summary refs log tree commit diff
path: root/po
diff options
context:
space:
mode:
Diffstat (limited to 'po')
-rw-r--r--po/POTFILES.in14
-rw-r--r--po/de.po5466
-rw-r--r--po/fr.po2
-rw-r--r--po/pt_BR.po7917
-rw-r--r--po/uk.po4712
-rw-r--r--po/zh_CN.po8790
6 files changed, 11511 insertions, 15390 deletions
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 942b0661..94125041 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -51,13 +51,12 @@ clients/tui/nmtui-connect.c
 clients/tui/nmtui-edit.c
 clients/tui/nmtui-hostname.c
 clients/tui/nmtui.c
-libnm-core/nm-crypto.c
-libnm-core/nm-crypto-gnutls.c
-libnm-core/nm-crypto-nss.c
+libnm-core/crypto.c
+libnm-core/crypto_gnutls.c
+libnm-core/crypto_nss.c
 libnm-core/nm-connection.c
 libnm-core/nm-dbus-utils.c
 libnm-core/nm-keyfile.c
-libnm-core/nm-setting-6lowpan.c
 libnm-core/nm-setting-8021x.c
 libnm-core/nm-setting-adsl.c
 libnm-core/nm-setting-bluetooth.c
@@ -67,7 +66,6 @@ libnm-core/nm-setting-bridge.c
 libnm-core/nm-setting-cdma.c
 libnm-core/nm-setting-connection.c
 libnm-core/nm-setting-dcb.c
-libnm-core/nm-setting-ethtool.c
 libnm-core/nm-setting-gsm.c
 libnm-core/nm-setting-infiniband.c
 libnm-core/nm-setting-ip-config.c
@@ -84,7 +82,6 @@ libnm-core/nm-setting-ovs-bridge.c
 libnm-core/nm-setting-ppp.c
 libnm-core/nm-setting-pppoe.c
 libnm-core/nm-setting-proxy.c
-libnm-core/nm-setting-sriov.c
 libnm-core/nm-setting-tc-config.c
 libnm-core/nm-setting-team.c
 libnm-core/nm-setting-team-port.c
@@ -97,7 +94,6 @@ libnm-core/nm-setting-wimax.c
 libnm-core/nm-setting-wired.c
 libnm-core/nm-setting-wireless-security.c
 libnm-core/nm-setting-wireless.c
-libnm-core/nm-setting-wpan.c
 libnm-core/nm-setting.c
 libnm-core/nm-utils.c
 libnm-core/nm-vpn-editor-plugin.c
@@ -133,7 +129,6 @@ libnm-util/nm-setting-wired.c
 libnm-util/nm-setting-wireless-security.c
 libnm-util/nm-setting-wireless.c
 libnm-util/nm-utils.c
-libnm/nm-device-6lowpan.c
 libnm/nm-device-adsl.c
 libnm/nm-device-bond.c
 libnm/nm-device-bridge.c
@@ -155,7 +150,6 @@ libnm/nm-device-vlan.c
 libnm/nm-device-vxlan.c
 libnm/nm-device-wifi.c
 libnm/nm-device-wimax.c
-libnm/nm-device-wpan.c
 libnm/nm-device.c
 libnm/nm-manager.c
 libnm/nm-object.c
@@ -175,7 +169,6 @@ src/dns/nm-dns-manager.c
 src/devices/adsl/nm-device-adsl.c
 src/devices/bluetooth/nm-bluez-device.c
 src/devices/bluetooth/nm-device-bt.c
-src/devices/nm-device-6lowpan.c
 src/devices/nm-device-bond.c
 src/devices/nm-device-bridge.c
 src/devices/nm-device-dummy.c
@@ -187,7 +180,6 @@ src/devices/nm-device-macvlan.c
 src/devices/nm-device-tun.c
 src/devices/nm-device-vlan.c
 src/devices/nm-device-vxlan.c
-src/devices/nm-device-wpan.c
 src/devices/team/nm-device-team.c
 src/devices/wifi/nm-device-olpc-mesh.c
 src/devices/wifi/nm-device-wifi.c
diff --git a/po/de.po b/po/de.po
index a7570190..bff293a0 100644
--- a/po/de.po
+++ b/po/de.po
@@ -10,7 +10,7 @@
 # Hauke Mehrtens <hauke@hauke-m.de>, 2008.
 # Daniel Schury <Daniel.Schury@physik.uni-giessen.de>, 2010.
 # Daniel Winzen <d@winzen4.de>, 2012.
-# Mario Blättermann <mario.blaettermann@gmail.com>, 2012, 2016-2018.
+# Mario Blättermann <mario.blaettermann@gmail.com>, 2012, 2016-2017.
 # Wolfgang Stöggl <c72578@yahoo.de>, 2012, 2013, 2015.
 # Christian Kirbach <christian.kirbach@gmail.com>, 2009-2014.
 # Benjamin Steinwender <b@stbe.at>, 2014.
@@ -18,19 +18,18 @@
 # lrintel <lrintel@redhat.com>, 2017. #zanata
 msgid ""
 msgstr ""
-"Project-Id-Version: \n"
-"Report-Msgid-Bugs-To: https://gitlab.freedesktop.org/NetworkManager/"
-"NetworkManager/issues\n"
-"POT-Creation-Date: 2018-08-19 15:24+0000\n"
-"PO-Revision-Date: 2018-07-15 17:31+0200\n"
-"Last-Translator: Mario Blättermann <mario.blaettermann@gmail.com>\n"
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2017-12-12 10:22+0100\n"
+"PO-Revision-Date: 2017-11-07 06:49+0000\n"
+"Last-Translator: Copied by Zanata <copied-by-zanata@zanata.org>\n"
 "Language-Team: Deutsch <gnome-de@gnome.org>\n"
 "Language: de\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Poedit 2.0.8\n"
+"X-Generator: Zanata 4.3.2\n"
 
 #: ../clients/cli/agent.c:40
 #, c-format
@@ -96,49 +95,47 @@ msgstr ""
 "nmcli auführen als NetworkManager-Passwort und polkit-Agent.\n"
 "\n"
 
-#: ../clients/cli/agent.c:157
+#: ../clients/cli/agent.c:158
 #, c-format
 msgid "nmcli successfully registered as a NetworkManager's secret agent.\n"
 msgstr ""
 "nmcli wurde erfolgreich als Passwort-Agent von NetworkManager angemeldet.\n"
 
-#: ../clients/cli/agent.c:159
+#: ../clients/cli/agent.c:160
 #, c-format
 msgid "Error: secret agent initialization failed"
 msgstr "Fehler: Initialisierung des Passwort-Agenten fehlgeschlagen"
 
-#: ../clients/cli/agent.c:178
+#: ../clients/cli/agent.c:179
 #, c-format
 msgid "Error: polkit agent initialization failed: %s"
 msgstr "Fehler: Initialisierung des Passwort-Agenten fehlgeschlagen: %s"
 
-#: ../clients/cli/agent.c:186
+#: ../clients/cli/agent.c:187
 #, c-format
 msgid "nmcli successfully registered as a polkit agent.\n"
 msgstr "nmcli wurde erfolgreich als polkit-Agent angemeldet.\n"
 
-#: ../clients/cli/common.c:361 ../clients/cli/common.c:362
-#: ../clients/cli/common.c:393 ../clients/cli/common.c:394
-#: ../clients/cli/connections.c:1389
+#: ../clients/cli/common.c:262 ../clients/cli/common.c:277
 msgid "GROUP"
 msgstr "GRUPPE"
 
-#: ../clients/cli/common.c:621
+#: ../clients/cli/common.c:559
 #, c-format
 msgid "Error: openconnect failed: %s\n"
 msgstr "Fehler: openconnect ist fehlgeschlagen: %s\n"
 
-#: ../clients/cli/common.c:628
+#: ../clients/cli/common.c:566
 #, c-format
 msgid "Error: openconnect failed with status %d\n"
 msgstr "Fehler: openconnect fehlgeschlagen mit Status %d\n"
 
-#: ../clients/cli/common.c:630
+#: ../clients/cli/common.c:568
 #, c-format
 msgid "Error: openconnect failed with signal %d\n"
 msgstr "Fehler: openconnect fehlgeschlagen mit Signal %d\n"
 
-#: ../clients/cli/common.c:710
+#: ../clients/cli/common.c:648
 #, c-format
 msgid ""
 "Warning: password for '%s' not given in 'passwd-file' and nmcli cannot ask "
@@ -147,27 +144,27 @@ msgstr ""
 "Warnung: Das Passwort für »%s« ist nicht in »passwd-file« definiert. nmcli "
 "darf nicht ohne die Option »--ask« fragen.\n"
 
-#: ../clients/cli/common.c:1200
+#: ../clients/cli/common.c:1114
 #, c-format
 msgid "Error: Could not create NMClient object: %s."
 msgstr "Fehler: NMClient-Objekt konnte nicht erstellt werden: %s."
 
-#: ../clients/cli/common.c:1220
+#: ../clients/cli/common.c:1134
 msgid "Error: NetworkManager is not running."
 msgstr "Fehler: NetworkManager wird nicht ausgeführt."
 
-#: ../clients/cli/common.c:1316
+#: ../clients/cli/common.c:1231
 #, c-format
 msgid "Error: argument '%s' not understood. Try passing --help instead."
 msgstr ""
 "Fehler: Argument »%s« wird nicht verstanden. Versuchen Sie stattdessen »--"
 "help«."
 
-#: ../clients/cli/common.c:1326
+#: ../clients/cli/common.c:1241
 msgid "Error: missing argument. Try passing --help."
 msgstr "Fehler: Fehlendes Argument. Versuchen sie »--help« anzugeben."
 
-#: ../clients/cli/common.c:1379
+#: ../clients/cli/common.c:1294
 msgid "access denied"
 msgstr "Zugriff verweigert"
 
@@ -201,70 +198,7 @@ msgstr "Verbindung(en) (Name, UUID oder Pfad)"
 msgid "Connection(s) (name, UUID, path or apath)"
 msgstr "Verbindung(en) (Name, UUID oder a-Pfad)"
 
-#: ../clients/cli/connections.c:80 ../clients/cli/connections.c:89
-#: ../clients/cli/devices.c:421 ../clients/cli/devices.c:513
-#: ../clients/cli/devices.c:520 ../clients/cli/general.c:41
-#: ../clients/cli/general.c:82 ../clients/cli/general.c:150
-#: ../clients/cli/general.c:155 ../clients/common/nm-client-utils.c:260
-#: ../clients/common/nm-client-utils.c:273
-#: ../clients/common/nm-client-utils.c:277
-#: ../clients/common/nm-client-utils.c:282
-#: ../clients/common/nm-meta-setting-desc.c:1510
-#: ../clients/common/nm-meta-setting-desc.c:1560
-#: ../clients/common/nm-meta-setting-desc.c:2709
-#: ../clients/common/nm-meta-setting-desc.c:2764
-msgid "unknown"
-msgstr "unbekannt"
-
-#: ../clients/cli/connections.c:81
-msgid "activating"
-msgstr "wird aktiviert"
-
-#: ../clients/cli/connections.c:82
-msgid "activated"
-msgstr "aktiviert"
-
-#: ../clients/cli/connections.c:83 ../clients/common/nm-client-utils.c:271
-msgid "deactivating"
-msgstr "wird deaktiviert"
-
-#: ../clients/cli/connections.c:84
-msgid "deactivated"
-msgstr "deaktiviert"
-
-#: ../clients/cli/connections.c:90
-msgid "VPN connecting (prepare)"
-msgstr "VPN wird verbunden (wird vorbereitet)"
-
-#: ../clients/cli/connections.c:91
-msgid "VPN connecting (need authentication)"
-msgstr "VPN wird verbunden (Legitimierung wird benötigt)"
-
-#: ../clients/cli/connections.c:92
-msgid "VPN connecting"
-msgstr "VPN wird verbunden"
-
-#: ../clients/cli/connections.c:93
-msgid "VPN connecting (getting IP configuration)"
-msgstr "VPN wird verbunden (IP-Einstellungen werden ermittelt)"
-
-#: ../clients/cli/connections.c:94
-msgid "VPN connected"
-msgstr "VPN verbunden"
-
-#: ../clients/cli/connections.c:95
-msgid "VPN connection failed"
-msgstr "VPN-Verbindung gescheitert"
-
-#: ../clients/cli/connections.c:96
-msgid "VPN disconnected"
-msgstr "VPN getrennt"
-
-#: ../clients/cli/connections.c:464
-msgid "never"
-msgstr "nie"
-
-#: ../clients/cli/connections.c:813
+#: ../clients/cli/connections.c:195
 #, c-format
 msgid ""
 "Usage: nmcli connection { COMMAND | help }\n"
@@ -341,7 +275,7 @@ msgstr ""
 "  export [id | uuid | path] <KENNUNG> [<Augabedatei>]\n"
 "\n"
 
-#: ../clients/cli/connections.c:835
+#: ../clients/cli/connections.c:217
 #, c-format
 msgid ""
 "Usage: nmcli connection show { ARGUMENTS | help }\n"
@@ -392,7 +326,7 @@ msgstr ""
 "Die globale Option »--show-secrets« zeigt zusätzlich zugehörige Passwörter "
 "an.\n"
 
-#: ../clients/cli/connections.c:856
+#: ../clients/cli/connections.c:238
 #, c-format
 msgid ""
 "Usage: nmcli connection up { ARGUMENTS | help }\n"
@@ -439,7 +373,7 @@ msgstr ""
 "passwd-file - Datei mit Passwörtern zum Aktivieren der Verbindung\n"
 "\n"
 
-#: ../clients/cli/connections.c:877
+#: ../clients/cli/connections.c:259
 #, c-format
 msgid ""
 "Usage: nmcli connection down { ARGUMENTS | help }\n"
@@ -462,156 +396,8 @@ msgstr ""
 "anhand dessen Name, UUID oder D-Bus-Pfad identifiziert.\n"
 "\n"
 
-#: ../clients/cli/connections.c:889
-#, fuzzy, c-format
-#| msgid ""
-#| "Usage: nmcli connection add { ARGUMENTS | help }\n"
-#| "\n"
-#| "ARGUMENTS := COMMON_OPTIONS TYPE_SPECIFIC_OPTIONS SLAVE_OPTIONS "
-#| "IP_OPTIONS [-- ([+|-]<setting>.<property> <value>)+]\n"
-#| "\n"
-#| "  COMMON_OPTIONS:\n"
-#| "                  type <type>\n"
-#| "                  ifname <interface name> | \"*\"\n"
-#| "                  [con-name <connection name>]\n"
-#| "                  [autoconnect yes|no]\n"
-#| "                  [save yes|no]\n"
-#| "                  [master <master (ifname, or connection UUID or name)>]\n"
-#| "                  [slave-type <master connection type>]\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"
-#| "                  [mode infrastructure|ap|adhoc]\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|nap|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"
-#| "                  [lacp-rate slow (0) | fast (1)]\n"
-#| "\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 or name)>\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"
-#| "                  [multicast-snooping yes|no]\n"
-#| "                  [mac <MAC address>]\n"
-#| "\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|"
-#| "libreswan|ssh|l2tp|iodine|...\n"
-#| "                  [user <username>]\n"
-#| "\n"
-#| "    olpc-mesh:    ssid <SSID>\n"
-#| "                  [channel <1-13>]\n"
-#| "                  [dhcp-anycast <MAC address>]\n"
-#| "\n"
-#| "    adsl:         username <username>\n"
-#| "                  protocol pppoa|pppoe|ipoatm\n"
-#| "                  [password <password>]\n"
-#| "                  [encapsulation vcmux|llc]\n"
-#| "\n"
-#| "    tun:          mode tun|tap\n"
-#| "                  [owner <UID>]\n"
-#| "                  [group <GID>]\n"
-#| "                  [pi yes|no]\n"
-#| "                  [vnet-hdr yes|no]\n"
-#| "                  [multi-queue yes|no]\n"
-#| "\n"
-#| "    ip-tunnel:    mode ipip|gre|sit|isatap|vti|ip6ip6|ipip6|ip6gre|vti6\n"
-#| "                  remote <remote endpoint IP>\n"
-#| "                  [local <local endpoint IP>]\n"
-#| "                  [dev <parent device (ifname or connection UUID)>]\n"
-#| "\n"
-#| "    macsec:       dev <parent device (connection UUID, ifname, or MAC)>\n"
-#| "                  mode <psk|eap>\n"
-#| "                  [cak <key> ckn <key>]\n"
-#| "                  [encrypt yes|no]\n"
-#| "                  [port 1-65534]\n"
-#| "\n"
-#| "\n"
-#| "    macvlan:      dev <parent device (connection UUID, ifname, or MAC)>\n"
-#| "                  mode vepa|bridge|private|passthru|source\n"
-#| "                  [tap yes|no]\n"
-#| "\n"
-#| "    vxlan:        id <VXLAN ID>\n"
-#| "                  remote <IP of multicast group or remote address>\n"
-#| "                  [local <source IP>]\n"
-#| "                  [dev <parent device (ifname or connection UUID)>]\n"
-#| "                  [source-port-min <0-65535>]\n"
-#| "                  [source-port-max <0-65535>]\n"
-#| "                  [destination-port <0-65535>]\n"
-#| "\n"
-#| "    dummy:         \n"
-#| "\n"
-#| "  SLAVE_OPTIONS:\n"
-#| "    bridge:       [priority <0-63>]\n"
-#| "                  [path-cost <1-65535>]\n"
-#| "                  [hairpin yes|no]\n"
-#| "\n"
-#| "    team:         [config <file>|<raw JSON data>]\n"
-#| "\n"
-#| "  IP_OPTIONS:\n"
-#| "                  [ip4 <IPv4 address>] [gw4 <IPv4 gateway>]\n"
-#| "                  [ip6 <IPv6 address>] [gw6 <IPv6 gateway>]\n"
-#| "\n"
+#: ../clients/cli/connections.c:271
+#, c-format
 msgid ""
 "Usage: nmcli connection add { ARGUMENTS | help }\n"
 "\n"
@@ -747,14 +533,7 @@ msgid ""
 "                  [source-port-max <0-65535>]\n"
 "                  [destination-port <0-65535>]\n"
 "\n"
-"    wpan:         [short-addr <0x0000-0xffff>]\n"
-"\n"
-"                  [pan-id <0x0000-0xffff>]\n"
-"\n"
-"                  [mac <MAC address>]\n"
-"\n"
-"    6lowpan:      dev <parent device (connection UUID, ifname, or MAC)>\n"
-"    dummy:\n"
+"    dummy:         \n"
 "\n"
 "  SLAVE_OPTIONS:\n"
 "    bridge:       [priority <0-63>]\n"
@@ -925,7 +704,7 @@ msgstr ""
 "                  [ip6 <IPv6-Adresse>] [gw6 <IPv6-Gateway>]\n"
 "\n"
 
-#: ../clients/cli/connections.c:1011
+#: ../clients/cli/connections.c:389
 #, c-format
 msgid ""
 "Usage: nmcli connection modify { ARGUMENTS | help }\n"
@@ -974,7 +753,7 @@ msgstr ""
 "nmcli con mod bond0 -bond.options downdelay\n"
 "\n"
 
-#: ../clients/cli/connections.c:1034
+#: ../clients/cli/connections.c:412
 #, c-format
 msgid ""
 "Usage: nmcli connection clone { ARGUMENTS | help }\n"
@@ -997,7 +776,7 @@ msgstr ""
 "und der id (wird als Parameter <Neuer Name> angegeben).\n"
 "\n"
 
-#: ../clients/cli/connections.c:1046
+#: ../clients/cli/connections.c:424
 #, c-format
 msgid ""
 "Usage: nmcli connection edit { ARGUMENTS | help }\n"
@@ -1025,7 +804,7 @@ msgstr ""
 "Fügt ein neues Verbindungsprofil in einem interaktiven Editor hinzu.\n"
 "\n"
 
-#: ../clients/cli/connections.c:1061
+#: ../clients/cli/connections.c:439
 #, c-format
 msgid ""
 "Usage: nmcli connection delete { ARGUMENTS | help }\n"
@@ -1044,7 +823,7 @@ msgstr ""
 "Das Profil wird anhand dessen Name, UUID oder D-Bus-Pfad identifiziert.\n"
 "\n"
 
-#: ../clients/cli/connections.c:1072
+#: ../clients/cli/connections.c:450
 #, c-format
 msgid ""
 "Usage: nmcli connection monitor { ARGUMENTS | help }\n"
@@ -1066,7 +845,7 @@ msgstr ""
 "Es werden alle Verbindungsprofile überwacht, sofern keines angegeben wird.\n"
 "\n"
 
-#: ../clients/cli/connections.c:1084
+#: ../clients/cli/connections.c:462
 #, c-format
 msgid ""
 "Usage: nmcli connection reload { help }\n"
@@ -1079,7 +858,7 @@ msgstr ""
 "Lädt alle Verbindungsdateien neu von der Festplatte.\n"
 "\n"
 
-#: ../clients/cli/connections.c:1092
+#: ../clients/cli/connections.c:470
 #, c-format
 msgid ""
 "Usage: nmcli connection load { ARGUMENTS | help }\n"
@@ -1102,7 +881,7 @@ msgstr ""
 "um sicherzustellen, dass der NetworkManager die Änderungen übernimmt.\n"
 "\n"
 
-#: ../clients/cli/connections.c:1104
+#: ../clients/cli/connections.c:482
 #, c-format
 msgid ""
 "Usage: nmcli connection import { ARGUMENTS | help }\n"
@@ -1128,7 +907,7 @@ msgstr ""
 "\n"
 "\n"
 
-#: ../clients/cli/connections.c:1117
+#: ../clients/cli/connections.c:495
 #, c-format
 msgid ""
 "Usage: nmcli connection export { ARGUMENTS | help }\n"
@@ -1149,342 +928,440 @@ msgstr ""
 "sofern eine angegeben wird.\n"
 "\n"
 
-#: ../clients/cli/connections.c:1199
+#: ../clients/cli/connections.c:525
+msgid "activating"
+msgstr "wird aktiviert"
+
+#: ../clients/cli/connections.c:527
+msgid "activated"
+msgstr "aktiviert"
+
+#: ../clients/cli/connections.c:529 ../clients/common/nm-client-utils.c:243
+msgid "deactivating"
+msgstr "wird deaktiviert"
+
+#: ../clients/cli/connections.c:531
+msgid "deactivated"
+msgstr "deaktiviert"
+
+#: ../clients/cli/connections.c:534 ../clients/cli/connections.c:557
+#: ../clients/cli/devices.c:1207 ../clients/cli/devices.c:1251
+#: ../clients/cli/devices.c:1253 ../clients/cli/general.c:41
+#: ../clients/cli/general.c:79 ../clients/cli/general.c:146
+#: ../clients/cli/general.c:151 ../clients/common/nm-client-utils.c:247
+#: ../clients/common/nm-client-utils.c:250
+#: ../clients/common/nm-client-utils.c:266
+#: ../clients/common/nm-client-utils.c:269
+#: ../clients/common/nm-meta-setting-desc.c:1479
+#: ../clients/common/nm-meta-setting-desc.c:1547
+#: ../clients/common/nm-meta-setting-desc.c:2692
+#: ../clients/common/nm-meta-setting-desc.c:2746
+msgid "unknown"
+msgstr "unbekannt"
+
+#: ../clients/cli/connections.c:543
+msgid "VPN connecting (prepare)"
+msgstr "VPN wird verbunden (wird vorbereitet)"
+
+#: ../clients/cli/connections.c:545
+msgid "VPN connecting (need authentication)"
+msgstr "VPN wird verbunden (Legitimierung wird benötigt)"
+
+#: ../clients/cli/connections.c:547
+msgid "VPN connecting"
+msgstr "VPN wird verbunden"
+
+#: ../clients/cli/connections.c:549
+msgid "VPN connecting (getting IP configuration)"
+msgstr "VPN wird verbunden (IP-Einstellungen werden ermittelt)"
+
+#: ../clients/cli/connections.c:551
+msgid "VPN connected"
+msgstr "VPN verbunden"
+
+#: ../clients/cli/connections.c:553
+msgid "VPN connection failed"
+msgstr "VPN-Verbindung gescheitert"
+
+#: ../clients/cli/connections.c:555
+msgid "VPN disconnected"
+msgstr "VPN getrennt"
+
+#: ../clients/cli/connections.c:625
 #, c-format
 msgid "Error updating secrets for %s: %s\n"
 msgstr "Fehler beim Aktualisieren der Geheimnisse für %s: %s\n"
 
-#: ../clients/cli/connections.c:1242
+#: ../clients/cli/connections.c:645
 msgid "Connection profile details"
 msgstr "Details des Verbindungsprofils"
 
-#: ../clients/cli/connections.c:1255 ../clients/cli/connections.c:1340
+#: ../clients/cli/connections.c:658 ../clients/cli/connections.c:1108
 #, c-format
 msgid "Error: 'connection show': %s"
 msgstr "Fehler: »connection show«: %s"
 
-#: ../clients/cli/connections.c:1330
+#: ../clients/cli/connections.c:876
+msgid "never"
+msgstr "nie"
+
+#. "CAPABILITIES"
+#: ../clients/cli/connections.c:877 ../clients/cli/connections.c:879
+#: ../clients/cli/connections.c:881 ../clients/cli/connections.c:914
+#: ../clients/cli/connections.c:981 ../clients/cli/connections.c:982
+#: ../clients/cli/connections.c:984 ../clients/cli/connections.c:4427
+#: ../clients/cli/connections.c:6365 ../clients/cli/connections.c:6366
+#: ../clients/cli/devices.c:881 ../clients/cli/devices.c:1170
+#: ../clients/cli/devices.c:1171 ../clients/cli/devices.c:1172
+#: ../clients/cli/devices.c:1173 ../clients/cli/devices.c:1174
+#: ../clients/cli/devices.c:1211 ../clients/cli/devices.c:1213
+#: ../clients/cli/devices.c:1214 ../clients/cli/devices.c:1244
+#: ../clients/cli/devices.c:1245 ../clients/cli/devices.c:1246
+#: ../clients/cli/devices.c:1247 ../clients/cli/devices.c:1248
+#: ../clients/cli/devices.c:1249 ../clients/cli/devices.c:1250
+#: ../clients/cli/devices.c:1252 ../clients/cli/devices.c:1254
+#: ../clients/cli/general.c:152 ../clients/common/nm-client-utils.c:258
+#: ../clients/common/nm-meta-setting-desc.c:719
+#: ../clients/common/nm-meta-setting-desc.c:2685
+msgid "yes"
+msgstr "ja"
+
+#: ../clients/cli/connections.c:877 ../clients/cli/connections.c:879
+#: ../clients/cli/connections.c:881 ../clients/cli/connections.c:981
+#: ../clients/cli/connections.c:982 ../clients/cli/connections.c:984
+#: ../clients/cli/connections.c:4426 ../clients/cli/connections.c:6365
+#: ../clients/cli/connections.c:6366 ../clients/cli/devices.c:881
+#: ../clients/cli/devices.c:1170 ../clients/cli/devices.c:1171
+#: ../clients/cli/devices.c:1172 ../clients/cli/devices.c:1173
+#: ../clients/cli/devices.c:1174 ../clients/cli/devices.c:1211
+#: ../clients/cli/devices.c:1213 ../clients/cli/devices.c:1214
+#: ../clients/cli/devices.c:1244 ../clients/cli/devices.c:1245
+#: ../clients/cli/devices.c:1246 ../clients/cli/devices.c:1247
+#: ../clients/cli/devices.c:1248 ../clients/cli/devices.c:1249
+#: ../clients/cli/devices.c:1250 ../clients/cli/devices.c:1252
+#: ../clients/cli/devices.c:1254 ../clients/cli/general.c:153
+#: ../clients/common/nm-client-utils.c:260
+#: ../clients/common/nm-meta-setting-desc.c:719
+#: ../clients/common/nm-meta-setting-desc.c:2688
+msgid "no"
+msgstr "nein"
+
+#: ../clients/cli/connections.c:1098
 msgid "Activate connection details"
 msgstr "Verbindungsdetails aktivieren"
 
-#: ../clients/cli/connections.c:1438 ../clients/cli/devices.c:1484
-#: ../clients/cli/devices.c:1498 ../clients/cli/devices.c:1513
-#: ../clients/cli/devices.c:1571 ../clients/cli/devices.c:1673
-msgid "NAME"
-msgstr "NAME"
-
-#: ../clients/cli/connections.c:1526
+#: ../clients/cli/connections.c:1345
 #, c-format
 msgid "invalid field '%s'; allowed fields: %s and %s, or %s,%s"
 msgstr "Ungültiges Feld »%s«; erlaubte Felder: %s und %s oder %s,%s"
 
-#: ../clients/cli/connections.c:1541 ../clients/cli/connections.c:1549
+#: ../clients/cli/connections.c:1360 ../clients/cli/connections.c:1368
 #, c-format
 msgid "'%s' has to be alone"
 msgstr "»%s« muss allein stehen"
 
-#: ../clients/cli/connections.c:1814
+#: ../clients/cli/connections.c:1568
 #, c-format
 msgid "incorrect string '%s' of '--order' option"
 msgstr "Falsche Zeichenkette »%s« der Option »--order«"
 
-#: ../clients/cli/connections.c:1839
+#: ../clients/cli/connections.c:1594
 #, c-format
 msgid "incorrect item '%s' in '--order' option"
 msgstr "Falsches Objekt »%s« der Option »--order«"
 
-#: ../clients/cli/connections.c:1877
+#: ../clients/cli/connections.c:1624
 msgid "No connection specified"
 msgstr "Keine Verbindung angegeben"
 
-#: ../clients/cli/connections.c:1888
+#: ../clients/cli/connections.c:1639
 #, c-format
 msgid "%s argument is missing"
 msgstr "Argument %s fehlt"
 
-#: ../clients/cli/connections.c:1906
+#: ../clients/cli/connections.c:1649
 #, c-format
 msgid "unknown connection '%s'"
 msgstr "Unbekannte Verbindung »%s«"
 
-#: ../clients/cli/connections.c:1935
+#: ../clients/cli/connections.c:1682
 msgid "'--order' argument is missing"
 msgstr "Argument »--order« fehlt"
 
-#: ../clients/cli/connections.c:1996
+#: ../clients/cli/connections.c:1737
 msgid "NetworkManager active profiles"
 msgstr "NetworkManager aktive Profile"
 
-#: ../clients/cli/connections.c:1997
+#: ../clients/cli/connections.c:1738
 msgid "NetworkManager connection profiles"
 msgstr "NetworkManager Verbindungsprofile"
 
-#: ../clients/cli/connections.c:2049 ../clients/cli/connections.c:2748
-#: ../clients/cli/connections.c:2760 ../clients/cli/connections.c:2772
-#: ../clients/cli/connections.c:2998 ../clients/cli/connections.c:8687
-#: ../clients/cli/connections.c:8703 ../clients/cli/devices.c:3037
-#: ../clients/cli/devices.c:3049 ../clients/cli/devices.c:3062
-#: ../clients/cli/devices.c:3213 ../clients/cli/devices.c:3224
-#: ../clients/cli/devices.c:3242 ../clients/cli/devices.c:3251
-#: ../clients/cli/devices.c:3272 ../clients/cli/devices.c:3283
-#: ../clients/cli/devices.c:3301 ../clients/cli/devices.c:3681
-#: ../clients/cli/devices.c:3691 ../clients/cli/devices.c:3699
-#: ../clients/cli/devices.c:3711 ../clients/cli/devices.c:3726
-#: ../clients/cli/devices.c:3734 ../clients/cli/devices.c:3908
-#: ../clients/cli/devices.c:3919 ../clients/cli/devices.c:4090
+#: ../clients/cli/connections.c:1791 ../clients/cli/connections.c:2466
+#: ../clients/cli/connections.c:2478 ../clients/cli/connections.c:2490
+#: ../clients/cli/connections.c:2666 ../clients/cli/connections.c:8428
+#: ../clients/cli/connections.c:8445 ../clients/cli/devices.c:2678
+#: ../clients/cli/devices.c:2689 ../clients/cli/devices.c:2931
+#: ../clients/cli/devices.c:2942 ../clients/cli/devices.c:2960
+#: ../clients/cli/devices.c:2969 ../clients/cli/devices.c:2990
+#: ../clients/cli/devices.c:3001 ../clients/cli/devices.c:3019
+#: ../clients/cli/devices.c:3397 ../clients/cli/devices.c:3407
+#: ../clients/cli/devices.c:3415 ../clients/cli/devices.c:3427
+#: ../clients/cli/devices.c:3442 ../clients/cli/devices.c:3450
+#: ../clients/cli/devices.c:3624 ../clients/cli/devices.c:3635
+#: ../clients/cli/devices.c:3807
 #, c-format
 msgid "Error: %s argument is missing."
 msgstr "Fehler: Argument %s fehlt."
 
-#: ../clients/cli/connections.c:2077
+#: ../clients/cli/connections.c:1810
 #, c-format
 msgid "Error: %s - no such connection profile."
 msgstr "Fehler: Verbindungsprofil %s existiert nicht."
 
-#: ../clients/cli/connections.c:2168 ../clients/cli/connections.c:2735
-#: ../clients/cli/connections.c:2799 ../clients/cli/connections.c:8211
-#: ../clients/cli/connections.c:8317 ../clients/cli/connections.c:8803
-#: ../clients/cli/devices.c:1758 ../clients/cli/devices.c:2044
-#: ../clients/cli/devices.c:2213 ../clients/cli/devices.c:2321
-#: ../clients/cli/devices.c:2510 ../clients/cli/devices.c:3871
-#: ../clients/cli/devices.c:4096 ../clients/cli/general.c:917
+#: ../clients/cli/connections.c:1874 ../clients/cli/connections.c:2453
+#: ../clients/cli/connections.c:2517 ../clients/cli/connections.c:7938
+#: ../clients/cli/connections.c:8049 ../clients/cli/connections.c:8559
+#: ../clients/cli/devices.c:1579 ../clients/cli/devices.c:1865
+#: ../clients/cli/devices.c:2034 ../clients/cli/devices.c:2142
+#: ../clients/cli/devices.c:2331 ../clients/cli/devices.c:3587
+#: ../clients/cli/devices.c:3813 ../clients/cli/general.c:928
 #, c-format
 msgid "Error: %s."
 msgstr "Fehler: %s."
 
-#: ../clients/cli/connections.c:2261
+#: ../clients/cli/connections.c:1972
 #, c-format
 msgid "no active connection on device '%s'"
 msgstr "Keine aktive Verbindung auf Gerät »%s«"
 
-#: ../clients/cli/connections.c:2269
+#: ../clients/cli/connections.c:1980
 msgid "no active connection or device"
 msgstr "Keine aktive Verbindung oder Gerät"
 
-#: ../clients/cli/connections.c:2289
+#: ../clients/cli/connections.c:2000
 #, c-format
 msgid "device '%s' not compatible with connection '%s':"
 msgstr "Gerät »%s« ist nicht mit der Verbindung »%s« kompatibel:"
 
-#: ../clients/cli/connections.c:2322
+#: ../clients/cli/connections.c:2036
 #, c-format
 msgid "device '%s' not compatible with connection '%s'"
 msgstr "Gerät »%s« ist nicht mit der Verbindung »%s« kompatibel"
 
-#: ../clients/cli/connections.c:2325
+#: ../clients/cli/connections.c:2039
 #, c-format
 msgid "no device found for connection '%s'"
 msgstr "Für die Verbindung »%s« wurde kein Gerät gefunden"
 
-#: ../clients/cli/connections.c:2357
+#: ../clients/cli/connections.c:2067
 #, c-format
 msgid "Connection successfully activated (%s) (D-Bus active path: %s)\n"
-msgstr "Verbindung wurde erfolgreich aktiviert (%s) (Aktiver D-Bus-Pfad: %s)\n"
+msgstr ""
 
-#: ../clients/cli/connections.c:2361 ../clients/cli/connections.c:2509
-#: ../clients/cli/connections.c:6575
+#: ../clients/cli/connections.c:2071 ../clients/cli/connections.c:2219
+#: ../clients/cli/connections.c:6244
 #, c-format
 msgid "Connection successfully activated (D-Bus active path: %s)\n"
 msgstr "Verbindung wurde erfolgreich aktiviert (aktiver D-Bus-Pfad: %s)\n"
 
-#: ../clients/cli/connections.c:2368 ../clients/cli/connections.c:2489
+#: ../clients/cli/connections.c:2078 ../clients/cli/connections.c:2199
 #, c-format
 msgid "Error: Connection activation failed: %s"
 msgstr "Fehler: Aktivierung der Verbindung ist gescheitert: %s"
 
-#: ../clients/cli/connections.c:2404
+#: ../clients/cli/connections.c:2114
 #, c-format
 msgid "Error: Timeout expired (%d seconds)"
 msgstr "Fehler: Zeitbeschränkung (%d Sekunden) ist abgelaufen."
 
-#: ../clients/cli/connections.c:2571
+#: ../clients/cli/connections.c:2280
 #, c-format
 msgid "failed to read passwd-file '%s': %s"
 msgstr "Fehler: Lesen der passwd-Datei »%s« ist fehlgeschlagen: %s"
 
-#: ../clients/cli/connections.c:2584
+#: ../clients/cli/connections.c:2292
 #, c-format
 msgid "missing colon in 'password' entry '%s'"
 msgstr "Fehlender Doppelpunkt im Passwort-Eintrag »%s«"
 
-#: ../clients/cli/connections.c:2592
+#: ../clients/cli/connections.c:2300
 #, c-format
 msgid "missing dot in 'password' entry '%s'"
 msgstr "Fehlender Punkt im Passwort-Eintrag »%s«"
 
-#: ../clients/cli/connections.c:2605
+#: ../clients/cli/connections.c:2313
 #, c-format
 msgid "invalid setting name in 'password' entry '%s'"
 msgstr "Ungültiger Einstellungsname im Passwort-Eintrag »%s«"
 
-#: ../clients/cli/connections.c:2651
+#: ../clients/cli/connections.c:2369
 #, c-format
 msgid "unknown device '%s'."
 msgstr "Unbekanntes Gerät »%s«."
 
-#: ../clients/cli/connections.c:2656
+#: ../clients/cli/connections.c:2374
 msgid "neither a valid connection nor device given"
 msgstr "weder eine gültige Verbindung noch ein Gerät angegeben"
 
-#: ../clients/cli/connections.c:2782 ../clients/cli/devices.c:1717
-#: ../clients/cli/devices.c:3094 ../clients/cli/devices.c:3314
-#: ../clients/cli/devices.c:3925
+#: ../clients/cli/connections.c:2500 ../clients/cli/devices.c:1530
+#: ../clients/cli/devices.c:2696 ../clients/cli/devices.c:3032
+#: ../clients/cli/devices.c:3641
 #, c-format
 msgid "Unknown parameter: %s\n"
 msgstr "Unbekannter Parameter: %s\n"
 
-#: ../clients/cli/connections.c:2807
+#: ../clients/cli/connections.c:2525
 msgid "preparing"
 msgstr "Vorbereitung läuft"
 
-#: ../clients/cli/connections.c:2915
+#: ../clients/cli/connections.c:2545
 #, c-format
 msgid "Connection '%s' (%s) successfully deleted.\n"
 msgstr "Verbindung »%s« (%s) erfolgreich gelöscht.\n"
 
-#: ../clients/cli/connections.c:2931
+#: ../clients/cli/connections.c:2561
 #, c-format
 msgid "Connection '%s' successfully deactivated (D-Bus active path: %s)\n"
 msgstr ""
 "Verbindung »%s« wurde erfolgreich deaktiviert (aktiver D-Bus-Pfad: %s)\n"
 
-#: ../clients/cli/connections.c:2980 ../clients/cli/connections.c:8424
-#: ../clients/cli/connections.c:8455 ../clients/cli/connections.c:8613
+#: ../clients/cli/connections.c:2642 ../clients/cli/connections.c:8164
+#: ../clients/cli/connections.c:8196 ../clients/cli/connections.c:8353
 #, c-format
 msgid "Error: No connection specified."
 msgstr "Fehler: Keine Verbindung angegeben."
 
-#: ../clients/cli/connections.c:3010
+#: ../clients/cli/connections.c:2683
 #, c-format
 msgid "Error: '%s' is not an active connection.\n"
 msgstr "Fehler: »%s« ist keine aktive Verbindung.\n"
 
-#: ../clients/cli/connections.c:3011
+#: ../clients/cli/connections.c:2684
 #, c-format
 msgid "Error: not all active connections found."
 msgstr "Fehler: Es wurden nicht alle aktiven Verbindungen gefunden."
 
-#: ../clients/cli/connections.c:3019
+#: ../clients/cli/connections.c:2693
 #, c-format
 msgid "Error: no active connection provided."
 msgstr "Fehler: Keine aktive Verbindung angegeben."
 
-#: ../clients/cli/connections.c:3050
+#: ../clients/cli/connections.c:2727
 #, c-format
 msgid "Connection '%s' deactivation failed: %s\n"
 msgstr "Deaktivierung der Verbindung »%s« ist gescheitert: %s\n"
 
-#: ../clients/cli/connections.c:3301 ../clients/cli/connections.c:3358
-#: ../clients/common/nm-client-utils.c:221
+#: ../clients/cli/connections.c:2983 ../clients/cli/connections.c:3040
+#: ../clients/common/nm-client-utils.c:169
 #, c-format
 msgid "'%s' not among [%s]"
 msgstr "»%s« ist nicht unter [%s]"
 
 #. We should not really come here
-#: ../clients/cli/connections.c:3321 ../clients/cli/connections.c:3381
-#: ../clients/common/nm-client-utils.c:289
+#: ../clients/cli/connections.c:3003 ../clients/cli/connections.c:3063
+#: ../clients/common/nm-client-utils.c:279
 #, c-format
 msgid "Unknown error"
 msgstr "Unbekannter Fehler"
 
-#: ../clients/cli/connections.c:3515
+#: ../clients/cli/connections.c:3197
 #, c-format
 msgid "Warning: master='%s' doesn't refer to any existing profile.\n"
 msgstr "Warnung: master=»%s« bezieht sich auf kein vorhandenes Profil.\n"
 
-#: ../clients/cli/connections.c:3852
+#: ../clients/cli/connections.c:3534
 #, c-format
 msgid "Error: invalid property '%s': %s."
 msgstr "Fehler: Ungültige Eigenschaft »%s«: %s."
 
-#: ../clients/cli/connections.c:3869
+#: ../clients/cli/connections.c:3551
 #, c-format
 msgid "Error: failed to modify %s.%s: %s."
 msgstr "Fehler: Ändern ist fehlgeschlagen %s.%s: %s."
 
-#: ../clients/cli/connections.c:3889
+#: ../clients/cli/connections.c:3570
 #, c-format
 msgid "Error: failed to remove a value from %s.%s: %s."
 msgstr "Fehler: Entfernen eines Wertes von %s.%s: %s ist fehlgeschlagen."
 
-#: ../clients/cli/connections.c:3923
+#: ../clients/cli/connections.c:3604
 #, c-format
 msgid "Error: '%s' is mandatory."
 msgstr "Fehler: »%s« ist zwingend erforderlich."
 
-#: ../clients/cli/connections.c:3950
+#: ../clients/cli/connections.c:3631
 #, c-format
 msgid "Error: invalid slave type; %s."
 msgstr "Fehler: Unzulässiger Slave-Typ; %s."
 
-#: ../clients/cli/connections.c:3958
+#: ../clients/cli/connections.c:3639
 #, c-format
 msgid "Error: invalid connection type; %s."
 msgstr "Fehler: Unbekannter Verbindungstyp: %s."
 
-#: ../clients/cli/connections.c:4035
+#: ../clients/cli/connections.c:3716
 #, c-format
 msgid "Error: bad connection type: %s"
 msgstr "Fehler: Falscher Verbindungstyp: %s"
 
-#: ../clients/cli/connections.c:4081
+#: ../clients/cli/connections.c:3762
 #, c-format
 msgid "Error: '%s': %s"
 msgstr "Fehler: »%s«: %s"
 
-#: ../clients/cli/connections.c:4102
+#: ../clients/cli/connections.c:3783
 msgid "Error: master is required"
 msgstr "Fehler: »master« ist notwendig"
 
-#: ../clients/cli/connections.c:4161
+#: ../clients/cli/connections.c:3842
 #, c-format
 msgid "Error: error adding bond option '%s=%s'."
 msgstr "Fehler: Fehler beim Hinzufügen der bond-Option »%s=%s«."
 
-#: ../clients/cli/connections.c:4192
+#: ../clients/cli/connections.c:3873
 #, c-format
 msgid "Error: '%s' is not a valid monitoring mode; use '%s' or '%s'.\n"
 msgstr ""
 "Fehler: »%s« ist kein gültiger Überwachungsmodus; verwenden Sie »%s« oder "
 "»%s«.\n"
 
-#: ../clients/cli/connections.c:4223
+#: ../clients/cli/connections.c:3904
 #, c-format
 msgid "Error: 'bt-type': '%s' not valid; use [%s, %s, %s (%s), %s]."
 msgstr ""
 "Fehler: »bt-type«: »%s« ist nicht gültig. Verwenden Sie [%s, %s, %s (%s), "
 "%s]."
 
-#: ../clients/cli/connections.c:4472
+#: ../clients/cli/connections.c:4153
 #, c-format
 msgid "Error: value for '%s' is missing."
 msgstr "Fehler: Wert für »%s« fehlt."
 
-#: ../clients/cli/connections.c:4518
+#: ../clients/cli/connections.c:4199
 msgid "Error: <setting>.<property> argument is missing."
 msgstr "Fehler: Argument für Einstellung fehlt."
 
-#: ../clients/cli/connections.c:4541
+#: ../clients/cli/connections.c:4222
 #, c-format
 msgid "Error: invalid or not allowed setting '%s': %s."
 msgstr "Fehler: Ungültige oder nicht zulässige Einstellung »%s«: %s."
 
-#: ../clients/cli/connections.c:4587 ../clients/cli/connections.c:4603
+#: ../clients/cli/connections.c:4268 ../clients/cli/connections.c:4284
 #, c-format
 msgid "Error: '%s' is ambiguous (%s.%s or %s.%s)."
 msgstr "Fehler: '%s' ist mehrdeutig (%s.%s oder %s.%s)."
 
-#: ../clients/cli/connections.c:4621
+#: ../clients/cli/connections.c:4302
 #, c-format
 msgid "Error: invalid <setting>.<property> '%s'."
 msgstr "Fehler: Ungültiger Einstellungsname: »%s«."
 
-#: ../clients/cli/connections.c:4665 ../clients/cli/connections.c:8257
+#: ../clients/cli/connections.c:4346 ../clients/cli/connections.c:7989
 #, c-format
 msgid "Error: Failed to add '%s' connection: %s"
 msgstr "Fehler: Verbindung »%s« konnte nicht hinzugefügt werden: %s"
 
-#: ../clients/cli/connections.c:4683
+#: ../clients/cli/connections.c:4364
 #, c-format
 msgid ""
 "Warning: There is another connection with the name '%1$s'. Reference the "
@@ -1493,39 +1370,14 @@ msgid_plural ""
 "Warning: There are %3$u other connections with the name '%1$s'. Reference "
 "the connection by its uuid '%2$s'\n"
 msgstr[0] ""
-"Warnung: Es gibt bereits eine andere Verbindung namens »%1$s«. Beziehen Sie "
-"sich auf diese Verbindung mit der UUID »%2$s«\n"
-"\n"
 msgstr[1] ""
-"Warnung: Es gibt bereits %3$u andere Verbindungen namens »%1$s«. Beziehen "
-"Sie sich auf diese Verbindung mit deren UUID »%2$s«\n"
 
-#: ../clients/cli/connections.c:4692
+#: ../clients/cli/connections.c:4373
 #, c-format
 msgid "Connection '%s' (%s) successfully added.\n"
 msgstr "Verbindung »%s« (%s) erfolgreich hinzugefügt.\n"
 
-#: ../clients/cli/connections.c:4745 ../clients/cli/connections.c:6692
-#: ../clients/cli/connections.c:6693 ../clients/cli/devices.c:512
-#: ../clients/cli/devices.c:519 ../clients/cli/devices.c:1238
-#: ../clients/cli/general.c:157 ../clients/cli/utils.h:292
-#: ../clients/common/nm-client-utils.c:279
-#: ../clients/common/nm-meta-setting-desc.c:754
-#: ../clients/common/nm-meta-setting-desc.c:2704
-msgid "no"
-msgstr "nein"
-
-#: ../clients/cli/connections.c:4746 ../clients/cli/connections.c:6692
-#: ../clients/cli/connections.c:6693 ../clients/cli/devices.c:511
-#: ../clients/cli/devices.c:518 ../clients/cli/devices.c:1238
-#: ../clients/cli/general.c:156 ../clients/cli/utils.h:292
-#: ../clients/common/nm-client-utils.c:278
-#: ../clients/common/nm-meta-setting-desc.c:754
-#: ../clients/common/nm-meta-setting-desc.c:2701
-msgid "yes"
-msgstr "ja"
-
-#: ../clients/cli/connections.c:4830
+#: ../clients/cli/connections.c:4511
 #, c-format
 msgid ""
 "You can specify this option more than once. Press <Enter> when you're done.\n"
@@ -1534,36 +1386,36 @@ msgstr ""
 "fertig sind.\n"
 
 #. Ask for optional arguments.
-#: ../clients/cli/connections.c:4929
+#: ../clients/cli/connections.c:4610
 #, c-format
 msgid "There is %d optional setting for %s.\n"
 msgid_plural "There are %d optional settings for %s.\n"
 msgstr[0] "Es gibt %d optionale Einstellung für »%s«.\n"
 msgstr[1] "Es gibt %d optionale Einstellungen für »%s«.\n"
 
-#: ../clients/cli/connections.c:4932
+#: ../clients/cli/connections.c:4613
 #, c-format
 msgid "Do you want to provide it? %s"
 msgid_plural "Do you want to provide them? %s"
-msgstr[0] "Möchten Sie es zur Verfügung stellen? %s"
-msgstr[1] "Möchten Sie diese zur Verfügung stellen? %s"
+msgstr[0] "Möchten Sie es zur Verfügung stellen? »%s«"
+msgstr[1] "Möchten Sie diese zur Verfügung stellen? »%s«"
 
-#: ../clients/cli/connections.c:5065 ../clients/cli/utils.c:294
+#: ../clients/cli/connections.c:4749 ../clients/cli/utils.c:303
 #, c-format
 msgid "Error: value for '%s' argument is required."
 msgstr "Fehler: Ein Wert ist für den Parameter »%s« notwendig."
 
-#: ../clients/cli/connections.c:5072
+#: ../clients/cli/connections.c:4755
 #, c-format
 msgid "Error: 'save': %s."
 msgstr "Fehler: »save«: %s."
 
-#: ../clients/cli/connections.c:5158 ../clients/cli/connections.c:5169
+#: ../clients/cli/connections.c:4843 ../clients/cli/connections.c:4854
 #, c-format
 msgid "Error: '%s' argument is required."
 msgstr "Fehler: Das Argument »%s« ist notwendig."
 
-#: ../clients/cli/connections.c:6134
+#: ../clients/cli/connections.c:5832
 #, c-format
 msgid "['%s' setting values]\n"
 msgstr "['%s' Werte werden gesetzt]\n"
@@ -1572,7 +1424,7 @@ msgstr "['%s' Werte werden gesetzt]\n"
 #. TRANSLATORS: do not translate command names and keywords before ::
 #. *              However, you should translate terms enclosed in <>.
 #.
-#: ../clients/cli/connections.c:6243
+#: ../clients/cli/connections.c:5911
 #, c-format
 msgid ""
 "---[ Main menu ]---\n"
@@ -1608,7 +1460,7 @@ msgstr ""
 "nmcli    <conf-option> <Wert>                  :: nmcli-Konfiguration\n"
 "quit                                           :: nmcli beenden\n"
 
-#: ../clients/cli/connections.c:6270
+#: ../clients/cli/connections.c:5938
 #, c-format
 msgid ""
 "goto <setting>[.<prop>] | <prop>  :: enter setting/property for editing\n"
@@ -1628,7 +1480,7 @@ msgstr ""
 "           nmcli connection> goto secondaries\n"
 "           nmcli> goto ipv4.addresses\n"
 
-#: ../clients/cli/connections.c:6277
+#: ../clients/cli/connections.c:5945
 #, c-format
 msgid ""
 "remove <setting>[.<prop>]  :: remove setting or reset property value\n"
@@ -1650,7 +1502,7 @@ msgstr ""
 "Beispiele: nmcli> remove wifi-sec\n"
 "           nmcli> remove eth.mtu\n"
 
-#: ../clients/cli/connections.c:6284
+#: ../clients/cli/connections.c:5952
 #, c-format
 msgid ""
 "set [<setting>.<prop> <value>]  :: set property value\n"
@@ -1665,7 +1517,7 @@ msgstr ""
 "\n"
 "Beispiel: nmcli> s con.id Meine Verbindung\n"
 
-#: ../clients/cli/connections.c:6289
+#: ../clients/cli/connections.c:5957
 #, c-format
 msgid ""
 "describe [<setting>.<prop>]  :: describe property\n"
@@ -1678,7 +1530,7 @@ msgstr ""
 "Zeigt die Eigenschaftsbeschreibung. Sie können die Hilfeseite nm-settings(5) "
 "zu Rate ziehen, um alle Einstellungen und Eigenschaften nachzulesen.\n"
 
-#: ../clients/cli/connections.c:6294
+#: ../clients/cli/connections.c:5962
 #, c-format
 msgid ""
 "print [all]  :: print setting or connection values\n"
@@ -1693,7 +1545,7 @@ msgstr ""
 "\n"
 "Beispiel: nmcli ipv4> print all\n"
 
-#: ../clients/cli/connections.c:6299
+#: ../clients/cli/connections.c:5967
 #, c-format
 msgid ""
 "verify [all | fix]  :: verify setting or connection validity\n"
@@ -1719,7 +1571,7 @@ msgstr ""
 "           nmcli> verify fix\n"
 "           nmcli bond> verify\n"
 
-#: ../clients/cli/connections.c:6308
+#: ../clients/cli/connections.c:5976
 #, c-format
 msgid ""
 "save [persistent|temporary]  :: save the connection\n"
@@ -1746,7 +1598,7 @@ msgstr ""
 "Verbindung volständig löschen möchten, so muss das Verbindungsprofil\n"
 "gelöscht werden.\n"
 
-#: ../clients/cli/connections.c:6319
+#: ../clients/cli/connections.c:5987
 #, c-format
 msgid ""
 "activate [<ifname>] [/<ap>|<nsp>]  :: activate the connection\n"
@@ -1768,7 +1620,7 @@ msgstr ""
 "/<Zugriffspunkt>|<nsp> - Zugriffspunkt (WLAN) oder NSP (WiMAX) (stellen Sie "
 "»/« voraus wenn <Schnittstelle> nicht angegeben wird)\n"
 
-#: ../clients/cli/connections.c:6326 ../clients/cli/connections.c:6484
+#: ../clients/cli/connections.c:5994 ../clients/cli/connections.c:6153
 #, c-format
 msgid ""
 "back  :: go to upper menu level\n"
@@ -1777,7 +1629,7 @@ msgstr ""
 "back :: Eine Menüebene nach oben gehen\n"
 "\n"
 
-#: ../clients/cli/connections.c:6329
+#: ../clients/cli/connections.c:5997
 #, c-format
 msgid ""
 "help/? [<command>]  :: help for the nmcli commands\n"
@@ -1786,7 +1638,7 @@ msgstr ""
 "help/? [<command>]  :: Hilfe zu den nmcli-Befehlen\n"
 "\n"
 
-#: ../clients/cli/connections.c:6332
+#: ../clients/cli/connections.c:6000
 #, c-format
 msgid ""
 "nmcli [<conf-option> <value>]  :: nmcli configuration\n"
@@ -1813,7 +1665,7 @@ msgstr ""
 "           nmcli> nmcli save-confirmation no\n"
 "           nmcli> nmcli prompt-color 3\n"
 
-#: ../clients/cli/connections.c:6354 ../clients/cli/connections.c:6490
+#: ../clients/cli/connections.c:6022 ../clients/cli/connections.c:6159
 #, c-format
 msgid ""
 "quit  :: exit nmcli\n"
@@ -1826,8 +1678,8 @@ msgstr ""
 "Dieser Befehl beendet nmcli. Wenn die Verbindung in Bearbeitung nicht "
 "gespeichert ist wird der Benutzer gefragt, die Aktion zu bestätigen.\n"
 
-#: ../clients/cli/connections.c:6359 ../clients/cli/connections.c:6495
-#: ../clients/cli/connections.c:6914 ../clients/cli/connections.c:7841
+#: ../clients/cli/connections.c:6027 ../clients/cli/connections.c:6164
+#: ../clients/cli/connections.c:6600 ../clients/cli/connections.c:7557
 #, c-format
 msgid "Unknown command: '%s'\n"
 msgstr "Unbekannter Befehl: »%s«\n"
@@ -1835,7 +1687,7 @@ msgstr "Unbekannter Befehl: »%s«\n"
 #. TRANSLATORS: do not translate command names and keywords before ::
 #. *              However, you should translate terms enclosed in <>.
 #.
-#: ../clients/cli/connections.c:6424
+#: ../clients/cli/connections.c:6093
 #, c-format
 msgid ""
 "---[ Property menu ]---\n"
@@ -1864,7 +1716,7 @@ msgstr ""
 "ausgeben\n"
 "quit                             :: nmcli beenden\n"
 
-#: ../clients/cli/connections.c:6449
+#: ../clients/cli/connections.c:6118
 #, c-format
 msgid ""
 "set [<value>]  :: set new value\n"
@@ -1875,7 +1727,7 @@ msgstr ""
 "\n"
 "Dieser Befehl setzt den <Wert> für die Eigenschaft\n"
 
-#: ../clients/cli/connections.c:6453
+#: ../clients/cli/connections.c:6122
 #, c-format
 msgid ""
 "add [<value>]  :: append new value to the property\n"
@@ -1890,7 +1742,7 @@ msgstr ""
 "die Eigenschaft ein Container-Typ ist. Für einwertige Eigenschaften wird der "
 "Wert ersetzt (genau wie »set«).\n"
 
-#: ../clients/cli/connections.c:6459
+#: ../clients/cli/connections.c:6128
 #, c-format
 msgid ""
 "change  :: change current value\n"
@@ -1901,7 +1753,7 @@ msgstr ""
 "\n"
 "Zeigt den aktuellen Wert an und lässt ihn bearbeiten.\n"
 
-#: ../clients/cli/connections.c:6463
+#: ../clients/cli/connections.c:6132
 #, c-format
 msgid ""
 "remove [<value>|<index>|<option name>]  :: delete the value\n"
@@ -1936,7 +1788,7 @@ msgstr ""
 "          nmcli bond.options> remove downdelay\n"
 "\n"
 
-#: ../clients/cli/connections.c:6474
+#: ../clients/cli/connections.c:6143
 #, c-format
 msgid ""
 "describe  :: describe property\n"
@@ -1950,7 +1802,7 @@ msgstr ""
 "settings(5)« alle NetworkManager- Einstellungen und Eigenschaften "
 "nachlesen.\n"
 
-#: ../clients/cli/connections.c:6479
+#: ../clients/cli/connections.c:6148
 #, c-format
 msgid ""
 "print [property|setting|connection]  :: print property (setting, connection) "
@@ -1965,7 +1817,7 @@ msgstr ""
 "Zeigt Eigenschaftswerte an. Wenn Sie ein Argument angeben, werden auch Werte "
 "für die gesamten Einstellungen oder Verbindungen angezeigt.\n"
 
-#: ../clients/cli/connections.c:6487
+#: ../clients/cli/connections.c:6156
 #, c-format
 msgid ""
 "help/? [<command>]  :: help for nmcli commands\n"
@@ -1974,12 +1826,12 @@ msgstr ""
 "help/? [<command>]  :: Hilfe zu den nmcli-Befehlen\n"
 "\n"
 
-#: ../clients/cli/connections.c:6581
+#: ../clients/cli/connections.c:6250
 #, c-format
 msgid "Error: Connection activation failed.\n"
 msgstr "Fehler: Aktivierung der Verbindung ist gescheitert.\n"
 
-#: ../clients/cli/connections.c:6672
+#: ../clients/cli/connections.c:6345
 #, c-format
 msgid "Error: setting '%s' is mandatory and cannot be removed.\n"
 msgstr ""
@@ -1987,18 +1839,18 @@ msgstr ""
 "werden.\n"
 
 #. TRANSLATORS: status line in nmcli connection editor
-#: ../clients/cli/connections.c:6690
+#: ../clients/cli/connections.c:6363
 #, c-format
 msgid "[ Type: %s | Name: %s | UUID: %s | Dirty: %s | Temp: %s ]\n"
 msgstr "[ Typ: %s | Name: %s | UUID: %s | Dirty: %s | Temp: %s ]\n"
 
-#: ../clients/cli/connections.c:6726
+#: ../clients/cli/connections.c:6399
 #, c-format
 msgid "The connection is not saved. Do you really want to quit? %s"
 msgstr ""
 "Die Verbindung wurde noch nicht gespeichert. Möchten Sie wirklich beenden? %s"
 
-#: ../clients/cli/connections.c:6772
+#: ../clients/cli/connections.c:6448
 #, c-format
 msgid ""
 "The connection profile has been removed from another client. You may type "
@@ -2007,66 +1859,66 @@ msgstr ""
 "Das Verbindungsprofil wurde von einem anderen Client gelöscht. Sie können "
 "»save« im Hauptmenü eingeben, um es wiederherzustellen.\n"
 
-#: ../clients/cli/connections.c:6803 ../clients/cli/connections.c:7195
-#: ../clients/cli/connections.c:7253
+#: ../clients/cli/connections.c:6478 ../clients/cli/connections.c:6892
+#: ../clients/cli/connections.c:6950
 #, c-format
 msgid "Allowed values for '%s' property: %s\n"
 msgstr "Gültige Werte für Eigenschaft »%s«: %s\n"
 
-#: ../clients/cli/connections.c:6806 ../clients/cli/connections.c:7198
-#: ../clients/cli/connections.c:7256
+#: ../clients/cli/connections.c:6481 ../clients/cli/connections.c:6895
+#: ../clients/cli/connections.c:6953
 #, c-format
 msgid "Enter '%s' value: "
 msgstr "Geben Sie den Wert »%s« ein: "
 
-#: ../clients/cli/connections.c:6820 ../clients/cli/connections.c:6840
-#: ../clients/cli/connections.c:7202 ../clients/cli/connections.c:7261
+#: ../clients/cli/connections.c:6496 ../clients/cli/connections.c:6518
+#: ../clients/cli/connections.c:6899 ../clients/cli/connections.c:6958
 #, c-format
 msgid "Error: failed to set '%s' property: %s\n"
 msgstr "Fehler: Eigenschaft »%s« konnte nicht festgelegt werden: %s\n"
 
-#: ../clients/cli/connections.c:6834
+#: ../clients/cli/connections.c:6512
 #, c-format
 msgid "Edit '%s' value: "
 msgstr "Bearbeiten Sie den Wert »%s«: "
 
-#: ../clients/cli/connections.c:6860 ../clients/cli/settings.c:394
+#: ../clients/cli/connections.c:6541 ../clients/cli/settings.c:392
 #, c-format
 msgid "Error: %s\n"
 msgstr "Fehler: %s\n"
 
-#: ../clients/cli/connections.c:6866 ../clients/cli/connections.c:7356
-#: ../clients/cli/connections.c:7407
+#: ../clients/cli/connections.c:6547 ../clients/cli/connections.c:7053
+#: ../clients/cli/connections.c:7104
 #, c-format
 msgid "Error: failed to remove value of '%s': %s\n"
 msgstr "Fehler: Entfernen des Wertes »%s« ist fehlgeschlagen: %s\n"
 
-#: ../clients/cli/connections.c:6887
+#: ../clients/cli/connections.c:6568
 #, c-format
 msgid "Unknown command argument: '%s'\n"
 msgstr "Unbekanntes Befehlsargument: »%s«\n"
 
-#: ../clients/cli/connections.c:6977
+#: ../clients/cli/connections.c:6671
 #, c-format
 msgid "Available settings: %s\n"
 msgstr "Verfügbare Einstellungen: %s\n"
 
-#: ../clients/cli/connections.c:6989
+#: ../clients/cli/connections.c:6683
 #, c-format
 msgid "Error: invalid setting name; %s\n"
 msgstr "Fehler: Ungültiger Einstellungsname: %s\n"
 
-#: ../clients/cli/connections.c:7006
+#: ../clients/cli/connections.c:6700
 #, c-format
 msgid "Available properties: %s\n"
 msgstr "Verfügbare Eigenschaften: %s\n"
 
-#: ../clients/cli/connections.c:7014
+#: ../clients/cli/connections.c:6708
 #, c-format
 msgid "Error: property %s\n"
 msgstr "Fehler: Eigenschaft »%s«\n"
 
-#: ../clients/cli/connections.c:7055
+#: ../clients/cli/connections.c:6749
 #, c-format
 msgid ""
 "Saving the connection with 'autoconnect=yes'. That might result in an "
@@ -2077,12 +1929,12 @@ msgstr ""
 "gespeichert. Dadurch könnte die Verbindung sofort aktiviert werden.\n"
 "Möchten Sie wirklich speichern? %s"
 
-#: ../clients/cli/connections.c:7134
+#: ../clients/cli/connections.c:6832
 #, c-format
 msgid "You may edit the following settings: %s\n"
 msgstr "Sie können die folgenden Einstellungen bearbeiten: %s\n"
 
-#: ../clients/cli/connections.c:7163
+#: ../clients/cli/connections.c:6862
 #, c-format
 msgid ""
 "The connection profile has been removed from another client. You may type "
@@ -2091,217 +1943,221 @@ msgstr ""
 "Das Verbindungsprofil wurde von einem anderen Client gelöscht. Sie können "
 "»save« eingeben, um es wiederherzustellen.\n"
 
-#: ../clients/cli/connections.c:7206 ../clients/cli/connections.c:7451
-#: ../clients/cli/connections.c:7483
+#: ../clients/cli/connections.c:6903 ../clients/cli/connections.c:7148
+#: ../clients/cli/connections.c:7180
 #, c-format
 msgid "Error: no setting selected; valid are [%s]\n"
 msgstr "Fehler: Keine Einstellung gewählt. Gültig sind [%s]\n"
 
-#: ../clients/cli/connections.c:7207
+#: ../clients/cli/connections.c:6904
 #, c-format
 msgid "use 'goto <setting>' first, or 'set <setting>.<property>'\n"
 msgstr ""
 "Verwenden Sie zuerst »goto <Einstellung>«, oder »set <Einstellung>."
 "<Eigenschaft>«\n"
 
-#: ../clients/cli/connections.c:7222 ../clients/cli/connections.c:7383
-#: ../clients/cli/connections.c:7473
+#: ../clients/cli/connections.c:6919 ../clients/cli/connections.c:7080
+#: ../clients/cli/connections.c:7170
 #, c-format
 msgid "Error: invalid setting argument '%s'; valid are [%s]\n"
 msgstr "Fehler: Ungültiges Festlegen des Arguments »%s«. Gültig sind [%s]\n"
 
-#: ../clients/cli/connections.c:7231
+#: ../clients/cli/connections.c:6928
 #, c-format
 msgid "Error: missing setting for '%s' property\n"
 msgstr "Fehler: Fehlende Einstellung für die Eigenschaft »%s«\n"
 
-#: ../clients/cli/connections.c:7238
+#: ../clients/cli/connections.c:6935
 #, c-format
 msgid "Error: invalid property: %s\n"
 msgstr "Fehler: Ungültige Eigenschaft: %s\n"
 
-#: ../clients/cli/connections.c:7292
+#: ../clients/cli/connections.c:6989
 #, c-format
 msgid "Error: unknown setting '%s'\n"
 msgstr "Fehler: Unbekannte Einstellung »%s«\n"
 
-#: ../clients/cli/connections.c:7317
+#: ../clients/cli/connections.c:7014
 #, c-format
 msgid "You may edit the following properties: %s\n"
 msgstr "Sie können die folgenden Eigenschaften bearbeiten: %s\n"
 
-#: ../clients/cli/connections.c:7361
+#: ../clients/cli/connections.c:7058
 #, c-format
 msgid "Error: no argument given; valid are [%s]\n"
 msgstr "Fehler: Es wurde kein Argument angegeben; gültig sind [%s]\n"
 
-#: ../clients/cli/connections.c:7380
+#: ../clients/cli/connections.c:7077
 #, c-format
 msgid "Setting '%s' is not present in the connection.\n"
 msgstr "Die Einstellung »%s« ist in der Verbindung nicht vorhanden.\n"
 
-#: ../clients/cli/connections.c:7428
+#: ../clients/cli/connections.c:7125
 #, c-format
 msgid "Error: %s properties, nor it is a setting name.\n"
 msgstr "Fehler: %s Eigenschaft, noch ist es ein Einstellungsname.\n"
 
-#: ../clients/cli/connections.c:7452 ../clients/cli/connections.c:7484
+#: ../clients/cli/connections.c:7149 ../clients/cli/connections.c:7181
 #, c-format
 msgid "use 'goto <setting>' first, or 'describe <setting>.<property>'\n"
 msgstr ""
 "Verwenden Sie zuerst »goto <Einstellung>«, oder »describe <Einstellung>."
 "<Eigenschaft>«\n"
 
-#: ../clients/cli/connections.c:7507
+#: ../clients/cli/connections.c:7204
 #, c-format
 msgid "Error: invalid property: %s, neither a valid setting name.\n"
 msgstr "Fehler: Ungültige Eigenschaft: %s, kein gültiger Einstellungsname.\n"
 
-#: ../clients/cli/connections.c:7537
+#: ../clients/cli/connections.c:7234
 #, c-format
 msgid "Error: unknown setting: '%s'\n"
 msgstr "Fehler: Unbekannte Einstellung: »%s«\n"
 
-#: ../clients/cli/connections.c:7542
+#: ../clients/cli/connections.c:7239
 #, c-format
 msgid "Error: '%s' setting not present in the connection\n"
 msgstr "Fehler: Die Einstellung »%s« ist in der Verbindung nicht vorhanden.\n"
 
-#: ../clients/cli/connections.c:7573
+#: ../clients/cli/connections.c:7270
 #, c-format
 msgid "Error: invalid property: %s%s\n"
 msgstr "Fehler: ungültige Eigenschaft %s%s\n"
 
-#: ../clients/cli/connections.c:7575
+#: ../clients/cli/connections.c:7272
 msgid ", neither a valid setting name"
 msgstr ", noch ein gültiger Einstellungsname"
 
-#: ../clients/cli/connections.c:7591
+#: ../clients/cli/connections.c:7288
 #, c-format
 msgid "Invalid verify option: %s\n"
 msgstr "Ungültige Prüfungsoption: %s\n"
 
-#: ../clients/cli/connections.c:7599
+#: ../clients/cli/connections.c:7296
 #, c-format
 msgid "Verify setting '%s': %s\n"
 msgstr "Überprüfe Einstellung »%s«: %s\n"
 
-#: ../clients/cli/connections.c:7614
+#: ../clients/cli/connections.c:7311
 #, c-format
 msgid "Verify connection: %s\n"
 msgstr "Verbindung überprüfen: %s\n"
 
-#: ../clients/cli/connections.c:7617
+#: ../clients/cli/connections.c:7314
 #, c-format
 msgid "The error cannot be fixed automatically.\n"
 msgstr "Der Fehler kann nicht automatisch behoben werden.\n"
 
-#: ../clients/cli/connections.c:7634
+#: ../clients/cli/connections.c:7331
 #, c-format
 msgid "Error: invalid argument '%s'\n"
 msgstr "Fehler: Ungültiges Argument »%s«\n"
 
-#: ../clients/cli/connections.c:7666
+#: ../clients/cli/connections.c:7363
 #, c-format
 msgid "Error: Failed to save '%s' (%s) connection: %s\n"
 msgstr "Fehler: Speichern von »%s« (%s) ist fehlgeschlagen: %s\n"
 
-#: ../clients/cli/connections.c:7673
+#: ../clients/cli/connections.c:7370
 #, c-format
 msgid "Connection '%s' (%s) successfully saved.\n"
 msgstr "Verbindung »%s« (%s) erfolgreich gespeichert.\n"
 
-#: ../clients/cli/connections.c:7674
+#: ../clients/cli/connections.c:7371
 #, c-format
 msgid "Connection '%s' (%s) successfully updated.\n"
 msgstr "Verbindung »%s« (%s) erfolgreich aktualisiert.\n"
 
-#: ../clients/cli/connections.c:7706
+#: ../clients/cli/connections.c:7403
 #, c-format
 msgid "Error: connection verification failed: %s\n"
 msgstr "Fehler: Prüfung der Verbindung ist fehlgeschlagen: %s\n"
 
-#: ../clients/cli/connections.c:7707
+#: ../clients/cli/connections.c:7404
 msgid "(unknown error)"
 msgstr "(Unbekannter Fehler)"
 
-#: ../clients/cli/connections.c:7708
+#: ../clients/cli/connections.c:7405
 #, c-format
 msgid "You may try running 'verify fix' to fix errors.\n"
 msgstr "Versuchen Sie »verify fix« auszuführen, um Fehler zu beheben.\n"
 
-#: ../clients/cli/connections.c:7730
+#: ../clients/cli/connections.c:7427
 #, c-format
 msgid "Error: connection is not saved. Type 'save' first.\n"
 msgstr ""
 "Fehler: Verbindung ist nicht gespeichert. Geben Sie zuerst »save« ein.\n"
 
-#: ../clients/cli/connections.c:7734
+#: ../clients/cli/connections.c:7431
 #, c-format
 msgid "Error: connection is not valid: %s\n"
 msgstr "Fehler: Verbindung ist ungültig: %s\n"
 
-#: ../clients/cli/connections.c:7744
+#: ../clients/cli/connections.c:7441
 #, c-format
 msgid "Error: Cannot activate connection: %s.\n"
 msgstr "Fehler: Verbindung kann nicht aktiviert werden: %s.\n"
 
-#: ../clients/cli/connections.c:7753
+#: ../clients/cli/connections.c:7450
 #, c-format
 msgid "Error: Failed to activate '%s' (%s) connection: %s\n"
 msgstr "Fehler: Aktivieren der Verbindung »%s« (%s) ist fehlgeschlagen: %s\n"
 
-#: ../clients/cli/connections.c:7759
+#: ../clients/cli/connections.c:7456
 msgid "Monitoring connection activation (press any key to continue)\n"
 msgstr ""
 "Überwachen einer Verbindungsherstellung (drücken Sie eine beliebige Taste, "
 "um fortzusetzen)\n"
 
-#: ../clients/cli/connections.c:7795
+#: ../clients/cli/connections.c:7492
 #, c-format
 msgid "Error: status-line: %s\n"
 msgstr "Fehler: Statuszeile: %s\n"
 
-#: ../clients/cli/connections.c:7803
+#: ../clients/cli/connections.c:7500
 #, c-format
 msgid "Error: save-confirmation: %s\n"
 msgstr "Fehler: Speicherbestätigung: %s\n"
 
-#: ../clients/cli/connections.c:7811
+#: ../clients/cli/connections.c:7508
 #, c-format
 msgid "Error: show-secrets: %s\n"
 msgstr "Fehler: »show-secrets«: %s\n"
 
-#: ../clients/cli/connections.c:7818
+#: ../clients/cli/connections.c:7517
+#, c-format
+msgid "Error: bad color: %s\n"
+msgstr "Fehler: Falsche Farbe: %s\n"
+
+#: ../clients/cli/connections.c:7532
 #, c-format
 msgid "Current nmcli configuration:\n"
 msgstr "Aktuelle nmcli-Konfiguration:\n"
 
-#: ../clients/cli/connections.c:7826
+#: ../clients/cli/connections.c:7542
 #, c-format
 msgid "Invalid configuration option '%s'; allowed [%s]\n"
 msgstr "Ungültige Konfigurationsoption »%s«. Gültig sind [%s]\n"
 
-#: ../clients/cli/connections.c:8044
-#, fuzzy, c-format
-#| msgid "Error: only one of 'id', uuid, or 'path' can be provided."
-msgid "Error: only one of 'id', 'filename', uuid, or 'path' can be provided."
+#: ../clients/cli/connections.c:7762
+#, c-format
+msgid "Error: only one of 'id', uuid, or 'path' can be provided."
 msgstr ""
 "Fehler: es kann nur entweder »id«, »uuid« oder »path« festgelegt werden."
 
-#: ../clients/cli/connections.c:8058 ../clients/cli/connections.c:8218
+#: ../clients/cli/connections.c:7777 ../clients/cli/connections.c:7946
 #, c-format
 msgid "Error: Unknown connection '%s'."
 msgstr "Fehler: Unbekannte Verbindung »%s«."
 
-#: ../clients/cli/connections.c:8074
+#: ../clients/cli/connections.c:7795
 #, c-format
 msgid "Warning: editing existing connection '%s'; 'type' argument is ignored\n"
 msgstr ""
 "Warnung: bestehende Verbindung »%s« wird bearbeitet. Das Argument »type« "
 "wird ignoriert\n"
 
-#: ../clients/cli/connections.c:8077
+#: ../clients/cli/connections.c:7798
 #, c-format
 msgid ""
 "Warning: editing existing connection '%s'; 'con-name' argument is ignored\n"
@@ -2309,203 +2165,198 @@ msgstr ""
 "Warnung: bestehende Verbindung »%s« wird bearbeitet. Das Argument »con-name« "
 "wird ignoriert\n"
 
-#: ../clients/cli/connections.c:8104
+#: ../clients/cli/connections.c:7820
 #, c-format
 msgid "Valid connection types: %s\n"
 msgstr "Gültige Verbindungstypen: %s\n"
 
-#: ../clients/cli/connections.c:8106
+#: ../clients/cli/connections.c:7822
 #, c-format
 msgid "Error: invalid connection type; %s\n"
 msgstr "Fehler: Ungültiger Verbindungstyp: %s\n"
 
-#: ../clients/cli/connections.c:8141
+#: ../clients/cli/connections.c:7862
 #, c-format
 msgid "===| nmcli interactive connection editor |==="
 msgstr "===| nmcli interaktiver Verbindungs-Editor |==="
 
-#: ../clients/cli/connections.c:8144
+#: ../clients/cli/connections.c:7865
 #, c-format
 msgid "Editing existing '%s' connection: '%s'"
 msgstr "Bestehende Verbindung »%s« wird bearbeitet: »%s«"
 
-#: ../clients/cli/connections.c:8146
+#: ../clients/cli/connections.c:7867
 #, c-format
 msgid "Adding a new '%s' connection"
 msgstr "Neue »%s«-Verbindung hinzufügen"
 
-#: ../clients/cli/connections.c:8148
+#: ../clients/cli/connections.c:7869
 #, c-format
 msgid "Type 'help' or '?' for available commands."
 msgstr "Tippen Sie »help« oder »?«, um verfügbare Befehle anzuzeigen."
 
-#: ../clients/cli/connections.c:8150
-#, c-format
-msgid "Type 'print' to show all the connection properties."
-msgstr ""
-
-#: ../clients/cli/connections.c:8152
+#: ../clients/cli/connections.c:7871
 #, c-format
 msgid "Type 'describe [<setting>.<prop>]' for detailed property description."
 msgstr ""
 "Tippen Sie »describe [<Einstellung>.<Eigenschaft>]« für eine detaillierte "
 "Eigenschaftenbeschreibung."
 
-#: ../clients/cli/connections.c:8180
+#: ../clients/cli/connections.c:7906
 #, c-format
 msgid "Error: Failed to modify connection '%s': %s"
 msgstr "Fehler: Ändern der Verbindung »%s« ist fehlgeschlagen: %s"
 
-#: ../clients/cli/connections.c:8186
+#: ../clients/cli/connections.c:7913
 #, c-format
 msgid "Connection '%s' (%s) successfully modified.\n"
 msgstr "Verbindung »%s« (%s) erfolgreich bearbeitet.\n"
 
-#: ../clients/cli/connections.c:8262
+#: ../clients/cli/connections.c:7994
 #, c-format
 msgid "%s (%s) cloned as %s (%s).\n"
 msgstr "%s (%s) dupliziert als %s (%s).\n"
 
-#: ../clients/cli/connections.c:8327
+#: ../clients/cli/connections.c:8060
 msgid "New connection name: "
 msgstr "Neuer Verbindungsname: "
 
-#: ../clients/cli/connections.c:8329
+#: ../clients/cli/connections.c:8062
 #, c-format
 msgid "Error: <new name> argument is missing."
 msgstr "Fehler: Argument <neuer Name> fehlt."
 
-#: ../clients/cli/connections.c:8334 ../clients/cli/connections.c:8814
+#: ../clients/cli/connections.c:8068 ../clients/cli/connections.c:8570
 #, c-format
 msgid "Error: unknown extra argument: '%s'."
 msgstr "Fehler: Unbekannter zusätzlicher Parameter »%s«."
 
-#: ../clients/cli/connections.c:8379
+#: ../clients/cli/connections.c:8119
 #, c-format
 msgid "Error: not all connections deleted."
 msgstr "Fehler: Es wurden nicht alle aktiven Verbindungen gelöscht."
 
-#: ../clients/cli/connections.c:8380
+#: ../clients/cli/connections.c:8120
 #, c-format
 msgid "Error: Connection deletion failed: %s"
 msgstr "Fehler: Löschen der Verbindung fehlgeschlagen: %s"
 
-#: ../clients/cli/connections.c:8436 ../clients/cli/connections.c:8557
+#: ../clients/cli/connections.c:8181 ../clients/cli/connections.c:8306
 #, c-format
 msgid "Error: %s.\n"
 msgstr "Fehler: %s.\n"
 
-#: ../clients/cli/connections.c:8437 ../clients/cli/connections.c:8558
+#: ../clients/cli/connections.c:8182 ../clients/cli/connections.c:8307
 #, c-format
 msgid "Error: not all connections found."
 msgstr "Fehler: Es wurden nicht alle Verbindungen gefunden."
 
 #. truncate trailing ", "
-#: ../clients/cli/connections.c:8488
+#: ../clients/cli/connections.c:8225
 #, c-format
 msgid "Error: cannot delete unknown connection(s): %s."
 msgstr ""
 "Fehler: Unbekannte Verbindung(en) »%s« kann/können nicht gelöscht werden."
 
-#: ../clients/cli/connections.c:8498
+#: ../clients/cli/connections.c:8237
 #, c-format
 msgid "%s: connection profile changed\n"
 msgstr "%s: Verbindungsprofil hat sich geändert\n"
 
-#: ../clients/cli/connections.c:8524
+#: ../clients/cli/connections.c:8263
 #, c-format
 msgid "%s: connection profile created\n"
 msgstr "%s: Verbindungsprofil wurde erstellt\n"
 
-#: ../clients/cli/connections.c:8533
+#: ../clients/cli/connections.c:8272
 #, c-format
 msgid "%s: connection profile removed\n"
 msgstr "%s: Verbindungsprofil wurde entfernt\n"
 
-#: ../clients/cli/connections.c:8595
+#: ../clients/cli/connections.c:8335
 #, c-format
 msgid "Error: failed to reload connections: %s."
 msgstr "Fehler: Erneutes Laden der Verbindung ist gescheitert: %s."
 
-#: ../clients/cli/connections.c:8628
+#: ../clients/cli/connections.c:8368
 #, c-format
 msgid "Error: failed to load connection: %s."
 msgstr "Fehler: Laden der Verbindung ist gescheitert: %s."
 
-#: ../clients/cli/connections.c:8636
+#: ../clients/cli/connections.c:8376
 #, c-format
 msgid "Could not load file '%s'\n"
 msgstr "Datei »%s« konnte nicht geladen werden\n"
 
-#: ../clients/cli/connections.c:8643
+#: ../clients/cli/connections.c:8383
 msgid "File to import: "
 msgstr "Datei zum Importieren: "
 
-#: ../clients/cli/connections.c:8674
+#: ../clients/cli/connections.c:8414
 #, c-format
 msgid "Error: No arguments provided."
 msgstr "Fehler: Es wurden keine Argumente angegeben."
 
-#: ../clients/cli/connections.c:8697
+#: ../clients/cli/connections.c:8439
 #, c-format
 msgid "Warning: 'type' already specified, ignoring extra one.\n"
 msgstr "Warnung: »type« ist bereits angegeben, wird ignoriert.\n"
 
-#: ../clients/cli/connections.c:8711
+#: ../clients/cli/connections.c:8454
 #, c-format
 msgid "Warning: 'file' already specified, ignoring extra one.\n"
 msgstr "Warnung: »file« ist bereits angegeben, wird ignoriert.\n"
 
-#: ../clients/cli/connections.c:8713
+#: ../clients/cli/connections.c:8456
 #, c-format
 msgid "Unknown parameter: %s"
 msgstr "Unbekannter Parameter: %s"
 
-#: ../clients/cli/connections.c:8724
+#: ../clients/cli/connections.c:8468
 #, c-format
 msgid "Error: 'type' argument is required."
 msgstr "Fehler: Das Argument »type« ist notwendig."
 
-#: ../clients/cli/connections.c:8728
+#: ../clients/cli/connections.c:8473
 #, c-format
 msgid "Error: 'file' argument is required."
 msgstr "Fehler: Das Argument »file« ist notwendig."
 
-#: ../clients/cli/connections.c:8734
+#: ../clients/cli/connections.c:8480
 #, c-format
 msgid "Error: failed to find VPN plugin for %s."
 msgstr "Fehler: VPN-Erweiterung für %s konnte nicht gefunden werden."
 
-#: ../clients/cli/connections.c:8741 ../clients/cli/connections.c:8833
+#: ../clients/cli/connections.c:8488 ../clients/cli/connections.c:8589
 #, c-format
 msgid "Error: failed to load VPN plugin: %s."
 msgstr "Fehler: Laden der VPN-Erweiterung ist gescheitert: %s."
 
-#: ../clients/cli/connections.c:8748
+#: ../clients/cli/connections.c:8496
 #, c-format
 msgid "Error: failed to import '%s': %s."
 msgstr "Fehler: Importieren von »%s« ist fehlgeschlagen: %s."
 
-#: ../clients/cli/connections.c:8820
+#: ../clients/cli/connections.c:8576
 msgid "Output file name: "
 msgstr "Dateiname zur Ausgabe: "
 
-#: ../clients/cli/connections.c:8824
+#: ../clients/cli/connections.c:8580
 #, c-format
 msgid "Error: the connection is not VPN."
 msgstr "Fehler: Verbindung ist kein VPN."
 
-#: ../clients/cli/connections.c:8846
+#: ../clients/cli/connections.c:8601
 #, c-format
 msgid "Error: failed to create temporary file %s."
 msgstr "Fehler: Temporäre Datei konnte nicht erstellt werden: %s."
 
-#: ../clients/cli/connections.c:8854
+#: ../clients/cli/connections.c:8610
 #, c-format
 msgid "Error: failed to export '%s': %s."
 msgstr "Fehler: Exportieren von »%s« ist fehlgeschlagen: %s."
 
-#: ../clients/cli/connections.c:8866
+#: ../clients/cli/connections.c:8621
 #, c-format
 msgid "Error: failed to read temporary file '%s': %s."
 msgstr "Fehler: Lesen der temporären Datei »%s« ist fehlgeschlagen: %s."
@@ -2519,29 +2370,7 @@ msgstr "Schnittstelle: "
 msgid "Interface(s): "
 msgstr "Schnittstelle(n): "
 
-#: ../clients/cli/devices.c:73 ../clients/cli/devices.c:1266
-msgid "(none)"
-msgstr "(keine)"
-
-#: ../clients/cli/devices.c:175 ../clients/cli/devices.c:182
-msgid "(unknown)"
-msgstr "(unbekannt)"
-
-#: ../clients/cli/devices.c:316
-#, c-format
-msgid "<invisible> | %s"
-msgstr "<unsichtbar> | %s"
-
-#: ../clients/cli/devices.c:317
-msgid "<invisible>"
-msgstr "<Unsichtbar>"
-
-#: ../clients/cli/devices.c:418
-#, c-format
-msgid "%u Mb/s"
-msgstr "%u Mb/s"
-
-#: ../clients/cli/devices.c:672
+#: ../clients/cli/devices.c:254
 #, c-format
 msgid ""
 "Usage: nmcli device { COMMAND | help }\n"
@@ -2620,7 +2449,7 @@ msgstr ""
 "  lldp [list [ifname <Schnittstellenname>]]\n"
 "\n"
 
-#: ../clients/cli/devices.c:695
+#: ../clients/cli/devices.c:277
 #, c-format
 msgid ""
 "Usage: nmcli device status { help }\n"
@@ -2651,7 +2480,7 @@ msgstr ""
 "status« auf.\n"
 "\n"
 
-#: ../clients/cli/devices.c:710
+#: ../clients/cli/devices.c:292
 #, c-format
 msgid ""
 "Usage: nmcli device show { ARGUMENTS | help }\n"
@@ -2671,7 +2500,7 @@ msgstr ""
 "Gerät auf.\n"
 "\n"
 
-#: ../clients/cli/devices.c:721
+#: ../clients/cli/devices.c:303
 #, c-format
 msgid ""
 "Usage: nmcli device connect { ARGUMENTS | help }\n"
@@ -2696,7 +2525,7 @@ msgstr ""
 "Verbindung konfiguriert sind.\n"
 "\n"
 
-#: ../clients/cli/devices.c:733
+#: ../clients/cli/devices.c:315
 #, c-format
 msgid ""
 "Usage: nmcli device reapply { ARGUMENTS | help }\n"
@@ -2715,7 +2544,7 @@ msgstr ""
 "zu aktualisieren, die seit der letzten Umsetzung gemacht wurden.\n"
 "\n"
 
-#: ../clients/cli/devices.c:744
+#: ../clients/cli/devices.c:326
 #, c-format
 msgid ""
 "Usage: nmcli device modify { ARGUMENTS | --help }\n"
@@ -2757,7 +2586,7 @@ msgstr ""
 "nmcli dev mod em1 -ipv4.dns 1\n"
 "nmcli dev mod em1 -ipv6.addr \"abbe::cafe/56\"\n"
 
-#: ../clients/cli/devices.c:764
+#: ../clients/cli/devices.c:346
 #, c-format
 msgid ""
 "Usage: nmcli device disconnect { ARGUMENTS | help }\n"
@@ -2778,7 +2607,7 @@ msgstr ""
 "Benutzereingriff weiterhin automatisch neu zu verbinden.\n"
 "\n"
 
-#: ../clients/cli/devices.c:776
+#: ../clients/cli/devices.c:358
 #, c-format
 msgid ""
 "Usage: nmcli device delete { ARGUMENTS | help }\n"
@@ -2801,7 +2630,7 @@ msgstr ""
 "können mit diesem Befehl nicht entfernt werden.\n"
 "\n"
 
-#: ../clients/cli/devices.c:789
+#: ../clients/cli/devices.c:371
 #, c-format
 msgid ""
 "Usage: nmcli device set { ARGUMENTS | help }\n"
@@ -2824,7 +2653,7 @@ msgstr ""
 "Geräte-Eigenschaften verändern.\n"
 "\n"
 
-#: ../clients/cli/devices.c:802
+#: ../clients/cli/devices.c:384
 #, c-format
 msgid ""
 "Usage: nmcli device monitor { ARGUMENTS | help }\n"
@@ -2847,7 +2676,7 @@ msgstr ""
 "angegeben wird.\n"
 "\n"
 
-#: ../clients/cli/devices.c:814
+#: ../clients/cli/devices.c:396
 #, c-format
 msgid ""
 "Usage: nmcli device wifi { ARGUMENTS | help }\n"
@@ -2960,7 +2789,7 @@ msgstr ""
 "Zugangspunkte nicht anzeigt. Verwenden Sie dazu »nmcli device wifi list«.\n"
 "\n"
 
-#: ../clients/cli/devices.c:861
+#: ../clients/cli/devices.c:443
 #, c-format
 msgid ""
 "Usage: nmcli device lldp { ARGUMENTS | help }\n"
@@ -2981,283 +2810,298 @@ msgstr ""
 "auf einer bestimmten Schnittstelle aufzulisten.\n"
 "\n"
 
-#: ../clients/cli/devices.c:1015
+#: ../clients/cli/devices.c:597
 #, c-format
 msgid "Error: No interface specified."
 msgstr "Fehler: Es muss eine Schnittstelle angegeben werden."
 
-#: ../clients/cli/devices.c:1038
+#: ../clients/cli/devices.c:620
 #, c-format
 msgid "Warning: argument '%s' is duplicated.\n"
 msgstr "Warnung: Argument »%s« ist mehrfach vorhanden.\n"
 
-#: ../clients/cli/devices.c:1041
+#: ../clients/cli/devices.c:623
 #, c-format
 msgid "Error: Device '%s' not found.\n"
 msgstr "Fehler: Gerät »%s« wurde nicht gefunden.\n"
 
-#: ../clients/cli/devices.c:1042
+#: ../clients/cli/devices.c:624
 #, c-format
 msgid "Error: not all devices found."
 msgstr "Fehler: Es wurden nicht alle Geräte gefunden."
 
-#: ../clients/cli/devices.c:1071
+#: ../clients/cli/devices.c:653
 msgid "No interface specified"
 msgstr "Keine Schnittstelle angegeben"
 
-#: ../clients/cli/devices.c:1090
+#: ../clients/cli/devices.c:672
 #, c-format
 msgid "Device '%s' not found"
 msgstr "Gerät »%s« wurde nicht gefunden"
 
-#: ../clients/cli/devices.c:1186
+#: ../clients/cli/devices.c:758 ../clients/cli/devices.c:910
+msgid "(none)"
+msgstr "(keine)"
+
+#: ../clients/cli/devices.c:829
 #, c-format
 msgid "%u MHz"
 msgstr "%u MHz"
 
-#: ../clients/cli/devices.c:1187
+#: ../clients/cli/devices.c:830
 #, c-format
 msgid "%u Mbit/s"
 msgstr "%u Mbit/s"
 
-#: ../clients/cli/devices.c:1198
+#: ../clients/cli/devices.c:841
 msgid "WEP"
 msgstr "WEP"
 
-#: ../clients/cli/devices.c:1202
+#: ../clients/cli/devices.c:845
 msgid "WPA1"
 msgstr "WPA1"
 
-#: ../clients/cli/devices.c:1206
+#: ../clients/cli/devices.c:849
 msgid "WPA2"
 msgstr "WPA2"
 
-#: ../clients/cli/devices.c:1211
+#: ../clients/cli/devices.c:854
 msgid "802.1X"
 msgstr "802.1X"
 
-#: ../clients/cli/devices.c:1226
+#: ../clients/cli/devices.c:869
 msgid "Ad-Hoc"
 msgstr "Ad-Hoc"
 
-#: ../clients/cli/devices.c:1227
+#: ../clients/cli/devices.c:870
 msgid "Infra"
 msgstr "Infra"
 
-#: ../clients/cli/devices.c:1228
+#: ../clients/cli/devices.c:871
 msgid "N/A"
 msgstr "N.V."
 
-#: ../clients/cli/devices.c:1423
+#: ../clients/cli/devices.c:1085
 msgid "Device details"
 msgstr "Geräteinformationen"
 
-#: ../clients/cli/devices.c:1434
+#: ../clients/cli/devices.c:1096
 #, c-format
 msgid "Error: 'device show': %s"
 msgstr "Fehler: »device show«: %s"
 
-#: ../clients/cli/devices.c:1732
-msgid "Status of devices"
-msgstr "Status der Geräte"
+#: ../clients/cli/devices.c:1161 ../clients/cli/devices.c:1164
+msgid "(unknown)"
+msgstr "(unbekannt)"
 
-#: ../clients/cli/devices.c:1736
+#: ../clients/cli/devices.c:1207
+#, c-format
+msgid "%u Mb/s"
+msgstr "%u Mb/s"
+
+#: ../clients/cli/devices.c:1310
+msgid "on"
+msgstr "an"
+
+#: ../clients/cli/devices.c:1310
+msgid "off"
+msgstr "aus"
+
+#: ../clients/cli/devices.c:1544
 #, c-format
 msgid "Error: 'device status': %s"
 msgstr "Fehler: »device status«: %s"
 
-#: ../clients/cli/devices.c:1763 ../clients/cli/devices.c:2218
-#: ../clients/cli/devices.c:4100
+#: ../clients/cli/devices.c:1558
+msgid "Status of devices"
+msgstr "Status der Geräte"
+
+#: ../clients/cli/devices.c:1584 ../clients/cli/devices.c:2039
+#: ../clients/cli/devices.c:3817
 #, c-format
 msgid "Error: invalid extra argument '%s'."
 msgstr "Fehler: Ungültiger zusätzlicher Parameter »%s«."
 
-#: ../clients/cli/devices.c:1799 ../clients/cli/general.c:539
+#: ../clients/cli/devices.c:1620 ../clients/cli/general.c:555
 #, c-format
 msgid "Error: Timeout %d sec expired."
 msgstr "Fehler: Zeitbeschränkung von %d Sekunden ist abgelaufen."
 
-#: ../clients/cli/devices.c:1848
+#: ../clients/cli/devices.c:1669
 #, c-format
 msgid "Device '%s' successfully activated with '%s'.\n"
 msgstr "Gerät »%s« wurde erfolgreich mit »%s« aktiviert.\n"
 
-#: ../clients/cli/devices.c:1854
+#: ../clients/cli/devices.c:1675
 #, c-format
 msgid "Error: Connection activation failed: (%d) %s.\n"
 msgstr "Fehler: Aktivierung der Verbindung ist gescheitert: (%d) %s.\n"
 
-#: ../clients/cli/devices.c:1890
+#: ../clients/cli/devices.c:1711
 #, c-format
 msgid "Error: Failed to setup a Wi-Fi hotspot: %s"
 msgstr "Fehler: Einrichten eines WLAN-Zugangspunkts schlug fehl: %s"
 
-#: ../clients/cli/devices.c:1893
+#: ../clients/cli/devices.c:1714
 #, c-format
 msgid "Error: Failed to add/activate new connection: %s"
 msgstr "Fehler: Neue Verbindung konnte nicht hinzugefügt/aktiviert werden: %s"
 
-#: ../clients/cli/devices.c:1903
+#: ../clients/cli/devices.c:1724
 #, c-format
 msgid "Error: Failed to setup a Wi-Fi hotspot"
 msgstr "Fehler: Einrichten eines WLAN-Zugangspunkts schlug fehl"
 
-#: ../clients/cli/devices.c:1905
+#: ../clients/cli/devices.c:1726
 #, c-format
 msgid "Error: Failed to add/activate new connection: Unknown error"
 msgstr ""
 "Fehler: Neue Verbindung konnte nicht hinzugefügt und aktiviert werden: "
 "Unbekannter Fehler"
 
-#: ../clients/cli/devices.c:1917
+#: ../clients/cli/devices.c:1738
 #, c-format
 msgid "Connection with UUID '%s' created and activated on device '%s'\n"
 msgstr ""
 "Verbindung mit der UUID »%s« wurde erstellt und auf dem Gerät »%s« "
 "aktiviert\n"
 
-#: ../clients/cli/devices.c:1920
+#: ../clients/cli/devices.c:1741
 #, c-format
 msgid "Hotspot '%s' activated on device '%s'\n"
 msgstr "Zugangspunkt »%s« wurde auf dem Gerät »%s« aktiviert\n"
 
-#: ../clients/cli/devices.c:1984
+#: ../clients/cli/devices.c:1805
 #, c-format
 msgid "Error: Device activation failed: %s"
 msgstr "Fehler: Aktivierung des Geräts ist gescheitert: %s"
 
-#: ../clients/cli/devices.c:1993
+#: ../clients/cli/devices.c:1814
 #, c-format
 msgid "Error: Device activation failed: device was disconnected"
 msgstr "Fehler: Aktivierung des Geräts ist gescheitert: Gerät war getrennt"
 
-#: ../clients/cli/devices.c:2008
+#: ../clients/cli/devices.c:1829
 #, c-format
 msgid "Device '%s' has been connected.\n"
 msgstr "Gerät »%s« hat sich verbunden.\n"
 
-#: ../clients/cli/devices.c:2049
+#: ../clients/cli/devices.c:1870
 #, c-format
 msgid "Error: extra argument not allowed: '%s'."
 msgstr "Fehler: Zusätzlicher Parameter nicht erlaubt: »%s«."
 
-#: ../clients/cli/devices.c:2121 ../clients/cli/devices.c:2136
-#: ../clients/cli/devices.c:2366
+#: ../clients/cli/devices.c:1942 ../clients/cli/devices.c:1957
+#: ../clients/cli/devices.c:2187
 #, c-format
 msgid "Device '%s' successfully disconnected.\n"
 msgstr "Gerät »%s« wurde erfolgreich getrennt.\n"
 
-#: ../clients/cli/devices.c:2124
+#: ../clients/cli/devices.c:1945
 #, c-format
 msgid "Device '%s' successfully removed.\n"
 msgstr "Gerät »%s« wurde erfolgreich entfernt.\n"
 
-#: ../clients/cli/devices.c:2183 ../clients/cli/devices.c:2253
+#: ../clients/cli/devices.c:2004 ../clients/cli/devices.c:2074
 #, c-format
 msgid "Error: Reapplying connection to device '%s' (%s) failed: %s"
 msgstr ""
 "Fehler: Erneutes Anwenden der Verbindung auf Gerät »%s« (%s) ist "
 "gescheitert: %s"
 
-#: ../clients/cli/devices.c:2193 ../clients/cli/devices.c:2262
+#: ../clients/cli/devices.c:2014 ../clients/cli/devices.c:2083
 #, c-format
 msgid "Connection successfully reapplied to device '%s'.\n"
 msgstr "Verbindung wurde erfolgreich erneut angewendet auf Gerät »%s«.\n"
 
-#: ../clients/cli/devices.c:2287
+#: ../clients/cli/devices.c:2108
 #, c-format
 msgid "Error: Reading applied connection from device '%s' (%s) failed: %s"
 msgstr ""
 "Fehler: Lesen der angewendeten Verbindung von Gerät »%s« (%s) ist "
 "gescheitert: %s"
 
-#: ../clients/cli/devices.c:2351
+#: ../clients/cli/devices.c:2172
 #, c-format
 msgid "Error: not all devices disconnected."
 msgstr "Fehler: Es wurden nicht alle Geräte getrennt."
 
-#: ../clients/cli/devices.c:2352
+#: ../clients/cli/devices.c:2173
 #, c-format
 msgid "Error: Device '%s' (%s) disconnecting failed: %s\n"
 msgstr "Fehler: Trennung des Gerätes »%s« (%s) ist gescheitert: %s\n"
 
-#: ../clients/cli/devices.c:2430
+#: ../clients/cli/devices.c:2251
 #, c-format
 msgid "Error: not all devices deleted."
 msgstr "Fehler: Es wurden nicht alle Geräte gelöscht."
 
-#: ../clients/cli/devices.c:2431
+#: ../clients/cli/devices.c:2252
 #, c-format
 msgid "Error: Device '%s' (%s) deletion failed: %s\n"
 msgstr "Fehler: Löschen des Gerätes »%s« (%s) ist gescheitert: %s\n"
 
-#: ../clients/cli/devices.c:2515
+#: ../clients/cli/devices.c:2336
 #, c-format
 msgid "Error: No property specified."
 msgstr "Fehler: Keine Eigenschaft angegeben."
 
-#: ../clients/cli/devices.c:2530 ../clients/cli/devices.c:2547
-#: ../clients/cli/general.c:713 ../clients/cli/general.c:725
+#: ../clients/cli/devices.c:2351 ../clients/cli/devices.c:2368
+#: ../clients/cli/general.c:724 ../clients/cli/general.c:736
 #, c-format
 msgid "Error: '%s' argument is missing."
 msgstr "Fehler: Argument »%s« fehlt."
 
-#: ../clients/cli/devices.c:2536
+#: ../clients/cli/devices.c:2357
 #, c-format
 msgid "Error: 'managed': %s."
 msgstr "Fehler: »managed«: %s."
 
-#: ../clients/cli/devices.c:2553
+#: ../clients/cli/devices.c:2374
 #, c-format
 msgid "Error: 'autoconnect': %s."
 msgstr "Fehler: »autoconnect«: %s."
 
-#: ../clients/cli/devices.c:2561 ../clients/cli/general.c:739
+#: ../clients/cli/devices.c:2382 ../clients/cli/general.c:750
 #, c-format
 msgid "Error: property '%s' is not known."
 msgstr "Fehler: Eigenschaft »%s« ist unbekannt."
 
-#: ../clients/cli/devices.c:2610
+#: ../clients/cli/devices.c:2432
 #, c-format
 msgid "%s: using connection '%s'\n"
 msgstr "%s: Verbindung »%s« wird verwendet\n"
 
-#: ../clients/cli/devices.c:2636
+#: ../clients/cli/devices.c:2458
 #, c-format
 msgid "%s: device created\n"
 msgstr "%s: Grerät angelegt\n"
 
-#: ../clients/cli/devices.c:2643
+#: ../clients/cli/devices.c:2465
 #, c-format
 msgid "%s: device removed\n"
 msgstr "%s: Das Gerät wurde entfernt\n"
 
-#: ../clients/cli/devices.c:2818
+#: ../clients/cli/devices.c:2663
 msgid "Wi-Fi scan list"
 msgstr "Suchliste des WLAN"
 
-#: ../clients/cli/devices.c:2895
-#, c-format
-msgid "Error: Access point with bssid '%s' not found."
-msgstr "Fehler: Zugangspunkt mit der BSSID »%s« nicht gefunden."
-
-#: ../clients/cli/devices.c:3085
+#: ../clients/cli/devices.c:2712
 #, c-format
 msgid "Error: 'device wifi': %s"
 msgstr "Fehler: »device wifi«: %s"
 
-#: ../clients/cli/devices.c:3103
-#, fuzzy, c-format
-#| msgid "Error: invalid setting argument '%s'; valid are [%s]\n"
-msgid "Error: invalid rescan argument: '%s' not among [auto, no, yes]"
-msgstr "Fehler: Ungültiges Festlegen des Arguments »%s«. Gültig sind [%s]\n"
-
-#: ../clients/cli/devices.c:3110
+#: ../clients/cli/devices.c:2724
 #, c-format
 msgid "Error: Device '%s' not found."
 msgstr "Fehler: Gerät »%s« wurde nicht gefunden."
 
-#: ../clients/cli/devices.c:3120
+#: ../clients/cli/devices.c:2745 ../clients/cli/devices.c:2831
+#, c-format
+msgid "Error: Access point with bssid '%s' not found."
+msgstr "Fehler: Zugangspunkt mit der BSSID »%s« nicht gefunden."
+
+#: ../clients/cli/devices.c:2773
 #, c-format
 msgid ""
 "Error: Device '%s' was not recognized as a Wi-Fi device, check "
@@ -3266,27 +3110,27 @@ msgstr ""
 "Fehler: Gerät »%s« ist kein WLAN-Gerät. Prüfen Sie die WLAN-Erweiterung in "
 "NetworkManager."
 
-#: ../clients/cli/devices.c:3124 ../clients/cli/devices.c:3342
-#: ../clients/cli/devices.c:3779 ../clients/cli/devices.c:3938
+#: ../clients/cli/devices.c:2777 ../clients/cli/devices.c:3060
+#: ../clients/cli/devices.c:3495 ../clients/cli/devices.c:3654
 #, c-format
 msgid "Error: Device '%s' is not a Wi-Fi device."
 msgstr "Fehler: Gerät »%s« ist kein WLAN-Gerät."
 
-#: ../clients/cli/devices.c:3191
+#: ../clients/cli/devices.c:2909
 msgid "SSID or BSSID: "
 msgstr "SSID oder BSSID: "
 
-#: ../clients/cli/devices.c:3196
+#: ../clients/cli/devices.c:2914
 #, c-format
 msgid "Error: SSID or BSSID are missing."
 msgstr "Fehler: SSID oder BSSID fehlt."
 
-#: ../clients/cli/devices.c:3233
+#: ../clients/cli/devices.c:2951
 #, c-format
 msgid "Error: bssid argument value '%s' is not a valid BSSID."
 msgstr "Fehler: Der Wert »%s« des BSSID-Arguments ist keine gültige BSSID."
 
-#: ../clients/cli/devices.c:3263
+#: ../clients/cli/devices.c:2981
 #, c-format
 msgid ""
 "Error: wep-key-type argument value '%s' is invalid, use 'key' or 'phrase'."
@@ -3294,45 +3138,45 @@ msgstr ""
 "Fehler: Wert des Arguments wep-key-type »%s« ist ungültig, verwenden Sie "
 "stattdessen »key« oder »phrase«."
 
-#: ../clients/cli/devices.c:3290 ../clients/cli/devices.c:3308
+#: ../clients/cli/devices.c:3008 ../clients/cli/devices.c:3026
 #, c-format
 msgid "Error: %s: %s."
 msgstr "Fehler: %s: %s."
 
-#: ../clients/cli/devices.c:3325
+#: ../clients/cli/devices.c:3043
 #, c-format
 msgid "Error: BSSID to connect to (%s) differs from bssid argument (%s)."
 msgstr ""
 "Fehler: BSSID für die Verbindung (%s) entspricht nicht dem bssid-Argument "
 "(%s)."
 
-#: ../clients/cli/devices.c:3331
+#: ../clients/cli/devices.c:3049
 #, c-format
 msgid "Error: Parameter '%s' is neither SSID nor BSSID."
 msgstr "Fehler: Parameter »%s« ist weder SSID noch BSSID."
 
-#: ../clients/cli/devices.c:3344 ../clients/cli/devices.c:3781
-#: ../clients/cli/devices.c:3940
+#: ../clients/cli/devices.c:3062 ../clients/cli/devices.c:3497
+#: ../clients/cli/devices.c:3656
 #, c-format
 msgid "Error: No Wi-Fi device found."
 msgstr "Fehler: Es wurde kein WLAN-Gerät gefunden."
 
-#: ../clients/cli/devices.c:3364
+#: ../clients/cli/devices.c:3082
 #, c-format
 msgid "Error: Failed to scan hidden SSID: %s."
 msgstr "Fehler: Suche nach verborgener SSID ist fehlgeschlagen: %s."
 
-#: ../clients/cli/devices.c:3391
+#: ../clients/cli/devices.c:3109
 #, c-format
 msgid "Error: No network with SSID '%s' found."
 msgstr "Fehler: Es wurde kein Netzwerk mit SSID »%s« gefunden."
 
-#: ../clients/cli/devices.c:3393
+#: ../clients/cli/devices.c:3111
 #, c-format
 msgid "Error: No access point with BSSID '%s' found."
 msgstr "Fehler: Es wurde kein Zugangspunkt mit BSSID »%s« gefunden."
 
-#: ../clients/cli/devices.c:3435
+#: ../clients/cli/devices.c:3153
 #, c-format
 msgid ""
 "Warning: '%s' should be SSID for hidden APs; but it looks like a BSSID.\n"
@@ -3340,73 +3184,73 @@ msgstr ""
 "Warnung: »%s« sollte eine SSID für verborgene Zugangspunkte sein. Es scheint "
 "aber eine BSSID zu sein.\n"
 
-#: ../clients/cli/devices.c:3451
+#: ../clients/cli/devices.c:3167
 msgid "Password: "
 msgstr "Passwort: "
 
-#: ../clients/cli/devices.c:3600
+#: ../clients/cli/devices.c:3316
 #, c-format
 msgid "'%s' is not valid WPA PSK"
 msgstr "»%s« ist kein gültiger WPA-PSK"
 
-#: ../clients/cli/devices.c:3617
+#: ../clients/cli/devices.c:3333
 #, c-format
 msgid "'%s' is not valid WEP key (it should be 5 or 13 ASCII chars)"
 msgstr ""
 "»%s« ist kein gültiger WEP-Schlüssel (er muss entweder 5 oder 13 Zeichen "
 "lang sein)"
 
-#: ../clients/cli/devices.c:3633
+#: ../clients/cli/devices.c:3349
 #, c-format
 msgid "Hotspot password: %s\n"
 msgstr "Passwort des Zugangspunkts: %s\n"
 
-#: ../clients/cli/devices.c:3704
+#: ../clients/cli/devices.c:3420
 #, c-format
 msgid "Error: ssid is too long."
 msgstr "Fehler: »SSID« ist zu lang."
 
-#: ../clients/cli/devices.c:3718
+#: ../clients/cli/devices.c:3434
 #, c-format
 msgid "Error: band argument value '%s' is invalid; use 'a' or 'bg'."
 msgstr "Fehler: Bandparameter »%s« ist ungültig. Verwenden Sie »a« oder »bg«."
 
-#: ../clients/cli/devices.c:3743
+#: ../clients/cli/devices.c:3459
 #, c-format
 msgid "Error: Unknown parameter %s."
 msgstr "Fehler: Unbekannter Parameter: %s."
 
-#: ../clients/cli/devices.c:3763
+#: ../clients/cli/devices.c:3479
 #, c-format
 msgid "Error: channel requires band too."
 msgstr "Fehler: Ein Kanal erfordert auch die Angabe eines Bandes."
 
-#: ../clients/cli/devices.c:3768
+#: ../clients/cli/devices.c:3484
 #, c-format
 msgid "Error: channel '%s' not valid for band '%s'."
 msgstr "Fehler: Kanal »%s« ist ungültig für das Band »%s«."
 
-#: ../clients/cli/devices.c:3792
+#: ../clients/cli/devices.c:3508
 #, c-format
 msgid "Error: Device '%s' supports neither AP nor Ad-Hoc mode."
 msgstr "Fehler: Gerät »%s« unterstützt weder Infrastruktur- noch Ad-Hoc-Modus."
 
-#: ../clients/cli/devices.c:3826
+#: ../clients/cli/devices.c:3542
 #, c-format
 msgid "Error: Invalid 'password': %s."
 msgstr "Fehler: Ungültiges »password«: %s."
 
-#: ../clients/cli/devices.c:3901
+#: ../clients/cli/devices.c:3617
 #, c-format
 msgid "Error: '%s' cannot repeat."
 msgstr "Fehler: »%s« darf sich nicht wiederholen."
 
 #. Main header name
-#: ../clients/cli/devices.c:4006
+#: ../clients/cli/devices.c:3723
 msgid "Device LLDP neighbors"
 msgstr "LLDP-Nachbarn des Geräts"
 
-#: ../clients/cli/devices.c:4116
+#: ../clients/cli/devices.c:3833
 #, c-format
 msgid "Error: 'device lldp list': %s"
 msgstr "Fehler: »device lldp list«: %s"
@@ -3427,7 +3271,7 @@ msgstr "verbunden (nur lokal)"
 msgid "connected (site only)"
 msgstr "verbunden (nur Gelände)"
 
-#: ../clients/cli/general.c:46 ../clients/common/nm-client-utils.c:270
+#: ../clients/cli/general.c:46 ../clients/common/nm-client-utils.c:241
 msgid "connected"
 msgstr "verbunden"
 
@@ -3435,53 +3279,53 @@ msgstr "verbunden"
 msgid "disconnecting"
 msgstr "wird getrennt"
 
-#: ../clients/cli/general.c:48 ../clients/common/nm-client-utils.c:263
+#: ../clients/cli/general.c:48 ../clients/common/nm-client-utils.c:227
 msgid "disconnected"
 msgstr "nicht verbunden"
 
-#: ../clients/cli/general.c:83
+#: ../clients/cli/general.c:80
 msgid "none"
 msgstr "kein"
 
-#: ../clients/cli/general.c:84
+#: ../clients/cli/general.c:81
 msgid "portal"
 msgstr "Portal"
 
-#: ../clients/cli/general.c:85
+#: ../clients/cli/general.c:82
 msgid "limited"
 msgstr "begrenzt"
 
-#: ../clients/cli/general.c:86
+#: ../clients/cli/general.c:83
 msgid "full"
 msgstr "vollständig"
 
 # Könnte auch Legitimierung sein. Der kontext entscheidet. -ck
 # Sieht entweder nach lausigen Englischkenntnissen oder nach einem irrtümlicherweise als übersetzbar markierten String aus.
-#: ../clients/cli/general.c:158
+#: ../clients/cli/general.c:154
 msgid "auth"
 msgstr "Legitimierung"
 
-#: ../clients/cli/general.c:186
+#: ../clients/cli/general.c:189
 msgid "running"
 msgstr "wird ausgeführt"
 
-#: ../clients/cli/general.c:200
+#: ../clients/cli/general.c:203
 msgid "starting"
 msgstr "wird gestartet"
 
-#: ../clients/cli/general.c:200
+#: ../clients/cli/general.c:203
 msgid "started"
 msgstr "gestartet"
 
-#: ../clients/cli/general.c:234
+#: ../clients/cli/general.c:237
 msgid "enabled"
 msgstr "aktiviert"
 
-#: ../clients/cli/general.c:234
+#: ../clients/cli/general.c:237
 msgid "disabled"
 msgstr "deaktiviert"
 
-#: ../clients/cli/general.c:352
+#: ../clients/cli/general.c:369
 #, c-format
 msgid ""
 "Usage: nmcli general { COMMAND | help }\n"
@@ -3510,7 +3354,7 @@ msgstr ""
 "  logging [level <Protokollstufe>] [domains <Protokoll-Domänen>]\n"
 "\n"
 
-#: ../clients/cli/general.c:363
+#: ../clients/cli/general.c:380
 #, c-format
 msgid ""
 "Usage: nmcli general status { help }\n"
@@ -3527,7 +3371,7 @@ msgstr ""
 "status« auf\n"
 "\n"
 
-#: ../clients/cli/general.c:372
+#: ../clients/cli/general.c:389
 #, c-format
 msgid ""
 "Usage: nmcli general hostname { ARGUMENTS | help }\n"
@@ -3550,7 +3394,7 @@ msgstr ""
 "persistenten System-Hostnamen fest.\n"
 "\n"
 
-#: ../clients/cli/general.c:384
+#: ../clients/cli/general.c:401
 #, c-format
 msgid ""
 "Usage: nmcli general permissions { help }\n"
@@ -3563,7 +3407,7 @@ msgstr ""
 "Zeigt die Aufrufberechtigungen für legitimierte Operationen.\n"
 "\n"
 
-#: ../clients/cli/general.c:392
+#: ../clients/cli/general.c:409
 #, c-format
 msgid ""
 "Usage: nmcli general logging { ARGUMENTS | help }\n"
@@ -3588,7 +3432,7 @@ msgstr ""
 "geben Sie die Stufe und/oder die Domäne an. Auf der Handbuchseite\n"
 "finden Sie eine Liste der möglichen Protokoll-Domänen.\n"
 
-#: ../clients/cli/general.c:405
+#: ../clients/cli/general.c:422
 #, c-format
 msgid ""
 "Usage: nmcli networking { COMMAND | help }\n"
@@ -3613,7 +3457,7 @@ msgstr ""
 "  connectivity [check]\n"
 "\n"
 
-#: ../clients/cli/general.c:415
+#: ../clients/cli/general.c:432
 #, c-format
 msgid ""
 "Usage: nmcli networking on { help }\n"
@@ -3626,7 +3470,7 @@ msgstr ""
 "Netzwerkverbindungen einschalten.\n"
 "\n"
 
-#: ../clients/cli/general.c:423
+#: ../clients/cli/general.c:440
 #, c-format
 msgid ""
 "Usage: nmcli networking off { help }\n"
@@ -3639,7 +3483,7 @@ msgstr ""
 "Netzwerkverbindungen ausschalten.\n"
 "\n"
 
-#: ../clients/cli/general.c:431
+#: ../clients/cli/general.c:448
 #, c-format
 msgid ""
 "Usage: nmcli networking connectivity { ARGUMENTS | help }\n"
@@ -3660,7 +3504,7 @@ msgstr ""
 "Verbindungsstatus erneut.\n"
 "\n"
 
-#: ../clients/cli/general.c:443
+#: ../clients/cli/general.c:460
 #, c-format
 msgid ""
 "Usage: nmcli radio { COMMAND | help }\n"
@@ -3677,7 +3521,7 @@ msgstr ""
 "  all | wifi | wwan [ on | off ]\n"
 "\n"
 
-#: ../clients/cli/general.c:452
+#: ../clients/cli/general.c:469
 #, c-format
 msgid ""
 "Usage: nmcli radio all { ARGUMENTS | help }\n"
@@ -3694,7 +3538,7 @@ msgstr ""
 "Ruft den Status aller Funkschalter ab oder schaltet diese an/aus.\n"
 "\n"
 
-#: ../clients/cli/general.c:462
+#: ../clients/cli/general.c:479
 #, c-format
 msgid ""
 "Usage: nmcli radio wifi { ARGUMENTS | help }\n"
@@ -3711,7 +3555,7 @@ msgstr ""
 "Ruft den Status des Wi-Fi-Funkschalters ab oder schaltet diesen an/aus.\n"
 "\n"
 
-#: ../clients/cli/general.c:472
+#: ../clients/cli/general.c:489
 #, c-format
 msgid ""
 "Usage: nmcli radio wwan { ARGUMENTS | help }\n"
@@ -3729,7 +3573,7 @@ msgstr ""
 "aus.\n"
 "\n"
 
-#: ../clients/cli/general.c:482
+#: ../clients/cli/general.c:499
 #, c-format
 msgid ""
 "Usage: nmcli monitor\n"
@@ -3744,180 +3588,180 @@ msgstr ""
 "Gibt eine Zeile aus, sobald es in NetworkManager eine Änderung gibt.\n"
 "\n"
 
-#: ../clients/cli/general.c:512
+#: ../clients/cli/general.c:528
 msgid "NetworkManager status"
 msgstr "Status von NetworkManager"
 
-#: ../clients/cli/general.c:516
+#: ../clients/cli/general.c:532
 #, c-format
 msgid "Error: only these fields are allowed: %s"
 msgstr "Fehler: Nur die folgenden Felder sind erlaubt: %s"
 
-#: ../clients/cli/general.c:570
+#: ../clients/cli/general.c:582
 msgid "NetworkManager permissions"
 msgstr "Befugnisse von NetworkManager"
 
-#: ../clients/cli/general.c:574
+#: ../clients/cli/general.c:586
 #, c-format
 msgid "Error: 'general permissions': %s"
 msgstr "Fehler: »general permissions«: %s"
 
-#: ../clients/cli/general.c:663
+#: ../clients/cli/general.c:674
 msgid "NetworkManager logging"
 msgstr "Protokollierung in NetworkManager"
 
-#: ../clients/cli/general.c:667
+#: ../clients/cli/general.c:678
 #, c-format
 msgid "Error: 'general logging': %s"
 msgstr "Fehler: »general logging«: %s"
 
-#: ../clients/cli/general.c:749
+#: ../clients/cli/general.c:760
 #, c-format
 msgid "Error: failed to set logging: %s"
 msgstr "Fehler: Festlegen der Protokollierung ist fehlgeschlagen: %s"
 
-#: ../clients/cli/general.c:766
+#: ../clients/cli/general.c:777
 #, c-format
 msgid "Error: failed to set hostname: %s"
 msgstr "Fehler: Festlegen des Rechnernamens schlug fehl: %s"
 
-#: ../clients/cli/general.c:835
+#: ../clients/cli/general.c:846
 #, c-format
 msgid "Error: '--fields' value '%s' is not valid here (allowed field: %s)"
 msgstr ""
 "Fehler: Der Wert »%s« für »--fields« ist hier nicht gültig (erlaubtes Feld: "
 "%s)"
 
-#: ../clients/cli/general.c:860
+#: ../clients/cli/general.c:871
 #, c-format
 msgid "Error: invalid '%s' argument: '%s' (use on/off)."
 msgstr "Fehler: Ungültiger »%s«-Parameter: »%s« (verwenden Sie ein/aus)."
 
 #. no arguments -> get current state
-#: ../clients/cli/general.c:908 ../clients/cli/general.c:920
+#: ../clients/cli/general.c:919 ../clients/cli/general.c:931
 msgid "Connectivity"
 msgstr "Konnektivität"
 
-#: ../clients/cli/general.c:923
+#: ../clients/cli/general.c:934
 #, c-format
 msgid "Error: 'networking' command '%s' is not valid."
 msgstr "Fehler: Der »networking«-Befehl »%s« ist ungültig."
 
-#: ../clients/cli/general.c:937
+#: ../clients/cli/general.c:948
 msgid "Networking"
 msgstr "Netzwerk"
 
 #. no argument, show all radio switches
-#: ../clients/cli/general.c:972
+#: ../clients/cli/general.c:983
 msgid "Radio switches"
 msgstr "Funkschalter"
 
 #. no argument, show current WiFi state
-#: ../clients/cli/general.c:1002
+#: ../clients/cli/general.c:1013
 msgid "Wi-Fi radio switch"
 msgstr "WLAN-Funkschalter"
 
 #. no argument, show current WWAN (mobile broadband) state
-#: ../clients/cli/general.c:1029
+#: ../clients/cli/general.c:1040
 msgid "WWAN radio switch"
 msgstr "WWAN-Funkschalter"
 
-#: ../clients/cli/general.c:1077
+#: ../clients/cli/general.c:1089
 msgid "NetworkManager has started"
 msgstr "NetworkManager wurde gestartet"
 
-#: ../clients/cli/general.c:1077
+#: ../clients/cli/general.c:1089
 msgid "NetworkManager has stopped"
 msgstr "NetworkManager wurde beendet"
 
-#: ../clients/cli/general.c:1088
+#: ../clients/cli/general.c:1100
 #, c-format
 msgid "Hostname set to '%s'\n"
 msgstr "Rechnernamen auf »%s« festgelegt\n"
 
-#: ../clients/cli/general.c:1103
+#: ../clients/cli/general.c:1115
 #, c-format
 msgid "'%s' is now the primary connection\n"
 msgstr "»%s« ist jetzt die primäre Verbindung\n"
 
-#: ../clients/cli/general.c:1105
+#: ../clients/cli/general.c:1117
 #, c-format
 msgid "There's no primary connection\n"
 msgstr "Es gibt keine primäre Verbindung\n"
 
-#: ../clients/cli/general.c:1117
+#: ../clients/cli/general.c:1129
 #, c-format
 msgid "Connectivity is now '%s'\n"
 msgstr "Verbindungszustand ist jetzt »%s«\n"
 
-#: ../clients/cli/general.c:1130
+#: ../clients/cli/general.c:1142
 #, c-format
 msgid "Networkmanager is now in the '%s' state\n"
 msgstr "NetworkManager ist jetzt im Zustand »%s«\n"
 
-#: ../clients/cli/general.c:1150
+#: ../clients/cli/general.c:1163
 msgid "connection available"
 msgstr "Verbindung verfügbar"
 
-#: ../clients/cli/general.c:1152
+#: ../clients/cli/general.c:1165
 msgid "connections available"
 msgstr "Verfügbare Verbindungen"
 
-#: ../clients/cli/general.c:1170
+#: ../clients/cli/general.c:1183
 msgid "autoconnect"
 msgstr "automatisches Verbinden"
 
-#: ../clients/cli/general.c:1172
+#: ../clients/cli/general.c:1185
 msgid "fw missing"
 msgstr "fw fehlt"
 
-#: ../clients/cli/general.c:1177
+#: ../clients/cli/general.c:1190
 msgid "plugin missing"
 msgstr "Erweiterung fehlt"
 
-#: ../clients/cli/general.c:1182
+#: ../clients/cli/general.c:1195
 msgid "sw"
 msgstr "sw"
 
-#: ../clients/cli/general.c:1184
+#: ../clients/cli/general.c:1197
 msgid "hw"
 msgstr "hw"
 
-#: ../clients/cli/general.c:1189
+#: ../clients/cli/general.c:1202
 msgid "iface"
 msgstr "Schnittstelle"
 
-#: ../clients/cli/general.c:1192
+#: ../clients/cli/general.c:1205
 msgid "port"
 msgstr "Port"
 
-#: ../clients/cli/general.c:1195
+#: ../clients/cli/general.c:1208
 msgid "mtu"
 msgstr "mtu"
 
-#: ../clients/cli/general.c:1212
+#: ../clients/cli/general.c:1225
 msgid "master"
 msgstr "Master"
 
-#: ../clients/cli/general.c:1216 ../clients/tui/nm-editor-utils.c:239
-#: ../clients/tui/nmt-connect-connection-list.c:407
+#: ../clients/cli/general.c:1229 ../clients/tui/nm-editor-utils.c:241
+#: ../clients/tui/nmt-connect-connection-list.c:408
 msgid "VPN"
 msgstr "VPN"
 
-#: ../clients/cli/general.c:1218
+#: ../clients/cli/general.c:1231
 msgid "ip4 default"
 msgstr "ip4-Vorgabe"
 
-#: ../clients/cli/general.c:1220
+#: ../clients/cli/general.c:1233
 msgid "ip6 default"
 msgstr "ip6-Vorgabe"
 
-#: ../clients/cli/general.c:1303
+#: ../clients/cli/general.c:1316
 #, c-format
 msgid "%s VPN connection"
 msgstr "%s VPN-Verbindung"
 
-#: ../clients/cli/general.c:1371
+#: ../clients/cli/general.c:1386
 #, c-format
 msgid ""
 "Use \"nmcli device show\" to get complete information about known devices "
@@ -3936,23 +3780,21 @@ msgstr ""
 "Die Hilfeseiten nmcli(1) und nmcli-examples(5) geben vollständige "
 "Aufrufbeschreibungen.\n"
 
-#: ../clients/cli/general.c:1392
+#: ../clients/cli/general.c:1407
 #, c-format
 msgid "Error: 'monitor' command '%s' is not valid."
 msgstr "Fehler: »monitor«-Befehl »%s« ist ungültig."
 
-#: ../clients/cli/general.c:1404
+#: ../clients/cli/general.c:1419
 msgid "Networkmanager is not running (waiting for it)\n"
 msgstr "NetworkManager wird nicht ausgeführt (es wird gewartet)\n"
 
-#: ../clients/cli/nmcli.c:245
-#, c-format
+#: ../clients/cli/nmcli.c:184
+#, fuzzy, c-format
 msgid ""
 "Usage: nmcli [OPTIONS] OBJECT { COMMAND | help }\n"
 "\n"
 "OPTIONS\n"
-"  -o[verview]                                    overview mode (hide default "
-"values)\n"
 "  -t[erse]                                       terse output\n"
 "  -p[retty]                                      pretty output\n"
 "  -m[ode] tabular|multiline                      output mode\n"
@@ -3983,15 +3825,11 @@ msgstr ""
 "Aufruf: nmcli [OPTIONEN] OBJEKT { BEFEHL | help }\n"
 "\n"
 "OPTIONEN\n"
-"  -o[verview]                                    Eine Übersicht "
-"(Vorgabewerte werden verborgen)\n"
 "  -t[erse]                                   Kurze Ausgabe\n"
 "  -p[retty]                                  Hübsche Ausgabe\n"
 "  -m[ode] tabular|multiline                  Ausgabemodus\n"
 "  -c[olors] auto|yes|no                      Farbausgabe\n"
 "  -f[ields] <Feld1,Feld2, …>|all|common      Ausgabefelder angeben\n"
-"  -g[et-values] <field1,field2,...>|all|common   Kurzversion von »-m tabular "
-"-t -f«\n"
 "  -e[scape] yes|no                           Escape-Spaltenseparator in "
 "Werten\n"
 "  -a[sk]                                     Nach fehlenden Parametern "
@@ -4012,82 +3850,62 @@ msgstr ""
 "  m[onitor]       Überwacht Änderungen in NetworkManager\n"
 "\n"
 
-#: ../clients/cli/nmcli.c:325
+#: ../clients/cli/nmcli.c:263
 #, c-format
 msgid "Error: missing argument for '%s' option."
 msgstr "Fehler: Fehlendes Argument für die Option »%s«."
 
-#: ../clients/cli/nmcli.c:626
-#, c-format
-msgid "Unexpected end of file following '%s'\n"
-msgstr "Unerwartetes Zeilenende nach »%s«\n"
-
-#: ../clients/cli/nmcli.c:634
-#, c-format
-msgid "Expected whitespace following '%s'\n"
-msgstr "Es wurde ein geschütztes Leerzeichen nach »%s« erwartet\n"
-
-#: ../clients/cli/nmcli.c:646
-#, c-format
-msgid "Expected a value for '%s'\n"
-msgstr "Ein Wert wurde für »%s« erwartet\n"
-
-#: ../clients/cli/nmcli.c:660
-#, c-format
-msgid "Expected a line break following '%s'\n"
-msgstr "Es wurde ein Zeilenumbruch nach »%s« erwartet\n"
-
-#: ../clients/cli/nmcli.c:749
+#: ../clients/cli/nmcli.c:311
 #, c-format
 msgid "Error: Option '--terse' is specified the second time."
 msgstr "Fehler: Option »--terse« wurde zweimal gesetzt."
 
-#: ../clients/cli/nmcli.c:754
+#: ../clients/cli/nmcli.c:316
 #, c-format
 msgid "Error: Option '--terse' is mutually exclusive with '--pretty'."
 msgstr "Fehler: Option »--terse« schließt »--pretty« aus."
 
-#: ../clients/cli/nmcli.c:762
+#: ../clients/cli/nmcli.c:324
 #, c-format
 msgid "Error: Option '--pretty' is specified the second time."
 msgstr "Fehler: Option »--pretty« wurde zweimal gesetzt."
 
-#: ../clients/cli/nmcli.c:767
+#: ../clients/cli/nmcli.c:329
 #, c-format
 msgid "Error: Option '--pretty' is mutually exclusive with '--terse'."
 msgstr "Fehler: Option »--pretty« schließt »--terse« aus."
 
-#: ../clients/cli/nmcli.c:782
+#: ../clients/cli/nmcli.c:344
 #, c-format
 msgid "Error: '%s' is not a valid argument for '%s' option."
 msgstr "Fehler: »%s« ist kein gültiges Argument für die Option »%s«."
 
-#: ../clients/cli/nmcli.c:796 ../clients/cli/nmcli.c:808
+#: ../clients/cli/nmcli.c:358 ../clients/cli/nmcli.c:370
 #, c-format
 msgid "Error: '%s' is not valid argument for '%s' option."
 msgstr "Fehler: »%s« ist kein gültiges Argument für die Option »%s«."
 
-#: ../clients/cli/nmcli.c:832
+#: ../clients/cli/nmcli.c:394
 #, c-format
 msgid "Error: '%s' is not a valid timeout."
 msgstr "Fehler: »%s« ist kein gültiger Zeitablauf."
 
-#: ../clients/cli/nmcli.c:839
+#: ../clients/cli/nmcli.c:401
 #, c-format
 msgid "nmcli tool, version %s\n"
 msgstr "nmcli-Werkzeug, Version %s\n"
 
-#: ../clients/cli/nmcli.c:847
+#: ../clients/cli/nmcli.c:409
 #, c-format
 msgid "Error: Option '%s' is unknown, try 'nmcli -help'."
 msgstr "Fehler: Option »%s« ist unbekannt, versuchen Sie »nmcli -help«."
 
-#: ../clients/cli/nmcli.c:903 ../clients/cli/nmcli.c:910
+#: ../clients/cli/nmcli.c:455 ../clients/cli/nmcli.c:462
 #, c-format
-msgid "Error: nmcli terminated by signal %s (%d)"
-msgstr "Fehler: nmcli wurde mit Signal %s (%d) beendet"
+msgid "Error: nmcli terminated by signal %s (%d)\n"
+msgstr "Fehler: nmcli mit Signal %s (%d) beendet\n"
 
-#: ../clients/cli/nmcli.c:1052
+#: ../clients/cli/nmcli.c:560
 msgid "Success"
 msgstr "Erfolg"
 
@@ -4096,12 +3914,12 @@ msgstr "Erfolg"
 msgid "Authentication message: %s\n"
 msgstr "Legitimierungsnachricht: %s\n"
 
-#: ../clients/cli/polkit-agent.c:76
+#: ../clients/cli/polkit-agent.c:74
 #, c-format
 msgid "Authentication error: %s\n"
 msgstr "Legitimationsfehler: %s\n"
 
-#: ../clients/cli/polkit-agent.c:136
+#: ../clients/cli/polkit-agent.c:120
 #, c-format
 msgid "Warning: polkit agent initialization failed: %s\n"
 msgstr "Warnung: Initialisierung des polkit-Agenten ist fehlgeschlagen: %s\n"
@@ -4135,236 +3953,210 @@ msgstr ""
 msgid "Do you want to remove them? [yes] "
 msgstr "Möchten Sie diese entfernen? [ja] "
 
-#: ../clients/cli/settings.c:332
+#: ../clients/cli/settings.c:330
 #, c-format
 msgid "Warning: %s is not an UUID of any existing connection profile\n"
 msgstr "Warnung: %s ist keine UUID eines vorhandenen Verbindungsprofils.\n"
 
-#: ../clients/cli/settings.c:337 ../clients/cli/settings.c:350
+#: ../clients/cli/settings.c:335 ../clients/cli/settings.c:348
 #, c-format
 msgid "'%s' is not a VPN connection profile"
 msgstr "»%s« ist kein Name eines VPN-Verbindungsprofils"
 
-#: ../clients/cli/settings.c:344
+#: ../clients/cli/settings.c:342
 #, c-format
 msgid "'%s' is not a name of any exiting profile"
 msgstr "»%s« ist kein Name eines bestehenden Profils"
 
-#: ../clients/cli/settings.c:388
+#: ../clients/cli/settings.c:386
 #, c-format
 msgid "Warning: %s\n"
 msgstr "Warnung: %s\n"
 
-#: ../clients/cli/settings.c:391
+#: ../clients/cli/settings.c:389
 #, c-format
 msgid "Info: %s\n"
 msgstr "Information: %s\n"
 
-#: ../clients/cli/settings.c:484
+#: ../clients/cli/settings.c:481
 msgid "don't know how to get the property value"
 msgstr "Unbekannt, wie der Eigenschaftswert ermittelt wird"
 
-#: ../clients/cli/settings.c:574 ../clients/cli/settings.c:616
+#: ../clients/cli/settings.c:571 ../clients/cli/settings.c:613
 msgid "the property can't be changed"
 msgstr "Die Einstellung konnte nicht geändert werden"
 
-#: ../clients/cli/settings.c:730
+#: ../clients/cli/settings.c:733
 msgid "[NM property description]"
 msgstr "[NM Eigenschaft-Beschreibung]"
 
-#: ../clients/cli/settings.c:740
+#: ../clients/cli/settings.c:743
 msgid "[nmcli specific description]"
 msgstr "[nmcli-spezifische Beschreibung]"
 
-#: ../clients/cli/utils.c:319
+#: ../clients/cli/utils.c:328
 #, c-format
 msgid "Error: Argument '%s' was expected, but '%s' provided."
 msgstr "Fehler: Parameter »%s« wurde erwartet, aber »%s« geliefert."
 
-#: ../clients/cli/utils.c:322
+#: ../clients/cli/utils.c:331
 #, c-format
 msgid "Error: Unexpected argument '%s'"
 msgstr "Fehler: Unerwarteter Parameter »%s«"
 
-#: ../clients/cli/utils.c:709
+#: ../clients/cli/utils.c:804
 #, c-format
 msgid "invalid field '%s%s%s'; no such field"
 msgstr "Ungültiges Feld »%s%s%s«; Feld existiert nicht"
 
-#: ../clients/cli/utils.c:713
+#: ../clients/cli/utils.c:808
 #, c-format
 msgid "invalid field '%s%s%s'; allowed fields: [%s]"
 msgstr "Ungültiges Feld »%s%s%s«; erlaubte Felder: [%s]"
 
-#: ../clients/cli/utils.c:809
+#: ../clients/cli/utils.c:881
 #, c-format
 msgid "failure to select field"
 msgstr "Wählen des Feldes ist fehlgeschlagen"
 
-#: ../clients/cli/utils.c:1435
+#: ../clients/cli/utils.c:1469
 #, c-format
 msgid "Error reading nmcli output: %s\n"
 msgstr "Fehler beim Lesen der nmcli-Ausgabe: %s\n"
 
-#: ../clients/cli/utils.c:1440
+#: ../clients/cli/utils.c:1474
 #, c-format
 msgid "Error writing nmcli output: %s\n"
 msgstr "Fehler beim Schreiben der nmcli-Ausgabe: %s\n"
 
-#: ../clients/cli/utils.c:1464
+#: ../clients/cli/utils.c:1498
 #, c-format
 msgid "Failed to create pager pipe: %s\n"
 msgstr "Pager-Weiterleitung konnte nicht erstellt werden: %s\n"
 
-#: ../clients/cli/utils.c:1472
+#: ../clients/cli/utils.c:1506
 #, c-format
 msgid "Failed to fork pager: %s\n"
 msgstr "Pager konnte nicht geforkt werden: %s\n"
 
-#: ../clients/cli/utils.c:1518 ../clients/cli/utils.c:1520
+#: ../clients/cli/utils.c:1552 ../clients/cli/utils.c:1554
 #, c-format
 msgid "Failed to duplicate pager pipe: %s\n"
 msgstr "Die Duplizierung der Pager-Weiterleitung scheiterte: %s\n"
 
-#: ../clients/cli/utils.h:298 ../clients/common/nm-meta-setting-desc.c:4901
-msgid "on"
-msgstr "an"
-
-#: ../clients/cli/utils.h:298 ../clients/common/nm-meta-setting-desc.c:4903
-msgid "off"
-msgstr "aus"
-
-#: ../clients/cli/utils.h:324
-#, c-format
-msgid "%lld (%s)"
-msgstr "%lld (%s)"
-
-#: ../clients/cli/utils.h:331
-#, c-format
-msgid "%lld - %s"
-msgstr "%lld - %s"
-
 #. TRANSLATORS: the first %s is the partial value entered by
 #. * the user, the second %s a list of compatible values.
 #.
-#: ../clients/common/nm-client-utils.c:117
-#: ../clients/common/nm-client-utils.c:148
+#: ../clients/common/nm-client-utils.c:75
+#: ../clients/common/nm-client-utils.c:106
 #, c-format
 msgid "'%s' is ambiguous (%s)"
 msgstr "»%s« ist mehrdeutig (%s)"
 
-#: ../clients/common/nm-client-utils.c:127
+#: ../clients/common/nm-client-utils.c:85
 #, c-format
 msgid "'%s' is not valid; use [%s] or [%s]"
 msgstr "»%s« ist ungültig. Verwenden Sie [%s] oder [%s]."
 
-#: ../clients/common/nm-client-utils.c:160
+#: ../clients/common/nm-client-utils.c:118
 #, c-format
 msgid "'%s' is not valid; use [%s], [%s] or [%s]"
 msgstr "»%s« ist ungültig. Verwenden Sie [%s], [%s] oder [%s]."
 
-#: ../clients/common/nm-client-utils.c:209
+#: ../clients/common/nm-client-utils.c:155
 #, c-format
-msgid "'%s' is ambiguous: %s"
-msgstr "»%s« ist mehrdeutig: %s"
+msgid "'%s' is ambiguous (%s x %s)"
+msgstr "»%s« ist mehrdeutig (%s x %s)"
 
-#: ../clients/common/nm-client-utils.c:219
+#: ../clients/common/nm-client-utils.c:167
 #, c-format
 msgid "missing name, try one of [%s]"
 msgstr "Fehlender Name, versuchen Sie einen von [%s]"
 
-#: ../clients/common/nm-client-utils.c:261
+#: ../clients/common/nm-client-utils.c:223
 msgid "unmanaged"
 msgstr "nicht verwaltet"
 
-#: ../clients/common/nm-client-utils.c:262
+#: ../clients/common/nm-client-utils.c:225
 msgid "unavailable"
 msgstr "nicht verfügbar"
 
-#: ../clients/common/nm-client-utils.c:264
+#: ../clients/common/nm-client-utils.c:229
 msgid "connecting (prepare)"
 msgstr "wird verbunden (wird vorbereitet)"
 
-#: ../clients/common/nm-client-utils.c:265
+#: ../clients/common/nm-client-utils.c:231
 msgid "connecting (configuring)"
 msgstr "wird verbunden (wird eingerichtet)"
 
-#: ../clients/common/nm-client-utils.c:266
+#: ../clients/common/nm-client-utils.c:233
 msgid "connecting (need authentication)"
 msgstr "wird verbunden (Legitimierung wird benötigt)"
 
-#: ../clients/common/nm-client-utils.c:267
+#: ../clients/common/nm-client-utils.c:235
 msgid "connecting (getting IP configuration)"
 msgstr "wird verbunden (IP-Einstellungen werden ermittelt)"
 
-#: ../clients/common/nm-client-utils.c:268
+#: ../clients/common/nm-client-utils.c:237
 msgid "connecting (checking IP connectivity)"
 msgstr "wird verbunden (IP-Funktionalität wird geprüft)"
 
-#: ../clients/common/nm-client-utils.c:269
+#: ../clients/common/nm-client-utils.c:239
 msgid "connecting (starting secondary connections)"
 msgstr "wird verbunden (Zweitverbindungen werden gestartet)"
 
-#: ../clients/common/nm-client-utils.c:272
+#: ../clients/common/nm-client-utils.c:245
 msgid "connection failed"
 msgstr "Verbindung fehlgeschlagen"
 
-#: ../clients/common/nm-client-utils.c:280
+#: ../clients/common/nm-client-utils.c:262
 msgid "yes (guessed)"
 msgstr "ja (geraten)"
 
-#: ../clients/common/nm-client-utils.c:281
+#: ../clients/common/nm-client-utils.c:264
 msgid "no (guessed)"
 msgstr "nein (geraten)"
 
-#. TRANSLATORS: Unknown reason for a device state change (NMDeviceStateReason)
-#. TRANSLATORS: Unknown reason for a connection state change (NMActiveConnectionStateReason)
-#: ../clients/common/nm-client-utils.c:287
-#: ../clients/common/nm-client-utils.c:359 ../libnm-glib/nm-device.c:1859
-#: ../libnm/nm-device.c:1363
-msgid "Unknown"
-msgstr "Unbekannt"
-
-#: ../clients/common/nm-client-utils.c:288
+#: ../clients/common/nm-client-utils.c:277
 msgid "No reason given"
 msgstr "Kein Grund angegeben"
 
-#: ../clients/common/nm-client-utils.c:290
+#: ../clients/common/nm-client-utils.c:281
 msgid "Device is now managed"
 msgstr "Gerät wird nun verwaltet"
 
-#: ../clients/common/nm-client-utils.c:291
+#: ../clients/common/nm-client-utils.c:283
 msgid "Device is now unmanaged"
 msgstr "Gerät wird nun nicht mehr verwaltet"
 
-#: ../clients/common/nm-client-utils.c:292
+#: ../clients/common/nm-client-utils.c:285
 msgid "The device could not be readied for configuration"
 msgstr "Das Gerät konnte nicht für die Konfiguration vorbereitet werden"
 
-#: ../clients/common/nm-client-utils.c:293
+#: ../clients/common/nm-client-utils.c:287
 msgid ""
 "IP configuration could not be reserved (no available address, timeout, etc.)"
 msgstr ""
 "IP-Konfiguration konnte nicht reserviert werden (keine verfügbare Adresse, "
 "Zeitüberschreitung usw.)"
 
-#: ../clients/common/nm-client-utils.c:294
+#: ../clients/common/nm-client-utils.c:289
 msgid "The IP configuration is no longer valid"
 msgstr "Die IP-Konfiguration ist nicht mehr gültig"
 
-#: ../clients/common/nm-client-utils.c:295
+#: ../clients/common/nm-client-utils.c:291
 msgid "Secrets were required, but not provided"
 msgstr "Geheimdaten waren erforderlich, wurden aber nicht angegeben"
 
-#: ../clients/common/nm-client-utils.c:296
+#: ../clients/common/nm-client-utils.c:293
 msgid "802.1X supplicant disconnected"
 msgstr "802.1X-Supplicant getrennt"
 
-#: ../clients/common/nm-client-utils.c:297
+#: ../clients/common/nm-client-utils.c:295
 msgid "802.1X supplicant configuration failed"
 msgstr "Einrichtung des 802.1X-Supplicant fehlgeschlagen"
 
-#: ../clients/common/nm-client-utils.c:298
+#: ../clients/common/nm-client-utils.c:297
 msgid "802.1X supplicant failed"
 msgstr "802.1X-Supplicant fehlgeschlagen"
 
@@ -4372,309 +4164,309 @@ msgstr "802.1X-Supplicant fehlgeschlagen"
 msgid "802.1X supplicant took too long to authenticate"
 msgstr "802.1X-Supplicant brauchte zu lange für die Legitimierung"
 
-#: ../clients/common/nm-client-utils.c:300
+#: ../clients/common/nm-client-utils.c:301
 msgid "PPP service failed to start"
 msgstr "PPP-Dienst konnte nicht gestartet werden"
 
-#: ../clients/common/nm-client-utils.c:301
+#: ../clients/common/nm-client-utils.c:303
 msgid "PPP service disconnected"
 msgstr "PPP-Dienst getrennt"
 
-#: ../clients/common/nm-client-utils.c:302
+#: ../clients/common/nm-client-utils.c:305
 msgid "PPP failed"
 msgstr "PPP fehlgeschlagen"
 
-#: ../clients/common/nm-client-utils.c:303
+#: ../clients/common/nm-client-utils.c:307
 msgid "DHCP client failed to start"
 msgstr "DHCP-Client konnte nicht gestartet werden"
 
-#: ../clients/common/nm-client-utils.c:304
+#: ../clients/common/nm-client-utils.c:309
 msgid "DHCP client error"
 msgstr "DHCP-Client-Fehler"
 
-#: ../clients/common/nm-client-utils.c:305
+#: ../clients/common/nm-client-utils.c:311
 msgid "DHCP client failed"
 msgstr "DHCP-Client fehlgeschlagen"
 
-#: ../clients/common/nm-client-utils.c:306
+#: ../clients/common/nm-client-utils.c:313
 msgid "Shared connection service failed to start"
 msgstr ""
 "Dienst für gemeinsam verwendete Verbindung konnte nicht gestartet werden"
 
-#: ../clients/common/nm-client-utils.c:307
+#: ../clients/common/nm-client-utils.c:315
 msgid "Shared connection service failed"
 msgstr "Dienst für gemeinsam verwendete Verbindung fehlgeschlagen"
 
-#: ../clients/common/nm-client-utils.c:308
+#: ../clients/common/nm-client-utils.c:317
 msgid "AutoIP service failed to start"
 msgstr "Start des AutoIP-Diensts fehlgeschlagen"
 
-#: ../clients/common/nm-client-utils.c:309
+#: ../clients/common/nm-client-utils.c:319
 msgid "AutoIP service error"
 msgstr "Fehler des AutoIP-Diensts"
 
-#: ../clients/common/nm-client-utils.c:310
+#: ../clients/common/nm-client-utils.c:321
 msgid "AutoIP service failed"
 msgstr "AutoIP-Dienst fehlgeschlagen"
 
-#: ../clients/common/nm-client-utils.c:311
+#: ../clients/common/nm-client-utils.c:323
 msgid "The line is busy"
 msgstr "Die Leitung ist besetzt"
 
-#: ../clients/common/nm-client-utils.c:312
+#: ../clients/common/nm-client-utils.c:325
 msgid "No dial tone"
 msgstr "Kein Freizeichen"
 
-#: ../clients/common/nm-client-utils.c:313
+#: ../clients/common/nm-client-utils.c:327
 msgid "No carrier could be established"
 msgstr "Es konnte kein Trägersignal aufgebaut werden"
 
-#: ../clients/common/nm-client-utils.c:314
+#: ../clients/common/nm-client-utils.c:329
 msgid "The dialing request timed out"
 msgstr "Der Einwahlvorgang benötigte zu viel Zeit"
 
-#: ../clients/common/nm-client-utils.c:315
+#: ../clients/common/nm-client-utils.c:331
 msgid "The dialing attempt failed"
 msgstr "Der Einwahlversuch ist fehlgeschlagen"
 
-#: ../clients/common/nm-client-utils.c:316
+#: ../clients/common/nm-client-utils.c:333
 msgid "Modem initialization failed"
 msgstr "Modeminitialisierung fehlgeschlagen"
 
-#: ../clients/common/nm-client-utils.c:317
+#: ../clients/common/nm-client-utils.c:335
 msgid "Failed to select the specified APN"
 msgstr "Angegebener APN konnte nicht ausgewählt werden"
 
-#: ../clients/common/nm-client-utils.c:318
+#: ../clients/common/nm-client-utils.c:337
 msgid "Not searching for networks"
 msgstr "Es wird nicht nach Netzwerken gesucht"
 
-#: ../clients/common/nm-client-utils.c:319
+#: ../clients/common/nm-client-utils.c:339
 msgid "Network registration denied"
 msgstr "Netzwerkanmeldung abgelehnt"
 
-#: ../clients/common/nm-client-utils.c:320
+#: ../clients/common/nm-client-utils.c:341
 msgid "Network registration timed out"
 msgstr "Netzwerkanmeldung benötigte zu viel Zeit"
 
-#: ../clients/common/nm-client-utils.c:321
+#: ../clients/common/nm-client-utils.c:343
 msgid "Failed to register with the requested network"
 msgstr "Anmeldung an dem angeforderten Netzwerk fehlgeschlagen"
 
-#: ../clients/common/nm-client-utils.c:322
+#: ../clients/common/nm-client-utils.c:345
 msgid "PIN check failed"
 msgstr "PIN-Überprüfung fehlgeschlagen"
 
-#: ../clients/common/nm-client-utils.c:323
+#: ../clients/common/nm-client-utils.c:347
 msgid "Necessary firmware for the device may be missing"
 msgstr "Notwendige Firmware des Geräts fehlt möglicherweise"
 
-#: ../clients/common/nm-client-utils.c:324
+#: ../clients/common/nm-client-utils.c:349
 msgid "The device was removed"
 msgstr "Das Gerät wurde entfernt"
 
-#: ../clients/common/nm-client-utils.c:325
+#: ../clients/common/nm-client-utils.c:351
 msgid "NetworkManager went to sleep"
 msgstr "NetworkManager ging in den Schlafmodus"
 
-#: ../clients/common/nm-client-utils.c:326
+#: ../clients/common/nm-client-utils.c:353
 msgid "The device's active connection disappeared"
 msgstr "Die aktive Verbindung des Geräts verschwand"
 
-#: ../clients/common/nm-client-utils.c:327
+#: ../clients/common/nm-client-utils.c:355
 msgid "Device disconnected by user or client"
 msgstr "Das Gerät wurde durch den Benutzer oder Client getrennt"
 
-#: ../clients/common/nm-client-utils.c:328
+#: ../clients/common/nm-client-utils.c:357
 msgid "Carrier/link changed"
 msgstr "Trägersignal/Verbindung geändert"
 
-#: ../clients/common/nm-client-utils.c:329
+#: ../clients/common/nm-client-utils.c:359
 msgid "The device's existing connection was assumed"
 msgstr "Die bestehende Verbindung des Geräts wurde angenommen"
 
-#: ../clients/common/nm-client-utils.c:330
+#: ../clients/common/nm-client-utils.c:361
 msgid "The supplicant is now available"
 msgstr "Der Supplicant ist nun verfügbar"
 
-#: ../clients/common/nm-client-utils.c:331
+#: ../clients/common/nm-client-utils.c:363
 msgid "The modem could not be found"
 msgstr "Das Modem wurde nicht gefunden"
 
-#: ../clients/common/nm-client-utils.c:332
+#: ../clients/common/nm-client-utils.c:365
 msgid "The Bluetooth connection failed or timed out"
 msgstr ""
 "Die Bluetooth-Verbindung ist fehlgeschlagen oder benötigte zu viel Zeit"
 
-#: ../clients/common/nm-client-utils.c:333
+#: ../clients/common/nm-client-utils.c:367
 msgid "GSM Modem's SIM card not inserted"
 msgstr "SIM-Karte des GSM-Modems ist nicht eingesteckt"
 
-#: ../clients/common/nm-client-utils.c:334
+#: ../clients/common/nm-client-utils.c:369
 msgid "GSM Modem's SIM PIN required"
 msgstr "PIN der SIM-Karte des GSM-Modems erforderlich"
 
-#: ../clients/common/nm-client-utils.c:335
+#: ../clients/common/nm-client-utils.c:371
 msgid "GSM Modem's SIM PUK required"
 msgstr "PUK der SIM-Karte des GSM-Modems erforderlich"
 
-#: ../clients/common/nm-client-utils.c:336
+#: ../clients/common/nm-client-utils.c:373
 msgid "GSM Modem's SIM wrong"
 msgstr "SIM-Karte des GSM-Modems ist falsch"
 
-#: ../clients/common/nm-client-utils.c:337
+#: ../clients/common/nm-client-utils.c:375
 msgid "InfiniBand device does not support connected mode"
 msgstr "Das InfiniBand-Gerät unterstützt keinen »Connected«-Modus"
 
-#: ../clients/common/nm-client-utils.c:338
+#: ../clients/common/nm-client-utils.c:377
 msgid "A dependency of the connection failed"
 msgstr "Eine Abhängigkeit der Verbindung ist gescheitert"
 
-#: ../clients/common/nm-client-utils.c:339
+#: ../clients/common/nm-client-utils.c:379
 msgid "A problem with the RFC 2684 Ethernet over ADSL bridge"
 msgstr "Ein Problem mit RFC 2684-Überbrückung (Ethernet über ADSL)"
 
-#: ../clients/common/nm-client-utils.c:340
+#: ../clients/common/nm-client-utils.c:381
 msgid "ModemManager is unavailable"
 msgstr "ModemManager ist nicht verfügbar"
 
-#: ../clients/common/nm-client-utils.c:341
+#: ../clients/common/nm-client-utils.c:383
 msgid "The Wi-Fi network could not be found"
 msgstr "Das WLAN konnte nicht gefunden werden"
 
-#: ../clients/common/nm-client-utils.c:342
+#: ../clients/common/nm-client-utils.c:385
 msgid "A secondary connection of the base connection failed"
 msgstr "Eine Zweitverbindung der Basisverbindung schlug fehl"
 
-#: ../clients/common/nm-client-utils.c:343
+#: ../clients/common/nm-client-utils.c:387
 msgid "DCB or FCoE setup failed"
 msgstr ""
 "Einrichtung für DCB (»Data Center Bridging«) oder FCoE (»Fibre Channel over "
 "Ethernet«) fehlgeschlagen"
 
-#: ../clients/common/nm-client-utils.c:344
+#: ../clients/common/nm-client-utils.c:389
 msgid "teamd control failed"
 msgstr "teamd-Bedienung fehlgeschlagen"
 
-#: ../clients/common/nm-client-utils.c:345
+#: ../clients/common/nm-client-utils.c:391
 msgid "Modem failed or no longer available"
 msgstr "Modem ausgefallen oder es ist nicht mehr verfügbar"
 
-#: ../clients/common/nm-client-utils.c:346
+#: ../clients/common/nm-client-utils.c:393
 msgid "Modem now ready and available"
 msgstr "Modem ist nun bereit und verfügbar"
 
-#: ../clients/common/nm-client-utils.c:347
+#: ../clients/common/nm-client-utils.c:395
 msgid "SIM PIN was incorrect"
 msgstr "PIN der SIM-Karte war falsch"
 
-#: ../clients/common/nm-client-utils.c:348
+#: ../clients/common/nm-client-utils.c:397
 msgid "New connection activation was enqueued"
 msgstr "Aktivierung der Verbindung wurde eingereiht"
 
-#: ../clients/common/nm-client-utils.c:349
+#: ../clients/common/nm-client-utils.c:399
 msgid "The device's parent changed"
 msgstr "Das übergeordnete Gerät wurde geändert"
 
-#: ../clients/common/nm-client-utils.c:350
+#: ../clients/common/nm-client-utils.c:401
 msgid "The device parent's management changed"
 msgstr "Die Verwaltung des übergeordneten Geräts wurde geändert"
 
-#: ../clients/common/nm-client-utils.c:351
+#: ../clients/common/nm-client-utils.c:403
 msgid "OpenVSwitch database connection failed"
-msgstr "Datenbankverbindung zu OpenVSwitch ist fehlgeschlagen"
+msgstr ""
 
-#: ../clients/common/nm-client-utils.c:352
+#: ../clients/common/nm-client-utils.c:405
 msgid "A duplicate IP address was detected"
-msgstr "Es wurde eine doppelt vorhandene IP-Adresse entdeckt"
-
-#: ../clients/common/nm-client-utils.c:353
-msgid "The selected IP method is not supported"
-msgstr "Die gewählte IP-Methode wird nicht unterstützt"
+msgstr ""
 
-#: ../clients/common/nm-client-utils.c:354
-#, fuzzy
-#| msgid "Failed to read configuration: %s\n"
-msgid "Failed to configure SR-IOV parameters"
-msgstr "Lesen der Konfiguration ist fehlgeschlagen: %s\n"
+#. TRANSLATORS: Unknown reason for a device state change (NMDeviceStateReason)
+#. TRANSLATORS: Unknown reason for a connection state change (NMActiveConnectionStateReason)
+#: ../clients/common/nm-client-utils.c:410
+#: ../clients/common/nm-client-utils.c:449 ../libnm-glib/nm-device.c:1860
+#: ../libnm/nm-device.c:1572
+msgid "Unknown"
+msgstr "Unbekannt"
 
-#: ../clients/common/nm-client-utils.c:360
+#: ../clients/common/nm-client-utils.c:418
 msgid "Unknown reason"
 msgstr "Unbekannte Ursache"
 
-#: ../clients/common/nm-client-utils.c:361
+#: ../clients/common/nm-client-utils.c:420
 msgid "The connection was disconnected"
 msgstr "Die Verbindung wurde getrennt"
 
-#: ../clients/common/nm-client-utils.c:362
+#: ../clients/common/nm-client-utils.c:422
 msgid "Disconnected by user"
 msgstr "Durch Benutzer getrennt"
 
-#: ../clients/common/nm-client-utils.c:363
+#: ../clients/common/nm-client-utils.c:424
 msgid "The base network connection was interrupted"
 msgstr "Die Basisverbindung wurde unterbrochen"
 
-#: ../clients/common/nm-client-utils.c:364
+#: ../clients/common/nm-client-utils.c:426
 msgid "The VPN service stopped unexpectedly"
 msgstr "Der VPN-Dienst wurde unerwartet gestoppt"
 
-#: ../clients/common/nm-client-utils.c:365
+#: ../clients/common/nm-client-utils.c:428
 msgid "The VPN service returned invalid configuration"
 msgstr "Der VPN-Dienst gab ungültige Einstellungen zurück"
 
-#: ../clients/common/nm-client-utils.c:366
+#: ../clients/common/nm-client-utils.c:430
 msgid "The connection attempt timed out"
 msgstr "Der Verbindungsversuch benötigte zu viel Zeit"
 
-#: ../clients/common/nm-client-utils.c:367
+#: ../clients/common/nm-client-utils.c:432
 msgid "The VPN service did not start in time"
 msgstr "Der VPN-Dienst wurde nicht rechtzeitig gestartet"
 
-#: ../clients/common/nm-client-utils.c:368
+#: ../clients/common/nm-client-utils.c:434
 msgid "The VPN service failed to start"
 msgstr "Der VPN-Dienst konnte nicht gestartet werden"
 
-#: ../clients/common/nm-client-utils.c:369
+#: ../clients/common/nm-client-utils.c:436
+#, fuzzy
 msgid "No valid secrets"
-msgstr "Keine gültigen Passwörter"
+msgstr "Keine gültigen VPN-Schlüssel"
 
-#: ../clients/common/nm-client-utils.c:370
+#: ../clients/common/nm-client-utils.c:438
+#, fuzzy
 msgid "Invalid secrets"
-msgstr "Ungültige Passwörter"
+msgstr "Ungültige VPN-Schlüssel"
 
-#: ../clients/common/nm-client-utils.c:371
+#: ../clients/common/nm-client-utils.c:440
 msgid "The connection was removed"
 msgstr "Die Verbindung wurde entfernt"
 
-#: ../clients/common/nm-client-utils.c:372
+#: ../clients/common/nm-client-utils.c:442
 msgid "Master connection failed"
 msgstr "Master-Verbindung ist fehlgeschlagen"
 
-#: ../clients/common/nm-client-utils.c:373
+#: ../clients/common/nm-client-utils.c:444
 msgid "Could not create a software link"
 msgstr "Software-Link konnte nicht erstellt werden"
 
-#: ../clients/common/nm-client-utils.c:374
+#: ../clients/common/nm-client-utils.c:446
 msgid "The device disappeared"
 msgstr "Das Gerät verschwand"
 
-#: ../clients/common/nm-meta-setting-access.c:492
+#: ../clients/common/nm-meta-setting-access.c:501
 #, c-format
 msgid "field '%s' has to be alone"
 msgstr "Feld »%s« muss allein stehen"
 
-#: ../clients/common/nm-meta-setting-access.c:507
+#: ../clients/common/nm-meta-setting-access.c:516
 #, c-format
 msgid "invalid field '%s%s%s%s%s'; %s%s%s"
 msgstr "Ungültiges Feld »%s%s%s%s%s«; %s%s%s"
 
-#: ../clients/common/nm-meta-setting-desc.c:99
-#: ../clients/common/nm-meta-setting-desc.c:161
+#: ../clients/common/nm-meta-setting-desc.c:100
+#: ../clients/common/nm-meta-setting-desc.c:156
 #, c-format
 msgid "invalid prefix '%s'; <1-%d> allowed"
 msgstr "ungültiger Präfix »%s«. <1-%d> ist erlaubt"
 
-#: ../clients/common/nm-meta-setting-desc.c:107
+#: ../clients/common/nm-meta-setting-desc.c:108
 #, c-format
 msgid "invalid IP address: %s"
 msgstr "Ungültige IP-Adresse: %s"
@@ -4687,239 +4479,266 @@ msgstr ""
 "Die gültige Syntax lautet: 'IP[/Präfix] [next-hop] [Metrik] "
 "[Attribut=Wert]... [,IP[/Präfix] ...]'"
 
-#: ../clients/common/nm-meta-setting-desc.c:172
+#: ../clients/common/nm-meta-setting-desc.c:167
 #, c-format
 msgid "the next hop ('%s') must be first"
-msgstr "»next hop« (%s) muss der erste sein"
+msgstr ""
 
-#: ../clients/common/nm-meta-setting-desc.c:178
+#: ../clients/common/nm-meta-setting-desc.c:173
 #, c-format
 msgid "the metric ('%s') must be before attributes"
-msgstr "die Metrik (»%s«) muss vor den Attributen stehen"
+msgstr ""
 
-#: ../clients/common/nm-meta-setting-desc.c:218
+#: ../clients/common/nm-meta-setting-desc.c:213
 #, c-format
 msgid "invalid route: %s. %s"
 msgstr "Ungültige Route: %s. %s"
 
-#: ../clients/common/nm-meta-setting-desc.c:230
+#: ../clients/common/nm-meta-setting-desc.c:225
 msgid "default route cannot be added (NetworkManager handles it by itself)"
 msgstr ""
 "Die Standard-Route kann nicht hinzugefügt werden (NetworkManager kümmert "
 "sich selbst darum)"
 
-#: ../clients/common/nm-meta-setting-desc.c:429
+#: ../clients/common/nm-meta-setting-desc.c:424
 #, c-format
 msgid "invalid priority map '%s'"
 msgstr "ungültige Prioritätsabbildung »%s«"
 
-#: ../clients/common/nm-meta-setting-desc.c:436
-#: ../clients/common/nm-meta-setting-desc.c:442
+#: ../clients/common/nm-meta-setting-desc.c:431
+#: ../clients/common/nm-meta-setting-desc.c:437
 #, c-format
 msgid "priority '%s' is not valid (<0-%ld>)"
 msgstr "Priorität »%s« ist ungültig (<0-%ld>)"
 
-#: ../clients/common/nm-meta-setting-desc.c:494
+#: ../clients/common/nm-meta-setting-desc.c:489
 #, c-format
 msgid "cannot read pac-script from file '%s'"
 msgstr "PAC-Skript kann nicht aus Datei »%s« gelesen werden"
 
-#: ../clients/common/nm-meta-setting-desc.c:501
+#: ../clients/common/nm-meta-setting-desc.c:496
 #, c-format
 msgid "file '%s' contains non-valid utf-8"
 msgstr "Datei »%s« enthält kein gültiges utf-8"
 
-#: ../clients/common/nm-meta-setting-desc.c:514
+#: ../clients/common/nm-meta-setting-desc.c:509
 #, c-format
 msgid "'%s' does not contain a valid PAC Script"
 msgstr "»%s« enthält kein kein gültiges PAC-Skript"
 
-#: ../clients/common/nm-meta-setting-desc.c:517
+#: ../clients/common/nm-meta-setting-desc.c:512
 #, c-format
 msgid "Not a valid PAC Script"
 msgstr "Kein gültiges PAC-Skript"
 
-#: ../clients/common/nm-meta-setting-desc.c:571
+#: ../clients/common/nm-meta-setting-desc.c:566
 #, c-format
 msgid "cannot read team config from file '%s'"
 msgstr "Team-Konfiguration kann nicht aus Datei »%s« gelesen werden"
 
-#: ../clients/common/nm-meta-setting-desc.c:578
+#: ../clients/common/nm-meta-setting-desc.c:573
 #, c-format
 msgid "team config file '%s' contains non-valid utf-8"
 msgstr "Team-Konfigurationsdatei »%s« enthält ungültiges UTF-8"
 
-#: ../clients/common/nm-meta-setting-desc.c:590
+#: ../clients/common/nm-meta-setting-desc.c:585
 #, c-format
 msgid "'%s' does not contain a valid team configuration"
 msgstr "»%s« enthält keine gültige Team-Konfiguration"
 
-#: ../clients/common/nm-meta-setting-desc.c:593
+#: ../clients/common/nm-meta-setting-desc.c:588
 #, c-format
 msgid "team configuration must be a JSON object"
 msgstr "Team-Konfiguration muss ein JSON-Objekt sein"
 
-#: ../clients/common/nm-meta-setting-desc.c:714
+#: ../clients/common/nm-meta-setting-desc.c:682
 #: ../clients/tui/nmt-mtu-entry.c:84
 msgid "(default)"
 msgstr "(Vorgabe)"
 
-#: ../clients/common/nm-meta-setting-desc.c:855
+#: ../clients/common/nm-meta-setting-desc.c:797
 msgid "auto"
 msgstr "auto"
 
-#: ../clients/common/nm-meta-setting-desc.c:1007
+#: ../clients/common/nm-meta-setting-desc.c:945
 #, c-format
 msgid "%s (%s)"
 msgstr "%s (%s)"
 
-#: ../clients/common/nm-meta-setting-desc.c:1131
+#: ../clients/common/nm-meta-setting-desc.c:1069
 #, c-format
 msgid "'%s' is out of range [%lli, %lli]"
 msgstr "»%s« ist außerhalb des Bereichs [%lli, %lli]"
 
-#: ../clients/common/nm-meta-setting-desc.c:1137
+#: ../clients/common/nm-meta-setting-desc.c:1075
 #, c-format
 msgid "'%s' is not a valid number"
 msgstr "»%s« ist keine gültige Zahl"
 
-#: ../clients/common/nm-meta-setting-desc.c:1187
+#: ../clients/common/nm-meta-setting-desc.c:1125
 #, c-format
 msgid "'%s' is out of range [0, %u]"
 msgstr "»%s« ist außerhalb des Bereichs [0, %u]"
 
-#: ../clients/common/nm-meta-setting-desc.c:1230
+#: ../clients/common/nm-meta-setting-desc.c:1162
 #, c-format
 msgid "'%s' is not a valid Ethernet MAC"
 msgstr "»%s« ist keine gültige Ethernet MAC-Adresse"
 
-#: ../clients/common/nm-meta-setting-desc.c:1334
+#: ../clients/common/nm-meta-setting-desc.c:1181
+#, c-format
+msgid "'%s' is not a valid flag number; use <0-%d>"
+msgstr "»%s« ist keine gültige flag-Zahl. Verwenden Sie <0-%d>"
+
+#: ../clients/common/nm-meta-setting-desc.c:1195
+#, c-format
+msgid "'%s' sum is higher than all flags => all flags set"
+msgstr "Die Summe »%s« ist größer als alle Flags => alle Flags gesetzt"
+
+#: ../clients/common/nm-meta-setting-desc.c:1299
 #, c-format
 msgid "invalid option '%s', use a combination of [%s]"
 msgstr "ungültige Option »%s«. Verwenden Sie eine Kombination aus [%s]"
 
-#: ../clients/common/nm-meta-setting-desc.c:1339 ../libnm-core/nm-keyfile.c:770
+#: ../clients/common/nm-meta-setting-desc.c:1304
+#: ../libnm-core/nm-keyfile-reader.c:623
 #, c-format
 msgid "invalid option '%s', use one of [%s]"
 msgstr "ungültige Option »%s«. Verwenden Sie eine aus [%s]"
 
-#: ../clients/common/nm-meta-setting-desc.c:1458
+#: ../clients/common/nm-meta-setting-desc.c:1427
 #, c-format
 msgid "%d (key)"
 msgstr "%d (Schlüssel)"
 
-#: ../clients/common/nm-meta-setting-desc.c:1460
+#: ../clients/common/nm-meta-setting-desc.c:1429
 #, c-format
 msgid "%d (passphrase)"
 msgstr "%d (Passphrase)"
 
-#: ../clients/common/nm-meta-setting-desc.c:1463
+#: ../clients/common/nm-meta-setting-desc.c:1432
+#: ../clients/common/nm-meta-setting-desc.c:1521
 #, c-format
 msgid "%d (unknown)"
 msgstr "%d (unbekannt)"
 
-#: ../clients/common/nm-meta-setting-desc.c:1495
+#: ../clients/common/nm-meta-setting-desc.c:1464
 msgid "0 (NONE)"
 msgstr "0 (KEINES)"
 
-#: ../clients/common/nm-meta-setting-desc.c:1501
+#: ../clients/common/nm-meta-setting-desc.c:1470
 msgid "REORDER_HEADERS, "
 msgstr "REORDER_HEADERS, "
 
-#: ../clients/common/nm-meta-setting-desc.c:1503
+#: ../clients/common/nm-meta-setting-desc.c:1472
 msgid "GVRP, "
 msgstr "GVRP, "
 
-#: ../clients/common/nm-meta-setting-desc.c:1505
+#: ../clients/common/nm-meta-setting-desc.c:1474
 msgid "LOOSE_BINDING, "
 msgstr "LOOSE_BINDING, "
 
-#: ../clients/common/nm-meta-setting-desc.c:1507
+#: ../clients/common/nm-meta-setting-desc.c:1476
 msgid "MVRP, "
 msgstr "MVRP, "
 
-#: ../clients/common/nm-meta-setting-desc.c:1547
+#: ../clients/common/nm-meta-setting-desc.c:1515
+#, c-format
+msgid "%d (disabled)"
+msgstr "%d (deaktiviert)"
+
+#: ../clients/common/nm-meta-setting-desc.c:1517
+#, c-format
+msgid "%d (enabled, prefer public IP)"
+msgstr "%d (aktiviert, öffentliche IP bevorzugen)"
+
+#: ../clients/common/nm-meta-setting-desc.c:1519
+#, c-format
+msgid "%d (enabled, prefer temporary IP)"
+msgstr "%d (aktiviert, temporäre IP bevorzugen)"
+
+#: ../clients/common/nm-meta-setting-desc.c:1534
 msgid "0 (none)"
 msgstr "0 (keine)"
 
-#: ../clients/common/nm-meta-setting-desc.c:1553
+#: ../clients/common/nm-meta-setting-desc.c:1540
 msgid "agent-owned, "
 msgstr "Agent-Besitz, "
 
-#: ../clients/common/nm-meta-setting-desc.c:1555
+#: ../clients/common/nm-meta-setting-desc.c:1542
 msgid "not saved, "
 msgstr "nicht gespeichert, "
 
-#: ../clients/common/nm-meta-setting-desc.c:1557
+#: ../clients/common/nm-meta-setting-desc.c:1544
 msgid "not required, "
 msgstr "nicht notwendig, "
 
-#: ../clients/common/nm-meta-setting-desc.c:1622
+#: ../clients/common/nm-meta-setting-desc.c:1606
 #, c-format
 msgid "'%s' is not valid; use <option>=<value>"
 msgstr "»%s« ist ungültig. Verwenden Sie <Option>=<Wert>"
 
-#: ../clients/common/nm-meta-setting-desc.c:1661
+#: ../clients/common/nm-meta-setting-desc.c:1648
 msgid "no item to remove"
 msgstr "Kein Eintrag zum Entfernen vorhanden"
 
-#: ../clients/common/nm-meta-setting-desc.c:1665
+#: ../clients/common/nm-meta-setting-desc.c:1652
 #, c-format
 msgid "index '%d' is not in range <0-%d>"
 msgstr "Index »%d« ist außerhalb des Bereichs <0-%d>"
 
-#: ../clients/common/nm-meta-setting-desc.c:1680
+#: ../clients/common/nm-meta-setting-desc.c:1667
 #, c-format
 msgid "invalid option '%s'"
 msgstr "Ungültige Option »%s«"
 
-#: ../clients/common/nm-meta-setting-desc.c:1682
+#: ../clients/common/nm-meta-setting-desc.c:1669
 msgid "missing option"
 msgstr "fehlende Option"
 
-#: ../clients/common/nm-meta-setting-desc.c:1706
+#: ../clients/common/nm-meta-setting-desc.c:1693
 #, c-format
 msgid "'%s' is not a valid MAC"
 msgstr "»%s« ist keine gültige MAC-Adresse"
 
-#: ../clients/common/nm-meta-setting-desc.c:1733
-#: ../clients/common/nm-meta-setting-desc.c:1830
-#: ../clients/common/nm-meta-setting-desc.c:4807
+#: ../clients/common/nm-meta-setting-desc.c:1723
+#: ../clients/common/nm-meta-setting-desc.c:1819
+#: ../clients/common/nm-meta-setting-desc.c:4667
 #, c-format
 msgid "'%s' is not valid"
 msgstr "»%s» ist ungültig"
 
-#: ../clients/common/nm-meta-setting-desc.c:1774
+#: ../clients/common/nm-meta-setting-desc.c:1763
 #, c-format
 msgid "'%u' flags are not valid; use combination of %s"
 msgstr "Flags »%u« sind ungültig. Verwenden Sie eine Kombination von %s"
 
-#: ../clients/common/nm-meta-setting-desc.c:1810
+#: ../clients/common/nm-meta-setting-desc.c:1799
 #, c-format
 msgid "'%s' is not a valid number (or out of range)"
 msgstr "»%s« ist keine gültige Zahl (oder außerhalb des Bereichs)"
 
-#: ../clients/common/nm-meta-setting-desc.c:1929
+#: ../clients/common/nm-meta-setting-desc.c:1919
 #, c-format
 msgid "'%s' is not a valid hex character"
 msgstr "»%s« ist kein gültiger hexadezimaler Wert"
 
-#: ../clients/common/nm-meta-setting-desc.c:2218
+#: ../clients/common/nm-meta-setting-desc.c:2199
 #, c-format
 msgid "the property doesn't contain EAP method '%s'"
 msgstr "Die Eigenschaft enthält nicht die EAP-Methode »%s«"
 
-#: ../clients/common/nm-meta-setting-desc.c:2241
+#: ../clients/common/nm-meta-setting-desc.c:2222
 #, fuzzy, c-format
 msgid "the property doesn't contain alternative subject match '%s'"
 msgstr "die Eigenschaft enthält kein alternative Themen passend zu »%s«"
 
-#: ../clients/common/nm-meta-setting-desc.c:2267
+#: ../clients/common/nm-meta-setting-desc.c:2248
 #, fuzzy, c-format
 msgid "the property doesn't contain \"phase2\" alternative subject match '%s'"
 msgstr "die Eigenschaft enthält nicht die Berechtigung »%s«"
 
-#: ../clients/common/nm-meta-setting-desc.c:2389
+#: ../clients/common/nm-meta-setting-desc.c:2369
 #, c-format
 msgid ""
 "Enter a list of bonding options formatted as:\n"
@@ -4957,256 +4776,242 @@ msgstr ""
 #. * hacky: we can not see if the type is already set, because
 #. * nmc_setting_set_property() is called only after the property
 #. * we're setting (type) has been removed.
-#: ../clients/common/nm-meta-setting-desc.c:2452
+#: ../clients/common/nm-meta-setting-desc.c:2429
 #, c-format
 msgid "Can not change the connection type"
 msgstr "Der Verbindungstyp kann nicht geändert werden"
 
-#: ../clients/common/nm-meta-setting-desc.c:2557
+#: ../clients/common/nm-meta-setting-desc.c:2539
 #, c-format
 msgid "the property doesn't contain permission '%s'"
 msgstr "die Eigenschaft enthält nicht die Berechtigung »%s«"
 
-#: ../clients/common/nm-meta-setting-desc.c:2578
+#: ../clients/common/nm-meta-setting-desc.c:2560
 #, c-format
 msgid "'%s' is not valid master; use ifname or connection UUID"
 msgstr ""
 "»%s« ist kein gültiger Master; verwenden Sie einen Interfacenamen (ifname) "
 "oder eine Verbindungskennung (UUID)"
 
-#: ../clients/common/nm-meta-setting-desc.c:2675
+#: ../clients/common/nm-meta-setting-desc.c:2659
 #, c-format
 msgid "the value '%s' is not a valid UUID"
 msgstr "Der Wert »%s» ist keine gültige UUID"
 
-#: ../clients/common/nm-meta-setting-desc.c:2682
+#: ../clients/common/nm-meta-setting-desc.c:2666
 #, c-format
 msgid "the property doesn't contain UUID '%s'"
 msgstr "die Eigenschaft enthält nicht die UUID »%s«"
 
-#: ../clients/common/nm-meta-setting-desc.c:2751
+#: ../clients/common/nm-meta-setting-desc.c:2733
 msgid "0 (disabled)"
 msgstr "0 (deaktiviert)"
 
-#: ../clients/common/nm-meta-setting-desc.c:2757
+#: ../clients/common/nm-meta-setting-desc.c:2739
 msgid "enabled, "
 msgstr "aktiviert, "
 
-#: ../clients/common/nm-meta-setting-desc.c:2759
+#: ../clients/common/nm-meta-setting-desc.c:2741
 msgid "advertise, "
 msgstr "sichtbar, "
 
-#: ../clients/common/nm-meta-setting-desc.c:2761
+#: ../clients/common/nm-meta-setting-desc.c:2743
 msgid "willing, "
 msgstr "willig, "
 
-#: ../clients/common/nm-meta-setting-desc.c:2883
+#: ../clients/common/nm-meta-setting-desc.c:2863
 #, c-format
 msgid "'%s' is not a valid DCB flag"
 msgstr "»%s« ist kein gültiges DCB-Flag"
 
-#: ../clients/common/nm-meta-setting-desc.c:2912
+#: ../clients/common/nm-meta-setting-desc.c:2893
 msgid "must contain 8 comma-separated numbers"
 msgstr "muss 8 mit Kommata getrennte Zahlen enthalten"
 
-#: ../clients/common/nm-meta-setting-desc.c:2928
+#: ../clients/common/nm-meta-setting-desc.c:2909
 #, c-format
 msgid "'%s' not a number between 0 and %u (inclusive) or %u"
 msgstr "»%s« ist keine Zahl zwischen 0 und %u (einschließlich) oder %u"
 
-#: ../clients/common/nm-meta-setting-desc.c:2931
+#: ../clients/common/nm-meta-setting-desc.c:2912
 #, c-format
 msgid "'%s' not a number between 0 and %u (inclusive)"
 msgstr "»%s« ist keine Zahl zwischen 0 und %u (einschließlich)"
 
-#: ../clients/common/nm-meta-setting-desc.c:2952
+#: ../clients/common/nm-meta-setting-desc.c:2933
 #, c-format
 msgid "changes will have no effect until '%s' includes 1 (enabled)"
 msgstr "Die Änderungen wirken sich erst aus wenn »%s« 1 enthält (aktiviert)"
 
-#: ../clients/common/nm-meta-setting-desc.c:3007
+#: ../clients/common/nm-meta-setting-desc.c:2988
 #, c-format
 msgid "bandwidth percentages must total 100%%"
 msgstr "Die Prozentzahlen der Bandbreiten müssen in Summe 100%% ergeben"
 
-#: ../clients/common/nm-meta-setting-desc.c:3080
-#: ../clients/common/nm-meta-setting-desc.c:3086
+#: ../clients/common/nm-meta-setting-desc.c:3061
+#: ../clients/common/nm-meta-setting-desc.c:3067
 msgid "SIM operator ID must be a 5 or 6 number MCCMNC code"
 msgstr ""
 "Die Kennung des SIM-Operators muss ein fünf- oder sechsstelliger MCCMNC-Code "
 "sein"
 
-#: ../clients/common/nm-meta-setting-desc.c:3110
+#: ../clients/common/nm-meta-setting-desc.c:3091
 #, c-format
 msgid "'%s' is not a valid IBoIP P_Key"
 msgstr "»%s« ist kein gültiger IBoIP P_Key"
 
-#: ../clients/common/nm-meta-setting-desc.c:3133
+#: ../clients/common/nm-meta-setting-desc.c:3114
 msgid "default"
 msgstr "Vorgabe"
 
-#: ../clients/common/nm-meta-setting-desc.c:3272
-#: ../clients/common/nm-meta-setting-desc.c:3289
+#: ../clients/common/nm-meta-setting-desc.c:3248
+#: ../clients/common/nm-meta-setting-desc.c:3267
 #, c-format
 msgid "invalid IPv4 address '%s'"
 msgstr "Ungültige IPv4-Adresse »%s«"
 
-#: ../clients/common/nm-meta-setting-desc.c:3295
-#: ../clients/common/nm-meta-setting-desc.c:3539
+#: ../clients/common/nm-meta-setting-desc.c:3273
+#: ../clients/common/nm-meta-setting-desc.c:3527
 #, c-format
 msgid "the property doesn't contain DNS server '%s'"
 msgstr "die Eigenschaft enthält nicht den DNS-Server »%s«"
 
-#: ../clients/common/nm-meta-setting-desc.c:3333
-#: ../clients/common/nm-meta-setting-desc.c:3577
+#: ../clients/common/nm-meta-setting-desc.c:3313
+#: ../clients/common/nm-meta-setting-desc.c:3567
 #, c-format
 msgid "the property doesn't contain DNS search domain '%s'"
 msgstr "die Eigenschaft enthält nicht die Suchdomäne »%s«"
 
-#: ../clients/common/nm-meta-setting-desc.c:3370
-#: ../clients/common/nm-meta-setting-desc.c:3614
+#: ../clients/common/nm-meta-setting-desc.c:3350
+#: ../clients/common/nm-meta-setting-desc.c:3604
 #, c-format
 msgid "the property doesn't contain DNS option '%s'"
 msgstr "Die Eigenschaft enthält nicht die DNS-Option »%s«"
 
-#: ../clients/common/nm-meta-setting-desc.c:3413
-#: ../clients/common/nm-meta-setting-desc.c:3663
+#: ../clients/common/nm-meta-setting-desc.c:3393
+#: ../clients/common/nm-meta-setting-desc.c:3653
 #, c-format
 msgid "the property doesn't contain IP address '%s'"
 msgstr "die Eigenschaft enthält nicht die IP-Adresse »%s«"
 
-#: ../clients/common/nm-meta-setting-desc.c:3433
-#: ../clients/common/nm-meta-setting-desc.c:3682
+#: ../clients/common/nm-meta-setting-desc.c:3413
+#: ../clients/common/nm-meta-setting-desc.c:3672
 #, c-format
 msgid "invalid gateway address '%s'"
 msgstr "Ungültige Gateway-Adresse »%s«"
 
-#: ../clients/common/nm-meta-setting-desc.c:3472
-#: ../clients/common/nm-meta-setting-desc.c:3723
+#: ../clients/common/nm-meta-setting-desc.c:3452
+#: ../clients/common/nm-meta-setting-desc.c:3713
 #, c-format
 msgid "the property doesn't contain route '%s'"
 msgstr "Die Eigenschaft enthält nicht die Route »%s«"
 
-#: ../clients/common/nm-meta-setting-desc.c:3516
-#: ../clients/common/nm-meta-setting-desc.c:3533
+#: ../clients/common/nm-meta-setting-desc.c:3502
+#: ../clients/common/nm-meta-setting-desc.c:3521
 #, c-format
 msgid "invalid IPv6 address '%s'"
 msgstr "Ungültige IPv6-Adresse »%s«"
 
-#: ../clients/common/nm-meta-setting-desc.c:3785
-#, fuzzy, c-format
-#| msgid "the property doesn't contain tfilter '%s'"
-msgid "the property doesn't contain interface name '%s'"
-msgstr "die Eigenschaft enthält nicht tfilter »%s«"
+#: ../clients/common/nm-meta-setting-desc.c:3731
+#: ../libnm-core/nm-setting-gsm.c:381 ../libnm-util/nm-setting-gsm.c:364
+#, c-format
+msgid "'%s' is not a number"
+msgstr "»%s« ist keine Zahl"
 
-#: ../clients/common/nm-meta-setting-desc.c:3822
+#: ../clients/common/nm-meta-setting-desc.c:3738
+#, c-format
+msgid "'%s' is not valid; use 0, 1, or 2"
+msgstr "»%s« ist ungültig. Verwenden Sie 0, 1 oder 2"
+
+#: ../clients/common/nm-meta-setting-desc.c:3772
 #, c-format
 msgid "'%s' is not a valid channel; use <1-13>"
 msgstr "»%s« ist kein gültiger Kanal. Verwenden Sie <1-13>"
 
-#: ../clients/common/nm-meta-setting-desc.c:3914
-#, fuzzy
-#| msgid ""
-#| "The valid syntax is: 'ip[/prefix] [next-hop] [metric] [attribute=val]... "
-#| "[,ip[/prefix] ...]'"
-msgid "The valid syntax is: vf [attribute=value]... [,vf [attribute=value]...]"
-msgstr ""
-"Die gültige Syntax lautet: 'IP[/Präfix] [next-hop] [Metrik] "
-"[Attribut=Wert]... [,IP[/Präfix] ...]'"
-
-#: ../clients/common/nm-meta-setting-desc.c:3936
+#: ../clients/common/nm-meta-setting-desc.c:3832
 msgid ""
 "The valid syntax is: '[root | parent <handle>] [handle <handle>] <qdisc>'"
 msgstr ""
-"Die gültige Syntax ist: [root | parent <Handle>] [handle <Handle>] <qdisc>'"
 
-#: ../clients/common/nm-meta-setting-desc.c:3960
+#: ../clients/common/nm-meta-setting-desc.c:3855
 #, fuzzy, c-format
-#| msgid "the property doesn't contain tfilter '%s'"
-msgid "the property doesn't contain vf with index %u"
-msgstr "die Eigenschaft enthält nicht tfilter »%s«"
-
-#: ../clients/common/nm-meta-setting-desc.c:3987
-#, c-format
 msgid "the property doesn't contain qdisc '%s'"
-msgstr "die Eigenschaft enthält nicht qdisc »%s«"
+msgstr "die Eigenschaft enthält nicht die UUID »%s«"
 
-#: ../clients/common/nm-meta-setting-desc.c:4041
+#: ../clients/common/nm-meta-setting-desc.c:3908
 msgid ""
 "The valid syntax is: '[root | parent <handle>] [handle <handle>] <tfilter>'"
 msgstr ""
-"Die gültige Syntax ist: [root | parent <Handle>] [handle <Handle>] <tfilter>'"
 
-#: ../clients/common/nm-meta-setting-desc.c:4064
-#, c-format
+#: ../clients/common/nm-meta-setting-desc.c:3931
+#, fuzzy, c-format
 msgid "the property doesn't contain tfilter '%s'"
-msgstr "die Eigenschaft enthält nicht tfilter »%s«"
+msgstr "Die Eigenschaft enthält nicht die Route »%s«"
 
-#: ../clients/common/nm-meta-setting-desc.c:4131
-#, c-format
+#: ../clients/common/nm-meta-setting-desc.c:3992
+#, fuzzy, c-format
 msgid "the property doesn't contain string '%s'"
-msgstr "die Eigenschaft enthält nicht die Zeichenkette »%s«"
+msgstr "Die Eigenschaft enthält nicht die Abbildung »%s«"
 
-#: ../clients/common/nm-meta-setting-desc.c:4206
-#: ../clients/common/nm-meta-setting-desc.c:4280
+#: ../clients/common/nm-meta-setting-desc.c:4065
+#: ../clients/common/nm-meta-setting-desc.c:4137
 #, fuzzy, c-format
 msgid "the property doesn't contain link watcher '%s'"
 msgstr "Die Eigenschaft enthält nicht die Route »%s«"
 
-#: ../clients/common/nm-meta-setting-desc.c:4386
+#: ../clients/common/nm-meta-setting-desc.c:4228
 #, c-format
 msgid "only one mapping at a time is supported; taking the first one (%s)"
 msgstr ""
 "Es werden nicht mehrere Abbildungen gleichzeitig unterstützt. Es wird die "
 "erste verwendet (%s)"
 
-#: ../clients/common/nm-meta-setting-desc.c:4394
+#: ../clients/common/nm-meta-setting-desc.c:4236
 #, c-format
 msgid "the property doesn't contain mapping '%s'"
 msgstr "Die Eigenschaft enthält nicht die Abbildung »%s«"
 
-#: ../clients/common/nm-meta-setting-desc.c:4402
+#: ../clients/common/nm-meta-setting-desc.c:4244
 msgid "no priority to remove"
 msgstr "Keine Priorität zum Entfernen"
 
-#: ../clients/common/nm-meta-setting-desc.c:4406
+#: ../clients/common/nm-meta-setting-desc.c:4248
 #, c-format
 msgid "index '%d' is not in the range of <0-%d>"
 msgstr "Index »%d« ist außerhalb des Bereichs <0-%d>"
 
-#: ../clients/common/nm-meta-setting-desc.c:4475
+#: ../clients/common/nm-meta-setting-desc.c:4317
 #, c-format
 msgid "'%s' cannot be empty"
 msgstr "»%s« darf nicht leer sein"
 
-#: ../clients/common/nm-meta-setting-desc.c:4514
-#: ../clients/common/nm-meta-setting-desc.c:4645
-#: ../libnm-core/nm-setting-sriov.c:446 ../libnm-core/nm-setting-wired.c:662
-#: ../libnm-core/nm-setting-wireless.c:857
-#: ../libnm-core/nm-setting-wireless.c:869 ../libnm-util/nm-setting-wired.c:645
-#: ../libnm-util/nm-setting-wireless.c:858
-#: ../libnm-util/nm-setting-wireless.c:872
+#: ../clients/common/nm-meta-setting-desc.c:4356
+#: ../clients/common/nm-meta-setting-desc.c:4489
+#: ../libnm-core/nm-setting-wired.c:664 ../libnm-core/nm-setting-wireless.c:857
+#: ../libnm-core/nm-setting-wireless.c:869 ../libnm-util/nm-setting-wired.c:646
+#: ../libnm-util/nm-setting-wireless.c:859
+#: ../libnm-util/nm-setting-wireless.c:873
 #, c-format
 msgid "'%s' is not a valid MAC address"
 msgstr "»%s« ist keine gültige MAC-Adresse"
 
-#: ../clients/common/nm-meta-setting-desc.c:4520
-#: ../clients/common/nm-meta-setting-desc.c:4651
+#: ../clients/common/nm-meta-setting-desc.c:4362
+#: ../clients/common/nm-meta-setting-desc.c:4495
 #, c-format
 msgid "the property doesn't contain MAC address '%s'"
 msgstr "die Eigenschaft enthält nicht die MAC-Adresse »%s«"
 
-#: ../clients/common/nm-meta-setting-desc.c:4538
+#: ../clients/common/nm-meta-setting-desc.c:4380
 #, c-format
 msgid "'%s' is not valid; 2 or 3 strings should be provided"
 msgstr "»%s« ist ungültig. 2 oder 3 Zeichenketten müssen angegeben werden"
 
-#: ../clients/common/nm-meta-setting-desc.c:4552
+#: ../clients/common/nm-meta-setting-desc.c:4396
 #, c-format
 msgid "'%s' string value should consist of 1 - 199 characters"
 msgstr "Die Zeichenkette »%s« muss aus 1-199 Zeichen bestehen"
 
-#: ../clients/common/nm-meta-setting-desc.c:4584
+#: ../clients/common/nm-meta-setting-desc.c:4428
 #, c-format
 msgid ""
 "Enter a list of S/390 options formatted as:\n"
@@ -5217,24 +5022,24 @@ msgstr ""
 "  Option = <Wert>, Option = <Wert>,… \n"
 "Mögliche Optionen sind: %s\n"
 
-#: ../clients/common/nm-meta-setting-desc.c:4618
+#: ../clients/common/nm-meta-setting-desc.c:4462
 #, c-format
 msgid "'%s' is not a valid channel"
 msgstr "»%s« ist kein gültiger Kanal"
 
-#: ../clients/common/nm-meta-setting-desc.c:4624
+#: ../clients/common/nm-meta-setting-desc.c:4468
 #, c-format
 msgid "'%ld' is not a valid channel"
 msgstr "»%ld« ist kein gültiger Kanal"
 
-#: ../clients/common/nm-meta-setting-desc.c:4707
-#: ../clients/common/nm-meta-setting-desc.c:4743
-#: ../clients/common/nm-meta-setting-desc.c:4779
+#: ../clients/common/nm-meta-setting-desc.c:4567
+#: ../clients/common/nm-meta-setting-desc.c:4603
+#: ../clients/common/nm-meta-setting-desc.c:4639
 #, c-format
 msgid "the property doesn't contain protocol '%s'"
 msgstr "die Eigenschaft enthält nicht das Protokoll »%s«"
 
-#: ../clients/common/nm-meta-setting-desc.c:4816
+#: ../clients/common/nm-meta-setting-desc.c:4676
 #, c-format
 msgid ""
 "'%s' not compatible with %s '%s', please change the key or set the right %s "
@@ -5243,64 +5048,58 @@ msgstr ""
 "»%s« ist nicht kompatibel mit %s »%s«. Bitte ändern Sie den Schlüssel oder "
 "legen Sie zuerst das richtige %s fest."
 
-#: ../clients/common/nm-meta-setting-desc.c:4826
+#: ../clients/common/nm-meta-setting-desc.c:4686
 #, c-format
 msgid "WEP key is guessed to be of '%s'"
 msgstr "Der WEP-Schlüssel ist vermutlich »%s«"
 
-#: ../clients/common/nm-meta-setting-desc.c:4831
+#: ../clients/common/nm-meta-setting-desc.c:4691
 #, c-format
 msgid "WEP key index set to '%d'"
 msgstr "Der WEP-Schlüsselindex wurde auf »%d« gesetzt"
 
-#: ../clients/common/nm-meta-setting-desc.c:4870
+#: ../clients/common/nm-meta-setting-desc.c:4730
 #, c-format
 msgid "'%s' is not compatible with '%s' type, please change or delete the key."
 msgstr ""
 "»%s« ist nicht kompatibel mit dem Typ »%s«. Bitte ändern oder löschen Sie "
 "den Schlüssel."
 
-#: ../clients/common/nm-meta-setting-desc.c:4880
+#: ../clients/common/nm-meta-setting-desc.c:4740
 #, c-format
 msgid "'%s' is not a valid PSK"
 msgstr "»%s« ist kein gültiger PSK"
 
-#: ../clients/common/nm-meta-setting-desc.c:4932
-#, fuzzy, c-format
-#| msgid "'%s' is not valid; use 0, 1, or 2"
-msgid "'%s' is not valid; use 'on', 'off', or 'ignore'"
-msgstr "»%s« ist ungültig. Verwenden Sie 0, 1 oder 2"
-
-#: ../clients/common/nm-meta-setting-desc.c:4991
+#: ../clients/common/nm-meta-setting-desc.c:4772
 msgid "Bonding primary interface [none]"
 msgstr "Primäre Schnittstelle der Bündelung [keine]"
 
 #. this is a virtual property, only needed during "ask" mode.
-#: ../clients/common/nm-meta-setting-desc.c:4998
+#: ../clients/common/nm-meta-setting-desc.c:4779
 msgid "Bonding monitoring mode"
 msgstr "Überwachungsmodus der Bündelung"
 
-#: ../clients/common/nm-meta-setting-desc.c:5007
+#: ../clients/common/nm-meta-setting-desc.c:4788
 msgid "Bonding miimon [100]"
 msgstr "Bündelung »miimon« [100]"
 
-#: ../clients/common/nm-meta-setting-desc.c:5015
+#: ../clients/common/nm-meta-setting-desc.c:4796
 msgid "Bonding downdelay [0]"
 msgstr "Bündelung »downdelay« [0]"
 
-#: ../clients/common/nm-meta-setting-desc.c:5023
+#: ../clients/common/nm-meta-setting-desc.c:4804
 msgid "Bonding updelay [0]"
 msgstr "Bündelung »updelay« [0]"
 
-#: ../clients/common/nm-meta-setting-desc.c:5031
+#: ../clients/common/nm-meta-setting-desc.c:4812
 msgid "Bonding arp-interval [0]"
 msgstr "Bündelung »arp-interval« [0]"
 
-#: ../clients/common/nm-meta-setting-desc.c:5039
+#: ../clients/common/nm-meta-setting-desc.c:4820
 msgid "Bonding arp-ip-target [none]"
 msgstr "Bündelung »arp-ip-target« [keines]"
 
-#: ../clients/common/nm-meta-setting-desc.c:5047
+#: ../clients/common/nm-meta-setting-desc.c:4828
 msgid "LACP rate ('slow' or 'fast') [slow]"
 msgstr "LACP-Rate (»slow« oder »fast«) [slow]"
 
@@ -5308,7 +5107,7 @@ msgstr "LACP-Rate (»slow« oder »fast«) [slow]"
 #. * that the actual type is (gboolean(*)(type *)).
 #. macro that returns @func as const (guint32(*)(NMSetting*)) type, but checks
 #. * that the actual type is (guint32(*)(type *)).
-#: ../clients/common/nm-meta-setting-desc.c:5166
+#: ../clients/common/nm-meta-setting-desc.c:4940
 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 "
@@ -5326,7 +5125,7 @@ msgstr ""
 "\"roundrobin\"}, \"ports\": {\"eth1\": {}, \"eth2\": {}} }\n"
 "          set team.config /etc/my-team.conf\n"
 
-#: ../clients/common/nm-meta-setting-desc.c:5174
+#: ../clients/common/nm-meta-setting-desc.c:4948
 msgid ""
 "Enter a list of link watchers formatted as dictionaries where the keys are "
 "teamd properties. Dictionary pairs are in the form: key=value and pairs are "
@@ -5343,16 +5142,16 @@ msgid ""
 "\n"
 "Properties available for the 'arp_ping' include all the ones for 'nsna_ping' "
 "and:\n"
-"  'source-host'*, 'validate-active', 'validate-inactive', 'send-always'.\n"
+"  'source-host', 'validate-active', 'validate-inactive', 'send-always'.\n"
 "\n"
 "Properties flagged with a '*' are mandatory.\n"
 "\n"
 "Example:\n"
-"   name=arp_ping source-host=172.16.1.1 target-host=172.16.1.254, "
-"name=ethtool delay-up=3\n"
+"   name=arp_ping,source-host=172.16.1.1,target-host=172.16.1.254; "
+"name=ethtool,delay-up=3\n"
 msgstr ""
 
-#: ../clients/common/nm-meta-setting-desc.c:5224
+#: ../clients/common/nm-meta-setting-desc.c:4999
 msgid ""
 "Enter file path to CA certificate (optionally prefixed with file://).\n"
 "  [file://]<file path>\n"
@@ -5366,7 +5165,7 @@ msgstr ""
 "unterstützt.\n"
 "Beispiel: /home/cimrman/cacert.crt\n"
 
-#: ../clients/common/nm-meta-setting-desc.c:5258
+#: ../clients/common/nm-meta-setting-desc.c:5033
 msgid ""
 "Enter file path to client certificate (optionally prefixed with file://).\n"
 "  [file://]<file path>\n"
@@ -5380,7 +5179,7 @@ msgstr ""
 "unterstützt.\n"
 "Beispiel: /home/cimrman/jara.crt\n"
 
-#: ../clients/common/nm-meta-setting-desc.c:5315
+#: ../clients/common/nm-meta-setting-desc.c:5090
 msgid ""
 "Enter file path to CA certificate for inner authentication (optionally "
 "prefixed\n"
@@ -5396,7 +5195,7 @@ msgstr ""
 "unterstützt.\n"
 "Beispiel: /home/cimrman/ca-zweite-phase.crt\n"
 
-#: ../clients/common/nm-meta-setting-desc.c:5350
+#: ../clients/common/nm-meta-setting-desc.c:5125
 msgid ""
 "Enter file path to client certificate for inner authentication (optionally "
 "prefixed\n"
@@ -5412,7 +5211,7 @@ msgstr ""
 "unterstützt.\n"
 "Beispiel: /home/cimrman/jara-zweite-phase.crt\n"
 
-#: ../clients/common/nm-meta-setting-desc.c:5377
+#: ../clients/common/nm-meta-setting-desc.c:5152
 msgid ""
 "Enter bytes as a list of hexadecimal values.\n"
 "Two formats are accepted:\n"
@@ -5434,8 +5233,8 @@ msgstr ""
 "Beispiele: ab0455a6ea3a74C2\n"
 "           ab 4 55 0xa6 ea 3a 74 C2\n"
 
-#: ../clients/common/nm-meta-setting-desc.c:5394
-#: ../clients/common/nm-meta-setting-desc.c:5412
+#: ../clients/common/nm-meta-setting-desc.c:5169
+#: ../clients/common/nm-meta-setting-desc.c:5187
 msgid ""
 "Enter path to a private key and the key password (if not set yet):\n"
 "  [file://]<file path> [<password>]\n"
@@ -5447,84 +5246,83 @@ msgstr ""
 "  [file://]<Dateipfad> [<Passwort>]\n"
 "Beispiel: /home/MaxMustermann/jara-priv-key StrengGeheim\n"
 
-#: ../clients/common/nm-meta-setting-desc.c:5451
-#: ../clients/common/nm-secret-agent-simple.c:249
-#: ../clients/common/nm-secret-agent-simple.c:347
+#: ../clients/common/nm-meta-setting-desc.c:5226
+#: ../clients/common/nm-secret-agent-simple.c:234
+#: ../clients/common/nm-secret-agent-simple.c:332
 #: ../clients/tui/nmt-page-dsl.c:66 ../clients/tui/nmt-page-wifi.c:332
 msgid "Username"
 msgstr "Benutzername"
 
-#: ../clients/common/nm-meta-setting-desc.c:5457
-#: ../clients/common/nm-meta-setting-desc.c:5641
-#: ../clients/common/nm-meta-setting-desc.c:6006
-#: ../clients/common/nm-meta-setting-desc.c:6666
+#: ../clients/common/nm-meta-setting-desc.c:5232
+#: ../clients/common/nm-meta-setting-desc.c:5416
+#: ../clients/common/nm-meta-setting-desc.c:5699
+#: ../clients/common/nm-meta-setting-desc.c:6323
 msgid "Password [none]"
 msgstr "Passwort [keines]"
 
-#: ../clients/common/nm-meta-setting-desc.c:5503
+#: ../clients/common/nm-meta-setting-desc.c:5278
 msgid "Bluetooth device address"
 msgstr "Bluetooth Geräteadresse"
 
-#: ../clients/common/nm-meta-setting-desc.c:5548
-#: ../clients/common/nm-meta-setting-desc.c:6060
-#: ../clients/common/nm-meta-setting-desc.c:7393
-#: ../clients/common/nm-meta-setting-desc.c:7431
-#: ../clients/common/nm-meta-setting-desc.c:7568
-#: ../clients/common/nm-meta-setting-desc.c:7786
+#: ../clients/common/nm-meta-setting-desc.c:5323
+#: ../clients/common/nm-meta-setting-desc.c:5753
+#: ../clients/common/nm-meta-setting-desc.c:7030
+#: ../clients/common/nm-meta-setting-desc.c:7068
+#: ../clients/common/nm-meta-setting-desc.c:7205
 msgid "MAC [none]"
 msgstr "MAC [keine]"
 
-#: ../clients/common/nm-meta-setting-desc.c:5554
+#: ../clients/common/nm-meta-setting-desc.c:5329
 msgid "Enable STP [no]"
 msgstr "STP aktivieren [nein]"
 
-#: ../clients/common/nm-meta-setting-desc.c:5560
+#: ../clients/common/nm-meta-setting-desc.c:5335
 msgid "STP priority [32768]"
 msgstr "STP-Priorität [32768]"
 
-#: ../clients/common/nm-meta-setting-desc.c:5566
+#: ../clients/common/nm-meta-setting-desc.c:5341
 msgid "Forward delay [15]"
 msgstr "Weiterleitungsverzögerung [15]"
 
-#: ../clients/common/nm-meta-setting-desc.c:5572
+#: ../clients/common/nm-meta-setting-desc.c:5347
 msgid "Hello time [2]"
 msgstr "Hello-Zeit [2]"
 
-#: ../clients/common/nm-meta-setting-desc.c:5578
+#: ../clients/common/nm-meta-setting-desc.c:5353
 msgid "Max age [20]"
 msgstr "Maximales Alter [20]"
 
-#: ../clients/common/nm-meta-setting-desc.c:5584
+#: ../clients/common/nm-meta-setting-desc.c:5359
 msgid "MAC address ageing time [300]"
 msgstr "Verfallszeit für MAC-Adressen [300]"
 
-#: ../clients/common/nm-meta-setting-desc.c:5590
+#: ../clients/common/nm-meta-setting-desc.c:5365
 msgid "Group forward mask [0]"
 msgstr ""
 
-#: ../clients/common/nm-meta-setting-desc.c:5596
+#: ../clients/common/nm-meta-setting-desc.c:5371
 msgid "Enable IGMP snooping [no]"
 msgstr "IGMP-Snooping aktivieren [nein]"
 
-#: ../clients/common/nm-meta-setting-desc.c:5608
+#: ../clients/common/nm-meta-setting-desc.c:5383
 msgid "Bridge port priority [32]"
 msgstr "Bridge-Port-Priorität [32]"
 
-#: ../clients/common/nm-meta-setting-desc.c:5614
+#: ../clients/common/nm-meta-setting-desc.c:5389
 msgid "Bridge port STP path cost [100]"
 msgstr "Bridge-Port-STP-Pfadkosten [100]"
 
-#: ../clients/common/nm-meta-setting-desc.c:5620
+#: ../clients/common/nm-meta-setting-desc.c:5395
 msgid "Hairpin [no]"
 msgstr "Hairpin-Modus [nein]"
 
-#: ../clients/common/nm-meta-setting-desc.c:5635
-#: ../clients/common/nm-meta-setting-desc.c:6000
-#: ../clients/common/nm-meta-setting-desc.c:7283
+#: ../clients/common/nm-meta-setting-desc.c:5410
+#: ../clients/common/nm-meta-setting-desc.c:5693
+#: ../clients/common/nm-meta-setting-desc.c:6920
 msgid "Username [none]"
 msgstr "Benutzername [keiner]"
 
-#: ../clients/common/nm-meta-setting-desc.c:5738
+#: ../clients/common/nm-meta-setting-desc.c:5505
 msgid ""
 "Enter a list of user permissions. This is a list of user names formatted "
 "as:\n"
@@ -5540,7 +5338,7 @@ msgstr ""
 "\n"
 "Beispiel: alice bob charlie\n"
 
-#: ../clients/common/nm-meta-setting-desc.c:5780
+#: ../clients/common/nm-meta-setting-desc.c:5547
 msgid ""
 "Enter secondary connections that should be activated when this connection "
 "is\n"
@@ -5564,7 +5362,7 @@ msgstr ""
 "\n"
 "Beispiel: private-openvpn, fe6ba5d8-c2fc-4aae-b2e3-97efddd8d9a7\n"
 
-#: ../clients/common/nm-meta-setting-desc.c:5797
+#: ../clients/common/nm-meta-setting-desc.c:5564
 msgid ""
 "Enter a value which indicates whether the connection is subject to a data\n"
 "quota, usage costs or other limitations. Accepted options are:\n"
@@ -5580,25 +5378,25 @@ msgstr ""
 "»unknown« (unbekannt), damit NetworkManager einen Wert mittels heuristischer "
 "Analysen ermittelt\n"
 
-#: ../clients/common/nm-meta-setting-desc.c:6017
+#: ../clients/common/nm-meta-setting-desc.c:5710
 msgid "APN"
 msgstr "APN"
 
-#: ../clients/common/nm-meta-setting-desc.c:6069
-#: ../clients/common/nm-meta-setting-desc.c:7456
-#: ../clients/common/nm-meta-setting-desc.c:7602
+#: ../clients/common/nm-meta-setting-desc.c:5762
+#: ../clients/common/nm-meta-setting-desc.c:7093
+#: ../clients/common/nm-meta-setting-desc.c:7239
 msgid "MTU [auto]"
 msgstr "MTU [automatisch]"
 
-#: ../clients/common/nm-meta-setting-desc.c:6088
+#: ../clients/common/nm-meta-setting-desc.c:5781
 msgid "P_KEY [none]"
 msgstr "P_KEY [keiner]"
 
-#: ../clients/common/nm-meta-setting-desc.c:6097
+#: ../clients/common/nm-meta-setting-desc.c:5790
 msgid "Parent interface [none]"
 msgstr "Übergeordnete Schnittstelle [keine]"
 
-#: ../clients/common/nm-meta-setting-desc.c:6120
+#: ../clients/common/nm-meta-setting-desc.c:5813
 msgid ""
 "Enter a list of IPv4 addresses of DNS servers.\n"
 "\n"
@@ -5608,11 +5406,11 @@ msgstr ""
 "\n"
 "Beispiel: 8.8.8.8, 8.8.4.4\n"
 
-#: ../clients/common/nm-meta-setting-desc.c:6152
+#: ../clients/common/nm-meta-setting-desc.c:5845
 msgid "IPv4 address (IP[/plen]) [none]"
 msgstr "IPv4-Adresse (IP[/plen]) [keine]"
 
-#: ../clients/common/nm-meta-setting-desc.c:6154
+#: ../clients/common/nm-meta-setting-desc.c:5847
 msgid ""
 "Enter a list of IPv4 addresses formatted as:\n"
 "  ip[/prefix], ip[/prefix],...\n"
@@ -5626,11 +5424,11 @@ msgstr ""
 "\n"
 "Beispiel: 192.168.1.5/24, 10.0.0.11/24\n"
 
-#: ../clients/common/nm-meta-setting-desc.c:6167
+#: ../clients/common/nm-meta-setting-desc.c:5860
 msgid "IPv4 gateway [none]"
 msgstr "IPv4-Gateway [keines]"
 
-#: ../clients/common/nm-meta-setting-desc.c:6175
+#: ../clients/common/nm-meta-setting-desc.c:5868
 msgid ""
 "Enter a list of IPv4 routes formatted as:\n"
 "  ip[/prefix] [next-hop] [metric],...\n"
@@ -5653,7 +5451,7 @@ msgstr ""
 "Beispiele: 192.168.2.0/24 192.168.2.1 3, 10.1.0.0/16 10.0.0.254\n"
 "           10.1.2.0/24\n"
 
-#: ../clients/common/nm-meta-setting-desc.c:6277
+#: ../clients/common/nm-meta-setting-desc.c:5970
 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 "
@@ -5673,11 +5471,11 @@ msgstr ""
 "\n"
 "Beispiel: 2607:f0d0:1002:51::4, 2607:f0d0:1002:51::1\n"
 
-#: ../clients/common/nm-meta-setting-desc.c:6315
+#: ../clients/common/nm-meta-setting-desc.c:6008
 msgid "IPv6 address (IP[/plen]) [none]"
 msgstr "IPv6-Adresse (IP[/plen]) [keine]"
 
-#: ../clients/common/nm-meta-setting-desc.c:6317
+#: ../clients/common/nm-meta-setting-desc.c:6010
 msgid ""
 "Enter a list of IPv6 addresses formatted as:\n"
 "  ip[/prefix], ip[/prefix],...\n"
@@ -5691,11 +5489,11 @@ msgstr ""
 "\n"
 "Beispiel: 2607:f0d0:1002:51::4/64, 1050:0:0:0:5:600:300c:326b\n"
 
-#: ../clients/common/nm-meta-setting-desc.c:6330
+#: ../clients/common/nm-meta-setting-desc.c:6023
 msgid "IPv6 gateway [none]"
 msgstr "IPv6-Gateway [keines]"
 
-#: ../clients/common/nm-meta-setting-desc.c:6338
+#: ../clients/common/nm-meta-setting-desc.c:6031
 msgid ""
 "Enter a list of IPv6 routes formatted as:\n"
 "  ip[/prefix] [next-hop] [metric],...\n"
@@ -5720,162 +5518,162 @@ msgstr ""
 "db8:beef::3 2\n"
 "           abbe::/64 55\n"
 
-#: ../clients/common/nm-meta-setting-desc.c:6443
-#: ../clients/common/nm-meta-setting-desc.c:7316
+#: ../clients/common/nm-meta-setting-desc.c:6124
+#: ../clients/common/nm-meta-setting-desc.c:6953
 msgid "Parent device [none]"
 msgstr "Übergeordnetes Gerät [keines]"
 
-#: ../clients/common/nm-meta-setting-desc.c:6449
+#: ../clients/common/nm-meta-setting-desc.c:6130
 msgid "Local endpoint [none]"
 msgstr "Lokaler Endpunkt [keiner]"
 
-#: ../clients/common/nm-meta-setting-desc.c:6456
-#: ../clients/common/nm-meta-setting-desc.c:7336
+#: ../clients/common/nm-meta-setting-desc.c:6137
+#: ../clients/common/nm-meta-setting-desc.c:6973
 msgid "Remote"
 msgstr "Entfernt"
 
-#: ../clients/common/nm-meta-setting-desc.c:6501
+#: ../clients/common/nm-meta-setting-desc.c:6174
 msgid "MACsec parent device or connection UUID"
 msgstr "Übergeordnetes MACsec-Gerät oder UUID der Verbindung"
 
-#: ../clients/common/nm-meta-setting-desc.c:6522
+#: ../clients/common/nm-meta-setting-desc.c:6195
 msgid "Enable encryption [yes]"
 msgstr "Verschlüsselung aktivieren [ja]"
 
-#: ../clients/common/nm-meta-setting-desc.c:6528
-#: ../clients/common/nm-secret-agent-simple.c:534
+#: ../clients/common/nm-meta-setting-desc.c:6201
+#: ../clients/common/nm-secret-agent-simple.c:523
 msgid "MKA CAK"
 msgstr "MKA CAK"
 
-#: ../clients/common/nm-meta-setting-desc.c:6538
+#: ../clients/common/nm-meta-setting-desc.c:6211
 msgid "MKA_CKN"
 msgstr "MKA_CKN"
 
-#: ../clients/common/nm-meta-setting-desc.c:6544
+#: ../clients/common/nm-meta-setting-desc.c:6217
 msgid "SCI port [1]"
 msgstr "SCI-Port [1]"
 
-#: ../clients/common/nm-meta-setting-desc.c:6570
+#: ../clients/common/nm-meta-setting-desc.c:6240
 msgid "MACVLAN parent device or connection UUID"
 msgstr "Übergeordnetes MACVLAN-Gerät oder UUID der Verbindung"
 
-#: ../clients/common/nm-meta-setting-desc.c:6591
+#: ../clients/common/nm-meta-setting-desc.c:6261
 msgid "Tap [no]"
 msgstr "Tap [nein]"
 
-#: ../clients/common/nm-meta-setting-desc.c:6617
-#: ../clients/common/nm-meta-setting-desc.c:7523
+#: ../clients/common/nm-meta-setting-desc.c:6274
+#: ../clients/common/nm-meta-setting-desc.c:7160
 #: ../clients/tui/nmt-page-wifi.c:224
 msgid "SSID"
 msgstr "SSID"
 
-#: ../clients/common/nm-meta-setting-desc.c:6626
+#: ../clients/common/nm-meta-setting-desc.c:6283
 msgid "OLPC Mesh channel [1]"
 msgstr "»OLPC Mesh« Kanal [1]"
 
-#: ../clients/common/nm-meta-setting-desc.c:6635
+#: ../clients/common/nm-meta-setting-desc.c:6292
 msgid "DHCP anycast MAC address [none]"
 msgstr "DHCP anycast MAC-Adresse [keine]"
 
-#: ../clients/common/nm-meta-setting-desc.c:6647
+#: ../clients/common/nm-meta-setting-desc.c:6304
 msgid "PPPoE parent device"
 msgstr "Übergeordnetes PPPoE-Gerät"
 
-#: ../clients/common/nm-meta-setting-desc.c:6653
+#: ../clients/common/nm-meta-setting-desc.c:6310
 msgid "Service [none]"
 msgstr "Dienst [keiner]"
 
-#: ../clients/common/nm-meta-setting-desc.c:6660
+#: ../clients/common/nm-meta-setting-desc.c:6317
 msgid "PPPoE username"
 msgstr "PPPoE Benutzername"
 
-#: ../clients/common/nm-meta-setting-desc.c:6834
+#: ../clients/common/nm-meta-setting-desc.c:6491
 msgid "Browser only [no]"
 msgstr "Nur Browser [nein]"
 
-#: ../clients/common/nm-meta-setting-desc.c:6840
+#: ../clients/common/nm-meta-setting-desc.c:6497
 msgid "PAC URL"
 msgstr "PAC-Adresse"
 
-#: ../clients/common/nm-meta-setting-desc.c:6846
+#: ../clients/common/nm-meta-setting-desc.c:6503
 msgid "PAC script"
 msgstr "PAC-Skript"
 
-#: ../clients/common/nm-meta-setting-desc.c:6881
-#: ../clients/common/nm-meta-setting-desc.c:7030
+#: ../clients/common/nm-meta-setting-desc.c:6538
+#: ../clients/common/nm-meta-setting-desc.c:6686
 msgid "Team JSON configuration [none]"
 msgstr "JSON-Konfiguration der Bündelung [keine]"
 
-#: ../clients/common/nm-meta-setting-desc.c:7186
+#: ../clients/common/nm-meta-setting-desc.c:6823
 msgid "User ID [none]"
 msgstr "Benutzerkennung [keine]"
 
-#: ../clients/common/nm-meta-setting-desc.c:7192
+#: ../clients/common/nm-meta-setting-desc.c:6829
 msgid "Group ID [none]"
 msgstr "Gruppenkennung [keine]"
 
-#: ../clients/common/nm-meta-setting-desc.c:7198
+#: ../clients/common/nm-meta-setting-desc.c:6835
 msgid "Enable PI [no]"
 msgstr "PI aktivieren [nein]"
 
-#: ../clients/common/nm-meta-setting-desc.c:7204
+#: ../clients/common/nm-meta-setting-desc.c:6841
 msgid "Enable VNET header [no]"
 msgstr "VNET-Kopfbereich aktivieren [nein]"
 
-#: ../clients/common/nm-meta-setting-desc.c:7210
+#: ../clients/common/nm-meta-setting-desc.c:6847
 msgid "Enable multi queue [no]"
 msgstr "»multi queue« aktivieren [nein]"
 
-#: ../clients/common/nm-meta-setting-desc.c:7223
+#: ../clients/common/nm-meta-setting-desc.c:6860
 msgid "VLAN parent device or connection UUID"
 msgstr "Übergeordnetes VLAN-Gerät oder UUID der Verbindung"
 
-#: ../clients/common/nm-meta-setting-desc.c:7230
+#: ../clients/common/nm-meta-setting-desc.c:6867
 msgid "VLAN ID (<0-4094>)"
 msgstr "VLAN-Kennung <0-4094>"
 
-#: ../clients/common/nm-meta-setting-desc.c:7236
+#: ../clients/common/nm-meta-setting-desc.c:6873
 msgid "VLAN flags (<0-7>) [none]"
 msgstr "VLAN-Flags (<0-7>) [keine]"
 
-#: ../clients/common/nm-meta-setting-desc.c:7245
+#: ../clients/common/nm-meta-setting-desc.c:6882
 msgid "Ingress priority maps [none]"
 msgstr "Eingehende Prioritätsumschlüsselungen [keine]"
 
-#: ../clients/common/nm-meta-setting-desc.c:7255
+#: ../clients/common/nm-meta-setting-desc.c:6892
 msgid "Egress priority maps [none]"
 msgstr "Ausgehende Prioritätsumschlüsselungen [keine]"
 
-#: ../clients/common/nm-meta-setting-desc.c:7323
+#: ../clients/common/nm-meta-setting-desc.c:6960
 msgid "VXLAN ID"
 msgstr "VXLAN-Kennung"
 
-#: ../clients/common/nm-meta-setting-desc.c:7329
+#: ../clients/common/nm-meta-setting-desc.c:6966
 msgid "Local address [none]"
 msgstr "Lokale Adresse [keine]"
 
-#: ../clients/common/nm-meta-setting-desc.c:7342
+#: ../clients/common/nm-meta-setting-desc.c:6979
 msgid "Minimum source port [0]"
 msgstr "Kleinster Quellport [0]"
 
-#: ../clients/common/nm-meta-setting-desc.c:7348
+#: ../clients/common/nm-meta-setting-desc.c:6985
 msgid "Maximum source port [0]"
 msgstr "Größter Quellport [0]"
 
-#: ../clients/common/nm-meta-setting-desc.c:7354
+#: ../clients/common/nm-meta-setting-desc.c:6991
 msgid "Destination port [8472]"
 msgstr "Zielport [8472]"
 
-#: ../clients/common/nm-meta-setting-desc.c:7400
+#: ../clients/common/nm-meta-setting-desc.c:7037
 msgid "WiMAX NSP name"
 msgstr "WiMAX NSP-Name"
 
-#: ../clients/common/nm-meta-setting-desc.c:7437
-#: ../clients/common/nm-meta-setting-desc.c:7573
+#: ../clients/common/nm-meta-setting-desc.c:7074
+#: ../clients/common/nm-meta-setting-desc.c:7210
 msgid "Cloned MAC [none]"
 msgstr "Geklonte MAC [keine]"
 
-#: ../clients/common/nm-meta-setting-desc.c:7464
+#: ../clients/common/nm-meta-setting-desc.c:7101
 msgid ""
 "Enter a list of subchannels (comma or space separated).\n"
 "\n"
@@ -5886,7 +5684,7 @@ msgstr ""
 "\n"
 "Beispiel: 0.0.0e20 0.0.0e21 0.0.0e22\n"
 
-#: ../clients/common/nm-meta-setting-desc.c:7732
+#: ../clients/common/nm-meta-setting-desc.c:7355
 msgid ""
 "Enter the type of WEP keys. The accepted values are: 0 or unknown, 1 or key, "
 "and 2 or passphrase.\n"
@@ -5895,218 +5693,182 @@ msgstr ""
 "»unknown« (unbekannt), 1 oder »key« (Schlüssel) und 2 oder "
 "»passphrase« (Passwort).\n"
 
-#: ../clients/common/nm-meta-setting-desc.c:7794
-msgid "Short address (<0x0000-0xffff>)"
-msgstr "Kurze Adresse (<0x0000-0xffff>)"
-
-#: ../clients/common/nm-meta-setting-desc.c:7810
-msgid "PAN Identifier (<0x0000-0xffff>)"
-msgstr ""
-
-#: ../clients/common/nm-meta-setting-desc.c:7832
-#, fuzzy
-#| msgid "VLAN parent device or connection UUID"
-msgid "IEEE 802.15.4 (WPAN) parent device or connection UUID"
-msgstr "Übergeordnetes VLAN-Gerät oder UUID der Verbindung"
-
 #. ***************************************************************************
-#: ../clients/common/nm-meta-setting-desc.c:7959
+#: ../clients/common/nm-meta-setting-desc.c:7515
 msgid "802-1x settings"
 msgstr "Einstellungen für 802-1x"
 
-#: ../clients/common/nm-meta-setting-desc.c:7960
-#: ../src/devices/adsl/nm-device-adsl.c:133
+#: ../clients/common/nm-meta-setting-desc.c:7516
+#: ../src/devices/adsl/nm-device-adsl.c:137
 msgid "ADSL connection"
 msgstr "ADSL-Verbindung"
 
-#: ../clients/common/nm-meta-setting-desc.c:7961
+#: ../clients/common/nm-meta-setting-desc.c:7517
 msgid "bluetooth connection"
 msgstr "Bluetooth-Verbindung"
 
-#: ../clients/common/nm-meta-setting-desc.c:7962
+#: ../clients/common/nm-meta-setting-desc.c:7518
 msgid "Bond device"
 msgstr "Bündel-Gerät"
 
-#: ../clients/common/nm-meta-setting-desc.c:7963
+#: ../clients/common/nm-meta-setting-desc.c:7519
 msgid "Bridge device"
 msgstr "Brückengerät"
 
-#: ../clients/common/nm-meta-setting-desc.c:7964
+#: ../clients/common/nm-meta-setting-desc.c:7520
 msgid "Bridge port"
 msgstr "Bridge-Port"
 
-#: ../clients/common/nm-meta-setting-desc.c:7965
+#: ../clients/common/nm-meta-setting-desc.c:7521
 msgid "CDMA mobile broadband connection"
 msgstr "Mobile CDMA-Breitband-Verbindung"
 
-#: ../clients/common/nm-meta-setting-desc.c:7966
+#: ../clients/common/nm-meta-setting-desc.c:7522
 msgid "General settings"
 msgstr "Allgemeine Einstellungen"
 
-#: ../clients/common/nm-meta-setting-desc.c:7967
+#: ../clients/common/nm-meta-setting-desc.c:7523
 msgid "DCB settings"
 msgstr "DCB-Einstellungen"
 
-#: ../clients/common/nm-meta-setting-desc.c:7968
+#: ../clients/common/nm-meta-setting-desc.c:7524
 msgid "Dummy settings"
 msgstr "Ersatzweise Einstellungen"
 
-#: ../clients/common/nm-meta-setting-desc.c:7969
-#, fuzzy
-#| msgid "IP-tunnel settings"
-msgid "Ethtool settings"
-msgstr "IP-Tunnel-Einstellungen"
-
-#: ../clients/common/nm-meta-setting-desc.c:7970
+#: ../clients/common/nm-meta-setting-desc.c:7525
 msgid "Generic settings"
 msgstr "Allgemeine Einstellungen"
 
-#: ../clients/common/nm-meta-setting-desc.c:7971
+#: ../clients/common/nm-meta-setting-desc.c:7526
 msgid "GSM mobile broadband connection"
 msgstr "Mobile GSM-Breitband-Verbindung"
 
-#: ../clients/common/nm-meta-setting-desc.c:7972
-#: ../src/devices/nm-device-infiniband.c:170
+#: ../clients/common/nm-meta-setting-desc.c:7527
+#: ../src/devices/nm-device-infiniband.c:192
 msgid "InfiniBand connection"
 msgstr "InfiniBand-Verbindung"
 
-#: ../clients/common/nm-meta-setting-desc.c:7973
+#: ../clients/common/nm-meta-setting-desc.c:7528
 msgid "IPv4 protocol"
 msgstr "IPv4-Protokoll"
 
-#: ../clients/common/nm-meta-setting-desc.c:7974
+#: ../clients/common/nm-meta-setting-desc.c:7529
 msgid "IPv6 protocol"
 msgstr "IPv6-Protokoll"
 
-#: ../clients/common/nm-meta-setting-desc.c:7975
+#: ../clients/common/nm-meta-setting-desc.c:7530
 msgid "IP-tunnel settings"
 msgstr "IP-Tunnel-Einstellungen"
 
-#: ../clients/common/nm-meta-setting-desc.c:7976
+#: ../clients/common/nm-meta-setting-desc.c:7531
 msgid "MACsec connection"
 msgstr "MACsec-Verbindung"
 
-#: ../clients/common/nm-meta-setting-desc.c:7977
+#: ../clients/common/nm-meta-setting-desc.c:7532
 msgid "macvlan connection"
 msgstr "MACVLAN-Verbindung"
 
-#: ../clients/common/nm-meta-setting-desc.c:7978
-msgid "Match"
-msgstr ""
-
-#: ../clients/common/nm-meta-setting-desc.c:7979
+#: ../clients/common/nm-meta-setting-desc.c:7533
 msgid "OLPC Mesh connection"
 msgstr "»OLPC Mesh«-Verbindung"
 
-#: ../clients/common/nm-meta-setting-desc.c:7980
+#: ../clients/common/nm-meta-setting-desc.c:7534
 msgid "OpenVSwitch bridge settings"
-msgstr "OpenVSwitch Brücken-Einstellungen"
+msgstr ""
 
-#: ../clients/common/nm-meta-setting-desc.c:7981
+#: ../clients/common/nm-meta-setting-desc.c:7535
 msgid "OpenVSwitch interface settings"
-msgstr "OpenVSwitch Schnittstellen-Einstellungen"
+msgstr ""
 
-#: ../clients/common/nm-meta-setting-desc.c:7982
+#: ../clients/common/nm-meta-setting-desc.c:7536
 msgid "OpenVSwitch patch interface settings"
 msgstr ""
 
-#: ../clients/common/nm-meta-setting-desc.c:7983
+#: ../clients/common/nm-meta-setting-desc.c:7537
 msgid "OpenVSwitch port settings"
-msgstr "OpenVSwitch Port-Einstellungen"
+msgstr ""
 
-#: ../clients/common/nm-meta-setting-desc.c:7984
+#: ../clients/common/nm-meta-setting-desc.c:7538
 msgid "PPP settings"
 msgstr "PPP-Einstellungen"
 
-#: ../clients/common/nm-meta-setting-desc.c:7985
+#: ../clients/common/nm-meta-setting-desc.c:7539
 msgid "PPPoE"
 msgstr "PPPoE"
 
-#: ../clients/common/nm-meta-setting-desc.c:7986
+#: ../clients/common/nm-meta-setting-desc.c:7540
 msgid "Proxy"
 msgstr "Proxy"
 
-#: ../clients/common/nm-meta-setting-desc.c:7987
+#: ../clients/common/nm-meta-setting-desc.c:7541
 msgid "Serial settings"
 msgstr "Serielle Einstellungen"
 
-#: ../clients/common/nm-meta-setting-desc.c:7988
-msgid "SR-IOV settings"
-msgstr "Einstellungen für SR-IOV"
-
-#: ../clients/common/nm-meta-setting-desc.c:7989
+#: ../clients/common/nm-meta-setting-desc.c:7542
 msgid "Traffic controls"
-msgstr "Verkehrssteuerung"
+msgstr ""
 
-#: ../clients/common/nm-meta-setting-desc.c:7990
+#: ../clients/common/nm-meta-setting-desc.c:7543
 msgid "Team device"
 msgstr "Team-Gerät"
 
-#: ../clients/common/nm-meta-setting-desc.c:7991
+#: ../clients/common/nm-meta-setting-desc.c:7544
 msgid "Team port"
 msgstr "Team-Port"
 
-#: ../clients/common/nm-meta-setting-desc.c:7992
+#: ../clients/common/nm-meta-setting-desc.c:7545
 msgid "Tun device"
 msgstr "TUN-Gerät"
 
-#: ../clients/common/nm-meta-setting-desc.c:7993
+#: ../clients/common/nm-meta-setting-desc.c:7546
 msgid "User settings"
 msgstr "Benutzereinstellungen"
 
-#: ../clients/common/nm-meta-setting-desc.c:7994
-#: ../src/devices/nm-device-vlan.c:400
+#: ../clients/common/nm-meta-setting-desc.c:7547
+#: ../src/devices/nm-device-vlan.c:394
 msgid "VLAN connection"
 msgstr "VLAN-Verbindung"
 
-#: ../clients/common/nm-meta-setting-desc.c:7995 ../src/nm-manager.c:5034
+#: ../clients/common/nm-meta-setting-desc.c:7548 ../src/nm-manager.c:4277
 msgid "VPN connection"
 msgstr "VPN-Verbindung"
 
-#: ../clients/common/nm-meta-setting-desc.c:7996
-#: ../src/devices/nm-device-vxlan.c:370
+#: ../clients/common/nm-meta-setting-desc.c:7549
+#: ../src/devices/nm-device-vxlan.c:331
 msgid "VXLAN connection"
 msgstr "VXLAN-Verbindung"
 
-#: ../clients/common/nm-meta-setting-desc.c:7997
+#: ../clients/common/nm-meta-setting-desc.c:7550
 msgid "WiMAX connection"
 msgstr "WiMAX-Verbindung"
 
-#: ../clients/common/nm-meta-setting-desc.c:7998
+#: ../clients/common/nm-meta-setting-desc.c:7551
 msgid "Wired Ethernet"
 msgstr "Kabelgebundenes Ethernet"
 
-#: ../clients/common/nm-meta-setting-desc.c:7999
+#: ../clients/common/nm-meta-setting-desc.c:7552
 msgid "Wi-Fi connection"
 msgstr "WLAN-Verbindung"
 
-#: ../clients/common/nm-meta-setting-desc.c:8000
+#: ../clients/common/nm-meta-setting-desc.c:7553
 msgid "Wi-Fi security settings"
 msgstr "WLAN-Sicherheitseinstellungen"
 
-#: ../clients/common/nm-meta-setting-desc.c:8001
-msgid "WPAN settings"
-msgstr "WPAN-Einstellungen"
-
-#: ../clients/common/nm-meta-setting-desc.c:8002
-msgid "6LOWPAN settings"
-msgstr "6LOWPAN-Einstellungen"
-
-#: ../clients/common/nm-meta-setting-desc.c:8353
+#: ../clients/common/nm-meta-setting-desc.c:7870
 msgid "name"
 msgstr "Name"
 
-#: ../clients/common/nm-polkit-listener.c:239
+#: ../clients/common/nm-polkit-listener.c:212
 msgid "An authentication session is already underway."
 msgstr "Eine Authentifizierungssitzung ist bereits aktiv."
 
-#: ../clients/common/nm-secret-agent-simple.c:255
-#: ../clients/common/nm-secret-agent-simple.c:295
-#: ../clients/common/nm-secret-agent-simple.c:323
-#: ../clients/common/nm-secret-agent-simple.c:359
-#: ../clients/common/nm-secret-agent-simple.c:519
-#: ../clients/common/nm-secret-agent-simple.c:551
-#: ../clients/common/nm-secret-agent-simple.c:573
+#: ../clients/common/nm-secret-agent-simple.c:240
+#: ../clients/common/nm-secret-agent-simple.c:280
+#: ../clients/common/nm-secret-agent-simple.c:308
+#: ../clients/common/nm-secret-agent-simple.c:344
+#: ../clients/common/nm-secret-agent-simple.c:508
+#: ../clients/common/nm-secret-agent-simple.c:540
+#: ../clients/common/nm-secret-agent-simple.c:562
 #: ../clients/common/nm-vpn-helpers.c:119
 #: ../clients/common/nm-vpn-helpers.c:123
 #: ../clients/common/nm-vpn-helpers.c:129
@@ -6116,29 +5878,29 @@ msgstr "Eine Authentifizierungssitzung ist bereits aktiv."
 msgid "Password"
 msgstr "Passwort"
 
-#: ../clients/common/nm-secret-agent-simple.c:265
+#: ../clients/common/nm-secret-agent-simple.c:250
 msgid "Identity"
 msgstr "Identität"
 
-#: ../clients/common/nm-secret-agent-simple.c:271
+#: ../clients/common/nm-secret-agent-simple.c:256
 msgid "Private key password"
 msgstr "Passwort für geheimen Schlüssel"
 
-#: ../clients/common/nm-secret-agent-simple.c:310
+#: ../clients/common/nm-secret-agent-simple.c:295
 #: ../clients/tui/nmt-page-wifi.c:289
 msgid "Key"
 msgstr "Schlüssel"
 
-#: ../clients/common/nm-secret-agent-simple.c:353
+#: ../clients/common/nm-secret-agent-simple.c:338
 #: ../clients/tui/nmt-page-dsl.c:78
 msgid "Service"
 msgstr "Dienst"
 
-#: ../clients/common/nm-secret-agent-simple.c:484
+#: ../clients/common/nm-secret-agent-simple.c:469
 msgid "Authentication required by wireless network"
 msgstr "Legitimierung für Funknetzwerk wird benötigt"
 
-#: ../clients/common/nm-secret-agent-simple.c:485
+#: ../clients/common/nm-secret-agent-simple.c:470
 #, c-format
 msgid ""
 "Passwords or encryption keys are required to access the wireless network "
@@ -6147,68 +5909,68 @@ msgstr ""
 "Passwörter oder Schlüssel sind erforderlich, um auf das Funknetzwerk »%s« "
 "zuzugreifen."
 
-#: ../clients/common/nm-secret-agent-simple.c:489
+#: ../clients/common/nm-secret-agent-simple.c:478
 msgid "Wired 802.1X authentication"
 msgstr "Kabelgebundene 802.1X-Legitimierung"
 
-#: ../clients/common/nm-secret-agent-simple.c:490
+#: ../clients/common/nm-secret-agent-simple.c:479
 #, c-format
 msgid "Secrets are required to access the wired network '%s'"
 msgstr ""
 "Passwörter oder Schlüssel sind erforderlich, um auf das Kabelnetzwerk »%s« "
 "zuzugreifen"
 
-#: ../clients/common/nm-secret-agent-simple.c:495
+#: ../clients/common/nm-secret-agent-simple.c:484
 msgid "DSL authentication"
 msgstr "DSL-Legitimierung"
 
-#: ../clients/common/nm-secret-agent-simple.c:496
+#: ../clients/common/nm-secret-agent-simple.c:485
 #, c-format
 msgid "Secrets are required for the DSL connection '%s'"
 msgstr "Passwörter sind für die DSL-Verbindung »%s« notwendig"
 
-#: ../clients/common/nm-secret-agent-simple.c:504
+#: ../clients/common/nm-secret-agent-simple.c:493
 msgid "PIN code required"
 msgstr "PIN-Code ist erforderlich"
 
-#: ../clients/common/nm-secret-agent-simple.c:505
+#: ../clients/common/nm-secret-agent-simple.c:494
 msgid "PIN code is needed for the mobile broadband device"
 msgstr "Für das mobile Breitbandgerät ist ein PIN-Code erforderlich"
 
-#: ../clients/common/nm-secret-agent-simple.c:508
+#: ../clients/common/nm-secret-agent-simple.c:497
 msgid "PIN"
 msgstr "PIN"
 
-#: ../clients/common/nm-secret-agent-simple.c:514
-#: ../clients/common/nm-secret-agent-simple.c:546
-#: ../clients/common/nm-secret-agent-simple.c:568
+#: ../clients/common/nm-secret-agent-simple.c:503
+#: ../clients/common/nm-secret-agent-simple.c:535
+#: ../clients/common/nm-secret-agent-simple.c:557
 msgid "Mobile broadband network password"
 msgstr "Passwort der mobilen Breitbandverbindung"
 
-#: ../clients/common/nm-secret-agent-simple.c:515
-#: ../clients/common/nm-secret-agent-simple.c:547
-#: ../clients/common/nm-secret-agent-simple.c:569
-#: ../clients/common/nm-secret-agent-simple.c:586
+#: ../clients/common/nm-secret-agent-simple.c:504
+#: ../clients/common/nm-secret-agent-simple.c:536
+#: ../clients/common/nm-secret-agent-simple.c:558
+#: ../clients/common/nm-secret-agent-simple.c:579
 #, c-format
 msgid "A password is required to connect to '%s'."
 msgstr "Es wird ein Passwort benötigt, um sich mit »%s« zu verbinden."
 
-#: ../clients/common/nm-secret-agent-simple.c:528
+#: ../clients/common/nm-secret-agent-simple.c:517
 #, c-format
 msgid "Secrets are required to access the MACsec network '%s'"
 msgstr ""
 "Passwörter oder Schlüssel sind erforderlich, um auf das MACsec-Netzwerk »%s« "
 "zuzugreifen"
 
-#: ../clients/common/nm-secret-agent-simple.c:532
+#: ../clients/common/nm-secret-agent-simple.c:521
 msgid "MACsec PSK authentication"
 msgstr "MACsec-PSK-Legitimierung"
 
-#: ../clients/common/nm-secret-agent-simple.c:540
+#: ../clients/common/nm-secret-agent-simple.c:529
 msgid "MACsec EAP authentication"
 msgstr "MACsec-EAP-Legitimierung"
 
-#: ../clients/common/nm-secret-agent-simple.c:581
+#: ../clients/common/nm-secret-agent-simple.c:574
 msgid "VPN password required"
 msgstr "VPN-Passwort ist erforderlich"
 
@@ -6263,31 +6025,67 @@ msgid "Gateway certificate hash"
 msgstr "Prüfsumme des Gateway-Zertifikats"
 
 #. Generated file. Do not edit.
-#: ../clients/common/settings-docs.h.in:3
-msgid ""
-"If given, specifies the parent interface name or parent connection UUID from "
-"which this 6LowPAN interface should be created."
-msgstr ""
-
-#: ../clients/common/settings-docs.h.in:4
+#: ../clients/common/settings-docs.c.in:3
 msgid "Channel on which the mesh network to join is located."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:5
+#: ../clients/common/settings-docs.c.in:4
 msgid ""
 "Anycast DHCP MAC address used when requesting an IP address via DHCP. The "
 "specific anycast address used determines which DHCP server class answers the "
 "request."
 msgstr ""
-"Die Anycast DHCP MAC-Adresse, welche beim Anfordern einer IP-Adresse mittels "
-"DHCP verwendet wird. Die eingesetzte Anycast-Adresse bestimmt, welche DHCP-"
-"Serverklasse die Anfrage beantwortet."
 
-#: ../clients/common/settings-docs.h.in:6
+#: ../clients/common/settings-docs.c.in:5
+#: ../clients/common/settings-docs.c.in:18
+#: ../clients/common/settings-docs.c.in:30
+#: ../clients/common/settings-docs.c.in:57
+#: ../clients/common/settings-docs.c.in:96
+#: ../clients/common/settings-docs.c.in:105
+#: ../clients/common/settings-docs.c.in:113
+#: ../clients/common/settings-docs.c.in:115
+#: ../clients/common/settings-docs.c.in:124
+#: ../clients/common/settings-docs.c.in:128
+#: ../clients/common/settings-docs.c.in:132
+#: ../clients/common/settings-docs.c.in:148
+#: ../clients/common/settings-docs.c.in:165
+#: ../clients/common/settings-docs.c.in:174
+#: ../clients/common/settings-docs.c.in:175
+#: ../clients/common/settings-docs.c.in:180
+#: ../clients/common/settings-docs.c.in:192
+#: ../clients/common/settings-docs.c.in:202
+#: ../clients/common/settings-docs.c.in:225
+#: ../clients/common/settings-docs.c.in:246
+#: ../clients/common/settings-docs.c.in:257
+#: ../clients/common/settings-docs.c.in:262
+#: ../clients/common/settings-docs.c.in:268
+#: ../clients/common/settings-docs.c.in:271
+#: ../clients/common/settings-docs.c.in:273
+#: ../clients/common/settings-docs.c.in:279
+#: ../clients/common/settings-docs.c.in:289
+#: ../clients/common/settings-docs.c.in:301
+#: ../clients/common/settings-docs.c.in:309
+#: ../clients/common/settings-docs.c.in:314
+#: ../clients/common/settings-docs.c.in:318
+#: ../clients/common/settings-docs.c.in:325
+#: ../clients/common/settings-docs.c.in:342
+#: ../clients/common/settings-docs.c.in:349
+#: ../clients/common/settings-docs.c.in:354
+#: ../clients/common/settings-docs.c.in:359
+#: ../clients/common/settings-docs.c.in:362
+#: ../clients/common/settings-docs.c.in:376
+#: ../clients/common/settings-docs.c.in:386
+msgid ""
+"The setting's name, which uniquely identifies the setting within the "
+"connection.  Each setting type has a name unique to that type, for example "
+"\"ppp\" or \"wireless\" or \"wired\"."
+msgstr ""
+
+#: ../clients/common/settings-docs.c.in:6
 msgid "SSID of the mesh network to join."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:7
+#: ../clients/common/settings-docs.c.in:7
 msgid ""
 "802.11 frequency band of the network.  One of \"a\" for 5GHz 802.11a or \"bg"
 "\" for 2.4GHz 802.11.  This will lock associations to the Wi-Fi network to "
@@ -6296,40 +6094,24 @@ msgid ""
 "compatible.  This setting depends on specific driver capability and may not "
 "work with all drivers."
 msgstr ""
-"Das Frequenzband des Netzwerks nach 802.11. Dies ist entweder »a« für 5GHz "
-"802.11a oder »bg« for 2.4GHz 802.11. Damit werden WLAN-Verbindungen auf das "
-"angegebene Band festgelegt. Wenn beispielsweise »a« angegeben ist, so wird "
-"sich das Gerät nicht mit dem Netzwerk über das 2.4GHz-Band verbinden, selbst "
-"wenn alle anderen Einstellungen passen. Diese Einstellung hängt von den "
-"Fähigkeiten des spezifischen Treibers ab und funktioniert somit nicht "
-"automatisch mit allen Treibern."
 
-#: ../clients/common/settings-docs.h.in:8
+#: ../clients/common/settings-docs.c.in:8
 msgid ""
 "If specified, directs the device to only associate with the given access "
 "point.  This capability is highly driver dependent and not supported by all "
 "devices.  Note: this property does not control the BSSID used when creating "
 "an Ad-Hoc network and is unlikely to in the future."
 msgstr ""
-"Bei Angabe wird das Gerät dazu veranlasst, sich nur mit dem angegebenen "
-"Zugangspunkt zu verbinden. Diese Fähigkeit hängt stark vom Treiber ab und "
-"wird nicht von allen Geräten unterstützt. Hinweis: Diese Eigenschaft steuert "
-"nicht die BSSID, welche beim Erstellen von Ad-Hoc-Netzwerken eingesetzt "
-"wird. Dies ist auch nicht für die Zukunft geplant."
 
-#: ../clients/common/settings-docs.h.in:9
+#: ../clients/common/settings-docs.c.in:9
 msgid ""
 "Wireless channel to use for the Wi-Fi connection.  The device will only join "
 "(or create for Ad-Hoc networks) a Wi-Fi network on the specified channel.  "
 "Because channel numbers overlap between bands, this property also requires "
 "the \"band\" property to be set."
 msgstr ""
-"Der für die WLAN-Verbindung zu verwendende WLAN-Kanal. Das Gerät verbindet "
-"sich nur mit einem WLAN-Netz (oder erstellt ein Ad-Hoc-Netz) im angegebenen "
-"Kanal. Weil sich Kanalnummern zwischen Bändern überlappen erfordert diese "
-"Eigenschaft auch das Festlegen der »Band«-Eigenschaft."
 
-#: ../clients/common/settings-docs.h.in:10
+#: ../clients/common/settings-docs.c.in:10
 msgid ""
 "If specified, request that the device use this MAC address instead. This is "
 "known as MAC cloning or spoofing. Beside explicitly specifying a MAC "
@@ -6345,8 +6127,8 @@ msgid ""
 "mac-address\" or the deprecated \"cloned-mac-address\"."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:11
-#: ../clients/common/settings-docs.h.in:91
+#: ../clients/common/settings-docs.c.in:11
+#: ../clients/common/settings-docs.c.in:92
 msgid ""
 "With \"cloned-mac-address\" setting \"random\" or \"stable\", by default all "
 "bits of the MAC address are scrambled and a locally-administered, unicast "
@@ -6372,55 +6154,24 @@ msgid ""
 "create a fully scrambled MAC address, randomly locally or globally "
 "administered."
 msgstr ""
-"Wenn die Einstellung cloned-mac-address auf »random« (zufällig) oder "
-"»stable« (stabil) eingestellt ist, so werden standardmäßig alle Bits der MAC-"
-"Adresse verwürfelt und eine lokal verwaltete unicast-MAC-Adresse wird "
-"erstellt. Diese Eigenschaft ermöglicht es festzulegen, dass bestimmte Bits "
-"fest sind. Beachten Sie, dass die kleinstwertigen Bits der ersten MAC-"
-"Adresse immer zurückgesetzt werden, um eine unicast-MAC-Adresse zu "
-"generieren. Wenn die Eigenschaft NULL ist, so darf sie durch eine Standard-"
-"Verbindungseinstellung überschrieben werden. Wenn der Wert dennoch NULL ist "
-"oder eine leere Zeichenkette, so wird per Vorgabe die lokal verwaltete "
-"unicast-MAC-Adresse generiert. Wenn der Wert eine MAC-Adresse enthält, so "
-"wird diese Adresse als Maske verwendet. Die in der Maske gesetzten Bits "
-"sollen mit der aktuellen MAC-Adresse des Geräts befüllt werden, während die "
-"nicht gesetzten mit Zufallswerten besetzt werden. Die Einstellung »FE:FF:"
-"FF:00:00:00« bedeutet, dass die OUI der aktuellen MAC-Adresse beibehalten "
-"wird und nur die niedrigsten 3 Bytes mit Hilfe des Logarithmus »random« oder "
-"»stable« verwürfelt werden. Wenn der Wert eine zusätzliche MAC-Adresse nach "
-"der Maske enthält, so wird diese Adresse an Stelle der aktuellen MAC-Adresse "
-"verwendet, um diejenigen Bits zu befüllten, die nicht verwürfelt werden "
-"sollen. Ein Beispiel: Der Wert »FE:FF:FF:00:00:00 68:F7:28:00:00:00« setzt "
-"die OUI der MAC-Adresse auf 68:F7:28 und die unteren Bits werden verwürfelt. "
-"Der Wert »02:00:00:00:00:00 00:00:00:00:00:00« erstellt eine vollständig "
-"verwürfelte, global verwaltete, eingebrannte MAC-Adresse. Wenn der Wert mehr "
-"als eine zusätzliche MAC-Adresse enthält, so wird eine von diesen zufällt "
-"gewählt. Zum Beispiel generiert »02:00:00:00:00:00 00:00:00:00:00:00 "
-"02:00:00:00:00:00« eine vollständig verwürfelte MAC-Adresse, die zufällig "
-"lokal oder global verwaltet wird."
-
-#: ../clients/common/settings-docs.h.in:12
+
+#: ../clients/common/settings-docs.c.in:12
 msgid ""
 "If TRUE, indicates this network is a non-broadcasting network that hides its "
 "SSID.  In this case various workarounds may take place, such as probe-"
 "scanning the SSID for more reliable network discovery.  However, these "
 "workarounds expose inherent insecurities with hidden SSID networks, and thus "
-"hidden SSID networks should be used with caution. Note that marking the "
-"network as hidden may be a privacy issue for you, as the explicit probe-"
-"scans may be distinctly recognizable on the air."
+"hidden SSID networks should be used with caution."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:13
+#: ../clients/common/settings-docs.c.in:13
 msgid ""
 "If specified, this connection will only apply to the Wi-Fi device whose "
 "permanent MAC address matches. This property does not change the MAC address "
 "of the device (i.e. MAC spoofing)."
 msgstr ""
-"Wenn angegeben, so ist diese Verbindung nur für das WLAN-Gerät gültig, "
-"dessen permanente MAC-Adresse passt. Diese Eigenschaft beeinflusst nicht die "
-"MAC-Adresse des Gerätes (d.h. kein »MAC spoofing«)."
 
-#: ../clients/common/settings-docs.h.in:14
+#: ../clients/common/settings-docs.c.in:14
 msgid ""
 "A list of permanent MAC addresses of Wi-Fi devices to which this connection "
 "should never apply.  Each MAC address should be given in the standard hex-"
@@ -6431,7 +6182,7 @@ msgstr ""
 "Schreibweise hexadezimal und mit Doppelpunkt (zum Beispiel "
 "»00:11:22:33:44:55«) angegeben werden."
 
-#: ../clients/common/settings-docs.h.in:15
+#: ../clients/common/settings-docs.c.in:15
 msgid ""
 "One of NM_SETTING_MAC_RANDOMIZATION_DEFAULT (0) (never randomize unless the "
 "user has set a global default to randomize and the supplicant supports "
@@ -6441,26 +6192,20 @@ msgid ""
 "Deprecated: 1"
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:16
+#: ../clients/common/settings-docs.c.in:16
 msgid ""
 "Wi-Fi network mode; one of \"infrastructure\", \"adhoc\" or \"ap\".  If "
 "blank, infrastructure is assumed."
 msgstr ""
-"Der WLAN-Netzwerkmodus. Es ist entweder »infrasturcture« (Infrastruktur), "
-"»adhoc« oder »ap« (Zugangspunkt). Sofern der Wert ausgelassen ist, wird "
-"»Infrastruktur« angenommen."
 
-#: ../clients/common/settings-docs.h.in:17
-#: ../clients/common/settings-docs.h.in:94
+#: ../clients/common/settings-docs.c.in:17
+#: ../clients/common/settings-docs.c.in:95
 msgid ""
 "If non-zero, only transmit packets of the specified size or smaller, "
 "breaking larger packets up into multiple Ethernet frames."
 msgstr ""
-"Wenn abweichend von Null, so werden Pakete mit der angegebenen Länge oder "
-"kleiner gesendet. Größere Pakete werden in mehrere Ethernet-Rahmen "
-"aufgeteilt."
 
-#: ../clients/common/settings-docs.h.in:18
+#: ../clients/common/settings-docs.c.in:19
 msgid ""
 "One of NM_SETTING_WIRELESS_POWERSAVE_DISABLE (2) (disable Wi-Fi power "
 "saving), NM_SETTING_WIRELESS_POWERSAVE_ENABLE (3) (enable Wi-Fi power "
@@ -6469,20 +6214,15 @@ msgid ""
 "globally configured value). All other values are reserved."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:19
+#: ../clients/common/settings-docs.c.in:20
 msgid ""
 "If non-zero, directs the device to only use the specified bitrate for "
 "communication with the access point.  Units are in Kb/s, ie 5500 = 5.5 Mbit/"
 "s.  This property is highly driver dependent and not all devices support "
 "setting a static bitrate."
 msgstr ""
-"Bei einer Angabe ungleich Null wird das Gerät angewiesen, nur die "
-"festgelegte Bitrate für die Kommunikation mit dem Zugangspunkt einzusetzen. "
-"Die Einheit ist KByte/s, d.h. 5500 = 5.5 Mbit/s.Diese Eigenschaft hängt "
-"stark vom Gerätetreiber ab. Nicht alle Geräte unterstützen das Festlegen "
-"einer statischen Bitrate."
 
-#: ../clients/common/settings-docs.h.in:20
+#: ../clients/common/settings-docs.c.in:21
 msgid ""
 "A list of BSSIDs (each BSSID formatted as a MAC address like "
 "\"00:11:22:33:44:55\") that have been detected as part of the Wi-Fi "
@@ -6490,44 +6230,19 @@ msgid ""
 "property is only meant for reading and reflects the BSSID list of "
 "NetworkManager. The changes you make to this property will not be preserved."
 msgstr ""
-"Eine Liste mit BSSID-Nummern (jede BSSID ist als MAC-Adresse wie "
-"beispielsweise »00:11:22:33:44:55« formatiert), die als Teil des WLAN-Netzes "
-"erkannt wurden. NetworkManager merkt sich erkannte BSSIDs. Diese Eigenschaft "
-"ist nur lesbar und entspricht der BSSID-Liste von NetworkManager. Änderungen "
-"an dieser Eigenschaft gehen verloren."
 
-#: ../clients/common/settings-docs.h.in:21
+#: ../clients/common/settings-docs.c.in:22
 msgid "SSID of the Wi-Fi network. Must be specified."
 msgstr "SSID des WLAN-Netzes. Dies muss angegeben werden."
 
-#: ../clients/common/settings-docs.h.in:22
+#: ../clients/common/settings-docs.c.in:23
 msgid ""
 "If non-zero, directs the device to use the specified transmit power. Units "
 "are dBm.  This property is highly driver dependent and not all devices "
 "support setting a static transmit power."
 msgstr ""
-"Bei einem Wert ungleich Null wird das Gerät angewiesen, die angegebene "
-"Sendeleistung zu verwenden. Die Einheit ist dBm. Diese Eigenschaft hängt "
-"stark vom Gerätetreiber ab. Nicht alle Geräte unterstützen das Festlegen "
-"einer statischen Sendeleistung."
 
-#: ../clients/common/settings-docs.h.in:23
-msgid ""
-"The NMSettingWirelessWakeOnWLan options to enable. Not all devices support "
-"all options. May be any combination of NM_SETTING_WIRELESS_WAKE_ON_WLAN_ANY "
-"(0x2), NM_SETTING_WIRELESS_WAKE_ON_WLAN_DISCONNECT (0x4), "
-"NM_SETTING_WIRELESS_WAKE_ON_WLAN_MAGIC (0x8), "
-"NM_SETTING_WIRELESS_WAKE_ON_WLAN_GTK_REKEY_FAILURE (0x10), "
-"NM_SETTING_WIRELESS_WAKE_ON_WLAN_EAP_IDENTITY_REQUEST (0x20), "
-"NM_SETTING_WIRELESS_WAKE_ON_WLAN_4WAY_HANDSHAKE (0x40), "
-"NM_SETTING_WIRELESS_WAKE_ON_WLAN_RFKILL_RELEASE (0x80), "
-"NM_SETTING_WIRELESS_WAKE_ON_WLAN_TCP (0x100) or the special values "
-"NM_SETTING_WIRELESS_WAKE_ON_WLAN_DEFAULT (0x1) (to use global settings) and "
-"NM_SETTING_WIRELESS_WAKE_ON_WLAN_IGNORE (0x8000) (to disable management of "
-"Wake-on-LAN in NetworkManager)."
-msgstr ""
-
-#: ../clients/common/settings-docs.h.in:24
+#: ../clients/common/settings-docs.c.in:24
 msgid ""
 "When WEP is used (ie, key-mgmt = \"none\" or \"ieee8021x\") indicate the "
 "802.11 authentication algorithm required by the AP here.  One of \"open\" "
@@ -6535,37 +6250,8 @@ msgid ""
 "When using Cisco LEAP (ie, key-mgmt = \"ieee8021x\" and auth-alg = \"leap\") "
 "the \"leap-username\" and \"leap-password\" properties must be specified."
 msgstr ""
-"Wenn WEP verwendet wird (d.h. key-mgmt = \"none\" oder \"ieee8021x\"), so "
-"wird der 802.11 Legitimierungs-Algorithmus angegeben, der durch den "
-"Zugangspunkt eingefordert wird. Es ist entweder »open« (offen) für ein "
-"offenes System, »shared« für einen gemeinsam verwendeten Schlüssel oder "
-"»leap« für Cisco LEAP. Bei Verwendung von Cisco LEAP (d.h. key-mgmt = "
-"\"ieee8021x\" und auth-alg = \"leap\") müssen die Eigenschaften »leap-"
-"username« und »leap-password« angegeben werden."
-
-#: ../clients/common/settings-docs.h.in:25
-msgid ""
-"Indicates whether Fast Initial Link Setup (802.11ai) must be enabled for the "
-"connection.  One of NM_SETTING_WIRELESS_SECURITY_FILS_DEFAULT (0) (use "
-"global default value), NM_SETTING_WIRELESS_SECURITY_FILS_DISABLE (1) "
-"(disable FILS), NM_SETTING_WIRELESS_SECURITY_FILS_OPTIONAL (2) (enable FILS "
-"if the supplicant and the access point support it) or "
-"NM_SETTING_WIRELESS_SECURITY_FILS_REQUIRED (3) (enable FILS and fail if not "
-"supported).  When set to NM_SETTING_WIRELESS_SECURITY_FILS_DEFAULT (0) and "
-"no global default is set, FILS will be optionally enabled."
-msgstr ""
-"Gibt an, ob »Fast Initial Link Setup« (802.11ai) für die Verbindung "
-"eingeschaltet sein muss. Es ist eines von "
-"NM_SETTING_WIRELESS_SECURITY_FILS_DEFAULT (0) (den globalen Vorgabewert "
-"verwenden), NM_SETTING_WIRELESS_SECURITY_FILS_DISABLE (1) (FILS "
-"ausschalten), NM_SETTING_WIRELESS_SECURITY_FILS_OPTIONAL (2) (FILS "
-"einschalten, wenn es supplicant und Zugangspunkt unterstützen) oder "
-"NM_SETTING_WIRELESS_SECURITY_FILS_REQUIRED (3) (FILS einschalten und "
-"abbrechen, sofern nicht unterstützt). Wenn  "
-"NM_SETTING_WIRELESS_SECURITY_FILS_DEFAULT (0) eingestellt ist und keine "
-"globale Vorgabe definiert ist, so wird FILS optional eingeschaltet."
-
-#: ../clients/common/settings-docs.h.in:26
+
+#: ../clients/common/settings-docs.c.in:25
 msgid ""
 "A list of group/broadcast encryption algorithms which prevents connections "
 "to Wi-Fi networks that do not utilize one of the algorithms in the list.  "
@@ -6573,42 +6259,31 @@ msgid ""
 "be one of \"wep40\", \"wep104\", \"tkip\", or \"ccmp\"."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:27
+#: ../clients/common/settings-docs.c.in:26
 msgid ""
 "Key management used for the connection.  One of \"none\" (WEP), \"ieee8021x"
 "\" (Dynamic WEP), \"wpa-none\" (Ad-Hoc WPA-PSK), \"wpa-psk\" (infrastructure "
 "WPA-PSK), or \"wpa-eap\" (WPA-Enterprise).  This property must be set for "
 "any Wi-Fi connection that uses security."
 msgstr ""
-"Die Schlüsselverwaltung für die Verbindung. Es ist eine von »none« (WEP), "
-"»ieee8021x« (Dynamisches WEP), »wpa-none« (Ad-Hoc WPA-PSK), »wpa-psk« (WPA-"
-"PSK mit Infrastruktur) oder »wpa-eap« (WPA-Enterprise). Diese Eigenschaft "
-"muss für jede WLAN-Verbindung festgelegt werden, die ein "
-"Sicherheitsverfahren einsetzt."
 
-#: ../clients/common/settings-docs.h.in:28
+#: ../clients/common/settings-docs.c.in:27
 msgid ""
 "The login password for legacy LEAP connections (ie, key-mgmt = \"ieee8021x\" "
 "and auth-alg = \"leap\")."
 msgstr ""
-"Das Passwort zur Anmeldung mit einer veralteten LEAP-Verbindung (d.h. key-"
-"mgmt = »ieee8021x« und auth-alg = »leap«)."
 
-#: ../clients/common/settings-docs.h.in:29
+#: ../clients/common/settings-docs.c.in:28
 msgid "Flags indicating how to handle the \"leap-password\" property."
 msgstr ""
-"Flags, die festlegen, wie mit der Eigenschaft »leap-password« umgegangen "
-"werden soll."
 
-#: ../clients/common/settings-docs.h.in:30
+#: ../clients/common/settings-docs.c.in:29
 msgid ""
 "The login username for legacy LEAP connections (ie, key-mgmt = \"ieee8021x\" "
 "and auth-alg = \"leap\")."
 msgstr ""
-"Der Benutzername zur Anmeldung mit einer veralteten LEAP-Verbindung (d.h. "
-"key-mgmt = »ieee8021x« und auth-alg = »leap«)."
 
-#: ../clients/common/settings-docs.h.in:31
+#: ../clients/common/settings-docs.c.in:31
 msgid ""
 "A list of pairwise encryption algorithms which prevents connections to Wi-Fi "
 "networks that do not utilize one of the algorithms in the list. For maximum "
@@ -6620,7 +6295,7 @@ msgstr ""
 "Für maximale Kompatibilität lassen Sie diese Eigenschaft leer. Jedes "
 "Listenelement kann entweder »tkip« oder »ccmp« sein."
 
-#: ../clients/common/settings-docs.h.in:32
+#: ../clients/common/settings-docs.c.in:32
 msgid ""
 "Indicates whether Protected Management Frames (802.11w) must be enabled for "
 "the connection.  One of NM_SETTING_WIRELESS_SECURITY_PMF_DEFAULT (0) (use "
@@ -6632,14 +6307,14 @@ msgid ""
 "global default is set, PMF will be optionally enabled."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:33
+#: ../clients/common/settings-docs.c.in:33
 msgid ""
 "List of strings specifying the allowed WPA protocol versions to use. Each "
 "element may be one \"wpa\" (allow WPA) or \"rsn\" (allow WPA2/RSN).  If not "
 "specified, both WPA and RSN connections are allowed."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:34
+#: ../clients/common/settings-docs.c.in:34
 msgid ""
 "Pre-Shared-Key for WPA networks.  If the key is 64-characters long, it must "
 "contain only hexadecimal characters and is interpreted as a hexadecimal WPA "
@@ -6649,20 +6324,17 @@ msgid ""
 "network."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:35
+#: ../clients/common/settings-docs.c.in:35
 msgid "Flags indicating how to handle the \"psk\" property."
 msgstr ""
-"Flags, die festlegen, wie mit der Eigenschaft »psk« umgegangen werden soll."
 
-#: ../clients/common/settings-docs.h.in:36
+#: ../clients/common/settings-docs.c.in:36
 msgid ""
 "Flags indicating how to handle the \"wep-key0\", \"wep-key1\", \"wep-key2\", "
 "and \"wep-key3\" properties."
 msgstr ""
-"Flags, die festlegen, wie mit den Eigenschaften »wep-key0«, »wep-key1«, »wep-"
-"key2« und »wep-key3« umgegangen werden soll."
 
-#: ../clients/common/settings-docs.h.in:37
+#: ../clients/common/settings-docs.c.in:37
 msgid ""
 "Controls the interpretation of WEP keys.  Allowed values are "
 "NM_WEP_KEY_TYPE_KEY (1), in which case the key is either a 10- or 26-"
@@ -6672,43 +6344,31 @@ msgid ""
 "actual WEP key."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:38
+#: ../clients/common/settings-docs.c.in:38
 msgid ""
 "Index 0 WEP key.  This is the WEP key used in most networks.  See the \"wep-"
 "key-type\" property for a description of how this key is interpreted."
 msgstr ""
-"Index 0 des WEP-Schlüssels. Dieser WEP-Schlüssel wird in den meisten Netzen "
-"eingesetzt. Lesen Sie für die Eigenschaft »wep-key-type« nach, wie dieser "
-"Schlüssel interpretiert wird."
 
-#: ../clients/common/settings-docs.h.in:39
+#: ../clients/common/settings-docs.c.in:39
 msgid ""
 "Index 1 WEP key.  This WEP index is not used by most networks.  See the "
 "\"wep-key-type\" property for a description of how this key is interpreted."
 msgstr ""
-"Index 1 des WEP-Schlüssels. Dieser WEP-Schlüssel wird in den meisten Netzen "
-"eingesetzt. Lesen Sie für die Eigenschaft »wep-key-type« nach, wie dieser "
-"Schlüssel interpretiert wird."
 
-#: ../clients/common/settings-docs.h.in:40
+#: ../clients/common/settings-docs.c.in:40
 msgid ""
 "Index 2 WEP key.  This WEP index is not used by most networks.  See the "
 "\"wep-key-type\" property for a description of how this key is interpreted."
 msgstr ""
-"Index 2 des WEP-Schlüssels. Dieser WEP-Schlüssel wird in den meisten Netzen "
-"eingesetzt. Lesen Sie für die Eigenschaft »wep-key-type« nach, wie dieser "
-"Schlüssel interpretiert wird."
 
-#: ../clients/common/settings-docs.h.in:41
+#: ../clients/common/settings-docs.c.in:41
 msgid ""
 "Index 3 WEP key.  This WEP index is not used by most networks.  See the "
 "\"wep-key-type\" property for a description of how this key is interpreted."
 msgstr ""
-"Index 3 des WEP-Schlüssels. Dieser WEP-Schlüssel wird in den meisten Netzen "
-"eingesetzt. Lesen Sie für die Eigenschaft »wep-key-type« nach, wie dieser "
-"Schlüssel interpretiert wird."
 
-#: ../clients/common/settings-docs.h.in:42
+#: ../clients/common/settings-docs.c.in:42
 msgid ""
 "When static WEP is used (ie, key-mgmt = \"none\") and a non-default WEP key "
 "index is used by the AP, put that WEP key index here.  Valid values are 0 "
@@ -6716,7 +6376,7 @@ msgid ""
 "Linksys WRT54G) number the keys 1 - 4."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:43
+#: ../clients/common/settings-docs.c.in:43
 msgid ""
 "Flags indicating which mode of WPS is to be used if any. There's little "
 "point in changing the default setting as NetworkManager will automatically "
@@ -6725,30 +6385,27 @@ msgid ""
 "of 1."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:44
+#: ../clients/common/settings-docs.c.in:44
 msgid ""
 "List of strings to be matched against the altSubjectName of the certificate "
 "presented by the authentication server. If the list is empty, no "
 "verification of the server certificate's altSubjectName is performed."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:45
+#: ../clients/common/settings-docs.c.in:45
 msgid ""
 "Anonymous identity string for EAP authentication methods.  Used as the "
 "unencrypted identity with EAP types that support different tunneled identity "
 "like EAP-TTLS."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:46
+#: ../clients/common/settings-docs.c.in:46
 msgid ""
 "A timeout for the authentication. Zero means the global default; if the "
 "global default is not set, the authentication timeout is 25 seconds."
 msgstr ""
-"Die Zeitbegrenzung für die Legitimierung. Null bedeutet Verwendung der "
-"globalen Vorgabe. Sofern die globale Vorgabe nicht festgelegt ist, so "
-"beträgt der Zeitablauf 25 Sekunden."
 
-#: ../clients/common/settings-docs.h.in:47
+#: ../clients/common/settings-docs.c.in:47
 msgid ""
 "Contains the CA certificate if used by the EAP method specified in the \"eap"
 "\" property. Certificate data is specified using a \"scheme\"; two are "
@@ -6761,31 +6418,25 @@ msgid ""
 "this allows man-in-the-middle attacks and is NOT recommended."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:48
+#: ../clients/common/settings-docs.c.in:48
 msgid ""
 "The password used to access the CA certificate stored in \"ca-cert\" "
 "property. Only makes sense if the certificate is stored on a PKCS#11 token "
 "that requires a login."
 msgstr ""
-"Das Passwort für den Zugriff auf das CA-Zertifikat, welches in der "
-"Eigenschaft »ca-cert« hinterlegt ist. Ergibt nur einen Sinn, wenn das "
-"Zertifikat auf einem PKCS#11-Token gespeichert ist, der eine Anmeldung "
-"verlangt."
 
-#: ../clients/common/settings-docs.h.in:49
+#: ../clients/common/settings-docs.c.in:49
 msgid "Flags indicating how to handle the \"ca-cert-password\" property."
 msgstr ""
-"Flags, die festlegen, wie mit der Eigenschaft »ca-cert-password« umgegangen "
-"werden soll."
 
-#: ../clients/common/settings-docs.h.in:50
+#: ../clients/common/settings-docs.c.in:50
 msgid ""
 "UTF-8 encoded path to a directory containing PEM or DER formatted "
 "certificates to be added to the verification chain in addition to the "
 "certificate specified in the \"ca-cert\" property."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:51
+#: ../clients/common/settings-docs.c.in:51
 msgid ""
 "Contains the client certificate if used by the EAP method specified in the "
 "\"eap\" property. Certificate data is specified using a \"scheme\"; two are "
@@ -6796,20 +6447,18 @@ msgid ""
 "with the string \"file://\" and ending with a terminating NUL byte."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:52
+#: ../clients/common/settings-docs.c.in:52
 msgid ""
 "The password used to access the client certificate stored in \"client-cert\" "
 "property. Only makes sense if the certificate is stored on a PKCS#11 token "
 "that requires a login."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:53
+#: ../clients/common/settings-docs.c.in:53
 msgid "Flags indicating how to handle the \"client-cert-password\" property."
 msgstr ""
-"Flags, die festlegen, wie mit der Eigenschaft »client-cert-password« "
-"umgegangen werden soll."
 
-#: ../clients/common/settings-docs.h.in:54
+#: ../clients/common/settings-docs.c.in:54
 msgid ""
 "Constraint for server domain name. If set, this FQDN is used as a suffix "
 "match requirement for dNSName element(s) of the certificate presented by the "
@@ -6818,7 +6467,7 @@ msgid ""
 "SubjectName CN using same suffix match comparison."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:55
+#: ../clients/common/settings-docs.c.in:55
 msgid ""
 "The allowed EAP method to be used when authenticating to the network with "
 "802.1x.  Valid methods are: \"leap\", \"md5\", \"tls\", \"peap\", \"ttls\", "
@@ -6827,34 +6476,32 @@ msgid ""
 "the allowed combinations."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:56
+#: ../clients/common/settings-docs.c.in:56
 msgid ""
 "Identity string for EAP authentication methods.  Often the user's user or "
 "login name."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:57
+#: ../clients/common/settings-docs.c.in:58
 msgid "UTF-8 encoded file path containing PAC for EAP-FAST."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:58
+#: ../clients/common/settings-docs.c.in:59
 msgid ""
 "UTF-8 encoded password used for EAP authentication methods. If both the "
 "\"password\" property and the \"password-raw\" property are specified, "
 "\"password\" is preferred."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:59
-#: ../clients/common/settings-docs.h.in:104
-#: ../clients/common/settings-docs.h.in:127
-#: ../clients/common/settings-docs.h.in:173
-#: ../clients/common/settings-docs.h.in:285
+#: ../clients/common/settings-docs.c.in:60
+#: ../clients/common/settings-docs.c.in:107
+#: ../clients/common/settings-docs.c.in:135
+#: ../clients/common/settings-docs.c.in:184
+#: ../clients/common/settings-docs.c.in:304
 msgid "Flags indicating how to handle the \"password\" property."
 msgstr ""
-"Flags, die festlegen, wie mit der Eigenschaft »password« umgegangen werden "
-"soll."
 
-#: ../clients/common/settings-docs.h.in:60
+#: ../clients/common/settings-docs.c.in:61
 msgid ""
 "Password used for EAP authentication methods, given as a byte array to allow "
 "passwords in other encodings than UTF-8 to be used. If both the \"password\" "
@@ -6862,13 +6509,11 @@ msgid ""
 "preferred."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:61
+#: ../clients/common/settings-docs.c.in:62
 msgid "Flags indicating how to handle the \"password-raw\" property."
 msgstr ""
-"Flags, die festlegen, wie mit der Eigenschaft »password-raw« umgegangen "
-"werden soll."
 
-#: ../clients/common/settings-docs.h.in:62
+#: ../clients/common/settings-docs.c.in:63
 msgid ""
 "Specifies authentication flags to use in \"phase 1\" outer authentication "
 "using NMSetting8021xAuthFlags options. The individual TLS versions can be "
@@ -6878,7 +6523,7 @@ msgid ""
 "details."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:63
+#: ../clients/common/settings-docs.c.in:64
 msgid ""
 "Enables or disables in-line provisioning of EAP-FAST credentials when FAST "
 "is specified as the EAP method in the \"eap\" property. Recognized values "
@@ -6888,7 +6533,7 @@ msgid ""
 "documentation for more details."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:64
+#: ../clients/common/settings-docs.c.in:65
 msgid ""
 "Forces use of the new PEAP label during key derivation.  Some RADIUS servers "
 "may require forcing the new PEAP label to interoperate with PEAPv1.  Set to "
@@ -6896,7 +6541,7 @@ msgid ""
 "documentation for more details."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:65
+#: ../clients/common/settings-docs.c.in:66
 msgid ""
 "Forces which PEAP version is used when PEAP is set as the EAP method in the "
 "\"eap\" property.  When unset, the version reported by the server will be "
@@ -6905,7 +6550,7 @@ msgid ""
 "set to \"0\" or \"1\" to force that specific PEAP version."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:66
+#: ../clients/common/settings-docs.c.in:67
 msgid ""
 "List of strings to be matched against the altSubjectName of the certificate "
 "presented by the authentication server during the inner \"phase 2\" "
@@ -6913,7 +6558,7 @@ msgid ""
 "certificate's altSubjectName is performed."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:67
+#: ../clients/common/settings-docs.c.in:68
 msgid ""
 "Specifies the allowed \"phase 2\" inner non-EAP authentication methods when "
 "an EAP method that uses an inner TLS tunnel is specified in the \"eap\" "
@@ -6923,7 +6568,7 @@ msgid ""
 "authentication; see the wpa_supplicant documentation for more details."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:68
+#: ../clients/common/settings-docs.c.in:69
 msgid ""
 "Specifies the allowed \"phase 2\" inner EAP-based authentication methods "
 "when an EAP method that uses an inner TLS tunnel is specified in the \"eap\" "
@@ -6933,7 +6578,7 @@ msgid ""
 "wpa_supplicant documentation for more details."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:69
+#: ../clients/common/settings-docs.c.in:70
 msgid ""
 "Contains the \"phase 2\" CA certificate if used by the EAP method specified "
 "in the \"phase2-auth\" or \"phase2-autheap\" properties. Certificate data is "
@@ -6947,28 +6592,26 @@ msgid ""
 "and is NOT recommended."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:70
+#: ../clients/common/settings-docs.c.in:71
 msgid ""
 "The password used to access the \"phase2\" CA certificate stored in \"phase2-"
 "ca-cert\" property. Only makes sense if the certificate is stored on a "
 "PKCS#11 token that requires a login."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:71
+#: ../clients/common/settings-docs.c.in:72
 msgid ""
 "Flags indicating how to handle the \"phase2-ca-cert-password\" property."
 msgstr ""
-"Flags, die festlegen, wie mit der Eigenschaft »phase2-ca-cert-password« "
-"umgegangen werden soll."
 
-#: ../clients/common/settings-docs.h.in:72
+#: ../clients/common/settings-docs.c.in:73
 msgid ""
 "UTF-8 encoded path to a directory containing PEM or DER formatted "
 "certificates to be added to the verification chain in addition to the "
 "certificate specified in the \"phase2-ca-cert\" property."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:73
+#: ../clients/common/settings-docs.c.in:74
 msgid ""
 "Contains the \"phase 2\" client certificate if used by the EAP method "
 "specified in the \"phase2-auth\" or \"phase2-autheap\" properties. "
@@ -6982,21 +6625,19 @@ msgid ""
 "in-the-middle attacks and is NOT recommended."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:74
+#: ../clients/common/settings-docs.c.in:75
 msgid ""
 "The password used to access the \"phase2\" client certificate stored in "
 "\"phase2-client-cert\" property. Only makes sense if the certificate is "
 "stored on a PKCS#11 token that requires a login."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:75
+#: ../clients/common/settings-docs.c.in:76
 msgid ""
 "Flags indicating how to handle the \"phase2-client-cert-password\" property."
 msgstr ""
-"Flags, die festlegen, wie mit der Eigenschaft »phase2-client-cert-password« "
-"umgegangen werden soll."
 
-#: ../clients/common/settings-docs.h.in:76
+#: ../clients/common/settings-docs.c.in:77
 msgid ""
 "Constraint for server domain name. If set, this FQDN is used as a suffix "
 "match requirement for dNSName element(s) of the certificate presented by the "
@@ -7006,7 +6647,7 @@ msgid ""
 "match comparison."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:77
+#: ../clients/common/settings-docs.c.in:78
 msgid ""
 "Contains the \"phase 2\" inner private key when the \"phase2-auth\" or "
 "\"phase2-autheap\" property is set to \"tls\". Key data is specified using a "
@@ -7025,21 +6666,19 @@ msgid ""
 "decode the PKCS#12 private key and certificate."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:78
+#: ../clients/common/settings-docs.c.in:79
 msgid ""
 "The password used to decrypt the \"phase 2\" private key specified in the "
 "\"phase2-private-key\" property when the private key either uses the path "
 "scheme, or is a PKCS#12 format key."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:79
+#: ../clients/common/settings-docs.c.in:80
 msgid ""
 "Flags indicating how to handle the \"phase2-private-key-password\" property."
 msgstr ""
-"Flags, die festlegen, wie mit der Eigenschaft »phase2-private-cert-password« "
-"umgegangen werden soll."
 
-#: ../clients/common/settings-docs.h.in:80
+#: ../clients/common/settings-docs.c.in:81
 msgid ""
 "Substring to be matched against the subject of the certificate presented by "
 "the authentication server during the inner \"phase 2\" authentication. When "
@@ -7048,17 +6687,16 @@ msgid ""
 "deprecated in favor of NMSetting8021x:phase2-domain-suffix-match."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:81
+#: ../clients/common/settings-docs.c.in:82
 msgid "PIN used for EAP authentication methods."
 msgstr "Die für die EAP-Legitimierungsmethode verwendete PIN."
 
-#: ../clients/common/settings-docs.h.in:82
-#: ../clients/common/settings-docs.h.in:175
+#: ../clients/common/settings-docs.c.in:83
+#: ../clients/common/settings-docs.c.in:186
 msgid "Flags indicating how to handle the \"pin\" property."
 msgstr ""
-"Flags, die festlegen, wie mit der Eigenschaft »pin« umgegangen werden soll."
 
-#: ../clients/common/settings-docs.h.in:83
+#: ../clients/common/settings-docs.c.in:84
 msgid ""
 "Contains the private key when the \"eap\" property is set to \"tls\". Key "
 "data is specified using a \"scheme\"; two are currently supported: blob and "
@@ -7080,20 +6718,18 @@ msgid ""
 "to prevent unauthorized access to unencrypted private key data."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:84
+#: ../clients/common/settings-docs.c.in:85
 msgid ""
 "The password used to decrypt the private key specified in the \"private-key"
 "\" property when the private key either uses the path scheme, or if the "
 "private key is a PKCS#12 format key."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:85
+#: ../clients/common/settings-docs.c.in:86
 msgid "Flags indicating how to handle the \"private-key-password\" property."
 msgstr ""
-"Flags, die festlegen, wie mit der Eigenschaft »private-key-password« "
-"umgegangen werden soll."
 
-#: ../clients/common/settings-docs.h.in:86
+#: ../clients/common/settings-docs.c.in:87
 msgid ""
 "Substring to be matched against the subject of the certificate presented by "
 "the authentication server. When unset, no verification of the authentication "
@@ -7102,7 +6738,7 @@ msgid ""
 "domain-suffix-match."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:87
+#: ../clients/common/settings-docs.c.in:88
 msgid ""
 "When TRUE, overrides the \"ca-path\" and \"phase2-ca-path\" properties using "
 "the system CA directory specified at configure time with the --system-ca-"
@@ -7114,18 +6750,14 @@ msgid ""
 "options for wpa_supplicant)."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:88
+#: ../clients/common/settings-docs.c.in:89
 msgid ""
-"When TRUE, enforce auto-negotiation of speed and duplex mode. If \"speed\" "
-"and \"duplex\" properties are both specified, only that single mode will be "
-"advertised and accepted during the link auto-negotiation process: this works "
-"only for BASE-T 802.3 specifications and is useful for enforcing gigabits "
-"modes, as in these cases link negotiation is mandatory. When FALSE, \"speed"
-"\" and \"duplex\" properties should be both set or link configuration will "
-"be skipped."
+"If TRUE, enforce auto-negotiation of port speed and duplex mode.  If FALSE, "
+"\"speed\" and \"duplex\" properties should be both set or link configuration "
+"will be skipped."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:89
+#: ../clients/common/settings-docs.c.in:90
 msgid ""
 "If specified, request that the device use this MAC address instead. This is "
 "known as MAC cloning or spoofing. Beside explicitly specifying a MAC "
@@ -7142,39 +6774,29 @@ msgid ""
 "\"cloned-mac-address\"."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:90
+#: ../clients/common/settings-docs.c.in:91
 msgid ""
-"When a value is set, either \"half\" or \"full\", configures the device to "
-"use the specified duplex mode. If \"auto-negotiate\" is \"yes\" the "
-"specified duplex mode will be the only one advertised during link "
-"negotiation: this works only for BASE-T 802.3 specifications and is useful "
-"for enforcing gigabits modes, as in these cases link negotiation is "
-"mandatory. If the value is unset (the default), the link configuration will "
-"be either skipped (if \"auto-negotiate\" is \"no\", the default) or will be "
-"auto-negotiated (if \"auto-negotiate\" is \"yes\") and the local device will "
-"advertise all the supported duplex modes. Must be set together with the "
-"\"speed\" property if specified. Before specifying a duplex mode be sure "
-"your device supports it."
+"Can be specified only when \"auto-negotiate\" is \"off\". In that case, "
+"statically configures the device to use that specified duplex mode, either "
+"\"half\" or \"full\". Must be set together with the \"speed\" property if "
+"specified. Before specifying a duplex mode be sure your device supports it."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:92
+#: ../clients/common/settings-docs.c.in:93
 msgid ""
 "If specified, this connection will only apply to the Ethernet device whose "
 "permanent MAC address matches. This property does not change the MAC address "
 "of the device (i.e. MAC spoofing)."
 msgstr ""
-"Wenn angegeben, so ist diese Verbindung nur für das Ethernet-Gerät gültig, "
-"dessen permanente MAC-Adresse übereinstimmt. Diese Eigenschaft beeinflusst "
-"nicht die MAC-Adresse des Gerätes (d.h. kein »MAC spoofing«)."
 
-#: ../clients/common/settings-docs.h.in:93
+#: ../clients/common/settings-docs.c.in:94
 msgid ""
 "If specified, this connection will never apply to the Ethernet device whose "
 "permanent MAC address matches an address in the list.  Each MAC address is "
 "in the standard hex-digits-and-colons notation (00:11:22:33:44:55)."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:95
+#: ../clients/common/settings-docs.c.in:97
 msgid ""
 "Specific port type to use if the device supports multiple attachment "
 "methods.  One of \"tp\" (Twisted Pair), \"aui\" (Attachment Unit Interface), "
@@ -7182,13 +6804,13 @@ msgid ""
 "device supports only one port type, this setting is ignored."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:96
+#: ../clients/common/settings-docs.c.in:98
 msgid ""
 "s390 network device type; one of \"qeth\", \"lcs\", or \"ctc\", representing "
 "the different types of virtual network devices available on s390 systems."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:97
+#: ../clients/common/settings-docs.c.in:99
 msgid ""
 "Dictionary of key/value pairs of s390-specific device options.  Both keys "
 "and values must be strings.  Allowed keys include \"portno\", \"layer2\", "
@@ -7196,7 +6818,7 @@ msgid ""
 "alphanumeric characters (ie, [a-zA-Z0-9])."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:98
+#: ../clients/common/settings-docs.c.in:100
 msgid ""
 "Identifies specific subchannels that this network device uses for "
 "communication with z/VM or s390 host.  Like the \"mac-address\" property for "
@@ -7206,22 +6828,16 @@ msgid ""
 "hexadecimal characters and the period (.) character."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:99
+#: ../clients/common/settings-docs.c.in:101
 msgid ""
-"When a value grater than 0 is set, configures the device to use the "
-"specified speed. If \"auto-negotiate\" is \"yes\" the specified speed will "
-"be the only one advertised during link negotiation: this works only for BASE-"
-"T 802.3 specifications and is useful for enforcing gigabit speeds, as in "
-"this case link negotiation is mandatory. If the value is unset (0, the "
-"default), the link configuration will be either skipped (if \"auto-negotiate"
-"\" is \"no\", the default) or will be auto-negotiated (if \"auto-negotiate\" "
-"is \"yes\") and the local device will advertise all the supported speeds. In "
-"Mbit/s, ie 100 == 100Mbit/s. Must be set together with the \"duplex\" "
-"property when non-zero. Before specifying a speed value be sure your device "
-"supports it."
+"Can be set to a value greater than zero only when \"auto-negotiate\" is \"off"
+"\". In that case, statically configures the device to use that specified "
+"speed. In Mbit/s, ie 100 == 100Mbit/s. Must be set together with the \"duplex"
+"\" property when non-zero. Before specifying a speed value be sure your "
+"device supports it."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:100
+#: ../clients/common/settings-docs.c.in:102
 msgid ""
 "The NMSettingWiredWakeOnLan options to enable. Not all devices support all "
 "options. May be any combination of NM_SETTING_WIRED_WAKE_ON_LAN_PHY (0x2), "
@@ -7234,66 +6850,66 @@ msgid ""
 "disable management of Wake-on-LAN in NetworkManager)."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:101
+#: ../clients/common/settings-docs.c.in:103
 msgid ""
 "If specified, the password used with magic-packet-based Wake-on-LAN, "
 "represented as an Ethernet MAC address.  If NULL, no password will be "
 "required."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:102
+#: ../clients/common/settings-docs.c.in:104
 msgid "Encapsulation of ADSL connection.  Can be \"vcmux\" or \"llc\"."
 msgstr ""
 "Verkapselungsmethode der ADSL-Verbindung. Der Wert darf »vcmux« oder »llc« "
 "sein."
 
-#: ../clients/common/settings-docs.h.in:103
+#: ../clients/common/settings-docs.c.in:106
 msgid "Password used to authenticate with the ADSL service."
 msgstr "Passwort für die Legitimierung mit dem ADSL-Dienst."
 
-#: ../clients/common/settings-docs.h.in:105
+#: ../clients/common/settings-docs.c.in:108
 msgid "ADSL connection protocol.  Can be \"pppoa\", \"pppoe\" or \"ipoatm\"."
 msgstr "ADSL-Verbindungsprotokoll. Darf »pppoa«, »pppoe« oder »ipoatm« sein."
 
-#: ../clients/common/settings-docs.h.in:106
+#: ../clients/common/settings-docs.c.in:109
 msgid "Username used to authenticate with the ADSL service."
 msgstr "Benutzername für die Legitimierung mit dem ADSL-Dienst."
 
-#: ../clients/common/settings-docs.h.in:107
+#: ../clients/common/settings-docs.c.in:110
 msgid "VCI of ADSL connection"
 msgstr "VCI einer ADSL-Verbindung"
 
-#: ../clients/common/settings-docs.h.in:108
+#: ../clients/common/settings-docs.c.in:111
 msgid "VPI of ADSL connection"
 msgstr "VPI einer ADSL-Verbindung"
 
-#: ../clients/common/settings-docs.h.in:109
+#: ../clients/common/settings-docs.c.in:112
 msgid "The Bluetooth address of the device."
 msgstr "Die Bluetooth-Adressen des Geräts."
 
-#: ../clients/common/settings-docs.h.in:110
+#: ../clients/common/settings-docs.c.in:114
 msgid ""
 "Either \"dun\" for Dial-Up Networking connections or \"panu\" for Personal "
 "Area Networking connections to devices supporting the NAP profile."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:111
+#: ../clients/common/settings-docs.c.in:116
 msgid ""
 "Dictionary of key/value pairs of bonding options.  Both keys and values must "
 "be strings. Option names must contain only alphanumeric characters (ie, [a-"
 "zA-Z0-9])."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:112
+#: ../clients/common/settings-docs.c.in:117
 msgid "The Ethernet MAC address aging time, in seconds."
 msgstr "Die Lebensdauer der Ethernet MAC-Adresse, in Sekunden."
 
-#: ../clients/common/settings-docs.h.in:113
+#: ../clients/common/settings-docs.c.in:118
 msgid "The Spanning Tree Protocol (STP) forwarding delay, in seconds."
 msgstr ""
 "Die Weiterleitungsverzögerung des Spanning Tree Protocol (STP), in Sekunden."
 
-#: ../clients/common/settings-docs.h.in:114
+#: ../clients/common/settings-docs.c.in:119
 msgid ""
 "A mask of group addresses to forward. Usually, group addresses in the range "
 "from 01:80:C2:00:00:00 to 01:80:C2:00:00:0F are not forwarded according to "
@@ -7302,11 +6918,11 @@ msgid ""
 "or 2 set because they are used for STP, MAC pause frames and LACP."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:115
+#: ../clients/common/settings-docs.c.in:120
 msgid "The Spanning Tree Protocol (STP) hello time, in seconds."
 msgstr "Die Hello-Zeit des Spanning Tree Protocol (STP), in Sekunden."
 
-#: ../clients/common/settings-docs.h.in:116
+#: ../clients/common/settings-docs.c.in:121
 msgid ""
 "If specified, the MAC address of bridge. When creating a new bridge, this "
 "MAC address will be set. If this field is left unspecified, the \"ethernet."
@@ -7316,127 +6932,101 @@ msgid ""
 "property is deprecated. Deprecated: 1"
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:117
+#: ../clients/common/settings-docs.c.in:122
 #, fuzzy
 msgid "The Spanning Tree Protocol (STP) maximum message age, in seconds."
 msgstr ""
 "Die Weiterleitungsverzögerung des Spanning Tree Protocol (STP), in Sekunden."
 
-#: ../clients/common/settings-docs.h.in:118
-#, fuzzy
+#: ../clients/common/settings-docs.c.in:123
 msgid ""
 "Controls whether IGMP snooping is enabled for this bridge. Note that if "
 "snooping was automatically disabled due to hash collisions, the system may "
 "refuse to enable the feature until the collisions are resolved."
 msgstr ""
-"Legt fest, ob »IGMP snooping« für diese Brücke aktiviert wird. Beachten Sie, "
-"dass das System diese Funktion automatisch verweigern kann, solange eine "
-"Hash-Kollision erkannt wird."
 
-#: ../clients/common/settings-docs.h.in:119
+#: ../clients/common/settings-docs.c.in:125
 msgid ""
 "Sets the Spanning Tree Protocol (STP) priority for this bridge.  Lower "
 "values are \"better\"; the lowest priority bridge will be elected the root "
 "bridge."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:120
+#: ../clients/common/settings-docs.c.in:126
 msgid ""
 "Controls whether Spanning Tree Protocol (STP) is enabled for this bridge."
 msgstr ""
-"Legt fest, ob für diese Brücke Spanning Tree Protocol (STP) aktiviert sein "
-"soll."
 
-#: ../clients/common/settings-docs.h.in:121
+#: ../clients/common/settings-docs.c.in:127
 msgid ""
 "Enables or disables \"hairpin mode\" for the port, which allows frames to be "
 "sent back out through the port the frame was received on."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:122
+#: ../clients/common/settings-docs.c.in:129
 msgid ""
 "The Spanning Tree Protocol (STP) port cost for destinations via this port."
 msgstr ""
-"Die Port-Kosten des Spanning Tree Protocol (STP) für Ziele über diesen Port."
 
-#: ../clients/common/settings-docs.h.in:123
+#: ../clients/common/settings-docs.c.in:130
 msgid "The Spanning Tree Protocol (STP) priority of this bridge port."
 msgstr ""
-"Die Priorität für das Spanning Tree Protocol (STP) dieses Brücken-Port."
 
-#: ../clients/common/settings-docs.h.in:124
-#: ../clients/common/settings-docs.h.in:169
-#: ../clients/common/settings-docs.h.in:180
+#: ../clients/common/settings-docs.c.in:131
+#: ../clients/common/settings-docs.c.in:179
+#: ../clients/common/settings-docs.c.in:191
 msgid ""
 "If non-zero, only transmit packets of the specified size or smaller, "
 "breaking larger packets up into multiple frames."
 msgstr ""
-"Wenn ungleich null, so werden Pakete mit der angegebenen Länge oder kleiner "
-"gesendet. Größere Pakete werden in mehrere Ethernet-Rahmen aufgeteilt."
 
-#: ../clients/common/settings-docs.h.in:125
+#: ../clients/common/settings-docs.c.in:133
 msgid ""
 "The number to dial to establish the connection to the CDMA-based mobile "
 "broadband network, if any.  If not specified, the default number (#777) is "
 "used when required."
 msgstr ""
-"Die zu wählende Rufnummer, um eine Verbindung mit dem mobilen CDMA-"
-"Breitbandnetz aufzubauen, sofern vorhanden. Falls die Nummer nicht angegeben "
-"ist, so wird die Vorgabenummer (#777) bei Bedarf verwendet."
 
-#: ../clients/common/settings-docs.h.in:126
-#: ../clients/common/settings-docs.h.in:172
+#: ../clients/common/settings-docs.c.in:134
+#: ../clients/common/settings-docs.c.in:183
 msgid ""
 "The password used to authenticate with the network, if required.  Many "
 "providers do not require a password, or accept any password.  But if a "
 "password is required, it is specified here."
 msgstr ""
-"Das Passwort zur Legitimierung mit dem Netz, sofern notwendig. Viele "
-"Anbieter erfordern kein Passwort oder akzeptieren jedes beliebige. Wenn aber "
-"ein Passwort erforderlich ist, so geben Sie es hier an."
 
-#: ../clients/common/settings-docs.h.in:128
-#: ../clients/common/settings-docs.h.in:178
+#: ../clients/common/settings-docs.c.in:136
+#: ../clients/common/settings-docs.c.in:189
 msgid ""
 "The username used to authenticate with the network, if required.  Many "
 "providers do not require a username, or accept any username.  But if a "
 "username is required, it is specified here."
 msgstr ""
-"Der Benutzername zur Legitimierung mit dem Netz, sofern notwendig. Viele "
-"Anbieter erfordern keinen Benutzernamen oder akzeptieren jeden beliebigen. "
-"Wenn aber ein Benutzername erforderlich ist, so geben Sie diesen hier an."
 
-#: ../clients/common/settings-docs.h.in:129
+#: ../clients/common/settings-docs.c.in:137
 msgid ""
 "The number of retries for the authentication. Zero means to try "
 "indefinitely; -1 means to use a global default. If the global default is not "
 "set, the authentication retries for 3 times before failing the connection. "
 "Currently this only applies to 802-1x authentication."
 msgstr ""
-"Die Anzahl Wiederholungsversuche zur Legitimierung. Null bedeutet unendlich "
-"viele. -1 bedeutet die allgemeine Vorgabe zu verwenden. Wenn die globale "
-"Vorgabe nicht festgelegt ist, so wird die Legitimierung drei mal wiederholt, "
-"bevor die Verbindung fehlschlägt. Derzeit trifft diese Einstellung nur für "
-"802-1x-Legitimierung zu."
 
-#: ../clients/common/settings-docs.h.in:130
+#: ../clients/common/settings-docs.c.in:138
 msgid ""
 "Whether or not the connection should be automatically connected by "
 "NetworkManager when the resources for the connection are available. TRUE to "
 "automatically activate the connection, FALSE to require manual intervention "
-"to activate the connection. Note that autoconnect is not implemented for VPN "
-"profiles. See \"secondaries\" as an alternative to automatically connect VPN "
-"profiles."
+"to activate the connection."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:131
+#: ../clients/common/settings-docs.c.in:139
 msgid ""
 "The autoconnect priority. If the connection is set to autoconnect, "
 "connections with higher priority will be preferred. Defaults to 0. The "
 "higher number means higher priority."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:132
+#: ../clients/common/settings-docs.c.in:140
 msgid ""
 "The number of times a connection should be tried when autoactivating before "
 "giving up. Zero means forever, -1 means the global default (4 times if not "
@@ -7445,33 +7035,30 @@ msgid ""
 "autoconnect again."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:133
+#: ../clients/common/settings-docs.c.in:141
 msgid ""
 "Whether or not slaves of this connection should be automatically brought up "
 "when NetworkManager activates this connection. This only has a real effect "
-"for master connections. The properties \"autoconnect\", \"autoconnect-"
-"priority\" and \"autoconnect-retries\" are unrelated to this setting. The "
-"permitted values are: 0: leave slave connections untouched, 1: activate all "
-"the slave connections with this connection, -1: default. If -1 (default) is "
-"set, global connection.autoconnect-slaves is read to determine the real "
-"value. If it is default as well, this fallbacks to 0."
+"for master connections. The permitted values are: 0: leave slave connections "
+"untouched, 1: activate all the slave connections with this connection, -1: "
+"default. If -1 (default) is set, global connection.autoconnect-slaves is "
+"read to determine the real value. If it is default as well, this fallbacks "
+"to 0."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:134
+#: ../clients/common/settings-docs.c.in:142
 msgid ""
 "If greater than zero, delay success of IP addressing until either the "
 "timeout is reached, or an IP gateway replies to a ping."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:135
+#: ../clients/common/settings-docs.c.in:143
 msgid ""
 "A human readable unique identifier for the connection, like \"Work Wi-Fi\" "
 "or \"T-Mobile 3G\"."
 msgstr ""
-"Eine einfach lesbare, eindeutige Identifizierung der Verbindung, wie "
-"beispielsweise »WLAN Arbeit« oder »Mobilfunk LTE«."
 
-#: ../clients/common/settings-docs.h.in:136
+#: ../clients/common/settings-docs.c.in:144
 msgid ""
 "The name of the network interface this connection is bound to. If not set, "
 "then the connection can be attached to any interface of the appropriate type "
@@ -7484,38 +7071,22 @@ msgid ""
 "interface."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:137
+#: ../clients/common/settings-docs.c.in:145
 msgid "Whether LLDP is enabled for the connection."
 msgstr "Legt fest, ob LLDP für die Verbindung eingeschaltet ist."
 
-#: ../clients/common/settings-docs.h.in:138
+#: ../clients/common/settings-docs.c.in:146
 msgid "Interface name of the master device or UUID of the master connection."
 msgstr ""
 "Der Schnittstellenname des Hauptgeräts oder die UUID der Hauptverbindung."
 
-#: ../clients/common/settings-docs.h.in:139
-msgid ""
-"Whether mDNS is enabled for the connection. The permitted values are: yes: "
-"register hostname and resolving for the connection, no: disable mDNS for the "
-"interface, resolve: do not register hostname but allow resolving of mDNS "
-"host names. When updating this property on a currently activated connection, "
-"the change takes effect immediately. This feature requires a plugin which "
-"supports mDNS. One such plugin is dns-systemd-resolved."
-msgstr ""
-
-#: ../clients/common/settings-docs.h.in:140
+#: ../clients/common/settings-docs.c.in:147
 msgid ""
 "Whether the connection is metered. When updating this property on a "
 "currently activated connection, the change takes effect immediately."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:141
-msgid ""
-"Specifies whether the profile can be active multiple times at a particular "
-"moment. The value is of type NMConnectionMultiConnect."
-msgstr ""
-
-#: ../clients/common/settings-docs.h.in:142
+#: ../clients/common/settings-docs.c.in:149
 msgid ""
 "An array of strings defining what access a given user has to this "
 "connection.  If this is NULL or empty, all users are allowed to access this "
@@ -7530,56 +7101,49 @@ msgid ""
 "[id], and [reserved] must be valid UTF-8."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:143
+#: ../clients/common/settings-docs.c.in:150
 msgid ""
 "FALSE if the connection can be modified using the provided settings "
 "service's D-Bus interface with the right privileges, or TRUE if the "
 "connection is read-only and cannot be modified."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:144
+#: ../clients/common/settings-docs.c.in:151
 msgid ""
 "List of connection UUIDs that should be activated when the base connection "
 "itself is activated. Currently only VPN connections are supported."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:145
+#: ../clients/common/settings-docs.c.in:152
 msgid ""
 "Setting name of the device type of this slave's master connection (eg, \"bond"
 "\"), or NULL if this connection is not a slave."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:146
+#: ../clients/common/settings-docs.c.in:153
 msgid ""
-"This represents the identity of the connection used for various purposes. It "
-"allows to configure multiple profiles to share the identity. Also, the "
-"stable-id can contain placeholders that are substituted dynamically and "
-"deterministically depending on the context. The stable-id is used for "
+"Token to generate stable IDs for the connection. The stable-id is used for "
 "generating IPv6 stable private addresses with ipv6.addr-gen-mode=stable-"
 "privacy. It is also used to seed the generated cloned MAC address for "
-"ethernet.cloned-mac-address=stable and wifi.cloned-mac-address=stable. It is "
-"also used as DHCP client identifier with ipv4.dhcp-client-id=stable and to "
-"derive the DHCP DUID with ipv6.dhcp-duid=stable-[llt,ll,uuid]. Note that "
-"depending on the context where it is used, other parameters are also seeded "
-"into the generation algorithm. For example, a per-host key is commonly also "
-"included, so that different systems end up generating different IDs. Or with "
-"ipv6.addr-gen-mode=stable-privacy, also the device's name is included, so "
-"that different interfaces yield different addresses. The '$' character is "
+"ethernet.cloned-mac-address=stable and wifi.cloned-mac-address=stable. Note "
+"that also the interface name of the activating connection and a per-host "
+"secret key is included into the address generation so that the same stable-"
+"id on different hosts/devices yields different addresses. If the value is "
+"unset, an ID unique for the connection is used. Specifying a stable-id "
+"allows multiple connections to generate the same addresses. Another use is "
+"to generate IDs at runtime via dynamic substitutions. The '$' character is "
 "treated special to perform dynamic substitutions at runtime. Currently "
-"supported are \"${CONNECTION}\", \"${DEVICE}\", \"${BOOT}\", \"${RANDOM}\". "
-"These effectively create unique IDs per-connection, per-device, per-boot, or "
-"every time. Note that \"${DEVICE}\" corresponds the the interface name of "
-"the device. Any unrecognized patterns following '$' are treated verbatim, "
-"however are reserved for future use. You are thus advised to avoid '$' or "
-"escape it as \"$$\". For example, set it to \"${CONNECTION}-${BOOT}-"
-"${DEVICE}\" to create a unique id for this connection that changes with "
-"every reboot and differs depending on the interface where the profile "
-"activates. If the value is unset, a global connection default is consulted. "
-"If the value is still unset, the default is similar to \"${CONNECTION}\" and "
-"uses a unique, fixed ID for the connection."
+"supported are \"${CONNECTION}\", \"${BOOT}\", \"${RANDOM}\". These "
+"effectively create unique IDs per-connection, per-boot, or every time. Any "
+"unrecognized patterns following '$' are treated verbatim, however are "
+"reserved for future use. You are thus advised to avoid '$' or escape it as "
+"\"$$\". For example, set it to \"${CONNECTION}/${BOOT}\" to create a unique "
+"id for this connection that changes with every reboot. Note that two "
+"connections only use the same effective id if their stable-id is also "
+"identical before performing dynamic substitutions."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:147
+#: ../clients/common/settings-docs.c.in:154
 msgid ""
 "The time, in seconds since the Unix Epoch, that the connection was last "
 "_successfully_ fully activated. NetworkManager updates the connection "
@@ -7588,7 +7152,7 @@ msgid ""
 "reading (changes to this property will not be preserved)."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:148
+#: ../clients/common/settings-docs.c.in:155
 msgid ""
 "Base type of the connection. For hardware-dependent connections, should "
 "contain the setting name of the hardware-type specific setting (ie, \"802-3-"
@@ -7597,7 +7161,7 @@ msgid ""
 "setting name of that setting type (ie, \"vpn\" or \"bridge\", etc)."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:149
+#: ../clients/common/settings-docs.c.in:156
 msgid ""
 "A universally unique identifier for the connection, for example generated "
 "with libuuid.  It should be assigned when the connection is created, and "
@@ -7609,7 +7173,7 @@ msgid ""
 "contains only hexadecimal characters and \"-\")."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:150
+#: ../clients/common/settings-docs.c.in:157
 msgid ""
 "The trust level of a the connection.  Free form case-insensitive string (for "
 "example \"Home\", \"Work\", \"Public\").  NULL or unspecified zone means the "
@@ -7618,53 +7182,53 @@ msgid ""
 "takes effect immediately."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:151
+#: ../clients/common/settings-docs.c.in:158
 msgid ""
 "Specifies the NMSettingDcbFlags for the DCB FCoE application.  Flags may be "
 "any combination of NM_SETTING_DCB_FLAG_ENABLE (0x1), "
 "NM_SETTING_DCB_FLAG_ADVERTISE (0x2), and NM_SETTING_DCB_FLAG_WILLING (0x4)."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:152
+#: ../clients/common/settings-docs.c.in:159
 msgid "The FCoE controller mode; either \"fabric\" (default) or \"vn2vn\"."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:153
+#: ../clients/common/settings-docs.c.in:160
 msgid ""
 "The highest User Priority (0 - 7) which FCoE frames should use, or -1 for "
 "default priority.  Only used when the \"app-fcoe-flags\" property includes "
 "the NM_SETTING_DCB_FLAG_ENABLE (0x1) flag."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:154
+#: ../clients/common/settings-docs.c.in:161
 msgid ""
 "Specifies the NMSettingDcbFlags for the DCB FIP application.  Flags may be "
 "any combination of NM_SETTING_DCB_FLAG_ENABLE (0x1), "
 "NM_SETTING_DCB_FLAG_ADVERTISE (0x2), and NM_SETTING_DCB_FLAG_WILLING (0x4)."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:155
+#: ../clients/common/settings-docs.c.in:162
 msgid ""
 "The highest User Priority (0 - 7) which FIP frames should use, or -1 for "
 "default priority.  Only used when the \"app-fip-flags\" property includes "
 "the NM_SETTING_DCB_FLAG_ENABLE (0x1) flag."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:156
+#: ../clients/common/settings-docs.c.in:163
 msgid ""
 "Specifies the NMSettingDcbFlags for the DCB iSCSI application.  Flags may be "
 "any combination of NM_SETTING_DCB_FLAG_ENABLE (0x1), "
 "NM_SETTING_DCB_FLAG_ADVERTISE (0x2), and NM_SETTING_DCB_FLAG_WILLING (0x4)."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:157
+#: ../clients/common/settings-docs.c.in:164
 msgid ""
 "The highest User Priority (0 - 7) which iSCSI frames should use, or -1 for "
 "default priority. Only used when the \"app-iscsi-flags\" property includes "
 "the NM_SETTING_DCB_FLAG_ENABLE (0x1) flag."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:158
+#: ../clients/common/settings-docs.c.in:166
 msgid ""
 "An array of 8 uint values, where the array index corresponds to the User "
 "Priority (0 - 7) and the value indicates the percentage of bandwidth of the "
@@ -7673,21 +7237,21 @@ msgid ""
 "percents."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:159
+#: ../clients/common/settings-docs.c.in:167
 msgid ""
 "An array of 8 boolean values, where the array index corresponds to the User "
 "Priority (0 - 7) and the value indicates whether or not the corresponding "
 "priority should transmit priority pause."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:160
+#: ../clients/common/settings-docs.c.in:168
 msgid ""
 "Specifies the NMSettingDcbFlags for DCB Priority Flow Control (PFC). Flags "
 "may be any combination of NM_SETTING_DCB_FLAG_ENABLE (0x1), "
 "NM_SETTING_DCB_FLAG_ADVERTISE (0x2), and NM_SETTING_DCB_FLAG_WILLING (0x4)."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:161
+#: ../clients/common/settings-docs.c.in:169
 msgid ""
 "An array of 8 uint values, where the array index corresponds to the Priority "
 "Group ID (0 - 7) and the value indicates the percentage of link bandwidth "
@@ -7695,35 +7259,35 @@ msgid ""
 "values must total 100 percents."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:162
+#: ../clients/common/settings-docs.c.in:170
 msgid ""
 "Specifies the NMSettingDcbFlags for DCB Priority Groups.  Flags may be any "
 "combination of NM_SETTING_DCB_FLAG_ENABLE (0x1), "
 "NM_SETTING_DCB_FLAG_ADVERTISE (0x2), and NM_SETTING_DCB_FLAG_WILLING (0x4)."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:163
+#: ../clients/common/settings-docs.c.in:171
 msgid ""
 "An array of 8 uint values, where the array index corresponds to the User "
 "Priority (0 - 7) and the value indicates the Priority Group ID.  Allowed "
 "Priority Group ID values are 0 - 7 or 15 for the unrestricted group."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:164
+#: ../clients/common/settings-docs.c.in:172
 msgid ""
 "An array of 8 boolean values, where the array index corresponds to the User "
 "Priority (0 - 7) and the value indicates whether or not the priority may use "
 "all of the bandwidth allocated to its assigned group."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:165
+#: ../clients/common/settings-docs.c.in:173
 msgid ""
 "An array of 8 uint values, where the array index corresponds to the User "
 "Priority (0 - 7) and the value indicates the traffic class (0 - 7) to which "
 "the priority is mapped."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:166
+#: ../clients/common/settings-docs.c.in:176
 msgid ""
 "The GPRS Access Point Name specifying the APN used when establishing a data "
 "session with the GSM-based network.  The APN often determines how the user "
@@ -7734,20 +7298,20 @@ msgid ""
 "14.9."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:167
+#: ../clients/common/settings-docs.c.in:177
 msgid ""
 "The device unique identifier (as given by the WWAN management service) which "
 "this connection applies to.  If given, the connection will only apply to the "
 "specified device."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:168
+#: ../clients/common/settings-docs.c.in:178
 msgid ""
 "When TRUE, only connections to the home network will be allowed. Connections "
 "to roaming networks will not be made."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:170
+#: ../clients/common/settings-docs.c.in:181
 msgid ""
 "The Network ID (GSM LAI format, ie MCC-MNC) to force specific network "
 "registration.  If the Network ID is specified, NetworkManager will attempt "
@@ -7756,7 +7320,7 @@ msgid ""
 "the device is not otherwise possible."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:171
+#: ../clients/common/settings-docs.c.in:182
 msgid ""
 "Number to dial when establishing a PPP data session with the GSM-based "
 "mobile broadband network.  Many modems do not require PPP for connections to "
@@ -7764,14 +7328,14 @@ msgid ""
 "NetworkManager to select the appropriate settings automatically."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:174
+#: ../clients/common/settings-docs.c.in:185
 msgid ""
 "If the SIM is locked with a PIN it must be unlocked before any other "
 "operations are requested.  Specify the PIN here to allow operation of the "
 "device."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:176
+#: ../clients/common/settings-docs.c.in:187
 msgid ""
 "The SIM card unique identifier (as given by the WWAN management service) "
 "which this connection applies to.  If given, the connection will apply to "
@@ -7779,7 +7343,7 @@ msgid ""
 "the given identifier."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:177
+#: ../clients/common/settings-docs.c.in:188
 msgid ""
 "A MCC/MNC string like \"310260\" or \"21601\" identifying the specific "
 "mobile network operator which this connection applies to.  If given, the "
@@ -7787,136 +7351,122 @@ msgid ""
 "id\" which contains a SIM card provisioned by the given operator."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:179
+#: ../clients/common/settings-docs.c.in:190
 msgid ""
 "If specified, this connection will only apply to the IPoIB device whose "
 "permanent MAC address matches. This property does not change the MAC address "
 "of the device (i.e. MAC spoofing)."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:181
+#: ../clients/common/settings-docs.c.in:193
 msgid ""
 "The InfiniBand P_Key to use for this device. A value of -1 means to use the "
 "default P_Key (aka \"the P_Key at index 0\").  Otherwise it is a 16-bit "
 "unsigned integer, whose high bit is set if it is a \"full membership\" P_Key."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:182
+#: ../clients/common/settings-docs.c.in:194
 msgid ""
 "The interface name of the parent device of this device. Normally NULL, but "
 "if the \"p_key\" property is set, then you must specify the base device by "
 "setting either this property or \"mac-address\"."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:183
+#: ../clients/common/settings-docs.c.in:195
 msgid ""
 "The IP-over-InfiniBand transport mode. Either \"datagram\" or \"connected\"."
 msgstr ""
 "Der IP-over-InfiniBand Transportmodus. Ist entweder »datagram« oder "
 "»connected«."
 
-#: ../clients/common/settings-docs.h.in:184
+#: ../clients/common/settings-docs.c.in:196
 msgid ""
 "How many additional levels of encapsulation are permitted to be prepended to "
 "packets. This property applies only to IPv6 tunnels."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:185
-msgid ""
-"Tunnel flags. Currently the following values are supported: "
-"NM_IP_TUNNEL_FLAG_IP6_IGN_ENCAP_LIMIT (0x1), "
-"NM_IP_TUNNEL_FLAG_IP6_USE_ORIG_TCLASS (0x2), "
-"NM_IP_TUNNEL_FLAG_IP6_USE_ORIG_FLOWLABEL (0x4), "
-"NM_IP_TUNNEL_FLAG_IP6_MIP6_DEV (0x8), NM_IP_TUNNEL_FLAG_IP6_RCV_DSCP_COPY "
-"(0x10), NM_IP_TUNNEL_FLAG_IP6_USE_ORIG_FWMARK (0x20). They are valid only "
-"for IPv6 tunnels."
-msgstr ""
-
-#: ../clients/common/settings-docs.h.in:186
+#: ../clients/common/settings-docs.c.in:197
 msgid ""
 "The flow label to assign to tunnel packets. This property applies only to "
 "IPv6 tunnels."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:187
+#: ../clients/common/settings-docs.c.in:198
 msgid ""
 "The key used for tunnel input packets; the property is valid only for "
 "certain tunnel modes (GRE, IP6GRE). If empty, no key is used."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:188
+#: ../clients/common/settings-docs.c.in:199
 msgid ""
 "The local endpoint of the tunnel; the value can be empty, otherwise it must "
 "contain an IPv4 or IPv6 address."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:189
+#: ../clients/common/settings-docs.c.in:200
 msgid ""
 "The tunneling mode, for example NM_IP_TUNNEL_MODE_IPIP (1) or "
 "NM_IP_TUNNEL_MODE_GRE (2)."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:190
+#: ../clients/common/settings-docs.c.in:201
 msgid ""
 "If non-zero, only transmit packets of the specified size or smaller, "
 "breaking larger packets up into multiple fragments."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:191
+#: ../clients/common/settings-docs.c.in:203
 msgid ""
 "The key used for tunnel output packets; the property is valid only for "
 "certain tunnel modes (GRE, IP6GRE). If empty, no key is used."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:192
+#: ../clients/common/settings-docs.c.in:204
 msgid ""
 "If given, specifies the parent interface name or parent connection UUID the "
 "new device will be bound to so that tunneled packets will only be routed via "
 "that interface."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:193
+#: ../clients/common/settings-docs.c.in:205
 msgid "Whether to enable Path MTU Discovery on this tunnel."
 msgstr ""
-"Legt fest, ob »Path MTU Discovery« für diesen Tunnel eingeschaltet sein soll."
 
-#: ../clients/common/settings-docs.h.in:194
+#: ../clients/common/settings-docs.c.in:206
 msgid ""
 "The remote endpoint of the tunnel; the value must contain an IPv4 or IPv6 "
 "address."
 msgstr ""
-"Die Gegenstelle des Tunnels. Der Wert muss eine IPv4- oder IPv6-Adresse "
-"enthalten."
 
-#: ../clients/common/settings-docs.h.in:195
+#: ../clients/common/settings-docs.c.in:207
 msgid ""
 "The type of service (IPv4) or traffic class (IPv6) field to be set on "
 "tunneled packets."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:196
+#: ../clients/common/settings-docs.c.in:208
 msgid ""
 "The TTL to assign to tunneled packets. 0 is a special value meaning that "
 "packets inherit the TTL value."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:197
-#: ../clients/common/settings-docs.h.in:218
+#: ../clients/common/settings-docs.c.in:209
+#: ../clients/common/settings-docs.c.in:231
 msgid "Array of IP addresses."
 msgstr "Feld mit IP-Adressen."
 
-#: ../clients/common/settings-docs.h.in:198
-#: ../clients/common/settings-docs.h.in:219
+#: ../clients/common/settings-docs.c.in:210
+#: ../clients/common/settings-docs.c.in:232
 msgid ""
 "Timeout in milliseconds used to check for the presence of duplicate IP "
 "addresses on the network.  If an address conflict is detected, the "
 "activation will fail.  A zero value means that no duplicate address "
 "detection is performed, -1 means the default value (either configuration "
-"ipvx.dad-timeout override or zero).  A value greater than zero is a timeout "
-"in milliseconds. The property is currently implemented only for IPv4."
+"ipvx.dad-timeout override or 3 seconds).  A value greater than zero is a "
+"timeout in milliseconds."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:199
+#: ../clients/common/settings-docs.c.in:211
 msgid ""
 "A string sent to the DHCP server to identify the local machine which the "
 "DHCP server may use to customize the DHCP lease and options. When the "
@@ -7925,33 +7475,26 @@ msgid ""
 "RFC 2132 section 9.14 and the remaining bytes may be an hardware address (e."
 "g. '01:xx:xx:xx:xx:xx:xx' where 1 is the Ethernet ARP type and the rest is a "
 "MAC address). If the property is not a hex string it is considered as a non-"
-"hardware-address client ID and the 'type' field is set to 0. The special "
-"values \"mac\" and \"perm-mac\" are supported, which use the current or "
-"permanent MAC address of the device to generate a client identifier with "
-"type ethernet (01). Currently, these options only work for ethernet type of "
-"links. The special value \"stable\" is supported to generate a type 0 client "
-"identifier based on the stable-id (see connection.stable-id) and a per-host "
-"key. If unset, a globally configured default is used. If still unset, the "
-"client-id from the last lease is reused."
+"hardware-address client ID and the 'type' field is set to 0."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:200
+#: ../clients/common/settings-docs.c.in:212
 msgid ""
 "If the \"dhcp-send-hostname\" property is TRUE, then the specified FQDN will "
 "be sent to the DHCP server when acquiring a lease. This property and \"dhcp-"
 "hostname\" are mutually exclusive and cannot be set at the same time."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:201
-#: ../clients/common/settings-docs.h.in:221
+#: ../clients/common/settings-docs.c.in:213
+#: ../clients/common/settings-docs.c.in:233
 msgid ""
 "If the \"dhcp-send-hostname\" property is TRUE, then the specified name will "
 "be sent to the DHCP server when acquiring a lease. This property and \"dhcp-"
 "fqdn\" are mutually exclusive and cannot be set at the same time."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:202
-#: ../clients/common/settings-docs.h.in:222
+#: ../clients/common/settings-docs.c.in:214
+#: ../clients/common/settings-docs.c.in:234
 msgid ""
 "If TRUE, a hostname is sent to the DHCP server when acquiring a lease. Some "
 "DHCP servers use this hostname to update DNS databases, essentially "
@@ -7960,68 +7503,57 @@ msgid ""
 "of the computer is sent."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:203
-#: ../clients/common/settings-docs.h.in:223
+#: ../clients/common/settings-docs.c.in:215
+#: ../clients/common/settings-docs.c.in:235
 msgid "A timeout for a DHCP transaction in seconds."
-msgstr "Die Zeitbegrenzung für eine DHCP-Transaktion in Sekunden."
+msgstr ""
 
-#: ../clients/common/settings-docs.h.in:204
-#: ../clients/common/settings-docs.h.in:224
+#: ../clients/common/settings-docs.c.in:216
+#: ../clients/common/settings-docs.c.in:236
 msgid "Array of IP addresses of DNS servers."
 msgstr "Feld mit IP-Adressen der DNS-Server."
 
-#: ../clients/common/settings-docs.h.in:205
-#: ../clients/common/settings-docs.h.in:225
+#: ../clients/common/settings-docs.c.in:217
+#: ../clients/common/settings-docs.c.in:237
 msgid ""
 "Array of DNS options as described in man 5 resolv.conf. NULL means that the "
 "options are unset and left at the default. In this case NetworkManager will "
 "use default options. This is distinct from an empty list of properties."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:206
-#: ../clients/common/settings-docs.h.in:226
+#: ../clients/common/settings-docs.c.in:218
+#: ../clients/common/settings-docs.c.in:238
 msgid ""
-"DNS servers priority. The relative priority for DNS servers specified by "
-"this setting.  A lower value is better (higher priority).  Zero selects the "
-"default value, which is 50 for VPNs and 100 for other connections. Note that "
-"the priority is to order DNS settings for multiple active connections.  It "
-"does not disambiguate multiple DNS servers within the same connection "
-"profile. When using dns=default, servers with higher priority will be on top "
-"of resolv.conf.  To prioritize a given server over another one within the "
-"same connection, just specify them in the desired order.  When multiple "
+"Intra-connection DNS priority. The relative priority to be used when "
+"determining the order of DNS servers in resolv.conf.  A lower value means "
+"that servers will be on top of the file.  Zero selects the default value, "
+"which is 50 for VPNs and 100 for other connections.  Note that the priority "
+"is to order DNS settings for multiple active connections. It does not "
+"disambiguate multiple DNS servers within the same connection profile. For "
+"that, just specify the DNS servers in the desired order. When multiple "
 "devices have configurations with the same priority, the one with an active "
-"default route will be preferred.  Negative values have the special effect of "
-"excluding other configurations with a greater priority value; so in presence "
-"of at least a negative priority, only DNS servers from connections with the "
-"lowest priority value will be used. When using a DNS resolver that supports "
-"split-DNS as dns=dnsmasq or dns=systemd-resolved, each connection is used to "
-"query domains in its search list.  Queries for domains not present in any "
-"search list are routed through connections having the '~.' special wildcard "
-"domain, which is added automatically to connections with the default route "
-"(or can be added manually).  When multiple connections specify the same "
-"domain, the one with the highest priority (lowest numerical value) wins.  If "
-"a connection specifies a domain which is subdomain of another domain with a "
-"negative DNS priority value, the subdomain is ignored."
+"default route will be preferred. Note that when using dns=dnsmasq the order "
+"is meaningless since dnsmasq forwards queries to all known servers at the "
+"same time. Negative values have the special effect of excluding other "
+"configurations with a greater priority value; so in presence of at least a "
+"negative priority, only DNS servers from connections with the lowest "
+"priority value will be used."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:207
-#: ../clients/common/settings-docs.h.in:227
-msgid ""
-"Array of DNS search domains. Domains starting with a tilde ('~') are "
-"considered 'routing' domains and are used only to decide the interface over "
-"which a query must be forwarded; they are not used to complete unqualified "
-"host names."
-msgstr ""
+#: ../clients/common/settings-docs.c.in:219
+#: ../clients/common/settings-docs.c.in:239
+msgid "Array of DNS search domains."
+msgstr "Feld mit DNS-Suchdomänen."
 
-#: ../clients/common/settings-docs.h.in:208
-#: ../clients/common/settings-docs.h.in:228
+#: ../clients/common/settings-docs.c.in:220
+#: ../clients/common/settings-docs.c.in:240
 msgid ""
 "The gateway associated with this configuration. This is only meaningful if "
 "\"addresses\" is also set."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:209
-#: ../clients/common/settings-docs.h.in:229
+#: ../clients/common/settings-docs.c.in:221
+#: ../clients/common/settings-docs.c.in:241
 msgid ""
 "When \"method\" is set to \"auto\" and this property to TRUE, automatically "
 "configured nameservers and search domains are ignored and only nameservers "
@@ -8029,16 +7561,16 @@ msgid ""
 "if any, are used."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:210
-#: ../clients/common/settings-docs.h.in:230
+#: ../clients/common/settings-docs.c.in:222
+#: ../clients/common/settings-docs.c.in:242
 msgid ""
 "When \"method\" is set to \"auto\" and this property to TRUE, automatically "
 "configured routes are ignored and only routes specified in the \"routes\" "
 "property, if any, are used."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:211
-#: ../clients/common/settings-docs.h.in:232
+#: ../clients/common/settings-docs.c.in:223
+#: ../clients/common/settings-docs.c.in:244
 msgid ""
 "If TRUE, allow overall network configuration to proceed even if the "
 "configuration specified by this property times out.  Note that at least one "
@@ -8048,8 +7580,8 @@ msgid ""
 "if IPv4 configuration fails but IPv6 configuration completes successfully."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:212
-#: ../clients/common/settings-docs.h.in:233
+#: ../clients/common/settings-docs.c.in:224
+#: ../clients/common/settings-docs.c.in:245
 msgid ""
 "IP configuration method. NMSettingIP4Config and NMSettingIP6Config both "
 "support \"auto\", \"manual\", and \"link-local\". See the subclass-specific "
@@ -8063,15 +7595,15 @@ msgid ""
 "10.42.x.0/24 is chosen."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:213
-#: ../clients/common/settings-docs.h.in:234
+#: ../clients/common/settings-docs.c.in:226
+#: ../clients/common/settings-docs.c.in:247
 msgid ""
 "If TRUE, this connection will never be the default connection for this IP "
 "type, meaning it will never be assigned the default route by NetworkManager."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:214
-#: ../clients/common/settings-docs.h.in:235
+#: ../clients/common/settings-docs.c.in:227
+#: ../clients/common/settings-docs.c.in:248
 msgid ""
 "The default metric for routes that don't explicitly specify a metric. The "
 "default value -1 means that the metric is chosen automatically based on the "
@@ -8082,8 +7614,8 @@ msgid ""
 "mean setting it to 1024. For IPv4, zero is a regular value for the metric."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:215
-#: ../clients/common/settings-docs.h.in:236
+#: ../clients/common/settings-docs.c.in:228
+#: ../clients/common/settings-docs.c.in:249
 msgid ""
 "Enable policy routing (source routing) and set the routing table used when "
 "adding routes. This affects all routes, including device-routes, IPv4LL, "
@@ -8100,12 +7632,12 @@ msgid ""
 "tables outside of NetworkManager."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:216
-#: ../clients/common/settings-docs.h.in:237
+#: ../clients/common/settings-docs.c.in:229
+#: ../clients/common/settings-docs.c.in:250
 msgid "Array of IP routes."
 msgstr "Feld aus IP-Routen."
 
-#: ../clients/common/settings-docs.h.in:217
+#: ../clients/common/settings-docs.c.in:230
 msgid ""
 "Configure method for creating the address for use with RFC4862 IPv6 "
 "Stateless Address Autoconfiguration. The permitted values are: "
@@ -8127,34 +7659,7 @@ msgid ""
 "affect the temporary addresses configured with this option."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:220
-msgid ""
-"A string containing the DHCPv6 Unique Identifier (DUID) used by the dhcp "
-"client to identify itself to DHCPv6 servers (RFC 3315). The DUID is carried "
-"in the Client Identifier option. If the property is a hex string ('aa:bb:"
-"cc') it is interpreted as a binary DUID and filled as an opaque value in the "
-"Client Identifier option. The special value \"lease\" will retrieve the DUID "
-"previously used from the lease file belonging to the connection. If no DUID "
-"is found and \"dhclient\" is the configured dhcp client, the DUID is "
-"searched in the system-wide dhclient lease file. If still no DUID is found, "
-"or another dhcp client is used, a global and permanent DUID-UUID (RFC 6355) "
-"will be generated based on the machine-id. The special values \"llt\" and "
-"\"ll\" will generate a DUID of type LLT or LL (see RFC 3315) based on the "
-"current MAC address of the device. In order to try providing a stable DUID-"
-"LLT, the time field will contain a constant timestamp that is used globally "
-"(for all profiles) and persisted to disk. The special values \"stable-llt\", "
-"\"stable-ll\" and \"stable-uuid\" will generate a DUID of the corresponding "
-"type, derived from the connection's stable-id and a per-host unique key. So, "
-"the link-layer address of \"stable-ll\" and \"stable-llt\" will be a "
-"generated address derived from the stable id. The DUID-LLT time value in the "
-"\"stable-llt\" option will be picked among a static timespan of three years "
-"(the upper bound of the interval is the same constant timestamp used in \"llt"
-"\"). When the property is unset, the global value provided for \"ipv6.dhcp-"
-"duid\" is used. If no global value is provided, the default \"lease\" value "
-"is assumed."
-msgstr ""
-
-#: ../clients/common/settings-docs.h.in:231
+#: ../clients/common/settings-docs.c.in:243
 msgid ""
 "Configure IPv6 Privacy Extensions for SLAAC, described in RFC4941.  If "
 "enabled, it makes the kernel generate a temporary IPv6 address in addition "
@@ -8171,38 +7676,38 @@ msgid ""
 "IPv6 addresses."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:238
+#: ../clients/common/settings-docs.c.in:251
 msgid ""
 "Configure the token for draft-chown-6man-tokenised-ipv6-identifiers-02 IPv6 "
 "tokenized interface identifiers. Useful with eui64 addr-gen-mode."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:239
+#: ../clients/common/settings-docs.c.in:252
 msgid "Whether the transmitted traffic must be encrypted."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:240
+#: ../clients/common/settings-docs.c.in:253
 msgid ""
 "The pre-shared CAK (Connectivity Association Key) for MACsec Key Agreement."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:241
+#: ../clients/common/settings-docs.c.in:254
 msgid "Flags indicating how to handle the \"mka-cak\" property."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:242
+#: ../clients/common/settings-docs.c.in:255
 msgid ""
 "The pre-shared CKN (Connectivity-association Key Name) for MACsec Key "
 "Agreement."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:243
+#: ../clients/common/settings-docs.c.in:256
 msgid ""
 "Specifies how the CAK (Connectivity Association Key) for MKA (MACsec Key "
 "Agreement) is obtained."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:244
+#: ../clients/common/settings-docs.c.in:258
 msgid ""
 "If given, specifies the parent interface name or parent connection UUID from "
 "which this MACSEC interface should be created.  If this property is not "
@@ -8210,7 +7715,7 @@ msgid ""
 "\"mac-address\" property."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:245
+#: ../clients/common/settings-docs.c.in:259
 msgid ""
 "The port component of the SCI (Secure Channel Identifier), between 1 and "
 "65534."
@@ -8218,23 +7723,17 @@ msgstr ""
 "Die Port-Komponente des SCI (Secure Channel Identifier), zwischen 1 und "
 "65534."
 
-#: ../clients/common/settings-docs.h.in:246
-msgid ""
-"Specifies whether the SCI (Secure Channel Identifier) is included in every "
-"packet."
-msgstr ""
-
-#: ../clients/common/settings-docs.h.in:247
+#: ../clients/common/settings-docs.c.in:260
 msgid "Specifies the validation mode for incoming frames."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:248
+#: ../clients/common/settings-docs.c.in:261
 msgid ""
 "The macvlan mode, which specifies the communication mechanism between "
 "multiple macvlans on the same lower device."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:249
+#: ../clients/common/settings-docs.c.in:263
 msgid ""
 "If given, specifies the parent interface name or parent connection UUID from "
 "which this MAC-VLAN interface should be created.  If this property is not "
@@ -8242,92 +7741,82 @@ msgid ""
 "\"mac-address\" property."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:250
+#: ../clients/common/settings-docs.c.in:264
 msgid "Whether the interface should be put in promiscuous mode."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:251
+#: ../clients/common/settings-docs.c.in:265
 msgid "Whether the interface should be a MACVTAP."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:252
-msgid ""
-"A list of interface names to match. Each element is a shell wildcard "
-"pattern.  When an element is prefixed with exclamation mark (!) the "
-"condition is inverted. A candidate interface name is considered matching "
-"when both these conditions are satisfied: (a) any of the elements not "
-"prefixed with '!' matches or there aren't such elements; (b) none of the "
-"elements prefixed with '!' match."
-msgstr ""
-
-#: ../clients/common/settings-docs.h.in:253
+#: ../clients/common/settings-docs.c.in:266
 msgid "The bridge failure mode. One of \"secure\", \"standalone\" or empty."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:254
+#: ../clients/common/settings-docs.c.in:267
 msgid "Enable or disable multicast snooping."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:255
+#: ../clients/common/settings-docs.c.in:269
 msgid "Enable or disable RSTP."
-msgstr "RSTP ein- oder ausschalten."
+msgstr ""
 
-#: ../clients/common/settings-docs.h.in:256
+#: ../clients/common/settings-docs.c.in:270
 msgid "Enable or disable STP."
-msgstr "STP ein- oder ausschalten."
+msgstr ""
 
-#: ../clients/common/settings-docs.h.in:257
+#: ../clients/common/settings-docs.c.in:272
 msgid "The interface type. Either \"internal\", or empty."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:258
+#: ../clients/common/settings-docs.c.in:274
 msgid ""
-"Specifies the unicast destination IP address of a remote Open vSwitch bridge "
+"Specifies the unicast destination IP address of a remote OpenVSwitch bridge "
 "port to connect to."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:259
+#: ../clients/common/settings-docs.c.in:275
 msgid "The time port must be inactive in order to be considered down."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:260
+#: ../clients/common/settings-docs.c.in:276
 msgid ""
 "Bonding mode. One of \"active-backup\", \"balance-slb\", or \"balance-tcp\"."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:261
+#: ../clients/common/settings-docs.c.in:277
 msgid "The time port must be active before it starts forwarding traffic."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:262
+#: ../clients/common/settings-docs.c.in:278
 msgid "LACP mode. One of \"active\", \"off\", or \"passive\"."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:263
+#: ../clients/common/settings-docs.c.in:280
 msgid "The VLAN tag in the range 0-4095."
-msgstr "Die VLAN-Kennung im Bereich 0-4095"
+msgstr ""
 
-#: ../clients/common/settings-docs.h.in:264
+#: ../clients/common/settings-docs.c.in:281
 msgid ""
 "The VLAN mode. One of \"access\", \"native-tagged\", \"native-untagged\", "
 "\"trunk\" or unset."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:265
+#: ../clients/common/settings-docs.c.in:282
 msgid ""
 "If non-zero, instruct pppd to set the serial port to the specified "
 "baudrate.  This value should normally be left as 0 to automatically choose "
 "the speed."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:266
+#: ../clients/common/settings-docs.c.in:283
 msgid ""
 "If TRUE, specify that pppd should set the serial port to use hardware flow "
 "control with RTS and CTS signals.  This value should normally be set to "
 "FALSE."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:267
+#: ../clients/common/settings-docs.c.in:284
 msgid ""
 "If non-zero, instruct pppd to presume the connection to the peer has failed "
 "if the specified number of LCP echo-requests go unanswered by the peer.  The "
@@ -8335,7 +7824,7 @@ msgid ""
 "property is used."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:268
+#: ../clients/common/settings-docs.c.in:285
 msgid ""
 "If non-zero, instruct pppd to send an LCP echo-request frame to the peer "
 "every n seconds (where n is the specified value).  Note that some PPP peers "
@@ -8343,79 +7832,78 @@ msgid ""
 "autodetect this."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:269
+#: ../clients/common/settings-docs.c.in:286
 msgid ""
 "If TRUE, stateful MPPE is used.  See pppd documentation for more information "
 "on stateful MPPE."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:270
+#: ../clients/common/settings-docs.c.in:287
 msgid ""
 "If non-zero, instruct pppd to request that the peer send packets no larger "
 "than the specified size.  If non-zero, the MRU should be between 128 and "
 "16384."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:271
+#: ../clients/common/settings-docs.c.in:288
 msgid ""
 "If non-zero, instruct pppd to send packets no larger than the specified size."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:272
+#: ../clients/common/settings-docs.c.in:290
 msgid "If TRUE, Van Jacobsen TCP header compression will not be requested."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:273
+#: ../clients/common/settings-docs.c.in:291
 msgid ""
 "If TRUE, do not require the other side (usually the PPP server) to "
 "authenticate itself to the client.  If FALSE, require authentication from "
 "the remote side.  In almost all cases, this should be TRUE."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:274
+#: ../clients/common/settings-docs.c.in:292
 msgid "If TRUE, BSD compression will not be requested."
-msgstr "Legt fest, ob BSD-Datenkomprimierung nicht angefordert werden soll."
+msgstr ""
 
-#: ../clients/common/settings-docs.h.in:275
+#: ../clients/common/settings-docs.c.in:293
 msgid "If TRUE, \"deflate\" compression will not be requested."
 msgstr ""
-"Legt fest, ob die »deflate«-Komprimierung nicht angefordert werden soll."
 
-#: ../clients/common/settings-docs.h.in:276
+#: ../clients/common/settings-docs.c.in:294
 msgid "If TRUE, the CHAP authentication method will not be used."
-msgstr "Legt fest, ob CHAP-Legitimierung nicht verwendet werden soll."
+msgstr ""
 
-#: ../clients/common/settings-docs.h.in:277
+#: ../clients/common/settings-docs.c.in:295
 msgid "If TRUE, the EAP authentication method will not be used."
-msgstr "Legt fest, ob EAP-Legitimierung nicht verwendet werden soll."
+msgstr ""
 
-#: ../clients/common/settings-docs.h.in:278
+#: ../clients/common/settings-docs.c.in:296
 msgid "If TRUE, the MSCHAP authentication method will not be used."
-msgstr "Legt fest, ob CHAP-Legitimierung nicht verwendet werden soll."
+msgstr ""
 
-#: ../clients/common/settings-docs.h.in:279
+#: ../clients/common/settings-docs.c.in:297
 msgid "If TRUE, the MSCHAPv2 authentication method will not be used."
-msgstr "Legt fest, ob MSCHAPv2-Legitimierung nicht verwendet werden soll."
+msgstr ""
 
-#: ../clients/common/settings-docs.h.in:280
+#: ../clients/common/settings-docs.c.in:298
 msgid "If TRUE, the PAP authentication method will not be used."
-msgstr "Legt fest, ob PAP-Legitimierung nicht verwendet werden soll."
+msgstr ""
 
-#: ../clients/common/settings-docs.h.in:281
+#: ../clients/common/settings-docs.c.in:299
 msgid ""
 "If TRUE, MPPE (Microsoft Point-to-Point Encryption) will be required for the "
 "PPP session.  If either 64-bit or 128-bit MPPE is not available the session "
 "will fail.  Note that MPPE is not used on mobile broadband connections."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:282
+#: ../clients/common/settings-docs.c.in:300
 msgid ""
 "If TRUE, 128-bit MPPE (Microsoft Point-to-Point Encryption) will be required "
 "for the PPP session, and the \"require-mppe\" property must also be set to "
 "TRUE.  If 128-bit MPPE is not available the session will fail."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:283
+#: ../clients/common/settings-docs.c.in:302
 msgid ""
 "If given, specifies the parent interface name on which this PPPoE connection "
 "should be created.  If this property is not specified, the connection is "
@@ -8423,11 +7911,11 @@ msgid ""
 "NMSettingConnection."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:284
+#: ../clients/common/settings-docs.c.in:303
 msgid "Password used to authenticate with the PPPoE service."
 msgstr "Zur Legitimierung am PPPoE-Dienst verwendetes Passwort."
 
-#: ../clients/common/settings-docs.h.in:286
+#: ../clients/common/settings-docs.c.in:305
 msgid ""
 "If specified, instruct PPPoE to only initiate sessions with access "
 "concentrators that provide the specified service.  For most providers, this "
@@ -8435,92 +7923,64 @@ msgid ""
 "concentrators or a specific service is known to be required."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:287
+#: ../clients/common/settings-docs.c.in:306
 msgid "Username used to authenticate with the PPPoE service."
-msgstr "Zur Legitimierung am PPPoE-Dienst verwendeter Benutzername."
+msgstr ""
 
-#: ../clients/common/settings-docs.h.in:288
+#: ../clients/common/settings-docs.c.in:307
 msgid "Whether the proxy configuration is for browser only."
 msgstr "Legt fest, ob die Proxy-Konfiguration nur für Browser gilt."
 
-#: ../clients/common/settings-docs.h.in:289
+#: ../clients/common/settings-docs.c.in:308
 msgid ""
 "Method for proxy configuration, Default is NM_SETTING_PROXY_METHOD_NONE (0)"
 msgstr ""
 "Methode der Proxy-Konfiguration, Voreinstellung ist "
 "NM_SETTING_PROXY_METHOD_NONE (0)"
 
-#: ../clients/common/settings-docs.h.in:290
+#: ../clients/common/settings-docs.c.in:310
 msgid "PAC script for the connection."
 msgstr "PAC-Skript für die Verbindung."
 
-#: ../clients/common/settings-docs.h.in:291
+#: ../clients/common/settings-docs.c.in:311
 msgid "PAC URL for obtaining PAC file."
 msgstr "PAC-Adresse zum Holen der PAC-Datei."
 
-#: ../clients/common/settings-docs.h.in:292
+#: ../clients/common/settings-docs.c.in:312
 msgid ""
 "Speed to use for communication over the serial port.  Note that this value "
 "usually has no effect for mobile broadband modems as they generally ignore "
 "speed settings and use the highest available speed."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:293
+#: ../clients/common/settings-docs.c.in:313
 msgid "Byte-width of the serial communication. The 8 in \"8n1\" for example."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:294
+#: ../clients/common/settings-docs.c.in:315
 msgid "Parity setting of the serial port."
 msgstr "Paritätseinstellung des seriellen Ports."
 
-#: ../clients/common/settings-docs.h.in:295
+#: ../clients/common/settings-docs.c.in:316
 msgid "Time to delay between each byte sent to the modem, in microseconds."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:296
+#: ../clients/common/settings-docs.c.in:317
 msgid ""
 "Number of stop bits for communication on the serial port.  Either 1 or 2. "
 "The 1 in \"8n1\" for example."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:297
-msgid ""
-"Whether to autoprobe virtual functions by a compatible driver. If set to "
-"NM_TERNARY_TRUE (1), the kernel will try to bind VFs to a compatible driver "
-"and if this succeeds a new network interface will be instantiated for each "
-"VF. If set to NM_TERNARY_FALSE (0), VFs will not be claimed and no network "
-"interfaces will be created for them. When set to NM_TERNARY_DEFAULT (-1), "
-"the global default is used; in case the global default is unspecified it is "
-"assumed to be NM_TERNARY_TRUE (1)."
-msgstr ""
-
-#: ../clients/common/settings-docs.h.in:298
-msgid "The total number of virtual functions to create."
-msgstr "Die Gesamtzahl der anzulegenden virtuellen Funktionen."
-
-#: ../clients/common/settings-docs.h.in:299
-msgid ""
-"Array of virtual function descriptors. Each VF descriptor is a dictionary "
-"mapping attribute names to GVariant values. The 'index' entry is mandatory "
-"for each VF. When represented as string a VF is in the form: \"INDEX "
-"[ATTR=VALUE[ ATTR=VALUE]...]\". for example: \"2 mac=00:11:22:33:44:55 spoof-"
-"check=true\". The \"vlans\" attribute is represented as a semicolor-"
-"separated list of VLAN descriptors, where each descriptor has the form \"ID[."
-"PRIORITY[.PROTO]]\". PROTO can be either 'q' for 802.1Q (the default) or "
-"'ad' for 802.1ad."
+#: ../clients/common/settings-docs.c.in:319
+msgid "Array of TC queuening disciplines."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:300
-#, fuzzy
-msgid "Array of TC queueing disciplines."
-msgstr "Feld aus IP-Routen."
-
-#: ../clients/common/settings-docs.h.in:301
+#: ../clients/common/settings-docs.c.in:320
 #, fuzzy
 msgid "Array of TC traffic filters."
 msgstr "Feld aus IP-Routen."
 
-#: ../clients/common/settings-docs.h.in:302
+#: ../clients/common/settings-docs.c.in:321
 msgid ""
 "The JSON configuration for the team network interface.  The property should "
 "contain raw JSON configuration data suitable for teamd, because the value is "
@@ -8528,8 +7988,8 @@ msgid ""
 "used.  See man teamd.conf for the format details."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:303
-#: ../clients/common/settings-docs.h.in:321
+#: ../clients/common/settings-docs.c.in:322
+#: ../clients/common/settings-docs.c.in:341
 msgid ""
 "Link watchers configuration for the connection: each link watcher is defined "
 "by a dictionary, whose keys depend upon the selected link watcher. Available "
@@ -8541,68 +8001,65 @@ msgid ""
 "for more details."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:304
+#: ../clients/common/settings-docs.c.in:323
 msgid "Corresponds to the teamd mcast_rejoin.count."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:305
+#: ../clients/common/settings-docs.c.in:324
 msgid "Corresponds to the teamd mcast_rejoin.interval."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:306
+#: ../clients/common/settings-docs.c.in:326
 msgid "Corresponds to the teamd notify_peers.count."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:307
+#: ../clients/common/settings-docs.c.in:327
 msgid "Corresponds to the teamd notify_peers.interval."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:308
+#: ../clients/common/settings-docs.c.in:328
 msgid ""
 "Corresponds to the teamd runner.name. Permitted values are: \"roundrobin\", "
-"\"broadcast\", \"activebackup\", \"loadbalance\", \"lacp\", \"random\". When "
-"setting the runner, all the properties specific to the runner will be reset "
-"to the default value; all the properties specific to other runners will be "
-"set to an empty value (or if not possible to a default value)."
+"\"broadcast\", \"activebackup\", \"loadbalance\", \"lacp\"."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:309
+#: ../clients/common/settings-docs.c.in:329
 msgid "Corresponds to the teamd runner.active."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:310
+#: ../clients/common/settings-docs.c.in:330
 msgid "Corresponds to the teamd runner.agg_select_policy."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:311
+#: ../clients/common/settings-docs.c.in:331
 msgid "Corresponds to the teamd runner.fast_rate."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:312
+#: ../clients/common/settings-docs.c.in:332
 msgid "Corresponds to the teamd runner.hwaddr_policy."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:313
+#: ../clients/common/settings-docs.c.in:333
 msgid "Corresponds to the teamd runner.min_ports."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:314
+#: ../clients/common/settings-docs.c.in:334
 msgid "Corresponds to the teamd runner.sys_prio."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:315
+#: ../clients/common/settings-docs.c.in:335
 msgid "Corresponds to the teamd runner.tx_balancer.name."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:316
+#: ../clients/common/settings-docs.c.in:336
 msgid "Corresponds to the teamd runner.tx_balancer.interval."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:317
+#: ../clients/common/settings-docs.c.in:337
 msgid "Corresponds to the teamd runner.tx_hash."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:318
+#: ../clients/common/settings-docs.c.in:338
 msgid ""
 "The JSON configuration for the team port. The property should contain raw "
 "JSON configuration data suitable for teamd, because the value is passed "
@@ -8610,67 +8067,67 @@ msgid ""
 "man teamd.conf for the format details."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:319
+#: ../clients/common/settings-docs.c.in:339
 msgid "Corresponds to the teamd ports.PORTIFNAME.lacp_key."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:320
+#: ../clients/common/settings-docs.c.in:340
 msgid "Corresponds to the teamd ports.PORTIFNAME.lacp_prio."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:322
+#: ../clients/common/settings-docs.c.in:343
 msgid "Corresponds to the teamd ports.PORTIFNAME.prio."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:323
+#: ../clients/common/settings-docs.c.in:344
 msgid ""
 "Corresponds to the teamd ports.PORTIFNAME.queue_id. When set to -1 means the "
 "parameter is skipped from the json config."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:324
+#: ../clients/common/settings-docs.c.in:345
 msgid "Corresponds to the teamd ports.PORTIFNAME.sticky."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:325
+#: ../clients/common/settings-docs.c.in:346
 msgid ""
 "The group ID which will own the device. If set to NULL everyone will be able "
 "to use the device."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:326
+#: ../clients/common/settings-docs.c.in:347
 msgid ""
 "The operating mode of the virtual device. Allowed values are "
 "NM_SETTING_TUN_MODE_TUN (1) to create a layer 3 device and "
 "NM_SETTING_TUN_MODE_TAP (2) to create an Ethernet-like layer 2 one."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:327
+#: ../clients/common/settings-docs.c.in:348
 msgid ""
 "If the property is set to TRUE, the interface will support multiple file "
 "descriptors (queues) to parallelize packet sending or receiving. Otherwise, "
 "the interface will only support a single queue."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:328
+#: ../clients/common/settings-docs.c.in:350
 msgid ""
 "The user ID which will own the device. If set to NULL everyone will be able "
 "to use the device."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:329
+#: ../clients/common/settings-docs.c.in:351
 msgid ""
 "If TRUE the interface will prepend a 4 byte header describing the physical "
 "interface to the packets."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:330
+#: ../clients/common/settings-docs.c.in:352
 msgid ""
 "If TRUE the IFF_VNET_HDR the tunnel packets will include a virtio network "
 "header."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:331
+#: ../clients/common/settings-docs.c.in:353
 msgid ""
 "A dictionary of key/value pairs with user data. This data is ignored by "
 "NetworkManager and can be used at the users discretion. The keys only "
@@ -8678,14 +8135,14 @@ msgid ""
 "up to a certain length."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:332
+#: ../clients/common/settings-docs.c.in:355
 msgid ""
 "For outgoing packets, a list of mappings from Linux SKB priorities to 802.1p "
 "priorities.  The mapping is given in the format \"from:to\" where both \"from"
 "\" and \"to\" are unsigned integers, ie \"7:3\"."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:333
+#: ../clients/common/settings-docs.c.in:356
 msgid ""
 "One or more flags which control the behavior and features of the VLAN "
 "interface.  Flags include NM_VLAN_FLAG_REORDER_HEADERS (0x1) (reordering of "
@@ -8698,20 +8155,20 @@ msgid ""
 "missing property on D-Bus is still considered as 0."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:334
+#: ../clients/common/settings-docs.c.in:357
 msgid ""
 "The VLAN identifier that the interface created by this connection should be "
 "assigned. The valid range is from 0 to 4094, without the reserved id 4095."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:335
+#: ../clients/common/settings-docs.c.in:358
 msgid ""
 "For incoming packets, a list of mappings from 802.1p priorities to Linux SKB "
 "priorities.  The mapping is given in the format \"from:to\" where both \"from"
 "\" and \"to\" are unsigned integers, ie \"7:3\"."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:336
+#: ../clients/common/settings-docs.c.in:360
 msgid ""
 "If given, specifies the parent interface name or parent connection UUID from "
 "which this VLAN interface should be created.  If this property is not "
@@ -8719,32 +8176,32 @@ msgid ""
 "\"mac-address\" property."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:337
+#: ../clients/common/settings-docs.c.in:361
 msgid ""
 "Dictionary of key/value pairs of VPN plugin specific data.  Both keys and "
 "values must be strings."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:338
+#: ../clients/common/settings-docs.c.in:363
 msgid ""
 "If the VPN service supports persistence, and this property is TRUE, the VPN "
 "will attempt to stay connected across link changes and outages, until "
 "explicitly disconnected."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:339
+#: ../clients/common/settings-docs.c.in:364
 msgid ""
 "Dictionary of key/value pairs of VPN plugin specific secrets like passwords "
 "or private keys.  Both keys and values must be strings."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:340
+#: ../clients/common/settings-docs.c.in:365
 msgid ""
 "D-Bus service name of the VPN plugin that this setting uses to connect to "
 "its network.  i.e. org.freedesktop.NetworkManager.vpnc for the vpnc plugin."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:341
+#: ../clients/common/settings-docs.c.in:366
 msgid ""
 "Timeout for the VPN service to establish the connection. Some services may "
 "take quite a long time to connect. Value of 0 means a default timeout, which "
@@ -8752,7 +8209,7 @@ msgid ""
 "Values greater than zero mean timeout in seconds."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:342
+#: ../clients/common/settings-docs.c.in:367
 msgid ""
 "If the VPN connection requires a user name for authentication, that name "
 "should be provided here.  If the connection is available to more than one "
@@ -8762,135 +8219,113 @@ msgid ""
 "connection."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:343
+#: ../clients/common/settings-docs.c.in:368
 msgid "Specifies the lifetime in seconds of FDB entries learnt by the kernel."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:344
+#: ../clients/common/settings-docs.c.in:369
 msgid ""
 "Specifies the UDP destination port to communicate to the remote VXLAN tunnel "
 "endpoint."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:345
+#: ../clients/common/settings-docs.c.in:370
 msgid ""
 "Specifies the VXLAN Network Identifier (or VXLAN Segment Identifier) to use."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:346
+#: ../clients/common/settings-docs.c.in:371
 msgid "Specifies whether netlink LL ADDR miss notifications are generated."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:347
+#: ../clients/common/settings-docs.c.in:372
 msgid "Specifies whether netlink IP ADDR miss notifications are generated."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:348
+#: ../clients/common/settings-docs.c.in:373
 msgid ""
 "Specifies whether unknown source link layer addresses and IP addresses are "
 "entered into the VXLAN device forwarding database."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:349
+#: ../clients/common/settings-docs.c.in:374
 msgid ""
 "Specifies the maximum number of FDB entries. A value of zero means that the "
 "kernel will store unlimited entries."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:350
+#: ../clients/common/settings-docs.c.in:375
 msgid "If given, specifies the source IP address to use in outgoing packets."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:351
+#: ../clients/common/settings-docs.c.in:377
 msgid ""
 "If given, specifies the parent interface name or parent connection UUID."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:352
+#: ../clients/common/settings-docs.c.in:378
 msgid "Specifies whether ARP proxy is turned on."
-msgstr "Legt fest, ob der ARP-Proxy eingeschaltet sein soll."
+msgstr ""
 
-#: ../clients/common/settings-docs.h.in:353
+#: ../clients/common/settings-docs.c.in:379
 msgid ""
 "Specifies the unicast destination IP address to use in outgoing packets when "
 "the destination link layer address is not known in the VXLAN device "
 "forwarding database, or the multicast IP address to join."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:354
+#: ../clients/common/settings-docs.c.in:380
 msgid "Specifies whether route short circuit is turned on."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:355
+#: ../clients/common/settings-docs.c.in:381
 msgid ""
 "Specifies the maximum UDP source port to communicate to the remote VXLAN "
 "tunnel endpoint."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:356
+#: ../clients/common/settings-docs.c.in:382
 msgid ""
 "Specifies the minimum UDP source port to communicate to the remote VXLAN "
 "tunnel endpoint."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:357
+#: ../clients/common/settings-docs.c.in:383
 msgid "Specifies the TOS value to use in outgoing packets."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:358
+#: ../clients/common/settings-docs.c.in:384
 msgid "Specifies the time-to-live value to use in outgoing packets."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:359
+#: ../clients/common/settings-docs.c.in:385
 msgid ""
 "If specified, this connection will only apply to the WiMAX device whose MAC "
 "address matches. This property does not change the MAC address of the device "
 "(known as MAC spoofing). Deprecated: 1"
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:360
+#: ../clients/common/settings-docs.c.in:387
 msgid ""
 "Network Service Provider (NSP) name of the WiMAX network this connection "
 "should use. Deprecated: 1"
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:361
-#, fuzzy
-#| msgid ""
-#| "If specified, this connection will only apply to the Ethernet device "
-#| "whose permanent MAC address matches. This property does not change the "
-#| "MAC address of the device (i.e. MAC spoofing)."
-msgid ""
-"If specified, this connection will only apply to the IEEE 802.15.4 (WPAN) "
-"MAC layer device whose permanent MAC address matches."
-msgstr ""
-"Wenn angegeben, so ist diese Verbindung nur für das Ethernet-Gerät gültig, "
-"dessen permanente MAC-Adresse übereinstimmt. Diese Eigenschaft beeinflusst "
-"nicht die MAC-Adresse des Gerätes (d.h. kein »MAC spoofing«)."
-
-#: ../clients/common/settings-docs.h.in:362
-msgid "IEEE 802.15.4 Personal Area Network (PAN) identifier."
-msgstr ""
-
-#: ../clients/common/settings-docs.h.in:363
-msgid "Short IEEE 802.15.4 address to be used within a restricted environment."
-msgstr ""
-
-#: ../clients/nm-online.c:90
+#: ../clients/nm-online.c:91
 msgid "Connecting"
 msgstr "Wird verbunden"
 
-#: ../clients/nm-online.c:206
+#: ../clients/nm-online.c:189
 #, c-format
 msgid "Error: timeout creating NMClient object\n"
 msgstr "Fehler: Zeitablauf beim Erstellen des NMClient-Objekts\n"
 
-#: ../clients/nm-online.c:226
+#: ../clients/nm-online.c:209
 #, c-format
 msgid "Error: Could not create NMClient object: %s\n"
 msgstr "Fehler: NMClient-Objekt konnte nicht erstellt werden: %s\n"
 
-#: ../clients/nm-online.c:252
+#: ../clients/nm-online.c:235
 msgid ""
 "Time to wait for a connection, in seconds (without the option, default value "
 "is 30)"
@@ -8898,36 +8333,36 @@ msgstr ""
 "Zeit zum Warten auf eine Verbindung, in Sekunden (ohne Angabe ist die "
 "Voreinstellung 30)"
 
-#: ../clients/nm-online.c:253
+#: ../clients/nm-online.c:236
 msgid "Exit immediately if NetworkManager is not running or connecting"
 msgstr ""
 "Sofort beenden, falls NetworkManager nicht ausgeführt wird oder eine "
 "Verbindung herstellt"
 
-#: ../clients/nm-online.c:254
+#: ../clients/nm-online.c:237
 msgid "Don't print anything"
 msgstr "Nichts ausgeben"
 
-#: ../clients/nm-online.c:255
+#: ../clients/nm-online.c:238
 msgid "Wait for NetworkManager startup instead of a connection"
 msgstr "Auf Start von NetworkManager anstatt auf eine Verbindungen warten"
 
-#: ../clients/nm-online.c:275
+#: ../clients/nm-online.c:260
 msgid ""
 "Waits for NetworkManager to finish activating startup network connections."
 msgstr ""
 "Auf NetworkManager zum Aktivieren der Start-Netzwerkverbindungen warten."
 
-#: ../clients/nm-online.c:282 ../clients/nm-online.c:288
+#: ../clients/nm-online.c:267 ../clients/nm-online.c:273
 msgid "Invalid option.  Please use --help to see a list of valid options."
 msgstr ""
 "Ungültige Option.  Verwenden Sie »--help«, um eine Liste gültiger Optionen "
 "zu erhalten."
 
-#: ../clients/tui/newt/nmt-newt-utils.c:177 ../clients/tui/nmt-editor.c:429
+#: ../clients/tui/newt/nmt-newt-utils.c:177 ../clients/tui/nmt-editor.c:430
 #: ../clients/tui/nmt-password-dialog.c:174
 #: ../clients/tui/nmt-route-editor.c:122 ../clients/tui/nmtui-hostname.c:69
-#: ../clients/tui/nmtui.c:134
+#: ../clients/tui/nmtui.c:136
 msgid "OK"
 msgstr "OK"
 
@@ -8937,127 +8372,137 @@ msgstr "OK"
 msgid "Could not create temporary file: %s"
 msgstr "Temporäre Datei konnte nicht erstellt werden: %s"
 
-#: ../clients/tui/newt/nmt-newt-utils.c:363
+#: ../clients/tui/newt/nmt-newt-utils.c:365
 #, c-format
 msgid "Editor failed: %s"
 msgstr "Editor fehlgeschlagen: %s"
 
-#: ../clients/tui/newt/nmt-newt-utils.c:369
+#: ../clients/tui/newt/nmt-newt-utils.c:373
+#, c-format
+msgid "Editor failed with status %d"
+msgstr "Editor fehlgeschlagen mit Status %d"
+
+#: ../clients/tui/newt/nmt-newt-utils.c:375
+#, c-format
+msgid "Editor failed with signal %d"
+msgstr "Editor fehlgeschlagen mit Signal %d"
+
+#: ../clients/tui/newt/nmt-newt-utils.c:379
 #, c-format
 msgid "Could not re-read file: %s"
 msgstr "Datei konnte nicht erneut eingelesen werden: %s"
 
-#: ../clients/tui/nm-editor-utils.c:144 ../libnm-glib/nm-device.c:1820
-#: ../libnm/nm-device.c:1306
+#: ../clients/tui/nm-editor-utils.c:146 ../libnm-glib/nm-device.c:1821
+#: ../libnm/nm-device.c:1521
 msgid "Ethernet"
 msgstr "Ethernet"
 
-#: ../clients/tui/nm-editor-utils.c:148
+#: ../clients/tui/nm-editor-utils.c:150
 #, c-format
 msgid "Ethernet connection %d"
 msgstr "Ethernet-Verbindung %d"
 
-#: ../clients/tui/nm-editor-utils.c:152 ../libnm-glib/nm-device.c:1822
-#: ../libnm/nm-device.c:1308
+#: ../clients/tui/nm-editor-utils.c:154 ../libnm-glib/nm-device.c:1823
+#: ../libnm/nm-device.c:1523
 msgid "Wi-Fi"
 msgstr "WLAN"
 
-#: ../clients/tui/nm-editor-utils.c:156
+#: ../clients/tui/nm-editor-utils.c:158
 #, c-format
 msgid "Wi-Fi connection %d"
 msgstr "WLAN-Verbindung %d"
 
-#: ../clients/tui/nm-editor-utils.c:161 ../libnm-core/nm-connection.c:2268
-#: ../libnm-glib/nm-device.c:1832 ../libnm/nm-device.c:1324
+#: ../clients/tui/nm-editor-utils.c:163 ../libnm-core/nm-connection.c:2114
+#: ../libnm-glib/nm-device.c:1833 ../libnm/nm-device.c:1539
 msgid "InfiniBand"
 msgstr "InfiniBand"
 
-#: ../clients/tui/nm-editor-utils.c:165
+#: ../clients/tui/nm-editor-utils.c:167
 #, c-format
 msgid "InfiniBand connection %d"
 msgstr "InfiniBand-Verbindung %d"
 
-#: ../clients/tui/nm-editor-utils.c:170 ../libnm-glib/nm-device.c:1830
-#: ../libnm/nm-device.c:1322
+#: ../clients/tui/nm-editor-utils.c:172 ../libnm-glib/nm-device.c:1831
+#: ../libnm/nm-device.c:1537
 msgid "Mobile Broadband"
 msgstr "Mobiles Breitband"
 
-#: ../clients/tui/nm-editor-utils.c:173
+#: ../clients/tui/nm-editor-utils.c:175
 #, c-format
 msgid "Mobile broadband connection %d"
 msgstr "Mobile Breitband-Verbindung %d"
 
-#: ../clients/tui/nm-editor-utils.c:179 ../clients/tui/nmt-page-dsl.c:62
+#: ../clients/tui/nm-editor-utils.c:181 ../clients/tui/nmt-page-dsl.c:62
 msgid "DSL"
 msgstr "DSL"
 
-#: ../clients/tui/nm-editor-utils.c:183
+#: ../clients/tui/nm-editor-utils.c:185
 #, c-format
 msgid "DSL connection %d"
 msgstr "DSL-Verbindung %d"
 
-#: ../clients/tui/nm-editor-utils.c:188 ../libnm-core/nm-connection.c:2260
-#: ../libnm-glib/nm-device.c:1834 ../libnm-util/nm-connection.c:1623
-#: ../libnm/nm-device.c:1326
-#: ../src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-reader.c:4734
+#: ../clients/tui/nm-editor-utils.c:190 ../libnm-core/nm-connection.c:2106
+#: ../libnm-glib/nm-device.c:1835 ../libnm-util/nm-connection.c:1626
+#: ../libnm/nm-device.c:1541
+#: ../src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-reader.c:4563
 msgid "Bond"
 msgstr "Gebündelt"
 
-#: ../clients/tui/nm-editor-utils.c:192
+#: ../clients/tui/nm-editor-utils.c:194
 #, c-format
 msgid "Bond connection %d"
 msgstr "Gebündelte Verbindung %d"
 
-#: ../clients/tui/nm-editor-utils.c:197 ../libnm-core/nm-connection.c:2264
-#: ../libnm-glib/nm-device.c:1838 ../libnm-util/nm-connection.c:1627
-#: ../libnm/nm-device.c:1330
-#: ../src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-reader.c:5070
+#: ../clients/tui/nm-editor-utils.c:199 ../libnm-core/nm-connection.c:2110
+#: ../libnm-glib/nm-device.c:1839 ../libnm-util/nm-connection.c:1630
+#: ../libnm/nm-device.c:1545
+#: ../src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-reader.c:4899
 msgid "Bridge"
 msgstr "Brücke"
 
-#: ../clients/tui/nm-editor-utils.c:202
+#: ../clients/tui/nm-editor-utils.c:204
 #, c-format
 msgid "Bridge connection %d"
 msgstr "Brückenverbindung %d"
 
-#: ../clients/tui/nm-editor-utils.c:206 ../libnm-core/nm-connection.c:2262
-#: ../libnm-glib/nm-device.c:1836 ../libnm-util/nm-connection.c:1625
-#: ../libnm/nm-device.c:1328
-#: ../src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-reader.c:4837
+#: ../clients/tui/nm-editor-utils.c:208 ../libnm-core/nm-connection.c:2108
+#: ../libnm-glib/nm-device.c:1837 ../libnm-util/nm-connection.c:1628
+#: ../libnm/nm-device.c:1543
+#: ../src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-reader.c:4666
 msgid "Team"
 msgstr "Bündelung"
 
-#: ../clients/tui/nm-editor-utils.c:211
+#: ../clients/tui/nm-editor-utils.c:213
 #, c-format
 msgid "Team connection %d"
 msgstr "Gebündelte Verbindung %d"
 
-#: ../clients/tui/nm-editor-utils.c:215 ../clients/tui/nmt-page-vlan.c:82
-#: ../libnm-core/nm-connection.c:2266 ../libnm-glib/nm-device.c:1840
-#: ../libnm-util/nm-connection.c:1629 ../libnm/nm-device.c:1332
+#: ../clients/tui/nm-editor-utils.c:217 ../clients/tui/nmt-page-vlan.c:82
+#: ../libnm-core/nm-connection.c:2112 ../libnm-glib/nm-device.c:1841
+#: ../libnm-util/nm-connection.c:1632 ../libnm/nm-device.c:1547
 msgid "VLAN"
 msgstr "VLAN"
 
-#: ../clients/tui/nm-editor-utils.c:219
+#: ../clients/tui/nm-editor-utils.c:221
 #, c-format
 msgid "VLAN connection %d"
 msgstr "VLAN-Verbindung %d"
 
-#: ../clients/tui/nm-editor-utils.c:223 ../clients/tui/nmt-page-ip-tunnel.c:136
+#: ../clients/tui/nm-editor-utils.c:225 ../clients/tui/nmt-page-ip-tunnel.c:136
 msgid "IP tunnel"
 msgstr "IP-Tunnel"
 
-#: ../clients/tui/nm-editor-utils.c:227
+#: ../clients/tui/nm-editor-utils.c:229
 #, c-format
 msgid "IP tunnel connection %d"
 msgstr "IP-Tunnel-Verbindung %d"
 
-#: ../clients/tui/nm-editor-utils.c:242
+#: ../clients/tui/nm-editor-utils.c:244
 #, c-format
 msgid "VPN connection %d"
 msgstr "VPN-Verbindung %d"
 
-#: ../clients/tui/nmt-device-entry.c:368
+#: ../clients/tui/nmt-device-entry.c:370
 msgid "Select..."
 msgstr "Auswählen …"
 
@@ -9072,7 +8517,7 @@ msgid "Edit..."
 msgstr "Bearbeiten …"
 
 #: ../clients/tui/nmt-edit-connection-list.c:116
-#: ../clients/tui/nmtui-edit.c:529
+#: ../clients/tui/nmtui-edit.c:531
 msgid "Delete"
 msgstr "Löschen"
 
@@ -9098,40 +8543,40 @@ msgstr "Editor für ungültige Verbindung »%s« konnte nicht erstellt werden."
 msgid "Edit Connection"
 msgstr "Verbindung bearbeiten"
 
-#: ../clients/tui/nmt-editor.c:173
+#: ../clients/tui/nmt-editor.c:174
 #, c-format
 msgid "Unable to save connection: %s"
 msgstr "Verbindung kann nicht gespeichert werden: %s"
 
-#: ../clients/tui/nmt-editor.c:187
+#: ../clients/tui/nmt-editor.c:188
 #, c-format
 msgid "Unable to add new connection: %s"
 msgstr "Neue Verbindung kann nicht hinzugefügt werden: %s"
 
-#: ../clients/tui/nmt-editor.c:332
+#: ../clients/tui/nmt-editor.c:333
 msgid "Profile name"
 msgstr "Profilname"
 
-#: ../clients/tui/nmt-editor.c:343
+#: ../clients/tui/nmt-editor.c:344
 msgid "Ethernet device"
 msgstr "Ethernet-Gerät"
 
-#: ../clients/tui/nmt-editor.c:345
+#: ../clients/tui/nmt-editor.c:346
 msgid "Device"
 msgstr "Gerät"
 
 #. And finally the bottom widgets
-#: ../clients/tui/nmt-editor.c:405
+#: ../clients/tui/nmt-editor.c:406
 msgid "Automatically connect"
 msgstr "Automatisch verbinden"
 
-#: ../clients/tui/nmt-editor.c:411
+#: ../clients/tui/nmt-editor.c:412
 msgid "Available to all users"
 msgstr "Für alle Benutzer verfügbar"
 
-#: ../clients/tui/nmt-editor.c:426 ../clients/tui/nmt-password-dialog.c:171
-#: ../clients/tui/nmt-route-editor.c:115 ../clients/tui/nmtui-edit.c:220
-#: ../clients/tui/nmtui-edit.c:528 ../clients/tui/nmtui-hostname.c:67
+#: ../clients/tui/nmt-editor.c:427 ../clients/tui/nmt-password-dialog.c:171
+#: ../clients/tui/nmt-route-editor.c:115 ../clients/tui/nmtui-edit.c:222
+#: ../clients/tui/nmtui-edit.c:530 ../clients/tui/nmtui-hostname.c:67
 msgid "Cancel"
 msgstr "Abbrechen"
 
@@ -9646,27 +9091,27 @@ msgstr "Nach diesem Passwort jedes Mal fragen"
 msgid "Show password"
 msgstr "Passwort zeigen"
 
-#: ../clients/tui/nmt-route-table.c:187
+#: ../clients/tui/nmt-route-table.c:191
 msgid "Destination"
 msgstr "Ziel"
 
-#: ../clients/tui/nmt-route-table.c:187
+#: ../clients/tui/nmt-route-table.c:191
 msgid "Prefix"
 msgstr "Präfix"
 
-#: ../clients/tui/nmt-route-table.c:196
+#: ../clients/tui/nmt-route-table.c:200
 msgid "Next Hop"
 msgstr "Next Hop"
 
-#: ../clients/tui/nmt-route-table.c:204
+#: ../clients/tui/nmt-route-table.c:208
 msgid "Metric"
 msgstr "Metrik"
 
-#: ../clients/tui/nmt-route-table.c:224
+#: ../clients/tui/nmt-route-table.c:228
 msgid "No custom routes are defined."
 msgstr "Es sind keine eigenen Routen festgelegt."
 
-#: ../clients/tui/nmt-slave-list.c:134
+#: ../clients/tui/nmt-slave-list.c:136
 msgid "Select the type of slave connection you wish to add."
 msgstr "Wählen Sie die Art der Slave-Verbindung, die Sie hinzufügen möchten."
 
@@ -9704,7 +9149,7 @@ msgstr "»openconnect« fehlgeschlagen mit Signal %d"
 #: ../clients/tui/nmtui-connect.c:183
 #, c-format
 msgid "Activation failed: %s"
-msgstr "Aktivierung ist fehlgeschlagen: %s"
+msgstr ""
 
 #: ../clients/tui/nmtui-connect.c:254
 msgid "Connecting..."
@@ -9723,12 +9168,12 @@ msgstr "Aktivieren"
 msgid "Deactivate"
 msgstr "Deaktivieren"
 
-#: ../clients/tui/nmtui-connect.c:445 ../clients/tui/nmtui-edit.c:118
-#: ../clients/tui/nmtui.c:128
+#: ../clients/tui/nmtui-connect.c:445 ../clients/tui/nmtui-edit.c:120
+#: ../clients/tui/nmtui.c:130
 msgid "Quit"
 msgstr "Beenden"
 
-#: ../clients/tui/nmtui-connect.c:445 ../clients/tui/nmtui-edit.c:118
+#: ../clients/tui/nmtui-connect.c:445 ../clients/tui/nmtui-edit.c:120
 msgid "Back"
 msgstr "Zurück"
 
@@ -9741,15 +9186,15 @@ msgstr "Verbindung »%s« existiert nicht"
 msgid "Connection is already active"
 msgstr "Verbindung ist bereits aktiv"
 
-#: ../clients/tui/nmtui-edit.c:228
+#: ../clients/tui/nmtui-edit.c:230
 msgid "Create"
 msgstr "Erstellen"
 
-#: ../clients/tui/nmtui-edit.c:370
+#: ../clients/tui/nmtui-edit.c:372
 msgid "Select the type of connection you wish to create."
 msgstr "Wählen Sie den Verbindungstyp, den Sie anlegen möchten."
 
-#: ../clients/tui/nmtui-edit.c:378
+#: ../clients/tui/nmtui-edit.c:380
 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."
@@ -9758,21 +9203,21 @@ msgstr ""
 "erscheint nicht in der Liste, dann haben Sie die korrekte Erweiterung nicht "
 "installiert."
 
-#: ../clients/tui/nmtui-edit.c:414 ../clients/tui/nmtui-edit.c:430
+#: ../clients/tui/nmtui-edit.c:416 ../clients/tui/nmtui-edit.c:432
 msgid "New Connection"
 msgstr "Neue Verbindung"
 
-#: ../clients/tui/nmtui-edit.c:469
+#: ../clients/tui/nmtui-edit.c:471
 #, c-format
 msgid "Unable to delete connection: %s"
 msgstr "Verbindung kann nicht gelöscht werden: %s"
 
-#: ../clients/tui/nmtui-edit.c:508
+#: ../clients/tui/nmtui-edit.c:510
 #, c-format
 msgid "Could not delete connection '%s': %s"
 msgstr "Verbindung »%s« konnte nicht gelöscht werden: %s"
 
-#: ../clients/tui/nmtui-edit.c:530
+#: ../clients/tui/nmtui-edit.c:532
 #, c-format
 msgid "Are you sure you want to delete the connection '%s'?"
 msgstr "Sind Sie sicher, dass Sie die Verbindung »%s« entfernen möchten?"
@@ -9796,129 +9241,129 @@ msgstr "Rechnernamen auf »%s« festlegen"
 msgid "Unable to set hostname: %s"
 msgstr "Fehler beim Festlegen des Rechnernamens: %s"
 
-#: ../clients/tui/nmtui.c:51 ../clients/tui/nmtui.c:54
+#: ../clients/tui/nmtui.c:53 ../clients/tui/nmtui.c:56
 msgid "connection"
 msgstr "Verbindung"
 
-#: ../clients/tui/nmtui.c:52
+#: ../clients/tui/nmtui.c:54
 msgid "Edit a connection"
 msgstr "Eine Verbindung bearbeiten"
 
-#: ../clients/tui/nmtui.c:55
+#: ../clients/tui/nmtui.c:57
 msgid "Activate a connection"
 msgstr "Eine Verbindung aktivieren"
 
-#: ../clients/tui/nmtui.c:57
+#: ../clients/tui/nmtui.c:59
 msgid "new hostname"
 msgstr "neuer Rechnername"
 
-#: ../clients/tui/nmtui.c:58
+#: ../clients/tui/nmtui.c:60
 msgid "Set system hostname"
 msgstr "Den Rechnernamen des Systems festlegen"
 
-#: ../clients/tui/nmtui.c:102
+#: ../clients/tui/nmtui.c:104
 msgid "NetworkManager TUI"
 msgstr "NetworkManager Terminal-Benutzeroberfläche (TUI)"
 
-#: ../clients/tui/nmtui.c:110
+#: ../clients/tui/nmtui.c:112
 msgid "Please select an option"
 msgstr "Bitte wählen Sie eine Option"
 
-#: ../clients/tui/nmtui.c:158
+#: ../clients/tui/nmtui.c:160
 msgid "Usage"
 msgstr "Aufruf"
 
-#: ../clients/tui/nmtui.c:239
+#: ../clients/tui/nmtui.c:241
 msgid "Could not parse arguments"
 msgstr "Parameter konnten nicht verarbeitet werden"
 
-#: ../clients/tui/nmtui.c:249
+#: ../clients/tui/nmtui.c:251
 #, c-format
 msgid "Could not contact NetworkManager: %s.\n"
 msgstr "NetworkManager konnte nicht erreicht werden: %s.\n"
 
-#: ../clients/tui/nmtui.c:254
+#: ../clients/tui/nmtui.c:256
 msgid "NetworkManager is not running."
 msgstr "NetworkManager wird nicht ausgeführt."
 
-#: ../libnm-core/crypto.c:118 ../libnm-util/crypto.c:130
+#: ../libnm-core/crypto.c:118 ../libnm-util/crypto.c:131
 #, c-format
 msgid "PEM key file had no end tag '%s'."
 msgstr "PEM-Schlüsseldatei hat kein abschließendes Tag »%s«."
 
-#: ../libnm-core/crypto.c:131 ../libnm-util/crypto.c:143
+#: ../libnm-core/crypto.c:131 ../libnm-util/crypto.c:144
 #, c-format
 msgid "Doesn't look like a PEM private key file."
 msgstr "Das sieht nicht nach einer privaten PEM-Schlüsseldatei aus."
 
-#: ../libnm-core/crypto.c:148 ../libnm-util/crypto.c:160
+#: ../libnm-core/crypto.c:148 ../libnm-util/crypto.c:161
 #, c-format
 msgid "Malformed PEM file: Proc-Type was not first tag."
 msgstr "Fehlerhafte PEM-Datei: Proc-Type ist nicht das erste Tag."
 
-#: ../libnm-core/crypto.c:156 ../libnm-util/crypto.c:168
+#: ../libnm-core/crypto.c:156 ../libnm-util/crypto.c:169
 #, c-format
 msgid "Malformed PEM file: unknown Proc-Type tag '%s'."
 msgstr "Fehlerhafte PEM-Datei: unbekannter Proc-Type-Tag »%s«."
 
-#: ../libnm-core/crypto.c:166 ../libnm-util/crypto.c:178
+#: ../libnm-core/crypto.c:166 ../libnm-util/crypto.c:179
 #, c-format
 msgid "Malformed PEM file: DEK-Info was not the second tag."
 msgstr "Fehlerhafte PEM-Datei: DEK-Info ist nicht das zweite Tag."
 
-#: ../libnm-core/crypto.c:177 ../libnm-util/crypto.c:189
+#: ../libnm-core/crypto.c:177 ../libnm-util/crypto.c:190
 #, c-format
 msgid "Malformed PEM file: no IV found in DEK-Info tag."
 msgstr "Fehlerhafte PEM-Datei: kein IV im DEK-Info-Tag gefunden."
 
-#: ../libnm-core/crypto.c:184 ../libnm-util/crypto.c:196
+#: ../libnm-core/crypto.c:184 ../libnm-util/crypto.c:197
 #, c-format
 msgid "Malformed PEM file: invalid format of IV in DEK-Info tag."
 msgstr "Fehlerhafte PEM-Datei: falsches Format des IV im DEK-Info-Tag."
 
-#: ../libnm-core/crypto.c:199 ../libnm-util/crypto.c:211
+#: ../libnm-core/crypto.c:199 ../libnm-util/crypto.c:212
 #, c-format
 msgid "Malformed PEM file: unknown private key cipher '%s'."
 msgstr "Fehlerhafte PEM-Datei: Unbekannter privater Schlüsselstrom »%s«."
 
-#: ../libnm-core/crypto.c:218 ../libnm-util/crypto.c:230
+#: ../libnm-core/crypto.c:218 ../libnm-util/crypto.c:231
 #, c-format
 msgid "Could not decode private key."
 msgstr "Der private Schlüssel konnte nicht entschlüsselt werden."
 
-#: ../libnm-core/crypto.c:272 ../libnm-util/crypto.c:282
+#: ../libnm-core/crypto.c:272 ../libnm-util/crypto.c:283
 msgid "Failed to find expected PKCS#8 start tag."
 msgstr "Auffinden der erwarteten PKCS#8-Startmarkierung scheiterte."
 
-#: ../libnm-core/crypto.c:280 ../libnm-util/crypto.c:290
+#: ../libnm-core/crypto.c:280 ../libnm-util/crypto.c:291
 #, c-format
 msgid "Failed to find expected PKCS#8 end tag '%s'."
 msgstr "Auffinden der erwarteten PKCS#8-Endmarkierung »%s« scheiterte."
 
-#: ../libnm-core/crypto.c:299 ../libnm-util/crypto.c:309
+#: ../libnm-core/crypto.c:299 ../libnm-util/crypto.c:310
 msgid "Failed to decode PKCS#8 private key."
 msgstr "Die Entschlüsselung des privaten PKCS#8-Schlüssels scheiterte."
 
-#: ../libnm-core/crypto.c:341 ../libnm-util/crypto.c:351
+#: ../libnm-core/crypto.c:341 ../libnm-util/crypto.c:352
 #, c-format
 msgid "IV must be an even number of bytes in length."
 msgstr "IV muss eine gerade Anzahl an Byte lang sein."
 
-#: ../libnm-core/crypto.c:355 ../libnm-util/crypto.c:365
+#: ../libnm-core/crypto.c:355 ../libnm-util/crypto.c:366
 #, c-format
 msgid "IV contains non-hexadecimal digits."
 msgstr "IV enthält nicht-hexadezimale Zeichen."
 
 #: ../libnm-core/crypto.c:395 ../libnm-core/crypto_gnutls.c:91
 #: ../libnm-core/crypto_gnutls.c:197 ../libnm-core/crypto_nss.c:112
-#: ../libnm-core/crypto_nss.c:277 ../libnm-util/crypto.c:405
-#: ../libnm-util/crypto_gnutls.c:151 ../libnm-util/crypto_gnutls.c:253
+#: ../libnm-core/crypto_nss.c:277 ../libnm-util/crypto.c:406
+#: ../libnm-util/crypto_gnutls.c:151 ../libnm-util/crypto_gnutls.c:256
 #: ../libnm-util/crypto_nss.c:162 ../libnm-util/crypto_nss.c:323
 #, c-format
 msgid "Private key cipher '%s' was unknown."
 msgstr "Privater Schlüsselstrom »%s« ist unbekannt."
 
-#: ../libnm-core/crypto.c:494 ../libnm-util/crypto.c:515
+#: ../libnm-core/crypto.c:494 ../libnm-util/crypto.c:516
 #, c-format
 msgid "Unable to determine private key type."
 msgstr "Der Typ des privaten Schlüssels konnte nicht bestimmt werden."
@@ -9928,17 +9373,17 @@ msgstr "Der Typ des privaten Schlüssels konnte nicht bestimmt werden."
 msgid "Password provided, but key was not encrypted."
 msgstr "Passwort wurde angegeben, aber der Schlüssel war nicht verschlüsselt."
 
-#: ../libnm-core/crypto.c:555 ../libnm-util/crypto.c:570
+#: ../libnm-core/crypto.c:555 ../libnm-util/crypto.c:571
 #, c-format
 msgid "PEM certificate had no start tag '%s'."
 msgstr "PEM-Zertifikat hatte kein Start-Tag »%s«."
 
-#: ../libnm-core/crypto.c:564 ../libnm-util/crypto.c:579
+#: ../libnm-core/crypto.c:564 ../libnm-util/crypto.c:580
 #, c-format
 msgid "PEM certificate had no end tag '%s'."
 msgstr "PEM-Zertifikat hatte kein abschließendes Tag »%s«."
 
-#: ../libnm-core/crypto.c:582 ../libnm-util/crypto.c:597
+#: ../libnm-core/crypto.c:582 ../libnm-util/crypto.c:598
 #, c-format
 msgid "Failed to decode certificate."
 msgstr "Die Entschlüsselung des Zertifikats scheiterte."
@@ -9977,48 +9422,48 @@ msgstr ""
 msgid "Failed to decrypt the private key."
 msgstr "Die Entschlüsselung des privaten Schlüssels scheiterte."
 
-#: ../libnm-core/crypto_gnutls.c:224 ../libnm-util/crypto_gnutls.c:280
+#: ../libnm-core/crypto_gnutls.c:224 ../libnm-util/crypto_gnutls.c:283
 #, c-format
 msgid "Failed to initialize the encryption cipher context: %s (%s)"
 msgstr ""
 "Die Initialisierung des Verschlüsselung-Chiffrekontextes scheiterte: %s (%s)"
 
-#: ../libnm-core/crypto_gnutls.c:233 ../libnm-util/crypto_gnutls.c:289
+#: ../libnm-core/crypto_gnutls.c:233 ../libnm-util/crypto_gnutls.c:292
 #, c-format
 msgid "Failed to encrypt the data: %s (%s)"
 msgstr "Die Verschlüsselung der Daten scheiterte: %s (%s)"
 
-#: ../libnm-core/crypto_gnutls.c:276 ../libnm-util/crypto_gnutls.c:329
+#: ../libnm-core/crypto_gnutls.c:276 ../libnm-util/crypto_gnutls.c:332
 #, c-format
 msgid "Error initializing certificate data: %s"
 msgstr "Die Initialisierung der Zertifikatsdaten schlug fehl: %s"
 
-#: ../libnm-core/crypto_gnutls.c:298 ../libnm-util/crypto_gnutls.c:351
+#: ../libnm-core/crypto_gnutls.c:298 ../libnm-util/crypto_gnutls.c:354
 #, c-format
 msgid "Couldn't decode certificate: %s"
 msgstr "Zertifikat konnte nicht entschlüsselt werden: %s"
 
-#: ../libnm-core/crypto_gnutls.c:326 ../libnm-util/crypto_gnutls.c:375
+#: ../libnm-core/crypto_gnutls.c:326 ../libnm-util/crypto_gnutls.c:378
 #, c-format
 msgid "Couldn't initialize PKCS#12 decoder: %s"
 msgstr "PKCS#12-Decoder konnte nicht initialisiert werden: %s"
 
-#: ../libnm-core/crypto_gnutls.c:339 ../libnm-util/crypto_gnutls.c:388
+#: ../libnm-core/crypto_gnutls.c:339 ../libnm-util/crypto_gnutls.c:391
 #, c-format
 msgid "Couldn't decode PKCS#12 file: %s"
 msgstr "PKCS#12 konnte nicht entschlüsselt werden: %s"
 
-#: ../libnm-core/crypto_gnutls.c:351 ../libnm-util/crypto_gnutls.c:400
+#: ../libnm-core/crypto_gnutls.c:351 ../libnm-util/crypto_gnutls.c:403
 #, c-format
 msgid "Couldn't verify PKCS#12 file: %s"
 msgstr "PKCS#12-Datei konnte nicht überprüft werden: %s"
 
-#: ../libnm-core/crypto_gnutls.c:383 ../libnm-util/crypto_gnutls.c:428
+#: ../libnm-core/crypto_gnutls.c:383 ../libnm-util/crypto_gnutls.c:431
 #, c-format
 msgid "Couldn't initialize PKCS#8 decoder: %s"
 msgstr "PKCS#8-Decoder konnte nicht initialisiert werden: %s"
 
-#: ../libnm-core/crypto_gnutls.c:406 ../libnm-util/crypto_gnutls.c:451
+#: ../libnm-core/crypto_gnutls.c:406 ../libnm-util/crypto_gnutls.c:454
 #, c-format
 msgid "Couldn't decode PKCS#8 file: %s"
 msgstr "PKCS#8-Datei konnte nicht entschlüsselt werden: %s"
@@ -10132,546 +9577,518 @@ msgstr "PKCS#12-Datei konnte nicht überprüft werden: %d"
 msgid "Could not generate random data."
 msgstr "Es konnten keine Zufallsdaten generiert werden."
 
-#: ../libnm-core/nm-connection.c:283
+#: ../libnm-core/nm-connection.c:249
 msgid "wrong type; should be a list of strings."
 msgstr "falscher Typ. Sollte eine Liste von Zeichenketten sein."
 
-#: ../libnm-core/nm-connection.c:353
+#: ../libnm-core/nm-connection.c:319
 msgid "unknown setting name"
 msgstr "Unbekannter Einstellungsname"
 
-#: ../libnm-core/nm-connection.c:365
+#: ../libnm-core/nm-connection.c:331
 msgid "duplicate setting name"
 msgstr "Doppelter Einstellungsname"
 
-#: ../libnm-core/nm-connection.c:1325
+#: ../libnm-core/nm-connection.c:1233
 msgid "setting not found"
 msgstr "Einstellung nicht gefunden"
 
-#: ../libnm-core/nm-connection.c:1391 ../libnm-core/nm-connection.c:1416
-#: ../libnm-core/nm-connection.c:1441
-msgid "setting is required for non-slave connections"
-msgstr "Einstellung ist für Nicht-Slave-Verbindungen notwendig"
-
-#: ../libnm-core/nm-connection.c:1404 ../libnm-core/nm-connection.c:1429
-#: ../libnm-core/nm-connection.c:1454
+#: ../libnm-core/nm-connection.c:1300
 msgid "setting not allowed in slave connection"
 msgstr "Die Einstellung ist nicht erlaubt für eine Slave-Verbindung"
 
-#: ../libnm-core/nm-connection.c:1544
+#: ../libnm-core/nm-connection.c:1316
+msgid "setting is required for non-slave connections"
+msgstr "Einstellung ist für Nicht-Slave-Verbindungen notwendig"
+
+#: ../libnm-core/nm-connection.c:1412
 msgid "Unexpected failure to verify the connection"
 msgstr "Unerwarteter Fehler beim Überprüfen der Verbindung"
 
-#: ../libnm-core/nm-connection.c:1588
+#: ../libnm-core/nm-connection.c:1454
 msgid "Unexpected failure to normalize the connection"
 msgstr "Unerwarteter Fehler beim Normalisieren der Verbindung"
 
-#: ../libnm-core/nm-connection.c:2126 ../libnm-core/nm-setting-8021x.c:2867
-#: ../libnm-core/nm-setting-8021x.c:2884 ../libnm-core/nm-setting-8021x.c:2915
-#: ../libnm-core/nm-setting-8021x.c:2932 ../libnm-core/nm-setting-8021x.c:2974
-#: ../libnm-core/nm-setting-8021x.c:2986 ../libnm-core/nm-setting-8021x.c:3004
-#: ../libnm-core/nm-setting-8021x.c:3016 ../libnm-core/nm-setting-8021x.c:3040
-#: ../libnm-core/nm-setting-8021x.c:3219 ../libnm-core/nm-setting-adsl.c:187
-#: ../libnm-core/nm-setting-bluetooth.c:136
-#: ../libnm-core/nm-setting-bluetooth.c:194
-#: ../libnm-core/nm-setting-bluetooth.c:208 ../libnm-core/nm-setting-cdma.c:157
-#: ../libnm-core/nm-setting-connection.c:928
-#: ../libnm-core/nm-setting-connection.c:971
-#: ../libnm-core/nm-setting-connection.c:1126
-#: ../libnm-core/nm-setting-ip-config.c:2492
-#: ../libnm-core/nm-setting-ip-tunnel.c:373
-#: ../libnm-core/nm-setting-olpc-mesh.c:118
-#: ../libnm-core/nm-setting-ovs-patch.c:92 ../libnm-core/nm-setting-pppoe.c:159
-#: ../libnm-core/nm-setting-vpn.c:488 ../libnm-core/nm-setting-vxlan.c:358
-#: ../libnm-core/nm-setting-wimax.c:124
-#: ../libnm-core/nm-setting-wireless-security.c:918
-#: ../libnm-core/nm-setting-wireless.c:750 ../libnm-util/nm-setting.c:1355
-#: ../libnm-util/nm-setting.c:1374 ../libnm-util/nm-setting.c:1392
-#: ../libnm-util/nm-setting-8021x.c:2324 ../libnm-util/nm-setting-8021x.c:2341
-#: ../libnm-util/nm-setting-8021x.c:2382 ../libnm-util/nm-setting-8021x.c:2399
-#: ../libnm-util/nm-setting-8021x.c:2451 ../libnm-util/nm-setting-8021x.c:2463
-#: ../libnm-util/nm-setting-8021x.c:2481 ../libnm-util/nm-setting-8021x.c:2493
-#: ../libnm-util/nm-setting-8021x.c:2517 ../libnm-util/nm-setting-8021x.c:2677
-#: ../libnm-util/nm-setting-adsl.c:209 ../libnm-util/nm-setting-bluetooth.c:141
-#: ../libnm-util/nm-setting-bluetooth.c:159 ../libnm-util/nm-setting-cdma.c:161
-#: ../libnm-util/nm-setting-connection.c:765
-#: ../libnm-util/nm-setting-connection.c:781
-#: ../libnm-util/nm-setting-connection.c:842
+#: ../libnm-core/nm-connection.c:1973 ../libnm-core/nm-setting-8021x.c:2881
+#: ../libnm-core/nm-setting-8021x.c:2898 ../libnm-core/nm-setting-8021x.c:2929
+#: ../libnm-core/nm-setting-8021x.c:2946 ../libnm-core/nm-setting-8021x.c:2988
+#: ../libnm-core/nm-setting-8021x.c:3000 ../libnm-core/nm-setting-8021x.c:3018
+#: ../libnm-core/nm-setting-8021x.c:3030 ../libnm-core/nm-setting-8021x.c:3054
+#: ../libnm-core/nm-setting-8021x.c:3235 ../libnm-core/nm-setting-adsl.c:189
+#: ../libnm-core/nm-setting-bluetooth.c:138
+#: ../libnm-core/nm-setting-bluetooth.c:196
+#: ../libnm-core/nm-setting-bluetooth.c:210 ../libnm-core/nm-setting-cdma.c:159
+#: ../libnm-core/nm-setting-connection.c:894
+#: ../libnm-core/nm-setting-connection.c:937
+#: ../libnm-core/nm-setting-connection.c:1066
+#: ../libnm-core/nm-setting-ip-config.c:2514
+#: ../libnm-core/nm-setting-ip-tunnel.c:352
+#: ../libnm-core/nm-setting-olpc-mesh.c:120
+#: ../libnm-core/nm-setting-ovs-patch.c:95 ../libnm-core/nm-setting-pppoe.c:161
+#: ../libnm-core/nm-setting-vpn.c:518 ../libnm-core/nm-setting-vxlan.c:360
+#: ../libnm-core/nm-setting-wimax.c:126
+#: ../libnm-core/nm-setting-wireless-security.c:900
+#: ../libnm-core/nm-setting-wireless.c:750 ../libnm-util/nm-setting.c:1357
+#: ../libnm-util/nm-setting.c:1376 ../libnm-util/nm-setting.c:1394
+#: ../libnm-util/nm-setting-8021x.c:2325 ../libnm-util/nm-setting-8021x.c:2342
+#: ../libnm-util/nm-setting-8021x.c:2383 ../libnm-util/nm-setting-8021x.c:2400
+#: ../libnm-util/nm-setting-8021x.c:2452 ../libnm-util/nm-setting-8021x.c:2464
+#: ../libnm-util/nm-setting-8021x.c:2482 ../libnm-util/nm-setting-8021x.c:2494
+#: ../libnm-util/nm-setting-8021x.c:2518 ../libnm-util/nm-setting-8021x.c:2680
+#: ../libnm-util/nm-setting-adsl.c:209 ../libnm-util/nm-setting-bluetooth.c:142
+#: ../libnm-util/nm-setting-bluetooth.c:160 ../libnm-util/nm-setting-cdma.c:162
+#: ../libnm-util/nm-setting-connection.c:768
+#: ../libnm-util/nm-setting-connection.c:784
+#: ../libnm-util/nm-setting-connection.c:845
 #: ../libnm-util/nm-setting-ip4-config.c:869
-#: ../libnm-util/nm-setting-ip6-config.c:831
-#: ../libnm-util/nm-setting-ip6-config.c:897
+#: ../libnm-util/nm-setting-ip6-config.c:833
+#: ../libnm-util/nm-setting-ip6-config.c:899
 #: ../libnm-util/nm-setting-olpc-mesh.c:123
-#: ../libnm-util/nm-setting-pppoe.c:162 ../libnm-util/nm-setting-vpn.c:422
-#: ../libnm-util/nm-setting-wimax.c:149
-#: ../libnm-util/nm-setting-wireless-security.c:890
-#: ../libnm-util/nm-setting-wireless.c:768
+#: ../libnm-util/nm-setting-pppoe.c:163 ../libnm-util/nm-setting-vpn.c:423
+#: ../libnm-util/nm-setting-wimax.c:150
+#: ../libnm-util/nm-setting-wireless-security.c:891
+#: ../libnm-util/nm-setting-wireless.c:769
 msgid "property is missing"
 msgstr "Eigenschaft fehlt"
 
-#: ../libnm-core/nm-connection.c:2271
+#: ../libnm-core/nm-connection.c:2117
 msgid "IP Tunnel"
 msgstr "IP-Tunnel"
 
-#: ../libnm-core/nm-dbus-utils.c:189
+#: ../libnm-core/nm-dbus-utils.c:188
 #, c-format
 msgid "Method returned type '%s', but expected '%s'"
 msgstr "Methode gab den Typ »%s« zurück, aber »%s« wurde erwartet"
 
-#: ../libnm-core/nm-keyfile.c:199
+#: ../libnm-core/nm-keyfile-reader.c:144
 msgid "ignoring missing number"
 msgstr "fehlende Zahl wird ignoriert"
 
-#: ../libnm-core/nm-keyfile.c:207
+#: ../libnm-core/nm-keyfile-reader.c:152
 #, c-format
 msgid "ignoring invalid number '%s'"
 msgstr "Ungültige Zahl »%s« wird ignoriert"
 
-#: ../libnm-core/nm-keyfile.c:228
+#: ../libnm-core/nm-keyfile-reader.c:173
 #, c-format
 msgid "ignoring invalid %s address: %s"
 msgstr "Ungültige %s-Adresse wird ignoriert: %s"
 
-#: ../libnm-core/nm-keyfile.c:270
+#: ../libnm-core/nm-keyfile-reader.c:215
 #, c-format
 msgid "ignoring invalid gateway '%s' for %s route"
 msgstr "Ungültiges Gateway »%s« für Route %s wird ignoriert"
 
-#: ../libnm-core/nm-keyfile.c:291
+#: ../libnm-core/nm-keyfile-reader.c:236
 #, c-format
 msgid "ignoring invalid %s route: %s"
 msgstr "Ungültige %s-Route wird ignoriert: %s"
 
-#: ../libnm-core/nm-keyfile.c:416
+#: ../libnm-core/nm-keyfile-reader.c:362
 #, c-format
 msgid "unexpected character '%c' for address %s: '%s' (position %td)"
 msgstr "unerwartetes Zeichen »%c« für Adresse %s: »%s« (Position %td)"
 
-#: ../libnm-core/nm-keyfile.c:426
+#: ../libnm-core/nm-keyfile-reader.c:372
 #, c-format
 msgid "unexpected character '%c' for %s: '%s' (position %td)"
 msgstr "unerwartetes Zeichen »%c« für %s: »%s« (Position %td)"
 
-#: ../libnm-core/nm-keyfile.c:435
+#: ../libnm-core/nm-keyfile-reader.c:381
 #, c-format
 msgid "unexpected character '%c' in prefix length for %s: '%s' (position %td)"
 msgstr "unerwartetes Zeichen »%c« in Präfixlänge für %s: »%s« (Position %td)"
 
-#: ../libnm-core/nm-keyfile.c:446
+#: ../libnm-core/nm-keyfile-reader.c:392
 #, c-format
 msgid "garbage at the end of value %s: '%s'"
 msgstr "Unsinn am Ende von Wert %s: »%s«"
 
-#: ../libnm-core/nm-keyfile.c:452
+#: ../libnm-core/nm-keyfile-reader.c:398
 #, c-format
 msgid "deprecated semicolon at the end of value %s: '%s'"
 msgstr "veraltetes Semikolon am Ende von Wert %s: »%s«"
 
-#: ../libnm-core/nm-keyfile.c:467
+#: ../libnm-core/nm-keyfile-reader.c:413
 #, c-format
 msgid "invalid prefix length for %s '%s', defaulting to %d"
 msgstr "ungültige Präfixlänge für %s »%s«. Vorgabe %d wird verwendet"
 
-#: ../libnm-core/nm-keyfile.c:474
+#: ../libnm-core/nm-keyfile-reader.c:420
 #, c-format
 msgid "missing prefix length for %s '%s', defaulting to %d"
 msgstr "fehlende Präfixlänge für %s »%s«. Vorgabe %d wird verwendet"
 
-#: ../libnm-core/nm-keyfile.c:738
+#: ../libnm-core/nm-keyfile-reader.c:554
+#, c-format
+msgid "ignoring invalid DNS server IPv4 address '%s'"
+msgstr "Ungültige DNS-Server IPv4-Adresse »%s« wird ignoriert"
+
+#: ../libnm-core/nm-keyfile-reader.c:593
 #, c-format
-msgid "ignoring invalid DNS server IPv%c address '%s'"
-msgstr "Ungültige DNS-Server IPv%c-Adresse »%s« wird ignoriert"
+msgid "ignoring invalid DNS server IPv6 address '%s'"
+msgstr "Ungültige DNS-Server IPv6-Adresse »%s« wird ignoriert"
 
-#: ../libnm-core/nm-keyfile.c:834 ../libnm-core/nm-keyfile.c:2629
+#: ../libnm-core/nm-keyfile-reader.c:687 ../libnm-core/nm-keyfile-reader.c:1721
 #, c-format
 msgid "ignoring invalid byte element '%d' (not between 0 and 255 inclusive)"
 msgstr ""
 "Ungültiges Byte-Element »%d« wird ignoriert (nicht zwischen 0 und "
 "einschließlich 255)"
 
-#: ../libnm-core/nm-keyfile.c:845
+#: ../libnm-core/nm-keyfile-reader.c:698
 msgid "ignoring invalid MAC address"
 msgstr "Ungültige MAC-Adresse wird ignoriert"
 
-#: ../libnm-core/nm-keyfile.c:1082
+#: ../libnm-core/nm-keyfile-reader.c:935
 msgid "ignoring invalid SSID"
 msgstr "ungültige SSID wird ignoriert"
 
-#: ../libnm-core/nm-keyfile.c:1098
+#: ../libnm-core/nm-keyfile-reader.c:951
 msgid "ignoring invalid raw password"
 msgstr "ungültiges Rohpasswort wird ignoriert"
 
-#: ../libnm-core/nm-keyfile.c:1236
-msgid "invalid key/cert value"
-msgstr "ungültiger Wert für Schlüssel/Zertifikat"
+#: ../libnm-core/nm-keyfile-reader.c:1026
+#: ../libnm-core/nm-keyfile-reader.c:1202
+#, c-format
+msgid "certificate or key file '%s' does not exist"
+msgstr "Zertifikat oder Schlüsseldatei »%s« ist nicht vorhanden"
 
-#: ../libnm-core/nm-keyfile.c:1247
+#: ../libnm-core/nm-keyfile-reader.c:1031
 #, c-format
 msgid "invalid key/cert value path \"%s\""
 msgstr "ungültiges Schlüssel/Zertifikat-Wertepaar »%s«"
 
-#: ../libnm-core/nm-keyfile.c:1263 ../libnm-core/nm-keyfile.c:1346
-#, c-format
-msgid "certificate or key file '%s' does not exist"
-msgstr "Zertifikat oder Schlüsseldatei »%s« ist nicht vorhanden"
-
-#: ../libnm-core/nm-keyfile.c:1272
+#: ../libnm-core/nm-keyfile-reader.c:1041
 #, c-format
 msgid "invalid PKCS#11 URI \"%s\""
 msgstr "ungültige PKCS#11-Adresse »%s«"
 
-#: ../libnm-core/nm-keyfile.c:1316
+#: ../libnm-core/nm-keyfile-reader.c:1079
 msgid "invalid key/cert value data:;base64, is not base64"
 msgstr ""
 
-#: ../libnm-core/nm-keyfile.c:1325
+#: ../libnm-core/nm-keyfile-reader.c:1092
 msgid "invalid key/cert value data:;base64,file://"
 msgstr ""
 
-#: ../libnm-core/nm-keyfile.c:1358
+#: ../libnm-core/nm-keyfile-reader.c:1239
 msgid "invalid key/cert value is not a valid blob"
 msgstr "ungültiger Wert für Schlüssel/Zertifikat ist kein gültiger blob"
 
-#: ../libnm-core/nm-keyfile.c:1408
+#: ../libnm-core/nm-keyfile-reader.c:1244
+msgid "invalid key/cert value"
+msgstr "ungültiger Wert für Schlüssel/Zertifikat"
+
+#: ../libnm-core/nm-keyfile-reader.c:1291
 #, c-format
 msgid "invalid parity value '%s'"
 msgstr "ungültiger Paritätswert »%s«"
 
-#: ../libnm-core/nm-keyfile.c:1426
+#: ../libnm-core/nm-keyfile-reader.c:1309
 #, c-format
 msgid "ignoring invalid team configuration: %s"
 msgstr "Ungültige Team-Konfiguration wird ignoriert: %s"
 
-#: ../libnm-core/nm-keyfile.c:1469
-#, c-format
+#: ../libnm-core/nm-keyfile-reader.c:1352
+#, fuzzy, c-format
 msgid "invalid qdisc: %s"
-msgstr "ungültiges qdisc: %s"
+msgstr "Ungültige IP-Adresse: %s"
 
-#: ../libnm-core/nm-keyfile.c:1517
-#, c-format
+#: ../libnm-core/nm-keyfile-reader.c:1400
+#, fuzzy, c-format
 msgid "invalid tfilter: %s"
-msgstr "ungültiger tfilter: %s"
+msgstr "ungültiger Präfix %s"
 
-#: ../libnm-core/nm-keyfile.c:2538
+#: ../libnm-core/nm-keyfile-reader.c:1622
 #, c-format
 msgid "error loading setting value: %s"
 msgstr "Fehler beim Laden des Einstellungswerts: %s"
 
-#: ../libnm-core/nm-keyfile.c:2563
+#: ../libnm-core/nm-keyfile-reader.c:1654
 #, c-format
 msgid "invalid negative value (%i)"
 msgstr "ungültiger negativer Wert (%i)"
 
-#: ../libnm-core/nm-keyfile.c:2584
+#: ../libnm-core/nm-keyfile-reader.c:1675
 #, c-format
 msgid "invalid char value (%i)"
 msgstr "ungültiger Zeichen-Wert (%i)"
 
-#: ../libnm-core/nm-keyfile.c:2606
+#: ../libnm-core/nm-keyfile-reader.c:1698
 #, c-format
 msgid "invalid int64 value (%s)"
 msgstr "ungültiger in64-Wert (%s)"
 
-#: ../libnm-core/nm-keyfile.c:2665
+#: ../libnm-core/nm-keyfile-reader.c:1757
 #, c-format
 msgid "too large FLAGS property '%s' (%llu)"
 msgstr "zu große FLAGS-Eigenschaft »%s« (%llu)"
 
-#: ../libnm-core/nm-keyfile.c:2678
+#: ../libnm-core/nm-keyfile-reader.c:1770
 #, fuzzy, c-format
 msgid "unhandled setting property type '%s'"
 msgstr "Fehler: Ungültiger Einstellungsname: »%s«."
 
-#: ../libnm-core/nm-keyfile.c:2699
+#: ../libnm-core/nm-keyfile-reader.c:1801
 #, c-format
 msgid "invalid setting name '%s'"
 msgstr "Ungültiger Einstellungsname »%s«"
 
-#: ../libnm-core/nm-keyfile.c:2742
-#, fuzzy, c-format
-#| msgid "invalid key \"%s\": %s"
-msgid "invalid key '%s.%s'"
-msgstr "Ungültiger Schlüsselname »%s«: %s"
-
-#: ../libnm-core/nm-keyfile.c:2757
-#, fuzzy, c-format
-#| msgid "'%s' is not a number"
-msgid "key '%s.%s' is not boolean"
-msgstr "»%s« ist keine Zahl"
-
-#: ../libnm-core/nm-setting-6lowpan.c:104
-#, c-format
-msgid "property is not specified"
-msgstr "Eigenschaft ist nicht angegeben"
-
-#: ../libnm-core/nm-setting-6lowpan.c:126 ../libnm-core/nm-setting-macsec.c:306
-#: ../libnm-core/nm-setting-vlan.c:632 ../libnm-util/nm-setting-vlan.c:556
-#, c-format
-msgid "'%s' value doesn't match '%s=%s'"
-msgstr "Wert »%s« entspricht nicht »%s=%s«"
-
-#: ../libnm-core/nm-setting-6lowpan.c:137
-#: ../libnm-core/nm-setting-ip-tunnel.c:351
-#: ../libnm-core/nm-setting-macsec.c:317 ../libnm-core/nm-setting-macvlan.c:161
-#: ../libnm-core/nm-setting-vlan.c:643 ../libnm-core/nm-setting-vxlan.c:401
-#: ../libnm-util/nm-setting-vlan.c:567
-#, c-format
-msgid "'%s' is neither an UUID nor an interface name"
-msgstr "»%s« ist weder eine UUID noch ein Schnittstellenname"
-
-#: ../libnm-core/nm-setting-8021x.c:434
+#: ../libnm-core/nm-setting-8021x.c:436
 msgid "data missing"
 msgstr "Daten fehlen"
 
-#: ../libnm-core/nm-setting-8021x.c:470
+#: ../libnm-core/nm-setting-8021x.c:472
 msgid "binary data missing"
 msgstr "Binärdaten fehlen"
 
-#: ../libnm-core/nm-setting-8021x.c:498
+#: ../libnm-core/nm-setting-8021x.c:500
 msgid "URI not NUL terminated"
 msgstr "Adresse ist nicht mit NUL terminiert"
 
-#: ../libnm-core/nm-setting-8021x.c:507
+#: ../libnm-core/nm-setting-8021x.c:509
 msgid "URI is empty"
 msgstr "Adresse ist leer"
 
-#: ../libnm-core/nm-setting-8021x.c:515
+#: ../libnm-core/nm-setting-8021x.c:517
 msgid "URI is not valid UTF-8"
 msgstr "Die Adresse ist kein gültiges UTF-8"
 
-#: ../libnm-core/nm-setting-8021x.c:751 ../libnm-util/nm-setting-8021x.c:639
+#: ../libnm-core/nm-setting-8021x.c:753 ../libnm-util/nm-setting-8021x.c:639
 msgid "CA certificate must be in X.509 format"
 msgstr "CA-Zertifikat muss im X.509-Format vorliegen"
 
-#: ../libnm-core/nm-setting-8021x.c:1156 ../libnm-core/nm-setting-8021x.c:1510
-#: ../libnm-core/nm-setting-8021x.c:1920 ../libnm-util/nm-setting-8021x.c:957
-#: ../libnm-util/nm-setting-8021x.c:1220 ../libnm-util/nm-setting-8021x.c:1542
+#: ../libnm-core/nm-setting-8021x.c:1158 ../libnm-core/nm-setting-8021x.c:1512
+#: ../libnm-core/nm-setting-8021x.c:1923 ../libnm-util/nm-setting-8021x.c:957
+#: ../libnm-util/nm-setting-8021x.c:1220 ../libnm-util/nm-setting-8021x.c:1543
 msgid "invalid certificate format"
 msgstr "Ungültiges Zertifikatsformat"
 
-#: ../libnm-core/nm-setting-8021x.c:2272 ../libnm-util/nm-setting-8021x.c:1811
+#: ../libnm-core/nm-setting-8021x.c:2275 ../libnm-util/nm-setting-8021x.c:1812
 msgid "invalid private key"
 msgstr "Ungültiger privater Schlüssel"
 
-#: ../libnm-core/nm-setting-8021x.c:2614 ../libnm-util/nm-setting-8021x.c:2122
+#: ../libnm-core/nm-setting-8021x.c:2622 ../libnm-util/nm-setting-8021x.c:2123
 msgid "invalid phase2 private key"
 msgstr "Ungültiger privater Schlüssel in Phase 2"
 
-#: ../libnm-core/nm-setting-8021x.c:2874 ../libnm-core/nm-setting-8021x.c:2891
-#: ../libnm-core/nm-setting-8021x.c:2922 ../libnm-core/nm-setting-8021x.c:2939
-#: ../libnm-core/nm-setting-8021x.c:2980 ../libnm-core/nm-setting-8021x.c:2992
-#: ../libnm-core/nm-setting-8021x.c:3010 ../libnm-core/nm-setting-8021x.c:3022
-#: ../libnm-core/nm-setting-8021x.c:3047 ../libnm-core/nm-setting-adsl.c:194
-#: ../libnm-core/nm-setting-cdma.c:164 ../libnm-core/nm-setting-cdma.c:173
-#: ../libnm-core/nm-setting-connection.c:935
-#: ../libnm-core/nm-setting-connection.c:983 ../libnm-core/nm-setting-gsm.c:297
-#: ../libnm-core/nm-setting-gsm.c:354 ../libnm-core/nm-setting-gsm.c:391
-#: ../libnm-core/nm-setting-gsm.c:400 ../libnm-core/nm-setting-ip-config.c:2499
-#: ../libnm-core/nm-setting-ip4-config.c:196
-#: ../libnm-core/nm-setting-ip4-config.c:203
-#: ../libnm-core/nm-setting-pppoe.c:166 ../libnm-core/nm-setting-pppoe.c:175
-#: ../libnm-core/nm-setting-vpn.c:497 ../libnm-core/nm-setting-vpn.c:507
-#: ../libnm-core/nm-setting-wimax.c:133
-#: ../libnm-core/nm-setting-wireless-security.c:948
-#: ../libnm-core/nm-setting-wireless-security.c:972
-#: ../libnm-core/nm-setting.c:1127 ../libnm-util/nm-setting-8021x.c:2331
-#: ../libnm-util/nm-setting-8021x.c:2348 ../libnm-util/nm-setting-8021x.c:2389
-#: ../libnm-util/nm-setting-8021x.c:2406 ../libnm-util/nm-setting-8021x.c:2457
-#: ../libnm-util/nm-setting-8021x.c:2469 ../libnm-util/nm-setting-8021x.c:2487
-#: ../libnm-util/nm-setting-8021x.c:2499 ../libnm-util/nm-setting-8021x.c:2524
-#: ../libnm-util/nm-setting-adsl.c:216 ../libnm-util/nm-setting-cdma.c:168
-#: ../libnm-util/nm-setting-cdma.c:177
-#: ../libnm-util/nm-setting-connection.c:772
-#: ../libnm-util/nm-setting-connection.c:849 ../libnm-util/nm-setting-gsm.c:281
-#: ../libnm-util/nm-setting-gsm.c:338 ../libnm-util/nm-setting-ip4-config.c:934
+#: ../libnm-core/nm-setting-8021x.c:2888 ../libnm-core/nm-setting-8021x.c:2905
+#: ../libnm-core/nm-setting-8021x.c:2936 ../libnm-core/nm-setting-8021x.c:2953
+#: ../libnm-core/nm-setting-8021x.c:2994 ../libnm-core/nm-setting-8021x.c:3006
+#: ../libnm-core/nm-setting-8021x.c:3024 ../libnm-core/nm-setting-8021x.c:3036
+#: ../libnm-core/nm-setting-8021x.c:3061 ../libnm-core/nm-setting-adsl.c:196
+#: ../libnm-core/nm-setting-cdma.c:166 ../libnm-core/nm-setting-cdma.c:175
+#: ../libnm-core/nm-setting-connection.c:901
+#: ../libnm-core/nm-setting-connection.c:949 ../libnm-core/nm-setting-gsm.c:299
+#: ../libnm-core/nm-setting-gsm.c:356 ../libnm-core/nm-setting-gsm.c:393
+#: ../libnm-core/nm-setting-gsm.c:402 ../libnm-core/nm-setting-ip-config.c:2521
+#: ../libnm-core/nm-setting-ip4-config.c:198
+#: ../libnm-core/nm-setting-ip4-config.c:205
+#: ../libnm-core/nm-setting-pppoe.c:168 ../libnm-core/nm-setting-pppoe.c:177
+#: ../libnm-core/nm-setting-vpn.c:527 ../libnm-core/nm-setting-vpn.c:537
+#: ../libnm-core/nm-setting-wimax.c:135
+#: ../libnm-core/nm-setting-wireless-security.c:930
+#: ../libnm-core/nm-setting-wireless-security.c:954
+#: ../libnm-core/nm-setting.c:1118 ../libnm-util/nm-setting-8021x.c:2332
+#: ../libnm-util/nm-setting-8021x.c:2349 ../libnm-util/nm-setting-8021x.c:2390
+#: ../libnm-util/nm-setting-8021x.c:2407 ../libnm-util/nm-setting-8021x.c:2458
+#: ../libnm-util/nm-setting-8021x.c:2470 ../libnm-util/nm-setting-8021x.c:2488
+#: ../libnm-util/nm-setting-8021x.c:2500 ../libnm-util/nm-setting-8021x.c:2525
+#: ../libnm-util/nm-setting-adsl.c:216 ../libnm-util/nm-setting-cdma.c:169
+#: ../libnm-util/nm-setting-cdma.c:178
+#: ../libnm-util/nm-setting-connection.c:775
+#: ../libnm-util/nm-setting-connection.c:852 ../libnm-util/nm-setting-gsm.c:282
+#: ../libnm-util/nm-setting-gsm.c:339 ../libnm-util/nm-setting-ip4-config.c:934
 #: ../libnm-util/nm-setting-ip4-config.c:943
-#: ../libnm-util/nm-setting-pppoe.c:169 ../libnm-util/nm-setting-pppoe.c:178
-#: ../libnm-util/nm-setting-vpn.c:431 ../libnm-util/nm-setting-vpn.c:441
-#: ../libnm-util/nm-setting-wimax.c:158
-#: ../libnm-util/nm-setting-wireless-security.c:920
-#: ../libnm-util/nm-setting-wireless-security.c:944
+#: ../libnm-util/nm-setting-pppoe.c:170 ../libnm-util/nm-setting-pppoe.c:179
+#: ../libnm-util/nm-setting-vpn.c:432 ../libnm-util/nm-setting-vpn.c:442
+#: ../libnm-util/nm-setting-wimax.c:159
+#: ../libnm-util/nm-setting-wireless-security.c:921
+#: ../libnm-util/nm-setting-wireless-security.c:945
 msgid "property is empty"
 msgstr "Eigenschaft ist leer"
 
-#: ../libnm-core/nm-setting-8021x.c:2904 ../libnm-core/nm-setting-8021x.c:2952
-#: ../libnm-util/nm-setting-8021x.c:2359 ../libnm-util/nm-setting-8021x.c:2371
-#: ../libnm-util/nm-setting-8021x.c:2417 ../libnm-util/nm-setting-8021x.c:2429
+#: ../libnm-core/nm-setting-8021x.c:2918 ../libnm-core/nm-setting-8021x.c:2966
+#: ../libnm-util/nm-setting-8021x.c:2360 ../libnm-util/nm-setting-8021x.c:2372
+#: ../libnm-util/nm-setting-8021x.c:2418 ../libnm-util/nm-setting-8021x.c:2430
 #, c-format
 msgid "has to match '%s' property for PKCS#12"
 msgstr "muss mit der Eigenschaft »%s« für PKCS#12 übereinstimmen"
 
-#: ../libnm-core/nm-setting-8021x.c:3181
+#: ../libnm-core/nm-setting-8021x.c:3197
 #, c-format
 msgid "certificate is invalid: %s"
 msgstr "Zertifikat ist ungültig: %s"
 
-#: ../libnm-core/nm-setting-8021x.c:3191
+#: ../libnm-core/nm-setting-8021x.c:3207
 #, c-format
 msgid "password is not supported when certificate is not on a PKCS#11 token"
 msgstr ""
 
-#: ../libnm-core/nm-setting-8021x.c:3228
-#: ../libnm-core/nm-setting-bluetooth.c:121
-#: ../libnm-core/nm-setting-infiniband.c:190
-#: ../libnm-core/nm-setting-infiniband.c:205
-#: ../libnm-core/nm-setting-ip4-config.c:187
-#: ../libnm-core/nm-setting-ip6-config.c:235
-#: ../libnm-core/nm-setting-ip6-config.c:246
-#: ../libnm-core/nm-setting-olpc-mesh.c:147
-#: ../libnm-core/nm-setting-wimax.c:142 ../libnm-core/nm-setting-wired.c:676
-#: ../libnm-core/nm-setting-wired.c:686
+#: ../libnm-core/nm-setting-8021x.c:3244
+#: ../libnm-core/nm-setting-bluetooth.c:123
+#: ../libnm-core/nm-setting-infiniband.c:192
+#: ../libnm-core/nm-setting-infiniband.c:207
+#: ../libnm-core/nm-setting-ip4-config.c:189
+#: ../libnm-core/nm-setting-ip6-config.c:215
+#: ../libnm-core/nm-setting-ip6-config.c:226
+#: ../libnm-core/nm-setting-olpc-mesh.c:149
+#: ../libnm-core/nm-setting-wimax.c:144 ../libnm-core/nm-setting-wired.c:678
+#: ../libnm-core/nm-setting-wired.c:688
+#: ../libnm-core/nm-setting-wireless-security.c:973
+#: ../libnm-core/nm-setting-wireless-security.c:982
 #: ../libnm-core/nm-setting-wireless-security.c:991
-#: ../libnm-core/nm-setting-wireless-security.c:1000
-#: ../libnm-core/nm-setting-wireless-security.c:1009
-#: ../libnm-core/nm-setting-wireless-security.c:1045
-#: ../libnm-core/nm-setting-wireless-security.c:1055
-#: ../libnm-core/nm-setting-wireless-security.c:1078
-#: ../libnm-core/nm-setting-wireless-security.c:1103
-#: ../libnm-core/nm-setting-wireless-security.c:1130
-#: ../libnm-core/nm-setting-wireless-security.c:1169
+#: ../libnm-core/nm-setting-wireless-security.c:1027
+#: ../libnm-core/nm-setting-wireless-security.c:1037
+#: ../libnm-core/nm-setting-wireless-security.c:1060
+#: ../libnm-core/nm-setting-wireless-security.c:1085
+#: ../libnm-core/nm-setting-wireless-security.c:1112
+#: ../libnm-core/nm-setting-wireless-security.c:1151
 #: ../libnm-core/nm-setting-wireless.c:811
 #: ../libnm-core/nm-setting-wireless.c:820
-#: ../libnm-core/nm-setting-wireless.c:831 ../libnm-core/nm-setting-wpan.c:129
-#: ../libnm-util/nm-setting.c:1365 ../libnm-util/nm-setting.c:1383
-#: ../libnm-util/nm-setting.c:1402 ../libnm-util/nm-setting-8021x.c:2652
-#: ../libnm-util/nm-setting-8021x.c:2686
-#: ../libnm-util/nm-setting-bluetooth.c:150
+#: ../libnm-core/nm-setting-wireless.c:831 ../libnm-util/nm-setting.c:1367
+#: ../libnm-util/nm-setting.c:1385 ../libnm-util/nm-setting.c:1404
+#: ../libnm-util/nm-setting-8021x.c:2655 ../libnm-util/nm-setting-8021x.c:2689
+#: ../libnm-util/nm-setting-bluetooth.c:151
 #: ../libnm-util/nm-setting-infiniband.c:205
 #: ../libnm-util/nm-setting-infiniband.c:221
 #: ../libnm-util/nm-setting-ip4-config.c:925
-#: ../libnm-util/nm-setting-ip6-config.c:888
+#: ../libnm-util/nm-setting-ip6-config.c:890
 #: ../libnm-util/nm-setting-olpc-mesh.c:151
-#: ../libnm-util/nm-setting-wimax.c:167 ../libnm-util/nm-setting-wired.c:657
-#: ../libnm-util/nm-setting-wired.c:666
-#: ../libnm-util/nm-setting-wireless-security.c:963
-#: ../libnm-util/nm-setting-wireless-security.c:972
-#: ../libnm-util/nm-setting-wireless-security.c:981
-#: ../libnm-util/nm-setting-wireless-security.c:1017
-#: ../libnm-util/nm-setting-wireless-security.c:1027
-#: ../libnm-util/nm-setting-wireless.c:828
-#: ../libnm-util/nm-setting-wireless.c:837
-#: ../libnm-util/nm-setting-wireless.c:846
+#: ../libnm-util/nm-setting-wimax.c:168 ../libnm-util/nm-setting-wired.c:658
+#: ../libnm-util/nm-setting-wired.c:667
+#: ../libnm-util/nm-setting-wireless-security.c:964
+#: ../libnm-util/nm-setting-wireless-security.c:973
+#: ../libnm-util/nm-setting-wireless-security.c:982
+#: ../libnm-util/nm-setting-wireless-security.c:1018
+#: ../libnm-util/nm-setting-wireless-security.c:1028
+#: ../libnm-util/nm-setting-wireless.c:829
+#: ../libnm-util/nm-setting-wireless.c:838
+#: ../libnm-util/nm-setting-wireless.c:847
 msgid "property is invalid"
 msgstr "Eigenschaft ist ungültig"
 
-#: ../libnm-core/nm-setting-8021x.c:3253 ../libnm-core/nm-setting-8021x.c:3263
-#: ../libnm-core/nm-setting-8021x.c:3273 ../libnm-core/nm-setting-8021x.c:3292
-#: ../libnm-core/nm-setting-8021x.c:3302 ../libnm-core/nm-setting-adsl.c:206
-#: ../libnm-core/nm-setting-adsl.c:218 ../libnm-core/nm-setting-bluetooth.c:149
-#: ../libnm-core/nm-setting-wireless-security.c:927
-#: ../libnm-util/nm-setting-8021x.c:2711 ../libnm-util/nm-setting-8021x.c:2721
-#: ../libnm-util/nm-setting-8021x.c:2731 ../libnm-util/nm-setting-8021x.c:2741
-#: ../libnm-util/nm-setting-8021x.c:2751 ../libnm-util/nm-setting-adsl.c:228
-#: ../libnm-util/nm-setting-adsl.c:240 ../libnm-util/nm-setting-bluetooth.c:167
-#: ../libnm-util/nm-setting-wireless-security.c:899
+#: ../libnm-core/nm-setting-8021x.c:3269 ../libnm-core/nm-setting-8021x.c:3279
+#: ../libnm-core/nm-setting-8021x.c:3289 ../libnm-core/nm-setting-8021x.c:3308
+#: ../libnm-core/nm-setting-8021x.c:3318 ../libnm-core/nm-setting-adsl.c:208
+#: ../libnm-core/nm-setting-adsl.c:220 ../libnm-core/nm-setting-bluetooth.c:151
+#: ../libnm-core/nm-setting-wireless-security.c:909
+#: ../libnm-util/nm-setting-8021x.c:2714 ../libnm-util/nm-setting-8021x.c:2724
+#: ../libnm-util/nm-setting-8021x.c:2734 ../libnm-util/nm-setting-8021x.c:2744
+#: ../libnm-util/nm-setting-8021x.c:2754 ../libnm-util/nm-setting-adsl.c:228
+#: ../libnm-util/nm-setting-adsl.c:240 ../libnm-util/nm-setting-bluetooth.c:168
+#: ../libnm-util/nm-setting-wireless-security.c:900
 #, c-format
 msgid "'%s' is not a valid value for the property"
 msgstr "Fehler: »%s« ist kein gültiger Wert für die Eigenschaft"
 
-#: ../libnm-core/nm-setting-8021x.c:3283
+#: ../libnm-core/nm-setting-8021x.c:3299
+#, fuzzy
 msgid "invalid auth flags"
-msgstr "Ungültige »auth«-Flags"
+msgstr "Ungültige Route: %s"
 
-#: ../libnm-core/nm-setting-bluetooth.c:171
+#: ../libnm-core/nm-setting-bluetooth.c:173
 #, c-format
 msgid "'%s' connection requires '%s' or '%s' setting"
 msgstr "Die Verbindung »%s« erfordert die Einstellung »%s« oder »%s«"
 
-#: ../libnm-core/nm-setting-bluetooth.c:217
+#: ../libnm-core/nm-setting-bluetooth.c:219
 #, c-format
 msgid "'%s' connection requires '%s' setting"
 msgstr "Die Verbindung »%s« erfordert die Einstellung »%s«"
 
-#: ../libnm-core/nm-setting-bond.c:564 ../libnm-util/nm-setting-bond.c:516
+#: ../libnm-core/nm-setting-bond.c:566 ../libnm-util/nm-setting-bond.c:517
 #, c-format
 msgid "invalid option '%s' or its value '%s'"
 msgstr "ungültige Option »%s« oder deren Wert »%s«"
 
-#: ../libnm-core/nm-setting-bond.c:589 ../libnm-util/nm-setting-bond.c:535
+#: ../libnm-core/nm-setting-bond.c:591 ../libnm-util/nm-setting-bond.c:536
 #, c-format
 msgid "only one of '%s' and '%s' can be set"
 msgstr "es kann nur entweder »%s« oder »%s« festgelegt werden"
 
-#: ../libnm-core/nm-setting-bond.c:602 ../libnm-util/nm-setting-bond.c:546
+#: ../libnm-core/nm-setting-bond.c:604 ../libnm-util/nm-setting-bond.c:547
 #, c-format
 msgid "mandatory option '%s' is missing"
 msgstr "zwingende Option »%s« fehlt"
 
-#: ../libnm-core/nm-setting-bond.c:612 ../libnm-util/nm-setting-bond.c:555
+#: ../libnm-core/nm-setting-bond.c:614 ../libnm-util/nm-setting-bond.c:556
 #, c-format
 msgid "'%s' is not a valid value for '%s'"
 msgstr "Fehler: »%s« ist kein gültiger Wert für »%s«."
 
-#: ../libnm-core/nm-setting-bond.c:626 ../libnm-util/nm-setting-bond.c:568
+#: ../libnm-core/nm-setting-bond.c:628 ../libnm-util/nm-setting-bond.c:569
 #, c-format
 msgid "'%s=%s' is incompatible with '%s > 0'"
 msgstr "»%s=%s« ist nicht kompatibel mit »%s > 0«"
 
-#: ../libnm-core/nm-setting-bond.c:641
+#: ../libnm-core/nm-setting-bond.c:643
 #, c-format
 msgid "'%s' is not valid for the '%s' option: %s"
 msgstr "»%s« ist für die Option »%s« ungültig: %s"
 
-#: ../libnm-core/nm-setting-bond.c:652 ../libnm-util/nm-setting-bond.c:591
+#: ../libnm-core/nm-setting-bond.c:654 ../libnm-util/nm-setting-bond.c:592
 #, c-format
 msgid "'%s' option is only valid for '%s=%s'"
 msgstr "Option »%s« ist nur gültig für »%s=%s«."
 
-#: ../libnm-core/nm-setting-bond.c:665 ../libnm-util/nm-setting-bond.c:604
+#: ../libnm-core/nm-setting-bond.c:667 ../libnm-util/nm-setting-bond.c:605
 #, c-format
 msgid "'%s=%s' is not a valid configuration for '%s'"
 msgstr "»%s=%s« ist keine gültige Konfiguration für »%s«."
 
-#: ../libnm-core/nm-setting-bond.c:678 ../libnm-core/nm-setting-bond.c:687
-#: ../libnm-core/nm-setting-bond.c:707 ../libnm-core/nm-setting-bond.c:743
-#: ../libnm-util/nm-setting-bond.c:617 ../libnm-util/nm-setting-bond.c:626
-#: ../libnm-util/nm-setting-bond.c:646 ../libnm-util/nm-setting-bond.c:682
+#: ../libnm-core/nm-setting-bond.c:680 ../libnm-core/nm-setting-bond.c:689
+#: ../libnm-core/nm-setting-bond.c:709 ../libnm-core/nm-setting-bond.c:745
+#: ../libnm-util/nm-setting-bond.c:618 ../libnm-util/nm-setting-bond.c:627
+#: ../libnm-util/nm-setting-bond.c:647 ../libnm-util/nm-setting-bond.c:683
 #, c-format
 msgid "'%s' option requires '%s' option to be set"
 msgstr "Option »%s« erfordert, dass die Einstellung »%s« aktiv ist"
 
-#: ../libnm-core/nm-setting-bond.c:718 ../libnm-util/nm-setting-bond.c:657
+#: ../libnm-core/nm-setting-bond.c:720 ../libnm-util/nm-setting-bond.c:658
 #, c-format
 msgid "'%s' option is empty"
 msgstr "Option »%s« ist leer"
 
-#: ../libnm-core/nm-setting-bond.c:730 ../libnm-util/nm-setting-bond.c:669
+#: ../libnm-core/nm-setting-bond.c:732 ../libnm-util/nm-setting-bond.c:670
 #, c-format
 msgid "'%s' is not a valid IPv4 address for '%s' option"
 msgstr "»%s« ist keine gültige IPv4-Adresse für die Option »%s«"
 
-#: ../libnm-core/nm-setting-bond.c:758 ../libnm-util/nm-setting-bond.c:696
+#: ../libnm-core/nm-setting-bond.c:760 ../libnm-util/nm-setting-bond.c:697
 #, c-format
 msgid "'%s' option is only valid with mode '%s'"
 msgstr "Die Option »%s« ist nur gültig im Modus »%s«"
 
-#: ../libnm-core/nm-setting-bond.c:769
+#: ../libnm-core/nm-setting-bond.c:771
 #, c-format
 msgid "'%s' and '%s' cannot have different values"
 msgstr "»%s« und »%s« dürfen nicht unterschiedliche Werte haben"
 
-#: ../libnm-core/nm-setting-bond.c:785
+#: ../libnm-core/nm-setting-bond.c:787
 #, c-format
 msgid "'%s' option should be string"
 msgstr "Option »%s« sollte eine Zeichenkette sein"
 
-#: ../libnm-core/nm-setting-bond.c:801
+#: ../libnm-core/nm-setting-bond.c:803
 #, c-format
 msgid "'%s' option is not valid with mode '%s'"
 msgstr "Die Option »%s« ist im Modus »%s« ungültig"
 
-#: ../libnm-core/nm-setting-bridge-port.c:125
-#: ../libnm-core/nm-setting-ovs-interface.c:259
-#: ../libnm-core/nm-setting-ovs-port.c:187
-#: ../libnm-core/nm-setting-ovs-bridge.c:150
-#: ../libnm-core/nm-setting-team-port.c:357
+#: ../libnm-core/nm-setting-bridge-port.c:127
+#: ../libnm-core/nm-setting-ovs-interface.c:262
+#: ../libnm-core/nm-setting-ovs-port.c:189
+#: ../libnm-core/nm-setting-ovs-bridge.c:152
+#: ../libnm-core/nm-setting-team-port.c:358
 #, c-format
 msgid "missing setting"
 msgstr "fehlende Einstellung"
 
-#: ../libnm-core/nm-setting-bridge-port.c:136
-#: ../libnm-core/nm-setting-ovs-interface.c:280
-#: ../libnm-core/nm-setting-ovs-port.c:208
-#: ../libnm-core/nm-setting-team-port.c:368
+#: ../libnm-core/nm-setting-bridge-port.c:138
+#: ../libnm-core/nm-setting-ovs-interface.c:283
+#: ../libnm-core/nm-setting-ovs-port.c:210
+#: ../libnm-core/nm-setting-team-port.c:369
 #, c-format
 msgid ""
 "A connection with a '%s' setting must have the slave-type set to '%s'. "
@@ -10680,91 +10097,79 @@ msgstr ""
 "Für Verbindungen mit einer »%s«-Einstellung muss der Slave-Typ auf »%s« "
 "gesetzt sein, hier ist es jedoch »%s«."
 
-#: ../libnm-core/nm-setting-bridge.c:229 ../libnm-util/nm-setting-bridge.c:268
+#: ../libnm-core/nm-setting-bridge.c:231 ../libnm-util/nm-setting-bridge.c:269
 #, c-format
 msgid "value '%d' is out of range <%d-%d>"
 msgstr "Wert »%d« ist außerhalb des Bereichs <%d-%d>"
 
-#: ../libnm-core/nm-setting-bridge.c:246 ../libnm-core/nm-setting-wired.c:650
-#: ../libnm-core/nm-setting-wired.c:712 ../libnm-core/nm-setting-wired.c:754
-#: ../libnm-util/nm-setting-bridge.c:285 ../libnm-util/nm-setting-wired.c:632
-#: ../libnm-util/nm-setting-wired.c:690
+#: ../libnm-core/nm-setting-bridge.c:248 ../libnm-core/nm-setting-wired.c:652
+#: ../libnm-core/nm-setting-wired.c:714 ../libnm-core/nm-setting-wired.c:756
+#: ../libnm-util/nm-setting-bridge.c:286 ../libnm-util/nm-setting-wired.c:633
+#: ../libnm-util/nm-setting-wired.c:691
 msgid "is not a valid MAC address"
 msgstr "ist keine gültige MAC-Adresse"
 
-#: ../libnm-core/nm-setting-bridge.c:287
+#: ../libnm-core/nm-setting-bridge.c:289
 msgid "the mask can't contain bits 0 (STP), 1 (MAC) or 2 (LACP)"
 msgstr ""
 
-#: ../libnm-core/nm-setting-connection.c:905
+#: ../libnm-core/nm-setting-connection.c:871
 #, c-format
 msgid "setting required for connection of type '%s'"
 msgstr "Einstellung ist für den Verbindungstyp »%s« notwendig"
 
-#: ../libnm-core/nm-setting-connection.c:944
-#: ../libnm-util/nm-setting-connection.c:788
+#: ../libnm-core/nm-setting-connection.c:910
+#: ../libnm-util/nm-setting-connection.c:791
 #, c-format
 msgid "'%s' is not a valid UUID"
 msgstr "»%s» ist keine gültige UUID"
 
-#: ../libnm-core/nm-setting-connection.c:994
+#: ../libnm-core/nm-setting-connection.c:960
 #, c-format
 msgid "connection type '%s' is not valid"
 msgstr "Verbindungstyp »%s« ist ungültig"
 
-#: ../libnm-core/nm-setting-connection.c:1030
-#: ../libnm-util/nm-setting-connection.c:874
+#: ../libnm-core/nm-setting-connection.c:996
+#: ../libnm-util/nm-setting-connection.c:877
 #, c-format
 msgid "Unknown slave type '%s'"
 msgstr "Unbekannter Slave-Typ »%s«"
 
-#: ../libnm-core/nm-setting-connection.c:1041
-#: ../libnm-util/nm-setting-connection.c:884
+#: ../libnm-core/nm-setting-connection.c:1007
+#: ../libnm-util/nm-setting-connection.c:887
 #, c-format
 msgid "Slave connections need a valid '%s' property"
 msgstr "Für Slave-Verbindungen ist eine gültige »%s«-Eigenschaft nötig"
 
-#: ../libnm-core/nm-setting-connection.c:1062
-#: ../libnm-util/nm-setting-connection.c:894
+#: ../libnm-core/nm-setting-connection.c:1028
+#: ../libnm-util/nm-setting-connection.c:897
 #, c-format
 msgid "Cannot set '%s' without '%s'"
 msgstr "»%s« kann nicht ohne »%s« gesetzt werden"
 
-#: ../libnm-core/nm-setting-connection.c:1076
-#, fuzzy, c-format
-#| msgid "'%s' connection requires '%s' or '%s' setting"
-msgid "'%s' connections must be enslaved to '%s', not '%s'"
-msgstr "Die Verbindung »%s« erfordert die Einstellung »%s« oder »%s«"
+#: ../libnm-core/nm-setting-connection.c:1041
+#, c-format
+msgid "Only '%s' connections can be enslaved to '%s'"
+msgstr ""
 
-#: ../libnm-core/nm-setting-connection.c:1090
+#: ../libnm-core/nm-setting-connection.c:1054
 #, c-format
 msgid "metered value %d is not valid"
 msgstr "Der gemessene Wert %d ist ungültig"
 
-#: ../libnm-core/nm-setting-connection.c:1101
-#, c-format
-msgid "mdns value %d is not valid"
-msgstr "Der mdns-Wert %d ist ungültig"
-
-#: ../libnm-core/nm-setting-connection.c:1114
-#, fuzzy, c-format
-#| msgid "mdns value %d is not valid"
-msgid "value %d is not valid"
-msgstr "Der mdns-Wert %d ist ungültig"
-
-#: ../libnm-core/nm-setting-connection.c:1135
+#: ../libnm-core/nm-setting-connection.c:1075
 #, c-format
 msgid "property type should be set to '%s'"
 msgstr "Der Eigenschaftentyp sollte auf »%s« eingestellt sein"
 
-#: ../libnm-core/nm-setting-connection.c:1150
+#: ../libnm-core/nm-setting-connection.c:1090
 #, c-format
 msgid "slave-type '%s' requires a '%s' setting in the connection"
 msgstr ""
 "Der Slave-Typ »%s« erfordert das Vorhandensein der Einstellung »%s« in der "
 "Verbindung"
 
-#: ../libnm-core/nm-setting-connection.c:1160
+#: ../libnm-core/nm-setting-connection.c:1100
 #, c-format
 msgid ""
 "Detect a slave connection with '%s' set and a port type '%s'. '%s' should be "
@@ -10773,100 +10178,79 @@ msgstr ""
 "Eine Slave-Verbindung mit gesetztem »%s« und dem Port-Typ »%s« erkennen. "
 "»%s« sollte auf »%s« gesetzt werden."
 
-#: ../libnm-core/nm-setting-connection.c:1177
-#, c-format
+#: ../libnm-core/nm-setting-connection.c:1117
+#, fuzzy, c-format
 msgid "A slave connection with '%s' set to '%s' cannot have a '%s' setting"
 msgstr ""
-"Eine Slave-Verbindung mit gesetztem »%s« für »%s« darf nicht die Einstellung "
-"»%s« haben"
+"Eine Slave-Verbindung mit gesetztem »%s« und dem Port-Typ »%s« erkennen. "
+"»%s« sollte auf »%s« gesetzt werden."
 
-#: ../libnm-core/nm-setting-dcb.c:520 ../libnm-util/nm-setting-dcb.c:593
+#: ../libnm-core/nm-setting-dcb.c:522 ../libnm-util/nm-setting-dcb.c:594
 msgid "flags invalid"
 msgstr "Ungültige Flags"
 
-#: ../libnm-core/nm-setting-dcb.c:529 ../libnm-util/nm-setting-dcb.c:602
+#: ../libnm-core/nm-setting-dcb.c:531 ../libnm-util/nm-setting-dcb.c:603
 msgid "flags invalid - disabled"
 msgstr "Ungültige Flags - deaktiviert"
 
-#: ../libnm-core/nm-setting-dcb.c:555 ../libnm-core/nm-setting-dcb.c:604
-#: ../libnm-util/nm-setting-dcb.c:628 ../libnm-util/nm-setting-dcb.c:677
+#: ../libnm-core/nm-setting-dcb.c:557 ../libnm-core/nm-setting-dcb.c:606
+#: ../libnm-util/nm-setting-dcb.c:629 ../libnm-util/nm-setting-dcb.c:678
 msgid "property invalid (not enabled)"
 msgstr "Eigenschaft ist ungültig (nicht aktiviert)"
 
-#: ../libnm-core/nm-setting-dcb.c:564 ../libnm-util/nm-setting-dcb.c:637
+#: ../libnm-core/nm-setting-dcb.c:566 ../libnm-util/nm-setting-dcb.c:638
 msgid "element invalid"
 msgstr "ungültiges Element"
 
-#: ../libnm-core/nm-setting-dcb.c:579 ../libnm-util/nm-setting-dcb.c:652
+#: ../libnm-core/nm-setting-dcb.c:581 ../libnm-util/nm-setting-dcb.c:653
 msgid "sum not 100%"
 msgstr "Summe nicht 100%"
 
-#: ../libnm-core/nm-setting-dcb.c:613 ../libnm-core/nm-setting-dcb.c:645
-#: ../libnm-util/nm-setting-dcb.c:686 ../libnm-util/nm-setting-dcb.c:718
+#: ../libnm-core/nm-setting-dcb.c:615 ../libnm-core/nm-setting-dcb.c:647
+#: ../libnm-util/nm-setting-dcb.c:687 ../libnm-util/nm-setting-dcb.c:719
 msgid "property invalid"
 msgstr "Ungültige Eigenschaft"
 
-#: ../libnm-core/nm-setting-dcb.c:635 ../libnm-util/nm-setting-dcb.c:708
+#: ../libnm-core/nm-setting-dcb.c:637 ../libnm-util/nm-setting-dcb.c:709
 msgid "property missing"
 msgstr "Eigenschaft fehlt"
 
-#: ../libnm-core/nm-setting-ethtool.c:269
-msgid "unsupported offload feature"
-msgstr ""
-
-#: ../libnm-core/nm-setting-ethtool.c:277
-#, fuzzy
-#| msgid "filename has invalid format (%s)"
-msgid "offload feature has invalid variant type"
-msgstr "Dateiname hat ein ungültiges Format (%s)"
-
-#: ../libnm-core/nm-setting-ethtool.c:300
-#, fuzzy, c-format
-#| msgid "unknown connection '%s'"
-msgid "unknown ethtool option '%s'"
-msgstr "Unbekannte Verbindung »%s«"
-
-#: ../libnm-core/nm-setting-gsm.c:310 ../libnm-util/nm-setting-gsm.c:294
+#: ../libnm-core/nm-setting-gsm.c:312 ../libnm-util/nm-setting-gsm.c:295
 #, c-format
 msgid "property value '%s' is empty or too long (>64)"
 msgstr "Eigenschaftswert »%s« ist leer oder zu lang (>64)"
 
-#: ../libnm-core/nm-setting-gsm.c:342 ../libnm-util/nm-setting-gsm.c:326
+#: ../libnm-core/nm-setting-gsm.c:344 ../libnm-util/nm-setting-gsm.c:327
 #, c-format
 msgid "'%s' contains invalid char(s) (use [A-Za-z._-])"
 msgstr "»%s« enthält ungültige Zeichen (Verwenden Sie [A-Za-z._-])"
 
-#: ../libnm-core/nm-setting-gsm.c:368 ../libnm-util/nm-setting-gsm.c:352
+#: ../libnm-core/nm-setting-gsm.c:370 ../libnm-util/nm-setting-gsm.c:353
 #, c-format
 msgid "'%s' length is invalid (should be 5 or 6 digits)"
 msgstr "»%s« Länge ist ungültig (muss 5 oder 6 Ziffern sein)"
 
-#: ../libnm-core/nm-setting-gsm.c:379 ../libnm-util/nm-setting-gsm.c:363
-#, c-format
-msgid "'%s' is not a number"
-msgstr "»%s« ist keine Zahl"
-
-#: ../libnm-core/nm-setting-gsm.c:413
+#: ../libnm-core/nm-setting-gsm.c:415
 msgid "property is empty or wrong size"
 msgstr "Eigenschaft ist leer oder hat eine falsche Größe"
 
-#: ../libnm-core/nm-setting-gsm.c:423
+#: ../libnm-core/nm-setting-gsm.c:425
 msgid "property must contain only digits"
 msgstr "die Eigenschaft darf nur Ziffern enthalten"
 
-#: ../libnm-core/nm-setting-infiniband.c:226
+#: ../libnm-core/nm-setting-infiniband.c:228
 #: ../libnm-util/nm-setting-infiniband.c:239
 msgid "Must specify a P_Key if specifying parent"
 msgstr "Wenn »parent« angegeben ist, muss auch ein »P_Key« angegeben werden"
 
-#: ../libnm-core/nm-setting-infiniband.c:236
+#: ../libnm-core/nm-setting-infiniband.c:238
 #: ../libnm-util/nm-setting-infiniband.c:249
 msgid "InfiniBand P_Key connection did not specify parent interface name"
 msgstr ""
 "InfiniBand »P_Key«-Verbindung definierte keinen übergeordneten (parent) "
 "Schnittstellennamen"
 
-#: ../libnm-core/nm-setting-infiniband.c:274
+#: ../libnm-core/nm-setting-infiniband.c:276
 #: ../libnm-util/nm-setting-infiniband.c:285
 #, c-format
 msgid ""
@@ -10876,7 +10260,7 @@ msgstr ""
 "Schnittstellenname des Software Infiniband-Geräts muss »%s« oder nicht "
 "festgelegt sein (es ist statt dessen »%s«)"
 
-#: ../libnm-core/nm-setting-infiniband.c:289
+#: ../libnm-core/nm-setting-infiniband.c:291
 #, c-format
 msgid "mtu for transport mode '%s' can be at most %d but it is %d"
 msgstr "mtu für Transportmodus »%s« darf höchstens %d sein, ist aber %d"
@@ -10916,432 +10300,384 @@ msgstr "Ungültiges IPv6-Adressenpräfix »%u«"
 msgid "Invalid routing metric '%s'"
 msgstr "Ungültige Routing-Metrik »%s«"
 
-#: ../libnm-core/nm-setting-ip-config.c:1287
-#: ../libnm-core/nm-setting-sriov.c:421
+#: ../libnm-core/nm-setting-ip-config.c:1317
 msgid "unknown attribute"
 msgstr "Unbekanntes Attribut"
 
-#: ../libnm-core/nm-setting-ip-config.c:1297
-#: ../libnm-core/nm-setting-sriov.c:431
+#: ../libnm-core/nm-setting-ip-config.c:1327
 #, c-format
 msgid "invalid attribute type '%s'"
 msgstr "Ungültiger Attributtyp »%s«"
 
-#: ../libnm-core/nm-setting-ip-config.c:1308
+#: ../libnm-core/nm-setting-ip-config.c:1338
 #, c-format
 msgid "attribute is not valid for a IPv4 route"
 msgstr "Parameter ist für eine IPv4-Route ungültig"
 
-#: ../libnm-core/nm-setting-ip-config.c:1309
+#: ../libnm-core/nm-setting-ip-config.c:1339
 #, c-format
 msgid "attribute is not valid for a IPv6 route"
 msgstr "Parameter ist für eine IPv6-Route ungültig"
 
-#: ../libnm-core/nm-setting-ip-config.c:1325
-#: ../libnm-core/nm-setting-ip-config.c:1349
+#: ../libnm-core/nm-setting-ip-config.c:1355
+#: ../libnm-core/nm-setting-ip-config.c:1379
 #, c-format
 msgid "'%s' is not a valid IPv4 address"
 msgstr "»%s« ist keine gültige IPv4-Adresse"
 
-#: ../libnm-core/nm-setting-ip-config.c:1326
-#: ../libnm-core/nm-setting-ip-config.c:1350
+#: ../libnm-core/nm-setting-ip-config.c:1356
+#: ../libnm-core/nm-setting-ip-config.c:1380
 #, c-format
 msgid "'%s' is not a valid IPv6 address"
 msgstr "»%s« ist keine gültige IPv6-Adresse"
 
-#: ../libnm-core/nm-setting-ip-config.c:1340
+#: ../libnm-core/nm-setting-ip-config.c:1370
 #, c-format
 msgid "invalid prefix %s"
 msgstr "ungültiger Präfix %s"
 
-#: ../libnm-core/nm-setting-ip-config.c:2512
+#: ../libnm-core/nm-setting-ip-config.c:2534
 #, c-format
 msgid "%d. DNS server address is invalid"
 msgstr "%d. DNS-Server-Adresse ist ungültig"
 
-#: ../libnm-core/nm-setting-ip-config.c:2528
+#: ../libnm-core/nm-setting-ip-config.c:2550
 #, c-format
 msgid "%d. IP address is invalid"
 msgstr "%d. IP-Adresse ist ungültig"
 
-#: ../libnm-core/nm-setting-ip-config.c:2540
+#: ../libnm-core/nm-setting-ip-config.c:2562
 #, c-format
 msgid "%d. IP address has 'label' property with invalid type"
 msgstr "%d. IP-Adresse hat die Eigenschaft »label« mit einem ungültigen Typ"
 
-#: ../libnm-core/nm-setting-ip-config.c:2549
+#: ../libnm-core/nm-setting-ip-config.c:2571
 #, c-format
 msgid "%d. IP address has invalid label '%s'"
 msgstr "%d. IP-Adresse hat den ungültigen Typ »%s«"
 
-#: ../libnm-core/nm-setting-ip-config.c:2563
+#: ../libnm-core/nm-setting-ip-config.c:2585
 msgid "gateway cannot be set if there are no addresses configured"
 msgstr ""
 "»gateway« kann nicht festgelegt werden, wenn keine Adressen eingerichtet sind"
 
-#: ../libnm-core/nm-setting-ip-config.c:2572
+#: ../libnm-core/nm-setting-ip-config.c:2594
 msgid "gateway is invalid"
 msgstr "Gateway ist ungültig"
 
-#: ../libnm-core/nm-setting-ip-config.c:2586
+#: ../libnm-core/nm-setting-ip-config.c:2608
 #, c-format
 msgid "%d. route is invalid"
 msgstr "%d. Zielwegwahl ist ungültig"
 
-#: ../libnm-core/nm-setting-ip-config.c:2595
+#: ../libnm-core/nm-setting-ip-config.c:2617
 #, c-format
 msgid "%d. route cannot be a default route"
 msgstr "%d. Route darf nicht die Vorgabe-Route sein"
 
-#: ../libnm-core/nm-setting-ip-config.c:2606
+#: ../libnm-core/nm-setting-ip-config.c:2628
 #, c-format
 msgid "a gateway is incompatible with '%s'"
 msgstr "ein Gateway ist nicht kompatibel mit »%s«"
 
-#: ../libnm-core/nm-setting-ip4-config.c:141
-#: ../libnm-core/nm-setting-ip6-config.c:187
+#: ../libnm-core/nm-setting-ip4-config.c:143
+#: ../libnm-core/nm-setting-ip6-config.c:167
 #: ../libnm-util/nm-setting-ip4-config.c:879
-#: ../libnm-util/nm-setting-ip6-config.c:841
+#: ../libnm-util/nm-setting-ip6-config.c:843
 #, c-format
 msgid "this property cannot be empty for '%s=%s'"
 msgstr "Diese Eigenschaft darf nicht für »%s=%s« leer sein"
 
-#: ../libnm-core/nm-setting-ip4-config.c:153
-#: ../libnm-core/nm-setting-ip4-config.c:163
-#: ../libnm-core/nm-setting-ip4-config.c:175
+#: ../libnm-core/nm-setting-ip4-config.c:155
+#: ../libnm-core/nm-setting-ip4-config.c:165
+#: ../libnm-core/nm-setting-ip4-config.c:177
+#: ../libnm-core/nm-setting-ip6-config.c:182
+#: ../libnm-core/nm-setting-ip6-config.c:192
 #: ../libnm-core/nm-setting-ip6-config.c:202
-#: ../libnm-core/nm-setting-ip6-config.c:212
-#: ../libnm-core/nm-setting-ip6-config.c:222
 #: ../libnm-util/nm-setting-ip4-config.c:891
 #: ../libnm-util/nm-setting-ip4-config.c:901
 #: ../libnm-util/nm-setting-ip4-config.c:913
-#: ../libnm-util/nm-setting-ip6-config.c:853
-#: ../libnm-util/nm-setting-ip6-config.c:863
-#: ../libnm-util/nm-setting-ip6-config.c:875
+#: ../libnm-util/nm-setting-ip6-config.c:855
+#: ../libnm-util/nm-setting-ip6-config.c:865
+#: ../libnm-util/nm-setting-ip6-config.c:877
 #, c-format
 msgid "this property is not allowed for '%s=%s'"
 msgstr "Diese Eigenschaft ist nicht erlaubt für »%s=%s«"
 
-#: ../libnm-core/nm-setting-ip4-config.c:212
+#: ../libnm-core/nm-setting-ip4-config.c:214
 #, c-format
 msgid "'%s' is not a valid FQDN"
 msgstr "»%s« ist keine gültiger FQDN"
 
-#: ../libnm-core/nm-setting-ip4-config.c:221
+#: ../libnm-core/nm-setting-ip4-config.c:223
 msgid "property cannot be set when dhcp-hostname is also set"
 msgstr ""
 "Eigenschaft darf nicht gesetzt sein, wenn dhcp-hostname auch gesetzt ist"
 
-#: ../libnm-core/nm-setting-ip4-config.c:233
+#: ../libnm-core/nm-setting-ip4-config.c:235
 #, c-format
 msgid "multiple addresses are not allowed for '%s=%s'"
 msgstr "mehrfache Adressen sind nicht erlaubt für »%s=%s«"
 
-#: ../libnm-core/nm-setting-ip4-config.c:247
+#: ../libnm-core/nm-setting-ip4-config.c:249
 msgid "property should be TRUE when method is set to disabled"
 msgstr ""
 "Der Eigenschaft sollte auf »TRUE« eingestellt sein, wenn die Methode "
 "deaktiviert ist"
 
-#: ../libnm-core/nm-setting-ip6-config.c:261
+#: ../libnm-core/nm-setting-ip6-config.c:241
 msgid "value is not a valid token"
 msgstr "Der Wert ist keine gültiges Token"
 
-#: ../libnm-core/nm-setting-ip6-config.c:272
+#: ../libnm-core/nm-setting-ip6-config.c:252
 msgid "only makes sense with EUI64 address generation mode"
 msgstr "ergibt nur einen Sinn im Modus EUI64-Addressenerstellung"
 
-#: ../libnm-core/nm-setting-ip6-config.c:283
-msgid "invalid DUID"
-msgstr "Ungültige DUID"
-
-#: ../libnm-core/nm-setting-ip6-config.c:295
+#: ../libnm-core/nm-setting-ip6-config.c:264
 msgid "token is not in canonical form"
 msgstr "Token ist nicht in kanonischer Form"
 
-#: ../libnm-core/nm-setting-ip6-config.c:307
+#: ../libnm-core/nm-setting-ip6-config.c:276
 msgid "property should be TRUE when method is set to ignore"
 msgstr ""
 "Eigenschaft sollte auf »TRUE« (WAHR) gesetzt sein, wenn die Methode auf "
 "»ignore« (ignorieren) eingestellt ist"
 
-#: ../libnm-core/nm-setting-ip-tunnel.c:339
+#: ../libnm-core/nm-setting-ip-tunnel.c:318
 #, c-format
 msgid "'%d' is not a valid tunnel mode"
 msgstr "»%d« ist kein gültiger Tunnel-Modus"
 
-#: ../libnm-core/nm-setting-ip-tunnel.c:362
-#: ../libnm-core/nm-setting-ip-tunnel.c:382
+#: ../libnm-core/nm-setting-ip-tunnel.c:330
+#: ../libnm-core/nm-setting-macsec.c:302 ../libnm-core/nm-setting-macvlan.c:167
+#: ../libnm-core/nm-setting-vlan.c:645 ../libnm-core/nm-setting-vxlan.c:403
+#: ../libnm-util/nm-setting-vlan.c:567
+#, c-format
+msgid "'%s' is neither an UUID nor an interface name"
+msgstr "»%s« ist weder eine UUID noch ein Schnittstellenname"
+
+#: ../libnm-core/nm-setting-ip-tunnel.c:341
+#: ../libnm-core/nm-setting-ip-tunnel.c:361
 #, c-format
 msgid "'%s' is not a valid IPv%c address"
 msgstr "»%s« ist keine gültige IPv%c-Adresse"
 
-#: ../libnm-core/nm-setting-ip-tunnel.c:399
+#: ../libnm-core/nm-setting-ip-tunnel.c:375
 msgid "tunnel keys can only be specified for GRE tunnels"
 msgstr "Tunnel-Schlüssel können nur für GRE-Tunnel angegeben werden"
 
-#: ../libnm-core/nm-setting-ip-tunnel.c:412
-#: ../libnm-core/nm-setting-ip-tunnel.c:428
+#: ../libnm-core/nm-setting-ip-tunnel.c:388
+#: ../libnm-core/nm-setting-ip-tunnel.c:404
 #, c-format
 msgid "'%s' is not a valid tunnel key"
 msgstr "»%s« ist kein gültiger Tunnel-Schlüssel"
 
-#: ../libnm-core/nm-setting-ip-tunnel.c:440
+#: ../libnm-core/nm-setting-ip-tunnel.c:416
 msgid "a fixed TTL is allowed only when path MTU discovery is enabled"
 msgstr ""
 "ein fester TTL-wert ist nur erlaubt, sofern »path MTU discovery« "
 "eingeschaltet ist"
 
-#: ../libnm-core/nm-setting-ip-tunnel.c:453
-#, c-format
-msgid "some flags are invalid for the select mode: %s"
-msgstr ""
-
-#: ../libnm-core/nm-setting-ip-tunnel.c:467
-#, fuzzy, c-format
-#| msgid "this property is not allowed for method none"
-msgid "wired setting not allowed for mode %s"
-msgstr "Diese Eigenschaft ist nicht erlaubt für die Methode »none«"
-
-#: ../libnm-core/nm-setting-macsec.c:250
+#: ../libnm-core/nm-setting-macsec.c:235
 msgid "the key is empty"
 msgstr "Schlüssel ist leer"
 
-#: ../libnm-core/nm-setting-macsec.c:261
+#: ../libnm-core/nm-setting-macsec.c:246
 #, c-format
 msgid "the key must be %d characters"
 msgstr "Schlüssel muss %d Zeichen lang sein"
 
-#: ../libnm-core/nm-setting-macsec.c:269
+#: ../libnm-core/nm-setting-macsec.c:254
 msgid "the key contains non-hexadecimal characters"
 msgstr "Schlüssel enthält nicht-hexadezimale Zeichen"
 
-#: ../libnm-core/nm-setting-macsec.c:331 ../libnm-core/nm-setting-macvlan.c:175
-#: ../libnm-core/nm-setting-vlan.c:657 ../libnm-util/nm-setting-vlan.c:580
+#: ../libnm-core/nm-setting-macsec.c:291 ../libnm-core/nm-setting-vlan.c:634
+#: ../libnm-util/nm-setting-vlan.c:556
+#, c-format
+msgid "'%s' value doesn't match '%s=%s'"
+msgstr "Wert »%s« entspricht nicht »%s=%s«"
+
+#: ../libnm-core/nm-setting-macsec.c:316 ../libnm-core/nm-setting-macvlan.c:181
+#: ../libnm-core/nm-setting-vlan.c:659 ../libnm-util/nm-setting-vlan.c:580
 #, c-format
 msgid "property is not specified and neither is '%s:%s'"
 msgstr "Eigenschaft ist nicht festgelegt und ebensowenig ist »%s:%s«"
 
-#: ../libnm-core/nm-setting-macsec.c:348
+#: ../libnm-core/nm-setting-macsec.c:333
 #, c-format
 msgid "EAP key management requires '%s' setting presence"
 msgstr "EAP-Schlüsselverwaltung erfordert Vorhandensein der Einstellung »%s«"
 
-#: ../libnm-core/nm-setting-macsec.c:359
+#: ../libnm-core/nm-setting-macsec.c:344
 #, c-format
 msgid "invalid port %d"
 msgstr "Ungültiger Port %d"
 
-#: ../libnm-core/nm-setting-macvlan.c:186
+#: ../libnm-core/nm-setting-macvlan.c:192
 msgid "non promiscuous operation is allowed only in passthru mode"
 msgstr ""
 
-#: ../libnm-core/nm-setting-olpc-mesh.c:128
+#: ../libnm-core/nm-setting-olpc-mesh.c:130
 #: ../libnm-core/nm-setting-wireless.c:760
 #: ../libnm-util/nm-setting-olpc-mesh.c:132
-#: ../libnm-util/nm-setting-wireless.c:777
+#: ../libnm-util/nm-setting-wireless.c:778
 msgid "SSID length is out of range <1-32> bytes"
 msgstr "Länge der SSID ist außerhalb des Bereichs <1-32> Byte"
 
-#: ../libnm-core/nm-setting-olpc-mesh.c:137
+#: ../libnm-core/nm-setting-olpc-mesh.c:139
 #: ../libnm-core/nm-setting-wireless.c:800
 #: ../libnm-util/nm-setting-olpc-mesh.c:141
-#: ../libnm-util/nm-setting-wireless.c:817
+#: ../libnm-util/nm-setting-wireless.c:818
 #, c-format
 msgid "'%d' is not a valid channel"
 msgstr "»%d« ist kein gültiger Kanal"
 
-#: ../libnm-core/nm-setting-ovs-interface.c:111
+#: ../libnm-core/nm-setting-ovs-interface.c:113
 #, c-format
 msgid "'%s' is not a valid interface type"
-msgstr "»%s« ist kein gültiger Schnittstellentyp"
+msgstr ""
 
-#: ../libnm-core/nm-setting-ovs-interface.c:133
+#: ../libnm-core/nm-setting-ovs-interface.c:135
 #, c-format
 msgid "A connection with a '%s' setting needs connection.type explicitly set"
 msgstr ""
-"Für eine Verbindung mit der Einstellung »%s« muss »connection.type« explizit "
-"festgelegt werden"
 
-#: ../libnm-core/nm-setting-ovs-interface.c:145
+#: ../libnm-core/nm-setting-ovs-interface.c:147
 #, c-format
 msgid "A connection of type '%s' cannot have ovs-interface.type \"system\""
 msgstr ""
-"Für eine Verbindung des Typs »%s« darf nicht ovs-interface.type auf »system« "
-"gesetzt sein"
 
-#: ../libnm-core/nm-setting-ovs-interface.c:157
+#: ../libnm-core/nm-setting-ovs-interface.c:159
 #, c-format
 msgid "A connection of type '%s' cannot have an ovs-interface.type \"%s\""
 msgstr ""
-"Für eine Verbindung des Typs »%s« darf nicht ovs-interface.type auf »%s« "
-"gesetzt sein"
 
-#: ../libnm-core/nm-setting-ovs-interface.c:173
+#: ../libnm-core/nm-setting-ovs-interface.c:175
 #, c-format
 msgid ""
 "A connection with '%s' setting must be of connection.type \"ovs-interface\" "
 "but is \"%s\""
 msgstr ""
-"Für eine Verbindung des Typs »%s« muss connection.type auf »ovs-interface« "
-"gesetzt sein, es ist aber »%s« gesetzt"
 
-#: ../libnm-core/nm-setting-ovs-interface.c:184
+#: ../libnm-core/nm-setting-ovs-interface.c:186
 #, c-format
 msgid ""
 "A connection with '%s' setting needs to be of 'patch' interface type, not "
 "'%s'"
 msgstr ""
-"Eine Verbindung mit der Einstellung »%s« muss den Schnittstellentyp »patch« "
-"haben und nicht »%s«"
 
-# Das Original ist kein vollständiger, sinnvoller Satz
-#: ../libnm-core/nm-setting-ovs-interface.c:199
-#, fuzzy, c-format
+#: ../libnm-core/nm-setting-ovs-interface.c:201
+#, c-format
 msgid "A connection with ovs-interface.type '%s' setting a 'ovs-patch' setting"
 msgstr ""
-"Für eine Verbindung des Typs »%s« muss connection.type auf »ovs-interface« "
-"gesetzt sein, es ist aber »%s« gesetzt"
 
-#: ../libnm-core/nm-setting-ovs-interface.c:219
+#: ../libnm-core/nm-setting-ovs-interface.c:221
 #, c-format
 msgid "Missing ovs interface setting"
-msgstr "Einstellung für ovs-Schnittstelle fehlt"
+msgstr ""
 
-#: ../libnm-core/nm-setting-ovs-interface.c:225
+#: ../libnm-core/nm-setting-ovs-interface.c:227
 #, c-format
 msgid "Missing ovs interface type"
-msgstr "Typ der ovs-Schnittstelle fehlt"
+msgstr ""
 
-#: ../libnm-core/nm-setting-ovs-interface.c:268
-#: ../libnm-core/nm-setting-ovs-port.c:196
-#, fuzzy, c-format
+#: ../libnm-core/nm-setting-ovs-interface.c:271
+#: ../libnm-core/nm-setting-ovs-port.c:198
+#, c-format
 msgid "A connection with a '%s' setting must have a master."
 msgstr ""
-"Für eine Verbindung des Typs »%s« muss connection.type auf »ovs-interface« "
-"gesetzt sein, es ist aber »%s« gesetzt"
 
-#: ../libnm-core/nm-setting-ovs-patch.c:104
-#: ../libnm-core/nm-setting-vxlan.c:373
+#: ../libnm-core/nm-setting-ovs-patch.c:110
+#: ../libnm-core/nm-setting-vxlan.c:375
 #, c-format
 msgid "'%s' is not a valid IP address"
 msgstr "»%s« ist keine gültige IP-Adresse"
 
-#: ../libnm-core/nm-setting-ovs-port.c:221
+#: ../libnm-core/nm-setting-ovs-port.c:223
 #, c-format
 msgid "'%s' is not allowed in vlan_mode"
-msgstr "»%s« ist nicht mit »vlan_mode« erlaubt"
+msgstr ""
 
-#: ../libnm-core/nm-setting-ovs-port.c:231
+#: ../libnm-core/nm-setting-ovs-port.c:233
 #, c-format
 msgid "the tag id must be in range 0-4094 but is %u"
 msgstr ""
 
-#: ../libnm-core/nm-setting-ovs-port.c:241
+#: ../libnm-core/nm-setting-ovs-port.c:243
 #, c-format
 msgid "'%s' is not allowed in lacp"
-msgstr "»%s« ist nicht mit »lacp« erlaubt"
+msgstr ""
 
-#: ../libnm-core/nm-setting-ovs-port.c:251
+#: ../libnm-core/nm-setting-ovs-port.c:253
 #, c-format
 msgid "'%s' is not allowed in bond_mode"
-msgstr "»%s« ist nicht mit »bond_mode« erlaubt"
+msgstr ""
 
-#: ../libnm-core/nm-setting-ovs-bridge.c:159
+#: ../libnm-core/nm-setting-ovs-bridge.c:161
 #, c-format
 msgid "A connection with a '%s' setting must not have a master."
 msgstr ""
 
-#: ../libnm-core/nm-setting-ovs-bridge.c:170
+#: ../libnm-core/nm-setting-ovs-bridge.c:172
 #, c-format
 msgid "'%s' is not allowed in fail_mode"
-msgstr "»%s« ist nicht mit »fail_mode« erlaubt"
+msgstr ""
 
-#: ../libnm-core/nm-setting-ppp.c:363 ../libnm-util/nm-setting-ppp.c:386
+#: ../libnm-core/nm-setting-ppp.c:365 ../libnm-util/nm-setting-ppp.c:387
 #, c-format
 msgid "'%d' is out of valid range <128-16384>"
 msgstr "»%d« ist außerhalb des Bereichs <128-16384>"
 
-#: ../libnm-core/nm-setting-ppp.c:376 ../libnm-util/nm-setting-ppp.c:399
+#: ../libnm-core/nm-setting-ppp.c:378 ../libnm-util/nm-setting-ppp.c:400
 #, c-format
 msgid "setting this property requires non-zero '%s' property"
 msgstr ""
 "Festlegen dieser Eigenschaft erfordert eine von Null verschiedene "
 "Eigenschaft »%s«"
 
-#: ../libnm-core/nm-setting-proxy.c:161
+#: ../libnm-core/nm-setting-proxy.c:163
 #, c-format
 msgid "invalid proxy method"
 msgstr "ungültige Proxy-Methode"
 
-#: ../libnm-core/nm-setting-proxy.c:171 ../libnm-core/nm-setting-proxy.c:180
+#: ../libnm-core/nm-setting-proxy.c:173 ../libnm-core/nm-setting-proxy.c:182
 #, c-format
 msgid "this property is not allowed for method none"
 msgstr "Diese Eigenschaft ist nicht erlaubt für die Methode »none«"
 
-#: ../libnm-core/nm-setting-proxy.c:191
+#: ../libnm-core/nm-setting-proxy.c:193
 #, c-format
 msgid "the script is too large"
 msgstr "Das Skript ist zu groß"
 
-#: ../libnm-core/nm-setting-proxy.c:199
+#: ../libnm-core/nm-setting-proxy.c:201
 #, c-format
 msgid "the script is not valid utf8"
 msgstr "Das Skript ist kein gültiges UTF8"
 
-#: ../libnm-core/nm-setting-proxy.c:207
+#: ../libnm-core/nm-setting-proxy.c:209
 #, c-format
 msgid "the script lacks FindProxyForURL function"
 msgstr "dem Skript fehlt die Funktion FindProxyForURL"
 
-#: ../libnm-core/nm-setting-sriov.c:1086
-#, c-format
-msgid "VF with index %u, but the total number of VFs is %u"
-msgstr ""
-
-#: ../libnm-core/nm-setting-sriov.c:1097
-#, fuzzy, c-format
-#| msgid "invalid key \"%s\": %s"
-msgid "invalid VF %u: %s"
-msgstr "Ungültiger Schlüsselname »%s«: %s"
-
-#: ../libnm-core/nm-setting-sriov.c:1109
-#, fuzzy, c-format
-#| msgid "duplicate setting name"
-msgid "duplicate VF index %u"
-msgstr "Doppelter Einstellungsname"
-
-#: ../libnm-core/nm-setting-sriov.c:1130
-#, c-format
-msgid "VFs %d and %d are not sorted by ascending index"
-msgstr ""
-
 #: ../libnm-core/nm-setting-tc-config.c:68
-#: ../libnm-core/nm-setting-tc-config.c:296
-#: ../libnm-core/nm-setting-tc-config.c:550
+#: ../libnm-core/nm-setting-tc-config.c:283
+#: ../libnm-core/nm-setting-tc-config.c:547
 #, fuzzy, c-format
 msgid "'%s' is not a valid kind"
 msgstr "»%s« ist kein gültiges Band"
 
 #: ../libnm-core/nm-setting-tc-config.c:76
-#: ../libnm-core/nm-setting-tc-config.c:558
+#: ../libnm-core/nm-setting-tc-config.c:555
 #, fuzzy
 msgid "parent handle missing"
 msgstr "Daten fehlen"
 
-#: ../libnm-core/nm-setting-tc-config.c:1203
-msgid "there are duplicate TC qdiscs"
-msgstr ""
-
-#: ../libnm-core/nm-setting-tc-config.c:1223
-msgid "there are duplicate TC filters"
-msgstr ""
-
 #: ../libnm-core/nm-setting-team.c:134 ../libnm-core/nm-setting-team.c:193
 #: ../libnm-core/nm-setting-team.c:266
-#, c-format
+#, fuzzy, c-format
 msgid "%s is out of range [0, %d]"
-msgstr "»%s« ist außerhalb des Bereichs [0, %d]"
+msgstr "»%s« ist außerhalb des Bereichs [0, %u]"
 
 #: ../libnm-core/nm-setting-team.c:175
 #, c-format
@@ -11349,9 +10685,9 @@ msgid "Missing target-host in nsna_ping link watcher"
 msgstr ""
 
 #: ../libnm-core/nm-setting-team.c:181 ../libnm-core/nm-setting-team.c:248
-#, c-format
+#, fuzzy, c-format
 msgid "target-host '%s' contains invalid characters"
-msgstr "Zielrechner »%s« enthält ungültige Zeichen"
+msgstr "Schlüssel enthält ungültige Zeichen"
 
 #: ../libnm-core/nm-setting-team.c:241
 #, c-format
@@ -11359,249 +10695,248 @@ msgid "Missing %s in arp_ping link watcher"
 msgstr ""
 
 #: ../libnm-core/nm-setting-team.c:254
-#, c-format
+#, fuzzy, c-format
 msgid "source-host '%s' contains invalid characters"
-msgstr "Quellrechner »%s« enthält ungültige Zeichen"
+msgstr "Schlüssel enthält ungültige Zeichen"
 
 #: ../libnm-core/nm-setting-team.c:1153
-#: ../libnm-core/nm-setting-team-port.c:380
+#: ../libnm-core/nm-setting-team-port.c:381
 #, c-format
 msgid "team config exceeds size limit"
 msgstr "Die Team-Konfiguration übersteigt die Größenbeschränkung"
 
-#: ../libnm-core/nm-setting-team.c:1179
-#, c-format
+#: ../libnm-core/nm-setting-team.c:1178
+#, fuzzy, c-format
 msgid "invalid runner \"%s\""
-msgstr "ungültiger Runner »%s«"
+msgstr "ungültiger Präfix %s"
 
-#: ../libnm-core/nm-setting-team.c:1192
+#: ../libnm-core/nm-setting-team.c:1191
 #, fuzzy, c-format
 msgid "missing link watcher name"
 msgstr "Dateiname fehlt"
 
-#: ../libnm-core/nm-setting-team.c:1202
+#: ../libnm-core/nm-setting-team.c:1201
 #, fuzzy, c-format
 msgid "unknown link watcher \"%s\""
 msgstr "Unbekannte VPN-Erweiterung »%s«"
 
-#: ../libnm-core/nm-setting-team.c:1213
-#, c-format
+#: ../libnm-core/nm-setting-team.c:1212
+#, fuzzy, c-format
 msgid "missing target host"
-msgstr "Zielrechner fehlt"
+msgstr "fehlende Einstellung"
 
-#: ../libnm-core/nm-setting-team.c:1221
-#, c-format
+#: ../libnm-core/nm-setting-team.c:1220
+#, fuzzy, c-format
 msgid "missing source address"
-msgstr "Quelladresse fehlt"
+msgstr "Fehlende IPv4-Adresse"
 
-#: ../libnm-core/nm-setting-tun.c:185
+#: ../libnm-core/nm-setting-tun.c:187
 #, c-format
 msgid "'%u': invalid mode"
 msgstr "»%u«: ungültiger Modus"
 
-#: ../libnm-core/nm-setting-tun.c:195
+#: ../libnm-core/nm-setting-tun.c:197
 #, c-format
 msgid "'%s': invalid user ID"
 msgstr "»%s«: ungültige Benutzerkennung"
 
-#: ../libnm-core/nm-setting-tun.c:206
+#: ../libnm-core/nm-setting-tun.c:208
 #, c-format
 msgid "'%s': invalid group ID"
 msgstr "»%s«: ungültige Gruppenkennung"
 
-#: ../libnm-core/nm-setting-user.c:109
+#: ../libnm-core/nm-setting-user.c:111
 msgid "missing key"
 msgstr "Schlüssel fehlt"
 
-#: ../libnm-core/nm-setting-user.c:115
+#: ../libnm-core/nm-setting-user.c:117
 msgid "key is too long"
 msgstr "Der Schlüssel ist zu lang"
 
-#: ../libnm-core/nm-setting-user.c:120
+#: ../libnm-core/nm-setting-user.c:122
 msgid "key must be UTF8"
 msgstr "Schlüssel muss in UTF-8 vorliegen"
 
-#: ../libnm-core/nm-setting-user.c:143
+#: ../libnm-core/nm-setting-user.c:145
 msgid "key requires a '.' for a namespace"
 msgstr "Schlüssel erfordert ein ».« für einen Namensraum"
 
-#: ../libnm-core/nm-setting-user.c:156
+#: ../libnm-core/nm-setting-user.c:158
 msgid "key cannot contain \"..\""
 msgstr "Schlüssel darf kein »..« enthalten"
 
-#: ../libnm-core/nm-setting-user.c:161
+#: ../libnm-core/nm-setting-user.c:163
 msgid "key contains invalid characters"
 msgstr "Schlüssel enthält ungültige Zeichen"
 
-#: ../libnm-core/nm-setting-user.c:186
+#: ../libnm-core/nm-setting-user.c:188
 msgid "value is missing"
 msgstr "Wert fehlt"
 
-#: ../libnm-core/nm-setting-user.c:193
+#: ../libnm-core/nm-setting-user.c:195
 msgid "value is too large"
 msgstr "Wert ist zu groß"
 
-#: ../libnm-core/nm-setting-user.c:199
+#: ../libnm-core/nm-setting-user.c:201
 msgid "value is not valid UTF8"
 msgstr "Wert ist kein gültiges UTF-8"
 
-#: ../libnm-core/nm-setting-user.c:329
+#: ../libnm-core/nm-setting-user.c:338
 msgid "maximum number of user data entries reached"
-msgstr "Die Höchstzahl an Benutzerdateneinträgen ist erreicht"
+msgstr ""
 
-#: ../libnm-core/nm-setting-user.c:370
+#: ../libnm-core/nm-setting-user.c:379
 #, c-format
 msgid "invalid key \"%s\": %s"
 msgstr "Ungültiger Schlüsselname »%s«: %s"
 
-#: ../libnm-core/nm-setting-user.c:374
+#: ../libnm-core/nm-setting-user.c:383
 #, c-format
 msgid "invalid value for \"%s\": %s"
 msgstr "Ungültiger Wert für »%s«: %s"
 
-#: ../libnm-core/nm-setting-user.c:389
+#: ../libnm-core/nm-setting-user.c:398
 #, c-format
 msgid "maximum number of user data entries reached (%u instead of %u)"
 msgstr ""
-"Die Höchstzahl an Benutzerdateneinträgen ist erreicht (%u anstelle von %u)"
 
-#: ../libnm-core/nm-setting-vlan.c:668 ../libnm-util/nm-setting-vlan.c:600
+#: ../libnm-core/nm-setting-vlan.c:670 ../libnm-util/nm-setting-vlan.c:600
 #, c-format
 msgid "the vlan id must be in range 0-4094 but is %u"
 msgstr "Die vlan-ID muss im Bereich 0-4094 sein, ist aber %u"
 
-#: ../libnm-core/nm-setting-vlan.c:678 ../libnm-util/nm-setting-vlan.c:591
+#: ../libnm-core/nm-setting-vlan.c:680 ../libnm-util/nm-setting-vlan.c:591
 msgid "flags are invalid"
 msgstr "Flags sind ungültig"
 
-#: ../libnm-core/nm-setting-vlan.c:690
+#: ../libnm-core/nm-setting-vlan.c:692
 msgid "vlan setting should have a ethernet setting as well"
-msgstr "Eine vlan-Einstellung sollte ebenfalls eine Ethernet-Einstellung haben"
-
-#: ../libnm-core/nm-setting-vpn.c:518
-msgid "cannot set connection.multi-connect for VPN setting"
 msgstr ""
 
-#: ../libnm-core/nm-setting-vpn.c:539
+#: ../libnm-core/nm-setting-vpn.c:559
 #, c-format
 msgid "secret was empty"
 msgstr "Passwort war leer"
 
-#: ../libnm-core/nm-setting-vpn.c:569
+#: ../libnm-core/nm-setting-vpn.c:589
 msgid "setting contained a secret with an empty name"
 msgstr "Die Einstellung enthält ein Geheimnis mit einem leeren Namen"
 
-#: ../libnm-core/nm-setting-vpn.c:577
+#: ../libnm-core/nm-setting-vpn.c:597
 #, c-format
 msgid "secret value was empty"
 msgstr "Wert für Geheimnis war leer"
 
-#: ../libnm-core/nm-setting-vpn.c:624 ../libnm-core/nm-setting.c:1891
+#: ../libnm-core/nm-setting-vpn.c:644 ../libnm-core/nm-setting.c:1788
 msgid "not a secret property"
 msgstr "Keine Eigenschaft von »Geheimnis«"
 
-#: ../libnm-core/nm-setting-vpn.c:630
+#: ../libnm-core/nm-setting-vpn.c:650
 msgid "secret is not of correct type"
 msgstr "»Geheimnis« ist nicht vom richtigen Typ"
 
-#: ../libnm-core/nm-setting-vpn.c:661
+#: ../libnm-core/nm-setting-vpn.c:681
 #, c-format
 msgid "failed to convert value '%s' to uint"
 msgstr "Umwandeln des Wertes »%s« nach uint ist fehlgeschlagen"
 
-#: ../libnm-core/nm-setting-vxlan.c:386
+#: ../libnm-core/nm-setting-vxlan.c:388
 #, c-format
 msgid "'%s' is not a valid IP%c address"
 msgstr "»%s« ist keine gültige IP%c-Adresse"
 
-#: ../libnm-core/nm-setting-vxlan.c:413
+#: ../libnm-core/nm-setting-vxlan.c:415
 #, c-format
 msgid "%d is greater than local port max %d"
 msgstr "%d ist größer als das Maximum %d des lokalen Ports"
 
-#: ../libnm-core/nm-setting-wired.c:630 ../libnm-util/nm-setting-wired.c:612
+#: ../libnm-core/nm-setting-wired.c:632 ../libnm-util/nm-setting-wired.c:613
 #, c-format
 msgid "'%s' is not a valid Ethernet port value"
 msgstr "»%s« ist kein gültiger Wert für einen Ethernet-Port"
 
-#: ../libnm-core/nm-setting-wired.c:640 ../libnm-util/nm-setting-wired.c:622
+#: ../libnm-core/nm-setting-wired.c:642 ../libnm-util/nm-setting-wired.c:623
 #, c-format
 msgid "'%s' is not a valid duplex value"
 msgstr "»%s« ist kein gültiger Duplex-Wert"
 
-#: ../libnm-core/nm-setting-wired.c:699 ../libnm-util/nm-setting-wired.c:679
+#: ../libnm-core/nm-setting-wired.c:701 ../libnm-util/nm-setting-wired.c:680
 #, c-format
 msgid "invalid '%s' or its value '%s'"
 msgstr "ungültiges »%s« oder dessen Wert »%s«"
 
-#: ../libnm-core/nm-setting-wired.c:736
+#: ../libnm-core/nm-setting-wired.c:738
 msgid "Wake-on-LAN mode 'default' and 'ignore' are exclusive flags"
 msgstr ""
 "Modi »default« und »ignore« für Wake-on-LAN schließen sich gegenseitig aus"
 
-#: ../libnm-core/nm-setting-wired.c:745
+#: ../libnm-core/nm-setting-wired.c:747
 msgid "Wake-on-LAN password can only be used with magic packet mode"
 msgstr ""
 "Passwort für Wake-on-LAN kann nur zusammen mit dem magischen Paketmodus "
 "verwendet werden"
 
 #: ../libnm-core/nm-setting-wired.c:770
-msgid "both speed and duplex should have a valid value or both should be unset"
+msgid "when link autonegotiation is enabled no duplex value is accepted"
 msgstr ""
 
-#: ../libnm-core/nm-setting-wired.c:771
+#: ../libnm-core/nm-setting-wired.c:778
+msgid "when link autonegotiation is enabled speed should be 0"
+msgstr ""
+
+#: ../libnm-core/nm-setting-wired.c:788
 msgid "both speed and duplex are required for static link configuration"
 msgstr ""
 "sowohl Geschwindigkeit als auch Duplexmodus sind für eine statische Link-"
 "Konfiguration notwendig"
 
-#: ../libnm-core/nm-setting-wireless-security.c:939
-#: ../libnm-util/nm-setting-wireless-security.c:911
+#: ../libnm-core/nm-setting-wireless-security.c:921
+#: ../libnm-util/nm-setting-wireless-security.c:912
 #, c-format
 msgid "'%s' security requires '%s=%s'"
 msgstr "Sicherheit »%s« erfordert »%s=%s«"
 
-#: ../libnm-core/nm-setting-wireless-security.c:960
-#: ../libnm-util/nm-setting-wireless-security.c:932
+#: ../libnm-core/nm-setting-wireless-security.c:942
+#: ../libnm-util/nm-setting-wireless-security.c:933
 #, c-format
 msgid "'%s' security requires '%s' setting presence"
 msgstr "Sicherheit »%s« erfordert Vorhandensein der Einstellung »%s«"
 
-#: ../libnm-core/nm-setting-wireless-security.c:981
-#: ../libnm-util/nm-setting-wireless-security.c:953
+#: ../libnm-core/nm-setting-wireless-security.c:963
+#: ../libnm-util/nm-setting-wireless-security.c:954
 #, c-format
 msgid "'%d' value is out of range <0-3>"
 msgstr "Wert »%d« ist außerhalb des Bereichs <0-3>"
 
-#: ../libnm-core/nm-setting-wireless-security.c:1036
-#: ../libnm-util/nm-setting-wireless-security.c:1008
+#: ../libnm-core/nm-setting-wireless-security.c:1018
+#: ../libnm-util/nm-setting-wireless-security.c:1009
 #, c-format
 msgid "'%s' connections require '%s' in this property"
 msgstr "»%s« Verbindungen erfordern »%s« in dieser Eigenschaft"
 
-#: ../libnm-core/nm-setting-wireless-security.c:1066
-#: ../libnm-util/nm-setting-wireless-security.c:1038
+#: ../libnm-core/nm-setting-wireless-security.c:1048
+#: ../libnm-util/nm-setting-wireless-security.c:1039
 #, c-format
 msgid "'%s' can only be used with '%s=%s' (WEP)"
 msgstr "»%s« kann nur zusammen mit »%s=%s« verwendet werden (WEP)"
 
-#: ../libnm-core/nm-setting-wireless-security.c:1090
+#: ../libnm-core/nm-setting-wireless-security.c:1072
 #, c-format
 msgid "'%s' can only be used with '%s=%s' or '%s=%s'"
 msgstr "»%s« kann nur zusammen mit »%s=%s« oder »%s=%s« verwendet werden"
 
-#: ../libnm-core/nm-setting-wireless-security.c:1112
+#: ../libnm-core/nm-setting-wireless-security.c:1094
 msgid "can't be simultaneously disabled and enabled"
-msgstr "darf nicht gleichzeitig ein- und ausgeschaltet sein"
+msgstr ""
 
 #: ../libnm-core/nm-setting-wireless.c:769
-#: ../libnm-util/nm-setting-wireless.c:786
+#: ../libnm-util/nm-setting-wireless.c:787
 #, c-format
 msgid "'%s' is not a valid Wi-Fi mode"
 msgstr "»%s« ist kein gültiger WLAN-Modus"
 
 #: ../libnm-core/nm-setting-wireless.c:779
-#: ../libnm-util/nm-setting-wireless.c:796
+#: ../libnm-util/nm-setting-wireless.c:797
 #, c-format
 msgid "'%s' is not a valid band"
 msgstr "»%s« ist kein gültiges Band"
@@ -11616,227 +10951,219 @@ msgstr "»%s« erfordert eine Festlegung der Eigenschaft »%s«"
 msgid "invalid value"
 msgstr "Ungültiger Wert"
 
-#: ../libnm-core/nm-setting-wireless.c:893
-#, fuzzy
-#| msgid "Wake-on-LAN mode 'default' and 'ignore' are exclusive flags"
-msgid "Wake-on-WLAN mode 'default' and 'ignore' are exclusive flags"
-msgstr ""
-"Modi »default« und »ignore« für Wake-on-LAN schließen sich gegenseitig aus"
-
-#: ../libnm-core/nm-setting-wireless.c:902
-msgid "Wake-on-WLAN trying to set unknown flag"
-msgstr ""
-
-#: ../libnm-core/nm-setting-wireless.c:924
+#: ../libnm-core/nm-setting-wireless.c:904
 #, c-format
 msgid "conflicting value of mac-address-randomization and cloned-mac-address"
 msgstr ""
 "Im Konflikt stehende Werte für »mac-address-randomization« und »cloned-mac-"
 "address«"
 
-#: ../libnm-core/nm-setting.c:771
+#: ../libnm-core/nm-setting.c:821
 #, c-format
 msgid "duplicate property"
 msgstr "Doppelte Eigenschaft"
 
-#: ../libnm-core/nm-setting.c:819 ../libnm-core/nm-setting.c:866
+#: ../libnm-core/nm-setting.c:849 ../libnm-core/nm-setting.c:896
 #, c-format
 msgid "can't set property of type '%s' from value of type '%s'"
 msgstr ""
 "Eigenschaft des Typs »%s« von Wert des Typs »%s« kann nicht gesetzt werden"
 
-#: ../libnm-core/nm-setting.c:838 ../libnm-core/nm-setting.c:852
+#: ../libnm-core/nm-setting.c:868 ../libnm-core/nm-setting.c:882
 #, c-format
 msgid "failed to set property: %s"
 msgstr "Eigenschaft konnte nicht festgelegt werden: %s"
 
-#: ../libnm-core/nm-setting.c:880
+#: ../libnm-core/nm-setting.c:910
 #, c-format
 msgid "can not set property: %s"
 msgstr "Die Eigenschaft kann nicht festgelegt werden: %s"
 
-#: ../libnm-core/nm-setting.c:896
+#: ../libnm-core/nm-setting.c:926
 #, c-format
 msgid "unknown property"
 msgstr "Unbekannte Eigenschaft"
 
-#: ../libnm-core/nm-setting.c:1789
+#: ../libnm-core/nm-setting.c:1686
 msgid "secret not found"
 msgstr "Passwort nicht gefunden"
 
-#: ../libnm-core/nm-setting.c:1881
+#: ../libnm-core/nm-setting.c:1778
 msgid "secret is not set"
 msgstr "»Geheimnis« ist nicht festgelegt"
 
-#: ../libnm-core/nm-utils.c:2057
-#, c-format
+#: ../libnm-core/nm-utils.c:2123
+#, fuzzy, c-format
 msgid "'%s' is not a valid handle."
-msgstr "»%s« ist kein gültiges Handle."
+msgstr "»%s« ist kein gültiges Band"
 
-#: ../libnm-core/nm-utils.c:2153
+#: ../libnm-core/nm-utils.c:2220
 #, c-format
 msgid "'%s' unexpected: parent already specified."
 msgstr ""
 
-#: ../libnm-core/nm-utils.c:2169
+#: ../libnm-core/nm-utils.c:2236
 #, fuzzy, c-format
 msgid "invalid handle: '%s'"
 msgstr "Ungültige Option »%s«"
 
-#: ../libnm-core/nm-utils.c:2191
+#: ../libnm-core/nm-utils.c:2258
+#, fuzzy
 msgid "parent not specified."
-msgstr "Es wurde kein übergeordnetes Element angegeben."
+msgstr "Es wurde kein Dienstname angegeben"
 
-#: ../libnm-core/nm-utils.c:2238
-#, c-format
+#: ../libnm-core/nm-utils.c:2305
+#, fuzzy, c-format
 msgid "unsupported qdisc option: '%s'."
-msgstr "Nicht unterstützte qdisc-Option »%s«."
+msgstr "Nicht unterstützter Parameter »%s« des Typs »%s«"
 
-#: ../libnm-core/nm-utils.c:2354
+#: ../libnm-core/nm-utils.c:2421
+#, fuzzy
 msgid "action name missing."
-msgstr "Es fehlt ein Name für die Aktion."
+msgstr "Daten fehlen"
 
-#: ../libnm-core/nm-utils.c:2378
-#, c-format
+#: ../libnm-core/nm-utils.c:2445
+#, fuzzy, c-format
 msgid "unsupported action option: '%s'."
-msgstr "Nicht unterstützte Option »%s« für die Aktion."
+msgstr "Nicht unterstützter Parameter »%s« des Typs »%s«"
 
-#: ../libnm-core/nm-utils.c:2516
+#: ../libnm-core/nm-utils.c:2583
+#, fuzzy
 msgid "invalid action: "
-msgstr "Ungültige Aktion: "
+msgstr "Ungültige Option »%s«"
 
-#: ../libnm-core/nm-utils.c:2520
-#, c-format
+#: ../libnm-core/nm-utils.c:2587
+#, fuzzy, c-format
 msgid "unsupported tfilter option: '%s'."
-msgstr "Nicht unterstützte tfilter-Option »%s«."
+msgstr "Nicht unterstützter Parameter »%s« des Typs »%s«"
 
-#: ../libnm-core/nm-utils.c:3122
+#: ../libnm-core/nm-utils.c:2946
 #, c-format
 msgid "failed stat file %s: %s"
 msgstr "Abfragen der Datei %s schlug fehl: %s"
 
-#: ../libnm-core/nm-utils.c:3131
+#: ../libnm-core/nm-utils.c:2955
 #, c-format
 msgid "not a file (%s)"
 msgstr "Keine Datei (%s)"
 
-#: ../libnm-core/nm-utils.c:3142
+#: ../libnm-core/nm-utils.c:2966
 #, c-format
 msgid "invalid file owner %d for %s"
 msgstr "Ungültiger Dateibesitzer %d für %s"
 
-#: ../libnm-core/nm-utils.c:3153
+#: ../libnm-core/nm-utils.c:2977
 #, c-format
 msgid "file permissions for %s"
 msgstr "Dateiberechtigungen für %s"
 
-#: ../libnm-core/nm-utils.c:3163
+#: ../libnm-core/nm-utils.c:2987
 #, c-format
 msgid "reject %s"
 msgstr "%s zurückweisen"
 
-#: ../libnm-core/nm-utils.c:3182
+#: ../libnm-core/nm-utils.c:3007
 #, c-format
 msgid "path is not absolute (%s)"
 msgstr "Der Pfad ist nicht absolut (%s)"
 
-#: ../libnm-core/nm-utils.c:3196
+#: ../libnm-core/nm-utils.c:3021
 #, c-format
 msgid "Plugin file does not exist (%s)"
 msgstr "Erweiterungs-Datei ist nicht vorhanden (%s)"
 
-#: ../libnm-core/nm-utils.c:3204
+#: ../libnm-core/nm-utils.c:3029
 #, c-format
 msgid "Plugin is not a valid file (%s)"
 msgstr "Erweiterung ist keine gültige Datei (%s)"
 
-#: ../libnm-core/nm-utils.c:3214
+#: ../libnm-core/nm-utils.c:3039
 #, c-format
 msgid "libtool archives are not supported (%s)"
 msgstr "libtool-Archive werden nicht unterstützt (%s)"
 
-#: ../libnm-core/nm-utils.c:3296 ../libnm-util/nm-utils.c:1794
+#: ../libnm-core/nm-utils.c:3121 ../libnm-util/nm-utils.c:1798
 #, c-format
 msgid "Could not find \"%s\" binary"
 msgstr "Binärdatei »%s« konnte nicht gefunden werden"
 
-#: ../libnm-core/nm-utils.c:4313
+#: ../libnm-core/nm-utils.c:4167
 #, c-format
 msgid "not a valid ethernet MAC address for mask at position %lld"
 msgstr "keine gültige Ethernet MAC-Adresse für die Maske an Position %lld"
 
-#: ../libnm-core/nm-utils.c:4328
+#: ../libnm-core/nm-utils.c:4182
 #, c-format
 msgid "not a valid ethernet MAC address #%u at position %lld"
 msgstr "Keine gültige Ethernet MAC-Adresse #%u an Position %lld"
 
-#: ../libnm-core/nm-utils.c:4364
+#: ../libnm-core/nm-utils.c:4218
 msgid "interface name is too short"
 msgstr "Schnittstellenname ist zu kurz"
 
-#: ../libnm-core/nm-utils.c:4373
+#: ../libnm-core/nm-utils.c:4227
 msgid "interface name is reserved"
 msgstr "Schnittstellenname ist reserviert"
 
-#: ../libnm-core/nm-utils.c:4385
+#: ../libnm-core/nm-utils.c:4239
 msgid "interface name contains an invalid character"
 msgstr "Schnittstellenname enthält ein ungültiges Zeichen"
 
-#: ../libnm-core/nm-utils.c:4391
+#: ../libnm-core/nm-utils.c:4245
 msgid "interface name is longer than 15 characters"
 msgstr "Schnittstellenname ist länger als 15 Zeichen"
 
-#: ../libnm-core/nm-utils.c:5037
-msgid "not valid utf-8"
-msgstr "kein gültiges UTF-8"
-
-#: ../libnm-core/nm-utils.c:5059 ../libnm-core/nm-utils.c:5527
-msgid "is not a JSON object"
-msgstr "kein JSON-Objekt"
-
-#: ../libnm-core/nm-utils.c:5503 ../libnm-core/nm-utils.c:5843
+#: ../libnm-core/nm-utils.c:5283 ../libnm-core/nm-utils.c:5626
 msgid "value is NULL"
 msgstr "Wert ist NULL"
 
-#: ../libnm-core/nm-utils.c:5503 ../libnm-core/nm-utils.c:5843
+#: ../libnm-core/nm-utils.c:5283 ../libnm-core/nm-utils.c:5626
 msgid "value is empty"
 msgstr "Wert ist leer"
 
-#: ../libnm-core/nm-utils.c:5515
+#: ../libnm-core/nm-utils.c:5292
 #, c-format
 msgid "invalid JSON at position %d (%s)"
 msgstr "Ungültiges JSON an Position %d (%s)"
 
-#: ../libnm-core/nm-utils.c:6160 ../libnm-core/nm-utils.c:6180
+#: ../libnm-core/nm-utils.c:5304 ../libnm-core/nm-utils.c:5645
+msgid "is not a JSON object"
+msgstr "kein JSON-Objekt"
+
+#: ../libnm-core/nm-utils.c:5615
+msgid "not valid utf-8"
+msgstr "kein gültiges UTF-8"
+
+#: ../libnm-core/nm-utils.c:5958 ../libnm-core/nm-utils.c:5978
 msgid "unterminated escape sequence"
-msgstr "Nicht abgeschlossene Escape-Sequenz"
+msgstr ""
 
-#: ../libnm-core/nm-utils.c:6205
+#: ../libnm-core/nm-utils.c:6003
 #, c-format
 msgid "unknown attribute '%s'"
 msgstr "Unbekanntes Attribut »%s«"
 
-#: ../libnm-core/nm-utils.c:6220
+#: ../libnm-core/nm-utils.c:6018
 #, c-format
 msgid "missing key-value separator '%c' after '%s'"
 msgstr ""
 
-#: ../libnm-core/nm-utils.c:6236
+#: ../libnm-core/nm-utils.c:6034
 #, c-format
 msgid "invalid uint32 value '%s' for attribute '%s'"
 msgstr "Ungültiger uint32-Wert »%s« für Attribut »%s«"
 
-#: ../libnm-core/nm-utils.c:6245
+#: ../libnm-core/nm-utils.c:6043
 #, c-format
 msgid "invalid uint8 value '%s' for attribute '%s'"
 msgstr "Ungültiger uint8-Wert »%s« für Attribut »%s«"
 
-#: ../libnm-core/nm-utils.c:6255
+#: ../libnm-core/nm-utils.c:6053
 #, c-format
 msgid "invalid boolean value '%s' for attribute '%s'"
 msgstr "Ungültiger boolescher Wert »%s« für Attribut »%s«"
 
-#: ../libnm-core/nm-utils.c:6265
+#: ../libnm-core/nm-utils.c:6063
 #, c-format
 msgid "unsupported attribute '%s' of type '%s'"
 msgstr "Nicht unterstützter Parameter »%s« des Typs »%s«"
@@ -11908,77 +11235,77 @@ msgstr ""
 "Es existiert bereits eine im Konflikt stehende Erweiterung mit dem gleichen "
 "Namen (%s)"
 
-#: ../libnm-core/nm-vpn-plugin-info.c:1070
+#: ../libnm-core/nm-vpn-plugin-info.c:1071
 #, c-format
 msgid "missing \"plugin\" setting"
 msgstr "Einstellung »Erweiterung« fehlt"
 
-#: ../libnm-core/nm-vpn-plugin-info.c:1080
+#: ../libnm-core/nm-vpn-plugin-info.c:1081
 #, c-format
 msgid "%s: don't retry loading plugin which already failed previously"
 msgstr ""
 "%s: Erneutes Laden des Plugins nicht versuchen, welches zuvor fehlschlug"
 
-#: ../libnm-core/nm-vpn-plugin-info.c:1174
+#: ../libnm-core/nm-vpn-plugin-info.c:1175
 msgid "missing filename to load VPN plugin info"
 msgstr "Fehlender Dateiname zum Laden der Information über VPN-Erweiterung"
 
-#: ../libnm-core/nm-vpn-plugin-info.c:1186
+#: ../libnm-core/nm-vpn-plugin-info.c:1187
 msgid "missing name for VPN plugin info"
 msgstr "Fehlender Name für die Information über VPN-Erweiterung"
 
-#: ../libnm-core/nm-vpn-plugin-info.c:1195
+#: ../libnm-core/nm-vpn-plugin-info.c:1196
 msgid "missing service for VPN plugin info"
 msgstr "Fehlender Dienst für die Information über VPN-Erweiterung"
 
-#: ../libnm-glib/nm-device.c:1824 ../libnm/nm-device.c:1310
+#: ../libnm-glib/nm-device.c:1825 ../libnm/nm-device.c:1525
 msgid "Bluetooth"
 msgstr "Bluetooth"
 
-#: ../libnm-glib/nm-device.c:1826 ../libnm/nm-device.c:1312
+#: ../libnm-glib/nm-device.c:1827 ../libnm/nm-device.c:1527
 msgid "OLPC Mesh"
 msgstr "OLPC-Mesh"
 
-#: ../libnm-glib/nm-device.c:1828 ../libnm/nm-device.c:1320
+#: ../libnm-glib/nm-device.c:1829 ../libnm/nm-device.c:1535
 msgid "WiMAX"
 msgstr "WiMAX"
 
-#: ../libnm-glib/nm-device.c:1842 ../libnm/nm-device.c:1334
+#: ../libnm-glib/nm-device.c:1843 ../libnm/nm-device.c:1549
 msgid "ADSL"
 msgstr "ADSL"
 
-#: ../libnm-glib/nm-device.c:1844 ../libnm/nm-device.c:1336
+#: ../libnm-glib/nm-device.c:1845 ../libnm/nm-device.c:1551
 msgid "MACVLAN"
 msgstr "MACVLAN"
 
 # virtuelles LAN, z.B. in virtualisierten Umgebungen
-#: ../libnm-glib/nm-device.c:1846 ../libnm/nm-device.c:1338
+#: ../libnm-glib/nm-device.c:1847 ../libnm/nm-device.c:1553
 msgid "VXLAN"
 msgstr "VXLAN"
 
-#: ../libnm-glib/nm-device.c:1848 ../libnm/nm-device.c:1340
+#: ../libnm-glib/nm-device.c:1849 ../libnm/nm-device.c:1555
 msgid "IPTunnel"
 msgstr "IP-Tunnel"
 
-#: ../libnm-glib/nm-device.c:1850 ../libnm/nm-device.c:1342
+#: ../libnm-glib/nm-device.c:1851 ../libnm/nm-device.c:1557
 msgid "Tun"
 msgstr "Tun"
 
 # Hier stimmt was nicht.
-# Steht das evtl für "virtuelles Ethernet"? k.a.
-#: ../libnm-glib/nm-device.c:1852 ../libnm/nm-device.c:1344
+#: ../libnm-glib/nm-device.c:1853 ../libnm/nm-device.c:1559
+#, fuzzy
 msgid "Veth"
-msgstr "Veth"
+msgstr "IP-over-InfiniBand"
 
-#: ../libnm-glib/nm-device.c:1884 ../libnm/nm-device.c:1388
+#: ../libnm-glib/nm-device.c:1885 ../libnm/nm-device.c:1597
 msgid "Wired"
 msgstr "Kabelgebunden"
 
-#: ../libnm-glib/nm-device.c:1915 ../libnm/nm-device.c:1419
+#: ../libnm-glib/nm-device.c:1916 ../libnm/nm-device.c:1628
 msgid "PCI"
 msgstr "PCI"
 
-#: ../libnm-glib/nm-device.c:1917 ../libnm/nm-device.c:1421
+#: ../libnm-glib/nm-device.c:1918 ../libnm/nm-device.c:1630
 msgid "USB"
 msgstr "USB"
 
@@ -11988,14 +11315,14 @@ msgstr "USB"
 #. * "%2$s (%1$s)" if there's no grammatical way to combine
 #. * the strings otherwise.
 #.
-#: ../libnm-glib/nm-device.c:2014 ../libnm-glib/nm-device.c:2033
-#: ../libnm/nm-device.c:1734 ../libnm/nm-device.c:1753
+#: ../libnm-glib/nm-device.c:2015 ../libnm-glib/nm-device.c:2034
+#: ../libnm/nm-device.c:1725 ../libnm/nm-device.c:1744
 #, c-format
 msgctxt "long device name"
 msgid "%s %s"
 msgstr "%s %s"
 
-#: ../libnm-glib/nm-remote-connection.c:148
+#: ../libnm-glib/nm-remote-connection.c:149
 msgid "Disconnected by D-Bus"
 msgstr "Durch D-Bus getrennt"
 
@@ -12019,23 +11346,23 @@ msgstr "Die Initialisierung des MD5-Kontexts scheiterte: %d."
 msgid "Couldn't convert password to UCS2: %d"
 msgstr "Das Passwort konnte nicht zu UCS2 konvertiert werden: %d"
 
-#: ../libnm-util/nm-setting-bluetooth.c:185
+#: ../libnm-util/nm-setting-bluetooth.c:186
 #, c-format
 msgid "requires '%s' or '%s' setting"
 msgstr "Erfordert die Einstellung »%s« oder »%s«"
 
-#: ../libnm-util/nm-setting-bond.c:581
+#: ../libnm-util/nm-setting-bond.c:582
 #, c-format
 msgid "'%s' is not a valid interface name for '%s' option"
 msgstr "»%s« ist kein gültiger Schnittstellenname für die Option »%s«"
 
-#: ../libnm-util/nm-setting-connection.c:831
+#: ../libnm-util/nm-setting-connection.c:834
 #: ../libnm-util/nm-setting-infiniband.c:269
 #, c-format
 msgid "'%s' is not a valid interface name"
 msgstr "»%s« ist kein gültiger Schnittstellenname"
 
-#: ../libnm-util/nm-setting-connection.c:859
+#: ../libnm-util/nm-setting-connection.c:862
 #, c-format
 msgid "requires presence of '%s' setting in the connection"
 msgstr "erfordert das Vorhandensein der Einstellung »%s« in der Verbindung"
@@ -12055,37 +11382,37 @@ msgid "%d. IPv4 address has invalid prefix"
 msgstr "%d. IPv4-Adresse hat ein ungültiges Präfix"
 
 #: ../libnm-util/nm-setting-ip4-config.c:983
-#: ../libnm-util/nm-setting-ip6-config.c:937
+#: ../libnm-util/nm-setting-ip6-config.c:939
 #, c-format
 msgid "%d. route has invalid prefix"
 msgstr "%d. Pfadwahl hat ein ungültiges Präfix"
 
-#: ../libnm-util/nm-setting-ip6-config.c:911
+#: ../libnm-util/nm-setting-ip6-config.c:913
 #, c-format
 msgid "%d. IPv6 address is invalid"
 msgstr "%d. IPv6-Adresse ist ungültig"
 
-#: ../libnm-util/nm-setting-ip6-config.c:921
+#: ../libnm-util/nm-setting-ip6-config.c:923
 #, c-format
 msgid "%d. IPv6 address has invalid prefix"
 msgstr "%d. IPv6-Adresse hat ein ungültiges Präfix"
 
-#: ../libnm-util/nm-setting-vpn.c:581
+#: ../libnm-util/nm-setting-vpn.c:582
 #, c-format
 msgid "Failed to convert '%s' value '%s' to uint"
 msgstr "Umwandeln des  »%s«-Wertes »%s« nach uint ist fehlgeschlagen"
 
-#: ../libnm-util/nm-setting-vpn.c:588
+#: ../libnm-util/nm-setting-vpn.c:589
 #, c-format
 msgid "Secret flags property '%s' not found"
 msgstr ""
 
-#: ../libnm-util/nm-setting-wireless.c:806
+#: ../libnm-util/nm-setting-wireless.c:807
 #, c-format
 msgid "requires setting '%s' property"
 msgstr "erfordert eine Festlegung der Eigenschaft »%s«"
 
-#: ../libnm/nm-device-adsl.c:72
+#: ../libnm/nm-device-adsl.c:73
 msgid "The connection was not an ADSL connection."
 msgstr "Die Verbindung war keine ADSL-Verbindung."
 
@@ -12124,12 +11451,13 @@ msgstr ""
 "sind."
 
 #: ../libnm/nm-device-dummy.c:76
+#, fuzzy
 msgid "The connection was not a dummy connection."
-msgstr "Die Verbindung war keine Platzhalter-Verbindung."
+msgstr "Die Verbindung war keine Modem-Verbindung."
 
 #: ../libnm/nm-device-dummy.c:83 ../libnm/nm-device-generic.c:97
-#: ../libnm/nm-device-ovs-bridge.c:97 ../libnm/nm-device-ovs-interface.c:68
-#: ../libnm/nm-device-ovs-port.c:96
+#: ../libnm/nm-device-ovs-bridge.c:68 ../libnm/nm-device-ovs-interface.c:68
+#: ../libnm/nm-device-ovs-port.c:67
 msgid "The connection did not specify an interface name."
 msgstr "Die Verbindung definierte keinen Schnittstellennamen."
 
@@ -12176,21 +11504,21 @@ msgstr "Der Gerätemodus und die Verbindung passen nicht zusammen"
 msgid "The connection was not an InfiniBand connection."
 msgstr "Die Verbindung war keine InfiniBand-Verbindung."
 
-#: ../libnm/nm-device-infiniband.c:101 ../libnm/nm-device-wifi.c:625
+#: ../libnm/nm-device-infiniband.c:101 ../libnm/nm-device-wifi.c:599
 #: ../libnm/nm-device-wimax.c:324
 msgid "Invalid device MAC address."
 msgstr "Ungültige MAC-Adresse des Geräts."
 
-#: ../libnm/nm-device-infiniband.c:109 ../libnm/nm-device-wifi.c:632
+#: ../libnm/nm-device-infiniband.c:109 ../libnm/nm-device-wifi.c:606
 #: ../libnm/nm-device-wimax.c:331
 msgid "The MACs of the device and the connection didn't match."
 msgstr "Die MAC-Adressen des Geräts und der Verbindung stimmen nicht überein."
 
-#: ../libnm/nm-device-ip-tunnel.c:271
+#: ../libnm/nm-device-ip-tunnel.c:253
 msgid "The connection was not an IP tunnel connection."
 msgstr "Die Verbindung war keine IP-Tunnel-Verbindung."
 
-#: ../libnm/nm-device-macvlan.c:157
+#: ../libnm/nm-device-macvlan.c:158
 msgid "The connection was not a MAC-VLAN connection."
 msgstr "Die Verbindung war keine MAC-VLAN-Verbindung."
 
@@ -12210,17 +11538,17 @@ msgstr "Dem Gerät fehlen Fähigkeiten, die für die Verbindung notwendig sind."
 msgid "The connection was not an OLPC Mesh connection."
 msgstr "Die Verbindung war keine »OLPC Mesh«-Verbindung."
 
-#: ../libnm/nm-device-ovs-bridge.c:90
+#: ../libnm/nm-device-ovs-bridge.c:61
 msgid "The connection was not a ovs_bridge connection."
-msgstr "Die Verbindung war keine »ovs_bridge« Brückenverbindung."
+msgstr ""
 
 #: ../libnm/nm-device-ovs-interface.c:61
 msgid "The connection was not a ovs_interface connection."
-msgstr "Die Verbindung war keine »ovs_interface« Brückenverbindung."
+msgstr ""
 
-#: ../libnm/nm-device-ovs-port.c:89
+#: ../libnm/nm-device-ovs-port.c:60
 msgid "The connection was not a ovs_port connection."
-msgstr "Die Verbindung war keine »ovs_port« Brückenverbindung."
+msgstr ""
 
 #: ../libnm/nm-device-team.c:138
 msgid "The connection was not a team connection."
@@ -12249,16 +11577,16 @@ msgid "The VXLAN identifiers of the device and the connection didn't match."
 msgstr ""
 "Die VXLAN-Bezeichner des Geräts und der Verbindung stimmen nicht überein."
 
-#: ../libnm/nm-device-wifi.c:616
+#: ../libnm/nm-device-wifi.c:590
 msgid "The connection was not a Wi-Fi connection."
 msgstr "Die Verbindung war keine WLAN-Verbindung."
 
-#: ../libnm/nm-device-wifi.c:652
+#: ../libnm/nm-device-wifi.c:626
 msgid "The device is lacking WPA capabilities required by the connection."
 msgstr ""
 "Dem Gerät fehlen WPA-Fähigkeiten, die für die Verbindung notwendig sind."
 
-#: ../libnm/nm-device-wifi.c:659
+#: ../libnm/nm-device-wifi.c:633
 msgid "The device is lacking WPA2/RSN capabilities required by the connection."
 msgstr ""
 "Dem Gerät fehlen WPA2/RSN-Fähigkeiten, die für die Verbindung notwendig sind."
@@ -12267,61 +11595,36 @@ msgstr ""
 msgid "The connection was not a WiMAX connection."
 msgstr "Die Verbindung war keine WiMAX-Verbindung."
 
-#: ../libnm/nm-device-wpan.c:82
-msgid "The connection was not a wpan connection."
-msgstr "Die Verbindung war keine wpan-Verbindung."
-
-# "öffnen" oder "offen" ?
-#: ../libnm/nm-device.c:1314
-#, fuzzy
-#| msgid "OpenVSwitch Interface"
-msgid "Open vSwitch Interface"
-msgstr "OpenVSwitch-Schnittstelle"
+#: ../libnm/nm-device.c:1529
+msgid "OpenVSwitch Interface"
+msgstr ""
 
-#: ../libnm/nm-device.c:1316
-#, fuzzy
-#| msgid "OpenVSwitch Port"
-msgid "Open vSwitch Port"
-msgstr "OpenVSwitch-Port"
+#: ../libnm/nm-device.c:1531
+msgid "OpenVSwitch Port"
+msgstr ""
 
-#: ../libnm/nm-device.c:1318
-#, fuzzy
-#| msgid "OpenVSwitch Bridge"
-msgid "Open vSwitch Bridge"
-msgstr "OpenVSwitch-Brücke"
+#: ../libnm/nm-device.c:1533
+msgid "OpenVSwitch Bridge"
+msgstr ""
 
-#: ../libnm/nm-device.c:1346
+#: ../libnm/nm-device.c:1561
 msgid "MACsec"
 msgstr "MACsec"
 
-#: ../libnm/nm-device.c:1348
+#: ../libnm/nm-device.c:1563
 msgid "Dummy"
 msgstr "Platzhalter"
 
-#: ../libnm/nm-device.c:1350
+#: ../libnm/nm-device.c:1565
 msgid "PPP"
 msgstr "PPP"
 
-#: ../libnm/nm-device.c:1352
-msgid "IEEE 802.15.4"
-msgstr "IEEE 802.15.4"
-
-#: ../libnm/nm-device.c:1354
-msgid "6LoWPAN"
-msgstr ""
-
-#: ../libnm/nm-device.c:1356
-#, fuzzy
-#| msgid "Wired"
-msgid "WireGuard"
-msgstr "Kabelgebunden"
-
-#: ../libnm/nm-device.c:2475
+#: ../libnm/nm-device.c:2456
 #, c-format
 msgid "The connection was not valid: %s"
 msgstr "Die Verbindung war ungültig: %s"
 
-#: ../libnm/nm-device.c:2484
+#: ../libnm/nm-device.c:2465
 #, c-format
 msgid "The interface names of the device and the connection didn't match."
 msgstr ""
@@ -12332,7 +11635,7 @@ msgstr ""
 msgid "Checkpoint was removed before it was initialized"
 msgstr "Die Verbindung wurde entfernt, bevor sie initialisiert wurde"
 
-#: ../libnm/nm-manager.c:955
+#: ../libnm/nm-manager.c:941
 msgid "Active connection removed before it was initialized"
 msgstr "Die aktive Verbindung wurde entfernt, bevor sie initialisiert wurde"
 
@@ -12340,7 +11643,7 @@ msgstr "Die aktive Verbindung wurde entfernt, bevor sie initialisiert wurde"
 msgid "Connection removed before it was initialized"
 msgstr "Die Verbindung wurde entfernt, bevor sie initialisiert wurde"
 
-#: ../libnm/nm-vpn-plugin-old.c:847 ../libnm/nm-vpn-service-plugin.c:1012
+#: ../libnm/nm-vpn-plugin-old.c:840 ../libnm/nm-vpn-service-plugin.c:957
 msgid "No service name specified"
 msgstr "Es wurde kein Dienstname angegeben"
 
@@ -12510,17 +11813,17 @@ msgstr ""
 "Die Systemrichtlinien verhindern die Aktivierung oder Deaktivierung der "
 "Verbindungsprüfung"
 
-#: ../shared/nm-utils/nm-shared-utils.c:962
+#: ../shared/nm-utils/nm-shared-utils.c:794
 #, c-format
 msgid "object class '%s' has no property named '%s'"
 msgstr "Objektklasse »%s« hat keine Eigenschaft namens »%s«"
 
-#: ../shared/nm-utils/nm-shared-utils.c:969
+#: ../shared/nm-utils/nm-shared-utils.c:801
 #, c-format
 msgid "property '%s' of object class '%s' is not writable"
 msgstr " Eigenschaft »%s« von Objektklasse »%s« ist nicht schreibbar"
 
-#: ../shared/nm-utils/nm-shared-utils.c:976
+#: ../shared/nm-utils/nm-shared-utils.c:808
 #, c-format
 msgid ""
 "construct property \"%s\" for object '%s' can't be set after construction"
@@ -12528,20 +11831,20 @@ msgstr ""
 "Konstruktor-Eigenschaft »%s« für Objekt »%s« kann nicht nach der "
 "Konstruktion gesetzt werden"
 
-#: ../shared/nm-utils/nm-shared-utils.c:984
+#: ../shared/nm-utils/nm-shared-utils.c:816
 #, c-format
 msgid "'%s::%s' is not a valid property name; '%s' is not a GObject subtype"
 msgstr ""
 "»%s::%s« ist ein ungültiger Eigenschaftsname. »%s« ist kein GObject-Untertyp"
 
-#: ../shared/nm-utils/nm-shared-utils.c:993
+#: ../shared/nm-utils/nm-shared-utils.c:825
 #, c-format
 msgid "unable to set property '%s' of type '%s' from value of type '%s'"
 msgstr ""
 "Eigenschaft »%s« des Typs »%s« von Wert des Typs »%s« kann nicht gesetzt "
 "werden"
 
-#: ../shared/nm-utils/nm-shared-utils.c:1004
+#: ../shared/nm-utils/nm-shared-utils.c:836
 #, c-format
 msgid ""
 "value \"%s\" of type '%s' is invalid or out of range for property '%s' of "
@@ -12554,51 +11857,51 @@ msgstr ""
 #. * as "Wired Connection" or "VPN Connection". The %d is a number
 #. * that is combined with the first argument to create a unique
 #. * connection id.
-#: ../src/NetworkManagerUtils.c:119
+#: ../src/NetworkManagerUtils.c:112
 #, c-format
 msgctxt "connection id fallback"
-msgid "%s %u"
-msgstr "%s %u"
+msgid "%s %d"
+msgstr "%s %d"
 
-#: ../src/main.c:180 ../src/main.c:314
+#: ../src/main.c:179 ../src/main.c:318
 #, c-format
 msgid "Failed to read configuration: %s\n"
 msgstr "Lesen der Konfiguration ist fehlgeschlagen: %s\n"
 
 #. Logging/debugging
-#: ../src/main.c:194 ../src/nm-iface-helper.c:297
+#: ../src/main.c:193 ../src/nm-iface-helper.c:292
 msgid "Print NetworkManager version and exit"
 msgstr "NetworkManager-Version anzeigen und beenden"
 
-#: ../src/main.c:195 ../src/nm-iface-helper.c:298
+#: ../src/main.c:194 ../src/nm-iface-helper.c:293
 msgid "Don't become a daemon"
 msgstr "Nicht zum Hintergrunddienst werden"
 
-#: ../src/main.c:196 ../src/nm-iface-helper.c:300
+#: ../src/main.c:195 ../src/nm-iface-helper.c:295
 #, c-format
 msgid "Log level: one of [%s]"
 msgstr "Protokollierungsstufe: Eine von [%s]"
 
-#: ../src/main.c:198 ../src/nm-iface-helper.c:302
+#: ../src/main.c:197 ../src/nm-iface-helper.c:297
 #, c-format
 msgid "Log domains separated by ',': any combination of [%s]"
 msgstr ""
 "Protokoll-Domänen, durch Kommata getrennt. Eine beliebige Kombination von "
 "[%s]"
 
-#: ../src/main.c:200 ../src/nm-iface-helper.c:304
+#: ../src/main.c:199 ../src/nm-iface-helper.c:299
 msgid "Make all warnings fatal"
 msgstr "Alle Warnungen als fatal betrachten"
 
-#: ../src/main.c:201
+#: ../src/main.c:200
 msgid "Specify the location of a PID file"
 msgstr "Geben Sie den Ort der PID-Datei an"
 
-#: ../src/main.c:203
+#: ../src/main.c:202
 msgid "Print NetworkManager configuration and exit"
 msgstr "NetworkManager-Konfiguration ausgeben und beenden"
 
-#: ../src/main.c:213
+#: ../src/main.c:212
 msgid ""
 "NetworkManager monitors all network connections and automatically\n"
 "chooses the best connection to use.  It also allows the user to\n"
@@ -12611,14 +11914,32 @@ msgstr ""
 "dem Anwender diejenigen Drahtlos-Zugangspunkte anzugeben, mit welchen sich\n"
 "die Drahtlos-Netzwerkkarten des Rechners verbinden sollen."
 
-#: ../src/main.c:304 ../src/main-utils.c:286 ../src/nm-iface-helper.c:442
+#: ../src/main.c:303 ../src/main-utils.c:286 ../src/nm-iface-helper.c:398
 #, c-format
 msgid "%s.  Please use --help to see a list of valid options.\n"
 msgstr ""
 "%s.  Verwenden Sie --help, um eine Liste der verfügbaren Optionen zu "
 "erhalten.\n"
 
-#: ../src/main.c:339 ../src/nm-iface-helper.c:457
+#: ../src/main.c:308 ../src/nm-iface-helper.c:403
+#, c-format
+msgid "Ignoring unrecognized log domain(s) '%s' passed on command line.\n"
+msgstr ""
+"Unbekannte Protokolldomäne(n) »%s« wurden über die Befehlszeile erhalten.\n"
+
+#: ../src/main.c:333
+#, c-format
+msgid "Error in configuration file: %s.\n"
+msgstr "Fehler in Konfigurationsdatei: %s.\n"
+
+#: ../src/main.c:338
+#, c-format
+msgid "Ignoring unrecognized log domain(s) '%s' from config files.\n"
+msgstr ""
+"Unbekannte Protokolldomäne(n) »%s« aus den Konfigurationsdateien werden "
+"ignoriert.\n"
+
+#: ../src/main.c:349 ../src/nm-iface-helper.c:413
 #, c-format
 msgid "Could not daemonize: %s [error %u]\n"
 msgstr "Hintergrunddienst nicht möglich: %s [error %u]\n"
@@ -12653,11 +11974,11 @@ msgstr "%s läuft bereits (pid %ld)\n"
 msgid "You must be root to run %s!\n"
 msgstr "Sie müssen als root angemeldet sein, um %s auszuführen.\n"
 
-#: ../src/dhcp/nm-dhcp-dhclient-utils.c:313
+#: ../src/dhcp/nm-dhcp-dhclient-utils.c:280
 msgid "# Created by NetworkManager\n"
 msgstr "# Erstellt von NetworkManager\n"
 
-#: ../src/dhcp/nm-dhcp-dhclient-utils.c:324
+#: ../src/dhcp/nm-dhcp-dhclient-utils.c:290
 #, c-format
 msgid ""
 "# Merged from %s\n"
@@ -12671,70 +11992,66 @@ msgstr ""
 msgid "%s Network"
 msgstr "%s-Netzwerk"
 
-#: ../src/devices/bluetooth/nm-device-bt.c:269
+#: ../src/devices/bluetooth/nm-device-bt.c:264
 msgid "PAN requested, but Bluetooth device does not support NAP"
 msgstr "PAN wurde angefordert, aber das Bluetooth-Gerät unterstützt kein NAP"
 
-#: ../src/devices/bluetooth/nm-device-bt.c:279
+#: ../src/devices/bluetooth/nm-device-bt.c:274
 msgid "PAN connections cannot specify GSM, CDMA, or serial settings"
 msgstr ""
 "Für PAN-Verbindungen können keine GSM-, CDMA- oder seriellen Einstellungen "
 "angegeben werden"
 
-#: ../src/devices/bluetooth/nm-device-bt.c:292
+#: ../src/devices/bluetooth/nm-device-bt.c:287
 msgid "PAN connection"
 msgstr "PAN-Verbindung"
 
-#: ../src/devices/bluetooth/nm-device-bt.c:299
+#: ../src/devices/bluetooth/nm-device-bt.c:294
 msgid "DUN requested, but Bluetooth device does not support DUN"
 msgstr "DUN wurde angefordert, aber das Bluetooth-Gerät unterstützt kein DUN"
 
-#: ../src/devices/bluetooth/nm-device-bt.c:309
+#: ../src/devices/bluetooth/nm-device-bt.c:304
 msgid "DUN connection must include a GSM or CDMA setting"
 msgstr "Die DUN-Verbindung muss eine GSM- oder CDMA-Einstellung enthalten"
 
-#: ../src/devices/bluetooth/nm-device-bt.c:319
-#: ../src/devices/wwan/nm-modem-broadband.c:705
+#: ../src/devices/bluetooth/nm-device-bt.c:314
+#: ../src/devices/wwan/nm-modem-broadband.c:709
 msgid "GSM connection"
 msgstr "GSM-Verbindung"
 
-#: ../src/devices/bluetooth/nm-device-bt.c:323
-#: ../src/devices/wwan/nm-modem-broadband.c:729
+#: ../src/devices/bluetooth/nm-device-bt.c:318
+#: ../src/devices/wwan/nm-modem-broadband.c:733
 msgid "CDMA connection"
 msgstr "CDMA-Verbindung"
 
-#: ../src/devices/bluetooth/nm-device-bt.c:331
+#: ../src/devices/bluetooth/nm-device-bt.c:326
 msgid "Unknown/unhandled Bluetooth connection type"
 msgstr "Unbekannter Bluetooth-Verbindungstyp"
 
-#: ../src/devices/bluetooth/nm-device-bt.c:352
-#: ../src/devices/nm-device-ethernet.c:1426
-#: ../src/devices/nm-device-infiniband.c:188
-#: ../src/devices/wifi/nm-device-wifi.c:922
+#: ../src/devices/bluetooth/nm-device-bt.c:347
+#: ../src/devices/nm-device-ethernet.c:1408
+#: ../src/devices/nm-device-infiniband.c:210
+#: ../src/devices/wifi/nm-device-wifi.c:952
 msgid "connection does not match device"
 msgstr "Die Verbindung passt nicht zum Gerät"
 
-#: ../src/devices/nm-device-6lowpan.c:191
-msgid "6LOWPAN connection"
-msgstr "6LOWPAN-Verbindung"
-
-#: ../src/devices/nm-device-bond.c:72
+#: ../src/devices/nm-device-bond.c:91
 msgid "Bond connection"
 msgstr "Bündel-Verbindung"
 
-#: ../src/devices/nm-device-bridge.c:153
+#: ../src/devices/nm-device-bridge.c:130
 msgid "Bridge connection"
 msgstr "Brückenverbindung"
 
-#: ../src/devices/nm-device-dummy.c:68
+#: ../src/devices/nm-device-dummy.c:70
 msgid "Dummy connection"
 msgstr "Platzhalter-Verbindung"
 
-#: ../src/devices/nm-device-ethernet.c:1407
+#: ../src/devices/nm-device-ethernet.c:1389
 msgid "PPPoE connection"
 msgstr "PPPoE-Verbindung"
 
-#: ../src/devices/nm-device-ethernet.c:1407
+#: ../src/devices/nm-device-ethernet.c:1389
 msgid "Wired connection"
 msgstr "Kabelgebundene Verbindung"
 
@@ -12743,31 +12060,27 @@ msgstr "Kabelgebundene Verbindung"
 msgid "Wired connection %d"
 msgstr "Kabelgebundene Verbindung %d"
 
-#: ../src/devices/nm-device-ip-tunnel.c:418
+#: ../src/devices/nm-device-ip-tunnel.c:340
 msgid "IP tunnel connection"
 msgstr "IP-Tunnel-Verbindung"
 
-#: ../src/devices/nm-device-macvlan.c:365
+#: ../src/devices/nm-device-macvlan.c:344
 msgid "MACVLAN connection"
 msgstr "MACVLAN-Verbindung"
 
-#: ../src/devices/nm-device-tun.c:158
+#: ../src/devices/nm-device-tun.c:146
 msgid "TUN connection"
 msgstr "TUN-Verbindung"
 
-#: ../src/devices/nm-device-wpan.c:68
-msgid "WPAN connection"
-msgstr "WPAN-Verbindung"
-
-#: ../src/devices/team/nm-device-team.c:101
+#: ../src/devices/team/nm-device-team.c:119
 msgid "Team connection"
 msgstr "Netzwerk-Team"
 
-#: ../src/devices/wifi/nm-device-olpc-mesh.c:125
+#: ../src/devices/wifi/nm-device-olpc-mesh.c:152
 msgid "Mesh"
 msgstr "Maschennetz"
 
-#: ../src/devices/wifi/nm-device-wifi.c:889
+#: ../src/devices/wifi/nm-device-wifi.c:919
 msgid "WPA Ad-Hoc disabled due to kernel bugs"
 msgstr "Ad-Hoc WPA ist wegen kernel-Fehlern ausgeschaltet"
 
@@ -12939,140 +12252,140 @@ msgstr ""
 msgid "Failed to determine AP security information"
 msgstr "Das Ermitteln der AP-Sicherheitsinformationen scheiterte"
 
-#: ../src/devices/wwan/nm-modem-broadband.c:691
+#: ../src/devices/wwan/nm-modem-broadband.c:695
 msgid "GSM mobile broadband connection requires a 'gsm' setting"
 msgstr "Mobile GSM-Breitband-Verbindung erfordert die Einstellung »gsm«"
 
-#: ../src/nm-config.c:521
+#: ../src/nm-config.c:486
 msgid "Config file location"
 msgstr "Speicherort der Konfigurationsdatei"
 
-#: ../src/nm-config.c:522
+#: ../src/nm-config.c:487
 msgid "Config directory location"
 msgstr "Speicherort des Konfigurationsordners"
 
-#: ../src/nm-config.c:523
+#: ../src/nm-config.c:488
 msgid "System config directory location"
 msgstr "Speicherort des System-Konfigurationsordners"
 
-#: ../src/nm-config.c:524
+#: ../src/nm-config.c:489
 msgid "Internal config file location"
 msgstr "Speicherort der internen Konfigurationsdatei"
 
-#: ../src/nm-config.c:525
+#: ../src/nm-config.c:490
 msgid "State file location"
 msgstr "Speicherort der Statusdatei"
 
-#: ../src/nm-config.c:526
+#: ../src/nm-config.c:491
 msgid "State file for no-auto-default devices"
 msgstr ""
 "Statusdatei für Geräte, die nicht automatisch als Standard gesetzt werden"
 
-#: ../src/nm-config.c:527
+#: ../src/nm-config.c:492
 msgid "List of plugins separated by ','"
 msgstr "Mit »,« getrennte Liste von Erweiterungen"
 
-#: ../src/nm-config.c:528
+#: ../src/nm-config.c:493
 msgid "Quit after initial configuration"
 msgstr "Nach Erstkonfiguration beenden"
 
-#: ../src/nm-config.c:529 ../src/nm-iface-helper.c:299
+#: ../src/nm-config.c:494 ../src/nm-iface-helper.c:294
 msgid "Don't become a daemon, and log to stderr"
 msgstr "Nicht zum Hintergrunddienst werden und auf stderr protokollieren"
 
 #. These three are hidden for now, and should eventually just go away.
-#: ../src/nm-config.c:532
+#: ../src/nm-config.c:497
 msgid "An http(s) address for checking internet connectivity"
 msgstr "Eine http(s)-Adresse zum Prüfen der Internetverbindung"
 
-#: ../src/nm-config.c:533
+#: ../src/nm-config.c:498
 msgid "The interval between connectivity checks (in seconds)"
 msgstr "Das Intervall zwischen Verbindungsprüfungen (in Sekunden)"
 
-#: ../src/nm-config.c:534
+#: ../src/nm-config.c:499
 msgid "The expected start of the response"
 msgstr "Der erwartete Start einer Antwort"
 
 #. Interface/IP config
-#: ../src/nm-iface-helper.c:279
+#: ../src/nm-iface-helper.c:274
 msgid "The interface to manage"
 msgstr "Die zu verwaltende Schnittstelle"
 
-#: ../src/nm-iface-helper.c:280
+#: ../src/nm-iface-helper.c:275
 msgid "Connection UUID"
 msgstr "Verbindungs-UUID"
 
-#: ../src/nm-iface-helper.c:281
+#: ../src/nm-iface-helper.c:276
 msgid "Connection Token for Stable IDs"
 msgstr "Verbindungs-Token für stabile Kennungen"
 
-#: ../src/nm-iface-helper.c:282
+#: ../src/nm-iface-helper.c:277
 msgid "Whether to manage IPv6 SLAAC"
 msgstr "Legt fest, ob IPv6 SLAAC verwaltet werden soll"
 
-#: ../src/nm-iface-helper.c:283
+#: ../src/nm-iface-helper.c:278
 msgid "Whether SLAAC must be successful"
 msgstr "Legt fest, ob SLAAC erfolgreich abschließen muss"
 
-#: ../src/nm-iface-helper.c:284
+#: ../src/nm-iface-helper.c:279
 msgid "Use an IPv6 temporary privacy address"
 msgstr "Eine temporäre private IPv6-Adresse verwenden"
 
-#: ../src/nm-iface-helper.c:285
+#: ../src/nm-iface-helper.c:280
 msgid "Current DHCPv4 address"
 msgstr "Aktuelle DHCPv4-Adresse"
 
-#: ../src/nm-iface-helper.c:286
+#: ../src/nm-iface-helper.c:281
 msgid "Whether DHCPv4 must be successful"
 msgstr "Legt fest, ob DHCPv4 erfolgreich abschließen muss"
 
-#: ../src/nm-iface-helper.c:287
+#: ../src/nm-iface-helper.c:282
 msgid "Hex-encoded DHCPv4 client ID"
 msgstr "Hexadezimal angegebene DHCPv4 Client-Kennung"
 
-#: ../src/nm-iface-helper.c:288
+#: ../src/nm-iface-helper.c:283
 msgid "Hostname to send to DHCP server"
 msgstr "Rechnername, der an den DHCP-Server gesendet wird"
 
-# Was soll das sein?
-#: ../src/nm-iface-helper.c:288
+#: ../src/nm-iface-helper.c:283
+#, fuzzy
 msgid "barbar"
-msgstr "barbar"
+msgstr "IP-over-InfiniBand"
 
-#: ../src/nm-iface-helper.c:289
+#: ../src/nm-iface-helper.c:284
 msgid "FQDN to send to DHCP server"
 msgstr "FQDN (Rechnername), der an den DHCP-Server gesendet wird"
 
-#: ../src/nm-iface-helper.c:289
+#: ../src/nm-iface-helper.c:284
 msgid "host.domain.org"
 msgstr "Rechner.domain.org"
 
-#: ../src/nm-iface-helper.c:290
+#: ../src/nm-iface-helper.c:285
 msgid "Route priority for IPv4"
 msgstr "Routen-Priorität für IPv4"
 
-#: ../src/nm-iface-helper.c:290
+#: ../src/nm-iface-helper.c:285
 msgid "0"
 msgstr "0"
 
-#: ../src/nm-iface-helper.c:291
+#: ../src/nm-iface-helper.c:286
 msgid "Route priority for IPv6"
 msgstr "Routen-Priorität für IPv6"
 
-#: ../src/nm-iface-helper.c:291
+#: ../src/nm-iface-helper.c:286
 msgid "1024"
 msgstr "1024"
 
-#: ../src/nm-iface-helper.c:292
+#: ../src/nm-iface-helper.c:287
 msgid "Hex-encoded Interface Identifier"
 msgstr "Hexadezimaler Bezeichner der Schnittstelle"
 
 # Mittels Stateless Address Autoconfiguration (SLAAC, zustandslose Adressenautokonfiguration, spezifiziert in RFC 4862) kann ein Host vollautomatisch eine funktionsfähige Internetverbindung aufbauen. Dazu kommuniziert er mit den für sein Netzwerksegment zuständigen Routern, um die notwendige Konfiguration zu ermitteln.
-#: ../src/nm-iface-helper.c:293
+#: ../src/nm-iface-helper.c:288
 msgid "IPv6 SLAAC address generation mode"
 msgstr "Adresserzeugung mittels IPv6 SLAAC"
 
-#: ../src/nm-iface-helper.c:294
+#: ../src/nm-iface-helper.c:289
 msgid ""
 "The logging backend configuration value. See logging.backend in "
 "NetworkManager.conf"
@@ -13080,7 +12393,7 @@ msgstr ""
 "Der Konfigurationswert des Protokollierungs-Backends. Siehe logging.backend "
 "in NetworkManager.conf"
 
-#: ../src/nm-iface-helper.c:314
+#: ../src/nm-iface-helper.c:309
 msgid ""
 "nm-iface-helper is a small, standalone process that manages a single network "
 "interface."
@@ -13088,98 +12401,27 @@ msgstr ""
 "nm-iface-helper ist ein kleiner, eigenständiger Prozess, der eine einzelne "
 "Netzwerkschnittstelle verwaltet."
 
-#: ../src/nm-iface-helper.c:423
+#: ../src/nm-iface-helper.c:379
 #, c-format
 msgid "An interface name and UUID are required\n"
 msgstr "Ein Schnittstellenname und eine UUID sind notwendig\n"
 
-#: ../src/nm-iface-helper.c:429
+#: ../src/nm-iface-helper.c:385
 #, c-format
 msgid "Failed to find interface index for %s (%s)\n"
 msgstr "Schnittstellenindex für %s konnte nicht gefunden werden (%s)\n"
 
-#: ../src/nm-iface-helper.c:447
-#, c-format
-msgid "Ignoring unrecognized log domain(s) '%s' passed on command line.\n"
-msgstr ""
-"Unbekannte Protokolldomäne(n) »%s« wurden über die Befehlszeile erhalten.\n"
-
-#: ../src/nm-iface-helper.c:486
+#: ../src/nm-iface-helper.c:446
 #, c-format
 msgid "(%s): Invalid IID %s\n"
 msgstr "(%s): Ungültige IID %s\n"
 
-#: ../src/nm-iface-helper.c:497
-#, c-format
-msgid "(%s): Invalid DHCP client-id %s\n"
-msgstr "(%s): Ungültige DHCP Client-Kennung %s\n"
-
-#: ../src/nm-logging.c:273
+#: ../src/nm-logging.c:267
 #, c-format
 msgid "Unknown log level '%s'"
 msgstr "Unbekannte Protokollstufe »%s«"
 
-#: ../src/nm-logging.c:375
+#: ../src/nm-logging.c:369
 #, c-format
 msgid "Unknown log domain '%s'"
 msgstr "Unbekannte Protokolldomäne »%s«"
-
-#~ msgid ""
-#~ "The setting's name, which uniquely identifies the setting within the "
-#~ "connection.  Each setting type has a name unique to that type, for "
-#~ "example \"ppp\" or \"wireless\" or \"wired\"."
-#~ msgstr ""
-#~ "Der Name der Einstellung, welcher eindeutig die Einstellung in dieser "
-#~ "Verbindung identifiziert. Jeder Einstellungstyp hat einen für diesen Typ "
-#~ "eindeutigen Namen, beispielsweise »ppp«, »Funk« oder »Kabel«."
-
-#~ msgid "Error in configuration file: %s.\n"
-#~ msgstr "Fehler in Konfigurationsdatei: %s.\n"
-
-#~ msgid "Ignoring unrecognized log domain(s) '%s' from config files.\n"
-#~ msgstr ""
-#~ "Unbekannte Protokolldomäne(n) »%s« aus den Konfigurationsdateien werden "
-#~ "ignoriert.\n"
-
-#~ msgid "'%s' is ambiguous (%s x %s)"
-#~ msgstr "»%s« ist mehrdeutig (%s x %s)"
-
-#~ msgid "when link autonegotiation is enabled no duplex value is accepted"
-#~ msgstr ""
-#~ "Wenn die Verbindungsaushandlung eingeschaltet ist, dann wird kein Duplex-"
-#~ "Wert akzeptiert"
-
-#~ msgid "when link autonegotiation is enabled speed should be 0"
-#~ msgstr ""
-#~ "Wenn die Verbindungsaushandlung eingeschaltet ist, dann sollte die "
-#~ "Geschwindigkeit 0 sein"
-
-#~ msgid "Error: bad color: %s\n"
-#~ msgstr "Fehler: Falsche Farbe: %s\n"
-
-#~ msgid "'%s' is not a valid flag number; use <0-%d>"
-#~ msgstr "»%s« ist keine gültige flag-Zahl. Verwenden Sie <0-%d>"
-
-#~ msgid "'%s' sum is higher than all flags => all flags set"
-#~ msgstr "Die Summe »%s« ist größer als alle Flags => alle Flags gesetzt"
-
-#~ msgid "%d (disabled)"
-#~ msgstr "%d (deaktiviert)"
-
-#~ msgid "%d (enabled, prefer public IP)"
-#~ msgstr "%d (aktiviert, öffentliche IP bevorzugen)"
-
-#~ msgid "%d (enabled, prefer temporary IP)"
-#~ msgstr "%d (aktiviert, temporäre IP bevorzugen)"
-
-#~ msgid "Array of DNS search domains."
-#~ msgstr "Feld mit DNS-Suchdomänen."
-
-#~ msgid "Editor failed with status %d"
-#~ msgstr "Editor fehlgeschlagen mit Status %d"
-
-#~ msgid "Editor failed with signal %d"
-#~ msgstr "Editor fehlgeschlagen mit Signal %d"
-
-#~ msgid "ignoring invalid DNS server IPv6 address '%s'"
-#~ msgstr "Ungültige DNS-Server IPv6-Adresse »%s« wird ignoriert"
diff --git a/po/fr.po b/po/fr.po
index c8051517..5c60420f 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -1065,7 +1065,7 @@ msgstr "Connexion « %s » (%s) supprimée.\n"
 #: ../clients/cli/connections.c:2561
 #, c-format
 msgid "Connection '%s' successfully deactivated (D-Bus active path: %s)\n"
-msgstr "Connexion « %s » désactivée (chemin D-Bus actif : %s)\n"
+msgstr "Connexion « %s » activée (chemin D-Bus actif : %s)\n"
 
 #: ../clients/cli/connections.c:2642 ../clients/cli/connections.c:8164
 #: ../clients/cli/connections.c:8196 ../clients/cli/connections.c:8353
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 87cd45f0..26935c05 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -1,5 +1,5 @@
 # Brazilian Portuguese translation of NetworkManager.
-# Copyright (C) 2018 Free Software Foundation, Inc.
+# Copyright (C) 2016 Free Software Foundation, Inc.
 # This file is distributed under the same license as the NetworkManager package.
 # Raphael Higino <In memoriam>, 2004-2007
 # Luiz Armesto <luiz.armesto@gmail.com>, 2007.
@@ -8,23 +8,22 @@
 # Fabrício Godoy <skarllot@gmail.com>, 2008.
 # Enrico Nicoletto <liverig@gmail.com>, 2013.
 # gcintra <gcintra@redhat.com>, 2013, 2014.
+# Rafael Fontenelle <rafaelff@gnome.org>, 2013, 2015, 2016.
 # lrintel <lrintel@redhat.com>, 2017. #zanata
-# Rafael Fontenelle <rafaelff@gnome.org>, 2013, 2015-2018.
 msgid ""
 msgstr ""
-"Project-Id-Version: NetworkManager\n"
-"Report-Msgid-Bugs-To: https://gitlab.freedesktop.org/NetworkManager/"
-"NetworkManager/issues\n"
-"POT-Creation-Date: 2018-08-02 15:24+0000\n"
-"PO-Revision-Date: 2018-08-06 00:17-0200\n"
-"Last-Translator: Rafael Fontenelle <rafaelff@gnome.org>\n"
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2017-12-12 10:22+0100\n"
+"PO-Revision-Date: 2017-11-07 06:49+0000\n"
+"Last-Translator: Copied by Zanata <copied-by-zanata@zanata.org>\n"
 "Language-Team: Brazilian Portuguese <gnome-pt_br-list@gnome.org>\n"
 "Language: pt_BR\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
-"X-Generator: Virtaal 1.0.0-beta1\n"
+"X-Generator: Zanata 4.3.2\n"
 "X-Project-Style: gnome\n"
 
 #: ../clients/cli/agent.c:40
@@ -35,7 +34,7 @@ msgid ""
 "COMMAND := { secret | polkit | all }\n"
 "\n"
 msgstr ""
-"Uso: nmcli agent { COMANDO | help }\n"
+"Uso: nmcli agent { COMMAND | help }\n"
 "\n"
 "COMANDO := { secret | polkit | all }\n"
 "\n"
@@ -91,87 +90,85 @@ msgstr ""
 "NetworkManager.\n"
 "\n"
 
-#: ../clients/cli/agent.c:157
+#: ../clients/cli/agent.c:158
 #, c-format
 msgid "nmcli successfully registered as a NetworkManager's secret agent.\n"
 msgstr ""
 "nmcli registrado com sucesso como um agente de segredo do NetworkManager.\n"
 
-#: ../clients/cli/agent.c:159
+#: ../clients/cli/agent.c:160
 #, c-format
 msgid "Error: secret agent initialization failed"
 msgstr "Erro: inicialização do agente de segredo falhou"
 
-#: ../clients/cli/agent.c:178
+#: ../clients/cli/agent.c:179
 #, c-format
 msgid "Error: polkit agent initialization failed: %s"
 msgstr "Erro: inicialização do agente de polkit falhou: %s"
 
-#: ../clients/cli/agent.c:186
+#: ../clients/cli/agent.c:187
 #, c-format
 msgid "nmcli successfully registered as a polkit agent.\n"
 msgstr "nmcli registrado com sucesso como um agente de polkit.\n"
 
-#: ../clients/cli/common.c:361 ../clients/cli/common.c:362
-#: ../clients/cli/common.c:393 ../clients/cli/common.c:394
-#: ../clients/cli/connections.c:1387
+#: ../clients/cli/common.c:262 ../clients/cli/common.c:277
 msgid "GROUP"
 msgstr "GRUPO"
 
-#: ../clients/cli/common.c:621
+#: ../clients/cli/common.c:559
 #, c-format
 msgid "Error: openconnect failed: %s\n"
 msgstr "Erro: openconnect falhou: %s\n"
 
-#: ../clients/cli/common.c:628
+#: ../clients/cli/common.c:566
 #, c-format
 msgid "Error: openconnect failed with status %d\n"
 msgstr "Erro: openconnect falhou com status %d\n"
 
-#: ../clients/cli/common.c:630
+#: ../clients/cli/common.c:568
 #, c-format
 msgid "Error: openconnect failed with signal %d\n"
 msgstr "Erro: openconnect falhou com sinal %d\n"
 
-#: ../clients/cli/common.c:710
+#: ../clients/cli/common.c:648
 #, c-format
 msgid ""
 "Warning: password for '%s' not given in 'passwd-file' and nmcli cannot ask "
 "without '--ask' option.\n"
 msgstr ""
-"Aviso: senha para “%s” não fornecida em “passwd-file” e nmcli não pode "
-"solicitar sem a opção “--ask”.\n"
+"Aviso: senha para \"%s\" não fornecida em \"passwd-file\" e nmcli não pode "
+"solicitar sem a opção '--ask\".\n"
 
-#: ../clients/cli/common.c:1200
+#: ../clients/cli/common.c:1114
 #, c-format
 msgid "Error: Could not create NMClient object: %s."
 msgstr "Erro: não foi possível criar objeto NMClient: %s."
 
-#: ../clients/cli/common.c:1220
+#: ../clients/cli/common.c:1134
 msgid "Error: NetworkManager is not running."
-msgstr "Erro: o NetworkManager não está em execução."
+msgstr "Erro: O NetworkManager não está em execução."
 
-#: ../clients/cli/common.c:1316
+#: ../clients/cli/common.c:1231
 #, c-format
 msgid "Error: argument '%s' not understood. Try passing --help instead."
-msgstr "Erro: argumento “%s” não compreendido. Tente passar --help."
+msgstr ""
 
-#: ../clients/cli/common.c:1326
+#: ../clients/cli/common.c:1241
 msgid "Error: missing argument. Try passing --help."
-msgstr "Erro: faltando argumento. Tente passar --help."
+msgstr ""
 
-#: ../clients/cli/common.c:1379
+#: ../clients/cli/common.c:1294
 msgid "access denied"
-msgstr "acesso negado"
+msgstr ""
 
 #. define some prompts for connection editor
 #: ../clients/cli/connections.c:64
 msgid "Setting name? "
-msgstr "Nome de definição? "
+msgstr "Nome configuração? "
 
 #: ../clients/cli/connections.c:65
 msgid "Property name? "
-msgstr "Nome de propriedade? "
+msgstr "Nome propriedade? "
 
 #: ../clients/cli/connections.c:66
 msgid "Enter connection type: "
@@ -179,85 +176,26 @@ msgstr "Digite o tipo de conexão: "
 
 #. define some other prompts
 #: ../clients/cli/connections.c:70
+#, fuzzy
 msgid "Connection (name, UUID, or path)"
-msgstr "Conexão (nome, UUID ou caminho)"
+msgstr "Conexão (nome, UUID ou caminho): "
 
 #: ../clients/cli/connections.c:71
+#, fuzzy
 msgid "VPN connection (name, UUID, or path)"
-msgstr "Conexão VPN (nome, UUID ou caminho)"
+msgstr "Conexão VPN (nome, UUID ou caminho): "
 
 #: ../clients/cli/connections.c:72
+#, fuzzy
 msgid "Connection(s) (name, UUID, or path)"
-msgstr "Conexão(ões) (nome, UUID ou caminho)"
+msgstr "Conexão(ões) (nome, UUID ou caminho): "
 
 #: ../clients/cli/connections.c:73
+#, fuzzy
 msgid "Connection(s) (name, UUID, path or apath)"
-msgstr "Conexão(ões) (nome, UUID, caminho ou “apath”)"
-
-#: ../clients/cli/connections.c:80 ../clients/cli/connections.c:89
-#: ../clients/cli/devices.c:421 ../clients/cli/devices.c:513
-#: ../clients/cli/devices.c:520 ../clients/cli/general.c:41
-#: ../clients/cli/general.c:82 ../clients/cli/general.c:150
-#: ../clients/cli/general.c:155 ../clients/common/nm-client-utils.c:260
-#: ../clients/common/nm-client-utils.c:273
-#: ../clients/common/nm-client-utils.c:277
-#: ../clients/common/nm-client-utils.c:282
-#: ../clients/common/nm-meta-setting-desc.c:1510
-#: ../clients/common/nm-meta-setting-desc.c:1560
-#: ../clients/common/nm-meta-setting-desc.c:2709
-#: ../clients/common/nm-meta-setting-desc.c:2764
-msgid "unknown"
-msgstr "desconhecido"
-
-#: ../clients/cli/connections.c:81
-msgid "activating"
-msgstr "ativando"
-
-#: ../clients/cli/connections.c:82
-msgid "activated"
-msgstr "ativado"
-
-#: ../clients/cli/connections.c:83 ../clients/common/nm-client-utils.c:271
-msgid "deactivating"
-msgstr "desativando"
-
-#: ../clients/cli/connections.c:84
-msgid "deactivated"
-msgstr "desativado"
-
-#: ../clients/cli/connections.c:90
-msgid "VPN connecting (prepare)"
-msgstr "Conexão VPN (preparando)"
-
-#: ../clients/cli/connections.c:91
-msgid "VPN connecting (need authentication)"
-msgstr "Conexão VPN (precisa de autenticação)"
-
-#: ../clients/cli/connections.c:92
-msgid "VPN connecting"
-msgstr "Conexão VPN"
-
-#: ../clients/cli/connections.c:93
-msgid "VPN connecting (getting IP configuration)"
-msgstr "Conexão VPN (obtendo configuração de IP)"
-
-#: ../clients/cli/connections.c:94
-msgid "VPN connected"
-msgstr "VPN conectada"
-
-#: ../clients/cli/connections.c:95
-msgid "VPN connection failed"
-msgstr "Conexão VPN falhou"
-
-#: ../clients/cli/connections.c:96
-msgid "VPN disconnected"
-msgstr "VPN desconectada"
-
-#: ../clients/cli/connections.c:464
-msgid "never"
-msgstr "nunca"
+msgstr "Conexão(ões) (nome, UUID, caminho ou \"apath\"): "
 
-#: ../clients/cli/connections.c:811
+#: ../clients/cli/connections.c:195
 #, c-format
 msgid ""
 "Usage: nmcli connection { COMMAND | help }\n"
@@ -297,44 +235,8 @@ msgid ""
 "  export [id | uuid | path] <ID> [<output file>]\n"
 "\n"
 msgstr ""
-"Uso: nmcli connection { COMANDO | help }\n"
-"\n"
-"COMANDO := { show | up | down | add | modify | clone | edit | delete | "
-"monitor | reload | load | import | export }\n"
-"\n"
-"  show [--active] [--order <especificação da ordem>]\n"
-"  show [--active] [id | uuid | path | apath] <ID> ...\n"
-"\n"
-"  up [[id | uuid | path] <ID>] [ifname <nome-if>] [ap <BSSID>] [passwd-file "
-"<arquivo com senhas>]\n"
-"\n"
-"  down [id | uuid | path | apath] <ID> ...\n"
-"\n"
-"  add OPÇÕES_COMUNS OPÇÕES_ESPECÍFICAS_TIPO OPÇÕES_ESCRAVO OPÇÕES_IP [-- "
-"([+|-]<definição>.<propriedade> <valor>)+]\n"
-"\n"
-"  modify [--temporary] [id | uuid | path] <ID> ([+|-]<definição>."
-"<propriedade> <valor>)+\n"
-"\n"
-"  clone [--temporary] [id | uuid | path ] <ID> <novo nome>\n"
-"\n"
-"  edit [id | uuid | path] <ID>\n"
-"  edit [type <tipo_nova_con>] [con-name <nome_nova_con>]\n"
-"\n"
-"  delete [id | uuid | path] <ID>\n"
-"\n"
-"  monitor [id | uuid | path] <ID> ...\n"
-"\n"
-"  reload\n"
-"\n"
-"  load <arquivo> [ <arquivo>... ]\n"
-"\n"
-"  import [--temporary] type <tipo> file <arquivo para importar>\n"
-"\n"
-"  export [id | uuid | path] <ID> [<arquivo de saída>]\n"
-"\n"
 
-#: ../clients/cli/connections.c:833
+#: ../clients/cli/connections.c:217
 #, c-format
 msgid ""
 "Usage: nmcli connection show { ARGUMENTS | help }\n"
@@ -380,7 +282,7 @@ msgstr ""
 "perfis ativos são levados em conta. Use a opção global --show-secrets para\n"
 "também revelar segredos associados.\n"
 
-#: ../clients/cli/connections.c:854
+#: ../clients/cli/connections.c:238
 #, c-format
 msgid ""
 "Usage: nmcli connection up { ARGUMENTS | help }\n"
@@ -425,7 +327,7 @@ msgstr ""
 "passwd-file - arquivo com senha(s) necessária(s) para ativar a conexão\n"
 "\n"
 
-#: ../clients/cli/connections.c:875
+#: ../clients/cli/connections.c:259
 #, c-format
 msgid ""
 "Usage: nmcli connection down { ARGUMENTS | help }\n"
@@ -442,12 +344,12 @@ msgstr ""
 "\n"
 "ARGUMENTOS := [id | uuid | path | apath] <ID> ...\n"
 "\n"
-"Desativa uma conexão de um dispositivo (sem impedir o dispositivo de\n"
+"Desativa uma conexão de um dispositivo (sem prevenir o dispositivo de\n"
 "auto-ativamento no futuro). O perfil para desativar é identificado por\n"
 "seu nome, UUID ou caminho do D-Bus.\n"
 "\n"
 
-#: ../clients/cli/connections.c:887
+#: ../clients/cli/connections.c:271
 #, c-format
 msgid ""
 "Usage: nmcli connection add { ARGUMENTS | help }\n"
@@ -584,14 +486,7 @@ msgid ""
 "                  [source-port-max <0-65535>]\n"
 "                  [destination-port <0-65535>]\n"
 "\n"
-"    wpan:         [short-addr <0x0000-0xffff>]\n"
-"\n"
-"                  [pan-id <0x0000-0xffff>]\n"
-"\n"
-"                  [mac <MAC address>]\n"
-"\n"
-"    6lowpan:      dev <parent device (connection UUID, ifname, or MAC)>\n"
-"    dummy:\n"
+"    dummy:         \n"
 "\n"
 "  SLAVE_OPTIONS:\n"
 "    bridge:       [priority <0-63>]\n"
@@ -605,163 +500,8 @@ msgid ""
 "                  [ip6 <IPv6 address>] [gw6 <IPv6 gateway>]\n"
 "\n"
 msgstr ""
-"Uso: nmcli connection add { ARGUMENTOS | help }\n"
-"\n"
-"ARGUMENTOS := OPÇÕES_COMUNS OPÇÕES_ESPECÍFICAS_TIPO OPÇÕES_ESCRAVO OPÇÕES_IP "
-"[-- ([+|-]<definição>.<propriedade> <valor>)+]\n"
-"\n"
-"  OPÇÕES_COMUNS:\n"
-"                  type <tipo>\n"
-"                  ifname <nome da interface> | \"*\"\n"
-"                  [con-name <nome da conexão>]\n"
-"                  [autoconnect yes|no]\n"
-"                  [save yes|no]\n"
-"                  [master <(nome-if ou UUID de conexão ou nome) do mestre>]\n"
-"                  [slave-type <tipo da conexão mestre>]\n"
-"\n"
-"  OPÇÕES_ESPECÍFICAS_TIPO:\n"
-"    ethernet:     [mac <endereço MAC>]\n"
-"                  [cloned-mac <endereço MAC clonado>]\n"
-"                  [mtu <MTU>]\n"
-"\n"
-"    wifi:         ssid <SSID>\n"
-"                  [mac <endereço MAC>]\n"
-"                  [cloned-mac <endereço MAC clonado>]\n"
-"                  [mtu <MTU>]\n"
-"                  [mode infrastructure|ap|adhoc]\n"
-"\n"
-"    wimax:        [mac <endereço MAC>]\n"
-"                  [nsp <NSP>]\n"
-"\n"
-"    pppoe:        username <nome de usuário PPPoE>\n"
-"                  [password <senha PPPoE>]\n"
-"                  [service <nome de serviço PPPoE>]\n"
-"                  [mtu <MTU>]\n"
-"                  [mac <endereço MAC>]\n"
-"\n"
-"    gsm:          apn <APN>\n"
-"                  [user <nome de usuário>]\n"
-"                  [password <senha>]\n"
-"\n"
-"    cdma:         [user <nome de usuário>]\n"
-"                  [password <senha>]\n"
-"\n"
-"    infiniband:   [mac <endereço MAC>]\n"
-"                  [mtu <MTU>]\n"
-"                  [transport-mode datagram | connected]\n"
-"                  [parent <nome-if>]\n"
-"                  [p-key <IPoIB P_Key>]\n"
-"\n"
-"    bluetooth:    [addr <endereço bluetooth>]\n"
-"                  [bt-type panu|nap|dun-gsm|dun-cdma]\n"
-"\n"
-"    vlan:         dev <(UUID de conexão, nome-if ou MAC) do dispositivo "
-"pai>\n"
-"                  id <VLAN ID>\n"
-"                  [flags <sinalizadores de VLAN>]\n"
-"                  [ingress <mapeamento de prioridade de ingresso>]\n"
-"                  [egress <mapeamento de prioridade de egresso>]\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 <nome-if>]\n"
-"                  [miimon <núm>]\n"
-"                  [downdelay <núm>]\n"
-"                  [updelay <núm>]\n"
-"                  [arp-interval <núm>]\n"
-"                  [arp-ip-target <núm>]\n"
-"                  [lacp-rate slow (0) | fast (1)]\n"
-"\n"
-"    bond-slave:   master <(nome-if, UUID de conexão ou nome) do mestre>\n"
-"\n"
-"    team:         [config <arquivo>|<dados JSON não tratados>]\n"
-"\n"
-"    team-slave:   master <(nome-if, UUID de conexão ou nome) do mestre>\n"
-"                  [config <arquivo>|<dados JSON não tratados>]\n"
-"\n"
-"    bridge:       [stp yes|no]\n"
-"                  [priority <núm>]\n"
-"                  [forward-delay <2-30>]\n"
-"                  [hello-time <1-10>]\n"
-"                  [max-age <6-40>]\n"
-"                  [ageing-time <0-1000000>]\n"
-"                  [multicast-snooping yes|no]\n"
-"                  [mac <endereço MAC>]\n"
-"\n"
-"    bridge-slave: master <(nome-if, UUID de conexão ou nome) do mestre>\n"
-"                  [priority <0-63>]\n"
-"                  [path-cost <1-65535>]\n"
-"                  [hairpin yes|no]\n"
-"\n"
-"    vpn:          vpn-type vpnc|openvpn|pptp|openconnect|openswan|libreswan|"
-"ssh|l2tp|iodine|...\n"
-"                  [user <nome de usuário>]\n"
-"\n"
-"    olpc-mesh:    ssid <SSID>\n"
-"                  [channel <1-13>]\n"
-"                  [dhcp-anycast <endereço MAC>]\n"
-"\n"
-"    adsl:         username <nome de usuário>\n"
-"                  protocol pppoa|pppoe|ipoatm\n"
-"                  [password <senha>]\n"
-"                  [encapsulation vcmux|llc]\n"
-"\n"
-"    tun:          mode tun|tap\n"
-"                  [owner <UID>]\n"
-"                  [group <GID>]\n"
-"                  [pi yes|no]\n"
-"                  [vnet-hdr yes|no]\n"
-"                  [multi-queue yes|no]\n"
-"\n"
-"    ip-tunnel:    mode ipip|gre|sit|isatap|vti|ip6ip6|ipip6|ip6gre|vti6\n"
-"                  remote <IP de ponto de extremidade remota>\n"
-"                  [local <IP de ponto de extremidade local>]\n"
-"                  [dev <(nome-if ou UUID de conexão) do dispositivo pai>]\n"
-"\n"
-"    macsec:       dev <(UUID de conexão, nome-if, MAC) do dispositivo pai>\n"
-"                  mode <psk|eap>\n"
-"                  [cak <chave> ckn <chave>]\n"
-"                  [encrypt yes|no]\n"
-"                  [port 1-65534]\n"
-"\n"
-"\n"
-"    macvlan:      dev <(UUID de conexão, nome-if, MAC) dispositivo pai>\n"
-"                  mode vepa|bridge|private|passthru|source\n"
-"                  [tap yes|no]\n"
-"\n"
-"    vxlan:        id <ID de VXLAN>\n"
-"                  remote <IP de grupo multicast ou endereço remoto>\n"
-"                  [local <IP de origem>]\n"
-"                  [dev <(nome-if ou UUID de conexão) do dispositivo pai>]\n"
-"                  [source-port-min <0-65535>]\n"
-"                  [source-port-max <0-65535>]\n"
-"                  [destination-port <0-65535>]\n"
-"\n"
-"    wpan:         [short-addr <0x0000-0xffff>]\n"
-"\n"
-"                  [pan-id <0x0000-0xffff>]\n"
-"\n"
-"                  [mac <endereço MAC>]\n"
-"\n"
-"    6lowpan:      dev <disp pai (UUID conexão, nome-if ou MAC)>\n"
-"    dummy:         \n"
-"\n"
-"  OPÇÕES_ESCRAVO:\n"
-"    bridge:       [priority <0-63>]\n"
-"                  [path-cost <1-65535>]\n"
-"                  [hairpin yes|no]\n"
-"\n"
-"    team:         [config <arquivo>|<dados JSON não tratados>]\n"
-"\n"
-"  OPÇÕES_IP:\n"
-"                  [ip4 <endereço IPv4>] [gw4 <gateway IPv4>]\n"
-"                  [ip6 <endereço IPv6>] [gw6 <gateway IPv6>]\n"
-"\n"
 
-#: ../clients/cli/connections.c:1009
+#: ../clients/cli/connections.c:389
 #, c-format
 msgid ""
 "Usage: nmcli connection modify { ARGUMENTS | help }\n"
@@ -794,7 +534,7 @@ msgstr ""
 "O perfil é identificado por seu nome, UUID ou cominho D-Bus. Para\n"
 "propriedades multivaloradas você pode usar os prefixos opcionais \"+\" ou\n"
 "\"-\" para o nome da propriedade. O sinal de \"+\" permite anexar itens ao\n"
-"invés de sobrescrever todo o valor. O sinal \"-\" permite remover itens\n"
+"invés de sobrescrever todo o valor. O signal \"-\" permite remover itens\n"
 "selecionados ao invés do valor inteiro.\n"
 "\n"
 "Exemplos:\n"
@@ -808,7 +548,7 @@ msgstr ""
 "nmcli con mod bond0 -bond.options downdelay\n"
 "\n"
 
-#: ../clients/cli/connections.c:1032
+#: ../clients/cli/connections.c:412
 #, c-format
 msgid ""
 "Usage: nmcli connection clone { ARGUMENTS | help }\n"
@@ -831,7 +571,7 @@ msgstr ""
 "argumento <novo nome>).\n"
 "\n"
 
-#: ../clients/cli/connections.c:1044
+#: ../clients/cli/connections.c:424
 #, c-format
 msgid ""
 "Usage: nmcli connection edit { ARGUMENTS | help }\n"
@@ -858,7 +598,7 @@ msgstr ""
 "Adiciona um novo perfil de conexão em um editor interativo.\n"
 "\n"
 
-#: ../clients/cli/connections.c:1059
+#: ../clients/cli/connections.c:439
 #, c-format
 msgid ""
 "Usage: nmcli connection delete { ARGUMENTS | help }\n"
@@ -877,7 +617,7 @@ msgstr ""
 "O perfil é identificado por seu nome, UUID ou caminho de D-Bus.\n"
 "\n"
 
-#: ../clients/cli/connections.c:1070
+#: ../clients/cli/connections.c:450
 #, c-format
 msgid ""
 "Usage: nmcli connection monitor { ARGUMENTS | help }\n"
@@ -898,7 +638,7 @@ msgstr ""
 "Monitora todos os perfis de conexão no caso de nenhuma ser especificada.\n"
 "\n"
 
-#: ../clients/cli/connections.c:1082
+#: ../clients/cli/connections.c:462
 #, c-format
 msgid ""
 "Usage: nmcli connection reload { help }\n"
@@ -911,7 +651,7 @@ msgstr ""
 "Recarrega todos os arquivos de conexão do disco.\n"
 "\n"
 
-#: ../clients/cli/connections.c:1090
+#: ../clients/cli/connections.c:470
 #, c-format
 msgid ""
 "Usage: nmcli connection load { ARGUMENTS | help }\n"
@@ -933,7 +673,7 @@ msgstr ""
 "saiba do seu último estado.\n"
 "\n"
 
-#: ../clients/cli/connections.c:1102
+#: ../clients/cli/connections.c:482
 #, c-format
 msgid ""
 "Usage: nmcli connection import { ARGUMENTS | help }\n"
@@ -958,7 +698,7 @@ msgstr ""
 "é importada pelos plug-ins VPN do NetworkManager.\n"
 "\n"
 
-#: ../clients/cli/connections.c:1115
+#: ../clients/cli/connections.c:495
 #, c-format
 msgid ""
 "Usage: nmcli connection export { ARGUMENTS | help }\n"
@@ -978,337 +718,437 @@ msgstr ""
 "se um nome for informado.\n"
 "\n"
 
-#: ../clients/cli/connections.c:1197
+#: ../clients/cli/connections.c:525
+msgid "activating"
+msgstr "ativando"
+
+#: ../clients/cli/connections.c:527
+msgid "activated"
+msgstr "ativado"
+
+#: ../clients/cli/connections.c:529 ../clients/common/nm-client-utils.c:243
+msgid "deactivating"
+msgstr "desativando"
+
+#: ../clients/cli/connections.c:531
+msgid "deactivated"
+msgstr "desativado"
+
+#: ../clients/cli/connections.c:534 ../clients/cli/connections.c:557
+#: ../clients/cli/devices.c:1207 ../clients/cli/devices.c:1251
+#: ../clients/cli/devices.c:1253 ../clients/cli/general.c:41
+#: ../clients/cli/general.c:79 ../clients/cli/general.c:146
+#: ../clients/cli/general.c:151 ../clients/common/nm-client-utils.c:247
+#: ../clients/common/nm-client-utils.c:250
+#: ../clients/common/nm-client-utils.c:266
+#: ../clients/common/nm-client-utils.c:269
+#: ../clients/common/nm-meta-setting-desc.c:1479
+#: ../clients/common/nm-meta-setting-desc.c:1547
+#: ../clients/common/nm-meta-setting-desc.c:2692
+#: ../clients/common/nm-meta-setting-desc.c:2746
+msgid "unknown"
+msgstr "desconhecido"
+
+#: ../clients/cli/connections.c:543
+msgid "VPN connecting (prepare)"
+msgstr "Conexão VPN (preparando)"
+
+#: ../clients/cli/connections.c:545
+msgid "VPN connecting (need authentication)"
+msgstr "Conexão VPN (precisa de autenticação)"
+
+#: ../clients/cli/connections.c:547
+msgid "VPN connecting"
+msgstr "Conexão VPN"
+
+#: ../clients/cli/connections.c:549
+msgid "VPN connecting (getting IP configuration)"
+msgstr "Conexão VPN (obtendo configuração de IP)"
+
+#: ../clients/cli/connections.c:551
+msgid "VPN connected"
+msgstr "VPN conectada"
+
+#: ../clients/cli/connections.c:553
+msgid "VPN connection failed"
+msgstr "Conexão VPN falhou"
+
+#: ../clients/cli/connections.c:555
+msgid "VPN disconnected"
+msgstr "VPN desconectada"
+
+#: ../clients/cli/connections.c:625
 #, c-format
 msgid "Error updating secrets for %s: %s\n"
 msgstr "Erro ao atualizar segredos para %s: %s\n"
 
-#: ../clients/cli/connections.c:1240
+#: ../clients/cli/connections.c:645
 msgid "Connection profile details"
 msgstr "Detalhes do perfil de conexão"
 
-#: ../clients/cli/connections.c:1253 ../clients/cli/connections.c:1338
+#: ../clients/cli/connections.c:658 ../clients/cli/connections.c:1108
 #, c-format
 msgid "Error: 'connection show': %s"
-msgstr "Erro: “connection show”: %s"
+msgstr "Erro: \"connection show\": %s"
+
+#: ../clients/cli/connections.c:876
+msgid "never"
+msgstr "nunca"
 
-#: ../clients/cli/connections.c:1328
+#. "CAPABILITIES"
+#: ../clients/cli/connections.c:877 ../clients/cli/connections.c:879
+#: ../clients/cli/connections.c:881 ../clients/cli/connections.c:914
+#: ../clients/cli/connections.c:981 ../clients/cli/connections.c:982
+#: ../clients/cli/connections.c:984 ../clients/cli/connections.c:4427
+#: ../clients/cli/connections.c:6365 ../clients/cli/connections.c:6366
+#: ../clients/cli/devices.c:881 ../clients/cli/devices.c:1170
+#: ../clients/cli/devices.c:1171 ../clients/cli/devices.c:1172
+#: ../clients/cli/devices.c:1173 ../clients/cli/devices.c:1174
+#: ../clients/cli/devices.c:1211 ../clients/cli/devices.c:1213
+#: ../clients/cli/devices.c:1214 ../clients/cli/devices.c:1244
+#: ../clients/cli/devices.c:1245 ../clients/cli/devices.c:1246
+#: ../clients/cli/devices.c:1247 ../clients/cli/devices.c:1248
+#: ../clients/cli/devices.c:1249 ../clients/cli/devices.c:1250
+#: ../clients/cli/devices.c:1252 ../clients/cli/devices.c:1254
+#: ../clients/cli/general.c:152 ../clients/common/nm-client-utils.c:258
+#: ../clients/common/nm-meta-setting-desc.c:719
+#: ../clients/common/nm-meta-setting-desc.c:2685
+msgid "yes"
+msgstr "sim"
+
+#: ../clients/cli/connections.c:877 ../clients/cli/connections.c:879
+#: ../clients/cli/connections.c:881 ../clients/cli/connections.c:981
+#: ../clients/cli/connections.c:982 ../clients/cli/connections.c:984
+#: ../clients/cli/connections.c:4426 ../clients/cli/connections.c:6365
+#: ../clients/cli/connections.c:6366 ../clients/cli/devices.c:881
+#: ../clients/cli/devices.c:1170 ../clients/cli/devices.c:1171
+#: ../clients/cli/devices.c:1172 ../clients/cli/devices.c:1173
+#: ../clients/cli/devices.c:1174 ../clients/cli/devices.c:1211
+#: ../clients/cli/devices.c:1213 ../clients/cli/devices.c:1214
+#: ../clients/cli/devices.c:1244 ../clients/cli/devices.c:1245
+#: ../clients/cli/devices.c:1246 ../clients/cli/devices.c:1247
+#: ../clients/cli/devices.c:1248 ../clients/cli/devices.c:1249
+#: ../clients/cli/devices.c:1250 ../clients/cli/devices.c:1252
+#: ../clients/cli/devices.c:1254 ../clients/cli/general.c:153
+#: ../clients/common/nm-client-utils.c:260
+#: ../clients/common/nm-meta-setting-desc.c:719
+#: ../clients/common/nm-meta-setting-desc.c:2688
+msgid "no"
+msgstr "não"
+
+#: ../clients/cli/connections.c:1098
 msgid "Activate connection details"
 msgstr "Ativar detalhes da conexão"
 
-#: ../clients/cli/connections.c:1436 ../clients/cli/devices.c:1484
-#: ../clients/cli/devices.c:1498 ../clients/cli/devices.c:1513
-#: ../clients/cli/devices.c:1571 ../clients/cli/devices.c:1673
-msgid "NAME"
-msgstr "NOME"
-
-#: ../clients/cli/connections.c:1524
+#: ../clients/cli/connections.c:1345
 #, c-format
 msgid "invalid field '%s'; allowed fields: %s and %s, or %s,%s"
-msgstr "campo inválido “%s”; campos permitidos: %s e %s, ou %s,%s"
+msgstr "campo inválido \"%s\"; campos permitidos: %s e %s, ou %s,%s"
 
-#: ../clients/cli/connections.c:1539 ../clients/cli/connections.c:1547
+#: ../clients/cli/connections.c:1360 ../clients/cli/connections.c:1368
 #, c-format
 msgid "'%s' has to be alone"
-msgstr "“%s” tem que ser um só"
+msgstr "\"%s\" tem que ser um só"
 
-#: ../clients/cli/connections.c:1812
+#: ../clients/cli/connections.c:1568
 #, c-format
 msgid "incorrect string '%s' of '--order' option"
-msgstr "string incorreta “%s” da opção “--order”"
+msgstr "string incorreta \"%s\" da opção \"--order\""
 
-#: ../clients/cli/connections.c:1837
+#: ../clients/cli/connections.c:1594
 #, c-format
 msgid "incorrect item '%s' in '--order' option"
-msgstr "item incorreto “%s” na opção “--order”"
+msgstr "item incorreto \"%s\" na opção \"--order\""
 
-#: ../clients/cli/connections.c:1875
+#: ../clients/cli/connections.c:1624
 msgid "No connection specified"
-msgstr "Nenhuma conexão especificada"
+msgstr ""
 
-#: ../clients/cli/connections.c:1886
+#: ../clients/cli/connections.c:1639
 #, c-format
 msgid "%s argument is missing"
-msgstr "o argumento %s está faltando"
+msgstr ""
 
-#: ../clients/cli/connections.c:1904
+#: ../clients/cli/connections.c:1649
 #, c-format
 msgid "unknown connection '%s'"
-msgstr "conexão desconhecida “%s”"
+msgstr ""
 
-#: ../clients/cli/connections.c:1933
+#: ../clients/cli/connections.c:1682
 msgid "'--order' argument is missing"
-msgstr "o argumento “--order” está faltando"
+msgstr "o argumento \"--order\" está faltando"
 
-#: ../clients/cli/connections.c:1994
+#: ../clients/cli/connections.c:1737
 msgid "NetworkManager active profiles"
 msgstr "Perfis ativos do NetworkManager"
 
-#: ../clients/cli/connections.c:1995
+#: ../clients/cli/connections.c:1738
 msgid "NetworkManager connection profiles"
 msgstr "Perfis de conexão do NetworkManager"
 
-#: ../clients/cli/connections.c:2047 ../clients/cli/connections.c:2746
-#: ../clients/cli/connections.c:2758 ../clients/cli/connections.c:2770
-#: ../clients/cli/connections.c:2996 ../clients/cli/connections.c:8685
-#: ../clients/cli/connections.c:8701 ../clients/cli/devices.c:3037
-#: ../clients/cli/devices.c:3049 ../clients/cli/devices.c:3062
-#: ../clients/cli/devices.c:3213 ../clients/cli/devices.c:3224
-#: ../clients/cli/devices.c:3242 ../clients/cli/devices.c:3251
-#: ../clients/cli/devices.c:3272 ../clients/cli/devices.c:3283
-#: ../clients/cli/devices.c:3301 ../clients/cli/devices.c:3681
-#: ../clients/cli/devices.c:3691 ../clients/cli/devices.c:3699
-#: ../clients/cli/devices.c:3711 ../clients/cli/devices.c:3726
-#: ../clients/cli/devices.c:3734 ../clients/cli/devices.c:3908
-#: ../clients/cli/devices.c:3919 ../clients/cli/devices.c:4090
+#: ../clients/cli/connections.c:1791 ../clients/cli/connections.c:2466
+#: ../clients/cli/connections.c:2478 ../clients/cli/connections.c:2490
+#: ../clients/cli/connections.c:2666 ../clients/cli/connections.c:8428
+#: ../clients/cli/connections.c:8445 ../clients/cli/devices.c:2678
+#: ../clients/cli/devices.c:2689 ../clients/cli/devices.c:2931
+#: ../clients/cli/devices.c:2942 ../clients/cli/devices.c:2960
+#: ../clients/cli/devices.c:2969 ../clients/cli/devices.c:2990
+#: ../clients/cli/devices.c:3001 ../clients/cli/devices.c:3019
+#: ../clients/cli/devices.c:3397 ../clients/cli/devices.c:3407
+#: ../clients/cli/devices.c:3415 ../clients/cli/devices.c:3427
+#: ../clients/cli/devices.c:3442 ../clients/cli/devices.c:3450
+#: ../clients/cli/devices.c:3624 ../clients/cli/devices.c:3635
+#: ../clients/cli/devices.c:3807
 #, c-format
 msgid "Error: %s argument is missing."
 msgstr "Erro: está faltando o argumento %s."
 
-#: ../clients/cli/connections.c:2075
+#: ../clients/cli/connections.c:1810
 #, c-format
 msgid "Error: %s - no such connection profile."
-msgstr "Erro: %s – perfil de conexão inexistente."
+msgstr "Erro: %s - perfil de conexão inexistente."
 
-#: ../clients/cli/connections.c:2166 ../clients/cli/connections.c:2733
-#: ../clients/cli/connections.c:2797 ../clients/cli/connections.c:8209
-#: ../clients/cli/connections.c:8315 ../clients/cli/connections.c:8801
-#: ../clients/cli/devices.c:1758 ../clients/cli/devices.c:2044
-#: ../clients/cli/devices.c:2213 ../clients/cli/devices.c:2321
-#: ../clients/cli/devices.c:2510 ../clients/cli/devices.c:3871
-#: ../clients/cli/devices.c:4096 ../clients/cli/general.c:917
+#: ../clients/cli/connections.c:1874 ../clients/cli/connections.c:2453
+#: ../clients/cli/connections.c:2517 ../clients/cli/connections.c:7938
+#: ../clients/cli/connections.c:8049 ../clients/cli/connections.c:8559
+#: ../clients/cli/devices.c:1579 ../clients/cli/devices.c:1865
+#: ../clients/cli/devices.c:2034 ../clients/cli/devices.c:2142
+#: ../clients/cli/devices.c:2331 ../clients/cli/devices.c:3587
+#: ../clients/cli/devices.c:3813 ../clients/cli/general.c:928
 #, c-format
 msgid "Error: %s."
 msgstr "Erro: %s."
 
-#: ../clients/cli/connections.c:2259
+#: ../clients/cli/connections.c:1972
 #, c-format
 msgid "no active connection on device '%s'"
-msgstr "nenhuma conexão ativa no dispositivo “%s”"
+msgstr "nenhuma conexão ativa no dispositivo \"%s\""
 
-#: ../clients/cli/connections.c:2267
+#: ../clients/cli/connections.c:1980
 msgid "no active connection or device"
 msgstr "nenhuma conexão ou dispositivo ativo"
 
-#: ../clients/cli/connections.c:2287
+#: ../clients/cli/connections.c:2000
 #, c-format
 msgid "device '%s' not compatible with connection '%s':"
-msgstr "dispositivo “%s” não é compatível com a conexão “%s”:"
+msgstr ""
 
-#: ../clients/cli/connections.c:2320
+#: ../clients/cli/connections.c:2036
 #, c-format
 msgid "device '%s' not compatible with connection '%s'"
-msgstr "dispositivo “%s” não é compatível com a conexão “%s”"
+msgstr "dispositivo \"%s\" não é compatível com a conexão \"%s\""
 
-#: ../clients/cli/connections.c:2323
+#: ../clients/cli/connections.c:2039
 #, c-format
 msgid "no device found for connection '%s'"
-msgstr "nenhum dispositivo encontrado para a conexão “%s”"
+msgstr "nenhum dispositivo encontrado para a conexão \"%s\""
 
-#: ../clients/cli/connections.c:2355
+#: ../clients/cli/connections.c:2067
 #, c-format
 msgid "Connection successfully activated (%s) (D-Bus active path: %s)\n"
-msgstr "Conexão ativada com sucesso (%s) (caminho D-Bus ativo: %s)\n"
+msgstr ""
 
-#: ../clients/cli/connections.c:2359 ../clients/cli/connections.c:2507
-#: ../clients/cli/connections.c:6573
+#: ../clients/cli/connections.c:2071 ../clients/cli/connections.c:2219
+#: ../clients/cli/connections.c:6244
 #, c-format
 msgid "Connection successfully activated (D-Bus active path: %s)\n"
 msgstr "Conexão ativada com sucesso (caminho D-Bus ativo: %s)\n"
 
-#: ../clients/cli/connections.c:2366 ../clients/cli/connections.c:2487
+#: ../clients/cli/connections.c:2078 ../clients/cli/connections.c:2199
 #, c-format
 msgid "Error: Connection activation failed: %s"
 msgstr "Erro: Ativação da conexão falhou: %s"
 
-#: ../clients/cli/connections.c:2402
+#: ../clients/cli/connections.c:2114
 #, c-format
 msgid "Error: Timeout expired (%d seconds)"
-msgstr "Erro: Tempo limite esperado (%d segundos)"
+msgstr ""
 
-#: ../clients/cli/connections.c:2569
+#: ../clients/cli/connections.c:2280
 #, c-format
 msgid "failed to read passwd-file '%s': %s"
-msgstr "falha ao ler arquivo-passwd “%s”: %s"
+msgstr "falha ao ler arquivo-passwd \"%s\": %s"
 
-#: ../clients/cli/connections.c:2582
+#: ../clients/cli/connections.c:2292
 #, c-format
 msgid "missing colon in 'password' entry '%s'"
-msgstr "faltando vírgula na entrada “password” “%s”"
+msgstr "faltando vírgula na entrada \"password\" \"%s\""
 
-#: ../clients/cli/connections.c:2590
+#: ../clients/cli/connections.c:2300
 #, c-format
 msgid "missing dot in 'password' entry '%s'"
-msgstr "faltando ponto na entrada “password” “%s”"
+msgstr "faltando ponto na entrada \"password\" \"%s\""
 
-#: ../clients/cli/connections.c:2603
+#: ../clients/cli/connections.c:2313
 #, c-format
 msgid "invalid setting name in 'password' entry '%s'"
-msgstr "nome inválido de definição na entrada “password” “%s”"
+msgstr "nome inválido de definição na entrada \"password\" \"%s\""
 
-#: ../clients/cli/connections.c:2649
+#: ../clients/cli/connections.c:2369
 #, c-format
 msgid "unknown device '%s'."
-msgstr "dispositivo “%s” desconhecido."
+msgstr "dispositivo \"%s\" desconhecido."
 
-#: ../clients/cli/connections.c:2654
+#: ../clients/cli/connections.c:2374
 msgid "neither a valid connection nor device given"
 msgstr "não há uma conexão válida nem um dispositivo fornecido"
 
-#: ../clients/cli/connections.c:2780 ../clients/cli/devices.c:1717
-#: ../clients/cli/devices.c:3094 ../clients/cli/devices.c:3314
-#: ../clients/cli/devices.c:3925
+#: ../clients/cli/connections.c:2500 ../clients/cli/devices.c:1530
+#: ../clients/cli/devices.c:2696 ../clients/cli/devices.c:3032
+#: ../clients/cli/devices.c:3641
 #, c-format
 msgid "Unknown parameter: %s\n"
 msgstr "Parâmetro desconhecido: %s\n"
 
-#: ../clients/cli/connections.c:2805
+#: ../clients/cli/connections.c:2525
 msgid "preparing"
 msgstr "preparando"
 
-#: ../clients/cli/connections.c:2913
+#: ../clients/cli/connections.c:2545
 #, c-format
 msgid "Connection '%s' (%s) successfully deleted.\n"
-msgstr "A conexão “%s” (%s) foi excluída com sucesso.\n"
+msgstr "A conexão \"%s\" (%s) foi excluída com sucesso.\n"
 
-#: ../clients/cli/connections.c:2929
+#: ../clients/cli/connections.c:2561
 #, c-format
 msgid "Connection '%s' successfully deactivated (D-Bus active path: %s)\n"
-msgstr "Conexão “%s” desativada com sucesso (caminho D-Bus ativo: %s)\n"
+msgstr "Conexão \"%s\" desativada com sucesso (caminho D-Bus ativo: %s)\n"
 
-#: ../clients/cli/connections.c:2978 ../clients/cli/connections.c:8422
-#: ../clients/cli/connections.c:8453 ../clients/cli/connections.c:8611
+#: ../clients/cli/connections.c:2642 ../clients/cli/connections.c:8164
+#: ../clients/cli/connections.c:8196 ../clients/cli/connections.c:8353
 #, c-format
 msgid "Error: No connection specified."
 msgstr "Erro: nenhuma conexão especificada."
 
-#: ../clients/cli/connections.c:3008
+#: ../clients/cli/connections.c:2683
 #, c-format
 msgid "Error: '%s' is not an active connection.\n"
-msgstr "Erro: “%s” não é uma conexão ativa.\n"
+msgstr "Erro: \"%s\" não é uma conexão ativa.\n"
 
-#: ../clients/cli/connections.c:3009
+#: ../clients/cli/connections.c:2684
 #, c-format
 msgid "Error: not all active connections found."
 msgstr "Erro: nem todas as conexões ativas foram encontradas."
 
-#: ../clients/cli/connections.c:3017
+#: ../clients/cli/connections.c:2693
 #, c-format
 msgid "Error: no active connection provided."
 msgstr "Erro: não foi fornecida nenhuma conexão ativa."
 
-#: ../clients/cli/connections.c:3048
-#, c-format
+#: ../clients/cli/connections.c:2727
+#, fuzzy, c-format
 msgid "Connection '%s' deactivation failed: %s\n"
-msgstr "Desativação de conexão “%s” falhou: %s\n"
+msgstr "Erro: Ativação da conexão falhou: %s"
 
-#: ../clients/cli/connections.c:3299 ../clients/cli/connections.c:3356
-#: ../clients/common/nm-client-utils.c:221
+#: ../clients/cli/connections.c:2983 ../clients/cli/connections.c:3040
+#: ../clients/common/nm-client-utils.c:169
 #, c-format
 msgid "'%s' not among [%s]"
-msgstr "“%s” não está entre [%s]"
+msgstr "\"%s\" não está entre [%s]"
 
 #. We should not really come here
-#: ../clients/cli/connections.c:3319 ../clients/cli/connections.c:3379
-#: ../clients/common/nm-client-utils.c:289
+#: ../clients/cli/connections.c:3003 ../clients/cli/connections.c:3063
+#: ../clients/common/nm-client-utils.c:279
 #, c-format
 msgid "Unknown error"
 msgstr "Erro desconhecido"
 
-#: ../clients/cli/connections.c:3513
+#: ../clients/cli/connections.c:3197
 #, c-format
 msgid "Warning: master='%s' doesn't refer to any existing profile.\n"
-msgstr "Aviso: master='%s' se refere a nenhum perfil existente.\n"
+msgstr "Aviso: master=\"%s\" se refere a nenhum perfil existente.\n"
 
-#: ../clients/cli/connections.c:3850
+#: ../clients/cli/connections.c:3534
 #, c-format
 msgid "Error: invalid property '%s': %s."
-msgstr "Erro: propriedade inválida “%s”: %s."
+msgstr "Erro: propriedade inválida \"%s\": %s."
 
-#: ../clients/cli/connections.c:3867
+#: ../clients/cli/connections.c:3551
 #, c-format
 msgid "Error: failed to modify %s.%s: %s."
 msgstr "Erro: falha ao modificar %s.%s: %s."
 
-#: ../clients/cli/connections.c:3887
+#: ../clients/cli/connections.c:3570
 #, c-format
 msgid "Error: failed to remove a value from %s.%s: %s."
 msgstr "Erro: falha ao remover um valor de %s.%s: %s."
 
-#: ../clients/cli/connections.c:3921
-#, c-format
+#: ../clients/cli/connections.c:3604
+#, fuzzy, c-format
 msgid "Error: '%s' is mandatory."
-msgstr "Erro: “%s” é obrigatório."
+msgstr "Erro: \"%s\" não pode repetir."
 
-#: ../clients/cli/connections.c:3948
-#, c-format
+#: ../clients/cli/connections.c:3631
+#, fuzzy, c-format
 msgid "Error: invalid slave type; %s."
-msgstr "Erro: tipo de escravo inválido; %s."
+msgstr "Erro: tipo de conexão inválido; %s."
 
-#: ../clients/cli/connections.c:3956
+#: ../clients/cli/connections.c:3639
 #, c-format
 msgid "Error: invalid connection type; %s."
 msgstr "Erro: tipo de conexão inválido; %s."
 
-#: ../clients/cli/connections.c:4033
-#, c-format
+#: ../clients/cli/connections.c:3716
+#, fuzzy, c-format
 msgid "Error: bad connection type: %s"
-msgstr "Erro: tipo de conexão errado; %s"
+msgstr "Erro: tipo de conexão inválido; %s."
 
-#: ../clients/cli/connections.c:4079
+#: ../clients/cli/connections.c:3762
 #, c-format
 msgid "Error: '%s': %s"
-msgstr "Error: “%s”: %s"
+msgstr ""
 
-#: ../clients/cli/connections.c:4100
+#: ../clients/cli/connections.c:3783
+#, fuzzy
 msgid "Error: master is required"
-msgstr "Erro: mestre é necessário"
+msgstr "Erro: é necessário o \"master\"."
 
-#: ../clients/cli/connections.c:4159
-#, c-format
+#: ../clients/cli/connections.c:3842
+#, fuzzy, c-format
 msgid "Error: error adding bond option '%s=%s'."
-msgstr "Erro: erro ao adicionar opção de vínculo “%s=%s”."
+msgstr "Erro: conexão desconhecida: \"%s\"."
 
-#: ../clients/cli/connections.c:4190
+#: ../clients/cli/connections.c:3873
 #, c-format
 msgid "Error: '%s' is not a valid monitoring mode; use '%s' or '%s'.\n"
-msgstr "Erro: “%s” não é um modo de monitoramento válido; use “%s” ou “%s”.\n"
+msgstr ""
+"Erro: \"%s\" não é um modo de monitoramento válido; use \"%s\" ou \"%s\".\n"
 
-#: ../clients/cli/connections.c:4221
+#: ../clients/cli/connections.c:3904
 #, c-format
 msgid "Error: 'bt-type': '%s' not valid; use [%s, %s, %s (%s), %s]."
-msgstr "Erro: “bt-type”: “%s” não é válido; use [%s, %s, %s (%s), %s]."
+msgstr ""
 
-#: ../clients/cli/connections.c:4470
+#: ../clients/cli/connections.c:4153
 #, c-format
 msgid "Error: value for '%s' is missing."
-msgstr "Erro: o valor para “%s” está faltando."
+msgstr "Erro: está faltando um valor para \"%s\"."
 
-#: ../clients/cli/connections.c:4516
+#: ../clients/cli/connections.c:4199
 msgid "Error: <setting>.<property> argument is missing."
-msgstr "Erro: o argumento <definição>.<propriedade> está faltando."
+msgstr "Erro: está faltando argumento <definição>.<propriedade>."
 
-#: ../clients/cli/connections.c:4539
+#: ../clients/cli/connections.c:4222
 #, c-format
 msgid "Error: invalid or not allowed setting '%s': %s."
-msgstr "Erro: definição inválida ou não permitida “%s”: %s."
+msgstr "Erro: definição inválida ou não permitida \"%s\": %s."
 
-#: ../clients/cli/connections.c:4585 ../clients/cli/connections.c:4601
-#, c-format
+#: ../clients/cli/connections.c:4268 ../clients/cli/connections.c:4284
+#, fuzzy, c-format
 msgid "Error: '%s' is ambiguous (%s.%s or %s.%s)."
-msgstr "Erro: “%s” é ambíguo (%s.%s ou %s.%s)."
+msgstr "\"%s\" é ambíguo (%s x %s)"
 
-#: ../clients/cli/connections.c:4619
+#: ../clients/cli/connections.c:4302
 #, c-format
 msgid "Error: invalid <setting>.<property> '%s'."
-msgstr "Erro: <definição>.<propriedade> “%s” inválida."
+msgstr "Erro: <definição>.<propriedade> \"%s\" inválida."
 
-#: ../clients/cli/connections.c:4663 ../clients/cli/connections.c:8255
+#: ../clients/cli/connections.c:4346 ../clients/cli/connections.c:7989
 #, c-format
 msgid "Error: Failed to add '%s' connection: %s"
-msgstr "Erro: Falha ao adicionar a conexão “%s”: %s"
+msgstr "Erro: falha ao adicionar a conexão \"%s\": %s"
 
-#: ../clients/cli/connections.c:4681
+#: ../clients/cli/connections.c:4364
 #, c-format
 msgid ""
 "Warning: There is another connection with the name '%1$s'. Reference the "
@@ -1317,76 +1157,50 @@ msgid_plural ""
 "Warning: There are %3$u other connections with the name '%1$s'. Reference "
 "the connection by its uuid '%2$s'\n"
 msgstr[0] ""
-"Aviso: Há outra conexão com o nome “%1$s”. Referencie a conexão por seu uuid "
-"“%2$s”\n"
 msgstr[1] ""
-"Aviso: Há outras %3$u conexões com o nome “%1$s”. Referencie a conexão por "
-"seu uuid “%2$s”\n"
 
-#: ../clients/cli/connections.c:4690
+#: ../clients/cli/connections.c:4373
 #, c-format
 msgid "Connection '%s' (%s) successfully added.\n"
-msgstr "A conexão “%s” (%s) foi adicionada com sucesso.\n"
-
-#: ../clients/cli/connections.c:4743 ../clients/cli/connections.c:6690
-#: ../clients/cli/connections.c:6691 ../clients/cli/devices.c:512
-#: ../clients/cli/devices.c:519 ../clients/cli/devices.c:1238
-#: ../clients/cli/general.c:157 ../clients/cli/utils.h:292
-#: ../clients/common/nm-client-utils.c:279
-#: ../clients/common/nm-meta-setting-desc.c:754
-#: ../clients/common/nm-meta-setting-desc.c:2704
-msgid "no"
-msgstr "não"
-
-#: ../clients/cli/connections.c:4744 ../clients/cli/connections.c:6690
-#: ../clients/cli/connections.c:6691 ../clients/cli/devices.c:511
-#: ../clients/cli/devices.c:518 ../clients/cli/devices.c:1238
-#: ../clients/cli/general.c:156 ../clients/cli/utils.h:292
-#: ../clients/common/nm-client-utils.c:278
-#: ../clients/common/nm-meta-setting-desc.c:754
-#: ../clients/common/nm-meta-setting-desc.c:2701
-msgid "yes"
-msgstr "sim"
+msgstr "A conexão \"%s\" (%s) foi adicionada com sucesso.\n"
 
-#: ../clients/cli/connections.c:4828
+#: ../clients/cli/connections.c:4511
 #, c-format
 msgid ""
 "You can specify this option more than once. Press <Enter> when you're done.\n"
 msgstr ""
-"Você pode especificar essa opção mais de uma vez. Pressione <Enter> quando "
-"tiver concluído.\n"
 
 #. Ask for optional arguments.
-#: ../clients/cli/connections.c:4927
-#, c-format
+#: ../clients/cli/connections.c:4610
+#, fuzzy, c-format
 msgid "There is %d optional setting for %s.\n"
 msgid_plural "There are %d optional settings for %s.\n"
-msgstr[0] "Há %d definição opcional para %s.\n"
-msgstr[1] "Há %d definições opcionais para “%s”.\n"
+msgstr[0] "Há %d argumento opcional para o tipo de conexão \"%s\".\n"
+msgstr[1] "Há %d argumentos opcionais para o tipo de conexão \"%s\".\n"
 
-#: ../clients/cli/connections.c:4930
+#: ../clients/cli/connections.c:4613
 #, c-format
 msgid "Do you want to provide it? %s"
 msgid_plural "Do you want to provide them? %s"
 msgstr[0] "Você deseja fornecê-lo? %s"
 msgstr[1] "Você deseja fornecê-los? %s"
 
-#: ../clients/cli/connections.c:5063 ../clients/cli/utils.c:294
+#: ../clients/cli/connections.c:4749 ../clients/cli/utils.c:303
 #, c-format
 msgid "Error: value for '%s' argument is required."
-msgstr "Erro: o valor para o argumento “%s” é necessário."
+msgstr "Erro: é necessário valor para o argumento \"%s\"."
 
-#: ../clients/cli/connections.c:5070
+#: ../clients/cli/connections.c:4755
 #, c-format
 msgid "Error: 'save': %s."
-msgstr "Erro: “save”: %s."
+msgstr "Erro: \"save\": %s."
 
-#: ../clients/cli/connections.c:5156 ../clients/cli/connections.c:5167
-#, c-format
+#: ../clients/cli/connections.c:4843 ../clients/cli/connections.c:4854
+#, fuzzy, c-format
 msgid "Error: '%s' argument is required."
-msgstr "Erro: o argumento “%s” é necessário."
+msgstr "Erro: é necessário o argumento \"type\"."
 
-#: ../clients/cli/connections.c:6132
+#: ../clients/cli/connections.c:5832
 #, c-format
 msgid "['%s' setting values]\n"
 msgstr "[valores da definição %s\"]\n"
@@ -1394,7 +1208,7 @@ msgstr "[valores da definição %s\"]\n"
 #. TRANSLATORS: do not translate command names and keywords before ::
 #. *              However, you should translate terms enclosed in <>.
 #.
-#: ../clients/cli/connections.c:6241
+#: ../clients/cli/connections.c:5911
 #, c-format
 msgid ""
 "---[ Main menu ]---\n"
@@ -1427,7 +1241,7 @@ msgstr ""
 "nmcli    <opção-conf> <valor>      :: configuração do nmcli\n"
 "quit                               :: sai do nmcli\n"
 
-#: ../clients/cli/connections.c:6268
+#: ../clients/cli/connections.c:5938
 #, c-format
 msgid ""
 "goto <setting>[.<prop>] | <prop>  :: enter setting/property for editing\n"
@@ -1446,7 +1260,7 @@ msgstr ""
 "          nmcli connection> goto secondaries\n"
 "          nmcli> goto ipv4.addresses\n"
 
-#: ../clients/cli/connections.c:6275
+#: ../clients/cli/connections.c:5945
 #, c-format
 msgid ""
 "remove <setting>[.<prop>]  :: remove setting or reset property value\n"
@@ -1467,7 +1281,7 @@ msgstr ""
 "Exemplos: nmcli> remove wifi-sec\n"
 "          nmcli> remove eth.mtu\n"
 
-#: ../clients/cli/connections.c:6282
+#: ../clients/cli/connections.c:5952
 #, c-format
 msgid ""
 "set [<setting>.<prop> <value>]  :: set property value\n"
@@ -1482,7 +1296,7 @@ msgstr ""
 "\n"
 "Exemplo: nmcli> set con.id Minha conexão\n"
 
-#: ../clients/cli/connections.c:6287
+#: ../clients/cli/connections.c:5957
 #, c-format
 msgid ""
 "describe [<setting>.<prop>]  :: describe property\n"
@@ -1495,7 +1309,7 @@ msgstr ""
 "Mostra a descrição da propriedade. Você pode consultar a página do manual de "
 "nm-settings(5) para ver todas as configurações e propriedades do NM.\n"
 
-#: ../clients/cli/connections.c:6292
+#: ../clients/cli/connections.c:5962
 #, c-format
 msgid ""
 "print [all]  :: print setting or connection values\n"
@@ -1510,7 +1324,7 @@ msgstr ""
 "\n"
 "Exemplo: nmcli ipv4> print all\n"
 
-#: ../clients/cli/connections.c:6297
+#: ../clients/cli/connections.c:5967
 #, c-format
 msgid ""
 "verify [all | fix]  :: verify setting or connection validity\n"
@@ -1526,16 +1340,15 @@ msgid ""
 msgstr ""
 "verify [all | fix]  :: verifica a validade da definição ou da conexão\n"
 "\n"
-"Verifica se a definição ou conexão é válida e se pode ser armazenada "
-"depois.\n"
-"Isto indica valores inválidos ou erros. Alguns erros podem ser corrigidos\n"
+"Verifica se a definição ou conexão é válida e se pode ser armazenada depois. "
+"Isto indica valores inválidos ou erros. Alguns erros podem ser corrigidos "
 "automaticamente com a opção \"fix\".\n"
 "\n"
 "Exemplos: nmcli> verify\n"
 "          nmcli> verify fix\n"
 "          nmcli bond> verify\n"
 
-#: ../clients/cli/connections.c:6306
+#: ../clients/cli/connections.c:5976
 #, c-format
 msgid ""
 "save [persistent|temporary]  :: save the connection\n"
@@ -1563,7 +1376,7 @@ msgstr ""
 "remover por completo a conexão permanente, o perfil de conexão deve ser\n"
 "excluído.\n"
 
-#: ../clients/cli/connections.c:6317
+#: ../clients/cli/connections.c:5987
 #, c-format
 msgid ""
 "activate [<ifname>] [/<ap>|<nsp>]  :: activate the connection\n"
@@ -1582,10 +1395,9 @@ msgstr ""
 "Opções disponíveis:\n"
 "<nome-if>    - dispositivo que ativará a conexão\n"
 "/<ap>|<nsp>  - ponto de acesso (Wi-Fi) ou provedor de serviço de rede "
-"(WiMAX)\n"
-"                 (preceda com / quando o <nome-if> não for especificado)\n"
+"(WiMAX) (preceda com / quando o <nome-if> não for especificado)\n"
 
-#: ../clients/cli/connections.c:6324 ../clients/cli/connections.c:6482
+#: ../clients/cli/connections.c:5994 ../clients/cli/connections.c:6153
 #, c-format
 msgid ""
 "back  :: go to upper menu level\n"
@@ -1594,7 +1406,7 @@ msgstr ""
 "back  :: vai ao nível de menu superior\n"
 "\n"
 
-#: ../clients/cli/connections.c:6327
+#: ../clients/cli/connections.c:5997
 #, c-format
 msgid ""
 "help/? [<command>]  :: help for the nmcli commands\n"
@@ -1603,7 +1415,7 @@ msgstr ""
 "help/? [<command>]  :: ajuda para os comandos do nmcli\n"
 "\n"
 
-#: ../clients/cli/connections.c:6330
+#: ../clients/cli/connections.c:6000
 #, c-format
 msgid ""
 "nmcli [<conf-option> <value>]  :: nmcli configuration\n"
@@ -1630,7 +1442,7 @@ msgstr ""
 "          nmcli> nmcli save-confirmation no\n"
 "          nmcli> nmcli prompt-color 3\n"
 
-#: ../clients/cli/connections.c:6352 ../clients/cli/connections.c:6488
+#: ../clients/cli/connections.c:6022 ../clients/cli/connections.c:6159
 #, c-format
 msgid ""
 "quit  :: exit nmcli\n"
@@ -1643,16 +1455,16 @@ msgstr ""
 "Este comando sai do nmcli. Quando a conexão que está sendo editada não foi "
 "salva, o usuário é solicitado a confirmar a ação.\n"
 
-#: ../clients/cli/connections.c:6357 ../clients/cli/connections.c:6493
-#: ../clients/cli/connections.c:6912 ../clients/cli/connections.c:7839
+#: ../clients/cli/connections.c:6027 ../clients/cli/connections.c:6164
+#: ../clients/cli/connections.c:6600 ../clients/cli/connections.c:7557
 #, c-format
 msgid "Unknown command: '%s'\n"
-msgstr "Comando desconhecido: “%s”\n"
+msgstr "Comando desconhecido: \"%s\"\n"
 
 #. TRANSLATORS: do not translate command names and keywords before ::
 #. *              However, you should translate terms enclosed in <>.
 #.
-#: ../clients/cli/connections.c:6422
+#: ../clients/cli/connections.c:6093
 #, c-format
 msgid ""
 "---[ Property menu ]---\n"
@@ -1673,14 +1485,14 @@ msgstr ""
 "change                           :: modifica o valor atual\n"
 "remove   [<índice> | <opção>]    :: exclui o valor\n"
 "describe                         :: descreve propriedade\n"
-"print    [definição | conexão]   :: exibe valor(es) da propriedade "
+"print    [setting | connection]  :: exibe valor(es) da propriedade "
 "(definição/conexão)\n"
 "back                             :: vai ao nível superior\n"
 "help/?   [<comando>]             :: exibe esta ajuda ou descrição de "
 "comando\n"
 "quit                             :: sai do nmcli\n"
 
-#: ../clients/cli/connections.c:6447
+#: ../clients/cli/connections.c:6118
 #, c-format
 msgid ""
 "set [<value>]  :: set new value\n"
@@ -1691,7 +1503,7 @@ msgstr ""
 "\n"
 "Este comando configura o <valor> fornecido à propriedade\n"
 
-#: ../clients/cli/connections.c:6451
+#: ../clients/cli/connections.c:6122
 #, c-format
 msgid ""
 "add [<value>]  :: append new value to the property\n"
@@ -1706,7 +1518,7 @@ msgstr ""
 "propriedade seja um tipo de contêiner. Para propriedades com valores únicos, "
 "isto substitui o valor (semelhante ao \"set\").\n"
 
-#: ../clients/cli/connections.c:6457
+#: ../clients/cli/connections.c:6128
 #, c-format
 msgid ""
 "change  :: change current value\n"
@@ -1717,7 +1529,7 @@ msgstr ""
 "\n"
 "Exibe o valor atual e permite sua edição.\n"
 
-#: ../clients/cli/connections.c:6461
+#: ../clients/cli/connections.c:6132
 #, c-format
 msgid ""
 "remove [<value>|<index>|<option name>]  :: delete the value\n"
@@ -1738,19 +1550,20 @@ msgid ""
 msgstr ""
 "remove [<valor>|<índice>|<nome-opção>]  :: exclui o valor\n"
 "\n"
-"Remove o valor da propriedade. Para propriedades de valor único, isso\n"
-"define a propriedade de volta para seu valor padrão. Para propriedades\n"
-"do tipo contêiner, isso remove todos os valores daquela propriedade,\n"
-"ou você pode especificar um argumento para remover apenas um único item\n"
-"ou opção. O argumento é um valor ou um índice do item para remover, ou\n"
-"um nome de opção (para propriedades com opções nomeadas).\n"
+"Remove o valor da propriedade. Para propriedades de valor único, isso "
+"define\n"
+"a propriedade de volta para seu valor padrão. Para propriedades do tipo\n"
+"contêiner, isso remove todos os valores daquela propriedade, ou você pode\n"
+"especificar um argumento para remover apenas um único item ou opção.\n"
+"O argumento é um valor ou um índice do item para remover, ou um nome de\n"
+"opção (para propriedades com opções nomeadas).\n"
 "\n"
 "Exemplos: nmcli ipv4.dns> remove 8.8.8.8\n"
 "          nmcli ipv4.dns> remove 2\n"
 "          nmcli bond.options> remove downdelay\n"
 "\n"
 
-#: ../clients/cli/connections.c:6472
+#: ../clients/cli/connections.c:6143
 #, c-format
 msgid ""
 "describe  :: describe property\n"
@@ -1763,7 +1576,7 @@ msgstr ""
 "Mostra a descrição da propriedade. Você pode consultar a página do manual nm-"
 "settings(5) para ver todas as configurações e propriedades do NM.\n"
 
-#: ../clients/cli/connections.c:6477
+#: ../clients/cli/connections.c:6148
 #, c-format
 msgid ""
 "print [property|setting|connection]  :: print property (setting, connection) "
@@ -1778,7 +1591,7 @@ msgstr ""
 "Mostra o valor da propriedade. Fornecendo um argumento, você também pode "
 "exibir valores para toda a conexão ou definição.\n"
 
-#: ../clients/cli/connections.c:6485
+#: ../clients/cli/connections.c:6156
 #, c-format
 msgid ""
 "help/? [<command>]  :: help for nmcli commands\n"
@@ -1787,96 +1600,96 @@ msgstr ""
 "help/? [<comando>]  :: ajuda para os comandos do nmcli\n"
 "\n"
 
-#: ../clients/cli/connections.c:6579
+#: ../clients/cli/connections.c:6250
 #, c-format
 msgid "Error: Connection activation failed.\n"
 msgstr "Erro: Ativação da conexão falhou.\n"
 
-#: ../clients/cli/connections.c:6670
+#: ../clients/cli/connections.c:6345
 #, c-format
 msgid "Error: setting '%s' is mandatory and cannot be removed.\n"
-msgstr "Erro: a definição “%s” é obrigatória e não pode ser removida.\n"
+msgstr "Erro: a definição \"%s\" é obrigatória e não pode ser removida.\n"
 
 #. TRANSLATORS: status line in nmcli connection editor
-#: ../clients/cli/connections.c:6688
+#: ../clients/cli/connections.c:6363
 #, c-format
 msgid "[ Type: %s | Name: %s | UUID: %s | Dirty: %s | Temp: %s ]\n"
 msgstr "[ Tipo: %s | Nome: %s | UUID: %s | Impurezas: %s | Temp: %s ]\n"
 
-#: ../clients/cli/connections.c:6724
+#: ../clients/cli/connections.c:6399
 #, c-format
 msgid "The connection is not saved. Do you really want to quit? %s"
 msgstr "A conexão não foi salva. Você realmente deseja sair? %s"
 
-#: ../clients/cli/connections.c:6770
+#: ../clients/cli/connections.c:6448
 #, c-format
 msgid ""
 "The connection profile has been removed from another client. You may type "
 "'save' in the main menu to restore it.\n"
 msgstr ""
-"O perfil de conexão foi removido do outro cliente. Você pode digitar “save” "
-"no menu principal para recuperá-lo.\n"
+"O perfil de conexão foi removido do outro cliente. Você pode digitar \"save"
+"\" no menu principal para recuperá-lo.\n"
 
-#: ../clients/cli/connections.c:6801 ../clients/cli/connections.c:7193
-#: ../clients/cli/connections.c:7251
+#: ../clients/cli/connections.c:6478 ../clients/cli/connections.c:6892
+#: ../clients/cli/connections.c:6950
 #, c-format
 msgid "Allowed values for '%s' property: %s\n"
-msgstr "Valores permitidos para a propriedade “%s”: %s\n"
+msgstr "Valores permitidos para a propriedade \"%s\": %s\n"
 
-#: ../clients/cli/connections.c:6804 ../clients/cli/connections.c:7196
-#: ../clients/cli/connections.c:7254
+#: ../clients/cli/connections.c:6481 ../clients/cli/connections.c:6895
+#: ../clients/cli/connections.c:6953
 #, c-format
 msgid "Enter '%s' value: "
-msgstr "Digite o valor de “%s”: "
+msgstr "Digite o valor de \"%s\": "
 
-#: ../clients/cli/connections.c:6818 ../clients/cli/connections.c:6838
-#: ../clients/cli/connections.c:7200 ../clients/cli/connections.c:7259
+#: ../clients/cli/connections.c:6496 ../clients/cli/connections.c:6518
+#: ../clients/cli/connections.c:6899 ../clients/cli/connections.c:6958
 #, c-format
 msgid "Error: failed to set '%s' property: %s\n"
-msgstr "Erro: falha ao definir a propriedade “%s”: %s\n"
+msgstr "Erro: falha ao definir a propriedade \"%s\": %s\n"
 
-#: ../clients/cli/connections.c:6832
+#: ../clients/cli/connections.c:6512
 #, c-format
 msgid "Edit '%s' value: "
-msgstr "Edite o valor de “%s”: "
+msgstr "Edite o valor de \"%s\": "
 
-#: ../clients/cli/connections.c:6858 ../clients/cli/settings.c:394
+#: ../clients/cli/connections.c:6541 ../clients/cli/settings.c:392
 #, c-format
 msgid "Error: %s\n"
 msgstr "Erro: %s\n"
 
-#: ../clients/cli/connections.c:6864 ../clients/cli/connections.c:7354
-#: ../clients/cli/connections.c:7405
+#: ../clients/cli/connections.c:6547 ../clients/cli/connections.c:7053
+#: ../clients/cli/connections.c:7104
 #, c-format
 msgid "Error: failed to remove value of '%s': %s\n"
-msgstr "Erro: falha ao remover valor de “%s”: %s\n"
+msgstr "Erro: falha ao remover valor de \"%s\": %s\n"
 
-#: ../clients/cli/connections.c:6885
+#: ../clients/cli/connections.c:6568
 #, c-format
 msgid "Unknown command argument: '%s'\n"
-msgstr "Argumento de comando desconhecido: “%s”\n"
+msgstr "Argumento de comando desconhecido: \"%s\"\n"
 
-#: ../clients/cli/connections.c:6975
+#: ../clients/cli/connections.c:6671
 #, c-format
 msgid "Available settings: %s\n"
 msgstr "Configurações disponíveis: %s\n"
 
-#: ../clients/cli/connections.c:6987
+#: ../clients/cli/connections.c:6683
 #, c-format
 msgid "Error: invalid setting name; %s\n"
 msgstr "Erro: nome de configuração inválido; %s\n"
 
-#: ../clients/cli/connections.c:7004
+#: ../clients/cli/connections.c:6700
 #, c-format
 msgid "Available properties: %s\n"
 msgstr "Propriedades disponíveis: %s\n"
 
-#: ../clients/cli/connections.c:7012
+#: ../clients/cli/connections.c:6708
 #, c-format
 msgid "Error: property %s\n"
 msgstr "Erro: propriedade %s\n"
 
-#: ../clients/cli/connections.c:7053
+#: ../clients/cli/connections.c:6749
 #, c-format
 msgid ""
 "Saving the connection with 'autoconnect=yes'. That might result in an "
@@ -1887,433 +1700,431 @@ msgstr ""
 "ativação imediata da conexão.\n"
 "Você ainda deseja salvar? %s"
 
-#: ../clients/cli/connections.c:7132
+#: ../clients/cli/connections.c:6832
 #, c-format
 msgid "You may edit the following settings: %s\n"
 msgstr "Você pode editar as seguintes configurações: %s\n"
 
-#: ../clients/cli/connections.c:7161
+#: ../clients/cli/connections.c:6862
 #, c-format
 msgid ""
 "The connection profile has been removed from another client. You may type "
 "'save' to restore it.\n"
 msgstr ""
-"O perfil de conexão foi removido de outro cliente. Você pode digitar “save” "
-"para recuperá-lo.\n"
+"O perfil de conexão foi removido de outro cliente. Você pode digitar \"save"
+"\" para recuperá-lo.\n"
 
-#: ../clients/cli/connections.c:7204 ../clients/cli/connections.c:7449
-#: ../clients/cli/connections.c:7481
+#: ../clients/cli/connections.c:6903 ../clients/cli/connections.c:7148
+#: ../clients/cli/connections.c:7180
 #, c-format
 msgid "Error: no setting selected; valid are [%s]\n"
 msgstr "Erro: nenhuma configuração selecionada; as válidas são [%s]\n"
 
-#: ../clients/cli/connections.c:7205
+#: ../clients/cli/connections.c:6904
 #, c-format
 msgid "use 'goto <setting>' first, or 'set <setting>.<property>'\n"
-msgstr "primeiro use “goto <definição>” ou “set <definição>.<propriedade>”\n"
+msgstr ""
+"primeiro use \"goto <definição>\" ou \"set <definição>.<propriedade>\"\n"
 
-#: ../clients/cli/connections.c:7220 ../clients/cli/connections.c:7381
-#: ../clients/cli/connections.c:7471
+#: ../clients/cli/connections.c:6919 ../clients/cli/connections.c:7080
+#: ../clients/cli/connections.c:7170
 #, c-format
 msgid "Error: invalid setting argument '%s'; valid are [%s]\n"
-msgstr "Erro: argumento de configuração “%s” inválido; os válidos são [%s]\n"
+msgstr "Erro: argumento de configuração \"%s\" inválido; os válidos são [%s]\n"
 
-#: ../clients/cli/connections.c:7229
+#: ../clients/cli/connections.c:6928
 #, c-format
 msgid "Error: missing setting for '%s' property\n"
-msgstr "Erro: falta definição para a propriedade “%s”\n"
+msgstr "Erro: falta configuração para a propriedade \"%s\"\n"
 
-#: ../clients/cli/connections.c:7236
+#: ../clients/cli/connections.c:6935
 #, c-format
 msgid "Error: invalid property: %s\n"
 msgstr "Erro: propriedade inválida: %s\n"
 
-#: ../clients/cli/connections.c:7290
+#: ../clients/cli/connections.c:6989
 #, c-format
 msgid "Error: unknown setting '%s'\n"
-msgstr "Erro: definição desconhecida: “%s”\n"
+msgstr "Erro: definição desconhecida: \"%s\"\n"
 
-#: ../clients/cli/connections.c:7315
+#: ../clients/cli/connections.c:7014
 #, c-format
 msgid "You may edit the following properties: %s\n"
 msgstr "Você pode editar as seguintes propriedades: %s\n"
 
-#: ../clients/cli/connections.c:7359
+#: ../clients/cli/connections.c:7058
 #, c-format
 msgid "Error: no argument given; valid are [%s]\n"
 msgstr "Erro: nenhum argumento fornecido; os válidos são [%s]\n"
 
-#: ../clients/cli/connections.c:7378
+#: ../clients/cli/connections.c:7077
 #, c-format
 msgid "Setting '%s' is not present in the connection.\n"
-msgstr "A configuração “%s” não está presente na conexão.\n"
+msgstr "A configuração \"%s\" não está presente na conexão.\n"
 
-#: ../clients/cli/connections.c:7426
+#: ../clients/cli/connections.c:7125
 #, c-format
 msgid "Error: %s properties, nor it is a setting name.\n"
 msgstr "Erro: propriedades %s, tampouco é um nome de definição.\n"
 
-#: ../clients/cli/connections.c:7450 ../clients/cli/connections.c:7482
+#: ../clients/cli/connections.c:7149 ../clients/cli/connections.c:7181
 #, c-format
 msgid "use 'goto <setting>' first, or 'describe <setting>.<property>'\n"
 msgstr ""
-"primeiro use “goto <definição>” ou “describe <definição>.<propriedade>”\n"
+"primeiro use \"goto <definição>\" ou \"describe <definição>.<propriedade>\"\n"
 
-#: ../clients/cli/connections.c:7505
+#: ../clients/cli/connections.c:7204
 #, c-format
 msgid "Error: invalid property: %s, neither a valid setting name.\n"
 msgstr ""
 "Erro: propriedade inválida: %s, tampouco um nome de definição válida.\n"
 
-#: ../clients/cli/connections.c:7535
+#: ../clients/cli/connections.c:7234
 #, c-format
 msgid "Error: unknown setting: '%s'\n"
-msgstr "Erro: definição desconhecida: “%s”\n"
+msgstr "Erro: definição desconhecida: \"%s\"\n"
 
-#: ../clients/cli/connections.c:7540
+#: ../clients/cli/connections.c:7239
 #, c-format
 msgid "Error: '%s' setting not present in the connection\n"
-msgstr "Erro: a definição “%s” não está presente na conexão\n"
+msgstr "Erro: a definição \"%s\" não está presente na conexão\n"
 
-#: ../clients/cli/connections.c:7571
+#: ../clients/cli/connections.c:7270
 #, c-format
 msgid "Error: invalid property: %s%s\n"
 msgstr "Erro: propriedade inválida: %s%s\n"
 
-#: ../clients/cli/connections.c:7573
+#: ../clients/cli/connections.c:7272
 msgid ", neither a valid setting name"
 msgstr ", tampouco um nome de configuração válido"
 
-#: ../clients/cli/connections.c:7589
+#: ../clients/cli/connections.c:7288
 #, c-format
 msgid "Invalid verify option: %s\n"
 msgstr "Opção de verificação inválida: %s\n"
 
-#: ../clients/cli/connections.c:7597
+#: ../clients/cli/connections.c:7296
 #, c-format
 msgid "Verify setting '%s': %s\n"
-msgstr "Verificar definição “%s”: %s\n"
+msgstr "Verificar configuração \"%s\": %s\n"
 
-#: ../clients/cli/connections.c:7612
+#: ../clients/cli/connections.c:7311
 #, c-format
 msgid "Verify connection: %s\n"
 msgstr "Verificar conexão: %s\n"
 
-#: ../clients/cli/connections.c:7615
+#: ../clients/cli/connections.c:7314
 #, c-format
 msgid "The error cannot be fixed automatically.\n"
 msgstr "O erro não pode ser corrigido automaticamente.\n"
 
-#: ../clients/cli/connections.c:7632
+#: ../clients/cli/connections.c:7331
 #, c-format
 msgid "Error: invalid argument '%s'\n"
-msgstr "Erro: argumento “%s” inválido\n"
+msgstr "Erro: argumento \"%s\" inválido\n"
 
-#: ../clients/cli/connections.c:7664
+#: ../clients/cli/connections.c:7363
 #, c-format
 msgid "Error: Failed to save '%s' (%s) connection: %s\n"
-msgstr "Erro: Falha ao salvar a conexão “%s” (%s): %s\n"
+msgstr "Erro: Falha ao salvar a conexão \"%s\" (%s): %s\n"
 
-#: ../clients/cli/connections.c:7671
+#: ../clients/cli/connections.c:7370
 #, c-format
 msgid "Connection '%s' (%s) successfully saved.\n"
-msgstr "A conexão “%s” (%s) foi salva com sucesso.\n"
+msgstr "A conexão \"%s\" (%s) foi salva com sucesso.\n"
 
-#: ../clients/cli/connections.c:7672
+#: ../clients/cli/connections.c:7371
 #, c-format
 msgid "Connection '%s' (%s) successfully updated.\n"
-msgstr "A conexão “%s” (%s) foi atualizada com sucesso.\n"
+msgstr "A conexão \"%s\" (%s) foi atualizada com sucesso.\n"
 
-#: ../clients/cli/connections.c:7704
+#: ../clients/cli/connections.c:7403
 #, c-format
 msgid "Error: connection verification failed: %s\n"
 msgstr "Erro: verificação de conexão falhou: %s\n"
 
-#: ../clients/cli/connections.c:7705
+#: ../clients/cli/connections.c:7404
 msgid "(unknown error)"
 msgstr "(erro desconhecido)"
 
-#: ../clients/cli/connections.c:7706
+#: ../clients/cli/connections.c:7405
 #, c-format
 msgid "You may try running 'verify fix' to fix errors.\n"
-msgstr "Você pode tentar executar “verify fix” para corrigir erros.\n"
+msgstr "Você pode tentar executar \"verify fix\" para corrigir erros.\n"
 
-#: ../clients/cli/connections.c:7728
+#: ../clients/cli/connections.c:7427
 #, c-format
 msgid "Error: connection is not saved. Type 'save' first.\n"
-msgstr "Erro: a conexão não foi salva. Primeiro digite “save”.\n"
+msgstr "Erro: a conexão não foi salva. Primeiro digite \"save\".\n"
 
-#: ../clients/cli/connections.c:7732
+#: ../clients/cli/connections.c:7431
 #, c-format
 msgid "Error: connection is not valid: %s\n"
 msgstr "Erro: a conexão não é válida: %s\n"
 
-#: ../clients/cli/connections.c:7742
+#: ../clients/cli/connections.c:7441
 #, c-format
 msgid "Error: Cannot activate connection: %s.\n"
 msgstr "Erro: Não foi possível ativar conexão: %s.\n"
 
-#: ../clients/cli/connections.c:7751
+#: ../clients/cli/connections.c:7450
 #, c-format
 msgid "Error: Failed to activate '%s' (%s) connection: %s\n"
-msgstr "Erro: Falha ao ativar a conexão “%s” (%s): %s\n"
+msgstr "Erro: Falha ao ativar a conexão \"%s\" (%s): %s\n"
 
-#: ../clients/cli/connections.c:7757
+#: ../clients/cli/connections.c:7456
 msgid "Monitoring connection activation (press any key to continue)\n"
 msgstr ""
 "Monitorando ativação da conexão (pressione qualquer tecla para continuar)\n"
 
-# status-line é uma opção do nmcli; não traduzir
-#: ../clients/cli/connections.c:7793
+#: ../clients/cli/connections.c:7492
 #, c-format
 msgid "Error: status-line: %s\n"
-msgstr "Erro: status-line: %s\n"
+msgstr "Erro: estado da linha (\"status-line\"): %s\n"
 
-# save-confirmation é uma opção do nmcli; não traduzir
-#: ../clients/cli/connections.c:7801
+#: ../clients/cli/connections.c:7500
 #, c-format
 msgid "Error: save-confirmation: %s\n"
-msgstr "Erro: save-confirmation: %s\n"
+msgstr "Erro: salvar confirmação: %s\n"
 
-# show-secrets é uma opção do nmcli; não traduzir
-#: ../clients/cli/connections.c:7809
+#: ../clients/cli/connections.c:7508
 #, c-format
 msgid "Error: show-secrets: %s\n"
 msgstr "Erro: show-secrets: %s\n"
 
-#: ../clients/cli/connections.c:7816
+#: ../clients/cli/connections.c:7517
+#, c-format
+msgid "Error: bad color: %s\n"
+msgstr "Erro: cor inválida: %s\n"
+
+#: ../clients/cli/connections.c:7532
 #, c-format
 msgid "Current nmcli configuration:\n"
 msgstr "Configuração atual do nmcli:\n"
 
-#: ../clients/cli/connections.c:7824
+#: ../clients/cli/connections.c:7542
 #, c-format
 msgid "Invalid configuration option '%s'; allowed [%s]\n"
-msgstr "A opção de configuração “%s” é inválida; é permitido [%s]\n"
+msgstr "A opção de configuração \"%s\" é inválida; é permitido [%s]\n"
 
-#: ../clients/cli/connections.c:8042
+#: ../clients/cli/connections.c:7762
 #, c-format
-msgid "Error: only one of 'id', 'filename', uuid, or 'path' can be provided."
-msgstr ""
-"Erro: apenas um “id”, “filename”, uuid, ou “path” podem ser fornecidos."
+msgid "Error: only one of 'id', uuid, or 'path' can be provided."
+msgstr "Erro: apenas um \"id\", uuid, ou \"path\" podem ser fornecidos."
 
-#: ../clients/cli/connections.c:8056 ../clients/cli/connections.c:8216
+#: ../clients/cli/connections.c:7777 ../clients/cli/connections.c:7946
 #, c-format
 msgid "Error: Unknown connection '%s'."
-msgstr "Erro: conexão desconhecida: “%s”."
+msgstr "Erro: conexão desconhecida: \"%s\"."
 
-#: ../clients/cli/connections.c:8072
+#: ../clients/cli/connections.c:7795
 #, c-format
 msgid "Warning: editing existing connection '%s'; 'type' argument is ignored\n"
 msgstr ""
-"Aviso: editando a conexão existente “%s”; o argumento “type” é ignorado\n"
+"Aviso: editando a conexão existente \"%s\"; o argumento \"type\" é ignorado\n"
 
-#: ../clients/cli/connections.c:8075
+#: ../clients/cli/connections.c:7798
 #, c-format
 msgid ""
 "Warning: editing existing connection '%s'; 'con-name' argument is ignored\n"
 msgstr ""
-"Aviso: editando a conexão existente “%s”; o argumento “con-name” é ignorado\n"
+"Aviso: editando a conexão existente \"%s\"; o argumento \"con-name\" é "
+"ignorado\n"
 
-#: ../clients/cli/connections.c:8102
+#: ../clients/cli/connections.c:7820
 #, c-format
 msgid "Valid connection types: %s\n"
 msgstr "Tipos de conexões válidos: %s\n"
 
-#: ../clients/cli/connections.c:8104
+#: ../clients/cli/connections.c:7822
 #, c-format
 msgid "Error: invalid connection type; %s\n"
 msgstr "Erro: tipo de conexão inválido; %s\n"
 
-#: ../clients/cli/connections.c:8139
+#: ../clients/cli/connections.c:7862
 #, c-format
 msgid "===| nmcli interactive connection editor |==="
 msgstr "===| editor interativo de conexões do nmcli |==="
 
-#: ../clients/cli/connections.c:8142
+#: ../clients/cli/connections.c:7865
 #, c-format
 msgid "Editing existing '%s' connection: '%s'"
-msgstr "Editando conexão existente “%s”: “%s”"
+msgstr "Editando conexão existente \"%s\": \"%s\""
 
-#: ../clients/cli/connections.c:8144
+#: ../clients/cli/connections.c:7867
 #, c-format
 msgid "Adding a new '%s' connection"
-msgstr "Adicionando uma nova conexão “%s”"
+msgstr "Adicionando uma nova conexão \"%s\""
 
-#: ../clients/cli/connections.c:8146
+#: ../clients/cli/connections.c:7869
 #, c-format
 msgid "Type 'help' or '?' for available commands."
-msgstr "Digite “help” ou “?” para comandos disponíveis."
-
-#: ../clients/cli/connections.c:8148
-#, c-format
-msgid "Type 'print' to show all the connection properties."
-msgstr "Digite “print” para mostrar todas as propriedades de conexão."
+msgstr "Digite \"help\" ou \"?\" para comandos disponíveis."
 
-#: ../clients/cli/connections.c:8150
+#: ../clients/cli/connections.c:7871
 #, c-format
 msgid "Type 'describe [<setting>.<prop>]' for detailed property description."
 msgstr ""
-"Digite “describe [<definição>.<propriedade>]” para exibir descrição "
+"Digite \"describe [<definição>.<propriedade>]\" para exibir descrição "
 "detalhada da propriedade."
 
-#: ../clients/cli/connections.c:8178
+#: ../clients/cli/connections.c:7906
 #, c-format
 msgid "Error: Failed to modify connection '%s': %s"
-msgstr "Erro: Falha ao modificar a conexão “%s”: %s"
+msgstr "Erro: Falha ao modificar a conexão \"%s\": %s"
 
-#: ../clients/cli/connections.c:8184
+#: ../clients/cli/connections.c:7913
 #, c-format
 msgid "Connection '%s' (%s) successfully modified.\n"
-msgstr "A conexão “%s” (%s) foi modificada com sucesso.\n"
+msgstr "A conexão \"%s\" (%s) foi modificada com sucesso.\n"
 
-#: ../clients/cli/connections.c:8260
+#: ../clients/cli/connections.c:7994
 #, c-format
 msgid "%s (%s) cloned as %s (%s).\n"
 msgstr "%s (%s) clonada como %s (%s).\n"
 
-#: ../clients/cli/connections.c:8325
+#: ../clients/cli/connections.c:8060
 msgid "New connection name: "
 msgstr "Nome da nova conexão: "
 
-#: ../clients/cli/connections.c:8327
+#: ../clients/cli/connections.c:8062
 #, c-format
 msgid "Error: <new name> argument is missing."
 msgstr "Erro: está faltando o argumento <novo nome>."
 
-#: ../clients/cli/connections.c:8332 ../clients/cli/connections.c:8812
+#: ../clients/cli/connections.c:8068 ../clients/cli/connections.c:8570
 #, c-format
 msgid "Error: unknown extra argument: '%s'."
-msgstr "Erro: argumento extra desconhecido: “%s”."
+msgstr "Erro: argumento extra desconhecida: \"%s\"."
 
-#: ../clients/cli/connections.c:8377
+#: ../clients/cli/connections.c:8119
 #, c-format
 msgid "Error: not all connections deleted."
 msgstr "Erro: nem todas as conexões ativas foram excluídas."
 
-#: ../clients/cli/connections.c:8378
+#: ../clients/cli/connections.c:8120
 #, c-format
 msgid "Error: Connection deletion failed: %s"
 msgstr "Erro: a exclusão da conexão falhou: %s"
 
-#: ../clients/cli/connections.c:8434 ../clients/cli/connections.c:8555
+#: ../clients/cli/connections.c:8181 ../clients/cli/connections.c:8306
 #, c-format
 msgid "Error: %s.\n"
-msgstr "Erro: %s.\n"
+msgstr ""
 
-#: ../clients/cli/connections.c:8435 ../clients/cli/connections.c:8556
+#: ../clients/cli/connections.c:8182 ../clients/cli/connections.c:8307
 #, c-format
 msgid "Error: not all connections found."
 msgstr "Erro: nem todas as conexões foram encontradas."
 
 #. truncate trailing ", "
-#: ../clients/cli/connections.c:8486
+#: ../clients/cli/connections.c:8225
 #, c-format
 msgid "Error: cannot delete unknown connection(s): %s."
 msgstr "Erro: não é possível excluir conexão(ões) desconhecida(s): %s."
 
-#: ../clients/cli/connections.c:8496
+#: ../clients/cli/connections.c:8237
 #, c-format
 msgid "%s: connection profile changed\n"
 msgstr "%s: perfil de conexão alterada\n"
 
-#: ../clients/cli/connections.c:8522
+#: ../clients/cli/connections.c:8263
 #, c-format
 msgid "%s: connection profile created\n"
 msgstr "%s: perfil de conexão criada\n"
 
-#: ../clients/cli/connections.c:8531
+#: ../clients/cli/connections.c:8272
 #, c-format
 msgid "%s: connection profile removed\n"
 msgstr "%s: perfil de conexão removida\n"
 
-#: ../clients/cli/connections.c:8593
+#: ../clients/cli/connections.c:8335
 #, c-format
 msgid "Error: failed to reload connections: %s."
 msgstr "Erro: falha ao recarregar conexões: %s."
 
-#: ../clients/cli/connections.c:8626
+#: ../clients/cli/connections.c:8368
 #, c-format
 msgid "Error: failed to load connection: %s."
 msgstr "Erro: falha ao carregar conexão: %s."
 
-#: ../clients/cli/connections.c:8634
+#: ../clients/cli/connections.c:8376
 #, c-format
 msgid "Could not load file '%s'\n"
-msgstr "Não foi possível carregar arquivo “%s”\n"
+msgstr "Não foi possível carregar arquivo \"%s\"\n"
 
-#: ../clients/cli/connections.c:8641
+#: ../clients/cli/connections.c:8383
 msgid "File to import: "
 msgstr "Arquivo a ser importado: "
 
-#: ../clients/cli/connections.c:8672
+#: ../clients/cli/connections.c:8414
 #, c-format
 msgid "Error: No arguments provided."
 msgstr "Erro: nenhum argumento foi fornecido."
 
-#: ../clients/cli/connections.c:8695
+#: ../clients/cli/connections.c:8439
 #, c-format
 msgid "Warning: 'type' already specified, ignoring extra one.\n"
-msgstr "Aviso: “type” já especificado, ignorando o extra.\n"
+msgstr "Aviso: \"type\" já especificado, ignorando o extra.\n"
 
-#: ../clients/cli/connections.c:8709
+#: ../clients/cli/connections.c:8454
 #, c-format
 msgid "Warning: 'file' already specified, ignoring extra one.\n"
-msgstr "Aviso: “file” já especificado, ignorando o extra.\n"
+msgstr "Aviso: \"file\" já especificado, ignorando o extra.\n"
 
-#: ../clients/cli/connections.c:8711
+#: ../clients/cli/connections.c:8456
 #, c-format
 msgid "Unknown parameter: %s"
 msgstr "Parâmetro desconhecido: %s"
 
-#: ../clients/cli/connections.c:8722
+#: ../clients/cli/connections.c:8468
 #, c-format
 msgid "Error: 'type' argument is required."
-msgstr "Erro: é necessário o argumento “type”."
+msgstr "Erro: é necessário o argumento \"type\"."
 
-#: ../clients/cli/connections.c:8726
+#: ../clients/cli/connections.c:8473
 #, c-format
 msgid "Error: 'file' argument is required."
-msgstr "Erro: é necessário o argumento “file”."
+msgstr "Erro: é necessário o argumento \"file\"."
 
-#: ../clients/cli/connections.c:8732
-#, c-format
+#: ../clients/cli/connections.c:8480
+#, fuzzy, c-format
 msgid "Error: failed to find VPN plugin for %s."
-msgstr "Erro: falha ao localizar plug-in VPN par %s."
+msgstr "Erro: falha ao carregar plug-in VPN: %s."
 
-#: ../clients/cli/connections.c:8739 ../clients/cli/connections.c:8831
+#: ../clients/cli/connections.c:8488 ../clients/cli/connections.c:8589
 #, c-format
 msgid "Error: failed to load VPN plugin: %s."
 msgstr "Erro: falha ao carregar plug-in VPN: %s."
 
-#: ../clients/cli/connections.c:8746
+#: ../clients/cli/connections.c:8496
 #, c-format
 msgid "Error: failed to import '%s': %s."
-msgstr "Erro: falha ao importar “%s”: %s."
+msgstr "Erro: falha ao importar \"%s\": %s."
 
-#: ../clients/cli/connections.c:8818
+#: ../clients/cli/connections.c:8576
 msgid "Output file name: "
 msgstr "Nome de arquivo de saída: "
 
-#: ../clients/cli/connections.c:8822
+#: ../clients/cli/connections.c:8580
 #, c-format
 msgid "Error: the connection is not VPN."
 msgstr "Erro: a conexão não é VPN."
 
-#: ../clients/cli/connections.c:8844
+#: ../clients/cli/connections.c:8601
 #, c-format
 msgid "Error: failed to create temporary file %s."
 msgstr "Erro: falha ao criar o arquivo temporário %s."
 
-#: ../clients/cli/connections.c:8852
+#: ../clients/cli/connections.c:8610
 #, c-format
 msgid "Error: failed to export '%s': %s."
-msgstr "Erro: falha ao exportar “%s”: %s."
+msgstr "Erro: falha ao exportar \"%s\": %s."
 
-#: ../clients/cli/connections.c:8864
+#: ../clients/cli/connections.c:8621
 #, c-format
 msgid "Error: failed to read temporary file '%s': %s."
-msgstr "Erro: falha ao ler o arquivo temporário “%s”: %s."
+msgstr "Erro: falha ao ler o arquivo temporário \"%s\": %s."
 
 #. define some prompts
 #: ../clients/cli/devices.c:39
@@ -2324,29 +2135,7 @@ msgstr "Interface: "
 msgid "Interface(s): "
 msgstr "Interface(s): "
 
-#: ../clients/cli/devices.c:73 ../clients/cli/devices.c:1266
-msgid "(none)"
-msgstr "(nenhum(a))"
-
-#: ../clients/cli/devices.c:175 ../clients/cli/devices.c:182
-msgid "(unknown)"
-msgstr "(desconhecido)"
-
-#: ../clients/cli/devices.c:316
-#, c-format
-msgid "<invisible> | %s"
-msgstr "<invisible> | %s"
-
-#: ../clients/cli/devices.c:317
-msgid "<invisible>"
-msgstr "<invisible>"
-
-#: ../clients/cli/devices.c:418
-#, c-format
-msgid "%u Mb/s"
-msgstr "%u Mb/s"
-
-#: ../clients/cli/devices.c:672
+#: ../clients/cli/devices.c:254
 #, c-format
 msgid ""
 "Usage: nmcli device { COMMAND | help }\n"
@@ -2387,45 +2176,8 @@ msgid ""
 "  lldp [list [ifname <ifname>]]\n"
 "\n"
 msgstr ""
-"Usage: nmcli device { COMANDO | help }\n"
-"\n"
-"COMANDO := { status | show | set | connect | reapply | modify | disconnect | "
-"delete | monitor | wifi | lldp }\n"
-"\n"
-"  status\n"
-"\n"
-"  show [<nome-if>]\n"
-"\n"
-"  set [ifname] <nome-if> [autoconnect yes|no] [managed yes|no]\n"
-"\n"
-"  connect <nome-if>\n"
-"\n"
-"  reapply <nome-if>\n"
-"\n"
-"  modify <nome-if> ([+|-]<definição>.<propriedade> <valor>)+\n"
-"\n"
-"  disconnect <nome-if> ...\n"
-"\n"
-"  delete <nome-if> ...\n"
-"\n"
-"  monitor <nome-if> ...\n"
-"\n"
-"  wifi [list [ifname <nome-if>] [bssid <BSSID>]]\n"
-"\n"
-"  wifi connect <(B)SSID> [password <senha>] [wep-key-type key|phrase] "
-"[ifname <nome-if>]\n"
-"                         [bssid <BSSID>] [name <nome>] [private yes|no] "
-"[hidden yes|no]\n"
-"\n"
-"  wifi hotspot [ifname <nome-if>] [con-name <nome>] [ssid <SSID>] [band a|"
-"bg] [channel <canal>] [password <senha>]\n"
-"\n"
-"  wifi rescan [ifname <nome-if>] [[ssid <SSID para buscar>] ...]\n"
-"\n"
-"  lldp [list [ifname <nome-if>]]\n"
-"\n"
 
-#: ../clients/cli/devices.c:695
+#: ../clients/cli/devices.c:277
 #, c-format
 msgid ""
 "Usage: nmcli device status { help }\n"
@@ -2446,17 +2198,17 @@ msgstr ""
 "\n"
 "Exibe o estado de todos os dispositivos.\n"
 "Por padrão, são exibidas as seguintes colunas:\n"
-" DISPOSITIVO - nome da interface\n"
-" TIPO        - tipo de dispositivo\n"
-" ESTADO      - estado do dispositivo\n"
-" CONEXÃO     - conexão ativada no dispositivo (caso haja algum)\n"
-"Colunas exibidas podem ser modificadas utilizando a opção mundial \"--fields"
-"\".\n"
-"\"status\" é o padrão, ou seja, \"nmcli device\" chama \"nmcli device status"
-"\".\n"
+" DEVICE     - nome da interface\n"
+" TYPE       - tipo de dispositivo\n"
+" STATE      - estado do dispositivo\n"
+" CONNECTION - conexão ativada no dispositivo (caso haja algum)\n"
+"Colunas exibidas podem ser modificadas utilizando a opção mundial '--"
+"fields'. 'status' é\n"
+"o comando padrão, o que significa que 'nmcli device' chama 'nmcli device "
+"status'.\n"
 "\n"
 
-#: ../clients/cli/devices.c:710
+#: ../clients/cli/devices.c:292
 #, c-format
 msgid ""
 "Usage: nmcli device show { ARGUMENTS | help }\n"
@@ -2472,11 +2224,11 @@ msgstr ""
 "ARGUMENTOS := [<nome-if>]\n"
 "\n"
 "Exibe detalhes de dispositivo(s).\n"
-"Os detalhes da lista do comando para todos os dispositivos, ou\n"
-"para dispositivos dados.\n"
+"Os detalhes da lista do comando para todos os dispositivos, ou para "
+"dispositivos dados.\n"
 "\n"
 
-#: ../clients/cli/devices.c:721
+#: ../clients/cli/devices.c:303
 #, c-format
 msgid ""
 "Usage: nmcli device connect { ARGUMENTS | help }\n"
@@ -2499,7 +2251,7 @@ msgstr ""
 "connect.\n"
 "\n"
 
-#: ../clients/cli/devices.c:733
+#: ../clients/cli/devices.c:315
 #, c-format
 msgid ""
 "Usage: nmcli device reapply { ARGUMENTS | help }\n"
@@ -2518,7 +2270,7 @@ msgstr ""
 "feitas desde a última aplicação.\n"
 "\n"
 
-#: ../clients/cli/devices.c:744
+#: ../clients/cli/devices.c:326
 #, c-format
 msgid ""
 "Usage: nmcli device modify { ARGUMENTS | --help }\n"
@@ -2539,25 +2291,8 @@ msgid ""
 "nmcli dev mod em1 -ipv4.dns 1\n"
 "nmcli dev mod em1 -ipv6.addr \"abbe::cafe/56\"\n"
 msgstr ""
-"Usage: nmcli device modify { ARGUMENTOS | --help }\n"
-"\n"
-"ARGUMENTS := <nome-if> ([+|-]<definição>.<propriedade> <valor>)+\n"
-"\n"
-"Modifica uma ou mais propriedades atualmente ativa no dispositivo sem\n"
-"modificar o perfil de conexão. As alterações têm efeito imediato. Para\n"
-"propriedades multivaloradas, você pode usar prefixo opcional \"+\" ou \"-\"\n"
-"para o nome da propriedade.\n"
-"O sinal \"+\" permite anexar itens em vez de sobrescrever todo o valor.\n"
-"O sinal \"-\" permite remover os itens selecionados em vez de todo o valor.\n"
-"\n"
-"Exemplos:\n"
-"nmcli dev mod em1 ipv4.method manual ipv4.addr \"192.168.1.2/24, "
-"10.10.1.5/8\"\n"
-"nmcli dev mod em1 +ipv4.dns 8.8.4.4\n"
-"nmcli dev mod em1 -ipv4.dns 1\n"
-"nmcli dev mod em1 -ipv6.addr \"abbe::cafe/56\"\n"
 
-#: ../clients/cli/devices.c:764
+#: ../clients/cli/devices.c:346
 #, c-format
 msgid ""
 "Usage: nmcli device disconnect { ARGUMENTS | help }\n"
@@ -2578,7 +2313,7 @@ msgstr ""
 "conexões futuras sem a intervenção do usuário/manual.\n"
 "\n"
 
-#: ../clients/cli/devices.c:776
+#: ../clients/cli/devices.c:358
 #, c-format
 msgid ""
 "Usage: nmcli device delete { ARGUMENTS | help }\n"
@@ -2593,15 +2328,15 @@ msgid ""
 msgstr ""
 "Uso: nmcli device delete { ARGUMENTOS | help }\n"
 "\n"
-"ARGUMENTOS := <nome-if> ...\n"
+"ARGUMENTOS := <ifname> ...\n"
 "\n"
 "Exclui os dispositivos de software.\n"
-"O comando remove as interfaces. Ele funciona apenas para dispositivos\n"
-"de software, como vínculos, pontes, etc. Dispositivos de hardware não\n"
-"pode ser excluído por este comando.\n"
+"O comando remove as interfaces. Ele funciona apenas para dispositivos de\n"
+"software, como vínculos, pontes, etc. Dispositivos de hardware não pode\n"
+"ser excluído por este comando.\n"
 "\n"
 
-#: ../clients/cli/devices.c:789
+#: ../clients/cli/devices.c:371
 #, c-format
 msgid ""
 "Usage: nmcli device set { ARGUMENTS | help }\n"
@@ -2616,15 +2351,15 @@ msgid ""
 msgstr ""
 "Uso: nmcli device set { ARGUMENTOS | help }\n"
 "\n"
-"ARGUMENTOS   := DISPOSITIVO { PROPRIEDADE [ PROPRIEDADE ... ] }\n"
-"DISPOSITIVO  := [nome-if] <nome-if> \n"
+"ARGUMENTOS := DISPOSITIVO { PROPRIEDADE [ PROPRIEDADE ... ] }\n"
+"DISPOSITIVO     := [nome-if] <nome-if> \n"
 "PROPRIEDADE  := { autoconnect { yes | no } |\n"
-"                { managed { yes | no }\n"
+"             { managed { yes | no }\n"
 "\n"
 "Modifica as propriedades do dispositivo.\n"
 "\n"
 
-#: ../clients/cli/devices.c:802
+#: ../clients/cli/devices.c:384
 #, c-format
 msgid ""
 "Usage: nmcli device monitor { ARGUMENTS | help }\n"
@@ -2645,7 +2380,7 @@ msgstr ""
 "Monitora todos os perfis de conexão no caso de nenhuma ser especificada.\n"
 "\n"
 
-#: ../clients/cli/devices.c:814
+#: ../clients/cli/devices.c:396
 #, c-format
 msgid ""
 "Usage: nmcli device wifi { ARGUMENTS | help }\n"
@@ -2697,52 +2432,8 @@ msgid ""
 "use 'nmcli device wifi list' for that.\n"
 "\n"
 msgstr ""
-"Uso: nmcli device wifi { ARGUMENTOS | help }\n"
-"\n"
-"Realizar operação em dispositivos Wi-Fi.\n"
-"\n"
-"ARGUMENTOS := [list [ifname <nome-if>] [bssid <BSSID>]]\n"
-"\n"
-"Lista pontos de acesso Wi-Fi disponíveis. As opções \"ifname\" e \"bssid\"\n"
-"podem ser usadas para lisar PAs para uma interface particular ou com\n"
-"um BSSID específico.\n"
-"\n"
-"ARGUMENTS := connect <(B)SSID> [password <senha>] [wep-key-type key|phrase]\n"
-"                     [ifname <nome-if>] [bssid <BSSID>] [name <nome>]\n"
-"                     [private yes|no] [hidden yes|no]\n"
-"\n"
-"Conecta a uma rede Wi-Fi especificada por SSID ou BSSID. O comando cria uma\n"
-"nova conexão e então ativa-a em um dispositivo. Isso é uma contrapartida de\n"
-"linha de comando a clicar em um SSID em um cliente GUI. O comando sempre\n"
-"cria uma nova conexão e, portanto, é principalmente útil para se conectar\n"
-"a novas redes Wi-Fi. Se uma conexão para a rede já existir, é melhor trazer\n"
-"o perfil existente conforme a seguir: nmcli con up id <nome>. Note que há\n"
-"suporte apenas a redes abertas, WEP e WPA-PSK neste momento. Também é\n"
-"presumido que a configuração IP é obtida via DHCP.\n"
-"\n"
-"ARGUMENTOS := hotspot [ifname <nome-if>] [con-name <nome>] [ssid <SSID>]\n"
-"                     [band a|bg] [channel <canal>] [password <senha>]\n"
-"\n"
-"Cria um hotspot Wi-Fi. Use \"connection down\" ou \"device disconnect\"\n"
-"para parar o hotspot.\n"
-"Parâmetros do hotspot podem ser influenciados por parâmetros opcionais:\n"
-"ifname - dispositivo Wi-Fi para usar\n"
-"con-name - nome do perfile de conexão do hotspot criado\n"
-"ssid - SSID do hotspot\n"
-"band - banda Wi-Fi para usar\n"
-"channel - canal Wi-Fi para usar\n"
-"password - senha a ser usada para o hotspot\n"
-"\n"
-"ARGUMENTOS := rescan [ifname <nome-if>] [[ssid <SSID para procurar>] ...]\n"
-"\n"
-"Requisita que o NetworkManager procure imediatamente por pontos de acesso\n"
-"disponíveis. O NetworkManager procura por redes Wi-Fi periodicamente, mas\n"
-"em alguns casos ele pode ser útil começar a procurar manualmente. \"ssid\"\n"
-"permite procurar por um SSID específico, que é útil para APs com SSIDs\n"
-"ocultos. Mais parâmetros \"ssid\" podem ser fornecidos. Note que esse\n"
-"comando não mostra os APs, use \"nmcli device wifi list\" para isso.\n"
 
-#: ../clients/cli/devices.c:861
+#: ../clients/cli/devices.c:443
 #, c-format
 msgid ""
 "Usage: nmcli device lldp { ARGUMENTS | help }\n"
@@ -2763,425 +2454,441 @@ msgstr ""
 "pode ser usada para listar vizinhos de uma interface específica.\n"
 "\n"
 
-#: ../clients/cli/devices.c:1015
+#: ../clients/cli/devices.c:597
 #, c-format
 msgid "Error: No interface specified."
 msgstr "Erro: Nenhuma interface especificada."
 
-#: ../clients/cli/devices.c:1038
+#: ../clients/cli/devices.c:620
 #, c-format
 msgid "Warning: argument '%s' is duplicated.\n"
-msgstr "Aviso: o argumento “%s” está duplicado.\n"
+msgstr "Aviso: o argumento \"%s\" está duplicado.\n"
 
-#: ../clients/cli/devices.c:1041
+#: ../clients/cli/devices.c:623
 #, c-format
 msgid "Error: Device '%s' not found.\n"
-msgstr "Erro: Dispositivo “%s” não encontrado.\n"
+msgstr "Erro: Dispositivo \"%s\" não encontrado.\n"
 
-#: ../clients/cli/devices.c:1042
+#: ../clients/cli/devices.c:624
 #, c-format
 msgid "Error: not all devices found."
 msgstr "Erro: nenhum todos dispositivos encontrados."
 
-#: ../clients/cli/devices.c:1071
+#: ../clients/cli/devices.c:653
 msgid "No interface specified"
-msgstr "Nenhuma interface especificada"
+msgstr ""
 
-#: ../clients/cli/devices.c:1090
+#: ../clients/cli/devices.c:672
 #, c-format
 msgid "Device '%s' not found"
-msgstr "Dispositivo “%s” não localizado"
+msgstr ""
+
+#: ../clients/cli/devices.c:758 ../clients/cli/devices.c:910
+msgid "(none)"
+msgstr "(nenhum(a))"
 
-#: ../clients/cli/devices.c:1186
+#: ../clients/cli/devices.c:829
 #, c-format
 msgid "%u MHz"
 msgstr "%u MHz"
 
-#: ../clients/cli/devices.c:1187
+#: ../clients/cli/devices.c:830
 #, c-format
 msgid "%u Mbit/s"
 msgstr "%u Mbit/s"
 
-#: ../clients/cli/devices.c:1198
+#: ../clients/cli/devices.c:841
 msgid "WEP"
 msgstr "WEP"
 
-#: ../clients/cli/devices.c:1202
+#: ../clients/cli/devices.c:845
 msgid "WPA1"
 msgstr "WPA1"
 
-#: ../clients/cli/devices.c:1206
+#: ../clients/cli/devices.c:849
 msgid "WPA2"
 msgstr "WPA2"
 
-#: ../clients/cli/devices.c:1211
+#: ../clients/cli/devices.c:854
 msgid "802.1X"
 msgstr "802.1X"
 
-#: ../clients/cli/devices.c:1226
+#: ../clients/cli/devices.c:869
 msgid "Ad-Hoc"
 msgstr "Ad-Hoc"
 
-#: ../clients/cli/devices.c:1227
+#: ../clients/cli/devices.c:870
 msgid "Infra"
 msgstr "Infra"
 
-#: ../clients/cli/devices.c:1228
+#: ../clients/cli/devices.c:871
 msgid "N/A"
 msgstr "N/A"
 
-#: ../clients/cli/devices.c:1423
+#: ../clients/cli/devices.c:1085
 msgid "Device details"
 msgstr "Detalhes do dispositivo"
 
-#: ../clients/cli/devices.c:1434
+#: ../clients/cli/devices.c:1096
 #, c-format
 msgid "Error: 'device show': %s"
-msgstr "Erro: “device show”: %s"
+msgstr "Erro: \"device show\": %s"
 
-#: ../clients/cli/devices.c:1732
-msgid "Status of devices"
-msgstr "Status dos dispositivos"
+#: ../clients/cli/devices.c:1161 ../clients/cli/devices.c:1164
+msgid "(unknown)"
+msgstr "(desconhecido)"
+
+#: ../clients/cli/devices.c:1207
+#, c-format
+msgid "%u Mb/s"
+msgstr "%u Mb/s"
+
+#: ../clients/cli/devices.c:1310
+msgid "on"
+msgstr "ligado"
 
-#: ../clients/cli/devices.c:1736
+#: ../clients/cli/devices.c:1310
+msgid "off"
+msgstr "desligado"
+
+#: ../clients/cli/devices.c:1544
 #, c-format
 msgid "Error: 'device status': %s"
-msgstr "Erro: “device status”: %s"
+msgstr "Erro: \"device status\": %s"
+
+#: ../clients/cli/devices.c:1558
+msgid "Status of devices"
+msgstr "Status dos dispositivos"
 
-#: ../clients/cli/devices.c:1763 ../clients/cli/devices.c:2218
-#: ../clients/cli/devices.c:4100
+#: ../clients/cli/devices.c:1584 ../clients/cli/devices.c:2039
+#: ../clients/cli/devices.c:3817
 #, c-format
 msgid "Error: invalid extra argument '%s'."
-msgstr "Erro: argumento extra “%s” inválido."
+msgstr "Erro: Argumento extra \"%s\" inválido."
 
-#: ../clients/cli/devices.c:1799 ../clients/cli/general.c:539
+#: ../clients/cli/devices.c:1620 ../clients/cli/general.c:555
 #, c-format
 msgid "Error: Timeout %d sec expired."
 msgstr "Erro: Tempo limite de %d seg expirou."
 
-#: ../clients/cli/devices.c:1848
+#: ../clients/cli/devices.c:1669
 #, c-format
 msgid "Device '%s' successfully activated with '%s'.\n"
-msgstr "Dispositivo “%s” ativado com sucesso com “%s”.\n"
+msgstr "Dispositivo \"%s\" ativado com sucesso com \"%s\".\n"
 
-#: ../clients/cli/devices.c:1854
+#: ../clients/cli/devices.c:1675
 #, c-format
 msgid "Error: Connection activation failed: (%d) %s.\n"
 msgstr "Erro: Ativação da conexão falhou: (%d) %s.\n"
 
-#: ../clients/cli/devices.c:1890
+#: ../clients/cli/devices.c:1711
 #, c-format
 msgid "Error: Failed to setup a Wi-Fi hotspot: %s"
 msgstr "Erro: Falha ao configurar um hotspot Wi-Fi: %s"
 
-#: ../clients/cli/devices.c:1893
+#: ../clients/cli/devices.c:1714
 #, c-format
 msgid "Error: Failed to add/activate new connection: %s"
 msgstr "Erro: Falha ao adicionar/ativar nova conexão: %s"
 
-#: ../clients/cli/devices.c:1903
+#: ../clients/cli/devices.c:1724
 #, c-format
 msgid "Error: Failed to setup a Wi-Fi hotspot"
 msgstr "Erro: Falha ao definir um hotspot Wi-Fi"
 
-#: ../clients/cli/devices.c:1905
+#: ../clients/cli/devices.c:1726
 #, c-format
 msgid "Error: Failed to add/activate new connection: Unknown error"
 msgstr "Erro: Falha ao adicionar/ativar nova conexão: Erro desconhecido"
 
-#: ../clients/cli/devices.c:1917
+#: ../clients/cli/devices.c:1738
 #, c-format
 msgid "Connection with UUID '%s' created and activated on device '%s'\n"
-msgstr "Conexão com UUID “%s” foi criada e ativada no dispositivo “%s”\n"
+msgstr "Conexão com UUID \"%s\" foi criada e ativada no dispositivo \"%s\"\n"
 
-#: ../clients/cli/devices.c:1920
+#: ../clients/cli/devices.c:1741
 #, c-format
 msgid "Hotspot '%s' activated on device '%s'\n"
-msgstr "Hotspot “%s” ativado no dispositivo “%s”\n"
+msgstr "Hotspot \"%s\" ativado no dispositivo \"%s\"\n"
 
-#: ../clients/cli/devices.c:1984
+#: ../clients/cli/devices.c:1805
 #, c-format
 msgid "Error: Device activation failed: %s"
 msgstr "Erro: Ativação do dispositivo falhou: %s"
 
-#: ../clients/cli/devices.c:1993
+#: ../clients/cli/devices.c:1814
 #, c-format
 msgid "Error: Device activation failed: device was disconnected"
 msgstr "Erro: Ativação do dispositivo falhou: o dispositivo foi desconectado"
 
-#: ../clients/cli/devices.c:2008
+#: ../clients/cli/devices.c:1829
 #, c-format
 msgid "Device '%s' has been connected.\n"
-msgstr "O dispositivo “%s” foi conectado.\n"
+msgstr "O dispositivo \"%s\" foi conectado.\n"
 
-#: ../clients/cli/devices.c:2049
+#: ../clients/cli/devices.c:1870
 #, c-format
 msgid "Error: extra argument not allowed: '%s'."
-msgstr "Erro: argumento extra não permitido: “%s”."
+msgstr "Erro: argumento extra não permitido: \"%s\"."
 
-#: ../clients/cli/devices.c:2121 ../clients/cli/devices.c:2136
-#: ../clients/cli/devices.c:2366
+#: ../clients/cli/devices.c:1942 ../clients/cli/devices.c:1957
+#: ../clients/cli/devices.c:2187
 #, c-format
 msgid "Device '%s' successfully disconnected.\n"
-msgstr "Dispositivo “%s” desconectado com sucesso.\n"
+msgstr "Dispositivo \"%s\" desconectado com sucesso.\n"
 
-#: ../clients/cli/devices.c:2124
+#: ../clients/cli/devices.c:1945
 #, c-format
 msgid "Device '%s' successfully removed.\n"
-msgstr "Dispositivo “%s” removido com sucesso.\n"
+msgstr "Dispositivo \"%s\" removido com sucesso.\n"
 
-#: ../clients/cli/devices.c:2183 ../clients/cli/devices.c:2253
+#: ../clients/cli/devices.c:2004 ../clients/cli/devices.c:2074
 #, c-format
 msgid "Error: Reapplying connection to device '%s' (%s) failed: %s"
-msgstr "Erro: a reaplicação da conexão no dispositivo “%s” (%s) falhou: %s"
+msgstr "Erro: a reaplicação da conexão no dispositivo \"%s\" (%s) falhou: %s"
 
-#: ../clients/cli/devices.c:2193 ../clients/cli/devices.c:2262
+#: ../clients/cli/devices.c:2014 ../clients/cli/devices.c:2083
 #, c-format
 msgid "Connection successfully reapplied to device '%s'.\n"
-msgstr "Conexão reaplicada com sucesso no dispositivo “%s”.\n"
+msgstr "Conexão reaplicada com sucesso no dispositivo \"%s\".\n"
 
-#: ../clients/cli/devices.c:2287
+#: ../clients/cli/devices.c:2108
 #, c-format
 msgid "Error: Reading applied connection from device '%s' (%s) failed: %s"
 msgstr ""
-"Erro: a leitura da conexão aplicada do dispositivo “%s” (%s) falhou: %s"
 
-#: ../clients/cli/devices.c:2351
+#: ../clients/cli/devices.c:2172
 #, c-format
 msgid "Error: not all devices disconnected."
 msgstr "Erro: nem todos os dispositivos foram desconectados."
 
-#: ../clients/cli/devices.c:2352
+#: ../clients/cli/devices.c:2173
 #, c-format
 msgid "Error: Device '%s' (%s) disconnecting failed: %s\n"
-msgstr "Erro: a desconexão do dispositivo “%s” (%s) falhou: %s\n"
+msgstr "Erro: a desconexão do dispositivo \"%s\" (%s) falhou: %s\n"
 
-#: ../clients/cli/devices.c:2430
+#: ../clients/cli/devices.c:2251
 #, c-format
 msgid "Error: not all devices deleted."
 msgstr "Erro: nem todos os dispositivos foram excluídos."
 
-#: ../clients/cli/devices.c:2431
+#: ../clients/cli/devices.c:2252
 #, c-format
 msgid "Error: Device '%s' (%s) deletion failed: %s\n"
-msgstr "Erro: a exclusão do dispositivo “%s” (%s) falhou: %s\n"
+msgstr "Erro: a exclusão do dispositivo \"%s\" (%s) falhou: %s\n"
 
-#: ../clients/cli/devices.c:2515
+#: ../clients/cli/devices.c:2336
 #, c-format
 msgid "Error: No property specified."
 msgstr "Erro: nenhuma conexão especificada."
 
-#: ../clients/cli/devices.c:2530 ../clients/cli/devices.c:2547
-#: ../clients/cli/general.c:713 ../clients/cli/general.c:725
+#: ../clients/cli/devices.c:2351 ../clients/cli/devices.c:2368
+#: ../clients/cli/general.c:724 ../clients/cli/general.c:736
 #, c-format
 msgid "Error: '%s' argument is missing."
 msgstr "Erro: está faltando o argumento %s."
 
-#: ../clients/cli/devices.c:2536
+#: ../clients/cli/devices.c:2357
 #, c-format
 msgid "Error: 'managed': %s."
-msgstr "Erro: “managed”: %s."
+msgstr "Erro: \"managed\": %s."
 
-#: ../clients/cli/devices.c:2553
+#: ../clients/cli/devices.c:2374
 #, c-format
 msgid "Error: 'autoconnect': %s."
-msgstr "Erro: “autoconnect”: %s."
+msgstr "Erro: \"autoconnect\": %s."
 
-#: ../clients/cli/devices.c:2561 ../clients/cli/general.c:739
+#: ../clients/cli/devices.c:2382 ../clients/cli/general.c:750
 #, c-format
 msgid "Error: property '%s' is not known."
-msgstr "Erro: propriedade “%s” não é conhecida."
+msgstr "Erro: propriedade \"%s\" não é conhecida."
 
-#: ../clients/cli/devices.c:2610
+#: ../clients/cli/devices.c:2432
 #, c-format
 msgid "%s: using connection '%s'\n"
-msgstr "%s: usando a conexão “%s”\n"
+msgstr "%s: usando a conexão \"%s\"\n"
 
-#: ../clients/cli/devices.c:2636
+#: ../clients/cli/devices.c:2458
 #, c-format
 msgid "%s: device created\n"
 msgstr "%s: dispositivo criado\n"
 
-#: ../clients/cli/devices.c:2643
+#: ../clients/cli/devices.c:2465
 #, c-format
 msgid "%s: device removed\n"
 msgstr "%s: dispositivo removido\n"
 
-#: ../clients/cli/devices.c:2818
+#: ../clients/cli/devices.c:2663
 msgid "Wi-Fi scan list"
 msgstr "Lista de varredura de redes sem fio (Wi-Fi)"
 
-#: ../clients/cli/devices.c:2895
-#, c-format
-msgid "Error: Access point with bssid '%s' not found."
-msgstr "Erro: Ponto de acesso com bssid “%s” não localizado."
-
-#: ../clients/cli/devices.c:3085
+#: ../clients/cli/devices.c:2712
 #, c-format
 msgid "Error: 'device wifi': %s"
-msgstr "Erro: “device wifi”: %s"
+msgstr "Erro: \"device wifi\": %s"
 
-#: ../clients/cli/devices.c:3103
+#: ../clients/cli/devices.c:2724
 #, c-format
-msgid "Error: invalid rescan argument: '%s' not among [auto, no, yes]"
-msgstr "Erro: argumento de rescan inválido: “%s” não entre [auto, no, yes]"
+msgid "Error: Device '%s' not found."
+msgstr "Erro: Dispositivo \"%s\" não localizado."
 
-#: ../clients/cli/devices.c:3110
+#: ../clients/cli/devices.c:2745 ../clients/cli/devices.c:2831
 #, c-format
-msgid "Error: Device '%s' not found."
-msgstr "Erro: Dispositivo “%s” não localizado."
+msgid "Error: Access point with bssid '%s' not found."
+msgstr "Erro: Ponto de acesso com bssid \"%s\" não localizado."
 
-#: ../clients/cli/devices.c:3120
+#: ../clients/cli/devices.c:2773
 #, c-format
 msgid ""
 "Error: Device '%s' was not recognized as a Wi-Fi device, check "
 "NetworkManager Wi-Fi plugin."
 msgstr ""
-"Erro: o dispositivo “%s” não foi reconhecido como um dispositivo Wi-Fi, "
+"Erro: o dispositivo \"%s\" não foi reconhecido como um dispositivo Wi-Fi, "
 "verifique o plug-in Wi-Fi do NetworkManager."
 
-#: ../clients/cli/devices.c:3124 ../clients/cli/devices.c:3342
-#: ../clients/cli/devices.c:3779 ../clients/cli/devices.c:3938
+#: ../clients/cli/devices.c:2777 ../clients/cli/devices.c:3060
+#: ../clients/cli/devices.c:3495 ../clients/cli/devices.c:3654
 #, c-format
 msgid "Error: Device '%s' is not a Wi-Fi device."
-msgstr "Erro: o dispositivo “%s” não é um dispositivo Wi-Fi."
+msgstr "Erro: o dispositivo \"%s\" não é um dispositivo Wi-Fi."
 
-#: ../clients/cli/devices.c:3191
+#: ../clients/cli/devices.c:2909
 msgid "SSID or BSSID: "
 msgstr "SSID ou BSSID: "
 
-#: ../clients/cli/devices.c:3196
+#: ../clients/cli/devices.c:2914
 #, c-format
 msgid "Error: SSID or BSSID are missing."
 msgstr "Erro: SSID ou BSSID estão faltando."
 
-#: ../clients/cli/devices.c:3233
+#: ../clients/cli/devices.c:2951
 #, c-format
 msgid "Error: bssid argument value '%s' is not a valid BSSID."
-msgstr "Erro: o valor do argumento bssid “%s” não é um BSSID válido."
+msgstr "Erro: o valor do argumento bssid \"%s\" não é um BSSID válido."
 
-#: ../clients/cli/devices.c:3263
+#: ../clients/cli/devices.c:2981
 #, c-format
 msgid ""
 "Error: wep-key-type argument value '%s' is invalid, use 'key' or 'phrase'."
 msgstr ""
-"Erro: o valor do argumento wep-key-type “%s” é inválido, utilize “key” ou "
-"“phrase”."
+"Erro: o valor do argumento wep-key-type \"%s\" é inválido, utilize \"key\" "
+"ou \"phrase\"."
 
-#: ../clients/cli/devices.c:3290 ../clients/cli/devices.c:3308
+#: ../clients/cli/devices.c:3008 ../clients/cli/devices.c:3026
 #, c-format
 msgid "Error: %s: %s."
 msgstr "Erro: %s: %s."
 
-#: ../clients/cli/devices.c:3325
+#: ../clients/cli/devices.c:3043
 #, c-format
 msgid "Error: BSSID to connect to (%s) differs from bssid argument (%s)."
 msgstr "Erro: BSSID para conectar-se a (%s) é diferente do argumento (%s)."
 
-#: ../clients/cli/devices.c:3331
+#: ../clients/cli/devices.c:3049
 #, c-format
 msgid "Error: Parameter '%s' is neither SSID nor BSSID."
-msgstr "Erro: o parâmetro “%s” não é SSID nem BSSID."
+msgstr "Erro: o parâmetro \"%s\" não é SSID nem BSSID."
 
-#: ../clients/cli/devices.c:3344 ../clients/cli/devices.c:3781
-#: ../clients/cli/devices.c:3940
+#: ../clients/cli/devices.c:3062 ../clients/cli/devices.c:3497
+#: ../clients/cli/devices.c:3656
 #, c-format
 msgid "Error: No Wi-Fi device found."
 msgstr "Erro: nenhum dispositivo Wi-Fi encontrado."
 
-#: ../clients/cli/devices.c:3364
+#: ../clients/cli/devices.c:3082
 #, c-format
 msgid "Error: Failed to scan hidden SSID: %s."
 msgstr "Erro: falha ao scanear SSID oculto: %s."
 
-#: ../clients/cli/devices.c:3391
+#: ../clients/cli/devices.c:3109
 #, c-format
 msgid "Error: No network with SSID '%s' found."
-msgstr "Erro: nenhuma rede com SSID “%s” foi encontrada."
+msgstr "Erro: nenhuma rede com SSID \"%s\" foi encontrada."
 
-#: ../clients/cli/devices.c:3393
+#: ../clients/cli/devices.c:3111
 #, c-format
 msgid "Error: No access point with BSSID '%s' found."
-msgstr "Erro: nenhum ponto de acesso com BSSID “%s” encontrado."
+msgstr "Erro: nenhum ponto de acesso com BSSID \"%s\" encontrado."
 
-#: ../clients/cli/devices.c:3435
+#: ../clients/cli/devices.c:3153
 #, c-format
 msgid ""
 "Warning: '%s' should be SSID for hidden APs; but it looks like a BSSID.\n"
 msgstr ""
-"Aviso: “%s” deveria ser SSID para APs ocultos, mas ele se parece com um "
+"Aviso: \"%s\" deveria ser SSID para APs ocultos, mas ele se parece com um "
 "BSSID.\n"
 
-#: ../clients/cli/devices.c:3451
+#: ../clients/cli/devices.c:3167
 msgid "Password: "
 msgstr "Senha: "
 
-#: ../clients/cli/devices.c:3600
+#: ../clients/cli/devices.c:3316
 #, c-format
 msgid "'%s' is not valid WPA PSK"
-msgstr "“%s” não é um WPA PSK válido"
+msgstr "\"%s\" não é um WPA PSK válido"
 
-#: ../clients/cli/devices.c:3617
+#: ../clients/cli/devices.c:3333
 #, c-format
 msgid "'%s' is not valid WEP key (it should be 5 or 13 ASCII chars)"
 msgstr ""
-"“%s” não é uma chave WEP válida (ele deveria ter 5 ou 13 caracteres ASCII)"
+"\"%s\" não é uma chave WEP válida (ele deveria ter 5 ou 13 caracteres ASCII)"
 
-#: ../clients/cli/devices.c:3633
+#: ../clients/cli/devices.c:3349
 #, c-format
 msgid "Hotspot password: %s\n"
 msgstr "Senha do hotspot: %s\n"
 
-#: ../clients/cli/devices.c:3704
+#: ../clients/cli/devices.c:3420
 #, c-format
 msgid "Error: ssid is too long."
 msgstr "Erro: ssid grande demais."
 
-#: ../clients/cli/devices.c:3718
+#: ../clients/cli/devices.c:3434
 #, c-format
 msgid "Error: band argument value '%s' is invalid; use 'a' or 'bg'."
 msgstr ""
-"Erro: o valor do argumento de banda “%s” é inválido, utilize “a” ou “bg”."
+"Erro: o valor do argumento de banda \"%s\" é inválido, utilize \"a\" ou \"bg"
+"\"."
 
-#: ../clients/cli/devices.c:3743
+#: ../clients/cli/devices.c:3459
 #, c-format
 msgid "Error: Unknown parameter %s."
 msgstr "Erro: parâmetro desconhecido %s."
 
-#: ../clients/cli/devices.c:3763
+#: ../clients/cli/devices.c:3479
 #, c-format
 msgid "Error: channel requires band too."
 msgstr "Erro: canal necessita de banda também."
 
-#: ../clients/cli/devices.c:3768
+#: ../clients/cli/devices.c:3484
 #, c-format
 msgid "Error: channel '%s' not valid for band '%s'."
-msgstr "Erro: canal “%s” não válido para banda “%s”."
+msgstr "Erro: canal \"%s\" não válido para banda \"%s\"."
 
-#: ../clients/cli/devices.c:3792
+#: ../clients/cli/devices.c:3508
 #, c-format
 msgid "Error: Device '%s' supports neither AP nor Ad-Hoc mode."
-msgstr "Erro: o dispositivo “%s” não oferece suporte aos modos AP e Ad-Hoc."
+msgstr "Erro: o dispositivo \"%s\" não oferece suporte aos modos AP e Ad-Hoc."
 
-#: ../clients/cli/devices.c:3826
+#: ../clients/cli/devices.c:3542
 #, c-format
 msgid "Error: Invalid 'password': %s."
-msgstr "Erro: “password” inválida: %s."
+msgstr "Erro: \"password\" inválida: %s."
 
-#: ../clients/cli/devices.c:3901
+#: ../clients/cli/devices.c:3617
 #, c-format
 msgid "Error: '%s' cannot repeat."
-msgstr "Erro: “%s” não pode repetir."
+msgstr "Erro: \"%s\" não pode repetir."
 
 #. Main header name
-#: ../clients/cli/devices.c:4006
+#: ../clients/cli/devices.c:3723
 msgid "Device LLDP neighbors"
 msgstr "Vizinhos LLDP do dispositivo"
 
-#: ../clients/cli/devices.c:4116
+#: ../clients/cli/devices.c:3833
 #, c-format
 msgid "Error: 'device lldp list': %s"
-msgstr "Erro: “device lldp list”: %s"
+msgstr "Erro: \"device lldp list\": %s"
 
 #: ../clients/cli/general.c:42
 msgid "asleep"
@@ -3199,7 +2906,7 @@ msgstr "conectado (somente local)"
 msgid "connected (site only)"
 msgstr "conectado (somente site)"
 
-#: ../clients/cli/general.c:46 ../clients/common/nm-client-utils.c:270
+#: ../clients/cli/general.c:46 ../clients/common/nm-client-utils.c:241
 msgid "connected"
 msgstr "conectado"
 
@@ -3207,51 +2914,51 @@ msgstr "conectado"
 msgid "disconnecting"
 msgstr "desconectando"
 
-#: ../clients/cli/general.c:48 ../clients/common/nm-client-utils.c:263
+#: ../clients/cli/general.c:48 ../clients/common/nm-client-utils.c:227
 msgid "disconnected"
 msgstr "desconectado"
 
-#: ../clients/cli/general.c:83
+#: ../clients/cli/general.c:80
 msgid "none"
 msgstr "nenhum(a)"
 
-#: ../clients/cli/general.c:84
+#: ../clients/cli/general.c:81
 msgid "portal"
 msgstr "portal"
 
-#: ../clients/cli/general.c:85
+#: ../clients/cli/general.c:82
 msgid "limited"
 msgstr "limitada"
 
-#: ../clients/cli/general.c:86
+#: ../clients/cli/general.c:83
 msgid "full"
 msgstr "completa"
 
-#: ../clients/cli/general.c:158
+#: ../clients/cli/general.c:154
 msgid "auth"
 msgstr "autenticação"
 
-#: ../clients/cli/general.c:186
+#: ../clients/cli/general.c:189
 msgid "running"
 msgstr "executando"
 
-#: ../clients/cli/general.c:200
+#: ../clients/cli/general.c:203
 msgid "starting"
 msgstr "iniciando"
 
-#: ../clients/cli/general.c:200
+#: ../clients/cli/general.c:203
 msgid "started"
 msgstr "iniciado"
 
-#: ../clients/cli/general.c:234
+#: ../clients/cli/general.c:237
 msgid "enabled"
 msgstr "habilitado"
 
-#: ../clients/cli/general.c:234
+#: ../clients/cli/general.c:237
 msgid "disabled"
 msgstr "desabilitado"
 
-#: ../clients/cli/general.c:352
+#: ../clients/cli/general.c:369
 #, c-format
 msgid ""
 "Usage: nmcli general { COMMAND | help }\n"
@@ -3280,7 +2987,7 @@ msgstr ""
 "  logging [level <nível de log>] [domains <domínios de log>]\n"
 "\n"
 
-#: ../clients/cli/general.c:363
+#: ../clients/cli/general.c:380
 #, c-format
 msgid ""
 "Usage: nmcli general status { help }\n"
@@ -3297,7 +3004,7 @@ msgstr ""
 "gen status\"\n"
 "\n"
 
-#: ../clients/cli/general.c:372
+#: ../clients/cli/general.c:389
 #, c-format
 msgid ""
 "Usage: nmcli general hostname { ARGUMENTS | help }\n"
@@ -3315,12 +3022,13 @@ msgstr ""
 "ARGUMENTOS := [<nome de sistema>]\n"
 "\n"
 "Obtém ou muda nome de máquina de sistema persistente.\n"
-"Sem um argumento, ele imprime o nome de máquina configurado atualmente.\n"
-"Quando você passa um nome de máquina, o NetworkManager o definirá como\n"
-"o novo nome de máquina de sistema persistente.\n"
+"Sem um argumento, ele imprime o nome de máquina configurado atualmente. "
+"Quando você passa\n"
+"um nome de máquina, o NetworkManager o definirá como o novo nome de máquina "
+"de sistema persistente.\n"
 "\n"
 
-#: ../clients/cli/general.c:384
+#: ../clients/cli/general.c:401
 #, c-format
 msgid ""
 "Usage: nmcli general permissions { help }\n"
@@ -3333,7 +3041,7 @@ msgstr ""
 "Exibir permissões de quem chama para operações autenticadas.\n"
 "\n"
 
-#: ../clients/cli/general.c:392
+#: ../clients/cli/general.c:409
 #, c-format
 msgid ""
 "Usage: nmcli general logging { ARGUMENTS | help }\n"
@@ -3354,12 +3062,12 @@ msgstr ""
 "\n"
 "Obtém ou muda domínios ou nível de registro de log do NetworkManager.\n"
 "Sem um argumento, os atuais domínios ou nível de registro de log são\n"
-"mostrados. Para mudar o estado do registro de log, forneça um nível\n"
-"e/ou domínio. Por favor, veja  as páginas do manual para a lista de\n"
-"domínios de registro de log possíveis.\n"
+"mostrados. Para mudar o estado do registro de log, forneça um nível e/ou\n"
+"domínio. Por favor, veja  as páginas do manual para a lista de domínios de\n"
+"registro de log possíveis.\n"
 "\n"
 
-#: ../clients/cli/general.c:405
+#: ../clients/cli/general.c:422
 #, c-format
 msgid ""
 "Usage: nmcli networking { COMMAND | help }\n"
@@ -3384,7 +3092,7 @@ msgstr ""
 "  connectivity [check]\n"
 "\n"
 
-#: ../clients/cli/general.c:415
+#: ../clients/cli/general.c:432
 #, c-format
 msgid ""
 "Usage: nmcli networking on { help }\n"
@@ -3397,7 +3105,7 @@ msgstr ""
 "Ativa a rede.\n"
 "\n"
 
-#: ../clients/cli/general.c:423
+#: ../clients/cli/general.c:440
 #, c-format
 msgid ""
 "Usage: nmcli networking off { help }\n"
@@ -3410,7 +3118,7 @@ msgstr ""
 "Desativa a rede.\n"
 "\n"
 
-#: ../clients/cli/general.c:431
+#: ../clients/cli/general.c:448
 #, c-format
 msgid ""
 "Usage: nmcli networking connectivity { ARGUMENTS | help }\n"
@@ -3427,11 +3135,11 @@ msgstr ""
 "ARGUMENTOS := [check]\n"
 "\n"
 "Obtém estado de conexão de rede.\n"
-"O argumento de \"verificação\" opcional faz com que o NetworkManager\n"
-"verifique novamente a conexão.\n"
+"O argumento de \"verificação\" opcional faz com que o NetworkManager "
+"verifica novamente a conexão.\n"
 "\n"
 
-#: ../clients/cli/general.c:443
+#: ../clients/cli/general.c:460
 #, c-format
 msgid ""
 "Usage: nmcli radio { COMMAND | help }\n"
@@ -3448,7 +3156,7 @@ msgstr ""
 "  all | wifi | wwan [ on | off ]\n"
 "\n"
 
-#: ../clients/cli/general.c:452
+#: ../clients/cli/general.c:469
 #, c-format
 msgid ""
 "Usage: nmcli radio all { ARGUMENTS | help }\n"
@@ -3465,7 +3173,7 @@ msgstr ""
 "Obtém status de todos os interruptores de radio, ou os ativa ou desativa.\n"
 "\n"
 
-#: ../clients/cli/general.c:462
+#: ../clients/cli/general.c:479
 #, c-format
 msgid ""
 "Usage: nmcli radio wifi { ARGUMENTS | help }\n"
@@ -3482,7 +3190,7 @@ msgstr ""
 "Obtém status do interruptor de radio Wi-Fi, ou os ativa ou desativa.\n"
 "\n"
 
-#: ../clients/cli/general.c:472
+#: ../clients/cli/general.c:489
 #, c-format
 msgid ""
 "Usage: nmcli radio wwan { ARGUMENTS | help }\n"
@@ -3496,11 +3204,11 @@ msgstr ""
 "\n"
 "ARGUMENTOS := [on | off]\n"
 "\n"
-"Obtém status do interruptor do rádio da banda larga móvel,\n"
-"ou o ativa ou desativa.\n"
+"Obtém status de um radio switch de banda larga móvel, ou o ativa ou "
+"desativa.\n"
 "\n"
 
-#: ../clients/cli/general.c:482
+#: ../clients/cli/general.c:499
 #, c-format
 msgid ""
 "Usage: nmcli monitor\n"
@@ -3512,182 +3220,183 @@ msgstr ""
 "Uso: nmcli monitor\n"
 "\n"
 "Monitora alterações no NetworkManager.\n"
-"Exibe uma linha sempre que ocorre uma alteração no NetworkManager\n"
+"Exibe uma linha quando uma alteração ocorrer no NetworkManager\n"
 "\n"
 
-#: ../clients/cli/general.c:512
+#: ../clients/cli/general.c:528
 msgid "NetworkManager status"
 msgstr "Status do NetworkManager"
 
-#: ../clients/cli/general.c:516
+#: ../clients/cli/general.c:532
 #, c-format
 msgid "Error: only these fields are allowed: %s"
 msgstr "Erro: somente estes campos são permitidos: %s"
 
-#: ../clients/cli/general.c:570
+#: ../clients/cli/general.c:582
 msgid "NetworkManager permissions"
 msgstr "Permissões do NetworkManager"
 
-#: ../clients/cli/general.c:574
+#: ../clients/cli/general.c:586
 #, c-format
 msgid "Error: 'general permissions': %s"
-msgstr "Erro: “general permissions”: %s"
+msgstr "Erro: \"general permissions\": %s"
 
-#: ../clients/cli/general.c:663
+#: ../clients/cli/general.c:674
 msgid "NetworkManager logging"
 msgstr "Gravação de registros do NetworkManager"
 
-#: ../clients/cli/general.c:667
+#: ../clients/cli/general.c:678
 #, c-format
 msgid "Error: 'general logging': %s"
-msgstr "Erro: “general logging”: %s"
+msgstr "Erro: \"gravação registros gerais\": %s"
 
-#: ../clients/cli/general.c:749
+#: ../clients/cli/general.c:760
 #, c-format
 msgid "Error: failed to set logging: %s"
 msgstr "Erro: falha ao definir gravação de registros de log: %s"
 
-#: ../clients/cli/general.c:766
+#: ../clients/cli/general.c:777
 #, c-format
 msgid "Error: failed to set hostname: %s"
 msgstr "Erro: falha ao definir nome de máquina: %s"
 
-#: ../clients/cli/general.c:835
+#: ../clients/cli/general.c:846
 #, c-format
 msgid "Error: '--fields' value '%s' is not valid here (allowed field: %s)"
 msgstr ""
-"Erro: o valor “%s” de “--fields” não é válido aqui (campos permitidos: %s)"
+"Erro: o valor \"%s\" de \"--fields\" não é válido aqui (campos permitidos: "
+"%s)"
 
-#: ../clients/cli/general.c:860
+#: ../clients/cli/general.c:871
 #, c-format
 msgid "Error: invalid '%s' argument: '%s' (use on/off)."
-msgstr "Erro: argumento “%s” inválido: “%s” (use on/off)."
+msgstr "Erro: argumento \"%s\" inválido: \"%s\" (use on/off)."
 
 #. no arguments -> get current state
-#: ../clients/cli/general.c:908 ../clients/cli/general.c:920
+#: ../clients/cli/general.c:919 ../clients/cli/general.c:931
 msgid "Connectivity"
 msgstr "Conectividade"
 
-#: ../clients/cli/general.c:923
+#: ../clients/cli/general.c:934
 #, c-format
 msgid "Error: 'networking' command '%s' is not valid."
-msgstr "Erro: o comando “%s” de “networking” não é válido."
+msgstr "Erro: o comando \"%s\" de \"networking\" não é válido."
 
-#: ../clients/cli/general.c:937
+#: ../clients/cli/general.c:948
 msgid "Networking"
 msgstr "Rede"
 
 #. no argument, show all radio switches
-#: ../clients/cli/general.c:972
+#: ../clients/cli/general.c:983
 msgid "Radio switches"
 msgstr "Alternadores de rádio"
 
 #. no argument, show current WiFi state
-#: ../clients/cli/general.c:1002
+#: ../clients/cli/general.c:1013
 msgid "Wi-Fi radio switch"
 msgstr "Alternador de rádio Wi-Fi"
 
 #. no argument, show current WWAN (mobile broadband) state
-#: ../clients/cli/general.c:1029
+#: ../clients/cli/general.c:1040
 msgid "WWAN radio switch"
 msgstr "Alternador de rádio WWAN"
 
-#: ../clients/cli/general.c:1077
+#: ../clients/cli/general.c:1089
 msgid "NetworkManager has started"
 msgstr "NetworkManager foi iniciado"
 
-#: ../clients/cli/general.c:1077
+#: ../clients/cli/general.c:1089
 msgid "NetworkManager has stopped"
 msgstr "NetworkManager foi parado"
 
-#: ../clients/cli/general.c:1088
+#: ../clients/cli/general.c:1100
 #, c-format
 msgid "Hostname set to '%s'\n"
-msgstr "Nome de máquina definido para “%s”\n"
+msgstr "Nome de máquina definido para \"%s\"\n"
 
-#: ../clients/cli/general.c:1103
+#: ../clients/cli/general.c:1115
 #, c-format
 msgid "'%s' is now the primary connection\n"
-msgstr "“%s” agora é a conexão primária\n"
+msgstr "\"%s\" agora é a conexão primária\n"
 
-#: ../clients/cli/general.c:1105
+#: ../clients/cli/general.c:1117
 #, c-format
 msgid "There's no primary connection\n"
 msgstr "Não há conexão primária\n"
 
-#: ../clients/cli/general.c:1117
+#: ../clients/cli/general.c:1129
 #, c-format
 msgid "Connectivity is now '%s'\n"
-msgstr "Conectividade agora é “%s”\n"
+msgstr "Conectividade agora é \"%s\"\n"
 
-#: ../clients/cli/general.c:1130
+#: ../clients/cli/general.c:1142
 #, c-format
 msgid "Networkmanager is now in the '%s' state\n"
-msgstr "NetworkManager não está no estado “%s”\n"
+msgstr "NetworkManager não está no estado \"%s\"\n"
 
-#: ../clients/cli/general.c:1150
+#: ../clients/cli/general.c:1163
 msgid "connection available"
-msgstr "conexão disponível"
+msgstr ""
 
-#: ../clients/cli/general.c:1152
+#: ../clients/cli/general.c:1165
 msgid "connections available"
-msgstr "conexões disponíveis"
+msgstr ""
 
-#: ../clients/cli/general.c:1170
+#: ../clients/cli/general.c:1183
 msgid "autoconnect"
-msgstr "autoconectar"
+msgstr ""
 
-#: ../clients/cli/general.c:1172
+#: ../clients/cli/general.c:1185
 msgid "fw missing"
-msgstr "faltando fw"
+msgstr ""
 
-#: ../clients/cli/general.c:1177
+#: ../clients/cli/general.c:1190
 msgid "plugin missing"
-msgstr "faltando plug-in"
+msgstr ""
 
-#: ../clients/cli/general.c:1182
+#: ../clients/cli/general.c:1195
 msgid "sw"
-msgstr "sw"
+msgstr ""
 
-#: ../clients/cli/general.c:1184
+#: ../clients/cli/general.c:1197
 msgid "hw"
-msgstr "hw"
+msgstr ""
 
-#: ../clients/cli/general.c:1189
+#: ../clients/cli/general.c:1202
 msgid "iface"
-msgstr "iface"
+msgstr ""
 
-#: ../clients/cli/general.c:1192
+#: ../clients/cli/general.c:1205
 msgid "port"
-msgstr "porta"
+msgstr ""
 
-#: ../clients/cli/general.c:1195
+#: ../clients/cli/general.c:1208
 msgid "mtu"
-msgstr "mtu"
+msgstr ""
 
-#: ../clients/cli/general.c:1212
+#: ../clients/cli/general.c:1225
 msgid "master"
-msgstr "mestre"
+msgstr ""
 
-#: ../clients/cli/general.c:1216 ../clients/tui/nm-editor-utils.c:239
-#: ../clients/tui/nmt-connect-connection-list.c:407
+#: ../clients/cli/general.c:1229 ../clients/tui/nm-editor-utils.c:241
+#: ../clients/tui/nmt-connect-connection-list.c:408
 msgid "VPN"
 msgstr "VPN"
 
-#: ../clients/cli/general.c:1218
+#: ../clients/cli/general.c:1231
 msgid "ip4 default"
-msgstr "padrão ip4"
+msgstr ""
 
-#: ../clients/cli/general.c:1220
+#: ../clients/cli/general.c:1233
 msgid "ip6 default"
-msgstr "padrão ip6"
+msgstr ""
 
-#: ../clients/cli/general.c:1303
+#: ../clients/cli/general.c:1316
 #, c-format
 msgid "%s VPN connection"
-msgstr "conexão VPN %s"
+msgstr ""
 
-#: ../clients/cli/general.c:1371
+#: ../clients/cli/general.c:1386
 #, c-format
 msgid ""
 "Use \"nmcli device show\" to get complete information about known devices "
@@ -3697,32 +3406,22 @@ msgid ""
 "Consult nmcli(1) and nmcli-examples(5) manual pages for complete usage "
 "details.\n"
 msgstr ""
-"Use \"nmcli device show\" para obter informações completas sobre "
-"dispositivos\n"
-"conhecidos e \"nmcli connection show\" para obter uma visão geral sobre "
-"perfis\n"
-"de conexão ativa.\n"
-"\n"
-"Consulte as páginas de manual nmcli(1) e nmcli-examples(5) para detalhes\n"
-"completos de uso.\n"
 
-#: ../clients/cli/general.c:1392
+#: ../clients/cli/general.c:1407
 #, c-format
 msgid "Error: 'monitor' command '%s' is not valid."
-msgstr "Erro: comando de “%s” de “monitor” não é válido."
+msgstr "Erro: comando de \"%s\" de \"monitor\" não é válido."
 
-#: ../clients/cli/general.c:1404
+#: ../clients/cli/general.c:1419
 msgid "Networkmanager is not running (waiting for it)\n"
 msgstr "NetworkManager não está em execução (espere por ele)\n"
 
-#: ../clients/cli/nmcli.c:245
+#: ../clients/cli/nmcli.c:184
 #, c-format
 msgid ""
 "Usage: nmcli [OPTIONS] OBJECT { COMMAND | help }\n"
 "\n"
 "OPTIONS\n"
-"  -o[verview]                                    overview mode (hide default "
-"values)\n"
 "  -t[erse]                                       terse output\n"
 "  -p[retty]                                      pretty output\n"
 "  -m[ode] tabular|multiline                      output mode\n"
@@ -3750,116 +3449,63 @@ msgid ""
 "  m[onitor]       monitor NetworkManager changes\n"
 "\n"
 msgstr ""
-"Uso: nmcli [OPÇÕES] OBJETO { COMANDO | help }\n"
-"\n"
-"OPÇÕES\n"
-"  -o[verview]                                    visão geral (oculta valores "
-"padrão)\n"
-"  -t[erse]                                       saída concisa\n"
-"  -p[retty]                                      boa saída\n"
-"  -m[ode] tabular|multiline                      modo de saída\n"
-"  -c[olors] auto|yes|no                          se deve usar cores na "
-"saída\n"
-"  -f[ields] <campo1,campo2,...>|all|common       especifica campos para "
-"exibir\n"
-"  -g[et-values] <campo1,campo2,...>|all|common   atalho para -m tabular -t -"
-"f\n"
-"  -e[scape] yes|no                               escapa separadores de "
-"colunas em valores\n"
-"  -a[sk]                                         pede parâmetros em falta\n"
-"  -s[how-secrets]                                permite exibir senhas\n"
-"  -w[ait] <segundos>                             define a espera até "
-"finalizar operações\n"
-"  -v[ersion]                                     mostra a versão do "
-"programa\n"
-"  -h[elp]                                        emite essa ajuda\n"
-"\n"
-"OBJETO\n"
-"  g[eneral]       operações e status geral do NetworkManager\n"
-"  n[etworking]    controle geral de rede\n"
-"  r[adio]         opções de rádio NetworkManager\n"
-"  c[onnection]    conexões do NetworkManager\n"
-"  d[evice]        dispositivos gerenciados pelo NetworkManager\n"
-"  a[gent]         agente polkit ou agente de segredos NetworkManager\n"
-"  m[onitor]       monitora alterações no NetworkManager\n"
-"\n"
-
-#: ../clients/cli/nmcli.c:325
-#, c-format
-msgid "Error: missing argument for '%s' option."
-msgstr "Erro: faltando argumento para a opção “%s”."
-
-#: ../clients/cli/nmcli.c:626
-#, c-format
-msgid "Unexpected end of file following '%s'\n"
-msgstr "Fim de arquivo inesperado após “%s”\n"
-
-#: ../clients/cli/nmcli.c:634
-#, c-format
-msgid "Expected whitespace following '%s'\n"
-msgstr "Espaço em branco esperado após “%s”\n"
-
-#: ../clients/cli/nmcli.c:646
-#, c-format
-msgid "Expected a value for '%s'\n"
-msgstr "Esperava um valor para “%s”\n"
 
-#: ../clients/cli/nmcli.c:660
+#: ../clients/cli/nmcli.c:263
 #, c-format
-msgid "Expected a line break following '%s'\n"
-msgstr "Esperava uma quebra de linha após “%s”\n"
+msgid "Error: missing argument for '%s' option."
+msgstr "Erro: faltando argumento para a opção \"%s\"."
 
-#: ../clients/cli/nmcli.c:749
+#: ../clients/cli/nmcli.c:311
 #, c-format
 msgid "Error: Option '--terse' is specified the second time."
-msgstr "Erro: Opção “--terse” especificada pela segunda vez."
+msgstr "Erro: Opção \"--terse\" especificada pela segunda vez."
 
-#: ../clients/cli/nmcli.c:754
+#: ../clients/cli/nmcli.c:316
 #, c-format
 msgid "Error: Option '--terse' is mutually exclusive with '--pretty'."
-msgstr "Erro: Opção “--terse” é mutualmente exclusiva com “--pretty”."
+msgstr "Erro: Opção \"--terse\" é mutualmente exclusiva com \"--pretty\"."
 
-#: ../clients/cli/nmcli.c:762
+#: ../clients/cli/nmcli.c:324
 #, c-format
 msgid "Error: Option '--pretty' is specified the second time."
-msgstr "Erro: Opção “--pretty” especificada pela segunda vez."
+msgstr "Erro: Opção \"--pretty\" especificada pela segunda vez."
 
-#: ../clients/cli/nmcli.c:767
+#: ../clients/cli/nmcli.c:329
 #, c-format
 msgid "Error: Option '--pretty' is mutually exclusive with '--terse'."
-msgstr "Erro: Opção “--pretty” é mutualmente exclusiva com “--terse”."
+msgstr "Erro: Opção \"--pretty\" é mutualmente exclusiva com \"--terse\"."
 
-#: ../clients/cli/nmcli.c:782
+#: ../clients/cli/nmcli.c:344
 #, c-format
 msgid "Error: '%s' is not a valid argument for '%s' option."
-msgstr "Erro: “%s” não é um argumento válido para a opção “%s”."
+msgstr ""
 
-#: ../clients/cli/nmcli.c:796 ../clients/cli/nmcli.c:808
+#: ../clients/cli/nmcli.c:358 ../clients/cli/nmcli.c:370
 #, c-format
 msgid "Error: '%s' is not valid argument for '%s' option."
-msgstr "Erro: argumento “%s” não é válido para a opção “%s”."
+msgstr "Erro: argumento \"%s\" não é válido para a opção \"%s\"."
 
-#: ../clients/cli/nmcli.c:832
+#: ../clients/cli/nmcli.c:394
 #, c-format
 msgid "Error: '%s' is not a valid timeout."
-msgstr "Erro: “%s” não é um tempo limite válido."
+msgstr ""
 
-#: ../clients/cli/nmcli.c:839
+#: ../clients/cli/nmcli.c:401
 #, c-format
 msgid "nmcli tool, version %s\n"
 msgstr "ferramenta nmcli, versão %s\n"
 
-#: ../clients/cli/nmcli.c:847
+#: ../clients/cli/nmcli.c:409
 #, c-format
 msgid "Error: Option '%s' is unknown, try 'nmcli -help'."
-msgstr "Erro: Opção “%s” é desconhecida, tente “nmcli -help”."
+msgstr "Erro: Opção \"%s\" é desconhecida, tente \"nmcli -help\"."
 
-#: ../clients/cli/nmcli.c:903 ../clients/cli/nmcli.c:910
+#: ../clients/cli/nmcli.c:455 ../clients/cli/nmcli.c:462
 #, c-format
-msgid "Error: nmcli terminated by signal %s (%d)"
-msgstr "Erro: nmcli terminado pelo sinal %s (%d)"
+msgid "Error: nmcli terminated by signal %s (%d)\n"
+msgstr ""
 
-#: ../clients/cli/nmcli.c:1052
+#: ../clients/cli/nmcli.c:560
 msgid "Success"
 msgstr "Sucesso"
 
@@ -3868,12 +3514,12 @@ msgstr "Sucesso"
 msgid "Authentication message: %s\n"
 msgstr "Mensagem de autenticação: %s\n"
 
-#: ../clients/cli/polkit-agent.c:76
+#: ../clients/cli/polkit-agent.c:74
 #, c-format
 msgid "Authentication error: %s\n"
 msgstr "Erro de autenticação: %s\n"
 
-#: ../clients/cli/polkit-agent.c:136
+#: ../clients/cli/polkit-agent.c:120
 #, c-format
 msgid "Warning: polkit agent initialization failed: %s\n"
 msgstr "Aviso: inicialização agente de polkit falhou: %s\n"
@@ -3881,19 +3527,19 @@ msgstr "Aviso: inicialização agente de polkit falhou: %s\n"
 #: ../clients/cli/settings.c:46
 #, c-format
 msgid "Do you also want to set '%s' to '%s'? [yes]: "
-msgstr "Você também deseja definir “%s” para “%s”? [sim]: "
+msgstr "Você também deseja definir \"%s\" para \"%s\"? [sim]: "
 
 #: ../clients/cli/settings.c:48
 #, c-format
 msgid "Do you also want to clear '%s'? [yes]: "
-msgstr "Você também deseja limpar “%s”? [sim]: "
+msgstr "Você também deseja limpar \"%s\"? [sim]: "
 
 #: ../clients/cli/settings.c:224
 #, c-format
 msgid ""
 "Warning: %s.%s set to '%s', but it might be ignored in infrastructure mode\n"
 msgstr ""
-"Aviso: %s.%s define para “%s”, mas ele pode ser ignorado no modo "
+"Aviso: %s.%s define para \"%s\", mas ele pode ser ignorado no modo "
 "infraestrutura\n"
 
 #: ../clients/cli/settings.c:243
@@ -3905,540 +3551,529 @@ msgstr "Aviso: definição %s.%s requer remover as definições de ipv4 e ipv6\n
 msgid "Do you want to remove them? [yes] "
 msgstr "Você deseja removê-las? [sim] "
 
-#: ../clients/cli/settings.c:332
+#: ../clients/cli/settings.c:330
 #, c-format
 msgid "Warning: %s is not an UUID of any existing connection profile\n"
 msgstr "Aviso: %s não é um UUID de um perfile de conexão existente\n"
 
-#: ../clients/cli/settings.c:337 ../clients/cli/settings.c:350
+#: ../clients/cli/settings.c:335 ../clients/cli/settings.c:348
 #, c-format
 msgid "'%s' is not a VPN connection profile"
-msgstr "“%s” não é um perfil de conexão VPN"
+msgstr "\"%s\" não é um perfil de conexão VPN"
 
-#: ../clients/cli/settings.c:344
+#: ../clients/cli/settings.c:342
 #, c-format
 msgid "'%s' is not a name of any exiting profile"
-msgstr "“%s” não é um nome de um perfil existente"
+msgstr "\"%s\" não é um nome de um perfil existente"
 
-#: ../clients/cli/settings.c:388
+#: ../clients/cli/settings.c:386
 #, c-format
 msgid "Warning: %s\n"
-msgstr "Aviso: %s\n"
+msgstr ""
 
-#: ../clients/cli/settings.c:391
-#, c-format
+#: ../clients/cli/settings.c:389
+#, fuzzy, c-format
 msgid "Info: %s\n"
-msgstr "Info: %s\n"
+msgstr "Erro: %s\n"
 
-#: ../clients/cli/settings.c:484
+#: ../clients/cli/settings.c:481
 msgid "don't know how to get the property value"
 msgstr "não há conhecimento de como obter o valor da propriedade"
 
-#: ../clients/cli/settings.c:574 ../clients/cli/settings.c:616
+#: ../clients/cli/settings.c:571 ../clients/cli/settings.c:613
 msgid "the property can't be changed"
 msgstr "a propriedade não pode ser alterada"
 
-#: ../clients/cli/settings.c:736
+#: ../clients/cli/settings.c:733
 msgid "[NM property description]"
 msgstr "[descrição propriedade NM]"
 
-#: ../clients/cli/settings.c:746
+#: ../clients/cli/settings.c:743
 msgid "[nmcli specific description]"
 msgstr "[descrição específica do nmcli]"
 
-#: ../clients/cli/utils.c:319
+#: ../clients/cli/utils.c:328
 #, c-format
 msgid "Error: Argument '%s' was expected, but '%s' provided."
-msgstr "Erro: era esperado o argumento “%s”, porém foi fornecido “%s”."
+msgstr "Erro: era esperado o argumento \"%s\", porém foi fornecido \"%s\"."
 
-#: ../clients/cli/utils.c:322
+#: ../clients/cli/utils.c:331
 #, c-format
 msgid "Error: Unexpected argument '%s'"
-msgstr "Erro: o argumento “%s” é inesperado"
+msgstr "Erro: o argumento \"%s\" é inesperado"
 
-#: ../clients/cli/utils.c:709
-#, c-format
+#: ../clients/cli/utils.c:804
+#, fuzzy, c-format
 msgid "invalid field '%s%s%s'; no such field"
-msgstr "campo inválido \"%s%s%s\"; campo inexistente"
+msgstr "campo inválido '%s'; campos permitidos: %s"
 
-#: ../clients/cli/utils.c:713
-#, c-format
+#: ../clients/cli/utils.c:808
+#, fuzzy, c-format
 msgid "invalid field '%s%s%s'; allowed fields: [%s]"
-msgstr "campo inválido \"%s%s%s\"; campos permitidos: [%s]"
+msgstr "campo inválido '%s'; campos permitidos: %s"
 
-#: ../clients/cli/utils.c:809
-#, c-format
+#: ../clients/cli/utils.c:881
+#, fuzzy, c-format
 msgid "failure to select field"
-msgstr "falha ao selecionar campo"
+msgstr "Falha ao selecionar o APN especificado"
 
-#: ../clients/cli/utils.c:1424
+#: ../clients/cli/utils.c:1469
 #, c-format
 msgid "Error reading nmcli output: %s\n"
-msgstr "Erro ao ler a saída do nmcli: %s\n"
+msgstr ""
 
-#: ../clients/cli/utils.c:1429
+#: ../clients/cli/utils.c:1474
 #, c-format
 msgid "Error writing nmcli output: %s\n"
-msgstr "Erro ao escrever a saída do nmcli: %s\n"
+msgstr ""
 
-#: ../clients/cli/utils.c:1453
+#: ../clients/cli/utils.c:1498
 #, c-format
 msgid "Failed to create pager pipe: %s\n"
-msgstr "Falha ao criar pipe de paginador: %s\n"
+msgstr ""
 
-#: ../clients/cli/utils.c:1461
+#: ../clients/cli/utils.c:1506
 #, c-format
 msgid "Failed to fork pager: %s\n"
-msgstr "Falha ao bifurcar paginador: %s\n"
+msgstr ""
 
-#: ../clients/cli/utils.c:1507 ../clients/cli/utils.c:1509
+#: ../clients/cli/utils.c:1552 ../clients/cli/utils.c:1554
 #, c-format
 msgid "Failed to duplicate pager pipe: %s\n"
-msgstr "Falha ao duplicar pipe de paginador: %s\n"
-
-#: ../clients/cli/utils.h:298
-msgid "on"
-msgstr "ligado"
-
-#: ../clients/cli/utils.h:298
-msgid "off"
-msgstr "desligado"
-
-#: ../clients/cli/utils.h:324
-#, c-format
-msgid "%lld (%s)"
-msgstr "%lld (%s)"
-
-#: ../clients/cli/utils.h:331
-#, c-format
-msgid "%lld - %s"
-msgstr "%lld – %s"
+msgstr ""
 
 #. TRANSLATORS: the first %s is the partial value entered by
 #. * the user, the second %s a list of compatible values.
 #.
-#: ../clients/common/nm-client-utils.c:117
-#: ../clients/common/nm-client-utils.c:148
+#: ../clients/common/nm-client-utils.c:75
+#: ../clients/common/nm-client-utils.c:106
 #, c-format
 msgid "'%s' is ambiguous (%s)"
-msgstr "“%s” é ambíguo (%s)"
+msgstr "\"%s\" é ambíguo (%s)"
 
-#: ../clients/common/nm-client-utils.c:127
+#: ../clients/common/nm-client-utils.c:85
 #, c-format
 msgid "'%s' is not valid; use [%s] or [%s]"
-msgstr "“%s” não é válido; use [%s] ou [%s]"
+msgstr "\"%s\" não é válido; use [%s] ou [%s]"
 
-#: ../clients/common/nm-client-utils.c:160
+#: ../clients/common/nm-client-utils.c:118
 #, c-format
 msgid "'%s' is not valid; use [%s], [%s] or [%s]"
-msgstr "“%s” não é válido; use [%s], [%s] ou [%s]"
+msgstr "\"%s\" não é válido; use [%s], [%s] ou [%s]"
 
-#: ../clients/common/nm-client-utils.c:209
+#: ../clients/common/nm-client-utils.c:155
 #, c-format
-msgid "'%s' is ambiguous: %s"
-msgstr "“%s” é ambíguo: %s"
+msgid "'%s' is ambiguous (%s x %s)"
+msgstr "\"%s\" é ambíguo (%s x %s)"
 
-#: ../clients/common/nm-client-utils.c:219
+#: ../clients/common/nm-client-utils.c:167
 #, c-format
 msgid "missing name, try one of [%s]"
-msgstr "faltando o nome, tente um de [%s]"
+msgstr "nome em falta, tente um de [%s]"
 
-#: ../clients/common/nm-client-utils.c:261
+#: ../clients/common/nm-client-utils.c:223
 msgid "unmanaged"
 msgstr "não gerenciável"
 
-#: ../clients/common/nm-client-utils.c:262
+#: ../clients/common/nm-client-utils.c:225
 msgid "unavailable"
 msgstr "não disponível"
 
-#: ../clients/common/nm-client-utils.c:264
+#: ../clients/common/nm-client-utils.c:229
 msgid "connecting (prepare)"
 msgstr "conectando (preparando)"
 
-#: ../clients/common/nm-client-utils.c:265
+#: ../clients/common/nm-client-utils.c:231
 msgid "connecting (configuring)"
 msgstr "conectando (configurando)"
 
-#: ../clients/common/nm-client-utils.c:266
+#: ../clients/common/nm-client-utils.c:233
 msgid "connecting (need authentication)"
 msgstr "conectando (precisa de autenticação)"
 
-#: ../clients/common/nm-client-utils.c:267
+#: ../clients/common/nm-client-utils.c:235
 msgid "connecting (getting IP configuration)"
 msgstr "conectando (obtendo configuração de IP)"
 
-#: ../clients/common/nm-client-utils.c:268
+#: ../clients/common/nm-client-utils.c:237
 msgid "connecting (checking IP connectivity)"
 msgstr "conectando (verificando conectividade de IP)"
 
-#: ../clients/common/nm-client-utils.c:269
+#: ../clients/common/nm-client-utils.c:239
 msgid "connecting (starting secondary connections)"
 msgstr "conectando (iniciando conexões secundárias)"
 
-#: ../clients/common/nm-client-utils.c:272
+#: ../clients/common/nm-client-utils.c:245
 msgid "connection failed"
 msgstr "falha na conexão"
 
-#: ../clients/common/nm-client-utils.c:280
+#: ../clients/common/nm-client-utils.c:262
 msgid "yes (guessed)"
 msgstr "sim (adivinhado)"
 
-#: ../clients/common/nm-client-utils.c:281
+#: ../clients/common/nm-client-utils.c:264
 msgid "no (guessed)"
 msgstr "não (adivinhado)"
 
-#. TRANSLATORS: Unknown reason for a device state change (NMDeviceStateReason)
-#. TRANSLATORS: Unknown reason for a connection state change (NMActiveConnectionStateReason)
-#: ../clients/common/nm-client-utils.c:287
-#: ../clients/common/nm-client-utils.c:359 ../libnm-glib/nm-device.c:1859
-#: ../libnm/nm-device.c:1360
-msgid "Unknown"
-msgstr "Desconhecido"
-
-#: ../clients/common/nm-client-utils.c:288
+#: ../clients/common/nm-client-utils.c:277
 msgid "No reason given"
 msgstr "Nenhuma razão fornecida"
 
-#: ../clients/common/nm-client-utils.c:290
+#: ../clients/common/nm-client-utils.c:281
 msgid "Device is now managed"
 msgstr "Agora o dispositivo é gerenciável"
 
-#: ../clients/common/nm-client-utils.c:291
+#: ../clients/common/nm-client-utils.c:283
 msgid "Device is now unmanaged"
 msgstr "Agora o dispositivo é não gerenciável"
 
-#: ../clients/common/nm-client-utils.c:292
+#: ../clients/common/nm-client-utils.c:285
 msgid "The device could not be readied for configuration"
 msgstr "O dispositivo pode não estar pronto para configuração"
 
-#: ../clients/common/nm-client-utils.c:293
+#: ../clients/common/nm-client-utils.c:287
 msgid ""
 "IP configuration could not be reserved (no available address, timeout, etc.)"
 msgstr ""
 "A configuração IP não pode estar reservada (nenhum endereço disponível, "
 "timeout, etc)"
 
-#: ../clients/common/nm-client-utils.c:294
+#: ../clients/common/nm-client-utils.c:289
 msgid "The IP configuration is no longer valid"
 msgstr "A configuração IP não é mais válida"
 
-#: ../clients/common/nm-client-utils.c:295
+#: ../clients/common/nm-client-utils.c:291
 msgid "Secrets were required, but not provided"
 msgstr "Segredos foram requisitados, mas não fornecidos"
 
-#: ../clients/common/nm-client-utils.c:296
+#: ../clients/common/nm-client-utils.c:293
 msgid "802.1X supplicant disconnected"
-msgstr "802.1X suplicante – desconectado"
+msgstr "802.1X suplicante - desconectado"
 
-#: ../clients/common/nm-client-utils.c:297
+#: ../clients/common/nm-client-utils.c:295
 msgid "802.1X supplicant configuration failed"
-msgstr "802.1X suplicante – falha de configuração"
+msgstr "802.1X suplicante - falha de configuração"
 
-#: ../clients/common/nm-client-utils.c:298
+#: ../clients/common/nm-client-utils.c:297
 msgid "802.1X supplicant failed"
-msgstr "802.1X suplicante – falhou"
+msgstr "802.1X suplicante - falhou"
 
 #: ../clients/common/nm-client-utils.c:299
 msgid "802.1X supplicant took too long to authenticate"
-msgstr "802.1X suplicante – demorou muito para autenticar"
+msgstr "802.1X suplicante - demorou muito para autenticar"
 
-#: ../clients/common/nm-client-utils.c:300
+#: ../clients/common/nm-client-utils.c:301
 msgid "PPP service failed to start"
 msgstr "O serviço PPP falhou ao iniciar"
 
-#: ../clients/common/nm-client-utils.c:301
+#: ../clients/common/nm-client-utils.c:303
 msgid "PPP service disconnected"
 msgstr "Serviço PPP desconectado"
 
-#: ../clients/common/nm-client-utils.c:302
+#: ../clients/common/nm-client-utils.c:305
 msgid "PPP failed"
 msgstr "PPP falhou"
 
-#: ../clients/common/nm-client-utils.c:303
+#: ../clients/common/nm-client-utils.c:307
 msgid "DHCP client failed to start"
 msgstr "O cliente DHCP falhou ao iniciar"
 
-#: ../clients/common/nm-client-utils.c:304
+#: ../clients/common/nm-client-utils.c:309
 msgid "DHCP client error"
 msgstr "Erro no cliente DHCP"
 
-#: ../clients/common/nm-client-utils.c:305
+#: ../clients/common/nm-client-utils.c:311
 msgid "DHCP client failed"
 msgstr "O cliente DHCP falhou"
 
-#: ../clients/common/nm-client-utils.c:306
+#: ../clients/common/nm-client-utils.c:313
 msgid "Shared connection service failed to start"
 msgstr "O serviço de conexão compartilhada falhou ao iniciar"
 
-#: ../clients/common/nm-client-utils.c:307
+#: ../clients/common/nm-client-utils.c:315
 msgid "Shared connection service failed"
 msgstr "Serviço de conexão compartilhada falhou"
 
-#: ../clients/common/nm-client-utils.c:308
+#: ../clients/common/nm-client-utils.c:317
 msgid "AutoIP service failed to start"
 msgstr "O serviço AutoIP falhou ao iniciar"
 
-#: ../clients/common/nm-client-utils.c:309
+#: ../clients/common/nm-client-utils.c:319
 msgid "AutoIP service error"
 msgstr "Erro no serviço AutoIP"
 
-#: ../clients/common/nm-client-utils.c:310
+#: ../clients/common/nm-client-utils.c:321
 msgid "AutoIP service failed"
 msgstr "O serviço AutoIP falhou"
 
-#: ../clients/common/nm-client-utils.c:311
+#: ../clients/common/nm-client-utils.c:323
 msgid "The line is busy"
 msgstr "A linha está ocupada"
 
-#: ../clients/common/nm-client-utils.c:312
+#: ../clients/common/nm-client-utils.c:325
 msgid "No dial tone"
 msgstr "Sem tom de discagem"
 
-#: ../clients/common/nm-client-utils.c:313
+#: ../clients/common/nm-client-utils.c:327
 msgid "No carrier could be established"
 msgstr "Nenhum serviço de comunicação pôde ser estabelecido"
 
-#: ../clients/common/nm-client-utils.c:314
+#: ../clients/common/nm-client-utils.c:329
 msgid "The dialing request timed out"
 msgstr "Tempo excedido durante a requisição de discagem"
 
-#: ../clients/common/nm-client-utils.c:315
+#: ../clients/common/nm-client-utils.c:331
 msgid "The dialing attempt failed"
 msgstr "A tentativa de discagem falhou"
 
-#: ../clients/common/nm-client-utils.c:316
+#: ../clients/common/nm-client-utils.c:333
 msgid "Modem initialization failed"
 msgstr "Falha na inicialização do modem"
 
-#: ../clients/common/nm-client-utils.c:317
+#: ../clients/common/nm-client-utils.c:335
 msgid "Failed to select the specified APN"
 msgstr "Falha ao selecionar o APN especificado"
 
-#: ../clients/common/nm-client-utils.c:318
+#: ../clients/common/nm-client-utils.c:337
 msgid "Not searching for networks"
 msgstr "Não procurando redes"
 
-#: ../clients/common/nm-client-utils.c:319
+#: ../clients/common/nm-client-utils.c:339
 msgid "Network registration denied"
 msgstr "Registro na rede negado"
 
-#: ../clients/common/nm-client-utils.c:320
+#: ../clients/common/nm-client-utils.c:341
 msgid "Network registration timed out"
 msgstr "Tempo excedido ao registrar na rede"
 
-#: ../clients/common/nm-client-utils.c:321
+#: ../clients/common/nm-client-utils.c:343
 msgid "Failed to register with the requested network"
 msgstr "Falha ao registrar com a rede requisitada"
 
-#: ../clients/common/nm-client-utils.c:322
+#: ../clients/common/nm-client-utils.c:345
 msgid "PIN check failed"
 msgstr "Verificação de PIN falhou"
 
-#: ../clients/common/nm-client-utils.c:323
+#: ../clients/common/nm-client-utils.c:347
 msgid "Necessary firmware for the device may be missing"
 msgstr "O firmware necessário para o dispositivo pode estar faltando"
 
-#: ../clients/common/nm-client-utils.c:324
+#: ../clients/common/nm-client-utils.c:349
 msgid "The device was removed"
 msgstr "O dispositivo foi removido"
 
-#: ../clients/common/nm-client-utils.c:325
+#: ../clients/common/nm-client-utils.c:351
 msgid "NetworkManager went to sleep"
 msgstr "NetworkManager foi dormir"
 
-#: ../clients/common/nm-client-utils.c:326
+#: ../clients/common/nm-client-utils.c:353
 msgid "The device's active connection disappeared"
 msgstr "A conexão ativa do dispositivo desapareceu"
 
-#: ../clients/common/nm-client-utils.c:327
+#: ../clients/common/nm-client-utils.c:355
 msgid "Device disconnected by user or client"
 msgstr "Dispositivo desconectado pelo usuário ou cliente"
 
-#: ../clients/common/nm-client-utils.c:328
+#: ../clients/common/nm-client-utils.c:357
 msgid "Carrier/link changed"
 msgstr "Comunicador/link alterado"
 
-#: ../clients/common/nm-client-utils.c:329
+#: ../clients/common/nm-client-utils.c:359
 msgid "The device's existing connection was assumed"
 msgstr "A conexão existente do dispositivo foi presumida"
 
-#: ../clients/common/nm-client-utils.c:330
+#: ../clients/common/nm-client-utils.c:361
 msgid "The supplicant is now available"
 msgstr "O suplicante agora está disponível"
 
-#: ../clients/common/nm-client-utils.c:331
+#: ../clients/common/nm-client-utils.c:363
 msgid "The modem could not be found"
 msgstr "O modem não pôde ser encontrado"
 
-#: ../clients/common/nm-client-utils.c:332
+#: ../clients/common/nm-client-utils.c:365
 msgid "The Bluetooth connection failed or timed out"
 msgstr "A conexão Bluetooth falhou ou teve seu tempo excedido"
 
-#: ../clients/common/nm-client-utils.c:333
+#: ../clients/common/nm-client-utils.c:367
 msgid "GSM Modem's SIM card not inserted"
 msgstr "Cartão SIM do modem GSM não inserido"
 
-#: ../clients/common/nm-client-utils.c:334
+#: ../clients/common/nm-client-utils.c:369
 msgid "GSM Modem's SIM PIN required"
 msgstr "PIN do cartão SIM do modem GSM necessário"
 
-#: ../clients/common/nm-client-utils.c:335
+#: ../clients/common/nm-client-utils.c:371
 msgid "GSM Modem's SIM PUK required"
 msgstr "PUK do cartão SIM do modem GSM necessário"
 
-#: ../clients/common/nm-client-utils.c:336
+#: ../clients/common/nm-client-utils.c:373
 msgid "GSM Modem's SIM wrong"
 msgstr "SIM do cartão SIM do modem GSM errado"
 
-#: ../clients/common/nm-client-utils.c:337
+#: ../clients/common/nm-client-utils.c:375
 msgid "InfiniBand device does not support connected mode"
 msgstr "Dispositivo InfiniBand não oferece suporte ao modo conectado"
 
-#: ../clients/common/nm-client-utils.c:338
+#: ../clients/common/nm-client-utils.c:377
 msgid "A dependency of the connection failed"
 msgstr "Uma dependência da conexão falhou"
 
-#: ../clients/common/nm-client-utils.c:339
+#: ../clients/common/nm-client-utils.c:379
 msgid "A problem with the RFC 2684 Ethernet over ADSL bridge"
 msgstr "Um problema com a RFC 2684 Ethernet sobre ponte ADSL"
 
-#: ../clients/common/nm-client-utils.c:340
+#: ../clients/common/nm-client-utils.c:381
 msgid "ModemManager is unavailable"
 msgstr "ModemManager está indisponível"
 
-#: ../clients/common/nm-client-utils.c:341
+#: ../clients/common/nm-client-utils.c:383
 msgid "The Wi-Fi network could not be found"
 msgstr "Não foi possível encontrar a rede Wi-Fi"
 
-#: ../clients/common/nm-client-utils.c:342
+#: ../clients/common/nm-client-utils.c:385
 msgid "A secondary connection of the base connection failed"
 msgstr "Uma conexão secundária à conexão base falhou"
 
-#: ../clients/common/nm-client-utils.c:343
+#: ../clients/common/nm-client-utils.c:387
 msgid "DCB or FCoE setup failed"
 msgstr "A configuração do DCB ou FCoE falhou"
 
-#: ../clients/common/nm-client-utils.c:344
+#: ../clients/common/nm-client-utils.c:389
 msgid "teamd control failed"
 msgstr "controle do teamd falhou"
 
-#: ../clients/common/nm-client-utils.c:345
+#: ../clients/common/nm-client-utils.c:391
 msgid "Modem failed or no longer available"
 msgstr "Modem falhou ou não está mais disponível"
 
-#: ../clients/common/nm-client-utils.c:346
+#: ../clients/common/nm-client-utils.c:393
 msgid "Modem now ready and available"
 msgstr "Modem está pronto e disponível"
 
-#: ../clients/common/nm-client-utils.c:347
+#: ../clients/common/nm-client-utils.c:395
 msgid "SIM PIN was incorrect"
 msgstr "PIN do SIM está incorreto"
 
-#: ../clients/common/nm-client-utils.c:348
+#: ../clients/common/nm-client-utils.c:397
 msgid "New connection activation was enqueued"
 msgstr "Nova ativação foi enfileirada"
 
-#: ../clients/common/nm-client-utils.c:349
+#: ../clients/common/nm-client-utils.c:399
 msgid "The device's parent changed"
 msgstr "O pai do dispositivo foi alterado"
 
-#: ../clients/common/nm-client-utils.c:350
+#: ../clients/common/nm-client-utils.c:401
 msgid "The device parent's management changed"
 msgstr "O gerenciamento do pai do dispositivo foi alterado"
 
-#: ../clients/common/nm-client-utils.c:351
+#: ../clients/common/nm-client-utils.c:403
 msgid "OpenVSwitch database connection failed"
-msgstr "Conexão com o banco de dados OpenVSwitch falhou"
+msgstr ""
 
-#: ../clients/common/nm-client-utils.c:352
+#: ../clients/common/nm-client-utils.c:405
 msgid "A duplicate IP address was detected"
-msgstr "Um endereço IP duplicado foi detectado"
-
-#: ../clients/common/nm-client-utils.c:353
-msgid "The selected IP method is not supported"
-msgstr "Não há suporte ao método de IP selecionado"
+msgstr ""
 
-#: ../clients/common/nm-client-utils.c:354
-msgid "Failed to configure SR-IOV parameters"
-msgstr "Falha ao configurar parâmetros SR-IOV"
+#. TRANSLATORS: Unknown reason for a device state change (NMDeviceStateReason)
+#. TRANSLATORS: Unknown reason for a connection state change (NMActiveConnectionStateReason)
+#: ../clients/common/nm-client-utils.c:410
+#: ../clients/common/nm-client-utils.c:449 ../libnm-glib/nm-device.c:1860
+#: ../libnm/nm-device.c:1572
+msgid "Unknown"
+msgstr "Desconhecido"
 
-#: ../clients/common/nm-client-utils.c:360
+#: ../clients/common/nm-client-utils.c:418
+#, fuzzy
 msgid "Unknown reason"
-msgstr "Motivo desconhecido"
+msgstr "razão desconhecida"
 
-#: ../clients/common/nm-client-utils.c:361
+#: ../clients/common/nm-client-utils.c:420
+#, fuzzy
 msgid "The connection was disconnected"
-msgstr "A conexão foi desconectada"
+msgstr "A conexão não era de vínculo."
 
-#: ../clients/common/nm-client-utils.c:362
+#: ../clients/common/nm-client-utils.c:422
+#, fuzzy
 msgid "Disconnected by user"
-msgstr "Desconectado pelo usuário"
+msgstr "Desconectado pelo D-Bus"
 
-#: ../clients/common/nm-client-utils.c:363
+#: ../clients/common/nm-client-utils.c:424
+#, fuzzy
 msgid "The base network connection was interrupted"
-msgstr "A conexão base de rede foi interrompida"
+msgstr "a conexão base de rede foi interrompida"
 
-#: ../clients/common/nm-client-utils.c:364
+#: ../clients/common/nm-client-utils.c:426
+#, fuzzy
 msgid "The VPN service stopped unexpectedly"
-msgstr "O serviço VPN parou inesperadamente"
+msgstr "o serviço VPN parou inesperadamente"
 
-#: ../clients/common/nm-client-utils.c:365
+#: ../clients/common/nm-client-utils.c:428
+#, fuzzy
 msgid "The VPN service returned invalid configuration"
-msgstr "O serviço VPN retornou uma configuração inválida"
+msgstr "o serviço VPN retornou uma configuração inválida"
 
-#: ../clients/common/nm-client-utils.c:366
+#: ../clients/common/nm-client-utils.c:430
+#, fuzzy
 msgid "The connection attempt timed out"
-msgstr "A tentativa de conexão esgotou o tempo limite"
+msgstr "a tentativa de conexão esgotou o tempo limite"
 
-#: ../clients/common/nm-client-utils.c:367
+#: ../clients/common/nm-client-utils.c:432
+#, fuzzy
 msgid "The VPN service did not start in time"
-msgstr "O serviço VPN não iniciou a tempo"
+msgstr "o serviço VPN não iniciou a tempo"
 
-#: ../clients/common/nm-client-utils.c:368
+#: ../clients/common/nm-client-utils.c:434
+#, fuzzy
 msgid "The VPN service failed to start"
-msgstr "O serviço VPN falhou ao iniciar"
+msgstr "o serviço VPN falhou ao iniciar"
 
-#: ../clients/common/nm-client-utils.c:369
+#: ../clients/common/nm-client-utils.c:436
+#, fuzzy
 msgid "No valid secrets"
-msgstr "Sem segredos válidos"
+msgstr "sem segredos VPN válidos"
 
-#: ../clients/common/nm-client-utils.c:370
+#: ../clients/common/nm-client-utils.c:438
+#, fuzzy
 msgid "Invalid secrets"
-msgstr "Segredos inválidos"
+msgstr "segredos VPN inválidos"
 
-#: ../clients/common/nm-client-utils.c:371
+#: ../clients/common/nm-client-utils.c:440
+#, fuzzy
 msgid "The connection was removed"
-msgstr "A conexão foi removida"
+msgstr "a conexão foi removida"
 
-#: ../clients/common/nm-client-utils.c:372
+#: ../clients/common/nm-client-utils.c:442
+#, fuzzy
 msgid "Master connection failed"
-msgstr "Conexão mestre falhou"
+msgstr "falha na conexão"
 
-#: ../clients/common/nm-client-utils.c:373
+#: ../clients/common/nm-client-utils.c:444
+#, fuzzy
 msgid "Could not create a software link"
-msgstr "Não foi possível criar um link de software"
+msgstr "Não foi possível criar um arquivo temporário: %s"
 
-#: ../clients/common/nm-client-utils.c:374
+#: ../clients/common/nm-client-utils.c:446
+#, fuzzy
 msgid "The device disappeared"
-msgstr "O dispositivo desapareceu"
+msgstr "A conexão ativa do dispositivo desapareceu"
 
 #: ../clients/common/nm-meta-setting-access.c:501
 #, c-format
 msgid "field '%s' has to be alone"
-msgstr "o campo “%s” tem que ser um só"
+msgstr "campo \"%s\" tem que ser um só"
 
 #: ../clients/common/nm-meta-setting-access.c:516
-#, c-format
+#, fuzzy, c-format
 msgid "invalid field '%s%s%s%s%s'; %s%s%s"
-msgstr "campo inválido \"%s%s%s%s%s\"; %s%s%s"
+msgstr "campo inválido '%s'; campos permitidos: %s"
 
-#: ../clients/common/nm-meta-setting-desc.c:99
-#: ../clients/common/nm-meta-setting-desc.c:161
+#: ../clients/common/nm-meta-setting-desc.c:100
+#: ../clients/common/nm-meta-setting-desc.c:156
 #, c-format
 msgid "invalid prefix '%s'; <1-%d> allowed"
-msgstr "prefixo “%s” inválido; <1-%d> são permitidos"
+msgstr "O prefixo \"%s\" é inválido; <1-%d> são permitidos"
 
-#: ../clients/common/nm-meta-setting-desc.c:107
+#: ../clients/common/nm-meta-setting-desc.c:108
 #, c-format
 msgid "invalid IP address: %s"
 msgstr "endereço IPv4 inválido: %s"
@@ -4448,243 +4083,271 @@ msgid ""
 "The valid syntax is: 'ip[/prefix] [next-hop] [metric] [attribute=val]... [,"
 "ip[/prefix] ...]'"
 msgstr ""
-"A sintaxe válida é: 'ip[/prefixo] [próx-salto] [métrica] [atributo=val]… [,"
-"ip[/prefixo] …]'"
 
-#: ../clients/common/nm-meta-setting-desc.c:172
+#: ../clients/common/nm-meta-setting-desc.c:167
 #, c-format
 msgid "the next hop ('%s') must be first"
-msgstr "o próximo salto (“%s”) deve vir primeiro"
+msgstr ""
 
-#: ../clients/common/nm-meta-setting-desc.c:178
+#: ../clients/common/nm-meta-setting-desc.c:173
 #, c-format
 msgid "the metric ('%s') must be before attributes"
-msgstr "a métrica (“%s”) deve vir antes dos atributos"
+msgstr ""
 
-#: ../clients/common/nm-meta-setting-desc.c:218
+#: ../clients/common/nm-meta-setting-desc.c:213
 #, c-format
 msgid "invalid route: %s. %s"
-msgstr "rota inválida: %s. %s"
+msgstr ""
 
-#: ../clients/common/nm-meta-setting-desc.c:230
+#: ../clients/common/nm-meta-setting-desc.c:225
 msgid "default route cannot be added (NetworkManager handles it by itself)"
 msgstr ""
 "a rota padrão não pode ser adicionada (NetworkManager cuida disso ele mesmo)"
 
-#: ../clients/common/nm-meta-setting-desc.c:429
+#: ../clients/common/nm-meta-setting-desc.c:424
 #, c-format
 msgid "invalid priority map '%s'"
-msgstr "mapa de prioridade “%s” inválido"
+msgstr "O mapa de prioridade \"%s\" é inválido"
 
-#: ../clients/common/nm-meta-setting-desc.c:436
-#: ../clients/common/nm-meta-setting-desc.c:442
+#: ../clients/common/nm-meta-setting-desc.c:431
+#: ../clients/common/nm-meta-setting-desc.c:437
 #, c-format
 msgid "priority '%s' is not valid (<0-%ld>)"
-msgstr "A prioridade “%s” não é válida (<0-%ld>)"
+msgstr "A prioridade \"%s\" não é válida (<0-%ld>)"
 
-#: ../clients/common/nm-meta-setting-desc.c:494
+#: ../clients/common/nm-meta-setting-desc.c:489
 #, c-format
 msgid "cannot read pac-script from file '%s'"
-msgstr "não foi possível ler script pac a partir do arquivo “%s”"
+msgstr ""
 
-#: ../clients/common/nm-meta-setting-desc.c:501
+#: ../clients/common/nm-meta-setting-desc.c:496
 #, c-format
 msgid "file '%s' contains non-valid utf-8"
-msgstr "o arquivo “%s” contém utf-8 não válido"
+msgstr ""
 
-#: ../clients/common/nm-meta-setting-desc.c:514
+#: ../clients/common/nm-meta-setting-desc.c:509
 #, c-format
 msgid "'%s' does not contain a valid PAC Script"
-msgstr "“%s” não contém um script PAC válido"
+msgstr ""
 
-#: ../clients/common/nm-meta-setting-desc.c:517
+#: ../clients/common/nm-meta-setting-desc.c:512
 #, c-format
 msgid "Not a valid PAC Script"
-msgstr "Script PAC não válido"
+msgstr ""
 
-#: ../clients/common/nm-meta-setting-desc.c:571
+#: ../clients/common/nm-meta-setting-desc.c:566
 #, c-format
 msgid "cannot read team config from file '%s'"
-msgstr "não foi possível ler configuração de união a partir do arquivo “%s”"
+msgstr ""
 
-#: ../clients/common/nm-meta-setting-desc.c:578
+#: ../clients/common/nm-meta-setting-desc.c:573
 #, c-format
 msgid "team config file '%s' contains non-valid utf-8"
-msgstr "arquivo de configuração “%s” de união contém utf-8 não válido"
+msgstr ""
 
-#: ../clients/common/nm-meta-setting-desc.c:590
+#: ../clients/common/nm-meta-setting-desc.c:585
 #, c-format
 msgid "'%s' does not contain a valid team configuration"
-msgstr "“%s” não contém uma configuração de união válida"
+msgstr ""
 
-#: ../clients/common/nm-meta-setting-desc.c:593
+#: ../clients/common/nm-meta-setting-desc.c:588
 #, c-format
 msgid "team configuration must be a JSON object"
-msgstr "configuração de união deve ser um objeto JSON"
+msgstr ""
 
-#: ../clients/common/nm-meta-setting-desc.c:714
+#: ../clients/common/nm-meta-setting-desc.c:682
 #: ../clients/tui/nmt-mtu-entry.c:84
 msgid "(default)"
 msgstr "(padrão)"
 
-#: ../clients/common/nm-meta-setting-desc.c:855
+#: ../clients/common/nm-meta-setting-desc.c:797
 msgid "auto"
 msgstr "auto"
 
-#: ../clients/common/nm-meta-setting-desc.c:1007
+#: ../clients/common/nm-meta-setting-desc.c:945
 #, c-format
 msgid "%s (%s)"
-msgstr "%s (%s)"
+msgstr ""
 
-#: ../clients/common/nm-meta-setting-desc.c:1131
+#: ../clients/common/nm-meta-setting-desc.c:1069
 #, c-format
 msgid "'%s' is out of range [%lli, %lli]"
-msgstr "“%s” está fora da faixa [%lli, %lli]"
+msgstr ""
 
-#: ../clients/common/nm-meta-setting-desc.c:1137
+#: ../clients/common/nm-meta-setting-desc.c:1075
 #, c-format
 msgid "'%s' is not a valid number"
-msgstr "“%s” não é um número válido"
+msgstr ""
 
-#: ../clients/common/nm-meta-setting-desc.c:1187
+#: ../clients/common/nm-meta-setting-desc.c:1125
 #, c-format
 msgid "'%s' is out of range [0, %u]"
-msgstr "“%s” está fora da faixa [0, %u]"
+msgstr ""
 
-#: ../clients/common/nm-meta-setting-desc.c:1230
+#: ../clients/common/nm-meta-setting-desc.c:1162
 #, c-format
 msgid "'%s' is not a valid Ethernet MAC"
-msgstr "“%s” não é um MAC de Ethernet válido"
+msgstr "\"%s\" não é um MAC de porta ethernet válido"
 
-#: ../clients/common/nm-meta-setting-desc.c:1334
+#: ../clients/common/nm-meta-setting-desc.c:1181
 #, c-format
+msgid "'%s' is not a valid flag number; use <0-%d>"
+msgstr "Erro: \"priority\": \"%s\" não é um número válido <0-%d>"
+
+#: ../clients/common/nm-meta-setting-desc.c:1195
+#, fuzzy, c-format
+msgid "'%s' sum is higher than all flags => all flags set"
+msgstr ""
+"Aviso: soma \"%s\" é maior do que todas os sinalizadores => todos "
+"sinalizadores definidos\n"
+
+#: ../clients/common/nm-meta-setting-desc.c:1299
+#, fuzzy, c-format
 msgid "invalid option '%s', use a combination of [%s]"
-msgstr "opção inválida “%s”, use uma combinação de [%s]"
+msgstr "opção inválida \"%s\", use um de [%s]"
 
-#: ../clients/common/nm-meta-setting-desc.c:1339 ../libnm-core/nm-keyfile.c:770
+#: ../clients/common/nm-meta-setting-desc.c:1304
+#: ../libnm-core/nm-keyfile-reader.c:623
 #, c-format
 msgid "invalid option '%s', use one of [%s]"
-msgstr "opção inválida “%s”, use um de [%s]"
+msgstr "opção inválida \"%s\", use um de [%s]"
 
-#: ../clients/common/nm-meta-setting-desc.c:1458
+#: ../clients/common/nm-meta-setting-desc.c:1427
 #, c-format
 msgid "%d (key)"
 msgstr "%d (chave)"
 
-#: ../clients/common/nm-meta-setting-desc.c:1460
+#: ../clients/common/nm-meta-setting-desc.c:1429
 #, c-format
 msgid "%d (passphrase)"
 msgstr "%d (palavra-chave)"
 
-#: ../clients/common/nm-meta-setting-desc.c:1463
+#: ../clients/common/nm-meta-setting-desc.c:1432
+#: ../clients/common/nm-meta-setting-desc.c:1521
 #, c-format
 msgid "%d (unknown)"
 msgstr "%d (desconhecido)"
 
-#: ../clients/common/nm-meta-setting-desc.c:1495
+#: ../clients/common/nm-meta-setting-desc.c:1464
 msgid "0 (NONE)"
 msgstr "0 (NENHUM(A))"
 
-#: ../clients/common/nm-meta-setting-desc.c:1501
+#: ../clients/common/nm-meta-setting-desc.c:1470
 msgid "REORDER_HEADERS, "
 msgstr "REORDENAR_CABEÇALHOS, "
 
-#: ../clients/common/nm-meta-setting-desc.c:1503
+#: ../clients/common/nm-meta-setting-desc.c:1472
 msgid "GVRP, "
 msgstr "GVRP, "
 
-#: ../clients/common/nm-meta-setting-desc.c:1505
+#: ../clients/common/nm-meta-setting-desc.c:1474
 msgid "LOOSE_BINDING, "
 msgstr "PERDA_VÍNCULO, "
 
-#: ../clients/common/nm-meta-setting-desc.c:1507
+#: ../clients/common/nm-meta-setting-desc.c:1476
 msgid "MVRP, "
 msgstr "MVRP, "
 
-#: ../clients/common/nm-meta-setting-desc.c:1547
+#: ../clients/common/nm-meta-setting-desc.c:1515
+#, c-format
+msgid "%d (disabled)"
+msgstr "%d (desabilitada)"
+
+#: ../clients/common/nm-meta-setting-desc.c:1517
+#, c-format
+msgid "%d (enabled, prefer public IP)"
+msgstr "%d (ativada, prefere IP público)"
+
+#: ../clients/common/nm-meta-setting-desc.c:1519
+#, c-format
+msgid "%d (enabled, prefer temporary IP)"
+msgstr "%d (ativada, prefere IP temporário)"
+
+#: ../clients/common/nm-meta-setting-desc.c:1534
 msgid "0 (none)"
 msgstr "0 (nenhum(a))"
 
-#: ../clients/common/nm-meta-setting-desc.c:1553
+#: ../clients/common/nm-meta-setting-desc.c:1540
 msgid "agent-owned, "
 msgstr "pertence-ao-agente, "
 
-#: ../clients/common/nm-meta-setting-desc.c:1555
+#: ../clients/common/nm-meta-setting-desc.c:1542
 msgid "not saved, "
 msgstr "não salvo, "
 
-#: ../clients/common/nm-meta-setting-desc.c:1557
+#: ../clients/common/nm-meta-setting-desc.c:1544
 msgid "not required, "
 msgstr "não requisitado, "
 
-#: ../clients/common/nm-meta-setting-desc.c:1622
+#: ../clients/common/nm-meta-setting-desc.c:1606
 #, c-format
 msgid "'%s' is not valid; use <option>=<value>"
-msgstr "“%s” não é válido; use <opção>=<valor>"
+msgstr "\"%s\" não é válido; use <opção>=<valor>"
 
-#: ../clients/common/nm-meta-setting-desc.c:1661
+#: ../clients/common/nm-meta-setting-desc.c:1648
 msgid "no item to remove"
 msgstr "nenhum item para remover"
 
-#: ../clients/common/nm-meta-setting-desc.c:1665
+#: ../clients/common/nm-meta-setting-desc.c:1652
 #, c-format
 msgid "index '%d' is not in range <0-%d>"
-msgstr "o índice “%d” está fora da faixa <0-%d>"
+msgstr "índice \"%d\" está fora da faixa <0-%d>"
 
-#: ../clients/common/nm-meta-setting-desc.c:1680
+#: ../clients/common/nm-meta-setting-desc.c:1667
 #, c-format
 msgid "invalid option '%s'"
-msgstr "opção “%s” inválida"
+msgstr "A opção \"%s\" é inválida"
 
-#: ../clients/common/nm-meta-setting-desc.c:1682
+#: ../clients/common/nm-meta-setting-desc.c:1669
 msgid "missing option"
-msgstr "faltando uma opção"
+msgstr "falta opção"
 
-#: ../clients/common/nm-meta-setting-desc.c:1706
+#: ../clients/common/nm-meta-setting-desc.c:1693
 #, c-format
 msgid "'%s' is not a valid MAC"
-msgstr "“%s” não é um MAC válido"
+msgstr "\"%s\" não é um MAC válido"
 
-#: ../clients/common/nm-meta-setting-desc.c:1733
-#: ../clients/common/nm-meta-setting-desc.c:1830
-#: ../clients/common/nm-meta-setting-desc.c:4745
+#: ../clients/common/nm-meta-setting-desc.c:1723
+#: ../clients/common/nm-meta-setting-desc.c:1819
+#: ../clients/common/nm-meta-setting-desc.c:4667
 #, c-format
 msgid "'%s' is not valid"
-msgstr "“%s” não é válido"
+msgstr "\"%s\" não é válido"
 
-#: ../clients/common/nm-meta-setting-desc.c:1774
+#: ../clients/common/nm-meta-setting-desc.c:1763
 #, c-format
 msgid "'%u' flags are not valid; use combination of %s"
-msgstr "“%u” não são sinalizadores válidos; use a combinação de %s"
+msgstr "\"%u\" não são sinalizadores válidos; use a combinação de %s"
 
-#: ../clients/common/nm-meta-setting-desc.c:1810
+#: ../clients/common/nm-meta-setting-desc.c:1799
 #, c-format
 msgid "'%s' is not a valid number (or out of range)"
-msgstr "“%s” não é um valor válido (ou está fora de faixa)"
+msgstr "\"%s\" não é um valor válido (ou está fora de faixa)"
 
-#: ../clients/common/nm-meta-setting-desc.c:1929
+#: ../clients/common/nm-meta-setting-desc.c:1919
 #, c-format
 msgid "'%s' is not a valid hex character"
-msgstr "“%s” não é um caractere hexadecimal válido"
+msgstr "\"%s\" não é um caracter hexadecimal válido"
 
-#: ../clients/common/nm-meta-setting-desc.c:2218
+#: ../clients/common/nm-meta-setting-desc.c:2199
 #, c-format
 msgid "the property doesn't contain EAP method '%s'"
-msgstr "a propriedade não contém um método EAP “%s”"
+msgstr "a propriedade não contém um método EAP \"%s\""
 
-#: ../clients/common/nm-meta-setting-desc.c:2241
+#: ../clients/common/nm-meta-setting-desc.c:2222
 #, c-format
 msgid "the property doesn't contain alternative subject match '%s'"
-msgstr "a propriedade não contém um sujeito alternativo correspondente a “%s”"
+msgstr ""
+"a propriedade não contém um sujeito alternativo correspondente a \"%s\""
 
-#: ../clients/common/nm-meta-setting-desc.c:2267
+#: ../clients/common/nm-meta-setting-desc.c:2248
 #, c-format
 msgid "the property doesn't contain \"phase2\" alternative subject match '%s'"
 msgstr ""
-"a propriedade não contém um sujeito alternativo de “phase2” correspondente a "
-"“%s”"
+"a propriedade não contém um sujeito alternativo de \"phase2\" correspondente "
+"a \"%s\""
 
-#: ../clients/common/nm-meta-setting-desc.c:2389
+#: ../clients/common/nm-meta-setting-desc.c:2369
 #, c-format
 msgid ""
 "Enter a list of bonding options formatted as:\n"
@@ -4701,7 +4364,7 @@ msgid ""
 "\n"
 "Example: mode=2,miimon=120\n"
 msgstr ""
-"Insira uma lista de opções de vinculação, formatados como:\n"
+"Digite uma lista de opções de vinculação, formatados como:\n"
 "  option = <valor>, option = <valor>,... \n"
 "Opções válidas são: %s\n"
 "\"mode\" pode ser fornecido como um nome ou um número:\n"
@@ -4722,239 +4385,239 @@ msgstr ""
 #. * hacky: we can not see if the type is already set, because
 #. * nmc_setting_set_property() is called only after the property
 #. * we're setting (type) has been removed.
-#: ../clients/common/nm-meta-setting-desc.c:2452
-#, c-format
+#: ../clients/common/nm-meta-setting-desc.c:2429
+#, fuzzy, c-format
 msgid "Can not change the connection type"
-msgstr "Não é possível alterar o tipo da conexão"
+msgstr "Tipo de conexão Bluetooth desconhecida/não manipulada"
 
-#: ../clients/common/nm-meta-setting-desc.c:2557
+#: ../clients/common/nm-meta-setting-desc.c:2539
 #, c-format
 msgid "the property doesn't contain permission '%s'"
-msgstr "a propriedade não contém a permissão “%s”"
+msgstr "a propriedade não contém a permissão \"%s\""
 
-#: ../clients/common/nm-meta-setting-desc.c:2578
+#: ../clients/common/nm-meta-setting-desc.c:2560
 #, c-format
 msgid "'%s' is not valid master; use ifname or connection UUID"
-msgstr "“%s” não é um mestre válido; use nome-if ou UUID da conexão"
+msgstr "\"%s\" não é um mestre válido; use nome-if ou UUID da conexão"
 
-#: ../clients/common/nm-meta-setting-desc.c:2675
+#: ../clients/common/nm-meta-setting-desc.c:2659
 #, c-format
 msgid "the value '%s' is not a valid UUID"
-msgstr "o valor “%s” não é um UUID válido"
+msgstr "o valor \"%s\" não é um UUID válido"
 
-#: ../clients/common/nm-meta-setting-desc.c:2682
+#: ../clients/common/nm-meta-setting-desc.c:2666
 #, c-format
 msgid "the property doesn't contain UUID '%s'"
-msgstr "a propriedade não contém UUID “%s”"
+msgstr "a propriedade não contém UUID \"%s\""
 
-#: ../clients/common/nm-meta-setting-desc.c:2751
+#: ../clients/common/nm-meta-setting-desc.c:2733
 msgid "0 (disabled)"
 msgstr "0 (desativado)"
 
-#: ../clients/common/nm-meta-setting-desc.c:2757
+#: ../clients/common/nm-meta-setting-desc.c:2739
 msgid "enabled, "
 msgstr "habilitado, "
 
-#: ../clients/common/nm-meta-setting-desc.c:2759
+#: ../clients/common/nm-meta-setting-desc.c:2741
 msgid "advertise, "
 msgstr "publicar, "
 
-#: ../clients/common/nm-meta-setting-desc.c:2761
+#: ../clients/common/nm-meta-setting-desc.c:2743
 msgid "willing, "
 msgstr "desejando, "
 
-#: ../clients/common/nm-meta-setting-desc.c:2883
+#: ../clients/common/nm-meta-setting-desc.c:2863
 #, c-format
 msgid "'%s' is not a valid DCB flag"
-msgstr "“%s” não é uma opção DCB válida"
+msgstr "'%s' não é uma opção DCB válida"
 
-#: ../clients/common/nm-meta-setting-desc.c:2912
+#: ../clients/common/nm-meta-setting-desc.c:2893
 msgid "must contain 8 comma-separated numbers"
 msgstr "deve conter 8 números separados por vírgulas"
 
-#: ../clients/common/nm-meta-setting-desc.c:2928
+#: ../clients/common/nm-meta-setting-desc.c:2909
 #, c-format
 msgid "'%s' not a number between 0 and %u (inclusive) or %u"
-msgstr "“%s” não é um número entre 0 e %u (inclusive) ou %u"
+msgstr "'%s' não é um número entre 0 e %u (inclusive) ou %u"
 
-#: ../clients/common/nm-meta-setting-desc.c:2931
+#: ../clients/common/nm-meta-setting-desc.c:2912
 #, c-format
 msgid "'%s' not a number between 0 and %u (inclusive)"
-msgstr "“%s” não é um número entre 0 e %u (inclusive)"
+msgstr "'%s' não um número entre 0 e %u (inclusive)"
 
-#: ../clients/common/nm-meta-setting-desc.c:2952
-#, c-format
+#: ../clients/common/nm-meta-setting-desc.c:2933
+#, fuzzy, c-format
 msgid "changes will have no effect until '%s' includes 1 (enabled)"
-msgstr "mudanças não terão efeito até “%s” incluir 1 (habilitado)"
+msgstr ""
+"Aviso: mudanças não tomarão efeito até '%s' incluindo 1 (habilitado)\n"
+"\n"
 
-#: ../clients/common/nm-meta-setting-desc.c:3007
+#: ../clients/common/nm-meta-setting-desc.c:2988
 #, c-format
 msgid "bandwidth percentages must total 100%%"
 msgstr "porcentagem da largura de banda deve totalizar 100%%"
 
-#: ../clients/common/nm-meta-setting-desc.c:3080
-#: ../clients/common/nm-meta-setting-desc.c:3086
+#: ../clients/common/nm-meta-setting-desc.c:3061
+#: ../clients/common/nm-meta-setting-desc.c:3067
 msgid "SIM operator ID must be a 5 or 6 number MCCMNC code"
 msgstr "ID de operador SIM deve ser um código MCCMNC de 5 ou 6 números"
 
-#: ../clients/common/nm-meta-setting-desc.c:3110
+#: ../clients/common/nm-meta-setting-desc.c:3091
 #, c-format
 msgid "'%s' is not a valid IBoIP P_Key"
-msgstr "“%s” não é uma P_Key IBoIP válida"
+msgstr "\"%s\" não é uma P_Key IBoIP válida"
 
-#: ../clients/common/nm-meta-setting-desc.c:3133
+#: ../clients/common/nm-meta-setting-desc.c:3114
 msgid "default"
 msgstr "padrão"
 
-#: ../clients/common/nm-meta-setting-desc.c:3272
-#: ../clients/common/nm-meta-setting-desc.c:3289
+#: ../clients/common/nm-meta-setting-desc.c:3248
+#: ../clients/common/nm-meta-setting-desc.c:3267
 #, c-format
 msgid "invalid IPv4 address '%s'"
-msgstr "“%s” não é um endereço IPv4 válido"
+msgstr "\"%s\" não é um endereço IPv4 válido"
 
-#: ../clients/common/nm-meta-setting-desc.c:3295
-#: ../clients/common/nm-meta-setting-desc.c:3539
+#: ../clients/common/nm-meta-setting-desc.c:3273
+#: ../clients/common/nm-meta-setting-desc.c:3527
 #, c-format
 msgid "the property doesn't contain DNS server '%s'"
-msgstr "a propriedade não contém o servidor DNS “%s”"
+msgstr "a propriedade não contém o servidor DNS \"%s\""
 
-#: ../clients/common/nm-meta-setting-desc.c:3333
-#: ../clients/common/nm-meta-setting-desc.c:3577
+#: ../clients/common/nm-meta-setting-desc.c:3313
+#: ../clients/common/nm-meta-setting-desc.c:3567
 #, c-format
 msgid "the property doesn't contain DNS search domain '%s'"
-msgstr "a propriedade não contém um domínio de pesquisa de DNS “%s”"
+msgstr "a propriedade não contém um domínio de pesquisa de DNS \"%s\""
 
-#: ../clients/common/nm-meta-setting-desc.c:3370
-#: ../clients/common/nm-meta-setting-desc.c:3614
+#: ../clients/common/nm-meta-setting-desc.c:3350
+#: ../clients/common/nm-meta-setting-desc.c:3604
 #, c-format
 msgid "the property doesn't contain DNS option '%s'"
-msgstr "a propriedade não contém a opção DNS “%s”"
+msgstr "a propriedade não contém a opção DNS \"%s\""
 
-#: ../clients/common/nm-meta-setting-desc.c:3413
-#: ../clients/common/nm-meta-setting-desc.c:3663
+#: ../clients/common/nm-meta-setting-desc.c:3393
+#: ../clients/common/nm-meta-setting-desc.c:3653
 #, c-format
 msgid "the property doesn't contain IP address '%s'"
-msgstr "a propriedade não contém o endereço IP “%s”"
+msgstr "a propriedade não contém o endereço IP \"%s\""
 
-#: ../clients/common/nm-meta-setting-desc.c:3433
-#: ../clients/common/nm-meta-setting-desc.c:3682
+#: ../clients/common/nm-meta-setting-desc.c:3413
+#: ../clients/common/nm-meta-setting-desc.c:3672
 #, c-format
 msgid "invalid gateway address '%s'"
-msgstr "endereço de gateway “%s” inválido"
+msgstr "endereço de gateway \"%s\" inválido"
 
-#: ../clients/common/nm-meta-setting-desc.c:3472
-#: ../clients/common/nm-meta-setting-desc.c:3723
+#: ../clients/common/nm-meta-setting-desc.c:3452
+#: ../clients/common/nm-meta-setting-desc.c:3713
 #, c-format
 msgid "the property doesn't contain route '%s'"
-msgstr "a propriedade não contém a rota “%s”"
+msgstr "a propriedade não contém a rota \"%s\""
 
-#: ../clients/common/nm-meta-setting-desc.c:3516
-#: ../clients/common/nm-meta-setting-desc.c:3533
+#: ../clients/common/nm-meta-setting-desc.c:3502
+#: ../clients/common/nm-meta-setting-desc.c:3521
 #, c-format
 msgid "invalid IPv6 address '%s'"
-msgstr "endereço IPv6 inválido “%s”"
+msgstr "\"%s\" não é um endereço IPv6 válido"
 
-#: ../clients/common/nm-meta-setting-desc.c:3760
+#: ../clients/common/nm-meta-setting-desc.c:3731
+#: ../libnm-core/nm-setting-gsm.c:381 ../libnm-util/nm-setting-gsm.c:364
 #, c-format
-msgid "'%s' is not a valid channel; use <1-13>"
-msgstr "“%s” não é um canal válido; use <1-13>"
+msgid "'%s' is not a number"
+msgstr "%s não é um número"
 
-#: ../clients/common/nm-meta-setting-desc.c:3852
-msgid "The valid syntax is: vf [attribute=value]... [,vf [attribute=value]...]"
-msgstr "A sintaxe válida é: vf [atributo=valor]… [,vf [atributo=valor]…]"
+#: ../clients/common/nm-meta-setting-desc.c:3738
+#, c-format
+msgid "'%s' is not valid; use 0, 1, or 2"
+msgstr "\"%s\" não é válido; use 0, 1, ou 2"
+
+#: ../clients/common/nm-meta-setting-desc.c:3772
+#, c-format
+msgid "'%s' is not a valid channel; use <1-13>"
+msgstr "\"%s\" não é um canal válido; use <1-13>"
 
-#: ../clients/common/nm-meta-setting-desc.c:3874
+#: ../clients/common/nm-meta-setting-desc.c:3832
 msgid ""
 "The valid syntax is: '[root | parent <handle>] [handle <handle>] <qdisc>'"
 msgstr ""
-"A sintaxe válida é: “[root | parent <tratamento>] [handle <tratamento>] "
-"<qdisc>”"
 
-#: ../clients/common/nm-meta-setting-desc.c:3898
-#, c-format
-msgid "the property doesn't contain vf with index %u"
-msgstr "a propriedade não contém um vf com índice %u"
-
-#: ../clients/common/nm-meta-setting-desc.c:3925
-#, c-format
+#: ../clients/common/nm-meta-setting-desc.c:3855
+#, fuzzy, c-format
 msgid "the property doesn't contain qdisc '%s'"
-msgstr "a propriedade não contém qdisc “%s”"
+msgstr "a propriedade não contém UUID \"%s\""
 
-#: ../clients/common/nm-meta-setting-desc.c:3979
+#: ../clients/common/nm-meta-setting-desc.c:3908
 msgid ""
 "The valid syntax is: '[root | parent <handle>] [handle <handle>] <tfilter>'"
 msgstr ""
-"A sintaxe válida é: “[root | parent <tratamento>] [handle <tratamento>] "
-"<tfilter>”"
 
-#: ../clients/common/nm-meta-setting-desc.c:4002
-#, c-format
+#: ../clients/common/nm-meta-setting-desc.c:3931
+#, fuzzy, c-format
 msgid "the property doesn't contain tfilter '%s'"
-msgstr "a propriedade não contém a tfilter “%s”"
+msgstr "a propriedade não contém a rota \"%s\""
 
-#: ../clients/common/nm-meta-setting-desc.c:4069
-#, c-format
+#: ../clients/common/nm-meta-setting-desc.c:3992
+#, fuzzy, c-format
 msgid "the property doesn't contain string '%s'"
-msgstr "a propriedade não contém o texto “%s”"
+msgstr "a propriedade não contém o mapeamento de \"%s\""
 
-#: ../clients/common/nm-meta-setting-desc.c:4144
-#: ../clients/common/nm-meta-setting-desc.c:4218
-#, c-format
+#: ../clients/common/nm-meta-setting-desc.c:4065
+#: ../clients/common/nm-meta-setting-desc.c:4137
+#, fuzzy, c-format
 msgid "the property doesn't contain link watcher '%s'"
-msgstr "a propriedade não contém a monitorador de link “%s”"
+msgstr "a propriedade não contém a rota \"%s\""
 
-#: ../clients/common/nm-meta-setting-desc.c:4324
-#, c-format
+#: ../clients/common/nm-meta-setting-desc.c:4228
+#, fuzzy, c-format
 msgid "only one mapping at a time is supported; taking the first one (%s)"
-msgstr "há suporte a apenas um mapeamento por vez; tomando o primeiro (%s)"
+msgstr ""
+"Aviso: há suporte a apenas um mapeamento por vez; tomando o primeiro (%s)\n"
 
-#: ../clients/common/nm-meta-setting-desc.c:4332
+#: ../clients/common/nm-meta-setting-desc.c:4236
 #, c-format
 msgid "the property doesn't contain mapping '%s'"
-msgstr "a propriedade não contém o mapeamento de “%s”"
+msgstr "a propriedade não contém o mapeamento de \"%s\""
 
-#: ../clients/common/nm-meta-setting-desc.c:4340
+#: ../clients/common/nm-meta-setting-desc.c:4244
 msgid "no priority to remove"
 msgstr "sem prioridade para remover"
 
-#: ../clients/common/nm-meta-setting-desc.c:4344
+#: ../clients/common/nm-meta-setting-desc.c:4248
 #, c-format
 msgid "index '%d' is not in the range of <0-%d>"
-msgstr "índice “%d” está fora da faixa de <0-%d>"
+msgstr "índice \"%d\" está fora da faixa de <0-%d>"
 
-#: ../clients/common/nm-meta-setting-desc.c:4413
+#: ../clients/common/nm-meta-setting-desc.c:4317
 #, c-format
 msgid "'%s' cannot be empty"
-msgstr "“%s” não pode estar vazio"
+msgstr "\"%s\" não pode estar vazio"
 
-#: ../clients/common/nm-meta-setting-desc.c:4452
-#: ../clients/common/nm-meta-setting-desc.c:4583
-#: ../libnm-core/nm-setting-sriov.c:447 ../libnm-core/nm-setting-wired.c:663
-#: ../libnm-core/nm-setting-wireless.c:858
-#: ../libnm-core/nm-setting-wireless.c:870 ../libnm-util/nm-setting-wired.c:645
-#: ../libnm-util/nm-setting-wireless.c:858
-#: ../libnm-util/nm-setting-wireless.c:872
+#: ../clients/common/nm-meta-setting-desc.c:4356
+#: ../clients/common/nm-meta-setting-desc.c:4489
+#: ../libnm-core/nm-setting-wired.c:664 ../libnm-core/nm-setting-wireless.c:857
+#: ../libnm-core/nm-setting-wireless.c:869 ../libnm-util/nm-setting-wired.c:646
+#: ../libnm-util/nm-setting-wireless.c:859
+#: ../libnm-util/nm-setting-wireless.c:873
 #, c-format
 msgid "'%s' is not a valid MAC address"
-msgstr "“%s” não é um endereço MAC válido"
+msgstr "\"%s\" não é um endereço MAC válido"
 
-#: ../clients/common/nm-meta-setting-desc.c:4458
-#: ../clients/common/nm-meta-setting-desc.c:4589
+#: ../clients/common/nm-meta-setting-desc.c:4362
+#: ../clients/common/nm-meta-setting-desc.c:4495
 #, c-format
 msgid "the property doesn't contain MAC address '%s'"
-msgstr "a propriedade não contém o endereço MAC “%s”"
+msgstr "a propriedade não contém o endereço MAC \"%s\""
 
-#: ../clients/common/nm-meta-setting-desc.c:4476
+#: ../clients/common/nm-meta-setting-desc.c:4380
 #, c-format
 msgid "'%s' is not valid; 2 or 3 strings should be provided"
-msgstr "“%s” não é válido; 2 ou 3 strings devem ser fornecidas"
+msgstr "\"%s\" não é válido; 2 ou 3 strings devem ser fornecidas"
 
-#: ../clients/common/nm-meta-setting-desc.c:4490
+#: ../clients/common/nm-meta-setting-desc.c:4396
 #, c-format
 msgid "'%s' string value should consist of 1 - 199 characters"
-msgstr "valor da string “%s” deveria consistir em 1 – 199 caracteres"
+msgstr "valor da string \"%s\" deveria consistir em 1 - 199 caracteres"
 
-#: ../clients/common/nm-meta-setting-desc.c:4522
+#: ../clients/common/nm-meta-setting-desc.c:4428
 #, c-format
 msgid ""
 "Enter a list of S/390 options formatted as:\n"
@@ -4962,94 +4625,103 @@ msgid ""
 "Valid options are: %s\n"
 msgstr ""
 "Digite uma lista de opções S/390, formatadas como:\n"
-"  option = <valor>, option = <valor>,...\n"
+"  option = <valor>, option = <valor>,... \n"
 "Opções válidas são: %s\n"
 
-#: ../clients/common/nm-meta-setting-desc.c:4556
+#: ../clients/common/nm-meta-setting-desc.c:4462
 #, c-format
 msgid "'%s' is not a valid channel"
-msgstr "“%s” não é um canal válido"
+msgstr "\"%s\" não é um canal válido"
 
-#: ../clients/common/nm-meta-setting-desc.c:4562
+#: ../clients/common/nm-meta-setting-desc.c:4468
 #, c-format
 msgid "'%ld' is not a valid channel"
-msgstr "“%ld” não é um canal válido"
+msgstr "\"%ld\" não é um canal válido"
 
-#: ../clients/common/nm-meta-setting-desc.c:4645
-#: ../clients/common/nm-meta-setting-desc.c:4681
-#: ../clients/common/nm-meta-setting-desc.c:4717
+#: ../clients/common/nm-meta-setting-desc.c:4567
+#: ../clients/common/nm-meta-setting-desc.c:4603
+#: ../clients/common/nm-meta-setting-desc.c:4639
 #, c-format
 msgid "the property doesn't contain protocol '%s'"
-msgstr "a propriedade não contém o protocolo “%s”"
+msgstr "a propriedade não contém o protocolo \"%s\""
 
-#: ../clients/common/nm-meta-setting-desc.c:4754
+#: ../clients/common/nm-meta-setting-desc.c:4676
 #, c-format
 msgid ""
 "'%s' not compatible with %s '%s', please change the key or set the right %s "
 "first."
 msgstr ""
-"“%s” não é compatível com %s “%s”, por favor altere a chave ou defina o %s "
-"correto primeiro."
+"\"%s\" não é compatível com %s \"%s\", por favor altere a chave ou defina o "
+"%s correto primeiro."
 
-#: ../clients/common/nm-meta-setting-desc.c:4764
-#, c-format
+#: ../clients/common/nm-meta-setting-desc.c:4686
+#, fuzzy, c-format
 msgid "WEP key is guessed to be of '%s'"
-msgstr "Supõe-se que a chave WEP seja “%s”"
+msgstr "Supõe-se que a chave WEP seja \"%s\"\n"
 
-#: ../clients/common/nm-meta-setting-desc.c:4769
-#, c-format
+#: ../clients/common/nm-meta-setting-desc.c:4691
+#, fuzzy, c-format
 msgid "WEP key index set to '%d'"
-msgstr "Índice da chave WEP definida para “%d”"
+msgstr "Índice da chave WEP definida para \"%d\"\n"
 
-#: ../clients/common/nm-meta-setting-desc.c:4808
-#, c-format
+#: ../clients/common/nm-meta-setting-desc.c:4730
+#, fuzzy, c-format
 msgid "'%s' is not compatible with '%s' type, please change or delete the key."
 msgstr ""
-"“%s” não é compatível com o tipo “%s”, por favor altere ou exclua a chave."
+"Aviso: \"%s\" não é compatível com o tipo \"%s\", por favor altere ou exclua "
+"a chave.\n"
 
-#: ../clients/common/nm-meta-setting-desc.c:4818
+#: ../clients/common/nm-meta-setting-desc.c:4740
 #, c-format
 msgid "'%s' is not a valid PSK"
-msgstr "“%s” não é um PSK válido"
+msgstr "\"%s\" não é um PSK válido"
 
-#: ../clients/common/nm-meta-setting-desc.c:4850
+#: ../clients/common/nm-meta-setting-desc.c:4772
+#, fuzzy
 msgid "Bonding primary interface [none]"
-msgstr "Interface primária da vinculação [nenhuma]"
+msgstr "Interface primária da vinculação [nenhuma]: "
 
 #. this is a virtual property, only needed during "ask" mode.
-#: ../clients/common/nm-meta-setting-desc.c:4857
+#: ../clients/common/nm-meta-setting-desc.c:4779
+#, fuzzy
 msgid "Bonding monitoring mode"
-msgstr "Modo de monitoramento da vinculação"
+msgstr "Modo de monitoramento %s da vinculação"
 
-#: ../clients/common/nm-meta-setting-desc.c:4866
+#: ../clients/common/nm-meta-setting-desc.c:4788
+#, fuzzy
 msgid "Bonding miimon [100]"
-msgstr "miimon da vinculação [100]"
+msgstr "Vinculação miimon [100]: "
 
-#: ../clients/common/nm-meta-setting-desc.c:4874
+#: ../clients/common/nm-meta-setting-desc.c:4796
+#, fuzzy
 msgid "Bonding downdelay [0]"
-msgstr "downdelay da vinculação [0]"
+msgstr "Vinculação downdelay [0]: "
 
-#: ../clients/common/nm-meta-setting-desc.c:4882
+#: ../clients/common/nm-meta-setting-desc.c:4804
+#, fuzzy
 msgid "Bonding updelay [0]"
-msgstr "updelay da vinculação [0]"
+msgstr "Vinculação updelay [0]: "
 
-#: ../clients/common/nm-meta-setting-desc.c:4890
+#: ../clients/common/nm-meta-setting-desc.c:4812
+#, fuzzy
 msgid "Bonding arp-interval [0]"
-msgstr "arp-interval da vinculação [0]"
+msgstr "Vinculação intervalo arp [0]: "
 
-#: ../clients/common/nm-meta-setting-desc.c:4898
+#: ../clients/common/nm-meta-setting-desc.c:4820
+#, fuzzy
 msgid "Bonding arp-ip-target [none]"
-msgstr "arp-ip-target da vinculação [nenhum]"
+msgstr "Vinculação arp-ip-destino [nenhum]: "
 
-#: ../clients/common/nm-meta-setting-desc.c:4906
+#: ../clients/common/nm-meta-setting-desc.c:4828
+#, fuzzy
 msgid "LACP rate ('slow' or 'fast') [slow]"
-msgstr "Taxa LACP (“slow” ou “fast”) [slow]"
+msgstr "Taxa LACP (\"slow\" ou \"fast\") [slow]: "
 
 #. macro that returns @func as const (gboolean(*)(NMSetting*)) type, but checks
 #. * that the actual type is (gboolean(*)(type *)).
 #. macro that returns @func as const (guint32(*)(NMSetting*)) type, but checks
 #. * that the actual type is (guint32(*)(type *)).
-#: ../clients/common/nm-meta-setting-desc.c:5019
+#: ../clients/common/nm-meta-setting-desc.c:4940
 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 "
@@ -5067,7 +4739,7 @@ msgstr ""
 "\"roundrobin\"}, \"ports\": {\"eth1\": {}, \"eth2\": {}} }\n"
 "          set team.config /etc/minha-união.conf\n"
 
-#: ../clients/common/nm-meta-setting-desc.c:5027
+#: ../clients/common/nm-meta-setting-desc.c:4948
 msgid ""
 "Enter a list of link watchers formatted as dictionaries where the keys are "
 "teamd properties. Dictionary pairs are in the form: key=value and pairs are "
@@ -5084,69 +4756,46 @@ msgid ""
 "\n"
 "Properties available for the 'arp_ping' include all the ones for 'nsna_ping' "
 "and:\n"
-"  'source-host'*, 'validate-active', 'validate-inactive', 'send-always'.\n"
+"  'source-host', 'validate-active', 'validate-inactive', 'send-always'.\n"
 "\n"
 "Properties flagged with a '*' are mandatory.\n"
 "\n"
 "Example:\n"
-"   name=arp_ping source-host=172.16.1.1 target-host=172.16.1.254, "
-"name=ethtool delay-up=3\n"
+"   name=arp_ping,source-host=172.16.1.1,target-host=172.16.1.254; "
+"name=ethtool,delay-up=3\n"
 msgstr ""
-"Insira uma lista de monitoradores de link formatados como dicionários nos "
-"quais as chaves são propriedades teamd. Os pares de dicionário estão na "
-"forma: chave=valor e os pares são separados por \" \". Os dicionários são "
-"separados com \",\".\n"
-"As chaves permitidas/exigidas no dicionário mudam com base no tipo de "
-"monitorador de link, enquanto a única propriedade comum a todos os "
-"monitoradores de link é \"name\"*, que define o monitorador de link a ser "
-"especificado\n"
-"\n"
-"Propriedades disponíveis para o monitorador de link \"ethtool\":\n"
-"  \"delay-up\", \"delay-down\"\n"
-"\n"
-"Propriedades disponíveis para o monitorador de link \"nsna_ping\":\n"
-"  \"init-wait\", \"interval\", \"missed-max\", \"target-host\"*\n"
-"\n"
-"Propriedades disponíveis para o \"arp_ping\" incluem todos aqueles para "
-"\"nsna_ping\" e:\n"
-"  \"source-host\"*, \"validate-active\", \"validate-inactive\", \"send-always"
-"\".\n"
-"\n"
-"Propriedades sinalizadas com \"*\" são obrigatórias.\n"
-"\n"
-"Exemplo:\n"
-"   name=arp_ping source-host=172.16.1.1 target-host=172.16.1.254, "
-"name=ethtool delay-up=3\n"
 
-#: ../clients/common/nm-meta-setting-desc.c:5077
+#: ../clients/common/nm-meta-setting-desc.c:4999
 msgid ""
 "Enter file path to CA certificate (optionally prefixed with file://).\n"
 "  [file://]<file path>\n"
 "Note that nmcli does not support specifying certificates as raw blob data.\n"
 "Example: /home/cimrman/cacert.crt\n"
 msgstr ""
-"Insira o caminho do arquivo para o certificado da AC (opcionalmente,\n"
-"prefixado com file://).\n"
+"Insira o caminho do arquivo para o certificado da AC (opcionalmente, "
+"prefixado \n"
+"com file://).\n"
 "  [file://]<caminho do arquivo>\n"
-"Note que o nmcli não oferece suporte a especificar certificados como\n"
-"dados blob não tratados.\n"
-"Exemplo: /home/cimrman/cert-ac.crt\n"
+"Note que nmcli não oferece suporte a especificar certificados como dados "
+"blob \n"
+"não tratados.\n"
+"Exemplo: /home/cimrman/cert-ca.crt\n"
 
-#: ../clients/common/nm-meta-setting-desc.c:5111
+#: ../clients/common/nm-meta-setting-desc.c:5033
 msgid ""
 "Enter file path to client certificate (optionally prefixed with file://).\n"
 "  [file://]<file path>\n"
 "Note that nmcli does not support specifying certificates as raw blob data.\n"
 "Example: /home/cimrman/jara.crt\n"
 msgstr ""
-"Insira o caminho do arquivo para o certificado do cliente (opcionalmente\n"
+"Inserir o caminho do arquivo para o certificado do cliente (opcionalmente \n"
 "prefixado com file://).\n"
 "  [file://]<caminho do arquivo>\n"
-"Note que o nmcli não oferece suporte a especificar certificados como\n"
-"dados blob não tratados.\n"
+"Note que o nmcli não oferece suporte a especificar certificados como dados \n"
+"blob não tratados.\n"
 "Exemplo: /home/cimrman/jara.crt\n"
 
-#: ../clients/common/nm-meta-setting-desc.c:5168
+#: ../clients/common/nm-meta-setting-desc.c:5090
 msgid ""
 "Enter file path to CA certificate for inner authentication (optionally "
 "prefixed\n"
@@ -5155,14 +4804,14 @@ msgid ""
 "Note that nmcli does not support specifying certificates as raw blob data.\n"
 "Example: /home/cimrman/ca-zweite-phase.crt\n"
 msgstr ""
-"Insira o caminho do arquivo para o certificado de AC para autenticação \n"
+"Insira o caminho do arquivo para um certificado de AC para autenticação \n"
 "interna (opcionalmente, prefixado com file://).\n"
 "  [file://]<caminho do arquivo>\n"
 "Note que nmcli não oferece suporte a especificar certificados como dados \n"
 "blob não tratados.\n"
 "Exemplo: /home/cimrman/ac-segunda-fase.crt\n"
 
-#: ../clients/common/nm-meta-setting-desc.c:5203
+#: ../clients/common/nm-meta-setting-desc.c:5125
 msgid ""
 "Enter file path to client certificate for inner authentication (optionally "
 "prefixed\n"
@@ -5179,7 +4828,7 @@ msgstr ""
 "blob não tratados.\n"
 "Exemplo: /home/cimrman/jara-segunda-fase.crt\n"
 
-#: ../clients/common/nm-meta-setting-desc.c:5230
+#: ../clients/common/nm-meta-setting-desc.c:5152
 msgid ""
 "Enter bytes as a list of hexadecimal values.\n"
 "Two formats are accepted:\n"
@@ -5191,109 +4840,121 @@ msgid ""
 "Examples: ab0455a6ea3a74C2\n"
 "          ab 4 55 0xa6 ea 3a 74 C2\n"
 msgstr ""
-"Insira os bytes como uma lista de valores hexadecimais.\n"
-"Dois formato são aceitos:\n"
-"(a) string de dígitos hexadecimais, onde cada dois dígitos representam um "
-"byte\n"
-"(b) lista separada por espaço de bytes escritos como dígitos hexadecimais\n"
-"      (opcionalmente com prefixo 0x/0X e 0 à esquerda).\n"
+"Digite os bytes como uma lista de valores hexadecimais.\n"
+"São aceitos dois formatos:\n"
+"(a) uma string de dígitos hexadecimais, onde cada dois dígitos representam "
+"um byte\n"
+"(b) lista separada por espaço de bytes escritos como dígitos hexadecimais "
+"(opcionalmente com prefixo 0x/0X e 0 à esquerda).\n"
 "\n"
 "Exemplos: ab0455a6ea3a74C2\n"
 "          ab 4 55 0xa6 ea 3a 74 C2\n"
 
-#: ../clients/common/nm-meta-setting-desc.c:5247
-#: ../clients/common/nm-meta-setting-desc.c:5265
+#: ../clients/common/nm-meta-setting-desc.c:5169
+#: ../clients/common/nm-meta-setting-desc.c:5187
 msgid ""
 "Enter path to a private key and the key password (if not set yet):\n"
 "  [file://]<file path> [<password>]\n"
 "Note that nmcli does not support specifying private key as raw blob data.\n"
 "Example: /home/cimrman/jara-priv-key Dardanely\n"
 msgstr ""
-"Insira o caminho para uma chave privada e a senha da chave (se não "
-"definido):\n"
+"Digite o caminho para uma chave privada e a senha da chave (se não tiver "
+"sido definido ainda):\n"
 "  [file://]<caminho do arquivo> [<senha>]\n"
-"Note que o nmcli não oferece suporte a especificação de chave privada como\n"
-"dados blob não tratados.\n"
+"Note que nmcli não oferece suporte a especificação de chave privada como "
+"dados blob não-tratados.\n"
 "Exemplo: /home/fulanodetal/jara-priv-key SenhaSegredo\n"
 
-#: ../clients/common/nm-meta-setting-desc.c:5304
-#: ../clients/common/nm-secret-agent-simple.c:249
-#: ../clients/common/nm-secret-agent-simple.c:347
+#: ../clients/common/nm-meta-setting-desc.c:5226
+#: ../clients/common/nm-secret-agent-simple.c:234
+#: ../clients/common/nm-secret-agent-simple.c:332
 #: ../clients/tui/nmt-page-dsl.c:66 ../clients/tui/nmt-page-wifi.c:332
 msgid "Username"
 msgstr "Nome de usuário"
 
-#: ../clients/common/nm-meta-setting-desc.c:5310
-#: ../clients/common/nm-meta-setting-desc.c:5494
-#: ../clients/common/nm-meta-setting-desc.c:5785
-#: ../clients/common/nm-meta-setting-desc.c:6432
+#: ../clients/common/nm-meta-setting-desc.c:5232
+#: ../clients/common/nm-meta-setting-desc.c:5416
+#: ../clients/common/nm-meta-setting-desc.c:5699
+#: ../clients/common/nm-meta-setting-desc.c:6323
+#, fuzzy
 msgid "Password [none]"
-msgstr "Senha [nenhuma]"
+msgstr "Senha [nenhuma]: "
 
-#: ../clients/common/nm-meta-setting-desc.c:5356
+#: ../clients/common/nm-meta-setting-desc.c:5278
+#, fuzzy
 msgid "Bluetooth device address"
-msgstr "Endereço de dispositivo Bluetooth"
-
-#: ../clients/common/nm-meta-setting-desc.c:5401
-#: ../clients/common/nm-meta-setting-desc.c:5839
-#: ../clients/common/nm-meta-setting-desc.c:7159
-#: ../clients/common/nm-meta-setting-desc.c:7197
-#: ../clients/common/nm-meta-setting-desc.c:7334
-#: ../clients/common/nm-meta-setting-desc.c:7552
+msgstr "Endereço de dispositivo Bluetooth: "
+
+#: ../clients/common/nm-meta-setting-desc.c:5323
+#: ../clients/common/nm-meta-setting-desc.c:5753
+#: ../clients/common/nm-meta-setting-desc.c:7030
+#: ../clients/common/nm-meta-setting-desc.c:7068
+#: ../clients/common/nm-meta-setting-desc.c:7205
+#, fuzzy
 msgid "MAC [none]"
-msgstr "MAC [nenhum]"
+msgstr "MAC [nenhum]: "
 
-#: ../clients/common/nm-meta-setting-desc.c:5407
+#: ../clients/common/nm-meta-setting-desc.c:5329
+#, fuzzy
 msgid "Enable STP [no]"
-msgstr "Habilitar STP [não]"
+msgstr "Habilitar STP %s"
 
-#: ../clients/common/nm-meta-setting-desc.c:5413
+#: ../clients/common/nm-meta-setting-desc.c:5335
+#, fuzzy
 msgid "STP priority [32768]"
-msgstr "Prioridade STP [32768]"
+msgstr "Prioridade STP [32768]: "
 
-#: ../clients/common/nm-meta-setting-desc.c:5419
+#: ../clients/common/nm-meta-setting-desc.c:5341
+#, fuzzy
 msgid "Forward delay [15]"
-msgstr "Atraso de encaminhamento [15]"
+msgstr "Atraso de encaminhamento [15]: "
 
-#: ../clients/common/nm-meta-setting-desc.c:5425
+#: ../clients/common/nm-meta-setting-desc.c:5347
+#, fuzzy
 msgid "Hello time [2]"
-msgstr "Tempo de saudação [2]"
+msgstr "Tempo de saudação [2]: "
 
-#: ../clients/common/nm-meta-setting-desc.c:5431
+#: ../clients/common/nm-meta-setting-desc.c:5353
+#, fuzzy
 msgid "Max age [20]"
-msgstr "Tempo de expiração máximo [20]"
+msgstr "Tempo de expiração máximo [20]: "
 
-#: ../clients/common/nm-meta-setting-desc.c:5437
+#: ../clients/common/nm-meta-setting-desc.c:5359
+#, fuzzy
 msgid "MAC address ageing time [300]"
-msgstr "Tempo de vencimento do endereço MAC [300]"
+msgstr "Tempo de vencimento do endereço MAC [300]: "
 
-#: ../clients/common/nm-meta-setting-desc.c:5443
+#: ../clients/common/nm-meta-setting-desc.c:5365
 msgid "Group forward mask [0]"
-msgstr "Máscara de encaminhamento de grupo [0]"
+msgstr ""
 
-#: ../clients/common/nm-meta-setting-desc.c:5449
+#: ../clients/common/nm-meta-setting-desc.c:5371
 msgid "Enable IGMP snooping [no]"
-msgstr "Habilitar IGMP snooping [não]"
+msgstr ""
 
-#: ../clients/common/nm-meta-setting-desc.c:5461
+#: ../clients/common/nm-meta-setting-desc.c:5383
+#, fuzzy
 msgid "Bridge port priority [32]"
-msgstr "Prioridade da porta da ponte [32]"
+msgstr "Prioridade da porta da ponte [32]: "
 
-#: ../clients/common/nm-meta-setting-desc.c:5467
+#: ../clients/common/nm-meta-setting-desc.c:5389
+#, fuzzy
 msgid "Bridge port STP path cost [100]"
-msgstr "Custo do caminho STP da porta da ponte [100]"
+msgstr "Custo do caminho STP da porta da ponte [100]: "
 
-#: ../clients/common/nm-meta-setting-desc.c:5473
+#: ../clients/common/nm-meta-setting-desc.c:5395
+#, fuzzy
 msgid "Hairpin [no]"
-msgstr "Hairpin [não]"
+msgstr "Modo do hairpin"
 
-#: ../clients/common/nm-meta-setting-desc.c:5488
-#: ../clients/common/nm-meta-setting-desc.c:5779
-#: ../clients/common/nm-meta-setting-desc.c:7049
+#: ../clients/common/nm-meta-setting-desc.c:5410
+#: ../clients/common/nm-meta-setting-desc.c:5693
+#: ../clients/common/nm-meta-setting-desc.c:6920
+#, fuzzy
 msgid "Username [none]"
-msgstr "Nome de usuário [nenhum]"
+msgstr "Nome de usuário [nenhum]: "
 
-#: ../clients/common/nm-meta-setting-desc.c:5583
+#: ../clients/common/nm-meta-setting-desc.c:5505
 msgid ""
 "Enter a list of user permissions. This is a list of user names formatted "
 "as:\n"
@@ -5302,14 +4963,14 @@ msgid ""
 "\n"
 "Example: alice bob charlie\n"
 msgstr ""
-"Insira uma lista de permissões de usuário. Esta é uma lista de\n"
-"nomes de usuários formatados como:\n"
-" [usuário:]<nome de usuário 1>, [usuário:]<nome de usuário 2>,...\n"
+"Inserir uma lista de permissões de usuário. Esta é uma lista de nomes de "
+"usuários formatados como:\n"
+" [user:]<nome de usuário 1>, [user:]<nome de usuário 2>,...\n"
 "Os itens pode ser separado por vírgulas ou espaços.\n"
 "\n"
 "Exemplo: alice bob carlos\n"
 
-#: ../clients/common/nm-meta-setting-desc.c:5625
+#: ../clients/common/nm-meta-setting-desc.c:5547
 msgid ""
 "Enter secondary connections that should be activated when this connection "
 "is\n"
@@ -5321,16 +4982,15 @@ msgid ""
 "\n"
 "Example: private-openvpn, fe6ba5d8-c2fc-4aae-b2e3-97efddd8d9a7\n"
 msgstr ""
-"Insira conexões secundárias que deve ser ativadas quando esta conexão for\n"
-"ativada. As conexões podem ser especificadas tanto pelo UUID ou ID (nome).\n"
+"Informe conexões secundárias que deveriam ser ativadas quando esta conexão\n"
+"for ativada. Conexões podem ser especificadas tanto pelo UUID ou ID (nome).\n"
 "nmcli traduz transparentemente nomes para UUIDs. Note que o NetworkManager\n"
-"oferece suporte apenas a VPNs como conexões secundárias no presente "
-"momento.\n"
+"provê suporte apenas a VPNs como conexões secundárias no presente momento.\n"
 "Os itens podem ser separados por vírgulas ou espaços.\n"
 "\n"
 "Exemplo: private-openvpn, fe6ba5d8-c2fc-4aae-b2e3-97efddd8d9a7\n"
 
-#: ../clients/common/nm-meta-setting-desc.c:5642
+#: ../clients/common/nm-meta-setting-desc.c:5564
 msgid ""
 "Enter a value which indicates whether the connection is subject to a data\n"
 "quota, usage costs or other limitations. Accepted options are:\n"
@@ -5344,25 +5004,29 @@ msgstr ""
 "\"false\",\"no\",\"off\" para definir a conexão como não medida\n"
 "\"unknown\" para deixar o NetworkManager escolher usando uma heurística\n"
 
-#: ../clients/common/nm-meta-setting-desc.c:5796
+#: ../clients/common/nm-meta-setting-desc.c:5710
+#, fuzzy
 msgid "APN"
-msgstr "APN"
+msgstr "AP"
 
-#: ../clients/common/nm-meta-setting-desc.c:5848
-#: ../clients/common/nm-meta-setting-desc.c:7222
-#: ../clients/common/nm-meta-setting-desc.c:7368
+#: ../clients/common/nm-meta-setting-desc.c:5762
+#: ../clients/common/nm-meta-setting-desc.c:7093
+#: ../clients/common/nm-meta-setting-desc.c:7239
+#, fuzzy
 msgid "MTU [auto]"
-msgstr "MTU [auto]"
+msgstr "MTU [auto]: "
 
-#: ../clients/common/nm-meta-setting-desc.c:5867
+#: ../clients/common/nm-meta-setting-desc.c:5781
+#, fuzzy
 msgid "P_KEY [none]"
-msgstr "P_KEY [nenhum]"
+msgstr "P_KEY [nenhum]: "
 
-#: ../clients/common/nm-meta-setting-desc.c:5876
+#: ../clients/common/nm-meta-setting-desc.c:5790
+#, fuzzy
 msgid "Parent interface [none]"
-msgstr "Interface principal [nenhuma]"
+msgstr "Interface principal [nenhuma]: "
 
-#: ../clients/common/nm-meta-setting-desc.c:5899
+#: ../clients/common/nm-meta-setting-desc.c:5813
 msgid ""
 "Enter a list of IPv4 addresses of DNS servers.\n"
 "\n"
@@ -5372,11 +5036,12 @@ msgstr ""
 "\n"
 "Exemplo: 8.8.8.8, 8.8.4.4\n"
 
-#: ../clients/common/nm-meta-setting-desc.c:5931
+#: ../clients/common/nm-meta-setting-desc.c:5845
+#, fuzzy
 msgid "IPv4 address (IP[/plen]) [none]"
-msgstr "Endereço IPv4 (IP[/plen]) [nenhum]"
+msgstr "Endereço IPv4 (IP[/plen]) [nenhum]: "
 
-#: ../clients/common/nm-meta-setting-desc.c:5933
+#: ../clients/common/nm-meta-setting-desc.c:5847
 msgid ""
 "Enter a list of IPv4 addresses formatted as:\n"
 "  ip[/prefix], ip[/prefix],...\n"
@@ -5384,17 +5049,18 @@ msgid ""
 "\n"
 "Example: 192.168.1.5/24, 10.0.0.11/24\n"
 msgstr ""
-"Insira uma lista de endereços IPv4 formatados como:\n"
+"Digite uma lista de endereços IPv4 formatados como:\n"
 "  ip[/prefixo], ip[/prefixo],...\n"
 "O prefixo que falta é considerado como prefixo de 32.\n"
 "\n"
 "Exemplo: 192.168.1.5/24, 10.0.0.11/24\n"
 
-#: ../clients/common/nm-meta-setting-desc.c:5946
+#: ../clients/common/nm-meta-setting-desc.c:5860
+#, fuzzy
 msgid "IPv4 gateway [none]"
-msgstr "Gateway IPv4 [nenhum]"
+msgstr "Gateway IPv4 [nenhum]: "
 
-#: ../clients/common/nm-meta-setting-desc.c:5954
+#: ../clients/common/nm-meta-setting-desc.c:5868
 msgid ""
 "Enter a list of IPv4 routes formatted as:\n"
 "  ip[/prefix] [next-hop] [metric],...\n"
@@ -5406,7 +5072,7 @@ msgid ""
 "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 ""
-"Insira uma lista de rotas IPv4 formatadas como:\n"
+"Digite uma lista de rotas IPv4 formatadas como:\n"
 "  ip/[prefixo] [próx-salto] [métrica],... \n"
 "\n"
 "O prefixo que faltar se considera como um prefixo de 32.\n"
@@ -5417,7 +5083,7 @@ msgstr ""
 "Exemplos: 192.168.2.0/24 192.168.2.1 3, 10.1.0.0/16 10.0.0.254\n"
 "          10.1.2.0/24\n"
 
-#: ../clients/common/nm-meta-setting-desc.c:6056
+#: ../clients/common/nm-meta-setting-desc.c:5970
 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 "
@@ -5428,21 +5094,22 @@ msgid ""
 "\n"
 "Example: 2607:f0d0:1002:51::4, 2607:f0d0:1002:51::1\n"
 msgstr ""
-"Insira uma lista de endereços IPv6 de servidores DNS. Se o método de "
-"configuração IPv6 for \"auto\" estes servidores DNS são acrescentados a "
-"aqueles (caso existam) retornados pela configuração automática. Servidores "
-"de DNS não podem ser usados com os métodos de configuração IPv6 \"shared\" "
-"ou \"link-local\", caso não exista nenhuma rede acima (upstream). Em todos "
-"os outros métodos de configuração IPv6, estes servidores DNS são usados como "
-"os únicos servidores DNS para esta conexão.\n"
+"Digite uma lista de endereços IPv6 de servidores DNS.  Se o método de "
+"configuração IPv6 for 'auto' estes servidores DNS são acrescentados a "
+"aqueles (caso existam) retornados pela configuração automática.  Servidores "
+"de DNS não podem ser usados com os métodos de configuração IPv6 'shared' ou "
+"'link-local', caso não exista nenhuma rede acima (upstream). Em todos os "
+"outros métodos de configuração IPv6, estes servidores DNS são usados como os "
+"únicos servidores DNS para esta conexão.\n"
 "\n"
 "Exemplo: 2607:f0d0:1002:51::4, 2607:f0d0:1002:51::1\n"
 
-#: ../clients/common/nm-meta-setting-desc.c:6094
+#: ../clients/common/nm-meta-setting-desc.c:6008
+#, fuzzy
 msgid "IPv6 address (IP[/plen]) [none]"
-msgstr "Endereço IPv6 (IP[/plen]) [nenhum]"
+msgstr "Endereço IPv6 (IP[/plen]) [nenhum]: "
 
-#: ../clients/common/nm-meta-setting-desc.c:6096
+#: ../clients/common/nm-meta-setting-desc.c:6010
 msgid ""
 "Enter a list of IPv6 addresses formatted as:\n"
 "  ip[/prefix], ip[/prefix],...\n"
@@ -5450,17 +5117,18 @@ msgid ""
 "\n"
 "Example: 2607:f0d0:1002:51::4/64, 1050:0:0:0:5:600:300c:326b\n"
 msgstr ""
-"Insira uma lista de endereços IPv6 formatados como:\n"
+"Digite uma lista de endereços IPv6 formatados como:\n"
 "  ip[/prefixo], ip[/prefixo],...\n"
 "O prefixo que falta é considerado como prefixo de 128.\n"
 "\n"
 "Exemplo: 2607:f0d0:1002:51::4/64, 1050:0:0:0:5:600:300c:326b\n"
 
-#: ../clients/common/nm-meta-setting-desc.c:6109
+#: ../clients/common/nm-meta-setting-desc.c:6023
+#, fuzzy
 msgid "IPv6 gateway [none]"
-msgstr "Gateway IPv6 [nenhum]"
+msgstr "Gateway IPv6 [nenhum]: "
 
-#: ../clients/common/nm-meta-setting-desc.c:6117
+#: ../clients/common/nm-meta-setting-desc.c:6031
 msgid ""
 "Enter a list of IPv6 routes formatted as:\n"
 "  ip[/prefix] [next-hop] [metric],...\n"
@@ -5473,7 +5141,7 @@ msgid ""
 "db8:beef::3 2\n"
 "          abbe::/64 55\n"
 msgstr ""
-"Insira uma lista de rotas IPv6 formatadas como:\n"
+"Digite uma lista de rotas IPv6 formatadas como:\n"
 "  ip/[prefixo] [próx-salto] [métrica],... \n"
 "\n"
 "O prefixo que faltar se considera como um prefixo de 128.\n"
@@ -5485,162 +5153,188 @@ msgstr ""
 "db8:beef::3 2\n"
 "          abbe::/64 55\n"
 
-#: ../clients/common/nm-meta-setting-desc.c:6222
-#: ../clients/common/nm-meta-setting-desc.c:7082
+#: ../clients/common/nm-meta-setting-desc.c:6124
+#: ../clients/common/nm-meta-setting-desc.c:6953
+#, fuzzy
 msgid "Parent device [none]"
-msgstr "Interface pai [nenhuma]"
+msgstr "Interface pai [nenhuma]: "
 
-#: ../clients/common/nm-meta-setting-desc.c:6228
+#: ../clients/common/nm-meta-setting-desc.c:6130
+#, fuzzy
 msgid "Local endpoint [none]"
-msgstr "Ponto de extremidade local [nenhum]"
+msgstr "Ponto local [nenhum]: "
 
-#: ../clients/common/nm-meta-setting-desc.c:6235
-#: ../clients/common/nm-meta-setting-desc.c:7102
+#: ../clients/common/nm-meta-setting-desc.c:6137
+#: ../clients/common/nm-meta-setting-desc.c:6973
+#, fuzzy
 msgid "Remote"
-msgstr "Remoto"
+msgstr "Remote: "
 
-#: ../clients/common/nm-meta-setting-desc.c:6280
+#: ../clients/common/nm-meta-setting-desc.c:6174
 msgid "MACsec parent device or connection UUID"
-msgstr "UUID de conexão ou dispositivo pai de MACsec"
+msgstr ""
 
-#: ../clients/common/nm-meta-setting-desc.c:6301
+#: ../clients/common/nm-meta-setting-desc.c:6195
 msgid "Enable encryption [yes]"
-msgstr "Habilitar criptografia [sim]"
+msgstr ""
 
-#: ../clients/common/nm-meta-setting-desc.c:6307
-#: ../clients/common/nm-secret-agent-simple.c:534
+#: ../clients/common/nm-meta-setting-desc.c:6201
+#: ../clients/common/nm-secret-agent-simple.c:523
 msgid "MKA CAK"
-msgstr "MKA CAK"
+msgstr ""
 
-#: ../clients/common/nm-meta-setting-desc.c:6317
+#: ../clients/common/nm-meta-setting-desc.c:6211
 msgid "MKA_CKN"
-msgstr "MKA_CKN"
+msgstr ""
 
-#: ../clients/common/nm-meta-setting-desc.c:6323
+#: ../clients/common/nm-meta-setting-desc.c:6217
 msgid "SCI port [1]"
-msgstr "Porta SCI [1]"
+msgstr ""
 
-#: ../clients/common/nm-meta-setting-desc.c:6349
+#: ../clients/common/nm-meta-setting-desc.c:6240
+#, fuzzy
 msgid "MACVLAN parent device or connection UUID"
-msgstr "UUID de conexão ou dispositivo pai de MACVLAN"
+msgstr "Dispositivo MACVLAN pai ou UUID de conexão: "
 
-#: ../clients/common/nm-meta-setting-desc.c:6370
+#: ../clients/common/nm-meta-setting-desc.c:6261
 msgid "Tap [no]"
-msgstr "Tap [não]"
+msgstr ""
 
-#: ../clients/common/nm-meta-setting-desc.c:6383
-#: ../clients/common/nm-meta-setting-desc.c:7289
+#: ../clients/common/nm-meta-setting-desc.c:6274
+#: ../clients/common/nm-meta-setting-desc.c:7160
 #: ../clients/tui/nmt-page-wifi.c:224
 msgid "SSID"
 msgstr "SSID"
 
-#: ../clients/common/nm-meta-setting-desc.c:6392
+#: ../clients/common/nm-meta-setting-desc.c:6283
+#, fuzzy
 msgid "OLPC Mesh channel [1]"
-msgstr "Canal da OLPC Mesh [1]"
+msgstr "Canal da OLPC Mesh [1]: "
 
-#: ../clients/common/nm-meta-setting-desc.c:6401
+#: ../clients/common/nm-meta-setting-desc.c:6292
+#, fuzzy
 msgid "DHCP anycast MAC address [none]"
-msgstr "Endereço MAC de difusão DHCP [nenhum]"
+msgstr "Endereço MAC de difusão DHCP [nenhum]: "
 
-#: ../clients/common/nm-meta-setting-desc.c:6413
+#: ../clients/common/nm-meta-setting-desc.c:6304
 msgid "PPPoE parent device"
-msgstr "Interface pai PPPoE"
+msgstr ""
 
-#: ../clients/common/nm-meta-setting-desc.c:6419
+#: ../clients/common/nm-meta-setting-desc.c:6310
+#, fuzzy
 msgid "Service [none]"
-msgstr "Serviço [nenhum]"
+msgstr "Serviço [nenhum]: "
 
-#: ../clients/common/nm-meta-setting-desc.c:6426
+#: ../clients/common/nm-meta-setting-desc.c:6317
+#, fuzzy
 msgid "PPPoE username"
-msgstr "Nome de usuário do PPPoE"
+msgstr "Nome de usuário do PPPoE: "
 
-#: ../clients/common/nm-meta-setting-desc.c:6600
+#: ../clients/common/nm-meta-setting-desc.c:6491
 msgid "Browser only [no]"
-msgstr "Navegar apenas [não]"
+msgstr ""
 
-#: ../clients/common/nm-meta-setting-desc.c:6606
+#: ../clients/common/nm-meta-setting-desc.c:6497
 msgid "PAC URL"
-msgstr "URL do PAC"
+msgstr ""
 
-#: ../clients/common/nm-meta-setting-desc.c:6612
+#: ../clients/common/nm-meta-setting-desc.c:6503
 msgid "PAC script"
-msgstr "Script PAC"
+msgstr ""
 
-#: ../clients/common/nm-meta-setting-desc.c:6647
-#: ../clients/common/nm-meta-setting-desc.c:6796
+#: ../clients/common/nm-meta-setting-desc.c:6538
+#: ../clients/common/nm-meta-setting-desc.c:6686
+#, fuzzy
 msgid "Team JSON configuration [none]"
-msgstr "Configuração da União JSON [nenhum]"
+msgstr "Configuração da União JSON [nenhum]: "
 
-#: ../clients/common/nm-meta-setting-desc.c:6952
+#: ../clients/common/nm-meta-setting-desc.c:6823
+#, fuzzy
 msgid "User ID [none]"
-msgstr "ID de usuário [nenhum]"
+msgstr "ID de usuário [nenhum]: "
 
-#: ../clients/common/nm-meta-setting-desc.c:6958
+#: ../clients/common/nm-meta-setting-desc.c:6829
+#, fuzzy
 msgid "Group ID [none]"
-msgstr "ID do grupo [nenhum]"
+msgstr "ID do grupo [nenhum]: "
 
-#: ../clients/common/nm-meta-setting-desc.c:6964
+#: ../clients/common/nm-meta-setting-desc.c:6835
+#, fuzzy
 msgid "Enable PI [no]"
-msgstr "Habilitar PI [não]"
+msgstr "Habilitar PI %s"
 
-#: ../clients/common/nm-meta-setting-desc.c:6970
+#: ../clients/common/nm-meta-setting-desc.c:6841
+#, fuzzy
 msgid "Enable VNET header [no]"
-msgstr "Habilitar cabeçalho VNET [não]"
+msgstr "Habilitar cabeçalho VNET %s"
 
-#: ../clients/common/nm-meta-setting-desc.c:6976
+#: ../clients/common/nm-meta-setting-desc.c:6847
+#, fuzzy
 msgid "Enable multi queue [no]"
-msgstr "Habilitar múltiplas filas [não]"
+msgstr "Habilitar múltiplas filas %s"
 
-#: ../clients/common/nm-meta-setting-desc.c:6989
+#: ../clients/common/nm-meta-setting-desc.c:6860
+#, fuzzy
 msgid "VLAN parent device or connection UUID"
-msgstr "Dispositivo VLAN principal ou conexão UUID"
+msgstr "Dispositivo VLAN principal ou conexão UUID: "
 
-#: ../clients/common/nm-meta-setting-desc.c:6996
+#: ../clients/common/nm-meta-setting-desc.c:6867
+#, fuzzy
 msgid "VLAN ID (<0-4094>)"
-msgstr "ID da VLAN (<0-4094>)"
+msgstr "ID da VLAN <0-4094>: "
 
-#: ../clients/common/nm-meta-setting-desc.c:7002
+#: ../clients/common/nm-meta-setting-desc.c:6873
+#, fuzzy
 msgid "VLAN flags (<0-7>) [none]"
-msgstr "Sinalizadores VLAN (<0-7>) [nenhum]"
+msgstr "Sinalizadores VLAN (<0-7>) [nenhum]: "
 
-#: ../clients/common/nm-meta-setting-desc.c:7011
+#: ../clients/common/nm-meta-setting-desc.c:6882
+#, fuzzy
 msgid "Ingress priority maps [none]"
-msgstr "Mapas de prioridade de ingresso [nenhum]"
+msgstr "Mapas de prioridade de ingresso [nenhum]: "
 
-#: ../clients/common/nm-meta-setting-desc.c:7021
+#: ../clients/common/nm-meta-setting-desc.c:6892
+#, fuzzy
 msgid "Egress priority maps [none]"
-msgstr "Mapas de prioridade de egresso [nenhum]"
+msgstr "Mapas de prioridade de egresso [nenhum]: "
 
-#: ../clients/common/nm-meta-setting-desc.c:7089
+#: ../clients/common/nm-meta-setting-desc.c:6960
+#, fuzzy
 msgid "VXLAN ID"
-msgstr "ID da VXLAN"
+msgstr "ID da VXLAN: "
 
-#: ../clients/common/nm-meta-setting-desc.c:7095
+#: ../clients/common/nm-meta-setting-desc.c:6966
+#, fuzzy
 msgid "Local address [none]"
-msgstr "Endereço local [nenhum]"
+msgstr "Endereço local [nenhum]: "
 
-#: ../clients/common/nm-meta-setting-desc.c:7108
+#: ../clients/common/nm-meta-setting-desc.c:6979
+#, fuzzy
 msgid "Minimum source port [0]"
-msgstr "Porta de origem mínima [0]"
+msgstr "Porta de origem mínima [0]: "
 
-#: ../clients/common/nm-meta-setting-desc.c:7114
+#: ../clients/common/nm-meta-setting-desc.c:6985
+#, fuzzy
 msgid "Maximum source port [0]"
-msgstr "Porta de origem máxima [0]"
+msgstr "Porta de origem máxima [0]: "
 
-#: ../clients/common/nm-meta-setting-desc.c:7120
+#: ../clients/common/nm-meta-setting-desc.c:6991
+#, fuzzy
 msgid "Destination port [8472]"
-msgstr "Porta de destino [8472]"
+msgstr "Porta de destino [8472]: "
 
-#: ../clients/common/nm-meta-setting-desc.c:7166
+#: ../clients/common/nm-meta-setting-desc.c:7037
+#, fuzzy
 msgid "WiMAX NSP name"
-msgstr "Nome do NSP WiMAX"
+msgstr "Nome do NSP WiMAX: "
 
-#: ../clients/common/nm-meta-setting-desc.c:7203
-#: ../clients/common/nm-meta-setting-desc.c:7339
+#: ../clients/common/nm-meta-setting-desc.c:7074
+#: ../clients/common/nm-meta-setting-desc.c:7210
+#, fuzzy
 msgid "Cloned MAC [none]"
-msgstr "MAC clonado [nenhum]"
+msgstr "MAC clonado [nenhum]: "
 
-#: ../clients/common/nm-meta-setting-desc.c:7230
+#: ../clients/common/nm-meta-setting-desc.c:7101
 msgid ""
 "Enter a list of subchannels (comma or space separated).\n"
 "\n"
@@ -5650,7 +5344,7 @@ msgstr ""
 "\n"
 "Exemplo: 0.0.0e20 0.0.0e21 0.0.0e22\n"
 
-#: ../clients/common/nm-meta-setting-desc.c:7498
+#: ../clients/common/nm-meta-setting-desc.c:7355
 msgid ""
 "Enter the type of WEP keys. The accepted values are: 0 or unknown, 1 or key, "
 "and 2 or passphrase.\n"
@@ -5658,206 +5352,199 @@ msgstr ""
 "Digite o tipo das chaves WEP. Os valores aceitáveis são: 0 ou unknown, 1 ou "
 "key, e 2 ou passphrase.\n"
 
-#: ../clients/common/nm-meta-setting-desc.c:7560
-msgid "Short address (<0x0000-0xffff>)"
-msgstr "Endereços curto (<0x0000-0xffff>)"
-
-#: ../clients/common/nm-meta-setting-desc.c:7576
-msgid "PAN Identifier (<0x0000-0xffff>)"
-msgstr "Identificador PAN (<0x0000-0xffff>)"
-
-#: ../clients/common/nm-meta-setting-desc.c:7598
-msgid "IEEE 802.15.4 (WPAN) parent device or connection UUID"
-msgstr "Dispositivo pai ou conexão UUID de IEEE 802.15.4 (WPAN)"
-
 #. ***************************************************************************
-#: ../clients/common/nm-meta-setting-desc.c:7725
+#: ../clients/common/nm-meta-setting-desc.c:7515
 msgid "802-1x settings"
-msgstr "Configurações 802-1x"
+msgstr ""
 
-#: ../clients/common/nm-meta-setting-desc.c:7726
-#: ../src/devices/adsl/nm-device-adsl.c:133
+#: ../clients/common/nm-meta-setting-desc.c:7516
+#: ../src/devices/adsl/nm-device-adsl.c:137
 msgid "ADSL connection"
 msgstr "Conexão ADSL"
 
-#: ../clients/common/nm-meta-setting-desc.c:7727
+#: ../clients/common/nm-meta-setting-desc.c:7517
+#, fuzzy
 msgid "bluetooth connection"
-msgstr "Conexão bluetooth"
+msgstr "Conexão vinculada"
 
-#: ../clients/common/nm-meta-setting-desc.c:7728
+#: ../clients/common/nm-meta-setting-desc.c:7518
+#, fuzzy
 msgid "Bond device"
-msgstr "Dispositivo vínculo"
+msgstr "Dispositivo Ethernet"
 
-#: ../clients/common/nm-meta-setting-desc.c:7729
+#: ../clients/common/nm-meta-setting-desc.c:7519
+#, fuzzy
 msgid "Bridge device"
-msgstr "Dispositivo ponte"
+msgstr "Dispositivo Ethernet"
 
-#: ../clients/common/nm-meta-setting-desc.c:7730
+#: ../clients/common/nm-meta-setting-desc.c:7520
+#, fuzzy
 msgid "Bridge port"
-msgstr "Porta de ponte"
+msgstr "Ponte"
 
-#: ../clients/common/nm-meta-setting-desc.c:7731
+#: ../clients/common/nm-meta-setting-desc.c:7521
+#, fuzzy
 msgid "CDMA mobile broadband connection"
-msgstr "Conexão de banda larga móvel CDMA"
+msgstr "Conexão de Banda larga móvel %d"
 
-#: ../clients/common/nm-meta-setting-desc.c:7732
+#: ../clients/common/nm-meta-setting-desc.c:7522
 msgid "General settings"
-msgstr "Configurações gerais"
+msgstr ""
 
-#: ../clients/common/nm-meta-setting-desc.c:7733
+#: ../clients/common/nm-meta-setting-desc.c:7523
 msgid "DCB settings"
-msgstr "Configurações DCB"
+msgstr ""
 
-#: ../clients/common/nm-meta-setting-desc.c:7734
+#: ../clients/common/nm-meta-setting-desc.c:7524
 msgid "Dummy settings"
-msgstr "Configurações de dummy"
+msgstr ""
 
-#: ../clients/common/nm-meta-setting-desc.c:7735
+#: ../clients/common/nm-meta-setting-desc.c:7525
 msgid "Generic settings"
-msgstr "Configurações genéricas"
+msgstr ""
 
-#: ../clients/common/nm-meta-setting-desc.c:7736
+#: ../clients/common/nm-meta-setting-desc.c:7526
+#, fuzzy
 msgid "GSM mobile broadband connection"
-msgstr "Conexão de banda larga móvel GSM"
+msgstr "Conexão de Banda larga móvel %d"
 
-#: ../clients/common/nm-meta-setting-desc.c:7737
-#: ../src/devices/nm-device-infiniband.c:170
+#: ../clients/common/nm-meta-setting-desc.c:7527
+#: ../src/devices/nm-device-infiniband.c:192
 msgid "InfiniBand connection"
 msgstr "Conexão InfiniBand"
 
-#: ../clients/common/nm-meta-setting-desc.c:7738
+#: ../clients/common/nm-meta-setting-desc.c:7528
+#, fuzzy
 msgid "IPv4 protocol"
-msgstr "Protocolo IPv4"
+msgstr "Protocolo ADSL"
 
-#: ../clients/common/nm-meta-setting-desc.c:7739
+#: ../clients/common/nm-meta-setting-desc.c:7529
+#, fuzzy
 msgid "IPv6 protocol"
-msgstr "Protocolo IPv6"
+msgstr "Protocolo ADSL"
 
-#: ../clients/common/nm-meta-setting-desc.c:7740
+#: ../clients/common/nm-meta-setting-desc.c:7530
 msgid "IP-tunnel settings"
-msgstr "Configurações de túnel IP"
+msgstr ""
 
-#: ../clients/common/nm-meta-setting-desc.c:7741
+#: ../clients/common/nm-meta-setting-desc.c:7531
 msgid "MACsec connection"
-msgstr "Conexão MACsec"
+msgstr ""
 
-#: ../clients/common/nm-meta-setting-desc.c:7742
+#: ../clients/common/nm-meta-setting-desc.c:7532
+#, fuzzy
 msgid "macvlan connection"
-msgstr "Conexão macvlan"
+msgstr "Conexão vinculada"
 
-#: ../clients/common/nm-meta-setting-desc.c:7743
+#: ../clients/common/nm-meta-setting-desc.c:7533
+#, fuzzy
 msgid "OLPC Mesh connection"
-msgstr "Conexão OLPC Mesh"
+msgstr "Conexão CDMA"
 
-#: ../clients/common/nm-meta-setting-desc.c:7744
+#: ../clients/common/nm-meta-setting-desc.c:7534
 msgid "OpenVSwitch bridge settings"
-msgstr "Configurações de ponte OpenVSwitch"
+msgstr ""
 
-#: ../clients/common/nm-meta-setting-desc.c:7745
+#: ../clients/common/nm-meta-setting-desc.c:7535
 msgid "OpenVSwitch interface settings"
-msgstr "Configurações de interface OpenVSwitch"
+msgstr ""
 
-#: ../clients/common/nm-meta-setting-desc.c:7746
+#: ../clients/common/nm-meta-setting-desc.c:7536
 msgid "OpenVSwitch patch interface settings"
-msgstr "Configurações de interface patch OpenVSwitch"
+msgstr ""
 
-#: ../clients/common/nm-meta-setting-desc.c:7747
+#: ../clients/common/nm-meta-setting-desc.c:7537
 msgid "OpenVSwitch port settings"
-msgstr "Configurações de porta OpenVSwitch"
+msgstr ""
 
-#: ../clients/common/nm-meta-setting-desc.c:7748
+#: ../clients/common/nm-meta-setting-desc.c:7538
 msgid "PPP settings"
-msgstr "Configurações PPP"
+msgstr ""
 
-#: ../clients/common/nm-meta-setting-desc.c:7749
+#: ../clients/common/nm-meta-setting-desc.c:7539
 msgid "PPPoE"
 msgstr "PPPoE"
 
-#: ../clients/common/nm-meta-setting-desc.c:7750
+#: ../clients/common/nm-meta-setting-desc.c:7540
 msgid "Proxy"
-msgstr "Proxy"
+msgstr ""
 
-#: ../clients/common/nm-meta-setting-desc.c:7751
+#: ../clients/common/nm-meta-setting-desc.c:7541
 msgid "Serial settings"
-msgstr "Configurações seriais"
-
-#: ../clients/common/nm-meta-setting-desc.c:7752
-msgid "SR-IOV settings"
-msgstr "Configurações SR-IOV"
+msgstr ""
 
-#: ../clients/common/nm-meta-setting-desc.c:7753
+#: ../clients/common/nm-meta-setting-desc.c:7542
 msgid "Traffic controls"
-msgstr "Controles de tráfego"
+msgstr ""
 
-#: ../clients/common/nm-meta-setting-desc.c:7754
+#: ../clients/common/nm-meta-setting-desc.c:7543
+#, fuzzy
 msgid "Team device"
-msgstr "Dispositivo da união"
+msgstr "Modo de dispositivo TUN"
 
-#: ../clients/common/nm-meta-setting-desc.c:7755
+#: ../clients/common/nm-meta-setting-desc.c:7544
+#, fuzzy
 msgid "Team port"
-msgstr "Porta da união"
+msgstr "União"
 
-#: ../clients/common/nm-meta-setting-desc.c:7756
+#: ../clients/common/nm-meta-setting-desc.c:7545
+#, fuzzy
 msgid "Tun device"
-msgstr "Dispositivo tun"
+msgstr "Modo de dispositivo TUN"
 
-#: ../clients/common/nm-meta-setting-desc.c:7757
+#: ../clients/common/nm-meta-setting-desc.c:7546
 msgid "User settings"
-msgstr "Configurações de usuário"
+msgstr ""
 
-#: ../clients/common/nm-meta-setting-desc.c:7758
-#: ../src/devices/nm-device-vlan.c:400
+#: ../clients/common/nm-meta-setting-desc.c:7547
+#: ../src/devices/nm-device-vlan.c:394
 msgid "VLAN connection"
 msgstr "Conexão VLAN"
 
-#: ../clients/common/nm-meta-setting-desc.c:7759 ../src/nm-manager.c:4988
+#: ../clients/common/nm-meta-setting-desc.c:7548 ../src/nm-manager.c:4277
 msgid "VPN connection"
 msgstr "Conexão VPN"
 
-#: ../clients/common/nm-meta-setting-desc.c:7760
-#: ../src/devices/nm-device-vxlan.c:370
+#: ../clients/common/nm-meta-setting-desc.c:7549
+#: ../src/devices/nm-device-vxlan.c:331
 msgid "VXLAN connection"
 msgstr "Conexão VXLAN"
 
-#: ../clients/common/nm-meta-setting-desc.c:7761
+#: ../clients/common/nm-meta-setting-desc.c:7550
+#, fuzzy
 msgid "WiMAX connection"
-msgstr "Conexão WiMAX"
+msgstr "Conexão CDMA"
 
-#: ../clients/common/nm-meta-setting-desc.c:7762
+#: ../clients/common/nm-meta-setting-desc.c:7551
+#, fuzzy
 msgid "Wired Ethernet"
-msgstr "Ethernet cabeada"
+msgstr "Ethernet"
 
-#: ../clients/common/nm-meta-setting-desc.c:7763
+#: ../clients/common/nm-meta-setting-desc.c:7552
+#, fuzzy
 msgid "Wi-Fi connection"
-msgstr "Conexão de Wi-Fi"
+msgstr "Conexão de Wi-Fi %d"
 
-#: ../clients/common/nm-meta-setting-desc.c:7764
+#: ../clients/common/nm-meta-setting-desc.c:7553
 msgid "Wi-Fi security settings"
-msgstr "Configurações de segurança Wi-Fi"
-
-#: ../clients/common/nm-meta-setting-desc.c:7765
-msgid "WPAN settings"
-msgstr "Configurações WPAN"
-
-#: ../clients/common/nm-meta-setting-desc.c:7766
-msgid "6LOWPAN settings"
-msgstr "Configurações 6LOWPAN"
+msgstr ""
 
-#: ../clients/common/nm-meta-setting-desc.c:8099
+#: ../clients/common/nm-meta-setting-desc.c:7870
+#, fuzzy
 msgid "name"
-msgstr "nome"
+msgstr "Nome de usuário"
 
-#: ../clients/common/nm-polkit-listener.c:239
+#: ../clients/common/nm-polkit-listener.c:212
 msgid "An authentication session is already underway."
 msgstr "Uma sessão de autenticação já está ocorrendo."
 
-#: ../clients/common/nm-secret-agent-simple.c:255
-#: ../clients/common/nm-secret-agent-simple.c:295
-#: ../clients/common/nm-secret-agent-simple.c:323
-#: ../clients/common/nm-secret-agent-simple.c:359
-#: ../clients/common/nm-secret-agent-simple.c:519
-#: ../clients/common/nm-secret-agent-simple.c:551
-#: ../clients/common/nm-secret-agent-simple.c:573
+#: ../clients/common/nm-secret-agent-simple.c:240
+#: ../clients/common/nm-secret-agent-simple.c:280
+#: ../clients/common/nm-secret-agent-simple.c:308
+#: ../clients/common/nm-secret-agent-simple.c:344
+#: ../clients/common/nm-secret-agent-simple.c:508
+#: ../clients/common/nm-secret-agent-simple.c:540
+#: ../clients/common/nm-secret-agent-simple.c:562
 #: ../clients/common/nm-vpn-helpers.c:119
 #: ../clients/common/nm-vpn-helpers.c:123
 #: ../clients/common/nm-vpn-helpers.c:129
@@ -5867,128 +5554,129 @@ msgstr "Uma sessão de autenticação já está ocorrendo."
 msgid "Password"
 msgstr "Senha"
 
-#: ../clients/common/nm-secret-agent-simple.c:265
+#: ../clients/common/nm-secret-agent-simple.c:250
 msgid "Identity"
 msgstr "Identidade"
 
-#: ../clients/common/nm-secret-agent-simple.c:271
+#: ../clients/common/nm-secret-agent-simple.c:256
 msgid "Private key password"
 msgstr "Senha de chave privada"
 
-#: ../clients/common/nm-secret-agent-simple.c:310
+#: ../clients/common/nm-secret-agent-simple.c:295
 #: ../clients/tui/nmt-page-wifi.c:289
 msgid "Key"
 msgstr "Chave"
 
-#: ../clients/common/nm-secret-agent-simple.c:353
+#: ../clients/common/nm-secret-agent-simple.c:338
 #: ../clients/tui/nmt-page-dsl.c:78
 msgid "Service"
 msgstr "Serviço"
 
-#: ../clients/common/nm-secret-agent-simple.c:484
+#: ../clients/common/nm-secret-agent-simple.c:469
 msgid "Authentication required by wireless network"
 msgstr "Autenticação requerida pela rede sem fio"
 
-#: ../clients/common/nm-secret-agent-simple.c:485
+#: ../clients/common/nm-secret-agent-simple.c:470
 #, c-format
 msgid ""
 "Passwords or encryption keys are required to access the wireless network "
 "'%s'."
 msgstr ""
 "Senhas ou chaves de criptografia são necessárias para acessar a rede sem fio "
-"“%s”."
+"\"%s\"."
 
-#: ../clients/common/nm-secret-agent-simple.c:489
+#: ../clients/common/nm-secret-agent-simple.c:478
 msgid "Wired 802.1X authentication"
 msgstr "Autenticação 802.1X com fio"
 
-#: ../clients/common/nm-secret-agent-simple.c:490
+#: ../clients/common/nm-secret-agent-simple.c:479
 #, c-format
 msgid "Secrets are required to access the wired network '%s'"
-msgstr "Segredos são necessários para acessar a rede cabeada “%s”"
+msgstr ""
 
-#: ../clients/common/nm-secret-agent-simple.c:495
+#: ../clients/common/nm-secret-agent-simple.c:484
 msgid "DSL authentication"
-msgstr "Autenticação DSL"
+msgstr "Autenticação do DSL"
 
-#: ../clients/common/nm-secret-agent-simple.c:496
+#: ../clients/common/nm-secret-agent-simple.c:485
 #, c-format
 msgid "Secrets are required for the DSL connection '%s'"
-msgstr "Segredos são necessários para a conexão DSL “%s”"
+msgstr ""
 
-#: ../clients/common/nm-secret-agent-simple.c:504
+#: ../clients/common/nm-secret-agent-simple.c:493
 msgid "PIN code required"
 msgstr "Código PIN necessário"
 
-#: ../clients/common/nm-secret-agent-simple.c:505
+#: ../clients/common/nm-secret-agent-simple.c:494
 msgid "PIN code is needed for the mobile broadband device"
 msgstr "Código PIN é necessário para o dispositivo de banda larga móvel"
 
-#: ../clients/common/nm-secret-agent-simple.c:508
+#: ../clients/common/nm-secret-agent-simple.c:497
 msgid "PIN"
 msgstr "PIN"
 
-#: ../clients/common/nm-secret-agent-simple.c:514
-#: ../clients/common/nm-secret-agent-simple.c:546
-#: ../clients/common/nm-secret-agent-simple.c:568
+#: ../clients/common/nm-secret-agent-simple.c:503
+#: ../clients/common/nm-secret-agent-simple.c:535
+#: ../clients/common/nm-secret-agent-simple.c:557
 msgid "Mobile broadband network password"
 msgstr "Senha de rede de banda larga móvel"
 
-#: ../clients/common/nm-secret-agent-simple.c:515
-#: ../clients/common/nm-secret-agent-simple.c:547
-#: ../clients/common/nm-secret-agent-simple.c:569
-#: ../clients/common/nm-secret-agent-simple.c:586
+#: ../clients/common/nm-secret-agent-simple.c:504
+#: ../clients/common/nm-secret-agent-simple.c:536
+#: ../clients/common/nm-secret-agent-simple.c:558
+#: ../clients/common/nm-secret-agent-simple.c:579
 #, c-format
 msgid "A password is required to connect to '%s'."
-msgstr "Uma senha é necessária para conectar ao “%s”."
+msgstr "Requer uma senha para conectar ao \"%s\"."
 
-#: ../clients/common/nm-secret-agent-simple.c:528
+#: ../clients/common/nm-secret-agent-simple.c:517
 #, c-format
 msgid "Secrets are required to access the MACsec network '%s'"
-msgstr "Os segredos são necessários para acessar a rede MACsec “%s”"
+msgstr ""
 
-#: ../clients/common/nm-secret-agent-simple.c:532
+#: ../clients/common/nm-secret-agent-simple.c:521
 msgid "MACsec PSK authentication"
-msgstr "Autenticação MACsec PSK"
+msgstr ""
 
-#: ../clients/common/nm-secret-agent-simple.c:540
+#: ../clients/common/nm-secret-agent-simple.c:529
 msgid "MACsec EAP authentication"
-msgstr "Autenticação MACsec EAP"
+msgstr ""
 
-#: ../clients/common/nm-secret-agent-simple.c:581
+#: ../clients/common/nm-secret-agent-simple.c:574
 msgid "VPN password required"
 msgstr "Senha de VPN necessária"
 
 #: ../clients/common/nm-vpn-helpers.c:48
-#, c-format
+#, fuzzy, c-format
 msgid "unknown VPN plugin \"%s\""
-msgstr "plug-in VPN desconhecido “%s”"
+msgstr "não foi possível carregar plug-in \"%s\": %s"
 
 #: ../clients/common/nm-vpn-helpers.c:59
 #, c-format
 msgid "cannot load legacy-only VPN plugin \"%s\" for \"%s\""
-msgstr "não foi possível carregar plug-in VPN somente legado “%s” para “%s”"
+msgstr ""
 
 #: ../clients/common/nm-vpn-helpers.c:64
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "cannot load VPN plugin \"%s\" due to missing \"%s\". Missing client plugin?"
 msgstr ""
-"não foi possível carregar plug-in VPN “%s” por estar faltando “%s”: Faltando "
-"plug-in do cliente?"
+"não foi possível carregar plug-in de VPN em \"%s\": faltando nome do plug-in"
 
 #: ../clients/common/nm-vpn-helpers.c:69
-#, c-format
+#, fuzzy, c-format
 msgid "failed to load VPN plugin \"%s\": %s"
-msgstr "falha ao carregar plug-in VPN “%s”: %s"
+msgstr "Erro: falha ao carregar plug-in VPN: %s."
 
 #: ../clients/common/nm-vpn-helpers.c:124
+#, fuzzy
 msgid "Certificate password"
-msgstr "Senha de certificado"
+msgstr "Senha de chave privada"
 
 #: ../clients/common/nm-vpn-helpers.c:125
+#, fuzzy
 msgid "HTTP proxy password"
-msgstr "Senha de proxy HTTP"
+msgstr "Senha do grupo"
 
 #: ../clients/common/nm-vpn-helpers.c:130
 #: ../clients/common/nm-vpn-helpers.c:135
@@ -6009,84 +5697,67 @@ msgid "Gateway certificate hash"
 msgstr "Hash de certificado do gateway"
 
 #. Generated file. Do not edit.
-#: ../clients/common/settings-docs.h.in:3
-#: ../clients/common/settings-docs.h.in:7
-#: ../clients/common/settings-docs.h.in:20
-#: ../clients/common/settings-docs.h.in:34
-#: ../clients/common/settings-docs.h.in:61
-#: ../clients/common/settings-docs.h.in:100
-#: ../clients/common/settings-docs.h.in:109
-#: ../clients/common/settings-docs.h.in:117
-#: ../clients/common/settings-docs.h.in:119
-#: ../clients/common/settings-docs.h.in:128
-#: ../clients/common/settings-docs.h.in:132
-#: ../clients/common/settings-docs.h.in:136
-#: ../clients/common/settings-docs.h.in:153
-#: ../clients/common/settings-docs.h.in:170
-#: ../clients/common/settings-docs.h.in:179
-#: ../clients/common/settings-docs.h.in:180
-#: ../clients/common/settings-docs.h.in:185
-#: ../clients/common/settings-docs.h.in:197
-#: ../clients/common/settings-docs.h.in:208
-#: ../clients/common/settings-docs.h.in:231
-#: ../clients/common/settings-docs.h.in:253
-#: ../clients/common/settings-docs.h.in:264
-#: ../clients/common/settings-docs.h.in:270
-#: ../clients/common/settings-docs.h.in:276
-#: ../clients/common/settings-docs.h.in:279
-#: ../clients/common/settings-docs.h.in:281
-#: ../clients/common/settings-docs.h.in:287
-#: ../clients/common/settings-docs.h.in:297
-#: ../clients/common/settings-docs.h.in:309
-#: ../clients/common/settings-docs.h.in:317
-#: ../clients/common/settings-docs.h.in:322
-#: ../clients/common/settings-docs.h.in:327
-#: ../clients/common/settings-docs.h.in:330
-#: ../clients/common/settings-docs.h.in:337
-#: ../clients/common/settings-docs.h.in:354
-#: ../clients/common/settings-docs.h.in:361
-#: ../clients/common/settings-docs.h.in:366
-#: ../clients/common/settings-docs.h.in:371
-#: ../clients/common/settings-docs.h.in:374
-#: ../clients/common/settings-docs.h.in:388
-#: ../clients/common/settings-docs.h.in:398
-#: ../clients/common/settings-docs.h.in:401
-msgid ""
-"The setting's name, which uniquely identifies the setting within the "
-"connection.  Each setting type has a name unique to that type, for example "
-"\"ppp\" or \"wireless\" or \"wired\"."
-msgstr ""
-"O nome da configuração, que identifica de forma única a configuração dentro "
-"da conexão. Cada tipo de configuração possui um nome único àquele tipo, por "
-"exemplo “ppp”, “wireless” ou “wired”."
-
-#: ../clients/common/settings-docs.h.in:4
-msgid ""
-"If given, specifies the parent interface name or parent connection UUID from "
-"which this 6LowPAN interface should be created."
-msgstr ""
-"Se fornecido, especifica o nome da interface pai ou o UUID da conexão pai a "
-"partir dos quais essa interface 6LowPAN deve ser criada."
-
-#: ../clients/common/settings-docs.h.in:5
+#: ../clients/common/settings-docs.c.in:3
 msgid "Channel on which the mesh network to join is located."
-msgstr "Canal no qual a rede mesh a se juntar está localizada."
+msgstr ""
 
-#: ../clients/common/settings-docs.h.in:6
+#: ../clients/common/settings-docs.c.in:4
 msgid ""
 "Anycast DHCP MAC address used when requesting an IP address via DHCP. The "
 "specific anycast address used determines which DHCP server class answers the "
 "request."
 msgstr ""
-"Endereço MAC de difusão DHCP usado ao requisitar um endereço IP via DHCP. O "
-"endereço específico de difusão usado determina qual classe de servidor DHCP "
-"responde a requisição."
 
-#: ../clients/common/settings-docs.h.in:8
+#: ../clients/common/settings-docs.c.in:5
+#: ../clients/common/settings-docs.c.in:18
+#: ../clients/common/settings-docs.c.in:30
+#: ../clients/common/settings-docs.c.in:57
+#: ../clients/common/settings-docs.c.in:96
+#: ../clients/common/settings-docs.c.in:105
+#: ../clients/common/settings-docs.c.in:113
+#: ../clients/common/settings-docs.c.in:115
+#: ../clients/common/settings-docs.c.in:124
+#: ../clients/common/settings-docs.c.in:128
+#: ../clients/common/settings-docs.c.in:132
+#: ../clients/common/settings-docs.c.in:148
+#: ../clients/common/settings-docs.c.in:165
+#: ../clients/common/settings-docs.c.in:174
+#: ../clients/common/settings-docs.c.in:175
+#: ../clients/common/settings-docs.c.in:180
+#: ../clients/common/settings-docs.c.in:192
+#: ../clients/common/settings-docs.c.in:202
+#: ../clients/common/settings-docs.c.in:225
+#: ../clients/common/settings-docs.c.in:246
+#: ../clients/common/settings-docs.c.in:257
+#: ../clients/common/settings-docs.c.in:262
+#: ../clients/common/settings-docs.c.in:268
+#: ../clients/common/settings-docs.c.in:271
+#: ../clients/common/settings-docs.c.in:273
+#: ../clients/common/settings-docs.c.in:279
+#: ../clients/common/settings-docs.c.in:289
+#: ../clients/common/settings-docs.c.in:301
+#: ../clients/common/settings-docs.c.in:309
+#: ../clients/common/settings-docs.c.in:314
+#: ../clients/common/settings-docs.c.in:318
+#: ../clients/common/settings-docs.c.in:325
+#: ../clients/common/settings-docs.c.in:342
+#: ../clients/common/settings-docs.c.in:349
+#: ../clients/common/settings-docs.c.in:354
+#: ../clients/common/settings-docs.c.in:359
+#: ../clients/common/settings-docs.c.in:362
+#: ../clients/common/settings-docs.c.in:376
+#: ../clients/common/settings-docs.c.in:386
+msgid ""
+"The setting's name, which uniquely identifies the setting within the "
+"connection.  Each setting type has a name unique to that type, for example "
+"\"ppp\" or \"wireless\" or \"wired\"."
+msgstr ""
+
+#: ../clients/common/settings-docs.c.in:6
 msgid "SSID of the mesh network to join."
-msgstr "SSID da rede mesh para se juntar."
+msgstr ""
 
-#: ../clients/common/settings-docs.h.in:9
+#: ../clients/common/settings-docs.c.in:7
 msgid ""
 "802.11 frequency band of the network.  One of \"a\" for 5GHz 802.11a or \"bg"
 "\" for 2.4GHz 802.11.  This will lock associations to the Wi-Fi network to "
@@ -6095,38 +5766,24 @@ msgid ""
 "compatible.  This setting depends on specific driver capability and may not "
 "work with all drivers."
 msgstr ""
-"Banda de frequência 802.11 da rede. Uma entre “a” para 5GHz 802.11a ou “bg” "
-"para 2.4GHz 802.11. Isso vai travar associações à rede Wi-Fi à banda "
-"específica, i.e. se “a” for especificado, o dispositivo não se associará à "
-"mesma rede na banda 2.4GHz, mesmo se as configurações da rede forem "
-"compatíveis. Essa configuração depende da capacidade de um driver específico "
-"e podem não funcionar com todos os drivers."
 
-#: ../clients/common/settings-docs.h.in:10
+#: ../clients/common/settings-docs.c.in:8
 msgid ""
 "If specified, directs the device to only associate with the given access "
 "point.  This capability is highly driver dependent and not supported by all "
 "devices.  Note: this property does not control the BSSID used when creating "
 "an Ad-Hoc network and is unlikely to in the future."
 msgstr ""
-"Se especificado, dirige o dispositivo para apenas se associar com o ponto de "
-"acesso dado. Essa capacidade é altamente dependendo do driver e não possui "
-"suporte em todos os dispositivos. Nota: essa propriedade não controla o "
-"BSSID usado ao criar uma rede Ad-Hoc e isto é improvável no futuro."
 
-#: ../clients/common/settings-docs.h.in:11
+#: ../clients/common/settings-docs.c.in:9
 msgid ""
 "Wireless channel to use for the Wi-Fi connection.  The device will only join "
 "(or create for Ad-Hoc networks) a Wi-Fi network on the specified channel.  "
 "Because channel numbers overlap between bands, this property also requires "
 "the \"band\" property to be set."
 msgstr ""
-"Canal sem fio a usar para a conexão Wi-Fi. O dispositivo só se juntará (ou "
-"criará para redes Ad-Hoc) uma rede Wi-Fi no canal especificado. Porque "
-"números de canal se sobrepõem entre bandas, essa propriedade também exibe "
-"que a propriedade “band” esteja definida."
 
-#: ../clients/common/settings-docs.h.in:12
+#: ../clients/common/settings-docs.c.in:10
 msgid ""
 "If specified, request that the device use this MAC address instead. This is "
 "known as MAC cloning or spoofing. Beside explicitly specifying a MAC "
@@ -6141,22 +5798,9 @@ msgid ""
 "different default value). On D-Bus, this field is expressed as \"assigned-"
 "mac-address\" or the deprecated \"cloned-mac-address\"."
 msgstr ""
-"Se especificado, exige que o dispositivo use esse endereço MAC. Isso é "
-"conhecido como clonagem de MAC ou MAC spoofing. Além de explicitamente "
-"especificar um endereço MAC, há suporte aos valores especiais “preserve”, "
-"“permanent”, “random” e “stable”. “preserve” significa não tocar o endereço "
-"MAC na ativação. “permanent” significa usar o endereço de hardware "
-"permanente do dispositivo. “random” cria um endereço MAC aleatório a cada "
-"conexão. “stable” cria um endereço MAC em hash baseado no connection.stable-"
-"id e uma chave dependente da máquina. Se não especificado, o valor pode ser "
-"sobrescrito via padrões globais, veja o manual do NetworkManager.conf. Se "
-"ainda estiver não especificado, usa como padrão “preserve” (versões antigas "
-"do NetworkManager podem usar um valor padrão diferente). No D-Bus, esse "
-"campo é expressado como “assigned-mac-address” ou o obsoleto “cloned-mac-"
-"address”."
-
-#: ../clients/common/settings-docs.h.in:13
-#: ../clients/common/settings-docs.h.in:96
+
+#: ../clients/common/settings-docs.c.in:11
+#: ../clients/common/settings-docs.c.in:92
 msgid ""
 "With \"cloned-mac-address\" setting \"random\" or \"stable\", by default all "
 "bits of the MAC address are scrambled and a locally-administered, unicast "
@@ -6182,71 +5826,31 @@ msgid ""
 "create a fully scrambled MAC address, randomly locally or globally "
 "administered."
 msgstr ""
-"Com a definição de “cloned-mac-address” com “random” ou “stable”, por padrão "
-"todos os bits do endereço MAC são embaralhados e um endereço MAC unicast, "
-"administrado localmente, é criado. Essa propriedade permite especificar que "
-"certos bits são fixos. Note que pelo menos bits significantes do primeiro "
-"endereço MAC serão sempre retirados para criar um endereço MAC unicast. Se a "
-"propriedade for NULL, ela é candidata a ser sobrescrita por uma definição "
-"padrão de conexão. Se o valor ainda é NULL ou uma string vazia, o padrão é "
-"criar um MAC unicast administrador localmente. Se o valor contém um endereço "
-"MAC, esse endereço é usado como máscara. Os bits definidos da máscara devem "
-"ser preenchidos com o endereço MAC atual do dispositivo, enquanto os bits "
-"não definidos estão sujeitos a valores aleatórios. Definir “FE:FF:"
-"FF:00:00:00” significa preservar o OUI do endereço MAC atual e aleatorizar "
-"apenas os 3 bytes menores usando o algoritmo “random” ou “stable”. Se o "
-"valor contém um endereço MAC adicional após a máscara, esse endereço é usado "
-"em vez do endereço MAC atual para preencher os bits que não devem ser "
-"aleatorizados. Por exemplo, um valor de “FE:FF:FF:00:00:00 68:"
-"F7:28:00:00:00” vai definir o OUI do endereço MAC para 68:F7:28, enquanto os "
-"bits menores serão aleatorizados. Um valor de “02:00:00:00:00:00 "
-"00:00:00:00:00:00” vai definir um endereço MAC gravado (“burned-in”), "
-"administrado globalmente, completamente embaralhado. Se o valor contém mais "
-"de um endereço MAC adicional, um deles é escolhido aleatoriamente. Por "
-"exemplo, “02:00:00:00:00:00 00:00:00:00:00:00 02:00:00:00:00:00” vai criar "
-"um endereço MAC completamente embaralhado, administrador local ou "
-"globalmente de forma aleatória."
-
-#: ../clients/common/settings-docs.h.in:14
+
+#: ../clients/common/settings-docs.c.in:12
 msgid ""
 "If TRUE, indicates this network is a non-broadcasting network that hides its "
 "SSID.  In this case various workarounds may take place, such as probe-"
 "scanning the SSID for more reliable network discovery.  However, these "
 "workarounds expose inherent insecurities with hidden SSID networks, and thus "
-"hidden SSID networks should be used with caution. Note that marking the "
-"network as hidden may be a privacy issue for you, as the explicit probe-"
-"scans may be distinctly recognizable on the air."
+"hidden SSID networks should be used with caution."
 msgstr ""
-"Se VERDADEIRO, indica que essa rede é uma rede sem broadcast que oculta seu "
-"SSID. Neste caso, várias soluções de contorno podem ser usadas, tal como "
-"sondar o SSID para uma descoberta de rede mais confiável. Porém, essas "
-"soluções de contorno expõem as inseguridades herdadas com reds de SSID "
-"ocultos e, portanto, redes de SSID ocultos devem ser usadas com cuidado. "
-"Observe que marcar a rede como oculta pode ser um problema de privacidade "
-"para você, pois as varreduras explícitas tipo sonda podem ser claramente "
-"reconhecidas no ar."
 
-#: ../clients/common/settings-docs.h.in:15
+#: ../clients/common/settings-docs.c.in:13
 msgid ""
 "If specified, this connection will only apply to the Wi-Fi device whose "
 "permanent MAC address matches. This property does not change the MAC address "
 "of the device (i.e. MAC spoofing)."
 msgstr ""
-"Se especificado, essa conexão se aplicará apenas ao dispositivo Wi-Fi cujo "
-"endereço MAC permanente coincidir. Essa propriedade não alterar o endereço "
-"MAC do dispositivo (i.e. MAC spoofind)."
 
-#: ../clients/common/settings-docs.h.in:16
+#: ../clients/common/settings-docs.c.in:14
 msgid ""
 "A list of permanent MAC addresses of Wi-Fi devices to which this connection "
 "should never apply.  Each MAC address should be given in the standard hex-"
 "digits-and-colons notation (eg \"00:11:22:33:44:55\")."
 msgstr ""
-"Uma lista de endereços MAC permanentes de dispositivos Wi-Fi aos quais esta "
-"conexão nunca deve se aplicar. Cada endereço MAC deve ser dado na anotação "
-"padrão de “dígitos hexadecimais e dois pontos (ex.: “00:11:22:33:44:55”)."
 
-#: ../clients/common/settings-docs.h.in:17
+#: ../clients/common/settings-docs.c.in:15
 msgid ""
 "One of NM_SETTING_MAC_RANDOMIZATION_DEFAULT (0) (never randomize unless the "
 "user has set a global default to randomize and the supplicant supports "
@@ -6255,31 +5859,21 @@ msgid ""
 "the MAC address). This property is deprecated for 'cloned-mac-address'. "
 "Deprecated: 1"
 msgstr ""
-"Um entre NM_SETTING_MAC_RANDOMIZATION_DEFAULT (0) (nunca aleatorizar a menos "
-"que o usuário tenha definido um global padrão para aleatorizar e o "
-"suplicante ofereça suporte a aleatorização),  "
-"NM_SETTING_MAC_RANDOMIZATION_NEVER (1) (nunca aleatorizar o endereço MAC) ou "
-"NM_SETTING_MAC_RANDOMIZATION_ALWAYS (2) (sempre aleatorizar o endereço MAC). "
-"Essa propriedade é obsoleta para “cloned-mac-address”. Obsoleto: 1"
 
-#: ../clients/common/settings-docs.h.in:18
+#: ../clients/common/settings-docs.c.in:16
 msgid ""
 "Wi-Fi network mode; one of \"infrastructure\", \"adhoc\" or \"ap\".  If "
 "blank, infrastructure is assumed."
 msgstr ""
-"Modo da rede Wi-Fi; um entre “infrastructure”, “adhoc” ou “ap”.  Se vazio, "
-"presume-se “infrastructure”."
 
-#: ../clients/common/settings-docs.h.in:19
-#: ../clients/common/settings-docs.h.in:99
+#: ../clients/common/settings-docs.c.in:17
+#: ../clients/common/settings-docs.c.in:95
 msgid ""
 "If non-zero, only transmit packets of the specified size or smaller, "
 "breaking larger packets up into multiple Ethernet frames."
 msgstr ""
-"Se não zero, transmite apenas pacotes do tamanho especificado ou menor, "
-"quebrando pacotes maiores em múltiplos quadros Ethernet."
 
-#: ../clients/common/settings-docs.h.in:21
+#: ../clients/common/settings-docs.c.in:19
 msgid ""
 "One of NM_SETTING_WIRELESS_POWERSAVE_DISABLE (2) (disable Wi-Fi power "
 "saving), NM_SETTING_WIRELESS_POWERSAVE_ENABLE (3) (enable Wi-Fi power "
@@ -6287,27 +5881,16 @@ msgid ""
 "configure setting) or NM_SETTING_WIRELESS_POWERSAVE_DEFAULT (0) (use the "
 "globally configured value). All other values are reserved."
 msgstr ""
-"Um entre NM_SETTING_WIRELESS_POWERSAVE_DISABLE (2) (desabilita economia de "
-"energia do Wi-Fi), NM_SETTING_WIRELESS_POWERSAVE_ENABLE (3) (habilita "
-"economia de energia do Wi-Fi), NM_SETTING_WIRELESS_POWERSAVE_IGNORE (1) (não "
-"toca a definição de configurações atual) ou "
-"NM_SETTING_WIRELESS_POWERSAVE_DEFAULT (0) (usa o valor globalmente "
-"configurado). Todos os outros valores são reservados."
 
-#: ../clients/common/settings-docs.h.in:22
+#: ../clients/common/settings-docs.c.in:20
 msgid ""
 "If non-zero, directs the device to only use the specified bitrate for "
 "communication with the access point.  Units are in Kb/s, ie 5500 = 5.5 Mbit/"
 "s.  This property is highly driver dependent and not all devices support "
 "setting a static bitrate."
 msgstr ""
-"Se não zero, dirige o dispositivo para usar apenas a taxa de bit "
-"especificada para comunicação com o ponto de acesso. Unidades são em Kb/s, i."
-"e. 5500 = 5.5 Mbit/s. Essa propriedade é altamente dependente do driver e "
-"nem todos os dispositivos oferecem suporte a definição de uma taxa de bits "
-"estática."
 
-#: ../clients/common/settings-docs.h.in:23
+#: ../clients/common/settings-docs.c.in:21
 msgid ""
 "A list of BSSIDs (each BSSID formatted as a MAC address like "
 "\"00:11:22:33:44:55\") that have been detected as part of the Wi-Fi "
@@ -6315,58 +5898,19 @@ msgid ""
 "property is only meant for reading and reflects the BSSID list of "
 "NetworkManager. The changes you make to this property will not be preserved."
 msgstr ""
-"Uma lista de BSSIDs (cada BSSID formatado como endereço MAC como "
-"“00:11:22:33:44:55”) que foram detectadas como parte da rede Wi-Fi. O "
-"NetworkManager rastreia internamente BSSIDs vistos anteriormente. A "
-"propriedade é apenas para leitura e reflete a lista de BSSIDs do "
-"NetworkManager. As alterações que você faz nesta propriedade não será "
-"preservada."
 
-#: ../clients/common/settings-docs.h.in:24
+#: ../clients/common/settings-docs.c.in:22
 msgid "SSID of the Wi-Fi network. Must be specified."
-msgstr "SSID da rede Wi-Fi. Deve ser especificado."
+msgstr ""
 
-#: ../clients/common/settings-docs.h.in:25
+#: ../clients/common/settings-docs.c.in:23
 msgid ""
 "If non-zero, directs the device to use the specified transmit power. Units "
 "are dBm.  This property is highly driver dependent and not all devices "
 "support setting a static transmit power."
 msgstr ""
-"Se não zero, dirige o dispositivo a usar a energia de transmissão "
-"especificada. Unidades são dBm. Essa propriedade é altamente dependente do "
-"driver e nem todos os dispositivos oferecem suporte a definir uma energia de "
-"transmissão estática."
-
-#: ../clients/common/settings-docs.h.in:26
-msgid ""
-"The NMSettingWirelessWakeOnWLan options to enable. Not all devices support "
-"all options. May be any combination of NM_SETTING_WIRELESS_WAKE_ON_WLAN_ANY "
-"(0x2), NM_SETTING_WIRELESS_WAKE_ON_WLAN_DISCONNECT (0x4), "
-"NM_SETTING_WIRELESS_WAKE_ON_WLAN_MAGIC (0x8), "
-"NM_SETTING_WIRELESS_WAKE_ON_WLAN_GTK_REKEY_FAILURE (0x10), "
-"NM_SETTING_WIRELESS_WAKE_ON_WLAN_EAP_IDENTITY_REQUEST (0x20), "
-"NM_SETTING_WIRELESS_WAKE_ON_WLAN_4WAY_HANDSHAKE (0x40), "
-"NM_SETTING_WIRELESS_WAKE_ON_WLAN_RFKILL_RELEASE (0x80), "
-"NM_SETTING_WIRELESS_WAKE_ON_WLAN_TCP (0x100) or the special values "
-"NM_SETTING_WIRELESS_WAKE_ON_WLAN_DEFAULT (0x1) (to use global settings) and "
-"NM_SETTING_WIRELESS_WAKE_ON_WLAN_IGNORE (0x8000) (to disable management of "
-"Wake-on-LAN in NetworkManager)."
-msgstr ""
-"As opções de NMSettingWirelessWakeOnWLan para habilitar. Nem todos os "
-"dispositivos oferecem suporte a todas as opções. Pode ser qualquer "
-"combinação de NM_SETTING_WIRELESS_WAKE_ON_WLAN_ANY (0x2), "
-"NM_SETTING_WIRELESS_WAKE_ON_WLAN_DISCONNECT (0x4), "
-"NM_SETTING_WIRELESS_WAKE_ON_WLAN_MAGIC (0x8), "
-"NM_SETTING_WIRELESS_WAKE_ON_WLAN_GTK_REKEY_FAILURE (0x10), "
-"NM_SETTING_WIRELESS_WAKE_ON_WLAN_EAP_IDENTITY_REQUEST (0x20), "
-"NM_SETTING_WIRELESS_WAKE_ON_WLAN_4WAY_HANDSHAKE (0x40), "
-"NM_SETTING_WIRELESS_WAKE_ON_WLAN_RFKILL_RELEASE (0x80), "
-"NM_SETTING_WIRELESS_WAKE_ON_WLAN_TCP (0x100) ou valores especificais "
-"NM_SETTING_WIRELESS_WAKE_ON_WLAN_DEFAULT (0x1) (para usar configurações "
-"globais) e NM_SETTING_WIRELESS_WAKE_ON_WLAN_IGNORE (0x8000) (para "
-"desabilitar gerenciamento de Wake-on-LAN no NetworkManager)."
-
-#: ../clients/common/settings-docs.h.in:27
+
+#: ../clients/common/settings-docs.c.in:24
 msgid ""
 "When WEP is used (ie, key-mgmt = \"none\" or \"ieee8021x\") indicate the "
 "802.11 authentication algorithm required by the AP here.  One of \"open\" "
@@ -6374,91 +5918,48 @@ msgid ""
 "When using Cisco LEAP (ie, key-mgmt = \"ieee8021x\" and auth-alg = \"leap\") "
 "the \"leap-username\" and \"leap-password\" properties must be specified."
 msgstr ""
-"Quando WEP é usado (i.e., key-mgmt = “none” ou “ieee8021x”), indica o "
-"algoritmo de autenticação 802.11 exibido pelo AP aqui. Um entre “open” para "
-"sistema aberto, “shared” para chave compartilhada ou “leap” para Cisco LEAP. "
-"Ao usar Cisco LEAP (i.e. key-mgmt = “ieee8021x” e auth-alg = “leap”), as "
-"propriedades “leap-username” e “leap-password” devem ser especificadas."
-
-#: ../clients/common/settings-docs.h.in:28
-msgid ""
-"Indicates whether Fast Initial Link Setup (802.11ai) must be enabled for the "
-"connection.  One of NM_SETTING_WIRELESS_SECURITY_FILS_DEFAULT (0) (use "
-"global default value), NM_SETTING_WIRELESS_SECURITY_FILS_DISABLE (1) "
-"(disable FILS), NM_SETTING_WIRELESS_SECURITY_FILS_OPTIONAL (2) (enable FILS "
-"if the supplicant and the access point support it) or "
-"NM_SETTING_WIRELESS_SECURITY_FILS_REQUIRED (3) (enable FILS and fail if not "
-"supported).  When set to NM_SETTING_WIRELESS_SECURITY_FILS_DEFAULT (0) and "
-"no global default is set, FILS will be optionally enabled."
-msgstr ""
-"Indica se Configuração Rápida do Link Inicial (FILS, 802.11ai) deve ser "
-"habilitado para a conexão. Um entre "
-"NM_SETTING_WIRELESS_SECURITY_FILS_DEFAULT (0) (usa valor padrão global), "
-"NM_SETTING_WIRELESS_SECURITY_FILS_DISABLE (1) (desabilita FILS), "
-"NM_SETTING_WIRELESS_SECURITY_FILS_OPTIONAL (2) (habilita FILS se o "
-"suplicante e o ponto de acesso oferecerem suporte a ele) ou "
-"NM_SETTING_WIRELESS_SECURITY_FILS_REQUIRED (3) (habilita FILS e falha se não "
-"houver suporte). Quando definido para "
-"NM_SETTING_WIRELESS_SECURITY_FILS_DEFAULT (0) e nenhum padrão global estiver "
-"definido, FILS será habilitado opcionalmente."
-
-#: ../clients/common/settings-docs.h.in:29
+
+#: ../clients/common/settings-docs.c.in:25
 msgid ""
 "A list of group/broadcast encryption algorithms which prevents connections "
 "to Wi-Fi networks that do not utilize one of the algorithms in the list.  "
 "For maximum compatibility leave this property empty.  Each list element may "
 "be one of \"wep40\", \"wep104\", \"tkip\", or \"ccmp\"."
 msgstr ""
-"Uma lista de algoritmos de criptografia de broadcast/grupo que impede "
-"conexões às redes Wi-Fi que não utilizam um dos algoritmos na lista. Para "
-"máxima compatibilidade, deixe essa propriedade vazia. Cada elemento da lista "
-"pode ser um entre “wep40”, “wep104”, “tkip” ou “ccmp”."
 
-#: ../clients/common/settings-docs.h.in:30
+#: ../clients/common/settings-docs.c.in:26
 msgid ""
 "Key management used for the connection.  One of \"none\" (WEP), \"ieee8021x"
 "\" (Dynamic WEP), \"wpa-none\" (Ad-Hoc WPA-PSK), \"wpa-psk\" (infrastructure "
 "WPA-PSK), or \"wpa-eap\" (WPA-Enterprise).  This property must be set for "
 "any Wi-Fi connection that uses security."
 msgstr ""
-"Gerenciamento de chave usada para a conexão. Um entre “none” (WEP), "
-"“ieee8021x” (WEP dinâmico), “wpa-none” (Ad-Hoc WPA-PSK), “wpa-psk” (WPA-PSK "
-"infraestrutura) ou “wpa-eap” (WPA-empresarial). Essa propriedade deve estar "
-"definida para qualquer conexão Wi-Fi que usa segurança."
 
-#: ../clients/common/settings-docs.h.in:31
+#: ../clients/common/settings-docs.c.in:27
 msgid ""
 "The login password for legacy LEAP connections (ie, key-mgmt = \"ieee8021x\" "
 "and auth-alg = \"leap\")."
 msgstr ""
-"A senha de login para conexões LEAP legadas (i.e. key-mgmt = “ieee8021x” e "
-"auth-alg = “leap”)."
 
-#: ../clients/common/settings-docs.h.in:32
+#: ../clients/common/settings-docs.c.in:28
 msgid "Flags indicating how to handle the \"leap-password\" property."
-msgstr "Sinalizadores indicando como tratar a propriedade “leap-password”."
+msgstr ""
 
-#: ../clients/common/settings-docs.h.in:33
+#: ../clients/common/settings-docs.c.in:29
 msgid ""
 "The login username for legacy LEAP connections (ie, key-mgmt = \"ieee8021x\" "
 "and auth-alg = \"leap\")."
 msgstr ""
-"O nome de usuário de login para conexões LEAP legadas (i.e. key-mgmt = "
-"“ieee8021x” e auth-alg = “leap”)."
 
-#: ../clients/common/settings-docs.h.in:35
+#: ../clients/common/settings-docs.c.in:31
 msgid ""
 "A list of pairwise encryption algorithms which prevents connections to Wi-Fi "
 "networks that do not utilize one of the algorithms in the list. For maximum "
 "compatibility leave this property empty.  Each list element may be one of "
 "\"tkip\" or \"ccmp\"."
 msgstr ""
-"Uma lista de algoritmos de criptografia em pares que impede conexões às "
-"redes Wi-Fi que não utilizam um dos algoritmos na lista. Para máxima "
-"compatibilidade, deixe essa propriedade vazia. Cada elemento da lista pode "
-"ser um entre “tkip” ou “ccmp”."
 
-#: ../clients/common/settings-docs.h.in:36
+#: ../clients/common/settings-docs.c.in:32
 msgid ""
 "Indicates whether Protected Management Frames (802.11w) must be enabled for "
 "the connection.  One of NM_SETTING_WIRELESS_SECURITY_PMF_DEFAULT (0) (use "
@@ -6469,27 +5970,15 @@ msgid ""
 "supported).  When set to NM_SETTING_WIRELESS_SECURITY_PMF_DEFAULT (0) and no "
 "global default is set, PMF will be optionally enabled."
 msgstr ""
-"Indica se Quadros de Gerenciamento Protegidos (PMF, 802.11w) deve ser "
-"habilitado para a conexão. Um entre NM_SETTING_WIRELESS_SECURITY_PMF_DEFAULT "
-"(0) (usa valor padrão global), NM_SETTING_WIRELESS_SECURITY_PMF_DISABLE (1) "
-"(desabilita PMF), NM_SETTING_WIRELESS_SECURITY_PMF_OPTIONAL (2) (habilita "
-"PMF se o suplicante e o ponto de acesso oferecerem suporte a ele) ou "
-"NM_SETTING_WIRELESS_SECURITY_PMF_REQUIRED (3) (habilita PMF e falha se não "
-"houver suporte). Quando definido para "
-"NM_SETTING_WIRELESS_SECURITY_PMF_DEFAULT (0) e nenhum padrão global estiver "
-"definido, PMF será habilitado opcionalmente."
 
-#: ../clients/common/settings-docs.h.in:37
+#: ../clients/common/settings-docs.c.in:33
 msgid ""
 "List of strings specifying the allowed WPA protocol versions to use. Each "
 "element may be one \"wpa\" (allow WPA) or \"rsn\" (allow WPA2/RSN).  If not "
 "specified, both WPA and RSN connections are allowed."
 msgstr ""
-"Lista de strings especificando as versões permitidas de protocolo WPA para "
-"usar. Cada elemento pode ser um entre “wpa” (permite WPA) ou “rsn” (permite "
-"WPA2/RSN). Se não especificado, ambas conexões WPA e RSN são permitidas."
 
-#: ../clients/common/settings-docs.h.in:38
+#: ../clients/common/settings-docs.c.in:34
 msgid ""
 "Pre-Shared-Key for WPA networks.  If the key is 64-characters long, it must "
 "contain only hexadecimal characters and is interpreted as a hexadecimal WPA "
@@ -6498,26 +5987,18 @@ msgid ""
 "and is hashed to derive the actual WPA-PSK used when connecting to the Wi-Fi "
 "network."
 msgstr ""
-"Chave pré-compartilhada (PSK) para redes WPA. Se a chave tiver 64 "
-"caracteres, ela deve conter apenas caracteres hexadecimais e é interpretada "
-"como uma chave WPA hexadecimal. Do contrário, a chave deve ter entre 8 e 63 "
-"caracteres ASCII (conforme especificado no padrão 802.11i) e é interpretada "
-"como uma frase secreta WPA, e é efetuado hash para derivar o WPA-PSK atual "
-"usado ao conectar à rede Wi-Fi."
 
-#: ../clients/common/settings-docs.h.in:39
+#: ../clients/common/settings-docs.c.in:35
 msgid "Flags indicating how to handle the \"psk\" property."
-msgstr "Sinalizadores indicando como tratar a propriedade “psk”."
+msgstr ""
 
-#: ../clients/common/settings-docs.h.in:40
+#: ../clients/common/settings-docs.c.in:36
 msgid ""
 "Flags indicating how to handle the \"wep-key0\", \"wep-key1\", \"wep-key2\", "
 "and \"wep-key3\" properties."
 msgstr ""
-"Sinalizadores indicando como tratar as propriedades “wep-key0”, “wep-key1”, "
-"“wep-key2” e “wep-key3”"
 
-#: ../clients/common/settings-docs.h.in:41
+#: ../clients/common/settings-docs.c.in:37
 msgid ""
 "Controls the interpretation of WEP keys.  Allowed values are "
 "NM_WEP_KEY_TYPE_KEY (1), in which case the key is either a 10- or 26-"
@@ -6526,62 +6007,40 @@ msgid ""
 "a string and will be hashed using the de-facto MD5 method to derive the "
 "actual WEP key."
 msgstr ""
-"Controla a interpretação de chaves WEP. Valores permitidos são "
-"NM_WEP_KEY_TYPE_KEY (1), no caso em que a chave é uma string hexadecimal de "
-"10 ou 26 caracteres, ou uma senha de ASCII caracteres 5 ou 13 caracteres; ou "
-"NM_WEP_KEY_TYPE_PASSPHRASE (2), caso em que a frase secreta é fornecida como "
-"uma string e será efetuado hash usando o método MD5 “de fato” para derivar a "
-"chave WEP atual."
 
-#: ../clients/common/settings-docs.h.in:42
+#: ../clients/common/settings-docs.c.in:38
 msgid ""
 "Index 0 WEP key.  This is the WEP key used in most networks.  See the \"wep-"
 "key-type\" property for a description of how this key is interpreted."
 msgstr ""
-"Chave WEP de índice 0. Essa é a chave WEP usada na maioria das redes. Veja a "
-"propriedade “wep-key-type” para a descrição de como essa chave é "
-"interpretada."
 
-#: ../clients/common/settings-docs.h.in:43
+#: ../clients/common/settings-docs.c.in:39
 msgid ""
 "Index 1 WEP key.  This WEP index is not used by most networks.  See the "
 "\"wep-key-type\" property for a description of how this key is interpreted."
 msgstr ""
-"Chave WEP de índice 1. Esse índice de WEP não é usado na maioria das redes. "
-"Veja a propriedade “wep-key-type” para a descrição de como essa chave é "
-"interpretada."
 
-#: ../clients/common/settings-docs.h.in:44
+#: ../clients/common/settings-docs.c.in:40
 msgid ""
 "Index 2 WEP key.  This WEP index is not used by most networks.  See the "
 "\"wep-key-type\" property for a description of how this key is interpreted."
 msgstr ""
-"Chave WEP de índice 2. Esse índice de WEP não é usado na maioria das redes. "
-"Veja a propriedade “wep-key-type” para a descrição de como essa chave é "
-"interpretada."
 
-#: ../clients/common/settings-docs.h.in:45
+#: ../clients/common/settings-docs.c.in:41
 msgid ""
 "Index 3 WEP key.  This WEP index is not used by most networks.  See the "
 "\"wep-key-type\" property for a description of how this key is interpreted."
 msgstr ""
-"Chave WEP de índice 3. Esse índice de WEP não é usado na maioria das redes. "
-"Veja a propriedade “wep-key-type” para a descrição de como essa chave é "
-"interpretada."
 
-#: ../clients/common/settings-docs.h.in:46
+#: ../clients/common/settings-docs.c.in:42
 msgid ""
 "When static WEP is used (ie, key-mgmt = \"none\") and a non-default WEP key "
 "index is used by the AP, put that WEP key index here.  Valid values are 0 "
 "(default key) through 3.  Note that some consumer access points (like the "
 "Linksys WRT54G) number the keys 1 - 4."
 msgstr ""
-"Quando WEP estático é usado (i.e. key-mgmt = “none”) e um índice de chave "
-"WEP não padrão é usado pelo AP, coloque o índice de chave WEP aqui. Valores "
-"válidos são 0 (chave padrão) até 3. Note que alguns pontos de acesso "
-"residenciais (como o Linksys WRT54G) numeram as chaves 1 – 4."
 
-#: ../clients/common/settings-docs.h.in:47
+#: ../clients/common/settings-docs.c.in:43
 msgid ""
 "Flags indicating which mode of WPS is to be used if any. There's little "
 "point in changing the default setting as NetworkManager will automatically "
@@ -6589,42 +6048,28 @@ msgid ""
 "Point capabilities. WPS can be disabled by setting this property to a value "
 "of 1."
 msgstr ""
-"Sinalizadores indicando qual modo WPS deve ser usado, se houver. Há pouco "
-"sentido em alterar a definição padrão, pois NetworkManager vai determinar "
-"automaticamente se é factível iniciar a inscrição WPS a partir das "
-"capacidades do AP. WPS pode ser desabilitado definindo essa propriedade para "
-"um valor de 1."
 
-#: ../clients/common/settings-docs.h.in:48
+#: ../clients/common/settings-docs.c.in:44
 msgid ""
 "List of strings to be matched against the altSubjectName of the certificate "
 "presented by the authentication server. If the list is empty, no "
 "verification of the server certificate's altSubjectName is performed."
 msgstr ""
-"Lista de strings a serem comparadas com o altSubjectName do certificado "
-"apresentado pelo servidor de autenticação. Se a lista estiver vazia, nenhuma "
-"verificação do altSubjectName do certificado do servidor é realizada."
 
-#: ../clients/common/settings-docs.h.in:49
+#: ../clients/common/settings-docs.c.in:45
 msgid ""
 "Anonymous identity string for EAP authentication methods.  Used as the "
 "unencrypted identity with EAP types that support different tunneled identity "
 "like EAP-TTLS."
 msgstr ""
-"String de identidade anônima para métodos de autenticação EAP. Usado como "
-"identidade não criptografada com tipos EAP que oferecem suporte a identidade "
-"tunelada diferente como EAP-TTLS."
 
-#: ../clients/common/settings-docs.h.in:50
+#: ../clients/common/settings-docs.c.in:46
 msgid ""
 "A timeout for the authentication. Zero means the global default; if the "
 "global default is not set, the authentication timeout is 25 seconds."
 msgstr ""
-"Um tempo limite para a autenticação. Zero significa o padrão global; se o "
-"padrão global não estiver definido, o tempo limite de autenticação é 25 "
-"segundos."
 
-#: ../clients/common/settings-docs.h.in:51
+#: ../clients/common/settings-docs.c.in:47
 msgid ""
 "Contains the CA certificate if used by the EAP method specified in the \"eap"
 "\" property. Certificate data is specified using a \"scheme\"; two are "
@@ -6636,42 +6081,26 @@ msgid ""
 "property can be unset even if the EAP method supports CA certificates, but "
 "this allows man-in-the-middle attacks and is NOT recommended."
 msgstr ""
-"Contém o certificado AC, se usado pelo método EAP especificado na "
-"propriedade “eap”. Dados do certificado são especificados usando um "
-"“esquema”; atualmente, há suporte a dois: blob e caminho. Ao usar o esquema "
-"blob (que possui compatibilidade reversa com NM 0.7.x), essa propriedade "
-"deve ser definida com os dados codificados com DER do certificado. Ao usar o "
-"esquema de caminho, essa propriedade deve ser definida com o caminho "
-"completo, codificado em UTF-8, do certificado, prefixado com a string "
-"“file://” e terminando com um byte NULO ao final. Essa propriedade pode ser "
-"desativada mesmo se o método EAP oferecer suporte a certificados AC, mas "
-"isso permite ataques “man-in-the-middle” e NÃO é recomendado."
 
-#: ../clients/common/settings-docs.h.in:52
+#: ../clients/common/settings-docs.c.in:48
 msgid ""
 "The password used to access the CA certificate stored in \"ca-cert\" "
 "property. Only makes sense if the certificate is stored on a PKCS#11 token "
 "that requires a login."
 msgstr ""
-"A senha usada para acessar o certificado de AC armazenado na propriedade “ca-"
-"cert”. Só faz sentido se o certificado está armazenado em um token PKCS#11 "
-"que exige um login."
 
-#: ../clients/common/settings-docs.h.in:53
+#: ../clients/common/settings-docs.c.in:49
 msgid "Flags indicating how to handle the \"ca-cert-password\" property."
-msgstr "Sinalizadores indicando como tratar a propriedade “ca-cert-password”."
+msgstr ""
 
-#: ../clients/common/settings-docs.h.in:54
+#: ../clients/common/settings-docs.c.in:50
 msgid ""
 "UTF-8 encoded path to a directory containing PEM or DER formatted "
 "certificates to be added to the verification chain in addition to the "
 "certificate specified in the \"ca-cert\" property."
 msgstr ""
-"Caminho codificado em UTF-8 para um diretório contendo certificados "
-"formatados em PEM ou DER para serem adicionados à cadeia de verificação em "
-"adição ao certificado especificado na propriedade “ca-cert”."
 
-#: ../clients/common/settings-docs.h.in:55
+#: ../clients/common/settings-docs.c.in:51
 msgid ""
 "Contains the client certificate if used by the EAP method specified in the "
 "\"eap\" property. Certificate data is specified using a \"scheme\"; two are "
@@ -6681,31 +6110,19 @@ msgid ""
 "should be set to the full UTF-8 encoded path of the certificate, prefixed "
 "with the string \"file://\" and ending with a terminating NUL byte."
 msgstr ""
-"Contém o certificado de cliente, se usado pelo método EAP especificado na "
-"propriedade “eap”. Dados do certificado são especificados usando um "
-"“esquema”; atualmente, há suporte a dois: blob e caminho. Ao usar o esquema "
-"blob (que possui compatibilidade reversa com NM 0.7.x), essa propriedade "
-"deve ser definida com os dados codificados com DER do certificado. Ao usar o "
-"esquema de caminho, essa propriedade deve ser definida com o caminho "
-"completo, codificado em UTF-8, do certificado, prefixado com a string "
-"“file://” e terminando com um byte NULO ao final."
 
-#: ../clients/common/settings-docs.h.in:56
+#: ../clients/common/settings-docs.c.in:52
 msgid ""
 "The password used to access the client certificate stored in \"client-cert\" "
 "property. Only makes sense if the certificate is stored on a PKCS#11 token "
 "that requires a login."
 msgstr ""
-"A senha usada para acessar o certificado de cliente armazenado na "
-"propriedade “client-cert”. Só faz sentido se o certificado está armazenado "
-"em um token PKCS#11 que exige um login."
 
-#: ../clients/common/settings-docs.h.in:57
+#: ../clients/common/settings-docs.c.in:53
 msgid "Flags indicating how to handle the \"client-cert-password\" property."
 msgstr ""
-"Sinalizadores indicando como tratar a propriedade “client-cert-password”."
 
-#: ../clients/common/settings-docs.h.in:58
+#: ../clients/common/settings-docs.c.in:54
 msgid ""
 "Constraint for server domain name. If set, this FQDN is used as a suffix "
 "match requirement for dNSName element(s) of the certificate presented by the "
@@ -6713,14 +6130,8 @@ msgid ""
 "met.  If no dNSName values are present, this constraint is matched against "
 "SubjectName CN using same suffix match comparison."
 msgstr ""
-"Restrição para o nome de domínio do servidor. Se definido, esse FQDN é usado "
-"como exigência correspondência de sufixo para elemento(s) dNSName do "
-"certificado apresentado pelo servidor de autenticação. Se um dNSName "
-"correspondente for encontrado, essa restrição é atendida. Se nenhum valor "
-"dNSName estiver presente, essa restrição é correspondida com CN do "
-"SubjectName usando a comparação de correspondência de sufixo."
 
-#: ../clients/common/settings-docs.h.in:59
+#: ../clients/common/settings-docs.c.in:55
 msgid ""
 "The allowed EAP method to be used when authenticating to the network with "
 "802.1x.  Valid methods are: \"leap\", \"md5\", \"tls\", \"peap\", \"ttls\", "
@@ -6728,59 +6139,45 @@ msgid ""
 "the properties of this setting; refer to wpa_supplicant documentation for "
 "the allowed combinations."
 msgstr ""
-"O método EAP permitido a ser usado ao autenticar na rede com 802.1x. Métodos "
-"válidos são “leap”, “md5”, “tls”, “peap”, “ttls”, “pwd” e “fast”. Cada "
-"método exige uma configuração diferente usando as propriedades dessa "
-"definição; veja a documentação de wpa_supplicant para as combinações "
-"permitidas. "
 
-#: ../clients/common/settings-docs.h.in:60
+#: ../clients/common/settings-docs.c.in:56
 msgid ""
 "Identity string for EAP authentication methods.  Often the user's user or "
 "login name."
 msgstr ""
-"String de identidade para métodos de autenticação EAP. Geralmente o nome de "
-"usuário ou nome de login do usuário."
 
-#: ../clients/common/settings-docs.h.in:62
+#: ../clients/common/settings-docs.c.in:58
 msgid "UTF-8 encoded file path containing PAC for EAP-FAST."
-msgstr "Caminho de arquivo codificado em UTF-8 contendo PAC para EAP-FAST."
+msgstr ""
 
-#: ../clients/common/settings-docs.h.in:63
+#: ../clients/common/settings-docs.c.in:59
 msgid ""
 "UTF-8 encoded password used for EAP authentication methods. If both the "
 "\"password\" property and the \"password-raw\" property are specified, "
 "\"password\" is preferred."
 msgstr ""
-"Senha codificada em UTF-8 usada para métodos de autenticação. Se tanto a "
-"propriedade “password” quanto a propriedade “password-raw” forem "
-"especificadas, “password” é preferida."
 
-#: ../clients/common/settings-docs.h.in:64
-#: ../clients/common/settings-docs.h.in:111
-#: ../clients/common/settings-docs.h.in:139
-#: ../clients/common/settings-docs.h.in:189
-#: ../clients/common/settings-docs.h.in:312
+#: ../clients/common/settings-docs.c.in:60
+#: ../clients/common/settings-docs.c.in:107
+#: ../clients/common/settings-docs.c.in:135
+#: ../clients/common/settings-docs.c.in:184
+#: ../clients/common/settings-docs.c.in:304
 msgid "Flags indicating how to handle the \"password\" property."
-msgstr "Sinalizadores indicando como tratar a propriedade “password”."
+msgstr ""
 
-#: ../clients/common/settings-docs.h.in:65
+#: ../clients/common/settings-docs.c.in:61
 msgid ""
 "Password used for EAP authentication methods, given as a byte array to allow "
 "passwords in other encodings than UTF-8 to be used. If both the \"password\" "
 "property and the \"password-raw\" property are specified, \"password\" is "
 "preferred."
 msgstr ""
-"Senha usada para métodos de autenticação EAP, dado como um vetor de bytes "
-"para permitir senhas em codificações diferentes do UTF-8 a serem usadas. Se "
-"ambas as propriedades “senha” e “password-raw forem especificadas, "
-"“password” é preferida."
 
-#: ../clients/common/settings-docs.h.in:66
+#: ../clients/common/settings-docs.c.in:62
 msgid "Flags indicating how to handle the \"password-raw\" property."
-msgstr "Sinalizadores indicando como tratar a propriedade “password-raw”."
+msgstr ""
 
-#: ../clients/common/settings-docs.h.in:67
+#: ../clients/common/settings-docs.c.in:63
 msgid ""
 "Specifies authentication flags to use in \"phase 1\" outer authentication "
 "using NMSetting8021xAuthFlags options. The individual TLS versions can be "
@@ -6789,14 +6186,8 @@ msgid ""
 "tls_disable_tlsv1_x settings. See the wpa_supplicant documentation for more "
 "details."
 msgstr ""
-"Especifica os sinalizadores de autenticação a usar na autenticação externa "
-"“fase 1” usando as opções de NMSetting8021xAuthFlags. As versões individuais "
-"de TLS podem ser desabilitadas explicitamente. Se um certo sinalizador de "
-"desabilitação de TLS não estiver definido, dependerá do suplicante permiti-"
-"lo ou proibi-lo. As opções TLS mapeiam as definições tls_disable_tlsv1_x. "
-"Veja a documentação de wpa_supplicant para mais detalhes."
 
-#: ../clients/common/settings-docs.h.in:68
+#: ../clients/common/settings-docs.c.in:64
 msgid ""
 "Enables or disables in-line provisioning of EAP-FAST credentials when FAST "
 "is specified as the EAP method in the \"eap\" property. Recognized values "
@@ -6805,26 +6196,16 @@ msgid ""
 "authenticated and unauthenticated provisioning).  See the wpa_supplicant "
 "documentation for more details."
 msgstr ""
-"Habilita ou desabilita provisionamento em-linha de credenciais EAP-FAST "
-"quando FAST está especificado como método EAP na propriedade “eap”. Valores "
-"reconhecidos são “0” (desabilitado), “1” (permitir provisionamento não "
-"autenticado), “2” permitir provisionamento autenticado) e “3” (permitir "
-"provisionamento autenticado e não autenticado). Veja a documentação de "
-"wpa_supplicant para mais detalhes."
 
-#: ../clients/common/settings-docs.h.in:69
+#: ../clients/common/settings-docs.c.in:65
 msgid ""
 "Forces use of the new PEAP label during key derivation.  Some RADIUS servers "
 "may require forcing the new PEAP label to interoperate with PEAPv1.  Set to "
 "\"1\" to force use of the new PEAP label.  See the wpa_supplicant "
 "documentation for more details."
 msgstr ""
-"Força o uso do novo rótulo PEAP durante a derivação de chave. Alguns "
-"servidores RADIUS podem exigir que se force o novo rótulo PEAP a interoperar "
-"com PEAPv1. Defina com “1” para forçar o uso do novo rótulo PEAP. Veja a "
-"documentação de wpa_supplicant para mais detalhes."
 
-#: ../clients/common/settings-docs.h.in:70
+#: ../clients/common/settings-docs.c.in:66
 msgid ""
 "Forces which PEAP version is used when PEAP is set as the EAP method in the "
 "\"eap\" property.  When unset, the version reported by the server will be "
@@ -6832,26 +6213,16 @@ msgid ""
 "the client to use a particular PEAP version.  To do so, this property may be "
 "set to \"0\" or \"1\" to force that specific PEAP version."
 msgstr ""
-"Força qual versão PEAP é usada quando PEAP está definido como o método EAP "
-"na propriedade “eap”. Quando indefinido, a versão relatada pelo servidor "
-"será usada. Algumas vezes, ao usar servidores RADIUS mais antigos, é "
-"necessário forçar o cliente a usar uma versão PEAP em particular. Para fazer "
-"isso, essa propriedade pode ser definida com “0” ou “1” para forçar aquela "
-"versão PEAP específica."
 
-#: ../clients/common/settings-docs.h.in:71
+#: ../clients/common/settings-docs.c.in:67
 msgid ""
 "List of strings to be matched against the altSubjectName of the certificate "
 "presented by the authentication server during the inner \"phase 2\" "
 "authentication. If the list is empty, no verification of the server "
 "certificate's altSubjectName is performed."
 msgstr ""
-"Lista de strings a serem comparadas com o altSubjectName do certificado "
-"apresentado pelo servidor de autenticação durante a autenticação interna "
-"“fase 2”. Se a lista estiver vazia, nenhuma verificação do altSubjectName do "
-"certificado do servidor é realizada."
 
-#: ../clients/common/settings-docs.h.in:72
+#: ../clients/common/settings-docs.c.in:68
 msgid ""
 "Specifies the allowed \"phase 2\" inner non-EAP authentication methods when "
 "an EAP method that uses an inner TLS tunnel is specified in the \"eap\" "
@@ -6860,14 +6231,8 @@ msgid ""
 "\"phase 2\" inner method requires specific parameters for successful "
 "authentication; see the wpa_supplicant documentation for more details."
 msgstr ""
-"Especifica os métodos de autenticação interno não EAP “fase 2” permitidos "
-"quando um método EAP que use um túnel TLS for especificado na propriedade "
-"“eap”. Os métodos não EAP “fase 2” reconhecidos são “pap”, “chap”, “mschap”, "
-"“mschapv2”, “gtc”, “otp”, “md5” e “tls”. Cada método interno “fase 2” requer "
-"parâmetros específicos para uma autenticação bem-sucedida; veja a "
-"documentação de wpa_supplicant para mais detalhes."
 
-#: ../clients/common/settings-docs.h.in:73
+#: ../clients/common/settings-docs.c.in:69
 msgid ""
 "Specifies the allowed \"phase 2\" inner EAP-based authentication methods "
 "when an EAP method that uses an inner TLS tunnel is specified in the \"eap\" "
@@ -6876,14 +6241,8 @@ msgid ""
 "requires specific parameters for successful authentication; see the "
 "wpa_supplicant documentation for more details."
 msgstr ""
-"Especifica os métodos de autenticação interno baseados em EAP “fase 2” "
-"permitidos quando um método EAP que use um túnel TLS for especificado na "
-"propriedade “eap”. Os métodos baseados em EAP “fase 2” reconhecidos são "
-"“md5”, “mschapv2”, “otp”, “gtc” e “tls”. Cada método interno “fase 2” requer "
-"parâmetros específicos para uma autenticação bem-sucedida; veja a "
-"documentação de wpa_supplicant para mais detalhes."
 
-#: ../clients/common/settings-docs.h.in:74
+#: ../clients/common/settings-docs.c.in:70
 msgid ""
 "Contains the \"phase 2\" CA certificate if used by the EAP method specified "
 "in the \"phase2-auth\" or \"phase2-autheap\" properties. Certificate data is "
@@ -6896,45 +6255,27 @@ msgid ""
 "method supports CA certificates, but this allows man-in-the-middle attacks "
 "and is NOT recommended."
 msgstr ""
-"Contém o certificado AC de “fase 2”, se usado pelo método EAP especificado "
-"nas propriedades “phase2-auth” ou “phase2-autheap”. Dados do certificado são "
-"especificados usando um “esquema”; atualmente, há suporte a dois: blob e "
-"caminho. Ao usar o esquema blob (que possui compatibilidade reversa com NM "
-"0.7.x), essa propriedade deve ser definida com os dados codificados com DER "
-"do certificado. Ao usar o esquema de caminho, essa propriedade deve ser "
-"definida com o caminho completo, codificado em UTF-8, do certificado, "
-"prefixado com a string “file://” e terminando com um byte NULO ao final. "
-"Essa propriedade pode ser desativada mesmo se o método EAP oferecer suporte "
-"a certificados AC, mas isso permite ataques “man-in-the-middle” e NÃO é "
-"recomendado."
 
-#: ../clients/common/settings-docs.h.in:75
+#: ../clients/common/settings-docs.c.in:71
 msgid ""
 "The password used to access the \"phase2\" CA certificate stored in \"phase2-"
 "ca-cert\" property. Only makes sense if the certificate is stored on a "
 "PKCS#11 token that requires a login."
 msgstr ""
-"A senha usada para acessar o certificado de AC de “fase 2” armazenado na "
-"propriedade “phase2-ca-cert”. Só faz sentido se o certificado está "
-"armazenado em um token PKCS#11 que exige um login."
 
-#: ../clients/common/settings-docs.h.in:76
+#: ../clients/common/settings-docs.c.in:72
 msgid ""
 "Flags indicating how to handle the \"phase2-ca-cert-password\" property."
 msgstr ""
-"Sinalizadores indicando como tratar a propriedade “phase2-ca-cert-password”."
 
-#: ../clients/common/settings-docs.h.in:77
+#: ../clients/common/settings-docs.c.in:73
 msgid ""
 "UTF-8 encoded path to a directory containing PEM or DER formatted "
 "certificates to be added to the verification chain in addition to the "
 "certificate specified in the \"phase2-ca-cert\" property."
 msgstr ""
-"Caminho codificado em UTF-8 para um diretório contendo certificados "
-"formatados em PEM ou DER para serem adicionados à cadeia de verificação em "
-"adição ao certificado especificado na propriedade “phase2-ca-cert”."
 
-#: ../clients/common/settings-docs.h.in:78
+#: ../clients/common/settings-docs.c.in:74
 msgid ""
 "Contains the \"phase 2\" client certificate if used by the EAP method "
 "specified in the \"phase2-auth\" or \"phase2-autheap\" properties. "
@@ -6947,36 +6288,20 @@ msgid ""
 "unset even if the EAP method supports CA certificates, but this allows man-"
 "in-the-middle attacks and is NOT recommended."
 msgstr ""
-"Contém o certificado de cliente “fase 2”, se usado pelo método EAP "
-"especificado nas propriedades “phase2-auth” ou “phase2-autheap”. Dados do "
-"certificado são especificados usando um “esquema”; atualmente, há suporte a "
-"dois: blob e caminho. Ao usar o esquema blob (que possui compatibilidade "
-"reversa com NM 0.7.x), essa propriedade deve ser definida com os dados "
-"codificados com DER do certificado. Ao usar o esquema de caminho, essa "
-"propriedade deve ser definida com o caminho completo, codificado em UTF-8, "
-"do certificado, prefixado com a string “file://” e terminando com um byte "
-"NULO ao final. Essa propriedade pode ser desativada mesmo se o método EAP "
-"oferecer suporte a certificados AC, mas isso permite ataques “man-in-the-"
-"middle” e NÃO é recomendado."
 
-#: ../clients/common/settings-docs.h.in:79
+#: ../clients/common/settings-docs.c.in:75
 msgid ""
 "The password used to access the \"phase2\" client certificate stored in "
 "\"phase2-client-cert\" property. Only makes sense if the certificate is "
 "stored on a PKCS#11 token that requires a login."
 msgstr ""
-"A senha usada para acessar o certificado de cliente de “fase 2” armazenado "
-"na propriedade “phase2-client-cert”. Só faz sentido se o certificado está "
-"armazenado em um token PKCS#11 que exige um login."
 
-#: ../clients/common/settings-docs.h.in:80
+#: ../clients/common/settings-docs.c.in:76
 msgid ""
 "Flags indicating how to handle the \"phase2-client-cert-password\" property."
 msgstr ""
-"Sinalizadores indicando como tratar a propriedade “phase2-client-cert-"
-"password”."
 
-#: ../clients/common/settings-docs.h.in:81
+#: ../clients/common/settings-docs.c.in:77
 msgid ""
 "Constraint for server domain name. If set, this FQDN is used as a suffix "
 "match requirement for dNSName element(s) of the certificate presented by the "
@@ -6985,15 +6310,8 @@ msgid ""
 "present, this constraint is matched against SubjectName CN using same suffix "
 "match comparison."
 msgstr ""
-"Restrição para o nome de domínio do servidor. Se definido, esse FQDN é usado "
-"como exigência correspondência de sufixo para elemento(s) dNSName do "
-"certificado apresentado pelo servidor de autenticação durante a autenticação "
-"interna “fase 2”. Se um dNSName correspondente for encontrado, essa "
-"restrição é atendida. Se nenhum valor dNSName estiver presente, essa "
-"restrição é correspondida com CN do SubjectName usando a comparação de "
-"correspondência de sufixo."
 
-#: ../clients/common/settings-docs.h.in:82
+#: ../clients/common/settings-docs.c.in:78
 msgid ""
 "Contains the \"phase 2\" inner private key when the \"phase2-auth\" or "
 "\"phase2-autheap\" property is set to \"tls\". Key data is specified using a "
@@ -7011,42 +6329,20 @@ msgid ""
 "\"phase2-private-key-password\" property must be set to the password used to "
 "decode the PKCS#12 private key and certificate."
 msgstr ""
-"Contém a chave privada interna “fase 2” quando a propriedade “phase2-auth” "
-"ou “phase2-autheap” está definida com “tls”. Dados da chave são "
-"especificados usando um “esquema”; atualmente, há suporte a dois: blob e "
-"caminho. Ao usar o esquema blob e chaves privadas, essa propriedade deve ser "
-"definida com os dados codificados com PEM criptografado da chave. Ao usar "
-"chaves privadas com o esquema de caminho, essa propriedade deve ser definida "
-"com o caminho completo, codificado em UTF-8, da chave, prefixado com a "
-"string “file://” e terminando com um byte NULO ao final. Ao usar chaves "
-"privadas no formato PKCS#12 e esquema blob, essa propriedade deve ser "
-"definida com os dados PKCS#12 e a propriedade “phase2-private-key-password” "
-"deve estar definida com a senha usada para descriptografar a chave e o "
-"certificado PKCS#12. Ao usar arquivos PKCS#12 e o esquema de caminho, essa "
-"propriedade deve ser definida com o caminho completo, codificado em UTF-8, "
-"da chave, prefixado com a string “file://” e terminando com um byte NULO ao "
-"final, e assim como no esquema blob, a propriedade “phase2-private-key-"
-"password” deve estar definida com a senha usada para decodificar o "
-"certificado e a chave privada PKCS#12."
-
-#: ../clients/common/settings-docs.h.in:83
+
+#: ../clients/common/settings-docs.c.in:79
 msgid ""
 "The password used to decrypt the \"phase 2\" private key specified in the "
 "\"phase2-private-key\" property when the private key either uses the path "
 "scheme, or is a PKCS#12 format key."
 msgstr ""
-"A senha usada para descriptografar a chave privada “fase 2” especificada na "
-"propriedade “phase2-private-key” quando a chave privada usa o esquema de "
-"caminho ou é uma chave formato PKCS#12."
 
-#: ../clients/common/settings-docs.h.in:84
+#: ../clients/common/settings-docs.c.in:80
 msgid ""
 "Flags indicating how to handle the \"phase2-private-key-password\" property."
 msgstr ""
-"Sinalizadores indicando como tratar a propriedade “phase2-private-key-"
-"password”."
 
-#: ../clients/common/settings-docs.h.in:85
+#: ../clients/common/settings-docs.c.in:81
 msgid ""
 "Substring to be matched against the subject of the certificate presented by "
 "the authentication server during the inner \"phase 2\" authentication. When "
@@ -7054,23 +6350,17 @@ msgid ""
 "performed.  This property provides little security, if any, and its use is "
 "deprecated in favor of NMSetting8021x:phase2-domain-suffix-match."
 msgstr ""
-"Substring a ser comparada com o sujeito do certificado apresentado pelo "
-"servidor de autenticação durante a autenticação interna “fase 2”. Quando não "
-"definido, nenhuma verificação do sujeito do certificado do servidor de "
-"autenticação é realizada. Essa propriedade fornece pouca segurança, se "
-"oferecer alguma, e seu uso está obsoleto em favor de NMSetting8021x:phase2-"
-"domain-suffix-match."
 
-#: ../clients/common/settings-docs.h.in:86
+#: ../clients/common/settings-docs.c.in:82
 msgid "PIN used for EAP authentication methods."
-msgstr "PIN usado para métodos de autenticação EAP."
+msgstr ""
 
-#: ../clients/common/settings-docs.h.in:87
-#: ../clients/common/settings-docs.h.in:191
+#: ../clients/common/settings-docs.c.in:83
+#: ../clients/common/settings-docs.c.in:186
 msgid "Flags indicating how to handle the \"pin\" property."
-msgstr "Sinalizadores indicando como tratar a propriedade “pin”."
+msgstr ""
 
-#: ../clients/common/settings-docs.h.in:88
+#: ../clients/common/settings-docs.c.in:84
 msgid ""
 "Contains the private key when the \"eap\" property is set to \"tls\". Key "
 "data is specified using a \"scheme\"; two are currently supported: blob and "
@@ -7091,44 +6381,19 @@ msgid ""
 "users.  Private keys should always be encrypted with a private key password "
 "to prevent unauthorized access to unencrypted private key data."
 msgstr ""
-"Contém a chave privada quando a propriedade “eap” está definida com “tls”. "
-"Dados da chave são especificados usando um “esquema”; atualmente, há suporte "
-"a dois: blob e caminho. Ao usar o esquema blob e chaves privadas, essa "
-"propriedade deve ser definida com os dados da chave, codificados com PEM "
-"criptografada. Ao usar chaves privadas com o esquema de caminho, essa "
-"propriedade deve ser definida com o caminho completo, codificado em UTF-8, "
-"da chave, prefixado com a string “file://” e terminando com um byte NULO ao "
-"final. Ao usar chaves privadas no formato PKCS#12 e esquema blob, essa "
-"propriedade deve ser definida com os dados PKCS#12 e a propriedade “private-"
-"key-password” deve estar definida com a senha usada para descriptografar a "
-"chave e o certificado PKCS#12. Ao usar arquivos PKCS#12 e o esquema de "
-"caminho, essa propriedade deve ser definida com o caminho completo, "
-"codificado em UTF-8, da chave, prefixado com a string “file://” e terminando "
-"com um byte NULO ao final, e assim como no esquema blob, a propriedade "
-"“private-key-password” deve estar definida com a senha usada para "
-"decodificar o certificado e a chave privada PKCS#12. AVISO: “private-key” "
-"não é uma propriedade “secret” e, portanto, dados de chave privada "
-"descriptografada usando o esquema BLOB podem ser lidos por usuários sem "
-"privilégios. Chaves privadas sempre devem ser criptografadas com uma senha "
-"de chave privada para evitar acesso não autorizado a dados da chave privada "
-"não criptografada."
-
-#: ../clients/common/settings-docs.h.in:89
+
+#: ../clients/common/settings-docs.c.in:85
 msgid ""
 "The password used to decrypt the private key specified in the \"private-key"
 "\" property when the private key either uses the path scheme, or if the "
 "private key is a PKCS#12 format key."
 msgstr ""
-"A senha usada para descriptografar a chave privada especificada na "
-"propriedade “private-key” quando a chave privada usa o esquema de caminho ou "
-"se a chave privada é uma chave formato PKCS#12."
 
-#: ../clients/common/settings-docs.h.in:90
+#: ../clients/common/settings-docs.c.in:86
 msgid "Flags indicating how to handle the \"private-key-password\" property."
 msgstr ""
-"Sinalizadores indicando como tratar a propriedade “private-key-password”."
 
-#: ../clients/common/settings-docs.h.in:91
+#: ../clients/common/settings-docs.c.in:87
 msgid ""
 "Substring to be matched against the subject of the certificate presented by "
 "the authentication server. When unset, no verification of the authentication "
@@ -7136,13 +6401,8 @@ msgid ""
 "security, if any, and its use is deprecated in favor of NMSetting8021x:"
 "domain-suffix-match."
 msgstr ""
-"Substring a ser comparada com o sujeito do certificado apresentado pelo "
-"servidor de autenticação. Quando não definido, nenhuma verificação do "
-"sujeito do certificado do servidor de autenticação é realizada. Essa "
-"propriedade fornece pouca segurança, se oferecer alguma, e seu uso está "
-"obsoleto em favor de NMSetting8021x:domain-suffix-match."
 
-#: ../clients/common/settings-docs.h.in:92
+#: ../clients/common/settings-docs.c.in:88
 msgid ""
 "When TRUE, overrides the \"ca-path\" and \"phase2-ca-path\" properties using "
 "the system CA directory specified at configure time with the --system-ca-"
@@ -7153,34 +6413,15 @@ msgid ""
 "\"ca-cert\" and \"phase2-ca-cert\" properties instead (sets ca_cert/ca_cert2 "
 "options for wpa_supplicant)."
 msgstr ""
-"Quando VERDADEIRO, sobrepõe as propriedades “ca-path” e “phase2-ca-path” "
-"usando o diretório de AC do sistema especificado em tempo de configuração "
-"com a opção --system-ca-path. Os certificados neste diretório são "
-"adicionados à cadeia de verificação em adição a quaisquer certificados "
-"especificados pelas propriedades “ca-cert” e “phase2-ca-cert”. Se o caminho "
-"fornecido com --system-ca-path for um nome de arquivo (pacote dos "
-"certificados de AC confiados), ele sobrepõe as propriedades “ca-cert” e "
-"“phase2-ca-cert” (define as opções ca_cert/ca_cert2 de wpa_supplicant)."
-
-#: ../clients/common/settings-docs.h.in:93
-msgid ""
-"When TRUE, enforce auto-negotiation of speed and duplex mode. If \"speed\" "
-"and \"duplex\" properties are both specified, only that single mode will be "
-"advertised and accepted during the link auto-negotiation process: this works "
-"only for BASE-T 802.3 specifications and is useful for enforcing gigabits "
-"modes, as in these cases link negotiation is mandatory. When FALSE, \"speed"
-"\" and \"duplex\" properties should be both set or link configuration will "
-"be skipped."
-msgstr ""
-"Quando VERDADEIRO, aplica a autonegociação da velocidade e do modo duplex. "
-"Se as propriedades “speed” e “duplex” forem especificadas, somente esse modo "
-"único será anunciado e aceito durante o processo de autonegociação do link: "
-"isso funciona apenas para as especificações BASE-T 802.3 e é útil para impor "
-"modos de gigabits, como nesses casos, a negociação de links é obrigatória. "
-"Quando FALSO, as propriedades “speed” e “duplex” devem ser definidas ou a "
-"configuração do link será ignorada."
-
-#: ../clients/common/settings-docs.h.in:94
+
+#: ../clients/common/settings-docs.c.in:89
+msgid ""
+"If TRUE, enforce auto-negotiation of port speed and duplex mode.  If FALSE, "
+"\"speed\" and \"duplex\" properties should be both set or link configuration "
+"will be skipped."
+msgstr ""
+
+#: ../clients/common/settings-docs.c.in:90
 msgid ""
 "If specified, request that the device use this MAC address instead. This is "
 "known as MAC cloning or spoofing. Beside explicitly specifying a MAC "
@@ -7196,103 +6437,52 @@ msgid ""
 "D-Bus, this field is expressed as \"assigned-mac-address\" or the deprecated "
 "\"cloned-mac-address\"."
 msgstr ""
-"Se especificado, exige que o dispositivo use esse endereço MAC. Isso é "
-"conhecido como clonagem de MAC ou MAC spoofing. Além de explicitamente "
-"especificar um endereço MAC, há suporte aos valores especiais “preserve”, "
-"“permanent”, “random” e “stable”. “preserve” significa não tocar o endereço "
-"MAC na ativação. “permanent” significa usar o endereço de hardware "
-"permanente se o dispositivo possuir um (do contrário, isso é tratado como "
-"“preserve”). “random” cria um endereço MAC aleatório a cada conexão. "
-"“stable” cria um endereço MAC em hash baseado no connection.stable-id e uma "
-"chave dependente da máquina. Se não especificado, o valor pode ser "
-"sobrescrito via padrões globais, veja o manual do NetworkManager.conf. Se "
-"ainda estiver não especificado, usa como padrão “preserve” (versões antigas "
-"do NetworkManager podem usar um valor padrão diferente). No D-Bus, esse "
-"campo é expressado como “assigned-mac-address” ou o obsoleto “cloned-mac-"
-"address”."
-
-#: ../clients/common/settings-docs.h.in:95
-msgid ""
-"When a value is set, either \"half\" or \"full\", configures the device to "
-"use the specified duplex mode. If \"auto-negotiate\" is \"yes\" the "
-"specified duplex mode will be the only one advertised during link "
-"negotiation: this works only for BASE-T 802.3 specifications and is useful "
-"for enforcing gigabits modes, as in these cases link negotiation is "
-"mandatory. If the value is unset (the default), the link configuration will "
-"be either skipped (if \"auto-negotiate\" is \"no\", the default) or will be "
-"auto-negotiated (if \"auto-negotiate\" is \"yes\") and the local device will "
-"advertise all the supported duplex modes. Must be set together with the "
-"\"speed\" property if specified. Before specifying a duplex mode be sure "
-"your device supports it."
-msgstr ""
-"Quando um valor é definido, “half” ou “full”, configura o dispositivo para "
-"usar o modo duplex especificado. Se “auto-negotiate” for “yes”, o modo "
-"duplex especificado será o único anunciado durante a negociação de links: "
-"isso funciona apenas para as especificações BASE-T 802.3 e é útil para impor "
-"modos de gigabits, já que nesses casos a negociação de links é obrigatória. "
-"Se o valor não for definido (o padrão), a configuração do link será ignorada "
-"(se “negociar automaticamente” for “não”, o padrão) ou será negociada "
-"automaticamente (se “negociar automaticamente” for “sim”) e o dispositivo "
-"local anunciará todos os modos duplex suportados. Deve ser definido junto "
-"com a propriedade “speed”, se especificada. Antes de especificar um modo "
-"duplex, certifique-se de que o seu dispositivo o suporta."
-
-#: ../clients/common/settings-docs.h.in:97
+
+#: ../clients/common/settings-docs.c.in:91
+msgid ""
+"Can be specified only when \"auto-negotiate\" is \"off\". In that case, "
+"statically configures the device to use that specified duplex mode, either "
+"\"half\" or \"full\". Must be set together with the \"speed\" property if "
+"specified. Before specifying a duplex mode be sure your device supports it."
+msgstr ""
+
+#: ../clients/common/settings-docs.c.in:93
 msgid ""
 "If specified, this connection will only apply to the Ethernet device whose "
 "permanent MAC address matches. This property does not change the MAC address "
 "of the device (i.e. MAC spoofing)."
 msgstr ""
-"Se especificado, essa conexão se aplicará apenas ao dispositivo Ethernet "
-"cujo endereço MAC permanente coincidir. Essa propriedade não alterar o "
-"endereço MAC do dispositivo (i.e. MAC spoofing)."
 
-#: ../clients/common/settings-docs.h.in:98
+#: ../clients/common/settings-docs.c.in:94
 msgid ""
 "If specified, this connection will never apply to the Ethernet device whose "
 "permanent MAC address matches an address in the list.  Each MAC address is "
 "in the standard hex-digits-and-colons notation (00:11:22:33:44:55)."
 msgstr ""
-"Se especificado, essa conexão nunca se aplicará ao dispositivo Ethernet cujo "
-"endereço MAC permanente corresponda a um endereço na lista. Cada endereço "
-"MAC está na notação padrão de dígitos hexadecimais e dois pontos "
-"(00:11:22:33:44:55)."
 
-#: ../clients/common/settings-docs.h.in:101
+#: ../clients/common/settings-docs.c.in:97
 msgid ""
 "Specific port type to use if the device supports multiple attachment "
 "methods.  One of \"tp\" (Twisted Pair), \"aui\" (Attachment Unit Interface), "
 "\"bnc\" (Thin Ethernet) or \"mii\" (Media Independent Interface). If the "
 "device supports only one port type, this setting is ignored."
 msgstr ""
-"Tipo de porta específico para usar se o dispositivo oferecer suporte a "
-"vários métodos de anexo. Um de “tp” (Par trançado), “aui” (Attachment Unit "
-"Interface), “bnc” (Thin Ethernet) ou “mii” (Media Independent Interface). Se "
-"o dispositivo oferecer suporte a apenas um tipo de porta, essa configuração "
-"será ignorada."
 
-#: ../clients/common/settings-docs.h.in:102
+#: ../clients/common/settings-docs.c.in:98
 msgid ""
 "s390 network device type; one of \"qeth\", \"lcs\", or \"ctc\", representing "
 "the different types of virtual network devices available on s390 systems."
 msgstr ""
-"Tipo de dispositivo de rede s390; um entre “qeth”, “lcs” ou “ctc”, "
-"representando os tipos diferentes de dispositivos de rede virtual "
-"disponíveis em sistemas s390."
 
-#: ../clients/common/settings-docs.h.in:103
+#: ../clients/common/settings-docs.c.in:99
 msgid ""
 "Dictionary of key/value pairs of s390-specific device options.  Both keys "
 "and values must be strings.  Allowed keys include \"portno\", \"layer2\", "
 "\"portname\", \"protocol\", among others.  Key names must contain only "
 "alphanumeric characters (ie, [a-zA-Z0-9])."
 msgstr ""
-"Dicionários de pares chave/valor de opções de dispositivos específicos de "
-"s390. Chaves e valores devem ser textos. Chaves permitidas incluem “portno”, "
-"“layer2”, “portname”, “protocol”, dentre outras. Nomes de chaves devem "
-"conter apenas caracteres alfanuméricos (ou seja, [a-zA-Z0-9])."
 
-#: ../clients/common/settings-docs.h.in:104
+#: ../clients/common/settings-docs.c.in:100
 msgid ""
 "Identifies specific subchannels that this network device uses for "
 "communication with z/VM or s390 host.  Like the \"mac-address\" property for "
@@ -7301,41 +6491,17 @@ msgid ""
 "contain exactly 3 strings, and each string may only be composed of "
 "hexadecimal characters and the period (.) character."
 msgstr ""
-"Identifica subcanais específicos que esse dispositivo de rede usa para "
-"comunicação com o host z/VM ou s390. Como a propriedade “mac-address” para "
-"dispositivos não z/VM, esta propriedade pode ser usada para garantir que "
-"esta conexão se aplique apenas ao dispositivo de rede que usa esses "
-"subcanais. A lista deve conter exatamente 3 strings, e cada string só pode "
-"ser composta por caracteres hexadecimais e o caractere de ponto (.)."
-
-#: ../clients/common/settings-docs.h.in:105
-msgid ""
-"When a value grater than 0 is set, configures the device to use the "
-"specified speed. If \"auto-negotiate\" is \"yes\" the specified speed will "
-"be the only one advertised during link negotiation: this works only for BASE-"
-"T 802.3 specifications and is useful for enforcing gigabit speeds, as in "
-"this case link negotiation is mandatory. If the value is unset (0, the "
-"default), the link configuration will be either skipped (if \"auto-negotiate"
-"\" is \"no\", the default) or will be auto-negotiated (if \"auto-negotiate\" "
-"is \"yes\") and the local device will advertise all the supported speeds. In "
-"Mbit/s, ie 100 == 100Mbit/s. Must be set together with the \"duplex\" "
-"property when non-zero. Before specifying a speed value be sure your device "
-"supports it."
-msgstr ""
-"Quando um valor maior que 0 é definido, configura o dispositivo para usar a "
-"velocidade especificada. Se “auto-negotiate” for “yes”, a velocidade "
-"especificada será a única anunciada durante a negociação de links: isso "
-"funciona apenas para as especificações BASE-T 802.3 e é útil para impor "
-"velocidades de gigabit, já que neste caso a negociação de links é "
-"obrigatória. Se o valor não estiver definido (0, o padrão), a configuração "
-"do link será ignorada (se “auto-negotiate” for “no”, o padrão) ou será "
-"negociada automaticamente (se “auto-negotiate” for “yes” “) e o dispositivo "
-"local anunciará todas as velocidades suportadas. Em Mbit/s, ou seja, 100 == "
-"100Mbit/s. Deve ser definido junto com a propriedade “duplex” quando "
-"diferente de zero. Antes de especificar um valor de velocidade, certifique-"
-"se de que o seu dispositivo o suporta."
-
-#: ../clients/common/settings-docs.h.in:106
+
+#: ../clients/common/settings-docs.c.in:101
+msgid ""
+"Can be set to a value greater than zero only when \"auto-negotiate\" is \"off"
+"\". In that case, statically configures the device to use that specified "
+"speed. In Mbit/s, ie 100 == 100Mbit/s. Must be set together with the \"duplex"
+"\" property when non-zero. Before specifying a speed value be sure your "
+"device supports it."
+msgstr ""
+
+#: ../clients/common/settings-docs.c.in:102
 msgid ""
 "The NMSettingWiredWakeOnLan options to enable. Not all devices support all "
 "options. May be any combination of NM_SETTING_WIRED_WAKE_ON_LAN_PHY (0x2), "
@@ -7347,84 +6513,64 @@ msgid ""
 "use global settings) and NM_SETTING_WIRED_WAKE_ON_LAN_IGNORE (0x8000) (to "
 "disable management of Wake-on-LAN in NetworkManager)."
 msgstr ""
-"As opções de NMSettingWiredWakeOnLan para habilitar. Nem todos os "
-"dispositivos oferecem suporte a todas as opções. Pode ser qualquer "
-"combinação de NM_SETTING_WIRED_WAKE_ON_LAN_PHY (0x2), "
-"NM_SETTING_WIRED_WAKE_ON_LAN_UNICAST (0x4), "
-"NM_SETTING_WIRED_WAKE_ON_LAN_MULTICAST (0x8), "
-"NM_SETTING_WIRED_WAKE_ON_LAN_BROADCAST (0x10), "
-"NM_SETTING_WIRED_WAKE_ON_LAN_ARP (0x20), NM_SETTING_WIRED_WAKE_ON_LAN_MAGIC "
-"(0x40) ou valores especificais NM_SETTING_WIRED_WAKE_ON_LAN_DEFAULT (0x1) "
-"(para usar configurações globais) e NM_SETTING_WIRED_WAKE_ON_LAN_IGNORE "
-"(0x8000) (para desabilitar gerenciamento de Wake-on-LAN no NetworkManager)."
 
-#: ../clients/common/settings-docs.h.in:107
+#: ../clients/common/settings-docs.c.in:103
 msgid ""
 "If specified, the password used with magic-packet-based Wake-on-LAN, "
 "represented as an Ethernet MAC address.  If NULL, no password will be "
 "required."
 msgstr ""
-"Se especificado, a senha usada com Wake-on-Lan baseada em pacote mágico, "
-"representada como um endereço MAC de Ethernet. Se NULO, nenhuma senha será "
-"exigida."
 
-#: ../clients/common/settings-docs.h.in:108
+#: ../clients/common/settings-docs.c.in:104
 msgid "Encapsulation of ADSL connection.  Can be \"vcmux\" or \"llc\"."
-msgstr "Encapsulamento da conexão ADSL. Pode ser “vcmux” ou “llc”."
+msgstr ""
 
-#: ../clients/common/settings-docs.h.in:110
+#: ../clients/common/settings-docs.c.in:106
 msgid "Password used to authenticate with the ADSL service."
-msgstr "Senha usada para autenticar com o serviço ADSL."
+msgstr ""
 
-#: ../clients/common/settings-docs.h.in:112
+#: ../clients/common/settings-docs.c.in:108
 msgid "ADSL connection protocol.  Can be \"pppoa\", \"pppoe\" or \"ipoatm\"."
-msgstr "Protocolo de conexão ADSL. Pode ser “pppoa”, “pppoe” ou “ipoatm”."
+msgstr ""
 
-#: ../clients/common/settings-docs.h.in:113
+#: ../clients/common/settings-docs.c.in:109
 msgid "Username used to authenticate with the ADSL service."
-msgstr "Nome de usuário usado para autenticar com o serviço ADSL."
+msgstr ""
 
-#: ../clients/common/settings-docs.h.in:114
+#: ../clients/common/settings-docs.c.in:110
 msgid "VCI of ADSL connection"
-msgstr "VCI de conexão ADSL"
+msgstr ""
 
-#: ../clients/common/settings-docs.h.in:115
+#: ../clients/common/settings-docs.c.in:111
 msgid "VPI of ADSL connection"
-msgstr "VPI de conexão ADSL"
+msgstr ""
 
-#: ../clients/common/settings-docs.h.in:116
+#: ../clients/common/settings-docs.c.in:112
 msgid "The Bluetooth address of the device."
-msgstr "O endereço Bluetooth do dispositivo."
+msgstr ""
 
-#: ../clients/common/settings-docs.h.in:118
+#: ../clients/common/settings-docs.c.in:114
 msgid ""
 "Either \"dun\" for Dial-Up Networking connections or \"panu\" for Personal "
 "Area Networking connections to devices supporting the NAP profile."
 msgstr ""
-"“dun” para conexões de Linha Discada (Dial-Up Networking) ou “panu” para "
-"conexões de Rede de Área Pessoal (Personal Area Networking) a dispositivos "
-"que ofereçam suporte a perfil NAP."
 
-#: ../clients/common/settings-docs.h.in:120
+#: ../clients/common/settings-docs.c.in:116
 msgid ""
 "Dictionary of key/value pairs of bonding options.  Both keys and values must "
 "be strings. Option names must contain only alphanumeric characters (ie, [a-"
 "zA-Z0-9])."
 msgstr ""
-"Dicionário de pares chave/valor de opções de vinculação. As chaves e os "
-"valores devem ser strings. Os nomes de opções devem conter apenas caracteres "
-"alfanuméricos (ou seja, [a-zA-Z0-9])."
 
-#: ../clients/common/settings-docs.h.in:121
+#: ../clients/common/settings-docs.c.in:117
 msgid "The Ethernet MAC address aging time, in seconds."
-msgstr "O tempo de expiração de endereço MAC Ethernet, em segundos."
+msgstr ""
 
-#: ../clients/common/settings-docs.h.in:122
+#: ../clients/common/settings-docs.c.in:118
 msgid "The Spanning Tree Protocol (STP) forwarding delay, in seconds."
 msgstr ""
-"O atraso de encaminhamento do Spanning Tree Protocol (STP), em segundos."
 
-#: ../clients/common/settings-docs.h.in:123
+#: ../clients/common/settings-docs.c.in:119
 msgid ""
 "A mask of group addresses to forward. Usually, group addresses in the range "
 "from 01:80:C2:00:00:00 to 01:80:C2:00:00:0F are not forwarded according to "
@@ -7432,18 +6578,12 @@ msgid ""
 "address in that range that must be forwarded. The mask can't have bits 0, 1 "
 "or 2 set because they are used for STP, MAC pause frames and LACP."
 msgstr ""
-"Uma máscara de endereços de grupo para encaminhar. Geralmente, os endereços "
-"de grupo no intervalo de 01:80:C2:00:00:00 a 01:80:C2:00:00:0F não são "
-"encaminhados de acordo com os padrões. Esta propriedade é uma máscara de 16 "
-"bits, cada uma correspondente a um endereço de grupo nesse intervalo que "
-"deve ser encaminhado. A máscara não pode ter bits 0, 1 ou 2 definidos porque "
-"são usados para o STP, quadros de pausa de MAC e LACP."
 
-#: ../clients/common/settings-docs.h.in:124
+#: ../clients/common/settings-docs.c.in:120
 msgid "The Spanning Tree Protocol (STP) hello time, in seconds."
-msgstr "O tempo de saudação do Spanning Tree Protocol (STP), em segundos."
+msgstr ""
 
-#: ../clients/common/settings-docs.h.in:125
+#: ../clients/common/settings-docs.c.in:121
 msgid ""
 "If specified, the MAC address of bridge. When creating a new bridge, this "
 "MAC address will be set. If this field is left unspecified, the \"ethernet."
@@ -7452,146 +6592,100 @@ msgid ""
 "the MAC address of the bridge later while activating the bridge. Hence, this "
 "property is deprecated. Deprecated: 1"
 msgstr ""
-"Se especificado, o endereço MAC da ponte. Ao criar uma nova ponte, este "
-"endereço MAC será definido. Se este campo for deixado sem especificação, o "
-"“ethernet.cloned-mac-address” será passado para gerar o endereço MAC "
-"inicial. Observe que a configuração “ethernet.cloned-mac-address” substitui "
-"de qualquer maneira o endereço MAC da ponte mais tarde, ao ativar a ponte. "
-"Portanto, esta propriedade está obsoleta. Obsoleto: 1"
 
-#: ../clients/common/settings-docs.h.in:126
+#: ../clients/common/settings-docs.c.in:122
 msgid "The Spanning Tree Protocol (STP) maximum message age, in seconds."
 msgstr ""
-"O tempo de expiração máximo de mensagem do Spanning Tree Protocol (STP), em "
-"segundos."
 
-#: ../clients/common/settings-docs.h.in:127
+#: ../clients/common/settings-docs.c.in:123
 msgid ""
 "Controls whether IGMP snooping is enabled for this bridge. Note that if "
 "snooping was automatically disabled due to hash collisions, the system may "
 "refuse to enable the feature until the collisions are resolved."
 msgstr ""
-"Controla se o IGMP snooping está habilitado para esta ponte. Observe que se "
-"o snooping foi automaticamente desativado devido a colisões de hash, o "
-"sistema pode se recusar a habilitar o recurso até que as colisões sejam "
-"resolvidas."
 
-#: ../clients/common/settings-docs.h.in:129
+#: ../clients/common/settings-docs.c.in:125
 msgid ""
 "Sets the Spanning Tree Protocol (STP) priority for this bridge.  Lower "
 "values are \"better\"; the lowest priority bridge will be elected the root "
 "bridge."
 msgstr ""
-"Define a prioridade de Spanning Tree Protocol (STP) para essa ponte. Valores "
-"mais baixos são “melhores”; a ponte de prioridade mais baixa será eleita a "
-"ponte raiz."
 
-#: ../clients/common/settings-docs.h.in:130
+#: ../clients/common/settings-docs.c.in:126
 msgid ""
 "Controls whether Spanning Tree Protocol (STP) is enabled for this bridge."
 msgstr ""
-"Controla se Spanning Tree Protocol (STP) está habilidade para essa ponte."
 
-#: ../clients/common/settings-docs.h.in:131
+#: ../clients/common/settings-docs.c.in:127
 msgid ""
 "Enables or disables \"hairpin mode\" for the port, which allows frames to be "
 "sent back out through the port the frame was received on."
 msgstr ""
-"Habilita ou desabilita o “modo hairpin” para a porta, o que permite que os "
-"quadros sejam enviados de volta pela porta na qual o quadro foi recebido."
 
-#: ../clients/common/settings-docs.h.in:133
+#: ../clients/common/settings-docs.c.in:129
 msgid ""
 "The Spanning Tree Protocol (STP) port cost for destinations via this port."
 msgstr ""
-"O custo de porta da Spanning Tree Protocol (STP) para destinos por essa "
-"porta."
 
-#: ../clients/common/settings-docs.h.in:134
+#: ../clients/common/settings-docs.c.in:130
 msgid "The Spanning Tree Protocol (STP) priority of this bridge port."
-msgstr "A prioridade de Spanning Tree Protocol (STP) desta porta de ponte."
+msgstr ""
 
-#: ../clients/common/settings-docs.h.in:135
-#: ../clients/common/settings-docs.h.in:184
-#: ../clients/common/settings-docs.h.in:196
+#: ../clients/common/settings-docs.c.in:131
+#: ../clients/common/settings-docs.c.in:179
+#: ../clients/common/settings-docs.c.in:191
 msgid ""
 "If non-zero, only transmit packets of the specified size or smaller, "
 "breaking larger packets up into multiple frames."
 msgstr ""
-"Se não zero, transmite apenas pacotes do tamanho especificado ou menor, "
-"quebrando pacotes maiores em múltiplos quadros."
 
-#: ../clients/common/settings-docs.h.in:137
+#: ../clients/common/settings-docs.c.in:133
 msgid ""
 "The number to dial to establish the connection to the CDMA-based mobile "
 "broadband network, if any.  If not specified, the default number (#777) is "
 "used when required."
 msgstr ""
-"O número a ser discado para estabelecer a conexão à rede de banda larga "
-"móvel baseada em CDMA, se houver. Se não for especificado, o número padrão "
-"(#777) é usado quando necessário."
 
-#: ../clients/common/settings-docs.h.in:138
-#: ../clients/common/settings-docs.h.in:188
+#: ../clients/common/settings-docs.c.in:134
+#: ../clients/common/settings-docs.c.in:183
 msgid ""
 "The password used to authenticate with the network, if required.  Many "
 "providers do not require a password, or accept any password.  But if a "
 "password is required, it is specified here."
 msgstr ""
-"A senha usada para autenticar com a rede, se necessário. Muitos provedores "
-"não requerem uma senha ou aceitam qualquer senha. Mas se uma senha for "
-"necessária, ela é especificada aqui."
 
-#: ../clients/common/settings-docs.h.in:140
-#: ../clients/common/settings-docs.h.in:194
+#: ../clients/common/settings-docs.c.in:136
+#: ../clients/common/settings-docs.c.in:189
 msgid ""
 "The username used to authenticate with the network, if required.  Many "
 "providers do not require a username, or accept any username.  But if a "
 "username is required, it is specified here."
 msgstr ""
-"O nome de usuário usado para autenticar com a rede, se necessário. Muitos "
-"provedores não requerem um nome de usuário ou aceitam qualquer nome de "
-"usuário. Mas se um nome de usuário for necessário, ele é especificado aqui."
 
-#: ../clients/common/settings-docs.h.in:141
+#: ../clients/common/settings-docs.c.in:137
 msgid ""
 "The number of retries for the authentication. Zero means to try "
 "indefinitely; -1 means to use a global default. If the global default is not "
 "set, the authentication retries for 3 times before failing the connection. "
 "Currently this only applies to 802-1x authentication."
 msgstr ""
-"O número de tentativas para a autenticação. Zero significa tentar "
-"indefinidamente; -1 significa usar um padrão global. Se o padrão global não "
-"estiver definido, a autenticação tentará 3 vezes antes de falhar a conexão. "
-"Atualmente isso aplica-se apenas à autenticação 802-1x."
 
-#: ../clients/common/settings-docs.h.in:142
+#: ../clients/common/settings-docs.c.in:138
 msgid ""
 "Whether or not the connection should be automatically connected by "
 "NetworkManager when the resources for the connection are available. TRUE to "
 "automatically activate the connection, FALSE to require manual intervention "
-"to activate the connection. Note that autoconnect is not implemented for VPN "
-"profiles. See \"secondaries\" as an alternative to automatically connect VPN "
-"profiles."
+"to activate the connection."
 msgstr ""
-"Se a conexão deve ou não ser conectada automaticamente pelo NetworkManager "
-"quando os recursos para a conexão estão disponíveis. VERDADEIRO para ativar "
-"automaticamente a conexão, FALSO para exigir intervenção manual para ativar "
-"a conexão. Observe que o autoconectar não é implementado para perfis de VPN. "
-"Veja “secundários” como uma alternativa para conectar automaticamente perfis "
-"de VPN."
 
-#: ../clients/common/settings-docs.h.in:143
+#: ../clients/common/settings-docs.c.in:139
 msgid ""
 "The autoconnect priority. If the connection is set to autoconnect, "
 "connections with higher priority will be preferred. Defaults to 0. The "
 "higher number means higher priority."
 msgstr ""
-"A prioridade da autoconexão. Se a conexão estiver configurada para "
-"autoconectar, as conexões com maior prioridade serão preferidas. Padrões "
-"para 0. O número mais alto significa maior prioridade."
 
-#: ../clients/common/settings-docs.h.in:144
+#: ../clients/common/settings-docs.c.in:140
 msgid ""
 "The number of times a connection should be tried when autoactivating before "
 "giving up. Zero means forever, -1 means the global default (4 times if not "
@@ -7599,50 +6693,31 @@ msgid ""
 "blocking autoconnect. Note that after a timeout, NetworkManager will try to "
 "autoconnect again."
 msgstr ""
-"O número de vezes que uma conexão deve ser testada quando é ativada "
-"automaticamente antes de desistir. Zero significa para sempre, -1 significa "
-"o padrão global (4 vezes, se não substituído). Definir isso como 1 significa "
-"testar a ativação apenas uma vez antes de bloquear a conexão automática. "
-"Observe que após esgotado um tempo limite, o NetworkManager tentará se "
-"conectar novamente."
 
-#: ../clients/common/settings-docs.h.in:145
+#: ../clients/common/settings-docs.c.in:141
 msgid ""
 "Whether or not slaves of this connection should be automatically brought up "
 "when NetworkManager activates this connection. This only has a real effect "
-"for master connections. The properties \"autoconnect\", \"autoconnect-"
-"priority\" and \"autoconnect-retries\" are unrelated to this setting. The "
-"permitted values are: 0: leave slave connections untouched, 1: activate all "
-"the slave connections with this connection, -1: default. If -1 (default) is "
-"set, global connection.autoconnect-slaves is read to determine the real "
-"value. If it is default as well, this fallbacks to 0."
-msgstr ""
-"Se os escravos desta conexão devem ou não ser automaticamente criados quando "
-"o NetworkManager ativa essa conexão. Isso só tem um efeito real para as "
-"conexões mestre. As propriedades “autoconnect”, “autoconnect-priority” e "
-"“autoconnect-retries” não estão relacionadas a essa configuração. Os valores "
-"permitidos são: 0: deixar as conexões escravas intocadas, 1: ativar todas as "
-"conexões escravas com essa conexão, -1: padrão. Se -1 (padrão) estiver "
-"definido, a global.autoconnect-slaves global é lida para determinar o valor "
-"real. Se for padrão também, este recai para 0."
-
-#: ../clients/common/settings-docs.h.in:146
+"for master connections. The permitted values are: 0: leave slave connections "
+"untouched, 1: activate all the slave connections with this connection, -1: "
+"default. If -1 (default) is set, global connection.autoconnect-slaves is "
+"read to determine the real value. If it is default as well, this fallbacks "
+"to 0."
+msgstr ""
+
+#: ../clients/common/settings-docs.c.in:142
 msgid ""
 "If greater than zero, delay success of IP addressing until either the "
 "timeout is reached, or an IP gateway replies to a ping."
 msgstr ""
-"Se for superior a zero, atrasa o sucesso do endereçamento IP até que o tempo "
-"limite seja atingido ou um gateway IP responda a um ping."
 
-#: ../clients/common/settings-docs.h.in:147
+#: ../clients/common/settings-docs.c.in:143
 msgid ""
 "A human readable unique identifier for the connection, like \"Work Wi-Fi\" "
 "or \"T-Mobile 3G\"."
 msgstr ""
-"Um identificador único legível para a conexão, como “Wi-Fi do Trabalho” ou "
-"“T-Mobile 3G”."
 
-#: ../clients/common/settings-docs.h.in:148
+#: ../clients/common/settings-docs.c.in:144
 msgid ""
 "The name of the network interface this connection is bound to. If not set, "
 "then the connection can be attached to any interface of the appropriate type "
@@ -7654,50 +6729,22 @@ msgid ""
 "names change or are reordered the connection may be applied to the wrong "
 "interface."
 msgstr ""
-"O nome da interface de rede à qual esta conexão está vinculada. Se não "
-"estiver configurado, a conexão pode ser anexada a qualquer interface do tipo "
-"apropriado (sujeito a restrições impostas por outras configurações). Para "
-"dispositivos de software, isso especifica o nome do dispositivo criado. Para "
-"os tipos de conexão em que os nomes das interfaces não podem ser facilmente "
-"persistentes (por exemplo, banda larga móvel ou USB Ethernet), essa "
-"propriedade não deve ser usada. Definir esta propriedade restringe as "
-"interfaces com as quais uma conexão pode ser usada, e se os nomes das "
-"interfaces mudarem ou forem reordenados, a conexão pode ser aplicada à "
-"interface errada."
-
-#: ../clients/common/settings-docs.h.in:149
+
+#: ../clients/common/settings-docs.c.in:145
 msgid "Whether LLDP is enabled for the connection."
-msgstr "Se LLDP está habilitado para a conexão."
+msgstr ""
 
-#: ../clients/common/settings-docs.h.in:150
+#: ../clients/common/settings-docs.c.in:146
 msgid "Interface name of the master device or UUID of the master connection."
-msgstr "Nome da interface do dispositivo mestre ou UUID da conexão mestre."
-
-#: ../clients/common/settings-docs.h.in:151
-msgid ""
-"Whether mDNS is enabled for the connection. The permitted values are: yes: "
-"register hostname and resolving for the connection, no: disable mDNS for the "
-"interface, resolve: do not register hostname but allow resolving of mDNS "
-"host names. When updating this property on a currently activated connection, "
-"the change takes effect immediately. This feature requires a plugin which "
-"supports mDNS. One such plugin is dns-systemd-resolved."
 msgstr ""
-"Se mDNS está habilitado para a conexão. Os valores permitidos são: yes: "
-"registra o nome do host e resolve a conexão, no: desativa mDNS para a "
-"interface, resolve: não registra o nome do host, mas permite a resolução de "
-"nomes de host mDNS. Ao atualizar esta propriedade em uma conexão atualmente "
-"ativada, a alteração terá efeito imediatamente. Esse recurso requer um plug-"
-"in que forneça suporte a mDNS. Um desses plug-in é dns-systemd-resolved."
 
-#: ../clients/common/settings-docs.h.in:152
+#: ../clients/common/settings-docs.c.in:147
 msgid ""
 "Whether the connection is metered. When updating this property on a "
 "currently activated connection, the change takes effect immediately."
 msgstr ""
-"Se a conexão é medida. Ao atualizar esta propriedade em uma conexão "
-"atualmente ativada, a alteração terá efeito imediatamente."
 
-#: ../clients/common/settings-docs.h.in:154
+#: ../clients/common/settings-docs.c.in:149
 msgid ""
 "An array of strings defining what access a given user has to this "
 "connection.  If this is NULL or empty, all users are allowed to access this "
@@ -7711,69 +6758,50 @@ msgid ""
 "present must be ignored and is reserved for future use.  All of [type], "
 "[id], and [reserved] must be valid UTF-8."
 msgstr ""
-"Uma série de strings definindo o acesso a um determinado usuário a essa "
-"conexão. Se este for NULL ou vazio, todos os usuários podem acessar essa "
-"conexão; caso contrário, os usuários são permitidos se e somente se eles "
-"estiverem nesta lista. Quando isso não está vazio, a conexão pode estar "
-"ativa somente quando um dos usuários especificado é logado em uma sessão "
-"ativa. Cada entrada é da forma “[tipo]:[id]:[reservado]”; por exemplo, "
-"“usuário:dcbw:blah”. Neste momento, apenas o “usuário” [tipo] é permitido. "
-"Qualquer outro valor é ignorado e reservado para uso futuro. [id] é o nome "
-"de usuário para o qual esta permissão se refere, que pode não conter o "
-"caractere “:”. Qualquer informação [reservada] presente deve ser ignorada e "
-"reservada para uso futuro. Todos [tipo], [id] e [reservado] devem ser UTF-8 "
-"válidos."
-
-#: ../clients/common/settings-docs.h.in:155
+
+#: ../clients/common/settings-docs.c.in:150
 msgid ""
 "FALSE if the connection can be modified using the provided settings "
 "service's D-Bus interface with the right privileges, or TRUE if the "
 "connection is read-only and cannot be modified."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:156
+#: ../clients/common/settings-docs.c.in:151
 msgid ""
 "List of connection UUIDs that should be activated when the base connection "
 "itself is activated. Currently only VPN connections are supported."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:157
+#: ../clients/common/settings-docs.c.in:152
 msgid ""
 "Setting name of the device type of this slave's master connection (eg, \"bond"
 "\"), or NULL if this connection is not a slave."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:158
+#: ../clients/common/settings-docs.c.in:153
 msgid ""
-"This represents the identity of the connection used for various purposes. It "
-"allows to configure multiple profiles to share the identity. Also, the "
-"stable-id can contain placeholders that are substituted dynamically and "
-"deterministically depending on the context. The stable-id is used for "
+"Token to generate stable IDs for the connection. The stable-id is used for "
 "generating IPv6 stable private addresses with ipv6.addr-gen-mode=stable-"
 "privacy. It is also used to seed the generated cloned MAC address for "
-"ethernet.cloned-mac-address=stable and wifi.cloned-mac-address=stable. It is "
-"also used as DHCP client identifier with ipv4.dhcp-client-id=stable and to "
-"derive the DHCP DUID with ipv6.dhcp-duid=stable-[llt,ll,uuid]. Note that "
-"depending on the context where it is used, other parameters are also seeded "
-"into the generation algorithm. For example, a per-host key is commonly also "
-"included, so that different systems end up generating different IDs. Or with "
-"ipv6.addr-gen-mode=stable-privacy, also the device's name is included, so "
-"that different interfaces yield different addresses. The '$' character is "
+"ethernet.cloned-mac-address=stable and wifi.cloned-mac-address=stable. Note "
+"that also the interface name of the activating connection and a per-host "
+"secret key is included into the address generation so that the same stable-"
+"id on different hosts/devices yields different addresses. If the value is "
+"unset, an ID unique for the connection is used. Specifying a stable-id "
+"allows multiple connections to generate the same addresses. Another use is "
+"to generate IDs at runtime via dynamic substitutions. The '$' character is "
 "treated special to perform dynamic substitutions at runtime. Currently "
-"supported are \"${CONNECTION}\", \"${DEVICE}\", \"${BOOT}\", \"${RANDOM}\". "
-"These effectively create unique IDs per-connection, per-device, per-boot, or "
-"every time. Note that \"${DEVICE}\" corresponds the the interface name of "
-"the device. Any unrecognized patterns following '$' are treated verbatim, "
-"however are reserved for future use. You are thus advised to avoid '$' or "
-"escape it as \"$$\". For example, set it to \"${CONNECTION}-${BOOT}-"
-"${DEVICE}\" to create a unique id for this connection that changes with "
-"every reboot and differs depending on the interface where the profile "
-"activates. If the value is unset, a global connection default is consulted. "
-"If the value is still unset, the default is similar to \"${CONNECTION}\" and "
-"uses a unique, fixed ID for the connection."
+"supported are \"${CONNECTION}\", \"${BOOT}\", \"${RANDOM}\". These "
+"effectively create unique IDs per-connection, per-boot, or every time. Any "
+"unrecognized patterns following '$' are treated verbatim, however are "
+"reserved for future use. You are thus advised to avoid '$' or escape it as "
+"\"$$\". For example, set it to \"${CONNECTION}/${BOOT}\" to create a unique "
+"id for this connection that changes with every reboot. Note that two "
+"connections only use the same effective id if their stable-id is also "
+"identical before performing dynamic substitutions."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:159
+#: ../clients/common/settings-docs.c.in:154
 msgid ""
 "The time, in seconds since the Unix Epoch, that the connection was last "
 "_successfully_ fully activated. NetworkManager updates the connection "
@@ -7782,7 +6810,7 @@ msgid ""
 "reading (changes to this property will not be preserved)."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:160
+#: ../clients/common/settings-docs.c.in:155
 msgid ""
 "Base type of the connection. For hardware-dependent connections, should "
 "contain the setting name of the hardware-type specific setting (ie, \"802-3-"
@@ -7791,7 +6819,7 @@ msgid ""
 "setting name of that setting type (ie, \"vpn\" or \"bridge\", etc)."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:161
+#: ../clients/common/settings-docs.c.in:156
 msgid ""
 "A universally unique identifier for the connection, for example generated "
 "with libuuid.  It should be assigned when the connection is created, and "
@@ -7803,7 +6831,7 @@ msgid ""
 "contains only hexadecimal characters and \"-\")."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:162
+#: ../clients/common/settings-docs.c.in:157
 msgid ""
 "The trust level of a the connection.  Free form case-insensitive string (for "
 "example \"Home\", \"Work\", \"Public\").  NULL or unspecified zone means the "
@@ -7812,53 +6840,53 @@ msgid ""
 "takes effect immediately."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:163
+#: ../clients/common/settings-docs.c.in:158
 msgid ""
 "Specifies the NMSettingDcbFlags for the DCB FCoE application.  Flags may be "
 "any combination of NM_SETTING_DCB_FLAG_ENABLE (0x1), "
 "NM_SETTING_DCB_FLAG_ADVERTISE (0x2), and NM_SETTING_DCB_FLAG_WILLING (0x4)."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:164
+#: ../clients/common/settings-docs.c.in:159
 msgid "The FCoE controller mode; either \"fabric\" (default) or \"vn2vn\"."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:165
+#: ../clients/common/settings-docs.c.in:160
 msgid ""
 "The highest User Priority (0 - 7) which FCoE frames should use, or -1 for "
 "default priority.  Only used when the \"app-fcoe-flags\" property includes "
 "the NM_SETTING_DCB_FLAG_ENABLE (0x1) flag."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:166
+#: ../clients/common/settings-docs.c.in:161
 msgid ""
 "Specifies the NMSettingDcbFlags for the DCB FIP application.  Flags may be "
 "any combination of NM_SETTING_DCB_FLAG_ENABLE (0x1), "
 "NM_SETTING_DCB_FLAG_ADVERTISE (0x2), and NM_SETTING_DCB_FLAG_WILLING (0x4)."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:167
+#: ../clients/common/settings-docs.c.in:162
 msgid ""
 "The highest User Priority (0 - 7) which FIP frames should use, or -1 for "
 "default priority.  Only used when the \"app-fip-flags\" property includes "
 "the NM_SETTING_DCB_FLAG_ENABLE (0x1) flag."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:168
+#: ../clients/common/settings-docs.c.in:163
 msgid ""
 "Specifies the NMSettingDcbFlags for the DCB iSCSI application.  Flags may be "
 "any combination of NM_SETTING_DCB_FLAG_ENABLE (0x1), "
 "NM_SETTING_DCB_FLAG_ADVERTISE (0x2), and NM_SETTING_DCB_FLAG_WILLING (0x4)."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:169
+#: ../clients/common/settings-docs.c.in:164
 msgid ""
 "The highest User Priority (0 - 7) which iSCSI frames should use, or -1 for "
 "default priority. Only used when the \"app-iscsi-flags\" property includes "
 "the NM_SETTING_DCB_FLAG_ENABLE (0x1) flag."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:171
+#: ../clients/common/settings-docs.c.in:166
 msgid ""
 "An array of 8 uint values, where the array index corresponds to the User "
 "Priority (0 - 7) and the value indicates the percentage of bandwidth of the "
@@ -7867,21 +6895,21 @@ msgid ""
 "percents."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:172
+#: ../clients/common/settings-docs.c.in:167
 msgid ""
 "An array of 8 boolean values, where the array index corresponds to the User "
 "Priority (0 - 7) and the value indicates whether or not the corresponding "
 "priority should transmit priority pause."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:173
+#: ../clients/common/settings-docs.c.in:168
 msgid ""
 "Specifies the NMSettingDcbFlags for DCB Priority Flow Control (PFC). Flags "
 "may be any combination of NM_SETTING_DCB_FLAG_ENABLE (0x1), "
 "NM_SETTING_DCB_FLAG_ADVERTISE (0x2), and NM_SETTING_DCB_FLAG_WILLING (0x4)."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:174
+#: ../clients/common/settings-docs.c.in:169
 msgid ""
 "An array of 8 uint values, where the array index corresponds to the Priority "
 "Group ID (0 - 7) and the value indicates the percentage of link bandwidth "
@@ -7889,35 +6917,35 @@ msgid ""
 "values must total 100 percents."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:175
+#: ../clients/common/settings-docs.c.in:170
 msgid ""
 "Specifies the NMSettingDcbFlags for DCB Priority Groups.  Flags may be any "
 "combination of NM_SETTING_DCB_FLAG_ENABLE (0x1), "
 "NM_SETTING_DCB_FLAG_ADVERTISE (0x2), and NM_SETTING_DCB_FLAG_WILLING (0x4)."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:176
+#: ../clients/common/settings-docs.c.in:171
 msgid ""
 "An array of 8 uint values, where the array index corresponds to the User "
 "Priority (0 - 7) and the value indicates the Priority Group ID.  Allowed "
 "Priority Group ID values are 0 - 7 or 15 for the unrestricted group."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:177
+#: ../clients/common/settings-docs.c.in:172
 msgid ""
 "An array of 8 boolean values, where the array index corresponds to the User "
 "Priority (0 - 7) and the value indicates whether or not the priority may use "
 "all of the bandwidth allocated to its assigned group."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:178
+#: ../clients/common/settings-docs.c.in:173
 msgid ""
 "An array of 8 uint values, where the array index corresponds to the User "
 "Priority (0 - 7) and the value indicates the traffic class (0 - 7) to which "
 "the priority is mapped."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:181
+#: ../clients/common/settings-docs.c.in:176
 msgid ""
 "The GPRS Access Point Name specifying the APN used when establishing a data "
 "session with the GSM-based network.  The APN often determines how the user "
@@ -7928,20 +6956,20 @@ msgid ""
 "14.9."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:182
+#: ../clients/common/settings-docs.c.in:177
 msgid ""
 "The device unique identifier (as given by the WWAN management service) which "
 "this connection applies to.  If given, the connection will only apply to the "
 "specified device."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:183
+#: ../clients/common/settings-docs.c.in:178
 msgid ""
 "When TRUE, only connections to the home network will be allowed. Connections "
 "to roaming networks will not be made."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:186
+#: ../clients/common/settings-docs.c.in:181
 msgid ""
 "The Network ID (GSM LAI format, ie MCC-MNC) to force specific network "
 "registration.  If the Network ID is specified, NetworkManager will attempt "
@@ -7950,7 +6978,7 @@ msgid ""
 "the device is not otherwise possible."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:187
+#: ../clients/common/settings-docs.c.in:182
 msgid ""
 "Number to dial when establishing a PPP data session with the GSM-based "
 "mobile broadband network.  Many modems do not require PPP for connections to "
@@ -7958,14 +6986,14 @@ msgid ""
 "NetworkManager to select the appropriate settings automatically."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:190
+#: ../clients/common/settings-docs.c.in:185
 msgid ""
 "If the SIM is locked with a PIN it must be unlocked before any other "
 "operations are requested.  Specify the PIN here to allow operation of the "
 "device."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:192
+#: ../clients/common/settings-docs.c.in:187
 msgid ""
 "The SIM card unique identifier (as given by the WWAN management service) "
 "which this connection applies to.  If given, the connection will apply to "
@@ -7973,7 +7001,7 @@ msgid ""
 "the given identifier."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:193
+#: ../clients/common/settings-docs.c.in:188
 msgid ""
 "A MCC/MNC string like \"310260\" or \"21601\" identifying the specific "
 "mobile network operator which this connection applies to.  If given, the "
@@ -7981,131 +7009,120 @@ msgid ""
 "id\" which contains a SIM card provisioned by the given operator."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:195
+#: ../clients/common/settings-docs.c.in:190
 msgid ""
 "If specified, this connection will only apply to the IPoIB device whose "
 "permanent MAC address matches. This property does not change the MAC address "
 "of the device (i.e. MAC spoofing)."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:198
+#: ../clients/common/settings-docs.c.in:193
 msgid ""
 "The InfiniBand P_Key to use for this device. A value of -1 means to use the "
 "default P_Key (aka \"the P_Key at index 0\").  Otherwise it is a 16-bit "
 "unsigned integer, whose high bit is set if it is a \"full membership\" P_Key."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:199
+#: ../clients/common/settings-docs.c.in:194
 msgid ""
 "The interface name of the parent device of this device. Normally NULL, but "
 "if the \"p_key\" property is set, then you must specify the base device by "
 "setting either this property or \"mac-address\"."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:200
+#: ../clients/common/settings-docs.c.in:195
 msgid ""
 "The IP-over-InfiniBand transport mode. Either \"datagram\" or \"connected\"."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:201
+#: ../clients/common/settings-docs.c.in:196
 msgid ""
 "How many additional levels of encapsulation are permitted to be prepended to "
 "packets. This property applies only to IPv6 tunnels."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:202
-msgid ""
-"Tunnel flags. Currently the following values are supported: "
-"NM_IP_TUNNEL_FLAG_IP6_IGN_ENCAP_LIMIT (0x1), "
-"NM_IP_TUNNEL_FLAG_IP6_USE_ORIG_TCLASS (0x2), "
-"NM_IP_TUNNEL_FLAG_IP6_USE_ORIG_FLOWLABEL (0x4), "
-"NM_IP_TUNNEL_FLAG_IP6_MIP6_DEV (0x8), NM_IP_TUNNEL_FLAG_IP6_RCV_DSCP_COPY "
-"(0x10), NM_IP_TUNNEL_FLAG_IP6_USE_ORIG_FWMARK (0x20). They are valid only "
-"for IPv6 tunnels."
-msgstr ""
-
-#: ../clients/common/settings-docs.h.in:203
+#: ../clients/common/settings-docs.c.in:197
 msgid ""
 "The flow label to assign to tunnel packets. This property applies only to "
 "IPv6 tunnels."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:204
+#: ../clients/common/settings-docs.c.in:198
 msgid ""
 "The key used for tunnel input packets; the property is valid only for "
 "certain tunnel modes (GRE, IP6GRE). If empty, no key is used."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:205
+#: ../clients/common/settings-docs.c.in:199
 msgid ""
 "The local endpoint of the tunnel; the value can be empty, otherwise it must "
 "contain an IPv4 or IPv6 address."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:206
+#: ../clients/common/settings-docs.c.in:200
 msgid ""
 "The tunneling mode, for example NM_IP_TUNNEL_MODE_IPIP (1) or "
 "NM_IP_TUNNEL_MODE_GRE (2)."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:207
+#: ../clients/common/settings-docs.c.in:201
 msgid ""
 "If non-zero, only transmit packets of the specified size or smaller, "
 "breaking larger packets up into multiple fragments."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:209
+#: ../clients/common/settings-docs.c.in:203
 msgid ""
 "The key used for tunnel output packets; the property is valid only for "
 "certain tunnel modes (GRE, IP6GRE). If empty, no key is used."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:210
+#: ../clients/common/settings-docs.c.in:204
 msgid ""
 "If given, specifies the parent interface name or parent connection UUID the "
 "new device will be bound to so that tunneled packets will only be routed via "
 "that interface."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:211
+#: ../clients/common/settings-docs.c.in:205
 msgid "Whether to enable Path MTU Discovery on this tunnel."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:212
+#: ../clients/common/settings-docs.c.in:206
 msgid ""
 "The remote endpoint of the tunnel; the value must contain an IPv4 or IPv6 "
 "address."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:213
+#: ../clients/common/settings-docs.c.in:207
 msgid ""
 "The type of service (IPv4) or traffic class (IPv6) field to be set on "
 "tunneled packets."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:214
+#: ../clients/common/settings-docs.c.in:208
 msgid ""
 "The TTL to assign to tunneled packets. 0 is a special value meaning that "
 "packets inherit the TTL value."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:215
-#: ../clients/common/settings-docs.h.in:237
+#: ../clients/common/settings-docs.c.in:209
+#: ../clients/common/settings-docs.c.in:231
 msgid "Array of IP addresses."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:216
-#: ../clients/common/settings-docs.h.in:238
+#: ../clients/common/settings-docs.c.in:210
+#: ../clients/common/settings-docs.c.in:232
 msgid ""
 "Timeout in milliseconds used to check for the presence of duplicate IP "
 "addresses on the network.  If an address conflict is detected, the "
 "activation will fail.  A zero value means that no duplicate address "
 "detection is performed, -1 means the default value (either configuration "
-"ipvx.dad-timeout override or zero).  A value greater than zero is a timeout "
-"in milliseconds. The property is currently implemented only for IPv4."
+"ipvx.dad-timeout override or 3 seconds).  A value greater than zero is a "
+"timeout in milliseconds."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:217
+#: ../clients/common/settings-docs.c.in:211
 msgid ""
 "A string sent to the DHCP server to identify the local machine which the "
 "DHCP server may use to customize the DHCP lease and options. When the "
@@ -8114,33 +7131,26 @@ msgid ""
 "RFC 2132 section 9.14 and the remaining bytes may be an hardware address (e."
 "g. '01:xx:xx:xx:xx:xx:xx' where 1 is the Ethernet ARP type and the rest is a "
 "MAC address). If the property is not a hex string it is considered as a non-"
-"hardware-address client ID and the 'type' field is set to 0. The special "
-"values \"mac\" and \"perm-mac\" are supported, which use the current or "
-"permanent MAC address of the device to generate a client identifier with "
-"type ethernet type (01). Currently, these options only work for ethernet "
-"type of links. The special value \"stable\" is supported to generate a type "
-"0 client identifier based on the stable-id (see connection.stable-id) and a "
-"per-host key. If unset, a globally configured default is used. If still "
-"unset, the client-id from the last lease is reused."
+"hardware-address client ID and the 'type' field is set to 0."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:218
+#: ../clients/common/settings-docs.c.in:212
 msgid ""
 "If the \"dhcp-send-hostname\" property is TRUE, then the specified FQDN will "
 "be sent to the DHCP server when acquiring a lease. This property and \"dhcp-"
 "hostname\" are mutually exclusive and cannot be set at the same time."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:219
-#: ../clients/common/settings-docs.h.in:240
+#: ../clients/common/settings-docs.c.in:213
+#: ../clients/common/settings-docs.c.in:233
 msgid ""
 "If the \"dhcp-send-hostname\" property is TRUE, then the specified name will "
 "be sent to the DHCP server when acquiring a lease. This property and \"dhcp-"
 "fqdn\" are mutually exclusive and cannot be set at the same time."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:220
-#: ../clients/common/settings-docs.h.in:241
+#: ../clients/common/settings-docs.c.in:214
+#: ../clients/common/settings-docs.c.in:234
 msgid ""
 "If TRUE, a hostname is sent to the DHCP server when acquiring a lease. Some "
 "DHCP servers use this hostname to update DNS databases, essentially "
@@ -8149,68 +7159,57 @@ msgid ""
 "of the computer is sent."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:221
-#: ../clients/common/settings-docs.h.in:242
+#: ../clients/common/settings-docs.c.in:215
+#: ../clients/common/settings-docs.c.in:235
 msgid "A timeout for a DHCP transaction in seconds."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:222
-#: ../clients/common/settings-docs.h.in:243
+#: ../clients/common/settings-docs.c.in:216
+#: ../clients/common/settings-docs.c.in:236
 msgid "Array of IP addresses of DNS servers."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:223
-#: ../clients/common/settings-docs.h.in:244
+#: ../clients/common/settings-docs.c.in:217
+#: ../clients/common/settings-docs.c.in:237
 msgid ""
 "Array of DNS options as described in man 5 resolv.conf. NULL means that the "
 "options are unset and left at the default. In this case NetworkManager will "
 "use default options. This is distinct from an empty list of properties."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:224
-#: ../clients/common/settings-docs.h.in:245
+#: ../clients/common/settings-docs.c.in:218
+#: ../clients/common/settings-docs.c.in:238
 msgid ""
-"DNS servers priority. The relative priority for DNS servers specified by "
-"this setting.  A lower value is better (higher priority).  Zero selects the "
-"default value, which is 50 for VPNs and 100 for other connections. Note that "
-"the priority is to order DNS settings for multiple active connections.  It "
-"does not disambiguate multiple DNS servers within the same connection "
-"profile. When using dns=default, servers with higher priority will be on top "
-"of resolv.conf.  To prioritize a given server over another one within the "
-"same connection, just specify them in the desired order.  When multiple "
+"Intra-connection DNS priority. The relative priority to be used when "
+"determining the order of DNS servers in resolv.conf.  A lower value means "
+"that servers will be on top of the file.  Zero selects the default value, "
+"which is 50 for VPNs and 100 for other connections.  Note that the priority "
+"is to order DNS settings for multiple active connections. It does not "
+"disambiguate multiple DNS servers within the same connection profile. For "
+"that, just specify the DNS servers in the desired order. When multiple "
 "devices have configurations with the same priority, the one with an active "
-"default route will be preferred.  Negative values have the special effect of "
-"excluding other configurations with a greater priority value; so in presence "
-"of at least a negative priority, only DNS servers from connections with the "
-"lowest priority value will be used. When using a DNS resolver that supports "
-"split-DNS as dns=dnsmasq or dns=systemd-resolved, each connection is used to "
-"query domains in its search list.  Queries for domains not present in any "
-"search list are routed through connections having the '~.' special wildcard "
-"domain, which is added automatically to connections with the default route "
-"(or can be added manually).  When multiple connections specify the same "
-"domain, the one with the highest priority (lowest numerical value) wins.  If "
-"a connection specifies a domain which is subdomain of another domain with a "
-"negative DNS priority value, the subdomain is ignored."
+"default route will be preferred. Note that when using dns=dnsmasq the order "
+"is meaningless since dnsmasq forwards queries to all known servers at the "
+"same time. Negative values have the special effect of excluding other "
+"configurations with a greater priority value; so in presence of at least a "
+"negative priority, only DNS servers from connections with the lowest "
+"priority value will be used."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:225
-#: ../clients/common/settings-docs.h.in:246
-msgid ""
-"Array of DNS search domains. Domains starting with a tilde ('~') are "
-"considered 'routing' domains and are used only to decide the interface over "
-"which a query must be forwarded; they are not used to complete unqualified "
-"host names."
+#: ../clients/common/settings-docs.c.in:219
+#: ../clients/common/settings-docs.c.in:239
+msgid "Array of DNS search domains."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:226
-#: ../clients/common/settings-docs.h.in:247
+#: ../clients/common/settings-docs.c.in:220
+#: ../clients/common/settings-docs.c.in:240
 msgid ""
 "The gateway associated with this configuration. This is only meaningful if "
 "\"addresses\" is also set."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:227
-#: ../clients/common/settings-docs.h.in:248
+#: ../clients/common/settings-docs.c.in:221
+#: ../clients/common/settings-docs.c.in:241
 msgid ""
 "When \"method\" is set to \"auto\" and this property to TRUE, automatically "
 "configured nameservers and search domains are ignored and only nameservers "
@@ -8218,16 +7217,16 @@ msgid ""
 "if any, are used."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:228
-#: ../clients/common/settings-docs.h.in:249
+#: ../clients/common/settings-docs.c.in:222
+#: ../clients/common/settings-docs.c.in:242
 msgid ""
 "When \"method\" is set to \"auto\" and this property to TRUE, automatically "
 "configured routes are ignored and only routes specified in the \"routes\" "
 "property, if any, are used."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:229
-#: ../clients/common/settings-docs.h.in:251
+#: ../clients/common/settings-docs.c.in:223
+#: ../clients/common/settings-docs.c.in:244
 msgid ""
 "If TRUE, allow overall network configuration to proceed even if the "
 "configuration specified by this property times out.  Note that at least one "
@@ -8237,8 +7236,8 @@ msgid ""
 "if IPv4 configuration fails but IPv6 configuration completes successfully."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:230
-#: ../clients/common/settings-docs.h.in:252
+#: ../clients/common/settings-docs.c.in:224
+#: ../clients/common/settings-docs.c.in:245
 msgid ""
 "IP configuration method. NMSettingIP4Config and NMSettingIP6Config both "
 "support \"auto\", \"manual\", and \"link-local\". See the subclass-specific "
@@ -8252,15 +7251,15 @@ msgid ""
 "10.42.x.0/24 is chosen."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:232
-#: ../clients/common/settings-docs.h.in:254
+#: ../clients/common/settings-docs.c.in:226
+#: ../clients/common/settings-docs.c.in:247
 msgid ""
 "If TRUE, this connection will never be the default connection for this IP "
 "type, meaning it will never be assigned the default route by NetworkManager."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:233
-#: ../clients/common/settings-docs.h.in:255
+#: ../clients/common/settings-docs.c.in:227
+#: ../clients/common/settings-docs.c.in:248
 msgid ""
 "The default metric for routes that don't explicitly specify a metric. The "
 "default value -1 means that the metric is chosen automatically based on the "
@@ -8271,8 +7270,8 @@ msgid ""
 "mean setting it to 1024. For IPv4, zero is a regular value for the metric."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:234
-#: ../clients/common/settings-docs.h.in:256
+#: ../clients/common/settings-docs.c.in:228
+#: ../clients/common/settings-docs.c.in:249
 msgid ""
 "Enable policy routing (source routing) and set the routing table used when "
 "adding routes. This affects all routes, including device-routes, IPv4LL, "
@@ -8289,12 +7288,12 @@ msgid ""
 "tables outside of NetworkManager."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:235
-#: ../clients/common/settings-docs.h.in:257
+#: ../clients/common/settings-docs.c.in:229
+#: ../clients/common/settings-docs.c.in:250
 msgid "Array of IP routes."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:236
+#: ../clients/common/settings-docs.c.in:230
 msgid ""
 "Configure method for creating the address for use with RFC4862 IPv6 "
 "Stateless Address Autoconfiguration. The permitted values are: "
@@ -8316,34 +7315,7 @@ msgid ""
 "affect the temporary addresses configured with this option."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:239
-msgid ""
-"A string containing the DHCPv6 Unique Identifier (DUID) used by the dhcp "
-"client to identify itself to DHCPv6 servers (RFC 3315). The DUID is carried "
-"in the Client Identifier option. If the property is a hex string ('aa:bb:"
-"cc') it is interpreted as a binary DUID and filled as an opaque value in the "
-"Client Identifier option. The special value \"lease\" will retrieve the DUID "
-"previously used from the lease file belonging to the connection. If no DUID "
-"is found and \"dhclient\" is the configured dhcp client, the DUID is "
-"searched in the system-wide dhclient lease file. If still no DUID is found, "
-"or another dhcp client is used, a global and permanent DUID-UUID (RFC 6355) "
-"will be generated based on the machine-id. The special values \"llt\" and "
-"\"ll\" will generate a DUID of type LLT or LL (see RFC 3315) based on the "
-"current MAC address of the device. In order to try providing a stable DUID-"
-"LLT, the time field will contain a constant timestamp that is used globally "
-"(for all profiles) and persisted to disk. The special values \"stable-llt\", "
-"\"stable-ll\" and \"stable-uuid\" will generate a DUID of the corresponding "
-"type, derived from the connection's stable-id and a per-host unique key. So, "
-"the link-layer address of \"stable-ll\" and \"stable-llt\" will be a "
-"generated address derived from the stable id. The DUID-LLT time value in the "
-"\"stable-llt\" option will be picked among a static timespan of three years "
-"(the upper bound of the interval is the same constant timestamp used in \"llt"
-"\"). When the property is unset, the global value provided for \"ipv6.dhcp-"
-"duid\" is used. If no global value is provided, the default \"lease\" value "
-"is assumed."
-msgstr ""
-
-#: ../clients/common/settings-docs.h.in:250
+#: ../clients/common/settings-docs.c.in:243
 msgid ""
 "Configure IPv6 Privacy Extensions for SLAAC, described in RFC4941.  If "
 "enabled, it makes the kernel generate a temporary IPv6 address in addition "
@@ -8360,38 +7332,38 @@ msgid ""
 "IPv6 addresses."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:258
+#: ../clients/common/settings-docs.c.in:251
 msgid ""
 "Configure the token for draft-chown-6man-tokenised-ipv6-identifiers-02 IPv6 "
 "tokenized interface identifiers. Useful with eui64 addr-gen-mode."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:259
+#: ../clients/common/settings-docs.c.in:252
 msgid "Whether the transmitted traffic must be encrypted."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:260
+#: ../clients/common/settings-docs.c.in:253
 msgid ""
 "The pre-shared CAK (Connectivity Association Key) for MACsec Key Agreement."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:261
+#: ../clients/common/settings-docs.c.in:254
 msgid "Flags indicating how to handle the \"mka-cak\" property."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:262
+#: ../clients/common/settings-docs.c.in:255
 msgid ""
 "The pre-shared CKN (Connectivity-association Key Name) for MACsec Key "
 "Agreement."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:263
+#: ../clients/common/settings-docs.c.in:256
 msgid ""
 "Specifies how the CAK (Connectivity Association Key) for MKA (MACsec Key "
 "Agreement) is obtained."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:265
+#: ../clients/common/settings-docs.c.in:258
 msgid ""
 "If given, specifies the parent interface name or parent connection UUID from "
 "which this MACSEC interface should be created.  If this property is not "
@@ -8399,29 +7371,23 @@ msgid ""
 "\"mac-address\" property."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:266
+#: ../clients/common/settings-docs.c.in:259
 msgid ""
 "The port component of the SCI (Secure Channel Identifier), between 1 and "
 "65534."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:267
-msgid ""
-"Specifies whether the SCI (Secure Channel Identifier) is included in every "
-"packet."
-msgstr ""
-
-#: ../clients/common/settings-docs.h.in:268
+#: ../clients/common/settings-docs.c.in:260
 msgid "Specifies the validation mode for incoming frames."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:269
+#: ../clients/common/settings-docs.c.in:261
 msgid ""
 "The macvlan mode, which specifies the communication mechanism between "
 "multiple macvlans on the same lower device."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:271
+#: ../clients/common/settings-docs.c.in:263
 msgid ""
 "If given, specifies the parent interface name or parent connection UUID from "
 "which this MAC-VLAN interface should be created.  If this property is not "
@@ -8429,82 +7395,82 @@ msgid ""
 "\"mac-address\" property."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:272
+#: ../clients/common/settings-docs.c.in:264
 msgid "Whether the interface should be put in promiscuous mode."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:273
+#: ../clients/common/settings-docs.c.in:265
 msgid "Whether the interface should be a MACVTAP."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:274
+#: ../clients/common/settings-docs.c.in:266
 msgid "The bridge failure mode. One of \"secure\", \"standalone\" or empty."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:275
+#: ../clients/common/settings-docs.c.in:267
 msgid "Enable or disable multicast snooping."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:277
+#: ../clients/common/settings-docs.c.in:269
 msgid "Enable or disable RSTP."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:278
+#: ../clients/common/settings-docs.c.in:270
 msgid "Enable or disable STP."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:280
+#: ../clients/common/settings-docs.c.in:272
 msgid "The interface type. Either \"internal\", or empty."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:282
+#: ../clients/common/settings-docs.c.in:274
 msgid ""
-"Specifies the unicast destination IP address of a remote Open vSwitch bridge "
+"Specifies the unicast destination IP address of a remote OpenVSwitch bridge "
 "port to connect to."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:283
+#: ../clients/common/settings-docs.c.in:275
 msgid "The time port must be inactive in order to be considered down."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:284
+#: ../clients/common/settings-docs.c.in:276
 msgid ""
 "Bonding mode. One of \"active-backup\", \"balance-slb\", or \"balance-tcp\"."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:285
+#: ../clients/common/settings-docs.c.in:277
 msgid "The time port must be active before it starts forwarding traffic."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:286
+#: ../clients/common/settings-docs.c.in:278
 msgid "LACP mode. One of \"active\", \"off\", or \"passive\"."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:288
+#: ../clients/common/settings-docs.c.in:280
 msgid "The VLAN tag in the range 0-4095."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:289
+#: ../clients/common/settings-docs.c.in:281
 msgid ""
 "The VLAN mode. One of \"access\", \"native-tagged\", \"native-untagged\", "
 "\"trunk\" or unset."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:290
+#: ../clients/common/settings-docs.c.in:282
 msgid ""
 "If non-zero, instruct pppd to set the serial port to the specified "
 "baudrate.  This value should normally be left as 0 to automatically choose "
 "the speed."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:291
+#: ../clients/common/settings-docs.c.in:283
 msgid ""
 "If TRUE, specify that pppd should set the serial port to use hardware flow "
 "control with RTS and CTS signals.  This value should normally be set to "
 "FALSE."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:292
+#: ../clients/common/settings-docs.c.in:284
 msgid ""
 "If non-zero, instruct pppd to presume the connection to the peer has failed "
 "if the specified number of LCP echo-requests go unanswered by the peer.  The "
@@ -8512,7 +7478,7 @@ msgid ""
 "property is used."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:293
+#: ../clients/common/settings-docs.c.in:285
 msgid ""
 "If non-zero, instruct pppd to send an LCP echo-request frame to the peer "
 "every n seconds (where n is the specified value).  Note that some PPP peers "
@@ -8520,78 +7486,78 @@ msgid ""
 "autodetect this."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:294
+#: ../clients/common/settings-docs.c.in:286
 msgid ""
 "If TRUE, stateful MPPE is used.  See pppd documentation for more information "
 "on stateful MPPE."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:295
+#: ../clients/common/settings-docs.c.in:287
 msgid ""
 "If non-zero, instruct pppd to request that the peer send packets no larger "
 "than the specified size.  If non-zero, the MRU should be between 128 and "
 "16384."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:296
+#: ../clients/common/settings-docs.c.in:288
 msgid ""
 "If non-zero, instruct pppd to send packets no larger than the specified size."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:298
+#: ../clients/common/settings-docs.c.in:290
 msgid "If TRUE, Van Jacobsen TCP header compression will not be requested."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:299
+#: ../clients/common/settings-docs.c.in:291
 msgid ""
 "If TRUE, do not require the other side (usually the PPP server) to "
 "authenticate itself to the client.  If FALSE, require authentication from "
 "the remote side.  In almost all cases, this should be TRUE."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:300
+#: ../clients/common/settings-docs.c.in:292
 msgid "If TRUE, BSD compression will not be requested."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:301
+#: ../clients/common/settings-docs.c.in:293
 msgid "If TRUE, \"deflate\" compression will not be requested."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:302
+#: ../clients/common/settings-docs.c.in:294
 msgid "If TRUE, the CHAP authentication method will not be used."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:303
+#: ../clients/common/settings-docs.c.in:295
 msgid "If TRUE, the EAP authentication method will not be used."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:304
+#: ../clients/common/settings-docs.c.in:296
 msgid "If TRUE, the MSCHAP authentication method will not be used."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:305
+#: ../clients/common/settings-docs.c.in:297
 msgid "If TRUE, the MSCHAPv2 authentication method will not be used."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:306
+#: ../clients/common/settings-docs.c.in:298
 msgid "If TRUE, the PAP authentication method will not be used."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:307
+#: ../clients/common/settings-docs.c.in:299
 msgid ""
 "If TRUE, MPPE (Microsoft Point-to-Point Encryption) will be required for the "
 "PPP session.  If either 64-bit or 128-bit MPPE is not available the session "
 "will fail.  Note that MPPE is not used on mobile broadband connections."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:308
+#: ../clients/common/settings-docs.c.in:300
 msgid ""
 "If TRUE, 128-bit MPPE (Microsoft Point-to-Point Encryption) will be required "
 "for the PPP session, and the \"require-mppe\" property must also be set to "
 "TRUE.  If 128-bit MPPE is not available the session will fail."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:310
+#: ../clients/common/settings-docs.c.in:302
 msgid ""
 "If given, specifies the parent interface name on which this PPPoE connection "
 "should be created.  If this property is not specified, the connection is "
@@ -8599,11 +7565,11 @@ msgid ""
 "NMSettingConnection."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:311
+#: ../clients/common/settings-docs.c.in:303
 msgid "Password used to authenticate with the PPPoE service."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:313
+#: ../clients/common/settings-docs.c.in:305
 msgid ""
 "If specified, instruct PPPoE to only initiate sessions with access "
 "concentrators that provide the specified service.  For most providers, this "
@@ -8611,88 +7577,61 @@ msgid ""
 "concentrators or a specific service is known to be required."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:314
+#: ../clients/common/settings-docs.c.in:306
 msgid "Username used to authenticate with the PPPoE service."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:315
+#: ../clients/common/settings-docs.c.in:307
 msgid "Whether the proxy configuration is for browser only."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:316
+#: ../clients/common/settings-docs.c.in:308
 msgid ""
 "Method for proxy configuration, Default is NM_SETTING_PROXY_METHOD_NONE (0)"
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:318
+#: ../clients/common/settings-docs.c.in:310
 msgid "PAC script for the connection."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:319
+#: ../clients/common/settings-docs.c.in:311
 msgid "PAC URL for obtaining PAC file."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:320
+#: ../clients/common/settings-docs.c.in:312
 msgid ""
 "Speed to use for communication over the serial port.  Note that this value "
 "usually has no effect for mobile broadband modems as they generally ignore "
 "speed settings and use the highest available speed."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:321
+#: ../clients/common/settings-docs.c.in:313
 msgid "Byte-width of the serial communication. The 8 in \"8n1\" for example."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:323
+#: ../clients/common/settings-docs.c.in:315
 msgid "Parity setting of the serial port."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:324
+#: ../clients/common/settings-docs.c.in:316
 msgid "Time to delay between each byte sent to the modem, in microseconds."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:325
+#: ../clients/common/settings-docs.c.in:317
 msgid ""
 "Number of stop bits for communication on the serial port.  Either 1 or 2. "
 "The 1 in \"8n1\" for example."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:326
-msgid ""
-"Whether to autoprobe virtual functions by a compatible driver. If set to "
-"NM_TERNARY_TRUE (1), the kernel will try to bind VFs to a compatible driver "
-"and if this succeeds a new network interface will be instantiated for each "
-"VF. If set to NM_TERNARY_FALSE (0), VFs will not be claimed and no network "
-"interfaces will be created for them. When set to NM_TERNARY_DEFAULT (-1), "
-"the global default is used; in case the global default is unspecified it is "
-"assumed to be NM_TERNARY_TRUE (1)."
-msgstr ""
-
-#: ../clients/common/settings-docs.h.in:328
-msgid "The total number of virtual functions to create."
-msgstr ""
-
-#: ../clients/common/settings-docs.h.in:329
-msgid ""
-"Array of virtual function descriptors. Each VF descriptor is a dictionary "
-"mapping attribute names to GVariant values. The 'index' entry is mandatory "
-"for each VF. When represented as string a VF is in the form: \"INDEX "
-"[ATTR=VALUE[ ATTR=VALUE]...]\". for example: \"2 mac=00:11:22:33:44:55 spoof-"
-"check=true\". The \"vlans\" attribute is represented as a semicolor-"
-"separated list of VLAN descriptors, where each descriptor has the form \"ID[."
-"PRIORITY[.PROTO]]\". PROTO can be either 'q' for 802.1Q (the default) or "
-"'ad' for 802.1ad."
-msgstr ""
-
-#: ../clients/common/settings-docs.h.in:331
-msgid "Array of TC queueing disciplines."
+#: ../clients/common/settings-docs.c.in:319
+msgid "Array of TC queuening disciplines."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:332
+#: ../clients/common/settings-docs.c.in:320
 msgid "Array of TC traffic filters."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:333
+#: ../clients/common/settings-docs.c.in:321
 msgid ""
 "The JSON configuration for the team network interface.  The property should "
 "contain raw JSON configuration data suitable for teamd, because the value is "
@@ -8700,8 +7639,8 @@ msgid ""
 "used.  See man teamd.conf for the format details."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:334
-#: ../clients/common/settings-docs.h.in:353
+#: ../clients/common/settings-docs.c.in:322
+#: ../clients/common/settings-docs.c.in:341
 msgid ""
 "Link watchers configuration for the connection: each link watcher is defined "
 "by a dictionary, whose keys depend upon the selected link watcher. Available "
@@ -8713,68 +7652,65 @@ msgid ""
 "for more details."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:335
+#: ../clients/common/settings-docs.c.in:323
 msgid "Corresponds to the teamd mcast_rejoin.count."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:336
+#: ../clients/common/settings-docs.c.in:324
 msgid "Corresponds to the teamd mcast_rejoin.interval."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:338
+#: ../clients/common/settings-docs.c.in:326
 msgid "Corresponds to the teamd notify_peers.count."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:339
+#: ../clients/common/settings-docs.c.in:327
 msgid "Corresponds to the teamd notify_peers.interval."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:340
+#: ../clients/common/settings-docs.c.in:328
 msgid ""
 "Corresponds to the teamd runner.name. Permitted values are: \"roundrobin\", "
-"\"broadcast\", \"activebackup\", \"loadbalance\", \"lacp\", \"random\". When "
-"setting the runner, all the properties specific to the runner will be reset "
-"to the default value; all the properties specific to other runners will be "
-"set to an empty value (or if not possible to a default value)."
+"\"broadcast\", \"activebackup\", \"loadbalance\", \"lacp\"."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:341
+#: ../clients/common/settings-docs.c.in:329
 msgid "Corresponds to the teamd runner.active."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:342
+#: ../clients/common/settings-docs.c.in:330
 msgid "Corresponds to the teamd runner.agg_select_policy."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:343
+#: ../clients/common/settings-docs.c.in:331
 msgid "Corresponds to the teamd runner.fast_rate."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:344
+#: ../clients/common/settings-docs.c.in:332
 msgid "Corresponds to the teamd runner.hwaddr_policy."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:345
+#: ../clients/common/settings-docs.c.in:333
 msgid "Corresponds to the teamd runner.min_ports."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:346
+#: ../clients/common/settings-docs.c.in:334
 msgid "Corresponds to the teamd runner.sys_prio."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:347
+#: ../clients/common/settings-docs.c.in:335
 msgid "Corresponds to the teamd runner.tx_balancer.name."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:348
+#: ../clients/common/settings-docs.c.in:336
 msgid "Corresponds to the teamd runner.tx_balancer.interval."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:349
+#: ../clients/common/settings-docs.c.in:337
 msgid "Corresponds to the teamd runner.tx_hash."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:350
+#: ../clients/common/settings-docs.c.in:338
 msgid ""
 "The JSON configuration for the team port. The property should contain raw "
 "JSON configuration data suitable for teamd, because the value is passed "
@@ -8782,67 +7718,67 @@ msgid ""
 "man teamd.conf for the format details."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:351
+#: ../clients/common/settings-docs.c.in:339
 msgid "Corresponds to the teamd ports.PORTIFNAME.lacp_key."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:352
+#: ../clients/common/settings-docs.c.in:340
 msgid "Corresponds to the teamd ports.PORTIFNAME.lacp_prio."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:355
+#: ../clients/common/settings-docs.c.in:343
 msgid "Corresponds to the teamd ports.PORTIFNAME.prio."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:356
+#: ../clients/common/settings-docs.c.in:344
 msgid ""
 "Corresponds to the teamd ports.PORTIFNAME.queue_id. When set to -1 means the "
 "parameter is skipped from the json config."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:357
+#: ../clients/common/settings-docs.c.in:345
 msgid "Corresponds to the teamd ports.PORTIFNAME.sticky."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:358
+#: ../clients/common/settings-docs.c.in:346
 msgid ""
 "The group ID which will own the device. If set to NULL everyone will be able "
 "to use the device."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:359
+#: ../clients/common/settings-docs.c.in:347
 msgid ""
 "The operating mode of the virtual device. Allowed values are "
 "NM_SETTING_TUN_MODE_TUN (1) to create a layer 3 device and "
 "NM_SETTING_TUN_MODE_TAP (2) to create an Ethernet-like layer 2 one."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:360
+#: ../clients/common/settings-docs.c.in:348
 msgid ""
 "If the property is set to TRUE, the interface will support multiple file "
 "descriptors (queues) to parallelize packet sending or receiving. Otherwise, "
 "the interface will only support a single queue."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:362
+#: ../clients/common/settings-docs.c.in:350
 msgid ""
 "The user ID which will own the device. If set to NULL everyone will be able "
 "to use the device."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:363
+#: ../clients/common/settings-docs.c.in:351
 msgid ""
 "If TRUE the interface will prepend a 4 byte header describing the physical "
 "interface to the packets."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:364
+#: ../clients/common/settings-docs.c.in:352
 msgid ""
 "If TRUE the IFF_VNET_HDR the tunnel packets will include a virtio network "
 "header."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:365
+#: ../clients/common/settings-docs.c.in:353
 msgid ""
 "A dictionary of key/value pairs with user data. This data is ignored by "
 "NetworkManager and can be used at the users discretion. The keys only "
@@ -8850,14 +7786,14 @@ msgid ""
 "up to a certain length."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:367
+#: ../clients/common/settings-docs.c.in:355
 msgid ""
 "For outgoing packets, a list of mappings from Linux SKB priorities to 802.1p "
 "priorities.  The mapping is given in the format \"from:to\" where both \"from"
 "\" and \"to\" are unsigned integers, ie \"7:3\"."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:368
+#: ../clients/common/settings-docs.c.in:356
 msgid ""
 "One or more flags which control the behavior and features of the VLAN "
 "interface.  Flags include NM_VLAN_FLAG_REORDER_HEADERS (0x1) (reordering of "
@@ -8870,20 +7806,20 @@ msgid ""
 "missing property on D-Bus is still considered as 0."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:369
+#: ../clients/common/settings-docs.c.in:357
 msgid ""
 "The VLAN identifier that the interface created by this connection should be "
 "assigned. The valid range is from 0 to 4094, without the reserved id 4095."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:370
+#: ../clients/common/settings-docs.c.in:358
 msgid ""
 "For incoming packets, a list of mappings from 802.1p priorities to Linux SKB "
 "priorities.  The mapping is given in the format \"from:to\" where both \"from"
 "\" and \"to\" are unsigned integers, ie \"7:3\"."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:372
+#: ../clients/common/settings-docs.c.in:360
 msgid ""
 "If given, specifies the parent interface name or parent connection UUID from "
 "which this VLAN interface should be created.  If this property is not "
@@ -8891,32 +7827,32 @@ msgid ""
 "\"mac-address\" property."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:373
+#: ../clients/common/settings-docs.c.in:361
 msgid ""
 "Dictionary of key/value pairs of VPN plugin specific data.  Both keys and "
 "values must be strings."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:375
+#: ../clients/common/settings-docs.c.in:363
 msgid ""
 "If the VPN service supports persistence, and this property is TRUE, the VPN "
 "will attempt to stay connected across link changes and outages, until "
 "explicitly disconnected."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:376
+#: ../clients/common/settings-docs.c.in:364
 msgid ""
 "Dictionary of key/value pairs of VPN plugin specific secrets like passwords "
 "or private keys.  Both keys and values must be strings."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:377
+#: ../clients/common/settings-docs.c.in:365
 msgid ""
 "D-Bus service name of the VPN plugin that this setting uses to connect to "
 "its network.  i.e. org.freedesktop.NetworkManager.vpnc for the vpnc plugin."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:378
+#: ../clients/common/settings-docs.c.in:366
 msgid ""
 "Timeout for the VPN service to establish the connection. Some services may "
 "take quite a long time to connect. Value of 0 means a default timeout, which "
@@ -8924,7 +7860,7 @@ msgid ""
 "Values greater than zero mean timeout in seconds."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:379
+#: ../clients/common/settings-docs.c.in:367
 msgid ""
 "If the VPN connection requires a user name for authentication, that name "
 "should be provided here.  If the connection is available to more than one "
@@ -8934,135 +7870,113 @@ msgid ""
 "connection."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:380
+#: ../clients/common/settings-docs.c.in:368
 msgid "Specifies the lifetime in seconds of FDB entries learnt by the kernel."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:381
+#: ../clients/common/settings-docs.c.in:369
 msgid ""
 "Specifies the UDP destination port to communicate to the remote VXLAN tunnel "
 "endpoint."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:382
+#: ../clients/common/settings-docs.c.in:370
 msgid ""
 "Specifies the VXLAN Network Identifier (or VXLAN Segment Identifier) to use."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:383
+#: ../clients/common/settings-docs.c.in:371
 msgid "Specifies whether netlink LL ADDR miss notifications are generated."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:384
+#: ../clients/common/settings-docs.c.in:372
 msgid "Specifies whether netlink IP ADDR miss notifications are generated."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:385
+#: ../clients/common/settings-docs.c.in:373
 msgid ""
 "Specifies whether unknown source link layer addresses and IP addresses are "
 "entered into the VXLAN device forwarding database."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:386
+#: ../clients/common/settings-docs.c.in:374
 msgid ""
 "Specifies the maximum number of FDB entries. A value of zero means that the "
 "kernel will store unlimited entries."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:387
+#: ../clients/common/settings-docs.c.in:375
 msgid "If given, specifies the source IP address to use in outgoing packets."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:389
+#: ../clients/common/settings-docs.c.in:377
 msgid ""
 "If given, specifies the parent interface name or parent connection UUID."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:390
+#: ../clients/common/settings-docs.c.in:378
 msgid "Specifies whether ARP proxy is turned on."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:391
+#: ../clients/common/settings-docs.c.in:379
 msgid ""
 "Specifies the unicast destination IP address to use in outgoing packets when "
 "the destination link layer address is not known in the VXLAN device "
 "forwarding database, or the multicast IP address to join."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:392
+#: ../clients/common/settings-docs.c.in:380
 msgid "Specifies whether route short circuit is turned on."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:393
+#: ../clients/common/settings-docs.c.in:381
 msgid ""
 "Specifies the maximum UDP source port to communicate to the remote VXLAN "
 "tunnel endpoint."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:394
+#: ../clients/common/settings-docs.c.in:382
 msgid ""
 "Specifies the minimum UDP source port to communicate to the remote VXLAN "
 "tunnel endpoint."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:395
+#: ../clients/common/settings-docs.c.in:383
 msgid "Specifies the TOS value to use in outgoing packets."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:396
+#: ../clients/common/settings-docs.c.in:384
 msgid "Specifies the time-to-live value to use in outgoing packets."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:397
+#: ../clients/common/settings-docs.c.in:385
 msgid ""
 "If specified, this connection will only apply to the WiMAX device whose MAC "
 "address matches. This property does not change the MAC address of the device "
 "(known as MAC spoofing). Deprecated: 1"
 msgstr ""
-"Se especificado, essa conexão se aplicará apenas ao dispositivo WiMAX cujo "
-"endereço MAC coincidir. Essa propriedade não alterar o endereço MAC do "
-"dispositivo (conhecido como MAC spoofing). Obsoleto: 1"
 
-#: ../clients/common/settings-docs.h.in:399
+#: ../clients/common/settings-docs.c.in:387
 msgid ""
 "Network Service Provider (NSP) name of the WiMAX network this connection "
 "should use. Deprecated: 1"
 msgstr ""
-"Nome do provedor de serviços de rede (NSP) da rede WiMAX que essa conexão "
-"deve usar. Obsoleto: 1"
-
-#: ../clients/common/settings-docs.h.in:400
-msgid ""
-"If specified, this connection will only apply to the IEEE 802.15.4 (WPAN) "
-"MAC layer device whose permanent MAC address matches."
-msgstr ""
-"Se especificado, essa conexão se aplicará apenas ao dispositivo de camada "
-"MAC IEEE 802.15.4 (WPAN) cujo endereço MAC permanente coincidir."
-
-#: ../clients/common/settings-docs.h.in:402
-msgid "IEEE 802.15.4 Personal Area Network (PAN) identifier."
-msgstr "Identificador IEEE 802.15.4 Rede de Área Pessoal (PAN)."
-
-#: ../clients/common/settings-docs.h.in:403
-msgid "Short IEEE 802.15.4 address to be used within a restricted environment."
-msgstr ""
-"Endereço curto IEEE 802.15.4 a ser usado dentro de um ambiente restrito."
 
-#: ../clients/nm-online.c:90
+#: ../clients/nm-online.c:91
 msgid "Connecting"
 msgstr "Conectando"
 
-#: ../clients/nm-online.c:206
-#, c-format
+#: ../clients/nm-online.c:189
+#, fuzzy, c-format
 msgid "Error: timeout creating NMClient object\n"
-msgstr "Erro: tempo limite atingido ao criar objeto NMClient\n"
+msgstr "Erro: não foi possível criar objeto NMClient: %s."
 
-#: ../clients/nm-online.c:226
-#, c-format
+#: ../clients/nm-online.c:209
+#, fuzzy, c-format
 msgid "Error: Could not create NMClient object: %s\n"
-msgstr "Erro: não foi possível criar objeto NMClient: %s\n"
+msgstr "Erro: não foi possível criar objeto NMClient: %s."
 
-#: ../clients/nm-online.c:252
+#: ../clients/nm-online.c:235
 msgid ""
 "Time to wait for a connection, in seconds (without the option, default value "
 "is 30)"
@@ -9070,35 +7984,35 @@ msgstr ""
 "Tempo a esperar por uma conexão, em segundos (sem a opção, o valor padrão é "
 "30)"
 
-#: ../clients/nm-online.c:253
+#: ../clients/nm-online.c:236
 msgid "Exit immediately if NetworkManager is not running or connecting"
 msgstr ""
-"Sai imediatamente caso o NetworkManager não esteja em execução ou conectando"
+"Sair imediatamente caso o NetworkManager não esteja em execução ou conectando"
 
-#: ../clients/nm-online.c:254
+#: ../clients/nm-online.c:237
 msgid "Don't print anything"
-msgstr "Não exibe nada"
+msgstr "Não exibir nada"
 
-#: ../clients/nm-online.c:255
+#: ../clients/nm-online.c:238
 msgid "Wait for NetworkManager startup instead of a connection"
 msgstr "Aguarda o NetworkManager inicializar, em vez de aguardar uma conexão"
 
-#: ../clients/nm-online.c:275
+#: ../clients/nm-online.c:260
 msgid ""
 "Waits for NetworkManager to finish activating startup network connections."
 msgstr ""
 "Aguarda o NetworkManager finalizar a ativação das conexões de rede de "
 "inicialização."
 
-#: ../clients/nm-online.c:282 ../clients/nm-online.c:288
+#: ../clients/nm-online.c:267 ../clients/nm-online.c:273
 msgid "Invalid option.  Please use --help to see a list of valid options."
 msgstr ""
 "Opção inválida. Por favor, use --help para ver uma lista de opções válidas."
 
-#: ../clients/tui/newt/nmt-newt-utils.c:177 ../clients/tui/nmt-editor.c:429
+#: ../clients/tui/newt/nmt-newt-utils.c:177 ../clients/tui/nmt-editor.c:430
 #: ../clients/tui/nmt-password-dialog.c:174
 #: ../clients/tui/nmt-route-editor.c:122 ../clients/tui/nmtui-hostname.c:69
-#: ../clients/tui/nmtui.c:134
+#: ../clients/tui/nmtui.c:136
 msgid "OK"
 msgstr "OK"
 
@@ -9108,129 +8022,139 @@ msgstr "OK"
 msgid "Could not create temporary file: %s"
 msgstr "Não foi possível criar um arquivo temporário: %s"
 
-#: ../clients/tui/newt/nmt-newt-utils.c:363
+#: ../clients/tui/newt/nmt-newt-utils.c:365
 #, c-format
 msgid "Editor failed: %s"
 msgstr "Editor falhou: %s"
 
-#: ../clients/tui/newt/nmt-newt-utils.c:369
+#: ../clients/tui/newt/nmt-newt-utils.c:373
+#, c-format
+msgid "Editor failed with status %d"
+msgstr "Editor falhou cp, status %d"
+
+#: ../clients/tui/newt/nmt-newt-utils.c:375
+#, c-format
+msgid "Editor failed with signal %d"
+msgstr "Editor falhou com sinal %d"
+
+#: ../clients/tui/newt/nmt-newt-utils.c:379
 #, c-format
 msgid "Could not re-read file: %s"
 msgstr "Não foi possível re-ler arquivo: %s"
 
-#: ../clients/tui/nm-editor-utils.c:144 ../libnm-glib/nm-device.c:1820
-#: ../libnm/nm-device.c:1305
+#: ../clients/tui/nm-editor-utils.c:146 ../libnm-glib/nm-device.c:1821
+#: ../libnm/nm-device.c:1521
 msgid "Ethernet"
 msgstr "Ethernet"
 
-#: ../clients/tui/nm-editor-utils.c:148
+#: ../clients/tui/nm-editor-utils.c:150
 #, c-format
 msgid "Ethernet connection %d"
 msgstr "Conexão de ethernet %d"
 
-#: ../clients/tui/nm-editor-utils.c:152 ../libnm-glib/nm-device.c:1822
-#: ../libnm/nm-device.c:1307
+#: ../clients/tui/nm-editor-utils.c:154 ../libnm-glib/nm-device.c:1823
+#: ../libnm/nm-device.c:1523
 msgid "Wi-Fi"
 msgstr "Sem fio (Wi-Fi)"
 
-#: ../clients/tui/nm-editor-utils.c:156
+#: ../clients/tui/nm-editor-utils.c:158
 #, c-format
 msgid "Wi-Fi connection %d"
 msgstr "Conexão de Wi-Fi %d"
 
-#: ../clients/tui/nm-editor-utils.c:161 ../libnm-core/nm-connection.c:2242
-#: ../libnm-glib/nm-device.c:1832 ../libnm/nm-device.c:1323
+#: ../clients/tui/nm-editor-utils.c:163 ../libnm-core/nm-connection.c:2114
+#: ../libnm-glib/nm-device.c:1833 ../libnm/nm-device.c:1539
 msgid "InfiniBand"
 msgstr "InfiniBand"
 
-#: ../clients/tui/nm-editor-utils.c:165
+#: ../clients/tui/nm-editor-utils.c:167
 #, c-format
 msgid "InfiniBand connection %d"
 msgstr "Conexão InfiniBand %d"
 
-#: ../clients/tui/nm-editor-utils.c:170 ../libnm-glib/nm-device.c:1830
-#: ../libnm/nm-device.c:1321
+#: ../clients/tui/nm-editor-utils.c:172 ../libnm-glib/nm-device.c:1831
+#: ../libnm/nm-device.c:1537
 msgid "Mobile Broadband"
 msgstr "Banda Larga Móvel"
 
-#: ../clients/tui/nm-editor-utils.c:173
+#: ../clients/tui/nm-editor-utils.c:175
 #, c-format
 msgid "Mobile broadband connection %d"
 msgstr "Conexão de Banda larga móvel %d"
 
-#: ../clients/tui/nm-editor-utils.c:179 ../clients/tui/nmt-page-dsl.c:62
+#: ../clients/tui/nm-editor-utils.c:181 ../clients/tui/nmt-page-dsl.c:62
 msgid "DSL"
 msgstr "DSL"
 
-#: ../clients/tui/nm-editor-utils.c:183
+#: ../clients/tui/nm-editor-utils.c:185
 #, c-format
 msgid "DSL connection %d"
 msgstr "Conexão DSL %d"
 
-#: ../clients/tui/nm-editor-utils.c:188 ../libnm-core/nm-connection.c:2234
-#: ../libnm-glib/nm-device.c:1834 ../libnm-util/nm-connection.c:1623
-#: ../libnm/nm-device.c:1325
-#: ../src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-reader.c:4653
+#: ../clients/tui/nm-editor-utils.c:190 ../libnm-core/nm-connection.c:2106
+#: ../libnm-glib/nm-device.c:1835 ../libnm-util/nm-connection.c:1626
+#: ../libnm/nm-device.c:1541
+#: ../src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-reader.c:4563
 msgid "Bond"
 msgstr "Vínculo"
 
-#: ../clients/tui/nm-editor-utils.c:192
+#: ../clients/tui/nm-editor-utils.c:194
 #, c-format
 msgid "Bond connection %d"
 msgstr "Conexão vinculada %d"
 
-#: ../clients/tui/nm-editor-utils.c:197 ../libnm-core/nm-connection.c:2238
-#: ../libnm-glib/nm-device.c:1838 ../libnm-util/nm-connection.c:1627
-#: ../libnm/nm-device.c:1329
-#: ../src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-reader.c:4989
+#: ../clients/tui/nm-editor-utils.c:199 ../libnm-core/nm-connection.c:2110
+#: ../libnm-glib/nm-device.c:1839 ../libnm-util/nm-connection.c:1630
+#: ../libnm/nm-device.c:1545
+#: ../src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-reader.c:4899
 msgid "Bridge"
 msgstr "Ponte"
 
-#: ../clients/tui/nm-editor-utils.c:202
+#: ../clients/tui/nm-editor-utils.c:204
 #, c-format
 msgid "Bridge connection %d"
 msgstr "Conexão de Ponte %d"
 
-#: ../clients/tui/nm-editor-utils.c:206 ../libnm-core/nm-connection.c:2236
-#: ../libnm-glib/nm-device.c:1836 ../libnm-util/nm-connection.c:1625
-#: ../libnm/nm-device.c:1327
-#: ../src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-reader.c:4756
+#: ../clients/tui/nm-editor-utils.c:208 ../libnm-core/nm-connection.c:2108
+#: ../libnm-glib/nm-device.c:1837 ../libnm-util/nm-connection.c:1628
+#: ../libnm/nm-device.c:1543
+#: ../src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-reader.c:4666
 msgid "Team"
 msgstr "União"
 
-#: ../clients/tui/nm-editor-utils.c:211
+#: ../clients/tui/nm-editor-utils.c:213
 #, c-format
 msgid "Team connection %d"
 msgstr "Conexão de união %d"
 
-#: ../clients/tui/nm-editor-utils.c:215 ../clients/tui/nmt-page-vlan.c:82
-#: ../libnm-core/nm-connection.c:2240 ../libnm-glib/nm-device.c:1840
-#: ../libnm-util/nm-connection.c:1629 ../libnm/nm-device.c:1331
+#: ../clients/tui/nm-editor-utils.c:217 ../clients/tui/nmt-page-vlan.c:82
+#: ../libnm-core/nm-connection.c:2112 ../libnm-glib/nm-device.c:1841
+#: ../libnm-util/nm-connection.c:1632 ../libnm/nm-device.c:1547
 msgid "VLAN"
 msgstr "VLAN"
 
-#: ../clients/tui/nm-editor-utils.c:219
+#: ../clients/tui/nm-editor-utils.c:221
 #, c-format
 msgid "VLAN connection %d"
 msgstr "Conexão VLAN %d"
 
-#: ../clients/tui/nm-editor-utils.c:223 ../clients/tui/nmt-page-ip-tunnel.c:136
+#: ../clients/tui/nm-editor-utils.c:225 ../clients/tui/nmt-page-ip-tunnel.c:136
 msgid "IP tunnel"
-msgstr "Túnel IP"
+msgstr ""
 
-#: ../clients/tui/nm-editor-utils.c:227
+#: ../clients/tui/nm-editor-utils.c:229
 #, c-format
 msgid "IP tunnel connection %d"
-msgstr "Conexão de túnel IP %d"
+msgstr ""
 
-#: ../clients/tui/nm-editor-utils.c:242
+#: ../clients/tui/nm-editor-utils.c:244
 #, c-format
 msgid "VPN connection %d"
 msgstr "Conexão VPN %d"
 
-#: ../clients/tui/nmt-device-entry.c:368
+#: ../clients/tui/nmt-device-entry.c:370
 msgid "Select..."
-msgstr "Selecionar…"
+msgstr "Selecionar..."
 
 #: ../clients/tui/nmt-edit-connection-list.c:110
 msgid "Add"
@@ -9240,10 +8164,10 @@ msgstr "Adicionar"
 #: ../clients/tui/nmt-page-ip4.c:169 ../clients/tui/nmt-page-ip6.c:167
 #: ../clients/tui/nmt-page-team-port.c:109 ../clients/tui/nmt-page-team.c:173
 msgid "Edit..."
-msgstr "Editar…"
+msgstr "Editar..."
 
 #: ../clients/tui/nmt-edit-connection-list.c:116
-#: ../clients/tui/nmtui-edit.c:529
+#: ../clients/tui/nmtui-edit.c:531
 msgid "Delete"
 msgstr "Remover"
 
@@ -9258,51 +8182,51 @@ msgstr "Exibir"
 #: ../clients/tui/nmt-editor.c:98
 #, c-format
 msgid "Could not create editor for connection '%s' of type '%s'."
-msgstr "Não foi possível criar editor para a conexão “%s” do tipo “%s”."
+msgstr "Não foi possível criar editor para a conexão \"%s\" do tipo \"%s\"."
 
 #: ../clients/tui/nmt-editor.c:102
 #, c-format
 msgid "Could not create editor for invalid connection '%s'."
-msgstr "Não foi possível criar editor para a conexão inválida “%s”."
+msgstr "Não foi possível criar editor para a conexão inválida \"%s\"."
 
 #: ../clients/tui/nmt-editor.c:112
 msgid "Edit Connection"
 msgstr "Editar conexão"
 
-#: ../clients/tui/nmt-editor.c:173
+#: ../clients/tui/nmt-editor.c:174
 #, c-format
 msgid "Unable to save connection: %s"
 msgstr "Incapaz de salvar conexão: %s"
 
-#: ../clients/tui/nmt-editor.c:187
+#: ../clients/tui/nmt-editor.c:188
 #, c-format
 msgid "Unable to add new connection: %s"
 msgstr "Não foi possível de adicionar nova conexão: %s"
 
-#: ../clients/tui/nmt-editor.c:332
+#: ../clients/tui/nmt-editor.c:333
 msgid "Profile name"
 msgstr "Nome do perfil"
 
-#: ../clients/tui/nmt-editor.c:343
+#: ../clients/tui/nmt-editor.c:344
 msgid "Ethernet device"
 msgstr "Dispositivo Ethernet"
 
-#: ../clients/tui/nmt-editor.c:345
+#: ../clients/tui/nmt-editor.c:346
 msgid "Device"
 msgstr "Dispositivo"
 
 #. And finally the bottom widgets
-#: ../clients/tui/nmt-editor.c:405
+#: ../clients/tui/nmt-editor.c:406
 msgid "Automatically connect"
 msgstr "Conectar automaticamente"
 
-#: ../clients/tui/nmt-editor.c:411
+#: ../clients/tui/nmt-editor.c:412
 msgid "Available to all users"
 msgstr "Disponibilizar à todos os usuários"
 
-#: ../clients/tui/nmt-editor.c:426 ../clients/tui/nmt-password-dialog.c:171
-#: ../clients/tui/nmt-route-editor.c:115 ../clients/tui/nmtui-edit.c:220
-#: ../clients/tui/nmtui-edit.c:528 ../clients/tui/nmtui-hostname.c:67
+#: ../clients/tui/nmt-editor.c:427 ../clients/tui/nmt-password-dialog.c:171
+#: ../clients/tui/nmt-route-editor.c:115 ../clients/tui/nmtui-edit.c:222
+#: ../clients/tui/nmtui-edit.c:530 ../clients/tui/nmtui-hostname.c:67
 msgid "Cancel"
 msgstr "Cancelar"
 
@@ -9380,11 +8304,11 @@ msgstr "Frequência de monitoramento"
 
 #: ../clients/tui/nmt-page-bond.c:401
 msgid "Link up delay"
-msgstr "Atraso de ativação do link"
+msgstr "Atraso de ativação de link"
 
 #: ../clients/tui/nmt-page-bond.c:408
 msgid "Link down delay"
-msgstr "Atraso de desativação do link"
+msgstr "Atraso de desativação de link"
 
 #: ../clients/tui/nmt-page-bond.c:421
 msgid "ARP targets"
@@ -9435,7 +8359,7 @@ msgstr "Habilitar STP (Spanning Tree Protocol)"
 
 #: ../clients/tui/nmt-page-bridge.c:128
 msgid "Forward delay"
-msgstr "Atraso de encaminhamento"
+msgstr "Avançar atraso"
 
 #: ../clients/tui/nmt-page-bridge.c:138
 msgid "Hello time"
@@ -9447,7 +8371,7 @@ msgstr "Tempo de expiração máximo"
 
 #: ../clients/tui/nmt-page-bridge.c:154
 msgid "Group forward mask"
-msgstr "Máscara de encaminhamento de grupo"
+msgstr ""
 
 #: ../clients/tui/nmt-page-ethernet.c:70
 msgid "ETHERNET"
@@ -9462,7 +8386,7 @@ msgstr "MTU"
 
 #: ../clients/tui/nmt-page-infiniband.c:47
 msgid "Datagram"
-msgstr "Datagrama"
+msgstr "Datagram"
 
 #: ../clients/tui/nmt-page-infiniband.c:48
 msgid "Connected"
@@ -9474,7 +8398,7 @@ msgstr "INFINIBAND"
 
 #: ../clients/tui/nmt-page-infiniband.c:88
 msgid "Transport mode"
-msgstr "Modo de transporte"
+msgstr "Modo de Transporte"
 
 #: ../clients/tui/nmt-page-ip4.c:38
 msgid "Disabled"
@@ -9509,7 +8433,7 @@ msgstr[1] "%d rotas personalizadas"
 
 #: ../clients/tui/nmt-page-ip4.c:128
 msgid "IPv4 CONFIGURATION"
-msgstr "CONFIGURAÇÃO IPv4"
+msgstr "CONFIGURAÇÃO DO IPv4"
 
 #: ../clients/tui/nmt-page-ip4.c:136 ../clients/tui/nmt-page-ip6.c:136
 msgid "Addresses"
@@ -9517,7 +8441,7 @@ msgstr "Endereços"
 
 #: ../clients/tui/nmt-page-ip4.c:150 ../clients/tui/nmt-page-ip6.c:150
 msgid "DNS servers"
-msgstr "Servidores DNS"
+msgstr "Servidores de DNS"
 
 #: ../clients/tui/nmt-page-ip4.c:156 ../clients/tui/nmt-page-ip6.c:156
 msgid "Search domains"
@@ -9537,11 +8461,11 @@ msgstr "Ignorar rotas obtidas automaticamente"
 
 #: ../clients/tui/nmt-page-ip4.c:185 ../clients/tui/nmt-page-ip6.c:183
 msgid "Ignore automatically obtained DNS parameters"
-msgstr "Ignorar parâmetros DNS obtidos automaticamente"
+msgstr ""
 
 #: ../clients/tui/nmt-page-ip4.c:193
 msgid "Require IPv4 addressing for this connection"
-msgstr "Exibir endereçamento IPv4 para esta conexão"
+msgstr "Requerer endereço IPv4 para esta conexão"
 
 #: ../clients/tui/nmt-page-ip6.c:38
 msgid "Ignore"
@@ -9553,48 +8477,48 @@ msgstr "Automático (somente DHCP)"
 
 #: ../clients/tui/nmt-page-ip6.c:128
 msgid "IPv6 CONFIGURATION"
-msgstr "CONFIGURAÇÃO IPv6"
+msgstr "CONFIGURAÇÃO DO IPv6"
 
 #: ../clients/tui/nmt-page-ip6.c:191
 msgid "Require IPv6 addressing for this connection"
-msgstr "Exibir endereçamento de IPv6 para esta conexão"
+msgstr "Requerer endereço de IPv6 para esta conexão"
 
 #. The order must match the NM_IP_TUNNEL_MODE_* enum
 #: ../clients/tui/nmt-page-ip-tunnel.c:78
 msgid "IPIP"
-msgstr "IPIP"
+msgstr ""
 
 #: ../clients/tui/nmt-page-ip-tunnel.c:79
 msgid "GRE"
-msgstr "GRE"
+msgstr ""
 
 #: ../clients/tui/nmt-page-ip-tunnel.c:80
 msgid "SIT"
-msgstr "SIT"
+msgstr ""
 
 #: ../clients/tui/nmt-page-ip-tunnel.c:81
 msgid "ISATAP"
-msgstr "ISATAP"
+msgstr ""
 
 #: ../clients/tui/nmt-page-ip-tunnel.c:82
 msgid "VTI"
-msgstr "VTI"
+msgstr ""
 
 #: ../clients/tui/nmt-page-ip-tunnel.c:83
 msgid "IP6IP6"
-msgstr "IP6IP6"
+msgstr ""
 
 #: ../clients/tui/nmt-page-ip-tunnel.c:84
 msgid "IPIP6"
-msgstr "IPIP6"
+msgstr ""
 
 #: ../clients/tui/nmt-page-ip-tunnel.c:85
 msgid "IP6GRE"
-msgstr "IP6GRE"
+msgstr ""
 
 #: ../clients/tui/nmt-page-ip-tunnel.c:86
 msgid "VTI6"
-msgstr "VTI6"
+msgstr ""
 
 #: ../clients/tui/nmt-page-ip-tunnel.c:150 ../clients/tui/nmt-page-vlan.c:87
 msgid "Parent"
@@ -9602,19 +8526,19 @@ msgstr "Pai"
 
 #: ../clients/tui/nmt-page-ip-tunnel.c:157
 msgid "Local IP"
-msgstr "IP local"
+msgstr ""
 
 #: ../clients/tui/nmt-page-ip-tunnel.c:163
 msgid "Remote IP"
-msgstr "IP remoto"
+msgstr ""
 
 #: ../clients/tui/nmt-page-ip-tunnel.c:169
 msgid "Input key"
-msgstr "Chave de entrada"
+msgstr ""
 
 #: ../clients/tui/nmt-page-ip-tunnel.c:176
 msgid "Output key"
-msgstr "Chave de saída"
+msgstr ""
 
 #: ../clients/tui/nmt-page-ppp.c:131
 msgid "PPP CONFIGURATION"
@@ -9646,7 +8570,7 @@ msgstr "MSCHAP"
 
 #: ../clients/tui/nmt-page-ppp.c:195
 msgid "Use point-to-point encryption (MPPE)"
-msgstr "Usar criptografia ponto a ponto (MPPE)"
+msgstr "Usar criptografia ponto-a-ponto (MPPE)"
 
 #: ../clients/tui/nmt-page-ppp.c:207
 msgid "Require 128-bit encryption"
@@ -9678,7 +8602,7 @@ msgstr "PORTA DA UNIÃO"
 
 #: ../clients/tui/nmt-page-team-port.c:99 ../clients/tui/nmt-page-team.c:163
 msgid "JSON configuration"
-msgstr "Configuração JSON"
+msgstr "Configuração do JSON"
 
 #: ../clients/tui/nmt-page-team.c:145
 msgid "TEAM"
@@ -9686,7 +8610,7 @@ msgstr "UNIÃO"
 
 #: ../clients/tui/nmt-page-vlan.c:102
 msgid "VLAN id"
-msgstr "ID da VLAN"
+msgstr "VLAN id"
 
 #: ../clients/tui/nmt-page-wifi.c:64
 msgctxt "Wi-Fi"
@@ -9789,7 +8713,7 @@ msgstr "Segurança"
 #. FIXME
 #: ../clients/tui/nmt-page-wifi.c:282
 msgid "(No support for wpa-enterprise yet...)"
-msgstr "(Nenhum suporte a WPA Empresarial ainda…)"
+msgstr "(Nenhum suporte a WPA Empresarial ainda...)"
 
 #: ../clients/tui/nmt-page-wifi.c:292 ../clients/tui/nmt-page-wifi.c:311
 msgid "WEP index"
@@ -9803,7 +8727,7 @@ msgstr "Autenticação"
 #. FIXME
 #: ../clients/tui/nmt-page-wifi.c:325
 msgid "(No support for dynamic-wep yet...)"
-msgstr "(Nenhum suporte a WEP Dinâmico ainda…)"
+msgstr "(Nenhum suporte a WEP Dinâmico ainda...)"
 
 #: ../clients/tui/nmt-page-wifi.c:358
 msgid "BSSID"
@@ -9817,33 +8741,33 @@ msgstr "Solicitar por esta senha todas as vezes"
 msgid "Show password"
 msgstr "Exibir senha"
 
-#: ../clients/tui/nmt-route-table.c:187
+#: ../clients/tui/nmt-route-table.c:191
 msgid "Destination"
 msgstr "Destino"
 
-#: ../clients/tui/nmt-route-table.c:187
+#: ../clients/tui/nmt-route-table.c:191
 msgid "Prefix"
 msgstr "Prefixo"
 
-#: ../clients/tui/nmt-route-table.c:196
+#: ../clients/tui/nmt-route-table.c:200
 msgid "Next Hop"
-msgstr "Próximo salto"
+msgstr "Próxima salto"
 
-#: ../clients/tui/nmt-route-table.c:204
+#: ../clients/tui/nmt-route-table.c:208
 msgid "Metric"
-msgstr "Métrica"
+msgstr "Métrico"
 
-#: ../clients/tui/nmt-route-table.c:224
+#: ../clients/tui/nmt-route-table.c:228
 msgid "No custom routes are defined."
 msgstr "Nenhuma rota de cliente foi definida."
 
-#: ../clients/tui/nmt-slave-list.c:134
+#: ../clients/tui/nmt-slave-list.c:136
 msgid "Select the type of slave connection you wish to add."
 msgstr "Selecionar o tipo de conexão escrava que você deseja adicionar."
 
 #: ../clients/tui/nmt-widget-list.c:139
 msgid "Add..."
-msgstr "Adicionar…"
+msgstr "Adicionar..."
 
 #: ../clients/tui/nmt-widget-list.c:202
 msgid "Remove"
@@ -9875,11 +8799,11 @@ msgstr "openconnect falhou com sinal %d"
 #: ../clients/tui/nmtui-connect.c:183
 #, c-format
 msgid "Activation failed: %s"
-msgstr "Ativação falhou: %s"
+msgstr ""
 
 #: ../clients/tui/nmtui-connect.c:254
 msgid "Connecting..."
-msgstr "Conectar…"
+msgstr "Conectar..."
 
 #: ../clients/tui/nmtui-connect.c:292 ../clients/tui/nmtui-connect.c:329
 #, c-format
@@ -9894,33 +8818,33 @@ msgstr "Ativar"
 msgid "Deactivate"
 msgstr "Desativar"
 
-#: ../clients/tui/nmtui-connect.c:445 ../clients/tui/nmtui-edit.c:118
-#: ../clients/tui/nmtui.c:128
+#: ../clients/tui/nmtui-connect.c:445 ../clients/tui/nmtui-edit.c:120
+#: ../clients/tui/nmtui.c:130
 msgid "Quit"
 msgstr "Cancelar"
 
-#: ../clients/tui/nmtui-connect.c:445 ../clients/tui/nmtui-edit.c:118
+#: ../clients/tui/nmtui-connect.c:445 ../clients/tui/nmtui-edit.c:120
 msgid "Back"
 msgstr "Voltar"
 
 #: ../clients/tui/nmtui-connect.c:468
 #, c-format
 msgid "No such connection '%s'"
-msgstr "Nenhuma conexão “%s”"
+msgstr "Nenhuma conexão \"%s\""
 
 #: ../clients/tui/nmtui-connect.c:470
 msgid "Connection is already active"
 msgstr "A conexão já está ativada"
 
-#: ../clients/tui/nmtui-edit.c:228
+#: ../clients/tui/nmtui-edit.c:230
 msgid "Create"
 msgstr "Criar"
 
-#: ../clients/tui/nmtui-edit.c:370
+#: ../clients/tui/nmtui-edit.c:372
 msgid "Select the type of connection you wish to create."
 msgstr "Selecionar o tipo de conexão que você deseja criar."
 
-#: ../clients/tui/nmtui-edit.c:378
+#: ../clients/tui/nmtui-edit.c:380
 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."
@@ -9928,24 +8852,24 @@ msgstr ""
 "Se você estiver criando uma conexão VPN e esta conexão que você deseja criar "
 "não aparece na lista, você pode não ter o plug-in VPN correto instalado."
 
-#: ../clients/tui/nmtui-edit.c:414 ../clients/tui/nmtui-edit.c:430
+#: ../clients/tui/nmtui-edit.c:416 ../clients/tui/nmtui-edit.c:432
 msgid "New Connection"
 msgstr "Nova conexão"
 
-#: ../clients/tui/nmtui-edit.c:469
+#: ../clients/tui/nmtui-edit.c:471
 #, c-format
 msgid "Unable to delete connection: %s"
 msgstr "Não foi possível remover conexão: %s"
 
-#: ../clients/tui/nmtui-edit.c:508
+#: ../clients/tui/nmtui-edit.c:510
 #, c-format
 msgid "Could not delete connection '%s': %s"
-msgstr "Não foi possível excluir a conexão “%s”: %s"
+msgstr "Nâo foi possível excluir a conexão \"%s\": %s"
 
-#: ../clients/tui/nmtui-edit.c:530
+#: ../clients/tui/nmtui-edit.c:532
 #, c-format
 msgid "Are you sure you want to delete the connection '%s'?"
-msgstr "Você tem certeza de que você quer excluir a conexão “%s”?"
+msgstr "Você tem certeza de que você quer excluir a conexão \"%s\"?"
 
 #: ../clients/tui/nmtui-hostname.c:45
 msgid "Set Hostname"
@@ -9959,136 +8883,136 @@ msgstr "Nome de máquina"
 #: ../clients/tui/nmtui-hostname.c:116
 #, c-format
 msgid "Set hostname to '%s'"
-msgstr "Definir nome de máquina para “%s”"
+msgstr "Definir nome de máquina para \"%s\""
 
 #: ../clients/tui/nmtui-hostname.c:118
 #, c-format
 msgid "Unable to set hostname: %s"
 msgstr "Incapaz de definir nome de máquina: %s"
 
-#: ../clients/tui/nmtui.c:51 ../clients/tui/nmtui.c:54
+#: ../clients/tui/nmtui.c:53 ../clients/tui/nmtui.c:56
 msgid "connection"
 msgstr "conexão"
 
-#: ../clients/tui/nmtui.c:52
+#: ../clients/tui/nmtui.c:54
 msgid "Edit a connection"
 msgstr "Editar uma conexão"
 
-#: ../clients/tui/nmtui.c:55
+#: ../clients/tui/nmtui.c:57
 msgid "Activate a connection"
 msgstr "Ativar uma conexão"
 
-#: ../clients/tui/nmtui.c:57
+#: ../clients/tui/nmtui.c:59
 msgid "new hostname"
 msgstr "novo nome de máquina"
 
-#: ../clients/tui/nmtui.c:58
+#: ../clients/tui/nmtui.c:60
 msgid "Set system hostname"
 msgstr "Definir nome de máquina do sistema"
 
-#: ../clients/tui/nmtui.c:102
+#: ../clients/tui/nmtui.c:104
 msgid "NetworkManager TUI"
 msgstr "NetworkManager TUI"
 
-#: ../clients/tui/nmtui.c:110
+#: ../clients/tui/nmtui.c:112
 msgid "Please select an option"
 msgstr "Por favor selecione uma opção"
 
-#: ../clients/tui/nmtui.c:158
+#: ../clients/tui/nmtui.c:160
 msgid "Usage"
 msgstr "Uso"
 
-#: ../clients/tui/nmtui.c:239
+#: ../clients/tui/nmtui.c:241
 msgid "Could not parse arguments"
 msgstr "Não foi possível analisar argumentos"
 
-#: ../clients/tui/nmtui.c:249
+#: ../clients/tui/nmtui.c:251
 #, c-format
 msgid "Could not contact NetworkManager: %s.\n"
 msgstr "Não foi possível contatar o NetworkManager: %s.\n"
 
-#: ../clients/tui/nmtui.c:254
+#: ../clients/tui/nmtui.c:256
 msgid "NetworkManager is not running."
 msgstr "NetworkManager não está em execução."
 
-#: ../libnm-core/crypto.c:118 ../libnm-util/crypto.c:130
+#: ../libnm-core/crypto.c:118 ../libnm-util/crypto.c:131
 #, c-format
 msgid "PEM key file had no end tag '%s'."
-msgstr "A arquivo de chave PEM não tinha a marca de finalização “%s”."
+msgstr "A arquivo de chave PEM não tinha a marca de finalização \"%s\"."
 
-#: ../libnm-core/crypto.c:131 ../libnm-util/crypto.c:143
+#: ../libnm-core/crypto.c:131 ../libnm-util/crypto.c:144
 #, c-format
 msgid "Doesn't look like a PEM private key file."
 msgstr "Não se parece com um arquivo de chave privada PEM."
 
-#: ../libnm-core/crypto.c:148 ../libnm-util/crypto.c:160
+#: ../libnm-core/crypto.c:148 ../libnm-util/crypto.c:161
 #, c-format
 msgid "Malformed PEM file: Proc-Type was not first tag."
 msgstr "Arquivo PEM defeituoso: Proc-Type não era a primeira marca."
 
-#: ../libnm-core/crypto.c:156 ../libnm-util/crypto.c:168
+#: ../libnm-core/crypto.c:156 ../libnm-util/crypto.c:169
 #, c-format
 msgid "Malformed PEM file: unknown Proc-Type tag '%s'."
-msgstr "Arquivo PEM defeituoso: marca Proc-Type desconhecida: “%s”."
+msgstr "Arquivo PEM defeituoso: marca Proc-Type desconhecida: \"%s\"."
 
-#: ../libnm-core/crypto.c:166 ../libnm-util/crypto.c:178
+#: ../libnm-core/crypto.c:166 ../libnm-util/crypto.c:179
 #, c-format
 msgid "Malformed PEM file: DEK-Info was not the second tag."
 msgstr "Arquivo PEM defeituoso: DEK-Info não era a segunda marca."
 
-#: ../libnm-core/crypto.c:177 ../libnm-util/crypto.c:189
+#: ../libnm-core/crypto.c:177 ../libnm-util/crypto.c:190
 #, c-format
 msgid "Malformed PEM file: no IV found in DEK-Info tag."
 msgstr "Arquivo PEM defeituoso: nenhum IV localizado na marca DEK-Info."
 
-#: ../libnm-core/crypto.c:184 ../libnm-util/crypto.c:196
+#: ../libnm-core/crypto.c:184 ../libnm-util/crypto.c:197
 #, c-format
 msgid "Malformed PEM file: invalid format of IV in DEK-Info tag."
 msgstr "Arquivo PEM defeituoso: formato inválido do IV na marca DEK-Info."
 
-#: ../libnm-core/crypto.c:199 ../libnm-util/crypto.c:211
+#: ../libnm-core/crypto.c:199 ../libnm-util/crypto.c:212
 #, c-format
 msgid "Malformed PEM file: unknown private key cipher '%s'."
-msgstr "Arquivo PEM defeituoso: cifra de chave privada desconhecida “%s”."
+msgstr "Arquivo PEM defeituoso: cifra de chave privada desconhecida \"%s\"."
 
-#: ../libnm-core/crypto.c:218 ../libnm-util/crypto.c:230
+#: ../libnm-core/crypto.c:218 ../libnm-util/crypto.c:231
 #, c-format
 msgid "Could not decode private key."
 msgstr "Não foi possível decodificar chave privada."
 
-#: ../libnm-core/crypto.c:272 ../libnm-util/crypto.c:282
+#: ../libnm-core/crypto.c:272 ../libnm-util/crypto.c:283
 msgid "Failed to find expected PKCS#8 start tag."
 msgstr "Falha ao procurar a marca de início PKCS#8 esperada."
 
-#: ../libnm-core/crypto.c:280 ../libnm-util/crypto.c:290
+#: ../libnm-core/crypto.c:280 ../libnm-util/crypto.c:291
 #, c-format
 msgid "Failed to find expected PKCS#8 end tag '%s'."
-msgstr "Falha ao procurar a marca de finalização PKCS#8 “%s” esperada."
+msgstr "Falha ao procurar a marca de finalização PKCS#8 \"%s\" esperada."
 
-#: ../libnm-core/crypto.c:299 ../libnm-util/crypto.c:309
+#: ../libnm-core/crypto.c:299 ../libnm-util/crypto.c:310
 msgid "Failed to decode PKCS#8 private key."
 msgstr "Falha ao descriptografar a chave privada PKCS#8."
 
-#: ../libnm-core/crypto.c:341 ../libnm-util/crypto.c:351
+#: ../libnm-core/crypto.c:341 ../libnm-util/crypto.c:352
 #, c-format
 msgid "IV must be an even number of bytes in length."
 msgstr "O tamanho do IV deve ser um número par de bytes."
 
-#: ../libnm-core/crypto.c:355 ../libnm-util/crypto.c:365
+#: ../libnm-core/crypto.c:355 ../libnm-util/crypto.c:366
 #, c-format
 msgid "IV contains non-hexadecimal digits."
 msgstr "IV contém dígitos não-hexadecimais."
 
 #: ../libnm-core/crypto.c:395 ../libnm-core/crypto_gnutls.c:91
 #: ../libnm-core/crypto_gnutls.c:197 ../libnm-core/crypto_nss.c:112
-#: ../libnm-core/crypto_nss.c:277 ../libnm-util/crypto.c:405
-#: ../libnm-util/crypto_gnutls.c:151 ../libnm-util/crypto_gnutls.c:253
+#: ../libnm-core/crypto_nss.c:277 ../libnm-util/crypto.c:406
+#: ../libnm-util/crypto_gnutls.c:151 ../libnm-util/crypto_gnutls.c:256
 #: ../libnm-util/crypto_nss.c:162 ../libnm-util/crypto_nss.c:323
 #, c-format
 msgid "Private key cipher '%s' was unknown."
-msgstr "A cifra da chave privada “%s” era desconhecida."
+msgstr "A cifra da chave privada \"%s\" era desconhecida."
 
-#: ../libnm-core/crypto.c:494 ../libnm-util/crypto.c:515
+#: ../libnm-core/crypto.c:494 ../libnm-util/crypto.c:516
 #, c-format
 msgid "Unable to determine private key type."
 msgstr "Não foi possível determinar o tipo da chave privada."
@@ -10098,17 +9022,17 @@ msgstr "Não foi possível determinar o tipo da chave privada."
 msgid "Password provided, but key was not encrypted."
 msgstr "Senha fornecida, mas a chave não estava criptografada."
 
-#: ../libnm-core/crypto.c:555 ../libnm-util/crypto.c:570
+#: ../libnm-core/crypto.c:555 ../libnm-util/crypto.c:571
 #, c-format
 msgid "PEM certificate had no start tag '%s'."
-msgstr "Certificado PEM não tinha a marca de inicialização “%s”."
+msgstr "Certificado PEM não tinha a marca de inicialização \"%s\"."
 
-#: ../libnm-core/crypto.c:564 ../libnm-util/crypto.c:579
+#: ../libnm-core/crypto.c:564 ../libnm-util/crypto.c:580
 #, c-format
 msgid "PEM certificate had no end tag '%s'."
-msgstr "Certificado PEM não tinha a marca de finalização “%s”."
+msgstr "Certificado PEM não tinha a marca de finalização \"%s\"."
 
-#: ../libnm-core/crypto.c:582 ../libnm-util/crypto.c:597
+#: ../libnm-core/crypto.c:582 ../libnm-util/crypto.c:598
 #, c-format
 msgid "Failed to decode certificate."
 msgstr "Falha ao decodificar o certificado."
@@ -10146,47 +9070,47 @@ msgstr ""
 msgid "Failed to decrypt the private key."
 msgstr "Falha ao descriptografar a chave privada."
 
-#: ../libnm-core/crypto_gnutls.c:224 ../libnm-util/crypto_gnutls.c:280
+#: ../libnm-core/crypto_gnutls.c:224 ../libnm-util/crypto_gnutls.c:283
 #, c-format
 msgid "Failed to initialize the encryption cipher context: %s (%s)"
 msgstr "Falha ao inicializar o contexto da cifra de criptografia: %s (%s)"
 
-#: ../libnm-core/crypto_gnutls.c:233 ../libnm-util/crypto_gnutls.c:289
+#: ../libnm-core/crypto_gnutls.c:233 ../libnm-util/crypto_gnutls.c:292
 #, c-format
 msgid "Failed to encrypt the data: %s (%s)"
 msgstr "Falha ao criptografar os dados: %s (%s)"
 
-#: ../libnm-core/crypto_gnutls.c:276 ../libnm-util/crypto_gnutls.c:329
+#: ../libnm-core/crypto_gnutls.c:276 ../libnm-util/crypto_gnutls.c:332
 #, c-format
 msgid "Error initializing certificate data: %s"
 msgstr "Erro ao inicializar os dados do certificado: %s"
 
-#: ../libnm-core/crypto_gnutls.c:298 ../libnm-util/crypto_gnutls.c:351
+#: ../libnm-core/crypto_gnutls.c:298 ../libnm-util/crypto_gnutls.c:354
 #, c-format
 msgid "Couldn't decode certificate: %s"
 msgstr "Não foi possível decodificar o certificado: %s"
 
-#: ../libnm-core/crypto_gnutls.c:326 ../libnm-util/crypto_gnutls.c:375
+#: ../libnm-core/crypto_gnutls.c:326 ../libnm-util/crypto_gnutls.c:378
 #, c-format
 msgid "Couldn't initialize PKCS#12 decoder: %s"
 msgstr "Não foi possível inicializar o decodificador PKCS#12: %s"
 
-#: ../libnm-core/crypto_gnutls.c:339 ../libnm-util/crypto_gnutls.c:388
+#: ../libnm-core/crypto_gnutls.c:339 ../libnm-util/crypto_gnutls.c:391
 #, c-format
 msgid "Couldn't decode PKCS#12 file: %s"
 msgstr "Não foi possível decodificar o arquivo PKCS#12: %s"
 
-#: ../libnm-core/crypto_gnutls.c:351 ../libnm-util/crypto_gnutls.c:400
+#: ../libnm-core/crypto_gnutls.c:351 ../libnm-util/crypto_gnutls.c:403
 #, c-format
 msgid "Couldn't verify PKCS#12 file: %s"
 msgstr "Não foi possível verificar o arquivo PKCS#12: %s"
 
-#: ../libnm-core/crypto_gnutls.c:383 ../libnm-util/crypto_gnutls.c:428
+#: ../libnm-core/crypto_gnutls.c:383 ../libnm-util/crypto_gnutls.c:431
 #, c-format
 msgid "Couldn't initialize PKCS#8 decoder: %s"
 msgstr "Não foi possível inicializar o decodificador PKCS#8: %s"
 
-#: ../libnm-core/crypto_gnutls.c:406 ../libnm-util/crypto_gnutls.c:451
+#: ../libnm-core/crypto_gnutls.c:406 ../libnm-util/crypto_gnutls.c:454
 #, c-format
 msgid "Couldn't decode PKCS#8 file: %s"
 msgstr "Não foi possível decodificar o arquivo PKCS#8: %s"
@@ -10297,717 +9221,691 @@ msgstr "Não foi possível verificar o arquivo PKCS#12: %d"
 msgid "Could not generate random data."
 msgstr "Não foi possível gerar dados aleatórios."
 
-#: ../libnm-core/nm-connection.c:283
+#: ../libnm-core/nm-connection.c:249
 msgid "wrong type; should be a list of strings."
 msgstr "tipo incorreto; deveria ser uma lista de strings."
 
-#: ../libnm-core/nm-connection.c:353
+#: ../libnm-core/nm-connection.c:319
 msgid "unknown setting name"
 msgstr "nome de definição desconhecido"
 
-#: ../libnm-core/nm-connection.c:365
+#: ../libnm-core/nm-connection.c:331
 msgid "duplicate setting name"
 msgstr "nome de definição duplicado"
 
-#: ../libnm-core/nm-connection.c:1325
+#: ../libnm-core/nm-connection.c:1233
 msgid "setting not found"
 msgstr "definição não localizada"
 
-#: ../libnm-core/nm-connection.c:1391 ../libnm-core/nm-connection.c:1416
-#: ../libnm-core/nm-connection.c:1441
-msgid "setting is required for non-slave connections"
-msgstr "definição é exigida para conexões não escravas"
-
-#: ../libnm-core/nm-connection.c:1404 ../libnm-core/nm-connection.c:1429
-#: ../libnm-core/nm-connection.c:1454
+#: ../libnm-core/nm-connection.c:1300
 msgid "setting not allowed in slave connection"
 msgstr "definição não permitida para conexão escrava"
 
-#: ../libnm-core/nm-connection.c:1544
+#: ../libnm-core/nm-connection.c:1316
+msgid "setting is required for non-slave connections"
+msgstr "definição é exigida para conexões não escravas"
+
+#: ../libnm-core/nm-connection.c:1412
 msgid "Unexpected failure to verify the connection"
 msgstr "Falha inesperada ao verificar a conexão"
 
-#: ../libnm-core/nm-connection.c:1588
+#: ../libnm-core/nm-connection.c:1454
 msgid "Unexpected failure to normalize the connection"
 msgstr "Falha inesperada ao normalizar a conexão"
 
-#: ../libnm-core/nm-connection.c:2100 ../libnm-core/nm-setting-8021x.c:2868
-#: ../libnm-core/nm-setting-8021x.c:2885 ../libnm-core/nm-setting-8021x.c:2916
-#: ../libnm-core/nm-setting-8021x.c:2933 ../libnm-core/nm-setting-8021x.c:2975
-#: ../libnm-core/nm-setting-8021x.c:2987 ../libnm-core/nm-setting-8021x.c:3005
-#: ../libnm-core/nm-setting-8021x.c:3017 ../libnm-core/nm-setting-8021x.c:3041
-#: ../libnm-core/nm-setting-8021x.c:3220 ../libnm-core/nm-setting-adsl.c:188
-#: ../libnm-core/nm-setting-bluetooth.c:137
-#: ../libnm-core/nm-setting-bluetooth.c:195
-#: ../libnm-core/nm-setting-bluetooth.c:209 ../libnm-core/nm-setting-cdma.c:158
-#: ../libnm-core/nm-setting-connection.c:911
-#: ../libnm-core/nm-setting-connection.c:954
-#: ../libnm-core/nm-setting-connection.c:1096
-#: ../libnm-core/nm-setting-ip-config.c:2494
-#: ../libnm-core/nm-setting-ip-tunnel.c:374
-#: ../libnm-core/nm-setting-olpc-mesh.c:119
-#: ../libnm-core/nm-setting-ovs-patch.c:93 ../libnm-core/nm-setting-pppoe.c:160
-#: ../libnm-core/nm-setting-vpn.c:488 ../libnm-core/nm-setting-vxlan.c:359
-#: ../libnm-core/nm-setting-wimax.c:125
-#: ../libnm-core/nm-setting-wireless-security.c:919
-#: ../libnm-core/nm-setting-wireless.c:751 ../libnm-util/nm-setting.c:1355
-#: ../libnm-util/nm-setting.c:1374 ../libnm-util/nm-setting.c:1392
-#: ../libnm-util/nm-setting-8021x.c:2324 ../libnm-util/nm-setting-8021x.c:2341
-#: ../libnm-util/nm-setting-8021x.c:2382 ../libnm-util/nm-setting-8021x.c:2399
-#: ../libnm-util/nm-setting-8021x.c:2451 ../libnm-util/nm-setting-8021x.c:2463
-#: ../libnm-util/nm-setting-8021x.c:2481 ../libnm-util/nm-setting-8021x.c:2493
-#: ../libnm-util/nm-setting-8021x.c:2517 ../libnm-util/nm-setting-8021x.c:2677
-#: ../libnm-util/nm-setting-adsl.c:209 ../libnm-util/nm-setting-bluetooth.c:141
-#: ../libnm-util/nm-setting-bluetooth.c:159 ../libnm-util/nm-setting-cdma.c:161
-#: ../libnm-util/nm-setting-connection.c:765
-#: ../libnm-util/nm-setting-connection.c:781
-#: ../libnm-util/nm-setting-connection.c:842
+#: ../libnm-core/nm-connection.c:1973 ../libnm-core/nm-setting-8021x.c:2881
+#: ../libnm-core/nm-setting-8021x.c:2898 ../libnm-core/nm-setting-8021x.c:2929
+#: ../libnm-core/nm-setting-8021x.c:2946 ../libnm-core/nm-setting-8021x.c:2988
+#: ../libnm-core/nm-setting-8021x.c:3000 ../libnm-core/nm-setting-8021x.c:3018
+#: ../libnm-core/nm-setting-8021x.c:3030 ../libnm-core/nm-setting-8021x.c:3054
+#: ../libnm-core/nm-setting-8021x.c:3235 ../libnm-core/nm-setting-adsl.c:189
+#: ../libnm-core/nm-setting-bluetooth.c:138
+#: ../libnm-core/nm-setting-bluetooth.c:196
+#: ../libnm-core/nm-setting-bluetooth.c:210 ../libnm-core/nm-setting-cdma.c:159
+#: ../libnm-core/nm-setting-connection.c:894
+#: ../libnm-core/nm-setting-connection.c:937
+#: ../libnm-core/nm-setting-connection.c:1066
+#: ../libnm-core/nm-setting-ip-config.c:2514
+#: ../libnm-core/nm-setting-ip-tunnel.c:352
+#: ../libnm-core/nm-setting-olpc-mesh.c:120
+#: ../libnm-core/nm-setting-ovs-patch.c:95 ../libnm-core/nm-setting-pppoe.c:161
+#: ../libnm-core/nm-setting-vpn.c:518 ../libnm-core/nm-setting-vxlan.c:360
+#: ../libnm-core/nm-setting-wimax.c:126
+#: ../libnm-core/nm-setting-wireless-security.c:900
+#: ../libnm-core/nm-setting-wireless.c:750 ../libnm-util/nm-setting.c:1357
+#: ../libnm-util/nm-setting.c:1376 ../libnm-util/nm-setting.c:1394
+#: ../libnm-util/nm-setting-8021x.c:2325 ../libnm-util/nm-setting-8021x.c:2342
+#: ../libnm-util/nm-setting-8021x.c:2383 ../libnm-util/nm-setting-8021x.c:2400
+#: ../libnm-util/nm-setting-8021x.c:2452 ../libnm-util/nm-setting-8021x.c:2464
+#: ../libnm-util/nm-setting-8021x.c:2482 ../libnm-util/nm-setting-8021x.c:2494
+#: ../libnm-util/nm-setting-8021x.c:2518 ../libnm-util/nm-setting-8021x.c:2680
+#: ../libnm-util/nm-setting-adsl.c:209 ../libnm-util/nm-setting-bluetooth.c:142
+#: ../libnm-util/nm-setting-bluetooth.c:160 ../libnm-util/nm-setting-cdma.c:162
+#: ../libnm-util/nm-setting-connection.c:768
+#: ../libnm-util/nm-setting-connection.c:784
+#: ../libnm-util/nm-setting-connection.c:845
 #: ../libnm-util/nm-setting-ip4-config.c:869
-#: ../libnm-util/nm-setting-ip6-config.c:831
-#: ../libnm-util/nm-setting-ip6-config.c:897
+#: ../libnm-util/nm-setting-ip6-config.c:833
+#: ../libnm-util/nm-setting-ip6-config.c:899
 #: ../libnm-util/nm-setting-olpc-mesh.c:123
-#: ../libnm-util/nm-setting-pppoe.c:162 ../libnm-util/nm-setting-vpn.c:422
-#: ../libnm-util/nm-setting-wimax.c:149
-#: ../libnm-util/nm-setting-wireless-security.c:890
-#: ../libnm-util/nm-setting-wireless.c:768
+#: ../libnm-util/nm-setting-pppoe.c:163 ../libnm-util/nm-setting-vpn.c:423
+#: ../libnm-util/nm-setting-wimax.c:150
+#: ../libnm-util/nm-setting-wireless-security.c:891
+#: ../libnm-util/nm-setting-wireless.c:769
 msgid "property is missing"
 msgstr "propriedade está faltando"
 
-#: ../libnm-core/nm-connection.c:2245
+#: ../libnm-core/nm-connection.c:2117
 msgid "IP Tunnel"
 msgstr "Túnel IP"
 
-#: ../libnm-core/nm-dbus-utils.c:189
+#: ../libnm-core/nm-dbus-utils.c:188
 #, c-format
 msgid "Method returned type '%s', but expected '%s'"
-msgstr "O método retornou o tipo “%s”, mas esperava-se “%s”"
+msgstr "O método retornou o tipo \"%s\", mas esperava-se \"%s\""
 
-#: ../libnm-core/nm-keyfile.c:199
+#: ../libnm-core/nm-keyfile-reader.c:144
 msgid "ignoring missing number"
 msgstr "ignorando número faltante"
 
-#: ../libnm-core/nm-keyfile.c:207
+#: ../libnm-core/nm-keyfile-reader.c:152
 #, c-format
 msgid "ignoring invalid number '%s'"
-msgstr "ignorando número inválido “%s”"
+msgstr "ignorando número inválido \"%s\""
 
-#: ../libnm-core/nm-keyfile.c:228
+#: ../libnm-core/nm-keyfile-reader.c:173
 #, c-format
 msgid "ignoring invalid %s address: %s"
 msgstr "ignorando endereço %s inválido: %s"
 
-#: ../libnm-core/nm-keyfile.c:270
+#: ../libnm-core/nm-keyfile-reader.c:215
 #, c-format
 msgid "ignoring invalid gateway '%s' for %s route"
-msgstr "ignorando gateway “%s” inválido para rota %s"
+msgstr "ignorando gateway \"%s\" inválido para rota %s"
 
-#: ../libnm-core/nm-keyfile.c:291
+#: ../libnm-core/nm-keyfile-reader.c:236
 #, c-format
 msgid "ignoring invalid %s route: %s"
 msgstr "ignorando rota %s inválido: %s"
 
-#: ../libnm-core/nm-keyfile.c:416
+#: ../libnm-core/nm-keyfile-reader.c:362
 #, c-format
 msgid "unexpected character '%c' for address %s: '%s' (position %td)"
-msgstr "caractere “%c” inesperado para endereço %s: “%s” (posição %td)"
+msgstr "caractere \"%c\" inesperado para endereço %s: \"%s\" (posição %td)"
 
-#: ../libnm-core/nm-keyfile.c:426
+#: ../libnm-core/nm-keyfile-reader.c:372
 #, c-format
 msgid "unexpected character '%c' for %s: '%s' (position %td)"
-msgstr "caractere “%c” inesperado para %s: “%s” (posição %td)"
+msgstr "caractere \"%c\" inesperado para %s: \"%s\" (posição %td)"
 
-#: ../libnm-core/nm-keyfile.c:435
+#: ../libnm-core/nm-keyfile-reader.c:381
 #, c-format
 msgid "unexpected character '%c' in prefix length for %s: '%s' (position %td)"
 msgstr ""
-"caractere “%c” inesperado no tamanho do prefixo para %s: “%s” (posição %td)"
+"caractere \"%c\" inesperado no tamanho do prefixo para %s: \"%s\" (posição "
+"%td)"
 
-#: ../libnm-core/nm-keyfile.c:446
+#: ../libnm-core/nm-keyfile-reader.c:392
 #, c-format
 msgid "garbage at the end of value %s: '%s'"
-msgstr "lixo ao final do valor %s: “%s”"
+msgstr "lixo ao final do valor %s: \"%s\""
 
-#: ../libnm-core/nm-keyfile.c:452
+#: ../libnm-core/nm-keyfile-reader.c:398
 #, c-format
 msgid "deprecated semicolon at the end of value %s: '%s'"
-msgstr "ponto-e-vírgula obsoleta ao final do valor %s: “%s”"
+msgstr "ponto-e-vírgula obsoleta ao final do valor %s: \"%s\""
 
-#: ../libnm-core/nm-keyfile.c:467
+#: ../libnm-core/nm-keyfile-reader.c:413
 #, c-format
 msgid "invalid prefix length for %s '%s', defaulting to %d"
-msgstr "tamanho de prefixo inválido para %s “%s”, usando o padrão %d"
+msgstr "tamanho de prefixo inválido para %s \"%s\", usando o padrão %d"
 
-#: ../libnm-core/nm-keyfile.c:474
+#: ../libnm-core/nm-keyfile-reader.c:420
 #, c-format
 msgid "missing prefix length for %s '%s', defaulting to %d"
-msgstr "faltando tamanho de prefixo para %s “%s”, usando o padrão %d"
+msgstr "faltando tamanho de prefixo para %s \"%s\", usando o padrão %d"
+
+#: ../libnm-core/nm-keyfile-reader.c:554
+#, c-format
+msgid "ignoring invalid DNS server IPv4 address '%s'"
+msgstr "ignorando endereço IPv4 %s inválido para servidor DNS"
 
-#: ../libnm-core/nm-keyfile.c:738
+#: ../libnm-core/nm-keyfile-reader.c:593
 #, c-format
-msgid "ignoring invalid DNS server IPv%c address '%s'"
-msgstr "ignorando endereço DNS inválido para endereços IPv%c “%s”"
+msgid "ignoring invalid DNS server IPv6 address '%s'"
+msgstr "ignorando endereço IPv6 %s inválido para servidor DNS"
 
-#: ../libnm-core/nm-keyfile.c:834 ../libnm-core/nm-keyfile.c:2625
+#: ../libnm-core/nm-keyfile-reader.c:687 ../libnm-core/nm-keyfile-reader.c:1721
 #, c-format
 msgid "ignoring invalid byte element '%d' (not between 0 and 255 inclusive)"
 msgstr ""
-"ignorando elemento byte “%d” inválido (não está entre 0 e 255 inclusivo)"
+"ignorando elemento byte \"%d\" inválido (não está entre 0 e 255 inclusivo)"
 
-#: ../libnm-core/nm-keyfile.c:845
+#: ../libnm-core/nm-keyfile-reader.c:698
 msgid "ignoring invalid MAC address"
 msgstr "ignorando endereço MAC inválido"
 
-#: ../libnm-core/nm-keyfile.c:1082
+#: ../libnm-core/nm-keyfile-reader.c:935
 msgid "ignoring invalid SSID"
 msgstr "ignorando SSID inválido"
 
-#: ../libnm-core/nm-keyfile.c:1098
+#: ../libnm-core/nm-keyfile-reader.c:951
 msgid "ignoring invalid raw password"
 msgstr "ignorando senha não tratada inválida"
 
-#: ../libnm-core/nm-keyfile.c:1236
-msgid "invalid key/cert value"
-msgstr "valor de certificado/chave inválido"
-
-#: ../libnm-core/nm-keyfile.c:1247
+#: ../libnm-core/nm-keyfile-reader.c:1026
+#: ../libnm-core/nm-keyfile-reader.c:1202
 #, c-format
-msgid "invalid key/cert value path \"%s\""
-msgstr "valor de certificado/chave com caminho inválido “%s”"
+msgid "certificate or key file '%s' does not exist"
+msgstr "certificado ou arquivo de chave \"%s\" não existe"
 
-#: ../libnm-core/nm-keyfile.c:1263 ../libnm-core/nm-keyfile.c:1346
+#: ../libnm-core/nm-keyfile-reader.c:1031
 #, c-format
-msgid "certificate or key file '%s' does not exist"
-msgstr "certificado ou arquivo de chave “%s” não existe"
+msgid "invalid key/cert value path \"%s\""
+msgstr "valor de certificado/chave com caminho inválido \"%s\""
 
-#: ../libnm-core/nm-keyfile.c:1272
+#: ../libnm-core/nm-keyfile-reader.c:1041
 #, c-format
 msgid "invalid PKCS#11 URI \"%s\""
-msgstr "URI de PKCS#11 inválida “%s”"
+msgstr ""
 
-#: ../libnm-core/nm-keyfile.c:1316
+#: ../libnm-core/nm-keyfile-reader.c:1079
 msgid "invalid key/cert value data:;base64, is not base64"
 msgstr "valor data:;base64 de chave/certificado inválido, não é base64"
 
-#: ../libnm-core/nm-keyfile.c:1325
+#: ../libnm-core/nm-keyfile-reader.c:1092
 msgid "invalid key/cert value data:;base64,file://"
 msgstr "valor data:;base64 de chave/certificado inválido, file://"
 
-#: ../libnm-core/nm-keyfile.c:1358
+#: ../libnm-core/nm-keyfile-reader.c:1239
 msgid "invalid key/cert value is not a valid blob"
 msgstr "valor de certificado/chave inválido não é um blob válido"
 
-#: ../libnm-core/nm-keyfile.c:1408
+#: ../libnm-core/nm-keyfile-reader.c:1244
+msgid "invalid key/cert value"
+msgstr "valor de certificado/chave inválido"
+
+#: ../libnm-core/nm-keyfile-reader.c:1291
 #, c-format
 msgid "invalid parity value '%s'"
-msgstr "valor de paridade inválido “%s”"
+msgstr "valor de paridade inválido \"%s\""
 
-#: ../libnm-core/nm-keyfile.c:1426
+#: ../libnm-core/nm-keyfile-reader.c:1309
 #, c-format
 msgid "ignoring invalid team configuration: %s"
-msgstr "ignorando configuração de união inválida: %s"
+msgstr ""
 
-#: ../libnm-core/nm-keyfile.c:1469
-#, c-format
+#: ../libnm-core/nm-keyfile-reader.c:1352
+#, fuzzy, c-format
 msgid "invalid qdisc: %s"
-msgstr "qdisc inválido: %s"
+msgstr "endereço IPv4 inválido: %s"
 
-#: ../libnm-core/nm-keyfile.c:1517
-#, c-format
+#: ../libnm-core/nm-keyfile-reader.c:1400
+#, fuzzy, c-format
 msgid "invalid tfilter: %s"
-msgstr "tfilter inválido: %s"
+msgstr "rota inválida: %s"
 
-#: ../libnm-core/nm-keyfile.c:2534
+#: ../libnm-core/nm-keyfile-reader.c:1622
 #, c-format
 msgid "error loading setting value: %s"
 msgstr "erro ao carregar valor de definição %s"
 
-#: ../libnm-core/nm-keyfile.c:2559
+#: ../libnm-core/nm-keyfile-reader.c:1654
 #, c-format
 msgid "invalid negative value (%i)"
 msgstr "valor negativo inválido (%i)"
 
-#: ../libnm-core/nm-keyfile.c:2580
+#: ../libnm-core/nm-keyfile-reader.c:1675
 #, c-format
 msgid "invalid char value (%i)"
 msgstr "valor char inválido (%i)"
 
-#: ../libnm-core/nm-keyfile.c:2602
+#: ../libnm-core/nm-keyfile-reader.c:1698
 #, c-format
 msgid "invalid int64 value (%s)"
 msgstr "valor int64 inválido (%s)"
 
-#: ../libnm-core/nm-keyfile.c:2661
+#: ../libnm-core/nm-keyfile-reader.c:1757
 #, c-format
 msgid "too large FLAGS property '%s' (%llu)"
-msgstr "propriedade “%s” de SINALIZADORES grande demais (%llu)"
+msgstr "propriedade \"%s\" de SINALIZADORES grande demais (%llu)"
 
-#: ../libnm-core/nm-keyfile.c:2674
+#: ../libnm-core/nm-keyfile-reader.c:1770
 #, c-format
 msgid "unhandled setting property type '%s'"
-msgstr "tipo “%s” com propriedade de definição não manipulada"
+msgstr "tipo \"%s\" com propriedade de definição não manipulada"
 
-#: ../libnm-core/nm-keyfile.c:2703
+#: ../libnm-core/nm-keyfile-reader.c:1801
 #, c-format
 msgid "invalid setting name '%s'"
-msgstr "nome de definição “%s” inválido"
-
-#: ../libnm-core/nm-setting-6lowpan.c:105
-#, c-format
-msgid "property is not specified"
-msgstr "a propriedade não foi especificada"
-
-#: ../libnm-core/nm-setting-6lowpan.c:127 ../libnm-core/nm-setting-macsec.c:307
-#: ../libnm-core/nm-setting-vlan.c:633 ../libnm-util/nm-setting-vlan.c:556
-#, c-format
-msgid "'%s' value doesn't match '%s=%s'"
-msgstr "valor “%s” não corresponde “%s=%s”"
-
-#: ../libnm-core/nm-setting-6lowpan.c:138
-#: ../libnm-core/nm-setting-ip-tunnel.c:352
-#: ../libnm-core/nm-setting-macsec.c:318 ../libnm-core/nm-setting-macvlan.c:162
-#: ../libnm-core/nm-setting-vlan.c:644 ../libnm-core/nm-setting-vxlan.c:402
-#: ../libnm-util/nm-setting-vlan.c:567
-#, c-format
-msgid "'%s' is neither an UUID nor an interface name"
-msgstr "“%s” não é um UUID nem um nome de interface"
+msgstr "nome de definição \"%s\" inválido"
 
-#: ../libnm-core/nm-setting-8021x.c:435
+#: ../libnm-core/nm-setting-8021x.c:436
 msgid "data missing"
 msgstr "faltando dados"
 
-#: ../libnm-core/nm-setting-8021x.c:471
+#: ../libnm-core/nm-setting-8021x.c:472
 msgid "binary data missing"
 msgstr "faltando dados de binário"
 
-#: ../libnm-core/nm-setting-8021x.c:499
+#: ../libnm-core/nm-setting-8021x.c:500
 msgid "URI not NUL terminated"
-msgstr "URL não terminada com NUL"
+msgstr ""
 
-#: ../libnm-core/nm-setting-8021x.c:508
+#: ../libnm-core/nm-setting-8021x.c:509
 msgid "URI is empty"
-msgstr "URI está vazia"
+msgstr ""
 
-#: ../libnm-core/nm-setting-8021x.c:516
+#: ../libnm-core/nm-setting-8021x.c:517
 msgid "URI is not valid UTF-8"
-msgstr "URI não é um UTF-8 válido"
+msgstr ""
 
-#: ../libnm-core/nm-setting-8021x.c:752 ../libnm-util/nm-setting-8021x.c:639
+#: ../libnm-core/nm-setting-8021x.c:753 ../libnm-util/nm-setting-8021x.c:639
 msgid "CA certificate must be in X.509 format"
 msgstr "Certificado de AC deve estar em um formato X.509"
 
-#: ../libnm-core/nm-setting-8021x.c:1157 ../libnm-core/nm-setting-8021x.c:1511
-#: ../libnm-core/nm-setting-8021x.c:1921 ../libnm-util/nm-setting-8021x.c:957
-#: ../libnm-util/nm-setting-8021x.c:1220 ../libnm-util/nm-setting-8021x.c:1542
+#: ../libnm-core/nm-setting-8021x.c:1158 ../libnm-core/nm-setting-8021x.c:1512
+#: ../libnm-core/nm-setting-8021x.c:1923 ../libnm-util/nm-setting-8021x.c:957
+#: ../libnm-util/nm-setting-8021x.c:1220 ../libnm-util/nm-setting-8021x.c:1543
 msgid "invalid certificate format"
 msgstr "formato de certificado inválido"
 
-#: ../libnm-core/nm-setting-8021x.c:2273 ../libnm-util/nm-setting-8021x.c:1811
+#: ../libnm-core/nm-setting-8021x.c:2275 ../libnm-util/nm-setting-8021x.c:1812
 msgid "invalid private key"
 msgstr "chave privada inválida"
 
-#: ../libnm-core/nm-setting-8021x.c:2615 ../libnm-util/nm-setting-8021x.c:2122
+#: ../libnm-core/nm-setting-8021x.c:2622 ../libnm-util/nm-setting-8021x.c:2123
 msgid "invalid phase2 private key"
 msgstr "chave privada de phase2 inválida"
 
-#: ../libnm-core/nm-setting-8021x.c:2875 ../libnm-core/nm-setting-8021x.c:2892
-#: ../libnm-core/nm-setting-8021x.c:2923 ../libnm-core/nm-setting-8021x.c:2940
-#: ../libnm-core/nm-setting-8021x.c:2981 ../libnm-core/nm-setting-8021x.c:2993
-#: ../libnm-core/nm-setting-8021x.c:3011 ../libnm-core/nm-setting-8021x.c:3023
-#: ../libnm-core/nm-setting-8021x.c:3048 ../libnm-core/nm-setting-adsl.c:195
-#: ../libnm-core/nm-setting-cdma.c:165 ../libnm-core/nm-setting-cdma.c:174
-#: ../libnm-core/nm-setting-connection.c:918
-#: ../libnm-core/nm-setting-connection.c:966 ../libnm-core/nm-setting-gsm.c:298
-#: ../libnm-core/nm-setting-gsm.c:355 ../libnm-core/nm-setting-gsm.c:392
-#: ../libnm-core/nm-setting-gsm.c:401 ../libnm-core/nm-setting-ip-config.c:2501
-#: ../libnm-core/nm-setting-ip4-config.c:197
-#: ../libnm-core/nm-setting-ip4-config.c:204
-#: ../libnm-core/nm-setting-pppoe.c:167 ../libnm-core/nm-setting-pppoe.c:176
-#: ../libnm-core/nm-setting-vpn.c:497 ../libnm-core/nm-setting-vpn.c:507
-#: ../libnm-core/nm-setting-wimax.c:134
-#: ../libnm-core/nm-setting-wireless-security.c:949
-#: ../libnm-core/nm-setting-wireless-security.c:973
-#: ../libnm-core/nm-setting.c:1197 ../libnm-util/nm-setting-8021x.c:2331
-#: ../libnm-util/nm-setting-8021x.c:2348 ../libnm-util/nm-setting-8021x.c:2389
-#: ../libnm-util/nm-setting-8021x.c:2406 ../libnm-util/nm-setting-8021x.c:2457
-#: ../libnm-util/nm-setting-8021x.c:2469 ../libnm-util/nm-setting-8021x.c:2487
-#: ../libnm-util/nm-setting-8021x.c:2499 ../libnm-util/nm-setting-8021x.c:2524
-#: ../libnm-util/nm-setting-adsl.c:216 ../libnm-util/nm-setting-cdma.c:168
-#: ../libnm-util/nm-setting-cdma.c:177
-#: ../libnm-util/nm-setting-connection.c:772
-#: ../libnm-util/nm-setting-connection.c:849 ../libnm-util/nm-setting-gsm.c:281
-#: ../libnm-util/nm-setting-gsm.c:338 ../libnm-util/nm-setting-ip4-config.c:934
+#: ../libnm-core/nm-setting-8021x.c:2888 ../libnm-core/nm-setting-8021x.c:2905
+#: ../libnm-core/nm-setting-8021x.c:2936 ../libnm-core/nm-setting-8021x.c:2953
+#: ../libnm-core/nm-setting-8021x.c:2994 ../libnm-core/nm-setting-8021x.c:3006
+#: ../libnm-core/nm-setting-8021x.c:3024 ../libnm-core/nm-setting-8021x.c:3036
+#: ../libnm-core/nm-setting-8021x.c:3061 ../libnm-core/nm-setting-adsl.c:196
+#: ../libnm-core/nm-setting-cdma.c:166 ../libnm-core/nm-setting-cdma.c:175
+#: ../libnm-core/nm-setting-connection.c:901
+#: ../libnm-core/nm-setting-connection.c:949 ../libnm-core/nm-setting-gsm.c:299
+#: ../libnm-core/nm-setting-gsm.c:356 ../libnm-core/nm-setting-gsm.c:393
+#: ../libnm-core/nm-setting-gsm.c:402 ../libnm-core/nm-setting-ip-config.c:2521
+#: ../libnm-core/nm-setting-ip4-config.c:198
+#: ../libnm-core/nm-setting-ip4-config.c:205
+#: ../libnm-core/nm-setting-pppoe.c:168 ../libnm-core/nm-setting-pppoe.c:177
+#: ../libnm-core/nm-setting-vpn.c:527 ../libnm-core/nm-setting-vpn.c:537
+#: ../libnm-core/nm-setting-wimax.c:135
+#: ../libnm-core/nm-setting-wireless-security.c:930
+#: ../libnm-core/nm-setting-wireless-security.c:954
+#: ../libnm-core/nm-setting.c:1118 ../libnm-util/nm-setting-8021x.c:2332
+#: ../libnm-util/nm-setting-8021x.c:2349 ../libnm-util/nm-setting-8021x.c:2390
+#: ../libnm-util/nm-setting-8021x.c:2407 ../libnm-util/nm-setting-8021x.c:2458
+#: ../libnm-util/nm-setting-8021x.c:2470 ../libnm-util/nm-setting-8021x.c:2488
+#: ../libnm-util/nm-setting-8021x.c:2500 ../libnm-util/nm-setting-8021x.c:2525
+#: ../libnm-util/nm-setting-adsl.c:216 ../libnm-util/nm-setting-cdma.c:169
+#: ../libnm-util/nm-setting-cdma.c:178
+#: ../libnm-util/nm-setting-connection.c:775
+#: ../libnm-util/nm-setting-connection.c:852 ../libnm-util/nm-setting-gsm.c:282
+#: ../libnm-util/nm-setting-gsm.c:339 ../libnm-util/nm-setting-ip4-config.c:934
 #: ../libnm-util/nm-setting-ip4-config.c:943
-#: ../libnm-util/nm-setting-pppoe.c:169 ../libnm-util/nm-setting-pppoe.c:178
-#: ../libnm-util/nm-setting-vpn.c:431 ../libnm-util/nm-setting-vpn.c:441
-#: ../libnm-util/nm-setting-wimax.c:158
-#: ../libnm-util/nm-setting-wireless-security.c:920
-#: ../libnm-util/nm-setting-wireless-security.c:944
+#: ../libnm-util/nm-setting-pppoe.c:170 ../libnm-util/nm-setting-pppoe.c:179
+#: ../libnm-util/nm-setting-vpn.c:432 ../libnm-util/nm-setting-vpn.c:442
+#: ../libnm-util/nm-setting-wimax.c:159
+#: ../libnm-util/nm-setting-wireless-security.c:921
+#: ../libnm-util/nm-setting-wireless-security.c:945
 msgid "property is empty"
 msgstr "propriedade está vazia"
 
-#: ../libnm-core/nm-setting-8021x.c:2905 ../libnm-core/nm-setting-8021x.c:2953
-#: ../libnm-util/nm-setting-8021x.c:2359 ../libnm-util/nm-setting-8021x.c:2371
-#: ../libnm-util/nm-setting-8021x.c:2417 ../libnm-util/nm-setting-8021x.c:2429
+#: ../libnm-core/nm-setting-8021x.c:2918 ../libnm-core/nm-setting-8021x.c:2966
+#: ../libnm-util/nm-setting-8021x.c:2360 ../libnm-util/nm-setting-8021x.c:2372
+#: ../libnm-util/nm-setting-8021x.c:2418 ../libnm-util/nm-setting-8021x.c:2430
 #, c-format
 msgid "has to match '%s' property for PKCS#12"
-msgstr "tem que corresponder à propriedade “%s” para PKCS#12"
+msgstr "tem que corresponder à propriedade \"%s\" para PKCS#12"
 
-#: ../libnm-core/nm-setting-8021x.c:3182
+#: ../libnm-core/nm-setting-8021x.c:3197
 #, c-format
 msgid "certificate is invalid: %s"
 msgstr "certificado é inválido: %s"
 
-#: ../libnm-core/nm-setting-8021x.c:3192
+#: ../libnm-core/nm-setting-8021x.c:3207
 #, c-format
 msgid "password is not supported when certificate is not on a PKCS#11 token"
 msgstr ""
-"não há suporte a senha quando o certificado não está em um token PKCS#11"
-
-#: ../libnm-core/nm-setting-8021x.c:3229
-#: ../libnm-core/nm-setting-bluetooth.c:122
-#: ../libnm-core/nm-setting-infiniband.c:191
-#: ../libnm-core/nm-setting-infiniband.c:206
-#: ../libnm-core/nm-setting-ip4-config.c:188
-#: ../libnm-core/nm-setting-ip6-config.c:236
-#: ../libnm-core/nm-setting-ip6-config.c:247
-#: ../libnm-core/nm-setting-olpc-mesh.c:148
-#: ../libnm-core/nm-setting-wimax.c:143 ../libnm-core/nm-setting-wired.c:677
-#: ../libnm-core/nm-setting-wired.c:687
-#: ../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:1046
-#: ../libnm-core/nm-setting-wireless-security.c:1056
-#: ../libnm-core/nm-setting-wireless-security.c:1079
-#: ../libnm-core/nm-setting-wireless-security.c:1104
-#: ../libnm-core/nm-setting-wireless-security.c:1131
-#: ../libnm-core/nm-setting-wireless-security.c:1170
-#: ../libnm-core/nm-setting-wireless.c:812
-#: ../libnm-core/nm-setting-wireless.c:821
-#: ../libnm-core/nm-setting-wireless.c:832 ../libnm-core/nm-setting-wpan.c:130
-#: ../libnm-util/nm-setting.c:1365 ../libnm-util/nm-setting.c:1383
-#: ../libnm-util/nm-setting.c:1402 ../libnm-util/nm-setting-8021x.c:2652
-#: ../libnm-util/nm-setting-8021x.c:2686
-#: ../libnm-util/nm-setting-bluetooth.c:150
+
+#: ../libnm-core/nm-setting-8021x.c:3244
+#: ../libnm-core/nm-setting-bluetooth.c:123
+#: ../libnm-core/nm-setting-infiniband.c:192
+#: ../libnm-core/nm-setting-infiniband.c:207
+#: ../libnm-core/nm-setting-ip4-config.c:189
+#: ../libnm-core/nm-setting-ip6-config.c:215
+#: ../libnm-core/nm-setting-ip6-config.c:226
+#: ../libnm-core/nm-setting-olpc-mesh.c:149
+#: ../libnm-core/nm-setting-wimax.c:144 ../libnm-core/nm-setting-wired.c:678
+#: ../libnm-core/nm-setting-wired.c:688
+#: ../libnm-core/nm-setting-wireless-security.c:973
+#: ../libnm-core/nm-setting-wireless-security.c:982
+#: ../libnm-core/nm-setting-wireless-security.c:991
+#: ../libnm-core/nm-setting-wireless-security.c:1027
+#: ../libnm-core/nm-setting-wireless-security.c:1037
+#: ../libnm-core/nm-setting-wireless-security.c:1060
+#: ../libnm-core/nm-setting-wireless-security.c:1085
+#: ../libnm-core/nm-setting-wireless-security.c:1112
+#: ../libnm-core/nm-setting-wireless-security.c:1151
+#: ../libnm-core/nm-setting-wireless.c:811
+#: ../libnm-core/nm-setting-wireless.c:820
+#: ../libnm-core/nm-setting-wireless.c:831 ../libnm-util/nm-setting.c:1367
+#: ../libnm-util/nm-setting.c:1385 ../libnm-util/nm-setting.c:1404
+#: ../libnm-util/nm-setting-8021x.c:2655 ../libnm-util/nm-setting-8021x.c:2689
+#: ../libnm-util/nm-setting-bluetooth.c:151
 #: ../libnm-util/nm-setting-infiniband.c:205
 #: ../libnm-util/nm-setting-infiniband.c:221
 #: ../libnm-util/nm-setting-ip4-config.c:925
-#: ../libnm-util/nm-setting-ip6-config.c:888
+#: ../libnm-util/nm-setting-ip6-config.c:890
 #: ../libnm-util/nm-setting-olpc-mesh.c:151
-#: ../libnm-util/nm-setting-wimax.c:167 ../libnm-util/nm-setting-wired.c:657
-#: ../libnm-util/nm-setting-wired.c:666
-#: ../libnm-util/nm-setting-wireless-security.c:963
-#: ../libnm-util/nm-setting-wireless-security.c:972
-#: ../libnm-util/nm-setting-wireless-security.c:981
-#: ../libnm-util/nm-setting-wireless-security.c:1017
-#: ../libnm-util/nm-setting-wireless-security.c:1027
-#: ../libnm-util/nm-setting-wireless.c:828
-#: ../libnm-util/nm-setting-wireless.c:837
-#: ../libnm-util/nm-setting-wireless.c:846
+#: ../libnm-util/nm-setting-wimax.c:168 ../libnm-util/nm-setting-wired.c:658
+#: ../libnm-util/nm-setting-wired.c:667
+#: ../libnm-util/nm-setting-wireless-security.c:964
+#: ../libnm-util/nm-setting-wireless-security.c:973
+#: ../libnm-util/nm-setting-wireless-security.c:982
+#: ../libnm-util/nm-setting-wireless-security.c:1018
+#: ../libnm-util/nm-setting-wireless-security.c:1028
+#: ../libnm-util/nm-setting-wireless.c:829
+#: ../libnm-util/nm-setting-wireless.c:838
+#: ../libnm-util/nm-setting-wireless.c:847
 msgid "property is invalid"
 msgstr "propriedade é inválida"
 
-#: ../libnm-core/nm-setting-8021x.c:3254 ../libnm-core/nm-setting-8021x.c:3264
-#: ../libnm-core/nm-setting-8021x.c:3274 ../libnm-core/nm-setting-8021x.c:3293
-#: ../libnm-core/nm-setting-8021x.c:3303 ../libnm-core/nm-setting-adsl.c:207
-#: ../libnm-core/nm-setting-adsl.c:219 ../libnm-core/nm-setting-bluetooth.c:150
-#: ../libnm-core/nm-setting-wireless-security.c:928
-#: ../libnm-util/nm-setting-8021x.c:2711 ../libnm-util/nm-setting-8021x.c:2721
-#: ../libnm-util/nm-setting-8021x.c:2731 ../libnm-util/nm-setting-8021x.c:2741
-#: ../libnm-util/nm-setting-8021x.c:2751 ../libnm-util/nm-setting-adsl.c:228
-#: ../libnm-util/nm-setting-adsl.c:240 ../libnm-util/nm-setting-bluetooth.c:167
-#: ../libnm-util/nm-setting-wireless-security.c:899
+#: ../libnm-core/nm-setting-8021x.c:3269 ../libnm-core/nm-setting-8021x.c:3279
+#: ../libnm-core/nm-setting-8021x.c:3289 ../libnm-core/nm-setting-8021x.c:3308
+#: ../libnm-core/nm-setting-8021x.c:3318 ../libnm-core/nm-setting-adsl.c:208
+#: ../libnm-core/nm-setting-adsl.c:220 ../libnm-core/nm-setting-bluetooth.c:151
+#: ../libnm-core/nm-setting-wireless-security.c:909
+#: ../libnm-util/nm-setting-8021x.c:2714 ../libnm-util/nm-setting-8021x.c:2724
+#: ../libnm-util/nm-setting-8021x.c:2734 ../libnm-util/nm-setting-8021x.c:2744
+#: ../libnm-util/nm-setting-8021x.c:2754 ../libnm-util/nm-setting-adsl.c:228
+#: ../libnm-util/nm-setting-adsl.c:240 ../libnm-util/nm-setting-bluetooth.c:168
+#: ../libnm-util/nm-setting-wireless-security.c:900
 #, c-format
 msgid "'%s' is not a valid value for the property"
-msgstr "valor “%s” não é válido para a propriedade"
+msgstr "valor \"%s\" não é válido para a propriedade"
 
-#: ../libnm-core/nm-setting-8021x.c:3284
+#: ../libnm-core/nm-setting-8021x.c:3299
+#, fuzzy
 msgid "invalid auth flags"
-msgstr "sinalizadores inválido de autenticação"
+msgstr "rota inválida: %s"
 
-#: ../libnm-core/nm-setting-bluetooth.c:172
+#: ../libnm-core/nm-setting-bluetooth.c:173
 #, c-format
 msgid "'%s' connection requires '%s' or '%s' setting"
-msgstr "a conexão “%s” requer a definição “%s” ou “%s”"
+msgstr "conexão \"%s\" requer a presença da definição de \"%s\" ou \"%s\""
 
-#: ../libnm-core/nm-setting-bluetooth.c:218
+#: ../libnm-core/nm-setting-bluetooth.c:219
 #, c-format
 msgid "'%s' connection requires '%s' setting"
-msgstr "a conexão “%s” requer a definição “%s”"
+msgstr ""
 
-#: ../libnm-core/nm-setting-bond.c:565 ../libnm-util/nm-setting-bond.c:516
+#: ../libnm-core/nm-setting-bond.c:566 ../libnm-util/nm-setting-bond.c:517
 #, c-format
 msgid "invalid option '%s' or its value '%s'"
-msgstr "opção “%s” ou seu valor “%s” inválido"
+msgstr "opção \"%s\" ou seu valor \"%s\" inválido"
 
-#: ../libnm-core/nm-setting-bond.c:590 ../libnm-util/nm-setting-bond.c:535
+#: ../libnm-core/nm-setting-bond.c:591 ../libnm-util/nm-setting-bond.c:536
 #, c-format
 msgid "only one of '%s' and '%s' can be set"
-msgstr "apenas um entre “%s” e “%s” pode estar definido"
+msgstr "apenas um entre \"%s\" e \"%s\" pode estar definido"
 
-#: ../libnm-core/nm-setting-bond.c:603 ../libnm-util/nm-setting-bond.c:546
+#: ../libnm-core/nm-setting-bond.c:604 ../libnm-util/nm-setting-bond.c:547
 #, c-format
 msgid "mandatory option '%s' is missing"
-msgstr "opção obrigatória “%s” está faltando"
+msgstr "opção obrigatória \"%s\" está faltando"
 
-#: ../libnm-core/nm-setting-bond.c:613 ../libnm-util/nm-setting-bond.c:555
+#: ../libnm-core/nm-setting-bond.c:614 ../libnm-util/nm-setting-bond.c:556
 #, c-format
 msgid "'%s' is not a valid value for '%s'"
-msgstr "“%s” não é um valor válido para “%s”"
+msgstr "\"%s\" não é um valor válido para \"%s\""
 
-#: ../libnm-core/nm-setting-bond.c:627 ../libnm-util/nm-setting-bond.c:568
+#: ../libnm-core/nm-setting-bond.c:628 ../libnm-util/nm-setting-bond.c:569
 #, c-format
 msgid "'%s=%s' is incompatible with '%s > 0'"
-msgstr "“%s=%s” é incompatível com “%s > 0”"
+msgstr "\"%s=%s\" é incompatível com \"%s > 0\""
 
-#: ../libnm-core/nm-setting-bond.c:642
+#: ../libnm-core/nm-setting-bond.c:643
 #, c-format
 msgid "'%s' is not valid for the '%s' option: %s"
-msgstr "“%s” não é válido para a opção “%s”: %s"
+msgstr ""
 
-#: ../libnm-core/nm-setting-bond.c:653 ../libnm-util/nm-setting-bond.c:591
+#: ../libnm-core/nm-setting-bond.c:654 ../libnm-util/nm-setting-bond.c:592
 #, c-format
 msgid "'%s' option is only valid for '%s=%s'"
-msgstr "opção “%s” é válida apenas para “%s=%s”"
+msgstr "opção \"%s\" é válida apenas para \"%s=%s\""
 
-#: ../libnm-core/nm-setting-bond.c:666 ../libnm-util/nm-setting-bond.c:604
+#: ../libnm-core/nm-setting-bond.c:667 ../libnm-util/nm-setting-bond.c:605
 #, c-format
 msgid "'%s=%s' is not a valid configuration for '%s'"
-msgstr "“%s=%s” não é uma configuração válida para “%s”"
+msgstr "\"%s=%s\" não é uma configuração válida para \"%s\""
 
-#: ../libnm-core/nm-setting-bond.c:679 ../libnm-core/nm-setting-bond.c:688
-#: ../libnm-core/nm-setting-bond.c:708 ../libnm-core/nm-setting-bond.c:744
-#: ../libnm-util/nm-setting-bond.c:617 ../libnm-util/nm-setting-bond.c:626
-#: ../libnm-util/nm-setting-bond.c:646 ../libnm-util/nm-setting-bond.c:682
+#: ../libnm-core/nm-setting-bond.c:680 ../libnm-core/nm-setting-bond.c:689
+#: ../libnm-core/nm-setting-bond.c:709 ../libnm-core/nm-setting-bond.c:745
+#: ../libnm-util/nm-setting-bond.c:618 ../libnm-util/nm-setting-bond.c:627
+#: ../libnm-util/nm-setting-bond.c:647 ../libnm-util/nm-setting-bond.c:683
 #, c-format
 msgid "'%s' option requires '%s' option to be set"
-msgstr "opção “%s” requer que a opção “%s” seja definida"
+msgstr "opção \"%s\" requer que a opção \"%s\" seja definida"
 
-#: ../libnm-core/nm-setting-bond.c:719 ../libnm-util/nm-setting-bond.c:657
+#: ../libnm-core/nm-setting-bond.c:720 ../libnm-util/nm-setting-bond.c:658
 #, c-format
 msgid "'%s' option is empty"
-msgstr "opção “%s” está vazia"
+msgstr "opção \"%s\" está vazia"
 
-#: ../libnm-core/nm-setting-bond.c:731 ../libnm-util/nm-setting-bond.c:669
+#: ../libnm-core/nm-setting-bond.c:732 ../libnm-util/nm-setting-bond.c:670
 #, c-format
 msgid "'%s' is not a valid IPv4 address for '%s' option"
-msgstr "“%s” não é um endereço IPv4 válido para a opção “%s”"
+msgstr "\"%s\" não é um endereço IPv4 válido para a opção \"%s\""
 
-#: ../libnm-core/nm-setting-bond.c:759 ../libnm-util/nm-setting-bond.c:696
+#: ../libnm-core/nm-setting-bond.c:760 ../libnm-util/nm-setting-bond.c:697
 #, c-format
 msgid "'%s' option is only valid with mode '%s'"
-msgstr "opção “%s” é válida apenas para “%s”"
+msgstr "opção \"%s\" é válida apenas para \"%s\""
 
-#: ../libnm-core/nm-setting-bond.c:770
+#: ../libnm-core/nm-setting-bond.c:771
 #, c-format
 msgid "'%s' and '%s' cannot have different values"
-msgstr "“%s” e “%s” não podem ter valores diferentes"
+msgstr "\"%s\" e \"%s\" não podem ter valores diferentes"
 
-#: ../libnm-core/nm-setting-bond.c:786
+#: ../libnm-core/nm-setting-bond.c:787
 #, c-format
 msgid "'%s' option should be string"
-msgstr "opção “%s” deveria ser string"
+msgstr "opção \"%s\" deveria ser string"
 
-#: ../libnm-core/nm-setting-bond.c:802
+#: ../libnm-core/nm-setting-bond.c:803
 #, c-format
 msgid "'%s' option is not valid with mode '%s'"
-msgstr "a opção “%s” não é válida com o modo “%s”"
+msgstr ""
 
-#: ../libnm-core/nm-setting-bridge-port.c:126
-#: ../libnm-core/nm-setting-ovs-interface.c:260
-#: ../libnm-core/nm-setting-ovs-port.c:188
-#: ../libnm-core/nm-setting-ovs-bridge.c:151
+#: ../libnm-core/nm-setting-bridge-port.c:127
+#: ../libnm-core/nm-setting-ovs-interface.c:262
+#: ../libnm-core/nm-setting-ovs-port.c:189
+#: ../libnm-core/nm-setting-ovs-bridge.c:152
 #: ../libnm-core/nm-setting-team-port.c:358
 #, c-format
 msgid "missing setting"
 msgstr "faltando definição"
 
-#: ../libnm-core/nm-setting-bridge-port.c:137
-#: ../libnm-core/nm-setting-ovs-interface.c:281
-#: ../libnm-core/nm-setting-ovs-port.c:209
+#: ../libnm-core/nm-setting-bridge-port.c:138
+#: ../libnm-core/nm-setting-ovs-interface.c:283
+#: ../libnm-core/nm-setting-ovs-port.c:210
 #: ../libnm-core/nm-setting-team-port.c:369
 #, c-format
 msgid ""
 "A connection with a '%s' setting must have the slave-type set to '%s'. "
 "Instead it is '%s'"
 msgstr ""
-"Uma conexão com uma definição “%s” deve ter um tipo escravo definido para "
-"“%s”. Em vez disso, ela é “%s”"
+"Uma conexão com uma definição \"%s\" deve ter um tipo escravo definido para "
+"\"%s\". Em vez disso, ela é \"%s\""
 
-#: ../libnm-core/nm-setting-bridge.c:230 ../libnm-util/nm-setting-bridge.c:268
+#: ../libnm-core/nm-setting-bridge.c:231 ../libnm-util/nm-setting-bridge.c:269
 #, c-format
 msgid "value '%d' is out of range <%d-%d>"
-msgstr "valor “%d” está fora da faixa <%d-%d>"
+msgstr "valor \"%d\" está fora da faixa <%d-%d>"
 
-#: ../libnm-core/nm-setting-bridge.c:247 ../libnm-core/nm-setting-wired.c:651
-#: ../libnm-core/nm-setting-wired.c:713 ../libnm-core/nm-setting-wired.c:755
-#: ../libnm-util/nm-setting-bridge.c:285 ../libnm-util/nm-setting-wired.c:632
-#: ../libnm-util/nm-setting-wired.c:690
+#: ../libnm-core/nm-setting-bridge.c:248 ../libnm-core/nm-setting-wired.c:652
+#: ../libnm-core/nm-setting-wired.c:714 ../libnm-core/nm-setting-wired.c:756
+#: ../libnm-util/nm-setting-bridge.c:286 ../libnm-util/nm-setting-wired.c:633
+#: ../libnm-util/nm-setting-wired.c:691
 msgid "is not a valid MAC address"
 msgstr "não é um endereço MAC válido"
 
-#: ../libnm-core/nm-setting-bridge.c:288
+#: ../libnm-core/nm-setting-bridge.c:289
 msgid "the mask can't contain bits 0 (STP), 1 (MAC) or 2 (LACP)"
-msgstr "a máscara não pode conter bits 0 (STP), 1 (MAC) ou 2 (LACP)"
+msgstr ""
 
-#: ../libnm-core/nm-setting-connection.c:888
+#: ../libnm-core/nm-setting-connection.c:871
 #, c-format
 msgid "setting required for connection of type '%s'"
-msgstr "definição requerida para a conexão do tipo “%s”"
+msgstr "definição requerida para a conexão do tipo \"%s\""
 
-#: ../libnm-core/nm-setting-connection.c:927
-#: ../libnm-util/nm-setting-connection.c:788
+#: ../libnm-core/nm-setting-connection.c:910
+#: ../libnm-util/nm-setting-connection.c:791
 #, c-format
 msgid "'%s' is not a valid UUID"
-msgstr "“%s” não é um UUID válido"
+msgstr "\"%s\" não é um UUID válido"
 
-#: ../libnm-core/nm-setting-connection.c:977
+#: ../libnm-core/nm-setting-connection.c:960
 #, c-format
 msgid "connection type '%s' is not valid"
-msgstr "tipo de conexão “%s” não é válida"
+msgstr "tipo de conexão \"%s\" não é válida"
 
-#: ../libnm-core/nm-setting-connection.c:1013
-#: ../libnm-util/nm-setting-connection.c:874
+#: ../libnm-core/nm-setting-connection.c:996
+#: ../libnm-util/nm-setting-connection.c:877
 #, c-format
 msgid "Unknown slave type '%s'"
-msgstr "Tipo de escravo “%s” desconhecido"
+msgstr "Tipo de escravo \"%s\" desconhecido"
 
-#: ../libnm-core/nm-setting-connection.c:1024
-#: ../libnm-util/nm-setting-connection.c:884
+#: ../libnm-core/nm-setting-connection.c:1007
+#: ../libnm-util/nm-setting-connection.c:887
 #, c-format
 msgid "Slave connections need a valid '%s' property"
-msgstr "Conexões escravas precisam de uma propriedade “%s” válida"
+msgstr "Conexões escravas precisam de uma propriedade \"%s\" válida"
 
-#: ../libnm-core/nm-setting-connection.c:1045
-#: ../libnm-util/nm-setting-connection.c:894
+#: ../libnm-core/nm-setting-connection.c:1028
+#: ../libnm-util/nm-setting-connection.c:897
 #, c-format
 msgid "Cannot set '%s' without '%s'"
-msgstr "Não é possível definir “%s” sem “%s”"
+msgstr "Não é possível definir \"%s\" sem \"%s\""
 
-#: ../libnm-core/nm-setting-connection.c:1059
+#: ../libnm-core/nm-setting-connection.c:1041
 #, c-format
-msgid "'%s' connections must be enslaved to '%s', not '%s'"
-msgstr "conexões “%s” podem ser escravizadas para “%s”, não “%s”"
+msgid "Only '%s' connections can be enslaved to '%s'"
+msgstr ""
 
-#: ../libnm-core/nm-setting-connection.c:1073
+#: ../libnm-core/nm-setting-connection.c:1054
 #, c-format
 msgid "metered value %d is not valid"
 msgstr "valor metrado %d não é válido"
 
-#: ../libnm-core/nm-setting-connection.c:1084
-#, c-format
-msgid "mdns value %d is not valid"
-msgstr "valor mdns %d não é válido"
-
-#: ../libnm-core/nm-setting-connection.c:1105
+#: ../libnm-core/nm-setting-connection.c:1075
 #, c-format
 msgid "property type should be set to '%s'"
-msgstr "tipo de propriedade deveria ser definida para “%s”"
+msgstr "tipo de propriedade deveria ser definida para \"%s\""
 
-#: ../libnm-core/nm-setting-connection.c:1120
+#: ../libnm-core/nm-setting-connection.c:1090
 #, c-format
 msgid "slave-type '%s' requires a '%s' setting in the connection"
-msgstr "tipo escravo “%s” requer uma definição “%s” na conexão"
+msgstr "tipo escravo \"%s\" requer uma definição \"%s\" na conexão"
 
-#: ../libnm-core/nm-setting-connection.c:1130
+#: ../libnm-core/nm-setting-connection.c:1100
 #, c-format
 msgid ""
 "Detect a slave connection with '%s' set and a port type '%s'. '%s' should be "
 "set to '%s'"
 msgstr ""
-"Detecta uma conexão escrava com “%s” definido e um tipo de porta “%s”. “%s” "
-"deveria ser definida para “%s”"
+"Detecta uma conexão escrava com \"%s\" definida e um tipo de porta \"%s\". "
+"\"%s\" deveria ser definida para \"%s\""
 
-#: ../libnm-core/nm-setting-connection.c:1147
-#, c-format
+#: ../libnm-core/nm-setting-connection.c:1117
+#, fuzzy, c-format
 msgid "A slave connection with '%s' set to '%s' cannot have a '%s' setting"
 msgstr ""
-"Uma conexão escrava com “%s” definido com “%s” não pode ter uma definição "
-"“%s”"
+"Detecta uma conexão escrava com \"%s\" definida e um tipo de porta \"%s\". "
+"\"%s\" deveria ser definida para \"%s\""
 
-#: ../libnm-core/nm-setting-dcb.c:521 ../libnm-util/nm-setting-dcb.c:593
+#: ../libnm-core/nm-setting-dcb.c:522 ../libnm-util/nm-setting-dcb.c:594
 msgid "flags invalid"
 msgstr "sinalizadores inválidos"
 
-#: ../libnm-core/nm-setting-dcb.c:530 ../libnm-util/nm-setting-dcb.c:602
+#: ../libnm-core/nm-setting-dcb.c:531 ../libnm-util/nm-setting-dcb.c:603
 msgid "flags invalid - disabled"
-msgstr "sinalizadores inválidos – desabilitados"
+msgstr "sinalizadores inválidos - desabilitados"
 
-#: ../libnm-core/nm-setting-dcb.c:556 ../libnm-core/nm-setting-dcb.c:605
-#: ../libnm-util/nm-setting-dcb.c:628 ../libnm-util/nm-setting-dcb.c:677
+#: ../libnm-core/nm-setting-dcb.c:557 ../libnm-core/nm-setting-dcb.c:606
+#: ../libnm-util/nm-setting-dcb.c:629 ../libnm-util/nm-setting-dcb.c:678
 msgid "property invalid (not enabled)"
 msgstr "propriedade inválida (não habilitado)"
 
-#: ../libnm-core/nm-setting-dcb.c:565 ../libnm-util/nm-setting-dcb.c:637
+#: ../libnm-core/nm-setting-dcb.c:566 ../libnm-util/nm-setting-dcb.c:638
 msgid "element invalid"
 msgstr "elemento inválido"
 
-#: ../libnm-core/nm-setting-dcb.c:580 ../libnm-util/nm-setting-dcb.c:652
+#: ../libnm-core/nm-setting-dcb.c:581 ../libnm-util/nm-setting-dcb.c:653
 msgid "sum not 100%"
 msgstr "soma não é 100%"
 
-#: ../libnm-core/nm-setting-dcb.c:614 ../libnm-core/nm-setting-dcb.c:646
-#: ../libnm-util/nm-setting-dcb.c:686 ../libnm-util/nm-setting-dcb.c:718
+#: ../libnm-core/nm-setting-dcb.c:615 ../libnm-core/nm-setting-dcb.c:647
+#: ../libnm-util/nm-setting-dcb.c:687 ../libnm-util/nm-setting-dcb.c:719
 msgid "property invalid"
 msgstr "propriedade inválida"
 
-#: ../libnm-core/nm-setting-dcb.c:636 ../libnm-util/nm-setting-dcb.c:708
+#: ../libnm-core/nm-setting-dcb.c:637 ../libnm-util/nm-setting-dcb.c:709
 msgid "property missing"
 msgstr "propriedade em falta"
 
-#: ../libnm-core/nm-setting-gsm.c:311 ../libnm-util/nm-setting-gsm.c:294
+#: ../libnm-core/nm-setting-gsm.c:312 ../libnm-util/nm-setting-gsm.c:295
 #, c-format
 msgid "property value '%s' is empty or too long (>64)"
-msgstr "valor da propriedade “%s” está vazio ou é muito longo (>64)"
+msgstr "valor da propriedade \"%s\" está vazio ou é muito longo (>64)"
 
-#: ../libnm-core/nm-setting-gsm.c:343 ../libnm-util/nm-setting-gsm.c:326
+#: ../libnm-core/nm-setting-gsm.c:344 ../libnm-util/nm-setting-gsm.c:327
 #, c-format
 msgid "'%s' contains invalid char(s) (use [A-Za-z._-])"
-msgstr "“%s” contém caractere(s) inválido(s) (use [A-Za-z._-])"
+msgstr "\"%s\" contém caractere(s) inválido(s) (use [A-Za-z._-])"
 
-#: ../libnm-core/nm-setting-gsm.c:369 ../libnm-util/nm-setting-gsm.c:352
+#: ../libnm-core/nm-setting-gsm.c:370 ../libnm-util/nm-setting-gsm.c:353
 #, c-format
 msgid "'%s' length is invalid (should be 5 or 6 digits)"
-msgstr "tamanho “%s” é inválido (deveria ser 5 ou 6 dígitos)"
-
-#: ../libnm-core/nm-setting-gsm.c:380 ../libnm-util/nm-setting-gsm.c:363
-#, c-format
-msgid "'%s' is not a number"
-msgstr "%s não é um número"
+msgstr "tamanho \"%s\" é inválido (deveria ser 5 ou 6 dígitos)"
 
-#: ../libnm-core/nm-setting-gsm.c:414
+#: ../libnm-core/nm-setting-gsm.c:415
 msgid "property is empty or wrong size"
 msgstr "propriedade está vazia ou tem tamanho errado"
 
-#: ../libnm-core/nm-setting-gsm.c:424
+#: ../libnm-core/nm-setting-gsm.c:425
 msgid "property must contain only digits"
 msgstr "a propriedade deve conter apenas dígitos"
 
-#: ../libnm-core/nm-setting-infiniband.c:227
+#: ../libnm-core/nm-setting-infiniband.c:228
 #: ../libnm-util/nm-setting-infiniband.c:239
 msgid "Must specify a P_Key if specifying parent"
 msgstr "Uma P_Key deve ser especificada se especificar um principal"
 
-#: ../libnm-core/nm-setting-infiniband.c:237
+#: ../libnm-core/nm-setting-infiniband.c:238
 #: ../libnm-util/nm-setting-infiniband.c:249
 msgid "InfiniBand P_Key connection did not specify parent interface name"
 msgstr ""
 "A conexão P_Key InfiniBand não especifica um nome de interface principal"
 
-#: ../libnm-core/nm-setting-infiniband.c:275
+#: ../libnm-core/nm-setting-infiniband.c:276
 #: ../libnm-util/nm-setting-infiniband.c:285
 #, c-format
 msgid ""
 "interface name of software infiniband device must be '%s' or unset (instead "
 "it is '%s')"
 msgstr ""
-"nome da interface de dispositivo de software de infiniband deve ser “%s” ou "
-"desconfigurada (mas está “%s”)"
+"nome da interface de dispositivo de software de infiniband deve ser \"%s\" "
+"ou desconfigurada (mas está \"%s\")"
 
-#: ../libnm-core/nm-setting-infiniband.c:290
+#: ../libnm-core/nm-setting-infiniband.c:291
 #, c-format
 msgid "mtu for transport mode '%s' can be at most %d but it is %d"
-msgstr "mtu para modo de transporte “%s” pode ser no máximo até %d, mas é %d"
+msgstr "mtu para modo de transporte \"%s\" pode ser no máximo até %d, mas é %d"
 
 #: ../libnm-core/nm-setting-ip-config.c:133
 #, c-format
@@ -11022,931 +9920,898 @@ msgstr "Endereço IPv6 faltando"
 #: ../libnm-core/nm-setting-ip-config.c:138
 #, c-format
 msgid "Invalid IPv4 address '%s'"
-msgstr "Endereço IPv4 inválido “%s”"
+msgstr "Endereço IPv4 inválido \"%s\""
 
 #: ../libnm-core/nm-setting-ip-config.c:138
 #, c-format
 msgid "Invalid IPv6 address '%s'"
-msgstr "Endereço IPv6 inválido “%s”"
+msgstr "Endereço IPv6 inválido \"%s\""
 
 #: ../libnm-core/nm-setting-ip-config.c:153
 #, c-format
 msgid "Invalid IPv4 address prefix '%u'"
-msgstr "Endereço IPv4 com prefixo inválido “%u”"
+msgstr "Endereço IPv4 com prefixo inválido \"%u\""
 
 #: ../libnm-core/nm-setting-ip-config.c:153
 #, c-format
 msgid "Invalid IPv6 address prefix '%u'"
-msgstr "Endereço IPv6 com prefixo inválido “%u”"
+msgstr "Endereço IPv6 com prefixo inválido \"%u\""
 
 #: ../libnm-core/nm-setting-ip-config.c:168
 #, c-format
 msgid "Invalid routing metric '%s'"
-msgstr "Métrica roteamento inválida “%s”"
+msgstr "Métrica roteamento inválida \"%s\""
 
-#: ../libnm-core/nm-setting-ip-config.c:1287
-#: ../libnm-core/nm-setting-sriov.c:422
+#: ../libnm-core/nm-setting-ip-config.c:1317
+#, fuzzy
 msgid "unknown attribute"
-msgstr "atributo desconhecido"
+msgstr "nome de definição desconhecido"
 
-#: ../libnm-core/nm-setting-ip-config.c:1297
-#: ../libnm-core/nm-setting-sriov.c:432
-#, c-format
+#: ../libnm-core/nm-setting-ip-config.c:1327
+#, fuzzy, c-format
 msgid "invalid attribute type '%s'"
-msgstr "valor de atributo inválido “%s”"
+msgstr "valor de paridade inválido \"%s\""
 
-#: ../libnm-core/nm-setting-ip-config.c:1308
+#: ../libnm-core/nm-setting-ip-config.c:1338
 #, c-format
 msgid "attribute is not valid for a IPv4 route"
-msgstr "o atributo não é válido para uma rota IPv4"
+msgstr ""
 
-#: ../libnm-core/nm-setting-ip-config.c:1309
+#: ../libnm-core/nm-setting-ip-config.c:1339
 #, c-format
 msgid "attribute is not valid for a IPv6 route"
-msgstr "o atributo não é válido para uma rota IPv6"
+msgstr ""
 
-#: ../libnm-core/nm-setting-ip-config.c:1325
-#: ../libnm-core/nm-setting-ip-config.c:1349
-#, c-format
+#: ../libnm-core/nm-setting-ip-config.c:1355
+#: ../libnm-core/nm-setting-ip-config.c:1379
+#, fuzzy, c-format
 msgid "'%s' is not a valid IPv4 address"
-msgstr "“%s” não é um endereço IPv4 válido"
+msgstr "\"%s\" não é um endereço IP válido"
 
-#: ../libnm-core/nm-setting-ip-config.c:1326
-#: ../libnm-core/nm-setting-ip-config.c:1350
-#, c-format
+#: ../libnm-core/nm-setting-ip-config.c:1356
+#: ../libnm-core/nm-setting-ip-config.c:1380
+#, fuzzy, c-format
 msgid "'%s' is not a valid IPv6 address"
-msgstr "“%s” não é um endereço IPv6 válido"
+msgstr "\"%s\" não é um endereço IP válido"
 
-#: ../libnm-core/nm-setting-ip-config.c:1340
-#, c-format
+#: ../libnm-core/nm-setting-ip-config.c:1370
+#, fuzzy, c-format
 msgid "invalid prefix %s"
-msgstr "prefixo inválido %s"
+msgstr "rota inválida: %s"
 
-#: ../libnm-core/nm-setting-ip-config.c:2514
+#: ../libnm-core/nm-setting-ip-config.c:2534
 #, c-format
 msgid "%d. DNS server address is invalid"
 msgstr "%d. Endereço de servidor DNS é inválido"
 
-#: ../libnm-core/nm-setting-ip-config.c:2530
+#: ../libnm-core/nm-setting-ip-config.c:2550
 #, c-format
 msgid "%d. IP address is invalid"
 msgstr "%d. Endereço IP é inválido"
 
-#: ../libnm-core/nm-setting-ip-config.c:2542
+#: ../libnm-core/nm-setting-ip-config.c:2562
 #, c-format
 msgid "%d. IP address has 'label' property with invalid type"
-msgstr "%d. Endereço IP possui a propriedade “label” com tipo inválido"
+msgstr "%d. Endereço IP possui a propriedade \"label\" com tipo inválido"
 
-#: ../libnm-core/nm-setting-ip-config.c:2551
+#: ../libnm-core/nm-setting-ip-config.c:2571
 #, c-format
 msgid "%d. IP address has invalid label '%s'"
-msgstr "%d. Endereço IPv4 possui um rótulo “%s” inválido"
+msgstr "%d. Endereço IPv4 possui um rótulo \"%s\" inválido"
 
-#: ../libnm-core/nm-setting-ip-config.c:2565
+#: ../libnm-core/nm-setting-ip-config.c:2585
 msgid "gateway cannot be set if there are no addresses configured"
 msgstr "gateway não pode ser definido se não houver endereços configurados"
 
-#: ../libnm-core/nm-setting-ip-config.c:2574
+#: ../libnm-core/nm-setting-ip-config.c:2594
 msgid "gateway is invalid"
 msgstr "gateway é inválido"
 
-#: ../libnm-core/nm-setting-ip-config.c:2588
+#: ../libnm-core/nm-setting-ip-config.c:2608
 #, c-format
 msgid "%d. route is invalid"
 msgstr "%d: rota é inválida"
 
-#: ../libnm-core/nm-setting-ip-config.c:2597
+#: ../libnm-core/nm-setting-ip-config.c:2617
 #, c-format
 msgid "%d. route cannot be a default route"
 msgstr "%d. rota não pode ser uma rota padrão"
 
-#: ../libnm-core/nm-setting-ip-config.c:2608
+#: ../libnm-core/nm-setting-ip-config.c:2628
 #, c-format
 msgid "a gateway is incompatible with '%s'"
-msgstr "um gateway é incompatível com “%s”"
+msgstr "um gateway é incompatível com \"%s\""
 
-#: ../libnm-core/nm-setting-ip4-config.c:142
-#: ../libnm-core/nm-setting-ip6-config.c:188
+#: ../libnm-core/nm-setting-ip4-config.c:143
+#: ../libnm-core/nm-setting-ip6-config.c:167
 #: ../libnm-util/nm-setting-ip4-config.c:879
-#: ../libnm-util/nm-setting-ip6-config.c:841
+#: ../libnm-util/nm-setting-ip6-config.c:843
 #, c-format
 msgid "this property cannot be empty for '%s=%s'"
-msgstr "esta propriedade não pode estar vazia para “%s=%s”"
-
-#: ../libnm-core/nm-setting-ip4-config.c:154
-#: ../libnm-core/nm-setting-ip4-config.c:164
-#: ../libnm-core/nm-setting-ip4-config.c:176
-#: ../libnm-core/nm-setting-ip6-config.c:203
-#: ../libnm-core/nm-setting-ip6-config.c:213
-#: ../libnm-core/nm-setting-ip6-config.c:223
+msgstr "esta propriedade não pode estar vazia para \"%s=%s\""
+
+#: ../libnm-core/nm-setting-ip4-config.c:155
+#: ../libnm-core/nm-setting-ip4-config.c:165
+#: ../libnm-core/nm-setting-ip4-config.c:177
+#: ../libnm-core/nm-setting-ip6-config.c:182
+#: ../libnm-core/nm-setting-ip6-config.c:192
+#: ../libnm-core/nm-setting-ip6-config.c:202
 #: ../libnm-util/nm-setting-ip4-config.c:891
 #: ../libnm-util/nm-setting-ip4-config.c:901
 #: ../libnm-util/nm-setting-ip4-config.c:913
-#: ../libnm-util/nm-setting-ip6-config.c:853
-#: ../libnm-util/nm-setting-ip6-config.c:863
-#: ../libnm-util/nm-setting-ip6-config.c:875
+#: ../libnm-util/nm-setting-ip6-config.c:855
+#: ../libnm-util/nm-setting-ip6-config.c:865
+#: ../libnm-util/nm-setting-ip6-config.c:877
 #, c-format
 msgid "this property is not allowed for '%s=%s'"
-msgstr "esta propriedade não é permitida para “%s=%s”"
+msgstr "esta propriedade não é permitida para \"%s=%s\""
 
-#: ../libnm-core/nm-setting-ip4-config.c:213
+#: ../libnm-core/nm-setting-ip4-config.c:214
 #, c-format
 msgid "'%s' is not a valid FQDN"
-msgstr "“%s” não é um FQDN válido"
+msgstr "\"%s\" não é um FQDN válido"
 
-#: ../libnm-core/nm-setting-ip4-config.c:222
+#: ../libnm-core/nm-setting-ip4-config.c:223
 msgid "property cannot be set when dhcp-hostname is also set"
 msgstr ""
 "propriedade não pode ser definida quando dhcp-hostname também foi definido"
 
-#: ../libnm-core/nm-setting-ip4-config.c:234
+#: ../libnm-core/nm-setting-ip4-config.c:235
 #, c-format
 msgid "multiple addresses are not allowed for '%s=%s'"
-msgstr "endereços múltiplos não são permitidos por “%s=%s”"
+msgstr ""
 
-#: ../libnm-core/nm-setting-ip4-config.c:248
+#: ../libnm-core/nm-setting-ip4-config.c:249
 msgid "property should be TRUE when method is set to disabled"
 msgstr ""
-"a propriedade deve ser VERDADEIRO quando o método está definido para "
-"desabilitado"
 
-#: ../libnm-core/nm-setting-ip6-config.c:262
+#: ../libnm-core/nm-setting-ip6-config.c:241
+#, fuzzy
 msgid "value is not a valid token"
-msgstr "o valor não é um token válido"
+msgstr "o valor \"%s\" não é um UUID válido"
 
-#: ../libnm-core/nm-setting-ip6-config.c:273
+#: ../libnm-core/nm-setting-ip6-config.c:252
+#, fuzzy
 msgid "only makes sense with EUI64 address generation mode"
-msgstr "só faz sentido com o modo de geração de endereço EUI64"
-
-#: ../libnm-core/nm-setting-ip6-config.c:284
-msgid "invalid DUID"
-msgstr "DUID inválido"
+msgstr "modo de geração de endereço SLAAC IPv6"
 
-#: ../libnm-core/nm-setting-ip6-config.c:296
+#: ../libnm-core/nm-setting-ip6-config.c:264
 msgid "token is not in canonical form"
-msgstr "o token não está na forma canônica"
+msgstr ""
 
-#: ../libnm-core/nm-setting-ip6-config.c:308
+#: ../libnm-core/nm-setting-ip6-config.c:276
 msgid "property should be TRUE when method is set to ignore"
 msgstr ""
-"a propriedade deve ser VERDADEIRO quando o método está definido para ignorar"
 
-#: ../libnm-core/nm-setting-ip-tunnel.c:340
+#: ../libnm-core/nm-setting-ip-tunnel.c:318
 #, c-format
 msgid "'%d' is not a valid tunnel mode"
-msgstr "“%d” não é um modo túnel válido"
+msgstr "\"%d\" não é um modo túnel válido"
 
-#: ../libnm-core/nm-setting-ip-tunnel.c:363
-#: ../libnm-core/nm-setting-ip-tunnel.c:383
+#: ../libnm-core/nm-setting-ip-tunnel.c:330
+#: ../libnm-core/nm-setting-macsec.c:302 ../libnm-core/nm-setting-macvlan.c:167
+#: ../libnm-core/nm-setting-vlan.c:645 ../libnm-core/nm-setting-vxlan.c:403
+#: ../libnm-util/nm-setting-vlan.c:567
+#, c-format
+msgid "'%s' is neither an UUID nor an interface name"
+msgstr "\"%s\" não é um UUID nem um nome de interface"
+
+#: ../libnm-core/nm-setting-ip-tunnel.c:341
+#: ../libnm-core/nm-setting-ip-tunnel.c:361
 #, c-format
 msgid "'%s' is not a valid IPv%c address"
-msgstr "“%s” não é um endereço IPv%c válido"
+msgstr "\"%s\" não é um endereço IPv%c válido"
 
-#: ../libnm-core/nm-setting-ip-tunnel.c:400
+#: ../libnm-core/nm-setting-ip-tunnel.c:375
 msgid "tunnel keys can only be specified for GRE tunnels"
 msgstr "chaves de túnel podem ser especificadas apenas para túneis GRE"
 
-#: ../libnm-core/nm-setting-ip-tunnel.c:413
-#: ../libnm-core/nm-setting-ip-tunnel.c:429
+#: ../libnm-core/nm-setting-ip-tunnel.c:388
+#: ../libnm-core/nm-setting-ip-tunnel.c:404
 #, c-format
 msgid "'%s' is not a valid tunnel key"
-msgstr "“%s” não é uma chave de túnel válido"
+msgstr "\"%s\" não é uma chave de túnel válido"
 
-#: ../libnm-core/nm-setting-ip-tunnel.c:441
+#: ../libnm-core/nm-setting-ip-tunnel.c:416
 msgid "a fixed TTL is allowed only when path MTU discovery is enabled"
 msgstr ""
 "um TTL fixo é permitida apenas quando a descoberta de MTU de caminho estiver "
 "habilitada"
 
-#: ../libnm-core/nm-setting-ip-tunnel.c:454
-#, c-format
-msgid "some flags are invalid for the select mode: %s"
-msgstr "alguns sinalizadores são inválido para o modo de seleção: %s"
-
-#: ../libnm-core/nm-setting-ip-tunnel.c:468
-#, c-format
-msgid "wired setting not allowed for mode %s"
-msgstr "esta propriedade não é permitida para método %s"
-
-#: ../libnm-core/nm-setting-macsec.c:251
+#: ../libnm-core/nm-setting-macsec.c:235
 msgid "the key is empty"
-msgstr "a chave está vazia"
+msgstr ""
 
-#: ../libnm-core/nm-setting-macsec.c:262
+#: ../libnm-core/nm-setting-macsec.c:246
 #, c-format
 msgid "the key must be %d characters"
-msgstr "a chave deve ter %d caracteres"
+msgstr ""
 
-#: ../libnm-core/nm-setting-macsec.c:270
+#: ../libnm-core/nm-setting-macsec.c:254
+#, fuzzy
 msgid "the key contains non-hexadecimal characters"
-msgstr "a chave contém caracteres não hexadecimais"
+msgstr "IV contém dígitos não-hexadecimais."
+
+#: ../libnm-core/nm-setting-macsec.c:291 ../libnm-core/nm-setting-vlan.c:634
+#: ../libnm-util/nm-setting-vlan.c:556
+#, c-format
+msgid "'%s' value doesn't match '%s=%s'"
+msgstr "valor \"%s\" não corresponde \"%s=%s\""
 
-#: ../libnm-core/nm-setting-macsec.c:332 ../libnm-core/nm-setting-macvlan.c:176
-#: ../libnm-core/nm-setting-vlan.c:658 ../libnm-util/nm-setting-vlan.c:580
+#: ../libnm-core/nm-setting-macsec.c:316 ../libnm-core/nm-setting-macvlan.c:181
+#: ../libnm-core/nm-setting-vlan.c:659 ../libnm-util/nm-setting-vlan.c:580
 #, c-format
 msgid "property is not specified and neither is '%s:%s'"
-msgstr "propriedade não está especificada nem é “%s=%s”"
+msgstr "propriedade não está especificada nem é \"%s=%s\""
 
-#: ../libnm-core/nm-setting-macsec.c:349
+#: ../libnm-core/nm-setting-macsec.c:333
 #, c-format
 msgid "EAP key management requires '%s' setting presence"
-msgstr "o gerenciamento de chaves EAP exige a presença da definição “%s”"
+msgstr ""
 
-#: ../libnm-core/nm-setting-macsec.c:360
+#: ../libnm-core/nm-setting-macsec.c:344
 #, c-format
 msgid "invalid port %d"
-msgstr "porta inválida %d"
+msgstr ""
 
-#: ../libnm-core/nm-setting-macvlan.c:187
+#: ../libnm-core/nm-setting-macvlan.c:192
 msgid "non promiscuous operation is allowed only in passthru mode"
 msgstr "operação não promíscua é permitida apenas em modo passthru"
 
-#: ../libnm-core/nm-setting-olpc-mesh.c:129
-#: ../libnm-core/nm-setting-wireless.c:761
+#: ../libnm-core/nm-setting-olpc-mesh.c:130
+#: ../libnm-core/nm-setting-wireless.c:760
 #: ../libnm-util/nm-setting-olpc-mesh.c:132
-#: ../libnm-util/nm-setting-wireless.c:777
+#: ../libnm-util/nm-setting-wireless.c:778
 msgid "SSID length is out of range <1-32> bytes"
 msgstr "tamanho do SSID está fora da faixa <1-32> bytes"
 
-#: ../libnm-core/nm-setting-olpc-mesh.c:138
-#: ../libnm-core/nm-setting-wireless.c:801
+#: ../libnm-core/nm-setting-olpc-mesh.c:139
+#: ../libnm-core/nm-setting-wireless.c:800
 #: ../libnm-util/nm-setting-olpc-mesh.c:141
-#: ../libnm-util/nm-setting-wireless.c:817
+#: ../libnm-util/nm-setting-wireless.c:818
 #, c-format
 msgid "'%d' is not a valid channel"
-msgstr "“%d” não é um canal válido"
+msgstr "\"%d\" não é um canal válido"
 
-#: ../libnm-core/nm-setting-ovs-interface.c:112
+#: ../libnm-core/nm-setting-ovs-interface.c:113
 #, c-format
 msgid "'%s' is not a valid interface type"
-msgstr "“%s” não é um tipo de interface válido"
+msgstr ""
 
-#: ../libnm-core/nm-setting-ovs-interface.c:134
+#: ../libnm-core/nm-setting-ovs-interface.c:135
 #, c-format
 msgid "A connection with a '%s' setting needs connection.type explicitly set"
 msgstr ""
-"Uma conexão com uma configuração “%s” precisa de connection.type definida "
-"explicitamente"
 
-#: ../libnm-core/nm-setting-ovs-interface.c:146
+#: ../libnm-core/nm-setting-ovs-interface.c:147
 #, c-format
 msgid "A connection of type '%s' cannot have ovs-interface.type \"system\""
-msgstr "Uma conexão do tipo “%s” não pode ter ovs-interface.type “system”"
+msgstr ""
 
-#: ../libnm-core/nm-setting-ovs-interface.c:158
+#: ../libnm-core/nm-setting-ovs-interface.c:159
 #, c-format
 msgid "A connection of type '%s' cannot have an ovs-interface.type \"%s\""
-msgstr "Uma conexão do tipo “%s” não pode ter um ovs-interface.type “%s”"
+msgstr ""
 
-#: ../libnm-core/nm-setting-ovs-interface.c:174
+#: ../libnm-core/nm-setting-ovs-interface.c:175
 #, c-format
 msgid ""
 "A connection with '%s' setting must be of connection.type \"ovs-interface\" "
 "but is \"%s\""
 msgstr ""
-"Uma conexão com a configuração “%s” deve ser de connection.type “ovs-"
-"interface”, mas é “%s”"
 
-#: ../libnm-core/nm-setting-ovs-interface.c:185
+#: ../libnm-core/nm-setting-ovs-interface.c:186
 #, c-format
 msgid ""
 "A connection with '%s' setting needs to be of 'patch' interface type, not "
 "'%s'"
 msgstr ""
-"Uma conexão com a configuração “%s” precisa ser do tipo de interface "
-"“patch”, e não “%s”"
 
-#: ../libnm-core/nm-setting-ovs-interface.c:200
+#: ../libnm-core/nm-setting-ovs-interface.c:201
 #, c-format
 msgid "A connection with ovs-interface.type '%s' setting a 'ovs-patch' setting"
 msgstr ""
-"Uma conexão com ovs-interface.type “%s” configurando uma configuração 'ovs-"
-"patch'"
 
-#: ../libnm-core/nm-setting-ovs-interface.c:220
+#: ../libnm-core/nm-setting-ovs-interface.c:221
 #, c-format
 msgid "Missing ovs interface setting"
-msgstr "Faltando configuração de interface ovs"
+msgstr ""
 
-#: ../libnm-core/nm-setting-ovs-interface.c:226
+#: ../libnm-core/nm-setting-ovs-interface.c:227
 #, c-format
 msgid "Missing ovs interface type"
-msgstr "Faltando tipo de interface ovs"
+msgstr ""
 
-#: ../libnm-core/nm-setting-ovs-interface.c:269
-#: ../libnm-core/nm-setting-ovs-port.c:197
+#: ../libnm-core/nm-setting-ovs-interface.c:271
+#: ../libnm-core/nm-setting-ovs-port.c:198
 #, c-format
 msgid "A connection with a '%s' setting must have a master."
-msgstr "Uma conexão com uma configuração “%s” deve ter um mestre."
+msgstr ""
 
-#: ../libnm-core/nm-setting-ovs-patch.c:105
-#: ../libnm-core/nm-setting-vxlan.c:374
+#: ../libnm-core/nm-setting-ovs-patch.c:110
+#: ../libnm-core/nm-setting-vxlan.c:375
 #, c-format
 msgid "'%s' is not a valid IP address"
-msgstr "“%s” não é um endereço IP válido"
+msgstr "\"%s\" não é um endereço IP válido"
 
-#: ../libnm-core/nm-setting-ovs-port.c:222
+#: ../libnm-core/nm-setting-ovs-port.c:223
 #, c-format
 msgid "'%s' is not allowed in vlan_mode"
-msgstr "“%s” não é permitido em vlan_mode"
+msgstr ""
 
-#: ../libnm-core/nm-setting-ovs-port.c:232
+#: ../libnm-core/nm-setting-ovs-port.c:233
 #, c-format
 msgid "the tag id must be in range 0-4094 but is %u"
-msgstr "o id da tag deve estar na faixa 0-4094, mas é %u"
+msgstr ""
 
-#: ../libnm-core/nm-setting-ovs-port.c:242
+#: ../libnm-core/nm-setting-ovs-port.c:243
 #, c-format
 msgid "'%s' is not allowed in lacp"
-msgstr "“%s” não é permitido em lacp"
+msgstr ""
 
-#: ../libnm-core/nm-setting-ovs-port.c:252
+#: ../libnm-core/nm-setting-ovs-port.c:253
 #, c-format
 msgid "'%s' is not allowed in bond_mode"
-msgstr "“%s” não é permitido em bond_mode"
+msgstr ""
 
-#: ../libnm-core/nm-setting-ovs-bridge.c:160
+#: ../libnm-core/nm-setting-ovs-bridge.c:161
 #, c-format
 msgid "A connection with a '%s' setting must not have a master."
-msgstr "Uma conexão com uma configuração “%s” não pode ter um mestre."
+msgstr ""
 
-#: ../libnm-core/nm-setting-ovs-bridge.c:171
+#: ../libnm-core/nm-setting-ovs-bridge.c:172
 #, c-format
 msgid "'%s' is not allowed in fail_mode"
-msgstr "“%s” não é permitido em fail_mode"
+msgstr ""
 
-#: ../libnm-core/nm-setting-ppp.c:364 ../libnm-util/nm-setting-ppp.c:386
+#: ../libnm-core/nm-setting-ppp.c:365 ../libnm-util/nm-setting-ppp.c:387
 #, c-format
 msgid "'%d' is out of valid range <128-16384>"
-msgstr "“%d” está fora da faixa válida <128-16384>"
+msgstr "\"%d\" está fora da faixa válida <128-16384>"
 
-#: ../libnm-core/nm-setting-ppp.c:377 ../libnm-util/nm-setting-ppp.c:399
+#: ../libnm-core/nm-setting-ppp.c:378 ../libnm-util/nm-setting-ppp.c:400
 #, c-format
 msgid "setting this property requires non-zero '%s' property"
-msgstr "definição desta propriedade requer propriedade “%s” não-zero"
+msgstr "definição desta propriedade requer propriedade \"%s\" não-zero"
 
-#: ../libnm-core/nm-setting-proxy.c:162
+#: ../libnm-core/nm-setting-proxy.c:163
 #, c-format
 msgid "invalid proxy method"
-msgstr "método de proxy inválido"
+msgstr ""
 
-#: ../libnm-core/nm-setting-proxy.c:172 ../libnm-core/nm-setting-proxy.c:181
+#: ../libnm-core/nm-setting-proxy.c:173 ../libnm-core/nm-setting-proxy.c:182
 #, c-format
 msgid "this property is not allowed for method none"
-msgstr "esta propriedade não é permitida para método “none”"
+msgstr ""
 
-#: ../libnm-core/nm-setting-proxy.c:192
+#: ../libnm-core/nm-setting-proxy.c:193
 #, c-format
 msgid "the script is too large"
-msgstr "o script é grande demais"
+msgstr ""
 
-#: ../libnm-core/nm-setting-proxy.c:200
+#: ../libnm-core/nm-setting-proxy.c:201
 #, c-format
 msgid "the script is not valid utf8"
-msgstr "o script não é um utf8 válido"
+msgstr ""
 
-#: ../libnm-core/nm-setting-proxy.c:208
+#: ../libnm-core/nm-setting-proxy.c:209
 #, c-format
 msgid "the script lacks FindProxyForURL function"
-msgstr "o script carece da função FindProxyForURL"
-
-#: ../libnm-core/nm-setting-sriov.c:1087
-#, c-format
-msgid "VF with index %u, but the total number of VFs is %u"
-msgstr "VF com índice %u, mas o número total de VFs é %u"
-
-#: ../libnm-core/nm-setting-sriov.c:1098
-#, c-format
-msgid "invalid VF %u: %s"
-msgstr "VF inválido %u: %s"
-
-#: ../libnm-core/nm-setting-sriov.c:1110
-#, c-format
-msgid "duplicate VF index %u"
-msgstr "VF índice %u duplicado"
-
-#: ../libnm-core/nm-setting-sriov.c:1131
-#, c-format
-msgid "VFs %d and %d are not sorted by ascending index"
-msgstr "VFs %d e %d não estão ordenados por índice ascendente"
+msgstr ""
 
 #: ../libnm-core/nm-setting-tc-config.c:68
-#: ../libnm-core/nm-setting-tc-config.c:296
-#: ../libnm-core/nm-setting-tc-config.c:550
-#, c-format
+#: ../libnm-core/nm-setting-tc-config.c:283
+#: ../libnm-core/nm-setting-tc-config.c:547
+#, fuzzy, c-format
 msgid "'%s' is not a valid kind"
-msgstr "“%s” não é um tipo válido"
+msgstr "\"%s\" não é uma banda válida"
 
 #: ../libnm-core/nm-setting-tc-config.c:76
-#: ../libnm-core/nm-setting-tc-config.c:558
+#: ../libnm-core/nm-setting-tc-config.c:555
+#, fuzzy
 msgid "parent handle missing"
-msgstr "faltando tratamento pai"
-
-#: ../libnm-core/nm-setting-tc-config.c:1204
-msgid "there are duplicate TC qdiscs"
-msgstr "há qdiscs TC duplicados"
-
-#: ../libnm-core/nm-setting-tc-config.c:1224
-msgid "there are duplicate TC filters"
-msgstr "há filtros TC duplicados"
+msgstr "faltando dados"
 
 #: ../libnm-core/nm-setting-team.c:134 ../libnm-core/nm-setting-team.c:193
 #: ../libnm-core/nm-setting-team.c:266
-#, c-format
+#, fuzzy, c-format
 msgid "%s is out of range [0, %d]"
-msgstr "%s está fora da faixa [0, %d]"
+msgstr "valor \"%d\" está fora da faixa <%d-%d>"
 
 #: ../libnm-core/nm-setting-team.c:175
 #, c-format
 msgid "Missing target-host in nsna_ping link watcher"
-msgstr "Faltando target-host no monitorador de link de nsna_ping"
+msgstr ""
 
 #: ../libnm-core/nm-setting-team.c:181 ../libnm-core/nm-setting-team.c:248
-#, c-format
+#, fuzzy, c-format
 msgid "target-host '%s' contains invalid characters"
-msgstr "o target-host “%s” contém caracteres inválidos"
+msgstr "IV contém dígitos não-hexadecimais."
 
 #: ../libnm-core/nm-setting-team.c:241
 #, c-format
 msgid "Missing %s in arp_ping link watcher"
-msgstr "Faltando %s no monitorador de link de arp_ping"
+msgstr ""
 
 #: ../libnm-core/nm-setting-team.c:254
-#, c-format
+#, fuzzy, c-format
 msgid "source-host '%s' contains invalid characters"
-msgstr "o source-host “%s” contém caracteres inválidos"
+msgstr "IV contém dígitos não-hexadecimais."
 
-#: ../libnm-core/nm-setting-team.c:1154
+#: ../libnm-core/nm-setting-team.c:1153
 #: ../libnm-core/nm-setting-team-port.c:381
 #, c-format
 msgid "team config exceeds size limit"
-msgstr "a configuração de união excede o limite de tamanho"
+msgstr ""
 
-#: ../libnm-core/nm-setting-team.c:1180
-#, c-format
+#: ../libnm-core/nm-setting-team.c:1178
+#, fuzzy, c-format
 msgid "invalid runner \"%s\""
-msgstr "runnner inválido “%s”"
+msgstr "rota inválida: %s"
 
-#: ../libnm-core/nm-setting-team.c:1193
-#, c-format
+#: ../libnm-core/nm-setting-team.c:1191
+#, fuzzy, c-format
 msgid "missing link watcher name"
-msgstr "faltando nome do monitorador de link"
+msgstr "faltando nome de arquivo"
 
-#: ../libnm-core/nm-setting-team.c:1203
-#, c-format
+#: ../libnm-core/nm-setting-team.c:1201
+#, fuzzy, c-format
 msgid "unknown link watcher \"%s\""
-msgstr "monitorador de link desconhecido “%s”"
+msgstr "não foi possível carregar plug-in \"%s\": %s"
 
-#: ../libnm-core/nm-setting-team.c:1214
-#, c-format
+#: ../libnm-core/nm-setting-team.c:1212
+#, fuzzy, c-format
 msgid "missing target host"
-msgstr "faltando host alvo"
+msgstr "faltando definição"
 
-#: ../libnm-core/nm-setting-team.c:1222
-#, c-format
+#: ../libnm-core/nm-setting-team.c:1220
+#, fuzzy, c-format
 msgid "missing source address"
-msgstr "faltando endereço origem"
+msgstr "Endereço IPv4 faltando"
 
-#: ../libnm-core/nm-setting-tun.c:186
+#: ../libnm-core/nm-setting-tun.c:187
 #, c-format
 msgid "'%u': invalid mode"
-msgstr "“%u”: modo inválido"
+msgstr "\"%u\": modo inválido"
 
-#: ../libnm-core/nm-setting-tun.c:196
+#: ../libnm-core/nm-setting-tun.c:197
 #, c-format
 msgid "'%s': invalid user ID"
-msgstr "“%s”: ID de usuário inválido"
+msgstr "\"%s\": ID de usuário inválido"
 
-#: ../libnm-core/nm-setting-tun.c:207
+#: ../libnm-core/nm-setting-tun.c:208
 #, c-format
 msgid "'%s': invalid group ID"
-msgstr "“%s”: ID de grupo inválido"
+msgstr "\"%s\": ID de grupo inválido"
 
-#: ../libnm-core/nm-setting-user.c:110
+#: ../libnm-core/nm-setting-user.c:111
+#, fuzzy
 msgid "missing key"
-msgstr "faltando chave"
+msgstr "faltando definição"
 
-#: ../libnm-core/nm-setting-user.c:116
+#: ../libnm-core/nm-setting-user.c:117
+#, fuzzy
 msgid "key is too long"
-msgstr "a chave é longa demais"
+msgstr "Erro: ssid grande demais."
 
-#: ../libnm-core/nm-setting-user.c:121
+#: ../libnm-core/nm-setting-user.c:122
+#, fuzzy
 msgid "key must be UTF8"
-msgstr "a chave deve ser UTF8"
+msgstr "Senha deve estar em UTF-8"
 
-#: ../libnm-core/nm-setting-user.c:144
+#: ../libnm-core/nm-setting-user.c:145
 msgid "key requires a '.' for a namespace"
-msgstr "a chave requer um “.” para um espaço de nome"
+msgstr ""
 
-#: ../libnm-core/nm-setting-user.c:157
+#: ../libnm-core/nm-setting-user.c:158
 msgid "key cannot contain \"..\""
-msgstr "a chave não pode conter “..”"
+msgstr ""
 
-#: ../libnm-core/nm-setting-user.c:162
+#: ../libnm-core/nm-setting-user.c:163
+#, fuzzy
 msgid "key contains invalid characters"
-msgstr "a chave contém caracteres inválidos"
+msgstr "IV contém dígitos não-hexadecimais."
 
-#: ../libnm-core/nm-setting-user.c:187
+#: ../libnm-core/nm-setting-user.c:188
+#, fuzzy
 msgid "value is missing"
-msgstr "valor está faltando"
+msgstr "propriedade está faltando"
 
-#: ../libnm-core/nm-setting-user.c:194
+#: ../libnm-core/nm-setting-user.c:195
+#, fuzzy
 msgid "value is too large"
-msgstr "o valor é grande demais"
+msgstr "valor \"%d\" está fora da faixa <0-3>"
 
-#: ../libnm-core/nm-setting-user.c:200
+#: ../libnm-core/nm-setting-user.c:201
+#, fuzzy
 msgid "value is not valid UTF8"
-msgstr "o valor não é um UTF8 válido"
+msgstr "o valor \"%s\" não é um UUID válido"
 
-#: ../libnm-core/nm-setting-user.c:330
+#: ../libnm-core/nm-setting-user.c:338
 msgid "maximum number of user data entries reached"
-msgstr "número máximo de entradas de dados de usuário atingida"
+msgstr ""
 
-#: ../libnm-core/nm-setting-user.c:371
+#: ../libnm-core/nm-setting-user.c:379
 #, c-format
 msgid "invalid key \"%s\": %s"
-msgstr "chave inválida “%s”: %s"
+msgstr ""
 
-#: ../libnm-core/nm-setting-user.c:375
+#: ../libnm-core/nm-setting-user.c:383
 #, c-format
 msgid "invalid value for \"%s\": %s"
-msgstr "valor inválido para “%s”: %s"
+msgstr ""
 
-#: ../libnm-core/nm-setting-user.c:390
+#: ../libnm-core/nm-setting-user.c:398
 #, c-format
 msgid "maximum number of user data entries reached (%u instead of %u)"
 msgstr ""
-"o número máximo de entradas de dados de usuário atingido (%u em vez de %u)"
 
-#: ../libnm-core/nm-setting-vlan.c:669 ../libnm-util/nm-setting-vlan.c:600
+#: ../libnm-core/nm-setting-vlan.c:670 ../libnm-util/nm-setting-vlan.c:600
 #, c-format
 msgid "the vlan id must be in range 0-4094 but is %u"
 msgstr "o id da vlan deve estar na faixa 0-4094, mas é %u"
 
-#: ../libnm-core/nm-setting-vlan.c:679 ../libnm-util/nm-setting-vlan.c:591
+#: ../libnm-core/nm-setting-vlan.c:680 ../libnm-util/nm-setting-vlan.c:591
 msgid "flags are invalid"
 msgstr "sinalizadores são inválidos"
 
-#: ../libnm-core/nm-setting-vlan.c:691
+#: ../libnm-core/nm-setting-vlan.c:692
 msgid "vlan setting should have a ethernet setting as well"
-msgstr "a definição de vlan deve ter uma definição de ethernet também"
+msgstr ""
 
-#: ../libnm-core/nm-setting-vpn.c:529
+#: ../libnm-core/nm-setting-vpn.c:559
 #, c-format
 msgid "secret was empty"
 msgstr "segredo estava vazio"
 
-#: ../libnm-core/nm-setting-vpn.c:559
+#: ../libnm-core/nm-setting-vpn.c:589
 msgid "setting contained a secret with an empty name"
 msgstr "definição continha um segredo com um nome vazio"
 
-#: ../libnm-core/nm-setting-vpn.c:567
+#: ../libnm-core/nm-setting-vpn.c:597
 #, c-format
 msgid "secret value was empty"
 msgstr "valor de segredo estava vazio"
 
-#: ../libnm-core/nm-setting-vpn.c:614 ../libnm-core/nm-setting.c:1867
+#: ../libnm-core/nm-setting-vpn.c:644 ../libnm-core/nm-setting.c:1788
 msgid "not a secret property"
 msgstr "não é uma propriedade de segredo"
 
-#: ../libnm-core/nm-setting-vpn.c:620
+#: ../libnm-core/nm-setting-vpn.c:650
 msgid "secret is not of correct type"
 msgstr "segredo não é do tipo correto"
 
-#: ../libnm-core/nm-setting-vpn.c:651
+#: ../libnm-core/nm-setting-vpn.c:681
 #, c-format
 msgid "failed to convert value '%s' to uint"
-msgstr "falha ao converter valor “%s” para uint"
+msgstr "falha ao converter valor \"%s\" para uint"
 
-#: ../libnm-core/nm-setting-vxlan.c:387
+#: ../libnm-core/nm-setting-vxlan.c:388
 #, c-format
 msgid "'%s' is not a valid IP%c address"
-msgstr "“%s” não é um endereço IP%c válido"
+msgstr "\"%s\" não é um endereço IP%c válido"
 
-#: ../libnm-core/nm-setting-vxlan.c:414
+#: ../libnm-core/nm-setting-vxlan.c:415
 #, c-format
 msgid "%d is greater than local port max %d"
 msgstr "%d é maior que porta local máxima %d"
 
-#: ../libnm-core/nm-setting-wired.c:631 ../libnm-util/nm-setting-wired.c:612
+#: ../libnm-core/nm-setting-wired.c:632 ../libnm-util/nm-setting-wired.c:613
 #, c-format
 msgid "'%s' is not a valid Ethernet port value"
-msgstr "“%s” não é um valor válido de porta Ethernet"
+msgstr "\"%s\" não é um valor válido de porta Ethernet"
 
-#: ../libnm-core/nm-setting-wired.c:641 ../libnm-util/nm-setting-wired.c:622
+#: ../libnm-core/nm-setting-wired.c:642 ../libnm-util/nm-setting-wired.c:623
 #, c-format
 msgid "'%s' is not a valid duplex value"
-msgstr "“%s” não é um valor duplex válido"
+msgstr "\"%s\" não é um valor duplex válido"
 
-#: ../libnm-core/nm-setting-wired.c:700 ../libnm-util/nm-setting-wired.c:679
+#: ../libnm-core/nm-setting-wired.c:701 ../libnm-util/nm-setting-wired.c:680
 #, c-format
 msgid "invalid '%s' or its value '%s'"
-msgstr "“%s” ou seu valor “%s” é inválido"
+msgstr "\"%s\" ou seu valor \"%s\" é inválido"
 
-#: ../libnm-core/nm-setting-wired.c:737
+#: ../libnm-core/nm-setting-wired.c:738
 msgid "Wake-on-LAN mode 'default' and 'ignore' are exclusive flags"
-msgstr "Modos de Wake-on-LAN “default” e “ignore” são sinalizadores exclusivo"
+msgstr ""
+"Modos de Wake-on-LAN \"default\" e \"ignore\" são sinalizadores exclusivo"
 
-#: ../libnm-core/nm-setting-wired.c:746
+#: ../libnm-core/nm-setting-wired.c:747
 msgid "Wake-on-LAN password can only be used with magic packet mode"
 msgstr "A senha de Wake-on-LAN só pode ser usada com o modo pacote mágico"
 
-#: ../libnm-core/nm-setting-wired.c:771
-msgid "both speed and duplex should have a valid value or both should be unset"
+#: ../libnm-core/nm-setting-wired.c:770
+msgid "when link autonegotiation is enabled no duplex value is accepted"
+msgstr ""
+
+#: ../libnm-core/nm-setting-wired.c:778
+msgid "when link autonegotiation is enabled speed should be 0"
 msgstr ""
-"tanto a velocidade quanto o duplex devem ter um valor válido ou ambos devem "
-"ser desfeitos"
 
-#: ../libnm-core/nm-setting-wired.c:772
+#: ../libnm-core/nm-setting-wired.c:788
 msgid "both speed and duplex are required for static link configuration"
 msgstr ""
-"ambos “speed” e “duplex” são exigidas para configuração de link estático"
 
-#: ../libnm-core/nm-setting-wireless-security.c:940
-#: ../libnm-util/nm-setting-wireless-security.c:911
+#: ../libnm-core/nm-setting-wireless-security.c:921
+#: ../libnm-util/nm-setting-wireless-security.c:912
 #, c-format
 msgid "'%s' security requires '%s=%s'"
-msgstr "segurança “%s” requer “%s=%s”"
+msgstr "segurança \"%s\" requer \"%s=%s\""
 
-#: ../libnm-core/nm-setting-wireless-security.c:961
-#: ../libnm-util/nm-setting-wireless-security.c:932
+#: ../libnm-core/nm-setting-wireless-security.c:942
+#: ../libnm-util/nm-setting-wireless-security.c:933
 #, c-format
 msgid "'%s' security requires '%s' setting presence"
-msgstr "segurança “%s” requer a presença de definição de “%s”"
+msgstr "segurança \"%s\" requer a presença de definição de \"%s\""
 
-#: ../libnm-core/nm-setting-wireless-security.c:982
-#: ../libnm-util/nm-setting-wireless-security.c:953
+#: ../libnm-core/nm-setting-wireless-security.c:963
+#: ../libnm-util/nm-setting-wireless-security.c:954
 #, c-format
 msgid "'%d' value is out of range <0-3>"
-msgstr "valor “%d” está fora da faixa <0-3>"
+msgstr "valor \"%d\" está fora da faixa <0-3>"
 
-#: ../libnm-core/nm-setting-wireless-security.c:1037
-#: ../libnm-util/nm-setting-wireless-security.c:1008
+#: ../libnm-core/nm-setting-wireless-security.c:1018
+#: ../libnm-util/nm-setting-wireless-security.c:1009
 #, c-format
 msgid "'%s' connections require '%s' in this property"
-msgstr "conexões “%s” requerem “%s” nesta propriedade"
+msgstr "conexões \"%s\" requerem \"%s\" nesta propriedade"
 
-#: ../libnm-core/nm-setting-wireless-security.c:1067
-#: ../libnm-util/nm-setting-wireless-security.c:1038
+#: ../libnm-core/nm-setting-wireless-security.c:1048
+#: ../libnm-util/nm-setting-wireless-security.c:1039
 #, c-format
 msgid "'%s' can only be used with '%s=%s' (WEP)"
-msgstr "“%s” pode ser usada apenas com “%s=%s” (WEP)"
+msgstr "\"%s\" pode ser usada apenas com \"%s=%s\" (WEP)"
 
-#: ../libnm-core/nm-setting-wireless-security.c:1091
+#: ../libnm-core/nm-setting-wireless-security.c:1072
 #, c-format
 msgid "'%s' can only be used with '%s=%s' or '%s=%s'"
-msgstr "“%s” pode ser usada apenas com “%s=%s” ou “%s=%s”"
+msgstr ""
 
-#: ../libnm-core/nm-setting-wireless-security.c:1113
+#: ../libnm-core/nm-setting-wireless-security.c:1094
 msgid "can't be simultaneously disabled and enabled"
-msgstr "não pode ser simultaneamente desabilitado e habilitado"
+msgstr ""
 
-#: ../libnm-core/nm-setting-wireless.c:770
-#: ../libnm-util/nm-setting-wireless.c:786
+#: ../libnm-core/nm-setting-wireless.c:769
+#: ../libnm-util/nm-setting-wireless.c:787
 #, c-format
 msgid "'%s' is not a valid Wi-Fi mode"
-msgstr "“%s” não é um modo Wi-Fi válido"
+msgstr "\"%s\" não é um modo Wi-Fi válido"
 
-#: ../libnm-core/nm-setting-wireless.c:780
-#: ../libnm-util/nm-setting-wireless.c:796
+#: ../libnm-core/nm-setting-wireless.c:779
+#: ../libnm-util/nm-setting-wireless.c:797
 #, c-format
 msgid "'%s' is not a valid band"
-msgstr "“%s” não é uma banda válida"
+msgstr "\"%s\" não é uma banda válida"
 
-#: ../libnm-core/nm-setting-wireless.c:790
+#: ../libnm-core/nm-setting-wireless.c:789
 #, c-format
 msgid "'%s' requires setting '%s' property"
-msgstr "“%s” requer a definição da propriedade “%s”"
+msgstr "\"%s\" requer a definição da propriedade \"%s\""
 
-#: ../libnm-core/nm-setting-wireless.c:884
+#: ../libnm-core/nm-setting-wireless.c:883
 #, c-format
 msgid "invalid value"
-msgstr "valor inválido"
-
-#: ../libnm-core/nm-setting-wireless.c:894
-msgid "Wake-on-WLAN mode 'default' and 'ignore' are exclusive flags"
-msgstr "Modos de Wake-on-WLAN “default” e “ignore” são sinalizadores exclusivo"
-
-#: ../libnm-core/nm-setting-wireless.c:903
-msgid "Wake-on-WLAN trying to set unknown flag"
-msgstr "Wake-on-WLAN tentando definir sinalizador desconhecido"
+msgstr ""
 
-#: ../libnm-core/nm-setting-wireless.c:925
+#: ../libnm-core/nm-setting-wireless.c:904
 #, c-format
 msgid "conflicting value of mac-address-randomization and cloned-mac-address"
-msgstr "valor conflitante de mac-address-randomization e cloned-mac-address"
+msgstr ""
 
-#: ../libnm-core/nm-setting.c:900
+#: ../libnm-core/nm-setting.c:821
 #, c-format
 msgid "duplicate property"
 msgstr "propriedade duplicada"
 
-#: ../libnm-core/nm-setting.c:928 ../libnm-core/nm-setting.c:975
+#: ../libnm-core/nm-setting.c:849 ../libnm-core/nm-setting.c:896
 #, c-format
 msgid "can't set property of type '%s' from value of type '%s'"
 msgstr ""
-"não foi possível definir propriedade do tipo “%s” do valor de tipo “%s”"
+"não foi possível definir propriedade do tipo \"%s\" do valor de tipo \"%s\""
 
-#: ../libnm-core/nm-setting.c:947 ../libnm-core/nm-setting.c:961
+#: ../libnm-core/nm-setting.c:868 ../libnm-core/nm-setting.c:882
 #, c-format
 msgid "failed to set property: %s"
 msgstr "falha ao definir a propriedade: %s"
 
-#: ../libnm-core/nm-setting.c:989
+#: ../libnm-core/nm-setting.c:910
 #, c-format
 msgid "can not set property: %s"
 msgstr "não foi possível definir propriedade: %s"
 
-#: ../libnm-core/nm-setting.c:1005
+#: ../libnm-core/nm-setting.c:926
 #, c-format
 msgid "unknown property"
 msgstr "propriedade desconhecida"
 
-#: ../libnm-core/nm-setting.c:1765
+#: ../libnm-core/nm-setting.c:1686
 msgid "secret not found"
 msgstr "segredo não localizado"
 
-#: ../libnm-core/nm-setting.c:1857
+#: ../libnm-core/nm-setting.c:1778
 msgid "secret is not set"
 msgstr "segredo não está definido"
 
-#: ../libnm-core/nm-utils.c:2170
-#, c-format
+#: ../libnm-core/nm-utils.c:2123
+#, fuzzy, c-format
 msgid "'%s' is not a valid handle."
-msgstr "“%s” não é um tratamento válido."
+msgstr "\"%s\" não é uma banda válida"
 
-#: ../libnm-core/nm-utils.c:2266
+#: ../libnm-core/nm-utils.c:2220
 #, c-format
 msgid "'%s' unexpected: parent already specified."
-msgstr "“%s” inesperado: pai já especificado."
+msgstr ""
 
-#: ../libnm-core/nm-utils.c:2282
-#, c-format
+#: ../libnm-core/nm-utils.c:2236
+#, fuzzy, c-format
 msgid "invalid handle: '%s'"
-msgstr "tratamento inválido: “%s”"
+msgstr "A opção \"%s\" é inválida"
 
-#: ../libnm-core/nm-utils.c:2304
+#: ../libnm-core/nm-utils.c:2258
+#, fuzzy
 msgid "parent not specified."
-msgstr "pai não especificado."
+msgstr "Nome do serviço não especificado"
 
-#: ../libnm-core/nm-utils.c:2351
+#: ../libnm-core/nm-utils.c:2305
 #, c-format
 msgid "unsupported qdisc option: '%s'."
-msgstr "opção de qdisc sem suporte: “%s”."
+msgstr ""
 
-#: ../libnm-core/nm-utils.c:2467
+#: ../libnm-core/nm-utils.c:2421
+#, fuzzy
 msgid "action name missing."
-msgstr "faltando nome da ação."
+msgstr "faltando dados"
 
-#: ../libnm-core/nm-utils.c:2491
+#: ../libnm-core/nm-utils.c:2445
 #, c-format
 msgid "unsupported action option: '%s'."
-msgstr "opção de ação sem suporte: “%s”."
+msgstr ""
 
-#: ../libnm-core/nm-utils.c:2629
+#: ../libnm-core/nm-utils.c:2583
+#, fuzzy
 msgid "invalid action: "
-msgstr "ação inválida: "
+msgstr "A opção \"%s\" é inválida"
 
-#: ../libnm-core/nm-utils.c:2633
+#: ../libnm-core/nm-utils.c:2587
 #, c-format
 msgid "unsupported tfilter option: '%s'."
-msgstr "opção de tfilter sem suporte: “%s”."
+msgstr ""
 
-#: ../libnm-core/nm-utils.c:3235
+#: ../libnm-core/nm-utils.c:2946
 #, c-format
 msgid "failed stat file %s: %s"
 msgstr "falha ao obter estado do arquivo %s: %s"
 
-#: ../libnm-core/nm-utils.c:3244
+#: ../libnm-core/nm-utils.c:2955
 #, c-format
 msgid "not a file (%s)"
 msgstr "não é um arquivo (%s)"
 
-#: ../libnm-core/nm-utils.c:3255
+#: ../libnm-core/nm-utils.c:2966
 #, c-format
 msgid "invalid file owner %d for %s"
 msgstr "proprietário %d de arquivo inválido para %s"
 
-#: ../libnm-core/nm-utils.c:3266
+#: ../libnm-core/nm-utils.c:2977
 #, c-format
 msgid "file permissions for %s"
 msgstr "permissões de arquivo para %s"
 
-#: ../libnm-core/nm-utils.c:3276
+#: ../libnm-core/nm-utils.c:2987
 #, c-format
 msgid "reject %s"
 msgstr "rejeitar %s"
 
-#: ../libnm-core/nm-utils.c:3295
+#: ../libnm-core/nm-utils.c:3007
 #, c-format
 msgid "path is not absolute (%s)"
 msgstr "o caminho não é absoluto (%s)"
 
-#: ../libnm-core/nm-utils.c:3309
+#: ../libnm-core/nm-utils.c:3021
 #, c-format
 msgid "Plugin file does not exist (%s)"
 msgstr "O arquivo do plug-in não existe (%s)"
 
-#: ../libnm-core/nm-utils.c:3317
+#: ../libnm-core/nm-utils.c:3029
 #, c-format
 msgid "Plugin is not a valid file (%s)"
 msgstr "O plug-in não é um arquivo válido (%s)"
 
-#: ../libnm-core/nm-utils.c:3327
+#: ../libnm-core/nm-utils.c:3039
 #, c-format
 msgid "libtool archives are not supported (%s)"
 msgstr "Não há suporte a arquivos de libtool (%s)"
 
-#: ../libnm-core/nm-utils.c:3409 ../libnm-util/nm-utils.c:1794
+#: ../libnm-core/nm-utils.c:3121 ../libnm-util/nm-utils.c:1798
 #, c-format
 msgid "Could not find \"%s\" binary"
-msgstr "Não foi possível localizar o executável “%s”"
+msgstr "Não foi possível localizar o executável \"%s\""
 
-#: ../libnm-core/nm-utils.c:4426
+#: ../libnm-core/nm-utils.c:4167
 #, c-format
 msgid "not a valid ethernet MAC address for mask at position %lld"
-msgstr "não é um endereço MAC de ethernet válido para máscara na posição %lld"
+msgstr ""
 
-#: ../libnm-core/nm-utils.c:4441
+#: ../libnm-core/nm-utils.c:4182
 #, c-format
 msgid "not a valid ethernet MAC address #%u at position %lld"
-msgstr "não é um endereço MAC de ethernet #%u na posição %lld"
+msgstr ""
 
-#: ../libnm-core/nm-utils.c:4477
+#: ../libnm-core/nm-utils.c:4218
 msgid "interface name is too short"
-msgstr "o nome da interface é pequeno demais"
+msgstr ""
 
-#: ../libnm-core/nm-utils.c:4486
+#: ../libnm-core/nm-utils.c:4227
 msgid "interface name is reserved"
-msgstr "o nome da interface está reservado"
+msgstr ""
 
-#: ../libnm-core/nm-utils.c:4498
+#: ../libnm-core/nm-utils.c:4239
 msgid "interface name contains an invalid character"
-msgstr "o nome da interface contém um caractere inválido"
+msgstr ""
 
-#: ../libnm-core/nm-utils.c:4504
+#: ../libnm-core/nm-utils.c:4245
 msgid "interface name is longer than 15 characters"
-msgstr "o nome da interface é maior que 15 caracteres"
-
-#: ../libnm-core/nm-utils.c:5150
-msgid "not valid utf-8"
-msgstr "não é um utf-8 válido"
-
-#: ../libnm-core/nm-utils.c:5172 ../libnm-core/nm-utils.c:5640
-msgid "is not a JSON object"
-msgstr "não é um objeto JSON"
+msgstr ""
 
-#: ../libnm-core/nm-utils.c:5616 ../libnm-core/nm-utils.c:5956
+#: ../libnm-core/nm-utils.c:5283 ../libnm-core/nm-utils.c:5626
 msgid "value is NULL"
-msgstr "o valor é NULO"
+msgstr ""
 
-#: ../libnm-core/nm-utils.c:5616 ../libnm-core/nm-utils.c:5956
+#: ../libnm-core/nm-utils.c:5283 ../libnm-core/nm-utils.c:5626
 msgid "value is empty"
-msgstr "o valor está vazio"
+msgstr ""
 
-#: ../libnm-core/nm-utils.c:5628
+#: ../libnm-core/nm-utils.c:5292
 #, c-format
 msgid "invalid JSON at position %d (%s)"
-msgstr "JSON inválido na posição %d (%s)"
+msgstr ""
+
+#: ../libnm-core/nm-utils.c:5304 ../libnm-core/nm-utils.c:5645
+msgid "is not a JSON object"
+msgstr ""
+
+#: ../libnm-core/nm-utils.c:5615
+msgid "not valid utf-8"
+msgstr ""
 
-#: ../libnm-core/nm-utils.c:6273 ../libnm-core/nm-utils.c:6293
+#: ../libnm-core/nm-utils.c:5958 ../libnm-core/nm-utils.c:5978
 msgid "unterminated escape sequence"
-msgstr "sequência de escape não terminada"
+msgstr ""
 
-#: ../libnm-core/nm-utils.c:6318
-#, c-format
+#: ../libnm-core/nm-utils.c:6003
+#, fuzzy, c-format
 msgid "unknown attribute '%s'"
-msgstr "atributo desconhecido “%s”"
+msgstr "dispositivo \"%s\" desconhecido."
 
-#: ../libnm-core/nm-utils.c:6333
+#: ../libnm-core/nm-utils.c:6018
 #, c-format
 msgid "missing key-value separator '%c' after '%s'"
-msgstr "faltando o separador de valor-chave “%c” após “%s”"
+msgstr ""
 
-#: ../libnm-core/nm-utils.c:6349
-#, c-format
+#: ../libnm-core/nm-utils.c:6034
+#, fuzzy, c-format
 msgid "invalid uint32 value '%s' for attribute '%s'"
-msgstr "valor uint32 inválido “%s” para o atributo “%s”"
+msgstr "opção \"%s\" ou seu valor \"%s\" inválido"
 
-#: ../libnm-core/nm-utils.c:6358
-#, c-format
+#: ../libnm-core/nm-utils.c:6043
+#, fuzzy, c-format
 msgid "invalid uint8 value '%s' for attribute '%s'"
-msgstr "valor uint8 inválido “%s” para o atributo “%s”"
+msgstr "opção \"%s\" ou seu valor \"%s\" inválido"
 
-#: ../libnm-core/nm-utils.c:6368
-#, c-format
+#: ../libnm-core/nm-utils.c:6053
+#, fuzzy, c-format
 msgid "invalid boolean value '%s' for attribute '%s'"
-msgstr "valor booleano inválido “%s” para o atributo “%s”"
+msgstr "opção \"%s\" ou seu valor \"%s\" inválido"
 
-#: ../libnm-core/nm-utils.c:6378
+#: ../libnm-core/nm-utils.c:6063
 #, c-format
 msgid "unsupported attribute '%s' of type '%s'"
-msgstr "atributo sem suporte “%s” de tipo “%s”"
+msgstr ""
 
 #: ../libnm-core/nm-vpn-editor-plugin.c:296
 #, c-format
 msgid "cannot load plugin \"%s\": %s"
-msgstr "não foi possível carregar plug-in “%s”: %s"
+msgstr "não foi possível carregar plug-in \"%s\": %s"
 
 #: ../libnm-core/nm-vpn-editor-plugin.c:307
 #, c-format
@@ -11962,13 +10827,13 @@ msgstr "erro desconhecido de inicialização do plug-in %s"
 #, c-format
 msgid "cannot load VPN plugin in '%s': missing plugin name"
 msgstr ""
-"não foi possível carregar plug-in de VPN em “%s”: faltando nome do plug-in"
+"não foi possível carregar plug-in de VPN em \"%s\": faltando nome do plug-in"
 
 #: ../libnm-core/nm-vpn-editor-plugin.c:358
 #, c-format
 msgid "cannot load VPN plugin in '%s': invalid service name"
 msgstr ""
-"não foi possível carregar plug-in de VPN em “%s”: nome de serviço inválido"
+"não foi possível carregar plug-in de VPN em \"%s\": nome de serviço inválido"
 
 #: ../libnm-core/nm-vpn-editor-plugin.c:501
 #, c-format
@@ -12005,73 +10870,73 @@ msgstr "há um plug-in conflitante (%s) que possui o mesmo valor %s.%s"
 msgid "there exists a conflicting plugin with the same name (%s)"
 msgstr "há um plug-in conflitante com o mesmo nome (%s)"
 
-#: ../libnm-core/nm-vpn-plugin-info.c:1070
+#: ../libnm-core/nm-vpn-plugin-info.c:1071
 #, c-format
 msgid "missing \"plugin\" setting"
-msgstr "faltando definição “plugin”"
+msgstr "faltando definição \"plugin\""
 
-#: ../libnm-core/nm-vpn-plugin-info.c:1080
+#: ../libnm-core/nm-vpn-plugin-info.c:1081
 #, c-format
 msgid "%s: don't retry loading plugin which already failed previously"
 msgstr "%s: não tentar novamente carregar plug-in que já falhou anteriormente"
 
-#: ../libnm-core/nm-vpn-plugin-info.c:1174
+#: ../libnm-core/nm-vpn-plugin-info.c:1175
 msgid "missing filename to load VPN plugin info"
 msgstr "faltando nome de arquivo para carregar informação de plug-in de VPN"
 
-#: ../libnm-core/nm-vpn-plugin-info.c:1186
+#: ../libnm-core/nm-vpn-plugin-info.c:1187
 msgid "missing name for VPN plugin info"
 msgstr "faltando nome de arquivo para carregar informação de plug-in de VPN"
 
-#: ../libnm-core/nm-vpn-plugin-info.c:1195
+#: ../libnm-core/nm-vpn-plugin-info.c:1196
 msgid "missing service for VPN plugin info"
 msgstr "faltando serviço para informação de plug-in de VPN"
 
-#: ../libnm-glib/nm-device.c:1824 ../libnm/nm-device.c:1309
+#: ../libnm-glib/nm-device.c:1825 ../libnm/nm-device.c:1525
 msgid "Bluetooth"
 msgstr "Bluetooth"
 
-#: ../libnm-glib/nm-device.c:1826 ../libnm/nm-device.c:1311
+#: ../libnm-glib/nm-device.c:1827 ../libnm/nm-device.c:1527
 msgid "OLPC Mesh"
 msgstr "OLPC Mesh"
 
-#: ../libnm-glib/nm-device.c:1828 ../libnm/nm-device.c:1319
+#: ../libnm-glib/nm-device.c:1829 ../libnm/nm-device.c:1535
 msgid "WiMAX"
 msgstr "WiMAX"
 
-#: ../libnm-glib/nm-device.c:1842 ../libnm/nm-device.c:1333
+#: ../libnm-glib/nm-device.c:1843 ../libnm/nm-device.c:1549
 msgid "ADSL"
 msgstr "ADSL"
 
-#: ../libnm-glib/nm-device.c:1844 ../libnm/nm-device.c:1335
+#: ../libnm-glib/nm-device.c:1845 ../libnm/nm-device.c:1551
 msgid "MACVLAN"
 msgstr "MACVLAN"
 
-#: ../libnm-glib/nm-device.c:1846 ../libnm/nm-device.c:1337
+#: ../libnm-glib/nm-device.c:1847 ../libnm/nm-device.c:1553
 msgid "VXLAN"
 msgstr "VXLAN"
 
-#: ../libnm-glib/nm-device.c:1848 ../libnm/nm-device.c:1339
+#: ../libnm-glib/nm-device.c:1849 ../libnm/nm-device.c:1555
 msgid "IPTunnel"
 msgstr "IPTunnel"
 
-#: ../libnm-glib/nm-device.c:1850 ../libnm/nm-device.c:1341
+#: ../libnm-glib/nm-device.c:1851 ../libnm/nm-device.c:1557
 msgid "Tun"
 msgstr "Tun"
 
-#: ../libnm-glib/nm-device.c:1852 ../libnm/nm-device.c:1343
+#: ../libnm-glib/nm-device.c:1853 ../libnm/nm-device.c:1559
 msgid "Veth"
 msgstr "Veth"
 
-#: ../libnm-glib/nm-device.c:1884 ../libnm/nm-device.c:1385
+#: ../libnm-glib/nm-device.c:1885 ../libnm/nm-device.c:1597
 msgid "Wired"
 msgstr "Cabeada"
 
-#: ../libnm-glib/nm-device.c:1915 ../libnm/nm-device.c:1416
+#: ../libnm-glib/nm-device.c:1916 ../libnm/nm-device.c:1628
 msgid "PCI"
 msgstr "PCI"
 
-#: ../libnm-glib/nm-device.c:1917 ../libnm/nm-device.c:1418
+#: ../libnm-glib/nm-device.c:1918 ../libnm/nm-device.c:1630
 msgid "USB"
 msgstr "USB"
 
@@ -12081,14 +10946,14 @@ msgstr "USB"
 #. * "%2$s (%1$s)" if there's no grammatical way to combine
 #. * the strings otherwise.
 #.
-#: ../libnm-glib/nm-device.c:2014 ../libnm-glib/nm-device.c:2033
-#: ../libnm/nm-device.c:1731 ../libnm/nm-device.c:1750
+#: ../libnm-glib/nm-device.c:2015 ../libnm-glib/nm-device.c:2034
+#: ../libnm/nm-device.c:1725 ../libnm/nm-device.c:1744
 #, c-format
 msgctxt "long device name"
 msgid "%s %s"
 msgstr "%s %s"
 
-#: ../libnm-glib/nm-remote-connection.c:148
+#: ../libnm-glib/nm-remote-connection.c:149
 msgid "Disconnected by D-Bus"
 msgstr "Desconectado pelo D-Bus"
 
@@ -12112,26 +10977,26 @@ msgstr "Falha ao inicializar o contexto MD5: %d."
 msgid "Couldn't convert password to UCS2: %d"
 msgstr "Não foi possível converter senha para o formato UCS2: %d"
 
-#: ../libnm-util/nm-setting-bluetooth.c:185
+#: ../libnm-util/nm-setting-bluetooth.c:186
 #, c-format
 msgid "requires '%s' or '%s' setting"
-msgstr "requer definição de “%s” ou “%s”"
+msgstr "requer definição de \"%s\" ou \"%s\""
 
-#: ../libnm-util/nm-setting-bond.c:581
+#: ../libnm-util/nm-setting-bond.c:582
 #, c-format
 msgid "'%s' is not a valid interface name for '%s' option"
-msgstr "“%s” não é um nome de interface válido para a opção “%s”"
+msgstr "\"%s\" não é um nome de interface válido para a opção \"%s\""
 
-#: ../libnm-util/nm-setting-connection.c:831
+#: ../libnm-util/nm-setting-connection.c:834
 #: ../libnm-util/nm-setting-infiniband.c:269
 #, c-format
 msgid "'%s' is not a valid interface name"
-msgstr "“%s” não é um nome de interface válido"
+msgstr "\"%s\" não é um nome de interface válido"
 
-#: ../libnm-util/nm-setting-connection.c:859
+#: ../libnm-util/nm-setting-connection.c:862
 #, c-format
 msgid "requires presence of '%s' setting in the connection"
-msgstr "requer a presença da definição de “%s” na conexão"
+msgstr "requer a presença da definição de \"%s\" na conexão"
 
 #: ../libnm-util/nm-setting-infiniband.c:231
 msgid "not a valid interface name"
@@ -12148,37 +11013,37 @@ msgid "%d. IPv4 address has invalid prefix"
 msgstr "%d. endereço IPv4 possui prefixo inválido"
 
 #: ../libnm-util/nm-setting-ip4-config.c:983
-#: ../libnm-util/nm-setting-ip6-config.c:937
+#: ../libnm-util/nm-setting-ip6-config.c:939
 #, c-format
 msgid "%d. route has invalid prefix"
 msgstr "%d: rota possui prefixo inválido"
 
-#: ../libnm-util/nm-setting-ip6-config.c:911
+#: ../libnm-util/nm-setting-ip6-config.c:913
 #, c-format
 msgid "%d. IPv6 address is invalid"
 msgstr "%d. endereço IPv6 é inválido"
 
-#: ../libnm-util/nm-setting-ip6-config.c:921
+#: ../libnm-util/nm-setting-ip6-config.c:923
 #, c-format
 msgid "%d. IPv6 address has invalid prefix"
 msgstr "%d. endereço IPv6 possui prefixo inválido"
 
-#: ../libnm-util/nm-setting-vpn.c:581
+#: ../libnm-util/nm-setting-vpn.c:582
 #, c-format
 msgid "Failed to convert '%s' value '%s' to uint"
-msgstr "Falha ao converter valor de “%s” “%s” para uint"
+msgstr "Falha ao converter valor de \"%s\" \"%s\" para uint"
 
-#: ../libnm-util/nm-setting-vpn.c:588
+#: ../libnm-util/nm-setting-vpn.c:589
 #, c-format
 msgid "Secret flags property '%s' not found"
-msgstr "Propriedade “%s” de sinalizadores de segredo não localizada"
+msgstr "Propriedade \"%s\" de sinalizadores de segredo não localizada"
 
-#: ../libnm-util/nm-setting-wireless.c:806
+#: ../libnm-util/nm-setting-wireless.c:807
 #, c-format
 msgid "requires setting '%s' property"
-msgstr "requer definição da propriedade “%s”"
+msgstr "requer definição da propriedade \"%s\""
 
-#: ../libnm/nm-device-adsl.c:72
+#: ../libnm/nm-device-adsl.c:73
 msgid "The connection was not an ADSL connection."
 msgstr "A conexão não era ADSL."
 
@@ -12198,7 +11063,7 @@ msgstr "A conexão não era Bluetooth."
 #: ../libnm/nm-device-bt.c:143
 #, c-format
 msgid "The connection is of Bluetooth NAP type."
-msgstr "A conexão é do tipo NAP Bluetooth."
+msgstr ""
 
 #: ../libnm/nm-device-bt.c:152
 msgid "Invalid device Bluetooth address."
@@ -12214,18 +11079,19 @@ msgid ""
 msgstr "O dispositivo não possui capacidades Bluetooth exigidas pela conexão."
 
 #: ../libnm/nm-device-dummy.c:76
+#, fuzzy
 msgid "The connection was not a dummy connection."
-msgstr "A conexão não era uma conexão dummy."
+msgstr "A conexão não era de modem."
 
 #: ../libnm/nm-device-dummy.c:83 ../libnm/nm-device-generic.c:97
-#: ../libnm/nm-device-ovs-bridge.c:97 ../libnm/nm-device-ovs-interface.c:68
-#: ../libnm/nm-device-ovs-port.c:96
+#: ../libnm/nm-device-ovs-bridge.c:68 ../libnm/nm-device-ovs-interface.c:68
+#: ../libnm/nm-device-ovs-port.c:67
 msgid "The connection did not specify an interface name."
 msgstr "A conexão não especificou um nome de interface."
 
 #: ../libnm/nm-device-ethernet.c:206
 msgid "The connection was not an Ethernet or PPPoE connection."
-msgstr "A conexão não era uma Ethernet ou PPPoE."
+msgstr "A  conexão não era uma Ethernet ou PPPoE."
 
 #: ../libnm/nm-device-ethernet.c:221
 msgid "The connection and device differ in S390 subchannels."
@@ -12234,7 +11100,7 @@ msgstr "A conexão e o dispositivo divergem em subcanais S390."
 #: ../libnm/nm-device-ethernet.c:236
 #, c-format
 msgid "Invalid device MAC address %s."
-msgstr "Endereço MAC de dispositivo inválido %s."
+msgstr ""
 
 #: ../libnm/nm-device-ethernet.c:241
 msgid "The MACs of the device and the connection do not match."
@@ -12266,21 +11132,21 @@ msgstr "O modo do dispositivo e da conexão não correspondem"
 msgid "The connection was not an InfiniBand connection."
 msgstr "A conexão não era InfiniBand."
 
-#: ../libnm/nm-device-infiniband.c:101 ../libnm/nm-device-wifi.c:625
+#: ../libnm/nm-device-infiniband.c:101 ../libnm/nm-device-wifi.c:599
 #: ../libnm/nm-device-wimax.c:324
 msgid "Invalid device MAC address."
 msgstr "Endereço MAC de dispositivo inválido."
 
-#: ../libnm/nm-device-infiniband.c:109 ../libnm/nm-device-wifi.c:632
+#: ../libnm/nm-device-infiniband.c:109 ../libnm/nm-device-wifi.c:606
 #: ../libnm/nm-device-wimax.c:331
 msgid "The MACs of the device and the connection didn't match."
 msgstr "Os MACs do dispositivo e a conexão não correspondem."
 
-#: ../libnm/nm-device-ip-tunnel.c:271
+#: ../libnm/nm-device-ip-tunnel.c:253
 msgid "The connection was not an IP tunnel connection."
 msgstr "A conexão não era túnel de IP."
 
-#: ../libnm/nm-device-macvlan.c:157
+#: ../libnm/nm-device-macvlan.c:158
 msgid "The connection was not a MAC-VLAN connection."
 msgstr "A conexão não era MAC-VLAN."
 
@@ -12300,17 +11166,17 @@ msgstr "O dispositivo não possui capacidades exigidas pela conexão."
 msgid "The connection was not an OLPC Mesh connection."
 msgstr "A conexão não era OLPC Mesh."
 
-#: ../libnm/nm-device-ovs-bridge.c:90
+#: ../libnm/nm-device-ovs-bridge.c:61
 msgid "The connection was not a ovs_bridge connection."
-msgstr "A conexão não era ovs-bridge."
+msgstr ""
 
 #: ../libnm/nm-device-ovs-interface.c:61
 msgid "The connection was not a ovs_interface connection."
-msgstr "A conexão não era ovs-interface."
+msgstr ""
 
-#: ../libnm/nm-device-ovs-port.c:89
+#: ../libnm/nm-device-ovs-port.c:60
 msgid "The connection was not a ovs_port connection."
-msgstr "A conexão não era ovs-port."
+msgstr ""
 
 #: ../libnm/nm-device-team.c:138
 msgid "The connection was not a team connection."
@@ -12338,15 +11204,15 @@ msgid "The VXLAN identifiers of the device and the connection didn't match."
 msgstr ""
 "Os identificadores da VXLAN do dispositivo e da conexão não correspondem."
 
-#: ../libnm/nm-device-wifi.c:616
+#: ../libnm/nm-device-wifi.c:590
 msgid "The connection was not a Wi-Fi connection."
 msgstr "A conexão não era uma conexão Wi-Fi."
 
-#: ../libnm/nm-device-wifi.c:652
+#: ../libnm/nm-device-wifi.c:626
 msgid "The device is lacking WPA capabilities required by the connection."
 msgstr "O dispositivo não possui capacidades WPA exigidas pela conexão."
 
-#: ../libnm/nm-device-wifi.c:659
+#: ../libnm/nm-device-wifi.c:633
 msgid "The device is lacking WPA2/RSN capabilities required by the connection."
 msgstr "O dispositivo não possui capacidades WPA2/RSN exigidas pela conexão."
 
@@ -12354,57 +11220,46 @@ msgstr "O dispositivo não possui capacidades WPA2/RSN exigidas pela conexão."
 msgid "The connection was not a WiMAX connection."
 msgstr "A conexão não era WiMAX."
 
-#: ../libnm/nm-device-wpan.c:82
-msgid "The connection was not a wpan connection."
-msgstr "A conexão não era wpan."
-
-#: ../libnm/nm-device.c:1313
-msgid "Open vSwitch Interface"
-msgstr "Interface Open vSwitch"
+#: ../libnm/nm-device.c:1529
+msgid "OpenVSwitch Interface"
+msgstr ""
 
-#: ../libnm/nm-device.c:1315
-msgid "Open vSwitch Port"
-msgstr "Porta Open vSwitch"
+#: ../libnm/nm-device.c:1531
+msgid "OpenVSwitch Port"
+msgstr ""
 
-#: ../libnm/nm-device.c:1317
-msgid "Open vSwitch Bridge"
-msgstr "Ponte Open vSwitch"
+#: ../libnm/nm-device.c:1533
+msgid "OpenVSwitch Bridge"
+msgstr ""
 
-#: ../libnm/nm-device.c:1345
+#: ../libnm/nm-device.c:1561
 msgid "MACsec"
-msgstr "MACsec"
+msgstr ""
 
-#: ../libnm/nm-device.c:1347
+#: ../libnm/nm-device.c:1563
 msgid "Dummy"
-msgstr "Dummy"
+msgstr ""
 
-#: ../libnm/nm-device.c:1349
+#: ../libnm/nm-device.c:1565
 msgid "PPP"
-msgstr "PPP"
-
-#: ../libnm/nm-device.c:1351
-msgid "IEEE 802.15.4"
-msgstr "IEEE 802.15.4"
-
-#: ../libnm/nm-device.c:1353
-msgid "6LoWPAN"
-msgstr "6LoWPAN"
+msgstr ""
 
-#: ../libnm/nm-device.c:2472
+#: ../libnm/nm-device.c:2456
 #, c-format
 msgid "The connection was not valid: %s"
 msgstr "A conexão não era válida: %s"
 
-#: ../libnm/nm-device.c:2481
+#: ../libnm/nm-device.c:2465
 #, c-format
 msgid "The interface names of the device and the connection didn't match."
 msgstr "Os nomes de interface do dispositivo e a conexão não correspondem."
 
 #: ../libnm/nm-manager.c:274
+#, fuzzy
 msgid "Checkpoint was removed before it was initialized"
-msgstr "O ponto de verificação foi removido antes de ser inicializado"
+msgstr "Conexão removida antes de ser inicializada"
 
-#: ../libnm/nm-manager.c:955
+#: ../libnm/nm-manager.c:941
 msgid "Active connection removed before it was initialized"
 msgstr "Conexão ativa removida antes de ser inicializada"
 
@@ -12412,7 +11267,7 @@ msgstr "Conexão ativa removida antes de ser inicializada"
 msgid "Connection removed before it was initialized"
 msgstr "Conexão removida antes de ser inicializada"
 
-#: ../libnm/nm-vpn-plugin-old.c:847 ../libnm/nm-vpn-service-plugin.c:1012
+#: ../libnm/nm-vpn-plugin-old.c:840 ../libnm/nm-vpn-service-plugin.c:957
 msgid "No service name specified"
 msgstr "Nome do serviço não especificado"
 
@@ -12423,16 +11278,20 @@ msgstr "Habilita ou desabilita o sistema de redes"
 #: ../data/org.freedesktop.NetworkManager.policy.in.in.h:2
 msgid "System policy prevents enabling or disabling system networking"
 msgstr ""
-"As políticas do sistema impedem habilitação ou desabilitação do sistema de "
+"Políticas de sistema previnem habilitação ou desabilitação do sistema de "
 "redes"
 
 #: ../data/org.freedesktop.NetworkManager.policy.in.in.h:3
+#, fuzzy
 msgid "Reload NetworkManager configuration"
-msgstr "Recarrega a configuração do NetworkManager"
+msgstr "Imprime a configuração do NetworkManager e sai"
 
 #: ../data/org.freedesktop.NetworkManager.policy.in.in.h:4
+#, fuzzy
 msgid "System policy prevents reloading NetworkManager"
-msgstr "As políticas do sistema impedem recarregamento do NetworkManager"
+msgstr ""
+"Políticas de sistema previnem habilitação ou desabilitação do sistema de "
+"redes"
 
 #: ../data/org.freedesktop.NetworkManager.policy.in.in.h:5
 msgid ""
@@ -12445,8 +11304,8 @@ msgstr ""
 #: ../data/org.freedesktop.NetworkManager.policy.in.in.h:6
 msgid "System policy prevents putting NetworkManager to sleep or waking it up"
 msgstr ""
-"As políticas do sistema impedem que se coloque o NetworkManager para dormir "
-"ou acordar"
+"Políticas de sistema previnem que se coloque o NetworkManager para dormir ou "
+"acordar"
 
 #: ../data/org.freedesktop.NetworkManager.policy.in.in.h:7
 msgid "Enable or disable WiFi devices"
@@ -12455,8 +11314,8 @@ msgstr "Habilita ou desabilita dispositivos WiFi"
 #: ../data/org.freedesktop.NetworkManager.policy.in.in.h:8
 msgid "System policy prevents enabling or disabling WiFi devices"
 msgstr ""
-"As políticas do sistema impedem a habilitação ou desabilitação de "
-"dispositivos WiFi"
+"Políticas de sistema previnem a habilitação ou desabilitação de dispositivos "
+"WiFi"
 
 #: ../data/org.freedesktop.NetworkManager.policy.in.in.h:9
 msgid "Enable or disable mobile broadband devices"
@@ -12465,8 +11324,8 @@ msgstr "Habilita ou desabilita dispositivos móveis de banda larga"
 #: ../data/org.freedesktop.NetworkManager.policy.in.in.h:10
 msgid "System policy prevents enabling or disabling mobile broadband devices"
 msgstr ""
-"As políticas do sistema impedem a habilitação ou desabilitação de "
-"dispositivos móveis de banda larga"
+"Políticas de sistema previnem a habilitação ou desabilitação de dispositivos "
+"móveis de banda larga"
 
 #: ../data/org.freedesktop.NetworkManager.policy.in.in.h:11
 msgid "Enable or disable WiMAX mobile broadband devices"
@@ -12476,8 +11335,8 @@ msgstr "Habilita ou desabilita dispositivos móveis WiMAX"
 msgid ""
 "System policy prevents enabling or disabling WiMAX mobile broadband devices"
 msgstr ""
-"As políticas do sistema impedem a habilitação ou desabilitação de "
-"dispositivos móveis de banda larga WiMAX"
+"Políticas de sistema previnem a habilitação ou desabilitação de dispositivos "
+"móveis de banda larga WiMAX"
 
 #: ../data/org.freedesktop.NetworkManager.policy.in.in.h:13
 msgid "Allow control of network connections"
@@ -12485,7 +11344,7 @@ msgstr "Permite o controle de conexões de rede"
 
 #: ../data/org.freedesktop.NetworkManager.policy.in.in.h:14
 msgid "System policy prevents control of network connections"
-msgstr "As políticas do sistema impedem o controle de conexões de rede"
+msgstr "Políticas de sistema previnem o controle de conexões de rede"
 
 #: ../data/org.freedesktop.NetworkManager.policy.in.in.h:15
 msgid "Connection sharing via a protected WiFi network"
@@ -12494,8 +11353,8 @@ msgstr "Compartilhamento de conexão via rede sem fio protegida"
 #: ../data/org.freedesktop.NetworkManager.policy.in.in.h:16
 msgid "System policy prevents sharing connections via a protected WiFi network"
 msgstr ""
-"As políticas do sistema impedem o compartilhamento de conexões através de "
-"uma rede sem fio protegida"
+"Políticas de sistema previnem compartilhamento de conexões através de uma "
+"rede sem fio protegida"
 
 #: ../data/org.freedesktop.NetworkManager.policy.in.in.h:17
 msgid "Connection sharing via an open WiFi network"
@@ -12504,8 +11363,8 @@ msgstr "Compartilhamento de conexão via rede sem fio aberta"
 #: ../data/org.freedesktop.NetworkManager.policy.in.in.h:18
 msgid "System policy prevents sharing connections via an open WiFi network"
 msgstr ""
-"As políticas do sistema impedem o compartilhamento de conexões através de "
-"uma rede sem fio aberta"
+"Políticas de sistema previnem compartilhamento de conexões através de uma "
+"rede sem fio aberta"
 
 #: ../data/org.freedesktop.NetworkManager.policy.in.in.h:19
 msgid "Modify personal network connections"
@@ -12514,8 +11373,7 @@ msgstr "Modificar conexões pessoais de rede"
 #: ../data/org.freedesktop.NetworkManager.policy.in.in.h:20
 msgid "System policy prevents modification of personal network settings"
 msgstr ""
-"As políticas do sistema impedem a modificação das definições pessoais de "
-"redes"
+"Políticas de sistema previnem modificação das configurações pessoais de redes"
 
 #: ../data/org.freedesktop.NetworkManager.policy.in.in.h:21
 msgid "Modify network connections for all users"
@@ -12524,7 +11382,7 @@ msgstr "Modificar conexões de rede para todos os usuários"
 #: ../data/org.freedesktop.NetworkManager.policy.in.in.h:22
 msgid "System policy prevents modification of network settings for all users"
 msgstr ""
-"As políticas do sistema impedem a modificação das definições de rede para "
+"Políticas de sistema previnem modificação das configurações de rede para "
 "todos os usuários"
 
 #: ../data/org.freedesktop.NetworkManager.policy.in.in.h:23
@@ -12534,8 +11392,7 @@ msgstr "Modificar máquina de sistema persistente"
 #: ../data/org.freedesktop.NetworkManager.policy.in.in.h:24
 msgid "System policy prevents modification of the persistent system hostname"
 msgstr ""
-"As políticas do sistema impedem a modificação da máquina do sistema "
-"persistente"
+"Políticas de sistema previnem modificação da máquina do sistema persistente"
 
 #: ../data/org.freedesktop.NetworkManager.policy.in.in.h:25
 msgid "Modify persistent global DNS configuration"
@@ -12546,129 +11403,121 @@ msgid ""
 "System policy prevents modification of the persistent global DNS "
 "configuration"
 msgstr ""
-"As políticas do sistema impedem a modificação da configuração de DNS global "
+"Políticas de sistema previnem modificação da configuração de DNS global "
 "persistente"
 
 #: ../data/org.freedesktop.NetworkManager.policy.in.in.h:27
 msgid "Perform a checkpoint or rollback of interfaces configuration"
 msgstr ""
-"Realizar um ponto de verificação ou uma reversão da configuração de "
-"interfaces"
 
 #: ../data/org.freedesktop.NetworkManager.policy.in.in.h:28
 msgid "System policy prevents the creation of a checkpoint or its rollback"
 msgstr ""
-"As políticas do sistema impedem a criação de um ponto de controle ou sua "
-"reversão"
 
 #: ../data/org.freedesktop.NetworkManager.policy.in.in.h:29
 msgid "Enable or disable device statistics"
-msgstr "Habilitar ou desabilitar estatísticas do dispositivo"
+msgstr ""
 
 #: ../data/org.freedesktop.NetworkManager.policy.in.in.h:30
 msgid "System policy prevents enabling or disabling device statistics"
 msgstr ""
-"As políticas do sistema impedem habilitação e desabilitação de estatísticas "
-"do dispositivo"
 
 #: ../data/org.freedesktop.NetworkManager.policy.in.in.h:31
 msgid "Enable or disable connectivity checking"
-msgstr "Habilite ou desabilitar a verificação da conectividade"
+msgstr ""
 
 #: ../data/org.freedesktop.NetworkManager.policy.in.in.h:32
 msgid "System policy prevents enabling or disabling connectivity checking"
 msgstr ""
-"As políticas do sistema impedem a habilitação ou desabilitação de "
-"verificação de conectividade"
 
-#: ../shared/nm-utils/nm-shared-utils.c:946
+#: ../shared/nm-utils/nm-shared-utils.c:794
 #, c-format
 msgid "object class '%s' has no property named '%s'"
-msgstr "a classe de objeto “%s” não possui uma propriedade chamada “%s”"
+msgstr "a classe de objeto \"%s\" não possui uma propriedade chamada \"%s\""
 
-#: ../shared/nm-utils/nm-shared-utils.c:953
+#: ../shared/nm-utils/nm-shared-utils.c:801
 #, c-format
 msgid "property '%s' of object class '%s' is not writable"
-msgstr "a propriedade “%s” da classe de objeto “%s” não pode ser escrita"
+msgstr "a propriedade \"%s\" da classe de objeto \"%s\" não pode ser escrita"
 
-#: ../shared/nm-utils/nm-shared-utils.c:960
+#: ../shared/nm-utils/nm-shared-utils.c:808
 #, c-format
 msgid ""
 "construct property \"%s\" for object '%s' can't be set after construction"
 msgstr ""
-"a propriedade de construtor “%s” para objeto “%s” não pode ser definido após "
-"construção"
+"a propriedade de construtor \"%s\" para objeto \"%s\" não pode ser definido "
+"após construção"
 
-#: ../shared/nm-utils/nm-shared-utils.c:968
+#: ../shared/nm-utils/nm-shared-utils.c:816
 #, c-format
 msgid "'%s::%s' is not a valid property name; '%s' is not a GObject subtype"
 msgstr ""
-"“%s::%s” não é um nome de propriedade válido; “%s” não é um subtipo de "
+"\"%s::%s\" não é um nome de propriedade válido; \"%s\" não é um subtipo de "
 "GObject"
 
-#: ../shared/nm-utils/nm-shared-utils.c:977
+#: ../shared/nm-utils/nm-shared-utils.c:825
 #, c-format
 msgid "unable to set property '%s' of type '%s' from value of type '%s'"
 msgstr ""
-"não foi possível definir a propriedade “%s” de tipo “%s” a partir do valor "
-"de tipo “%s”"
+"não foi possível definir a propriedade \"%s\" de tipo \"%s\" a partir do "
+"valor de tipo \"%s\""
 
-#: ../shared/nm-utils/nm-shared-utils.c:988
+#: ../shared/nm-utils/nm-shared-utils.c:836
 #, c-format
 msgid ""
 "value \"%s\" of type '%s' is invalid or out of range for property '%s' of "
 "type '%s'"
 msgstr ""
-"o valor “%s” de tipo “%s” é inválido ou fora do intervalo da propriedade "
-"“%s” de tipo “%s”"
+"o valor \"%s\" de tipo \"%s\" é inválido ou fora do intervalo da propriedade "
+"\"%s\" de tipo \"%s\""
 
 #. TRANSLATORS: the first %s is a prefix for the connection id, such
 #. * as "Wired Connection" or "VPN Connection". The %d is a number
 #. * that is combined with the first argument to create a unique
 #. * connection id.
-#: ../src/NetworkManagerUtils.c:119
+#: ../src/NetworkManagerUtils.c:112
 #, c-format
 msgctxt "connection id fallback"
-msgid "%s %u"
-msgstr "%s %u"
+msgid "%s %d"
+msgstr "%s %d"
 
-#: ../src/main.c:180 ../src/main.c:314
+#: ../src/main.c:179 ../src/main.c:318
 #, c-format
 msgid "Failed to read configuration: %s\n"
 msgstr "Falha ao ler configuração: %s\n"
 
 #. Logging/debugging
-#: ../src/main.c:194 ../src/nm-iface-helper.c:297
+#: ../src/main.c:193 ../src/nm-iface-helper.c:292
 msgid "Print NetworkManager version and exit"
 msgstr "Imprime a versão do NetworkManager e sai"
 
-#: ../src/main.c:195 ../src/nm-iface-helper.c:298
+#: ../src/main.c:194 ../src/nm-iface-helper.c:293
 msgid "Don't become a daemon"
 msgstr "Não se torna um daemon"
 
-#: ../src/main.c:196 ../src/nm-iface-helper.c:300
+#: ../src/main.c:195 ../src/nm-iface-helper.c:295
 #, c-format
 msgid "Log level: one of [%s]"
 msgstr "Nível de registro: um dos [%s]"
 
-#: ../src/main.c:198 ../src/nm-iface-helper.c:302
+#: ../src/main.c:197 ../src/nm-iface-helper.c:297
 #, c-format
 msgid "Log domains separated by ',': any combination of [%s]"
-msgstr "Domínios de registro separados por “,”: qualquer combinação de [%s]"
+msgstr "Domínios de registro separados por \",\": qualquer combinação de [%s]"
 
-#: ../src/main.c:200 ../src/nm-iface-helper.c:304
+#: ../src/main.c:199 ../src/nm-iface-helper.c:299
 msgid "Make all warnings fatal"
 msgstr "Torna todos os avisos fatais"
 
-#: ../src/main.c:201
+#: ../src/main.c:200
 msgid "Specify the location of a PID file"
 msgstr "Especifica a localização de um arquivo PID"
 
-#: ../src/main.c:203
+#: ../src/main.c:202
 msgid "Print NetworkManager configuration and exit"
 msgstr "Imprime a configuração do NetworkManager e sai"
 
-#: ../src/main.c:213
+#: ../src/main.c:212
 msgid ""
 "NetworkManager monitors all network connections and automatically\n"
 "chooses the best connection to use.  It also allows the user to\n"
@@ -12680,12 +11529,30 @@ msgstr ""
 "especifique pontos de acesso sem fio os quais cartões sem fio no\n"
 "computador podem ser associados."
 
-#: ../src/main.c:304 ../src/main-utils.c:286 ../src/nm-iface-helper.c:442
+#: ../src/main.c:303 ../src/main-utils.c:286 ../src/nm-iface-helper.c:398
 #, c-format
 msgid "%s.  Please use --help to see a list of valid options.\n"
 msgstr "%s. Por favor, use --help para ver uma lista de opções válidas.\n"
 
-#: ../src/main.c:339 ../src/nm-iface-helper.c:457
+#: ../src/main.c:308 ../src/nm-iface-helper.c:403
+#, c-format
+msgid "Ignoring unrecognized log domain(s) '%s' passed on command line.\n"
+msgstr ""
+"Ignorando domínio(s) de log irreconhecíveis '%s' passaram na linha de "
+"comando.\n"
+
+#: ../src/main.c:333
+#, c-format
+msgid "Error in configuration file: %s.\n"
+msgstr "Erro no arquivo de configuração: %s.\n"
+
+#: ../src/main.c:338
+#, c-format
+msgid "Ignoring unrecognized log domain(s) '%s' from config files.\n"
+msgstr ""
+"Ignorando domínio(s) de log irreconhecíveis '%s' dos arquivos de config.\n"
+
+#: ../src/main.c:349 ../src/nm-iface-helper.c:413
 #, c-format
 msgid "Could not daemonize: %s [error %u]\n"
 msgstr "Não foi possível tornar um daemon: %s [erro %u]\n"
@@ -12708,7 +11575,7 @@ msgstr "Fechamento de %s falhou: %s\n"
 #: ../src/main-utils.c:148 ../src/main-utils.c:159
 #, c-format
 msgid "Cannot create '%s': %s"
-msgstr "Não foi possível criar “%s”: %s"
+msgstr "Não foi possível criar \"%s\": %s"
 
 #: ../src/main-utils.c:212
 #, c-format
@@ -12720,11 +11587,11 @@ msgstr "%s já está em execução (pid %ld)\n"
 msgid "You must be root to run %s!\n"
 msgstr "Você precisa ser superusuário para executar %s!\n"
 
-#: ../src/dhcp/nm-dhcp-dhclient-utils.c:313
+#: ../src/dhcp/nm-dhcp-dhclient-utils.c:280
 msgid "# Created by NetworkManager\n"
 msgstr "# Criado pelo NetworkManager\n"
 
-#: ../src/dhcp/nm-dhcp-dhclient-utils.c:324
+#: ../src/dhcp/nm-dhcp-dhclient-utils.c:290
 #, c-format
 msgid ""
 "# Merged from %s\n"
@@ -12738,68 +11605,65 @@ msgstr ""
 msgid "%s Network"
 msgstr "Rede %s"
 
-#: ../src/devices/bluetooth/nm-device-bt.c:269
+#: ../src/devices/bluetooth/nm-device-bt.c:264
 msgid "PAN requested, but Bluetooth device does not support NAP"
 msgstr "PAN requisitado, mas dispositivo Bluetooth não oferece suporte a NAP"
 
-#: ../src/devices/bluetooth/nm-device-bt.c:279
+#: ../src/devices/bluetooth/nm-device-bt.c:274
 msgid "PAN connections cannot specify GSM, CDMA, or serial settings"
 msgstr "Conexões PAN não podem especificar definições GSM, CDMA ou serial"
 
-#: ../src/devices/bluetooth/nm-device-bt.c:292
+#: ../src/devices/bluetooth/nm-device-bt.c:287
 msgid "PAN connection"
 msgstr "Conexão PAN"
 
-#: ../src/devices/bluetooth/nm-device-bt.c:299
+#: ../src/devices/bluetooth/nm-device-bt.c:294
 msgid "DUN requested, but Bluetooth device does not support DUN"
 msgstr "DUN requisitado, mas dispositivo Bluetooth não oferece suporte a DUN"
 
-#: ../src/devices/bluetooth/nm-device-bt.c:309
+#: ../src/devices/bluetooth/nm-device-bt.c:304
 msgid "DUN connection must include a GSM or CDMA setting"
 msgstr "Conexão DUN deve incluir uma definição GSM ou CDMA"
 
-#: ../src/devices/bluetooth/nm-device-bt.c:319
-#: ../src/devices/wwan/nm-modem-broadband.c:705
+#: ../src/devices/bluetooth/nm-device-bt.c:314
+#: ../src/devices/wwan/nm-modem-broadband.c:709
 msgid "GSM connection"
 msgstr "Conexão GSM"
 
-#: ../src/devices/bluetooth/nm-device-bt.c:323
-#: ../src/devices/wwan/nm-modem-broadband.c:729
+#: ../src/devices/bluetooth/nm-device-bt.c:318
+#: ../src/devices/wwan/nm-modem-broadband.c:733
 msgid "CDMA connection"
 msgstr "Conexão CDMA"
 
-#: ../src/devices/bluetooth/nm-device-bt.c:331
+#: ../src/devices/bluetooth/nm-device-bt.c:326
 msgid "Unknown/unhandled Bluetooth connection type"
 msgstr "Tipo de conexão Bluetooth desconhecida/não manipulada"
 
-#: ../src/devices/bluetooth/nm-device-bt.c:352
-#: ../src/devices/nm-device-ethernet.c:1426
-#: ../src/devices/nm-device-infiniband.c:188
-#: ../src/devices/wifi/nm-device-wifi.c:901
+#: ../src/devices/bluetooth/nm-device-bt.c:347
+#: ../src/devices/nm-device-ethernet.c:1408
+#: ../src/devices/nm-device-infiniband.c:210
+#: ../src/devices/wifi/nm-device-wifi.c:952
 msgid "connection does not match device"
 msgstr "conexão não corresponde ao dispositivo"
 
-#: ../src/devices/nm-device-6lowpan.c:191
-msgid "6LOWPAN connection"
-msgstr "Conexão 6LOWPAN"
-
-#: ../src/devices/nm-device-bond.c:72
+#: ../src/devices/nm-device-bond.c:91
 msgid "Bond connection"
 msgstr "Conexão vinculada"
 
-#: ../src/devices/nm-device-bridge.c:153
+#: ../src/devices/nm-device-bridge.c:130
 msgid "Bridge connection"
 msgstr "Conexão de ponte"
 
-#: ../src/devices/nm-device-dummy.c:68
+#: ../src/devices/nm-device-dummy.c:70
+#, fuzzy
 msgid "Dummy connection"
-msgstr "Conexão dummy"
+msgstr "Conexão ADSL"
 
-#: ../src/devices/nm-device-ethernet.c:1407
+#: ../src/devices/nm-device-ethernet.c:1389
 msgid "PPPoE connection"
 msgstr "Conexão PPPoE"
 
-#: ../src/devices/nm-device-ethernet.c:1407
+#: ../src/devices/nm-device-ethernet.c:1389
 msgid "Wired connection"
 msgstr "Conexão cabeada"
 
@@ -12808,31 +11672,27 @@ msgstr "Conexão cabeada"
 msgid "Wired connection %d"
 msgstr "Conexão cabeada %d"
 
-#: ../src/devices/nm-device-ip-tunnel.c:418
+#: ../src/devices/nm-device-ip-tunnel.c:340
 msgid "IP tunnel connection"
-msgstr "Conexão túnel IP"
+msgstr "Conexão de túnel IP"
 
-#: ../src/devices/nm-device-macvlan.c:365
+#: ../src/devices/nm-device-macvlan.c:344
 msgid "MACVLAN connection"
 msgstr "Conexão MACVLAN"
 
-#: ../src/devices/nm-device-tun.c:158
+#: ../src/devices/nm-device-tun.c:146
 msgid "TUN connection"
 msgstr "Conexão TUN"
 
-#: ../src/devices/nm-device-wpan.c:68
-msgid "WPAN connection"
-msgstr "Conexão WPAN"
-
-#: ../src/devices/team/nm-device-team.c:101
+#: ../src/devices/team/nm-device-team.c:119
 msgid "Team connection"
 msgstr "Conexão de união"
 
-#: ../src/devices/wifi/nm-device-olpc-mesh.c:125
+#: ../src/devices/wifi/nm-device-olpc-mesh.c:152
 msgid "Mesh"
 msgstr "Mesh"
 
-#: ../src/devices/wifi/nm-device-wifi.c:868
+#: ../src/devices/wifi/nm-device-wifi.c:919
 msgid "WPA Ad-Hoc disabled due to kernel bugs"
 msgstr "Ad-Hoc WPA desabilitada por causa de erros no kernel"
 
@@ -12847,7 +11707,7 @@ msgstr "Autenticação LEAP requer um nome de usuário LEAP"
 
 #: ../src/devices/wifi/nm-wifi-utils.c:87
 msgid "LEAP username requires 'leap' authentication"
-msgstr "Nome de usuário LEAP requer autenticação “leap”"
+msgstr "Nome de usuário LEAP requer autenticação \"leap\""
 
 #: ../src/devices/wifi/nm-wifi-utils.c:100
 msgid "LEAP authentication requires IEEE 802.1x key management"
@@ -12865,26 +11725,26 @@ msgstr "Autenticação LEAP é incompatível com definição 802.1x"
 #, c-format
 msgid "a connection using '%s' authentication cannot use WPA key management"
 msgstr ""
-"uma conexão usando autenticação “%s” não pode usar gerenciamento de chaves "
+"uma conexão usando autenticação \"%s\" não pode usar gerenciamento de chaves "
 "WPA"
 
 #: ../src/devices/wifi/nm-wifi-utils.c:165
 #, c-format
 msgid "a connection using '%s' authentication cannot specify WPA protocols"
 msgstr ""
-"uma conexão usando autenticação “%s” não pode especificar protocolos WPA"
+"uma conexão usando autenticação \"%s\" não pode especificar protocolos WPA"
 
 #: ../src/devices/wifi/nm-wifi-utils.c:181
 #: ../src/devices/wifi/nm-wifi-utils.c:198
 #, c-format
 msgid "a connection using '%s' authentication cannot specify WPA ciphers"
-msgstr "uma conexão usando autenticação “%s” não pode especificar cifras WPA"
+msgstr "uma conexão usando autenticação \"%s\" não pode especificar cifras WPA"
 
 #: ../src/devices/wifi/nm-wifi-utils.c:210
 #, c-format
 msgid "a connection using '%s' authentication cannot specify a WPA password"
 msgstr ""
-"uma conexão usando autenticação “%s” não pode especificar uma senha WPA"
+"uma conexão usando autenticação \"%s\" não pode especificar uma senha WPA"
 
 #: ../src/devices/wifi/nm-wifi-utils.c:241
 msgid "Dynamic WEP requires an 802.1x setting"
@@ -12893,11 +11753,11 @@ msgstr "WEP dinâmico requer uma definição 802.1x"
 #: ../src/devices/wifi/nm-wifi-utils.c:251
 #: ../src/devices/wifi/nm-wifi-utils.c:279
 msgid "Dynamic WEP requires 'open' authentication"
-msgstr "WEP dinâmico requer autenticação “open”"
+msgstr "WEP dinâmico requer autenticação \"open\""
 
 #: ../src/devices/wifi/nm-wifi-utils.c:266
 msgid "Dynamic WEP requires 'ieee8021x' key management"
-msgstr "WEP dinâmico requer gerenciamento de chaves “ieee8021x”"
+msgstr "WEP dinâmico requer gerenciamento de chaves \"ieee8021x\""
 
 #: ../src/devices/wifi/nm-wifi-utils.c:313
 msgid "WPA-PSK authentication is incompatible with 802.1x"
@@ -12905,7 +11765,7 @@ msgstr "Autenticação WPA-PSK é incompatível com 802.1x"
 
 #: ../src/devices/wifi/nm-wifi-utils.c:323
 msgid "WPA-PSK requires 'open' authentication"
-msgstr "Autenticação WPA-PSK requer autenticação “open”"
+msgstr "Autenticação WPA-PSK requer autenticação \"open\""
 
 #: ../src/devices/wifi/nm-wifi-utils.c:335
 msgid "WPA Ad-Hoc authentication requires an Ad-Hoc mode AP"
@@ -12913,15 +11773,15 @@ msgstr "Autenticação Ad-Hoc WPA requer um AP no modo Ad-Hoc"
 
 #: ../src/devices/wifi/nm-wifi-utils.c:348
 msgid "WPA Ad-Hoc authentication requires 'wpa' protocol"
-msgstr "Autenticação Ad-Hoc WPA requer protocolo “wpa”"
+msgstr "Autenticação Ad-Hoc WPA requer protocolo \"wpa\""
 
 #: ../src/devices/wifi/nm-wifi-utils.c:360
 msgid "WPA Ad-Hoc authentication requires 'none' pairwise cipher"
-msgstr "Autenticação Ad-Hoc WPA requer cifra em pares “none”"
+msgstr "Autenticação Ad-Hoc WPA requer cifra em pares \"none\""
 
 #: ../src/devices/wifi/nm-wifi-utils.c:372
 msgid "WPA Ad-Hoc requires 'tkip' group cipher"
-msgstr "Ad-Hoc WPA requer cifra de grupo “tkip”"
+msgstr "Ad-Hoc WPA requer cifra de grupo \"tkip\""
 
 #: ../src/devices/wifi/nm-wifi-utils.c:386
 msgid "Access point does not support PSK but setting requires it"
@@ -12933,11 +11793,11 @@ msgstr "Autenticação WPA-EAP requer uma definição 802.1x"
 
 #: ../src/devices/wifi/nm-wifi-utils.c:426
 msgid "WPA-EAP requires 'open' authentication"
-msgstr "WPA-EAP requer autenticação “open”"
+msgstr "WPA-EAP requer autenticação \"open\""
 
 #: ../src/devices/wifi/nm-wifi-utils.c:437
 msgid "802.1x setting requires 'wpa-eap' key management"
-msgstr "Definição 802.1x requer gerenciamento de chave “wpa-eap”"
+msgstr "Definição 802.1x requer gerenciamento de chave \"wpa-eap\""
 
 #: ../src/devices/wifi/nm-wifi-utils.c:450
 msgid "Access point does not support 802.1x but setting requires it"
@@ -12960,7 +11820,7 @@ msgstr "Modo Ad-Hoc é incompatível com segurança LEAP"
 
 #: ../src/devices/wifi/nm-wifi-utils.c:507
 msgid "Ad-Hoc mode requires 'open' authentication"
-msgstr "Modo Ad-Hoc requer autenticação “open”"
+msgstr "Modo Ad-Hoc requer autenticação \"open\""
 
 #: ../src/devices/wifi/nm-wifi-utils.c:517
 msgid ""
@@ -12997,137 +11857,137 @@ msgstr ""
 msgid "Failed to determine AP security information"
 msgstr "Falha ao determinar informação de segurança do AP"
 
-#: ../src/devices/wwan/nm-modem-broadband.c:691
+#: ../src/devices/wwan/nm-modem-broadband.c:695
 msgid "GSM mobile broadband connection requires a 'gsm' setting"
-msgstr "Conexão de banda larga móvel (GSM) requer uma definição “gsm”"
+msgstr "Conexão de banda larga móvel (GSM) requer uma configuração \"gsm\""
 
-#: ../src/nm-config.c:521
+#: ../src/nm-config.c:486
 msgid "Config file location"
 msgstr "Localização do arquivo de configuração"
 
-#: ../src/nm-config.c:522
+#: ../src/nm-config.c:487
 msgid "Config directory location"
 msgstr "Localização do diretório de configuração"
 
-#: ../src/nm-config.c:523
+#: ../src/nm-config.c:488
 msgid "System config directory location"
 msgstr "Localização do diretório de configuração do sistema"
 
-#: ../src/nm-config.c:524
+#: ../src/nm-config.c:489
 msgid "Internal config file location"
 msgstr "Localização do arquivo de configuração interna"
 
-#: ../src/nm-config.c:525
+#: ../src/nm-config.c:490
 msgid "State file location"
 msgstr "Localização do arquivo de estado"
 
-#: ../src/nm-config.c:526
+#: ../src/nm-config.c:491
 msgid "State file for no-auto-default devices"
 msgstr "Arquivo de estado para dispositivos no-auto-default"
 
-#: ../src/nm-config.c:527
+#: ../src/nm-config.c:492
 msgid "List of plugins separated by ','"
-msgstr "Lista de plug-ins separada por “,”"
+msgstr "Lista de plug-ins separada por \",\""
 
-#: ../src/nm-config.c:528
+#: ../src/nm-config.c:493
 msgid "Quit after initial configuration"
-msgstr "Saii após configuração inicial"
+msgstr "Sair após configuração inicial"
 
-#: ../src/nm-config.c:529 ../src/nm-iface-helper.c:299
+#: ../src/nm-config.c:494 ../src/nm-iface-helper.c:294
 msgid "Don't become a daemon, and log to stderr"
 msgstr "Não se tornar um daemon e registrar à saída padrão de erro (stderr)"
 
 #. These three are hidden for now, and should eventually just go away.
-#: ../src/nm-config.c:532
+#: ../src/nm-config.c:497
 msgid "An http(s) address for checking internet connectivity"
 msgstr "Um endereço http(s) para verificar a conectividade com a internet"
 
-#: ../src/nm-config.c:533
+#: ../src/nm-config.c:498
 msgid "The interval between connectivity checks (in seconds)"
 msgstr "O intervalo de tempo entre verificações de conectividade (em segundos)"
 
-#: ../src/nm-config.c:534
+#: ../src/nm-config.c:499
 msgid "The expected start of the response"
 msgstr "O início esperado da resposta"
 
 #. Interface/IP config
-#: ../src/nm-iface-helper.c:279
+#: ../src/nm-iface-helper.c:274
 msgid "The interface to manage"
 msgstr "A interface para gerenciar"
 
-#: ../src/nm-iface-helper.c:280
+#: ../src/nm-iface-helper.c:275
 msgid "Connection UUID"
 msgstr "UUID de conexão"
 
-#: ../src/nm-iface-helper.c:281
+#: ../src/nm-iface-helper.c:276
 msgid "Connection Token for Stable IDs"
-msgstr "Token de conexão para IDs estáveis"
+msgstr ""
 
-#: ../src/nm-iface-helper.c:282
+#: ../src/nm-iface-helper.c:277
 msgid "Whether to manage IPv6 SLAAC"
 msgstr "Se SLAAC IPv6 deve ser gerenciado"
 
-#: ../src/nm-iface-helper.c:283
+#: ../src/nm-iface-helper.c:278
 msgid "Whether SLAAC must be successful"
 msgstr "Se SLAAC deve ter obtido sucesso"
 
-#: ../src/nm-iface-helper.c:284
+#: ../src/nm-iface-helper.c:279
 msgid "Use an IPv6 temporary privacy address"
 msgstr "Usar um endereço de privacidade temporária"
 
-#: ../src/nm-iface-helper.c:285
+#: ../src/nm-iface-helper.c:280
 msgid "Current DHCPv4 address"
 msgstr "Endereço DHCPv4 atual"
 
-#: ../src/nm-iface-helper.c:286
+#: ../src/nm-iface-helper.c:281
 msgid "Whether DHCPv4 must be successful"
 msgstr "Se DHCPv4 deve ter obtido sucesso"
 
-#: ../src/nm-iface-helper.c:287
+#: ../src/nm-iface-helper.c:282
 msgid "Hex-encoded DHCPv4 client ID"
 msgstr "ID de cliente DHCPv4 codificado em Hexa"
 
-#: ../src/nm-iface-helper.c:288
+#: ../src/nm-iface-helper.c:283
 msgid "Hostname to send to DHCP server"
 msgstr "Nome de máquina para enviar ao servidor DHCP"
 
-#: ../src/nm-iface-helper.c:288
+#: ../src/nm-iface-helper.c:283
 msgid "barbar"
 msgstr "barrabarra"
 
-#: ../src/nm-iface-helper.c:289
+#: ../src/nm-iface-helper.c:284
 msgid "FQDN to send to DHCP server"
 msgstr "FQDN para enviar ao servidor DHCP"
 
-#: ../src/nm-iface-helper.c:289
+#: ../src/nm-iface-helper.c:284
 msgid "host.domain.org"
 msgstr "máquina.domínio.org"
 
-#: ../src/nm-iface-helper.c:290
+#: ../src/nm-iface-helper.c:285
 msgid "Route priority for IPv4"
 msgstr "Prioridade de rota para IPv4"
 
-#: ../src/nm-iface-helper.c:290
+#: ../src/nm-iface-helper.c:285
 msgid "0"
 msgstr "0"
 
-#: ../src/nm-iface-helper.c:291
+#: ../src/nm-iface-helper.c:286
 msgid "Route priority for IPv6"
 msgstr "Prioridade de rota para IPv6"
 
-#: ../src/nm-iface-helper.c:291
+#: ../src/nm-iface-helper.c:286
 msgid "1024"
 msgstr "1024"
 
-#: ../src/nm-iface-helper.c:292
+#: ../src/nm-iface-helper.c:287
 msgid "Hex-encoded Interface Identifier"
 msgstr "Identificação de interface codificada em hexadecimal"
 
-#: ../src/nm-iface-helper.c:293
+#: ../src/nm-iface-helper.c:288
 msgid "IPv6 SLAAC address generation mode"
 msgstr "modo de geração de endereço SLAAC IPv6"
 
-#: ../src/nm-iface-helper.c:294
+#: ../src/nm-iface-helper.c:289
 msgid ""
 "The logging backend configuration value. See logging.backend in "
 "NetworkManager.conf"
@@ -13135,7 +11995,7 @@ msgstr ""
 "O valor da configuração do backend de registro de log. Veja logging.backend "
 "no NetworkManager.conf"
 
-#: ../src/nm-iface-helper.c:314
+#: ../src/nm-iface-helper.c:309
 msgid ""
 "nm-iface-helper is a small, standalone process that manages a single network "
 "interface."
@@ -13143,158 +12003,27 @@ msgstr ""
 "nm-iface-helper is é um pequeno processo independente que gerencia uma "
 "interface de rede singular."
 
-#: ../src/nm-iface-helper.c:423
+#: ../src/nm-iface-helper.c:379
 #, c-format
 msgid "An interface name and UUID are required\n"
 msgstr "Um nome de interface e UUID são necessários\n"
 
-#: ../src/nm-iface-helper.c:429
+#: ../src/nm-iface-helper.c:385
 #, c-format
 msgid "Failed to find interface index for %s (%s)\n"
 msgstr "Falha em localizar índice de interfaces para %s (%s)\n"
 
-#: ../src/nm-iface-helper.c:447
-#, c-format
-msgid "Ignoring unrecognized log domain(s) '%s' passed on command line.\n"
-msgstr ""
-"Ignorando domínio(s) de log irreconhecíveis “%s” passaram na linha de "
-"comando.\n"
-
-#: ../src/nm-iface-helper.c:486
+#: ../src/nm-iface-helper.c:446
 #, c-format
 msgid "(%s): Invalid IID %s\n"
 msgstr "(%s): IID %s inválido\n"
 
-#: ../src/nm-iface-helper.c:497
-#, c-format
-msgid "(%s): Invalid DHCP client-id %s\n"
-msgstr "(%s): client-id de DHCP %s inválido\n"
-
-#: ../src/nm-logging.c:273
+#: ../src/nm-logging.c:267
 #, c-format
 msgid "Unknown log level '%s'"
-msgstr "Nível de registro “%s” desconhecido"
+msgstr "Nível de registro \"%s\" desconhecido"
 
-#: ../src/nm-logging.c:375
+#: ../src/nm-logging.c:369
 #, c-format
 msgid "Unknown log domain '%s'"
-msgstr "Domínio de registro “%s” desconhecido"
-
-#~ msgid "Error: bad color: %s\n"
-#~ msgstr "Erro: cor inválida: %s\n"
-
-#~ msgid "'%s' is ambiguous (%s x %s)"
-#~ msgstr "\"%s\" é ambíguo (%s x %s)"
-
-#~ msgid "'%s' is not a valid flag; use <0-%d> or a combination of '%s'"
-#~ msgstr ""
-#~ "\"%s\" não é um sinalizado válido; use <0-%d> ou uma combinação de \"%s\""
-
-#~ msgid "'%s' sum is higher than all flags => all flags set"
-#~ msgstr ""
-#~ "soma \"%s\" é maior do que todas os sinalizadores => todos sinalizadores "
-#~ "definidos"
-
-#~ msgid "%d (disabled)"
-#~ msgstr "%d (desabilitada)"
-
-#~ msgid "%d (enabled, prefer public IP)"
-#~ msgstr "%d (ativada, prefere IP público)"
-
-#~ msgid "%d (enabled, prefer temporary IP)"
-#~ msgstr "%d (ativada, prefere IP temporário)"
-
-#~ msgid "'%s' is not valid; use 0, 1, or 2"
-#~ msgstr "\"%s\" não é válido; use 0, 1, ou 2"
-
-#~ msgid ""
-#~ "If TRUE, enforce auto-negotiation of port speed and duplex mode.  If "
-#~ "FALSE, \"speed\" and \"duplex\" properties should be both set or link "
-#~ "configuration will be skipped."
-#~ msgstr ""
-#~ "Se VERDADEIRO, aplica autonegociação da velocidade da porta e modo "
-#~ "duplex. Se FALSO, as propriedades \"speed\" e \"duplex\" devem ser "
-#~ "definidas ou a configuração do link será ignorada."
-
-#~ msgid ""
-#~ "Can be specified only when \"auto-negotiate\" is \"off\". In that case, "
-#~ "statically configures the device to use that specified duplex mode, "
-#~ "either \"half\" or \"full\". Must be set together with the \"speed\" "
-#~ "property if specified. Before specifying a duplex mode be sure your "
-#~ "device supports it."
-#~ msgstr ""
-#~ "Pode ser especificado apenas quando \"auto-negotiate\" está \"off\". "
-#~ "Nesse caso, configura estaticamente o dispositivo para usar esse modo "
-#~ "duplex especificado, \"half\" ou \"full\". Deve ser configurado junto com "
-#~ "a propriedade \"speed\", se especificada. Antes de especificar um modo "
-#~ "duplex, certifique-se de que seu dispositivo oferece suporte a isso."
-
-#~ msgid ""
-#~ "Can be set to a value greater than zero only when \"auto-negotiate\" is "
-#~ "\"off\". In that case, statically configures the device to use that "
-#~ "specified speed. In Mbit/s, ie 100 == 100Mbit/s. Must be set together "
-#~ "with the \"duplex\" property when non-zero. Before specifying a speed "
-#~ "value be sure your device supports it."
-#~ msgstr ""
-#~ "Pode ser definido para um valor maior que zero apenas quando \"auto-"
-#~ "negotiate\" está em \"off\". Nesse caso, configura estaticamente o "
-#~ "dispositivo para usar a velocidade especificada. Em Mbit/s, isto é, 100 "
-#~ "== 100Mbit/s. Deve ser configurado junto com a propriedade \"duplex\" "
-#~ "quando não zero. Antes de especificar um valor de velocidade, certifique-"
-#~ "se de que seu dispositivo oferece suporte a isso."
-
-#~ msgid "ignoring invalid DNS server IPv6 address '%s'"
-#~ msgstr "ignorando endereço IPv6 %s inválido para servidor DNS"
-
-#~ msgid "when link autonegotiation is enabled no duplex value is accepted"
-#~ msgstr ""
-#~ "quando autonegociação de link estiver habilitada, nenhum valor de \"duplex"
-#~ "\" é aceito"
-
-#~ msgid "when link autonegotiation is enabled speed should be 0"
-#~ msgstr ""
-#~ "quando autonegociação de link estiver habilitada, \"speed\" deve ser 0"
-
-#~ msgid "Error in configuration file: %s.\n"
-#~ msgstr "Erro no arquivo de configuração: %s.\n"
-
-#~ msgid "Ignoring unrecognized log domain(s) '%s' from config files.\n"
-#~ msgstr ""
-#~ "Ignorando domínio(s) de log irreconhecíveis '%s' dos arquivos de config.\n"
-
-#~ msgid "Invalid reason"
-#~ msgstr "Motivo inválido"
-
-#~ msgid ""
-#~ "Connection successfully activated (master waiting for slaves) (D-Bus "
-#~ "active path: %s)\n"
-#~ msgstr ""
-#~ "Conexão ativada com sucesso (mestre aguardando por escravos) (caminho D-"
-#~ "Bus ativo: %s)\n"
-
-#~ msgid "Error: nmcli terminated by signal %s (%d)\n"
-#~ msgstr "Erro: nmcli terminado pelo sinal %s (%d)\n"
-
-#~ msgid "'%s' is not a valid flag number; use <0-%d>"
-#~ msgstr "\"%s\" não é um número de sinalizador válido; use <0-%d>"
-
-#~ msgid "%d (default)"
-#~ msgstr "%d (padrão)"
-
-#~ msgid "%d (forever)"
-#~ msgstr "%d (sempre)"
-
-#~ msgid "%d (off)"
-#~ msgstr "%d (desligado)"
-
-#~ msgid "Editor failed with status %d"
-#~ msgstr "Editor falhou cp, status %d"
-
-#~ msgid "Editor failed with signal %d"
-#~ msgstr "Editor falhou com sinal %d"
-
-#~ msgid "Activation failed"
-#~ msgstr "Ativação falhou"
-
-#~ msgid "missing key-value separator '%c'"
-#~ msgstr "faltando o separador de valor-chave \"%c\""
\ No newline at end of file
+msgstr "Domínio de registro \"%s\" desconhecido"
diff --git a/po/uk.po b/po/uk.po
index 14d7050e..be59c6b6 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -10,8 +10,8 @@ msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: https://bugzilla.gnome.org/enter_bug.cgi?product=Network"
 "Manager&keywords=I18N+L10N&component=Translations\n"
-"POT-Creation-Date: 2018-07-01 03:24+0000\n"
-"PO-Revision-Date: 2018-07-01 13:48+0200\n"
+"POT-Creation-Date: 2018-03-07 03:24+0000\n"
+"PO-Revision-Date: 2018-03-18 12:09+0200\n"
 "Last-Translator: Yuri Chornoivan <yurchor@ukr.net>\n"
 "Language-Team: Ukrainian <kde-i18n-uk@kde.org>\n"
 "Language: uk\n"
@@ -86,47 +86,46 @@ msgstr ""
 "Запустити nmcli як агент паролів NetworkManager та polkit.\n"
 "\n"
 
-#: ../clients/cli/agent.c:157
+#: ../clients/cli/agent.c:158
 #, c-format
 msgid "nmcli successfully registered as a NetworkManager's secret agent.\n"
 msgstr "nmcli успішно зареєстровано як агент паролів NetworkManager.\n"
 
-#: ../clients/cli/agent.c:159
+#: ../clients/cli/agent.c:160
 #, c-format
 msgid "Error: secret agent initialization failed"
 msgstr "Помилка: не вдалося ініціалізувати агент обробки паролів"
 
-#: ../clients/cli/agent.c:178
+#: ../clients/cli/agent.c:179
 #, c-format
 msgid "Error: polkit agent initialization failed: %s"
 msgstr "Помилка: не вдалося ініціалізувати агент polkit: %s"
 
-#: ../clients/cli/agent.c:186
+#: ../clients/cli/agent.c:187
 #, c-format
 msgid "nmcli successfully registered as a polkit agent.\n"
 msgstr "nmcli успішно зареєстровано як агент polkit.\n"
 
-#: ../clients/cli/common.c:306 ../clients/cli/common.c:332
-#: ../clients/cli/connections.c:1303
+#: ../clients/cli/common.c:261 ../clients/cli/common.c:276
 msgid "GROUP"
 msgstr "ГРУПА"
 
-#: ../clients/cli/common.c:606
+#: ../clients/cli/common.c:558
 #, c-format
 msgid "Error: openconnect failed: %s\n"
 msgstr "Помилка: не вдалося виконати openconnect: %s\n"
 
-#: ../clients/cli/common.c:613
+#: ../clients/cli/common.c:565
 #, c-format
 msgid "Error: openconnect failed with status %d\n"
 msgstr "Помилка: виконання openconnect завершилося невдало зі станом %d\n"
 
-#: ../clients/cli/common.c:615
+#: ../clients/cli/common.c:567
 #, c-format
 msgid "Error: openconnect failed with signal %d\n"
 msgstr "Помилка: виконання openconnect завершилося невдало із сигналом %d\n"
 
-#: ../clients/cli/common.c:695
+#: ../clients/cli/common.c:647
 #, c-format
 msgid ""
 "Warning: password for '%s' not given in 'passwd-file' and nmcli cannot ask "
@@ -135,26 +134,26 @@ msgstr ""
 "Попередження: у «passwd-file» не вказано пароля до «%s», а nmcli не може "
 "запитати про пароль без параметра «--ask».\n"
 
-#: ../clients/cli/common.c:1185
+#: ../clients/cli/common.c:1137
 #, c-format
 msgid "Error: Could not create NMClient object: %s."
 msgstr "Помилка: не вдалося створити об’єкт NMClient: %s."
 
-#: ../clients/cli/common.c:1205
+#: ../clients/cli/common.c:1157
 msgid "Error: NetworkManager is not running."
 msgstr "Помилка: NetworkManager не працює."
 
-#: ../clients/cli/common.c:1301
+#: ../clients/cli/common.c:1253
 #, c-format
 msgid "Error: argument '%s' not understood. Try passing --help instead."
 msgstr ""
 "Помилка: параметр «%s» є невідомим. Спробуйте скористатися параметром --help."
 
-#: ../clients/cli/common.c:1311
+#: ../clients/cli/common.c:1263
 msgid "Error: missing argument. Try passing --help."
 msgstr "Помилка: пропущено параметр. Спробуйте скористатися параметром --help."
 
-#: ../clients/cli/common.c:1364
+#: ../clients/cli/common.c:1316
 msgid "access denied"
 msgstr "доступ заборонено"
 
@@ -188,70 +187,7 @@ msgstr "З’єднання (назва, UUID або шлях)"
 msgid "Connection(s) (name, UUID, path or apath)"
 msgstr "З’єднання (назва, UUID, шлях або apath)"
 
-#: ../clients/cli/connections.c:80 ../clients/cli/connections.c:89
-#: ../clients/cli/devices.c:1201 ../clients/cli/devices.c:1245
-#: ../clients/cli/devices.c:1247 ../clients/cli/general.c:41
-#: ../clients/cli/general.c:82 ../clients/cli/general.c:150
-#: ../clients/cli/general.c:155 ../clients/common/nm-client-utils.c:288
-#: ../clients/common/nm-client-utils.c:291
-#: ../clients/common/nm-client-utils.c:307
-#: ../clients/common/nm-client-utils.c:310
-#: ../clients/common/nm-meta-setting-desc.c:1510
-#: ../clients/common/nm-meta-setting-desc.c:1560
-#: ../clients/common/nm-meta-setting-desc.c:2709
-#: ../clients/common/nm-meta-setting-desc.c:2764
-msgid "unknown"
-msgstr "невідомо"
-
-#: ../clients/cli/connections.c:81
-msgid "activating"
-msgstr "активація"
-
-#: ../clients/cli/connections.c:82
-msgid "activated"
-msgstr "активовано"
-
-#: ../clients/cli/connections.c:83 ../clients/common/nm-client-utils.c:284
-msgid "deactivating"
-msgstr "деактивація"
-
-#: ../clients/cli/connections.c:84
-msgid "deactivated"
-msgstr "вимкнено"
-
-#: ../clients/cli/connections.c:90
-msgid "VPN connecting (prepare)"
-msgstr "З’єднання VPN (приготування)"
-
-#: ../clients/cli/connections.c:91
-msgid "VPN connecting (need authentication)"
-msgstr "З’єднання VPN (потрібне розпізнавання)"
-
-#: ../clients/cli/connections.c:92
-msgid "VPN connecting"
-msgstr "З’єднання VPN"
-
-#: ../clients/cli/connections.c:93
-msgid "VPN connecting (getting IP configuration)"
-msgstr "З’єднання VPN (отримання налаштувань IP)"
-
-#: ../clients/cli/connections.c:94
-msgid "VPN connected"
-msgstr "VPN з’єднано"
-
-#: ../clients/cli/connections.c:95
-msgid "VPN connection failed"
-msgstr "Невдала спроба з’єднання VPN"
-
-#: ../clients/cli/connections.c:96
-msgid "VPN disconnected"
-msgstr "VPN роз’єднано"
-
-#: ../clients/cli/connections.c:452
-msgid "never"
-msgstr "ніколи"
-
-#: ../clients/cli/connections.c:715
+#: ../clients/cli/connections.c:195
 #, c-format
 msgid ""
 "Usage: nmcli connection { COMMAND | help }\n"
@@ -329,7 +265,7 @@ msgstr ""
 "  export [id | uuid | path] <ідентифікатор> [<файл результатів>]\n"
 "\n"
 
-#: ../clients/cli/connections.c:737
+#: ../clients/cli/connections.c:217
 #, c-format
 msgid ""
 "Usage: nmcli connection show { ARGUMENTS | help }\n"
@@ -377,7 +313,7 @@ msgstr ""
 "Якщо вказано параметр «--active», братимуться до уваги лише активні профілі. "
 "Загальний параметр --show-secrets покаже також пов’язані паролі.\n"
 
-#: ../clients/cli/connections.c:758
+#: ../clients/cli/connections.c:238
 #, c-format
 msgid ""
 "Usage: nmcli connection up { ARGUMENTS | help }\n"
@@ -423,7 +359,7 @@ msgstr ""
 "passwd-file - файл з паролями, потрібними для активації з’єднання\n"
 "\n"
 
-#: ../clients/cli/connections.c:779
+#: ../clients/cli/connections.c:259
 #, c-format
 msgid ""
 "Usage: nmcli connection down { ARGUMENTS | help }\n"
@@ -445,156 +381,8 @@ msgstr ""
 "назвою, UUID або шляхом D-Bus.\n"
 "\n"
 
-#: ../clients/cli/connections.c:791
+#: ../clients/cli/connections.c:271
 #, c-format
-#| msgid ""
-#| "Usage: nmcli connection add { ARGUMENTS | help }\n"
-#| "\n"
-#| "ARGUMENTS := COMMON_OPTIONS TYPE_SPECIFIC_OPTIONS SLAVE_OPTIONS "
-#| "IP_OPTIONS [-- ([+|-]<setting>.<property> <value>)+]\n"
-#| "\n"
-#| "  COMMON_OPTIONS:\n"
-#| "                  type <type>\n"
-#| "                  ifname <interface name> | \"*\"\n"
-#| "                  [con-name <connection name>]\n"
-#| "                  [autoconnect yes|no]\n"
-#| "                  [save yes|no]\n"
-#| "                  [master <master (ifname, or connection UUID or name)>]\n"
-#| "                  [slave-type <master connection type>]\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"
-#| "                  [mode infrastructure|ap|adhoc]\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|nap|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"
-#| "                  [lacp-rate slow (0) | fast (1)]\n"
-#| "\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 or name)>\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"
-#| "                  [multicast-snooping yes|no]\n"
-#| "                  [mac <MAC address>]\n"
-#| "\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|"
-#| "libreswan|ssh|l2tp|iodine|...\n"
-#| "                  [user <username>]\n"
-#| "\n"
-#| "    olpc-mesh:    ssid <SSID>\n"
-#| "                  [channel <1-13>]\n"
-#| "                  [dhcp-anycast <MAC address>]\n"
-#| "\n"
-#| "    adsl:         username <username>\n"
-#| "                  protocol pppoa|pppoe|ipoatm\n"
-#| "                  [password <password>]\n"
-#| "                  [encapsulation vcmux|llc]\n"
-#| "\n"
-#| "    tun:          mode tun|tap\n"
-#| "                  [owner <UID>]\n"
-#| "                  [group <GID>]\n"
-#| "                  [pi yes|no]\n"
-#| "                  [vnet-hdr yes|no]\n"
-#| "                  [multi-queue yes|no]\n"
-#| "\n"
-#| "    ip-tunnel:    mode ipip|gre|sit|isatap|vti|ip6ip6|ipip6|ip6gre|vti6\n"
-#| "                  remote <remote endpoint IP>\n"
-#| "                  [local <local endpoint IP>]\n"
-#| "                  [dev <parent device (ifname or connection UUID)>]\n"
-#| "\n"
-#| "    macsec:       dev <parent device (connection UUID, ifname, or MAC)>\n"
-#| "                  mode <psk|eap>\n"
-#| "                  [cak <key> ckn <key>]\n"
-#| "                  [encrypt yes|no]\n"
-#| "                  [port 1-65534]\n"
-#| "\n"
-#| "\n"
-#| "    macvlan:      dev <parent device (connection UUID, ifname, or MAC)>\n"
-#| "                  mode vepa|bridge|private|passthru|source\n"
-#| "                  [tap yes|no]\n"
-#| "\n"
-#| "    vxlan:        id <VXLAN ID>\n"
-#| "                  remote <IP of multicast group or remote address>\n"
-#| "                  [local <source IP>]\n"
-#| "                  [dev <parent device (ifname or connection UUID)>]\n"
-#| "                  [source-port-min <0-65535>]\n"
-#| "                  [source-port-max <0-65535>]\n"
-#| "                  [destination-port <0-65535>]\n"
-#| "\n"
-#| "    dummy:         \n"
-#| "\n"
-#| "  SLAVE_OPTIONS:\n"
-#| "    bridge:       [priority <0-63>]\n"
-#| "                  [path-cost <1-65535>]\n"
-#| "                  [hairpin yes|no]\n"
-#| "\n"
-#| "    team:         [config <file>|<raw JSON data>]\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"
@@ -730,14 +518,7 @@ msgid ""
 "                  [source-port-max <0-65535>]\n"
 "                  [destination-port <0-65535>]\n"
 "\n"
-"    wpan:         [short-addr <0x0000-0xffff>]\n"
-"\n"
-"                  [pan-id <0x0000-0xffff>]\n"
-"\n"
-"                  [mac <MAC address>]\n"
-"\n"
-"    6lowpan:      dev <parent device (connection UUID, ifname, or MAC)>\n"
-"    dummy:\n"
+"    dummy:         \n"
 "\n"
 "  SLAVE_OPTIONS:\n"
 "    bridge:       [priority <0-63>]\n"
@@ -893,15 +674,7 @@ msgstr ""
 "                  [source-port-max <0-65535>]\n"
 "                  [destination-port <0-65535>]\n"
 "\n"
-"    wpan:         [short-addr <0x0000-0xffff>]\n"
-"\n"
-"                  [pan-id <0x0000-0xffff>]\n"
-"\n"
-"                  [mac <MAC-адреса>]\n"
-"\n"
-"    6lowpan:      dev <батьківський пристрій (UUID з'єднання, назва"
-" інтерфейсу або MAC)>\n"
-"    dummy:\n"
+"    dummy:         \n"
 "\n"
 "  ПАРАМЕТРИ_SLAVE:\n"
 "    bridge:       [priority <0-63>]\n"
@@ -915,7 +688,7 @@ msgstr ""
 "                  [ip6 <адреса IPv6>] [gw6 <шлюз IPv6>]\n"
 "\n"
 
-#: ../clients/cli/connections.c:913
+#: ../clients/cli/connections.c:389
 #, c-format
 msgid ""
 "Usage: nmcli connection modify { ARGUMENTS | help }\n"
@@ -962,7 +735,7 @@ msgstr ""
 "nmcli con mod bond0 -bond.options downdelay\n"
 "\n"
 
-#: ../clients/cli/connections.c:936
+#: ../clients/cli/connections.c:412
 #, c-format
 msgid ""
 "Usage: nmcli connection clone { ARGUMENTS | help }\n"
@@ -985,7 +758,7 @@ msgstr ""
 "ідентифікатора (задається параметром <нова назва>).\n"
 "\n"
 
-#: ../clients/cli/connections.c:948
+#: ../clients/cli/connections.c:424
 #, c-format
 msgid ""
 "Usage: nmcli connection edit { ARGUMENTS | help }\n"
@@ -1013,7 +786,7 @@ msgstr ""
 "Додати новий профіль з’єднання за допомогою інтерактивного редактора.\n"
 "\n"
 
-#: ../clients/cli/connections.c:963
+#: ../clients/cli/connections.c:439
 #, c-format
 msgid ""
 "Usage: nmcli connection delete { ARGUMENTS | help }\n"
@@ -1032,7 +805,7 @@ msgstr ""
 "Профіль можна вказати за допомогою назви, UUID або шляху D-Bus.\n"
 "\n"
 
-#: ../clients/cli/connections.c:974
+#: ../clients/cli/connections.c:450
 #, c-format
 msgid ""
 "Usage: nmcli connection monitor { ARGUMENTS | help }\n"
@@ -1054,7 +827,7 @@ msgstr ""
 "Стежить за усіма профілями з’єднань, якщо конкретний профіль не вказано.\n"
 "\n"
 
-#: ../clients/cli/connections.c:986
+#: ../clients/cli/connections.c:462
 #, c-format
 msgid ""
 "Usage: nmcli connection reload { help }\n"
@@ -1067,7 +840,7 @@ msgstr ""
 "Перезавантажити усіх файли з’єднань з диска.\n"
 "\n"
 
-#: ../clients/cli/connections.c:994
+#: ../clients/cli/connections.c:470
 #, c-format
 msgid ""
 "Usage: nmcli connection load { ARGUMENTS | help }\n"
@@ -1090,7 +863,7 @@ msgstr ""
 "того, щоб завантажити до NetworkManager найсвіжіші налаштування.\n"
 "\n"
 
-#: ../clients/cli/connections.c:1006
+#: ../clients/cli/connections.c:482
 #, c-format
 msgid ""
 "Usage: nmcli connection import { ARGUMENTS | help }\n"
@@ -1115,7 +888,7 @@ msgstr ""
 "імпортуються додатками VPN NetworkManager.\n"
 "\n"
 
-#: ../clients/cli/connections.c:1019
+#: ../clients/cli/connections.c:495
 #, c-format
 msgid ""
 "Usage: nmcli connection export { ARGUMENTS | help }\n"
@@ -1135,336 +908,440 @@ msgstr ""
 "Дані спрямовуватимуться до стандартного виведення або до вказаного файла.\n"
 "\n"
 
-#: ../clients/cli/connections.c:1101
+#: ../clients/cli/connections.c:525
+msgid "activating"
+msgstr "активація"
+
+#: ../clients/cli/connections.c:527
+msgid "activated"
+msgstr "активовано"
+
+#: ../clients/cli/connections.c:529 ../clients/common/nm-client-utils.c:234
+msgid "deactivating"
+msgstr "деактивація"
+
+#: ../clients/cli/connections.c:531
+msgid "deactivated"
+msgstr "вимкнено"
+
+#: ../clients/cli/connections.c:534 ../clients/cli/connections.c:557
+#: ../clients/cli/devices.c:1207 ../clients/cli/devices.c:1251
+#: ../clients/cli/devices.c:1253 ../clients/cli/general.c:41
+#: ../clients/cli/general.c:79 ../clients/cli/general.c:146
+#: ../clients/cli/general.c:151 ../clients/common/nm-client-utils.c:238
+#: ../clients/common/nm-client-utils.c:241
+#: ../clients/common/nm-client-utils.c:257
+#: ../clients/common/nm-client-utils.c:260
+#: ../clients/common/nm-meta-setting-desc.c:1487
+#: ../clients/common/nm-meta-setting-desc.c:1555
+#: ../clients/common/nm-meta-setting-desc.c:2690
+#: ../clients/common/nm-meta-setting-desc.c:2744
+msgid "unknown"
+msgstr "невідомо"
+
+#: ../clients/cli/connections.c:543
+msgid "VPN connecting (prepare)"
+msgstr "З’єднання VPN (приготування)"
+
+#: ../clients/cli/connections.c:545
+msgid "VPN connecting (need authentication)"
+msgstr "З’єднання VPN (потрібне розпізнавання)"
+
+#: ../clients/cli/connections.c:547
+msgid "VPN connecting"
+msgstr "З’єднання VPN"
+
+#: ../clients/cli/connections.c:549
+msgid "VPN connecting (getting IP configuration)"
+msgstr "З’єднання VPN (отримання налаштувань IP)"
+
+#: ../clients/cli/connections.c:551
+msgid "VPN connected"
+msgstr "VPN з’єднано"
+
+#: ../clients/cli/connections.c:553
+msgid "VPN connection failed"
+msgstr "Невдала спроба з’єднання VPN"
+
+#: ../clients/cli/connections.c:555
+msgid "VPN disconnected"
+msgstr "VPN роз’єднано"
+
+#: ../clients/cli/connections.c:630
 #, c-format
 msgid "Error updating secrets for %s: %s\n"
 msgstr "Помилка під час проби оновлення паролів для %s: %s\n"
 
-#: ../clients/cli/connections.c:1144
+#: ../clients/cli/connections.c:673
 msgid "Connection profile details"
 msgstr "Параметри профілю з’єднання"
 
-#: ../clients/cli/connections.c:1157 ../clients/cli/connections.c:1255
+#: ../clients/cli/connections.c:686 ../clients/cli/connections.c:1135
 #, c-format
 msgid "Error: 'connection show': %s"
 msgstr "Помилка: «connection show»: %s"
 
-#: ../clients/cli/connections.c:1245
+#: ../clients/cli/connections.c:904
+msgid "never"
+msgstr "ніколи"
+
+#. "CAPABILITIES"
+#: ../clients/cli/connections.c:905 ../clients/cli/connections.c:907
+#: ../clients/cli/connections.c:909 ../clients/cli/connections.c:942
+#: ../clients/cli/connections.c:1009 ../clients/cli/connections.c:1010
+#: ../clients/cli/connections.c:1012 ../clients/cli/connections.c:4447
+#: ../clients/cli/connections.c:6414 ../clients/cli/connections.c:6415
+#: ../clients/cli/devices.c:881 ../clients/cli/devices.c:1170
+#: ../clients/cli/devices.c:1171 ../clients/cli/devices.c:1172
+#: ../clients/cli/devices.c:1173 ../clients/cli/devices.c:1174
+#: ../clients/cli/devices.c:1211 ../clients/cli/devices.c:1213
+#: ../clients/cli/devices.c:1214 ../clients/cli/devices.c:1244
+#: ../clients/cli/devices.c:1245 ../clients/cli/devices.c:1246
+#: ../clients/cli/devices.c:1247 ../clients/cli/devices.c:1248
+#: ../clients/cli/devices.c:1249 ../clients/cli/devices.c:1250
+#: ../clients/cli/devices.c:1252 ../clients/cli/devices.c:1254
+#: ../clients/cli/general.c:152 ../clients/common/nm-client-utils.c:249
+#: ../clients/common/nm-meta-setting-desc.c:724
+#: ../clients/common/nm-meta-setting-desc.c:2683
+msgid "yes"
+msgstr "так"
+
+#: ../clients/cli/connections.c:905 ../clients/cli/connections.c:907
+#: ../clients/cli/connections.c:909 ../clients/cli/connections.c:1009
+#: ../clients/cli/connections.c:1010 ../clients/cli/connections.c:1012
+#: ../clients/cli/connections.c:4446 ../clients/cli/connections.c:6414
+#: ../clients/cli/connections.c:6415 ../clients/cli/devices.c:881
+#: ../clients/cli/devices.c:1170 ../clients/cli/devices.c:1171
+#: ../clients/cli/devices.c:1172 ../clients/cli/devices.c:1173
+#: ../clients/cli/devices.c:1174 ../clients/cli/devices.c:1211
+#: ../clients/cli/devices.c:1213 ../clients/cli/devices.c:1214
+#: ../clients/cli/devices.c:1244 ../clients/cli/devices.c:1245
+#: ../clients/cli/devices.c:1246 ../clients/cli/devices.c:1247
+#: ../clients/cli/devices.c:1248 ../clients/cli/devices.c:1249
+#: ../clients/cli/devices.c:1250 ../clients/cli/devices.c:1252
+#: ../clients/cli/devices.c:1254 ../clients/cli/general.c:153
+#: ../clients/common/nm-client-utils.c:251
+#: ../clients/common/nm-meta-setting-desc.c:724
+#: ../clients/common/nm-meta-setting-desc.c:2686
+msgid "no"
+msgstr "ні"
+
+#: ../clients/cli/connections.c:1125
 msgid "Activate connection details"
 msgstr "Активувати параметри з’єднання"
 
-#: ../clients/cli/connections.c:1491
+#: ../clients/cli/connections.c:1371
 #, c-format
 msgid "invalid field '%s'; allowed fields: %s and %s, or %s,%s"
 msgstr "некоректне поле «%s»; дозволені поля: %s і %s або %s,%s"
 
-#: ../clients/cli/connections.c:1506 ../clients/cli/connections.c:1514
+#: ../clients/cli/connections.c:1386 ../clients/cli/connections.c:1394
 #, c-format
 msgid "'%s' has to be alone"
 msgstr "«%s» має бути єдиним"
 
-#: ../clients/cli/connections.c:1779
+#: ../clients/cli/connections.c:1595
 #, c-format
 msgid "incorrect string '%s' of '--order' option"
 msgstr "помилковий рядок «%s» у параметрі «--order»"
 
-#: ../clients/cli/connections.c:1804
+#: ../clients/cli/connections.c:1620
 #, c-format
 msgid "incorrect item '%s' in '--order' option"
 msgstr "помилковий пункт «%s» у параметрі «--order»"
 
-#: ../clients/cli/connections.c:1842
+#: ../clients/cli/connections.c:1649
 msgid "No connection specified"
 msgstr "Не вказано з’єднання"
 
-#: ../clients/cli/connections.c:1853
+#: ../clients/cli/connections.c:1660
 #, c-format
 msgid "%s argument is missing"
 msgstr "пропущено аргумент %s"
 
-#: ../clients/cli/connections.c:1871
+#: ../clients/cli/connections.c:1675
 #, c-format
 msgid "unknown connection '%s'"
 msgstr "невідоме з’єднання «%s»"
 
-#: ../clients/cli/connections.c:1900
+#: ../clients/cli/connections.c:1708
 msgid "'--order' argument is missing"
 msgstr "пропущено аргумент «--order»"
 
-#: ../clients/cli/connections.c:1961
+#: ../clients/cli/connections.c:1763
 msgid "NetworkManager active profiles"
 msgstr "Активні профілі NetworkManager"
 
-#: ../clients/cli/connections.c:1962
+#: ../clients/cli/connections.c:1764
 msgid "NetworkManager connection profiles"
 msgstr "Профілі з’єднань NetworkManager"
 
-#: ../clients/cli/connections.c:2014 ../clients/cli/connections.c:2713
-#: ../clients/cli/connections.c:2725 ../clients/cli/connections.c:2737
-#: ../clients/cli/connections.c:2963 ../clients/cli/connections.c:8652
-#: ../clients/cli/connections.c:8668 ../clients/cli/devices.c:2849
-#: ../clients/cli/devices.c:2861 ../clients/cli/devices.c:2874
-#: ../clients/cli/devices.c:3025 ../clients/cli/devices.c:3036
-#: ../clients/cli/devices.c:3054 ../clients/cli/devices.c:3063
-#: ../clients/cli/devices.c:3084 ../clients/cli/devices.c:3095
-#: ../clients/cli/devices.c:3113 ../clients/cli/devices.c:3493
-#: ../clients/cli/devices.c:3503 ../clients/cli/devices.c:3511
-#: ../clients/cli/devices.c:3523 ../clients/cli/devices.c:3538
-#: ../clients/cli/devices.c:3546 ../clients/cli/devices.c:3720
-#: ../clients/cli/devices.c:3731 ../clients/cli/devices.c:3902
+#: ../clients/cli/connections.c:1817 ../clients/cli/connections.c:2486
+#: ../clients/cli/connections.c:2498 ../clients/cli/connections.c:2510
+#: ../clients/cli/connections.c:2686 ../clients/cli/connections.c:8474
+#: ../clients/cli/connections.c:8491 ../clients/cli/devices.c:2678
+#: ../clients/cli/devices.c:2689 ../clients/cli/devices.c:2931
+#: ../clients/cli/devices.c:2942 ../clients/cli/devices.c:2960
+#: ../clients/cli/devices.c:2969 ../clients/cli/devices.c:2990
+#: ../clients/cli/devices.c:3001 ../clients/cli/devices.c:3019
+#: ../clients/cli/devices.c:3397 ../clients/cli/devices.c:3407
+#: ../clients/cli/devices.c:3415 ../clients/cli/devices.c:3427
+#: ../clients/cli/devices.c:3442 ../clients/cli/devices.c:3450
+#: ../clients/cli/devices.c:3624 ../clients/cli/devices.c:3635
+#: ../clients/cli/devices.c:3807
 #, c-format
 msgid "Error: %s argument is missing."
 msgstr "Помилка: пропущено аргумент %s."
 
-#: ../clients/cli/connections.c:2042
+#: ../clients/cli/connections.c:1836
 #, c-format
 msgid "Error: %s - no such connection profile."
 msgstr "Помилка: профілю з’єднання %s не існує."
 
-#: ../clients/cli/connections.c:2133 ../clients/cli/connections.c:2700
-#: ../clients/cli/connections.c:2764 ../clients/cli/connections.c:8176
-#: ../clients/cli/connections.c:8282 ../clients/cli/connections.c:8768
-#: ../clients/cli/devices.c:1570 ../clients/cli/devices.c:1856
-#: ../clients/cli/devices.c:2025 ../clients/cli/devices.c:2133
-#: ../clients/cli/devices.c:2322 ../clients/cli/devices.c:3683
-#: ../clients/cli/devices.c:3908 ../clients/cli/general.c:914
+#: ../clients/cli/connections.c:1900 ../clients/cli/connections.c:2473
+#: ../clients/cli/connections.c:2537 ../clients/cli/connections.c:7984
+#: ../clients/cli/connections.c:8095 ../clients/cli/connections.c:8605
+#: ../clients/cli/devices.c:1579 ../clients/cli/devices.c:1865
+#: ../clients/cli/devices.c:2034 ../clients/cli/devices.c:2142
+#: ../clients/cli/devices.c:2331 ../clients/cli/devices.c:3587
+#: ../clients/cli/devices.c:3813 ../clients/cli/general.c:928
 #, c-format
 msgid "Error: %s."
 msgstr "Помилка: %s."
 
-#: ../clients/cli/connections.c:2226
+#: ../clients/cli/connections.c:1998
 #, c-format
 msgid "no active connection on device '%s'"
 msgstr "на пристрої «%s» немає активних з’єднань"
 
-#: ../clients/cli/connections.c:2234
+#: ../clients/cli/connections.c:2006
 msgid "no active connection or device"
 msgstr "немає активних з’єднань або пристроїв"
 
-#: ../clients/cli/connections.c:2254
+#: ../clients/cli/connections.c:2026
 #, c-format
 msgid "device '%s' not compatible with connection '%s':"
 msgstr "пристрій «%s» несумісний зі з’єднанням «%s»:"
 
-#: ../clients/cli/connections.c:2287
+#: ../clients/cli/connections.c:2062
 #, c-format
 msgid "device '%s' not compatible with connection '%s'"
 msgstr "пристрій «%s» несумісний зі з’єднанням «%s»"
 
-#: ../clients/cli/connections.c:2290
+#: ../clients/cli/connections.c:2065
 #, c-format
 msgid "no device found for connection '%s'"
 msgstr "не виявлено пристрою для з’єднання «%s»"
 
-#: ../clients/cli/connections.c:2322
+#: ../clients/cli/connections.c:2093
 #, c-format
 msgid "Connection successfully activated (%s) (D-Bus active path: %s)\n"
 msgstr "З’єднання успішно задіяно (%s) (активний шлях D-Bus: %s)\n"
 
-#: ../clients/cli/connections.c:2326 ../clients/cli/connections.c:2474
-#: ../clients/cli/connections.c:6540
+#: ../clients/cli/connections.c:2097 ../clients/cli/connections.c:2245
+#: ../clients/cli/connections.c:6293
 #, c-format
 msgid "Connection successfully activated (D-Bus active path: %s)\n"
 msgstr "З’єднання успішно задіяно (активний шлях D-Bus: %s)\n"
 
-#: ../clients/cli/connections.c:2333 ../clients/cli/connections.c:2454
+#: ../clients/cli/connections.c:2104 ../clients/cli/connections.c:2225
 #, c-format
 msgid "Error: Connection activation failed: %s"
 msgstr "Помилка: не вдалося активувати з’єднання: %s"
 
-#: ../clients/cli/connections.c:2369
+#: ../clients/cli/connections.c:2140
 #, c-format
 msgid "Error: Timeout expired (%d seconds)"
 msgstr "Помилка: перевищено час очікування (%d секунд)."
 
-#: ../clients/cli/connections.c:2536
+#: ../clients/cli/connections.c:2307
 #, c-format
 msgid "failed to read passwd-file '%s': %s"
 msgstr "не вдалося прочитати файл passwd «%s»: %s"
 
-#: ../clients/cli/connections.c:2549
+#: ../clients/cli/connections.c:2320
 #, c-format
 msgid "missing colon in 'password' entry '%s'"
 msgstr "пропущено двокрапку у записі «password» «%s»"
 
-#: ../clients/cli/connections.c:2557
+#: ../clients/cli/connections.c:2328
 #, c-format
 msgid "missing dot in 'password' entry '%s'"
 msgstr "пропущено крапку у записі «password» «%s»"
 
-#: ../clients/cli/connections.c:2570
+#: ../clients/cli/connections.c:2341
 #, c-format
 msgid "invalid setting name in 'password' entry '%s'"
 msgstr "некоректна назва параметра у записі «password» «%s»"
 
-#: ../clients/cli/connections.c:2616
+#: ../clients/cli/connections.c:2389
 #, c-format
 msgid "unknown device '%s'."
 msgstr "невідомий пристрій, «%s»."
 
-#: ../clients/cli/connections.c:2621
+#: ../clients/cli/connections.c:2394
 msgid "neither a valid connection nor device given"
 msgstr "не вказано ні коректного з’єднання, ні пристрою"
 
-#: ../clients/cli/connections.c:2747 ../clients/cli/devices.c:1521
-#: ../clients/cli/devices.c:2906 ../clients/cli/devices.c:3126
-#: ../clients/cli/devices.c:3737
+#: ../clients/cli/connections.c:2520 ../clients/cli/devices.c:1530
+#: ../clients/cli/devices.c:2696 ../clients/cli/devices.c:3032
+#: ../clients/cli/devices.c:3641
 #, c-format
 msgid "Unknown parameter: %s\n"
 msgstr "Невідомий параметр: %s\n"
 
-#: ../clients/cli/connections.c:2772
+#: ../clients/cli/connections.c:2545
 msgid "preparing"
 msgstr "приготування"
 
-#: ../clients/cli/connections.c:2880
+#: ../clients/cli/connections.c:2565
 #, c-format
 msgid "Connection '%s' (%s) successfully deleted.\n"
 msgstr "Запис з’єднання «%s» (%s) успішно вилучено.\n"
 
-#: ../clients/cli/connections.c:2896
+#: ../clients/cli/connections.c:2581
 #, c-format
 msgid "Connection '%s' successfully deactivated (D-Bus active path: %s)\n"
 msgstr "З’єднання «%s» успішно вимкнено (активний шлях D-Bus: %s)\n"
 
-#: ../clients/cli/connections.c:2945 ../clients/cli/connections.c:8389
-#: ../clients/cli/connections.c:8420 ../clients/cli/connections.c:8578
+#: ../clients/cli/connections.c:2662 ../clients/cli/connections.c:8210
+#: ../clients/cli/connections.c:8242 ../clients/cli/connections.c:8399
 #, c-format
 msgid "Error: No connection specified."
 msgstr "Помилка: не вказано з’єднання."
 
-#: ../clients/cli/connections.c:2975
+#: ../clients/cli/connections.c:2703
 #, c-format
 msgid "Error: '%s' is not an active connection.\n"
 msgstr "Помилка: «%s» не є активним з’єднанням.\n"
 
-#: ../clients/cli/connections.c:2976
+#: ../clients/cli/connections.c:2704
 #, c-format
 msgid "Error: not all active connections found."
 msgstr "Помилка: не усі активні з’єднання знайдено."
 
-#: ../clients/cli/connections.c:2984
+#: ../clients/cli/connections.c:2713
 #, c-format
 msgid "Error: no active connection provided."
 msgstr "Помилка: не надано активного з’єднання."
 
-#: ../clients/cli/connections.c:3015
+#: ../clients/cli/connections.c:2747
 #, c-format
 msgid "Connection '%s' deactivation failed: %s\n"
 msgstr "Невдала спроба вимкнути з’єднання «%s»: %s\n"
 
-#: ../clients/cli/connections.c:3266 ../clients/cli/connections.c:3323
-#: ../clients/common/nm-client-utils.c:221
+#: ../clients/cli/connections.c:3003 ../clients/cli/connections.c:3060
+#: ../clients/common/nm-client-utils.c:172
 #, c-format
 msgid "'%s' not among [%s]"
 msgstr "«%s» немає серед [%s]"
 
 #. We should not really come here
-#: ../clients/cli/connections.c:3286 ../clients/cli/connections.c:3346
-#: ../clients/common/nm-client-utils.c:320
+#: ../clients/cli/connections.c:3023 ../clients/cli/connections.c:3083
+#: ../clients/common/nm-client-utils.c:270
 #, c-format
 msgid "Unknown error"
 msgstr "Невідома помилка"
 
-#: ../clients/cli/connections.c:3480
+#: ../clients/cli/connections.c:3217
 #, c-format
 msgid "Warning: master='%s' doesn't refer to any existing profile.\n"
 msgstr ""
 "Попередження: master='%s' не посилається ні на один з наявних профілів.\n"
 
-#: ../clients/cli/connections.c:3817
+#: ../clients/cli/connections.c:3554
 #, c-format
 msgid "Error: invalid property '%s': %s."
 msgstr "Помилка: некоректна властивість, «%s»: %s."
 
-#: ../clients/cli/connections.c:3834
+#: ../clients/cli/connections.c:3571
 #, c-format
 msgid "Error: failed to modify %s.%s: %s."
 msgstr "Помилка: не вдалося внести зміни до %s.%s: %s."
 
-#: ../clients/cli/connections.c:3854
+#: ../clients/cli/connections.c:3590
 #, c-format
 msgid "Error: failed to remove a value from %s.%s: %s."
 msgstr "Помилка: не вдалося вилучити значення з %s.%s: %s."
 
-#: ../clients/cli/connections.c:3888
+#: ../clients/cli/connections.c:3624
 #, c-format
 msgid "Error: '%s' is mandatory."
 msgstr "Помилка: «%s» є обов’язковим."
 
-#: ../clients/cli/connections.c:3915
+#: ../clients/cli/connections.c:3651
 #, c-format
 msgid "Error: invalid slave type; %s."
 msgstr "Помилка: некоректний тип підлеглого; %s."
 
-#: ../clients/cli/connections.c:3923
+#: ../clients/cli/connections.c:3659
 #, c-format
 msgid "Error: invalid connection type; %s."
 msgstr "Помилка: некоректний тип з’єднання; %s."
 
-#: ../clients/cli/connections.c:4000
+#: ../clients/cli/connections.c:3736
 #, c-format
 msgid "Error: bad connection type: %s"
 msgstr "Помилка: помилковий тип з’єднання: %s"
 
-#: ../clients/cli/connections.c:4046
+#: ../clients/cli/connections.c:3782
 #, c-format
 msgid "Error: '%s': %s"
 msgstr "Помилка: «%s»: %s"
 
-#: ../clients/cli/connections.c:4067
+#: ../clients/cli/connections.c:3803
 msgid "Error: master is required"
 msgstr "Помилка: слід вказати значення параметра «master»"
 
-#: ../clients/cli/connections.c:4126
+#: ../clients/cli/connections.c:3862
 #, c-format
 msgid "Error: error adding bond option '%s=%s'."
 msgstr "Помилка: помилка під час спроби додавання параметра прив’язки «%s=%s»."
 
-#: ../clients/cli/connections.c:4157
+#: ../clients/cli/connections.c:3893
 #, c-format
 msgid "Error: '%s' is not a valid monitoring mode; use '%s' or '%s'.\n"
 msgstr ""
 "Помилка: «%s» не є коректним режимом спостереження; скористайтеся «%s» або "
 "«%s».\n"
 
-#: ../clients/cli/connections.c:4188
+#: ../clients/cli/connections.c:3924
 #, c-format
 msgid "Error: 'bt-type': '%s' not valid; use [%s, %s, %s (%s), %s]."
 msgstr ""
 "Помилка: «bt-type»: «%s» є некоректним; скористайтеся значенням з переліку "
 "[%s, %s, %s (%s), %s]."
 
-#: ../clients/cli/connections.c:4437
+#: ../clients/cli/connections.c:4173
 #, c-format
 msgid "Error: value for '%s' is missing."
 msgstr "Помилка: не вказано значення «%s»."
 
-#: ../clients/cli/connections.c:4483
+#: ../clients/cli/connections.c:4219
 msgid "Error: <setting>.<property> argument is missing."
 msgstr "Помилка: пропущено аргумент <параметр>.<властивість>."
 
-#: ../clients/cli/connections.c:4506
+#: ../clients/cli/connections.c:4242
 #, c-format
 msgid "Error: invalid or not allowed setting '%s': %s."
 msgstr "Помилка: некоректний або заборонений параметр, «%s»: %s."
 
-#: ../clients/cli/connections.c:4552 ../clients/cli/connections.c:4568
+#: ../clients/cli/connections.c:4288 ../clients/cli/connections.c:4304
 #, c-format
 msgid "Error: '%s' is ambiguous (%s.%s or %s.%s)."
 msgstr "Помилка: «%s» є неоднозначним (%s.%s або %s.%s)."
 
-#: ../clients/cli/connections.c:4586
+#: ../clients/cli/connections.c:4322
 #, c-format
 msgid "Error: invalid <setting>.<property> '%s'."
 msgstr "Помилка: некоректний аргумент <параметр>.<властивість>, «%s»."
 
-#: ../clients/cli/connections.c:4630 ../clients/cli/connections.c:8222
+#: ../clients/cli/connections.c:4366 ../clients/cli/connections.c:8035
 #, c-format
 msgid "Error: Failed to add '%s' connection: %s"
 msgstr "Помилка: не вдалося додати з’єднання «%s»: %s"
 
-#: ../clients/cli/connections.c:4648
+#: ../clients/cli/connections.c:4384
 #, c-format
 msgid ""
 "Warning: There is another connection with the name '%1$s'. Reference the "
@@ -1485,47 +1362,12 @@ msgstr[3] ""
 "Попередження: існує інше з'єднання з назвою «%1$s». Посилайтеся на з'єднання "
 "за його UUID, «%2$s»\n"
 
-#: ../clients/cli/connections.c:4657
+#: ../clients/cli/connections.c:4393
 #, c-format
 msgid "Connection '%s' (%s) successfully added.\n"
 msgstr "Запис з’єднання «%s» (%s) успішно додано.\n"
 
-#: ../clients/cli/connections.c:4710 ../clients/cli/connections.c:6657
-#: ../clients/cli/connections.c:6658 ../clients/cli/devices.c:876
-#: ../clients/cli/devices.c:1164 ../clients/cli/devices.c:1165
-#: ../clients/cli/devices.c:1166 ../clients/cli/devices.c:1167
-#: ../clients/cli/devices.c:1168 ../clients/cli/devices.c:1205
-#: ../clients/cli/devices.c:1207 ../clients/cli/devices.c:1208
-#: ../clients/cli/devices.c:1238 ../clients/cli/devices.c:1239
-#: ../clients/cli/devices.c:1240 ../clients/cli/devices.c:1241
-#: ../clients/cli/devices.c:1242 ../clients/cli/devices.c:1243
-#: ../clients/cli/devices.c:1244 ../clients/cli/devices.c:1246
-#: ../clients/cli/devices.c:1248 ../clients/cli/general.c:157
-#: ../clients/cli/utils.h:220 ../clients/common/nm-client-utils.c:301
-#: ../clients/common/nm-meta-setting-desc.c:754
-#: ../clients/common/nm-meta-setting-desc.c:2704
-msgid "no"
-msgstr "ні"
-
-#. "CAPABILITIES"
-#: ../clients/cli/connections.c:4711 ../clients/cli/connections.c:6657
-#: ../clients/cli/connections.c:6658 ../clients/cli/devices.c:876
-#: ../clients/cli/devices.c:1164 ../clients/cli/devices.c:1165
-#: ../clients/cli/devices.c:1166 ../clients/cli/devices.c:1167
-#: ../clients/cli/devices.c:1168 ../clients/cli/devices.c:1205
-#: ../clients/cli/devices.c:1207 ../clients/cli/devices.c:1208
-#: ../clients/cli/devices.c:1238 ../clients/cli/devices.c:1239
-#: ../clients/cli/devices.c:1240 ../clients/cli/devices.c:1241
-#: ../clients/cli/devices.c:1242 ../clients/cli/devices.c:1243
-#: ../clients/cli/devices.c:1244 ../clients/cli/devices.c:1246
-#: ../clients/cli/devices.c:1248 ../clients/cli/general.c:156
-#: ../clients/cli/utils.h:220 ../clients/common/nm-client-utils.c:299
-#: ../clients/common/nm-meta-setting-desc.c:754
-#: ../clients/common/nm-meta-setting-desc.c:2701
-msgid "yes"
-msgstr "так"
-
-#: ../clients/cli/connections.c:4795
+#: ../clients/cli/connections.c:4531
 #, c-format
 msgid ""
 "You can specify this option more than once. Press <Enter> when you're done.\n"
@@ -1534,7 +1376,7 @@ msgstr ""
 "завершите.\n"
 
 #. Ask for optional arguments.
-#: ../clients/cli/connections.c:4894
+#: ../clients/cli/connections.c:4630
 #, c-format
 msgid "There is %d optional setting for %s.\n"
 msgid_plural "There are %d optional settings for %s.\n"
@@ -1543,7 +1385,7 @@ msgstr[1] "Для «%2$s» передбачено %1$d додатковий па
 msgstr[2] "Для з’єднань типу «%2$s» передбачено %1$d додаткових аргументів.\n"
 msgstr[3] "Для з’єднань типу «%2$s» передбачено %1$d додатковий аргумент.\n"
 
-#: ../clients/cli/connections.c:4897
+#: ../clients/cli/connections.c:4633
 #, c-format
 msgid "Do you want to provide it? %s"
 msgid_plural "Do you want to provide them? %s"
@@ -1552,22 +1394,22 @@ msgstr[1] "Хочете вказати їх? %s"
 msgstr[2] "Хочете вказати їх? %s"
 msgstr[3] "Хочете вказати його? %s"
 
-#: ../clients/cli/connections.c:5030 ../clients/cli/utils.c:292
+#: ../clients/cli/connections.c:4769 ../clients/cli/utils.c:303
 #, c-format
 msgid "Error: value for '%s' argument is required."
 msgstr "Помилка: слід вказати значення «%s» аргументу."
 
-#: ../clients/cli/connections.c:5037
+#: ../clients/cli/connections.c:4775
 #, c-format
 msgid "Error: 'save': %s."
 msgstr "Помилка: «save»: %s."
 
-#: ../clients/cli/connections.c:5123 ../clients/cli/connections.c:5134
+#: ../clients/cli/connections.c:4863 ../clients/cli/connections.c:4874
 #, c-format
 msgid "Error: '%s' argument is required."
 msgstr "Помилка: слід вказати параметр «%s»."
 
-#: ../clients/cli/connections.c:6099
+#: ../clients/cli/connections.c:5852
 #, c-format
 msgid "['%s' setting values]\n"
 msgstr "['%s' значення параметра]\n"
@@ -1575,7 +1417,7 @@ msgstr "['%s' значення параметра]\n"
 #. TRANSLATORS: do not translate command names and keywords before ::
 #. *              However, you should translate terms enclosed in <>.
 #.
-#: ../clients/cli/connections.c:6208
+#: ../clients/cli/connections.c:5961
 #, c-format
 msgid ""
 "---[ Main menu ]---\n"
@@ -1609,7 +1451,7 @@ msgstr ""
 "nmcli    <параметр-налашт.> <знач.>   :: налаштовування nmcli\n"
 "quit                                  :: завершити роботу nmcli\n"
 
-#: ../clients/cli/connections.c:6235
+#: ../clients/cli/connections.c:5988
 #, c-format
 msgid ""
 "goto <setting>[.<prop>] | <prop>  :: enter setting/property for editing\n"
@@ -1630,7 +1472,7 @@ msgstr ""
 "          nmcli connection> goto secondaries\n"
 "          nmcli> goto ipv4.addresses\n"
 
-#: ../clients/cli/connections.c:6242
+#: ../clients/cli/connections.c:5995
 #, c-format
 msgid ""
 "remove <setting>[.<prop>]  :: remove setting or reset property value\n"
@@ -1652,7 +1494,7 @@ msgstr ""
 "Приклади: nmcli> remove wifi-sec\n"
 "          nmcli> remove eth.mtu\n"
 
-#: ../clients/cli/connections.c:6249
+#: ../clients/cli/connections.c:6002
 #, c-format
 msgid ""
 "set [<setting>.<prop> <value>]  :: set property value\n"
@@ -1668,7 +1510,7 @@ msgstr ""
 "\n"
 "Приклад: nmcli> s con.id My connection\n"
 
-#: ../clients/cli/connections.c:6254
+#: ../clients/cli/connections.c:6007
 #, c-format
 msgid ""
 "describe [<setting>.<prop>]  :: describe property\n"
@@ -1681,7 +1523,7 @@ msgstr ""
 "Показує опис властивості. Список усіх параметрів і властивостей NM можна "
 "знайти на сторінці довідника (man) nm-settings(5).\n"
 
-#: ../clients/cli/connections.c:6259
+#: ../clients/cli/connections.c:6012
 #, c-format
 msgid ""
 "print [all]  :: print setting or connection values\n"
@@ -1696,7 +1538,7 @@ msgstr ""
 "\n"
 "Приклад: nmcli ipv4> print all\n"
 
-#: ../clients/cli/connections.c:6264
+#: ../clients/cli/connections.c:6017
 #, c-format
 msgid ""
 "verify [all | fix]  :: verify setting or connection validity\n"
@@ -1721,7 +1563,7 @@ msgstr ""
 "          nmcli> verify fix\n"
 "          nmcli bond> verify\n"
 
-#: ../clients/cli/connections.c:6273
+#: ../clients/cli/connections.c:6026
 #, c-format
 msgid ""
 "save [persistent|temporary]  :: save the connection\n"
@@ -1748,7 +1590,7 @@ msgstr ""
 "потрібно\n"
 "повністю вилучити постійне з’єднання, вам доведеться вилучити його профіль.\n"
 
-#: ../clients/cli/connections.c:6284
+#: ../clients/cli/connections.c:6037
 #, c-format
 msgid ""
 "activate [<ifname>] [/<ap>|<nsp>]  :: activate the connection\n"
@@ -1769,7 +1611,7 @@ msgstr ""
 "/<ap>|<nsp> - AP (Wi-Fi) або NSP (WiMAX) (додайте на початку «/», якщо не "
 "вказано <інтерфейс>)\n"
 
-#: ../clients/cli/connections.c:6291 ../clients/cli/connections.c:6449
+#: ../clients/cli/connections.c:6044 ../clients/cli/connections.c:6202
 #, c-format
 msgid ""
 "back  :: go to upper menu level\n"
@@ -1778,7 +1620,7 @@ msgstr ""
 "back  :: піднятися у меню на один рівень\n"
 "\n"
 
-#: ../clients/cli/connections.c:6294
+#: ../clients/cli/connections.c:6047
 #, c-format
 msgid ""
 "help/? [<command>]  :: help for the nmcli commands\n"
@@ -1787,7 +1629,7 @@ msgstr ""
 "help/? [<команда>]  :: довідка з команди nmcli\n"
 "\n"
 
-#: ../clients/cli/connections.c:6297
+#: ../clients/cli/connections.c:6050
 #, c-format
 msgid ""
 "nmcli [<conf-option> <value>]  :: nmcli configuration\n"
@@ -1814,7 +1656,7 @@ msgstr ""
 "          nmcli> nmcli save-confirmation no\n"
 "          nmcli> nmcli prompt-color 3\n"
 
-#: ../clients/cli/connections.c:6319 ../clients/cli/connections.c:6455
+#: ../clients/cli/connections.c:6072 ../clients/cli/connections.c:6208
 #, c-format
 msgid ""
 "quit  :: exit nmcli\n"
@@ -1828,8 +1670,8 @@ msgstr ""
 "запис з’єднання не було збережено, користувачеві буде запропоновано "
 "підтвердити дію з виходу з програми.\n"
 
-#: ../clients/cli/connections.c:6324 ../clients/cli/connections.c:6460
-#: ../clients/cli/connections.c:6879 ../clients/cli/connections.c:7806
+#: ../clients/cli/connections.c:6077 ../clients/cli/connections.c:6213
+#: ../clients/cli/connections.c:6649 ../clients/cli/connections.c:7603
 #, c-format
 msgid "Unknown command: '%s'\n"
 msgstr "Невідома команда «%s».\n"
@@ -1837,7 +1679,7 @@ msgstr "Невідома команда «%s».\n"
 #. TRANSLATORS: do not translate command names and keywords before ::
 #. *              However, you should translate terms enclosed in <>.
 #.
-#: ../clients/cli/connections.c:6389
+#: ../clients/cli/connections.c:6142
 #, c-format
 msgid ""
 "---[ Property menu ]---\n"
@@ -1864,7 +1706,7 @@ msgstr ""
 "help/?   [<команда>]             :: вивести цю довідку або опис команди\n"
 "quit                             :: вийти з nmcli\n"
 
-#: ../clients/cli/connections.c:6414
+#: ../clients/cli/connections.c:6167
 #, c-format
 msgid ""
 "set [<value>]  :: set new value\n"
@@ -1876,7 +1718,7 @@ msgstr ""
 "За допомогою цієї команди можна змінити значення властивості на вказане "
 "<значення>\n"
 
-#: ../clients/cli/connections.c:6418
+#: ../clients/cli/connections.c:6171
 #, c-format
 msgid ""
 "add [<value>]  :: append new value to the property\n"
@@ -1891,7 +1733,7 @@ msgstr ""
 "якщо властивість належить до типу контейнерів. Якщо властивість складається "
 "лише з одного значення, це значення буде замінено (те саме, що і «set»).\n"
 
-#: ../clients/cli/connections.c:6424
+#: ../clients/cli/connections.c:6177
 #, c-format
 msgid ""
 "change  :: change current value\n"
@@ -1902,7 +1744,7 @@ msgstr ""
 "\n"
 "Показує поточне значення і надає змогу його редагувати.\n"
 
-#: ../clients/cli/connections.c:6428
+#: ../clients/cli/connections.c:6181
 #, c-format
 msgid ""
 "remove [<value>|<index>|<option name>]  :: delete the value\n"
@@ -1935,7 +1777,7 @@ msgstr ""
 "          nmcli bond.options> remove downdelay\n"
 "\n"
 
-#: ../clients/cli/connections.c:6439
+#: ../clients/cli/connections.c:6192
 #, c-format
 msgid ""
 "describe  :: describe property\n"
@@ -1948,7 +1790,7 @@ msgstr ""
 "Показує опис властивості. Список усіх параметрів і властивостей NM можна "
 "знайти на сторінці довідника (man) nm-settings(5).\n"
 
-#: ../clients/cli/connections.c:6444
+#: ../clients/cli/connections.c:6197
 #, c-format
 msgid ""
 "print [property|setting|connection]  :: print property (setting, connection) "
@@ -1963,7 +1805,7 @@ msgstr ""
 "Виводить значення властивості. За допомогою аргументу команди ви можете "
 "виводити значення усього параметра або усього запису з’єднання.\n"
 
-#: ../clients/cli/connections.c:6452
+#: ../clients/cli/connections.c:6205
 #, c-format
 msgid ""
 "help/? [<command>]  :: help for nmcli commands\n"
@@ -1972,29 +1814,29 @@ msgstr ""
 "help/? [<команда>]  :: довідка з команди nmcli\n"
 "\n"
 
-#: ../clients/cli/connections.c:6546
+#: ../clients/cli/connections.c:6299
 #, c-format
 msgid "Error: Connection activation failed.\n"
 msgstr "Помилка: невдала спроба активації з’єднання.\n"
 
-#: ../clients/cli/connections.c:6637
+#: ../clients/cli/connections.c:6394
 #, c-format
 msgid "Error: setting '%s' is mandatory and cannot be removed.\n"
 msgstr "Помилка: параметр «%s» є обов’язковим, його не можна вилучати.\n"
 
 #. TRANSLATORS: status line in nmcli connection editor
-#: ../clients/cli/connections.c:6655
+#: ../clients/cli/connections.c:6412
 #, c-format
 msgid "[ Type: %s | Name: %s | UUID: %s | Dirty: %s | Temp: %s ]\n"
 msgstr "[ Тип: %s | Назва: %s | UUID: %s | Не збережено: %s | Тимч.: %s ]\n"
 
-#: ../clients/cli/connections.c:6691
+#: ../clients/cli/connections.c:6448
 #, c-format
 msgid "The connection is not saved. Do you really want to quit? %s"
 msgstr ""
 "З’єднання не збережено. Ви справді хочете завершити роботу програми? %s"
 
-#: ../clients/cli/connections.c:6737
+#: ../clients/cli/connections.c:6497
 #, c-format
 msgid ""
 "The connection profile has been removed from another client. You may type "
@@ -2003,66 +1845,66 @@ msgstr ""
 "Профіль з’єднання було вилучено з іншого клієнта. Ви можете ввести «save» у "
 "головному меню, щоб відновити його.\n"
 
-#: ../clients/cli/connections.c:6768 ../clients/cli/connections.c:7160
-#: ../clients/cli/connections.c:7218
+#: ../clients/cli/connections.c:6527 ../clients/cli/connections.c:6938
+#: ../clients/cli/connections.c:6996
 #, c-format
 msgid "Allowed values for '%s' property: %s\n"
 msgstr "Можливі значення властивості «%s»: %s\n"
 
-#: ../clients/cli/connections.c:6771 ../clients/cli/connections.c:7163
-#: ../clients/cli/connections.c:7221
+#: ../clients/cli/connections.c:6530 ../clients/cli/connections.c:6941
+#: ../clients/cli/connections.c:6999
 #, c-format
 msgid "Enter '%s' value: "
 msgstr "Введіть значення «%s»: "
 
-#: ../clients/cli/connections.c:6785 ../clients/cli/connections.c:6805
-#: ../clients/cli/connections.c:7167 ../clients/cli/connections.c:7226
+#: ../clients/cli/connections.c:6545 ../clients/cli/connections.c:6567
+#: ../clients/cli/connections.c:6945 ../clients/cli/connections.c:7004
 #, c-format
 msgid "Error: failed to set '%s' property: %s\n"
 msgstr "Помилка: не вдалося встановити значення властивості «%s»: %s\n"
 
-#: ../clients/cli/connections.c:6799
+#: ../clients/cli/connections.c:6561
 #, c-format
 msgid "Edit '%s' value: "
 msgstr "Редагування значення «%s»: "
 
-#: ../clients/cli/connections.c:6825 ../clients/cli/settings.c:394
+#: ../clients/cli/connections.c:6590 ../clients/cli/settings.c:394
 #, c-format
 msgid "Error: %s\n"
 msgstr "Помилка: %s\n"
 
-#: ../clients/cli/connections.c:6831 ../clients/cli/connections.c:7321
-#: ../clients/cli/connections.c:7372
+#: ../clients/cli/connections.c:6596 ../clients/cli/connections.c:7099
+#: ../clients/cli/connections.c:7150
 #, c-format
 msgid "Error: failed to remove value of '%s': %s\n"
 msgstr "Помилка: не вдалося вилучити значення «%s»: %s\n"
 
-#: ../clients/cli/connections.c:6852
+#: ../clients/cli/connections.c:6617
 #, c-format
 msgid "Unknown command argument: '%s'\n"
 msgstr "Невідомий аргумент команди: «%s»\n"
 
-#: ../clients/cli/connections.c:6942
+#: ../clients/cli/connections.c:6717
 #, c-format
 msgid "Available settings: %s\n"
 msgstr "Доступні параметри: %s\n"
 
-#: ../clients/cli/connections.c:6954
+#: ../clients/cli/connections.c:6729
 #, c-format
 msgid "Error: invalid setting name; %s\n"
 msgstr "Помилка: некоректна назва параметра; %s\n"
 
-#: ../clients/cli/connections.c:6971
+#: ../clients/cli/connections.c:6746
 #, c-format
 msgid "Available properties: %s\n"
 msgstr "Доступні властивості: %s\n"
 
-#: ../clients/cli/connections.c:6979
+#: ../clients/cli/connections.c:6754
 #, c-format
 msgid "Error: property %s\n"
 msgstr "Помилка: властивість %s\n"
 
-#: ../clients/cli/connections.c:7020
+#: ../clients/cli/connections.c:6795
 #, c-format
 msgid ""
 "Saving the connection with 'autoconnect=yes'. That might result in an "
@@ -2073,12 +1915,12 @@ msgstr ""
 "значення параметра може призвести до негайного задіяння з’єднання.\n"
 "Хочете зберегти запис? %s"
 
-#: ../clients/cli/connections.c:7099
+#: ../clients/cli/connections.c:6878
 #, c-format
 msgid "You may edit the following settings: %s\n"
 msgstr "Можна редагувати такі параметри: %s\n"
 
-#: ../clients/cli/connections.c:7128
+#: ../clients/cli/connections.c:6908
 #, c-format
 msgid ""
 "The connection profile has been removed from another client. You may type "
@@ -2087,223 +1929,225 @@ msgstr ""
 "Профіль з’єднання було вилучено з іншого клієнта. Ви можете ввести «save», "
 "щоб відновити його.\n"
 
-#: ../clients/cli/connections.c:7171 ../clients/cli/connections.c:7416
-#: ../clients/cli/connections.c:7448
+#: ../clients/cli/connections.c:6949 ../clients/cli/connections.c:7194
+#: ../clients/cli/connections.c:7226
 #, c-format
 msgid "Error: no setting selected; valid are [%s]\n"
 msgstr ""
 "Помилка: не вибрано значення параметра; коректними значеннями є такі: [%s]\n"
 
-#: ../clients/cli/connections.c:7172
+#: ../clients/cli/connections.c:6950
 #, c-format
 msgid "use 'goto <setting>' first, or 'set <setting>.<property>'\n"
 msgstr ""
 "спочатку скористайтеся командою «goto <параметр>» або командою «set "
 "<параметр>.<властивість>»\n"
 
-#: ../clients/cli/connections.c:7187 ../clients/cli/connections.c:7348
-#: ../clients/cli/connections.c:7438
+#: ../clients/cli/connections.c:6965 ../clients/cli/connections.c:7126
+#: ../clients/cli/connections.c:7216
 #, c-format
 msgid "Error: invalid setting argument '%s'; valid are [%s]\n"
 msgstr ""
 "Помилка: некоректний аргумент параметра, «%s»; коректними є такі ПАРАМЕТРИ: "
 "[%s]\n"
 
-#: ../clients/cli/connections.c:7196
+#: ../clients/cli/connections.c:6974
 #, c-format
 msgid "Error: missing setting for '%s' property\n"
 msgstr "Помилка: не вказано параметра для властивості «%s»\n"
 
-#: ../clients/cli/connections.c:7203
+#: ../clients/cli/connections.c:6981
 #, c-format
 msgid "Error: invalid property: %s\n"
 msgstr "Помилка: некоректна властивість: %s\n"
 
-#: ../clients/cli/connections.c:7257
+#: ../clients/cli/connections.c:7035
 #, c-format
 msgid "Error: unknown setting '%s'\n"
 msgstr "Помилка: невідоме значення «%s»\n"
 
-#: ../clients/cli/connections.c:7282
+#: ../clients/cli/connections.c:7060
 #, c-format
 msgid "You may edit the following properties: %s\n"
 msgstr "Можна редагувати значення таких властивостей: %s\n"
 
-#: ../clients/cli/connections.c:7326
+#: ../clients/cli/connections.c:7104
 #, c-format
 msgid "Error: no argument given; valid are [%s]\n"
 msgstr "Помилка: не вказано аргументу; коректними аргументами є такі: [%s]\n"
 
-#: ../clients/cli/connections.c:7345
+#: ../clients/cli/connections.c:7123
 #, c-format
 msgid "Setting '%s' is not present in the connection.\n"
 msgstr "У з’єднання немає параметра «%s».\n"
 
-#: ../clients/cli/connections.c:7393
+#: ../clients/cli/connections.c:7171
 #, c-format
 msgid "Error: %s properties, nor it is a setting name.\n"
 msgstr "Помилка: властивості %s і не є назвою параметра.\n"
 
-#: ../clients/cli/connections.c:7417 ../clients/cli/connections.c:7449
+#: ../clients/cli/connections.c:7195 ../clients/cli/connections.c:7227
 #, c-format
 msgid "use 'goto <setting>' first, or 'describe <setting>.<property>'\n"
 msgstr ""
 "скористайтеся спочатку командою «goto <параметр> або командою «describe "
 "<параметр>.<властивість>»\n"
 
-#: ../clients/cli/connections.c:7472
+#: ../clients/cli/connections.c:7250
 #, c-format
 msgid "Error: invalid property: %s, neither a valid setting name.\n"
 msgstr ""
 "Помилка: некоректна властивість: %s і не є коректною назвою параметра.\n"
 
-#: ../clients/cli/connections.c:7502
+#: ../clients/cli/connections.c:7280
 #, c-format
 msgid "Error: unknown setting: '%s'\n"
 msgstr "Помилка: невідомий параметр: «%s»\n"
 
-#: ../clients/cli/connections.c:7507
+#: ../clients/cli/connections.c:7285
 #, c-format
 msgid "Error: '%s' setting not present in the connection\n"
 msgstr "Помилка: у з’єднання немає параметра «%s».\n"
 
-#: ../clients/cli/connections.c:7538
+#: ../clients/cli/connections.c:7316
 #, c-format
 msgid "Error: invalid property: %s%s\n"
 msgstr "Помилка: некоректна властивість: %s%s\n"
 
-#: ../clients/cli/connections.c:7540
+#: ../clients/cli/connections.c:7318
 msgid ", neither a valid setting name"
 msgstr ", і не є коректною назвою параметра"
 
-#: ../clients/cli/connections.c:7556
+#: ../clients/cli/connections.c:7334
 #, c-format
 msgid "Invalid verify option: %s\n"
 msgstr "Некоректний параметр verify: %s\n"
 
-#: ../clients/cli/connections.c:7564
+#: ../clients/cli/connections.c:7342
 #, c-format
 msgid "Verify setting '%s': %s\n"
 msgstr "Перевірка параметра «%s»: %s\n"
 
-#: ../clients/cli/connections.c:7579
+#: ../clients/cli/connections.c:7357
 #, c-format
 msgid "Verify connection: %s\n"
 msgstr "Перевірка з’єднання: %s\n"
 
-#: ../clients/cli/connections.c:7582
+#: ../clients/cli/connections.c:7360
 #, c-format
 msgid "The error cannot be fixed automatically.\n"
 msgstr "Помилку не можна виправити у автоматичному режимі.\n"
 
-#: ../clients/cli/connections.c:7599
+#: ../clients/cli/connections.c:7377
 #, c-format
 msgid "Error: invalid argument '%s'\n"
 msgstr "Помилка: некоректний аргумент «%s»\n"
 
-#: ../clients/cli/connections.c:7631
+#: ../clients/cli/connections.c:7409
 #, c-format
 msgid "Error: Failed to save '%s' (%s) connection: %s\n"
 msgstr "Помилка: не вдалося додати з’єднання «%s» (%s): %s\n"
 
-#: ../clients/cli/connections.c:7638
+#: ../clients/cli/connections.c:7416
 #, c-format
 msgid "Connection '%s' (%s) successfully saved.\n"
 msgstr "Запис з’єднання «%s» (%s) успішно збережено.\n"
 
-#: ../clients/cli/connections.c:7639
+#: ../clients/cli/connections.c:7417
 #, c-format
 msgid "Connection '%s' (%s) successfully updated.\n"
 msgstr "Запис з’єднання «%s» (%s) успішно оновлено.\n"
 
-#: ../clients/cli/connections.c:7671
+#: ../clients/cli/connections.c:7449
 #, c-format
 msgid "Error: connection verification failed: %s\n"
 msgstr "Помилка: з’єднання не пройшло перевірки: %s\n"
 
-#: ../clients/cli/connections.c:7672
+#: ../clients/cli/connections.c:7450
 msgid "(unknown error)"
 msgstr "(невідома помилка)"
 
-#: ../clients/cli/connections.c:7673
+#: ../clients/cli/connections.c:7451
 #, c-format
 msgid "You may try running 'verify fix' to fix errors.\n"
 msgstr "Ви можете спробувати запустити «verify fix» для виправлення помилок.\n"
 
-#: ../clients/cli/connections.c:7695
+#: ../clients/cli/connections.c:7473
 #, c-format
 msgid "Error: connection is not saved. Type 'save' first.\n"
 msgstr "Помилка: з’єднання не збережено. Спочатку введіть «save».\n"
 
-#: ../clients/cli/connections.c:7699
+#: ../clients/cli/connections.c:7477
 #, c-format
 msgid "Error: connection is not valid: %s\n"
 msgstr "Помилка: некоректне з’єднання: %s\n"
 
-#: ../clients/cli/connections.c:7709
+#: ../clients/cli/connections.c:7487
 #, c-format
 msgid "Error: Cannot activate connection: %s.\n"
 msgstr "Помилка: не вдалося задіяти з’єднання: %s.\n"
 
-#: ../clients/cli/connections.c:7718
+#: ../clients/cli/connections.c:7496
 #, c-format
 msgid "Error: Failed to activate '%s' (%s) connection: %s\n"
 msgstr "Помилка: не вдалося задіяти з’єднання «%s» (%s): %s\n"
 
-#: ../clients/cli/connections.c:7724
+#: ../clients/cli/connections.c:7502
 msgid "Monitoring connection activation (press any key to continue)\n"
 msgstr ""
 "Спостерігаємо за активацією з’єднання (натисніть будь-яку клавішу, щоб "
 "продовжити)\n"
 
-#: ../clients/cli/connections.c:7760
+#: ../clients/cli/connections.c:7538
 #, c-format
 msgid "Error: status-line: %s\n"
 msgstr "Помилка: рядок стану: %s\n"
 
-#: ../clients/cli/connections.c:7768
+#: ../clients/cli/connections.c:7546
 #, c-format
 msgid "Error: save-confirmation: %s\n"
 msgstr "Помилка: save-confirmation: %s\n"
 
-#: ../clients/cli/connections.c:7776
+#: ../clients/cli/connections.c:7554
 #, c-format
 msgid "Error: show-secrets: %s\n"
 msgstr "Помилка: show-secrets: %s\n"
 
-#: ../clients/cli/connections.c:7783
+#: ../clients/cli/connections.c:7563
+#, c-format
+msgid "Error: bad color: %s\n"
+msgstr "Помилка: некоректний колір: %s\n"
+
+#: ../clients/cli/connections.c:7578
 #, c-format
 msgid "Current nmcli configuration:\n"
 msgstr "Поточне налаштування nmcli:\n"
 
-#: ../clients/cli/connections.c:7791
+#: ../clients/cli/connections.c:7588
 #, c-format
 msgid "Invalid configuration option '%s'; allowed [%s]\n"
 msgstr ""
 "Некоректний параметр налаштування, «%s»; можна використовувати лише такі: "
 "[%s]\n"
 
-#: ../clients/cli/connections.c:8009
+#: ../clients/cli/connections.c:7808
 #, c-format
-#| msgid "Error: only one of 'id', uuid, or 'path' can be provided."
-msgid "Error: only one of 'id', 'filename', uuid, or 'path' can be provided."
-msgstr ""
-"Помилка: можна вказувати лише один з параметрів «id», «filename», uuid або"
-" «path»."
+msgid "Error: only one of 'id', uuid, or 'path' can be provided."
+msgstr "Помилка: можна вказувати лише один з параметрів «id», uuid або «path»."
 
-#: ../clients/cli/connections.c:8023 ../clients/cli/connections.c:8183
+#: ../clients/cli/connections.c:7823 ../clients/cli/connections.c:7992
 #, c-format
 msgid "Error: Unknown connection '%s'."
 msgstr "Помилка: невідоме з’єднання, «%s»."
 
-#: ../clients/cli/connections.c:8039
+#: ../clients/cli/connections.c:7841
 #, c-format
 msgid "Warning: editing existing connection '%s'; 'type' argument is ignored\n"
 msgstr ""
 "Попередження: редагування вже створеного запису з’єднання «%s»; аргумент "
 "«type» проігноровано\n"
 
-#: ../clients/cli/connections.c:8042
+#: ../clients/cli/connections.c:7844
 #, c-format
 msgid ""
 "Warning: editing existing connection '%s'; 'con-name' argument is ignored\n"
@@ -2311,204 +2155,199 @@ msgstr ""
 "Попередження: редагування вже створеного запису з’єднання «%s»; аргумент "
 "«con-name» проігноровано\n"
 
-#: ../clients/cli/connections.c:8069
+#: ../clients/cli/connections.c:7866
 #, c-format
 msgid "Valid connection types: %s\n"
 msgstr "Коректні типи з’єднань: %s\n"
 
-#: ../clients/cli/connections.c:8071
+#: ../clients/cli/connections.c:7868
 #, c-format
 msgid "Error: invalid connection type; %s\n"
 msgstr "Помилка: некоректний тип з’єднання; %s\n"
 
-#: ../clients/cli/connections.c:8106
+#: ../clients/cli/connections.c:7908
 #, c-format
 msgid "===| nmcli interactive connection editor |==="
 msgstr "===| Інтерактивний редактор з’єднань nmcli |==="
 
-#: ../clients/cli/connections.c:8109
+#: ../clients/cli/connections.c:7911
 #, c-format
 msgid "Editing existing '%s' connection: '%s'"
 msgstr "Редагування наявного з’єднання «%s»: «%s»"
 
-#: ../clients/cli/connections.c:8111
+#: ../clients/cli/connections.c:7913
 #, c-format
 msgid "Adding a new '%s' connection"
 msgstr "Додавання нового з’єднання «%s»"
 
-#: ../clients/cli/connections.c:8113
+#: ../clients/cli/connections.c:7915
 #, c-format
 msgid "Type 'help' or '?' for available commands."
 msgstr "Введіть «help» або «?», щоб ознайомитися зі списком доступних команд."
 
-#: ../clients/cli/connections.c:8115
-#, c-format
-msgid "Type 'print' to show all the connection properties."
-msgstr "Введіть «print», щоб побачити усі властивості з'єднання."
-
-#: ../clients/cli/connections.c:8117
+#: ../clients/cli/connections.c:7917
 #, c-format
 msgid "Type 'describe [<setting>.<prop>]' for detailed property description."
 msgstr ""
 "Щоб ознайомитися з докладним описом властивості, скористайтеся командою "
 "«describe [<параметр>.<властивість>]."
 
-#: ../clients/cli/connections.c:8145
+#: ../clients/cli/connections.c:7952
 #, c-format
 msgid "Error: Failed to modify connection '%s': %s"
 msgstr "Помилка: не вдалося внести зміни до запису з’єднання «%s»: %s"
 
-#: ../clients/cli/connections.c:8151
+#: ../clients/cli/connections.c:7959
 #, c-format
 msgid "Connection '%s' (%s) successfully modified.\n"
 msgstr "Зміни до з’єднання «%s» (%s) успішно внесено.\n"
 
-#: ../clients/cli/connections.c:8227
+#: ../clients/cli/connections.c:8040
 #, c-format
 msgid "%s (%s) cloned as %s (%s).\n"
 msgstr "%s (%s) клоновано як %s (%s).\n"
 
-#: ../clients/cli/connections.c:8292
+#: ../clients/cli/connections.c:8106
 msgid "New connection name: "
 msgstr "Нова назва з’єднання: "
 
-#: ../clients/cli/connections.c:8294
+#: ../clients/cli/connections.c:8108
 #, c-format
 msgid "Error: <new name> argument is missing."
 msgstr "Помилка: не вказано параметр <нова назва>."
 
-#: ../clients/cli/connections.c:8299 ../clients/cli/connections.c:8779
+#: ../clients/cli/connections.c:8114 ../clients/cli/connections.c:8616
 #, c-format
 msgid "Error: unknown extra argument: '%s'."
 msgstr "Помилка: невідомий зайвий параметр: «%s»."
 
-#: ../clients/cli/connections.c:8344
+#: ../clients/cli/connections.c:8165
 #, c-format
 msgid "Error: not all connections deleted."
 msgstr "Помилка: вилучено не усі з’єднання."
 
-#: ../clients/cli/connections.c:8345
+#: ../clients/cli/connections.c:8166
 #, c-format
 msgid "Error: Connection deletion failed: %s"
 msgstr "Помилка: не вдалося вилучити з’єднання: %s"
 
-#: ../clients/cli/connections.c:8401 ../clients/cli/connections.c:8522
+#: ../clients/cli/connections.c:8227 ../clients/cli/connections.c:8352
 #, c-format
 msgid "Error: %s.\n"
 msgstr "Помилка: %s.\n"
 
-#: ../clients/cli/connections.c:8402 ../clients/cli/connections.c:8523
+#: ../clients/cli/connections.c:8228 ../clients/cli/connections.c:8353
 #, c-format
 msgid "Error: not all connections found."
 msgstr "Помилка: знайдено не усі з’єднання."
 
 #. truncate trailing ", "
-#: ../clients/cli/connections.c:8453
+#: ../clients/cli/connections.c:8271
 #, c-format
 msgid "Error: cannot delete unknown connection(s): %s."
 msgstr "Помилка: не можна вилучати невідомі з’єднання: %s."
 
-#: ../clients/cli/connections.c:8463
+#: ../clients/cli/connections.c:8283
 #, c-format
 msgid "%s: connection profile changed\n"
 msgstr "%s: змінено профіль з’єднання\n"
 
-#: ../clients/cli/connections.c:8489
+#: ../clients/cli/connections.c:8309
 #, c-format
 msgid "%s: connection profile created\n"
 msgstr "%s: створено профіль з’єднання\n"
 
-#: ../clients/cli/connections.c:8498
+#: ../clients/cli/connections.c:8318
 #, c-format
 msgid "%s: connection profile removed\n"
 msgstr "%s: вилучено профіль з’єднання\n"
 
-#: ../clients/cli/connections.c:8560
+#: ../clients/cli/connections.c:8381
 #, c-format
 msgid "Error: failed to reload connections: %s."
 msgstr "Помилка: не вдалося перезавантажити з’єднання: %s."
 
-#: ../clients/cli/connections.c:8593
+#: ../clients/cli/connections.c:8414
 #, c-format
 msgid "Error: failed to load connection: %s."
 msgstr "Помилка: не вдалося завантажити з’єднання: %s."
 
-#: ../clients/cli/connections.c:8601
+#: ../clients/cli/connections.c:8422
 #, c-format
 msgid "Could not load file '%s'\n"
 msgstr "Не вдалося завантажити файл «%s»\n"
 
-#: ../clients/cli/connections.c:8608
+#: ../clients/cli/connections.c:8429
 msgid "File to import: "
 msgstr "Файл для імпортування: "
 
-#: ../clients/cli/connections.c:8639
+#: ../clients/cli/connections.c:8460
 #, c-format
 msgid "Error: No arguments provided."
 msgstr "Помилка: не надано аргументів."
 
-#: ../clients/cli/connections.c:8662
+#: ../clients/cli/connections.c:8485
 #, c-format
 msgid "Warning: 'type' already specified, ignoring extra one.\n"
 msgstr ""
 "Попередження: значення «type» вже задано, зайве значення проігноровано.\n"
 
-#: ../clients/cli/connections.c:8676
+#: ../clients/cli/connections.c:8500
 #, c-format
 msgid "Warning: 'file' already specified, ignoring extra one.\n"
 msgstr ""
 "Попередження: значення «file» вже задано, зайве значення проігноровано.\n"
 
-#: ../clients/cli/connections.c:8678
+#: ../clients/cli/connections.c:8502
 #, c-format
 msgid "Unknown parameter: %s"
 msgstr "Невідомий параметр: %s"
 
-#: ../clients/cli/connections.c:8689
+#: ../clients/cli/connections.c:8514
 #, c-format
 msgid "Error: 'type' argument is required."
 msgstr "Помилка: слід вказати значення «type»."
 
-#: ../clients/cli/connections.c:8693
+#: ../clients/cli/connections.c:8519
 #, c-format
 msgid "Error: 'file' argument is required."
 msgstr "Помилка: слід вказати значення «file»."
 
-#: ../clients/cli/connections.c:8699
+#: ../clients/cli/connections.c:8526
 #, c-format
 msgid "Error: failed to find VPN plugin for %s."
 msgstr "Помилка: не вдалося знайти додаток VPN для %s."
 
-#: ../clients/cli/connections.c:8706 ../clients/cli/connections.c:8798
+#: ../clients/cli/connections.c:8534 ../clients/cli/connections.c:8635
 #, c-format
 msgid "Error: failed to load VPN plugin: %s."
 msgstr "Помилка: не вдалося завантажити додаток VPN: %s."
 
-#: ../clients/cli/connections.c:8713
+#: ../clients/cli/connections.c:8542
 #, c-format
 msgid "Error: failed to import '%s': %s."
 msgstr "Помилка: не вдалося імпортувати «%s»: %s."
 
-#: ../clients/cli/connections.c:8785
+#: ../clients/cli/connections.c:8622
 msgid "Output file name: "
 msgstr "Назва файла результатів: "
 
-#: ../clients/cli/connections.c:8789
+#: ../clients/cli/connections.c:8626
 #, c-format
 msgid "Error: the connection is not VPN."
 msgstr "Помилка: з’єднання не належить до типу VPN."
 
-#: ../clients/cli/connections.c:8811
+#: ../clients/cli/connections.c:8647
 #, c-format
 msgid "Error: failed to create temporary file %s."
 msgstr "Помилка: не вдалося створити тимчасовий файл %s."
 
-#: ../clients/cli/connections.c:8819
+#: ../clients/cli/connections.c:8656
 #, c-format
 msgid "Error: failed to export '%s': %s."
 msgstr "Помилка: не вдалося експортувати «%s»: %s."
 
-#: ../clients/cli/connections.c:8831
+#: ../clients/cli/connections.c:8667
 #, c-format
 msgid "Error: failed to read temporary file '%s': %s."
 msgstr "Помилка: не вдалося прочитати тимчасовий файл «%s»: %s."
@@ -2522,7 +2361,7 @@ msgstr "Інтерфейс: "
 msgid "Interface(s): "
 msgstr "Інтерфейси: "
 
-#: ../clients/cli/devices.c:253
+#: ../clients/cli/devices.c:254
 #, c-format
 msgid ""
 "Usage: nmcli device { COMMAND | help }\n"
@@ -2600,7 +2439,7 @@ msgstr ""
 "  lldp [list [ifname <інтерфейс>]]\n"
 "\n"
 
-#: ../clients/cli/devices.c:276
+#: ../clients/cli/devices.c:277
 #, c-format
 msgid ""
 "Usage: nmcli device status { help }\n"
@@ -2631,7 +2470,7 @@ msgstr ""
 "device status».\n"
 "\n"
 
-#: ../clients/cli/devices.c:291
+#: ../clients/cli/devices.c:292
 #, c-format
 msgid ""
 "Usage: nmcli device show { ARGUMENTS | help }\n"
@@ -2651,7 +2490,7 @@ msgstr ""
 "аргументу пристрою.\n"
 "\n"
 
-#: ../clients/cli/devices.c:302
+#: ../clients/cli/devices.c:303
 #, c-format
 msgid ""
 "Usage: nmcli device connect { ARGUMENTS | help }\n"
@@ -2675,7 +2514,7 @@ msgstr ""
 "з’єднання.\n"
 "\n"
 
-#: ../clients/cli/devices.c:314
+#: ../clients/cli/devices.c:315
 #, c-format
 msgid ""
 "Usage: nmcli device reapply { ARGUMENTS | help }\n"
@@ -2694,7 +2533,7 @@ msgstr ""
 "внесено до поточного активного з’єднання з часу його застосування.\n"
 "\n"
 
-#: ../clients/cli/devices.c:325
+#: ../clients/cli/devices.c:326
 #, c-format
 msgid ""
 "Usage: nmcli device modify { ARGUMENTS | --help }\n"
@@ -2734,7 +2573,7 @@ msgstr ""
 "nmcli dev mod em1 -ipv4.dns 1\n"
 "nmcli dev mod em1 -ipv6.addr \"abbe::cafe/56\"\n"
 
-#: ../clients/cli/devices.c:345
+#: ../clients/cli/devices.c:346
 #, c-format
 msgid ""
 "Usage: nmcli device disconnect { ARGUMENTS | help }\n"
@@ -2755,7 +2594,7 @@ msgstr ""
 "повторну активацію для подальших з’єднань без ручного втручання.\n"
 "\n"
 
-#: ../clients/cli/devices.c:357
+#: ../clients/cli/devices.c:358
 #, c-format
 msgid ""
 "Usage: nmcli device delete { ARGUMENTS | help }\n"
@@ -2778,7 +2617,7 @@ msgstr ""
 "за допомогою цієї команди.\n"
 "\n"
 
-#: ../clients/cli/devices.c:370
+#: ../clients/cli/devices.c:371
 #, c-format
 msgid ""
 "Usage: nmcli device set { ARGUMENTS | help }\n"
@@ -2801,7 +2640,7 @@ msgstr ""
 "Змінити властивості пристрою.\n"
 "\n"
 
-#: ../clients/cli/devices.c:383
+#: ../clients/cli/devices.c:384
 #, c-format
 msgid ""
 "Usage: nmcli device monitor { ARGUMENTS | help }\n"
@@ -2823,7 +2662,7 @@ msgstr ""
 "Стежить за усіма пристроями, якщо не вказано інтерфейс.\n"
 "\n"
 
-#: ../clients/cli/devices.c:395
+#: ../clients/cli/devices.c:396
 #, c-format
 msgid ""
 "Usage: nmcli device wifi { ARGUMENTS | help }\n"
@@ -2927,7 +2766,7 @@ msgstr ""
 "скористатися командою «nmcli device wifi list».\n"
 "\n"
 
-#: ../clients/cli/devices.c:442
+#: ../clients/cli/devices.c:443
 #, c-format
 msgid ""
 "Usage: nmcli device lldp { ARGUMENTS | help }\n"
@@ -2948,302 +2787,294 @@ msgstr ""
 "певного інтерфейсу.\n"
 "\n"
 
-#: ../clients/cli/devices.c:596
+#: ../clients/cli/devices.c:597
 #, c-format
 msgid "Error: No interface specified."
 msgstr "Помилка: мало бути вказано інтерфейс."
 
-#: ../clients/cli/devices.c:619
+#: ../clients/cli/devices.c:620
 #, c-format
 msgid "Warning: argument '%s' is duplicated.\n"
 msgstr "Попередження: аргумент «%s» дубльовано.\n"
 
-#: ../clients/cli/devices.c:622
+#: ../clients/cli/devices.c:623
 #, c-format
 msgid "Error: Device '%s' not found.\n"
 msgstr "Помилка: не знайдено пристрій «%s».\n"
 
-#: ../clients/cli/devices.c:623
+#: ../clients/cli/devices.c:624
 #, c-format
 msgid "Error: not all devices found."
 msgstr "Помилка: знайдено не усі пристрої."
 
-#: ../clients/cli/devices.c:652
+#: ../clients/cli/devices.c:653
 msgid "No interface specified"
 msgstr "Не вказано інтерфейс"
 
-#: ../clients/cli/devices.c:671
+#: ../clients/cli/devices.c:672
 #, c-format
 msgid "Device '%s' not found"
 msgstr "Не знайдено пристрою «%s»"
 
-#: ../clients/cli/devices.c:754 ../clients/cli/devices.c:904
+#: ../clients/cli/devices.c:758 ../clients/cli/devices.c:910
 msgid "(none)"
 msgstr "(немає)"
 
-#: ../clients/cli/devices.c:824
+#: ../clients/cli/devices.c:829
 #, c-format
 msgid "%u MHz"
 msgstr "%u МГц"
 
-#: ../clients/cli/devices.c:825
+#: ../clients/cli/devices.c:830
 #, c-format
 msgid "%u Mbit/s"
 msgstr "%u МБ/с"
 
-#: ../clients/cli/devices.c:836
+#: ../clients/cli/devices.c:841
 msgid "WEP"
 msgstr "WEP"
 
-#: ../clients/cli/devices.c:840
+#: ../clients/cli/devices.c:845
 msgid "WPA1"
 msgstr "WPA1"
 
-#: ../clients/cli/devices.c:844
+#: ../clients/cli/devices.c:849
 msgid "WPA2"
 msgstr "WPA2"
 
-#: ../clients/cli/devices.c:849
+#: ../clients/cli/devices.c:854
 msgid "802.1X"
 msgstr "802.1X"
 
-#: ../clients/cli/devices.c:864
+#: ../clients/cli/devices.c:869
 msgid "Ad-Hoc"
 msgstr "Ad-Hoc"
 
-#: ../clients/cli/devices.c:865
+#: ../clients/cli/devices.c:870
 msgid "Infra"
 msgstr "Інфраструктура"
 
-#: ../clients/cli/devices.c:866
+#: ../clients/cli/devices.c:871
 msgid "N/A"
 msgstr "н/д"
 
-#: ../clients/cli/devices.c:1079
+#: ../clients/cli/devices.c:1085
 msgid "Device details"
 msgstr "Дані щодо пристрою"
 
-#: ../clients/cli/devices.c:1090
+#: ../clients/cli/devices.c:1096
 #, c-format
 msgid "Error: 'device show': %s"
 msgstr "Помилка: «device show»: %s"
 
-#: ../clients/cli/devices.c:1155 ../clients/cli/devices.c:1158
+#: ../clients/cli/devices.c:1161 ../clients/cli/devices.c:1164
 msgid "(unknown)"
 msgstr "(невідомо)"
 
-#: ../clients/cli/devices.c:1201
+#: ../clients/cli/devices.c:1207
 #, c-format
 msgid "%u Mb/s"
 msgstr "%u Мб/с"
 
-#: ../clients/cli/devices.c:1304
+#: ../clients/cli/devices.c:1310
 msgid "on"
 msgstr "увімкн."
 
-#: ../clients/cli/devices.c:1304
+#: ../clients/cli/devices.c:1310
 msgid "off"
 msgstr "вимкн."
 
-#: ../clients/cli/devices.c:1535
+#: ../clients/cli/devices.c:1544
 #, c-format
 msgid "Error: 'device status': %s"
 msgstr "Помилка: «device status»: %s"
 
-#: ../clients/cli/devices.c:1549
+#: ../clients/cli/devices.c:1558
 msgid "Status of devices"
 msgstr "Стан пристрою"
 
-#: ../clients/cli/devices.c:1575 ../clients/cli/devices.c:2030
-#: ../clients/cli/devices.c:3912
+#: ../clients/cli/devices.c:1584 ../clients/cli/devices.c:2039
+#: ../clients/cli/devices.c:3817
 #, c-format
 msgid "Error: invalid extra argument '%s'."
 msgstr "Помилка: некоректний додатковий аргумент, «%s»."
 
-#: ../clients/cli/devices.c:1611 ../clients/cli/general.c:538
+#: ../clients/cli/devices.c:1620 ../clients/cli/general.c:555
 #, c-format
 msgid "Error: Timeout %d sec expired."
 msgstr "Помилка: перевищено час очікування у %d с."
 
-#: ../clients/cli/devices.c:1660
+#: ../clients/cli/devices.c:1669
 #, c-format
 msgid "Device '%s' successfully activated with '%s'.\n"
 msgstr "Пристрій «%s» успішно активовано з «%s».\n"
 
-#: ../clients/cli/devices.c:1666
+#: ../clients/cli/devices.c:1675
 #, c-format
 msgid "Error: Connection activation failed: (%d) %s.\n"
 msgstr "Помилка: не вдалося активувати з’єднання: (%d) %s.\n"
 
-#: ../clients/cli/devices.c:1702
+#: ../clients/cli/devices.c:1711
 #, c-format
 msgid "Error: Failed to setup a Wi-Fi hotspot: %s"
 msgstr "Помилка: не вдалося налаштувати точку доступу Wi-Fi: %s"
 
-#: ../clients/cli/devices.c:1705
+#: ../clients/cli/devices.c:1714
 #, c-format
 msgid "Error: Failed to add/activate new connection: %s"
 msgstr "Помилка: не вдалося додати або задіяти нове з’єднання: %s"
 
-#: ../clients/cli/devices.c:1715
+#: ../clients/cli/devices.c:1724
 #, c-format
 msgid "Error: Failed to setup a Wi-Fi hotspot"
 msgstr "Помилка: не вдалося встановити назву вузла"
 
-#: ../clients/cli/devices.c:1717
+#: ../clients/cli/devices.c:1726
 #, c-format
 msgid "Error: Failed to add/activate new connection: Unknown error"
 msgstr ""
 "Помилка: не вдалося додати або задіяти нове з’єднання (невідома помилка)"
 
-#: ../clients/cli/devices.c:1729
+#: ../clients/cli/devices.c:1738
 #, c-format
 msgid "Connection with UUID '%s' created and activated on device '%s'\n"
 msgstr "Створено і задіяно з’єднання з UUID «%s» на пристрої «%s»\n"
 
-#: ../clients/cli/devices.c:1732
+#: ../clients/cli/devices.c:1741
 #, c-format
 msgid "Hotspot '%s' activated on device '%s'\n"
 msgstr "Активовано точку доступу «%s» на пристрої «%s»\n"
 
-#: ../clients/cli/devices.c:1796
+#: ../clients/cli/devices.c:1805
 #, c-format
 msgid "Error: Device activation failed: %s"
 msgstr "Помилка: не вдалося активувати пристрій: %s"
 
-#: ../clients/cli/devices.c:1805
+#: ../clients/cli/devices.c:1814
 #, c-format
 msgid "Error: Device activation failed: device was disconnected"
 msgstr "Помилка: не вдалося активувати пристрій: пристрій було від’єднано"
 
-#: ../clients/cli/devices.c:1820
+#: ../clients/cli/devices.c:1829
 #, c-format
 msgid "Device '%s' has been connected.\n"
 msgstr "Пристрій «%s» було з’єднано.\n"
 
-#: ../clients/cli/devices.c:1861
+#: ../clients/cli/devices.c:1870
 #, c-format
 msgid "Error: extra argument not allowed: '%s'."
 msgstr "Помилка: некоректний додатковий аргумент, «%s»."
 
-#: ../clients/cli/devices.c:1933 ../clients/cli/devices.c:1948
-#: ../clients/cli/devices.c:2178
+#: ../clients/cli/devices.c:1942 ../clients/cli/devices.c:1957
+#: ../clients/cli/devices.c:2187
 #, c-format
 msgid "Device '%s' successfully disconnected.\n"
 msgstr "Пристрій «%s» успішно від’єднано.\n"
 
-#: ../clients/cli/devices.c:1936
+#: ../clients/cli/devices.c:1945
 #, c-format
 msgid "Device '%s' successfully removed.\n"
 msgstr "Пристрій «%s» успішно вилучено.\n"
 
-#: ../clients/cli/devices.c:1995 ../clients/cli/devices.c:2065
+#: ../clients/cli/devices.c:2004 ../clients/cli/devices.c:2074
 #, c-format
 msgid "Error: Reapplying connection to device '%s' (%s) failed: %s"
 msgstr ""
 "Помилка: не вдалося повторно застосувати з’єднання із пристроєм «%s» (%s): %s"
 
-#: ../clients/cli/devices.c:2005 ../clients/cli/devices.c:2074
+#: ../clients/cli/devices.c:2014 ../clients/cli/devices.c:2083
 #, c-format
 msgid "Connection successfully reapplied to device '%s'.\n"
 msgstr "З’єднання успішно повторно застосовано до пристрою «%s».\n"
 
-#: ../clients/cli/devices.c:2099
+#: ../clients/cli/devices.c:2108
 #, c-format
 msgid "Error: Reading applied connection from device '%s' (%s) failed: %s"
 msgstr ""
 "Помилка: спроба читання застосованого з’єднання з пристрою «%s» (%s) зазнала "
 "невдачі: %s"
 
-#: ../clients/cli/devices.c:2163
+#: ../clients/cli/devices.c:2172
 #, c-format
 msgid "Error: not all devices disconnected."
 msgstr "Помилка: не усі пристрої від’єднано."
 
-#: ../clients/cli/devices.c:2164
+#: ../clients/cli/devices.c:2173
 #, c-format
 msgid "Error: Device '%s' (%s) disconnecting failed: %s\n"
 msgstr "Помилка: невдала спроба від’єднання «%s» (%s): %s\n"
 
-#: ../clients/cli/devices.c:2242
+#: ../clients/cli/devices.c:2251
 #, c-format
 msgid "Error: not all devices deleted."
 msgstr "Помилка: вилучено не усі пристрої."
 
-#: ../clients/cli/devices.c:2243
+#: ../clients/cli/devices.c:2252
 #, c-format
 msgid "Error: Device '%s' (%s) deletion failed: %s\n"
 msgstr "Помилка: помилка під час спроби вилучення пристрою «%s» (%s): %s\n"
 
-#: ../clients/cli/devices.c:2327
+#: ../clients/cli/devices.c:2336
 #, c-format
 msgid "Error: No property specified."
 msgstr "Помилка: не вказано властивості."
 
-#: ../clients/cli/devices.c:2342 ../clients/cli/devices.c:2359
-#: ../clients/cli/general.c:710 ../clients/cli/general.c:722
+#: ../clients/cli/devices.c:2351 ../clients/cli/devices.c:2368
+#: ../clients/cli/general.c:724 ../clients/cli/general.c:736
 #, c-format
 msgid "Error: '%s' argument is missing."
 msgstr "Помилка: пропущено параметр %s."
 
-#: ../clients/cli/devices.c:2348
+#: ../clients/cli/devices.c:2357
 #, c-format
 msgid "Error: 'managed': %s."
 msgstr "Помилка: «managed»: %s."
 
-#: ../clients/cli/devices.c:2365
+#: ../clients/cli/devices.c:2374
 #, c-format
 msgid "Error: 'autoconnect': %s."
 msgstr "Помилка: «autoconnect»: %s."
 
-#: ../clients/cli/devices.c:2373 ../clients/cli/general.c:736
+#: ../clients/cli/devices.c:2382 ../clients/cli/general.c:750
 #, c-format
 msgid "Error: property '%s' is not known."
 msgstr "Помилка: властивість «%s» є невідомою."
 
-#: ../clients/cli/devices.c:2422
+#: ../clients/cli/devices.c:2432
 #, c-format
 msgid "%s: using connection '%s'\n"
 msgstr "%s: використовуємо з’єднання «%s»\n"
 
-#: ../clients/cli/devices.c:2448
+#: ../clients/cli/devices.c:2458
 #, c-format
 msgid "%s: device created\n"
 msgstr "%s: створено запис пристрою\n"
 
-#: ../clients/cli/devices.c:2455
+#: ../clients/cli/devices.c:2465
 #, c-format
 msgid "%s: device removed\n"
 msgstr "%s: пристрій вилучено\n"
 
-#: ../clients/cli/devices.c:2630
+#: ../clients/cli/devices.c:2663
 msgid "Wi-Fi scan list"
 msgstr "Список сканування Wi-Fi"
 
-#: ../clients/cli/devices.c:2707
-#, c-format
-msgid "Error: Access point with bssid '%s' not found."
-msgstr "Помилка: не знайдено точки доступу з bssid «%s»."
-
-#: ../clients/cli/devices.c:2897
+#: ../clients/cli/devices.c:2712
 #, c-format
 msgid "Error: 'device wifi': %s"
 msgstr "Помилка: «device wifi»: %s"
 
-#: ../clients/cli/devices.c:2915
-#, c-format
-#| msgid "Error: invalid setting argument '%s'; valid are [%s]\n"
-msgid "Error: invalid rescan argument: '%s' not among [auto, no, yes]"
-msgstr ""
-"Помилка: некоректний аргумент rescan: «%s» не належить до набору [auto, no,"
-" yes]"
-
-#: ../clients/cli/devices.c:2922
+#: ../clients/cli/devices.c:2724
 #, c-format
 msgid "Error: Device '%s' not found."
 msgstr "Помилка: не знайдено пристрій «%s»."
 
-#: ../clients/cli/devices.c:2932
+#: ../clients/cli/devices.c:2745 ../clients/cli/devices.c:2831
+#, c-format
+msgid "Error: Access point with bssid '%s' not found."
+msgstr "Помилка: не знайдено точки доступу з bssid «%s»."
+
+#: ../clients/cli/devices.c:2773
 #, c-format
 msgid ""
 "Error: Device '%s' was not recognized as a Wi-Fi device, check "
@@ -3252,27 +3083,27 @@ msgstr ""
 "Помилка: пристрій «%s» не розпізнано як пристрій Wi-Fi, перевірте, чи працює "
 "додаток Wi-Fi NetworkManager."
 
-#: ../clients/cli/devices.c:2936 ../clients/cli/devices.c:3154
-#: ../clients/cli/devices.c:3591 ../clients/cli/devices.c:3750
+#: ../clients/cli/devices.c:2777 ../clients/cli/devices.c:3060
+#: ../clients/cli/devices.c:3495 ../clients/cli/devices.c:3654
 #, c-format
 msgid "Error: Device '%s' is not a Wi-Fi device."
 msgstr "Помилка: пристрій «%s» не є пристроєм Wi-Fi."
 
-#: ../clients/cli/devices.c:3003
+#: ../clients/cli/devices.c:2909
 msgid "SSID or BSSID: "
 msgstr "SSID або BSSID: "
 
-#: ../clients/cli/devices.c:3008
+#: ../clients/cli/devices.c:2914
 #, c-format
 msgid "Error: SSID or BSSID are missing."
 msgstr "Помилка: не вистачає SSID або BSSID."
 
-#: ../clients/cli/devices.c:3045
+#: ../clients/cli/devices.c:2951
 #, c-format
 msgid "Error: bssid argument value '%s' is not a valid BSSID."
 msgstr "Помилка: значення параметра bssid, «%s», не є коректним BSSID."
 
-#: ../clients/cli/devices.c:3075
+#: ../clients/cli/devices.c:2981
 #, c-format
 msgid ""
 "Error: wep-key-type argument value '%s' is invalid, use 'key' or 'phrase'."
@@ -3280,44 +3111,44 @@ msgstr ""
 "Помилка: значення параметра wep-key-type, «%s», є некоректним, слід "
 "використовувати «key» або «phrase»."
 
-#: ../clients/cli/devices.c:3102 ../clients/cli/devices.c:3120
+#: ../clients/cli/devices.c:3008 ../clients/cli/devices.c:3026
 #, c-format
 msgid "Error: %s: %s."
 msgstr "Помилка: %s: %s."
 
-#: ../clients/cli/devices.c:3137
+#: ../clients/cli/devices.c:3043
 #, c-format
 msgid "Error: BSSID to connect to (%s) differs from bssid argument (%s)."
 msgstr ""
 "Помилка: BSSID для з’єднання з (%s) відрізняється від параметра bssid (%s)."
 
-#: ../clients/cli/devices.c:3143
+#: ../clients/cli/devices.c:3049
 #, c-format
 msgid "Error: Parameter '%s' is neither SSID nor BSSID."
 msgstr "Помилка: параметр «%s» не дорівнює ні SSID, ні BSSID."
 
-#: ../clients/cli/devices.c:3156 ../clients/cli/devices.c:3593
-#: ../clients/cli/devices.c:3752
+#: ../clients/cli/devices.c:3062 ../clients/cli/devices.c:3497
+#: ../clients/cli/devices.c:3656
 #, c-format
 msgid "Error: No Wi-Fi device found."
 msgstr "Помилка: не знайдено жодного пристрою Wi-Fi."
 
-#: ../clients/cli/devices.c:3176
+#: ../clients/cli/devices.c:3082
 #, c-format
 msgid "Error: Failed to scan hidden SSID: %s."
 msgstr "Помилка: неможливо виконати сканування прихованого SSID: %s."
 
-#: ../clients/cli/devices.c:3203
+#: ../clients/cli/devices.c:3109
 #, c-format
 msgid "Error: No network with SSID '%s' found."
 msgstr "Помилка: не знайдено мережі з SSID «%s»."
 
-#: ../clients/cli/devices.c:3205
+#: ../clients/cli/devices.c:3111
 #, c-format
 msgid "Error: No access point with BSSID '%s' found."
 msgstr "Помилка: не знайдено точки доступу з BSSID «%s»."
 
-#: ../clients/cli/devices.c:3247
+#: ../clients/cli/devices.c:3153
 #, c-format
 msgid ""
 "Warning: '%s' should be SSID for hidden APs; but it looks like a BSSID.\n"
@@ -3325,76 +3156,76 @@ msgstr ""
 "Попередження: «%s» має бути SSID для прихованих точок доступу; втім, "
 "здається, маємо BSSID.\n"
 
-#: ../clients/cli/devices.c:3263
+#: ../clients/cli/devices.c:3167
 msgid "Password: "
 msgstr "Пароль: "
 
-#: ../clients/cli/devices.c:3412
+#: ../clients/cli/devices.c:3316
 #, c-format
 msgid "'%s' is not valid WPA PSK"
 msgstr "«%s» не є коректним PSK WPA"
 
-#: ../clients/cli/devices.c:3429
+#: ../clients/cli/devices.c:3333
 #, c-format
 msgid "'%s' is not valid WEP key (it should be 5 or 13 ASCII chars)"
 msgstr ""
 "«%s» не є коректним ключем WEP (коректний ключ має складатися з 5 або 13 "
 "символів ASCII)"
 
-#: ../clients/cli/devices.c:3445
+#: ../clients/cli/devices.c:3349
 #, c-format
 msgid "Hotspot password: %s\n"
 msgstr "Пароль до точки доступу: %s\n"
 
-#: ../clients/cli/devices.c:3516
+#: ../clients/cli/devices.c:3420
 #, c-format
 msgid "Error: ssid is too long."
 msgstr "Помилка: SSID є надто довгим."
 
-#: ../clients/cli/devices.c:3530
+#: ../clients/cli/devices.c:3434
 #, c-format
 msgid "Error: band argument value '%s' is invalid; use 'a' or 'bg'."
 msgstr ""
 "Помилка: значення аргументу «band» «%s» є некоректним; має бути «a» або «bg»."
 
-#: ../clients/cli/devices.c:3555
+#: ../clients/cli/devices.c:3459
 #, c-format
 msgid "Error: Unknown parameter %s."
 msgstr "Помилка: невідомий параметр, %s."
 
-#: ../clients/cli/devices.c:3575
+#: ../clients/cli/devices.c:3479
 #, c-format
 msgid "Error: channel requires band too."
 msgstr "Помилка: разом із каналом слід вказати смугу."
 
-#: ../clients/cli/devices.c:3580
+#: ../clients/cli/devices.c:3484
 #, c-format
 msgid "Error: channel '%s' not valid for band '%s'."
 msgstr "Помилка: не можна використовувати канал «%s» для смуги «%s»."
 
-#: ../clients/cli/devices.c:3604
+#: ../clients/cli/devices.c:3508
 #, c-format
 msgid "Error: Device '%s' supports neither AP nor Ad-Hoc mode."
 msgstr ""
 "Помилка: для пристрою «%s» не передбачено ні режиму точки доступу, ні режиму "
 "Ad-Hoc."
 
-#: ../clients/cli/devices.c:3638
+#: ../clients/cli/devices.c:3542
 #, c-format
 msgid "Error: Invalid 'password': %s."
 msgstr "Помилка: некоректне значення «password»: %s."
 
-#: ../clients/cli/devices.c:3713
+#: ../clients/cli/devices.c:3617
 #, c-format
 msgid "Error: '%s' cannot repeat."
 msgstr "Помилка: не можна повторювати «%s»."
 
 #. Main header name
-#: ../clients/cli/devices.c:3818
+#: ../clients/cli/devices.c:3723
 msgid "Device LLDP neighbors"
 msgstr "LLDP-сусіди пристрою"
 
-#: ../clients/cli/devices.c:3928
+#: ../clients/cli/devices.c:3833
 #, c-format
 msgid "Error: 'device lldp list': %s"
 msgstr "Помилка: «device lldp list»: %s"
@@ -3415,7 +3246,7 @@ msgstr "з’єднується (локально)"
 msgid "connected (site only)"
 msgstr "з’єднано (на вузлі)"
 
-#: ../clients/cli/general.c:46 ../clients/common/nm-client-utils.c:282
+#: ../clients/cli/general.c:46 ../clients/common/nm-client-utils.c:232
 msgid "connected"
 msgstr "з'єднано"
 
@@ -3423,51 +3254,51 @@ msgstr "з'єднано"
 msgid "disconnecting"
 msgstr "роз’єднується"
 
-#: ../clients/cli/general.c:48 ../clients/common/nm-client-utils.c:268
+#: ../clients/cli/general.c:48 ../clients/common/nm-client-utils.c:218
 msgid "disconnected"
 msgstr "роз'єднано"
 
-#: ../clients/cli/general.c:83
+#: ../clients/cli/general.c:80
 msgid "none"
 msgstr "немає"
 
-#: ../clients/cli/general.c:84
+#: ../clients/cli/general.c:81
 msgid "portal"
 msgstr "портал"
 
-#: ../clients/cli/general.c:85
+#: ../clients/cli/general.c:82
 msgid "limited"
 msgstr "обмежена"
 
-#: ../clients/cli/general.c:86
+#: ../clients/cli/general.c:83
 msgid "full"
 msgstr "повна"
 
-#: ../clients/cli/general.c:158
+#: ../clients/cli/general.c:154
 msgid "auth"
 msgstr "розпізн"
 
-#: ../clients/cli/general.c:186
+#: ../clients/cli/general.c:189
 msgid "running"
 msgstr "виконується"
 
-#: ../clients/cli/general.c:200
+#: ../clients/cli/general.c:203
 msgid "starting"
 msgstr "запуск"
 
-#: ../clients/cli/general.c:200
+#: ../clients/cli/general.c:203
 msgid "started"
 msgstr "запущено"
 
-#: ../clients/cli/general.c:234
+#: ../clients/cli/general.c:237
 msgid "enabled"
 msgstr "увімкнено"
 
-#: ../clients/cli/general.c:234
+#: ../clients/cli/general.c:237
 msgid "disabled"
 msgstr "вимкнено"
 
-#: ../clients/cli/general.c:352
+#: ../clients/cli/general.c:369
 #, c-format
 msgid ""
 "Usage: nmcli general { COMMAND | help }\n"
@@ -3497,7 +3328,7 @@ msgstr ""
 "журналу>]\n"
 "\n"
 
-#: ../clients/cli/general.c:363
+#: ../clients/cli/general.c:380
 #, c-format
 msgid ""
 "Usage: nmcli general status { help }\n"
@@ -3514,7 +3345,7 @@ msgstr ""
 "status»\n"
 "\n"
 
-#: ../clients/cli/general.c:372
+#: ../clients/cli/general.c:389
 #, c-format
 msgid ""
 "Usage: nmcli general hostname { ARGUMENTS | help }\n"
@@ -3539,7 +3370,7 @@ msgstr ""
 "назвою вузла системи.\n"
 "\n"
 
-#: ../clients/cli/general.c:384
+#: ../clients/cli/general.c:401
 #, c-format
 msgid ""
 "Usage: nmcli general permissions { help }\n"
@@ -3553,7 +3384,7 @@ msgstr ""
 "пройти розпізнавання.\n"
 "\n"
 
-#: ../clients/cli/general.c:392
+#: ../clients/cli/general.c:409
 #, c-format
 msgid ""
 "Usage: nmcli general logging { ARGUMENTS | help }\n"
@@ -3580,7 +3411,7 @@ msgstr ""
 "журналювання наведено на сторінці підручника (man).\n"
 "\n"
 
-#: ../clients/cli/general.c:405
+#: ../clients/cli/general.c:422
 #, c-format
 msgid ""
 "Usage: nmcli networking { COMMAND | help }\n"
@@ -3605,7 +3436,7 @@ msgstr ""
 "  connectivity [перевірити]\n"
 "\n"
 
-#: ../clients/cli/general.c:415
+#: ../clients/cli/general.c:432
 #, c-format
 msgid ""
 "Usage: nmcli networking on { help }\n"
@@ -3618,7 +3449,7 @@ msgstr ""
 "Увімкнути роботу у мережі\n"
 "\n"
 
-#: ../clients/cli/general.c:423
+#: ../clients/cli/general.c:440
 #, c-format
 msgid ""
 "Usage: nmcli networking off { help }\n"
@@ -3631,7 +3462,7 @@ msgstr ""
 "Вимкнути роботу у мережі.\n"
 "\n"
 
-#: ../clients/cli/general.c:431
+#: ../clients/cli/general.c:448
 #, c-format
 msgid ""
 "Usage: nmcli networking connectivity { ARGUMENTS | help }\n"
@@ -3652,7 +3483,7 @@ msgstr ""
 "виконати повторну перевірку можливості з’єднання.\n"
 "\n"
 
-#: ../clients/cli/general.c:443
+#: ../clients/cli/general.c:460
 #, c-format
 msgid ""
 "Usage: nmcli radio { COMMAND | help }\n"
@@ -3669,7 +3500,7 @@ msgstr ""
 "  all | wifi | wwan [ on | off ]\n"
 "\n"
 
-#: ../clients/cli/general.c:452
+#: ../clients/cli/general.c:469
 #, c-format
 msgid ""
 "Usage: nmcli radio all { ARGUMENTS | help }\n"
@@ -3686,7 +3517,7 @@ msgstr ""
 "Отримати стан усіх перемикачів або перемкнути їх (увімкнути чи вимкнути).\n"
 "\n"
 
-#: ../clients/cli/general.c:462
+#: ../clients/cli/general.c:479
 #, c-format
 msgid ""
 "Usage: nmcli radio wifi { ARGUMENTS | help }\n"
@@ -3703,7 +3534,7 @@ msgstr ""
 "Отримати стан перемикача Wi-Fi або перемкнути його (увімкнути чи вимкнути).\n"
 "\n"
 
-#: ../clients/cli/general.c:472
+#: ../clients/cli/general.c:489
 #, c-format
 msgid ""
 "Usage: nmcli radio wwan { ARGUMENTS | help }\n"
@@ -3721,7 +3552,7 @@ msgstr ""
 "(увімкнути чи вимкнути).\n"
 "\n"
 
-#: ../clients/cli/general.c:482
+#: ../clients/cli/general.c:499
 #, c-format
 msgid ""
 "Usage: nmcli monitor\n"
@@ -3737,180 +3568,180 @@ msgstr ""
 "зміни\n"
 "\n"
 
-#: ../clients/cli/general.c:511
+#: ../clients/cli/general.c:528
 msgid "NetworkManager status"
 msgstr "Стан NetworkManager"
 
-#: ../clients/cli/general.c:515
+#: ../clients/cli/general.c:532
 #, c-format
 msgid "Error: only these fields are allowed: %s"
 msgstr "Помилка: можна використовувати лише такі поля: %s"
 
-#: ../clients/cli/general.c:568
+#: ../clients/cli/general.c:582
 msgid "NetworkManager permissions"
 msgstr "Права доступу NetworkManager"
 
-#: ../clients/cli/general.c:572
+#: ../clients/cli/general.c:586
 #, c-format
 msgid "Error: 'general permissions': %s"
 msgstr "Помилка: «general permissions»: %s"
 
-#: ../clients/cli/general.c:660
+#: ../clients/cli/general.c:674
 msgid "NetworkManager logging"
 msgstr "Ведення журналу NetworkManager"
 
-#: ../clients/cli/general.c:664
+#: ../clients/cli/general.c:678
 #, c-format
 msgid "Error: 'general logging': %s"
 msgstr "Помилка: «general logging»: %s"
 
-#: ../clients/cli/general.c:746
+#: ../clients/cli/general.c:760
 #, c-format
 msgid "Error: failed to set logging: %s"
 msgstr "Помилка: не вдалося встановити параметри ведення журналу: %s"
 
-#: ../clients/cli/general.c:763
+#: ../clients/cli/general.c:777
 #, c-format
 msgid "Error: failed to set hostname: %s"
 msgstr "Помилка: не вдалося встановити назву вузла: %s"
 
-#: ../clients/cli/general.c:832
+#: ../clients/cli/general.c:846
 #, c-format
 msgid "Error: '--fields' value '%s' is not valid here (allowed field: %s)"
 msgstr ""
 "Помилка: значення «--fields» «%s» не можна використовувати тут (дозволене "
 "поле: %s)"
 
-#: ../clients/cli/general.c:857
+#: ../clients/cli/general.c:871
 #, c-format
 msgid "Error: invalid '%s' argument: '%s' (use on/off)."
 msgstr "Помилка: некоректний аргумент «%s»: «%s» (мало бути on/off)."
 
 #. no arguments -> get current state
-#: ../clients/cli/general.c:905 ../clients/cli/general.c:917
+#: ../clients/cli/general.c:919 ../clients/cli/general.c:931
 msgid "Connectivity"
 msgstr "Можливість з’єднання"
 
-#: ../clients/cli/general.c:920
+#: ../clients/cli/general.c:934
 #, c-format
 msgid "Error: 'networking' command '%s' is not valid."
 msgstr "Помилка: команда «networking» «%s» є некоректною."
 
-#: ../clients/cli/general.c:934
+#: ../clients/cli/general.c:948
 msgid "Networking"
 msgstr "Робота у мережі"
 
 #. no argument, show all radio switches
-#: ../clients/cli/general.c:969
+#: ../clients/cli/general.c:983
 msgid "Radio switches"
 msgstr "Радіоперемикачі"
 
 #. no argument, show current WiFi state
-#: ../clients/cli/general.c:999
+#: ../clients/cli/general.c:1013
 msgid "Wi-Fi radio switch"
 msgstr "Перемикач Wi-Fi"
 
 #. no argument, show current WWAN (mobile broadband) state
-#: ../clients/cli/general.c:1026
+#: ../clients/cli/general.c:1040
 msgid "WWAN radio switch"
 msgstr "Перемикач WWAN"
 
-#: ../clients/cli/general.c:1074
+#: ../clients/cli/general.c:1089
 msgid "NetworkManager has started"
 msgstr "Запущено NetworkManager"
 
-#: ../clients/cli/general.c:1074
+#: ../clients/cli/general.c:1089
 msgid "NetworkManager has stopped"
 msgstr "Зупинено NetworkManager"
 
-#: ../clients/cli/general.c:1085
+#: ../clients/cli/general.c:1100
 #, c-format
 msgid "Hostname set to '%s'\n"
 msgstr "Встановлено назву вузла «%s»\n"
 
-#: ../clients/cli/general.c:1100
+#: ../clients/cli/general.c:1115
 #, c-format
 msgid "'%s' is now the primary connection\n"
 msgstr "«%s» є тепер основним з’єднанням\n"
 
-#: ../clients/cli/general.c:1102
+#: ../clients/cli/general.c:1117
 #, c-format
 msgid "There's no primary connection\n"
 msgstr "Немає основного з’єднання\n"
 
-#: ../clients/cli/general.c:1114
+#: ../clients/cli/general.c:1129
 #, c-format
 msgid "Connectivity is now '%s'\n"
 msgstr "Значенням можливості з’єднання тепер є «%s»\n"
 
-#: ../clients/cli/general.c:1127
+#: ../clients/cli/general.c:1142
 #, c-format
 msgid "Networkmanager is now in the '%s' state\n"
 msgstr "Networkmanager тепер перебуває у стані «%s»\n"
 
-#: ../clients/cli/general.c:1147
+#: ../clients/cli/general.c:1163
 msgid "connection available"
 msgstr "доступне з’єднання"
 
-#: ../clients/cli/general.c:1149
+#: ../clients/cli/general.c:1165
 msgid "connections available"
 msgstr "доступні з’єднання"
 
-#: ../clients/cli/general.c:1167
+#: ../clients/cli/general.c:1183
 msgid "autoconnect"
 msgstr "автоз’єднання"
 
-#: ../clients/cli/general.c:1169
+#: ../clients/cli/general.c:1185
 msgid "fw missing"
 msgstr "пропущено fw"
 
-#: ../clients/cli/general.c:1174
+#: ../clients/cli/general.c:1190
 msgid "plugin missing"
 msgstr "не вказано додатка"
 
-#: ../clients/cli/general.c:1179
+#: ../clients/cli/general.c:1195
 msgid "sw"
 msgstr "sw"
 
-#: ../clients/cli/general.c:1181
+#: ../clients/cli/general.c:1197
 msgid "hw"
 msgstr "hw"
 
-#: ../clients/cli/general.c:1186
+#: ../clients/cli/general.c:1202
 msgid "iface"
 msgstr "інтерфейс"
 
-#: ../clients/cli/general.c:1189
+#: ../clients/cli/general.c:1205
 msgid "port"
 msgstr "порт"
 
-#: ../clients/cli/general.c:1192
+#: ../clients/cli/general.c:1208
 msgid "mtu"
 msgstr "mtu"
 
-#: ../clients/cli/general.c:1209
+#: ../clients/cli/general.c:1225
 msgid "master"
 msgstr "основний"
 
-#: ../clients/cli/general.c:1213 ../clients/tui/nm-editor-utils.c:239
+#: ../clients/cli/general.c:1229 ../clients/tui/nm-editor-utils.c:239
 #: ../clients/tui/nmt-connect-connection-list.c:407
 msgid "VPN"
 msgstr "VPN"
 
-#: ../clients/cli/general.c:1215
+#: ../clients/cli/general.c:1231
 msgid "ip4 default"
 msgstr "типова ip4"
 
-#: ../clients/cli/general.c:1217
+#: ../clients/cli/general.c:1233
 msgid "ip6 default"
 msgstr "типова ip6"
 
-#: ../clients/cli/general.c:1300
+#: ../clients/cli/general.c:1316
 #, c-format
 msgid "%s VPN connection"
 msgstr "З’єднання VPN %s"
 
-#: ../clients/cli/general.c:1368
+#: ../clients/cli/general.c:1386
 #, c-format
 msgid ""
 "Use \"nmcli device show\" to get complete information about known devices "
@@ -3927,56 +3758,21 @@ msgstr ""
 "Докладний опис використання програм можна знайти на сторінках підручника "
 "(man) nmcli(1) та nmcli-examples(5).\n"
 
-#: ../clients/cli/general.c:1389
+#: ../clients/cli/general.c:1407
 #, c-format
 msgid "Error: 'monitor' command '%s' is not valid."
 msgstr "Помилка: команда «monitor» «%s» є некоректною."
 
-#: ../clients/cli/general.c:1401
+#: ../clients/cli/general.c:1419
 msgid "Networkmanager is not running (waiting for it)\n"
 msgstr "Networkmanager не запущено (очікуємо на запуск)\n"
 
-#: ../clients/cli/nmcli.c:245
+#: ../clients/cli/nmcli.c:184
 #, c-format
-#| msgid ""
-#| "Usage: nmcli [OPTIONS] OBJECT { COMMAND | help }\n"
-#| "\n"
-#| "OPTIONS\n"
-#| "  -t[erse]                                       terse output\n"
-#| "  -p[retty]                                      pretty output\n"
-#| "  -m[ode] tabular|multiline                      output mode\n"
-#| "  -c[olors] auto|yes|no                          whether to use colors in "
-#| "output\n"
-#| "  -f[ields] <field1,field2,...>|all|common       specify fields to "
-#| "output\n"
-#| "  -g[et-values] <field1,field2,...>|all|common   shortcut for -m tabular -"
-#| "t -f\n"
-#| "  -e[scape] yes|no                               escape columns "
-#| "separators in values\n"
-#| "  -a[sk]                                         ask for missing "
-#| "parameters\n"
-#| "  -s[how-secrets]                                allow displaying "
-#| "passwords\n"
-#| "  -w[ait] <seconds>                              set timeout waiting for "
-#| "finishing operations\n"
-#| "  -v[ersion]                                     show program version\n"
-#| "  -h[elp]                                        print this help\n"
-#| "\n"
-#| "OBJECT\n"
-#| "  g[eneral]       NetworkManager's general status and operations\n"
-#| "  n[etworking]    overall networking control\n"
-#| "  r[adio]         NetworkManager radio switches\n"
-#| "  c[onnection]    NetworkManager's connections\n"
-#| "  d[evice]        devices managed by NetworkManager\n"
-#| "  a[gent]         NetworkManager secret agent or polkit agent\n"
-#| "  m[onitor]       monitor NetworkManager changes\n"
-#| "\n"
 msgid ""
 "Usage: nmcli [OPTIONS] OBJECT { COMMAND | help }\n"
 "\n"
 "OPTIONS\n"
-"  -o[verview]                                    overview mode (hide default "
-"values)\n"
 "  -t[erse]                                       terse output\n"
 "  -p[retty]                                      pretty output\n"
 "  -m[ode] tabular|multiline                      output mode\n"
@@ -4007,8 +3803,6 @@ msgstr ""
 "Користування: nmcli [ПАРАМЕТРИ] ОБ’ЄКТ { КОМАНДА | help }\n"
 "\n"
 "ПАРАМЕТРИ\n"
-"  -o[verview]                                    режим огляду (приховати"
-" типові значення)\n"
 "  -t[erse]                                       скорочене виведення\n"
 "  -p[retty]                                      форматоване виведення\n"
 "  -m[ode] tabular|multiline                      режим виведення\n"
@@ -4037,99 +3831,79 @@ msgstr ""
 "  m[onitor]       стежити за змінами у NetworkManager\n"
 "\n"
 
-#: ../clients/cli/nmcli.c:325
+#: ../clients/cli/nmcli.c:263
 #, c-format
 msgid "Error: missing argument for '%s' option."
 msgstr "Помилка: не вказано аргумент параметра «%s»."
 
-#: ../clients/cli/nmcli.c:626
-#, c-format
-msgid "Unexpected end of file following '%s'\n"
-msgstr "Неочікуваний кінець файла із наступним «%s»\n"
-
-#: ../clients/cli/nmcli.c:634
-#, c-format
-msgid "Expected whitespace following '%s'\n"
-msgstr "Мав бути пробіл із наступним «%s»\n"
-
-#: ../clients/cli/nmcli.c:646
-#, c-format
-#| msgid "'%s' is not a valid value for '%s'"
-msgid "Expected a value for '%s'\n"
-msgstr "Мало бути значення для «%s»\n"
-
-#: ../clients/cli/nmcli.c:660
-#, c-format
-msgid "Expected a line break following '%s'\n"
-msgstr "Мав бути символ розриву рядка із наступним «%s»\n"
-
-#: ../clients/cli/nmcli.c:749
+#: ../clients/cli/nmcli.c:311
 #, c-format
 msgid "Error: Option '--terse' is specified the second time."
 msgstr "Помилка: параметр «--terse» вказано двічі."
 
-#: ../clients/cli/nmcli.c:754
+#: ../clients/cli/nmcli.c:316
 #, c-format
 msgid "Error: Option '--terse' is mutually exclusive with '--pretty'."
 msgstr ""
 "Помилка: параметр «--terse» і «--pretty» не можна використовувати одночасно."
 
-#: ../clients/cli/nmcli.c:762
+#: ../clients/cli/nmcli.c:324
 #, c-format
 msgid "Error: Option '--pretty' is specified the second time."
 msgstr "Помилка: параметр «--pretty» вказано двічі."
 
-#: ../clients/cli/nmcli.c:767
+#: ../clients/cli/nmcli.c:329
 #, c-format
 msgid "Error: Option '--pretty' is mutually exclusive with '--terse'."
 msgstr ""
 "Помилка: параметр «--pretty» і «--terse» не можна використовувати одночасно"
 
-#: ../clients/cli/nmcli.c:782
+#: ../clients/cli/nmcli.c:344
 #, c-format
 msgid "Error: '%s' is not a valid argument for '%s' option."
 msgstr "Помилка: «%s» не є коректним аргументом «%s»."
 
-#: ../clients/cli/nmcli.c:796 ../clients/cli/nmcli.c:808
+#: ../clients/cli/nmcli.c:358 ../clients/cli/nmcli.c:370
 #, c-format
 msgid "Error: '%s' is not valid argument for '%s' option."
 msgstr "Помилка: «%s» не є коректним аргументом «%s»."
 
-#: ../clients/cli/nmcli.c:832
+#: ../clients/cli/nmcli.c:394
 #, c-format
 msgid "Error: '%s' is not a valid timeout."
 msgstr "Помилка: «%s» не є коректним часом очікування."
 
-#: ../clients/cli/nmcli.c:839
+#: ../clients/cli/nmcli.c:401
 #, c-format
 msgid "nmcli tool, version %s\n"
 msgstr "інструмент nmcli, версія %s\n"
 
-#: ../clients/cli/nmcli.c:847
+#: ../clients/cli/nmcli.c:409
 #, c-format
 msgid "Error: Option '%s' is unknown, try 'nmcli -help'."
 msgstr "Помилка: невідомий параметр «%s», спробуйте «nmcli -help»."
 
-#: ../clients/cli/nmcli.c:903 ../clients/cli/nmcli.c:910
+#: ../clients/cli/nmcli.c:456 ../clients/cli/nmcli.c:463
 #, c-format
+#| msgid "Error: nmcli terminated by signal %s (%d)\n"
 msgid "Error: nmcli terminated by signal %s (%d)"
 msgstr "Помилка: роботу nmcli перервано сигналом %s (%d)"
 
-#: ../clients/cli/nmcli.c:1052
+#: ../clients/cli/nmcli.c:561
 msgid "Success"
 msgstr "Виконано"
 
-#: ../clients/cli/polkit-agent.c:68
+#: ../clients/cli/polkit-agent.c:67
 #, c-format
 msgid "Authentication message: %s\n"
 msgstr "Повідомлення щодо розпізнавання: %s\n"
 
-#: ../clients/cli/polkit-agent.c:76
+#: ../clients/cli/polkit-agent.c:73
 #, c-format
 msgid "Authentication error: %s\n"
 msgstr "Помилка розпізнавання: %s\n"
 
-#: ../clients/cli/polkit-agent.c:136
+#: ../clients/cli/polkit-agent.c:119
 #, c-format
 msgid "Warning: polkit agent initialization failed: %s\n"
 msgstr "Попередження: не вдалося ініціалізувати агент polkit: %s\n"
@@ -4187,493 +3961,486 @@ msgstr "Попередження: %s\n"
 msgid "Info: %s\n"
 msgstr "Інформація: %s\n"
 
-#: ../clients/cli/settings.c:484
+#: ../clients/cli/settings.c:483
 msgid "don't know how to get the property value"
 msgstr "програмі невідомий спосіб отримання значення властивості"
 
-#: ../clients/cli/settings.c:574 ../clients/cli/settings.c:616
+#: ../clients/cli/settings.c:573 ../clients/cli/settings.c:615
 msgid "the property can't be changed"
 msgstr "значення властивості не можна змінювати"
 
-#: ../clients/cli/settings.c:736
+#: ../clients/cli/settings.c:735
 msgid "[NM property description]"
 msgstr "[опис властивості NM]"
 
-#: ../clients/cli/settings.c:746
+#: ../clients/cli/settings.c:745
 msgid "[nmcli specific description]"
 msgstr "[специфічний для nmcli опис]"
 
-#: ../clients/cli/utils.c:317
+#: ../clients/cli/utils.c:328
 #, c-format
 msgid "Error: Argument '%s' was expected, but '%s' provided."
 msgstr "Помилка: мало бути вказано аргумент «%s», втім вказано аргумент «%s»."
 
-#: ../clients/cli/utils.c:320
+#: ../clients/cli/utils.c:331
 #, c-format
 msgid "Error: Unexpected argument '%s'"
 msgstr "Помилка: неочікуваний аргумент «%s»."
 
-#: ../clients/cli/utils.c:699
+#: ../clients/cli/utils.c:808
 #, c-format
 msgid "invalid field '%s%s%s'; no such field"
 msgstr "некоректне поле «%s%s%s»; немає такого поля"
 
-#: ../clients/cli/utils.c:703
+#: ../clients/cli/utils.c:812
 #, c-format
 msgid "invalid field '%s%s%s'; allowed fields: [%s]"
 msgstr "некоректне поле «%s%s%s»; дозволені поля: [%s]"
 
-#: ../clients/cli/utils.c:776
+#: ../clients/cli/utils.c:885
 #, c-format
 msgid "failure to select field"
 msgstr "не вдалося вибрати поле"
 
-#: ../clients/cli/utils.c:1369
+#: ../clients/cli/utils.c:1473
 #, c-format
 msgid "Error reading nmcli output: %s\n"
 msgstr "Помилка під час спроби прочитати виведене nmcli: %s\n"
 
-#: ../clients/cli/utils.c:1374
+#: ../clients/cli/utils.c:1478
 #, c-format
 msgid "Error writing nmcli output: %s\n"
 msgstr "Помилка під час спроби записати виведене nmcli: %s\n"
 
-#: ../clients/cli/utils.c:1398
+#: ../clients/cli/utils.c:1502
 #, c-format
 msgid "Failed to create pager pipe: %s\n"
 msgstr "Не вдалося створити конвеєр пейджера: %s\n"
 
-#: ../clients/cli/utils.c:1406
+#: ../clients/cli/utils.c:1510
 #, c-format
 msgid "Failed to fork pager: %s\n"
 msgstr "Не вдалося створити відгалуження пейджера: %s\n"
 
-#: ../clients/cli/utils.c:1452 ../clients/cli/utils.c:1454
+#: ../clients/cli/utils.c:1556 ../clients/cli/utils.c:1558
 #, c-format
 msgid "Failed to duplicate pager pipe: %s\n"
 msgstr "Не вдалося здублювати конвеєр пейджера: %s\n"
 
-#: ../clients/cli/utils.h:239
-#, c-format
-#| msgid "%s (%s)"
-msgid "%lld (%s)"
-msgstr "%lld (%s)"
-
 #. TRANSLATORS: the first %s is the partial value entered by
 #. * the user, the second %s a list of compatible values.
 #.
-#: ../clients/common/nm-client-utils.c:117
-#: ../clients/common/nm-client-utils.c:148
+#: ../clients/common/nm-client-utils.c:76
+#: ../clients/common/nm-client-utils.c:107
 #, c-format
 msgid "'%s' is ambiguous (%s)"
 msgstr "«%s» є неоднозначним (%s)"
 
-#: ../clients/common/nm-client-utils.c:127
+#: ../clients/common/nm-client-utils.c:86
 #, c-format
 msgid "'%s' is not valid; use [%s] or [%s]"
 msgstr "«%s» не є коректним значенням; мало бути [%s] або [%s]"
 
-#: ../clients/common/nm-client-utils.c:160
+#: ../clients/common/nm-client-utils.c:119
 #, c-format
 msgid "'%s' is not valid; use [%s], [%s] or [%s]"
 msgstr "«%s» не є коректним значенням; мало бути [%s], [%s] або [%s]"
 
-#: ../clients/common/nm-client-utils.c:209
+#: ../clients/common/nm-client-utils.c:162
 #, c-format
-#| msgid "'%s' is ambiguous (%s)"
-msgid "'%s' is ambiguous: %s"
-msgstr "«%s» є неоднозначним: %s"
+msgid "'%s' is ambiguous (%s x %s)"
+msgstr "«%s» є неоднозначним (%s x %s)"
 
-#: ../clients/common/nm-client-utils.c:219
+#: ../clients/common/nm-client-utils.c:170
 #, c-format
 msgid "missing name, try one of [%s]"
 msgstr "пропущено назву, спробуйте одну з таких назв: [%s]"
 
-#: ../clients/common/nm-client-utils.c:264
+#: ../clients/common/nm-client-utils.c:214
 msgid "unmanaged"
 msgstr "некерований"
 
-#: ../clients/common/nm-client-utils.c:266
+#: ../clients/common/nm-client-utils.c:216
 msgid "unavailable"
 msgstr "недоступний"
 
-#: ../clients/common/nm-client-utils.c:270
+#: ../clients/common/nm-client-utils.c:220
 msgid "connecting (prepare)"
 msgstr "з’єднання (приготування)"
 
-#: ../clients/common/nm-client-utils.c:272
+#: ../clients/common/nm-client-utils.c:222
 msgid "connecting (configuring)"
 msgstr "з’єднання (налаштовування)"
 
-#: ../clients/common/nm-client-utils.c:274
+#: ../clients/common/nm-client-utils.c:224
 msgid "connecting (need authentication)"
 msgstr "з’єднання (потрібне розпізнавання)"
 
-#: ../clients/common/nm-client-utils.c:276
+#: ../clients/common/nm-client-utils.c:226
 msgid "connecting (getting IP configuration)"
 msgstr "з’єднання (отримання налаштувань IP)"
 
-#: ../clients/common/nm-client-utils.c:278
+#: ../clients/common/nm-client-utils.c:228
 msgid "connecting (checking IP connectivity)"
 msgstr "з’єднання (перевірка можливості з’єднання)"
 
-#: ../clients/common/nm-client-utils.c:280
+#: ../clients/common/nm-client-utils.c:230
 msgid "connecting (starting secondary connections)"
 msgstr "з’єднання (встановлення другорядних з’єднань)"
 
-#: ../clients/common/nm-client-utils.c:286
+#: ../clients/common/nm-client-utils.c:236
 msgid "connection failed"
 msgstr "невдала спроба з’єднання"
 
-#: ../clients/common/nm-client-utils.c:303
+#: ../clients/common/nm-client-utils.c:253
 msgid "yes (guessed)"
 msgstr "так (вгадано)"
 
-#: ../clients/common/nm-client-utils.c:305
+#: ../clients/common/nm-client-utils.c:255
 msgid "no (guessed)"
 msgstr "ні (вгадано)"
 
-#: ../clients/common/nm-client-utils.c:318
+#: ../clients/common/nm-client-utils.c:268
 msgid "No reason given"
 msgstr "Причину не вказано"
 
-#: ../clients/common/nm-client-utils.c:322
+#: ../clients/common/nm-client-utils.c:272
 msgid "Device is now managed"
 msgstr "Тепер пристрій є керованим"
 
-#: ../clients/common/nm-client-utils.c:324
+#: ../clients/common/nm-client-utils.c:274
 msgid "Device is now unmanaged"
 msgstr "Тепер пристрій є некерованим"
 
-#: ../clients/common/nm-client-utils.c:326
+#: ../clients/common/nm-client-utils.c:276
 msgid "The device could not be readied for configuration"
 msgstr "Пристрій не може бути приготовано до налаштовування"
 
-#: ../clients/common/nm-client-utils.c:328
+#: ../clients/common/nm-client-utils.c:278
 msgid ""
 "IP configuration could not be reserved (no available address, timeout, etc.)"
 msgstr ""
 "Не вдалося зарезервувати налаштування IP (немає доступної адреси, часу "
 "очікування тощо)"
 
-#: ../clients/common/nm-client-utils.c:330
+#: ../clients/common/nm-client-utils.c:280
 msgid "The IP configuration is no longer valid"
 msgstr "Налаштування IP вже не є коректними"
 
-#: ../clients/common/nm-client-utils.c:332
+#: ../clients/common/nm-client-utils.c:282
 msgid "Secrets were required, but not provided"
 msgstr "Потрібні були реєстраційні дані, яких не було надано"
 
-#: ../clients/common/nm-client-utils.c:334
+#: ../clients/common/nm-client-utils.c:284
 msgid "802.1X supplicant disconnected"
 msgstr "Допоміжну програму 802.1X від’єднано"
 
-#: ../clients/common/nm-client-utils.c:336
+#: ../clients/common/nm-client-utils.c:286
 msgid "802.1X supplicant configuration failed"
 msgstr "Спроба налаштувати допоміжну програму 802.1X завершилася невдало"
 
-#: ../clients/common/nm-client-utils.c:338
+#: ../clients/common/nm-client-utils.c:288
 msgid "802.1X supplicant failed"
 msgstr "Помилка допоміжної програми 802.1X"
 
-#: ../clients/common/nm-client-utils.c:340
+#: ../clients/common/nm-client-utils.c:290
 msgid "802.1X supplicant took too long to authenticate"
 msgstr ""
 "Розпізнавання за допомогою допоміжної програми 802.1X триває занадто довго"
 
-#: ../clients/common/nm-client-utils.c:342
+#: ../clients/common/nm-client-utils.c:292
 msgid "PPP service failed to start"
 msgstr "Не вдалося запустити службу PPP"
 
-#: ../clients/common/nm-client-utils.c:344
+#: ../clients/common/nm-client-utils.c:294
 msgid "PPP service disconnected"
 msgstr "Службу PPP від’єднано"
 
-#: ../clients/common/nm-client-utils.c:346
+#: ../clients/common/nm-client-utils.c:296
 msgid "PPP failed"
 msgstr "помилка PPP"
 
-#: ../clients/common/nm-client-utils.c:348
+#: ../clients/common/nm-client-utils.c:298
 msgid "DHCP client failed to start"
 msgstr "Не вдалося запустити клієнтську програму DHCP"
 
-#: ../clients/common/nm-client-utils.c:350
+#: ../clients/common/nm-client-utils.c:300
 msgid "DHCP client error"
 msgstr "помилка клієнтської програми DHCP"
 
-#: ../clients/common/nm-client-utils.c:352
+#: ../clients/common/nm-client-utils.c:302
 msgid "DHCP client failed"
 msgstr "критична помилка клієнтської програми DHCP"
 
-#: ../clients/common/nm-client-utils.c:354
+#: ../clients/common/nm-client-utils.c:304
 msgid "Shared connection service failed to start"
 msgstr "Не вдалося запустити службу спільного використання з’єднання"
 
-#: ../clients/common/nm-client-utils.c:356
+#: ../clients/common/nm-client-utils.c:306
 msgid "Shared connection service failed"
 msgstr "Критична помилка служби спільного використання з’єднання"
 
-#: ../clients/common/nm-client-utils.c:358
+#: ../clients/common/nm-client-utils.c:308
 msgid "AutoIP service failed to start"
 msgstr "Не вдалося запустити службу AutoIP"
 
-#: ../clients/common/nm-client-utils.c:360
+#: ../clients/common/nm-client-utils.c:310
 msgid "AutoIP service error"
 msgstr "Помилка служби AutoIP"
 
-#: ../clients/common/nm-client-utils.c:362
+#: ../clients/common/nm-client-utils.c:312
 msgid "AutoIP service failed"
 msgstr "Помилка служби AutoIP"
 
-#: ../clients/common/nm-client-utils.c:364
+#: ../clients/common/nm-client-utils.c:314
 msgid "The line is busy"
 msgstr "Лінію зайнято"
 
-#: ../clients/common/nm-client-utils.c:366
+#: ../clients/common/nm-client-utils.c:316
 msgid "No dial tone"
 msgstr "Немає гудка"
 
-#: ../clients/common/nm-client-utils.c:368
+#: ../clients/common/nm-client-utils.c:318
 msgid "No carrier could be established"
 msgstr "Не вдалося визначити носій сигналу"
 
-#: ../clients/common/nm-client-utils.c:370
+#: ../clients/common/nm-client-utils.c:320
 msgid "The dialing request timed out"
 msgstr "Перевищено час очікування на підтвердження запиту щодо набору номера"
 
-#: ../clients/common/nm-client-utils.c:372
+#: ../clients/common/nm-client-utils.c:322
 msgid "The dialing attempt failed"
 msgstr "Спроба набирання номера завершилася невдало"
 
-#: ../clients/common/nm-client-utils.c:374
+#: ../clients/common/nm-client-utils.c:324
 msgid "Modem initialization failed"
 msgstr "Не вдалося ініціалізувати модем"
 
-#: ../clients/common/nm-client-utils.c:376
+#: ../clients/common/nm-client-utils.c:326
 msgid "Failed to select the specified APN"
 msgstr "Не вдалося вибрати вказаний APN"
 
-#: ../clients/common/nm-client-utils.c:378
+#: ../clients/common/nm-client-utils.c:328
 msgid "Not searching for networks"
 msgstr "Пошук мереж не виконується"
 
-#: ../clients/common/nm-client-utils.c:380
+#: ../clients/common/nm-client-utils.c:330
 msgid "Network registration denied"
 msgstr "Реєстрацію у мережі заборонено"
 
-#: ../clients/common/nm-client-utils.c:382
+#: ../clients/common/nm-client-utils.c:332
 msgid "Network registration timed out"
 msgstr "Перевищено час очікування на реєстрацію у мережі"
 
-#: ../clients/common/nm-client-utils.c:384
+#: ../clients/common/nm-client-utils.c:334
 msgid "Failed to register with the requested network"
 msgstr "Не вдалося зареєструватися у потрібній мережі"
 
-#: ../clients/common/nm-client-utils.c:386
+#: ../clients/common/nm-client-utils.c:336
 msgid "PIN check failed"
 msgstr "Помилка під час спроби перевірити PIN-код"
 
-#: ../clients/common/nm-client-utils.c:388
+#: ../clients/common/nm-client-utils.c:338
 msgid "Necessary firmware for the device may be missing"
 msgstr "Можливо, не вистачає потрібної для роботи пристрою мікропрограми"
 
-#: ../clients/common/nm-client-utils.c:390
+#: ../clients/common/nm-client-utils.c:340
 msgid "The device was removed"
 msgstr "Пристрій вилучено"
 
-#: ../clients/common/nm-client-utils.c:392
+#: ../clients/common/nm-client-utils.c:342
 msgid "NetworkManager went to sleep"
 msgstr "NetworkManager переведено у режим сну"
 
-#: ../clients/common/nm-client-utils.c:394
+#: ../clients/common/nm-client-utils.c:344
 msgid "The device's active connection disappeared"
 msgstr "Активне з’єднання з пристроєм зникло"
 
-#: ../clients/common/nm-client-utils.c:396
+#: ../clients/common/nm-client-utils.c:346
 msgid "Device disconnected by user or client"
 msgstr "Пристрій роз’єднано з боку користувача або клієнтської програми"
 
-#: ../clients/common/nm-client-utils.c:398
+#: ../clients/common/nm-client-utils.c:348
 msgid "Carrier/link changed"
 msgstr "Змінено носій або зв’язок"
 
-#: ../clients/common/nm-client-utils.c:400
+#: ../clients/common/nm-client-utils.c:350
 msgid "The device's existing connection was assumed"
 msgstr ""
 "Зроблено припущення щодо використання вже встановленого з’єднання з пристроєм"
 
-#: ../clients/common/nm-client-utils.c:402
+#: ../clients/common/nm-client-utils.c:352
 msgid "The supplicant is now available"
 msgstr "Відкрито доступ до допоміжної програми"
 
-#: ../clients/common/nm-client-utils.c:404
+#: ../clients/common/nm-client-utils.c:354
 msgid "The modem could not be found"
 msgstr "Не вдалося виявити модем"
 
-#: ../clients/common/nm-client-utils.c:406
+#: ../clients/common/nm-client-utils.c:356
 msgid "The Bluetooth connection failed or timed out"
 msgstr ""
 "Помилка з’єднання Bluetooth або перевищення часу очікування на передавання "
 "даних з’єднанням"
 
-#: ../clients/common/nm-client-utils.c:408
+#: ../clients/common/nm-client-utils.c:358
 msgid "GSM Modem's SIM card not inserted"
 msgstr "До модема GSM не вставлено SIM-картки"
 
-#: ../clients/common/nm-client-utils.c:410
+#: ../clients/common/nm-client-utils.c:360
 msgid "GSM Modem's SIM PIN required"
 msgstr "Слід вказати PIN-код SIM-картки у модемі GSM"
 
-#: ../clients/common/nm-client-utils.c:412
+#: ../clients/common/nm-client-utils.c:362
 msgid "GSM Modem's SIM PUK required"
 msgstr "Слід вказати код розпізнавання (PUK) SIM-картки у модемі GSM"
 
-#: ../clients/common/nm-client-utils.c:414
+#: ../clients/common/nm-client-utils.c:364
 msgid "GSM Modem's SIM wrong"
 msgstr "Помилкова SIM-картка у модемі GSM"
 
-#: ../clients/common/nm-client-utils.c:416
+#: ../clients/common/nm-client-utils.c:366
 msgid "InfiniBand device does not support connected mode"
 msgstr "У пристрої InfiniBand не передбачено режиму з’єднання"
 
-#: ../clients/common/nm-client-utils.c:418
+#: ../clients/common/nm-client-utils.c:368
 msgid "A dependency of the connection failed"
 msgstr "Не вдалося використати залежність з’єднання"
 
-#: ../clients/common/nm-client-utils.c:420
+#: ../clients/common/nm-client-utils.c:370
 msgid "A problem with the RFC 2684 Ethernet over ADSL bridge"
 msgstr "Проблема з містком Ethernet на основі ADSL відповідно до RFC 2684"
 
-#: ../clients/common/nm-client-utils.c:422
+#: ../clients/common/nm-client-utils.c:372
 msgid "ModemManager is unavailable"
 msgstr "ModemManager недоступний"
 
-#: ../clients/common/nm-client-utils.c:424
+#: ../clients/common/nm-client-utils.c:374
 msgid "The Wi-Fi network could not be found"
 msgstr "Не вдалося виявити мережу Wi-Fi"
 
-#: ../clients/common/nm-client-utils.c:426
+#: ../clients/common/nm-client-utils.c:376
 msgid "A secondary connection of the base connection failed"
 msgstr "Не вдалося встановити вторинне щодо основного з’єднання"
 
-#: ../clients/common/nm-client-utils.c:428
+#: ../clients/common/nm-client-utils.c:378
 msgid "DCB or FCoE setup failed"
 msgstr "Не вдалося налаштувати DCB або FCoE"
 
-#: ../clients/common/nm-client-utils.c:430
+#: ../clients/common/nm-client-utils.c:380
 msgid "teamd control failed"
 msgstr "помилка керування teamd"
 
-#: ../clients/common/nm-client-utils.c:432
+#: ../clients/common/nm-client-utils.c:382
 msgid "Modem failed or no longer available"
 msgstr "Помилка модема або модем недоступний"
 
-#: ../clients/common/nm-client-utils.c:434
+#: ../clients/common/nm-client-utils.c:384
 msgid "Modem now ready and available"
 msgstr "Модем готовий до роботи і доступний"
 
-#: ../clients/common/nm-client-utils.c:436
+#: ../clients/common/nm-client-utils.c:386
 msgid "SIM PIN was incorrect"
 msgstr "PIN-код SIM-картки є некоректним"
 
-#: ../clients/common/nm-client-utils.c:438
+#: ../clients/common/nm-client-utils.c:388
 msgid "New connection activation was enqueued"
 msgstr "Дію з активації нового з’єднання додано до черги"
 
-#: ../clients/common/nm-client-utils.c:440
+#: ../clients/common/nm-client-utils.c:390
 msgid "The device's parent changed"
 msgstr "Змінено батьківський каталог пристрою"
 
-#: ../clients/common/nm-client-utils.c:442
+#: ../clients/common/nm-client-utils.c:392
 msgid "The device parent's management changed"
 msgstr "Змінено керування батьківським каталогом пристрою"
 
-#: ../clients/common/nm-client-utils.c:444
+#: ../clients/common/nm-client-utils.c:394
 msgid "OpenVSwitch database connection failed"
 msgstr "Не вдалося встановити з’єднання із базою даних OpenVSwitch"
 
-#: ../clients/common/nm-client-utils.c:446
+#: ../clients/common/nm-client-utils.c:396
 msgid "A duplicate IP address was detected"
 msgstr "Виявлено дублювання IP-адреси"
 
-#: ../clients/common/nm-client-utils.c:448
+#: ../clients/common/nm-client-utils.c:398
 msgid "The selected IP method is not supported"
 msgstr "Підтримки вибраного методу IP не передбачено"
 
 #. TRANSLATORS: Unknown reason for a device state change (NMDeviceStateReason)
 #. TRANSLATORS: Unknown reason for a connection state change (NMActiveConnectionStateReason)
-#: ../clients/common/nm-client-utils.c:452
-#: ../clients/common/nm-client-utils.c:491 ../libnm-glib/nm-device.c:1859
-#: ../libnm/nm-device.c:1360
+#: ../clients/common/nm-client-utils.c:402
+#: ../clients/common/nm-client-utils.c:441 ../libnm-glib/nm-device.c:1860
+#: ../libnm/nm-device.c:1356
 msgid "Unknown"
 msgstr "Невідомо"
 
-#: ../clients/common/nm-client-utils.c:460
+#: ../clients/common/nm-client-utils.c:410
 msgid "Unknown reason"
 msgstr "Невідома причина"
 
-#: ../clients/common/nm-client-utils.c:462
+#: ../clients/common/nm-client-utils.c:412
 msgid "The connection was disconnected"
 msgstr "З’єднання розірвано"
 
-#: ../clients/common/nm-client-utils.c:464
+#: ../clients/common/nm-client-utils.c:414
 msgid "Disconnected by user"
 msgstr "Від’єднано користувачем"
 
-#: ../clients/common/nm-client-utils.c:466
+#: ../clients/common/nm-client-utils.c:416
 msgid "The base network connection was interrupted"
 msgstr "Основне з’єднання з мережею розірвано"
 
-#: ../clients/common/nm-client-utils.c:468
+#: ../clients/common/nm-client-utils.c:418
 msgid "The VPN service stopped unexpectedly"
 msgstr "Служба VPN неочікувано завершила роботу"
 
-#: ../clients/common/nm-client-utils.c:470
+#: ../clients/common/nm-client-utils.c:420
 msgid "The VPN service returned invalid configuration"
 msgstr "Службою VPN повернуто неприпустимі налаштування"
 
-#: ../clients/common/nm-client-utils.c:472
+#: ../clients/common/nm-client-utils.c:422
 msgid "The connection attempt timed out"
 msgstr "Перевищено час очікування на встановлення з’єднання"
 
-#: ../clients/common/nm-client-utils.c:474
+#: ../clients/common/nm-client-utils.c:424
 msgid "The VPN service did not start in time"
 msgstr "Службу VPN не було вчасно запущено"
 
-#: ../clients/common/nm-client-utils.c:476
+#: ../clients/common/nm-client-utils.c:426
 msgid "The VPN service failed to start"
 msgstr "Не вдалося запустити службу VPN"
 
-#: ../clients/common/nm-client-utils.c:478
+#: ../clients/common/nm-client-utils.c:428
 msgid "No valid secrets"
 msgstr "Немає коректних реєстраційних даних"
 
-#: ../clients/common/nm-client-utils.c:480
+#: ../clients/common/nm-client-utils.c:430
 msgid "Invalid secrets"
 msgstr "Некоректні реєстраційні дані"
 
-#: ../clients/common/nm-client-utils.c:482
+#: ../clients/common/nm-client-utils.c:432
 msgid "The connection was removed"
 msgstr "З’єднання було вилучено"
 
-#: ../clients/common/nm-client-utils.c:484
+#: ../clients/common/nm-client-utils.c:434
 msgid "Master connection failed"
 msgstr "Не вдалося встановити основне з’єднання"
 
-#: ../clients/common/nm-client-utils.c:486
+#: ../clients/common/nm-client-utils.c:436
 msgid "Could not create a software link"
 msgstr "Не вдалося створити програмне посилання"
 
-#: ../clients/common/nm-client-utils.c:488
+#: ../clients/common/nm-client-utils.c:438
 msgid "The device disappeared"
 msgstr "Пристрій зник"
 
-#: ../clients/common/nm-meta-setting-access.c:504
+#: ../clients/common/nm-meta-setting-access.c:501
 #, c-format
 msgid "field '%s' has to be alone"
 msgstr "поле «%s» має бути єдиним"
 
-#: ../clients/common/nm-meta-setting-access.c:519
+#: ../clients/common/nm-meta-setting-access.c:516
 #, c-format
 msgid "invalid field '%s%s%s%s%s'; %s%s%s"
 msgstr "некоректне поле «%s%s%s%s%s»; %s%s%s"
@@ -4772,173 +4539,204 @@ msgstr "«%s» не містить коректного налаштування
 msgid "team configuration must be a JSON object"
 msgstr "налаштування команди має бути об’єктом JSON"
 
-#: ../clients/common/nm-meta-setting-desc.c:714
+#: ../clients/common/nm-meta-setting-desc.c:687
 #: ../clients/tui/nmt-mtu-entry.c:84
 msgid "(default)"
 msgstr "(типово)"
 
-#: ../clients/common/nm-meta-setting-desc.c:855
+#: ../clients/common/nm-meta-setting-desc.c:802
 msgid "auto"
 msgstr "авто"
 
-#: ../clients/common/nm-meta-setting-desc.c:1007
+#: ../clients/common/nm-meta-setting-desc.c:950
 #, c-format
 msgid "%s (%s)"
 msgstr "%s (%s)"
 
-#: ../clients/common/nm-meta-setting-desc.c:1131
+#: ../clients/common/nm-meta-setting-desc.c:1074
 #, c-format
 msgid "'%s' is out of range [%lli, %lli]"
 msgstr "«%s» поза межами припустимого діапазону [%lli, %lli]"
 
-#: ../clients/common/nm-meta-setting-desc.c:1137
+#: ../clients/common/nm-meta-setting-desc.c:1080
 #, c-format
 msgid "'%s' is not a valid number"
 msgstr "«%s» не є коректним числом"
 
-#: ../clients/common/nm-meta-setting-desc.c:1187
+#: ../clients/common/nm-meta-setting-desc.c:1130
 #, c-format
 msgid "'%s' is out of range [0, %u]"
 msgstr "«%s» поза діапазоном [0, %u]"
 
-#: ../clients/common/nm-meta-setting-desc.c:1230
+#: ../clients/common/nm-meta-setting-desc.c:1167
 #, c-format
 msgid "'%s' is not a valid Ethernet MAC"
 msgstr "«%s» не є коректним значенням MAC-адреси Ethernet"
 
-#: ../clients/common/nm-meta-setting-desc.c:1334
+#: ../clients/common/nm-meta-setting-desc.c:1191
+#, c-format
+#| msgid "'%u' flags are not valid; use combination of %s"
+msgid "'%s' is not a valid flag; use <0-%d> or a combination of '%s'"
+msgstr ""
+"«%s» не є коректним прапорцем; скористайтеся <0-%d> або комбінацією «%s»"
+
+#: ../clients/common/nm-meta-setting-desc.c:1203
+#, c-format
+msgid "'%s' sum is higher than all flags => all flags set"
+msgstr ""
+"сума «%s» перевищує усі прапорці => встановлено нове значення для усіх "
+"прапорців"
+
+#: ../clients/common/nm-meta-setting-desc.c:1307
 #, c-format
 msgid "invalid option '%s', use a combination of [%s]"
 msgstr "некоректний параметр «%s», скористайтеся комбінацією [%s]"
 
-#: ../clients/common/nm-meta-setting-desc.c:1339 ../libnm-core/nm-keyfile.c:727
+#: ../clients/common/nm-meta-setting-desc.c:1312
+#: ../libnm-core/nm-keyfile-reader.c:623
 #, c-format
 msgid "invalid option '%s', use one of [%s]"
 msgstr ""
 "некоректний параметр «%s», скористайтеся одним із таких параметрів [%s]"
 
-#: ../clients/common/nm-meta-setting-desc.c:1458
+#: ../clients/common/nm-meta-setting-desc.c:1435
 #, c-format
 msgid "%d (key)"
 msgstr "%d (ключ)"
 
-#: ../clients/common/nm-meta-setting-desc.c:1460
+#: ../clients/common/nm-meta-setting-desc.c:1437
 #, c-format
 msgid "%d (passphrase)"
 msgstr "%d (пароль)"
 
-#: ../clients/common/nm-meta-setting-desc.c:1463
+#: ../clients/common/nm-meta-setting-desc.c:1440
+#: ../clients/common/nm-meta-setting-desc.c:1529
 #, c-format
 msgid "%d (unknown)"
 msgstr "%d (невідомо)"
 
-#: ../clients/common/nm-meta-setting-desc.c:1495
+#: ../clients/common/nm-meta-setting-desc.c:1472
 msgid "0 (NONE)"
 msgstr "0 (НЕМАЄ)"
 
-#: ../clients/common/nm-meta-setting-desc.c:1501
+#: ../clients/common/nm-meta-setting-desc.c:1478
 msgid "REORDER_HEADERS, "
 msgstr "ПЕРЕВПОРЯДКОВУВАННЯ_ЗАГОЛОВКІВ, "
 
-#: ../clients/common/nm-meta-setting-desc.c:1503
+#: ../clients/common/nm-meta-setting-desc.c:1480
 msgid "GVRP, "
 msgstr "GVRP, "
 
-#: ../clients/common/nm-meta-setting-desc.c:1505
+#: ../clients/common/nm-meta-setting-desc.c:1482
 msgid "LOOSE_BINDING, "
 msgstr "ШИРОКЕ_ПРИВ’ЯЗУВАННЯ, "
 
-#: ../clients/common/nm-meta-setting-desc.c:1507
+#: ../clients/common/nm-meta-setting-desc.c:1484
 msgid "MVRP, "
 msgstr "MVRP, "
 
-#: ../clients/common/nm-meta-setting-desc.c:1547
+#: ../clients/common/nm-meta-setting-desc.c:1523
+#, c-format
+msgid "%d (disabled)"
+msgstr "%d (вимкнено)"
+
+#: ../clients/common/nm-meta-setting-desc.c:1525
+#, c-format
+msgid "%d (enabled, prefer public IP)"
+msgstr "%d (увімкнено, перевага відкритого IP)"
+
+#: ../clients/common/nm-meta-setting-desc.c:1527
+#, c-format
+msgid "%d (enabled, prefer temporary IP)"
+msgstr "%d (увімкнено, перевага тимчасового IP)"
+
+#: ../clients/common/nm-meta-setting-desc.c:1542
 msgid "0 (none)"
 msgstr "0 (немає)"
 
-#: ../clients/common/nm-meta-setting-desc.c:1553
+#: ../clients/common/nm-meta-setting-desc.c:1548
 msgid "agent-owned, "
 msgstr ", власником є агент, "
 
-#: ../clients/common/nm-meta-setting-desc.c:1555
+#: ../clients/common/nm-meta-setting-desc.c:1550
 msgid "not saved, "
 msgstr "не збережено, "
 
-#: ../clients/common/nm-meta-setting-desc.c:1557
+#: ../clients/common/nm-meta-setting-desc.c:1552
 msgid "not required, "
 msgstr "не є обов’язковим, "
 
-#: ../clients/common/nm-meta-setting-desc.c:1622
+#: ../clients/common/nm-meta-setting-desc.c:1617
 #, c-format
 msgid "'%s' is not valid; use <option>=<value>"
 msgstr ""
 "Запис «%s» є некоректним; слід використовувати формат <параметр>=<значення>"
 
-#: ../clients/common/nm-meta-setting-desc.c:1661
+#: ../clients/common/nm-meta-setting-desc.c:1656
 msgid "no item to remove"
 msgstr "немає пунктів для вилучення"
 
-#: ../clients/common/nm-meta-setting-desc.c:1665
+#: ../clients/common/nm-meta-setting-desc.c:1660
 #, c-format
 msgid "index '%d' is not in range <0-%d>"
 msgstr "індекс «%d» лежить поза діапазоном <0-%d>"
 
-#: ../clients/common/nm-meta-setting-desc.c:1680
+#: ../clients/common/nm-meta-setting-desc.c:1675
 #, c-format
 msgid "invalid option '%s'"
 msgstr "некоректний параметр, «%s»"
 
-#: ../clients/common/nm-meta-setting-desc.c:1682
+#: ../clients/common/nm-meta-setting-desc.c:1677
 msgid "missing option"
 msgstr "пропущено параметр"
 
-#: ../clients/common/nm-meta-setting-desc.c:1706
+#: ../clients/common/nm-meta-setting-desc.c:1701
 #, c-format
 msgid "'%s' is not a valid MAC"
 msgstr "«%s» не є коректною MAC-адресою"
 
-#: ../clients/common/nm-meta-setting-desc.c:1733
-#: ../clients/common/nm-meta-setting-desc.c:1830
-#: ../clients/common/nm-meta-setting-desc.c:4664
+#: ../clients/common/nm-meta-setting-desc.c:1729
+#: ../clients/common/nm-meta-setting-desc.c:1826
+#: ../clients/common/nm-meta-setting-desc.c:4668
 #, c-format
 msgid "'%s' is not valid"
 msgstr "«%s» не є коректним"
 
-#: ../clients/common/nm-meta-setting-desc.c:1774
+#: ../clients/common/nm-meta-setting-desc.c:1770
 #, c-format
 msgid "'%u' flags are not valid; use combination of %s"
 msgstr "прапорці «%u» не є коректними; скористайтеся комбінацією з %s"
 
-#: ../clients/common/nm-meta-setting-desc.c:1810
+#: ../clients/common/nm-meta-setting-desc.c:1806
 #, c-format
 msgid "'%s' is not a valid number (or out of range)"
 msgstr ""
 "«%s» не є коректним значенням номер (або лежить поза діапазоном припустимих "
 "номерів)"
 
-#: ../clients/common/nm-meta-setting-desc.c:1929
+#: ../clients/common/nm-meta-setting-desc.c:1925
 #, c-format
 msgid "'%s' is not a valid hex character"
 msgstr "«%s» не є коректним шістнадцятковим символом"
 
-#: ../clients/common/nm-meta-setting-desc.c:2218
+#: ../clients/common/nm-meta-setting-desc.c:2204
 #, c-format
 msgid "the property doesn't contain EAP method '%s'"
 msgstr "властивість не містить методу EAP «%s»"
 
-#: ../clients/common/nm-meta-setting-desc.c:2241
+#: ../clients/common/nm-meta-setting-desc.c:2227
 #, c-format
 msgid "the property doesn't contain alternative subject match '%s'"
 msgstr "властивість не містить альтернативної відповідності «%s»"
 
-#: ../clients/common/nm-meta-setting-desc.c:2267
+#: ../clients/common/nm-meta-setting-desc.c:2253
 #, c-format
 msgid "the property doesn't contain \"phase2\" alternative subject match '%s'"
 msgstr ""
 "властивість не містить відповідності альтернативного призначення «phase2» "
 "«%s»"
 
-#: ../clients/common/nm-meta-setting-desc.c:2389
+#: ../clients/common/nm-meta-setting-desc.c:2374
 #, c-format
 msgid ""
 "Enter a list of bonding options formatted as:\n"
@@ -4976,234 +4774,249 @@ msgstr ""
 #. * hacky: we can not see if the type is already set, because
 #. * nmc_setting_set_property() is called only after the property
 #. * we're setting (type) has been removed.
-#: ../clients/common/nm-meta-setting-desc.c:2452
+#: ../clients/common/nm-meta-setting-desc.c:2434
 #, c-format
 msgid "Can not change the connection type"
 msgstr "Не вдалося змінити тип з’єднання"
 
-#: ../clients/common/nm-meta-setting-desc.c:2557
+#: ../clients/common/nm-meta-setting-desc.c:2539
 #, c-format
 msgid "the property doesn't contain permission '%s'"
 msgstr "властивість не містить права доступу «%s»"
 
-#: ../clients/common/nm-meta-setting-desc.c:2578
+#: ../clients/common/nm-meta-setting-desc.c:2560
 #, c-format
 msgid "'%s' is not valid master; use ifname or connection UUID"
 msgstr ""
 "«%s» не є коректним значенням основного інтерфейсу; скористайтеся назвою "
 "інтерфейсу або UUID з’єднання"
 
-#: ../clients/common/nm-meta-setting-desc.c:2675
+#: ../clients/common/nm-meta-setting-desc.c:2657
 #, c-format
 msgid "the value '%s' is not a valid UUID"
 msgstr "значення «%s» не є коректним UUID"
 
-#: ../clients/common/nm-meta-setting-desc.c:2682
+#: ../clients/common/nm-meta-setting-desc.c:2664
 #, c-format
 msgid "the property doesn't contain UUID '%s'"
 msgstr "властивість не містить UUID «%s»"
 
-#: ../clients/common/nm-meta-setting-desc.c:2751
+#: ../clients/common/nm-meta-setting-desc.c:2731
 msgid "0 (disabled)"
 msgstr "0 (вимкнено)"
 
-#: ../clients/common/nm-meta-setting-desc.c:2757
+#: ../clients/common/nm-meta-setting-desc.c:2737
 msgid "enabled, "
 msgstr "увімкнено, "
 
-#: ../clients/common/nm-meta-setting-desc.c:2759
+#: ../clients/common/nm-meta-setting-desc.c:2739
 msgid "advertise, "
 msgstr "оголошення, "
 
-#: ../clients/common/nm-meta-setting-desc.c:2761
+#: ../clients/common/nm-meta-setting-desc.c:2741
 msgid "willing, "
 msgstr "надання, "
 
-#: ../clients/common/nm-meta-setting-desc.c:2883
+#: ../clients/common/nm-meta-setting-desc.c:2863
 #, c-format
 msgid "'%s' is not a valid DCB flag"
 msgstr "«%s» не є коректним прапорцем DCB"
 
-#: ../clients/common/nm-meta-setting-desc.c:2912
+#: ../clients/common/nm-meta-setting-desc.c:2892
 msgid "must contain 8 comma-separated numbers"
 msgstr "має містити 8 чисел, відокремлених комами"
 
-#: ../clients/common/nm-meta-setting-desc.c:2928
+#: ../clients/common/nm-meta-setting-desc.c:2908
 #, c-format
 msgid "'%s' not a number between 0 and %u (inclusive) or %u"
 msgstr "«%s» не є числом у діапазоні від 0 до %u (включно) або %u"
 
-#: ../clients/common/nm-meta-setting-desc.c:2931
+#: ../clients/common/nm-meta-setting-desc.c:2911
 #, c-format
 msgid "'%s' not a number between 0 and %u (inclusive)"
 msgstr "«%s» не є числом у діапазоні від 0 до %u (включно)"
 
-#: ../clients/common/nm-meta-setting-desc.c:2952
+#: ../clients/common/nm-meta-setting-desc.c:2932
 #, c-format
 msgid "changes will have no effect until '%s' includes 1 (enabled)"
 msgstr "зміни не буде задіяно, доки «%s» не включатиме 1 (увімкнено)"
 
-#: ../clients/common/nm-meta-setting-desc.c:3007
+#: ../clients/common/nm-meta-setting-desc.c:2987
 #, c-format
 msgid "bandwidth percentages must total 100%%"
 msgstr "сума частин каналу у відсотках має складати 100%%"
 
-#: ../clients/common/nm-meta-setting-desc.c:3080
-#: ../clients/common/nm-meta-setting-desc.c:3086
+#: ../clients/common/nm-meta-setting-desc.c:3060
+#: ../clients/common/nm-meta-setting-desc.c:3066
 msgid "SIM operator ID must be a 5 or 6 number MCCMNC code"
 msgstr ""
 "Ідентифікатор оператора SIM має бути п’яти- або шестицифровим кодом MCCMNC"
 
-#: ../clients/common/nm-meta-setting-desc.c:3110
+#: ../clients/common/nm-meta-setting-desc.c:3090
 #, c-format
 msgid "'%s' is not a valid IBoIP P_Key"
 msgstr "«%s» не є коректним закритим ключем IBoIP"
 
-#: ../clients/common/nm-meta-setting-desc.c:3133
+#: ../clients/common/nm-meta-setting-desc.c:3113
 msgid "default"
 msgstr "типовий"
 
-#: ../clients/common/nm-meta-setting-desc.c:3272
-#: ../clients/common/nm-meta-setting-desc.c:3289
+#: ../clients/common/nm-meta-setting-desc.c:3249
+#: ../clients/common/nm-meta-setting-desc.c:3266
 #, c-format
 msgid "invalid IPv4 address '%s'"
 msgstr "некоректна адреса IPv4, «%s»"
 
-#: ../clients/common/nm-meta-setting-desc.c:3295
-#: ../clients/common/nm-meta-setting-desc.c:3539
+#: ../clients/common/nm-meta-setting-desc.c:3272
+#: ../clients/common/nm-meta-setting-desc.c:3524
 #, c-format
 msgid "the property doesn't contain DNS server '%s'"
 msgstr "властивість не містить сервера DNS «%s»"
 
-#: ../clients/common/nm-meta-setting-desc.c:3333
-#: ../clients/common/nm-meta-setting-desc.c:3577
+#: ../clients/common/nm-meta-setting-desc.c:3310
+#: ../clients/common/nm-meta-setting-desc.c:3562
 #, c-format
 msgid "the property doesn't contain DNS search domain '%s'"
 msgstr "властивість не містить домену пошуку DNS «%s»"
 
-#: ../clients/common/nm-meta-setting-desc.c:3370
-#: ../clients/common/nm-meta-setting-desc.c:3614
+#: ../clients/common/nm-meta-setting-desc.c:3347
+#: ../clients/common/nm-meta-setting-desc.c:3599
 #, c-format
 msgid "the property doesn't contain DNS option '%s'"
 msgstr "властивість не містить параметра DNS «%s»"
 
-#: ../clients/common/nm-meta-setting-desc.c:3413
-#: ../clients/common/nm-meta-setting-desc.c:3663
+#: ../clients/common/nm-meta-setting-desc.c:3390
+#: ../clients/common/nm-meta-setting-desc.c:3648
 #, c-format
 msgid "the property doesn't contain IP address '%s'"
 msgstr "властивість не містить адреси IP «%s»"
 
-#: ../clients/common/nm-meta-setting-desc.c:3433
-#: ../clients/common/nm-meta-setting-desc.c:3682
+#: ../clients/common/nm-meta-setting-desc.c:3410
+#: ../clients/common/nm-meta-setting-desc.c:3667
 #, c-format
 msgid "invalid gateway address '%s'"
 msgstr "некоректна адреса шлюзу, «%s»"
 
-#: ../clients/common/nm-meta-setting-desc.c:3472
-#: ../clients/common/nm-meta-setting-desc.c:3723
+#: ../clients/common/nm-meta-setting-desc.c:3449
+#: ../clients/common/nm-meta-setting-desc.c:3708
 #, c-format
 msgid "the property doesn't contain route '%s'"
 msgstr "властивість не містить маршруту «%s»"
 
-#: ../clients/common/nm-meta-setting-desc.c:3516
-#: ../clients/common/nm-meta-setting-desc.c:3533
+#: ../clients/common/nm-meta-setting-desc.c:3501
+#: ../clients/common/nm-meta-setting-desc.c:3518
 #, c-format
 msgid "invalid IPv6 address '%s'"
 msgstr "некоректна адреса IPv6, «%s»"
 
-#: ../clients/common/nm-meta-setting-desc.c:3760
+#: ../clients/common/nm-meta-setting-desc.c:3726
+#: ../libnm-core/nm-setting-gsm.c:381 ../libnm-util/nm-setting-gsm.c:364
+#, c-format
+msgid "'%s' is not a number"
+msgstr "«%s» не є числом"
+
+#: ../clients/common/nm-meta-setting-desc.c:3733
+#, c-format
+msgid "'%s' is not valid; use 0, 1, or 2"
+msgstr ""
+"«%s» не є коректним значенням; можна використовувати лише значення 0, 1, 2"
+
+#: ../clients/common/nm-meta-setting-desc.c:3767
 #, c-format
 msgid "'%s' is not a valid channel; use <1-13>"
 msgstr "«%s» не є коректним каналом; канал має належати діапазону <1-13>"
 
-#: ../clients/common/nm-meta-setting-desc.c:3821
+#: ../clients/common/nm-meta-setting-desc.c:3827
 msgid ""
 "The valid syntax is: '[root | parent <handle>] [handle <handle>] <qdisc>'"
 msgstr ""
-"Коректна синтаксична конструкція: '[root | parent <дескриптор>] [handle "
-"<дескриптор>] <qdisc>'"
+"Коректна синтаксична конструкція: '[root | parent <дескриптор>] [handle <"
+"дескриптор>] <qdisc>'"
 
-#: ../clients/common/nm-meta-setting-desc.c:3844
+#: ../clients/common/nm-meta-setting-desc.c:3850
 #, c-format
+#| msgid "the property doesn't contain string '%s'"
 msgid "the property doesn't contain qdisc '%s'"
 msgstr "властивість не містить qdisc «%s»"
 
-#: ../clients/common/nm-meta-setting-desc.c:3898
+#: ../clients/common/nm-meta-setting-desc.c:3903
 msgid ""
 "The valid syntax is: '[root | parent <handle>] [handle <handle>] <tfilter>'"
 msgstr ""
-"Коректна синтаксична конструкція: '[root | parent <дескриптор>] [handle "
-"<дескриптор>] <tfilter>'"
+"Коректна синтаксична конструкція: '[root | parent <дескриптор>] [handle <"
+"дескриптор>] <tfilter>'"
 
-#: ../clients/common/nm-meta-setting-desc.c:3921
+#: ../clients/common/nm-meta-setting-desc.c:3926
 #, c-format
+#| msgid "the property doesn't contain route '%s'"
 msgid "the property doesn't contain tfilter '%s'"
 msgstr "властивість не містить tfilter «%s»"
 
-#: ../clients/common/nm-meta-setting-desc.c:3988
+#: ../clients/common/nm-meta-setting-desc.c:3993
 #, c-format
 msgid "the property doesn't contain string '%s'"
 msgstr "властивість не містить рядка «%s»"
 
-#: ../clients/common/nm-meta-setting-desc.c:4063
-#: ../clients/common/nm-meta-setting-desc.c:4137
+#: ../clients/common/nm-meta-setting-desc.c:4067
+#: ../clients/common/nm-meta-setting-desc.c:4140
 #, c-format
+#| msgid "the property doesn't contain route '%s'"
 msgid "the property doesn't contain link watcher '%s'"
 msgstr "властивість не містить засобу спостереження за зв'язком «%s»"
 
-#: ../clients/common/nm-meta-setting-desc.c:4243
+#: ../clients/common/nm-meta-setting-desc.c:4231
 #, c-format
 msgid "only one mapping at a time is supported; taking the first one (%s)"
 msgstr ""
 "передбачено підтримку лише одної прив’язки одночасно; вибрано першу "
 "прив’язку (%s)"
 
-#: ../clients/common/nm-meta-setting-desc.c:4251
+#: ../clients/common/nm-meta-setting-desc.c:4239
 #, c-format
 msgid "the property doesn't contain mapping '%s'"
 msgstr "властивість не містить прив’язки «%s»"
 
-#: ../clients/common/nm-meta-setting-desc.c:4259
+#: ../clients/common/nm-meta-setting-desc.c:4247
 msgid "no priority to remove"
 msgstr "немає пріоритетності для вилучення"
 
-#: ../clients/common/nm-meta-setting-desc.c:4263
+#: ../clients/common/nm-meta-setting-desc.c:4251
 #, c-format
 msgid "index '%d' is not in the range of <0-%d>"
 msgstr "індекс «%d» лежить поза діапазоном <0-%d>"
 
-#: ../clients/common/nm-meta-setting-desc.c:4332
+#: ../clients/common/nm-meta-setting-desc.c:4320
 #, c-format
 msgid "'%s' cannot be empty"
 msgstr "Не можна вказувати порожнє значення «%s»"
 
-#: ../clients/common/nm-meta-setting-desc.c:4371
-#: ../clients/common/nm-meta-setting-desc.c:4502
-#: ../libnm-core/nm-setting-wired.c:664 ../libnm-core/nm-setting-wireless.c:859
-#: ../libnm-core/nm-setting-wireless.c:871 ../libnm-util/nm-setting-wired.c:645
-#: ../libnm-util/nm-setting-wireless.c:858
-#: ../libnm-util/nm-setting-wireless.c:872
+#: ../clients/common/nm-meta-setting-desc.c:4359
+#: ../clients/common/nm-meta-setting-desc.c:4490
+#: ../libnm-core/nm-setting-wired.c:664 ../libnm-core/nm-setting-wireless.c:857
+#: ../libnm-core/nm-setting-wireless.c:869 ../libnm-util/nm-setting-wired.c:646
+#: ../libnm-util/nm-setting-wireless.c:859
+#: ../libnm-util/nm-setting-wireless.c:873
 #, c-format
 msgid "'%s' is not a valid MAC address"
 msgstr "%s не є припустимою MAC-адресою"
 
-#: ../clients/common/nm-meta-setting-desc.c:4377
-#: ../clients/common/nm-meta-setting-desc.c:4508
+#: ../clients/common/nm-meta-setting-desc.c:4365
+#: ../clients/common/nm-meta-setting-desc.c:4496
 #, c-format
 msgid "the property doesn't contain MAC address '%s'"
 msgstr "властивість не містить адреси MAC «%s»"
 
-#: ../clients/common/nm-meta-setting-desc.c:4395
+#: ../clients/common/nm-meta-setting-desc.c:4383
 #, c-format
 msgid "'%s' is not valid; 2 or 3 strings should be provided"
 msgstr "«%s» не є коректним значенням; слід вказати 2 або 3 рядки"
 
-#: ../clients/common/nm-meta-setting-desc.c:4409
+#: ../clients/common/nm-meta-setting-desc.c:4397
 #, c-format
 msgid "'%s' string value should consist of 1 - 199 characters"
 msgstr "Рядок значення «%s» має складатися з від 1 до 199 символів"
 
-#: ../clients/common/nm-meta-setting-desc.c:4441
+#: ../clients/common/nm-meta-setting-desc.c:4429
 #, c-format
 msgid ""
 "Enter a list of S/390 options formatted as:\n"
@@ -5214,24 +5027,24 @@ msgstr ""
 "  параметр = <значення>, параметр = <значення>,...\n"
 "Коректні значення параметрів: %s\n"
 
-#: ../clients/common/nm-meta-setting-desc.c:4475
+#: ../clients/common/nm-meta-setting-desc.c:4463
 #, c-format
 msgid "'%s' is not a valid channel"
 msgstr "«%s» не є коректним каналом"
 
-#: ../clients/common/nm-meta-setting-desc.c:4481
+#: ../clients/common/nm-meta-setting-desc.c:4469
 #, c-format
 msgid "'%ld' is not a valid channel"
 msgstr "«%ld» не є коректним каналом"
 
-#: ../clients/common/nm-meta-setting-desc.c:4564
-#: ../clients/common/nm-meta-setting-desc.c:4600
-#: ../clients/common/nm-meta-setting-desc.c:4636
+#: ../clients/common/nm-meta-setting-desc.c:4568
+#: ../clients/common/nm-meta-setting-desc.c:4604
+#: ../clients/common/nm-meta-setting-desc.c:4640
 #, c-format
 msgid "the property doesn't contain protocol '%s'"
 msgstr "властивість не містить протоколу «%s»"
 
-#: ../clients/common/nm-meta-setting-desc.c:4673
+#: ../clients/common/nm-meta-setting-desc.c:4677
 #, c-format
 msgid ""
 "'%s' not compatible with %s '%s', please change the key or set the right %s "
@@ -5240,56 +5053,56 @@ msgstr ""
 "«%s» є несумісним з %s «%s», будь ласка, спочатку змініть ключ або "
 "встановіть правильне значення %s."
 
-#: ../clients/common/nm-meta-setting-desc.c:4683
+#: ../clients/common/nm-meta-setting-desc.c:4687
 #, c-format
 msgid "WEP key is guessed to be of '%s'"
 msgstr "Припускаємо, що ключем WEP є «%s»"
 
-#: ../clients/common/nm-meta-setting-desc.c:4688
+#: ../clients/common/nm-meta-setting-desc.c:4692
 #, c-format
 msgid "WEP key index set to '%d'"
 msgstr "індекс ключа WEP встановлено у значення «%d»"
 
-#: ../clients/common/nm-meta-setting-desc.c:4727
+#: ../clients/common/nm-meta-setting-desc.c:4731
 #, c-format
 msgid "'%s' is not compatible with '%s' type, please change or delete the key."
 msgstr "«%s» несумісний з типом «%s». Будь ласка, змініть або вилучіть ключ."
 
-#: ../clients/common/nm-meta-setting-desc.c:4737
+#: ../clients/common/nm-meta-setting-desc.c:4741
 #, c-format
 msgid "'%s' is not a valid PSK"
 msgstr "«%s» не є коректним PSK"
 
-#: ../clients/common/nm-meta-setting-desc.c:4769
+#: ../clients/common/nm-meta-setting-desc.c:4773
 msgid "Bonding primary interface [none]"
 msgstr "Основний інтерфейс прив’язування [типово немає]"
 
 #. this is a virtual property, only needed during "ask" mode.
-#: ../clients/common/nm-meta-setting-desc.c:4776
+#: ../clients/common/nm-meta-setting-desc.c:4780
 msgid "Bonding monitoring mode"
 msgstr "Режим спостереження за зв’язком"
 
-#: ../clients/common/nm-meta-setting-desc.c:4785
+#: ../clients/common/nm-meta-setting-desc.c:4789
 msgid "Bonding miimon [100]"
 msgstr "Частота спостереження MII прив’язування [типово 100]"
 
-#: ../clients/common/nm-meta-setting-desc.c:4793
+#: ../clients/common/nm-meta-setting-desc.c:4797
 msgid "Bonding downdelay [0]"
 msgstr "downdelay прив’язування [типово 0]"
 
-#: ../clients/common/nm-meta-setting-desc.c:4801
+#: ../clients/common/nm-meta-setting-desc.c:4805
 msgid "Bonding updelay [0]"
 msgstr "updelay прив’язування [типово 0]"
 
-#: ../clients/common/nm-meta-setting-desc.c:4809
+#: ../clients/common/nm-meta-setting-desc.c:4813
 msgid "Bonding arp-interval [0]"
 msgstr "arp-interval прив’язування [типово 0]"
 
-#: ../clients/common/nm-meta-setting-desc.c:4817
+#: ../clients/common/nm-meta-setting-desc.c:4821
 msgid "Bonding arp-ip-target [none]"
 msgstr "arp-ip-target прив’язування [типово немає]"
 
-#: ../clients/common/nm-meta-setting-desc.c:4825
+#: ../clients/common/nm-meta-setting-desc.c:4829
 msgid "LACP rate ('slow' or 'fast') [slow]"
 msgstr "Швидкість LACP (slow або fast) [slow]"
 
@@ -5297,7 +5110,7 @@ msgstr "Швидкість LACP (slow або fast) [slow]"
 #. * that the actual type is (gboolean(*)(type *)).
 #. macro that returns @func as const (guint32(*)(NMSetting*)) type, but checks
 #. * that the actual type is (guint32(*)(type *)).
-#: ../clients/common/nm-meta-setting-desc.c:4938
+#: ../clients/common/nm-meta-setting-desc.c:4942
 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 "
@@ -5316,7 +5129,7 @@ msgstr ""
 "\"roundrobin\"}, \"ports\": {\"eth1\": {}, \"eth2\": {}} }\n"
 "          set team.config /etc/my-team.conf\n"
 
-#: ../clients/common/nm-meta-setting-desc.c:4946
+#: ../clients/common/nm-meta-setting-desc.c:4950
 msgid ""
 "Enter a list of link watchers formatted as dictionaries where the keys are "
 "teamd properties. Dictionary pairs are in the form: key=value and pairs are "
@@ -5341,13 +5154,13 @@ msgid ""
 "   name=arp_ping source-host=172.16.1.1 target-host=172.16.1.254, "
 "name=ethtool delay-up=3\n"
 msgstr ""
-"Введіть список засобів спостереження за зв'язком у форматі словників, де "
-"записи є властивостями teamd. Словникові пари слід вказувати у такому "
-"форматі: ключ=значення. Пари слід відокремлювати пробілами (« »). Словники "
-"слід відокремлювати комами («,»).\n"
-"Дозволені і обов'язкові ключі у словнику залежать від типу засобу "
-"спостереження. Єдиною спільною властивістю для усіх засобів спостереження є "
-"«name»*, яка визначає назву засобу спостереження.\n"
+"Введіть список засобів спостереження за зв'язком у форматі словників, де"
+" записи є властивостями teamd. Словникові пари слід вказувати у такому"
+" форматі: ключ=значення. Пари слід відокремлювати пробілами (« »). Словники"
+" слід відокремлювати комами («,»).\n"
+"Дозволені і обов'язкові ключі у словнику залежать від типу засобу"
+" спостереження. Єдиною спільною властивістю для усіх засобів спостереження є"
+" «name»*, яка визначає назву засобу спостереження.\n"
 "\n"
 "Властивості, доступні для засобу спостереження «ethtool»:\n"
 "  'delay-up', 'delay-down'\n"
@@ -5355,8 +5168,8 @@ msgstr ""
 "Властивості, доступні для засобу спостереження «nsna_ping»:\n"
 "  'init-wait', 'interval', 'missed-max', 'target-host'*\n"
 "\n"
-"Властивості, доступні для засобу спостереження «arp_ping», є тими самими, що "
-"і для «nsna_ping» із додаванням таких властивостей:\n"
+"Властивості, доступні для засобу спостереження «arp_ping», є тими самими, що"
+" і для «nsna_ping» із додаванням таких властивостей:\n"
 "  'source-host'*, 'validate-active', 'validate-inactive', 'send-always'.\n"
 "\n"
 "Властивості, які позначено зірочкою («*») є обов'язковими.\n"
@@ -5365,7 +5178,7 @@ msgstr ""
 "   name=arp_ping source-host=172.16.1.1 target-host=172.16.1.254, "
 "name=ethtool delay-up=3\n"
 
-#: ../clients/common/nm-meta-setting-desc.c:4996
+#: ../clients/common/nm-meta-setting-desc.c:5001
 msgid ""
 "Enter file path to CA certificate (optionally prefixed with file://).\n"
 "  [file://]<file path>\n"
@@ -5378,7 +5191,7 @@ msgstr ""
 "форматі простого масиву даних.\n"
 "Приклад: /home/cimrman/cacert.crt\n"
 
-#: ../clients/common/nm-meta-setting-desc.c:5030
+#: ../clients/common/nm-meta-setting-desc.c:5035
 msgid ""
 "Enter file path to client certificate (optionally prefixed with file://).\n"
 "  [file://]<file path>\n"
@@ -5392,7 +5205,7 @@ msgstr ""
 "форматі простого масиву даних.\n"
 "Приклад: /home/cimrman/jara.crt\n"
 
-#: ../clients/common/nm-meta-setting-desc.c:5087
+#: ../clients/common/nm-meta-setting-desc.c:5092
 msgid ""
 "Enter file path to CA certificate for inner authentication (optionally "
 "prefixed\n"
@@ -5408,7 +5221,7 @@ msgstr ""
 "форматі простого масиву даних.\n"
 "Приклад: /home/cimrman/ca-zweite-phase.crt\n"
 
-#: ../clients/common/nm-meta-setting-desc.c:5122
+#: ../clients/common/nm-meta-setting-desc.c:5127
 msgid ""
 "Enter file path to client certificate for inner authentication (optionally "
 "prefixed\n"
@@ -5424,7 +5237,7 @@ msgstr ""
 "форматі простого масиву даних.\n"
 "Приклад: /home/cimrman/jara-zweite-phase.crt\n"
 
-#: ../clients/common/nm-meta-setting-desc.c:5149
+#: ../clients/common/nm-meta-setting-desc.c:5154
 msgid ""
 "Enter bytes as a list of hexadecimal values.\n"
 "Two formats are accepted:\n"
@@ -5446,8 +5259,8 @@ msgstr ""
 "Приклади: ab0455a6ea3a74C2\n"
 "          ab 4 55 0xa6 ea 3a 74 C2\n"
 
-#: ../clients/common/nm-meta-setting-desc.c:5166
-#: ../clients/common/nm-meta-setting-desc.c:5184
+#: ../clients/common/nm-meta-setting-desc.c:5171
+#: ../clients/common/nm-meta-setting-desc.c:5189
 msgid ""
 "Enter path to a private key and the key password (if not set yet):\n"
 "  [file://]<file path> [<password>]\n"
@@ -5461,84 +5274,83 @@ msgstr ""
 "форматі простого масиву даних.\n"
 "Приклад: /home/cimrman/jara-priv-key Dardanely\n"
 
-#: ../clients/common/nm-meta-setting-desc.c:5223
-#: ../clients/common/nm-secret-agent-simple.c:249
-#: ../clients/common/nm-secret-agent-simple.c:347
+#: ../clients/common/nm-meta-setting-desc.c:5228
+#: ../clients/common/nm-secret-agent-simple.c:233
+#: ../clients/common/nm-secret-agent-simple.c:331
 #: ../clients/tui/nmt-page-dsl.c:66 ../clients/tui/nmt-page-wifi.c:332
 msgid "Username"
 msgstr "Користувач"
 
-#: ../clients/common/nm-meta-setting-desc.c:5229
-#: ../clients/common/nm-meta-setting-desc.c:5413
-#: ../clients/common/nm-meta-setting-desc.c:5704
-#: ../clients/common/nm-meta-setting-desc.c:6351
+#: ../clients/common/nm-meta-setting-desc.c:5234
+#: ../clients/common/nm-meta-setting-desc.c:5418
+#: ../clients/common/nm-meta-setting-desc.c:5709
+#: ../clients/common/nm-meta-setting-desc.c:6341
 msgid "Password [none]"
 msgstr "Пароль [типово немає]"
 
-#: ../clients/common/nm-meta-setting-desc.c:5275
+#: ../clients/common/nm-meta-setting-desc.c:5280
 msgid "Bluetooth device address"
 msgstr "Адреса пристрою Bluetooth"
 
-#: ../clients/common/nm-meta-setting-desc.c:5320
-#: ../clients/common/nm-meta-setting-desc.c:5758
-#: ../clients/common/nm-meta-setting-desc.c:7059
-#: ../clients/common/nm-meta-setting-desc.c:7097
-#: ../clients/common/nm-meta-setting-desc.c:7234
-#: ../clients/common/nm-meta-setting-desc.c:7452
+#: ../clients/common/nm-meta-setting-desc.c:5325
+#: ../clients/common/nm-meta-setting-desc.c:5763
+#: ../clients/common/nm-meta-setting-desc.c:7049
+#: ../clients/common/nm-meta-setting-desc.c:7087
+#: ../clients/common/nm-meta-setting-desc.c:7224
 msgid "MAC [none]"
 msgstr "MAC [типово немає]"
 
-#: ../clients/common/nm-meta-setting-desc.c:5326
+#: ../clients/common/nm-meta-setting-desc.c:5331
 msgid "Enable STP [no]"
 msgstr "Увімкнути STP [типово ні]"
 
-#: ../clients/common/nm-meta-setting-desc.c:5332
+#: ../clients/common/nm-meta-setting-desc.c:5337
 msgid "STP priority [32768]"
 msgstr "Пріоритет STP [типово 32768]"
 
-#: ../clients/common/nm-meta-setting-desc.c:5338
+#: ../clients/common/nm-meta-setting-desc.c:5343
 msgid "Forward delay [15]"
 msgstr "Затримка переспрямування [типово 15]"
 
-#: ../clients/common/nm-meta-setting-desc.c:5344
+#: ../clients/common/nm-meta-setting-desc.c:5349
 msgid "Hello time [2]"
 msgstr "Час на вітання [типово 2]"
 
-#: ../clients/common/nm-meta-setting-desc.c:5350
+#: ../clients/common/nm-meta-setting-desc.c:5355
 msgid "Max age [20]"
 msgstr "Макс. вік [типово 20]"
 
-#: ../clients/common/nm-meta-setting-desc.c:5356
+#: ../clients/common/nm-meta-setting-desc.c:5361
 msgid "MAC address ageing time [300]"
 msgstr "Час застарівання MAC-адреси [типово 300]"
 
-#: ../clients/common/nm-meta-setting-desc.c:5362
+#: ../clients/common/nm-meta-setting-desc.c:5367
 msgid "Group forward mask [0]"
 msgstr "Маска групового переспрямовування [0]"
 
-#: ../clients/common/nm-meta-setting-desc.c:5368
+#: ../clients/common/nm-meta-setting-desc.c:5373
 msgid "Enable IGMP snooping [no]"
 msgstr "Увімкнути підглядання IGMP [типово ні]"
 
-#: ../clients/common/nm-meta-setting-desc.c:5380
+#: ../clients/common/nm-meta-setting-desc.c:5385
 msgid "Bridge port priority [32]"
 msgstr "Пріоритетний порт містка [типово 32]"
 
-#: ../clients/common/nm-meta-setting-desc.c:5386
+#: ../clients/common/nm-meta-setting-desc.c:5391
 msgid "Bridge port STP path cost [100]"
 msgstr "Вартість маршруту STP порту містка [типово 100]"
 
-#: ../clients/common/nm-meta-setting-desc.c:5392
+#: ../clients/common/nm-meta-setting-desc.c:5397
 msgid "Hairpin [no]"
 msgstr "Початкова зона [типово немає]"
 
-#: ../clients/common/nm-meta-setting-desc.c:5407
-#: ../clients/common/nm-meta-setting-desc.c:5698
-#: ../clients/common/nm-meta-setting-desc.c:6949
+#: ../clients/common/nm-meta-setting-desc.c:5412
+#: ../clients/common/nm-meta-setting-desc.c:5703
+#: ../clients/common/nm-meta-setting-desc.c:6939
 msgid "Username [none]"
 msgstr "Користувач [типово немає]"
 
-#: ../clients/common/nm-meta-setting-desc.c:5502
+#: ../clients/common/nm-meta-setting-desc.c:5507
 msgid ""
 "Enter a list of user permissions. This is a list of user names formatted "
 "as:\n"
@@ -5553,7 +5365,7 @@ msgstr ""
 "\n"
 "Приклад: alice bob charlie\n"
 
-#: ../clients/common/nm-meta-setting-desc.c:5544
+#: ../clients/common/nm-meta-setting-desc.c:5549
 msgid ""
 "Enter secondary connections that should be activated when this connection "
 "is\n"
@@ -5574,7 +5386,7 @@ msgstr ""
 "\n"
 "Приклад: private-openvpn, fe6ba5d8-c2fc-4aae-b2e3-97efddd8d9a7\n"
 
-#: ../clients/common/nm-meta-setting-desc.c:5561
+#: ../clients/common/nm-meta-setting-desc.c:5566
 msgid ""
 "Enter a value which indicates whether the connection is subject to a data\n"
 "quota, usage costs or other limitations. Accepted options are:\n"
@@ -5590,25 +5402,25 @@ msgstr ""
 "«unknown» — дозволити NetworkManager вибирати значення за допомогою "
 "евристики\n"
 
-#: ../clients/common/nm-meta-setting-desc.c:5715
+#: ../clients/common/nm-meta-setting-desc.c:5720
 msgid "APN"
 msgstr "APN"
 
-#: ../clients/common/nm-meta-setting-desc.c:5767
-#: ../clients/common/nm-meta-setting-desc.c:7122
-#: ../clients/common/nm-meta-setting-desc.c:7268
+#: ../clients/common/nm-meta-setting-desc.c:5772
+#: ../clients/common/nm-meta-setting-desc.c:7112
+#: ../clients/common/nm-meta-setting-desc.c:7258
 msgid "MTU [auto]"
 msgstr "MTU [типово авто]"
 
-#: ../clients/common/nm-meta-setting-desc.c:5786
+#: ../clients/common/nm-meta-setting-desc.c:5791
 msgid "P_KEY [none]"
 msgstr "P_KEY [типово немає]"
 
-#: ../clients/common/nm-meta-setting-desc.c:5795
+#: ../clients/common/nm-meta-setting-desc.c:5800
 msgid "Parent interface [none]"
 msgstr "Батьківський інтерфейс [типово немає]"
 
-#: ../clients/common/nm-meta-setting-desc.c:5818
+#: ../clients/common/nm-meta-setting-desc.c:5823
 msgid ""
 "Enter a list of IPv4 addresses of DNS servers.\n"
 "\n"
@@ -5618,11 +5430,11 @@ msgstr ""
 "\n"
 "Приклад: 8.8.8.8, 8.8.4.4\n"
 
-#: ../clients/common/nm-meta-setting-desc.c:5850
+#: ../clients/common/nm-meta-setting-desc.c:5855
 msgid "IPv4 address (IP[/plen]) [none]"
 msgstr "Адреса IPv4 (IP[/plen]) [немає]"
 
-#: ../clients/common/nm-meta-setting-desc.c:5852
+#: ../clients/common/nm-meta-setting-desc.c:5857
 msgid ""
 "Enter a list of IPv4 addresses formatted as:\n"
 "  ip[/prefix], ip[/prefix],...\n"
@@ -5636,11 +5448,11 @@ msgstr ""
 "\n"
 "Приклад: 192.168.1.5/24, 10.0.0.11/24\n"
 
-#: ../clients/common/nm-meta-setting-desc.c:5865
+#: ../clients/common/nm-meta-setting-desc.c:5870
 msgid "IPv4 gateway [none]"
 msgstr "Шлюз IPv4 [немає]"
 
-#: ../clients/common/nm-meta-setting-desc.c:5873
+#: ../clients/common/nm-meta-setting-desc.c:5878
 msgid ""
 "Enter a list of IPv4 routes formatted as:\n"
 "  ip[/prefix] [next-hop] [metric],...\n"
@@ -5663,7 +5475,7 @@ msgstr ""
 "Приклади: 192.168.2.0/24 192.168.2.1 3, 10.1.0.0/16 10.0.0.254\n"
 "          10.1.2.0/24\n"
 
-#: ../clients/common/nm-meta-setting-desc.c:5975
+#: ../clients/common/nm-meta-setting-desc.c:5980
 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 "
@@ -5684,11 +5496,11 @@ msgstr ""
 "\n"
 "Приклад: 2607:f0d0:1002:51::4, 2607:f0d0:1002:51::1\n"
 
-#: ../clients/common/nm-meta-setting-desc.c:6013
+#: ../clients/common/nm-meta-setting-desc.c:6018
 msgid "IPv6 address (IP[/plen]) [none]"
 msgstr "Адреса IPv6 (IP[/plen]) [немає]"
 
-#: ../clients/common/nm-meta-setting-desc.c:6015
+#: ../clients/common/nm-meta-setting-desc.c:6020
 msgid ""
 "Enter a list of IPv6 addresses formatted as:\n"
 "  ip[/prefix], ip[/prefix],...\n"
@@ -5702,11 +5514,11 @@ msgstr ""
 "\n"
 "Приклад: 2607:f0d0:1002:51::4/64, 1050:0:0:0:5:600:300c:326b\n"
 
-#: ../clients/common/nm-meta-setting-desc.c:6028
+#: ../clients/common/nm-meta-setting-desc.c:6033
 msgid "IPv6 gateway [none]"
 msgstr "Шлюз IPv6 [типово немає]"
 
-#: ../clients/common/nm-meta-setting-desc.c:6036
+#: ../clients/common/nm-meta-setting-desc.c:6041
 msgid ""
 "Enter a list of IPv6 routes formatted as:\n"
 "  ip[/prefix] [next-hop] [metric],...\n"
@@ -5731,162 +5543,162 @@ msgstr ""
 "db8:beef::3 2\n"
 "          abbe::/64 55\n"
 
-#: ../clients/common/nm-meta-setting-desc.c:6141
-#: ../clients/common/nm-meta-setting-desc.c:6982
+#: ../clients/common/nm-meta-setting-desc.c:6134
+#: ../clients/common/nm-meta-setting-desc.c:6972
 msgid "Parent device [none]"
 msgstr "Батьківський пристрій [типово немає]"
 
-#: ../clients/common/nm-meta-setting-desc.c:6147
+#: ../clients/common/nm-meta-setting-desc.c:6140
 msgid "Local endpoint [none]"
 msgstr "Локальна кінцева точка [типово немає]"
 
-#: ../clients/common/nm-meta-setting-desc.c:6154
-#: ../clients/common/nm-meta-setting-desc.c:7002
+#: ../clients/common/nm-meta-setting-desc.c:6147
+#: ../clients/common/nm-meta-setting-desc.c:6992
 msgid "Remote"
 msgstr "Віддалений"
 
-#: ../clients/common/nm-meta-setting-desc.c:6199
+#: ../clients/common/nm-meta-setting-desc.c:6192
 msgid "MACsec parent device or connection UUID"
 msgstr "Батьківський пристрій MACsec або UUID з’єднання"
 
-#: ../clients/common/nm-meta-setting-desc.c:6220
+#: ../clients/common/nm-meta-setting-desc.c:6213
 msgid "Enable encryption [yes]"
 msgstr "Увімкнути шифрування [типово «так»]"
 
-#: ../clients/common/nm-meta-setting-desc.c:6226
-#: ../clients/common/nm-secret-agent-simple.c:534
+#: ../clients/common/nm-meta-setting-desc.c:6219
+#: ../clients/common/nm-secret-agent-simple.c:518
 msgid "MKA CAK"
 msgstr "MKA CAK"
 
-#: ../clients/common/nm-meta-setting-desc.c:6236
+#: ../clients/common/nm-meta-setting-desc.c:6229
 msgid "MKA_CKN"
 msgstr "MKA_CKN"
 
-#: ../clients/common/nm-meta-setting-desc.c:6242
+#: ../clients/common/nm-meta-setting-desc.c:6235
 msgid "SCI port [1]"
 msgstr "Порт SCI [1]"
 
-#: ../clients/common/nm-meta-setting-desc.c:6268
+#: ../clients/common/nm-meta-setting-desc.c:6258
 msgid "MACVLAN parent device or connection UUID"
 msgstr "Батьківський пристрій MACVLAN або UUID з’єднання"
 
-#: ../clients/common/nm-meta-setting-desc.c:6289
+#: ../clients/common/nm-meta-setting-desc.c:6279
 msgid "Tap [no]"
 msgstr "Tap [типово ні]"
 
-#: ../clients/common/nm-meta-setting-desc.c:6302
-#: ../clients/common/nm-meta-setting-desc.c:7189
+#: ../clients/common/nm-meta-setting-desc.c:6292
+#: ../clients/common/nm-meta-setting-desc.c:7179
 #: ../clients/tui/nmt-page-wifi.c:224
 msgid "SSID"
 msgstr "SSID"
 
-#: ../clients/common/nm-meta-setting-desc.c:6311
+#: ../clients/common/nm-meta-setting-desc.c:6301
 msgid "OLPC Mesh channel [1]"
 msgstr "Канал OLPC Mesh [типово 1]"
 
-#: ../clients/common/nm-meta-setting-desc.c:6320
+#: ../clients/common/nm-meta-setting-desc.c:6310
 msgid "DHCP anycast MAC address [none]"
 msgstr "MAC-адреса довільного надсилання (anycast) DHCP [типово немає]"
 
-#: ../clients/common/nm-meta-setting-desc.c:6332
+#: ../clients/common/nm-meta-setting-desc.c:6322
 msgid "PPPoE parent device"
 msgstr "Батьківський пристрій PPPoE"
 
-#: ../clients/common/nm-meta-setting-desc.c:6338
+#: ../clients/common/nm-meta-setting-desc.c:6328
 msgid "Service [none]"
 msgstr "Служба [типово немає]"
 
-#: ../clients/common/nm-meta-setting-desc.c:6345
+#: ../clients/common/nm-meta-setting-desc.c:6335
 msgid "PPPoE username"
 msgstr "Користувач PPPoE"
 
-#: ../clients/common/nm-meta-setting-desc.c:6519
+#: ../clients/common/nm-meta-setting-desc.c:6509
 msgid "Browser only [no]"
 msgstr "Лише навігатор [типово «ні»]"
 
-#: ../clients/common/nm-meta-setting-desc.c:6525
+#: ../clients/common/nm-meta-setting-desc.c:6515
 msgid "PAC URL"
 msgstr "Адреса PAC"
 
-#: ../clients/common/nm-meta-setting-desc.c:6531
+#: ../clients/common/nm-meta-setting-desc.c:6521
 msgid "PAC script"
 msgstr "Скрипт PAC"
 
-#: ../clients/common/nm-meta-setting-desc.c:6566
-#: ../clients/common/nm-meta-setting-desc.c:6715
+#: ../clients/common/nm-meta-setting-desc.c:6556
+#: ../clients/common/nm-meta-setting-desc.c:6705
 msgid "Team JSON configuration [none]"
 msgstr "Налаштування JSON команди [немає]"
 
-#: ../clients/common/nm-meta-setting-desc.c:6852
+#: ../clients/common/nm-meta-setting-desc.c:6842
 msgid "User ID [none]"
 msgstr "Ідентифікатор користувача [типово немає]"
 
-#: ../clients/common/nm-meta-setting-desc.c:6858
+#: ../clients/common/nm-meta-setting-desc.c:6848
 msgid "Group ID [none]"
 msgstr "Ідентифікатор групи [типово немає]"
 
-#: ../clients/common/nm-meta-setting-desc.c:6864
+#: ../clients/common/nm-meta-setting-desc.c:6854
 msgid "Enable PI [no]"
 msgstr "Увімкнути PI [типово ні]"
 
-#: ../clients/common/nm-meta-setting-desc.c:6870
+#: ../clients/common/nm-meta-setting-desc.c:6860
 msgid "Enable VNET header [no]"
 msgstr "Увімкнути заголовок VNET [типово ні]"
 
-#: ../clients/common/nm-meta-setting-desc.c:6876
+#: ../clients/common/nm-meta-setting-desc.c:6866
 msgid "Enable multi queue [no]"
 msgstr "Увімкнути декілька черг [типово ні]"
 
-#: ../clients/common/nm-meta-setting-desc.c:6889
+#: ../clients/common/nm-meta-setting-desc.c:6879
 msgid "VLAN parent device or connection UUID"
 msgstr "Батьківський пристрій VLAN або UUID з’єднання"
 
-#: ../clients/common/nm-meta-setting-desc.c:6896
+#: ../clients/common/nm-meta-setting-desc.c:6886
 msgid "VLAN ID (<0-4094>)"
 msgstr "Ід. VLAN (<0-4094>)"
 
-#: ../clients/common/nm-meta-setting-desc.c:6902
+#: ../clients/common/nm-meta-setting-desc.c:6892
 msgid "VLAN flags (<0-7>) [none]"
 msgstr "Прапорці VLAN (<0-7>) [типово немає]"
 
-#: ../clients/common/nm-meta-setting-desc.c:6911
+#: ../clients/common/nm-meta-setting-desc.c:6901
 msgid "Ingress priority maps [none]"
 msgstr "Відображення пріоритетності вхідного доступу [типово немає]"
 
-#: ../clients/common/nm-meta-setting-desc.c:6921
+#: ../clients/common/nm-meta-setting-desc.c:6911
 msgid "Egress priority maps [none]"
 msgstr "Відображення пріоритетності вихідного доступу [типово немає]"
 
-#: ../clients/common/nm-meta-setting-desc.c:6989
+#: ../clients/common/nm-meta-setting-desc.c:6979
 msgid "VXLAN ID"
 msgstr "Ід. VXLAN"
 
-#: ../clients/common/nm-meta-setting-desc.c:6995
+#: ../clients/common/nm-meta-setting-desc.c:6985
 msgid "Local address [none]"
 msgstr "Локальна адреса [типово немає]"
 
-#: ../clients/common/nm-meta-setting-desc.c:7008
+#: ../clients/common/nm-meta-setting-desc.c:6998
 msgid "Minimum source port [0]"
 msgstr "Мінімальний порт джерела [0]"
 
-#: ../clients/common/nm-meta-setting-desc.c:7014
+#: ../clients/common/nm-meta-setting-desc.c:7004
 msgid "Maximum source port [0]"
 msgstr "Максимальний порт джерела [0]"
 
-#: ../clients/common/nm-meta-setting-desc.c:7020
+#: ../clients/common/nm-meta-setting-desc.c:7010
 msgid "Destination port [8472]"
 msgstr "Порт призначення [типово 8472]"
 
-#: ../clients/common/nm-meta-setting-desc.c:7066
+#: ../clients/common/nm-meta-setting-desc.c:7056
 msgid "WiMAX NSP name"
 msgstr "Назва NSP WiMAX"
 
-#: ../clients/common/nm-meta-setting-desc.c:7103
-#: ../clients/common/nm-meta-setting-desc.c:7239
+#: ../clients/common/nm-meta-setting-desc.c:7093
+#: ../clients/common/nm-meta-setting-desc.c:7229
 msgid "Cloned MAC [none]"
 msgstr "Клонований MAC [типово немає]"
 
-#: ../clients/common/nm-meta-setting-desc.c:7130
+#: ../clients/common/nm-meta-setting-desc.c:7120
 msgid ""
 "Enter a list of subchannels (comma or space separated).\n"
 "\n"
@@ -5896,7 +5708,7 @@ msgstr ""
 "\n"
 "Приклад: 0.0.0e20 0.0.0e21 0.0.0e22\n"
 
-#: ../clients/common/nm-meta-setting-desc.c:7398
+#: ../clients/common/nm-meta-setting-desc.c:7374
 msgid ""
 "Enter the type of WEP keys. The accepted values are: 0 or unknown, 1 or key, "
 "and 2 or passphrase.\n"
@@ -5904,205 +5716,182 @@ msgstr ""
 "Вкажіть тип ключів WEP. Можливі значення: 0 або unknown (невідомо), 1 або "
 "key (ключ) та 2 або passphrase (пароль).\n"
 
-#: ../clients/common/nm-meta-setting-desc.c:7460
-msgid "Short address (<0x0000-0xffff>)"
-msgstr "Коротка адреса (<0x0000-0xffff>)"
-
-#: ../clients/common/nm-meta-setting-desc.c:7476
-msgid "PAN Identifier (<0x0000-0xffff>)"
-msgstr "Ідентифікатор PAN (<0x0000-0xffff>)"
-
-#: ../clients/common/nm-meta-setting-desc.c:7498
-#| msgid "VLAN parent device or connection UUID"
-msgid "IEEE 802.15.4 (WPAN) parent device or connection UUID"
-msgstr "Батьківський пристрій або UUID з’єднання IEEE 802.15.4 (WPAN)"
-
 #. ***************************************************************************
-#: ../clients/common/nm-meta-setting-desc.c:7625
+#: ../clients/common/nm-meta-setting-desc.c:7542
 msgid "802-1x settings"
 msgstr "Параметри 802-1x"
 
-#: ../clients/common/nm-meta-setting-desc.c:7626
-#: ../src/devices/adsl/nm-device-adsl.c:135
+#: ../clients/common/nm-meta-setting-desc.c:7543
+#: ../src/devices/adsl/nm-device-adsl.c:137
 msgid "ADSL connection"
 msgstr "З’єднання ADSL"
 
-#: ../clients/common/nm-meta-setting-desc.c:7627
+#: ../clients/common/nm-meta-setting-desc.c:7544
 msgid "bluetooth connection"
 msgstr "з’єднання bluetooth"
 
-#: ../clients/common/nm-meta-setting-desc.c:7628
+#: ../clients/common/nm-meta-setting-desc.c:7545
 msgid "Bond device"
 msgstr "Пристрій Bond"
 
-#: ../clients/common/nm-meta-setting-desc.c:7629
+#: ../clients/common/nm-meta-setting-desc.c:7546
 msgid "Bridge device"
 msgstr "Пристрій містка"
 
-#: ../clients/common/nm-meta-setting-desc.c:7630
+#: ../clients/common/nm-meta-setting-desc.c:7547
 msgid "Bridge port"
 msgstr "Порт містка"
 
-#: ../clients/common/nm-meta-setting-desc.c:7631
+#: ../clients/common/nm-meta-setting-desc.c:7548
 msgid "CDMA mobile broadband connection"
 msgstr "мобільне широкосмугове з’єднання CDMA"
 
-#: ../clients/common/nm-meta-setting-desc.c:7632
+#: ../clients/common/nm-meta-setting-desc.c:7549
 msgid "General settings"
 msgstr "Загальні параметри"
 
-#: ../clients/common/nm-meta-setting-desc.c:7633
+#: ../clients/common/nm-meta-setting-desc.c:7550
 msgid "DCB settings"
 msgstr "Параметри DCB"
 
-#: ../clients/common/nm-meta-setting-desc.c:7634
+#: ../clients/common/nm-meta-setting-desc.c:7551
 msgid "Dummy settings"
 msgstr "Фіктивні параметри"
 
-#: ../clients/common/nm-meta-setting-desc.c:7635
+#: ../clients/common/nm-meta-setting-desc.c:7552
 msgid "Generic settings"
 msgstr "Загальні параметри"
 
-#: ../clients/common/nm-meta-setting-desc.c:7636
+#: ../clients/common/nm-meta-setting-desc.c:7553
 msgid "GSM mobile broadband connection"
 msgstr "мобільне широкосмугове з’єднання GSM"
 
-#: ../clients/common/nm-meta-setting-desc.c:7637
-#: ../src/devices/nm-device-infiniband.c:172
+#: ../clients/common/nm-meta-setting-desc.c:7554
+#: ../src/devices/nm-device-infiniband.c:192
 msgid "InfiniBand connection"
 msgstr "З’єднання InfiniBand"
 
-#: ../clients/common/nm-meta-setting-desc.c:7638
+#: ../clients/common/nm-meta-setting-desc.c:7555
 msgid "IPv4 protocol"
 msgstr "Протокол IPv4"
 
-#: ../clients/common/nm-meta-setting-desc.c:7639
+#: ../clients/common/nm-meta-setting-desc.c:7556
 msgid "IPv6 protocol"
 msgstr "Протокол IPv6"
 
-#: ../clients/common/nm-meta-setting-desc.c:7640
+#: ../clients/common/nm-meta-setting-desc.c:7557
 msgid "IP-tunnel settings"
 msgstr "Параметри IP-тунелювання"
 
-#: ../clients/common/nm-meta-setting-desc.c:7641
+#: ../clients/common/nm-meta-setting-desc.c:7558
 msgid "MACsec connection"
 msgstr "З’єднання MACsec"
 
-#: ../clients/common/nm-meta-setting-desc.c:7642
+#: ../clients/common/nm-meta-setting-desc.c:7559
 msgid "macvlan connection"
 msgstr "З’єднання MACVLAN"
 
-#: ../clients/common/nm-meta-setting-desc.c:7643
+#: ../clients/common/nm-meta-setting-desc.c:7560
 msgid "OLPC Mesh connection"
 msgstr "З’єднання OLPC Mesh"
 
-#: ../clients/common/nm-meta-setting-desc.c:7644
+#: ../clients/common/nm-meta-setting-desc.c:7561
 msgid "OpenVSwitch bridge settings"
 msgstr "Параметри містка OpenVSwitch"
 
-#: ../clients/common/nm-meta-setting-desc.c:7645
+#: ../clients/common/nm-meta-setting-desc.c:7562
 msgid "OpenVSwitch interface settings"
 msgstr "Параметри інтерфейсу OpenVSwitch"
 
-#: ../clients/common/nm-meta-setting-desc.c:7646
+#: ../clients/common/nm-meta-setting-desc.c:7563
 msgid "OpenVSwitch patch interface settings"
 msgstr "Параметри інтерфейсу латок OpenVSwitch"
 
-#: ../clients/common/nm-meta-setting-desc.c:7647
+#: ../clients/common/nm-meta-setting-desc.c:7564
 msgid "OpenVSwitch port settings"
 msgstr "Параметри портів OpenVSwitch"
 
-#: ../clients/common/nm-meta-setting-desc.c:7648
+#: ../clients/common/nm-meta-setting-desc.c:7565
 msgid "PPP settings"
 msgstr "Параметри PPP"
 
-#: ../clients/common/nm-meta-setting-desc.c:7649
+#: ../clients/common/nm-meta-setting-desc.c:7566
 msgid "PPPoE"
 msgstr "PPPoE"
 
-#: ../clients/common/nm-meta-setting-desc.c:7650
+#: ../clients/common/nm-meta-setting-desc.c:7567
 msgid "Proxy"
 msgstr "Проксі"
 
-#: ../clients/common/nm-meta-setting-desc.c:7651
+#: ../clients/common/nm-meta-setting-desc.c:7568
 msgid "Serial settings"
 msgstr "Параметри послідовного з’єднання"
 
-#: ../clients/common/nm-meta-setting-desc.c:7652
+#: ../clients/common/nm-meta-setting-desc.c:7569
 msgid "Traffic controls"
 msgstr "Засоби керування обміном даними"
 
-#: ../clients/common/nm-meta-setting-desc.c:7653
+#: ../clients/common/nm-meta-setting-desc.c:7570
 msgid "Team device"
 msgstr "Пристрій Team"
 
-#: ../clients/common/nm-meta-setting-desc.c:7654
+#: ../clients/common/nm-meta-setting-desc.c:7571
 msgid "Team port"
 msgstr "Порт Team"
 
-#: ../clients/common/nm-meta-setting-desc.c:7655
+#: ../clients/common/nm-meta-setting-desc.c:7572
 msgid "Tun device"
 msgstr "Пристрій TUN"
 
-#: ../clients/common/nm-meta-setting-desc.c:7656
+#: ../clients/common/nm-meta-setting-desc.c:7573
 msgid "User settings"
 msgstr "Параметри користувача"
 
-#: ../clients/common/nm-meta-setting-desc.c:7657
-#: ../src/devices/nm-device-vlan.c:393
+#: ../clients/common/nm-meta-setting-desc.c:7574
+#: ../src/devices/nm-device-vlan.c:394
 msgid "VLAN connection"
 msgstr "З’єднання VLAN"
 
-#: ../clients/common/nm-meta-setting-desc.c:7658 ../src/nm-manager.c:4943
+#: ../clients/common/nm-meta-setting-desc.c:7575 ../src/nm-manager.c:4521
 msgid "VPN connection"
 msgstr "З’єднання VPN"
 
-#: ../clients/common/nm-meta-setting-desc.c:7659
-#: ../src/devices/nm-device-vxlan.c:327
+#: ../clients/common/nm-meta-setting-desc.c:7576
+#: ../src/devices/nm-device-vxlan.c:331
 msgid "VXLAN connection"
 msgstr "З’єднання VXLAN"
 
-#: ../clients/common/nm-meta-setting-desc.c:7660
+#: ../clients/common/nm-meta-setting-desc.c:7577
 msgid "WiMAX connection"
 msgstr "З’єднання WiMAX"
 
-#: ../clients/common/nm-meta-setting-desc.c:7661
+#: ../clients/common/nm-meta-setting-desc.c:7578
 msgid "Wired Ethernet"
 msgstr "Дротовий Ethernet"
 
-#: ../clients/common/nm-meta-setting-desc.c:7662
+#: ../clients/common/nm-meta-setting-desc.c:7579
 msgid "Wi-Fi connection"
 msgstr "З’єднання Wi-Fi"
 
-#: ../clients/common/nm-meta-setting-desc.c:7663
+#: ../clients/common/nm-meta-setting-desc.c:7580
 msgid "Wi-Fi security settings"
 msgstr "Параметри захисту Wi-Fi"
 
-#: ../clients/common/nm-meta-setting-desc.c:7664
-#| msgid "PPP settings"
-msgid "WPAN settings"
-msgstr "Параметри WPAN"
-
-#: ../clients/common/nm-meta-setting-desc.c:7665
-#| msgid "PPP settings"
-msgid "6LOWPAN settings"
-msgstr "Параметри 6LOWPAN"
-
-#: ../clients/common/nm-meta-setting-desc.c:7994
+#: ../clients/common/nm-meta-setting-desc.c:7897
 msgid "name"
 msgstr "назва"
 
-#: ../clients/common/nm-polkit-listener.c:239
+#: ../clients/common/nm-polkit-listener.c:212
 msgid "An authentication session is already underway."
 msgstr "Сеанс розпізнавання вже триває."
 
-#: ../clients/common/nm-secret-agent-simple.c:255
-#: ../clients/common/nm-secret-agent-simple.c:295
-#: ../clients/common/nm-secret-agent-simple.c:323
-#: ../clients/common/nm-secret-agent-simple.c:359
-#: ../clients/common/nm-secret-agent-simple.c:519
-#: ../clients/common/nm-secret-agent-simple.c:551
-#: ../clients/common/nm-secret-agent-simple.c:573
+#: ../clients/common/nm-secret-agent-simple.c:239
+#: ../clients/common/nm-secret-agent-simple.c:279
+#: ../clients/common/nm-secret-agent-simple.c:307
+#: ../clients/common/nm-secret-agent-simple.c:343
+#: ../clients/common/nm-secret-agent-simple.c:503
+#: ../clients/common/nm-secret-agent-simple.c:535
+#: ../clients/common/nm-secret-agent-simple.c:557
 #: ../clients/common/nm-vpn-helpers.c:119
 #: ../clients/common/nm-vpn-helpers.c:123
 #: ../clients/common/nm-vpn-helpers.c:129
@@ -6112,29 +5901,29 @@ msgstr "Сеанс розпізнавання вже триває."
 msgid "Password"
 msgstr "Пароль"
 
-#: ../clients/common/nm-secret-agent-simple.c:265
+#: ../clients/common/nm-secret-agent-simple.c:249
 msgid "Identity"
 msgstr "Профіль"
 
-#: ../clients/common/nm-secret-agent-simple.c:271
+#: ../clients/common/nm-secret-agent-simple.c:255
 msgid "Private key password"
 msgstr "Пароль закритого ключа"
 
-#: ../clients/common/nm-secret-agent-simple.c:310
+#: ../clients/common/nm-secret-agent-simple.c:294
 #: ../clients/tui/nmt-page-wifi.c:289
 msgid "Key"
 msgstr "Ключ"
 
-#: ../clients/common/nm-secret-agent-simple.c:353
+#: ../clients/common/nm-secret-agent-simple.c:337
 #: ../clients/tui/nmt-page-dsl.c:78
 msgid "Service"
 msgstr "Служба"
 
-#: ../clients/common/nm-secret-agent-simple.c:484
+#: ../clients/common/nm-secret-agent-simple.c:468
 msgid "Authentication required by wireless network"
 msgstr "Для доступу до бездротової мережі слід пройти розпізнавання"
 
-#: ../clients/common/nm-secret-agent-simple.c:485
+#: ../clients/common/nm-secret-agent-simple.c:469
 #, c-format
 msgid ""
 "Passwords or encryption keys are required to access the wireless network "
@@ -6143,66 +5932,66 @@ msgstr ""
 "Для отримання доступу до бездротової мережі потрібні паролі або ключі "
 "шифрування «%s»."
 
-#: ../clients/common/nm-secret-agent-simple.c:489
+#: ../clients/common/nm-secret-agent-simple.c:473
 msgid "Wired 802.1X authentication"
 msgstr "Розпізнавання дротової мережі 802.1X"
 
-#: ../clients/common/nm-secret-agent-simple.c:490
+#: ../clients/common/nm-secret-agent-simple.c:474
 #, c-format
 msgid "Secrets are required to access the wired network '%s'"
 msgstr "Для доступу до дротової мережі «%s» потрібні реєстраційні дані"
 
-#: ../clients/common/nm-secret-agent-simple.c:495
+#: ../clients/common/nm-secret-agent-simple.c:479
 msgid "DSL authentication"
 msgstr "Розпізнавання DSL"
 
-#: ../clients/common/nm-secret-agent-simple.c:496
+#: ../clients/common/nm-secret-agent-simple.c:480
 #, c-format
 msgid "Secrets are required for the DSL connection '%s'"
 msgstr "Для встановлення з’єднання DSL «%s» потрібні реєстраційні дані"
 
-#: ../clients/common/nm-secret-agent-simple.c:504
+#: ../clients/common/nm-secret-agent-simple.c:488
 msgid "PIN code required"
 msgstr "Потрібен PIN-код"
 
-#: ../clients/common/nm-secret-agent-simple.c:505
+#: ../clients/common/nm-secret-agent-simple.c:489
 msgid "PIN code is needed for the mobile broadband device"
 msgstr ""
 "Для користування пристроєм мобільної широкосмугової мережі слід вказати PIN-"
 "код"
 
-#: ../clients/common/nm-secret-agent-simple.c:508
+#: ../clients/common/nm-secret-agent-simple.c:492
 msgid "PIN"
 msgstr "PIN"
 
-#: ../clients/common/nm-secret-agent-simple.c:514
-#: ../clients/common/nm-secret-agent-simple.c:546
-#: ../clients/common/nm-secret-agent-simple.c:568
+#: ../clients/common/nm-secret-agent-simple.c:498
+#: ../clients/common/nm-secret-agent-simple.c:530
+#: ../clients/common/nm-secret-agent-simple.c:552
 msgid "Mobile broadband network password"
 msgstr "Пароль до мобільної широкосмугової мережі"
 
-#: ../clients/common/nm-secret-agent-simple.c:515
-#: ../clients/common/nm-secret-agent-simple.c:547
-#: ../clients/common/nm-secret-agent-simple.c:569
-#: ../clients/common/nm-secret-agent-simple.c:586
+#: ../clients/common/nm-secret-agent-simple.c:499
+#: ../clients/common/nm-secret-agent-simple.c:531
+#: ../clients/common/nm-secret-agent-simple.c:553
+#: ../clients/common/nm-secret-agent-simple.c:570
 #, c-format
 msgid "A password is required to connect to '%s'."
 msgstr "Для встановлення з’єднання з «%s» слід вказати пароль."
 
-#: ../clients/common/nm-secret-agent-simple.c:528
+#: ../clients/common/nm-secret-agent-simple.c:512
 #, c-format
 msgid "Secrets are required to access the MACsec network '%s'"
 msgstr "Для доступу до мережі MACsec «%s» потрібні реєстраційні дані"
 
-#: ../clients/common/nm-secret-agent-simple.c:532
+#: ../clients/common/nm-secret-agent-simple.c:516
 msgid "MACsec PSK authentication"
 msgstr "Розпізнавання у MACsec за PSK"
 
-#: ../clients/common/nm-secret-agent-simple.c:540
+#: ../clients/common/nm-secret-agent-simple.c:524
 msgid "MACsec EAP authentication"
 msgstr "Розпізнавання у MACsec за EAP"
 
-#: ../clients/common/nm-secret-agent-simple.c:581
+#: ../clients/common/nm-secret-agent-simple.c:565
 msgid "VPN password required"
 msgstr "Потрібен пароль до VPN"
 
@@ -6257,46 +6046,59 @@ msgstr "Хеш сертифіката шлюзу"
 
 #. Generated file. Do not edit.
 #: ../clients/common/settings-docs.h.in:3
-#: ../clients/common/settings-docs.h.in:7
-#: ../clients/common/settings-docs.h.in:20
-#: ../clients/common/settings-docs.h.in:34
-#: ../clients/common/settings-docs.h.in:61
-#: ../clients/common/settings-docs.h.in:100
-#: ../clients/common/settings-docs.h.in:109
-#: ../clients/common/settings-docs.h.in:117
-#: ../clients/common/settings-docs.h.in:119
-#: ../clients/common/settings-docs.h.in:128
-#: ../clients/common/settings-docs.h.in:132
-#: ../clients/common/settings-docs.h.in:136
-#: ../clients/common/settings-docs.h.in:153
-#: ../clients/common/settings-docs.h.in:170
-#: ../clients/common/settings-docs.h.in:179
-#: ../clients/common/settings-docs.h.in:180
-#: ../clients/common/settings-docs.h.in:185
-#: ../clients/common/settings-docs.h.in:197
-#: ../clients/common/settings-docs.h.in:208
-#: ../clients/common/settings-docs.h.in:231
-#: ../clients/common/settings-docs.h.in:253
-#: ../clients/common/settings-docs.h.in:264
-#: ../clients/common/settings-docs.h.in:270
+msgid "Channel on which the mesh network to join is located."
+msgstr "Канал, на якому розташовано мережу mesh, до якої слід долучитися."
+
+#: ../clients/common/settings-docs.h.in:4
+msgid ""
+"Anycast DHCP MAC address used when requesting an IP address via DHCP. The "
+"specific anycast address used determines which DHCP server class answers the "
+"request."
+msgstr ""
+"MAC-адреса довільного надсилання (anycast) DHCP, яка використовується під "
+"час надсилання запитів щодо визначення IP-адреси за допомогою DHCP. Вказана "
+"адреса довільного надсилання визначає, який із класів сервера DHCP "
+"відповідатиме на запит."
+
+#: ../clients/common/settings-docs.h.in:5
+#: ../clients/common/settings-docs.h.in:18
+#: ../clients/common/settings-docs.h.in:31
+#: ../clients/common/settings-docs.h.in:58
+#: ../clients/common/settings-docs.h.in:97
+#: ../clients/common/settings-docs.h.in:106
+#: ../clients/common/settings-docs.h.in:114
+#: ../clients/common/settings-docs.h.in:116
+#: ../clients/common/settings-docs.h.in:125
+#: ../clients/common/settings-docs.h.in:129
+#: ../clients/common/settings-docs.h.in:133
+#: ../clients/common/settings-docs.h.in:150
+#: ../clients/common/settings-docs.h.in:167
+#: ../clients/common/settings-docs.h.in:176
+#: ../clients/common/settings-docs.h.in:177
+#: ../clients/common/settings-docs.h.in:182
+#: ../clients/common/settings-docs.h.in:194
+#: ../clients/common/settings-docs.h.in:205
+#: ../clients/common/settings-docs.h.in:228
+#: ../clients/common/settings-docs.h.in:249
+#: ../clients/common/settings-docs.h.in:260
+#: ../clients/common/settings-docs.h.in:265
+#: ../clients/common/settings-docs.h.in:271
+#: ../clients/common/settings-docs.h.in:274
 #: ../clients/common/settings-docs.h.in:276
-#: ../clients/common/settings-docs.h.in:279
-#: ../clients/common/settings-docs.h.in:281
-#: ../clients/common/settings-docs.h.in:287
-#: ../clients/common/settings-docs.h.in:297
-#: ../clients/common/settings-docs.h.in:309
+#: ../clients/common/settings-docs.h.in:282
+#: ../clients/common/settings-docs.h.in:292
+#: ../clients/common/settings-docs.h.in:304
+#: ../clients/common/settings-docs.h.in:312
 #: ../clients/common/settings-docs.h.in:317
-#: ../clients/common/settings-docs.h.in:322
-#: ../clients/common/settings-docs.h.in:326
-#: ../clients/common/settings-docs.h.in:333
-#: ../clients/common/settings-docs.h.in:350
+#: ../clients/common/settings-docs.h.in:321
+#: ../clients/common/settings-docs.h.in:328
+#: ../clients/common/settings-docs.h.in:345
+#: ../clients/common/settings-docs.h.in:352
 #: ../clients/common/settings-docs.h.in:357
 #: ../clients/common/settings-docs.h.in:362
-#: ../clients/common/settings-docs.h.in:367
-#: ../clients/common/settings-docs.h.in:370
-#: ../clients/common/settings-docs.h.in:384
-#: ../clients/common/settings-docs.h.in:394
-#: ../clients/common/settings-docs.h.in:397
+#: ../clients/common/settings-docs.h.in:365
+#: ../clients/common/settings-docs.h.in:379
+#: ../clients/common/settings-docs.h.in:389
 msgid ""
 "The setting's name, which uniquely identifies the setting within the "
 "connection.  Each setting type has a name unique to that type, for example "
@@ -6306,36 +6108,11 @@ msgstr ""
 "кожного типу параметрів є однозначна назва, наприклад «ppp», «wireless» або "
 "«wired»."
 
-#: ../clients/common/settings-docs.h.in:4
-#| msgid ""
-#| "If given, specifies the parent interface name or parent connection UUID."
-msgid ""
-"If given, specifies the parent interface name or parent connection UUID from "
-"which this 6LowPAN interface should be created."
-msgstr ""
-"Якщо задано, визначає назву батьківського інтерфейсу або UUID батьківського "
-"з’єднання, на основі якого має бути створено цей інтерфейс 6LowPAN."
-
-#: ../clients/common/settings-docs.h.in:5
-msgid "Channel on which the mesh network to join is located."
-msgstr "Канал, на якому розташовано мережу mesh, до якої слід долучитися."
-
 #: ../clients/common/settings-docs.h.in:6
-msgid ""
-"Anycast DHCP MAC address used when requesting an IP address via DHCP. The "
-"specific anycast address used determines which DHCP server class answers the "
-"request."
-msgstr ""
-"MAC-адреса довільного надсилання (anycast) DHCP, яка використовується під "
-"час надсилання запитів щодо визначення IP-адреси за допомогою DHCP. Вказана "
-"адреса довільного надсилання визначає, який із класів сервера DHCP "
-"відповідатиме на запит."
-
-#: ../clients/common/settings-docs.h.in:8
 msgid "SSID of the mesh network to join."
 msgstr "SSID мережі mesh, до якої слід долучитися."
 
-#: ../clients/common/settings-docs.h.in:9
+#: ../clients/common/settings-docs.h.in:7
 msgid ""
 "802.11 frequency band of the network.  One of \"a\" for 5GHz 802.11a or \"bg"
 "\" for 2.4GHz 802.11.  This will lock associations to the Wi-Fi network to "
@@ -6351,7 +6128,7 @@ msgstr ""
 "сумісними. Використання цього параметра залежить від можливостей певного "
 "драйвера і можливе не для усіх драйверів."
 
-#: ../clients/common/settings-docs.h.in:10
+#: ../clients/common/settings-docs.h.in:8
 msgid ""
 "If specified, directs the device to only associate with the given access "
 "point.  This capability is highly driver dependent and not supported by all "
@@ -6364,7 +6141,7 @@ msgstr ""
 "використовується для створення ситуативної мережі, і малоймовірно, що "
 "керуватиме ним у майбутньому."
 
-#: ../clients/common/settings-docs.h.in:11
+#: ../clients/common/settings-docs.h.in:9
 msgid ""
 "Wireless channel to use for the Wi-Fi connection.  The device will only join "
 "(or create for Ad-Hoc networks) a Wi-Fi network on the specified channel.  "
@@ -6377,7 +6154,7 @@ msgstr ""
 "різних смугах перекриваються, для використання цієї властивості має бути "
 "також встановлено властивість «band»."
 
-#: ../clients/common/settings-docs.h.in:12
+#: ../clients/common/settings-docs.h.in:10
 msgid ""
 "If specified, request that the device use this MAC address instead. This is "
 "known as MAC cloning or spoofing. Beside explicitly specifying a MAC "
@@ -6407,8 +6184,8 @@ msgstr ""
 "використовуватися інше типове значення). У D-Bus це поле позначається як "
 "«assigned-mac-address», а у застарілих версіях, як «cloned-mac-address»."
 
-#: ../clients/common/settings-docs.h.in:13
-#: ../clients/common/settings-docs.h.in:96
+#: ../clients/common/settings-docs.h.in:11
+#: ../clients/common/settings-docs.h.in:93
 msgid ""
 "With \"cloned-mac-address\" setting \"random\" or \"stable\", by default all "
 "bits of the MAC address are scrambled and a locally-administered, unicast "
@@ -6461,32 +6238,22 @@ msgstr ""
 "буде створено повністю перемішану MAC-адресу із випадковим локальним або "
 "глобальним адмініструванням."
 
-#: ../clients/common/settings-docs.h.in:14
-#| msgid ""
-#| "If TRUE, indicates this network is a non-broadcasting network that hides "
-#| "its SSID.  In this case various workarounds may take place, such as probe-"
-#| "scanning the SSID for more reliable network discovery.  However, these "
-#| "workarounds expose inherent insecurities with hidden SSID networks, and "
-#| "thus hidden SSID networks should be used with caution."
+#: ../clients/common/settings-docs.h.in:12
 msgid ""
 "If TRUE, indicates this network is a non-broadcasting network that hides its "
 "SSID.  In this case various workarounds may take place, such as probe-"
 "scanning the SSID for more reliable network discovery.  However, these "
 "workarounds expose inherent insecurities with hidden SSID networks, and thus "
-"hidden SSID networks should be used with caution. Note that marking the "
-"network as hidden may be a privacy issue for you, as the explicit probe-"
-"scans may be distinctly recognizable on the air."
+"hidden SSID networks should be used with caution."
 msgstr ""
 "Якщо має значення TRUE, мережа вважається нетрансляційною, такою, яка ховає "
 "свій SSID. У такому випадку може бути використано різноманітні обхідні "
 "маневри, зокрема зондування-сканування SSID для надійнішого визначення "
 "мережі. Втім, ці обхідні маневри погіршують захист системи, впроваджуючи "
 "можливість мереж із прихованими SSID. Тому не слід зловживати використанням "
-"мереж із прихованим SSID. Зауважте, що позначення мережі як прихованої може"
-" стати проблемою конфіденційності для вашого комп'ютера, оскільки явне"
-" зондування можна буде легко виявити в ефірі."
+"мереж із прихованим SSID."
 
-#: ../clients/common/settings-docs.h.in:15
+#: ../clients/common/settings-docs.h.in:13
 msgid ""
 "If specified, this connection will only apply to the Wi-Fi device whose "
 "permanent MAC address matches. This property does not change the MAC address "
@@ -6496,7 +6263,7 @@ msgstr ""
 "відповідною сталою адресою MAC. Ця властивість не змінює MAC-адреси пристрою "
 "(таку зміну називають підміною MAC)."
 
-#: ../clients/common/settings-docs.h.in:16
+#: ../clients/common/settings-docs.h.in:14
 msgid ""
 "A list of permanent MAC addresses of Wi-Fi devices to which this connection "
 "should never apply.  Each MAC address should be given in the standard hex-"
@@ -6507,7 +6274,7 @@ msgstr ""
 "стандартного запису із шістнадцяткових цифр із двокрапками (наприклад, "
 "«00:11:22:33:44:55»)."
 
-#: ../clients/common/settings-docs.h.in:17
+#: ../clients/common/settings-docs.h.in:15
 msgid ""
 "One of NM_SETTING_MAC_RANDOMIZATION_DEFAULT (0) (never randomize unless the "
 "user has set a global default to randomize and the supplicant supports "
@@ -6525,7 +6292,7 @@ msgstr ""
 "випадковим чином). Якщо властивість вважається застарілою, використовуйте "
 "замість неї «cloned-mac-address». Застаріла: 1"
 
-#: ../clients/common/settings-docs.h.in:18
+#: ../clients/common/settings-docs.h.in:16
 msgid ""
 "Wi-Fi network mode; one of \"infrastructure\", \"adhoc\" or \"ap\".  If "
 "blank, infrastructure is assumed."
@@ -6533,8 +6300,8 @@ msgstr ""
 "Режим роботи мережі Wi-Fi. Одне з таких значень: «infrastructure», «adhoc» "
 "або «ap». Якщо не вказано, використовується режим «infrastructure»."
 
-#: ../clients/common/settings-docs.h.in:19
-#: ../clients/common/settings-docs.h.in:99
+#: ../clients/common/settings-docs.h.in:17
+#: ../clients/common/settings-docs.h.in:96
 msgid ""
 "If non-zero, only transmit packets of the specified size or smaller, "
 "breaking larger packets up into multiple Ethernet frames."
@@ -6542,7 +6309,7 @@ msgstr ""
 "Якщо має ненульове значення, передавати пакети лише вказаного або меншого "
 "розміру, розбиваючи великі пакети на декілька кадрів Ethernet."
 
-#: ../clients/common/settings-docs.h.in:21
+#: ../clients/common/settings-docs.h.in:19
 msgid ""
 "One of NM_SETTING_WIRELESS_POWERSAVE_DISABLE (2) (disable Wi-Fi power "
 "saving), NM_SETTING_WIRELESS_POWERSAVE_ENABLE (3) (enable Wi-Fi power "
@@ -6557,7 +6324,7 @@ msgstr ""
 "або NM_SETTING_WIRELESS_POWERSAVE_DEFAULT (0) (використовувати налаштоване "
 "на загальному рівні значення). Усі інші значення поки зарезервовано."
 
-#: ../clients/common/settings-docs.h.in:22
+#: ../clients/common/settings-docs.h.in:20
 msgid ""
 "If non-zero, directs the device to only use the specified bitrate for "
 "communication with the access point.  Units are in Kb/s, ie 5500 = 5.5 Mbit/"
@@ -6570,7 +6337,7 @@ msgstr ""
 "властивості дуже залежить від драйвера. Підтримку встановлення статичної "
 "бітової швидкості передбачено не для усіх пристрої."
 
-#: ../clients/common/settings-docs.h.in:23
+#: ../clients/common/settings-docs.h.in:21
 msgid ""
 "A list of BSSIDs (each BSSID formatted as a MAC address like "
 "\"00:11:22:33:44:55\") that have been detected as part of the Wi-Fi "
@@ -6585,11 +6352,11 @@ msgstr ""
 "NetworkManager. Зміни, які буде внесено до значення цієї властивості не "
 "зберігатимуться."
 
-#: ../clients/common/settings-docs.h.in:24
+#: ../clients/common/settings-docs.h.in:22
 msgid "SSID of the Wi-Fi network. Must be specified."
 msgstr "SSID мережі Wi-Fi. Має бути вказано."
 
-#: ../clients/common/settings-docs.h.in:25
+#: ../clients/common/settings-docs.h.in:23
 msgid ""
 "If non-zero, directs the device to use the specified transmit power. Units "
 "are dBm.  This property is highly driver dependent and not all devices "
@@ -6600,48 +6367,7 @@ msgstr ""
 "властивості дуже залежить від драйвера. Підтримку встановлення статичної "
 "потужності передавання передбачено не для усіх пристрої."
 
-#: ../clients/common/settings-docs.h.in:26
-#| msgid ""
-#| "The NMSettingWiredWakeOnLan options to enable. Not all devices support "
-#| "all options. May be any combination of NM_SETTING_WIRED_WAKE_ON_LAN_PHY "
-#| "(0x2), NM_SETTING_WIRED_WAKE_ON_LAN_UNICAST (0x4), "
-#| "NM_SETTING_WIRED_WAKE_ON_LAN_MULTICAST (0x8), "
-#| "NM_SETTING_WIRED_WAKE_ON_LAN_BROADCAST (0x10), "
-#| "NM_SETTING_WIRED_WAKE_ON_LAN_ARP (0x20), "
-#| "NM_SETTING_WIRED_WAKE_ON_LAN_MAGIC (0x40) or the special values "
-#| "NM_SETTING_WIRED_WAKE_ON_LAN_DEFAULT (0x1) (to use global settings) and "
-#| "NM_SETTING_WIRED_WAKE_ON_LAN_IGNORE (0x8000) (to disable management of "
-#| "Wake-on-LAN in NetworkManager)."
-msgid ""
-"The NMSettingWirelessWakeOnWLan options to enable. Not all devices support "
-"all options. May be any combination of NM_SETTING_WIRELESS_WAKE_ON_WLAN_ANY "
-"(0x2), NM_SETTING_WIRELESS_WAKE_ON_WLAN_DISCONNECT (0x4), "
-"NM_SETTING_WIRELESS_WAKE_ON_WLAN_MAGIC (0x8), "
-"NM_SETTING_WIRELESS_WAKE_ON_WLAN_GTK_REKEY_FAILURE (0x10), "
-"NM_SETTING_WIRELESS_WAKE_ON_WLAN_EAP_IDENTITY_REQUEST (0x20), "
-"NM_SETTING_WIRELESS_WAKE_ON_WLAN_4WAY_HANDSHAKE (0x40), "
-"NM_SETTING_WIRELESS_WAKE_ON_WLAN_RFKILL_RELEASE (0x80), "
-"NM_SETTING_WIRELESS_WAKE_ON_WLAN_TCP (0x100) or the special values "
-"NM_SETTING_WIRELESS_WAKE_ON_WLAN_DEFAULT (0x1) (to use global settings) and "
-"NM_SETTING_WIRELESS_WAKE_ON_WLAN_IGNORE (0x8000) (to disable management of "
-"Wake-on-LAN in NetworkManager)."
-msgstr ""
-"Параметри NMSettingWirelessWakeOnWLan, які слід увімкнути. Підтримку усіх "
-"параметрів передбачено не на усіх пристроях. Може бути будь-якою "
-"комбінацією NM_SETTING_WIRELESS_WAKE_ON_WLAN_ANY "
-"(0x2), NM_SETTING_WIRELESS_WAKE_ON_WLAN_DISCONNECT (0x4), "
-"NM_SETTING_WIRELESS_WAKE_ON_WLAN_MAGIC (0x8), "
-"NM_SETTING_WIRELESS_WAKE_ON_WLAN_GTK_REKEY_FAILURE (0x10), "
-"NM_SETTING_WIRELESS_WAKE_ON_WLAN_EAP_IDENTITY_REQUEST (0x20), "
-"NM_SETTING_WIRELESS_WAKE_ON_WLAN_4WAY_HANDSHAKE (0x40), "
-"NM_SETTING_WIRELESS_WAKE_ON_WLAN_RFKILL_RELEASE (0x80), "
-"NM_SETTING_WIRELESS_WAKE_ON_WLAN_TCP (0x100) або спеціальних значень "
-"NM_SETTING_WIRELESS_WAKE_ON_WLAN_DEFAULT (0x1) (для використання загальних"
-" параметрів) і "
-"NM_SETTING_WIRELESS_WAKE_ON_WLAN_IGNORE (0x8000) (для вимикання керування"
-" Wake-on-LAN у NetworkManager)."
-
-#: ../clients/common/settings-docs.h.in:27
+#: ../clients/common/settings-docs.h.in:24
 msgid ""
 "When WEP is used (ie, key-mgmt = \"none\" or \"ieee8021x\") indicate the "
 "802.11 authentication algorithm required by the AP here.  One of \"open\" "
@@ -6657,7 +6383,16 @@ msgstr ""
 "= \"leap\") слід вказати значення для властивостей «leap-username» і «leap-"
 "password»."
 
-#: ../clients/common/settings-docs.h.in:28
+#: ../clients/common/settings-docs.h.in:25
+#| msgid ""
+#| "Indicates whether Protected Management Frames (802.11w) must be enabled "
+#| "for the connection.  One of NM_SETTING_WIRELESS_SECURITY_PMF_DEFAULT (0) "
+#| "(use global default value), NM_SETTING_WIRELESS_SECURITY_PMF_DISABLE (1) "
+#| "(disable PMF), NM_SETTING_WIRELESS_SECURITY_PMF_OPTIONAL (2) (enable PMF "
+#| "if the supplicant and the access point support it) or "
+#| "NM_SETTING_WIRELESS_SECURITY_PMF_REQUIRED (3) (enable PMF and fail if not "
+#| "supported).  When set to NM_SETTING_WIRELESS_SECURITY_PMF_DEFAULT (0) and "
+#| "no global default is set, PMF will be optionally enabled."
 msgid ""
 "Indicates whether Fast Initial Link Setup (802.11ai) must be enabled for the "
 "connection.  One of NM_SETTING_WIRELESS_SECURITY_FILS_DEFAULT (0) (use "
@@ -6668,18 +6403,18 @@ msgid ""
 "supported).  When set to NM_SETTING_WIRELESS_SECURITY_FILS_DEFAULT (0) and "
 "no global default is set, FILS will be optionally enabled."
 msgstr ""
-"Позначає, чи слід вмикати для з'єднання швидке налаштовування початкового "
-"зв'язку (Fast Initial Link Setup, 802.11ai). Одне з таких значень: "
-"NM_SETTING_WIRELESS_SECURITY_FILS_DEFAULT (0) (використовувати загальне "
-"типове значення), NM_SETTING_WIRELESS_SECURITY_FILS_DISABLE (1) (вимкнути "
-"FILS), NM_SETTING_WIRELESS_SECURITY_FILS_OPTIONAL (2) (увімкнути FILS, якщо "
-"підтримку передбачено у допоміжній програмі та на точці доступу) або "
-"NM_SETTING_WIRELESS_SECURITY_FILS_REQUIRED (3) (увімкнути FILS і повідомити "
-"про помилку, якщо підтримки не передбачено). Якщо встановлено "
-"NM_SETTING_WIRELESS_SECURITY_FILS_DEFAULT (0), а загальне типове значення не "
-"встановлено, буде, якщо можна, увімкнено FILS."
+"Позначає, чи слід вмикати для з'єднання швидке налаштовування початкового"
+" зв'язку (Fast Initial Link Setup, 802.11ai). Одне з таких значень:"
+" NM_SETTING_WIRELESS_SECURITY_FILS_DEFAULT (0) (використовувати загальне"
+" типове значення), NM_SETTING_WIRELESS_SECURITY_FILS_DISABLE (1) (вимкнути"
+" FILS), NM_SETTING_WIRELESS_SECURITY_FILS_OPTIONAL (2) (увімкнути FILS, якщо"
+" підтримку передбачено у допоміжній програмі та на точці доступу) або"
+" NM_SETTING_WIRELESS_SECURITY_FILS_REQUIRED (3) (увімкнути FILS і повідомити"
+" про помилку, якщо підтримки не передбачено). Якщо встановлено"
+" NM_SETTING_WIRELESS_SECURITY_FILS_DEFAULT (0), а загальне типове значення не"
+" встановлено, буде, якщо можна, увімкнено FILS."
 
-#: ../clients/common/settings-docs.h.in:29
+#: ../clients/common/settings-docs.h.in:26
 msgid ""
 "A list of group/broadcast encryption algorithms which prevents connections "
 "to Wi-Fi networks that do not utilize one of the algorithms in the list.  "
@@ -6692,7 +6427,7 @@ msgstr ""
 "властивість порожньою. Кожен з елементів списку може мати одне зі значень, "
 "«wep40», «wep104», «tkip» або «ccmp»."
 
-#: ../clients/common/settings-docs.h.in:30
+#: ../clients/common/settings-docs.h.in:27
 msgid ""
 "Key management used for the connection.  One of \"none\" (WEP), \"ieee8021x"
 "\" (Dynamic WEP), \"wpa-none\" (Ad-Hoc WPA-PSK), \"wpa-psk\" (infrastructure "
@@ -6705,7 +6440,7 @@ msgstr ""
 "Enterprise). Значення цієї властивості слід встановити для усіх з’єднань Wi-"
 "Fi, для яких використовується захист."
 
-#: ../clients/common/settings-docs.h.in:31
+#: ../clients/common/settings-docs.h.in:28
 msgid ""
 "The login password for legacy LEAP connections (ie, key-mgmt = \"ieee8021x\" "
 "and auth-alg = \"leap\")."
@@ -6713,11 +6448,11 @@ msgstr ""
 "Пароль для застарілих з’єднань LEAP (тобто для key-mgmt = \"ieee8021x\" і "
 "auth-alg = \"leap\")."
 
-#: ../clients/common/settings-docs.h.in:32
+#: ../clients/common/settings-docs.h.in:29
 msgid "Flags indicating how to handle the \"leap-password\" property."
 msgstr "Прапорці, які позначають, як обробляти властивість «leap-password»."
 
-#: ../clients/common/settings-docs.h.in:33
+#: ../clients/common/settings-docs.h.in:30
 msgid ""
 "The login username for legacy LEAP connections (ie, key-mgmt = \"ieee8021x\" "
 "and auth-alg = \"leap\")."
@@ -6725,7 +6460,7 @@ msgstr ""
 "Ім’я користувача для застарілих з’єднань LEAP (тобто для key-mgmt = "
 "\"ieee8021x\" і auth-alg = \"leap\")."
 
-#: ../clients/common/settings-docs.h.in:35
+#: ../clients/common/settings-docs.h.in:32
 msgid ""
 "A list of pairwise encryption algorithms which prevents connections to Wi-Fi "
 "networks that do not utilize one of the algorithms in the list. For maximum "
@@ -6737,7 +6472,7 @@ msgstr ""
 "максимальної сумісності залиште цю властивість порожньою. Кожен з елементів "
 "списку може мати одне зі значень, «tkip» або «ccmp»."
 
-#: ../clients/common/settings-docs.h.in:36
+#: ../clients/common/settings-docs.h.in:33
 msgid ""
 "Indicates whether Protected Management Frames (802.11w) must be enabled for "
 "the connection.  One of NM_SETTING_WIRELESS_SECURITY_PMF_DEFAULT (0) (use "
@@ -6759,7 +6494,7 @@ msgstr ""
 "значення NM_SETTING_WIRELESS_SECURITY_PMF_DEFAULT (0) і немає загального "
 "типового значення, додатково буде увімкнено PMF."
 
-#: ../clients/common/settings-docs.h.in:37
+#: ../clients/common/settings-docs.h.in:34
 msgid ""
 "List of strings specifying the allowed WPA protocol versions to use. Each "
 "element may be one \"wpa\" (allow WPA) or \"rsn\" (allow WPA2/RSN).  If not "
@@ -6770,7 +6505,7 @@ msgstr ""
 "або «rsn» (дозволити WPA2/RSN). Якщо не вказано буде дозволено як з’єднання "
 "WPA, так і з’єднання RSN."
 
-#: ../clients/common/settings-docs.h.in:38
+#: ../clients/common/settings-docs.h.in:35
 msgid ""
 "Pre-Shared-Key for WPA networks.  If the key is 64-characters long, it must "
 "contain only hexadecimal characters and is interpreted as a hexadecimal WPA "
@@ -6786,11 +6521,11 @@ msgstr ""
 "оброблено як пароль WPA і хешовано для отримання справжнього WPA-PSK, який і "
 "буде використано під час встановлення з’єднання із мережею Wi-Fi."
 
-#: ../clients/common/settings-docs.h.in:39
+#: ../clients/common/settings-docs.h.in:36
 msgid "Flags indicating how to handle the \"psk\" property."
 msgstr "Прапорці, які позначають, як обробляти властивість «psk»."
 
-#: ../clients/common/settings-docs.h.in:40
+#: ../clients/common/settings-docs.h.in:37
 msgid ""
 "Flags indicating how to handle the \"wep-key0\", \"wep-key1\", \"wep-key2\", "
 "and \"wep-key3\" properties."
@@ -6798,7 +6533,7 @@ msgstr ""
 "Прапорці, які позначають, як обробляти властивості «wep-key0», «wep-key1», "
 "«wep-key2» та «wep-key3»."
 
-#: ../clients/common/settings-docs.h.in:41
+#: ../clients/common/settings-docs.h.in:38
 msgid ""
 "Controls the interpretation of WEP keys.  Allowed values are "
 "NM_WEP_KEY_TYPE_KEY (1), in which case the key is either a 10- or 26-"
@@ -6813,7 +6548,7 @@ msgstr ""
 "вказано як текстовий рядок, який буде хешовано за допомогою фактичного "
 "методу MD5 для отримання справжнього ключа WEP."
 
-#: ../clients/common/settings-docs.h.in:42
+#: ../clients/common/settings-docs.h.in:39
 msgid ""
 "Index 0 WEP key.  This is the WEP key used in most networks.  See the \"wep-"
 "key-type\" property for a description of how this key is interpreted."
@@ -6822,7 +6557,7 @@ msgstr ""
 "Опис інтерпретації цього ключа наведено у довідці щодо властивості «wep-key-"
 "type»."
 
-#: ../clients/common/settings-docs.h.in:43
+#: ../clients/common/settings-docs.h.in:40
 msgid ""
 "Index 1 WEP key.  This WEP index is not used by most networks.  See the "
 "\"wep-key-type\" property for a description of how this key is interpreted."
@@ -6831,7 +6566,7 @@ msgstr ""
 "Опис інтерпретації цього ключа наведено у довідці щодо властивості «wep-key-"
 "type»."
 
-#: ../clients/common/settings-docs.h.in:44
+#: ../clients/common/settings-docs.h.in:41
 msgid ""
 "Index 2 WEP key.  This WEP index is not used by most networks.  See the "
 "\"wep-key-type\" property for a description of how this key is interpreted."
@@ -6840,7 +6575,7 @@ msgstr ""
 "Опис інтерпретації цього ключа наведено у довідці щодо властивості «wep-key-"
 "type»."
 
-#: ../clients/common/settings-docs.h.in:45
+#: ../clients/common/settings-docs.h.in:42
 msgid ""
 "Index 3 WEP key.  This WEP index is not used by most networks.  See the "
 "\"wep-key-type\" property for a description of how this key is interpreted."
@@ -6849,7 +6584,7 @@ msgstr ""
 "Опис інтерпретації цього ключа наведено у довідці щодо властивості «wep-key-"
 "type»."
 
-#: ../clients/common/settings-docs.h.in:46
+#: ../clients/common/settings-docs.h.in:43
 msgid ""
 "When static WEP is used (ie, key-mgmt = \"none\") and a non-default WEP key "
 "index is used by the AP, put that WEP key index here.  Valid values are 0 "
@@ -6862,7 +6597,7 @@ msgstr ""
 "на деяких поширених точках доступу (зокрема Linksys WRT54G) ключі "
 "нумеруються у діапазоні 1 - 4."
 
-#: ../clients/common/settings-docs.h.in:47
+#: ../clients/common/settings-docs.h.in:44
 msgid ""
 "Flags indicating which mode of WPS is to be used if any. There's little "
 "point in changing the default setting as NetworkManager will automatically "
@@ -6875,7 +6610,7 @@ msgstr ""
 "можливо запустити засіб надання ролей WPS, на основі можливостей точки "
 "доступу. WPS можна вимкнути встановленням для цієї властивості значення 1."
 
-#: ../clients/common/settings-docs.h.in:48
+#: ../clients/common/settings-docs.h.in:45
 msgid ""
 "List of strings to be matched against the altSubjectName of the certificate "
 "presented by the authentication server. If the list is empty, no "
@@ -6885,7 +6620,7 @@ msgstr ""
 "надано сервером розпізнавання. Якщо список порожній, перевірка значення "
 "altSubjectName сертифіката сервера не здійснюватиметься."
 
-#: ../clients/common/settings-docs.h.in:49
+#: ../clients/common/settings-docs.h.in:46
 msgid ""
 "Anonymous identity string for EAP authentication methods.  Used as the "
 "unencrypted identity with EAP types that support different tunneled identity "
@@ -6895,7 +6630,7 @@ msgstr ""
 "шифрований профіль з типами EAP, які підтримують тунелювання іншого профілю, "
 "наприклад, EAP-TTLS."
 
-#: ../clients/common/settings-docs.h.in:50
+#: ../clients/common/settings-docs.h.in:47
 msgid ""
 "A timeout for the authentication. Zero means the global default; if the "
 "global default is not set, the authentication timeout is 25 seconds."
@@ -6904,7 +6639,7 @@ msgstr ""
 "час очікування. Якщо загальне типове значення не встановлено, час очікування "
 "на розпізнавання складатиме 25 секунд."
 
-#: ../clients/common/settings-docs.h.in:51
+#: ../clients/common/settings-docs.h.in:48
 msgid ""
 "Contains the CA certificate if used by the EAP method specified in the \"eap"
 "\" property. Certificate data is specified using a \"scheme\"; two are "
@@ -6928,7 +6663,7 @@ msgstr ""
 "сертифікації, але це уможливлює втручання сторонніх осіб у ланцюжки "
 "передавання даних, тому ми наполегливо не рекомендуємо це робити."
 
-#: ../clients/common/settings-docs.h.in:52
+#: ../clients/common/settings-docs.h.in:49
 msgid ""
 "The password used to access the CA certificate stored in \"ca-cert\" "
 "property. Only makes sense if the certificate is stored on a PKCS#11 token "
@@ -6939,11 +6674,11 @@ msgstr ""
 "якщо сертифікат зберігається на ключі PKCS#11, для доступу до якого слід "
 "пройти розпізнавання."
 
-#: ../clients/common/settings-docs.h.in:53
+#: ../clients/common/settings-docs.h.in:50
 msgid "Flags indicating how to handle the \"ca-cert-password\" property."
 msgstr "Прапорці, які позначають, як обробляти властивість «ca-cert-password»."
 
-#: ../clients/common/settings-docs.h.in:54
+#: ../clients/common/settings-docs.h.in:51
 msgid ""
 "UTF-8 encoded path to a directory containing PEM or DER formatted "
 "certificates to be added to the verification chain in addition to the "
@@ -6953,7 +6688,7 @@ msgstr ""
 "форматуванні PEM або DER, які слід додати до ланцюжка перевірки на додачу до "
 "сертифікатів, вказаних за допомогою властивості «ca-cert»."
 
-#: ../clients/common/settings-docs.h.in:55
+#: ../clients/common/settings-docs.h.in:52
 msgid ""
 "Contains the client certificate if used by the EAP method specified in the "
 "\"eap\" property. Certificate data is specified using a \"scheme\"; two are "
@@ -6971,7 +6706,7 @@ msgstr ""
 "path, для цієї властивості слід встановити повний шлях у кодуванні UTF-8 до "
 "сертифіката із рядком-префіксом «file://» та завершальним байтом NUL."
 
-#: ../clients/common/settings-docs.h.in:56
+#: ../clients/common/settings-docs.h.in:53
 msgid ""
 "The password used to access the client certificate stored in \"client-cert\" "
 "property. Only makes sense if the certificate is stored on a PKCS#11 token "
@@ -6982,12 +6717,12 @@ msgstr ""
 "зберігається на ключі PKCS#11, для доступу до якого слід пройти "
 "розпізнавання."
 
-#: ../clients/common/settings-docs.h.in:57
+#: ../clients/common/settings-docs.h.in:54
 msgid "Flags indicating how to handle the \"client-cert-password\" property."
 msgstr ""
 "Прапорці, які позначають, як обробляти властивість «client-cert-password»."
 
-#: ../clients/common/settings-docs.h.in:58
+#: ../clients/common/settings-docs.h.in:55
 msgid ""
 "Constraint for server domain name. If set, this FQDN is used as a suffix "
 "match requirement for dNSName element(s) of the certificate presented by the "
@@ -7002,7 +6737,7 @@ msgstr ""
 "значень dNSName не буде виявлено, обмеження застосовуватиметься до CN "
 "SubjectName з використанням тих самих правил порівняння за суфіксом."
 
-#: ../clients/common/settings-docs.h.in:59
+#: ../clients/common/settings-docs.h.in:56
 msgid ""
 "The allowed EAP method to be used when authenticating to the network with "
 "802.1x.  Valid methods are: \"leap\", \"md5\", \"tls\", \"peap\", \"ttls\", "
@@ -7016,7 +6751,7 @@ msgstr ""
 "властивостей цього параметра; можливі комбінації параметрів наведено у "
 "документації з wpa_supplicant."
 
-#: ../clients/common/settings-docs.h.in:60
+#: ../clients/common/settings-docs.h.in:57
 msgid ""
 "Identity string for EAP authentication methods.  Often the user's user or "
 "login name."
@@ -7024,11 +6759,11 @@ msgstr ""
 "Рядок профілю для способів розпізнавання EAP. Часто ім’я користувача або "
 "назва облікового запису."
 
-#: ../clients/common/settings-docs.h.in:62
+#: ../clients/common/settings-docs.h.in:59
 msgid "UTF-8 encoded file path containing PAC for EAP-FAST."
 msgstr "Шлях у кодуванні UTF-8 до файла, який містить PAC для EAP-FAST."
 
-#: ../clients/common/settings-docs.h.in:63
+#: ../clients/common/settings-docs.h.in:60
 msgid ""
 "UTF-8 encoded password used for EAP authentication methods. If both the "
 "\"password\" property and the \"password-raw\" property are specified, "
@@ -7038,15 +6773,15 @@ msgstr ""
 "розпізнавання EAP. Якщо вказано обидві властивості, «password» і «password-"
 "raw», пріоритет матиме властивість «password»."
 
-#: ../clients/common/settings-docs.h.in:64
-#: ../clients/common/settings-docs.h.in:111
-#: ../clients/common/settings-docs.h.in:139
-#: ../clients/common/settings-docs.h.in:189
-#: ../clients/common/settings-docs.h.in:312
+#: ../clients/common/settings-docs.h.in:61
+#: ../clients/common/settings-docs.h.in:108
+#: ../clients/common/settings-docs.h.in:136
+#: ../clients/common/settings-docs.h.in:186
+#: ../clients/common/settings-docs.h.in:307
 msgid "Flags indicating how to handle the \"password\" property."
 msgstr "Прапорці, які позначають, як обробляти властивість «password»."
 
-#: ../clients/common/settings-docs.h.in:65
+#: ../clients/common/settings-docs.h.in:62
 msgid ""
 "Password used for EAP authentication methods, given as a byte array to allow "
 "passwords in other encodings than UTF-8 to be used. If both the \"password\" "
@@ -7058,11 +6793,11 @@ msgstr ""
 "відмінних від UTF-8. Якщо вказано обидві властивості, «password» і «password-"
 "raw», пріоритет матиме властивість «password»."
 
-#: ../clients/common/settings-docs.h.in:66
+#: ../clients/common/settings-docs.h.in:63
 msgid "Flags indicating how to handle the \"password-raw\" property."
 msgstr "Прапорці, які позначають, як обробляти властивість «password-raw»."
 
-#: ../clients/common/settings-docs.h.in:67
+#: ../clients/common/settings-docs.h.in:64
 msgid ""
 "Specifies authentication flags to use in \"phase 1\" outer authentication "
 "using NMSetting8021xAuthFlags options. The individual TLS versions can be "
@@ -7079,7 +6814,7 @@ msgstr ""
 "tls_disable_tlsv1_x. Докладнішу інформацію можна знайти у документації до "
 "wpa_supplicant."
 
-#: ../clients/common/settings-docs.h.in:68
+#: ../clients/common/settings-docs.h.in:65
 msgid ""
 "Enables or disables in-line provisioning of EAP-FAST credentials when FAST "
 "is specified as the EAP method in the \"eap\" property. Recognized values "
@@ -7095,7 +6830,7 @@ msgstr ""
 "режими ініціалізації — з розпізнаванням і без нього). Див. документацію до "
 "wpa_supplicant, щоб дізнатися більше."
 
-#: ../clients/common/settings-docs.h.in:69
+#: ../clients/common/settings-docs.h.in:66
 msgid ""
 "Forces use of the new PEAP label during key derivation.  Some RADIUS servers "
 "may require forcing the new PEAP label to interoperate with PEAPv1.  Set to "
@@ -7108,7 +6843,7 @@ msgstr ""
 "використовувати нову мітку PEAP. Див. документацію до wpa_supplicant, щоб "
 "дізнатися більше."
 
-#: ../clients/common/settings-docs.h.in:70
+#: ../clients/common/settings-docs.h.in:67
 msgid ""
 "Forces which PEAP version is used when PEAP is set as the EAP method in the "
 "\"eap\" property.  When unset, the version reported by the server will be "
@@ -7124,7 +6859,7 @@ msgstr ""
 "використовується встановлення для цієї властивості значення «0» або «1», яке "
 "примусово визначає певну версію PEAP."
 
-#: ../clients/common/settings-docs.h.in:71
+#: ../clients/common/settings-docs.h.in:68
 msgid ""
 "List of strings to be matched against the altSubjectName of the certificate "
 "presented by the authentication server during the inner \"phase 2\" "
@@ -7136,7 +6871,7 @@ msgstr ""
 "Якщо список порожній, перевірка значення altSubjectName сертифіката сервера "
 "не здійснюватиметься."
 
-#: ../clients/common/settings-docs.h.in:72
+#: ../clients/common/settings-docs.h.in:69
 msgid ""
 "Specifies the allowed \"phase 2\" inner non-EAP authentication methods when "
 "an EAP method that uses an inner TLS tunnel is specified in the \"eap\" "
@@ -7153,7 +6888,7 @@ msgstr ""
 "специфічні параметри. Докладніший опис параметрів можна знайти у "
 "документації з wpa_supplicant."
 
-#: ../clients/common/settings-docs.h.in:73
+#: ../clients/common/settings-docs.h.in:70
 msgid ""
 "Specifies the allowed \"phase 2\" inner EAP-based authentication methods "
 "when an EAP method that uses an inner TLS tunnel is specified in the \"eap\" "
@@ -7169,7 +6904,7 @@ msgstr ""
 "внутрішніх способів «phase 2» слід вказати специфічні параметри. Докладніший "
 "опис параметрів можна знайти у документації з wpa_supplicant."
 
-#: ../clients/common/settings-docs.h.in:74
+#: ../clients/common/settings-docs.h.in:71
 msgid ""
 "Contains the \"phase 2\" CA certificate if used by the EAP method specified "
 "in the \"phase2-auth\" or \"phase2-autheap\" properties. Certificate data is "
@@ -7194,7 +6929,7 @@ msgstr ""
 "служб сертифікації, але це уможливлює втручання сторонніх осіб у ланцюжки "
 "передавання даних, тому ми наполегливо не рекомендуємо це робити."
 
-#: ../clients/common/settings-docs.h.in:75
+#: ../clients/common/settings-docs.h.in:72
 msgid ""
 "The password used to access the \"phase2\" CA certificate stored in \"phase2-"
 "ca-cert\" property. Only makes sense if the certificate is stored on a "
@@ -7205,13 +6940,13 @@ msgstr ""
 "лише якщо сертифікат зберігається на ключі PKCS#11, для доступу до якого "
 "слід пройти розпізнавання."
 
-#: ../clients/common/settings-docs.h.in:76
+#: ../clients/common/settings-docs.h.in:73
 msgid ""
 "Flags indicating how to handle the \"phase2-ca-cert-password\" property."
 msgstr ""
 "Прапорці, які позначають, як обробляти властивість «phase2-ca-cert-password»."
 
-#: ../clients/common/settings-docs.h.in:77
+#: ../clients/common/settings-docs.h.in:74
 msgid ""
 "UTF-8 encoded path to a directory containing PEM or DER formatted "
 "certificates to be added to the verification chain in addition to the "
@@ -7221,7 +6956,7 @@ msgstr ""
 "форматуванні PEM або DER, які слід додати до ланцюжка перевірки на додачу до "
 "сертифікатів, вказаних за допомогою властивості «phase2-ca-cert»."
 
-#: ../clients/common/settings-docs.h.in:78
+#: ../clients/common/settings-docs.h.in:75
 msgid ""
 "Contains the \"phase 2\" client certificate if used by the EAP method "
 "specified in the \"phase2-auth\" or \"phase2-autheap\" properties. "
@@ -7246,7 +6981,7 @@ msgstr ""
 "служб сертифікації, але це уможливлює втручання сторонніх осіб у ланцюжки "
 "передавання даних, тому ми наполегливо не рекомендуємо це робити."
 
-#: ../clients/common/settings-docs.h.in:79
+#: ../clients/common/settings-docs.h.in:76
 msgid ""
 "The password used to access the \"phase2\" client certificate stored in "
 "\"phase2-client-cert\" property. Only makes sense if the certificate is "
@@ -7257,14 +6992,14 @@ msgstr ""
 "значення, лише якщо сертифікат зберігається на ключі PKCS#11, для доступу до "
 "якого слід пройти розпізнавання."
 
-#: ../clients/common/settings-docs.h.in:80
+#: ../clients/common/settings-docs.h.in:77
 msgid ""
 "Flags indicating how to handle the \"phase2-client-cert-password\" property."
 msgstr ""
 "Прапорці, які позначають, як обробляти властивість «phase2-client-cert-"
 "password»."
 
-#: ../clients/common/settings-docs.h.in:81
+#: ../clients/common/settings-docs.h.in:78
 msgid ""
 "Constraint for server domain name. If set, this FQDN is used as a suffix "
 "match requirement for dNSName element(s) of the certificate presented by the "
@@ -7281,7 +7016,7 @@ msgstr ""
 "виявлено, обмеження застосовуватиметься до CN SubjectName з використанням "
 "тих самих правил порівняння за суфіксом."
 
-#: ../clients/common/settings-docs.h.in:82
+#: ../clients/common/settings-docs.h.in:79
 msgid ""
 "Contains the \"phase 2\" inner private key when the \"phase2-auth\" or "
 "\"phase2-autheap\" property is set to \"tls\". Key data is specified using a "
@@ -7318,7 +7053,7 @@ msgstr ""
 "значення пароля, який використовується для розшифрування закритого ключа і "
 "сертифіката PKCS#12."
 
-#: ../clients/common/settings-docs.h.in:83
+#: ../clients/common/settings-docs.h.in:80
 msgid ""
 "The password used to decrypt the \"phase 2\" private key specified in the "
 "\"phase2-private-key\" property when the private key either uses the path "
@@ -7328,14 +7063,14 @@ msgstr ""
 "вказаного за допомогою властивості «phase2-private-key», коли для закритого "
 "ключа або використовується схема path, або це ключ у форматі PKCS#12."
 
-#: ../clients/common/settings-docs.h.in:84
+#: ../clients/common/settings-docs.h.in:81
 msgid ""
 "Flags indicating how to handle the \"phase2-private-key-password\" property."
 msgstr ""
 "Прапорці, які позначають, як обробляти властивість «phase2-private-key-"
 "password»."
 
-#: ../clients/common/settings-docs.h.in:85
+#: ../clients/common/settings-docs.h.in:82
 msgid ""
 "Substring to be matched against the subject of the certificate presented by "
 "the authentication server during the inner \"phase 2\" authentication. When "
@@ -7350,16 +7085,16 @@ msgstr ""
 "якщо взагалі його поліпшує, тому її використання вважається застарілим. "
 "Рекомендованим є використання NMSetting8021x:phase2-domain-suffix-match."
 
-#: ../clients/common/settings-docs.h.in:86
+#: ../clients/common/settings-docs.h.in:83
 msgid "PIN used for EAP authentication methods."
 msgstr "PIN, який використовується для методів розпізнавання EAP."
 
-#: ../clients/common/settings-docs.h.in:87
-#: ../clients/common/settings-docs.h.in:191
+#: ../clients/common/settings-docs.h.in:84
+#: ../clients/common/settings-docs.h.in:188
 msgid "Flags indicating how to handle the \"pin\" property."
 msgstr "Прапорці, які позначають, як обробляти властивість «pin»."
 
-#: ../clients/common/settings-docs.h.in:88
+#: ../clients/common/settings-docs.h.in:85
 msgid ""
 "Contains the private key when the \"eap\" property is set to \"tls\". Key "
 "data is specified using a \"scheme\"; two are currently supported: blob and "
@@ -7403,7 +7138,7 @@ msgstr ""
 "допомогою пароля для закритих ключів, щоб запобігти доступу сторонніх осіб "
 "до незашифрованих даних закритого ключа."
 
-#: ../clients/common/settings-docs.h.in:89
+#: ../clients/common/settings-docs.h.in:86
 msgid ""
 "The password used to decrypt the private key specified in the \"private-key"
 "\" property when the private key either uses the path scheme, or if the "
@@ -7414,12 +7149,12 @@ msgstr ""
 "використовується схема path, або якщо закрити ключ є ключем у форматі "
 "PKCS#12."
 
-#: ../clients/common/settings-docs.h.in:90
+#: ../clients/common/settings-docs.h.in:87
 msgid "Flags indicating how to handle the \"private-key-password\" property."
 msgstr ""
 "Прапорці, які позначають, як обробляти властивість «private-key-password»."
 
-#: ../clients/common/settings-docs.h.in:91
+#: ../clients/common/settings-docs.h.in:88
 msgid ""
 "Substring to be matched against the subject of the certificate presented by "
 "the authentication server. When unset, no verification of the authentication "
@@ -7434,7 +7169,7 @@ msgstr ""
 "використання вважається застарілим. Рекомендованим є використання "
 "NMSetting8021x:domain-suffix-match."
 
-#: ../clients/common/settings-docs.h.in:92
+#: ../clients/common/settings-docs.h.in:89
 msgid ""
 "When TRUE, overrides the \"ca-path\" and \"phase2-ca-path\" properties using "
 "the system CA directory specified at configure time with the --system-ca-"
@@ -7455,26 +7190,18 @@ msgstr ""
 "«ca-cert» і «phase2-ca-cert» (встановлює параметри ca_cert/ca_cert2 для "
 "wpa_supplicant)."
 
-#: ../clients/common/settings-docs.h.in:93
+#: ../clients/common/settings-docs.h.in:90
 msgid ""
-"When TRUE, enforce auto-negotiation of speed and duplex mode. If \"speed\" "
-"and \"duplex\" properties are both specified, only that single mode will be "
-"advertised and accepted during the link auto-negotiation process: this works "
-"only for BASE-T 802.3 specifications and is useful for enforcing gigabits "
-"modes, as in these cases link negotiation is mandatory. When FALSE, \"speed"
-"\" and \"duplex\" properties should be both set or link configuration will "
-"be skipped."
-msgstr ""
-"Якщо має значення TRUE, наказує автоматично узгоджувати швидкість і двобічний"
-" режим роботи порту. Якщо одразу вказано властивості «speed» і «duplex»,"
-" пропонуватиметься і прийматиметься під час процедури автоматичного"
-" узгодження зв'язку лише одинарний режим: це працює лише для специфікацій"
-" BASE-T 802.3 і корисне для примусового встановлення гігабітових режимів,"
-" оскільки у цих випадках узгодження зв'язку є обов'язковим. Якщо має значення"
-" FALSE, має бути вручну встановлено значення властивостей «speed» і «duplex»,"
-" інакше налаштування зв’язку буде пропущено."
+"If TRUE, enforce auto-negotiation of port speed and duplex mode.  If FALSE, "
+"\"speed\" and \"duplex\" properties should be both set or link configuration "
+"will be skipped."
+msgstr ""
+"Якщо має значення TRUE, наказує автоматично узгоджувати швидкість і "
+"двобічний режим роботи порту. Якщо має значення FALSE, має бути вручну "
+"встановлено значення властивостей «speed» і «duplex», інакше налаштування "
+"зв’язку буде пропущено."
 
-#: ../clients/common/settings-docs.h.in:94
+#: ../clients/common/settings-docs.h.in:91
 msgid ""
 "If specified, request that the device use this MAC address instead. This is "
 "known as MAC cloning or spoofing. Beside explicitly specifying a MAC "
@@ -7506,34 +7233,20 @@ msgstr ""
 "використовуватися інше типове значення). У D-Bus це поле позначається як "
 "«assigned-mac-address», а у застарілих версіях, як «cloned-mac-address»."
 
-#: ../clients/common/settings-docs.h.in:95
+#: ../clients/common/settings-docs.h.in:92
 msgid ""
-"When a value is set, either \"half\" or \"full\", configures the device to "
-"use the specified duplex mode. If \"auto-negotiate\" is \"yes\" the "
-"specified duplex mode will be the only one advertised during link "
-"negotiation: this works only for BASE-T 802.3 specifications and is useful "
-"for enforcing gigabits modes, as in these cases link negotiation is "
-"mandatory. If the value is unset (the default), the link configuration will "
-"be either skipped (if \"auto-negotiate\" is \"no\", the default) or will be "
-"auto-negotiated (if \"auto-negotiate\" is \"yes\") and the local device will "
-"advertise all the supported duplex modes. Must be set together with the "
-"\"speed\" property if specified. Before specifying a duplex mode be sure "
-"your device supports it."
-msgstr ""
-"Якщо встановлено значення, «half» або «full», налаштовує пристрій на"
-" використання вказаного двобічного режиму. Якщо «auto-negotiate» має значення"
-" «yes», вказаний двобічний режим буде єдиним, який пропонуватиметься під час"
-" узгодження зв'язку: це працює лише для специфікацій BASE-T 802.3 і корисне"
-" для примусового встановлення гігабітових режимів, оскільки у цих випадках"
-" узгодження зв'язку є обов'язковим. Якщо значення не встановлено (типовий"
-" стан), налаштування зв'язку буде або пропущено (якщо «auto-negotiate» має"
-" значення «no», типове) або автоматично узгоджено (якщо «auto-negotiate» має"
-" значення «yes»), а локальний пристрій пропонуватиме усі підтримувані ним"
-" двобічні режими. Має бути вказано із властивістю «speed», якщо визначається."
-" Перш ніж вказувати двобічний режим, переконайтеся, що у пристрої передбачено"
-" його підтримку."
+"Can be specified only when \"auto-negotiate\" is \"off\". In that case, "
+"statically configures the device to use that specified duplex mode, either "
+"\"half\" or \"full\". Must be set together with the \"speed\" property if "
+"specified. Before specifying a duplex mode be sure your device supports it."
+msgstr ""
+"Можна вказували, лише якщо «auto-negotiate» має значення «off». У цьому "
+"випадку статично налаштовує пристрій на використання вказаного двобічного "
+"режиму, «half» або «full». Має бути вказано із властивістю «speed», якщо "
+"визначається. Перш ніж вказувати двобічний режим, переконайтеся, що у "
+"пристрої передбачено його підтримку."
 
-#: ../clients/common/settings-docs.h.in:97
+#: ../clients/common/settings-docs.h.in:94
 msgid ""
 "If specified, this connection will only apply to the Ethernet device whose "
 "permanent MAC address matches. This property does not change the MAC address "
@@ -7543,7 +7256,7 @@ msgstr ""
 "відповідною сталою адресою MAC. Ця властивість не змінює MAC-адреси пристрою "
 "(таку зміну називають підміною MAC)."
 
-#: ../clients/common/settings-docs.h.in:98
+#: ../clients/common/settings-docs.h.in:95
 msgid ""
 "If specified, this connection will never apply to the Ethernet device whose "
 "permanent MAC address matches an address in the list.  Each MAC address is "
@@ -7554,7 +7267,7 @@ msgstr ""
 "адреси слід вказувати у стандартному позначенні із шістнадцяткових цифр і "
 "двокрапок (00:11:22:33:44:55)."
 
-#: ../clients/common/settings-docs.h.in:101
+#: ../clients/common/settings-docs.h.in:98
 msgid ""
 "Specific port type to use if the device supports multiple attachment "
 "methods.  One of \"tp\" (Twisted Pair), \"aui\" (Attachment Unit Interface), "
@@ -7567,7 +7280,7 @@ msgstr ""
 "Independent Interface). Якщо для пристрою передбачено підтримку лише одного "
 "типу порту, цей параметр буде проігноровано."
 
-#: ../clients/common/settings-docs.h.in:102
+#: ../clients/common/settings-docs.h.in:99
 msgid ""
 "s390 network device type; one of \"qeth\", \"lcs\", or \"ctc\", representing "
 "the different types of virtual network devices available on s390 systems."
@@ -7576,7 +7289,7 @@ msgstr ""
 "відповідно до різних типів пристроїв віртуальної мережі, які доступні на "
 "системах s390."
 
-#: ../clients/common/settings-docs.h.in:103
+#: ../clients/common/settings-docs.h.in:100
 msgid ""
 "Dictionary of key/value pairs of s390-specific device options.  Both keys "
 "and values must be strings.  Allowed keys include \"portno\", \"layer2\", "
@@ -7588,7 +7301,7 @@ msgstr ""
 "«portno», «layer2», «portname», «protocol». Параметр names має містити лише "
 "літери латинської абетки та цифри (тобто [a-zA-Z0-9])."
 
-#: ../clients/common/settings-docs.h.in:104
+#: ../clients/common/settings-docs.h.in:101
 msgid ""
 "Identifies specific subchannels that this network device uses for "
 "communication with z/VM or s390 host.  Like the \"mac-address\" property for "
@@ -7604,35 +7317,22 @@ msgstr ""
 "використовує вказані підканали. Список має містити точно три рядки, кожен з "
 "рядків може складатися лише із шістнадцяткових цифр та символів крапки (.)."
 
-#: ../clients/common/settings-docs.h.in:105
+#: ../clients/common/settings-docs.h.in:102
 msgid ""
-"When a value grater than 0 is set, configures the device to use the "
-"specified speed. If \"auto-negotiate\" is \"yes\" the specified speed will "
-"be the only one advertised during link negotiation: this works only for BASE-"
-"T 802.3 specifications and is useful for enforcing gigabit speeds, as in "
-"this case link negotiation is mandatory. If the value is unset (0, the "
-"default), the link configuration will be either skipped (if \"auto-negotiate"
-"\" is \"no\", the default) or will be auto-negotiated (if \"auto-negotiate\" "
-"is \"yes\") and the local device will advertise all the supported speeds. In "
-"Mbit/s, ie 100 == 100Mbit/s. Must be set together with the \"duplex\" "
-"property when non-zero. Before specifying a speed value be sure your device "
-"supports it."
-msgstr ""
-"Якщо встановлено значення, яке є більшим за 0, наказує пристрою"
-" використовувати вказану швидкість. Якщо для «auto-negotiate» встановлено"
-" значення «yes», вказана швидкість буде єдиною швидкістю, яка"
-" пропонуватиметься під час узгодження зв'язку: працює лише для специфікацій"
-" BASE-T 802.3 і корисне для примусового встановлення гігабітових швидкостей,"
-" оскільки у цьому випадку узгодження є обов'зяковим. Якщо значення не"
-" встановлено (0, типове значення), налаштування зв'язку буде або пропущено"
-" (якщо «auto-negotiate» має значення «no», типове) або автоматично узгоджено"
-" (якщо «auto-negotiate» має значення «yes»), а локальний пристрій"
-" пропонуватиме усі підтримувані ним швидкості. Значення слід вказувати у"
-" Мбіт/с, тобто 100 == 100 Мбіт/с. Має бути встановлено разом із ненульовим"
-" значенням властивості «duplex». Перш ніж встановлювати значення швидкості,"
-" переконайтеся, що у вашому пристрої передбачено її підтримку."
+"Can be set to a value greater than zero only when \"auto-negotiate\" is \"off"
+"\". In that case, statically configures the device to use that specified "
+"speed. In Mbit/s, ie 100 == 100Mbit/s. Must be set together with the \"duplex"
+"\" property when non-zero. Before specifying a speed value be sure your "
+"device supports it."
+msgstr ""
+"Можна встановлювати значення більше за нуль, лише якщо «auto-negotiate» має "
+"значення «off». У цьому випадку налаштовує пристрій на використання вказаної "
+"швидкості обміну даними. Швидкість вказується у Мбіт/с, тобто 100 == 100 "
+"Мбіт/с. Слід вказувати разом із властивістю «duplex», якщо має ненульове "
+"значення. Перш ніж вказувати значення швидкості, слід переконатися, що на "
+"пристрої передбачено підтримку такої швидкості."
 
-#: ../clients/common/settings-docs.h.in:106
+#: ../clients/common/settings-docs.h.in:103
 msgid ""
 "The NMSettingWiredWakeOnLan options to enable. Not all devices support all "
 "options. May be any combination of NM_SETTING_WIRED_WAKE_ON_LAN_PHY (0x2), "
@@ -7655,7 +7355,7 @@ msgstr ""
 "(використання загальних параметрів) та NM_SETTING_WIRED_WAKE_ON_LAN_IGNORE "
 "(0x8000) (вимкнути керування Wake-on-LAN у NetworkManager)."
 
-#: ../clients/common/settings-docs.h.in:107
+#: ../clients/common/settings-docs.h.in:104
 msgid ""
 "If specified, the password used with magic-packet-based Wake-on-LAN, "
 "represented as an Ethernet MAC address.  If NULL, no password will be "
@@ -7665,37 +7365,37 @@ msgstr ""
 "магічних пакетах, представлений як MAC-адреса Ethernet. Якщо має значення "
 "NULL, пароль не потрібен."
 
-#: ../clients/common/settings-docs.h.in:108
+#: ../clients/common/settings-docs.h.in:105
 msgid "Encapsulation of ADSL connection.  Can be \"vcmux\" or \"llc\"."
 msgstr "Вкладеність з’єднання ADSL. Може мати значення «vcmux» або «llc»."
 
-#: ../clients/common/settings-docs.h.in:110
+#: ../clients/common/settings-docs.h.in:107
 msgid "Password used to authenticate with the ADSL service."
 msgstr "Пароль, який використовуватиметься для розпізнавання на службі ADSL."
 
-#: ../clients/common/settings-docs.h.in:112
+#: ../clients/common/settings-docs.h.in:109
 msgid "ADSL connection protocol.  Can be \"pppoa\", \"pppoe\" or \"ipoatm\"."
 msgstr ""
 "Протокол з’єднання ADSL. Може мати значення «pppoa», «pppoe» та «ipoatm»."
 
-#: ../clients/common/settings-docs.h.in:113
+#: ../clients/common/settings-docs.h.in:110
 msgid "Username used to authenticate with the ADSL service."
 msgstr ""
 "Ім’я користувача, яке використовуватиметься для розпізнавання на службі ADSL."
 
-#: ../clients/common/settings-docs.h.in:114
+#: ../clients/common/settings-docs.h.in:111
 msgid "VCI of ADSL connection"
 msgstr "VCI з’єднання ADSL"
 
-#: ../clients/common/settings-docs.h.in:115
+#: ../clients/common/settings-docs.h.in:112
 msgid "VPI of ADSL connection"
 msgstr "VPI з’єднання ADSL"
 
-#: ../clients/common/settings-docs.h.in:116
+#: ../clients/common/settings-docs.h.in:113
 msgid "The Bluetooth address of the device."
 msgstr "Адреса Bluetooth пристрою."
 
-#: ../clients/common/settings-docs.h.in:118
+#: ../clients/common/settings-docs.h.in:115
 msgid ""
 "Either \"dun\" for Dial-Up Networking connections or \"panu\" for Personal "
 "Area Networking connections to devices supporting the NAP profile."
@@ -7704,7 +7404,7 @@ msgstr ""
 "особистої області мережі із пристроями, для яких передбачено підтримку "
 "профілю NAP."
 
-#: ../clients/common/settings-docs.h.in:120
+#: ../clients/common/settings-docs.h.in:117
 msgid ""
 "Dictionary of key/value pairs of bonding options.  Both keys and values must "
 "be strings. Option names must contain only alphanumeric characters (ie, [a-"
@@ -7714,15 +7414,15 @@ msgstr ""
 "значення мають бути рядками. Параметр names має містити лише літери "
 "латинської абетки та цифри (тобто [a-zA-Z0-9])."
 
-#: ../clients/common/settings-docs.h.in:121
+#: ../clients/common/settings-docs.h.in:118
 msgid "The Ethernet MAC address aging time, in seconds."
 msgstr "Час застарівання MAC-адреси Ethernet, у секундах."
 
-#: ../clients/common/settings-docs.h.in:122
+#: ../clients/common/settings-docs.h.in:119
 msgid "The Spanning Tree Protocol (STP) forwarding delay, in seconds."
 msgstr "Затримка переспрямовування за протоколом STP, у секундах."
 
-#: ../clients/common/settings-docs.h.in:123
+#: ../clients/common/settings-docs.h.in:120
 msgid ""
 "A mask of group addresses to forward. Usually, group addresses in the range "
 "from 01:80:C2:00:00:00 to 01:80:C2:00:00:0F are not forwarded according to "
@@ -7738,11 +7438,18 @@ msgstr ""
 "2, оскільки ці біти використовуються для кадрів призупинення STP, MAC та "
 "LACP."
 
-#: ../clients/common/settings-docs.h.in:124
+#: ../clients/common/settings-docs.h.in:121
 msgid "The Spanning Tree Protocol (STP) hello time, in seconds."
 msgstr "Тривалість вітання за протоколом STP, у секундах."
 
-#: ../clients/common/settings-docs.h.in:125
+#: ../clients/common/settings-docs.h.in:122
+#| msgid ""
+#| "If specified, the MAC address of bridge. When creating a new bridge, this "
+#| "MAC address will be set. If this field is left unspecified, the "
+#| "\"ethernet.cloned-mac-address\" is referred instead to generate the "
+#| "initial MAC address. Note that setting \"ethernet.cloned-mac-address\" "
+#| "anyway overwrites the MAC address of the bridge later while activating "
+#| "the bridge. Hence, this property is deprecated."
 msgid ""
 "If specified, the MAC address of bridge. When creating a new bridge, this "
 "MAC address will be set. If this field is left unspecified, the \"ethernet."
@@ -7757,11 +7464,11 @@ msgstr ""
 "Зауважте, що встановлення «ethernet.cloned-mac-address» завжди перевизначає "
 "MAC-адресу містка під час активації. Отже, ця властивість є застарілою."
 
-#: ../clients/common/settings-docs.h.in:126
+#: ../clients/common/settings-docs.h.in:123
 msgid "The Spanning Tree Protocol (STP) maximum message age, in seconds."
 msgstr "Максимальний вік повідомлення за протоколом STP, у секундах."
 
-#: ../clients/common/settings-docs.h.in:127
+#: ../clients/common/settings-docs.h.in:124
 msgid ""
 "Controls whether IGMP snooping is enabled for this bridge. Note that if "
 "snooping was automatically disabled due to hash collisions, the system may "
@@ -7771,7 +7478,7 @@ msgstr ""
 "стеження було автоматично вимкнено через конфлікти хешування, система може "
 "відмовити у вмиканні цієї можливості, аж доки конфлікти не буде усунено."
 
-#: ../clients/common/settings-docs.h.in:129
+#: ../clients/common/settings-docs.h.in:126
 msgid ""
 "Sets the Spanning Tree Protocol (STP) priority for this bridge.  Lower "
 "values are \"better\"; the lowest priority bridge will be elected the root "
@@ -7781,14 +7488,14 @@ msgstr ""
 "пріоритетнішими; місток із найменшим значенням пріоритетності буде вибрано "
 "як кореневий місток."
 
-#: ../clients/common/settings-docs.h.in:130
+#: ../clients/common/settings-docs.h.in:127
 msgid ""
 "Controls whether Spanning Tree Protocol (STP) is enabled for this bridge."
 msgstr ""
 "Керує тим, чи увімкнено протокол пересування ієрархією (STP) для цього "
 "містка."
 
-#: ../clients/common/settings-docs.h.in:131
+#: ../clients/common/settings-docs.h.in:128
 msgid ""
 "Enables or disables \"hairpin mode\" for the port, which allows frames to be "
 "sent back out through the port the frame was received on."
@@ -7796,21 +7503,21 @@ msgstr ""
 "Вмикає або вимикає «режим початкової зони» для порту, що уможливлює зворотне "
 "надсилання кадрів крізь порт, з якого було отримано кадр."
 
-#: ../clients/common/settings-docs.h.in:133
+#: ../clients/common/settings-docs.h.in:130
 msgid ""
 "The Spanning Tree Protocol (STP) port cost for destinations via this port."
 msgstr ""
 "Вартість порту у протоколі пересування ієрархією (STP) для призначень, що "
 "маршрутизуються через цей порт."
 
-#: ../clients/common/settings-docs.h.in:134
+#: ../clients/common/settings-docs.h.in:131
 msgid "The Spanning Tree Protocol (STP) priority of this bridge port."
 msgstr ""
 "Пріоритетність протоколу пересування ієрархією (STP) цього порту містка."
 
-#: ../clients/common/settings-docs.h.in:135
-#: ../clients/common/settings-docs.h.in:184
-#: ../clients/common/settings-docs.h.in:196
+#: ../clients/common/settings-docs.h.in:132
+#: ../clients/common/settings-docs.h.in:181
+#: ../clients/common/settings-docs.h.in:193
 msgid ""
 "If non-zero, only transmit packets of the specified size or smaller, "
 "breaking larger packets up into multiple frames."
@@ -7818,7 +7525,7 @@ msgstr ""
 "Якщо має ненульове значення, передавати пакети лише вказаного або меншого "
 "розміру, розбиваючи великі пакети на декілька кадрів."
 
-#: ../clients/common/settings-docs.h.in:137
+#: ../clients/common/settings-docs.h.in:134
 msgid ""
 "The number to dial to establish the connection to the CDMA-based mobile "
 "broadband network, if any.  If not specified, the default number (#777) is "
@@ -7828,8 +7535,8 @@ msgstr ""
 "широкосмуговою мережею на основі CDMA, якщо такий передбачено. Якщо не "
 "вказано, буде використано типовий номер (#777)."
 
-#: ../clients/common/settings-docs.h.in:138
-#: ../clients/common/settings-docs.h.in:188
+#: ../clients/common/settings-docs.h.in:135
+#: ../clients/common/settings-docs.h.in:185
 msgid ""
 "The password used to authenticate with the network, if required.  Many "
 "providers do not require a password, or accept any password.  But if a "
@@ -7839,8 +7546,8 @@ msgstr ""
 "Багато надавачів послуг не вимагають надання пароля або приймають будь-який "
 "пароль. Втім, якщо пароль потрібен, його слід вказати тут."
 
-#: ../clients/common/settings-docs.h.in:140
-#: ../clients/common/settings-docs.h.in:194
+#: ../clients/common/settings-docs.h.in:137
+#: ../clients/common/settings-docs.h.in:191
 msgid ""
 "The username used to authenticate with the network, if required.  Many "
 "providers do not require a username, or accept any username.  But if a "
@@ -7851,7 +7558,7 @@ msgstr ""
 "приймають будь-яке ім’я користувача. Втім, якщо ім’я користувача потрібне, "
 "його слід вказати тут."
 
-#: ../clients/common/settings-docs.h.in:141
+#: ../clients/common/settings-docs.h.in:138
 msgid ""
 "The number of retries for the authentication. Zero means to try "
 "indefinitely; -1 means to use a global default. If the global default is not "
@@ -7865,29 +7572,19 @@ msgstr ""
 "неможливість встановлення з'єднання. У поточній версії стосується лише до "
 "розпізнавання за протоколом 802-1x."
 
-#: ../clients/common/settings-docs.h.in:142
-#| msgid ""
-#| "Whether or not the connection should be automatically connected by "
-#| "NetworkManager when the resources for the connection are available. TRUE "
-#| "to automatically activate the connection, FALSE to require manual "
-#| "intervention to activate the connection."
+#: ../clients/common/settings-docs.h.in:139
 msgid ""
 "Whether or not the connection should be automatically connected by "
 "NetworkManager when the resources for the connection are available. TRUE to "
 "automatically activate the connection, FALSE to require manual intervention "
-"to activate the connection. Note that autoconnect is not implemented for VPN "
-"profiles. See \"secondaries\" as an alternative to automatically connect VPN "
-"profiles."
+"to activate the connection."
 msgstr ""
 "Визначає, чи слід автоматично встановлювати з’єднання за допомогою "
 "NetworkManager, якщо доступні ресурси для з’єднання. Значення TRUE "
 "призводить до автоматичної активації з’єднання, а значення FALSE означатиме, "
-"що для активації з’єднання потрібне буде втручання вручну. Зауважте, що"
-" автоматичне з'єднання не реалізовано для профілів VPN. Див. \"secondaries\","
-" якщо потрібна альтернатива для автоматичного встановлення з'єднань для"
-" профілів VPN."
+"що для активації з’єднання потрібне буде втручання вручну."
 
-#: ../clients/common/settings-docs.h.in:143
+#: ../clients/common/settings-docs.h.in:140
 msgid ""
 "The autoconnect priority. If the connection is set to autoconnect, "
 "connections with higher priority will be preferred. Defaults to 0. The "
@@ -7898,7 +7595,7 @@ msgstr ""
 "пріоритетністю Типовим значенням пріоритетності є 0. Більші значення "
 "означають вищу пріоритетність."
 
-#: ../clients/common/settings-docs.h.in:144
+#: ../clients/common/settings-docs.h.in:141
 msgid ""
 "The number of times a connection should be tried when autoactivating before "
 "giving up. Zero means forever, -1 means the global default (4 times if not "
@@ -7913,37 +7610,26 @@ msgstr ""
 "виконуватиметься лише один раз. Зауважте, що по завершенню часу очікування "
 "NetworkManager знову спробує встановити з'єднання у автоматичному режимі."
 
-#: ../clients/common/settings-docs.h.in:145
-#| msgid ""
-#| "Whether or not slaves of this connection should be automatically brought "
-#| "up when NetworkManager activates this connection. This only has a real "
-#| "effect for master connections. The permitted values are: 0: leave slave "
-#| "connections untouched, 1: activate all the slave connections with this "
-#| "connection, -1: default. If -1 (default) is set, global connection."
-#| "autoconnect-slaves is read to determine the real value. If it is default "
-#| "as well, this fallbacks to 0."
+#: ../clients/common/settings-docs.h.in:142
 msgid ""
 "Whether or not slaves of this connection should be automatically brought up "
 "when NetworkManager activates this connection. This only has a real effect "
-"for master connections. The properties \"autoconnect\", \"autoconnect-"
-"priority\" and \"autoconnect-retries\" are unrelated to this setting. The "
-"permitted values are: 0: leave slave connections untouched, 1: activate all "
-"the slave connections with this connection, -1: default. If -1 (default) is "
-"set, global connection.autoconnect-slaves is read to determine the real "
-"value. If it is default as well, this fallbacks to 0."
+"for master connections. The permitted values are: 0: leave slave connections "
+"untouched, 1: activate all the slave connections with this connection, -1: "
+"default. If -1 (default) is set, global connection.autoconnect-slaves is "
+"read to determine the real value. If it is default as well, this fallbacks "
+"to 0."
 msgstr ""
 "Визначає, чи слід встановлювати з’єднання автоматично для підлеглих "
 "з’єднань, коли NetworkManager активує це з’єднання. По-справжньому впливає "
-"лише на основні з’єднання. Властивості \"autoconnect\", \"autoconnect-"
-"priority\" і \"autoconnect-retries\" не пов'язано із цим параметром."
-" Дозволені значення: 0: не впливати на підлеглі "
+"лише на основні з’єднання. Дозволені значення: 0: не впливати на підлеглі "
 "з’єднання, 1: активувати усі підлеглі з’єднання разом із цим з’єднанням, -1: "
 "типова поведінка. Якщо встановлено значення -1 (типова поведінка), для "
 "визначення справжнього значення виконується читання загального параметра "
 "connection.autoconnect-slaves. Якщо і для нього встановлено типове значення, "
 "використовується значення 0."
 
-#: ../clients/common/settings-docs.h.in:146
+#: ../clients/common/settings-docs.h.in:143
 msgid ""
 "If greater than zero, delay success of IP addressing until either the "
 "timeout is reached, or an IP gateway replies to a ping."
@@ -7952,7 +7638,7 @@ msgstr ""
 "встановлення адреси IP, доки або не буде вичерпано час очікування або шлюз "
 "IP відповість на надісланий йому сигнал."
 
-#: ../clients/common/settings-docs.h.in:147
+#: ../clients/common/settings-docs.h.in:144
 msgid ""
 "A human readable unique identifier for the connection, like \"Work Wi-Fi\" "
 "or \"T-Mobile 3G\"."
@@ -7960,7 +7646,7 @@ msgstr ""
 "Зручний для читання ідентифікатор для цього з’єднання, наприклад «Робочий Wi-"
 "Fi» або «T-Mobile 3G»."
 
-#: ../clients/common/settings-docs.h.in:148
+#: ../clients/common/settings-docs.h.in:145
 msgid ""
 "The name of the network interface this connection is bound to. If not set, "
 "then the connection can be attached to any interface of the appropriate type "
@@ -7983,15 +7669,15 @@ msgstr ""
 "з’єднання. Якщо змінюється назва інтерфейсу або перевпорядковується список "
 "з’єднань, з’єднання може бути застосовано до помилкового інтерфейсу."
 
-#: ../clients/common/settings-docs.h.in:149
+#: ../clients/common/settings-docs.h.in:146
 msgid "Whether LLDP is enabled for the connection."
 msgstr "Визначає, чи увімкнено LLDP для з’єднання."
 
-#: ../clients/common/settings-docs.h.in:150
+#: ../clients/common/settings-docs.h.in:147
 msgid "Interface name of the master device or UUID of the master connection."
 msgstr "Назва інтерфейсу основного пристрою або UUID основного з’єднання."
 
-#: ../clients/common/settings-docs.h.in:151
+#: ../clients/common/settings-docs.h.in:148
 msgid ""
 "Whether mDNS is enabled for the connection. The permitted values are: yes: "
 "register hostname and resolving for the connection, no: disable mDNS for the "
@@ -8000,15 +7686,15 @@ msgid ""
 "the change takes effect immediately. This feature requires a plugin which "
 "supports mDNS. One such plugin is dns-systemd-resolved."
 msgstr ""
-"Визначає, чи увімкнено mDNS для з'єднання. Дозволені значення: yes: "
-"зареєструвати назву вузла і визначення адрес для з'єднання, no: вимкнути "
-"mDNS для інтерфейсу, resolve: не реєструвати назви вузла, але дозволити "
-"визначення адрес за назвами вузлів у mDNS. Оновлення значення цієї "
-"властивості для поточного активованого з'єднання призведе до негайного його "
-"використання. Для роботи цієї можливості потрібен додаток із підтримкою "
-"mDNS. Одним з таких додатків є dns-systemd-resolved."
+"Визначає, чи увімкнено mDNS для з'єднання. Дозволені значення: yes:"
+" зареєструвати назву вузла і визначення адрес для з'єднання, no: вимкнути"
+" mDNS для інтерфейсу, resolve: не реєструвати назви вузла, але дозволити"
+" визначення адрес за назвами вузлів у mDNS. Оновлення значення цієї"
+" властивості для поточного активованого з'єднання призведе до негайного його"
+" використання. Для роботи цієї можливості потрібен додаток із підтримкою"
+" mDNS. Одним з таких додатків є dns-systemd-resolved."
 
-#: ../clients/common/settings-docs.h.in:152
+#: ../clients/common/settings-docs.h.in:149
 msgid ""
 "Whether the connection is metered. When updating this property on a "
 "currently activated connection, the change takes effect immediately."
@@ -8017,7 +7703,7 @@ msgstr ""
 "властивість для поточного активованого з’єднання, зміни набудуть чинності "
 "негайно."
 
-#: ../clients/common/settings-docs.h.in:154
+#: ../clients/common/settings-docs.h.in:151
 msgid ""
 "An array of strings defining what access a given user has to this "
 "connection.  If this is NULL or empty, all users are allowed to access this "
@@ -8047,7 +7733,7 @@ msgstr ""
 "використано у майбутньому. Усі значення, [тип], [ідентифікатор] і "
 "[зарезервоване значення], мають бути коректними рядками UTF-8."
 
-#: ../clients/common/settings-docs.h.in:155
+#: ../clients/common/settings-docs.h.in:152
 msgid ""
 "FALSE if the connection can be modified using the provided settings "
 "service's D-Bus interface with the right privileges, or TRUE if the "
@@ -8058,7 +7744,7 @@ msgstr ""
 "якщо параметри з’єднання є придатними лише для читання, і їх не можна "
 "змінювати."
 
-#: ../clients/common/settings-docs.h.in:156
+#: ../clients/common/settings-docs.h.in:153
 msgid ""
 "List of connection UUIDs that should be activated when the base connection "
 "itself is activated. Currently only VPN connections are supported."
@@ -8066,7 +7752,7 @@ msgstr ""
 "Список UUID з’єднань, які має бути активовано, якщо активовано базове "
 "з’єднання. У поточній версії передбачено підтримку лише з’єднань VPN."
 
-#: ../clients/common/settings-docs.h.in:157
+#: ../clients/common/settings-docs.h.in:154
 msgid ""
 "Setting name of the device type of this slave's master connection (eg, \"bond"
 "\"), or NULL if this connection is not a slave."
@@ -8074,14 +7760,13 @@ msgstr ""
 "Встановлює назву типу пристрою для основного з’єднання цього підлеглого "
 "з’єднання (наприклад «bond») або NULL, якщо це з’єднання не є підлеглим."
 
-#: ../clients/common/settings-docs.h.in:158
+#: ../clients/common/settings-docs.h.in:155
 #| msgid ""
 #| "Token to generate stable IDs for the connection. The stable-id is used "
 #| "for generating IPv6 stable private addresses with ipv6.addr-gen-"
 #| "mode=stable-privacy. It is also used to seed the generated cloned MAC "
 #| "address for ethernet.cloned-mac-address=stable and wifi.cloned-mac-"
-#| "address=stable. It is also used as DHCP client identifier with ipv4.dhcp-"
-#| "client-id=stable. Note that also the interface name of the activating "
+#| "address=stable. Note that also the interface name of the activating "
 #| "connection and a per-host secret key is included into the address "
 #| "generation so that the same stable-id on different hosts/devices yields "
 #| "different addresses. If the value is unset, an ID unique for the "
@@ -8098,72 +7783,59 @@ msgstr ""
 #| "only use the same effective id if their stable-id is also identical "
 #| "before performing dynamic substitutions."
 msgid ""
-"This represents the identity of the connection used for various purposes. It "
-"allows to configure multiple profiles to share the identity. Also, the "
-"stable-id can contain placeholders that are substituted dynamically and "
-"deterministically depending on the context. The stable-id is used for "
+"Token to generate stable IDs for the connection. The stable-id is used for "
 "generating IPv6 stable private addresses with ipv6.addr-gen-mode=stable-"
 "privacy. It is also used to seed the generated cloned MAC address for "
 "ethernet.cloned-mac-address=stable and wifi.cloned-mac-address=stable. It is "
-"also used as DHCP client identifier with ipv4.dhcp-client-id=stable and to "
-"derive the DHCP DUID with ipv6.dhcp-duid=stable-[llt,ll,uuid]. Note that "
-"depending on the context where it is used, other parameters are also seeded "
-"into the generation algorithm. For example, a per-host key is commonly also "
-"included, so that different systems end up generating different IDs. Or with "
-"ipv6.addr-gen-mode=stable-privacy, also the device's name is included, so "
-"that different interfaces yield different addresses. The '$' character is "
+"also used as DHCP client identifier with ipv4.dhcp-client-id=stable. Note "
+"that also the interface name of the activating connection and a per-host "
+"secret key is included into the address generation so that the same stable-"
+"id on different hosts/devices yields different addresses. If the value is "
+"unset, an ID unique for the connection is used. Specifying a stable-id "
+"allows multiple connections to generate the same addresses. Another use is "
+"to generate IDs at runtime via dynamic substitutions. The '$' character is "
 "treated special to perform dynamic substitutions at runtime. Currently "
-"supported are \"${CONNECTION}\", \"${DEVICE}\", \"${BOOT}\", \"${RANDOM}\". "
-"These effectively create unique IDs per-connection, per-device, per-boot, or "
-"every time. Note that \"${DEVICE}\" corresponds the the interface name of "
-"the device. Any unrecognized patterns following '$' are treated verbatim, "
-"however are reserved for future use. You are thus advised to avoid '$' or "
-"escape it as \"$$\". For example, set it to \"${CONNECTION}-${BOOT}-"
-"${DEVICE}\" to create a unique id for this connection that changes with "
-"every reboot and differs depending on the interface where the profile "
-"activates. If the value is unset, a global connection default is consulted. "
-"If the value is still unset, the default is similar to \"${CONNECTION}\" and "
-"uses a unique, fixed ID for the connection."
-msgstr ""
-"Відповідає ідентифікатору з'єднання, який використовується з різною метою."
-" Він надає змогу налаштовувати декілька профілів для одного ідентифікатора."
-" Крім того, стабільний ідентифікатор може містити символи-замінники, вміст"
-" яких визначається у динамічному режимі і певним чином залежить від"
-" контексту. Стабільні ідентифікатори використовуються для створення"
-" стабільних у IPv6 приватних адрес за допомогою"
-" ipv6.addr-gen-mode=stable-privacy. Вони також "
-"використовуються як початкове значення для створення клонованих MAC-адрес "
-"для ethernet.cloned-mac-address=stable і wifi.cloned-mac-address=stable. Він"
-" також використовується як ідентифікатор клієнта DHCP з"
-" ipv4.dhcp-client-id=stable і для визначення похідного DUID DHCP з"
-" ipv6.dhcp-duid=stable-[llt,ll,uuid]. Зауважте, що, залежно від контексту, де"
-" його використано, до алгоритму визначення ідентифікатора може бути включено"
-" інші параметри. Наприклад, часто використовується окремий ключ вузла, щоб у"
-" різних систем були різні ідентифікатори. Якщо вказано"
-" ipv6.addr-gen-mode=stable-privacy, до обчислення буде включено назву"
-" пристрою, щоб різні інтерфейси мали різні адреси. Символ «$» є спеціальним "
-"символом для визначення динамічного підставляння під час роботи. У поточній "
-"версії передбачено підтримку ідентифікаторів «${CONNECTION}», «${DEVICE}»,"
-" «${BOOT}», "
-"«${RANDOM}». Використання цих ідентифікаторів призводить, відповідно, до "
-"створення унікальних ідентифікаторів для кожного з’єднання, для кожного"
-" пристрою, для кожного "
-"завантаження системи і для будь-яких умов. Зауважте, що запис «${DEVICE}»"
-" відповідає назві інтерфейсу пристрою. Усі невизначені рядки після «$» "
+"supported are \"${CONNECTION}\", \"${BOOT}\", \"${RANDOM}\". These "
+"effectively create unique IDs per-connection, per-boot, or every time. Any "
+"unrecognized patterns following '$' are treated verbatim, however are "
+"reserved for future use. You are thus advised to avoid '$' or escape it as "
+"\"$$\". For example, set it to \"${CONNECTION}/${BOOT}\" to create a unique "
+"id for this connection that changes with every reboot. Note that two "
+"connections only use the same effective id if their stable-id is also "
+"identical before performing dynamic substitutions."
+msgstr ""
+"Ключ для створення стабільних ідентифікаторів для з’єднання. Стабільні "
+"ідентифікатори використовуються для створення стабільних у IPv6 приватних "
+"адрес за допомогою ipv6.addr-gen-mode=stable-privacy. Вони також"
+" використовуються як "
+"початкове значення для створення клонованих MAC-адрес для ethernet.cloned-"
+"mac-address=stable і wifi.cloned-mac-address=stable. Також використовуються"
+" як ідентифікатор клієнта DHCP за допомогою рядка ipv4.dhcp-client-id=stable."
+" Зауважте, що при "
+"створенні адреси також беруться до уваги назва інтерфейсу з’єднання "
+"активації та закриті ключі окремих вузлів. Отже, одне і те саме значення "
+"стабільного ідентифікатора (stable-id) на різних вузлах або пристроях дає "
+"різні адреси. Якщо значення властивості не встановлено, буде використано "
+"унікальний ідентифікатор з’єднання. Визначення стабільного ідентифікатора "
+"надає змогу створення однієї адреси для декількох з’єднань. Іншим варіантом "
+"використання є створення ідентифікаторів під час роботи за допомогою "
+"динамічних підставлянь. Символ «$» є спеціальним символом для визначення "
+"динамічного підставляння під час роботи. У поточній версії передбачено "
+"підтримку ідентифікаторів «${CONNECTION}», «${BOOT}», «${RANDOM}». "
+"Використання цих ідентифікаторів призводить, відповідно, до створення "
+"унікальних ідентифікаторів для кожного з’єднання, для кожного завантаження "
+"системи і для будь-яких умов. Усі невизначені рядки після «$» "
 "сприйматимуться програмою буквально. Втім, можливо, у майбутніх версіях буде "
 "додано ще якісь ідентифікатори. Отже, не варто використовувати у ваших "
 "нетипових ідентифікаторах символ «$» або слід додати екранування до цього "
-"символу: «$$». Приклад: встановіть значення «${CONNECTION}-${BOOT}-"
-"${DEVICE}» для "
+"символу: «$$». Приклад: встановіть значення «${CONNECTION}/${BOOT}» для "
 "створення унікального ідентифікатора для цього з’єднання, який "
-"змінюватиметься після кожного перезавантаження системи і залежатиме від"
-" інтерфейсу, на якому активовано профіль. Якщо значення не встановлено, буде"
-" використано типові параметри загального з'єднання. Якщо значення не вдасться"
-" визначити і після врахування цих параметрів, буде використано алгоритм"
-" визначення значення, подібний до алгоритму для «${CONNECTION}», і"
-" використано унікальний фіксований ідентифікатор для з'єднання."
+"змінюватиметься після кожного перезавантаження системи. Зауважте, що два "
+"з’єднання можуть використовувати один ефективний ідентифікатор, лише якщо "
+"їхні стабільні ідентифікатори до виконання динамічного підставляння бути "
+"однаковими."
 
-#: ../clients/common/settings-docs.h.in:159
+#: ../clients/common/settings-docs.h.in:156
 msgid ""
 "The time, in seconds since the Unix Epoch, that the connection was last "
 "_successfully_ fully activated. NetworkManager updates the connection "
@@ -8177,7 +7849,7 @@ msgstr ""
 "активного з’єднання найсвіжішої часової позначки. Властивість можна лише "
 "читати (зміни до цієї властивості не зберігатимуться)."
 
-#: ../clients/common/settings-docs.h.in:160
+#: ../clients/common/settings-docs.h.in:157
 msgid ""
 "Base type of the connection. For hardware-dependent connections, should "
 "contain the setting name of the hardware-type specific setting (ie, \"802-3-"
@@ -8191,7 +7863,7 @@ msgstr ""
 "з’єднань VPN та інших має містити назву параметра відповідного типу "
 "параметрів (тобто «vpn» або «bridge» тощо)."
 
-#: ../clients/common/settings-docs.h.in:161
+#: ../clients/common/settings-docs.h.in:158
 msgid ""
 "A universally unique identifier for the connection, for example generated "
 "with libuuid.  It should be assigned when the connection is created, and "
@@ -8213,7 +7885,7 @@ msgstr ""
 "«2815492f-7e56-435e-b2e9-246bd7cdc664» (тобто у форматі запису, який містить "
 "лише шістнадцяткові цифри і символи «-»)."
 
-#: ../clients/common/settings-docs.h.in:162
+#: ../clients/common/settings-docs.h.in:159
 msgid ""
 "The trust level of a the connection.  Free form case-insensitive string (for "
 "example \"Home\", \"Work\", \"Public\").  NULL or unspecified zone means the "
@@ -8227,7 +7899,7 @@ msgstr ""
 "брандмауером. Якщо ця властивість оновлюється для поточного активованого "
 "з’єднання, зміни набудуть чинності негайно."
 
-#: ../clients/common/settings-docs.h.in:163
+#: ../clients/common/settings-docs.h.in:160
 msgid ""
 "Specifies the NMSettingDcbFlags for the DCB FCoE application.  Flags may be "
 "any combination of NM_SETTING_DCB_FLAG_ENABLE (0x1), "
@@ -8237,11 +7909,11 @@ msgstr ""
 "будь-яка комбінація NM_SETTING_DCB_FLAG_ENABLE (0x1), "
 "NM_SETTING_DCB_FLAG_ADVERTISE (0x2) і NM_SETTING_DCB_FLAG_WILLING (0x4)."
 
-#: ../clients/common/settings-docs.h.in:164
+#: ../clients/common/settings-docs.h.in:161
 msgid "The FCoE controller mode; either \"fabric\" (default) or \"vn2vn\"."
 msgstr "Режим контролера FCoE; або «fabric» (типовий), або «vn2vn»."
 
-#: ../clients/common/settings-docs.h.in:165
+#: ../clients/common/settings-docs.h.in:162
 msgid ""
 "The highest User Priority (0 - 7) which FCoE frames should use, or -1 for "
 "default priority.  Only used when the \"app-fcoe-flags\" property includes "
@@ -8252,7 +7924,7 @@ msgstr ""
 "лише якщо до властивості «app-fcoe-flags» включає прапорець "
 "NM_SETTING_DCB_FLAG_ENABLE (0x1)."
 
-#: ../clients/common/settings-docs.h.in:166
+#: ../clients/common/settings-docs.h.in:163
 msgid ""
 "Specifies the NMSettingDcbFlags for the DCB FIP application.  Flags may be "
 "any combination of NM_SETTING_DCB_FLAG_ENABLE (0x1), "
@@ -8262,7 +7934,7 @@ msgstr ""
 "будь-якою комбінацією NM_SETTING_DCB_FLAG_ENABLE (0x1), "
 "NM_SETTING_DCB_FLAG_ADVERTISE (0x2) і NM_SETTING_DCB_FLAG_WILLING (0x4)."
 
-#: ../clients/common/settings-docs.h.in:167
+#: ../clients/common/settings-docs.h.in:164
 msgid ""
 "The highest User Priority (0 - 7) which FIP frames should use, or -1 for "
 "default priority.  Only used when the \"app-fip-flags\" property includes "
@@ -8273,7 +7945,7 @@ msgstr ""
 "лише якщо до властивості «app-fip-flags» включає прапорець "
 "NM_SETTING_DCB_FLAG_ENABLE (0x1)."
 
-#: ../clients/common/settings-docs.h.in:168
+#: ../clients/common/settings-docs.h.in:165
 msgid ""
 "Specifies the NMSettingDcbFlags for the DCB iSCSI application.  Flags may be "
 "any combination of NM_SETTING_DCB_FLAG_ENABLE (0x1), "
@@ -8283,7 +7955,7 @@ msgstr ""
 "будь-якою комбінацією NM_SETTING_DCB_FLAG_ENABLE (0x1), "
 "NM_SETTING_DCB_FLAG_ADVERTISE (0x2) і NM_SETTING_DCB_FLAG_WILLING (0x4)."
 
-#: ../clients/common/settings-docs.h.in:169
+#: ../clients/common/settings-docs.h.in:166
 msgid ""
 "The highest User Priority (0 - 7) which iSCSI frames should use, or -1 for "
 "default priority. Only used when the \"app-iscsi-flags\" property includes "
@@ -8294,7 +7966,7 @@ msgstr ""
 "лише якщо до властивості «app-iscsi-flags» включає прапорець "
 "NM_SETTING_DCB_FLAG_ENABLE (0x1)."
 
-#: ../clients/common/settings-docs.h.in:171
+#: ../clients/common/settings-docs.h.in:168
 msgid ""
 "An array of 8 uint values, where the array index corresponds to the User "
 "Priority (0 - 7) and the value indicates the percentage of bandwidth of the "
@@ -8308,7 +7980,7 @@ msgstr ""
 "може використовувати. Сума усіх значень у межах однієї групи має складати "
 "100 відсотків."
 
-#: ../clients/common/settings-docs.h.in:172
+#: ../clients/common/settings-docs.h.in:169
 msgid ""
 "An array of 8 boolean values, where the array index corresponds to the User "
 "Priority (0 - 7) and the value indicates whether or not the corresponding "
@@ -8318,7 +7990,7 @@ msgstr ""
 "користувача (від 0 до 7), а значення відповідає за те, чи має відповідна "
 "пріоритетність передавати паузу пріоритетності."
 
-#: ../clients/common/settings-docs.h.in:173
+#: ../clients/common/settings-docs.h.in:170
 msgid ""
 "Specifies the NMSettingDcbFlags for DCB Priority Flow Control (PFC). Flags "
 "may be any combination of NM_SETTING_DCB_FLAG_ENABLE (0x1), "
@@ -8328,7 +8000,7 @@ msgstr ""
 "Прапорці можуть бути будь-якою комбінацією NM_SETTING_DCB_FLAG_ENABLE (0x1), "
 "NM_SETTING_DCB_FLAG_ADVERTISE (0x2) і NM_SETTING_DCB_FLAG_WILLING (0x4)."
 
-#: ../clients/common/settings-docs.h.in:174
+#: ../clients/common/settings-docs.h.in:171
 msgid ""
 "An array of 8 uint values, where the array index corresponds to the Priority "
 "Group ID (0 - 7) and the value indicates the percentage of link bandwidth "
@@ -8340,7 +8012,7 @@ msgstr ""
 "каналу з’єднання, яку пов’язано із відповідною групою. Допустимими є "
 "значення від 0 до 100. Сума усіх значень має складати 100 відсотків."
 
-#: ../clients/common/settings-docs.h.in:175
+#: ../clients/common/settings-docs.h.in:172
 msgid ""
 "Specifies the NMSettingDcbFlags for DCB Priority Groups.  Flags may be any "
 "combination of NM_SETTING_DCB_FLAG_ENABLE (0x1), "
@@ -8350,7 +8022,7 @@ msgstr ""
 "будь-якою комбінацією NM_SETTING_DCB_FLAG_ENABLE (0x1), "
 "NM_SETTING_DCB_FLAG_ADVERTISE (0x2) і NM_SETTING_DCB_FLAG_WILLING (0x4)"
 
-#: ../clients/common/settings-docs.h.in:176
+#: ../clients/common/settings-docs.h.in:173
 msgid ""
 "An array of 8 uint values, where the array index corresponds to the User "
 "Priority (0 - 7) and the value indicates the Priority Group ID.  Allowed "
@@ -8361,7 +8033,7 @@ msgstr ""
 "пріоритетності. Дозволеними значенням ідентифікатора групи пріоритетності є "
 "значення від 0 до 7 або 15 для групи без обмежень."
 
-#: ../clients/common/settings-docs.h.in:177
+#: ../clients/common/settings-docs.h.in:174
 msgid ""
 "An array of 8 boolean values, where the array index corresponds to the User "
 "Priority (0 - 7) and the value indicates whether or not the priority may use "
@@ -8372,7 +8044,7 @@ msgstr ""
 "пріоритетність використовувати усю ширину каналу, пов’язаного із відповідною "
 "групою."
 
-#: ../clients/common/settings-docs.h.in:178
+#: ../clients/common/settings-docs.h.in:175
 msgid ""
 "An array of 8 uint values, where the array index corresponds to the User "
 "Priority (0 - 7) and the value indicates the traffic class (0 - 7) to which "
@@ -8382,7 +8054,7 @@ msgstr ""
 "користувача (0 - 7), а значення відповідає за клас передавання даних (від 0 "
 "до 7), із яким пов’язано пріоритетність."
 
-#: ../clients/common/settings-docs.h.in:181
+#: ../clients/common/settings-docs.h.in:178
 msgid ""
 "The GPRS Access Point Name specifying the APN used when establishing a data "
 "session with the GSM-based network.  The APN often determines how the user "
@@ -8400,7 +8072,7 @@ msgstr ""
 "користувача важливо використовувати належну APN. Назва APN може складатися "
 "лише із символів a-z, 0-9, . та - за стандартом GSM 03.60, розділ 14.9."
 
-#: ../clients/common/settings-docs.h.in:182
+#: ../clients/common/settings-docs.h.in:179
 msgid ""
 "The device unique identifier (as given by the WWAN management service) which "
 "this connection applies to.  If given, the connection will only apply to the "
@@ -8410,7 +8082,7 @@ msgstr ""
 "WWAN), до якого застосовується це з’єднання. Якщо вказано, з’єднання "
 "застосовуватиметься лише для вказаного пристрою."
 
-#: ../clients/common/settings-docs.h.in:183
+#: ../clients/common/settings-docs.h.in:180
 msgid ""
 "When TRUE, only connections to the home network will be allowed. Connections "
 "to roaming networks will not be made."
@@ -8418,7 +8090,7 @@ msgstr ""
 "Якщо має значення TRUE, буде дозволено лише з’єднання із домашньою мережею. "
 "З’єднання із мережами роумінґу не виконуватимуться."
 
-#: ../clients/common/settings-docs.h.in:186
+#: ../clients/common/settings-docs.h.in:183
 msgid ""
 "The Network ID (GSM LAI format, ie MCC-MNC) to force specific network "
 "registration.  If the Network ID is specified, NetworkManager will attempt "
@@ -8433,7 +8105,7 @@ msgstr ""
 "роумінґовою мережею, якщо керування роумінґом пристрою у інший спосіб "
 "неможливе."
 
-#: ../clients/common/settings-docs.h.in:187
+#: ../clients/common/settings-docs.h.in:184
 msgid ""
 "Number to dial when establishing a PPP data session with the GSM-based "
 "mobile broadband network.  Many modems do not require PPP for connections to "
@@ -8446,7 +8118,7 @@ msgstr ""
 "не вказувати ніякого значення. Порожнє значення надасть змогу NetworkManager "
 "вибрати відповідні значення параметрів автоматично."
 
-#: ../clients/common/settings-docs.h.in:190
+#: ../clients/common/settings-docs.h.in:187
 msgid ""
 "If the SIM is locked with a PIN it must be unlocked before any other "
 "operations are requested.  Specify the PIN here to allow operation of the "
@@ -8456,7 +8128,7 @@ msgstr ""
 "виконувати будь-які інші дії. Тут слід вказати PIN-код, який відкриває "
 "доступ до дій із пристроєм."
 
-#: ../clients/common/settings-docs.h.in:192
+#: ../clients/common/settings-docs.h.in:189
 msgid ""
 "The SIM card unique identifier (as given by the WWAN management service) "
 "which this connection applies to.  If given, the connection will apply to "
@@ -8468,7 +8140,7 @@ msgstr ""
 "застосовуватиметься до будь-якого пристрою, який також дозволено «device-"
 "id», де міститься значення відповідності SIM-картки вказаному ідентифікатору."
 
-#: ../clients/common/settings-docs.h.in:193
+#: ../clients/common/settings-docs.h.in:190
 msgid ""
 "A MCC/MNC string like \"310260\" or \"21601\" identifying the specific "
 "mobile network operator which this connection applies to.  If given, the "
@@ -8481,7 +8153,7 @@ msgstr ""
 "властивостями «device-id» і «sim-id» і який містить SIM-картку, яку випущено "
 "вказаним оператором."
 
-#: ../clients/common/settings-docs.h.in:195
+#: ../clients/common/settings-docs.h.in:192
 msgid ""
 "If specified, this connection will only apply to the IPoIB device whose "
 "permanent MAC address matches. This property does not change the MAC address "
@@ -8491,7 +8163,7 @@ msgstr ""
 "відповідною сталою адресою MAC. Ця властивість не змінює MAC-адреси пристрою "
 "(таку зміну називають підміною MAC)."
 
-#: ../clients/common/settings-docs.h.in:198
+#: ../clients/common/settings-docs.h.in:195
 msgid ""
 "The InfiniBand P_Key to use for this device. A value of -1 means to use the "
 "default P_Key (aka \"the P_Key at index 0\").  Otherwise it is a 16-bit "
@@ -8502,7 +8174,7 @@ msgstr ""
 "Інші значення має бути вказано у форматі 16-бітового цілого числа без знаку, "
 "старший біт якого дорівнює одиниці, якщо P_Key є ключем «повного членства»."
 
-#: ../clients/common/settings-docs.h.in:199
+#: ../clients/common/settings-docs.h.in:196
 msgid ""
 "The interface name of the parent device of this device. Normally NULL, but "
 "if the \"p_key\" property is set, then you must specify the base device by "
@@ -8513,14 +8185,14 @@ msgstr ""
 "вказати базовий пристрій або встановленням значення для цієї властивості, "
 "або встановленням значення для властивості «mac-address»."
 
-#: ../clients/common/settings-docs.h.in:200
+#: ../clients/common/settings-docs.h.in:197
 msgid ""
 "The IP-over-InfiniBand transport mode. Either \"datagram\" or \"connected\"."
 msgstr ""
 "Режим передавання IP-over-InfiniBand. Можливі значення: «datagram» або "
 "«connected»."
 
-#: ../clients/common/settings-docs.h.in:201
+#: ../clients/common/settings-docs.h.in:198
 msgid ""
 "How many additional levels of encapsulation are permitted to be prepended to "
 "packets. This property applies only to IPv6 tunnels."
@@ -8528,7 +8200,7 @@ msgstr ""
 "Кількість додаткових рівнів вкладеності, які дозволено дописувати до "
 "пакетів. Цю властивість стосується лише тунелів IPv6."
 
-#: ../clients/common/settings-docs.h.in:202
+#: ../clients/common/settings-docs.h.in:199
 msgid ""
 "Tunnel flags. Currently the following values are supported: "
 "NM_IP_TUNNEL_FLAG_IP6_IGN_ENCAP_LIMIT (0x1), "
@@ -8543,17 +8215,17 @@ msgstr ""
 "NM_IP_TUNNEL_FLAG_IP6_USE_ORIG_TCLASS (0x2), "
 "NM_IP_TUNNEL_FLAG_IP6_USE_ORIG_FLOWLABEL (0x4), "
 "NM_IP_TUNNEL_FLAG_IP6_MIP6_DEV (0x8), NM_IP_TUNNEL_FLAG_IP6_RCV_DSCP_COPY "
-"(0x10), NM_IP_TUNNEL_FLAG_IP6_USE_ORIG_FWMARK (0x20). Ці значення є "
-"коректними лише для тунелів IPv6."
+"(0x10), NM_IP_TUNNEL_FLAG_IP6_USE_ORIG_FWMARK (0x20). Ці значення є"
+" коректними лише для тунелів IPv6."
 
-#: ../clients/common/settings-docs.h.in:203
+#: ../clients/common/settings-docs.h.in:200
 msgid ""
 "The flow label to assign to tunnel packets. This property applies only to "
 "IPv6 tunnels."
 msgstr ""
 "Мітка потоку для пакетів тунелю. Ця властивість стосується лише тунелів IPv6."
 
-#: ../clients/common/settings-docs.h.in:204
+#: ../clients/common/settings-docs.h.in:201
 msgid ""
 "The key used for tunnel input packets; the property is valid only for "
 "certain tunnel modes (GRE, IP6GRE). If empty, no key is used."
@@ -8562,7 +8234,7 @@ msgstr ""
 "лише для певних режимів роботи тунелю (GRE, IP6GRE). Якщо порожній, ключ не "
 "використовується."
 
-#: ../clients/common/settings-docs.h.in:205
+#: ../clients/common/settings-docs.h.in:202
 msgid ""
 "The local endpoint of the tunnel; the value can be empty, otherwise it must "
 "contain an IPv4 or IPv6 address."
@@ -8570,7 +8242,7 @@ msgstr ""
 "Локальна кінцева точка тунелю; значення може бути порожнім або має містити "
 "адресу IPv4 або IPv6."
 
-#: ../clients/common/settings-docs.h.in:206
+#: ../clients/common/settings-docs.h.in:203
 msgid ""
 "The tunneling mode, for example NM_IP_TUNNEL_MODE_IPIP (1) or "
 "NM_IP_TUNNEL_MODE_GRE (2)."
@@ -8578,7 +8250,7 @@ msgstr ""
 "Режим тунелювання, наприклад NM_IP_TUNNEL_MODE_IPIP (1) або "
 "NM_IP_TUNNEL_MODE_GRE (2)."
 
-#: ../clients/common/settings-docs.h.in:207
+#: ../clients/common/settings-docs.h.in:204
 msgid ""
 "If non-zero, only transmit packets of the specified size or smaller, "
 "breaking larger packets up into multiple fragments."
@@ -8586,7 +8258,7 @@ msgstr ""
 "Якщо має ненульове значення, передавати пакети лише вказаного або меншого "
 "розміру, розбиваючи великі пакети на декілька фрагментів."
 
-#: ../clients/common/settings-docs.h.in:209
+#: ../clients/common/settings-docs.h.in:206
 msgid ""
 "The key used for tunnel output packets; the property is valid only for "
 "certain tunnel modes (GRE, IP6GRE). If empty, no key is used."
@@ -8595,7 +8267,7 @@ msgstr ""
 "чинною лише для певних режимів роботи тунелю (GRE, IP6GRE). Якщо порожній, "
 "ключ не використовується."
 
-#: ../clients/common/settings-docs.h.in:210
+#: ../clients/common/settings-docs.h.in:207
 msgid ""
 "If given, specifies the parent interface name or parent connection UUID the "
 "new device will be bound to so that tunneled packets will only be routed via "
@@ -8605,18 +8277,18 @@ msgstr ""
 "з’єднання, до якого буде прив’язано новий пристрій так, що тунельовані "
 "пакети маршрутизуватимуться лише крізь цей інтерфейс."
 
-#: ../clients/common/settings-docs.h.in:211
+#: ../clients/common/settings-docs.h.in:208
 msgid "Whether to enable Path MTU Discovery on this tunnel."
 msgstr "Визначає, чи слід вмикати Path MTU Discovery для цього тунелю."
 
-#: ../clients/common/settings-docs.h.in:212
+#: ../clients/common/settings-docs.h.in:209
 msgid ""
 "The remote endpoint of the tunnel; the value must contain an IPv4 or IPv6 "
 "address."
 msgstr ""
 "Віддалена кінцева точка тунелю; значення має містити адресу IPv4 або IPv6."
 
-#: ../clients/common/settings-docs.h.in:213
+#: ../clients/common/settings-docs.h.in:210
 msgid ""
 "The type of service (IPv4) or traffic class (IPv6) field to be set on "
 "tunneled packets."
@@ -8624,7 +8296,7 @@ msgstr ""
 "Поле типу служби (IPv4) або класу передавання даних (IPv6), яке слід "
 "встановити для тунельованих пакетів."
 
-#: ../clients/common/settings-docs.h.in:214
+#: ../clients/common/settings-docs.h.in:211
 msgid ""
 "The TTL to assign to tunneled packets. 0 is a special value meaning that "
 "packets inherit the TTL value."
@@ -8632,37 +8304,29 @@ msgstr ""
 "Значення TTL, яке слід призначити для тунельованих пакетів. 0 — спеціальне "
 "значення, яке означає, що пакети успадковують значення TTL."
 
-#: ../clients/common/settings-docs.h.in:215
-#: ../clients/common/settings-docs.h.in:237
+#: ../clients/common/settings-docs.h.in:212
+#: ../clients/common/settings-docs.h.in:234
 msgid "Array of IP addresses."
 msgstr "Масив IP-адрес."
 
-#: ../clients/common/settings-docs.h.in:216
-#: ../clients/common/settings-docs.h.in:238
-#| msgid ""
-#| "Timeout in milliseconds used to check for the presence of duplicate IP "
-#| "addresses on the network.  If an address conflict is detected, the "
-#| "activation will fail.  A zero value means that no duplicate address "
-#| "detection is performed, -1 means the default value (either configuration "
-#| "ipvx.dad-timeout override or 3 seconds).  A value greater than zero is a "
-#| "timeout in milliseconds."
+#: ../clients/common/settings-docs.h.in:213
+#: ../clients/common/settings-docs.h.in:235
 msgid ""
 "Timeout in milliseconds used to check for the presence of duplicate IP "
 "addresses on the network.  If an address conflict is detected, the "
 "activation will fail.  A zero value means that no duplicate address "
 "detection is performed, -1 means the default value (either configuration "
-"ipvx.dad-timeout override or zero).  A value greater than zero is a timeout "
-"in milliseconds. The property is currently implemented only for IPv4."
+"ipvx.dad-timeout override or 3 seconds).  A value greater than zero is a "
+"timeout in milliseconds."
 msgstr ""
 "Час очікування у мілісекундах, який використовуватиметься для перевірки "
 "наявності дублікатів IP-адрес у мережі. Якщо буде виявлено конфлікт адрес, "
 "спроба активації вважатиметься невдалою. Нульове значення означає, що спроба "
 "виявити дублювання адрес не виконуватиметься, -1 означає типове значення "
-"(або перевизначене за допомогою ipvx.dad-timeout, або нуль). Значення, "
-"яке перевищує нуль, вважатиметься часом очікування у мілісекундах. Цю"
-" властивість у поточній версії реалізовано лише для IPv4."
+"(або перевизначене за допомогою ipvx.dad-timeout, або 3 секунди). Значення, "
+"яке перевищує нуль, вважатиметься часом очікування у мілісекундах."
 
-#: ../clients/common/settings-docs.h.in:217
+#: ../clients/common/settings-docs.h.in:214
 #| msgid ""
 #| "A string sent to the DHCP server to identify the local machine which the "
 #| "DHCP server may use to customize the DHCP lease and options. When the "
@@ -8672,14 +8336,7 @@ msgstr ""
 #| "address (e.g. '01:xx:xx:xx:xx:xx:xx' where 1 is the Ethernet ARP type and "
 #| "the rest is a MAC address). If the property is not a hex string it is "
 #| "considered as a non-hardware-address client ID and the 'type' field is "
-#| "set to 0. The special values \"mac\" and \"perm-mac\" are supported, "
-#| "which use the current or permanent MAC address of the device to generate "
-#| "a client identifier with type ethernet type (01). Currently, these "
-#| "options only work for ethernet type of links. The special value \"stable"
-#| "\" is supported to generate a type 0 client identifier based on the "
-#| "stable-id (see connection.stable-id). If unset, a globally configured "
-#| "default is used. If still unset, the client-id from the last lease is "
-#| "reused."
+#| "set to 0."
 msgid ""
 "A string sent to the DHCP server to identify the local machine which the "
 "DHCP server may use to customize the DHCP lease and options. When the "
@@ -8693,9 +8350,9 @@ msgid ""
 "permanent MAC address of the device to generate a client identifier with "
 "type ethernet (01). Currently, these options only work for ethernet "
 "type of links. The special value \"stable\" is supported to generate a type "
-"0 client identifier based on the stable-id (see connection.stable-id) and a "
-"per-host key. If unset, a globally configured default is used. If still "
-"unset, the client-id from the last lease is reused."
+"0 client identifier based on the stable-id (see connection.stable-id). If "
+"unset, a globally configured default is used. If still unset, the client-id "
+"from the last lease is reused."
 msgstr ""
 "Рядок, надісланий до сервера DHCP для ідентифікації локального комп'ютера, "
 "який сервер DHCP може використовувати для налаштовування надання послуг і "
@@ -8705,19 +8362,18 @@ msgstr ""
 "можуть бути апаратною адресою (наприклад, «01:xx:xx:xx:xx:xx:xx», де 1 є "
 "типом ARP Ethernet, а решта є MAC-адресою). Якщо властивість не є "
 "шістнадцятковим рядком, він вважається ідентифікатором клієнта без апаратної "
-"адреси, а для поля «type» встановлюється значення 0. Передбачено підтримку "
-"особливих значень «mac» та «perm-mac», використання яких призводить до "
-"використання поточної або сталої адреси MAC пристрою для створення "
-"ідентифікатора клієнта із типом ethernet (01). У поточній версії ці "
-"параметри працюють лише для зв'язків типу ethernet. Передбачено підтримку "
-"особливого значення «stable» для створення типу 0 ідентифікатора клієнта на "
-"основі стабільного ідентифікатора (див. connection.stable-id) і окремого"
-" ключа вузла. Якщо не "
-"встановлено, використовується загальне типове значення. Якщо не встановлено "
-"загального типового значення, використовується ідентифікатор клієнта із "
-"останнього сеансу надання послуг."
+"адреси, а для поля «type» встановлюється значення 0. Передбачено підтримку"
+" особливих значень «mac» та «perm-mac», використання яких призводить до"
+" використання поточної або сталої адреси MAC пристрою для створення"
+" ідентифікатора клієнта із типом ethernet (01). У поточній версії ці"
+" параметри працюють лише для зв'язків типу ethernet. Передбачено підтримку"
+" особливого значення «stable» для створення типу 0 ідентифікатора клієнта на"
+" основі стабільного ідентифікатора (див. connection.stable-id). Якщо не"
+" встановлено, використовується загальне типове значення. Якщо не встановлено"
+" загального типового значення, використовується ідентифікатор клієнта із"
+" останнього сеансу надання послуг."
 
-#: ../clients/common/settings-docs.h.in:218
+#: ../clients/common/settings-docs.h.in:215
 msgid ""
 "If the \"dhcp-send-hostname\" property is TRUE, then the specified FQDN will "
 "be sent to the DHCP server when acquiring a lease. This property and \"dhcp-"
@@ -8727,8 +8383,8 @@ msgstr ""
 "адреси до сервера DHCP буде надіслано вказану FDQN. Цю властивість не можна "
 "використовувати разом із властивістю «dhcp-hostname»."
 
-#: ../clients/common/settings-docs.h.in:219
-#: ../clients/common/settings-docs.h.in:240
+#: ../clients/common/settings-docs.h.in:216
+#: ../clients/common/settings-docs.h.in:236
 msgid ""
 "If the \"dhcp-send-hostname\" property is TRUE, then the specified name will "
 "be sent to the DHCP server when acquiring a lease. This property and \"dhcp-"
@@ -8738,8 +8394,8 @@ msgstr ""
 "адреси до сервера DHCP буде надіслано вказану назву. Цю властивість не можна "
 "використовувати разом із властивістю «dhcp-fqdn»."
 
-#: ../clients/common/settings-docs.h.in:220
-#: ../clients/common/settings-docs.h.in:241
+#: ../clients/common/settings-docs.h.in:217
+#: ../clients/common/settings-docs.h.in:237
 msgid ""
 "If TRUE, a hostname is sent to the DHCP server when acquiring a lease. Some "
 "DHCP servers use this hostname to update DNS databases, essentially "
@@ -8754,18 +8410,18 @@ msgstr ""
 "властивості вказано значення TRUE, буде надіслано поточну стану назву вузла "
 "комп’ютера."
 
-#: ../clients/common/settings-docs.h.in:221
-#: ../clients/common/settings-docs.h.in:242
+#: ../clients/common/settings-docs.h.in:218
+#: ../clients/common/settings-docs.h.in:238
 msgid "A timeout for a DHCP transaction in seconds."
 msgstr "Час очікування на завершення дії DHCP у секундах."
 
-#: ../clients/common/settings-docs.h.in:222
-#: ../clients/common/settings-docs.h.in:243
+#: ../clients/common/settings-docs.h.in:219
+#: ../clients/common/settings-docs.h.in:239
 msgid "Array of IP addresses of DNS servers."
 msgstr "Масив IP-адрес серверів DNS."
 
-#: ../clients/common/settings-docs.h.in:223
-#: ../clients/common/settings-docs.h.in:244
+#: ../clients/common/settings-docs.h.in:220
+#: ../clients/common/settings-docs.h.in:240
 msgid ""
 "Array of DNS options as described in man 5 resolv.conf. NULL means that the "
 "options are unset and left at the default. In this case NetworkManager will "
@@ -8776,72 +8432,56 @@ msgstr ""
 "такому випадку NetworkManager використовуватиме типові параметри. Якщо ж "
 "буде вказано порожній список властивостей, поведінка програми буде інакшою."
 
-#: ../clients/common/settings-docs.h.in:224
-#: ../clients/common/settings-docs.h.in:245
+#: ../clients/common/settings-docs.h.in:221
+#: ../clients/common/settings-docs.h.in:241
 msgid ""
-"DNS servers priority. The relative priority for DNS servers specified by "
-"this setting.  A lower value is better (higher priority).  Zero selects the "
-"default value, which is 50 for VPNs and 100 for other connections. Note that "
-"the priority is to order DNS settings for multiple active connections.  It "
-"does not disambiguate multiple DNS servers within the same connection "
-"profile. When using dns=default, servers with higher priority will be on top "
-"of resolv.conf.  To prioritize a given server over another one within the "
-"same connection, just specify them in the desired order.  When multiple "
+"Intra-connection DNS priority. The relative priority to be used when "
+"determining the order of DNS servers in resolv.conf.  A lower value means "
+"that servers will be on top of the file.  Zero selects the default value, "
+"which is 50 for VPNs and 100 for other connections.  Note that the priority "
+"is to order DNS settings for multiple active connections. It does not "
+"disambiguate multiple DNS servers within the same connection profile. For "
+"that, just specify the DNS servers in the desired order. When multiple "
 "devices have configurations with the same priority, the one with an active "
-"default route will be preferred.  Negative values have the special effect of "
-"excluding other configurations with a greater priority value; so in presence "
-"of at least a negative priority, only DNS servers from connections with the "
-"lowest priority value will be used. When using a DNS resolver that supports "
-"split-DNS as dns=dnsmasq or dns=systemd-resolved, each connection is used to "
-"query domains in its search list.  Queries for domains not present in any "
-"search list are routed through connections having the '~.' special wildcard "
-"domain, which is added automatically to connections with the default route "
-"(or can be added manually).  When multiple connections specify the same "
-"domain, the one with the highest priority (lowest numerical value) wins.  If "
-"a connection specifies a domain which is subdomain of another domain with a "
-"negative DNS priority value, the subdomain is ignored."
-msgstr ""
-"Пріоритетність серверів DNS. Цим параметром визначається відносна"
-" пріоритетність серверів DNS. Менше значення означає вищу пріоритетність."
-" Нульове значення відповідає типовому варіанту, тобто 50 для VPN і 100 для"
-" інших з’єднань. Зауважте, що пріоритетність призначено для упорядковування"
-" параметрів DNS для ситуації із декількома активними з’єднаннями. Вона не"
-" призводить до двозначності при виборі із декількох серверів DNS у межах"
-" одного профілю з’єднання. Якщо використано dns=default, сервери з вищою"
-" пріоритетністю будуть у верхній частині списку resolv.conf. Для визначення"
-" пріоритетності у межах одного профілю просто вкажіть сервери DNS у бажаному"
-" порядку використання. Якщо налаштування із одним рівнем пріоритетності мають"
-" декілька пристроїв, перевагу буде надано пристрою із активним типовим"
-" маршрутом. Від’ємні значення є особливими: вони виключають інші налаштування"
-" із більшим значенням пріоритетності. Отже, якщо є хоч один запис із"
-" від’ємною пріоритетністю, буде використано лише сервери DNS зі з’єднань із"
-" найменшим значенням пріоритетності. Якщо використовується визначник DNS, де"
-" передбачено підтримку split-DNS як dns=dnsmasq або dns=systemd-resolved,"
-" кожне з'єднання використовується для опитування доменів у його власному"
-" списку пошуку. Запити для доменів, яких немає у жодному зі списків пошуку"
-" переспрямовуються через з'єднання, які мають особливих домен-замінник «~.»,"
-" який додається автоматично до з'єднання із типовим маршрутом (або може бути"
-" доданий вручну). Якщо декілька з'єднань визначають один домен,"
-" використовуватиметься домен із вищим значенням пріоритетності (меншим"
-" числовим значенням). Якщо якесь з'єднання визначає домен, який є піддоменом"
-" іншого домену із від'ємним значенням пріоритетності DNS, цей піддомен буде"
-" проігноровано."
+"default route will be preferred. Note that when using dns=dnsmasq the order "
+"is meaningless since dnsmasq forwards queries to all known servers at the "
+"same time. Negative values have the special effect of excluding other "
+"configurations with a greater priority value; so in presence of at least a "
+"negative priority, only DNS servers from connections with the lowest "
+"priority value will be used."
+msgstr ""
+"Пріоритетність DNS всередині з’єднання. Відносна пріоритетність, яку слід "
+"використовувати під час визначення порядку серверів DNS у resolv.conf. Менше "
+"значення означає, що запис сервера буде вище у файлі. Нульове значення "
+"відповідає типовому варіанту, тобто 50 для VPN і 100 для інших з’єднань. "
+"Зауважте, що пріоритетність призначено для упорядковування параметрів DNS "
+"для ситуації із декількома активними з’єднаннями. Вона не призводить до "
+"двозначності при виборі із декількох серверів DNS у межах одного профілю "
+"з’єднання. Для визначення пріоритетності у межах одного профілю просто "
+"вкажіть сервери DNS у бажаному порядку використання. Якщо налаштування із "
+"одним рівнем пріоритетності мають декілька пристроїв, перевагу буде надано "
+"пристрою із активним типовим маршрутом. Зауважте, що коли ви використовуєте "
+"dns=dnsmasq, порядок не матиме значення, оскільки dnsmasq переспрямовує "
+"запити до усіх відомих серверів одночасно. Від’ємні значення є особливими: "
+"вони виключають інші налаштування із більшим значенням пріоритетності. Отже, "
+"якщо є хоч один запис із від’ємною пріоритетністю, буде використано лише "
+"сервери DNS зі з’єднань із найменшим значенням пріоритетності."
 
-#: ../clients/common/settings-docs.h.in:225
-#: ../clients/common/settings-docs.h.in:246
+#: ../clients/common/settings-docs.h.in:222
+#: ../clients/common/settings-docs.h.in:242
 msgid ""
 "Array of DNS search domains. Domains starting with a tilde ('~') are "
 "considered 'routing' domains and are used only to decide the interface over "
 "which a query must be forwarded; they are not used to complete unqualified "
 "host names."
 msgstr ""
-"Масив доменів пошуку DNS. Записи доменів, які починаються з тильди («~») "
-"вважатимуться записами «маршрутних» доменів і використовуватимуться для "
-"визначення інтерфейсу, крізь який слід спрямовувати запит; такі записи не "
-"використовуватимуться для доповнення неповних назв вузлів."
+"Масив доменів пошуку DNS. Записи доменів, які починаються з тильди («~»)"
+" вважатимуться записами «маршрутних» доменів і використовуватимуться для"
+" визначення інтерфейсу, крізь який слід спрямовувати запит; такі записи не"
+" використовуватимуться для доповнення неповних назв вузлів."
 
-#: ../clients/common/settings-docs.h.in:226
-#: ../clients/common/settings-docs.h.in:247
+#: ../clients/common/settings-docs.h.in:223
+#: ../clients/common/settings-docs.h.in:243
 msgid ""
 "The gateway associated with this configuration. This is only meaningful if "
 "\"addresses\" is also set."
@@ -8849,8 +8489,8 @@ msgstr ""
 "Шлюз, який пов’язано із цими налаштуваннями. Має значення, лише якщо "
 "встановлено значення «addresses»."
 
-#: ../clients/common/settings-docs.h.in:227
-#: ../clients/common/settings-docs.h.in:248
+#: ../clients/common/settings-docs.h.in:224
+#: ../clients/common/settings-docs.h.in:244
 msgid ""
 "When \"method\" is set to \"auto\" and this property to TRUE, automatically "
 "configured nameservers and search domains are ignored and only nameservers "
@@ -8863,8 +8503,8 @@ msgstr ""
 "пошуку, вказані за допомогою властивостей «dns» і «dns-search», якщо буде "
 "вказано якісь записи серверів і доменів для цих властивостей."
 
-#: ../clients/common/settings-docs.h.in:228
-#: ../clients/common/settings-docs.h.in:249
+#: ../clients/common/settings-docs.h.in:225
+#: ../clients/common/settings-docs.h.in:245
 msgid ""
 "When \"method\" is set to \"auto\" and this property to TRUE, automatically "
 "configured routes are ignored and only routes specified in the \"routes\" "
@@ -8875,8 +8515,8 @@ msgstr ""
 "використовуватимуться лише маршрути, вказані за допомогою властивості "
 "«routes», якщо такі існують."
 
-#: ../clients/common/settings-docs.h.in:229
-#: ../clients/common/settings-docs.h.in:251
+#: ../clients/common/settings-docs.h.in:226
+#: ../clients/common/settings-docs.h.in:247
 msgid ""
 "If TRUE, allow overall network configuration to proceed even if the "
 "configuration specified by this property times out.  Note that at least one "
@@ -8893,8 +8533,8 @@ msgstr ""
 "NMSettingIP4Config уможливлює успішне налаштовування усієї мережі, якщо не "
 "вдається налаштувати IPv4, але IPv6 налаштовано успішно."
 
-#: ../clients/common/settings-docs.h.in:230
-#: ../clients/common/settings-docs.h.in:252
+#: ../clients/common/settings-docs.h.in:227
+#: ../clients/common/settings-docs.h.in:248
 msgid ""
 "IP configuration method. NMSettingIP4Config and NMSettingIP6Config both "
 "support \"auto\", \"manual\", and \"link-local\". See the subclass-specific "
@@ -8918,8 +8558,8 @@ msgstr ""
 "бути порожніми. Для способу IPv4 «shared» підмережу IP можна налаштувати "
 "додаванням однієї адреси IPv4 вручну, інакше буде вибрано 10.42.x.0/24."
 
-#: ../clients/common/settings-docs.h.in:232
-#: ../clients/common/settings-docs.h.in:254
+#: ../clients/common/settings-docs.h.in:229
+#: ../clients/common/settings-docs.h.in:250
 msgid ""
 "If TRUE, this connection will never be the default connection for this IP "
 "type, meaning it will never be assigned the default route by NetworkManager."
@@ -8928,8 +8568,8 @@ msgstr ""
 "IP, що означає, що його ніколи не буде пов’язано із типовим маршрутом у "
 "NetworkManager."
 
-#: ../clients/common/settings-docs.h.in:233
-#: ../clients/common/settings-docs.h.in:255
+#: ../clients/common/settings-docs.h.in:230
+#: ../clients/common/settings-docs.h.in:251
 msgid ""
 "The default metric for routes that don't explicitly specify a metric. The "
 "default value -1 means that the metric is chosen automatically based on the "
@@ -8949,8 +8589,8 @@ msgstr ""
 "насправді означає, що встановлено значення 1024. Для IPv4 нуль є звичайним "
 "значенням для метрики."
 
-#: ../clients/common/settings-docs.h.in:234
-#: ../clients/common/settings-docs.h.in:256
+#: ../clients/common/settings-docs.h.in:231
+#: ../clients/common/settings-docs.h.in:252
 msgid ""
 "Enable policy routing (source routing) and set the routing table used when "
 "adding routes. This affects all routes, including device-routes, IPv4LL, "
@@ -8982,12 +8622,12 @@ msgstr ""
 "таблиці. Так зроблено, щоб зберегти зворотну сумісність для користувачів, "
 "які змінюють таблиці маршрутизації з-поза меж NetworkManager."
 
-#: ../clients/common/settings-docs.h.in:235
-#: ../clients/common/settings-docs.h.in:257
+#: ../clients/common/settings-docs.h.in:232
+#: ../clients/common/settings-docs.h.in:253
 msgid "Array of IP routes."
 msgstr "Масив IP-маршрутів."
 
-#: ../clients/common/settings-docs.h.in:236
+#: ../clients/common/settings-docs.h.in:233
 msgid ""
 "Configure method for creating the address for use with RFC4862 IPv6 "
 "Stateless Address Autoconfiguration. The permitted values are: "
@@ -9028,61 +8668,7 @@ msgstr ""
 "конфіденційності, які налаштовуються властивістю «ip6-privacy», і не впливає "
 "на тимчасові адреси, які налаштовано за допомогою відповідної властивості."
 
-#: ../clients/common/settings-docs.h.in:239
-msgid ""
-"A string containing the DHCPv6 Unique Identifier (DUID) used by the dhcp "
-"client to identify itself to DHCPv6 servers (RFC 3315). The DUID is carried "
-"in the Client Identifier option. If the property is a hex string ('aa:bb:"
-"cc') it is interpreted as a binary DUID and filled as an opaque value in the "
-"Client Identifier option. The special value \"lease\" will retrieve the DUID "
-"previously used from the lease file belonging to the connection. If no DUID "
-"is found and \"dhclient\" is the configured dhcp client, the DUID is "
-"searched in the system-wide dhclient lease file. If still no DUID is found, "
-"or another dhcp client is used, a global and permanent DUID-UUID (RFC 6355) "
-"will be generated based on the machine-id. The special values \"llt\" and "
-"\"ll\" will generate a DUID of type LLT or LL (see RFC 3315) based on the "
-"current MAC address of the device. In order to try providing a stable DUID-"
-"LLT, the time field will contain a constant timestamp that is used globally "
-"(for all profiles) and persisted to disk. The special values \"stable-llt\", "
-"\"stable-ll\" and \"stable-uuid\" will generate a DUID of the corresponding "
-"type, derived from the connection's stable-id and a per-host unique key. So, "
-"the link-layer address of \"stable-ll\" and \"stable-llt\" will be a "
-"generated address derived from the stable id. The DUID-LLT time value in the "
-"\"stable-llt\" option will be picked among a static timespan of three years "
-"(the upper bound of the interval is the same constant timestamp used in \"llt"
-"\"). When the property is unset, the global value provided for \"ipv6.dhcp-"
-"duid\" is used. If no global value is provided, the default \"lease\" value "
-"is assumed."
-msgstr ""
-"Рядок, який містить унікальний ідентифікатор DHCPv6 (DUID) і використовується"
-" клієнтом dhcp для самоідентифікації на серверах DHCPv6 (RFC 3315). DUID"
-" вводиться у параметрів ідентифікатора клієнта. Якщо властивість встановлено"
-" у значення шістнадцяткового рядка («aa:bb:cc»), вона обробляється як"
-" двійковий DUID і заповнюється як непрозоре значення у параметрів"
-" ідентифікатора клієнта. Якщо вказано особливе значення «lease», значення"
-" ідентифікатора буде отримано з раніше використаного DUID з файла надання"
-" адреси, який належить з'єднанню. Якщо у файлі не буде знайдено DUID, а"
-" налаштованим клієнтом DHCP є «dhclient», буде виконано пошук DUID у"
-" загальносистемному файлі надання адреси dhclient. Якщо DUID не буде знайдено"
-" і після цього або використано інший клієнт DHCP, загальне і остаточне"
-" значення DUID-UUID (RFC 6355) буде створено на основі ідентифікатора машини"
-" (machine-id). Використання особливих значень «llt» і «ll» призведе до"
-" створення DUID типу LLT або LL (див. RFC 3315) на основі поточної MAC-адреси"
-" пристрою. З метою забезпечення стабільного визначення DUID-LLT, поле часу"
-" міститиме сталу позначку часу, яка використовуватиметься на загальному рівні"
-" (для усіх профілів) і зберігатиметься на диску. Використання особливих"
-" значень «stable-llt», «stable-ll» і «stable-uuid» призведе до створення DUID"
-" відповідного типу, похідного від стабільного ідентифікатора з'єднання і"
-" унікального ключа вузла. Отже, адресою шару-зв'язку або «stable-ll» і"
-" «stable-llt» буде створена адреса, похідна від стабільного ідентифікатора."
-" Значення часу для DUID-LLT у варіанті з «stable-llt» буде вибрано з"
-" статичного проміжку часу у три роки (верхньою межею інтервалу є та сама"
-" стала часова позначка, що і та, яка використовується для «llt»). Якщо"
-" значення властивості не встановлено, буде використано загальне значення, яке"
-" міститься у властивості «ipv6.dhcp-duid». Якщо загальне значення не"
-" встановлено, типовим вважатиметься значення «lease»."
-
-#: ../clients/common/settings-docs.h.in:250
+#: ../clients/common/settings-docs.h.in:246
 msgid ""
 "Configure IPv6 Privacy Extensions for SLAAC, described in RFC4941.  If "
 "enabled, it makes the kernel generate a temporary IPv6 address in addition "
@@ -9113,7 +8699,7 @@ msgstr ""
 "увімкнено за допомогою параметра «stable-privacy» властивості «addr-gen-"
 "mode», як інший спосіб уникнути стеження за вузлом за допомогою адрес IPv6."
 
-#: ../clients/common/settings-docs.h.in:258
+#: ../clients/common/settings-docs.h.in:254
 msgid ""
 "Configure the token for draft-chown-6man-tokenised-ipv6-identifiers-02 IPv6 "
 "tokenized interface identifiers. Useful with eui64 addr-gen-mode."
@@ -9122,22 +8708,22 @@ msgstr ""
 "chown-6man-tokenised-ipv6-identifiers-02. Корисне у поєднанні зі значення "
 "addr-gen-mode eui64."
 
-#: ../clients/common/settings-docs.h.in:259
+#: ../clients/common/settings-docs.h.in:255
 msgid "Whether the transmitted traffic must be encrypted."
 msgstr "Визначає, чи слід шифрувати дані, які передаються."
 
-#: ../clients/common/settings-docs.h.in:260
+#: ../clients/common/settings-docs.h.in:256
 msgid ""
 "The pre-shared CAK (Connectivity Association Key) for MACsec Key Agreement."
 msgstr ""
 "Попереднього поширений CAK (ключ прив’язки з’єднань) для узгодження ключів "
 "MACsec."
 
-#: ../clients/common/settings-docs.h.in:261
+#: ../clients/common/settings-docs.h.in:257
 msgid "Flags indicating how to handle the \"mka-cak\" property."
 msgstr "Прапорці, які позначають, як обробляти властивість «mka-cak»."
 
-#: ../clients/common/settings-docs.h.in:262
+#: ../clients/common/settings-docs.h.in:258
 msgid ""
 "The pre-shared CKN (Connectivity-association Key Name) for MACsec Key "
 "Agreement."
@@ -9145,7 +8731,7 @@ msgstr ""
 "Попереднього поширена CKN (назва ключа ключ прив’язки з’єднань) для "
 "узгодження ключів MACsec."
 
-#: ../clients/common/settings-docs.h.in:263
+#: ../clients/common/settings-docs.h.in:259
 msgid ""
 "Specifies how the CAK (Connectivity Association Key) for MKA (MACsec Key "
 "Agreement) is obtained."
@@ -9153,7 +8739,7 @@ msgstr ""
 "Визначає спосіб отримання CAK (ключа прив’язки з’єднань) для MKA (узгодження "
 "ключів MACsec)."
 
-#: ../clients/common/settings-docs.h.in:265
+#: ../clients/common/settings-docs.h.in:261
 msgid ""
 "If given, specifies the parent interface name or parent connection UUID from "
 "which this MACSEC interface should be created.  If this property is not "
@@ -9165,7 +8751,7 @@ msgstr ""
 "значення для цієї властивості не вказано, запис з’єднання має містити "
 "параметр «802-3-ethernet» із властивістю «mac-address»."
 
-#: ../clients/common/settings-docs.h.in:266
+#: ../clients/common/settings-docs.h.in:262
 msgid ""
 "The port component of the SCI (Secure Channel Identifier), between 1 and "
 "65534."
@@ -9173,17 +8759,11 @@ msgstr ""
 "Компонент порту SCI (ідентифікатора безпечного каналу), значення від 1 до "
 "65534."
 
-#: ../clients/common/settings-docs.h.in:267
-msgid ""
-"Specifies whether the SCI (Secure Channel Identifier) is included in every "
-"packet."
-msgstr "Вказує, чи включено SCI (Secure Channel Identifier) до кожного пакета."
-
-#: ../clients/common/settings-docs.h.in:268
+#: ../clients/common/settings-docs.h.in:263
 msgid "Specifies the validation mode for incoming frames."
 msgstr "Визначає режим перевірки для вхідних кадрів."
 
-#: ../clients/common/settings-docs.h.in:269
+#: ../clients/common/settings-docs.h.in:264
 msgid ""
 "The macvlan mode, which specifies the communication mechanism between "
 "multiple macvlans on the same lower device."
@@ -9191,7 +8771,7 @@ msgstr ""
 "Режим macvlan, який визначає механізм обміну даними між декількома macvlan "
 "на одному пристрої нижнього рівня."
 
-#: ../clients/common/settings-docs.h.in:271
+#: ../clients/common/settings-docs.h.in:266
 msgid ""
 "If given, specifies the parent interface name or parent connection UUID from "
 "which this MAC-VLAN interface should be created.  If this property is not "
@@ -9203,71 +8783,68 @@ msgstr ""
 "значення для цієї властивості не вказано, запис з’єднання має містити "
 "параметр «802-3-ethernet» із властивістю «mac-address»."
 
-#: ../clients/common/settings-docs.h.in:272
+#: ../clients/common/settings-docs.h.in:267
 msgid "Whether the interface should be put in promiscuous mode."
 msgstr "Визначає, чи слід переводити інтерфейс у нерозбірливий режим."
 
-#: ../clients/common/settings-docs.h.in:273
+#: ../clients/common/settings-docs.h.in:268
 msgid "Whether the interface should be a MACVTAP."
 msgstr "Визначає, чи має бути інтерфейс інтерфейсом MACVTAP."
 
-#: ../clients/common/settings-docs.h.in:274
+#: ../clients/common/settings-docs.h.in:269
 msgid "The bridge failure mode. One of \"secure\", \"standalone\" or empty."
 msgstr ""
 "Режим відмови містка. Одне з таких значень: «secure», «standalone» або "
 "порожнє значення."
 
-#: ../clients/common/settings-docs.h.in:275
+#: ../clients/common/settings-docs.h.in:270
 msgid "Enable or disable multicast snooping."
 msgstr "Увімкнути або вимкнути переставляння універсальної трансляції."
 
-#: ../clients/common/settings-docs.h.in:277
+#: ../clients/common/settings-docs.h.in:272
 msgid "Enable or disable RSTP."
 msgstr "Увімкнути або вимкнути RSTP."
 
-#: ../clients/common/settings-docs.h.in:278
+#: ../clients/common/settings-docs.h.in:273
 msgid "Enable or disable STP."
 msgstr "Увімкнути або вимкнути STP."
 
-#: ../clients/common/settings-docs.h.in:280
+#: ../clients/common/settings-docs.h.in:275
 msgid "The interface type. Either \"internal\", or empty."
 msgstr "Тип інтерфейсу. Рядок «internal» або порожній рядок."
 
-#: ../clients/common/settings-docs.h.in:282
-#| msgid ""
-#| "Specifies the unicast destination IP address of a remote OpenVSwitch "
-#| "bridge port to connect to."
+#: ../clients/common/settings-docs.h.in:277
 msgid ""
-"Specifies the unicast destination IP address of a remote Open vSwitch bridge "
+"Specifies the unicast destination IP address of a remote OpenVSwitch bridge "
 "port to connect to."
 msgstr ""
 "Визначає IP-адресу односпрямованої трансляції, з якою слід з'єднувати порт "
-"містка Open vSwitch."
+"містка OpenVSwitch."
 
-#: ../clients/common/settings-docs.h.in:283
+#: ../clients/common/settings-docs.h.in:278
 msgid "The time port must be inactive in order to be considered down."
 msgstr "Щоб вважатися вимкненим, порт часу має бути неактивним."
 
-#: ../clients/common/settings-docs.h.in:284
+#: ../clients/common/settings-docs.h.in:279
 msgid ""
 "Bonding mode. One of \"active-backup\", \"balance-slb\", or \"balance-tcp\"."
 msgstr ""
 "Режим прив'язування. Одне з таких значень: «active-backup», «balance-slb» "
 "або «balance-tcp»."
 
-#: ../clients/common/settings-docs.h.in:285
+#: ../clients/common/settings-docs.h.in:280
 msgid "The time port must be active before it starts forwarding traffic."
 msgstr "Щоб почати переспрямовувати дані, слід активувати порт часу."
 
-#: ../clients/common/settings-docs.h.in:286
+#: ../clients/common/settings-docs.h.in:281
 msgid "LACP mode. One of \"active\", \"off\", or \"passive\"."
 msgstr "Режим LACP. Одне з таких значень: «active», «off» або «passive»."
 
-#: ../clients/common/settings-docs.h.in:288
+#: ../clients/common/settings-docs.h.in:283
 msgid "The VLAN tag in the range 0-4095."
 msgstr "Теґ VLAN у діапазоні від 0 до 4095."
 
-#: ../clients/common/settings-docs.h.in:289
+#: ../clients/common/settings-docs.h.in:284
 msgid ""
 "The VLAN mode. One of \"access\", \"native-tagged\", \"native-untagged\", "
 "\"trunk\" or unset."
@@ -9275,7 +8852,7 @@ msgstr ""
 "Режим VLAN. Одне з таких значень: «access», «native-tagged», «native-"
 "untagged», «trunk» або порожнє значення."
 
-#: ../clients/common/settings-docs.h.in:290
+#: ../clients/common/settings-docs.h.in:285
 msgid ""
 "If non-zero, instruct pppd to set the serial port to the specified "
 "baudrate.  This value should normally be left as 0 to automatically choose "
@@ -9285,7 +8862,7 @@ msgstr ""
 "вказану швидкість передавання даних у бодах. Зазвичай, для цієї властивості "
 "слід залишити нульове значення, щоб швидкість було вибрано автоматично."
 
-#: ../clients/common/settings-docs.h.in:291
+#: ../clients/common/settings-docs.h.in:286
 msgid ""
 "If TRUE, specify that pppd should set the serial port to use hardware flow "
 "control with RTS and CTS signals.  This value should normally be set to "
@@ -9295,7 +8872,7 @@ msgstr ""
 "керування потоком апаратних даних за допомогою сигналів RTS і CTS. За "
 "звичних умов, для цієї властивості має бути встановлено значення FALSE."
 
-#: ../clients/common/settings-docs.h.in:292
+#: ../clients/common/settings-docs.h.in:287
 msgid ""
 "If non-zero, instruct pppd to presume the connection to the peer has failed "
 "if the specified number of LCP echo-requests go unanswered by the peer.  The "
@@ -9307,7 +8884,7 @@ msgstr ""
 "кількість луна-запитів LCP. Якщо використовується ця властивість, для "
 "властивості «lcp-echo-interval» слід встановити ненульове значення."
 
-#: ../clients/common/settings-docs.h.in:293
+#: ../clients/common/settings-docs.h.in:288
 msgid ""
 "If non-zero, instruct pppd to send an LCP echo-request frame to the peer "
 "every n seconds (where n is the specified value).  Note that some PPP peers "
@@ -9319,7 +8896,7 @@ msgstr ""
 "відповідатимуть на луна-запити, а деякі — ні. Визначити, чи відповідатиме "
 "певний вузол, у автоматичному режимі неможливо."
 
-#: ../clients/common/settings-docs.h.in:294
+#: ../clients/common/settings-docs.h.in:289
 msgid ""
 "If TRUE, stateful MPPE is used.  See pppd documentation for more information "
 "on stateful MPPE."
@@ -9327,7 +8904,7 @@ msgstr ""
 "Якщо TRUE, використовуватиметься режим MPPE зі станами (stateful). "
 "Докладніший опис режиму MPPE зі станами наведено у документації із pppd."
 
-#: ../clients/common/settings-docs.h.in:295
+#: ../clients/common/settings-docs.h.in:290
 msgid ""
 "If non-zero, instruct pppd to request that the peer send packets no larger "
 "than the specified size.  If non-zero, the MRU should be between 128 and "
@@ -9337,20 +8914,20 @@ msgstr ""
 "щодо того, щоб він надсилав пакети, не більші за вказаний розмір. Якщо має "
 "ненульове значення, MRU має бути від 128 до 16384."
 
-#: ../clients/common/settings-docs.h.in:296
+#: ../clients/common/settings-docs.h.in:291
 msgid ""
 "If non-zero, instruct pppd to send packets no larger than the specified size."
 msgstr ""
 "Якщо має ненульове значення, наказує pppd надсилати пакети, не більші за "
 "вказаний розмір."
 
-#: ../clients/common/settings-docs.h.in:298
+#: ../clients/common/settings-docs.h.in:293
 msgid "If TRUE, Van Jacobsen TCP header compression will not be requested."
 msgstr ""
 "Якщо має значення TRUE, запит щодо стискання заголовків TCP ван Якобсена не "
 "надсилатиметься."
 
-#: ../clients/common/settings-docs.h.in:299
+#: ../clients/common/settings-docs.h.in:294
 msgid ""
 "If TRUE, do not require the other side (usually the PPP server) to "
 "authenticate itself to the client.  If FALSE, require authentication from "
@@ -9361,35 +8938,35 @@ msgstr ""
 "FALSE, вимагати проходження розпізнавання з боку віддаленого вузла. У "
 "більшості випадків слід використовувати значення TRUE."
 
-#: ../clients/common/settings-docs.h.in:300
+#: ../clients/common/settings-docs.h.in:295
 msgid "If TRUE, BSD compression will not be requested."
 msgstr "Якщо TRUE, стискання BSD не вимагатиметься."
 
-#: ../clients/common/settings-docs.h.in:301
+#: ../clients/common/settings-docs.h.in:296
 msgid "If TRUE, \"deflate\" compression will not be requested."
 msgstr "Якщо TRUE, стискання «deflate» не вимагатиметься."
 
-#: ../clients/common/settings-docs.h.in:302
+#: ../clients/common/settings-docs.h.in:297
 msgid "If TRUE, the CHAP authentication method will not be used."
 msgstr "Якщо TRUE, спосіб розпізнавання CHAP не використовуватиметься."
 
-#: ../clients/common/settings-docs.h.in:303
+#: ../clients/common/settings-docs.h.in:298
 msgid "If TRUE, the EAP authentication method will not be used."
 msgstr "Якщо TRUE, спосіб розпізнавання EAP не використовуватиметься."
 
-#: ../clients/common/settings-docs.h.in:304
+#: ../clients/common/settings-docs.h.in:299
 msgid "If TRUE, the MSCHAP authentication method will not be used."
 msgstr "Якщо TRUE, спосіб розпізнавання MSCHAP не використовуватиметься."
 
-#: ../clients/common/settings-docs.h.in:305
+#: ../clients/common/settings-docs.h.in:300
 msgid "If TRUE, the MSCHAPv2 authentication method will not be used."
 msgstr "Якщо TRUE, спосіб розпізнавання MSCHAPv2 не використовуватиметься."
 
-#: ../clients/common/settings-docs.h.in:306
+#: ../clients/common/settings-docs.h.in:301
 msgid "If TRUE, the PAP authentication method will not be used."
 msgstr "Якщо TRUE, спосіб розпізнавання PAP не використовуватиметься."
 
-#: ../clients/common/settings-docs.h.in:307
+#: ../clients/common/settings-docs.h.in:302
 msgid ""
 "If TRUE, MPPE (Microsoft Point-to-Point Encryption) will be required for the "
 "PPP session.  If either 64-bit or 128-bit MPPE is not available the session "
@@ -9400,7 +8977,7 @@ msgstr ""
 "128-бітове MPPE виявиться недоступним, сеанс не буде створено. Зауважте, що "
 "MPPE не використовується для мобільних широкосмугових з’єднань."
 
-#: ../clients/common/settings-docs.h.in:308
+#: ../clients/common/settings-docs.h.in:303
 msgid ""
 "If TRUE, 128-bit MPPE (Microsoft Point-to-Point Encryption) will be required "
 "for the PPP session, and the \"require-mppe\" property must also be set to "
@@ -9411,7 +8988,7 @@ msgstr ""
 "для властивості «require-mppe» також має бути встановлено TRUE. Якщо 128-"
 "бітове MPPE виявиться недоступним, сеанс не буде створено."
 
-#: ../clients/common/settings-docs.h.in:310
+#: ../clients/common/settings-docs.h.in:305
 msgid ""
 "If given, specifies the parent interface name on which this PPPoE connection "
 "should be created.  If this property is not specified, the connection is "
@@ -9423,11 +9000,11 @@ msgstr ""
 "з'єднання буде активовано на інтерфейсі, який вказано за допомогою параметра "
 "«interface-name» NMSettingConnection."
 
-#: ../clients/common/settings-docs.h.in:311
+#: ../clients/common/settings-docs.h.in:306
 msgid "Password used to authenticate with the PPPoE service."
 msgstr "Пароль, який використовуватиметься для розпізнавання на службі PPPoE."
 
-#: ../clients/common/settings-docs.h.in:313
+#: ../clients/common/settings-docs.h.in:308
 msgid ""
 "If specified, instruct PPPoE to only initiate sessions with access "
 "concentrators that provide the specified service.  For most providers, this "
@@ -9440,33 +9017,33 @@ msgstr ""
 "якщо ви маєте справу із концентраторами із декількома способами доступу або "
 "відомо, що вказана служба є необхідною."
 
-#: ../clients/common/settings-docs.h.in:314
+#: ../clients/common/settings-docs.h.in:309
 msgid "Username used to authenticate with the PPPoE service."
 msgstr ""
 "Ім’я користувача, яке використовуватиметься для розпізнавання на службі "
 "PPPoE."
 
-#: ../clients/common/settings-docs.h.in:315
+#: ../clients/common/settings-docs.h.in:310
 msgid "Whether the proxy configuration is for browser only."
 msgstr ""
 "Визначає, чи використовуються налаштування проксі лише для програм для "
 "перегляду інтернету."
 
-#: ../clients/common/settings-docs.h.in:316
+#: ../clients/common/settings-docs.h.in:311
 msgid ""
 "Method for proxy configuration, Default is NM_SETTING_PROXY_METHOD_NONE (0)"
 msgstr ""
 "Спосіб налаштовування проксі. Типовим є NM_SETTING_PROXY_METHOD_NONE (0)"
 
-#: ../clients/common/settings-docs.h.in:318
+#: ../clients/common/settings-docs.h.in:313
 msgid "PAC script for the connection."
 msgstr "Скрипт PAC для з’єднання."
 
-#: ../clients/common/settings-docs.h.in:319
+#: ../clients/common/settings-docs.h.in:314
 msgid "PAC URL for obtaining PAC file."
 msgstr "Адреса PAC для отримання файла PAC."
 
-#: ../clients/common/settings-docs.h.in:320
+#: ../clients/common/settings-docs.h.in:315
 msgid ""
 "Speed to use for communication over the serial port.  Note that this value "
 "usually has no effect for mobile broadband modems as they generally ignore "
@@ -9477,20 +9054,20 @@ msgstr ""
 "загалом, для них параметри швидкості ігноруються — просто використовується "
 "найвища доступна швидкість."
 
-#: ../clients/common/settings-docs.h.in:321
+#: ../clients/common/settings-docs.h.in:316
 msgid "Byte-width of the serial communication. The 8 in \"8n1\" for example."
 msgstr "Байтова ширина послідовного обміну даними. Наприклад, 8 у «8n1»."
 
-#: ../clients/common/settings-docs.h.in:323
+#: ../clients/common/settings-docs.h.in:318
 msgid "Parity setting of the serial port."
 msgstr "Параметр парності послідовного порту."
 
-#: ../clients/common/settings-docs.h.in:324
+#: ../clients/common/settings-docs.h.in:319
 msgid "Time to delay between each byte sent to the modem, in microseconds."
 msgstr ""
 "Затримка у часі між надсиланнями одного байта на модем, у мікросекундах."
 
-#: ../clients/common/settings-docs.h.in:325
+#: ../clients/common/settings-docs.h.in:320
 msgid ""
 "Number of stop bits for communication on the serial port.  Either 1 or 2. "
 "The 1 in \"8n1\" for example."
@@ -9498,15 +9075,16 @@ msgstr ""
 "Кількість бітів зупинки для обміну даними на послідовному порту. Може мати "
 "значення 1 або 2. Наприклад, 1 у «8n1»."
 
-#: ../clients/common/settings-docs.h.in:327
+#: ../clients/common/settings-docs.h.in:322
 msgid "Array of TC queuening disciplines."
 msgstr "Масив дисциплін TC у черзі."
 
-#: ../clients/common/settings-docs.h.in:328
+#: ../clients/common/settings-docs.h.in:323
+#| msgid "Array of IP routes."
 msgid "Array of TC traffic filters."
 msgstr "Список TC фільтрів обміну даними."
 
-#: ../clients/common/settings-docs.h.in:329
+#: ../clients/common/settings-docs.h.in:324
 msgid ""
 "The JSON configuration for the team network interface.  The property should "
 "contain raw JSON configuration data suitable for teamd, because the value is "
@@ -9519,8 +9097,8 @@ msgstr ""
 "використовуватимуться типові налаштування. Щоб дізнатися більше про "
 "форматування даних, ознайомитеся із підручником (man) з teamd.conf."
 
-#: ../clients/common/settings-docs.h.in:330
-#: ../clients/common/settings-docs.h.in:349
+#: ../clients/common/settings-docs.h.in:325
+#: ../clients/common/settings-docs.h.in:344
 msgid ""
 "Link watchers configuration for the connection: each link watcher is defined "
 "by a dictionary, whose keys depend upon the selected link watcher. Available "
@@ -9531,90 +9109,84 @@ msgid ""
 "'validate-active', 'validate-incative', 'send-always'. See teamd.conf man "
 "for more details."
 msgstr ""
-"Налаштовування засобів спостереження за зв'язком для з'єднання: кожен засіб "
-"спостереження за зв'язком визначається словником, записи якого залежать від "
-"вибраного засобу спостереження. Доступними засобами спостереження є такі: "
-"«ethtool», «nsna_ping» та «arp_ping». Засіб спостереження визначається у "
-"словнику із записом «name». Доступні записи: ethtool: «delay-up», «delay-"
-"down», «init-wait»; nsna_ping: «init-wait», «interval», «missed-max», "
-"«target-host»; arp_ping: усі у nsna_ping і «source-host», «validate-active», "
-"«validate-incative», «send-always». Докладніше про це на сторінці підручника "
-"(man) щодо teamd.conf."
+"Налаштовування засобів спостереження за зв'язком для з'єднання: кожен засіб"
+" спостереження за зв'язком визначається словником, записи якого залежать від"
+" вибраного засобу спостереження. Доступними засобами спостереження є такі:"
+" «ethtool», «nsna_ping» та «arp_ping». Засіб спостереження визначається у"
+" словнику із записом «name». Доступні записи: ethtool: «delay-"
+"up», «delay-down», «init-wait»; nsna_ping: «init-wait», «interval»,"
+" «missed-max», «target-host»; arp_ping: усі у nsna_ping і «source-host»,"
+" «validate-active», «validate-incative», «send-always». Докладніше про це на"
+" сторінці підручника (man) щодо teamd.conf."
 
-#: ../clients/common/settings-docs.h.in:331
+#: ../clients/common/settings-docs.h.in:326
 msgid "Corresponds to the teamd mcast_rejoin.count."
 msgstr "Відповідає mcast_rejoin.count у teamd."
 
-#: ../clients/common/settings-docs.h.in:332
+#: ../clients/common/settings-docs.h.in:327
 msgid "Corresponds to the teamd mcast_rejoin.interval."
 msgstr "Відповідає mcast_rejoin.interval у teamd."
 
-#: ../clients/common/settings-docs.h.in:334
+#: ../clients/common/settings-docs.h.in:329
 msgid "Corresponds to the teamd notify_peers.count."
 msgstr "Відповідає notify_peers.count у teamd."
 
-#: ../clients/common/settings-docs.h.in:335
+#: ../clients/common/settings-docs.h.in:330
 msgid "Corresponds to the teamd notify_peers.interval."
 msgstr "Відповідає notify_peers.interval у teamd."
 
-#: ../clients/common/settings-docs.h.in:336
-#| msgid ""
-#| "Corresponds to the teamd runner.name. Permitted values are: \"roundrobin"
-#| "\", \"broadcast\", \"activebackup\", \"loadbalance\", \"lacp\". When "
-#| "setting the runner, all the properties specific to the runner will be "
-#| "reset to the default value; all the properties specific to other runners "
-#| "will be set to an empty value (or if not possible to a default value)."
+#: ../clients/common/settings-docs.h.in:331
 msgid ""
 "Corresponds to the teamd runner.name. Permitted values are: \"roundrobin\", "
-"\"broadcast\", \"activebackup\", \"loadbalance\", \"lacp\", \"random\". When "
-"setting the runner, all the properties specific to the runner will be reset "
-"to the default value; all the properties specific to other runners will be "
-"set to an empty value (or if not possible to a default value)."
+"\"broadcast\", \"activebackup\", \"loadbalance\", \"lacp\". When setting the "
+"runner, all the properties specific to the runner will be reset to the "
+"default value; all the properties specific to other runners will be set to "
+"an empty value (or if not possible to a default value)."
 msgstr ""
 "Відповідає runner.name у teamd. Дозволені значення: \"roundrobin\", "
-"\"broadcast\", \"activebackup\", \"loadbalance\", \"lacp\", \"random\". Якщо "
-"встановлюється засіб запуску (runner), значення усіх властивостей, "
-"специфічних для засобу запуску буде скинуто до типових; буде встановлено "
-"порожні значення для усіх властивостей, специфічних для інших засобів "
-"запуску (або, якщо це неможливо, типові значення)."
+"\"broadcast\", \"activebackup\", \"loadbalance\", \"lacp\". Якщо"
+" встановлюється засіб запуску (runner), значення усіх властивостей,"
+" специфічних для засобу запуску буде скинуто до типових; буде встановлено"
+" порожні значення для усіх властивостей, специфічних для інших засобів"
+" запуску (або, якщо це неможливо, типові значення)."
 
-#: ../clients/common/settings-docs.h.in:337
+#: ../clients/common/settings-docs.h.in:332
 msgid "Corresponds to the teamd runner.active."
 msgstr "Відповідає runner.active у teamd."
 
-#: ../clients/common/settings-docs.h.in:338
+#: ../clients/common/settings-docs.h.in:333
 msgid "Corresponds to the teamd runner.agg_select_policy."
 msgstr "Відповідає runner.agg_select_policy у teamd."
 
-#: ../clients/common/settings-docs.h.in:339
+#: ../clients/common/settings-docs.h.in:334
 msgid "Corresponds to the teamd runner.fast_rate."
 msgstr "Відповідає runner.fast_rate у teamd."
 
-#: ../clients/common/settings-docs.h.in:340
+#: ../clients/common/settings-docs.h.in:335
 msgid "Corresponds to the teamd runner.hwaddr_policy."
 msgstr "Відповідає runner.hwaddr_policy у teamd."
 
-#: ../clients/common/settings-docs.h.in:341
+#: ../clients/common/settings-docs.h.in:336
 msgid "Corresponds to the teamd runner.min_ports."
 msgstr "Відповідає runner.min_ports у teamd."
 
-#: ../clients/common/settings-docs.h.in:342
+#: ../clients/common/settings-docs.h.in:337
 msgid "Corresponds to the teamd runner.sys_prio."
 msgstr "Відповідає runner.sys_prio у teamd."
 
-#: ../clients/common/settings-docs.h.in:343
+#: ../clients/common/settings-docs.h.in:338
 msgid "Corresponds to the teamd runner.tx_balancer.name."
 msgstr "Відповідає runner.tx_balancer.name у teamd."
 
-#: ../clients/common/settings-docs.h.in:344
+#: ../clients/common/settings-docs.h.in:339
 msgid "Corresponds to the teamd runner.tx_balancer.interval."
 msgstr "Відповідає runner.tx_balancer.interval у teamd."
 
-#: ../clients/common/settings-docs.h.in:345
+#: ../clients/common/settings-docs.h.in:340
 msgid "Corresponds to the teamd runner.tx_hash."
 msgstr "Відповідає runner.tx_hash у teamd."
 
-#: ../clients/common/settings-docs.h.in:346
+#: ../clients/common/settings-docs.h.in:341
 msgid ""
 "The JSON configuration for the team port. The property should contain raw "
 "JSON configuration data suitable for teamd, because the value is passed "
@@ -9627,19 +9199,19 @@ msgstr ""
 "використовуватимуться типові налаштування. Щоб дізнатися більше про "
 "форматування даних, ознайомитеся із підручником (man) з teamd.conf."
 
-#: ../clients/common/settings-docs.h.in:347
+#: ../clients/common/settings-docs.h.in:342
 msgid "Corresponds to the teamd ports.PORTIFNAME.lacp_key."
 msgstr "Відповідає ports.PORTIFNAME.lacp_key у teamd."
 
-#: ../clients/common/settings-docs.h.in:348
+#: ../clients/common/settings-docs.h.in:343
 msgid "Corresponds to the teamd ports.PORTIFNAME.lacp_prio."
 msgstr "Відповідає ports.PORTIFNAME.lacp_prio у teamd."
 
-#: ../clients/common/settings-docs.h.in:351
+#: ../clients/common/settings-docs.h.in:346
 msgid "Corresponds to the teamd ports.PORTIFNAME.prio."
 msgstr "Відповідає ports.PORTIFNAME.prio у teamd."
 
-#: ../clients/common/settings-docs.h.in:352
+#: ../clients/common/settings-docs.h.in:347
 msgid ""
 "Corresponds to the teamd ports.PORTIFNAME.queue_id. When set to -1 means the "
 "parameter is skipped from the json config."
@@ -9647,11 +9219,11 @@ msgstr ""
 "Відповідає ports.PORTIFNAME.queue_id у teamd. Значення -1 означає, що "
 "параметр пропускається у налаштуваннях json."
 
-#: ../clients/common/settings-docs.h.in:353
+#: ../clients/common/settings-docs.h.in:348
 msgid "Corresponds to the teamd ports.PORTIFNAME.sticky."
 msgstr "Відповідає ports.PORTIFNAME.sticky у teamd."
 
-#: ../clients/common/settings-docs.h.in:354
+#: ../clients/common/settings-docs.h.in:349
 msgid ""
 "The group ID which will own the device. If set to NULL everyone will be able "
 "to use the device."
@@ -9659,7 +9231,7 @@ msgstr ""
 "Ідентифікатор групи-власника пристрою. Якщо встановлено значення NULL, "
 "пристроєм зможе користуватися будь-хто."
 
-#: ../clients/common/settings-docs.h.in:355
+#: ../clients/common/settings-docs.h.in:350
 msgid ""
 "The operating mode of the virtual device. Allowed values are "
 "NM_SETTING_TUN_MODE_TUN (1) to create a layer 3 device and "
@@ -9669,7 +9241,7 @@ msgstr ""
 "NM_SETTING_TUN_MODE_TUN (1) для створення пристрою шару 3 і "
 "NM_SETTING_TUN_MODE_TAP (2) для створення пристрою Ethernet-подібного шару 2."
 
-#: ../clients/common/settings-docs.h.in:356
+#: ../clients/common/settings-docs.h.in:351
 msgid ""
 "If the property is set to TRUE, the interface will support multiple file "
 "descriptors (queues) to parallelize packet sending or receiving. Otherwise, "
@@ -9680,7 +9252,7 @@ msgstr ""
 "надсилання або отримування пакетів. Якщо ж встановлено значення FALSE, "
 "інтерфейсом підтримуватиметься лише одна черга."
 
-#: ../clients/common/settings-docs.h.in:358
+#: ../clients/common/settings-docs.h.in:353
 msgid ""
 "The user ID which will own the device. If set to NULL everyone will be able "
 "to use the device."
@@ -9688,7 +9260,7 @@ msgstr ""
 "Ідентифікатор користувача-власника пристрою. Якщо встановлено значення NULL, "
 "пристроєм зможе користуватися будь-хто."
 
-#: ../clients/common/settings-docs.h.in:359
+#: ../clients/common/settings-docs.h.in:354
 msgid ""
 "If TRUE the interface will prepend a 4 byte header describing the physical "
 "interface to the packets."
@@ -9696,7 +9268,7 @@ msgstr ""
 "Якщо TRUE, інтерфейс дописуватиме на початку пакетів заголовок у 4 байти із "
 "описом фізичного інтерфейсу."
 
-#: ../clients/common/settings-docs.h.in:360
+#: ../clients/common/settings-docs.h.in:355
 msgid ""
 "If TRUE the IFF_VNET_HDR the tunnel packets will include a virtio network "
 "header."
@@ -9704,7 +9276,7 @@ msgstr ""
 "Якщо IFF_VNET_HDR має значення TRUE, тунельовані пакети включатимуть "
 "заголовок мережі virtio."
 
-#: ../clients/common/settings-docs.h.in:361
+#: ../clients/common/settings-docs.h.in:356
 msgid ""
 "A dictionary of key/value pairs with user data. This data is ignored by "
 "NetworkManager and can be used at the users discretion. The keys only "
@@ -9717,7 +9289,7 @@ msgstr ""
 "формату ASCII, але значення можуть бути довільними рядками UTF8, довжина "
 "яких не перевищує певного значення."
 
-#: ../clients/common/settings-docs.h.in:363
+#: ../clients/common/settings-docs.h.in:358
 msgid ""
 "For outgoing packets, a list of mappings from Linux SKB priorities to 802.1p "
 "priorities.  The mapping is given in the format \"from:to\" where both \"from"
@@ -9727,7 +9299,7 @@ msgstr ""
 "802.1p. Прив’язка визначається у форматі «з:до», де обидва значення, «з» і "
 "«до» є цілими додатними числами, наприклад «7:3»."
 
-#: ../clients/common/settings-docs.h.in:364
+#: ../clients/common/settings-docs.h.in:359
 msgid ""
 "One or more flags which control the behavior and features of the VLAN "
 "interface.  Flags include NM_VLAN_FLAG_REORDER_HEADERS (0x1) (reordering of "
@@ -9749,7 +9321,7 @@ msgstr ""
 "зберегти зворотну сумісність, типовим значенням у програмному інтерфейсі D-"
 "Bus лишається 0, а нестача властивості у D-Bus також розглядається як 0."
 
-#: ../clients/common/settings-docs.h.in:365
+#: ../clients/common/settings-docs.h.in:360
 msgid ""
 "The VLAN identifier that the interface created by this connection should be "
 "assigned. The valid range is from 0 to 4094, without the reserved id 4095."
@@ -9758,7 +9330,7 @@ msgstr ""
 "з’єднанням. Коректним діапазоном є діапазон від 0 до 4094, без "
 "зарезервованого ідентифікатора 4095."
 
-#: ../clients/common/settings-docs.h.in:366
+#: ../clients/common/settings-docs.h.in:361
 msgid ""
 "For incoming packets, a list of mappings from 802.1p priorities to Linux SKB "
 "priorities.  The mapping is given in the format \"from:to\" where both \"from"
@@ -9768,7 +9340,7 @@ msgstr ""
 "Linux. Прив’язка визначається у форматі «з:до», де обидва значення, «з» і "
 "«до» є цілими додатними числами, наприклад «7:3»."
 
-#: ../clients/common/settings-docs.h.in:368
+#: ../clients/common/settings-docs.h.in:363
 msgid ""
 "If given, specifies the parent interface name or parent connection UUID from "
 "which this VLAN interface should be created.  If this property is not "
@@ -9780,7 +9352,7 @@ msgstr ""
 "значення для цієї властивості не вказано, запис з’єднання має містити "
 "параметр «802-3-ethernet» із властивістю «mac-address»."
 
-#: ../clients/common/settings-docs.h.in:369
+#: ../clients/common/settings-docs.h.in:364
 msgid ""
 "Dictionary of key/value pairs of VPN plugin specific data.  Both keys and "
 "values must be strings."
@@ -9788,7 +9360,7 @@ msgstr ""
 "Словник із пар ключ-значення для специфічних даних додатка VPN. Величинами "
 "ключа і значення можуть бути лише текстові рядки."
 
-#: ../clients/common/settings-docs.h.in:371
+#: ../clients/common/settings-docs.h.in:366
 msgid ""
 "If the VPN service supports persistence, and this property is TRUE, the VPN "
 "will attempt to stay connected across link changes and outages, until "
@@ -9799,7 +9371,7 @@ msgstr ""
 "час зміни параметрів зв’язку або неможливості обміну даними, аж доки "
 "з’єднання не буде розірвано явним чином."
 
-#: ../clients/common/settings-docs.h.in:372
+#: ../clients/common/settings-docs.h.in:367
 msgid ""
 "Dictionary of key/value pairs of VPN plugin specific secrets like passwords "
 "or private keys.  Both keys and values must be strings."
@@ -9808,7 +9380,7 @@ msgstr ""
 "VPN, зокрема паролів або закритих ключів. Величинами ключа і значення можуть "
 "бути лише текстові рядки."
 
-#: ../clients/common/settings-docs.h.in:373
+#: ../clients/common/settings-docs.h.in:368
 msgid ""
 "D-Bus service name of the VPN plugin that this setting uses to connect to "
 "its network.  i.e. org.freedesktop.NetworkManager.vpnc for the vpnc plugin."
@@ -9817,7 +9389,7 @@ msgstr ""
 "додатка з його мережею. Приклад: org.freedesktop.NetworkManager.vpnc для "
 "додатка vpnc."
 
-#: ../clients/common/settings-docs.h.in:374
+#: ../clients/common/settings-docs.h.in:369
 msgid ""
 "Timeout for the VPN service to establish the connection. Some services may "
 "take quite a long time to connect. Value of 0 means a default timeout, which "
@@ -9830,7 +9402,7 @@ msgstr ""
 "допомогою параметра vpn.timeout у файлі налаштувань). Значення, які "
 "перевищують нуль, визначають час очікування у секундах."
 
-#: ../clients/common/settings-docs.h.in:375
+#: ../clients/common/settings-docs.h.in:370
 msgid ""
 "If the VPN connection requires a user name for authentication, that name "
 "should be provided here.  If the connection is available to more than one "
@@ -9846,11 +9418,11 @@ msgstr ""
 "порожнє, NetworkManager автоматично використає ім’я користувача, який "
 "надіслав запит щодо встановлення з’єднання VPN."
 
-#: ../clients/common/settings-docs.h.in:376
+#: ../clients/common/settings-docs.h.in:371
 msgid "Specifies the lifetime in seconds of FDB entries learnt by the kernel."
 msgstr "Визначає час життя у секундах записів FDB, вивчених ядром."
 
-#: ../clients/common/settings-docs.h.in:377
+#: ../clients/common/settings-docs.h.in:372
 msgid ""
 "Specifies the UDP destination port to communicate to the remote VXLAN tunnel "
 "endpoint."
@@ -9858,22 +9430,22 @@ msgstr ""
 "Визначає порт призначення UDP для обміну даними із віддаленою кінцевою "
 "точкою тунелю VXLAN."
 
-#: ../clients/common/settings-docs.h.in:378
+#: ../clients/common/settings-docs.h.in:373
 msgid ""
 "Specifies the VXLAN Network Identifier (or VXLAN Segment Identifier) to use."
 msgstr ""
 "Визначає ідентифікатор мережі VXLAN (або ідентифікатор сегмента VXLAN), яким "
 "слід скористатися."
 
-#: ../clients/common/settings-docs.h.in:379
+#: ../clients/common/settings-docs.h.in:374
 msgid "Specifies whether netlink LL ADDR miss notifications are generated."
 msgstr "Визначає, чи будуть створюватися сповіщення netlink LL ADDR miss."
 
-#: ../clients/common/settings-docs.h.in:380
+#: ../clients/common/settings-docs.h.in:375
 msgid "Specifies whether netlink IP ADDR miss notifications are generated."
 msgstr "Визначає, чи будуть створюватися сповіщення netlink IP ADDR miss."
 
-#: ../clients/common/settings-docs.h.in:381
+#: ../clients/common/settings-docs.h.in:376
 msgid ""
 "Specifies whether unknown source link layer addresses and IP addresses are "
 "entered into the VXLAN device forwarding database."
@@ -9881,7 +9453,7 @@ msgstr ""
 "Вказує, чи вводяться невідомі адреси шару посилань та IP-адреси до бази "
 "даних переспрямовування пристроїв VXLAN."
 
-#: ../clients/common/settings-docs.h.in:382
+#: ../clients/common/settings-docs.h.in:377
 msgid ""
 "Specifies the maximum number of FDB entries. A value of zero means that the "
 "kernel will store unlimited entries."
@@ -9889,24 +9461,24 @@ msgstr ""
 "Вказує максимальну кількість записів FDB. Нульове значення означає, що ядро "
 "зберігатиме необмежену кількість записів."
 
-#: ../clients/common/settings-docs.h.in:383
+#: ../clients/common/settings-docs.h.in:378
 msgid "If given, specifies the source IP address to use in outgoing packets."
 msgstr ""
 "Якщо задано, визначає початкову IP-адресу, якою слід скористатися для "
 "вихідних пакетів."
 
-#: ../clients/common/settings-docs.h.in:385
+#: ../clients/common/settings-docs.h.in:380
 msgid ""
 "If given, specifies the parent interface name or parent connection UUID."
 msgstr ""
 "Якщо задано, визначає назву батьківського інтерфейсу або UUID батьківського "
 "з’єднання."
 
-#: ../clients/common/settings-docs.h.in:386
+#: ../clients/common/settings-docs.h.in:381
 msgid "Specifies whether ARP proxy is turned on."
 msgstr "Визначає, чи увімкнено ARP-проксі."
 
-#: ../clients/common/settings-docs.h.in:387
+#: ../clients/common/settings-docs.h.in:382
 msgid ""
 "Specifies the unicast destination IP address to use in outgoing packets when "
 "the destination link layer address is not known in the VXLAN device "
@@ -9917,11 +9489,11 @@ msgstr ""
 "переспрямовування пристроїв VXLAN, або IP-адреса універсальної трансляції, з "
 "якою слід встановити зв’язок."
 
-#: ../clients/common/settings-docs.h.in:388
+#: ../clients/common/settings-docs.h.in:383
 msgid "Specifies whether route short circuit is turned on."
 msgstr "Визначає, чи увімкнено коротке замикання маршруту."
 
-#: ../clients/common/settings-docs.h.in:389
+#: ../clients/common/settings-docs.h.in:384
 msgid ""
 "Specifies the maximum UDP source port to communicate to the remote VXLAN "
 "tunnel endpoint."
@@ -9929,7 +9501,7 @@ msgstr ""
 "Визначає максимальний початковий порт UDP для обміну даними із віддаленою "
 "кінцевою точкою тунелю VXLAN."
 
-#: ../clients/common/settings-docs.h.in:390
+#: ../clients/common/settings-docs.h.in:385
 msgid ""
 "Specifies the minimum UDP source port to communicate to the remote VXLAN "
 "tunnel endpoint."
@@ -9937,16 +9509,16 @@ msgstr ""
 "Визначає мінімальний початковий порт UDP для обміну даними із віддаленою "
 "кінцевою точкою тунелю VXLAN."
 
-#: ../clients/common/settings-docs.h.in:391
+#: ../clients/common/settings-docs.h.in:386
 msgid "Specifies the TOS value to use in outgoing packets."
 msgstr "Визначає значення TOS, яке слід використовувати для вихідних пакетів."
 
-#: ../clients/common/settings-docs.h.in:392
+#: ../clients/common/settings-docs.h.in:387
 msgid "Specifies the time-to-live value to use in outgoing packets."
 msgstr ""
 "Визначає значення часу життя, яке слід використовувати для вихідних пакетів."
 
-#: ../clients/common/settings-docs.h.in:393
+#: ../clients/common/settings-docs.h.in:388
 msgid ""
 "If specified, this connection will only apply to the WiMAX device whose MAC "
 "address matches. This property does not change the MAC address of the device "
@@ -9956,7 +9528,7 @@ msgstr ""
 "відповідною адресою MAC. Ця властивість не змінює MAC-адреси пристрою (таку "
 "зміну називають підміною MAC). Застаріле: 1"
 
-#: ../clients/common/settings-docs.h.in:395
+#: ../clients/common/settings-docs.h.in:390
 msgid ""
 "Network Service Provider (NSP) name of the WiMAX network this connection "
 "should use. Deprecated: 1"
@@ -9964,44 +9536,21 @@ msgstr ""
 "Назва надавача мережевих послуг (NSP) для мережі WiMAX, яку має "
 "використовувати це з’єднання. Застаріле: 1"
 
-#: ../clients/common/settings-docs.h.in:396
-#| msgid ""
-#| "If specified, this connection will only apply to the Ethernet device "
-#| "whose permanent MAC address matches. This property does not change the "
-#| "MAC address of the device (i.e. MAC spoofing)."
-msgid ""
-"If specified, this connection will only apply to the IEEE 802.15.4 (WPAN) "
-"MAC layer device whose permanent MAC address matches."
-msgstr ""
-"Якщо вказано, це з’єднання застосовуватиметься лише до пристрою шару MAC IEEE"
-" 802.15.4 (WPAN) із "
-"відповідною сталою адресою MAC."
-
-#: ../clients/common/settings-docs.h.in:398
-msgid "IEEE 802.15.4 Personal Area Network (PAN) identifier."
-msgstr "Ідентифікатор Personal Area Network (PAN) IEEE 802.15.4."
-
-#: ../clients/common/settings-docs.h.in:399
-msgid "Short IEEE 802.15.4 address to be used within a restricted environment."
-msgstr ""
-"Коротка адреса IEEE 802.15.4, яку слід використовувати у обмеженому"
-" середовищі."
-
-#: ../clients/nm-online.c:90
+#: ../clients/nm-online.c:89
 msgid "Connecting"
 msgstr "Встановлюється з’єднання"
 
-#: ../clients/nm-online.c:206
+#: ../clients/nm-online.c:187
 #, c-format
 msgid "Error: timeout creating NMClient object\n"
 msgstr "Помилка: перевищення часу очікування на створення об’єкта NMClient\n"
 
-#: ../clients/nm-online.c:226
+#: ../clients/nm-online.c:207
 #, c-format
 msgid "Error: Could not create NMClient object: %s\n"
 msgstr "Помилка: не вдалося створити об’єкт NMClient: %s\n"
 
-#: ../clients/nm-online.c:252
+#: ../clients/nm-online.c:233
 msgid ""
 "Time to wait for a connection, in seconds (without the option, default value "
 "is 30)"
@@ -10009,34 +9558,34 @@ msgstr ""
 "Час очікування на з’єднання, у секундах (без цього параметра типовим "
 "значенням є 30)"
 
-#: ../clients/nm-online.c:253
+#: ../clients/nm-online.c:234
 msgid "Exit immediately if NetworkManager is not running or connecting"
 msgstr ""
 "Негайно завершити роботу, якщо NetworkManager не запущено або виконується "
 "спроба з’єднання"
 
-#: ../clients/nm-online.c:254
+#: ../clients/nm-online.c:235
 msgid "Don't print anything"
 msgstr "Нічого не виводити"
 
-#: ../clients/nm-online.c:255
+#: ../clients/nm-online.c:236
 msgid "Wait for NetworkManager startup instead of a connection"
 msgstr "Чекати на запуск NetworkManager, а не на з’єднання"
 
-#: ../clients/nm-online.c:275
+#: ../clients/nm-online.c:256
 msgid ""
 "Waits for NetworkManager to finish activating startup network connections."
 msgstr ""
 "Очікує на завершення активації NetworkManager з’єднань, які слід активувати "
 "під час запуску."
 
-#: ../clients/nm-online.c:282 ../clients/nm-online.c:288
+#: ../clients/nm-online.c:263 ../clients/nm-online.c:269
 msgid "Invalid option.  Please use --help to see a list of valid options."
 msgstr ""
 "Некоректний параметр. Щоб ознайомитися зі списком параметрів, скористайтеся "
 "параметром --help."
 
-#: ../clients/tui/newt/nmt-newt-utils.c:177 ../clients/tui/nmt-editor.c:429
+#: ../clients/tui/newt/nmt-newt-utils.c:177 ../clients/tui/nmt-editor.c:430
 #: ../clients/tui/nmt-password-dialog.c:174
 #: ../clients/tui/nmt-route-editor.c:122 ../clients/tui/nmtui-hostname.c:69
 #: ../clients/tui/nmtui.c:134
@@ -10059,7 +9608,7 @@ msgstr "Помилка редактора: %s"
 msgid "Could not re-read file: %s"
 msgstr "Не вдалося повторно прочитати файл: %s"
 
-#: ../clients/tui/nm-editor-utils.c:144 ../libnm-glib/nm-device.c:1820
+#: ../clients/tui/nm-editor-utils.c:144 ../libnm-glib/nm-device.c:1821
 #: ../libnm/nm-device.c:1305
 msgid "Ethernet"
 msgstr "Ethernet"
@@ -10069,7 +9618,7 @@ msgstr "Ethernet"
 msgid "Ethernet connection %d"
 msgstr "З’єднання Ethernet %d"
 
-#: ../clients/tui/nm-editor-utils.c:152 ../libnm-glib/nm-device.c:1822
+#: ../clients/tui/nm-editor-utils.c:152 ../libnm-glib/nm-device.c:1823
 #: ../libnm/nm-device.c:1307
 msgid "Wi-Fi"
 msgstr "Wi-Fi"
@@ -10079,8 +9628,8 @@ msgstr "Wi-Fi"
 msgid "Wi-Fi connection %d"
 msgstr "З’єднання Wi-Fi %d"
 
-#: ../clients/tui/nm-editor-utils.c:161 ../libnm-core/nm-connection.c:2173
-#: ../libnm-glib/nm-device.c:1832 ../libnm/nm-device.c:1323
+#: ../clients/tui/nm-editor-utils.c:161 ../libnm-core/nm-connection.c:2106
+#: ../libnm-glib/nm-device.c:1833 ../libnm/nm-device.c:1323
 msgid "InfiniBand"
 msgstr "InfiniBand"
 
@@ -10089,7 +9638,7 @@ msgstr "InfiniBand"
 msgid "InfiniBand connection %d"
 msgstr "З’єднання InfiniBand %d"
 
-#: ../clients/tui/nm-editor-utils.c:170 ../libnm-glib/nm-device.c:1830
+#: ../clients/tui/nm-editor-utils.c:170 ../libnm-glib/nm-device.c:1831
 #: ../libnm/nm-device.c:1321
 msgid "Mobile Broadband"
 msgstr "Мобільна радіомережа"
@@ -10108,10 +9657,10 @@ msgstr "DSL"
 msgid "DSL connection %d"
 msgstr "З’єднання DSL %d"
 
-#: ../clients/tui/nm-editor-utils.c:188 ../libnm-core/nm-connection.c:2165
-#: ../libnm-glib/nm-device.c:1834 ../libnm-util/nm-connection.c:1623
+#: ../clients/tui/nm-editor-utils.c:188 ../libnm-core/nm-connection.c:2098
+#: ../libnm-glib/nm-device.c:1835 ../libnm-util/nm-connection.c:1626
 #: ../libnm/nm-device.c:1325
-#: ../src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-reader.c:4594
+#: ../src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-reader.c:4581
 msgid "Bond"
 msgstr "Прив’язка"
 
@@ -10120,10 +9669,10 @@ msgstr "Прив’язка"
 msgid "Bond connection %d"
 msgstr "Прив’язане з’єднання %d"
 
-#: ../clients/tui/nm-editor-utils.c:197 ../libnm-core/nm-connection.c:2169
-#: ../libnm-glib/nm-device.c:1838 ../libnm-util/nm-connection.c:1627
+#: ../clients/tui/nm-editor-utils.c:197 ../libnm-core/nm-connection.c:2102
+#: ../libnm-glib/nm-device.c:1839 ../libnm-util/nm-connection.c:1630
 #: ../libnm/nm-device.c:1329
-#: ../src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-reader.c:4930
+#: ../src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-reader.c:4917
 msgid "Bridge"
 msgstr "Місток"
 
@@ -10132,10 +9681,10 @@ msgstr "Місток"
 msgid "Bridge connection %d"
 msgstr "З’єднання містка %d"
 
-#: ../clients/tui/nm-editor-utils.c:206 ../libnm-core/nm-connection.c:2167
-#: ../libnm-glib/nm-device.c:1836 ../libnm-util/nm-connection.c:1625
+#: ../clients/tui/nm-editor-utils.c:206 ../libnm-core/nm-connection.c:2100
+#: ../libnm-glib/nm-device.c:1837 ../libnm-util/nm-connection.c:1628
 #: ../libnm/nm-device.c:1327
-#: ../src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-reader.c:4697
+#: ../src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-reader.c:4684
 msgid "Team"
 msgstr "Команда"
 
@@ -10145,8 +9694,8 @@ msgid "Team connection %d"
 msgstr "Командне з’єднання %d"
 
 #: ../clients/tui/nm-editor-utils.c:215 ../clients/tui/nmt-page-vlan.c:82
-#: ../libnm-core/nm-connection.c:2171 ../libnm-glib/nm-device.c:1840
-#: ../libnm-util/nm-connection.c:1629 ../libnm/nm-device.c:1331
+#: ../libnm-core/nm-connection.c:2104 ../libnm-glib/nm-device.c:1841
+#: ../libnm-util/nm-connection.c:1632 ../libnm/nm-device.c:1331
 msgid "VLAN"
 msgstr "VLAN"
 
@@ -10210,38 +9759,38 @@ msgstr "Не вдалося створити редактор для некор
 msgid "Edit Connection"
 msgstr "Редагувати з’єднання"
 
-#: ../clients/tui/nmt-editor.c:173
+#: ../clients/tui/nmt-editor.c:174
 #, c-format
 msgid "Unable to save connection: %s"
 msgstr "Не вдалося зберегти запис з’єднання: %s"
 
-#: ../clients/tui/nmt-editor.c:187
+#: ../clients/tui/nmt-editor.c:188
 #, c-format
 msgid "Unable to add new connection: %s"
 msgstr "Не вдалося додати нове з’єднання: %s"
 
-#: ../clients/tui/nmt-editor.c:332
+#: ../clients/tui/nmt-editor.c:333
 msgid "Profile name"
 msgstr "Назва профілю"
 
-#: ../clients/tui/nmt-editor.c:343
+#: ../clients/tui/nmt-editor.c:344
 msgid "Ethernet device"
 msgstr "Пристрій Ethernet"
 
-#: ../clients/tui/nmt-editor.c:345
+#: ../clients/tui/nmt-editor.c:346
 msgid "Device"
 msgstr "Пристрій"
 
 #. And finally the bottom widgets
-#: ../clients/tui/nmt-editor.c:405
+#: ../clients/tui/nmt-editor.c:406
 msgid "Automatically connect"
 msgstr "З’єднуватись автоматично"
 
-#: ../clients/tui/nmt-editor.c:411
+#: ../clients/tui/nmt-editor.c:412
 msgid "Available to all users"
 msgstr "Доступне усім користувачам"
 
-#: ../clients/tui/nmt-editor.c:426 ../clients/tui/nmt-password-dialog.c:171
+#: ../clients/tui/nmt-editor.c:427 ../clients/tui/nmt-password-dialog.c:171
 #: ../clients/tui/nmt-route-editor.c:115 ../clients/tui/nmtui-edit.c:220
 #: ../clients/tui/nmtui-edit.c:528 ../clients/tui/nmtui-hostname.c:67
 msgid "Cancel"
@@ -10955,86 +10504,86 @@ msgstr "Не вдалося зв’язатися із NetworkManager: %s.\n"
 msgid "NetworkManager is not running."
 msgstr "NetworkManager не запущено."
 
-#: ../libnm-core/crypto.c:118 ../libnm-util/crypto.c:130
+#: ../libnm-core/crypto.c:118 ../libnm-util/crypto.c:131
 #, c-format
 msgid "PEM key file had no end tag '%s'."
 msgstr "У файлі ключа PEM не міститься завершального теґу «%s»."
 
-#: ../libnm-core/crypto.c:131 ../libnm-util/crypto.c:143
+#: ../libnm-core/crypto.c:131 ../libnm-util/crypto.c:144
 #, c-format
 msgid "Doesn't look like a PEM private key file."
 msgstr "Ймовірно, цей файл не є файлом закритого ключа PEM."
 
-#: ../libnm-core/crypto.c:148 ../libnm-util/crypto.c:160
+#: ../libnm-core/crypto.c:148 ../libnm-util/crypto.c:161
 #, c-format
 msgid "Malformed PEM file: Proc-Type was not first tag."
 msgstr "Помилкове форматування PEM: Proc-Type не є першим теґом."
 
-#: ../libnm-core/crypto.c:156 ../libnm-util/crypto.c:168
+#: ../libnm-core/crypto.c:156 ../libnm-util/crypto.c:169
 #, c-format
 msgid "Malformed PEM file: unknown Proc-Type tag '%s'."
 msgstr "Помилкове форматування PEM: невідомий теґ Proc-Type «%s»."
 
-#: ../libnm-core/crypto.c:166 ../libnm-util/crypto.c:178
+#: ../libnm-core/crypto.c:166 ../libnm-util/crypto.c:179
 #, c-format
 msgid "Malformed PEM file: DEK-Info was not the second tag."
 msgstr "Помилкове форматування PEM: DEK-Info не є другим теґом."
 
-#: ../libnm-core/crypto.c:177 ../libnm-util/crypto.c:189
+#: ../libnm-core/crypto.c:177 ../libnm-util/crypto.c:190
 #, c-format
 msgid "Malformed PEM file: no IV found in DEK-Info tag."
 msgstr "Помилкове форматування файла PEM: не знайдено теґу DEK-Info у ВІ."
 
-#: ../libnm-core/crypto.c:184 ../libnm-util/crypto.c:196
+#: ../libnm-core/crypto.c:184 ../libnm-util/crypto.c:197
 #, c-format
 msgid "Malformed PEM file: invalid format of IV in DEK-Info tag."
 msgstr ""
 "Помилкове форматування файла PEM: некоректне форматування ВІ у тезі DEK-Info."
 
-#: ../libnm-core/crypto.c:199 ../libnm-util/crypto.c:211
+#: ../libnm-core/crypto.c:199 ../libnm-util/crypto.c:212
 #, c-format
 msgid "Malformed PEM file: unknown private key cipher '%s'."
 msgstr ""
 "Помилкове форматування файла PEM: невідоме шифрування закритого ключа «%s»."
 
-#: ../libnm-core/crypto.c:218 ../libnm-util/crypto.c:230
+#: ../libnm-core/crypto.c:218 ../libnm-util/crypto.c:231
 #, c-format
 msgid "Could not decode private key."
 msgstr "Не вдалося декодувати закритий ключ."
 
-#: ../libnm-core/crypto.c:272 ../libnm-util/crypto.c:282
+#: ../libnm-core/crypto.c:272 ../libnm-util/crypto.c:283
 msgid "Failed to find expected PKCS#8 start tag."
 msgstr "Не вдалося знайти очікуваний початковий теґ PKCS#8."
 
-#: ../libnm-core/crypto.c:280 ../libnm-util/crypto.c:290
+#: ../libnm-core/crypto.c:280 ../libnm-util/crypto.c:291
 #, c-format
 msgid "Failed to find expected PKCS#8 end tag '%s'."
 msgstr "Не вдалося знайти очікуваний завершальний теґ PKCS#8 «%s»."
 
-#: ../libnm-core/crypto.c:299 ../libnm-util/crypto.c:309
+#: ../libnm-core/crypto.c:299 ../libnm-util/crypto.c:310
 msgid "Failed to decode PKCS#8 private key."
 msgstr "Не вдалося декодувати закритий ключ PKCS#8."
 
-#: ../libnm-core/crypto.c:341 ../libnm-util/crypto.c:351
+#: ../libnm-core/crypto.c:341 ../libnm-util/crypto.c:352
 #, c-format
 msgid "IV must be an even number of bytes in length."
 msgstr "Довжина ВІ має дорівнювати парній кількості байтів."
 
-#: ../libnm-core/crypto.c:355 ../libnm-util/crypto.c:365
+#: ../libnm-core/crypto.c:355 ../libnm-util/crypto.c:366
 #, c-format
 msgid "IV contains non-hexadecimal digits."
 msgstr "ВІ містить не шістнадцяткові цифри."
 
 #: ../libnm-core/crypto.c:395 ../libnm-core/crypto_gnutls.c:91
 #: ../libnm-core/crypto_gnutls.c:197 ../libnm-core/crypto_nss.c:112
-#: ../libnm-core/crypto_nss.c:277 ../libnm-util/crypto.c:405
-#: ../libnm-util/crypto_gnutls.c:151 ../libnm-util/crypto_gnutls.c:253
+#: ../libnm-core/crypto_nss.c:277 ../libnm-util/crypto.c:406
+#: ../libnm-util/crypto_gnutls.c:151 ../libnm-util/crypto_gnutls.c:256
 #: ../libnm-util/crypto_nss.c:162 ../libnm-util/crypto_nss.c:323
 #, c-format
 msgid "Private key cipher '%s' was unknown."
 msgstr "Невідоме шифрування закритого ключа «%s»."
 
-#: ../libnm-core/crypto.c:494 ../libnm-util/crypto.c:515
+#: ../libnm-core/crypto.c:494 ../libnm-util/crypto.c:516
 #, c-format
 msgid "Unable to determine private key type."
 msgstr "Не вдалося визначити тип закритого ключа."
@@ -11044,17 +10593,17 @@ msgstr "Не вдалося визначити тип закритого клю
 msgid "Password provided, but key was not encrypted."
 msgstr "Надано пароль, але ключ не зашифровано."
 
-#: ../libnm-core/crypto.c:555 ../libnm-util/crypto.c:570
+#: ../libnm-core/crypto.c:555 ../libnm-util/crypto.c:571
 #, c-format
 msgid "PEM certificate had no start tag '%s'."
 msgstr "Сертифікат PEM не містить початкового теґу «%s»."
 
-#: ../libnm-core/crypto.c:564 ../libnm-util/crypto.c:579
+#: ../libnm-core/crypto.c:564 ../libnm-util/crypto.c:580
 #, c-format
 msgid "PEM certificate had no end tag '%s'."
 msgstr "Сертифікат PEM не містить завершального теґу «%s»."
 
-#: ../libnm-core/crypto.c:582 ../libnm-util/crypto.c:597
+#: ../libnm-core/crypto.c:582 ../libnm-util/crypto.c:598
 #, c-format
 msgid "Failed to decode certificate."
 msgstr "Не вдалося декодувати сертифікат."
@@ -11090,47 +10639,47 @@ msgstr "Не вдалося розшифрувати закритий ключ:
 msgid "Failed to decrypt the private key."
 msgstr "Не вдалося розшифрувати закритий ключ."
 
-#: ../libnm-core/crypto_gnutls.c:224 ../libnm-util/crypto_gnutls.c:280
+#: ../libnm-core/crypto_gnutls.c:224 ../libnm-util/crypto_gnutls.c:283
 #, c-format
 msgid "Failed to initialize the encryption cipher context: %s (%s)"
 msgstr "Не вдалося ініціалізувати контекст шифру кодування: %s (%s)."
 
-#: ../libnm-core/crypto_gnutls.c:233 ../libnm-util/crypto_gnutls.c:289
+#: ../libnm-core/crypto_gnutls.c:233 ../libnm-util/crypto_gnutls.c:292
 #, c-format
 msgid "Failed to encrypt the data: %s (%s)"
 msgstr "Не вдалося зашифрувати дані: %s (%s)."
 
-#: ../libnm-core/crypto_gnutls.c:276 ../libnm-util/crypto_gnutls.c:329
+#: ../libnm-core/crypto_gnutls.c:276 ../libnm-util/crypto_gnutls.c:332
 #, c-format
 msgid "Error initializing certificate data: %s"
 msgstr "Помилка під час спроби ініціалізації даних сертифіката: %s"
 
-#: ../libnm-core/crypto_gnutls.c:298 ../libnm-util/crypto_gnutls.c:351
+#: ../libnm-core/crypto_gnutls.c:298 ../libnm-util/crypto_gnutls.c:354
 #, c-format
 msgid "Couldn't decode certificate: %s"
 msgstr "Не вдалося декодувати сертифікат: %s"
 
-#: ../libnm-core/crypto_gnutls.c:326 ../libnm-util/crypto_gnutls.c:375
+#: ../libnm-core/crypto_gnutls.c:326 ../libnm-util/crypto_gnutls.c:378
 #, c-format
 msgid "Couldn't initialize PKCS#12 decoder: %s"
 msgstr "Не вдалося ініціалізувати інструмент розшифрування PKCS#12: %s"
 
-#: ../libnm-core/crypto_gnutls.c:339 ../libnm-util/crypto_gnutls.c:388
+#: ../libnm-core/crypto_gnutls.c:339 ../libnm-util/crypto_gnutls.c:391
 #, c-format
 msgid "Couldn't decode PKCS#12 file: %s"
 msgstr "Не вдалося розшифрувати файл PKCS#12: %s"
 
-#: ../libnm-core/crypto_gnutls.c:351 ../libnm-util/crypto_gnutls.c:400
+#: ../libnm-core/crypto_gnutls.c:351 ../libnm-util/crypto_gnutls.c:403
 #, c-format
 msgid "Couldn't verify PKCS#12 file: %s"
 msgstr "Не вдалося перевірити файл PKCS#12: %s"
 
-#: ../libnm-core/crypto_gnutls.c:383 ../libnm-util/crypto_gnutls.c:428
+#: ../libnm-core/crypto_gnutls.c:383 ../libnm-util/crypto_gnutls.c:431
 #, c-format
 msgid "Couldn't initialize PKCS#8 decoder: %s"
 msgstr "Не вдалося ініціалізувати інструмент розшифрування PKCS#8: %s"
 
-#: ../libnm-core/crypto_gnutls.c:406 ../libnm-util/crypto_gnutls.c:451
+#: ../libnm-core/crypto_gnutls.c:406 ../libnm-util/crypto_gnutls.c:454
 #, c-format
 msgid "Couldn't decode PKCS#8 file: %s"
 msgstr "Не вдалося розшифрувати файл PKCS#8: %s"
@@ -11252,40 +10801,38 @@ msgstr "невідома назва параметра"
 msgid "duplicate setting name"
 msgstr "дублювання назви параметра"
 
-#: ../libnm-core/nm-connection.c:1259
+#: ../libnm-core/nm-connection.c:1233
 msgid "setting not found"
 msgstr "параметра не знайдено"
 
-#: ../libnm-core/nm-connection.c:1325 ../libnm-core/nm-connection.c:1350
-#: ../libnm-core/nm-connection.c:1375
-msgid "setting is required for non-slave connections"
-msgstr "для непідлеглих з’єднань потрібен параметр"
-
-#: ../libnm-core/nm-connection.c:1338 ../libnm-core/nm-connection.c:1363
-#: ../libnm-core/nm-connection.c:1388
+#: ../libnm-core/nm-connection.c:1300
 msgid "setting not allowed in slave connection"
 msgstr "параметр не можна використовувати у підлеглому з’єднанні"
 
-#: ../libnm-core/nm-connection.c:1478
+#: ../libnm-core/nm-connection.c:1316
+msgid "setting is required for non-slave connections"
+msgstr "для непідлеглих з’єднань потрібен параметр"
+
+#: ../libnm-core/nm-connection.c:1412
 msgid "Unexpected failure to verify the connection"
 msgstr "Неочікувана помилка під час спроби перевірити з’єднання"
 
-#: ../libnm-core/nm-connection.c:1520
+#: ../libnm-core/nm-connection.c:1454
 msgid "Unexpected failure to normalize the connection"
 msgstr "Неочікувана помилка під час спроби нормалізувати з’єднання"
 
-#: ../libnm-core/nm-connection.c:2031 ../libnm-core/nm-setting-8021x.c:2869
-#: ../libnm-core/nm-setting-8021x.c:2886 ../libnm-core/nm-setting-8021x.c:2917
-#: ../libnm-core/nm-setting-8021x.c:2934 ../libnm-core/nm-setting-8021x.c:2976
-#: ../libnm-core/nm-setting-8021x.c:2988 ../libnm-core/nm-setting-8021x.c:3006
-#: ../libnm-core/nm-setting-8021x.c:3018 ../libnm-core/nm-setting-8021x.c:3042
-#: ../libnm-core/nm-setting-8021x.c:3221 ../libnm-core/nm-setting-adsl.c:189
+#: ../libnm-core/nm-connection.c:1965 ../libnm-core/nm-setting-8021x.c:2870
+#: ../libnm-core/nm-setting-8021x.c:2887 ../libnm-core/nm-setting-8021x.c:2918
+#: ../libnm-core/nm-setting-8021x.c:2935 ../libnm-core/nm-setting-8021x.c:2977
+#: ../libnm-core/nm-setting-8021x.c:2989 ../libnm-core/nm-setting-8021x.c:3007
+#: ../libnm-core/nm-setting-8021x.c:3019 ../libnm-core/nm-setting-8021x.c:3043
+#: ../libnm-core/nm-setting-8021x.c:3224 ../libnm-core/nm-setting-adsl.c:189
 #: ../libnm-core/nm-setting-bluetooth.c:138
 #: ../libnm-core/nm-setting-bluetooth.c:196
 #: ../libnm-core/nm-setting-bluetooth.c:210 ../libnm-core/nm-setting-cdma.c:159
-#: ../libnm-core/nm-setting-connection.c:912
-#: ../libnm-core/nm-setting-connection.c:955
-#: ../libnm-core/nm-setting-connection.c:1095
+#: ../libnm-core/nm-setting-connection.c:913
+#: ../libnm-core/nm-setting-connection.c:956
+#: ../libnm-core/nm-setting-connection.c:1096
 #: ../libnm-core/nm-setting-ip-config.c:2484
 #: ../libnm-core/nm-setting-ip-tunnel.c:373
 #: ../libnm-core/nm-setting-olpc-mesh.c:120
@@ -11293,231 +10840,217 @@ msgstr "Неочікувана помилка під час спроби нор
 #: ../libnm-core/nm-setting-vpn.c:489 ../libnm-core/nm-setting-vxlan.c:360
 #: ../libnm-core/nm-setting-wimax.c:126
 #: ../libnm-core/nm-setting-wireless-security.c:920
-#: ../libnm-core/nm-setting-wireless.c:752 ../libnm-util/nm-setting.c:1355
-#: ../libnm-util/nm-setting.c:1374 ../libnm-util/nm-setting.c:1392
-#: ../libnm-util/nm-setting-8021x.c:2324 ../libnm-util/nm-setting-8021x.c:2341
-#: ../libnm-util/nm-setting-8021x.c:2382 ../libnm-util/nm-setting-8021x.c:2399
-#: ../libnm-util/nm-setting-8021x.c:2451 ../libnm-util/nm-setting-8021x.c:2463
-#: ../libnm-util/nm-setting-8021x.c:2481 ../libnm-util/nm-setting-8021x.c:2493
-#: ../libnm-util/nm-setting-8021x.c:2517 ../libnm-util/nm-setting-8021x.c:2677
-#: ../libnm-util/nm-setting-adsl.c:209 ../libnm-util/nm-setting-bluetooth.c:141
-#: ../libnm-util/nm-setting-bluetooth.c:159 ../libnm-util/nm-setting-cdma.c:161
-#: ../libnm-util/nm-setting-connection.c:765
-#: ../libnm-util/nm-setting-connection.c:781
-#: ../libnm-util/nm-setting-connection.c:842
+#: ../libnm-core/nm-setting-wireless.c:750 ../libnm-util/nm-setting.c:1356
+#: ../libnm-util/nm-setting.c:1375 ../libnm-util/nm-setting.c:1393
+#: ../libnm-util/nm-setting-8021x.c:2325 ../libnm-util/nm-setting-8021x.c:2342
+#: ../libnm-util/nm-setting-8021x.c:2383 ../libnm-util/nm-setting-8021x.c:2400
+#: ../libnm-util/nm-setting-8021x.c:2452 ../libnm-util/nm-setting-8021x.c:2464
+#: ../libnm-util/nm-setting-8021x.c:2482 ../libnm-util/nm-setting-8021x.c:2494
+#: ../libnm-util/nm-setting-8021x.c:2518 ../libnm-util/nm-setting-8021x.c:2680
+#: ../libnm-util/nm-setting-adsl.c:209 ../libnm-util/nm-setting-bluetooth.c:142
+#: ../libnm-util/nm-setting-bluetooth.c:160 ../libnm-util/nm-setting-cdma.c:162
+#: ../libnm-util/nm-setting-connection.c:768
+#: ../libnm-util/nm-setting-connection.c:784
+#: ../libnm-util/nm-setting-connection.c:845
 #: ../libnm-util/nm-setting-ip4-config.c:869
-#: ../libnm-util/nm-setting-ip6-config.c:831
-#: ../libnm-util/nm-setting-ip6-config.c:897
+#: ../libnm-util/nm-setting-ip6-config.c:833
+#: ../libnm-util/nm-setting-ip6-config.c:899
 #: ../libnm-util/nm-setting-olpc-mesh.c:123
-#: ../libnm-util/nm-setting-pppoe.c:162 ../libnm-util/nm-setting-vpn.c:422
-#: ../libnm-util/nm-setting-wimax.c:149
-#: ../libnm-util/nm-setting-wireless-security.c:890
-#: ../libnm-util/nm-setting-wireless.c:768
+#: ../libnm-util/nm-setting-pppoe.c:163 ../libnm-util/nm-setting-vpn.c:423
+#: ../libnm-util/nm-setting-wimax.c:150
+#: ../libnm-util/nm-setting-wireless-security.c:891
+#: ../libnm-util/nm-setting-wireless.c:769
 msgid "property is missing"
 msgstr "не вказано властивості"
 
-#: ../libnm-core/nm-connection.c:2176
+#: ../libnm-core/nm-connection.c:2109
 msgid "IP Tunnel"
 msgstr "IP-тунель"
 
-#: ../libnm-core/nm-dbus-utils.c:189
+#: ../libnm-core/nm-dbus-utils.c:188
 #, c-format
 msgid "Method returned type '%s', but expected '%s'"
 msgstr "Методом повернуто тип «%s», хоча мав бути «%s»"
 
-#: ../libnm-core/nm-keyfile.c:156
+#: ../libnm-core/nm-keyfile-reader.c:144
 msgid "ignoring missing number"
 msgstr "ігноруємо пропущене число"
 
-#: ../libnm-core/nm-keyfile.c:164
+#: ../libnm-core/nm-keyfile-reader.c:152
 #, c-format
 msgid "ignoring invalid number '%s'"
 msgstr "ігноруємо некоректне число «%s»"
 
-#: ../libnm-core/nm-keyfile.c:185
+#: ../libnm-core/nm-keyfile-reader.c:173
 #, c-format
 msgid "ignoring invalid %s address: %s"
 msgstr "ігноруємо некоректну адресу %s: %s"
 
-#: ../libnm-core/nm-keyfile.c:227
+#: ../libnm-core/nm-keyfile-reader.c:215
 #, c-format
 msgid "ignoring invalid gateway '%s' for %s route"
 msgstr "ігноруємо некоректний шлюз «%s» для маршруту %s"
 
-#: ../libnm-core/nm-keyfile.c:248
+#: ../libnm-core/nm-keyfile-reader.c:236
 #, c-format
 msgid "ignoring invalid %s route: %s"
 msgstr "ігноруємо некоректний маршрут %s: %s"
 
-#: ../libnm-core/nm-keyfile.c:373
+#: ../libnm-core/nm-keyfile-reader.c:362
 #, c-format
 msgid "unexpected character '%c' for address %s: '%s' (position %td)"
 msgstr "неочікуваний символ «%c» для адреси %s: «%s» (позиція %td)"
 
-#: ../libnm-core/nm-keyfile.c:383
+#: ../libnm-core/nm-keyfile-reader.c:372
 #, c-format
 msgid "unexpected character '%c' for %s: '%s' (position %td)"
 msgstr "неочікуваний символ «%c» для %s: «%s» (позиція %td)"
 
-#: ../libnm-core/nm-keyfile.c:392
+#: ../libnm-core/nm-keyfile-reader.c:381
 #, c-format
 msgid "unexpected character '%c' in prefix length for %s: '%s' (position %td)"
 msgstr "неочікуваний символ «%c» у префіксі довжини для %s: «%s» (позиція %td)"
 
-#: ../libnm-core/nm-keyfile.c:403
+#: ../libnm-core/nm-keyfile-reader.c:392
 #, c-format
 msgid "garbage at the end of value %s: '%s'"
 msgstr "зайві дані наприкінці значення %s: «%s»"
 
-#: ../libnm-core/nm-keyfile.c:409
+#: ../libnm-core/nm-keyfile-reader.c:398
 #, c-format
 msgid "deprecated semicolon at the end of value %s: '%s'"
 msgstr "застаріла крапка з комою наприкінці значення %s: «%s»"
 
-#: ../libnm-core/nm-keyfile.c:424
+#: ../libnm-core/nm-keyfile-reader.c:413
 #, c-format
 msgid "invalid prefix length for %s '%s', defaulting to %d"
 msgstr "некоректний префікс довжини для %s «%s», повертаємося до типового, %d"
 
-#: ../libnm-core/nm-keyfile.c:431
+#: ../libnm-core/nm-keyfile-reader.c:420
 #, c-format
 msgid "missing prefix length for %s '%s', defaulting to %d"
 msgstr "пропущено префікс довжини для %s «%s», повертаємося до типового, %d"
 
-#: ../libnm-core/nm-keyfile.c:695
+#: ../libnm-core/nm-keyfile-reader.c:554
 #, c-format
-#| msgid "ignoring invalid DNS server IPv4 address '%s'"
-msgid "ignoring invalid DNS server IPv%c address '%s'"
-msgstr "ігноруємо некоректну адресу IPv%c сервера DNS «%s»"
+msgid "ignoring invalid DNS server IPv4 address '%s'"
+msgstr "ігноруємо некоректну адресу IPv4 сервера DNS «%s»"
 
-#: ../libnm-core/nm-keyfile.c:791 ../libnm-core/nm-keyfile.c:2542
+#: ../libnm-core/nm-keyfile-reader.c:593
+#, c-format
+msgid "ignoring invalid DNS server IPv6 address '%s'"
+msgstr "ігноруємо некоректну адресу IPv6 сервера DNS «%s»"
+
+#: ../libnm-core/nm-keyfile-reader.c:687 ../libnm-core/nm-keyfile-reader.c:1697
 #, c-format
 msgid "ignoring invalid byte element '%d' (not between 0 and 255 inclusive)"
 msgstr ""
 "ігноруємо некоректний байтовий елемент «%d» (не у діапазоні від 0 до 255, "
 "включно)"
 
-#: ../libnm-core/nm-keyfile.c:802
+#: ../libnm-core/nm-keyfile-reader.c:698
 msgid "ignoring invalid MAC address"
 msgstr "ігноруємо некоректну MAC-адресу"
 
-#: ../libnm-core/nm-keyfile.c:1039
+#: ../libnm-core/nm-keyfile-reader.c:935
 msgid "ignoring invalid SSID"
 msgstr "ігноруємо некоректний SSID"
 
-#: ../libnm-core/nm-keyfile.c:1055
+#: ../libnm-core/nm-keyfile-reader.c:951
 msgid "ignoring invalid raw password"
 msgstr "ігноруємо некоректний необроблений пароль"
 
-#: ../libnm-core/nm-keyfile.c:1193
+#: ../libnm-core/nm-keyfile-reader.c:1095
 msgid "invalid key/cert value"
 msgstr "некоректне значення ключа/сертифіката"
 
-#: ../libnm-core/nm-keyfile.c:1204
+#: ../libnm-core/nm-keyfile-reader.c:1106
 #, c-format
 msgid "invalid key/cert value path \"%s\""
 msgstr "некоректний шлях до ключа/сертифіката, «%s»"
 
-#: ../libnm-core/nm-keyfile.c:1220 ../libnm-core/nm-keyfile.c:1303
+#: ../libnm-core/nm-keyfile-reader.c:1122
+#: ../libnm-core/nm-keyfile-reader.c:1205
 #, c-format
 msgid "certificate or key file '%s' does not exist"
 msgstr "файла сертифіката або ключа «%s» не існує"
 
-#: ../libnm-core/nm-keyfile.c:1229
+#: ../libnm-core/nm-keyfile-reader.c:1131
 #, c-format
 msgid "invalid PKCS#11 URI \"%s\""
 msgstr "некоректна адреса PKCS#11 «%s»"
 
-#: ../libnm-core/nm-keyfile.c:1273
+#: ../libnm-core/nm-keyfile-reader.c:1175
 msgid "invalid key/cert value data:;base64, is not base64"
 msgstr "некоректні дані значення ключа/сертифіката data:;base64, не є base64"
 
-#: ../libnm-core/nm-keyfile.c:1282
+#: ../libnm-core/nm-keyfile-reader.c:1184
 msgid "invalid key/cert value data:;base64,file://"
 msgstr "некоректне значення ключа/сертифіката data:;base64,file://"
 
-#: ../libnm-core/nm-keyfile.c:1315
+#: ../libnm-core/nm-keyfile-reader.c:1217
 msgid "invalid key/cert value is not a valid blob"
 msgstr ""
 "некоректне значення ключа/сертифіката, не є коректним значення «%s» не є "
 "коректним великим бінарним об’єктом"
 
-#: ../libnm-core/nm-keyfile.c:1365
+#: ../libnm-core/nm-keyfile-reader.c:1267
 #, c-format
 msgid "invalid parity value '%s'"
 msgstr "некоректне значення парності, «%s»"
 
-#: ../libnm-core/nm-keyfile.c:1383
+#: ../libnm-core/nm-keyfile-reader.c:1285
 #, c-format
 msgid "ignoring invalid team configuration: %s"
 msgstr "ігноруємо некоректне налаштування команди: %s"
 
-#: ../libnm-core/nm-keyfile.c:1426
+#: ../libnm-core/nm-keyfile-reader.c:1328
 #, c-format
+#| msgid "invalid IP address: %s"
 msgid "invalid qdisc: %s"
 msgstr "некоректний qdisc: %s"
 
-#: ../libnm-core/nm-keyfile.c:1474
+#: ../libnm-core/nm-keyfile-reader.c:1376
 #, c-format
+#| msgid "invalid prefix %s"
 msgid "invalid tfilter: %s"
 msgstr "некоректний tfilter: %s"
 
-#: ../libnm-core/nm-keyfile.c:2451
+#: ../libnm-core/nm-keyfile-reader.c:1598
 #, c-format
 msgid "error loading setting value: %s"
 msgstr "помилка під час завантаження значення параметра: %s"
 
-#: ../libnm-core/nm-keyfile.c:2476
+#: ../libnm-core/nm-keyfile-reader.c:1630
 #, c-format
 msgid "invalid negative value (%i)"
 msgstr "некоректне від’ємне значення (%i)"
 
-#: ../libnm-core/nm-keyfile.c:2497
+#: ../libnm-core/nm-keyfile-reader.c:1651
 #, c-format
 msgid "invalid char value (%i)"
 msgstr "некоректне символьне значення (%i)"
 
-#: ../libnm-core/nm-keyfile.c:2519
+#: ../libnm-core/nm-keyfile-reader.c:1674
 #, c-format
 msgid "invalid int64 value (%s)"
 msgstr "некоректне значення int64 (%s)"
 
-#: ../libnm-core/nm-keyfile.c:2578
+#: ../libnm-core/nm-keyfile-reader.c:1733
 #, c-format
 msgid "too large FLAGS property '%s' (%llu)"
 msgstr "надто велике значення властивості FLAGS «%s» (%llu)"
 
-#: ../libnm-core/nm-keyfile.c:2591
+#: ../libnm-core/nm-keyfile-reader.c:1746
 #, c-format
 msgid "unhandled setting property type '%s'"
 msgstr "непридатний до обробки тип властивості параметра «%s»"
 
-#: ../libnm-core/nm-keyfile.c:2620
+#: ../libnm-core/nm-keyfile-reader.c:1777
 #, c-format
 msgid "invalid setting name '%s'"
 msgstr "некоректна назва параметра, «%s»"
 
-#: ../libnm-core/nm-setting-6lowpan.c:106
-#, c-format
-#| msgid "parent not specified."
-msgid "property is not specified"
-msgstr "властивість не вказано"
-
-#: ../libnm-core/nm-setting-6lowpan.c:128 ../libnm-core/nm-setting-macsec.c:308
-#: ../libnm-core/nm-setting-vlan.c:634 ../libnm-util/nm-setting-vlan.c:556
-#, c-format
-msgid "'%s' value doesn't match '%s=%s'"
-msgstr "значення «%s» не відповідає «%s=%s»"
-
-#: ../libnm-core/nm-setting-6lowpan.c:139
-#: ../libnm-core/nm-setting-ip-tunnel.c:351
-#: ../libnm-core/nm-setting-macsec.c:319 ../libnm-core/nm-setting-macvlan.c:163
-#: ../libnm-core/nm-setting-vlan.c:645 ../libnm-core/nm-setting-vxlan.c:403
-#: ../libnm-util/nm-setting-vlan.c:567
-#, c-format
-msgid "'%s' is neither an UUID nor an interface name"
-msgstr "«%s» не є ні UUID, ні назвою інтерфейсу"
-
 #: ../libnm-core/nm-setting-8021x.c:436
 msgid "data missing"
 msgstr "пропущено дані"
@@ -11543,27 +11076,27 @@ msgid "CA certificate must be in X.509 format"
 msgstr "Форматом сертифіката CA має бути X.509"
 
 #: ../libnm-core/nm-setting-8021x.c:1158 ../libnm-core/nm-setting-8021x.c:1512
-#: ../libnm-core/nm-setting-8021x.c:1922 ../libnm-util/nm-setting-8021x.c:957
-#: ../libnm-util/nm-setting-8021x.c:1220 ../libnm-util/nm-setting-8021x.c:1542
+#: ../libnm-core/nm-setting-8021x.c:1923 ../libnm-util/nm-setting-8021x.c:957
+#: ../libnm-util/nm-setting-8021x.c:1220 ../libnm-util/nm-setting-8021x.c:1543
 msgid "invalid certificate format"
 msgstr "некоректний формат сертифіката"
 
-#: ../libnm-core/nm-setting-8021x.c:2274 ../libnm-util/nm-setting-8021x.c:1811
+#: ../libnm-core/nm-setting-8021x.c:2275 ../libnm-util/nm-setting-8021x.c:1812
 msgid "invalid private key"
 msgstr "некоректний закритий ключ"
 
-#: ../libnm-core/nm-setting-8021x.c:2616 ../libnm-util/nm-setting-8021x.c:2122
+#: ../libnm-core/nm-setting-8021x.c:2617 ../libnm-util/nm-setting-8021x.c:2123
 msgid "invalid phase2 private key"
 msgstr "некоректний закритий ключ фази 2"
 
-#: ../libnm-core/nm-setting-8021x.c:2876 ../libnm-core/nm-setting-8021x.c:2893
-#: ../libnm-core/nm-setting-8021x.c:2924 ../libnm-core/nm-setting-8021x.c:2941
-#: ../libnm-core/nm-setting-8021x.c:2982 ../libnm-core/nm-setting-8021x.c:2994
-#: ../libnm-core/nm-setting-8021x.c:3012 ../libnm-core/nm-setting-8021x.c:3024
-#: ../libnm-core/nm-setting-8021x.c:3049 ../libnm-core/nm-setting-adsl.c:196
+#: ../libnm-core/nm-setting-8021x.c:2877 ../libnm-core/nm-setting-8021x.c:2894
+#: ../libnm-core/nm-setting-8021x.c:2925 ../libnm-core/nm-setting-8021x.c:2942
+#: ../libnm-core/nm-setting-8021x.c:2983 ../libnm-core/nm-setting-8021x.c:2995
+#: ../libnm-core/nm-setting-8021x.c:3013 ../libnm-core/nm-setting-8021x.c:3025
+#: ../libnm-core/nm-setting-8021x.c:3050 ../libnm-core/nm-setting-adsl.c:196
 #: ../libnm-core/nm-setting-cdma.c:166 ../libnm-core/nm-setting-cdma.c:175
-#: ../libnm-core/nm-setting-connection.c:919
-#: ../libnm-core/nm-setting-connection.c:967 ../libnm-core/nm-setting-gsm.c:299
+#: ../libnm-core/nm-setting-connection.c:920
+#: ../libnm-core/nm-setting-connection.c:968 ../libnm-core/nm-setting-gsm.c:299
 #: ../libnm-core/nm-setting-gsm.c:356 ../libnm-core/nm-setting-gsm.c:393
 #: ../libnm-core/nm-setting-gsm.c:402 ../libnm-core/nm-setting-ip-config.c:2491
 #: ../libnm-core/nm-setting-ip4-config.c:198
@@ -11573,51 +11106,51 @@ msgstr "некоректний закритий ключ фази 2"
 #: ../libnm-core/nm-setting-wimax.c:135
 #: ../libnm-core/nm-setting-wireless-security.c:950
 #: ../libnm-core/nm-setting-wireless-security.c:974
-#: ../libnm-core/nm-setting.c:1116 ../libnm-util/nm-setting-8021x.c:2331
-#: ../libnm-util/nm-setting-8021x.c:2348 ../libnm-util/nm-setting-8021x.c:2389
-#: ../libnm-util/nm-setting-8021x.c:2406 ../libnm-util/nm-setting-8021x.c:2457
-#: ../libnm-util/nm-setting-8021x.c:2469 ../libnm-util/nm-setting-8021x.c:2487
-#: ../libnm-util/nm-setting-8021x.c:2499 ../libnm-util/nm-setting-8021x.c:2524
-#: ../libnm-util/nm-setting-adsl.c:216 ../libnm-util/nm-setting-cdma.c:168
-#: ../libnm-util/nm-setting-cdma.c:177
-#: ../libnm-util/nm-setting-connection.c:772
-#: ../libnm-util/nm-setting-connection.c:849 ../libnm-util/nm-setting-gsm.c:281
-#: ../libnm-util/nm-setting-gsm.c:338 ../libnm-util/nm-setting-ip4-config.c:934
+#: ../libnm-core/nm-setting.c:1117 ../libnm-util/nm-setting-8021x.c:2332
+#: ../libnm-util/nm-setting-8021x.c:2349 ../libnm-util/nm-setting-8021x.c:2390
+#: ../libnm-util/nm-setting-8021x.c:2407 ../libnm-util/nm-setting-8021x.c:2458
+#: ../libnm-util/nm-setting-8021x.c:2470 ../libnm-util/nm-setting-8021x.c:2488
+#: ../libnm-util/nm-setting-8021x.c:2500 ../libnm-util/nm-setting-8021x.c:2525
+#: ../libnm-util/nm-setting-adsl.c:216 ../libnm-util/nm-setting-cdma.c:169
+#: ../libnm-util/nm-setting-cdma.c:178
+#: ../libnm-util/nm-setting-connection.c:775
+#: ../libnm-util/nm-setting-connection.c:852 ../libnm-util/nm-setting-gsm.c:282
+#: ../libnm-util/nm-setting-gsm.c:339 ../libnm-util/nm-setting-ip4-config.c:934
 #: ../libnm-util/nm-setting-ip4-config.c:943
-#: ../libnm-util/nm-setting-pppoe.c:169 ../libnm-util/nm-setting-pppoe.c:178
-#: ../libnm-util/nm-setting-vpn.c:431 ../libnm-util/nm-setting-vpn.c:441
-#: ../libnm-util/nm-setting-wimax.c:158
-#: ../libnm-util/nm-setting-wireless-security.c:920
-#: ../libnm-util/nm-setting-wireless-security.c:944
+#: ../libnm-util/nm-setting-pppoe.c:170 ../libnm-util/nm-setting-pppoe.c:179
+#: ../libnm-util/nm-setting-vpn.c:432 ../libnm-util/nm-setting-vpn.c:442
+#: ../libnm-util/nm-setting-wimax.c:159
+#: ../libnm-util/nm-setting-wireless-security.c:921
+#: ../libnm-util/nm-setting-wireless-security.c:945
 msgid "property is empty"
 msgstr "властивість є порожньою"
 
-#: ../libnm-core/nm-setting-8021x.c:2906 ../libnm-core/nm-setting-8021x.c:2954
-#: ../libnm-util/nm-setting-8021x.c:2359 ../libnm-util/nm-setting-8021x.c:2371
-#: ../libnm-util/nm-setting-8021x.c:2417 ../libnm-util/nm-setting-8021x.c:2429
+#: ../libnm-core/nm-setting-8021x.c:2907 ../libnm-core/nm-setting-8021x.c:2955
+#: ../libnm-util/nm-setting-8021x.c:2360 ../libnm-util/nm-setting-8021x.c:2372
+#: ../libnm-util/nm-setting-8021x.c:2418 ../libnm-util/nm-setting-8021x.c:2430
 #, c-format
 msgid "has to match '%s' property for PKCS#12"
 msgstr "має відповідати властивості «%s» для PKCS#12"
 
-#: ../libnm-core/nm-setting-8021x.c:3183
+#: ../libnm-core/nm-setting-8021x.c:3186
 #, c-format
 msgid "certificate is invalid: %s"
 msgstr "некоректний сертифікат: %s"
 
-#: ../libnm-core/nm-setting-8021x.c:3193
+#: ../libnm-core/nm-setting-8021x.c:3196
 #, c-format
 msgid "password is not supported when certificate is not on a PKCS#11 token"
 msgstr ""
 "підтримки паролів не передбачено, якщо сертифікат не міститься у ключі "
 "PKCS#11"
 
-#: ../libnm-core/nm-setting-8021x.c:3230
+#: ../libnm-core/nm-setting-8021x.c:3233
 #: ../libnm-core/nm-setting-bluetooth.c:123
 #: ../libnm-core/nm-setting-infiniband.c:192
 #: ../libnm-core/nm-setting-infiniband.c:207
 #: ../libnm-core/nm-setting-ip4-config.c:189
-#: ../libnm-core/nm-setting-ip6-config.c:237
-#: ../libnm-core/nm-setting-ip6-config.c:248
+#: ../libnm-core/nm-setting-ip6-config.c:215
+#: ../libnm-core/nm-setting-ip6-config.c:226
 #: ../libnm-core/nm-setting-olpc-mesh.c:149
 #: ../libnm-core/nm-setting-wimax.c:144 ../libnm-core/nm-setting-wired.c:678
 #: ../libnm-core/nm-setting-wired.c:688
@@ -11630,46 +11163,45 @@ msgstr ""
 #: ../libnm-core/nm-setting-wireless-security.c:1105
 #: ../libnm-core/nm-setting-wireless-security.c:1132
 #: ../libnm-core/nm-setting-wireless-security.c:1171
-#: ../libnm-core/nm-setting-wireless.c:813
-#: ../libnm-core/nm-setting-wireless.c:822
-#: ../libnm-core/nm-setting-wireless.c:833 ../libnm-core/nm-setting-wpan.c:131
-#: ../libnm-util/nm-setting.c:1365 ../libnm-util/nm-setting.c:1383
-#: ../libnm-util/nm-setting.c:1402 ../libnm-util/nm-setting-8021x.c:2652
-#: ../libnm-util/nm-setting-8021x.c:2686
-#: ../libnm-util/nm-setting-bluetooth.c:150
+#: ../libnm-core/nm-setting-wireless.c:811
+#: ../libnm-core/nm-setting-wireless.c:820
+#: ../libnm-core/nm-setting-wireless.c:831 ../libnm-util/nm-setting.c:1366
+#: ../libnm-util/nm-setting.c:1384 ../libnm-util/nm-setting.c:1403
+#: ../libnm-util/nm-setting-8021x.c:2655 ../libnm-util/nm-setting-8021x.c:2689
+#: ../libnm-util/nm-setting-bluetooth.c:151
 #: ../libnm-util/nm-setting-infiniband.c:205
 #: ../libnm-util/nm-setting-infiniband.c:221
 #: ../libnm-util/nm-setting-ip4-config.c:925
-#: ../libnm-util/nm-setting-ip6-config.c:888
+#: ../libnm-util/nm-setting-ip6-config.c:890
 #: ../libnm-util/nm-setting-olpc-mesh.c:151
-#: ../libnm-util/nm-setting-wimax.c:167 ../libnm-util/nm-setting-wired.c:657
-#: ../libnm-util/nm-setting-wired.c:666
-#: ../libnm-util/nm-setting-wireless-security.c:963
-#: ../libnm-util/nm-setting-wireless-security.c:972
-#: ../libnm-util/nm-setting-wireless-security.c:981
-#: ../libnm-util/nm-setting-wireless-security.c:1017
-#: ../libnm-util/nm-setting-wireless-security.c:1027
-#: ../libnm-util/nm-setting-wireless.c:828
-#: ../libnm-util/nm-setting-wireless.c:837
-#: ../libnm-util/nm-setting-wireless.c:846
+#: ../libnm-util/nm-setting-wimax.c:168 ../libnm-util/nm-setting-wired.c:658
+#: ../libnm-util/nm-setting-wired.c:667
+#: ../libnm-util/nm-setting-wireless-security.c:964
+#: ../libnm-util/nm-setting-wireless-security.c:973
+#: ../libnm-util/nm-setting-wireless-security.c:982
+#: ../libnm-util/nm-setting-wireless-security.c:1018
+#: ../libnm-util/nm-setting-wireless-security.c:1028
+#: ../libnm-util/nm-setting-wireless.c:829
+#: ../libnm-util/nm-setting-wireless.c:838
+#: ../libnm-util/nm-setting-wireless.c:847
 msgid "property is invalid"
 msgstr "властивість є некоректною"
 
-#: ../libnm-core/nm-setting-8021x.c:3255 ../libnm-core/nm-setting-8021x.c:3265
-#: ../libnm-core/nm-setting-8021x.c:3275 ../libnm-core/nm-setting-8021x.c:3294
-#: ../libnm-core/nm-setting-8021x.c:3304 ../libnm-core/nm-setting-adsl.c:208
+#: ../libnm-core/nm-setting-8021x.c:3258 ../libnm-core/nm-setting-8021x.c:3268
+#: ../libnm-core/nm-setting-8021x.c:3278 ../libnm-core/nm-setting-8021x.c:3297
+#: ../libnm-core/nm-setting-8021x.c:3307 ../libnm-core/nm-setting-adsl.c:208
 #: ../libnm-core/nm-setting-adsl.c:220 ../libnm-core/nm-setting-bluetooth.c:151
 #: ../libnm-core/nm-setting-wireless-security.c:929
-#: ../libnm-util/nm-setting-8021x.c:2711 ../libnm-util/nm-setting-8021x.c:2721
-#: ../libnm-util/nm-setting-8021x.c:2731 ../libnm-util/nm-setting-8021x.c:2741
-#: ../libnm-util/nm-setting-8021x.c:2751 ../libnm-util/nm-setting-adsl.c:228
-#: ../libnm-util/nm-setting-adsl.c:240 ../libnm-util/nm-setting-bluetooth.c:167
-#: ../libnm-util/nm-setting-wireless-security.c:899
+#: ../libnm-util/nm-setting-8021x.c:2714 ../libnm-util/nm-setting-8021x.c:2724
+#: ../libnm-util/nm-setting-8021x.c:2734 ../libnm-util/nm-setting-8021x.c:2744
+#: ../libnm-util/nm-setting-8021x.c:2754 ../libnm-util/nm-setting-adsl.c:228
+#: ../libnm-util/nm-setting-adsl.c:240 ../libnm-util/nm-setting-bluetooth.c:168
+#: ../libnm-util/nm-setting-wireless-security.c:900
 #, c-format
 msgid "'%s' is not a valid value for the property"
 msgstr "«%s» не є коректним значенням властивості"
 
-#: ../libnm-core/nm-setting-8021x.c:3285
+#: ../libnm-core/nm-setting-8021x.c:3288
 msgid "invalid auth flags"
 msgstr "некоректні прапорці розпізнавання"
 
@@ -11683,27 +11215,27 @@ msgstr "з’єднання «%s» потребує параметра «%s» а
 msgid "'%s' connection requires '%s' setting"
 msgstr "з’єднання «%s» потребує параметра «%s»"
 
-#: ../libnm-core/nm-setting-bond.c:566 ../libnm-util/nm-setting-bond.c:516
+#: ../libnm-core/nm-setting-bond.c:566 ../libnm-util/nm-setting-bond.c:517
 #, c-format
 msgid "invalid option '%s' or its value '%s'"
 msgstr "некоректний параметр «%s» або його значення «%s»"
 
-#: ../libnm-core/nm-setting-bond.c:591 ../libnm-util/nm-setting-bond.c:535
+#: ../libnm-core/nm-setting-bond.c:591 ../libnm-util/nm-setting-bond.c:536
 #, c-format
 msgid "only one of '%s' and '%s' can be set"
 msgstr "можна встановлювати лише одне з «%s» або «%s»"
 
-#: ../libnm-core/nm-setting-bond.c:604 ../libnm-util/nm-setting-bond.c:546
+#: ../libnm-core/nm-setting-bond.c:604 ../libnm-util/nm-setting-bond.c:547
 #, c-format
 msgid "mandatory option '%s' is missing"
 msgstr "пропущено обов’язковий параметр «%s»"
 
-#: ../libnm-core/nm-setting-bond.c:614 ../libnm-util/nm-setting-bond.c:555
+#: ../libnm-core/nm-setting-bond.c:614 ../libnm-util/nm-setting-bond.c:556
 #, c-format
 msgid "'%s' is not a valid value for '%s'"
 msgstr "«%s» не є коректним значенням «%s»"
 
-#: ../libnm-core/nm-setting-bond.c:628 ../libnm-util/nm-setting-bond.c:568
+#: ../libnm-core/nm-setting-bond.c:628 ../libnm-util/nm-setting-bond.c:569
 #, c-format
 msgid "'%s=%s' is incompatible with '%s > 0'"
 msgstr "«%s=%s» є несумісним з «%s > 0»"
@@ -11713,35 +11245,35 @@ msgstr "«%s=%s» є несумісним з «%s > 0»"
 msgid "'%s' is not valid for the '%s' option: %s"
 msgstr "«%s» є некоректним для параметра «%s»: %s"
 
-#: ../libnm-core/nm-setting-bond.c:654 ../libnm-util/nm-setting-bond.c:591
+#: ../libnm-core/nm-setting-bond.c:654 ../libnm-util/nm-setting-bond.c:592
 #, c-format
 msgid "'%s' option is only valid for '%s=%s'"
 msgstr "параметр «%s» можна використовувати, лише якщо «%s=%s»"
 
-#: ../libnm-core/nm-setting-bond.c:667 ../libnm-util/nm-setting-bond.c:604
+#: ../libnm-core/nm-setting-bond.c:667 ../libnm-util/nm-setting-bond.c:605
 #, c-format
 msgid "'%s=%s' is not a valid configuration for '%s'"
 msgstr "«%s=%s» не є коректним налаштуванням для «%s»"
 
 #: ../libnm-core/nm-setting-bond.c:680 ../libnm-core/nm-setting-bond.c:689
 #: ../libnm-core/nm-setting-bond.c:709 ../libnm-core/nm-setting-bond.c:745
-#: ../libnm-util/nm-setting-bond.c:617 ../libnm-util/nm-setting-bond.c:626
-#: ../libnm-util/nm-setting-bond.c:646 ../libnm-util/nm-setting-bond.c:682
+#: ../libnm-util/nm-setting-bond.c:618 ../libnm-util/nm-setting-bond.c:627
+#: ../libnm-util/nm-setting-bond.c:647 ../libnm-util/nm-setting-bond.c:683
 #, c-format
 msgid "'%s' option requires '%s' option to be set"
 msgstr "використання параметра «%s» вимагає встановлення параметра «%s»"
 
-#: ../libnm-core/nm-setting-bond.c:720 ../libnm-util/nm-setting-bond.c:657
+#: ../libnm-core/nm-setting-bond.c:720 ../libnm-util/nm-setting-bond.c:658
 #, c-format
 msgid "'%s' option is empty"
 msgstr "параметр «%s» є порожнім"
 
-#: ../libnm-core/nm-setting-bond.c:732 ../libnm-util/nm-setting-bond.c:669
+#: ../libnm-core/nm-setting-bond.c:732 ../libnm-util/nm-setting-bond.c:670
 #, c-format
 msgid "'%s' is not a valid IPv4 address for '%s' option"
 msgstr "«%s» не є припустимою адресою IPv4 для параметра «%s»"
 
-#: ../libnm-core/nm-setting-bond.c:760 ../libnm-util/nm-setting-bond.c:696
+#: ../libnm-core/nm-setting-bond.c:760 ../libnm-util/nm-setting-bond.c:697
 #, c-format
 msgid "'%s' option is only valid with mode '%s'"
 msgstr "параметр «%s» є коректним лише у режимі «%s»"
@@ -11762,18 +11294,18 @@ msgid "'%s' option is not valid with mode '%s'"
 msgstr "параметр «%s» є коректним з режимом «%s»"
 
 #: ../libnm-core/nm-setting-bridge-port.c:127
-#: ../libnm-core/nm-setting-ovs-interface.c:261
+#: ../libnm-core/nm-setting-ovs-interface.c:262
 #: ../libnm-core/nm-setting-ovs-port.c:189
 #: ../libnm-core/nm-setting-ovs-bridge.c:152
-#: ../libnm-core/nm-setting-team-port.c:357
+#: ../libnm-core/nm-setting-team-port.c:358
 #, c-format
 msgid "missing setting"
 msgstr "пропущено параметр"
 
 #: ../libnm-core/nm-setting-bridge-port.c:138
-#: ../libnm-core/nm-setting-ovs-interface.c:282
+#: ../libnm-core/nm-setting-ovs-interface.c:283
 #: ../libnm-core/nm-setting-ovs-port.c:210
-#: ../libnm-core/nm-setting-team-port.c:368
+#: ../libnm-core/nm-setting-team-port.c:369
 #, c-format
 msgid ""
 "A connection with a '%s' setting must have the slave-type set to '%s'. "
@@ -11782,15 +11314,15 @@ msgstr ""
 "Для з’єднання з параметром «%s» має бути встановлено тип підлеглості «%s». "
 "Замість цього маємо «%s»."
 
-#: ../libnm-core/nm-setting-bridge.c:231 ../libnm-util/nm-setting-bridge.c:268
+#: ../libnm-core/nm-setting-bridge.c:231 ../libnm-util/nm-setting-bridge.c:269
 #, c-format
 msgid "value '%d' is out of range <%d-%d>"
 msgstr "значення «%d» лежить поза діапазоном <%d-%d>"
 
 #: ../libnm-core/nm-setting-bridge.c:248 ../libnm-core/nm-setting-wired.c:652
 #: ../libnm-core/nm-setting-wired.c:714 ../libnm-core/nm-setting-wired.c:756
-#: ../libnm-util/nm-setting-bridge.c:285 ../libnm-util/nm-setting-wired.c:632
-#: ../libnm-util/nm-setting-wired.c:690
+#: ../libnm-util/nm-setting-bridge.c:286 ../libnm-util/nm-setting-wired.c:633
+#: ../libnm-util/nm-setting-wired.c:691
 msgid "is not a valid MAC address"
 msgstr "не є коректною MAC-адресою"
 
@@ -11798,66 +11330,67 @@ msgstr "не є коректною MAC-адресою"
 msgid "the mask can't contain bits 0 (STP), 1 (MAC) or 2 (LACP)"
 msgstr "маска не може містити біти 0 (STP), 1 (MAC) і 2 (LACP)"
 
-#: ../libnm-core/nm-setting-connection.c:889
+#: ../libnm-core/nm-setting-connection.c:890
 #, c-format
 msgid "setting required for connection of type '%s'"
 msgstr "для з’єднання типу «%s» потрібен параметр"
 
-#: ../libnm-core/nm-setting-connection.c:928
-#: ../libnm-util/nm-setting-connection.c:788
+#: ../libnm-core/nm-setting-connection.c:929
+#: ../libnm-util/nm-setting-connection.c:791
 #, c-format
 msgid "'%s' is not a valid UUID"
 msgstr "«%s» не є коректним UUID"
 
-#: ../libnm-core/nm-setting-connection.c:978
+#: ../libnm-core/nm-setting-connection.c:979
 #, c-format
 msgid "connection type '%s' is not valid"
 msgstr "тип з’єднання «%s» є некоректним"
 
-#: ../libnm-core/nm-setting-connection.c:1014
-#: ../libnm-util/nm-setting-connection.c:874
+#: ../libnm-core/nm-setting-connection.c:1015
+#: ../libnm-util/nm-setting-connection.c:877
 #, c-format
 msgid "Unknown slave type '%s'"
 msgstr "Невідомий тип підлеглого «%s»"
 
-#: ../libnm-core/nm-setting-connection.c:1025
-#: ../libnm-util/nm-setting-connection.c:884
+#: ../libnm-core/nm-setting-connection.c:1026
+#: ../libnm-util/nm-setting-connection.c:887
 #, c-format
 msgid "Slave connections need a valid '%s' property"
 msgstr "Для підлеглих з’єднань потрібна коректна властивість «%s»"
 
-#: ../libnm-core/nm-setting-connection.c:1046
-#: ../libnm-util/nm-setting-connection.c:894
+#: ../libnm-core/nm-setting-connection.c:1047
+#: ../libnm-util/nm-setting-connection.c:897
 #, c-format
 msgid "Cannot set '%s' without '%s'"
 msgstr "Не можна встановити «%s» без «%s»"
 
-#: ../libnm-core/nm-setting-connection.c:1059
+#: ../libnm-core/nm-setting-connection.c:1060
 #, c-format
 msgid "Only '%s' connections can be enslaved to '%s'"
 msgstr "Лише з'єднання «%s» можуть бути підлеглими для «%s»"
 
-#: ../libnm-core/nm-setting-connection.c:1072
+#: ../libnm-core/nm-setting-connection.c:1073
 #, c-format
 msgid "metered value %d is not valid"
 msgstr "лічильне значення %d є некоректним"
 
-#: ../libnm-core/nm-setting-connection.c:1083
+#: ../libnm-core/nm-setting-connection.c:1084
 #, c-format
+#| msgid "metered value %d is not valid"
 msgid "mdns value %d is not valid"
 msgstr "значення mdns %d є некоректним"
 
-#: ../libnm-core/nm-setting-connection.c:1104
+#: ../libnm-core/nm-setting-connection.c:1105
 #, c-format
 msgid "property type should be set to '%s'"
 msgstr "тип властивості має бути встановлено у значення «%s»"
 
-#: ../libnm-core/nm-setting-connection.c:1119
+#: ../libnm-core/nm-setting-connection.c:1120
 #, c-format
 msgid "slave-type '%s' requires a '%s' setting in the connection"
 msgstr "тип підлеглого з’єднання «%s» потребує параметра «%s» у з’єднанні"
 
-#: ../libnm-core/nm-setting-connection.c:1129
+#: ../libnm-core/nm-setting-connection.c:1130
 #, c-format
 msgid ""
 "Detect a slave connection with '%s' set and a port type '%s'. '%s' should be "
@@ -11866,63 +11399,58 @@ msgstr ""
 "Визначити підлегле з’єднання зі встановленим «%s» і типом порту «%s». «%s» "
 "слід встановити у значення «%s»"
 
-#: ../libnm-core/nm-setting-connection.c:1146
+#: ../libnm-core/nm-setting-connection.c:1147
 #, c-format
 msgid "A slave connection with '%s' set to '%s' cannot have a '%s' setting"
 msgstr ""
 "Підлегле з’єднання з «%s», переведене у режим «%s», не може мати параметра "
 "«%s»"
 
-#: ../libnm-core/nm-setting-dcb.c:522 ../libnm-util/nm-setting-dcb.c:593
+#: ../libnm-core/nm-setting-dcb.c:522 ../libnm-util/nm-setting-dcb.c:594
 msgid "flags invalid"
 msgstr "некоректні прапорці"
 
-#: ../libnm-core/nm-setting-dcb.c:531 ../libnm-util/nm-setting-dcb.c:602
+#: ../libnm-core/nm-setting-dcb.c:531 ../libnm-util/nm-setting-dcb.c:603
 msgid "flags invalid - disabled"
 msgstr "некоректні прапорці — вимкнено"
 
 #: ../libnm-core/nm-setting-dcb.c:557 ../libnm-core/nm-setting-dcb.c:606
-#: ../libnm-util/nm-setting-dcb.c:628 ../libnm-util/nm-setting-dcb.c:677
+#: ../libnm-util/nm-setting-dcb.c:629 ../libnm-util/nm-setting-dcb.c:678
 msgid "property invalid (not enabled)"
 msgstr "властивість є некоректною (не увімкнено)"
 
-#: ../libnm-core/nm-setting-dcb.c:566 ../libnm-util/nm-setting-dcb.c:637
+#: ../libnm-core/nm-setting-dcb.c:566 ../libnm-util/nm-setting-dcb.c:638
 msgid "element invalid"
 msgstr "некоректний елемент"
 
-#: ../libnm-core/nm-setting-dcb.c:581 ../libnm-util/nm-setting-dcb.c:652
+#: ../libnm-core/nm-setting-dcb.c:581 ../libnm-util/nm-setting-dcb.c:653
 msgid "sum not 100%"
 msgstr "сума не дорівнює 100%"
 
 #: ../libnm-core/nm-setting-dcb.c:615 ../libnm-core/nm-setting-dcb.c:647
-#: ../libnm-util/nm-setting-dcb.c:686 ../libnm-util/nm-setting-dcb.c:718
+#: ../libnm-util/nm-setting-dcb.c:687 ../libnm-util/nm-setting-dcb.c:719
 msgid "property invalid"
 msgstr "некоректна властивість"
 
-#: ../libnm-core/nm-setting-dcb.c:637 ../libnm-util/nm-setting-dcb.c:708
+#: ../libnm-core/nm-setting-dcb.c:637 ../libnm-util/nm-setting-dcb.c:709
 msgid "property missing"
 msgstr "пропущено властивість"
 
-#: ../libnm-core/nm-setting-gsm.c:312 ../libnm-util/nm-setting-gsm.c:294
+#: ../libnm-core/nm-setting-gsm.c:312 ../libnm-util/nm-setting-gsm.c:295
 #, c-format
 msgid "property value '%s' is empty or too long (>64)"
 msgstr "значення властивості, «%s», є порожнім або надто довгим (>64)"
 
-#: ../libnm-core/nm-setting-gsm.c:344 ../libnm-util/nm-setting-gsm.c:326
+#: ../libnm-core/nm-setting-gsm.c:344 ../libnm-util/nm-setting-gsm.c:327
 #, c-format
 msgid "'%s' contains invalid char(s) (use [A-Za-z._-])"
 msgstr "«%s» містить некоректні символи (слід використовувати [A-Za-z._-])"
 
-#: ../libnm-core/nm-setting-gsm.c:370 ../libnm-util/nm-setting-gsm.c:352
+#: ../libnm-core/nm-setting-gsm.c:370 ../libnm-util/nm-setting-gsm.c:353
 #, c-format
 msgid "'%s' length is invalid (should be 5 or 6 digits)"
 msgstr "довжина «%s» є некоректною (має бути 5 або 6 цифр)"
 
-#: ../libnm-core/nm-setting-gsm.c:381 ../libnm-util/nm-setting-gsm.c:363
-#, c-format
-msgid "'%s' is not a number"
-msgstr "«%s» не є числом"
-
 #: ../libnm-core/nm-setting-gsm.c:415
 msgid "property is empty or wrong size"
 msgstr "властивість є порожньою або має помилковий розмір"
@@ -12073,9 +11601,9 @@ msgid "a gateway is incompatible with '%s'"
 msgstr "шлюз є несумісним з «%s»"
 
 #: ../libnm-core/nm-setting-ip4-config.c:143
-#: ../libnm-core/nm-setting-ip6-config.c:189
+#: ../libnm-core/nm-setting-ip6-config.c:167
 #: ../libnm-util/nm-setting-ip4-config.c:879
-#: ../libnm-util/nm-setting-ip6-config.c:841
+#: ../libnm-util/nm-setting-ip6-config.c:843
 #, c-format
 msgid "this property cannot be empty for '%s=%s'"
 msgstr "ця властивість не може бути порожньою, якщо «%s=%s»"
@@ -12083,15 +11611,15 @@ msgstr "ця властивість не може бути порожньою, 
 #: ../libnm-core/nm-setting-ip4-config.c:155
 #: ../libnm-core/nm-setting-ip4-config.c:165
 #: ../libnm-core/nm-setting-ip4-config.c:177
-#: ../libnm-core/nm-setting-ip6-config.c:204
-#: ../libnm-core/nm-setting-ip6-config.c:214
-#: ../libnm-core/nm-setting-ip6-config.c:224
+#: ../libnm-core/nm-setting-ip6-config.c:182
+#: ../libnm-core/nm-setting-ip6-config.c:192
+#: ../libnm-core/nm-setting-ip6-config.c:202
 #: ../libnm-util/nm-setting-ip4-config.c:891
 #: ../libnm-util/nm-setting-ip4-config.c:901
 #: ../libnm-util/nm-setting-ip4-config.c:913
-#: ../libnm-util/nm-setting-ip6-config.c:853
-#: ../libnm-util/nm-setting-ip6-config.c:863
-#: ../libnm-util/nm-setting-ip6-config.c:875
+#: ../libnm-util/nm-setting-ip6-config.c:855
+#: ../libnm-util/nm-setting-ip6-config.c:865
+#: ../libnm-util/nm-setting-ip6-config.c:877
 #, c-format
 msgid "this property is not allowed for '%s=%s'"
 msgstr "цю властивість не можна застосовувати до «%s=%s»"
@@ -12115,24 +11643,19 @@ msgid "property should be TRUE when method is set to disabled"
 msgstr ""
 "властивість повинна мати значення TRUE, якщо встановлено метод «disabled»"
 
-#: ../libnm-core/nm-setting-ip6-config.c:263
+#: ../libnm-core/nm-setting-ip6-config.c:241
 msgid "value is not a valid token"
 msgstr "значення не є коректним жетоном"
 
-#: ../libnm-core/nm-setting-ip6-config.c:274
+#: ../libnm-core/nm-setting-ip6-config.c:252
 msgid "only makes sense with EUI64 address generation mode"
 msgstr "має сенс лише з режимом створення адрес EUI64"
 
-#: ../libnm-core/nm-setting-ip6-config.c:285
-#| msgid "invalid value"
-msgid "invalid DUID"
-msgstr "некоректний DUID"
-
-#: ../libnm-core/nm-setting-ip6-config.c:297
+#: ../libnm-core/nm-setting-ip6-config.c:264
 msgid "token is not in canonical form"
 msgstr "жетон вказано не у канонічній формі"
 
-#: ../libnm-core/nm-setting-ip6-config.c:309
+#: ../libnm-core/nm-setting-ip6-config.c:276
 msgid "property should be TRUE when method is set to ignore"
 msgstr ""
 "властивість повинна мати значення TRUE, якщо встановлено метод «ignore»"
@@ -12142,6 +11665,14 @@ msgstr ""
 msgid "'%d' is not a valid tunnel mode"
 msgstr "«%d» не є коректним режимом тунелювання"
 
+#: ../libnm-core/nm-setting-ip-tunnel.c:351
+#: ../libnm-core/nm-setting-macsec.c:302 ../libnm-core/nm-setting-macvlan.c:163
+#: ../libnm-core/nm-setting-vlan.c:645 ../libnm-core/nm-setting-vxlan.c:403
+#: ../libnm-util/nm-setting-vlan.c:567
+#, c-format
+msgid "'%s' is neither an UUID nor an interface name"
+msgstr "«%s» не є ні UUID, ні назвою інтерфейсу"
+
 #: ../libnm-core/nm-setting-ip-tunnel.c:362
 #: ../libnm-core/nm-setting-ip-tunnel.c:382
 #, c-format
@@ -12169,31 +11700,37 @@ msgstr ""
 msgid "some flags are invalid for the select mode: %s"
 msgstr "деякі з прапорців для режиму вибору є некоректними: %s"
 
-#: ../libnm-core/nm-setting-macsec.c:252
+#: ../libnm-core/nm-setting-macsec.c:235
 msgid "the key is empty"
 msgstr "ключ є порожнім"
 
-#: ../libnm-core/nm-setting-macsec.c:263
+#: ../libnm-core/nm-setting-macsec.c:246
 #, c-format
 msgid "the key must be %d characters"
 msgstr "ключ має складатися з %d символів"
 
-#: ../libnm-core/nm-setting-macsec.c:271
+#: ../libnm-core/nm-setting-macsec.c:254
 msgid "the key contains non-hexadecimal characters"
 msgstr "ключ містить нешістнадцяткові цифри"
 
-#: ../libnm-core/nm-setting-macsec.c:333 ../libnm-core/nm-setting-macvlan.c:177
+#: ../libnm-core/nm-setting-macsec.c:291 ../libnm-core/nm-setting-vlan.c:634
+#: ../libnm-util/nm-setting-vlan.c:556
+#, c-format
+msgid "'%s' value doesn't match '%s=%s'"
+msgstr "значення «%s» не відповідає «%s=%s»"
+
+#: ../libnm-core/nm-setting-macsec.c:316 ../libnm-core/nm-setting-macvlan.c:177
 #: ../libnm-core/nm-setting-vlan.c:659 ../libnm-util/nm-setting-vlan.c:580
 #, c-format
 msgid "property is not specified and neither is '%s:%s'"
 msgstr "властивість не вказано і не визначено «%s:%s»"
 
-#: ../libnm-core/nm-setting-macsec.c:350
+#: ../libnm-core/nm-setting-macsec.c:333
 #, c-format
 msgid "EAP key management requires '%s' setting presence"
 msgstr "Керування ключами за допомогою EAP потребує додавання параметра «%s»"
 
-#: ../libnm-core/nm-setting-macsec.c:361
+#: ../libnm-core/nm-setting-macsec.c:344
 #, c-format
 msgid "invalid port %d"
 msgstr "некоректний порт %d"
@@ -12203,16 +11740,16 @@ msgid "non promiscuous operation is allowed only in passthru mode"
 msgstr "розбірливі дії можливі лише у режимі передавання (passthru)"
 
 #: ../libnm-core/nm-setting-olpc-mesh.c:130
-#: ../libnm-core/nm-setting-wireless.c:762
+#: ../libnm-core/nm-setting-wireless.c:760
 #: ../libnm-util/nm-setting-olpc-mesh.c:132
-#: ../libnm-util/nm-setting-wireless.c:777
+#: ../libnm-util/nm-setting-wireless.c:778
 msgid "SSID length is out of range <1-32> bytes"
 msgstr "Довжина SSID лежить поза діапазоном у <1-32> байтів"
 
 #: ../libnm-core/nm-setting-olpc-mesh.c:139
-#: ../libnm-core/nm-setting-wireless.c:802
+#: ../libnm-core/nm-setting-wireless.c:800
 #: ../libnm-util/nm-setting-olpc-mesh.c:141
-#: ../libnm-util/nm-setting-wireless.c:817
+#: ../libnm-util/nm-setting-wireless.c:818
 #, c-format
 msgid "'%d' is not a valid channel"
 msgstr "«%d» не є коректним каналом"
@@ -12274,7 +11811,7 @@ msgstr "Пропущено параметр інтерфейсу ovs"
 msgid "Missing ovs interface type"
 msgstr "Не вказано тип інтерфейсу ovs"
 
-#: ../libnm-core/nm-setting-ovs-interface.c:270
+#: ../libnm-core/nm-setting-ovs-interface.c:271
 #: ../libnm-core/nm-setting-ovs-port.c:198
 #, c-format
 msgid "A connection with a '%s' setting must have a master."
@@ -12317,12 +11854,12 @@ msgstr "З'єднання з параметром «%s» не повинне м
 msgid "'%s' is not allowed in fail_mode"
 msgstr "«%s» не можна використовувати у режимі fail_mode"
 
-#: ../libnm-core/nm-setting-ppp.c:365 ../libnm-util/nm-setting-ppp.c:386
+#: ../libnm-core/nm-setting-ppp.c:365 ../libnm-util/nm-setting-ppp.c:387
 #, c-format
 msgid "'%d' is out of valid range <128-16384>"
 msgstr "«%d» не належить до коректного діапазону <128-16384>"
 
-#: ../libnm-core/nm-setting-ppp.c:378 ../libnm-util/nm-setting-ppp.c:399
+#: ../libnm-core/nm-setting-ppp.c:378 ../libnm-util/nm-setting-ppp.c:400
 #, c-format
 msgid "setting this property requires non-zero '%s' property"
 msgstr ""
@@ -12354,28 +11891,23 @@ msgid "the script lacks FindProxyForURL function"
 msgstr "скрипт не містить функції FindProxyForURL"
 
 #: ../libnm-core/nm-setting-tc-config.c:68
-#: ../libnm-core/nm-setting-tc-config.c:296
-#: ../libnm-core/nm-setting-tc-config.c:550
+#: ../libnm-core/nm-setting-tc-config.c:283
+#: ../libnm-core/nm-setting-tc-config.c:537
 #, c-format
+#| msgid "'%s' is not a valid band"
 msgid "'%s' is not a valid kind"
 msgstr "«%s» не є коректним типом"
 
 #: ../libnm-core/nm-setting-tc-config.c:76
-#: ../libnm-core/nm-setting-tc-config.c:558
+#: ../libnm-core/nm-setting-tc-config.c:545
+#| msgid "data missing"
 msgid "parent handle missing"
 msgstr "не вказано батьківського дескриптора"
 
-#: ../libnm-core/nm-setting-tc-config.c:1201
-msgid "there are duplicate TC qdiscs"
-msgstr "маємо дублювання q-дисків TC"
-
-#: ../libnm-core/nm-setting-tc-config.c:1221
-msgid "there are duplicate TC filters"
-msgstr "маємо дублювання фільтрів TC"
-
 #: ../libnm-core/nm-setting-team.c:134 ../libnm-core/nm-setting-team.c:193
 #: ../libnm-core/nm-setting-team.c:266
 #, c-format
+#| msgid "'%s' is out of range [0, %u]"
 msgid "%s is out of range [0, %d]"
 msgstr "%s не належить до діапазону [0, %d]"
 
@@ -12383,11 +11915,12 @@ msgstr "%s не належить до діапазону [0, %d]"
 #, c-format
 msgid "Missing target-host in nsna_ping link watcher"
 msgstr ""
-"Пропущено вузол призначення у налаштуваннях засобу спостереження за зв'язком "
-"nsna_ping"
+"Пропущено вузол призначення у налаштуваннях засобу спостереження за зв'язком"
+" nsna_ping"
 
 #: ../libnm-core/nm-setting-team.c:181 ../libnm-core/nm-setting-team.c:248
 #, c-format
+#| msgid "key contains invalid characters"
 msgid "target-host '%s' contains invalid characters"
 msgstr "назва вузла призначення, «%s», містить некоректні символи"
 
@@ -12399,11 +11932,12 @@ msgstr ""
 
 #: ../libnm-core/nm-setting-team.c:254
 #, c-format
+#| msgid "key contains invalid characters"
 msgid "source-host '%s' contains invalid characters"
 msgstr "назва вузла джерела, «%s», містить некоректні символи"
 
 #: ../libnm-core/nm-setting-team.c:1153
-#: ../libnm-core/nm-setting-team-port.c:380
+#: ../libnm-core/nm-setting-team-port.c:381
 #, c-format
 msgid "team config exceeds size limit"
 msgstr "налаштування команди порушують обмеження щодо розміру"
@@ -12415,21 +11949,25 @@ msgstr "некоректний засіб запуску «%s»"
 
 #: ../libnm-core/nm-setting-team.c:1192
 #, c-format
+#| msgid "missing filename"
 msgid "missing link watcher name"
 msgstr "не вказано назву засобу спостереження за зв'язком"
 
 #: ../libnm-core/nm-setting-team.c:1202
 #, c-format
+#| msgid "unknown VPN plugin \"%s\""
 msgid "unknown link watcher \"%s\""
 msgstr "невідомий засіб спостереження за зв'язком, «%s»"
 
 #: ../libnm-core/nm-setting-team.c:1213
 #, c-format
+#| msgid "missing setting"
 msgid "missing target host"
 msgstr "не вказано вузол призначення"
 
 #: ../libnm-core/nm-setting-team.c:1221
 #, c-format
+#| msgid "Missing IPv4 address"
 msgid "missing source address"
 msgstr "не вказано адреси джерела"
 
@@ -12484,21 +12022,21 @@ msgstr "значення є надто великим"
 msgid "value is not valid UTF8"
 msgstr "значення не записано у коректному кодуванні UTF8"
 
-#: ../libnm-core/nm-setting-user.c:331
+#: ../libnm-core/nm-setting-user.c:338
 msgid "maximum number of user data entries reached"
 msgstr "досягнуто максимальної кількості записів даних користувача"
 
-#: ../libnm-core/nm-setting-user.c:372
+#: ../libnm-core/nm-setting-user.c:379
 #, c-format
 msgid "invalid key \"%s\": %s"
 msgstr "некоректний ключ «%s»: %s"
 
-#: ../libnm-core/nm-setting-user.c:376
+#: ../libnm-core/nm-setting-user.c:383
 #, c-format
 msgid "invalid value for \"%s\": %s"
 msgstr "некоректне значення для «%s»: %s"
 
-#: ../libnm-core/nm-setting-user.c:391
+#: ../libnm-core/nm-setting-user.c:398
 #, c-format
 msgid "maximum number of user data entries reached (%u instead of %u)"
 msgstr ""
@@ -12532,7 +12070,7 @@ msgstr "параметри містив пароль з порожньою на
 msgid "secret value was empty"
 msgstr "значення пароля є порожнім"
 
-#: ../libnm-core/nm-setting-vpn.c:615 ../libnm-core/nm-setting.c:1786
+#: ../libnm-core/nm-setting-vpn.c:615 ../libnm-core/nm-setting.c:1787
 msgid "not a secret property"
 msgstr "не є властивістю пароля"
 
@@ -12555,17 +12093,17 @@ msgstr "«%s» є некоректною IP-адресою у форматі IP%
 msgid "%d is greater than local port max %d"
 msgstr "%d перевищує максимальний припустимий номер локального порту, %d"
 
-#: ../libnm-core/nm-setting-wired.c:632 ../libnm-util/nm-setting-wired.c:612
+#: ../libnm-core/nm-setting-wired.c:632 ../libnm-util/nm-setting-wired.c:613
 #, c-format
 msgid "'%s' is not a valid Ethernet port value"
 msgstr "«%s» не є коректним значенням номера порту Ethernet"
 
-#: ../libnm-core/nm-setting-wired.c:642 ../libnm-util/nm-setting-wired.c:622
+#: ../libnm-core/nm-setting-wired.c:642 ../libnm-util/nm-setting-wired.c:623
 #, c-format
 msgid "'%s' is not a valid duplex value"
 msgstr "«%s» не є коректним значенням дуплексного режиму"
 
-#: ../libnm-core/nm-setting-wired.c:701 ../libnm-util/nm-setting-wired.c:679
+#: ../libnm-core/nm-setting-wired.c:701 ../libnm-util/nm-setting-wired.c:680
 #, c-format
 msgid "invalid '%s' or its value '%s'"
 msgstr "некоректний «%s» або його значення «%s»"
@@ -12581,42 +12119,44 @@ msgid "Wake-on-LAN password can only be used with magic packet mode"
 msgstr ""
 "Пароль до Wake-on-LAN можна використовувати лише у режимі магічних пакетів"
 
-#: ../libnm-core/nm-setting-wired.c:772
-msgid "both speed and duplex should have a valid value or both should be unset"
-msgstr ""
-"параметри швидкості і двобічного режиму повинні обидва мати коректні значення"
-" або обидва параметри має бути не встановлено"
+#: ../libnm-core/nm-setting-wired.c:770
+msgid "when link autonegotiation is enabled no duplex value is accepted"
+msgstr "якщо увімкнено автоузгодження посилань, значення duplex не приймаються"
+
+#: ../libnm-core/nm-setting-wired.c:778
+msgid "when link autonegotiation is enabled speed should be 0"
+msgstr "якщо увімкнено автоузгодження посилань, швидкість має бути нульовою"
 
-#: ../libnm-core/nm-setting-wired.c:773
+#: ../libnm-core/nm-setting-wired.c:788
 msgid "both speed and duplex are required for static link configuration"
 msgstr "для статичного налаштування зв’язку слід вказати speed і duplex"
 
 #: ../libnm-core/nm-setting-wireless-security.c:941
-#: ../libnm-util/nm-setting-wireless-security.c:911
+#: ../libnm-util/nm-setting-wireless-security.c:912
 #, c-format
 msgid "'%s' security requires '%s=%s'"
 msgstr "для захисту «%s» слід вказати «%s=%s»"
 
 #: ../libnm-core/nm-setting-wireless-security.c:962
-#: ../libnm-util/nm-setting-wireless-security.c:932
+#: ../libnm-util/nm-setting-wireless-security.c:933
 #, c-format
 msgid "'%s' security requires '%s' setting presence"
 msgstr "захист «%s» вимагає використання параметра «%s»"
 
 #: ../libnm-core/nm-setting-wireless-security.c:983
-#: ../libnm-util/nm-setting-wireless-security.c:953
+#: ../libnm-util/nm-setting-wireless-security.c:954
 #, c-format
 msgid "'%d' value is out of range <0-3>"
 msgstr "значення «%d» лежить поза діапазоном <0-3>"
 
 #: ../libnm-core/nm-setting-wireless-security.c:1038
-#: ../libnm-util/nm-setting-wireless-security.c:1008
+#: ../libnm-util/nm-setting-wireless-security.c:1009
 #, c-format
 msgid "'%s' connections require '%s' in this property"
 msgstr "з’єднання «%s» потребують «%s» у цій властивості"
 
 #: ../libnm-core/nm-setting-wireless-security.c:1068
-#: ../libnm-util/nm-setting-wireless-security.c:1038
+#: ../libnm-util/nm-setting-wireless-security.c:1039
 #, c-format
 msgid "'%s' can only be used with '%s=%s' (WEP)"
 msgstr "«%s» можна використовувати лише з «%s=%s» (WEP)"
@@ -12630,246 +12170,244 @@ msgstr "«%s» можна використовувати лише з «%s=%s» 
 msgid "can't be simultaneously disabled and enabled"
 msgstr "не може бути одночасно вимкнено і увімкнено"
 
-#: ../libnm-core/nm-setting-wireless.c:771
-#: ../libnm-util/nm-setting-wireless.c:786
+#: ../libnm-core/nm-setting-wireless.c:769
+#: ../libnm-util/nm-setting-wireless.c:787
 #, c-format
 msgid "'%s' is not a valid Wi-Fi mode"
 msgstr "«%s» не є коректним режимом Wi-Fi"
 
-#: ../libnm-core/nm-setting-wireless.c:781
-#: ../libnm-util/nm-setting-wireless.c:796
+#: ../libnm-core/nm-setting-wireless.c:779
+#: ../libnm-util/nm-setting-wireless.c:797
 #, c-format
 msgid "'%s' is not a valid band"
 msgstr "«%s» не є коректним значенням смуги"
 
-#: ../libnm-core/nm-setting-wireless.c:791
+#: ../libnm-core/nm-setting-wireless.c:789
 #, c-format
 msgid "'%s' requires setting '%s' property"
 msgstr "«%s» потребує встановлення властивості «%s»"
 
-#: ../libnm-core/nm-setting-wireless.c:885
+#: ../libnm-core/nm-setting-wireless.c:883
 #, c-format
 msgid "invalid value"
 msgstr "некоректне значення"
 
-#: ../libnm-core/nm-setting-wireless.c:895
-#| msgid "Wake-on-LAN mode 'default' and 'ignore' are exclusive flags"
-msgid "Wake-on-WLAN mode 'default' and 'ignore' are exclusive flags"
-msgstr ""
-"Прапорці режиму Wake-on-WLAN «default» і «ignore» не можна використовувати "
-"одночасно"
-
 #: ../libnm-core/nm-setting-wireless.c:904
-msgid "Wake-on-WLAN trying to set unknown flag"
-msgstr "Wake-on-WLAN намагається встановити невідомий прапорець"
-
-#: ../libnm-core/nm-setting-wireless.c:926
 #, c-format
 msgid "conflicting value of mac-address-randomization and cloned-mac-address"
 msgstr "конфлікт значень mac-address-randomization і cloned-mac-address"
 
-#: ../libnm-core/nm-setting.c:819
+#: ../libnm-core/nm-setting.c:820
 #, c-format
 msgid "duplicate property"
 msgstr "дублювання властивості"
 
-#: ../libnm-core/nm-setting.c:847 ../libnm-core/nm-setting.c:894
+#: ../libnm-core/nm-setting.c:848 ../libnm-core/nm-setting.c:895
 #, c-format
 msgid "can't set property of type '%s' from value of type '%s'"
 msgstr "не вдалося встановити властивість типу «%s» зі значення типу «%s»"
 
-#: ../libnm-core/nm-setting.c:866 ../libnm-core/nm-setting.c:880
+#: ../libnm-core/nm-setting.c:867 ../libnm-core/nm-setting.c:881
 #, c-format
 msgid "failed to set property: %s"
 msgstr "не вдалося встановити значення властивості: %s"
 
-#: ../libnm-core/nm-setting.c:908
+#: ../libnm-core/nm-setting.c:909
 #, c-format
 msgid "can not set property: %s"
 msgstr "не вдалося встановити значення властивості: %s"
 
-#: ../libnm-core/nm-setting.c:924
+#: ../libnm-core/nm-setting.c:925
 #, c-format
 msgid "unknown property"
 msgstr "невідома властивість"
 
-#: ../libnm-core/nm-setting.c:1684
+#: ../libnm-core/nm-setting.c:1685
 msgid "secret not found"
 msgstr "не знайдено ключа"
 
-#: ../libnm-core/nm-setting.c:1776
+#: ../libnm-core/nm-setting.c:1777
 msgid "secret is not set"
 msgstr "пароль не встановлено"
 
-#: ../libnm-core/nm-utils.c:2168
+#: ../libnm-core/nm-utils.c:2169
 #, c-format
+#| msgid "'%s' is not a valid band"
 msgid "'%s' is not a valid handle."
 msgstr "«%s» не є коректним дескриптором."
 
-#: ../libnm-core/nm-utils.c:2264
+#: ../libnm-core/nm-utils.c:2266
 #, c-format
 msgid "'%s' unexpected: parent already specified."
 msgstr "Неочікуване «%s»: батьківський запис вже вказано."
 
-#: ../libnm-core/nm-utils.c:2280
+#: ../libnm-core/nm-utils.c:2282
 #, c-format
+#| msgid "invalid option '%s'"
 msgid "invalid handle: '%s'"
 msgstr "некоректний дескриптор: «%s»"
 
-#: ../libnm-core/nm-utils.c:2302
+#: ../libnm-core/nm-utils.c:2304
+#| msgid "No service name specified"
 msgid "parent not specified."
 msgstr "не вказано батьківський запис."
 
-#: ../libnm-core/nm-utils.c:2349
+#: ../libnm-core/nm-utils.c:2351
 #, c-format
+#| msgid "unsupported attribute '%s' of type '%s'"
 msgid "unsupported qdisc option: '%s'."
 msgstr "непідтримуваний параметр qdisc: «%s»."
 
-#: ../libnm-core/nm-utils.c:2465
+#: ../libnm-core/nm-utils.c:2467
+#| msgid "data missing"
 msgid "action name missing."
 msgstr "не вказано назви дії."
 
-#: ../libnm-core/nm-utils.c:2489
+#: ../libnm-core/nm-utils.c:2491
 #, c-format
+#| msgid "unsupported attribute '%s' of type '%s'"
 msgid "unsupported action option: '%s'."
 msgstr "непідтримуваний параметр дії: «%s»."
 
-#: ../libnm-core/nm-utils.c:2627
+#: ../libnm-core/nm-utils.c:2629
+#| msgid "invalid option '%s'"
 msgid "invalid action: "
 msgstr "некоректна дія: "
 
-#: ../libnm-core/nm-utils.c:2631
+#: ../libnm-core/nm-utils.c:2633
 #, c-format
+#| msgid "unsupported attribute '%s' of type '%s'"
 msgid "unsupported tfilter option: '%s'."
 msgstr "непідтримуваний параметр tfilter: «%s»."
 
-#: ../libnm-core/nm-utils.c:2990
+#: ../libnm-core/nm-utils.c:2992
 #, c-format
 msgid "failed stat file %s: %s"
 msgstr "не вдалося отримати статистичні дані щодо файла %s: %s"
 
-#: ../libnm-core/nm-utils.c:2999
+#: ../libnm-core/nm-utils.c:3001
 #, c-format
 msgid "not a file (%s)"
 msgstr "не є файлом (%s)"
 
-#: ../libnm-core/nm-utils.c:3010
+#: ../libnm-core/nm-utils.c:3012
 #, c-format
 msgid "invalid file owner %d for %s"
 msgstr "некоректний власник файла, %d, %s"
 
-#: ../libnm-core/nm-utils.c:3021
+#: ../libnm-core/nm-utils.c:3023
 #, c-format
 msgid "file permissions for %s"
 msgstr "файлові права доступу до %s"
 
-#: ../libnm-core/nm-utils.c:3031
+#: ../libnm-core/nm-utils.c:3033
 #, c-format
 msgid "reject %s"
 msgstr "відмовити %s"
 
-#: ../libnm-core/nm-utils.c:3050
+#: ../libnm-core/nm-utils.c:3053
 #, c-format
 msgid "path is not absolute (%s)"
 msgstr "шлях не є абсолютним (%s)"
 
-#: ../libnm-core/nm-utils.c:3064
+#: ../libnm-core/nm-utils.c:3067
 #, c-format
 msgid "Plugin file does not exist (%s)"
 msgstr "Файла додатка не існує (%s)"
 
-#: ../libnm-core/nm-utils.c:3072
+#: ../libnm-core/nm-utils.c:3075
 #, c-format
 msgid "Plugin is not a valid file (%s)"
 msgstr "Додаток не є коректним файлом (%s)"
 
-#: ../libnm-core/nm-utils.c:3082
+#: ../libnm-core/nm-utils.c:3085
 #, c-format
 msgid "libtool archives are not supported (%s)"
 msgstr "Підтримки архівів libtool не передбачено (%s)"
 
-#: ../libnm-core/nm-utils.c:3164 ../libnm-util/nm-utils.c:1794
+#: ../libnm-core/nm-utils.c:3167 ../libnm-util/nm-utils.c:1798
 #, c-format
 msgid "Could not find \"%s\" binary"
 msgstr "Не вдалося знайти виконуваний файл «%s»"
 
-#: ../libnm-core/nm-utils.c:4181
+#: ../libnm-core/nm-utils.c:4182
 #, c-format
 msgid "not a valid ethernet MAC address for mask at position %lld"
 msgstr "некоректна адреса MAC ethernet для маски у позиції %lld"
 
-#: ../libnm-core/nm-utils.c:4196
+#: ../libnm-core/nm-utils.c:4197
 #, c-format
 msgid "not a valid ethernet MAC address #%u at position %lld"
 msgstr "некоректна адреса MAC ethernet #%u у позиції %lld"
 
-#: ../libnm-core/nm-utils.c:4232
+#: ../libnm-core/nm-utils.c:4233
 msgid "interface name is too short"
 msgstr "назва інтерфейсу є надто короткою"
 
-#: ../libnm-core/nm-utils.c:4241
+#: ../libnm-core/nm-utils.c:4242
 msgid "interface name is reserved"
 msgstr "таку назву інтерфейсу зарезервовано"
 
-#: ../libnm-core/nm-utils.c:4253
+#: ../libnm-core/nm-utils.c:4254
 msgid "interface name contains an invalid character"
 msgstr "назва інтерфейсу містить некоректний символ"
 
-#: ../libnm-core/nm-utils.c:4259
+#: ../libnm-core/nm-utils.c:4260
 msgid "interface name is longer than 15 characters"
 msgstr "назва інтерфейсу є довшою за 15 символів"
 
-#: ../libnm-core/nm-utils.c:4905
+#: ../libnm-core/nm-utils.c:4865
 msgid "not valid utf-8"
 msgstr "некоректні дані UTF-8"
 
-#: ../libnm-core/nm-utils.c:4927 ../libnm-core/nm-utils.c:5395
+#: ../libnm-core/nm-utils.c:4887 ../libnm-core/nm-utils.c:5357
 msgid "is not a JSON object"
 msgstr "не є об’єктом JSON"
 
-#: ../libnm-core/nm-utils.c:5371 ../libnm-core/nm-utils.c:5711
+#: ../libnm-core/nm-utils.c:5333 ../libnm-core/nm-utils.c:5674
 msgid "value is NULL"
 msgstr "значенням є NULL"
 
-#: ../libnm-core/nm-utils.c:5371 ../libnm-core/nm-utils.c:5711
+#: ../libnm-core/nm-utils.c:5333 ../libnm-core/nm-utils.c:5674
 msgid "value is empty"
 msgstr "порожнє значення"
 
-#: ../libnm-core/nm-utils.c:5383
+#: ../libnm-core/nm-utils.c:5345
 #, c-format
 msgid "invalid JSON at position %d (%s)"
 msgstr "некоректний код JSON на позиції %d (%s)"
 
-#: ../libnm-core/nm-utils.c:6028 ../libnm-core/nm-utils.c:6048
+#: ../libnm-core/nm-utils.c:5990 ../libnm-core/nm-utils.c:6010
 msgid "unterminated escape sequence"
 msgstr "незавершена екранована послідовність"
 
-#: ../libnm-core/nm-utils.c:6073
+#: ../libnm-core/nm-utils.c:6035
 #, c-format
 msgid "unknown attribute '%s'"
 msgstr "невідомий атрибут «%s»"
 
-#: ../libnm-core/nm-utils.c:6088
+#: ../libnm-core/nm-utils.c:6050
 #, c-format
+#| msgid "missing key-value separator '%c'"
 msgid "missing key-value separator '%c' after '%s'"
 msgstr "пропущено роздільник пар ключ-значення «%c» після «%s»"
 
-#: ../libnm-core/nm-utils.c:6104
+#: ../libnm-core/nm-utils.c:6066
 #, c-format
 msgid "invalid uint32 value '%s' for attribute '%s'"
 msgstr "некоректне значення uint32 «%s» атрибута «%s»"
 
-#: ../libnm-core/nm-utils.c:6113
+#: ../libnm-core/nm-utils.c:6075
 #, c-format
 msgid "invalid uint8 value '%s' for attribute '%s'"
 msgstr "некоректне значення uint8 «%s» атрибута «%s»"
 
-#: ../libnm-core/nm-utils.c:6123
+#: ../libnm-core/nm-utils.c:6085
 #, c-format
 msgid "invalid boolean value '%s' for attribute '%s'"
 msgstr "некоректне булеве значення «%s» атрибута «%s»"
 
-#: ../libnm-core/nm-utils.c:6133
+#: ../libnm-core/nm-utils.c:6095
 #, c-format
 msgid "unsupported attribute '%s' of type '%s'"
 msgstr "непідтримуваний атрибут «%s» типу «%s»"
@@ -12934,75 +12472,75 @@ msgstr "виявлено конфліктний додаток (%s), який м
 msgid "there exists a conflicting plugin with the same name (%s)"
 msgstr "виявлено конфліктний додаток із тією самою назвою (%s)"
 
-#: ../libnm-core/nm-vpn-plugin-info.c:1070
+#: ../libnm-core/nm-vpn-plugin-info.c:1071
 #, c-format
 msgid "missing \"plugin\" setting"
 msgstr "не вказано параметр «plugin»"
 
-#: ../libnm-core/nm-vpn-plugin-info.c:1080
+#: ../libnm-core/nm-vpn-plugin-info.c:1081
 #, c-format
 msgid "%s: don't retry loading plugin which already failed previously"
 msgstr ""
 "%s: не намагатися повторно завантажити додаток, спроба завантаження якого "
 "вже завершилася помилкою"
 
-#: ../libnm-core/nm-vpn-plugin-info.c:1174
+#: ../libnm-core/nm-vpn-plugin-info.c:1175
 msgid "missing filename to load VPN plugin info"
 msgstr "не вказано назви файла для завантаження даних щодо додатка VPN"
 
-#: ../libnm-core/nm-vpn-plugin-info.c:1186
+#: ../libnm-core/nm-vpn-plugin-info.c:1187
 msgid "missing name for VPN plugin info"
 msgstr "не вказано назви для даних щодо додатка VPN"
 
-#: ../libnm-core/nm-vpn-plugin-info.c:1195
+#: ../libnm-core/nm-vpn-plugin-info.c:1196
 msgid "missing service for VPN plugin info"
 msgstr "не вказано служби для даних щодо додатка VPN"
 
-#: ../libnm-glib/nm-device.c:1824 ../libnm/nm-device.c:1309
+#: ../libnm-glib/nm-device.c:1825 ../libnm/nm-device.c:1309
 msgid "Bluetooth"
 msgstr "Bluetooth"
 
-#: ../libnm-glib/nm-device.c:1826 ../libnm/nm-device.c:1311
+#: ../libnm-glib/nm-device.c:1827 ../libnm/nm-device.c:1311
 msgid "OLPC Mesh"
 msgstr "Сітка OLPC"
 
-#: ../libnm-glib/nm-device.c:1828 ../libnm/nm-device.c:1319
+#: ../libnm-glib/nm-device.c:1829 ../libnm/nm-device.c:1319
 msgid "WiMAX"
 msgstr "WiMAX"
 
-#: ../libnm-glib/nm-device.c:1842 ../libnm/nm-device.c:1333
+#: ../libnm-glib/nm-device.c:1843 ../libnm/nm-device.c:1333
 msgid "ADSL"
 msgstr "ADSL"
 
-#: ../libnm-glib/nm-device.c:1844 ../libnm/nm-device.c:1335
+#: ../libnm-glib/nm-device.c:1845 ../libnm/nm-device.c:1335
 msgid "MACVLAN"
 msgstr "MACVLAN"
 
-#: ../libnm-glib/nm-device.c:1846 ../libnm/nm-device.c:1337
+#: ../libnm-glib/nm-device.c:1847 ../libnm/nm-device.c:1337
 msgid "VXLAN"
 msgstr "VXLAN"
 
-#: ../libnm-glib/nm-device.c:1848 ../libnm/nm-device.c:1339
+#: ../libnm-glib/nm-device.c:1849 ../libnm/nm-device.c:1339
 msgid "IPTunnel"
 msgstr "IPTunnel"
 
-#: ../libnm-glib/nm-device.c:1850 ../libnm/nm-device.c:1341
+#: ../libnm-glib/nm-device.c:1851 ../libnm/nm-device.c:1341
 msgid "Tun"
 msgstr "TUN"
 
-#: ../libnm-glib/nm-device.c:1852 ../libnm/nm-device.c:1343
+#: ../libnm-glib/nm-device.c:1853 ../libnm/nm-device.c:1343
 msgid "Veth"
 msgstr "Veth"
 
-#: ../libnm-glib/nm-device.c:1884 ../libnm/nm-device.c:1385
+#: ../libnm-glib/nm-device.c:1885 ../libnm/nm-device.c:1381
 msgid "Wired"
 msgstr "Дротове"
 
-#: ../libnm-glib/nm-device.c:1915 ../libnm/nm-device.c:1416
+#: ../libnm-glib/nm-device.c:1916 ../libnm/nm-device.c:1412
 msgid "PCI"
 msgstr "PCI"
 
-#: ../libnm-glib/nm-device.c:1917 ../libnm/nm-device.c:1418
+#: ../libnm-glib/nm-device.c:1918 ../libnm/nm-device.c:1414
 msgid "USB"
 msgstr "USB"
 
@@ -13012,14 +12550,14 @@ msgstr "USB"
 #. * "%2$s (%1$s)" if there's no grammatical way to combine
 #. * the strings otherwise.
 #.
-#: ../libnm-glib/nm-device.c:2014 ../libnm-glib/nm-device.c:2033
-#: ../libnm/nm-device.c:1731 ../libnm/nm-device.c:1750
+#: ../libnm-glib/nm-device.c:2015 ../libnm-glib/nm-device.c:2034
+#: ../libnm/nm-device.c:1727 ../libnm/nm-device.c:1746
 #, c-format
 msgctxt "long device name"
 msgid "%s %s"
 msgstr "%s %s"
 
-#: ../libnm-glib/nm-remote-connection.c:148
+#: ../libnm-glib/nm-remote-connection.c:149
 msgid "Disconnected by D-Bus"
 msgstr "Від’єднано D-Bus"
 
@@ -13043,23 +12581,23 @@ msgstr "Не вдалося ініціалізувати контекст MD5: %
 msgid "Couldn't convert password to UCS2: %d"
 msgstr "Не вдалося змінити кодування пароля на UCS2: %d"
 
-#: ../libnm-util/nm-setting-bluetooth.c:185
+#: ../libnm-util/nm-setting-bluetooth.c:186
 #, c-format
 msgid "requires '%s' or '%s' setting"
 msgstr "слід вказати параметр «%s» або «%s»"
 
-#: ../libnm-util/nm-setting-bond.c:581
+#: ../libnm-util/nm-setting-bond.c:582
 #, c-format
 msgid "'%s' is not a valid interface name for '%s' option"
 msgstr "«%s» не є коректною назвою інтерфейсу для параметра «%s»"
 
-#: ../libnm-util/nm-setting-connection.c:831
+#: ../libnm-util/nm-setting-connection.c:834
 #: ../libnm-util/nm-setting-infiniband.c:269
 #, c-format
 msgid "'%s' is not a valid interface name"
 msgstr "«%s» не є коректною назвою інтерфейсу"
 
-#: ../libnm-util/nm-setting-connection.c:859
+#: ../libnm-util/nm-setting-connection.c:862
 #, c-format
 msgid "requires presence of '%s' setting in the connection"
 msgstr "потребує визначення «%s» у параметрах з’єднання"
@@ -13079,37 +12617,37 @@ msgid "%d. IPv4 address has invalid prefix"
 msgstr "%d. Адреса IPv4 має некоректний префікс"
 
 #: ../libnm-util/nm-setting-ip4-config.c:983
-#: ../libnm-util/nm-setting-ip6-config.c:937
+#: ../libnm-util/nm-setting-ip6-config.c:939
 #, c-format
 msgid "%d. route has invalid prefix"
 msgstr "%d. Маршрут має некоректний префікс"
 
-#: ../libnm-util/nm-setting-ip6-config.c:911
+#: ../libnm-util/nm-setting-ip6-config.c:913
 #, c-format
 msgid "%d. IPv6 address is invalid"
 msgstr "%d. Адреса IPv6 є некоректною"
 
-#: ../libnm-util/nm-setting-ip6-config.c:921
+#: ../libnm-util/nm-setting-ip6-config.c:923
 #, c-format
 msgid "%d. IPv6 address has invalid prefix"
 msgstr "%d. Адреса IPv6 має некоректний префікс"
 
-#: ../libnm-util/nm-setting-vpn.c:581
+#: ../libnm-util/nm-setting-vpn.c:582
 #, c-format
 msgid "Failed to convert '%s' value '%s' to uint"
 msgstr "не вдалося перетворити значення «%2$s» «%1$s» на uint"
 
-#: ../libnm-util/nm-setting-vpn.c:588
+#: ../libnm-util/nm-setting-vpn.c:589
 #, c-format
 msgid "Secret flags property '%s' not found"
 msgstr "Властивість прапорців паролів «%s» не знайдено"
 
-#: ../libnm-util/nm-setting-wireless.c:806
+#: ../libnm-util/nm-setting-wireless.c:807
 #, c-format
 msgid "requires setting '%s' property"
 msgstr "потребує встановлення властивості «%s»"
 
-#: ../libnm/nm-device-adsl.c:72
+#: ../libnm/nm-device-adsl.c:73
 msgid "The connection was not an ADSL connection."
 msgstr "З’єднання не є з’єднанням ADSL."
 
@@ -13197,12 +12735,12 @@ msgstr "Режими роботи пристрою і з’єднання не 
 msgid "The connection was not an InfiniBand connection."
 msgstr "З’єднання не є з’єднанням InfiniBand."
 
-#: ../libnm/nm-device-infiniband.c:101 ../libnm/nm-device-wifi.c:625
+#: ../libnm/nm-device-infiniband.c:101 ../libnm/nm-device-wifi.c:599
 #: ../libnm/nm-device-wimax.c:324
 msgid "Invalid device MAC address."
 msgstr "Некоректна MAC-адреса пристрою."
 
-#: ../libnm/nm-device-infiniband.c:109 ../libnm/nm-device-wifi.c:632
+#: ../libnm/nm-device-infiniband.c:109 ../libnm/nm-device-wifi.c:606
 #: ../libnm/nm-device-wimax.c:331
 msgid "The MACs of the device and the connection didn't match."
 msgstr "Адреси MAC пристрою і з’єднання не збігаються."
@@ -13211,7 +12749,7 @@ msgstr "Адреси MAC пристрою і з’єднання не збіга
 msgid "The connection was not an IP tunnel connection."
 msgstr "З’єднання не є тунельованим IP-з’єднанням."
 
-#: ../libnm/nm-device-macvlan.c:157
+#: ../libnm/nm-device-macvlan.c:158
 msgid "The connection was not a MAC-VLAN connection."
 msgstr "З’єднання не є з’єднанням MAC-VLAN."
 
@@ -13267,15 +12805,15 @@ msgstr "З’єднання не є з’єднанням VXLAN."
 msgid "The VXLAN identifiers of the device and the connection didn't match."
 msgstr "Ідентифікатори VXLAN пристрою і з’єднання не збігаються."
 
-#: ../libnm/nm-device-wifi.c:616
+#: ../libnm/nm-device-wifi.c:590
 msgid "The connection was not a Wi-Fi connection."
 msgstr "З’єднання не є з’єднанням Wi-Fi."
 
-#: ../libnm/nm-device-wifi.c:652
+#: ../libnm/nm-device-wifi.c:626
 msgid "The device is lacking WPA capabilities required by the connection."
 msgstr "У пристрою немає можливостей WPA, потрібних з’єднанню."
 
-#: ../libnm/nm-device-wifi.c:659
+#: ../libnm/nm-device-wifi.c:633
 msgid "The device is lacking WPA2/RSN capabilities required by the connection."
 msgstr "У пристрою немає можливостей WPA2/RSN, потрібних з’єднанню."
 
@@ -13283,25 +12821,17 @@ msgstr "У пристрою немає можливостей WPA2/RSN, потр
 msgid "The connection was not a WiMAX connection."
 msgstr "З’єднання не є з’єднанням WiMAX."
 
-#: ../libnm/nm-device-wpan.c:82
-#| msgid "The connection was not a tun connection."
-msgid "The connection was not a wpan connection."
-msgstr "З’єднання не належить до типу wpan."
-
 #: ../libnm/nm-device.c:1313
-#| msgid "OpenVSwitch Interface"
-msgid "Open vSwitch Interface"
-msgstr "Інтерфейс Open vSwitch"
+msgid "OpenVSwitch Interface"
+msgstr "Інтерфейс OpenVSwitch"
 
 #: ../libnm/nm-device.c:1315
-#| msgid "OpenVSwitch Port"
-msgid "Open vSwitch Port"
-msgstr "Порт Open vSwitch"
+msgid "OpenVSwitch Port"
+msgstr "Порт OpenVSwitch"
 
 #: ../libnm/nm-device.c:1317
-#| msgid "OpenVSwitch Bridge"
-msgid "Open vSwitch Bridge"
-msgstr "Місток Open vSwitch"
+msgid "OpenVSwitch Bridge"
+msgstr "Місток OpenVSwitch"
 
 #: ../libnm/nm-device.c:1345
 msgid "MACsec"
@@ -13315,20 +12845,12 @@ msgstr "Фіктивний"
 msgid "PPP"
 msgstr "PPP"
 
-#: ../libnm/nm-device.c:1351
-msgid "IEEE 802.15.4"
-msgstr "IEEE 802.15.4"
-
-#: ../libnm/nm-device.c:1353
-msgid "6LoWPAN"
-msgstr "6LoWPAN"
-
-#: ../libnm/nm-device.c:2469
+#: ../libnm/nm-device.c:2458
 #, c-format
 msgid "The connection was not valid: %s"
 msgstr "З’єднання не є коректним: %s"
 
-#: ../libnm/nm-device.c:2478
+#: ../libnm/nm-device.c:2467
 #, c-format
 msgid "The interface names of the device and the connection didn't match."
 msgstr "Назви інтерфейсу пристрою і з’єднання не збігаються."
@@ -13337,7 +12859,7 @@ msgstr "Назви інтерфейсу пристрою і з’єднання
 msgid "Checkpoint was removed before it was initialized"
 msgstr "Пункт перевірки вилучено до його ініціалізації"
 
-#: ../libnm/nm-manager.c:955
+#: ../libnm/nm-manager.c:941
 msgid "Active connection removed before it was initialized"
 msgstr "Активне з’єднання вилучено до його ініціалізації"
 
@@ -13345,7 +12867,7 @@ msgstr "Активне з’єднання вилучено до його іні
 msgid "Connection removed before it was initialized"
 msgstr "З’єднання вилучено до його ініціалізації"
 
-#: ../libnm/nm-vpn-plugin-old.c:847 ../libnm/nm-vpn-service-plugin.c:1012
+#: ../libnm/nm-vpn-plugin-old.c:848 ../libnm/nm-vpn-service-plugin.c:1014
 msgid "No service name specified"
 msgstr "Не вказано назви служби"
 
@@ -13507,36 +13029,36 @@ msgstr ""
 "Правила системи забороняють вмикання або вимикання перевірки придатності до "
 "з'єднання"
 
-#: ../shared/nm-utils/nm-shared-utils.c:946
+#: ../shared/nm-utils/nm-shared-utils.c:794
 #, c-format
 msgid "object class '%s' has no property named '%s'"
 msgstr "у класі об’єктів «%s» немає властивості із назвою «%s»"
 
-#: ../shared/nm-utils/nm-shared-utils.c:953
+#: ../shared/nm-utils/nm-shared-utils.c:801
 #, c-format
 msgid "property '%s' of object class '%s' is not writable"
 msgstr "властивість «%s» класу об’єктів «%s» є непридатною до запису"
 
-#: ../shared/nm-utils/nm-shared-utils.c:960
+#: ../shared/nm-utils/nm-shared-utils.c:808
 #, c-format
 msgid ""
 "construct property \"%s\" for object '%s' can't be set after construction"
 msgstr ""
 "властивість construct «%s» об’єкта «%s» не можна встановлювати після побудови"
 
-#: ../shared/nm-utils/nm-shared-utils.c:968
+#: ../shared/nm-utils/nm-shared-utils.c:816
 #, c-format
 msgid "'%s::%s' is not a valid property name; '%s' is not a GObject subtype"
 msgstr "«%s::%s» не є коректною назвою властивості; «%s» не є підтипом GObject"
 
-#: ../shared/nm-utils/nm-shared-utils.c:977
+#: ../shared/nm-utils/nm-shared-utils.c:825
 #, c-format
 msgid "unable to set property '%s' of type '%s' from value of type '%s'"
 msgstr ""
 "не вдалося встановити значення властивості «%s» типу «%s» на основі значення "
 "типу «%s»"
 
-#: ../shared/nm-utils/nm-shared-utils.c:988
+#: ../shared/nm-utils/nm-shared-utils.c:836
 #, c-format
 msgid ""
 "value \"%s\" of type '%s' is invalid or out of range for property '%s' of "
@@ -13549,15 +13071,13 @@ msgstr ""
 #. * as "Wired Connection" or "VPN Connection". The %d is a number
 #. * that is combined with the first argument to create a unique
 #. * connection id.
-#: ../src/NetworkManagerUtils.c:119
+#: ../src/NetworkManagerUtils.c:112
 #, c-format
-#| msgctxt "connection id fallback"
-#| msgid "%s %d"
 msgctxt "connection id fallback"
-msgid "%s %u"
-msgstr "%s %u"
+msgid "%s %d"
+msgstr "%s %d"
 
-#: ../src/main.c:181 ../src/main.c:315
+#: ../src/main.c:181 ../src/main.c:318
 #, c-format
 msgid "Failed to read configuration: %s\n"
 msgstr "Не вдалося прочитати налаштування: %s\n"
@@ -13608,14 +13128,32 @@ msgstr ""
 "з якими слід пов’язувати картки бездротового доступу на вашому\n"
 "комп’ютері."
 
-#: ../src/main.c:305 ../src/main-utils.c:286 ../src/nm-iface-helper.c:442
+#: ../src/main.c:303 ../src/main-utils.c:286 ../src/nm-iface-helper.c:441
 #, c-format
 msgid "%s.  Please use --help to see a list of valid options.\n"
 msgstr ""
 "%s. Щоб ознайомитися зі списком параметрів, скористайтеся параметром --"
 "help.\n"
 
-#: ../src/main.c:340 ../src/nm-iface-helper.c:457
+#: ../src/main.c:308 ../src/nm-iface-helper.c:446
+#, c-format
+msgid "Ignoring unrecognized log domain(s) '%s' passed on command line.\n"
+msgstr ""
+"Ігноруємо нерозпізнані домени журналювання, «%s», передані за допомогою "
+"командного рядка.\n"
+
+#: ../src/main.c:333
+#, c-format
+msgid "Error in configuration file: %s.\n"
+msgstr "Помилка у файлі налаштувань: %s.\n"
+
+#: ../src/main.c:338
+#, c-format
+msgid "Ignoring unrecognized log domain(s) '%s' from config files.\n"
+msgstr ""
+"Ігноруємо нерозпізнані домени журналювання, «%s», з файлів налаштувань.\n"
+
+#: ../src/main.c:349 ../src/nm-iface-helper.c:456
 #, c-format
 msgid "Could not daemonize: %s [error %u]\n"
 msgstr "Не вдалося створити фонову службу: %s [помилка %u]\n"
@@ -13650,11 +13188,11 @@ msgstr "%s вже працює (pid %ld)\n"
 msgid "You must be root to run %s!\n"
 msgstr "Для виконання %s потрібно перейти у режим root!\n"
 
-#: ../src/dhcp/nm-dhcp-dhclient-utils.c:313
+#: ../src/dhcp/nm-dhcp-dhclient-utils.c:284
 msgid "# Created by NetworkManager\n"
 msgstr "# Створено за допомогою NetworkManager\n"
 
-#: ../src/dhcp/nm-dhcp-dhclient-utils.c:323
+#: ../src/dhcp/nm-dhcp-dhclient-utils.c:294
 #, c-format
 msgid ""
 "# Merged from %s\n"
@@ -13668,75 +13206,70 @@ msgstr ""
 msgid "%s Network"
 msgstr "Мережа %s"
 
-#: ../src/devices/bluetooth/nm-device-bt.c:262
+#: ../src/devices/bluetooth/nm-device-bt.c:264
 msgid "PAN requested, but Bluetooth device does not support NAP"
 msgstr ""
 "Надіслано запит щодо PAN, але у пристрої Bluetooth не передбачено підтримки "
 "NAP"
 
-#: ../src/devices/bluetooth/nm-device-bt.c:272
+#: ../src/devices/bluetooth/nm-device-bt.c:274
 msgid "PAN connections cannot specify GSM, CDMA, or serial settings"
 msgstr ""
 "Записи з’єднання PAN не можуть вказувати параметрів GSM, CDMA або "
 "послідовного пристрою"
 
-#: ../src/devices/bluetooth/nm-device-bt.c:285
+#: ../src/devices/bluetooth/nm-device-bt.c:287
 msgid "PAN connection"
 msgstr "З’єднання PAN"
 
-#: ../src/devices/bluetooth/nm-device-bt.c:292
+#: ../src/devices/bluetooth/nm-device-bt.c:294
 msgid "DUN requested, but Bluetooth device does not support DUN"
 msgstr ""
 "Надіслано запит щодо DUN, але у пристрої Bluetooth не передбачено підтримки "
 "DUN"
 
-#: ../src/devices/bluetooth/nm-device-bt.c:302
+#: ../src/devices/bluetooth/nm-device-bt.c:304
 msgid "DUN connection must include a GSM or CDMA setting"
 msgstr "З’єднання DUN має включати параметр GSM або CDMA"
 
-#: ../src/devices/bluetooth/nm-device-bt.c:312
+#: ../src/devices/bluetooth/nm-device-bt.c:314
 #: ../src/devices/wwan/nm-modem-broadband.c:709
 msgid "GSM connection"
 msgstr "З’єднання GSM"
 
-#: ../src/devices/bluetooth/nm-device-bt.c:316
+#: ../src/devices/bluetooth/nm-device-bt.c:318
 #: ../src/devices/wwan/nm-modem-broadband.c:733
 msgid "CDMA connection"
 msgstr "З’єднання CDMA"
 
-#: ../src/devices/bluetooth/nm-device-bt.c:324
+#: ../src/devices/bluetooth/nm-device-bt.c:326
 msgid "Unknown/unhandled Bluetooth connection type"
 msgstr "Невідомий або непридатний тип з’єднання Bluetooth"
 
-#: ../src/devices/bluetooth/nm-device-bt.c:345
-#: ../src/devices/nm-device-ethernet.c:1413
-#: ../src/devices/nm-device-infiniband.c:190
-#: ../src/devices/wifi/nm-device-wifi.c:893
+#: ../src/devices/bluetooth/nm-device-bt.c:347
+#: ../src/devices/nm-device-ethernet.c:1421
+#: ../src/devices/nm-device-infiniband.c:210
+#: ../src/devices/wifi/nm-device-wifi.c:900
 msgid "connection does not match device"
 msgstr "з’єднання не відповідає пристрою"
 
-#: ../src/devices/nm-device-6lowpan.c:206
-#| msgid "PAN connection"
-msgid "6LOWPAN connection"
-msgstr "З'єднання 6LOWPAN"
-
-#: ../src/devices/nm-device-bond.c:89
+#: ../src/devices/nm-device-bond.c:91
 msgid "Bond connection"
 msgstr "Прив’язане з’єднання"
 
-#: ../src/devices/nm-device-bridge.c:128
+#: ../src/devices/nm-device-bridge.c:130
 msgid "Bridge connection"
 msgstr "З’єднання містка"
 
-#: ../src/devices/nm-device-dummy.c:68
+#: ../src/devices/nm-device-dummy.c:70
 msgid "Dummy connection"
 msgstr "Фіктивне з’єднання"
 
-#: ../src/devices/nm-device-ethernet.c:1394
+#: ../src/devices/nm-device-ethernet.c:1402
 msgid "PPPoE connection"
 msgstr "З’єднання PPPoE"
 
-#: ../src/devices/nm-device-ethernet.c:1394
+#: ../src/devices/nm-device-ethernet.c:1402
 msgid "Wired connection"
 msgstr "Дротове з’єднання"
 
@@ -13745,32 +13278,27 @@ msgstr "Дротове з’єднання"
 msgid "Wired connection %d"
 msgstr "Дротове з’єднання %d"
 
-#: ../src/devices/nm-device-ip-tunnel.c:371
+#: ../src/devices/nm-device-ip-tunnel.c:373
 msgid "IP tunnel connection"
 msgstr "З’єднання IP-тунель"
 
-#: ../src/devices/nm-device-macvlan.c:347
+#: ../src/devices/nm-device-macvlan.c:344
 msgid "MACVLAN connection"
 msgstr "З’єднання MACVLAN"
 
-#: ../src/devices/nm-device-tun.c:158
+#: ../src/devices/nm-device-tun.c:146
 msgid "TUN connection"
 msgstr "З’єднання TUN"
 
-#: ../src/devices/nm-device-wpan.c:68
-#| msgid "PAN connection"
-msgid "WPAN connection"
-msgstr "З'єднання WPAN"
-
-#: ../src/devices/team/nm-device-team.c:118
+#: ../src/devices/team/nm-device-team.c:119
 msgid "Team connection"
 msgstr "Командне з’єднання"
 
-#: ../src/devices/wifi/nm-device-olpc-mesh.c:147
+#: ../src/devices/wifi/nm-device-olpc-mesh.c:152
 msgid "Mesh"
 msgstr "Сітка"
 
-#: ../src/devices/wifi/nm-device-wifi.c:860
+#: ../src/devices/wifi/nm-device-wifi.c:867
 msgid "WPA Ad-Hoc disabled due to kernel bugs"
 msgstr "Спеціальний WPA вимкнено через вади у ядрі"
 
@@ -14098,40 +13626,54 @@ msgstr ""
 "nm-iface-helper — малий окремий процес, який керує окремим інтерфейсом "
 "мережі."
 
-#: ../src/nm-iface-helper.c:423
+#: ../src/nm-iface-helper.c:422
 #, c-format
 msgid "An interface name and UUID are required\n"
 msgstr "Потрібні назва і UUID інтерфейсу\n"
 
-#: ../src/nm-iface-helper.c:429
+#: ../src/nm-iface-helper.c:428
 #, c-format
 msgid "Failed to find interface index for %s (%s)\n"
 msgstr "Не вдалося знайти покажчик інтерфейсу для %s (%s)\n"
 
-#: ../src/nm-iface-helper.c:447
-#, c-format
-msgid "Ignoring unrecognized log domain(s) '%s' passed on command line.\n"
-msgstr ""
-"Ігноруємо нерозпізнані домени журналювання, «%s», передані за допомогою "
-"командного рядка.\n"
-
-#: ../src/nm-iface-helper.c:486
+#: ../src/nm-iface-helper.c:485
 #, c-format
 msgid "(%s): Invalid IID %s\n"
 msgstr "(%s): некоректний IID %s\n"
 
-#: ../src/nm-iface-helper.c:497
+#: ../src/nm-iface-helper.c:496
 #, c-format
+#| msgid "(%s): Invalid IID %s\n"
 msgid "(%s): Invalid DHCP client-id %s\n"
 msgstr "(%s): некоректний ідентифікатор клієнта DHCP %s\n"
 
-#: ../src/nm-logging.c:273
+#: ../src/nm-logging.c:267
 #, c-format
 msgid "Unknown log level '%s'"
 msgstr "Невідомий рівень ведення журналу, «%s»"
 
-#: ../src/nm-logging.c:375
+#: ../src/nm-logging.c:369
 #, c-format
 msgid "Unknown log domain '%s'"
 msgstr "Невідомий домен ведення журналу, «%s»"
 
+#~ msgid "'%s' is not a valid flag number; use <0-%d>"
+#~ msgstr ""
+#~ "«%s» не є коректним номером прапорця; скористайтеся номером у діапазоні "
+#~ "<0-%d>"
+
+#~ msgid "Array of DNS search domains."
+#~ msgstr "Масив доменів пошуку DNS."
+
+#~ msgid ""
+#~ "Corresponds to the teamd runner.name. Permitted values are: \"roundrobin"
+#~ "\", \"broadcast\", \"activebackup\", \"loadbalance\", \"lacp\"."
+#~ msgstr ""
+#~ "Відповідає runner.name у teamd. Можливі такі значення: «roundrobin», "
+#~ "«broadcast», «activebackup», «loadbalance», «lacp»."
+
+#~ msgid "Editor failed with status %d"
+#~ msgstr "Помилка редактора з кодом стану %d"
+
+#~ msgid "Editor failed with signal %d"
+#~ msgstr "Помилка редактора з сигналом %d"
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 7e0fcd42..5c5050c1 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -1,33 +1,34 @@
-# Simplified Chinese translation for NetworkManager.
-# Copyright (C) 2004-2018 Free Software Foundation, Inc.
+# translation of zh_CN.po to Wei Liu
+# Simplified Chinese translation to NetworkManager
+# Copyright (C) 2009, 2010 Free Software Foundation, Inc.
 # This file is distributed under the same license as the NetworkManager package.
+#
 # Funda Wang <fundawang@linux.net.cn>, 2004.
 # Leah Liu <lliu@redhat.com>, 2010.
 # Aron Xu <happyaron.xu@gmail.com>, 2009, 2010.
+# Simplified Chinese translation for NetworkManager
 # tuhaihe <1132321739qq@gmail.com>, 2012, 2013.
 # Wylmer Wang <wantinghard@gmail.com>, 2013.
 # Luo Lei <luolei@ubuntukylin.com>, 2014.
+# Dingzhong Chen <wsxy162@gmail.com>, 2016.
 # Ian Li <https://launchpad.net/~ian.li>, 2016.
 # shijing <jingshi@ubuntukylin.com>, 2016.
 # Mingye Wang (Arthur2e5) <arthur200126@gmail.com>, 2016.
-# Mingcong Bai <jeffbai@aosc.xyz>, 2017.
-# Dingzhong Chen <wsxy162@gmail.com>, 2016, 2017, 2018.
-#
+# lrintel <lrintel@redhat.com>, 2017. #zanata
 msgid ""
 msgstr ""
-"Project-Id-Version: NetworkManager master\n"
-"Report-Msgid-Bugs-To: https://gitlab.freedesktop.org/NetworkManager/"
-"NetworkManager/issues\n"
-"POT-Creation-Date: 2018-08-29 03:24+0000\n"
-"PO-Revision-Date: 2018-08-30 12:00+0800\n"
-"Last-Translator: Dingzhong Chen <wsxy162@gmail.com>\n"
-"Language-Team: Chinese (China) <i18n-zh@googlegroups.com>\n"
-"Language: zh_CN\n"
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2017-12-12 10:22+0100\n"
+"PO-Revision-Date: 2017-11-07 06:48+0000\n"
+"Last-Translator: Copied by Zanata <copied-by-zanata@zanata.org>\n"
+"Language-Team: Chinese (simplified) <i18n-zh@googlegroups.com>\n"
+"Language: zh_Hans\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Generator: Poedit 2.1.1\n"
+"X-Generator: Zanata 4.3.2\n"
 
 #: ../clients/cli/agent.c:40
 #, c-format
@@ -37,7 +38,7 @@ msgid ""
 "COMMAND := { secret | polkit | all }\n"
 "\n"
 msgstr ""
-"用法:nmcli agent { 命令 | help }\n"
+"用法: nmcli agent { 命令 | help }\n"
 "\n"
 "命令 := { secret | polkit | all }\n"
 "\n"
@@ -53,12 +54,11 @@ msgid ""
 "and if a password is required asks the user for it.\n"
 "\n"
 msgstr ""
-"用法:nmcli agent secret { help }\n"
-"\n"
-"将 nmcli 作为网络管理器(NetworkManager)的密钥(secret)代理运行。当 "
-"NetworkManager 要求密码时,它将请求\n"
-"注册的代理提供。这个命令将使 nmcli 保持运行,如果要求密码则会请求用户提供。\n"
+"用法: nmcli agent secret { help }\n"
 "\n"
+"将 nmcli 作为 NetworkManager 安全代理运行。当 NetworkManager 要求密码时,它将"
+"请求注册的代理提供。这个命令将使 nmcli 保持运行,如果要求密码则会请求用户提"
+"供。\n"
 "\n"
 
 #: ../clients/cli/agent.c:58
@@ -72,10 +72,10 @@ msgid ""
 "the response back to polkit.\n"
 "\n"
 msgstr ""
-"用法:nmcli agent polkit { help }\n"
+"用法: nmcli agent polkit { help }\n"
 "\n"
-"将 nmcli 注册为用于用户会话的 polkit 操作。\n"
-"当 polkit 守护进程要求授权时,nmcli 询问用户后将其响应返回 polkit。\n"
+"为用户会话将 nmcli 注册为 polkit 操作。当 polkit 守护进程要求授权时,nmcli 将"
+"向用户请求并响应 polkit。\n"
 "\n"
 
 #: ../clients/cli/agent.c:68
@@ -86,85 +86,80 @@ msgid ""
 "Runs nmcli as both NetworkManager secret and a polkit agent.\n"
 "\n"
 msgstr ""
-"用法:nmcli agent all { help }\n"
+"用法: nmcli agent all { help }\n"
 "\n"
-"将 nmcli 同时作为网络管理器(NetworkManager)的密钥(secret)代理及 polkit 代"
-"理运行。\n"
+"将 nmcli 作为 NetworkManager 安全代理及 polkit 代理运行。\n"
 "\n"
 
-#: ../clients/cli/agent.c:157
+#: ../clients/cli/agent.c:158
 #, c-format
 msgid "nmcli successfully registered as a NetworkManager's secret agent.\n"
-msgstr ""
-"nmcli 已成功地注册为网络管理器(NetworkManager)的密钥(secret)代理。\n"
+msgstr "nmcli 已成功地注册为 NetworkManager 的安全代理。\n"
 
-#: ../clients/cli/agent.c:159
+#: ../clients/cli/agent.c:160
 #, c-format
 msgid "Error: secret agent initialization failed"
-msgstr "错误:密钥(secret)代理初始化失败"
+msgstr "错误:安全代理初始化失败"
 
-#: ../clients/cli/agent.c:178
+#: ../clients/cli/agent.c:179
 #, c-format
 msgid "Error: polkit agent initialization failed: %s"
 msgstr "错误:polkit 代理初始化失败:%s"
 
-#: ../clients/cli/agent.c:186
+#: ../clients/cli/agent.c:187
 #, c-format
 msgid "nmcli successfully registered as a polkit agent.\n"
 msgstr "nmcli 已成功地注册为 polkit 代理。\n"
 
-#: ../clients/cli/common.c:361 ../clients/cli/common.c:362
-#: ../clients/cli/common.c:393 ../clients/cli/common.c:394
-#: ../clients/cli/connections.c:1390
+#: ../clients/cli/common.c:262 ../clients/cli/common.c:277
 msgid "GROUP"
-msgstr "组"
+msgstr "群组"
 
-#: ../clients/cli/common.c:621
+#: ../clients/cli/common.c:559
 #, c-format
 msgid "Error: openconnect failed: %s\n"
 msgstr "错误:openconnect 失败:%s\n"
 
-#: ../clients/cli/common.c:628
+#: ../clients/cli/common.c:566
 #, c-format
 msgid "Error: openconnect failed with status %d\n"
 msgstr "错误:openconnect 失败,状态为 %d\n"
 
-#: ../clients/cli/common.c:630
+#: ../clients/cli/common.c:568
 #, c-format
 msgid "Error: openconnect failed with signal %d\n"
 msgstr "错误:openconnect 失败,信号为 %d\n"
 
-#: ../clients/cli/common.c:710
+#: ../clients/cli/common.c:648
 #, c-format
 msgid ""
 "Warning: password for '%s' not given in 'passwd-file' and nmcli cannot ask "
 "without '--ask' option.\n"
 msgstr ""
-"警告:\"passwd-file\" 里没有给定 \"%s\" 的密码而且 nmcli 没有 \"--ask\" 选项"
-"就无法进行\n"
-"询问。\n"
+"警告: 'passwd-file' 里没有给出 '%s' 的密码,nmcli 无法用 '--ask' 选项进行请"
+"求。\n"
 
-#: ../clients/cli/common.c:1200
+#: ../clients/cli/common.c:1114
 #, c-format
 msgid "Error: Could not create NMClient object: %s."
 msgstr "错误:无法创建 NMClient 对象:%s。"
 
-#: ../clients/cli/common.c:1220
+#: ../clients/cli/common.c:1134
 msgid "Error: NetworkManager is not running."
-msgstr "错误:网络管理器(NetworkManager)未运行。"
+msgstr "错误:网络管理器未运行。"
 
-#: ../clients/cli/common.c:1316
+#: ../clients/cli/common.c:1231
 #, c-format
 msgid "Error: argument '%s' not understood. Try passing --help instead."
-msgstr "错误:不能理解参数 \"%s\"。试下换成传递 --help 参数。"
+msgstr "错误:参数“%s”不理解。试下替用 --help 来传送。"
 
-#: ../clients/cli/common.c:1326
+#: ../clients/cli/common.c:1241
 msgid "Error: missing argument. Try passing --help."
-msgstr "错误:缺少参数。试下传递 --help 参数。"
+msgstr "错误:缺少参数。尝试传送 --help。"
 
-#: ../clients/cli/common.c:1379
+#: ../clients/cli/common.c:1294
 msgid "access denied"
-msgstr "访问遭到拒绝"
+msgstr "访问遭拒"
 
 #. define some prompts for connection editor
 #: ../clients/cli/connections.c:64
@@ -173,7 +168,7 @@ msgstr "设置名称?"
 
 #: ../clients/cli/connections.c:65
 msgid "Property name? "
-msgstr "属性名称?"
+msgstr "属性名称? "
 
 #: ../clients/cli/connections.c:66
 msgid "Enter connection type: "
@@ -181,87 +176,24 @@ msgstr "输入连接类型:"
 
 #. define some other prompts
 #: ../clients/cli/connections.c:70
-msgid "Connection (name, UUID, or path): "
-msgstr "连接(名称、UUID 或路径):"
+msgid "Connection (name, UUID, or path)"
+msgstr "连接(名称、UUID 或路径)"
 
 #: ../clients/cli/connections.c:71
-msgid "VPN connection (name, UUID, or path): "
-msgstr "VPN 连接(名称、UUID 或路径):"
+msgid "VPN connection (name, UUID, or path)"
+msgstr "VPN 连接(名称、UUID 或路径)"
 
 #: ../clients/cli/connections.c:72
-msgid "Connection(s) (name, UUID, or path): "
-msgstr "连接(名称、UUID 或路径):"
+msgid "Connection(s) (name, UUID, or path)"
+msgstr "连接(名称、UUID 或路径)"
 
 # apath = active path
 #: ../clients/cli/connections.c:73
-msgid "Connection(s) (name, UUID, path or apath): "
-msgstr "连接(名称、UUID、路径或活动路径):"
-
-#: ../clients/cli/connections.c:80 ../clients/cli/connections.c:89
-#: ../clients/cli/devices.c:421 ../clients/cli/devices.c:513
-#: ../clients/cli/devices.c:520 ../clients/cli/general.c:41
-#: ../clients/cli/general.c:82 ../clients/cli/general.c:150
-#: ../clients/cli/general.c:155 ../clients/common/nm-client-utils.c:260
-#: ../clients/common/nm-client-utils.c:273
-#: ../clients/common/nm-client-utils.c:277
-#: ../clients/common/nm-client-utils.c:282
-#: ../clients/common/nm-meta-setting-desc.c:1510
-#: ../clients/common/nm-meta-setting-desc.c:1560
-#: ../clients/common/nm-meta-setting-desc.c:2707
-#: ../clients/common/nm-meta-setting-desc.c:2762
-msgid "unknown"
-msgstr "未知"
-
-#: ../clients/cli/connections.c:81
-msgid "activating"
-msgstr "激活中"
-
-#: ../clients/cli/connections.c:82
-msgid "activated"
-msgstr "已激活"
-
-#: ../clients/cli/connections.c:83 ../clients/common/nm-client-utils.c:271
-msgid "deactivating"
-msgstr "停用中"
-
-#: ../clients/cli/connections.c:84
-msgid "deactivated"
-msgstr "已停用"
-
-#: ../clients/cli/connections.c:90
-msgid "VPN connecting (prepare)"
-msgstr "VPN 连接中(准备)"
-
-#: ../clients/cli/connections.c:91
-msgid "VPN connecting (need authentication)"
-msgstr "VPN 连接中(需要验证)"
-
-#: ../clients/cli/connections.c:92
-msgid "VPN connecting"
-msgstr "VPN 连接中"
-
-#: ../clients/cli/connections.c:93
-msgid "VPN connecting (getting IP configuration)"
-msgstr "VPN 连接中(获取 IP 配置中)"
-
-#: ../clients/cli/connections.c:94
-msgid "VPN connected"
-msgstr "VPN 已连接"
-
-#: ../clients/cli/connections.c:95
-msgid "VPN connection failed"
-msgstr "VPN 连接失败"
+msgid "Connection(s) (name, UUID, path or apath)"
+msgstr "连接(名称、UUID、路径或活动路径)"
 
-#: ../clients/cli/connections.c:96
-msgid "VPN disconnected"
-msgstr "VPN 已断开"
-
-#: ../clients/cli/connections.c:464
-msgid "never"
-msgstr "从不"
-
-#: ../clients/cli/connections.c:814
-#, c-format
+#: ../clients/cli/connections.c:195
+#, fuzzy, c-format
 msgid ""
 "Usage: nmcli connection { COMMAND | help }\n"
 "\n"
@@ -308,20 +240,21 @@ msgstr ""
 "  show [--active] [--order <order spec>]\n"
 "  show [--active] [id | uuid | path | apath] <ID> ...\n"
 "\n"
-"  up [[id | uuid | path] <ID>] [ifname <接口名>] [ap <BSSID>] [passwd-file <"
-"密码文件>]\n"
+"  up [[id | uuid | path] <ID>] [ifname <ifname>] [ap <BSSID>] [passwd-file "
+"<file with passwords>]\n"
 "\n"
 "  down [id | uuid | path | apath] <ID> ...\n"
 "\n"
-"  add 通用选项 类型特定选项 从属选项 IP_选项 [-- ([+|-]<设置>.<属性> <值"
-">)+]\n"
+"  add COMMON_OPTIONS TYPE_SPECIFIC_OPTIONS SLAVE_OPTIONS IP_OPTIONS [-- "
+"([+|-]<setting>.<property> <value>)+]\n"
 "\n"
-"  modify [--temporary] [id | uuid | path] <ID> ([+|-]<设置>.<属性> <值>)+\n"
+"  modify [--temporary] [id | uuid | path] <ID> ([+|-]<setting>.<property> "
+"<value>)+\n"
 "\n"
-"  clone [--temporary] [id | uuid | path ] <ID> <新名称>\n"
+"  clone [--temporary] [id | uuid | path ] <ID> <new name>\n"
 "\n"
 "  edit [id | uuid | path] <ID>\n"
-"  edit [type <新连接类型>] [con-name <新连接名称>]\n"
+"  edit [type <new_con_type>] [con-name <new_con_name>]\n"
 "\n"
 "  delete [id | uuid | path] <ID>\n"
 "\n"
@@ -329,14 +262,14 @@ msgstr ""
 "\n"
 "  reload\n"
 "\n"
-"  load <文件名> [ <文件名>... ]\n"
+"  load <filename> [ <filename>... ]\n"
 "\n"
-"  import [--temporary] type <类型> file <要导入的文件>\n"
+"  import [--temporary] type <type> file <file to import>\n"
 "\n"
-"  export [id | uuid | path] <ID> [<输出文件>]\n"
+"  export [id | uuid | path] <ID> [<output file>]\n"
 "\n"
 
-#: ../clients/cli/connections.c:836
+#: ../clients/cli/connections.c:217
 #, c-format
 msgid ""
 "Usage: nmcli connection show { ARGUMENTS | help }\n"
@@ -362,26 +295,22 @@ msgid ""
 "account. Use global --show-secrets option to reveal associated secrets as "
 "well.\n"
 msgstr ""
-"用法:nmcli connection show { 参数 | help }\n"
+"用法:nmcli connection show { ARGUMENTS | help }\n"
 "\n"
-"参数 := [--active] [--order <排序规则>]\n"
+"ARGUMENTS := [--active] [--order <order spec>]\n"
 "\n"
-"列出内存中以及磁盘上的连接配置集,其中也有些是活动的,如果它正被设备使用的"
-"话。\n"
-"未使用参数时,所有的配置集都将列出。当指定 --active 选项时,只显示活动的配"
-"置\n"
-"集。--order 允许自定义连接的顺序(请参考手册页)。\n"
+"列出 in-memory 和 on-disk 连接配置集,如果设备正在使用这个配置集,其中一些也"
+"可能是活动的。未使用参数时,所有的配置集都会被列出。当指定 --active 选项时,"
+"只显示活动的配置集。 --order 允许自定义连接排序(请参考手册页)。\n"
 "\n"
-"参数 := [--active] [id | uuid | path | apath] <ID> ...\n"
+"ARGUMENTS := [--active] [id | uuid | path | apath] <ID> ...\n"
 "\n"
-"显示指定连接的细节。在默认情况下,静态配置和活动连接数据都会被显示。您可以用"
-"全\n"
-"局的 \"--fields\" 选项过滤输出。更多信息请参考手册页。当指定 --active 选项"
-"时,只\n"
-"会考虑活动的配置集。请使用全局的 --show-secrets 选项以同时显示关联的密钥"
-"(secret)。\n"
+"显示指定的连接的细节。在默认情况下,静态配置和活动连接数据都会被显示。您可以"
+"用全局的 '--fields' 选项过滤输出。更多信息请参考手册页。当指定 --active 选项"
+"时,只会考虑活动的配置集。请使用全局的 --show-secrets 选项来显示关联的秘"
+"密。\n"
 
-#: ../clients/cli/connections.c:857
+#: ../clients/cli/connections.c:238
 #, c-format
 msgid ""
 "Usage: nmcli connection up { ARGUMENTS | help }\n"
@@ -405,24 +334,24 @@ msgid ""
 "passwd-file - file with password(s) required to activate the connection\n"
 "\n"
 msgstr ""
-"用法:nmcli connection up { 参数 | help }\n"
+"用法:nmcli connection up { ARGUMENTS | help }\n"
 "\n"
-"参数 := [id | uuid | path] <ID> [ifname <接口名>] [ap <BSSID>] [nsp <名称>] "
-"[passwd-file <密码文件>]\n"
+"ARGUMENTS := [id | uuid | path] <ID> [ifname <ifname>] [ap <BSSID>] [nsp "
+"<name>] [passwd-file <file with passwords>]\n"
 "\n"
-"激活设备上的连接。要激活的配置集由它的名称、UUID 或 D-Bus 路径来确定。\n"
+"激活设备上的连接。要激活的配置集是由它的名称、UUID 或 D-Bus 路径来确定。\n"
 "\n"
-"参数 := ifname <接口名称> [ap <BSSID>] [nsp <名称>] [passwd-file <密码文件"
-">]\n"
+"ARGUMENTS := ifname <ifname> [ap <BSSID>] [nsp <name>] [passwd-file <file "
+"with passwords>]\n"
 "\n"
-"用连接激活设备。网络管理器(NetworkManager)会自动选择连接配置集。\n"
+"用连接激活设备。NetworkManager 会自动选择连接配置集。\n"
 "\n"
 "ifname      - 指定激活连接所用的设备\n"
 "ap          - 指定要连接的 AP(只对 Wi-Fi 有效)\n"
 "nsp         - 指定要连接的 NSP(只对 WiMAX 有效)\n"
-"passwd-file - 激活连接所需的密码文件\n"
+"passwd-file - 激活连接所需的密码\n"
 
-#: ../clients/cli/connections.c:878
+#: ../clients/cli/connections.c:259
 #, c-format
 msgid ""
 "Usage: nmcli connection down { ARGUMENTS | help }\n"
@@ -435,16 +364,15 @@ msgid ""
 "UUID or D-Bus path.\n"
 "\n"
 msgstr ""
-"用法:nmcli connection down { 参数 | help }\n"
+"用法:nmcli connection down { ARGUMENTS | help }\n"
 "\n"
-"参数 := [id | uuid | path | apath] <ID> ...\n"
+"ARGUMENTS := [id | uuid | path | apath] <ID> ...\n"
 "\n"
-"从设备停用连接(无需阻止设备再次自动激活)。要停用的配置集由它的名称、UUID "
-"或 \n"
-"D-Bus 路径来确定。\n"
+"取消激活设备的连接(无需阻止设备再次自动激活)。要取消激活的配置集是由它的名"
+"称、UUID 或 D-Bus 路径来确定的。\n"
 "\n"
 
-#: ../clients/cli/connections.c:890
+#: ../clients/cli/connections.c:271
 #, c-format
 msgid ""
 "Usage: nmcli connection add { ARGUMENTS | help }\n"
@@ -581,14 +509,7 @@ msgid ""
 "                  [source-port-max <0-65535>]\n"
 "                  [destination-port <0-65535>]\n"
 "\n"
-"    wpan:         [short-addr <0x0000-0xffff>]\n"
-"\n"
-"                  [pan-id <0x0000-0xffff>]\n"
-"\n"
-"                  [mac <MAC address>]\n"
-"\n"
-"    6lowpan:      dev <parent device (connection UUID, ifname, or MAC)>\n"
-"    dummy:\n"
+"    dummy:         \n"
 "\n"
 "  SLAVE_OPTIONS:\n"
 "    bridge:       [priority <0-63>]\n"
@@ -602,162 +523,8 @@ msgid ""
 "                  [ip6 <IPv6 address>] [gw6 <IPv6 gateway>]\n"
 "\n"
 msgstr ""
-"用法:nmcli connection add { 参数 | help }\n"
-"\n"
-"参数 := 通用选项 类型特定选项 从属选项 IP_选项 [-- ([+|-]<设置>.<属性> <值"
-">)+]\n"
-"\n"
-"  通用选项:\n"
-"                  type <类型>\n"
-"                  ifname <接口名> | \"*\"\n"
-"                  [con-name <连接名称>]\n"
-"                  [autoconnect yes|no]\n"
-"                  [save yes|no]\n"
-"                  [master <主连接(接口名、连接的 UUID 或其名称)>]\n"
-"                  [slave-type <主连接类型>]\n"
-"\n"
-"  类型特定选项:\n"
-"    ethernet:     [mac <MAC 地址>]\n"
-"                  [cloned-mac <克隆的 MAC 地址>]\n"
-"                  [mtu <MTU>]\n"
-"\n"
-"    wifi:         ssid <SSID>\n"
-"                  [mac <MAC 地址>]\n"
-"                  [cloned-mac <克隆的 MAC 地址>]\n"
-"                  [mtu <MTU>]\n"
-"                  [mode infrastructure|ap|adhoc]\n"
-"\n"
-"    wimax:        [mac <MAC 地址>]\n"
-"                  [nsp <NSP>]\n"
-"\n"
-"    pppoe:        username <PPPoE 用户名>\n"
-"                  [password <PPPoE 密码>]\n"
-"                  [service <PPPoE 服务名>]\n"
-"                  [mtu <MTU>]\n"
-"                  [mac <MAC 地址>]\n"
-"\n"
-"    gsm:          apn <APN>\n"
-"                  [user <用户名>]\n"
-"                  [password <密码>]\n"
-"\n"
-"    cdma:         [user <用户名>]\n"
-"                  [password <密码>]\n"
-"\n"
-"    infiniband:   [mac <MAC 地址>]\n"
-"                  [mtu <MTU>]\n"
-"                  [transport-mode datagram | connected]\n"
-"                  [parent <接口名>]\n"
-"                  [p-key <IPoIB P_Key>]\n"
-"\n"
-"    bluetooth:    [addr <蓝牙地址>]\n"
-"                  [bt-type panu|nap|dun-gsm|dun-cdma]\n"
-"\n"
-"    vlan:         dev <上级设备(连接 UUID、接口名或 MAC)>\n"
-"                  id <VLAN ID>\n"
-"                  [flags <VLAN 标记>]\n"
-"                  [ingress <入口优先级映射>]\n"
-"                  [egress <出口优先级映射>]\n"
-"                  [mtu <MTU>]\n"
-"\n"
-"    bond:         [mode balance-rr (0) | active-backup (1) | balance-xor (2) "
-"| broadcast (3) |\n"
-"                        802.3ad    (4) | balance-tlb   (5) | balance-alb "
-"(6)]\n"
-"                  [primary <接口名>]\n"
-"                  [miimon <数字>]\n"
-"                  [downdelay <数字>]\n"
-"                  [updelay <数字>]\n"
-"                  [arp-interval <数字>]\n"
-"                  [arp-ip-target <数字>]\n"
-"                  [lacp-rate slow (0) | fast (1)]\n"
-"\n"
-"    bond-slave:   master <主连接(接口名、连接的 UUID 或其名称)>\n"
-"\n"
-"    team:         [config <文件>|<原始 JSON 数据>]\n"
-"\n"
-"    team-slave:   master <主连接(接口名、连接的 UUID 或其名称)>\n"
-"                  [config <文件>|<原始 JSON 数据>]\n"
-"\n"
-"    bridge:       [stp yes|no]\n"
-"                  [priority <数字>]\n"
-"                  [forward-delay <2-30>]\n"
-"                  [hello-time <1-10>]\n"
-"                  [max-age <6-40>]\n"
-"                  [ageing-time <0-1000000>]\n"
-"                  [multicast-snooping yes|no]\n"
-"                  [mac <MAC 地址>]\n"
-"\n"
-"    bridge-slave: master <主连接(接口名、连接的 UUID 或其名称)>\n"
-"                  [priority <0-63>]\n"
-"                  [path-cost <1-65535>]\n"
-"                  [hairpin yes|no]\n"
-"\n"
-"    vpn:          vpn-type vpnc|openvpn|pptp|openconnect|openswan|libreswan|"
-"ssh|l2tp|iodine|...\n"
-"                  [user <用户名>]\n"
-"\n"
-"    olpc-mesh:    ssid <SSID>\n"
-"                  [channel <1-13>]\n"
-"                  [dhcp-anycast <MAC 地址>]\n"
-"\n"
-"    adsl:         username <用户名>\n"
-"                  protocol pppoa|pppoe|ipoatm\n"
-"                  [password <密码>]\n"
-"                  [encapsulation vcmux|llc]\n"
-"\n"
-"    tun:          mode tun|tap\n"
-"                  [owner <UID>]\n"
-"                  [group <GID>]\n"
-"                  [pi yes|no]\n"
-"                  [vnet-hdr yes|no]\n"
-"                  [multi-queue yes|no]\n"
-"\n"
-"    ip-tunnel:    mode ipip|gre|sit|isatap|vti|ip6ip6|ipip6|ip6gre|vti6\n"
-"                  remote <远程端点 IP>\n"
-"                  [local <本地端点 IP>]\n"
-"                  [dev <上级设备(接口名或连接的 UUID)>]\n"
-"\n"
-"    macsec:       dev <上级设备(连接的 UUID、接口名或 MAC)>\n"
-"                  mode <psk|eap>\n"
-"                  [cak <key> ckn <key>]\n"
-"                  [encrypt yes|no]\n"
-"                  [port 1-65534]\n"
-"\n"
-"\n"
-"    macvlan:      dev <上级设备(连接的 UUID、接口名或 MAC)>\n"
-"                  mode vepa|bridge|private|passthru|source\n"
-"                  [tap yes|no]\n"
-"\n"
-"    vxlan:        id <VXLAN ID>\n"
-"                  remote <多播组或远程地址的 IP>\n"
-"                  [local <源 IP>]\n"
-"                  [dev <上级设备(接口名或连接的 UUID)>]\n"
-"                  [source-port-min <0-65535>]\n"
-"                  [source-port-max <0-65535>]\n"
-"                  [destination-port <0-65535>]\n"
-"\n"
-"    wpan:         [short-addr <0x0000-0xffff>]\n"
-"\n"
-"                  [pan-id <0x0000-0xffff>]\n"
-"\n"
-"                  [mac <MAC 地址>]\n"
-"\n"
-"    6lowpan:      dev <上级设备(连接的 UUID、接口名 或 MAC)>\n"
-"    dummy:\n"
-"\n"
-"  从属选项:\n"
-"    bridge:       [priority <0-63>]\n"
-"                  [path-cost <1-65535>]\n"
-"                  [hairpin yes|no]\n"
-"\n"
-"    team:         [config <文件>|<原始 JSON 数据>]\n"
-"\n"
-"  IP_选项:\n"
-"                  [ip4 <IPv4 地址>] [gw4 <IPv4 网关>]\n"
-"                  [ip6 <IPv6 地址>] [gw6 <IPv6 网关>]\n"
-"\n"
 
-#: ../clients/cli/connections.c:1012
+#: ../clients/cli/connections.c:389
 #, c-format
 msgid ""
 "Usage: nmcli connection modify { ARGUMENTS | help }\n"
@@ -781,15 +548,13 @@ msgid ""
 "nmcli con mod bond0 -bond.options downdelay\n"
 "\n"
 msgstr ""
-"用法:nmcli connection modify { 参数 | help }\n"
+"用法:nmcli connection modify { ARGUMENTS | help }\n"
 "\n"
-"参数 := [id | uuid | path] <ID> ([+|-]<设置>.<属性> <值>)+\n"
+"ARGUMENTS := [id | uuid | path] <ID> ([+|-]<setting>.<property> <value>)+\n"
 "\n"
-"修改连接配置集的一个或多个属性。配置集由其名称、UUID 或 D-Bus 路径来确定。"
-"对\n"
-"于具有多个值的属性,您可以在属性名称前插入可选的 \"+\" 或 \"-\"。\"+\" 符号允"
-"许附加项\n"
-"而不是覆盖整个值。\"-\" 符号允许删除选中项而不是整个值。\n"
+"修改连接配置集的一个或多个属性。配置集是由其名称、UUID 或 D-Bus 路径来确定"
+"的。对于具有多个值的属性,您可以为属性名称使用可选的 '+' 或 '-' 前缀。'+' 标"
+"志允许附加项而不是覆盖整个值。'-' 标志允许删除选择的项而不是整个值。\n"
 "\n"
 "示例:\n"
 "nmcli con mod home-wifi wifi.ssid rakosnicek\n"
@@ -802,7 +567,7 @@ msgstr ""
 "nmcli con mod bond0 -bond.options downdelay\n"
 "\n"
 
-#: ../clients/cli/connections.c:1035
+#: ../clients/cli/connections.c:412
 #, c-format
 msgid ""
 "Usage: nmcli connection clone { ARGUMENTS | help }\n"
@@ -815,16 +580,15 @@ msgid ""
 "id (provided as <new name> argument).\n"
 "\n"
 msgstr ""
-"用法:nmcli connection clone { 参数 | help }\n"
+"用法:nmcli connection clone { ARGUMENTS | help }\n"
 "\n"
-"参数 := [--temporary] [id | uuid | path] <ID> <新名称>\n"
+"ARGUMENTS := [--temporary] [id | uuid | path] <ID> <new name>\n"
 "\n"
-"克隆现有的连接配置集。新创建的连接将是 <ID> 的完全复制,除了 UUID 属性(将被"
-"生\n"
-"成)和 ID(由 <新名称> 参数提供)不同。\n"
+"克隆现有的连接配置集。新创建的连接将是 <ID> 的拷贝,除了 UUID 属性(将被生"
+"成)和 ID(作为 <new name> 参数提供)不同。\n"
 "\n"
 
-#: ../clients/cli/connections.c:1047
+#: ../clients/cli/connections.c:424
 #, c-format
 msgid ""
 "Usage: nmcli connection edit { ARGUMENTS | help }\n"
@@ -843,15 +607,15 @@ msgstr ""
 "\n"
 "参数 := [id | uuid | path] <ID>\n"
 "\n"
-"在交互式编辑器中编辑已有的连接配置集。\n"
-"配置集由其名称、UUID 或 D-Bus 路径来确定。\n"
+"在交互式编辑器中编辑已有的连接配置文件。\n"
+"该配置文件由名称、UUID 或 D-Bus 路径确定。\n"
 "\n"
 "参数 := [type <新连接类型>] [con-name <新连接名称>]\n"
 "\n"
 "在交互式编辑器中添加新的连接配置文件。\n"
 "\n"
 
-#: ../clients/cli/connections.c:1062
+#: ../clients/cli/connections.c:439
 #, c-format
 msgid ""
 "Usage: nmcli connection delete { ARGUMENTS | help }\n"
@@ -866,11 +630,11 @@ msgstr ""
 "\n"
 "参数 := [id | uuid | path] <ID>\n"
 "\n"
-"删除一个连接配置集。\n"
-"配置集由其名称、UUID 或 D-Bus 路径来确定。\n"
+"删除一个连接配置文件。\n"
+"该配置文件由名称、UUID 或 D-Bus 路径确定。\n"
 "\n"
 
-#: ../clients/cli/connections.c:1073
+#: ../clients/cli/connections.c:450
 #, c-format
 msgid ""
 "Usage: nmcli connection monitor { ARGUMENTS | help }\n"
@@ -882,15 +646,14 @@ msgid ""
 "Monitors all connection profiles in case none is specified.\n"
 "\n"
 msgstr ""
-"用法:nmcli connection monitor { 参数 | help }\n"
-"\n"
-"参数 := [id | uuid | path] <ID> ...\n"
+"用法:nmcli connection monitor { ARGUMENTS | help }\n"
 "\n"
-"监视连接配置集活动。\n"
-"每当指定的连接修改时,这个命令将其打印出来。如果没有指定则监视所有的连接。\n"
+"ARGUMENTS := [id | uuid | path] <ID> ...\n"
 "\n"
+"监控连接配置集活动。每当指定的连接修改时,这个命令会打印一行。如果没有指定则"
+"监控所有的连接。 \n"
 
-#: ../clients/cli/connections.c:1085
+#: ../clients/cli/connections.c:462
 #, c-format
 msgid ""
 "Usage: nmcli connection reload { help }\n"
@@ -903,7 +666,7 @@ msgstr ""
 "从磁盘重新载入所有的连接文件。\n"
 "\n"
 
-#: ../clients/cli/connections.c:1093
+#: ../clients/cli/connections.c:470
 #, c-format
 msgid ""
 "Usage: nmcli connection load { ARGUMENTS | help }\n"
@@ -920,11 +683,12 @@ msgstr ""
 "\n"
 "参数 := <文件名> [<文件名>...]\n"
 "\n"
-"从磁盘加载/重载一个或多个连接文件。在手动编辑连接文件后使用此方法以确保\n"
-"网络管理器(NetworkManager)能注意到它的最新状态。\n"
+"从磁盘加载/重载一个或多个连接文件。在手动编辑\n"
+"连接文件后使用此方法以确保网络管理器能注意到\n"
+"最新状态。\n"
 "\n"
 
-#: ../clients/cli/connections.c:1105
+#: ../clients/cli/connections.c:482
 #, c-format
 msgid ""
 "Usage: nmcli connection import { ARGUMENTS | help }\n"
@@ -938,16 +702,15 @@ msgid ""
 "is imported by NetworkManager VPN plugins.\n"
 "\n"
 msgstr ""
-"用法:nmcli connection import { 参数 | help }\n"
+"用法: nmcli connection import { ARGUMENTS | help }\n"
 "\n"
-"参数 := [--temporary] type <类型> file <要导入的文件>\n"
+"ARGUMENTS := [--temporary] type <type> file <file to import>\n"
 "\n"
-"将外部配置作为网络管理器(NetworkManager)连接配置导入。输入文件的类型由 "
-"type 选项指定。\n"
-"目前只支持 VPN 配置。配置通过 NetworkManager VPN 插件导入。\n"
+"将外部配置作为 NetworkManager 连接配置导入。输入文件的类型是由 type 选项指定"
+"的。目前只支持 VPN 配置。配置是通过 NetworkManager VPN 插件导入的。\n"
 "\n"
 
-#: ../clients/cli/connections.c:1118
+#: ../clients/cli/connections.c:495
 #, c-format
 msgid ""
 "Usage: nmcli connection export { ARGUMENTS | help }\n"
@@ -958,346 +721,444 @@ msgid ""
 "The data are directed to standard output or to a file if a name is given.\n"
 "\n"
 msgstr ""
-"用法:nmcli connection export { 参数 | help }\n"
-"\n"
-"参数 := [id | uuid | path] <ID> [<输出文件>]\n"
+"用法:nmcli connection export { ARGUMENTS | help }\n"
 "\n"
-"导出连接。目前只支持 VPN 连接。数据会导出到标准输出或文件(如果给定了)。\n"
+"ARGUMENTS := [id | uuid | path] <ID> [<output file>]\n"
 "\n"
+"导出连接。目前只支持 VPN 连接。数据会导出到标准输出或指定的文件。\n"
+
+#: ../clients/cli/connections.c:525
+msgid "activating"
+msgstr "激活中"
 
-#: ../clients/cli/connections.c:1200
+#: ../clients/cli/connections.c:527
+msgid "activated"
+msgstr "已激活"
+
+#: ../clients/cli/connections.c:529 ../clients/common/nm-client-utils.c:243
+msgid "deactivating"
+msgstr "正在停用"
+
+#: ../clients/cli/connections.c:531
+msgid "deactivated"
+msgstr "已取消激活"
+
+#: ../clients/cli/connections.c:534 ../clients/cli/connections.c:557
+#: ../clients/cli/devices.c:1207 ../clients/cli/devices.c:1251
+#: ../clients/cli/devices.c:1253 ../clients/cli/general.c:41
+#: ../clients/cli/general.c:79 ../clients/cli/general.c:146
+#: ../clients/cli/general.c:151 ../clients/common/nm-client-utils.c:247
+#: ../clients/common/nm-client-utils.c:250
+#: ../clients/common/nm-client-utils.c:266
+#: ../clients/common/nm-client-utils.c:269
+#: ../clients/common/nm-meta-setting-desc.c:1479
+#: ../clients/common/nm-meta-setting-desc.c:1547
+#: ../clients/common/nm-meta-setting-desc.c:2692
+#: ../clients/common/nm-meta-setting-desc.c:2746
+msgid "unknown"
+msgstr "未知"
+
+#: ../clients/cli/connections.c:543
+msgid "VPN connecting (prepare)"
+msgstr "VPN 连接(准备)"
+
+#: ../clients/cli/connections.c:545
+msgid "VPN connecting (need authentication)"
+msgstr "VPN 连接中(需要验证)"
+
+#: ../clients/cli/connections.c:547
+msgid "VPN connecting"
+msgstr "VPN 连接中"
+
+#: ../clients/cli/connections.c:549
+msgid "VPN connecting (getting IP configuration)"
+msgstr "VPN 连接中(获取 IP 配置)"
+
+#: ../clients/cli/connections.c:551
+msgid "VPN connected"
+msgstr "VPN 已连接"
+
+#: ../clients/cli/connections.c:553
+msgid "VPN connection failed"
+msgstr "VPN 连接失败"
+
+#: ../clients/cli/connections.c:555
+msgid "VPN disconnected"
+msgstr "VPN 已断开"
+
+#: ../clients/cli/connections.c:625
 #, c-format
 msgid "Error updating secrets for %s: %s\n"
-msgstr "更新 %s 的密钥时出错:%s\n"
+msgstr "更新 %s 的秘密出错:%s\n"
 
-#: ../clients/cli/connections.c:1243
+#: ../clients/cli/connections.c:645
 msgid "Connection profile details"
 msgstr "连接配置集详情"
 
-#: ../clients/cli/connections.c:1256 ../clients/cli/connections.c:1341
+#: ../clients/cli/connections.c:658 ../clients/cli/connections.c:1108
 #, c-format
 msgid "Error: 'connection show': %s"
-msgstr "错误:\"connection show\":%s"
+msgstr "错误:'connection show': %s"
 
-#: ../clients/cli/connections.c:1331
-msgid "Activate connection details"
-msgstr "激活连接详情"
+#: ../clients/cli/connections.c:876
+msgid "never"
+msgstr "从不"
 
-#: ../clients/cli/connections.c:1439 ../clients/cli/devices.c:1484
-#: ../clients/cli/devices.c:1498 ../clients/cli/devices.c:1513
-#: ../clients/cli/devices.c:1571 ../clients/cli/devices.c:1673
-msgid "NAME"
-msgstr "名称"
+#. "CAPABILITIES"
+#: ../clients/cli/connections.c:877 ../clients/cli/connections.c:879
+#: ../clients/cli/connections.c:881 ../clients/cli/connections.c:914
+#: ../clients/cli/connections.c:981 ../clients/cli/connections.c:982
+#: ../clients/cli/connections.c:984 ../clients/cli/connections.c:4427
+#: ../clients/cli/connections.c:6365 ../clients/cli/connections.c:6366
+#: ../clients/cli/devices.c:881 ../clients/cli/devices.c:1170
+#: ../clients/cli/devices.c:1171 ../clients/cli/devices.c:1172
+#: ../clients/cli/devices.c:1173 ../clients/cli/devices.c:1174
+#: ../clients/cli/devices.c:1211 ../clients/cli/devices.c:1213
+#: ../clients/cli/devices.c:1214 ../clients/cli/devices.c:1244
+#: ../clients/cli/devices.c:1245 ../clients/cli/devices.c:1246
+#: ../clients/cli/devices.c:1247 ../clients/cli/devices.c:1248
+#: ../clients/cli/devices.c:1249 ../clients/cli/devices.c:1250
+#: ../clients/cli/devices.c:1252 ../clients/cli/devices.c:1254
+#: ../clients/cli/general.c:152 ../clients/common/nm-client-utils.c:258
+#: ../clients/common/nm-meta-setting-desc.c:719
+#: ../clients/common/nm-meta-setting-desc.c:2685
+msgid "yes"
+msgstr "是"
 
-#: ../clients/cli/connections.c:1527
+#: ../clients/cli/connections.c:877 ../clients/cli/connections.c:879
+#: ../clients/cli/connections.c:881 ../clients/cli/connections.c:981
+#: ../clients/cli/connections.c:982 ../clients/cli/connections.c:984
+#: ../clients/cli/connections.c:4426 ../clients/cli/connections.c:6365
+#: ../clients/cli/connections.c:6366 ../clients/cli/devices.c:881
+#: ../clients/cli/devices.c:1170 ../clients/cli/devices.c:1171
+#: ../clients/cli/devices.c:1172 ../clients/cli/devices.c:1173
+#: ../clients/cli/devices.c:1174 ../clients/cli/devices.c:1211
+#: ../clients/cli/devices.c:1213 ../clients/cli/devices.c:1214
+#: ../clients/cli/devices.c:1244 ../clients/cli/devices.c:1245
+#: ../clients/cli/devices.c:1246 ../clients/cli/devices.c:1247
+#: ../clients/cli/devices.c:1248 ../clients/cli/devices.c:1249
+#: ../clients/cli/devices.c:1250 ../clients/cli/devices.c:1252
+#: ../clients/cli/devices.c:1254 ../clients/cli/general.c:153
+#: ../clients/common/nm-client-utils.c:260
+#: ../clients/common/nm-meta-setting-desc.c:719
+#: ../clients/common/nm-meta-setting-desc.c:2688
+msgid "no"
+msgstr "否"
+
+#: ../clients/cli/connections.c:1098
+msgid "Activate connection details"
+msgstr "激活连接细节"
+
+#: ../clients/cli/connections.c:1345
 #, c-format
 msgid "invalid field '%s'; allowed fields: %s and %s, or %s,%s"
-msgstr "无效字段 \"%s\";允许的字段为 %s 和 %s,或 %s,%s"
+msgstr "无效字段 '%s'; 允许的字段为 %s 和 %s,或 %s,%s。"
 
-#: ../clients/cli/connections.c:1542 ../clients/cli/connections.c:1550
+#: ../clients/cli/connections.c:1360 ../clients/cli/connections.c:1368
 #, c-format
 msgid "'%s' has to be alone"
-msgstr "\"%s\" 必须是单独的"
+msgstr "'%s' 必须是单独的"
 
-#: ../clients/cli/connections.c:1815
+#: ../clients/cli/connections.c:1568
 #, c-format
 msgid "incorrect string '%s' of '--order' option"
-msgstr "\"--order\" 选项的字符串 \"%s\" 错误"
+msgstr "'--order' 选项的错误字符串 '%s' "
 
-#: ../clients/cli/connections.c:1840
+#: ../clients/cli/connections.c:1594
 #, c-format
 msgid "incorrect item '%s' in '--order' option"
-msgstr "\"--order\" 选项里有错误项 \"%s\""
+msgstr "'--order' 选项里的错误项 '%s' "
 
-#: ../clients/cli/connections.c:1878
+#: ../clients/cli/connections.c:1624
 msgid "No connection specified"
-msgstr "未指定连接"
+msgstr ""
 
-#: ../clients/cli/connections.c:1889
+#: ../clients/cli/connections.c:1639
 #, c-format
 msgid "%s argument is missing"
-msgstr "缺少 %s 参数"
+msgstr ""
 
-#: ../clients/cli/connections.c:1907
+#: ../clients/cli/connections.c:1649
 #, c-format
 msgid "unknown connection '%s'"
-msgstr "未知的连接 \"%s\""
+msgstr ""
 
-#: ../clients/cli/connections.c:1936
+#: ../clients/cli/connections.c:1682
 msgid "'--order' argument is missing"
-msgstr "缺少 \"--order\" 参数"
+msgstr "缺少 '--order' 参数"
 
-#: ../clients/cli/connections.c:1997
+#: ../clients/cli/connections.c:1737
 msgid "NetworkManager active profiles"
-msgstr "网络管理器活动的配置集"
+msgstr "NetworkManager 的活动配置集"
 
-#: ../clients/cli/connections.c:1998
+#: ../clients/cli/connections.c:1738
 msgid "NetworkManager connection profiles"
-msgstr "网络管理器连接配置集"
-
-#: ../clients/cli/connections.c:2050 ../clients/cli/connections.c:2749
-#: ../clients/cli/connections.c:2761 ../clients/cli/connections.c:2773
-#: ../clients/cli/connections.c:2999 ../clients/cli/connections.c:8702
-#: ../clients/cli/connections.c:8718 ../clients/cli/devices.c:3037
-#: ../clients/cli/devices.c:3049 ../clients/cli/devices.c:3062
-#: ../clients/cli/devices.c:3213 ../clients/cli/devices.c:3224
-#: ../clients/cli/devices.c:3242 ../clients/cli/devices.c:3251
-#: ../clients/cli/devices.c:3272 ../clients/cli/devices.c:3283
-#: ../clients/cli/devices.c:3301 ../clients/cli/devices.c:3681
-#: ../clients/cli/devices.c:3691 ../clients/cli/devices.c:3699
-#: ../clients/cli/devices.c:3711 ../clients/cli/devices.c:3726
-#: ../clients/cli/devices.c:3734 ../clients/cli/devices.c:3908
-#: ../clients/cli/devices.c:3919 ../clients/cli/devices.c:4090
+msgstr "NetworkManager 连接配置集"
+
+#: ../clients/cli/connections.c:1791 ../clients/cli/connections.c:2466
+#: ../clients/cli/connections.c:2478 ../clients/cli/connections.c:2490
+#: ../clients/cli/connections.c:2666 ../clients/cli/connections.c:8428
+#: ../clients/cli/connections.c:8445 ../clients/cli/devices.c:2678
+#: ../clients/cli/devices.c:2689 ../clients/cli/devices.c:2931
+#: ../clients/cli/devices.c:2942 ../clients/cli/devices.c:2960
+#: ../clients/cli/devices.c:2969 ../clients/cli/devices.c:2990
+#: ../clients/cli/devices.c:3001 ../clients/cli/devices.c:3019
+#: ../clients/cli/devices.c:3397 ../clients/cli/devices.c:3407
+#: ../clients/cli/devices.c:3415 ../clients/cli/devices.c:3427
+#: ../clients/cli/devices.c:3442 ../clients/cli/devices.c:3450
+#: ../clients/cli/devices.c:3624 ../clients/cli/devices.c:3635
+#: ../clients/cli/devices.c:3807
 #, c-format
 msgid "Error: %s argument is missing."
 msgstr "错误:缺少 %s 参数。"
 
-#: ../clients/cli/connections.c:2078
+#: ../clients/cli/connections.c:1810
 #, c-format
 msgid "Error: %s - no such connection profile."
 msgstr "错误:%s - 没有这样的连接配置集。"
 
-#: ../clients/cli/connections.c:2169 ../clients/cli/connections.c:2736
-#: ../clients/cli/connections.c:2800 ../clients/cli/connections.c:8226
-#: ../clients/cli/connections.c:8332 ../clients/cli/connections.c:8818
-#: ../clients/cli/devices.c:1758 ../clients/cli/devices.c:2044
-#: ../clients/cli/devices.c:2213 ../clients/cli/devices.c:2321
-#: ../clients/cli/devices.c:2510 ../clients/cli/devices.c:3871
-#: ../clients/cli/devices.c:4096 ../clients/cli/general.c:917
+#: ../clients/cli/connections.c:1874 ../clients/cli/connections.c:2453
+#: ../clients/cli/connections.c:2517 ../clients/cli/connections.c:7938
+#: ../clients/cli/connections.c:8049 ../clients/cli/connections.c:8559
+#: ../clients/cli/devices.c:1579 ../clients/cli/devices.c:1865
+#: ../clients/cli/devices.c:2034 ../clients/cli/devices.c:2142
+#: ../clients/cli/devices.c:2331 ../clients/cli/devices.c:3587
+#: ../clients/cli/devices.c:3813 ../clients/cli/general.c:928
 #, c-format
 msgid "Error: %s."
 msgstr "错误:%s。"
 
-#: ../clients/cli/connections.c:2262
+#: ../clients/cli/connections.c:1972
 #, c-format
 msgid "no active connection on device '%s'"
-msgstr "设备 \"%s\" 上没有活动的连接"
+msgstr "设备“%s”中没有活跃连接"
 
-#: ../clients/cli/connections.c:2270
+#: ../clients/cli/connections.c:1980
 msgid "no active connection or device"
-msgstr "没有活动的连接或设备"
+msgstr "没有活跃连接或者设备"
 
-#: ../clients/cli/connections.c:2290
+#: ../clients/cli/connections.c:2000
 #, c-format
 msgid "device '%s' not compatible with connection '%s':"
-msgstr "设备 \"%s\" 与连接 \"%s\" 不兼容:"
+msgstr ""
 
-#: ../clients/cli/connections.c:2323
+#: ../clients/cli/connections.c:2036
 #, c-format
 msgid "device '%s' not compatible with connection '%s'"
-msgstr "设备 \"%s\" 与连接 \"%s\" 不兼容"
+msgstr "设备“%s”不兼容连接“%s”"
 
-#: ../clients/cli/connections.c:2326
+#: ../clients/cli/connections.c:2039
 #, c-format
 msgid "no device found for connection '%s'"
-msgstr "没有找到可用于连接 \"%s\" 的设备"
+msgstr "没有找到可用于连接“%s”的设备"
 
-#: ../clients/cli/connections.c:2358
+#: ../clients/cli/connections.c:2067
 #, c-format
 msgid "Connection successfully activated (%s) (D-Bus active path: %s)\n"
-msgstr "连接已成功激活(%s)(D-Bus 活动路径:%s)\n"
+msgstr ""
 
-#: ../clients/cli/connections.c:2362 ../clients/cli/connections.c:2510
-#: ../clients/cli/connections.c:6590
+#: ../clients/cli/connections.c:2071 ../clients/cli/connections.c:2219
+#: ../clients/cli/connections.c:6244
 #, c-format
 msgid "Connection successfully activated (D-Bus active path: %s)\n"
 msgstr "连接已成功激活(D-Bus 活动路径:%s)\n"
 
-#: ../clients/cli/connections.c:2369 ../clients/cli/connections.c:2490
+#: ../clients/cli/connections.c:2078 ../clients/cli/connections.c:2199
 #, c-format
 msgid "Error: Connection activation failed: %s"
-msgstr "错误:连接激活失败:%s"
+msgstr "错误:激活连接失败:%s"
 
-#: ../clients/cli/connections.c:2405
+#: ../clients/cli/connections.c:2114
 #, c-format
 msgid "Error: Timeout expired (%d seconds)"
-msgstr "错误:超时时间已到(%d 秒)"
+msgstr ""
 
-#: ../clients/cli/connections.c:2572
+#: ../clients/cli/connections.c:2280
 #, c-format
 msgid "failed to read passwd-file '%s': %s"
-msgstr "读取 passwd-file \"%s\" 失败:%s"
+msgstr "读取 passwd-file '%s' 失败:%s"
 
-#: ../clients/cli/connections.c:2585
+#: ../clients/cli/connections.c:2292
 #, c-format
 msgid "missing colon in 'password' entry '%s'"
-msgstr "\"password\" 条目 \"%s\" 缺失了冒号"
+msgstr "'password' 条目 '%s' 缺失了冒号"
 
-#: ../clients/cli/connections.c:2593
+#: ../clients/cli/connections.c:2300
 #, c-format
 msgid "missing dot in 'password' entry '%s'"
-msgstr "\"password\" 条目 \"%s\" 缺失了点号"
+msgstr "'password' 条目 '%s' 缺失了点号"
 
-#: ../clients/cli/connections.c:2606
+#: ../clients/cli/connections.c:2313
 #, c-format
 msgid "invalid setting name in 'password' entry '%s'"
-msgstr "\"password\" 条目 \"%s\" 里出现无效的设置名称"
+msgstr "'password' 条目 '%s' 里出现无效的设置名称"
 
-#: ../clients/cli/connections.c:2652
+#: ../clients/cli/connections.c:2369
 #, c-format
 msgid "unknown device '%s'."
-msgstr "未知设备 \"%s\"。"
+msgstr "未知设备“%s”"
 
-#: ../clients/cli/connections.c:2657
+#: ../clients/cli/connections.c:2374
 msgid "neither a valid connection nor device given"
-msgstr "没有给定有效的连接或设备"
+msgstr "没有给定有效连接或者设备"
 
-#: ../clients/cli/connections.c:2783 ../clients/cli/devices.c:1717
-#: ../clients/cli/devices.c:3094 ../clients/cli/devices.c:3314
-#: ../clients/cli/devices.c:3925
+#: ../clients/cli/connections.c:2500 ../clients/cli/devices.c:1530
+#: ../clients/cli/devices.c:2696 ../clients/cli/devices.c:3032
+#: ../clients/cli/devices.c:3641
 #, c-format
 msgid "Unknown parameter: %s\n"
 msgstr "未知参数:%s\n"
 
-#: ../clients/cli/connections.c:2808
+#: ../clients/cli/connections.c:2525
 msgid "preparing"
-msgstr "准备中"
+msgstr "正在准备"
 
-#: ../clients/cli/connections.c:2916
+#: ../clients/cli/connections.c:2545
 #, c-format
 msgid "Connection '%s' (%s) successfully deleted.\n"
-msgstr "成功删除连接 \"%s\" (%s)。\n"
+msgstr "成功删除连接 '%s'(%s)。\n"
 
-#: ../clients/cli/connections.c:2932
+#: ../clients/cli/connections.c:2561
 #, c-format
 msgid "Connection '%s' successfully deactivated (D-Bus active path: %s)\n"
 msgstr ""
-"成功停用连接 \"%s\"(D-Bus 活动路径:%s)\n"
+"成功取消激活连接 '%s'(D-Bus 活动路径:%s)\n"
 "\n"
 
-#: ../clients/cli/connections.c:2981 ../clients/cli/connections.c:8439
-#: ../clients/cli/connections.c:8470 ../clients/cli/connections.c:8628
+#: ../clients/cli/connections.c:2642 ../clients/cli/connections.c:8164
+#: ../clients/cli/connections.c:8196 ../clients/cli/connections.c:8353
 #, c-format
 msgid "Error: No connection specified."
 msgstr "错误:未指定连接。"
 
-#: ../clients/cli/connections.c:3011
+#: ../clients/cli/connections.c:2683
 #, c-format
 msgid "Error: '%s' is not an active connection.\n"
-msgstr "错误:\"%s\" 不是活动的连接。\n"
+msgstr "错误:'%s' 不是活跃连接。\n"
 
-#: ../clients/cli/connections.c:3012
+#: ../clients/cli/connections.c:2684
 #, c-format
 msgid "Error: not all active connections found."
 msgstr "错误:未找到所有的活动连接。"
 
-#: ../clients/cli/connections.c:3020
+#: ../clients/cli/connections.c:2693
 #, c-format
 msgid "Error: no active connection provided."
 msgstr "错误:未提供活动连接。"
 
-#: ../clients/cli/connections.c:3051
-#, c-format
+#: ../clients/cli/connections.c:2727
+#, fuzzy, c-format
 msgid "Connection '%s' deactivation failed: %s\n"
-msgstr "错误:停用连接 \"%s\" 失败:%s\n"
+msgstr "错误:激活连接失败:%s"
 
-#: ../clients/cli/connections.c:3302 ../clients/cli/connections.c:3359
-#: ../clients/common/nm-client-utils.c:221
+#: ../clients/cli/connections.c:2983 ../clients/cli/connections.c:3040
+#: ../clients/common/nm-client-utils.c:169
 #, c-format
 msgid "'%s' not among [%s]"
-msgstr "\"%s\" 不在 [%s] 中"
+msgstr "'%s' 不在 [%s] 中"
 
 #. We should not really come here
-#: ../clients/cli/connections.c:3322 ../clients/cli/connections.c:3382
-#: ../clients/common/nm-client-utils.c:289
+#: ../clients/cli/connections.c:3003 ../clients/cli/connections.c:3063
+#: ../clients/common/nm-client-utils.c:279
 #, c-format
 msgid "Unknown error"
 msgstr "未知错误"
 
-#: ../clients/cli/connections.c:3516
+#: ../clients/cli/connections.c:3197
 #, c-format
 msgid "Warning: master='%s' doesn't refer to any existing profile.\n"
-msgstr "警告:master=\"%s\" 没有引用任何现有的配置集。\n"
+msgstr "警告: master='%s' 没有应用任何现有的配置集。\n"
 
-#: ../clients/cli/connections.c:3865
+#: ../clients/cli/connections.c:3534
 #, c-format
 msgid "Error: invalid property '%s': %s."
-msgstr "错误:无效的属性 \"%s\":%s。"
+msgstr "错误:无效的属性“%s”:%s。"
 
-#: ../clients/cli/connections.c:3882
+#: ../clients/cli/connections.c:3551
 #, c-format
 msgid "Error: failed to modify %s.%s: %s."
 msgstr "错误:修改 %s.%s 失败:%s。"
 
-#: ../clients/cli/connections.c:3902
+#: ../clients/cli/connections.c:3570
 #, c-format
 msgid "Error: failed to remove a value from %s.%s: %s."
 msgstr "错误:从 %s.%s 删除值失败:%s。"
 
-#: ../clients/cli/connections.c:3936
-#, c-format
+#: ../clients/cli/connections.c:3604
+#, fuzzy, c-format
 msgid "Error: '%s' is mandatory."
-msgstr "错误:设置 \"%s\" 是必填的。"
+msgstr "错误:设置“%s”是必填的而且无法移除。\n"
 
-#: ../clients/cli/connections.c:3963
-#, c-format
+#: ../clients/cli/connections.c:3631
+#, fuzzy, c-format
 msgid "Error: invalid slave type; %s."
-msgstr "错误:无效的从属类型;%s。"
+msgstr "错误:无效的连接类型;%s。"
 
-#: ../clients/cli/connections.c:3971
+#: ../clients/cli/connections.c:3639
 #, c-format
 msgid "Error: invalid connection type; %s."
 msgstr "错误:无效的连接类型;%s。"
 
-#: ../clients/cli/connections.c:4048
-#, c-format
+#: ../clients/cli/connections.c:3716
+#, fuzzy, c-format
 msgid "Error: bad connection type: %s"
-msgstr "错误:错误的连接类型:%s"
+msgstr "错误:无效的连接类型;%s。"
 
-#: ../clients/cli/connections.c:4094
+#: ../clients/cli/connections.c:3762
 #, c-format
 msgid "Error: '%s': %s"
-msgstr "错误:\"%s\":%s"
+msgstr ""
 
-#: ../clients/cli/connections.c:4115
+#: ../clients/cli/connections.c:3783
+#, fuzzy
 msgid "Error: master is required"
 msgstr "错误:需要主连接"
 
-#: ../clients/cli/connections.c:4174
-#, c-format
+#: ../clients/cli/connections.c:3842
+#, fuzzy, c-format
 msgid "Error: error adding bond option '%s=%s'."
-msgstr "错误:添加绑定(bond)选项 \"%s=%s\" 时出错。"
+msgstr "错误:未知连接“%s”。"
 
-#: ../clients/cli/connections.c:4205
+#: ../clients/cli/connections.c:3873
 #, c-format
 msgid "Error: '%s' is not a valid monitoring mode; use '%s' or '%s'.\n"
-msgstr "错误:\"%s\" 不是有效的监视模式;使用 \"%s\" 或 \"%s\"。\n"
+msgstr "错误:“%s”不是有效的监控模式;使用“%s”或“%s”。\n"
 
-#: ../clients/cli/connections.c:4236
+#: ../clients/cli/connections.c:3904
 #, c-format
 msgid "Error: 'bt-type': '%s' not valid; use [%s, %s, %s (%s), %s]."
-msgstr "错误:\"bt-type\":\"%s\" 无效;使用 [%s, %s, %s (%s), %s]。"
+msgstr ""
 
-#: ../clients/cli/connections.c:4485
+#: ../clients/cli/connections.c:4153
 #, c-format
 msgid "Error: value for '%s' is missing."
-msgstr "错误:缺少 \"%s\" 的值。"
+msgstr "错误:缺失了 '%s' 的值。"
 
-#: ../clients/cli/connections.c:4531
+#: ../clients/cli/connections.c:4199
 msgid "Error: <setting>.<property> argument is missing."
 msgstr "错误:缺少 <设置>.<属性> 参数。"
 
-#: ../clients/cli/connections.c:4554
+#: ../clients/cli/connections.c:4222
 #, c-format
 msgid "Error: invalid or not allowed setting '%s': %s."
-msgstr "错误:无效或不允许的设置 \"%s\":%s。"
+msgstr "错误:无效或不允许的设置“%s”:%s。"
 
-#: ../clients/cli/connections.c:4600 ../clients/cli/connections.c:4616
-#, c-format
+#: ../clients/cli/connections.c:4268 ../clients/cli/connections.c:4284
+#, fuzzy, c-format
 msgid "Error: '%s' is ambiguous (%s.%s or %s.%s)."
-msgstr "错误:\"%s\" 不明确(%s.%s 或 %s.%s)。"
+msgstr "“%s” 含义模糊 (%s x %s)"
 
-#: ../clients/cli/connections.c:4634
+#: ../clients/cli/connections.c:4302
 #, c-format
 msgid "Error: invalid <setting>.<property> '%s'."
-msgstr "错误:无效的 <设置>.<属性> \"%s\"。"
+msgstr "错误:无效的 <设置>.<属性> “%s”。"
 
-#: ../clients/cli/connections.c:4678 ../clients/cli/connections.c:8272
+#: ../clients/cli/connections.c:4346 ../clients/cli/connections.c:7989
 #, c-format
 msgid "Error: Failed to add '%s' connection: %s"
-msgstr "错误:添加 \"%s\" 连接失败:%s"
+msgstr "错误:添加 '%s' 连接失败:%s"
 
-#: ../clients/cli/connections.c:4696
+#: ../clients/cli/connections.c:4364
 #, c-format
 msgid ""
 "Warning: There is another connection with the name '%1$s'. Reference the "
@@ -1306,76 +1167,55 @@ msgid_plural ""
 "Warning: There are %3$u other connections with the name '%1$s'. Reference "
 "the connection by its uuid '%2$s'\n"
 msgstr[0] ""
-"警告:存在 %3$u 条名为 \"%1$s\" 的其他连接。可由它的 uuid \"%2$s\" 引用\n"
 
-#: ../clients/cli/connections.c:4705
+#: ../clients/cli/connections.c:4373
 #, c-format
 msgid "Connection '%s' (%s) successfully added.\n"
-msgstr "连接 \"%s\" (%s) 已成功添加。\n"
-
-#: ../clients/cli/connections.c:4758 ../clients/cli/connections.c:6707
-#: ../clients/cli/connections.c:6708 ../clients/cli/devices.c:512
-#: ../clients/cli/devices.c:519 ../clients/cli/devices.c:1238
-#: ../clients/cli/general.c:157 ../clients/cli/utils.h:292
-#: ../clients/common/nm-client-utils.c:279
-#: ../clients/common/nm-meta-setting-desc.c:754
-#: ../clients/common/nm-meta-setting-desc.c:2702
-msgid "no"
-msgstr "否"
+msgstr "连接“%s”(%s) 已成功添加。\n"
 
-#: ../clients/cli/connections.c:4759 ../clients/cli/connections.c:6707
-#: ../clients/cli/connections.c:6708 ../clients/cli/devices.c:511
-#: ../clients/cli/devices.c:518 ../clients/cli/devices.c:1238
-#: ../clients/cli/general.c:156 ../clients/cli/utils.h:292
-#: ../clients/common/nm-client-utils.c:278
-#: ../clients/common/nm-meta-setting-desc.c:754
-#: ../clients/common/nm-meta-setting-desc.c:2699
-msgid "yes"
-msgstr "是"
-
-#: ../clients/cli/connections.c:4845
+#: ../clients/cli/connections.c:4511
 #, c-format
 msgid ""
 "You can specify this option more than once. Press <Enter> when you're done.\n"
-msgstr "您可以多次指定此选项。按下 <回车键> 以完成。\n"
+msgstr ""
 
 #. Ask for optional arguments.
-#: ../clients/cli/connections.c:4944
-#, c-format
+#: ../clients/cli/connections.c:4610
+#, fuzzy, c-format
 msgid "There is %d optional setting for %s.\n"
 msgid_plural "There are %d optional settings for %s.\n"
-msgstr[0] "%2$s 有 %1$d 个可选的设置。\n"
+msgstr[0] "有 %d 可选参数可用于“%s”连接类型。\n"
 
-#: ../clients/cli/connections.c:4947
+#: ../clients/cli/connections.c:4613
 #, c-format
 msgid "Do you want to provide it? %s"
 msgid_plural "Do you want to provide them? %s"
 msgstr[0] "您要提供它吗?%s"
 
-#: ../clients/cli/connections.c:5080 ../clients/cli/utils.c:294
+#: ../clients/cli/connections.c:4749 ../clients/cli/utils.c:303
 #, c-format
 msgid "Error: value for '%s' argument is required."
-msgstr "错误:需要 \"%s\" 参数的值。"
+msgstr "错误:需要 “%s” 参数值。"
 
-#: ../clients/cli/connections.c:5087
+#: ../clients/cli/connections.c:4755
 #, c-format
 msgid "Error: 'save': %s."
-msgstr "错误:\"save\":%s。"
+msgstr "错误:'save': %s。"
 
-#: ../clients/cli/connections.c:5173 ../clients/cli/connections.c:5184
-#, c-format
+#: ../clients/cli/connections.c:4843 ../clients/cli/connections.c:4854
+#, fuzzy, c-format
 msgid "Error: '%s' argument is required."
-msgstr "错误:需要 \"%s\" 参数。"
+msgstr "错误:需要“type”参数。"
 
-#: ../clients/cli/connections.c:6149
+#: ../clients/cli/connections.c:5832
 #, c-format
 msgid "['%s' setting values]\n"
-msgstr "[\"%s\" 设置值]\n"
+msgstr "[“%s”设置值]\n"
 
 #. TRANSLATORS: do not translate command names and keywords before ::
 #. *              However, you should translate terms enclosed in <>.
 #.
-#: ../clients/cli/connections.c:6258
+#: ../clients/cli/connections.c:5911
 #, c-format
 msgid ""
 "---[ Main menu ]---\n"
@@ -1393,21 +1233,22 @@ msgid ""
 "nmcli    <conf-option> <value>       :: nmcli configuration\n"
 "quit                                 :: exit nmcli\n"
 msgstr ""
-"---[ 主菜单 ]---\n"
-"goto     [<设置> | <属性>]        :: 转到设置或属性\n"
-"remove   <设置>[.<属性>] | <属性> :: 移除设置或重置属性值\n"
-"set      [<设置>.<属性> <值>]     :: 设置属性值\n"
-"describe [<设置>.<属性>]          :: 描述属性\n"
-"print    [all | <设置>[.<属性>]]  :: 输出连接\n"
-"verify   [all | fix]              :: 验证连接\n"
-"save     [persistent|temporary]   :: 保存连接\n"
-"activate [<接口名>] [/<ap>|<nsp>] :: 激活连接\n"
-"back                              :: 转到上层(返回)\n"
-"help/?   [<命令>]                 :: 输出此帮助\n"
-"nmcli    <配置选项> <值>          :: nmcli configuration\n"
-"quit                              :: 退出 nmcli\n"
+"---[ Main menu ]---\n"
+"goto     [<setting> | <prop>]        :: go to a setting or property\n"
+"remove   <setting>[.<prop>] | <prop> :: remove setting or reset property "
+"value\n"
+"set      [<setting>.<prop> <value>]  :: set property value\n"
+"describe [<setting>.<prop>]          :: describe property\n"
+"print    [all | <setting>[.<prop>]]  :: print the connection\n"
+"verify   [all | fix]                 :: verify the connection\n"
+"save     [persistent|temporary]      :: save the connection\n"
+"activate [<ifname>] [/<ap>|<nsp>]    :: activate the connection\n"
+"back                                 :: go one level up (back)\n"
+"help/?   [<command>]                 :: print this help\n"
+"nmcli    <conf-option> <value>       :: nmcli configuration\n"
+"quit                                 :: exit nmcli\n"
 
-#: ../clients/cli/connections.c:6285
+#: ../clients/cli/connections.c:5938
 #, c-format
 msgid ""
 "goto <setting>[.<prop>] | <prop>  :: enter setting/property for editing\n"
@@ -1423,10 +1264,10 @@ msgstr ""
 "该命令进入设置或属性来进行编辑。\n"
 "\n"
 "示例:nmcli> goto connection\n"
-"      nmcli connection> goto secondaries\n"
-"      nmcli> goto ipv4.addresses\n"
+"          nmcli connection> goto secondaries\n"
+"          nmcli> goto ipv4.addresses\n"
 
-#: ../clients/cli/connections.c:6292
+#: ../clients/cli/connections.c:5945
 #, c-format
 msgid ""
 "remove <setting>[.<prop>]  :: remove setting or reset property value\n"
@@ -1443,9 +1284,9 @@ msgstr ""
 "该命令移除来自连接的输入项设置,或者如果给定属性,重置该属性为默认值。\n"
 "\n"
 "示例:nmcli> remove wifi-sec\n"
-"      nmcli> remove eth.mtu\n"
+"          nmcli> remove eth.mtu\n"
 
-#: ../clients/cli/connections.c:6299
+#: ../clients/cli/connections.c:5952
 #, c-format
 msgid ""
 "set [<setting>.<prop> <value>]  :: set property value\n"
@@ -1460,7 +1301,7 @@ msgstr ""
 "\n"
 "示例:nmcli> set con.id 我的连接\n"
 
-#: ../clients/cli/connections.c:6304
+#: ../clients/cli/connections.c:5957
 #, c-format
 msgid ""
 "describe [<setting>.<prop>]  :: describe property\n"
@@ -1470,10 +1311,10 @@ msgid ""
 msgstr ""
 "describe [<设置>.<属性>]  :: 描述属性\n"
 "\n"
-"显示属性描述。您可以参阅 nm-settings(5) 手册页来查看全部的网络管理器"
-"(NetworkManager)设置和属性。\n"
+"显示属性描述。您肯依参阅 nm-settings(5) 手册页来查看全部的网络管理器设置和属"
+"性。\n"
 
-#: ../clients/cli/connections.c:6309
+#: ../clients/cli/connections.c:5962
 #, c-format
 msgid ""
 "print [all]  :: print setting or connection values\n"
@@ -1484,11 +1325,11 @@ msgid ""
 msgstr ""
 "print [all]  :: 输出设置或连接值\n"
 "\n"
-"显示当前属性或整个连接。\n"
+"显示当前属性或全部的连接。\n"
 "\n"
 "示例:nmcli ipv4> print all\n"
 
-#: ../clients/cli/connections.c:6314
+#: ../clients/cli/connections.c:5967
 #, c-format
 msgid ""
 "verify [all | fix]  :: verify setting or connection validity\n"
@@ -1502,17 +1343,16 @@ msgid ""
 "          nmcli> verify fix\n"
 "          nmcli bond> verify\n"
 msgstr ""
-"verify [all | fix]  :: 验证设置或连接的有效性\n"
+"verify [all | fix]  :: 检验设置或连接的有效性\n"
 "\n"
-"验证设置或连接是否有效和可以稍后保存。发生错误时它会指出无效的值。有些错误可"
-"以\n"
-"通过 \"fix\" 选项自动修复。\n"
+"检验设置或连接是否有效且可在以后保存。发生错误时它会提示值无效。某些错误可以"
+"通过 'fix' 选项自动修复。\n"
 "\n"
 "示例: nmcli> verify\n"
-"      nmcli> verify fix\n"
-"      nmcli bond> verify\n"
+"          nmcli> verify fix\n"
+"          nmcli bond> verify\n"
 
-#: ../clients/cli/connections.c:6323
+#: ../clients/cli/connections.c:5976
 #, c-format
 msgid ""
 "save [persistent|temporary]  :: save the connection\n"
@@ -1529,16 +1369,16 @@ msgid ""
 msgstr ""
 "save [persistent|temporary]  :: 保存连接\n"
 "\n"
-"发送连接配置集到网络管理器(NetworkManager),可以选择永久保存或者是只保存在"
-"内存里。不带参数\n"
-"的 \"save\" 表示 \"save persistent\"。\n"
-"请注意,一旦您永久地保存了配置集,这些设置在重启机器/NM 后都会存在。随后的修"
-"改\n"
-"可以是临时的,也可以是永久的,但任何临时的修改在重启后都会复原。如果您想完全"
-"删\n"
-"除永久性连接,连接配置集就必须被删除。\n"
+"发送连接配置集到 NetworkManager,或是永久保存 ,\n"
+"或是只保存在内存里。不带参数的 'save' \n"
+"表示 'save persistent'。\n"
+"请注意,一旦您永久地保存了配置集,这些设置在\n"
+"重启后都会存在。随后的修改可以是临时的,也\n"
+"可以是永久的,但任何临时的修改在重启后都会复原。\n"
+"如果您项完全删除持久性连接,连接配置集就必须\n"
+"被删除。\n"
 
-#: ../clients/cli/connections.c:6334
+#: ../clients/cli/connections.c:5987
 #, c-format
 msgid ""
 "activate [<ifname>] [/<ap>|<nsp>]  :: activate the connection\n"
@@ -1550,25 +1390,24 @@ msgid ""
 "/<ap>|<nsp> - AP (Wi-Fi) or NSP (WiMAX) (prepend with / when <ifname> is not "
 "specified)\n"
 msgstr ""
-"activate [<接口名>] [/<ap>|<nsp>]  :: 激活连接\n"
+"activate [<ifname>] [/<ap>|<nsp>]  :: 激活连接\n"
 "\n"
 "激活连接。\n"
 "\n"
 "可用选项:\n"
-"<接口名>    - 将激活连接的设备。\n"
-"/<ap>|<nsp> - AP (Wi-Fi) 或者 NSP (WiMAX)(未指定 <接口名> 时前置 / 符"
-"号。)\n"
+"<ifname>    - 在其中激活连接的设备。\n"
+"/<ap>|<nsp> - AP (Wi-Fi) 或者 NSP (WiMAX) (未指定 <ifname> 时用 / 做前缀。)\n"
 
-#: ../clients/cli/connections.c:6341 ../clients/cli/connections.c:6499
+#: ../clients/cli/connections.c:5994 ../clients/cli/connections.c:6153
 #, c-format
 msgid ""
 "back  :: go to upper menu level\n"
 "\n"
 msgstr ""
-"back  :: 转到上层菜单\n"
+"back  :: 转到上级菜单\n"
 "\n"
 
-#: ../clients/cli/connections.c:6344
+#: ../clients/cli/connections.c:5997
 #, c-format
 msgid ""
 "help/? [<command>]  :: help for the nmcli commands\n"
@@ -1577,7 +1416,7 @@ msgstr ""
 "help/? [<命令>]  :: nmcli 命令的帮助\n"
 "\n"
 
-#: ../clients/cli/connections.c:6347
+#: ../clients/cli/connections.c:6000
 #, c-format
 msgid ""
 "nmcli [<conf-option> <value>]  :: nmcli configuration\n"
@@ -1592,19 +1431,19 @@ msgid ""
 "          nmcli> nmcli save-confirmation no\n"
 "          nmcli> nmcli prompt-color 3\n"
 msgstr ""
-"nmcli [<配置选项> <值>]  :: nmcli 配置\n"
+"nmcli [<conf-option> <value>]  :: nmcli 配置\n"
 "\n"
 "配置 nmcli。以下是可用选项:\n"
-"status-line yes | no          [默认:no]\n"
-"save-confirmation yes | no    [默认:yes]\n"
-"show-secrets yes | no         [默认:no]\n"
-"prompt-color <颜色> | <0-8>   [默认:0]\n"
+"status-line yes | no          [default: no]\n"
+"save-confirmation yes | no    [default: yes]\n"
+"show-secrets yes | no         [default: no]\n"
+"prompt-color <color> | <0-8>  [default: 0]\n"
 "%s\n"
 "示例: nmcli> nmcli status-line yes\n"
-"      nmcli> nmcli save-confirmation no\n"
-"      nmcli> nmcli prompt-color 3\n"
+"          nmcli> nmcli save-confirmation no\n"
+"          nmcli> nmcli prompt-color 3\n"
 
-#: ../clients/cli/connections.c:6369 ../clients/cli/connections.c:6505
+#: ../clients/cli/connections.c:6022 ../clients/cli/connections.c:6159
 #, c-format
 msgid ""
 "quit  :: exit nmcli\n"
@@ -1614,18 +1453,18 @@ msgid ""
 msgstr ""
 "quit  :: 退出 nmcli\n"
 "\n"
-"此命令用于退出 nmcli。当被编辑的连接没有保存时,会询问用户确定操作。\n"
+"此命令用于退出 nmcli。当被编辑的连接没有保存,会询问用户确定操作。\n"
 
-#: ../clients/cli/connections.c:6374 ../clients/cli/connections.c:6510
-#: ../clients/cli/connections.c:6929 ../clients/cli/connections.c:7856
+#: ../clients/cli/connections.c:6027 ../clients/cli/connections.c:6164
+#: ../clients/cli/connections.c:6600 ../clients/cli/connections.c:7557
 #, c-format
 msgid "Unknown command: '%s'\n"
-msgstr "未知命令:\"%s\"\n"
+msgstr "未知命令:“%s”\n"
 
 #. TRANSLATORS: do not translate command names and keywords before ::
 #. *              However, you should translate terms enclosed in <>.
 #.
-#: ../clients/cli/connections.c:6439
+#: ../clients/cli/connections.c:6093
 #, c-format
 msgid ""
 "---[ Property menu ]---\n"
@@ -1641,17 +1480,17 @@ msgid ""
 "quit                             :: exit nmcli\n"
 msgstr ""
 "---[ 属性菜单 ]---\n"
-"set      [<值>]                  :: 设置新值\n"
-"add      [<值>]                  :: 添加新选项到属性\n"
+"set      [<值>]               :: 设置新值\n"
+"add      [<值>]               :: 添加新选项到属性\n"
 "change                           :: 更改当前值\n"
-"remove   [<目录> | <选项>]       :: 删除该值\n"
+"remove   [<目录> | <选项>]    :: 删除该值\n"
 "describe                         :: 描述属性\n"
-"print    [setting | connection]  :: 输出(设置/连接)值\n"
+"print    [setting | connection]  :: 输出 (设置/连接) 值\n"
 "back                             :: 转到上一级\n"
-"help/?   [<命令>]                :: 输出该帮助或命令描述\n"
+"help/?   [<命令>]             :: 输出该帮助或命令描述\n"
 "quit                             :: 退出 nmcli\n"
 
-#: ../clients/cli/connections.c:6464
+#: ../clients/cli/connections.c:6118
 #, c-format
 msgid ""
 "set [<value>]  :: set new value\n"
@@ -1662,7 +1501,7 @@ msgstr ""
 "\n"
 "此命令用于设置提供的 <值> 到该属性\n"
 
-#: ../clients/cli/connections.c:6468
+#: ../clients/cli/connections.c:6122
 #, c-format
 msgid ""
 "add [<value>]  :: append new value to the property\n"
@@ -1671,13 +1510,13 @@ msgid ""
 "container type. For single-valued properties the property value is replaced "
 "(same as 'set').\n"
 msgstr ""
-"add [<值>]  :: 附加新值到这个属性\n"
+"add [<value>]  :: 附加新值到这个属性\n"
 "\n"
-"如果该属性为容器类型,则这个命令在这个属性中添加提供的 <值>。对于单值属性,它"
-"会替换该值(和 \"set\" 一样)。\n"
+"如果该属性为容器类型,则这个命令在这个属性中添加提供的 <value>。对于单值属"
+"性,它会替换该值(和‘set’一样)。\n"
 "\n"
 
-#: ../clients/cli/connections.c:6474
+#: ../clients/cli/connections.c:6128
 #, c-format
 msgid ""
 "change  :: change current value\n"
@@ -1688,7 +1527,7 @@ msgstr ""
 "\n"
 "显示当前值并允许编辑它。\n"
 
-#: ../clients/cli/connections.c:6478
+#: ../clients/cli/connections.c:6132
 #, c-format
 msgid ""
 "remove [<value>|<index>|<option name>]  :: delete the value\n"
@@ -1707,20 +1546,20 @@ msgid ""
 "          nmcli bond.options> remove downdelay\n"
 "\n"
 msgstr ""
-"remove [<值>|<目录>|<选项名称>]  :: 删除属性值\n"
+"remove [<value>|<index>|<option name>]  :: 删除属性值\n"
 "\n"
-"移除属性值。对于单值属性,将属性设置回其默认值。对于容器类属性,这将删除该属"
-"性\n"
-"的所有值,或者您可以指定参数只删除单项或选项。参数可以是要删除项的值或索引,"
-"又\n"
-"或者是选项名称(具有命名选项的属性)。\n"
+"删除属性值。对于单值的属性,这会将属性设置\n"
+"回其默认值。对于 container-type 属性,这将删除\n"
+"该属性的所有值,或者您可以指定参数只删除单项\n"
+"或选项。参数可以是一个值或要删除的项的索引,\n"
+"或者是选项名称(具有命名选项的属性)。 \n"
 "\n"
 "示例: nmcli ipv4.dns> remove 8.8.8.8\n"
-"      nmcli ipv4.dns> remove 2\n"
-"      nmcli bond.options> remove downdelay\n"
+"          nmcli ipv4.dns> remove 2\n"
+"          nmcli bond.options> remove downdelay\n"
 "\n"
 
-#: ../clients/cli/connections.c:6489
+#: ../clients/cli/connections.c:6143
 #, c-format
 msgid ""
 "describe  :: describe property\n"
@@ -1730,10 +1569,10 @@ msgid ""
 msgstr ""
 "describe  :: 描述属性\n"
 "\n"
-"显示属性描述。您可以参阅 nm-settings(5) 手册页来查看所有的网络管理器"
-"(NetworkManager)设置和属性。\n"
+"显示属性描述。您可以参阅 nm-settings(5) 手册页来查看所有的网络管理器设置和属"
+"性。\n"
 
-#: ../clients/cli/connections.c:6494
+#: ../clients/cli/connections.c:6148
 #, c-format
 msgid ""
 "print [property|setting|connection]  :: print property (setting, connection) "
@@ -1742,532 +1581,531 @@ msgid ""
 "Shows property value. Providing an argument you can also display values for "
 "the whole setting or connection.\n"
 msgstr ""
-"print [property|setting|connection]  :: 输出属性(设置、连接)值\n"
+"print [property|setting|connection]  :: 输出属性 (设置、连接) 值\n"
 "\n"
-"显示属性。提供参数您也可以显示整个设置或连接的值。\n"
+"显示属性。提供一项命令,您可以为全部设置或连接显示值。\n"
 
-#: ../clients/cli/connections.c:6502
+#: ../clients/cli/connections.c:6156
 #, c-format
 msgid ""
 "help/? [<command>]  :: help for nmcli commands\n"
 "\n"
 msgstr ""
-"help/? [<命令>]  :: nmcli 命令的帮助\n"
+"help/? [<命令>]  :: nmcli 命令的帮护\n"
 "\n"
 
-#: ../clients/cli/connections.c:6596
+#: ../clients/cli/connections.c:6250
 #, c-format
 msgid "Error: Connection activation failed.\n"
-msgstr "错误:连接激活失败。\n"
+msgstr "错误:激活连接失败。\n"
 
-#: ../clients/cli/connections.c:6687
+#: ../clients/cli/connections.c:6345
 #, c-format
 msgid "Error: setting '%s' is mandatory and cannot be removed.\n"
-msgstr "错误:设置 \"%s\" 是必填的而且无法移除。\n"
+msgstr "错误:设置“%s”是必填的而且无法移除。\n"
 
 #. TRANSLATORS: status line in nmcli connection editor
-#: ../clients/cli/connections.c:6705
+#: ../clients/cli/connections.c:6363
 #, c-format
 msgid "[ Type: %s | Name: %s | UUID: %s | Dirty: %s | Temp: %s ]\n"
-msgstr "[ 类型:%s | 名称:%s | UUID:%s | 变动:%s | 临时:%s ]\n"
+msgstr "[ Type: %s | Name: %s | UUID: %s | Dirty: %s | Temp: %s ]\n"
 
-#: ../clients/cli/connections.c:6741
+#: ../clients/cli/connections.c:6399
 #, c-format
 msgid "The connection is not saved. Do you really want to quit? %s"
 msgstr "连接未保存。您真的要退出吗?%s"
 
-#: ../clients/cli/connections.c:6787
+#: ../clients/cli/connections.c:6448
 #, c-format
 msgid ""
 "The connection profile has been removed from another client. You may type "
 "'save' in the main menu to restore it.\n"
 msgstr ""
-"此连接配置集已被其他客户端移除了。您可以在主菜单中输入 \"save\" 来还原它。\n"
+"此连接配置文件已被其它客户端移除了。您可以在主菜单输入“save”来还原它。\n"
 
-#: ../clients/cli/connections.c:6818 ../clients/cli/connections.c:7210
-#: ../clients/cli/connections.c:7268
+#: ../clients/cli/connections.c:6478 ../clients/cli/connections.c:6892
+#: ../clients/cli/connections.c:6950
 #, c-format
 msgid "Allowed values for '%s' property: %s\n"
-msgstr "\"%s\" 属性允许的值:%s\n"
+msgstr "对于“%s”属性允许的值:%s\n"
 
-#: ../clients/cli/connections.c:6821 ../clients/cli/connections.c:7213
-#: ../clients/cli/connections.c:7271
+#: ../clients/cli/connections.c:6481 ../clients/cli/connections.c:6895
+#: ../clients/cli/connections.c:6953
 #, c-format
 msgid "Enter '%s' value: "
-msgstr "输入 \"%s\" 值:"
+msgstr "输入“%s”值:"
 
-#: ../clients/cli/connections.c:6835 ../clients/cli/connections.c:6855
-#: ../clients/cli/connections.c:7217 ../clients/cli/connections.c:7276
+#: ../clients/cli/connections.c:6496 ../clients/cli/connections.c:6518
+#: ../clients/cli/connections.c:6899 ../clients/cli/connections.c:6958
 #, c-format
 msgid "Error: failed to set '%s' property: %s\n"
-msgstr "错误:设置 \"%s\" 属性失败:%s\n"
+msgstr "错误:设置“%s”属性失败:%s\n"
 
-#: ../clients/cli/connections.c:6849
+#: ../clients/cli/connections.c:6512
 #, c-format
 msgid "Edit '%s' value: "
-msgstr "编辑 \"%s\" 值:"
+msgstr "编辑“%s”值:"
 
-#: ../clients/cli/connections.c:6875 ../clients/cli/settings.c:394
+#: ../clients/cli/connections.c:6541 ../clients/cli/settings.c:392
 #, c-format
 msgid "Error: %s\n"
 msgstr "错误:%s\n"
 
-#: ../clients/cli/connections.c:6881 ../clients/cli/connections.c:7371
-#: ../clients/cli/connections.c:7422
+#: ../clients/cli/connections.c:6547 ../clients/cli/connections.c:7053
+#: ../clients/cli/connections.c:7104
 #, c-format
 msgid "Error: failed to remove value of '%s': %s\n"
-msgstr "错误:移除 \"%s\" 的值失败:%s\n"
+msgstr "错误:移除“%s”的值失败:%s\n"
 
-#: ../clients/cli/connections.c:6902
+#: ../clients/cli/connections.c:6568
 #, c-format
 msgid "Unknown command argument: '%s'\n"
-msgstr "未知的命令参数:\"%s\"\n"
+msgstr "未知命令参数:“%s”\n"
 
-#: ../clients/cli/connections.c:6992
+#: ../clients/cli/connections.c:6671
 #, c-format
 msgid "Available settings: %s\n"
 msgstr "有效设置:%s\n"
 
-#: ../clients/cli/connections.c:7004
+#: ../clients/cli/connections.c:6683
 #, c-format
 msgid "Error: invalid setting name; %s\n"
 msgstr "错误:无效的设置名称;%s\n"
 
-#: ../clients/cli/connections.c:7021
+#: ../clients/cli/connections.c:6700
 #, c-format
 msgid "Available properties: %s\n"
 msgstr "有效属性:%s\n"
 
-#: ../clients/cli/connections.c:7029
+#: ../clients/cli/connections.c:6708
 #, c-format
 msgid "Error: property %s\n"
 msgstr "错误:属性 %s\n"
 
-#: ../clients/cli/connections.c:7070
+#: ../clients/cli/connections.c:6749
 #, c-format
 msgid ""
 "Saving the connection with 'autoconnect=yes'. That might result in an "
 "immediate activation of the connection.\n"
 "Do you still want to save? %s"
 msgstr ""
-"使用 \"autoconnect=yes\" 保存该连接。这样会立即激活该连接。\n"
-"您仍要保存吗? %s"
+"使用 'autoconnect=yes' 保存该连接。这样会立即激活该连接。\n"
+"您还要保存吗? %s"
 
-#: ../clients/cli/connections.c:7149
+#: ../clients/cli/connections.c:6832
 #, c-format
 msgid "You may edit the following settings: %s\n"
 msgstr "您可编辑下列设置:%s\n"
 
-#: ../clients/cli/connections.c:7178
+#: ../clients/cli/connections.c:6862
 #, c-format
 msgid ""
 "The connection profile has been removed from another client. You may type "
 "'save' to restore it.\n"
-msgstr "此连接配置集已被其他客户端移除了。您可以输入 \"save\" 来还原它。\n"
+msgstr "此连接配置文件已被其它客户端移除了。您可以输入“save”来还原它。\n"
 
-#: ../clients/cli/connections.c:7221 ../clients/cli/connections.c:7466
-#: ../clients/cli/connections.c:7498
+#: ../clients/cli/connections.c:6903 ../clients/cli/connections.c:7148
+#: ../clients/cli/connections.c:7180
 #, c-format
 msgid "Error: no setting selected; valid are [%s]\n"
 msgstr "错误:未选择设置;有效的为 [%s]\n"
 
-#: ../clients/cli/connections.c:7222
+#: ../clients/cli/connections.c:6904
 #, c-format
 msgid "use 'goto <setting>' first, or 'set <setting>.<property>'\n"
-msgstr "先使用 \"goto <设置>\",或 \"set <设置>.<属性>\"\n"
+msgstr "先使用“goto <设置>”,或“set <设置>.<属性>”\n"
 
-#: ../clients/cli/connections.c:7237 ../clients/cli/connections.c:7398
-#: ../clients/cli/connections.c:7488
+#: ../clients/cli/connections.c:6919 ../clients/cli/connections.c:7080
+#: ../clients/cli/connections.c:7170
 #, c-format
 msgid "Error: invalid setting argument '%s'; valid are [%s]\n"
-msgstr "错误:无效的设置参数 \"%s\";有效的为 [%s]\n"
+msgstr "错误:无效的设置参数“%s”;有效的为 [%s]\n"
 
-#: ../clients/cli/connections.c:7246
+#: ../clients/cli/connections.c:6928
 #, c-format
 msgid "Error: missing setting for '%s' property\n"
-msgstr "错误:缺少 \"%s\" 属性的设置\n"
+msgstr "错误:缺少用于“%s”属性的设置\n"
 
-#: ../clients/cli/connections.c:7253
+#: ../clients/cli/connections.c:6935
 #, c-format
 msgid "Error: invalid property: %s\n"
-msgstr "错误:无效的属性:%s\n"
+msgstr "错误:无效属性:%s\n"
 
-#: ../clients/cli/connections.c:7307
+#: ../clients/cli/connections.c:6989
 #, c-format
 msgid "Error: unknown setting '%s'\n"
-msgstr "错误:未知的设置 \"%s\"\n"
+msgstr "错误:未知设置“%s”\n"
 
-#: ../clients/cli/connections.c:7332
+#: ../clients/cli/connections.c:7014
 #, c-format
 msgid "You may edit the following properties: %s\n"
 msgstr "您可以编辑下列属性:%s\n"
 
-#: ../clients/cli/connections.c:7376
+#: ../clients/cli/connections.c:7058
 #, c-format
 msgid "Error: no argument given; valid are [%s]\n"
 msgstr "错误:未给定参数:有效的为 [%s]\n"
 
-#: ../clients/cli/connections.c:7395
+#: ../clients/cli/connections.c:7077
 #, c-format
 msgid "Setting '%s' is not present in the connection.\n"
-msgstr "设置 \"%s\" 在连接里未提供。\n"
+msgstr "设置“%s”未在连接里提供。\n"
 
-#: ../clients/cli/connections.c:7443
+#: ../clients/cli/connections.c:7125
 #, c-format
 msgid "Error: %s properties, nor it is a setting name.\n"
 msgstr "错误:%s 属性,也不是设置名称。\n"
 
-#: ../clients/cli/connections.c:7467 ../clients/cli/connections.c:7499
+#: ../clients/cli/connections.c:7149 ../clients/cli/connections.c:7181
 #, c-format
 msgid "use 'goto <setting>' first, or 'describe <setting>.<property>'\n"
-msgstr "先使用 \"goto <设置>\",或 \"describe <设置>.<属性>\"\n"
+msgstr "先使用“goto <设置>”,或“describe <设置>.<属性>”\n"
 
-#: ../clients/cli/connections.c:7522
+#: ../clients/cli/connections.c:7204
 #, c-format
 msgid "Error: invalid property: %s, neither a valid setting name.\n"
-msgstr "错误:无效的属性:%s,也不是有效的设置名称。\n"
+msgstr "错误:无效属性:%s,也不是有效的设置名称。\n"
 
-#: ../clients/cli/connections.c:7552
+#: ../clients/cli/connections.c:7234
 #, c-format
 msgid "Error: unknown setting: '%s'\n"
-msgstr "错误:未知的设置:\"%s\"\n"
+msgstr "错误:未知设置:“%s”\n"
 
-#: ../clients/cli/connections.c:7557
+#: ../clients/cli/connections.c:7239
 #, c-format
 msgid "Error: '%s' setting not present in the connection\n"
-msgstr "错误:设置 \"%s\" 在连接里未提供。\n"
+msgstr "错误:该连接中未出现设置 '%s'\n"
 
-#: ../clients/cli/connections.c:7588
+#: ../clients/cli/connections.c:7270
 #, c-format
 msgid "Error: invalid property: %s%s\n"
-msgstr "错误:无效的属性:%s%s\n"
+msgstr "错误:无效属性:%s%s\n"
 
-#: ../clients/cli/connections.c:7590
+#: ../clients/cli/connections.c:7272
 msgid ", neither a valid setting name"
 msgstr ",也不是有效的设置名称"
 
-#: ../clients/cli/connections.c:7606
+#: ../clients/cli/connections.c:7288
 #, c-format
 msgid "Invalid verify option: %s\n"
-msgstr "无效的验证选项:%s\n"
+msgstr "无效的检验选项:%s\n"
 
-#: ../clients/cli/connections.c:7614
+#: ../clients/cli/connections.c:7296
 #, c-format
 msgid "Verify setting '%s': %s\n"
-msgstr "验证设置 \"%s\":%s\n"
+msgstr "验证设置“%s”:%s\n"
 
-#: ../clients/cli/connections.c:7629
+#: ../clients/cli/connections.c:7311
 #, c-format
 msgid "Verify connection: %s\n"
 msgstr "验证连接:%s\n"
 
-#: ../clients/cli/connections.c:7632
+#: ../clients/cli/connections.c:7314
 #, c-format
 msgid "The error cannot be fixed automatically.\n"
 msgstr "错误无法自动修复。\n"
 
-#: ../clients/cli/connections.c:7649
+#: ../clients/cli/connections.c:7331
 #, c-format
 msgid "Error: invalid argument '%s'\n"
-msgstr "错误:无效的参数 \"%s\"\n"
+msgstr "错误:无效的参数 '%s'\n"
 
-#: ../clients/cli/connections.c:7681
+#: ../clients/cli/connections.c:7363
 #, c-format
 msgid "Error: Failed to save '%s' (%s) connection: %s\n"
-msgstr "错误:保存 \"%s\" (%s) 连接失败:%s\n"
+msgstr "错误:保存 '%s' (%s) 连接失败:%s\n"
 
-#: ../clients/cli/connections.c:7688
+#: ../clients/cli/connections.c:7370
 #, c-format
 msgid "Connection '%s' (%s) successfully saved.\n"
-msgstr "连接 \"%s\" (%s) 已成功保存。\n"
+msgstr "连接“%s” (%s)  已成功保存。\n"
 
-#: ../clients/cli/connections.c:7689
+#: ../clients/cli/connections.c:7371
 #, c-format
 msgid "Connection '%s' (%s) successfully updated.\n"
-msgstr "成功地更新了连接 \"%s\" (%s)。\n"
+msgstr "成功地更新了连接 '%s'(%s)。\n"
 
-#: ../clients/cli/connections.c:7721
+#: ../clients/cli/connections.c:7403
 #, c-format
 msgid "Error: connection verification failed: %s\n"
 msgstr "错误:连接验证失败:%s。\n"
 
-#: ../clients/cli/connections.c:7722
+#: ../clients/cli/connections.c:7404
 msgid "(unknown error)"
 msgstr "(未知错误)"
 
-#: ../clients/cli/connections.c:7723
+#: ../clients/cli/connections.c:7405
 #, c-format
 msgid "You may try running 'verify fix' to fix errors.\n"
-msgstr "您可以运行 \"verify fix\" 来修复错误。\n"
+msgstr "您可以运行 'verify fix' 来修复错误。\n"
 
-#: ../clients/cli/connections.c:7745
+#: ../clients/cli/connections.c:7427
 #, c-format
 msgid "Error: connection is not saved. Type 'save' first.\n"
-msgstr "错误:连接还未保存。先输入 \"save\"。\n"
+msgstr "错误:连接还未保存。先输入“save”。\n"
 
-#: ../clients/cli/connections.c:7749
+#: ../clients/cli/connections.c:7431
 #, c-format
 msgid "Error: connection is not valid: %s\n"
 msgstr "错误:连接是无效的:%s\n"
 
-#: ../clients/cli/connections.c:7759
+#: ../clients/cli/connections.c:7441
 #, c-format
 msgid "Error: Cannot activate connection: %s.\n"
 msgstr "错误:无法激活连接:%s。\n"
 
-#: ../clients/cli/connections.c:7768
+#: ../clients/cli/connections.c:7450
 #, c-format
 msgid "Error: Failed to activate '%s' (%s) connection: %s\n"
-msgstr "错误:激活 \"%s\" (%s) 连接失败:%s\n"
+msgstr "错误:激活 '%s' (%s) 连接失败:%s\n"
 
-#: ../clients/cli/connections.c:7774
+#: ../clients/cli/connections.c:7456
 msgid "Monitoring connection activation (press any key to continue)\n"
-msgstr "正在监视连接激活(按任意键继续)\n"
+msgstr "正在监控连接激活(按任意键继续)\n"
 
-# 具体的选项名,不需翻译,下同
-#: ../clients/cli/connections.c:7810
+#: ../clients/cli/connections.c:7492
 #, c-format
 msgid "Error: status-line: %s\n"
 msgstr "错误:status-line:%s\n"
 
-#: ../clients/cli/connections.c:7818
+#: ../clients/cli/connections.c:7500
 #, c-format
 msgid "Error: save-confirmation: %s\n"
 msgstr "错误:save-confirmation:%s\n"
 
-#: ../clients/cli/connections.c:7826
+#: ../clients/cli/connections.c:7508
 #, c-format
 msgid "Error: show-secrets: %s\n"
-msgstr "错误:show-secrets:%s\n"
+msgstr "错误:show-secrets: %s\n"
+
+#: ../clients/cli/connections.c:7517
+#, c-format
+msgid "Error: bad color: %s\n"
+msgstr "错误:错误的颜色:%s\n"
 
-#: ../clients/cli/connections.c:7833
+#: ../clients/cli/connections.c:7532
 #, c-format
 msgid "Current nmcli configuration:\n"
 msgstr "当前 nmcli 配置:\n"
 
-#: ../clients/cli/connections.c:7841
+#: ../clients/cli/connections.c:7542
 #, c-format
 msgid "Invalid configuration option '%s'; allowed [%s]\n"
-msgstr "无效的配置选项 \"%s\";允许 [%s]\n"
+msgstr "无效的配置选项“%s”;允许 [%s]\n"
 
-#: ../clients/cli/connections.c:8059
+#: ../clients/cli/connections.c:7762
 #, c-format
-msgid "Error: only one of 'id', 'filename', uuid, or 'path' can be provided."
-msgstr "错误:只能提供 \"id\"、\"filename\"、\"uuid\" 或 \"path\" 之一。"
+msgid "Error: only one of 'id', uuid, or 'path' can be provided."
+msgstr "错误:只能提供“id”、uuid 或“路径”之一。"
 
-#: ../clients/cli/connections.c:8073 ../clients/cli/connections.c:8233
+#: ../clients/cli/connections.c:7777 ../clients/cli/connections.c:7946
 #, c-format
 msgid "Error: Unknown connection '%s'."
-msgstr "错误:未知连接 \"%s\"。"
+msgstr "错误:未知连接“%s”。"
 
-#: ../clients/cli/connections.c:8089
+#: ../clients/cli/connections.c:7795
 #, c-format
 msgid "Warning: editing existing connection '%s'; 'type' argument is ignored\n"
-msgstr "警告:正在编辑已有的连接 \"%s\";\"type\" 参数已忽略\n"
+msgstr "警告:正在编辑已存的连接“%s”;“type”参数已忽略\n"
 
-#: ../clients/cli/connections.c:8092
+#: ../clients/cli/connections.c:7798
 #, c-format
 msgid ""
 "Warning: editing existing connection '%s'; 'con-name' argument is ignored\n"
-msgstr "警告:正在编辑已有的连接 \"%s\";\"con-name\" 参数已忽略\n"
+msgstr "警告:正在编辑已存的连接“%s”;“con-name”参数已忽略\n"
 
-#: ../clients/cli/connections.c:8119
+#: ../clients/cli/connections.c:7820
 #, c-format
 msgid "Valid connection types: %s\n"
-msgstr "有效的连接类型:%s\n"
+msgstr "无效的连接类型:%s\n"
 
-#: ../clients/cli/connections.c:8121
+#: ../clients/cli/connections.c:7822
 #, c-format
 msgid "Error: invalid connection type; %s\n"
 msgstr "错误:无效的连接类型;%s\n"
 
-#: ../clients/cli/connections.c:8156
+#: ../clients/cli/connections.c:7862
 #, c-format
 msgid "===| nmcli interactive connection editor |==="
 msgstr "===| nmcli 交互式连接编辑器 |==="
 
-#: ../clients/cli/connections.c:8159
+#: ../clients/cli/connections.c:7865
 #, c-format
 msgid "Editing existing '%s' connection: '%s'"
-msgstr "正在编辑已有的连接 \"%s\":\"%s\""
+msgstr "正在编辑已存的连接“%s”:“%s”"
 
-#: ../clients/cli/connections.c:8161
+#: ../clients/cli/connections.c:7867
 #, c-format
 msgid "Adding a new '%s' connection"
-msgstr "正在添加新的 \"%s\" 连接"
+msgstr "正在添加新的“%s”连接"
 
-#: ../clients/cli/connections.c:8163
+#: ../clients/cli/connections.c:7869
 #, c-format
 msgid "Type 'help' or '?' for available commands."
-msgstr "输入 \"help\" 或 \"?\" 查看可用的命令。"
-
-#: ../clients/cli/connections.c:8165
-#, c-format
-msgid "Type 'print' to show all the connection properties."
-msgstr "输入 \"print\" 来显示所有的连接属性。"
+msgstr "对于可用的命令输入“help”或“?”。"
 
-#: ../clients/cli/connections.c:8167
+#: ../clients/cli/connections.c:7871
 #, c-format
 msgid "Type 'describe [<setting>.<prop>]' for detailed property description."
-msgstr "输入 \"describe [<设置>.<属性>]\" 来获得详细的属性描述。"
+msgstr "输入“describe [<设置>.<属性>]”来获得详细的属性描述。"
 
-#: ../clients/cli/connections.c:8195
+#: ../clients/cli/connections.c:7906
 #, c-format
 msgid "Error: Failed to modify connection '%s': %s"
-msgstr "错误:修改连接 \"%s\" 失败:%s"
+msgstr "错误:修改连接 '%s' 失败:%s"
 
-#: ../clients/cli/connections.c:8201
+#: ../clients/cli/connections.c:7913
 #, c-format
 msgid "Connection '%s' (%s) successfully modified.\n"
-msgstr "连接 \"%s\" (%s) 已成功修改。\n"
+msgstr "连接“%s”(%s) 已成功修改。\n"
 
-#: ../clients/cli/connections.c:8277
+#: ../clients/cli/connections.c:7994
 #, c-format
 msgid "%s (%s) cloned as %s (%s).\n"
-msgstr "%s (%s) 已克隆为 %s (%s)。\n"
+msgstr "%s (%s) 被克隆为 %s (%s)。\n"
 
-#: ../clients/cli/connections.c:8342
+#: ../clients/cli/connections.c:8060
 msgid "New connection name: "
 msgstr "新连接名称:"
 
-#: ../clients/cli/connections.c:8344
+#: ../clients/cli/connections.c:8062
 #, c-format
 msgid "Error: <new name> argument is missing."
-msgstr "错误:缺少 <新名称> 参数。"
+msgstr "错误:缺少 <new name> 参数。"
 
-#: ../clients/cli/connections.c:8349 ../clients/cli/connections.c:8829
+#: ../clients/cli/connections.c:8068 ../clients/cli/connections.c:8570
 #, c-format
 msgid "Error: unknown extra argument: '%s'."
-msgstr "错误:未知的额外参数:\"%s\"。"
+msgstr "错误:未知的额外参数:'%s'。"
 
-#: ../clients/cli/connections.c:8394
+#: ../clients/cli/connections.c:8119
 #, c-format
 msgid "Error: not all connections deleted."
 msgstr "错误:未删除所有的连接。"
 
-#: ../clients/cli/connections.c:8395
+#: ../clients/cli/connections.c:8120
 #, c-format
 msgid "Error: Connection deletion failed: %s"
 msgstr "错误:连接删除失败:%s"
 
-#: ../clients/cli/connections.c:8451 ../clients/cli/connections.c:8572
+#: ../clients/cli/connections.c:8181 ../clients/cli/connections.c:8306
 #, c-format
 msgid "Error: %s.\n"
 msgstr "错误:%s。\n"
 
-#: ../clients/cli/connections.c:8452 ../clients/cli/connections.c:8573
+#: ../clients/cli/connections.c:8182 ../clients/cli/connections.c:8307
 #, c-format
 msgid "Error: not all connections found."
 msgstr "错误:未找到所有连接。"
 
 #. truncate trailing ", "
-#: ../clients/cli/connections.c:8503
+#: ../clients/cli/connections.c:8225
 #, c-format
 msgid "Error: cannot delete unknown connection(s): %s."
 msgstr "错误:无法删除未知连接:%s。"
 
-#: ../clients/cli/connections.c:8513
+#: ../clients/cli/connections.c:8237
 #, c-format
 msgid "%s: connection profile changed\n"
-msgstr "%s:连接配置集已改动\n"
+msgstr "%s: 连接配置集已改动\n"
 
-#: ../clients/cli/connections.c:8539
+#: ../clients/cli/connections.c:8263
 #, c-format
 msgid "%s: connection profile created\n"
-msgstr "%s:连接配置集已创建\n"
+msgstr "%s: 连接配置集已创建\n"
 
-#: ../clients/cli/connections.c:8548
+#: ../clients/cli/connections.c:8272
 #, c-format
 msgid "%s: connection profile removed\n"
-msgstr "%s:连接配置集已移除\n"
+msgstr "%s: 连接配置集已删除\n"
 
-#: ../clients/cli/connections.c:8610
+#: ../clients/cli/connections.c:8335
 #, c-format
 msgid "Error: failed to reload connections: %s."
-msgstr "错误:重新加载连接失败:%s。"
+msgstr "错误:重载连接失败:%s。"
 
-#: ../clients/cli/connections.c:8643
+#: ../clients/cli/connections.c:8368
 #, c-format
 msgid "Error: failed to load connection: %s."
 msgstr "错误:加载连接失败:%s。"
 
-#: ../clients/cli/connections.c:8651
+#: ../clients/cli/connections.c:8376
 #, c-format
 msgid "Could not load file '%s'\n"
-msgstr "无法加载文件 \"%s\"\n"
+msgstr "无法加载文件“%s”\n"
 
-#: ../clients/cli/connections.c:8658
+#: ../clients/cli/connections.c:8383
 msgid "File to import: "
 msgstr "要导入的文件:"
 
-#: ../clients/cli/connections.c:8689
+#: ../clients/cli/connections.c:8414
 #, c-format
 msgid "Error: No arguments provided."
-msgstr "错误:未提供参数。"
+msgstr "错误:没有提供参数。"
 
-#: ../clients/cli/connections.c:8712
+#: ../clients/cli/connections.c:8439
 #, c-format
 msgid "Warning: 'type' already specified, ignoring extra one.\n"
-msgstr "警告:已指定 \"type\",忽略额外的参数。\n"
+msgstr "警告:已指定 'type',忽略额外的选项。\n"
 
-#: ../clients/cli/connections.c:8726
+#: ../clients/cli/connections.c:8454
 #, c-format
 msgid "Warning: 'file' already specified, ignoring extra one.\n"
-msgstr "警告:已指定 \"file\",忽略额外的参数。\n"
+msgstr "警告:已指定 'file',忽略额外的选项。\n"
 
-#: ../clients/cli/connections.c:8728
+#: ../clients/cli/connections.c:8456
 #, c-format
 msgid "Unknown parameter: %s"
 msgstr "未知参数:%s"
 
-#: ../clients/cli/connections.c:8739
+#: ../clients/cli/connections.c:8468
 #, c-format
 msgid "Error: 'type' argument is required."
-msgstr "错误:需要 \"type\" 参数。"
+msgstr "错误:需要“type”参数。"
 
-#: ../clients/cli/connections.c:8743
+#: ../clients/cli/connections.c:8473
 #, c-format
 msgid "Error: 'file' argument is required."
-msgstr "错误:需要 \"file\" 参数。"
+msgstr "错误:需要'file' 参数。"
 
-#: ../clients/cli/connections.c:8749
-#, c-format
+#: ../clients/cli/connections.c:8480
+#, fuzzy, c-format
 msgid "Error: failed to find VPN plugin for %s."
-msgstr "错误:查找用于 %s 的 VPN 插件失败。"
+msgstr "错误:加载 VPN 插件失败:%s。"
 
-#: ../clients/cli/connections.c:8756 ../clients/cli/connections.c:8848
+#: ../clients/cli/connections.c:8488 ../clients/cli/connections.c:8589
 #, c-format
 msgid "Error: failed to load VPN plugin: %s."
 msgstr "错误:加载 VPN 插件失败:%s。"
 
-#: ../clients/cli/connections.c:8763
+#: ../clients/cli/connections.c:8496
 #, c-format
 msgid "Error: failed to import '%s': %s."
-msgstr "错误:导入 \"%s\" 失败失败失败失败失败失败失败失败失败失败失败:%s。"
+msgstr "错误:导入失败 '%s':%s。"
 
-#: ../clients/cli/connections.c:8835
+#: ../clients/cli/connections.c:8576
 msgid "Output file name: "
-msgstr "输出文件名称:"
+msgstr "输出文件名:"
 
-#: ../clients/cli/connections.c:8839
+#: ../clients/cli/connections.c:8580
 #, c-format
 msgid "Error: the connection is not VPN."
 msgstr "错误:连接不是 VPN。"
 
-#: ../clients/cli/connections.c:8861
+#: ../clients/cli/connections.c:8601
 #, c-format
 msgid "Error: failed to create temporary file %s."
 msgstr "错误:创建临时文件 %s 失败。"
 
-#: ../clients/cli/connections.c:8869
+#: ../clients/cli/connections.c:8610
 #, c-format
 msgid "Error: failed to export '%s': %s."
-msgstr "错误:导出 \"%s\" 失败:%s。"
+msgstr "错误:导出 '%s' 失败:%s。"
 
-#: ../clients/cli/connections.c:8881
+#: ../clients/cli/connections.c:8621
 #, c-format
 msgid "Error: failed to read temporary file '%s': %s."
-msgstr "错误:读取临时文件 \"%s\" 失败:%s。"
+msgstr "错误:读取临时文件 '%s' 失败:%s。"
 
 #. define some prompts
 #: ../clients/cli/devices.c:39
@@ -2278,29 +2116,7 @@ msgstr "接口:"
 msgid "Interface(s): "
 msgstr "接口:"
 
-#: ../clients/cli/devices.c:73 ../clients/cli/devices.c:1266
-msgid "(none)"
-msgstr "(无)"
-
-#: ../clients/cli/devices.c:175 ../clients/cli/devices.c:182
-msgid "(unknown)"
-msgstr "(未知)"
-
-#: ../clients/cli/devices.c:316
-#, c-format
-msgid "<invisible> | %s"
-msgstr "<不可见> | %s"
-
-#: ../clients/cli/devices.c:317
-msgid "<invisible>"
-msgstr "<不可见>"
-
-#: ../clients/cli/devices.c:418
-#, c-format
-msgid "%u Mb/s"
-msgstr "%u Mb/s"
-
-#: ../clients/cli/devices.c:672
+#: ../clients/cli/devices.c:254
 #, c-format
 msgid ""
 "Usage: nmcli device { COMMAND | help }\n"
@@ -2341,46 +2157,8 @@ msgid ""
 "  lldp [list [ifname <ifname>]]\n"
 "\n"
 msgstr ""
-"用法:nmcli device { 命令 | help }\n"
-"\n"
-"命令 := { status | show | set | connect | reapply | modify | disconnect | "
-"delete | monitor | wifi | lldp }\n"
-"\n"
-"  status\n"
-"\n"
-"  show [<接口名>]\n"
-"\n"
-"  set [ifname] <接口名> [autoconnect yes|no] [managed yes|no]\n"
-"\n"
-"  connect <接口名>\n"
-"\n"
-"  reapply <接口名>\n"
-"\n"
-"  modify <接口名> ([+|-]<设置>.<属性> <值>)+\n"
-"\n"
-"  disconnect <接口名> ...\n"
-"\n"
-"  delete <接口名> ...\n"
-"\n"
-"  monitor <接口名> ...\n"
-"\n"
-"  wifi [list [ifname <接口名>] [bssid <BSSID>]]\n"
-"\n"
-"  wifi connect <(B)SSID> [password <密码>] [wep-key-type key|phrase] [ifname "
-"<接口名>]\n"
-"                         [bssid <BSSID>] [name <名称>] [private yes|no] "
-"[hidden yes|no]\n"
-"\n"
-"  wifi hotspot [ifname <接口名>] [con-name <名称>] [ssid <SSID>] [band a|bg] "
-"[channel <信道>] [password <密码>]\n"
-"\n"
-"  wifi rescan [ifname <接口名>] [[ssid <要扫描的 SSID>] ...]\n"
-"\n"
-"  lldp [list [ifname <接口名>]]\n"
-"\n"
 
-# 大写的 DEVICE、TYPE、STATE、CONNECTION 找不到具体对应的翻译位置,这是在 CLI 是显示的列表项,所以没有翻译。
-#: ../clients/cli/devices.c:695
+#: ../clients/cli/devices.c:277
 #, c-format
 msgid ""
 "Usage: nmcli device status { help }\n"
@@ -2399,17 +2177,16 @@ msgid ""
 msgstr ""
 "用法:nmcli device status { help }\n"
 "\n"
-"显示所有设备的状态。\n"
-"默认情况下,显示下列栏目:\n"
+"显示全部设备的状态。\n"
+"默认情况下,显示下列:\n"
 " DEVICE     - 接口名称\n"
 " TYPE       - 设备类型\n"
 " STATE      - 设备状态\n"
 " CONNECTION - 设备上激活的连接(如果有的话)\n"
-"显示哪些栏目可以通过 \"--fields\" 全局选项改变。\"status\" 是默认命令,也就是"
-"说 \n"
-"\"nmcli device\" 会调用 \"nmcli device status\"。\n"
+"显示哪些列可以通过“--fields”全局选项改变。\n"
+"“status” 是默认命令,也就是说 “nmcli device” 会调用 “nmcli device status”。\n"
 
-#: ../clients/cli/devices.c:710
+#: ../clients/cli/devices.c:292
 #, c-format
 msgid ""
 "Usage: nmcli device show { ARGUMENTS | help }\n"
@@ -2420,15 +2197,15 @@ msgid ""
 "The command lists details for all devices, or for a given device.\n"
 "\n"
 msgstr ""
-"用法:nmcli device show { 参数 | help }\n"
+"用法:nmcli device show { ARGUMENTS | help }\n"
 "\n"
-"参数 := [<接口名>]\n"
+"ARGUMENTS := [<ifname>]\n"
 "\n"
 "显示设备详情。\n"
-"该命令列出所有设备或者给定设备的详情。\n"
+"该命令列出所有设备或者给定设备详情。\n"
 "\n"
 
-#: ../clients/cli/devices.c:721
+#: ../clients/cli/devices.c:303
 #, c-format
 msgid ""
 "Usage: nmcli device connect { ARGUMENTS | help }\n"
@@ -2441,17 +2218,17 @@ msgid ""
 "It will also consider connections that are not set to auto-connect.\n"
 "\n"
 msgstr ""
-"用法:nmcli device connect { 参数 | help }\n"
+"用法:nmcli device connect { ARGUMENTS | help }\n"
 "\n"
-"参数 := <接口名>\n"
+"ARGUMENTS := <ifname>\n"
 "\n"
 "连接该设备。\n"
-"网络管理器(NetworkManager)将尝试查找将激活的合适连接,包括那些没有设定为自"
-"动连接的连接。\n"
+"NetworkManager 将尝试查找将激活的适当连接。\n"
+"它也将考虑哪些没有设定为 set to auto-connect 的连接。\n"
 "\n"
 
-#: ../clients/cli/devices.c:733
-#, c-format
+#: ../clients/cli/devices.c:315
+#, fuzzy, c-format
 msgid ""
 "Usage: nmcli device reapply { ARGUMENTS | help }\n"
 "\n"
@@ -2461,14 +2238,16 @@ msgid ""
 "made since it was last applied.\n"
 "\n"
 msgstr ""
-"用法:nmcli device reapply { 参数 | help }\n"
+"用法:nmcli device disconnect { ARGUMENTS | help }\n"
 "\n"
-"参数 := <接口名>\n"
+"ARGUMENTS := <ifname>\n"
 "\n"
-"尝试将自上次应用以来对当前活动连接所做的更改更新到设备上。\n"
+"断开该设备。\n"
+"该命令断开该设备并方式其在没有用户/菜单\n"
+"互动的情况下自动激活进一步的连接。\n"
 "\n"
 
-#: ../clients/cli/devices.c:744
+#: ../clients/cli/devices.c:326
 #, c-format
 msgid ""
 "Usage: nmcli device modify { ARGUMENTS | --help }\n"
@@ -2489,24 +2268,8 @@ msgid ""
 "nmcli dev mod em1 -ipv4.dns 1\n"
 "nmcli dev mod em1 -ipv6.addr \"abbe::cafe/56\"\n"
 msgstr ""
-"用法:nmcli device modify { 参数 | --help }\n"
-"\n"
-"参数 := <接口名> ([+|-]<设置>.<属性> <值>)+\n"
-"\n"
-"修改设备上当前活动连接的一个或多个属性,但不用更改该连接的配置集。更改会即时"
-"生\n"
-"效。对于多值属性,您可以在属性名前插可选的 \"+\" 或 \"-\" 符号。\"+\" 符号允"
-"许附加项\n"
-"而不是是替换掉整个值。\"-\" 符号允许移除选中项而不是整个值。\n"
-"\n"
-"示例:\n"
-"nmcli dev mod em1 ipv4.method manual ipv4.addr \"192.168.1.2/24, "
-"10.10.1.5/8\"\n"
-"nmcli dev mod em1 +ipv4.dns 8.8.4.4\n"
-"nmcli dev mod em1 -ipv4.dns 1\n"
-"nmcli dev mod em1 -ipv6.addr \"abbe::cafe/56\"\n"
 
-#: ../clients/cli/devices.c:764
+#: ../clients/cli/devices.c:346
 #, c-format
 msgid ""
 "Usage: nmcli device disconnect { ARGUMENTS | help }\n"
@@ -2518,15 +2281,16 @@ msgid ""
 "further connections without user/manual intervention.\n"
 "\n"
 msgstr ""
-"用法:nmcli device disconnect { 参数 | help }\n"
+"用法:nmcli device disconnect { ARGUMENTS | help }\n"
 "\n"
-"参数 := <接口名>\n"
+"ARGUMENTS := <ifname>\n"
 "\n"
-"断开设备的连接。\n"
-"该命令断开设备的连接并阻止其在没有用户/手动干预的情况下继续自动激活连接。\n"
+"断开该设备。\n"
+"该命令断开该设备并防止其在没有用户/手动干预\n"
+"的情况下自动激活进一步的连接。\n"
 "\n"
 
-#: ../clients/cli/devices.c:776
+#: ../clients/cli/devices.c:358
 #, c-format
 msgid ""
 "Usage: nmcli device delete { ARGUMENTS | help }\n"
@@ -2539,17 +2303,16 @@ msgid ""
 "command.\n"
 "\n"
 msgstr ""
-"用法:nmcli device delete { 参数 | help }\n"
+"用法:nmcli device delete { ARGUMENTS | help }\n"
 "\n"
-"参数 := <接口名> ...\n"
+"ARGUMENTS := <ifname> ...\n"
 "\n"
 "删除软件设备。\n"
-"此命令用于移除接口。它仅适用于软件设备(如绑定、网桥等)。硬件设备不能用这个"
-"命\n"
-"令来删除。\n"
+"这个命令删除接口。它仅用于软件设备。\n"
+"(例如 Bond、Bridge 等)。硬件设备不能用这个命令来删除。\n"
 "\n"
 
-#: ../clients/cli/devices.c:789
+#: ../clients/cli/devices.c:371
 #, c-format
 msgid ""
 "Usage: nmcli device set { ARGUMENTS | help }\n"
@@ -2562,17 +2325,17 @@ msgid ""
 "Modify device properties.\n"
 "\n"
 msgstr ""
-"用法:nmcli device set { 参数 | help }\n"
+"用法:nmcli device set { ARGUMENTS | help }\n"
 "\n"
-"参数 := 设备 { 属性 [ 属性 ... ] }\n"
-"设备 := [ifname] <接口名> \n"
-"属性 := { autoconnect { yes | no } |\n"
-"        { managed { yes | no }\n"
+"ARGUMENTS := DEVICE { PROPERTY [ PROPERTY ... ] }\n"
+"DEVICE    := [ifname] <ifname> \n"
+"PROPERTY  := { autoconnect { yes | no } |\n"
+"             { managed { yes | no }\n"
 "\n"
 "修改设备属性。\n"
 "\n"
 
-#: ../clients/cli/devices.c:802
+#: ../clients/cli/devices.c:384
 #, c-format
 msgid ""
 "Usage: nmcli device monitor { ARGUMENTS | help }\n"
@@ -2584,16 +2347,16 @@ msgid ""
 "Monitors all devices in case no interface is specified.\n"
 "\n"
 msgstr ""
-"用法:nmcli device monitor { 参数 | help }\n"
+"用法:nmcli device monitor { ARGUMENTS | help }\n"
 "\n"
-"参数 := [<接口名>] ...\n"
+"ARGUMENTS := [<ifname>] ...\n"
 "\n"
-"监视设备活动。\n"
-"每当指定的连接修改时,这个命令会将其打印出来。如果没有指定则监视所有的连"
-"接。\n"
+"监控设备活动。\n"
+"每当指定的设备改变状态,这个命令将打印一行信息。\n"
+"如果没有指定接口,则监控所有设备。\n"
 "\n"
 
-#: ../clients/cli/devices.c:814
+#: ../clients/cli/devices.c:396
 #, c-format
 msgid ""
 "Usage: nmcli device wifi { ARGUMENTS | help }\n"
@@ -2645,56 +2408,8 @@ msgid ""
 "use 'nmcli device wifi list' for that.\n"
 "\n"
 msgstr ""
-"用法:nmcli device wifi { 参数 | help }\n"
-"\n"
-"在 Wi-Fi 设备上执行操作。\n"
-"\n"
-"参数 := [list [ifname <接口名>] [bssid <BSSID>]]\n"
-"\n"
-"列出可用的 Wi-Fi 接入点。\"ifname\" 和 \"bssid\" 选项可用于列出具体接口或指定"
-"的 \n"
-"BSSID 的接入点。\n"
-"\n"
-"参数 := connect <(B)SSID> [password <密码>] [wep-key-type key|phrase] "
-"[ifname <接口名>]\n"
-"                [bssid <BSSID>] [name <名称>] [private yes|no] [hidden yes|"
-"no]\n"
-"\n"
-"连接到 SSID 或 BSSID 指定的 Wi-Fi 网络。此命令会新建一个连接然后在设备上激"
-"活\n"
-"它。这个命令行操作对应在图形界面客户端上点击一个 SSID。此命令总是新建一个连"
-"接,\n"
-"因此主要用于连接到新的 Wi-Fi 网络。如果所选网络已经存在连接,最好是调出已有的"
-"配\n"
-"置集合,如下命令:nmcli con up id <接口名>。注意目前只支持开放、WEP 和 WPA-"
-"PSK \n"
-"网络。IP 配置也是通过 DHCP 获取。\n"
-"\n"
-"参数 := hotspot [ifname <接口名>] [con-name <名称>] [ssid <SSID>]\n"
-"                [band a|bg] [channel <信道>] [password <密码>]\n"
-"\n"
-"创建 Wi-Fi 热点。使用 \"connection down\" 或 \"device disconnect\" 来停止热"
-"点。\n"
-"热点参数可由下列可选参数控制:\n"
-"ifname - 要使用的 Wi-Fi 设备\n"
-"con-name - 创建的热点连接配置集名称\n"
-"ssid - 热点的 SSID\n"
-"band - 要使用的 Wi-Fi 频段\n"
-"channel - 要使用的 Wi-Fi 信道\n"
-"password - 热点要使用的密码\n"
-"\n"
-"参数 := rescan [ifname <接口名>] [[ssid <要扫描的 SSID>] ...]\n"
-"\n"
-"请求网络管理器(NetworkManager)立即重新扫描可以用的接入点。网络管理器会定期"
-"地扫描 \n"
-"Wi-Fi 网络,但有些情况下手动扫描可能有用。\"ssid\" 允许扫描一个指定的 SSID,"
-"这对\n"
-"隐藏了其 SSID 的接入点有用。可以给定更多的 \"ssid\" 参数。注意该命令不能显示"
-"接入\n"
-"点,可以使用 \"nmcli device wifi list\" 来显示。\n"
-"\n"
 
-#: ../clients/cli/devices.c:861
+#: ../clients/cli/devices.c:443
 #, c-format
 msgid ""
 "Usage: nmcli device lldp { ARGUMENTS | help }\n"
@@ -2706,434 +2421,449 @@ msgid ""
 "used to list neighbors for a particular interface.\n"
 "\n"
 msgstr ""
-"用法:nmcli device lldp { 参数 | help }\n"
+"用法:nmcli device lldp { ARGUMENTS | help }\n"
 "\n"
-"参数 := [list [ifname <接口名>]]\n"
+"ARGUMENTS := [list [ifname <ifname>]]\n"
 "\n"
-"列出通过 LLDP 发现的邻居设备。可使用 \"ifname\" 选项列出具体接口的邻居设"
-"备。\n"
+"列出通过 LLDP 发现的邻居设备。可使用 'ifname' 选项\n"
+"列出具体接口的邻居设备。\n"
 "\n"
 
-#: ../clients/cli/devices.c:1015
+#: ../clients/cli/devices.c:597
 #, c-format
 msgid "Error: No interface specified."
 msgstr "错误:没有指定接口。"
 
-#: ../clients/cli/devices.c:1038
+#: ../clients/cli/devices.c:620
 #, c-format
 msgid "Warning: argument '%s' is duplicated.\n"
-msgstr "警告:重复的参数 \"%s\"。\n"
+msgstr "警告:重复的参数 '%s'\n"
 
-#: ../clients/cli/devices.c:1041
+#: ../clients/cli/devices.c:623
 #, c-format
 msgid "Error: Device '%s' not found.\n"
-msgstr "错误:没有找到设备 \"%s\"。\n"
+msgstr "错误:没有找到设备 '%s'。\n"
 
-#: ../clients/cli/devices.c:1042
+#: ../clients/cli/devices.c:624
 #, c-format
 msgid "Error: not all devices found."
 msgstr "错误:未找到所有设备。"
 
-#: ../clients/cli/devices.c:1071
+#: ../clients/cli/devices.c:653
 msgid "No interface specified"
-msgstr "没有指定接口"
+msgstr ""
 
-#: ../clients/cli/devices.c:1090
+#: ../clients/cli/devices.c:672
 #, c-format
 msgid "Device '%s' not found"
-msgstr "未找到设备 \"%s\""
+msgstr ""
 
-#: ../clients/cli/devices.c:1186
+#: ../clients/cli/devices.c:758 ../clients/cli/devices.c:910
+msgid "(none)"
+msgstr "(无)"
+
+#: ../clients/cli/devices.c:829
 #, c-format
 msgid "%u MHz"
 msgstr "%u MHz"
 
-#: ../clients/cli/devices.c:1187
+#: ../clients/cli/devices.c:830
 #, c-format
 msgid "%u Mbit/s"
 msgstr "%u Mbit/s"
 
-#: ../clients/cli/devices.c:1198
+#: ../clients/cli/devices.c:841
 msgid "WEP"
 msgstr "WEP"
 
-#: ../clients/cli/devices.c:1202
+#: ../clients/cli/devices.c:845
 msgid "WPA1"
 msgstr "WPA1"
 
-#: ../clients/cli/devices.c:1206
+#: ../clients/cli/devices.c:849
 msgid "WPA2"
 msgstr "WPA2"
 
-#: ../clients/cli/devices.c:1211
+#: ../clients/cli/devices.c:854
 msgid "802.1X"
 msgstr "802.1X"
 
-#: ../clients/cli/devices.c:1226
+#: ../clients/cli/devices.c:869
 msgid "Ad-Hoc"
 msgstr "Ad-Hoc"
 
-#: ../clients/cli/devices.c:1227
+#: ../clients/cli/devices.c:870
 msgid "Infra"
 msgstr "红外"
 
-#: ../clients/cli/devices.c:1228
+#: ../clients/cli/devices.c:871
 msgid "N/A"
 msgstr "不可用"
 
-#: ../clients/cli/devices.c:1423
+#: ../clients/cli/devices.c:1085
 msgid "Device details"
 msgstr "设备详情"
 
-#: ../clients/cli/devices.c:1434
+#: ../clients/cli/devices.c:1096
 #, c-format
 msgid "Error: 'device show': %s"
-msgstr "错误:\"device show\":%s"
+msgstr "错误:“device show”:%s"
 
-#: ../clients/cli/devices.c:1732
-msgid "Status of devices"
-msgstr "设备状态"
+#: ../clients/cli/devices.c:1161 ../clients/cli/devices.c:1164
+msgid "(unknown)"
+msgstr "(未知)"
 
-#: ../clients/cli/devices.c:1736
+#: ../clients/cli/devices.c:1207
+#, c-format
+msgid "%u Mb/s"
+msgstr "%u Mb/s"
+
+#: ../clients/cli/devices.c:1310
+msgid "on"
+msgstr "开"
+
+#: ../clients/cli/devices.c:1310
+msgid "off"
+msgstr "关"
+
+#: ../clients/cli/devices.c:1544
 #, c-format
 msgid "Error: 'device status': %s"
-msgstr "错误:\"dev status\": %s"
+msgstr "错误:“dev status”: %s"
+
+#: ../clients/cli/devices.c:1558
+msgid "Status of devices"
+msgstr "设备状态"
 
-#: ../clients/cli/devices.c:1763 ../clients/cli/devices.c:2218
-#: ../clients/cli/devices.c:4100
+#: ../clients/cli/devices.c:1584 ../clients/cli/devices.c:2039
+#: ../clients/cli/devices.c:3817
 #, c-format
 msgid "Error: invalid extra argument '%s'."
-msgstr "错误:无效的额外参数 \"%s\"。"
+msgstr "错误:无效的额外参数“%s”。"
 
-#: ../clients/cli/devices.c:1799 ../clients/cli/general.c:539
+#: ../clients/cli/devices.c:1620 ../clients/cli/general.c:555
 #, c-format
 msgid "Error: Timeout %d sec expired."
-msgstr "错误:超时时间 %d 秒已到。"
+msgstr "错误:超时 %d 秒过期。"
 
-#: ../clients/cli/devices.c:1848
+#: ../clients/cli/devices.c:1669
 #, c-format
 msgid "Device '%s' successfully activated with '%s'.\n"
-msgstr "成功用 \"%2$s\" 激活了设备 \"%1$s\"。\n"
+msgstr "成功用 '%s' 激活了设备 '%s'。\n"
 
-#: ../clients/cli/devices.c:1854
+#: ../clients/cli/devices.c:1675
 #, c-format
 msgid "Error: Connection activation failed: (%d) %s.\n"
-msgstr "错误:连接激活失败:(%d) %s。\n"
+msgstr "错误:连接激活失败:(%d)%s。\n"
 
-#: ../clients/cli/devices.c:1890
+#: ../clients/cli/devices.c:1711
 #, c-format
 msgid "Error: Failed to setup a Wi-Fi hotspot: %s"
-msgstr "错误:建立 Wi-Fi 热点失败:%s"
+msgstr "错误:设定 Wi-Fi 热点失败:%s"
 
-#: ../clients/cli/devices.c:1893
+#: ../clients/cli/devices.c:1714
 #, c-format
 msgid "Error: Failed to add/activate new connection: %s"
 msgstr "错误:添加/激活新连接失败:%s"
 
-#: ../clients/cli/devices.c:1903
+#: ../clients/cli/devices.c:1724
 #, c-format
 msgid "Error: Failed to setup a Wi-Fi hotspot"
-msgstr "错误:建立 Wi-Fi 热点失败"
+msgstr "错误:设定 Wi-Fi 热点失败"
 
-#: ../clients/cli/devices.c:1905
+#: ../clients/cli/devices.c:1726
 #, c-format
 msgid "Error: Failed to add/activate new connection: Unknown error"
 msgstr "错误:无法添加/激活新连接:未知错误"
 
-#: ../clients/cli/devices.c:1917
+#: ../clients/cli/devices.c:1738
 #, c-format
 msgid "Connection with UUID '%s' created and activated on device '%s'\n"
-msgstr "UUID 为 \"%s\" 的连接已创建并在设备 \"%s\" 上激活\n"
+msgstr "UUID 为“%s”的连接已创建并在设备“%s”上激活\n"
 
-#: ../clients/cli/devices.c:1920
+#: ../clients/cli/devices.c:1741
 #, c-format
 msgid "Hotspot '%s' activated on device '%s'\n"
-msgstr "热点 \"%s\" 已在设备 \"%s\" 上激活\n"
+msgstr ""
+"设备 '%s' 上激活的热点 '%s'\n"
+"\n"
 
-#: ../clients/cli/devices.c:1984
+#: ../clients/cli/devices.c:1805
 #, c-format
 msgid "Error: Device activation failed: %s"
 msgstr "错误:激活设备失败:%s"
 
-#: ../clients/cli/devices.c:1993
+#: ../clients/cli/devices.c:1814
 #, c-format
 msgid "Error: Device activation failed: device was disconnected"
 msgstr "错误:设备激活失败:设备已断开连接"
 
-# 原译设备已连接。原话用来提示设备已连接过了,不能再激活另一个连接了。如果使用“已连接”会让人认为是连接成功的意思,所以改成这个。
-#: ../clients/cli/devices.c:2008
+#: ../clients/cli/devices.c:1829
 #, c-format
 msgid "Device '%s' has been connected.\n"
-msgstr "设备 \"%s\" 已有连接。\n"
+msgstr "设备“%s”已连接。\n"
 
-#: ../clients/cli/devices.c:2049
+#: ../clients/cli/devices.c:1870
 #, c-format
 msgid "Error: extra argument not allowed: '%s'."
-msgstr "错误:不允许的额外参数:\"%s\"。"
+msgstr "错误:不允许的额外参数 “%s”。"
 
-#: ../clients/cli/devices.c:2121 ../clients/cli/devices.c:2136
-#: ../clients/cli/devices.c:2366
+#: ../clients/cli/devices.c:1942 ../clients/cli/devices.c:1957
+#: ../clients/cli/devices.c:2187
 #, c-format
 msgid "Device '%s' successfully disconnected.\n"
-msgstr "成功断开设备 \"%s\"。\n"
+msgstr "成功断开设备 '%s'。\n"
 
-#: ../clients/cli/devices.c:2124
+#: ../clients/cli/devices.c:1945
 #, c-format
 msgid "Device '%s' successfully removed.\n"
-msgstr "成功移除设备 \"%s\"。\n"
+msgstr "成功删除设备 '%s'。\n"
 
-#: ../clients/cli/devices.c:2183 ../clients/cli/devices.c:2253
-#, c-format
+#: ../clients/cli/devices.c:2004 ../clients/cli/devices.c:2074
+#, fuzzy, c-format
 msgid "Error: Reapplying connection to device '%s' (%s) failed: %s"
-msgstr "错误:重新应用连接到 \"%s\" (%s) 失败:%s"
+msgstr "错误:保存“%s”(%s) 连接失败:%s\n"
 
-#: ../clients/cli/devices.c:2193 ../clients/cli/devices.c:2262
+#: ../clients/cli/devices.c:2014 ../clients/cli/devices.c:2083
 #, c-format
 msgid "Connection successfully reapplied to device '%s'.\n"
-msgstr "成功重新应用连接到设备 \"%s\"。\n"
+msgstr "成功重新应用连接到设备 '%s'。\n"
 
-#: ../clients/cli/devices.c:2287
+#: ../clients/cli/devices.c:2108
 #, c-format
 msgid "Error: Reading applied connection from device '%s' (%s) failed: %s"
-msgstr "错误:从设备 \"%s\" (%s) 读取已应用的连接失败:%s"
+msgstr ""
 
-#: ../clients/cli/devices.c:2351
+#: ../clients/cli/devices.c:2172
 #, c-format
 msgid "Error: not all devices disconnected."
-msgstr "错误:未断开所有设备的连接。"
+msgstr "错误:未断开所有设备。"
 
-#: ../clients/cli/devices.c:2352
+#: ../clients/cli/devices.c:2173
 #, c-format
 msgid "Error: Device '%s' (%s) disconnecting failed: %s\n"
-msgstr "错误:断开设备 \"%s\" (%s) 的连接失败:%s\n"
+msgstr "错误:断开设备 '%s'(%s)失败:%s\n"
 
-#: ../clients/cli/devices.c:2430
+#: ../clients/cli/devices.c:2251
 #, c-format
 msgid "Error: not all devices deleted."
 msgstr "错误:未删除所有设备。"
 
-#: ../clients/cli/devices.c:2431
+#: ../clients/cli/devices.c:2252
 #, c-format
 msgid "Error: Device '%s' (%s) deletion failed: %s\n"
-msgstr "错误:删除设备 \"%s\" (%s) 失败:%s\n"
+msgstr "错误:删除设备 '%s'(%s)失败:%s\n"
 
-#: ../clients/cli/devices.c:2515
+#: ../clients/cli/devices.c:2336
 #, c-format
 msgid "Error: No property specified."
 msgstr "错误:未指定属性。"
 
-#: ../clients/cli/devices.c:2530 ../clients/cli/devices.c:2547
-#: ../clients/cli/general.c:713 ../clients/cli/general.c:725
+#: ../clients/cli/devices.c:2351 ../clients/cli/devices.c:2368
+#: ../clients/cli/general.c:724 ../clients/cli/general.c:736
 #, c-format
 msgid "Error: '%s' argument is missing."
-msgstr "错误:缺少 \"%s\" 参数。"
+msgstr "错误:缺少 “%s” 参数。"
 
-#: ../clients/cli/devices.c:2536
+#: ../clients/cli/devices.c:2357
 #, c-format
 msgid "Error: 'managed': %s."
-msgstr "错误:\"managed\":%s。"
+msgstr "错误:'managed': %s。"
 
-#: ../clients/cli/devices.c:2553
+#: ../clients/cli/devices.c:2374
 #, c-format
 msgid "Error: 'autoconnect': %s."
-msgstr "错误:\"autoconnect\":%s。"
+msgstr "错误:“autoconnect”:%s。"
 
-#: ../clients/cli/devices.c:2561 ../clients/cli/general.c:739
+#: ../clients/cli/devices.c:2382 ../clients/cli/general.c:750
 #, c-format
 msgid "Error: property '%s' is not known."
-msgstr "错误:属性 \"%s\" 是未知的。"
+msgstr "错误:属性 '%s' 是未知的。"
 
-#: ../clients/cli/devices.c:2610
+#: ../clients/cli/devices.c:2432
 #, c-format
 msgid "%s: using connection '%s'\n"
 msgstr ""
-"%s:正使用连接 \"%s\"\n"
+"%s: 在使用连接 '%s'\n"
 "\n"
 
-#: ../clients/cli/devices.c:2636
+#: ../clients/cli/devices.c:2458
 #, c-format
 msgid "%s: device created\n"
-msgstr "%s:设备已创建\n"
+msgstr "%s: 设备已创建\n"
 
-#: ../clients/cli/devices.c:2643
+#: ../clients/cli/devices.c:2465
 #, c-format
 msgid "%s: device removed\n"
-msgstr "%s:设备已移除\n"
+msgstr "%s:设备已删除\n"
 
-#: ../clients/cli/devices.c:2818
+#: ../clients/cli/devices.c:2663
 msgid "Wi-Fi scan list"
 msgstr "Wi-Fi 扫描列表"
 
-#: ../clients/cli/devices.c:2895
-#, c-format
-msgid "Error: Access point with bssid '%s' not found."
-msgstr "错误:未找到 bssid 为 \"%s\" 的接入点。"
-
-#: ../clients/cli/devices.c:3085
+#: ../clients/cli/devices.c:2712
 #, c-format
 msgid "Error: 'device wifi': %s"
-msgstr "错误:\"device wifi\":%s"
+msgstr "错误:“device wifi”:%s"
 
-#: ../clients/cli/devices.c:3103
+#: ../clients/cli/devices.c:2724
 #, c-format
-msgid "Error: invalid rescan argument: '%s' not among [auto, no, yes]"
-msgstr "错误:无效的重新扫描参数:\"%s\" 未在 [auto, no, yes] 之中"
+msgid "Error: Device '%s' not found."
+msgstr "错误:没有找到设备“%s”。"
 
-#: ../clients/cli/devices.c:3110
+#: ../clients/cli/devices.c:2745 ../clients/cli/devices.c:2831
 #, c-format
-msgid "Error: Device '%s' not found."
-msgstr "错误:没有找到设备 \"%s\"。"
+msgid "Error: Access point with bssid '%s' not found."
+msgstr "错误:未找到 bssid 是“%s”的访问点。"
 
-#: ../clients/cli/devices.c:3120
+#: ../clients/cli/devices.c:2773
 #, c-format
 msgid ""
 "Error: Device '%s' was not recognized as a Wi-Fi device, check "
 "NetworkManager Wi-Fi plugin."
 msgstr ""
-"错误:设备 \"%s\" 没有被识别为 Wi-Fi 设备,请检查网络管理器(NetworkManager)"
-"的 Wi-Fi 插件。"
+"错误:设备 '%s' 不被识别为 Wi-Fi 设备,请检查 NetworkManager Wi-Fi 插件。"
 
-#: ../clients/cli/devices.c:3124 ../clients/cli/devices.c:3342
-#: ../clients/cli/devices.c:3779 ../clients/cli/devices.c:3938
+#: ../clients/cli/devices.c:2777 ../clients/cli/devices.c:3060
+#: ../clients/cli/devices.c:3495 ../clients/cli/devices.c:3654
 #, c-format
 msgid "Error: Device '%s' is not a Wi-Fi device."
-msgstr "错误:设备 \"%s\" 不是 Wi-Fi 设备。"
+msgstr "错误:设备“%s”不是 Wi-Fi 设备。"
 
-#: ../clients/cli/devices.c:3191
+#: ../clients/cli/devices.c:2909
 msgid "SSID or BSSID: "
 msgstr "SSID 或 BSSID:"
 
-#: ../clients/cli/devices.c:3196
+#: ../clients/cli/devices.c:2914
 #, c-format
 msgid "Error: SSID or BSSID are missing."
 msgstr "错误:缺少 SSID/BSSID。"
 
-#: ../clients/cli/devices.c:3233
+#: ../clients/cli/devices.c:2951
 #, c-format
 msgid "Error: bssid argument value '%s' is not a valid BSSID."
-msgstr "错误:bssid 参数值\"%s\"为无效 BSSID。"
+msgstr "错误:bssid 参数值“%s”为无效 BSSID。"
 
-#: ../clients/cli/devices.c:3263
+#: ../clients/cli/devices.c:2981
 #, c-format
 msgid ""
 "Error: wep-key-type argument value '%s' is invalid, use 'key' or 'phrase'."
-msgstr "错误:wep-key-type 参数值 \"%s\" 无效,请使用 \"key\" 或 \"phrase\"。"
+msgstr "错误:wep-key-type 参数值“%s”无效,请使用“key”或“phrase”。"
 
-#: ../clients/cli/devices.c:3290 ../clients/cli/devices.c:3308
+#: ../clients/cli/devices.c:3008 ../clients/cli/devices.c:3026
 #, c-format
 msgid "Error: %s: %s."
 msgstr "错误:%s:%s。"
 
-#: ../clients/cli/devices.c:3325
+#: ../clients/cli/devices.c:3043
 #, c-format
 msgid "Error: BSSID to connect to (%s) differs from bssid argument (%s)."
-msgstr "错误:要连接的 BSSID (%s) 与 bssid 参数 (%s) 不同。"
+msgstr "错误:要连接的 BSSID (%s) 与 bssid 参数中的(%s)不同。"
 
-#: ../clients/cli/devices.c:3331
+#: ../clients/cli/devices.c:3049
 #, c-format
 msgid "Error: Parameter '%s' is neither SSID nor BSSID."
-msgstr "错误:参数 \"%s\" 不是 SSID 或 BSSID。"
+msgstr "错误:参数“%s”不是 SSID 或 BSSID。"
 
-#: ../clients/cli/devices.c:3344 ../clients/cli/devices.c:3781
-#: ../clients/cli/devices.c:3940
+#: ../clients/cli/devices.c:3062 ../clients/cli/devices.c:3497
+#: ../clients/cli/devices.c:3656
 #, c-format
 msgid "Error: No Wi-Fi device found."
 msgstr "错误:未发现 Wi-Fi 设备。"
 
-#: ../clients/cli/devices.c:3364
+#: ../clients/cli/devices.c:3082
 #, c-format
 msgid "Error: Failed to scan hidden SSID: %s."
 msgstr "错误:扫描隐藏的 SSID 失败:%s。"
 
-#: ../clients/cli/devices.c:3391
+#: ../clients/cli/devices.c:3109
 #, c-format
 msgid "Error: No network with SSID '%s' found."
-msgstr "错误:未发现 SSID 为 \"%s\" 的网络。"
+msgstr "错误:未发现 SSID 是“%s”的网络。"
 
-#: ../clients/cli/devices.c:3393
+#: ../clients/cli/devices.c:3111
 #, c-format
 msgid "Error: No access point with BSSID '%s' found."
-msgstr "错误:未找到 BSSID 为 \"%s\" 的接入点。"
+msgstr "错误:未找到 BSSID 是“%s”的访问点。"
 
-#: ../clients/cli/devices.c:3435
+#: ../clients/cli/devices.c:3153
 #, c-format
 msgid ""
 "Warning: '%s' should be SSID for hidden APs; but it looks like a BSSID.\n"
-msgstr "警告:\"%s\" 应该是隐藏 AP 的 SSID,但看起来像 BSSID。\n"
+msgstr "警告:'%s' 应该是隐藏 AP 的 SSID,但看起来像 BSSID。\n"
 
-#: ../clients/cli/devices.c:3451
+#: ../clients/cli/devices.c:3167
 msgid "Password: "
 msgstr "密码:"
 
-#: ../clients/cli/devices.c:3600
+#: ../clients/cli/devices.c:3316
 #, c-format
 msgid "'%s' is not valid WPA PSK"
-msgstr "\"%s\" 不是有效的 WPA PSK"
+msgstr "'%s' 是无效的 WPA PSK"
 
-#: ../clients/cli/devices.c:3617
+#: ../clients/cli/devices.c:3333
 #, c-format
 msgid "'%s' is not valid WEP key (it should be 5 or 13 ASCII chars)"
-msgstr "\"%s\" 不是有效的 WEP 密钥(它应该是 5 或 13 个 ASCII 字符)"
+msgstr "'%s' 不是有效的 WEP 密钥(它应该是 5 或 13 个 ASCII 字符)"
 
-#: ../clients/cli/devices.c:3633
+#: ../clients/cli/devices.c:3349
 #, c-format
 msgid "Hotspot password: %s\n"
 msgstr "热点密码:%s\n"
 
-#: ../clients/cli/devices.c:3704
+#: ../clients/cli/devices.c:3420
 #, c-format
 msgid "Error: ssid is too long."
 msgstr "错误:SSID 太长。"
 
-# 这里 channel/band 开头不大写,表示其是命令行选项,所以不译。下面的同理。
-#: ../clients/cli/devices.c:3718
+#: ../clients/cli/devices.c:3434
 #, c-format
 msgid "Error: band argument value '%s' is invalid; use 'a' or 'bg'."
-msgstr "错误:band 参数值 \"%s\" 无效,请使用 \"a\" 或 \"bg\"。"
+msgstr "错误:band 参数值 '%s' 无效,请使用 'a' 或 'bg'。"
 
-#: ../clients/cli/devices.c:3743
+#: ../clients/cli/devices.c:3459
 #, c-format
 msgid "Error: Unknown parameter %s."
 msgstr "错误:未知参数 %s。"
 
-#: ../clients/cli/devices.c:3763
+#: ../clients/cli/devices.c:3479
 #, c-format
 msgid "Error: channel requires band too."
-msgstr "错误:channal 也需要 band。"
+msgstr "错误:频道也需要 band。"
 
-#: ../clients/cli/devices.c:3768
+#: ../clients/cli/devices.c:3484
 #, c-format
 msgid "Error: channel '%s' not valid for band '%s'."
-msgstr "错误:band \"%s\" 的 channel \"%s\" 无效。"
+msgstr "错误:band '%s' 的 channel '%s' 无效。"
 
-#: ../clients/cli/devices.c:3792
+#: ../clients/cli/devices.c:3508
 #, c-format
 msgid "Error: Device '%s' supports neither AP nor Ad-Hoc mode."
-msgstr "错误:设备 \"%s\" 既不支持 AP 也不支持 Ad-Hoc 模式。"
+msgstr "错误:设备 '%s' 既不支持 AP 也不支持 Ad-Hoc 模式。"
 
-#: ../clients/cli/devices.c:3826
+#: ../clients/cli/devices.c:3542
 #, c-format
 msgid "Error: Invalid 'password': %s."
-msgstr "错误:无效的 \"password\":%s。"
+msgstr "错误:无效 'password':%s。"
 
-#: ../clients/cli/devices.c:3901
+#: ../clients/cli/devices.c:3617
 #, c-format
 msgid "Error: '%s' cannot repeat."
-msgstr "错误:\"%s\" 不能重复。"
+msgstr "错误:'%s' 不能重复。"
 
 #. Main header name
-#: ../clients/cli/devices.c:4006
+#: ../clients/cli/devices.c:3723
 msgid "Device LLDP neighbors"
 msgstr "设备 LLDP 邻居"
 
-#: ../clients/cli/devices.c:4116
+#: ../clients/cli/devices.c:3833
 #, c-format
 msgid "Error: 'device lldp list': %s"
-msgstr "错误:\"device lldp list\":%s"
+msgstr "错误:'device lldp list':%s"
 
 #: ../clients/cli/general.c:42
 msgid "asleep"
-msgstr "睡眠中"
+msgstr "睡眠"
 
 #: ../clients/cli/general.c:43
 msgid "connecting"
@@ -3141,65 +2871,65 @@ msgstr "连接中"
 
 #: ../clients/cli/general.c:44
 msgid "connected (local only)"
-msgstr "已连接(仅本地)"
+msgstr "已连接(仅本地)"
 
 #: ../clients/cli/general.c:45
 msgid "connected (site only)"
-msgstr "已连接(仅站点)"
+msgstr "已连接(仅站点)"
 
-#: ../clients/cli/general.c:46 ../clients/common/nm-client-utils.c:270
+#: ../clients/cli/general.c:46 ../clients/common/nm-client-utils.c:241
 msgid "connected"
-msgstr "已连接"
+msgstr "连接的"
 
 #: ../clients/cli/general.c:47
 msgid "disconnecting"
-msgstr "断开中"
+msgstr "正在断开连接"
 
-#: ../clients/cli/general.c:48 ../clients/common/nm-client-utils.c:263
+#: ../clients/cli/general.c:48 ../clients/common/nm-client-utils.c:227
 msgid "disconnected"
 msgstr "已断开"
 
-#: ../clients/cli/general.c:83
+#: ../clients/cli/general.c:80
 msgid "none"
 msgstr "无"
 
-#: ../clients/cli/general.c:84
+#: ../clients/cli/general.c:81
 msgid "portal"
 msgstr "入口"
 
-#: ../clients/cli/general.c:85
+#: ../clients/cli/general.c:82
 msgid "limited"
 msgstr "受限"
 
-#: ../clients/cli/general.c:86
+#: ../clients/cli/general.c:83
 msgid "full"
 msgstr "完全"
 
-#: ../clients/cli/general.c:158
+#: ../clients/cli/general.c:154
 msgid "auth"
-msgstr "验证"
+msgstr "认证"
 
-#: ../clients/cli/general.c:186
+#: ../clients/cli/general.c:189
 msgid "running"
 msgstr "运行中"
 
-#: ../clients/cli/general.c:200
+#: ../clients/cli/general.c:203
 msgid "starting"
-msgstr "启动中"
+msgstr "正在启动"
 
-#: ../clients/cli/general.c:200
+#: ../clients/cli/general.c:203
 msgid "started"
-msgstr "已启动"
+msgstr "开始时间"
 
-#: ../clients/cli/general.c:234
+#: ../clients/cli/general.c:237
 msgid "enabled"
 msgstr "已启用"
 
-#: ../clients/cli/general.c:234
+#: ../clients/cli/general.c:237
 msgid "disabled"
 msgstr "已禁用"
 
-#: ../clients/cli/general.c:352
+#: ../clients/cli/general.c:369
 #, c-format
 msgid ""
 "Usage: nmcli general { COMMAND | help }\n"
@@ -3215,20 +2945,20 @@ msgid ""
 "  logging [level <log level>] [domains <log domains>]\n"
 "\n"
 msgstr ""
-"用法:nmcli general { 命令 | help }\n"
+"用法:nmcli general { COMMAND | help }\n"
 "\n"
-"命令 := { status | hostname | permissions | logging }\n"
+"COMMAND := { status | hostname | permissions | logging }\n"
 "\n"
 "  status\n"
 "\n"
-"  hostname [<主机名>]\n"
+"  hostname [<hostname>]\n"
 "\n"
 "  permissions\n"
 "\n"
-"  logging [level <日志级别>] [domains <日志域>]\n"
+"  logging [level <log level>] [domains <log domains>]\n"
 "\n"
 
-#: ../clients/cli/general.c:363
+#: ../clients/cli/general.c:380
 #, c-format
 msgid ""
 "Usage: nmcli general status { help }\n"
@@ -3240,11 +2970,11 @@ msgid ""
 msgstr ""
 "用法:nmcli general status { help }\n"
 "\n"
-"显示网络管理器(NetworkManager)的整体状态。\n"
-"\"status\" 是默认操作,即 \"nmcli gen\" 调用 \"nmcli gen status\"\n"
+"显示 NetworkManager 的总体状态。\n"
+"“status” 是默认动作,即 “nmcli gen” 调用 “nmcli gen status”\n"
 "\n"
 
-#: ../clients/cli/general.c:372
+#: ../clients/cli/general.c:389
 #, c-format
 msgid ""
 "Usage: nmcli general hostname { ARGUMENTS | help }\n"
@@ -3257,17 +2987,16 @@ msgid ""
 "hostname.\n"
 "\n"
 msgstr ""
-"用法:nmcli general hostname { 参数 | help }\n"
+"用法:nmcli general hostname { ARGUMENTS | help }\n"
 "\n"
-"参数 := [<主机名>]\n"
+"ARGUMENTS := [<hostname>]\n"
 "\n"
-"获取或更改永久的系统主机名。\n"
-"如果没有参数,则会输出当前配置的主机名。给定主机名后,网络管理器"
-"(NetworkManager)会将其设为\n"
-"新的永久系统主机名。\n"
+"获得或者更改持久系统主机名。\n"
+"如果没有参数,则会输出目前配置的主机名。给定主机名后,\n"
+"NetworkManager 会将其设定为新的持久系统主机名。\n"
 "\n"
 
-#: ../clients/cli/general.c:384
+#: ../clients/cli/general.c:401
 #, c-format
 msgid ""
 "Usage: nmcli general permissions { help }\n"
@@ -3277,10 +3006,10 @@ msgid ""
 msgstr ""
 "用法:nmcli general permissions { help }\n"
 "\n"
-"显示验证操作的调用程序权限。\n"
+"显示认证操作的调用程序权限。\n"
 "\n"
 
-#: ../clients/cli/general.c:392
+#: ../clients/cli/general.c:409
 #, c-format
 msgid ""
 "Usage: nmcli general logging { ARGUMENTS | help }\n"
@@ -3295,17 +3024,17 @@ msgid ""
 "for the list of possible logging domains.\n"
 "\n"
 msgstr ""
-"用法:nmcli general logging { 参数 | help }\n"
+"用法:nmcli general logging { ARGUMENTS | help }\n"
 "\n"
-"参数 := [level <日志级别>] [domains <日志域>]\n"
+"ARGUMENTS := [level <log level>] [domains <log domains>]\n"
 "\n"
-"获取或更改网络管理器(NetworkManager)的日志级别和域。\n"
-"如果没有任何参数则显示当前日志级别和域。要更改日志状态,请提供级别和(或)"
-"域。\n"
-"可能的日志域列表请参阅手册页。\n"
+"获得或者更改 NetworkManager 日志等级和域。\n"
+"如果没有任何参数则显示当前日志等级和域。要\n"
+"更改日志状态,请提供等级和(/或者)域。可能的日志域\n"
+"请参看 man page。\n"
 "\n"
 
-#: ../clients/cli/general.c:405
+#: ../clients/cli/general.c:422
 #, c-format
 msgid ""
 "Usage: nmcli networking { COMMAND | help }\n"
@@ -3319,9 +3048,9 @@ msgid ""
 "  connectivity [check]\n"
 "\n"
 msgstr ""
-"用法:nmcli networking { 命令 | help }\n"
+"用法:nmcli networking { COMMAND | help }\n"
 "\n"
-"命令 := { [ on | off | connectivity ] }\n"
+"COMMAND := { [ on | off | connectivity ] }\n"
 "\n"
 "  on\n"
 "\n"
@@ -3330,7 +3059,7 @@ msgstr ""
 "  connectivity [check]\n"
 "\n"
 
-#: ../clients/cli/general.c:415
+#: ../clients/cli/general.c:432
 #, c-format
 msgid ""
 "Usage: nmcli networking on { help }\n"
@@ -3343,7 +3072,7 @@ msgstr ""
 "打开联网。\n"
 "\n"
 
-#: ../clients/cli/general.c:423
+#: ../clients/cli/general.c:440
 #, c-format
 msgid ""
 "Usage: nmcli networking off { help }\n"
@@ -3356,7 +3085,7 @@ msgstr ""
 "关闭联网。\n"
 "\n"
 
-#: ../clients/cli/general.c:431
+#: ../clients/cli/general.c:448
 #, c-format
 msgid ""
 "Usage: nmcli networking connectivity { ARGUMENTS | help }\n"
@@ -3368,15 +3097,15 @@ msgid ""
 "connectivity.\n"
 "\n"
 msgstr ""
-"用法:nmcli networking connectivity { 参数 | help }\n"
+"用法:nmcli networking connectivity { ARGUMENTS | help }\n"
 "\n"
-"参数 := [check]\n"
+"ARGUMENTS := [check]\n"
 "\n"
-"获取网络连接性状态。\n"
-"可选的 \"check\" 参数可让网络管理器(NetworkManager)重新检查连接性。\n"
+"获得网络连接性状态。\n"
+"可选的 “check” 参数可让 NetworkManager 重新检查连接性。\n"
 "\n"
 
-#: ../clients/cli/general.c:443
+#: ../clients/cli/general.c:460
 #, c-format
 msgid ""
 "Usage: nmcli radio { COMMAND | help }\n"
@@ -3386,14 +3115,14 @@ msgid ""
 "  all | wifi | wwan [ on | off ]\n"
 "\n"
 msgstr ""
-"用法:nmcli radio { 命令 | help }\n"
+"用法:nmcli radio { COMMAND | help }\n"
 "\n"
-"命令 := { all | wifi | wwan }\n"
+"COMMAND := { all | wifi | wwan }\n"
 "\n"
 "  all | wifi | wwan [ on | off ]\n"
 "\n"
 
-#: ../clients/cli/general.c:452
+#: ../clients/cli/general.c:469
 #, c-format
 msgid ""
 "Usage: nmcli radio all { ARGUMENTS | help }\n"
@@ -3403,14 +3132,14 @@ msgid ""
 "Get status of all radio switches, or turn them on/off.\n"
 "\n"
 msgstr ""
-"用法:nmcli radio all { 参数 | help }\n"
+"用法:nmcli radio all { ARGUMENTS | help }\n"
 "\n"
-"参数 := [on | off]\n"
+"ARGUMENTS := [on | off]\n"
 "\n"
-"获取所有无线电开关的状态,或者打开/关闭它们。\n"
+"获得所有单选按钮状态,或者打开/关闭它们。\n"
 "\n"
 
-#: ../clients/cli/general.c:462
+#: ../clients/cli/general.c:479
 #, c-format
 msgid ""
 "Usage: nmcli radio wifi { ARGUMENTS | help }\n"
@@ -3420,14 +3149,14 @@ msgid ""
 "Get status of Wi-Fi radio switch, or turn it on/off.\n"
 "\n"
 msgstr ""
-"用法:nmcli radio wifi { 参数 | help }\n"
+"用法:nmcli radio wifi { ARGUMENTS | help }\n"
 "\n"
-"参数 := [on | off]\n"
+"ARGUMENTS := [on | off]\n"
 "\n"
-"获取 Wi-Fi 无线电开关的状态,或者打开/关闭它。\n"
+"获得 Wi-Fi 单选开关状态,或者打开/关闭它。\n"
 "\n"
 
-#: ../clients/cli/general.c:472
+#: ../clients/cli/general.c:489
 #, c-format
 msgid ""
 "Usage: nmcli radio wwan { ARGUMENTS | help }\n"
@@ -3437,14 +3166,14 @@ msgid ""
 "Get status of mobile broadband radio switch, or turn it on/off.\n"
 "\n"
 msgstr ""
-"用法:nmcli radio wwan { 参数 | help }\n"
+"用法:nmcli radio wwan { ARGUMENTS | help }\n"
 "\n"
-"参数 := [on | off]\n"
+"ARGUMENTS := [on | off]\n"
 "\n"
-"获取移动宽带无线电开关的状态,或者打开/关闭它。\n"
+"获得移动宽带单选按钮状态,或者打开/关闭它。\n"
 "\n"
 
-#: ../clients/cli/general.c:482
+#: ../clients/cli/general.c:499
 #, c-format
 msgid ""
 "Usage: nmcli monitor\n"
@@ -3455,184 +3184,184 @@ msgid ""
 msgstr ""
 "用法:nmcli monitor\n"
 "\n"
-"监视网络管理器(NetworkManager)的更改。\n"
-"每当 NetworkManager 出现更改时打印一行信息。\n"
+"监控 NetworkManager 的改动。\n"
+"每当 NetworkManager 出现改动时打印一行信息。\n"
 "\n"
 
-#: ../clients/cli/general.c:512
+#: ../clients/cli/general.c:528
 msgid "NetworkManager status"
 msgstr "网络管理器状态"
 
-#: ../clients/cli/general.c:516
+#: ../clients/cli/general.c:532
 #, c-format
 msgid "Error: only these fields are allowed: %s"
 msgstr "错误:只允许使用这些字段:%s"
 
-#: ../clients/cli/general.c:570
+#: ../clients/cli/general.c:582
 msgid "NetworkManager permissions"
 msgstr "网络管理器权限"
 
 # XXX: 这里考虑一下要不要翻译
 # XXX: Should we translate this?
-#: ../clients/cli/general.c:574
+#: ../clients/cli/general.c:586
 #, c-format
 msgid "Error: 'general permissions': %s"
-msgstr "错误:\"常规权限\":%s"
+msgstr "错误:“general permissions”: %s"
 
-#: ../clients/cli/general.c:663
+#: ../clients/cli/general.c:674
 msgid "NetworkManager logging"
-msgstr "网络管理器日志"
+msgstr "NetworkManager 日志"
 
-#: ../clients/cli/general.c:667
+#: ../clients/cli/general.c:678
 #, c-format
 msgid "Error: 'general logging': %s"
-msgstr "错误:\"常规日志\":%s"
+msgstr "错误:“general logging”: %s"
 
-#: ../clients/cli/general.c:749
+#: ../clients/cli/general.c:760
 #, c-format
 msgid "Error: failed to set logging: %s"
 msgstr "错误:设置日志失败:%s"
 
-#: ../clients/cli/general.c:766
+#: ../clients/cli/general.c:777
 #, c-format
 msgid "Error: failed to set hostname: %s"
-msgstr "错误:设置主机名失败:%s"
+msgstr "错误:设定主机名失败:%s"
 
-#: ../clients/cli/general.c:835
+#: ../clients/cli/general.c:846
 #, c-format
 msgid "Error: '--fields' value '%s' is not valid here (allowed field: %s)"
-msgstr "错误:\"--fields\" 值 \"%s\" 在此无效(允许的字段:%s)"
+msgstr "错误:“--fields”值“%s”在此无效(允许的字段:%s)"
 
-#: ../clients/cli/general.c:860
+#: ../clients/cli/general.c:871
 #, c-format
 msgid "Error: invalid '%s' argument: '%s' (use on/off)."
-msgstr "错误:无效的 \"%s\" 参数:\"%s\"(使用 on/off)。"
+msgstr "错误:无效的“%s”参数:“%s”(使用 on/off)。"
 
 #. no arguments -> get current state
-#: ../clients/cli/general.c:908 ../clients/cli/general.c:920
+#: ../clients/cli/general.c:919 ../clients/cli/general.c:931
 msgid "Connectivity"
-msgstr "连接性"
+msgstr "连接"
 
-#: ../clients/cli/general.c:923
+#: ../clients/cli/general.c:934
 #, c-format
 msgid "Error: 'networking' command '%s' is not valid."
-msgstr "错误:\"networking\" 命令 \"%s\" 无效。"
+msgstr "错误:“networking” 命令 “%s” 无效。"
 
-#: ../clients/cli/general.c:937
+#: ../clients/cli/general.c:948
 msgid "Networking"
-msgstr "联网"
+msgstr "网络"
 
 #. no argument, show all radio switches
-#: ../clients/cli/general.c:972
+#: ../clients/cli/general.c:983
 msgid "Radio switches"
-msgstr "无线电开关"
+msgstr "无线开关"
 
 #. no argument, show current WiFi state
-#: ../clients/cli/general.c:1002
+#: ../clients/cli/general.c:1013
 msgid "Wi-Fi radio switch"
-msgstr "Wi-Fi 无线电开关"
+msgstr "Wi-Fi 无线开关"
 
 #. no argument, show current WWAN (mobile broadband) state
-#: ../clients/cli/general.c:1029
+#: ../clients/cli/general.c:1040
 msgid "WWAN radio switch"
-msgstr "WWAN 无线电开关"
+msgstr "WWAN 无线开关"
 
-#: ../clients/cli/general.c:1077
+#: ../clients/cli/general.c:1089
 msgid "NetworkManager has started"
-msgstr "网络管理器已启动"
+msgstr "NetworkManager 已启动"
 
-#: ../clients/cli/general.c:1077
+#: ../clients/cli/general.c:1089
 msgid "NetworkManager has stopped"
-msgstr "网络管理器已停止"
+msgstr "NetworkManager 已停止"
 
-#: ../clients/cli/general.c:1088
+#: ../clients/cli/general.c:1100
 #, c-format
 msgid "Hostname set to '%s'\n"
-msgstr "主机名已设为 \"%s\"\n"
+msgstr "将主机名设定为 '%s'\n"
 
-#: ../clients/cli/general.c:1103
+#: ../clients/cli/general.c:1115
 #, c-format
 msgid "'%s' is now the primary connection\n"
-msgstr "\"%s\" 现在是主连接\n"
+msgstr "'%s' 现在是主连接\n"
 
-#: ../clients/cli/general.c:1105
+#: ../clients/cli/general.c:1117
 #, c-format
 msgid "There's no primary connection\n"
 msgstr "没有主连接\n"
 
-#: ../clients/cli/general.c:1117
+#: ../clients/cli/general.c:1129
 #, c-format
 msgid "Connectivity is now '%s'\n"
-msgstr "连接性现在是 \"%s\"\n"
+msgstr "连接性现在是 '%s'\n"
 
-#: ../clients/cli/general.c:1130
+#: ../clients/cli/general.c:1142
 #, c-format
 msgid "Networkmanager is now in the '%s' state\n"
-msgstr "网络管理器现在处于 \"%s\" 状态\n"
+msgstr "NetworkManager 现在处于 '%s' 状态。\n"
 
-#: ../clients/cli/general.c:1150
+#: ../clients/cli/general.c:1163
 msgid "connection available"
-msgstr "连接可用"
+msgstr ""
 
-#: ../clients/cli/general.c:1152
+#: ../clients/cli/general.c:1165
 msgid "connections available"
-msgstr "连接可用"
+msgstr ""
 
-#: ../clients/cli/general.c:1170
+#: ../clients/cli/general.c:1183
 msgid "autoconnect"
-msgstr "自动连接"
+msgstr ""
 
-#: ../clients/cli/general.c:1172
+#: ../clients/cli/general.c:1185
 msgid "fw missing"
-msgstr "缺失固件"
+msgstr ""
 
-#: ../clients/cli/general.c:1177
+#: ../clients/cli/general.c:1190
 msgid "plugin missing"
-msgstr "缺失插件"
+msgstr ""
 
-#: ../clients/cli/general.c:1182
+#: ../clients/cli/general.c:1195
 msgid "sw"
-msgstr "软件"
+msgstr ""
 
-#: ../clients/cli/general.c:1184
+#: ../clients/cli/general.c:1197
 msgid "hw"
-msgstr "硬件"
+msgstr ""
 
-#: ../clients/cli/general.c:1189
+#: ../clients/cli/general.c:1202
 msgid "iface"
-msgstr "接口"
+msgstr ""
 
-#: ../clients/cli/general.c:1192
+#: ../clients/cli/general.c:1205
 msgid "port"
-msgstr "端口"
+msgstr ""
 
-#: ../clients/cli/general.c:1195
+#: ../clients/cli/general.c:1208
 msgid "mtu"
-msgstr "mtu"
+msgstr ""
 
-#: ../clients/cli/general.c:1212
+#: ../clients/cli/general.c:1225
 msgid "master"
-msgstr "主连接"
+msgstr ""
 
-#: ../clients/cli/general.c:1216 ../clients/tui/nm-editor-utils.c:239
-#: ../clients/tui/nmt-connect-connection-list.c:407
+#: ../clients/cli/general.c:1229 ../clients/tui/nm-editor-utils.c:241
+#: ../clients/tui/nmt-connect-connection-list.c:408
 msgid "VPN"
-msgstr "VPN"
+msgstr "VPN 参数"
 
-#: ../clients/cli/general.c:1218
+#: ../clients/cli/general.c:1231
 msgid "ip4 default"
-msgstr "ip4 默认"
+msgstr ""
 
-#: ../clients/cli/general.c:1220
+#: ../clients/cli/general.c:1233
 msgid "ip6 default"
-msgstr "ip6 默认"
+msgstr ""
 
-#: ../clients/cli/general.c:1303
+#: ../clients/cli/general.c:1316
 #, c-format
 msgid "%s VPN connection"
-msgstr "%s VPN 连接"
+msgstr ""
 
-#: ../clients/cli/general.c:1371
+#: ../clients/cli/general.c:1386
 #, c-format
 msgid ""
 "Use \"nmcli device show\" to get complete information about known devices "
@@ -3642,28 +3371,22 @@ msgid ""
 "Consult nmcli(1) and nmcli-examples(5) manual pages for complete usage "
 "details.\n"
 msgstr ""
-"使用 \"nmcli device show\" 获取关于已知设备的完整信息,以及 \n"
-"\"nmcli connection show\" 获取活动连接配置集的概述。\n"
-"\n"
-"完整的用法细节,可参考 nmcli(1) 和 nmcli-examples(5) 手册页。\n"
 
-#: ../clients/cli/general.c:1392
+#: ../clients/cli/general.c:1407
 #, c-format
 msgid "Error: 'monitor' command '%s' is not valid."
-msgstr "错误:\"monitor\" 命令 \"%s\" 无效。"
+msgstr "错误:'monitor' 命令 '%s' 无效。"
 
-#: ../clients/cli/general.c:1404
+#: ../clients/cli/general.c:1419
 msgid "Networkmanager is not running (waiting for it)\n"
-msgstr "网络管理器未运行(等待中)。\n"
+msgstr "NetworkManager 未运行(等待中)。\n"
 
-#: ../clients/cli/nmcli.c:245
+#: ../clients/cli/nmcli.c:184
 #, c-format
 msgid ""
 "Usage: nmcli [OPTIONS] OBJECT { COMMAND | help }\n"
 "\n"
 "OPTIONS\n"
-"  -o[verview]                                    overview mode (hide default "
-"values)\n"
 "  -t[erse]                                       terse output\n"
 "  -p[retty]                                      pretty output\n"
 "  -m[ode] tabular|multiline                      output mode\n"
@@ -3691,111 +3414,63 @@ msgid ""
 "  m[onitor]       monitor NetworkManager changes\n"
 "\n"
 msgstr ""
-"用法:nmcli [选项] OBJECT { 命令 | help }\n"
-"\n"
-"选项:\n"
-"  -o[verview]                                    概览模式(隐藏默认值)\n"
-"  -t[erse]                                       简洁输出\n"
-"  -p[retty]                                      整齐输出\n"
-"  -m[ode] tabular|multiline                      输出模式\n"
-"  -c[olors] auto|yes|no                          是否在输出中使用颜色\n"
-"  -f[ields] <field1,field2,...>|all|common       指定要输出的字段\n"
-"  -g[et-values] <field1,field2,...>|all|common   -m tabular -t -f 的快捷方"
-"式\n"
-"  -e[scape] yes|no                               在值中转义列分隔符\n"
-"  -a[sk]                                         询问缺少的参数\n"
-"  -s[how-secrets]                                允许显示密码\n"
-"  -w[ait] <秒>                                   为完成的操作设置超时等待时"
-"间\n"
-"  -v[ersion]                                     显示程序版本\n"
-"  -h[elp]                                        输出此帮助\n"
-"\n"
-"对象:\n"
-"  g[eneral]       网络管理器(NetworkManager)的常规状态和操作\n"
-"  n[etworking]    整体联网控制\n"
-"  r[adio]         网络管理器无线电开关\n"
-"  c[onnection]    网络管理器的连接\n"
-"  d[evice]        由网络管理器管理的设备\n"
-"  a[gent]         网络管理器的密钥(secret)代理或 polkit 代理\n"
-"  m[onitor]       监视网络管理器更改\n"
-"\n"
-
-#: ../clients/cli/nmcli.c:325
-#, c-format
-msgid "Error: missing argument for '%s' option."
-msgstr "错误:\"%s\" 选项缺少参数。"
 
-#: ../clients/cli/nmcli.c:626
+#: ../clients/cli/nmcli.c:263
 #, c-format
-msgid "Unexpected end of file following '%s'\n"
-msgstr "\"%s\" 后更随着意外的文件尾\n"
-
-#: ../clients/cli/nmcli.c:634
-#, c-format
-msgid "Expected whitespace following '%s'\n"
-msgstr "期望 \"%s\" 后更随空白\n"
-
-#: ../clients/cli/nmcli.c:646
-#, c-format
-msgid "Expected a value for '%s'\n"
-msgstr "期望一个 \"%s\" 的值\n"
-
-#: ../clients/cli/nmcli.c:660
-#, c-format
-msgid "Expected a line break following '%s'\n"
-msgstr "期望 \"%s\" 后更随换行符\n"
+msgid "Error: missing argument for '%s' option."
+msgstr "错误:“%s” 选项缺少参数。"
 
-#: ../clients/cli/nmcli.c:749
+#: ../clients/cli/nmcli.c:311
 #, c-format
 msgid "Error: Option '--terse' is specified the second time."
-msgstr "错误:第二次指定了选项 \"--terse\"。"
+msgstr "错误:第二次指定选项 “--terse”。"
 
-#: ../clients/cli/nmcli.c:754
+#: ../clients/cli/nmcli.c:316
 #, c-format
 msgid "Error: Option '--terse' is mutually exclusive with '--pretty'."
-msgstr "错误:选项 \"--terse\" 与 \"--pretty\" 相互排斥。"
+msgstr "错误:选项 “--terse” 与 “--pretty” 相互排斥。"
 
-#: ../clients/cli/nmcli.c:762
+#: ../clients/cli/nmcli.c:324
 #, c-format
 msgid "Error: Option '--pretty' is specified the second time."
-msgstr "错误:第二次指定了选项 \"--pretty\"。"
+msgstr "错误:第二次指定选项 “--pretty”。"
 
-#: ../clients/cli/nmcli.c:767
+#: ../clients/cli/nmcli.c:329
 #, c-format
 msgid "Error: Option '--pretty' is mutually exclusive with '--terse'."
-msgstr "错误:选项 \"--pretty\" 与 \"--terse\" 相互排斥。"
+msgstr "错误:选项 “--pretty” 与 “--terse” 相互排斥。"
 
-#: ../clients/cli/nmcli.c:782
+#: ../clients/cli/nmcli.c:344
 #, c-format
 msgid "Error: '%s' is not a valid argument for '%s' option."
-msgstr "错误:\"%s\" 不是 \"%s\" 选项的有效参数。"
+msgstr ""
 
-#: ../clients/cli/nmcli.c:796 ../clients/cli/nmcli.c:808
+#: ../clients/cli/nmcli.c:358 ../clients/cli/nmcli.c:370
 #, c-format
 msgid "Error: '%s' is not valid argument for '%s' option."
-msgstr "错误:\"%s\" 不是 \"%s\" 选项的有效参数。"
+msgstr "错误:“%s” 不是 “%s” 选项的有效参数。"
 
-#: ../clients/cli/nmcli.c:832
+#: ../clients/cli/nmcli.c:394
 #, c-format
 msgid "Error: '%s' is not a valid timeout."
-msgstr "错误:\"%s\" 不是有效的超时时间。"
+msgstr ""
 
-#: ../clients/cli/nmcli.c:839
+#: ../clients/cli/nmcli.c:401
 #, c-format
 msgid "nmcli tool, version %s\n"
 msgstr "nmcli 工具,版本 %s\n"
 
-#: ../clients/cli/nmcli.c:847
+#: ../clients/cli/nmcli.c:409
 #, c-format
 msgid "Error: Option '%s' is unknown, try 'nmcli -help'."
-msgstr "错误:选项 \"%s\" 未知,尝试 \"nmcli -help\"。"
+msgstr "错误:选项 “%s” 未知,尝试 “nmcli -help”。"
 
-#: ../clients/cli/nmcli.c:903 ../clients/cli/nmcli.c:910
+#: ../clients/cli/nmcli.c:455 ../clients/cli/nmcli.c:462
 #, c-format
-msgid "Error: nmcli terminated by signal %s (%d)"
-msgstr "错误:nmcli 被信号 %s (%d) 终止了"
+msgid "Error: nmcli terminated by signal %s (%d)\n"
+msgstr ""
 
-#: ../clients/cli/nmcli.c:1052
+#: ../clients/cli/nmcli.c:560
 msgid "Success"
 msgstr "成功"
 
@@ -3804,12 +3479,12 @@ msgstr "成功"
 msgid "Authentication message: %s\n"
 msgstr "验证消息:%s\n"
 
-#: ../clients/cli/polkit-agent.c:76
+#: ../clients/cli/polkit-agent.c:74
 #, c-format
 msgid "Authentication error: %s\n"
 msgstr "验证错误:%s\n"
 
-#: ../clients/cli/polkit-agent.c:136
+#: ../clients/cli/polkit-agent.c:120
 #, c-format
 msgid "Warning: polkit agent initialization failed: %s\n"
 msgstr "警告:polkit 代理初始化失败:%s\n"
@@ -3817,567 +3492,553 @@ msgstr "警告:polkit 代理初始化失败:%s\n"
 #: ../clients/cli/settings.c:46
 #, c-format
 msgid "Do you also want to set '%s' to '%s'? [yes]: "
-msgstr "您是否也要将 \"%s\" 设为 \"%s\"?[yes]:"
+msgstr "您还要将 “%s” 设定为 “%s” 吗 [yes]:"
 
 #: ../clients/cli/settings.c:48
 #, c-format
 msgid "Do you also want to clear '%s'? [yes]: "
-msgstr "您是否也要清除 \"%s\"?[yes]:"
+msgstr "您还要清除 “%s” 吗? [yes]:"
 
 #: ../clients/cli/settings.c:224
 #, c-format
 msgid ""
 "Warning: %s.%s set to '%s', but it might be ignored in infrastructure mode\n"
-msgstr ""
-"警告:%s.%s 已设为 \"%s\",但在基础结构(infrastructure)模式下它可能会被忽"
-"略。\n"
+msgstr "警告:设置 %s.%s 为 '%s',但在 infrastructure 模式下它可能被忽略。\n"
 
 #: ../clients/cli/settings.c:243
 #, c-format
 msgid "Warning: setting %s.%s requires removing ipv4 and ipv6 settings\n"
-msgstr "警告: 设置 %s.%s 需要删除 ipv4 和 ipv6 设置\n"
+msgstr "警告: 设置 %s.%s 要求删除 ipv4 和 ipv6 设置\n"
 
 #: ../clients/cli/settings.c:245
 msgid "Do you want to remove them? [yes] "
-msgstr "您要删除它们吗?[yes]:"
+msgstr "您要删除它们吗?[yes]"
 
-#: ../clients/cli/settings.c:332
+#: ../clients/cli/settings.c:330
 #, c-format
 msgid "Warning: %s is not an UUID of any existing connection profile\n"
-msgstr "警告:%s 不是任何现有连接配置集的 UUID\n"
+msgstr "警告: %s 不是任何现有连接配置集的 UUID \n"
 
-#: ../clients/cli/settings.c:337 ../clients/cli/settings.c:350
+#: ../clients/cli/settings.c:335 ../clients/cli/settings.c:348
 #, c-format
 msgid "'%s' is not a VPN connection profile"
-msgstr "\"%s\" 不是 VPN 连接配置集"
+msgstr "'%s' 不是一个 VPN 连接配置集"
 
-#: ../clients/cli/settings.c:344
+#: ../clients/cli/settings.c:342
 #, c-format
 msgid "'%s' is not a name of any exiting profile"
-msgstr "\"%s\" 不是任何现有配置集的名称"
+msgstr "'%s' 不是任何现有配置集的名称"
 
-#: ../clients/cli/settings.c:388
+#: ../clients/cli/settings.c:386
 #, c-format
 msgid "Warning: %s\n"
-msgstr "警告:%s\n"
+msgstr ""
 
-#: ../clients/cli/settings.c:391
-#, c-format
+#: ../clients/cli/settings.c:389
+#, fuzzy, c-format
 msgid "Info: %s\n"
-msgstr "信息:%s\n"
+msgstr "错误:%s\n"
 
-#: ../clients/cli/settings.c:484
+#: ../clients/cli/settings.c:481
 msgid "don't know how to get the property value"
-msgstr "不知道如何获取属性值"
+msgstr "不知道如何获得属性值"
 
-#: ../clients/cli/settings.c:574 ../clients/cli/settings.c:616
+#: ../clients/cli/settings.c:571 ../clients/cli/settings.c:613
 msgid "the property can't be changed"
-msgstr "无法更改该属性"
+msgstr "无法更改属性"
 
-#: ../clients/cli/settings.c:730
+#: ../clients/cli/settings.c:733
 msgid "[NM property description]"
 msgstr "[NM 属性描述]"
 
-#: ../clients/cli/settings.c:740
+#: ../clients/cli/settings.c:743
 msgid "[nmcli specific description]"
-msgstr "[nmcli 特定描述]"
+msgstr "[nmcli 具体描述]"
 
-#: ../clients/cli/utils.c:319
+#: ../clients/cli/utils.c:328
 #, c-format
 msgid "Error: Argument '%s' was expected, but '%s' provided."
-msgstr "错误:需要参数 \"%s\" 但提供的是 \"%s\"。"
+msgstr "错误:需要参数 “%s” 但给出的是 “%s”。"
 
-#: ../clients/cli/utils.c:322
+#: ../clients/cli/utils.c:331
 #, c-format
 msgid "Error: Unexpected argument '%s'"
-msgstr "错误:意外参数 \"%s\""
+msgstr "错误:意外参数 “%s”"
 
-#: ../clients/cli/utils.c:709
-#, c-format
+#: ../clients/cli/utils.c:804
+#, fuzzy, c-format
 msgid "invalid field '%s%s%s'; no such field"
-msgstr "无效字段 \"%s%s%s\";没有此类字段"
+msgstr "无效字段“%s”;允许字段:%s"
 
-#: ../clients/cli/utils.c:713
-#, c-format
+#: ../clients/cli/utils.c:808
+#, fuzzy, c-format
 msgid "invalid field '%s%s%s'; allowed fields: [%s]"
-msgstr "无效字段 \"%s%s%s\";允许的字段:[%s]"
+msgstr "无效字段“%s”;允许字段:%s"
 
-#: ../clients/cli/utils.c:809
-#, c-format
+#: ../clients/cli/utils.c:881
+#, fuzzy, c-format
 msgid "failure to select field"
-msgstr "选择字段失败"
+msgstr "无法选择指定的 APN"
 
-#: ../clients/cli/utils.c:1435
+#: ../clients/cli/utils.c:1469
 #, c-format
 msgid "Error reading nmcli output: %s\n"
-msgstr "读取 nmcli 输出时出错:%s\n"
+msgstr ""
 
-#: ../clients/cli/utils.c:1440
+#: ../clients/cli/utils.c:1474
 #, c-format
 msgid "Error writing nmcli output: %s\n"
-msgstr "写入 nmcli 输出时出错:%s\n"
+msgstr ""
 
-#: ../clients/cli/utils.c:1464
+#: ../clients/cli/utils.c:1498
 #, c-format
 msgid "Failed to create pager pipe: %s\n"
-msgstr "创建与子进程通讯的管道失败:%s\n"
+msgstr ""
 
-#: ../clients/cli/utils.c:1472
+#: ../clients/cli/utils.c:1506
 #, c-format
 msgid "Failed to fork pager: %s\n"
-msgstr "fork 子进程失败:%s\n"
+msgstr ""
 
-#: ../clients/cli/utils.c:1518 ../clients/cli/utils.c:1520
+#: ../clients/cli/utils.c:1552 ../clients/cli/utils.c:1554
 #, c-format
 msgid "Failed to duplicate pager pipe: %s\n"
-msgstr "复制与子进程通讯的管道失败:%s\n"
-
-#: ../clients/cli/utils.h:298 ../clients/common/nm-meta-setting-desc.c:4899
-msgid "on"
-msgstr "开"
-
-#: ../clients/cli/utils.h:298 ../clients/common/nm-meta-setting-desc.c:4901
-msgid "off"
-msgstr "关"
-
-#: ../clients/cli/utils.h:324
-#, c-format
-msgid "%lld (%s)"
-msgstr "%lld(%s)"
-
-#: ../clients/cli/utils.h:331
-#, c-format
-#| msgid "%lld (%s)"
-msgid "%lld - %s"
-msgstr "%lld — %s"
+msgstr ""
 
 #. TRANSLATORS: the first %s is the partial value entered by
 #. * the user, the second %s a list of compatible values.
 #.
-#: ../clients/common/nm-client-utils.c:117
-#: ../clients/common/nm-client-utils.c:148
+#: ../clients/common/nm-client-utils.c:75
+#: ../clients/common/nm-client-utils.c:106
 #, c-format
 msgid "'%s' is ambiguous (%s)"
-msgstr "\"%s\" 不明确(%s)"
+msgstr "'%s' 含义模糊(%s)"
 
-#: ../clients/common/nm-client-utils.c:127
+#: ../clients/common/nm-client-utils.c:85
 #, c-format
 msgid "'%s' is not valid; use [%s] or [%s]"
-msgstr "\"%s\" 无效,请使用 [%s] 或 [%s]"
+msgstr "“%s” 无效,请使用 [%s] 或者 [%s]"
 
-#: ../clients/common/nm-client-utils.c:160
+#: ../clients/common/nm-client-utils.c:118
 #, c-format
 msgid "'%s' is not valid; use [%s], [%s] or [%s]"
-msgstr "\"%s\" 无效,请使用 [%s]、[%s] 或 [%s]"
+msgstr "'%s' 无效,请使用 [%s]、[%s] 或者 [%s]"
 
-#: ../clients/common/nm-client-utils.c:209
+#: ../clients/common/nm-client-utils.c:155
 #, c-format
-msgid "'%s' is ambiguous: %s"
-msgstr "\"%s\" 不明确:%s"
+msgid "'%s' is ambiguous (%s x %s)"
+msgstr "“%s” 含义模糊 (%s x %s)"
 
-#: ../clients/common/nm-client-utils.c:219
+#: ../clients/common/nm-client-utils.c:167
 #, c-format
 msgid "missing name, try one of [%s]"
 msgstr "缺少名称,请尝试使用 [%s] 之一。"
 
-#: ../clients/common/nm-client-utils.c:261
+#: ../clients/common/nm-client-utils.c:223
 msgid "unmanaged"
 msgstr "未托管"
 
-#: ../clients/common/nm-client-utils.c:262
+#: ../clients/common/nm-client-utils.c:225
 msgid "unavailable"
 msgstr "不可用"
 
-#: ../clients/common/nm-client-utils.c:264
+#: ../clients/common/nm-client-utils.c:229
 msgid "connecting (prepare)"
-msgstr "连接中(准备)"
+msgstr "连接中(准备)"
 
-#: ../clients/common/nm-client-utils.c:265
+#: ../clients/common/nm-client-utils.c:231
 msgid "connecting (configuring)"
-msgstr "连接中(正在配置)"
+msgstr "连接中(配置)"
 
-#: ../clients/common/nm-client-utils.c:266
+#: ../clients/common/nm-client-utils.c:233
 msgid "connecting (need authentication)"
-msgstr "连接中(需要验证)"
+msgstr "连接中(需要验证)"
 
-#: ../clients/common/nm-client-utils.c:267
+#: ../clients/common/nm-client-utils.c:235
 msgid "connecting (getting IP configuration)"
-msgstr "连接中(正在获取 IP 配置)"
+msgstr "正在连接(正在获取 IP 配置)"
 
-#: ../clients/common/nm-client-utils.c:268
+#: ../clients/common/nm-client-utils.c:237
 msgid "connecting (checking IP connectivity)"
-msgstr "连接中(正在检查 IP 连接性)"
+msgstr "正在连接(正在检查 IP 连通性)"
 
-#: ../clients/common/nm-client-utils.c:269
+#: ../clients/common/nm-client-utils.c:239
 msgid "connecting (starting secondary connections)"
-msgstr "连接中(正在启动次级连接)"
+msgstr "正在连接(正在启用第二连接)"
 
-#: ../clients/common/nm-client-utils.c:272
+#: ../clients/common/nm-client-utils.c:245
 msgid "connection failed"
 msgstr "连接失败"
 
-#: ../clients/common/nm-client-utils.c:280
+#: ../clients/common/nm-client-utils.c:262
 msgid "yes (guessed)"
 msgstr "是(猜测)"
 
-#: ../clients/common/nm-client-utils.c:281
+#: ../clients/common/nm-client-utils.c:264
 msgid "no (guessed)"
 msgstr "否(猜测)"
 
-#. TRANSLATORS: Unknown reason for a device state change (NMDeviceStateReason)
-#. TRANSLATORS: Unknown reason for a connection state change (NMActiveConnectionStateReason)
-#: ../clients/common/nm-client-utils.c:287
-#: ../clients/common/nm-client-utils.c:359 ../libnm-glib/nm-device.c:1859
-#: ../libnm/nm-device.c:1363
-msgid "Unknown"
-msgstr "未知"
-
-#: ../clients/common/nm-client-utils.c:288
+#: ../clients/common/nm-client-utils.c:277
 msgid "No reason given"
 msgstr "未给出原因"
 
-#: ../clients/common/nm-client-utils.c:290
+#: ../clients/common/nm-client-utils.c:281
 msgid "Device is now managed"
 msgstr "设备现在已托管"
 
-#: ../clients/common/nm-client-utils.c:291
+#: ../clients/common/nm-client-utils.c:283
 msgid "Device is now unmanaged"
 msgstr "设备现在未托管"
 
-#: ../clients/common/nm-client-utils.c:292
+#: ../clients/common/nm-client-utils.c:285
 msgid "The device could not be readied for configuration"
 msgstr "设备配置未就绪"
 
-#: ../clients/common/nm-client-utils.c:293
+#: ../clients/common/nm-client-utils.c:287
 msgid ""
 "IP configuration could not be reserved (no available address, timeout, etc.)"
-msgstr "IP 配置无法保留(无可用地址、超时等)"
+msgstr "IP 配置无法保留(无可用地址,超时等)"
 
-#: ../clients/common/nm-client-utils.c:294
+#: ../clients/common/nm-client-utils.c:289
 msgid "The IP configuration is no longer valid"
 msgstr "IP 配置不再有效"
 
-#: ../clients/common/nm-client-utils.c:295
+#: ../clients/common/nm-client-utils.c:291
 msgid "Secrets were required, but not provided"
-msgstr "需要密钥,但未提供"
+msgstr "需要认证凭据,但未提供"
 
-#: ../clients/common/nm-client-utils.c:296
+#: ../clients/common/nm-client-utils.c:293
 msgid "802.1X supplicant disconnected"
-msgstr "802.1X 请求方已断开连接"
+msgstr "802.1X 客户端已断开连接"
 
-#: ../clients/common/nm-client-utils.c:297
+#: ../clients/common/nm-client-utils.c:295
 msgid "802.1X supplicant configuration failed"
-msgstr "802.1X 请求方配置失败"
+msgstr "802.1X 客户端配置失败"
 
-#: ../clients/common/nm-client-utils.c:298
+#: ../clients/common/nm-client-utils.c:297
 msgid "802.1X supplicant failed"
-msgstr "802.1X 请求方失败"
+msgstr "802.1X 客户端失败"
 
 #: ../clients/common/nm-client-utils.c:299
 msgid "802.1X supplicant took too long to authenticate"
-msgstr "802.1X 请求方验证时间过长"
+msgstr "802.1X 客户端认证时间过长"
 
-#: ../clients/common/nm-client-utils.c:300
+#: ../clients/common/nm-client-utils.c:301
 msgid "PPP service failed to start"
 msgstr "PPP 服务无法启动"
 
-#: ../clients/common/nm-client-utils.c:301
+#: ../clients/common/nm-client-utils.c:303
 msgid "PPP service disconnected"
 msgstr "PPP 服务已断开连接"
 
 # auto translated by TM merge from project: control-center, version: 3.8.3, DocId: gnome-control-center-2.0
-#: ../clients/common/nm-client-utils.c:302
+#: ../clients/common/nm-client-utils.c:305
 msgid "PPP failed"
 msgstr "PPP 失败"
 
-#: ../clients/common/nm-client-utils.c:303
+#: ../clients/common/nm-client-utils.c:307
 msgid "DHCP client failed to start"
-msgstr "DHCP 客户端启动失败"
+msgstr "DHCP 客户端无法启动"
 
 # auto translated by TM merge from project: control-center, version: 3.8.3, DocId: gnome-control-center-2.0
-#: ../clients/common/nm-client-utils.c:304
+#: ../clients/common/nm-client-utils.c:309
 msgid "DHCP client error"
 msgstr "DHCP 客户端错误"
 
-#: ../clients/common/nm-client-utils.c:305
+#: ../clients/common/nm-client-utils.c:311
 msgid "DHCP client failed"
 msgstr "DHCP 客户端失败"
 
-#: ../clients/common/nm-client-utils.c:306
+#: ../clients/common/nm-client-utils.c:313
 msgid "Shared connection service failed to start"
-msgstr "共享连接服务启动失败"
+msgstr "共享连接服务无法启动"
 
-#: ../clients/common/nm-client-utils.c:307
+#: ../clients/common/nm-client-utils.c:315
 msgid "Shared connection service failed"
 msgstr "共享连接服务失败"
 
-#: ../clients/common/nm-client-utils.c:308
+#: ../clients/common/nm-client-utils.c:317
 msgid "AutoIP service failed to start"
-msgstr "自动 IP(AutoIP)服务无法启动"
+msgstr "自动 IP(AutoIP) 服务无法启动"
 
-#: ../clients/common/nm-client-utils.c:309
+#: ../clients/common/nm-client-utils.c:319
 msgid "AutoIP service error"
-msgstr "自动 IP(AutoIP)服务出错"
+msgstr "自动 IP(AutoIP) 服务出错"
 
-#: ../clients/common/nm-client-utils.c:310
+#: ../clients/common/nm-client-utils.c:321
 msgid "AutoIP service failed"
-msgstr "自动 IP(AutoIP)服务失败"
+msgstr "自动 IP(AutoIP) 服务失败"
 
-#: ../clients/common/nm-client-utils.c:311
+#: ../clients/common/nm-client-utils.c:323
 msgid "The line is busy"
-msgstr "线路正忙"
+msgstr "线路忙"
 
-#: ../clients/common/nm-client-utils.c:312
+#: ../clients/common/nm-client-utils.c:325
 msgid "No dial tone"
 msgstr "无拨号音"
 
-#: ../clients/common/nm-client-utils.c:313
+#: ../clients/common/nm-client-utils.c:327
 msgid "No carrier could be established"
 msgstr "无法建立载波"
 
-#: ../clients/common/nm-client-utils.c:314
+#: ../clients/common/nm-client-utils.c:329
 msgid "The dialing request timed out"
 msgstr "拨号请求超时"
 
-#: ../clients/common/nm-client-utils.c:315
+#: ../clients/common/nm-client-utils.c:331
 msgid "The dialing attempt failed"
 msgstr "拨号尝试失败"
 
-#: ../clients/common/nm-client-utils.c:316
+#: ../clients/common/nm-client-utils.c:333
 msgid "Modem initialization failed"
 msgstr "调制解调器初始化失败"
 
-#: ../clients/common/nm-client-utils.c:317
+#: ../clients/common/nm-client-utils.c:335
 msgid "Failed to select the specified APN"
 msgstr "无法选择指定的 APN"
 
-#: ../clients/common/nm-client-utils.c:318
+#: ../clients/common/nm-client-utils.c:337
 msgid "Not searching for networks"
 msgstr "不搜索网络"
 
-#: ../clients/common/nm-client-utils.c:319
+#: ../clients/common/nm-client-utils.c:339
 msgid "Network registration denied"
 msgstr "网络注册遭拒绝"
 
-#: ../clients/common/nm-client-utils.c:320
+#: ../clients/common/nm-client-utils.c:341
 msgid "Network registration timed out"
 msgstr "网络注册超时"
 
-#: ../clients/common/nm-client-utils.c:321
+#: ../clients/common/nm-client-utils.c:343
 msgid "Failed to register with the requested network"
-msgstr "注册请求的网络失败"
+msgstr "无法注册请求的网络"
 
-#: ../clients/common/nm-client-utils.c:322
+#: ../clients/common/nm-client-utils.c:345
 msgid "PIN check failed"
 msgstr "PIN 检查失败"
 
-#: ../clients/common/nm-client-utils.c:323
+#: ../clients/common/nm-client-utils.c:347
 msgid "Necessary firmware for the device may be missing"
-msgstr "该设备所需固件可能缺失"
+msgstr "该设备所需固件可能丢失"
 
-#: ../clients/common/nm-client-utils.c:324
+#: ../clients/common/nm-client-utils.c:349
 msgid "The device was removed"
-msgstr "设备已被移除"
+msgstr "设备被移除"
 
-#: ../clients/common/nm-client-utils.c:325
+#: ../clients/common/nm-client-utils.c:351
 msgid "NetworkManager went to sleep"
-msgstr "网络管理器已挂起"
+msgstr "网络管理器挂起"
 
-#: ../clients/common/nm-client-utils.c:326
+#: ../clients/common/nm-client-utils.c:353
 msgid "The device's active connection disappeared"
 msgstr "设备的活动连接已消失"
 
-#: ../clients/common/nm-client-utils.c:327
+#: ../clients/common/nm-client-utils.c:355
 msgid "Device disconnected by user or client"
-msgstr "用户或客户端断开了设备连接"
+msgstr "用户/客户端断开了设备连接"
 
-#: ../clients/common/nm-client-utils.c:328
+#: ../clients/common/nm-client-utils.c:357
 msgid "Carrier/link changed"
-msgstr "载波/链路已更改"
+msgstr "载波/连接已更改"
 
-#: ../clients/common/nm-client-utils.c:329
+#: ../clients/common/nm-client-utils.c:359
 msgid "The device's existing connection was assumed"
 msgstr "假定设备已有连接"
 
-#: ../clients/common/nm-client-utils.c:330
+#: ../clients/common/nm-client-utils.c:361
 msgid "The supplicant is now available"
 msgstr "客户端目前可用"
 
-#: ../clients/common/nm-client-utils.c:331
+#: ../clients/common/nm-client-utils.c:363
 msgid "The modem could not be found"
 msgstr "未找到调制解调器"
 
-#: ../clients/common/nm-client-utils.c:332
+#: ../clients/common/nm-client-utils.c:365
 msgid "The Bluetooth connection failed or timed out"
 msgstr "蓝牙连接失败或超时"
 
-#: ../clients/common/nm-client-utils.c:333
+#: ../clients/common/nm-client-utils.c:367
 msgid "GSM Modem's SIM card not inserted"
 msgstr "GSM 调制解调器的 SIM 卡未插入"
 
-#: ../clients/common/nm-client-utils.c:334
+#: ../clients/common/nm-client-utils.c:369
 msgid "GSM Modem's SIM PIN required"
 msgstr "GSM 调制解调器的 SIM 需要 PIN 码"
 
-#: ../clients/common/nm-client-utils.c:335
+#: ../clients/common/nm-client-utils.c:371
 msgid "GSM Modem's SIM PUK required"
 msgstr "GSM 调制解调器的 SIM 需要 PUK 码"
 
-#: ../clients/common/nm-client-utils.c:336
+#: ../clients/common/nm-client-utils.c:373
 msgid "GSM Modem's SIM wrong"
 msgstr "GSM 调制解调器的 SIM 错误"
 
-#: ../clients/common/nm-client-utils.c:337
+#: ../clients/common/nm-client-utils.c:375
 msgid "InfiniBand device does not support connected mode"
-msgstr "InfiniBand 设备不支持已连接的模式"
+msgstr "高速网络连接设备不支持已连接的模式"
 
-#: ../clients/common/nm-client-utils.c:338
+#: ../clients/common/nm-client-utils.c:377
 msgid "A dependency of the connection failed"
 msgstr "连接的依赖关系失败"
 
-#: ../clients/common/nm-client-utils.c:339
+#: ../clients/common/nm-client-utils.c:379
 msgid "A problem with the RFC 2684 Ethernet over ADSL bridge"
-msgstr "ADSL 网桥上的 RFC 2684 以太网出现问题"
+msgstr "RFC 2684 以太网在 ADSL 网桥处出现问题"
 
-#: ../clients/common/nm-client-utils.c:340
+#: ../clients/common/nm-client-utils.c:381
 msgid "ModemManager is unavailable"
-msgstr "ModemManager 不可用"
+msgstr "调制解调器管理器不可用"
 
-#: ../clients/common/nm-client-utils.c:341
+#: ../clients/common/nm-client-utils.c:383
 msgid "The Wi-Fi network could not be found"
 msgstr "未找到 Wi-Fi 网络"
 
-#: ../clients/common/nm-client-utils.c:342
+#: ../clients/common/nm-client-utils.c:385
 msgid "A secondary connection of the base connection failed"
-msgstr "基础连接的次级连接失败"
+msgstr "基础连接的备选连接失败"
 
-#: ../clients/common/nm-client-utils.c:343
+#: ../clients/common/nm-client-utils.c:387
 msgid "DCB or FCoE setup failed"
 msgstr "DCB 或 FCoE 设置失败"
 
-#: ../clients/common/nm-client-utils.c:344
+#: ../clients/common/nm-client-utils.c:389
 msgid "teamd control failed"
 msgstr "teamd 控制失败"
 
 # auto translated by TM merge from project: NetworkManager, version: 0.9.8.2, DocId: NetworkManager
-#: ../clients/common/nm-client-utils.c:345
+#: ../clients/common/nm-client-utils.c:391
 msgid "Modem failed or no longer available"
 msgstr "调制解调器出现故障或不再可用"
 
 # auto translated by TM merge from project: NetworkManager, version: 0.9.8.2, DocId: NetworkManager
-#: ../clients/common/nm-client-utils.c:346
+#: ../clients/common/nm-client-utils.c:393
 msgid "Modem now ready and available"
-msgstr "调制解调器现已就绪且可用"
+msgstr "调制解调器现在已准备好且可用"
 
-#: ../clients/common/nm-client-utils.c:347
+#: ../clients/common/nm-client-utils.c:395
 msgid "SIM PIN was incorrect"
 msgstr "SIM PIN 不正确"
 
-#: ../clients/common/nm-client-utils.c:348
+#: ../clients/common/nm-client-utils.c:397
 msgid "New connection activation was enqueued"
 msgstr "新连接激活已排队"
 
-#: ../clients/common/nm-client-utils.c:349
+#: ../clients/common/nm-client-utils.c:399
 msgid "The device's parent changed"
-msgstr "设备的上级已更改"
+msgstr "设备的参数已修改"
 
-#: ../clients/common/nm-client-utils.c:350
+#: ../clients/common/nm-client-utils.c:401
 msgid "The device parent's management changed"
-msgstr "设备的上级管理已更改"
+msgstr "父设备的管理已修改"
 
-#: ../clients/common/nm-client-utils.c:351
+#: ../clients/common/nm-client-utils.c:403
 msgid "OpenVSwitch database connection failed"
-msgstr "OpenVSwitch 数据库连接失败"
+msgstr ""
 
-#: ../clients/common/nm-client-utils.c:352
+#: ../clients/common/nm-client-utils.c:405
 msgid "A duplicate IP address was detected"
-msgstr "检测到重复的 IP 地址"
-
-#: ../clients/common/nm-client-utils.c:353
-msgid "The selected IP method is not supported"
-msgstr "选中的 IP 方法未支持"
+msgstr ""
 
-#: ../clients/common/nm-client-utils.c:354
-msgid "Failed to configure SR-IOV parameters"
-msgstr "配置 SR-IOV 参数失败"
+#. TRANSLATORS: Unknown reason for a device state change (NMDeviceStateReason)
+#. TRANSLATORS: Unknown reason for a connection state change (NMActiveConnectionStateReason)
+#: ../clients/common/nm-client-utils.c:410
+#: ../clients/common/nm-client-utils.c:449 ../libnm-glib/nm-device.c:1860
+#: ../libnm/nm-device.c:1572
+msgid "Unknown"
+msgstr "未知"
 
-#: ../clients/common/nm-client-utils.c:360
+#: ../clients/common/nm-client-utils.c:418
+#, fuzzy
 msgid "Unknown reason"
 msgstr "未知原因"
 
-#: ../clients/common/nm-client-utils.c:361
+#: ../clients/common/nm-client-utils.c:420
+#, fuzzy
 msgid "The connection was disconnected"
-msgstr "连接已断开"
+msgstr "这个连接不是一个 Bond 连接。"
 
-#: ../clients/common/nm-client-utils.c:362
+#: ../clients/common/nm-client-utils.c:422
+#, fuzzy
 msgid "Disconnected by user"
-msgstr "已被用户断开连接"
+msgstr "被 D-Bus 断开"
 
-#: ../clients/common/nm-client-utils.c:363
+#: ../clients/common/nm-client-utils.c:424
+#, fuzzy
 msgid "The base network connection was interrupted"
-msgstr "基础网络连接已中断"
+msgstr "基点网络连接中断"
 
-#: ../clients/common/nm-client-utils.c:364
+#: ../clients/common/nm-client-utils.c:426
+#, fuzzy
 msgid "The VPN service stopped unexpectedly"
 msgstr "VPN 服务意外停止"
 
-#: ../clients/common/nm-client-utils.c:365
+#: ../clients/common/nm-client-utils.c:428
+#, fuzzy
 msgid "The VPN service returned invalid configuration"
-msgstr "VPN 服务返回了无效配置"
+msgstr "VPN 服务返回无效配置"
 
-#: ../clients/common/nm-client-utils.c:366
+#: ../clients/common/nm-client-utils.c:430
+#, fuzzy
 msgid "The connection attempt timed out"
 msgstr "连接尝试超时"
 
-#: ../clients/common/nm-client-utils.c:367
+#: ../clients/common/nm-client-utils.c:432
+#, fuzzy
 msgid "The VPN service did not start in time"
-msgstr "VPN 连接没有及时启动"
+msgstr "VPN 连接没有按时启动"
 
-#: ../clients/common/nm-client-utils.c:368
+#: ../clients/common/nm-client-utils.c:434
+#, fuzzy
 msgid "The VPN service failed to start"
 msgstr "VPN 服务启动失败"
 
-#: ../clients/common/nm-client-utils.c:369
+#: ../clients/common/nm-client-utils.c:436
+#, fuzzy
 msgid "No valid secrets"
-msgstr "没有有效的密钥"
+msgstr "没有有效的 VPN 加密"
 
-#: ../clients/common/nm-client-utils.c:370
+#: ../clients/common/nm-client-utils.c:438
+#, fuzzy
 msgid "Invalid secrets"
-msgstr "无效的密钥"
+msgstr "无效 VPN 加密"
 
-#: ../clients/common/nm-client-utils.c:371
+#: ../clients/common/nm-client-utils.c:440
+#, fuzzy
 msgid "The connection was removed"
-msgstr "连接已被移除"
+msgstr "连接被删除"
 
-#: ../clients/common/nm-client-utils.c:372
+#: ../clients/common/nm-client-utils.c:442
+#, fuzzy
 msgid "Master connection failed"
-msgstr "主连接失败"
+msgstr "连接失败"
 
-#: ../clients/common/nm-client-utils.c:373
+#: ../clients/common/nm-client-utils.c:444
+#, fuzzy
 msgid "Could not create a software link"
-msgstr "无法创建软件链路:%s"
+msgstr "无法创建临时文件:%s"
 
-#: ../clients/common/nm-client-utils.c:374
+#: ../clients/common/nm-client-utils.c:446
+#, fuzzy
 msgid "The device disappeared"
-msgstr "设备已消失"
+msgstr "设备的活动连接已消失"
 
-#: ../clients/common/nm-meta-setting-access.c:492
+#: ../clients/common/nm-meta-setting-access.c:501
 #, c-format
 msgid "field '%s' has to be alone"
-msgstr "字段 \"%s\" 必须是单独的"
+msgstr "字段“%s”必须是单独的"
 
-#: ../clients/common/nm-meta-setting-access.c:507
-#, c-format
+#: ../clients/common/nm-meta-setting-access.c:516
+#, fuzzy, c-format
 msgid "invalid field '%s%s%s%s%s'; %s%s%s"
-msgstr "无效字段 \"%s%s%s%s%s\";%s%s%s"
+msgstr "无效字段“%s”;允许字段:%s"
 
-#: ../clients/common/nm-meta-setting-desc.c:99
-#: ../clients/common/nm-meta-setting-desc.c:161
+#: ../clients/common/nm-meta-setting-desc.c:100
+#: ../clients/common/nm-meta-setting-desc.c:156
 #, c-format
 msgid "invalid prefix '%s'; <1-%d> allowed"
-msgstr "无效前缀 \"%s\":允许的范围是 <1-%d>"
+msgstr "无效前缀 '%s':允许的范围是 <1-%d>"
 
-#: ../clients/common/nm-meta-setting-desc.c:107
+#: ../clients/common/nm-meta-setting-desc.c:108
 #, c-format
 msgid "invalid IP address: %s"
 msgstr "无效的 IP 地址:%s"
@@ -4387,240 +4048,265 @@ msgid ""
 "The valid syntax is: 'ip[/prefix] [next-hop] [metric] [attribute=val]... [,"
 "ip[/prefix] ...]'"
 msgstr ""
-"有效语法为:\"ip[/prefix] [next-hop] [metric] [attribute=val]... [,ip[/"
-"prefix] ...]\""
 
-#: ../clients/common/nm-meta-setting-desc.c:172
+#: ../clients/common/nm-meta-setting-desc.c:167
 #, c-format
 msgid "the next hop ('%s') must be first"
-msgstr "下一跳(\"%s\")必须在首位"
+msgstr ""
 
-#: ../clients/common/nm-meta-setting-desc.c:178
+#: ../clients/common/nm-meta-setting-desc.c:173
 #, c-format
 msgid "the metric ('%s') must be before attributes"
-msgstr "跃点数(\"%s\")必需在属性前"
+msgstr ""
 
-#: ../clients/common/nm-meta-setting-desc.c:218
+#: ../clients/common/nm-meta-setting-desc.c:213
 #, c-format
 msgid "invalid route: %s. %s"
-msgstr "无效路由:%s。%s"
+msgstr ""
 
-#: ../clients/common/nm-meta-setting-desc.c:230
+#: ../clients/common/nm-meta-setting-desc.c:225
 msgid "default route cannot be added (NetworkManager handles it by itself)"
-msgstr "无法添加默认路由(网络管理器自己进行处理)"
+msgstr "无法添加默认的路由(NetworkManager 自己进行处理)"
 
-#: ../clients/common/nm-meta-setting-desc.c:429
+#: ../clients/common/nm-meta-setting-desc.c:424
 #, c-format
 msgid "invalid priority map '%s'"
-msgstr "无效的优先级映射 \"%s\""
+msgstr "无效的优先级映射“%s”"
 
-#: ../clients/common/nm-meta-setting-desc.c:436
-#: ../clients/common/nm-meta-setting-desc.c:442
+#: ../clients/common/nm-meta-setting-desc.c:431
+#: ../clients/common/nm-meta-setting-desc.c:437
 #, c-format
 msgid "priority '%s' is not valid (<0-%ld>)"
-msgstr "优先级 \"%s\" 无效(<0-%ld>)"
+msgstr "优先级“%s”无效 (<0-%ld>)"
 
-#: ../clients/common/nm-meta-setting-desc.c:494
+#: ../clients/common/nm-meta-setting-desc.c:489
 #, c-format
 msgid "cannot read pac-script from file '%s'"
-msgstr "无法从文件 \"%s\" 读取 PAC 脚本"
+msgstr "无法从文件“%s”读取 PAC 脚本"
 
-#: ../clients/common/nm-meta-setting-desc.c:501
+#: ../clients/common/nm-meta-setting-desc.c:496
 #, c-format
 msgid "file '%s' contains non-valid utf-8"
-msgstr "文件 \"%s\" 包含无效的 utf-8"
+msgstr "文件“%s”包含无效的 utf-8"
 
-#: ../clients/common/nm-meta-setting-desc.c:514
+#: ../clients/common/nm-meta-setting-desc.c:509
 #, c-format
 msgid "'%s' does not contain a valid PAC Script"
-msgstr "\"%s\" 没有包含有效的 PAC 脚本"
+msgstr "“%s”没有包含有效的 PAC 脚本"
 
-#: ../clients/common/nm-meta-setting-desc.c:517
+#: ../clients/common/nm-meta-setting-desc.c:512
 #, c-format
 msgid "Not a valid PAC Script"
 msgstr "不是有效的 PAC 脚本"
 
-#: ../clients/common/nm-meta-setting-desc.c:571
+#: ../clients/common/nm-meta-setting-desc.c:566
 #, c-format
 msgid "cannot read team config from file '%s'"
-msgstr "无法从文件 \"%s\" 读取组合(team)配置"
+msgstr "无法从文件“%s”读取分组配置"
 
-#: ../clients/common/nm-meta-setting-desc.c:578
+#: ../clients/common/nm-meta-setting-desc.c:573
 #, c-format
 msgid "team config file '%s' contains non-valid utf-8"
-msgstr "组合(team)配置文件 \"%s\" 包含无效的 utf-8"
+msgstr ""
 
-#: ../clients/common/nm-meta-setting-desc.c:590
+#: ../clients/common/nm-meta-setting-desc.c:585
 #, c-format
 msgid "'%s' does not contain a valid team configuration"
-msgstr "\"%s\" 没有包含有效的组合(team)配置"
+msgstr ""
 
-#: ../clients/common/nm-meta-setting-desc.c:593
+#: ../clients/common/nm-meta-setting-desc.c:588
 #, c-format
 msgid "team configuration must be a JSON object"
-msgstr "组合(team)配置必须为 JSON 目标"
+msgstr ""
 
-#: ../clients/common/nm-meta-setting-desc.c:714
+#: ../clients/common/nm-meta-setting-desc.c:682
 #: ../clients/tui/nmt-mtu-entry.c:84
 msgid "(default)"
 msgstr "(默认)"
 
-#: ../clients/common/nm-meta-setting-desc.c:855
+#: ../clients/common/nm-meta-setting-desc.c:797
 msgid "auto"
 msgstr "自动"
 
-#: ../clients/common/nm-meta-setting-desc.c:1007
+#: ../clients/common/nm-meta-setting-desc.c:945
 #, c-format
 msgid "%s (%s)"
-msgstr "%s(%s)"
+msgstr ""
 
-#: ../clients/common/nm-meta-setting-desc.c:1131
+#: ../clients/common/nm-meta-setting-desc.c:1069
 #, c-format
 msgid "'%s' is out of range [%lli, %lli]"
-msgstr "\"%s\" 超出范围 [%lli, %lli]"
+msgstr ""
 
-#: ../clients/common/nm-meta-setting-desc.c:1137
+#: ../clients/common/nm-meta-setting-desc.c:1075
 #, c-format
 msgid "'%s' is not a valid number"
-msgstr "\"%s\" 不是有效的数字"
+msgstr ""
 
-#: ../clients/common/nm-meta-setting-desc.c:1187
+#: ../clients/common/nm-meta-setting-desc.c:1125
 #, c-format
 msgid "'%s' is out of range [0, %u]"
-msgstr "\"%s\" 超出范围 [0, %u]"
+msgstr ""
 
-#: ../clients/common/nm-meta-setting-desc.c:1230
+#: ../clients/common/nm-meta-setting-desc.c:1162
 #, c-format
 msgid "'%s' is not a valid Ethernet MAC"
-msgstr "\"%s\" 不是有效的以太网 MAC"
+msgstr "“%s”不是有效的以太网 MAC"
 
-#: ../clients/common/nm-meta-setting-desc.c:1334
+#: ../clients/common/nm-meta-setting-desc.c:1181
 #, c-format
+msgid "'%s' is not a valid flag number; use <0-%d>"
+msgstr "'%s' 是无效的标记数字,请使用 <0-%d>。"
+
+#: ../clients/common/nm-meta-setting-desc.c:1195
+#, fuzzy, c-format
+msgid "'%s' sum is higher than all flags => all flags set"
+msgstr "警告:'%s' 总计高于 all flags => all flags 集合\n"
+
+#: ../clients/common/nm-meta-setting-desc.c:1299
+#, fuzzy, c-format
 msgid "invalid option '%s', use a combination of [%s]"
-msgstr "无效选项 \"%s\",请使用 [%s] 的组合"
+msgstr "无效选项 '%s',请使用 [%s] 中的一个。"
 
-#: ../clients/common/nm-meta-setting-desc.c:1339 ../libnm-core/nm-keyfile.c:770
+#: ../clients/common/nm-meta-setting-desc.c:1304
+#: ../libnm-core/nm-keyfile-reader.c:623
 #, c-format
 msgid "invalid option '%s', use one of [%s]"
-msgstr "无效选项 \"%s\",请使用 [%s] 中的一个。"
+msgstr "无效选项 '%s',请使用 [%s] 中的一个。"
 
-#: ../clients/common/nm-meta-setting-desc.c:1458
+#: ../clients/common/nm-meta-setting-desc.c:1427
 #, c-format
 msgid "%d (key)"
-msgstr "%d(密钥)"
+msgstr "%d (密钥)"
 
-#: ../clients/common/nm-meta-setting-desc.c:1460
+#: ../clients/common/nm-meta-setting-desc.c:1429
 #, c-format
 msgid "%d (passphrase)"
-msgstr "%d(密码)"
+msgstr "%d (密码短语)"
 
-#: ../clients/common/nm-meta-setting-desc.c:1463
+#: ../clients/common/nm-meta-setting-desc.c:1432
+#: ../clients/common/nm-meta-setting-desc.c:1521
 #, c-format
 msgid "%d (unknown)"
-msgstr "%d(未知)"
+msgstr "%d (未知)"
 
-#: ../clients/common/nm-meta-setting-desc.c:1495
+#: ../clients/common/nm-meta-setting-desc.c:1464
 msgid "0 (NONE)"
-msgstr "0(无)"
+msgstr "0 (无)"
 
-#: ../clients/common/nm-meta-setting-desc.c:1501
+#: ../clients/common/nm-meta-setting-desc.c:1470
 msgid "REORDER_HEADERS, "
 msgstr "记录头、"
 
-#: ../clients/common/nm-meta-setting-desc.c:1503
+#: ../clients/common/nm-meta-setting-desc.c:1472
 msgid "GVRP, "
 msgstr "GVRP、"
 
-#: ../clients/common/nm-meta-setting-desc.c:1505
+#: ../clients/common/nm-meta-setting-desc.c:1474
 msgid "LOOSE_BINDING, "
-msgstr "松散绑定、"
+msgstr "LOOSE_BINDING, "
 
-#: ../clients/common/nm-meta-setting-desc.c:1507
+#: ../clients/common/nm-meta-setting-desc.c:1476
 msgid "MVRP, "
-msgstr "MVRP、"
+msgstr "MVRP, "
 
-#: ../clients/common/nm-meta-setting-desc.c:1547
+#: ../clients/common/nm-meta-setting-desc.c:1515
+#, c-format
+msgid "%d (disabled)"
+msgstr "%d (已禁用)"
+
+#: ../clients/common/nm-meta-setting-desc.c:1517
+#, c-format
+msgid "%d (enabled, prefer public IP)"
+msgstr "%d (已启用,首选公共 IP)"
+
+#: ../clients/common/nm-meta-setting-desc.c:1519
+#, c-format
+msgid "%d (enabled, prefer temporary IP)"
+msgstr "%d (已启用,首选临时 IP)"
+
+#: ../clients/common/nm-meta-setting-desc.c:1534
 msgid "0 (none)"
-msgstr "0(无)"
+msgstr "0 (无)"
 
-#: ../clients/common/nm-meta-setting-desc.c:1553
+#: ../clients/common/nm-meta-setting-desc.c:1540
 msgid "agent-owned, "
 msgstr "为代理拥有、"
 
-#: ../clients/common/nm-meta-setting-desc.c:1555
+#: ../clients/common/nm-meta-setting-desc.c:1542
 msgid "not saved, "
 msgstr "未保存、"
 
-#: ../clients/common/nm-meta-setting-desc.c:1557
+#: ../clients/common/nm-meta-setting-desc.c:1544
 msgid "not required, "
-msgstr "不必需、"
+msgstr "不必须、"
 
-#: ../clients/common/nm-meta-setting-desc.c:1622
+#: ../clients/common/nm-meta-setting-desc.c:1606
 #, c-format
 msgid "'%s' is not valid; use <option>=<value>"
-msgstr "\"%s\" 无效;请使用 <选项>=<值>"
+msgstr "“%s” 无效,请使用 <option>=<value>"
 
-#: ../clients/common/nm-meta-setting-desc.c:1661
+#: ../clients/common/nm-meta-setting-desc.c:1648
 msgid "no item to remove"
-msgstr "没有要移除的项"
+msgstr "没有要删除的项"
 
-#: ../clients/common/nm-meta-setting-desc.c:1665
+#: ../clients/common/nm-meta-setting-desc.c:1652
 #, c-format
 msgid "index '%d' is not in range <0-%d>"
-msgstr "索引 \"%d\" 超出了范围 <0-%d>"
+msgstr "索引“%d”超出了范围 <0-%d>"
 
-#: ../clients/common/nm-meta-setting-desc.c:1680
+#: ../clients/common/nm-meta-setting-desc.c:1667
 #, c-format
 msgid "invalid option '%s'"
-msgstr "无效选项 \"%s\""
+msgstr "无效选项“%s”"
 
-#: ../clients/common/nm-meta-setting-desc.c:1682
+#: ../clients/common/nm-meta-setting-desc.c:1669
 msgid "missing option"
 msgstr "缺少选项"
 
-#: ../clients/common/nm-meta-setting-desc.c:1706
+#: ../clients/common/nm-meta-setting-desc.c:1693
 #, c-format
 msgid "'%s' is not a valid MAC"
-msgstr "\"%s\" 不是有效的 MAC"
+msgstr "“%s”不是有效的 MAC 地址"
 
-#: ../clients/common/nm-meta-setting-desc.c:1733
-#: ../clients/common/nm-meta-setting-desc.c:1830
-#: ../clients/common/nm-meta-setting-desc.c:4805
+#: ../clients/common/nm-meta-setting-desc.c:1723
+#: ../clients/common/nm-meta-setting-desc.c:1819
+#: ../clients/common/nm-meta-setting-desc.c:4667
 #, c-format
 msgid "'%s' is not valid"
-msgstr "\"%s\" 无效"
+msgstr "“%s” 无效"
 
-#: ../clients/common/nm-meta-setting-desc.c:1774
+#: ../clients/common/nm-meta-setting-desc.c:1763
 #, c-format
 msgid "'%u' flags are not valid; use combination of %s"
-msgstr "\"%u\" 标记无效;请使用 %s 的组合"
+msgstr "'%u' 标记无效,请使用 %s 组合"
 
-#: ../clients/common/nm-meta-setting-desc.c:1810
+#: ../clients/common/nm-meta-setting-desc.c:1799
 #, c-format
 msgid "'%s' is not a valid number (or out of range)"
-msgstr "\"%s\" 不是有效的数字(或超出范围)"
+msgstr "“%s”不是有效的值(或超出范围)"
 
-#: ../clients/common/nm-meta-setting-desc.c:1929
+#: ../clients/common/nm-meta-setting-desc.c:1919
 #, c-format
 msgid "'%s' is not a valid hex character"
-msgstr "\"%s\" 不是有效十六进制字符"
+msgstr "“%s” 不是有效十六进制字符串"
 
-#: ../clients/common/nm-meta-setting-desc.c:2218
+#: ../clients/common/nm-meta-setting-desc.c:2199
 #, c-format
 msgid "the property doesn't contain EAP method '%s'"
-msgstr "属性没有包含 EAP 方法 \"%s\""
+msgstr "属性不能包含 EAP 方法 '%s'"
 
-#: ../clients/common/nm-meta-setting-desc.c:2241
+#: ../clients/common/nm-meta-setting-desc.c:2222
 #, c-format
 msgid "the property doesn't contain alternative subject match '%s'"
-msgstr "属性没有包含符合 \"%s\" 的替换者"
+msgstr "属性没有包含匹配 '%s' 的替代主体"
 
-#: ../clients/common/nm-meta-setting-desc.c:2267
+#: ../clients/common/nm-meta-setting-desc.c:2248
 #, c-format
 msgid "the property doesn't contain \"phase2\" alternative subject match '%s'"
-msgstr "属性没有包含符合 \"%s\" 的 \"phase2\" 替换者"
+msgstr "属性没有包含匹配 '%s' 的 \"phase2\" 替代主体"
 
-#: ../clients/common/nm-meta-setting-desc.c:2389
+#: ../clients/common/nm-meta-setting-desc.c:2369
 #, c-format
 msgid ""
 "Enter a list of bonding options formatted as:\n"
@@ -4637,10 +4323,10 @@ msgid ""
 "\n"
 "Example: mode=2,miimon=120\n"
 msgstr ""
-"输入绑定(bonding)选项列表,格式为:\n"
-"  option = <值>, option = <值>,... \n"
-"有效选项为:%s\n"
-"\"mode\" 可以由名称或者数字提供:\n"
+"输入绑定选项列表,格式为:\n"
+"  option = <value>, option = <value>,... \n"
+"有效选项为: %s\n"
+"“mode” 可作为名称或者数字提供:\n"
 "balance-rr    = 0\n"
 "active-backup = 1\n"
 "balance-xor   = 2\n"
@@ -4658,243 +4344,238 @@ msgstr ""
 #. * hacky: we can not see if the type is already set, because
 #. * nmc_setting_set_property() is called only after the property
 #. * we're setting (type) has been removed.
-#: ../clients/common/nm-meta-setting-desc.c:2452
-#, c-format
+#: ../clients/common/nm-meta-setting-desc.c:2429
+#, fuzzy, c-format
 msgid "Can not change the connection type"
-msgstr "无法更改连接类型"
+msgstr "未知/未处理的蓝牙连接类型"
 
-#: ../clients/common/nm-meta-setting-desc.c:2555
+#: ../clients/common/nm-meta-setting-desc.c:2539
 #, c-format
 msgid "the property doesn't contain permission '%s'"
-msgstr "属性没有包含权限 \"%s\""
+msgstr "属性没有包含权限 '%s'"
 
-#: ../clients/common/nm-meta-setting-desc.c:2576
+#: ../clients/common/nm-meta-setting-desc.c:2560
 #, c-format
 msgid "'%s' is not valid master; use ifname or connection UUID"
-msgstr "\"%s\" 不是有效的主连接;使用接口名或连接的 UUID"
+msgstr "“%s” 不是有效主接口;使用 ifname 或者连接 UUID"
 
-#: ../clients/common/nm-meta-setting-desc.c:2673
+#: ../clients/common/nm-meta-setting-desc.c:2659
 #, c-format
 msgid "the value '%s' is not a valid UUID"
-msgstr "值 \"%s\" 不是有效的 UUID"
+msgstr "'%s' 值不是有效的 UUID"
 
-#: ../clients/common/nm-meta-setting-desc.c:2680
+#: ../clients/common/nm-meta-setting-desc.c:2666
 #, c-format
 msgid "the property doesn't contain UUID '%s'"
-msgstr "属性没有包含 UUID \"%s\""
+msgstr "属性没有包含 UUID '%s'"
 
-#: ../clients/common/nm-meta-setting-desc.c:2749
+#: ../clients/common/nm-meta-setting-desc.c:2733
 msgid "0 (disabled)"
 msgstr "0(禁用)"
 
-#: ../clients/common/nm-meta-setting-desc.c:2755
+#: ../clients/common/nm-meta-setting-desc.c:2739
 msgid "enabled, "
-msgstr "启用、"
+msgstr "已启用、"
 
-#: ../clients/common/nm-meta-setting-desc.c:2757
+#: ../clients/common/nm-meta-setting-desc.c:2741
 msgid "advertise, "
-msgstr "通告、"
+msgstr "广告,"
 
-#: ../clients/common/nm-meta-setting-desc.c:2759
+#: ../clients/common/nm-meta-setting-desc.c:2743
 msgid "willing, "
-msgstr "愿意、"
+msgstr "willing, "
 
-#: ../clients/common/nm-meta-setting-desc.c:2881
+#: ../clients/common/nm-meta-setting-desc.c:2863
 #, c-format
 msgid "'%s' is not a valid DCB flag"
-msgstr "\"%s\" 不是有效的 DCB 标记"
+msgstr "“%s” 不是有效 DCB 标签"
 
-#: ../clients/common/nm-meta-setting-desc.c:2910
+#: ../clients/common/nm-meta-setting-desc.c:2893
 msgid "must contain 8 comma-separated numbers"
-msgstr "必须包含 8 个用逗号分隔的数字"
+msgstr "必须包含 8 个用逗号分开的数字"
 
-#: ../clients/common/nm-meta-setting-desc.c:2926
+#: ../clients/common/nm-meta-setting-desc.c:2909
 #, c-format
 msgid "'%s' not a number between 0 and %u (inclusive) or %u"
-msgstr "\"%s\" 不是 0 和 %u(包括)之间的数字或是 %u"
+msgstr "“%s” 不是 0 和 %u (包含该数字) 或者 %u 之间的数字"
 
-#: ../clients/common/nm-meta-setting-desc.c:2929
+#: ../clients/common/nm-meta-setting-desc.c:2912
 #, c-format
 msgid "'%s' not a number between 0 and %u (inclusive)"
-msgstr "\"%s\" 不是 0 和 %u(包括)之间的数字"
+msgstr "“%s” 不是 0 和 %u (包含该数字) 之间的数字"
 
-#: ../clients/common/nm-meta-setting-desc.c:2950
-#, c-format
+#: ../clients/common/nm-meta-setting-desc.c:2933
+#, fuzzy, c-format
 msgid "changes will have no effect until '%s' includes 1 (enabled)"
-msgstr "除非 \"%s\" 包含 1(启用),否则更改无法生效"
+msgstr ""
+"警告:除非 “%s” 包括 1 (启用),否则更改无法生效。\n"
+"\n"
 
-#: ../clients/common/nm-meta-setting-desc.c:3005
+#: ../clients/common/nm-meta-setting-desc.c:2988
 #, c-format
 msgid "bandwidth percentages must total 100%%"
-msgstr "带宽百分比总和必须为 100%%"
+msgstr "贷款百分比必须为 100%%"
 
-#: ../clients/common/nm-meta-setting-desc.c:3078
-#: ../clients/common/nm-meta-setting-desc.c:3084
+#: ../clients/common/nm-meta-setting-desc.c:3061
+#: ../clients/common/nm-meta-setting-desc.c:3067
 msgid "SIM operator ID must be a 5 or 6 number MCCMNC code"
-msgstr "SIM 运营商 ID 必须为 5 或 6 个数字的 MCCMNC 代码"
+msgstr "SIM 操作员 ID 必须为 5 或 6 个数字的 MCCMNC 代码"
 
-#: ../clients/common/nm-meta-setting-desc.c:3108
+#: ../clients/common/nm-meta-setting-desc.c:3091
 #, c-format
 msgid "'%s' is not a valid IBoIP P_Key"
-msgstr "\"%s\" 不是有效的 IBoIP P_Key"
+msgstr "“%s”不是有效的 IBoIP P_Key"
 
-#: ../clients/common/nm-meta-setting-desc.c:3131
+#: ../clients/common/nm-meta-setting-desc.c:3114
 msgid "default"
 msgstr "默认"
 
-#: ../clients/common/nm-meta-setting-desc.c:3270
-#: ../clients/common/nm-meta-setting-desc.c:3287
+#: ../clients/common/nm-meta-setting-desc.c:3248
+#: ../clients/common/nm-meta-setting-desc.c:3267
 #, c-format
 msgid "invalid IPv4 address '%s'"
-msgstr "无效的 IPv4 地址\"%s\""
+msgstr "无效的 IPv4 地址“%s”"
 
-#: ../clients/common/nm-meta-setting-desc.c:3293
-#: ../clients/common/nm-meta-setting-desc.c:3537
+#: ../clients/common/nm-meta-setting-desc.c:3273
+#: ../clients/common/nm-meta-setting-desc.c:3527
 #, c-format
 msgid "the property doesn't contain DNS server '%s'"
-msgstr "属性没有包含 DNS 服务器 \"%s\""
+msgstr "属性没有包含 DNS 服务器 '%s'"
 
-#: ../clients/common/nm-meta-setting-desc.c:3331
-#: ../clients/common/nm-meta-setting-desc.c:3575
+#: ../clients/common/nm-meta-setting-desc.c:3313
+#: ../clients/common/nm-meta-setting-desc.c:3567
 #, c-format
 msgid "the property doesn't contain DNS search domain '%s'"
-msgstr "属性没有包含 DNS 搜索域 \"%s\""
+msgstr "属性没有包含 DNS 搜索域 '%s'"
 
-#: ../clients/common/nm-meta-setting-desc.c:3368
-#: ../clients/common/nm-meta-setting-desc.c:3612
+#: ../clients/common/nm-meta-setting-desc.c:3350
+#: ../clients/common/nm-meta-setting-desc.c:3604
 #, c-format
 msgid "the property doesn't contain DNS option '%s'"
-msgstr "属性没有包含 DNS 选项 \"%s\""
+msgstr "属性没有包含 DNS 选项 '%s'"
 
-#: ../clients/common/nm-meta-setting-desc.c:3411
-#: ../clients/common/nm-meta-setting-desc.c:3661
+#: ../clients/common/nm-meta-setting-desc.c:3393
+#: ../clients/common/nm-meta-setting-desc.c:3653
 #, c-format
 msgid "the property doesn't contain IP address '%s'"
-msgstr "属性没有包含 IP 地址 \"%s\""
+msgstr "属性没有包含 IP 地址 '%s'"
 
-#: ../clients/common/nm-meta-setting-desc.c:3431
-#: ../clients/common/nm-meta-setting-desc.c:3680
+#: ../clients/common/nm-meta-setting-desc.c:3413
+#: ../clients/common/nm-meta-setting-desc.c:3672
 #, c-format
 msgid "invalid gateway address '%s'"
-msgstr "无效的网关地址 \"%s\""
+msgstr "无效网关地址 '%s'"
 
-#: ../clients/common/nm-meta-setting-desc.c:3470
-#: ../clients/common/nm-meta-setting-desc.c:3721
+#: ../clients/common/nm-meta-setting-desc.c:3452
+#: ../clients/common/nm-meta-setting-desc.c:3713
 #, c-format
 msgid "the property doesn't contain route '%s'"
-msgstr "属性没有包含路由 \"%s\""
+msgstr "属性没有包含路由 '%s'"
 
-#: ../clients/common/nm-meta-setting-desc.c:3514
-#: ../clients/common/nm-meta-setting-desc.c:3531
+#: ../clients/common/nm-meta-setting-desc.c:3502
+#: ../clients/common/nm-meta-setting-desc.c:3521
 #, c-format
 msgid "invalid IPv6 address '%s'"
-msgstr "无效的 IPv6 地址 \"%s\""
+msgstr "无效的 IPv6 地址“%s”"
 
-#: ../clients/common/nm-meta-setting-desc.c:3783
+#: ../clients/common/nm-meta-setting-desc.c:3731
+#: ../libnm-core/nm-setting-gsm.c:381 ../libnm-util/nm-setting-gsm.c:364
 #, c-format
-msgid "the property doesn't contain interface name '%s'"
-msgstr "属性没有包含接口名 \"%s\""
+msgid "'%s' is not a number"
+msgstr "“%s”不是一个数字"
 
-#: ../clients/common/nm-meta-setting-desc.c:3820
+#: ../clients/common/nm-meta-setting-desc.c:3738
 #, c-format
-msgid "'%s' is not a valid channel; use <1-13>"
-msgstr "\"%s\" 不是有效的信道;请使用 <1-13>"
+msgid "'%s' is not valid; use 0, 1, or 2"
+msgstr "“%s” 无效,请使用 0、1 或者 2。"
 
-#: ../clients/common/nm-meta-setting-desc.c:3912
-msgid "The valid syntax is: vf [attribute=value]... [,vf [attribute=value]...]"
-msgstr "有效语法为:\"vf [attribute=value]... [,vf [attribute=value]...]\""
+#: ../clients/common/nm-meta-setting-desc.c:3772
+#, c-format
+msgid "'%s' is not a valid channel; use <1-13>"
+msgstr "“%s”不是有效的信道;请使用 <1-13>"
 
-#: ../clients/common/nm-meta-setting-desc.c:3934
+#: ../clients/common/nm-meta-setting-desc.c:3832
 msgid ""
 "The valid syntax is: '[root | parent <handle>] [handle <handle>] <qdisc>'"
 msgstr ""
-"有效语法为:\"[root | parent <句柄>] [handle <句柄>] <排队规则(qdisc)>\""
 
-#: ../clients/common/nm-meta-setting-desc.c:3958
-#, c-format
-msgid "the property doesn't contain vf with index %u"
-msgstr "属性没有包含索引为 %u 的虚拟功能(vf)"
-
-#: ../clients/common/nm-meta-setting-desc.c:3985
-#, c-format
+#: ../clients/common/nm-meta-setting-desc.c:3855
+#, fuzzy, c-format
 msgid "the property doesn't contain qdisc '%s'"
-msgstr "属性没有包含排队规则(qdisc) \"%s\""
+msgstr "属性没有包含 UUID '%s'"
 
-#: ../clients/common/nm-meta-setting-desc.c:4039
+#: ../clients/common/nm-meta-setting-desc.c:3908
 msgid ""
 "The valid syntax is: '[root | parent <handle>] [handle <handle>] <tfilter>'"
 msgstr ""
-"有效语法为:\"[root | parent <处理模块>] [handle <处理模块>] <流量过滤器"
-"(tfilter)>\""
 
-#: ../clients/common/nm-meta-setting-desc.c:4062
-#, c-format
+#: ../clients/common/nm-meta-setting-desc.c:3931
+#, fuzzy, c-format
 msgid "the property doesn't contain tfilter '%s'"
-msgstr "属性没有包含流量过滤器(tfilter)\"%s\""
+msgstr "属性没有包含路由 '%s'"
 
-#: ../clients/common/nm-meta-setting-desc.c:4129
-#, c-format
+#: ../clients/common/nm-meta-setting-desc.c:3992
+#, fuzzy, c-format
 msgid "the property doesn't contain string '%s'"
-msgstr "属性没有包含字符串 \"%s\""
+msgstr "属性没有包含映射 '%s'"
 
-#: ../clients/common/nm-meta-setting-desc.c:4204
-#: ../clients/common/nm-meta-setting-desc.c:4278
-#, c-format
+#: ../clients/common/nm-meta-setting-desc.c:4065
+#: ../clients/common/nm-meta-setting-desc.c:4137
+#, fuzzy, c-format
 msgid "the property doesn't contain link watcher '%s'"
-msgstr "属性没有包含链路监视器 \"%s\""
+msgstr "属性没有包含路由 '%s'"
 
-#: ../clients/common/nm-meta-setting-desc.c:4384
-#, c-format
+#: ../clients/common/nm-meta-setting-desc.c:4228
+#, fuzzy, c-format
 msgid "only one mapping at a time is supported; taking the first one (%s)"
-msgstr "警告:一次只支持映射一个;使用第一个(%s)"
+msgstr "警告:不支持一次只映射一次;使用第一个(%s)\n"
 
-#: ../clients/common/nm-meta-setting-desc.c:4392
+#: ../clients/common/nm-meta-setting-desc.c:4236
 #, c-format
 msgid "the property doesn't contain mapping '%s'"
-msgstr "属性没有包含映射 \"%s\""
+msgstr "属性没有包含映射 '%s'"
 
-#: ../clients/common/nm-meta-setting-desc.c:4400
+#: ../clients/common/nm-meta-setting-desc.c:4244
 msgid "no priority to remove"
-msgstr "没有要删除的优先级"
+msgstr "未删除任何优先级"
 
-#: ../clients/common/nm-meta-setting-desc.c:4404
+#: ../clients/common/nm-meta-setting-desc.c:4248
 #, c-format
 msgid "index '%d' is not in the range of <0-%d>"
-msgstr "索引 \"%d\" 超出了范围 <0-%d>"
+msgstr "索引“%d”超出了范围 <0-%d>"
 
-#: ../clients/common/nm-meta-setting-desc.c:4473
+#: ../clients/common/nm-meta-setting-desc.c:4317
 #, c-format
 msgid "'%s' cannot be empty"
-msgstr "\"%s\" 不能为空"
+msgstr "'%s' 不能为空"
 
-#: ../clients/common/nm-meta-setting-desc.c:4512
-#: ../clients/common/nm-meta-setting-desc.c:4643
-#: ../libnm-core/nm-setting-sriov.c:446 ../libnm-core/nm-setting-wired.c:662
-#: ../libnm-core/nm-setting-wireless.c:857
-#: ../libnm-core/nm-setting-wireless.c:869 ../libnm-util/nm-setting-wired.c:645
-#: ../libnm-util/nm-setting-wireless.c:858
-#: ../libnm-util/nm-setting-wireless.c:872
+#: ../clients/common/nm-meta-setting-desc.c:4356
+#: ../clients/common/nm-meta-setting-desc.c:4489
+#: ../libnm-core/nm-setting-wired.c:664 ../libnm-core/nm-setting-wireless.c:857
+#: ../libnm-core/nm-setting-wireless.c:869 ../libnm-util/nm-setting-wired.c:646
+#: ../libnm-util/nm-setting-wireless.c:859
+#: ../libnm-util/nm-setting-wireless.c:873
 #, c-format
 msgid "'%s' is not a valid MAC address"
-msgstr "\"%s\" 不是有效的 MAC 地址"
+msgstr "“%s”不是有效的 MAC 地址"
 
-#: ../clients/common/nm-meta-setting-desc.c:4518
-#: ../clients/common/nm-meta-setting-desc.c:4649
+#: ../clients/common/nm-meta-setting-desc.c:4362
+#: ../clients/common/nm-meta-setting-desc.c:4495
 #, c-format
 msgid "the property doesn't contain MAC address '%s'"
-msgstr "属性没有包含 MAC 地址 \"%s\""
+msgstr "属性没有包含 MAC 地址 '%s'"
 
-#: ../clients/common/nm-meta-setting-desc.c:4536
+#: ../clients/common/nm-meta-setting-desc.c:4380
 #, c-format
 msgid "'%s' is not valid; 2 or 3 strings should be provided"
-msgstr "\"%s\" 无效;应提供两至三个字符串"
+msgstr "'%s' 无效;应提供两至三个字符串。"
 
-#: ../clients/common/nm-meta-setting-desc.c:4550
+#: ../clients/common/nm-meta-setting-desc.c:4396
 #, c-format
 msgid "'%s' string value should consist of 1 - 199 characters"
-msgstr "\"%s\" 字符串值应该由 1~199 个字符组成"
+msgstr "'%s' 字符串值应该由 1 - 199 个字符组成"
 
-#: ../clients/common/nm-meta-setting-desc.c:4582
+#: ../clients/common/nm-meta-setting-desc.c:4428
 #, c-format
 msgid ""
 "Enter a list of S/390 options formatted as:\n"
@@ -4902,98 +4583,95 @@ msgid ""
 "Valid options are: %s\n"
 msgstr ""
 "输入 S/390 选项列表,格式为:\n"
-"  option = <值>, option = <值>,... \n"
+"  option = <value>, option = <value>,... \n"
 "有效选项为:%s\n"
 
-#: ../clients/common/nm-meta-setting-desc.c:4616
+#: ../clients/common/nm-meta-setting-desc.c:4462
 #, c-format
 msgid "'%s' is not a valid channel"
-msgstr "\"%s\" 不是有效的信道"
+msgstr "“%s” 是无效的通道"
 
-#: ../clients/common/nm-meta-setting-desc.c:4622
+#: ../clients/common/nm-meta-setting-desc.c:4468
 #, c-format
 msgid "'%ld' is not a valid channel"
-msgstr "\"%ld\" 不是有效的信道"
+msgstr "“%ld”不是有效频道"
 
-#: ../clients/common/nm-meta-setting-desc.c:4705
-#: ../clients/common/nm-meta-setting-desc.c:4741
-#: ../clients/common/nm-meta-setting-desc.c:4777
+#: ../clients/common/nm-meta-setting-desc.c:4567
+#: ../clients/common/nm-meta-setting-desc.c:4603
+#: ../clients/common/nm-meta-setting-desc.c:4639
 #, c-format
 msgid "the property doesn't contain protocol '%s'"
-msgstr "属性没有包含协议 \"%s\""
+msgstr "属性没有包含协议 '%s'"
 
-#: ../clients/common/nm-meta-setting-desc.c:4814
+#: ../clients/common/nm-meta-setting-desc.c:4676
 #, c-format
 msgid ""
 "'%s' not compatible with %s '%s', please change the key or set the right %s "
 "first."
-msgstr "\"%s\" 和 %s \"%s\" 不兼容,请先修改密钥或设置正确的 %s。"
+msgstr "'%s' 和 %s '%s' 不兼容,请先修改密钥或设置正确的 %s。"
 
-#: ../clients/common/nm-meta-setting-desc.c:4824
-#, c-format
+#: ../clients/common/nm-meta-setting-desc.c:4686
+#, fuzzy, c-format
 msgid "WEP key is guessed to be of '%s'"
-msgstr "猜测 WEP 密钥为 \"%s\" 类型"
+msgstr "猜测 WEP 密钥为 “%s”\n"
 
-#: ../clients/common/nm-meta-setting-desc.c:4829
-#, c-format
+#: ../clients/common/nm-meta-setting-desc.c:4691
+#, fuzzy, c-format
 msgid "WEP key index set to '%d'"
-msgstr "WEP 密钥索引已设为 \"%d\""
+msgstr ""
+"设置 WEP 密钥为 '%d'\n"
+"\n"
 
-#: ../clients/common/nm-meta-setting-desc.c:4868
-#, c-format
+#: ../clients/common/nm-meta-setting-desc.c:4730
+#, fuzzy, c-format
 msgid "'%s' is not compatible with '%s' type, please change or delete the key."
-msgstr "\"%s\" 和 \"%s\" 类型不兼容,请修改或删除密钥。"
+msgstr "警告:'%s' 和 '%s' 类型不兼容,请修改或删除密钥。\n"
 
-#: ../clients/common/nm-meta-setting-desc.c:4878
+#: ../clients/common/nm-meta-setting-desc.c:4740
 #, c-format
 msgid "'%s' is not a valid PSK"
-msgstr "\"%s\" 不是有效的 PSK"
-
-#: ../clients/common/nm-meta-setting-desc.c:4930
-#, c-format
-msgid "'%s' is not valid; use 'on', 'off', or 'ignore'"
-msgstr "\"%s\" 无效;请使用 \"on\"、\"off\" 或 \"ignore\""
+msgstr "“%s” 是无效 PSK"
 
-#: ../clients/common/nm-meta-setting-desc.c:4989
+#: ../clients/common/nm-meta-setting-desc.c:4772
 msgid "Bonding primary interface [none]"
 msgstr "绑定主要接口 [无]"
 
 #. this is a virtual property, only needed during "ask" mode.
-#: ../clients/common/nm-meta-setting-desc.c:4996
+#: ../clients/common/nm-meta-setting-desc.c:4779
 msgid "Bonding monitoring mode"
 msgstr "绑定监控模式"
 
 # https://www.centos.org/docs/5/html/5.1/Deployment_Guide/s3-modules-bonding-directives.html
 # 链接有下面几个术语的定义,不过应该不用翻译,作为参考。
-#: ../clients/common/nm-meta-setting-desc.c:5005
+#: ../clients/common/nm-meta-setting-desc.c:4788
 msgid "Bonding miimon [100]"
 msgstr "绑定 miimon [100]"
 
-#: ../clients/common/nm-meta-setting-desc.c:5013
+#: ../clients/common/nm-meta-setting-desc.c:4796
 msgid "Bonding downdelay [0]"
 msgstr "绑定 downdelay [0]"
 
-#: ../clients/common/nm-meta-setting-desc.c:5021
+#: ../clients/common/nm-meta-setting-desc.c:4804
 msgid "Bonding updelay [0]"
 msgstr "绑定 updelay [0]"
 
-#: ../clients/common/nm-meta-setting-desc.c:5029
+#: ../clients/common/nm-meta-setting-desc.c:4812
 msgid "Bonding arp-interval [0]"
 msgstr "绑定 arp-interval [0]"
 
-#: ../clients/common/nm-meta-setting-desc.c:5037
+#: ../clients/common/nm-meta-setting-desc.c:4820
 msgid "Bonding arp-ip-target [none]"
 msgstr "绑定 arp-ip-target [none]"
 
-#: ../clients/common/nm-meta-setting-desc.c:5045
+#: ../clients/common/nm-meta-setting-desc.c:4828
 msgid "LACP rate ('slow' or 'fast') [slow]"
-msgstr "LACP 速率(\"slow\" 或 \"fast\")[slow]"
+msgstr "LACP 速率(“slow”或“fast”)[slow]"
 
 #. macro that returns @func as const (gboolean(*)(NMSetting*)) type, but checks
 #. * that the actual type is (gboolean(*)(type *)).
 #. macro that returns @func as const (guint32(*)(NMSetting*)) type, but checks
 #. * that the actual type is (guint32(*)(type *)).
-#: ../clients/common/nm-meta-setting-desc.c:5164
+#: ../clients/common/nm-meta-setting-desc.c:4940
 msgid ""
 "nmcli can accepts both direct JSON configuration data and a file name "
 "containing the configuration. In the latter case the file is read and the "
@@ -5010,7 +4688,7 @@ msgstr ""
 "\"roundrobin\"}, \"ports\": {\"eth1\": {}, \"eth2\": {}} }\n"
 "          set team.config /etc/my-team.conf\n"
 
-#: ../clients/common/nm-meta-setting-desc.c:5172
+#: ../clients/common/nm-meta-setting-desc.c:4948
 msgid ""
 "Enter a list of link watchers formatted as dictionaries where the keys are "
 "teamd properties. Dictionary pairs are in the form: key=value and pairs are "
@@ -5027,37 +4705,16 @@ msgid ""
 "\n"
 "Properties available for the 'arp_ping' include all the ones for 'nsna_ping' "
 "and:\n"
-"  'source-host'*, 'validate-active', 'validate-inactive', 'send-always'.\n"
+"  'source-host', 'validate-active', 'validate-inactive', 'send-always'.\n"
 "\n"
 "Properties flagged with a '*' are mandatory.\n"
 "\n"
 "Example:\n"
-"   name=arp_ping source-host=172.16.1.1 target-host=172.16.1.254, "
-"name=ethtool delay-up=3\n"
+"   name=arp_ping,source-host=172.16.1.1,target-host=172.16.1.254; "
+"name=ethtool,delay-up=3\n"
 msgstr ""
-"输入链路监视器列表,其格式为键值是 teamd 属性的字典。字典对的形式为:键=值,"
-"且字典对以空格 \" \" 分隔。字典间以 \",\" 分隔。\n"
-"在字典里允许或需要的键根据链路监视器的类型改变,而所有链路监视器的唯一共同属"
-"性是 \"name\"*,其定义了指定的链路监视器。\n"
-"\n"
-"适用于 \"ethtool\" 链路监视器的属性有:\n"
-"  \"delay-up\"、\"delay-down\"\n"
-"\n"
-"适用于 \"nsna_ping\" 链路监视器的属性有:\n"
-"  \"init-wait\"、\"interval\"、\"missed-max\"、\"target-host\"*\n"
-"\n"
-"适用于 \"arp_ping\" 链路监视器的属性除了包含 \"nsna_ping\" 下的所有属性还"
-"有:\n"
-"  \"source-host\"*、\"validate-active\"、\"validate-inactive\"、\"send-always"
-"\"。\n"
-"\n"
-"带有 \"*\" 标记的属性为必填的。\n"
-"\n"
-"示例:\n"
-"   name=arp_ping source-host=172.16.1.1 target-host=172.16.1.254, "
-"name=ethtool delay-up=3\n"
 
-#: ../clients/common/nm-meta-setting-desc.c:5222
+#: ../clients/common/nm-meta-setting-desc.c:4999
 msgid ""
 "Enter file path to CA certificate (optionally prefixed with file://).\n"
 "  [file://]<file path>\n"
@@ -5065,11 +4722,11 @@ msgid ""
 "Example: /home/cimrman/cacert.crt\n"
 msgstr ""
 "输入 CA 证书的文件路径(前缀可选择 file://)。\n"
-"  [file://]<文件路径>\n"
-"请注意,nmcli 不支持将证书指定为原始比特块(blob)数据。\n"
+"  [file://]<file path>\n"
+"请注意,nmcli 不支持将证书指定为原始 blob 数据。\n"
 "示例:/home/cimrman/cacert.crt\n"
 
-#: ../clients/common/nm-meta-setting-desc.c:5256
+#: ../clients/common/nm-meta-setting-desc.c:5033
 msgid ""
 "Enter file path to client certificate (optionally prefixed with file://).\n"
 "  [file://]<file path>\n"
@@ -5077,11 +4734,11 @@ msgid ""
 "Example: /home/cimrman/jara.crt\n"
 msgstr ""
 "输入客户证书的文件路径(前缀可选择 file://)。\n"
-"  [file://]<文件路径>\n"
-"请注意,nmcli 不支持将证书指定为原始比特块(blob)数据。\n"
+"  [file://]<file path>\n"
+"请注意,nmcli 不支持将证书指定为原始 blob 数据。\n"
 "示例:/home/cimrman/jara.crt\n"
 
-#: ../clients/common/nm-meta-setting-desc.c:5313
+#: ../clients/common/nm-meta-setting-desc.c:5090
 msgid ""
 "Enter file path to CA certificate for inner authentication (optionally "
 "prefixed\n"
@@ -5091,11 +4748,11 @@ msgid ""
 "Example: /home/cimrman/ca-zweite-phase.crt\n"
 msgstr ""
 "输入内部验证的 CA 证书的文件路径(前缀可选择 file://)。\n"
-"  [file://]<文件路径>\n"
-"请注意,nmcli 不支持将证书指定为原始比特块(blob)数据。\n"
+"  [file://]<file path>\n"
+"请注意,nmcli 不支持将证书指定为原始 blob 数据。\n"
 "示例:/home/cimrman/ca-zweite-phase.crt\n"
 
-#: ../clients/common/nm-meta-setting-desc.c:5348
+#: ../clients/common/nm-meta-setting-desc.c:5125
 msgid ""
 "Enter file path to client certificate for inner authentication (optionally "
 "prefixed\n"
@@ -5105,11 +4762,11 @@ msgid ""
 "Example: /home/cimrman/jara-zweite-phase.crt\n"
 msgstr ""
 "输入内部验证的客户证书的文件路径(前缀可选择 file://)。\n"
-"  [file://]<文件路径>\n"
-"请注意,nmcli 不支持将证书指定为原始比特块(blob)数据。\n"
+"  [file://]<file path>\n"
+"请注意,nmcli 不支持将证书指定为原始 blob 数据。\n"
 "示例:/home/cimrman/jara-zweite-phase.crt\n"
 
-#: ../clients/common/nm-meta-setting-desc.c:5375
+#: ../clients/common/nm-meta-setting-desc.c:5152
 msgid ""
 "Enter bytes as a list of hexadecimal values.\n"
 "Two formats are accepted:\n"
@@ -5128,10 +4785,10 @@ msgstr ""
 "头)。\n"
 "\n"
 "例如:ab0455a6ea3a74C2\n"
-"      ab 4 55 0xa6 ea 3a 74 C2\n"
+"     ab 4 55 0xa6 ea 3a 74 C2\n"
 
-#: ../clients/common/nm-meta-setting-desc.c:5392
-#: ../clients/common/nm-meta-setting-desc.c:5410
+#: ../clients/common/nm-meta-setting-desc.c:5169
+#: ../clients/common/nm-meta-setting-desc.c:5187
 msgid ""
 "Enter path to a private key and the key password (if not set yet):\n"
 "  [file://]<file path> [<password>]\n"
@@ -5139,88 +4796,88 @@ msgid ""
 "Example: /home/cimrman/jara-priv-key Dardanely\n"
 msgstr ""
 "输入私有密钥和密钥密码的路径(如果还没有设置):\n"
-"  [file://]<文件路径> [<密码>]\n"
-"请注意,nmcli 不支持将私有密钥指定为原始比特块(blob)数据。\n"
+"  [file://]<file path> [<password>]\n"
+"请注意,nmcli 不支持将私有密钥指定为原始 blob 数据。\n"
 "示例:/home/cimrman/jara-priv-key Dardanely\n"
 
-#: ../clients/common/nm-meta-setting-desc.c:5449
-#: ../clients/common/nm-secret-agent-simple.c:249
-#: ../clients/common/nm-secret-agent-simple.c:347
+#: ../clients/common/nm-meta-setting-desc.c:5226
+#: ../clients/common/nm-secret-agent-simple.c:234
+#: ../clients/common/nm-secret-agent-simple.c:332
 #: ../clients/tui/nmt-page-dsl.c:66 ../clients/tui/nmt-page-wifi.c:332
 msgid "Username"
 msgstr "用户名"
 
-#: ../clients/common/nm-meta-setting-desc.c:5455
-#: ../clients/common/nm-meta-setting-desc.c:5639
-#: ../clients/common/nm-meta-setting-desc.c:6004
-#: ../clients/common/nm-meta-setting-desc.c:6664
+#: ../clients/common/nm-meta-setting-desc.c:5232
+#: ../clients/common/nm-meta-setting-desc.c:5416
+#: ../clients/common/nm-meta-setting-desc.c:5699
+#: ../clients/common/nm-meta-setting-desc.c:6323
 msgid "Password [none]"
 msgstr "密码 [无]"
 
-#: ../clients/common/nm-meta-setting-desc.c:5501
+#: ../clients/common/nm-meta-setting-desc.c:5278
 msgid "Bluetooth device address"
 msgstr "蓝牙设备地址"
 
-#: ../clients/common/nm-meta-setting-desc.c:5546
-#: ../clients/common/nm-meta-setting-desc.c:6058
-#: ../clients/common/nm-meta-setting-desc.c:7391
-#: ../clients/common/nm-meta-setting-desc.c:7429
-#: ../clients/common/nm-meta-setting-desc.c:7566
-#: ../clients/common/nm-meta-setting-desc.c:7784
+#: ../clients/common/nm-meta-setting-desc.c:5323
+#: ../clients/common/nm-meta-setting-desc.c:5753
+#: ../clients/common/nm-meta-setting-desc.c:7030
+#: ../clients/common/nm-meta-setting-desc.c:7068
+#: ../clients/common/nm-meta-setting-desc.c:7205
 msgid "MAC [none]"
 msgstr "MAC [无]"
 
-#: ../clients/common/nm-meta-setting-desc.c:5552
+#: ../clients/common/nm-meta-setting-desc.c:5329
 msgid "Enable STP [no]"
 msgstr "启用 STP [否]"
 
-#: ../clients/common/nm-meta-setting-desc.c:5558
+#: ../clients/common/nm-meta-setting-desc.c:5335
 msgid "STP priority [32768]"
 msgstr "STP 优先级 [32768]"
 
-#: ../clients/common/nm-meta-setting-desc.c:5564
+#: ../clients/common/nm-meta-setting-desc.c:5341
 msgid "Forward delay [15]"
 msgstr "转发延时 [15]"
 
-#: ../clients/common/nm-meta-setting-desc.c:5570
+#: ../clients/common/nm-meta-setting-desc.c:5347
+#, fuzzy
 msgid "Hello time [2]"
-msgstr "呼叫时间 [2]"
+msgstr "问候时间 [2]"
 
-#: ../clients/common/nm-meta-setting-desc.c:5576
+#: ../clients/common/nm-meta-setting-desc.c:5353
 msgid "Max age [20]"
 msgstr "最大寿命 [20]"
 
-#: ../clients/common/nm-meta-setting-desc.c:5582
+#: ../clients/common/nm-meta-setting-desc.c:5359
 msgid "MAC address ageing time [300]"
 msgstr "MAC 地址老化时间 [300]"
 
-#: ../clients/common/nm-meta-setting-desc.c:5588
+#: ../clients/common/nm-meta-setting-desc.c:5365
 msgid "Group forward mask [0]"
-msgstr "组前向掩码 [0]"
+msgstr ""
 
-#: ../clients/common/nm-meta-setting-desc.c:5594
+#: ../clients/common/nm-meta-setting-desc.c:5371
 msgid "Enable IGMP snooping [no]"
-msgstr "启用 IGMP 监听 [否]"
+msgstr ""
 
-#: ../clients/common/nm-meta-setting-desc.c:5606
+#: ../clients/common/nm-meta-setting-desc.c:5383
 msgid "Bridge port priority [32]"
-msgstr "网桥端口优先级 [32]"
+msgstr "桥接端口优先级 [32]"
 
-#: ../clients/common/nm-meta-setting-desc.c:5612
+#: ../clients/common/nm-meta-setting-desc.c:5389
 msgid "Bridge port STP path cost [100]"
-msgstr "网桥端口 STP 路径开销 [100]"
+msgstr "桥接端口 STP 路径开销 [100]"
 
-#: ../clients/common/nm-meta-setting-desc.c:5618
+#: ../clients/common/nm-meta-setting-desc.c:5395
 msgid "Hairpin [no]"
 msgstr "Hairpin [否]"
 
-#: ../clients/common/nm-meta-setting-desc.c:5633
-#: ../clients/common/nm-meta-setting-desc.c:5998
-#: ../clients/common/nm-meta-setting-desc.c:7281
+#: ../clients/common/nm-meta-setting-desc.c:5410
+#: ../clients/common/nm-meta-setting-desc.c:5693
+#: ../clients/common/nm-meta-setting-desc.c:6920
 msgid "Username [none]"
 msgstr "用户名 [无]"
 
-#: ../clients/common/nm-meta-setting-desc.c:5736
+#: ../clients/common/nm-meta-setting-desc.c:5505
 msgid ""
 "Enter a list of user permissions. This is a list of user names formatted "
 "as:\n"
@@ -5230,12 +4887,12 @@ msgid ""
 "Example: alice bob charlie\n"
 msgstr ""
 "输入用户权限列表。这个列表的用户名格式为:\n"
-"  [user:]<用户名 1>, [user:]<用户名 2>,... \n"
+"  [user:]<user name 1>, [user:]<user name 2>,... \n"
 "使用逗号或者空格将名称分开。\n"
 "\n"
 "例如:alice bob charlie\n"
 
-#: ../clients/common/nm-meta-setting-desc.c:5778
+#: ../clients/common/nm-meta-setting-desc.c:5547
 msgid ""
 "Enter secondary connections that should be activated when this connection "
 "is\n"
@@ -5247,15 +4904,14 @@ msgid ""
 "\n"
 "Example: private-openvpn, fe6ba5d8-c2fc-4aae-b2e3-97efddd8d9a7\n"
 msgstr ""
-"输入当这个连接激活时应该被激活的次级连接。连接可用 UUID 或 ID(名称)指定。"
-"nmcli\n"
-"自动将名称地转换为 UUID。请注意,目前网络管理器(NetworkManager)只支持将 "
-"VPN 作为次级连接。\n"
-"这些输入项可用逗号或空格隔开。\n"
+"输入当这个连接激活时应该被激活的二级连接。连接可用\n"
+"UUID 或 ID(名称)指定。nmcli 将名称透明的转换为 UUID。\n"
+"请注意,目前 NetworkManager 只支持将 VPN 作为二级连接。\n"
+"这些项可用逗号或空格隔开。\n"
 "\n"
 "示例:private-openvpn, fe6ba5d8-c2fc-4aae-b2e3-97efddd8d9a7\n"
 
-#: ../clients/common/nm-meta-setting-desc.c:5795
+#: ../clients/common/nm-meta-setting-desc.c:5564
 msgid ""
 "Enter a value which indicates whether the connection is subject to a data\n"
 "quota, usage costs or other limitations. Accepted options are:\n"
@@ -5265,29 +4921,29 @@ msgid ""
 msgstr ""
 "输入的值表示连接是否有数据配额、使用成本或其他限制。\n"
 "可接受的选项是:\n"
-"\"true\"、\"yes\"、\"on\",设置连接为计算流量的\n"
-"\"false\"、\"no\"、\"off\",设置连接为不计流量的\n"
-"\"unknown\",让网络管理器(NetworkManager)使用一些启发式算法来选择值\n"
+"'true','yes','on',设置连接为可度量的\n"
+"'false','no','off',设置连接为不可度量的\n"
+"'unknown', 让 NetworkManager 使用一些启发式算法选择值\n"
 
-#: ../clients/common/nm-meta-setting-desc.c:6015
+#: ../clients/common/nm-meta-setting-desc.c:5710
 msgid "APN"
 msgstr "APN"
 
-#: ../clients/common/nm-meta-setting-desc.c:6067
-#: ../clients/common/nm-meta-setting-desc.c:7454
-#: ../clients/common/nm-meta-setting-desc.c:7600
+#: ../clients/common/nm-meta-setting-desc.c:5762
+#: ../clients/common/nm-meta-setting-desc.c:7093
+#: ../clients/common/nm-meta-setting-desc.c:7239
 msgid "MTU [auto]"
 msgstr "MTU [自动]"
 
-#: ../clients/common/nm-meta-setting-desc.c:6086
+#: ../clients/common/nm-meta-setting-desc.c:5781
 msgid "P_KEY [none]"
 msgstr "P_KEY [无]"
 
-#: ../clients/common/nm-meta-setting-desc.c:6095
+#: ../clients/common/nm-meta-setting-desc.c:5790
 msgid "Parent interface [none]"
 msgstr "上级接口 [无]"
 
-#: ../clients/common/nm-meta-setting-desc.c:6118
+#: ../clients/common/nm-meta-setting-desc.c:5813
 msgid ""
 "Enter a list of IPv4 addresses of DNS servers.\n"
 "\n"
@@ -5297,11 +4953,11 @@ msgstr ""
 "\n"
 "示例:8.8.8.8, 8.8.4.4\n"
 
-#: ../clients/common/nm-meta-setting-desc.c:6150
+#: ../clients/common/nm-meta-setting-desc.c:5845
 msgid "IPv4 address (IP[/plen]) [none]"
-msgstr "IPv4 地址(IP[/plen])[无]"
+msgstr "IPv4 地址 (IP[/plen]) [无]"
 
-#: ../clients/common/nm-meta-setting-desc.c:6152
+#: ../clients/common/nm-meta-setting-desc.c:5847
 msgid ""
 "Enter a list of IPv4 addresses formatted as:\n"
 "  ip[/prefix], ip[/prefix],...\n"
@@ -5315,11 +4971,11 @@ msgstr ""
 "\n"
 "示例:192.168.1.5/24, 10.0.0.11/24\n"
 
-#: ../clients/common/nm-meta-setting-desc.c:6165
+#: ../clients/common/nm-meta-setting-desc.c:5860
 msgid "IPv4 gateway [none]"
 msgstr "IPv4 网关 [无]"
 
-#: ../clients/common/nm-meta-setting-desc.c:6173
+#: ../clients/common/nm-meta-setting-desc.c:5868
 msgid ""
 "Enter a list of IPv4 routes formatted as:\n"
 "  ip[/prefix] [next-hop] [metric],...\n"
@@ -5335,12 +4991,12 @@ msgstr ""
 "  ip[/prefix] [next-hop] [metric],...\n"
 "缺少前缀则默认为 32。\n"
 "缺少 next-hop 则默认为 0.0.0.0。\n"
-"缺少跃点数则使用默认值(NM/kernel 将设置默认值)。\n"
+"缺少度量衡则使用默认值(NM/kernel 将设置默认值)。\n"
 "\n"
 "示例:192.168.2.0/24 192.168.2.1 3, 10.1.0.0/16 10.0.0.254\n"
-"      10.1.2.0/24\n"
+"          10.1.2.0/24\n"
 
-#: ../clients/common/nm-meta-setting-desc.c:6275
+#: ../clients/common/nm-meta-setting-desc.c:5970
 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 "
@@ -5351,18 +5007,18 @@ msgid ""
 "\n"
 "Example: 2607:f0d0:1002:51::4, 2607:f0d0:1002:51::1\n"
 msgstr ""
-"输入 DNS 服务器的 IPv6 地址列表。如果 IPv6 配置方法为 \"auto\",这些 DNS 服务"
-"器将附加到哪些自动配置返回的地址中(如果有)。DNS 服务器不能使用 \"shared\" "
-"或者 \"link-local\" IPv6 配置方法,因为它们不是上游网络。在所有其他 IPv6 配置"
-"方法中,这些 DNS 服务器可作为这个连接的唯一 DNS 服务器。\n"
+"输入 DNS 服务器的 IPv6 地址列表。如果 IPv6 配置方法为 “auto”,这些 DNS 服务器"
+"将附加到哪些自动配置返回的地址中(如果有)。DNS 服务器不能使用 “shared” 或者 "
+"“link-local” IPv6 配置方法,因为它们不是上游网络。在所有其他 IPv6 配置方法"
+"中,这些 DNS 服务器可作为这个连接的唯一 DNS 服务器。\n"
 "\n"
 "示例:2607:f0d0:1002:51::4, 2607:f0d0:1002:51::1\n"
 
-#: ../clients/common/nm-meta-setting-desc.c:6313
+#: ../clients/common/nm-meta-setting-desc.c:6008
 msgid "IPv6 address (IP[/plen]) [none]"
-msgstr "IPv6 地址(IP[/plen])[无]"
+msgstr "IPv6 地址 (IP[/plen]) [无]"
 
-#: ../clients/common/nm-meta-setting-desc.c:6315
+#: ../clients/common/nm-meta-setting-desc.c:6010
 msgid ""
 "Enter a list of IPv6 addresses formatted as:\n"
 "  ip[/prefix], ip[/prefix],...\n"
@@ -5376,11 +5032,11 @@ msgstr ""
 "\n"
 "示例:2607:f0d0:1002:51::4/64, 1050:0:0:0:5:600:300c:326b\n"
 
-#: ../clients/common/nm-meta-setting-desc.c:6328
+#: ../clients/common/nm-meta-setting-desc.c:6023
 msgid "IPv6 gateway [none]"
 msgstr "IPv6 网关 [无]"
 
-#: ../clients/common/nm-meta-setting-desc.c:6336
+#: ../clients/common/nm-meta-setting-desc.c:6031
 msgid ""
 "Enter a list of IPv6 routes formatted as:\n"
 "  ip[/prefix] [next-hop] [metric],...\n"
@@ -5396,395 +5052,370 @@ msgstr ""
 "输入 IPv6 路由列表,格式为:\n"
 "  ip[/prefix] [next-hop] [metric],...\n"
 "缺少前缀则默认为 128。\n"
-"缺少 next-hop 则默认为 \"::\"。\n"
-"缺少跃点数则使用默认值(NM/kernel 将设置默认值)。\n"
+"缺少 next-hop 则默认为  \"::\"。\n"
+"缺少度量衡则使用默认值(NM/kernel 将设置默认值)。\n"
 "\n"
 "示例:2001:db8:beef:2::/64 2001:db8:beef::2, 2001:db8:beef:3::/64 2001:db8:"
 "beef::3 2\n"
-"      abbe::/64 55\n"
+"          abbe::/64 55\n"
 
-#: ../clients/common/nm-meta-setting-desc.c:6441
-#: ../clients/common/nm-meta-setting-desc.c:7314
+#: ../clients/common/nm-meta-setting-desc.c:6124
+#: ../clients/common/nm-meta-setting-desc.c:6953
 msgid "Parent device [none]"
 msgstr "上级设备 [无]"
 
-#: ../clients/common/nm-meta-setting-desc.c:6447
+#: ../clients/common/nm-meta-setting-desc.c:6130
 msgid "Local endpoint [none]"
-msgstr "本地端点 [无]"
+msgstr "本地端点 (endpoint) [无]"
 
-#: ../clients/common/nm-meta-setting-desc.c:6454
-#: ../clients/common/nm-meta-setting-desc.c:7334
+#: ../clients/common/nm-meta-setting-desc.c:6137
+#: ../clients/common/nm-meta-setting-desc.c:6973
 msgid "Remote"
 msgstr "远程"
 
-#: ../clients/common/nm-meta-setting-desc.c:6499
+#: ../clients/common/nm-meta-setting-desc.c:6174
 msgid "MACsec parent device or connection UUID"
-msgstr "MACsec 上级设备或连接 UUID"
+msgstr ""
 
-#: ../clients/common/nm-meta-setting-desc.c:6520
+#: ../clients/common/nm-meta-setting-desc.c:6195
 msgid "Enable encryption [yes]"
-msgstr "启用加密 [是]"
+msgstr ""
 
-#: ../clients/common/nm-meta-setting-desc.c:6526
-#: ../clients/common/nm-secret-agent-simple.c:534
+#: ../clients/common/nm-meta-setting-desc.c:6201
+#: ../clients/common/nm-secret-agent-simple.c:523
 msgid "MKA CAK"
-msgstr "MKA CAK"
+msgstr ""
 
-#: ../clients/common/nm-meta-setting-desc.c:6536
+#: ../clients/common/nm-meta-setting-desc.c:6211
 msgid "MKA_CKN"
-msgstr "MKA_CKN"
+msgstr ""
 
-#: ../clients/common/nm-meta-setting-desc.c:6542
+#: ../clients/common/nm-meta-setting-desc.c:6217
 msgid "SCI port [1]"
-msgstr "SCI 端口 [1]"
+msgstr ""
 
-#: ../clients/common/nm-meta-setting-desc.c:6568
+#: ../clients/common/nm-meta-setting-desc.c:6240
 msgid "MACVLAN parent device or connection UUID"
 msgstr "MACVLAN 上级设备或连接 UUID"
 
-#: ../clients/common/nm-meta-setting-desc.c:6589
+#: ../clients/common/nm-meta-setting-desc.c:6261
 msgid "Tap [no]"
-msgstr "Tap [否]"
+msgstr ""
 
-#: ../clients/common/nm-meta-setting-desc.c:6615
-#: ../clients/common/nm-meta-setting-desc.c:7521
+#: ../clients/common/nm-meta-setting-desc.c:6274
+#: ../clients/common/nm-meta-setting-desc.c:7160
 #: ../clients/tui/nmt-page-wifi.c:224
 msgid "SSID"
 msgstr "SSID"
 
-#: ../clients/common/nm-meta-setting-desc.c:6624
+#: ../clients/common/nm-meta-setting-desc.c:6283
 msgid "OLPC Mesh channel [1]"
-msgstr "OLPC Mesh 信道 [1]"
+msgstr "OLPC Mesh 频道 [1]"
 
-#: ../clients/common/nm-meta-setting-desc.c:6633
+#: ../clients/common/nm-meta-setting-desc.c:6292
 msgid "DHCP anycast MAC address [none]"
 msgstr "DHCP 任意广播 MAC 地址 [无]"
 
-#: ../clients/common/nm-meta-setting-desc.c:6645
+#: ../clients/common/nm-meta-setting-desc.c:6304
 msgid "PPPoE parent device"
-msgstr "PPPoE 上级设备"
+msgstr ""
 
-#: ../clients/common/nm-meta-setting-desc.c:6651
+#: ../clients/common/nm-meta-setting-desc.c:6310
 msgid "Service [none]"
 msgstr "服务 [无]"
 
-#: ../clients/common/nm-meta-setting-desc.c:6658
+#: ../clients/common/nm-meta-setting-desc.c:6317
 msgid "PPPoE username"
 msgstr "PPPoE 用户名"
 
-#: ../clients/common/nm-meta-setting-desc.c:6832
+#: ../clients/common/nm-meta-setting-desc.c:6491
+#, fuzzy
 msgid "Browser only [no]"
-msgstr "仅浏览器 [否]"
+msgstr "仅浏览器"
 
-#: ../clients/common/nm-meta-setting-desc.c:6838
+#: ../clients/common/nm-meta-setting-desc.c:6497
+#, fuzzy
 msgid "PAC URL"
-msgstr "PAC URL"
+msgstr "PAC Url"
 
-#: ../clients/common/nm-meta-setting-desc.c:6844
+#: ../clients/common/nm-meta-setting-desc.c:6503
+#, fuzzy
 msgid "PAC script"
 msgstr "PAC 脚本"
 
-#: ../clients/common/nm-meta-setting-desc.c:6879
-#: ../clients/common/nm-meta-setting-desc.c:7028
+#: ../clients/common/nm-meta-setting-desc.c:6538
+#: ../clients/common/nm-meta-setting-desc.c:6686
 msgid "Team JSON configuration [none]"
-msgstr "组合 JSON 配置 [无]"
+msgstr "群组 JSON 配置 [无]:"
 
-#: ../clients/common/nm-meta-setting-desc.c:7184
+#: ../clients/common/nm-meta-setting-desc.c:6823
 msgid "User ID [none]"
 msgstr "用户 ID [无]"
 
-#: ../clients/common/nm-meta-setting-desc.c:7190
+#: ../clients/common/nm-meta-setting-desc.c:6829
+#, fuzzy
 msgid "Group ID [none]"
-msgstr "分组 ID [无]"
+msgstr "群组 ID [无]"
 
-#: ../clients/common/nm-meta-setting-desc.c:7196
+#: ../clients/common/nm-meta-setting-desc.c:6835
 msgid "Enable PI [no]"
 msgstr "启用 PI [否]"
 
-#: ../clients/common/nm-meta-setting-desc.c:7202
+#: ../clients/common/nm-meta-setting-desc.c:6841
 msgid "Enable VNET header [no]"
 msgstr "启用 VNET 首部 [否]"
 
-#: ../clients/common/nm-meta-setting-desc.c:7208
+#: ../clients/common/nm-meta-setting-desc.c:6847
 msgid "Enable multi queue [no]"
 msgstr "启用多队列 [否]"
 
-#: ../clients/common/nm-meta-setting-desc.c:7221
+#: ../clients/common/nm-meta-setting-desc.c:6860
 msgid "VLAN parent device or connection UUID"
 msgstr "VLAN 上级设备或连接 UUID"
 
-#: ../clients/common/nm-meta-setting-desc.c:7228
+#: ../clients/common/nm-meta-setting-desc.c:6867
 msgid "VLAN ID (<0-4094>)"
 msgstr "VLAN ID <0-4095>"
 
-#: ../clients/common/nm-meta-setting-desc.c:7234
+#: ../clients/common/nm-meta-setting-desc.c:6873
 msgid "VLAN flags (<0-7>) [none]"
-msgstr "VLAN 标记(<0-7>)[无]"
+msgstr "VLAN 标志 (<0-7>) [无]"
 
-#: ../clients/common/nm-meta-setting-desc.c:7243
+#: ../clients/common/nm-meta-setting-desc.c:6882
 msgid "Ingress priority maps [none]"
 msgstr "入口优先级映射 [无]"
 
-#: ../clients/common/nm-meta-setting-desc.c:7253
+#: ../clients/common/nm-meta-setting-desc.c:6892
 msgid "Egress priority maps [none]"
 msgstr "出口优先级映射 [无]"
 
-#: ../clients/common/nm-meta-setting-desc.c:7321
+#: ../clients/common/nm-meta-setting-desc.c:6960
 msgid "VXLAN ID"
 msgstr "VXLAN ID"
 
-#: ../clients/common/nm-meta-setting-desc.c:7327
+#: ../clients/common/nm-meta-setting-desc.c:6966
 msgid "Local address [none]"
 msgstr "本地地址 [无]"
 
-#: ../clients/common/nm-meta-setting-desc.c:7340
+#: ../clients/common/nm-meta-setting-desc.c:6979
 msgid "Minimum source port [0]"
 msgstr "最小来源端口 [0]"
 
-#: ../clients/common/nm-meta-setting-desc.c:7346
+#: ../clients/common/nm-meta-setting-desc.c:6985
 msgid "Maximum source port [0]"
 msgstr "最大来源端口 [0]"
 
-#: ../clients/common/nm-meta-setting-desc.c:7352
+#: ../clients/common/nm-meta-setting-desc.c:6991
 msgid "Destination port [8472]"
 msgstr "目标端口 [8472]"
 
-#: ../clients/common/nm-meta-setting-desc.c:7398
+#: ../clients/common/nm-meta-setting-desc.c:7037
 msgid "WiMAX NSP name"
 msgstr "WiMAX NSP 名称"
 
-#: ../clients/common/nm-meta-setting-desc.c:7435
-#: ../clients/common/nm-meta-setting-desc.c:7571
+#: ../clients/common/nm-meta-setting-desc.c:7074
+#: ../clients/common/nm-meta-setting-desc.c:7210
 msgid "Cloned MAC [none]"
 msgstr "克隆的 MAC 地址 [无]"
 
-#: ../clients/common/nm-meta-setting-desc.c:7462
+#: ../clients/common/nm-meta-setting-desc.c:7101
 msgid ""
 "Enter a list of subchannels (comma or space separated).\n"
 "\n"
 "Example: 0.0.0e20 0.0.0e21 0.0.0e22\n"
 msgstr ""
-"输入子通道列表(用逗号或者空格分开)。\n"
+"输入子频道列表(用逗号或者空格分开)。\n"
 "\n"
 "示例:0.0.0e20 0.0.0e21 0.0.0e22\n"
 
-#: ../clients/common/nm-meta-setting-desc.c:7730
+#: ../clients/common/nm-meta-setting-desc.c:7355
 msgid ""
 "Enter the type of WEP keys. The accepted values are: 0 or unknown, 1 or key, "
 "and 2 or passphrase.\n"
 msgstr ""
-"输入 WEP 密钥类型。可接受的值为:0 或者 unknown、1 或者 key, 以及 2 或者 "
+"输入 WEP 密钥类型。可接受的值为:0 或者 unknown, 1 或者 key, 以及 2 或者 "
 "passphrase。\n"
 
-#: ../clients/common/nm-meta-setting-desc.c:7792
-msgid "Short address (<0x0000-0xffff>)"
-msgstr "短地址(<0x0000-0xffff>)"
-
-#: ../clients/common/nm-meta-setting-desc.c:7808
-msgid "PAN Identifier (<0x0000-0xffff>)"
-msgstr "PAN 标识符(<0x0000-0xffff>)"
-
-#: ../clients/common/nm-meta-setting-desc.c:7830
-msgid "IEEE 802.15.4 (WPAN) parent device or connection UUID"
-msgstr "IEEE 802.15.4(WPAN)上级设备或连接的 UUID"
-
 #. ***************************************************************************
-#: ../clients/common/nm-meta-setting-desc.c:7957
+#: ../clients/common/nm-meta-setting-desc.c:7515
 msgid "802-1x settings"
-msgstr "802-1x 设置"
+msgstr ""
 
-#: ../clients/common/nm-meta-setting-desc.c:7958
-#: ../src/devices/adsl/nm-device-adsl.c:133
+#: ../clients/common/nm-meta-setting-desc.c:7516
+#: ../src/devices/adsl/nm-device-adsl.c:137
 msgid "ADSL connection"
 msgstr "ADSL 连接"
 
-#: ../clients/common/nm-meta-setting-desc.c:7959
+#: ../clients/common/nm-meta-setting-desc.c:7517
 msgid "bluetooth connection"
 msgstr "蓝牙连接"
 
-#: ../clients/common/nm-meta-setting-desc.c:7960
+#: ../clients/common/nm-meta-setting-desc.c:7518
+#, fuzzy
 msgid "Bond device"
-msgstr "绑定设备"
+msgstr "以太网设备"
 
-#: ../clients/common/nm-meta-setting-desc.c:7961
+#: ../clients/common/nm-meta-setting-desc.c:7519
 msgid "Bridge device"
-msgstr "网桥设备"
+msgstr "桥接设备"
 
-#: ../clients/common/nm-meta-setting-desc.c:7962
+#: ../clients/common/nm-meta-setting-desc.c:7520
 msgid "Bridge port"
-msgstr "网桥端口"
+msgstr "桥接端口"
 
-#: ../clients/common/nm-meta-setting-desc.c:7963
+#: ../clients/common/nm-meta-setting-desc.c:7521
 msgid "CDMA mobile broadband connection"
 msgstr "CDMA 移动宽带连接"
 
-#: ../clients/common/nm-meta-setting-desc.c:7964
+#: ../clients/common/nm-meta-setting-desc.c:7522
 msgid "General settings"
-msgstr "常规设置"
+msgstr ""
 
-#: ../clients/common/nm-meta-setting-desc.c:7965
+#: ../clients/common/nm-meta-setting-desc.c:7523
 msgid "DCB settings"
-msgstr "DCB 设置"
+msgstr ""
 
-#: ../clients/common/nm-meta-setting-desc.c:7966
+#: ../clients/common/nm-meta-setting-desc.c:7524
 msgid "Dummy settings"
-msgstr "虚拟设置"
-
-#: ../clients/common/nm-meta-setting-desc.c:7967
-msgid "Ethtool settings"
-msgstr "Ethtool 设置"
+msgstr ""
 
-#: ../clients/common/nm-meta-setting-desc.c:7968
+#: ../clients/common/nm-meta-setting-desc.c:7525
 msgid "Generic settings"
-msgstr "通用设置"
+msgstr ""
 
-#: ../clients/common/nm-meta-setting-desc.c:7969
+#: ../clients/common/nm-meta-setting-desc.c:7526
 msgid "GSM mobile broadband connection"
 msgstr "GSM 移动宽带连接"
 
-#: ../clients/common/nm-meta-setting-desc.c:7970
-#: ../src/devices/nm-device-infiniband.c:170
+#: ../clients/common/nm-meta-setting-desc.c:7527
+#: ../src/devices/nm-device-infiniband.c:192
 msgid "InfiniBand connection"
 msgstr "InfiniBand 连接"
 
-#: ../clients/common/nm-meta-setting-desc.c:7971
+#: ../clients/common/nm-meta-setting-desc.c:7528
 msgid "IPv4 protocol"
 msgstr "IPv4 协议"
 
-#: ../clients/common/nm-meta-setting-desc.c:7972
+#: ../clients/common/nm-meta-setting-desc.c:7529
 msgid "IPv6 protocol"
 msgstr "IPv6 协议"
 
-#: ../clients/common/nm-meta-setting-desc.c:7973
+#: ../clients/common/nm-meta-setting-desc.c:7530
 msgid "IP-tunnel settings"
-msgstr "IP 隧道设置"
+msgstr ""
 
-#: ../clients/common/nm-meta-setting-desc.c:7974
+#: ../clients/common/nm-meta-setting-desc.c:7531
 msgid "MACsec connection"
 msgstr "MACsec 连接"
 
-#: ../clients/common/nm-meta-setting-desc.c:7975
+#: ../clients/common/nm-meta-setting-desc.c:7532
 msgid "macvlan connection"
 msgstr "macvlan 连接"
 
-#: ../clients/common/nm-meta-setting-desc.c:7976
-msgid "Match"
-msgstr "匹配"
-
-#: ../clients/common/nm-meta-setting-desc.c:7977
+#: ../clients/common/nm-meta-setting-desc.c:7533
 msgid "OLPC Mesh connection"
 msgstr "OLPC Mesh 连接"
 
-#: ../clients/common/nm-meta-setting-desc.c:7978
+#: ../clients/common/nm-meta-setting-desc.c:7534
 msgid "OpenVSwitch bridge settings"
-msgstr "OpenVSwitch 网桥设置"
+msgstr ""
 
-#: ../clients/common/nm-meta-setting-desc.c:7979
+#: ../clients/common/nm-meta-setting-desc.c:7535
 msgid "OpenVSwitch interface settings"
-msgstr "OpenVSwitch 接口设置"
+msgstr ""
 
-#: ../clients/common/nm-meta-setting-desc.c:7980
+#: ../clients/common/nm-meta-setting-desc.c:7536
 msgid "OpenVSwitch patch interface settings"
-msgstr "OpenVSwitch 插线接口设置"
+msgstr ""
 
-#: ../clients/common/nm-meta-setting-desc.c:7981
+#: ../clients/common/nm-meta-setting-desc.c:7537
 msgid "OpenVSwitch port settings"
-msgstr "OpenVSwitch 端口设置"
+msgstr ""
 
-#: ../clients/common/nm-meta-setting-desc.c:7982
+#: ../clients/common/nm-meta-setting-desc.c:7538
 msgid "PPP settings"
-msgstr "PPP 设置"
+msgstr ""
 
-#: ../clients/common/nm-meta-setting-desc.c:7983
+#: ../clients/common/nm-meta-setting-desc.c:7539
 msgid "PPPoE"
 msgstr "PPPoE"
 
-#: ../clients/common/nm-meta-setting-desc.c:7984
+#: ../clients/common/nm-meta-setting-desc.c:7540
 msgid "Proxy"
 msgstr "代理"
 
-#: ../clients/common/nm-meta-setting-desc.c:7985
+#: ../clients/common/nm-meta-setting-desc.c:7541
 msgid "Serial settings"
-msgstr "串行设置"
-
-#: ../clients/common/nm-meta-setting-desc.c:7986
-#| msgid "802-1x settings"
-msgid "SR-IOV settings"
-msgstr "SR-IOV 设置"
+msgstr ""
 
-#: ../clients/common/nm-meta-setting-desc.c:7987
+#: ../clients/common/nm-meta-setting-desc.c:7542
 msgid "Traffic controls"
-msgstr "流量控制"
+msgstr ""
 
-#: ../clients/common/nm-meta-setting-desc.c:7988
+#: ../clients/common/nm-meta-setting-desc.c:7543
+#, fuzzy
 msgid "Team device"
-msgstr "组合设备"
+msgstr "TUN 设备模式"
 
-#: ../clients/common/nm-meta-setting-desc.c:7989
+#: ../clients/common/nm-meta-setting-desc.c:7544
+#, fuzzy
 msgid "Team port"
-msgstr "组合端口"
+msgstr "组队"
 
-#: ../clients/common/nm-meta-setting-desc.c:7990
+#: ../clients/common/nm-meta-setting-desc.c:7545
 msgid "Tun device"
 msgstr "Tun 设备"
 
-#: ../clients/common/nm-meta-setting-desc.c:7991
+#: ../clients/common/nm-meta-setting-desc.c:7546
 msgid "User settings"
-msgstr "用户设置"
+msgstr ""
 
-#: ../clients/common/nm-meta-setting-desc.c:7992
-#: ../src/devices/nm-device-vlan.c:400
+#: ../clients/common/nm-meta-setting-desc.c:7547
+#: ../src/devices/nm-device-vlan.c:394
 msgid "VLAN connection"
 msgstr "VLAN 连接"
 
-#: ../clients/common/nm-meta-setting-desc.c:7993 ../src/nm-manager.c:5126
+#: ../clients/common/nm-meta-setting-desc.c:7548 ../src/nm-manager.c:4277
 msgid "VPN connection"
 msgstr "VPN 连接"
 
-#: ../clients/common/nm-meta-setting-desc.c:7994
-#: ../src/devices/nm-device-vxlan.c:370
+#: ../clients/common/nm-meta-setting-desc.c:7549
+#: ../src/devices/nm-device-vxlan.c:331
 msgid "VXLAN connection"
 msgstr "VXLAN 连接"
 
-#: ../clients/common/nm-meta-setting-desc.c:7995
+#: ../clients/common/nm-meta-setting-desc.c:7550
 msgid "WiMAX connection"
 msgstr "WiMAX 连接"
 
-#: ../clients/common/nm-meta-setting-desc.c:7996
+#: ../clients/common/nm-meta-setting-desc.c:7551
 msgid "Wired Ethernet"
 msgstr "有线以太网"
 
-#: ../clients/common/nm-meta-setting-desc.c:7997
+#: ../clients/common/nm-meta-setting-desc.c:7552
 msgid "Wi-Fi connection"
 msgstr "Wi-Fi 连接"
 
-#: ../clients/common/nm-meta-setting-desc.c:7998
+#: ../clients/common/nm-meta-setting-desc.c:7553
 msgid "Wi-Fi security settings"
-msgstr "Wi-Fi 安全设置"
-
-#: ../clients/common/nm-meta-setting-desc.c:7999
-msgid "WPAN settings"
-msgstr "WPAN 设置"
-
-#: ../clients/common/nm-meta-setting-desc.c:8000
-msgid "6LOWPAN settings"
-msgstr "6LOWPAN 设置"
+msgstr ""
 
-#: ../clients/common/nm-meta-setting-desc.c:8351
+#: ../clients/common/nm-meta-setting-desc.c:7870
+#, fuzzy
 msgid "name"
-msgstr "名称"
+msgstr "用户名"
 
-#: ../clients/common/nm-polkit-listener.c:239
+#: ../clients/common/nm-polkit-listener.c:212
 msgid "An authentication session is already underway."
 msgstr "验证会话已在进行。"
 
-#: ../clients/common/nm-secret-agent-simple.c:255
-#: ../clients/common/nm-secret-agent-simple.c:295
-#: ../clients/common/nm-secret-agent-simple.c:323
-#: ../clients/common/nm-secret-agent-simple.c:359
-#: ../clients/common/nm-secret-agent-simple.c:519
-#: ../clients/common/nm-secret-agent-simple.c:551
-#: ../clients/common/nm-secret-agent-simple.c:573
+#: ../clients/common/nm-secret-agent-simple.c:240
+#: ../clients/common/nm-secret-agent-simple.c:280
+#: ../clients/common/nm-secret-agent-simple.c:308
+#: ../clients/common/nm-secret-agent-simple.c:344
+#: ../clients/common/nm-secret-agent-simple.c:508
+#: ../clients/common/nm-secret-agent-simple.c:540
+#: ../clients/common/nm-secret-agent-simple.c:562
 #: ../clients/common/nm-vpn-helpers.c:119
 #: ../clients/common/nm-vpn-helpers.c:123
 #: ../clients/common/nm-vpn-helpers.c:129
@@ -5794,120 +5425,121 @@ msgstr "验证会话已在进行。"
 msgid "Password"
 msgstr "密码"
 
-#: ../clients/common/nm-secret-agent-simple.c:265
+#: ../clients/common/nm-secret-agent-simple.c:250
 msgid "Identity"
 msgstr "身份"
 
-#: ../clients/common/nm-secret-agent-simple.c:271
+#: ../clients/common/nm-secret-agent-simple.c:256
 msgid "Private key password"
 msgstr "私钥密码"
 
-#: ../clients/common/nm-secret-agent-simple.c:310
+#: ../clients/common/nm-secret-agent-simple.c:295
 #: ../clients/tui/nmt-page-wifi.c:289
 msgid "Key"
 msgstr "密钥"
 
-#: ../clients/common/nm-secret-agent-simple.c:353
+#: ../clients/common/nm-secret-agent-simple.c:338
 #: ../clients/tui/nmt-page-dsl.c:78
 msgid "Service"
 msgstr "服务"
 
-#: ../clients/common/nm-secret-agent-simple.c:484
+#: ../clients/common/nm-secret-agent-simple.c:469
 msgid "Authentication required by wireless network"
-msgstr "无线网络要求身份验证"
+msgstr "无线网络要求身份认证"
 
-#: ../clients/common/nm-secret-agent-simple.c:485
+#: ../clients/common/nm-secret-agent-simple.c:470
 #, c-format
 msgid ""
 "Passwords or encryption keys are required to access the wireless network "
 "'%s'."
-msgstr "需要密码或密钥来访问无线网络 \"%s\"。"
+msgstr "需要密码或密钥来访问无效网络“%s”。"
 
-#: ../clients/common/nm-secret-agent-simple.c:489
+#: ../clients/common/nm-secret-agent-simple.c:478
 msgid "Wired 802.1X authentication"
-msgstr "有线 802.1X 身份验证"
+msgstr "有线 802.1X 认证"
 
-#: ../clients/common/nm-secret-agent-simple.c:490
+#: ../clients/common/nm-secret-agent-simple.c:479
 #, c-format
 msgid "Secrets are required to access the wired network '%s'"
-msgstr "需要密钥来访问有线网络 \"%s\"。"
+msgstr ""
 
-#: ../clients/common/nm-secret-agent-simple.c:495
+#: ../clients/common/nm-secret-agent-simple.c:484
 msgid "DSL authentication"
-msgstr "DSL 身份验证"
+msgstr "DSL 认证"
 
-#: ../clients/common/nm-secret-agent-simple.c:496
+#: ../clients/common/nm-secret-agent-simple.c:485
 #, c-format
 msgid "Secrets are required for the DSL connection '%s'"
-msgstr "DSL 连接 \"%s\" 需要密钥。"
+msgstr ""
 
-#: ../clients/common/nm-secret-agent-simple.c:504
+#: ../clients/common/nm-secret-agent-simple.c:493
 msgid "PIN code required"
 msgstr "需要 PIN 码"
 
-#: ../clients/common/nm-secret-agent-simple.c:505
+#: ../clients/common/nm-secret-agent-simple.c:494
 msgid "PIN code is needed for the mobile broadband device"
 msgstr "移动宽带设备需要 PIN 码"
 
-#: ../clients/common/nm-secret-agent-simple.c:508
+#: ../clients/common/nm-secret-agent-simple.c:497
 msgid "PIN"
 msgstr "PIN"
 
-#: ../clients/common/nm-secret-agent-simple.c:514
-#: ../clients/common/nm-secret-agent-simple.c:546
-#: ../clients/common/nm-secret-agent-simple.c:568
+#: ../clients/common/nm-secret-agent-simple.c:503
+#: ../clients/common/nm-secret-agent-simple.c:535
+#: ../clients/common/nm-secret-agent-simple.c:557
 msgid "Mobile broadband network password"
 msgstr "移动宽带网络密码"
 
-#: ../clients/common/nm-secret-agent-simple.c:515
-#: ../clients/common/nm-secret-agent-simple.c:547
-#: ../clients/common/nm-secret-agent-simple.c:569
-#: ../clients/common/nm-secret-agent-simple.c:586
+#: ../clients/common/nm-secret-agent-simple.c:504
+#: ../clients/common/nm-secret-agent-simple.c:536
+#: ../clients/common/nm-secret-agent-simple.c:558
+#: ../clients/common/nm-secret-agent-simple.c:579
 #, c-format
 msgid "A password is required to connect to '%s'."
-msgstr "需要密码来连接到 \"%s\"。"
+msgstr "需要密码来连接到“%s”。"
 
-#: ../clients/common/nm-secret-agent-simple.c:528
+#: ../clients/common/nm-secret-agent-simple.c:517
 #, c-format
 msgid "Secrets are required to access the MACsec network '%s'"
-msgstr "需要密钥来访问 MACsec 网络 \"%s\"。"
+msgstr ""
 
-#: ../clients/common/nm-secret-agent-simple.c:532
+#: ../clients/common/nm-secret-agent-simple.c:521
 msgid "MACsec PSK authentication"
-msgstr "MACsec PSK 身份验证"
+msgstr ""
 
-#: ../clients/common/nm-secret-agent-simple.c:540
+#: ../clients/common/nm-secret-agent-simple.c:529
 msgid "MACsec EAP authentication"
-msgstr "MACsec EAP 身份验证"
+msgstr ""
 
-#: ../clients/common/nm-secret-agent-simple.c:581
+#: ../clients/common/nm-secret-agent-simple.c:574
 msgid "VPN password required"
-msgstr "需要 VPN 密码"
+msgstr "要求 VPN 密码"
 
 #: ../clients/common/nm-vpn-helpers.c:48
 #, c-format
 msgid "unknown VPN plugin \"%s\""
-msgstr "未知的 VPN 插件 \"%s\""
+msgstr "未知的 VPN 插件“%s”"
 
 #: ../clients/common/nm-vpn-helpers.c:59
 #, c-format
 msgid "cannot load legacy-only VPN plugin \"%s\" for \"%s\""
-msgstr "无法为 \"%2$s\" 加载旧版限定的 VPN 插件 \"%1$s\""
+msgstr ""
 
 #: ../clients/common/nm-vpn-helpers.c:64
 #, c-format
 msgid ""
 "cannot load VPN plugin \"%s\" due to missing \"%s\". Missing client plugin?"
-msgstr "由于缺少 \"%2$s\",无法加载 VPN 插件 \"%1$s\"。缺少客户端插件?"
+msgstr ""
 
 #: ../clients/common/nm-vpn-helpers.c:69
-#, c-format
+#, fuzzy, c-format
 msgid "failed to load VPN plugin \"%s\": %s"
-msgstr "加载 VPN 插件 \"%s\" 失败:%s"
+msgstr "错误:加载 VPN 插件失败:%s。"
 
 #: ../clients/common/nm-vpn-helpers.c:124
+#, fuzzy
 msgid "Certificate password"
-msgstr "证书密码"
+msgstr "私钥密码"
 
 #: ../clients/common/nm-vpn-helpers.c:125
 msgid "HTTP proxy password"
@@ -5929,34 +5561,70 @@ msgstr "Cookie"
 
 #: ../clients/common/nm-vpn-helpers.c:141
 msgid "Gateway certificate hash"
-msgstr "网关证书散列"
+msgstr "网关证书哈希"
 
 #. Generated file. Do not edit.
-#: ../clients/common/settings-docs.h.in:3
-msgid ""
-"If given, specifies the parent interface name or parent connection UUID from "
-"which this 6LowPAN interface should be created."
-msgstr ""
-"如果给定了,其指定 6LowPAN 接口应被创建在上级接口名称或上级连接的 UUID。"
-
-#: ../clients/common/settings-docs.h.in:4
+#: ../clients/common/settings-docs.c.in:3
 msgid "Channel on which the mesh network to join is located."
-msgstr "已位于要加入的 Mesh 网络信道。"
+msgstr ""
 
-#: ../clients/common/settings-docs.h.in:5
+#: ../clients/common/settings-docs.c.in:4
 msgid ""
 "Anycast DHCP MAC address used when requesting an IP address via DHCP. The "
 "specific anycast address used determines which DHCP server class answers the "
 "request."
 msgstr ""
-"通过 DHCP 请求 IP 时使用的任意广播 DHCP MAC 地址。使用的指定任播地址决定了哪"
-"个 DHCP 服务器来回复请求。"
 
-#: ../clients/common/settings-docs.h.in:6
+#: ../clients/common/settings-docs.c.in:5
+#: ../clients/common/settings-docs.c.in:18
+#: ../clients/common/settings-docs.c.in:30
+#: ../clients/common/settings-docs.c.in:57
+#: ../clients/common/settings-docs.c.in:96
+#: ../clients/common/settings-docs.c.in:105
+#: ../clients/common/settings-docs.c.in:113
+#: ../clients/common/settings-docs.c.in:115
+#: ../clients/common/settings-docs.c.in:124
+#: ../clients/common/settings-docs.c.in:128
+#: ../clients/common/settings-docs.c.in:132
+#: ../clients/common/settings-docs.c.in:148
+#: ../clients/common/settings-docs.c.in:165
+#: ../clients/common/settings-docs.c.in:174
+#: ../clients/common/settings-docs.c.in:175
+#: ../clients/common/settings-docs.c.in:180
+#: ../clients/common/settings-docs.c.in:192
+#: ../clients/common/settings-docs.c.in:202
+#: ../clients/common/settings-docs.c.in:225
+#: ../clients/common/settings-docs.c.in:246
+#: ../clients/common/settings-docs.c.in:257
+#: ../clients/common/settings-docs.c.in:262
+#: ../clients/common/settings-docs.c.in:268
+#: ../clients/common/settings-docs.c.in:271
+#: ../clients/common/settings-docs.c.in:273
+#: ../clients/common/settings-docs.c.in:279
+#: ../clients/common/settings-docs.c.in:289
+#: ../clients/common/settings-docs.c.in:301
+#: ../clients/common/settings-docs.c.in:309
+#: ../clients/common/settings-docs.c.in:314
+#: ../clients/common/settings-docs.c.in:318
+#: ../clients/common/settings-docs.c.in:325
+#: ../clients/common/settings-docs.c.in:342
+#: ../clients/common/settings-docs.c.in:349
+#: ../clients/common/settings-docs.c.in:354
+#: ../clients/common/settings-docs.c.in:359
+#: ../clients/common/settings-docs.c.in:362
+#: ../clients/common/settings-docs.c.in:376
+#: ../clients/common/settings-docs.c.in:386
+msgid ""
+"The setting's name, which uniquely identifies the setting within the "
+"connection.  Each setting type has a name unique to that type, for example "
+"\"ppp\" or \"wireless\" or \"wired\"."
+msgstr ""
+
+#: ../clients/common/settings-docs.c.in:6
 msgid "SSID of the mesh network to join."
-msgstr "要加入的 mesh 网络的 SSID。"
+msgstr ""
 
-#: ../clients/common/settings-docs.h.in:7
+#: ../clients/common/settings-docs.c.in:7
 msgid ""
 "802.11 frequency band of the network.  One of \"a\" for 5GHz 802.11a or \"bg"
 "\" for 2.4GHz 802.11.  This will lock associations to the Wi-Fi network to "
@@ -5965,32 +5633,24 @@ msgid ""
 "compatible.  This setting depends on specific driver capability and may not "
 "work with all drivers."
 msgstr ""
-"网络的 802.11 频段。一个 \"a\" 代表 5GHz 802.11a 或 \"bg\" 代表 2.4GHz "
-"802.11。这将锁定关联的 Wi-Fi 网络到特定的频段,比如指定了 \"a\",设备就不会关"
-"联在 2.4GHz 内的相同网络,不管网络设置是否兼容。此设置取决于具体驱动的功能,"
-"且可能不是全部的驱动都有效。"
 
-#: ../clients/common/settings-docs.h.in:8
+#: ../clients/common/settings-docs.c.in:8
 msgid ""
 "If specified, directs the device to only associate with the given access "
 "point.  This capability is highly driver dependent and not supported by all "
 "devices.  Note: this property does not control the BSSID used when creating "
 "an Ad-Hoc network and is unlikely to in the future."
 msgstr ""
-"如果指定了,则指定设备只关联给定的接入点。此功能依赖于驱动,并非所有设备都支"
-"持。注意:此属性不会控制创建 Ad-Hoc 网络时使用的 BSSID,将来也不会。"
 
-#: ../clients/common/settings-docs.h.in:9
+#: ../clients/common/settings-docs.c.in:9
 msgid ""
 "Wireless channel to use for the Wi-Fi connection.  The device will only join "
 "(or create for Ad-Hoc networks) a Wi-Fi network on the specified channel.  "
 "Because channel numbers overlap between bands, this property also requires "
 "the \"band\" property to be set."
 msgstr ""
-"用于 Wi-Fi 连接的无线信道。设备将只在指定的信道上加入(或创建 Ad-Hoc 网络)"
-"Wi-Fi 网络。因为信道号码在不同频段间重复,此属性也需要设定 \"band\" 属性。"
 
-#: ../clients/common/settings-docs.h.in:10
+#: ../clients/common/settings-docs.c.in:10
 msgid ""
 "If specified, request that the device use this MAC address instead. This is "
 "known as MAC cloning or spoofing. Beside explicitly specifying a MAC "
@@ -6005,17 +5665,9 @@ msgid ""
 "different default value). On D-Bus, this field is expressed as \"assigned-"
 "mac-address\" or the deprecated \"cloned-mac-address\"."
 msgstr ""
-"如指定了,则请求该设备使用此 MAC 地址来代替。这个可被称为 MAC 克隆或欺骗。除"
-"了明确地指定 MAC 地址,也支持 \"preserve\"、\"permanent\"、\"random\" 和 "
-"\"stable\" 等特殊值。\"preserve\" 表示激活时不动 MAC 地址。\"permanent\" 使用"
-"设备的永久硬件地址。\"random\" 则在每个连接上创建随机的 MAC 地址。\"stable\" "
-"则根据 connection.stable-id 和机器相关密钥创建散列的 MAC 地址。如未指定,该值"
-"可被全局默认值覆盖,参见 NetworkManager.conf 的手册。如还未指定,它就默认为 "
-"\"preserve\"(旧版 NetworkManager 可能使用不同的默认值)。在 D-Bus 上, 此字段"
-"表示为 \"assigned-mac-address\" 或已弃用的 \"cloned-mac-address\"。"
 
-#: ../clients/common/settings-docs.h.in:11
-#: ../clients/common/settings-docs.h.in:91
+#: ../clients/common/settings-docs.c.in:11
+#: ../clients/common/settings-docs.c.in:92
 msgid ""
 "With \"cloned-mac-address\" setting \"random\" or \"stable\", by default all "
 "bits of the MAC address are scrambled and a locally-administered, unicast "
@@ -6041,55 +5693,31 @@ msgid ""
 "create a fully scrambled MAC address, randomly locally or globally "
 "administered."
 msgstr ""
-"\"cloned-mac-address\" 设置为 \"random\" 或 \"stable\" 时,按默认 MAC 地址的"
-"所有位都被扰乱,并创建一个本地管理的单播 MAC 地址。 此属性允许指定某些位为固"
-"定的。请注意,第一个 MAC 地址的最低有效位始终未被设置以创建单播MAC地址。如果"
-"属性为 NULL,它可以被默认的连接设置覆盖。如果该值还是 NULL 或为空字符串,默认"
-"值就为创建一个本地管理的单播 MAC 地址。如果该值包含一个 MAC 地址,此地址用作"
-"掩码。掩码的设置位将以设备的当前 MAC 地址填充,而未设置位将随机化。设为 \"FE:"
-"FF:FF:00:00:00\" 表示保留当前 MAC 地址的 OUI 且使用 \"random\" 或 \"stable\" "
-"算法只随机最低三位。如果该值在掩码后包含一个附加的 MAC 地址,使用此地址来代替"
-"当前的 MAC 地址去填充那些不应该随机的位。示例,值 \"FE:FF:FF:00:00:00 68:"
-"F7:28:00:00:00\" 将设定 MAC 地址的 OUI 为  68:F7:28,而更低位随机化。值 "
-"\"02:00:00:00:00:00 00:00:00:00:00:00\" 将创建完全扰乱的全局管理烧录的 MAC 地"
-"址。如果值包含多个附加 MAC 地址,就随机选择其中一个。示"
-"例,\"02:00:00:00:00:00 00:00:00:00:00:00 02:00:00:00:00:00\" 将创建完全扰乱"
-"的 MAC 地址,随机地选择本地或全局管理。"
-
-#: ../clients/common/settings-docs.h.in:12
+
+#: ../clients/common/settings-docs.c.in:12
 msgid ""
 "If TRUE, indicates this network is a non-broadcasting network that hides its "
 "SSID.  In this case various workarounds may take place, such as probe-"
 "scanning the SSID for more reliable network discovery.  However, these "
 "workarounds expose inherent insecurities with hidden SSID networks, and thus "
-"hidden SSID networks should be used with caution. Note that marking the "
-"network as hidden may be a privacy issue for you, as the explicit probe-"
-"scans may be distinctly recognizable on the air."
+"hidden SSID networks should be used with caution."
 msgstr ""
-"如为 TRUE,表明此网络是个隐藏了它 SSID 的非广播网络。这种情况下,可以采用多种"
-"解决方法,比如探测扫描 SSID 以获得更可靠的网络发现。但是,这些解决方法也暴露"
-"了隐藏 SSID 网络的固有的不安全性,因此应该谨慎地使用隐藏 SSID 网络。注意标记"
-"网络为隐藏对于你可能是个隐私问题,因为明确的探测扫描在空中可能被清晰地识别。"
 
-#: ../clients/common/settings-docs.h.in:13
+#: ../clients/common/settings-docs.c.in:13
 msgid ""
 "If specified, this connection will only apply to the Wi-Fi device whose "
 "permanent MAC address matches. This property does not change the MAC address "
 "of the device (i.e. MAC spoofing)."
 msgstr ""
-"如指定了,此连接将只应用到符合永久 MAC 地址的 Wi-Fi 设备。此属性不会改变设备"
-"的 MAC 地址(例如 MAC 欺骗)。"
 
-#: ../clients/common/settings-docs.h.in:14
+#: ../clients/common/settings-docs.c.in:14
 msgid ""
 "A list of permanent MAC addresses of Wi-Fi devices to which this connection "
 "should never apply.  Each MAC address should be given in the standard hex-"
 "digits-and-colons notation (eg \"00:11:22:33:44:55\")."
 msgstr ""
-"Wi-Fi 设备的永久 MAC 地址列表,其地址此连接应该从不应用。每个 MAC 地址应给定"
-"为标准的十六进制数字和冒号的表示法(比如 \"00:11:22:33:44:55\")。"
 
-#: ../clients/common/settings-docs.h.in:15
+#: ../clients/common/settings-docs.c.in:15
 msgid ""
 "One of NM_SETTING_MAC_RANDOMIZATION_DEFAULT (0) (never randomize unless the "
 "user has set a global default to randomize and the supplicant supports "
@@ -6098,28 +5726,21 @@ msgid ""
 "the MAC address). This property is deprecated for 'cloned-mac-address'. "
 "Deprecated: 1"
 msgstr ""
-"NM_SETTING_MAC_RANDOMIZATION_DEFAULT (0)(从不随机化,除非用户设定了全局默认"
-"随机且请求方支持随机化)、NM_SETTING_MAC_RANDOMIZATION_NEVER (1)(从不随机化 "
-"MAC 地址)或 NM_SETTING_MAC_RANDOMIZATION_ALWAYS (2)(总是随机化 MAC 地址)之"
-"一。此属性已为 \"cloned-mac-address\" 所弃用。已弃用:1"
 
-#: ../clients/common/settings-docs.h.in:16
+#: ../clients/common/settings-docs.c.in:16
 msgid ""
 "Wi-Fi network mode; one of \"infrastructure\", \"adhoc\" or \"ap\".  If "
 "blank, infrastructure is assumed."
 msgstr ""
-"Wi-Fi 网络模式;\"infrastructure\"、\"adhoc\" 或 \"ap\" 之一。如果留空,假定"
-"为 infrastructure。"
 
-#: ../clients/common/settings-docs.h.in:17
-#: ../clients/common/settings-docs.h.in:94
+#: ../clients/common/settings-docs.c.in:17
+#: ../clients/common/settings-docs.c.in:95
 msgid ""
 "If non-zero, only transmit packets of the specified size or smaller, "
 "breaking larger packets up into multiple Ethernet frames."
 msgstr ""
-"如果非零,只传输指定大小或更小的数据包,将较大的数据包分成多个以太网帧。"
 
-#: ../clients/common/settings-docs.h.in:18
+#: ../clients/common/settings-docs.c.in:19
 msgid ""
 "One of NM_SETTING_WIRELESS_POWERSAVE_DISABLE (2) (disable Wi-Fi power "
 "saving), NM_SETTING_WIRELESS_POWERSAVE_ENABLE (3) (enable Wi-Fi power "
@@ -6127,23 +5748,16 @@ msgid ""
 "configure setting) or NM_SETTING_WIRELESS_POWERSAVE_DEFAULT (0) (use the "
 "globally configured value). All other values are reserved."
 msgstr ""
-"NM_SETTING_WIRELESS_POWERSAVE_DISABLE (2)(禁用 Wi-Fi 的节能模式)、 "
-"NM_SETTING_WIRELESS_POWERSAVE_ENABLE (3)(启用 Wi-Fi 的节能模式)、 "
-"NM_SETTING_WIRELESS_POWERSAVE_IGNORE (1)(不改变当前配置)或 "
-"NM_SETTING_WIRELESS_POWERSAVE_DEFAULT (0)(使用全局配置值)之一。所有其他值都"
-"保留。"
 
-#: ../clients/common/settings-docs.h.in:19
+#: ../clients/common/settings-docs.c.in:20
 msgid ""
 "If non-zero, directs the device to only use the specified bitrate for "
 "communication with the access point.  Units are in Kb/s, ie 5500 = 5.5 Mbit/"
 "s.  This property is highly driver dependent and not all devices support "
 "setting a static bitrate."
 msgstr ""
-"如果非零,指示设备仅使用指定的比特率与接入点进行通信。单位为 Kb/s,示例 "
-"5500=5.5 Mbit/s。此属性依赖于驱动,并非所有设备都支持设置静态比特率。"
 
-#: ../clients/common/settings-docs.h.in:20
+#: ../clients/common/settings-docs.c.in:21
 msgid ""
 "A list of BSSIDs (each BSSID formatted as a MAC address like "
 "\"00:11:22:33:44:55\") that have been detected as part of the Wi-Fi "
@@ -6151,53 +5765,19 @@ msgid ""
 "property is only meant for reading and reflects the BSSID list of "
 "NetworkManager. The changes you make to this property will not be preserved."
 msgstr ""
-"检测为 Wi-Fi 网络一部分的 BSSID 列表(每个 BSSID 格式化为如 "
-"\"00:11:22:33:44:55\" 的 MAC 地址)。网络管理器(NetworkManager)会内部追踪先"
-"前见过的 BSSID。此属性仅用于读取和显示网络管理器的 BSSID 列表。您对此属性所作"
-"的更改不会保留。"
 
-#: ../clients/common/settings-docs.h.in:21
+#: ../clients/common/settings-docs.c.in:22
 msgid "SSID of the Wi-Fi network. Must be specified."
-msgstr "Wi-Fi 网络的 SSID。必须指定。"
+msgstr ""
 
-#: ../clients/common/settings-docs.h.in:22
+#: ../clients/common/settings-docs.c.in:23
 msgid ""
 "If non-zero, directs the device to use the specified transmit power. Units "
 "are dBm.  This property is highly driver dependent and not all devices "
 "support setting a static transmit power."
 msgstr ""
-"如果非零,指示设备使用指定的传输功率。单位为 dBm。此属性依赖于驱动,并非所有"
-"设备都支持设置静态的传输功率。"
-
-#: ../clients/common/settings-docs.h.in:23
-msgid ""
-"The NMSettingWirelessWakeOnWLan options to enable. Not all devices support "
-"all options. May be any combination of NM_SETTING_WIRELESS_WAKE_ON_WLAN_ANY "
-"(0x2), NM_SETTING_WIRELESS_WAKE_ON_WLAN_DISCONNECT (0x4), "
-"NM_SETTING_WIRELESS_WAKE_ON_WLAN_MAGIC (0x8), "
-"NM_SETTING_WIRELESS_WAKE_ON_WLAN_GTK_REKEY_FAILURE (0x10), "
-"NM_SETTING_WIRELESS_WAKE_ON_WLAN_EAP_IDENTITY_REQUEST (0x20), "
-"NM_SETTING_WIRELESS_WAKE_ON_WLAN_4WAY_HANDSHAKE (0x40), "
-"NM_SETTING_WIRELESS_WAKE_ON_WLAN_RFKILL_RELEASE (0x80), "
-"NM_SETTING_WIRELESS_WAKE_ON_WLAN_TCP (0x100) or the special values "
-"NM_SETTING_WIRELESS_WAKE_ON_WLAN_DEFAULT (0x1) (to use global settings) and "
-"NM_SETTING_WIRELESS_WAKE_ON_WLAN_IGNORE (0x8000) (to disable management of "
-"Wake-on-LAN in NetworkManager)."
-msgstr ""
-"启用 NMSettingWiredWakeOnWLan 的选项。并非全部设备都支持所有选项。可以是以下"
-"选项的任意组合:NM_SETTING_WIRELESS_WAKE_ON_WLAN_ANY (0x2)、"
-"NM_SETTING_WIRELESS_WAKE_ON_WLAN_DISCONNECT (0x4)、"
-"NM_SETTING_WIRELESS_WAKE_ON_WLAN_MAGIC (0x8)、"
-"NM_SETTING_WIRELESS_WAKE_ON_WLAN_GTK_REKEY_FAILURE (0x10)、"
-"NM_SETTING_WIRELESS_WAKE_ON_WLAN_EAP_IDENTITY_REQUEST (0x20)、"
-"NM_SETTING_WIRELESS_WAKE_ON_WLAN_4WAY_HANDSHAKE (0x40)、"
-"NM_SETTING_WIRELESS_WAKE_ON_WLAN_RFKILL_RELEASE (0x80)、"
-"NM_SETTING_WIRELESS_WAKE_ON_WLAN_TCP (0x100) 或特殊值 "
-"NM_SETTING_WIRELESS_WAKE_ON_WLAN_DEFAULT (0x1)(使用全局默认值)和 "
-"NM_SETTING_WIRELESS_WAKE_ON_WLAN_IGNORE (0x8000)(在网络管理器"
-"(NetworkManager)中禁用 WLAN 唤醒的管理)。"
-
-#: ../clients/common/settings-docs.h.in:24
+
+#: ../clients/common/settings-docs.c.in:24
 msgid ""
 "When WEP is used (ie, key-mgmt = \"none\" or \"ieee8021x\") indicate the "
 "802.11 authentication algorithm required by the AP here.  One of \"open\" "
@@ -6205,84 +5785,48 @@ msgid ""
 "When using Cisco LEAP (ie, key-mgmt = \"ieee8021x\" and auth-alg = \"leap\") "
 "the \"leap-username\" and \"leap-password\" properties must be specified."
 msgstr ""
-"当时使用 WEP 时(示例,key-mgmt = \"none\" 或 \"ieee8021x\")表示接入点这里需"
-"要 802.11 验证算法。其中的 \"open\" 用于开放系统(Open System),\"shared\" "
-"用于共享密钥,而 \"leap\" 用于思科 LEAP。当使用思科 LEAP(示例,key-mgmt = "
-"\"ieee8021x\" 和 auth-alg = \"leap\")时,必须指定 \"leap-username\" 和 "
-"\"leap-password\" 属性。"
-
-#: ../clients/common/settings-docs.h.in:25
-msgid ""
-"Indicates whether Fast Initial Link Setup (802.11ai) must be enabled for the "
-"connection.  One of NM_SETTING_WIRELESS_SECURITY_FILS_DEFAULT (0) (use "
-"global default value), NM_SETTING_WIRELESS_SECURITY_FILS_DISABLE (1) "
-"(disable FILS), NM_SETTING_WIRELESS_SECURITY_FILS_OPTIONAL (2) (enable FILS "
-"if the supplicant and the access point support it) or "
-"NM_SETTING_WIRELESS_SECURITY_FILS_REQUIRED (3) (enable FILS and fail if not "
-"supported).  When set to NM_SETTING_WIRELESS_SECURITY_FILS_DEFAULT (0) and "
-"no global default is set, FILS will be optionally enabled."
-msgstr ""
-"指示链路是否为连接启用快速初始链路设置(FILS/802.11ai)。"
-"NM_SETTING_WIRELESS_SECURITY_FILS_DEFAULT (0)(使用全局默认值)、 "
-"NM_SETTING_WIRELESS_SECURITY_FILS_DISABLE (1)(禁用 FILS)、 "
-"NM_SETTING_WIRELESS_SECURITY_FILS_OPTIONAL (2)(如果请求方和接入点支持 FILS "
-"就启用)或 NM_SETTING_WIRELESS_SECURITY_FILS_REQUIRED (3)(启用 FILS,不支持"
-"就失败)之一。当设定为 NM_SETTING_WIRELESS_SECURITY_FILS_DEFAULT (0) 时且未设"
-"定全局默认值,FILS 将被选择启用。"
-
-#: ../clients/common/settings-docs.h.in:26
+
+#: ../clients/common/settings-docs.c.in:25
 msgid ""
 "A list of group/broadcast encryption algorithms which prevents connections "
 "to Wi-Fi networks that do not utilize one of the algorithms in the list.  "
 "For maximum compatibility leave this property empty.  Each list element may "
 "be one of \"wep40\", \"wep104\", \"tkip\", or \"ccmp\"."
 msgstr ""
-"组/广播加密算法列表,用来阻止连接到那些不使用列表中算法的 Wi-Fi 网络。为了最"
-"好的兼容性,可以让此属性留空。每个列表元素可以为 "
-"\"wep40\"、\"wep104\"、\"tkip\" 或 \"ccmp\" 中的一个。"
 
-#: ../clients/common/settings-docs.h.in:27
+#: ../clients/common/settings-docs.c.in:26
 msgid ""
 "Key management used for the connection.  One of \"none\" (WEP), \"ieee8021x"
 "\" (Dynamic WEP), \"wpa-none\" (Ad-Hoc WPA-PSK), \"wpa-psk\" (infrastructure "
 "WPA-PSK), or \"wpa-eap\" (WPA-Enterprise).  This property must be set for "
 "any Wi-Fi connection that uses security."
 msgstr ""
-"用于连接的密钥管理。\"none\"(WEP)、\"ieee8021x\"(动态 WEP)、\"wpa-none"
-"\"(Ad-Hoc WPA-PSK)、\"wpa-psk\"(基础结构 WPA-PSK)或 \"wpa-eap\"(WPA 企"
-"业)之一。对于使用安全保护的任何 Wi-Fi 连接,此属性必须设定。"
 
-#: ../clients/common/settings-docs.h.in:28
+#: ../clients/common/settings-docs.c.in:27
 msgid ""
 "The login password for legacy LEAP connections (ie, key-mgmt = \"ieee8021x\" "
 "and auth-alg = \"leap\")."
 msgstr ""
-"传统 LEAP 连接的登录密码(示例,key-mgmt = \"ieee8021x\" 和 auth-alg = \"leap"
-"\")。"
 
-#: ../clients/common/settings-docs.h.in:29
+#: ../clients/common/settings-docs.c.in:28
 msgid "Flags indicating how to handle the \"leap-password\" property."
-msgstr "指示如何处理 \"leap-password\" 属性的标志。"
+msgstr ""
 
-#: ../clients/common/settings-docs.h.in:30
+#: ../clients/common/settings-docs.c.in:29
 msgid ""
 "The login username for legacy LEAP connections (ie, key-mgmt = \"ieee8021x\" "
 "and auth-alg = \"leap\")."
 msgstr ""
-"传统 LEAP 连接的登录用户名(示例,key-mgmt = \"ieee8021x\" 和 auth-alg = "
-"\"leap\")。"
 
-#: ../clients/common/settings-docs.h.in:31
+#: ../clients/common/settings-docs.c.in:31
 msgid ""
 "A list of pairwise encryption algorithms which prevents connections to Wi-Fi "
 "networks that do not utilize one of the algorithms in the list. For maximum "
 "compatibility leave this property empty.  Each list element may be one of "
 "\"tkip\" or \"ccmp\"."
 msgstr ""
-"成对加密算法列表,用来阻止连接到那些不使用列表中算法的 Wi-Fi 网络。为了最好的"
-"兼容性,可以让此属性留空。每个列表元素可以为 \"tkip\" 或 \"ccmp\" 中的一个。"
 
-#: ../clients/common/settings-docs.h.in:32
+#: ../clients/common/settings-docs.c.in:32
 msgid ""
 "Indicates whether Protected Management Frames (802.11w) must be enabled for "
 "the connection.  One of NM_SETTING_WIRELESS_SECURITY_PMF_DEFAULT (0) (use "
@@ -6293,24 +5837,15 @@ msgid ""
 "supported).  When set to NM_SETTING_WIRELESS_SECURITY_PMF_DEFAULT (0) and no "
 "global default is set, PMF will be optionally enabled."
 msgstr ""
-"指示是否必须为连接启用受保护的管理帧(PMF/802.11w)。"
-"NM_SETTING_WIRELESS_SECURITY_PMF_DEFAULT (0)(使用全局默认值)、 "
-"NM_SETTING_WIRELESS_SECURITY_PMF_DISABLE (1)(禁用 PMF)、 "
-"NM_SETTING_WIRELESS_SECURITY_PMF_OPTIONAL (2)(如果请求方和接入点支持 PMF 就"
-"启用)或 NM_SETTING_WIRELESS_SECURITY_PMF_REQUIRED (3)(启用 PMF,不支持就失"
-"败)之一。当设定为 NM_SETTING_WIRELESS_SECURITY_PMF_DEFAULT (0) 时且未设定全"
-"局默认值,PMF 将被选择启用。"
 
-#: ../clients/common/settings-docs.h.in:33
+#: ../clients/common/settings-docs.c.in:33
 msgid ""
 "List of strings specifying the allowed WPA protocol versions to use. Each "
 "element may be one \"wpa\" (allow WPA) or \"rsn\" (allow WPA2/RSN).  If not "
 "specified, both WPA and RSN connections are allowed."
 msgstr ""
-"字符串列表,指定允许使用的 WPA 协议版本。每个元素可以为 \"wpa\"(允许 WPA)"
-"或 \"rsn\"(允许 WPA2/RSN)中的一个。如果未指定,WPA 和 RSN 连接都允许。"
 
-#: ../clients/common/settings-docs.h.in:34
+#: ../clients/common/settings-docs.c.in:34
 msgid ""
 "Pre-Shared-Key for WPA networks.  If the key is 64-characters long, it must "
 "contain only hexadecimal characters and is interpreted as a hexadecimal WPA "
@@ -6319,24 +5854,18 @@ msgid ""
 "and is hashed to derive the actual WPA-PSK used when connecting to the Wi-Fi "
 "network."
 msgstr ""
-"用于 WPA 网络的预共享密钥。如果密钥时 64 字符长,它必须只能包含十六进制的字"
-"符,并且被解释为十六进制的 WPA 密钥。否则,该密钥必须在 8 到 63 ASCII 字符之"
-"间(如 802.11i 标准所规定)并被解释为 WPA 密码;而且当连接到 Wi-Fi 网络时,该"
-"密钥被散列以衍生实际的 WPA-PSK。"
 
-#: ../clients/common/settings-docs.h.in:35
+#: ../clients/common/settings-docs.c.in:35
 msgid "Flags indicating how to handle the \"psk\" property."
-msgstr "指示如何处理 \"psk\" 属性的标志。"
+msgstr ""
 
-#: ../clients/common/settings-docs.h.in:36
+#: ../clients/common/settings-docs.c.in:36
 msgid ""
 "Flags indicating how to handle the \"wep-key0\", \"wep-key1\", \"wep-key2\", "
 "and \"wep-key3\" properties."
 msgstr ""
-"指示如何处理 \"wep-key0\"、\"wep-key1\"、\"wep-key2\" 和 \"wep-key3\" 属性的"
-"标志。"
 
-#: ../clients/common/settings-docs.h.in:37
+#: ../clients/common/settings-docs.c.in:37
 msgid ""
 "Controls the interpretation of WEP keys.  Allowed values are "
 "NM_WEP_KEY_TYPE_KEY (1), in which case the key is either a 10- or 26-"
@@ -6345,55 +5874,40 @@ msgid ""
 "a string and will be hashed using the de-facto MD5 method to derive the "
 "actual WEP key."
 msgstr ""
-"控制 WEP 密钥的转义。允许的值有 NM_WEP_KEY_TYPE_KEY (1),此情况下密钥要么是 "
-"10 或 26 个字符长度的十六进制字符串,要么是 5 或 13 个字符长度的 ASCII 密码;"
-"还有 NM_WEP_KEY_TYPE_PASSPHRASE (2),此情况下密码以字符串提供,并使用事实上"
-"的 MD5 方法散列以衍生实际的 WEP 密钥。"
 
-#: ../clients/common/settings-docs.h.in:38
+#: ../clients/common/settings-docs.c.in:38
 msgid ""
 "Index 0 WEP key.  This is the WEP key used in most networks.  See the \"wep-"
 "key-type\" property for a description of how this key is interpreted."
 msgstr ""
-"索引 0 WEP 密钥。这个是在大多数网络下使用的 WEP 密钥。参见 \"wep-key-type\" "
-"属性获取解释该密钥的描述。"
 
-#: ../clients/common/settings-docs.h.in:39
+#: ../clients/common/settings-docs.c.in:39
 msgid ""
 "Index 1 WEP key.  This WEP index is not used by most networks.  See the "
 "\"wep-key-type\" property for a description of how this key is interpreted."
 msgstr ""
-"索引 1 WEP 密钥。此 WEP 索引不在大多数网络下使用。参见 \"wep-key-type\" 属性"
-"获取解释该密钥的描述。"
 
-#: ../clients/common/settings-docs.h.in:40
+#: ../clients/common/settings-docs.c.in:40
 msgid ""
 "Index 2 WEP key.  This WEP index is not used by most networks.  See the "
 "\"wep-key-type\" property for a description of how this key is interpreted."
 msgstr ""
-"索引 2 WEP 密钥。此 WEP 索引不在大多数网络下使用。参见 \"wep-key-type\" 属性"
-"获取解释该密钥的描述。"
 
-#: ../clients/common/settings-docs.h.in:41
+#: ../clients/common/settings-docs.c.in:41
 msgid ""
 "Index 3 WEP key.  This WEP index is not used by most networks.  See the "
 "\"wep-key-type\" property for a description of how this key is interpreted."
 msgstr ""
-"索引 3 WEP 密钥。此 WEP 索引不在大多数网络下使用。参见 \"wep-key-type\" 属性"
-"获取解释该密钥的描述。"
 
-#: ../clients/common/settings-docs.h.in:42
+#: ../clients/common/settings-docs.c.in:42
 msgid ""
 "When static WEP is used (ie, key-mgmt = \"none\") and a non-default WEP key "
 "index is used by the AP, put that WEP key index here.  Valid values are 0 "
 "(default key) through 3.  Note that some consumer access points (like the "
 "Linksys WRT54G) number the keys 1 - 4."
 msgstr ""
-"当使用静态 WEP 时(例如 key-mgmt = \"none\")并且接入点使用非默认的 WEP 密钥"
-"索引,在这里设置该 WEP 密钥索引。有效值从 0(默认密钥)到 3。注意有些用户接入"
-"点(如 Linksys WRT54G)编号密钥为 1~4。"
 
-#: ../clients/common/settings-docs.h.in:43
+#: ../clients/common/settings-docs.c.in:43
 msgid ""
 "Flags indicating which mode of WPS is to be used if any. There's little "
 "point in changing the default setting as NetworkManager will automatically "
@@ -6401,36 +5915,28 @@ msgid ""
 "Point capabilities. WPS can be disabled by setting this property to a value "
 "of 1."
 msgstr ""
-"指示使用哪种 WPS 模式(如果可用)的标志。由于网络管理器(NetworkManager)会自"
-"动从接入点功能确定启动 WPS 注册是否可行,因此改变默认设置几乎没有意义。可以通"
-"过设置此属性值为 1 来禁用 WPS。"
 
-#: ../clients/common/settings-docs.h.in:44
+#: ../clients/common/settings-docs.c.in:44
 msgid ""
 "List of strings to be matched against the altSubjectName of the certificate "
 "presented by the authentication server. If the list is empty, no "
 "verification of the server certificate's altSubjectName is performed."
 msgstr ""
-"字符串列表,将与验证服务器所提供证书里的 altSubjectName 匹配。如果列表为空,"
-"不执行服务器证书的 altSubjectName 验证。"
 
-#: ../clients/common/settings-docs.h.in:45
+#: ../clients/common/settings-docs.c.in:45
 msgid ""
 "Anonymous identity string for EAP authentication methods.  Used as the "
 "unencrypted identity with EAP types that support different tunneled identity "
 "like EAP-TTLS."
 msgstr ""
-"用于 EAP 验证方法的匿名标识字符串。用作支持不同隧道标识如 EAP-TTLS 的 EAP 类"
-"型的未加密标识。"
 
-#: ../clients/common/settings-docs.h.in:46
+#: ../clients/common/settings-docs.c.in:46
 msgid ""
 "A timeout for the authentication. Zero means the global default; if the "
 "global default is not set, the authentication timeout is 25 seconds."
 msgstr ""
-"身份验证的超时时间。零代表全局默认;如果全局默认未设定,验证超时为 25 秒。"
 
-#: ../clients/common/settings-docs.h.in:47
+#: ../clients/common/settings-docs.c.in:47
 msgid ""
 "Contains the CA certificate if used by the EAP method specified in the \"eap"
 "\" property. Certificate data is specified using a \"scheme\"; two are "
@@ -6442,36 +5948,26 @@ msgid ""
 "property can be unset even if the EAP method supports CA certificates, but "
 "this allows man-in-the-middle attacks and is NOT recommended."
 msgstr ""
-"包含 \"eap\" 属性指定的 EAP 方法所使用的 CA 证书,如果其使用了。证书数据用 "
-"\"scheme\" 指定;当前支持两种方案:比特块(blob)和路径。当使用比特块方案"
-"(与 NM 0.7.x 后向兼容)时,此属性应设定为证书的 DER 编码数据。当使用路径方案"
-"时,此属性应设定为证书的完整 UTF-8 编码路径,以字符串 \"file://\" 为前缀并以"
-"终止 NUL 字节结束。此属性可不设定,即使 EAP 方法支持 CA 证书,但这将允许中间"
-"人攻击因此不推荐。"
 
-#: ../clients/common/settings-docs.h.in:48
+#: ../clients/common/settings-docs.c.in:48
 msgid ""
 "The password used to access the CA certificate stored in \"ca-cert\" "
 "property. Only makes sense if the certificate is stored on a PKCS#11 token "
 "that requires a login."
 msgstr ""
-"用于访问 \"ca-cert\" 存储的 CA 证书的密码。只在 PKCS#11 令牌里存储的证书需要"
-"登录时有意义。"
 
-#: ../clients/common/settings-docs.h.in:49
+#: ../clients/common/settings-docs.c.in:49
 msgid "Flags indicating how to handle the \"ca-cert-password\" property."
-msgstr "指示如何处理 \"ca-cert-password\" 属性的标志。"
+msgstr ""
 
-#: ../clients/common/settings-docs.h.in:50
+#: ../clients/common/settings-docs.c.in:50
 msgid ""
 "UTF-8 encoded path to a directory containing PEM or DER formatted "
 "certificates to be added to the verification chain in addition to the "
 "certificate specified in the \"ca-cert\" property."
 msgstr ""
-"指向包含 PEM 或 DER 格式化证书目录的 UTF-8 编码路径,该证书将同 \"ca-cert\" "
-"属性里的指定证书一起添加到验证链。"
 
-#: ../clients/common/settings-docs.h.in:51
+#: ../clients/common/settings-docs.c.in:51
 msgid ""
 "Contains the client certificate if used by the EAP method specified in the "
 "\"eap\" property. Certificate data is specified using a \"scheme\"; two are "
@@ -6481,26 +5977,19 @@ msgid ""
 "should be set to the full UTF-8 encoded path of the certificate, prefixed "
 "with the string \"file://\" and ending with a terminating NUL byte."
 msgstr ""
-"包含 \"eap\" 属性指定的 EAP 方法所使用的客户端证书,如果其使用了。证书数据用 "
-"\"scheme\" 指定;当前支持两种方案:比特块(blob)和路径。当使用比特块方案"
-"(与 NM 0.7.x 后向兼容)时,此属性应设定为证书的 DER 编码数据。当使用路径方案"
-"时,此属性应设定为证书的完整 UTF-8 编码路径,以字符串 \"file://\" 为前缀并以"
-"终止 NUL 字节结束。"
 
-#: ../clients/common/settings-docs.h.in:52
+#: ../clients/common/settings-docs.c.in:52
 msgid ""
 "The password used to access the client certificate stored in \"client-cert\" "
 "property. Only makes sense if the certificate is stored on a PKCS#11 token "
 "that requires a login."
 msgstr ""
-"用于访问 \"client-cert\" 属性里存储的客户端证书的密码。只在 PKCS#11 令牌里存"
-"储的证书需要登录时有意义。"
 
-#: ../clients/common/settings-docs.h.in:53
+#: ../clients/common/settings-docs.c.in:53
 msgid "Flags indicating how to handle the \"client-cert-password\" property."
-msgstr "指示如何处理 \"client-cert-password\" 属性的标志。"
+msgstr ""
 
-#: ../clients/common/settings-docs.h.in:54
+#: ../clients/common/settings-docs.c.in:54
 msgid ""
 "Constraint for server domain name. If set, this FQDN is used as a suffix "
 "match requirement for dNSName element(s) of the certificate presented by the "
@@ -6508,11 +5997,8 @@ msgid ""
 "met.  If no dNSName values are present, this constraint is matched against "
 "SubjectName CN using same suffix match comparison."
 msgstr ""
-"服务器域名的约束。如果设定,此其 FQDN 用作后缀以匹配验证服务器所提供证书的 "
-"dNSName 元素需求。如果找到了匹配的 dNSName,此约束被满足。如果未提供 dNSName "
-"值,此约束用来匹配使用同个后缀匹配对比的 SubjectName CN。"
 
-#: ../clients/common/settings-docs.h.in:55
+#: ../clients/common/settings-docs.c.in:55
 msgid ""
 "The allowed EAP method to be used when authenticating to the network with "
 "802.1x.  Valid methods are: \"leap\", \"md5\", \"tls\", \"peap\", \"ttls\", "
@@ -6520,53 +6006,45 @@ msgid ""
 "the properties of this setting; refer to wpa_supplicant documentation for "
 "the allowed combinations."
 msgstr ""
-"当验证到 802.1x 网络时,所允许使用的 EAP 方法。有效方法有:\"leap"
-"\"、\"md5\"、\"tls\"、\"peap\"、\"ttls\"、\"pwd\" 和 \"fast\"。每种方法需要使"
-"用此设置属性的不同配置;请参考 wpa_supplicant 文档以获取允许的组合。"
 
-#: ../clients/common/settings-docs.h.in:56
+#: ../clients/common/settings-docs.c.in:56
 msgid ""
 "Identity string for EAP authentication methods.  Often the user's user or "
 "login name."
-msgstr "用于 EAP 验证方法的标识字符串。通常是用户的用户名或登录名。"
+msgstr ""
 
-#: ../clients/common/settings-docs.h.in:57
+#: ../clients/common/settings-docs.c.in:58
 msgid "UTF-8 encoded file path containing PAC for EAP-FAST."
-msgstr "UTF-8 编码的文件路径,包含用于 EAP-FAST 的 PAC。"
+msgstr ""
 
-#: ../clients/common/settings-docs.h.in:58
+#: ../clients/common/settings-docs.c.in:59
 msgid ""
 "UTF-8 encoded password used for EAP authentication methods. If both the "
 "\"password\" property and the \"password-raw\" property are specified, "
 "\"password\" is preferred."
 msgstr ""
-"用于 EAP 验证方法的 UTF-8 编码密码。如果 \"password\" 属性和 \"password-raw"
-"\" 属性都指定了,首选 \"password\"。"
 
-#: ../clients/common/settings-docs.h.in:59
-#: ../clients/common/settings-docs.h.in:104
-#: ../clients/common/settings-docs.h.in:127
-#: ../clients/common/settings-docs.h.in:173
-#: ../clients/common/settings-docs.h.in:285
+#: ../clients/common/settings-docs.c.in:60
+#: ../clients/common/settings-docs.c.in:107
+#: ../clients/common/settings-docs.c.in:135
+#: ../clients/common/settings-docs.c.in:184
+#: ../clients/common/settings-docs.c.in:304
 msgid "Flags indicating how to handle the \"password\" property."
-msgstr "指示如何处理 \"password\" 属性的标志。"
+msgstr ""
 
-#: ../clients/common/settings-docs.h.in:60
+#: ../clients/common/settings-docs.c.in:61
 msgid ""
 "Password used for EAP authentication methods, given as a byte array to allow "
 "passwords in other encodings than UTF-8 to be used. If both the \"password\" "
 "property and the \"password-raw\" property are specified, \"password\" is "
 "preferred."
 msgstr ""
-"用于 EAP 验证方法的密码,以字节数组给定以允许其他不是 UTF-8 编码的密码能够使"
-"用。如果 \"password\" 属性和 \"password-raw\" 属性都指定了,首选 \"password"
-"\"。"
 
-#: ../clients/common/settings-docs.h.in:61
+#: ../clients/common/settings-docs.c.in:62
 msgid "Flags indicating how to handle the \"password-raw\" property."
-msgstr "指示如何处理 \"password-raw\" 属性的标志。"
+msgstr ""
 
-#: ../clients/common/settings-docs.h.in:62
+#: ../clients/common/settings-docs.c.in:63
 msgid ""
 "Specifies authentication flags to use in \"phase 1\" outer authentication "
 "using NMSetting8021xAuthFlags options. The individual TLS versions can be "
@@ -6575,12 +6053,8 @@ msgid ""
 "tls_disable_tlsv1_x settings. See the wpa_supplicant documentation for more "
 "details."
 msgstr ""
-"指定 NMSetting8021xAuthFlags 选项使用的 \"phase 1\" 外部验证所要用的验证标"
-"识。可以明确地禁用个别 TLS 版本。如果未设定确切的 TLS 禁用标识,将由请求方决"
-"定允许还是禁止它。TLS 选项映射到 tls_disable_tlsv1_x 设置。详情请见 "
-"wpa_supplicant 文档。"
 
-#: ../clients/common/settings-docs.h.in:63
+#: ../clients/common/settings-docs.c.in:64
 msgid ""
 "Enables or disables in-line provisioning of EAP-FAST credentials when FAST "
 "is specified as the EAP method in the \"eap\" property. Recognized values "
@@ -6589,22 +6063,16 @@ msgid ""
 "authenticated and unauthenticated provisioning).  See the wpa_supplicant "
 "documentation for more details."
 msgstr ""
-"当 \"eap\" 属性里的 EAP 方法指定为 FAST 时,启用或禁用 EAP-FAST 凭据的行内设"
-"置。可识别的值有 \"0\"(禁用)、\"1\"(允许未验证的设置)、\"2\"(允许验证的"
-"设置)和 \"3\"(验证和未验证的设置都允许)。详情请见 wpa_supplicant 文档。"
 
-#: ../clients/common/settings-docs.h.in:64
+#: ../clients/common/settings-docs.c.in:65
 msgid ""
 "Forces use of the new PEAP label during key derivation.  Some RADIUS servers "
 "may require forcing the new PEAP label to interoperate with PEAPv1.  Set to "
 "\"1\" to force use of the new PEAP label.  See the wpa_supplicant "
 "documentation for more details."
 msgstr ""
-"强制在衍生密钥时使用新的 PEAP 标签。有些 RADIUS 服务器可能需要强制使用新的 "
-"PEAP 标签以与 PEAPv1 互操作。设为 \"1\" 以强制使用新的 PEAP 标签。详情请见 "
-"wpa_supplicant 文档。"
 
-#: ../clients/common/settings-docs.h.in:65
+#: ../clients/common/settings-docs.c.in:66
 msgid ""
 "Forces which PEAP version is used when PEAP is set as the EAP method in the "
 "\"eap\" property.  When unset, the version reported by the server will be "
@@ -6612,22 +6080,16 @@ msgid ""
 "the client to use a particular PEAP version.  To do so, this property may be "
 "set to \"0\" or \"1\" to force that specific PEAP version."
 msgstr ""
-"当 \"eap\" 属性里的 EAP 方法指定为 PEAP 时,强制所使用的 PEAP 版本。未设定"
-"时,将使用服务器报告的版本。有时使用旧的 RADIUS 服务器时,强制客户端使用特定"
-"的 PEAP 版本时必须的。要这么做,此属性可以设为 \"0\" 或 \"1\" 以强制所指定的 "
-"PEAP 版本。"
 
-#: ../clients/common/settings-docs.h.in:66
+#: ../clients/common/settings-docs.c.in:67
 msgid ""
 "List of strings to be matched against the altSubjectName of the certificate "
 "presented by the authentication server during the inner \"phase 2\" "
 "authentication. If the list is empty, no verification of the server "
 "certificate's altSubjectName is performed."
 msgstr ""
-"字符串列表,在 \"phase 2\" 验证期间将与验证服务器所提供证书里的 "
-"altSubjectName 匹配。如果列表为空,不执行服务器证书的 altSubjectName 验证。"
 
-#: ../clients/common/settings-docs.h.in:67
+#: ../clients/common/settings-docs.c.in:68
 msgid ""
 "Specifies the allowed \"phase 2\" inner non-EAP authentication methods when "
 "an EAP method that uses an inner TLS tunnel is specified in the \"eap\" "
@@ -6636,12 +6098,8 @@ msgid ""
 "\"phase 2\" inner method requires specific parameters for successful "
 "authentication; see the wpa_supplicant documentation for more details."
 msgstr ""
-"当 \"eap\" 属性指定了使用内部 TLS 隧道的 EAP 方法时,指定其允许的 \"phase "
-"2\" 内部非 EAP 验证方法。可识别的非 EAP \"phase 2\" 方法有 \"pap\"、\"chap"
-"\"、\"mschap\"、\"mschapv2\"、\"gtc\"、\"otp\"、\"md5\" 和 \"tls\"。要成功验"
-"证,每个 \"phase 2\" 内部方法都需要特定的参数;详情请见 wpa_supplicant 文档。"
 
-#: ../clients/common/settings-docs.h.in:68
+#: ../clients/common/settings-docs.c.in:69
 msgid ""
 "Specifies the allowed \"phase 2\" inner EAP-based authentication methods "
 "when an EAP method that uses an inner TLS tunnel is specified in the \"eap\" "
@@ -6650,12 +6108,8 @@ msgid ""
 "requires specific parameters for successful authentication; see the "
 "wpa_supplicant documentation for more details."
 msgstr ""
-"当 \"eap\" 属性指定了使用内部 TLS 隧道的 EAP 方法时,指定其允许的 \"phase "
-"2\" 内部基于 EAP 的验证方法。可识别的基于 EAP 的 \"phase 2\" 方法有 \"md5\", "
-"\"mschapv2\", \"otp\", \"gtc\", and \"tls\"。要成功验证,每个 \"phase 2\" 内"
-"部方法都需要特定的参数;详情请见 wpa_supplicant 文档。"
 
-#: ../clients/common/settings-docs.h.in:69
+#: ../clients/common/settings-docs.c.in:70
 msgid ""
 "Contains the \"phase 2\" CA certificate if used by the EAP method specified "
 "in the \"phase2-auth\" or \"phase2-autheap\" properties. Certificate data is "
@@ -6668,37 +6122,27 @@ msgid ""
 "method supports CA certificates, but this allows man-in-the-middle attacks "
 "and is NOT recommended."
 msgstr ""
-"包含 \"phase2-auth\" 或 \"phase2-autheap\" 属性指定的 EAP 方法所使用的 "
-"\"phase 2\" CA 证书,如果其使用了。证书数据用 \"scheme\" 指定;当前支持两种方"
-"案:比特块(blob)和路径。当使用比特块方案(与 NM 0.7.x 后向兼容)时,此属性"
-"应设定为证书的 DER 编码数据。当使用路径方案时,此属性应设定为证书的完整 "
-"UTF-8 编码路径,以字符串 \"file://\" 为前缀并以终止 NUL 字节结束。此属性可不"
-"设定,即使 EAP 方法支持 CA 证书,但这将允许中间人攻击因此不推荐。"
 
-#: ../clients/common/settings-docs.h.in:70
+#: ../clients/common/settings-docs.c.in:71
 msgid ""
 "The password used to access the \"phase2\" CA certificate stored in \"phase2-"
 "ca-cert\" property. Only makes sense if the certificate is stored on a "
 "PKCS#11 token that requires a login."
 msgstr ""
-"用于访问 \"phase2-ca-cert\" 属性里存储的 \"phase2\" CA 证书的密码。只在 "
-"PKCS#11 令牌里存储的证书需要登录时有意义。"
 
-#: ../clients/common/settings-docs.h.in:71
+#: ../clients/common/settings-docs.c.in:72
 msgid ""
 "Flags indicating how to handle the \"phase2-ca-cert-password\" property."
-msgstr "指示如何处理 \"phase2-ca-cert-password\" 属性的标志。"
+msgstr ""
 
-#: ../clients/common/settings-docs.h.in:72
+#: ../clients/common/settings-docs.c.in:73
 msgid ""
 "UTF-8 encoded path to a directory containing PEM or DER formatted "
 "certificates to be added to the verification chain in addition to the "
 "certificate specified in the \"phase2-ca-cert\" property."
 msgstr ""
-"指向包含 PEM 或 DER 格式化证书目录的 UTF-8 编码路径,该证书将同 \"phase2-ca-"
-"cert\" 属性里的指定证书一起添加到验证链。"
 
-#: ../clients/common/settings-docs.h.in:73
+#: ../clients/common/settings-docs.c.in:74
 msgid ""
 "Contains the \"phase 2\" client certificate if used by the EAP method "
 "specified in the \"phase2-auth\" or \"phase2-autheap\" properties. "
@@ -6711,28 +6155,20 @@ msgid ""
 "unset even if the EAP method supports CA certificates, but this allows man-"
 "in-the-middle attacks and is NOT recommended."
 msgstr ""
-"包含 \"phase2-auth\" 或 \"phase2-autheap\" 属性指定的 EAP 方法所使用的 "
-"\"phase 2\" 客户端证书,如果其使用了。证书数据用 \"scheme\" 指定;当前支持两"
-"种方案:比特块(blob)和路径。当使用比特块方案(与 NM 0.7.x 后向兼容)时,此"
-"属性应设定为证书的 DER 编码数据。当使用路径方案时,此属性应设定为证书的完整 "
-"UTF-8 编码路径,以字符串 \"file://\" 为前缀并以终止 NUL 字节结束。此属性可不"
-"设定,即使 EAP 方法支持 CA 证书,但这将允许中间人攻击因此不推荐。"
 
-#: ../clients/common/settings-docs.h.in:74
+#: ../clients/common/settings-docs.c.in:75
 msgid ""
 "The password used to access the \"phase2\" client certificate stored in "
 "\"phase2-client-cert\" property. Only makes sense if the certificate is "
 "stored on a PKCS#11 token that requires a login."
 msgstr ""
-"用于访问 \"phase2-client-cert\" 属性里存储的 \"phase2\" 客户端证书的密码。只"
-"在 PKCS#11 令牌里存储的证书需要登录时有意义。"
 
-#: ../clients/common/settings-docs.h.in:75
+#: ../clients/common/settings-docs.c.in:76
 msgid ""
 "Flags indicating how to handle the \"phase2-client-cert-password\" property."
-msgstr "指示如何处理 \"phase2-client-cert-password\" 属性的标志。"
+msgstr ""
 
-#: ../clients/common/settings-docs.h.in:76
+#: ../clients/common/settings-docs.c.in:77
 msgid ""
 "Constraint for server domain name. If set, this FQDN is used as a suffix "
 "match requirement for dNSName element(s) of the certificate presented by the "
@@ -6741,12 +6177,8 @@ msgid ""
 "present, this constraint is matched against SubjectName CN using same suffix "
 "match comparison."
 msgstr ""
-"服务器域名的约束。如果设定,在内部 \"phase 2\" 验证期间,此 FQDN 用作后缀以匹"
-"配验证服务器所提供证书的 dNSName 元素需求。如果找到了匹配的 dNSName,此约束被"
-"满足。如果未提供 dNSName 值,此约束用来匹配使用同个后缀匹配对比的 "
-"SubjectName CN。"
 
-#: ../clients/common/settings-docs.h.in:77
+#: ../clients/common/settings-docs.c.in:78
 msgid ""
 "Contains the \"phase 2\" inner private key when the \"phase2-auth\" or "
 "\"phase2-autheap\" property is set to \"tls\". Key data is specified using a "
@@ -6764,32 +6196,20 @@ msgid ""
 "\"phase2-private-key-password\" property must be set to the password used to "
 "decode the PKCS#12 private key and certificate."
 msgstr ""
-"包含如果 \"phase2-auth\" 或 \"phase2-autheap\" 属性设为 \"tls\" 时的 \"phase "
-"2\" 内部私钥。密钥数据用 \"scheme\" 指定;当前支持两种方案:比特块(blob)和"
-"路径。当使用比特块方案时,此属性应设定为私钥加密过的 PEM 编码数据。当使用路径"
-"方案时,此属性应设定为私钥的完整 UTF-8 编码路径,以字符串 \"file://\" 为前缀"
-"并以终止 NUL 字节结束。当使用 PKCS#12 格式私钥和比特块方案时,此属性应设为 "
-"PKCS#12 数据且 \"phase2-private-key-password\" 属性必须设为用于解密 PKCS#12 "
-"证书和私钥的密码。当使用 PKCS#12 文件和路径方案时,此属性应设为私钥的完整 "
-"UTF-8 编码路径,以字符串 \"file://\" 为前缀并以终止 NUL 字节结束;而与 blob "
-"方案同用时,\"phase2-private-key-password\" 属性必须设为用于解码 PKCS#12 私钥"
-"和证书的密码。"
 
-#: ../clients/common/settings-docs.h.in:78
+#: ../clients/common/settings-docs.c.in:79
 msgid ""
 "The password used to decrypt the \"phase 2\" private key specified in the "
 "\"phase2-private-key\" property when the private key either uses the path "
 "scheme, or is a PKCS#12 format key."
 msgstr ""
-"当私钥使用路径方案或为 PKCS#12 格式时,解密 \"phase2-private-key\" 属性指定"
-"的 \"phase 2\" 私钥所使用的密码。"
 
-#: ../clients/common/settings-docs.h.in:79
+#: ../clients/common/settings-docs.c.in:80
 msgid ""
 "Flags indicating how to handle the \"phase2-private-key-password\" property."
-msgstr "指示如何处理 \"phase2-private-key-password\" 属性的标志。"
+msgstr ""
 
-#: ../clients/common/settings-docs.h.in:80
+#: ../clients/common/settings-docs.c.in:81
 msgid ""
 "Substring to be matched against the subject of the certificate presented by "
 "the authentication server during the inner \"phase 2\" authentication. When "
@@ -6797,20 +6217,17 @@ msgid ""
 "performed.  This property provides little security, if any, and its use is "
 "deprecated in favor of NMSetting8021x:phase2-domain-suffix-match."
 msgstr ""
-"主题字符串,在 \"phase 2\" 验证期间将与验证服务器所提供证书的主题匹配。如果未"
-"设,不执行服务器证书的主题验证。就算设定了此属性也提供不了多少安全性,而且它"
-"的使用已废弃,取代的是 NMSetting8021x:phase2-domain-suffix-match。"
 
-#: ../clients/common/settings-docs.h.in:81
+#: ../clients/common/settings-docs.c.in:82
 msgid "PIN used for EAP authentication methods."
-msgstr "用于 EAP 验证方法的 PIN。"
+msgstr ""
 
-#: ../clients/common/settings-docs.h.in:82
-#: ../clients/common/settings-docs.h.in:175
+#: ../clients/common/settings-docs.c.in:83
+#: ../clients/common/settings-docs.c.in:186
 msgid "Flags indicating how to handle the \"pin\" property."
-msgstr "指示如何处理 \"pin\" 属性的标志。"
+msgstr ""
 
-#: ../clients/common/settings-docs.h.in:83
+#: ../clients/common/settings-docs.c.in:84
 msgid ""
 "Contains the private key when the \"eap\" property is set to \"tls\". Key "
 "data is specified using a \"scheme\"; two are currently supported: blob and "
@@ -6831,32 +6248,19 @@ msgid ""
 "users.  Private keys should always be encrypted with a private key password "
 "to prevent unauthorized access to unencrypted private key data."
 msgstr ""
-"包含如果 \"eap\" 属性设为 \"tls\" 时的私钥。私钥数据用 \"scheme\" 指定;当前"
-"支持两种方案:比特块(blob)和路径。当使用比特块方案时,此属性应设为私钥加密"
-"过的 PEM 编码数据。当使用路径方案时,此属性应设定为私钥的完整 UTF-8 编码路"
-"径,以字符串 \"file://\" 为前缀并以终止 NUL 字节结束。当使用 PKCS#12 格式私钥"
-"和比特块方案时,此属性应设为 PKCS#12 数据且 \"private-key-password\" 属性必须"
-"设为用于解密 PKCS#12 证书和私钥的密码。当使用 PKCS#12 文件和路径方案时,此属"
-"性应设为私钥的完整 UTF-8 编码路径,以字符串 \"file://\" 为前缀并以终止 NUL 字"
-"节结束;而与比特块方案同用时,\"private-key-password\" 属性必须设为用于解码 "
-"PKCS#12 私钥和证书的密码。警告:\"private-key\" 不是 \"secret\" 属性,因此使"
-"用比特块方案时未加密的私钥数据可能会被非特权用户读取。私钥总是应该用私钥密码"
-"加密以阻止对未加密私钥数据的未授权访问。"
 
-#: ../clients/common/settings-docs.h.in:84
+#: ../clients/common/settings-docs.c.in:85
 msgid ""
 "The password used to decrypt the private key specified in the \"private-key"
 "\" property when the private key either uses the path scheme, or if the "
 "private key is a PKCS#12 format key."
 msgstr ""
-"当私钥使用路径方案或为 PKCS#12 格式时,解密 \"private-key\" 属性指定私钥所使"
-"用的密码。"
 
-#: ../clients/common/settings-docs.h.in:85
+#: ../clients/common/settings-docs.c.in:86
 msgid "Flags indicating how to handle the \"private-key-password\" property."
-msgstr "指示如何处理 \"private-key-password\" 属性的标志。"
+msgstr ""
 
-#: ../clients/common/settings-docs.h.in:86
+#: ../clients/common/settings-docs.c.in:87
 msgid ""
 "Substring to be matched against the subject of the certificate presented by "
 "the authentication server. When unset, no verification of the authentication "
@@ -6864,11 +6268,8 @@ msgid ""
 "security, if any, and its use is deprecated in favor of NMSetting8021x:"
 "domain-suffix-match."
 msgstr ""
-"主题字符串,将与验证服务器所提供证书的主题匹配。如果未设,不执行服务器证书的"
-"主题验证。就算设定了此属性也提供不了多少安全性,而且它的使用已废弃,取代的是 "
-"NMSetting8021x:domain-suffix-match。"
 
-#: ../clients/common/settings-docs.h.in:87
+#: ../clients/common/settings-docs.c.in:88
 msgid ""
 "When TRUE, overrides the \"ca-path\" and \"phase2-ca-path\" properties using "
 "the system CA directory specified at configure time with the --system-ca-"
@@ -6879,28 +6280,15 @@ msgid ""
 "\"ca-cert\" and \"phase2-ca-cert\" properties instead (sets ca_cert/ca_cert2 "
 "options for wpa_supplicant)."
 msgstr ""
-"设为 TRUE 时,覆盖掉 \"ca-path\" 和 \"phase2-ca-path\" 属性,换成使用配置时 "
-"--system-ca-path 指定的系统 CA 目录。该目录中的证书同 \"ca-cert\" 和 "
-"\"phase2-ca-cert\" 属性指定的任何证书一起加入到验证链。如果以 --system-ca-"
-"path 提供的路径不是文件名(捆绑或受信任 CA 证书),它会变成覆盖 \"ca-cert\" "
-"和 \"phase2-ca-cert\" 属性(为 wpa_supplicant 设定 ca_cert/ca_cert2 选项)。"
 
-#: ../clients/common/settings-docs.h.in:88
+#: ../clients/common/settings-docs.c.in:89
 msgid ""
-"When TRUE, enforce auto-negotiation of speed and duplex mode. If \"speed\" "
-"and \"duplex\" properties are both specified, only that single mode will be "
-"advertised and accepted during the link auto-negotiation process: this works "
-"only for BASE-T 802.3 specifications and is useful for enforcing gigabits "
-"modes, as in these cases link negotiation is mandatory. When FALSE, \"speed"
-"\" and \"duplex\" properties should be both set or link configuration will "
-"be skipped."
+"If TRUE, enforce auto-negotiation of port speed and duplex mode.  If FALSE, "
+"\"speed\" and \"duplex\" properties should be both set or link configuration "
+"will be skipped."
 msgstr ""
-"为 TRUE 时,强制速度和双工模式的自动协商。如果 \"speed\" 和 \"duplex\" 属性都"
-"指定了,只有那一个模式会在链路自动协商过程中被通告和接受:这只对 BASE-T "
-"802.3 规范有效并用于强制吉比特模式,因为在这些情况下链路协商时强制性的。为 "
-"FALSE 时,\"speed\" 和 \"duplex\" 属性应该都设置,否则链路配置将被忽略。"
 
-#: ../clients/common/settings-docs.h.in:89
+#: ../clients/common/settings-docs.c.in:90
 msgid ""
 "If specified, request that the device use this MAC address instead. This is "
 "known as MAC cloning or spoofing. Beside explicitly specifying a MAC "
@@ -6916,87 +6304,52 @@ msgid ""
 "D-Bus, this field is expressed as \"assigned-mac-address\" or the deprecated "
 "\"cloned-mac-address\"."
 msgstr ""
-"如果指定了,则请求设备改成使用此 MAC 地址。这被称为 MAC 克隆或欺骗。除了明确"
-"地指定个 MAC 地址,也支持特殊值 \"preserve\"、\"permanent\"、\"random\" 和 "
-"\"stable\"。\"preserve\" 表示激活时不动 MAC 地址。\"permanent\" 表示如果设备"
-"有永久硬件地址则使用(否则视为 \"preserve\")。\"random\" 会在每次连接时创建"
-"个随机的 MAC 地址。\"stable\" 根据 connection.stable-id 和机器相关的密钥创建"
-"个散列的 MAC 地址。如果未指定,其值可被全局默认值覆盖,参阅 NetworkManager."
-"conf 手册。如仍未指定,它将默认为 \"preserve\"(旧版 NetworkManager 可能使用"
-"不同的默认值)。在 D-Bus 上,此字段表示为 \"assigned-mac-address\" 或已弃用"
-"的 \"cloned-mac-address\"。"
-
-#: ../clients/common/settings-docs.h.in:90
-msgid ""
-"When a value is set, either \"half\" or \"full\", configures the device to "
-"use the specified duplex mode. If \"auto-negotiate\" is \"yes\" the "
-"specified duplex mode will be the only one advertised during link "
-"negotiation: this works only for BASE-T 802.3 specifications and is useful "
-"for enforcing gigabits modes, as in these cases link negotiation is "
-"mandatory. If the value is unset (the default), the link configuration will "
-"be either skipped (if \"auto-negotiate\" is \"no\", the default) or will be "
-"auto-negotiated (if \"auto-negotiate\" is \"yes\") and the local device will "
-"advertise all the supported duplex modes. Must be set together with the "
-"\"speed\" property if specified. Before specifying a duplex mode be sure "
-"your device supports it."
-msgstr ""
-"设定值时,\"half\" 和 \"full\" 二选一,配置设备要使用的指定双工模式。如果 "
-"\"auto-negotiate\" 为 \"yes\",只有指定的模式会在链路自动协商过程中被通告:这"
-"只对 BASE-T 802.3 规范有效并用于强制吉比特模式,因为在这些情况下链路协商时强"
-"制性的。如果值未设定(默认值),链路配置要么将被忽略(如果 \"auto-negotiate"
-"\" 为 \"no\",默认值)要么将被自动协商(如果 \"auto-negotiate\" 为 \"yes"
-"\"),并且本地设备将通告所有支持的双工模式。如果指定,必须与 \"speed\" 属性一"
-"块设定。在指定双工模式前请确保您的设备支持。"
-
-#: ../clients/common/settings-docs.h.in:92
+
+#: ../clients/common/settings-docs.c.in:91
+msgid ""
+"Can be specified only when \"auto-negotiate\" is \"off\". In that case, "
+"statically configures the device to use that specified duplex mode, either "
+"\"half\" or \"full\". Must be set together with the \"speed\" property if "
+"specified. Before specifying a duplex mode be sure your device supports it."
+msgstr ""
+
+#: ../clients/common/settings-docs.c.in:93
 msgid ""
 "If specified, this connection will only apply to the Ethernet device whose "
 "permanent MAC address matches. This property does not change the MAC address "
 "of the device (i.e. MAC spoofing)."
 msgstr ""
-"如果指定了,此连接将只应用到其永久 MAC 地址匹配的以太网设备。此属性不会改变设"
-"备的 MAC 地址(例如 MAC 欺骗)。"
 
-#: ../clients/common/settings-docs.h.in:93
+#: ../clients/common/settings-docs.c.in:94
 msgid ""
 "If specified, this connection will never apply to the Ethernet device whose "
 "permanent MAC address matches an address in the list.  Each MAC address is "
 "in the standard hex-digits-and-colons notation (00:11:22:33:44:55)."
 msgstr ""
-"如果指定了,此连接将从不应用到其永久 MAC 地址与列表里的地址匹配的以太网设备。"
-"每个 MAC 地址采用标准的十六进制数字和冒号标记(00:11:22:33:44:55)。"
 
-#: ../clients/common/settings-docs.h.in:95
+#: ../clients/common/settings-docs.c.in:97
 msgid ""
 "Specific port type to use if the device supports multiple attachment "
 "methods.  One of \"tp\" (Twisted Pair), \"aui\" (Attachment Unit Interface), "
 "\"bnc\" (Thin Ethernet) or \"mii\" (Media Independent Interface). If the "
 "device supports only one port type, this setting is ignored."
 msgstr ""
-"如果设备支持多个连接方法,指定其使用的端口类型。\"tp\"(双绞线)、\"aui\"(连"
-"接单元接口)、\"bnc\"(细以太网)或 \"mii\"(介质无关接口)之一。如果设备只支"
-"持一个端口类型,忽略此设置。"
 
-#: ../clients/common/settings-docs.h.in:96
+#: ../clients/common/settings-docs.c.in:98
 msgid ""
 "s390 network device type; one of \"qeth\", \"lcs\", or \"ctc\", representing "
 "the different types of virtual network devices available on s390 systems."
 msgstr ""
-"s390 网络设备类型;\"qeth\"、\"lcs\" 或 \"ctc\" 之一,代表 s390 系统上可用的"
-"不同虚拟网络设备。"
 
-#: ../clients/common/settings-docs.h.in:97
+#: ../clients/common/settings-docs.c.in:99
 msgid ""
 "Dictionary of key/value pairs of s390-specific device options.  Both keys "
 "and values must be strings.  Allowed keys include \"portno\", \"layer2\", "
 "\"portname\", \"protocol\", among others.  Key names must contain only "
 "alphanumeric characters (ie, [a-zA-Z0-9])."
 msgstr ""
-"s390 特定设备的键值对字典。键和值都必须为字符串。允许的值包括 \"portno"
-"\"、\"layer2\"、\"portname\"、\"protocol\" 等等。键名必须只能包含字母数字字符"
-"(例如 [a-zA-Z0-9])。"
 
-#: ../clients/common/settings-docs.h.in:98
+#: ../clients/common/settings-docs.c.in:100
 msgid ""
 "Identifies specific subchannels that this network device uses for "
 "communication with z/VM or s390 host.  Like the \"mac-address\" property for "
@@ -7005,34 +6358,17 @@ msgid ""
 "contain exactly 3 strings, and each string may only be composed of "
 "hexadecimal characters and the period (.) character."
 msgstr ""
-"指定此网络设备与 z/VM 或 s390 主机通信使用的子通道的标识符。如 \"mac-address"
-"\" 用于非 z/VM 设备,此属性可用来确保此连接只应用到使用这些子通道的网络设备。"
-"列表应该包含 3 个字符串,且每个字符串只能由十六进制字符和半角句号(.)字符组"
-"成。"
-
-#: ../clients/common/settings-docs.h.in:99
-msgid ""
-"When a value grater than 0 is set, configures the device to use the "
-"specified speed. If \"auto-negotiate\" is \"yes\" the specified speed will "
-"be the only one advertised during link negotiation: this works only for BASE-"
-"T 802.3 specifications and is useful for enforcing gigabit speeds, as in "
-"this case link negotiation is mandatory. If the value is unset (0, the "
-"default), the link configuration will be either skipped (if \"auto-negotiate"
-"\" is \"no\", the default) or will be auto-negotiated (if \"auto-negotiate\" "
-"is \"yes\") and the local device will advertise all the supported speeds. In "
-"Mbit/s, ie 100 == 100Mbit/s. Must be set together with the \"duplex\" "
-"property when non-zero. Before specifying a speed value be sure your device "
-"supports it."
-msgstr ""
-"当设定为大于 0 的值时,配置此设备使用指定的速度。如果 \"auto-negotiate\" 为 "
-"\"yes\",只有指定的速度会在链路自动协商过程中被通告:这只对 BASE-T 802.3 规范"
-"有效并用于强制吉比特模式,因为在这些情况下链路协商时强制性的。如果值未设定"
-"(0,默认值),链路配置要么将被忽略(如果 \"auto-negotiate\" 为 \"no\",默认"
-"值)要么将被自动协商(如果 \"auto-negotiate\" 为 \"yes\"),并且本地设备将通"
-"告所有支持的双工模式。单位为 Mbit/s,例如 100 == 100Mbit/s。如果非零,必须与 "
-"\"duplex\" 属性一块设定。在指定速度值前请确保您的设备支持。"
-
-#: ../clients/common/settings-docs.h.in:100
+
+#: ../clients/common/settings-docs.c.in:101
+msgid ""
+"Can be set to a value greater than zero only when \"auto-negotiate\" is \"off"
+"\". In that case, statically configures the device to use that specified "
+"speed. In Mbit/s, ie 100 == 100Mbit/s. Must be set together with the \"duplex"
+"\" property when non-zero. Before specifying a speed value be sure your "
+"device supports it."
+msgstr ""
+
+#: ../clients/common/settings-docs.c.in:102
 msgid ""
 "The NMSettingWiredWakeOnLan options to enable. Not all devices support all "
 "options. May be any combination of NM_SETTING_WIRED_WAKE_ON_LAN_PHY (0x2), "
@@ -7044,79 +6380,64 @@ msgid ""
 "use global settings) and NM_SETTING_WIRED_WAKE_ON_LAN_IGNORE (0x8000) (to "
 "disable management of Wake-on-LAN in NetworkManager)."
 msgstr ""
-"启用 NMSettingWiredWakeOnLan 的选项。并非全部设备都支持所有选项。可以是以下选"
-"项的任意组合:NM_SETTING_WIRED_WAKE_ON_LAN_PHY (0x2)、"
-"NM_SETTING_WIRED_WAKE_ON_LAN_UNICAST (0x4)、"
-"NM_SETTING_WIRED_WAKE_ON_LAN_MULTICAST (0x8)、"
-"NM_SETTING_WIRED_WAKE_ON_LAN_BROADCAST (0x10)、"
-"NM_SETTING_WIRED_WAKE_ON_LAN_ARP (0x20)、NM_SETTING_WIRED_WAKE_ON_LAN_MAGIC "
-"(0x40) 或特殊值 NM_SETTING_WIRED_WAKE_ON_LAN_DEFAULT (0x1)(使用全局设置)和 "
-"NM_SETTING_WIRED_WAKE_ON_LAN_IGNORE (0x8000)(在网络管理器(NetworkManager)"
-"里禁用 LAN 唤醒的管理)。"
 
-#: ../clients/common/settings-docs.h.in:101
+#: ../clients/common/settings-docs.c.in:103
 msgid ""
 "If specified, the password used with magic-packet-based Wake-on-LAN, "
 "represented as an Ethernet MAC address.  If NULL, no password will be "
 "required."
 msgstr ""
-"如果指定了,其为基于幻数据包的 LAN 唤醒所使用的密码,表示为以太网 MAC 地址。"
-"如果为 NULL,将不需要密码。"
 
-#: ../clients/common/settings-docs.h.in:102
+#: ../clients/common/settings-docs.c.in:104
 msgid "Encapsulation of ADSL connection.  Can be \"vcmux\" or \"llc\"."
-msgstr "ADSL 连接的封装。可以是 \"vcmux\" 或 \"llc\"。"
+msgstr ""
 
-#: ../clients/common/settings-docs.h.in:103
+#: ../clients/common/settings-docs.c.in:106
 msgid "Password used to authenticate with the ADSL service."
-msgstr "用于 ADSL 服务验证的密码。"
+msgstr ""
 
-#: ../clients/common/settings-docs.h.in:105
+#: ../clients/common/settings-docs.c.in:108
 msgid "ADSL connection protocol.  Can be \"pppoa\", \"pppoe\" or \"ipoatm\"."
-msgstr "ADSL 连接协议。可为 \"pppoa\"、\"pppoe\" 或 \"ipoatm\"。"
+msgstr ""
 
-#: ../clients/common/settings-docs.h.in:106
+#: ../clients/common/settings-docs.c.in:109
 msgid "Username used to authenticate with the ADSL service."
-msgstr "用于 ADSL 服务验证的用户名。"
+msgstr ""
 
-#: ../clients/common/settings-docs.h.in:107
+#: ../clients/common/settings-docs.c.in:110
 msgid "VCI of ADSL connection"
-msgstr "ADSL 连接的 VCI"
+msgstr ""
 
-#: ../clients/common/settings-docs.h.in:108
+#: ../clients/common/settings-docs.c.in:111
 msgid "VPI of ADSL connection"
-msgstr "ADSL 连接的 VPI"
+msgstr ""
 
-#: ../clients/common/settings-docs.h.in:109
+#: ../clients/common/settings-docs.c.in:112
 msgid "The Bluetooth address of the device."
-msgstr "设备的蓝牙地址。"
+msgstr ""
 
-#: ../clients/common/settings-docs.h.in:110
+#: ../clients/common/settings-docs.c.in:114
 msgid ""
 "Either \"dun\" for Dial-Up Networking connections or \"panu\" for Personal "
 "Area Networking connections to devices supporting the NAP profile."
 msgstr ""
-"拨号网络连接时使用 \"dun\",或者支持 NAP 配置集设备的个人区域网络连接时使用 "
-"\"panu\"。"
 
-#: ../clients/common/settings-docs.h.in:111
+#: ../clients/common/settings-docs.c.in:116
 msgid ""
 "Dictionary of key/value pairs of bonding options.  Both keys and values must "
 "be strings. Option names must contain only alphanumeric characters (ie, [a-"
 "zA-Z0-9])."
 msgstr ""
-"绑定(bonding)选项的键/值对目录。键和值都必须为字符串。选项名必须只能包含字"
-"母数字字符(示例 [a-zA-Z0-9])。"
 
-#: ../clients/common/settings-docs.h.in:112
+#: ../clients/common/settings-docs.c.in:117
 msgid "The Ethernet MAC address aging time, in seconds."
-msgstr "以太网 MAC 地址的老化时间,以秒计。"
+msgstr ""
 
-#: ../clients/common/settings-docs.h.in:113
+#: ../clients/common/settings-docs.c.in:118
 msgid "The Spanning Tree Protocol (STP) forwarding delay, in seconds."
-msgstr "生成树协议(STP)转发延迟,以秒计。"
+msgstr ""
 
-#: ../clients/common/settings-docs.h.in:114
+#: ../clients/common/settings-docs.c.in:119
 msgid ""
 "A mask of group addresses to forward. Usually, group addresses in the range "
 "from 01:80:C2:00:00:00 to 01:80:C2:00:00:0F are not forwarded according to "
@@ -7124,16 +6445,12 @@ msgid ""
 "address in that range that must be forwarded. The mask can't have bits 0, 1 "
 "or 2 set because they are used for STP, MAC pause frames and LACP."
 msgstr ""
-"要转发的组地址掩码。通常,范围在 01:80:C2:00:00:00 到 01:80:C2:00:00:0F 内的"
-"组地址根据标准不转发。此属性是个 16 位的掩码,每个对应于一个组地址,组地址范"
-"围内的地址必须被转发。掩码不能设定了位 0、1 或 2,因为它们用于 STP、MAC 暂停"
-"帧和 LACP。"
 
-#: ../clients/common/settings-docs.h.in:115
+#: ../clients/common/settings-docs.c.in:120
 msgid "The Spanning Tree Protocol (STP) hello time, in seconds."
-msgstr "生成树协议(STP)呼叫时间,以秒计。"
+msgstr ""
 
-#: ../clients/common/settings-docs.h.in:116
+#: ../clients/common/settings-docs.c.in:121
 msgid ""
 "If specified, the MAC address of bridge. When creating a new bridge, this "
 "MAC address will be set. If this field is left unspecified, the \"ethernet."
@@ -7142,123 +6459,100 @@ msgid ""
 "the MAC address of the bridge later while activating the bridge. Hence, this "
 "property is deprecated. Deprecated: 1"
 msgstr ""
-"如果指定了,其为网桥的 MAC 地址。当创建新网桥时,将设定此 MAC 地址。如果不指"
-"定此字段,换成引用 \"ethernet.cloned-mac-address\" 来生成初始 MAC 地址。注意"
-"设置 \"ethernet.cloned-mac-address\" 怎样都会在之后激活网桥时覆盖网桥的 MAC "
-"地址。因此,此属性被弃用。已弃用:1"
 
-#: ../clients/common/settings-docs.h.in:117
+#: ../clients/common/settings-docs.c.in:122
 msgid "The Spanning Tree Protocol (STP) maximum message age, in seconds."
-msgstr "生成树协议(STP)最大消息寿命,以秒计。"
+msgstr ""
 
-#: ../clients/common/settings-docs.h.in:118
+#: ../clients/common/settings-docs.c.in:123
 msgid ""
 "Controls whether IGMP snooping is enabled for this bridge. Note that if "
 "snooping was automatically disabled due to hash collisions, the system may "
 "refuse to enable the feature until the collisions are resolved."
 msgstr ""
-"控制是否为此网桥启用 IGMP 监听。注意如果散列冲突监听会被自动禁用,系统可能拒"
-"绝启用该功能直到冲突解决。"
 
-#: ../clients/common/settings-docs.h.in:119
+#: ../clients/common/settings-docs.c.in:125
 msgid ""
 "Sets the Spanning Tree Protocol (STP) priority for this bridge.  Lower "
 "values are \"better\"; the lowest priority bridge will be elected the root "
 "bridge."
 msgstr ""
-"设定此网桥的生成树协议(STP)优先级。值越小优先级越高;最高优先级(值最低)的"
-"网桥将选为根桥。"
 
-#: ../clients/common/settings-docs.h.in:120
+#: ../clients/common/settings-docs.c.in:126
 msgid ""
 "Controls whether Spanning Tree Protocol (STP) is enabled for this bridge."
-msgstr "控制是否为此网桥启用生成树协议(STP)。"
+msgstr ""
 
-#: ../clients/common/settings-docs.h.in:121
+#: ../clients/common/settings-docs.c.in:127
 msgid ""
 "Enables or disables \"hairpin mode\" for the port, which allows frames to be "
 "sent back out through the port the frame was received on."
-msgstr "启用或禁用端口的 \"hairpin mode\",其允许从接收帧的端口发回帧。"
+msgstr ""
 
-#: ../clients/common/settings-docs.h.in:122
+#: ../clients/common/settings-docs.c.in:129
 msgid ""
 "The Spanning Tree Protocol (STP) port cost for destinations via this port."
-msgstr "通过此端口的目标的生成树协议(STP)端口开销。"
+msgstr ""
 
-#: ../clients/common/settings-docs.h.in:123
+#: ../clients/common/settings-docs.c.in:130
 msgid "The Spanning Tree Protocol (STP) priority of this bridge port."
-msgstr "此网桥端口的生成树协议(STP)优先级。"
+msgstr ""
 
-#: ../clients/common/settings-docs.h.in:124
-#: ../clients/common/settings-docs.h.in:169
-#: ../clients/common/settings-docs.h.in:180
+#: ../clients/common/settings-docs.c.in:131
+#: ../clients/common/settings-docs.c.in:179
+#: ../clients/common/settings-docs.c.in:191
 msgid ""
 "If non-zero, only transmit packets of the specified size or smaller, "
 "breaking larger packets up into multiple frames."
-msgstr "如果非零,只传输指定大小或更小的数据包,将较大的数据包分成多个帧。"
+msgstr ""
 
-#: ../clients/common/settings-docs.h.in:125
+#: ../clients/common/settings-docs.c.in:133
 msgid ""
 "The number to dial to establish the connection to the CDMA-based mobile "
 "broadband network, if any.  If not specified, the default number (#777) is "
 "used when required."
 msgstr ""
-"建立基于 CDMA 移动宽带网络连接的拨号号码,如果有的话。如未指定,需要时默认使"
-"用号码(#777)。"
 
-#: ../clients/common/settings-docs.h.in:126
-#: ../clients/common/settings-docs.h.in:172
+#: ../clients/common/settings-docs.c.in:134
+#: ../clients/common/settings-docs.c.in:183
 msgid ""
 "The password used to authenticate with the network, if required.  Many "
 "providers do not require a password, or accept any password.  But if a "
 "password is required, it is specified here."
 msgstr ""
-"用于与网络验证的密码,如果需要。很多运营商不需要密码,或是接受任何密码。但是"
-"如果需要密码,可在这里指定。"
 
-#: ../clients/common/settings-docs.h.in:128
-#: ../clients/common/settings-docs.h.in:178
+#: ../clients/common/settings-docs.c.in:136
+#: ../clients/common/settings-docs.c.in:189
 msgid ""
 "The username used to authenticate with the network, if required.  Many "
 "providers do not require a username, or accept any username.  But if a "
 "username is required, it is specified here."
 msgstr ""
-"用于与网络验证的用户名,如果需要。很多运营商不需要用户名,或是接受任何用户"
-"名。但是如果需要用户名,可在这里指定。"
 
-#: ../clients/common/settings-docs.h.in:129
+#: ../clients/common/settings-docs.c.in:137
 msgid ""
 "The number of retries for the authentication. Zero means to try "
 "indefinitely; -1 means to use a global default. If the global default is not "
 "set, the authentication retries for 3 times before failing the connection. "
 "Currently this only applies to 802-1x authentication."
 msgstr ""
-"验证的重试次数。零代表无限次数;-1 代表使用全局默认值。如果全局默认值未设定,"
-"允许连接失败前验证重试 3 次。当前此属性只应用到 802.1x 验证。"
 
-#: ../clients/common/settings-docs.h.in:130
+#: ../clients/common/settings-docs.c.in:138
 msgid ""
 "Whether or not the connection should be automatically connected by "
 "NetworkManager when the resources for the connection are available. TRUE to "
 "automatically activate the connection, FALSE to require manual intervention "
-"to activate the connection. Note that autoconnect is not implemented for VPN "
-"profiles. See \"secondaries\" as an alternative to automatically connect VPN "
-"profiles."
+"to activate the connection."
 msgstr ""
-"当连接资源可用时,网络管理器(NetworkManager)是否自动连接。TRUE 为自动激活连"
-"接,FALSE 为请求手动介入来激活连接。注意自动连接未实现于 VPN 配置集。要自动连"
-"接 VPN 配置集请参阅作为备用方法的 \"secondaries\"。"
 
-#: ../clients/common/settings-docs.h.in:131
+#: ../clients/common/settings-docs.c.in:139
 msgid ""
 "The autoconnect priority. If the connection is set to autoconnect, "
 "connections with higher priority will be preferred. Defaults to 0. The "
 "higher number means higher priority."
 msgstr ""
-"自动连接优先级。如果连接设为自动连接时,首选高优先级的连接。默认为 0。数值越"
-"高优先级越高。"
 
-#: ../clients/common/settings-docs.h.in:132
+#: ../clients/common/settings-docs.c.in:140
 msgid ""
 "The number of times a connection should be tried when autoactivating before "
 "giving up. Zero means forever, -1 means the global default (4 times if not "
@@ -7266,41 +6560,31 @@ msgid ""
 "blocking autoconnect. Note that after a timeout, NetworkManager will try to "
 "autoconnect again."
 msgstr ""
-"自动激活放弃前连接应该尝试的次数。零表示从不,-1 表示全局默认值(未被覆盖时"
-"为 4 次)。设定此属性为 1 表示阻止自动连接前只尝试一次激活。注意一段超时时间"
-"后,网络管理器(NetworkManager)将重新尝试自动连接。"
 
-#: ../clients/common/settings-docs.h.in:133
+#: ../clients/common/settings-docs.c.in:141
 msgid ""
 "Whether or not slaves of this connection should be automatically brought up "
 "when NetworkManager activates this connection. This only has a real effect "
-"for master connections. The properties \"autoconnect\", \"autoconnect-"
-"priority\" and \"autoconnect-retries\" are unrelated to this setting. The "
-"permitted values are: 0: leave slave connections untouched, 1: activate all "
-"the slave connections with this connection, -1: default. If -1 (default) is "
-"set, global connection.autoconnect-slaves is read to determine the real "
-"value. If it is default as well, this fallbacks to 0."
+"for master connections. The permitted values are: 0: leave slave connections "
+"untouched, 1: activate all the slave connections with this connection, -1: "
+"default. If -1 (default) is set, global connection.autoconnect-slaves is "
+"read to determine the real value. If it is default as well, this fallbacks "
+"to 0."
 msgstr ""
-"NetworkManger 激活此连接时,是否自动启动此连接的从连接。这只对主连接有实际效"
-"果。属性 \"autoconnect\"、\"autoconnect-priority\" 和 \"autoconnect-retries"
-"\" 跟此设置无关。允许的值有:0:保持从连接不变;1:激活此连接的所有从连"
-"接;-1:默认。如果设为 -1(默认)时,读取全局 connection.autoconnect-slaves "
-"以确定实际值。如果它也是默认的,此设置回落到 0。"
 
-#: ../clients/common/settings-docs.h.in:134
+#: ../clients/common/settings-docs.c.in:142
 msgid ""
 "If greater than zero, delay success of IP addressing until either the "
 "timeout is reached, or an IP gateway replies to a ping."
 msgstr ""
-"如果大于零,推迟 IP 寻址的成功,直到到达超时时间或 IP 网关应答了 ping。"
 
-#: ../clients/common/settings-docs.h.in:135
+#: ../clients/common/settings-docs.c.in:143
 msgid ""
 "A human readable unique identifier for the connection, like \"Work Wi-Fi\" "
 "or \"T-Mobile 3G\"."
-msgstr "用户可读的连接的唯一标识符,如 \"工作 Wi-Fi\" 或 \"运营商 4G\"。"
+msgstr ""
 
-#: ../clients/common/settings-docs.h.in:136
+#: ../clients/common/settings-docs.c.in:144
 msgid ""
 "The name of the network interface this connection is bound to. If not set, "
 "then the connection can be attached to any interface of the appropriate type "
@@ -7312,48 +6596,22 @@ msgid ""
 "names change or are reordered the connection may be applied to the wrong "
 "interface."
 msgstr ""
-"此连接绑定的网络接口名称。如果未设定,此连接可以连接到任何合适类型的接口(受"
-"其他设置的限制)。对于软件设备,此值指定创建设备的名称。对于其接口名无法很容"
-"易固定的连接类型(例如 移动宽带或 USB 以太网),不应使用此属性。设置此属性会"
-"限制连接可以使用的接口,而且当接口名改变或重新排序了,连接可能会应用到错误的"
-"接口。"
 
-#: ../clients/common/settings-docs.h.in:137
+#: ../clients/common/settings-docs.c.in:145
 msgid "Whether LLDP is enabled for the connection."
-msgstr "是否为连接启用 LLDP。"
+msgstr ""
 
-#: ../clients/common/settings-docs.h.in:138
+#: ../clients/common/settings-docs.c.in:146
 msgid "Interface name of the master device or UUID of the master connection."
-msgstr "主设备的接口名或 UUID 或主连接。"
-
-#: ../clients/common/settings-docs.h.in:139
-msgid ""
-"Whether mDNS is enabled for the connection. The permitted values are: yes: "
-"register hostname and resolving for the connection, no: disable mDNS for the "
-"interface, resolve: do not register hostname but allow resolving of mDNS "
-"host names. When updating this property on a currently activated connection, "
-"the change takes effect immediately. This feature requires a plugin which "
-"supports mDNS. One such plugin is dns-systemd-resolved."
 msgstr ""
-"是否为此连接启用 mDNS。允许的值有:yes,注册主机名并解析连接;no,禁用接口的 "
-"mDNS;resolve,不要注册主机名但允许 mDNS 主机名的解析。当在当前激活的连接上更"
-"新此属性时,更改立即生效。此功能需要支持 mDNS 的插件。一个这样的插件是 dns-"
-"systemd-resolved。"
 
-#: ../clients/common/settings-docs.h.in:140
+#: ../clients/common/settings-docs.c.in:147
 msgid ""
 "Whether the connection is metered. When updating this property on a "
 "currently activated connection, the change takes effect immediately."
-msgstr "连接是否按流量计费。当在当前激活的连接上更新此属性时,更改立即生效。"
-
-#: ../clients/common/settings-docs.h.in:141
-msgid ""
-"Specifies whether the profile can be active multiple times at a particular "
-"moment. The value is of type NMConnectionMultiConnect."
 msgstr ""
-"指定配置集是否能在指定时刻激活多次。该值为 NMConnectionMultiConnect 类型。"
 
-#: ../clients/common/settings-docs.h.in:142
+#: ../clients/common/settings-docs.c.in:149
 msgid ""
 "An array of strings defining what access a given user has to this "
 "connection.  If this is NULL or empty, all users are allowed to access this "
@@ -7367,85 +6625,50 @@ msgid ""
 "present must be ignored and is reserved for future use.  All of [type], "
 "[id], and [reserved] must be valid UTF-8."
 msgstr ""
-"字符串数组,用于定义给定用户对此连接的访问权。如果此属性为 NULL 或空,允许所"
-"有用户访问此连接;否则只允许在此列表中的用户。当此属性非空时,只有当指定用户"
-"之一登录到活动会话时,连接被激活。每个条目的形式为 \"[类型]:[ID]:[已保留]\";"
-"例如 \"user:dcbw:blah\"。此时,只允许用户 \"user\" [类型]。其他任何值被忽略并"
-"保留为将来使用。[ID] 是此权限引用的用户名,不能包含冒号 \":\" 字符。存在的任"
-"何 [已保留] 信息都必须被忽略并保留为将来使用。所有的 [类型]、[ID] 和 [已保"
-"留] 都必须为有效的 UTF-8。"
 
-#: ../clients/common/settings-docs.h.in:143
+#: ../clients/common/settings-docs.c.in:150
 msgid ""
 "FALSE if the connection can be modified using the provided settings "
 "service's D-Bus interface with the right privileges, or TRUE if the "
 "connection is read-only and cannot be modified."
 msgstr ""
-"如果连接可以用提供设置服务的 D-Bus 接口以正确的权限来修改,为 FALSE;如果连接"
-"为只读且无法修改,为 TRUE。"
 
-#: ../clients/common/settings-docs.h.in:144
+#: ../clients/common/settings-docs.c.in:151
 msgid ""
 "List of connection UUIDs that should be activated when the base connection "
 "itself is activated. Currently only VPN connections are supported."
-msgstr "当基础连接本身激活时应一块激活的连接 UUID 列表。当前只支持 VPN 连接。"
+msgstr ""
 
-#: ../clients/common/settings-docs.h.in:145
+#: ../clients/common/settings-docs.c.in:152
 msgid ""
 "Setting name of the device type of this slave's master connection (eg, \"bond"
 "\"), or NULL if this connection is not a slave."
 msgstr ""
-"此从连接的主连接设备类型的设置名称(例如 \"bond\"),或者为 NULL 如果此连接不"
-"是从连接。"
 
-#: ../clients/common/settings-docs.h.in:146
+#: ../clients/common/settings-docs.c.in:153
 msgid ""
-"This represents the identity of the connection used for various purposes. It "
-"allows to configure multiple profiles to share the identity. Also, the "
-"stable-id can contain placeholders that are substituted dynamically and "
-"deterministically depending on the context. The stable-id is used for "
+"Token to generate stable IDs for the connection. The stable-id is used for "
 "generating IPv6 stable private addresses with ipv6.addr-gen-mode=stable-"
 "privacy. It is also used to seed the generated cloned MAC address for "
-"ethernet.cloned-mac-address=stable and wifi.cloned-mac-address=stable. It is "
-"also used as DHCP client identifier with ipv4.dhcp-client-id=stable and to "
-"derive the DHCP DUID with ipv6.dhcp-duid=stable-[llt,ll,uuid]. Note that "
-"depending on the context where it is used, other parameters are also seeded "
-"into the generation algorithm. For example, a per-host key is commonly also "
-"included, so that different systems end up generating different IDs. Or with "
-"ipv6.addr-gen-mode=stable-privacy, also the device's name is included, so "
-"that different interfaces yield different addresses. The '$' character is "
+"ethernet.cloned-mac-address=stable and wifi.cloned-mac-address=stable. Note "
+"that also the interface name of the activating connection and a per-host "
+"secret key is included into the address generation so that the same stable-"
+"id on different hosts/devices yields different addresses. If the value is "
+"unset, an ID unique for the connection is used. Specifying a stable-id "
+"allows multiple connections to generate the same addresses. Another use is "
+"to generate IDs at runtime via dynamic substitutions. The '$' character is "
 "treated special to perform dynamic substitutions at runtime. Currently "
-"supported are \"${CONNECTION}\", \"${DEVICE}\", \"${BOOT}\", \"${RANDOM}\". "
-"These effectively create unique IDs per-connection, per-device, per-boot, or "
-"every time. Note that \"${DEVICE}\" corresponds the the interface name of "
-"the device. Any unrecognized patterns following '$' are treated verbatim, "
-"however are reserved for future use. You are thus advised to avoid '$' or "
-"escape it as \"$$\". For example, set it to \"${CONNECTION}-${BOOT}-"
-"${DEVICE}\" to create a unique id for this connection that changes with "
-"every reboot and differs depending on the interface where the profile "
-"activates. If the value is unset, a global connection default is consulted. "
-"If the value is still unset, the default is similar to \"${CONNECTION}\" and "
-"uses a unique, fixed ID for the connection."
-msgstr ""
-"此属性表示用于多个目的的连接标识符。它允许通过配置多个配置集来共享标识符。同"
-"时,stable-id 可以包含根据上下文,动态和确定地替换的占位符。stable-id 用来与 "
-"ipv6.addr-gen-mode=stable-privacy 共用时生成 IPv6 稳定私有地址。它也可以用来"
-"为 ethernet.cloned-mac-address=stable 和 wifi.cloned-mac-address=stable 生成"
-"的克隆 MAC 地址做种。它还能与 ipv4.dhcp-client-id=stable 共用时当作 DHCP 客户"
-"端标识符,与 ipv6.dhcp-duid=stable-[llt,ll,uuid] 共用时用于衍生 DHCP DUID。注"
-"意,取决于它使用的上下文,其他参数也可以当作生成算法的种子。示例,一般包括每"
-"个主机自己的密钥,这样不同的系统可以生成不同的 ID。或者与 ipv6.addr-gen-"
-"mode=stable-privacy 共用时,也包括设备的名称,这样不同的接口可以产出不同的地"
-"址。\"$\" 字符被特别对待以在运行时执行动态替换。当前支持的有 "
-"\"${CONNECTION}\"、\"${BOOT}\" 和 \"${RANDOM}\"。这些字符串可以有效地为每个连"
-"接、每次启动或每一次都创建唯一的 ID。注意 \"${DEVICE}\" 对应于设备的接口"
-"名。\"$\" 后跟随任何未识别的样式都视作原字符串,但也被保留为将来使用。因此建"
-"议您避免使用 \"$\" 或将其转义为 \"$$\"。示例,设定为 \"${CONNECTION}/"
-"${BOOT}\" 将为此连接创建一个唯一 ID ,该 ID 每次启动都改变而且根据配置激活的"
-"接口区别开来。如果值未设定,将查询全局连接默认值。如果值仍未设定,则默认为跟 "
-"\"${CONNECTION}\" 相同并为连接使用唯一的固定 ID。"
-
-#: ../clients/common/settings-docs.h.in:147
+"supported are \"${CONNECTION}\", \"${BOOT}\", \"${RANDOM}\". These "
+"effectively create unique IDs per-connection, per-boot, or every time. Any "
+"unrecognized patterns following '$' are treated verbatim, however are "
+"reserved for future use. You are thus advised to avoid '$' or escape it as "
+"\"$$\". For example, set it to \"${CONNECTION}/${BOOT}\" to create a unique "
+"id for this connection that changes with every reboot. Note that two "
+"connections only use the same effective id if their stable-id is also "
+"identical before performing dynamic substitutions."
+msgstr ""
+
+#: ../clients/common/settings-docs.c.in:154
 msgid ""
 "The time, in seconds since the Unix Epoch, that the connection was last "
 "_successfully_ fully activated. NetworkManager updates the connection "
@@ -7453,11 +6676,8 @@ msgid ""
 "active connection has the latest timestamp. The property is only meant for "
 "reading (changes to this property will not be preserved)."
 msgstr ""
-"连接上次完全激活的时间,以秒计算和 Unix 时间表示。当连接激活时网络管理器"
-"(NetworkManager)会定期更新连接的时间戳以确保活动连接有最新的时间戳。该用来"
-"读取(此属性的更改不被保留)。"
 
-#: ../clients/common/settings-docs.h.in:148
+#: ../clients/common/settings-docs.c.in:155
 msgid ""
 "Base type of the connection. For hardware-dependent connections, should "
 "contain the setting name of the hardware-type specific setting (ie, \"802-3-"
@@ -7465,12 +6685,8 @@ msgid ""
 "hardware dependent connections like VPN or otherwise, should contain the "
 "setting name of that setting type (ie, \"vpn\" or \"bridge\", etc)."
 msgstr ""
-"连接的基础类型。对于硬件相关的连接,应包含硬件类型特定设置的设置名称(例如 "
-"\"802-3-ethernet\" 或 \"802-11-wireless\" 或 \"bluetooth\",等等),而对于非"
-"硬件相关的连接如 VPN 或其他的,应包含该设置类型的设置名称(例如 \"vpn\" 或 "
-"\"bridge\",等等)。"
 
-#: ../clients/common/settings-docs.h.in:149
+#: ../clients/common/settings-docs.c.in:156
 msgid ""
 "A universally unique identifier for the connection, for example generated "
 "with libuuid.  It should be assigned when the connection is created, and "
@@ -7481,13 +6697,8 @@ msgid ""
 "UUID must be in the format \"2815492f-7e56-435e-b2e9-246bd7cdc664\" (ie, "
 "contains only hexadecimal characters and \"-\")."
 msgstr ""
-"用于连接的全局唯一标识符,例如以 libuuid 生成。它应该在连接创建时分配,并且只"
-"要连接仍应用到同个网络就不改变。例如,当 \"id\" 属性或 NMSettingIP4Config 更"
-"改时它不应改变;但当 Wi-Fi SSID、移动宽带网络运营商或 \"type\" 属性改变时它可"
-"能需要重新创建。UUIS 必须为如 \"2815492f-7e56-435e-b2e9-246bd7cdc664\" 的格式"
-"(示例,只包含十六进制和 \"-\")。"
 
-#: ../clients/common/settings-docs.h.in:150
+#: ../clients/common/settings-docs.c.in:157
 msgid ""
 "The trust level of a the connection.  Free form case-insensitive string (for "
 "example \"Home\", \"Work\", \"Public\").  NULL or unspecified zone means the "
@@ -7495,72 +6706,54 @@ msgid ""
 "When updating this property on a currently activated connection, the change "
 "takes effect immediately."
 msgstr ""
-"连接的信任级别。格式自由、不区分大小写的字符串(例如 \"Home\"、\"工作\"、\"公"
-"共\")。NULL 或为指定区域表示连接将放置到防火墙定义的默认区域。当在当前激活的"
-"连接上更新此属性时,更改立即生效。"
 
-#: ../clients/common/settings-docs.h.in:151
+#: ../clients/common/settings-docs.c.in:158
 msgid ""
 "Specifies the NMSettingDcbFlags for the DCB FCoE application.  Flags may be "
 "any combination of NM_SETTING_DCB_FLAG_ENABLE (0x1), "
 "NM_SETTING_DCB_FLAG_ADVERTISE (0x2), and NM_SETTING_DCB_FLAG_WILLING (0x4)."
 msgstr ""
-"指定 DCB FCoE 应用程序的 NMSettingDcbFlags。标志可以是 "
-"NM_SETTING_DCB_FLAG_ENABLE (0x1)、NM_SETTING_DCB_FLAG_ADVERTISE (0x2) 和 "
-"NM_SETTING_DCB_FLAG_WILLING (0x4) 的任意组合。"
 
-#: ../clients/common/settings-docs.h.in:152
+#: ../clients/common/settings-docs.c.in:159
 msgid "The FCoE controller mode; either \"fabric\" (default) or \"vn2vn\"."
-msgstr "FCoE 控制器模式;为 \"fabric\"(默认)或 \"vn2vn\"。"
+msgstr ""
 
-#: ../clients/common/settings-docs.h.in:153
+#: ../clients/common/settings-docs.c.in:160
 msgid ""
 "The highest User Priority (0 - 7) which FCoE frames should use, or -1 for "
 "default priority.  Only used when the \"app-fcoe-flags\" property includes "
 "the NM_SETTING_DCB_FLAG_ENABLE (0x1) flag."
 msgstr ""
-"FCoE 帧应使用的最高用户优先级(0~7),或 -1 代表默认优先级。只当 \"app-fcoe-"
-"flags\" 属性包含 NM_SETTING_DCB_FLAG_ENABLE (0x1) 标志时使用。"
 
-#: ../clients/common/settings-docs.h.in:154
+#: ../clients/common/settings-docs.c.in:161
 msgid ""
 "Specifies the NMSettingDcbFlags for the DCB FIP application.  Flags may be "
 "any combination of NM_SETTING_DCB_FLAG_ENABLE (0x1), "
 "NM_SETTING_DCB_FLAG_ADVERTISE (0x2), and NM_SETTING_DCB_FLAG_WILLING (0x4)."
 msgstr ""
-"指定 DCB FIP 应用程序的 NMSettingDcbFlags。标志可以是 "
-"NM_SETTING_DCB_FLAG_ENABLE (0x1)、NM_SETTING_DCB_FLAG_ADVERTISE (0x2) 和 "
-"NM_SETTING_DCB_FLAG_WILLING (0x4) 的任意组合。"
 
-#: ../clients/common/settings-docs.h.in:155
+#: ../clients/common/settings-docs.c.in:162
 msgid ""
 "The highest User Priority (0 - 7) which FIP frames should use, or -1 for "
 "default priority.  Only used when the \"app-fip-flags\" property includes "
 "the NM_SETTING_DCB_FLAG_ENABLE (0x1) flag."
 msgstr ""
-"FIP 帧应使用的最高用户优先级(0~7),或 -1 代表默认优先级。只当 \"app-fip-"
-"flags\" 属性包含 NM_SETTING_DCB_FLAG_ENABLE (0x1) 标志时使用。"
 
-#: ../clients/common/settings-docs.h.in:156
+#: ../clients/common/settings-docs.c.in:163
 msgid ""
 "Specifies the NMSettingDcbFlags for the DCB iSCSI application.  Flags may be "
 "any combination of NM_SETTING_DCB_FLAG_ENABLE (0x1), "
 "NM_SETTING_DCB_FLAG_ADVERTISE (0x2), and NM_SETTING_DCB_FLAG_WILLING (0x4)."
 msgstr ""
-"指定 DCB iSCSI 应用程序的 NMSettingDcbFlags。标志可以是 "
-"NM_SETTING_DCB_FLAG_ENABLE (0x1)、NM_SETTING_DCB_FLAG_ADVERTISE (0x2) 和 "
-"NM_SETTING_DCB_FLAG_WILLING (0x4) 的任意组合。"
 
-#: ../clients/common/settings-docs.h.in:157
+#: ../clients/common/settings-docs.c.in:164
 msgid ""
 "The highest User Priority (0 - 7) which iSCSI frames should use, or -1 for "
 "default priority. Only used when the \"app-iscsi-flags\" property includes "
 "the NM_SETTING_DCB_FLAG_ENABLE (0x1) flag."
 msgstr ""
-"iSCSI 帧应使用的最高用户优先级(0~7),或 -1 代表默认优先级。只当 \"app-"
-"iscsi-flags\" 属性包含 NM_SETTING_DCB_FLAG_ENABLE (0x1) 标志时使用。"
 
-#: ../clients/common/settings-docs.h.in:158
+#: ../clients/common/settings-docs.c.in:166
 msgid ""
 "An array of 8 uint values, where the array index corresponds to the User "
 "Priority (0 - 7) and the value indicates the percentage of bandwidth of the "
@@ -7568,77 +6761,58 @@ msgid ""
 "percentages for priorities which belong to the same group must total 100 "
 "percents."
 msgstr ""
-"8 个无符号整数值组成的数组,其数组索引对应于用户优先级(0~7)而其值指示优先"
-"级可使用的优先级指定组的带宽百分比。属于同个组的所有优先级百分比总和必须为 "
-"100%。"
 
-#: ../clients/common/settings-docs.h.in:159
+#: ../clients/common/settings-docs.c.in:167
 msgid ""
 "An array of 8 boolean values, where the array index corresponds to the User "
 "Priority (0 - 7) and the value indicates whether or not the corresponding "
 "priority should transmit priority pause."
 msgstr ""
-"8 个布尔值组成的数组,其数组索引对应于用户优先级(0~7)而其值指示对应优先级"
-"是否应该传输优先级暂停。"
 
-#: ../clients/common/settings-docs.h.in:160
+#: ../clients/common/settings-docs.c.in:168
 msgid ""
 "Specifies the NMSettingDcbFlags for DCB Priority Flow Control (PFC). Flags "
 "may be any combination of NM_SETTING_DCB_FLAG_ENABLE (0x1), "
 "NM_SETTING_DCB_FLAG_ADVERTISE (0x2), and NM_SETTING_DCB_FLAG_WILLING (0x4)."
 msgstr ""
-"指定 DCB 优先级流量控制(PFC)的 NMSettingDcbFlags。标志可以是 "
-"NM_SETTING_DCB_FLAG_ENABLE (0x1)、NM_SETTING_DCB_FLAG_ADVERTISE (0x2) 和 "
-"NM_SETTING_DCB_FLAG_WILLING (0x4) 的任意组合。"
 
-#: ../clients/common/settings-docs.h.in:161
+#: ../clients/common/settings-docs.c.in:169
 msgid ""
 "An array of 8 uint values, where the array index corresponds to the Priority "
 "Group ID (0 - 7) and the value indicates the percentage of link bandwidth "
 "allocated to that group.  Allowed values are 0 - 100, and the sum of all "
 "values must total 100 percents."
 msgstr ""
-"8 个无符号整数值组成的数组,其数组索引对应于用户优先级(0~7)而其值指示分配"
-"到该组的链路带宽百分比。允许的值为 0~100,且所有值的总和必须为 100%。"
 
-#: ../clients/common/settings-docs.h.in:162
+#: ../clients/common/settings-docs.c.in:170
 msgid ""
 "Specifies the NMSettingDcbFlags for DCB Priority Groups.  Flags may be any "
 "combination of NM_SETTING_DCB_FLAG_ENABLE (0x1), "
 "NM_SETTING_DCB_FLAG_ADVERTISE (0x2), and NM_SETTING_DCB_FLAG_WILLING (0x4)."
 msgstr ""
-"指定 DCB 优先级组的 NMSettingDcbFlags。标志可以是 NM_SETTING_DCB_FLAG_ENABLE "
-"(0x1)、NM_SETTING_DCB_FLAG_ADVERTISE (0x2) 和 NM_SETTING_DCB_FLAG_WILLING "
-"(0x4) 的任意组合。"
 
-#: ../clients/common/settings-docs.h.in:163
+#: ../clients/common/settings-docs.c.in:171
 msgid ""
 "An array of 8 uint values, where the array index corresponds to the User "
 "Priority (0 - 7) and the value indicates the Priority Group ID.  Allowed "
 "Priority Group ID values are 0 - 7 or 15 for the unrestricted group."
 msgstr ""
-"8 个无符号整数值组成的数组,其数组索引对应于用户优先级(0~7)而其值指示优先"
-"级组 ID。允许的优先级组 ID 值为 0~7,或 15 表示无限制组。"
 
-#: ../clients/common/settings-docs.h.in:164
+#: ../clients/common/settings-docs.c.in:172
 msgid ""
 "An array of 8 boolean values, where the array index corresponds to the User "
 "Priority (0 - 7) and the value indicates whether or not the priority may use "
 "all of the bandwidth allocated to its assigned group."
 msgstr ""
-"8 个布尔值组成的数组,其数组索引对应于用户优先级(0~7)而其值指示优先级是否"
-"可以使用分配到它指定组的全部带宽。"
 
-#: ../clients/common/settings-docs.h.in:165
+#: ../clients/common/settings-docs.c.in:173
 msgid ""
 "An array of 8 uint values, where the array index corresponds to the User "
 "Priority (0 - 7) and the value indicates the traffic class (0 - 7) to which "
 "the priority is mapped."
 msgstr ""
-"8 个无符号整数值组成的数组,其数组索引对应于用户优先级(0~7)而其值指示该优"
-"先级映射的流量等级(0~7)。"
 
-#: ../clients/common/settings-docs.h.in:166
+#: ../clients/common/settings-docs.c.in:176
 msgid ""
 "The GPRS Access Point Name specifying the APN used when establishing a data "
 "session with the GSM-based network.  The APN often determines how the user "
@@ -7648,27 +6822,21 @@ msgid ""
 "only be composed of the characters a-z, 0-9, ., and - per GSM 03.60 Section "
 "14.9."
 msgstr ""
-"当与基于 GSM 网络建立数据会话时指定使用的 APN 的 GPRS 接入点名称。APN 通常确"
-"定了用户如何为他们的网络使用付费,和用户能否访问互联网或只是运营商特定的封闭"
-"平台,因此为用户的移动带宽套餐使用正确的 APN 很重要。根据 GSM 03.60 章节 "
-"14.9,APN 只能由字符 a~z、0~9、. 和 - 组成。"
 
-#: ../clients/common/settings-docs.h.in:167
+#: ../clients/common/settings-docs.c.in:177
 msgid ""
 "The device unique identifier (as given by the WWAN management service) which "
 "this connection applies to.  If given, the connection will only apply to the "
 "specified device."
 msgstr ""
-"此连接要应用的设备唯一标识符(由 WWAN 管理服务给定)。如果给定了,连接将只应"
-"用到指定的设备。"
 
-#: ../clients/common/settings-docs.h.in:168
+#: ../clients/common/settings-docs.c.in:178
 msgid ""
 "When TRUE, only connections to the home network will be allowed. Connections "
 "to roaming networks will not be made."
-msgstr "为 TRUE 时,将只允许连接到本地网络,不会连接到漫游网络。"
+msgstr ""
 
-#: ../clients/common/settings-docs.h.in:170
+#: ../clients/common/settings-docs.c.in:181
 msgid ""
 "The Network ID (GSM LAI format, ie MCC-MNC) to force specific network "
 "registration.  If the Network ID is specified, NetworkManager will attempt "
@@ -7676,200 +6844,152 @@ msgid ""
 "used to ensure that the device does not roam when direct roaming control of "
 "the device is not otherwise possible."
 msgstr ""
-"要强制指定网络注册的网络 ID(GSM LAI 格式,如 MCC-MNC)。如果指定了网络 ID,"
-"网络管理器(NetworkManager)将尝试强制设备只在指定的网络注册。当设备不能直接"
-"控制漫游时,这可以用于确保设备不漫游。"
 
-#: ../clients/common/settings-docs.h.in:171
+#: ../clients/common/settings-docs.c.in:182
 msgid ""
 "Number to dial when establishing a PPP data session with the GSM-based "
 "mobile broadband network.  Many modems do not require PPP for connections to "
 "the mobile network and thus this property should be left blank, which allows "
 "NetworkManager to select the appropriate settings automatically."
 msgstr ""
-"当与基于 GSM 移动宽带网络建立 PPP 数据会话时要拨打的号码。很多调制解调器不需"
-"要 PPP 来连接到移动网络,这种情况下该属性应留空,以允许网络管理器"
-"(NetworkManager)自动选择合适的设置。"
 
-#: ../clients/common/settings-docs.h.in:174
+#: ../clients/common/settings-docs.c.in:185
 msgid ""
 "If the SIM is locked with a PIN it must be unlocked before any other "
 "operations are requested.  Specify the PIN here to allow operation of the "
 "device."
 msgstr ""
-"如果 SIM 被 PIN 锁住了,在请求任何其他操作前必须解锁。在这里指定 PIN 以允许设"
-"备的操作。"
 
-#: ../clients/common/settings-docs.h.in:176
+#: ../clients/common/settings-docs.c.in:187
 msgid ""
 "The SIM card unique identifier (as given by the WWAN management service) "
 "which this connection applies to.  If given, the connection will apply to "
 "any device also allowed by \"device-id\" which contains a SIM card matching "
 "the given identifier."
 msgstr ""
-"此连接应用的 SIM 卡的唯一标识符(由 WWAN 管理服务给定)。如果给定了,此连接将"
-"应用到包含匹配给定标识符 SIM 卡的 \"device-id\" 所允许的任何设备。"
 
-#: ../clients/common/settings-docs.h.in:177
+#: ../clients/common/settings-docs.c.in:188
 msgid ""
 "A MCC/MNC string like \"310260\" or \"21601\" identifying the specific "
 "mobile network operator which this connection applies to.  If given, the "
 "connection will apply to any device also allowed by \"device-id\" and \"sim-"
 "id\" which contains a SIM card provisioned by the given operator."
 msgstr ""
-"一个如 \"310260\" 或 \"21601\" 的 MCC/MNC 字符串,用来鉴定此连接应用到的指定"
-"移动网络运营商。如果给定了,连接将应用到包含给定运营商提供 SIM 卡的 \"device-"
-"id\" 和 \"sim-id\" 所允许的任何设备。"
 
-#: ../clients/common/settings-docs.h.in:179
+#: ../clients/common/settings-docs.c.in:190
 msgid ""
 "If specified, this connection will only apply to the IPoIB device whose "
 "permanent MAC address matches. This property does not change the MAC address "
 "of the device (i.e. MAC spoofing)."
 msgstr ""
-"如指定了,此连接将只应用到符合永久 MAC 地址的 IPoIB 设备。此属性不会改变设备"
-"的 MAC 地址(例如 MAC 欺骗)。"
 
-#: ../clients/common/settings-docs.h.in:181
+#: ../clients/common/settings-docs.c.in:193
 msgid ""
 "The InfiniBand P_Key to use for this device. A value of -1 means to use the "
 "default P_Key (aka \"the P_Key at index 0\").  Otherwise it is a 16-bit "
 "unsigned integer, whose high bit is set if it is a \"full membership\" P_Key."
 msgstr ""
-"用于此设备的 InfiniBand P_Key。值 -1 代表使用默认的 P_Key(又名 \"索引 0 的 "
-"P_Key\")。否则它是个 16 位无符号整数,其高位已设定如果它是个 \"正式会员\" "
-"P_Key。"
 
-#: ../clients/common/settings-docs.h.in:182
+#: ../clients/common/settings-docs.c.in:194
 msgid ""
 "The interface name of the parent device of this device. Normally NULL, but "
 "if the \"p_key\" property is set, then you must specify the base device by "
 "setting either this property or \"mac-address\"."
 msgstr ""
-"此设备的上级设备的接口名称。一般是 NULL,但如果 \"p_key\" 已设定,您必须通过"
-"设置此属性或 \"mac-address\" 来指定基础设备。"
 
-#: ../clients/common/settings-docs.h.in:183
+#: ../clients/common/settings-docs.c.in:195
 msgid ""
 "The IP-over-InfiniBand transport mode. Either \"datagram\" or \"connected\"."
 msgstr ""
-"IP-over-InfiniBand 传输模式。要么为 \"datagram\" 要么为 \"connected\"。"
 
-#: ../clients/common/settings-docs.h.in:184
+#: ../clients/common/settings-docs.c.in:196
 msgid ""
 "How many additional levels of encapsulation are permitted to be prepended to "
 "packets. This property applies only to IPv6 tunnels."
-msgstr "允许多少个附加的封装等级预置到数据包。此属性值只应用到 IPv6 隧道。"
-
-#: ../clients/common/settings-docs.h.in:185
-msgid ""
-"Tunnel flags. Currently the following values are supported: "
-"NM_IP_TUNNEL_FLAG_IP6_IGN_ENCAP_LIMIT (0x1), "
-"NM_IP_TUNNEL_FLAG_IP6_USE_ORIG_TCLASS (0x2), "
-"NM_IP_TUNNEL_FLAG_IP6_USE_ORIG_FLOWLABEL (0x4), "
-"NM_IP_TUNNEL_FLAG_IP6_MIP6_DEV (0x8), NM_IP_TUNNEL_FLAG_IP6_RCV_DSCP_COPY "
-"(0x10), NM_IP_TUNNEL_FLAG_IP6_USE_ORIG_FWMARK (0x20). They are valid only "
-"for IPv6 tunnels."
 msgstr ""
-"隧道标志。当前支持下列值:NM_IP_TUNNEL_FLAG_IP6_IGN_ENCAP_LIMIT (0x1)、"
-"NM_IP_TUNNEL_FLAG_IP6_USE_ORIG_TCLASS (0x2)、"
-"NM_IP_TUNNEL_FLAG_IP6_USE_ORIG_FLOWLABEL (0x4)、"
-"NM_IP_TUNNEL_FLAG_IP6_MIP6_DEV (0x8)、NM_IP_TUNNEL_FLAG_IP6_RCV_DSCP_COPY "
-"(0x10)、NM_IP_TUNNEL_FLAG_IP6_USE_ORIG_FWMARK (0x20)。它们只对 IPv6 隧道有"
-"效。"
 
-#: ../clients/common/settings-docs.h.in:186
+#: ../clients/common/settings-docs.c.in:197
 msgid ""
 "The flow label to assign to tunnel packets. This property applies only to "
 "IPv6 tunnels."
-msgstr "要分配到隧道数据包的流量标签。此属性只应用到 IPv6 隧道。"
+msgstr ""
 
-#: ../clients/common/settings-docs.h.in:187
+#: ../clients/common/settings-docs.c.in:198
 msgid ""
 "The key used for tunnel input packets; the property is valid only for "
 "certain tunnel modes (GRE, IP6GRE). If empty, no key is used."
 msgstr ""
-"用于隧道输入数据包的密钥。该属性值对某些隧道模式有效(GRE、IP6GRE)。如果留空"
-"则不使用密钥。"
 
-#: ../clients/common/settings-docs.h.in:188
+#: ../clients/common/settings-docs.c.in:199
 msgid ""
 "The local endpoint of the tunnel; the value can be empty, otherwise it must "
 "contain an IPv4 or IPv6 address."
-msgstr "隧道的本地端点。值可以为空,否则它必须包含一个 IPv4 或 IPv6 地址。"
+msgstr ""
 
-#: ../clients/common/settings-docs.h.in:189
+#: ../clients/common/settings-docs.c.in:200
 msgid ""
 "The tunneling mode, for example NM_IP_TUNNEL_MODE_IPIP (1) or "
 "NM_IP_TUNNEL_MODE_GRE (2)."
 msgstr ""
-"隧道模式,例如 NM_IP_TUNNEL_MODE_IPIP (1) 或 NM_IP_TUNNEL_MODE_GRE (2)。"
 
-#: ../clients/common/settings-docs.h.in:190
+#: ../clients/common/settings-docs.c.in:201
 msgid ""
 "If non-zero, only transmit packets of the specified size or smaller, "
 "breaking larger packets up into multiple fragments."
-msgstr "如果非零,只传输指定大小或更小的数据包,将较大的数据包分成多个帧。"
+msgstr ""
 
-#: ../clients/common/settings-docs.h.in:191
+#: ../clients/common/settings-docs.c.in:203
 msgid ""
 "The key used for tunnel output packets; the property is valid only for "
 "certain tunnel modes (GRE, IP6GRE). If empty, no key is used."
 msgstr ""
-"用于隧道输出数据包的密钥。该属性值对某些隧道模式有效(GRE、IP6GRE)。如果留空"
-"则不使用密钥。"
 
-#: ../clients/common/settings-docs.h.in:192
+#: ../clients/common/settings-docs.c.in:204
 msgid ""
 "If given, specifies the parent interface name or parent connection UUID the "
 "new device will be bound to so that tunneled packets will only be routed via "
 "that interface."
 msgstr ""
-"如果给定了,指定新设备将绑定到的上级接口名或上级连接 UUID,以让隧道的数据包只"
-"能通过该接口进行路由。"
 
-#: ../clients/common/settings-docs.h.in:193
+#: ../clients/common/settings-docs.c.in:205
 msgid "Whether to enable Path MTU Discovery on this tunnel."
-msgstr "是否在此隧道启用路径 MTU 发现。"
+msgstr ""
 
-#: ../clients/common/settings-docs.h.in:194
+#: ../clients/common/settings-docs.c.in:206
 msgid ""
 "The remote endpoint of the tunnel; the value must contain an IPv4 or IPv6 "
 "address."
-msgstr "隧道的远程端点;值必须包含一个 IPv4 或 IPv6 地址。"
+msgstr ""
 
-#: ../clients/common/settings-docs.h.in:195
+#: ../clients/common/settings-docs.c.in:207
 msgid ""
 "The type of service (IPv4) or traffic class (IPv6) field to be set on "
 "tunneled packets."
-msgstr "设定在隧道数据包上的服务类型(IPv4)或流量等级(IPv6)字段。"
+msgstr ""
 
-#: ../clients/common/settings-docs.h.in:196
+#: ../clients/common/settings-docs.c.in:208
 msgid ""
 "The TTL to assign to tunneled packets. 0 is a special value meaning that "
 "packets inherit the TTL value."
-msgstr "分配到隧道数据包的 TTL。0 为特殊值,表示数据包继承 TTL 值。"
+msgstr ""
 
-#: ../clients/common/settings-docs.h.in:197
-#: ../clients/common/settings-docs.h.in:218
+#: ../clients/common/settings-docs.c.in:209
+#: ../clients/common/settings-docs.c.in:231
 msgid "Array of IP addresses."
-msgstr "IP 地址数组。"
+msgstr ""
 
-#: ../clients/common/settings-docs.h.in:198
-#: ../clients/common/settings-docs.h.in:219
+#: ../clients/common/settings-docs.c.in:210
+#: ../clients/common/settings-docs.c.in:232
 msgid ""
 "Timeout in milliseconds used to check for the presence of duplicate IP "
 "addresses on the network.  If an address conflict is detected, the "
 "activation will fail.  A zero value means that no duplicate address "
 "detection is performed, -1 means the default value (either configuration "
-"ipvx.dad-timeout override or zero).  A value greater than zero is a timeout "
-"in milliseconds. The property is currently implemented only for IPv4."
+"ipvx.dad-timeout override or 3 seconds).  A value greater than zero is a "
+"timeout in milliseconds."
 msgstr ""
-"用于检查网络中是否存在重复 IP 地址的超时时间。如果检测到了冲突,激活将失败。"
-"零值表示不执行重复 IP 检查,-1 表示默认值(配置 ipvx.dad-timeout 覆盖或 3 "
-"秒)。大于零的值为以毫秒计算的超时时间。该属性当前只实现于 IPv4。"
 
-#: ../clients/common/settings-docs.h.in:199
+#: ../clients/common/settings-docs.c.in:211
 msgid ""
 "A string sent to the DHCP server to identify the local machine which the "
 "DHCP server may use to customize the DHCP lease and options. When the "
@@ -7878,47 +6998,26 @@ msgid ""
 "RFC 2132 section 9.14 and the remaining bytes may be an hardware address (e."
 "g. '01:xx:xx:xx:xx:xx:xx' where 1 is the Ethernet ARP type and the rest is a "
 "MAC address). If the property is not a hex string it is considered as a non-"
-"hardware-address client ID and the 'type' field is set to 0. The special "
-"values \"mac\" and \"perm-mac\" are supported, which use the current or "
-"permanent MAC address of the device to generate a client identifier with "
-"type ethernet (01). Currently, these options only work for ethernet type of "
-"links. The special value \"stable\" is supported to generate a type 0 client "
-"identifier based on the stable-id (see connection.stable-id) and a per-host "
-"key. If unset, a globally configured default is used. If still unset, the "
-"client-id from the last lease is reused."
-msgstr ""
-"发送到 DHCP 服务器的字符串,用以确定 DHCP 服务器可能用于自定义 DHCP 租约和选"
-"项的本地机器。当属性值为十六进制字符串时,将其解读为二进制的客户端 ID,这种情"
-"况下根据 RFC 2132 章节 9.14 首字节被认为是 \"type\" 字段而剩下的字节可为一个"
-"硬件地址(例如 \"01:xx:xx:xx:xx:xx:xx\" 中 1 是以太网 ARP 类型而其余的是个 "
-"MAC 地址)。如果属性不是十六进制字符串,它被视作非硬件地址客户端 ID 且 \"type"
-"\" 字段被设为 0。支持特殊值 \"mac\" 和 \"perm-mac\",其使用设备的当前或永久 "
-"MAC 地址来生成类型为以太网类型 (01) 的客户端标识符。当前这些选项仅适用于以太"
-"网类型的链路。支持特殊值 \"stable\" 基于 stable-id 和每个主机的密钥生成一个类"
-"型 0 的客户端标识符(参见 connection.stable-id)。如果未设,使用全局默认值。"
-"如果仍未设定,重新使用来自上个租约的 client-id。"
-
-#: ../clients/common/settings-docs.h.in:200
+"hardware-address client ID and the 'type' field is set to 0."
+msgstr ""
+
+#: ../clients/common/settings-docs.c.in:212
 msgid ""
 "If the \"dhcp-send-hostname\" property is TRUE, then the specified FQDN will "
 "be sent to the DHCP server when acquiring a lease. This property and \"dhcp-"
 "hostname\" are mutually exclusive and cannot be set at the same time."
 msgstr ""
-"如果 \"dhcp-send-hostname\" 属性为 TRUE,当获取租约时指定的 FQDN 将被发送到 "
-"DHCP 服务器。此属性与 \"dhcp-hostname\" 相互排斥而且无法被同时设定。"
 
-#: ../clients/common/settings-docs.h.in:201
-#: ../clients/common/settings-docs.h.in:221
+#: ../clients/common/settings-docs.c.in:213
+#: ../clients/common/settings-docs.c.in:233
 msgid ""
 "If the \"dhcp-send-hostname\" property is TRUE, then the specified name will "
 "be sent to the DHCP server when acquiring a lease. This property and \"dhcp-"
 "fqdn\" are mutually exclusive and cannot be set at the same time."
 msgstr ""
-"如果 \"dhcp-send-hostname\" 属性为 TRUE,当获取租约时指定的名称将被发送到 "
-"DHCP 服务器。此属性与 \"dhcp-fqdn\" 相互排斥而且无法被同时设定。"
 
-#: ../clients/common/settings-docs.h.in:202
-#: ../clients/common/settings-docs.h.in:222
+#: ../clients/common/settings-docs.c.in:214
+#: ../clients/common/settings-docs.c.in:234
 msgid ""
 "If TRUE, a hostname is sent to the DHCP server when acquiring a lease. Some "
 "DHCP servers use this hostname to update DNS databases, essentially "
@@ -7926,112 +7025,75 @@ msgid ""
 "property is NULL and this property is TRUE, the current persistent hostname "
 "of the computer is sent."
 msgstr ""
-"如果为 TRUE,当获取租约时发送主机名到 DHCP 服务器。有些 DHCP 服务器使用这个主"
-"机名来更新 DNS 数据库,实质上为计算机提供了个静态的主机名。如果 \"dhcp-"
-"hostname\" 属性为 NULL 且此属性为 TRUE,以计算机的当前永久主机。"
 
-#: ../clients/common/settings-docs.h.in:203
-#: ../clients/common/settings-docs.h.in:223
+#: ../clients/common/settings-docs.c.in:215
+#: ../clients/common/settings-docs.c.in:235
 msgid "A timeout for a DHCP transaction in seconds."
-msgstr "DHCP 事务的超时时间,以秒计。"
+msgstr ""
 
-#: ../clients/common/settings-docs.h.in:204
-#: ../clients/common/settings-docs.h.in:224
+#: ../clients/common/settings-docs.c.in:216
+#: ../clients/common/settings-docs.c.in:236
 msgid "Array of IP addresses of DNS servers."
-msgstr "DNS 服务器的 IP 地址数组。"
+msgstr ""
 
-#: ../clients/common/settings-docs.h.in:205
-#: ../clients/common/settings-docs.h.in:225
+#: ../clients/common/settings-docs.c.in:217
+#: ../clients/common/settings-docs.c.in:237
 msgid ""
 "Array of DNS options as described in man 5 resolv.conf. NULL means that the "
 "options are unset and left at the default. In this case NetworkManager will "
 "use default options. This is distinct from an empty list of properties."
 msgstr ""
-"在 man 5 resolv.conf 中描述的 DNS 选项数组。NULL 代表选项未设定并保留默认值。"
-"此情况下网络管理器(NetworkManager)将使用默认选项。这跟空列表的属性不同。"
 
-#: ../clients/common/settings-docs.h.in:206
-#: ../clients/common/settings-docs.h.in:226
+#: ../clients/common/settings-docs.c.in:218
+#: ../clients/common/settings-docs.c.in:238
 msgid ""
-"DNS servers priority. The relative priority for DNS servers specified by "
-"this setting.  A lower value is better (higher priority).  Zero selects the "
-"default value, which is 50 for VPNs and 100 for other connections. Note that "
-"the priority is to order DNS settings for multiple active connections.  It "
-"does not disambiguate multiple DNS servers within the same connection "
-"profile. When using dns=default, servers with higher priority will be on top "
-"of resolv.conf.  To prioritize a given server over another one within the "
-"same connection, just specify them in the desired order.  When multiple "
+"Intra-connection DNS priority. The relative priority to be used when "
+"determining the order of DNS servers in resolv.conf.  A lower value means "
+"that servers will be on top of the file.  Zero selects the default value, "
+"which is 50 for VPNs and 100 for other connections.  Note that the priority "
+"is to order DNS settings for multiple active connections. It does not "
+"disambiguate multiple DNS servers within the same connection profile. For "
+"that, just specify the DNS servers in the desired order. When multiple "
 "devices have configurations with the same priority, the one with an active "
-"default route will be preferred.  Negative values have the special effect of "
-"excluding other configurations with a greater priority value; so in presence "
-"of at least a negative priority, only DNS servers from connections with the "
-"lowest priority value will be used. When using a DNS resolver that supports "
-"split-DNS as dns=dnsmasq or dns=systemd-resolved, each connection is used to "
-"query domains in its search list.  Queries for domains not present in any "
-"search list are routed through connections having the '~.' special wildcard "
-"domain, which is added automatically to connections with the default route "
-"(or can be added manually).  When multiple connections specify the same "
-"domain, the one with the highest priority (lowest numerical value) wins.  If "
-"a connection specifies a domain which is subdomain of another domain with a "
-"negative DNS priority value, the subdomain is ignored."
-msgstr ""
-"DNS 服务器优先级。此设置指定 DNS 服务器的相关优先级。值越低优先级越高。零代表"
-"默认值,即 50 用于 VPN 和 100 用于其他连接。注意此优先级用于为多个活动连接排"
-"序 DNS 设置。它不是对同个连接配置集中的多个 DNS 服务器进行明确选择。当使用 "
-"dns=default 时,更高优先级的服务器将在 resolv.conf 里的更顶部。要让给定服务器"
-"优先于同连接内的另一服务器,只要以期望的顺序指定它们就行。当多个设备配置了同"
-"样的优先级,将优先选择活动默认路由的那一个。注意当使用 dns=dnsmasq 时,此顺序"
-"无意义因为 dnsmasq 同时转发查询到所有已知服务器。负值具有排除其他拥有更高优先"
-"级值的配置的特殊效果;所以存在至少一个负值优先级的情况下,只使用具有最低优先"
-"级值的连接的 DNS 服务器。当使用支持拆分 DNS 为 dns=dnsmasq 或 dns=systemd-"
-"resolved 的 DNS 解析器时,每个连接用于查询它搜索列表中的域。未在任何搜索列表"
-"中的域查询会由具有 \"~.\" 特殊通配符的域进行路由,被自动以默认路由添加到连接"
-"(或可以手动添加)。当多个连接指定了同个域时,拥有最高权限(最低的数值)的那"
-"个连接将获选。如果连接指定了个域,其为具有负 DNS 优先级值的另一域的子域,那这"
-"个子域会被忽略。"
-
-#: ../clients/common/settings-docs.h.in:207
-#: ../clients/common/settings-docs.h.in:227
-msgid ""
-"Array of DNS search domains. Domains starting with a tilde ('~') are "
-"considered 'routing' domains and are used only to decide the interface over "
-"which a query must be forwarded; they are not used to complete unqualified "
-"host names."
-msgstr ""
-"DNS 搜索域的数组。域以半角波浪号(\"~\")开头的视为 \"路由\" 域并只用于确定查"
-"询必须转发的接口;它们不用于完全未限定的主机名。"
-
-#: ../clients/common/settings-docs.h.in:208
-#: ../clients/common/settings-docs.h.in:228
+"default route will be preferred. Note that when using dns=dnsmasq the order "
+"is meaningless since dnsmasq forwards queries to all known servers at the "
+"same time. Negative values have the special effect of excluding other "
+"configurations with a greater priority value; so in presence of at least a "
+"negative priority, only DNS servers from connections with the lowest "
+"priority value will be used."
+msgstr ""
+
+#: ../clients/common/settings-docs.c.in:219
+#: ../clients/common/settings-docs.c.in:239
+msgid "Array of DNS search domains."
+msgstr ""
+
+#: ../clients/common/settings-docs.c.in:220
+#: ../clients/common/settings-docs.c.in:240
 msgid ""
 "The gateway associated with this configuration. This is only meaningful if "
 "\"addresses\" is also set."
-msgstr "与此配置关联的网关。这只在 \"addresses\" 也设定的时候有意义。"
+msgstr ""
 
-#: ../clients/common/settings-docs.h.in:209
-#: ../clients/common/settings-docs.h.in:229
+#: ../clients/common/settings-docs.c.in:221
+#: ../clients/common/settings-docs.c.in:241
 msgid ""
 "When \"method\" is set to \"auto\" and this property to TRUE, automatically "
 "configured nameservers and search domains are ignored and only nameservers "
 "and search domains specified in the \"dns\" and \"dns-search\" properties, "
 "if any, are used."
 msgstr ""
-"当 \"method\" 设为 \"auto\" 且此属性为 TRUE 时,自动配置的名称服务器和搜索域"
-"被忽略且只有 \"dns\" 和 \"dns-search\" 属性中指定的名称服务器和搜索域被使用,"
-"如果有的话。"
 
-#: ../clients/common/settings-docs.h.in:210
-#: ../clients/common/settings-docs.h.in:230
+#: ../clients/common/settings-docs.c.in:222
+#: ../clients/common/settings-docs.c.in:242
 msgid ""
 "When \"method\" is set to \"auto\" and this property to TRUE, automatically "
 "configured routes are ignored and only routes specified in the \"routes\" "
 "property, if any, are used."
 msgstr ""
-"当 \"method\" 设为 \"auto\" 且此属性为 TRUE 时,自动配置的路由被忽略且只有 "
-"\"routes\" 属性中指定的路由被使用,如果有的话。"
 
-#: ../clients/common/settings-docs.h.in:211
-#: ../clients/common/settings-docs.h.in:232
+#: ../clients/common/settings-docs.c.in:223
+#: ../clients/common/settings-docs.c.in:244
 msgid ""
 "If TRUE, allow overall network configuration to proceed even if the "
 "configuration specified by this property times out.  Note that at least one "
@@ -8040,13 +7102,9 @@ msgid ""
 "the NMSettingIP4Config allows the overall network configuration to succeed "
 "if IPv4 configuration fails but IPv6 configuration completes successfully."
 msgstr ""
-"如果为 TURE,允许进行整体网络配置不管此属性指定的配置是否超时。注意至少要有一"
-"个 IP 配置成功不然整体网络配置仍将失败。示例,在纯 IPv6 网络,在 "
-"NMSettingIP4Config 设置此属性为 TRUE 时允许整体网络配置在 IPv4 配置失败但 "
-"IPv6 配置成功完成时成功。"
 
-#: ../clients/common/settings-docs.h.in:212
-#: ../clients/common/settings-docs.h.in:233
+#: ../clients/common/settings-docs.c.in:224
+#: ../clients/common/settings-docs.c.in:245
 msgid ""
 "IP configuration method. NMSettingIP4Config and NMSettingIP6Config both "
 "support \"auto\", \"manual\", and \"link-local\". See the subclass-specific "
@@ -8059,25 +7117,16 @@ msgid ""
 "subnet can be configured by adding one manual IPv4 address or otherwise "
 "10.42.x.0/24 is chosen."
 msgstr ""
-"IP 配置方法。NMSettingIP4Config 和 NMSettingIP6Config 都支持 \"auto"
-"\"、\"manual\" 和 \"link-local\"。其他值请查看子类特定的文档。通常,对于 "
-"\"auto\" 方法,诸如 \"dns\" 和 \"routes\" 之类的属性指定添加到从自动配置返回"
-"信息的信息。\"ignore-auto-routes\" 和 \"ignore-auto-dns\" 属性会修改此行为。"
-"对于没有上游网络的方法,比如 \"shared\" 或 \"link-local\",这些属性必须为空。"
-"对于 IPv4 方法 \"shared\",配置 IP 子网可通过添加一个手动的 IPv4 地址或是选"
-"择 10.42.x.0/24 完成。"
 
-#: ../clients/common/settings-docs.h.in:213
-#: ../clients/common/settings-docs.h.in:234
+#: ../clients/common/settings-docs.c.in:226
+#: ../clients/common/settings-docs.c.in:247
 msgid ""
 "If TRUE, this connection will never be the default connection for this IP "
 "type, meaning it will never be assigned the default route by NetworkManager."
 msgstr ""
-"如果为 TRUE,此连接将永不成为此 IP 类型的默认连接,这表示网络管理器"
-"(NetworkManager)永远不会为其分配默认路由。"
 
-#: ../clients/common/settings-docs.h.in:214
-#: ../clients/common/settings-docs.h.in:235
+#: ../clients/common/settings-docs.c.in:227
+#: ../clients/common/settings-docs.c.in:248
 msgid ""
 "The default metric for routes that don't explicitly specify a metric. The "
 "default value -1 means that the metric is chosen automatically based on the "
@@ -8087,13 +7136,9 @@ msgid ""
 "it to 1024 (user default). Hence, setting this property to zero effectively "
 "mean setting it to 1024. For IPv4, zero is a regular value for the metric."
 msgstr ""
-"用于没有明确指定跃点的路由器的默认跃点。默认值 -1 表示根据设备类型自动选择跃"
-"点。该跃点应用到自动路由、没有明确跃点设置的手动(静态)路由、地址前缀路由和"
-"默认路由。注意对于 IPv6,内核接受零值(0)但会将其转为 1024(用户默认)。因"
-"此,设置此属性为零等于设置它为 1024。对于 IPv4,零是跃点的常规值。"
 
-#: ../clients/common/settings-docs.h.in:215
-#: ../clients/common/settings-docs.h.in:236
+#: ../clients/common/settings-docs.c.in:228
+#: ../clients/common/settings-docs.c.in:249
 msgid ""
 "Enable policy routing (source routing) and set the routing table used when "
 "adding routes. This affects all routes, including device-routes, IPv4LL, "
@@ -8109,20 +7154,13 @@ msgid ""
 "This is to preserve backward compatibility for users who manage routing "
 "tables outside of NetworkManager."
 msgstr ""
-"启用策略路由(源路由)并在添加路由时设定路由表。此属性影响所有的路由器,包括"
-"设备路由、IPv4LL、DHCP、SLAAC、默认路由和静态路由。但请注意静态路由可以通过明"
-"确地指定非零的路由表来自己覆盖掉设置。如果表设置保留为零,它有权被全局配置覆"
-"盖。如果在应用全局配置值后属性仍为零,对此连接的地址族禁用策略路由。禁用策略"
-"路由意味着网络管理器(NetworkManager)将添加所有路由到主表(除了明确配置了不"
-"同路由表的静态路由)。另外,网络管理器将不会从表中删除任何外部路由,除了主路"
-"由。这是为了给用网络管理器之外工具管理路由表的用户保持后向兼容性。"
 
-#: ../clients/common/settings-docs.h.in:216
-#: ../clients/common/settings-docs.h.in:237
+#: ../clients/common/settings-docs.c.in:229
+#: ../clients/common/settings-docs.c.in:250
 msgid "Array of IP routes."
-msgstr "IP 路由数组。"
+msgstr ""
 
-#: ../clients/common/settings-docs.h.in:217
+#: ../clients/common/settings-docs.c.in:230
 msgid ""
 "Configure method for creating the address for use with RFC4862 IPv6 "
 "Stateless Address Autoconfiguration. The permitted values are: "
@@ -8143,61 +7181,8 @@ msgid ""
 "Privacy Extensions as configured by \"ip6-privacy\" property and it does not "
 "affect the temporary addresses configured with this option."
 msgstr ""
-"创建用于 RFC4862 IPv6 无状态地址自动配置的地址的配置方法。允许的值有:"
-"NM_SETTING_IP6_CONFIG_ADDR_GEN_MODE_EUI64 (0) 或 "
-"NM_SETTING_IP6_CONFIG_ADDR_GEN_MODE_STABLE_PRIVACY (1)。如果属性设为 EUI64,"
-"地址将使用衍生自硬件地址的接口令牌来生成。这会让地址的主机部分保持不变,使得"
-"在地址变化时能够追踪主机的存在。接口硬件被替换时地址改变。stable-privacy 值启"
-"用主机特定密钥的加密安全散列,随同连接的 stable-id 和由 RFC7217 指定的网络地"
-"址一起使用。这使得可以利用地址追踪主机的存在,且在网络接口硬件被替换时能保持"
-"地址固定。在 D-Bus 上,没有 addr-gen-mode 设置等于启用 stable-privacy。对于密"
-"钥文件,磁盘上没有设置则表示 EUI6,因此属性在从旧版本升级时不会改变。注意此设"
-"置与由 \"ip6-privacy\" 配置的隐私扩展不同,而且它不会影响此选项配置的临时地"
-"址。"
-
-#: ../clients/common/settings-docs.h.in:220
-msgid ""
-"A string containing the DHCPv6 Unique Identifier (DUID) used by the dhcp "
-"client to identify itself to DHCPv6 servers (RFC 3315). The DUID is carried "
-"in the Client Identifier option. If the property is a hex string ('aa:bb:"
-"cc') it is interpreted as a binary DUID and filled as an opaque value in the "
-"Client Identifier option. The special value \"lease\" will retrieve the DUID "
-"previously used from the lease file belonging to the connection. If no DUID "
-"is found and \"dhclient\" is the configured dhcp client, the DUID is "
-"searched in the system-wide dhclient lease file. If still no DUID is found, "
-"or another dhcp client is used, a global and permanent DUID-UUID (RFC 6355) "
-"will be generated based on the machine-id. The special values \"llt\" and "
-"\"ll\" will generate a DUID of type LLT or LL (see RFC 3315) based on the "
-"current MAC address of the device. In order to try providing a stable DUID-"
-"LLT, the time field will contain a constant timestamp that is used globally "
-"(for all profiles) and persisted to disk. The special values \"stable-llt\", "
-"\"stable-ll\" and \"stable-uuid\" will generate a DUID of the corresponding "
-"type, derived from the connection's stable-id and a per-host unique key. So, "
-"the link-layer address of \"stable-ll\" and \"stable-llt\" will be a "
-"generated address derived from the stable id. The DUID-LLT time value in the "
-"\"stable-llt\" option will be picked among a static timespan of three years "
-"(the upper bound of the interval is the same constant timestamp used in \"llt"
-"\"). When the property is unset, the global value provided for \"ipv6.dhcp-"
-"duid\" is used. If no global value is provided, the default \"lease\" value "
-"is assumed."
-msgstr ""
-"包含 DHCPv6 唯一标识符(DUID)的字符串,用于 dhcp 客户端鉴定它自己到 DHCPv6 "
-"服务器(RFC 3315)。DUID 携带在客户端标识符选项中。如果属性为十六进制的字符串"
-"(\"aa:bb:cc\"),它被解读为二进制 DUID 并在客户端标识符选项中以不透明值填"
-"充。特殊值 \"lease\" 将重试连接所属租约文件上次使用的 DUID。如果为找到且 "
-"\"dhclient\" 为配置的 dhcp 客户端,DUID 将在系统范围的 dhclient 租约文件中搜"
-"索。如果仍为找到 DUID 或使用了其他 dhcp 客户端,将基于 machine-id 生成全局和"
-"永久的 DUID-UUID(RFC 6355)。特殊值 \"llt\" 和 \"ll\" 将基于设备的当前 MAC "
-"地址生成 LLT 或 LL 类型的 DUID(参阅 RFC 3315)。为了试着提供稳定的 DUID-"
-"LLT,时间字段将包含固定时间戳,用于全局(的所有配置集)且保留到磁盘上。特殊"
-"值 \"stable-llt\"、\"stable-ll\" 和 \"stable-uuid\" 将生成相应类型的 DUID,衍"
-"生自连接的 stable-id 和每个主机的唯一密钥。因此,\"stable-ll\" 和 \"stable-"
-"llt\" 的链路层地址将是衍生自稳定 id 的生成地址。\"stable-llt\" 选项中的 DUID-"
-"LLT 时间值将在静态的三年时间跨度中选择(区间的上限与用在 \"llt\" 中的固定时间"
-"戳相同)。当属性未设定时,使用 \"ipv6.dhcp-duid\" 提供的全局值。如果未提供全"
-"局值,认定为默认的 \"lease\" 值。"
-
-#: ../clients/common/settings-docs.h.in:231
+
+#: ../clients/common/settings-docs.c.in:243
 msgid ""
 "Configure IPv6 Privacy Extensions for SLAAC, described in RFC4941.  If "
 "enabled, it makes the kernel generate a temporary IPv6 address in addition "
@@ -8213,419 +7198,316 @@ msgid ""
 "\"stable-privacy\" setting as another way of avoiding host tracking with "
 "IPv6 addresses."
 msgstr ""
-"配置 SLAAC 的 IPv6 隐私扩展,描述于 RFC4941。如果启用,它让内核通过修改 "
-"EUI-64 生成临时的 IPv6 地址附加到从 MAC 地址生成的公共地址上。此可以增强隐私"
-"性,但另一方面也可能在有些应用程序上引起问题。允许的值有:-1,未知;0:禁用;"
-"1:启用(首选公共地址);2:启用(首选临时地址)。把单个连接的设置设为 "
-"\"-1\" 表示其回落到全局配置 \"ipv6.ip6-privacy\"。如果全局配置也为配置或设为 "
-"\"-1\",回落到读取 \"/proc/sys/net/ipv6/conf/default/use_tempaddr\" 的值。注"
-"意此设置与固定隐私地址不同,后者可通过 \"addr-gen-mode\" 属性的 \"stable-"
-"privacy\" 设置启用,可作为避免 IPv6 地址追踪的另一种方法。"
 
-#: ../clients/common/settings-docs.h.in:238
+#: ../clients/common/settings-docs.c.in:251
 msgid ""
 "Configure the token for draft-chown-6man-tokenised-ipv6-identifiers-02 IPv6 "
 "tokenized interface identifiers. Useful with eui64 addr-gen-mode."
 msgstr ""
-"配置用于 draft-chown-6man-tokenised-ipv6-identifiers-02 IPv6 令牌化接口标识符"
-"的令牌。对 eui64 addr-gen-mode 有用。"
 
-#: ../clients/common/settings-docs.h.in:239
+#: ../clients/common/settings-docs.c.in:252
 msgid "Whether the transmitted traffic must be encrypted."
-msgstr "是否加密传输的流量。"
+msgstr ""
 
-#: ../clients/common/settings-docs.h.in:240
+#: ../clients/common/settings-docs.c.in:253
 msgid ""
 "The pre-shared CAK (Connectivity Association Key) for MACsec Key Agreement."
-msgstr "用于 MACsec 密钥协商的预共享 CAK。"
+msgstr ""
 
-#: ../clients/common/settings-docs.h.in:241
+#: ../clients/common/settings-docs.c.in:254
 msgid "Flags indicating how to handle the \"mka-cak\" property."
-msgstr "指示如何处理 \"mka-cak\" 属性的标志。"
+msgstr ""
 
-#: ../clients/common/settings-docs.h.in:242
+#: ../clients/common/settings-docs.c.in:255
 msgid ""
 "The pre-shared CKN (Connectivity-association Key Name) for MACsec Key "
 "Agreement."
-msgstr "用于 MACsec 密钥协商的预共享 CKN(连接关联密钥名称)。"
+msgstr ""
 
-#: ../clients/common/settings-docs.h.in:243
+#: ../clients/common/settings-docs.c.in:256
 msgid ""
 "Specifies how the CAK (Connectivity Association Key) for MKA (MACsec Key "
 "Agreement) is obtained."
-msgstr "指定如何获取用于 MKA(MACsec 密钥协商)的 CAK(连接关联密钥)。"
+msgstr ""
 
-#: ../clients/common/settings-docs.h.in:244
+#: ../clients/common/settings-docs.c.in:258
 msgid ""
 "If given, specifies the parent interface name or parent connection UUID from "
 "which this MACSEC interface should be created.  If this property is not "
 "specified, the connection must contain an \"802-3-ethernet\" setting with a "
 "\"mac-address\" property."
 msgstr ""
-"如果给定了,其指定从此 MACSEC 接口应该创建自的上级接口名称或上级连接的 UUID。"
-"如果此属性未指定,该连接必须包含具有 \"mac-address\" 属性的 \"802-3-ethernet"
-"\" 设置。"
 
-#: ../clients/common/settings-docs.h.in:245
+#: ../clients/common/settings-docs.c.in:259
 msgid ""
 "The port component of the SCI (Secure Channel Identifier), between 1 and "
 "65534."
-msgstr "SCI(安全信道标识符)的端口组件,介于 1 和 65534 之间。"
-
-#: ../clients/common/settings-docs.h.in:246
-msgid ""
-"Specifies whether the SCI (Secure Channel Identifier) is included in every "
-"packet."
-msgstr "指定 SCI(安全信道标识符)是否包括在每个数据包中。"
+msgstr ""
 
-#: ../clients/common/settings-docs.h.in:247
+#: ../clients/common/settings-docs.c.in:260
 msgid "Specifies the validation mode for incoming frames."
-msgstr "指定传入帧的验证模式。"
+msgstr ""
 
-#: ../clients/common/settings-docs.h.in:248
+#: ../clients/common/settings-docs.c.in:261
 msgid ""
 "The macvlan mode, which specifies the communication mechanism between "
 "multiple macvlans on the same lower device."
-msgstr "macvlan 模式,它指定了同一低层设备上的多个 macvlans 之间的通信机制。"
+msgstr ""
 
-#: ../clients/common/settings-docs.h.in:249
+#: ../clients/common/settings-docs.c.in:263
 msgid ""
 "If given, specifies the parent interface name or parent connection UUID from "
 "which this MAC-VLAN interface should be created.  If this property is not "
 "specified, the connection must contain an \"802-3-ethernet\" setting with a "
 "\"mac-address\" property."
 msgstr ""
-"如果给定了,其指定从此 MAC-VLAN 接口应该创建自的上级接口名称或上级连接的 "
-"UUID。如果此属性未指定,该连接必须包含具有 \"mac-address\" 属性的 \"802-3-"
-"ethernet\" 设置。"
 
-#: ../clients/common/settings-docs.h.in:250
+#: ../clients/common/settings-docs.c.in:264
 msgid "Whether the interface should be put in promiscuous mode."
-msgstr "是否应将接口置于混杂模式。"
+msgstr ""
 
-#: ../clients/common/settings-docs.h.in:251
+#: ../clients/common/settings-docs.c.in:265
 msgid "Whether the interface should be a MACVTAP."
-msgstr "接口是否应为 MACVTAP。"
-
-#: ../clients/common/settings-docs.h.in:252
-msgid ""
-"A list of interface names to match. Each element is a shell wildcard "
-"pattern.  When an element is prefixed with exclamation mark (!) the "
-"condition is inverted. A candidate interface name is considered matching "
-"when both these conditions are satisfied: (a) any of the elements not "
-"prefixed with '!' matches or there aren't such elements; (b) none of the "
-"elements prefixed with '!' match."
 msgstr ""
-"要匹配的接口名列表。每个元素都为 shell 通配符模式。当元素以感叹号(!)为前缀"
-"时,条件反转。当满足下列条件时,视为匹配的候选接口名:(a) 未前插 \"!\" 的任意"
-"元素匹配或不存此类元素;(b) 无前插 \"!\" 的元素匹配。"
 
-#: ../clients/common/settings-docs.h.in:253
+#: ../clients/common/settings-docs.c.in:266
 msgid "The bridge failure mode. One of \"secure\", \"standalone\" or empty."
-msgstr "网桥失败模式。\"secure\"、\"standalone\" 之一或留空。"
+msgstr ""
 
-#: ../clients/common/settings-docs.h.in:254
+#: ../clients/common/settings-docs.c.in:267
 msgid "Enable or disable multicast snooping."
-msgstr "启用或禁用多播监听。"
+msgstr ""
 
-#: ../clients/common/settings-docs.h.in:255
+#: ../clients/common/settings-docs.c.in:269
 msgid "Enable or disable RSTP."
-msgstr "启用或禁用 RSTP。"
+msgstr ""
 
-#: ../clients/common/settings-docs.h.in:256
+#: ../clients/common/settings-docs.c.in:270
 msgid "Enable or disable STP."
-msgstr "启用或禁用 STP。"
+msgstr ""
 
-#: ../clients/common/settings-docs.h.in:257
+#: ../clients/common/settings-docs.c.in:272
 msgid "The interface type. Either \"internal\", or empty."
-msgstr "接口类型。要么为 \"internal\",要么留空。"
+msgstr ""
 
-#: ../clients/common/settings-docs.h.in:258
+#: ../clients/common/settings-docs.c.in:274
 msgid ""
-"Specifies the unicast destination IP address of a remote Open vSwitch bridge "
+"Specifies the unicast destination IP address of a remote OpenVSwitch bridge "
 "port to connect to."
-msgstr "指定要连接的远程 Open vSwitch 网桥端口的单播目标 IP 地址。"
+msgstr ""
 
-#: ../clients/common/settings-docs.h.in:259
+#: ../clients/common/settings-docs.c.in:275
 msgid "The time port must be inactive in order to be considered down."
-msgstr "端口被视为关闭所需停用的时间。"
+msgstr ""
 
-#: ../clients/common/settings-docs.h.in:260
+#: ../clients/common/settings-docs.c.in:276
 msgid ""
 "Bonding mode. One of \"active-backup\", \"balance-slb\", or \"balance-tcp\"."
 msgstr ""
-"绑定(Bonding)模式。\"active-backup\"、\"balance-slb\" 或 \"balance-tcp\" 之"
-"一。"
 
-#: ../clients/common/settings-docs.h.in:261
+#: ../clients/common/settings-docs.c.in:277
 msgid "The time port must be active before it starts forwarding traffic."
-msgstr "端口开始流量转发所需激活的时间。"
+msgstr ""
 
-#: ../clients/common/settings-docs.h.in:262
+#: ../clients/common/settings-docs.c.in:278
 msgid "LACP mode. One of \"active\", \"off\", or \"passive\"."
-msgstr "LACP 模式。\"active\"、\"off\" 或 \"passive\" 之一。"
+msgstr ""
 
-#: ../clients/common/settings-docs.h.in:263
+#: ../clients/common/settings-docs.c.in:280
 msgid "The VLAN tag in the range 0-4095."
-msgstr "VLAN 标记在 0~4095 范围内。"
+msgstr ""
 
-#: ../clients/common/settings-docs.h.in:264
+#: ../clients/common/settings-docs.c.in:281
 msgid ""
 "The VLAN mode. One of \"access\", \"native-tagged\", \"native-untagged\", "
 "\"trunk\" or unset."
 msgstr ""
-"VLAN 模式。\"access\"、\"native-tagged\"、\"native-untagged\"、\"trunk\" 之一"
-"或不设定。"
 
-#: ../clients/common/settings-docs.h.in:265
+#: ../clients/common/settings-docs.c.in:282
 msgid ""
 "If non-zero, instruct pppd to set the serial port to the specified "
 "baudrate.  This value should normally be left as 0 to automatically choose "
 "the speed."
 msgstr ""
-"如果非零,指示 pppd 设定串口到指定的波特率。要自动选择速度时此值通常保留为 "
-"0。"
 
-#: ../clients/common/settings-docs.h.in:266
+#: ../clients/common/settings-docs.c.in:283
 msgid ""
 "If TRUE, specify that pppd should set the serial port to use hardware flow "
 "control with RTS and CTS signals.  This value should normally be set to "
 "FALSE."
 msgstr ""
-"如果为 TRUE,指定 pppd 应设定串口以使用通过 RTS 和 CTS 信号的硬件流量控制。此"
-"值通常应设为 FALSE。"
 
-#: ../clients/common/settings-docs.h.in:267
+#: ../clients/common/settings-docs.c.in:284
 msgid ""
 "If non-zero, instruct pppd to presume the connection to the peer has failed "
 "if the specified number of LCP echo-requests go unanswered by the peer.  The "
 "\"lcp-echo-interval\" property must also be set to a non-zero value if this "
 "property is used."
 msgstr ""
-"如果非零,指示如果指定的 LCP 回响请求号码未被节点回应时 pppd 就认定到节点的连"
-"接失败了。如果要使用此属性,\"lcp-echo-interval\" 属性也必须设为非零值。"
 
-#: ../clients/common/settings-docs.h.in:268
+#: ../clients/common/settings-docs.c.in:285
 msgid ""
 "If non-zero, instruct pppd to send an LCP echo-request frame to the peer "
 "every n seconds (where n is the specified value).  Note that some PPP peers "
 "will respond to echo requests and some will not, and it is not possible to "
 "autodetect this."
 msgstr ""
-"如果非零,指示 pppd 每几秒发送一个 LCP 回响请求帧到节点(几秒为该属性指定)。"
-"注意有些 PPP 节点将响应回响请求而有些不会,并且无法自动检测此行为。"
 
-#: ../clients/common/settings-docs.h.in:269
+#: ../clients/common/settings-docs.c.in:286
 msgid ""
 "If TRUE, stateful MPPE is used.  See pppd documentation for more information "
 "on stateful MPPE."
 msgstr ""
-"如果为 TRUE,使用有状态 MPPE。关于有状态 MPPPE 的更多信息请查看 pppd 文档。"
 
-#: ../clients/common/settings-docs.h.in:270
+#: ../clients/common/settings-docs.c.in:287
 msgid ""
 "If non-zero, instruct pppd to request that the peer send packets no larger "
 "than the specified size.  If non-zero, the MRU should be between 128 and "
 "16384."
 msgstr ""
-"如果非零,指示 pppd 请求节点发送的数据包不要超过指定的大小。如果非零,MRU 应"
-"在 128 和 16384 之间。"
 
-#: ../clients/common/settings-docs.h.in:271
+#: ../clients/common/settings-docs.c.in:288
 msgid ""
 "If non-zero, instruct pppd to send packets no larger than the specified size."
-msgstr "如果非零,指示 pppd 不要发送超过指定大小的数据包。"
+msgstr ""
 
-#: ../clients/common/settings-docs.h.in:272
+#: ../clients/common/settings-docs.c.in:290
 msgid "If TRUE, Van Jacobsen TCP header compression will not be requested."
-msgstr "如果为 TRUE,将不请求压缩 Van Jacobsen TCP 首部。"
+msgstr ""
 
-#: ../clients/common/settings-docs.h.in:273
+#: ../clients/common/settings-docs.c.in:291
 msgid ""
 "If TRUE, do not require the other side (usually the PPP server) to "
 "authenticate itself to the client.  If FALSE, require authentication from "
 "the remote side.  In almost all cases, this should be TRUE."
 msgstr ""
-"如果为 TRUE,不需要其他方(通常是 PPP 服务器)验证自己到客户端。如果为 "
-"FALSE,需要来自远端的验证。在大多数情况下,此属性应为 TRUE。"
 
-#: ../clients/common/settings-docs.h.in:274
+#: ../clients/common/settings-docs.c.in:292
 msgid "If TRUE, BSD compression will not be requested."
-msgstr "如果为 TURE,将不会请求 BSD 压缩。"
+msgstr ""
 
-#: ../clients/common/settings-docs.h.in:275
+#: ../clients/common/settings-docs.c.in:293
 msgid "If TRUE, \"deflate\" compression will not be requested."
-msgstr "如果为 TURE,将不会请求 \"deflate\" 压缩。"
+msgstr ""
 
-#: ../clients/common/settings-docs.h.in:276
+#: ../clients/common/settings-docs.c.in:294
 msgid "If TRUE, the CHAP authentication method will not be used."
-msgstr "如果为 TRUE,将不会使用 CHAP 验证方法。"
+msgstr ""
 
-#: ../clients/common/settings-docs.h.in:277
+#: ../clients/common/settings-docs.c.in:295
 msgid "If TRUE, the EAP authentication method will not be used."
-msgstr "如果为 TRUE,将不会使用 EAP 验证方法。"
+msgstr ""
 
-#: ../clients/common/settings-docs.h.in:278
+#: ../clients/common/settings-docs.c.in:296
 msgid "If TRUE, the MSCHAP authentication method will not be used."
-msgstr "如果为 TRUE,将不会使用 MSCHAP 验证方法。"
+msgstr ""
 
-#: ../clients/common/settings-docs.h.in:279
+#: ../clients/common/settings-docs.c.in:297
 msgid "If TRUE, the MSCHAPv2 authentication method will not be used."
-msgstr "如果为 TRUE,将不会使用 MSCHAPv2 验证方法。"
+msgstr ""
 
-#: ../clients/common/settings-docs.h.in:280
+#: ../clients/common/settings-docs.c.in:298
 msgid "If TRUE, the PAP authentication method will not be used."
-msgstr "如果为 TRUE,将不会使用 PAP 验证方法。"
+msgstr ""
 
-#: ../clients/common/settings-docs.h.in:281
+#: ../clients/common/settings-docs.c.in:299
 msgid ""
 "If TRUE, MPPE (Microsoft Point-to-Point Encryption) will be required for the "
 "PPP session.  If either 64-bit or 128-bit MPPE is not available the session "
 "will fail.  Note that MPPE is not used on mobile broadband connections."
 msgstr ""
-"如果为 TRUE,PPP 会话将需要 MPPE(微软点对点加密)。如果 64 位或 128 位的 "
-"MPPE 都不可用,会话将失败。注意 MPPE 不用在移动宽带连接。"
 
-#: ../clients/common/settings-docs.h.in:282
+#: ../clients/common/settings-docs.c.in:300
 msgid ""
 "If TRUE, 128-bit MPPE (Microsoft Point-to-Point Encryption) will be required "
 "for the PPP session, and the \"require-mppe\" property must also be set to "
 "TRUE.  If 128-bit MPPE is not available the session will fail."
 msgstr ""
-"如果为 TRUE,PPP 会话将需要 MPPE(微软点对点加密)且 \"require-mppe\" 也必须"
-"设为 TRUE。如果 128 位的 MPPE 不可用,会话将失败。"
 
-#: ../clients/common/settings-docs.h.in:283
+#: ../clients/common/settings-docs.c.in:302
 msgid ""
 "If given, specifies the parent interface name on which this PPPoE connection "
 "should be created.  If this property is not specified, the connection is "
 "activated on the interface specified in \"interface-name\" of "
 "NMSettingConnection."
 msgstr ""
-"如果给定了,指定此 PPPoE 连接应被创建在的上级接口名。如果此属性未指定,连接将"
-"激活到 NMSettingConnection 的 \"interface-name\" 所指定的接口。"
 
-#: ../clients/common/settings-docs.h.in:284
+#: ../clients/common/settings-docs.c.in:303
 msgid "Password used to authenticate with the PPPoE service."
-msgstr "用于 PPPoE 服务验证的密码。"
+msgstr ""
 
-#: ../clients/common/settings-docs.h.in:286
+#: ../clients/common/settings-docs.c.in:305
 msgid ""
 "If specified, instruct PPPoE to only initiate sessions with access "
 "concentrators that provide the specified service.  For most providers, this "
 "should be left blank.  It is only required if there are multiple access "
 "concentrators or a specific service is known to be required."
 msgstr ""
-"如果指定了,指示 PPPoE 只启动与提供了指定服务的集线器的会话。对于大多数运营"
-"商,此属性应留空。如果有多个集线器存在或者特定服务需要时,此属性才需要设定。"
 
-#: ../clients/common/settings-docs.h.in:287
+#: ../clients/common/settings-docs.c.in:306
 msgid "Username used to authenticate with the PPPoE service."
-msgstr "用于 PPPoE 服务验证的用户名。"
+msgstr ""
 
-#: ../clients/common/settings-docs.h.in:288
+#: ../clients/common/settings-docs.c.in:307
 msgid "Whether the proxy configuration is for browser only."
-msgstr "代理配置是否只用于浏览器。"
+msgstr ""
 
-#: ../clients/common/settings-docs.h.in:289
+#: ../clients/common/settings-docs.c.in:308
 msgid ""
 "Method for proxy configuration, Default is NM_SETTING_PROXY_METHOD_NONE (0)"
-msgstr "代理配置的方法,默认为 NM_SETTING_PROXY_METHOD_NONE (0)"
+msgstr ""
 
-#: ../clients/common/settings-docs.h.in:290
+#: ../clients/common/settings-docs.c.in:310
 msgid "PAC script for the connection."
-msgstr "用于连接的 PAC 脚本。"
+msgstr ""
 
-#: ../clients/common/settings-docs.h.in:291
+#: ../clients/common/settings-docs.c.in:311
 msgid "PAC URL for obtaining PAC file."
-msgstr "用户获取 PAC 文件的 PAC URL。"
+msgstr ""
 
-#: ../clients/common/settings-docs.h.in:292
+#: ../clients/common/settings-docs.c.in:312
 msgid ""
 "Speed to use for communication over the serial port.  Note that this value "
 "usually has no effect for mobile broadband modems as they generally ignore "
 "speed settings and use the highest available speed."
 msgstr ""
-"通过串口通信使用的速度。注意该值一般对移动宽带调制解调器没有效果,因为它们通"
-"常忽略速度设置并使用最高的可用速度。"
 
-#: ../clients/common/settings-docs.h.in:293
+#: ../clients/common/settings-docs.c.in:313
 msgid "Byte-width of the serial communication. The 8 in \"8n1\" for example."
-msgstr "串口通信的字节宽度。以 \"8n1\" 中的 8 为例。"
+msgstr ""
 
-#: ../clients/common/settings-docs.h.in:294
+#: ../clients/common/settings-docs.c.in:315
 msgid "Parity setting of the serial port."
-msgstr "串口的奇偶校验设置。"
+msgstr ""
 
-#: ../clients/common/settings-docs.h.in:295
+#: ../clients/common/settings-docs.c.in:316
 msgid "Time to delay between each byte sent to the modem, in microseconds."
-msgstr "每次发送字节到调制解调器的延迟时间,以微秒计。"
+msgstr ""
 
-#: ../clients/common/settings-docs.h.in:296
+#: ../clients/common/settings-docs.c.in:317
 msgid ""
 "Number of stop bits for communication on the serial port.  Either 1 or 2. "
 "The 1 in \"8n1\" for example."
-msgstr "用在串口通信的停止位数量。要么是 1 要么是 2。以 \"8n1\" 中的 1 为例。"
-
-#: ../clients/common/settings-docs.h.in:297
-msgid ""
-"Whether to autoprobe virtual functions by a compatible driver. If set to "
-"NM_TERNARY_TRUE (1), the kernel will try to bind VFs to a compatible driver "
-"and if this succeeds a new network interface will be instantiated for each "
-"VF. If set to NM_TERNARY_FALSE (0), VFs will not be claimed and no network "
-"interfaces will be created for them. When set to NM_TERNARY_DEFAULT (-1), "
-"the global default is used; in case the global default is unspecified it is "
-"assumed to be NM_TERNARY_TRUE (1)."
-msgstr ""
-"是否通过兼容的驱动程序自动探测虚拟功能(virtual function)。如果设为 "
-"NM_TERNARY_TRUE (1),内核将尝试绑定虚拟功能到兼容的驱动,而且如果成功,每个虚"
-"拟功能都将实例化一个新的网络接口。如果设为 NM_TERNARY_FALSE (0),虚拟功能将不"
-"被声明且不会为它们创建网络接口。当设为 NM_TERNARY_DEFAULT (-1) 时,使用全局默"
-"认值;全局默认未指定的情况下则假定为 NM_TERNARY_TRUE (1)。"
-
-#: ../clients/common/settings-docs.h.in:298
-msgid "The total number of virtual functions to create."
-msgstr "要创建的虚拟功能总数。"
-
-#: ../clients/common/settings-docs.h.in:299
-msgid ""
-"Array of virtual function descriptors. Each VF descriptor is a dictionary "
-"mapping attribute names to GVariant values. The 'index' entry is mandatory "
-"for each VF. When represented as string a VF is in the form: \"INDEX "
-"[ATTR=VALUE[ ATTR=VALUE]...]\". for example: \"2 mac=00:11:22:33:44:55 spoof-"
-"check=true\". The \"vlans\" attribute is represented as a semicolor-"
-"separated list of VLAN descriptors, where each descriptor has the form \"ID[."
-"PRIORITY[.PROTO]]\". PROTO can be either 'q' for 802.1Q (the default) or "
-"'ad' for 802.1ad."
-msgstr ""
-"虚拟功能描述符阵列。每个虚拟功能描述符是个映射属性名到 GVariant 值的字"
-"典。\"index\" 条目为每个虚拟功能的必填项。当表示为字符串时,虚拟功能的格式"
-"为:\"INDEX [ATTR=VALUE[ ATTR=VALUE]...]\"。例如:\"2 mac=00:11:22:33:44:55 "
-"spoof-check=true\"。\"vlans\" 属性表示为分号分隔的 VLAN 描述符列表,其中每个"
-"描述符的格式为 \"ID[.PRIORITY[.PROTO]]\"。PROTO 可以是用于 802.1Q(默认)的 "
-"\"q\" 或用于 802.1ad 的 \"ad\"。"
-
-#: ../clients/common/settings-docs.h.in:300
-msgid "Array of TC queueing disciplines."
-msgstr "TC 排队规则阵列。"
-
-#: ../clients/common/settings-docs.h.in:301
+msgstr ""
+
+#: ../clients/common/settings-docs.c.in:319
+msgid "Array of TC queuening disciplines."
+msgstr ""
+
+#: ../clients/common/settings-docs.c.in:320
 msgid "Array of TC traffic filters."
-msgstr "TC 流量过滤器阵列。"
+msgstr ""
 
-#: ../clients/common/settings-docs.h.in:302
+#: ../clients/common/settings-docs.c.in:321
 msgid ""
 "The JSON configuration for the team network interface.  The property should "
 "contain raw JSON configuration data suitable for teamd, because the value is "
 "passed directly to teamd. If not specified, the default configuration is "
 "used.  See man teamd.conf for the format details."
 msgstr ""
-"组合(team)网络接口的 JSON 配置。此属性应包含适用于 teamd 的原始 JSON 配置,"
-"因为该值直接传递给 teamd。如果未指定则使用默认的配置。格式详情请参阅 teamd."
-"conf 手册。"
 
-#: ../clients/common/settings-docs.h.in:303
-#: ../clients/common/settings-docs.h.in:321
+#: ../clients/common/settings-docs.c.in:322
+#: ../clients/common/settings-docs.c.in:341
 msgid ""
 "Link watchers configuration for the connection: each link watcher is defined "
 "by a dictionary, whose keys depend upon the selected link watcher. Available "
@@ -8636,175 +7518,149 @@ msgid ""
 "'validate-active', 'validate-incative', 'send-always'. See teamd.conf man "
 "for more details."
 msgstr ""
-"连接的链路监视器配置:每个链路监视器都由一个目录定义,其密钥取决于所选的链路"
-"监视器。可用的链路监视器有 \"ethtool\"、\"nsna_ping\" 和 \"arp_ping\",并且在"
-"目录中以密钥 \"name\" 指定。可用的密钥有:  ethtool:\"delay-up\"、\"delay-"
-"down\"、\"init-wait\";nsna_ping:\"init-wait\"、\"interval\"、\"missed-max"
-"\"、\"target-host\";arp_ping:包括 nsna_ping 中的和 \"source-host"
-"\"、\"validate-active\"、\"validate-incative\"、\"send-always\"。"
 
-#: ../clients/common/settings-docs.h.in:304
+#: ../clients/common/settings-docs.c.in:323
 msgid "Corresponds to the teamd mcast_rejoin.count."
-msgstr "对应于 teamd mcast_rejoin.count。"
+msgstr ""
 
-#: ../clients/common/settings-docs.h.in:305
+#: ../clients/common/settings-docs.c.in:324
 msgid "Corresponds to the teamd mcast_rejoin.interval."
-msgstr "对应于 teamd mcast_rejoin.interval。"
+msgstr ""
 
-#: ../clients/common/settings-docs.h.in:306
+#: ../clients/common/settings-docs.c.in:326
 msgid "Corresponds to the teamd notify_peers.count."
-msgstr "对应于 teamd notify_peers.count。"
+msgstr ""
 
-#: ../clients/common/settings-docs.h.in:307
+#: ../clients/common/settings-docs.c.in:327
 msgid "Corresponds to the teamd notify_peers.interval."
-msgstr "对应于 teamd notify_peers.interval。"
+msgstr ""
 
-#: ../clients/common/settings-docs.h.in:308
+#: ../clients/common/settings-docs.c.in:328
 msgid ""
 "Corresponds to the teamd runner.name. Permitted values are: \"roundrobin\", "
-"\"broadcast\", \"activebackup\", \"loadbalance\", \"lacp\", \"random\". When "
-"setting the runner, all the properties specific to the runner will be reset "
-"to the default value; all the properties specific to other runners will be "
-"set to an empty value (or if not possible to a default value)."
+"\"broadcast\", \"activebackup\", \"loadbalance\", \"lacp\"."
 msgstr ""
-"对应于 teamd runner.name。允许的值有:\"roundrobin\"、\"broadcast"
-"\"、\"activebackup\"、\"loadbalance\"、\"lacp\" 和 \"random\"。设置运行程序"
-"时,所有指定到运行程序的属性都将充值为默认值;所有指定到其他运行程序的属性都"
-"将设为空值(或者不可能时设为默认值)。"
 
-#: ../clients/common/settings-docs.h.in:309
+#: ../clients/common/settings-docs.c.in:329
 msgid "Corresponds to the teamd runner.active."
-msgstr "对应于 teamd runner.active。"
+msgstr ""
 
-#: ../clients/common/settings-docs.h.in:310
+#: ../clients/common/settings-docs.c.in:330
 msgid "Corresponds to the teamd runner.agg_select_policy."
-msgstr "对应于 teamd runner.agg_select_policy。"
+msgstr ""
 
-#: ../clients/common/settings-docs.h.in:311
+#: ../clients/common/settings-docs.c.in:331
 msgid "Corresponds to the teamd runner.fast_rate."
-msgstr "对应于 teamd runner.fast_rate。"
+msgstr ""
 
-#: ../clients/common/settings-docs.h.in:312
+#: ../clients/common/settings-docs.c.in:332
 msgid "Corresponds to the teamd runner.hwaddr_policy."
-msgstr "对应于 teamd runner.hwaddr_policy。"
+msgstr ""
 
-#: ../clients/common/settings-docs.h.in:313
+#: ../clients/common/settings-docs.c.in:333
 msgid "Corresponds to the teamd runner.min_ports."
-msgstr "对应于 teamd runner.min_ports。"
+msgstr ""
 
-#: ../clients/common/settings-docs.h.in:314
+#: ../clients/common/settings-docs.c.in:334
 msgid "Corresponds to the teamd runner.sys_prio."
-msgstr "对应于 teamd runner.sys_prio。"
+msgstr ""
 
-#: ../clients/common/settings-docs.h.in:315
+#: ../clients/common/settings-docs.c.in:335
 msgid "Corresponds to the teamd runner.tx_balancer.name."
-msgstr "对应于 teamd runner.tx_balancer.name。"
+msgstr ""
 
-#: ../clients/common/settings-docs.h.in:316
+#: ../clients/common/settings-docs.c.in:336
 msgid "Corresponds to the teamd runner.tx_balancer.interval."
-msgstr "对应于 teamd runner.tx_balancer.interval。"
+msgstr ""
 
-#: ../clients/common/settings-docs.h.in:317
+#: ../clients/common/settings-docs.c.in:337
 msgid "Corresponds to the teamd runner.tx_hash."
-msgstr "对应于 teamd runner.tx_hash。"
+msgstr ""
 
-#: ../clients/common/settings-docs.h.in:318
+#: ../clients/common/settings-docs.c.in:338
 msgid ""
 "The JSON configuration for the team port. The property should contain raw "
 "JSON configuration data suitable for teamd, because the value is passed "
 "directly to teamd. If not specified, the default configuration is used. See "
 "man teamd.conf for the format details."
 msgstr ""
-"组合(team)接口的 JSON 配置。此属性应包含适用于 teamd 的原始 JSON 配置,因为"
-"该值直接传递给 teamd。如果未指定则使用默认的配置。格式详情请参阅 teamd.conf "
-"手册。"
 
-#: ../clients/common/settings-docs.h.in:319
+#: ../clients/common/settings-docs.c.in:339
 msgid "Corresponds to the teamd ports.PORTIFNAME.lacp_key."
-msgstr "对应于 teamd ports.PORTIFNAME.lacp_key。"
+msgstr ""
 
-#: ../clients/common/settings-docs.h.in:320
+#: ../clients/common/settings-docs.c.in:340
 msgid "Corresponds to the teamd ports.PORTIFNAME.lacp_prio."
-msgstr "对应于 teamd ports.PORTIFNAME.lacp_prio。"
+msgstr ""
 
-#: ../clients/common/settings-docs.h.in:322
+#: ../clients/common/settings-docs.c.in:343
 msgid "Corresponds to the teamd ports.PORTIFNAME.prio."
-msgstr "对应于 teamd ports.PORTIFNAME.prio。"
+msgstr ""
 
-#: ../clients/common/settings-docs.h.in:323
+#: ../clients/common/settings-docs.c.in:344
 msgid ""
 "Corresponds to the teamd ports.PORTIFNAME.queue_id. When set to -1 means the "
 "parameter is skipped from the json config."
 msgstr ""
-"对应于 teamd ports.PORTIFNAME.queue_id。设定为 -1 时表示参数从 json 配置忽"
-"略。"
 
-#: ../clients/common/settings-docs.h.in:324
+#: ../clients/common/settings-docs.c.in:345
 msgid "Corresponds to the teamd ports.PORTIFNAME.sticky."
-msgstr "对应于 teamd ports.PORTIFNAME.sticky。"
+msgstr ""
 
-#: ../clients/common/settings-docs.h.in:325
+#: ../clients/common/settings-docs.c.in:346
 msgid ""
 "The group ID which will own the device. If set to NULL everyone will be able "
 "to use the device."
-msgstr "将拥有设备的组 ID。如果设为 NULL 则每个人都能使用设备。"
+msgstr ""
 
-#: ../clients/common/settings-docs.h.in:326
+#: ../clients/common/settings-docs.c.in:347
 msgid ""
 "The operating mode of the virtual device. Allowed values are "
 "NM_SETTING_TUN_MODE_TUN (1) to create a layer 3 device and "
 "NM_SETTING_TUN_MODE_TAP (2) to create an Ethernet-like layer 2 one."
 msgstr ""
-"虚拟设备的操作模式。允许值有 NM_SETTING_TUN_MODE_TUN (1) 以创建第三层设备和 "
-"NM_SETTING_TUN_MODE_TAP (2) 以创建类以太网的第二层设备。"
 
-#: ../clients/common/settings-docs.h.in:327
+#: ../clients/common/settings-docs.c.in:348
 msgid ""
 "If the property is set to TRUE, the interface will support multiple file "
 "descriptors (queues) to parallelize packet sending or receiving. Otherwise, "
 "the interface will only support a single queue."
 msgstr ""
-"如果属性设为 TRUE,接口将支持多个文件描述符(队列)以并行化数据包的发送和接"
-"收,接口将只支持单个队列。"
 
-#: ../clients/common/settings-docs.h.in:328
+#: ../clients/common/settings-docs.c.in:350
 msgid ""
 "The user ID which will own the device. If set to NULL everyone will be able "
 "to use the device."
-msgstr "将拥有设备的用户 ID。如果设为 NULL 则每个人都能使用设备。"
+msgstr ""
 
-#: ../clients/common/settings-docs.h.in:329
+#: ../clients/common/settings-docs.c.in:351
 msgid ""
 "If TRUE the interface will prepend a 4 byte header describing the physical "
 "interface to the packets."
-msgstr "如果为 TRUE,接口将前置一个描述到数据包的物理接口的 4 字节首部。"
+msgstr ""
 
-#: ../clients/common/settings-docs.h.in:330
+#: ../clients/common/settings-docs.c.in:352
 msgid ""
 "If TRUE the IFF_VNET_HDR the tunnel packets will include a virtio network "
 "header."
-msgstr "如果为 TRUE,隧道数据包的 IFF_VNET_HDR 将包含一个 virtio 网络首部。"
+msgstr ""
 
-#: ../clients/common/settings-docs.h.in:331
+#: ../clients/common/settings-docs.c.in:353
 msgid ""
 "A dictionary of key/value pairs with user data. This data is ignored by "
 "NetworkManager and can be used at the users discretion. The keys only "
 "support a strict ascii format, but the values can be arbitrary UTF8 strings "
 "up to a certain length."
 msgstr ""
-"包含用户数据的键/值对字典。此数据被网络管理器(NetworkManager)忽略且可被用户"
-"随意使用。键只支持严格的 ASCII 格式,但是值可以为长度有限的任意 UTF8 字符串。"
 
-#: ../clients/common/settings-docs.h.in:332
+#: ../clients/common/settings-docs.c.in:355
 msgid ""
 "For outgoing packets, a list of mappings from Linux SKB priorities to 802.1p "
 "priorities.  The mapping is given in the format \"from:to\" where both \"from"
 "\" and \"to\" are unsigned integers, ie \"7:3\"."
 msgstr ""
-"用于传出的数据包,从 Linux SKB 优先级到 802.1p 优先级的映射列表。映射以 \"从:"
-"到\" 的格式给定,其中 \"从\" 和 \"到\" 都是无符号整数,如 \"7:3\"。"
 
-#: ../clients/common/settings-docs.h.in:333
+#: ../clients/common/settings-docs.c.in:356
 msgid ""
 "One or more flags which control the behavior and features of the VLAN "
 "interface.  Flags include NM_VLAN_FLAG_REORDER_HEADERS (0x1) (reordering of "
@@ -8816,83 +7672,62 @@ msgid ""
 "compatibility, the default-value in the D-Bus API continues to be 0 and a "
 "missing property on D-Bus is still considered as 0."
 msgstr ""
-"控制 VLAN 接口的行为和功能的一个或多个标志。标识包含 "
-"NM_VLAN_FLAG_REORDER_HEADERS (0x1)(重新排序输出数据包首部)、"
-"NM_VLAN_FLAG_GVRP (0x2)(使用 GVRP 协议)、NM_VLAN_FLAG_LOOSE_BINDING (0x4)"
-"(接口到它主设备运行状态的松散绑定)和 NM_VLAN_FLAG_MVRP (0x8)(使用 MVRP 协"
-"议)。此属性的默认值为 NM_VLAN_FLAG_REORDER_HEADERS,但它以前是 0。为了保持后"
-"向兼容性,D-Bus API 里的默认值继续为 0 而且 D-Bus 上缺少属性时仍视为 0。"
 
-#: ../clients/common/settings-docs.h.in:334
+#: ../clients/common/settings-docs.c.in:357
 msgid ""
 "The VLAN identifier that the interface created by this connection should be "
 "assigned. The valid range is from 0 to 4094, without the reserved id 4095."
 msgstr ""
-"由此连接创建的接口应该分配的 VLAN 标识符。有效范围为从 0 到 4094,不包括保留"
-"的 ID 4095。"
 
-#: ../clients/common/settings-docs.h.in:335
+#: ../clients/common/settings-docs.c.in:358
 msgid ""
 "For incoming packets, a list of mappings from 802.1p priorities to Linux SKB "
 "priorities.  The mapping is given in the format \"from:to\" where both \"from"
 "\" and \"to\" are unsigned integers, ie \"7:3\"."
 msgstr ""
-"用于传入的数据包,从 802.1p 优先级到 Linux SKB 优先级的映射列表。映射以 \"从:"
-"到\" 的格式给定,其中 \"从\" 和 \"到\" 都是无符号整数,如 \"7:3\"。"
 
-#: ../clients/common/settings-docs.h.in:336
+#: ../clients/common/settings-docs.c.in:360
 msgid ""
 "If given, specifies the parent interface name or parent connection UUID from "
 "which this VLAN interface should be created.  If this property is not "
 "specified, the connection must contain an \"802-3-ethernet\" setting with a "
 "\"mac-address\" property."
 msgstr ""
-"如果给定了,其指定从此 VLAN 接口应该创建自的上级接口名称或上级连接的 UUID。如"
-"果此属性未指定,该连接必须包含具有 \"mac-address\" 属性的 \"802-3-ethernet\" "
-"设置。"
 
-#: ../clients/common/settings-docs.h.in:337
+#: ../clients/common/settings-docs.c.in:361
 msgid ""
 "Dictionary of key/value pairs of VPN plugin specific data.  Both keys and "
 "values must be strings."
-msgstr "VPN 插件特定数据的键/值对字典。键和值都必须为字符串。"
+msgstr ""
 
-#: ../clients/common/settings-docs.h.in:338
+#: ../clients/common/settings-docs.c.in:363
 msgid ""
 "If the VPN service supports persistence, and this property is TRUE, the VPN "
 "will attempt to stay connected across link changes and outages, until "
 "explicitly disconnected."
 msgstr ""
-"如果 VPN 服务支持持久连接,并且此属性为 TRUE,VPN 将尝试在链路更改和中断的整"
-"个期间都保持连接,直到手动断开连接。"
 
-#: ../clients/common/settings-docs.h.in:339
+#: ../clients/common/settings-docs.c.in:364
 msgid ""
 "Dictionary of key/value pairs of VPN plugin specific secrets like passwords "
 "or private keys.  Both keys and values must be strings."
 msgstr ""
-"VPN 插件指定如密码或密钥的密钥(secret)的键/值对字典。键和值都必须为字符串。"
 
-#: ../clients/common/settings-docs.h.in:340
+#: ../clients/common/settings-docs.c.in:365
 msgid ""
 "D-Bus service name of the VPN plugin that this setting uses to connect to "
 "its network.  i.e. org.freedesktop.NetworkManager.vpnc for the vpnc plugin."
 msgstr ""
-"此连接用于连接到它网络的 VPN 插件的 D-Bus 服务名。例如 org.freedesktop."
-"NetworkManager.vpnc 用于 vpnc 插件。"
 
-#: ../clients/common/settings-docs.h.in:341
+#: ../clients/common/settings-docs.c.in:366
 msgid ""
 "Timeout for the VPN service to establish the connection. Some services may "
 "take quite a long time to connect. Value of 0 means a default timeout, which "
 "is 60 seconds (unless overridden by vpn.timeout in configuration file). "
 "Values greater than zero mean timeout in seconds."
 msgstr ""
-"VPN 服务建立连接的超时时间。有些服务可能需要很多时间才能连接。值 0 表示默认的"
-"超时,即 60 秒(除非被配置文件中的 vpn.timeout 覆盖)。大于零的值表示以秒计算"
-"的超时时间。"
 
-#: ../clients/common/settings-docs.h.in:342
+#: ../clients/common/settings-docs.c.in:367
 msgid ""
 "If the VPN connection requires a user name for authentication, that name "
 "should be provided here.  If the connection is available to more than one "
@@ -8901,167 +7736,144 @@ msgid ""
 "automatically supply the username of the user which requested the VPN "
 "connection."
 msgstr ""
-"如果 VPN 连接需要用户名用于验证,应在这里提供。如果连接可用于多个用户,且 "
-"VPN 需要每个用户提供个不同的名称,那么让此属性留空。如果此属性留空,网络管理"
-"器(NetworkManager)将自动提供 VPN 连接所需要用户的用户名。"
 
-#: ../clients/common/settings-docs.h.in:343
+#: ../clients/common/settings-docs.c.in:368
 msgid "Specifies the lifetime in seconds of FDB entries learnt by the kernel."
-msgstr "指定内核已获知 FDB 条目的生存期,以秒计。"
+msgstr ""
 
-#: ../clients/common/settings-docs.h.in:344
+#: ../clients/common/settings-docs.c.in:369
 msgid ""
 "Specifies the UDP destination port to communicate to the remote VXLAN tunnel "
 "endpoint."
-msgstr "指定连接到远程 VXLAN 隧道端点的 UDP 目标端口。"
+msgstr ""
 
-#: ../clients/common/settings-docs.h.in:345
+#: ../clients/common/settings-docs.c.in:370
 msgid ""
 "Specifies the VXLAN Network Identifier (or VXLAN Segment Identifier) to use."
-msgstr "指定要使用的 VXLAN 网络标识符(或 VXLAN 分段标识符)。"
+msgstr ""
 
-#: ../clients/common/settings-docs.h.in:346
+#: ../clients/common/settings-docs.c.in:371
 msgid "Specifies whether netlink LL ADDR miss notifications are generated."
-msgstr "指定是否生成网络链路 LL ADDR 未命中通知。"
+msgstr ""
 
-#: ../clients/common/settings-docs.h.in:347
+#: ../clients/common/settings-docs.c.in:372
 msgid "Specifies whether netlink IP ADDR miss notifications are generated."
-msgstr "指定是否生成网络链路 IP ADDR 未命中通知。"
+msgstr ""
 
-#: ../clients/common/settings-docs.h.in:348
+#: ../clients/common/settings-docs.c.in:373
 msgid ""
 "Specifies whether unknown source link layer addresses and IP addresses are "
 "entered into the VXLAN device forwarding database."
-msgstr "指定是否让未知来源的链路层地址和 IP 地址输入进 VXLAN 设备转发数据库。"
+msgstr ""
 
-#: ../clients/common/settings-docs.h.in:349
+#: ../clients/common/settings-docs.c.in:374
 msgid ""
 "Specifies the maximum number of FDB entries. A value of zero means that the "
 "kernel will store unlimited entries."
-msgstr "指定 FDB 条目的最大数量。零值表示允许内核存储不限量的条目。"
+msgstr ""
 
-#: ../clients/common/settings-docs.h.in:350
+#: ../clients/common/settings-docs.c.in:375
 msgid "If given, specifies the source IP address to use in outgoing packets."
-msgstr "如果给定,指定要在传出数据包使用的来源 IP 地址。"
+msgstr ""
 
-#: ../clients/common/settings-docs.h.in:351
+#: ../clients/common/settings-docs.c.in:377
 msgid ""
 "If given, specifies the parent interface name or parent connection UUID."
-msgstr "如果给定了,其指定上级接口名称或上级连接的 UUID。"
+msgstr ""
 
-#: ../clients/common/settings-docs.h.in:352
+#: ../clients/common/settings-docs.c.in:378
 msgid "Specifies whether ARP proxy is turned on."
-msgstr "指定是否打开 ARP 代理。"
+msgstr ""
 
-#: ../clients/common/settings-docs.h.in:353
+#: ../clients/common/settings-docs.c.in:379
 msgid ""
 "Specifies the unicast destination IP address to use in outgoing packets when "
 "the destination link layer address is not known in the VXLAN device "
 "forwarding database, or the multicast IP address to join."
 msgstr ""
-"指定当目标链路层地址在 VXLAN 设备转发数据库中未知时要在传出数据包中使用的单播"
-"目标 IP 地址,或者要加入的多播 IP 地址。"
 
-#: ../clients/common/settings-docs.h.in:354
+#: ../clients/common/settings-docs.c.in:380
 msgid "Specifies whether route short circuit is turned on."
-msgstr "指定是否打开路由短路。"
+msgstr ""
 
-#: ../clients/common/settings-docs.h.in:355
+#: ../clients/common/settings-docs.c.in:381
 msgid ""
 "Specifies the maximum UDP source port to communicate to the remote VXLAN "
 "tunnel endpoint."
-msgstr "指定连接到远程 VXLAN 隧道端点的最大 UDP 来源端口。"
+msgstr ""
 
-#: ../clients/common/settings-docs.h.in:356
+#: ../clients/common/settings-docs.c.in:382
 msgid ""
 "Specifies the minimum UDP source port to communicate to the remote VXLAN "
 "tunnel endpoint."
-msgstr "指定连接到远程 VXLAN 隧道端点的最小 UDP 来源端口。"
+msgstr ""
 
-#: ../clients/common/settings-docs.h.in:357
+#: ../clients/common/settings-docs.c.in:383
 msgid "Specifies the TOS value to use in outgoing packets."
-msgstr "指定要在传出数据包使用的 TOS 值。"
+msgstr ""
 
-#: ../clients/common/settings-docs.h.in:358
+#: ../clients/common/settings-docs.c.in:384
 msgid "Specifies the time-to-live value to use in outgoing packets."
-msgstr "指定要在传出数据包使用的存活时间值。"
+msgstr ""
 
-#: ../clients/common/settings-docs.h.in:359
+#: ../clients/common/settings-docs.c.in:385
 msgid ""
 "If specified, this connection will only apply to the WiMAX device whose MAC "
 "address matches. This property does not change the MAC address of the device "
 "(known as MAC spoofing). Deprecated: 1"
 msgstr ""
-"如指定了,此连接将只应用到其 MAC 地址符合的 WiMAX 设备。此属性不会改变设备的 "
-"MAC 地址(又名 MAC 欺骗)。已弃用:1"
 
-#: ../clients/common/settings-docs.h.in:360
+#: ../clients/common/settings-docs.c.in:387
 msgid ""
 "Network Service Provider (NSP) name of the WiMAX network this connection "
 "should use. Deprecated: 1"
-msgstr "此连接应使用的 WiMAX 网络服务提供商(NSP)的名称。已弃用:1"
-
-#: ../clients/common/settings-docs.h.in:361
-msgid ""
-"If specified, this connection will only apply to the IEEE 802.15.4 (WPAN) "
-"MAC layer device whose permanent MAC address matches."
 msgstr ""
-"如果指定了,此连接将只应用到其永久 MAC 地址匹配的 IEEE 802.15.4 (WPAN) MAC 层"
-"设备。"
-
-#: ../clients/common/settings-docs.h.in:362
-msgid "IEEE 802.15.4 Personal Area Network (PAN) identifier."
-msgstr "IEEE 802.15.4 个人区域网络(PAN)标识符。"
 
-#: ../clients/common/settings-docs.h.in:363
-msgid "Short IEEE 802.15.4 address to be used within a restricted environment."
-msgstr "在受限环境中使用的短 IEEE 802.15.4 地址。"
-
-#: ../clients/nm-online.c:90
+#: ../clients/nm-online.c:91
 msgid "Connecting"
 msgstr "正在连接"
 
-#: ../clients/nm-online.c:206
-#, c-format
+#: ../clients/nm-online.c:189
+#, fuzzy, c-format
 msgid "Error: timeout creating NMClient object\n"
-msgstr "错误:创建 NMClient 对象时超时\n"
+msgstr "错误:无法创建 NMClient 对象:%s。"
 
-#: ../clients/nm-online.c:226
-#, c-format
+#: ../clients/nm-online.c:209
+#, fuzzy, c-format
 msgid "Error: Could not create NMClient object: %s\n"
-msgstr "错误:无法创建 NMClient 对象:%s\n"
+msgstr "错误:无法创建 NMClient 对象:%s。"
 
-#: ../clients/nm-online.c:252
+#: ../clients/nm-online.c:235
 msgid ""
 "Time to wait for a connection, in seconds (without the option, default value "
 "is 30)"
-msgstr "等待连接时间,以秒计(没有该选项时,默认为 30)"
+msgstr "等待连接时间,以秒计(没有该选项时,默认为 30)"
 
-#: ../clients/nm-online.c:253
+#: ../clients/nm-online.c:236
 msgid "Exit immediately if NetworkManager is not running or connecting"
-msgstr "如果网络管理器未运行或连接则立即退出"
+msgstr "如果 NetworkManager 未运行或连接则立即退出"
 
-#: ../clients/nm-online.c:254
+#: ../clients/nm-online.c:237
 msgid "Don't print anything"
 msgstr "不输出任何结果"
 
-#: ../clients/nm-online.c:255
+#: ../clients/nm-online.c:238
 msgid "Wait for NetworkManager startup instead of a connection"
-msgstr "等待网络管理器启动而不是连接"
+msgstr "等待 NetworkManager 启动而不是连接"
 
-#: ../clients/nm-online.c:275
+#: ../clients/nm-online.c:260
 msgid ""
 "Waits for NetworkManager to finish activating startup network connections."
-msgstr "等待网络管理完成激活启动网络连接。"
+msgstr "等待 NetworkManager 完成激活启动网络连接。"
 
-#: ../clients/nm-online.c:282 ../clients/nm-online.c:288
+#: ../clients/nm-online.c:267 ../clients/nm-online.c:273
 msgid "Invalid option.  Please use --help to see a list of valid options."
 msgstr "无效选项。请使用 --help 查看有效选项列表。"
 
-#: ../clients/tui/newt/nmt-newt-utils.c:177 ../clients/tui/nmt-editor.c:429
+#: ../clients/tui/newt/nmt-newt-utils.c:177 ../clients/tui/nmt-editor.c:430
 #: ../clients/tui/nmt-password-dialog.c:174
 #: ../clients/tui/nmt-route-editor.c:122 ../clients/tui/nmtui-hostname.c:69
-#: ../clients/tui/nmtui.c:134
+#: ../clients/tui/nmtui.c:136
 msgid "OK"
 msgstr "确定"
 
@@ -9071,127 +7883,137 @@ msgstr "确定"
 msgid "Could not create temporary file: %s"
 msgstr "无法创建临时文件:%s"
 
-#: ../clients/tui/newt/nmt-newt-utils.c:363
+#: ../clients/tui/newt/nmt-newt-utils.c:365
 #, c-format
 msgid "Editor failed: %s"
 msgstr "编辑器失败:%s"
 
-#: ../clients/tui/newt/nmt-newt-utils.c:369
+#: ../clients/tui/newt/nmt-newt-utils.c:373
+#, c-format
+msgid "Editor failed with status %d"
+msgstr "编辑器失败,状态码:%d"
+
+#: ../clients/tui/newt/nmt-newt-utils.c:375
+#, c-format
+msgid "Editor failed with signal %d"
+msgstr "编辑器失败,信号 %d"
+
+#: ../clients/tui/newt/nmt-newt-utils.c:379
 #, c-format
 msgid "Could not re-read file: %s"
 msgstr "无法重新读取文件:%s"
 
-#: ../clients/tui/nm-editor-utils.c:144 ../libnm-glib/nm-device.c:1820
-#: ../libnm/nm-device.c:1306
+#: ../clients/tui/nm-editor-utils.c:146 ../libnm-glib/nm-device.c:1821
+#: ../libnm/nm-device.c:1521
 msgid "Ethernet"
 msgstr "以太网"
 
-#: ../clients/tui/nm-editor-utils.c:148
+#: ../clients/tui/nm-editor-utils.c:150
 #, c-format
 msgid "Ethernet connection %d"
 msgstr "以太网连接 %d"
 
-#: ../clients/tui/nm-editor-utils.c:152 ../libnm-glib/nm-device.c:1822
-#: ../libnm/nm-device.c:1308
+#: ../clients/tui/nm-editor-utils.c:154 ../libnm-glib/nm-device.c:1823
+#: ../libnm/nm-device.c:1523
 msgid "Wi-Fi"
-msgstr "Wi-Fi"
+msgstr "Wi-Fi 参数"
 
-#: ../clients/tui/nm-editor-utils.c:156
+#: ../clients/tui/nm-editor-utils.c:158
 #, c-format
 msgid "Wi-Fi connection %d"
 msgstr "Wi-Fi 连接 %d"
 
-#: ../clients/tui/nm-editor-utils.c:161 ../libnm-core/nm-connection.c:2268
-#: ../libnm-glib/nm-device.c:1832 ../libnm/nm-device.c:1324
+#: ../clients/tui/nm-editor-utils.c:163 ../libnm-core/nm-connection.c:2114
+#: ../libnm-glib/nm-device.c:1833 ../libnm/nm-device.c:1539
 msgid "InfiniBand"
-msgstr "InfiniBand"
+msgstr "InfiniBand 参数"
 
-#: ../clients/tui/nm-editor-utils.c:165
+#: ../clients/tui/nm-editor-utils.c:167
 #, c-format
 msgid "InfiniBand connection %d"
-msgstr "InfiniBand 连接 %d"
+msgstr "高速网络连接 %d"
 
-#: ../clients/tui/nm-editor-utils.c:170 ../libnm-glib/nm-device.c:1830
-#: ../libnm/nm-device.c:1322
+#: ../clients/tui/nm-editor-utils.c:172 ../libnm-glib/nm-device.c:1831
+#: ../libnm/nm-device.c:1537
 msgid "Mobile Broadband"
 msgstr "移动宽带"
 
-#: ../clients/tui/nm-editor-utils.c:173
+#: ../clients/tui/nm-editor-utils.c:175
 #, c-format
 msgid "Mobile broadband connection %d"
 msgstr "移动宽带连接 %d"
 
-#: ../clients/tui/nm-editor-utils.c:179 ../clients/tui/nmt-page-dsl.c:62
+#: ../clients/tui/nm-editor-utils.c:181 ../clients/tui/nmt-page-dsl.c:62
 msgid "DSL"
 msgstr "DSL"
 
-#: ../clients/tui/nm-editor-utils.c:183
+#: ../clients/tui/nm-editor-utils.c:185
 #, c-format
 msgid "DSL connection %d"
 msgstr "DSL 连接 %d"
 
-#: ../clients/tui/nm-editor-utils.c:188 ../libnm-core/nm-connection.c:2260
-#: ../libnm-glib/nm-device.c:1834 ../libnm-util/nm-connection.c:1623
-#: ../libnm/nm-device.c:1326
-#: ../src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-reader.c:4732
+#: ../clients/tui/nm-editor-utils.c:190 ../libnm-core/nm-connection.c:2106
+#: ../libnm-glib/nm-device.c:1835 ../libnm-util/nm-connection.c:1626
+#: ../libnm/nm-device.c:1541
+#: ../src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-reader.c:4563
 msgid "Bond"
 msgstr "绑定"
 
-#: ../clients/tui/nm-editor-utils.c:192
+#: ../clients/tui/nm-editor-utils.c:194
 #, c-format
 msgid "Bond connection %d"
 msgstr "绑定连接 %d"
 
-#: ../clients/tui/nm-editor-utils.c:197 ../libnm-core/nm-connection.c:2264
-#: ../libnm-glib/nm-device.c:1838 ../libnm-util/nm-connection.c:1627
-#: ../libnm/nm-device.c:1330
-#: ../src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-reader.c:5068
+#: ../clients/tui/nm-editor-utils.c:199 ../libnm-core/nm-connection.c:2110
+#: ../libnm-glib/nm-device.c:1839 ../libnm-util/nm-connection.c:1630
+#: ../libnm/nm-device.c:1545
+#: ../src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-reader.c:4899
 msgid "Bridge"
-msgstr "网桥"
+msgstr "桥接"
 
-#: ../clients/tui/nm-editor-utils.c:202
+#: ../clients/tui/nm-editor-utils.c:204
 #, c-format
 msgid "Bridge connection %d"
-msgstr "网桥连接 %d"
+msgstr "桥式连接 %d"
 
-#: ../clients/tui/nm-editor-utils.c:206 ../libnm-core/nm-connection.c:2262
-#: ../libnm-glib/nm-device.c:1836 ../libnm-util/nm-connection.c:1625
-#: ../libnm/nm-device.c:1328
-#: ../src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-reader.c:4835
+#: ../clients/tui/nm-editor-utils.c:208 ../libnm-core/nm-connection.c:2108
+#: ../libnm-glib/nm-device.c:1837 ../libnm-util/nm-connection.c:1628
+#: ../libnm/nm-device.c:1543
+#: ../src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-reader.c:4666
 msgid "Team"
-msgstr "组合"
+msgstr "组队"
 
-#: ../clients/tui/nm-editor-utils.c:211
+#: ../clients/tui/nm-editor-utils.c:213
 #, c-format
 msgid "Team connection %d"
-msgstr "组合连接 %d"
+msgstr "组队连接 %d"
 
-#: ../clients/tui/nm-editor-utils.c:215 ../clients/tui/nmt-page-vlan.c:82
-#: ../libnm-core/nm-connection.c:2266 ../libnm-glib/nm-device.c:1840
-#: ../libnm-util/nm-connection.c:1629 ../libnm/nm-device.c:1332
+#: ../clients/tui/nm-editor-utils.c:217 ../clients/tui/nmt-page-vlan.c:82
+#: ../libnm-core/nm-connection.c:2112 ../libnm-glib/nm-device.c:1841
+#: ../libnm-util/nm-connection.c:1632 ../libnm/nm-device.c:1547
 msgid "VLAN"
-msgstr "VLAN"
+msgstr "VLAN 参数"
 
-#: ../clients/tui/nm-editor-utils.c:219
+#: ../clients/tui/nm-editor-utils.c:221
 #, c-format
 msgid "VLAN connection %d"
 msgstr "VLAN 连接 %d"
 
-#: ../clients/tui/nm-editor-utils.c:223 ../clients/tui/nmt-page-ip-tunnel.c:136
+#: ../clients/tui/nm-editor-utils.c:225 ../clients/tui/nmt-page-ip-tunnel.c:136
 msgid "IP tunnel"
-msgstr "IP 隧道"
+msgstr ""
 
-#: ../clients/tui/nm-editor-utils.c:227
+#: ../clients/tui/nm-editor-utils.c:229
 #, c-format
 msgid "IP tunnel connection %d"
-msgstr "IP 隧道连接 %d"
+msgstr ""
 
-#: ../clients/tui/nm-editor-utils.c:242
+#: ../clients/tui/nm-editor-utils.c:244
 #, c-format
 msgid "VPN connection %d"
 msgstr "VPN 连接 %d"
 
-#: ../clients/tui/nmt-device-entry.c:368
+#: ../clients/tui/nmt-device-entry.c:370
 msgid "Select..."
 msgstr "选择..."
 
@@ -9206,7 +8028,7 @@ msgid "Edit..."
 msgstr "编辑..."
 
 #: ../clients/tui/nmt-edit-connection-list.c:116
-#: ../clients/tui/nmtui-edit.c:529
+#: ../clients/tui/nmtui-edit.c:531
 msgid "Delete"
 msgstr "删除"
 
@@ -9221,51 +8043,51 @@ msgstr "显示"
 #: ../clients/tui/nmt-editor.c:98
 #, c-format
 msgid "Could not create editor for connection '%s' of type '%s'."
-msgstr "无法为类型 \"%s\" 的连接 \"%s\" 创建编辑器。"
+msgstr "无法为类型 '%s' 的连接 '%s'创建编辑器。"
 
 #: ../clients/tui/nmt-editor.c:102
 #, c-format
 msgid "Could not create editor for invalid connection '%s'."
-msgstr "无法为无效的连接 \"%s\" 创建编辑器。"
+msgstr "无法为无效的连接“%s”创建编辑器。"
 
 #: ../clients/tui/nmt-editor.c:112
 msgid "Edit Connection"
 msgstr "编辑连接"
 
-#: ../clients/tui/nmt-editor.c:173
+#: ../clients/tui/nmt-editor.c:174
 #, c-format
 msgid "Unable to save connection: %s"
 msgstr "无法保存连接:%s"
 
-#: ../clients/tui/nmt-editor.c:187
+#: ../clients/tui/nmt-editor.c:188
 #, c-format
 msgid "Unable to add new connection: %s"
 msgstr "无法添加新连接:%s"
 
-#: ../clients/tui/nmt-editor.c:332
+#: ../clients/tui/nmt-editor.c:333
 msgid "Profile name"
-msgstr "配置集名称"
+msgstr "配置名称"
 
-#: ../clients/tui/nmt-editor.c:343
+#: ../clients/tui/nmt-editor.c:344
 msgid "Ethernet device"
-msgstr "以太网设备"
+msgstr "以太设备"
 
-#: ../clients/tui/nmt-editor.c:345
+#: ../clients/tui/nmt-editor.c:346
 msgid "Device"
 msgstr "设备"
 
 #. And finally the bottom widgets
-#: ../clients/tui/nmt-editor.c:405
+#: ../clients/tui/nmt-editor.c:406
 msgid "Automatically connect"
 msgstr "自动连接"
 
-#: ../clients/tui/nmt-editor.c:411
+#: ../clients/tui/nmt-editor.c:412
 msgid "Available to all users"
 msgstr "对所有用户有效"
 
-#: ../clients/tui/nmt-editor.c:426 ../clients/tui/nmt-password-dialog.c:171
-#: ../clients/tui/nmt-route-editor.c:115 ../clients/tui/nmtui-edit.c:220
-#: ../clients/tui/nmtui-edit.c:528 ../clients/tui/nmtui-hostname.c:67
+#: ../clients/tui/nmt-editor.c:427 ../clients/tui/nmt-password-dialog.c:171
+#: ../clients/tui/nmt-route-editor.c:115 ../clients/tui/nmtui-edit.c:222
+#: ../clients/tui/nmtui-edit.c:530 ../clients/tui/nmtui-hostname.c:67
 msgid "Cancel"
 msgstr "取消"
 
@@ -9295,11 +8117,11 @@ msgstr "802.3ad"
 
 #: ../clients/tui/nmt-page-bond.c:90
 msgid "Adaptive Transmit Load Balancing (tlb)"
-msgstr "自适应传输负载均衡(tlb)"
+msgstr "自适应传输负载均衡 (tlb)"
 
 #: ../clients/tui/nmt-page-bond.c:91
 msgid "Adaptive Load Balancing (alb)"
-msgstr "自适应负载均衡(alb)"
+msgstr "自适应负载均衡 (alb)"
 
 #: ../clients/tui/nmt-page-bond.c:97
 msgid "MII (recommended)"
@@ -9311,7 +8133,7 @@ msgstr "ARP"
 
 #: ../clients/tui/nmt-page-bond.c:359
 msgid "BOND"
-msgstr "绑定"
+msgstr "BOND"
 
 #: ../clients/tui/nmt-page-bond.c:363 ../clients/tui/nmt-page-bridge.c:85
 #: ../clients/tui/nmt-page-team.c:152
@@ -9329,7 +8151,7 @@ msgstr "主机"
 
 #: ../clients/tui/nmt-page-bond.c:387
 msgid "Link monitoring"
-msgstr "链路监测"
+msgstr "链路监控"
 
 #: ../clients/tui/nmt-page-bond.c:393 ../clients/tui/nmt-page-bond.c:400
 #: ../clients/tui/nmt-page-bond.c:407 ../clients/tui/nmt-page-bond.c:414
@@ -9343,11 +8165,11 @@ msgstr "监控频率"
 
 #: ../clients/tui/nmt-page-bond.c:401
 msgid "Link up delay"
-msgstr "链路开启延时"
+msgstr "链接建立延时"
 
 #: ../clients/tui/nmt-page-bond.c:408
 msgid "Link down delay"
-msgstr "链路关闭延时"
+msgstr "链接断开延时"
 
 #: ../clients/tui/nmt-page-bond.c:421
 msgid "ARP targets"
@@ -9356,11 +8178,11 @@ msgstr "ARP 目标"
 #: ../clients/tui/nmt-page-bond.c:428 ../clients/tui/nmt-page-ethernet.c:77
 #: ../clients/tui/nmt-page-vlan.c:110 ../clients/tui/nmt-page-wifi.c:364
 msgid "Cloned MAC address"
-msgstr "克隆的 MAC 地址"
+msgstr "复制的 MAC 地址"
 
 #: ../clients/tui/nmt-page-bridge-port.c:60
 msgid "BRIDGE PORT"
-msgstr "网桥端口"
+msgstr "桥接端口"
 
 #: ../clients/tui/nmt-page-bridge-port.c:67
 #: ../clients/tui/nmt-page-bridge.c:118
@@ -9377,7 +8199,7 @@ msgstr "Hairpin 模式"
 
 #: ../clients/tui/nmt-page-bridge.c:81
 msgid "BRIDGE"
-msgstr "网桥"
+msgstr "桥接"
 
 #: ../clients/tui/nmt-page-bridge.c:96 ../clients/tui/nmt-page-bridge.c:127
 #: ../clients/tui/nmt-page-bridge.c:137 ../clients/tui/nmt-page-bridge.c:147
@@ -9390,11 +8212,11 @@ msgstr "老化时间"
 
 #: ../clients/tui/nmt-page-bridge.c:99
 msgid "Enable IGMP snooping"
-msgstr "启用 IGMP 监听"
+msgstr "启用 IGMP snooping"
 
 #: ../clients/tui/nmt-page-bridge.c:105
 msgid "Enable STP (Spanning Tree Protocol)"
-msgstr "启用 STP(生成树协议)"
+msgstr "启用 STP(跨树协议)"
 
 #: ../clients/tui/nmt-page-bridge.c:128
 msgid "Forward delay"
@@ -9410,7 +8232,7 @@ msgstr "最大寿命"
 
 #: ../clients/tui/nmt-page-bridge.c:154
 msgid "Group forward mask"
-msgstr "组前向掩码"
+msgstr ""
 
 #: ../clients/tui/nmt-page-ethernet.c:70
 msgid "ETHERNET"
@@ -9441,7 +8263,7 @@ msgstr "传输模式"
 
 #: ../clients/tui/nmt-page-ip4.c:38
 msgid "Disabled"
-msgstr "禁用"
+msgstr "已禁用"
 
 #: ../clients/tui/nmt-page-ip4.c:39 ../clients/tui/nmt-page-ip6.c:39
 msgid "Automatic"
@@ -9467,7 +8289,7 @@ msgstr "(没有自定义路由)"
 #, c-format
 msgid "One custom route"
 msgid_plural "%d custom routes"
-msgstr[0] "%d 个自定义路由"
+msgstr[0] "%d一个自定义路线"
 
 #: ../clients/tui/nmt-page-ip4.c:128
 msgid "IPv4 CONFIGURATION"
@@ -9499,11 +8321,11 @@ msgstr "忽略自动获取的路由"
 
 #: ../clients/tui/nmt-page-ip4.c:185 ../clients/tui/nmt-page-ip6.c:183
 msgid "Ignore automatically obtained DNS parameters"
-msgstr "忽略自动获取的 DNS 参数"
+msgstr ""
 
 #: ../clients/tui/nmt-page-ip4.c:193
 msgid "Require IPv4 addressing for this connection"
-msgstr "需要 IPv4 地址来完成这个连接"
+msgstr "需要 IPv4 地址完成这个连接"
 
 #: ../clients/tui/nmt-page-ip6.c:38
 msgid "Ignore"
@@ -9511,7 +8333,7 @@ msgstr "忽略"
 
 #: ../clients/tui/nmt-page-ip6.c:40
 msgid "Automatic (DHCP-only)"
-msgstr "自动(仅 DHCP)"
+msgstr "自动(仅 DHCP)"
 
 #: ../clients/tui/nmt-page-ip6.c:128
 msgid "IPv6 CONFIGURATION"
@@ -9519,44 +8341,44 @@ msgstr "IPv6 配置"
 
 #: ../clients/tui/nmt-page-ip6.c:191
 msgid "Require IPv6 addressing for this connection"
-msgstr "需要 IPv6 地址来完成这个连接"
+msgstr "需要 IPv6 地址完成这个连接"
 
 #. The order must match the NM_IP_TUNNEL_MODE_* enum
 #: ../clients/tui/nmt-page-ip-tunnel.c:78
 msgid "IPIP"
-msgstr "IPIP"
+msgstr ""
 
 #: ../clients/tui/nmt-page-ip-tunnel.c:79
 msgid "GRE"
-msgstr "GRE"
+msgstr ""
 
 #: ../clients/tui/nmt-page-ip-tunnel.c:80
 msgid "SIT"
-msgstr "SIT"
+msgstr ""
 
 #: ../clients/tui/nmt-page-ip-tunnel.c:81
 msgid "ISATAP"
-msgstr "ISATAP"
+msgstr ""
 
 #: ../clients/tui/nmt-page-ip-tunnel.c:82
 msgid "VTI"
-msgstr "VTI"
+msgstr ""
 
 #: ../clients/tui/nmt-page-ip-tunnel.c:83
 msgid "IP6IP6"
-msgstr "IP6IP6"
+msgstr ""
 
 #: ../clients/tui/nmt-page-ip-tunnel.c:84
 msgid "IPIP6"
-msgstr "IPIP6"
+msgstr ""
 
 #: ../clients/tui/nmt-page-ip-tunnel.c:85
 msgid "IP6GRE"
-msgstr "IP6GRE"
+msgstr ""
 
 #: ../clients/tui/nmt-page-ip-tunnel.c:86
 msgid "VTI6"
-msgstr "VTI6"
+msgstr ""
 
 #: ../clients/tui/nmt-page-ip-tunnel.c:150 ../clients/tui/nmt-page-vlan.c:87
 msgid "Parent"
@@ -9564,19 +8386,19 @@ msgstr "上级"
 
 #: ../clients/tui/nmt-page-ip-tunnel.c:157
 msgid "Local IP"
-msgstr "本地 IP"
+msgstr ""
 
 #: ../clients/tui/nmt-page-ip-tunnel.c:163
 msgid "Remote IP"
-msgstr "远程 IP"
+msgstr ""
 
 #: ../clients/tui/nmt-page-ip-tunnel.c:169
 msgid "Input key"
-msgstr "输入密钥"
+msgstr ""
 
 #: ../clients/tui/nmt-page-ip-tunnel.c:176
 msgid "Output key"
-msgstr "输出密钥"
+msgstr ""
 
 #: ../clients/tui/nmt-page-ppp.c:131
 msgid "PPP CONFIGURATION"
@@ -9608,7 +8430,7 @@ msgstr "MSCHAP"
 
 #: ../clients/tui/nmt-page-ppp.c:195
 msgid "Use point-to-point encryption (MPPE)"
-msgstr "使用点到点加密(MPPE)"
+msgstr "使用点到点加密 (MPPE)"
 
 #: ../clients/tui/nmt-page-ppp.c:207
 msgid "Require 128-bit encryption"
@@ -9616,7 +8438,7 @@ msgstr "需要 128 位加密"
 
 #: ../clients/tui/nmt-page-ppp.c:217
 msgid "Use stateful MPPE"
-msgstr "使用有状态 MPPE"
+msgstr "使用带有状态的 MPPE"
 
 #: ../clients/tui/nmt-page-ppp.c:229
 msgid "Allow BSD data compression"
@@ -9628,7 +8450,7 @@ msgstr "允许 Deflate 数据压缩"
 
 #: ../clients/tui/nmt-page-ppp.c:245
 msgid "Use TCP header compression"
-msgstr "使用 TCP 首部压缩"
+msgstr "使用 TCP 头压缩"
 
 #: ../clients/tui/nmt-page-ppp.c:255
 msgid "Send PPP echo packets"
@@ -9636,7 +8458,7 @@ msgstr "发送 PPP 回响数据包"
 
 #: ../clients/tui/nmt-page-team-port.c:92
 msgid "TEAM PORT"
-msgstr "组合端口"
+msgstr "群组端口"
 
 #: ../clients/tui/nmt-page-team-port.c:99 ../clients/tui/nmt-page-team.c:163
 msgid "JSON configuration"
@@ -9644,7 +8466,7 @@ msgstr "JSON 配置"
 
 #: ../clients/tui/nmt-page-team.c:145
 msgid "TEAM"
-msgstr "组合"
+msgstr "群组"
 
 #: ../clients/tui/nmt-page-vlan.c:102
 msgid "VLAN id"
@@ -9693,7 +8515,7 @@ msgstr "WPA & WPA2 企业"
 
 #: ../clients/tui/nmt-page-wifi.c:83
 msgid "WEP 40/128-bit Key (Hex or ASCII)"
-msgstr "WEP 40/128 位密钥(Hex 或者 ASCII)"
+msgstr "WEP 40/128 位密钥(Hex 或者 ASCII)"
 
 #: ../clients/tui/nmt-page-wifi.c:84
 msgid "WEP 128-bit Passphrase"
@@ -9701,7 +8523,7 @@ msgstr "WEP 128位 密码"
 
 #: ../clients/tui/nmt-page-wifi.c:85
 msgid "Dynamic WEP (802.1x)"
-msgstr "动态 WEP(802.1x)"
+msgstr "动态 WEP (802.1x)"
 
 #: ../clients/tui/nmt-page-wifi.c:86
 msgid "LEAP"
@@ -9751,7 +8573,7 @@ msgstr "安全性"
 #. FIXME
 #: ../clients/tui/nmt-page-wifi.c:282
 msgid "(No support for wpa-enterprise yet...)"
-msgstr "(还未支持 WPA 企业...)"
+msgstr "(还未支持 wpa-enterprise…)"
 
 #: ../clients/tui/nmt-page-wifi.c:292 ../clients/tui/nmt-page-wifi.c:311
 msgid "WEP index"
@@ -9759,13 +8581,13 @@ msgstr "WEP 索引"
 
 #: ../clients/tui/nmt-page-wifi.c:300 ../clients/tui/nmt-page-wifi.c:319
 msgid "Authentication"
-msgstr "验证"
+msgstr "认证"
 
 #. "dynamic-wep"
 #. FIXME
 #: ../clients/tui/nmt-page-wifi.c:325
 msgid "(No support for dynamic-wep yet...)"
-msgstr "(还未支持动态 WEP...)"
+msgstr "(尚未支持动态-wep ...)"
 
 #: ../clients/tui/nmt-page-wifi.c:358
 msgid "BSSID"
@@ -9779,29 +8601,29 @@ msgstr "每次都询问这个密码"
 msgid "Show password"
 msgstr "显示密码"
 
-#: ../clients/tui/nmt-route-table.c:187
+#: ../clients/tui/nmt-route-table.c:191
 msgid "Destination"
 msgstr "目标"
 
-#: ../clients/tui/nmt-route-table.c:187
+#: ../clients/tui/nmt-route-table.c:191
 msgid "Prefix"
 msgstr "前缀"
 
-#: ../clients/tui/nmt-route-table.c:196
+#: ../clients/tui/nmt-route-table.c:200
 msgid "Next Hop"
-msgstr "下一个跃点"
+msgstr "下一步 Hop"
 
-#: ../clients/tui/nmt-route-table.c:204
+#: ../clients/tui/nmt-route-table.c:208
 msgid "Metric"
-msgstr "跃点数"
+msgstr "权重"
 
-#: ../clients/tui/nmt-route-table.c:224
+#: ../clients/tui/nmt-route-table.c:228
 msgid "No custom routes are defined."
-msgstr "未定义自定义陆游。"
+msgstr "未定义自定义路线。"
 
-#: ../clients/tui/nmt-slave-list.c:134
+#: ../clients/tui/nmt-slave-list.c:136
 msgid "Select the type of slave connection you wish to add."
-msgstr "选择您要添加的从连接类型。"
+msgstr "选择您要添加的辅助连接类型。"
 
 #: ../clients/tui/nmt-widget-list.c:139
 msgid "Add..."
@@ -9835,11 +8657,11 @@ msgstr "openconnect 失败,信号为 %d"
 #: ../clients/tui/nmtui-connect.c:183
 #, c-format
 msgid "Activation failed: %s"
-msgstr "激活失败:%s"
+msgstr ""
 
 #: ../clients/tui/nmtui-connect.c:254
 msgid "Connecting..."
-msgstr "正在连接..."
+msgstr "正在连接…"
 
 #: ../clients/tui/nmtui-connect.c:292 ../clients/tui/nmtui-connect.c:329
 #, c-format
@@ -9852,35 +8674,35 @@ msgstr "激活"
 
 #: ../clients/tui/nmtui-connect.c:393
 msgid "Deactivate"
-msgstr "停用"
+msgstr "禁用"
 
-#: ../clients/tui/nmtui-connect.c:445 ../clients/tui/nmtui-edit.c:118
-#: ../clients/tui/nmtui.c:128
+#: ../clients/tui/nmtui-connect.c:445 ../clients/tui/nmtui-edit.c:120
+#: ../clients/tui/nmtui.c:130
 msgid "Quit"
 msgstr "退出"
 
-#: ../clients/tui/nmtui-connect.c:445 ../clients/tui/nmtui-edit.c:118
+#: ../clients/tui/nmtui-connect.c:445 ../clients/tui/nmtui-edit.c:120
 msgid "Back"
 msgstr "返回"
 
 #: ../clients/tui/nmtui-connect.c:468
 #, c-format
 msgid "No such connection '%s'"
-msgstr "无此连接 \"%s\""
+msgstr "无此连接“%s”"
 
 #: ../clients/tui/nmtui-connect.c:470
 msgid "Connection is already active"
 msgstr "连接已经激活"
 
-#: ../clients/tui/nmtui-edit.c:228
+#: ../clients/tui/nmtui-edit.c:230
 msgid "Create"
 msgstr "创建"
 
-#: ../clients/tui/nmtui-edit.c:370
+#: ../clients/tui/nmtui-edit.c:372
 msgid "Select the type of connection you wish to create."
-msgstr "选择您要创建的连接类型。"
+msgstr "选择您要创建的辅助连接类型。"
 
-#: ../clients/tui/nmtui-edit.c:378
+#: ../clients/tui/nmtui-edit.c:380
 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."
@@ -9888,24 +8710,24 @@ msgstr ""
 "如果您想创建一个 VPN 但列表中没有您想要创建的 VPN 类型,这很可能是您没有安装"
 "正确的 VPN 插件。"
 
-#: ../clients/tui/nmtui-edit.c:414 ../clients/tui/nmtui-edit.c:430
+#: ../clients/tui/nmtui-edit.c:416 ../clients/tui/nmtui-edit.c:432
 msgid "New Connection"
 msgstr "新建连接"
 
-#: ../clients/tui/nmtui-edit.c:469
+#: ../clients/tui/nmtui-edit.c:471
 #, c-format
 msgid "Unable to delete connection: %s"
 msgstr "无法删除连接:%s"
 
-#: ../clients/tui/nmtui-edit.c:508
+#: ../clients/tui/nmtui-edit.c:510
 #, c-format
 msgid "Could not delete connection '%s': %s"
-msgstr "无法删除连接 \"%s\":%s"
+msgstr "无法删除连接 '%s': %s"
 
-#: ../clients/tui/nmtui-edit.c:530
+#: ../clients/tui/nmtui-edit.c:532
 #, c-format
 msgid "Are you sure you want to delete the connection '%s'?"
-msgstr "您确定要删除连接 \"%s\" 吗?"
+msgstr "您确定要删除连接 “%s” 吗?"
 
 #: ../clients/tui/nmtui-hostname.c:45
 msgid "Set Hostname"
@@ -9919,156 +8741,156 @@ msgstr "主机名"
 #: ../clients/tui/nmtui-hostname.c:116
 #, c-format
 msgid "Set hostname to '%s'"
-msgstr "主机名已设为 \"%s\""
+msgstr "主机名已设为“%s”"
 
 #: ../clients/tui/nmtui-hostname.c:118
 #, c-format
 msgid "Unable to set hostname: %s"
 msgstr "无法设置主机名:%s"
 
-#: ../clients/tui/nmtui.c:51 ../clients/tui/nmtui.c:54
+#: ../clients/tui/nmtui.c:53 ../clients/tui/nmtui.c:56
 msgid "connection"
 msgstr "连接"
 
-#: ../clients/tui/nmtui.c:52
+#: ../clients/tui/nmtui.c:54
 msgid "Edit a connection"
 msgstr "编辑连接"
 
-#: ../clients/tui/nmtui.c:55
+#: ../clients/tui/nmtui.c:57
 msgid "Activate a connection"
 msgstr "启用连接"
 
-#: ../clients/tui/nmtui.c:57
+#: ../clients/tui/nmtui.c:59
 msgid "new hostname"
 msgstr "新主机名"
 
-#: ../clients/tui/nmtui.c:58
+#: ../clients/tui/nmtui.c:60
 msgid "Set system hostname"
 msgstr "设置系统主机名"
 
-#: ../clients/tui/nmtui.c:102
+#: ../clients/tui/nmtui.c:104
 msgid "NetworkManager TUI"
-msgstr "网络管理器文本用户界面"
+msgstr "网络管理器 TUI"
 
-#: ../clients/tui/nmtui.c:110
+#: ../clients/tui/nmtui.c:112
 msgid "Please select an option"
 msgstr "请选择选项"
 
-#: ../clients/tui/nmtui.c:158
+#: ../clients/tui/nmtui.c:160
 msgid "Usage"
 msgstr "用法"
 
-#: ../clients/tui/nmtui.c:239
+#: ../clients/tui/nmtui.c:241
 msgid "Could not parse arguments"
 msgstr "无法解析参数"
 
-#: ../clients/tui/nmtui.c:249
+#: ../clients/tui/nmtui.c:251
 #, c-format
 msgid "Could not contact NetworkManager: %s.\n"
-msgstr "无法联系网络管理器:%s\n"
+msgstr "无法联系  NetworkManager:%s\n"
 
-#: ../clients/tui/nmtui.c:254
+#: ../clients/tui/nmtui.c:256
 msgid "NetworkManager is not running."
-msgstr "NetworkManaer 未运行。"
+msgstr "网络管理器未运行。"
 
-#: ../libnm-core/crypto.c:118 ../libnm-util/crypto.c:130
+#: ../libnm-core/crypto.c:118 ../libnm-util/crypto.c:131
 #, c-format
 msgid "PEM key file had no end tag '%s'."
-msgstr "PEM 密钥文件没有结束标记 \"%s\"。"
+msgstr "PEM 密钥文件没有结束标记“%s”。"
 
-#: ../libnm-core/crypto.c:131 ../libnm-util/crypto.c:143
+#: ../libnm-core/crypto.c:131 ../libnm-util/crypto.c:144
 #, c-format
 msgid "Doesn't look like a PEM private key file."
 msgstr "不像是一个 PEM 私钥文件。"
 
-#: ../libnm-core/crypto.c:148 ../libnm-util/crypto.c:160
+#: ../libnm-core/crypto.c:148 ../libnm-util/crypto.c:161
 #, c-format
 msgid "Malformed PEM file: Proc-Type was not first tag."
 msgstr "错误的 PEM 文件格式:Proc-Type 不是第一个标记。"
 
-#: ../libnm-core/crypto.c:156 ../libnm-util/crypto.c:168
+#: ../libnm-core/crypto.c:156 ../libnm-util/crypto.c:169
 #, c-format
 msgid "Malformed PEM file: unknown Proc-Type tag '%s'."
-msgstr "错误的 PEM 文件格式:未知的 Proc-Type 标记 \"%s\"。"
+msgstr "错误的 PEM 文件格式:未知的 Proc-Type 标记“%s”。"
 
-#: ../libnm-core/crypto.c:172 ../libnm-util/crypto.c:178
+#: ../libnm-core/crypto.c:166 ../libnm-util/crypto.c:179
 #, c-format
 msgid "Malformed PEM file: DEK-Info was not the second tag."
 msgstr "错误的 PEM 文件格式:DEK-Info 不是第二个标记。"
 
-#: ../libnm-core/crypto.c:183 ../libnm-util/crypto.c:189
+#: ../libnm-core/crypto.c:177 ../libnm-util/crypto.c:190
 #, c-format
 msgid "Malformed PEM file: no IV found in DEK-Info tag."
-msgstr "错误的 PEM 文件格式:没有在 DEK-Info 标记找到初始向量。"
+msgstr "错误的 PEM 文件格式:没有在 DEK-Info 标签找到初始向量。"
 
-#: ../libnm-core/crypto.c:190 ../libnm-util/crypto.c:196
+#: ../libnm-core/crypto.c:184 ../libnm-util/crypto.c:197
 #, c-format
 msgid "Malformed PEM file: invalid format of IV in DEK-Info tag."
 msgstr "错误的 PEM 文件格式:DEK-Info 标签中的初始向量格式无效。"
 
-#: ../libnm-core/crypto.c:205 ../libnm-util/crypto.c:211
+#: ../libnm-core/crypto.c:199 ../libnm-util/crypto.c:212
 #, c-format
 msgid "Malformed PEM file: unknown private key cipher '%s'."
-msgstr "错误的 PEM 文件格式:未知的私钥密码 \"%s\"。"
+msgstr "对 PEM 文件进行操作:未知专用密钥 “%s”。"
 
-#: ../libnm-core/crypto.c:224 ../libnm-util/crypto.c:230
+#: ../libnm-core/crypto.c:218 ../libnm-util/crypto.c:231
 #, c-format
 msgid "Could not decode private key."
 msgstr "无法解码私钥。"
 
-#: ../libnm-core/crypto.c:278 ../libnm-util/crypto.c:282
+#: ../libnm-core/crypto.c:272 ../libnm-util/crypto.c:283
 msgid "Failed to find expected PKCS#8 start tag."
-msgstr "无法找到预期的 PKCS#8 起始标记。"
+msgstr "无法找到 PKCS#8 起始标记。"
 
-#: ../libnm-core/crypto.c:286 ../libnm-util/crypto.c:290
+#: ../libnm-core/crypto.c:280 ../libnm-util/crypto.c:291
 #, c-format
 msgid "Failed to find expected PKCS#8 end tag '%s'."
-msgstr "无法找到预期的 PKCS#8 结束标记\"%s\"。"
+msgstr "无法找到 PKCS#8 结束标记“%s”。"
 
-#: ../libnm-core/crypto.c:305 ../libnm-util/crypto.c:309
+#: ../libnm-core/crypto.c:299 ../libnm-util/crypto.c:310
 msgid "Failed to decode PKCS#8 private key."
 msgstr "无法解码 PKCS#8 私钥。"
 
-#: ../libnm-core/crypto.c:347 ../libnm-util/crypto.c:351
+#: ../libnm-core/crypto.c:341 ../libnm-util/crypto.c:352
 #, c-format
 msgid "IV must be an even number of bytes in length."
 msgstr "初始向量长度必须是偶数字节。"
 
-#: ../libnm-core/crypto.c:361 ../libnm-util/crypto.c:365
+#: ../libnm-core/crypto.c:355 ../libnm-util/crypto.c:366
 #, c-format
 msgid "IV contains non-hexadecimal digits."
 msgstr "初始向量中包含非十六进制数字。"
 
-#: ../libnm-core/crypto.c:405 ../libnm-core/crypto_gnutls.c:97
-#: ../libnm-core/crypto_gnutls.c:207 ../libnm-core/crypto_nss.c:114
-#: ../libnm-core/crypto_nss.c:282 ../libnm-util/crypto.c:405
-#: ../libnm-util/crypto_gnutls.c:151 ../libnm-util/crypto_gnutls.c:253
+#: ../libnm-core/crypto.c:395 ../libnm-core/crypto_gnutls.c:91
+#: ../libnm-core/crypto_gnutls.c:197 ../libnm-core/crypto_nss.c:112
+#: ../libnm-core/crypto_nss.c:277 ../libnm-util/crypto.c:406
+#: ../libnm-util/crypto_gnutls.c:151 ../libnm-util/crypto_gnutls.c:256
 #: ../libnm-util/crypto_nss.c:162 ../libnm-util/crypto_nss.c:323
 #, c-format
 msgid "Private key cipher '%s' was unknown."
-msgstr "未知的私钥密码 \"%s\"。"
+msgstr "未知专用密钥密码“%s”。"
 
-#: ../libnm-core/crypto.c:504 ../libnm-util/crypto.c:515
+#: ../libnm-core/crypto.c:494 ../libnm-util/crypto.c:516
 #, c-format
 msgid "Unable to determine private key type."
 msgstr "无法确定私钥类型。"
 
-#: ../libnm-core/crypto.c:512
+#: ../libnm-core/crypto.c:502
 #, c-format
 msgid "Password provided, but key was not encrypted."
 msgstr "已提供密码,但密钥没有加密。"
 
-#: ../libnm-core/crypto.c:565 ../libnm-util/crypto.c:570
+#: ../libnm-core/crypto.c:555 ../libnm-util/crypto.c:571
 #, c-format
 msgid "PEM certificate had no start tag '%s'."
-msgstr "PEM 证书没有起始标记 \"%s\"。"
+msgstr "PEM 证书没有起始标记“%s”。"
 
-#: ../libnm-core/crypto.c:574 ../libnm-util/crypto.c:579
+#: ../libnm-core/crypto.c:564 ../libnm-util/crypto.c:580
 #, c-format
 msgid "PEM certificate had no end tag '%s'."
-msgstr "PEM 证书没有结束标记 \"%s\"。"
+msgstr "PEM 证书没有结束标记“%s”。"
 
-#: ../libnm-core/crypto.c:592 ../libnm-util/crypto.c:597
+#: ../libnm-core/crypto.c:582 ../libnm-util/crypto.c:598
 #, c-format
 msgid "Failed to decode certificate."
 msgstr "无法解码证书。"
@@ -10077,74 +8899,74 @@ msgstr "无法解码证书。"
 msgid "Failed to initialize the crypto engine."
 msgstr "初始化加密引擎失败。"
 
-#: ../libnm-core/crypto_gnutls.c:105 ../libnm-util/crypto_gnutls.c:159
+#: ../libnm-core/crypto_gnutls.c:99 ../libnm-util/crypto_gnutls.c:159
 #, c-format
 msgid "Invalid IV length (must be at least %zd)."
-msgstr "无效的初始向量长度(至少为 %zd)。"
+msgstr "无效初始向量长度(至少为为 %zd)。"
 
-#: ../libnm-core/crypto_gnutls.c:121 ../libnm-util/crypto_gnutls.c:175
+#: ../libnm-core/crypto_gnutls.c:115 ../libnm-util/crypto_gnutls.c:175
 #, c-format
 msgid "Failed to initialize the decryption cipher context: %s (%s)"
-msgstr "初始化解密计算内容失败:%s(%s)"
+msgstr "初始化解密计算内容失败:%s (%s)。"
 
-#: ../libnm-core/crypto_gnutls.c:130 ../libnm-util/crypto_gnutls.c:184
+#: ../libnm-core/crypto_gnutls.c:124 ../libnm-util/crypto_gnutls.c:184
 #, c-format
 msgid "Failed to decrypt the private key: %s (%s)"
-msgstr "解密私钥失败:%s(%s)"
+msgstr "解密私钥失败:%s (%s)"
 
-#: ../libnm-core/crypto_gnutls.c:140 ../libnm-core/crypto_nss.c:204
+#: ../libnm-core/crypto_gnutls.c:134 ../libnm-core/crypto_nss.c:202
 #: ../libnm-util/crypto_gnutls.c:194 ../libnm-util/crypto_nss.c:252
 #, c-format
 msgid "Failed to decrypt the private key: unexpected padding length."
 msgstr "解密私钥失败:意外的填充长度。"
 
-#: ../libnm-core/crypto_gnutls.c:151 ../libnm-core/crypto_nss.c:215
+#: ../libnm-core/crypto_gnutls.c:145 ../libnm-core/crypto_nss.c:213
 #: ../libnm-util/crypto_gnutls.c:205 ../libnm-util/crypto_nss.c:263
 #, c-format
 msgid "Failed to decrypt the private key."
 msgstr "解密私钥失败。"
 
-#: ../libnm-core/crypto_gnutls.c:234 ../libnm-util/crypto_gnutls.c:280
+#: ../libnm-core/crypto_gnutls.c:224 ../libnm-util/crypto_gnutls.c:283
 #, c-format
 msgid "Failed to initialize the encryption cipher context: %s (%s)"
-msgstr "初始化加密计算内容失败:%s(%s)"
+msgstr "初始化加密计算内容失败:%s (%s)。"
 
-#: ../libnm-core/crypto_gnutls.c:243 ../libnm-util/crypto_gnutls.c:289
+#: ../libnm-core/crypto_gnutls.c:233 ../libnm-util/crypto_gnutls.c:292
 #, c-format
 msgid "Failed to encrypt the data: %s (%s)"
-msgstr "加密数据失败:%s(%s)"
+msgstr "加密数据失败:%s (%s)。"
 
-#: ../libnm-core/crypto_gnutls.c:286 ../libnm-util/crypto_gnutls.c:329
+#: ../libnm-core/crypto_gnutls.c:276 ../libnm-util/crypto_gnutls.c:332
 #, c-format
 msgid "Error initializing certificate data: %s"
 msgstr "初始化证书数据出错:%s"
 
-#: ../libnm-core/crypto_gnutls.c:308 ../libnm-util/crypto_gnutls.c:351
+#: ../libnm-core/crypto_gnutls.c:298 ../libnm-util/crypto_gnutls.c:354
 #, c-format
 msgid "Couldn't decode certificate: %s"
 msgstr "无法解码证书:%s"
 
-#: ../libnm-core/crypto_gnutls.c:336 ../libnm-util/crypto_gnutls.c:375
+#: ../libnm-core/crypto_gnutls.c:326 ../libnm-util/crypto_gnutls.c:378
 #, c-format
 msgid "Couldn't initialize PKCS#12 decoder: %s"
 msgstr "无法初始化 PKCS#12 解码器:%s"
 
-#: ../libnm-core/crypto_gnutls.c:349 ../libnm-util/crypto_gnutls.c:388
+#: ../libnm-core/crypto_gnutls.c:339 ../libnm-util/crypto_gnutls.c:391
 #, c-format
 msgid "Couldn't decode PKCS#12 file: %s"
 msgstr "无法解码 PKCS#12 文件:%s"
 
-#: ../libnm-core/crypto_gnutls.c:361 ../libnm-util/crypto_gnutls.c:400
+#: ../libnm-core/crypto_gnutls.c:351 ../libnm-util/crypto_gnutls.c:403
 #, c-format
 msgid "Couldn't verify PKCS#12 file: %s"
 msgstr "无法校验 PKCS#12 文件:%s"
 
-#: ../libnm-core/crypto_gnutls.c:393 ../libnm-util/crypto_gnutls.c:428
+#: ../libnm-core/crypto_gnutls.c:383 ../libnm-util/crypto_gnutls.c:431
 #, c-format
 msgid "Couldn't initialize PKCS#8 decoder: %s"
 msgstr "无法初始化 PKCS#8 解码器:%s"
 
-#: ../libnm-core/crypto_gnutls.c:416 ../libnm-util/crypto_gnutls.c:451
+#: ../libnm-core/crypto_gnutls.c:406 ../libnm-util/crypto_gnutls.c:454
 #, c-format
 msgid "Couldn't decode PKCS#8 file: %s"
 msgstr "无法解码 PKCS#8 文件:%s"
@@ -10154,833 +8976,778 @@ msgstr "无法解码 PKCS#8 文件:%s"
 msgid "Failed to initialize the crypto engine: %d."
 msgstr "初始化加密引擎失败:%d。"
 
-#: ../libnm-core/crypto_nss.c:122 ../libnm-util/crypto_nss.c:170
+#: ../libnm-core/crypto_nss.c:120 ../libnm-util/crypto_nss.c:170
 #, c-format
 msgid "Invalid IV length (must be at least %d)."
-msgstr "无效的初始向量长度(至少为 %d)。"
+msgstr "无效的初始向量长度(至少为 %d)。"
 
-#: ../libnm-core/crypto_nss.c:133 ../libnm-util/crypto_nss.c:181
+#: ../libnm-core/crypto_nss.c:131 ../libnm-util/crypto_nss.c:181
 #, c-format
 msgid "Failed to initialize the decryption cipher slot."
 msgstr "初始化解密计算插槽失败。"
 
-#: ../libnm-core/crypto_nss.c:143 ../libnm-util/crypto_nss.c:191
+#: ../libnm-core/crypto_nss.c:141 ../libnm-util/crypto_nss.c:191
 #, c-format
 msgid "Failed to set symmetric key for decryption."
 msgstr "为解密设置对称密钥失败。"
 
-#: ../libnm-core/crypto_nss.c:153 ../libnm-util/crypto_nss.c:201
+#: ../libnm-core/crypto_nss.c:151 ../libnm-util/crypto_nss.c:201
 #, c-format
 msgid "Failed to set IV for decryption."
 msgstr "为解密设置初始向量失败。"
 
-#: ../libnm-core/crypto_nss.c:161 ../libnm-util/crypto_nss.c:209
+#: ../libnm-core/crypto_nss.c:159 ../libnm-util/crypto_nss.c:209
 #, c-format
 msgid "Failed to initialize the decryption context."
 msgstr "初始化解密环境失败。"
 
-#: ../libnm-core/crypto_nss.c:174 ../libnm-util/crypto_nss.c:222
+#: ../libnm-core/crypto_nss.c:172 ../libnm-util/crypto_nss.c:222
 #, c-format
 msgid "Failed to decrypt the private key: %d."
 msgstr "解密私钥失败:%d。"
 
-#: ../libnm-core/crypto_nss.c:182 ../libnm-util/crypto_nss.c:230
+#: ../libnm-core/crypto_nss.c:180 ../libnm-util/crypto_nss.c:230
 #, c-format
 msgid "Failed to decrypt the private key: decrypted data too large."
 msgstr "解密私钥失败:解密后的数据太大。"
 
-#: ../libnm-core/crypto_nss.c:193 ../libnm-util/crypto_nss.c:241
+#: ../libnm-core/crypto_nss.c:191 ../libnm-util/crypto_nss.c:241
 #, c-format
 msgid "Failed to finalize decryption of the private key: %d."
 msgstr "结束解密私钥失败:%d。"
 
-#: ../libnm-core/crypto_nss.c:304 ../libnm-util/crypto_nss.c:345
+#: ../libnm-core/crypto_nss.c:299 ../libnm-util/crypto_nss.c:345
 #, c-format
 msgid "Failed to initialize the encryption cipher slot."
 msgstr "初始化加密计算插槽空间失败。"
 
-#: ../libnm-core/crypto_nss.c:312 ../libnm-util/crypto_nss.c:353
+#: ../libnm-core/crypto_nss.c:307 ../libnm-util/crypto_nss.c:353
 #, c-format
 msgid "Failed to set symmetric key for encryption."
 msgstr "为加密设置对称密钥失败。"
 
-#: ../libnm-core/crypto_nss.c:320 ../libnm-util/crypto_nss.c:361
+#: ../libnm-core/crypto_nss.c:315 ../libnm-util/crypto_nss.c:361
 #, c-format
 msgid "Failed to set IV for encryption."
-msgstr "为加密设置初始向量失败。"
+msgstr "为加密设置 IV 失败。"
 
-#: ../libnm-core/crypto_nss.c:328 ../libnm-util/crypto_nss.c:369
+#: ../libnm-core/crypto_nss.c:323 ../libnm-util/crypto_nss.c:369
 #, c-format
 msgid "Failed to initialize the encryption context."
 msgstr "初始化加密内容失败。"
 
-#: ../libnm-core/crypto_nss.c:336 ../libnm-util/crypto_nss.c:377
+#: ../libnm-core/crypto_nss.c:331 ../libnm-util/crypto_nss.c:377
 #, c-format
 msgid "Failed to encrypt: %d."
 msgstr "加密失败:%d。"
 
-#: ../libnm-core/crypto_nss.c:344 ../libnm-util/crypto_nss.c:385
+#: ../libnm-core/crypto_nss.c:339 ../libnm-util/crypto_nss.c:385
 #, c-format
 msgid "Unexpected amount of data after encrypting."
 msgstr "加密后意外的数据量。"
 
-#: ../libnm-core/crypto_nss.c:387 ../libnm-util/crypto_nss.c:425
+#: ../libnm-core/crypto_nss.c:382 ../libnm-util/crypto_nss.c:425
 #, c-format
 msgid "Couldn't decode certificate: %d"
 msgstr "无法解码证书:%d"
 
-#: ../libnm-core/crypto_nss.c:425
+#: ../libnm-core/crypto_nss.c:420
 #, c-format
 msgid "Password must be UTF-8"
 msgstr "密码必须是 UTF-8 格式"
 
-#: ../libnm-core/crypto_nss.c:455 ../libnm-util/crypto_nss.c:488
+#: ../libnm-core/crypto_nss.c:450 ../libnm-util/crypto_nss.c:488
 #, c-format
 msgid "Couldn't initialize PKCS#12 decoder: %d"
 msgstr "无法初始化 PKCS#12 解码器:%d"
 
-#: ../libnm-core/crypto_nss.c:464 ../libnm-util/crypto_nss.c:497
+#: ../libnm-core/crypto_nss.c:459 ../libnm-util/crypto_nss.c:497
 #, c-format
 msgid "Couldn't decode PKCS#12 file: %d"
 msgstr "无法解码 PKCS#12 文件:%d"
 
-#: ../libnm-core/crypto_nss.c:473 ../libnm-util/crypto_nss.c:506
+#: ../libnm-core/crypto_nss.c:468 ../libnm-util/crypto_nss.c:506
 #, c-format
 msgid "Couldn't verify PKCS#12 file: %d"
 msgstr "无法校验 PKCS#12 文件:%d"
 
-#: ../libnm-core/crypto_nss.c:524 ../libnm-util/crypto_nss.c:550
+#: ../libnm-core/crypto_nss.c:519 ../libnm-util/crypto_nss.c:550
 msgid "Could not generate random data."
 msgstr "无法生成随机数据。"
 
-#: ../libnm-core/nm-connection.c:283
+#: ../libnm-core/nm-connection.c:249
 msgid "wrong type; should be a list of strings."
-msgstr "错误的类型;应为一个字符串列表。"
+msgstr "错误的类型,应该是一个字符串列表。"
 
-#: ../libnm-core/nm-connection.c:353
+#: ../libnm-core/nm-connection.c:319
 msgid "unknown setting name"
 msgstr "未知的设置名称"
 
-#: ../libnm-core/nm-connection.c:365
+#: ../libnm-core/nm-connection.c:331
 msgid "duplicate setting name"
 msgstr "重复的设置名称"
 
-#: ../libnm-core/nm-connection.c:1325
+#: ../libnm-core/nm-connection.c:1233
 msgid "setting not found"
 msgstr "未找到设置"
 
-#: ../libnm-core/nm-connection.c:1391 ../libnm-core/nm-connection.c:1416
-#: ../libnm-core/nm-connection.c:1441
-msgid "setting is required for non-slave connections"
-msgstr "对于非从连接,设置是必需的"
-
-#: ../libnm-core/nm-connection.c:1404 ../libnm-core/nm-connection.c:1429
-#: ../libnm-core/nm-connection.c:1454
+#: ../libnm-core/nm-connection.c:1300
 msgid "setting not allowed in slave connection"
 msgstr "从连接中不允许设置"
 
-#: ../libnm-core/nm-connection.c:1544
+#: ../libnm-core/nm-connection.c:1316
+msgid "setting is required for non-slave connections"
+msgstr "对于非从连接,设置是必需的。"
+
+#: ../libnm-core/nm-connection.c:1412
 msgid "Unexpected failure to verify the connection"
 msgstr "检验连接意外地失败"
 
-#: ../libnm-core/nm-connection.c:1588
+#: ../libnm-core/nm-connection.c:1454
 msgid "Unexpected failure to normalize the connection"
 msgstr "正常化连接意外地失败"
 
-#: ../libnm-core/nm-connection.c:2126 ../libnm-core/nm-setting-8021x.c:2867
-#: ../libnm-core/nm-setting-8021x.c:2884 ../libnm-core/nm-setting-8021x.c:2915
-#: ../libnm-core/nm-setting-8021x.c:2932 ../libnm-core/nm-setting-8021x.c:2974
-#: ../libnm-core/nm-setting-8021x.c:2986 ../libnm-core/nm-setting-8021x.c:3004
-#: ../libnm-core/nm-setting-8021x.c:3016 ../libnm-core/nm-setting-8021x.c:3040
-#: ../libnm-core/nm-setting-8021x.c:3219 ../libnm-core/nm-setting-adsl.c:187
-#: ../libnm-core/nm-setting-bluetooth.c:136
-#: ../libnm-core/nm-setting-bluetooth.c:194
-#: ../libnm-core/nm-setting-bluetooth.c:208 ../libnm-core/nm-setting-cdma.c:157
-#: ../libnm-core/nm-setting-connection.c:928
-#: ../libnm-core/nm-setting-connection.c:971
-#: ../libnm-core/nm-setting-connection.c:1126
-#: ../libnm-core/nm-setting-ip-config.c:2492
-#: ../libnm-core/nm-setting-ip-tunnel.c:373
-#: ../libnm-core/nm-setting-olpc-mesh.c:118
-#: ../libnm-core/nm-setting-ovs-patch.c:92 ../libnm-core/nm-setting-pppoe.c:159
-#: ../libnm-core/nm-setting-vpn.c:488 ../libnm-core/nm-setting-vxlan.c:358
-#: ../libnm-core/nm-setting-wimax.c:124
-#: ../libnm-core/nm-setting-wireless-security.c:918
-#: ../libnm-core/nm-setting-wireless.c:750 ../libnm-util/nm-setting.c:1355
-#: ../libnm-util/nm-setting.c:1374 ../libnm-util/nm-setting.c:1392
-#: ../libnm-util/nm-setting-8021x.c:2324 ../libnm-util/nm-setting-8021x.c:2341
-#: ../libnm-util/nm-setting-8021x.c:2382 ../libnm-util/nm-setting-8021x.c:2399
-#: ../libnm-util/nm-setting-8021x.c:2451 ../libnm-util/nm-setting-8021x.c:2463
-#: ../libnm-util/nm-setting-8021x.c:2481 ../libnm-util/nm-setting-8021x.c:2493
-#: ../libnm-util/nm-setting-8021x.c:2517 ../libnm-util/nm-setting-8021x.c:2677
-#: ../libnm-util/nm-setting-adsl.c:209 ../libnm-util/nm-setting-bluetooth.c:141
-#: ../libnm-util/nm-setting-bluetooth.c:159 ../libnm-util/nm-setting-cdma.c:161
-#: ../libnm-util/nm-setting-connection.c:765
-#: ../libnm-util/nm-setting-connection.c:781
-#: ../libnm-util/nm-setting-connection.c:842
+#: ../libnm-core/nm-connection.c:1973 ../libnm-core/nm-setting-8021x.c:2881
+#: ../libnm-core/nm-setting-8021x.c:2898 ../libnm-core/nm-setting-8021x.c:2929
+#: ../libnm-core/nm-setting-8021x.c:2946 ../libnm-core/nm-setting-8021x.c:2988
+#: ../libnm-core/nm-setting-8021x.c:3000 ../libnm-core/nm-setting-8021x.c:3018
+#: ../libnm-core/nm-setting-8021x.c:3030 ../libnm-core/nm-setting-8021x.c:3054
+#: ../libnm-core/nm-setting-8021x.c:3235 ../libnm-core/nm-setting-adsl.c:189
+#: ../libnm-core/nm-setting-bluetooth.c:138
+#: ../libnm-core/nm-setting-bluetooth.c:196
+#: ../libnm-core/nm-setting-bluetooth.c:210 ../libnm-core/nm-setting-cdma.c:159
+#: ../libnm-core/nm-setting-connection.c:894
+#: ../libnm-core/nm-setting-connection.c:937
+#: ../libnm-core/nm-setting-connection.c:1066
+#: ../libnm-core/nm-setting-ip-config.c:2514
+#: ../libnm-core/nm-setting-ip-tunnel.c:352
+#: ../libnm-core/nm-setting-olpc-mesh.c:120
+#: ../libnm-core/nm-setting-ovs-patch.c:95 ../libnm-core/nm-setting-pppoe.c:161
+#: ../libnm-core/nm-setting-vpn.c:518 ../libnm-core/nm-setting-vxlan.c:360
+#: ../libnm-core/nm-setting-wimax.c:126
+#: ../libnm-core/nm-setting-wireless-security.c:900
+#: ../libnm-core/nm-setting-wireless.c:750 ../libnm-util/nm-setting.c:1357
+#: ../libnm-util/nm-setting.c:1376 ../libnm-util/nm-setting.c:1394
+#: ../libnm-util/nm-setting-8021x.c:2325 ../libnm-util/nm-setting-8021x.c:2342
+#: ../libnm-util/nm-setting-8021x.c:2383 ../libnm-util/nm-setting-8021x.c:2400
+#: ../libnm-util/nm-setting-8021x.c:2452 ../libnm-util/nm-setting-8021x.c:2464
+#: ../libnm-util/nm-setting-8021x.c:2482 ../libnm-util/nm-setting-8021x.c:2494
+#: ../libnm-util/nm-setting-8021x.c:2518 ../libnm-util/nm-setting-8021x.c:2680
+#: ../libnm-util/nm-setting-adsl.c:209 ../libnm-util/nm-setting-bluetooth.c:142
+#: ../libnm-util/nm-setting-bluetooth.c:160 ../libnm-util/nm-setting-cdma.c:162
+#: ../libnm-util/nm-setting-connection.c:768
+#: ../libnm-util/nm-setting-connection.c:784
+#: ../libnm-util/nm-setting-connection.c:845
 #: ../libnm-util/nm-setting-ip4-config.c:869
-#: ../libnm-util/nm-setting-ip6-config.c:831
-#: ../libnm-util/nm-setting-ip6-config.c:897
+#: ../libnm-util/nm-setting-ip6-config.c:833
+#: ../libnm-util/nm-setting-ip6-config.c:899
 #: ../libnm-util/nm-setting-olpc-mesh.c:123
-#: ../libnm-util/nm-setting-pppoe.c:162 ../libnm-util/nm-setting-vpn.c:422
-#: ../libnm-util/nm-setting-wimax.c:149
-#: ../libnm-util/nm-setting-wireless-security.c:890
-#: ../libnm-util/nm-setting-wireless.c:768
+#: ../libnm-util/nm-setting-pppoe.c:163 ../libnm-util/nm-setting-vpn.c:423
+#: ../libnm-util/nm-setting-wimax.c:150
+#: ../libnm-util/nm-setting-wireless-security.c:891
+#: ../libnm-util/nm-setting-wireless.c:769
 msgid "property is missing"
 msgstr "缺少属性"
 
-#: ../libnm-core/nm-connection.c:2271
+#: ../libnm-core/nm-connection.c:2117
 msgid "IP Tunnel"
 msgstr "IP 隧道"
 
-#: ../libnm-core/nm-dbus-utils.c:189
+#: ../libnm-core/nm-dbus-utils.c:188
 #, c-format
 msgid "Method returned type '%s', but expected '%s'"
-msgstr "方法返回类型 \"%s\",但期望的是 \"%s\""
+msgstr "方法返回类型 '%s',但期望的是 '%s'"
 
-#: ../libnm-core/nm-keyfile.c:199
+#: ../libnm-core/nm-keyfile-reader.c:144
 msgid "ignoring missing number"
 msgstr "忽略缺失的数字"
 
-#: ../libnm-core/nm-keyfile.c:207
+#: ../libnm-core/nm-keyfile-reader.c:152
 #, c-format
 msgid "ignoring invalid number '%s'"
-msgstr "忽略无效的数字 \"%s\""
+msgstr "忽略无效的数字 '%s'"
 
-#: ../libnm-core/nm-keyfile.c:228
+#: ../libnm-core/nm-keyfile-reader.c:173
 #, c-format
 msgid "ignoring invalid %s address: %s"
 msgstr "忽略无效的 %s 地址:%s"
 
-#: ../libnm-core/nm-keyfile.c:270
+#: ../libnm-core/nm-keyfile-reader.c:215
 #, c-format
 msgid "ignoring invalid gateway '%s' for %s route"
-msgstr "忽略 %2$s 路由的无效网关 \"%1$s\""
+msgstr "忽略 %s 路由的无效网关 '%s'"
 
-#: ../libnm-core/nm-keyfile.c:291
+#: ../libnm-core/nm-keyfile-reader.c:236
 #, c-format
 msgid "ignoring invalid %s route: %s"
 msgstr "忽略无效的 %s 路由:%s"
 
-#: ../libnm-core/nm-keyfile.c:416
+#: ../libnm-core/nm-keyfile-reader.c:362
 #, c-format
 msgid "unexpected character '%c' for address %s: '%s' (position %td)"
-msgstr "对于地址 %2$s 的意外字符 \"%1$c\":\"%3$s\"(位置 %4$td)"
+msgstr "意外字符 “%c”(地址 %s): “%s” (位置 %td)"
 
-#: ../libnm-core/nm-keyfile.c:426
+#: ../libnm-core/nm-keyfile-reader.c:372
 #, c-format
 msgid "unexpected character '%c' for %s: '%s' (position %td)"
-msgstr "对于 %2$s 的意外字符 \"%1$c\":\"%3$s\"(位置 %4$td)"
+msgstr "意外字符 “%c” (%s): “%s” (位置 %td)"
 
-#: ../libnm-core/nm-keyfile.c:435
+#: ../libnm-core/nm-keyfile-reader.c:381
 #, c-format
 msgid "unexpected character '%c' in prefix length for %s: '%s' (position %td)"
-msgstr "对于 %2$s,前缀长度中有意外字符 \"%1$c\":\"%3$s\"(位置 %4$td)"
+msgstr "意外字符 “%c”(在 %s 的前缀长度中): “%s” (位置 %td)"
 
-#: ../libnm-core/nm-keyfile.c:446
+#: ../libnm-core/nm-keyfile-reader.c:392
 #, c-format
 msgid "garbage at the end of value %s: '%s'"
-msgstr "值 %s 的末尾有无用信息:\"%s\""
+msgstr "值 %s: '%s' 结尾的无用信息"
 
-#: ../libnm-core/nm-keyfile.c:452
+#: ../libnm-core/nm-keyfile-reader.c:398
 #, c-format
 msgid "deprecated semicolon at the end of value %s: '%s'"
-msgstr "值 %s 的末尾有舍弃的分号:\"%s\""
+msgstr "值 %s: '%s' 结尾已舍弃的分号"
 
-#: ../libnm-core/nm-keyfile.c:467
+#: ../libnm-core/nm-keyfile-reader.c:413
 #, c-format
 msgid "invalid prefix length for %s '%s', defaulting to %d"
-msgstr "%s 的前缀长度 \"%s\" 无效,默认为 %d"
+msgstr "%s '%s' 的无效前缀长度,默认为 %d。"
 
-#: ../libnm-core/nm-keyfile.c:474
+#: ../libnm-core/nm-keyfile-reader.c:420
 #, c-format
 msgid "missing prefix length for %s '%s', defaulting to %d"
-msgstr "缺少 %s 的前缀长度  \"%s\",默认为 %d"
+msgstr "%s '%s' 缺失的前缀长度,默认为 %d。"
+
+#: ../libnm-core/nm-keyfile-reader.c:554
+#, c-format
+msgid "ignoring invalid DNS server IPv4 address '%s'"
+msgstr "忽略无效的 DNS 服务器 IPv4 地址 '%s'"
 
-#: ../libnm-core/nm-keyfile.c:738
+#: ../libnm-core/nm-keyfile-reader.c:593
 #, c-format
-msgid "ignoring invalid DNS server IPv%c address '%s'"
-msgstr "忽略无效的 DNS 服务器 IPv%c 地址 \"%s\""
+msgid "ignoring invalid DNS server IPv6 address '%s'"
+msgstr "忽略无效的 DNS 服务器 IPv6 地址 '%s'"
 
-#: ../libnm-core/nm-keyfile.c:834 ../libnm-core/nm-keyfile.c:2629
+#: ../libnm-core/nm-keyfile-reader.c:687 ../libnm-core/nm-keyfile-reader.c:1721
 #, c-format
 msgid "ignoring invalid byte element '%d' (not between 0 and 255 inclusive)"
-msgstr "忽略无效的字节元素 \"%d\"(不在 0 和 255 之间)"
+msgstr "忽略无效的字节元素 '%d'(不在 0 和 255 之间)"
 
-#: ../libnm-core/nm-keyfile.c:845
+#: ../libnm-core/nm-keyfile-reader.c:698
 msgid "ignoring invalid MAC address"
 msgstr "忽略无效的 MAC 地址"
 
-#: ../libnm-core/nm-keyfile.c:1082
+#: ../libnm-core/nm-keyfile-reader.c:935
 msgid "ignoring invalid SSID"
 msgstr "忽略无效的 SSID"
 
-#: ../libnm-core/nm-keyfile.c:1098
+#: ../libnm-core/nm-keyfile-reader.c:951
 msgid "ignoring invalid raw password"
 msgstr "忽略无效的原始密码"
 
-#: ../libnm-core/nm-keyfile.c:1236
-msgid "invalid key/cert value"
-msgstr "无效的密钥/证书值"
+#: ../libnm-core/nm-keyfile-reader.c:1026
+#: ../libnm-core/nm-keyfile-reader.c:1202
+#, c-format
+msgid "certificate or key file '%s' does not exist"
+msgstr "证书或密钥文件 '%s' 不存在"
 
-#: ../libnm-core/nm-keyfile.c:1247
+#: ../libnm-core/nm-keyfile-reader.c:1031
 #, c-format
 msgid "invalid key/cert value path \"%s\""
 msgstr "无效的密钥/证书值路径 \"%s\""
 
-#: ../libnm-core/nm-keyfile.c:1263 ../libnm-core/nm-keyfile.c:1346
-#, c-format
-msgid "certificate or key file '%s' does not exist"
-msgstr "证书或密钥文件 \"%s\" 不存在"
-
-#: ../libnm-core/nm-keyfile.c:1272
+#: ../libnm-core/nm-keyfile-reader.c:1041
 #, c-format
 msgid "invalid PKCS#11 URI \"%s\""
-msgstr "无效的 PKCS#11 URI \"%s\""
+msgstr ""
 
-#: ../libnm-core/nm-keyfile.c:1316
+#: ../libnm-core/nm-keyfile-reader.c:1079
 msgid "invalid key/cert value data:;base64, is not base64"
-msgstr "无效的密钥/证书值 data:;base64,不是 base64"
+msgstr "无效的密钥/证书值数据:;base64,不是 base64"
 
-#: ../libnm-core/nm-keyfile.c:1325
+#: ../libnm-core/nm-keyfile-reader.c:1092
 msgid "invalid key/cert value data:;base64,file://"
-msgstr "无效的密钥/证书值 data:;base64,file://"
+msgstr "无效的密钥/证书值数据:;base64,file://"
 
-#: ../libnm-core/nm-keyfile.c:1358
+#: ../libnm-core/nm-keyfile-reader.c:1239
 msgid "invalid key/cert value is not a valid blob"
-msgstr "无效的密钥/证书值,不是有效的比特块(blob)"
+msgstr "无效的密钥/证书值不是有效的 blob"
+
+#: ../libnm-core/nm-keyfile-reader.c:1244
+msgid "invalid key/cert value"
+msgstr "无效的密钥/证书值"
 
-#: ../libnm-core/nm-keyfile.c:1408
+#: ../libnm-core/nm-keyfile-reader.c:1291
 #, c-format
 msgid "invalid parity value '%s'"
-msgstr "无效的奇偶校验值 \"%s\""
+msgstr "无效的奇偶校验值 '%s'"
 
-#: ../libnm-core/nm-keyfile.c:1426
+#: ../libnm-core/nm-keyfile-reader.c:1309
 #, c-format
 msgid "ignoring invalid team configuration: %s"
-msgstr "忽略无效的组合(team)配置:%s"
+msgstr ""
 
-#: ../libnm-core/nm-keyfile.c:1469
-#, c-format
+#: ../libnm-core/nm-keyfile-reader.c:1352
+#, fuzzy, c-format
 msgid "invalid qdisc: %s"
-msgstr "无效的排队规则(qdisc):%s"
+msgstr "无效的 IP 地址:%s"
 
-#: ../libnm-core/nm-keyfile.c:1517
-#, c-format
+#: ../libnm-core/nm-keyfile-reader.c:1400
+#, fuzzy, c-format
 msgid "invalid tfilter: %s"
-msgstr "无效的流量过滤器(tfilter):%s"
+msgstr "无效的路由:%s"
 
-#: ../libnm-core/nm-keyfile.c:2538
+#: ../libnm-core/nm-keyfile-reader.c:1622
 #, c-format
 msgid "error loading setting value: %s"
-msgstr "加载设置值时出错:%s"
+msgstr "加载设置值出错:%s"
 
-#: ../libnm-core/nm-keyfile.c:2563
+#: ../libnm-core/nm-keyfile-reader.c:1654
 #, c-format
 msgid "invalid negative value (%i)"
-msgstr "无效的负值(%i)"
+msgstr "无效的负值 (%i)"
 
-#: ../libnm-core/nm-keyfile.c:2584
+#: ../libnm-core/nm-keyfile-reader.c:1675
 #, c-format
 msgid "invalid char value (%i)"
-msgstr "无效的字符值(%i)"
+msgstr "无效的字符值 (%i)"
 
-#: ../libnm-core/nm-keyfile.c:2606
+#: ../libnm-core/nm-keyfile-reader.c:1698
 #, c-format
 msgid "invalid int64 value (%s)"
-msgstr "无效的 int64 值(%s)"
+msgstr "无效的 int64 值 (%s)"
 
-#: ../libnm-core/nm-keyfile.c:2665
+#: ../libnm-core/nm-keyfile-reader.c:1757
 #, c-format
 msgid "too large FLAGS property '%s' (%llu)"
-msgstr "过大的 FLAGS 属性 \"%s\" (%llu)"
+msgstr "过大的 FLAGS 属性 '%s' (%llu)"
 
-#: ../libnm-core/nm-keyfile.c:2678
+#: ../libnm-core/nm-keyfile-reader.c:1770
 #, c-format
 msgid "unhandled setting property type '%s'"
-msgstr "未处理的设置属性类型 \"%s\""
+msgstr "未处理的设置属性类型 '%s'"
 
-#: ../libnm-core/nm-keyfile.c:2699
+#: ../libnm-core/nm-keyfile-reader.c:1801
 #, c-format
 msgid "invalid setting name '%s'"
-msgstr "无效的设置名称 \"%s\""
-
-#: ../libnm-core/nm-keyfile.c:2742
-#, c-format
-msgid "invalid key '%s.%s'"
-msgstr "无效的密钥 \"%s.%s\""
-
-#: ../libnm-core/nm-keyfile.c:2757
-#, c-format
-msgid "key '%s.%s' is not boolean"
-msgstr "密钥 \"%s.%s\" 不是布尔值"
+msgstr "无效的设置名称 '%s'"
 
-#: ../libnm-core/nm-setting-6lowpan.c:104
-#, c-format
-msgid "property is not specified"
-msgstr "未指定属性"
-
-#: ../libnm-core/nm-setting-6lowpan.c:126 ../libnm-core/nm-setting-macsec.c:306
-#: ../libnm-core/nm-setting-vlan.c:632 ../libnm-util/nm-setting-vlan.c:556
-#, c-format
-msgid "'%s' value doesn't match '%s=%s'"
-msgstr "\"%s\" 值与 \"%s=%s\" 不匹配"
-
-#: ../libnm-core/nm-setting-6lowpan.c:137
-#: ../libnm-core/nm-setting-ip-tunnel.c:351
-#: ../libnm-core/nm-setting-macsec.c:317 ../libnm-core/nm-setting-macvlan.c:161
-#: ../libnm-core/nm-setting-vlan.c:643 ../libnm-core/nm-setting-vxlan.c:401
-#: ../libnm-util/nm-setting-vlan.c:567
-#, c-format
-msgid "'%s' is neither an UUID nor an interface name"
-msgstr "\"%s\" 不是 UUID 或接口名称"
-
-#: ../libnm-core/nm-setting-8021x.c:434
+#: ../libnm-core/nm-setting-8021x.c:436
 msgid "data missing"
 msgstr "数据缺失"
 
-#: ../libnm-core/nm-setting-8021x.c:470
+#: ../libnm-core/nm-setting-8021x.c:472
 msgid "binary data missing"
 msgstr "二进制数据缺失"
 
-#: ../libnm-core/nm-setting-8021x.c:498
+#: ../libnm-core/nm-setting-8021x.c:500
 msgid "URI not NUL terminated"
-msgstr "URI 非 NUL 终止符"
+msgstr ""
 
-#: ../libnm-core/nm-setting-8021x.c:507
+#: ../libnm-core/nm-setting-8021x.c:509
 msgid "URI is empty"
-msgstr "URI 为空"
+msgstr ""
 
-#: ../libnm-core/nm-setting-8021x.c:515
+#: ../libnm-core/nm-setting-8021x.c:517
 msgid "URI is not valid UTF-8"
-msgstr "URI 不是有效的 UTF-8"
+msgstr ""
 
-#: ../libnm-core/nm-setting-8021x.c:751 ../libnm-util/nm-setting-8021x.c:639
+#: ../libnm-core/nm-setting-8021x.c:753 ../libnm-util/nm-setting-8021x.c:639
 msgid "CA certificate must be in X.509 format"
-msgstr "CA 证书必须是 X.509 格式"
+msgstr "CA 证书格式必须是 X.509"
 
-#: ../libnm-core/nm-setting-8021x.c:1156 ../libnm-core/nm-setting-8021x.c:1510
-#: ../libnm-core/nm-setting-8021x.c:1920 ../libnm-util/nm-setting-8021x.c:957
-#: ../libnm-util/nm-setting-8021x.c:1220 ../libnm-util/nm-setting-8021x.c:1542
+#: ../libnm-core/nm-setting-8021x.c:1158 ../libnm-core/nm-setting-8021x.c:1512
+#: ../libnm-core/nm-setting-8021x.c:1923 ../libnm-util/nm-setting-8021x.c:957
+#: ../libnm-util/nm-setting-8021x.c:1220 ../libnm-util/nm-setting-8021x.c:1543
 msgid "invalid certificate format"
 msgstr "无效的证书格式"
 
-#: ../libnm-core/nm-setting-8021x.c:2272 ../libnm-util/nm-setting-8021x.c:1811
+#: ../libnm-core/nm-setting-8021x.c:2275 ../libnm-util/nm-setting-8021x.c:1812
 msgid "invalid private key"
 msgstr "无效的私有密钥"
 
-#: ../libnm-core/nm-setting-8021x.c:2614 ../libnm-util/nm-setting-8021x.c:2122
+#: ../libnm-core/nm-setting-8021x.c:2622 ../libnm-util/nm-setting-8021x.c:2123
 msgid "invalid phase2 private key"
-msgstr "无效的二阶段私钥"
-
-#: ../libnm-core/nm-setting-8021x.c:2874 ../libnm-core/nm-setting-8021x.c:2891
-#: ../libnm-core/nm-setting-8021x.c:2922 ../libnm-core/nm-setting-8021x.c:2939
-#: ../libnm-core/nm-setting-8021x.c:2980 ../libnm-core/nm-setting-8021x.c:2992
-#: ../libnm-core/nm-setting-8021x.c:3010 ../libnm-core/nm-setting-8021x.c:3022
-#: ../libnm-core/nm-setting-8021x.c:3047 ../libnm-core/nm-setting-adsl.c:194
-#: ../libnm-core/nm-setting-cdma.c:164 ../libnm-core/nm-setting-cdma.c:173
-#: ../libnm-core/nm-setting-connection.c:935
-#: ../libnm-core/nm-setting-connection.c:983 ../libnm-core/nm-setting-gsm.c:297
-#: ../libnm-core/nm-setting-gsm.c:354 ../libnm-core/nm-setting-gsm.c:391
-#: ../libnm-core/nm-setting-gsm.c:400 ../libnm-core/nm-setting-ip-config.c:2499
-#: ../libnm-core/nm-setting-ip4-config.c:196
-#: ../libnm-core/nm-setting-ip4-config.c:203
-#: ../libnm-core/nm-setting-pppoe.c:166 ../libnm-core/nm-setting-pppoe.c:175
-#: ../libnm-core/nm-setting-vpn.c:497 ../libnm-core/nm-setting-vpn.c:507
-#: ../libnm-core/nm-setting-wimax.c:133
-#: ../libnm-core/nm-setting-wireless-security.c:948
-#: ../libnm-core/nm-setting-wireless-security.c:972
-#: ../libnm-core/nm-setting.c:1127 ../libnm-util/nm-setting-8021x.c:2331
-#: ../libnm-util/nm-setting-8021x.c:2348 ../libnm-util/nm-setting-8021x.c:2389
-#: ../libnm-util/nm-setting-8021x.c:2406 ../libnm-util/nm-setting-8021x.c:2457
-#: ../libnm-util/nm-setting-8021x.c:2469 ../libnm-util/nm-setting-8021x.c:2487
-#: ../libnm-util/nm-setting-8021x.c:2499 ../libnm-util/nm-setting-8021x.c:2524
-#: ../libnm-util/nm-setting-adsl.c:216 ../libnm-util/nm-setting-cdma.c:168
-#: ../libnm-util/nm-setting-cdma.c:177
-#: ../libnm-util/nm-setting-connection.c:772
-#: ../libnm-util/nm-setting-connection.c:849 ../libnm-util/nm-setting-gsm.c:281
-#: ../libnm-util/nm-setting-gsm.c:338 ../libnm-util/nm-setting-ip4-config.c:934
+msgstr "无效的二阶段私有密钥"
+
+#: ../libnm-core/nm-setting-8021x.c:2888 ../libnm-core/nm-setting-8021x.c:2905
+#: ../libnm-core/nm-setting-8021x.c:2936 ../libnm-core/nm-setting-8021x.c:2953
+#: ../libnm-core/nm-setting-8021x.c:2994 ../libnm-core/nm-setting-8021x.c:3006
+#: ../libnm-core/nm-setting-8021x.c:3024 ../libnm-core/nm-setting-8021x.c:3036
+#: ../libnm-core/nm-setting-8021x.c:3061 ../libnm-core/nm-setting-adsl.c:196
+#: ../libnm-core/nm-setting-cdma.c:166 ../libnm-core/nm-setting-cdma.c:175
+#: ../libnm-core/nm-setting-connection.c:901
+#: ../libnm-core/nm-setting-connection.c:949 ../libnm-core/nm-setting-gsm.c:299
+#: ../libnm-core/nm-setting-gsm.c:356 ../libnm-core/nm-setting-gsm.c:393
+#: ../libnm-core/nm-setting-gsm.c:402 ../libnm-core/nm-setting-ip-config.c:2521
+#: ../libnm-core/nm-setting-ip4-config.c:198
+#: ../libnm-core/nm-setting-ip4-config.c:205
+#: ../libnm-core/nm-setting-pppoe.c:168 ../libnm-core/nm-setting-pppoe.c:177
+#: ../libnm-core/nm-setting-vpn.c:527 ../libnm-core/nm-setting-vpn.c:537
+#: ../libnm-core/nm-setting-wimax.c:135
+#: ../libnm-core/nm-setting-wireless-security.c:930
+#: ../libnm-core/nm-setting-wireless-security.c:954
+#: ../libnm-core/nm-setting.c:1118 ../libnm-util/nm-setting-8021x.c:2332
+#: ../libnm-util/nm-setting-8021x.c:2349 ../libnm-util/nm-setting-8021x.c:2390
+#: ../libnm-util/nm-setting-8021x.c:2407 ../libnm-util/nm-setting-8021x.c:2458
+#: ../libnm-util/nm-setting-8021x.c:2470 ../libnm-util/nm-setting-8021x.c:2488
+#: ../libnm-util/nm-setting-8021x.c:2500 ../libnm-util/nm-setting-8021x.c:2525
+#: ../libnm-util/nm-setting-adsl.c:216 ../libnm-util/nm-setting-cdma.c:169
+#: ../libnm-util/nm-setting-cdma.c:178
+#: ../libnm-util/nm-setting-connection.c:775
+#: ../libnm-util/nm-setting-connection.c:852 ../libnm-util/nm-setting-gsm.c:282
+#: ../libnm-util/nm-setting-gsm.c:339 ../libnm-util/nm-setting-ip4-config.c:934
 #: ../libnm-util/nm-setting-ip4-config.c:943
-#: ../libnm-util/nm-setting-pppoe.c:169 ../libnm-util/nm-setting-pppoe.c:178
-#: ../libnm-util/nm-setting-vpn.c:431 ../libnm-util/nm-setting-vpn.c:441
-#: ../libnm-util/nm-setting-wimax.c:158
-#: ../libnm-util/nm-setting-wireless-security.c:920
-#: ../libnm-util/nm-setting-wireless-security.c:944
+#: ../libnm-util/nm-setting-pppoe.c:170 ../libnm-util/nm-setting-pppoe.c:179
+#: ../libnm-util/nm-setting-vpn.c:432 ../libnm-util/nm-setting-vpn.c:442
+#: ../libnm-util/nm-setting-wimax.c:159
+#: ../libnm-util/nm-setting-wireless-security.c:921
+#: ../libnm-util/nm-setting-wireless-security.c:945
 msgid "property is empty"
 msgstr "属性为空"
 
-#: ../libnm-core/nm-setting-8021x.c:2904 ../libnm-core/nm-setting-8021x.c:2952
-#: ../libnm-util/nm-setting-8021x.c:2359 ../libnm-util/nm-setting-8021x.c:2371
-#: ../libnm-util/nm-setting-8021x.c:2417 ../libnm-util/nm-setting-8021x.c:2429
+#: ../libnm-core/nm-setting-8021x.c:2918 ../libnm-core/nm-setting-8021x.c:2966
+#: ../libnm-util/nm-setting-8021x.c:2360 ../libnm-util/nm-setting-8021x.c:2372
+#: ../libnm-util/nm-setting-8021x.c:2418 ../libnm-util/nm-setting-8021x.c:2430
 #, c-format
 msgid "has to match '%s' property for PKCS#12"
-msgstr "必须匹配 PKCS#12 的 \"%s\" 属性"
+msgstr "PKCS#12:必须匹配“%s”属性"
 
-#: ../libnm-core/nm-setting-8021x.c:3181
+#: ../libnm-core/nm-setting-8021x.c:3197
 #, c-format
 msgid "certificate is invalid: %s"
 msgstr "证书是无效的:%s"
 
-#: ../libnm-core/nm-setting-8021x.c:3191
+#: ../libnm-core/nm-setting-8021x.c:3207
 #, c-format
 msgid "password is not supported when certificate is not on a PKCS#11 token"
-msgstr "当证书不在 PKCS#11 令牌上时不支持密码"
-
-#: ../libnm-core/nm-setting-8021x.c:3228
-#: ../libnm-core/nm-setting-bluetooth.c:121
-#: ../libnm-core/nm-setting-infiniband.c:190
-#: ../libnm-core/nm-setting-infiniband.c:205
-#: ../libnm-core/nm-setting-ip4-config.c:187
-#: ../libnm-core/nm-setting-ip6-config.c:235
-#: ../libnm-core/nm-setting-ip6-config.c:246
-#: ../libnm-core/nm-setting-olpc-mesh.c:147
-#: ../libnm-core/nm-setting-wimax.c:142 ../libnm-core/nm-setting-wired.c:676
-#: ../libnm-core/nm-setting-wired.c:686
+msgstr ""
+
+#: ../libnm-core/nm-setting-8021x.c:3244
+#: ../libnm-core/nm-setting-bluetooth.c:123
+#: ../libnm-core/nm-setting-infiniband.c:192
+#: ../libnm-core/nm-setting-infiniband.c:207
+#: ../libnm-core/nm-setting-ip4-config.c:189
+#: ../libnm-core/nm-setting-ip6-config.c:215
+#: ../libnm-core/nm-setting-ip6-config.c:226
+#: ../libnm-core/nm-setting-olpc-mesh.c:149
+#: ../libnm-core/nm-setting-wimax.c:144 ../libnm-core/nm-setting-wired.c:678
+#: ../libnm-core/nm-setting-wired.c:688
+#: ../libnm-core/nm-setting-wireless-security.c:973
+#: ../libnm-core/nm-setting-wireless-security.c:982
 #: ../libnm-core/nm-setting-wireless-security.c:991
-#: ../libnm-core/nm-setting-wireless-security.c:1000
-#: ../libnm-core/nm-setting-wireless-security.c:1009
-#: ../libnm-core/nm-setting-wireless-security.c:1045
-#: ../libnm-core/nm-setting-wireless-security.c:1055
-#: ../libnm-core/nm-setting-wireless-security.c:1078
-#: ../libnm-core/nm-setting-wireless-security.c:1103
-#: ../libnm-core/nm-setting-wireless-security.c:1130
-#: ../libnm-core/nm-setting-wireless-security.c:1169
+#: ../libnm-core/nm-setting-wireless-security.c:1027
+#: ../libnm-core/nm-setting-wireless-security.c:1037
+#: ../libnm-core/nm-setting-wireless-security.c:1060
+#: ../libnm-core/nm-setting-wireless-security.c:1085
+#: ../libnm-core/nm-setting-wireless-security.c:1112
+#: ../libnm-core/nm-setting-wireless-security.c:1151
 #: ../libnm-core/nm-setting-wireless.c:811
 #: ../libnm-core/nm-setting-wireless.c:820
-#: ../libnm-core/nm-setting-wireless.c:831 ../libnm-core/nm-setting-wpan.c:129
-#: ../libnm-util/nm-setting.c:1365 ../libnm-util/nm-setting.c:1383
-#: ../libnm-util/nm-setting.c:1402 ../libnm-util/nm-setting-8021x.c:2652
-#: ../libnm-util/nm-setting-8021x.c:2686
-#: ../libnm-util/nm-setting-bluetooth.c:150
+#: ../libnm-core/nm-setting-wireless.c:831 ../libnm-util/nm-setting.c:1367
+#: ../libnm-util/nm-setting.c:1385 ../libnm-util/nm-setting.c:1404
+#: ../libnm-util/nm-setting-8021x.c:2655 ../libnm-util/nm-setting-8021x.c:2689
+#: ../libnm-util/nm-setting-bluetooth.c:151
 #: ../libnm-util/nm-setting-infiniband.c:205
 #: ../libnm-util/nm-setting-infiniband.c:221
 #: ../libnm-util/nm-setting-ip4-config.c:925
-#: ../libnm-util/nm-setting-ip6-config.c:888
+#: ../libnm-util/nm-setting-ip6-config.c:890
 #: ../libnm-util/nm-setting-olpc-mesh.c:151
-#: ../libnm-util/nm-setting-wimax.c:167 ../libnm-util/nm-setting-wired.c:657
-#: ../libnm-util/nm-setting-wired.c:666
-#: ../libnm-util/nm-setting-wireless-security.c:963
-#: ../libnm-util/nm-setting-wireless-security.c:972
-#: ../libnm-util/nm-setting-wireless-security.c:981
-#: ../libnm-util/nm-setting-wireless-security.c:1017
-#: ../libnm-util/nm-setting-wireless-security.c:1027
-#: ../libnm-util/nm-setting-wireless.c:828
-#: ../libnm-util/nm-setting-wireless.c:837
-#: ../libnm-util/nm-setting-wireless.c:846
+#: ../libnm-util/nm-setting-wimax.c:168 ../libnm-util/nm-setting-wired.c:658
+#: ../libnm-util/nm-setting-wired.c:667
+#: ../libnm-util/nm-setting-wireless-security.c:964
+#: ../libnm-util/nm-setting-wireless-security.c:973
+#: ../libnm-util/nm-setting-wireless-security.c:982
+#: ../libnm-util/nm-setting-wireless-security.c:1018
+#: ../libnm-util/nm-setting-wireless-security.c:1028
+#: ../libnm-util/nm-setting-wireless.c:829
+#: ../libnm-util/nm-setting-wireless.c:838
+#: ../libnm-util/nm-setting-wireless.c:847
 msgid "property is invalid"
 msgstr "属性无效"
 
-#: ../libnm-core/nm-setting-8021x.c:3253 ../libnm-core/nm-setting-8021x.c:3263
-#: ../libnm-core/nm-setting-8021x.c:3273 ../libnm-core/nm-setting-8021x.c:3292
-#: ../libnm-core/nm-setting-8021x.c:3302 ../libnm-core/nm-setting-adsl.c:206
-#: ../libnm-core/nm-setting-adsl.c:218 ../libnm-core/nm-setting-bluetooth.c:149
-#: ../libnm-core/nm-setting-wireless-security.c:927
-#: ../libnm-util/nm-setting-8021x.c:2711 ../libnm-util/nm-setting-8021x.c:2721
-#: ../libnm-util/nm-setting-8021x.c:2731 ../libnm-util/nm-setting-8021x.c:2741
-#: ../libnm-util/nm-setting-8021x.c:2751 ../libnm-util/nm-setting-adsl.c:228
-#: ../libnm-util/nm-setting-adsl.c:240 ../libnm-util/nm-setting-bluetooth.c:167
-#: ../libnm-util/nm-setting-wireless-security.c:899
+#: ../libnm-core/nm-setting-8021x.c:3269 ../libnm-core/nm-setting-8021x.c:3279
+#: ../libnm-core/nm-setting-8021x.c:3289 ../libnm-core/nm-setting-8021x.c:3308
+#: ../libnm-core/nm-setting-8021x.c:3318 ../libnm-core/nm-setting-adsl.c:208
+#: ../libnm-core/nm-setting-adsl.c:220 ../libnm-core/nm-setting-bluetooth.c:151
+#: ../libnm-core/nm-setting-wireless-security.c:909
+#: ../libnm-util/nm-setting-8021x.c:2714 ../libnm-util/nm-setting-8021x.c:2724
+#: ../libnm-util/nm-setting-8021x.c:2734 ../libnm-util/nm-setting-8021x.c:2744
+#: ../libnm-util/nm-setting-8021x.c:2754 ../libnm-util/nm-setting-adsl.c:228
+#: ../libnm-util/nm-setting-adsl.c:240 ../libnm-util/nm-setting-bluetooth.c:168
+#: ../libnm-util/nm-setting-wireless-security.c:900
 #, c-format
 msgid "'%s' is not a valid value for the property"
-msgstr "\"%s\" 不是该属性的有效取值"
+msgstr "“%s”不是该属性的有效取值"
 
-#: ../libnm-core/nm-setting-8021x.c:3283
+#: ../libnm-core/nm-setting-8021x.c:3299
+#, fuzzy
 msgid "invalid auth flags"
-msgstr "无效的验证标记"
+msgstr "无效的路由:%s"
 
-#: ../libnm-core/nm-setting-bluetooth.c:171
+#: ../libnm-core/nm-setting-bluetooth.c:173
 #, c-format
 msgid "'%s' connection requires '%s' or '%s' setting"
-msgstr "\"%s\" 连接需要 \"%s\" 或者 \"%s\" 设置"
+msgstr "'%s' 连接需要 '%s' 或者 '%s' 设置"
 
-#: ../libnm-core/nm-setting-bluetooth.c:217
+#: ../libnm-core/nm-setting-bluetooth.c:219
 #, c-format
 msgid "'%s' connection requires '%s' setting"
-msgstr "\"%s\" 连接需要 \"%s\" 设置"
+msgstr ""
 
-#: ../libnm-core/nm-setting-bond.c:564 ../libnm-util/nm-setting-bond.c:516
+#: ../libnm-core/nm-setting-bond.c:566 ../libnm-util/nm-setting-bond.c:517
 #, c-format
 msgid "invalid option '%s' or its value '%s'"
-msgstr "无效的选项 \"%s\" 或其值 \"%s\""
+msgstr "无效选项“%s”或值“%s”"
 
-#: ../libnm-core/nm-setting-bond.c:589 ../libnm-util/nm-setting-bond.c:535
+#: ../libnm-core/nm-setting-bond.c:591 ../libnm-util/nm-setting-bond.c:536
 #, c-format
 msgid "only one of '%s' and '%s' can be set"
-msgstr "只能设置 \"%s\" 和 \"%s\" 中的一个"
+msgstr "只能设置“%s”和“%s”中的一个"
 
-#: ../libnm-core/nm-setting-bond.c:602 ../libnm-util/nm-setting-bond.c:546
+#: ../libnm-core/nm-setting-bond.c:604 ../libnm-util/nm-setting-bond.c:547
 #, c-format
 msgid "mandatory option '%s' is missing"
-msgstr "缺少必填选项 \"%s\""
+msgstr "缺少强制选项 “%s”"
 
-#: ../libnm-core/nm-setting-bond.c:612 ../libnm-util/nm-setting-bond.c:555
+#: ../libnm-core/nm-setting-bond.c:614 ../libnm-util/nm-setting-bond.c:556
 #, c-format
 msgid "'%s' is not a valid value for '%s'"
-msgstr "\"%s\" 不是 \"%s\" 的有效取值"
+msgstr "“%s”不是“%s”的有效取值"
 
-#: ../libnm-core/nm-setting-bond.c:626 ../libnm-util/nm-setting-bond.c:568
+#: ../libnm-core/nm-setting-bond.c:628 ../libnm-util/nm-setting-bond.c:569
 #, c-format
 msgid "'%s=%s' is incompatible with '%s > 0'"
-msgstr "\"%s=%s\" 与 \"%s > 0\" 不兼容"
+msgstr "“%s=%s”与“%s > 0”不兼容"
 
-#: ../libnm-core/nm-setting-bond.c:641
+#: ../libnm-core/nm-setting-bond.c:643
 #, c-format
 msgid "'%s' is not valid for the '%s' option: %s"
-msgstr "\"%s\" 对 \"%s\" 选项无效:%s"
+msgstr ""
 
-#: ../libnm-core/nm-setting-bond.c:652 ../libnm-util/nm-setting-bond.c:591
+#: ../libnm-core/nm-setting-bond.c:654 ../libnm-util/nm-setting-bond.c:592
 #, c-format
 msgid "'%s' option is only valid for '%s=%s'"
-msgstr "\"%s\" 选项只能在 \"%s=%s\" 中使用"
+msgstr "“%s” 选项只能在 “%s=%s” 中使用"
 
-#: ../libnm-core/nm-setting-bond.c:665 ../libnm-util/nm-setting-bond.c:604
+#: ../libnm-core/nm-setting-bond.c:667 ../libnm-util/nm-setting-bond.c:605
 #, c-format
 msgid "'%s=%s' is not a valid configuration for '%s'"
-msgstr "\"%s=%s\" 不是 \"%s\" 的有效配置"
+msgstr "“%s=%s”不是“%s”的有效配置"
 
-#: ../libnm-core/nm-setting-bond.c:678 ../libnm-core/nm-setting-bond.c:687
-#: ../libnm-core/nm-setting-bond.c:707 ../libnm-core/nm-setting-bond.c:743
-#: ../libnm-util/nm-setting-bond.c:617 ../libnm-util/nm-setting-bond.c:626
-#: ../libnm-util/nm-setting-bond.c:646 ../libnm-util/nm-setting-bond.c:682
+#: ../libnm-core/nm-setting-bond.c:680 ../libnm-core/nm-setting-bond.c:689
+#: ../libnm-core/nm-setting-bond.c:709 ../libnm-core/nm-setting-bond.c:745
+#: ../libnm-util/nm-setting-bond.c:618 ../libnm-util/nm-setting-bond.c:627
+#: ../libnm-util/nm-setting-bond.c:647 ../libnm-util/nm-setting-bond.c:683
 #, c-format
 msgid "'%s' option requires '%s' option to be set"
-msgstr "\"%s\" 选项需要设置 \"%s\" 选项"
+msgstr "“%s” 选项需要设置 “%s” 选项"
 
-#: ../libnm-core/nm-setting-bond.c:718 ../libnm-util/nm-setting-bond.c:657
+#: ../libnm-core/nm-setting-bond.c:720 ../libnm-util/nm-setting-bond.c:658
 #, c-format
 msgid "'%s' option is empty"
-msgstr "\"%s\"选项为空"
+msgstr "“%s”选项为空"
 
-#: ../libnm-core/nm-setting-bond.c:730 ../libnm-util/nm-setting-bond.c:669
+#: ../libnm-core/nm-setting-bond.c:732 ../libnm-util/nm-setting-bond.c:670
 #, c-format
 msgid "'%s' is not a valid IPv4 address for '%s' option"
-msgstr "\"%s\" 不是 \"%s\" 选项的有效 IPv4 地址"
+msgstr "“%s”不是“%s”选项的有效 IPv4 地址。"
 
-#: ../libnm-core/nm-setting-bond.c:758 ../libnm-util/nm-setting-bond.c:696
+#: ../libnm-core/nm-setting-bond.c:760 ../libnm-util/nm-setting-bond.c:697
 #, c-format
 msgid "'%s' option is only valid with mode '%s'"
-msgstr "\"%s\" 选项只在 \"%s\" 模式里有效"
+msgstr "'%s' 选项只在 '%s' 模式里有效"
 
-#: ../libnm-core/nm-setting-bond.c:769
+#: ../libnm-core/nm-setting-bond.c:771
 #, c-format
 msgid "'%s' and '%s' cannot have different values"
-msgstr "\"%s\" 和 \"%s\" 不能有不同的值"
+msgstr "'%s' 和 '%s' 不能有不同的值"
 
-#: ../libnm-core/nm-setting-bond.c:785
+#: ../libnm-core/nm-setting-bond.c:787
 #, c-format
 msgid "'%s' option should be string"
-msgstr "\"%s\" 选项应该为字符串"
+msgstr "'%s' 选项应该为字符串"
 
-#: ../libnm-core/nm-setting-bond.c:801
+#: ../libnm-core/nm-setting-bond.c:803
 #, c-format
 msgid "'%s' option is not valid with mode '%s'"
-msgstr "\"%s\" 选项在 \"%s\" 模式里无效"
+msgstr ""
 
-#: ../libnm-core/nm-setting-bridge-port.c:125
-#: ../libnm-core/nm-setting-ovs-interface.c:259
-#: ../libnm-core/nm-setting-ovs-port.c:187
-#: ../libnm-core/nm-setting-ovs-bridge.c:150
-#: ../libnm-core/nm-setting-team-port.c:357
+#: ../libnm-core/nm-setting-bridge-port.c:127
+#: ../libnm-core/nm-setting-ovs-interface.c:262
+#: ../libnm-core/nm-setting-ovs-port.c:189
+#: ../libnm-core/nm-setting-ovs-bridge.c:152
+#: ../libnm-core/nm-setting-team-port.c:358
 #, c-format
 msgid "missing setting"
 msgstr "缺少设置"
 
-#: ../libnm-core/nm-setting-bridge-port.c:136
-#: ../libnm-core/nm-setting-ovs-interface.c:280
-#: ../libnm-core/nm-setting-ovs-port.c:208
-#: ../libnm-core/nm-setting-team-port.c:368
+#: ../libnm-core/nm-setting-bridge-port.c:138
+#: ../libnm-core/nm-setting-ovs-interface.c:283
+#: ../libnm-core/nm-setting-ovs-port.c:210
+#: ../libnm-core/nm-setting-team-port.c:369
 #, c-format
 msgid ""
 "A connection with a '%s' setting must have the slave-type set to '%s'. "
 "Instead it is '%s'"
-msgstr "具有 \"%s\" 设置的连接必须将 slave-type 设置为 \"%s\"。而它是 \"%s\""
+msgstr "具有 '%s' 设置的连接必须将 slave-type 设置为 '%s'。而它是 '%s'。"
 
-#: ../libnm-core/nm-setting-bridge.c:229 ../libnm-util/nm-setting-bridge.c:268
+#: ../libnm-core/nm-setting-bridge.c:231 ../libnm-util/nm-setting-bridge.c:269
 #, c-format
 msgid "value '%d' is out of range <%d-%d>"
-msgstr "值 \"%d\" 超出了范围 <%d-%d>"
+msgstr "值“%d”超出了范围 <%d-%d>"
 
-#: ../libnm-core/nm-setting-bridge.c:246 ../libnm-core/nm-setting-wired.c:650
-#: ../libnm-core/nm-setting-wired.c:712 ../libnm-core/nm-setting-wired.c:754
-#: ../libnm-util/nm-setting-bridge.c:285 ../libnm-util/nm-setting-wired.c:632
-#: ../libnm-util/nm-setting-wired.c:690
+#: ../libnm-core/nm-setting-bridge.c:248 ../libnm-core/nm-setting-wired.c:652
+#: ../libnm-core/nm-setting-wired.c:714 ../libnm-core/nm-setting-wired.c:756
+#: ../libnm-util/nm-setting-bridge.c:286 ../libnm-util/nm-setting-wired.c:633
+#: ../libnm-util/nm-setting-wired.c:691
 msgid "is not a valid MAC address"
 msgstr "不是有效的 MAC 地址"
 
-#: ../libnm-core/nm-setting-bridge.c:287
+#: ../libnm-core/nm-setting-bridge.c:289
 msgid "the mask can't contain bits 0 (STP), 1 (MAC) or 2 (LACP)"
-msgstr "掩码不能包含位 0(STP)、1(MAC)或2(LACP)"
+msgstr ""
 
-#: ../libnm-core/nm-setting-connection.c:905
+#: ../libnm-core/nm-setting-connection.c:871
 #, c-format
 msgid "setting required for connection of type '%s'"
-msgstr "类型为 \"%s\" 的连接需要设置"
+msgstr "类型为 '%s' 的连接要求的设置"
 
-#: ../libnm-core/nm-setting-connection.c:944
-#: ../libnm-util/nm-setting-connection.c:788
+#: ../libnm-core/nm-setting-connection.c:910
+#: ../libnm-util/nm-setting-connection.c:791
 #, c-format
 msgid "'%s' is not a valid UUID"
-msgstr "\"%s\"不是有效的 UUID"
+msgstr "“%s”不是有效的 UUID"
 
-#: ../libnm-core/nm-setting-connection.c:994
+#: ../libnm-core/nm-setting-connection.c:960
 #, c-format
 msgid "connection type '%s' is not valid"
-msgstr "连接类型 \"%s\" 无效"
+msgstr "连接类型 '%s' 无效"
 
-#: ../libnm-core/nm-setting-connection.c:1030
-#: ../libnm-util/nm-setting-connection.c:874
+#: ../libnm-core/nm-setting-connection.c:996
+#: ../libnm-util/nm-setting-connection.c:877
 #, c-format
 msgid "Unknown slave type '%s'"
-msgstr "未知的从类型 \"%s\""
+msgstr "未知的从类型 '%s'"
 
-#: ../libnm-core/nm-setting-connection.c:1041
-#: ../libnm-util/nm-setting-connection.c:884
+#: ../libnm-core/nm-setting-connection.c:1007
+#: ../libnm-util/nm-setting-connection.c:887
 #, c-format
 msgid "Slave connections need a valid '%s' property"
-msgstr "从连接需要有效的 \"%s\" 属性"
+msgstr "从连接需要有效的 '%s' 属性"
 
-#: ../libnm-core/nm-setting-connection.c:1062
-#: ../libnm-util/nm-setting-connection.c:894
+#: ../libnm-core/nm-setting-connection.c:1028
+#: ../libnm-util/nm-setting-connection.c:897
 #, c-format
 msgid "Cannot set '%s' without '%s'"
-msgstr "没有 \"%s\" 无法设置 \"%s\""
+msgstr "没有 '%s' 无法设置 '%s'"
 
-#: ../libnm-core/nm-setting-connection.c:1076
+#: ../libnm-core/nm-setting-connection.c:1041
 #, c-format
-msgid "'%s' connections must be enslaved to '%s', not '%s'"
-msgstr "\"%s\" 连接必须从属于 \"%s\",而不是 \"%s\""
+msgid "Only '%s' connections can be enslaved to '%s'"
+msgstr ""
 
-#: ../libnm-core/nm-setting-connection.c:1090
+#: ../libnm-core/nm-setting-connection.c:1054
 #, c-format
 msgid "metered value %d is not valid"
-msgstr "计量值 %d 无效"
-
-#: ../libnm-core/nm-setting-connection.c:1101
-#, c-format
-msgid "mdns value %d is not valid"
-msgstr "mdns %d 无效"
-
-#: ../libnm-core/nm-setting-connection.c:1114
-#, c-format
-msgid "value %d is not valid"
-msgstr "值 %d 无效"
+msgstr "测量值 %d 无效"
 
-#: ../libnm-core/nm-setting-connection.c:1135
+#: ../libnm-core/nm-setting-connection.c:1075
 #, c-format
 msgid "property type should be set to '%s'"
-msgstr "属性类型应该设置为 \"%s\""
+msgstr "属性类型应该设置为 '%s'"
 
-#: ../libnm-core/nm-setting-connection.c:1150
+#: ../libnm-core/nm-setting-connection.c:1090
 #, c-format
 msgid "slave-type '%s' requires a '%s' setting in the connection"
-msgstr "slave-type \"%s\" 要求连接中有 \"%s\" 设置"
+msgstr "slave-type '%s' 要求连接中有 '%s' 设置"
 
-#: ../libnm-core/nm-setting-connection.c:1160
+#: ../libnm-core/nm-setting-connection.c:1100
 #, c-format
 msgid ""
 "Detect a slave connection with '%s' set and a port type '%s'. '%s' should be "
 "set to '%s'"
-msgstr ""
-"检测到设置了 \"%s\" 和端口类型为 \"%s\" 的从连接。\"%s\" 应该设置为 \"%s\""
+msgstr "检测到设置了 '%s' 和端口类型 '%s' 的从连接。'%s' 应该设置为 '%s'。"
 
-#: ../libnm-core/nm-setting-connection.c:1177
-#, c-format
+#: ../libnm-core/nm-setting-connection.c:1117
+#, fuzzy, c-format
 msgid "A slave connection with '%s' set to '%s' cannot have a '%s' setting"
-msgstr "\"%s\" 设为 \"%s\" 的从连接不能有个 \"%s\" 设置"
+msgstr "检测到设置了 '%s' 和端口类型 '%s' 的从连接。'%s' 应该设置为 '%s'。"
 
-#: ../libnm-core/nm-setting-dcb.c:520 ../libnm-util/nm-setting-dcb.c:593
+#: ../libnm-core/nm-setting-dcb.c:522 ../libnm-util/nm-setting-dcb.c:594
 msgid "flags invalid"
 msgstr "标志无效"
 
-#: ../libnm-core/nm-setting-dcb.c:529 ../libnm-util/nm-setting-dcb.c:602
+#: ../libnm-core/nm-setting-dcb.c:531 ../libnm-util/nm-setting-dcb.c:603
 msgid "flags invalid - disabled"
-msgstr "标志无效 — 已禁用"
+msgstr "标志无效 - 已禁用"
 
-#: ../libnm-core/nm-setting-dcb.c:555 ../libnm-core/nm-setting-dcb.c:604
-#: ../libnm-util/nm-setting-dcb.c:628 ../libnm-util/nm-setting-dcb.c:677
+#: ../libnm-core/nm-setting-dcb.c:557 ../libnm-core/nm-setting-dcb.c:606
+#: ../libnm-util/nm-setting-dcb.c:629 ../libnm-util/nm-setting-dcb.c:678
 msgid "property invalid (not enabled)"
 msgstr "属性无效(未启用)"
 
-#: ../libnm-core/nm-setting-dcb.c:564 ../libnm-util/nm-setting-dcb.c:637
+#: ../libnm-core/nm-setting-dcb.c:566 ../libnm-util/nm-setting-dcb.c:638
 msgid "element invalid"
 msgstr "元素无效"
 
-#: ../libnm-core/nm-setting-dcb.c:579 ../libnm-util/nm-setting-dcb.c:652
+#: ../libnm-core/nm-setting-dcb.c:581 ../libnm-util/nm-setting-dcb.c:653
 msgid "sum not 100%"
-msgstr "总和不是 100%"
+msgstr "sum 不是 100%"
 
-#: ../libnm-core/nm-setting-dcb.c:613 ../libnm-core/nm-setting-dcb.c:645
-#: ../libnm-util/nm-setting-dcb.c:686 ../libnm-util/nm-setting-dcb.c:718
+#: ../libnm-core/nm-setting-dcb.c:615 ../libnm-core/nm-setting-dcb.c:647
+#: ../libnm-util/nm-setting-dcb.c:687 ../libnm-util/nm-setting-dcb.c:719
 msgid "property invalid"
 msgstr "属性无效"
 
-#: ../libnm-core/nm-setting-dcb.c:635 ../libnm-util/nm-setting-dcb.c:708
+#: ../libnm-core/nm-setting-dcb.c:637 ../libnm-util/nm-setting-dcb.c:709
 msgid "property missing"
 msgstr "缺少属性"
 
-#: ../libnm-core/nm-setting-ethtool.c:269
-msgid "unsupported offload feature"
-msgstr "不支持的卸载功能"
-
-#: ../libnm-core/nm-setting-ethtool.c:277
-msgid "offload feature has invalid variant type"
-msgstr "卸载功能有无效的变种类型"
-
-#: ../libnm-core/nm-setting-ethtool.c:300
-#, c-format
-msgid "unknown ethtool option '%s'"
-msgstr "未知的 ethtool 选项 \"%s\""
-
-#: ../libnm-core/nm-setting-gsm.c:310 ../libnm-util/nm-setting-gsm.c:294
+#: ../libnm-core/nm-setting-gsm.c:312 ../libnm-util/nm-setting-gsm.c:295
 #, c-format
 msgid "property value '%s' is empty or too long (>64)"
-msgstr "属性值 \"%s\" 为空或过长(>64)"
+msgstr "属性值“%s”为空或过长(>64)"
 
-#: ../libnm-core/nm-setting-gsm.c:342 ../libnm-util/nm-setting-gsm.c:326
+#: ../libnm-core/nm-setting-gsm.c:344 ../libnm-util/nm-setting-gsm.c:327
 #, c-format
 msgid "'%s' contains invalid char(s) (use [A-Za-z._-])"
-msgstr "\"%s\" 包含无效字符(请使用 [A-Za-z._-])"
+msgstr "“%s”包含无效字符(请使用 [A-Za-z._-])"
 
-#: ../libnm-core/nm-setting-gsm.c:368 ../libnm-util/nm-setting-gsm.c:352
+#: ../libnm-core/nm-setting-gsm.c:370 ../libnm-util/nm-setting-gsm.c:353
 #, c-format
 msgid "'%s' length is invalid (should be 5 or 6 digits)"
-msgstr "\"%s\" 长度无效(应为 5 位或 6 位数)"
-
-#: ../libnm-core/nm-setting-gsm.c:379 ../libnm-util/nm-setting-gsm.c:363
-#, c-format
-msgid "'%s' is not a number"
-msgstr "\"%s\" 不是数字"
+msgstr "“%s”长度无效(应为5位或6位数)"
 
-#: ../libnm-core/nm-setting-gsm.c:413
+#: ../libnm-core/nm-setting-gsm.c:415
 msgid "property is empty or wrong size"
 msgstr "属性为空或大小错误"
 
-#: ../libnm-core/nm-setting-gsm.c:423
+#: ../libnm-core/nm-setting-gsm.c:425
 msgid "property must contain only digits"
 msgstr "属性必须只包含数字"
 
-#: ../libnm-core/nm-setting-infiniband.c:226
+#: ../libnm-core/nm-setting-infiniband.c:228
 #: ../libnm-util/nm-setting-infiniband.c:239
 msgid "Must specify a P_Key if specifying parent"
-msgstr "如果指定上级接口,则必须指定 P_Key"
+msgstr "如果指定上级接口,则必须指定 P_Key。"
 
-#: ../libnm-core/nm-setting-infiniband.c:236
+#: ../libnm-core/nm-setting-infiniband.c:238
 #: ../libnm-util/nm-setting-infiniband.c:249
 msgid "InfiniBand P_Key connection did not specify parent interface name"
 msgstr "InfiniBand P_Key 连接未指定上级接口名"
 
-#: ../libnm-core/nm-setting-infiniband.c:274
+#: ../libnm-core/nm-setting-infiniband.c:276
 #: ../libnm-util/nm-setting-infiniband.c:285
 #, c-format
 msgid ""
 "interface name of software infiniband device must be '%s' or unset (instead "
 "it is '%s')"
-msgstr "软件 infiniband 设备的接口名必须为 \"%s\" 或未设置(但现在是 \"%s\")"
+msgstr "软件 infiniband 设备的接口名必须为 '%s' 或未设置(相反它是 '%s')"
 
-#: ../libnm-core/nm-setting-infiniband.c:289
+#: ../libnm-core/nm-setting-infiniband.c:291
 #, c-format
 msgid "mtu for transport mode '%s' can be at most %d but it is %d"
-msgstr "传输模式 \"%s\" 的 MTU 最多为 %d,但现在是 %d"
+msgstr "传输模式 '%s' 的 MTU 最多为 %d,但现在是 %d。"
 
 #: ../libnm-core/nm-setting-ip-config.c:133
 #, c-format
@@ -10995,923 +9762,897 @@ msgstr "缺失 IPv6 地址"
 #: ../libnm-core/nm-setting-ip-config.c:138
 #, c-format
 msgid "Invalid IPv4 address '%s'"
-msgstr "无效的 IPv4 地址 \"%s\""
+msgstr "无效的 IPv4 地址 '%s'"
 
 #: ../libnm-core/nm-setting-ip-config.c:138
 #, c-format
 msgid "Invalid IPv6 address '%s'"
-msgstr "无效的 IPv6 地址 \"%s\""
+msgstr "无效的 IPv6 地址 '%s'"
 
 #: ../libnm-core/nm-setting-ip-config.c:153
 #, c-format
 msgid "Invalid IPv4 address prefix '%u'"
-msgstr "无效 IPv4 地址前缀 \"%u\""
+msgstr "无效 IPv4 地址前缀 '%u'"
 
 #: ../libnm-core/nm-setting-ip-config.c:153
 #, c-format
 msgid "Invalid IPv6 address prefix '%u'"
-msgstr "无效 IPv6 地址前缀 \"%u\""
+msgstr "无效 IPv6 地址前缀 '%u'"
 
 #: ../libnm-core/nm-setting-ip-config.c:168
 #, c-format
 msgid "Invalid routing metric '%s'"
-msgstr "无效的路由度量 \"%s\""
+msgstr "无效的路由度量 '%s'"
 
-#: ../libnm-core/nm-setting-ip-config.c:1287
-#: ../libnm-core/nm-setting-sriov.c:421
+#: ../libnm-core/nm-setting-ip-config.c:1317
+#, fuzzy
 msgid "unknown attribute"
-msgstr "未知属性"
+msgstr "未知的设置名称"
 
-#: ../libnm-core/nm-setting-ip-config.c:1297
-#: ../libnm-core/nm-setting-sriov.c:431
-#, c-format
+#: ../libnm-core/nm-setting-ip-config.c:1327
+#, fuzzy, c-format
 msgid "invalid attribute type '%s'"
-msgstr "无效的属性类型 \"%s\""
+msgstr "无效的奇偶校验值 '%s'"
 
-#: ../libnm-core/nm-setting-ip-config.c:1308
+#: ../libnm-core/nm-setting-ip-config.c:1338
 #, c-format
 msgid "attribute is not valid for a IPv4 route"
-msgstr "属性对 IPv4 路由无效"
+msgstr ""
 
-#: ../libnm-core/nm-setting-ip-config.c:1309
+#: ../libnm-core/nm-setting-ip-config.c:1339
 #, c-format
 msgid "attribute is not valid for a IPv6 route"
-msgstr "属性对 IPv6 路由无效"
+msgstr ""
 
-#: ../libnm-core/nm-setting-ip-config.c:1325
-#: ../libnm-core/nm-setting-ip-config.c:1349
-#, c-format
+#: ../libnm-core/nm-setting-ip-config.c:1355
+#: ../libnm-core/nm-setting-ip-config.c:1379
+#, fuzzy, c-format
 msgid "'%s' is not a valid IPv4 address"
-msgstr "\"%s\" 不是有效的 IPv4 地址"
+msgstr "'%s' 不是有效的 IP 地址"
 
-#: ../libnm-core/nm-setting-ip-config.c:1326
-#: ../libnm-core/nm-setting-ip-config.c:1350
-#, c-format
+#: ../libnm-core/nm-setting-ip-config.c:1356
+#: ../libnm-core/nm-setting-ip-config.c:1380
+#, fuzzy, c-format
 msgid "'%s' is not a valid IPv6 address"
-msgstr "\"%s\" 不是有效的 IPv6 地址"
+msgstr "'%s' 不是有效的 IP 地址"
 
-#: ../libnm-core/nm-setting-ip-config.c:1340
-#, c-format
+#: ../libnm-core/nm-setting-ip-config.c:1370
+#, fuzzy, c-format
 msgid "invalid prefix %s"
-msgstr "无效的前缀 %s"
+msgstr "无效的路由:%s"
 
-#: ../libnm-core/nm-setting-ip-config.c:2512
+#: ../libnm-core/nm-setting-ip-config.c:2534
 #, c-format
 msgid "%d. DNS server address is invalid"
 msgstr "%d。DNS 服务器地址无效"
 
-#: ../libnm-core/nm-setting-ip-config.c:2528
+#: ../libnm-core/nm-setting-ip-config.c:2550
 #, c-format
 msgid "%d. IP address is invalid"
 msgstr "%d。IP 地址无效"
 
-#: ../libnm-core/nm-setting-ip-config.c:2540
+#: ../libnm-core/nm-setting-ip-config.c:2562
 #, c-format
 msgid "%d. IP address has 'label' property with invalid type"
-msgstr "%d。IP 地址有无效类型的 \"label\" 属性"
+msgstr "%d。IP 地址有无效类型的 'label' 属性"
 
-#: ../libnm-core/nm-setting-ip-config.c:2549
+#: ../libnm-core/nm-setting-ip-config.c:2571
 #, c-format
 msgid "%d. IP address has invalid label '%s'"
-msgstr "%d。IP 地址有无效标签 \"%s\""
+msgstr "%d。IP 地址有无效标签 '%s'"
 
-#: ../libnm-core/nm-setting-ip-config.c:2563
+#: ../libnm-core/nm-setting-ip-config.c:2585
 msgid "gateway cannot be set if there are no addresses configured"
-msgstr "如果没有配置地址,网关会无法设置"
+msgstr "如果没有配置地址,网关会无法设置。"
 
-#: ../libnm-core/nm-setting-ip-config.c:2572
+#: ../libnm-core/nm-setting-ip-config.c:2594
 msgid "gateway is invalid"
 msgstr "网关无效"
 
-#: ../libnm-core/nm-setting-ip-config.c:2586
+#: ../libnm-core/nm-setting-ip-config.c:2608
 #, c-format
 msgid "%d. route is invalid"
 msgstr "%d。路由无效"
 
-#: ../libnm-core/nm-setting-ip-config.c:2595
+#: ../libnm-core/nm-setting-ip-config.c:2617
 #, c-format
 msgid "%d. route cannot be a default route"
 msgstr "%d。路由不能是默认路由"
 
-#: ../libnm-core/nm-setting-ip-config.c:2606
-#, c-format
+#: ../libnm-core/nm-setting-ip-config.c:2628
+#, fuzzy, c-format
 msgid "a gateway is incompatible with '%s'"
-msgstr "网关与 \"%s\" 不兼容"
+msgstr "错误:无效的网关地址“%s”\n"
 
-#: ../libnm-core/nm-setting-ip4-config.c:141
-#: ../libnm-core/nm-setting-ip6-config.c:187
+#: ../libnm-core/nm-setting-ip4-config.c:143
+#: ../libnm-core/nm-setting-ip6-config.c:167
 #: ../libnm-util/nm-setting-ip4-config.c:879
-#: ../libnm-util/nm-setting-ip6-config.c:841
+#: ../libnm-util/nm-setting-ip6-config.c:843
 #, c-format
 msgid "this property cannot be empty for '%s=%s'"
-msgstr "\"%s=%s\" 不允许这个属性为空"
+msgstr "'%s=%s' 不允许这个属性为空"
 
-#: ../libnm-core/nm-setting-ip4-config.c:153
-#: ../libnm-core/nm-setting-ip4-config.c:163
-#: ../libnm-core/nm-setting-ip4-config.c:175
+#: ../libnm-core/nm-setting-ip4-config.c:155
+#: ../libnm-core/nm-setting-ip4-config.c:165
+#: ../libnm-core/nm-setting-ip4-config.c:177
+#: ../libnm-core/nm-setting-ip6-config.c:182
+#: ../libnm-core/nm-setting-ip6-config.c:192
 #: ../libnm-core/nm-setting-ip6-config.c:202
-#: ../libnm-core/nm-setting-ip6-config.c:212
-#: ../libnm-core/nm-setting-ip6-config.c:222
 #: ../libnm-util/nm-setting-ip4-config.c:891
 #: ../libnm-util/nm-setting-ip4-config.c:901
 #: ../libnm-util/nm-setting-ip4-config.c:913
-#: ../libnm-util/nm-setting-ip6-config.c:853
-#: ../libnm-util/nm-setting-ip6-config.c:863
-#: ../libnm-util/nm-setting-ip6-config.c:875
+#: ../libnm-util/nm-setting-ip6-config.c:855
+#: ../libnm-util/nm-setting-ip6-config.c:865
+#: ../libnm-util/nm-setting-ip6-config.c:877
 #, c-format
 msgid "this property is not allowed for '%s=%s'"
-msgstr "此属性不允许用于\"%s=%s\""
+msgstr "此属性不允许用于“%s=%s”"
 
-#: ../libnm-core/nm-setting-ip4-config.c:212
+#: ../libnm-core/nm-setting-ip4-config.c:214
 #, c-format
 msgid "'%s' is not a valid FQDN"
-msgstr "\"%s\" 不是有效的 FQDN"
+msgstr "'%s' 不是有效的 FQDN"
 
-#: ../libnm-core/nm-setting-ip4-config.c:221
+#: ../libnm-core/nm-setting-ip4-config.c:223
 msgid "property cannot be set when dhcp-hostname is also set"
 msgstr "当设置了 dhcp-hostname 则不能设置属性"
 
-#: ../libnm-core/nm-setting-ip4-config.c:233
+#: ../libnm-core/nm-setting-ip4-config.c:235
 #, c-format
 msgid "multiple addresses are not allowed for '%s=%s'"
-msgstr "\"%s=%s\" 不允许多个地址"
+msgstr ""
 
-#: ../libnm-core/nm-setting-ip4-config.c:247
+#: ../libnm-core/nm-setting-ip4-config.c:249
 msgid "property should be TRUE when method is set to disabled"
-msgstr "方法设为禁用时属性应该是 TRUE"
+msgstr ""
 
-#: ../libnm-core/nm-setting-ip6-config.c:261
+#: ../libnm-core/nm-setting-ip6-config.c:241
+#, fuzzy
 msgid "value is not a valid token"
-msgstr "值不是有效的令牌"
+msgstr "“%s” 的值不是有效的 UUID"
 
-#: ../libnm-core/nm-setting-ip6-config.c:272
+#: ../libnm-core/nm-setting-ip6-config.c:252
 msgid "only makes sense with EUI64 address generation mode"
-msgstr "只有 EUI64 地址生成模式才有意义"
-
-#: ../libnm-core/nm-setting-ip6-config.c:283
-msgid "invalid DUID"
-msgstr "无效的 DUID"
+msgstr ""
 
-#: ../libnm-core/nm-setting-ip6-config.c:295
+#: ../libnm-core/nm-setting-ip6-config.c:264
 msgid "token is not in canonical form"
-msgstr "令牌不是规范形式"
+msgstr ""
 
-#: ../libnm-core/nm-setting-ip6-config.c:307
+#: ../libnm-core/nm-setting-ip6-config.c:276
 msgid "property should be TRUE when method is set to ignore"
-msgstr "方法设为忽略时属性应该是 TRUE"
+msgstr ""
 
-#: ../libnm-core/nm-setting-ip-tunnel.c:339
+#: ../libnm-core/nm-setting-ip-tunnel.c:318
 #, c-format
 msgid "'%d' is not a valid tunnel mode"
-msgstr "\"%d\" 是无效的隧道模式"
+msgstr "'%d' 是无效的隧道模式"
+
+#: ../libnm-core/nm-setting-ip-tunnel.c:330
+#: ../libnm-core/nm-setting-macsec.c:302 ../libnm-core/nm-setting-macvlan.c:167
+#: ../libnm-core/nm-setting-vlan.c:645 ../libnm-core/nm-setting-vxlan.c:403
+#: ../libnm-util/nm-setting-vlan.c:567
+#, c-format
+msgid "'%s' is neither an UUID nor an interface name"
+msgstr "“%s”不是 UUID 或接口名称"
 
-#: ../libnm-core/nm-setting-ip-tunnel.c:362
-#: ../libnm-core/nm-setting-ip-tunnel.c:382
+#: ../libnm-core/nm-setting-ip-tunnel.c:341
+#: ../libnm-core/nm-setting-ip-tunnel.c:361
 #, c-format
 msgid "'%s' is not a valid IPv%c address"
-msgstr "\"%s\" 不是有效的 IPv%c 地址"
+msgstr "'%s' 不是有效的 IPv%c 地址"
 
-#: ../libnm-core/nm-setting-ip-tunnel.c:399
+#: ../libnm-core/nm-setting-ip-tunnel.c:375
 msgid "tunnel keys can only be specified for GRE tunnels"
 msgstr "只能为 GRE 隧道指定隧道密钥"
 
-#: ../libnm-core/nm-setting-ip-tunnel.c:412
-#: ../libnm-core/nm-setting-ip-tunnel.c:428
+#: ../libnm-core/nm-setting-ip-tunnel.c:388
+#: ../libnm-core/nm-setting-ip-tunnel.c:404
 #, c-format
 msgid "'%s' is not a valid tunnel key"
-msgstr "\"%s\" 不是有效的隧道密钥"
+msgstr "'%s' 不是有效的频道密钥"
 
-#: ../libnm-core/nm-setting-ip-tunnel.c:440
+#: ../libnm-core/nm-setting-ip-tunnel.c:416
 msgid "a fixed TTL is allowed only when path MTU discovery is enabled"
 msgstr "只有启用路径 MTU 发现时才允许固定的 TTL"
 
-#: ../libnm-core/nm-setting-ip-tunnel.c:453
-#, c-format
-msgid "some flags are invalid for the select mode: %s"
-msgstr "有些标记对所选模式无效:%s"
-
-#: ../libnm-core/nm-setting-ip-tunnel.c:467
-#, c-format
-msgid "wired setting not allowed for mode %s"
-msgstr "模式 %s 不允许有线设置"
-
-#: ../libnm-core/nm-setting-macsec.c:250
+#: ../libnm-core/nm-setting-macsec.c:235
 msgid "the key is empty"
-msgstr "密钥为空"
+msgstr ""
 
-#: ../libnm-core/nm-setting-macsec.c:261
+#: ../libnm-core/nm-setting-macsec.c:246
 #, c-format
 msgid "the key must be %d characters"
-msgstr "密钥必须是 %d 个字符"
+msgstr ""
 
-#: ../libnm-core/nm-setting-macsec.c:269
+#: ../libnm-core/nm-setting-macsec.c:254
+#, fuzzy
 msgid "the key contains non-hexadecimal characters"
-msgstr "密钥包含非十六进制字符"
+msgstr "初始向量中包含非十六进制数字。"
 
-#: ../libnm-core/nm-setting-macsec.c:331 ../libnm-core/nm-setting-macvlan.c:175
-#: ../libnm-core/nm-setting-vlan.c:657 ../libnm-util/nm-setting-vlan.c:580
+#: ../libnm-core/nm-setting-macsec.c:291 ../libnm-core/nm-setting-vlan.c:634
+#: ../libnm-util/nm-setting-vlan.c:556
+#, c-format
+msgid "'%s' value doesn't match '%s=%s'"
+msgstr "“%s”值与“%s=%s”不符"
+
+#: ../libnm-core/nm-setting-macsec.c:316 ../libnm-core/nm-setting-macvlan.c:181
+#: ../libnm-core/nm-setting-vlan.c:659 ../libnm-util/nm-setting-vlan.c:580
 #, c-format
 msgid "property is not specified and neither is '%s:%s'"
-msgstr "属性未指定,也不是 \"%s:%s\""
+msgstr "属性未指定或不是“%s:%s”"
 
-#: ../libnm-core/nm-setting-macsec.c:348
+#: ../libnm-core/nm-setting-macsec.c:333
 #, c-format
 msgid "EAP key management requires '%s' setting presence"
-msgstr "EAP 密钥管理需要 \"%s\" 设置存在"
+msgstr ""
 
-#: ../libnm-core/nm-setting-macsec.c:359
+#: ../libnm-core/nm-setting-macsec.c:344
 #, c-format
 msgid "invalid port %d"
-msgstr "无效的端口 %d"
+msgstr ""
 
-#: ../libnm-core/nm-setting-macvlan.c:186
+#: ../libnm-core/nm-setting-macvlan.c:192
 msgid "non promiscuous operation is allowed only in passthru mode"
-msgstr "只有通过(passthru)模式才允许无混杂操作"
+msgstr "只有 passthru 模式才允许 non-promiscuous 操作"
 
-#: ../libnm-core/nm-setting-olpc-mesh.c:128
+#: ../libnm-core/nm-setting-olpc-mesh.c:130
 #: ../libnm-core/nm-setting-wireless.c:760
 #: ../libnm-util/nm-setting-olpc-mesh.c:132
-#: ../libnm-util/nm-setting-wireless.c:777
+#: ../libnm-util/nm-setting-wireless.c:778
 msgid "SSID length is out of range <1-32> bytes"
-msgstr "SSID 长度超出 <1-32> 字节范围"
+msgstr "SSID 长度超出范围<1-32>字节"
 
-#: ../libnm-core/nm-setting-olpc-mesh.c:137
+#: ../libnm-core/nm-setting-olpc-mesh.c:139
 #: ../libnm-core/nm-setting-wireless.c:800
 #: ../libnm-util/nm-setting-olpc-mesh.c:141
-#: ../libnm-util/nm-setting-wireless.c:817
+#: ../libnm-util/nm-setting-wireless.c:818
 #, c-format
 msgid "'%d' is not a valid channel"
-msgstr "\"%d\" 不是有效的信道"
+msgstr "“%d”不是有效的信道"
 
-#: ../libnm-core/nm-setting-ovs-interface.c:111
+#: ../libnm-core/nm-setting-ovs-interface.c:113
 #, c-format
 msgid "'%s' is not a valid interface type"
-msgstr "\"%s\" 不是有效的接口类型"
+msgstr ""
 
-#: ../libnm-core/nm-setting-ovs-interface.c:133
+#: ../libnm-core/nm-setting-ovs-interface.c:135
 #, c-format
 msgid "A connection with a '%s' setting needs connection.type explicitly set"
-msgstr "有 \"%s\" 设置的连接需要明确设定 connection.type"
+msgstr ""
 
-#: ../libnm-core/nm-setting-ovs-interface.c:145
+#: ../libnm-core/nm-setting-ovs-interface.c:147
 #, c-format
 msgid "A connection of type '%s' cannot have ovs-interface.type \"system\""
-msgstr "\"%s\" 类型的连接不能有 ovs-interface.type \"system\""
+msgstr ""
 
-#: ../libnm-core/nm-setting-ovs-interface.c:157
+#: ../libnm-core/nm-setting-ovs-interface.c:159
 #, c-format
 msgid "A connection of type '%s' cannot have an ovs-interface.type \"%s\""
-msgstr "\"%s\" 类型的连接不能有 ovs-interface.type \"%s\""
+msgstr ""
 
-#: ../libnm-core/nm-setting-ovs-interface.c:173
+#: ../libnm-core/nm-setting-ovs-interface.c:175
 #, c-format
 msgid ""
 "A connection with '%s' setting must be of connection.type \"ovs-interface\" "
 "but is \"%s\""
 msgstr ""
-"有 \"%s\" 设置的连接必须是 connection.type \"ovs-interface\" 类型,但现在是 "
-"\"%s\""
 
-#: ../libnm-core/nm-setting-ovs-interface.c:184
+#: ../libnm-core/nm-setting-ovs-interface.c:186
 #, c-format
 msgid ""
 "A connection with '%s' setting needs to be of 'patch' interface type, not "
 "'%s'"
-msgstr "有 \"%s\" 设置的连接必须是 \"patch\" 接口类型 ,而不是 \"%s\""
+msgstr ""
 
-#: ../libnm-core/nm-setting-ovs-interface.c:199
+#: ../libnm-core/nm-setting-ovs-interface.c:201
 #, c-format
 msgid "A connection with ovs-interface.type '%s' setting a 'ovs-patch' setting"
-msgstr "ovs-interface.type \"%s\" 类型的连接缺少设置 \"ovs-patch\""
+msgstr ""
 
-#: ../libnm-core/nm-setting-ovs-interface.c:219
+#: ../libnm-core/nm-setting-ovs-interface.c:221
 #, c-format
 msgid "Missing ovs interface setting"
-msgstr "缺少 ovs 接口设置"
+msgstr ""
 
-#: ../libnm-core/nm-setting-ovs-interface.c:225
+#: ../libnm-core/nm-setting-ovs-interface.c:227
 #, c-format
 msgid "Missing ovs interface type"
-msgstr "缺少 ovs 接口类型"
+msgstr ""
 
-#: ../libnm-core/nm-setting-ovs-interface.c:268
-#: ../libnm-core/nm-setting-ovs-port.c:196
+#: ../libnm-core/nm-setting-ovs-interface.c:271
+#: ../libnm-core/nm-setting-ovs-port.c:198
 #, c-format
 msgid "A connection with a '%s' setting must have a master."
-msgstr "有 \"%s\" 设置的连接必须有个主连接。"
+msgstr ""
 
-#: ../libnm-core/nm-setting-ovs-patch.c:104
-#: ../libnm-core/nm-setting-vxlan.c:373
+#: ../libnm-core/nm-setting-ovs-patch.c:110
+#: ../libnm-core/nm-setting-vxlan.c:375
 #, c-format
 msgid "'%s' is not a valid IP address"
-msgstr "\"%s\" 不是有效的 IP 地址"
+msgstr "'%s' 不是有效的 IP 地址"
 
-#: ../libnm-core/nm-setting-ovs-port.c:221
+#: ../libnm-core/nm-setting-ovs-port.c:223
 #, c-format
 msgid "'%s' is not allowed in vlan_mode"
-msgstr "\"%s\" 在 vlan_mode 里不允许"
+msgstr ""
 
-#: ../libnm-core/nm-setting-ovs-port.c:231
+#: ../libnm-core/nm-setting-ovs-port.c:233
 #, c-format
 msgid "the tag id must be in range 0-4094 but is %u"
-msgstr "标记 ID 必须在 0~4094 范围内,但其是 %u"
+msgstr ""
 
-#: ../libnm-core/nm-setting-ovs-port.c:241
+#: ../libnm-core/nm-setting-ovs-port.c:243
 #, c-format
 msgid "'%s' is not allowed in lacp"
-msgstr "\"%s\" 在 lacp 里不允许"
+msgstr ""
 
-#: ../libnm-core/nm-setting-ovs-port.c:251
+#: ../libnm-core/nm-setting-ovs-port.c:253
 #, c-format
 msgid "'%s' is not allowed in bond_mode"
-msgstr "\"%s\" 在 bond_mode 里不允许"
+msgstr ""
 
-#: ../libnm-core/nm-setting-ovs-bridge.c:159
+#: ../libnm-core/nm-setting-ovs-bridge.c:161
 #, c-format
 msgid "A connection with a '%s' setting must not have a master."
-msgstr "有 \"%s\" 设置的连接不能有主连接。"
+msgstr ""
 
-#: ../libnm-core/nm-setting-ovs-bridge.c:170
+#: ../libnm-core/nm-setting-ovs-bridge.c:172
 #, c-format
 msgid "'%s' is not allowed in fail_mode"
-msgstr "\"%s\" 在 fail_mode 里不允许"
+msgstr ""
 
-#: ../libnm-core/nm-setting-ppp.c:363 ../libnm-util/nm-setting-ppp.c:386
+#: ../libnm-core/nm-setting-ppp.c:365 ../libnm-util/nm-setting-ppp.c:387
 #, c-format
 msgid "'%d' is out of valid range <128-16384>"
-msgstr "\"%d\" 超出范围 <128-16384>"
+msgstr "“%d”超出范围<128-16384>"
 
-#: ../libnm-core/nm-setting-ppp.c:376 ../libnm-util/nm-setting-ppp.c:399
+#: ../libnm-core/nm-setting-ppp.c:378 ../libnm-util/nm-setting-ppp.c:400
 #, c-format
 msgid "setting this property requires non-zero '%s' property"
-msgstr "设置此属性要求 \"%s\" 属性不为零"
+msgstr "设置此属性要求“%s”属性不为零"
 
-#: ../libnm-core/nm-setting-proxy.c:161
+#: ../libnm-core/nm-setting-proxy.c:163
 #, c-format
 msgid "invalid proxy method"
-msgstr "无效的代理方法"
+msgstr ""
 
-#: ../libnm-core/nm-setting-proxy.c:171 ../libnm-core/nm-setting-proxy.c:180
+#: ../libnm-core/nm-setting-proxy.c:173 ../libnm-core/nm-setting-proxy.c:182
 #, c-format
 msgid "this property is not allowed for method none"
-msgstr "无方法时不允许此属性"
+msgstr ""
 
-#: ../libnm-core/nm-setting-proxy.c:191
+#: ../libnm-core/nm-setting-proxy.c:193
 #, c-format
 msgid "the script is too large"
-msgstr "脚本太大"
+msgstr ""
 
-#: ../libnm-core/nm-setting-proxy.c:199
+#: ../libnm-core/nm-setting-proxy.c:201
 #, c-format
 msgid "the script is not valid utf8"
-msgstr "脚本不是有效的 utf8"
+msgstr ""
 
-#: ../libnm-core/nm-setting-proxy.c:207
+#: ../libnm-core/nm-setting-proxy.c:209
 #, c-format
 msgid "the script lacks FindProxyForURL function"
-msgstr "脚本缺少 FindProxyForURL 功能"
-
-#: ../libnm-core/nm-setting-sriov.c:1086
-#, c-format
-msgid "VF with index %u, but the total number of VFs is %u"
-msgstr "有索引为 %u 的虚拟功能,但虚拟功能总数为 %u"
-
-#: ../libnm-core/nm-setting-sriov.c:1097
-#, c-format
-msgid "invalid VF %u: %s"
-msgstr "无效的虚拟功能 %u:%s"
-
-#: ../libnm-core/nm-setting-sriov.c:1109
-#, c-format
-msgid "duplicate VF index %u"
-msgstr "重复的虚拟功能索引 %u"
-
-#: ../libnm-core/nm-setting-sriov.c:1130
-#, c-format
-msgid "VFs %d and %d are not sorted by ascending index"
-msgstr "虚拟功能 %d 和 %d 未按升序排列"
+msgstr ""
 
 #: ../libnm-core/nm-setting-tc-config.c:68
-#: ../libnm-core/nm-setting-tc-config.c:296
-#: ../libnm-core/nm-setting-tc-config.c:550
-#, c-format
+#: ../libnm-core/nm-setting-tc-config.c:283
+#: ../libnm-core/nm-setting-tc-config.c:547
+#, fuzzy, c-format
 msgid "'%s' is not a valid kind"
-msgstr "\"%s\" 不是有效的种类"
+msgstr "“%s”不是有效波段"
 
 #: ../libnm-core/nm-setting-tc-config.c:76
-#: ../libnm-core/nm-setting-tc-config.c:558
+#: ../libnm-core/nm-setting-tc-config.c:555
+#, fuzzy
 msgid "parent handle missing"
-msgstr "缺少上级处理模块"
-
-#: ../libnm-core/nm-setting-tc-config.c:1203
-msgid "there are duplicate TC qdiscs"
-msgstr "存在重复的 TC 排队规则"
-
-#: ../libnm-core/nm-setting-tc-config.c:1223
-msgid "there are duplicate TC filters"
-msgstr "存在重复的 TC 过滤器"
+msgstr "数据缺失"
 
 #: ../libnm-core/nm-setting-team.c:134 ../libnm-core/nm-setting-team.c:193
 #: ../libnm-core/nm-setting-team.c:266
-#, c-format
+#, fuzzy, c-format
 msgid "%s is out of range [0, %d]"
-msgstr "%s 超出了范围 [0, %d]"
+msgstr "值“%d”超出了范围 <%d-%d>"
 
 #: ../libnm-core/nm-setting-team.c:175
 #, c-format
 msgid "Missing target-host in nsna_ping link watcher"
-msgstr "在 nsna_ping 链路监视器里缺少目标主机"
+msgstr ""
 
 #: ../libnm-core/nm-setting-team.c:181 ../libnm-core/nm-setting-team.c:248
-#, c-format
+#, fuzzy, c-format
 msgid "target-host '%s' contains invalid characters"
-msgstr "目标主机 \"%s\" 包含无效的字符"
+msgstr "初始向量中包含非十六进制数字。"
 
 #: ../libnm-core/nm-setting-team.c:241
 #, c-format
 msgid "Missing %s in arp_ping link watcher"
-msgstr "在 arp_ping 链路监视器里缺少 %s"
+msgstr ""
 
 #: ../libnm-core/nm-setting-team.c:254
-#, c-format
+#, fuzzy, c-format
 msgid "source-host '%s' contains invalid characters"
-msgstr "来源主机 \"%s\" 包含无效的字符"
+msgstr "初始向量中包含非十六进制数字。"
 
 #: ../libnm-core/nm-setting-team.c:1153
-#: ../libnm-core/nm-setting-team-port.c:380
+#: ../libnm-core/nm-setting-team-port.c:381
 #, c-format
 msgid "team config exceeds size limit"
-msgstr "组合(team)配置超过大小限制"
+msgstr ""
 
-#: ../libnm-core/nm-setting-team.c:1179
-#, c-format
+#: ../libnm-core/nm-setting-team.c:1178
+#, fuzzy, c-format
 msgid "invalid runner \"%s\""
-msgstr "无效的运行程序(runner)\"%s\""
+msgstr "无效的路由:%s"
 
-#: ../libnm-core/nm-setting-team.c:1192
-#, c-format
+#: ../libnm-core/nm-setting-team.c:1191
+#, fuzzy, c-format
 msgid "missing link watcher name"
-msgstr "缺少链路监视器名称"
+msgstr "缺少文件名"
 
-#: ../libnm-core/nm-setting-team.c:1202
-#, c-format
+#: ../libnm-core/nm-setting-team.c:1201
+#, fuzzy, c-format
 msgid "unknown link watcher \"%s\""
-msgstr "未知的链路监视器 \"%s\""
+msgstr "未知的 VPN 插件“%s”"
 
-#: ../libnm-core/nm-setting-team.c:1213
-#, c-format
+#: ../libnm-core/nm-setting-team.c:1212
+#, fuzzy, c-format
 msgid "missing target host"
-msgstr "缺少目标主机"
+msgstr "缺少设置"
 
-#: ../libnm-core/nm-setting-team.c:1221
-#, c-format
+#: ../libnm-core/nm-setting-team.c:1220
+#, fuzzy, c-format
 msgid "missing source address"
-msgstr "缺少来源地址"
+msgstr "缺失 IPv4 地址"
 
-#: ../libnm-core/nm-setting-tun.c:185
+#: ../libnm-core/nm-setting-tun.c:187
 #, c-format
 msgid "'%u': invalid mode"
-msgstr "\"%u\":无效模式"
+msgstr "'%u':无效模式"
 
-#: ../libnm-core/nm-setting-tun.c:195
+#: ../libnm-core/nm-setting-tun.c:197
 #, c-format
 msgid "'%s': invalid user ID"
-msgstr "\"%s\":无效的用户 ID"
+msgstr "'%s':无效的用户 ID"
 
-#: ../libnm-core/nm-setting-tun.c:206
+#: ../libnm-core/nm-setting-tun.c:208
 #, c-format
 msgid "'%s': invalid group ID"
-msgstr "\"%s\":无效的组 ID"
+msgstr "'%s':无效的组 ID"
 
-#: ../libnm-core/nm-setting-user.c:109
+#: ../libnm-core/nm-setting-user.c:111
+#, fuzzy
 msgid "missing key"
-msgstr "缺少密钥"
+msgstr "缺少设置"
 
-#: ../libnm-core/nm-setting-user.c:115
+#: ../libnm-core/nm-setting-user.c:117
+#, fuzzy
 msgid "key is too long"
-msgstr "密钥太长"
+msgstr "错误:SSID 太长。"
 
-#: ../libnm-core/nm-setting-user.c:120
+#: ../libnm-core/nm-setting-user.c:122
+#, fuzzy
 msgid "key must be UTF8"
 msgstr "密码必须是 UTF-8 格式"
 
-#: ../libnm-core/nm-setting-user.c:143
+#: ../libnm-core/nm-setting-user.c:145
 msgid "key requires a '.' for a namespace"
-msgstr "密钥需要 \".\" 用于命名空间"
+msgstr ""
 
-#: ../libnm-core/nm-setting-user.c:156
+#: ../libnm-core/nm-setting-user.c:158
 msgid "key cannot contain \"..\""
-msgstr "密钥不能包含 \"..\""
+msgstr ""
 
-#: ../libnm-core/nm-setting-user.c:161
+#: ../libnm-core/nm-setting-user.c:163
+#, fuzzy
 msgid "key contains invalid characters"
-msgstr "密钥包含无效的字符"
+msgstr "初始向量中包含非十六进制数字。"
 
-#: ../libnm-core/nm-setting-user.c:186
+#: ../libnm-core/nm-setting-user.c:188
+#, fuzzy
 msgid "value is missing"
-msgstr "缺少值"
+msgstr "缺少属性"
 
-#: ../libnm-core/nm-setting-user.c:193
+#: ../libnm-core/nm-setting-user.c:195
+#, fuzzy
 msgid "value is too large"
-msgstr "值太大"
+msgstr "“%d”值超出范围 <0-3>"
 
-#: ../libnm-core/nm-setting-user.c:199
+#: ../libnm-core/nm-setting-user.c:201
+#, fuzzy
 msgid "value is not valid UTF8"
-msgstr "值不是有效的 UTF-8"
+msgstr "“%s” 的值不是有效的 UUID"
 
-#: ../libnm-core/nm-setting-user.c:329
+#: ../libnm-core/nm-setting-user.c:338
 msgid "maximum number of user data entries reached"
-msgstr "已达到最大的用户数据输入项"
+msgstr ""
 
-#: ../libnm-core/nm-setting-user.c:370
+#: ../libnm-core/nm-setting-user.c:379
 #, c-format
 msgid "invalid key \"%s\": %s"
-msgstr "无效的密钥 \"%s\":%s"
+msgstr ""
 
-#: ../libnm-core/nm-setting-user.c:374
+#: ../libnm-core/nm-setting-user.c:383
 #, c-format
 msgid "invalid value for \"%s\": %s"
-msgstr "对 \"%s\" 无效的值:%s"
+msgstr ""
 
-#: ../libnm-core/nm-setting-user.c:389
+#: ../libnm-core/nm-setting-user.c:398
 #, c-format
 msgid "maximum number of user data entries reached (%u instead of %u)"
-msgstr "已达到最大的用户数据输入项(现为 %u,最大只有 %u )"
+msgstr ""
 
-#: ../libnm-core/nm-setting-vlan.c:668 ../libnm-util/nm-setting-vlan.c:600
+#: ../libnm-core/nm-setting-vlan.c:670 ../libnm-util/nm-setting-vlan.c:600
 #, c-format
 msgid "the vlan id must be in range 0-4094 but is %u"
-msgstr "vlan id 的必须在范围 0~4094 内,但却是 %u"
+msgstr "VLAN ID 的范围必须是 0-4094,但却是 %u"
 
-#: ../libnm-core/nm-setting-vlan.c:678 ../libnm-util/nm-setting-vlan.c:591
+#: ../libnm-core/nm-setting-vlan.c:680 ../libnm-util/nm-setting-vlan.c:591
 msgid "flags are invalid"
-msgstr "标记无效"
+msgstr "标志无效"
 
-#: ../libnm-core/nm-setting-vlan.c:690
+#: ../libnm-core/nm-setting-vlan.c:692
 msgid "vlan setting should have a ethernet setting as well"
-msgstr "vlan 设置也应该有以太网设置"
-
-#: ../libnm-core/nm-setting-vpn.c:518
-msgid "cannot set connection.multi-connect for VPN setting"
-msgstr "无法为 VPN 设置设定 connection.multi-connect"
+msgstr ""
 
-#: ../libnm-core/nm-setting-vpn.c:539
+#: ../libnm-core/nm-setting-vpn.c:559
 #, c-format
 msgid "secret was empty"
-msgstr "密钥为空"
+msgstr "秘密(secret)为空"
 
-#: ../libnm-core/nm-setting-vpn.c:569
+#: ../libnm-core/nm-setting-vpn.c:589
 msgid "setting contained a secret with an empty name"
-msgstr "设置包含具有空名称的密钥"
+msgstr "设置包含具有空名称的秘密"
 
-#: ../libnm-core/nm-setting-vpn.c:577
+#: ../libnm-core/nm-setting-vpn.c:597
 #, c-format
 msgid "secret value was empty"
-msgstr "密钥值为空"
+msgstr "秘密(secret)值为空"
 
-#: ../libnm-core/nm-setting-vpn.c:624 ../libnm-core/nm-setting.c:1891
+#: ../libnm-core/nm-setting-vpn.c:644 ../libnm-core/nm-setting.c:1788
 msgid "not a secret property"
-msgstr "不是密钥(secret)属性"
+msgstr "不是 secret 属性"
 
-#: ../libnm-core/nm-setting-vpn.c:630
+#: ../libnm-core/nm-setting-vpn.c:650
 msgid "secret is not of correct type"
-msgstr "密钥(secret)不是正确的类型"
+msgstr "Secret 不是正确的类型"
 
-#: ../libnm-core/nm-setting-vpn.c:661
+#: ../libnm-core/nm-setting-vpn.c:681
 #, c-format
 msgid "failed to convert value '%s' to uint"
-msgstr "转换 \"%s\" 值为 uint 失败"
+msgstr "转换 '%s' 值为 uint 失败"
 
-#: ../libnm-core/nm-setting-vxlan.c:386
+#: ../libnm-core/nm-setting-vxlan.c:388
 #, c-format
 msgid "'%s' is not a valid IP%c address"
-msgstr "\"%s\" 不是有效的 IP%c 地址"
+msgstr "'%s' 不是有效的 IP%c 地址"
 
-#: ../libnm-core/nm-setting-vxlan.c:413
+#: ../libnm-core/nm-setting-vxlan.c:415
 #, c-format
 msgid "%d is greater than local port max %d"
 msgstr "%d 大于本地端口最大值 %d"
 
-#: ../libnm-core/nm-setting-wired.c:630 ../libnm-util/nm-setting-wired.c:612
+#: ../libnm-core/nm-setting-wired.c:632 ../libnm-util/nm-setting-wired.c:613
 #, c-format
 msgid "'%s' is not a valid Ethernet port value"
-msgstr "\"%s\" 不是有效的以太网端口值"
+msgstr "'%s' 不是有效的以太网端口值"
 
-#: ../libnm-core/nm-setting-wired.c:640 ../libnm-util/nm-setting-wired.c:622
+#: ../libnm-core/nm-setting-wired.c:642 ../libnm-util/nm-setting-wired.c:623
 #, c-format
 msgid "'%s' is not a valid duplex value"
-msgstr "\"%s\"不是有效的双工值"
+msgstr "“%s”不是有效的双工值"
 
-#: ../libnm-core/nm-setting-wired.c:699 ../libnm-util/nm-setting-wired.c:679
+#: ../libnm-core/nm-setting-wired.c:701 ../libnm-util/nm-setting-wired.c:680
 #, c-format
 msgid "invalid '%s' or its value '%s'"
-msgstr "\"%s\" 或其值 \"%s\" 无效"
+msgstr "“%s”或其值“%s”无效"
 
-#: ../libnm-core/nm-setting-wired.c:736
+#: ../libnm-core/nm-setting-wired.c:738
 msgid "Wake-on-LAN mode 'default' and 'ignore' are exclusive flags"
-msgstr "LAN 唤醒模式 \"default\" 和 \"ignore\" 是相互排斥的标记"
+msgstr "Wake-on-LAN 模式 'default' 和 'ignore' 是相互排斥的标记"
 
-#: ../libnm-core/nm-setting-wired.c:745
+#: ../libnm-core/nm-setting-wired.c:747
 msgid "Wake-on-LAN password can only be used with magic packet mode"
-msgstr "LAN 唤醒密码只能在幻数据包模式使用"
+msgstr "Wake-on-LAN 密码只能用于 magic packet 模式"
 
 #: ../libnm-core/nm-setting-wired.c:770
-msgid "both speed and duplex should have a valid value or both should be unset"
-msgstr "速度和双工都应设定有效值或者都保持未设定"
+msgid "when link autonegotiation is enabled no duplex value is accepted"
+msgstr ""
+
+#: ../libnm-core/nm-setting-wired.c:778
+msgid "when link autonegotiation is enabled speed should be 0"
+msgstr ""
 
-#: ../libnm-core/nm-setting-wired.c:771
+#: ../libnm-core/nm-setting-wired.c:788
 msgid "both speed and duplex are required for static link configuration"
-msgstr "静态链路配置需要设置速度和双工"
+msgstr ""
 
-#: ../libnm-core/nm-setting-wireless-security.c:939
-#: ../libnm-util/nm-setting-wireless-security.c:911
+#: ../libnm-core/nm-setting-wireless-security.c:921
+#: ../libnm-util/nm-setting-wireless-security.c:912
 #, c-format
 msgid "'%s' security requires '%s=%s'"
-msgstr "\"%s\" 安全需要 \"%s=%s\""
+msgstr "“%s”安全要求“%s=%s”"
 
-#: ../libnm-core/nm-setting-wireless-security.c:960
-#: ../libnm-util/nm-setting-wireless-security.c:932
+#: ../libnm-core/nm-setting-wireless-security.c:942
+#: ../libnm-util/nm-setting-wireless-security.c:933
 #, c-format
 msgid "'%s' security requires '%s' setting presence"
-msgstr "\"%s\" 安全需要 \"%s\" 设置存在"
+msgstr "“%s”安全要求“%s”设置存在"
 
-#: ../libnm-core/nm-setting-wireless-security.c:981
-#: ../libnm-util/nm-setting-wireless-security.c:953
+#: ../libnm-core/nm-setting-wireless-security.c:963
+#: ../libnm-util/nm-setting-wireless-security.c:954
 #, c-format
 msgid "'%d' value is out of range <0-3>"
-msgstr "\"%d\" 值超出范围 <0-3>"
+msgstr "“%d”值超出范围 <0-3>"
 
-#: ../libnm-core/nm-setting-wireless-security.c:1036
-#: ../libnm-util/nm-setting-wireless-security.c:1008
+#: ../libnm-core/nm-setting-wireless-security.c:1018
+#: ../libnm-util/nm-setting-wireless-security.c:1009
 #, c-format
 msgid "'%s' connections require '%s' in this property"
-msgstr "\"%s\" 连接需要此属性中的 \"%s\""
+msgstr "“%s”连接要求此属性中的“%s”"
 
-#: ../libnm-core/nm-setting-wireless-security.c:1066
-#: ../libnm-util/nm-setting-wireless-security.c:1038
+#: ../libnm-core/nm-setting-wireless-security.c:1048
+#: ../libnm-util/nm-setting-wireless-security.c:1039
 #, c-format
 msgid "'%s' can only be used with '%s=%s' (WEP)"
-msgstr "\"%s\" 只能与 \"%s=%s\"(WEP)共用"
+msgstr "“%s”只能与“%s=%s”(WEP)共用"
 
-#: ../libnm-core/nm-setting-wireless-security.c:1090
+#: ../libnm-core/nm-setting-wireless-security.c:1072
 #, c-format
 msgid "'%s' can only be used with '%s=%s' or '%s=%s'"
-msgstr "\"%s\" 只能与 \"%s=%s\" 或 \"%s=%s\"共用"
+msgstr ""
 
-#: ../libnm-core/nm-setting-wireless-security.c:1112
+#: ../libnm-core/nm-setting-wireless-security.c:1094
 msgid "can't be simultaneously disabled and enabled"
-msgstr "不能同时启用和禁用"
+msgstr ""
 
 #: ../libnm-core/nm-setting-wireless.c:769
-#: ../libnm-util/nm-setting-wireless.c:786
+#: ../libnm-util/nm-setting-wireless.c:787
 #, c-format
 msgid "'%s' is not a valid Wi-Fi mode"
-msgstr "\"%s\" 不是有效的 Wi-Fi 模式"
+msgstr "“%s”不是有效的 Wi-Fi 模式"
 
 #: ../libnm-core/nm-setting-wireless.c:779
-#: ../libnm-util/nm-setting-wireless.c:796
+#: ../libnm-util/nm-setting-wireless.c:797
 #, c-format
 msgid "'%s' is not a valid band"
-msgstr "\"%s\" 不是有效频段"
+msgstr "“%s”不是有效波段"
 
 #: ../libnm-core/nm-setting-wireless.c:789
 #, c-format
 msgid "'%s' requires setting '%s' property"
-msgstr "\"%s\" 需要设置 \"%s\" 属性"
+msgstr "'%s' 需要设置 '%s' 属性"
 
 #: ../libnm-core/nm-setting-wireless.c:883
 #, c-format
 msgid "invalid value"
-msgstr "无效值"
-
-#: ../libnm-core/nm-setting-wireless.c:893
-msgid "Wake-on-WLAN mode 'default' and 'ignore' are exclusive flags"
-msgstr "WLAN 唤醒模式 \"default\" 和 \"ignore\" 是相互排斥的标记"
-
-#: ../libnm-core/nm-setting-wireless.c:902
-msgid "Wake-on-WLAN trying to set unknown flag"
-msgstr "WLAN 唤醒正在尝试设定未知的标记"
+msgstr ""
 
-#: ../libnm-core/nm-setting-wireless.c:924
+#: ../libnm-core/nm-setting-wireless.c:904
 #, c-format
 msgid "conflicting value of mac-address-randomization and cloned-mac-address"
-msgstr "mac-address-randomization 和 cloned-mac-address 的值冲突"
+msgstr ""
 
-#: ../libnm-core/nm-setting.c:771
+#: ../libnm-core/nm-setting.c:821
 #, c-format
 msgid "duplicate property"
 msgstr "重复的属性"
 
-#: ../libnm-core/nm-setting.c:819 ../libnm-core/nm-setting.c:866
+#: ../libnm-core/nm-setting.c:849 ../libnm-core/nm-setting.c:896
 #, c-format
 msgid "can't set property of type '%s' from value of type '%s'"
-msgstr "无法从类型为 \"%2$s\" 的值设置类型为 \"%1$s\" 的属性"
+msgstr "无法从类型为 '%s' 的值设置类型为 '%s' 的属性"
 
-#: ../libnm-core/nm-setting.c:838 ../libnm-core/nm-setting.c:852
+#: ../libnm-core/nm-setting.c:868 ../libnm-core/nm-setting.c:882
 #, c-format
 msgid "failed to set property: %s"
 msgstr "设定属性失败:%s"
 
-#: ../libnm-core/nm-setting.c:880
+#: ../libnm-core/nm-setting.c:910
 #, c-format
 msgid "can not set property: %s"
 msgstr "无法设定属性:%s"
 
-#: ../libnm-core/nm-setting.c:896
+#: ../libnm-core/nm-setting.c:926
 #, c-format
 msgid "unknown property"
 msgstr "未知属性"
 
-#: ../libnm-core/nm-setting.c:1789
+#: ../libnm-core/nm-setting.c:1686
 msgid "secret not found"
-msgstr "未找到密钥"
+msgstr "未找到 secret"
 
-#: ../libnm-core/nm-setting.c:1881
+#: ../libnm-core/nm-setting.c:1778
 msgid "secret is not set"
-msgstr "未设置密钥"
+msgstr "未设置 secret"
 
-#: ../libnm-core/nm-utils.c:2095
-#, c-format
+#: ../libnm-core/nm-utils.c:2123
+#, fuzzy, c-format
 msgid "'%s' is not a valid handle."
-msgstr "\"%s\" 不是有效的处理模块。"
+msgstr "“%s”不是有效波段"
 
-#: ../libnm-core/nm-utils.c:2191
+#: ../libnm-core/nm-utils.c:2220
 #, c-format
 msgid "'%s' unexpected: parent already specified."
-msgstr "意外的 \"%s\":已指定上级。"
+msgstr ""
 
-#: ../libnm-core/nm-utils.c:2207
-#, c-format
+#: ../libnm-core/nm-utils.c:2236
+#, fuzzy, c-format
 msgid "invalid handle: '%s'"
-msgstr "无效的句柄:\"%s\""
+msgstr "无效选项“%s”"
 
-#: ../libnm-core/nm-utils.c:2229
+#: ../libnm-core/nm-utils.c:2258
+#, fuzzy
 msgid "parent not specified."
-msgstr "未指定上级。"
+msgstr "未指定服务"
 
-#: ../libnm-core/nm-utils.c:2276
+#: ../libnm-core/nm-utils.c:2305
 #, c-format
 msgid "unsupported qdisc option: '%s'."
-msgstr "不支持的排队规则(qdisc)选项:\"%s\"。"
+msgstr ""
 
-#: ../libnm-core/nm-utils.c:2392
+#: ../libnm-core/nm-utils.c:2421
+#, fuzzy
 msgid "action name missing."
-msgstr "操作名缺失。"
+msgstr "数据缺失"
 
-#: ../libnm-core/nm-utils.c:2416
+#: ../libnm-core/nm-utils.c:2445
 #, c-format
 msgid "unsupported action option: '%s'."
-msgstr "不支持的操作选项:\"%s\"。"
+msgstr ""
 
-#: ../libnm-core/nm-utils.c:2554
+#: ../libnm-core/nm-utils.c:2583
+#, fuzzy
 msgid "invalid action: "
-msgstr "无效操作:"
+msgstr "无效选项“%s”"
 
-#: ../libnm-core/nm-utils.c:2558
+#: ../libnm-core/nm-utils.c:2587
 #, c-format
 msgid "unsupported tfilter option: '%s'."
-msgstr "不支持的流量过滤器(tfilter)选项:\"%s\"。"
+msgstr ""
 
-#: ../libnm-core/nm-utils.c:3160
+#: ../libnm-core/nm-utils.c:2946
 #, c-format
 msgid "failed stat file %s: %s"
 msgstr "统计文件 %s 失败:%s"
 
-#: ../libnm-core/nm-utils.c:3169
+#: ../libnm-core/nm-utils.c:2955
 #, c-format
 msgid "not a file (%s)"
-msgstr "不是一个文件(%s)"
+msgstr "不是一个文件 (%s)"
 
-#: ../libnm-core/nm-utils.c:3180
-#, c-format
+#: ../libnm-core/nm-utils.c:2966
+#, fuzzy, c-format
 msgid "invalid file owner %d for %s"
-msgstr "对 %2$s 无效的文件所有者 %1$d"
+msgstr "file:无效文件(file)操作:%s"
 
-#: ../libnm-core/nm-utils.c:3191
+#: ../libnm-core/nm-utils.c:2977
 #, c-format
 msgid "file permissions for %s"
 msgstr "%s 的文件权限"
 
-#: ../libnm-core/nm-utils.c:3201
+#: ../libnm-core/nm-utils.c:2987
 #, c-format
 msgid "reject %s"
 msgstr "拒绝 %s"
 
-#: ../libnm-core/nm-utils.c:3220
+#: ../libnm-core/nm-utils.c:3007
 #, c-format
 msgid "path is not absolute (%s)"
-msgstr "路径不是绝对路径(%s)"
+msgstr "路径不是绝对路径 (%s)"
 
-#: ../libnm-core/nm-utils.c:3234
+#: ../libnm-core/nm-utils.c:3021
 #, c-format
 msgid "Plugin file does not exist (%s)"
-msgstr "插件文件不存在(%s)"
+msgstr "插件文件不存在 (%s)"
 
-#: ../libnm-core/nm-utils.c:3242
+#: ../libnm-core/nm-utils.c:3029
 #, c-format
 msgid "Plugin is not a valid file (%s)"
-msgstr "插件不是有效的文件(%s)"
+msgstr "插件不是有效的文件 (%s)"
 
-#: ../libnm-core/nm-utils.c:3252
+#: ../libnm-core/nm-utils.c:3039
 #, c-format
 msgid "libtool archives are not supported (%s)"
-msgstr "不支持 libtool 归档(%s)"
+msgstr "不支持 libtool 归档 (%s)"
 
-#: ../libnm-core/nm-utils.c:3334 ../libnm-util/nm-utils.c:1794
+#: ../libnm-core/nm-utils.c:3121 ../libnm-util/nm-utils.c:1798
 #, c-format
 msgid "Could not find \"%s\" binary"
 msgstr "无法找到 \"%s\" 二进制文件"
 
-#: ../libnm-core/nm-utils.c:4351
+#: ../libnm-core/nm-utils.c:4167
 #, c-format
 msgid "not a valid ethernet MAC address for mask at position %lld"
-msgstr "对于 %lld 位置的掩码,该以太网 MAC 地址无效"
+msgstr ""
 
-#: ../libnm-core/nm-utils.c:4366
+#: ../libnm-core/nm-utils.c:4182
 #, c-format
 msgid "not a valid ethernet MAC address #%u at position %lld"
-msgstr "在位置 %2$lld,该以太网 MAC 地址 #%1$u 无效"
+msgstr ""
 
-#: ../libnm-core/nm-utils.c:4402
+#: ../libnm-core/nm-utils.c:4218
 msgid "interface name is too short"
-msgstr "接口名太短"
+msgstr ""
 
-#: ../libnm-core/nm-utils.c:4411
+#: ../libnm-core/nm-utils.c:4227
 msgid "interface name is reserved"
-msgstr "接口名被保留"
+msgstr ""
 
-#: ../libnm-core/nm-utils.c:4423
+#: ../libnm-core/nm-utils.c:4239
 msgid "interface name contains an invalid character"
-msgstr "接口名包含无效字符"
+msgstr ""
 
-#: ../libnm-core/nm-utils.c:4429
+#: ../libnm-core/nm-utils.c:4245
 msgid "interface name is longer than 15 characters"
-msgstr "接口名长度超过 15 字符"
-
-#: ../libnm-core/nm-utils.c:5075
-msgid "not valid utf-8"
-msgstr "不是有效的 utf-8"
-
-#: ../libnm-core/nm-utils.c:5097 ../libnm-core/nm-utils.c:5565
-msgid "is not a JSON object"
-msgstr "不是 JSON 对象"
+msgstr ""
 
-#: ../libnm-core/nm-utils.c:5541 ../libnm-core/nm-utils.c:5881
+#: ../libnm-core/nm-utils.c:5283 ../libnm-core/nm-utils.c:5626
 msgid "value is NULL"
-msgstr "值为 NULL"
+msgstr ""
 
-#: ../libnm-core/nm-utils.c:5541 ../libnm-core/nm-utils.c:5881
+#: ../libnm-core/nm-utils.c:5283 ../libnm-core/nm-utils.c:5626
 msgid "value is empty"
-msgstr "值为空"
+msgstr ""
 
-#: ../libnm-core/nm-utils.c:5553
+#: ../libnm-core/nm-utils.c:5292
 #, c-format
 msgid "invalid JSON at position %d (%s)"
-msgstr "位置 %d 有无效的 JSON(%s)"
+msgstr ""
+
+#: ../libnm-core/nm-utils.c:5304 ../libnm-core/nm-utils.c:5645
+msgid "is not a JSON object"
+msgstr ""
 
-#: ../libnm-core/nm-utils.c:6198 ../libnm-core/nm-utils.c:6218
+#: ../libnm-core/nm-utils.c:5615
+msgid "not valid utf-8"
+msgstr ""
+
+#: ../libnm-core/nm-utils.c:5958 ../libnm-core/nm-utils.c:5978
 msgid "unterminated escape sequence"
-msgstr "未结束的转义序列"
+msgstr ""
 
-#: ../libnm-core/nm-utils.c:6243
-#, c-format
+#: ../libnm-core/nm-utils.c:6003
+#, fuzzy, c-format
 msgid "unknown attribute '%s'"
-msgstr "未知属性 \"%s\""
+msgstr "未知设备“%s”"
 
-#: ../libnm-core/nm-utils.c:6258
+#: ../libnm-core/nm-utils.c:6018
 #, c-format
 msgid "missing key-value separator '%c' after '%s'"
-msgstr "在 \"%2$s\" 后缺少键值对分隔符 \"%1$c\""
+msgstr ""
 
-#: ../libnm-core/nm-utils.c:6274
-#, c-format
+#: ../libnm-core/nm-utils.c:6034
+#, fuzzy, c-format
 msgid "invalid uint32 value '%s' for attribute '%s'"
-msgstr "uint32 值 \"%1$s\" 对属性 \"%2$s\" 无效"
+msgstr "无效选项“%s”或值“%s”"
 
-#: ../libnm-core/nm-utils.c:6283
-#, c-format
+#: ../libnm-core/nm-utils.c:6043
+#, fuzzy, c-format
 msgid "invalid uint8 value '%s' for attribute '%s'"
-msgstr "uint8 值 \"%1$s\" 对属性 \"%2$s\" 无效"
+msgstr "无效选项“%s”或值“%s”"
 
-#: ../libnm-core/nm-utils.c:6293
-#, c-format
+#: ../libnm-core/nm-utils.c:6053
+#, fuzzy, c-format
 msgid "invalid boolean value '%s' for attribute '%s'"
-msgstr "布尔值 \"%1$s\" 对属性 \"%2$s\" 无效"
+msgstr "无效选项“%s”或值“%s”"
 
-#: ../libnm-core/nm-utils.c:6303
+#: ../libnm-core/nm-utils.c:6063
 #, c-format
 msgid "unsupported attribute '%s' of type '%s'"
-msgstr "不支持类型 \"%2$s\" 的属性 \"%1$s\""
+msgstr ""
 
 #: ../libnm-core/nm-vpn-editor-plugin.c:296
-#, c-format
+#, fuzzy, c-format
 msgid "cannot load plugin \"%s\": %s"
-msgstr "无法加载插件 \"%s\":%s"
+msgstr "无法加载插件 %s"
 
 #: ../libnm-core/nm-vpn-editor-plugin.c:307
 #, c-format
 msgid "failed to load nm_vpn_editor_plugin_factory() from %s (%s)"
-msgstr "从 %s 加载 nm_vpn_editor_plugin_factory() 失败(%s)"
+msgstr "从 %s (%s) 加载 nm_vpn_editor_plugin_factory() 失败"
 
 #: ../libnm-core/nm-vpn-editor-plugin.c:332
 #, c-format
@@ -11921,12 +10662,12 @@ msgstr "初始化插件 %s 时出现未知错误"
 #: ../libnm-core/nm-vpn-editor-plugin.c:349
 #, c-format
 msgid "cannot load VPN plugin in '%s': missing plugin name"
-msgstr "无法在 \"%s\" 里加载 VPN 插件:缺少插件名称"
+msgstr "无法在 '%s' 里加载 VPN 插件:缺少插件名称。"
 
 #: ../libnm-core/nm-vpn-editor-plugin.c:358
 #, c-format
 msgid "cannot load VPN plugin in '%s': invalid service name"
-msgstr "无法在 \"%s\" 里加载 VPN 插件:无效的服务名称"
+msgstr "无法在 '%s' 里加载 VPN 插件:无效的服务名称。"
 
 #: ../libnm-core/nm-vpn-editor-plugin.c:501
 #, c-format
@@ -11946,90 +10687,90 @@ msgstr "缺少文件名"
 #: ../libnm-core/nm-vpn-plugin-info.c:118
 #, c-format
 msgid "filename must be an absolute path (%s)"
-msgstr "文件名必须为绝对路径(%s)"
+msgstr "文件名必须为绝对路径 (%s)"
 
 #: ../libnm-core/nm-vpn-plugin-info.c:127
 #, c-format
 msgid "filename has invalid format (%s)"
-msgstr "文件名具有无效的格式(%s)"
+msgstr "文件名具有无效的格式 (%s)"
 
 #: ../libnm-core/nm-vpn-plugin-info.c:450
 #, c-format
 msgid "there exists a conflicting plugin (%s) that has the same %s.%s value"
-msgstr "已存在具有相同 %s.%s 值的冲突插件(%s)"
+msgstr "已存在冲突的具有相同 %s.%s 值的插件(%s)"
 
 #: ../libnm-core/nm-vpn-plugin-info.c:488
 #, c-format
 msgid "there exists a conflicting plugin with the same name (%s)"
-msgstr "已存在具有相同名称(%s)的冲突插件"
+msgstr "已存在冲突的具有相同名称(%s)的插件"
 
-#: ../libnm-core/nm-vpn-plugin-info.c:1070
+#: ../libnm-core/nm-vpn-plugin-info.c:1071
 #, c-format
 msgid "missing \"plugin\" setting"
 msgstr "缺少 \"plugin\" 设置"
 
-#: ../libnm-core/nm-vpn-plugin-info.c:1080
+#: ../libnm-core/nm-vpn-plugin-info.c:1081
 #, c-format
 msgid "%s: don't retry loading plugin which already failed previously"
-msgstr "%s:不要重试加载之前已失败的插件"
+msgstr "%s:不要重新加载之前已失败的插件"
 
-#: ../libnm-core/nm-vpn-plugin-info.c:1174
+#: ../libnm-core/nm-vpn-plugin-info.c:1175
 msgid "missing filename to load VPN plugin info"
 msgstr "缺少文件名来加载 VPN 插件信息"
 
-#: ../libnm-core/nm-vpn-plugin-info.c:1186
+#: ../libnm-core/nm-vpn-plugin-info.c:1187
 msgid "missing name for VPN plugin info"
 msgstr "缺少 VPN 插件信息的名称"
 
-#: ../libnm-core/nm-vpn-plugin-info.c:1195
+#: ../libnm-core/nm-vpn-plugin-info.c:1196
 msgid "missing service for VPN plugin info"
 msgstr "缺少 VPN 插件信息的服务"
 
-#: ../libnm-glib/nm-device.c:1824 ../libnm/nm-device.c:1310
+#: ../libnm-glib/nm-device.c:1825 ../libnm/nm-device.c:1525
 msgid "Bluetooth"
 msgstr "蓝牙"
 
-#: ../libnm-glib/nm-device.c:1826 ../libnm/nm-device.c:1312
+#: ../libnm-glib/nm-device.c:1827 ../libnm/nm-device.c:1527
 msgid "OLPC Mesh"
 msgstr "OLPC Mesh"
 
-#: ../libnm-glib/nm-device.c:1828 ../libnm/nm-device.c:1320
+#: ../libnm-glib/nm-device.c:1829 ../libnm/nm-device.c:1535
 msgid "WiMAX"
-msgstr "WiMAX"
+msgstr "WiMAX 参数"
 
-#: ../libnm-glib/nm-device.c:1842 ../libnm/nm-device.c:1334
+#: ../libnm-glib/nm-device.c:1843 ../libnm/nm-device.c:1549
 msgid "ADSL"
-msgstr "ADSL"
+msgstr "ADSL 参数"
 
-#: ../libnm-glib/nm-device.c:1844 ../libnm/nm-device.c:1336
+#: ../libnm-glib/nm-device.c:1845 ../libnm/nm-device.c:1551
 msgid "MACVLAN"
 msgstr "MACVLAN"
 
-#: ../libnm-glib/nm-device.c:1846 ../libnm/nm-device.c:1338
+#: ../libnm-glib/nm-device.c:1847 ../libnm/nm-device.c:1553
 msgid "VXLAN"
 msgstr "VXLAN"
 
-#: ../libnm-glib/nm-device.c:1848 ../libnm/nm-device.c:1340
+#: ../libnm-glib/nm-device.c:1849 ../libnm/nm-device.c:1555
 msgid "IPTunnel"
-msgstr "IP 隧道"
+msgstr "IPTunnel"
 
-#: ../libnm-glib/nm-device.c:1850 ../libnm/nm-device.c:1342
+#: ../libnm-glib/nm-device.c:1851 ../libnm/nm-device.c:1557
 msgid "Tun"
 msgstr "Tun"
 
-#: ../libnm-glib/nm-device.c:1852 ../libnm/nm-device.c:1344
+#: ../libnm-glib/nm-device.c:1853 ../libnm/nm-device.c:1559
 msgid "Veth"
 msgstr "Veth"
 
-#: ../libnm-glib/nm-device.c:1884 ../libnm/nm-device.c:1388
+#: ../libnm-glib/nm-device.c:1885 ../libnm/nm-device.c:1597
 msgid "Wired"
-msgstr "有线"
+msgstr "有线连接"
 
-#: ../libnm-glib/nm-device.c:1915 ../libnm/nm-device.c:1419
+#: ../libnm-glib/nm-device.c:1916 ../libnm/nm-device.c:1628
 msgid "PCI"
 msgstr "PCI"
 
-#: ../libnm-glib/nm-device.c:1917 ../libnm/nm-device.c:1421
+#: ../libnm-glib/nm-device.c:1918 ../libnm/nm-device.c:1630
 msgid "USB"
 msgstr "USB"
 
@@ -12039,26 +10780,26 @@ msgstr "USB"
 #. * "%2$s (%1$s)" if there's no grammatical way to combine
 #. * the strings otherwise.
 #.
-#: ../libnm-glib/nm-device.c:2014 ../libnm-glib/nm-device.c:2033
-#: ../libnm/nm-device.c:1734 ../libnm/nm-device.c:1753
+#: ../libnm-glib/nm-device.c:2015 ../libnm-glib/nm-device.c:2034
+#: ../libnm/nm-device.c:1725 ../libnm/nm-device.c:1744
 #, c-format
 msgctxt "long device name"
 msgid "%s %s"
 msgstr "%s %s"
 
-#: ../libnm-glib/nm-remote-connection.c:148
+#: ../libnm-glib/nm-remote-connection.c:149
 msgid "Disconnected by D-Bus"
 msgstr "被 D-Bus 断开"
 
 #: ../libnm-util/crypto_gnutls.c:84
 #, c-format
 msgid "Hash length too long (%d > %d)."
-msgstr "散列长度太长(%d > %d)。"
+msgstr "Hash 长度太常 (%d > %d)。"
 
 #: ../libnm-util/crypto_gnutls.c:115
 #, c-format
 msgid "Failed to initialize the MD5 engine: %s (%s)"
-msgstr "初始化 MD5 引擎失败:%s(%s)"
+msgstr "初始化 MD5 引擎失败:%s (%s)"
 
 #: ../libnm-util/crypto_nss.c:99
 #, c-format
@@ -12070,26 +10811,26 @@ msgstr "初始化 MD5 环境失败:%d。"
 msgid "Couldn't convert password to UCS2: %d"
 msgstr "无法将密码转换为 USC2 方式:%d"
 
-#: ../libnm-util/nm-setting-bluetooth.c:185
+#: ../libnm-util/nm-setting-bluetooth.c:186
 #, c-format
 msgid "requires '%s' or '%s' setting"
-msgstr "需要 \"%s\" 或 \"%s\" 设置"
+msgstr "要求“%s”或“%s”设置"
 
-#: ../libnm-util/nm-setting-bond.c:581
+#: ../libnm-util/nm-setting-bond.c:582
 #, c-format
 msgid "'%s' is not a valid interface name for '%s' option"
-msgstr "\"%s\" 不是 \"%s\" 选项的有效接口名"
+msgstr "“%s” 不是 “%s” 选项的有效接口名"
 
-#: ../libnm-util/nm-setting-connection.c:831
+#: ../libnm-util/nm-setting-connection.c:834
 #: ../libnm-util/nm-setting-infiniband.c:269
 #, c-format
 msgid "'%s' is not a valid interface name"
-msgstr "\"%s\" 不是有效的接口名称"
+msgstr "“%s”不是有效的接口名称"
 
-#: ../libnm-util/nm-setting-connection.c:859
+#: ../libnm-util/nm-setting-connection.c:862
 #, c-format
 msgid "requires presence of '%s' setting in the connection"
-msgstr "需要连接中存在 \"%s\" 设置"
+msgstr "要求连接中存在“%s”设置"
 
 #: ../libnm-util/nm-setting-infiniband.c:231
 msgid "not a valid interface name"
@@ -12106,57 +10847,57 @@ msgid "%d. IPv4 address has invalid prefix"
 msgstr "%d。IPv4 地址前缀无效"
 
 #: ../libnm-util/nm-setting-ip4-config.c:983
-#: ../libnm-util/nm-setting-ip6-config.c:937
+#: ../libnm-util/nm-setting-ip6-config.c:939
 #, c-format
 msgid "%d. route has invalid prefix"
 msgstr "%d。路由前缀无效"
 
-#: ../libnm-util/nm-setting-ip6-config.c:911
+#: ../libnm-util/nm-setting-ip6-config.c:913
 #, c-format
 msgid "%d. IPv6 address is invalid"
-msgstr "%d。IPv6 地址无效"
+msgstr "%d. IPv6 地址无效。"
 
-#: ../libnm-util/nm-setting-ip6-config.c:921
+#: ../libnm-util/nm-setting-ip6-config.c:923
 #, c-format
 msgid "%d. IPv6 address has invalid prefix"
-msgstr "%d。IPv6 地址前缀无效"
+msgstr "%d. IPv6 地址有无效前缀。"
 
-#: ../libnm-util/nm-setting-vpn.c:581
+#: ../libnm-util/nm-setting-vpn.c:582
 #, c-format
 msgid "Failed to convert '%s' value '%s' to uint"
-msgstr "转换 \"%s\" 值 \"%s\" 为 uint 失败"
+msgstr "转换 '%s' 值 '%s' 为 uint 失败"
 
-#: ../libnm-util/nm-setting-vpn.c:588
+#: ../libnm-util/nm-setting-vpn.c:589
 #, c-format
 msgid "Secret flags property '%s' not found"
-msgstr "未找到密钥(secret)标记属性 \"%s\""
+msgstr "未找到 Secret flags 属性 '%s'"
 
-#: ../libnm-util/nm-setting-wireless.c:806
+#: ../libnm-util/nm-setting-wireless.c:807
 #, c-format
 msgid "requires setting '%s' property"
-msgstr "需要设置 \"%s\" 属性"
+msgstr "要求设置“%s”属性"
 
-#: ../libnm/nm-device-adsl.c:72
+#: ../libnm/nm-device-adsl.c:73
 msgid "The connection was not an ADSL connection."
-msgstr "此连接不是 ADSL 连接。"
+msgstr "这个连接不是一个 ADSL 连接。"
 
 #: ../libnm/nm-device-bond.c:111
 msgid "The connection was not a bond connection."
-msgstr "此连接不是绑定(bond)连接。"
+msgstr "这个连接不是一个 Bond 连接。"
 
 #: ../libnm/nm-device-bridge.c:115
 msgid "The connection was not a bridge connection."
-msgstr "此连接不是网桥连接。"
+msgstr "这个连接不是一个桥接连接。"
 
 #: ../libnm/nm-device-bt.c:137
 #, c-format
 msgid "The connection was not a Bluetooth connection."
-msgstr "此连接不是蓝牙连接。"
+msgstr "这个连接不是一个 Bluetooth 连接。"
 
 #: ../libnm/nm-device-bt.c:143
 #, c-format
 msgid "The connection is of Bluetooth NAP type."
-msgstr "此连接为蓝牙 NAP 类型。"
+msgstr ""
 
 #: ../libnm/nm-device-bt.c:152
 msgid "Invalid device Bluetooth address."
@@ -12172,27 +10913,28 @@ msgid ""
 msgstr "设备缺少连接所要求的蓝牙功能。"
 
 #: ../libnm/nm-device-dummy.c:76
+#, fuzzy
 msgid "The connection was not a dummy connection."
-msgstr "此连接不是虚拟(dummy)连接。"
+msgstr "这个连接不是一个调制解调器连接。"
 
 #: ../libnm/nm-device-dummy.c:83 ../libnm/nm-device-generic.c:97
-#: ../libnm/nm-device-ovs-bridge.c:97 ../libnm/nm-device-ovs-interface.c:68
-#: ../libnm/nm-device-ovs-port.c:96
+#: ../libnm/nm-device-ovs-bridge.c:68 ../libnm/nm-device-ovs-interface.c:68
+#: ../libnm/nm-device-ovs-port.c:67
 msgid "The connection did not specify an interface name."
-msgstr "此连接未指定接口名。"
+msgstr "这个连接未指定接口名。"
 
 #: ../libnm/nm-device-ethernet.c:206
 msgid "The connection was not an Ethernet or PPPoE connection."
-msgstr "此连接不是以太网或 PPPoE 连接。"
+msgstr "这个连接不是 Ethernet 或 PPPoE 连接。"
 
 #: ../libnm/nm-device-ethernet.c:221
 msgid "The connection and device differ in S390 subchannels."
-msgstr "此连接和设备在 S390 子信道不相同。"
+msgstr "连接和设备在 S390 子通道有所不同。"
 
 #: ../libnm/nm-device-ethernet.c:236
 #, c-format
 msgid "Invalid device MAC address %s."
-msgstr "无效的设备 MAC 地址 %s。"
+msgstr ""
 
 #: ../libnm/nm-device-ethernet.c:241
 msgid "The MACs of the device and the connection do not match."
@@ -12206,15 +10948,15 @@ msgstr "黑名单里无效的 MAC 地址:%s。"
 #: ../libnm/nm-device-ethernet.c:257
 #, c-format
 msgid "Device MAC (%s) is blacklisted by the connection."
-msgstr "设备 MAC(%s)被连接列入了黑名单。"
+msgstr "设备 MAC(%s)别连接放入了黑名单。"
 
 #: ../libnm/nm-device-generic.c:90
 msgid "The connection was not a generic connection."
-msgstr "此连接不是通用的连接。"
+msgstr "这个连接不是一个通用的连接。"
 
 #: ../libnm/nm-device-tun.c:208
 msgid "The connection was not a tun connection."
-msgstr "此连接不是 tun 连接。"
+msgstr "这个连接不是一个 tun 连接。"
 
 #: ../libnm/nm-device-tun.c:217
 msgid "The mode of the device and the connection didn't match"
@@ -12222,33 +10964,33 @@ msgstr "设备和连接的模式不匹配"
 
 #: ../libnm/nm-device-infiniband.c:93
 msgid "The connection was not an InfiniBand connection."
-msgstr "此连接不是 InfiniBand 连接。"
+msgstr "这个连接不是一个 InfiniBand 连接。"
 
-#: ../libnm/nm-device-infiniband.c:101 ../libnm/nm-device-wifi.c:625
+#: ../libnm/nm-device-infiniband.c:101 ../libnm/nm-device-wifi.c:599
 #: ../libnm/nm-device-wimax.c:324
 msgid "Invalid device MAC address."
 msgstr "无效的设备 MAC 地址。"
 
-#: ../libnm/nm-device-infiniband.c:109 ../libnm/nm-device-wifi.c:632
+#: ../libnm/nm-device-infiniband.c:109 ../libnm/nm-device-wifi.c:606
 #: ../libnm/nm-device-wimax.c:331
 msgid "The MACs of the device and the connection didn't match."
 msgstr "设备和连接的 MAC 地址不匹配。"
 
-#: ../libnm/nm-device-ip-tunnel.c:271
+#: ../libnm/nm-device-ip-tunnel.c:253
 msgid "The connection was not an IP tunnel connection."
-msgstr "此连接不是 IP 隧道连接。"
+msgstr "这个连接不是一个 IP 隧道连接。"
 
-#: ../libnm/nm-device-macvlan.c:157
+#: ../libnm/nm-device-macvlan.c:158
 msgid "The connection was not a MAC-VLAN connection."
-msgstr "此连接不是 MAC-VLAN 连接。"
+msgstr "这个连接不是一个 MAC-VLAN 连接。"
 
 #: ../libnm/nm-device-modem.c:119
 msgid "The connection was not a modem connection."
-msgstr "此连接不是调制解调器连接。"
+msgstr "这个连接不是一个调制解调器连接。"
 
 #: ../libnm/nm-device-modem.c:127
 msgid "The connection was not a valid modem connection."
-msgstr "此连接不是有效的调制解调器连接。"
+msgstr "这个连接不是一个有效的调制解调器连接。"
 
 #: ../libnm/nm-device-modem.c:134
 msgid "The device is lacking capabilities required by the connection."
@@ -12256,27 +10998,27 @@ msgstr "设备缺少连接所要求的功能。"
 
 #: ../libnm/nm-device-olpc-mesh.c:114
 msgid "The connection was not an OLPC Mesh connection."
-msgstr "此连接不是 OLPC Mesh 连接。"
+msgstr "这个连接不是一个 'OLPC Mesh' 连接。"
 
-#: ../libnm/nm-device-ovs-bridge.c:90
+#: ../libnm/nm-device-ovs-bridge.c:61
 msgid "The connection was not a ovs_bridge connection."
-msgstr "此连接不是 ovs 网桥连接。"
+msgstr ""
 
 #: ../libnm/nm-device-ovs-interface.c:61
 msgid "The connection was not a ovs_interface connection."
-msgstr "此连接不是 ovs 接口连接。"
+msgstr ""
 
-#: ../libnm/nm-device-ovs-port.c:89
+#: ../libnm/nm-device-ovs-port.c:60
 msgid "The connection was not a ovs_port connection."
-msgstr "此连接不是 ovs 端口连接。"
+msgstr ""
 
 #: ../libnm/nm-device-team.c:138
 msgid "The connection was not a team connection."
-msgstr "此连接不是组合(team)连接。"
+msgstr "这个连接不是一个 team 连接。"
 
 #: ../libnm/nm-device-vlan.c:128
 msgid "The connection was not a VLAN connection."
-msgstr "此连接不是 VLAN 连接。"
+msgstr "这个连接不是一个 VLAN 连接。"
 
 #: ../libnm/nm-device-vlan.c:135
 msgid "The VLAN identifiers of the device and the connection didn't match."
@@ -12288,116 +11030,102 @@ msgstr "设备和连接的硬件地址不匹配。"
 
 #: ../libnm/nm-device-vxlan.c:386
 msgid "The connection was not a VXLAN connection."
-msgstr "此连接不是 VXLAN 连接。"
+msgstr "这个连接不是 VXLAN 连接。"
 
 #: ../libnm/nm-device-vxlan.c:393
 msgid "The VXLAN identifiers of the device and the connection didn't match."
 msgstr "设备和连接的 VXLAN 标识符不匹配。"
 
-#: ../libnm/nm-device-wifi.c:616
+#: ../libnm/nm-device-wifi.c:590
 msgid "The connection was not a Wi-Fi connection."
-msgstr "此连接不是 Wi-Fi 连接。"
+msgstr "这个连接不是一个 Wi-Fi 连接。"
 
-#: ../libnm/nm-device-wifi.c:652
+#: ../libnm/nm-device-wifi.c:626
 msgid "The device is lacking WPA capabilities required by the connection."
-msgstr "设备缺少连接所要求的 WPA 功能。"
+msgstr "设备缺少连接所要求的 WPA 功能"
 
-#: ../libnm/nm-device-wifi.c:659
+#: ../libnm/nm-device-wifi.c:633
 msgid "The device is lacking WPA2/RSN capabilities required by the connection."
-msgstr "设备缺少连接所要求的 WPA2/RSN 功能。"
+msgstr "设备缺少连接所要求的 WPA2/RSN 功能"
 
 #: ../libnm/nm-device-wimax.c:315
 msgid "The connection was not a WiMAX connection."
-msgstr "此连接不是 WiMAX 连接。"
-
-#: ../libnm/nm-device-wpan.c:82
-msgid "The connection was not a wpan connection."
-msgstr "此连接不是 wpan 连接。"
+msgstr "这个连接不是 WiMAX 连接。"
 
-#: ../libnm/nm-device.c:1314
-msgid "Open vSwitch Interface"
-msgstr "Open vSwitch 接口"
+#: ../libnm/nm-device.c:1529
+msgid "OpenVSwitch Interface"
+msgstr ""
 
-#: ../libnm/nm-device.c:1316
-msgid "Open vSwitch Port"
-msgstr "Open vSwitch 端口"
+#: ../libnm/nm-device.c:1531
+msgid "OpenVSwitch Port"
+msgstr ""
 
-#: ../libnm/nm-device.c:1318
-msgid "Open vSwitch Bridge"
-msgstr "Open vSwitch 网桥"
+#: ../libnm/nm-device.c:1533
+msgid "OpenVSwitch Bridge"
+msgstr ""
 
-#: ../libnm/nm-device.c:1346
+#: ../libnm/nm-device.c:1561
 msgid "MACsec"
-msgstr "MACsec"
+msgstr ""
 
-#: ../libnm/nm-device.c:1348
+#: ../libnm/nm-device.c:1563
 msgid "Dummy"
-msgstr "虚拟"
+msgstr ""
 
-#: ../libnm/nm-device.c:1350
+#: ../libnm/nm-device.c:1565
 msgid "PPP"
-msgstr "PPP"
-
-#: ../libnm/nm-device.c:1352
-msgid "IEEE 802.15.4"
-msgstr "IEEE 802.15.4"
-
-#: ../libnm/nm-device.c:1354
-msgid "6LoWPAN"
-msgstr "6LoWPAN"
-
-#: ../libnm/nm-device.c:1356
-#| msgid "Wired"
-msgid "WireGuard"
-msgstr "WireGuard"
+msgstr ""
 
-#: ../libnm/nm-device.c:2475
+#: ../libnm/nm-device.c:2456
 #, c-format
 msgid "The connection was not valid: %s"
 msgstr "连接无效:%s"
 
-#: ../libnm/nm-device.c:2484
+#: ../libnm/nm-device.c:2465
 #, c-format
 msgid "The interface names of the device and the connection didn't match."
 msgstr "这个设备的接口名和连接不匹配。"
 
 #: ../libnm/nm-manager.c:274
+#, fuzzy
 msgid "Checkpoint was removed before it was initialized"
-msgstr "检查点在初始化之前被删除"
+msgstr "连接在初始化之前被删除"
 
-#: ../libnm/nm-manager.c:955
+#: ../libnm/nm-manager.c:941
 msgid "Active connection removed before it was initialized"
-msgstr "活动连接在初始化之前被删除"
+msgstr "活动连接在初始化之前无法被删除"
 
 #: ../libnm/nm-remote-settings.c:256
 msgid "Connection removed before it was initialized"
 msgstr "连接在初始化之前被删除"
 
-#: ../libnm/nm-vpn-plugin-old.c:847 ../libnm/nm-vpn-service-plugin.c:1016
+#: ../libnm/nm-vpn-plugin-old.c:840 ../libnm/nm-vpn-service-plugin.c:957
 msgid "No service name specified"
 msgstr "未指定服务"
 
 #: ../data/org.freedesktop.NetworkManager.policy.in.in.h:1
 msgid "Enable or disable system networking"
-msgstr "启用或禁用系统联网"
+msgstr "启用或禁用系统网络"
 
 #: ../data/org.freedesktop.NetworkManager.policy.in.in.h:2
 msgid "System policy prevents enabling or disabling system networking"
-msgstr "系统策略阻止启用或禁用系统联网"
+msgstr "系统策略阻止启用或禁用系统网络"
 
 #: ../data/org.freedesktop.NetworkManager.policy.in.in.h:3
+#, fuzzy
 msgid "Reload NetworkManager configuration"
-msgstr "重新加载网络管理器配置"
+msgstr "输出网络管理器配置并退出"
 
 #: ../data/org.freedesktop.NetworkManager.policy.in.in.h:4
+#, fuzzy
 msgid "System policy prevents reloading NetworkManager"
-msgstr "系统策略阻止重新加载网络管理器"
+msgstr "系统策略阻止启用或禁用系统网络"
 
 #: ../data/org.freedesktop.NetworkManager.policy.in.in.h:5
 msgid ""
 "Put NetworkManager to sleep or wake it up (should only be used by system "
 "power management)"
-msgstr "挂起或唤醒网络管理器(应仅用于系统电源管理)"
+msgstr "挂起或唤醒网络管理器(应仅用于系统电源管理)"
 
 #: ../data/org.freedesktop.NetworkManager.policy.in.in.h:6
 msgid "System policy prevents putting NetworkManager to sleep or waking it up"
@@ -12421,7 +11149,7 @@ msgstr "系统策略阻止启用或禁用移动宽带设备"
 
 #: ../data/org.freedesktop.NetworkManager.policy.in.in.h:11
 msgid "Enable or disable WiMAX mobile broadband devices"
-msgstr "启用或禁用 WiMAX 移动宽带设备"
+msgstr "启用/禁用 WiMAX 移动宽带设备"
 
 #: ../data/org.freedesktop.NetworkManager.policy.in.in.h:12
 msgid ""
@@ -12434,7 +11162,7 @@ msgstr "允许控制网络连接"
 
 #: ../data/org.freedesktop.NetworkManager.policy.in.in.h:14
 msgid "System policy prevents control of network connections"
-msgstr "系统策略阻止网络连接的控制"
+msgstr "系统策略阻止更改网络连接"
 
 #: ../data/org.freedesktop.NetworkManager.policy.in.in.h:15
 msgid "Connection sharing via a protected WiFi network"
@@ -12462,19 +11190,19 @@ msgstr "系统策略阻止更改个人网络设置"
 
 #: ../data/org.freedesktop.NetworkManager.policy.in.in.h:21
 msgid "Modify network connections for all users"
-msgstr "修改所有用户的网络连接"
+msgstr "更改所有用户的网络连接"
 
 #: ../data/org.freedesktop.NetworkManager.policy.in.in.h:22
 msgid "System policy prevents modification of network settings for all users"
-msgstr "系统策略阻止徐该全部用户的共用网络设置"
+msgstr "系统策略阻止更改全部用户的共用网络设置"
 
 #: ../data/org.freedesktop.NetworkManager.policy.in.in.h:23
 msgid "Modify persistent system hostname"
-msgstr "修改系统固有主机名"
+msgstr "更改系统固有主机名"
 
 #: ../data/org.freedesktop.NetworkManager.policy.in.in.h:24
 msgid "System policy prevents modification of the persistent system hostname"
-msgstr "系统策略阻止修改系统固有主机名"
+msgstr "系统策略阻止更改系统固有主机名"
 
 #: ../data/org.freedesktop.NetworkManager.policy.in.in.h:25
 msgid "Modify persistent global DNS configuration"
@@ -12484,128 +11212,142 @@ msgstr "修改持久性全局 DNS 配置"
 msgid ""
 "System policy prevents modification of the persistent global DNS "
 "configuration"
-msgstr "系统策略阻止修改持久性全局 DNS 配置"
+msgstr "系统策略阻止更改持久性全局 DNS 配置"
 
 #: ../data/org.freedesktop.NetworkManager.policy.in.in.h:27
 msgid "Perform a checkpoint or rollback of interfaces configuration"
-msgstr "执行接口配置的检查点或回滚"
+msgstr ""
 
 #: ../data/org.freedesktop.NetworkManager.policy.in.in.h:28
 msgid "System policy prevents the creation of a checkpoint or its rollback"
-msgstr "系统策略阻止检查点的创建或其回滚"
+msgstr ""
 
 #: ../data/org.freedesktop.NetworkManager.policy.in.in.h:29
 msgid "Enable or disable device statistics"
-msgstr "启用或禁用设备统计"
+msgstr ""
 
 #: ../data/org.freedesktop.NetworkManager.policy.in.in.h:30
 msgid "System policy prevents enabling or disabling device statistics"
-msgstr "系统策略阻止启用或禁用设备统计"
+msgstr ""
 
 #: ../data/org.freedesktop.NetworkManager.policy.in.in.h:31
 msgid "Enable or disable connectivity checking"
-msgstr "启用或禁用连接性检查"
+msgstr ""
 
 #: ../data/org.freedesktop.NetworkManager.policy.in.in.h:32
 msgid "System policy prevents enabling or disabling connectivity checking"
-msgstr "系统策略阻止启用或禁用连接性检查"
+msgstr ""
 
-#: ../shared/nm-utils/nm-shared-utils.c:979
+#: ../shared/nm-utils/nm-shared-utils.c:794
 #, c-format
 msgid "object class '%s' has no property named '%s'"
-msgstr "对象类 \"%s\" 没有名为 \"%s\" 的属性"
+msgstr "对象类 '%s' 没有名为 '%s' 的属性"
 
-#: ../shared/nm-utils/nm-shared-utils.c:986
+#: ../shared/nm-utils/nm-shared-utils.c:801
 #, c-format
 msgid "property '%s' of object class '%s' is not writable"
-msgstr "对象类 \"%2$s\" 的 \"%1$s\" 属性是不可写的"
+msgstr "对象类 '%s' 的 '%s' 属性是不可写的"
 
-#: ../shared/nm-utils/nm-shared-utils.c:993
+#: ../shared/nm-utils/nm-shared-utils.c:808
 #, c-format
 msgid ""
 "construct property \"%s\" for object '%s' can't be set after construction"
-msgstr "对象 \"%2$s\" 的构造属性 \"%1$s\" 在构造后不能被设定"
+msgstr "对象 '%s' 的构造属性 \"%s\" 在构造后不能被设置"
 
-#: ../shared/nm-utils/nm-shared-utils.c:1001
+#: ../shared/nm-utils/nm-shared-utils.c:816
 #, c-format
 msgid "'%s::%s' is not a valid property name; '%s' is not a GObject subtype"
-msgstr "\"%s::%s\" 不是有效的属性名;\"%s\" 不是 GObject 子类型"
+msgstr "'%s::%s' 不是有效的属性名,'%s' 不是 GObject 子类型。"
 
-#: ../shared/nm-utils/nm-shared-utils.c:1010
+#: ../shared/nm-utils/nm-shared-utils.c:825
 #, c-format
 msgid "unable to set property '%s' of type '%s' from value of type '%s'"
-msgstr "无法从类型 \"%3$s\" 的值设定类型为 \"%2$s\" 的属性 \"%1$s\""
+msgstr "无法从类型 '%s' 的值设置类型为 '%s' 的属性 '%s'"
 
-#: ../shared/nm-utils/nm-shared-utils.c:1021
+#: ../shared/nm-utils/nm-shared-utils.c:836
 #, c-format
 msgid ""
 "value \"%s\" of type '%s' is invalid or out of range for property '%s' of "
 "type '%s'"
-msgstr ""
-"类型 \"%2$s\" 的值 \"%1$s\" 无效或超出类型为 \"%4$s\" 的属性 \"%3$s\" 范围"
+msgstr "类型 '%s' 的值 \"%s\" 是无效的或超出类型为 '%s' 的属性 '%s' 的范围"
 
 #. TRANSLATORS: the first %s is a prefix for the connection id, such
 #. * as "Wired Connection" or "VPN Connection". The %d is a number
 #. * that is combined with the first argument to create a unique
 #. * connection id.
-#: ../src/NetworkManagerUtils.c:119
+#: ../src/NetworkManagerUtils.c:112
 #, c-format
 msgctxt "connection id fallback"
-msgid "%s %u"
-msgstr "%s %u"
+msgid "%s %d"
+msgstr "%s %d"
 
-#: ../src/main.c:180 ../src/main.c:314
+#: ../src/main.c:179 ../src/main.c:318
 #, c-format
 msgid "Failed to read configuration: %s\n"
 msgstr "读取配置失败:%s\n"
 
 #. Logging/debugging
-#: ../src/main.c:194 ../src/nm-iface-helper.c:297
+#: ../src/main.c:193 ../src/nm-iface-helper.c:292
 msgid "Print NetworkManager version and exit"
 msgstr "输出网络管理器版本并退出"
 
-#: ../src/main.c:195 ../src/nm-iface-helper.c:298
+#: ../src/main.c:194 ../src/nm-iface-helper.c:293
 msgid "Don't become a daemon"
 msgstr "不成为守护进程"
 
-#: ../src/main.c:196 ../src/nm-iface-helper.c:300
+#: ../src/main.c:195 ../src/nm-iface-helper.c:295
 #, c-format
 msgid "Log level: one of [%s]"
 msgstr "日志级别:取 [%s] 之一"
 
-#: ../src/main.c:198 ../src/nm-iface-helper.c:302
+#: ../src/main.c:197 ../src/nm-iface-helper.c:297
 #, c-format
 msgid "Log domains separated by ',': any combination of [%s]"
-msgstr "以 \",\" 分开的日志域:可以是 [%s] 的任意组合"
+msgstr "以 “,” 分开的日志域:可以是 [%s] 的任意组合"
 
-#: ../src/main.c:200 ../src/nm-iface-helper.c:304
+#: ../src/main.c:199 ../src/nm-iface-helper.c:299
 msgid "Make all warnings fatal"
 msgstr "视所有警告为致命错误"
 
-#: ../src/main.c:201
+#: ../src/main.c:200
 msgid "Specify the location of a PID file"
 msgstr "指定一个 PID 文件的位置"
 
-#: ../src/main.c:203
+#: ../src/main.c:202
 msgid "Print NetworkManager configuration and exit"
-msgstr "输出网络管理器配置并退出"
+msgstr "打印 NetworkManager 配置并退出"
 
-#: ../src/main.c:213
+#: ../src/main.c:212
 msgid ""
 "NetworkManager monitors all network connections and automatically\n"
 "chooses the best connection to use.  It also allows the user to\n"
 "specify wireless access points which wireless cards in the computer\n"
 "should associate with."
 msgstr ""
-"网络管理器(NetworkManager)监视所有网络连接,并自动选择要使用的最佳连接。\n"
+"网络管理器监视所有网络连接,并自动选择要使用的最佳连接。\n"
 "它还允许用户指定计算机无线网卡连接的无线访问点。"
 
-#: ../src/main.c:304 ../src/main-utils.c:286 ../src/nm-iface-helper.c:442
+#: ../src/main.c:303 ../src/main-utils.c:286 ../src/nm-iface-helper.c:398
 #, c-format
 msgid "%s.  Please use --help to see a list of valid options.\n"
 msgstr "%s。请使用 --help 查看有效选项列表。\n"
 
-#: ../src/main.c:339 ../src/nm-iface-helper.c:457
+#: ../src/main.c:308 ../src/nm-iface-helper.c:403
+#, c-format
+msgid "Ignoring unrecognized log domain(s) '%s' passed on command line.\n"
+msgstr "正在忽略传给命令行的未识别日志域“%s”\n"
+
+#: ../src/main.c:333
+#, c-format
+msgid "Error in configuration file: %s.\n"
+msgstr "配置文件有错误:%s。\n"
+
+#: ../src/main.c:338
+#, c-format
+msgid "Ignoring unrecognized log domain(s) '%s' from config files.\n"
+msgstr "正在忽略来自配置文件的未识别日志域“%s”。\n"
+
+#: ../src/main.c:349 ../src/nm-iface-helper.c:413
 #, c-format
 msgid "Could not daemonize: %s [error %u]\n"
 msgstr "无法设为守护进程:%s [错误 %u]\n"
@@ -12628,23 +11370,23 @@ msgstr "关闭 %s 失败:%s\n"
 #: ../src/main-utils.c:148 ../src/main-utils.c:159
 #, c-format
 msgid "Cannot create '%s': %s"
-msgstr "无法创建 \"%s\":%s"
+msgstr "无法创建 '%s':%s"
 
 #: ../src/main-utils.c:212
 #, c-format
 msgid "%s is already running (pid %ld)\n"
-msgstr "%s 已在运行中(pid %ld)\n"
+msgstr "%s 已在运行中 (pid %ld)\n"
 
 #: ../src/main-utils.c:222
 #, c-format
 msgid "You must be root to run %s!\n"
 msgstr "运行 %s 必须是根用户!\n"
 
-#: ../src/dhcp/nm-dhcp-dhclient-utils.c:313
+#: ../src/dhcp/nm-dhcp-dhclient-utils.c:280
 msgid "# Created by NetworkManager\n"
 msgstr "# 由 NetworkManger 创建\n"
 
-#: ../src/dhcp/nm-dhcp-dhclient-utils.c:324
+#: ../src/dhcp/nm-dhcp-dhclient-utils.c:290
 #, c-format
 msgid ""
 "# Merged from %s\n"
@@ -12653,106 +11395,99 @@ msgstr ""
 "# 合并自 %s\n"
 "\n"
 
-#: ../src/devices/bluetooth/nm-bluez-device.c:212
+#: ../src/devices/bluetooth/nm-bluez-device.c:211
 #, c-format
 msgid "%s Network"
 msgstr "%s 网络"
 
-#: ../src/devices/bluetooth/nm-device-bt.c:270
+#: ../src/devices/bluetooth/nm-device-bt.c:264
 msgid "PAN requested, but Bluetooth device does not support NAP"
 msgstr "PAN 已请求,但蓝牙设备不支持 NAP"
 
-#: ../src/devices/bluetooth/nm-device-bt.c:280
+#: ../src/devices/bluetooth/nm-device-bt.c:274
 msgid "PAN connections cannot specify GSM, CDMA, or serial settings"
-msgstr "PAN 连接无法指定 GSM、CDMA 或串行设置"
+msgstr "PAN 连接无法指定 GSM、CDMA 或序列设置"
 
-#: ../src/devices/bluetooth/nm-device-bt.c:293
+#: ../src/devices/bluetooth/nm-device-bt.c:287
 msgid "PAN connection"
 msgstr "PAN 连接"
 
-#: ../src/devices/bluetooth/nm-device-bt.c:300
+#: ../src/devices/bluetooth/nm-device-bt.c:294
 msgid "DUN requested, but Bluetooth device does not support DUN"
-msgstr "DUN 已请求,但蓝牙设备不支持 DUN"
+msgstr "DUN 已请求,但 Bluetooth 设备不支持 DUN"
 
-#: ../src/devices/bluetooth/nm-device-bt.c:310
+#: ../src/devices/bluetooth/nm-device-bt.c:304
 msgid "DUN connection must include a GSM or CDMA setting"
 msgstr "DUN 连接必须包含 GSM 或 CDMA 设置"
 
-#: ../src/devices/bluetooth/nm-device-bt.c:320
-#: ../src/devices/wwan/nm-modem-broadband.c:705
+#: ../src/devices/bluetooth/nm-device-bt.c:314
+#: ../src/devices/wwan/nm-modem-broadband.c:709
 msgid "GSM connection"
 msgstr "GSM 连接"
 
-#: ../src/devices/bluetooth/nm-device-bt.c:324
-#: ../src/devices/wwan/nm-modem-broadband.c:729
+#: ../src/devices/bluetooth/nm-device-bt.c:318
+#: ../src/devices/wwan/nm-modem-broadband.c:733
 msgid "CDMA connection"
 msgstr "CDMA 连接"
 
-#: ../src/devices/bluetooth/nm-device-bt.c:332
+#: ../src/devices/bluetooth/nm-device-bt.c:326
 msgid "Unknown/unhandled Bluetooth connection type"
 msgstr "未知的/未处理的蓝牙连接类型"
 
-#: ../src/devices/bluetooth/nm-device-bt.c:353
-#: ../src/devices/nm-device-ethernet.c:1426
-#: ../src/devices/nm-device-infiniband.c:188
-#: ../src/devices/wifi/nm-device-wifi.c:907
+#: ../src/devices/bluetooth/nm-device-bt.c:347
+#: ../src/devices/nm-device-ethernet.c:1408
+#: ../src/devices/nm-device-infiniband.c:210
+#: ../src/devices/wifi/nm-device-wifi.c:952
 msgid "connection does not match device"
 msgstr "连接不匹配设备"
 
-#: ../src/devices/nm-device-6lowpan.c:191
-msgid "6LOWPAN connection"
-msgstr "6LOWPAN 连接"
-
-#: ../src/devices/nm-device-bond.c:72
+#: ../src/devices/nm-device-bond.c:91
 msgid "Bond connection"
 msgstr "绑定连接"
 
-#: ../src/devices/nm-device-bridge.c:153
+#: ../src/devices/nm-device-bridge.c:130
 msgid "Bridge connection"
-msgstr "网桥连接"
+msgstr "桥接连接"
 
-#: ../src/devices/nm-device-dummy.c:68
+#: ../src/devices/nm-device-dummy.c:70
+#, fuzzy
 msgid "Dummy connection"
-msgstr "虚拟连接"
+msgstr "ADSL 连接"
 
-#: ../src/devices/nm-device-ethernet.c:1407
+#: ../src/devices/nm-device-ethernet.c:1389
 msgid "PPPoE connection"
 msgstr "PPPoE 连接"
 
-#: ../src/devices/nm-device-ethernet.c:1407
+#: ../src/devices/nm-device-ethernet.c:1389
 msgid "Wired connection"
 msgstr "有线连接"
 
-#: ../src/devices/nm-device-ethernet-utils.c:33
+#: ../src/devices/nm-device-ethernet-utils.c:36
 #, c-format
 msgid "Wired connection %d"
 msgstr "有线连接 %d"
 
-#: ../src/devices/nm-device-ip-tunnel.c:418
+#: ../src/devices/nm-device-ip-tunnel.c:340
 msgid "IP tunnel connection"
 msgstr "IP 隧道连接"
 
-#: ../src/devices/nm-device-macvlan.c:365
+#: ../src/devices/nm-device-macvlan.c:344
 msgid "MACVLAN connection"
 msgstr "MACVLAN 连接"
 
-#: ../src/devices/nm-device-tun.c:158
+#: ../src/devices/nm-device-tun.c:146
 msgid "TUN connection"
 msgstr "TUN 连接"
 
-#: ../src/devices/nm-device-wpan.c:68
-msgid "WPAN connection"
-msgstr "WPAN 连接"
-
-#: ../src/devices/team/nm-device-team.c:101
+#: ../src/devices/team/nm-device-team.c:119
 msgid "Team connection"
-msgstr "组合连接"
+msgstr "Team 连接"
 
-#: ../src/devices/wifi/nm-device-olpc-mesh.c:124
+#: ../src/devices/wifi/nm-device-olpc-mesh.c:152
 msgid "Mesh"
 msgstr "Mesh"
 
-#: ../src/devices/wifi/nm-device-wifi.c:880
+#: ../src/devices/wifi/nm-device-wifi.c:919
 msgid "WPA Ad-Hoc disabled due to kernel bugs"
 msgstr "由于内核程序错误禁用了 WPA Ad-Hoc"
 
@@ -12767,7 +11502,7 @@ msgstr "LEAP 验证要求 LEAP 用户名"
 
 #: ../src/devices/wifi/nm-wifi-utils.c:87
 msgid "LEAP username requires 'leap' authentication"
-msgstr "LEAP 用户名要求 \"leap\" 验证"
+msgstr "LEAP 用户名要求 'leap' 验证"
 
 #: ../src/devices/wifi/nm-wifi-utils.c:100
 msgid "LEAP authentication requires IEEE 802.1x key management"
@@ -12784,23 +11519,23 @@ msgstr "LEAP 验证和 802.1x 设置不兼容"
 #: ../src/devices/wifi/nm-wifi-utils.c:154
 #, c-format
 msgid "a connection using '%s' authentication cannot use WPA key management"
-msgstr "使用 \"%s\" 验证的连接无法使用 WPA 密钥管理"
+msgstr "使用 '%s' 验证的连接无法使用 WPA 密钥管理"
 
 #: ../src/devices/wifi/nm-wifi-utils.c:165
 #, c-format
 msgid "a connection using '%s' authentication cannot specify WPA protocols"
-msgstr "使用 \"%s\" 验证的连接无法指定 WPA 协议"
+msgstr "使用 '%s' 验证的连接无法指定 WPA 协议"
 
 #: ../src/devices/wifi/nm-wifi-utils.c:181
 #: ../src/devices/wifi/nm-wifi-utils.c:198
 #, c-format
 msgid "a connection using '%s' authentication cannot specify WPA ciphers"
-msgstr "使用 \"%s\" 验证的连接无法指定 WPA 密文"
+msgstr "使用 '%s' 验证的连接无法指定 WPA 密文"
 
 #: ../src/devices/wifi/nm-wifi-utils.c:210
 #, c-format
 msgid "a connection using '%s' authentication cannot specify a WPA password"
-msgstr "使用 \"%s\" 验证的连接无法指定 WPA 密码"
+msgstr "使用 '%s' 验证的连接无法指定 WPA 密码"
 
 #: ../src/devices/wifi/nm-wifi-utils.c:241
 msgid "Dynamic WEP requires an 802.1x setting"
@@ -12809,19 +11544,19 @@ msgstr "动态 WEP 要求 802.1x 设置"
 #: ../src/devices/wifi/nm-wifi-utils.c:251
 #: ../src/devices/wifi/nm-wifi-utils.c:279
 msgid "Dynamic WEP requires 'open' authentication"
-msgstr "动态 WEP 要求 \"open\" 验证"
+msgstr "动态 WEP 要求 'open' 验证"
 
 #: ../src/devices/wifi/nm-wifi-utils.c:266
 msgid "Dynamic WEP requires 'ieee8021x' key management"
-msgstr "动态 WEP 要求 \"ieee8021x\" 密钥管理"
+msgstr "动态 WEP 要求 'ieee8021x' 密钥管理"
 
 #: ../src/devices/wifi/nm-wifi-utils.c:313
 msgid "WPA-PSK authentication is incompatible with 802.1x"
-msgstr "WPA-PSK 验证和 802.1x 兼容"
+msgstr "WPA-PSK 验证和 802.1x 是兼容的"
 
 #: ../src/devices/wifi/nm-wifi-utils.c:323
 msgid "WPA-PSK requires 'open' authentication"
-msgstr "WPA-PSK 要求 \"open\" 验证"
+msgstr "WPA-PSK 要求 'open' 验证"
 
 #: ../src/devices/wifi/nm-wifi-utils.c:335
 msgid "WPA Ad-Hoc authentication requires an Ad-Hoc mode AP"
@@ -12829,15 +11564,15 @@ msgstr "WPA Ad-Hoc 验证要求 Ad-Hoc 模式的 AP"
 
 #: ../src/devices/wifi/nm-wifi-utils.c:348
 msgid "WPA Ad-Hoc authentication requires 'wpa' protocol"
-msgstr "WPA Ad-Hoc 验证要求 \"wpa\" 协议"
+msgstr "WPA Ad-Hoc 验证要求 'wpa' 协议"
 
 #: ../src/devices/wifi/nm-wifi-utils.c:360
 msgid "WPA Ad-Hoc authentication requires 'none' pairwise cipher"
-msgstr "WPA Ad-Hoc 验证要求 \"none\" 配对密码"
+msgstr "WPA Ad-Hoc 验证要求 'none' 配对密码"
 
 #: ../src/devices/wifi/nm-wifi-utils.c:372
 msgid "WPA Ad-Hoc requires 'tkip' group cipher"
-msgstr "WPA Ad-Hoc 要求 \"tkip\" 组密码"
+msgstr "WPA Ad-Hoc 要求 'tkip' 组密码"
 
 #: ../src/devices/wifi/nm-wifi-utils.c:386
 msgid "Access point does not support PSK but setting requires it"
@@ -12849,11 +11584,11 @@ msgstr "WPA-EAP 验证要求 802.1x 设置"
 
 #: ../src/devices/wifi/nm-wifi-utils.c:426
 msgid "WPA-EAP requires 'open' authentication"
-msgstr "WPA-EAP 要求 \"open\" 验证"
+msgstr "WPA-EAP 要求 'open' 验证"
 
 #: ../src/devices/wifi/nm-wifi-utils.c:437
 msgid "802.1x setting requires 'wpa-eap' key management"
-msgstr "802.1x 设置要求 \"wpa-eap\" 密钥管理"
+msgstr "802.1x 设置要求 'wpa-eap' 密钥管理"
 
 #: ../src/devices/wifi/nm-wifi-utils.c:450
 msgid "Access point does not support 802.1x but setting requires it"
@@ -12874,319 +11609,200 @@ msgstr "Ad-Hoc 模式和 LEAP 安全性不兼容"
 
 #: ../src/devices/wifi/nm-wifi-utils.c:507
 msgid "Ad-Hoc mode requires 'open' authentication"
-msgstr "Ad-Hoc 模式要求 \"open\" 验证"
+msgstr "Ad-Hoc 模式要求 'open' 验证"
 
 #: ../src/devices/wifi/nm-wifi-utils.c:517
 msgid ""
 "Access point mode is Infrastructure but setting requires Ad-Hoc security"
 msgstr "接入点模式是 Infrastructure 但设置要求 Ad-Hoc 安全性"
 
-#: ../src/devices/wifi/nm-wifi-utils.c:558
-#: ../src/devices/wifi/nm-wifi-utils.c:586
+#: ../src/devices/wifi/nm-wifi-utils.c:559
+#: ../src/devices/wifi/nm-wifi-utils.c:589
 #, c-format
 msgid "connection does not match access point"
-msgstr "连接和接入点不匹配"
+msgstr "连接不匹配接入点"
 
-#: ../src/devices/wifi/nm-wifi-utils.c:610
+#: ../src/devices/wifi/nm-wifi-utils.c:613
 msgid "Access point is unencrypted but setting specifies security"
 msgstr "接入点未加密但设置指定了安全性"
 
-#: ../src/devices/wifi/nm-wifi-utils.c:699
+#: ../src/devices/wifi/nm-wifi-utils.c:702
 msgid ""
 "WPA authentication is incompatible with non-EAP (original) LEAP or Dynamic "
 "WEP"
 msgstr "WPA 验证和非 EAP(原始的)LEAP 或动态 WEP 不兼容"
 
-#: ../src/devices/wifi/nm-wifi-utils.c:709
+#: ../src/devices/wifi/nm-wifi-utils.c:712
 msgid "WPA authentication is incompatible with Shared Key authentication"
-msgstr "WPA 验证和共享密钥(Shared Key)验证不兼容"
+msgstr "WPA 验证和 Shared Key 验证不兼容"
 
-#: ../src/devices/wifi/nm-wifi-utils.c:756
+#: ../src/devices/wifi/nm-wifi-utils.c:759
 msgid "Failed to determine AP security information"
 msgstr "确定 AP 安全信息失败"
 
-#: ../src/devices/wwan/nm-modem-broadband.c:691
+#: ../src/devices/wwan/nm-modem-broadband.c:695
 msgid "GSM mobile broadband connection requires a 'gsm' setting"
-msgstr "GSM 移动宽带连接要求 \"gsm\" 设置"
+msgstr "GSM 移动宽带连接要求 'gsm' 设置"
 
-#: ../src/nm-config.c:521
+#: ../src/nm-config.c:486
 msgid "Config file location"
 msgstr "配置文件位置"
 
-#: ../src/nm-config.c:522
+#: ../src/nm-config.c:487
 msgid "Config directory location"
 msgstr "配置目录位置"
 
-#: ../src/nm-config.c:523
+#: ../src/nm-config.c:488
 msgid "System config directory location"
 msgstr "系统配置目录位置"
 
-#: ../src/nm-config.c:524
+#: ../src/nm-config.c:489
 msgid "Internal config file location"
-msgstr "内部配置文件位置"
+msgstr "内部的配置文件位置"
 
-#: ../src/nm-config.c:525
+#: ../src/nm-config.c:490
 msgid "State file location"
 msgstr "状态文件位置"
 
-#: ../src/nm-config.c:526
+#: ../src/nm-config.c:491
 msgid "State file for no-auto-default devices"
 msgstr "no-auto-default 设备的状态文件"
 
-#: ../src/nm-config.c:527
+#: ../src/nm-config.c:492
 msgid "List of plugins separated by ','"
-msgstr "插件列表,以 \",\" 隔开"
+msgstr "插件列表,以“,”隔开"
 
-#: ../src/nm-config.c:528
+#: ../src/nm-config.c:493
 msgid "Quit after initial configuration"
-msgstr "初始化配置后退出"
+msgstr "初始配置后退出"
 
-#: ../src/nm-config.c:529 ../src/nm-iface-helper.c:299
+#: ../src/nm-config.c:494 ../src/nm-iface-helper.c:294
 msgid "Don't become a daemon, and log to stderr"
-msgstr "不成为守护进程,并向标准错误打印日志"
+msgstr "不成为守护进程,并向 stderr 打印日志"
 
 #. These three are hidden for now, and should eventually just go away.
-#: ../src/nm-config.c:532
+#: ../src/nm-config.c:497
 msgid "An http(s) address for checking internet connectivity"
 msgstr "检查网络连通用的 http(s) 地址"
 
-#: ../src/nm-config.c:533
+#: ../src/nm-config.c:498
 msgid "The interval between connectivity checks (in seconds)"
-msgstr "连接性检查间隔(以秒计)"
+msgstr "网络连通检查间隔(秒)"
 
-#: ../src/nm-config.c:534
+#: ../src/nm-config.c:499
 msgid "The expected start of the response"
 msgstr "预期的响应开头"
 
 #. Interface/IP config
-#: ../src/nm-iface-helper.c:279
+#: ../src/nm-iface-helper.c:274
 msgid "The interface to manage"
 msgstr "要管理的接口"
 
-#: ../src/nm-iface-helper.c:280
+#: ../src/nm-iface-helper.c:275
 msgid "Connection UUID"
 msgstr "连接 UUID"
 
-#: ../src/nm-iface-helper.c:281
+#: ../src/nm-iface-helper.c:276
 msgid "Connection Token for Stable IDs"
-msgstr "固定 ID 的连接令牌"
+msgstr ""
 
-#: ../src/nm-iface-helper.c:282
+#: ../src/nm-iface-helper.c:277
 msgid "Whether to manage IPv6 SLAAC"
 msgstr "是否管理 IPv6 SLAAC"
 
-#: ../src/nm-iface-helper.c:283
+#: ../src/nm-iface-helper.c:278
 msgid "Whether SLAAC must be successful"
 msgstr "SLAAC 是否必须是成功的"
 
-#: ../src/nm-iface-helper.c:284
+#: ../src/nm-iface-helper.c:279
 msgid "Use an IPv6 temporary privacy address"
 msgstr "使用 IPv6 临时私有地址"
 
-#: ../src/nm-iface-helper.c:285
+#: ../src/nm-iface-helper.c:280
 msgid "Current DHCPv4 address"
 msgstr "当前的 DHCPv4 地址"
 
-#: ../src/nm-iface-helper.c:286
+#: ../src/nm-iface-helper.c:281
 msgid "Whether DHCPv4 must be successful"
 msgstr "DHCPv4 是否必须是成功的"
 
-#: ../src/nm-iface-helper.c:287
+#: ../src/nm-iface-helper.c:282
 msgid "Hex-encoded DHCPv4 client ID"
 msgstr "十六进制编码的 DHCPv4 客户 ID"
 
-#: ../src/nm-iface-helper.c:288
+#: ../src/nm-iface-helper.c:283
 msgid "Hostname to send to DHCP server"
 msgstr "发送至 DHCP 服务器的主机名"
 
-#: ../src/nm-iface-helper.c:288
+#: ../src/nm-iface-helper.c:283
 msgid "barbar"
 msgstr "barbar"
 
-#: ../src/nm-iface-helper.c:289
+#: ../src/nm-iface-helper.c:284
 msgid "FQDN to send to DHCP server"
-msgstr "发送至 DHCP 服务器的 FQDN"
+msgstr "发送至 DHCP 服务器的全限定名"
 
-#: ../src/nm-iface-helper.c:289
+#: ../src/nm-iface-helper.c:284
 msgid "host.domain.org"
 msgstr "host.domain.org"
 
-#: ../src/nm-iface-helper.c:290
+#: ../src/nm-iface-helper.c:285
 msgid "Route priority for IPv4"
 msgstr "IPv4 的路由优先级"
 
-#: ../src/nm-iface-helper.c:290
+#: ../src/nm-iface-helper.c:285
 msgid "0"
 msgstr "0"
 
-#: ../src/nm-iface-helper.c:291
+#: ../src/nm-iface-helper.c:286
 msgid "Route priority for IPv6"
 msgstr "IPv6 的路由优先级"
 
-#: ../src/nm-iface-helper.c:291
+#: ../src/nm-iface-helper.c:286
 msgid "1024"
 msgstr "1024"
 
-#: ../src/nm-iface-helper.c:292
+#: ../src/nm-iface-helper.c:287
 msgid "Hex-encoded Interface Identifier"
 msgstr "十六进制编码的接口标识符"
 
-#: ../src/nm-iface-helper.c:293
+#: ../src/nm-iface-helper.c:288
 msgid "IPv6 SLAAC address generation mode"
 msgstr "IPv6 SLAAC 地址生成模式"
 
-#: ../src/nm-iface-helper.c:294
+#: ../src/nm-iface-helper.c:289
 msgid ""
 "The logging backend configuration value. See logging.backend in "
 "NetworkManager.conf"
-msgstr "日志后台的配置值。请参考 NetworkManager.conf 里的 logging.backend"
+msgstr "日志后台配置的值。请参考 NetworkManager.conf 里的 logging.backend "
 
-#: ../src/nm-iface-helper.c:314
+#: ../src/nm-iface-helper.c:309
 msgid ""
 "nm-iface-helper is a small, standalone process that manages a single network "
 "interface."
 msgstr "nm-iface-helper 是一个管理单个网络接口的小型独立进程。"
 
-#: ../src/nm-iface-helper.c:423
+#: ../src/nm-iface-helper.c:379
 #, c-format
 msgid "An interface name and UUID are required\n"
 msgstr "接口名称和 UUID 是必需的\n"
 
-#: ../src/nm-iface-helper.c:429
+#: ../src/nm-iface-helper.c:385
 #, c-format
 msgid "Failed to find interface index for %s (%s)\n"
 msgstr "寻找 %s(%s) 的接口索引失败\n"
 
-#: ../src/nm-iface-helper.c:447
-#, c-format
-msgid "Ignoring unrecognized log domain(s) '%s' passed on command line.\n"
-msgstr "正在忽略传给命令行的未识别日志域 \"%s\"。\n"
-
-#: ../src/nm-iface-helper.c:486
+#: ../src/nm-iface-helper.c:446
 #, c-format
 msgid "(%s): Invalid IID %s\n"
-msgstr "(%s):无效的 IID %s\n"
-
-#: ../src/nm-iface-helper.c:497
-#, c-format
-msgid "(%s): Invalid DHCP client-id %s\n"
-msgstr "(%s):无效的 DHCP 客户端 ID %s\n"
+msgstr "(%s): 无效的 IID %s\n"
 
-#: ../src/nm-logging.c:273
+#: ../src/nm-logging.c:267
 #, c-format
 msgid "Unknown log level '%s'"
-msgstr "未知的日志等级 \"%s\""
+msgstr "未知日志等级“%s”"
 
-#: ../src/nm-logging.c:375
+#: ../src/nm-logging.c:369
 #, c-format
 msgid "Unknown log domain '%s'"
-msgstr "未知的日志域 \"%s\""
-
-#~ msgid ""
-#~ "The setting's name, which uniquely identifies the setting within the "
-#~ "connection.  Each setting type has a name unique to that type, for "
-#~ "example \"ppp\" or \"wireless\" or \"wired\"."
-#~ msgstr ""
-#~ "设置的名称,用在连接里的唯一标志。每个设置类型拥有该类型的唯一名称,例如 "
-#~ "\"ppp\"、\"wireless\" 或 \"wired\"。"
-
-#~ msgid "Error: bad color: %s\n"
-#~ msgstr "错误:错误的颜色:%s\n"
-
-#~ msgid "'%s' is ambiguous (%s x %s)"
-#~ msgstr "\"%s\" 不明确(%s x %s)"
-
-#~ msgid "'%s' is not a valid flag; use <0-%d> or a combination of '%s'"
-#~ msgstr "\"%s\" 标记无效,请使用 <0-%d> 或 \"%s\" 的组合"
-
-#~ msgid "'%s' sum is higher than all flags => all flags set"
-#~ msgstr "\"%s\" 总和高于全部的标记 => 全部标记集合"
-
-#~ msgid "%d (disabled)"
-#~ msgstr "%d(禁用)"
-
-#~ msgid "%d (enabled, prefer public IP)"
-#~ msgstr "%d(启用,首选公共 IP)"
-
-#~ msgid "%d (enabled, prefer temporary IP)"
-#~ msgstr "%d(启用,首选临时 IP)"
-
-#~ msgid ""
-#~ "If TRUE, enforce auto-negotiation of port speed and duplex mode.  If "
-#~ "FALSE, \"speed\" and \"duplex\" properties should be both set or link "
-#~ "configuration will be skipped."
-#~ msgstr ""
-#~ "如果为 TRUE,强制端口速度和双工模式的自动协商。如果为 FALSE,\"speed\" 和 "
-#~ "\"duplex\" 属性都应该被设定或者链接配置将被忽略。"
-
-#~ msgid ""
-#~ "Can be specified only when \"auto-negotiate\" is \"off\". In that case, "
-#~ "statically configures the device to use that specified duplex mode, "
-#~ "either \"half\" or \"full\". Must be set together with the \"speed\" "
-#~ "property if specified. Before specifying a duplex mode be sure your "
-#~ "device supports it."
-#~ msgstr ""
-#~ "只在 \"auto-negotiate\" 为 \"off\" 时可指定。在该情况下,静态配置设备使用"
-#~ "指定的双工模式,\"half\" 或 \"full\"。如果指定则必须同时设定 \"speed\" 属"
-#~ "性。在指定双工模式前请确保您的设备支持它。"
-
-#~ msgid ""
-#~ "Can be set to a value greater than zero only when \"auto-negotiate\" is "
-#~ "\"off\". In that case, statically configures the device to use that "
-#~ "specified speed. In Mbit/s, ie 100 == 100Mbit/s. Must be set together "
-#~ "with the \"duplex\" property when non-zero. Before specifying a speed "
-#~ "value be sure your device supports it."
-#~ msgstr ""
-#~ "只在 \"auto-negotiate\" 为 \"off\" 时可以设置为大于零的值。这种情况下,静"
-#~ "态配置设备使用该指定的速度。以 Mbit/s 计算,例如 100 == 100Mbit/s。非零时 "
-#~ "\"duplex\" 属性必须同时设置。在指定速度值前请确保您的设备支持它。"
-
-#~ msgid ""
-#~ "Intra-connection DNS priority. The relative priority to be used when "
-#~ "determining the order of DNS servers in resolv.conf.  A lower value means "
-#~ "that servers will be on top of the file.  Zero selects the default value, "
-#~ "which is 50 for VPNs and 100 for other connections.  Note that the "
-#~ "priority is to order DNS settings for multiple active connections. It "
-#~ "does not disambiguate multiple DNS servers within the same connection "
-#~ "profile. For that, just specify the DNS servers in the desired order. "
-#~ "When multiple devices have configurations with the same priority, the one "
-#~ "with an active default route will be preferred. Note that when using "
-#~ "dns=dnsmasq the order is meaningless since dnsmasq forwards queries to "
-#~ "all known servers at the same time. Negative values have the special "
-#~ "effect of excluding other configurations with a greater priority value; "
-#~ "so in presence of at least a negative priority, only DNS servers from "
-#~ "connections with the lowest priority value will be used."
-#~ msgstr ""
-#~ "内部连接的 DNS 优先级。当确定 resolv.conf 里的 DNS 服务器顺序时使用的相对"
-#~ "优先级。更低的值代表服务器将位于文件的更顶部。零代表默认值,即 50 用于 "
-#~ "VPN 和 100 用于其他连接。注意此优先级用于为多个活动连接排序 DNS 设置。它不"
-#~ "是对同个连接配置集中的多个 DNS 服务器进行明确选择。要完成这个,只要以期望"
-#~ "的顺序指定 DNS 服务器就行。当多个设备配置了同样的优先级,将优先选择活动默"
-#~ "认路由的那一个。注意当使用 dns=dnsmasq 时,此顺序无意义因为 dnsmasq 同时转"
-#~ "发查询到所有已知服务器。负值具有排除其他拥有更高优先级值的配置的特殊效果;"
-#~ "所以存在至少一个负值优先级的情况下,只使用具有最低优先级值的连接的 DNS 服"
-#~ "务器。"
-
-#~ msgid "ignoring invalid DNS server IPv6 address '%s'"
-#~ msgstr "忽略无效的 DNS 服务器 IPv6 地址 \"%s\""
-
-#~ msgid "when link autonegotiation is enabled no duplex value is accepted"
-#~ msgstr "当链路自动协商启用时不接受任何双工值"
-
-#~ msgid "when link autonegotiation is enabled speed should be 0"
-#~ msgstr "当链路自动协商启用时速度应该为 0"
-
-#~ msgid "Error in configuration file: %s.\n"
-#~ msgstr "配置文件有错误:%s。\n"
-
-#~ msgid "Ignoring unrecognized log domain(s) '%s' from config files.\n"
-#~ msgstr "正在忽略来自配置文件的未识别日志域 \"%s\"。\n"
-
-#~ msgid "'%s' is not a valid flag number; use <0-%d>"
-#~ msgstr "'%s' 是无效的标记数字,请使用 <0-%d>。"
-
-#~ msgid "Editor failed with status %d"
-#~ msgstr "编辑器失败,状态码:%d"
-
-#~ msgid "Editor failed with signal %d"
-#~ msgstr "编辑器失败,信号 %d"
+msgstr "未知日志域“%s”"