po: add translations from Red Hat

https://bugzilla.redhat.com/show_bug.cgi?id=887771

10 files changed, 26820 insertions, 23485 deletions

diff --git a/po/de.po b/po/de.po
index be17a6d555..5f586309f7 100644
--- a/po/de.po
+++ b/po/de.po
@@ -1,7 +1,7 @@
 # German translation of NetworkManager.
 # Copyright (C) 2005 Dan Williams <dcbw@redhat.com>
 # This file is distributed under the same license as the NetworkManager package.
-#
+# 
 # Hendrik Brandt <heb@gnome-de.org>, 2004, 2005.
 # Frank Arnold <frank@scirocco-5v-turbo.de>, 2005.
 # Hendrik Richter <hendrikr@gnome.org>, 2006.
@@ -18,18 +18,17 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: NetworkManager HEAD\n"
-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
-"product=NetworkManager&keywords=I18N+L10N&component=Translations\n"
-"POT-Creation-Date: 2016-05-26 14:24+0000\n"
-"PO-Revision-Date: 2016-05-21 13:21+0200\n"
-"Last-Translator: Christian Kirbach <christian.kirbach@gmail.com>\n"
-"Language-Team: Deutsch <gnome-de@gnome.org>\n"
-"Language: de\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2016-04-29 14:24+0530\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"PO-Revision-Date: 2016-07-05 08:44+0000\n"
+"Last-Translator: Copied by Zanata <copied-by-zanata@zanata.org>\n"
+"Language-Team: Deutsch <gnome-de@gnome.org>\n"
+"Language: de\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Poedit 1.8.7.1\n"
+"X-Generator: Zanata 3.9.3\n"
 
 #: ../clients/cli/agent.c:39
 #, c-format
@@ -39,7 +38,7 @@ msgid ""
 "COMMAND := { secret | polkit | all }\n"
 "\n"
 msgstr ""
-"Aufruf: nmcli agent { BEFEHL | help }\n"
+"Aufruf: nmcli agent { COMMAND | help }\n"
 "\n"
 "BEFEHL := { secret | polkit | all }\n"
 "\n"
@@ -60,8 +59,7 @@ msgstr ""
 "Ruft nmcli als Passwort-Agent für NetworkManager auf. Sobald NetworkManager\n"
 "ein Passwort verlangt fragt es bekannte Agenten danach. Der Befehl hält "
 "nmcli\n"
-"am Laufen und wenn ein Passwort notwendig ist, so wird der Benutzer "
-"gefragt.\n"
+"am Laufen und wenn ein Passwort notwendig ist, so wird der Benutzer gefragt.\n"
 "\n"
 
 #: ../clients/cli/agent.c:57
@@ -116,21 +114,21 @@ msgstr "Fehler: Initialisierung des Passwort-Agenten fehlgeschlagen: %s"
 msgid "nmcli successfully registered as a polkit agent.\n"
 msgstr "nmcli wurde erfolgreich als polkit-Agent angemeldet.\n"
 
-#: ../clients/cli/agent.c:206 ../clients/cli/connections.c:11046
-#: ../clients/cli/devices.c:3724 ../clients/cli/general.c:343
-#: ../clients/cli/general.c:481
+#: ../clients/cli/agent.c:206 ../clients/cli/connections.c:11050
+#: ../clients/cli/devices.c:3669 ../clients/cli/general.c:343
+#: ../clients/cli/general.c:484
 #, c-format
 msgid "Error: NetworkManager is not running."
 msgstr "Fehler: NetworkManager wird nicht ausgeführt"
 
-#: ../clients/cli/agent.c:239
+#: ../clients/cli/agent.c:242
 #, c-format
 msgid "Error: 'agent' command '%s' is not valid."
 msgstr "Fehler: Der »agent«-Befehl »%s« ist ungültig."
 
 #: ../clients/cli/common.c:38 ../clients/cli/common.c:51
 #: ../clients/cli/common.c:59 ../clients/cli/common.c:71
-#: ../clients/cli/connections.c:177 ../clients/cli/connections.c:199
+#: ../clients/cli/connections.c:192 ../clients/cli/connections.c:214
 msgid "GROUP"
 msgstr "GRUPPE"
 
@@ -142,7 +140,7 @@ msgstr "ADRESSE"
 #. 1
 #. 2
 #: ../clients/cli/common.c:40 ../clients/cli/common.c:61
-#: ../clients/cli/connections.c:202
+#: ../clients/cli/connections.c:217
 msgid "GATEWAY"
 msgstr "GATEWAY"
 
@@ -246,7 +244,7 @@ msgstr "wird verbunden (Zweitverbindungen werden gestartet)"
 msgid "connected"
 msgstr "verbunden"
 
-#: ../clients/cli/common.c:514 ../clients/cli/connections.c:630
+#: ../clients/cli/common.c:514 ../clients/cli/connections.c:648
 msgid "deactivating"
 msgstr "wird deaktiviert"
 
@@ -255,52 +253,52 @@ msgid "connection failed"
 msgstr "Verbindung fehlgeschlagen"
 
 #: ../clients/cli/common.c:518 ../clients/cli/common.c:535
-#: ../clients/cli/connections.c:635 ../clients/cli/connections.c:658
-#: ../clients/cli/connections.c:1931 ../clients/cli/devices.c:1104
-#: ../clients/cli/devices.c:1145 ../clients/cli/devices.c:1147
+#: ../clients/cli/connections.c:653 ../clients/cli/connections.c:676
+#: ../clients/cli/connections.c:1949 ../clients/cli/devices.c:1024
+#: ../clients/cli/devices.c:1065 ../clients/cli/devices.c:1067
 #: ../clients/cli/general.c:248 ../clients/cli/general.c:286
-#: ../clients/cli/general.c:429 ../clients/cli/general.c:445
-#: ../clients/cli/settings.c:843 ../clients/cli/settings.c:929
-#: ../clients/cli/settings.c:1313 ../clients/cli/settings.c:1951
-#: ../clients/cli/settings.c:3248
+#: ../clients/cli/general.c:432 ../clients/cli/general.c:448
+#: ../clients/cli/settings.c:839 ../clients/cli/settings.c:925
+#: ../clients/cli/settings.c:1265 ../clients/cli/settings.c:1901
+#: ../clients/cli/settings.c:3205 ../clients/cli/utils.c:1400
 #, c-format
 msgid "unknown"
 msgstr "unbekannt"
 
 #. "CAPABILITIES"
-#: ../clients/cli/common.c:527 ../clients/cli/connections.c:915
-#: ../clients/cli/connections.c:917 ../clients/cli/connections.c:919
-#: ../clients/cli/connections.c:953 ../clients/cli/connections.c:1022
-#: ../clients/cli/connections.c:1023 ../clients/cli/connections.c:1025
-#: ../clients/cli/connections.c:3438 ../clients/cli/connections.c:8559
-#: ../clients/cli/connections.c:8560 ../clients/cli/devices.c:782
-#: ../clients/cli/devices.c:1069 ../clients/cli/devices.c:1070
-#: ../clients/cli/devices.c:1071 ../clients/cli/devices.c:1072
-#: ../clients/cli/devices.c:1073 ../clients/cli/devices.c:1108
-#: ../clients/cli/devices.c:1110 ../clients/cli/devices.c:1138
-#: ../clients/cli/devices.c:1139 ../clients/cli/devices.c:1140
-#: ../clients/cli/devices.c:1141 ../clients/cli/devices.c:1142
-#: ../clients/cli/devices.c:1143 ../clients/cli/devices.c:1144
-#: ../clients/cli/devices.c:1146 ../clients/cli/devices.c:1148
-#: ../clients/cli/general.c:439 ../clients/cli/settings.c:3243
+#: ../clients/cli/common.c:527 ../clients/cli/connections.c:933
+#: ../clients/cli/connections.c:935 ../clients/cli/connections.c:937
+#: ../clients/cli/connections.c:971 ../clients/cli/connections.c:1040
+#: ../clients/cli/connections.c:1041 ../clients/cli/connections.c:1043
+#: ../clients/cli/connections.c:3450 ../clients/cli/connections.c:8563
+#: ../clients/cli/connections.c:8564 ../clients/cli/devices.c:772
+#: ../clients/cli/devices.c:989 ../clients/cli/devices.c:990
+#: ../clients/cli/devices.c:991 ../clients/cli/devices.c:992
+#: ../clients/cli/devices.c:993 ../clients/cli/devices.c:1028
+#: ../clients/cli/devices.c:1030 ../clients/cli/devices.c:1058
+#: ../clients/cli/devices.c:1059 ../clients/cli/devices.c:1060
+#: ../clients/cli/devices.c:1061 ../clients/cli/devices.c:1062
+#: ../clients/cli/devices.c:1063 ../clients/cli/devices.c:1064
+#: ../clients/cli/devices.c:1066 ../clients/cli/devices.c:1068
+#: ../clients/cli/general.c:442 ../clients/cli/settings.c:3200
 msgid "yes"
 msgstr "ja"
 
-#: ../clients/cli/common.c:529 ../clients/cli/connections.c:915
-#: ../clients/cli/connections.c:917 ../clients/cli/connections.c:919
-#: ../clients/cli/connections.c:1022 ../clients/cli/connections.c:1023
-#: ../clients/cli/connections.c:1025 ../clients/cli/connections.c:3439
-#: ../clients/cli/connections.c:8559 ../clients/cli/connections.c:8560
-#: ../clients/cli/devices.c:782 ../clients/cli/devices.c:1069
-#: ../clients/cli/devices.c:1070 ../clients/cli/devices.c:1071
-#: ../clients/cli/devices.c:1072 ../clients/cli/devices.c:1073
-#: ../clients/cli/devices.c:1108 ../clients/cli/devices.c:1110
-#: ../clients/cli/devices.c:1138 ../clients/cli/devices.c:1139
-#: ../clients/cli/devices.c:1140 ../clients/cli/devices.c:1141
-#: ../clients/cli/devices.c:1142 ../clients/cli/devices.c:1143
-#: ../clients/cli/devices.c:1144 ../clients/cli/devices.c:1146
-#: ../clients/cli/devices.c:1148 ../clients/cli/general.c:441
-#: ../clients/cli/settings.c:3245
+#: ../clients/cli/common.c:529 ../clients/cli/connections.c:933
+#: ../clients/cli/connections.c:935 ../clients/cli/connections.c:937
+#: ../clients/cli/connections.c:1040 ../clients/cli/connections.c:1041
+#: ../clients/cli/connections.c:1043 ../clients/cli/connections.c:3451
+#: ../clients/cli/connections.c:8563 ../clients/cli/connections.c:8564
+#: ../clients/cli/devices.c:772 ../clients/cli/devices.c:989
+#: ../clients/cli/devices.c:990 ../clients/cli/devices.c:991
+#: ../clients/cli/devices.c:992 ../clients/cli/devices.c:993
+#: ../clients/cli/devices.c:1028 ../clients/cli/devices.c:1030
+#: ../clients/cli/devices.c:1058 ../clients/cli/devices.c:1059
+#: ../clients/cli/devices.c:1060 ../clients/cli/devices.c:1061
+#: ../clients/cli/devices.c:1062 ../clients/cli/devices.c:1063
+#: ../clients/cli/devices.c:1064 ../clients/cli/devices.c:1066
+#: ../clients/cli/devices.c:1068 ../clients/cli/general.c:444
+#: ../clients/cli/settings.c:3202
 msgid "no"
 msgstr "nein"
 
@@ -317,7 +315,7 @@ msgid "No reason given"
 msgstr "Kein Grund angegeben"
 
 #. We should not really come here
-#: ../clients/cli/common.c:547 ../clients/cli/connections.c:2964
+#: ../clients/cli/common.c:547 ../clients/cli/connections.c:2976
 #, c-format
 msgid "Unknown error"
 msgstr "Unbekannter Fehler"
@@ -566,14 +564,12 @@ msgid "New connection activation was enqueued"
 msgstr "Aktivierung der Verbindung wurde eingereiht"
 
 #: ../clients/cli/common.c:727
-#, fuzzy
 msgid "The device's parent changed"
-msgstr "Das Gerät wurde entfernt"
+msgstr "Parent des Geräts wurde geändert "
 
 #: ../clients/cli/common.c:730
-#, fuzzy
 msgid "The device parent's management changed"
-msgstr "Das Gerät wurde entfernt"
+msgstr "Verwaltung des übergeordneten Geräts wurde geändert "
 
 #. TRANSLATORS: Unknown reason for a device state change (NMDeviceStateReason)
 #: ../clients/cli/common.c:734 ../libnm-glib/nm-device.c:1888
@@ -599,7 +595,7 @@ msgstr "»%s« ist keine gültige Bündelungskonfiguration oder Dateiname."
 #: ../clients/cli/common.c:958
 #, c-format
 msgid "Error: openconnect failed: %s\n"
-msgstr "Fehler: openconnect ist fehlgeschlagen: %s\n"
+msgstr "Fehler: openconnect fehlgeschlagen: %s\n"
 
 #: ../clients/cli/common.c:965
 #, c-format
@@ -671,20 +667,19 @@ msgid "MACVLAN mode: "
 msgstr "MACVLAN-Modus: "
 
 #. 0
-#: ../clients/cli/connections.c:58 ../clients/cli/connections.c:178
+#: ../clients/cli/connections.c:73 ../clients/cli/connections.c:193
 #: ../clients/cli/devices.c:55 ../clients/cli/devices.c:89
 #: ../clients/cli/devices.c:99 ../clients/cli/devices.c:110
 #: ../clients/cli/devices.c:120 ../clients/cli/devices.c:137
 #: ../clients/cli/devices.c:150 ../clients/cli/devices.c:176
 #: ../clients/cli/devices.c:191 ../clients/cli/devices.c:200
-#: ../clients/cli/devices.c:210 ../clients/cli/devices.c:220
-#: ../clients/cli/devices.c:261
+#: ../clients/cli/devices.c:210 ../clients/cli/devices.c:251
 msgid "NAME"
 msgstr "NAME"
 
 #. 0
 #. 1
-#: ../clients/cli/connections.c:59 ../clients/cli/connections.c:179
+#: ../clients/cli/connections.c:74 ../clients/cli/connections.c:194
 msgid "UUID"
 msgstr "UUID"
 
@@ -692,35 +687,35 @@ msgstr "UUID"
 #. 0
 #. 1
 #. 2
-#: ../clients/cli/connections.c:60 ../clients/cli/connections.c:200
+#: ../clients/cli/connections.c:75 ../clients/cli/connections.c:215
 #: ../clients/cli/devices.c:41 ../clients/cli/devices.c:57
 #: ../clients/cli/devices.c:179
 msgid "TYPE"
 msgstr "TYP"
 
 #. 2
-#: ../clients/cli/connections.c:61
+#: ../clients/cli/connections.c:76
 msgid "TIMESTAMP"
 msgstr "ZEITSTEMPEL"
 
 #. 3
-#: ../clients/cli/connections.c:62
+#: ../clients/cli/connections.c:77
 msgid "TIMESTAMP-REAL"
 msgstr "ZEITSTEMPEL-ECHT"
 
 #. 4
 #. 16
-#: ../clients/cli/connections.c:63 ../clients/cli/devices.c:72
+#: ../clients/cli/connections.c:78 ../clients/cli/devices.c:72
 msgid "AUTOCONNECT"
 msgstr "AUTO-VERBINDEN"
 
 #. 5
-#: ../clients/cli/connections.c:64
+#: ../clients/cli/connections.c:79
 msgid "AUTOCONNECT-PRIORITY"
 msgstr "AUTOVERBINDEN-PRIORITÄT"
 
 #. 6
-#: ../clients/cli/connections.c:65
+#: ../clients/cli/connections.c:80
 msgid "READONLY"
 msgstr "NUR-LESEN"
 
@@ -729,7 +724,7 @@ msgstr "NUR-LESEN"
 #. 2
 #. 15
 #. 5
-#: ../clients/cli/connections.c:66 ../clients/cli/connections.c:186
+#: ../clients/cli/connections.c:81 ../clients/cli/connections.c:201
 #: ../clients/cli/devices.c:43 ../clients/cli/devices.c:166
 #: ../clients/cli/devices.c:182
 msgid "DBUS-PATH"
@@ -738,7 +733,7 @@ msgstr "DBUS-PFAD"
 #. 8
 #. 13
 #. 4
-#: ../clients/cli/connections.c:67 ../clients/cli/devices.c:164
+#: ../clients/cli/connections.c:82 ../clients/cli/devices.c:164
 #: ../clients/cli/devices.c:181
 msgid "ACTIVE"
 msgstr "AKTIV"
@@ -748,9 +743,9 @@ msgstr "AKTIV"
 #. 12
 #. 3
 #. 0
-#: ../clients/cli/connections.c:68 ../clients/cli/devices.c:40
+#: ../clients/cli/connections.c:83 ../clients/cli/devices.c:40
 #: ../clients/cli/devices.c:56 ../clients/cli/devices.c:163
-#: ../clients/cli/devices.c:180 ../clients/cli/devices.c:262
+#: ../clients/cli/devices.c:180 ../clients/cli/devices.c:252
 msgid "DEVICE"
 msgstr "GERÄT"
 
@@ -759,42 +754,42 @@ msgstr "GERÄT"
 #. 1
 #. 10
 #. 1
-#: ../clients/cli/connections.c:69 ../clients/cli/connections.c:181
+#: ../clients/cli/connections.c:84 ../clients/cli/connections.c:196
 #: ../clients/cli/devices.c:42 ../clients/cli/devices.c:66
 #: ../clients/cli/general.c:36
 msgid "STATE"
 msgstr "STATUS"
 
 #. 11
-#: ../clients/cli/connections.c:70
+#: ../clients/cli/connections.c:85
 msgid "ACTIVE-PATH"
 msgstr "AKTIV-PFAD"
 
 #. 2
-#: ../clients/cli/connections.c:180
+#: ../clients/cli/connections.c:195
 msgid "DEVICES"
 msgstr "GERÄTE"
 
 #. 4
-#: ../clients/cli/connections.c:182
+#: ../clients/cli/connections.c:197
 msgid "DEFAULT"
 msgstr "VORGABE"
 
 #. 5
-#: ../clients/cli/connections.c:183
+#: ../clients/cli/connections.c:198
 msgid "DEFAULT6"
 msgstr "STANDARD6"
 
 #. 6
-#: ../clients/cli/connections.c:184
+#: ../clients/cli/connections.c:199
 msgid "SPEC-OBJECT"
 msgstr "SPEC-OBJECT"
 
 #. 7
 #. 4
 #. Ask for optional 'vpn' arguments.
-#: ../clients/cli/connections.c:185 ../clients/cli/connections.c:223
-#: ../clients/cli/connections.c:4157 ../clients/tui/nm-editor-utils.c:233
+#: ../clients/cli/connections.c:200 ../clients/cli/connections.c:238
+#: ../clients/cli/connections.c:4169 ../clients/tui/nm-editor-utils.c:233
 #: ../clients/tui/nmt-connect-connection-list.c:405
 msgid "VPN"
 msgstr "VPN"
@@ -802,70 +797,70 @@ msgstr "VPN"
 #. 9
 #. 5
 #. 22
-#: ../clients/cli/connections.c:187 ../clients/cli/devices.c:46
+#: ../clients/cli/connections.c:202 ../clients/cli/devices.c:46
 #: ../clients/cli/devices.c:78
 msgid "CON-PATH"
 msgstr "CON-PFAD"
 
 #. 10
-#: ../clients/cli/connections.c:188
+#: ../clients/cli/connections.c:203
 msgid "ZONE"
 msgstr "ZONE"
 
 #. 11
-#: ../clients/cli/connections.c:189
+#: ../clients/cli/connections.c:204
 msgid "MASTER-PATH"
 msgstr "MASTER-PFAD"
 
 #. 1
-#: ../clients/cli/connections.c:201
+#: ../clients/cli/connections.c:216
 msgid "USERNAME"
 msgstr "BENUTZERNAME"
 
 #. 3
-#: ../clients/cli/connections.c:203
+#: ../clients/cli/connections.c:218
 msgid "BANNER"
 msgstr "BANNER"
 
 #. 4
-#: ../clients/cli/connections.c:204
+#: ../clients/cli/connections.c:219
 msgid "VPN-STATE"
 msgstr "VPN-STATUS"
 
 #. 5
-#: ../clients/cli/connections.c:205
+#: ../clients/cli/connections.c:220
 msgid "CFG"
 msgstr "CFG"
 
-#: ../clients/cli/connections.c:218 ../clients/cli/devices.c:235
+#: ../clients/cli/connections.c:233 ../clients/cli/devices.c:225
 msgid "GENERAL"
 msgstr "ALLGEMEIN"
 
 #. 0
 #. 6
-#: ../clients/cli/connections.c:219 ../clients/cli/devices.c:242
+#: ../clients/cli/connections.c:234 ../clients/cli/devices.c:232
 msgid "IP4"
 msgstr "IP4"
 
 #. 1
 #. 7
-#: ../clients/cli/connections.c:220 ../clients/cli/devices.c:243
+#: ../clients/cli/connections.c:235 ../clients/cli/devices.c:233
 msgid "DHCP4"
 msgstr "DHCP4"
 
 #. 2
 #. 8
-#: ../clients/cli/connections.c:221 ../clients/cli/devices.c:244
+#: ../clients/cli/connections.c:236 ../clients/cli/devices.c:234
 msgid "IP6"
 msgstr "IP6"
 
 #. 3
 #. 9
-#: ../clients/cli/connections.c:222 ../clients/cli/devices.c:245
+#: ../clients/cli/connections.c:237 ../clients/cli/devices.c:235
 msgid "DHCP6"
 msgstr "DHCP6"
 
-#: ../clients/cli/connections.c:254
+#: ../clients/cli/connections.c:272
 #, c-format
 msgid ""
 "Usage: nmcli connection { COMMAND | help }\n"
@@ -881,8 +876,8 @@ msgid ""
 "\n"
 "  down [id | uuid | path | apath] <ID> ...\n"
 "\n"
-"  add COMMON_OPTIONS TYPE_SPECIFIC_OPTIONS SLAVE_OPTIONS IP_OPTIONS [-- "
-"([+|-]<setting>.<property> <value>)+]\n"
+"  add COMMON_OPTIONS TYPE_SPECIFIC_OPTIONS SLAVE_OPTIONS IP_OPTIONS [-- ([+|-"
+"]<setting>.<property> <value>)+]\n"
 "\n"
 "  modify [--temporary] [id | uuid | path] <ID> ([+|-]<setting>.<property> "
 "<value>)+\n"
@@ -941,7 +936,7 @@ msgstr ""
 "  export [id | uuid | path] <KENNUNG> [<Augabedatei>]\n"
 "\n"
 
-#: ../clients/cli/connections.c:276
+#: ../clients/cli/connections.c:294
 #, c-format
 msgid ""
 "Usage: nmcli connection show { ARGUMENTS | help }\n"
@@ -967,32 +962,31 @@ msgid ""
 "account. Use global --show-secrets option to reveal associated secrets as "
 "well.\n"
 msgstr ""
-"Aufruf: nmcli connection show { PARAMETER | help }\n"
+"Aufruf: nmcli connection show { ARGUMENTS | help }\n"
 "\n"
 "PARAMETER := [--active] [--order <order spec>]\n"
 "\n"
-"Zeigt Verbindungsprofile im Speicher und auf Datenträgern. Einige sind "
-"eventuell\n"
-"aktiv, wenn ein Gerät dieses Verbindungsprofil verwendet. Ohne Parameter "
-"werden\n"
-"alle Profile angezeigt. Wenn die Option »--active« angegeben ist, so\n"
-"werden nur aktive Profile angezeigt. »--order« ermöglicht eine angepasste\n"
-"Verbindungssortierung (schauen Sie ins Handbuch für weitere Informationen).\n"
+"Zeigt Verbindungsprofile im Speicher und auf Datenträgern. Einige können "
+"auch dann\n"
+"aktiv sein, wenn ein Gerät dieses Verbindungsprofil verwendet. Ohne "
+"Parameter werden\n"
+"alle Profile angezeigt. Wenn die Option --active angegeben ist, so\n"
+"werden nur aktive Profile angezeigt. --order ermöglicht eine angepasste\n"
+"Verbindungssortierung (siehe man-Seite).\n"
 "\n"
-"PARAMETER := [--active] [id | uuid | path | apath] <Kennung> ...\n"
+"PARAMETER := [--active] [--show-secrets] [id | uuid | path | apath] <ID> ...\n"
 "\n"
-"Zeigt Details zu bestimmten Verbindungen. Standardmäßig werden sowohl "
+"Zeigt Details zu bestimmten Verbindungen an. Standardmäßig werden sowohl "
 "statische\n"
-"Konfiguration als auch aktive Verbindungsdaten angezeigt. Die Ausgabe kann "
+"Konfiguration, als auch aktive Verbindungsdaten angezeigt. Die Ausgabe kann "
 "mit der\n"
-"allgemeinen Option »--fields« gefiltert werden. Lesen Sie im Handbuch für "
-"weitere Informationen.\n"
-"Wenn die Option »--active« angegeben ist, so werden nur aktive Profile "
+"allgemeinen Option '--fields' gefiltert werden. Weitere Informationen finden "
+"Sie in den man-Seiten.\n"
+"Wenn die Option --active angegeben ist, so werden nur aktive Profile "
 "angezeigt.\n"
-"Die globale Option »--show-secrets« zeigt zusätzlich zugehörige Passwörter "
-"an.\n"
+"Die Option --show-secrets zeigt weitere zugehörige geheime Schlüssel an.\n"
 
-#: ../clients/cli/connections.c:297
+#: ../clients/cli/connections.c:315
 #, c-format
 msgid ""
 "Usage: nmcli connection up { ARGUMENTS | help }\n"
@@ -1034,12 +1028,11 @@ msgstr ""
 "soll\n"
 "ap          - spezifiziert den zu verbindenden Zugangspunkt (nur gültig für "
 "Drahtlosnetzwerke)\n"
-"nsp         - spezifiziert den Netzwerkdienstanbieter (nur gültig für "
-"WiMAX)\n"
+"nsp         - spezifiziert den Netzwerkdienstanbieter (nur gültig für WiMAX)\n"
 "passwd-file - Datei mit Passwörtern zum Aktivieren der Verbindung\n"
 "\n"
 
-#: ../clients/cli/connections.c:318
+#: ../clients/cli/connections.c:336
 #, c-format
 msgid ""
 "Usage: nmcli connection down { ARGUMENTS | help }\n"
@@ -1062,13 +1055,13 @@ msgstr ""
 "anhand dessen Name, UUID oder D-Bus-Pfad identifiziert.\n"
 "\n"
 
-#: ../clients/cli/connections.c:330
+#: ../clients/cli/connections.c:348
 #, 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"
+"ARGUMENTS := COMMON_OPTIONS TYPE_SPECIFIC_OPTIONS SLAVE_OPTIONS IP_OPTIONS [-"
+"- ([+|-]<setting>.<property> <value>)+]\n"
 "\n"
 "  COMMON_OPTIONS:\n"
 "                  type <type>\n"
@@ -1155,8 +1148,8 @@ msgid ""
 "                  [path-cost <1-65535>]\n"
 "                  [hairpin yes|no]\n"
 "\n"
-"    vpn:          vpn-type vpnc|openvpn|pptp|openconnect|openswan|libreswan|"
-"ssh|l2tp|iodine|...\n"
+"    vpn:          vpn-type "
+"vpnc|openvpn|pptp|openconnect|openswan|libreswan|ssh|l2tp|iodine|...\n"
 "                  [user <username>]\n"
 "\n"
 "    olpc-mesh:    ssid <SSID>\n"
@@ -1204,155 +1197,146 @@ msgid ""
 "                  [ip6 <IPv6 address>] [gw6 <IPv6 gateway>]\n"
 "\n"
 msgstr ""
-"Aufruf: nmcli connection add { ARGUMENTE | help }\n"
+"Aufruf: nmcli connection add { ARGUMENTS | help }\n"
 "\n"
-"  ARGUMENTE := NORMALE_OPTIONEN TYP_SPEZIFISCHE_OPTIONEN SLAVE_OPTIONEN "
-"IP_OPTIONEN [-- ([+|-]<Einstellung>.<Eigenschaft> <Wert>)+]\n"
+"ARGUMENTS := COMMON_OPTIONS TYPE_SPECIFIC_OPTIONS SLAVE_OPTIONS IP_OPTIONS [-"
+"- ([+|-]<setting>.<property> <value>)+]\n"
 "\n"
-"  NORMALE_OPTIONEN:\n"
-"                  type <Typ>\n"
-"                  ifname <Schnittstellenname> | \"*\"\n"
-"                  [con-name <Verbindungsname>]\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 (Schnittstellenname oder Vebindungs-UUID "
-"oder Name)>]\n"
-"                  [slave-type <master-Verbindungstyp>]\n"
+"                  [master <master (ifname, or connection UUID or name)>]\n"
+"                  [slave-type <master connection type>]\n"
 "\n"
-"  TYP_SPEZIFISCHE_OPTIONEN:\n"
-"    Ethernet:     [mac <MAC-Adresse>]\n"
-"                  [cloned-mac <geklonte MAC-Adresse>]\n"
+"  TYPE_SPECIFIC_OPTIONS:\n"
+"    ethernet:     [mac <MAC address>]\n"
+"                  [cloned-mac <cloned MAC address>]\n"
 "                  [mtu <MTU>]\n"
 "\n"
-"    WLAN:         ssid <SSID>\n"
-"                  [mac <MAC-Adresse>]\n"
-"                  [cloned-mac <geklonte MAC-Adresse>]\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-Adresse>]\n"
+"    wimax:        [mac <MAC address>]\n"
 "                  [nsp <NSP>]\n"
 "\n"
-"    pppoe:        username <PPPoE-Benutzername>\n"
-"                  [password <PPPoE-Passwort>]\n"
-"                  [service <PPPoE-Dienstname>]\n"
+"    pppoe:        username <PPPoE username>\n"
+"                  [password <PPPoE password>]\n"
+"                  [service <PPPoE service name>]\n"
 "                  [mtu <MTU>]\n"
-"                  [mac <MAC-Adresse>]\n"
+"                  [mac <MAC address>]\n"
 "\n"
-"    gsm:          apn <APN>]\n"
-"                  [user <Benutzername>]\n"
-"                  [password <Passwort>]\n"
+"    gsm:          apn <APN>\n"
+"                  [user <username>]\n"
+"                  [password <password>]\n"
 "\n"
-"    cdma:         [user <Benutzername>]\n"
-"                  [password <Passwort>]\n"
+"    cdma:         [user <username>]\n"
+"                  [password <password>]\n"
 "\n"
-"    infiniband:   [mac <MAC-Adresse>]\n"
+"    infiniband:   [mac <MAC address>]\n"
 "                  [mtu <MTU>]\n"
 "                  [transport-mode datagram | connected]\n"
-"                  [parent <Schnittstellenname>]\n"
+"                  [parent <ifname>]\n"
 "                  [p-key <IPoIB P_Key>]\n"
 "\n"
-"    Bluetooth:    [addr <Bluetooth-Adresse>]\n"
+"    bluetooth:    [addr <bluetooth address>]\n"
 "                  [bt-type panu|dun-gsm|dun-cdma]\n"
 "\n"
-"    vlan:         dev <Übergeordnetes Gerät (Verbindungs-UUID, "
-"Schnittstellenname oder MAC)\n"
-"                  id <VLAN-Kennung>\n"
-"                  [flags <VLAN-Flags>]\n"
-"                  [ingress <Prioritätsabbildung Eingangsverkehr>]\n"
-"                  [egress <Prioritätsabbildung Ausgangsverkehr>]\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 <Schnittstellenname>]\n"
-"                  [miimon <Zahl>]\n"
-"                  [downdelay <Zahl>]\n"
-"                  [updelay <Zahl>]\n"
-"                  [arp-interval <Zahl>]\n"
-"                  [arp-ip-target <Zahl>]\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 (Schnittstellenname, Verbindungs-UUID oder "
-"Name)\n"
+"    bond-slave:   master <master (ifname, or connection UUID or name)>\n"
 "\n"
-"    team:         [config <Datei>|<Pure JSON-Daten>]\n"
+"    team:         [config <file>|<raw JSON data>]\n"
 "\n"
-"    team-slave:   master <master (Schnittstellenname, Verbindungs-UUID oder "
-"Name)\n"
-"                  [config <Datei>|<Pure JSON-Daten>]\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 <Zahl>]\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-Adresse>]\n"
+"                  [mac <MAC address>]\n"
 "\n"
-"    bridge-slave: master <master (Schnittstellenname, Verbindungs-UUID oder "
-"Name)\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 <Benutzername>]\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-Adresse>]\n"
+"                  [dhcp-anycast <MAC address>]\n"
 "\n"
-"    adsl:         username <Benutzername>\n"
+"    adsl:         username <username>\n"
 "                  protocol pppoa|pppoe|ipoatm\n"
-"                  [password <Passwort>]\n"
+"                  [password <password>]\n"
 "                  [encapsulation vcmux|llc]\n"
 "\n"
 "    tun:          mode tun|tap\n"
-"                  [owner <Benutzerkennung>]\n"
-"                  [group <Gruppenkennung>]\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 der Gegenstelle>\n"
-"                  [local <IP des lokalen Endpunkts>]\n"
-"                  [dev <parent device (Schnittstellenname oder Verbindungs-"
-"UUID)>]\n"
+"                  remote <remote endpoint IP>\n"
+"                  [local <local endpoint IP>]\n"
+"                  [dev <parent device (ifname or connection UUID)>]\n"
 "\n"
-"    macvlan:      dev <parent device (Verbindungs-UUID, Schnittstellenname, "
-"oder MAC)>\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 (Schnittstellenname oder Verbindungs-"
-"UUID)>]\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"
-"\n"
-"  SLAVE_OPTIONEN:\n"
+"  SLAVE_OPTIONS:\n"
 "    bridge:       [priority <0-63>]\n"
 "                  [path-cost <1-65535>]\n"
 "                  [hairpin yes|no]\n"
 "\n"
-"    team:         [config <Datei>|<Pure JSON-Daten>]\n"
+"    team:         [config <file>|<raw JSON data>]\n"
 "\n"
-"  IP_OPTIONEN:\n"
-"                  [ip4 <IPv4-Adresse>] [gw4 <IPv4-Gateway>]\n"
-"                  [ip6 <IPv6-Adresse>] [gw6 <IPv6-Gateway>]\n"
+"  IP_OPTIONS:\n"
+"                  [ip4 <IPv4 address>] [gw4 <IPv4 gateway>]\n"
+"                  [ip6 <IPv6 address>] [gw6 <IPv6 gateway>]\n"
 "\n"
 
-#: ../clients/cli/connections.c:442
+#: ../clients/cli/connections.c:460
 #, c-format
 msgid ""
 "Usage: nmcli connection modify { ARGUMENTS | help }\n"
@@ -1367,8 +1351,8 @@ msgid ""
 "\n"
 "Examples:\n"
 "nmcli con mod home-wifi wifi.ssid rakosnicek\n"
-"nmcli con mod em1-1 ipv4.method manual ipv4.addr \"192.168.1.2/24, "
-"10.10.1.5/8\"\n"
+"nmcli con mod em1-1 ipv4.method manual ipv4.addr \"192.168.1.2/24, 10.10.1.5/"
+"8\"\n"
 "nmcli con mod em1-1 +ipv4.dns 8.8.4.4\n"
 "nmcli con mod em1-1 -ipv4.dns 1\n"
 "nmcli con mod em1-1 -ipv6.addr \"abbe::cafe/56\"\n"
@@ -1387,13 +1371,12 @@ msgstr ""
 "»+« oder »-« vorangestellt.\n"
 "»+« ermöglicht Objekte anzuhängen, anstatt den gesamten Wert zu "
 "überschreiben.\n"
-"»-« ermöglicht das Entfernen einzelner Objekte an Stelle des gesamten "
-"Werts.\n"
+"»-« ermöglicht das Entfernen einzelner Objekte an Stelle des gesamten Werts.\n"
 "\n"
 "Beispiele:\n"
 "nmcli con mod home-wifi wifi.ssid rakosnicek\n"
-"nmcli con mod em1-1 ipv4.method manual ipv4.addr \"192.168.1.2/24, "
-"10.10.1.5/8\"\n"
+"nmcli con mod em1-1 ipv4.method manual ipv4.addr \"192.168.1.2/24, 10.10.1.5/"
+"8\"\n"
 "nmcli con mod em1-1 +ipv4.dns 8.8.4.4\n"
 "nmcli con mod em1-1 -ipv4.dns 1\n"
 "nmcli con mod em1-1 -ipv6.addr \"abbe::cafe/56\"\n"
@@ -1401,7 +1384,7 @@ msgstr ""
 "nmcli con mod bond0 -bond.options downdelay\n"
 "\n"
 
-#: ../clients/cli/connections.c:465
+#: ../clients/cli/connections.c:483
 #, c-format
 msgid ""
 "Usage: nmcli connection clone { ARGUMENTS | help }\n"
@@ -1409,8 +1392,7 @@ msgid ""
 "ARGUMENTS := [--temporary] [id | uuid | path] <ID> <new name>\n"
 "\n"
 "Clone an existing connection profile. The newly created connection will be\n"
-"the exact copy of the <ID>, except the uuid property (will be generated) "
-"and\n"
+"the exact copy of the <ID>, except the uuid property (will be generated) and\n"
 "id (provided as <new name> argument).\n"
 "\n"
 msgstr ""
@@ -1424,7 +1406,7 @@ msgstr ""
 "und der id (wird als Parameter <Neuer Name> angegeben).\n"
 "\n"
 
-#: ../clients/cli/connections.c:477
+#: ../clients/cli/connections.c:495
 #, c-format
 msgid ""
 "Usage: nmcli connection edit { ARGUMENTS | help }\n"
@@ -1452,7 +1434,7 @@ msgstr ""
 "Fügt ein neues Verbindungsprofil in einem interaktiven Editor hinzu.\n"
 "\n"
 
-#: ../clients/cli/connections.c:492
+#: ../clients/cli/connections.c:510
 #, c-format
 msgid ""
 "Usage: nmcli connection delete { ARGUMENTS | help }\n"
@@ -1471,7 +1453,7 @@ msgstr ""
 "Das Profil wird anhand dessen Name, UUID oder D-Bus-Pfad identifiziert.\n"
 "\n"
 
-#: ../clients/cli/connections.c:503
+#: ../clients/cli/connections.c:521
 #, c-format
 msgid ""
 "Usage: nmcli connection monitor { ARGUMENTS | help }\n"
@@ -1483,17 +1465,17 @@ msgid ""
 "Monitors all connection profiles in case none is specified.\n"
 "\n"
 msgstr ""
-"Aufruf: nmcli connection monitor { PARAMETER | help }\n"
+"Aufruf: nmcli connection monitor { ARGUMENTS | help }\n"
 "\n"
-"PARAMETER := [id | uuid | path] <Kennung> …\n"
+"ARGUMENTS := [id | uuid | path] <ID> ...\n"
 "\n"
-"Überwacht die Aktivität eines Verbindungsprofils.\n"
-"Dieser Befehl gibt eine Zeile aus, sobald sich die angegebene Verbindung "
-"ändert.\n"
-"Es werden alle Verbindungsprofile überwacht, sofern keines angegeben wird.\n"
+"Aktivität der Verbindungsprofile überwachen.\n"
+"Immer wenn sich die angegebene Verbindung ändert, gibt dieser Befehl eine "
+"Zeile aus.\n"
+"Überwacht alle Verbindungsprofile, falls keine angegeben sind.\n"
 "\n"
 
-#: ../clients/cli/connections.c:515
+#: ../clients/cli/connections.c:533
 #, c-format
 msgid ""
 "Usage: nmcli connection reload { help }\n"
@@ -1506,7 +1488,7 @@ msgstr ""
 "Lädt alle Verbindungsdateien neu von der Festplatte.\n"
 "\n"
 
-#: ../clients/cli/connections.c:523
+#: ../clients/cli/connections.c:541
 #, c-format
 msgid ""
 "Usage: nmcli connection load { ARGUMENTS | help }\n"
@@ -1523,13 +1505,13 @@ msgstr ""
 "\n"
 "PARAMETER := <Dateiname> [<Dateiname>...]\n"
 "\n"
-"Lädt eine oder mehrere Verbindungsdateien von der Festplatte (bzw. lädt "
-"neu).\n"
+"Lädt eine oder mehrere Verbindungsdateien von der Festplatte (bzw. lädt neu)."
+"\n"
 "Verwenden Sie dies nach einer manuellen Änderung an einer Verbindungsdatei,\n"
 "um sicherzustellen, dass der NetworkManager die Änderungen übernimmt.\n"
 "\n"
 
-#: ../clients/cli/connections.c:535
+#: ../clients/cli/connections.c:553
 #, c-format
 msgid ""
 "Usage: nmcli connection import { ARGUMENTS | help }\n"
@@ -1555,7 +1537,7 @@ msgstr ""
 "\n"
 "\n"
 
-#: ../clients/cli/connections.c:548
+#: ../clients/cli/connections.c:566
 #, c-format
 msgid ""
 "Usage: nmcli connection export { ARGUMENTS | help }\n"
@@ -1566,207 +1548,206 @@ msgid ""
 "The data are directed to standard output or to a file if a name is given.\n"
 "\n"
 msgstr ""
-"Aufruf: nmcli connection export { PARAMETER | help }\n"
+"Aufruf: nmcli connection export { ARGUMENTS | help }\n"
 "\n"
-"PARAMETER := [id | uuid | path] <Kennung> [<Ausgabedatei>]\n"
+"PARAMETER := [id | uuid | path] <ID> [<output file>]\n"
 "\n"
-"Exportiert eine Verbindung. Derzeit werden nur VPN-Verbindungen "
-"unterstützt.\n"
-"Die Daten werden auf die Standardausgabe umgeleitet oder in eine Datei,\n"
-"sofern eine angegeben wird.\n"
+"Exportiert eine Verbindung. Derzeit werden nur VPN-Verbindungen unterstützt.\n"
+"Die Daten werden in die Standardausgabe geschrieben oder in eine Datei, wenn "
+"sie benannt sind.\n"
 "\n"
 
-#: ../clients/cli/connections.c:626
+#: ../clients/cli/connections.c:644
 msgid "activating"
 msgstr "wird aktiviert"
 
-#: ../clients/cli/connections.c:628
+#: ../clients/cli/connections.c:646
 msgid "activated"
 msgstr "aktiviert"
 
-#: ../clients/cli/connections.c:632
+#: ../clients/cli/connections.c:650
 msgid "deactivated"
 msgstr "deaktiviert"
 
-#: ../clients/cli/connections.c:644
+#: ../clients/cli/connections.c:662
 msgid "VPN connecting (prepare)"
 msgstr "VPN wird verbunden (wird vorbereitet)"
 
-#: ../clients/cli/connections.c:646
+#: ../clients/cli/connections.c:664
 msgid "VPN connecting (need authentication)"
 msgstr "VPN wird verbunden (Legitimierung wird benötigt)"
 
-#: ../clients/cli/connections.c:648
+#: ../clients/cli/connections.c:666
 msgid "VPN connecting"
 msgstr "VPN wird verbunden"
 
-#: ../clients/cli/connections.c:650
+#: ../clients/cli/connections.c:668
 msgid "VPN connecting (getting IP configuration)"
 msgstr "VPN wird verbunden (IP-Einstellungen werden ermittelt)"
 
-#: ../clients/cli/connections.c:652
+#: ../clients/cli/connections.c:670
 msgid "VPN connected"
 msgstr "VPN verbunden"
 
-#: ../clients/cli/connections.c:654
+#: ../clients/cli/connections.c:672
 msgid "VPN connection failed"
 msgstr "VPN-Verbindung gescheitert"
 
-#: ../clients/cli/connections.c:656
+#: ../clients/cli/connections.c:674
 msgid "VPN disconnected"
 msgstr "VPN getrennt"
 
-#: ../clients/cli/connections.c:726
-#, fuzzy, c-format
+#: ../clients/cli/connections.c:744
+#, c-format
 msgid "Error updating secrets for %s: %s\n"
-msgstr "Fehler beim Speichern der Verbindung: %s"
+msgstr "Fehler beim Aktualisieren der geheimen Schlüssel für %s : %s\n"
 
-#: ../clients/cli/connections.c:746
+#: ../clients/cli/connections.c:764
 msgid "Connection profile details"
 msgstr "Details des Verbindungsprofils"
 
-#: ../clients/cli/connections.c:758 ../clients/cli/connections.c:1151
+#: ../clients/cli/connections.c:776 ../clients/cli/connections.c:1169
 #, c-format
 msgid "Error: 'connection show': %s"
 msgstr "Fehler: »connection show«: %s"
 
-#: ../clients/cli/connections.c:914 ../clients/cli/settings.c:1947
+#: ../clients/cli/connections.c:932 ../clients/cli/settings.c:1897
 msgid "never"
 msgstr "nie"
 
-#: ../clients/cli/connections.c:1139
+#: ../clients/cli/connections.c:1157
 msgid "Activate connection details"
 msgstr "Verbindungsdetails aktivieren"
 
-#: ../clients/cli/connections.c:1375
+#: ../clients/cli/connections.c:1393
 #, 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:1390 ../clients/cli/connections.c:1398
+#: ../clients/cli/connections.c:1408 ../clients/cli/connections.c:1416
 #, c-format
 msgid "'%s' has to be alone"
 msgstr "»%s« muss allein stehen"
 
 #. Add headers
-#: ../clients/cli/connections.c:1616
+#: ../clients/cli/connections.c:1634
 msgid "NetworkManager active profiles"
 msgstr "NetworkManager aktive Profile"
 
-#: ../clients/cli/connections.c:1617
+#: ../clients/cli/connections.c:1635
 msgid "NetworkManager connection profiles"
 msgstr "NetworkManager Verbindungsprofile"
 
-#: ../clients/cli/connections.c:1663 ../clients/cli/connections.c:2378
-#: ../clients/cli/connections.c:2400 ../clients/cli/connections.c:2409
-#: ../clients/cli/connections.c:2418 ../clients/cli/connections.c:2577
-#: ../clients/cli/connections.c:10152 ../clients/cli/connections.c:10269
-#: ../clients/cli/connections.c:10401 ../clients/cli/connections.c:10534
-#: ../clients/cli/connections.c:10644 ../clients/cli/connections.c:10655
-#: ../clients/cli/connections.c:10754 ../clients/cli/devices.c:2402
-#: ../clients/cli/devices.c:2410 ../clients/cli/devices.c:2733
-#: ../clients/cli/devices.c:2740 ../clients/cli/devices.c:2754
-#: ../clients/cli/devices.c:2761 ../clients/cli/devices.c:2778
-#: ../clients/cli/devices.c:2786 ../clients/cli/devices.c:2799
-#: ../clients/cli/devices.c:3163 ../clients/cli/devices.c:3170
-#: ../clients/cli/devices.c:3177 ../clients/cli/devices.c:3189
-#: ../clients/cli/devices.c:3202 ../clients/cli/devices.c:3209
-#: ../clients/cli/devices.c:3381 ../clients/cli/devices.c:3388
-#: ../clients/cli/devices.c:3561
+#: ../clients/cli/connections.c:1681 ../clients/cli/connections.c:2389
+#: ../clients/cli/connections.c:2411 ../clients/cli/connections.c:2420
+#: ../clients/cli/connections.c:2429 ../clients/cli/connections.c:2588
+#: ../clients/cli/connections.c:10156 ../clients/cli/connections.c:10273
+#: ../clients/cli/connections.c:10405 ../clients/cli/connections.c:10538
+#: ../clients/cli/connections.c:10648 ../clients/cli/connections.c:10659
+#: ../clients/cli/connections.c:10758 ../clients/cli/devices.c:2344
+#: ../clients/cli/devices.c:2352 ../clients/cli/devices.c:2675
+#: ../clients/cli/devices.c:2682 ../clients/cli/devices.c:2696
+#: ../clients/cli/devices.c:2703 ../clients/cli/devices.c:2720
+#: ../clients/cli/devices.c:2728 ../clients/cli/devices.c:2741
+#: ../clients/cli/devices.c:3105 ../clients/cli/devices.c:3112
+#: ../clients/cli/devices.c:3119 ../clients/cli/devices.c:3131
+#: ../clients/cli/devices.c:3144 ../clients/cli/devices.c:3151
+#: ../clients/cli/devices.c:3323 ../clients/cli/devices.c:3330
+#: ../clients/cli/devices.c:3503
 #, c-format
 msgid "Error: %s argument is missing."
 msgstr "Fehler: Argument %s fehlt."
 
-#: ../clients/cli/connections.c:1678
+#: ../clients/cli/connections.c:1696
 #, c-format
 msgid "Error: %s - no such connection profile."
 msgstr "Fehler: Verbindungsprofil %s existiert nicht."
 
-#: ../clients/cli/connections.c:1737 ../clients/cli/connections.c:2441
-#: ../clients/cli/connections.c:11155 ../clients/cli/devices.c:3350
-#: ../clients/cli/devices.c:3831 ../clients/cli/general.c:536
-#: ../clients/cli/general.c:585 ../clients/cli/general.c:602
-#: ../clients/cli/general.c:641 ../clients/cli/general.c:655
-#: ../clients/cli/general.c:773 ../clients/cli/general.c:820
-#: ../clients/cli/general.c:840
+#: ../clients/cli/connections.c:1755 ../clients/cli/connections.c:2452
+#: ../clients/cli/connections.c:11162 ../clients/cli/devices.c:3292
+#: ../clients/cli/devices.c:3779 ../clients/cli/general.c:539
+#: ../clients/cli/general.c:588 ../clients/cli/general.c:605
+#: ../clients/cli/general.c:644 ../clients/cli/general.c:658
+#: ../clients/cli/general.c:776 ../clients/cli/general.c:823
+#: ../clients/cli/general.c:843
 #, c-format
 msgid "Error: %s."
 msgstr "Fehler: %s."
 
-#: ../clients/cli/connections.c:1833
+#: ../clients/cli/connections.c:1851
 #, c-format
 msgid "no active connection on device '%s'"
 msgstr "Keine aktive Verbindung auf Gerät »%s«"
 
-#: ../clients/cli/connections.c:1841
+#: ../clients/cli/connections.c:1859
 msgid "no active connection or device"
 msgstr "Keine aktive Verbindung oder Gerät"
 
-#: ../clients/cli/connections.c:1892
+#: ../clients/cli/connections.c:1910
 #, 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:1895
+#: ../clients/cli/connections.c:1913
 #, c-format
 msgid "no device found for connection '%s'"
 msgstr "Für die Verbindung »%s« wurde kein Gerät gefunden"
 
-#: ../clients/cli/connections.c:1907
+#: ../clients/cli/connections.c:1925
 msgid "unknown reason"
 msgstr "unbekannter Grund"
 
-#: ../clients/cli/connections.c:1909 ../clients/cli/general.c:277
+#: ../clients/cli/connections.c:1927 ../clients/cli/general.c:277
 msgid "none"
 msgstr "kein"
 
-#: ../clients/cli/connections.c:1911
+#: ../clients/cli/connections.c:1929
 msgid "the user was disconnected"
 msgstr "Der Benutzer wurde getrennt"
 
-#: ../clients/cli/connections.c:1913
+#: ../clients/cli/connections.c:1931
 msgid "the base network connection was interrupted"
 msgstr "Die Basisverbindung wurde unterbrochen"
 
-#: ../clients/cli/connections.c:1915
+#: ../clients/cli/connections.c:1933
 msgid "the VPN service stopped unexpectedly"
 msgstr "Der VPN-Dienst wurde unerwartet gestoppt"
 
-#: ../clients/cli/connections.c:1917
+#: ../clients/cli/connections.c:1935
 msgid "the VPN service returned invalid configuration"
 msgstr "Der VPN-Dienst gab ungültige Einstellungen zurück"
 
-#: ../clients/cli/connections.c:1919
+#: ../clients/cli/connections.c:1937
 msgid "the connection attempt timed out"
 msgstr "Der Verbindungsversuch benötigte zu viel Zeit"
 
-#: ../clients/cli/connections.c:1921
+#: ../clients/cli/connections.c:1939
 msgid "the VPN service did not start in time"
 msgstr "Der VPN-Dienst wurde nicht rechtzeitig gestartet"
 
-#: ../clients/cli/connections.c:1923
+#: ../clients/cli/connections.c:1941
 msgid "the VPN service failed to start"
 msgstr "Der VPN-Dienst konnte nicht gestartet werden"
 
-#: ../clients/cli/connections.c:1925
+#: ../clients/cli/connections.c:1943
 msgid "no valid VPN secrets"
 msgstr "Keine gültigen VPN-Schlüssel"
 
-#: ../clients/cli/connections.c:1927
+#: ../clients/cli/connections.c:1945
 msgid "invalid VPN secrets"
 msgstr "Ungültige VPN-Schlüssel"
 
-#: ../clients/cli/connections.c:1929
+#: ../clients/cli/connections.c:1947
 msgid "the connection was removed"
 msgstr "Die Verbindung wurde entfernt"
 
-#: ../clients/cli/connections.c:1951 ../clients/cli/connections.c:1986
-#: ../clients/cli/connections.c:2147 ../clients/cli/connections.c:8450
+#: ../clients/cli/connections.c:1969 ../clients/cli/connections.c:1997
+#: ../clients/cli/connections.c:2158 ../clients/cli/connections.c:8454
 #, 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:1959
+#: ../clients/cli/connections.c:1976
 #, c-format
 msgid ""
 "Connection successfully activated (master waiting for slaves) (D-Bus active "
@@ -1775,209 +1756,204 @@ msgstr ""
 "Verbindung wurde erfolgreich aktiviert (master wartet auf slaves) (aktiver D-"
 "Bus-Pfad: %s)\n"
 
-#: ../clients/cli/connections.c:1966 ../clients/cli/connections.c:8456
-#, c-format
-msgid "Error: Connection activation failed.\n"
-msgstr "Fehler: Aktivierung der Verbindung ist gescheitert.\n"
-
-#: ../clients/cli/connections.c:1969 ../clients/cli/connections.c:1991
+#: ../clients/cli/connections.c:1980 ../clients/cli/connections.c:2002
 #, c-format
 msgid "Error: Connection activation failed."
 msgstr "Fehler: Aktivierung der Verbindung ist gescheitert."
 
-#: ../clients/cli/connections.c:2042
+#: ../clients/cli/connections.c:2053
 #, c-format
 msgid "VPN connection successfully activated (D-Bus active path: %s)\n"
 msgstr "VPN-Verbindung wurde erfolgreich aktiviert (aktiver D-Bus-Pfad: %s)\n"
 
-#: ../clients/cli/connections.c:2050
+#: ../clients/cli/connections.c:2061
 #, c-format
 msgid "Error: Connection activation failed: %s."
 msgstr "Fehler: Aktivierung der Verbindung ist gescheitert: %s."
 
-#: ../clients/cli/connections.c:2069 ../clients/cli/devices.c:1506
+#: ../clients/cli/connections.c:2080 ../clients/cli/devices.c:1426
 #, c-format
 msgid "Error: Timeout %d sec expired."
 msgstr "Fehler: Zeitbeschränkung von %d Sekunden ist abgelaufen."
 
-#: ../clients/cli/connections.c:2129
+#: ../clients/cli/connections.c:2140
 #, c-format
 msgid "Error: Connection activation failed: %s"
 msgstr "Fehler: Aktivierung der Verbindung ist gescheitert: %s"
 
-#: ../clients/cli/connections.c:2214
+#: ../clients/cli/connections.c:2225
 #, c-format
 msgid "failed to read passwd-file '%s': %s"
 msgstr "Fehler: Lesen der passwd-Datei »%s« ist fehlgeschlagen: %s"
 
-#: ../clients/cli/connections.c:2226
+#: ../clients/cli/connections.c:2237
 #, c-format
 msgid "missing colon in 'password' entry '%s'"
 msgstr "Fehlender Doppelpunkt im Passwort-Eintrag »%s«"
 
-#: ../clients/cli/connections.c:2234
+#: ../clients/cli/connections.c:2245
 #, c-format
 msgid "missing dot in 'password' entry '%s'"
 msgstr "Fehlender Punkt im Passwort-Eintrag »%s«"
 
-#: ../clients/cli/connections.c:2247
+#: ../clients/cli/connections.c:2258
 #, c-format
 msgid "invalid setting name in 'password' entry '%s'"
 msgstr "Ungültiger Einstellungsname im Passwort-Eintrag »%s«"
 
-#: ../clients/cli/connections.c:2303
+#: ../clients/cli/connections.c:2314
 #, c-format
 msgid "unknown device '%s'."
 msgstr "Unbekanntes Gerät »%s«,"
 
-#: ../clients/cli/connections.c:2308
+#: ../clients/cli/connections.c:2319
 msgid "neither a valid connection nor device given"
 msgstr "weder eine gültige Verbindung noch ein Gerät angegeben"
 
-#: ../clients/cli/connections.c:2391
+#: ../clients/cli/connections.c:2402
 #, c-format
 msgid "Error: Connection '%s' does not exist."
 msgstr "Fehler: Verbindung »%s« ist nicht vorhanden."
 
-#: ../clients/cli/connections.c:2426 ../clients/cli/devices.c:1405
-#: ../clients/cli/devices.c:2416 ../clients/cli/devices.c:2810
-#: ../clients/cli/devices.c:3394
+#: ../clients/cli/connections.c:2437 ../clients/cli/devices.c:1325
+#: ../clients/cli/devices.c:2358 ../clients/cli/devices.c:2752
+#: ../clients/cli/devices.c:3336
 #, c-format
 msgid "Unknown parameter: %s\n"
 msgstr "Unbekannter Parameter: %s\n"
 
-#: ../clients/cli/connections.c:2451
+#: ../clients/cli/connections.c:2462
 msgid "preparing"
 msgstr "Vorbereitung läuft"
 
-#: ../clients/cli/connections.c:2472
+#: ../clients/cli/connections.c:2483
 #, c-format
 msgid "Connection '%s' (%s) successfully deleted.\n"
 msgstr "Verbindung »%s« (%s) erfolgreich gelöscht.\n"
 
-#: ../clients/cli/connections.c:2488
+#: ../clients/cli/connections.c:2499
 #, 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:2559 ../clients/cli/connections.c:10387
-#: ../clients/cli/connections.c:10586
+#: ../clients/cli/connections.c:2570 ../clients/cli/connections.c:10391
+#: ../clients/cli/connections.c:10590
 #, c-format
 msgid "Error: No connection specified."
 msgstr "Fehler: Keine Verbindung angegeben."
 
-#: ../clients/cli/connections.c:2591
+#: ../clients/cli/connections.c:2602
 #, c-format
 msgid "Error: '%s' is not an active connection.\n"
 msgstr "Fehler: »%s« ist keine aktive Verbindung.\n"
 
-#: ../clients/cli/connections.c:2592 ../clients/cli/connections.c:10416
+#: ../clients/cli/connections.c:2603 ../clients/cli/connections.c:10420
 #, c-format
 msgid "Error: not all active connections found."
 msgstr "Fehler: Es wurden nicht alle aktiven Verbindungen gefunden."
 
-#: ../clients/cli/connections.c:2601
+#: ../clients/cli/connections.c:2612
 #, c-format
 msgid "Error: no active connection provided."
 msgstr "Fehler: Keine aktive Verbindung angegeben."
 
-#: ../clients/cli/connections.c:2943 ../clients/cli/utils.c:648
+#: ../clients/cli/connections.c:2955 ../clients/cli/utils.c:702
 #, c-format
 msgid "'%s' not among [%s]"
 msgstr "»%s« ist nicht unter [%s]"
 
-#: ../clients/cli/connections.c:3020
+#: ../clients/cli/connections.c:3032
 #, c-format
 msgid "Error: '%s': '%s' is not a valid %s MAC address."
 msgstr "Fehler: »%s«: »%s« ist keine gültige %s MAC-Adresse."
 
 #. Ask for optional arguments
-#: ../clients/cli/connections.c:3021 ../clients/cli/connections.c:3553
-#: ../clients/tui/nm-editor-utils.c:163 ../libnm-core/nm-connection.c:1729
+#: ../clients/cli/connections.c:3033 ../clients/cli/connections.c:3565
+#: ../clients/tui/nm-editor-utils.c:163 ../libnm-core/nm-connection.c:1716
 #: ../libnm-glib/nm-device.c:1861 ../libnm/nm-device.c:1812
 msgid "InfiniBand"
 msgstr "InfiniBand"
 
-#: ../clients/cli/connections.c:3021 ../clients/tui/nm-editor-utils.c:146
+#: ../clients/cli/connections.c:3033 ../clients/tui/nm-editor-utils.c:146
 #: ../libnm-glib/nm-device.c:1849 ../libnm/nm-device.c:1800
 msgid "Ethernet"
 msgstr "Ethernet"
 
-#: ../clients/cli/connections.c:3041
+#: ../clients/cli/connections.c:3053
 #, c-format
 msgid "Error: 'mtu': '%s' is not a valid MTU."
 msgstr "Fehler: »mtu«: »%s« ist keine gültige MTU."
 
-#: ../clients/cli/connections.c:3057
+#: ../clients/cli/connections.c:3069
 #, c-format
 msgid "Error: 'parent': '%s' is not a valid interface name."
 msgstr "Fehler: »parent«: »%s« ist kein gültiger Name einer Schnittstelle."
 
-#: ../clients/cli/connections.c:3078
+#: ../clients/cli/connections.c:3090
 #, c-format
 msgid "Error: 'p-key': '%s' is not a valid InfiniBand P_KEY."
 msgstr "Fehler: »p-key«: »%s« ist kein gültiger InfiniBand »P_KEY«."
 
-#: ../clients/cli/connections.c:3093
+#: ../clients/cli/connections.c:3105
 #, c-format
 msgid "Error: '%s' is not a valid UID/GID."
 msgstr "Fehler: »%s« ist keine gültige UID/GID."
 
-#: ../clients/cli/connections.c:3137
+#: ../clients/cli/connections.c:3149
 #, c-format
 msgid "Error: '%s': '%s' is not a valid %s %s."
 msgstr "Fehler: »%s«: »%s« ist kein gültiges %s %s."
 
-#: ../clients/cli/connections.c:3150
+#: ../clients/cli/connections.c:3162
 msgid "Wi-Fi mode"
 msgstr "WLAN-Modus"
 
-#: ../clients/cli/connections.c:3159
+#: ../clients/cli/connections.c:3171
 msgid "InfiniBand transport mode"
 msgstr "InfiniBand Transportmodus"
 
-#: ../clients/cli/connections.c:3171
+#: ../clients/cli/connections.c:3183
 msgid "ADSL protocol"
 msgstr "ADSL-Protokoll"
 
-#: ../clients/cli/connections.c:3182
+#: ../clients/cli/connections.c:3194
 msgid "ADSL encapsulation"
 msgstr "ADSL-Einkapselung"
 
-#: ../clients/cli/connections.c:3191
+#: ../clients/cli/connections.c:3203
 msgid "TUN device mode"
 msgstr "TUN-Gerätemodus"
 
-#: ../clients/cli/connections.c:3204
+#: ../clients/cli/connections.c:3216
 #, c-format
 msgid "Error: 'flags': '%s' is not valid; use <0-7>."
 msgstr "Fehler: »flags«: »%s« ist ungültig. Verwenden Sie <0-7>."
 
-#: ../clients/cli/connections.c:3226
+#: ../clients/cli/connections.c:3238
 #, c-format
 msgid "Error: '%s': '%s' is not valid; %s "
 msgstr "Fehler: »%s«: »%s« ist ungültig; %s "
 
-#: ../clients/cli/connections.c:3404
+#: ../clients/cli/connections.c:3416
 #, 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:3429
+#: ../clients/cli/connections.c:3441
 #, c-format
 msgid "Error: '%s': '%s' is not valid; use <%u-%u>."
 msgstr "Fehler: »%s«: »%s« ist ungültig; verwenden Sie <%u-%u>."
 
 #. Ask for optional arguments.
-#: ../clients/cli/connections.c:3485
+#: ../clients/cli/connections.c:3497
 #, c-format
 msgid "There is %d optional argument for '%s' connection type.\n"
 msgid_plural "There are %d optional arguments for '%s' connection type.\n"
 msgstr[0] "Es gibt %d optionales Argument für den Verbindungstyp »%s«.\n"
 msgstr[1] "Es gibt %d optionale Argumente für den Verbindungstyp »%s«.\n"
 
-#: ../clients/cli/connections.c:3488
+#: ../clients/cli/connections.c:3500
 #, c-format
 msgid "Do you want to provide it? %s"
 msgid_plural "Do you want to provide them? %s"
@@ -1985,556 +1961,554 @@ msgstr[0] "Möchten Sie es zur Verfügung stellen? »%s«"
 msgstr[1] "Möchten Sie diese zur Verfügung stellen? »%s«"
 
 #. Ask for optional arguments
-#: ../clients/cli/connections.c:3505
+#: ../clients/cli/connections.c:3517
 msgid "ethernet"
 msgstr "Ethernet"
 
-#: ../clients/cli/connections.c:3510 ../clients/cli/connections.c:3558
-#: ../clients/cli/connections.c:3692 ../clients/cli/connections.c:3771
+#: ../clients/cli/connections.c:3522 ../clients/cli/connections.c:3570
+#: ../clients/cli/connections.c:3704 ../clients/cli/connections.c:3783
 msgid "MTU [auto]: "
 msgstr "MTU [automatisch]: "
 
-#: ../clients/cli/connections.c:3521 ../clients/cli/connections.c:3569
-#: ../clients/cli/connections.c:3664 ../clients/cli/connections.c:3703
-#: ../clients/cli/connections.c:4089
+#: ../clients/cli/connections.c:3533 ../clients/cli/connections.c:3581
+#: ../clients/cli/connections.c:3676 ../clients/cli/connections.c:3715
+#: ../clients/cli/connections.c:4101
 msgid "MAC [none]: "
 msgstr "MAC [keine]: "
 
-#: ../clients/cli/connections.c:3532
+#: ../clients/cli/connections.c:3544
 msgid "Cloned MAC [none]: "
 msgstr "Geklonte MAC [keine]: "
 
-#: ../clients/cli/connections.c:3580
+#: ../clients/cli/connections.c:3592
 #, c-format
 msgid "Transport mode %s"
 msgstr "Übertragungsmodus %s"
 
-#: ../clients/cli/connections.c:3593
+#: ../clients/cli/connections.c:3605
 msgid "Parent interface [none]: "
 msgstr "Übergeordnete Schnittstelle [keine]: "
 
-#: ../clients/cli/connections.c:3604
+#: ../clients/cli/connections.c:3616
 msgid "P_KEY [none]: "
 msgstr "P_KEY [keiner]: "
 
-#: ../clients/cli/connections.c:3614
+#: ../clients/cli/connections.c:3626
 #, c-format
 msgid "Error: 'p-key' is mandatory when 'parent' is specified.\n"
 msgstr "Fehler: »p-key« wird benötigt wenn »parent« angegeben ist.\n"
 
 #. Ask for optional arguments
-#: ../clients/cli/connections.c:3631 ../clients/tui/nm-editor-utils.c:154
+#: ../clients/cli/connections.c:3643 ../clients/tui/nm-editor-utils.c:154
 #: ../libnm-glib/nm-device.c:1851 ../libnm/nm-device.c:1802
 msgid "Wi-Fi"
 msgstr "Wi-Fi"
 
-#: ../clients/cli/connections.c:3639 ../clients/cli/connections.c:6192
+#: ../clients/cli/connections.c:3651 ../clients/cli/connections.c:6199
 #, c-format
 msgid "Mode %s"
 msgstr "Modus %s"
 
 #. Ask for optional 'wimax' arguments.
-#: ../clients/cli/connections.c:3659 ../libnm-glib/nm-device.c:1857
+#: ../clients/cli/connections.c:3671 ../libnm-glib/nm-device.c:1857
 #: ../libnm/nm-device.c:1808
 msgid "WiMAX"
 msgstr "WiMAX"
 
 #. Ask for optional 'pppoe' arguments.
-#: ../clients/cli/connections.c:3682
+#: ../clients/cli/connections.c:3694
 msgid "PPPoE"
 msgstr "PPPoE"
 
-#: ../clients/cli/connections.c:3686 ../clients/cli/connections.c:3724
-#: ../clients/cli/connections.c:4211
+#: ../clients/cli/connections.c:3698 ../clients/cli/connections.c:3736
+#: ../clients/cli/connections.c:4223
 msgid "Password [none]: "
 msgstr "Passwort [keines]: "
 
-#: ../clients/cli/connections.c:3688
+#: ../clients/cli/connections.c:3700
 msgid "Service [none]: "
 msgstr "Dienst [keiner]: "
 
 #. Ask for optional 'gsm' or 'cdma' arguments.
-#: ../clients/cli/connections.c:3718
+#: ../clients/cli/connections.c:3730
 msgid "mobile broadband"
 msgstr "Mobiles Breitband"
 
-#: ../clients/cli/connections.c:3722 ../clients/cli/connections.c:4161
+#: ../clients/cli/connections.c:3734 ../clients/cli/connections.c:4173
 msgid "Username [none]: "
 msgstr "Benutzername [keiner]: "
 
 #. Ask for optional 'bluetooth' arguments.
-#: ../clients/cli/connections.c:3737
+#: ../clients/cli/connections.c:3749
 msgid "bluetooth"
 msgstr "bluetooth"
 
-#: ../clients/cli/connections.c:3744
+#: ../clients/cli/connections.c:3756
 #, c-format
 msgid "Bluetooth type %s"
 msgstr "Bluetooth-Typ %s"
 
-#: ../clients/cli/connections.c:3750
+#: ../clients/cli/connections.c:3762
 #, c-format
 msgid "Error: 'bt-type': '%s' is not a valid bluetooth type.\n"
 msgstr "Fehler: »bt-type«: »%s« ist kein gültiger Bluetooth-Typ.\n"
 
 #. Ask for optional 'vlan' arguments.
 #. 13
-#: ../clients/cli/connections.c:3766 ../clients/cli/devices.c:249
+#: ../clients/cli/connections.c:3778 ../clients/cli/devices.c:239
 #: ../clients/tui/nm-editor-utils.c:217 ../clients/tui/nmt-page-vlan.c:94
-#: ../libnm-core/nm-connection.c:1727 ../libnm-glib/nm-device.c:1869
+#: ../libnm-core/nm-connection.c:1714 ../libnm-glib/nm-device.c:1869
 #: ../libnm-util/nm-connection.c:1632 ../libnm/nm-device.c:1820
 msgid "VLAN"
 msgstr "VLAN"
 
-#: ../clients/cli/connections.c:3782
+#: ../clients/cli/connections.c:3794
 msgid "VLAN flags (<0-7>) [none]: "
 msgstr "VLAN-Flags (<0-7>) [keine]: "
 
-#: ../clients/cli/connections.c:3793
+#: ../clients/cli/connections.c:3805
 msgid "Ingress priority maps [none]: "
 msgstr "Eingehende Prioritätsumschlüsselungen [keine]:"
 
-#: ../clients/cli/connections.c:3804
+#: ../clients/cli/connections.c:3816
 msgid "Egress priority maps [none]: "
 msgstr "Ausgehende Prioritätsumschlüsselungen [keine]:"
 
-#: ../clients/cli/connections.c:3815
+#: ../clients/cli/connections.c:3827
 msgid "Bonding mode [balance-rr]: "
 msgstr "Bündelungsmodus [balance-rr]: "
 
 #. Ask for optional 'bond' arguments.
-#: ../clients/cli/connections.c:3831
+#: ../clients/cli/connections.c:3843
 msgid "bond"
 msgstr "Bündelung"
 
-#: ../clients/cli/connections.c:3853
+#: ../clients/cli/connections.c:3865
 msgid "Bonding primary interface [none]: "
 msgstr "Primäre Schnittstelle der Bündelung [keine]: "
 
-#: ../clients/cli/connections.c:3856
+#: ../clients/cli/connections.c:3868
 #, c-format
 msgid "Error: 'primary': '%s' is not a valid interface name.\n"
 msgstr "Fehler: »primary«: »%s« ist kein gültiger Name einer Schnittstelle.\n"
 
-#: ../clients/cli/connections.c:3864
+#: ../clients/cli/connections.c:3876
 #, c-format
 msgid "Bonding monitoring mode %s"
 msgstr "Überwachungsmodus %s der Bündelung"
 
-#: ../clients/cli/connections.c:3870
+#: ../clients/cli/connections.c:3882
 #, 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:3879
+#: ../clients/cli/connections.c:3891
 msgid "Bonding miimon [100]: "
 msgstr "Bündelung »miimon« [100]: "
 
-#: ../clients/cli/connections.c:3882
+#: ../clients/cli/connections.c:3894
 #, c-format
 msgid "Error: 'miimon': '%s' is not a valid number <0-%u>.\n"
 msgstr "Fehler: »miimon«: »%s« ist keine gültige Zahl <0-%u>.\n"
 
-#: ../clients/cli/connections.c:3890
+#: ../clients/cli/connections.c:3902
 msgid "Bonding downdelay [0]: "
 msgstr "Bündelung »downdelay« [0]: "
 
-#: ../clients/cli/connections.c:3893
+#: ../clients/cli/connections.c:3905
 #, c-format
 msgid "Error: 'downdelay': '%s' is not a valid number <0-%u>.\n"
 msgstr "Fehler: »downdelay«: »%s« ist keine gültige Zahl <0-%u>.\n"
 
-#: ../clients/cli/connections.c:3901
+#: ../clients/cli/connections.c:3913
 msgid "Bonding updelay [0]: "
 msgstr "Bündelung »updelay« [0]: "
 
-#: ../clients/cli/connections.c:3904
+#: ../clients/cli/connections.c:3916
 #, c-format
 msgid "Error: 'updelay': '%s' is not a valid number <0-%u>.\n"
 msgstr "Fehler: »updelay«: »%s« ist keine gültige Zahl <0-%u>.\n"
 
-#: ../clients/cli/connections.c:3913
+#: ../clients/cli/connections.c:3925
 msgid "Bonding arp-interval [0]: "
 msgstr "Bündelung »arp-interval« [0]: "
 
-#: ../clients/cli/connections.c:3916
+#: ../clients/cli/connections.c:3928
 #, c-format
 msgid "Error: 'arp-interval': '%s' is not a valid number <0-%u>.\n"
 msgstr "Fehler: »arp-interval«: »%s« ist keine gültige Zahl <0-%u>.\n"
 
 #. FIXME: verify the string
-#: ../clients/cli/connections.c:3924
+#: ../clients/cli/connections.c:3936
 msgid "Bonding arp-ip-target [none]: "
 msgstr "Bündelung »arp-ip-target« [keines]: "
 
-#: ../clients/cli/connections.c:3931
+#: ../clients/cli/connections.c:3943
 msgid "LACP rate ('slow' or 'fast') [slow]: "
 msgstr "LACP-Rate (»slow« oder »fast«) [slow]: "
 
-#: ../clients/cli/connections.c:3937
+#: ../clients/cli/connections.c:3949
 #, c-format
 msgid "Error: 'lacp_rate': '%s' is invalid ('slow' or 'fast').\n"
 msgstr "Fehler: »lacp_rate«: »%s« ist ungültig (»slow« oder »fast«).\n"
 
-#: ../clients/cli/connections.c:3960
+#: ../clients/cli/connections.c:3972
 msgid "Team JSON configuration [none]: "
 msgstr "JSON-Konfiguration der Bündelung [keine]: "
 
-#: ../clients/cli/connections.c:3977
+#: ../clients/cli/connections.c:3989
 msgid "team"
 msgstr "Bündelung"
 
-#: ../clients/cli/connections.c:3983
+#: ../clients/cli/connections.c:3995
 msgid "team-slave"
 msgstr "Bündelungs-Slave"
 
 #. Ask for optional 'bridge' arguments.
-#: ../clients/cli/connections.c:3995
+#: ../clients/cli/connections.c:4007
 msgid "bridge"
 msgstr "Brücke"
 
-#: ../clients/cli/connections.c:4001
+#: ../clients/cli/connections.c:4013
 #, c-format
 msgid "Enable STP %s"
 msgstr "STP %s aktivieren"
 
-#: ../clients/cli/connections.c:4006
+#: ../clients/cli/connections.c:4018
 #, c-format
 msgid "Error: 'stp': %s.\n"
 msgstr "Fehler: »STP«: %s \n"
 
-#: ../clients/cli/connections.c:4014
+#: ../clients/cli/connections.c:4026
 msgid "STP priority [32768]: "
 msgstr "STP-Priorität [32768]: "
 
-#: ../clients/cli/connections.c:4018
+#: ../clients/cli/connections.c:4030
 #, c-format
 msgid "Error: 'priority': '%s' is not a valid number <0-%d>.\n"
 msgstr "Fehler: »priority«: »%s« ist keine gültige Zahl <0-%d>.\n"
 
-#: ../clients/cli/connections.c:4026
+#: ../clients/cli/connections.c:4038
 msgid "Forward delay [15]: "
 msgstr "Weiterleitungsverzögerung [15]: "
 
-#: ../clients/cli/connections.c:4030
+#: ../clients/cli/connections.c:4042
 #, c-format
 msgid "Error: 'forward-delay': '%s' is not a valid number <2-30>.\n"
 msgstr "Fehler: »forward-delay«: »%s« ist keine gültige Zahl <2-30>.\n"
 
-#: ../clients/cli/connections.c:4039
+#: ../clients/cli/connections.c:4051
 msgid "Hello time [2]: "
 msgstr "Hello-Zeit [2]: "
 
-#: ../clients/cli/connections.c:4043
+#: ../clients/cli/connections.c:4055
 #, c-format
 msgid "Error: 'hello-time': '%s' is not a valid number <1-10>.\n"
 msgstr "Fehler: »hello-time«: »%s« ist keine gültige Zahl <1-10>.\n"
 
-#: ../clients/cli/connections.c:4051
+#: ../clients/cli/connections.c:4063
 msgid "Max age [20]: "
 msgstr "Maximales Alter [20]: "
 
-#: ../clients/cli/connections.c:4055
+#: ../clients/cli/connections.c:4067
 #, c-format
 msgid "Error: 'max-age': '%s' is not a valid number <6-40>.\n"
 msgstr "Fehler: »max.age«: »%s« ist keine gültige Zahl <6-40>.\n"
 
-#: ../clients/cli/connections.c:4063
+#: ../clients/cli/connections.c:4075
 msgid "MAC address ageing time [300]: "
 msgstr "Verfallszeit für MAC-Adressen [300]: "
 
-#: ../clients/cli/connections.c:4067
+#: ../clients/cli/connections.c:4079
 #, c-format
 msgid "Error: 'ageing-time': '%s' is not a valid number <0-1000000>.\n"
 msgstr "Fehler: 'ageing-time': »%s« ist keine gültige Zahl <0-1000000>.\n"
 
-#: ../clients/cli/connections.c:4076
+#: ../clients/cli/connections.c:4088
 #, c-format
 msgid "Enable IGMP snooping %s"
 msgstr "IGMP-Snooping %s aktivieren"
 
-#: ../clients/cli/connections.c:4081
+#: ../clients/cli/connections.c:4093
 #, c-format
 msgid "Error: 'multicast-snooping': %s.\n"
 msgstr "Fehler: »multicast-snooping«: %s \n"
 
 #. Ask for optional 'bridge-slave' arguments.
-#: ../clients/cli/connections.c:4108
+#: ../clients/cli/connections.c:4120
 msgid "bridge-slave"
 msgstr "Sklave der Netzwerkbrücke"
 
-#: ../clients/cli/connections.c:4113
+#: ../clients/cli/connections.c:4125
 msgid "Bridge port priority [32]: "
 msgstr "Bridge-Port-Priorität [32]: "
 
-#: ../clients/cli/connections.c:4126
+#: ../clients/cli/connections.c:4138
 msgid "Bridge port STP path cost [100]: "
 msgstr "Bridge-Port-STP-Pfadkosten [100]: "
 
-#: ../clients/cli/connections.c:4140
+#: ../clients/cli/connections.c:4152
 #, c-format
 msgid "Hairpin %s"
 msgstr "Hairpin %s"
 
-#: ../clients/cli/connections.c:4145
+#: ../clients/cli/connections.c:4157
 #, c-format
 msgid "Error: 'hairpin': %s.\n"
 msgstr "Fehler: »hairpin«: %s \n"
 
 #. Ask for optional 'olpc' arguments.
-#: ../clients/cli/connections.c:4172 ../libnm-glib/nm-device.c:1855
+#: ../clients/cli/connections.c:4184 ../libnm-glib/nm-device.c:1855
 #: ../libnm/nm-device.c:1806
 msgid "OLPC Mesh"
 msgstr "OLPC-Mesh"
 
-#: ../clients/cli/connections.c:4177
+#: ../clients/cli/connections.c:4189
 msgid "OLPC Mesh channel [1]: "
 msgstr "»OLPC Mesh« Kanal [1]: "
 
-#: ../clients/cli/connections.c:4180
+#: ../clients/cli/connections.c:4192
 #, c-format
 msgid "Error: 'channel': '%s' is not a valid number <1-13>.\n"
 msgstr "Fehler: »channel«: »%s« ist keine gültige Zahl <1-13>.\n"
 
-#: ../clients/cli/connections.c:4188
+#: ../clients/cli/connections.c:4200
 msgid "DHCP anycast MAC address [none]: "
 msgstr "DHCP anycast MAC-Adresse [keine]: "
 
 #. Ask for optional 'adsl' arguments.
-#: ../clients/cli/connections.c:4207 ../libnm-glib/nm-device.c:1871
+#: ../clients/cli/connections.c:4219 ../libnm-glib/nm-device.c:1871
 #: ../libnm/nm-device.c:1822
 msgid "ADSL"
 msgstr "ADSL"
 
-#: ../clients/cli/connections.c:4215
+#: ../clients/cli/connections.c:4227
 #, c-format
 msgid "ADSL encapsulation %s"
 msgstr "ADSL-Einkapselung %s"
 
 #. Ask for optional 'macvlan' arguments.
-#: ../clients/cli/connections.c:4233
+#: ../clients/cli/connections.c:4245
 msgid "macvlan"
 msgstr "macvlan"
 
-#: ../clients/cli/connections.c:4239
+#: ../clients/cli/connections.c:4251
 #, c-format
 msgid "Tap %s"
-msgstr ""
+msgstr "Antippen %s"
 
-#: ../clients/cli/connections.c:4244
+#: ../clients/cli/connections.c:4256
 #, c-format
 msgid "Error: 'tap': %s.\n"
 msgstr "Fehler: »tap«: %s \n"
 
 # virtuelles LAN, z.B. in virtualisierten Umgebungen
 #. Ask for optional 'vxlan' arguments.
-#: ../clients/cli/connections.c:4260 ../libnm-glib/nm-device.c:1875
+#: ../clients/cli/connections.c:4272 ../libnm-glib/nm-device.c:1875
 #: ../libnm/nm-device.c:1826
 msgid "VXLAN"
 msgstr "VXLAN"
 
-#: ../clients/cli/connections.c:4265 ../clients/cli/connections.c:4589
+#: ../clients/cli/connections.c:4277 ../clients/cli/connections.c:4601
 msgid "Parent device [none]: "
 msgstr "Übergeordnetes Gerät [keines]: "
 
-#: ../clients/cli/connections.c:4270 ../clients/cli/connections.c:4594
+#: ../clients/cli/connections.c:4282 ../clients/cli/connections.c:4606
 #, c-format
 msgid "Error: 'dev': '%s' is neither UUID nor interface name.\n"
 msgstr "Fehler: »dev«: »%s« ist weder eine UUID noch ein Schnittstellenname.\n"
 
-#: ../clients/cli/connections.c:4279
+#: ../clients/cli/connections.c:4291
 msgid "Local address [none]: "
 msgstr "Lokale Adresse [keine]: "
 
-#: ../clients/cli/connections.c:4284
+#: ../clients/cli/connections.c:4296
 #, c-format
 msgid "Error: 'local': '%s' is not a valid IP address.\n"
 msgstr "Fehler: »local«: »%s« ist keine gültige IP-Adresse.\n"
 
-#: ../clients/cli/connections.c:4293
+#: ../clients/cli/connections.c:4305
 msgid "Minimum source port [0]: "
 msgstr "Kleinster Quellport [0]: "
 
-#: ../clients/cli/connections.c:4297
-#, fuzzy, c-format
+#: ../clients/cli/connections.c:4309
+#, c-format
 msgid "Error: 'source-port-min': '%s' is not a valid number <0-65535>.\n"
-msgstr "Fehler: »priority«: »%s« ist keine gültige Zahl <0-%d>.\n"
+msgstr "Fehler: 'source-port-min': '%s' ist keine gültige Zahl <0-65535>.\n"
 
-#: ../clients/cli/connections.c:4306
+#: ../clients/cli/connections.c:4318
 msgid "Maximum source port [0]: "
 msgstr "Größter Quellport [0]: "
 
-#: ../clients/cli/connections.c:4310
+#: ../clients/cli/connections.c:4322
 #, c-format
 msgid "Error: 'source-port-max': '%s' is not a valid number <0-65535>.\n"
-msgstr "Fehler: »source-port-max«: »%s« ist keine gültige Zahl <0-65535>.\n"
+msgstr "Fehler: 'source-port-max': '%s' ist keine gültige Zahl <0-65535>.\n"
 
-#: ../clients/cli/connections.c:4319
+#: ../clients/cli/connections.c:4331
 msgid "Destination port [8472]: "
 msgstr "Zielport [8472]: "
 
-#: ../clients/cli/connections.c:4323
+#: ../clients/cli/connections.c:4335
 #, c-format
 msgid "Error: 'destination-port': '%s' is not a valid number <0-65535>.\n"
-msgstr "Fehler: »destination-port«: »%s« ist keine gültige Zahl <0-65535>.\n"
+msgstr "Fehler: 'destination-port': '%s' ist keine gültige Zahl <0-65535>.\n"
 
-#: ../clients/cli/connections.c:4362
+#: ../clients/cli/connections.c:4374
 msgid "IPv4 address (IP[/plen]) [none]: "
 msgstr "IPv4-Adresse (IP[/plen]) [keine]: "
 
-#: ../clients/cli/connections.c:4364
+#: ../clients/cli/connections.c:4376
 msgid "IPv6 address (IP[/plen]) [none]: "
 msgstr "IPv6-Adresse (IP[/plen]) [keine]: "
 
-#: ../clients/cli/connections.c:4378
+#: ../clients/cli/connections.c:4390
 #, c-format
 msgid "  Address successfully added: %s\n"
 msgstr "  Adresse erfolgreich hinzugefügt: %s\n"
 
-#: ../clients/cli/connections.c:4380
+#: ../clients/cli/connections.c:4392
 #, c-format
 msgid "  Warning: address already present: %s\n"
 msgstr "  Warnung: Adresse ist bereits vorhanden: %s\n"
 
-#: ../clients/cli/connections.c:4382
+#: ../clients/cli/connections.c:4394
 #, c-format
 msgid "  Warning: ignoring garbage at the end: '%s'\n"
 msgstr "  Warnung: der Unsinn am Ende wird ignoriert: »%s«\n"
 
-#: ../clients/cli/connections.c:4384 ../clients/cli/connections.c:5593
-#: ../clients/cli/connections.c:5640 ../clients/cli/connections.c:6562
-#: ../clients/cli/connections.c:6595
+#: ../clients/cli/connections.c:4396 ../clients/cli/connections.c:5605
+#: ../clients/cli/connections.c:5652 ../clients/cli/connections.c:6569
+#: ../clients/cli/connections.c:6602
 msgid "Error: "
 msgstr "Fehler: "
 
-#: ../clients/cli/connections.c:4404
+#: ../clients/cli/connections.c:4416
 msgid "IPv4 gateway [none]: "
 msgstr "IPv4-Gateway [keines]: "
 
-#: ../clients/cli/connections.c:4407
+#: ../clients/cli/connections.c:4419
 msgid "IPv6 gateway [none]: "
 msgstr "IPv6-Gateway [keines]: "
 
-#: ../clients/cli/connections.c:4427
+#: ../clients/cli/connections.c:4439
 #, c-format
 msgid "Error: invalid gateway address '%s'\n"
 msgstr "Fehler: Ungültige Gateway-Adresse »%s«\n"
 
 #. Ask for IP addresses
-#: ../clients/cli/connections.c:4440
+#: ../clients/cli/connections.c:4452
 #, c-format
 msgid "Do you want to add IP addresses? %s"
 msgstr "Möchten Sie die IP-Adresse hinzufügen? %s"
 
-#: ../clients/cli/connections.c:4448
+#: ../clients/cli/connections.c:4460
 #, c-format
 msgid "Press <Enter> to finish adding addresses.\n"
-msgstr ""
-"Drücken Sie die Eingabetaste, um das Hinzufügen einer Adresse "
-"abzuschließen.\n"
+msgstr "Drücken Sie <Enter> um die Adresse hinzuzufügen.\n"
 
 #. Ask for optional 'tun' arguments.
-#: ../clients/cli/connections.c:4492 ../libnm-glib/nm-device.c:1879
+#: ../clients/cli/connections.c:4504 ../libnm-glib/nm-device.c:1879
 #: ../libnm/nm-device.c:1830
 msgid "Tun"
 msgstr "Tun"
 
-#: ../clients/cli/connections.c:4497
+#: ../clients/cli/connections.c:4509
 msgid "User ID [none]: "
 msgstr "Benutzerkennung [keine]: "
 
-#: ../clients/cli/connections.c:4510
+#: ../clients/cli/connections.c:4522
 msgid "Group ID [none]: "
 msgstr "Gruppenkennung [keine]: "
 
-#: ../clients/cli/connections.c:4524
+#: ../clients/cli/connections.c:4536
 #, c-format
 msgid "Enable PI %s"
 msgstr "PI %s aktivieren"
 
-#: ../clients/cli/connections.c:4529
+#: ../clients/cli/connections.c:4541
 #, c-format
 msgid "Error: 'pi': %s.\n"
-msgstr "Fehler: »pi«: %s.\n"
+msgstr "Fehler: 'pi': %s.\n"
 
-#: ../clients/cli/connections.c:4537
+#: ../clients/cli/connections.c:4549
 #, c-format
 msgid "Enable VNET header %s"
-msgstr "VNET-Kopfbereich %s aktivieren"
+msgstr "VNET-Header %s aktivieren"
 
-#: ../clients/cli/connections.c:4542
+#: ../clients/cli/connections.c:4554
 #, c-format
 msgid "Error: 'vnet-hdr': %s.\n"
-msgstr "Fehler: »vnet-hdr«: %s.\n"
+msgstr "Fehler: 'vnet-hdr': %s.\n"
 
-#: ../clients/cli/connections.c:4550
+#: ../clients/cli/connections.c:4562
 #, c-format
 msgid "Enable multi queue %s"
-msgstr ""
+msgstr "Mehrere Warteschlangen %s aktivieren"
 
-#: ../clients/cli/connections.c:4555
+#: ../clients/cli/connections.c:4567
 #, c-format
 msgid "Error: 'multi-queue': %s.\n"
 msgstr "Fehler: »multi-queue«: %s.\n"
 
 #. Ask for optional 'ip-tunnel' arguments.
-#: ../clients/cli/connections.c:4569
+#: ../clients/cli/connections.c:4581
 msgid "IP Tunnel"
 msgstr "IP-Tunnel"
 
-#: ../clients/cli/connections.c:4574
+#: ../clients/cli/connections.c:4586
 msgid "Local endpoint [none]: "
 msgstr "Lokaler Endpunkt [keiner]: "
 
-#: ../clients/cli/connections.c:4580
+#: ../clients/cli/connections.c:4592
 #, c-format
 msgid "Error: 'local': '%s' is not valid; must be an IP address\n"
-msgstr "Fehler: »local«: »%s« ist ungültig. Es muss eine IP-Adresse sein\n"
+msgstr "Fehler: 'local': '%s' ist nicht gültig; muss eine IP-Adresse sein\n"
 
-#: ../clients/cli/connections.c:4646 ../clients/cli/connections.c:10180
+#: ../clients/cli/connections.c:4658 ../clients/cli/connections.c:10184
 #, c-format
 msgid "Error: <setting>.<property> argument is missing."
-msgstr "Fehler: Argument für Einstellung fehlt."
+msgstr "Fehler: <setting>.<property> Parameter fehlt."
 
-#: ../clients/cli/connections.c:4651
+#: ../clients/cli/connections.c:4663
 #, c-format
 msgid "Error: value for '%s' is missing."
 msgstr "Fehler: Wert für »%s« fehlt."
 
-#: ../clients/cli/connections.c:4669
+#: ../clients/cli/connections.c:4681
 #, c-format
 msgid "Error: invalid <setting>.<property> '%s'."
-msgstr "Fehler: Ungültiger Einstellungsname: »%s«."
+msgstr "Fehler: <setting> ungültig.<property> '%s'."
 
-#: ../clients/cli/connections.c:4677
+#: ../clients/cli/connections.c:4689
 #, 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:4688
+#: ../clients/cli/connections.c:4700
 #, c-format
 msgid "Error: don't know how to create '%s' setting."
 msgstr ""
 "Fehler: Es ist unbekannt, wie die Einstellung »%s« erstellt werden kann."
 
-#: ../clients/cli/connections.c:4698
+#: ../clients/cli/connections.c:4710
 #, c-format
 msgid "Error: invalid property '%s': %s."
 msgstr "Fehler: Ungültige Eigenschaft »%s«: %s."
 
-#: ../clients/cli/connections.c:4710
+#: ../clients/cli/connections.c:4722
 #, c-format
 msgid "Error: failed to modify %s.%s: %s."
 msgstr "Fehler: Ändern ist fehlgeschlagen %s.%s: %s."
 
-#: ../clients/cli/connections.c:4729
+#: ../clients/cli/connections.c:4741
 #, 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:4763
+#: ../clients/cli/connections.c:4775
 #, c-format
 msgid ""
 "Warning: 'type' is ignored. Use 'nmcli connection add \"%s\" ...' instead."
@@ -2542,330 +2516,329 @@ msgstr ""
 "Warning: »type« wird ignored. Verwenden Sie stattdessen »nmcli connection "
 "add %s …« ."
 
-#: ../clients/cli/connections.c:4771
+#: ../clients/cli/connections.c:4783
 msgid "Error: redundant 'master' option."
 msgstr "Fehler: Redundante Option »master«."
 
-#: ../clients/cli/connections.c:4784
+#: ../clients/cli/connections.c:4796
 msgid "Error: 'master' is required."
 msgstr "Fehler: »master« ist notwendig."
 
-#: ../clients/cli/connections.c:4938
+#: ../clients/cli/connections.c:4950
 #, c-format
 msgid "Error: 'parent': not valid without 'p-key'."
 msgstr "Fehler: »parent«: nicht gültig ohne »p-key«."
 
-#: ../clients/cli/connections.c:4993 ../clients/cli/connections.c:5960
+#: ../clients/cli/connections.c:5005 ../clients/cli/connections.c:5967
 msgid "SSID: "
 msgstr "SSID: "
 
-#: ../clients/cli/connections.c:4996 ../clients/cli/connections.c:5963
+#: ../clients/cli/connections.c:5008 ../clients/cli/connections.c:5970
 msgid "Error: 'ssid' is required."
 msgstr "Fehler: »SSID« ist notwendig."
 
-#: ../clients/cli/connections.c:5060
+#: ../clients/cli/connections.c:5072
 msgid "WiMAX NSP name: "
 msgstr "WiMAX NSP-Name: "
 
-#: ../clients/cli/connections.c:5063
+#: ../clients/cli/connections.c:5075
 msgid "Error: 'nsp' is required."
 msgstr "Fehler: »nsp« ist notwendig."
 
-#: ../clients/cli/connections.c:5115
+#: ../clients/cli/connections.c:5127
 msgid "PPPoE username: "
 msgstr "PPPoE Benutzername: "
 
-#: ../clients/cli/connections.c:5118 ../clients/cli/connections.c:6030
+#: ../clients/cli/connections.c:5130 ../clients/cli/connections.c:6037
 msgid "Error: 'username' is required."
 msgstr "Fehler: »username« ist notwendig."
 
-#: ../clients/cli/connections.c:5187
+#: ../clients/cli/connections.c:5199
 msgid "APN: "
 msgstr "APN: "
 
-#: ../clients/cli/connections.c:5190
+#: ../clients/cli/connections.c:5202
 msgid "Error: 'apn' is required."
 msgstr "Fehler: »apn« ist notwendig."
 
-#: ../clients/cli/connections.c:5248
+#: ../clients/cli/connections.c:5260
 msgid "Bluetooth device address: "
 msgstr "Bluetooth Geräteadresse: "
 
-#: ../clients/cli/connections.c:5251
+#: ../clients/cli/connections.c:5263
 msgid "Error: 'addr' is required."
 msgstr "Fehler: »addr« ist notwendig."
 
-#: ../clients/cli/connections.c:5292
+#: ../clients/cli/connections.c:5304
 #, c-format
 msgid "Error: 'bt-type': '%s' not valid; use [%s, %s (%s), %s]."
 msgstr ""
 "Fehler: »bt-type«: »%s« ist nicht gültig. Verwenden Sie [%s, %s (%s), %s]."
 
-#: ../clients/cli/connections.c:5336
+#: ../clients/cli/connections.c:5348
 msgid "VLAN parent device or connection UUID: "
 msgstr "Übergeordnetes VLAN-Gerät oder UUID der Verbindung: "
 
-#: ../clients/cli/connections.c:5339 ../clients/cli/connections.c:6101
+#: ../clients/cli/connections.c:5351 ../clients/cli/connections.c:6108
 msgid "Error: 'dev' is required."
 msgstr "Fehler: »dev« ist notwendig."
 
-#: ../clients/cli/connections.c:5343
+#: ../clients/cli/connections.c:5355
 msgid "VLAN ID <0-4094>: "
 msgstr "VLAN-Kennung <0-4094>: "
 
-#: ../clients/cli/connections.c:5346 ../clients/cli/connections.c:6417
+#: ../clients/cli/connections.c:5358 ../clients/cli/connections.c:6424
 msgid "Error: 'id' is required."
 msgstr "Fehler: »id« ist notwendig."
 
-#: ../clients/cli/connections.c:5352
+#: ../clients/cli/connections.c:5364
 #, c-format
 msgid "Error: 'id': '%s' is not valid; use <0-4094>."
-msgstr "Fehler: »id«: »%s« ist ungültig; Verwenden Sie <0-4094>."
+msgstr "Fehler: 'id': '%s' ist nicht gültig; verwenden Sie <0-4094>."
 
-#: ../clients/cli/connections.c:5362 ../clients/cli/connections.c:6109
+#: ../clients/cli/connections.c:5374 ../clients/cli/connections.c:6116
 #, c-format
 msgid "Error: 'dev': '%s' is neither UUID, interface name, nor MAC."
 msgstr ""
 "Fehler: »dev«: »%s« ist weder eine UUID noch ein Schnittstellenname oder "
 "eine MAC-Adresse."
 
-#: ../clients/cli/connections.c:5494
+#: ../clients/cli/connections.c:5506
 #, c-format
 msgid "Error: 'mode': %s."
 msgstr "Fehler: »mode«: %s."
 
-#: ../clients/cli/connections.c:5503
+#: ../clients/cli/connections.c:5515
 #, c-format
 msgid "Error: 'primary': '%s' is not a valid interface name."
 msgstr "Fehler: »primary«: »%s« ist kein gültiger Name einer Schnittstelle."
 
-#: ../clients/cli/connections.c:5726
+#: ../clients/cli/connections.c:5738
 #, c-format
 msgid "Error: 'stp': %s."
 msgstr "Fehler: »stp«: %s."
 
-#: ../clients/cli/connections.c:5735
+#: ../clients/cli/connections.c:5747
 #, c-format
 msgid "Error: 'multicast-snooping': %s."
 msgstr "Fehler: »multicast-snooping«: %s."
 
-#: ../clients/cli/connections.c:5854
+#: ../clients/cli/connections.c:5866
 #, c-format
 msgid "Error: 'hairpin': %s."
 msgstr "Fehler: »hairpin«: %s."
 
-#: ../clients/cli/connections.c:5905
+#: ../clients/cli/connections.c:5915
 msgid "Error: 'vpn-type' is required."
 msgstr "Fehler: »vpn-type« ist notwendig."
 
-#: ../clients/cli/connections.c:5913
+#: ../clients/cli/connections.c:5922
 #, c-format
 msgid "Warning: 'vpn-type': %s not known.\n"
 msgstr "Warnung: »vpn-type«: %s ist unbekannt. \n"
 
-#: ../clients/cli/connections.c:5976
+#: ../clients/cli/connections.c:5983
 #, c-format
 msgid "Error: 'channel': '%s' is not valid; use <1-13>."
 msgstr "Fehler: »channel«: »%s« ist ungültig. Verwenden Sie <1-13>."
 
-#: ../clients/cli/connections.c:6027
+#: ../clients/cli/connections.c:6034
 msgid "Username: "
 msgstr "Benutzername: "
 
-#: ../clients/cli/connections.c:6036
+#: ../clients/cli/connections.c:6043
 #, c-format
 msgid "Protocol %s"
 msgstr "Protokoll: %s"
 
-#: ../clients/cli/connections.c:6039
+#: ../clients/cli/connections.c:6046
 msgid "Error: 'protocol' is required."
 msgstr "Fehler: »protocol« ist notwendig."
 
-#: ../clients/cli/connections.c:6098
+#: ../clients/cli/connections.c:6105
 msgid "MACVLAN parent device or connection UUID: "
-msgstr "Übergeordnetes MACVLAN-Gerät oder UUID der Verbindung: "
+msgstr "MACVLAN übergeordnetes Gerät oder Verbindungs-UUID: "
 
-#: ../clients/cli/connections.c:6118 ../clients/cli/connections.c:6198
-#: ../clients/cli/connections.c:6300
+#: ../clients/cli/connections.c:6125 ../clients/cli/connections.c:6205
+#: ../clients/cli/connections.c:6307
 msgid "Error: 'mode' is required."
-msgstr "Fehler: »mode« ist notwendig."
+msgstr "Fehler: 'mode' ist notwendig."
 
-#: ../clients/cli/connections.c:6124
+#: ../clients/cli/connections.c:6131
 msgid "Error: 'mode' is not valid."
 msgstr "Fehler: »modus« ist ungültig."
 
-#: ../clients/cli/connections.c:6137
+#: ../clients/cli/connections.c:6144
 #, c-format
 msgid "Error: 'tap': %s."
 msgstr "Fehler: »tap«: %s."
 
-#: ../clients/cli/connections.c:6223
+#: ../clients/cli/connections.c:6230
 #, c-format
 msgid "Error: 'pi': %s."
 msgstr "Fehler: »pi«: %s."
 
-#: ../clients/cli/connections.c:6234
+#: ../clients/cli/connections.c:6241
 #, c-format
 msgid "Error: 'vnet-hdr': %s."
 msgstr "Fehler: »vnet-hdr«: %s."
 
-#: ../clients/cli/connections.c:6245
+#: ../clients/cli/connections.c:6252
 #, c-format
 msgid "Error: 'multi-queue': %s."
 msgstr "Fehler: »multi-queue«: %s."
 
-#: ../clients/cli/connections.c:6314
+#: ../clients/cli/connections.c:6321
 #, c-format
 msgid "Error: 'mode': '%s' is not valid, use one of %s"
 msgstr "Fehler: »mode«: »%s« ist ungültig. Verwenden Sie eines von %s"
 
-#: ../clients/cli/connections.c:6320
+#: ../clients/cli/connections.c:6327
 msgid "Remote endpoint: "
 msgstr "Entfernter Endpunkt: "
 
-#: ../clients/cli/connections.c:6323 ../clients/cli/connections.c:6425
+#: ../clients/cli/connections.c:6330 ../clients/cli/connections.c:6432
 msgid "Error: 'remote' is required."
 msgstr "Fehler: »remote« ist notwendig."
 
-#: ../clients/cli/connections.c:6330
+#: ../clients/cli/connections.c:6337
 #, c-format
 msgid "Error: 'remote': '%s' is not valid; must be an IP address"
 msgstr "Fehler: »remote«: »%s« ist ungültig. Es muss eine IP-Adresse sein"
 
-#: ../clients/cli/connections.c:6344
+#: ../clients/cli/connections.c:6351
 #, c-format
 msgid "Error: 'local': '%s' is not valid; must be an IP address"
 msgstr "Fehler: »local«: »%s« ist ungültig. Es muss eine IP-Adresse sein"
 
-#: ../clients/cli/connections.c:6353 ../clients/cli/connections.c:6448
+#: ../clients/cli/connections.c:6360 ../clients/cli/connections.c:6455
 #, c-format
 msgid "Error: 'dev': '%s' is neither UUID nor interface name."
-msgstr "Fehler: »dev«: »%s« ist weder eine UUID noch ein Schnittstellenname."
+msgstr "Fehler: 'dev': '%s' ist weder UUID noch Schnittstellenname."
 
-#: ../clients/cli/connections.c:6414
+#: ../clients/cli/connections.c:6421
 msgid "VXLAN ID: "
 msgstr "VXLAN-Kennung: "
 
-#: ../clients/cli/connections.c:6422
+#: ../clients/cli/connections.c:6429
 msgid "Remote: "
 msgstr "Gegenstelle: "
 
-#: ../clients/cli/connections.c:6431
+#: ../clients/cli/connections.c:6438
 #, c-format
 msgid "Error: 'id': '%s' is not valid; use <0-16777215>."
-msgstr "Fehler: »id«: »%s« ist ungültig; verwenden Sie <0-16777215>."
+msgstr "Fehler: 'id': '%s' ist nicht gültig; verwenden Sie <0-16777215>."
 
-#: ../clients/cli/connections.c:6457
+#: ../clients/cli/connections.c:6464
 #, c-format
 msgid "Error: 'remote': '%s' is not a valid IP address"
-msgstr "Fehler: »remote«: »%s« ist keine gültige IP-Adresse"
+msgstr "Fehler: 'remote': '%s' ist keine gültige IP-Adresse"
 
-#: ../clients/cli/connections.c:6466
+#: ../clients/cli/connections.c:6473
 #, c-format
 msgid "Error: 'local': '%s' is not a valid IP address"
-msgstr "Fehler: »local«: »%s« ist keine gültige IP-Adresse"
+msgstr "Fehler: 'local': '%s' ist keine gültige IP-Adresse"
 
-#: ../clients/cli/connections.c:6475
+#: ../clients/cli/connections.c:6482
 #, c-format
 msgid "Error: 'source-port-min': %s is not valid; use <0-65535>."
-msgstr "Fehler: »source-port-min«: »%s« ist ungültig; verwenden Sie <0-65535>."
+msgstr "Fehler: 'source-port-min': %s ist ungültig; verwenden Sie <0-65535>."
 
-#: ../clients/cli/connections.c:6484
+#: ../clients/cli/connections.c:6491
 #, c-format
 msgid "Error: 'source-port-max': %s is not valid; use <0-65535>."
-msgstr "Fehler: »source-port-max«: »%s« ist ungültig. Verwenden Sie <0-65535>."
+msgstr "Fehler: 'source-port-max': %s ist ungültig; verwenden Sie <0-65535>."
 
-#: ../clients/cli/connections.c:6493
+#: ../clients/cli/connections.c:6500
 #, c-format
 msgid "Error: 'destination-port': %s is not valid; use <0-65535>."
-msgstr ""
-"Fehler: »destination-port«: »%s« ist ungültig; verwenden Sie <0-65535>."
+msgstr "Fehler: 'destination-port': %s ist ungültig; verwenden Sie <0-65535>."
 
-#: ../clients/cli/connections.c:6533
+#: ../clients/cli/connections.c:6540
 #, c-format
 msgid "Error: '%s' is not a valid connection type."
 msgstr "Fehler: »%s« ist kein gültiger Verbindungstyp."
 
-#: ../clients/cli/connections.c:6574
+#: ../clients/cli/connections.c:6581
 #, c-format
 msgid "Error: IPv4 gateway specified without IPv4 addresses"
 msgstr "Fehler: IPv4-Gateway wurde ohne IPv4-Adresse angegeben"
 
-#: ../clients/cli/connections.c:6578
+#: ../clients/cli/connections.c:6585
 #, c-format
 msgid "Error: multiple IPv4 gateways specified"
 msgstr "Fehler: Es wurden mehrere IPv4-Gateways angegeben"
 
-#: ../clients/cli/connections.c:6582
+#: ../clients/cli/connections.c:6589
 #, c-format
 msgid "Error: Invalid IPv4 gateway '%s'"
 msgstr "Fehler: Ungültiges IPv4-Gateway »%s«"
 
-#: ../clients/cli/connections.c:6607
+#: ../clients/cli/connections.c:6614
 #, c-format
 msgid "Error: IPv6 gateway specified without IPv6 addresses"
 msgstr "Fehler: IPv6-Gateway wurde ohne IPv6-Adresse angegeben"
 
-#: ../clients/cli/connections.c:6611
+#: ../clients/cli/connections.c:6618
 #, c-format
 msgid "Error: multiple IPv6 gateways specified"
 msgstr "Fehler: Es wurden mehrere IPv6-Gateways angegeben"
 
-#: ../clients/cli/connections.c:6615
+#: ../clients/cli/connections.c:6622
 #, c-format
 msgid "Error: Invalid IPv6 gateway '%s'"
 msgstr "Fehler: Ungültiges IPv6-Gateway »%s«"
 
-#: ../clients/cli/connections.c:6663 ../clients/cli/connections.c:10219
+#: ../clients/cli/connections.c:6670 ../clients/cli/connections.c:10223
 #, c-format
 msgid "Error: Failed to add '%s' connection: %s"
 msgstr "Fehler: Verbindung »%s« konnte nicht hinzugefügt werden: %s"
 
-#: ../clients/cli/connections.c:6668
+#: ../clients/cli/connections.c:6675
 #, c-format
 msgid "Connection '%s' (%s) successfully added.\n"
 msgstr "Verbindung »%s« (%s) erfolgreich hinzugefügt.\n"
 
-#: ../clients/cli/connections.c:6947 ../clients/cli/connections.c:10674
+#: ../clients/cli/connections.c:6951 ../clients/cli/connections.c:10678
 #, c-format
 msgid "Error: 'type' argument is required."
 msgstr "Fehler: Das Argument »type« ist notwendig."
 
-#: ../clients/cli/connections.c:6955
+#: ../clients/cli/connections.c:6959
 #, c-format
 msgid "Error: invalid connection type; %s."
 msgstr "Fehler: Unbekannter Verbindungstyp: %s."
 
-#: ../clients/cli/connections.c:6964 ../clients/cli/devices.c:2222
+#: ../clients/cli/connections.c:6968 ../clients/cli/devices.c:2164
 #, c-format
 msgid "Error: 'autoconnect': %s."
 msgstr "Fehler: »autoconnect«: %s."
 
-#: ../clients/cli/connections.c:6974
+#: ../clients/cli/connections.c:6978
 #, c-format
 msgid "Error: 'save': %s."
 msgstr "Fehler: »save«: %s."
 
-#: ../clients/cli/connections.c:6991
+#: ../clients/cli/connections.c:6995
 msgid "Interface name [*]: "
 msgstr "Schnittstellenname [*]: "
 
-#: ../clients/cli/connections.c:6996
+#: ../clients/cli/connections.c:7000
 #, c-format
 msgid "Error: 'ifname' argument is required."
 msgstr "Fehler: Das Argument »ifname« ist notwendig."
 
-#: ../clients/cli/connections.c:6998
+#: ../clients/cli/connections.c:7002
 #, c-format
 msgid "Error: mandatory 'ifname' not seen before '%s'."
 msgstr "Fehler: Erforderliches »ifconfig« nicht vor »%s« vorhanden."
 
-#: ../clients/cli/connections.c:7007
+#: ../clients/cli/connections.c:7011
 #, c-format
 msgid "Error: 'ifname': '%s' is not a valid interface nor '*'."
 msgstr "Fehler: »ifname«: »%s« ist weder eine gültige Schnittstelle noch »*«."
 
-#: ../clients/cli/connections.c:8031
+#: ../clients/cli/connections.c:8035
 #, c-format
 msgid "['%s' setting values]\n"
 msgstr "['%s' Werte werden gesetzt]\n"
@@ -2873,8 +2846,8 @@ msgstr "['%s' Werte werden gesetzt]\n"
 # Ausrichtung mit Leerzeichen an der zweitlängsten Zeile.
 #. TRANSLATORS: do not translate command names and keywords before ::
 #. *              However, you should translate terms enclosed in <>.
-#.
-#: ../clients/cli/connections.c:8113
+#. 
+#: ../clients/cli/connections.c:8117
 #, c-format
 msgid ""
 "---[ Main menu ]---\n"
@@ -2897,8 +2870,7 @@ msgstr ""
 "Eigenschaft wechseln\n"
 "remove   <Einstellung>[.<Eigenschaft>] | <Eigenschaft> :: Einstellung "
 "entfernen oder Eigenschaftswert zurücksetzen\n"
-"set      [<Einstellung>.<Eigenschaft> <Wert>]  :: Eigenschaftswert "
-"festlegen\n"
+"set      [<Einstellung>.<Eigenschaft> <Wert>]  :: Eigenschaftswert festlegen\n"
 "describe [<Einstellung>.<Eigenschaft>]         :: Eigenschaft beschreiben\n"
 "print    [all | <Einstellung>[.<Eigenschaft>]] :: Die Verbindung ausgeben\n"
 "verify   [all | fix]                           :: Die Verbindung prüfen\n"
@@ -2910,7 +2882,7 @@ msgstr ""
 "nmcli    <conf-option> <Wert>                  :: nmcli-Konfiguration\n"
 "quit                                           :: nmcli beenden\n"
 
-#: ../clients/cli/connections.c:8140
+#: ../clients/cli/connections.c:8144
 #, c-format
 msgid ""
 "goto <setting>[.<prop>] | <prop>  :: enter setting/property for editing\n"
@@ -2930,13 +2902,12 @@ msgstr ""
 "           nmcli connection> goto secondaries\n"
 "           nmcli> goto ipv4.addresses\n"
 
-#: ../clients/cli/connections.c:8147
+#: ../clients/cli/connections.c:8151
 #, c-format
 msgid ""
 "remove <setting>[.<prop>]  :: remove setting or reset property value\n"
 "\n"
-"This command removes an entire setting from the connection, or if a "
-"property\n"
+"This command removes an entire setting from the connection, or if a property\n"
 "is given, resets that property to the default value.\n"
 "\n"
 "Examples: nmcli> remove wifi-sec\n"
@@ -2952,7 +2923,7 @@ msgstr ""
 "Beispiele: nmcli> remove wifi-sec\n"
 "           nmcli> remove eth.mtu\n"
 
-#: ../clients/cli/connections.c:8154
+#: ../clients/cli/connections.c:8158
 #, c-format
 msgid ""
 "set [<setting>.<prop> <value>]  :: set property value\n"
@@ -2967,7 +2938,7 @@ msgstr ""
 "\n"
 "Beispiel: nmcli> s con.id Meine Verbindung\n"
 
-#: ../clients/cli/connections.c:8159
+#: ../clients/cli/connections.c:8163
 #, c-format
 msgid ""
 "describe [<setting>.<prop>]  :: describe property\n"
@@ -2980,7 +2951,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:8164
+#: ../clients/cli/connections.c:8168
 #, c-format
 msgid ""
 "print [all]  :: print setting or connection values\n"
@@ -2995,14 +2966,13 @@ msgstr ""
 "\n"
 "Beispiel: nmcli ipv4> print all\n"
 
-#: ../clients/cli/connections.c:8169
+#: ../clients/cli/connections.c:8173
 #, c-format
 msgid ""
 "verify [all | fix]  :: verify setting or connection validity\n"
 "\n"
 "Verifies whether the setting or connection is valid and can be saved later.\n"
-"It indicates invalid values on error. Some errors may be fixed "
-"automatically\n"
+"It indicates invalid values on error. Some errors may be fixed automatically\n"
 "by 'fix' option.\n"
 "\n"
 "Examples: nmcli> verify\n"
@@ -3021,7 +2991,7 @@ msgstr ""
 "           nmcli> verify fix\n"
 "           nmcli bond> verify\n"
 
-#: ../clients/cli/connections.c:8178
+#: ../clients/cli/connections.c:8182
 #, c-format
 msgid ""
 "save [persistent|temporary]  :: save the connection\n"
@@ -3048,7 +3018,7 @@ msgstr ""
 "Verbindung volständig löschen möchten, so muss das Verbindungsprofil\n"
 "gelöscht werden.\n"
 
-#: ../clients/cli/connections.c:8189
+#: ../clients/cli/connections.c:8193
 #, c-format
 msgid ""
 "activate [<ifname>] [/<ap>|<nsp>]  :: activate the connection\n"
@@ -3070,25 +3040,21 @@ msgstr ""
 "/<Zugriffspunkt>|<nsp> - Zugriffspunkt (WLAN) oder NSP (WiMAX) (stellen Sie "
 "»/« voraus wenn <Schnittstelle> nicht angegeben wird)\n"
 
-#: ../clients/cli/connections.c:8196 ../clients/cli/connections.c:8355
+#: ../clients/cli/connections.c:8200 ../clients/cli/connections.c:8359
 #, c-format
-msgid ""
-"back  :: go to upper menu level\n"
+msgid "back  :: go to upper menu level\n"
 "\n"
-msgstr ""
-"back :: Eine Menüebene nach oben gehen\n"
+msgstr "back :: Eine Menüebene nach oben gehen\n"
 "\n"
 
-#: ../clients/cli/connections.c:8199
+#: ../clients/cli/connections.c:8203
 #, c-format
-msgid ""
-"help/? [<command>]  :: help for the nmcli commands\n"
+msgid "help/? [<command>]  :: help for the nmcli commands\n"
 "\n"
-msgstr ""
-"help/? [<command>]  :: Hilfe zu den nmcli-Befehlen\n"
+msgstr "help/? [<command>]  :: Hilfe zu den nmcli-Befehlen\n"
 "\n"
 
-#: ../clients/cli/connections.c:8202
+#: ../clients/cli/connections.c:8206
 #, c-format
 msgid ""
 "nmcli [<conf-option> <value>]  :: nmcli configuration\n"
@@ -3115,7 +3081,7 @@ msgstr ""
 "           nmcli> nmcli save-confirmation no\n"
 "           nmcli> nmcli prompt-color 3\n"
 
-#: ../clients/cli/connections.c:8224 ../clients/cli/connections.c:8361
+#: ../clients/cli/connections.c:8228 ../clients/cli/connections.c:8365
 #, c-format
 msgid ""
 "quit  :: exit nmcli\n"
@@ -3128,16 +3094,16 @@ 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:8229 ../clients/cli/connections.c:8366
-#: ../clients/cli/connections.c:8790 ../clients/cli/connections.c:9738
+#: ../clients/cli/connections.c:8233 ../clients/cli/connections.c:8370
+#: ../clients/cli/connections.c:8794 ../clients/cli/connections.c:9742
 #, c-format
 msgid "Unknown command: '%s'\n"
 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:8295
+#. 
+#: ../clients/cli/connections.c:8299
 #, c-format
 msgid ""
 "---[ Property menu ]---\n"
@@ -3166,7 +3132,7 @@ msgstr ""
 "ausgeben\n"
 "quit                             :: nmcli beenden\n"
 
-#: ../clients/cli/connections.c:8320
+#: ../clients/cli/connections.c:8324
 #, c-format
 msgid ""
 "set [<value>]  :: set new value\n"
@@ -3177,7 +3143,7 @@ msgstr ""
 "\n"
 "Dieser Befehl setzt den <Wert> für die Eigenschaft\n"
 
-#: ../clients/cli/connections.c:8324
+#: ../clients/cli/connections.c:8328
 #, c-format
 msgid ""
 "add [<value>]  :: append new value to the property\n"
@@ -3192,7 +3158,7 @@ msgstr ""
 "die Eigenschaft ein Container-Typ ist. Für einwertige Eigenschaften wird der "
 "Wert ersetzt (genau wie »set«).\n"
 
-#: ../clients/cli/connections.c:8330
+#: ../clients/cli/connections.c:8334
 #, c-format
 msgid ""
 "change  :: change current value\n"
@@ -3203,7 +3169,7 @@ msgstr ""
 "\n"
 "Zeigt den aktuellen Wert an und lässt ihn bearbeiten.\n"
 
-#: ../clients/cli/connections.c:8334
+#: ../clients/cli/connections.c:8338
 #, c-format
 msgid ""
 "remove [<value>|<index>|<option name>]  :: delete the value\n"
@@ -3238,7 +3204,7 @@ msgstr ""
 "          nmcli bond.options> remove downdelay\n"
 "\n"
 
-#: ../clients/cli/connections.c:8345
+#: ../clients/cli/connections.c:8349
 #, c-format
 msgid ""
 "describe  :: describe property\n"
@@ -3249,10 +3215,10 @@ msgstr ""
 "describe  :: die Eigenschaft erklären\n"
 "\n"
 "Zeigt die Beschreibung für die Eigenschaft. Sie können im Handbuch »nm-"
-"settings(5)« alle NetworkManager- Einstellungen und Eigenschaften "
-"nachlesen.\n"
+"settings(5)« alle NetworkManager- Einstellungen und Eigenschaften nachlesen."
+"\n"
 
-#: ../clients/cli/connections.c:8350
+#: ../clients/cli/connections.c:8354
 #, c-format
 msgid ""
 "print [property|setting|connection]  :: print property (setting, connection) "
@@ -3267,35 +3233,39 @@ 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:8358
+#: ../clients/cli/connections.c:8362
 #, c-format
-msgid ""
-"help/? [<command>]  :: help for nmcli commands\n"
+msgid "help/? [<command>]  :: help for nmcli commands\n"
 "\n"
-msgstr ""
-"help/? [<command>]  :: Hilfe zu den nmcli-Befehlen\n"
+msgstr "help/? [<command>]  :: Hilfe zu den nmcli-Befehlen\n"
 "\n"
 
-#: ../clients/cli/connections.c:8539
+#: ../clients/cli/connections.c:8460
+#, c-format
+msgid "Error: Connection activation failed.\n"
+msgstr "Fehler: Aktivierung der Verbindung ist gescheitert.\n"
+
+#: ../clients/cli/connections.c:8543
 #, c-format
 msgid "Error: setting '%s' is mandatory and cannot be removed.\n"
 msgstr ""
-"Fehler: Die Einstellung »%s« ist erforderlich und kann nicht entfernt "
-"werden.\n"
+"Fehler: Die Einstellung »%s« ist erforderlich und kann nicht entfernt werden."
+"\n"
 
 #. TRANSLATORS: status line in nmcli connection editor
-#: ../clients/cli/connections.c:8557
+#: ../clients/cli/connections.c:8561
 #, 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:8593
+#: ../clients/cli/connections.c:8597
 #, 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"
+"Die Verbindung wurde noch nicht gespeichert. Möchten Sie wirklich beenden? "
+"%s"
 
-#: ../clients/cli/connections.c:8642
+#: ../clients/cli/connections.c:8646
 #, c-format
 msgid ""
 "The connection profile has been removed from another client. You may type "
@@ -3304,66 +3274,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:8667 ../clients/cli/connections.c:9089
-#: ../clients/cli/connections.c:9147
+#: ../clients/cli/connections.c:8671 ../clients/cli/connections.c:9093
+#: ../clients/cli/connections.c:9151
 #, c-format
 msgid "Allowed values for '%s' property: %s\n"
 msgstr "Gültige Werte für Eigenschaft »%s«: %s\n"
 
-#: ../clients/cli/connections.c:8671 ../clients/cli/connections.c:9093
-#: ../clients/cli/connections.c:9151
+#: ../clients/cli/connections.c:8675 ../clients/cli/connections.c:9097
+#: ../clients/cli/connections.c:9155
 #, c-format
 msgid "Enter '%s' value: "
 msgstr "Geben Sie den Wert »%s« ein:"
 
-#: ../clients/cli/connections.c:8686 ../clients/cli/connections.c:8708
-#: ../clients/cli/connections.c:9097 ../clients/cli/connections.c:9156
+#: ../clients/cli/connections.c:8690 ../clients/cli/connections.c:8712
+#: ../clients/cli/connections.c:9101 ../clients/cli/connections.c:9160
 #, 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:8702
+#: ../clients/cli/connections.c:8706
 #, c-format
 msgid "Edit '%s' value: "
 msgstr "Bearbeiten Sie den Wert »%s«:"
 
-#: ../clients/cli/connections.c:8731
+#: ../clients/cli/connections.c:8735
 #, c-format
 msgid "Error: %s\n"
 msgstr "Fehler: %s\n"
 
-#: ../clients/cli/connections.c:8737 ../clients/cli/connections.c:9238
-#: ../clients/cli/connections.c:9286
+#: ../clients/cli/connections.c:8741 ../clients/cli/connections.c:9242
+#: ../clients/cli/connections.c:9290
 #, 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:8758
+#: ../clients/cli/connections.c:8762
 #, c-format
 msgid "Unknown command argument: '%s'\n"
 msgstr "Unbekanntes Befehlsargument: »%s«\n"
 
-#: ../clients/cli/connections.c:8863
+#: ../clients/cli/connections.c:8867
 #, c-format
 msgid "Available settings: %s\n"
 msgstr "Verfügbare Einstellungen: %s\n"
 
-#: ../clients/cli/connections.c:8875
+#: ../clients/cli/connections.c:8879
 #, c-format
 msgid "Error: invalid setting name; %s\n"
 msgstr "Fehler: Ungültiger Einstellungsname: %s\n"
 
-#: ../clients/cli/connections.c:8892
+#: ../clients/cli/connections.c:8896
 #, c-format
 msgid "Available properties: %s\n"
 msgstr "Verfügbare Eigenschaften: %s\n"
 
-#: ../clients/cli/connections.c:8900
+#: ../clients/cli/connections.c:8904
 #, c-format
 msgid "Error: property %s\n"
 msgstr "Fehler: Eigenschaft »%s«\n"
 
-#: ../clients/cli/connections.c:8941
+#: ../clients/cli/connections.c:8945
 #, c-format
 msgid ""
 "Saving the connection with 'autoconnect=yes'. That might result in an "
@@ -3374,12 +3344,12 @@ msgstr ""
 "gespeichert. Dadurch könnte die Verbindung sofort aktiviert werden.\n"
 "Möchten Sie wirklich speichern? %s"
 
-#: ../clients/cli/connections.c:9031
+#: ../clients/cli/connections.c:9035
 #, 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:9059
+#: ../clients/cli/connections.c:9063
 #, c-format
 msgid ""
 "The connection profile has been removed from another client. You may type "
@@ -3388,223 +3358,223 @@ msgstr ""
 "Das Verbindungsprofil wurde von einem anderen Client gelöscht. Sie können "
 "»save« eingeben, um es wiederherzustellen.\n"
 
-#: ../clients/cli/connections.c:9101 ../clients/cli/connections.c:9331
+#: ../clients/cli/connections.c:9105 ../clients/cli/connections.c:9335
 #, 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:9102
+#: ../clients/cli/connections.c:9106
 #, 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:9116 ../clients/cli/connections.c:9265
-#: ../clients/cli/connections.c:9353
+#: ../clients/cli/connections.c:9120 ../clients/cli/connections.c:9269
+#: ../clients/cli/connections.c:9357
 #, 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:9126
+#: ../clients/cli/connections.c:9130
 #, c-format
 msgid "Error: missing setting for '%s' property\n"
 msgstr "Fehler: Fehlende Einstellung für die Eigenschaft »%s«\n"
 
-#: ../clients/cli/connections.c:9133
+#: ../clients/cli/connections.c:9137
 #, c-format
 msgid "Error: invalid property: %s\n"
 msgstr "Fehler: Ungültige Eigenschaft: %s\n"
 
-#: ../clients/cli/connections.c:9186
+#: ../clients/cli/connections.c:9190
 #, c-format
 msgid "Error: unknown setting '%s'\n"
 msgstr "Fehler: Unbekannte Einstellung »%s«\n"
 
-#: ../clients/cli/connections.c:9199
+#: ../clients/cli/connections.c:9203
 #, 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:9243
+#: ../clients/cli/connections.c:9247
 #, 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:9262
+#: ../clients/cli/connections.c:9266
 #, 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:9307
+#: ../clients/cli/connections.c:9311
 #, 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:9332
+#: ../clients/cli/connections.c:9336
 #, 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:9381
+#: ../clients/cli/connections.c:9385
 #, 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:9413
+#: ../clients/cli/connections.c:9417
 #, c-format
 msgid "Error: unknown setting: '%s'\n"
 msgstr "Fehler: Unbekannte Einstellung: »%s«\n"
 
-#: ../clients/cli/connections.c:9418
+#: ../clients/cli/connections.c:9422
 #, 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:9446
+#: ../clients/cli/connections.c:9450
 #, c-format
 msgid "Error: invalid property: %s%s\n"
 msgstr "Fehler: ungültige Eigenschaft %s%s\n"
 
-#: ../clients/cli/connections.c:9448
+#: ../clients/cli/connections.c:9452
 msgid ", neither a valid setting name"
 msgstr ", noch ein gültiger Einstellungsname"
 
-#: ../clients/cli/connections.c:9465
+#: ../clients/cli/connections.c:9469
 #, c-format
 msgid "Invalid verify option: %s\n"
 msgstr "Ungültige Prüfungsoption: %s\n"
 
-#: ../clients/cli/connections.c:9473
+#: ../clients/cli/connections.c:9477
 #, c-format
 msgid "Verify setting '%s': %s\n"
 msgstr "Überprüfe Einstellung »%s«: %s\n"
 
-#: ../clients/cli/connections.c:9488
+#: ../clients/cli/connections.c:9492
 #, c-format
 msgid "Verify connection: %s\n"
 msgstr "Verbindung überprüfen: %s\n"
 
-#: ../clients/cli/connections.c:9491
+#: ../clients/cli/connections.c:9495
 #, c-format
 msgid "The error cannot be fixed automatically.\n"
 msgstr "Der Fehler kann nicht automatisch behoben werden.\n"
 
-#: ../clients/cli/connections.c:9508
+#: ../clients/cli/connections.c:9512
 #, c-format
 msgid "Error: invalid argument '%s'\n"
 msgstr "Fehler: Ungültiges Argument »%s«\n"
 
-#: ../clients/cli/connections.c:9541
+#: ../clients/cli/connections.c:9545
 #, 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:9548
+#: ../clients/cli/connections.c:9552
 #, c-format
 msgid "Connection '%s' (%s) successfully saved.\n"
 msgstr "Verbindung »%s« (%s) erfolgreich gespeichert.\n"
 
-#: ../clients/cli/connections.c:9549
+#: ../clients/cli/connections.c:9553
 #, c-format
 msgid "Connection '%s' (%s) successfully updated.\n"
 msgstr "Verbindung »%s« (%s) erfolgreich aktualisiert.\n"
 
-#: ../clients/cli/connections.c:9582
+#: ../clients/cli/connections.c:9586
 #, c-format
 msgid "Error: connection verification failed: %s\n"
 msgstr "Fehler: Prüfung der Verbindung ist fehlgeschlagen: %s\n"
 
-#: ../clients/cli/connections.c:9583
+#: ../clients/cli/connections.c:9587
 msgid "(unknown error)"
 msgstr "(Unbekannter Fehler)"
 
-#: ../clients/cli/connections.c:9584
+#: ../clients/cli/connections.c:9588
 #, c-format
 msgid "You may try running 'verify fix' to fix errors.\n"
-msgstr ""
+msgstr "Versuchen Sie 'verify fix' zur Fehlerbehebung auszuführen.\n"
 
-#: ../clients/cli/connections.c:9606
+#: ../clients/cli/connections.c:9610
 #, 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:9610
+#: ../clients/cli/connections.c:9614
 #, c-format
 msgid "Error: connection is not valid: %s\n"
 msgstr "Fehler: Verbindung ist ungültig: %s\n"
 
-#: ../clients/cli/connections.c:9620
+#: ../clients/cli/connections.c:9624
 #, c-format
 msgid "Error: Cannot activate connection: %s.\n"
 msgstr "Fehler: Verbindung kann nicht aktiviert werden: %s.\n"
 
-#: ../clients/cli/connections.c:9630
+#: ../clients/cli/connections.c:9634
 #, 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:9636
+#: ../clients/cli/connections.c:9640
 #, c-format
 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:9674
+#: ../clients/cli/connections.c:9678
 #, c-format
 msgid "Error: status-line: %s\n"
 msgstr "Fehler: Statuszeile: %s\n"
 
-#: ../clients/cli/connections.c:9682
+#: ../clients/cli/connections.c:9686
 #, c-format
 msgid "Error: save-confirmation: %s\n"
 msgstr "Fehler: Speicherbestätigung: %s\n"
 
-#: ../clients/cli/connections.c:9690
+#: ../clients/cli/connections.c:9694
 #, c-format
 msgid "Error: show-secrets: %s\n"
 msgstr "Fehler: »show-secrets«: %s\n"
 
-#: ../clients/cli/connections.c:9699
+#: ../clients/cli/connections.c:9703
 #, c-format
 msgid "Error: bad color: %s\n"
 msgstr "Fehler: Falsche Farbe: %s\n"
 
-#: ../clients/cli/connections.c:9713
+#: ../clients/cli/connections.c:9717
 #, c-format
 msgid "Current nmcli configuration:\n"
 msgstr "Aktuelle nmcli-Konfiguration:\n"
 
-#: ../clients/cli/connections.c:9723
+#: ../clients/cli/connections.c:9727
 #, c-format
 msgid "Invalid configuration option '%s'; allowed [%s]\n"
 msgstr "Ungültige Konfigurationsoption »%s«. Gültig sind [%s]\n"
 
-#: ../clients/cli/connections.c:9978
+#: ../clients/cli/connections.c:9982
 #, 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:9990 ../clients/cli/connections.c:10167
-#: ../clients/cli/connections.c:10174 ../clients/cli/connections.c:10302
-#: ../clients/cli/connections.c:10778
+#: ../clients/cli/connections.c:9994 ../clients/cli/connections.c:10171
+#: ../clients/cli/connections.c:10178 ../clients/cli/connections.c:10306
+#: ../clients/cli/connections.c:10782
 #, c-format
 msgid "Error: Unknown connection '%s'."
 msgstr "Fehler: Unbekannte Verbindung »%s«."
 
-#: ../clients/cli/connections.c:10008
+#: ../clients/cli/connections.c:10012
 #, 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:10011
+#: ../clients/cli/connections.c:10015
 #, c-format
 msgid ""
 "Warning: editing existing connection '%s'; 'con-name' argument is ignored\n"
@@ -3612,224 +3582,224 @@ msgstr ""
 "Warnung: bestehende Verbindung »%s« wird bearbeitet. Das Argument »con-name« "
 "wird ignoriert\n"
 
-#: ../clients/cli/connections.c:10025
+#: ../clients/cli/connections.c:10029
 #, c-format
 msgid "Valid connection types: %s\n"
 msgstr "Gültige Verbindungstypen: %s\n"
 
-#: ../clients/cli/connections.c:10027
+#: ../clients/cli/connections.c:10031
 #, c-format
 msgid "Error: invalid connection type; %s\n"
 msgstr "Fehler: Ungültiger Verbindungstyp: %s\n"
 
-#: ../clients/cli/connections.c:10066
+#: ../clients/cli/connections.c:10070
 #, c-format
 msgid "===| nmcli interactive connection editor |==="
 msgstr "===| nmcli interaktiver Verbindungs-Editor |==="
 
-#: ../clients/cli/connections.c:10069
+#: ../clients/cli/connections.c:10073
 #, c-format
 msgid "Editing existing '%s' connection: '%s'"
 msgstr "Bestehende Verbindung »%s« wird bearbeitet: »%s«"
 
-#: ../clients/cli/connections.c:10071
+#: ../clients/cli/connections.c:10075
 #, c-format
 msgid "Adding a new '%s' connection"
 msgstr "Neue »%s«-Verbindung hinzufügen"
 
-#: ../clients/cli/connections.c:10073
+#: ../clients/cli/connections.c:10077
 #, c-format
 msgid "Type 'help' or '?' for available commands."
 msgstr "Tippen Sie »help« oder »?«, um verfügbare Befehle anzuzeigen."
 
-#: ../clients/cli/connections.c:10075
+#: ../clients/cli/connections.c:10079
 #, 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:10113
+#: ../clients/cli/connections.c:10117
 #, c-format
 msgid "Error: Failed to modify connection '%s': %s"
 msgstr "Fehler: Ändern der Verbindung »%s« ist fehlgeschlagen: %s"
 
-#: ../clients/cli/connections.c:10120
+#: ../clients/cli/connections.c:10124
 #, c-format
 msgid "Connection '%s' (%s) successfully modified.\n"
 msgstr "Verbindung »%s« (%s) erfolgreich bearbeitet.\n"
 
-#: ../clients/cli/connections.c:10142 ../clients/cli/connections.c:10258
-#: ../clients/cli/connections.c:10635 ../clients/cli/connections.c:10743
+#: ../clients/cli/connections.c:10146 ../clients/cli/connections.c:10262
+#: ../clients/cli/connections.c:10639 ../clients/cli/connections.c:10747
 #, c-format
 msgid "Error: No arguments provided."
 msgstr "Fehler: Es wurden keine Argumente angegeben."
 
-#: ../clients/cli/connections.c:10161 ../clients/cli/connections.c:10290
-#: ../clients/cli/connections.c:10772
+#: ../clients/cli/connections.c:10165 ../clients/cli/connections.c:10294
+#: ../clients/cli/connections.c:10776
 #, c-format
 msgid "Error: connection ID is missing."
 msgstr "Fehler: Verbindungskennung fehlt."
 
-#: ../clients/cli/connections.c:10224
+#: ../clients/cli/connections.c:10228
 #, c-format
 msgid "%s (%s) cloned as %s (%s).\n"
 msgstr "%s (%s) dupliziert als %s (%s).\n"
 
-#: ../clients/cli/connections.c:10256
+#: ../clients/cli/connections.c:10260
 msgid "New connection name: "
 msgstr "Neuer Verbindungsname: "
 
-#: ../clients/cli/connections.c:10277 ../clients/cli/connections.c:10295
+#: ../clients/cli/connections.c:10281 ../clients/cli/connections.c:10299
 #, c-format
 msgid "Error: <new name> argument is missing."
-msgstr "Fehler: Argument <neuer Name> fehlt."
+msgstr "Fehler: <new name> Parameter fehlt."
 
-#: ../clients/cli/connections.c:10283
+#: ../clients/cli/connections.c:10287
 #, c-format
 msgid "Error: unexpected extra argument '%s'."
-msgstr "Fehler: Unerwarteter zusätzlicher Parameter »%s«."
+msgstr "Fehler: Unerwarteter zusätzlicher Parameter '%s'."
 
-#: ../clients/cli/connections.c:10352
+#: ../clients/cli/connections.c:10356
 #, c-format
 msgid "Error: not all connections deleted."
 msgstr "Fehler: Es wurden nicht alle aktiven Verbindungen gelöscht."
 
-#: ../clients/cli/connections.c:10353
+#: ../clients/cli/connections.c:10357
 #, c-format
 msgid "Error: Connection deletion failed: %s"
 msgstr "Fehler: Löschen der Verbindung fehlgeschlagen: %s"
 
-#: ../clients/cli/connections.c:10415 ../clients/cli/connections.c:10543
+#: ../clients/cli/connections.c:10419 ../clients/cli/connections.c:10547
 #, c-format
 msgid "Error: unknown connection '%s'\n"
 msgstr "Fehler: Unbekannte Verbindung »%s«\n"
 
-#: ../clients/cli/connections.c:10429
+#: ../clients/cli/connections.c:10433
 #, c-format
 msgid "Error: no connection provided."
 msgstr "Fehler: Es ist keine Verbindung angegeben."
 
 #. truncate trailing ", "
-#: ../clients/cli/connections.c:10454
+#: ../clients/cli/connections.c:10458
 #, 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:10466
+#: ../clients/cli/connections.c:10470
 #, c-format
 msgid "%s: connection profile changed\n"
-msgstr "%s: Verbindungsprofil hat sich geändert\n"
+msgstr "%s: Verbindungsprofil geändert\n"
 
-#: ../clients/cli/connections.c:10492
+#: ../clients/cli/connections.c:10496
 #, c-format
 msgid "%s: connection profile created\n"
-msgstr "%s: Verbindungsprofil wurde erstellt\n"
+msgstr "%s: Verbindungsprofil erstellt\n"
 
-#: ../clients/cli/connections.c:10501
+#: ../clients/cli/connections.c:10505
 #, c-format
 msgid "%s: connection profile removed\n"
-msgstr "%s: Verbindungsprofil wurde entfernt\n"
+msgstr "%s: Verbindungsprofil entfernt\n"
 
-#: ../clients/cli/connections.c:10544
+#: ../clients/cli/connections.c:10548
 #, c-format
 msgid "Error: not all connections found."
 msgstr "Fehler: Es wurden nicht alle Verbindungen gefunden."
 
-#: ../clients/cli/connections.c:10567
+#: ../clients/cli/connections.c:10571
 #, c-format
 msgid "Error: failed to reload connections: %s."
 msgstr "Fehler: Erneutes Laden der Verbindung ist gescheitert: %s."
 
-#: ../clients/cli/connections.c:10599
+#: ../clients/cli/connections.c:10603
 #, c-format
 msgid "Error: failed to load connection: %s."
 msgstr "Fehler: Laden der Verbindung ist gescheitert: %s."
 
-#: ../clients/cli/connections.c:10607
+#: ../clients/cli/connections.c:10611
 #, c-format
 msgid "Could not load file '%s'\n"
 msgstr "Datei »%s« konnte nicht geladen werden\n"
 
-#: ../clients/cli/connections.c:10616
+#: ../clients/cli/connections.c:10620
 msgid "File to import: "
-msgstr "Datei zum Importieren: "
+msgstr "Datei für Import: "
 
-#: ../clients/cli/connections.c:10651
+#: ../clients/cli/connections.c:10655
 #, c-format
 msgid "Warning: 'type' already specified, ignoring extra one.\n"
 msgstr "Warnung: »type« ist bereits angegeben, wird ignoriert.\n"
 
-#: ../clients/cli/connections.c:10662
+#: ../clients/cli/connections.c:10666
 #, c-format
 msgid "Warning: 'file' already specified, ignoring extra one.\n"
 msgstr "Warnung: »file« ist bereits angegeben, wird ignoriert.\n"
 
-#: ../clients/cli/connections.c:10664
+#: ../clients/cli/connections.c:10668
 #, c-format
 msgid "Unknown parameter: %s"
 msgstr "Unbekannter Parameter: %s"
 
-#: ../clients/cli/connections.c:10679
+#: ../clients/cli/connections.c:10683
 #, c-format
 msgid "Error: 'file' argument is required."
-msgstr "Fehler: Das Argument »file« ist notwendig."
+msgstr "Fehler: Parameter 'file' ist erforderlich."
 
-#: ../clients/cli/connections.c:10687 ../clients/cli/connections.c:10794
+#: ../clients/cli/connections.c:10691 ../clients/cli/connections.c:10798
 #, c-format
 msgid "Error: failed to load VPN plugin: %s."
-msgstr "Fehler: Laden des VPN-Plugins ist gescheitert: %s."
+msgstr "Fehler: Laden des VPN-Plugins fehlgeschlagen: %s."
 
-#: ../clients/cli/connections.c:10695
+#: ../clients/cli/connections.c:10699
 #, c-format
 msgid "Error: failed to import '%s': %s."
-msgstr "Fehler: Importieren von »%s« ist fehlgeschlagen: %s."
+msgstr "Fehler: Import fehlgeschlagen '%s': %s."
 
-#: ../clients/cli/connections.c:10741
+#: ../clients/cli/connections.c:10745
 msgid "Output file name: "
-msgstr "Dateiname zur Ausgabe: "
+msgstr "Ausgabedateiname: "
 
-#: ../clients/cli/connections.c:10765
+#: ../clients/cli/connections.c:10769
 #, c-format
 msgid "Error: unknown extra argument: '%s'."
-msgstr "Fehler: Unbekannter zusätzlicher Parameter »%s«."
+msgstr "Fehler: Unbekannter zusätzlicher Parameter '%s'."
 
-#: ../clients/cli/connections.c:10785
+#: ../clients/cli/connections.c:10789
 #, c-format
 msgid "Error: the connection is not VPN."
-msgstr "Fehler: Verbindung ist kein VPN."
+msgstr "Fehler: Verbindung ist nicht VPN."
 
-#: ../clients/cli/connections.c:10806
+#: ../clients/cli/connections.c:10810
 #, c-format
 msgid "Error: failed to create temporary file %s."
-msgstr "Fehler: Temporäre Datei konnte nicht erstellt werden: %s."
+msgstr "Fehler: Temporäre Datei konnte nicht erstellt werden: %s"
 
-#: ../clients/cli/connections.c:10815
+#: ../clients/cli/connections.c:10819
 #, c-format
 msgid "Error: failed to export '%s': %s."
-msgstr "Fehler: Exportieren von »%s« ist fehlgeschlagen: %s."
+msgstr "Fehler: Export fehlgeschlagen '%s': %s."
 
-#: ../clients/cli/connections.c:10826
+#: ../clients/cli/connections.c:10830
 #, c-format
 msgid "Error: failed to read temporary file '%s': %s."
-msgstr "Fehler: Lesen der temporären Datei »%s« ist fehlgeschlagen: %s."
+msgstr "Fehler: Temporäre Datei konnte nicht gelesen werden'%s': %s."
 
-#: ../clients/cli/connections.c:10972
+#: ../clients/cli/connections.c:10976
 #, c-format
 msgid "incorrect string '%s' of '--order' option"
 msgstr "Falsche Zeichenkette »%s« der Option »--order«"
 
-#: ../clients/cli/connections.c:10998
+#: ../clients/cli/connections.c:11002
 #, c-format
 msgid "incorrect item '%s' in '--order' option"
 msgstr "Falsches Objekt »%s« der Option »--order«"
 
-#: ../clients/cli/connections.c:11082
+#: ../clients/cli/connections.c:11089
 msgid "'--order' argument is missing"
 msgstr "Argument »--order« fehlt"
 
-#: ../clients/cli/connections.c:11147
+#: ../clients/cli/connections.c:11154
 #, c-format
 msgid "Error: '%s' is not valid 'connection' command."
 msgstr "Fehler: »%s« ist kein aktiver Verbindungsbefehl."
@@ -3974,7 +3944,7 @@ msgid "S390-SUBCHANNELS"
 msgstr "S390-UNTERKANÄLE"
 
 #. 0
-#: ../clients/cli/devices.c:121 ../clients/cli/devices.c:741
+#: ../clients/cli/devices.c:121 ../clients/cli/devices.c:731
 msgid "WEP"
 msgstr "WEP"
 
@@ -3984,7 +3954,7 @@ msgid "WPA"
 msgstr "WPA"
 
 #. 2
-#: ../clients/cli/devices.c:123 ../clients/cli/devices.c:749
+#: ../clients/cli/devices.c:123 ../clients/cli/devices.c:739
 msgid "WPA2"
 msgstr "WPA2"
 
@@ -4000,7 +3970,7 @@ msgstr "CCMP"
 
 #. 5
 #. 2
-#: ../clients/cli/devices.c:126 ../clients/cli/devices.c:238
+#: ../clients/cli/devices.c:126 ../clients/cli/devices.c:228
 msgid "AP"
 msgstr "AP"
 
@@ -4112,147 +4082,141 @@ msgstr "*"
 
 #. 0
 #. 5
-#: ../clients/cli/devices.c:177 ../clients/cli/devices.c:241
+#: ../clients/cli/devices.c:177 ../clients/cli/devices.c:231
 msgid "NSP"
 msgstr "NSP"
 
 #. 0
-#: ../clients/cli/devices.c:192 ../clients/cli/devices.c:201
+#: ../clients/cli/devices.c:192
 msgid "SLAVES"
 msgstr "SLAVES"
 
-#. 1
-#: ../clients/cli/devices.c:202
-msgid "CONFIG"
-msgstr ""
-
 #. 0
-#: ../clients/cli/devices.c:211
-#, fuzzy
+#: ../clients/cli/devices.c:201
 msgid "PARENT"
-msgstr "Eltern"
+msgstr "PARENT"
 
 #. 1
-#: ../clients/cli/devices.c:212
+#: ../clients/cli/devices.c:202
 msgid "ID"
-msgstr "Kennung"
+msgstr "ID"
 
 #. 0
-#: ../clients/cli/devices.c:221 ../clients/cli/devices.c:236
+#: ../clients/cli/devices.c:211 ../clients/cli/devices.c:226
 msgid "CAPABILITIES"
 msgstr "RESSOURCEN"
 
 #. 1
-#: ../clients/cli/devices.c:237
+#: ../clients/cli/devices.c:227
 msgid "WIFI-PROPERTIES"
 msgstr "WLAN-EIGENSCHAFTEN"
 
 #. 3
-#: ../clients/cli/devices.c:239
+#: ../clients/cli/devices.c:229
 msgid "WIRED-PROPERTIES"
 msgstr "KABEL-EIGENSCHAFTEN"
 
 #. 4
-#: ../clients/cli/devices.c:240
+#: ../clients/cli/devices.c:230
 msgid "WIMAX-PROPERTIES"
 msgstr "WIMAX-EIGENSCHAFTEN"
 
 #. 10
-#: ../clients/cli/devices.c:246 ../clients/tui/nmt-page-bond.c:351
+#: ../clients/cli/devices.c:236 ../clients/tui/nmt-page-bond.c:351
 msgid "BOND"
 msgstr "GEBÜNDELT"
 
 #. 11
-#: ../clients/cli/devices.c:247 ../clients/tui/nmt-page-team.c:145
+#: ../clients/cli/devices.c:237 ../clients/tui/nmt-page-team.c:145
 msgid "TEAM"
 msgstr "Bündelung"
 
 #. 12
-#: ../clients/cli/devices.c:248 ../clients/tui/nmt-page-bridge.c:74
+#: ../clients/cli/devices.c:238 ../clients/tui/nmt-page-bridge.c:74
 msgid "BRIDGE"
 msgstr "Bridge"
 
 #. 14
-#: ../clients/cli/devices.c:250
+#: ../clients/cli/devices.c:240
 msgid "BLUETOOTH"
 msgstr "BLUETOOTH"
 
 #. 15
-#: ../clients/cli/devices.c:251
+#: ../clients/cli/devices.c:241
 msgid "CONNECTIONS"
 msgstr "VERBINDUNGEN"
 
 #. 1
-#: ../clients/cli/devices.c:263
+#: ../clients/cli/devices.c:253
 msgid "CHASSIS-ID"
 msgstr "GEHÄUSE-KENNUNG"
 
 #. 2
-#: ../clients/cli/devices.c:264
+#: ../clients/cli/devices.c:254
 msgid "PORT-ID"
 msgstr "PHYS-PORT-KENNUNG"
 
 #. 3
-#: ../clients/cli/devices.c:265
+#: ../clients/cli/devices.c:255
 msgid "PORT-DESCRIPTION"
 msgstr "PORT-BESCHREIBUNG"
 
 #. 4
-#: ../clients/cli/devices.c:266
+#: ../clients/cli/devices.c:256
 msgid "SYSTEM-NAME"
 msgstr "SYSTEM-NAME"
 
 #. 5
-#: ../clients/cli/devices.c:267
+#: ../clients/cli/devices.c:257
 msgid "SYSTEM-DESCRIPTION"
 msgstr "SYSTEM-BESCHREIBUNG"
 
 #. 6
-#: ../clients/cli/devices.c:268
+#: ../clients/cli/devices.c:258
 msgid "SYSTEM-CAPABILITIES"
 msgstr "SYSTEM-FÄHIGKEITEN"
 
 #. 7
-#: ../clients/cli/devices.c:269
+#: ../clients/cli/devices.c:259
 msgid "IEEE-802-1-PVID"
 msgstr "IEEE-802-1-PVID"
 
 #. 8
-#: ../clients/cli/devices.c:270
+#: ../clients/cli/devices.c:260
 msgid "IEEE-802-1-PPVID"
 msgstr "IEEE-802-1-PPVID"
 
 #. 9
-#: ../clients/cli/devices.c:271
+#: ../clients/cli/devices.c:261
 msgid "IEEE-802-1-PPVID-FLAGS"
 msgstr "IEEE-802-1-PPVID-FLAGS"
 
 #. 10
-#: ../clients/cli/devices.c:272
+#: ../clients/cli/devices.c:262
 msgid "IEEE-802-1-VID"
 msgstr "IEEE-802-1-VID"
 
 #. 11
-#: ../clients/cli/devices.c:273
+#: ../clients/cli/devices.c:263
 msgid "IEEE-802-1-VLAN-NAME"
 msgstr "IEEE-802-1-VLAN-NAME"
 
 #. 12
-#: ../clients/cli/devices.c:274
+#: ../clients/cli/devices.c:264
 msgid "DESTINATION"
 msgstr "ZIEL"
 
 #. 13
-#: ../clients/cli/devices.c:275
+#: ../clients/cli/devices.c:265
 msgid "CHASSIS-ID-TYPE"
 msgstr "GEHÄUSE-KENNUNGSTYP"
 
 #. 14
-#: ../clients/cli/devices.c:276
+#: ../clients/cli/devices.c:266
 msgid "PORT-ID-TYPE"
 msgstr "PORT-KENNUNGSTYP"
 
-#: ../clients/cli/devices.c:293
+#: ../clients/cli/devices.c:283
 #, c-format
 msgid ""
 "Usage: nmcli device { COMMAND | help }\n"
@@ -4268,7 +4232,7 @@ msgid ""
 "\n"
 "  connect <ifname>\n"
 "\n"
-"  reapply <ifname>\n"
+"  reapply <ifname> ...\n"
 "\n"
 "  disconnect <ifname> ...\n"
 "\n"
@@ -4304,7 +4268,7 @@ msgstr ""
 "\n"
 "  connect <Schnittstellenname>\n"
 "\n"
-"  reapply <Schnittstellenname>\n"
+"  reapply <Schnittstellenname> …\n"
 "\n"
 "  disconnect <Schnittstellenname> …\n"
 "\n"
@@ -4327,7 +4291,7 @@ msgstr ""
 "  lldp [list [ifname <Schnittstellenname>]]\n"
 "\n"
 
-#: ../clients/cli/devices.c:315
+#: ../clients/cli/devices.c:305
 #, c-format
 msgid ""
 "Usage: nmcli device status { help }\n"
@@ -4338,10 +4302,8 @@ msgid ""
 " TYPE       - device type\n"
 " STATE      - device state\n"
 " CONNECTION - connection activated on device (if any)\n"
-"Displayed columns can be changed using '--fields' global option. 'status' "
-"is\n"
-"the default command, which means 'nmcli device' calls 'nmcli device "
-"status'.\n"
+"Displayed columns can be changed using '--fields' global option. 'status' is\n"
+"the default command, which means 'nmcli device' calls 'nmcli device status'.\n"
 "\n"
 msgstr ""
 "Aufruf: nmcli device status { help }\n"
@@ -4358,7 +4320,7 @@ msgstr ""
 "status« auf.\n"
 "\n"
 
-#: ../clients/cli/devices.c:330
+#: ../clients/cli/devices.c:320
 #, c-format
 msgid ""
 "Usage: nmcli device show { ARGUMENTS | help }\n"
@@ -4378,7 +4340,7 @@ msgstr ""
 "Gerät auf.\n"
 "\n"
 
-#: ../clients/cli/devices.c:341
+#: ../clients/cli/devices.c:331
 #, c-format
 msgid ""
 "Usage: nmcli device connect { ARGUMENTS | help }\n"
@@ -4386,8 +4348,8 @@ msgid ""
 "ARGUMENTS := <ifname>\n"
 "\n"
 "Connect the device.\n"
-"NetworkManager will try to find a suitable connection that will be "
-"activated.\n"
+"NetworkManager will try to find a suitable connection that will be activated."
+"\n"
 "It will also consider connections that are not set to auto-connect.\n"
 "\n"
 msgstr ""
@@ -4403,12 +4365,12 @@ msgstr ""
 "Verbindung konfiguriert sind.\n"
 "\n"
 
-#: ../clients/cli/devices.c:353
+#: ../clients/cli/devices.c:343
 #, c-format
 msgid ""
 "Usage: nmcli device reapply { ARGUMENTS | help }\n"
 "\n"
-"ARGUMENTS := <ifname>\n"
+"ARGUMENTS := <ifname> ...\n"
 "\n"
 "Attempts to update device with changes to the currently active connection\n"
 "made since it was last applied.\n"
@@ -4416,13 +4378,14 @@ msgid ""
 msgstr ""
 "Aufruf: nmcli device reapply { ARGUMENTE | help }\n"
 "\n"
-"ARGUMENTE := <Schnittstellenname>\n"
+"ARGUMENTE := <Schnittstellenname> …\n"
 "\n"
-"Versucht das Gerät mit Änderungen an der derzeit aktiven Verbindung\n"
-"zu aktualisieren, die seit der letzten Umsetzung gemacht wurden.\n"
+"Versucht das Gerät mit Änderungen an der derzeit aktiven Verbindung zu "
+"aktualisieren,\n"
+"die seit der letzten Umsetzung gemacht wurden.\n"
 "\n"
 
-#: ../clients/cli/devices.c:364
+#: ../clients/cli/devices.c:354
 #, c-format
 msgid ""
 "Usage: nmcli device disconnect { ARGUMENTS | help }\n"
@@ -4443,7 +4406,7 @@ msgstr ""
 "Benutzereingriff weiterhin automatisch neu zu verbinden.\n"
 "\n"
 
-#: ../clients/cli/devices.c:376
+#: ../clients/cli/devices.c:366
 #, c-format
 msgid ""
 "Usage: nmcli device delete { ARGUMENTS | help }\n"
@@ -4466,7 +4429,7 @@ msgstr ""
 "können mit diesem Befehl nicht entfernt werden.\n"
 "\n"
 
-#: ../clients/cli/devices.c:389
+#: ../clients/cli/devices.c:379
 #, c-format
 msgid ""
 "Usage: nmcli device set { ARGUMENTS | help }\n"
@@ -4489,7 +4452,7 @@ msgstr ""
 "Geräte-Eigenschaften verändern.\n"
 "\n"
 
-#: ../clients/cli/devices.c:402
+#: ../clients/cli/devices.c:392
 #, c-format
 msgid ""
 "Usage: nmcli device monitor { ARGUMENTS | help }\n"
@@ -4512,7 +4475,7 @@ msgstr ""
 "angegeben wird.\n"
 "\n"
 
-#: ../clients/cli/devices.c:414
+#: ../clients/cli/devices.c:404
 #, c-format
 msgid ""
 "Usage: nmcli device wifi { ARGUMENTS | help }\n"
@@ -4524,8 +4487,8 @@ msgid ""
 "List available Wi-Fi access points. The 'ifname' and 'bssid' options can be\n"
 "used to list APs for a particular interface, or with a specific BSSID.\n"
 "\n"
-"ARGUMENTS := connect <(B)SSID> [password <password>] [wep-key-type key|"
-"phrase] [ifname <ifname>]\n"
+"ARGUMENTS := connect <(B)SSID> [password <password>] [wep-key-type "
+"key|phrase] [ifname <ifname>]\n"
 "                    [bssid <BSSID>] [name <name>] [private yes|no] [hidden "
 "yes|no]\n"
 "\n"
@@ -4554,10 +4517,8 @@ msgid ""
 "\n"
 "ARGUMENTS := rescan [ifname <ifname>] [[ssid <SSID to scan>] ...]\n"
 "\n"
-"Request that NetworkManager immediately re-scan for available access "
-"points.\n"
-"NetworkManager scans Wi-Fi networks periodically, but in some cases it "
-"might\n"
+"Request that NetworkManager immediately re-scan for available access points.\n"
+"NetworkManager scans Wi-Fi networks periodically, but in some cases it might\n"
 "be useful to start scanning manually. 'ssid' allows scanning for a specific\n"
 "SSID, which is useful for APs with hidden SSIDs. More 'ssid' parameters can "
 "be\n"
@@ -4576,20 +4537,18 @@ msgstr ""
 "Schnittstelle\n"
 "oder mit einer bestimmten BSSID aufzulisten.\n"
 "\n"
-"ARGUMENTE := connect <(B)SSID> [password <Passwort>] [wep-key-type key|"
-"phrase] [ifname <Schnittstellenname>]\n"
+"ARGUMENTE := connect <(B)SSID> [password <Passwort>] [wep-key-type "
+"key|phrase] [ifname <Schnittstellenname>]\n"
 "                    [bssid <BSSID>] [name <Name>] [private yes|no] [hidden "
 "yes|no]\n"
 "\n"
 "Verbindet mit einem WLAN-Netzwerk, das anhand seiner SSID oder BSSID\n"
 "angegeben wird. Der Befehl erstellt eine neue Verbindung und aktiviert\n"
-"diese auf einem Gerät. Dieser Befehl entspricht dem Klicken auf eine SSID "
-"in\n"
+"diese auf einem Gerät. Dieser Befehl entspricht dem Klicken auf eine SSID in\n"
 "einer graphischen Oberfläche. Der Befehl erstellt immer eine neue Verbindung "
 "und ist\n"
 "deshalb hauptsächlich nützlich zum Verbinden mit neuen WLAN-Netzen.\n"
-"Falls eine Verbindung für das Netzwerk bereits existiert, ist es besser, "
-"das\n"
+"Falls eine Verbindung für das Netzwerk bereits existiert, ist es besser, das\n"
 "vorhandene Profil wie folgt aufzurufen: nmcli con up id <Name>. Beachten\n"
 "Sie, dass derzeit lediglich offene, WEP- und WPA-PSK-Netzwerke unterstützt "
 "werden.\n"
@@ -4626,15 +4585,14 @@ msgstr ""
 "Zugangspunkte nicht anzeigt. Verwenden Sie dazu »nmcli device wifi list«.\n"
 "\n"
 
-#: ../clients/cli/devices.c:461
+#: ../clients/cli/devices.c:451
 #, c-format
 msgid ""
 "Usage: nmcli device lldp { ARGUMENTS | help }\n"
 "\n"
 "ARGUMENTS := [list [ifname <ifname>]]\n"
 "\n"
-"List neighboring devices discovered through LLDP. The 'ifname' option can "
-"be\n"
+"List neighboring devices discovered through LLDP. The 'ifname' option can be\n"
 "used to list neighbors for a particular interface.\n"
 "\n"
 msgstr ""
@@ -4647,277 +4605,277 @@ msgstr ""
 "auf einer bestimmten Schnittstelle aufzulisten.\n"
 "\n"
 
-#: ../clients/cli/devices.c:537 ../clients/cli/devices.c:1756
-#: ../clients/cli/devices.c:1765 ../clients/cli/devices.c:1956
-#: ../clients/cli/devices.c:2161 ../clients/cli/devices.c:2168
+#: ../clients/cli/devices.c:527 ../clients/cli/devices.c:1676
+#: ../clients/cli/devices.c:1685 ../clients/cli/devices.c:1879
+#: ../clients/cli/devices.c:2103 ../clients/cli/devices.c:2110
 #, c-format
 msgid "Error: No interface specified."
 msgstr "Fehler: Es muss eine Schnittstelle angegeben werden."
 
-#: ../clients/cli/devices.c:557
+#: ../clients/cli/devices.c:547 ../clients/cli/devices.c:1899
 #, c-format
 msgid "Warning: argument '%s' is duplicated.\n"
 msgstr "Warnung: Argument »%s« ist mehrfach vorhanden.\n"
 
-#: ../clients/cli/devices.c:559
+#: ../clients/cli/devices.c:549 ../clients/cli/devices.c:1901
 #, c-format
 msgid "Error: Device '%s' not found.\n"
 msgstr "Fehler: Gerät »%s« wurde nicht gefunden.\n"
 
-#: ../clients/cli/devices.c:560
+#: ../clients/cli/devices.c:550 ../clients/cli/devices.c:1902
 #, c-format
 msgid "Error: not all devices found."
 msgstr "Fehler: Es wurden nicht alle Geräte gefunden."
 
-#: ../clients/cli/devices.c:660 ../clients/cli/devices.c:811
+#: ../clients/cli/devices.c:650 ../clients/cli/devices.c:801
 msgid "(none)"
 msgstr "(keine)"
 
-#: ../clients/cli/devices.c:729
+#: ../clients/cli/devices.c:719
 #, c-format
 msgid "%u MHz"
 msgstr "%u MHz"
 
-#: ../clients/cli/devices.c:730
+#: ../clients/cli/devices.c:720
 #, c-format
 msgid "%u Mbit/s"
 msgstr "%u Mbit/s"
 
-#: ../clients/cli/devices.c:745
+#: ../clients/cli/devices.c:735
 msgid "WPA1"
 msgstr "WPA1"
 
-#: ../clients/cli/devices.c:754
+#: ../clients/cli/devices.c:744
 msgid "802.1X"
 msgstr "802.1X"
 
-#: ../clients/cli/devices.c:770
+#: ../clients/cli/devices.c:760
 msgid "Ad-Hoc"
 msgstr "Ad-Hoc"
 
-#: ../clients/cli/devices.c:771
+#: ../clients/cli/devices.c:761
 msgid "Infra"
 msgstr "Infra"
 
-#: ../clients/cli/devices.c:772
+#: ../clients/cli/devices.c:762
 msgid "N/A"
 msgstr "N.V."
 
-#: ../clients/cli/devices.c:996
+#: ../clients/cli/devices.c:916
 msgid "Device details"
 msgstr "Geräteinformationen"
 
-#: ../clients/cli/devices.c:1008
+#: ../clients/cli/devices.c:928
 #, c-format
 msgid "Error: 'device show': %s"
 msgstr "Fehler: »device show«: %s"
 
-#: ../clients/cli/devices.c:1060 ../clients/cli/devices.c:1063
+#: ../clients/cli/devices.c:980 ../clients/cli/devices.c:983
 msgid "(unknown)"
 msgstr "(unbekannt)"
 
-#: ../clients/cli/devices.c:1104
+#: ../clients/cli/devices.c:1024
 #, c-format
 msgid "%u Mb/s"
 msgstr "%u Mb/s"
 
-#: ../clients/cli/devices.c:1195
+#: ../clients/cli/devices.c:1115
 msgid "on"
 msgstr "an"
 
-#: ../clients/cli/devices.c:1195
+#: ../clients/cli/devices.c:1115
 msgid "off"
 msgstr "aus"
 
-#: ../clients/cli/devices.c:1422
+#: ../clients/cli/devices.c:1342
 #, c-format
 msgid "Error: 'device status': %s"
 msgstr "Fehler: »device status«: %s"
 
 #. Add headers
-#: ../clients/cli/devices.c:1429
+#: ../clients/cli/devices.c:1349
 msgid "Status of devices"
 msgstr "Status der Geräte"
 
-#: ../clients/cli/devices.c:1460 ../clients/cli/devices.c:3567
+#: ../clients/cli/devices.c:1380 ../clients/cli/devices.c:3509
 #, c-format
 msgid "Error: invalid extra argument '%s'."
 msgstr "Fehler: Ungültiger zusätzlicher Parameter »%s«."
 
-#: ../clients/cli/devices.c:1477 ../clients/cli/devices.c:1787
-#: ../clients/cli/devices.c:2184 ../clients/cli/devices.c:2454
-#: ../clients/cli/devices.c:3606
+#: ../clients/cli/devices.c:1397 ../clients/cli/devices.c:1707
+#: ../clients/cli/devices.c:2126 ../clients/cli/devices.c:2396
+#: ../clients/cli/devices.c:3548
 #, c-format
 msgid "Error: Device '%s' not found."
 msgstr "Fehler: Gerät »%s« wurde nicht gefunden."
 
-#: ../clients/cli/devices.c:1555
+#: ../clients/cli/devices.c:1475
 #, c-format
 msgid "Device '%s' successfully activated with '%s'.\n"
 msgstr "Gerät »%s« wurde erfolgreich mit »%s« aktiviert.\n"
 
-#: ../clients/cli/devices.c:1561
+#: ../clients/cli/devices.c:1481
 #, c-format
 msgid "Error: Connection activation failed: (%d) %s.\n"
 msgstr "Fehler: Aktivierung der Verbindung ist gescheitert: (%d) %s.\n"
 
-#: ../clients/cli/devices.c:1597
+#: ../clients/cli/devices.c:1517
 #, c-format
 msgid "Error: Failed to setup a Wi-Fi hotspot: %s"
-msgstr "Fehler: Einrichten eines WLAN-Zugangspunkts schlug fehl: %s"
+msgstr "Fehler: Einrichten eines Wi-Fi Hotspots fehlgeschlagen: %s"
 
-#: ../clients/cli/devices.c:1600
+#: ../clients/cli/devices.c:1520
 #, 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:1610
+#: ../clients/cli/devices.c:1530
 #, c-format
 msgid "Error: Failed to setup a Wi-Fi hotspot"
-msgstr "Fehler: Einrichten eines WLAN-Zugangspunkts schlug fehl"
+msgstr "Fehler: Einrichten eines Wi-Fi Hotspots fehlgeschlagen"
 
-#: ../clients/cli/devices.c:1612
+#: ../clients/cli/devices.c:1532
 #, 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:1624
+#: ../clients/cli/devices.c:1544
 #, 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:1627
+#: ../clients/cli/devices.c:1547
 #, c-format
 msgid "Hotspot '%s' activated on device '%s'\n"
-msgstr "Zugangspunkt »%s« wurde auf dem Gerät »%s« aktiviert\n"
+msgstr "Hotspot '%s' ist aktiviert auf Gerät'%s'\n"
 
-#: ../clients/cli/devices.c:1691
+#: ../clients/cli/devices.c:1611
 #, c-format
 msgid "Error: Device activation failed: %s"
 msgstr "Fehler: Aktivierung des Geräts ist gescheitert: %s"
 
-#: ../clients/cli/devices.c:1700
+#: ../clients/cli/devices.c:1620
 #, 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:1715
+#: ../clients/cli/devices.c:1635
 #, c-format
 msgid "Device '%s' has been connected.\n"
 msgstr "Gerät »%s« hat sich verbunden.\n"
 
-#: ../clients/cli/devices.c:1771
+#: ../clients/cli/devices.c:1691
 #, c-format
 msgid "Error: extra argument not allowed: '%s'."
 msgstr "Fehler: Zusätzlicher Parameter nicht erlaubt: »%s«."
 
-#: ../clients/cli/devices.c:1856 ../clients/cli/devices.c:1871
-#: ../clients/cli/devices.c:2022
+#: ../clients/cli/devices.c:1776 ../clients/cli/devices.c:1791
+#: ../clients/cli/devices.c:1964
 #, c-format
 msgid "Device '%s' successfully disconnected.\n"
 msgstr "Gerät »%s« wurde erfolgreich getrennt.\n"
 
-#: ../clients/cli/devices.c:1859
+#: ../clients/cli/devices.c:1779
 #, c-format
 msgid "Device '%s' successfully removed.\n"
 msgstr "Gerät »%s« wurde erfolgreich entfernt.\n"
 
-#: ../clients/cli/devices.c:1918
+#: ../clients/cli/devices.c:1838
 #, 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"
+msgid "Error: not all connections reapplied."
+msgstr "Fehler: Nicht alle Verbindungen wurden erneut angewendet."
 
-#: ../clients/cli/devices.c:1928
+#: ../clients/cli/devices.c:1839
 #, c-format
-msgid "Connection successfully reapplied to device '%s'.\n"
-msgstr "Verbindung wurde erfolgreich erneut angewendet auf Gerät »%s«.\n"
+msgid "Error: Reapplying connection to device '%s' (%s) failed: %s\n"
+msgstr ""
+"Fehler: Erneute Anwendung der Verbindung auf Gerät '%s' (%s) fehlgeschlagen: "
+"%s\n"
 
-#: ../clients/cli/devices.c:1965
+#: ../clients/cli/devices.c:1849
 #, c-format
-msgid "Error: unsupported argument '%s'."
-msgstr "Fehler: Nicht unterstützter Parameter »%s«."
+msgid "Connection successfully reapplied to device '%s'.\n"
+msgstr "Erneute Anwendung der Verbindung auf Gerät '%s' erfolgreich.\n"
 
-#: ../clients/cli/devices.c:1979
+#: ../clients/cli/devices.c:1912
 #, c-format
-msgid "Error: device '%s' not found."
-msgstr "Fehler: Gerät »%s« wurde nicht gefunden."
+msgid "Error: no valid device provided."
+msgstr "Fehler: es wurde kein gültiges Gerät angegeben."
 
-#: ../clients/cli/devices.c:2007
+#: ../clients/cli/devices.c:1949
 #, c-format
 msgid "Error: not all devices disconnected."
 msgstr "Fehler: Es wurden nicht alle Geräte getrennt."
 
-#: ../clients/cli/devices.c:2008
+#: ../clients/cli/devices.c:1950
 #, 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:2083
+#: ../clients/cli/devices.c:2025
 #, c-format
 msgid "Error: not all devices deleted."
 msgstr "Fehler: Es wurden nicht alle Geräte gelöscht."
 
-#: ../clients/cli/devices.c:2084
+#: ../clients/cli/devices.c:2026
 #, 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:2190
+#: ../clients/cli/devices.c:2132
 #, c-format
 msgid "Error: No property specified."
 msgstr "Fehler: Keine Eigenschaft angegeben."
 
-#: ../clients/cli/devices.c:2202 ../clients/cli/devices.c:2217
+#: ../clients/cli/devices.c:2144 ../clients/cli/devices.c:2159
 #, c-format
 msgid "Error: '%s' argument is missing."
 msgstr "Fehler: Argument »%s« fehlt."
 
-#: ../clients/cli/devices.c:2207
+#: ../clients/cli/devices.c:2149
 #, c-format
 msgid "Error: 'managed': %s."
 msgstr "Fehler: »managed«: %s."
 
-#: ../clients/cli/devices.c:2232
+#: ../clients/cli/devices.c:2174
 #, c-format
 msgid "Error: property '%s' is not known."
 msgstr "Fehler: Eigenschaft »%s« ist unbekannt."
 
-#: ../clients/cli/devices.c:2278
+#: ../clients/cli/devices.c:2220
 #, c-format
 msgid "%s: using connection '%s'\n"
 msgstr "%s: Verbindung »%s« wird verwendet\n"
 
-#: ../clients/cli/devices.c:2304
+#: ../clients/cli/devices.c:2246
 #, c-format
 msgid "%s: device created\n"
 msgstr "%s: Grerät angelegt\n"
 
-#: ../clients/cli/devices.c:2311
+#: ../clients/cli/devices.c:2253
 #, c-format
 msgid "%s: device removed\n"
 msgstr "%s: Das Gerät wurde entfernt\n"
 
-#: ../clients/cli/devices.c:2397
+#: ../clients/cli/devices.c:2339
 msgid "Wi-Fi scan list"
 msgstr "Suchliste des WLAN"
 
-#: ../clients/cli/devices.c:2435
+#: ../clients/cli/devices.c:2377
 #, c-format
 msgid "Error: 'device wifi': %s"
 msgstr "Fehler: »device wifi«: %s"
 
-#: ../clients/cli/devices.c:2477 ../clients/cli/devices.c:2558
+#: ../clients/cli/devices.c:2419 ../clients/cli/devices.c:2500
 #, c-format
 msgid "Error: Access point with bssid '%s' not found."
 msgstr "Fehler: Zugangspunkt mit der BSSID »%s« nicht gefunden."
 
-#: ../clients/cli/devices.c:2504
+#: ../clients/cli/devices.c:2446
 #, c-format
 msgid ""
 "Error: Device '%s' was not recognized as a Wi-Fi device, check "
@@ -4926,27 +4884,27 @@ msgstr ""
 "Fehler: Gerät »%s« ist kein WLAN-Gerät. Prüfen Sie das WLAN-Plugin in "
 "NetworkManager."
 
-#: ../clients/cli/devices.c:2506 ../clients/cli/devices.c:2838
-#: ../clients/cli/devices.c:3258 ../clients/cli/devices.c:3407
+#: ../clients/cli/devices.c:2448 ../clients/cli/devices.c:2780
+#: ../clients/cli/devices.c:3200 ../clients/cli/devices.c:3349
 #, 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:2718
+#: ../clients/cli/devices.c:2660
 msgid "SSID or BSSID: "
 msgstr "SSID oder BSSID: "
 
-#: ../clients/cli/devices.c:2723
+#: ../clients/cli/devices.c:2665
 #, c-format
 msgid "Error: SSID or BSSID are missing."
 msgstr "Fehler: SSID oder BSSID fehlt."
 
-#: ../clients/cli/devices.c:2747
+#: ../clients/cli/devices.c:2689
 #, 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:2771
+#: ../clients/cli/devices.c:2713
 #, c-format
 msgid ""
 "Error: wep-key-type argument value '%s' is invalid, use 'key' or 'phrase'."
@@ -4954,45 +4912,45 @@ msgstr ""
 "Fehler: Wert des Arguments wep-key-type »%s« ist ungültig, verwenden Sie "
 "stattdessen »key« oder »phrase«"
 
-#: ../clients/cli/devices.c:2791 ../clients/cli/devices.c:2804
+#: ../clients/cli/devices.c:2733 ../clients/cli/devices.c:2746
 #, c-format
 msgid "Error: %s: %s."
 msgstr "Fehler: %s: %s."
 
-#: ../clients/cli/devices.c:2819
+#: ../clients/cli/devices.c:2761
 #, 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:2825
+#: ../clients/cli/devices.c:2767
 #, c-format
 msgid "Error: Parameter '%s' is neither SSID nor BSSID."
 msgstr "Fehler: Parameter »%s« ist weder SSID noch BSSID."
 
-#: ../clients/cli/devices.c:2840 ../clients/cli/devices.c:3260
-#: ../clients/cli/devices.c:3409
+#: ../clients/cli/devices.c:2782 ../clients/cli/devices.c:3202
+#: ../clients/cli/devices.c:3351
 #, c-format
 msgid "Error: No Wi-Fi device found."
 msgstr "Fehler: Es wurde kein WLAN-Gerät gefunden."
 
-#: ../clients/cli/devices.c:2860
+#: ../clients/cli/devices.c:2802
 #, c-format
 msgid "Error: Failed to scan hidden SSID: %s."
 msgstr "Fehler: Suche nach verborgener SSID ist fehlgeschlagen: %s."
 
-#: ../clients/cli/devices.c:2885
+#: ../clients/cli/devices.c:2827
 #, c-format
 msgid "Error: No network with SSID '%s' found."
 msgstr "Fehler: Es wurde kein Netzwerk mit SSID »%s« gefunden."
 
-#: ../clients/cli/devices.c:2887
+#: ../clients/cli/devices.c:2829
 #, 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:2929
+#: ../clients/cli/devices.c:2871
 #, c-format
 msgid ""
 "Warning: '%s' should be SSID for hidden APs; but it looks like a BSSID.\n"
@@ -5000,88 +4958,89 @@ msgstr ""
 "Warnung: »%s« sollte eine SSID für verborgene Zugangspunkte sein. Es scheint "
 "aber eine BSSID zu sein.\n"
 
-#: ../clients/cli/devices.c:2943
+#: ../clients/cli/devices.c:2885
 msgid "Password: "
 msgstr "Passwort: "
 
-#: ../clients/cli/devices.c:3092
+#: ../clients/cli/devices.c:3034
 #, c-format
 msgid "'%s' is not valid WPA PSK"
 msgstr "»%s« ist kein gültiger WPA-PSK"
 
-#: ../clients/cli/devices.c:3109
+#: ../clients/cli/devices.c:3051
 #, 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:3125
+#: ../clients/cli/devices.c:3067
 #, c-format
 msgid "Hotspot password: %s\n"
 msgstr "Passwort des Zugangspunkts: %s\n"
 
-#: ../clients/cli/devices.c:3183
+#: ../clients/cli/devices.c:3125
 #, c-format
 msgid "Error: ssid is too long."
 msgstr "Fehler: »SSID« ist zu lang."
 
-#: ../clients/cli/devices.c:3195
+#: ../clients/cli/devices.c:3137
 #, 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«."
+msgstr ""
+"Fehler: Bandparameterwert '%s' ist ungültig; verwenden Sie 'a' oder 'bg'."
 
-#: ../clients/cli/devices.c:3219
+#: ../clients/cli/devices.c:3161
 #, c-format
 msgid "Error: Unknown parameter %s."
 msgstr "Fehler: Unbekannter Parameter: %s."
 
-#: ../clients/cli/devices.c:3238
+#: ../clients/cli/devices.c:3180
 #, c-format
 msgid "Error: channel requires band too."
-msgstr "Fehler: Ein Kanal erfordert auch die Angabe eines Bandes."
+msgstr "Fehler: Channel erfordert auch Band."
 
-#: ../clients/cli/devices.c:3244
+#: ../clients/cli/devices.c:3186
 #, c-format
 msgid "Error: channel '%s' not valid for band '%s'."
-msgstr "Fehler: Kanal »%s« ist ungültig für das Band »%s«."
+msgstr "Fehler: Channel '%s' ist nicht gültig für Band '%s'."
 
-#: ../clients/cli/devices.c:3272
+#: ../clients/cli/devices.c:3214
 #, 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."
+msgstr "Fehler: Gerät '%s' unterstützt weder AP noch Ad-Hoc Modus."
 
-#: ../clients/cli/devices.c:3307
+#: ../clients/cli/devices.c:3249
 #, c-format
 msgid "Error: Invalid 'password': %s."
-msgstr "Fehler: Ungültiges »password«: %s."
+msgstr "Fehler: Ungültiges 'password': %s."
 
-#: ../clients/cli/devices.c:3376
+#: ../clients/cli/devices.c:3318
 #, c-format
 msgid "Error: '%s' cannot repeat."
 msgstr "Fehler: »%s« darf sich nicht wiederholen."
 
-#: ../clients/cli/devices.c:3457
+#: ../clients/cli/devices.c:3399
 #, c-format
 msgid "Error: 'device wifi' command '%s' is not valid."
 msgstr "Fehler: Der »device wifi«-Befehl »%s« ist ungültig."
 
 #. Main header name
-#: ../clients/cli/devices.c:3483
+#: ../clients/cli/devices.c:3425
 msgid "Device LLDP neighbors"
-msgstr ""
+msgstr "Geräte- LLDP-Nachbarn"
 
-#: ../clients/cli/devices.c:3586
+#: ../clients/cli/devices.c:3528
 #, c-format
 msgid "Error: 'device lldp list': %s"
-msgstr "Fehler: »device lldp list«: %s"
+msgstr "Fehler: 'device lldp list': %s"
 
-#: ../clients/cli/devices.c:3633
+#: ../clients/cli/devices.c:3575
 #, c-format
 msgid "Error: 'device lldp' command '%s' is not valid."
-msgstr "Fehler: Der Befehl »device lldp« »%s« ist ungültig."
+msgstr "Fehler: 'device lldp' Befehl '%s' ist nicht gültig."
 
-#: ../clients/cli/devices.c:3822
+#: ../clients/cli/devices.c:3770
 #, c-format
 msgid "Error: 'dev' command '%s' is not valid."
 msgstr "Fehler: Der Befehl »%s« für »dev« ist ungültig."
@@ -5213,8 +5172,8 @@ msgid ""
 "\n"
 "Get or change persistent system hostname.\n"
 "With no arguments, this prints currently configured hostname. When you pass\n"
-"a hostname, NetworkManager will set it as the new persistent system "
-"hostname.\n"
+"a hostname, NetworkManager will set it as the new persistent system hostname."
+"\n"
 "\n"
 msgstr ""
 "Aufruf: nmcli general hostname { PARAMETER | help }\n"
@@ -5292,8 +5251,7 @@ msgstr ""
 
 #: ../clients/cli/general.c:148
 #, c-format
-msgid ""
-"Usage: nmcli networking on { help }\n"
+msgid "Usage: nmcli networking on { help }\n"
 "\n"
 "Switch networking on.\n"
 "\n"
@@ -5305,8 +5263,7 @@ msgstr ""
 
 #: ../clients/cli/general.c:156
 #, c-format
-msgid ""
-"Usage: nmcli networking off { help }\n"
+msgid "Usage: nmcli networking off { help }\n"
 "\n"
 "Switch networking off.\n"
 "\n"
@@ -5324,8 +5281,8 @@ msgid ""
 "ARGUMENTS := [check]\n"
 "\n"
 "Get network connectivity state.\n"
-"The optional 'check' argument makes NetworkManager re-check the "
-"connectivity.\n"
+"The optional 'check' argument makes NetworkManager re-check the connectivity."
+"\n"
 "\n"
 msgstr ""
 "Aufruf: nmcli networking connectivity { PARAMETER | help }\n"
@@ -5458,161 +5415,161 @@ msgstr "vollständig"
 msgid "Error: only these fields are allowed: %s"
 msgstr "Fehler: Nur die folgenden Felder sind erlaubt: %s"
 
-#: ../clients/cli/general.c:357
+#: ../clients/cli/general.c:360
 msgid "NetworkManager status"
 msgstr "Status von NetworkManager"
 
-#: ../clients/cli/general.c:362
+#: ../clients/cli/general.c:365
 msgid "running"
 msgstr "wird ausgeführt"
 
-#: ../clients/cli/general.c:365
+#: ../clients/cli/general.c:368
 msgid "starting"
 msgstr "wird gestartet"
 
-#: ../clients/cli/general.c:365
+#: ../clients/cli/general.c:368
 msgid "started"
 msgstr "gestartet"
 
-#: ../clients/cli/general.c:367 ../clients/cli/general.c:368
-#: ../clients/cli/general.c:369 ../clients/cli/general.c:370
-#: ../clients/cli/general.c:371
+#: ../clients/cli/general.c:370 ../clients/cli/general.c:371
+#: ../clients/cli/general.c:372 ../clients/cli/general.c:373
+#: ../clients/cli/general.c:374
 msgid "enabled"
 msgstr "aktiviert"
 
-#: ../clients/cli/general.c:367 ../clients/cli/general.c:368
-#: ../clients/cli/general.c:369 ../clients/cli/general.c:370
-#: ../clients/cli/general.c:371
+#: ../clients/cli/general.c:370 ../clients/cli/general.c:371
+#: ../clients/cli/general.c:372 ../clients/cli/general.c:373
+#: ../clients/cli/general.c:374
 msgid "disabled"
 msgstr "deaktiviert"
 
 # 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:443
+#: ../clients/cli/general.c:446
 msgid "auth"
 msgstr "Legitimierung"
 
-#: ../clients/cli/general.c:472
+#: ../clients/cli/general.c:475
 #, c-format
 msgid "Error: 'general permissions': %s"
 msgstr "Fehler: »general permissions«: %s"
 
-#: ../clients/cli/general.c:486
+#: ../clients/cli/general.c:489
 msgid "NetworkManager permissions"
 msgstr "Befugnisse von NetworkManager"
 
-#: ../clients/cli/general.c:527
+#: ../clients/cli/general.c:530
 #, c-format
 msgid "Error: 'general logging': %s"
 msgstr "Fehler: »general logging«: %s"
 
-#: ../clients/cli/general.c:542
+#: ../clients/cli/general.c:545
 msgid "NetworkManager logging"
 msgstr "Protokollierung in NetworkManager"
 
-#: ../clients/cli/general.c:564
+#: ../clients/cli/general.c:567
 #, c-format
 msgid "Error: failed to set hostname: %s"
 msgstr "Fehler: Festlegen des Rechnernamens schlug fehl: %s"
 
-#: ../clients/cli/general.c:677
+#: ../clients/cli/general.c:680
 #, c-format
 msgid "Error: failed to set logging: %s"
 msgstr "Fehler: Festlegen der Protokollierung ist fehlgeschlagen: %s"
 
-#: ../clients/cli/general.c:686
+#: ../clients/cli/general.c:689
 #, c-format
 msgid "Error: 'general' command '%s' is not valid."
 msgstr "Fehler: Der allgemeine Befehl »%s« ist ungültig."
 
-#: ../clients/cli/general.c:704
+#: ../clients/cli/general.c:707
 #, 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:729
+#: ../clients/cli/general.c:732
 #, c-format
 msgid "Error: invalid '%s' argument: '%s' (use on/off)."
 msgstr "Fehler: Ungültiger »%s«-Parameter: »%s« (verwenden Sie ein/aus)."
 
-#: ../clients/cli/general.c:740
+#: ../clients/cli/general.c:743
 msgid "Connectivity"
 msgstr "Konnektivität"
 
-#: ../clients/cli/general.c:755
+#: ../clients/cli/general.c:758
 msgid "Networking"
 msgstr "Netzwerk"
 
-#: ../clients/cli/general.c:780
+#: ../clients/cli/general.c:783
 #, c-format
 msgid "Error: 'networking connectivity' command '%s' is not valid."
 msgstr "Fehler: Der »networking connectivity«-Befehl »%s« ist ungültig."
 
-#: ../clients/cli/general.c:796
+#: ../clients/cli/general.c:799
 #, c-format
 msgid "Error: 'networking' command '%s' is not valid."
 msgstr "Fehler: Der »networking«-Befehl »%s« ist ungültig."
 
-#: ../clients/cli/general.c:825 ../clients/cli/general.c:845
+#: ../clients/cli/general.c:828 ../clients/cli/general.c:848
 msgid "Radio switches"
 msgstr "Funkschalter"
 
 #. no argument, show current WiFi state
-#: ../clients/cli/general.c:863
+#: ../clients/cli/general.c:866
 msgid "Wi-Fi radio switch"
 msgstr "WLAN-Funkschalter"
 
 #. no argument, show current WWAN (mobile broadband) state
-#: ../clients/cli/general.c:879
+#: ../clients/cli/general.c:882
 msgid "WWAN radio switch"
 msgstr "WWAN-Funkschalter"
 
-#: ../clients/cli/general.c:890
+#: ../clients/cli/general.c:893
 #, c-format
 msgid "Error: 'radio' command '%s' is not valid."
 msgstr "Fehler: Der »radio«-Befehl »%s« ist ungültig."
 
-#: ../clients/cli/general.c:911
+#: ../clients/cli/general.c:914
 msgid "NetworkManager has started"
-msgstr "NetworkManager wurde gestartet"
+msgstr "NetworkManager gestartet"
 
-#: ../clients/cli/general.c:914
+#: ../clients/cli/general.c:917
 msgid "NetworkManager has stopped"
-msgstr "NetworkManager wurde beendet"
+msgstr "NetworkManager gestoppt"
 
-#: ../clients/cli/general.c:928
+#: ../clients/cli/general.c:931
 #, c-format
 msgid "Hostname set to '%s'\n"
 msgstr "Rechnernamen auf »%s« festgelegt\n"
 
-#: ../clients/cli/general.c:943
+#: ../clients/cli/general.c:946
 #, c-format
 msgid "'%s' is now the primary connection\n"
-msgstr "»%s« ist jetzt die primäre Verbindung\n"
+msgstr "'%s' ist jetzt primäre Verbindung\n"
 
-#: ../clients/cli/general.c:945
+#: ../clients/cli/general.c:948
 #, c-format
 msgid "There's no primary connection\n"
-msgstr "Es gibt keine primäre Verbindung\n"
+msgstr "Keine primäre Verbindung vorhanden\n"
 
-#: ../clients/cli/general.c:957
+#: ../clients/cli/general.c:960
 #, c-format
 msgid "Connectivity is now '%s'\n"
 msgstr "Verbindungszustand ist jetzt »%s«\n"
 
-#: ../clients/cli/general.c:970
+#: ../clients/cli/general.c:973
 #, c-format
 msgid "Networkmanager is now in the '%s' state\n"
 msgstr "NetworkManager ist jetzt im Zustand »%s«\n"
 
-#: ../clients/cli/general.c:981
+#: ../clients/cli/general.c:984
 #, c-format
 msgid "Error: 'monitor' command '%s' is not valid."
 msgstr "Fehler: »monitor«-Befehl »%s« ist ungültig."
 
-#: ../clients/cli/general.c:995
+#: ../clients/cli/general.c:998
 msgid "Networkmanager is not running (waiting for it)\n"
 msgstr "NetworkManager wird nicht ausgeführt (es wird gewartet)\n"
 
@@ -5625,11 +5582,12 @@ msgid ""
 "  -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"
+"  -c[olors] auto|yes|no                      whether to use colors in output\n"
 "  -f[ields] <field1,field2,...>|all|common   specify fields to output\n"
 "  -e[scape] yes|no                           escape columns separators in "
 "values\n"
+"  -n[ocheck]                                 don't check nmcli and "
+"NetworkManager versions\n"
 "  -a[sk]                                     ask for missing parameters\n"
 "  -s[how-secrets]                            allow displaying passwords\n"
 "  -w[ait] <seconds>                          set timeout waiting for "
@@ -5657,6 +5615,8 @@ msgstr ""
 "  -f[ields] <Feld1,Feld2, …>|all|common      Ausgabefelder angeben\n"
 "  -e[scape] yes|no                           Escape-Spaltenseparator in "
 "Werten\n"
+"  -n[ocheck]                                 Nicht die Versionen von nmcli "
+"und NetworkManager prüfen\n"
 "  -a[sk]                                     Nach fehlenden Parametern "
 "fragen\n"
 "  -s[how-secrets]                            Passwörter anzeigen\n"
@@ -5676,88 +5636,86 @@ msgstr ""
 "\n"
 "\n"
 
-#: ../clients/cli/nmcli.c:142
+#: ../clients/cli/nmcli.c:143
 #, c-format
 msgid "Error: Object '%s' is unknown, try 'nmcli help'."
 msgstr "Fehler: Objekt »%s« ist unbekannt, versuchen Sie »nmcli help«."
 
-#: ../clients/cli/nmcli.c:172
+#: ../clients/cli/nmcli.c:173
 #, c-format
 msgid "Error: Option '--terse' is specified the second time."
 msgstr "Fehler: Option »--terse« wurde zweimal gesetzt."
 
-#: ../clients/cli/nmcli.c:177
+#: ../clients/cli/nmcli.c:178
 #, c-format
 msgid "Error: Option '--terse' is mutually exclusive with '--pretty'."
 msgstr "Fehler: Option »--terse« schließt »--pretty« aus."
 
-#: ../clients/cli/nmcli.c:185
+#: ../clients/cli/nmcli.c:186
 #, c-format
 msgid "Error: Option '--pretty' is specified the second time."
 msgstr "Fehler: Option »--pretty« wurde zweimal gesetzt."
 
-#: ../clients/cli/nmcli.c:190
+#: ../clients/cli/nmcli.c:191
 #, c-format
 msgid "Error: Option '--pretty' is mutually exclusive with '--terse'."
 msgstr "Fehler: Option »--pretty« schließt »--terse« aus."
 
-#: ../clients/cli/nmcli.c:200 ../clients/cli/nmcli.c:216
-#: ../clients/cli/nmcli.c:234 ../clients/cli/nmcli.c:265
+#: ../clients/cli/nmcli.c:201 ../clients/cli/nmcli.c:217
+#: ../clients/cli/nmcli.c:235 ../clients/cli/nmcli.c:266
 #, c-format
 msgid "Error: missing argument for '%s' option."
 msgstr "Fehler: Fehlendes Argument für die Option »%s«."
 
-#: ../clients/cli/nmcli.c:209 ../clients/cli/nmcli.c:227
-#: ../clients/cli/nmcli.c:243
+#: ../clients/cli/nmcli.c:210 ../clients/cli/nmcli.c:228
+#: ../clients/cli/nmcli.c:244
 #, 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:250
+#: ../clients/cli/nmcli.c:251
 #, c-format
 msgid "Error: fields for '%s' options are missing."
 msgstr "Fehler: Felder für die Option »%s« fehlen."
 
-#: ../clients/cli/nmcli.c:270
+#: ../clients/cli/nmcli.c:271
 #, c-format
 msgid "Error: '%s' is not a valid timeout for '%s' option."
 msgstr "Fehler: »%s« ist kein gültiger Zeitablauf für die Option »%s«."
 
-#: ../clients/cli/nmcli.c:277
+#: ../clients/cli/nmcli.c:278
 #, c-format
 msgid "nmcli tool, version %s\n"
 msgstr "nmcli-Werkzeug, Version %s\n"
 
-#: ../clients/cli/nmcli.c:283
+#: ../clients/cli/nmcli.c:284
 #, 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:366 ../clients/cli/nmcli.c:376
+#: ../clients/cli/nmcli.c:367 ../clients/cli/nmcli.c:377
 #, c-format
-msgid ""
-"\n"
+msgid "\n"
 "Error: nmcli terminated by signal %s (%d)\n"
-msgstr ""
-"\n"
+msgstr "\n"
 "Fehler: nmcli mit Signal %s (%d) beendet\n"
 
-#: ../clients/cli/nmcli.c:407
+#: ../clients/cli/nmcli.c:408
 #, c-format
 msgid "Failed to set signal mask: %d\n"
 msgstr "Fehler beim Festlegen der Signalmaske: %d\n"
 
-#: ../clients/cli/nmcli.c:414
+#: ../clients/cli/nmcli.c:415
 #, c-format
 msgid "Failed to create signal handling thread: %d\n"
 msgstr "Erstellen des Threads für die Signalbehandlung schlug fehl: %d\n"
 
-#: ../clients/cli/nmcli.c:511 ../clients/nm-online.c:193
+#: ../clients/cli/nmcli.c:512 ../clients/nm-online.c:193
 #, c-format
 msgid "Error: Could not create NMClient object: %s."
 msgstr "Fehler: NMClient-Objekt konnte nicht erstellt werden: %s."
 
-#: ../clients/cli/nmcli.c:528
+#: ../clients/cli/nmcli.c:529
 msgid "Success"
 msgstr "Erfolg"
 
@@ -5776,173 +5734,166 @@ msgstr "Legitimationsfehler: %s\n"
 msgid "Warning: polkit agent initialization failed: %s\n"
 msgstr "Warnung: Initialisierung des polkit-Agenten ist fehlgeschlagen: %s\n"
 
-#: ../clients/cli/settings.c:794
+#: ../clients/cli/settings.c:790
 #, c-format
 msgid "%d (key)"
 msgstr "%d (Schlüssel)"
 
-#: ../clients/cli/settings.c:796
+#: ../clients/cli/settings.c:792
 #, c-format
 msgid "%d (passphrase)"
 msgstr "%d (Passphrase)"
 
-#: ../clients/cli/settings.c:799 ../clients/cli/settings.c:885
+#: ../clients/cli/settings.c:795 ../clients/cli/settings.c:881
 #, c-format
 msgid "%d (unknown)"
 msgstr "%d (unbekannt)"
 
-#: ../clients/cli/settings.c:828
+#: ../clients/cli/settings.c:824
 msgid "0 (NONE)"
 msgstr "0 (KEINES)"
 
-#: ../clients/cli/settings.c:834
+#: ../clients/cli/settings.c:830
 msgid "REORDER_HEADERS, "
 msgstr "REORDER_HEADERS, "
 
-#: ../clients/cli/settings.c:836
+#: ../clients/cli/settings.c:832
 msgid "GVRP, "
 msgstr "GVRP, "
 
-#: ../clients/cli/settings.c:838
+#: ../clients/cli/settings.c:834
 msgid "LOOSE_BINDING, "
 msgstr "LOOSE_BINDING, "
 
-#: ../clients/cli/settings.c:840
+#: ../clients/cli/settings.c:836
 msgid "MVRP, "
 msgstr "MVRP, "
 
-#: ../clients/cli/settings.c:879
+#: ../clients/cli/settings.c:875
 #, c-format
 msgid "%d (disabled)"
 msgstr "%d (deaktiviert)"
 
-#: ../clients/cli/settings.c:881
+#: ../clients/cli/settings.c:877
 #, c-format
 msgid "%d (enabled, prefer public IP)"
 msgstr "%d (aktiviert, öffentliche IP bevorzugen)"
 
-#: ../clients/cli/settings.c:883
+#: ../clients/cli/settings.c:879
 #, c-format
 msgid "%d (enabled, prefer temporary IP)"
 msgstr "%d (aktiviert, temporäre IP bevorzugen)"
 
-#: ../clients/cli/settings.c:898
+#: ../clients/cli/settings.c:894
 #, c-format
 msgid "%d (no)"
 msgstr "%d (nein)"
 
-#: ../clients/cli/settings.c:900
+#: ../clients/cli/settings.c:896
 #, c-format
 msgid "%d (yes)"
 msgstr "%d (ja)"
 
-#: ../clients/cli/settings.c:903 ../clients/cli/settings.c:1603
+#: ../clients/cli/settings.c:899 ../clients/cli/settings.c:1554
 #, c-format
 msgid "%d (default)"
 msgstr "%d (Vorgabe)"
 
-#: ../clients/cli/settings.c:916
+#: ../clients/cli/settings.c:912
 msgid "0 (none)"
 msgstr "0 (keine)"
 
-#: ../clients/cli/settings.c:922
+#: ../clients/cli/settings.c:918
 msgid "agent-owned, "
 msgstr "Agent-Besitz, "
 
-#: ../clients/cli/settings.c:924
+#: ../clients/cli/settings.c:920
 msgid "not saved, "
 msgstr "nicht gespeichert,"
 
-#: ../clients/cli/settings.c:926
+#: ../clients/cli/settings.c:922
 msgid "not required, "
 msgstr "nicht notwendig, "
 
-#: ../clients/cli/settings.c:975 ../clients/tui/nmt-mtu-entry.c:84
+#: ../clients/cli/settings.c:971 ../clients/tui/nmt-mtu-entry.c:84
 msgid "(default)"
 msgstr "(Vorgabe)"
 
-#. ----------------------------------------------------------------------------
-#: ../clients/cli/settings.c:1061 ../clients/cli/settings.c:1104
-#: ../clients/cli/settings.c:1138 ../clients/cli/settings.c:1165
-#: ../clients/cli/settings.c:7957
-msgid "<hidden>"
-msgstr "<verborgen>"
-
-#: ../clients/cli/settings.c:1300
+#: ../clients/cli/settings.c:1252
 msgid "0 (disabled)"
 msgstr "0 (deaktiviert)"
 
-#: ../clients/cli/settings.c:1306
+#: ../clients/cli/settings.c:1258
 msgid "enabled, "
 msgstr "aktiviert, "
 
-#: ../clients/cli/settings.c:1308
+#: ../clients/cli/settings.c:1260
 msgid "advertise, "
 msgstr "sichtbar, "
 
-#: ../clients/cli/settings.c:1310
+#: ../clients/cli/settings.c:1262
 msgid "willing, "
 msgstr "willig, "
 
-#: ../clients/cli/settings.c:1338
+#: ../clients/cli/settings.c:1290
 msgid "-1 (unset)"
 msgstr "-1 (nicht gesetzt)"
 
-#: ../clients/cli/settings.c:1470 ../clients/cli/settings.c:1774
-#: ../clients/cli/settings.c:1914
+#: ../clients/cli/settings.c:1422 ../clients/cli/settings.c:1724
+#: ../clients/cli/settings.c:1864
 msgid "auto"
 msgstr "auto"
 
-#: ../clients/cli/settings.c:1483 ../clients/cli/settings.c:1945
+#: ../clients/cli/settings.c:1435 ../clients/cli/settings.c:1895
 msgid "default"
 msgstr "Vorgabe"
 
-#: ../clients/cli/settings.c:1605
+#: ../clients/cli/settings.c:1556
 #, c-format
 msgid "%d (off)"
 msgstr "%d (aus)"
 
-#: ../clients/cli/settings.c:1820
+#: ../clients/cli/settings.c:1770
 #, c-format
 msgid ""
 "invalid option '%s', use a combination of [%s] or 'ignore', 'default' or "
 "'none'"
 msgstr ""
-"ungültige Option »%s«. Verwenden Sie eine Kombination aus [%s] oder "
-"»ignore« (ignorieren), »default« (Voreinstellung) oder »none« (keine)"
+"ungültige Option »%s«, verwenden Sie eine Kombination aus [%s] oder "
+"»ignore«, »default« oder »none«"
 
-#: ../clients/cli/settings.c:1831
+#: ../clients/cli/settings.c:1781
 msgid "'default' and 'ignore' are incompatible with other flags"
 msgstr "»default« und »ignore« sind nicht kompatibel mit anderen Flags"
 
-#: ../clients/cli/settings.c:1867
+#: ../clients/cli/settings.c:1817
 #, c-format
 msgid "invalid mode '%s', use one of %s"
-msgstr "ungültiger Modus »%s«. Verwenden Sie einen aus %s"
+msgstr "ungültiger Modus »%s«; verwenden Sie einen von %s"
 
-#: ../clients/cli/settings.c:1949
+#: ../clients/cli/settings.c:1899
 #, c-format
 msgid "always"
 msgstr "Immer"
 
-#: ../clients/cli/settings.c:2049 ../clients/cli/settings.c:3329
-#: ../clients/cli/settings.c:4521 ../clients/cli/settings.c:5024
+#: ../clients/cli/settings.c:1999 ../clients/cli/settings.c:3286
+#: ../clients/cli/settings.c:4478 ../clients/cli/settings.c:4981
 #: ../libnm-core/nm-keyfile-reader.c:573
 #, c-format
 msgid "invalid option '%s', use one of [%s]"
 msgstr "ungültige Option »%s«. Verwenden Sie eine aus [%s]"
 
-#: ../clients/cli/settings.c:2159
+#: ../clients/cli/settings.c:2116
 #, c-format
 msgid "Do you also want to set '%s' to '%s'? [yes]: "
 msgstr "Möchten Sie auch »%s« auf »%s« setzen? [Ja]: "
 
-#: ../clients/cli/settings.c:2161
+#: ../clients/cli/settings.c:2118
 #, c-format
 msgid "Do you also want to clear '%s'? [yes]: "
 msgstr "Möchten Sie auch »%s« löschen? [Ja]: "
 
-#: ../clients/cli/settings.c:2322
+#: ../clients/cli/settings.c:2279
 #, c-format
 msgid ""
 "Warning: %s.%s set to '%s', but it might be ignored in infrastructure mode\n"
@@ -5950,88 +5901,88 @@ msgstr ""
 "Warnung: %s.%s wurde auf »%s« festgelegt. Es könnte aber im Infrastruktur-"
 "Modus ignoriert werden\n"
 
-#: ../clients/cli/settings.c:2341
+#: ../clients/cli/settings.c:2298
 #, c-format
 msgid "Warning: setting %s.%s requires removing ipv4 and ipv6 settings\n"
 msgstr ""
 "Warnung: Die Einstellung %s.%s erfordert das Entfernen von ipv4- und ipv6-"
 "Einstellungen\n"
 
-#: ../clients/cli/settings.c:2343
+#: ../clients/cli/settings.c:2300
 msgid "Do you want to remove them? [yes] "
 msgstr "Möchten Sie diese entfernen? [ja] "
 
-#: ../clients/cli/settings.c:2439 ../clients/cli/settings.c:2834
-#: ../clients/cli/settings.c:5225
+#: ../clients/cli/settings.c:2396 ../clients/cli/settings.c:2791
+#: ../clients/cli/settings.c:5182
 #, c-format
 msgid "'%s' is not valid"
 msgstr "»%s» ist ungültig"
 
-#: ../clients/cli/settings.c:2462
+#: ../clients/cli/settings.c:2419
 #, c-format
 msgid "'%d' is not valid; use <%d-%d>"
 msgstr "»%d« ist ungültig. Verwenden Sie <%d-%d>"
 
-#: ../clients/cli/settings.c:2484
+#: ../clients/cli/settings.c:2441
 #, c-format
 msgid "'%lld' is not valid; use <%lld-%lld>"
 msgstr "»%lld« ist ungültig. Verwenden Sie <%lld-%lld>"
 
-#: ../clients/cli/settings.c:2506
+#: ../clients/cli/settings.c:2463
 #, c-format
 msgid "'%u' is not valid; use <%u-%u>"
 msgstr "»%u« ist ungültig. Verwenden Sie <%u-%u>"
 
-#: ../clients/cli/settings.c:2545
+#: ../clients/cli/settings.c:2502
 #, 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/cli/settings.c:2612
+#: ../clients/cli/settings.c:2569
 #, c-format
 msgid "'%s' is not valid; use <option>=<value>"
-msgstr "»%s« ist ungültig. Verwenden Sie <Option>=<Wert>"
+msgstr "»%s« ist ungültig; verwenden Sie <option>=<value>"
 
-#: ../clients/cli/settings.c:2646
+#: ../clients/cli/settings.c:2603
 #, c-format
 msgid "index '%s' is not valid"
 msgstr "Index »%s« ist ungültig"
 
-#: ../clients/cli/settings.c:2651 ../clients/cli/settings.c:2676
+#: ../clients/cli/settings.c:2608 ../clients/cli/settings.c:2633
 msgid "no item to remove"
 msgstr "Kein Eintrag zum Entfernen vorhanden"
 
-#: ../clients/cli/settings.c:2655 ../clients/cli/settings.c:2680
+#: ../clients/cli/settings.c:2612 ../clients/cli/settings.c:2637
 #, c-format
 msgid "index '%d' is not in range <0-%d>"
 msgstr "Index »%d« ist außerhalb des Bereichs <0-%d>"
 
-#: ../clients/cli/settings.c:2695
+#: ../clients/cli/settings.c:2652
 #, c-format
 msgid "invalid option '%s'"
 msgstr "Ungültige Option »%s«"
 
-#: ../clients/cli/settings.c:2697
+#: ../clients/cli/settings.c:2654
 msgid "missing option"
 msgstr "fehlende Option"
 
-#: ../clients/cli/settings.c:2724 ../clients/cli/settings.c:2744
-#: ../clients/cli/settings.c:2764 ../clients/cli/settings.c:2784
+#: ../clients/cli/settings.c:2681 ../clients/cli/settings.c:2701
+#: ../clients/cli/settings.c:2721 ../clients/cli/settings.c:2741
 #, 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/cli/settings.c:2818
+#: ../clients/cli/settings.c:2775
 #, c-format
 msgid "'%s' is not a valid value; use -1, 0 or 1"
 msgstr "»%s« ist ein ungültiger Wert. Verwenden Sie -1, 0, oder 1"
 
-#: ../clients/cli/settings.c:2850
+#: ../clients/cli/settings.c:2807
 #, c-format
 msgid "'%s' is not a valid Ethernet MAC"
 msgstr "»%s« ist keine gültige Ethernet MAC-Adresse"
 
-#: ../clients/cli/settings.c:2875 ../libnm-core/nm-setting-connection.c:864
+#: ../clients/cli/settings.c:2832 ../libnm-core/nm-setting-connection.c:864
 #: ../libnm-core/nm-setting-infiniband.c:255
 #: ../libnm-util/nm-setting-connection.c:834
 #: ../libnm-util/nm-setting-infiniband.c:269
@@ -6039,41 +5990,40 @@ msgstr "»%s« ist keine gültige Ethernet MAC-Adresse"
 msgid "'%s' is not a valid interface name"
 msgstr "»%s« ist kein gültiger Schnittstellenname"
 
-#: ../clients/cli/settings.c:2899
+#: ../clients/cli/settings.c:2856
 #, 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/cli/settings.c:2911
+#: ../clients/cli/settings.c:2868
 #, c-format
 msgid "Warning: '%s' sum is higher than all flags => all flags set\n"
-msgstr ""
+msgstr "Warnung: '%s' Summe ist größer als alle Flags => alle Flags gesetzt\n"
 
-#: ../clients/cli/settings.c:2952
+#: ../clients/cli/settings.c:2909
 #, c-format
 msgid "'%s' is not a valid hex character"
 msgstr "»%s« ist kein gültiger hexadezimaler Wert"
 
-#: ../clients/cli/settings.c:2982
+#: ../clients/cli/settings.c:2939
 #, c-format
 msgid "'%s' is not a valid MAC"
 msgstr "»%s« ist keine gültige MAC-Adresse"
 
-#: ../clients/cli/settings.c:3008 ../libnm-core/nm-setting-connection.c:853
+#: ../clients/cli/settings.c:2965 ../libnm-core/nm-setting-connection.c:853
 #: ../libnm-util/nm-setting-connection.c:791
 #, c-format
 msgid "'%s' is not a valid UUID"
 msgstr "»%s» ist keine gültige UUID"
 
-#: ../clients/cli/settings.c:3075
+#: ../clients/cli/settings.c:3032
 #, c-format
 msgid "the property doesn't contain permission '%s'"
 msgstr "die Eigenschaft enthält nicht die Berechtigung »%s«"
 
-#: ../clients/cli/settings.c:3087
+#: ../clients/cli/settings.c:3044
 msgid ""
-"Enter a list of user permissions. This is a list of user names formatted "
-"as:\n"
+"Enter a list of user permissions. This is a list of user names formatted as:\n"
 "  [user:]<user name 1>, [user:]<user name 2>,...\n"
 "The items can be separated by commas or spaces.\n"
 "\n"
@@ -6086,42 +6036,41 @@ msgstr ""
 "\n"
 "Beispiel: alice bob charlie\n"
 
-#: ../clients/cli/settings.c:3106
+#: ../clients/cli/settings.c:3063
 #, 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/cli/settings.c:3150
+#: ../clients/cli/settings.c:3107
 #, 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:3154 ../clients/cli/settings.c:3170
+#: ../clients/cli/settings.c:3111 ../clients/cli/settings.c:3127
 #, c-format
 msgid "'%s' is not a VPN connection profile"
 msgstr "»%s« ist kein Name eines VPN-Verbindungsprofils"
 
-#: ../clients/cli/settings.c:3163
+#: ../clients/cli/settings.c:3120
 #, c-format
 msgid "'%s' is not a name of any exiting profile"
 msgstr "»%s« ist kein Name eines bestehenden Profils"
 
-#: ../clients/cli/settings.c:3197
+#: ../clients/cli/settings.c:3154
 #, c-format
 msgid "the value '%s' is not a valid UUID"
 msgstr "Der Wert »%s» ist keine gültige UUID"
 
-#: ../clients/cli/settings.c:3204
+#: ../clients/cli/settings.c:3161
 #, c-format
 msgid "the property doesn't contain UUID '%s'"
 msgstr "die Eigenschaft enthält nicht die UUID »%s«"
 
-#: ../clients/cli/settings.c:3216
+#: ../clients/cli/settings.c:3173
 msgid ""
-"Enter secondary connections that should be activated when this connection "
-"is\n"
+"Enter secondary connections that should be activated when this connection is\n"
 "activated. Connections can be specified either by UUID or ID (name). nmcli\n"
 "transparently translates names to UUIDs. Note that NetworkManager only "
 "supports\n"
@@ -6142,7 +6091,7 @@ msgstr ""
 "\n"
 "Beispiel: private-openvpn, fe6ba5d8-c2fc-4aae-b2e3-97efddd8d9a7\n"
 
-#: ../clients/cli/settings.c:3283
+#: ../clients/cli/settings.c:3240
 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"
@@ -6150,50 +6099,59 @@ msgid ""
 "'false','no','off' to set the connection as not metered\n"
 "'unknown' to let NetworkManager choose a value using some heuristics\n"
 msgstr ""
+"Geben Sie einen Wert an, der anzeigt, ob die Verbindung einem "
+"Datenkontingent, \n"
+"Nutzungskosten oder anderen Einschränkungen unterliegt. Akzeptierte Optionen "
+"sind:\n"
+"'wahr','ja','an' um die Verbindung als gemessen anzugeben\n"
+"'falsch','nein','aus' um die Verbindung als nicht gemessen anzugeben\n"
+"'unbekannt' um den NetzwerkManager einen heuristischen Wert auswählen zu "
+"lassen\n"
 
-#: ../clients/cli/settings.c:3407
+#: ../clients/cli/settings.c:3364
 msgid "private key password not provided"
 msgstr "Passwort für privaten Schlüssel nicht angegeben"
 
-#: ../clients/cli/settings.c:3435
+#: ../clients/cli/settings.c:3392
 #, c-format
 msgid "the property doesn't contain EAP method '%s'"
 msgstr "Die Eigenschaft enthält nicht die EAP-Methode »%s«"
 
-#: ../clients/cli/settings.c:3452
+#: ../clients/cli/settings.c:3409
 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 ""
-"Geben Sie den Dateipfad zum CA-Zertifikat ein (optional mit Präfix "
-"»file://«).\n"
+"Geben Sie den Dateipfad zum CA-Zertifikat ein (optional mit Präfix »file://"
+"«).\n"
 "  [file://]<Dateipfad>\n"
 "Beachten Sie, dass nmcli nicht die Angabe von Zertifikaten als Rohdaten "
 "unterstützt.\n"
 "Beispiel: /home/cimrman/cacert.crt\n"
 
-#: ../clients/cli/settings.c:3471
-#, fuzzy, c-format
+#: ../clients/cli/settings.c:3428
+#, c-format
 msgid "the property doesn't contain alternative subject match '%s'"
-msgstr "die Eigenschaft enthält kein alternative Themen passend zu »%s«"
+msgstr ""
+"Die Eigenschaft enthält nicht die alternative Subjekt-Übereinstimmung »%s«"
 
-#: ../clients/cli/settings.c:3487
+#: ../clients/cli/settings.c:3444
 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 ""
-"Geben Sie den Dateipfad zum Client-Zertifikat ein (optional mit Präfix "
-"»file://«).\n"
+"Geben Sie den Dateipfad zum Client-Zertifikat ein (optional mit Präfix »file:"
+"//«).\n"
 "  [file://]<Dateipfad>\n"
 "Beachten Sie, dass nmcli nicht die Angabe von Zertifikaten als Rohdaten "
 "unterstützt.\n"
 "Beispiel: /home/cimrman/jara.crt\n"
 
-#: ../clients/cli/settings.c:3499
+#: ../clients/cli/settings.c:3456
 msgid ""
 "Enter file path to CA certificate for inner authentication (optionally "
 "prefixed\n"
@@ -6209,12 +6167,14 @@ msgstr ""
 "unterstützt.\n"
 "Beispiel: /home/cimrman/ca-zweite-phase.crt\n"
 
-#: ../clients/cli/settings.c:3519
-#, fuzzy, c-format
+#: ../clients/cli/settings.c:3476
+#, c-format
 msgid "the property doesn't contain \"phase2\" alternative subject match '%s'"
-msgstr "die Eigenschaft enthält nicht die Berechtigung »%s«"
+msgstr ""
+"die Eigenschaft enthält nicht \"Phase 2\" der alternativen Subjekt-"
+"Übereinstimmung »%s«"
 
-#: ../clients/cli/settings.c:3535
+#: ../clients/cli/settings.c:3492
 msgid ""
 "Enter file path to client certificate for inner authentication (optionally "
 "prefixed\n"
@@ -6230,7 +6190,7 @@ msgstr ""
 "unterstützt.\n"
 "Beispiel: /home/cimrman/jara-zweite-phase.crt\n"
 
-#: ../clients/cli/settings.c:3555
+#: ../clients/cli/settings.c:3512
 msgid ""
 "Enter path to a private key and the key password (if not set yet):\n"
 "  [file://]<file path> [<password>]\n"
@@ -6242,12 +6202,11 @@ msgstr ""
 "  [file://]<Dateipfad> [<Passwort>]\n"
 "Beispiel: /home/MaxMustermann/jara-priv-key StrengGeheim\n"
 
-#: ../clients/cli/settings.c:3626
+#: ../clients/cli/settings.c:3583
 msgid ""
 "Enter bytes as a list of hexadecimal values.\n"
 "Two formats are accepted:\n"
-"(a) a string of hexadecimal digits, where each two digits represent one "
-"byte\n"
+"(a) a string of hexadecimal digits, where each two digits represent one byte\n"
 "(b) space-separated list of bytes written as hexadecimal digits (with "
 "optional 0x/0X prefix, and optional leading 0).\n"
 "\n"
@@ -6264,7 +6223,7 @@ msgstr ""
 "Beispiele: ab0455a6ea3a74C2\n"
 "           ab 4 55 0xa6 ea 3a 74 C2\n"
 
-#: ../clients/cli/settings.c:3747
+#: ../clients/cli/settings.c:3704
 #, c-format
 msgid ""
 "Enter a list of bonding options formatted as:\n"
@@ -6295,32 +6254,32 @@ msgstr ""
 "\n"
 "Beispiel: mode=2,miimon=120\n"
 
-#: ../clients/cli/settings.c:3778
+#: ../clients/cli/settings.c:3735
 #, c-format
 msgid "'%s' is not a valid InfiniBand MAC"
 msgstr "»%s« ist keine gültige InfiniBand MAC-Adresse"
 
-#: ../clients/cli/settings.c:3815
+#: ../clients/cli/settings.c:3772
 #, c-format
 msgid "'%s' is not a valid IBoIP P_Key"
 msgstr "»%s« ist kein gültiger IBoIP P_Key"
 
-#: ../clients/cli/settings.c:3846
+#: ../clients/cli/settings.c:3803
 #, c-format
 msgid "'%s' is not valid (the format is: ip[/prefix] [next-hop] [metric])"
 msgstr "»%s« ist ungültig (das Format ist:  ip/[prefix] [next-hop] [Metrik])"
 
-#: ../clients/cli/settings.c:3894 ../clients/cli/settings.c:3913
+#: ../clients/cli/settings.c:3851 ../clients/cli/settings.c:3870
 #, c-format
 msgid "invalid IPv4 address '%s'"
 msgstr "Ungültige IPv4-Adresse »%s«"
 
-#: ../clients/cli/settings.c:3919 ../clients/cli/settings.c:4227
+#: ../clients/cli/settings.c:3876 ../clients/cli/settings.c:4184
 #, c-format
 msgid "the property doesn't contain DNS server '%s'"
 msgstr "die Eigenschaft enthält nicht den DNS-Server »%s«"
 
-#: ../clients/cli/settings.c:3931
+#: ../clients/cli/settings.c:3888
 msgid ""
 "Enter a list of IPv4 addresses of DNS servers.\n"
 "\n"
@@ -6330,22 +6289,22 @@ msgstr ""
 "\n"
 "Beispiel: 8.8.8.8, 8.8.4.4\n"
 
-#: ../clients/cli/settings.c:3967 ../clients/cli/settings.c:4281
+#: ../clients/cli/settings.c:3924 ../clients/cli/settings.c:4238
 #, c-format
 msgid "the property doesn't contain DNS search domain '%s'"
 msgstr "die Eigenschaft enthält nicht die Suchdomäne »%s«"
 
-#: ../clients/cli/settings.c:4005 ../clients/cli/settings.c:4319
+#: ../clients/cli/settings.c:3962 ../clients/cli/settings.c:4276
 #, c-format
 msgid "the property doesn't contain DNS option '%s'"
 msgstr "Die Eigenschaft enthält nicht die DNS-Option »%s«"
 
-#: ../clients/cli/settings.c:4059 ../clients/cli/settings.c:4372
+#: ../clients/cli/settings.c:4016 ../clients/cli/settings.c:4329
 #, c-format
 msgid "the property doesn't contain IP address '%s'"
 msgstr "die Eigenschaft enthält nicht die IP-Adresse »%s«"
 
-#: ../clients/cli/settings.c:4072
+#: ../clients/cli/settings.c:4029
 msgid ""
 "Enter a list of IPv4 addresses formatted as:\n"
 "  ip[/prefix], ip[/prefix],...\n"
@@ -6359,17 +6318,17 @@ msgstr ""
 "\n"
 "Beispiel: 192.168.1.5/24, 10.0.0.11/24\n"
 
-#: ../clients/cli/settings.c:4088 ../clients/cli/settings.c:4401
+#: ../clients/cli/settings.c:4045 ../clients/cli/settings.c:4358
 #, c-format
 msgid "invalid gateway address '%s'"
 msgstr "Ungültige Gateway-Adresse »%s«"
 
-#: ../clients/cli/settings.c:4143 ../clients/cli/settings.c:4456
+#: ../clients/cli/settings.c:4100 ../clients/cli/settings.c:4413
 #, c-format
 msgid "the property doesn't contain route '%s'"
 msgstr "Die Eigenschaft enthält nicht die Route »%s«"
 
-#: ../clients/cli/settings.c:4156
+#: ../clients/cli/settings.c:4113
 msgid ""
 "Enter a list of IPv4 routes formatted as:\n"
 "  ip[/prefix] [next-hop] [metric],...\n"
@@ -6392,12 +6351,12 @@ 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/cli/settings.c:4202 ../clients/cli/settings.c:4221
+#: ../clients/cli/settings.c:4159 ../clients/cli/settings.c:4178
 #, c-format
 msgid "invalid IPv6 address '%s'"
 msgstr "Ungültige IPv6-Adresse »%s«"
 
-#: ../clients/cli/settings.c:4239
+#: ../clients/cli/settings.c:4196
 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 "
@@ -6417,7 +6376,7 @@ msgstr ""
 "\n"
 "Beispiel: 2607:f0d0:1002:51::4, 2607:f0d0:1002:51::1\n"
 
-#: ../clients/cli/settings.c:4385
+#: ../clients/cli/settings.c:4342
 msgid ""
 "Enter a list of IPv6 addresses formatted as:\n"
 "  ip[/prefix], ip[/prefix],...\n"
@@ -6431,7 +6390,7 @@ msgstr ""
 "\n"
 "Beispiel: 2607:f0d0:1002:51::4/64, 1050:0:0:0:5:600:300c:326b\n"
 
-#: ../clients/cli/settings.c:4469
+#: ../clients/cli/settings.c:4426
 msgid ""
 "Enter a list of IPv6 routes formatted as:\n"
 "  ip[/prefix] [next-hop] [metric],...\n"
@@ -6456,28 +6415,28 @@ msgstr ""
 "db8:beef::3 2\n"
 "           abbe::/64 55\n"
 
-#: ../clients/cli/settings.c:4486 ../libnm-core/nm-setting-gsm.c:363
+#: ../clients/cli/settings.c:4443 ../libnm-core/nm-setting-gsm.c:363
 #: ../libnm-util/nm-setting-gsm.c:364
 #, c-format
 msgid "'%s' is not a number"
 msgstr "»%s« ist keine Zahl"
 
-#: ../clients/cli/settings.c:4493
+#: ../clients/cli/settings.c:4450
 #, c-format
 msgid "'%s' is not valid; use 0, 1, or 2"
 msgstr "»%s« ist ungültig. Verwenden Sie 0, 1 oder 2"
 
-#: ../clients/cli/settings.c:4540
+#: ../clients/cli/settings.c:4497
 #, c-format
 msgid "'%s' is not a valid channel; use <1-13>"
 msgstr "»%s« ist kein gültiger Kanal. Verwenden Sie <1-13>"
 
-#: ../clients/cli/settings.c:4577
+#: ../clients/cli/settings.c:4534
 #, c-format
 msgid "'%s' is not valid; use [e, o, n]"
 msgstr "»%s« ist ungültig. Verwenden Sie [e, o, n]"
 
-#: ../clients/cli/settings.c:4605
+#: ../clients/cli/settings.c:4562
 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 "
@@ -6495,53 +6454,56 @@ msgstr ""
 "\"roundrobin\"}, \"ports\": {\"eth1\": {}, \"eth2\": {}} }\n"
 "          set team.config /etc/my-team.conf\n"
 
-#: ../clients/cli/settings.c:4645
+#: ../clients/cli/settings.c:4602
 msgid "no priority to remove"
 msgstr "Keine Priorität zum Entfernen"
 
-#: ../clients/cli/settings.c:4649
+#: ../clients/cli/settings.c:4606
 #, c-format
 msgid "index '%d' is not in the range of <0-%d>"
 msgstr "Index »%d« ist außerhalb des Bereichs <0-%d>"
 
-#: ../clients/cli/settings.c:4688
+#: ../clients/cli/settings.c:4645
 #, c-format
 msgid ""
-"Warning: only one mapping at a time is supported; taking the first one (%s)\n"
+"Warning: only one mapping at a time is supported; taking the first one "
+"(%s)\n"
 msgstr ""
 "Warnung: Es wird nur eine Abbildung gleichzeitig unterstützt. Es wird die "
 "erste verwendet (%s)\n"
 
-#: ../clients/cli/settings.c:4695
+#: ../clients/cli/settings.c:4652
 #, c-format
 msgid "the property doesn't contain mapping '%s'"
 msgstr "Die Eigenschaft enthält nicht die Abbildung »%s«"
 
-#: ../clients/cli/settings.c:4743
+#: ../clients/cli/settings.c:4700
 #, c-format
 msgid "'%s' cannot be empty"
 msgstr "»%s« darf nicht leer sein"
 
-#: ../clients/cli/settings.c:4817 ../clients/cli/settings.c:4984
-#: ../libnm-core/nm-setting-wired.c:651 ../libnm-core/nm-setting-wireless.c:820
-#: ../libnm-core/nm-setting-wireless.c:832 ../libnm-util/nm-setting-wired.c:646
+#: ../clients/cli/settings.c:4774 ../clients/cli/settings.c:4941
+#: ../libnm-core/nm-setting-wired.c:651
+#: ../libnm-core/nm-setting-wireless.c:820
+#: ../libnm-core/nm-setting-wireless.c:832
+#: ../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/cli/settings.c:4823 ../clients/cli/settings.c:4990
+#: ../clients/cli/settings.c:4780 ../clients/cli/settings.c:4947
 #, c-format
 msgid "the property doesn't contain MAC address '%s'"
 msgstr "die Eigenschaft enthält nicht die MAC-Adresse »%s«"
 
-#: ../clients/cli/settings.c:4842
+#: ../clients/cli/settings.c:4799
 #, 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/cli/settings.c:4856
+#: ../clients/cli/settings.c:4813
 msgid ""
 "Enter a list of subchannels (comma or space separated).\n"
 "\n"
@@ -6552,12 +6514,12 @@ msgstr ""
 "\n"
 "Beispiel: 0.0.0e20 0.0.0e21 0.0.0e22\n"
 
-#: ../clients/cli/settings.c:4878
+#: ../clients/cli/settings.c:4835
 #, c-format
 msgid "'%s' string value should consist of 1 - 199 characters"
-msgstr "Die Zeichenkette »%s« muss aus 1-199 Zeichen bestehen"
+msgstr "'%s' Zeichenkettenwert sollte aus 1 - 199 Zeichen bestehen"
 
-#: ../clients/cli/settings.c:4910
+#: ../clients/cli/settings.c:4867
 #, c-format
 msgid ""
 "Enter a list of S/390 options formatted as:\n"
@@ -6568,30 +6530,30 @@ msgstr ""
 "  Option = <Wert>, Option = <Wert>,… \n"
 "Mögliche Optionen sind: %s\n"
 
-#: ../clients/cli/settings.c:4956
+#: ../clients/cli/settings.c:4913
 #, c-format
 msgid "'%s' is not a valid channel"
 msgstr "»%s« ist kein gültiger Kanal"
 
-#: ../clients/cli/settings.c:4962
+#: ../clients/cli/settings.c:4919
 #, c-format
 msgid "'%ld' is not a valid channel"
 msgstr "»%ld« ist kein gültiger Kanal"
 
-#: ../clients/cli/settings.c:5056
+#: ../clients/cli/settings.c:5013
 #, c-format
 msgid "invalid option '%s', use 'default', 'never' or 'always'"
 msgstr ""
 "ungültige Option »%s«. Verwenden Sie »default« (Vorgabe), »never« (nie) oder "
 "»always« (immer)."
 
-#: ../clients/cli/settings.c:5117 ../clients/cli/settings.c:5156
-#: ../clients/cli/settings.c:5195
+#: ../clients/cli/settings.c:5074 ../clients/cli/settings.c:5113
+#: ../clients/cli/settings.c:5152
 #, c-format
 msgid "the property doesn't contain protocol '%s'"
 msgstr "die Eigenschaft enthält nicht das Protokoll »%s«"
 
-#: ../clients/cli/settings.c:5234
+#: ../clients/cli/settings.c:5191
 #, c-format
 msgid ""
 "'%s' not compatible with %s '%s', please change the key or set the right %s "
@@ -6600,23 +6562,23 @@ msgstr ""
 "»%s« ist nicht kompatibel mit %s »%s«. Bitte ändern Sie den Schlüssel oder "
 "legen Sie zuerst das richtige %s fest."
 
-#: ../clients/cli/settings.c:5242
+#: ../clients/cli/settings.c:5199
 #, c-format
 msgid "WEP key is guessed to be of '%s'\n"
 msgstr "Der WEP-Schlüssel ist vermutlich »%s«\n"
 
-#: ../clients/cli/settings.c:5244
+#: ../clients/cli/settings.c:5201
 #, c-format
 msgid "WEP key index set to '%d'\n"
 msgstr "Der WEP-Schlüsselindex wurde auf »%d« gesetzt\n"
 
-#: ../clients/cli/settings.c:5267
+#: ../clients/cli/settings.c:5224
 #, c-format
 msgid "'%s' not among [0 (unknown), 1 (key), 2 (passphrase)]"
 msgstr "»%s« nicht innerhalb [0 (unbekannt), 1 (Schlüssel), 2 (Passphrase)]"
 
-#: ../clients/cli/settings.c:5283 ../clients/cli/settings.c:5286
-#: ../clients/cli/settings.c:5289 ../clients/cli/settings.c:5292
+#: ../clients/cli/settings.c:5240 ../clients/cli/settings.c:5243
+#: ../clients/cli/settings.c:5246 ../clients/cli/settings.c:5249
 #, c-format
 msgid ""
 "Warning: '%s' is not compatible with '%s' type, please change or delete the "
@@ -6625,89 +6587,91 @@ msgstr ""
 "Warnung: »%s« ist nicht kompatibel mit dem Typ »%s«. Bitte ändern oder "
 "löschen Sie den Schlüssel.\n"
 
-#: ../clients/cli/settings.c:5305
+#: ../clients/cli/settings.c:5262
 #, c-format
 msgid ""
 "Enter the type of WEP keys. The accepted values are: 0 or unknown, 1 or key, "
 "and 2 or passphrase.\n"
 msgstr ""
-"Geben Sie den WEP-Schlüsseltyp ein. Gültige Werte sind: 0 oder "
-"»unknown« (unbekannt), 1 oder »key« (Schlüssel) und 2 oder "
-"»passphrase« (Passwort).\n"
+"Geben Sie den WEP-Schlüsseltyp ein. Gültige Werte sind: 0 oder »unknown« "
+"(unbekannt), 1 oder »key« (Schlüssel) und 2 oder »passphrase« (Passwort).\n"
 
-#: ../clients/cli/settings.c:5318
+#: ../clients/cli/settings.c:5275
 #, c-format
 msgid "'%s' is not a valid PSK"
 msgstr "»%s« ist kein gültiger PSK"
 
-#: ../clients/cli/settings.c:5362
+#: ../clients/cli/settings.c:5319
 #, c-format
 msgid "'%s' is not a valid DCB flag"
 msgstr "»%s« ist kein gültiges DCB-Flag"
 
-#: ../clients/cli/settings.c:5385
+#: ../clients/cli/settings.c:5342
 #, c-format
 msgid "'%s' is not a DCB app priority"
 msgstr "»%s« ist keine gültige DCB-Applikationspriorität"
 
-#: ../clients/cli/settings.c:5411
+#: ../clients/cli/settings.c:5368
 msgid "must contain 8 comma-separated numbers"
 msgstr "muss 8 mit Kommata getrennte Zahlen enthalten"
 
-#: ../clients/cli/settings.c:5428
+#: ../clients/cli/settings.c:5385
 #, 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/cli/settings.c:5431
+#: ../clients/cli/settings.c:5388
 #, c-format
 msgid "'%s' not a number between 0 and %u (inclusive)"
 msgstr "»%s« ist keine Zahl zwischen 0 und %u (einschließlich)"
 
-#: ../clients/cli/settings.c:5453
+#: ../clients/cli/settings.c:5410
 #, c-format
-msgid ""
-"Warning: changes will have no effect until '%s' includes 1 (enabled)\n"
+msgid "Warning: changes will have no effect until '%s' includes 1 (enabled)\n"
 "\n"
 msgstr ""
-"Warnung: Die Änderungen wirken sich erst aus wenn »%s« 1 enthält "
-"(aktiviert)\n"
+"Warnung: Die Änderungen wirken sich erst aus wenn »%s« 1 enthält (aktiviert)\n"
 "\n"
 
-#: ../clients/cli/settings.c:5506
+#: ../clients/cli/settings.c:5463
 #, c-format
 msgid "bandwidth percentages must total 100%%"
 msgstr "Die Prozentzahlen der Bandbreiten müssen in Summe 100%% ergeben"
 
-#: ../clients/cli/settings.c:5592 ../clients/cli/settings.c:5598
+#: ../clients/cli/settings.c:5549 ../clients/cli/settings.c:5555
 msgid "SIM operator ID must be a 5 or 6 number MCCMNC code"
-msgstr ""
+msgstr "SIM Operator ID muss 5 oder 6stelliger MCCMNC Code sein"
 
-#: ../clients/cli/settings.c:5641
+#: ../clients/cli/settings.c:5598
 #, c-format
 msgid "invalid option '%s', use '%s' or '%s'"
 msgstr "ungültige Option »%s«. Verwenden Sie »%s« oder »%s«"
 
-#: ../clients/cli/settings.c:7701
+#: ../clients/cli/settings.c:7644
 msgid "don't know how to get the property value"
 msgstr "Unbekannt, wie der Eigenschaftswert ermittelt wird"
 
-#: ../clients/cli/settings.c:7754 ../clients/cli/settings.c:7794
+#: ../clients/cli/settings.c:7697 ../clients/cli/settings.c:7737
 msgid "the property can't be changed"
 msgstr "Die Einstellung konnte nicht geändert werden"
 
-#: ../clients/cli/settings.c:7878
+#: ../clients/cli/settings.c:7821
 msgid "(not available)"
 msgstr "(nicht verfügbar)"
 
-#: ../clients/cli/settings.c:7903
+#: ../clients/cli/settings.c:7846
 msgid "[NM property description]"
 msgstr "[NM Eigenschaft-Beschreibung]"
 
-#: ../clients/cli/settings.c:7908
+#: ../clients/cli/settings.c:7851
 msgid "[nmcli specific description]"
 msgstr "[nmcli-spezifische Beschreibung]"
 
+#. ----------------------------------------------------------------------------
+#: ../clients/cli/settings.c:7900
+msgid "<hidden>"
+msgstr "<verborgen>"
+
 #: ../clients/cli/utils.c:124
 #, c-format
 msgid "Error: value for '%s' argument is required."
@@ -6723,61 +6687,90 @@ msgstr "Fehler: Parameter »%s« wurde erwartet, aber »%s« geliefert."
 msgid "Error: Unexpected argument '%s'"
 msgstr "Fehler: Unerwarteter Parameter »%s«."
 
+#: ../clients/cli/utils.c:202
+#, c-format
+msgid "Error converting IP4 address '0x%X' to text form"
+msgstr "Fehler beim Umwandeln der IPv4-Adresse »0x%X« in eine Textform"
+
+#: ../clients/cli/utils.c:230
+#, c-format
+msgid "Error converting IP6 address '%s' to text form"
+msgstr "Fehler beim Umwandeln der IPv6-Adresse »%s« in eine Textform"
+
 #. Translators: the first %s is the partial value entered by
 #. * the user, the second %s a list of compatible values.
-#.
-#: ../clients/cli/utils.c:492 ../clients/cli/utils.c:523
+#. 
+#: ../clients/cli/utils.c:546 ../clients/cli/utils.c:577
 #, c-format
 msgid "'%s' is ambiguous (%s)"
 msgstr "»%s« ist mehrdeutig (%s)"
 
-#: ../clients/cli/utils.c:502
+#: ../clients/cli/utils.c:556
 #, c-format
 msgid "'%s' is not valid; use [%s] or [%s]"
 msgstr "»%s« ist ungültig. Verwenden Sie [%s] oder [%s]."
 
-#: ../clients/cli/utils.c:535
+#: ../clients/cli/utils.c:589
 #, c-format
 msgid "'%s' is not valid; use [%s], [%s] or [%s]"
 msgstr "»%s« ist ungültig. Verwenden Sie [%s], [%s] oder [%s]."
 
-#: ../clients/cli/utils.c:634
+#: ../clients/cli/utils.c:688
 #, c-format
 msgid "'%s' is ambiguous (%s x %s)"
 msgstr "»%s« ist mehrdeutig (%s x %s)"
 
-#: ../clients/cli/utils.c:646
+#: ../clients/cli/utils.c:700
 #, c-format
 msgid "missing name, try one of [%s]"
 msgstr "Fehlender Name, versuchen Sie einen von [%s]"
 
-#: ../clients/cli/utils.c:893
+#: ../clients/cli/utils.c:964
 #, c-format
 msgid "field '%s' has to be alone"
 msgstr "Feld »%s« muss allein stehen"
 
-#: ../clients/cli/utils.c:896
+#: ../clients/cli/utils.c:967
 #, c-format
 msgid "invalid field '%s'; allowed fields: %s"
 msgstr "Ungültiges Feld »%s«; erlaubte Felder: %s"
 
-#: ../clients/cli/utils.c:953
+#: ../clients/cli/utils.c:1024
 msgid "Option '--terse' requires specifying '--fields'"
 msgstr "Option »--terse« benötigt die Angabe von »--fields«"
 
-#: ../clients/cli/utils.c:957
+#: ../clients/cli/utils.c:1028
 #, c-format
 msgid "Option '--terse' requires specific '--fields' option values , not '%s'"
 msgstr "Option »--terse« benötigt bestimmte »--fields«-Werte, nicht »%s«"
 
+#: ../clients/cli/utils.c:1390
+#, c-format
+msgid ""
+"Warning: nmcli (%s) and NetworkManager (%s) versions don't match. Use --"
+"nocheck to suppress the warning.\n"
+msgstr ""
+"Warnung: Die Versionen von nmcli (%s) und NetworkManager (%s) stimmen nicht "
+"überein. Verwenden Sie »--nocheck«, um diese Warnung zu unterdrücken.\n"
+
+#: ../clients/cli/utils.c:1399
+#, c-format
+msgid ""
+"Error: nmcli (%s) and NetworkManager (%s) versions don't match. Force "
+"execution using --nocheck, but the results are unpredictable."
+msgstr ""
+"Fehler: Die Versionen von nmcli (%s) und NetworkManager (%s) stimmen nicht "
+"überein. Eine Ausführung kann mit »--nocheck« erzwungen werden, aber die "
+"Resultate sind unvorhersehbar."
+
 #: ../clients/common/nm-polkit-listener.c:212
 msgid "An authentication session is already underway."
-msgstr "Eine Authentifizierungssitzung ist bereits aktiv."
+msgstr "Eine Authentifizierungssession ist bereits eingeleitet."
 
 #. TTLS and PEAP are actually much more complicated, but this complication
 #. * is not visible here since we only care about phase2 authentication
 #. * (and don't even care of which one)
-#.
+#. 
 #: ../clients/common/nm-secret-agent-simple.c:223
 #: ../clients/common/nm-secret-agent-simple.c:328
 #: ../clients/tui/nmt-page-dsl.c:66 ../clients/tui/nmt-page-wifi.c:332
@@ -6791,10 +6784,9 @@ msgstr "Benutzername"
 #: ../clients/common/nm-secret-agent-simple.c:492
 #: ../clients/common/nm-secret-agent-simple.c:507
 #: ../clients/common/nm-secret-agent-simple.c:525
-#: ../clients/common/nm-vpn-helpers.c:197
-#: ../clients/common/nm-vpn-helpers.c:198
-#: ../clients/common/nm-vpn-helpers.c:202
-#: ../clients/common/nm-vpn-helpers.c:205 ../clients/tui/nmt-page-dsl.c:75
+#: ../clients/common/nm-vpn-helpers.c:101
+#: ../clients/common/nm-vpn-helpers.c:102
+#: ../clients/common/nm-vpn-helpers.c:105 ../clients/tui/nmt-page-dsl.c:75
 #: ../clients/tui/nmt-page-wifi.c:277 ../clients/tui/nmt-page-wifi.c:308
 #: ../clients/tui/nmt-page-wifi.c:341
 msgid "Password"
@@ -6873,57 +6865,28 @@ msgstr "Es wird ein Passwort benötigt, um sich mit »%s« zu verbinden."
 msgid "VPN password required"
 msgstr "VPN-Passwort ist erforderlich"
 
-#: ../clients/common/nm-vpn-helpers.c:57
-#, fuzzy, c-format
-#| msgid "cannot load plugin \"%s\": %s"
-msgid "unknown VPN plugin \"%s\""
-msgstr "Plugin »%s« kann nicht geladen werden: %s"
-
-#: ../clients/common/nm-vpn-helpers.c:68
-#, fuzzy, c-format
-#| msgid "cannot load plugin \"%s\": %s"
-msgid "cannot cannot load legacy-only VPN plugin \"%s\" for \"%s\""
-msgstr "Plugin »%s« kann nicht geladen werden: %s"
-
-#: ../clients/common/nm-vpn-helpers.c:73
-#, fuzzy, c-format
-#| msgid "cannot load VPN plugin in '%s': missing plugin name"
-msgid ""
-"cannot load VPN plugin \"%s\" due to missing \"%s\". Missing client plugin?"
-msgstr "VPN-Plugin in »%s« kann nicht geladen werden: Name des Plugin fehlt"
-
-#: ../clients/common/nm-vpn-helpers.c:78
-#, fuzzy, c-format
-#| msgid "Error: failed to load VPN plugin: %s."
-msgid "failed to load VPN plugin \"%s\": %s"
-msgstr "Fehler: Laden des VPN-Plugins ist gescheitert: %s."
-
-#: ../clients/common/nm-vpn-helpers.c:199
-msgid "Certificate password"
-msgstr "Passwort für Zertifikat"
+#: ../clients/common/nm-vpn-helpers.c:61
+msgid "could not get VPN plugin info"
+msgstr "VPN Plugin-Info konnte nicht abgerufen werden"
 
-#: ../clients/common/nm-vpn-helpers.c:200
-msgid "HTTP proxy password"
-msgstr "Passwort für HTTP-Proxy"
-
-#: ../clients/common/nm-vpn-helpers.c:203
-#: ../clients/common/nm-vpn-helpers.c:206
+#: ../clients/common/nm-vpn-helpers.c:103
+#: ../clients/common/nm-vpn-helpers.c:106
 msgid "Group password"
 msgstr "Gruppenpasswort"
 
-#: ../clients/common/nm-vpn-helpers.c:208 ../clients/tui/nmt-page-ip4.c:143
+#: ../clients/common/nm-vpn-helpers.c:108 ../clients/tui/nmt-page-ip4.c:143
 #: ../clients/tui/nmt-page-ip6.c:143
 msgid "Gateway"
 msgstr "Gateway"
 
 # https://de.wikipedia.org/wiki/Cookie
-#: ../clients/common/nm-vpn-helpers.c:209
+#: ../clients/common/nm-vpn-helpers.c:109
 msgid "Cookie"
 msgstr "Cookie"
 
-#: ../clients/common/nm-vpn-helpers.c:210
+#: ../clients/common/nm-vpn-helpers.c:110
 msgid "Gateway certificate hash"
-msgstr "Prüfsumme des Gateway-Zertifikats"
+msgstr "Hash des Gateway-Zertifikats"
 
 #: ../clients/nm-online.c:94
 msgid "Connecting"
@@ -6966,7 +6929,7 @@ msgstr ""
 #: ../clients/tui/newt/nmt-newt-utils.c:177 ../clients/tui/nmt-editor.c:415
 #: ../clients/tui/nmt-password-dialog.c:174
 #: ../clients/tui/nmt-route-editor.c:122 ../clients/tui/nmtui-hostname.c:69
-#: ../clients/tui/nmtui.c:136
+#: ../clients/tui/nmtui.c:114
 msgid "OK"
 msgstr "OK"
 
@@ -7030,9 +6993,9 @@ msgstr "DSL"
 msgid "DSL connection %d"
 msgstr "DSL-Verbindung %d"
 
-#: ../clients/tui/nm-editor-utils.c:190 ../libnm-core/nm-connection.c:1721
+#: ../clients/tui/nm-editor-utils.c:190 ../libnm-core/nm-connection.c:1708
 #: ../libnm-glib/nm-device.c:1863 ../libnm-util/nm-connection.c:1626
-#: ../libnm/nm-device.c:1814 ../src/settings/plugins/ifcfg-rh/reader.c:4188
+#: ../libnm/nm-device.c:1814 ../src/settings/plugins/ifcfg-rh/reader.c:4182
 msgid "Bond"
 msgstr "Gebündelt"
 
@@ -7041,9 +7004,9 @@ msgstr "Gebündelt"
 msgid "Bond connection %d"
 msgstr "Gebündelte Verbindung %d"
 
-#: ../clients/tui/nm-editor-utils.c:199 ../libnm-core/nm-connection.c:1725
+#: ../clients/tui/nm-editor-utils.c:199 ../libnm-core/nm-connection.c:1712
 #: ../libnm-glib/nm-device.c:1867 ../libnm-util/nm-connection.c:1630
-#: ../libnm/nm-device.c:1818 ../src/settings/plugins/ifcfg-rh/reader.c:4485
+#: ../libnm/nm-device.c:1818 ../src/settings/plugins/ifcfg-rh/reader.c:4479
 msgid "Bridge"
 msgstr "Brücke"
 
@@ -7052,9 +7015,9 @@ msgstr "Brücke"
 msgid "Bridge connection %d"
 msgstr "Brückenverbindung %d"
 
-#: ../clients/tui/nm-editor-utils.c:208 ../libnm-core/nm-connection.c:1723
+#: ../clients/tui/nm-editor-utils.c:208 ../libnm-core/nm-connection.c:1710
 #: ../libnm-glib/nm-device.c:1865 ../libnm-util/nm-connection.c:1628
-#: ../libnm/nm-device.c:1816 ../src/settings/plugins/ifcfg-rh/reader.c:4294
+#: ../libnm/nm-device.c:1816 ../src/settings/plugins/ifcfg-rh/reader.c:4288
 msgid "Team"
 msgstr "Bündelung"
 
@@ -7614,21 +7577,23 @@ msgid ""
 "openconnect will be run to authenticate.\n"
 "It will return to nmtui when completed."
 msgstr ""
+"openconnect wird zur Authentifizierung ausgeführt.\n"
+"Wird wieder nmtui, wenn dies abgeschlossen ist."
 
 #: ../clients/tui/nmtui-connect.c:68
 #, c-format
 msgid "Error: openconnect failed: %s"
-msgstr "Fehler: »openconnect« fehlgeschlagen: %s"
+msgstr "Fehler: openconnect fehlgeschlagen: %s"
 
 #: ../clients/tui/nmtui-connect.c:75
 #, c-format
 msgid "openconnect failed with status %d"
-msgstr "»openconnect« fehlgeschlagen mit Status %d"
+msgstr "openconnect fehlgeschlagen mit Status %d"
 
 #: ../clients/tui/nmtui-connect.c:79
 #, c-format
 msgid "openconnect failed with signal %d"
-msgstr "»openconnect« fehlgeschlagen mit Signal %d"
+msgstr "openconnect fehlgeschlagen mit Signal %d"
 
 #: ../clients/tui/nmtui-connect.c:178
 msgid "Activation failed"
@@ -7652,14 +7617,10 @@ msgid "Deactivate"
 msgstr "Deaktivieren"
 
 #: ../clients/tui/nmtui-connect.c:413 ../clients/tui/nmtui-edit.c:120
-#: ../clients/tui/nmtui.c:130
+#: ../clients/tui/nmtui.c:108
 msgid "Quit"
 msgstr "Beenden"
 
-#: ../clients/tui/nmtui-connect.c:413 ../clients/tui/nmtui-edit.c:120
-msgid "Back"
-msgstr "Zurück"
-
 #: ../clients/tui/nmtui-connect.c:436
 #, c-format
 msgid "No such connection '%s'"
@@ -7744,28 +7705,28 @@ msgstr "neuer Rechnername"
 msgid "Set system hostname"
 msgstr "Den Rechnernamen des Systems festlegen"
 
-#: ../clients/tui/nmtui.c:104
+#: ../clients/tui/nmtui.c:83
 msgid "NetworkManager TUI"
 msgstr "NetworkManager Terminal-Benutzeroberfläche (TUI)"
 
-#: ../clients/tui/nmtui.c:112
+#: ../clients/tui/nmtui.c:91
 msgid "Please select an option"
 msgstr "Bitte wählen Sie eine Option"
 
-#: ../clients/tui/nmtui.c:160
+#: ../clients/tui/nmtui.c:143
 msgid "Usage"
 msgstr "Aufruf"
 
-#: ../clients/tui/nmtui.c:241
+#: ../clients/tui/nmtui.c:224
 msgid "Could not parse arguments"
 msgstr "Parameter konnten nicht verarbeitet werden"
 
-#: ../clients/tui/nmtui.c:251
+#: ../clients/tui/nmtui.c:234
 #, c-format
 msgid "Could not contact NetworkManager: %s.\n"
 msgstr "NetworkManager konnte nicht erreicht werden: %s.\n"
 
-#: ../clients/tui/nmtui.c:256
+#: ../clients/tui/nmtui.c:239
 msgid "NetworkManager is not running."
 msgstr "NetworkManager wird nicht ausgeführt."
 
@@ -7854,7 +7815,7 @@ msgstr "Der Typ des privaten Schlüssels konnte nicht bestimmt werden."
 #: ../libnm-core/crypto.c:502
 #, c-format
 msgid "Password provided, but key was not encrypted."
-msgstr "Passwort wurde angegeben, aber der Schlüssel war nicht verschlüsselt."
+msgstr "Passwort angegeben, aber Schlüssel war nicht verschlüsselt."
 
 #: ../libnm-core/crypto.c:555 ../libnm-util/crypto.c:571
 #, c-format
@@ -7885,6 +7846,7 @@ msgstr "Ungültige IV-Länge (muss mindestens %zd betragen)."
 msgid "Failed to initialize the decryption cipher context: %s (%s)"
 msgstr ""
 "Die Initialisierung des Entschlüsselung-Chiffrekontextes scheiterte: %s (%s)."
+""
 
 #: ../libnm-core/crypto_gnutls.c:124 ../libnm-util/crypto_gnutls.c:184
 #, c-format
@@ -8062,7 +8024,7 @@ msgstr "Es konnten keine Zufallsdaten generiert werden."
 
 #: ../libnm-core/nm-connection.c:224
 msgid "wrong type; should be a list of strings."
-msgstr "falscher Typ. Sollte eine Liste von Zeichenketten sein."
+msgstr "Falscher Typ; sollte eine Liste von Zeichenketten sein."
 
 #: ../libnm-core/nm-connection.c:294
 msgid "unknown setting name"
@@ -8072,41 +8034,39 @@ msgstr "Unbekannter Einstellungsname"
 msgid "duplicate setting name"
 msgstr "Doppelter Einstellungsname"
 
-#: ../libnm-core/nm-connection.c:886
+#: ../libnm-core/nm-connection.c:873
 msgid "setting not found"
 msgstr "Einstellung nicht gefunden"
 
-#: ../libnm-core/nm-connection.c:950
+#: ../libnm-core/nm-connection.c:937
 msgid "setting not allowed in slave connection"
-msgstr "Die Einstellung ist nicht erlaubt für eine Slave-Verbindung"
+msgstr "Einstellung in Slave-Verbindung nicht zugelassen"
 
-#: ../libnm-core/nm-connection.c:961
-#, fuzzy
+#: ../libnm-core/nm-connection.c:948
 msgid "setting is required for non-slave connections"
-msgstr ""
-"Einstellung »%s« ist für die Verbindung notwendig, wenn die Eigenschaft "
-"festgelegt ist"
+msgstr "Einstellung erforderlich für nicht-Slave Verbindungen"
 
-#: ../libnm-core/nm-connection.c:1055
+#: ../libnm-core/nm-connection.c:1042
 msgid "Unexpected failure to verify the connection"
-msgstr "Unerwarteter Fehler beim Überprüfen der Verbindung"
+msgstr "Unerwarteter Fehler bei Prüfung der Verbindung"
 
-#: ../libnm-core/nm-connection.c:1088
+#: ../libnm-core/nm-connection.c:1075
 msgid "Unexpected failure to normalize the connection"
-msgstr "Unerwarteter Fehler beim Normalisieren der Verbindung"
+msgstr "Unerwarteter Fehler bei Normalisierung der Verbindung"
 
-#: ../libnm-core/nm-connection.c:1589 ../libnm-core/nm-setting-8021x.c:2411
+#: ../libnm-core/nm-connection.c:1576 ../libnm-core/nm-setting-8021x.c:2411
 #: ../libnm-core/nm-setting-8021x.c:2428 ../libnm-core/nm-setting-8021x.c:2459
 #: ../libnm-core/nm-setting-8021x.c:2476 ../libnm-core/nm-setting-8021x.c:2518
 #: ../libnm-core/nm-setting-8021x.c:2530 ../libnm-core/nm-setting-8021x.c:2548
 #: ../libnm-core/nm-setting-8021x.c:2560 ../libnm-core/nm-setting-8021x.c:2584
 #: ../libnm-core/nm-setting-8021x.c:2749 ../libnm-core/nm-setting-adsl.c:189
 #: ../libnm-core/nm-setting-bluetooth.c:120
-#: ../libnm-core/nm-setting-bluetooth.c:138 ../libnm-core/nm-setting-cdma.c:141
+#: ../libnm-core/nm-setting-bluetooth.c:138
+#: ../libnm-core/nm-setting-cdma.c:141
 #: ../libnm-core/nm-setting-connection.c:837
 #: ../libnm-core/nm-setting-connection.c:876
 #: ../libnm-core/nm-setting-connection.c:989
-#: ../libnm-core/nm-setting-ip-config.c:2185
+#: ../libnm-core/nm-setting-ip-config.c:2167
 #: ../libnm-core/nm-setting-olpc-mesh.c:120
 #: ../libnm-core/nm-setting-pppoe.c:142 ../libnm-core/nm-setting-vpn.c:419
 #: ../libnm-core/nm-setting-vxlan.c:360 ../libnm-core/nm-setting-wimax.c:126
@@ -8118,8 +8078,10 @@ msgstr "Unerwarteter Fehler beim Normalisieren der Verbindung"
 #: ../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-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
@@ -8137,7 +8099,7 @@ msgstr "Eigenschaft fehlt"
 #: ../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"
+msgstr "Methode gab Typ »%s« zurück, aber »%s« wurde erwartet"
 
 #: ../libnm-core/nm-keyfile-reader.c:136
 msgid "ignoring missing number"
@@ -8156,7 +8118,7 @@ msgstr "Ungültige %s-Adresse wird ignoriert: %s"
 #: ../libnm-core/nm-keyfile-reader.c:205
 #, c-format
 msgid "ignoring invalid gateway '%s' for %s route"
-msgstr "Ungültiges Gateway »%s« für Route %s wird ignoriert"
+msgstr "Ungültiges Gateway '%s' wird ignoriert für %s-Route"
 
 #: ../libnm-core/nm-keyfile-reader.c:225
 #, c-format
@@ -8166,17 +8128,17 @@ msgstr "Ungültige %s-Route wird ignoriert: %s"
 #: ../libnm-core/nm-keyfile-reader.c:343
 #, c-format
 msgid "unexpected character '%c' for address %s: '%s' (position %td)"
-msgstr "unerwartetes Zeichen »%c« für Adresse %s: »%s« (Position %td)"
+msgstr "Unerwartetes Zeichen '%c' für Adresse %s: '%s' (Position %td)"
 
 #: ../libnm-core/nm-keyfile-reader.c:353
 #, c-format
 msgid "unexpected character '%c' for %s: '%s' (position %td)"
-msgstr "unerwartetes Zeichen »%c« für %s: »%s« (Position %td)"
+msgstr "Unerwartetes Zeichen '%c' für %s: '%s' (Position %td)"
 
 #: ../libnm-core/nm-keyfile-reader.c:362
 #, 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)"
+msgstr "Unerwartetes Zeichen '%c' in Präfixlänge für %s: '%s' (Position %td)"
 
 #: ../libnm-core/nm-keyfile-reader.c:373
 #, c-format
@@ -8186,17 +8148,17 @@ msgstr " Unsinn am Ende von Wert %s: »%s«"
 #: ../libnm-core/nm-keyfile-reader.c:379
 #, c-format
 msgid "deprecated semicolon at the end of value %s: '%s'"
-msgstr "veraltetes Semikolon am Ende von Wert %s: »%s«"
+msgstr "Veraltetes Semikolon am Ende des Wertes %s: '%s'"
 
 #: ../libnm-core/nm-keyfile-reader.c:394
 #, 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"
+msgstr "Ungültige Präfixlänge für %s '%s', wird auf Standardwert %d gesetzt"
 
 #: ../libnm-core/nm-keyfile-reader.c:401
 #, 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"
+msgstr "Fehlende Präfixlänge für %s '%s', wird auf Standardwert %d gesetzt"
 
 #: ../libnm-core/nm-keyfile-reader.c:504
 #, c-format
@@ -8213,6 +8175,7 @@ msgstr "Ungültige DNS-Server IPv6-Adresse »%s« wird ignoriert"
 #, c-format
 msgid "ignoring invalid byte element '%d' (not between 0 and 255 inclusive)"
 msgstr ""
+"Ungültiges Byte-Element '%d' (nicht zwischen 0 und einschließlich 255)"
 
 #: ../libnm-core/nm-keyfile-reader.c:642
 msgid "ignoring invalid MAC address"
@@ -8220,7 +8183,7 @@ msgstr "Ungültige MAC-Adresse wird ignoriert"
 
 #: ../libnm-core/nm-keyfile-reader.c:758
 msgid "ignoring invalid binary property"
-msgstr "Ungültige binäre Eigenschaft wird ignoriert"
+msgstr "Ungültige Binäreigenschaft wird ignoriert"
 
 #: ../libnm-core/nm-keyfile-reader.c:801
 msgid "ignoring invalid SSID"
@@ -8228,9 +8191,10 @@ msgstr "ungültige SSID wird ignoriert"
 
 #: ../libnm-core/nm-keyfile-reader.c:817
 msgid "ignoring invalid raw password"
-msgstr ""
+msgstr "Ungültiges Raw-Passwort wird ignoriert "
 
-#: ../libnm-core/nm-keyfile-reader.c:892 ../libnm-core/nm-keyfile-reader.c:1058
+#: ../libnm-core/nm-keyfile-reader.c:892
+#: ../libnm-core/nm-keyfile-reader.c:1058
 #, c-format
 msgid "certificate or key file '%s' does not exist"
 msgstr "Zertifikat oder Schlüsseldatei »%s« ist nicht vorhanden"
@@ -8238,28 +8202,28 @@ msgstr "Zertifikat oder Schlüsseldatei »%s« ist nicht vorhanden"
 #: ../libnm-core/nm-keyfile-reader.c:897
 #, c-format
 msgid "invalid key/cert value path \"%s\""
-msgstr "ungültiges Schlüssel/Zertifikat-Wertepaar »%s«"
+msgstr "Ungültiger Schlüssel/Zertifikatwert-Pfad \"%s\""
 
 #: ../libnm-core/nm-keyfile-reader.c:935
 msgid "invalid key/cert value data:;base64, is not base64"
-msgstr ""
+msgstr "Ungültiger Schlüssel/Zertifikatwert-Daten:;base64, ist nicht base64"
 
 #: ../libnm-core/nm-keyfile-reader.c:948
 msgid "invalid key/cert value data:;base64,file://"
-msgstr ""
+msgstr "Ungültiger Schlüssel/Zertifikatwert Daten:;base64,file://"
 
 #: ../libnm-core/nm-keyfile-reader.c:1095
 msgid "invalid key/cert value is not a valid blob"
-msgstr "ungültiger Wert für Schlüssel/Zertifikat ist kein gültiger blob"
+msgstr "Ungültiger Wert für Schlüssel/Zertifikatwert ist kein gültiger Blob"
 
 #: ../libnm-core/nm-keyfile-reader.c:1100
 msgid "invalid key/cert value"
-msgstr "ungültiger Wert für Schlüssel/Zertifikat"
+msgstr "Ungültiger Wert für Schlüssel/Zertifikatwert"
 
 #: ../libnm-core/nm-keyfile-reader.c:1147
-#, fuzzy, c-format
+#, c-format
 msgid "invalid parity value '%s'"
-msgstr "ungültiges »%s« oder dessen Wert »%s«"
+msgstr "Ungültiger Paritätswert '%s'"
 
 #: ../libnm-core/nm-keyfile-reader.c:1347
 #, c-format
@@ -8284,12 +8248,12 @@ msgstr "ungültiger in64-Wert (%s)"
 #: ../libnm-core/nm-keyfile-reader.c:1482
 #, c-format
 msgid "too large FLAGS property '%s' (%llu)"
-msgstr ""
+msgstr "zu große FLAGS Eigenschaft '%s' (%llu)"
 
 #: ../libnm-core/nm-keyfile-reader.c:1495
-#, fuzzy, c-format
+#, c-format
 msgid "unhandled setting property type '%s'"
-msgstr "Fehler: Ungültiger Einstellungsname: »%s«."
+msgstr "Unbehandelter Einstellungstyp '%s'"
 
 #: ../libnm-core/nm-keyfile-reader.c:1526
 #, c-format
@@ -8341,9 +8305,10 @@ msgstr "Ungültiger privater Schlüssel in Phase 2"
 #: ../libnm-core/nm-setting-8021x.c:2591 ../libnm-core/nm-setting-adsl.c:196
 #: ../libnm-core/nm-setting-cdma.c:148 ../libnm-core/nm-setting-cdma.c:157
 #: ../libnm-core/nm-setting-connection.c:844
-#: ../libnm-core/nm-setting-connection.c:887 ../libnm-core/nm-setting-gsm.c:281
-#: ../libnm-core/nm-setting-gsm.c:338 ../libnm-core/nm-setting-gsm.c:375
-#: ../libnm-core/nm-setting-gsm.c:384 ../libnm-core/nm-setting-ip-config.c:2192
+#: ../libnm-core/nm-setting-connection.c:887
+#: ../libnm-core/nm-setting-gsm.c:281 ../libnm-core/nm-setting-gsm.c:338
+#: ../libnm-core/nm-setting-gsm.c:375 ../libnm-core/nm-setting-gsm.c:384
+#: ../libnm-core/nm-setting-ip-config.c:2174
 #: ../libnm-core/nm-setting-ip4-config.c:198
 #: ../libnm-core/nm-setting-ip4-config.c:205
 #: ../libnm-core/nm-setting-pppoe.c:149 ../libnm-core/nm-setting-pppoe.c:158
@@ -8359,8 +8324,9 @@ msgstr "Ungültiger privater Schlüssel in Phase 2"
 #: ../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-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:170 ../libnm-util/nm-setting-pppoe.c:179
 #: ../libnm-util/nm-setting-vpn.c:432 ../libnm-util/nm-setting-vpn.c:442
@@ -8426,12 +8392,14 @@ msgstr "Eigenschaft ist ungültig"
 #: ../libnm-core/nm-setting-8021x.c:2783 ../libnm-core/nm-setting-8021x.c:2793
 #: ../libnm-core/nm-setting-8021x.c:2803 ../libnm-core/nm-setting-8021x.c:2813
 #: ../libnm-core/nm-setting-8021x.c:2823 ../libnm-core/nm-setting-adsl.c:208
-#: ../libnm-core/nm-setting-adsl.c:220 ../libnm-core/nm-setting-bluetooth.c:146
+#: ../libnm-core/nm-setting-adsl.c:220
+#: ../libnm-core/nm-setting-bluetooth.c:146
 #: ../libnm-core/nm-setting-wireless-security.c:870
 #: ../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-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"
@@ -8508,7 +8476,7 @@ msgstr "Die Option »%s« ist nur gültig im Modus »%s«"
 #: ../libnm-core/nm-setting-bond.c:687
 #, c-format
 msgid "'%s' and '%s' cannot have different values"
-msgstr ""
+msgstr "'%s' und '%s' können nicht unterschiedliche Werte haben"
 
 #: ../libnm-core/nm-setting-bond.c:703
 #, c-format
@@ -8524,18 +8492,20 @@ msgid "'%d' is not a valid value for the property (should be <= %d)"
 msgstr "»%d« ist kein gültiger Wert für die Eigenschaft (sollte <= %d sein)"
 
 #: ../libnm-core/nm-setting-bridge-port.c:154
-#: ../libnm-core/nm-setting-team-port.c:109
+#: ../libnm-core/nm-setting-team-port.c:97
 #, c-format
 msgid "missing setting"
 msgstr "fehlende Einstellung"
 
 #: ../libnm-core/nm-setting-bridge-port.c:165
-#: ../libnm-core/nm-setting-team-port.c:120
+#: ../libnm-core/nm-setting-team-port.c:108
 #, c-format
 msgid ""
 "A connection with a '%s' setting must have the slave-type set to '%s'. "
 "Instead it is '%s'"
 msgstr ""
+"Bei einer Verbindung mit '%s' Einstellung muss der Slave-Typ auf '%s' "
+"gesetzt sein. Stattdessen ist er '%s'"
 
 #: ../libnm-core/nm-setting-bridge.c:227 ../libnm-util/nm-setting-bridge.c:269
 #, c-format
@@ -8567,9 +8537,9 @@ msgstr "Unbekannter Sklaventyp »%s«"
 
 #: ../libnm-core/nm-setting-connection.c:942
 #: ../libnm-util/nm-setting-connection.c:887
-#, fuzzy, c-format
+#, c-format
 msgid "Slave connections need a valid '%s' property"
-msgstr "Es muss ein gültiger Server-Pfad eingegeben werden"
+msgstr "Slave-Verbindungen brauchen eine gültige '%s'-Eigenschaft"
 
 #: ../libnm-core/nm-setting-connection.c:963
 #: ../libnm-util/nm-setting-connection.c:897
@@ -8588,9 +8558,9 @@ msgid "property type should be set to '%s'"
 msgstr "Der Eigenschaftentyp sollte auf »%s« eingestellt sein"
 
 #: ../libnm-core/nm-setting-connection.c:1013
-#, fuzzy, c-format
+#, c-format
 msgid "slave-type '%s' requires a '%s' setting in the connection"
-msgstr "erfordert das Vorhandensein der Einstellung »%s« in der Verbindung"
+msgstr "Slave-Typ '%s' erfordert '%s'-Einstellung in der Verbindung"
 
 #: ../libnm-core/nm-setting-connection.c:1023
 #, c-format
@@ -8598,6 +8568,8 @@ msgid ""
 "Detect a slave connection with '%s' set and a port type '%s'. '%s' should be "
 "set to '%s'"
 msgstr ""
+"Erkennt Slave-Verbindung mit eingestelltem '%s' und Porttyp '%s'. '%s' "
+"sollte auf '%s' gestellt sein "
 
 #: ../libnm-core/nm-setting-dcb.c:522 ../libnm-util/nm-setting-dcb.c:594
 msgid "flags invalid"
@@ -8719,50 +8691,46 @@ 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:2205
+#: ../libnm-core/nm-setting-ip-config.c:2187
 #, c-format
 msgid "%d. DNS server address is invalid"
 msgstr "%d. DNS-Server-Adresse ist ungültig"
 
-#: ../libnm-core/nm-setting-ip-config.c:2221
+#: ../libnm-core/nm-setting-ip-config.c:2203
 #, c-format
 msgid "%d. IP address is invalid"
 msgstr "%d. IP-Adresse ist ungültig"
 
-#: ../libnm-core/nm-setting-ip-config.c:2233
+#: ../libnm-core/nm-setting-ip-config.c:2215
 #, 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:2242
+#: ../libnm-core/nm-setting-ip-config.c:2224
 #, 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:2256
+#: ../libnm-core/nm-setting-ip-config.c:2238
 msgid "gateway cannot be set if there are no addresses configured"
 msgstr ""
-"»gateway« kann nicht festgelegt werden, wenn keine Adressen eingerichtet sind"
+"»gateway« kann nicht festgelegt werden, wenn keine Adressen eingerichtet "
+"sind"
 
-#: ../libnm-core/nm-setting-ip-config.c:2265
+#: ../libnm-core/nm-setting-ip-config.c:2247
 msgid "gateway is invalid"
 msgstr "Gateway ist ungültig"
 
-#: ../libnm-core/nm-setting-ip-config.c:2279
+#: ../libnm-core/nm-setting-ip-config.c:2261
 #, c-format
 msgid "%d. route is invalid"
 msgstr "%d. Zielwegwahl ist ungültig"
 
-#: ../libnm-core/nm-setting-ip-config.c:2288
+#: ../libnm-core/nm-setting-ip-config.c:2270
 #, 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:2299
-#, c-format
-msgid "a gateway is incompatible with '%s'"
-msgstr "ein Gateway ist nicht kompatibel mit »%s«"
-
 #: ../libnm-core/nm-setting-ip4-config.c:143
 #: ../libnm-core/nm-setting-ip6-config.c:144
 #: ../libnm-util/nm-setting-ip4-config.c:879
@@ -8795,6 +8763,8 @@ msgstr "»%s« ist keine gültiger FQDN"
 #: ../libnm-core/nm-setting-ip4-config.c:223
 msgid "property cannot be set when dhcp-hostname is also set"
 msgstr ""
+"Eigenschaft kann nicht eingestellt werden, wenn dhcp-Hostname auch "
+"eingestellt ist"
 
 #: ../libnm-core/nm-setting-ip-tunnel.c:318
 #, c-format
@@ -8827,6 +8797,8 @@ msgstr "»%s« ist kein gültiger Tunnel-Schlüssel"
 #: ../libnm-core/nm-setting-ip-tunnel.c:407
 msgid "a fixed TTL is allowed only when path MTU discovery is enabled"
 msgstr ""
+"Eine festgelegte TTL ist nur zugelassen, wenn Path MTU Discovery aktiviert "
+"ist"
 
 #: ../libnm-core/nm-setting-macvlan.c:181 ../libnm-core/nm-setting-vlan.c:661
 #: ../libnm-util/nm-setting-vlan.c:580
@@ -8836,7 +8808,7 @@ msgstr "Eigenschaft ist nicht festgelegt und ebensowenig ist »%s:%s«"
 
 #: ../libnm-core/nm-setting-macvlan.c:192
 msgid "non promiscuous operation is allowed only in passthru mode"
-msgstr ""
+msgstr "nicht-promisker Vorgang ist nur im passthru-Modus zugelassen"
 
 #: ../libnm-core/nm-setting-olpc-mesh.c:130
 #: ../libnm-core/nm-setting-wireless.c:739
@@ -8888,7 +8860,7 @@ msgstr "Wert »%s« entspricht nicht »%s=%s«"
 #: ../libnm-core/nm-setting-vlan.c:672 ../libnm-util/nm-setting-vlan.c:600
 #, c-format
 msgid "the vlan id must be in range 0-4094 but is %u"
-msgstr ""
+msgstr "Die VLAN-ID muss im Bereich 0-4094 sein, ist aber %u"
 
 #: ../libnm-core/nm-setting-vlan.c:681 ../libnm-util/nm-setting-vlan.c:591
 msgid "flags are invalid"
@@ -8901,20 +8873,20 @@ msgstr "Passwort war leer"
 
 #: ../libnm-core/nm-setting-vpn.c:490
 msgid "setting contained a secret with an empty name"
-msgstr ""
+msgstr "Einstellung enthielt geheimen Schlüssel mit leerem Namen"
 
 #: ../libnm-core/nm-setting-vpn.c:498
 #, c-format
 msgid "secret value was empty"
-msgstr ""
+msgstr "Geheimer Wert war leer"
 
 #: ../libnm-core/nm-setting-vpn.c:545 ../libnm-core/nm-setting.c:1784
 msgid "not a secret property"
-msgstr ""
+msgstr "keine geheime Eigenschaft "
 
 #: ../libnm-core/nm-setting-vpn.c:551
 msgid "secret is not of correct type"
-msgstr ""
+msgstr "Geheimer Schlüssel ist nicht der richtige Typ"
 
 #: ../libnm-core/nm-setting-vpn.c:586
 #, c-format
@@ -8923,7 +8895,7 @@ msgstr "Umwandeln des Wertes »%s« nach uint ist fehlgeschlagen"
 
 #: ../libnm-core/nm-setting-vpn.c:594
 msgid "secret flags property not found"
-msgstr ""
+msgstr "Geheime Flags-Eigenschaft nicht gefunden"
 
 #: ../libnm-core/nm-setting-vxlan.c:375
 #, c-format
@@ -8938,7 +8910,7 @@ msgstr "»%s« ist keine gültige IP%c-Adresse"
 #: ../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"
+msgstr "%d ist größer als lokales Port-Maximum %d"
 
 #: ../libnm-core/nm-setting-wired.c:619 ../libnm-util/nm-setting-wired.c:613
 #, c-format
@@ -8957,11 +8929,11 @@ msgstr "ungültiges »%s« oder dessen Wert »%s«"
 
 #: ../libnm-core/nm-setting-wired.c:709
 msgid "Wake-on-LAN mode 'default' and 'ignore' are exclusive flags"
-msgstr ""
+msgstr "Wake-on-LAN Modus 'Standard' und 'ignorieren' sind exklusive Flags"
 
 #: ../libnm-core/nm-setting-wired.c:718
 msgid "Wake-on-LAN password can only be used with magic packet mode"
-msgstr ""
+msgstr "Wake-on-LAN Passwort kann nur mit  Magic-Paketmodus benutzt werden"
 
 #: ../libnm-core/nm-setting-wireless-security.c:882
 #: ../libnm-util/nm-setting-wireless-security.c:912
@@ -9018,162 +8990,164 @@ msgstr "Doppelte Eigenschaft"
 #: ../libnm-core/nm-setting.c:865 ../libnm-core/nm-setting.c:912
 #, c-format
 msgid "can't set property of type '%s' from value of type '%s'"
-msgstr ""
+msgstr "Eigenschaftstyp '%s' von Werttyp '%s' kann nicht festgelegt werden"
 
 #: ../libnm-core/nm-setting.c:884 ../libnm-core/nm-setting.c:898
 #, c-format
 msgid "failed to set property: %s"
-msgstr "Eigenschaft konnte nicht festgelegt werden: %s"
+msgstr "Fehler bei Festlegen von Eigenschaft: %s"
 
 #: ../libnm-core/nm-setting.c:926
 #, c-format
 msgid "can not set property: %s"
-msgstr "Die Eigenschaft kann nicht festgelegt werden: %s"
+msgstr "Eigenschaft kann nicht festgelegt werden: %s"
 
 #: ../libnm-core/nm-setting.c:942
 #, c-format
 msgid "unknown property"
-msgstr "Unbekannte Eigenschaft"
+msgstr "unbekannte Eigenschaft"
 
 #: ../libnm-core/nm-setting.c:1682
 msgid "secret not found"
-msgstr "Passwort nicht gefunden"
+msgstr "Geheimer Schlüssel nicht gefunden"
 
 #: ../libnm-core/nm-setting.c:1774
 msgid "secret is not set"
-msgstr ""
+msgstr "Geheimer Schlüssel nicht festgelegt"
 
-#: ../libnm-core/nm-utils.c:2451
+#: ../libnm-core/nm-utils.c:2447
 #, c-format
 msgid "failed stat file %s: %s"
 msgstr "Abfragen der Datei %s schlug fehl: %s"
 
-#: ../libnm-core/nm-utils.c:2460
+#: ../libnm-core/nm-utils.c:2456
 #, c-format
 msgid "not a file (%s)"
 msgstr "Keine Datei (%s)"
 
-#: ../libnm-core/nm-utils.c:2471
+#: ../libnm-core/nm-utils.c:2467
 #, c-format
 msgid "invalid file owner %d for %s"
 msgstr "Ungültiger Dateibesitzer %d für %s"
 
-#: ../libnm-core/nm-utils.c:2482
+#: ../libnm-core/nm-utils.c:2478
 #, c-format
 msgid "file permissions for %s"
 msgstr "Dateiberechtigungen für %s"
 
-#: ../libnm-core/nm-utils.c:2492
+#: ../libnm-core/nm-utils.c:2488
 #, c-format
 msgid "reject %s"
 msgstr "%s zurückweisen"
 
-#: ../libnm-core/nm-utils.c:2512
+#: ../libnm-core/nm-utils.c:2508
 #, c-format
 msgid "path is not absolute (%s)"
 msgstr "Der Pfad ist nicht absolut (%s)"
 
-#: ../libnm-core/nm-utils.c:2526
+#: ../libnm-core/nm-utils.c:2522
 #, c-format
 msgid "Plugin file does not exist (%s)"
-msgstr ""
+msgstr "Plugin-Datei existiert nicht (%s)"
 
-#: ../libnm-core/nm-utils.c:2534
+#: ../libnm-core/nm-utils.c:2530
 #, c-format
 msgid "Plugin is not a valid file (%s)"
 msgstr "Plugin ist keine gültige Datei (%s)"
 
-#: ../libnm-core/nm-utils.c:2544
+#: ../libnm-core/nm-utils.c:2540
 #, c-format
 msgid "libtool archives are not supported (%s)"
 msgstr "libtool-Archive werden nicht unterstützt (%s)"
 
-#: ../libnm-core/nm-utils.c:2626 ../libnm-util/nm-utils.c:1815
+#: ../libnm-core/nm-utils.c:2622 ../libnm-util/nm-utils.c:1815
 #, c-format
 msgid "Could not find \"%s\" binary"
 msgstr "Binärdatei »%s« konnte nicht gefunden werden"
 
-#: ../libnm-core/nm-vpn-editor-plugin.c:143
-#, c-format
-msgid "cannot load plugin \"%s\": %s"
-msgstr "Plugin »%s« kann nicht geladen werden: %s"
-
-#: ../libnm-core/nm-vpn-editor-plugin.c:154
-#, c-format
-msgid "failed to load nm_vpn_editor_plugin_factory() from %s (%s)"
-msgstr ""
-
-#: ../libnm-core/nm-vpn-editor-plugin.c:179
+#: ../libnm-core/nm-vpn-editor-plugin.c:124
 #, c-format
-msgid "unknown error initializing plugin %s"
-msgstr "Unbekannter Fehler beim Initialisieren des Plugins %s"
+msgid "cannot load plugin %s"
+msgstr "Plugin %s kann nicht geladen werden"
 
-#: ../libnm-core/nm-vpn-editor-plugin.c:196
+#: ../libnm-core/nm-vpn-editor-plugin.c:150
 #, c-format
 msgid "cannot load VPN plugin in '%s': missing plugin name"
 msgstr "VPN-Plugin in »%s« kann nicht geladen werden: Name des Plugin fehlt"
 
-#: ../libnm-core/nm-vpn-editor-plugin.c:205
+#: ../libnm-core/nm-vpn-editor-plugin.c:157
 #, c-format
 msgid "cannot load VPN plugin in '%s': invalid service name"
 msgstr "VPN-Plugin in »%s« kann nicht geladen werden: Ungültiger Dienstname"
 
-#: ../libnm-core/nm-vpn-editor-plugin.c:348
+#: ../libnm-core/nm-vpn-editor-plugin.c:173
+#, c-format
+msgid "unknown error initializing plugin %s"
+msgstr "Unbekannter Fehler beim Initialisieren des Plugins %s"
+
+#: ../libnm-core/nm-vpn-editor-plugin.c:185
+#, c-format
+msgid "failed to load nm_vpn_editor_plugin_factory() from %s (%s)"
+msgstr "Fehler bei Laden von nm_vpn_editor_plugin_factory() aus %s (%s)"
+
+#: ../libnm-core/nm-vpn-editor-plugin.c:292
 #, c-format
 msgid "the plugin does not support import capability"
-msgstr ""
+msgstr "das Plugin unterstützt nicht Import-Fähigkeit"
 
-#: ../libnm-core/nm-vpn-editor-plugin.c:368
+#: ../libnm-core/nm-vpn-editor-plugin.c:312
 #, c-format
 msgid "the plugin does not support export capability"
-msgstr ""
+msgstr "das Plugin unterstützt nicht Export-Fähigkeit"
 
-#: ../libnm-core/nm-vpn-plugin-info.c:110
+#: ../libnm-core/nm-vpn-plugin-info.c:109
 #, c-format
 msgid "missing filename"
 msgstr "Dateiname fehlt"
 
-#: ../libnm-core/nm-vpn-plugin-info.c:118
+#: ../libnm-core/nm-vpn-plugin-info.c:117
 #, c-format
 msgid "filename must be an absolute path (%s)"
 msgstr "Der Dateiname muss ein absoluter Pfad sein (%s)"
 
-#: ../libnm-core/nm-vpn-plugin-info.c:127
+#: ../libnm-core/nm-vpn-plugin-info.c:126
 #, c-format
 msgid "filename has invalid format (%s)"
 msgstr "Dateiname hat ein ungültiges Format (%s)"
 
-#: ../libnm-core/nm-vpn-plugin-info.c:450
+#: ../libnm-core/nm-vpn-plugin-info.c:383
 #, c-format
 msgid "there exists a conflicting plugin (%s) that has the same %s.%s value"
-msgstr ""
+msgstr "In Konflikt stehendes Plugin (%s) hat denselben %s.%s Wert"
 
-#: ../libnm-core/nm-vpn-plugin-info.c:488
+#: ../libnm-core/nm-vpn-plugin-info.c:421
 #, c-format
 msgid "there exists a conflicting plugin with the same name (%s)"
-msgstr ""
+msgstr "In Konflikt stehendes Plugin mit demselben Namen (%s)"
 
-#: ../libnm-core/nm-vpn-plugin-info.c:878
+#: ../libnm-core/nm-vpn-plugin-info.c:740
 #, c-format
 msgid "missing \"plugin\" setting"
 msgstr "Einstellung »plugin« fehlt"
 
-#: ../libnm-core/nm-vpn-plugin-info.c:888
+#: ../libnm-core/nm-vpn-plugin-info.c:750
 #, c-format
 msgid "%s: don't retry loading plugin which already failed previously"
 msgstr ""
+"%s: versuchen Sie nicht ein Plugin neu zu laden, das bereits einmal "
+"fehlschlug"
 
-#: ../libnm-core/nm-vpn-plugin-info.c:980
+#: ../libnm-core/nm-vpn-plugin-info.c:842
 msgid "missing filename to load VPN plugin info"
-msgstr ""
+msgstr "Dateiname fehlt um VPN Plugin-Info zu laden"
 
-#: ../libnm-core/nm-vpn-plugin-info.c:992
+#: ../libnm-core/nm-vpn-plugin-info.c:854
 msgid "missing name for VPN plugin info"
-msgstr ""
+msgstr "Name für VPN Plugin-Info fehlt"
 
-#: ../libnm-core/nm-vpn-plugin-info.c:1001
+#: ../libnm-core/nm-vpn-plugin-info.c:863
 msgid "missing service for VPN plugin info"
-msgstr ""
+msgstr "Dienst für VPN Plugin-Info fehlt"
 
 #: ../libnm-glib/nm-device.c:1853 ../libnm/nm-device.c:1804
 msgid "Bluetooth"
@@ -9189,7 +9163,7 @@ msgstr "IP-Tunnel"
 
 #: ../libnm-glib/nm-device.c:1881 ../libnm/nm-device.c:1832
 msgid "Veth"
-msgstr ""
+msgstr "Veth"
 
 #: ../libnm-glib/nm-device.c:1913 ../libnm/nm-device.c:1864
 msgid "Wired"
@@ -9208,7 +9182,7 @@ msgstr "USB"
 #. * "Ethernet"). You can change this to something like
 #. * "%2$s (%1$s)" if there's no grammatical way to combine
 #. * the strings otherwise.
-#.
+#. 
 #: ../libnm-glib/nm-device.c:2042 ../libnm-glib/nm-device.c:2061
 #: ../libnm/nm-device.c:1991 ../libnm/nm-device.c:2010
 #, c-format
@@ -9279,12 +9253,12 @@ msgstr "%d. IPv6-Adresse hat ein ungültiges Präfix"
 #: ../libnm-util/nm-setting-vpn.c:582
 #, c-format
 msgid "Failed to convert '%s' value '%s' to uint"
-msgstr ""
+msgstr "Fehler bei Umwandlung von '%s' Wert '%s' zu uint "
 
 #: ../libnm-util/nm-setting-vpn.c:589
 #, c-format
 msgid "Secret flags property '%s' not found"
-msgstr ""
+msgstr "Eigenschaft '%s' der geheimen Flags nicht gefunden"
 
 #: ../libnm-util/nm-setting-wireless.c:807
 #, c-format
@@ -9330,7 +9304,7 @@ msgstr "Die Verbindung war keine Ethernet- oder PPPoE-Verbindung."
 
 #: ../libnm/nm-device-ethernet.c:222
 msgid "The connection and device differ in S390 subchannels."
-msgstr ""
+msgstr "Verbindung und Gerät unterscheiden sich in S390 Subchannels."
 
 #: ../libnm/nm-device-ethernet.c:232 ../libnm/nm-device-infiniband.c:102
 #: ../libnm/nm-device-wifi.c:604 ../libnm/nm-device-wimax.c:326
@@ -9400,7 +9374,7 @@ 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-team.c:139
+#: ../libnm/nm-device-team.c:118
 msgid "The connection was not a team connection."
 msgstr "Die Verbindung war keine Team-Verbindung."
 
@@ -9410,11 +9384,11 @@ msgstr "Die Verbindung war keine VLAN-Verbindung."
 
 #: ../libnm/nm-device-vlan.c:135
 msgid "The VLAN identifiers of the device and the connection didn't match."
-msgstr ""
+msgstr "Die VLAN-Bezeichner von Gerät und Verbindung stimmen nicht überein."
 
 #: ../libnm/nm-device-vlan.c:148
 msgid "The hardware address of the device and the connection didn't match."
-msgstr ""
+msgstr "Die Hardware-Adresse von Gerät und Verbindung stimmen nicht überein."
 
 #: ../libnm/nm-device-vxlan.c:387
 msgid "The connection was not a VXLAN connection."
@@ -9422,8 +9396,7 @@ msgstr "Die Verbindung war keine VXLAN-Verbindung."
 
 #: ../libnm/nm-device-vxlan.c:394
 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."
+msgstr "Die VXLAN-Bezeichner von Gerät und Verbindung stimmen nicht überein."
 
 #: ../libnm/nm-device-wifi.c:595
 msgid "The connection was not a Wi-Fi connection."
@@ -9435,9 +9408,11 @@ msgstr ""
 "Dem Gerät fehlen WPA-Fähigkeiten, die für die Verbindung notwendig sind."
 
 #: ../libnm/nm-device-wifi.c:638
-msgid "The device is lacking WPA2/RSN capabilities required by the connection."
+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."
+""
 
 #: ../libnm/nm-device-wimax.c:317
 msgid "The connection was not a WiMAX connection."
@@ -9452,6 +9427,7 @@ msgstr "Die Verbindung war ungültig: %s"
 #, c-format
 msgid "The interface names of the device and the connection didn't match."
 msgstr ""
+"Die Schnittstellennamen von Gerät und Verbindung stimmen nicht überein."
 
 #: ../libnm/nm-manager.c:874
 msgid "Active connection could not be attached to the device"
@@ -9463,11 +9439,11 @@ msgstr "Die aktive Verbindung wurde entfernt, bevor sie initialisiert wurde"
 
 #: ../libnm/nm-object.c:1545 ../libnm/nm-object.c:1691
 msgid "Caller did not specify D-Bus path for object"
-msgstr ""
+msgstr "Aufrufer hat nicht D-Bus Pfad für Objekt angegeben"
 
 #: ../libnm/nm-remote-settings.c:261
 msgid "Connection removed before it was initialized"
-msgstr ""
+msgstr "Die Verbindung wurde entfernt, bevor sie initialisiert wurde"
 
 #: ../libnm/nm-vpn-plugin-old.c:957 ../libnm/nm-vpn-service-plugin.c:978
 msgid "No service name specified"
@@ -9542,7 +9518,8 @@ msgid "Connection sharing via a protected WiFi network"
 msgstr "Verbindungsfreigabe über ein geschütztes WLAN-Netzwerk"
 
 #: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:14
-msgid "System policy prevents sharing connections via a protected WiFi network"
+msgid ""
+"System policy prevents sharing connections via a protected WiFi network"
 msgstr ""
 "Die Systemrichtlinien verhindern Verbindungsfreigaben über ein geschütztes "
 "WLAN-Netzwerk"
@@ -9589,7 +9566,7 @@ msgstr ""
 
 #: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:23
 msgid "Modify persistent global DNS configuration"
-msgstr "Die dauerhafte globale DNS-Konfiguration bearbeiten"
+msgstr "Beständige globale DNS-Konfiguration ändern"
 
 #: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:24
 msgid ""
@@ -9599,38 +9576,46 @@ msgstr ""
 "Die Systemrichtlinien verhindern das Ändern der ständigen globalen DNS-"
 "Konfiguration"
 
-#: ../shared/nm-shared-utils.c:185
+#: ../shared/nm-shared-utils.c:208
 #, c-format
 msgid "object class '%s' has no property named '%s'"
-msgstr ""
+msgstr "Objektklasse '%s' hat keine Eigenschaft namens '%s'"
 
-#: ../shared/nm-shared-utils.c:192
+#: ../shared/nm-shared-utils.c:215
 #, c-format
 msgid "property '%s' of object class '%s' is not writable"
-msgstr ""
+msgstr "Eigenschaft '%s' von Objektklasse '%s' ist nicht beschreibbar"
 
-#: ../shared/nm-shared-utils.c:199
+#: ../shared/nm-shared-utils.c:222
 #, c-format
 msgid ""
 "construct property \"%s\" for object '%s' can't be set after construction"
 msgstr ""
+"Erstellungseigenschaft \"%s\" für Objekt '%s' kann nicht nach der Erstellung "
+"festgelegt werden"
 
-#: ../shared/nm-shared-utils.c:207
+#: ../shared/nm-shared-utils.c:230
 #, c-format
 msgid "'%s::%s' is not a valid property name; '%s' is not a GObject subtype"
 msgstr ""
+"'%s::%s' ist kein gültiger Eigenschaftsname; '%s' ist kein Subtyp von "
+"GObject"
 
-#: ../shared/nm-shared-utils.c:216
+#: ../shared/nm-shared-utils.c:239
 #, 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 festgelegt "
+"werden"
 
-#: ../shared/nm-shared-utils.c:227
+#: ../shared/nm-shared-utils.c:250
 #, c-format
 msgid ""
 "value \"%s\" of type '%s' is invalid or out of range for property '%s' of "
 "type '%s'"
 msgstr ""
+"Wert  '%s' des Typs '%s' ist ungültig oder nicht im Bereich für Eigenschaft "
+"'%s' des Typs '%s'"
 
 #. Translators: the first %s is a prefix for the connection id, such
 #. * as "Wired Connection" or "VPN Connection". The %d is a number
@@ -9642,45 +9627,49 @@ msgctxt "connection id fallback"
 msgid "%s %d"
 msgstr "%s %d"
 
-#: ../src/main.c:148 ../src/main.c:283
+#: ../src/main.c:220 ../src/main.c:358
 #, c-format
 msgid "Failed to read configuration: %s\n"
 msgstr "Lesen der Konfiguration ist fehlgeschlagen: %s\n"
 
 #. Logging/debugging
-#: ../src/main.c:162 ../src/nm-iface-helper.c:298
+#: ../src/main.c:234 ../src/nm-iface-helper.c:298
 msgid "Print NetworkManager version and exit"
 msgstr "NetworkManager-Version anzeigen und beenden"
 
-#: ../src/main.c:163 ../src/nm-iface-helper.c:299
+#: ../src/main.c:235 ../src/nm-iface-helper.c:299
 msgid "Don't become a daemon"
 msgstr "Nicht zum Hintergrunddienst werden"
 
-#: ../src/main.c:164 ../src/nm-iface-helper.c:301
+#: ../src/main.c:236 ../src/nm-iface-helper.c:301
 #, c-format
 msgid "Log level: one of [%s]"
 msgstr "Protokollierungsstufe: Eine von [%s]"
 
-#: ../src/main.c:166 ../src/nm-iface-helper.c:303
+#: ../src/main.c:238 ../src/nm-iface-helper.c:303
 #, 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:168 ../src/nm-iface-helper.c:305
+#: ../src/main.c:240 ../src/nm-iface-helper.c:305
 msgid "Make all warnings fatal"
 msgstr "Alle Warnungen als fatal betrachten"
 
-#: ../src/main.c:169
+#: ../src/main.c:241
 msgid "Specify the location of a PID file"
 msgstr "Geben Sie den Ort der PID-Datei an"
 
-#: ../src/main.c:171
+#: ../src/main.c:242
+msgid "State file location"
+msgstr "Speicherort der Statusdatei"
+
+#: ../src/main.c:244
 msgid "Print NetworkManager configuration and exit"
 msgstr "NetworkManager-Konfiguration ausgeben und beenden"
 
-#: ../src/main.c:181
+#: ../src/main.c:254
 msgid ""
 "NetworkManager monitors all network connections and automatically\n"
 "chooses the best connection to use.  It also allows the user to\n"
@@ -9688,67 +9677,66 @@ msgid ""
 "should associate with."
 msgstr ""
 "Die Netzwerkverwaltung überwacht alle Netzwerkverbindungen und wählt\n"
-"automatisch die beste Verbindung zur Verwendung aus. Außerdem ermöglicht "
-"sie\n"
+"automatisch die beste Verbindung zur Verwendung aus. Außerdem ermöglicht sie\n"
 "dem Anwender diejenigen Drahtlos-Zugangspunkte anzugeben, mit welchen sich\n"
 "die Drahtlos-Netzwerkkarten des Rechners verbinden sollen."
 
-#: ../src/main.c:268 ../src/main-utils.c:268 ../src/nm-iface-helper.c:393
+#: ../src/main.c:343 ../src/main-utils.c:269 ../src/nm-iface-helper.c:393
 #, 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:273 ../src/nm-iface-helper.c:398
+#: ../src/main.c:348 ../src/nm-iface-helper.c:398
 #, 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:298
+#: ../src/main.c:373
 #, c-format
 msgid "Error in configuration file: %s.\n"
 msgstr "Fehler in Konfigurationsdatei: %s.\n"
 
-#: ../src/main.c:303
+#: ../src/main.c:378
 #, 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:314 ../src/nm-iface-helper.c:408
+#: ../src/main.c:389 ../src/nm-iface-helper.c:408
 #, c-format
 msgid "Could not daemonize: %s [error %u]\n"
 msgstr "Hintergrunddienst nicht möglich: %s [error %u]\n"
 
-#: ../src/main-utils.c:98
+#: ../src/main-utils.c:99
 #, c-format
 msgid "Opening %s failed: %s\n"
 msgstr "Öffnen von %s fehlgeschlagen: %s\n"
 
-#: ../src/main-utils.c:104
+#: ../src/main-utils.c:105
 #, c-format
 msgid "Writing to %s failed: %s\n"
 msgstr "Schreiben nach %s gescheitert: %s\n"
 
-#: ../src/main-utils.c:109
+#: ../src/main-utils.c:110
 #, c-format
 msgid "Closing %s failed: %s\n"
 msgstr "Schließen von %s fehlgeschlagen: %s\n"
 
-#: ../src/main-utils.c:144
+#: ../src/main-utils.c:145
 #, c-format
 msgid "Cannot create '%s': %s"
 msgstr "»%s« kann nicht erstellt werden: %s"
 
-#: ../src/main-utils.c:196
+#: ../src/main-utils.c:197
 #, c-format
 msgid "%s is already running (pid %ld)\n"
 msgstr "%s läuft bereits (pid %ld)\n"
 
-#: ../src/main-utils.c:206
+#: ../src/main-utils.c:207
 #, c-format
 msgid "You must be root to run %s!\n"
 msgstr "Sie müssen als root angemeldet sein, um %s auszuführen.\n"
@@ -9759,29 +9747,28 @@ msgstr "# Erstellt von NetworkManager\n"
 
 #: ../src/dhcp-manager/nm-dhcp-dhclient-utils.c:220
 #, c-format
-msgid ""
-"# Merged from %s\n"
+msgid "# Merged from %s\n"
 "\n"
-msgstr ""
-"# Zusammengeführt aus %s\n"
+msgstr "# Zusammengeführt aus %s\n"
 "\n"
 
 #: ../src/devices/adsl/nm-device-adsl.c:133
 msgid "ADSL connection"
 msgstr "ADSL-Verbindung"
 
-#: ../src/devices/bluetooth/nm-bluez-device.c:200
+#: ../src/devices/bluetooth/nm-bluez-device.c:197
 #, c-format
 msgid "%s Network"
 msgstr "%s-Netzwerk"
 
 #: ../src/devices/bluetooth/nm-device-bt.c:253
 msgid "PAN requested, but Bluetooth device does not support NAP"
-msgstr ""
+msgstr "PAN angefordert, aber Bluetooth-Gerät unterstützt nicht NAP"
 
 #: ../src/devices/bluetooth/nm-device-bt.c:263
 msgid "PAN connections cannot specify GSM, CDMA, or serial settings"
 msgstr ""
+"PAN-Verbindungen können nicht GSM, CDMA oder serielle Einstellungen angeben"
 
 #: ../src/devices/bluetooth/nm-device-bt.c:276
 msgid "PAN connection"
@@ -9789,30 +9776,30 @@ msgstr "PAN-Verbindung"
 
 #: ../src/devices/bluetooth/nm-device-bt.c:283
 msgid "DUN requested, but Bluetooth device does not support DUN"
-msgstr ""
+msgstr "DUN angefordert, aber Bluetooth-Gerät unterstützt nicht DUN"
 
 #: ../src/devices/bluetooth/nm-device-bt.c:293
 msgid "DUN connection must include a GSM or CDMA setting"
-msgstr ""
+msgstr "DUN-Verbindung muss eine GSM oder CDMA Einstellung enthalten"
 
 #: ../src/devices/bluetooth/nm-device-bt.c:303
-#: ../src/devices/wwan/nm-modem-broadband.c:687
+#: ../src/devices/wwan/nm-modem-broadband.c:655
 msgid "GSM connection"
 msgstr "GSM-Verbindung"
 
 #: ../src/devices/bluetooth/nm-device-bt.c:307
-#: ../src/devices/wwan/nm-modem-broadband.c:711
+#: ../src/devices/wwan/nm-modem-broadband.c:679
 msgid "CDMA connection"
 msgstr "CDMA-Verbindung"
 
 #: ../src/devices/bluetooth/nm-device-bt.c:315
 msgid "Unknown/unhandled Bluetooth connection type"
-msgstr ""
+msgstr "Unbekannter/unbehandelter Bluetooth-Verbindungstyp"
 
 #: ../src/devices/bluetooth/nm-device-bt.c:336
-#: ../src/devices/nm-device-ethernet.c:1421
+#: ../src/devices/nm-device-ethernet.c:1415
 #: ../src/devices/nm-device-infiniband.c:193
-#: ../src/devices/wifi/nm-device-wifi.c:874
+#: ../src/devices/wifi/nm-device-wifi.c:872
 msgid "connection does not match device"
 msgstr "Die Verbindung passt nicht zum Gerät"
 
@@ -9824,15 +9811,15 @@ msgstr "Bündel-Verbindung"
 msgid "Bridge connection"
 msgstr "Brückenverbindung"
 
-#: ../src/devices/nm-device-ethernet.c:1402
+#: ../src/devices/nm-device-ethernet.c:1396
 msgid "PPPoE connection"
 msgstr "PPPoE-Verbindung"
 
-#: ../src/devices/nm-device-ethernet.c:1402
+#: ../src/devices/nm-device-ethernet.c:1396
 msgid "Wired connection"
 msgstr "Kabelgebundene Verbindung"
 
-#: ../src/devices/nm-device-ethernet-utils.c:36
+#: ../src/devices/nm-device-ethernet-utils.c:39
 #, c-format
 msgid "Wired connection %d"
 msgstr "Kabelgebundene Verbindung %d"
@@ -9841,11 +9828,11 @@ msgstr "Kabelgebundene Verbindung %d"
 msgid "InfiniBand connection"
 msgstr "InfiniBand-Verbindung"
 
-#: ../src/devices/nm-device-ip-tunnel.c:347
+#: ../src/devices/nm-device-ip-tunnel.c:346
 msgid "IP tunnel connection"
 msgstr "IP-Tunnel-Verbindung"
 
-#: ../src/devices/nm-device-macvlan.c:436
+#: ../src/devices/nm-device-macvlan.c:435
 msgid "MACVLAN connection"
 msgstr "MACVLAN-Verbindung"
 
@@ -9853,15 +9840,15 @@ msgstr "MACVLAN-Verbindung"
 msgid "TUN connection"
 msgstr "TUN-Verbindung"
 
-#: ../src/devices/nm-device-vlan.c:458
+#: ../src/devices/nm-device-vlan.c:457
 msgid "VLAN connection"
 msgstr "VLAN-Verbindung"
 
-#: ../src/devices/nm-device-vxlan.c:374
+#: ../src/devices/nm-device-vxlan.c:373
 msgid "VXLAN connection"
 msgstr "VXLAN-Verbindung"
 
-#: ../src/devices/team/nm-device-team.c:121
+#: ../src/devices/team/nm-device-team.c:115
 msgid "Team connection"
 msgstr "Netzwerk-Team"
 
@@ -9869,7 +9856,7 @@ msgstr "Netzwerk-Team"
 msgid "Mesh"
 msgstr "Maschennetz"
 
-#: ../src/devices/wifi/nm-device-wifi.c:841
+#: ../src/devices/wifi/nm-device-wifi.c:839
 msgid "WPA Ad-Hoc disabled due to kernel bugs"
 msgstr "Ad-Hoc WPA ist wegen kernel-Fehlern ausgeschaltet"
 
@@ -9960,11 +9947,13 @@ msgstr ""
 
 #: ../src/devices/wifi/nm-wifi-ap-utils.c:371
 msgid "WPA Ad-Hoc requires 'tkip' group cipher"
-msgstr ""
+msgstr "WPA Ad-Hoc erfordert Chiffre der 'tkip'-Gruppe"
 
 #: ../src/devices/wifi/nm-wifi-ap-utils.c:385
 msgid "Access point does not support PSK but setting requires it"
 msgstr ""
+"Der Zugriffspunkt unterstützt nicht PSK, aber die Einstellung setzt es "
+"voraus"
 
 #: ../src/devices/wifi/nm-wifi-ap-utils.c:415
 msgid "WPA-EAP authentication requires an 802.1x setting"
@@ -9988,6 +9977,8 @@ msgstr ""
 msgid ""
 "Access point mode is Ad-Hoc but setting requires Infrastructure security"
 msgstr ""
+"Der Zugriffspunkt-Modus ist Ad-Hoc, aber die Einstellung erfordert "
+"Infrastruktursicherheit"
 
 #: ../src/devices/wifi/nm-wifi-ap-utils.c:487
 msgid "Ad-Hoc mode is incompatible with 802.1x security"
@@ -10005,6 +9996,8 @@ msgstr "Ad-hoc-Modus erfordert »offene« Legitimierung"
 msgid ""
 "Access point mode is Infrastructure but setting requires Ad-Hoc security"
 msgstr ""
+"Der Zugriffspunkt-Modus ist Infrastruktur, die Einstellung erfordert aber Ad-"
+"Hoc Sicherheit"
 
 #: ../src/devices/wifi/nm-wifi-ap-utils.c:558
 #: ../src/devices/wifi/nm-wifi-ap-utils.c:588
@@ -10015,12 +10008,16 @@ msgstr "Die Verbindung passt nicht zum Zugriffspunkt"
 #: ../src/devices/wifi/nm-wifi-ap-utils.c:612
 msgid "Access point is unencrypted but setting specifies security"
 msgstr ""
+"Der Zugriffspunkt ist unverschlüsselt, die Einstellung erfordert aber "
+"Sicherheit "
 
 #: ../src/devices/wifi/nm-wifi-ap-utils.c:701
 msgid ""
 "WPA authentication is incompatible with non-EAP (original) LEAP or Dynamic "
 "WEP"
 msgstr ""
+"WPA-Authentifizierung ist nicht kompatibel mit nicht-EAP (original) LEAP "
+"oder Dynamic WEP"
 
 #: ../src/devices/wifi/nm-wifi-ap-utils.c:711
 msgid "WPA authentication is incompatible with Shared Key authentication"
@@ -10032,56 +10029,52 @@ msgstr ""
 msgid "Failed to determine AP security information"
 msgstr "Das Ermitteln der AP-Sicherheitsinformationen scheiterte"
 
-#: ../src/devices/wwan/nm-modem-broadband.c:673
+#: ../src/devices/wwan/nm-modem-broadband.c:641
 msgid "GSM mobile broadband connection requires a 'gsm' setting"
 msgstr "Mobile GSM-Breitband-Verbindung erfordert die Einstellung »gsm«"
 
-#: ../src/nm-config.c:499
+#: ../src/nm-config.c:465
 msgid "Config file location"
 msgstr "Speicherort der Konfigurationsdatei"
 
-#: ../src/nm-config.c:500
+#: ../src/nm-config.c:466
 msgid "Config directory location"
 msgstr "Speicherort des Konfigurationsordners"
 
-#: ../src/nm-config.c:501
+#: ../src/nm-config.c:467
 msgid "System config directory location"
 msgstr "Speicherort des System-Konfigurationsordners"
 
-#: ../src/nm-config.c:502
+#: ../src/nm-config.c:468
 msgid "Internal config file location"
 msgstr "Speicherort der internen Konfigurationsdatei"
 
-#: ../src/nm-config.c:503
-msgid "State file location"
-msgstr "Speicherort der Statusdatei"
-
-#: ../src/nm-config.c:504
+#: ../src/nm-config.c:469
 msgid "State file for no-auto-default devices"
-msgstr ""
+msgstr "Statusdatei für no-auto-default Geräte "
 
-#: ../src/nm-config.c:505
+#: ../src/nm-config.c:470
 msgid "List of plugins separated by ','"
 msgstr "Mit »,« getrennte Liste von Erweiterungen"
 
-#: ../src/nm-config.c:506
+#: ../src/nm-config.c:471
 msgid "Quit after initial configuration"
 msgstr "Nach Erstkonfiguration beenden"
 
-#: ../src/nm-config.c:507 ../src/nm-iface-helper.c:300
+#: ../src/nm-config.c:472 ../src/nm-iface-helper.c:300
 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:510
+#: ../src/nm-config.c:475
 msgid "An http(s) address for checking internet connectivity"
 msgstr "Eine http(s)-Adresse zum Prüfen der Internetverbindung"
 
-#: ../src/nm-config.c:511
+#: ../src/nm-config.c:476
 msgid "The interval between connectivity checks (in seconds)"
 msgstr "Das Intervall zwischen Verbindungsprüfungen (in Sekunden)"
 
-#: ../src/nm-config.c:512
+#: ../src/nm-config.c:477
 msgid "The expected start of the response"
 msgstr "Der erwartete Start einer Antwort"
 
@@ -10104,15 +10097,15 @@ msgstr "661e8cd0-b618-46b8-9dc9-31a52baaa16b"
 
 #: ../src/nm-iface-helper.c:283
 msgid "Whether to manage IPv6 SLAAC"
-msgstr ""
+msgstr "Legt fest, ob IPv6 SLAAC verwaltet werden soll"
 
 #: ../src/nm-iface-helper.c:284
 msgid "Whether SLAAC must be successful"
-msgstr "Legt fest, ob SLAAC erfolgreich abschließen muss"
+msgstr "Legt fest, ob SLAAC erfolgreich sein muss"
 
 #: ../src/nm-iface-helper.c:285
 msgid "Use an IPv6 temporary privacy address"
-msgstr ""
+msgstr "Temporäre IPv6 Privacy-Adresse benutzen"
 
 #: ../src/nm-iface-helper.c:286
 msgid "Current DHCPv4 address"
@@ -10132,7 +10125,7 @@ msgstr "Rechnername, der an den DHCP-Server gesendet wird"
 
 #: ../src/nm-iface-helper.c:289
 msgid "barbar"
-msgstr ""
+msgstr "Barbar"
 
 #: ../src/nm-iface-helper.c:290
 msgid "FQDN to send to DHCP server"
@@ -10140,7 +10133,7 @@ msgstr "FQDN (Rechnername), der an den DHCP-Server gesendet wird"
 
 #: ../src/nm-iface-helper.c:290
 msgid "host.domain.org"
-msgstr "Rechner.domain.org"
+msgstr "host.domain.org"
 
 #: ../src/nm-iface-helper.c:291
 msgid "Route priority for IPv4"
@@ -10160,259 +10153,61 @@ msgstr "1024"
 
 #: ../src/nm-iface-helper.c:293
 msgid "Hex-encoded Interface Identifier"
-msgstr ""
+msgstr "Hex-kodierter Schnittstellenbezeichner"
 
 #: ../src/nm-iface-helper.c:294
 msgid "IPv6 SLAAC address generation mode"
-msgstr ""
+msgstr "IPv6 SLAAC Adressgenerierungs-Modus"
 
 #: ../src/nm-iface-helper.c:295
 msgid ""
 "The logging backend configuration value. See logging.backend in "
 "NetworkManager.conf"
 msgstr ""
+"Protokollierungs-Backend Konfigurationswert. Siehe logging.backend in der "
+"NetworkManager.conf"
 
 #: ../src/nm-iface-helper.c:315
 msgid ""
 "nm-iface-helper is a small, standalone process that manages a single network "
 "interface."
 msgstr ""
+"Der nm-iface-helper ist ein kleiner Standalone-Prozess, der eine einzelne "
+"Netzwerkschnittstelle verwaltet."
 
 #: ../src/nm-iface-helper.c:374
 #, c-format
 msgid "An interface name and UUID are required\n"
-msgstr ""
+msgstr "Schnittstellenname und UUID sind erforderlich\n"
 
 #: ../src/nm-iface-helper.c:380
 #, c-format
 msgid "Failed to find interface index for %s (%s)\n"
-msgstr "Schnittstellenindex für %s konnte nicht gefunden werden (%s)\n"
+msgstr "Kein Schnittstellenindex gefunden für %s (%s)\n"
 
 #: ../src/nm-iface-helper.c:442
 #, c-format
 msgid "(%s): Invalid IID %s\n"
-msgstr ""
+msgstr "(%s): Ungültiger IID %s\n"
 
-#: ../src/nm-logging.c:220
+#: ../src/nm-logging.c:216
 #, c-format
 msgid "Unknown log level '%s'"
 msgstr "Unbekannte Protokollstufe »%s«"
 
-#: ../src/nm-logging.c:308
+#: ../src/nm-logging.c:309
 #, c-format
 msgid "Unknown log domain '%s'"
 msgstr "Unbekannte Protokolldomäne »%s«"
 
-#: ../src/nm-manager.c:3617
+#: ../src/nm-manager.c:3635
 msgid "VPN connection"
 msgstr "VPN-Verbindung"
 
-#: ../src/settings/plugins/ifcfg-rh/reader.c:106
+#: ../src/nm-sleep-monitor-systemd.c:131
+msgid "NetworkManager needs to turn off networks"
+msgstr "NetworkManager muss Netzwerke abschalten"
+
+#: ../src/settings/plugins/ifcfg-rh/reader.c:108
 msgid "System"
 msgstr "System"
-
-#~ msgid "could not get VPN plugin info"
-#~ msgstr "Informationen zum VPN-Plugin konnten nicht ermittelt werden."
-
-#, fuzzy
-#~ msgid "Error: not all connections reapplied."
-#~ msgstr "Fehler: Es wurden nicht alle aktiven Verbindungen gelöscht."
-
-#~ msgid "Error: no valid device provided."
-#~ msgstr "Fehler: es wurde kein gültiges Gerät angegeben."
-
-#~ msgid "Error converting IP4 address '0x%X' to text form"
-#~ msgstr "Fehler beim Umwandeln der IPv4-Adresse »0x%X« in eine Textform"
-
-#~ msgid "Error converting IP6 address '%s' to text form"
-#~ msgstr "Fehler beim Umwandeln der IPv6-Adresse »%s« in eine Textform"
-
-#~ msgid "NetworkManager needs to turn off networks"
-#~ msgstr "NetworkManager muss Netzwerke abschalten"
-
-#~ msgid "no usable DHCP client could be found."
-#~ msgstr "Es konnte kein verwendbarer DHCP-Client gefunden werden."
-
-#~ msgid "NOTE: the libc resolver may not support more than 3 nameservers."
-#~ msgstr ""
-#~ "HINWEIS: Der libc-resolver unterstützt eventuell nicht mehr als drei "
-#~ "Nameserver."
-
-#~ msgid "The nameservers listed below may not be recognized."
-#~ msgstr ""
-#~ "Die nachfolgend gelisteten Nameserver werden eventuell nicht erkannt."
-
-#~ msgid "Failed to read configuration: (%d) %s\n"
-#~ msgstr "Konfiguration konnte nicht gelesen werden: (%d) %s\n"
-
-#, fuzzy
-#~| msgid "Unknown parameter: %s\n"
-#~ msgid "Error: unknown parameter: %s"
-#~ msgstr "Unbekannter Parameter: %s\n"
-
-#~ msgid "yes (%u)"
-#~ msgstr "Ja (%u)"
-
-#, fuzzy
-#~| msgid "'%s' is not a valid duplex value"
-#~ msgid "'%s' is not a valid powersave value"
-#~ msgstr "»%s« ist kein gültiger Duplex-Wert"
-
-#~ msgid "Error: Device '%s' is a hardware device. It can't be deleted.\n"
-#~ msgstr ""
-#~ "Fehler: Gerät »%s« ist ein Hardware-Gerät und kann nicht entfernt "
-#~ "werden.\n"
-
-#~ msgid "Error: not all devices valid."
-#~ msgstr "Fehler: Nicht alle Geräte sind gültig."
-
-#~ msgid "Error: Argument missing."
-#~ msgstr "Fehler: Argument fehlt."
-
-#~ msgid "property is empty'"
-#~ msgstr "Eigenschaft ist leer"
-
-#~ msgid "'%s' not allowed for %s=%s"
-#~ msgstr "»%s« ist nicht erlaubt für %s=%s"
-
-#~ msgid "Team master: "
-#~ msgstr "Bündelungs-Master: "
-
-#~ msgid "Bridge master: "
-#~ msgstr "Master der Netzwerkbrücke: "
-
-#~ msgid ""
-#~ "Warning: 'type' is currently ignored. We only support ethernet slaves for "
-#~ "now.\n"
-#~ msgstr ""
-#~ "Warnung: »type« wird derzeit ignoriert. Zur Zeit werden nur Ethernet-"
-#~ "slaves unterstützt.\n"
-
-#~ msgid "Error: bad color number: '%s'; use <0-8>\n"
-#~ msgstr "Fehler: ungültige Farbnummer: »%s«. Verwenden Sie <0-8>\n"
-
-#~ msgid "Home"
-#~ msgstr "Zu Hause"
-
-#~ msgid "Partner"
-#~ msgstr "Partner"
-
-# CHECK
-#~ msgid "Roaming"
-#~ msgstr "Roaming"
-
-#~ msgid "WiMAX NSP list"
-#~ msgstr "WiMAX NSP-Liste"
-
-#~ msgid "Error: 'device wimax': %s"
-#~ msgstr "Fehler: »device wimax«: %s"
-
-#~ msgid "Error: NSP with name '%s' not found."
-#~ msgstr "Fehler: NSP namens »%s« wurde nicht gefunden."
-
-#~ msgid "Error: Device '%s' is not a WiMAX device."
-#~ msgstr "Fehler: Gerät »%s« ist kein WiMAX-Gerät."
-
-#~ msgid "Error: Access point with nsp '%s' not found."
-#~ msgstr "Fehler: Zugangspunkt mit NSP »%s« nicht gefunden."
-
-#~ msgid "Error: 'device wimax' command '%s' is not valid."
-#~ msgstr "Fehler: Der »device wimax«-Befehl für »%s« ist ungültig."
-
-#~ msgid ""
-#~ "Usage: nmcli radio wimax { ARGUMENTS | help }\n"
-#~ "\n"
-#~ "ARGUMENTS := [on | off]\n"
-#~ "\n"
-#~ "Get status of WiMAX radio switch, or turn it on/off.\n"
-#~ "\n"
-#~ msgstr ""
-#~ "Aufruf: nmcli radio wimax { PARAMETER | help }\n"
-#~ "\n"
-#~ "PARAMETER := [on | off]\n"
-#~ "\n"
-#~ "Ruft den Status des WiMAX-Funkschalters ab oder schaltet diesen an/aus.\n"
-#~ "\n"
-
-#~ msgid "WiMAX radio switch"
-#~ msgstr "WiMAX-Funkschalter"
-
-#~ msgid "'%s' is ambiguous (on x off)"
-#~ msgstr "»%s« ist mehrdeutig (ein x aus)"
-
-#~ msgid "Failed to set symmetric key for decryption: %s / %s."
-#~ msgstr ""
-#~ "Das Anlegen der symmetrischen Schlüssel zum Entschlüsseln scheiterte: "
-#~ "%s / %s."
-
-#~ msgid "Failed to set IV for decryption: %s / %s."
-#~ msgstr "Das Anlegen des IV zum Entschlüsseln scheiterte: %s / %s."
-
-#~ msgid "Failed to set symmetric key for encryption: %s / %s."
-#~ msgstr ""
-#~ "Das Anlegen des symmetrischen Schlüssels zum Verschlüsseln scheiterte: "
-#~ "%s / %s."
-
-#~ msgid "Failed to set IV for encryption: %s / %s."
-#~ msgstr "Das Anlegen des IV zur Verschlüsselung scheiterte: %s / %s."
-
-#~ msgid "/path/to/state.file"
-#~ msgstr "/pfad/zur/status.datei"
-
-#~ msgid "/path/to/config.file"
-#~ msgstr "/pfad/zur/config.datei"
-
-#~ msgid "/path/to/config/dir"
-#~ msgstr "/Pfad/zur/Konfiguration/Ordner"
-
-#~ msgid "plugin1,plugin2"
-#~ msgstr "erweiterung1,erweiterung2"
-
-#~ msgid "Bingo!"
-#~ msgstr "Bingo!"
-
-#, fuzzy
-#~| msgid "Wired connection %d"
-#~ msgid "ibft: read connection '%s'"
-#~ msgstr "Kabelgebundene Verbindung %d"
-
-#~ msgid "Device '%s' has been disconnected.\n"
-#~ msgstr "Gerät »%s« wurde getrennt.\n"
-
-#, fuzzy
-#~| msgid "Shared connection service failed"
-#~ msgid "Slave connections need a valid '"
-#~ msgstr "Es muss ein gültiger Server-Pfad eingegeben werden"
-
-#, fuzzy
-#~ msgid "Cannot set '"
-#~ msgstr "  ' kann nicht gesetzt werden"
-
-#~ msgid "State file %s parsing failed: (%d) %s\n"
-#~ msgstr "Statusdatei %s konnte nicht verarbeitet werden: (%d) %s\n"
-
-#~ msgid "invalid prefix '%s'; <1-32> allowed"
-#~ msgstr "ungültiger Präfix »%s«. <1-32> ist erlaubt"
-
-#~ msgid "invalid prefix '%s'; <1-128> allowed"
-#~ msgstr "ungültiger Präfix »%s«. <1-128> ist erlaubt"
-
-#~ msgid "invalid route destination address '%s'"
-#~ msgstr "ungültige Routen-Zieladresse »%s«"
-
-#~ msgid "invalid next hop address '%s'"
-#~ msgstr "ungültige next-hop-Adresse »%s«"
-
-#~ msgid ""
-#~ "Error: Device '%s' is waiting for slaves before proceeding with "
-#~ "activation."
-#~ msgstr ""
-#~ "Fehler: Gerät »%s« wartet auf »Slaves«, bevor mit der Aktivierung "
-#~ "fortgefahren wird."
-
-#~ msgid ""
-#~ "Error: 'mode': '%s' is not a valid InfiniBand transport mode [datagram, "
-#~ "connected]."
-#~ msgstr ""
-#~ "Fehler: »mode»: »%s« ist kein gültiger InfiniBand-Transportmodus "
-#~ "[datagram, connected]."
diff --git a/po/es.po b/po/es.po
index b001633224..11a4f6b07b 100644
--- a/po/es.po
+++ b/po/es.po
@@ -3,27 +3,26 @@
 # Traducción de NetworkManager al español.
 # Copyright (C) Spanish translation for NetworkManager
 # This file is distributed under the same license as the NetworkManager package.
-#
+# 
 # Antonio Ognio <antonio@linux.org.pe>, 2004.
 # Francisco Javier F. Serrador <serrador@cvs.gnome.org>, 2004, 2005, 2006.
 # Lucas Vieites Fariña <lucas@asixinformatica.com>, 2005, 2006.
 # Gladys Guerrero  <gguerrer@redhat.com>, 2010.
 # Jorge González <jorgegonz@svn.gnome.org>, 2007, 2008, 2010, 2011.
 # Daniel Mustieles <daniel.mustieles@gmail.com>, 2012.
-# Lubomir Rintel <lkundrak@v3.sk>, 2016. #zanata
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-06-22 10:02+0200\n"
-"PO-Revision-Date: 2014-01-29 11:34-0500\n"
-"Last-Translator: gguerrer <gguerrer@redhat.com>\n"
-"Language-Team: Español <gnome-es-list@gnome.org>\n"
-"Language: es\n"
+"POT-Creation-Date: 2016-04-29 14:24+0530\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Zanata 3.8.4\n"
+"PO-Revision-Date: 2016-07-05 08:41+0000\n"
+"Last-Translator: Copied by Zanata <copied-by-zanata@zanata.org>\n"
+"Language-Team: Español <gnome-es-list@gnome.org>\n"
+"Language: es\n"
+"X-Generator: Zanata 3.9.3\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: ../clients/cli/agent.c:39
@@ -36,7 +35,7 @@ msgid ""
 msgstr ""
 "Modo de uso: nmcli agent { COMMAND | help }\n"
 "\n"
-"COMMAND := { secret | polkit | all }\n"
+"COMANDO := { secret | polkit | all }\n"
 "\n"
 
 #: ../clients/cli/agent.c:47
@@ -50,6 +49,13 @@ msgid ""
 "and if a password is required asks the user for it.\n"
 "\n"
 msgstr ""
+"Uso: nmcli agent secret { help }\n"
+"\n"
+"Ejecuta nmcli como el agente secreto de NetworkManager. Cuando "
+"NetworkManager requiere una contraseña, la pide a los agentes registrados. "
+"Este comando mantiene a nmcli en ejecución y si se requiere  la contraseña "
+"se la solicita al usuario.\n"
+"\n"
 
 #: ../clients/cli/agent.c:57
 #, c-format
@@ -62,6 +68,11 @@ msgid ""
 "the response back to polkit.\n"
 "\n"
 msgstr ""
+"Uso: nmcli agent polkit { help }\n"
+"Registra a nmcli como una acción polkit para la sesión de usuario. Cuando un "
+"demonio polkit requiere una autorización, nmcli le pregunta al usuario y le "
+"responde a polkit.\n"
+"\n"
 
 #: ../clients/cli/agent.c:67
 #, c-format
@@ -71,43 +82,48 @@ msgid ""
 "Runs nmcli as both NetworkManager secret and a polkit agent.\n"
 "\n"
 msgstr ""
+"Uso: nmcli agent all { help }\n"
+"Ejecuta nmcli como secreto de NetworkManager y como agente polkit.\n"
+"\n"
 
 #: ../clients/cli/agent.c:149
 #, c-format
 msgid "nmcli successfully registered as a NetworkManager's secret agent.\n"
 msgstr ""
+"nmcli se ha registrado con acierto como un agente secreto de NetworkManager."
+"\n"
 
 #: ../clients/cli/agent.c:151
-#, fuzzy, c-format
+#, c-format
 msgid "Error: secret agent initialization failed"
-msgstr "Falló la inicialización del módem"
+msgstr "Error: No se pudo inicializar el agente secreto"
 
 #: ../clients/cli/agent.c:166
-#, fuzzy, c-format
+#, c-format
 msgid "Error: polkit agent initialization failed: %s"
-msgstr "Error: falló la activación de la conexión: %s"
+msgstr "Error: No se pudo inicializar el agente polkit: %s"
 
 #: ../clients/cli/agent.c:174
 #, c-format
 msgid "nmcli successfully registered as a polkit agent.\n"
-msgstr ""
+msgstr "nmcli se ha registrado con acierto como un agente polkit. \n"
 
-#: ../clients/cli/agent.c:206 ../clients/cli/connections.c:8703
-#: ../clients/cli/devices.c:3727 ../clients/cli/general.c:344
-#: ../clients/cli/general.c:473
+#: ../clients/cli/agent.c:206 ../clients/cli/connections.c:11050
+#: ../clients/cli/devices.c:3669 ../clients/cli/general.c:343
+#: ../clients/cli/general.c:484
 #, c-format
 msgid "Error: NetworkManager is not running."
 msgstr "Error: NetworkManager no se está ejecutando."
 
-#: ../clients/cli/agent.c:239
-#, fuzzy, c-format
+#: ../clients/cli/agent.c:242
+#, c-format
 msgid "Error: 'agent' command '%s' is not valid."
-msgstr "Error: comando 'general' '%s' no es válido."
+msgstr "Error: comando 'agent' '%s' no es válido."
 
 # auto translated by TM merge from project: gnome-search-tool, version: 3.4.0, DocId: gnome-search-tool
 #: ../clients/cli/common.c:38 ../clients/cli/common.c:51
 #: ../clients/cli/common.c:59 ../clients/cli/common.c:71
-#: ../clients/cli/connections.c:237 ../clients/cli/connections.c:259
+#: ../clients/cli/connections.c:192 ../clients/cli/connections.c:214
 msgid "GROUP"
 msgstr "GRUPO"
 
@@ -119,7 +135,7 @@ msgstr "DIRECCIÓN"
 #. 1
 #. 2
 #: ../clients/cli/common.c:40 ../clients/cli/common.c:61
-#: ../clients/cli/connections.c:262
+#: ../clients/cli/connections.c:217
 msgid "GATEWAY"
 msgstr "PUERTA DE ENLACE"
 
@@ -151,14 +167,14 @@ msgid "OPTION"
 msgstr "OPCIÓN"
 
 #: ../clients/cli/common.c:376 ../clients/cli/common.c:436
-#, fuzzy, c-format
+#, c-format
 msgid "invalid prefix '%s'; <1-%d> allowed"
-msgstr "Prefijo inválido '%s'; <1-32> permitido"
+msgstr "Prefijo inválido '%s'; <1-%d> permitido"
 
 #: ../clients/cli/common.c:384
-#, fuzzy, c-format
+#, c-format
 msgid "invalid IP address: %s"
-msgstr "Formato de dirección IPv4 inválido '%s'"
+msgstr "Formato de dirección IP inválido: %s"
 
 #: ../clients/cli/common.c:448
 #, c-format
@@ -166,6 +182,8 @@ msgid ""
 "the second component of route ('%s') is neither a next hop address nor a "
 "metric"
 msgstr ""
+"El segundo componente de ruta ('%s') no es ni una dirección de salto ni una "
+"métrica"
 
 #: ../clients/cli/common.c:457
 #, c-format
@@ -180,6 +198,8 @@ msgstr "Ruta inválida: %s"
 #: ../clients/cli/common.c:477
 msgid "default route cannot be added (NetworkManager handles it by itself)"
 msgstr ""
+"No se puede agregar la ruta predeterminada (NetworkManager se encarga por sí "
+"mismo)"
 
 #: ../clients/cli/common.c:494
 msgid "unmanaged"
@@ -189,7 +209,7 @@ msgstr "sin gestión"
 msgid "unavailable"
 msgstr "no disponible"
 
-#: ../clients/cli/common.c:498 ../clients/cli/general.c:246
+#: ../clients/cli/common.c:498 ../clients/cli/general.c:245
 msgid "disconnected"
 msgstr "desconectado"
 
@@ -217,11 +237,11 @@ msgstr "conectando (comprobando conectividad IP)"
 msgid "connecting (starting secondary connections)"
 msgstr "conectando (iniciando conexiones secundarias)"
 
-#: ../clients/cli/common.c:512 ../clients/cli/general.c:242
+#: ../clients/cli/common.c:512 ../clients/cli/general.c:241
 msgid "connected"
 msgstr "conectado"
 
-#: ../clients/cli/common.c:514 ../clients/cli/connections.c:690
+#: ../clients/cli/common.c:514 ../clients/cli/connections.c:648
 msgid "deactivating"
 msgstr "desactivando"
 
@@ -230,63 +250,62 @@ msgid "connection failed"
 msgstr "conexión falló"
 
 #: ../clients/cli/common.c:518 ../clients/cli/common.c:535
-#: ../clients/cli/connections.c:695 ../clients/cli/connections.c:718
-#: ../clients/cli/connections.c:1995 ../clients/cli/devices.c:1104
-#: ../clients/cli/devices.c:1145 ../clients/cli/devices.c:1147
-#: ../clients/cli/general.c:249 ../clients/cli/general.c:287
-#: ../clients/cli/general.c:422 ../clients/cli/general.c:437
-#: ../clients/cli/settings.c:845 ../clients/cli/settings.c:931
-#: ../clients/cli/settings.c:1315 ../clients/cli/settings.c:1954
-#: ../clients/cli/settings.c:3317
+#: ../clients/cli/connections.c:653 ../clients/cli/connections.c:676
+#: ../clients/cli/connections.c:1949 ../clients/cli/devices.c:1024
+#: ../clients/cli/devices.c:1065 ../clients/cli/devices.c:1067
+#: ../clients/cli/general.c:248 ../clients/cli/general.c:286
+#: ../clients/cli/general.c:432 ../clients/cli/general.c:448
+#: ../clients/cli/settings.c:839 ../clients/cli/settings.c:925
+#: ../clients/cli/settings.c:1265 ../clients/cli/settings.c:1901
+#: ../clients/cli/settings.c:3205 ../clients/cli/utils.c:1400
 #, c-format
 msgid "unknown"
 msgstr "desconocido"
 
 #. "CAPABILITIES"
-#: ../clients/cli/common.c:527 ../clients/cli/connections.c:975
-#: ../clients/cli/connections.c:977 ../clients/cli/connections.c:979
-#: ../clients/cli/connections.c:1013 ../clients/cli/connections.c:1082
-#: ../clients/cli/connections.c:1083 ../clients/cli/connections.c:1085
-#: ../clients/cli/connections.c:3291 ../clients/cli/connections.c:4414
-#: ../clients/cli/connections.c:6229 ../clients/cli/connections.c:6230
-#: ../clients/cli/devices.c:782 ../clients/cli/devices.c:1069
-#: ../clients/cli/devices.c:1070 ../clients/cli/devices.c:1071
-#: ../clients/cli/devices.c:1072 ../clients/cli/devices.c:1073
-#: ../clients/cli/devices.c:1108 ../clients/cli/devices.c:1110
-#: ../clients/cli/devices.c:1138 ../clients/cli/devices.c:1139
-#: ../clients/cli/devices.c:1140 ../clients/cli/devices.c:1141
-#: ../clients/cli/devices.c:1142 ../clients/cli/devices.c:1143
-#: ../clients/cli/devices.c:1144 ../clients/cli/devices.c:1146
-#: ../clients/cli/devices.c:1148 ../clients/cli/general.c:431
-#: ../clients/cli/settings.c:3312
+#: ../clients/cli/common.c:527 ../clients/cli/connections.c:933
+#: ../clients/cli/connections.c:935 ../clients/cli/connections.c:937
+#: ../clients/cli/connections.c:971 ../clients/cli/connections.c:1040
+#: ../clients/cli/connections.c:1041 ../clients/cli/connections.c:1043
+#: ../clients/cli/connections.c:3450 ../clients/cli/connections.c:8563
+#: ../clients/cli/connections.c:8564 ../clients/cli/devices.c:772
+#: ../clients/cli/devices.c:989 ../clients/cli/devices.c:990
+#: ../clients/cli/devices.c:991 ../clients/cli/devices.c:992
+#: ../clients/cli/devices.c:993 ../clients/cli/devices.c:1028
+#: ../clients/cli/devices.c:1030 ../clients/cli/devices.c:1058
+#: ../clients/cli/devices.c:1059 ../clients/cli/devices.c:1060
+#: ../clients/cli/devices.c:1061 ../clients/cli/devices.c:1062
+#: ../clients/cli/devices.c:1063 ../clients/cli/devices.c:1064
+#: ../clients/cli/devices.c:1066 ../clients/cli/devices.c:1068
+#: ../clients/cli/general.c:442 ../clients/cli/settings.c:3200
 msgid "yes"
 msgstr "sí"
 
-#: ../clients/cli/common.c:529 ../clients/cli/connections.c:975
-#: ../clients/cli/connections.c:977 ../clients/cli/connections.c:979
-#: ../clients/cli/connections.c:1082 ../clients/cli/connections.c:1083
-#: ../clients/cli/connections.c:1085 ../clients/cli/connections.c:3292
-#: ../clients/cli/connections.c:4413 ../clients/cli/connections.c:6229
-#: ../clients/cli/connections.c:6230 ../clients/cli/devices.c:782
-#: ../clients/cli/devices.c:1069 ../clients/cli/devices.c:1070
-#: ../clients/cli/devices.c:1071 ../clients/cli/devices.c:1072
-#: ../clients/cli/devices.c:1073 ../clients/cli/devices.c:1108
-#: ../clients/cli/devices.c:1110 ../clients/cli/devices.c:1138
-#: ../clients/cli/devices.c:1139 ../clients/cli/devices.c:1140
-#: ../clients/cli/devices.c:1141 ../clients/cli/devices.c:1142
-#: ../clients/cli/devices.c:1143 ../clients/cli/devices.c:1144
-#: ../clients/cli/devices.c:1146 ../clients/cli/devices.c:1148
-#: ../clients/cli/general.c:433 ../clients/cli/settings.c:3314
+#: ../clients/cli/common.c:529 ../clients/cli/connections.c:933
+#: ../clients/cli/connections.c:935 ../clients/cli/connections.c:937
+#: ../clients/cli/connections.c:1040 ../clients/cli/connections.c:1041
+#: ../clients/cli/connections.c:1043 ../clients/cli/connections.c:3451
+#: ../clients/cli/connections.c:8563 ../clients/cli/connections.c:8564
+#: ../clients/cli/devices.c:772 ../clients/cli/devices.c:989
+#: ../clients/cli/devices.c:990 ../clients/cli/devices.c:991
+#: ../clients/cli/devices.c:992 ../clients/cli/devices.c:993
+#: ../clients/cli/devices.c:1028 ../clients/cli/devices.c:1030
+#: ../clients/cli/devices.c:1058 ../clients/cli/devices.c:1059
+#: ../clients/cli/devices.c:1060 ../clients/cli/devices.c:1061
+#: ../clients/cli/devices.c:1062 ../clients/cli/devices.c:1063
+#: ../clients/cli/devices.c:1064 ../clients/cli/devices.c:1066
+#: ../clients/cli/devices.c:1068 ../clients/cli/general.c:444
+#: ../clients/cli/settings.c:3202
 msgid "no"
 msgstr "no"
 
 #: ../clients/cli/common.c:531
 msgid "yes (guessed)"
-msgstr ""
+msgstr "sí (adivinando)"
 
 #: ../clients/cli/common.c:533
 msgid "no (guessed)"
-msgstr ""
+msgstr "no (adivinando)"
 
 # auto translated by TM merge from project: NetworkManager, version: 0.9.8.2, DocId: NetworkManager
 #: ../clients/cli/common.c:544
@@ -295,7 +314,7 @@ msgstr "No se ha dado ninguna razón"
 
 # auto translated by TM merge from project: evolution-mapi, version: el6, DocId: evolution-mapi
 #. We should not really come here
-#: ../clients/cli/common.c:547 ../clients/cli/connections.c:3140
+#: ../clients/cli/common.c:547 ../clients/cli/connections.c:2976
 #, c-format
 msgid "Unknown error"
 msgstr "Error desconocido"
@@ -356,7 +375,7 @@ msgstr "El suplicante de 802.1X tardó mucho tiempo en autenticarse"
 # auto translated by TM merge from project: control-center, version: 3.8.3, DocId: gnome-control-center-2.0
 #: ../clients/cli/common.c:580
 msgid "PPP service failed to start"
-msgstr "Falló al iniciar el servicio de PPP"
+msgstr "No se pudo iniciar el servicio de PPP"
 
 # auto translated by TM merge from project: control-center, version: 3.8.3, DocId: gnome-control-center-2.0
 #: ../clients/cli/common.c:583
@@ -371,7 +390,7 @@ msgstr "PPP falló"
 # auto translated by TM merge from project: control-center, version: 3.8.3, DocId: gnome-control-center-2.0
 #: ../clients/cli/common.c:589
 msgid "DHCP client failed to start"
-msgstr "Falló al iniciar el cliente de DHCP"
+msgstr "No se pudo iniciar el cliente de DHCP"
 
 # auto translated by TM merge from project: control-center, version: 3.8.3, DocId: gnome-control-center-2.0
 #: ../clients/cli/common.c:592
@@ -386,7 +405,7 @@ msgstr "Falló el cliente de DHCP"
 # auto translated by TM merge from project: control-center, version: 3.8.3, DocId: gnome-control-center-2.0
 #: ../clients/cli/common.c:598
 msgid "Shared connection service failed to start"
-msgstr "Falló al iniciar el servicio de conexión compartida"
+msgstr "No se pudo iniciar el servicio de conexión compartida"
 
 #: ../clients/cli/common.c:601
 msgid "Shared connection service failed"
@@ -394,7 +413,7 @@ msgstr "Falló el servicio de conexión compartida"
 
 #: ../clients/cli/common.c:604
 msgid "AutoIP service failed to start"
-msgstr "Falló al iniciar el servicio de AutoIP"
+msgstr "No se pudo iniciar el servicio de AutoIP"
 
 #: ../clients/cli/common.c:607
 msgid "AutoIP service error"
@@ -430,11 +449,11 @@ msgstr "Falló la inicialización del módem"
 
 #: ../clients/cli/common.c:631
 msgid "Failed to select the specified APN"
-msgstr "Falló al seleccionar el NPA especificado"
+msgstr "No se pudo seleccionar el APN especificado"
 
 #: ../clients/cli/common.c:634
 msgid "Not searching for networks"
-msgstr "No se están buscando redes"
+msgstr "No hay ninguna búsqueda de  redes en curso"
 
 #: ../clients/cli/common.c:637
 msgid "Network registration denied"
@@ -446,7 +465,7 @@ msgstr "Expiró el tiempo de registro de la red"
 
 #: ../clients/cli/common.c:643
 msgid "Failed to register with the requested network"
-msgstr "Falló al registrarse con la red solicitada"
+msgstr "No se pudo registrarse con la red solicitada"
 
 #: ../clients/cli/common.c:646
 msgid "PIN check failed"
@@ -549,38 +568,33 @@ msgstr "Falló el control teamd"
 
 # auto translated by TM merge from project: NetworkManager, version: 0.9.8.2, DocId: NetworkManager
 #: ../clients/cli/common.c:715
-#, fuzzy
 msgid "Modem failed or no longer available"
-msgstr "MódemManager no está disponible"
+msgstr "El módem falló o ya no está disponible"
 
 # auto translated by TM merge from project: NetworkManager, version: 0.9.8.2, DocId: NetworkManager
 #: ../clients/cli/common.c:718
-#, fuzzy
 msgid "Modem now ready and available"
-msgstr "MódemManager no está disponible"
+msgstr "El módem ya está listo y disponible"
 
 #: ../clients/cli/common.c:721
 msgid "SIM PIN was incorrect"
-msgstr ""
+msgstr "El PIN de la SIM es incorrecto"
 
 #: ../clients/cli/common.c:724
-#, fuzzy
 msgid "New connection activation was enqueued"
-msgstr "Error: falló la activación de la conexión."
+msgstr "La nueva activación de la conexión estaba en cola"
 
 #: ../clients/cli/common.c:727
-#, fuzzy
 msgid "The device's parent changed"
-msgstr "El dispositivo fue retirado"
+msgstr "Se cambió el padré del dispositivo"
 
 #: ../clients/cli/common.c:730
-#, fuzzy
 msgid "The device parent's management changed"
-msgstr "El dispositivo fue retirado"
+msgstr "Se cambió la administración del padre del dispositivo"
 
 #. TRANSLATORS: Unknown reason for a device state change (NMDeviceStateReason)
-#: ../clients/cli/common.c:734 ../libnm-glib/nm-device.c:1898
-#: ../libnm/nm-device.c:1849
+#: ../clients/cli/common.c:734 ../libnm-glib/nm-device.c:1888
+#: ../libnm/nm-device.c:1839
 msgid "Unknown"
 msgstr "desconocido"
 
@@ -597,22 +611,23 @@ msgstr "Prioridad '%s' no es válida (<0-%ld>)"
 #: ../clients/cli/common.c:856
 #, c-format
 msgid "'%s' is not a valid team configuration or file name."
-msgstr "'%s' no es una configuración de un equipo o nombre de archivo válidos."
+msgstr ""
+"'%s' no es una configuración de un equipo o nombre de archivo válidos."
 
 #: ../clients/cli/common.c:958
-#, fuzzy, c-format
+#, c-format
 msgid "Error: openconnect failed: %s\n"
-msgstr "Error: falló la verificación de conexión: %s\n"
+msgstr "Error: falló openconnect: %s\n"
 
 #: ../clients/cli/common.c:965
-#, fuzzy, c-format
+#, c-format
 msgid "Error: openconnect failed with status %d\n"
-msgstr "Error: conexión no es válida: %s\n"
+msgstr "Error: falló openconnect con estado: %d\n"
 
 #: ../clients/cli/common.c:967
-#, fuzzy, c-format
+#, c-format
 msgid "Error: openconnect failed with signal %d\n"
-msgstr "Error: conexión no es válida: %s\n"
+msgstr "Error: falló openconnect con señal %d\n"
 
 #: ../clients/cli/common.c:1045
 #, c-format
@@ -620,120 +635,73 @@ msgid ""
 "Warning: password for '%s' not given in 'passwd-file' and nmcli cannot ask "
 "without '--ask' option.\n"
 msgstr ""
+"Advertencia: la contraseña para '%s' no se indica en 'passwd-file' y nmcli "
+"no la puede pedir sin la opción '--ask'.\n"
 
 #. define some prompts for connection editor
-#: ../clients/cli/connections.c:61
+#: ../clients/cli/connections.c:41
 msgid "Setting name? "
 msgstr "¿Establecimiento de permisos?"
 
-#: ../clients/cli/connections.c:62
+#: ../clients/cli/connections.c:42
 msgid "Property name? "
 msgstr "¿Nombre de propiedad? "
 
-#: ../clients/cli/connections.c:63
+#: ../clients/cli/connections.c:43
 msgid "Enter connection type: "
 msgstr "Ingrese el tipo de conexión:"
 
 #. define some other prompts
-#: ../clients/cli/connections.c:66
-#, fuzzy
-msgid "Connection type"
+#: ../clients/cli/connections.c:46
+msgid "Connection type: "
 msgstr "Tipo de conexión:"
 
-#: ../clients/cli/connections.c:67
-#, fuzzy
-msgid "VPN type"
+#: ../clients/cli/connections.c:47
+msgid "VPN type: "
 msgstr "Tipo de VPN:"
 
-#: ../clients/cli/connections.c:68
-#, fuzzy
-msgid "Master"
-msgstr "Maestro de vínculo: "
-
-#: ../clients/cli/connections.c:70 ../clients/tui/nmt-page-infiniband.c:88
-msgid "Transport mode"
-msgstr "Modo de transporte"
-
-#: ../clients/cli/connections.c:75
-#, fuzzy
-msgid "Bluetooth type"
-msgstr "Bluetooth"
-
-#: ../clients/cli/connections.c:81
-#, fuzzy
-msgid "Bonding mode"
-msgstr "Enlace de monitorización"
-
-#: ../clients/cli/connections.c:83 ../clients/cli/connections.c:4014
-#, fuzzy
-msgid "Bonding monitoring mode"
-msgstr "Enlace de monitorización"
-
-#: ../clients/cli/connections.c:88
-msgid "Protocol"
-msgstr ""
-
-# auto translated by TM merge from project: control-center, version: 3.8.3, DocId: gnome-control-center-2.0
-#: ../clients/cli/connections.c:91
-#, fuzzy
-msgid "Wi-Fi mode"
-msgstr "Inalámbrica"
-
-#: ../clients/cli/connections.c:97
-#, fuzzy
-msgid "ADSL encapsulation"
-msgstr "Autenticación DSL"
+#: ../clients/cli/connections.c:48
+msgid "Master: "
+msgstr "Maestro: "
 
-#: ../clients/cli/connections.c:100
-#, fuzzy
-msgid "Tun mode"
-msgstr "Modo de transporte"
+#: ../clients/cli/connections.c:49
+msgid "Connection (name, UUID, or path): "
+msgstr "Conexión (nombre, UUID, o ruta): "
 
-#: ../clients/cli/connections.c:105
-#, fuzzy
-msgid "IP Tunnel mode"
-msgstr "Editar conexión"
+#: ../clients/cli/connections.c:50
+msgid "VPN connection (name, UUID, or path): "
+msgstr "Conexión VPN (nombre, UUID, o ruta): "
 
-#: ../clients/cli/connections.c:107
-#, fuzzy
-msgid "MACVLAN mode"
-msgstr "VLAN"
+#: ../clients/cli/connections.c:51
+msgid "Connection(s) (name, UUID, or path): "
+msgstr "Conexión(es) (nombre, UUID, o ruta): "
 
-#: ../clients/cli/connections.c:109
-#, fuzzy
-msgid "Connection (name, UUID, or path)"
-msgstr "Conexión (nombre, UUID, o ruta): "
+#: ../clients/cli/connections.c:52
+msgid "Connection(s) (name, UUID, path or apath): "
+msgstr "Conexión(es) (nombre, UUID, o ruta): "
 
-#: ../clients/cli/connections.c:110
-#, fuzzy
-msgid "VPN connection (name, UUID, or path)"
-msgstr "Conexión (nombre, UUID, o ruta): "
-
-#: ../clients/cli/connections.c:111
-#, fuzzy
-msgid "Connection(s) (name, UUID, or path)"
-msgstr "Conexión (nombre, UUID, o ruta): "
+#: ../clients/cli/connections.c:53
+msgid "Tunnel mode: "
+msgstr "Modo de túnel:"
 
-#: ../clients/cli/connections.c:112
-#, fuzzy
-msgid "Connection(s) (name, UUID, path or apath)"
-msgstr "Conexión (nombre, UUID, o ruta): "
+#: ../clients/cli/connections.c:54
+msgid "MACVLAN mode: "
+msgstr "Modo MACVLAN:"
 
 #. 0
-#: ../clients/cli/connections.c:118 ../clients/cli/connections.c:238
+#: ../clients/cli/connections.c:73 ../clients/cli/connections.c:193
 #: ../clients/cli/devices.c:55 ../clients/cli/devices.c:89
 #: ../clients/cli/devices.c:99 ../clients/cli/devices.c:110
 #: ../clients/cli/devices.c:120 ../clients/cli/devices.c:137
 #: ../clients/cli/devices.c:150 ../clients/cli/devices.c:176
 #: ../clients/cli/devices.c:191 ../clients/cli/devices.c:200
-#: ../clients/cli/devices.c:210 ../clients/cli/devices.c:220
-#: ../clients/cli/devices.c:261
+#: ../clients/cli/devices.c:210 ../clients/cli/devices.c:251
 msgid "NAME"
 msgstr "NOMBRE"
 
 #. 0
 #. 1
-#: ../clients/cli/connections.c:119 ../clients/cli/connections.c:239
+#: ../clients/cli/connections.c:74 ../clients/cli/connections.c:194
 msgid "UUID"
 msgstr "UUID"
 
@@ -741,36 +709,35 @@ msgstr "UUID"
 #. 0
 #. 1
 #. 2
-#: ../clients/cli/connections.c:120 ../clients/cli/connections.c:260
+#: ../clients/cli/connections.c:75 ../clients/cli/connections.c:215
 #: ../clients/cli/devices.c:41 ../clients/cli/devices.c:57
 #: ../clients/cli/devices.c:179
 msgid "TYPE"
 msgstr "TIPO"
 
 #. 2
-#: ../clients/cli/connections.c:121
+#: ../clients/cli/connections.c:76
 msgid "TIMESTAMP"
 msgstr "MARCA DE TIEMPO"
 
 #. 3
-#: ../clients/cli/connections.c:122
+#: ../clients/cli/connections.c:77
 msgid "TIMESTAMP-REAL"
 msgstr "MARCA DE TIEMPO-REAL"
 
 #. 4
 #. 16
-#: ../clients/cli/connections.c:123 ../clients/cli/devices.c:72
+#: ../clients/cli/connections.c:78 ../clients/cli/devices.c:72
 msgid "AUTOCONNECT"
 msgstr "AUTOCONECTAR"
 
 #. 5
-#: ../clients/cli/connections.c:124
-#, fuzzy
+#: ../clients/cli/connections.c:79
 msgid "AUTOCONNECT-PRIORITY"
-msgstr "AUTOCONECTAR"
+msgstr "AUTOCONNECT-PRIORITY"
 
 #. 6
-#: ../clients/cli/connections.c:125
+#: ../clients/cli/connections.c:80
 msgid "READONLY"
 msgstr "SÓLOLECTURA"
 
@@ -779,7 +746,7 @@ msgstr "SÓLOLECTURA"
 #. 2
 #. 15
 #. 5
-#: ../clients/cli/connections.c:126 ../clients/cli/connections.c:246
+#: ../clients/cli/connections.c:81 ../clients/cli/connections.c:201
 #: ../clients/cli/devices.c:43 ../clients/cli/devices.c:166
 #: ../clients/cli/devices.c:182
 msgid "DBUS-PATH"
@@ -788,7 +755,7 @@ msgstr "RUTA-DBUS"
 #. 8
 #. 13
 #. 4
-#: ../clients/cli/connections.c:127 ../clients/cli/devices.c:164
+#: ../clients/cli/connections.c:82 ../clients/cli/devices.c:164
 #: ../clients/cli/devices.c:181
 msgid "ACTIVE"
 msgstr "ACTIVO"
@@ -798,9 +765,9 @@ msgstr "ACTIVO"
 #. 12
 #. 3
 #. 0
-#: ../clients/cli/connections.c:128 ../clients/cli/devices.c:40
+#: ../clients/cli/connections.c:83 ../clients/cli/devices.c:40
 #: ../clients/cli/devices.c:56 ../clients/cli/devices.c:163
-#: ../clients/cli/devices.c:180 ../clients/cli/devices.c:262
+#: ../clients/cli/devices.c:180 ../clients/cli/devices.c:252
 msgid "DEVICE"
 msgstr "DISPOSITIVO"
 
@@ -809,44 +776,44 @@ msgstr "DISPOSITIVO"
 #. 1
 #. 10
 #. 1
-#: ../clients/cli/connections.c:129 ../clients/cli/connections.c:241
+#: ../clients/cli/connections.c:84 ../clients/cli/connections.c:196
 #: ../clients/cli/devices.c:42 ../clients/cli/devices.c:66
-#: ../clients/cli/general.c:37
+#: ../clients/cli/general.c:36
 msgid "STATE"
 msgstr "ESTADO"
 
 # auto translated by TM merge from project: NetworkManager, version: 0.9.8.2, DocId: NetworkManager
 #. 11
-#: ../clients/cli/connections.c:130
-#, fuzzy
+#: ../clients/cli/connections.c:85
 msgid "ACTIVE-PATH"
-msgstr "MASTER-RUTA"
+msgstr "ACTIVE-PATH"
 
 #. 2
-#: ../clients/cli/connections.c:240
+#: ../clients/cli/connections.c:195
 msgid "DEVICES"
 msgstr "DISPOSITIVOS"
 
 #. 4
-#: ../clients/cli/connections.c:242
+#: ../clients/cli/connections.c:197
 msgid "DEFAULT"
 msgstr "PREDETERMINADO"
 
 # auto translated by TM merge from project: NetworkManager, version: 0.9.8.2, DocId: NetworkManager
 #. 5
-#: ../clients/cli/connections.c:243
+#: ../clients/cli/connections.c:198
 msgid "DEFAULT6"
 msgstr "PREDETERMINADO6"
 
 #. 6
-#: ../clients/cli/connections.c:244
+#: ../clients/cli/connections.c:199
 msgid "SPEC-OBJECT"
 msgstr "OBJETO SPEC"
 
 #. 7
 #. 4
-#: ../clients/cli/connections.c:245 ../clients/cli/connections.c:283
-#: ../clients/tui/nm-editor-utils.c:233
+#. Ask for optional 'vpn' arguments.
+#: ../clients/cli/connections.c:200 ../clients/cli/connections.c:238
+#: ../clients/cli/connections.c:4169 ../clients/tui/nm-editor-utils.c:233
 #: ../clients/tui/nmt-connect-connection-list.c:405
 msgid "VPN"
 msgstr "VPN"
@@ -855,78 +822,78 @@ msgstr "VPN"
 #. 9
 #. 5
 #. 22
-#: ../clients/cli/connections.c:247 ../clients/cli/devices.c:46
+#: ../clients/cli/connections.c:202 ../clients/cli/devices.c:46
 #: ../clients/cli/devices.c:78
 msgid "CON-PATH"
 msgstr "CON-RUTA"
 
 # auto translated by TM merge from project: NetworkManager, version: 0.9.8.2, DocId: NetworkManager
 #. 10
-#: ../clients/cli/connections.c:248
+#: ../clients/cli/connections.c:203
 msgid "ZONE"
 msgstr "ZONA"
 
 # auto translated by TM merge from project: NetworkManager, version: 0.9.8.2, DocId: NetworkManager
 #. 11
-#: ../clients/cli/connections.c:249
+#: ../clients/cli/connections.c:204
 msgid "MASTER-PATH"
 msgstr "MASTER-RUTA"
 
 #. 1
-#: ../clients/cli/connections.c:261
+#: ../clients/cli/connections.c:216
 msgid "USERNAME"
 msgstr "Nombre de usuario"
 
 # auto translated by TM merge from project: NetworkManager, version: 0.9.8.2, DocId: NetworkManager
 #. 3
-#: ../clients/cli/connections.c:263
+#: ../clients/cli/connections.c:218
 msgid "BANNER"
 msgstr "INDICADOR"
 
 # auto translated by TM merge from project: NetworkManager, version: 0.9.8.2, DocId: NetworkManager
 #. 4
-#: ../clients/cli/connections.c:264
+#: ../clients/cli/connections.c:219
 msgid "VPN-STATE"
 msgstr "ESTADO-VPN"
 
 # auto translated by TM merge from project: NetworkManager, version: 0.9.8.2, DocId: NetworkManager
 #. 5
-#: ../clients/cli/connections.c:265
+#: ../clients/cli/connections.c:220
 msgid "CFG"
 msgstr "CFG"
 
-#: ../clients/cli/connections.c:278 ../clients/cli/devices.c:235
+#: ../clients/cli/connections.c:233 ../clients/cli/devices.c:225
 msgid "GENERAL"
 msgstr "GENERAL"
 
 # auto translated by TM merge from project: NetworkManager, version: 0.9.8.2, DocId: NetworkManager
 #. 0
 #. 6
-#: ../clients/cli/connections.c:279 ../clients/cli/devices.c:242
+#: ../clients/cli/connections.c:234 ../clients/cli/devices.c:232
 msgid "IP4"
 msgstr "IP4"
 
 # auto translated by TM merge from project: NetworkManager, version: 0.9.8.2, DocId: NetworkManager
 #. 1
 #. 7
-#: ../clients/cli/connections.c:280 ../clients/cli/devices.c:243
+#: ../clients/cli/connections.c:235 ../clients/cli/devices.c:233
 msgid "DHCP4"
 msgstr "DHCP4"
 
 #. 2
 #. 8
-#: ../clients/cli/connections.c:281 ../clients/cli/devices.c:244
+#: ../clients/cli/connections.c:236 ../clients/cli/devices.c:234
 msgid "IP6"
 msgstr "IP6"
 
 #. 3
 #. 9
-#: ../clients/cli/connections.c:282 ../clients/cli/devices.c:245
+#: ../clients/cli/connections.c:237 ../clients/cli/devices.c:235
 msgid "DHCP6"
 msgstr "DHCP6"
 
-#: ../clients/cli/connections.c:314
-#, fuzzy, c-format
+#: ../clients/cli/connections.c:272
+#, c-format
 msgid ""
 "Usage: nmcli connection { COMMAND | help }\n"
 "\n"
@@ -941,8 +908,8 @@ msgid ""
 "\n"
 "  down [id | uuid | path | apath] <ID> ...\n"
 "\n"
-"  add COMMON_OPTIONS TYPE_SPECIFIC_OPTIONS SLAVE_OPTIONS IP_OPTIONS [-- "
-"([+|-]<setting>.<property> <value>)+]\n"
+"  add COMMON_OPTIONS TYPE_SPECIFIC_OPTIONS SLAVE_OPTIONS IP_OPTIONS [-- ([+|-"
+"]<setting>.<property> <value>)+]\n"
 "\n"
 "  modify [--temporary] [id | uuid | path] <ID> ([+|-]<setting>.<property> "
 "<value>)+\n"
@@ -967,33 +934,42 @@ msgid ""
 msgstr ""
 "Uso: nmcli connection { COMMAND | help }\n"
 "\n"
-"COMANDO := { show | up | down | add | modify | edit | delete | reload | "
-"load }\n"
+"COMANDO := { show | up | down | add | modify | edit | delete | monitor | "
+"reload | load }\n"
 "\n"
-"  show configured [[id | uuid | path] <ID>]\n"
-"  show active     [[id | uuid | path | apath] <ID>]\n"
+"  show [--active] [--order <order spec>]\n"
+"  show [--active] [id | uuid | path | apath] <ID> ...\n"
 "\n"
-"  up [[id | uuid | path] <ID>] [ifname <ifname>] [ap <BSSID>] [nsp <name>]\n"
+"  up [[id | uuid | path] <ID>] [ifname <ifname>] [ap <BSSID>] [passwd-file "
+"<file with passwords>]\n"
 "\n"
-"  up [[id | uuid | path] <ID>] [ifname <ifname>] [ap <BSSID>]\n"
+"  down [id | uuid | path | apath] <ID> ...\n"
 "\n"
-"  down [id | uuid | path | apath] <ID>\n"
+"  add COMMON_OPTIONS TYPE_SPECIFIC_OPTIONS SLAVE_OPTIONS IP_OPTIONS [-- ([+|-"
+"]<setting>.<property> <value>)+]\n"
 "\n"
-"  add COMMON_OPTIONS TYPE_SPECIFIC_OPTIONS IP_OPTIONS\n"
+"  modify [--temporary] [id | uuid | path] <ID> ([+|-]<setting>.<property> "
+"<value>)+\n"
 "\n"
-"  modify [id | uuid | path] <ID> <setting>.<property> <value>\n"
+"  clone [--temporary] [id | uuid | path ] <ID> <new name>\n"
 "\n"
 "  edit [id | uuid | path] <ID>\n"
 "  edit [type <new_con_type>] [con-name <new_con_name>]\n"
 "\n"
 "  delete [id | uuid | path] <ID>\n"
 "\n"
+"  monitor [id | uuid | path] <ID> ...\n"
+"\n"
 "  reload\n"
 "\n"
 "  load <filename> [ <filename>... ]\n"
 "\n"
+"  import [--temporary] type <type> file <file to import>\n"
+"\n"
+"  export [id | uuid | path] <ID> [<output file>]\n"
+"\n"
 
-#: ../clients/cli/connections.c:336
+#: ../clients/cli/connections.c:294
 #, c-format
 msgid ""
 "Usage: nmcli connection show { ARGUMENTS | help }\n"
@@ -1019,9 +995,29 @@ msgid ""
 "account. Use global --show-secrets option to reveal associated secrets as "
 "well.\n"
 msgstr ""
+"Uso: nmcli connection show { ARGUMENTS | help }\n"
+"\n"
+"ARGUMENTOS := [--active] [--order <order spec>]\n"
+"\n"
+"Lista los perfiles de conexión in-memory y on-disk, algunos de los cuales "
+"pueden estar activos si un dispositivo está utilizando ese perfil de "
+"conexión. Sin un parámetro, todos los perfiles se listarán. Cuando se "
+"especifique la opción --active, únicamente se muestran los perfiles activos. "
+"--order permite la orden de conexión personalizada (vea la página de manual)."
+"\n"
+"\n"
+"ARGUMENTOS := [--active] [id | uuid | path | apath] <ID> ...\n"
+"\n"
+"Muestra información para conexiones especificas. Tanto los datos de conexión "
+"de configuración estática como de conexión activa se muestran de forma "
+"predeterminada. Es posible filtrar la salida mediante la opción '--fields'. "
+"Consulte la página de manual para obtener más información.\n"
+"Cuando la opción --active es especificada, únicamente los perfiles activos "
+"se tienen en cuenta. Use la opción global --show-secrets para revelar "
+"también los secretos asociados.\n"
 
-#: ../clients/cli/connections.c:357
-#, fuzzy, c-format
+#: ../clients/cli/connections.c:315
+#, c-format
 msgid ""
 "Usage: nmcli connection up { ARGUMENTS | help }\n"
 "\n"
@@ -1047,25 +1043,26 @@ msgstr ""
 "Uso: nmcli connection up { ARGUMENTS | help }\n"
 "\n"
 "ARGUMENTOS := [id | uuid | path] <ID> [ifname <ifname>] [ap <BSSID>] [nsp "
-"<name>]\n"
+"<name>] [passwd-file <file with passwords>]\n"
 "\n"
-"Activar una conexión en un dispositivo. El perfil para activar es "
-"identificado por su \n"
+"Activar una conexión en un dispositivo. El perfil a activar es identificado "
+"por su \n"
 "nombre, UUID o ruta D-Bus.\n"
 "\n"
-"ARGUMENTOS := ifname <ifname> [ap <BSSID>] [nsp <name>]\n"
+"ARGUMENTOS := ifname <ifname> [ap <BSSID>] [nsp <name>] [passwd-file <file "
+"with passwords>]\n"
 "\n"
-"Activar un dispositivo con una conexión. El perfil de conexión es "
-"seleccionado de forma automática por NetworkManager\n"
-" \n"
+"Activar un dispositivo con una conexión. El perfil de la conexión es "
+"seleccionada automáticamente por NetworkManager.\n"
 "\n"
-"ifname - especifica el dispositivo para activar la conexión\n"
-"ap     - especifica AP para conectarse a (únicamente válido para Wi-Fi)\n"
-"nsp    - especifica NSP para conectarse a (únicamente válido para WiMAX)\n"
+"ifname      - especifica el dispositivo para activar la conexión\n"
+"ap          - especifica  AP para conectarse (únicamente válida parar Wi-Fi)\n"
+"nsp         - especifica NSP para conectarse (únicamente válida para WiMAX)\n"
+"passwd-file - archivo con contraseña(s) se requiere para activar la conexión\n"
 "\n"
 
-#: ../clients/cli/connections.c:378
-#, fuzzy, c-format
+#: ../clients/cli/connections.c:336
+#, c-format
 msgid ""
 "Usage: nmcli connection down { ARGUMENTS | help }\n"
 "\n"
@@ -1087,13 +1084,13 @@ msgstr ""
 "UUID o ruta D-Bus.\n"
 "\n"
 
-#: ../clients/cli/connections.c:390
-#, fuzzy, c-format
+#: ../clients/cli/connections.c:348
+#, 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"
+"ARGUMENTS := COMMON_OPTIONS TYPE_SPECIFIC_OPTIONS SLAVE_OPTIONS IP_OPTIONS [-"
+"- ([+|-]<setting>.<property> <value>)+]\n"
 "\n"
 "  COMMON_OPTIONS:\n"
 "                  type <type>\n"
@@ -1180,8 +1177,8 @@ msgid ""
 "                  [path-cost <1-65535>]\n"
 "                  [hairpin yes|no]\n"
 "\n"
-"    vpn:          vpn-type vpnc|openvpn|pptp|openconnect|openswan|libreswan|"
-"ssh|l2tp|iodine|...\n"
+"    vpn:          vpn-type "
+"vpnc|openvpn|pptp|openconnect|openswan|libreswan|ssh|l2tp|iodine|...\n"
 "                  [user <username>]\n"
 "\n"
 "    olpc-mesh:    ssid <SSID>\n"
@@ -1231,15 +1228,19 @@ msgid ""
 msgstr ""
 "Uso: nmcli connection add { ARGUMENTS | help }\n"
 "\n"
-"ARGUMENTOS := COMMON_OPTIONS TYPE_SPECIFIC_OPTIONS IP_OPTIONS\n"
+"ARGUMENTOS := COMMON_OPTIONS TYPE_SPECIFIC_OPTIONS SLAVE_OPTIONS IP_OPTIONS "
+"[-- ([+|-]<setting>.<property> <value>)+]\n"
 "\n"
-"  OPCIONES COMUNES:\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"
-"  OPCIONES DE TIPO ESPECÍFICAS:\n"
+"  TYPE_SPECIFIC_OPTIONS:\n"
 "    ethernet:     [mac <MAC address>]\n"
 "                  [cloned-mac <cloned MAC address>]\n"
 "                  [mtu <MTU>]\n"
@@ -1248,6 +1249,7 @@ msgstr ""
 "                  [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"
@@ -1274,7 +1276,7 @@ msgstr ""
 "    bluetooth:    [addr <bluetooth address>]\n"
 "                  [bt-type panu|dun-gsm|dun-cdma]\n"
 "\n"
-"    vlan:         dev <parent device (connection  UUID, ifname, or MAC)>\n"
+"    vlan:         dev <parent device (connection UUID, ifname, or MAC)>\n"
 "                  id <VLAN ID>\n"
 "                  [flags <VLAN flags>]\n"
 "                  [ingress <ingress priority mapping>]\n"
@@ -1291,12 +1293,13 @@ msgstr ""
 "                  [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)>\n"
+"    bond-slave:   master <master (ifname, or connection UUID or name)>\n"
 "\n"
 "    team:         [config <file>|<raw JSON data>]\n"
 "\n"
-"    team-slave:   master <master (ifname or connection UUID)>\n"
+"    team-slave:   master <master (ifname, or connection UUID or name)>\n"
 "                  [config <file>|<raw JSON data>]\n"
 "\n"
 "    bridge:       [stp yes|no]\n"
@@ -1305,25 +1308,64 @@ msgstr ""
 "                  [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)>\n"
+"    bridge-slave: master <master (ifname, or connection UUID or name)>\n"
 "                  [priority <0-63>]\n"
 "                  [path-cost <1-65535>]\n"
 "                  [hairpin yes|no]\n"
 "\n"
-"    vpn:          vpn-type vpnc|openvpn|pptp|openconnect|openswan\n"
+"    vpn:          vpn-type "
+"vpnc|openvpn|pptp|openconnect|openswan|libreswan|ssh|l2tp|iodine|...\n"
 "                  [user <username>]\n"
 "\n"
 "    olpc-mesh:    ssid <SSID>\n"
 "                  [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"
+"    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"
+"  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:502
+#: ../clients/cli/connections.c:460
 #, c-format
 msgid ""
 "Usage: nmcli connection modify { ARGUMENTS | help }\n"
@@ -1338,8 +1380,8 @@ msgid ""
 "\n"
 "Examples:\n"
 "nmcli con mod home-wifi wifi.ssid rakosnicek\n"
-"nmcli con mod em1-1 ipv4.method manual ipv4.addr \"192.168.1.2/24, "
-"10.10.1.5/8\"\n"
+"nmcli con mod em1-1 ipv4.method manual ipv4.addr \"192.168.1.2/24, 10.10.1.5/"
+"8\"\n"
 "nmcli con mod em1-1 +ipv4.dns 8.8.4.4\n"
 "nmcli con mod em1-1 -ipv4.dns 1\n"
 "nmcli con mod em1-1 -ipv6.addr \"abbe::cafe/56\"\n"
@@ -1347,8 +1389,31 @@ msgid ""
 "nmcli con mod bond0 -bond.options downdelay\n"
 "\n"
 msgstr ""
+"Uso: nmcli connection modify { ARGUMENTS | help }\n"
+"\n"
+"ARGUMENTOS := [id | uuid | path] <ID> ([+|-]<setting>.<property> <value>)+\n"
+"\n"
+"Modifique una o más propiedades del perfil de conexiones.\n"
+"El perfil es identificado por el nombre, UUID o ruta D-Bus. Para propiedades "
+"con múltiples valores puede utilizar el prefijo opcional '+' o '-' al nombre "
+"de propiedad.\n"
+"El signo '+' le permite agregar ítemes en lugar de sobrescribir el valor "
+"total.\n"
+"El signo '-' le permite retirar los ítemes seleccionados en lugar del valor "
+"total.\n"
+"\n"
+"Ejemplos:\n"
+"nmcli con mod home-wifi wifi.ssid rakosnicek\n"
+"nmcli con mod em1-1 ipv4.method manual ipv4.addr \"192.168.1.2/24, 10.10.1.5/"
+"8\"\n"
+"nmcli con mod em1-1 +ipv4.dns 8.8.4.4\n"
+"nmcli con mod em1-1 -ipv4.dns 1\n"
+"nmcli con mod em1-1 -ipv6.addr \"abbe::cafe/56\"\n"
+"nmcli con mod bond0 +bond.options mii=500\n"
+"nmcli con mod bond0 -bond.options downdelay\n"
+"\n"
 
-#: ../clients/cli/connections.c:525
+#: ../clients/cli/connections.c:483
 #, c-format
 msgid ""
 "Usage: nmcli connection clone { ARGUMENTS | help }\n"
@@ -1356,13 +1421,20 @@ msgid ""
 "ARGUMENTS := [--temporary] [id | uuid | path] <ID> <new name>\n"
 "\n"
 "Clone an existing connection profile. The newly created connection will be\n"
-"the exact copy of the <ID>, except the uuid property (will be generated) "
-"and\n"
+"the exact copy of the <ID>, except the uuid property (will be generated) and\n"
 "id (provided as <new name> argument).\n"
 "\n"
 msgstr ""
+"Uso: nmcli connection clone { ARGUMENTS | help }\n"
+"\n"
+"ARGUMENTOS := [--temporary] [id | uuid | path] <ID> <new name>\n"
+"\n"
+"Clone un perfil de conexión existente. La conexión recién creada será \n"
+"la copia exacta de <ID>, excepto la propiedad de uuid (será generada) y el "
+"ID (provisto como argumento <new name>).\n"
+"\n"
 
-#: ../clients/cli/connections.c:537
+#: ../clients/cli/connections.c:495
 #, c-format
 msgid ""
 "Usage: nmcli connection edit { ARGUMENTS | help }\n"
@@ -1389,7 +1461,7 @@ msgstr ""
 "Añadir un nuevo perfil de conexión en un editor interactivo.\n"
 "\n"
 
-#: ../clients/cli/connections.c:552
+#: ../clients/cli/connections.c:510
 #, c-format
 msgid ""
 "Usage: nmcli connection delete { ARGUMENTS | help }\n"
@@ -1408,8 +1480,8 @@ msgstr ""
 "El perfil es identificado por su nombre, UUID o ruta  D-Bus.\n"
 "\n"
 
-#: ../clients/cli/connections.c:563
-#, fuzzy, c-format
+#: ../clients/cli/connections.c:521
+#, c-format
 msgid ""
 "Usage: nmcli connection monitor { ARGUMENTS | help }\n"
 "\n"
@@ -1420,19 +1492,17 @@ msgid ""
 "Monitors all connection profiles in case none is specified.\n"
 "\n"
 msgstr ""
-"Uso: nmcli connection edit { ARGUMENTS | help }\n"
+"Uso: nmcli connection monitor { ARGUMENTS | help }\n"
 "\n"
-"ARGUMENTOS := [id | uuid | path] <ID>\n"
+"ARGUMENTOS := [id | uuid | path] <ID> ...\n"
 "\n"
-"Modificar un perfil de conexión existente en un editor interactivo.\n"
-"El perfil es identificado por su nombre, UUID o ruta D-Bus\n"
-"\n"
-"ARGUMENTOS := [type <new connection type>] [con-name <new connection name>]\n"
-"\n"
-"Añadir un nuevo perfil de conexión en un editor interactivo.\n"
+"Monitorizar la actividad del perfil de conexiones.\n"
+"Este comando imprime una línea cada vez que cambia la conexión especificada.\n"
+"Monitoriza todos los perfiles de conexiones en caso de que no se especifique "
+"ninguno.\n"
 "\n"
 
-#: ../clients/cli/connections.c:575
+#: ../clients/cli/connections.c:533
 #, c-format
 msgid ""
 "Usage: nmcli connection reload { help }\n"
@@ -1445,7 +1515,7 @@ msgstr ""
 "Recargar todos los archivos de conexión desde el disco.\n"
 "\n"
 
-#: ../clients/cli/connections.c:583
+#: ../clients/cli/connections.c:541
 #, c-format
 msgid ""
 "Usage: nmcli connection load { ARGUMENTS | help }\n"
@@ -1462,14 +1532,13 @@ msgstr ""
 "\n"
 "ARGUMENTOS := <filename> [<filename>...]\n"
 "\n"
-"Cargar o Recargar uno o más archivos de conexión del disco. Uselo después de "
+"Cargar o Recargar uno o más archivos de conexión del disco. Úselo después de "
 "modificar de forma manual \n"
 "un archivo de conexión para garantizar que NetworkManager está al tanto del "
-"último\n"
-"estado.\n"
+"estado más reciente.\n"
 "\n"
 
-#: ../clients/cli/connections.c:595
+#: ../clients/cli/connections.c:553
 #, c-format
 msgid ""
 "Usage: nmcli connection import { ARGUMENTS | help }\n"
@@ -1483,9 +1552,19 @@ msgid ""
 "is imported by NetworkManager VPN plugins.\n"
 "\n"
 msgstr ""
+"Uso: nmcli connection import { ARGUMENTS | help }\n"
+"\n"
+"ARGUMENTOS := [--temporary] type <type> file <file to import>\n"
+"\n"
+"Importa una configuración externa o foránea como el perfil de conexiones "
+"NetworkManager.\n"
+"El tipo de la salida es especificada por la opción type.\n"
+"Únicamente las configuraciones VPN son compatibles en este momento. La "
+"configuración es importada por los complementos VPN de NetworkManager.\n"
+"\n"
 
-#: ../clients/cli/connections.c:608
-#, fuzzy, c-format
+#: ../clients/cli/connections.c:566
+#, c-format
 msgid ""
 "Usage: nmcli connection export { ARGUMENTS | help }\n"
 "\n"
@@ -1495,904 +1574,1317 @@ msgid ""
 "The data are directed to standard output or to a file if a name is given.\n"
 "\n"
 msgstr ""
-"Uso: nmcli connection delete { ARGUMENTS | help }\n"
+"Uso: nmcli connection export { ARGUMENTS | help }\n"
 "\n"
-"ARGUMENTOS := [id | uuid | path] <ID>\n"
+"ARGUMENTOS := [id | uuid | path] <ID> [<output file>]\n"
 "\n"
-"Borrar un perfil de conexión.\n"
-"El perfil es identificado por su nombre, UUID o ruta  D-Bus.\n"
+"Exporta una conexión. Únicamente las conexiones VPN reciben soporte en el "
+"momento.\n"
+"Los datos se dirigen a la salida estándar o a un archivo si se da un nombre.\n"
 "\n"
 
-#: ../clients/cli/connections.c:686
+#: ../clients/cli/connections.c:644
 msgid "activating"
 msgstr "activando"
 
-#: ../clients/cli/connections.c:688
+#: ../clients/cli/connections.c:646
 msgid "activated"
 msgstr "activada"
 
 # auto translated by TM merge from project: firewalld, version: 0.3.4, DocId: firewalld
-#: ../clients/cli/connections.c:692
+#: ../clients/cli/connections.c:650
 msgid "deactivated"
 msgstr "desactivado"
 
-#: ../clients/cli/connections.c:704
+#: ../clients/cli/connections.c:662
 msgid "VPN connecting (prepare)"
 msgstr "Conectando VPN (preparar)"
 
-#: ../clients/cli/connections.c:706
+#: ../clients/cli/connections.c:664
 msgid "VPN connecting (need authentication)"
 msgstr "Conectando VPN (necesita autenticación)"
 
-#: ../clients/cli/connections.c:708
+#: ../clients/cli/connections.c:666
 msgid "VPN connecting"
 msgstr "Conectando VPN"
 
-#: ../clients/cli/connections.c:710
+#: ../clients/cli/connections.c:668
 msgid "VPN connecting (getting IP configuration)"
 msgstr "Conectando VPN (obteniendo configuración IP)"
 
-#: ../clients/cli/connections.c:712
+#: ../clients/cli/connections.c:670
 msgid "VPN connected"
 msgstr "VPN conectada"
 
-#: ../clients/cli/connections.c:714
+#: ../clients/cli/connections.c:672
 msgid "VPN connection failed"
 msgstr "Falló la conexión VPN"
 
-#: ../clients/cli/connections.c:716
+#: ../clients/cli/connections.c:674
 msgid "VPN disconnected"
 msgstr "VPN desconectada"
 
-#: ../clients/cli/connections.c:786
-#, fuzzy, c-format
+#: ../clients/cli/connections.c:744
+#, c-format
 msgid "Error updating secrets for %s: %s\n"
-msgstr "Error al guardar conexión: %s"
+msgstr "Error al actualizar secretos para %s: %s \n"
 
-#: ../clients/cli/connections.c:806
-#, fuzzy
+#: ../clients/cli/connections.c:764
 msgid "Connection profile details"
-msgstr "Detalles de conexiones"
+msgstr "Detalles de perfil de conexiones"
 
-#: ../clients/cli/connections.c:818 ../clients/cli/connections.c:1211
-#, fuzzy, c-format
+#: ../clients/cli/connections.c:776 ../clients/cli/connections.c:1169
+#, c-format
 msgid "Error: 'connection show': %s"
-msgstr "Error: 'device show': %s"
+msgstr "Error: 'connection show': %s"
 
-#: ../clients/cli/connections.c:974 ../clients/cli/settings.c:1950
+#: ../clients/cli/connections.c:932 ../clients/cli/settings.c:1897
 msgid "never"
 msgstr "nunca"
 
 # auto translated by TM merge from project: NetworkManager, version: 0.9.8.2, DocId: NetworkManager
-#: ../clients/cli/connections.c:1199
-#, fuzzy
+#: ../clients/cli/connections.c:1157
 msgid "Activate connection details"
 msgstr "Activar detalles de la conexión"
 
-#: ../clients/cli/connections.c:1435
-#, fuzzy, c-format
+#: ../clients/cli/connections.c:1393
+#, c-format
 msgid "invalid field '%s'; allowed fields: %s and %s, or %s,%s"
-msgstr "Campo inválido '%s'; campos permitidos: %s"
+msgstr "Campo inválido '%s'; campos permitidos: %s and %s, or %s,%s"
 
-#: ../clients/cli/connections.c:1450 ../clients/cli/connections.c:1458
-#, fuzzy, c-format
+#: ../clients/cli/connections.c:1408 ../clients/cli/connections.c:1416
+#, c-format
 msgid "'%s' has to be alone"
 msgstr "el campo «%s» tiene que estar solo"
 
 #. Add headers
-#: ../clients/cli/connections.c:1680
-#, fuzzy
+#: ../clients/cli/connections.c:1634
 msgid "NetworkManager active profiles"
-msgstr "Estado de NetworkManager"
+msgstr "Perfiles activos de NetworkManager"
 
-#: ../clients/cli/connections.c:1681
-#, fuzzy
+#: ../clients/cli/connections.c:1635
 msgid "NetworkManager connection profiles"
-msgstr "NetworkManager se fue a dormir"
-
-#.
-#. * TODO(?): complete uuid, path or id
-#. if (nmc->complete) {
-#. quit ();
-#. }
-#.
-#: ../clients/cli/connections.c:1727 ../clients/cli/connections.c:2445
-#: ../clients/cli/connections.c:2467 ../clients/cli/connections.c:2476
-#: ../clients/cli/connections.c:2485 ../clients/cli/connections.c:2648
-#: ../clients/cli/connections.c:7777 ../clients/cli/connections.c:7896
-#: ../clients/cli/connections.c:8032 ../clients/cli/connections.c:8170
-#: ../clients/cli/connections.c:8289 ../clients/cli/connections.c:8300
-#: ../clients/cli/connections.c:8410 ../clients/cli/devices.c:2402
-#: ../clients/cli/devices.c:2410 ../clients/cli/devices.c:2736
-#: ../clients/cli/devices.c:2743 ../clients/cli/devices.c:2757
-#: ../clients/cli/devices.c:2764 ../clients/cli/devices.c:2781
-#: ../clients/cli/devices.c:2789 ../clients/cli/devices.c:2802
-#: ../clients/cli/devices.c:3166 ../clients/cli/devices.c:3173
-#: ../clients/cli/devices.c:3180 ../clients/cli/devices.c:3192
-#: ../clients/cli/devices.c:3205 ../clients/cli/devices.c:3212
-#: ../clients/cli/devices.c:3384 ../clients/cli/devices.c:3391
-#: ../clients/cli/devices.c:3564
+msgstr "Perfiles de conexiones NetworkManager "
+
+#: ../clients/cli/connections.c:1681 ../clients/cli/connections.c:2389
+#: ../clients/cli/connections.c:2411 ../clients/cli/connections.c:2420
+#: ../clients/cli/connections.c:2429 ../clients/cli/connections.c:2588
+#: ../clients/cli/connections.c:10156 ../clients/cli/connections.c:10273
+#: ../clients/cli/connections.c:10405 ../clients/cli/connections.c:10538
+#: ../clients/cli/connections.c:10648 ../clients/cli/connections.c:10659
+#: ../clients/cli/connections.c:10758 ../clients/cli/devices.c:2344
+#: ../clients/cli/devices.c:2352 ../clients/cli/devices.c:2675
+#: ../clients/cli/devices.c:2682 ../clients/cli/devices.c:2696
+#: ../clients/cli/devices.c:2703 ../clients/cli/devices.c:2720
+#: ../clients/cli/devices.c:2728 ../clients/cli/devices.c:2741
+#: ../clients/cli/devices.c:3105 ../clients/cli/devices.c:3112
+#: ../clients/cli/devices.c:3119 ../clients/cli/devices.c:3131
+#: ../clients/cli/devices.c:3144 ../clients/cli/devices.c:3151
+#: ../clients/cli/devices.c:3323 ../clients/cli/devices.c:3330
+#: ../clients/cli/devices.c:3503
 #, c-format
 msgid "Error: %s argument is missing."
 msgstr "Error: falta el argumento %s."
 
-#: ../clients/cli/connections.c:1742
-#, fuzzy, c-format
+#: ../clients/cli/connections.c:1696
+#, c-format
 msgid "Error: %s - no such connection profile."
 msgstr "Error: %s - no hay tal conexión."
 
-#: ../clients/cli/connections.c:1801 ../clients/cli/connections.c:2508
-#: ../clients/cli/connections.c:8825 ../clients/cli/devices.c:3353
-#: ../clients/cli/devices.c:3834 ../clients/cli/general.c:528
-#: ../clients/cli/general.c:577 ../clients/cli/general.c:594
-#: ../clients/cli/general.c:633 ../clients/cli/general.c:647
-#: ../clients/cli/general.c:765 ../clients/cli/general.c:812
-#: ../clients/cli/general.c:832
+#: ../clients/cli/connections.c:1755 ../clients/cli/connections.c:2452
+#: ../clients/cli/connections.c:11162 ../clients/cli/devices.c:3292
+#: ../clients/cli/devices.c:3779 ../clients/cli/general.c:539
+#: ../clients/cli/general.c:588 ../clients/cli/general.c:605
+#: ../clients/cli/general.c:644 ../clients/cli/general.c:658
+#: ../clients/cli/general.c:776 ../clients/cli/general.c:823
+#: ../clients/cli/general.c:843
 #, c-format
 msgid "Error: %s."
 msgstr "Error: %s."
 
-#: ../clients/cli/connections.c:1897
+#: ../clients/cli/connections.c:1851
 #, c-format
 msgid "no active connection on device '%s'"
 msgstr "conexión no activa en el dispositivo «%s»"
 
-#: ../clients/cli/connections.c:1905
+#: ../clients/cli/connections.c:1859
 msgid "no active connection or device"
 msgstr "conexión o dispositivo no activo"
 
-#: ../clients/cli/connections.c:1956
+#: ../clients/cli/connections.c:1910
 #, c-format
 msgid "device '%s' not compatible with connection '%s'"
 msgstr "dispositivo «%s» incompatible con conexión «%s»"
 
-#: ../clients/cli/connections.c:1959
+#: ../clients/cli/connections.c:1913
 #, c-format
 msgid "no device found for connection '%s'"
 msgstr "no se encontró dispositivo para conexión «%s»"
 
-#: ../clients/cli/connections.c:1971
+#: ../clients/cli/connections.c:1925
 msgid "unknown reason"
 msgstr "razón desconocida"
 
-#: ../clients/cli/connections.c:1973 ../clients/cli/general.c:278
+#: ../clients/cli/connections.c:1927 ../clients/cli/general.c:277
 msgid "none"
 msgstr "ninguna"
 
-#: ../clients/cli/connections.c:1975
+#: ../clients/cli/connections.c:1929
 msgid "the user was disconnected"
 msgstr "el usuario estaba desconectado"
 
-#: ../clients/cli/connections.c:1977
+#: ../clients/cli/connections.c:1931
 msgid "the base network connection was interrupted"
 msgstr "se interrumpió la conexión de red de base"
 
-#: ../clients/cli/connections.c:1979
+#: ../clients/cli/connections.c:1933
 msgid "the VPN service stopped unexpectedly"
 msgstr "el servicio VPN se detuvo inesperadamente"
 
-#: ../clients/cli/connections.c:1981
+#: ../clients/cli/connections.c:1935
 msgid "the VPN service returned invalid configuration"
 msgstr "el servicio VPN retornó una configuración no válida"
 
-#: ../clients/cli/connections.c:1983
+#: ../clients/cli/connections.c:1937
 msgid "the connection attempt timed out"
 msgstr "se agotaron los intentos de conexión"
 
-#: ../clients/cli/connections.c:1985
+#: ../clients/cli/connections.c:1939
 msgid "the VPN service did not start in time"
 msgstr "el servicio VPN no inició a tiempo"
 
-#: ../clients/cli/connections.c:1987
+#: ../clients/cli/connections.c:1941
 msgid "the VPN service failed to start"
 msgstr "el servicio VPN falló en el inicio"
 
-#: ../clients/cli/connections.c:1989
+#: ../clients/cli/connections.c:1943
 msgid "no valid VPN secrets"
 msgstr "secretos VPN no válidos"
 
-#: ../clients/cli/connections.c:1991
+#: ../clients/cli/connections.c:1945
 msgid "invalid VPN secrets"
 msgstr "secretos VPN válidos"
 
-#: ../clients/cli/connections.c:1993
+#: ../clients/cli/connections.c:1947
 msgid "the connection was removed"
 msgstr "se eliminó la conexión"
 
 # auto translated by TM merge from project: NetworkManager, version: 0.9.8.2, DocId: NetworkManager
-#: ../clients/cli/connections.c:2015 ../clients/cli/connections.c:2050
-#: ../clients/cli/connections.c:2211 ../clients/cli/connections.c:6120
+#: ../clients/cli/connections.c:1969 ../clients/cli/connections.c:1997
+#: ../clients/cli/connections.c:2158 ../clients/cli/connections.c:8454
 #, c-format
 msgid "Connection successfully activated (D-Bus active path: %s)\n"
 msgstr "Conexión activada con éxito (D-Bus active path: %s)\n"
 
 # auto translated by TM merge from project: NetworkManager, version: 0.9.8.2, DocId: NetworkManager
-#: ../clients/cli/connections.c:2023
-#, fuzzy, c-format
+#: ../clients/cli/connections.c:1976
+#, c-format
 msgid ""
 "Connection successfully activated (master waiting for slaves) (D-Bus active "
 "path: %s)\n"
-msgstr "Conexión activada con éxito (D-Bus active path: %s)\n"
-
-#: ../clients/cli/connections.c:2030 ../clients/cli/connections.c:6126
-#, c-format
-msgid "Error: Connection activation failed.\n"
-msgstr "Error: falló la activación de la conexión.\n"
+msgstr ""
+"Conexión activada correctamente (maestro en espera de esclavos) (ruta activa "
+"D-Bus: %s)\n"
 
-#: ../clients/cli/connections.c:2033 ../clients/cli/connections.c:2055
+#: ../clients/cli/connections.c:1980 ../clients/cli/connections.c:2002
 #, c-format
 msgid "Error: Connection activation failed."
 msgstr "Error: falló la activación de la conexión."
 
 # auto translated by TM merge from project: NetworkManager, version: 0.9.8.2, DocId: NetworkManager
-#: ../clients/cli/connections.c:2106
+#: ../clients/cli/connections.c:2053
 #, c-format
 msgid "VPN connection successfully activated (D-Bus active path: %s)\n"
 msgstr "Conexión VPN activada con éxito (D-Bus active path: %s)\n"
 
-#: ../clients/cli/connections.c:2114
+#: ../clients/cli/connections.c:2061
 #, c-format
 msgid "Error: Connection activation failed: %s."
 msgstr "Error: falló la activación de la conexión: %s."
 
-#: ../clients/cli/connections.c:2133 ../clients/cli/devices.c:1506
+#: ../clients/cli/connections.c:2080 ../clients/cli/devices.c:1426
 #, c-format
 msgid "Error: Timeout %d sec expired."
 msgstr "Error: expiró la pausa de %d segundos."
 
-#: ../clients/cli/connections.c:2193
+#: ../clients/cli/connections.c:2140
 #, c-format
 msgid "Error: Connection activation failed: %s"
 msgstr "Error: falló la activación de la conexión: %s"
 
-#: ../clients/cli/connections.c:2278
-#, fuzzy, c-format
+#: ../clients/cli/connections.c:2225
+#, c-format
 msgid "failed to read passwd-file '%s': %s"
-msgstr "Error: falló al retirar el valor de '%s': %s\n"
+msgstr "Error: No se pudo leer passwd-file '%s': %s"
 
-#: ../clients/cli/connections.c:2290
+#: ../clients/cli/connections.c:2237
 #, c-format
 msgid "missing colon in 'password' entry '%s'"
-msgstr ""
+msgstr "Faltan los dos puntos en la entrada 'password' '%s' "
 
-#: ../clients/cli/connections.c:2298
+#: ../clients/cli/connections.c:2245
 #, c-format
 msgid "missing dot in 'password' entry '%s'"
-msgstr ""
+msgstr "Falta el punto en la entrada 'password' '%s' "
 
-#: ../clients/cli/connections.c:2311
+#: ../clients/cli/connections.c:2258
 #, c-format
 msgid "invalid setting name in 'password' entry '%s'"
-msgstr ""
+msgstr "El nombre de parámetro en la entrada 'password' '%s' no es válido "
 
-#: ../clients/cli/connections.c:2367
+#: ../clients/cli/connections.c:2314
 #, c-format
 msgid "unknown device '%s'."
 msgstr "Dispositivo desconocido '%s'."
 
-#: ../clients/cli/connections.c:2372
+#: ../clients/cli/connections.c:2319
 msgid "neither a valid connection nor device given"
 msgstr "Ni es una conexión válida ni es un dispositivo determinado."
 
-#: ../clients/cli/connections.c:2458
-#, fuzzy, c-format
+#: ../clients/cli/connections.c:2402
+#, c-format
 msgid "Error: Connection '%s' does not exist."
-msgstr "Error: conexión no es válida: %s\n"
+msgstr "Error: no existe la conexión '%s"
 
-#: ../clients/cli/connections.c:2493 ../clients/cli/devices.c:1405
-#: ../clients/cli/devices.c:2416 ../clients/cli/devices.c:2813
-#: ../clients/cli/devices.c:3397
+#: ../clients/cli/connections.c:2437 ../clients/cli/devices.c:1325
+#: ../clients/cli/devices.c:2358 ../clients/cli/devices.c:2752
+#: ../clients/cli/devices.c:3336
 #, c-format
 msgid "Unknown parameter: %s\n"
 msgstr "Parámetro desconocido: %s\n"
 
 # auto translated by TM merge from project: gtk3, version: 3.8.2, DocId: gtk30
-#: ../clients/cli/connections.c:2518
+#: ../clients/cli/connections.c:2462
 msgid "preparing"
 msgstr "Preparando"
 
-#: ../clients/cli/connections.c:2539
-#, fuzzy, c-format
+#: ../clients/cli/connections.c:2483
+#, c-format
 msgid "Connection '%s' (%s) successfully deleted.\n"
-msgstr "Conexión '%s' (%s) agregada con éxito.\n"
+msgstr "Conexión '%s' (%s) borrada correctamente.\n"
 
 # auto translated by TM merge from project: NetworkManager, version: 0.9.8.2, DocId: NetworkManager
-#: ../clients/cli/connections.c:2555
-#, fuzzy, c-format
+#: ../clients/cli/connections.c:2499
+#, c-format
 msgid "Connection '%s' successfully deactivated (D-Bus active path: %s)\n"
-msgstr "Conexión activada con éxito (D-Bus active path: %s)\n"
+msgstr ""
+"La conexión '%s' fue desactivada correctamente (ruta activa D-Bus: %s)\n"
 
-#: ../clients/cli/connections.c:2630 ../clients/cli/connections.c:8018
-#: ../clients/cli/connections.c:8226
+#: ../clients/cli/connections.c:2570 ../clients/cli/connections.c:10391
+#: ../clients/cli/connections.c:10590
 #, c-format
 msgid "Error: No connection specified."
 msgstr "Error: no se especificó una conexión."
 
 # auto translated by TM merge from project: NetworkManager, version: 0.9.8.2, DocId: NetworkManager
-#: ../clients/cli/connections.c:2662
-#, fuzzy, c-format
+#: ../clients/cli/connections.c:2602
+#, c-format
 msgid "Error: '%s' is not an active connection.\n"
-msgstr "Error: '%s' no se una conexión activa."
+msgstr "Error: '%s' no se una conexión activa. .\n"
+"\n"
 
 # auto translated by TM merge from project: NetworkManager, version: 0.9.8.2, DocId: NetworkManager
-#: ../clients/cli/connections.c:2663 ../clients/cli/connections.c:8047
-#, fuzzy, c-format
+#: ../clients/cli/connections.c:2603 ../clients/cli/connections.c:10420
+#, c-format
 msgid "Error: not all active connections found."
-msgstr "Error: '%s' no se una conexión activa."
+msgstr "Error: no se encontraron todas las conexiones activas."
 
-#: ../clients/cli/connections.c:2672
-#, fuzzy, c-format
+#: ../clients/cli/connections.c:2612
+#, c-format
 msgid "Error: no active connection provided."
-msgstr "Error: no se puede activar conexión: %s.\n"
+msgstr "Error: no se proporcionó una conexión activa."
 
-#: ../clients/cli/connections.c:3120 ../clients/cli/utils.c:648
+#: ../clients/cli/connections.c:2955 ../clients/cli/utils.c:702
 #, c-format
 msgid "'%s' not among [%s]"
 msgstr "'%s' no está entre [%s]"
 
-#: ../clients/cli/connections.c:3280
+#: ../clients/cli/connections.c:3032
 #, c-format
-msgid "Warning: master='%s' doesn't refer to any existing profile.\n"
-msgstr ""
+msgid "Error: '%s': '%s' is not a valid %s MAC address."
+msgstr "Error: '%s': '%s' no es una dirección MAC %s válida."
 
-#: ../clients/cli/connections.c:3451
-#, fuzzy, c-format
-msgid "Error: don't know how to create '%s' setting."
-msgstr "Error: no se pudo obtener configuración de sistema."
+# auto translated by TM merge from project: RHEL Migration Planning Guide, version: 6.4, DocId: Networking
+#. Ask for optional arguments
+#: ../clients/cli/connections.c:3033 ../clients/cli/connections.c:3565
+#: ../clients/tui/nm-editor-utils.c:163 ../libnm-core/nm-connection.c:1716
+#: ../libnm-glib/nm-device.c:1861 ../libnm/nm-device.c:1812
+msgid "InfiniBand"
+msgstr "Infiniband"
 
-#: ../clients/cli/connections.c:3462
-#, c-format
-msgid "Error: invalid property '%s': %s."
-msgstr "Error: propiedad inválida '%s': %s."
+# auto translated by TM merge from project: virt-manager, version: 0.9.0, DocId: virt-manager
+#: ../clients/cli/connections.c:3033 ../clients/tui/nm-editor-utils.c:146
+#: ../libnm-glib/nm-device.c:1849 ../libnm/nm-device.c:1800
+msgid "Ethernet"
+msgstr "Ethernet"
 
-#: ../clients/cli/connections.c:3479
+#: ../clients/cli/connections.c:3053
 #, c-format
-msgid "Error: failed to modify %s.%s: %s."
-msgstr "Error: falló al modificar %s.%s: %s."
+msgid "Error: 'mtu': '%s' is not a valid MTU."
+msgstr "Error: 'mtu': '%s' no es una MTU válido."
 
-#: ../clients/cli/connections.c:3498
-#, fuzzy, c-format
-msgid "Error: failed to remove a value from %s.%s: %s."
-msgstr "Error: falló al retirar el valor de '%s': %s\n"
+#: ../clients/cli/connections.c:3069
+#, c-format
+msgid "Error: 'parent': '%s' is not a valid interface name."
+msgstr "Error: 'parent': '%s' no es un nombre de interfaz válido."
 
-#: ../clients/cli/connections.c:3524
-#, fuzzy, c-format
-msgid "Error: '%s' is mandatory."
-msgstr "Error: '%s' parámetro no está presente\n"
+#: ../clients/cli/connections.c:3090
+#, c-format
+msgid "Error: 'p-key': '%s' is not a valid InfiniBand P_KEY."
+msgstr "Error: 'p-key': '%s' no es una InfiniBand P_KEY válida."
 
-#: ../clients/cli/connections.c:3556
-#, fuzzy, c-format
-msgid "Error: invalid slave type; %s."
-msgstr "Error: tipo de conexión inválido; %s."
+#: ../clients/cli/connections.c:3105
+#, c-format
+msgid "Error: '%s' is not a valid UID/GID."
+msgstr "Error:  '%s' no es un UID/GID válido."
 
-#: ../clients/cli/connections.c:3569
+#: ../clients/cli/connections.c:3149
 #, c-format
-msgid "Error: invalid connection type; %s."
-msgstr "Error: tipo de conexión inválido; %s."
+msgid "Error: '%s': '%s' is not a valid %s %s."
+msgstr "Error: '%s': '%s' no es %s %s válido."
 
-#: ../clients/cli/connections.c:3744
-#, fuzzy, c-format
-msgid "Error: bad connection type: %s."
-msgstr "Error: tipo de conexión inválido; %s."
+# auto translated by TM merge from project: control-center, version: 3.8.3, DocId: gnome-control-center-2.0
+#: ../clients/cli/connections.c:3162
+msgid "Wi-Fi mode"
+msgstr "Modo Wi-Fi"
 
-#: ../clients/cli/connections.c:3802
-#, fuzzy, c-format
-msgid "Error: '%s' is not a valid interface nor '*'."
-msgstr "Error: 'ifname': '%s' no es una interfaz válida ni '*'."
+#: ../clients/cli/connections.c:3171
+msgid "InfiniBand transport mode"
+msgstr "Modo de transporte InfiniBand "
 
-#: ../clients/cli/connections.c:3825
-#, fuzzy
-msgid "Error: master is required"
-msgstr "Error: se requiere 'master'."
+#: ../clients/cli/connections.c:3183
+msgid "ADSL protocol"
+msgstr "Protocolo ADSL"
 
-#: ../clients/cli/connections.c:3883
-#, fuzzy, c-format
-msgid "Error: error adding bond option '%s=%s'."
-msgstr "Error: Conexión desconocida '%s'."
+#: ../clients/cli/connections.c:3194
+msgid "ADSL encapsulation"
+msgstr "Encapsulación ADSL"
+
+#: ../clients/cli/connections.c:3203
+msgid "TUN device mode"
+msgstr "Modo de dispositivo TUN"
 
-#: ../clients/cli/connections.c:3914
+#: ../clients/cli/connections.c:3216
 #, c-format
-msgid "Error: '%s' is not a valid monitoring mode; use '%s' or '%s'.\n"
-msgstr ""
-"Error: '%s' modo de monitorización no es válido; utilice '%s' o '%s'.\n"
+msgid "Error: 'flags': '%s' is not valid; use <0-7>."
+msgstr "Error: 'flags': '%s' no es válido; use <0-7>."
 
-#: ../clients/cli/connections.c:3945
+#: ../clients/cli/connections.c:3238
 #, c-format
-msgid "Error: 'bt-type': '%s' not valid; use [%s, %s (%s), %s]."
-msgstr "Error: 'bt-type': '%s' no es válido; utilice [%s, %s (%s), %s]."
+msgid "Error: '%s': '%s' is not valid; %s "
+msgstr "Error: '%s': '%s' no es válido; %s "
 
-#: ../clients/cli/connections.c:3972
-#, fuzzy
-msgid "Interface name [*]"
-msgstr "Nombre de interfaz [*]: "
+#: ../clients/cli/connections.c:3416
+#, c-format
+msgid "Warning: master='%s' doesn't refer to any existing profile.\n"
+msgstr "Advertencia: maestro='%s' no se refiere a ningún perfil existente.\n"
 
-#: ../clients/cli/connections.c:3976
-#, fuzzy
-msgid "PPPoE username"
-msgstr "Nombre de usuario PPPoE"
+#: ../clients/cli/connections.c:3441
+#, c-format
+msgid "Error: '%s': '%s' is not valid; use <%u-%u>."
+msgstr "Error: '%s': '%s' no es válido; use <%u-%u>."
 
-#: ../clients/cli/connections.c:3977 ../clients/cli/connections.c:3998
-#: ../clients/cli/connections.c:4000 ../clients/cli/connections.c:4049
-#, fuzzy
-msgid "Password [none]"
-msgstr "Contraseña [none]: "
+#. Ask for optional arguments.
+#: ../clients/cli/connections.c:3497
+#, c-format
+msgid "There is %d optional argument for '%s' connection type.\n"
+msgid_plural "There are %d optional arguments for '%s' connection type.\n"
+msgstr[0] "Hay un %d argumento opcional para tipo de conexión '%s'.\n"
+msgstr[1] "Hay  %d argumentos opcionales para tipo de conexión '%s'.\n"
 
-#: ../clients/cli/connections.c:3978
-#, fuzzy
-msgid "Service [none]"
-msgstr "Servicio [ninguno]: "
+#: ../clients/cli/connections.c:3500
+#, c-format
+msgid "Do you want to provide it? %s"
+msgid_plural "Do you want to provide them? %s"
+msgstr[0] "¿Desea proporcionarlo? %s"
+msgstr[1] "¿Desea proporcionarlos? %s"
 
-#: ../clients/cli/connections.c:3979 ../clients/cli/connections.c:3982
-#: ../clients/cli/connections.c:3991
-#, fuzzy
-msgid "MTU [auto]"
+# auto translated by TM merge from project: virt-manager, version: 0.9.0, DocId: virt-manager
+#. Ask for optional arguments
+#: ../clients/cli/connections.c:3517
+msgid "ethernet"
+msgstr "Ethernet"
+
+#: ../clients/cli/connections.c:3522 ../clients/cli/connections.c:3570
+#: ../clients/cli/connections.c:3704 ../clients/cli/connections.c:3783
+msgid "MTU [auto]: "
 msgstr "MTU [auto]: "
 
-#: ../clients/cli/connections.c:3980 ../clients/cli/connections.c:3983
-#: ../clients/cli/connections.c:3992 ../clients/cli/connections.c:3995
-#: ../clients/cli/connections.c:4036
-#, fuzzy
-msgid "MAC [none]"
+#: ../clients/cli/connections.c:3533 ../clients/cli/connections.c:3581
+#: ../clients/cli/connections.c:3676 ../clients/cli/connections.c:3715
+#: ../clients/cli/connections.c:4101
+msgid "MAC [none]: "
 msgstr "MAC [none]: "
 
-#: ../clients/cli/connections.c:3981 ../clients/cli/connections.c:3993
-#, fuzzy
-msgid "Cloned MAC [none]"
+#: ../clients/cli/connections.c:3544
+msgid "Cloned MAC [none]: "
 msgstr "MAC clonada [none]: "
 
-#: ../clients/cli/connections.c:3986
-#, fuzzy
-msgid "Parent interface [none]"
+#: ../clients/cli/connections.c:3592
+#, c-format
+msgid "Transport mode %s"
+msgstr "Modo de transporte %s"
+
+#: ../clients/cli/connections.c:3605
+msgid "Parent interface [none]: "
 msgstr "Interfaz principal [none]: "
 
-#: ../clients/cli/connections.c:3987
-#, fuzzy
-msgid "P_KEY [none]"
+#: ../clients/cli/connections.c:3616
+msgid "P_KEY [none]: "
 msgstr "P_KEY [none]: "
 
-#. 0
-#: ../clients/cli/connections.c:3988 ../clients/cli/connections.c:4043
-#: ../clients/cli/devices.c:151 ../clients/tui/nmt-page-wifi.c:224
-msgid "SSID"
-msgstr "SSID"
+#: ../clients/cli/connections.c:3626
+#, c-format
+msgid "Error: 'p-key' is mandatory when 'parent' is specified.\n"
+msgstr "Error: 'p-key' es obligatorio cuando 'parent' está especificado.\n"
 
-#: ../clients/cli/connections.c:3994
-#, fuzzy
-msgid "WiMAX NSP name"
-msgstr "Nombre NSP WiMAX: "
+# auto translated by TM merge from project: control-center, version: 3.8.3, DocId: gnome-control-center-2.0
+#. Ask for optional arguments
+#: ../clients/cli/connections.c:3643 ../clients/tui/nm-editor-utils.c:154
+#: ../libnm-glib/nm-device.c:1851 ../libnm/nm-device.c:1802
+msgid "Wi-Fi"
+msgstr "Inalámbrica"
 
-#: ../clients/cli/connections.c:3996
-#, fuzzy
-msgid "APN"
-msgstr "AP"
+#: ../clients/cli/connections.c:3651 ../clients/cli/connections.c:6199
+#, c-format
+msgid "Mode %s"
+msgstr "Modo  %s"
 
-#: ../clients/cli/connections.c:3997 ../clients/cli/connections.c:3999
-#: ../clients/cli/connections.c:4042
-#, fuzzy
-msgid "Username [none]"
+#. Ask for optional 'wimax' arguments.
+#: ../clients/cli/connections.c:3671 ../libnm-glib/nm-device.c:1857
+#: ../libnm/nm-device.c:1808
+msgid "WiMAX"
+msgstr "WiMAX"
+
+#. Ask for optional 'pppoe' arguments.
+#: ../clients/cli/connections.c:3694
+msgid "PPPoE"
+msgstr "PPPoE"
+
+#: ../clients/cli/connections.c:3698 ../clients/cli/connections.c:3736
+#: ../clients/cli/connections.c:4223
+msgid "Password [none]: "
+msgstr "Contraseña [none]: "
+
+#: ../clients/cli/connections.c:3700
+msgid "Service [none]: "
+msgstr "Servicio [ninguno]: "
+
+#. Ask for optional 'gsm' or 'cdma' arguments.
+#: ../clients/cli/connections.c:3730
+msgid "mobile broadband"
+msgstr "Banda ancha móvil"
+
+#: ../clients/cli/connections.c:3734 ../clients/cli/connections.c:4173
+msgid "Username [none]: "
 msgstr "Nombre de usuario [none]: "
 
-#: ../clients/cli/connections.c:4001
-#, fuzzy
-msgid "Bluetooth device address"
-msgstr "Dirección de dispositivo Bluetooth:"
+#. Ask for optional 'bluetooth' arguments.
+#: ../clients/cli/connections.c:3749
+msgid "bluetooth"
+msgstr "Bluetooth"
 
-#: ../clients/cli/connections.c:4004
-#, fuzzy
-msgid "VLAN parent device or connection UUID"
-msgstr "Dispositivo principal VLAN o UUID de conexión: "
+#: ../clients/cli/connections.c:3756
+#, c-format
+msgid "Bluetooth type %s"
+msgstr "Bluetooth tipo %s"
 
-#: ../clients/cli/connections.c:4006
-#, fuzzy
-msgid "VLAN ID (<0-4094>)"
-msgstr "ID de VLAN <0-4095>: "
+#: ../clients/cli/connections.c:3762
+#, c-format
+msgid "Error: 'bt-type': '%s' is not a valid bluetooth type.\n"
+msgstr "Error: 'bt-type': '%s' no es un tipo bluetooth válido.\n"
 
-#: ../clients/cli/connections.c:4007
-#, fuzzy
-msgid "VLAN flags (<0-7>) [none]"
+#. Ask for optional 'vlan' arguments.
+#. 13
+#: ../clients/cli/connections.c:3778 ../clients/cli/devices.c:239
+#: ../clients/tui/nm-editor-utils.c:217 ../clients/tui/nmt-page-vlan.c:94
+#: ../libnm-core/nm-connection.c:1714 ../libnm-glib/nm-device.c:1869
+#: ../libnm-util/nm-connection.c:1632 ../libnm/nm-device.c:1820
+msgid "VLAN"
+msgstr "VLAN"
+
+#: ../clients/cli/connections.c:3794
+msgid "VLAN flags (<0-7>) [none]: "
 msgstr "Indicadores VLAN (<0-7>) [none]: "
 
-#: ../clients/cli/connections.c:4008
-#, fuzzy
-msgid "Ingress priority maps [none]"
+#: ../clients/cli/connections.c:3805
+msgid "Ingress priority maps [none]: "
 msgstr "Mapas de prioridad de ingreso [none]: "
 
-#: ../clients/cli/connections.c:4009
-#, fuzzy
-msgid "Egress priority maps [none]"
+#: ../clients/cli/connections.c:3816
+msgid "Egress priority maps [none]: "
 msgstr "Mapas de prioridad de egreso [none]: "
 
-#: ../clients/cli/connections.c:4012
-#, fuzzy
-msgid "Bonding primary interface [none]"
+#: ../clients/cli/connections.c:3827
+msgid "Bonding mode [balance-rr]: "
+msgstr "Modo de vinculación [balance-rr] desconocido: "
+
+#. Ask for optional 'bond' arguments.
+#: ../clients/cli/connections.c:3843
+msgid "bond"
+msgstr "vínculo"
+
+#: ../clients/cli/connections.c:3865
+msgid "Bonding primary interface [none]: "
 msgstr "Interfaz de vinculación primaria [none]: "
 
-#: ../clients/cli/connections.c:4016
-#, fuzzy
-msgid "Bonding miimon [100]"
+#: ../clients/cli/connections.c:3868
+#, c-format
+msgid "Error: 'primary': '%s' is not a valid interface name.\n"
+msgstr "Error: 'primary': '%s' no es un nombre de interfaz válido.\n"
+
+#: ../clients/cli/connections.c:3876
+#, c-format
+msgid "Bonding monitoring mode %s"
+msgstr "Enlace de monitorización en modo %s"
+
+#: ../clients/cli/connections.c:3882
+#, c-format
+msgid "Error: '%s' is not a valid monitoring mode; use '%s' or '%s'.\n"
+msgstr ""
+"Error: '%s' modo de monitorización no es válido; utilice '%s' o '%s'.\n"
+
+#: ../clients/cli/connections.c:3891
+msgid "Bonding miimon [100]: "
 msgstr "Vinculación miimon [100]: "
 
-#: ../clients/cli/connections.c:4017
-#, fuzzy
-msgid "Bonding downdelay [0]"
+#: ../clients/cli/connections.c:3894
+#, c-format
+msgid "Error: 'miimon': '%s' is not a valid number <0-%u>.\n"
+msgstr "Error: 'miimon': '%s' no es un número valido <0-%u>.\n"
+
+#: ../clients/cli/connections.c:3902
+msgid "Bonding downdelay [0]: "
 msgstr "Vinculación downdelay [0]: "
 
-#: ../clients/cli/connections.c:4018
-#, fuzzy
-msgid "Bonding updelay [0]"
+#: ../clients/cli/connections.c:3905
+#, c-format
+msgid "Error: 'downdelay': '%s' is not a valid number <0-%u>.\n"
+msgstr "Error: 'downdelay': '%s' no es un número válido <0-%u>.\n"
+
+#: ../clients/cli/connections.c:3913
+msgid "Bonding updelay [0]: "
 msgstr "Vinculación updelay [0]: "
 
-#: ../clients/cli/connections.c:4019
-#, fuzzy
-msgid "Bonding arp-interval [0]"
+#: ../clients/cli/connections.c:3916
+#, c-format
+msgid "Error: 'updelay': '%s' is not a valid number <0-%u>.\n"
+msgstr "Error: 'updelay': '%s' no es un número válido <0-%u>.\n"
+
+#: ../clients/cli/connections.c:3925
+msgid "Bonding arp-interval [0]: "
 msgstr "Vinculación arp-interval [0]: "
 
-#: ../clients/cli/connections.c:4021
-#, fuzzy
-msgid "Bonding arp-ip-target [none]"
+#: ../clients/cli/connections.c:3928
+#, c-format
+msgid "Error: 'arp-interval': '%s' is not a valid number <0-%u>.\n"
+msgstr "Error: 'arp-interval': '%s' no es un número válido <0-%u>.\n"
+
+#. FIXME: verify the string
+#: ../clients/cli/connections.c:3936
+msgid "Bonding arp-ip-target [none]: "
 msgstr "Vinculación arp-ip-target [none]: "
 
-#: ../clients/cli/connections.c:4023
-msgid "LACP rate ('slow' or 'fast') [slow]"
-msgstr ""
+#: ../clients/cli/connections.c:3943
+msgid "LACP rate ('slow' or 'fast') [slow]: "
+msgstr "Tasa LACP ('slow' o 'fast') [slow]: "
 
-#: ../clients/cli/connections.c:4025 ../clients/cli/connections.c:4026
-#, fuzzy
-msgid "Team JSON configuration [none]"
+#: ../clients/cli/connections.c:3949
+#, c-format
+msgid "Error: 'lacp_rate': '%s' is invalid ('slow' or 'fast').\n"
+msgstr "Error: 'lacp_rate': '%s' es inválido ('slow' o 'fast').\n"
+
+#: ../clients/cli/connections.c:3972
+msgid "Team JSON configuration [none]: "
 msgstr "Configuración de equipo JSON [ninguna]: "
 
-#: ../clients/cli/connections.c:4027
-#, fuzzy
-msgid "Enable STP [no]"
-msgstr "Habilitar STP (si o no) [yes]: "
+#: ../clients/cli/connections.c:3989
+msgid "team"
+msgstr "Equipo"
 
-#: ../clients/cli/connections.c:4029
-#, fuzzy
-msgid "STP priority [32768]"
-msgstr "Prioridad STP [128]: "
+#: ../clients/cli/connections.c:3995
+msgid "team-slave"
+msgstr "Equipo esclavo"
+
+# auto translated by TM merge from project: RHN Satellite UI, version: 5.5, DocId: java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource
+#. Ask for optional 'bridge' arguments.
+#: ../clients/cli/connections.c:4007
+msgid "bridge"
+msgstr "Puente"
+
+#: ../clients/cli/connections.c:4013
+#, c-format
+msgid "Enable STP %s"
+msgstr "Habilitar STP %s"
+
+#: ../clients/cli/connections.c:4018
+#, c-format
+msgid "Error: 'stp': %s.\n"
+msgstr "Error: 'stp': %s.\n"
+
+#: ../clients/cli/connections.c:4026
+msgid "STP priority [32768]: "
+msgstr "Prioridad STP [32768]: "
 
 #: ../clients/cli/connections.c:4030
-#, fuzzy
-msgid "Forward delay [15]"
+#, c-format
+msgid "Error: 'priority': '%s' is not a valid number <0-%d>.\n"
+msgstr "Error: 'priority': '%s' no es un número válido <0-%d>.\n"
+
+#: ../clients/cli/connections.c:4038
+msgid "Forward delay [15]: "
 msgstr "Demora de reenvío [15]:"
 
-#: ../clients/cli/connections.c:4031
-#, fuzzy
-msgid "Hello time [2]"
+#: ../clients/cli/connections.c:4042
+#, c-format
+msgid "Error: 'forward-delay': '%s' is not a valid number <2-30>.\n"
+msgstr "Error: 'forward-updelay': '%s' no es un número válido <2-30>.\n"
+
+#: ../clients/cli/connections.c:4051
+msgid "Hello time [2]: "
 msgstr "Hello time [2]: "
 
-#: ../clients/cli/connections.c:4032
-#, fuzzy
-msgid "Max age [20]"
+#: ../clients/cli/connections.c:4055
+#, c-format
+msgid "Error: 'hello-time': '%s' is not a valid number <1-10>.\n"
+msgstr "Error: 'hello-time': '%s' no es un número válido <1-10>.\n"
+
+#: ../clients/cli/connections.c:4063
+msgid "Max age [20]: "
 msgstr "Edad máxima [20]: "
 
-#: ../clients/cli/connections.c:4033
-#, fuzzy
-msgid "MAC address ageing time [300]"
+#: ../clients/cli/connections.c:4067
+#, c-format
+msgid "Error: 'max-age': '%s' is not a valid number <6-40>.\n"
+msgstr "Error: 'max-age': '%s' no es un número válido <6-40>.\n"
+
+#: ../clients/cli/connections.c:4075
+msgid "MAC address ageing time [300]: "
 msgstr "Tiempo de envejecimiento de direción MAC  [300]: "
 
-#: ../clients/cli/connections.c:4034
+#: ../clients/cli/connections.c:4079
 #, c-format
-msgid "Enable IGMP snooping %s [no]"
-msgstr ""
+msgid "Error: 'ageing-time': '%s' is not a valid number <0-1000000>.\n"
+msgstr "Error: 'ageing-time': '%s' no es un número válido <0-1000000>.\n"
 
-#: ../clients/cli/connections.c:4037
-#, fuzzy
-msgid "Bridge port priority [32]"
+#: ../clients/cli/connections.c:4088
+#, c-format
+msgid "Enable IGMP snooping %s"
+msgstr "Habilitar snooping IGMP  %s"
+
+#: ../clients/cli/connections.c:4093
+#, c-format
+msgid "Error: 'multicast-snooping': %s.\n"
+msgstr "Error: 'multicast-snooping': %s.\n"
+
+#. Ask for optional 'bridge-slave' arguments.
+#: ../clients/cli/connections.c:4120
+msgid "bridge-slave"
+msgstr "bridge-slave"
+
+#: ../clients/cli/connections.c:4125
+msgid "Bridge port priority [32]: "
 msgstr "Prioridad de puerto de puente [32]: "
 
-#: ../clients/cli/connections.c:4038
-#, fuzzy
-msgid "Bridge port STP path cost [100]"
+#: ../clients/cli/connections.c:4138
+msgid "Bridge port STP path cost [100]: "
 msgstr "Costo de ruta STP puerto de puente [100]: "
 
-#: ../clients/cli/connections.c:4039
-#, fuzzy
-msgid "Hairpin [no]"
-msgstr "Modo de Hairpin"
+#: ../clients/cli/connections.c:4152
+#, c-format
+msgid "Hairpin %s"
+msgstr "Hairpin %s"
+
+#: ../clients/cli/connections.c:4157
+#, c-format
+msgid "Error: 'hairpin': %s.\n"
+msgstr "Error: 'hairpin': %s.\n"
 
-#: ../clients/cli/connections.c:4044
-#, fuzzy
-msgid "OLPC Mesh channel [1]"
+#. Ask for optional 'olpc' arguments.
+#: ../clients/cli/connections.c:4184 ../libnm-glib/nm-device.c:1855
+#: ../libnm/nm-device.c:1806
+msgid "OLPC Mesh"
+msgstr "OLPC Mesh"
+
+#: ../clients/cli/connections.c:4189
+msgid "OLPC Mesh channel [1]: "
 msgstr "Canal OLPC Mesh [1]: "
 
-#: ../clients/cli/connections.c:4045
-#, fuzzy
-msgid "DHCP anycast MAC address [none]"
+#: ../clients/cli/connections.c:4192
+#, c-format
+msgid "Error: 'channel': '%s' is not a valid number <1-13>.\n"
+msgstr "Error: 'channel': '%s' no es un número válido <1-13>.\n"
+
+#: ../clients/cli/connections.c:4200
+msgid "DHCP anycast MAC address [none]: "
 msgstr "Dirección MAC DHCP anycast [none]: "
 
-#. TTLS and PEAP are actually much more complicated, but this complication
-#. * is not visible here since we only care about phase2 authentication
-#. * (and don't even care of which one)
-#.
-#: ../clients/cli/connections.c:4046
-#: ../clients/common/nm-secret-agent-simple.c:223
-#: ../clients/common/nm-secret-agent-simple.c:328
-#: ../clients/tui/nmt-page-dsl.c:66 ../clients/tui/nmt-page-wifi.c:332
-msgid "Username"
-msgstr "Nombre de usuario"
+#. Ask for optional 'adsl' arguments.
+#: ../clients/cli/connections.c:4219 ../libnm-glib/nm-device.c:1871
+#: ../libnm/nm-device.c:1822
+msgid "ADSL"
+msgstr "ADSL"
 
-#: ../clients/cli/connections.c:4052
-#, fuzzy
-msgid "MACVLAN parent device or connection UUID"
-msgstr "Dispositivo principal VLAN o UUID de conexión: "
+#: ../clients/cli/connections.c:4227
+#, c-format
+msgid "ADSL encapsulation %s"
+msgstr "Encapsulación ADSL %s"
 
-#: ../clients/cli/connections.c:4055
-msgid "Tap [no]"
-msgstr ""
+#. Ask for optional 'macvlan' arguments.
+#: ../clients/cli/connections.c:4245
+msgid "macvlan"
+msgstr "macvlan"
 
-#: ../clients/cli/connections.c:4057
-#, fuzzy
-msgid "VXLAN ID"
-msgstr "ID de VLAN <0-4095>: "
+#: ../clients/cli/connections.c:4251
+#, c-format
+msgid "Tap %s"
+msgstr "Tap %s"
 
-#: ../clients/cli/connections.c:4058 ../clients/cli/connections.c:4076
-#, fuzzy
-msgid "Remote"
-msgstr "Retirar"
+#: ../clients/cli/connections.c:4256
+#, c-format
+msgid "Error: 'tap': %s.\n"
+msgstr "Error: 'tap': %s.\n"
 
-#: ../clients/cli/connections.c:4059 ../clients/cli/connections.c:4077
-#, fuzzy
-msgid "Parent device [none]"
-msgstr "Interfaz principal [none]: "
+#. Ask for optional 'vxlan' arguments.
+#: ../clients/cli/connections.c:4272 ../libnm-glib/nm-device.c:1875
+#: ../libnm/nm-device.c:1826
+msgid "VXLAN"
+msgstr "VXLAN"
 
-#: ../clients/cli/connections.c:4060
-#, fuzzy
-msgid "Local address [none]"
-msgstr "Dirección MAC DHCP anycast [none]: "
+#: ../clients/cli/connections.c:4277 ../clients/cli/connections.c:4601
+msgid "Parent device [none]: "
+msgstr "Dispositivo principal [none]: "
 
-#: ../clients/cli/connections.c:4061
-msgid "Minimum source port [0]"
-msgstr ""
+#: ../clients/cli/connections.c:4282 ../clients/cli/connections.c:4606
+#, c-format
+msgid "Error: 'dev': '%s' is neither UUID nor interface name.\n"
+msgstr "Error: 'dev': '%s'no es ni UUID ni nombre de interfaz.\n"
 
-#: ../clients/cli/connections.c:4062
-msgid "Maximum source port [0]"
-msgstr ""
+#: ../clients/cli/connections.c:4291
+msgid "Local address [none]: "
+msgstr "Dirección local [none]: "
 
-#: ../clients/cli/connections.c:4063
-#, fuzzy
-msgid "Destination port [8472]"
-msgstr "Destino"
+#: ../clients/cli/connections.c:4296
+#, c-format
+msgid "Error: 'local': '%s' is not a valid IP address.\n"
+msgstr "Error: 'local': '%s'  no es una dirección IP válida.\n"
 
-#: ../clients/cli/connections.c:4066
-#, fuzzy
-msgid "User ID [none]"
-msgstr "Nombre de usuario [none]: "
+#: ../clients/cli/connections.c:4305
+msgid "Minimum source port [0]: "
+msgstr "Puerto de fuente mínimo [0]: "
 
-#: ../clients/cli/connections.c:4067
-#, fuzzy
-msgid "Group ID [none]"
-msgstr "MAC [none]: "
+#: ../clients/cli/connections.c:4309
+#, c-format
+msgid "Error: 'source-port-min': '%s' is not a valid number <0-65535>.\n"
+msgstr "Error: 'source-port-min': '%s' no es un número válido <0-65535>.\n"
 
-#: ../clients/cli/connections.c:4068
-#, fuzzy
-msgid "Enable PI [no]"
-msgstr "Habilitar STP (si o no) [yes]: "
+#: ../clients/cli/connections.c:4318
+msgid "Maximum source port [0]: "
+msgstr "Puerto de fuente máximo [0]: "
 
-#: ../clients/cli/connections.c:4070
-msgid "Enable VNET header [no]"
-msgstr ""
+#: ../clients/cli/connections.c:4322
+#, c-format
+msgid "Error: 'source-port-max': '%s' is not a valid number <0-65535>.\n"
+msgstr "Error: 'source-port-max': '%s' no es un número válido <0-65535>.\n"
 
-#: ../clients/cli/connections.c:4072
-msgid "Enable multi queue [no]"
-msgstr ""
+#: ../clients/cli/connections.c:4331
+msgid "Destination port [8472]: "
+msgstr "Puerto de destino  [8472]: "
 
-#: ../clients/cli/connections.c:4075
-#, fuzzy
-msgid "Local endpoint [none]"
-msgstr "Interfaz principal [none]: "
+#: ../clients/cli/connections.c:4335
+#, c-format
+msgid "Error: 'destination-port': '%s' is not a valid number <0-65535>.\n"
+msgstr "Error: 'destination-port': '%s' no es un número valido <0-65535>.\n"
 
-#: ../clients/cli/connections.c:4078
-#, fuzzy
-msgid "IPv4 address (IP[/plen]) [none]"
+#: ../clients/cli/connections.c:4374
+msgid "IPv4 address (IP[/plen]) [none]: "
 msgstr "Dirección IPv4 (IP[/plen] [gateway]) [none]: "
 
-#: ../clients/cli/connections.c:4079
-#, fuzzy
-msgid "IPv4 gateway [none]"
-msgstr "Dirección IPv4 (IP[/plen] [gateway]) [none]: "
+#: ../clients/cli/connections.c:4376
+msgid "IPv6 address (IP[/plen]) [none]: "
+msgstr "Dirección IPv6 (IP[/plen]) [none]: "
 
-#: ../clients/cli/connections.c:4080
-#, fuzzy
-msgid "IPv6 address (IP[/plen]) [none]"
-msgstr "Dirección IPv6 (IP[/plen] [gateway]) [none]: "
+#: ../clients/cli/connections.c:4390
+#, c-format
+msgid "  Address successfully added: %s\n"
+msgstr "Dirección agregada correctamente: %s\n"
 
-#: ../clients/cli/connections.c:4081
-#, fuzzy
-msgid "IPv6 gateway [none]"
-msgstr "Dirección IPv6 (IP[/plen] [gateway]) [none]: "
+#: ../clients/cli/connections.c:4392
+#, c-format
+msgid "  Warning: address already present: %s\n"
+msgstr "  Advertencia: la dirección ya está presente: %s \n"
 
-#: ../clients/cli/connections.c:4205
-#, fuzzy, c-format
-msgid "Error: value for '%s' is missing."
-msgstr "Error: faltan campos para opciones «%s»."
+#: ../clients/cli/connections.c:4394
+#, c-format
+msgid "  Warning: ignoring garbage at the end: '%s'\n"
+msgstr "  Advertencia: ignorando basura al final: '%s'\n"
+
+#: ../clients/cli/connections.c:4396 ../clients/cli/connections.c:5605
+#: ../clients/cli/connections.c:5652 ../clients/cli/connections.c:6569
+#: ../clients/cli/connections.c:6602
+msgid "Error: "
+msgstr "Error: "
 
-#: ../clients/cli/connections.c:4252
+#: ../clients/cli/connections.c:4416
+msgid "IPv4 gateway [none]: "
+msgstr "Puerta de enlace IPv4 [none]: "
+
+#: ../clients/cli/connections.c:4419
+msgid "IPv6 gateway [none]: "
+msgstr "Dirección IPv6 [none]: "
+
+#: ../clients/cli/connections.c:4439
+#, c-format
+msgid "Error: invalid gateway address '%s'\n"
+msgstr "Error: dirección de puerta de enlace no es válida '%s'.\n"
+
+#. Ask for IP addresses
+#: ../clients/cli/connections.c:4452
+#, c-format
+msgid "Do you want to add IP addresses? %s"
+msgstr "¿Desea agregar las direcciones IP? %s"
+
+#: ../clients/cli/connections.c:4460
+#, c-format
+msgid "Press <Enter> to finish adding addresses.\n"
+msgstr "Pulse <Enter> para terminar de agregar direcciones.\n"
+
+#. Ask for optional 'tun' arguments.
+#: ../clients/cli/connections.c:4504 ../libnm-glib/nm-device.c:1879
+#: ../libnm/nm-device.c:1830
+msgid "Tun"
+msgstr "Tun"
+
+#: ../clients/cli/connections.c:4509
+msgid "User ID [none]: "
+msgstr "ID de usuario [none]: "
+
+#: ../clients/cli/connections.c:4522
+msgid "Group ID [none]: "
+msgstr "ID de grupo [none]: "
+
+#: ../clients/cli/connections.c:4536
+#, c-format
+msgid "Enable PI %s"
+msgstr "Habilitar PI %s"
+
+#: ../clients/cli/connections.c:4541
+#, c-format
+msgid "Error: 'pi': %s.\n"
+msgstr "Error: 'pi': %s.\n"
+
+#: ../clients/cli/connections.c:4549
+#, c-format
+msgid "Enable VNET header %s"
+msgstr "Habilitar encabezamiento VNET %s "
+
+#: ../clients/cli/connections.c:4554
+#, c-format
+msgid "Error: 'vnet-hdr': %s.\n"
+msgstr "Error: 'vnet-hdr': %s.\n"
+
+#: ../clients/cli/connections.c:4562
+#, c-format
+msgid "Enable multi queue %s"
+msgstr "Habilitar varias colas %s"
+
+#: ../clients/cli/connections.c:4567
+#, c-format
+msgid "Error: 'multi-queue': %s.\n"
+msgstr "Error: 'multi-queue': %s.\n"
+
+#. Ask for optional 'ip-tunnel' arguments.
+#: ../clients/cli/connections.c:4581
+msgid "IP Tunnel"
+msgstr "Túnel IP"
+
+#: ../clients/cli/connections.c:4586
+msgid "Local endpoint [none]: "
+msgstr "Punto final local [none]: "
+
+#: ../clients/cli/connections.c:4592
+#, c-format
+msgid "Error: 'local': '%s' is not valid; must be an IP address\n"
+msgstr "Error: 'local': '%s' no es válido; debe ser una dirección IP\n"
+
+#: ../clients/cli/connections.c:4658 ../clients/cli/connections.c:10184
+#, c-format
 msgid "Error: <setting>.<property> argument is missing."
 msgstr "Error: <setting>.<property> falta el argumento."
 
-#: ../clients/cli/connections.c:4274
+#: ../clients/cli/connections.c:4663
+#, c-format
+msgid "Error: value for '%s' is missing."
+msgstr "Error: falta el valor para '%s'."
+
+#: ../clients/cli/connections.c:4681
+#, c-format
+msgid "Error: invalid <setting>.<property> '%s'."
+msgstr "Error: inválido <setting>.<property> '%s'."
+
+#: ../clients/cli/connections.c:4689
 #, c-format
 msgid "Error: invalid or not allowed setting '%s': %s."
 msgstr "Error: parámetro inválido o no permitido '%s': %s."
 
-#: ../clients/cli/connections.c:4301
-#, fuzzy, c-format
-msgid "Error: '%s' is ambiguous (%s.%s or %s.%s)."
-msgstr "'%s' es ambiguo (%s x %s)"
+#: ../clients/cli/connections.c:4700
+#, c-format
+msgid "Error: don't know how to create '%s' setting."
+msgstr "Error: no se sabe cómo crear el parámetro '%s'."
 
-#: ../clients/cli/connections.c:4315
+#: ../clients/cli/connections.c:4710
 #, c-format
-msgid "Error: invalid <setting>.<property> '%s'."
-msgstr "Error: inválido <setting>.<property> '%s'."
+msgid "Error: invalid property '%s': %s."
+msgstr "Error: propiedad inválida '%s': %s."
 
-#: ../clients/cli/connections.c:4356 ../clients/cli/connections.c:7842
-#, fuzzy, c-format
-msgid "Error: Failed to add '%s' connection: %s"
-msgstr "Error: Falló al agregar '%s' conexión: (%d) %s"
+#: ../clients/cli/connections.c:4722
+#, c-format
+msgid "Error: failed to modify %s.%s: %s."
+msgstr "Error: No se pudo modificar %s.%s: %s."
 
-#: ../clients/cli/connections.c:4361
+#: ../clients/cli/connections.c:4741
 #, c-format
-msgid "Connection '%s' (%s) successfully added.\n"
-msgstr "Conexión '%s' (%s) agregada con éxito.\n"
+msgid "Error: failed to remove a value from %s.%s: %s."
+msgstr "Error: No se pudo retirar el valor de  %s.%s: %s."
 
-#: ../clients/cli/connections.c:4477
+#: ../clients/cli/connections.c:4775
 #, c-format
 msgid ""
-"You can specify this option more than once. Press <Enter> when you're done.\n"
+"Warning: 'type' is ignored. Use 'nmcli connection add \"%s\" ...' instead."
 msgstr ""
+"Advertencia: se ignora 'type'. Use 'nmcli connection add \"%s\" ...' en su "
+"lugar."
 
-#. Ask for optional arguments.
-#: ../clients/cli/connections.c:4515
-#, fuzzy, c-format
-msgid "There is %d optional setting for %s.\n"
-msgid_plural "There are %d optional settings for %s.\n"
-msgstr[0] "Hay 1 argumento opcional para tipo de conexión '%s'\n"
-msgstr[1] "Hay 1 argumento opcional para tipo de conexión '%s'\n"
-
-#: ../clients/cli/connections.c:4518
-#, fuzzy, c-format
-msgid "Do you want to provide it? %s"
-msgid_plural "Do you want to provide them? %s"
-msgstr[0] "¿Desea proporcionarlo? (Sí o No) [yes] "
-msgstr[1] "¿Desea proporcionarlo? (Sí o No) [yes] "
+#: ../clients/cli/connections.c:4783
+msgid "Error: redundant 'master' option."
+msgstr "Error: opción 'master' redundante."
 
-# auto translated by TM merge from project: virt-manager, version: 0.9.0, DocId: virt-manager
-#: ../clients/cli/connections.c:4532
-#, fuzzy
-msgid "Wired Ethernet"
-msgstr "Ethernet"
+#: ../clients/cli/connections.c:4796
+msgid "Error: 'master' is required."
+msgstr "Error: se requiere 'master'."
 
-#: ../clients/cli/connections.c:4534 ../src/devices/nm-device-infiniband.c:175
-#, fuzzy
-msgid "InfiniBand connection"
-msgstr "Conexión InfiniBand %d"
+#: ../clients/cli/connections.c:4950
+#, c-format
+msgid "Error: 'parent': not valid without 'p-key'."
+msgstr "Error: 'parent': 'no es válido sin 'p-key'."
 
-#: ../clients/cli/connections.c:4536
-#, fuzzy
-msgid "Wi-Fi connection"
-msgstr "Conexión Wi-Fi %d"
+#: ../clients/cli/connections.c:5005 ../clients/cli/connections.c:5967
+msgid "SSID: "
+msgstr "SSID: "
 
-#: ../clients/cli/connections.c:4538
-#, fuzzy
-msgid "WiMAX connection"
-msgstr "Conexión CDMA %d"
+#: ../clients/cli/connections.c:5008 ../clients/cli/connections.c:5970
+msgid "Error: 'ssid' is required."
+msgstr "Error: se requiere 'ssid'."
 
-#: ../clients/cli/connections.c:4540
-msgid "PPPoE"
-msgstr ""
+#: ../clients/cli/connections.c:5072
+msgid "WiMAX NSP name: "
+msgstr "Nombre NSP WiMAX: "
 
-#: ../clients/cli/connections.c:4542
-#, fuzzy
-msgid "CDMA mobile broadband connection"
-msgstr "Conexión de banda ancha móvil %d"
+#: ../clients/cli/connections.c:5075
+msgid "Error: 'nsp' is required."
+msgstr "Error: se requiere 'nsp'."
 
-#: ../clients/cli/connections.c:4544
-#, fuzzy
-msgid "GSM mobile broadband connection"
-msgstr "Conexión de banda ancha móvil %d"
+#: ../clients/cli/connections.c:5127
+msgid "PPPoE username: "
+msgstr "Nombre de usuario PPPoE"
 
-#: ../clients/cli/connections.c:4546
-#, fuzzy
-msgid "bluetooth connection"
-msgstr "Conexión de vínculo %d"
+#: ../clients/cli/connections.c:5130 ../clients/cli/connections.c:6037
+msgid "Error: 'username' is required."
+msgstr "Error: 'username' es requerido."
 
-#: ../clients/cli/connections.c:4548 ../src/devices/nm-device-vlan.c:458
-#, fuzzy
-msgid "VLAN connection"
-msgstr "Conexión VLAN %d"
+#: ../clients/cli/connections.c:5199
+msgid "APN: "
+msgstr "APN: "
 
-# auto translated by TM merge from project: virt-manager, version: 0.9.0, DocId: virt-manager
-#: ../clients/cli/connections.c:4550
-#, fuzzy
-msgid "Bond device"
-msgstr "Ethernet"
+#: ../clients/cli/connections.c:5202
+msgid "Error: 'apn' is required."
+msgstr "Error: se requiere 'apn'."
 
-#: ../clients/cli/connections.c:4552
-#, fuzzy
-msgid "Team device"
-msgstr "El dispositivo fue retirado"
+#: ../clients/cli/connections.c:5260
+msgid "Bluetooth device address: "
+msgstr "Dirección de dispositivo Bluetooth:"
 
-#: ../clients/cli/connections.c:4554
-#, fuzzy
-msgid "Team port"
-msgstr "Equipo "
+#: ../clients/cli/connections.c:5263
+msgid "Error: 'addr' is required."
+msgstr "Error: se requiere 'addr'."
 
-# auto translated by TM merge from project: virt-manager, version: 0.9.0, DocId: virt-manager
-#: ../clients/cli/connections.c:4556
-#, fuzzy
-msgid "Bridge device"
-msgstr "Ethernet"
+#: ../clients/cli/connections.c:5304
+#, c-format
+msgid "Error: 'bt-type': '%s' not valid; use [%s, %s (%s), %s]."
+msgstr "Error: 'bt-type': '%s' no es válido; utilice [%s, %s (%s), %s]."
 
-# auto translated by TM merge from project: RHN Satellite UI, version: 5.5, DocId: java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource
-#: ../clients/cli/connections.c:4558
-#, fuzzy
-msgid "Bridge port"
-msgstr "Puente"
+#: ../clients/cli/connections.c:5348
+msgid "VLAN parent device or connection UUID: "
+msgstr "Dispositivo principal VLAN o UUID de conexión: "
 
-#: ../clients/cli/connections.c:4560 ../src/nm-manager.c:3716
-#, fuzzy
-msgid "VPN connection"
-msgstr "Conectando VPN"
+#: ../clients/cli/connections.c:5351 ../clients/cli/connections.c:6108
+msgid "Error: 'dev' is required."
+msgstr "Error: se requiere 'dev'."
 
-#: ../clients/cli/connections.c:4562
-#, fuzzy
-msgid "OLPC Mesh connection"
-msgstr "Conexión CDMA %d"
+#: ../clients/cli/connections.c:5355
+msgid "VLAN ID <0-4094>: "
+msgstr "ID de VLAN <0-4094>: "
 
-#: ../clients/cli/connections.c:4564 ../src/devices/adsl/nm-device-adsl.c:133
-#, fuzzy
-msgid "ADSL connection"
-msgstr "Conexión ADSL %d"
+#: ../clients/cli/connections.c:5358 ../clients/cli/connections.c:6424
+msgid "Error: 'id' is required."
+msgstr "Error: Se requiere 'id'."
 
-#: ../clients/cli/connections.c:4566
-#, fuzzy
-msgid "macvlan connection"
-msgstr "Conexión de vínculo %d"
+#: ../clients/cli/connections.c:5364
+#, c-format
+msgid "Error: 'id': '%s' is not valid; use <0-4094>."
+msgstr "Error: 'id': '%s' no es válido; use <0-4094>: "
 
-#: ../clients/cli/connections.c:4568 ../src/devices/nm-device-vxlan.c:374
-#, fuzzy
-msgid "VXLAN connection"
-msgstr "Conexión VLAN %d"
+#: ../clients/cli/connections.c:5374 ../clients/cli/connections.c:6116
+#, c-format
+msgid "Error: 'dev': '%s' is neither UUID, interface name, nor MAC."
+msgstr "Error: 'dev': '%s' no es ni nombre de interfaz ni  MAC."
 
-#: ../clients/cli/connections.c:4570
-#, fuzzy
-msgid "Tun device"
-msgstr "El dispositivo fue retirado"
+#: ../clients/cli/connections.c:5506
+#, c-format
+msgid "Error: 'mode': %s."
+msgstr "Error: 'modo': %s."
 
-#: ../clients/cli/connections.c:4572
-msgid "IPv4 protocol"
-msgstr ""
+# auto translated by TM merge from project: NetworkManager, version: 0.9.9.0, DocId: NetworkManager
+#: ../clients/cli/connections.c:5515
+#, c-format
+msgid "Error: 'primary': '%s' is not a valid interface name."
+msgstr "Error: 'primary': '%s' no es un nombre de interfaz válido."
 
-#: ../clients/cli/connections.c:4574
-msgid "IPv6 protocol"
-msgstr ""
+#: ../clients/cli/connections.c:5738
+#, c-format
+msgid "Error: 'stp': %s."
+msgstr "Error: 'stp': '%s'."
 
-#: ../clients/cli/connections.c:4657 ../clients/cli/utils.c:124
+#: ../clients/cli/connections.c:5747
 #, c-format
-msgid "Error: value for '%s' argument is required."
-msgstr "Error: se requiere valor para argumento '%s'."
+msgid "Error: 'multicast-snooping': %s."
+msgstr "Error: 'multicast-snooping': '%s'."
 
-#: ../clients/cli/connections.c:4663
-#, fuzzy, c-format
-msgid "Error: 'save': %s."
-msgstr "Error: 'stp': '%s'."
+#: ../clients/cli/connections.c:5866
+#, c-format
+msgid "Error: 'hairpin': %s."
+msgstr "Error: 'hairpin': '%s'."
+
+#: ../clients/cli/connections.c:5915
+msgid "Error: 'vpn-type' is required."
+msgstr "Error: se requiere 'vpn-type'."
+
+#: ../clients/cli/connections.c:5922
+#, c-format
+msgid "Warning: 'vpn-type': %s not known.\n"
+msgstr "Advertencia: 'vpn-type': %s desconocido.\n"
+
+#: ../clients/cli/connections.c:5983
+#, c-format
+msgid "Error: 'channel': '%s' is not valid; use <1-13>."
+msgstr "Error: 'channel': '%s' no es válido; use <1-13>."
+
+#: ../clients/cli/connections.c:6034
+msgid "Username: "
+msgstr "Nombre de usuario:"
+
+#: ../clients/cli/connections.c:6043
+#, c-format
+msgid "Protocol %s"
+msgstr "Protocolo %s"
+
+#: ../clients/cli/connections.c:6046
+msgid "Error: 'protocol' is required."
+msgstr "Error: se requiere 'protocol'."
+
+#: ../clients/cli/connections.c:6105
+msgid "MACVLAN parent device or connection UUID: "
+msgstr "Dispositivo principal MACVLAN o UUID de conexión: "
+
+#: ../clients/cli/connections.c:6125 ../clients/cli/connections.c:6205
+#: ../clients/cli/connections.c:6307
+msgid "Error: 'mode' is required."
+msgstr "Error: se requiere 'mode'."
+
+#: ../clients/cli/connections.c:6131
+msgid "Error: 'mode' is not valid."
+msgstr "Error: 'mode' no es válido."
+
+#: ../clients/cli/connections.c:6144
+#, c-format
+msgid "Error: 'tap': %s."
+msgstr "Error: 'tap': '%s'."
+
+#: ../clients/cli/connections.c:6230
+#, c-format
+msgid "Error: 'pi': %s."
+msgstr "Error: 'pi': '%s'."
 
-#: ../clients/cli/connections.c:4732
-#, fuzzy, c-format
-msgid "Error: '%s' argument is required."
+#: ../clients/cli/connections.c:6241
+#, c-format
+msgid "Error: 'vnet-hdr': %s."
+msgstr "Error: 'vnet-hdr': %s."
+
+#: ../clients/cli/connections.c:6252
+#, c-format
+msgid "Error: 'multi-queue': %s."
+msgstr "Error: 'multi-queue': %s."
+
+#: ../clients/cli/connections.c:6321
+#, c-format
+msgid "Error: 'mode': '%s' is not valid, use one of %s"
+msgstr "Error: 'mode': '%s' no es válido; use uno de %s "
+
+#: ../clients/cli/connections.c:6327
+msgid "Remote endpoint: "
+msgstr "Punto final remoto:"
+
+#: ../clients/cli/connections.c:6330 ../clients/cli/connections.c:6432
+msgid "Error: 'remote' is required."
+msgstr "Error: se requiere 'remote'."
+
+#: ../clients/cli/connections.c:6337
+#, c-format
+msgid "Error: 'remote': '%s' is not valid; must be an IP address"
+msgstr "Error: 'remote': '%s' no es válido; debe er una dirección IP"
+
+#: ../clients/cli/connections.c:6351
+#, c-format
+msgid "Error: 'local': '%s' is not valid; must be an IP address"
+msgstr "Error: 'local': '%s' no es válido; debe ser una dirección IP"
+
+#: ../clients/cli/connections.c:6360 ../clients/cli/connections.c:6455
+#, c-format
+msgid "Error: 'dev': '%s' is neither UUID nor interface name."
+msgstr "Error: 'dev': '%s' no es ni UUID ni nombre de interfaz."
+
+#: ../clients/cli/connections.c:6421
+msgid "VXLAN ID: "
+msgstr "ID de VLAN:"
+
+#: ../clients/cli/connections.c:6429
+msgid "Remote: "
+msgstr "Remoto:"
+
+#: ../clients/cli/connections.c:6438
+#, c-format
+msgid "Error: 'id': '%s' is not valid; use <0-16777215>."
+msgstr "Error: 'id': '%s' no es válido; use <0-16777215>."
+
+#: ../clients/cli/connections.c:6464
+#, c-format
+msgid "Error: 'remote': '%s' is not a valid IP address"
+msgstr "Error: 'remote': '%s' no es una dirección IP válida."
+
+#: ../clients/cli/connections.c:6473
+#, c-format
+msgid "Error: 'local': '%s' is not a valid IP address"
+msgstr "Error: 'local': '%s' no es una dirección MAC IP válida."
+
+#: ../clients/cli/connections.c:6482
+#, c-format
+msgid "Error: 'source-port-min': %s is not valid; use <0-65535>."
+msgstr "Error: 'source-port-min': '%s' no es válido; use  <0-65535>."
+
+#: ../clients/cli/connections.c:6491
+#, c-format
+msgid "Error: 'source-port-max': %s is not valid; use <0-65535>."
+msgstr "Error: 'source-port-max': %s no es válido; use  <0-65535>."
+
+#: ../clients/cli/connections.c:6500
+#, c-format
+msgid "Error: 'destination-port': %s is not valid; use <0-65535>."
+msgstr "Error: 'destination-port': %s' no es válido; use  <0-65535>."
+
+#: ../clients/cli/connections.c:6540
+#, c-format
+msgid "Error: '%s' is not a valid connection type."
+msgstr "Error: '%s' no es un tipo de conexión válida."
+
+#: ../clients/cli/connections.c:6581
+#, c-format
+msgid "Error: IPv4 gateway specified without IPv4 addresses"
+msgstr "Error: puerta de enlace IPv4 fue especificada sin direcciones IPv4"
+
+#: ../clients/cli/connections.c:6585
+#, c-format
+msgid "Error: multiple IPv4 gateways specified"
+msgstr "Error: se especificaron múltiples puertas de enlace IPv4"
+
+#: ../clients/cli/connections.c:6589
+#, c-format
+msgid "Error: Invalid IPv4 gateway '%s'"
+msgstr "Error: Puerta de enlace IPv4 inválida '%s'"
+
+#: ../clients/cli/connections.c:6614
+#, c-format
+msgid "Error: IPv6 gateway specified without IPv6 addresses"
+msgstr "Error: puerta de enlace IPv6 fue especificada sin direcciones IPv6"
+
+#: ../clients/cli/connections.c:6618
+#, c-format
+msgid "Error: multiple IPv6 gateways specified"
+msgstr "Error: se especificaron múltiples puertas de enlace IPv6"
+
+#: ../clients/cli/connections.c:6622
+#, c-format
+msgid "Error: Invalid IPv6 gateway '%s'"
+msgstr "Error: Puerta de enlace IPv6 es inválida '%s'"
+
+#: ../clients/cli/connections.c:6670 ../clients/cli/connections.c:10223
+#, c-format
+msgid "Error: Failed to add '%s' connection: %s"
+msgstr "Error: No se pudo agregar conexión'%s': %s"
+
+#: ../clients/cli/connections.c:6675
+#, c-format
+msgid "Connection '%s' (%s) successfully added.\n"
+msgstr "Conexión '%s' (%s) agregada con éxito.\n"
+
+#: ../clients/cli/connections.c:6951 ../clients/cli/connections.c:10678
+#, c-format
+msgid "Error: 'type' argument is required."
 msgstr "Error: se requiere argumento 'type'."
 
-#: ../clients/cli/connections.c:5701
+#: ../clients/cli/connections.c:6959
+#, c-format
+msgid "Error: invalid connection type; %s."
+msgstr "Error: tipo de conexión inválido; %s."
+
+#: ../clients/cli/connections.c:6968 ../clients/cli/devices.c:2164
+#, c-format
+msgid "Error: 'autoconnect': %s."
+msgstr "Error: 'autoconnect': %s."
+
+#: ../clients/cli/connections.c:6978
+#, c-format
+msgid "Error: 'save': %s."
+msgstr "Error: 'save': %s."
+
+#: ../clients/cli/connections.c:6995
+msgid "Interface name [*]: "
+msgstr "Nombre de interfaz [*]: "
+
+#: ../clients/cli/connections.c:7000
+#, c-format
+msgid "Error: 'ifname' argument is required."
+msgstr "Error: argumento 'ifname' es requerido."
+
+#: ../clients/cli/connections.c:7002
+#, c-format
+msgid "Error: mandatory 'ifname' not seen before '%s'."
+msgstr "Error: 'ifname' obligatorio no se había visto antes '%s'."
+
+#: ../clients/cli/connections.c:7011
+#, c-format
+msgid "Error: 'ifname': '%s' is not a valid interface nor '*'."
+msgstr "Error: 'ifname': '%s' no es una interfaz válida ni '*'."
+
+#: ../clients/cli/connections.c:8035
 #, c-format
 msgid "['%s' setting values]\n"
 msgstr "['%s' setting values]\n"
 
 #. TRANSLATORS: do not translate command names and keywords before ::
 #. *              However, you should translate terms enclosed in <>.
-#.
-#: ../clients/cli/connections.c:5783
-#, fuzzy, c-format
+#. 
+#: ../clients/cli/connections.c:8117
+#, c-format
 msgid ""
 "---[ Main menu ]---\n"
 "goto     [<setting> | <prop>]        :: go to a setting or property\n"
@@ -2410,21 +2902,21 @@ msgid ""
 "quit                                 :: exit nmcli\n"
 msgstr ""
 "---[ Menú principal ]---\n"
-"goto     [<setting> | <prop>]        :: va a un parámetro o propiedad\n"
-"remove   <setting>[.<prop>] | <prop> :: retira parámetro o restablecer valor "
-"de propiedad\n"
-"set      [<setting>.<prop> <value>]  :: establece valor de propiedad\n"
-"describe [<setting>.<prop>]          :: describe propiedad\n"
-"print    [all]                       :: imprime en pantalla la conexión\n"
-"verify   [all]                       :: verifica la conexión\n"
-"save                                 :: guarda la conexión\n"
-"activate [<ifname>] [/<ap>|<nsp>]    :: activa la conexión\n"
-"back                                 :: va un nivel atrás (back)\n"
-"help/?   [<command>]                 :: imprime en pantalla esta ayuda\n"
-"nmcli    <conf-option> <value>       :: configuración nmcli\n"
-"quit                                 :: sale de nmcli\n"
-
-#: ../clients/cli/connections.c:5810
+"goto     [<setting> | <prop>]        :: ir a parámetro o propiedad\n"
+"remove   <setting>[.<prop>] | <prop> :: retirar parámetro o restablecer "
+"valor de propiedad\n"
+"set      [<setting>.<prop> <value>]  :: establecer valor de propiedad\n"
+"describe [<setting>.<prop>]          :: describir propiedad\n"
+"print    [all | <setting>[.<prop>]]  :: imprimir la conexión\n"
+"verify   [all | fix]                 :: verificar la conexión\n"
+"save     [persistent|temporary]      :: guardar la conexión\n"
+"activate [<ifname>] [/<ap>|<nsp>]    :: activar la conexión\n"
+"back                                 :: ir a un nivel superior (back)\n"
+"help/?   [<command>]                 :: imprimir esta ayuda\n"
+"nmcli    <conf-option> <value>       :: configuración nmcli \n"
+"quit                                 :: salir de nmcli\n"
+
+#: ../clients/cli/connections.c:8144
 #, c-format
 msgid ""
 "goto <setting>[.<prop>] | <prop>  :: enter setting/property for editing\n"
@@ -2444,13 +2936,12 @@ msgstr ""
 "          nmcli connection> goto secondaries\n"
 "          nmcli> goto ipv4.addresses\n"
 
-#: ../clients/cli/connections.c:5817
+#: ../clients/cli/connections.c:8151
 #, c-format
 msgid ""
 "remove <setting>[.<prop>]  :: remove setting or reset property value\n"
 "\n"
-"This command removes an entire setting from the connection, or if a "
-"property\n"
+"This command removes an entire setting from the connection, or if a property\n"
 "is given, resets that property to the default value.\n"
 "\n"
 "Examples: nmcli> remove wifi-sec\n"
@@ -2466,7 +2957,7 @@ msgstr ""
 "Ejemplos: nmcli> remove wifi-sec\n"
 "          nmcli> remove eth.mtu\n"
 
-#: ../clients/cli/connections.c:5824
+#: ../clients/cli/connections.c:8158
 #, c-format
 msgid ""
 "set [<setting>.<prop> <value>]  :: set property value\n"
@@ -2481,7 +2972,7 @@ msgstr ""
 "\n"
 "Ejemplo: nmcli> set con.id My connection\n"
 
-#: ../clients/cli/connections.c:5829
+#: ../clients/cli/connections.c:8163
 #, c-format
 msgid ""
 "describe [<setting>.<prop>]  :: describe property\n"
@@ -2494,7 +2985,7 @@ msgstr ""
 "Muestra la descripción de la propiedad. Puede consultar la página de manual "
 "nm-settings(5) para ver todos los parámetros y propiedades NM.\n"
 
-#: ../clients/cli/connections.c:5834
+#: ../clients/cli/connections.c:8168
 #, c-format
 msgid ""
 "print [all]  :: print setting or connection values\n"
@@ -2509,14 +3000,13 @@ msgstr ""
 "\n"
 "Ejemplo: nmcli ipv4> print all\n"
 
-#: ../clients/cli/connections.c:5839
-#, fuzzy, c-format
+#: ../clients/cli/connections.c:8173
+#, c-format
 msgid ""
 "verify [all | fix]  :: verify setting or connection validity\n"
 "\n"
 "Verifies whether the setting or connection is valid and can be saved later.\n"
-"It indicates invalid values on error. Some errors may be fixed "
-"automatically\n"
+"It indicates invalid values on error. Some errors may be fixed automatically\n"
 "by 'fix' option.\n"
 "\n"
 "Examples: nmcli> verify\n"
@@ -2526,12 +3016,14 @@ msgstr ""
 "verify [all]  :: verifica parámetros o validez de conexión\n"
 "\n"
 "Verifica si los parámetros o la conexión son válidos y si pueden guardarse "
-"más adelante. Indica valores inválidos en error.\n"
+"más adelante. Indica valores inválidos en error. Algunos errores pueden "
+"corregirse de forma automática.\n"
 "\n"
 "Ejemplos: nmcli> verify\n"
-"          nmcli bond> verify\n"
+"           nmcli> verify fix        \n"
+"           nmcli bond> verify          \n"
 
-#: ../clients/cli/connections.c:5848
+#: ../clients/cli/connections.c:8182
 #, c-format
 msgid ""
 "save [persistent|temporary]  :: save the connection\n"
@@ -2546,8 +3038,19 @@ msgid ""
 "connection\n"
 "profile must be deleted.\n"
 msgstr ""
+"save [persistent|temporary]  :: save the connection\n"
+"\n"
+"Envía el perfil de conexión a NetworkManager que lo guardará de forma "
+"persistente o lo mantendrá en memoria. 'save' sin un argumento significa\n"
+"'save persistent'.\n"
+"Observe que una vez que haya guardado el perfil de forma persistente dichos "
+"parámetros se guardan a través del reinicio o rearranque. Los cambios "
+"subsiguientes pueden también ser temporales o persistentes,  pero los "
+"cambios temporales no serán persistentes a través del reinicio arranque. Si "
+"desea retirar completamente la conexión persistente, el perfil de conexión "
+"debe ser borrado.\n"
 
-#: ../clients/cli/connections.c:5859
+#: ../clients/cli/connections.c:8193
 #, c-format
 msgid ""
 "activate [<ifname>] [/<ap>|<nsp>]  :: activate the connection\n"
@@ -2568,26 +3071,22 @@ msgstr ""
 "/<ap>|<nsp> - AP (Wi-Fi) or NSP (WiMAX) (prepend with / when <ifname> is not "
 "specified)\n"
 
-#: ../clients/cli/connections.c:5866 ../clients/cli/connections.c:6025
+#: ../clients/cli/connections.c:8200 ../clients/cli/connections.c:8359
 #, c-format
-msgid ""
-"back  :: go to upper menu level\n"
+msgid "back  :: go to upper menu level\n"
 "\n"
-msgstr ""
-"back  :: va a un nivel superior del menú\n"
+msgstr "back  :: va a un nivel superior del menú\n"
 "\n"
 
-#: ../clients/cli/connections.c:5869
+#: ../clients/cli/connections.c:8203
 #, c-format
-msgid ""
-"help/? [<command>]  :: help for the nmcli commands\n"
+msgid "help/? [<command>]  :: help for the nmcli commands\n"
 "\n"
-msgstr ""
-"help/? [<command>]  :: ayuda para los comandos nmcli\n"
+msgstr "help/? [<command>]  :: ayuda para los comandos nmcli\n"
 "\n"
 
-#: ../clients/cli/connections.c:5872
-#, fuzzy, c-format
+#: ../clients/cli/connections.c:8206
+#, c-format
 msgid ""
 "nmcli [<conf-option> <value>]  :: nmcli configuration\n"
 "\n"
@@ -2601,18 +3100,19 @@ msgid ""
 "          nmcli> nmcli save-confirmation no\n"
 "          nmcli> nmcli prompt-color 3\n"
 msgstr ""
-"nmcli [<conf-option> <value>]  :: configuración nmcli\n"
+"nmcli [<conf-option> <value>]  :: configuración nmcli \n"
 "\n"
 "Configura nmcli. Las siguientes opciones están disponibles:\n"
-"status-line yes | no        [default: no]\n"
-"save-confirmation yes | no  [default: yes]\n"
-"prompt-color <0-8>          [default: 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"
-"Ejemplos: nmcli> nmcli status-line yes\n"
+"Examples: nmcli> nmcli status-line yes\n"
 "          nmcli> nmcli save-confirmation no\n"
 "          nmcli> nmcli prompt-color 3\n"
 
-#: ../clients/cli/connections.c:5894 ../clients/cli/connections.c:6031
+#: ../clients/cli/connections.c:8228 ../clients/cli/connections.c:8365
 #, c-format
 msgid ""
 "quit  :: exit nmcli\n"
@@ -2625,16 +3125,16 @@ msgstr ""
 "Este comando sale de nmcli. Cuando la conexión es editada no se guarda, se "
 "le pide al usuario que confirme la acción.\n"
 
-#: ../clients/cli/connections.c:5899 ../clients/cli/connections.c:6036
-#: ../clients/cli/connections.c:6460 ../clients/cli/connections.c:7407
+#: ../clients/cli/connections.c:8233 ../clients/cli/connections.c:8370
+#: ../clients/cli/connections.c:8794 ../clients/cli/connections.c:9742
 #, c-format
 msgid "Unknown command: '%s'\n"
 msgstr "Comando desconocido: '%s'\n"
 
 #. TRANSLATORS: do not translate command names and keywords before ::
 #. *              However, you should translate terms enclosed in <>.
-#.
-#: ../clients/cli/connections.c:5965
+#. 
+#: ../clients/cli/connections.c:8299
 #, c-format
 msgid ""
 "---[ Property menu ]---\n"
@@ -2662,7 +3162,7 @@ msgstr ""
 "descripción del comando\n"
 "quit                             :: sale de nmcli\n"
 
-#: ../clients/cli/connections.c:5990
+#: ../clients/cli/connections.c:8324
 #, c-format
 msgid ""
 "set [<value>]  :: set new value\n"
@@ -2673,8 +3173,8 @@ msgstr ""
 "\n"
 "Este comando establece <value> provisto a esta propiedad\n"
 
-#: ../clients/cli/connections.c:5994
-#, fuzzy, c-format
+#: ../clients/cli/connections.c:8328
+#, c-format
 msgid ""
 "add [<value>]  :: append new value to the property\n"
 "\n"
@@ -2685,10 +3185,10 @@ msgstr ""
 "add [<value>]  :: add new option to the property\n"
 "\n"
 "Este comando agrega el <value> provisto para esta propiedad, si la propiedad "
-"es de un tipo de contenedor. Para propiedades de un solo valor, este comando "
-"remplaza el valor (igual que 'set').\n"
+"es de un tipo de contenedor. Para propiedades de un solo valor, el valor de "
+"la propiedad es remplazado (igual que 'set').\n"
 
-#: ../clients/cli/connections.c:6000
+#: ../clients/cli/connections.c:8334
 #, c-format
 msgid ""
 "change  :: change current value\n"
@@ -2699,7 +3199,7 @@ msgstr ""
 "\n"
 "Despliega el valor actual y permite editarlo.\n"
 
-#: ../clients/cli/connections.c:6004
+#: ../clients/cli/connections.c:8338
 #, c-format
 msgid ""
 "remove [<value>|<index>|<option name>]  :: delete the value\n"
@@ -2718,9 +3218,23 @@ msgid ""
 "          nmcli bond.options> remove downdelay\n"
 "\n"
 msgstr ""
+"remove [<value>|<index>|<option name>]  :: delete the value\n"
+"\n"
+"Retira el valor de propiedad. Para las propiedades single-valued, establece "
+"la propiedad a su valor predeterminado. Para las propiedades de container-"
+"type, retira todos los valores de esa propiedad o  especifica un argumento "
+"para retirar únicamente un ítem u opción. El argumento es un valor o un "
+"índice del ítem u opción. El argumento puede ser un valor o índice del ítem "
+"para retirar o un nombre de opción (para propiedades con opciones "
+"denominadas).\n"
+"\n"
+"Ejemplos: nmcli ipv4.dns> remove 8.8.8.8\n"
+"          nmcli ipv4.dns> remove 2\n"
+"          nmcli bond.options> remove downdelay\n"
+"\n"
 
 # auto translated by TM merge from project: NetworkManager, version: 0.9.9.0, DocId: NetworkManager
-#: ../clients/cli/connections.c:6015
+#: ../clients/cli/connections.c:8349
 #, c-format
 msgid ""
 "describe  :: describe property\n"
@@ -2733,7 +3247,7 @@ msgstr ""
 "Muestra la descripción de la propiedad. Puede consultar la página de manual "
 "nm-settings(5) para ver todos los parámetros y propiedades NM.\n"
 
-#: ../clients/cli/connections.c:6020
+#: ../clients/cli/connections.c:8354
 #, c-format
 msgid ""
 "print [property|setting|connection]  :: print property (setting, connection) "
@@ -2749,33 +3263,35 @@ msgstr ""
 "desplegar valores para toda la configuración o conexión.\n"
 
 # auto translated by TM merge from project: NetworkManager, version: 0.9.9.0, DocId: NetworkManager
-#: ../clients/cli/connections.c:6028
+#: ../clients/cli/connections.c:8362
 #, c-format
-msgid ""
-"help/? [<command>]  :: help for nmcli commands\n"
+msgid "help/? [<command>]  :: help for nmcli commands\n"
 "\n"
-msgstr ""
-"help/? [<command>]  :: ayuda para los comandos nmcli\n"
+msgstr "help/? [<command>]  :: ayuda para los comandos nmcli\n"
 "\n"
 
-#: ../clients/cli/connections.c:6209
+#: ../clients/cli/connections.c:8460
+#, c-format
+msgid "Error: Connection activation failed.\n"
+msgstr "Error: falló la activación de la conexión.\n"
+
+#: ../clients/cli/connections.c:8543
 #, c-format
 msgid "Error: setting '%s' is mandatory and cannot be removed.\n"
 msgstr "Error: parámetro '%s' es obligatorio y no puede ser retirado.\n"
 
 #. TRANSLATORS: status line in nmcli connection editor
-#: ../clients/cli/connections.c:6227
-#, fuzzy, c-format
+#: ../clients/cli/connections.c:8561
+#, c-format
 msgid "[ Type: %s | Name: %s | UUID: %s | Dirty: %s | Temp: %s ]\n"
-msgstr "[ Connection type: %s | name: %s | UUID: %s | dirty: %s ]\n"
+msgstr "[ Type: %s | Name: %s | UUID: %s | Dirty: %s | Temp: %s ]\n"
 
-#: ../clients/cli/connections.c:6263
-#, fuzzy, c-format
+#: ../clients/cli/connections.c:8597
+#, c-format
 msgid "The connection is not saved. Do you really want to quit? %s"
-msgstr ""
-"La conexión no es ha guardado. ¿Está seguro de que quiere salir? [s/n]\n"
+msgstr "La conexión no se ha guardado. ¿Está seguro de que quiere salir? %s"
 
-#: ../clients/cli/connections.c:6312
+#: ../clients/cli/connections.c:8646
 #, c-format
 msgid ""
 "The connection profile has been removed from another client. You may type "
@@ -2784,82 +3300,84 @@ msgstr ""
 "El perfil de conexiones ha sido retirado de otro cliente. Puede escribir "
 "'save' en el menú principal para restaurarlo.\n"
 
-#: ../clients/cli/connections.c:6337 ../clients/cli/connections.c:6758
-#: ../clients/cli/connections.c:6816
+#: ../clients/cli/connections.c:8671 ../clients/cli/connections.c:9093
+#: ../clients/cli/connections.c:9151
 #, c-format
 msgid "Allowed values for '%s' property: %s\n"
 msgstr "Valores permitidos para '%s' propiedad: %s\n"
 
-#: ../clients/cli/connections.c:6341 ../clients/cli/connections.c:6762
-#: ../clients/cli/connections.c:6820
+#: ../clients/cli/connections.c:8675 ../clients/cli/connections.c:9097
+#: ../clients/cli/connections.c:9155
 #, c-format
 msgid "Enter '%s' value: "
 msgstr "Ingresar el valor '%s': "
 
-#: ../clients/cli/connections.c:6356 ../clients/cli/connections.c:6378
-#: ../clients/cli/connections.c:6766 ../clients/cli/connections.c:6825
+#: ../clients/cli/connections.c:8690 ../clients/cli/connections.c:8712
+#: ../clients/cli/connections.c:9101 ../clients/cli/connections.c:9160
 #, c-format
 msgid "Error: failed to set '%s' property: %s\n"
-msgstr "Error: falló al establecer '%s' propiedad: %s\n"
+msgstr "Error: No se pudo establecer '%s' propiedad: %s\n"
 
-#: ../clients/cli/connections.c:6372
+#: ../clients/cli/connections.c:8706
 #, c-format
 msgid "Edit '%s' value: "
 msgstr "Modificar el valor '%s': "
 
-#: ../clients/cli/connections.c:6401
+#: ../clients/cli/connections.c:8735
 #, c-format
 msgid "Error: %s\n"
 msgstr "Error: %s\n"
 
-#: ../clients/cli/connections.c:6407 ../clients/cli/connections.c:6907
-#: ../clients/cli/connections.c:6955
+#: ../clients/cli/connections.c:8741 ../clients/cli/connections.c:9242
+#: ../clients/cli/connections.c:9290
 #, c-format
 msgid "Error: failed to remove value of '%s': %s\n"
-msgstr "Error: falló al retirar el valor de '%s': %s\n"
+msgstr "Error: No se pudo retirar el valor de '%s': %s\n"
 
-#: ../clients/cli/connections.c:6428
+#: ../clients/cli/connections.c:8762
 #, c-format
 msgid "Unknown command argument: '%s'\n"
 msgstr "Argumento desconocido de comando: '%s'\n"
 
-#: ../clients/cli/connections.c:6533
+#: ../clients/cli/connections.c:8867
 #, c-format
 msgid "Available settings: %s\n"
 msgstr "Parámetros disponibles: %s\n"
 
-#: ../clients/cli/connections.c:6545
+#: ../clients/cli/connections.c:8879
 #, c-format
 msgid "Error: invalid setting name; %s\n"
 msgstr "Error: nombre de parámetro inválido; %s\n"
 
-#: ../clients/cli/connections.c:6562
+#: ../clients/cli/connections.c:8896
 #, c-format
 msgid "Available properties: %s\n"
 msgstr "Propiedades disponibles: %s\n"
 
-#: ../clients/cli/connections.c:6570
+#: ../clients/cli/connections.c:8904
 #, c-format
 msgid "Error: property %s\n"
 msgstr "Error: propiedad %s\n"
 
-#: ../clients/cli/connections.c:6611
-#, fuzzy, c-format
+#: ../clients/cli/connections.c:8945
+#, 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 ""
 "Guardando la conexión con 'autoconnect=yes'. Esto podría activar la conexión "
-"de forma inmediata.\n"
-"¿Aún desea guardar? [yes] "
+"de forma inmediata.                                \n"
+"¿Aún desea guardar?  %s                                                      "
+"                                                                             "
+"                                     "
 
-#: ../clients/cli/connections.c:6700
+#: ../clients/cli/connections.c:9035
 #, c-format
 msgid "You may edit the following settings: %s\n"
 msgstr "Puede modificar los siguientes parámetros: %s\n"
 
-#: ../clients/cli/connections.c:6728
+#: ../clients/cli/connections.c:9063
 #, c-format
 msgid ""
 "The connection profile has been removed from another client. You may type "
@@ -2868,220 +3386,219 @@ msgstr ""
 "El perfil de conexión ha sido retirado de otro cliente. Puede escribir "
 "'save' para restaurarlo.\n"
 
-#: ../clients/cli/connections.c:6770 ../clients/cli/connections.c:7000
+#: ../clients/cli/connections.c:9105 ../clients/cli/connections.c:9335
 #, c-format
 msgid "Error: no setting selected; valid are [%s]\n"
 msgstr "Error: no se ha seleccionado parámetro; los válidos son [%s]\n"
 
-#: ../clients/cli/connections.c:6771
+#: ../clients/cli/connections.c:9106
 #, c-format
 msgid "use 'goto <setting>' first, or 'set <setting>.<property>'\n"
 msgstr "utilice 'goto <setting>' primero, o 'set <setting>.<property>'\n"
 
-#: ../clients/cli/connections.c:6785 ../clients/cli/connections.c:6934
-#: ../clients/cli/connections.c:7022
+#: ../clients/cli/connections.c:9120 ../clients/cli/connections.c:9269
+#: ../clients/cli/connections.c:9357
 #, c-format
 msgid "Error: invalid setting argument '%s'; valid are [%s]\n"
 msgstr "Error: argumento de parámetros inválido '%s'; los validos son [%s]\n"
 
-#: ../clients/cli/connections.c:6795
+#: ../clients/cli/connections.c:9130
 #, c-format
 msgid "Error: missing setting for '%s' property\n"
 msgstr "Error: No se encuentra la propiedad '%s'\n"
 
-#: ../clients/cli/connections.c:6802
+#: ../clients/cli/connections.c:9137
 #, c-format
 msgid "Error: invalid property: %s\n"
 msgstr "Error: propiedad inválida: %s\n"
 
-#: ../clients/cli/connections.c:6855
+#: ../clients/cli/connections.c:9190
 #, c-format
 msgid "Error: unknown setting '%s'\n"
 msgstr "Error: parámetro desconocido '%s'\n"
 
-#: ../clients/cli/connections.c:6868
+#: ../clients/cli/connections.c:9203
 #, c-format
 msgid "You may edit the following properties: %s\n"
 msgstr "Puede modificar los siguientes parámetros: %s\n"
 
-#: ../clients/cli/connections.c:6912
+#: ../clients/cli/connections.c:9247
 #, c-format
 msgid "Error: no argument given; valid are [%s]\n"
 msgstr "Error: no se ha proporcionado argumento; los válidos son [%s]\n"
 
-#: ../clients/cli/connections.c:6931
+#: ../clients/cli/connections.c:9266
 #, c-format
 msgid "Setting '%s' is not present in the connection.\n"
 msgstr "El parámetro '%s' no está presente en la conexión.\n"
 
-#: ../clients/cli/connections.c:6976
+#: ../clients/cli/connections.c:9311
 #, c-format
 msgid "Error: %s properties, nor it is a setting name.\n"
 msgstr "Error: %s propiedades, no es un nombre de parámetro.\n"
 
-#: ../clients/cli/connections.c:7001
+#: ../clients/cli/connections.c:9336
 #, c-format
 msgid "use 'goto <setting>' first, or 'describe <setting>.<property>'\n"
 msgstr "utilice 'goto <setting>' primero, o 'describe <setting>.<property>'\n"
 
-#: ../clients/cli/connections.c:7050
+#: ../clients/cli/connections.c:9385
 #, c-format
 msgid "Error: invalid property: %s, neither a valid setting name.\n"
 msgstr "Error: propiedad inválida: %s, no es un nombre de parámetro válido.\n"
 
-#: ../clients/cli/connections.c:7082
+#: ../clients/cli/connections.c:9417
 #, c-format
 msgid "Error: unknown setting: '%s'\n"
 msgstr "Error: parámetro desconocido: '%s'\n"
 
-#: ../clients/cli/connections.c:7087
-#, fuzzy, c-format
+#: ../clients/cli/connections.c:9422
+#, c-format
 msgid "Error: '%s' setting not present in the connection\n"
 msgstr "El parámetro '%s' no está presente en la conexión.\n"
 
-#: ../clients/cli/connections.c:7115
-#, fuzzy, c-format
+#: ../clients/cli/connections.c:9450
+#, c-format
 msgid "Error: invalid property: %s%s\n"
-msgstr "Error: propiedad inválida: %s\n"
+msgstr "Error: propiedad inválida: %s%s\n"
 
-#: ../clients/cli/connections.c:7117
-#, fuzzy
+#: ../clients/cli/connections.c:9452
 msgid ", neither a valid setting name"
-msgstr "Error: propiedad inválida: %s, no es un nombre de parámetro válido.\n"
+msgstr ", ni un nombre de parámetro válido."
 
-#: ../clients/cli/connections.c:7134
-#, fuzzy, c-format
+#: ../clients/cli/connections.c:9469
+#, c-format
 msgid "Invalid verify option: %s\n"
-msgstr "Opción inválida: '%s'"
+msgstr "Opción de verificación inválida: %s\n"
 
-#: ../clients/cli/connections.c:7142
+#: ../clients/cli/connections.c:9477
 #, c-format
 msgid "Verify setting '%s': %s\n"
 msgstr "Verificar parámetro '%s': %s\n"
 
-#: ../clients/cli/connections.c:7157
+#: ../clients/cli/connections.c:9492
 #, c-format
 msgid "Verify connection: %s\n"
 msgstr "Verificar conexión: %s\n"
 
-#: ../clients/cli/connections.c:7160
+#: ../clients/cli/connections.c:9495
 #, c-format
 msgid "The error cannot be fixed automatically.\n"
-msgstr ""
+msgstr "El error no puede corregirse de forma automática.\n"
 
-#: ../clients/cli/connections.c:7177
-#, fuzzy, c-format
+#: ../clients/cli/connections.c:9512
+#, c-format
 msgid "Error: invalid argument '%s'\n"
-msgstr "Error: invalid extra argument '%s'."
+msgstr "Error: argumento inválido '%s'\n"
 
-#: ../clients/cli/connections.c:7210
-#, fuzzy, c-format
+#: ../clients/cli/connections.c:9545
+#, c-format
 msgid "Error: Failed to save '%s' (%s) connection: %s\n"
-msgstr "Error: Falló al guardar '%s' (%s) conexión: (%d) %s\n"
+msgstr "Error: No se pudo guardar la conexión '%s' (%s): %s\n"
 
 # auto translated by TM merge from project: NetworkManager, version: 0.9.9.0, DocId: NetworkManager
-#: ../clients/cli/connections.c:7217
+#: ../clients/cli/connections.c:9552
 #, c-format
 msgid "Connection '%s' (%s) successfully saved.\n"
 msgstr "Conexión '%s' (%s) guardada con éxito.\n"
 
-#: ../clients/cli/connections.c:7218
-#, fuzzy, c-format
+#: ../clients/cli/connections.c:9553
+#, c-format
 msgid "Connection '%s' (%s) successfully updated.\n"
-msgstr "Conexión '%s' (%s) agregada con éxito.\n"
+msgstr "Conexión '%s' (%s) actualizada con éxito.\n"
 
-#: ../clients/cli/connections.c:7251
+#: ../clients/cli/connections.c:9586
 #, c-format
 msgid "Error: connection verification failed: %s\n"
 msgstr "Error: falló la verificación de conexión: %s\n"
 
 # auto translated by TM merge from project: evolution-data-server, version: el6, DocId: evolution-data-server-2.32
-#: ../clients/cli/connections.c:7252
+#: ../clients/cli/connections.c:9587
 msgid "(unknown error)"
 msgstr "(Error desconocido)"
 
-#: ../clients/cli/connections.c:7253
+#: ../clients/cli/connections.c:9588
 #, c-format
 msgid "You may try running 'verify fix' to fix errors.\n"
-msgstr ""
+msgstr "Intente ejecutar 'verify fix' para corregir errores.\n"
 
-#: ../clients/cli/connections.c:7275
+#: ../clients/cli/connections.c:9610
 #, c-format
 msgid "Error: connection is not saved. Type 'save' first.\n"
 msgstr "Error: la conexión no se ha guardado. Escriba primero 'save'.\n"
 
-#: ../clients/cli/connections.c:7279
+#: ../clients/cli/connections.c:9614
 #, c-format
 msgid "Error: connection is not valid: %s\n"
 msgstr "Error: conexión no es válida: %s\n"
 
-#: ../clients/cli/connections.c:7289
+#: ../clients/cli/connections.c:9624
 #, c-format
 msgid "Error: Cannot activate connection: %s.\n"
 msgstr "Error: no se puede activar conexión: %s.\n"
 
-#: ../clients/cli/connections.c:7299
-#, fuzzy, c-format
+#: ../clients/cli/connections.c:9634
+#, c-format
 msgid "Error: Failed to activate '%s' (%s) connection: %s\n"
-msgstr "Error: Falló al activar '%s' (%s) conexión: (%d) %s\n"
+msgstr "Error: Failed to activate '%s' (%s) connection: %s\n"
 
-#: ../clients/cli/connections.c:7305
+#: ../clients/cli/connections.c:9640
 #, c-format
 msgid "Monitoring connection activation (press any key to continue)\n"
 msgstr ""
 "Activación de conexión de monitorización (pulse cualquier tecla para "
 "continuar)\n"
 
-#: ../clients/cli/connections.c:7343
+#: ../clients/cli/connections.c:9678
 #, c-format
 msgid "Error: status-line: %s\n"
 msgstr "Error: status-line: %s\n"
 
-#: ../clients/cli/connections.c:7351
+#: ../clients/cli/connections.c:9686
 #, c-format
 msgid "Error: save-confirmation: %s\n"
 msgstr "Error: save-confirmation: %s\n"
 
-#: ../clients/cli/connections.c:7359
-#, fuzzy, c-format
+#: ../clients/cli/connections.c:9694
+#, c-format
 msgid "Error: show-secrets: %s\n"
-msgstr "Error: 'mostrar activas': %s"
+msgstr "Error: show-secrets: %s\n"
 
-#: ../clients/cli/connections.c:7368
-#, fuzzy, c-format
+#: ../clients/cli/connections.c:9703
+#, c-format
 msgid "Error: bad color: %s\n"
-msgstr "Error: propiedad inválida: %s\n"
+msgstr "Error: color errado: %s\n"
 
-#: ../clients/cli/connections.c:7382
+#: ../clients/cli/connections.c:9717
 #, c-format
 msgid "Current nmcli configuration:\n"
 msgstr "Configuración nmcli actual:\n"
 
-#: ../clients/cli/connections.c:7392
+#: ../clients/cli/connections.c:9727
 #, c-format
 msgid "Invalid configuration option '%s'; allowed [%s]\n"
 msgstr "Opción de configuración inválida '%s'; permitida [%s]\n"
 
-#: ../clients/cli/connections.c:7593
+#: ../clients/cli/connections.c:9982
 #, c-format
 msgid "Error: only one of 'id', uuid, or 'path' can be provided."
 msgstr "Error: solamente uno si 'id', uuid, o 'path' pueden proporcionarse."
 
-#: ../clients/cli/connections.c:7605 ../clients/cli/connections.c:7788
-#: ../clients/cli/connections.c:7795 ../clients/cli/connections.c:7929
-#: ../clients/cli/connections.c:8434
+#: ../clients/cli/connections.c:9994 ../clients/cli/connections.c:10171
+#: ../clients/cli/connections.c:10178 ../clients/cli/connections.c:10306
+#: ../clients/cli/connections.c:10782
 #, c-format
 msgid "Error: Unknown connection '%s'."
 msgstr "Error: Conexión desconocida '%s'."
 
-#: ../clients/cli/connections.c:7623
+#: ../clients/cli/connections.c:10012
 #, c-format
 msgid "Warning: editing existing connection '%s'; 'type' argument is ignored\n"
 msgstr ""
 "Advertencia: modificando la conexión existente '%s'; argumento 'type' se "
 "ignora\n"
 
-#: ../clients/cli/connections.c:7626
+#: ../clients/cli/connections.c:10015
 #, c-format
 msgid ""
 "Warning: editing existing connection '%s'; 'con-name' argument is ignored\n"
@@ -3089,242 +3606,227 @@ msgstr ""
 "Advertencia: modificando la conexión existente '%s'; argumento 'con-name' se "
 "ignora\n"
 
-#: ../clients/cli/connections.c:7640
+#: ../clients/cli/connections.c:10029
 #, c-format
 msgid "Valid connection types: %s\n"
 msgstr "Tipos de conexión válidos: %s\n"
 
-#: ../clients/cli/connections.c:7642
+#: ../clients/cli/connections.c:10031
 #, c-format
 msgid "Error: invalid connection type; %s\n"
 msgstr "Error: tipo de conexión no es válido; %s\n"
 
-#: ../clients/cli/connections.c:7681
+#: ../clients/cli/connections.c:10070
 #, c-format
 msgid "===| nmcli interactive connection editor |==="
 msgstr "===| nmcli interactive connection editor |==="
 
-#: ../clients/cli/connections.c:7684
+#: ../clients/cli/connections.c:10073
 #, c-format
 msgid "Editing existing '%s' connection: '%s'"
 msgstr "Modificar conexión '%s' existente: '%s'"
 
-#: ../clients/cli/connections.c:7686
+#: ../clients/cli/connections.c:10075
 #, c-format
 msgid "Adding a new '%s' connection"
 msgstr "Agregar una nueva conexión '%s'"
 
-#: ../clients/cli/connections.c:7688
+#: ../clients/cli/connections.c:10077
 #, c-format
 msgid "Type 'help' or '?' for available commands."
 msgstr "Escribir 'help' o '?' para comandos disponibles."
 
-#: ../clients/cli/connections.c:7690
+#: ../clients/cli/connections.c:10079
 #, c-format
 msgid "Type 'describe [<setting>.<prop>]' for detailed property description."
 msgstr ""
 "Escribir 'describe [<setting>.<prop>]' para descripción de propiedad "
 "detallada."
 
-#: ../clients/cli/connections.c:7728
-#, fuzzy, c-format
+#: ../clients/cli/connections.c:10117
+#, c-format
 msgid "Error: Failed to modify connection '%s': %s"
-msgstr "Error: Falló al modificar conexión '%s': (%d) %s"
+msgstr "Error: No se pudo modificar conexión '%s': %s"
 
-#: ../clients/cli/connections.c:7735
+#: ../clients/cli/connections.c:10124
 #, c-format
 msgid "Connection '%s' (%s) successfully modified.\n"
 msgstr "Conexión '%s' (%s) modificada con éxito.\n"
 
-#.
-#. * TODO(?) complete "uuid", "path", "id" or connection name.
-#. * (if we ever will move this here from shell completion script)
-#. if (nmc->complete) {
-#. quit ();
-#.
-#: ../clients/cli/connections.c:7761 ../clients/cli/connections.c:7885
-#: ../clients/cli/connections.c:8280 ../clients/cli/connections.c:8399
+#: ../clients/cli/connections.c:10146 ../clients/cli/connections.c:10262
+#: ../clients/cli/connections.c:10639 ../clients/cli/connections.c:10747
 #, c-format
 msgid "Error: No arguments provided."
 msgstr "Error: No se proporcionaron argumentos."
 
-#: ../clients/cli/connections.c:7847
+#: ../clients/cli/connections.c:10165 ../clients/cli/connections.c:10294
+#: ../clients/cli/connections.c:10776
+#, c-format
+msgid "Error: connection ID is missing."
+msgstr "Error: falta ID de conexión."
+
+#: ../clients/cli/connections.c:10228
 #, c-format
 msgid "%s (%s) cloned as %s (%s).\n"
-msgstr ""
+msgstr "%s (%s) clonado como %s (%s).\n"
 
-#: ../clients/cli/connections.c:7883
-#, fuzzy
+#: ../clients/cli/connections.c:10260
 msgid "New connection name: "
-msgstr "Nueva conexión"
+msgstr "Nuevo nombre de conexión:"
 
-#: ../clients/cli/connections.c:7904 ../clients/cli/connections.c:7922
-#, fuzzy, c-format
+#: ../clients/cli/connections.c:10281 ../clients/cli/connections.c:10299
+#, c-format
 msgid "Error: <new name> argument is missing."
-msgstr "Error: falta el argumento %s."
+msgstr "Error: falta el argumento <new name> "
 
-#: ../clients/cli/connections.c:7910
-#, fuzzy, c-format
+#: ../clients/cli/connections.c:10287
+#, c-format
 msgid "Error: unexpected extra argument '%s'."
-msgstr "Error: Argumento inesperado '%s'"
+msgstr "Error: Argumento adicional inesperado '%s'"
 
-#: ../clients/cli/connections.c:7917 ../clients/cli/connections.c:8428
+#: ../clients/cli/connections.c:10356
 #, c-format
-msgid "Error: connection ID is missing."
-msgstr "Error: falta ID de conexión."
-
-#: ../clients/cli/connections.c:7979
-#, fuzzy, c-format
 msgid "Error: not all connections deleted."
-msgstr "Error: no se especificó una conexión."
+msgstr "Error: no se borraron todas las conexiones."
 
-#: ../clients/cli/connections.c:7980
+#: ../clients/cli/connections.c:10357
 #, c-format
 msgid "Error: Connection deletion failed: %s"
 msgstr "Error: Falló el borrado de conexión: %s"
 
-#: ../clients/cli/connections.c:8046 ../clients/cli/connections.c:8179
-#, fuzzy, c-format
+#: ../clients/cli/connections.c:10419 ../clients/cli/connections.c:10547
+#, c-format
 msgid "Error: unknown connection '%s'\n"
-msgstr "Error: conexión desconocida: %s\n"
+msgstr "Error: conexión desconocida: '%s'\n"
 
-#: ../clients/cli/connections.c:8060
-#, fuzzy, c-format
+#: ../clients/cli/connections.c:10433
+#, c-format
 msgid "Error: no connection provided."
-msgstr "Error: no se especificó una conexión."
+msgstr "Error: no se proporcionó una conexión."
 
 #. truncate trailing ", "
-#: ../clients/cli/connections.c:8085
+#: ../clients/cli/connections.c:10458
 #, c-format
 msgid "Error: cannot delete unknown connection(s): %s."
-msgstr "Error: no se puede borrar conexión desconocida(s): %s."
+msgstr "Error: no se pueden borrar conexiones desconocidas: %s."
 
-#: ../clients/cli/connections.c:8097
-#, fuzzy, c-format
+#: ../clients/cli/connections.c:10470
+#, c-format
 msgid "%s: connection profile changed\n"
-msgstr "conexión falló"
+msgstr "%s: se cambió el perfil de conexión\n"
+"\n"
 
-#: ../clients/cli/connections.c:8123
-#, fuzzy, c-format
+#: ../clients/cli/connections.c:10496
+#, c-format
 msgid "%s: connection profile created\n"
-msgstr "conexión falló"
+msgstr "%s: se creó un perfil de conexión\n"
+"\n"
 
-#: ../clients/cli/connections.c:8132
-#, fuzzy, c-format
+#: ../clients/cli/connections.c:10505
+#, c-format
 msgid "%s: connection profile removed\n"
-msgstr "se eliminó la conexión"
+msgstr "%s: se retiró perfil de conexión\n"
+"\n"
 
-#: ../clients/cli/connections.c:8180
-#, fuzzy, c-format
+#: ../clients/cli/connections.c:10548
+#, c-format
 msgid "Error: not all connections found."
-msgstr "Error: '%s' no es un comando de 'connection' válido."
+msgstr "Error: no se encontraron todas las conexiones"
 
-#: ../clients/cli/connections.c:8205
-#, fuzzy, c-format
+#: ../clients/cli/connections.c:10571
+#, c-format
 msgid "Error: failed to reload connections: %s."
-msgstr "Error: Falló al agregar '%s' conexión: (%d) %s"
+msgstr "Error: No se pudo recargar las conexiones: %s."
 
-#: ../clients/cli/connections.c:8239
-#, fuzzy, c-format
+#: ../clients/cli/connections.c:10603
+#, c-format
 msgid "Error: failed to load connection: %s."
-msgstr "Error: Falló al agregar '%s' conexión: (%d) %s"
+msgstr "Error: No se pudo recargar la conexión: %s."
 
-#: ../clients/cli/connections.c:8247
+#: ../clients/cli/connections.c:10611
 #, c-format
 msgid "Could not load file '%s'\n"
 msgstr "No se pudo cargar archivo '%s'\n"
 
-#: ../clients/cli/connections.c:8256
-#, fuzzy
+#: ../clients/cli/connections.c:10620
 msgid "File to import: "
-msgstr "Falló al cifrar: %d."
+msgstr "No se pudo importar: "
 
-#: ../clients/cli/connections.c:8296
+#: ../clients/cli/connections.c:10655
 #, c-format
 msgid "Warning: 'type' already specified, ignoring extra one.\n"
-msgstr ""
+msgstr "Advertencia: 'type' ya fue especificado, ignorando el adicional.\n"
 
-#: ../clients/cli/connections.c:8307
+#: ../clients/cli/connections.c:10666
 #, c-format
 msgid "Warning: 'file' already specified, ignoring extra one.\n"
-msgstr ""
+msgstr "Advertencia: 'file' ya fue especificado, ignorando el adicional.\n"
+"\n"
 
-#: ../clients/cli/connections.c:8309
-#, fuzzy, c-format
+#: ../clients/cli/connections.c:10668
+#, c-format
 msgid "Unknown parameter: %s"
-msgstr "Parámetro desconocido: %s\n"
+msgstr "Parámetro desconocido: %s"
 
-#: ../clients/cli/connections.c:8319
+#: ../clients/cli/connections.c:10683
 #, c-format
-msgid "Error: 'type' argument is required."
-msgstr "Error: se requiere argumento 'type'."
-
-#: ../clients/cli/connections.c:8324
-#, fuzzy, c-format
 msgid "Error: 'file' argument is required."
-msgstr "Error: argumento 'ifname' es requerido."
+msgstr "Error: argumento 'file' es requerido."
 
-#: ../clients/cli/connections.c:8331
-#, fuzzy, c-format
-msgid "Error: failed to find VPN plugin for %s."
-msgstr "Error: falló al modificar %s.%s: %s."
-
-#: ../clients/cli/connections.c:8339 ../clients/cli/connections.c:8450
-#, fuzzy, c-format
+#: ../clients/cli/connections.c:10691 ../clients/cli/connections.c:10798
+#, c-format
 msgid "Error: failed to load VPN plugin: %s."
-msgstr "Error: falló al modificar %s.%s: %s."
+msgstr "Error: No se pudo cargar el complemento VPN: %s."
 
-#: ../clients/cli/connections.c:8347
-#, fuzzy, c-format
+#: ../clients/cli/connections.c:10699
+#, c-format
 msgid "Error: failed to import '%s': %s."
-msgstr "Error: falló al modificar %s.%s: %s."
+msgstr "Error: No se pudo importar '%s': %s."
 
-#: ../clients/cli/connections.c:8397
-#, fuzzy
+#: ../clients/cli/connections.c:10745
 msgid "Output file name: "
 msgstr "Nombre de archivo"
 
-#: ../clients/cli/connections.c:8421
-#, fuzzy, c-format
+#: ../clients/cli/connections.c:10769
+#, c-format
 msgid "Error: unknown extra argument: '%s'."
-msgstr "Error: invalid extra argument '%s'."
+msgstr "Error: argumento adicional desconocido '%s'."
 
-#: ../clients/cli/connections.c:8441
-#, fuzzy, c-format
+#: ../clients/cli/connections.c:10789
+#, c-format
 msgid "Error: the connection is not VPN."
-msgstr "Error: conexión no es válida: %s\n"
+msgstr "Error: la conexión no es VPN."
 
-#: ../clients/cli/connections.c:8462
-#, fuzzy, c-format
+#: ../clients/cli/connections.c:10810
+#, c-format
 msgid "Error: failed to create temporary file %s."
-msgstr "No se pudo crear archivo temporal: %s"
+msgstr "Error: no se pudo crear archivo temporal %s."
 
-#: ../clients/cli/connections.c:8471
-#, fuzzy, c-format
+#: ../clients/cli/connections.c:10819
+#, c-format
 msgid "Error: failed to export '%s': %s."
-msgstr "Error: falló al establecer '%s' propiedad: %s\n"
+msgstr "Error: No se pudo exportar '%s': %s."
 
-#: ../clients/cli/connections.c:8482
-#, fuzzy, c-format
+#: ../clients/cli/connections.c:10830
+#, c-format
 msgid "Error: failed to read temporary file '%s': %s."
-msgstr "Error: falló al retirar el valor de '%s': %s\n"
+msgstr "Error: No se pudo leer archivo temporal '%s': %s."
 
-#: ../clients/cli/connections.c:8628
+#: ../clients/cli/connections.c:10976
 #, c-format
 msgid "incorrect string '%s' of '--order' option"
-msgstr ""
+msgstr "cadena incorrecta '%s' de la opción '--order'"
 
-#: ../clients/cli/connections.c:8654
+#: ../clients/cli/connections.c:11002
 #, c-format
 msgid "incorrect item '%s' in '--order' option"
-msgstr ""
+msgstr "ítem incorrecto '%s' en la opción '--order'"
 
-#: ../clients/cli/connections.c:8740
-#, fuzzy
+#: ../clients/cli/connections.c:11089
 msgid "'--order' argument is missing"
-msgstr "Error: falta el argumento %s."
+msgstr "Falta el argumento '--order'"
 
-#: ../clients/cli/connections.c:8816
+#: ../clients/cli/connections.c:11154
 #, c-format
 msgid "Error: '%s' is not valid 'connection' command."
 msgstr "Error: '%s' no es un comando de 'connection' válido."
@@ -3335,9 +3837,8 @@ msgid "Interface: "
 msgstr "Interfaz:"
 
 #: ../clients/cli/devices.c:36
-#, fuzzy
 msgid "Interface(s): "
-msgstr "Interfaz:"
+msgstr "Interfaces:"
 
 #. 3
 #. 20
@@ -3353,9 +3854,8 @@ msgstr "CON-UUID"
 
 #. 2
 #: ../clients/cli/devices.c:58
-#, fuzzy
 msgid "NM-TYPE"
-msgstr "TIPO"
+msgstr "NM-TYPE"
 
 #. 3
 #: ../clients/cli/devices.c:59
@@ -3416,7 +3916,7 @@ msgstr "IP-IFACE"
 #. 2
 #: ../clients/cli/devices.c:70 ../clients/cli/devices.c:102
 msgid "IS-SOFTWARE"
-msgstr ""
+msgstr "IS-SOFTWARE"
 
 # auto translated by TM merge from project: NetworkManager, version: 0.9.8.2, DocId: NetworkManager
 #. 15
@@ -3433,17 +3933,17 @@ msgstr "FALTA-FIRMWARE"
 #. 18
 #: ../clients/cli/devices.c:74
 msgid "NM-PLUGIN-MISSING"
-msgstr ""
+msgstr "NM-PLUGIN-MISSING"
 
 #. 19
 #: ../clients/cli/devices.c:75
 msgid "PHYS-PORT-ID"
-msgstr ""
+msgstr "PHYS-PORT-ID"
 
 #. 23
 #: ../clients/cli/devices.c:79
 msgid "METERED"
-msgstr ""
+msgstr "METERED"
 
 # auto translated by TM merge from project: NetworkManager, version: 0.9.8.2, DocId: NetworkManager
 #. 0
@@ -3475,10 +3975,10 @@ msgstr "PORTADOR"
 #. 1
 #: ../clients/cli/devices.c:112
 msgid "S390-SUBCHANNELS"
-msgstr ""
+msgstr "S390-SUBCHANNELS"
 
 #. 0
-#: ../clients/cli/devices.c:121 ../clients/cli/devices.c:741
+#: ../clients/cli/devices.c:121 ../clients/cli/devices.c:731
 msgid "WEP"
 msgstr "WEP"
 
@@ -3488,7 +3988,7 @@ msgid "WPA"
 msgstr "WPA"
 
 #. 2
-#: ../clients/cli/devices.c:123 ../clients/cli/devices.c:749
+#: ../clients/cli/devices.c:123 ../clients/cli/devices.c:739
 msgid "WPA2"
 msgstr "WPA2"
 
@@ -3504,7 +4004,7 @@ msgstr "CCMP"
 
 #. 5
 #. 2
-#: ../clients/cli/devices.c:126 ../clients/cli/devices.c:238
+#: ../clients/cli/devices.c:126 ../clients/cli/devices.c:228
 msgid "AP"
 msgstr "AP"
 
@@ -3517,12 +4017,12 @@ msgstr "ADHOC"
 #. 7
 #: ../clients/cli/devices.c:128
 msgid "2GHZ"
-msgstr ""
+msgstr "2GHZ"
 
 #. 8
 #: ../clients/cli/devices.c:129
 msgid "5GHZ"
-msgstr ""
+msgstr "5GHZ"
 
 #. 0
 #: ../clients/cli/devices.c:138
@@ -3549,6 +4049,11 @@ msgstr "TX-POW"
 msgid "BSID"
 msgstr "BSID"
 
+#. 0
+#: ../clients/cli/devices.c:151 ../clients/tui/nmt-page-wifi.c:224
+msgid "SSID"
+msgstr "SSID"
+
 #. 1
 #: ../clients/cli/devices.c:152
 msgid "SSID-HEX"
@@ -3612,159 +4117,144 @@ msgstr "*"
 
 #. 0
 #. 5
-#: ../clients/cli/devices.c:177 ../clients/cli/devices.c:241
+#: ../clients/cli/devices.c:177 ../clients/cli/devices.c:231
 msgid "NSP"
 msgstr "PSR"
 
 # auto translated by TM merge from project: NetworkManager, version: 0.9.8.2, DocId: NetworkManager
 #. 0
-#: ../clients/cli/devices.c:192 ../clients/cli/devices.c:201
+#: ../clients/cli/devices.c:192
 msgid "SLAVES"
 msgstr "ESCLAVOS"
 
-#. 1
-#: ../clients/cli/devices.c:202
-msgid "CONFIG"
-msgstr ""
-
 #. 0
-#: ../clients/cli/devices.c:211
+#: ../clients/cli/devices.c:201
 msgid "PARENT"
-msgstr ""
+msgstr "PARENT"
 
 # auto translated by TM merge from project: RHN Satellite UI, version: 5.5, DocId: java/code/src/com/redhat/rhn/frontend/strings/java/StringResource
 #. 1
-#: ../clients/cli/devices.c:212
+#: ../clients/cli/devices.c:202
 msgid "ID"
 msgstr "ID"
 
 #. 0
-#: ../clients/cli/devices.c:221 ../clients/cli/devices.c:236
+#: ../clients/cli/devices.c:211 ../clients/cli/devices.c:226
 msgid "CAPABILITIES"
 msgstr "FUNCIONALIDADES"
 
 #. 1
-#: ../clients/cli/devices.c:237
+#: ../clients/cli/devices.c:227
 msgid "WIFI-PROPERTIES"
 msgstr "PROPIEDADES-WIFI"
 
 #. 3
-#: ../clients/cli/devices.c:239
+#: ../clients/cli/devices.c:229
 msgid "WIRED-PROPERTIES"
 msgstr "PROPIEDADES ALÁMBRICAS"
 
 #. 4
-#: ../clients/cli/devices.c:240
+#: ../clients/cli/devices.c:230
 msgid "WIMAX-PROPERTIES"
 msgstr "PROPIEDADES-WIMAX"
 
 #. 10
-#: ../clients/cli/devices.c:246 ../clients/tui/nmt-page-bond.c:351
+#: ../clients/cli/devices.c:236 ../clients/tui/nmt-page-bond.c:351
 msgid "BOND"
 msgstr "VÍNCULO"
 
 #. 11
-#: ../clients/cli/devices.c:247 ../clients/tui/nmt-page-team.c:145
+#: ../clients/cli/devices.c:237 ../clients/tui/nmt-page-team.c:145
 msgid "TEAM"
 msgstr "EQUIPO"
 
 #. 12
-#: ../clients/cli/devices.c:248 ../clients/tui/nmt-page-bridge.c:74
+#: ../clients/cli/devices.c:238 ../clients/tui/nmt-page-bridge.c:74
 msgid "BRIDGE"
 msgstr "PUENTE"
 
-#. 13
-#: ../clients/cli/devices.c:249 ../clients/tui/nm-editor-utils.c:217
-#: ../clients/tui/nmt-page-vlan.c:94 ../libnm-core/nm-connection.c:1746
-#: ../libnm-glib/nm-device.c:1879 ../libnm-util/nm-connection.c:1632
-#: ../libnm/nm-device.c:1830
-msgid "VLAN"
-msgstr "VLAN"
-
 #. 14
-#: ../clients/cli/devices.c:250
+#: ../clients/cli/devices.c:240
 msgid "BLUETOOTH"
-msgstr ""
+msgstr "BLUETOOTH"
 
 #. 15
-#: ../clients/cli/devices.c:251
+#: ../clients/cli/devices.c:241
 msgid "CONNECTIONS"
 msgstr "CONEXIONES"
 
 #. 1
-#: ../clients/cli/devices.c:263
+#: ../clients/cli/devices.c:253
 msgid "CHASSIS-ID"
-msgstr ""
+msgstr "CHASSIS-ID"
 
 #. 2
-#: ../clients/cli/devices.c:264
+#: ../clients/cli/devices.c:254
 msgid "PORT-ID"
-msgstr ""
+msgstr "PORT-ID"
 
 #. 3
-#: ../clients/cli/devices.c:265
+#: ../clients/cli/devices.c:255
 msgid "PORT-DESCRIPTION"
-msgstr ""
+msgstr "PORT-DESCRIPTION"
 
 #. 4
-#: ../clients/cli/devices.c:266
-#, fuzzy
+#: ../clients/cli/devices.c:256
 msgid "SYSTEM-NAME"
-msgstr "Nombre de usuario"
+msgstr "SYSTEM-NAME"
 
 #. 5
-#: ../clients/cli/devices.c:267
+#: ../clients/cli/devices.c:257
 msgid "SYSTEM-DESCRIPTION"
-msgstr ""
+msgstr "SYSTEM-DESCRIPTION"
 
 #. 6
-#: ../clients/cli/devices.c:268
-#, fuzzy
+#: ../clients/cli/devices.c:258
 msgid "SYSTEM-CAPABILITIES"
-msgstr "FUNCIONALIDADES"
+msgstr "SYSTEM-CAPABILITIES"
 
 #. 7
-#: ../clients/cli/devices.c:269
+#: ../clients/cli/devices.c:259
 msgid "IEEE-802-1-PVID"
-msgstr ""
+msgstr "IEEE-802-1-PVID"
 
 #. 8
-#: ../clients/cli/devices.c:270
+#: ../clients/cli/devices.c:260
 msgid "IEEE-802-1-PPVID"
-msgstr ""
+msgstr "IEEE-802-1-PPVID"
 
 #. 9
-#: ../clients/cli/devices.c:271
+#: ../clients/cli/devices.c:261
 msgid "IEEE-802-1-PPVID-FLAGS"
-msgstr ""
+msgstr "IEEE-802-1-PPVID-FLAGS"
 
 #. 10
-#: ../clients/cli/devices.c:272
+#: ../clients/cli/devices.c:262
 msgid "IEEE-802-1-VID"
-msgstr ""
+msgstr "IEEE-802-1-VID"
 
 #. 11
-#: ../clients/cli/devices.c:273
+#: ../clients/cli/devices.c:263
 msgid "IEEE-802-1-VLAN-NAME"
-msgstr ""
+msgstr "IEEE-802-1-VLAN-NAME"
 
 #. 12
-#: ../clients/cli/devices.c:274
+#: ../clients/cli/devices.c:264
 msgid "DESTINATION"
-msgstr ""
+msgstr "DESTINO"
 
 #. 13
-#: ../clients/cli/devices.c:275
+#: ../clients/cli/devices.c:265
 msgid "CHASSIS-ID-TYPE"
-msgstr ""
+msgstr "CHASSIS-ID-TYPE"
 
 #. 14
-#: ../clients/cli/devices.c:276
+#: ../clients/cli/devices.c:266
 msgid "PORT-ID-TYPE"
-msgstr ""
+msgstr "PORT-ID-TYPE"
 
-#: ../clients/cli/devices.c:293
-#, fuzzy, c-format
+#: ../clients/cli/devices.c:283
+#, c-format
 msgid ""
 "Usage: nmcli device { COMMAND | help }\n"
 "\n"
@@ -3779,7 +4269,7 @@ msgid ""
 "\n"
 "  connect <ifname>\n"
 "\n"
-"  reapply <ifname>\n"
+"  reapply <ifname> ...\n"
 "\n"
 "  disconnect <ifname> ...\n"
 "\n"
@@ -3804,30 +4294,41 @@ msgid ""
 msgstr ""
 "Uso: nmcli device { COMMAND | help }\n"
 "\n"
-"COMANDO := { status | show | connect | disconnect | wifi | wimax }\n"
-"\n"
-"COMANDO := { status | show | connect | disconnect | wifi }\n"
+"COMANDO := { status | show | connect | reapply | disconnect | delete | "
+"monitor | wifi | lldp }\n"
 "\n"
 "  status\n"
 "\n"
 "  show [<ifname>]\n"
 "\n"
+"  set [ifname] <ifname> [autoconnect yes|no] [managed yes|no]\n"
+"\n"
 "  connect <ifname>\n"
 "\n"
-"  disconnect <ifname>\n"
+"  reapply <ifname> ...\n"
+"\n"
+"  disconnect <ifname> ...\n"
+"\n"
+"  delete <ifname> ...\n"
+"\n"
+"  monitor <ifname> ...\n"
 "\n"
 "  wifi [list [ifname <ifname>] [bssid <BSSID>]]\n"
 "\n"
 "  wifi connect <(B)SSID> [password <password>] [wep-key-type key|phrase] "
 "[ifname <ifname>]\n"
-"                         [bssid <BSSID>] [name <name>] [private yes|no]\n"
+"                         [bssid <BSSID>] [name <name>] [private yes|no] "
+"[hidden yes|no]\n"
+"\n"
+"  wifi hotspot [ifname <ifname>] [con-name <name>] [ssid <SSID>] [band a|bg] "
+"[channel <channel>] [password <password>]\n"
 "\n"
-"  wifi rescan [[ifname] <ifname>]\n"
+"  wifi rescan [ifname <ifname>] [[ssid <SSID to scan>] ...]\n"
 "\n"
-"  wimax [list [ifname <ifname>] [nsp <name>]]\n"
+"  lldp [list [ifname <ifname>]]\n"
 "\n"
 
-#: ../clients/cli/devices.c:315
+#: ../clients/cli/devices.c:305
 #, c-format
 msgid ""
 "Usage: nmcli device status { help }\n"
@@ -3838,10 +4339,8 @@ msgid ""
 " TYPE       - device type\n"
 " STATE      - device state\n"
 " CONNECTION - connection activated on device (if any)\n"
-"Displayed columns can be changed using '--fields' global option. 'status' "
-"is\n"
-"the default command, which means 'nmcli device' calls 'nmcli device "
-"status'.\n"
+"Displayed columns can be changed using '--fields' global option. 'status' is\n"
+"the default command, which means 'nmcli device' calls 'nmcli device status'.\n"
 "\n"
 msgstr ""
 "Uso: nmcli device status { help }\n"
@@ -3858,7 +4357,7 @@ msgstr ""
 "'nmcli device status'.\n"
 "\n"
 
-#: ../clients/cli/devices.c:330
+#: ../clients/cli/devices.c:320
 #, c-format
 msgid ""
 "Usage: nmcli device show { ARGUMENTS | help }\n"
@@ -3878,7 +4377,7 @@ msgstr ""
 "dispositivo determinado.\n"
 "\n"
 
-#: ../clients/cli/devices.c:341
+#: ../clients/cli/devices.c:331
 #, c-format
 msgid ""
 "Usage: nmcli device connect { ARGUMENTS | help }\n"
@@ -3886,8 +4385,8 @@ msgid ""
 "ARGUMENTS := <ifname>\n"
 "\n"
 "Connect the device.\n"
-"NetworkManager will try to find a suitable connection that will be "
-"activated.\n"
+"NetworkManager will try to find a suitable connection that will be activated."
+"\n"
 "It will also consider connections that are not set to auto-connect.\n"
 "\n"
 msgstr ""
@@ -3900,28 +4399,27 @@ msgstr ""
 "También considerará conexiones que no estén configuradas para auto-connect.\n"
 "\n"
 
-#: ../clients/cli/devices.c:353
-#, fuzzy, c-format
+#: ../clients/cli/devices.c:343
+#, c-format
 msgid ""
 "Usage: nmcli device reapply { ARGUMENTS | help }\n"
 "\n"
-"ARGUMENTS := <ifname>\n"
+"ARGUMENTS := <ifname> ...\n"
 "\n"
 "Attempts to update device with changes to the currently active connection\n"
 "made since it was last applied.\n"
 "\n"
 msgstr ""
-"Uso: nmcli device disconnect { ARGUMENTS | help }\n"
+"Uso: nmcli device reapply { ARGUMENTS | help }\n"
 "\n"
-"ARGUMENTOS := <ifname>\n"
+"ARGUMENTOS := <ifname> ...\n"
 "\n"
-"Desconectar el dispositivo.\n"
-"El comando se desconecta y evita que se autoactiven\n"
-"otras conexiones sin la intervención manual del usuario.\n"
+"Trata de actualizar el dispositivo con los cambios hechos a la conexión "
+"actualmente activa desde que se aplicó por última vez.\n"
 "\n"
 
-#: ../clients/cli/devices.c:364
-#, fuzzy, c-format
+#: ../clients/cli/devices.c:354
+#, c-format
 msgid ""
 "Usage: nmcli device disconnect { ARGUMENTS | help }\n"
 "\n"
@@ -3936,13 +4434,13 @@ msgstr ""
 "\n"
 "ARGUMENTOS := <ifname>\n"
 "\n"
-"Desconectar el dispositivo.\n"
+"Desconectar dispositivos.\n"
 "El comando se desconecta y evita que se autoactiven\n"
 "otras conexiones sin la intervención manual del usuario.\n"
 "\n"
 
-#: ../clients/cli/devices.c:376
-#, fuzzy, c-format
+#: ../clients/cli/devices.c:366
+#, c-format
 msgid ""
 "Usage: nmcli device delete { ARGUMENTS | help }\n"
 "\n"
@@ -3954,16 +4452,18 @@ msgid ""
 "command.\n"
 "\n"
 msgstr ""
-"Uso: nmcli device show { ARGUMENTS | help }\n"
+"Uso: nmcli device delete { ARGUMENTS | help }\n"
 "\n"
-"ARGUMENTOS := [<ifname>]\n"
+"ARGUMENTOS := <ifname> ...\n"
 "\n"
-"Muestra detalles del o los dispositivo(s).\n"
-"El comando lista información para todos los dispositivos o para un "
-"dispositivo determinado.\n"
+"Borrar los dispositivos de software.\n"
+"El comando retira las interfaces. Solamente funciona para dispositivos de "
+"software\n"
+"(por ejemplo, bonos, puentes, etc.). Los dispositivos de hardware no pueden "
+"ser borrados por el comando.\n"
 "\n"
 
-#: ../clients/cli/devices.c:389
+#: ../clients/cli/devices.c:379
 #, c-format
 msgid ""
 "Usage: nmcli device set { ARGUMENTS | help }\n"
@@ -3976,9 +4476,18 @@ msgid ""
 "Modify device properties.\n"
 "\n"
 msgstr ""
+"Uso: nmcli device set { ARGUMENTS | help }\n"
+"\n"
+"ARGUMENTOS := DEVICE { PROPERTY [ PROPERTY ... ] }\n"
+"DISPOSITIVO    := [ifname] <ifname> \n"
+"PROPIEDAD  := { autoconnect { yes | no } |\n"
+"             { managed { yes | no }\n"
+"\n"
+"Modificar propiedades de dispositivos.\n"
+"\n"
 
-#: ../clients/cli/devices.c:402
-#, fuzzy, c-format
+#: ../clients/cli/devices.c:392
+#, c-format
 msgid ""
 "Usage: nmcli device monitor { ARGUMENTS | help }\n"
 "\n"
@@ -3989,17 +4498,21 @@ msgid ""
 "Monitors all devices in case no interface is specified.\n"
 "\n"
 msgstr ""
-"Uso: nmcli device show { ARGUMENTS | help }\n"
+"Uso: nmcli device monitor { ARGUMENTS | help }\n"
 "\n"
 "ARGUMENTOS := [<ifname>]\n"
 "\n"
-"Muestra detalles del o los dispositivo(s).\n"
-"El comando lista información para todos los dispositivos o para un "
-"dispositivo determinado.\n"
+"Monitoriza la actividad del dispositivo.\n"
+"Este comando imprime en pantalla una línea cada vez que los dispositivos "
+"especificados cambien de estado.  Monitoriza todos los dispositivos en caso "
+"de que no se especifique ninguna interfaz.                                   "
+"                                                                             "
+"                                                                             "
+" \n"
 "\n"
 
-#: ../clients/cli/devices.c:414
-#, fuzzy, c-format
+#: ../clients/cli/devices.c:404
+#, c-format
 msgid ""
 "Usage: nmcli device wifi { ARGUMENTS | help }\n"
 "\n"
@@ -4010,8 +4523,8 @@ msgid ""
 "List available Wi-Fi access points. The 'ifname' and 'bssid' options can be\n"
 "used to list APs for a particular interface, or with a specific BSSID.\n"
 "\n"
-"ARGUMENTS := connect <(B)SSID> [password <password>] [wep-key-type key|"
-"phrase] [ifname <ifname>]\n"
+"ARGUMENTS := connect <(B)SSID> [password <password>] [wep-key-type "
+"key|phrase] [ifname <ifname>]\n"
 "                    [bssid <BSSID>] [name <name>] [private yes|no] [hidden "
 "yes|no]\n"
 "\n"
@@ -4040,10 +4553,8 @@ msgid ""
 "\n"
 "ARGUMENTS := rescan [ifname <ifname>] [[ssid <SSID to scan>] ...]\n"
 "\n"
-"Request that NetworkManager immediately re-scan for available access "
-"points.\n"
-"NetworkManager scans Wi-Fi networks periodically, but in some cases it "
-"might\n"
+"Request that NetworkManager immediately re-scan for available access points.\n"
+"NetworkManager scans Wi-Fi networks periodically, but in some cases it might\n"
 "be useful to start scanning manually. 'ssid' allows scanning for a specific\n"
 "SSID, which is useful for APs with hidden SSIDs. More 'ssid' parameters can "
 "be\n"
@@ -4057,564 +4568,592 @@ msgstr ""
 "\n"
 "ARGUMENTOS := [list [ifname <ifname>] [bssid <BSSID>]]\n"
 "\n"
-"Lista puntos de acceso Wi-Fi disponibles. Las opciones 'ifname' y 'bssid' "
-"pueden utilizarse para listar\n"
+"Lista los puntos de acceso Wi-Fi disponibles. Las opciones 'ifname' y "
+"'bssid' pueden utilizarse para listar\n"
 "las AP para una interfaz particular o con un BSSID específico.\n"
 "\n"
-"ARGUMENTOS := connect <(B)SSID> [password <password>] [wep-key-type key|"
-"phrase] [ifname <ifname>]\n"
+"ARGUMENTOS := connect <(B)SSID> [password <password>] [wep-key-type "
+"key|phrase] [ifname <ifname>]\n"
 "                    [bssid <BSSID>] [name <name>] [private yes|no]\n"
 "\n"
-"Conectar a una red Wi-Fi especificada por SSI o BSSID. El comando crea\n"
+"Conectar a una red Wi-Fi especificada por SSID o BSSID. El comando crea\n"
 "una nueva conexión y luego la activa en un dispositivo. Este es un \n"
-"equivalente de línea de comandos de hacer clic en un SSID en un cliente de \n"
-"GUI.El comando siempre crea\n"
-"una nueva conexión y por lo tanto es muy útil para conectarse a nuevas "
-"redes \n"
-"Wi-Fi.\n"
-"Si ya existe una conexión para la red, es mejor devolver el perfil "
+"equivalente de línea de comandos de pulsar un SSID en un cliente de \n"
+"GUI. El comando siempre crea\n"
+"una nueva conexión y por lo tanto es muy útil para conectarse a nuevas redes "
+"\n"
+"Wi-Fi. Si ya existe una conexión para la red, es mejor devolver el perfil "
 "existente \n"
-"así: nmcli con up id <name>. Observe que solo abre, las redes WEP y WPA-"
-"PSK \n"
-"tienen soporte en este momento. También se supone que configuración IP se \n"
-"obtiene vía DHCP.  Solicita que NetworkManager reescanée inmediatamente "
-"los \n"
-"puntos de acceso disponibles.NetworkManager escanea periodicamente  redes "
-"de \n"
-"Wi-Fi, pero en algunos casos puede ser útil comenzar el escaneo de forma \n"
-"manual. Observe que este comando no muestra las AP, use la lista de \n"
-"dispositivos nmcli Wi-Fi para ello.\n"
-"\n"
-
-#: ../clients/cli/devices.c:461
-#, fuzzy, c-format
+"así: nmcli con up id <name>. Observe que solo abre, las redes WEP y WPA-PSK \n"
+"tienen soporte en este momento. También se supone que  la configuración IP "
+"se \n"
+"obtiene vía DHCP. .\n"
+"\n"
+"ARGUMENTOS := wifi hotspot [ifname <ifname>] [con-name <name>] [ssid <SSID>]\n"
+"                          [band a|bg] [channel <channel>] [password "
+"<password>]\n"
+"\n"
+"Cree un Wi-Fi hotspot. Use 'connection down' o 'device disconnect'\n"
+"para detener el hotspot.\n"
+"Los parametros del hotspot pueden afectarse por los parámetros opcionales:\n"
+"ifname - Dispositivo Wi-Fi para usar\n"
+"con-name - name del perfil de conexión del hotspot creado\n"
+"ssid - SSID del hotspot\n"
+"band - Banda Wi-Fi a usar\n"
+"channel - Wi-Fi channel to use\n"
+"password - contraseña para el  hotspot\n"
+"\n"
+"ARGUMENTOS := rescan [ifname <ifname>] [[ssid <SSID to scan>] ...]\n"
+"\n"
+"Solicita que NetworkManager efectué inmediatamente un nuevo escán de los "
+"puntos disponibles.\n"
+"NetworkManager escanea redes Wi-Fi periódicamente, pero en algunos casos "
+"podría ser útil iniciar el escaneo de forma manual. 'ssid' le solicita "
+"escanear todos los SSID específicos, los cuales sirven para API con SSID "
+"ocultos. Se pueden agregar otros parámetros 'ssid'. Observe que este comando "
+"no muestra los AP,\n"
+"use 'nmcli device wifi list' para ello.\n"
+
+#: ../clients/cli/devices.c:451
+#, c-format
 msgid ""
 "Usage: nmcli device lldp { ARGUMENTS | help }\n"
 "\n"
 "ARGUMENTS := [list [ifname <ifname>]]\n"
 "\n"
-"List neighboring devices discovered through LLDP. The 'ifname' option can "
-"be\n"
+"List neighboring devices discovered through LLDP. The 'ifname' option can be\n"
 "used to list neighbors for a particular interface.\n"
 "\n"
 msgstr ""
-"Uso: nmcli device wimax { ARGUMENTS | help }\n"
+"Uso: nmcli device lldp { ARGUMENTS | help }\n"
 "\n"
-"Realizar operación en dispositivos WiMAX.\n"
+"ARGUMENTOS := [list [ifname <ifname>]]\n"
 "\n"
-"ARGUMENTOS := [list [ifname <ifname>] [nsp <name>]]\n"
-"\n"
-"Lista los NSP de WiMAX disponibles. Las opciones 'ifname' y 'nsp' pueden ser "
-"utilizadas para listar redes\n"
-"para una determinada interfaz, o con un NSP específico.\n"
+"Lista los dispositivos vecinos a través de LLDP. La opción 'ifname' sirve "
+"para enumerar los vecinos de una determinada interfaz.\n"
 "\n"
 
-#: ../clients/cli/devices.c:537 ../clients/cli/devices.c:1756
-#: ../clients/cli/devices.c:1765 ../clients/cli/devices.c:1956
-#: ../clients/cli/devices.c:2161 ../clients/cli/devices.c:2168
+#: ../clients/cli/devices.c:527 ../clients/cli/devices.c:1676
+#: ../clients/cli/devices.c:1685 ../clients/cli/devices.c:1879
+#: ../clients/cli/devices.c:2103 ../clients/cli/devices.c:2110
 #, c-format
 msgid "Error: No interface specified."
 msgstr "Error: No interface specified."
 
-#: ../clients/cli/devices.c:557
+#: ../clients/cli/devices.c:547 ../clients/cli/devices.c:1899
 #, c-format
 msgid "Warning: argument '%s' is duplicated.\n"
-msgstr ""
+msgstr "Advertencia: argumento  '%s' está duplicado.\n"
+"\n"
 
-#: ../clients/cli/devices.c:559
-#, fuzzy, c-format
+#: ../clients/cli/devices.c:549 ../clients/cli/devices.c:1901
+#, c-format
 msgid "Error: Device '%s' not found.\n"
-msgstr "Error: no se encontró el dispositivo «%s»."
+msgstr "Error: no se encontró el dispositivo '%s'.\n"
+"\n"
 
-#: ../clients/cli/devices.c:560
-#, fuzzy, c-format
+#: ../clients/cli/devices.c:550 ../clients/cli/devices.c:1902
+#, c-format
 msgid "Error: not all devices found."
-msgstr "Error: No se encontró dispositivo Wi-Fi."
+msgstr "Error: No se encontraron todos los dispositivos."
 
-#: ../clients/cli/devices.c:660 ../clients/cli/devices.c:811
+#: ../clients/cli/devices.c:650 ../clients/cli/devices.c:801
 msgid "(none)"
 msgstr "(ninguno)"
 
-#: ../clients/cli/devices.c:729
+#: ../clients/cli/devices.c:719
 #, c-format
 msgid "%u MHz"
 msgstr "%u MHz"
 
-#: ../clients/cli/devices.c:730
+#: ../clients/cli/devices.c:720
 #, c-format
 msgid "%u Mbit/s"
 msgstr "%u Mbit/s"
 
-#: ../clients/cli/devices.c:745
+#: ../clients/cli/devices.c:735
 msgid "WPA1"
 msgstr "WPA1"
 
-#: ../clients/cli/devices.c:754
+#: ../clients/cli/devices.c:744
 msgid "802.1X"
 msgstr "802.1X"
 
-#: ../clients/cli/devices.c:770
+#: ../clients/cli/devices.c:760
 msgid "Ad-Hoc"
 msgstr "Ad-Hoc"
 
-#: ../clients/cli/devices.c:771
+#: ../clients/cli/devices.c:761
 msgid "Infra"
 msgstr "Infra"
 
 # auto translated by TM merge from project: rhsm-web, version: 0.0, DocId: management
-#: ../clients/cli/devices.c:772
+#: ../clients/cli/devices.c:762
 msgid "N/A"
 msgstr "N/A"
 
-#: ../clients/cli/devices.c:996
+#: ../clients/cli/devices.c:916
 msgid "Device details"
 msgstr "Detalles de los dispositivos"
 
-#: ../clients/cli/devices.c:1008
+#: ../clients/cli/devices.c:928
 #, c-format
 msgid "Error: 'device show': %s"
 msgstr "Error: 'device show': %s"
 
-#: ../clients/cli/devices.c:1060 ../clients/cli/devices.c:1063
+#: ../clients/cli/devices.c:980 ../clients/cli/devices.c:983
 msgid "(unknown)"
 msgstr "(desconocido)"
 
-#: ../clients/cli/devices.c:1104
+#: ../clients/cli/devices.c:1024
 #, c-format
 msgid "%u Mb/s"
 msgstr "%u Mb/s"
 
-#: ../clients/cli/devices.c:1195
+#: ../clients/cli/devices.c:1115
 msgid "on"
 msgstr "encendido"
 
-#: ../clients/cli/devices.c:1195
+#: ../clients/cli/devices.c:1115
 msgid "off"
 msgstr "apagado"
 
-#: ../clients/cli/devices.c:1422
+#: ../clients/cli/devices.c:1342
 #, c-format
 msgid "Error: 'device status': %s"
 msgstr "Error: 'device status': %s"
 
 #. Add headers
-#: ../clients/cli/devices.c:1429
+#: ../clients/cli/devices.c:1349
 msgid "Status of devices"
 msgstr "Estado de los dispositivos"
 
-#: ../clients/cli/devices.c:1460 ../clients/cli/devices.c:3570
+#: ../clients/cli/devices.c:1380 ../clients/cli/devices.c:3509
 #, c-format
 msgid "Error: invalid extra argument '%s'."
 msgstr "Error: invalid extra argument '%s'."
 
-#: ../clients/cli/devices.c:1477 ../clients/cli/devices.c:1787
-#: ../clients/cli/devices.c:2184 ../clients/cli/devices.c:2454
-#: ../clients/cli/devices.c:3609
+#: ../clients/cli/devices.c:1397 ../clients/cli/devices.c:1707
+#: ../clients/cli/devices.c:2126 ../clients/cli/devices.c:2396
+#: ../clients/cli/devices.c:3548
 #, c-format
 msgid "Error: Device '%s' not found."
 msgstr "Error: no se encontró el dispositivo «%s»."
 
-#: ../clients/cli/devices.c:1555
-#, fuzzy, c-format
+#: ../clients/cli/devices.c:1475
+#, c-format
 msgid "Device '%s' successfully activated with '%s'.\n"
-msgstr "Exito: Dispositivo '%s' ha sido activado correctamente."
+msgstr "El dispositivo '%s' ha sido activado con '%s'.\n"
+"\n"
 
-#: ../clients/cli/devices.c:1561
-#, fuzzy, c-format
+#: ../clients/cli/devices.c:1481
+#, c-format
 msgid "Error: Connection activation failed: (%d) %s.\n"
-msgstr "Error: Connection activation failed: (%d) %s."
+msgstr "Error: Falló la activación de la conexión:(%d) %s.\n"
 
-#: ../clients/cli/devices.c:1597
-#, fuzzy, c-format
+#: ../clients/cli/devices.c:1517
+#, c-format
 msgid "Error: Failed to setup a Wi-Fi hotspot: %s"
-msgstr "Error: No se puedo establecer nombre de host: (%d) %s"
+msgstr "Error: No se puedo establecer un hotspot Wi-Fi: %s"
 
-#: ../clients/cli/devices.c:1600
-#, fuzzy, c-format
+#: ../clients/cli/devices.c:1520
+#, c-format
 msgid "Error: Failed to add/activate new connection: %s"
-msgstr "Error: Failed to add/activate new connection: (%d) %s"
+msgstr "Error: No se puedo agregar o activar la nueva conexión:  %s"
 
-#: ../clients/cli/devices.c:1610
-#, fuzzy, c-format
+#: ../clients/cli/devices.c:1530
+#, c-format
 msgid "Error: Failed to setup a Wi-Fi hotspot"
-msgstr "Error: No se puedo establecer nombre de host: (%d) %s"
+msgstr "Error: No se puedo establecer un hotspot Wi-Fi"
 
-#: ../clients/cli/devices.c:1612
+#: ../clients/cli/devices.c:1532
 #, c-format
 msgid "Error: Failed to add/activate new connection: Unknown error"
 msgstr "Error: Failed to add/activate new connection: Unknown error"
 
-#: ../clients/cli/devices.c:1624
+#: ../clients/cli/devices.c:1544
 #, c-format
 msgid "Connection with UUID '%s' created and activated on device '%s'\n"
 msgstr "Conexión con UUID '%s' ha sido creada y activada en dispositivo '%s'\n"
 
-#: ../clients/cli/devices.c:1627
-#, fuzzy, c-format
+#: ../clients/cli/devices.c:1547
+#, c-format
 msgid "Hotspot '%s' activated on device '%s'\n"
-msgstr "Conexión con UUID '%s' ha sido creada y activada en dispositivo '%s'\n"
+msgstr "Hotspot '%s' está activado en este dispositivo '%s'\n"
+"\n"
 
-#: ../clients/cli/devices.c:1691
+#: ../clients/cli/devices.c:1611
 #, c-format
 msgid "Error: Device activation failed: %s"
 msgstr "Error: Device activation failed: %s"
 
-#: ../clients/cli/devices.c:1700
-#, fuzzy, c-format
+#: ../clients/cli/devices.c:1620
+#, c-format
 msgid "Error: Device activation failed: device was disconnected"
-msgstr "Error: Device activation failed: %s"
+msgstr ""
+"Error: La activación del dispositivo falló: el dispositivo estaba "
+"desconectado"
 
-#: ../clients/cli/devices.c:1715
+#: ../clients/cli/devices.c:1635
 #, c-format
 msgid "Device '%s' has been connected.\n"
 msgstr "Dispositivo '%s' ha sido conectado.\n"
 
-#: ../clients/cli/devices.c:1771
+#: ../clients/cli/devices.c:1691
 #, c-format
 msgid "Error: extra argument not allowed: '%s'."
 msgstr "Error: extra argument not allowed: '%s'."
 
-#: ../clients/cli/devices.c:1856 ../clients/cli/devices.c:1871
-#: ../clients/cli/devices.c:2022
-#, fuzzy, c-format
+#: ../clients/cli/devices.c:1776 ../clients/cli/devices.c:1791
+#: ../clients/cli/devices.c:1964
+#, c-format
 msgid "Device '%s' successfully disconnected.\n"
-msgstr "Éxito: dispositivo «%s» desconectado correctamente."
+msgstr "El dispositivo «%s» fue desconectado correctamente.\n"
+"\n"
 
-#: ../clients/cli/devices.c:1859
-#, fuzzy, c-format
+#: ../clients/cli/devices.c:1779
+#, c-format
 msgid "Device '%s' successfully removed.\n"
-msgstr "Exito: Dispositivo '%s' ha sido activado correctamente."
+msgstr "El dispositivo '%s' ha sido retirado correctamente.\n"
+"\n"
 
-#: ../clients/cli/devices.c:1918
-#, fuzzy, c-format
-msgid "Error: Reapplying connection to device '%s' (%s) failed: %s"
-msgstr "Error: falló la desconexión del dispositivo «%s» (%s): %s"
+#: ../clients/cli/devices.c:1838
+#, c-format
+msgid "Error: not all connections reapplied."
+msgstr "Error: no se reaplicaron todas las conexiones"
+
+#: ../clients/cli/devices.c:1839
+#, c-format
+msgid "Error: Reapplying connection to device '%s' (%s) failed: %s\n"
+msgstr "Error: Falló al reaplicar la conexión al dispositivo '%s' (%s): %s\n"
 
 # auto translated by TM merge from project: NetworkManager, version: 0.9.8.2, DocId: NetworkManager
-#: ../clients/cli/devices.c:1928
-#, fuzzy, c-format
+#: ../clients/cli/devices.c:1849
+#, c-format
 msgid "Connection successfully reapplied to device '%s'.\n"
-msgstr "Conexión activada con éxito (D-Bus active path: %s)\n"
+msgstr "Se reaplicó correctamente la conexión al dispositivo  %s\n"
 
-#: ../clients/cli/devices.c:1965
-#, fuzzy, c-format
-msgid "Error: unsupported argument '%s'."
-msgstr "Error: Argumento inesperado '%s'"
-
-#: ../clients/cli/devices.c:1979
-#, fuzzy, c-format
-msgid "Error: device '%s' not found."
-msgstr "Error: no se encontró el dispositivo «%s»."
+#: ../clients/cli/devices.c:1912
+#, c-format
+msgid "Error: no valid device provided."
+msgstr "Error: No se encontró dispositivo válido."
 
-#: ../clients/cli/devices.c:2007
-#, fuzzy, c-format
+#: ../clients/cli/devices.c:1949
+#, c-format
 msgid "Error: not all devices disconnected."
-msgstr "Error: No se encontró dispositivo Wi-Fi."
+msgstr "Error: No todos los dispositivos están desconectados."
 
-#: ../clients/cli/devices.c:2008
-#, fuzzy, c-format
+#: ../clients/cli/devices.c:1950
+#, c-format
 msgid "Error: Device '%s' (%s) disconnecting failed: %s\n"
-msgstr "Error: falló la desconexión del dispositivo «%s» (%s): %s"
+msgstr "Error: falló la desconexión del dispositivo «%s» (%s): %s \n"
+"\n"
 
-#: ../clients/cli/devices.c:2083
-#, fuzzy, c-format
+#: ../clients/cli/devices.c:2025
+#, c-format
 msgid "Error: not all devices deleted."
-msgstr "Error: No se encontró dispositivo Wi-Fi."
+msgstr "Error: No se borraron todos los dispositivos."
 
-#: ../clients/cli/devices.c:2084
-#, fuzzy, c-format
+#: ../clients/cli/devices.c:2026
+#, c-format
 msgid "Error: Device '%s' (%s) deletion failed: %s\n"
-msgstr "Error: falló la desconexión del dispositivo «%s» (%s): %s"
+msgstr "Error: falló la desconexión del dispositivo «%s» (%s): %s:\n"
+"\n"
 
-#: ../clients/cli/devices.c:2190
-#, fuzzy, c-format
+#: ../clients/cli/devices.c:2132
+#, c-format
 msgid "Error: No property specified."
-msgstr "Error: no se especificó una conexión."
+msgstr "Error: no se especificó ninguna propiedad."
 
-#: ../clients/cli/devices.c:2202 ../clients/cli/devices.c:2217
+#: ../clients/cli/devices.c:2144 ../clients/cli/devices.c:2159
 #, c-format
 msgid "Error: '%s' argument is missing."
 msgstr "Error: '%s' falta argumento."
 
-#: ../clients/cli/devices.c:2207
-#, fuzzy, c-format
+#: ../clients/cli/devices.c:2149
+#, c-format
 msgid "Error: 'managed': %s."
-msgstr "Error: 'modo': %s."
+msgstr "Error: 'administrado': %s."
 
-#: ../clients/cli/devices.c:2222
+#: ../clients/cli/devices.c:2174
 #, c-format
-msgid "Error: 'autoconnect': %s."
-msgstr "Error: 'autoconnect': %s."
-
-#: ../clients/cli/devices.c:2232
-#, fuzzy, c-format
 msgid "Error: property '%s' is not known."
-msgstr "Error: propiedad inválida '%s': %s."
+msgstr "Error: se desconoce la propiedad '%s."
 
-#: ../clients/cli/devices.c:2278
-#, fuzzy, c-format
+#: ../clients/cli/devices.c:2220
+#, c-format
 msgid "%s: using connection '%s'\n"
-msgstr "No hay tal conexión '%s'"
+msgstr "%s: está utilizando la conexión '%s'\n"
 
-#: ../clients/cli/devices.c:2304
+#: ../clients/cli/devices.c:2246
 #, c-format
 msgid "%s: device created\n"
-msgstr ""
+msgstr "%s: se creó dispositivo.\n"
+"\n"
 
-#: ../clients/cli/devices.c:2311
-#, fuzzy, c-format
+#: ../clients/cli/devices.c:2253
+#, c-format
 msgid "%s: device removed\n"
-msgstr "El dispositivo fue retirado"
+msgstr "%s: El dispositivo fue retirado.\n"
+"\n"
 
-#: ../clients/cli/devices.c:2397
+#: ../clients/cli/devices.c:2339
 msgid "Wi-Fi scan list"
 msgstr "Lista de escán de Wi-Fi"
 
-#: ../clients/cli/devices.c:2435
+#: ../clients/cli/devices.c:2377
 #, c-format
 msgid "Error: 'device wifi': %s"
 msgstr "Error: 'device wifi': %s"
 
-#: ../clients/cli/devices.c:2477 ../clients/cli/devices.c:2561
+#: ../clients/cli/devices.c:2419 ../clients/cli/devices.c:2500
 #, c-format
 msgid "Error: Access point with bssid '%s' not found."
 msgstr "Error: no se encontró el punto de acceso con bssid «%s»."
 
-#: ../clients/cli/devices.c:2504
-#, fuzzy, c-format
+#: ../clients/cli/devices.c:2446
+#, c-format
 msgid ""
 "Error: Device '%s' was not recognized as a Wi-Fi device, check "
 "NetworkManager Wi-Fi plugin."
-msgstr "Error: Device '%s' is not a Wi-Fi device."
+msgstr ""
+"Error: El dispositivo '%s' no fue reconocido como un dispositivo Wi-Fi, "
+"verifique el componente Wi-Fi de NetworkManager."
 
-#: ../clients/cli/devices.c:2508 ../clients/cli/devices.c:2841
-#: ../clients/cli/devices.c:3261 ../clients/cli/devices.c:3410
+#: ../clients/cli/devices.c:2448 ../clients/cli/devices.c:2780
+#: ../clients/cli/devices.c:3200 ../clients/cli/devices.c:3349
 #, c-format
 msgid "Error: Device '%s' is not a Wi-Fi device."
-msgstr "Error: Device '%s' is not a Wi-Fi device."
+msgstr "Error: Device '%s' no es un dispositivo Wi-Fi ."
 
-#: ../clients/cli/devices.c:2721
+#: ../clients/cli/devices.c:2660
 msgid "SSID or BSSID: "
 msgstr "SSID o BSSID: "
 
-#: ../clients/cli/devices.c:2726
+#: ../clients/cli/devices.c:2665
 #, c-format
 msgid "Error: SSID or BSSID are missing."
 msgstr "Error: SSID or BSSID are missing."
 
-#: ../clients/cli/devices.c:2750
+#: ../clients/cli/devices.c:2689
 #, c-format
 msgid "Error: bssid argument value '%s' is not a valid BSSID."
-msgstr "Error: bssid argument value '%s' is not a valid BSSID."
+msgstr "Error: el valor del argumento bssid '%s' no es un BSSID válido."
 
-#: ../clients/cli/devices.c:2774
+#: ../clients/cli/devices.c:2713
 #, c-format
 msgid ""
 "Error: wep-key-type argument value '%s' is invalid, use 'key' or 'phrase'."
 msgstr ""
-"Error: wep-key-type argument value '%s' is invalid, use 'key' or 'phrase'."
+"Error: el valor del argumento key-type'%s' no es válido, use 'key' o'phrase'."
+""
 
-#: ../clients/cli/devices.c:2794 ../clients/cli/devices.c:2807
+#: ../clients/cli/devices.c:2733 ../clients/cli/devices.c:2746
 #, c-format
 msgid "Error: %s: %s."
 msgstr "Error: %s: %s."
 
-#: ../clients/cli/devices.c:2822
+#: ../clients/cli/devices.c:2761
 #, c-format
 msgid "Error: BSSID to connect to (%s) differs from bssid argument (%s)."
 msgstr "Error: BSSID para conectarse a (%s) difiere del argumento bssid (%s)."
 
-#: ../clients/cli/devices.c:2828
+#: ../clients/cli/devices.c:2767
 #, c-format
 msgid "Error: Parameter '%s' is neither SSID nor BSSID."
 msgstr "Error: Parámetro '%s' no es ni SSID ni BSSID."
 
-#: ../clients/cli/devices.c:2843 ../clients/cli/devices.c:3263
-#: ../clients/cli/devices.c:3412
+#: ../clients/cli/devices.c:2782 ../clients/cli/devices.c:3202
+#: ../clients/cli/devices.c:3351
 #, c-format
 msgid "Error: No Wi-Fi device found."
 msgstr "Error: No se encontró dispositivo Wi-Fi."
 
-#: ../clients/cli/devices.c:2863
-#, fuzzy, c-format
+#: ../clients/cli/devices.c:2802
+#, c-format
 msgid "Error: Failed to scan hidden SSID: %s."
-msgstr "Error: falló al modificar %s.%s: %s."
+msgstr "Error: no se pudo escanera el SSID oculto : %s."
 
-#: ../clients/cli/devices.c:2888
+#: ../clients/cli/devices.c:2827
 #, c-format
 msgid "Error: No network with SSID '%s' found."
 msgstr "Error: No se encontro red con SSID '%s."
 
-#: ../clients/cli/devices.c:2890
+#: ../clients/cli/devices.c:2829
 #, c-format
 msgid "Error: No access point with BSSID '%s' found."
 msgstr "Error: No se encontró punto de acceso con BSSID '%s'."
 
-#: ../clients/cli/devices.c:2932
+#: ../clients/cli/devices.c:2871
 #, c-format
 msgid ""
 "Warning: '%s' should be SSID for hidden APs; but it looks like a BSSID.\n"
 msgstr ""
+"Advertencia: '%s' debe ser SSID para AP oculto; pero parece un BSSID.\n"
 
-#: ../clients/cli/devices.c:2946
+#: ../clients/cli/devices.c:2885
 msgid "Password: "
 msgstr "Contraseña:"
 
-#: ../clients/cli/devices.c:3095
-#, fuzzy, c-format
+#: ../clients/cli/devices.c:3034
+#, c-format
 msgid "'%s' is not valid WPA PSK"
-msgstr "'%s' no es un PSK válido"
+msgstr "'%s' no es un WPA PSK válido"
 
-#: ../clients/cli/devices.c:3112
-#, fuzzy, c-format
+#: ../clients/cli/devices.c:3051
+#, c-format
 msgid "'%s' is not valid WEP key (it should be 5 or 13 ASCII chars)"
-msgstr "'%s' longitud es inválida (debe tener 5 o 6 dígitos)"
+msgstr "'%s' no es una llave WEP válida (debe tener 5 o 13 caracteres ASCII)"
 
-#: ../clients/cli/devices.c:3128
+#: ../clients/cli/devices.c:3067
 #, c-format
 msgid "Hotspot password: %s\n"
-msgstr ""
+msgstr "Contraseña de Hotspot: %s\n"
 
-#: ../clients/cli/devices.c:3186
-#, fuzzy, c-format
+#: ../clients/cli/devices.c:3125
+#, c-format
 msgid "Error: ssid is too long."
-msgstr "Error: se requiere 'ssid'."
+msgstr "Error: ssid es demasiado largo."
 
-#: ../clients/cli/devices.c:3198
-#, fuzzy, c-format
+#: ../clients/cli/devices.c:3137
+#, c-format
 msgid "Error: band argument value '%s' is invalid; use 'a' or 'bg'."
-msgstr ""
-"Error: wep-key-type argument value '%s' is invalid, use 'key' or 'phrase'."
+msgstr "Error: el valor del argumento '%s' no es válido, use 'a' o 'bg'."
 
-#: ../clients/cli/devices.c:3222
-#, fuzzy, c-format
+#: ../clients/cli/devices.c:3161
+#, c-format
 msgid "Error: Unknown parameter %s."
-msgstr "Parámetro desconocido: %s\n"
+msgstr ""
+"Error: el parámetro %s es desconocido.                                       "
+"                                                                             "
+"                                                                             "
+"         \n"
+"           "
 
-#: ../clients/cli/devices.c:3241
-#, fuzzy, c-format
+#: ../clients/cli/devices.c:3180
+#, c-format
 msgid "Error: channel requires band too."
-msgstr "Error: se requiere 'apn'."
+msgstr "Error: el canal también  requiere banda."
 
-#: ../clients/cli/devices.c:3247
-#, fuzzy, c-format
+#: ../clients/cli/devices.c:3186
+#, c-format
 msgid "Error: channel '%s' not valid for band '%s'."
-msgstr "Error: 'channel': '%s' no es válido; use <1-13>."
+msgstr "Error: el canal  '%s' no es válido para banda '%s'."
 
-#: ../clients/cli/devices.c:3275
-#, fuzzy, c-format
+#: ../clients/cli/devices.c:3214
+#, c-format
 msgid "Error: Device '%s' supports neither AP nor Ad-Hoc mode."
-msgstr "Error: Device '%s' is not a Wi-Fi device."
+msgstr "Error: El dispositivo '%s' no soporta ni AP ni modo AD-Hoc."
 
-#: ../clients/cli/devices.c:3310
-#, fuzzy, c-format
+#: ../clients/cli/devices.c:3249
+#, c-format
 msgid "Error: Invalid 'password': %s."
-msgstr "Error: propiedad inválida '%s': %s."
+msgstr "Error: contraseña inválida: %s."
 
-#: ../clients/cli/devices.c:3379
-#, fuzzy, c-format
+#: ../clients/cli/devices.c:3318
+#, c-format
 msgid "Error: '%s' cannot repeat."
-msgstr "Error: '%s' parámetro no está presente\n"
+msgstr "Error: '%s' no se puede repetir."
 
-#: ../clients/cli/devices.c:3460
+#: ../clients/cli/devices.c:3399
 #, c-format
 msgid "Error: 'device wifi' command '%s' is not valid."
-msgstr "Error: 'device wifi' command '%s' no es válido."
+msgstr "Error: el comando 'device wifi' '%s' no es válido."
 
 #. Main header name
-#: ../clients/cli/devices.c:3486
+#: ../clients/cli/devices.c:3425
 msgid "Device LLDP neighbors"
-msgstr ""
+msgstr "Device LLDP neighbors"
 
-#: ../clients/cli/devices.c:3589
-#, fuzzy, c-format
+#: ../clients/cli/devices.c:3528
+#, c-format
 msgid "Error: 'device lldp list': %s"
-msgstr "Error: 'device status': %s"
+msgstr "Error:  'device lldp list': %s"
 
-#: ../clients/cli/devices.c:3636
-#, fuzzy, c-format
+#: ../clients/cli/devices.c:3575
+#, c-format
 msgid "Error: 'device lldp' command '%s' is not valid."
-msgstr "Error: 'device wifi' command '%s' no es válido."
+msgstr "Error: 'device lldp' command '%s' no es váĺido."
 
-#: ../clients/cli/devices.c:3825
+#: ../clients/cli/devices.c:3770
 #, c-format
 msgid "Error: 'dev' command '%s' is not valid."
 msgstr "Error: comando «dev» «%s» no válido."
 
-#: ../clients/cli/general.c:35
+#: ../clients/cli/general.c:34
 msgid "RUNNING"
 msgstr "EJECUTANDO"
 
 #. 0
-#: ../clients/cli/general.c:36
+#: ../clients/cli/general.c:35
 msgid "VERSION"
 msgstr "VERSIÓN"
 
 #. 2
-#: ../clients/cli/general.c:38
+#: ../clients/cli/general.c:37
 msgid "STARTUP"
 msgstr "INICIO"
 
 #. 3
-#: ../clients/cli/general.c:39
+#: ../clients/cli/general.c:38
 msgid "CONNECTIVITY"
 msgstr "CONECTIVIDAD"
 
 #. 4
-#: ../clients/cli/general.c:40
+#: ../clients/cli/general.c:39
 msgid "NETWORKING"
 msgstr "RED"
 
 #. 5
-#: ../clients/cli/general.c:41
+#: ../clients/cli/general.c:40
 msgid "WIFI-HW"
 msgstr "WIFI-HW"
 
 #. 6
-#: ../clients/cli/general.c:42
+#: ../clients/cli/general.c:41
 msgid "WIFI"
 msgstr "WIFI"
 
 #. 7
-#: ../clients/cli/general.c:43
+#: ../clients/cli/general.c:42
 msgid "WWAN-HW"
 msgstr "WWAN-HW"
 
 #. 8
-#: ../clients/cli/general.c:44
+#: ../clients/cli/general.c:43
 msgid "WWAN"
 msgstr "WWAN"
 
 #. 9
-#: ../clients/cli/general.c:45
+#: ../clients/cli/general.c:44
 msgid "WIMAX-HW"
 msgstr "WIMAX-HW"
 
 #. 10
-#: ../clients/cli/general.c:46
+#: ../clients/cli/general.c:45
 msgid "WIMAX"
 msgstr "WIMAX"
 
 # auto translated by TM merge from project: NetworkManager, version: 0.9.8.2, DocId: NetworkManager
-#: ../clients/cli/general.c:62
+#: ../clients/cli/general.c:61
 msgid "PERMISSION"
 msgstr "PERMISO"
 
 #. 0
-#: ../clients/cli/general.c:63
+#: ../clients/cli/general.c:62
 msgid "VALUE"
 msgstr "VALOR"
 
-#: ../clients/cli/general.c:71
+#: ../clients/cli/general.c:70
 msgid "LEVEL"
 msgstr "NIVEL"
 
 #. 0
-#: ../clients/cli/general.c:72
+#: ../clients/cli/general.c:71
 msgid "DOMAINS"
 msgstr "DOMINIOS"
 
-#: ../clients/cli/general.c:86
+#: ../clients/cli/general.c:85
 #, c-format
 msgid ""
 "Usage: nmcli general { COMMAND | help }\n"
@@ -4643,7 +5182,7 @@ msgstr ""
 "  logging [level <log level>] [domains <log domains>]\n"
 "\n"
 
-#: ../clients/cli/general.c:97
+#: ../clients/cli/general.c:96
 #, c-format
 msgid ""
 "Usage: nmcli general status { help }\n"
@@ -4660,7 +5199,7 @@ msgstr ""
 "llama a 'nmcli gen status'\n"
 "\n"
 
-#: ../clients/cli/general.c:106
+#: ../clients/cli/general.c:105
 #, c-format
 msgid ""
 "Usage: nmcli general hostname { ARGUMENTS | help }\n"
@@ -4669,8 +5208,8 @@ msgid ""
 "\n"
 "Get or change persistent system hostname.\n"
 "With no arguments, this prints currently configured hostname. When you pass\n"
-"a hostname, NetworkManager will set it as the new persistent system "
-"hostname.\n"
+"a hostname, NetworkManager will set it as the new persistent system hostname."
+"\n"
 "\n"
 msgstr ""
 "Uso: nombre de host general nmcli { ARGUMENTS | help }\n"
@@ -4684,7 +5223,7 @@ msgstr ""
 "de sistema persistente.\n"
 "\n"
 
-#: ../clients/cli/general.c:118
+#: ../clients/cli/general.c:117
 #, c-format
 msgid ""
 "Usage: nmcli general permissions { help }\n"
@@ -4697,7 +5236,7 @@ msgstr ""
 "Mostrar permisos de llamador para operaciones autenticadas.\n"
 "\n"
 
-#: ../clients/cli/general.c:126
+#: ../clients/cli/general.c:125
 #, c-format
 msgid ""
 "Usage: nmcli general logging { ARGUMENTS | help }\n"
@@ -4723,7 +5262,7 @@ msgstr ""
 "para obtener una lista de los dominios de registro posibles.\n"
 "\n"
 
-#: ../clients/cli/general.c:139
+#: ../clients/cli/general.c:138
 #, c-format
 msgid ""
 "Usage: nmcli networking { COMMAND | help }\n"
@@ -4748,33 +5287,29 @@ msgstr ""
 "  connectivity [check]\n"
 "\n"
 
-#: ../clients/cli/general.c:149
+#: ../clients/cli/general.c:148
 #, c-format
-msgid ""
-"Usage: nmcli networking on { help }\n"
+msgid "Usage: nmcli networking on { help }\n"
 "\n"
 "Switch networking on.\n"
 "\n"
-msgstr ""
-"Uso: red nmcli en { help }\n"
+msgstr "Uso: red nmcli en { help }\n"
 "\n"
 "Cambio de redes encendido.\n"
 "\n"
 
-#: ../clients/cli/general.c:157
+#: ../clients/cli/general.c:156
 #, c-format
-msgid ""
-"Usage: nmcli networking off { help }\n"
+msgid "Usage: nmcli networking off { help }\n"
 "\n"
 "Switch networking off.\n"
 "\n"
-msgstr ""
-"Uso: nmcli networking off { help }\n"
+msgstr "Uso: nmcli networking off { help }\n"
 "\n"
 "Switch networking off.\n"
 "\n"
 
-#: ../clients/cli/general.c:165
+#: ../clients/cli/general.c:164
 #, c-format
 msgid ""
 "Usage: nmcli networking connectivity { ARGUMENTS | help }\n"
@@ -4782,8 +5317,8 @@ msgid ""
 "ARGUMENTS := [check]\n"
 "\n"
 "Get network connectivity state.\n"
-"The optional 'check' argument makes NetworkManager re-check the "
-"connectivity.\n"
+"The optional 'check' argument makes NetworkManager re-check the connectivity."
+"\n"
 "\n"
 msgstr ""
 "Uso: nmcli networking connectivity { ARGUMENTS | help }\n"
@@ -4795,8 +5330,8 @@ msgstr ""
 "conectividad.\n"
 "\n"
 
-#: ../clients/cli/general.c:177
-#, fuzzy, c-format
+#: ../clients/cli/general.c:176
+#, c-format
 msgid ""
 "Usage: nmcli radio { COMMAND | help }\n"
 "\n"
@@ -4805,18 +5340,14 @@ msgid ""
 "  all | wifi | wwan [ on | off ]\n"
 "\n"
 msgstr ""
-"Uso: nmcli radio { COMMAND | help }\n"
-"\n"
-"COMANDO := { all | wifi | wwan | wimax }\n"
-"\n"
-"  all | wifi | wwan | wimax [ on | off ]\n"
+"Uso:  nmcli radio { COMMAND | help }\n"
 "\n"
 "COMANDO := { all | wifi | wwan }\n"
 "\n"
 "  all | wifi | wwan [ on | off ]\n"
 "\n"
 
-#: ../clients/cli/general.c:186
+#: ../clients/cli/general.c:185
 #, c-format
 msgid ""
 "Usage: nmcli radio all { ARGUMENTS | help }\n"
@@ -4833,7 +5364,7 @@ msgstr ""
 "Obtener estatus de todos los interruptores de radio encendidos o apagados.\n"
 "\n"
 
-#: ../clients/cli/general.c:196
+#: ../clients/cli/general.c:195
 #, c-format
 msgid ""
 "Usage: nmcli radio wifi { ARGUMENTS | help }\n"
@@ -4850,7 +5381,7 @@ msgstr ""
 "Obtener estatus de interruptor de radio Wi-Fi, encendido o apagado.\n"
 "\n"
 
-#: ../clients/cli/general.c:206
+#: ../clients/cli/general.c:205
 #, c-format
 msgid ""
 "Usage: nmcli radio wwan { ARGUMENTS | help }\n"
@@ -4868,7 +5399,7 @@ msgstr ""
 "apagado.\n"
 "\n"
 
-#: ../clients/cli/general.c:216
+#: ../clients/cli/general.c:215
 #, c-format
 msgid ""
 "Usage: nmcli monitor\n"
@@ -4877,210 +5408,213 @@ msgid ""
 "Prints a line whenever a change occurs in NetworkManager\n"
 "\n"
 msgstr ""
+"Us0: nmcli monitor\n"
+"\n"
+"Cambia el monitor NetworkManager.\n"
+"Imprime en pantalla una línea cuando se presenta un cambio en NetworkManager\n"
+"\n"
 
-#: ../clients/cli/general.c:234
+#: ../clients/cli/general.c:233
 msgid "asleep"
 msgstr "dormido"
 
-#: ../clients/cli/general.c:236
+#: ../clients/cli/general.c:235
 msgid "connecting"
 msgstr "conectando"
 
-#: ../clients/cli/general.c:238
+#: ../clients/cli/general.c:237
 msgid "connected (local only)"
 msgstr "conectado (sólo local)"
 
-#: ../clients/cli/general.c:240
+#: ../clients/cli/general.c:239
 msgid "connected (site only)"
 msgstr "conectado (sólo el sitio)"
 
-#: ../clients/cli/general.c:244
+#: ../clients/cli/general.c:243
 msgid "disconnecting"
 msgstr "desconectando"
 
-#: ../clients/cli/general.c:280
+#: ../clients/cli/general.c:279
 msgid "portal"
 msgstr "portal"
 
-#: ../clients/cli/general.c:282
+#: ../clients/cli/general.c:281
 msgid "limited"
 msgstr "limitado"
 
-#: ../clients/cli/general.c:284
+#: ../clients/cli/general.c:283
 msgid "full"
 msgstr "total"
 
-#: ../clients/cli/general.c:335
+#: ../clients/cli/general.c:334
 #, c-format
 msgid "Error: only these fields are allowed: %s"
 msgstr "Error: solo estos campos están permitidos: %s"
 
-#: ../clients/cli/general.c:358
+#: ../clients/cli/general.c:360
 msgid "NetworkManager status"
 msgstr "Estado de NetworkManager"
 
-#: ../clients/cli/general.c:363
+#: ../clients/cli/general.c:365
 msgid "running"
 msgstr "ejecutando"
 
 # auto translated by TM merge from project: gnome-packagekit, version: 3.8.2, DocId: gnome-packagekit
-#: ../clients/cli/general.c:366
+#: ../clients/cli/general.c:368
 msgid "starting"
 msgstr "Iniciando"
 
 # auto translated by TM merge from project: libvirt, version: 1.1.1, DocId: libvirt
-#: ../clients/cli/general.c:366
+#: ../clients/cli/general.c:368
 msgid "started"
 msgstr "Iniciado"
 
-#: ../clients/cli/general.c:368 ../clients/cli/general.c:369
 #: ../clients/cli/general.c:370 ../clients/cli/general.c:371
-#: ../clients/cli/general.c:372
+#: ../clients/cli/general.c:372 ../clients/cli/general.c:373
+#: ../clients/cli/general.c:374
 msgid "enabled"
 msgstr "activado"
 
-#: ../clients/cli/general.c:368 ../clients/cli/general.c:369
 #: ../clients/cli/general.c:370 ../clients/cli/general.c:371
-#: ../clients/cli/general.c:372
+#: ../clients/cli/general.c:372 ../clients/cli/general.c:373
+#: ../clients/cli/general.c:374
 msgid "disabled"
 msgstr "desactivado"
 
 # auto translated by TM merge from project: NetworkManager, version: 0.9.8.2, DocId: NetworkManager
-#: ../clients/cli/general.c:435
+#: ../clients/cli/general.c:446
 msgid "auth"
 msgstr "auth"
 
-#: ../clients/cli/general.c:464
+#: ../clients/cli/general.c:475
 #, c-format
 msgid "Error: 'general permissions': %s"
 msgstr "Error: 'general permissions': %s"
 
 # auto translated by TM merge from project: NetworkManager, version: 0.9.8.2, DocId: NetworkManager
-#: ../clients/cli/general.c:478
+#: ../clients/cli/general.c:489
 msgid "NetworkManager permissions"
 msgstr "Permisos de NetworkManager"
 
-#: ../clients/cli/general.c:519
+#: ../clients/cli/general.c:530
 #, c-format
 msgid "Error: 'general logging': %s"
 msgstr "Error: 'general logging': %s"
 
-#: ../clients/cli/general.c:534
+#: ../clients/cli/general.c:545
 msgid "NetworkManager logging"
 msgstr "Registro de NetworkManager"
 
-#: ../clients/cli/general.c:556
-#, fuzzy, c-format
+#: ../clients/cli/general.c:567
+#, c-format
 msgid "Error: failed to set hostname: %s"
-msgstr "Error: No se puedo establecer nombre de host: (%d) %s"
+msgstr "Error: No se puedo establecer nombre de host: %s"
 
-#: ../clients/cli/general.c:669
-#, fuzzy, c-format
+#: ../clients/cli/general.c:680
+#, c-format
 msgid "Error: failed to set logging: %s"
-msgstr "Error: acceso denegado para establecer el registro; %s"
+msgstr "Error: no se pudo establecer acceso: %s"
 
-#: ../clients/cli/general.c:678
+#: ../clients/cli/general.c:689
 #, c-format
 msgid "Error: 'general' command '%s' is not valid."
 msgstr "Error: comando 'general' '%s' no es válido."
 
-#: ../clients/cli/general.c:696
+#: ../clients/cli/general.c:707
 #, c-format
 msgid "Error: '--fields' value '%s' is not valid here (allowed field: %s)"
 msgstr "Error: valor '--fields' '%s' no es válido aquí (campo permitido: %s)"
 
-#: ../clients/cli/general.c:721
+#: ../clients/cli/general.c:732
 #, c-format
 msgid "Error: invalid '%s' argument: '%s' (use on/off)."
 msgstr "Error: argumento '%s' es inválido: '%s' (usar on/off)."
 
 # auto translated by TM merge from project: RHN Satellite Installation Guide, version: 5.5, DocId: Trouble_Shooting
-#: ../clients/cli/general.c:732
+#: ../clients/cli/general.c:743
 msgid "Connectivity"
 msgstr "Conectividad"
 
 # auto translated by TM merge from project: RHN Satellite UI, version: 5.5, DocId: java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource
-#: ../clients/cli/general.c:747
+#: ../clients/cli/general.c:758
 msgid "Networking"
 msgstr "Redes"
 
-#: ../clients/cli/general.c:772
+#: ../clients/cli/general.c:783
 #, c-format
 msgid "Error: 'networking connectivity' command '%s' is not valid."
 msgstr "Error: el comando 'networking connectivity' '%s' no es válido."
 
-#: ../clients/cli/general.c:788
+#: ../clients/cli/general.c:799
 #, c-format
 msgid "Error: 'networking' command '%s' is not valid."
 msgstr "Error: el comando 'networking''%s' no es válido."
 
-#: ../clients/cli/general.c:817 ../clients/cli/general.c:837
+#: ../clients/cli/general.c:828 ../clients/cli/general.c:848
 msgid "Radio switches"
 msgstr "Interruptores de radio"
 
 #. no argument, show current WiFi state
-#: ../clients/cli/general.c:855
+#: ../clients/cli/general.c:866
 msgid "Wi-Fi radio switch"
 msgstr "Interruptor de radio Wi-Fi"
 
 #. no argument, show current WWAN (mobile broadband) state
-#: ../clients/cli/general.c:871
+#: ../clients/cli/general.c:882
 msgid "WWAN radio switch"
 msgstr "Interruptor de radio WWAN"
 
-#: ../clients/cli/general.c:882
+#: ../clients/cli/general.c:893
 #, c-format
 msgid "Error: 'radio' command '%s' is not valid."
 msgstr "Error: el comando 'radio' '%s' no es válido."
 
-#: ../clients/cli/general.c:902
-#, fuzzy
+#: ../clients/cli/general.c:914
 msgid "NetworkManager has started"
-msgstr "Estado de NetworkManager"
+msgstr "NetworkManager ha iniciado"
 
-#: ../clients/cli/general.c:902
-#, fuzzy
+#: ../clients/cli/general.c:917
 msgid "NetworkManager has stopped"
-msgstr "Estado de NetworkManager"
+msgstr "NetworkManager se ha detenido"
 
-#: ../clients/cli/general.c:913
-#, fuzzy, c-format
+#: ../clients/cli/general.c:931
+#, c-format
 msgid "Hostname set to '%s'\n"
-msgstr "Establecer nombre de host '%s'"
+msgstr "Se establece nombre de host a  '%s'\n"
 
-#: ../clients/cli/general.c:928
-#, fuzzy, c-format
+#: ../clients/cli/general.c:946
+#, c-format
 msgid "'%s' is now the primary connection\n"
-msgstr "El parámetro '%s' no está presente en la conexión.\n"
+msgstr "'%s' es ahora la conexión primaria.\n"
 
-#: ../clients/cli/general.c:930
-#, fuzzy, c-format
+#: ../clients/cli/general.c:948
+#, c-format
 msgid "There's no primary connection\n"
-msgstr "Verificar conexión: %s\n"
+msgstr "No hay conexión primaria\n"
 
 # auto translated by TM merge from project: RHN Satellite Installation Guide, version: 5.5, DocId: Trouble_Shooting
-#: ../clients/cli/general.c:942
-#, fuzzy, c-format
+#: ../clients/cli/general.c:960
+#, c-format
 msgid "Connectivity is now '%s'\n"
-msgstr "Conectividad"
+msgstr "Ahora la conectividad es '%s'\n"
+"\n"
 
-#: ../clients/cli/general.c:955
-#, fuzzy, c-format
+#: ../clients/cli/general.c:973
+#, c-format
 msgid "Networkmanager is now in the '%s' state\n"
-msgstr "NetworkManager no está funcionando."
+msgstr "Networkmanager ahora está en el estado '%s' \n"
 
-#: ../clients/cli/general.c:966
-#, fuzzy, c-format
+#: ../clients/cli/general.c:984
+#, c-format
 msgid "Error: 'monitor' command '%s' is not valid."
-msgstr "Error: el comando 'radio' '%s' no es válido."
+msgstr "Error: el comando 'monitor' '%s' no es válido."
 
-#: ../clients/cli/general.c:980
-#, fuzzy
+#: ../clients/cli/general.c:998
 msgid "Networkmanager is not running (waiting for it)\n"
-msgstr "NetworkManager no está funcionando."
+msgstr "Networkmanager no es está ejecutando (esperando...)\n"
 
 #: ../clients/cli/nmcli.c:83
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "Usage: %s [OPTIONS] OBJECT { COMMAND | help }\n"
 "\n"
@@ -5088,11 +5622,12 @@ msgid ""
 "  -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"
+"  -c[olors] auto|yes|no                      whether to use colors in output\n"
 "  -f[ields] <field1,field2,...>|all|common   specify fields to output\n"
 "  -e[scape] yes|no                           escape columns separators in "
 "values\n"
+"  -n[ocheck]                                 don't check nmcli and "
+"NetworkManager versions\n"
 "  -a[sk]                                     ask for missing parameters\n"
 "  -s[how-secrets]                            allow displaying passwords\n"
 "  -w[ait] <seconds>                          set timeout waiting for "
@@ -5110,385 +5645,390 @@ msgid ""
 "  m[onitor]       monitor NetworkManager changes\n"
 "\n"
 msgstr ""
-"Uso: %s [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"
-"  -f[ields] <field1,field2,...>|all|common   specify fields to output\n"
-"  -e[scape] yes|no                           escape columns separators in "
-"values\n"
-"  -a[sk]                                     ask for missing parameters\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"
-"\n"
-
-#: ../clients/cli/nmcli.c:142
+"Uso: %s [OPCIONES] OBJETO { COMMAND | help }\n"
+"\n"
+"OPCIONES\n"
+"  -t[erse]                                   salida tersa\n"
+"  -p[retty]                                  salida pretty\n"
+"  -m[ode] tabular|multiline                  modo de salida\n"
+"  -c[olors] auto|yes|no                      si usar o no colores en la "
+"salida\n"
+"  -f[ields] <field1,field2,...>|all|common   especificar campos para salida\n"
+"  -e[scape] yes|no                           escapar separadores de columnas "
+"en valores\n"
+"  -n[ocheck]                                 no revisar versiones de  nmcli "
+"ni NetworkManager\n"
+"  -a[sk]                                     pedir los parámetros que faltan\n"
+"  -s[how-secrets]                            permitir mostrar contraseñas\n"
+"  -w[ait] <seconds>                          establecer tiempo de espera "
+"para terminar operaciones\n"
+"  -v[ersion]                                 mostrar versión del programa\n"
+"  -h[elp]                                    imprimir esta ayuda\n"
+"\n"
+"OBJECTO\n"
+"  g[eneral]       Estado y operaciones generales de NetworkManager\n"
+"  n[etworking]    control general de redes\n"
+"  r[adio]         Interruptores de radio de NetworkManager\n"
+"  c[onnection]    Conexiones de NetworkManager\n"
+"  d[evice]        dispositivos administrados por NetworkManager\n"
+"  a[gent]         Agente secreto de NetworkManager o agente polkit\n"
+"  m[onitor]       monitoriza cambios de  NetworkManager\n"
+"\n"
+
+#: ../clients/cli/nmcli.c:143
 #, c-format
 msgid "Error: Object '%s' is unknown, try 'nmcli help'."
 msgstr "Error: el objeto «%s» desconocido, intente «nmcli help»."
 
-#: ../clients/cli/nmcli.c:183
+#: ../clients/cli/nmcli.c:173
 #, c-format
 msgid "Error: Option '--terse' is specified the second time."
 msgstr "Error: la opción «--terse» se especifica la segunda vez."
 
-#: ../clients/cli/nmcli.c:188
+#: ../clients/cli/nmcli.c:178
 #, c-format
 msgid "Error: Option '--terse' is mutually exclusive with '--pretty'."
 msgstr "Error: la opción «--terse» es mutuamente exclusiva con «--pretty»."
 
-#: ../clients/cli/nmcli.c:196
+#: ../clients/cli/nmcli.c:186
 #, c-format
 msgid "Error: Option '--pretty' is specified the second time."
 msgstr "Error: la opción «--pretty» se especifica la segunda vez."
 
-#: ../clients/cli/nmcli.c:201
+#: ../clients/cli/nmcli.c:191
 #, c-format
 msgid "Error: Option '--pretty' is mutually exclusive with '--terse'."
 msgstr "Error: la opción «--pretty» es mutuamente exclusiva con «--terse»."
 
-#: ../clients/cli/nmcli.c:211 ../clients/cli/nmcli.c:227
-#: ../clients/cli/nmcli.c:245 ../clients/cli/nmcli.c:276
+#: ../clients/cli/nmcli.c:201 ../clients/cli/nmcli.c:217
+#: ../clients/cli/nmcli.c:235 ../clients/cli/nmcli.c:266
 #, c-format
 msgid "Error: missing argument for '%s' option."
 msgstr "Error: falta argumento para opción «%s»."
 
-#: ../clients/cli/nmcli.c:220 ../clients/cli/nmcli.c:238
-#: ../clients/cli/nmcli.c:254
+#: ../clients/cli/nmcli.c:210 ../clients/cli/nmcli.c:228
+#: ../clients/cli/nmcli.c:244
 #, c-format
 msgid "Error: '%s' is not valid argument for '%s' option."
 msgstr "Error: «%s» no es válido argumento para opción «%s»."
 
-#: ../clients/cli/nmcli.c:261
+#: ../clients/cli/nmcli.c:251
 #, c-format
 msgid "Error: fields for '%s' options are missing."
 msgstr "Error: faltan campos para opciones «%s»."
 
-#: ../clients/cli/nmcli.c:281
+#: ../clients/cli/nmcli.c:271
 #, c-format
 msgid "Error: '%s' is not a valid timeout for '%s' option."
 msgstr "Error: '%s' no es un tiempo de espera válido para opción '%s'."
 
-#: ../clients/cli/nmcli.c:288
+#: ../clients/cli/nmcli.c:278
 #, c-format
 msgid "nmcli tool, version %s\n"
 msgstr "herramienta nmcli, versión %s\n"
 
-#: ../clients/cli/nmcli.c:294
+#: ../clients/cli/nmcli.c:284
 #, c-format
 msgid "Error: Option '%s' is unknown, try 'nmcli -help'."
 msgstr "Error: opción «%s» desconocida, intente «nmcli -help»."
 
-#: ../clients/cli/nmcli.c:377 ../clients/cli/nmcli.c:387
-#, fuzzy, c-format
-msgid ""
-"\n"
+#: ../clients/cli/nmcli.c:367 ../clients/cli/nmcli.c:377
+#, c-format
+msgid "\n"
 "Error: nmcli terminated by signal %s (%d)\n"
-msgstr ""
-"\n"
-"Error: nmcli terminado por señal %d."
+msgstr "\n"
+"Error: nmcli terminado por señal %s (%d)\n"
 
 # auto translated by TM merge from project: NetworkManager, version: 0.9.8.2, DocId: NetworkManager
-#: ../clients/cli/nmcli.c:418
-#, fuzzy, c-format
+#: ../clients/cli/nmcli.c:408
+#, c-format
 msgid "Failed to set signal mask: %d\n"
-msgstr "Falló al establecer máscara de señal: %d"
+msgstr "No se pudo establecer máscara de señal: %d\n"
 
 # auto translated by TM merge from project: NetworkManager, version: 0.9.8.2, DocId: NetworkManager
-#: ../clients/cli/nmcli.c:425
-#, fuzzy, c-format
+#: ../clients/cli/nmcli.c:415
+#, c-format
 msgid "Failed to create signal handling thread: %d\n"
-msgstr "Falló al crear hilo de manejo de señal: %d"
+msgstr "No se pudo crear hilo de manejo de  señal: %d\n"
 
-#: ../clients/cli/nmcli.c:522 ../clients/nm-online.c:193
-#, fuzzy, c-format
+#: ../clients/cli/nmcli.c:512 ../clients/nm-online.c:193
+#, c-format
 msgid "Error: Could not create NMClient object: %s."
-msgstr "Error: no se pudo crear un objeto NMClient."
+msgstr "Error: No se pudo crear objeto NMClient: %s."
 
-#: ../clients/cli/nmcli.c:539
+#: ../clients/cli/nmcli.c:529
 msgid "Success"
 msgstr "Éxito"
 
 #: ../clients/cli/polkit-agent.c:66
-#, fuzzy, c-format
+#, c-format
 msgid "Authentication message: %s\n"
-msgstr "Autenticación"
+msgstr "Mensaje de autenticación: %s\n"
+"\n"
 
 #: ../clients/cli/polkit-agent.c:72
-#, fuzzy, c-format
+#, c-format
 msgid "Authentication error: %s\n"
-msgstr "Autenticación"
+msgstr "Error de autenticación: %s\n"
 
 #: ../clients/cli/polkit-agent.c:118
-#, fuzzy, c-format
+#, c-format
 msgid "Warning: polkit agent initialization failed: %s\n"
-msgstr "Falló la inicialización del módem"
+msgstr "Advertencia: Falló la inicialización del agente polkit: %s\n"
+"\n"
 
-#: ../clients/cli/settings.c:796
-#, fuzzy, c-format
+#: ../clients/cli/settings.c:790
+#, c-format
 msgid "%d (key)"
-msgstr "%d (clave-hex-ascii)"
+msgstr "%d (llave)"
 
-#: ../clients/cli/settings.c:798
-#, fuzzy, c-format
+#: ../clients/cli/settings.c:792
+#, c-format
 msgid "%d (passphrase)"
-msgstr "%d (frase de acceso 104/128-bits)"
+msgstr "%d (frase de paso)"
 
-#: ../clients/cli/settings.c:801 ../clients/cli/settings.c:887
+#: ../clients/cli/settings.c:795 ../clients/cli/settings.c:881
 #, c-format
 msgid "%d (unknown)"
 msgstr "%d (desconocido)"
 
-#: ../clients/cli/settings.c:830
+#: ../clients/cli/settings.c:824
 msgid "0 (NONE)"
 msgstr "0 (NONE)"
 
-#: ../clients/cli/settings.c:836
+#: ../clients/cli/settings.c:830
 msgid "REORDER_HEADERS, "
 msgstr "REORDENAR_ENCABEZADOS, "
 
-#: ../clients/cli/settings.c:838
+#: ../clients/cli/settings.c:832
 msgid "GVRP, "
 msgstr "GVRP, "
 
-#: ../clients/cli/settings.c:840
+#: ../clients/cli/settings.c:834
 msgid "LOOSE_BINDING, "
 msgstr "DESATAR_VINCULACIÓN, "
 
-#: ../clients/cli/settings.c:842
-#, fuzzy
+#: ../clients/cli/settings.c:836
 msgid "MVRP, "
-msgstr "GVRP, "
+msgstr "MVRP, "
 
-#: ../clients/cli/settings.c:881
+#: ../clients/cli/settings.c:875
 #, c-format
 msgid "%d (disabled)"
 msgstr "%d (inhabilitado)"
 
-#: ../clients/cli/settings.c:883
+#: ../clients/cli/settings.c:877
 #, c-format
 msgid "%d (enabled, prefer public IP)"
 msgstr "%d (habilitado, prefiere IP pública)"
 
-#: ../clients/cli/settings.c:885
+#: ../clients/cli/settings.c:879
 #, c-format
 msgid "%d (enabled, prefer temporary IP)"
 msgstr "%d (inhabilitado, prefiere temporal IP)"
 
-#: ../clients/cli/settings.c:900
-#, fuzzy, c-format
+#: ../clients/cli/settings.c:894
+#, c-format
 msgid "%d (no)"
-msgstr "%d (desconocido)"
+msgstr "%d (no)"
 
-#: ../clients/cli/settings.c:902
+#: ../clients/cli/settings.c:896
 #, c-format
 msgid "%d (yes)"
-msgstr ""
+msgstr "%d (sí)"
 
-#: ../clients/cli/settings.c:905 ../clients/cli/settings.c:1605
-#, fuzzy, c-format
+#: ../clients/cli/settings.c:899 ../clients/cli/settings.c:1554
+#, c-format
 msgid "%d (default)"
-msgstr "(predeterminado)"
+msgstr "%d (predeterminado)"
 
-#: ../clients/cli/settings.c:918
+#: ../clients/cli/settings.c:912
 msgid "0 (none)"
 msgstr "0 (none)"
 
-#: ../clients/cli/settings.c:924
+#: ../clients/cli/settings.c:918
 msgid "agent-owned, "
 msgstr "agente-adquirido, "
 
-#: ../clients/cli/settings.c:926
+#: ../clients/cli/settings.c:920
 msgid "not saved, "
 msgstr "sin guardar,"
 
 # auto translated by TM merge from project: NetworkManager, version: 0.9.8.2, DocId: NetworkManager
-#: ../clients/cli/settings.c:928
+#: ../clients/cli/settings.c:922
 msgid "not required, "
 msgstr "no requerido"
 
-#: ../clients/cli/settings.c:977 ../clients/tui/nmt-mtu-entry.c:84
+#: ../clients/cli/settings.c:971 ../clients/tui/nmt-mtu-entry.c:84
 msgid "(default)"
 msgstr "(predeterminado)"
 
-#. ----------------------------------------------------------------------------
-#: ../clients/cli/settings.c:1063 ../clients/cli/settings.c:1106
-#: ../clients/cli/settings.c:1140 ../clients/cli/settings.c:1167
-#: ../clients/cli/settings.c:8033
-msgid "<hidden>"
-msgstr ""
-
-#: ../clients/cli/settings.c:1302
+#: ../clients/cli/settings.c:1252
 msgid "0 (disabled)"
 msgstr "0 (inhabilitado)"
 
-#: ../clients/cli/settings.c:1308
+#: ../clients/cli/settings.c:1258
 msgid "enabled, "
 msgstr "habilitado,"
 
-#: ../clients/cli/settings.c:1310
+#: ../clients/cli/settings.c:1260
 msgid "advertise, "
 msgstr "promover, "
 
-#: ../clients/cli/settings.c:1312
+#: ../clients/cli/settings.c:1262
 msgid "willing, "
 msgstr "dispuesto, "
 
-#: ../clients/cli/settings.c:1340
+#: ../clients/cli/settings.c:1290
 msgid "-1 (unset)"
 msgstr "-1 (sin establecer)"
 
-#: ../clients/cli/settings.c:1472 ../clients/cli/settings.c:1777
-#: ../clients/cli/settings.c:1917
+#: ../clients/cli/settings.c:1422 ../clients/cli/settings.c:1724
+#: ../clients/cli/settings.c:1864
 msgid "auto"
 msgstr "auto"
 
 # auto translated by TM merge from project: Skynet topics, version: 1, DocId: 4680-83989
-#: ../clients/cli/settings.c:1485 ../clients/cli/settings.c:1948
+#: ../clients/cli/settings.c:1435 ../clients/cli/settings.c:1895
 msgid "default"
 msgstr "predeterminado"
 
-#: ../clients/cli/settings.c:1607
-#, fuzzy, c-format
+#: ../clients/cli/settings.c:1556
+#, c-format
 msgid "%d (off)"
-msgstr "%d (desconocido)"
+msgstr "%d (off)"
 
-#: ../clients/cli/settings.c:1823
+#: ../clients/cli/settings.c:1770
 #, c-format
 msgid ""
 "invalid option '%s', use a combination of [%s] or 'ignore', 'default' or "
 "'none'"
 msgstr ""
+"opción inválida '%s', use una combinación de [%s] o 'ignore', 'default' o "
+"'none'"
 
-#: ../clients/cli/settings.c:1834
+#: ../clients/cli/settings.c:1781
 msgid "'default' and 'ignore' are incompatible with other flags"
-msgstr ""
+msgstr "'default' e 'ignore' son incompatibles con otros indicadores"
 
-#: ../clients/cli/settings.c:1870
-#, fuzzy, c-format
+#: ../clients/cli/settings.c:1817
+#, c-format
 msgid "invalid mode '%s', use one of %s"
-msgstr "Campo inválido '%s'; campos permitidos: %s"
+msgstr "Modo inválido '%s'; use uno de %s"
 
-#: ../clients/cli/settings.c:1952
+#: ../clients/cli/settings.c:1899
 #, c-format
 msgid "always"
-msgstr ""
+msgstr "Siempre"
 
-#: ../clients/cli/settings.c:2052 ../clients/cli/settings.c:3398
-#: ../clients/cli/settings.c:4590 ../clients/cli/settings.c:5093
+#: ../clients/cli/settings.c:1999 ../clients/cli/settings.c:3286
+#: ../clients/cli/settings.c:4478 ../clients/cli/settings.c:4981
 #: ../libnm-core/nm-keyfile-reader.c:573
-#, fuzzy, c-format
+#, c-format
 msgid "invalid option '%s', use one of [%s]"
-msgstr "Opción '%s' es inválida o su valor es '%s'"
+msgstr "La opción '%s' es inválida,  use uno de [%s]"
 
-#: ../clients/cli/settings.c:2162
+#: ../clients/cli/settings.c:2116
 #, c-format
 msgid "Do you also want to set '%s' to '%s'? [yes]: "
 msgstr "¿Desea también establecer '%s' a '%s'? [yes]: "
 
-#: ../clients/cli/settings.c:2164
+#: ../clients/cli/settings.c:2118
 #, c-format
 msgid "Do you also want to clear '%s'? [yes]: "
 msgstr "¿Desea también limpiar '%s' ? [yes]: "
 
-#: ../clients/cli/settings.c:2325
+#: ../clients/cli/settings.c:2279
 #, c-format
 msgid ""
 "Warning: %s.%s set to '%s', but it might be ignored in infrastructure mode\n"
 msgstr ""
+"Advertencia %s.%s se estableció a '%s', pero podría ignorarse en modo de "
+"infraestructura\n"
+"\n"
 
-#: ../clients/cli/settings.c:2344
+#: ../clients/cli/settings.c:2298
 #, c-format
 msgid "Warning: setting %s.%s requires removing ipv4 and ipv6 settings\n"
 msgstr ""
+"Advertencia: parámetro %s.%s requiere el retiro de los parámetros ipv4 e "
+"ipv6\n"
 
-#: ../clients/cli/settings.c:2346
-#, fuzzy
+#: ../clients/cli/settings.c:2300
 msgid "Do you want to remove them? [yes] "
-msgstr "¿Desea proporcionarlos? (Sí o No) [yes] "
+msgstr "¿Desea retirarlos?  [yes] "
 
-#: ../clients/cli/settings.c:2482 ../clients/cli/settings.c:2877
-#: ../clients/cli/settings.c:5294
+#: ../clients/cli/settings.c:2396 ../clients/cli/settings.c:2791
+#: ../clients/cli/settings.c:5182
 #, c-format
 msgid "'%s' is not valid"
 msgstr "'%s' no es válido"
 
-#: ../clients/cli/settings.c:2505
+#: ../clients/cli/settings.c:2419
 #, c-format
 msgid "'%d' is not valid; use <%d-%d>"
 msgstr "'%d' no es válido; use <%d-%d>"
 
-#: ../clients/cli/settings.c:2527
-#, fuzzy, c-format
+#: ../clients/cli/settings.c:2441
+#, c-format
 msgid "'%lld' is not valid; use <%lld-%lld>"
-msgstr "'%d' no es válido; use <%d-%d>"
+msgstr "'%lld' no es válido; use <%lld-%lld>"
 
-#: ../clients/cli/settings.c:2549
-#, fuzzy, c-format
+#: ../clients/cli/settings.c:2463
+#, c-format
 msgid "'%u' is not valid; use <%u-%u>"
-msgstr "'%u' no es válido; use <%d-%d>"
+msgstr "'%u' no es válido; use <%u-%u>"
 
-#: ../clients/cli/settings.c:2588
-#, fuzzy, c-format
+#: ../clients/cli/settings.c:2502
+#, c-format
 msgid "'%u' flags are not valid; use combination of %s"
-msgstr "'%s' no es válido; use [%s] or [%s]"
+msgstr "'%u' indicadores no son válidos; use la combinación de %s"
 
-#: ../clients/cli/settings.c:2655
+#: ../clients/cli/settings.c:2569
 #, c-format
 msgid "'%s' is not valid; use <option>=<value>"
 msgstr "'%s' no es válido; use <option>=<value>"
 
-#: ../clients/cli/settings.c:2689
+#: ../clients/cli/settings.c:2603
 #, c-format
 msgid "index '%s' is not valid"
 msgstr "index '%s' no es válido"
 
-#: ../clients/cli/settings.c:2694 ../clients/cli/settings.c:2719
+#: ../clients/cli/settings.c:2608 ../clients/cli/settings.c:2633
 msgid "no item to remove"
 msgstr "No se encontró ningún elemento para eliminar"
 
-#: ../clients/cli/settings.c:2698 ../clients/cli/settings.c:2723
+#: ../clients/cli/settings.c:2612 ../clients/cli/settings.c:2637
 #, c-format
 msgid "index '%d' is not in range <0-%d>"
 msgstr "index '%d' no está en el rango <0-%d>"
 
-#: ../clients/cli/settings.c:2738
+#: ../clients/cli/settings.c:2652
 #, c-format
 msgid "invalid option '%s'"
 msgstr "Opción inválida: '%s'"
 
-#: ../clients/cli/settings.c:2740
+#: ../clients/cli/settings.c:2654
 msgid "missing option"
 msgstr "Falta opción"
 
-#: ../clients/cli/settings.c:2767 ../clients/cli/settings.c:2787
-#: ../clients/cli/settings.c:2807 ../clients/cli/settings.c:2827
+#: ../clients/cli/settings.c:2681 ../clients/cli/settings.c:2701
+#: ../clients/cli/settings.c:2721 ../clients/cli/settings.c:2741
 #, c-format
 msgid "'%s' is not a valid number (or out of range)"
 msgstr "'%s' no es un número válido (o está fuera de rango)"
 
-#: ../clients/cli/settings.c:2861
-#, fuzzy, c-format
+#: ../clients/cli/settings.c:2775
+#, c-format
 msgid "'%s' is not a valid value; use -1, 0 or 1"
-msgstr "'%s' no es válido; use 0, 1, o 2"
+msgstr "'%s' no es un valor válido; use ; use -1, 0 o 1"
 
-#: ../clients/cli/settings.c:2893
+#: ../clients/cli/settings.c:2807
 #, c-format
 msgid "'%s' is not a valid Ethernet MAC"
 msgstr "'%s' no es un Ethernet MAC válido"
 
-#: ../clients/cli/settings.c:2918 ../libnm-core/nm-setting-connection.c:864
+#: ../clients/cli/settings.c:2832 ../libnm-core/nm-setting-connection.c:864
 #: ../libnm-core/nm-setting-infiniband.c:255
 #: ../libnm-util/nm-setting-connection.c:834
 #: ../libnm-util/nm-setting-infiniband.c:269
@@ -5496,53 +6036,42 @@ msgstr "'%s' no es un Ethernet MAC válido"
 msgid "'%s' is not a valid interface name"
 msgstr "'%s' no es un nombre de interfaz válido"
 
-#: ../clients/cli/settings.c:2942
-#, fuzzy, c-format
+#: ../clients/cli/settings.c:2856
+#, c-format
 msgid "'%s' is not a valid flag number; use <0-%d>"
-msgstr "'%s'  no es un canal válido; use <1-13>"
+msgstr "'%s'  no es un número de indicador válido; use <0-%d>"
 
-#: ../clients/cli/settings.c:2954
+#: ../clients/cli/settings.c:2868
 #, c-format
 msgid "Warning: '%s' sum is higher than all flags => all flags set\n"
 msgstr ""
+"Advertencia: '%s' suma no es mayor que todos los indicadores => todos los "
+"indicadores están establecidos\n"
 
-#: ../clients/cli/settings.c:2995
+#: ../clients/cli/settings.c:2909
 #, c-format
 msgid "'%s' is not a valid hex character"
 msgstr "'%s' no es un caracter hex"
 
-#: ../clients/cli/settings.c:3025
+#: ../clients/cli/settings.c:2939
 #, c-format
 msgid "'%s' is not a valid MAC"
 msgstr "'%s' no es un MAC válido"
 
-#. Don't allow setting type unless the connection is brand new.
-#. * Just because it's a bad idea and the user wouldn't probably want that.
-#. * No technical reason, really.
-#. * Also, using uuid to see if the connection is brand new is a bit
-#. * 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/cli/settings.c:3053
-#, fuzzy, c-format
-msgid "Can not change the connection type"
-msgstr "Ingrese el tipo de conexión:"
-
-#: ../clients/cli/settings.c:3077 ../libnm-core/nm-setting-connection.c:853
+#: ../clients/cli/settings.c:2965 ../libnm-core/nm-setting-connection.c:853
 #: ../libnm-util/nm-setting-connection.c:791
 #, c-format
 msgid "'%s' is not a valid UUID"
 msgstr "'%s' no es un UUID válido"
 
-#: ../clients/cli/settings.c:3144
+#: ../clients/cli/settings.c:3032
 #, c-format
 msgid "the property doesn't contain permission '%s'"
-msgstr ""
+msgstr "la propiedad no contiene permiso '%s'"
 
-#: ../clients/cli/settings.c:3156
+#: ../clients/cli/settings.c:3044
 msgid ""
-"Enter a list of user permissions. This is a list of user names formatted "
-"as:\n"
+"Enter a list of user permissions. This is a list of user names formatted as:\n"
 "  [user:]<user name 1>, [user:]<user name 2>,...\n"
 "The items can be separated by commas or spaces.\n"
 "\n"
@@ -5555,40 +6084,39 @@ msgstr ""
 "\n"
 "Ejemplo: alice bob charlie\n"
 
-#: ../clients/cli/settings.c:3175
+#: ../clients/cli/settings.c:3063
 #, c-format
 msgid "'%s' is not valid master; use ifname or connection UUID"
 msgstr "'%s' no es un maestro válido; use ifname o UUID de conexión"
 
-#: ../clients/cli/settings.c:3219
+#: ../clients/cli/settings.c:3107
 #, c-format
 msgid "Warning: %s is not an UUID of any existing connection profile\n"
-msgstr ""
+msgstr "Advertencia: %s no es un UUID de un perfil de conexión existente\n"
 
-#: ../clients/cli/settings.c:3223 ../clients/cli/settings.c:3239
-#, fuzzy, c-format
+#: ../clients/cli/settings.c:3111 ../clients/cli/settings.c:3127
+#, c-format
 msgid "'%s' is not a VPN connection profile"
-msgstr "Error: '%s' no es un tipo de conexión válida."
+msgstr "%s' no es un perfil de conexión VPN.."
 
-#: ../clients/cli/settings.c:3232
-#, fuzzy, c-format
+#: ../clients/cli/settings.c:3120
+#, c-format
 msgid "'%s' is not a name of any exiting profile"
-msgstr "'%s' no es una configuración de un equipo o nombre de archivo válidos."
+msgstr "'%s' no es un nombre de ningún un perfil saliente."
 
-#: ../clients/cli/settings.c:3266
-#, fuzzy, c-format
+#: ../clients/cli/settings.c:3154
+#, c-format
 msgid "the value '%s' is not a valid UUID"
 msgstr "'%s' no es un UUID válido"
 
-#: ../clients/cli/settings.c:3273
+#: ../clients/cli/settings.c:3161
 #, c-format
 msgid "the property doesn't contain UUID '%s'"
-msgstr ""
+msgstr "la propiedad no contiene UUID '%s'"
 
-#: ../clients/cli/settings.c:3285
+#: ../clients/cli/settings.c:3173
 msgid ""
-"Enter secondary connections that should be activated when this connection "
-"is\n"
+"Enter secondary connections that should be activated when this connection is\n"
 "activated. Connections can be specified either by UUID or ID (name). nmcli\n"
 "transparently translates names to UUIDs. Note that NetworkManager only "
 "supports\n"
@@ -5597,8 +6125,16 @@ msgid ""
 "\n"
 "Example: private-openvpn, fe6ba5d8-c2fc-4aae-b2e3-97efddd8d9a7\n"
 msgstr ""
+"Ingrese la conexión secundaria que debe ser activada cuando esta conexión "
+"esté activada. Las conexiones pueden ser especificadas ya sea mediante un  "
+"UUID o ID (nombre) nmcli de forma transparentes traduce nombres a las UUID. "
+"Observe que NetworkManager únicamente soporta en el momento  VPN como "
+"conexiones secundarias. Los ítems pueden ir separados por comas o espacios..\n"
+"\n"
+"Ejemplo: private-openvpn, fe6ba5d8-c2fc-4aae-b2e3-97efddd8d9a7\n"
+"\n"
 
-#: ../clients/cli/settings.c:3352
+#: ../clients/cli/settings.c:3240
 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"
@@ -5606,38 +6142,58 @@ msgid ""
 "'false','no','off' to set the connection as not metered\n"
 "'unknown' to let NetworkManager choose a value using some heuristics\n"
 msgstr ""
+"Ingrese un valor que indique si la conexión está sujeta a cuota de datos, "
+"costo de uso u otras limitaciones. Las opciones aceptadas son:\n"
+"'true','yes','on' para establecer la conexión como medida\n"
+"'false','no','off' para establecer la conexión como medida\n"
+"'unknown' para permitir que NetworkManager elija un valor mediante "
+"heurística\n"
 
-#: ../clients/cli/settings.c:3476
+#: ../clients/cli/settings.c:3364
 msgid "private key password not provided"
 msgstr "La contraseña de clave privada no se ha provisto"
 
-#: ../clients/cli/settings.c:3504
-#, fuzzy, c-format
+#: ../clients/cli/settings.c:3392
+#, c-format
 msgid "the property doesn't contain EAP method '%s'"
-msgstr "La propiedad no puede cambiarse"
+msgstr "La propiedad no contiene el método EAP '%s'"
 
-#: ../clients/cli/settings.c:3521
+#: ../clients/cli/settings.c:3409
 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 ""
+"Ingrese la ruta del archivo al certificado CA (opcionalmente prefijado con "
+"el archivo://).\n"
+"  [file://]<file path>\n"
+"Observe que nmcli no soporta certificados que se especifican como datos en "
+"crudo o blobs.\n"
+"Ejemplo: /home/cimrman/cacert.crt\n"
 
-#: ../clients/cli/settings.c:3540
+#: ../clients/cli/settings.c:3428
 #, c-format
 msgid "the property doesn't contain alternative subject match '%s'"
-msgstr ""
+msgstr "la propiedad no contiene correspondencia alternativa con '%s'\n"
+"\n"
+"    "
 
-#: ../clients/cli/settings.c:3556
+#: ../clients/cli/settings.c:3444
 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 ""
+"Ingrese la ruta del archivo al certificado del cliente (opcionalmente "
+"prefijado con el archivo://).\n"
+"  [file://]<file path>\n"
+"Observe que nmcli no soporta certificados que se especifican como datos en "
+"crudo o blobs.\n"
+"Ejemplo: /home/cimrman/jara.crt\n"
 
-#: ../clients/cli/settings.c:3568
+#: ../clients/cli/settings.c:3456
 msgid ""
 "Enter file path to CA certificate for inner authentication (optionally "
 "prefixed\n"
@@ -5646,13 +6202,20 @@ msgid ""
 "Note that nmcli does not support specifying certificates as raw blob data.\n"
 "Example: /home/cimrman/ca-zweite-phase.crt\n"
 msgstr ""
+"Ingrese la ruta del archivo al certificado CA para autenticación interna "
+"(opcionalmente prefijado con el archivo://).\n"
+"  [file://]<file path>\n"
+"Observe que nmcli no soporta certificados que se especifican como datos en "
+"crudo o blobs.\n"
+"Ejemplo:/home/cimrman/ca-zweite-phase.crt\n"
 
-#: ../clients/cli/settings.c:3588
+#: ../clients/cli/settings.c:3476
 #, c-format
 msgid "the property doesn't contain \"phase2\" alternative subject match '%s'"
 msgstr ""
+"la propiedad no contiene  correspondencia de alternativa '%s' de \"phase2\" "
 
-#: ../clients/cli/settings.c:3604
+#: ../clients/cli/settings.c:3492
 msgid ""
 "Enter file path to client certificate for inner authentication (optionally "
 "prefixed\n"
@@ -5661,9 +6224,14 @@ msgid ""
 "Note that nmcli does not support specifying certificates as raw blob data.\n"
 "Example: /home/cimrman/jara-zweite-phase.crt\n"
 msgstr ""
+"Ingrese la ruta al certificado de cliente para autenticación interna "
+"(opcionalmente prefijado con el archivo://).\n"
+"  [file://]<file path>\n"
+"Observe que nmcli no soporta certificados que se especifican como datos en "
+"crudo o blobs.\n"
+"Ejemplo: /home/cimrman/jara-zweite-phase.crt\n"
 
-#: ../clients/cli/settings.c:3624
-#, fuzzy
+#: ../clients/cli/settings.c:3512
 msgid ""
 "Enter path to a private key and the key password (if not set yet):\n"
 "  [file://]<file path> [<password>]\n"
@@ -5672,14 +6240,17 @@ msgid ""
 msgstr ""
 "Ingrese ruta a una clave y contraseña privadas (si aún no lo ha hecho):\n"
 "  <file path> [<password>]\n"
-"Ejemplo: /home/cimrman/jara-priv-key Dardanely\n"
+"Observe que nmcli no soporta certificados que se especifican como datos en "
+"crudo o blobs.                                                               "
+"                                                                             "
+"                                                            Ejemplo: /home/"
+"cimrman/jara-priv-key Dardanely\n"
 
-#: ../clients/cli/settings.c:3695
+#: ../clients/cli/settings.c:3583
 msgid ""
 "Enter bytes as a list of hexadecimal values.\n"
 "Two formats are accepted:\n"
-"(a) a string of hexadecimal digits, where each two digits represent one "
-"byte\n"
+"(a) a string of hexadecimal digits, where each two digits represent one byte\n"
 "(b) space-separated list of bytes written as hexadecimal digits (with "
 "optional 0x/0X prefix, and optional leading 0).\n"
 "\n"
@@ -5696,7 +6267,7 @@ msgstr ""
 "Ejemplos: ab0455a6ea3a74C2\n"
 "          ab 4 55 0xa6 ea 3a 74 C2\n"
 
-#: ../clients/cli/settings.c:3816
+#: ../clients/cli/settings.c:3704
 #, c-format
 msgid ""
 "Enter a list of bonding options formatted as:\n"
@@ -5727,32 +6298,32 @@ msgstr ""
 "\n"
 "Ejemplo: mode=2,miimon=120\n"
 
-#: ../clients/cli/settings.c:3847
+#: ../clients/cli/settings.c:3735
 #, c-format
 msgid "'%s' is not a valid InfiniBand MAC"
 msgstr "'%s' no es un InfiniBand MAC válido"
 
-#: ../clients/cli/settings.c:3884
+#: ../clients/cli/settings.c:3772
 #, c-format
 msgid "'%s' is not a valid IBoIP P_Key"
 msgstr "'%s' no es una llave IBOIP P_key válida"
 
-#: ../clients/cli/settings.c:3915
-#, fuzzy, c-format
+#: ../clients/cli/settings.c:3803
+#, c-format
 msgid "'%s' is not valid (the format is: ip[/prefix] [next-hop] [metric])"
-msgstr "'%s' no es válido (use ip/[prefix] next-hop [metric])"
+msgstr "'%s' no es válido (el formato es: ip[/prefix] [next-hop] [metric])"
 
-#: ../clients/cli/settings.c:3963 ../clients/cli/settings.c:3982
+#: ../clients/cli/settings.c:3851 ../clients/cli/settings.c:3870
 #, c-format
 msgid "invalid IPv4 address '%s'"
 msgstr "Formato de dirección IPv4 inválido '%s'"
 
-#: ../clients/cli/settings.c:3988 ../clients/cli/settings.c:4296
+#: ../clients/cli/settings.c:3876 ../clients/cli/settings.c:4184
 #, c-format
 msgid "the property doesn't contain DNS server '%s'"
-msgstr ""
+msgstr "la propiedad no contiene servidor DNS '%s'"
 
-#: ../clients/cli/settings.c:4000
+#: ../clients/cli/settings.c:3888
 msgid ""
 "Enter a list of IPv4 addresses of DNS servers.\n"
 "\n"
@@ -5762,23 +6333,22 @@ msgstr ""
 "\n"
 "Ejemplo: 8.8.8.8, 8.8.4.4\n"
 
-#: ../clients/cli/settings.c:4036 ../clients/cli/settings.c:4350
+#: ../clients/cli/settings.c:3924 ../clients/cli/settings.c:4238
 #, c-format
 msgid "the property doesn't contain DNS search domain '%s'"
-msgstr ""
+msgstr "la propiedad no contiene dominio de búsqueda DNS '%s'"
 
-#: ../clients/cli/settings.c:4074 ../clients/cli/settings.c:4388
+#: ../clients/cli/settings.c:3962 ../clients/cli/settings.c:4276
 #, c-format
 msgid "the property doesn't contain DNS option '%s'"
-msgstr ""
+msgstr "la propiedad no contiene la opción DNS '%s'"
 
-#: ../clients/cli/settings.c:4128 ../clients/cli/settings.c:4441
+#: ../clients/cli/settings.c:4016 ../clients/cli/settings.c:4329
 #, c-format
 msgid "the property doesn't contain IP address '%s'"
-msgstr ""
+msgstr "La propiedad no puede contiene la dirección IP '%s'"
 
-#: ../clients/cli/settings.c:4141
-#, fuzzy
+#: ../clients/cli/settings.c:4029
 msgid ""
 "Enter a list of IPv4 addresses formatted as:\n"
 "  ip[/prefix], ip[/prefix],...\n"
@@ -5787,23 +6357,22 @@ msgid ""
 "Example: 192.168.1.5/24, 10.0.0.11/24\n"
 msgstr ""
 "Ingrese una lista de direcciones IPv4 formateadas así:\n"
-"  ip[/prefix] [gateway], ip[/prefix] [gateway],...\n"
+"    ip[/prefix], ip[/prefix],...\n"
 "Falta prefijo aparece como prefijo de 32.\n"
 "\n"
-"Ejemplo: 192.168.1.5/24 192.168.1.1, 10.0.0.11/24\n"
+"Ejemplo: 192.168.1.5/24, 10.0.0.11/24\n"
 
-#: ../clients/cli/settings.c:4157 ../clients/cli/settings.c:4470
-#, fuzzy, c-format
+#: ../clients/cli/settings.c:4045 ../clients/cli/settings.c:4358
+#, c-format
 msgid "invalid gateway address '%s'"
-msgstr "Puerta de enlace inválida '%s'"
+msgstr "Dirección de puerta de enlace inválida '%s'"
 
-#: ../clients/cli/settings.c:4212 ../clients/cli/settings.c:4525
-#, fuzzy, c-format
+#: ../clients/cli/settings.c:4100 ../clients/cli/settings.c:4413
+#, c-format
 msgid "the property doesn't contain route '%s'"
-msgstr "La propiedad no puede cambiarse"
+msgstr "La propiedad no puede contiene la ruta '%s'"
 
-#: ../clients/cli/settings.c:4225
-#, fuzzy
+#: ../clients/cli/settings.c:4113
 msgid ""
 "Enter a list of IPv4 routes formatted as:\n"
 "  ip[/prefix] [next-hop] [metric],...\n"
@@ -5815,19 +6384,22 @@ 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 ""
-"Ingresar una lista de rutas IPv4 formateadas como:\n"
-"  ip/[prefix] next-hop [metric],...\n"
-"El prefijo faltante se ve como un prefijo de 32.\n"
-"Métrica faltante aparece como una metrica de 0.\n"
+"Ingrese una lista de rutas IPv4 formateadas así:\n"
+"  ip[/prefix] [next-hop] [metric],...\n"
 "\n"
-"Ejemplo: 192.168.2.0/24 192.168.2.1 3, 10.1.0.0/16 10.0.0.254\n"
+"Missing prefix is regarded as a prefix of 32.\n"
+"Missing next-hop is regarded as 0.0.0.0.\n"
+"Missing metric means default (NM/kernel will set a default value).\n"
+"\n"
+"Ejemplos: 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/cli/settings.c:4271 ../clients/cli/settings.c:4290
+#: ../clients/cli/settings.c:4159 ../clients/cli/settings.c:4178
 #, c-format
 msgid "invalid IPv6 address '%s'"
 msgstr "Dirección IPv4 inválida '%s'"
 
-#: ../clients/cli/settings.c:4308
+#: ../clients/cli/settings.c:4196
 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 "
@@ -5848,8 +6420,7 @@ msgstr ""
 "\n"
 "Ejemplo: 2607:f0d0:1002:51::4, 2607:f0d0:1002:51::1\n"
 
-#: ../clients/cli/settings.c:4454
-#, fuzzy
+#: ../clients/cli/settings.c:4342
 msgid ""
 "Enter a list of IPv6 addresses formatted as:\n"
 "  ip[/prefix], ip[/prefix],...\n"
@@ -5858,13 +6429,12 @@ msgid ""
 "Example: 2607:f0d0:1002:51::4/64, 1050:0:0:0:5:600:300c:326b\n"
 msgstr ""
 "Ingrese una lista de direcciones IPv6 formateadas así:\n"
-"  ip[/prefix] [gateway], ip[/prefix] [gateway],...\n"
-"Falta prefijo aparece como prefijo de 128.\n"
+"  ip[/prefix], ip[/prefix],...\n"
+"Prefijo faltante aparece como prefijo de 128.\n"
 ".\n"
-"Ejemplo: 192.168.1.5/24 192.168.1.1, 10.0.0.11/24\n"
+"Ejemplo:  2607:f0d0:1002:51::4/64, 1050:0:0:0:5:600:300c:326b\n"
 
-#: ../clients/cli/settings.c:4538
-#, fuzzy
+#: ../clients/cli/settings.c:4426
 msgid ""
 "Enter a list of IPv6 routes formatted as:\n"
 "  ip[/prefix] [next-hop] [metric],...\n"
@@ -5877,36 +6447,40 @@ msgid ""
 "db8:beef::3 2\n"
 "          abbe::/64 55\n"
 msgstr ""
-"Ingresar una lista de rutas IPv6 formateadas como:\n"
-"  ip/[prefix] next-hop [metric],...\n"
-"El prefijo faltante se ve como un prefijo de 128.\n"
-"Métrica faltante aparece como una metrica de 0.\n"
+"Ingrese una lista de rutas IPv6 formateadas como:\n"
+"  ip/[prefix] next-hop [metric],...,\n"
+"\n"
+"El prefijo faltante se visualiza como un prefijo de 128.\n"
+"El next-hop faltante se visualiza como \"::\".\n"
+"La métrica faltante significa predeterminado ( NM/kernel establecerá un "
+"valor predeterminado).\n"
 "\n"
-"Ejemplo: 2001:db8:beef:2::/64 2001:db8:beef::2, 2001:db8:beef:3::/64 2001:"
+"Ejemplos: 2001:db8:beef:2::/64 2001:db8:beef::2, 2001:db8:beef:3::/64 2001:"
 "db8:beef::3 2\n"
+"          abbe::/64 55\n"
 
-#: ../clients/cli/settings.c:4555 ../libnm-core/nm-setting-gsm.c:363
+#: ../clients/cli/settings.c:4443 ../libnm-core/nm-setting-gsm.c:363
 #: ../libnm-util/nm-setting-gsm.c:364
 #, c-format
 msgid "'%s' is not a number"
 msgstr "'%s' no es un número "
 
-#: ../clients/cli/settings.c:4562
+#: ../clients/cli/settings.c:4450
 #, c-format
 msgid "'%s' is not valid; use 0, 1, or 2"
 msgstr "'%s' no es válido; use 0, 1, o 2"
 
-#: ../clients/cli/settings.c:4609
+#: ../clients/cli/settings.c:4497
 #, c-format
 msgid "'%s' is not a valid channel; use <1-13>"
 msgstr "'%s'  no es un canal válido; use <1-13>"
 
-#: ../clients/cli/settings.c:4646
+#: ../clients/cli/settings.c:4534
 #, c-format
 msgid "'%s' is not valid; use [e, o, n]"
 msgstr "'%s' no es válido; use [e, o, n]"
 
-#: ../clients/cli/settings.c:4674
+#: ../clients/cli/settings.c:4562
 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 "
@@ -5924,67 +6498,72 @@ msgstr ""
 "\"roundrobin\"}, \"ports\": {\"eth1\": {}, \"eth2\": {}} }\n"
 "          set team.config /etc/my-team.conf\n"
 
-#: ../clients/cli/settings.c:4714
+#: ../clients/cli/settings.c:4602
 msgid "no priority to remove"
 msgstr "no hay prioridad para retirar"
 
-#: ../clients/cli/settings.c:4718
+#: ../clients/cli/settings.c:4606
 #, c-format
 msgid "index '%d' is not in the range of <0-%d>"
 msgstr "index '%d' no está en el rango de <0-%d>"
 
-#: ../clients/cli/settings.c:4757
+#: ../clients/cli/settings.c:4645
 #, c-format
 msgid ""
-"Warning: only one mapping at a time is supported; taking the first one (%s)\n"
+"Warning: only one mapping at a time is supported; taking the first one "
+"(%s)\n"
 msgstr ""
+"Advertencia: solamente un mapeo a la vez recibe soporte; tomando el primero  "
+"(%s)\n"
+"\n"
 
-#: ../clients/cli/settings.c:4764
-#, fuzzy, c-format
+#: ../clients/cli/settings.c:4652
+#, c-format
 msgid "the property doesn't contain mapping '%s'"
-msgstr "La propiedad no puede cambiarse"
+msgstr "la propiedad no contiene mapeo '%s'"
 
-#: ../clients/cli/settings.c:4812
-#, fuzzy, c-format
+#: ../clients/cli/settings.c:4700
+#, c-format
 msgid "'%s' cannot be empty"
-msgstr "opción '%s' está vacía"
+msgstr "'%s'no puede estar vacía"
 
-#: ../clients/cli/settings.c:4886 ../clients/cli/settings.c:5053
-#: ../libnm-core/nm-setting-wired.c:651 ../libnm-core/nm-setting-wireless.c:820
-#: ../libnm-core/nm-setting-wireless.c:832 ../libnm-util/nm-setting-wired.c:646
+#: ../clients/cli/settings.c:4774 ../clients/cli/settings.c:4941
+#: ../libnm-core/nm-setting-wired.c:651
+#: ../libnm-core/nm-setting-wireless.c:820
+#: ../libnm-core/nm-setting-wireless.c:832
+#: ../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' no es una dirección MAC válida"
 
-#: ../clients/cli/settings.c:4892 ../clients/cli/settings.c:5059
+#: ../clients/cli/settings.c:4780 ../clients/cli/settings.c:4947
 #, c-format
 msgid "the property doesn't contain MAC address '%s'"
-msgstr ""
+msgstr "la propiedad no contiene la dirección MAC '%s'"
 
-#: ../clients/cli/settings.c:4911
-#, fuzzy, c-format
+#: ../clients/cli/settings.c:4799
+#, c-format
 msgid "'%s' is not valid; 2 or 3 strings should be provided"
-msgstr "'%s' no es válido; se deben proporcionar 3 cadenas "
+msgstr "'%s' no es válido; se deben proporcionar 2 o 3 cadenas "
 
-#: ../clients/cli/settings.c:4925
-#, fuzzy
+#: ../clients/cli/settings.c:4813
 msgid ""
 "Enter a list of subchannels (comma or space separated).\n"
 "\n"
 "Example: 0.0.0e20 0.0.0e21 0.0.0e22\n"
 msgstr ""
-"Ingrese una lista de tres canales (separados por espacio o coma).\n"
+"Ingrese una lista de subcanales (separados por espacio o coma).\n"
 "\n"
 "Ejemplo: 0.0.0e20 0.0.0e21 0.0.0e22\n"
 
-#: ../clients/cli/settings.c:4947
+#: ../clients/cli/settings.c:4835
 #, c-format
 msgid "'%s' string value should consist of 1 - 199 characters"
-msgstr ""
+msgstr "el valor de la cadena '%s' debe constar entre 1 y  199 caracteres"
 
-#: ../clients/cli/settings.c:4979
+#: ../clients/cli/settings.c:4867
 #, c-format
 msgid ""
 "Enter a list of S/390 options formatted as:\n"
@@ -5995,58 +6574,62 @@ msgstr ""
 "  opción = <value>, option = <value>,...\n"
 "Las opciones válidas son: %s\n"
 
-#: ../clients/cli/settings.c:5025
+#: ../clients/cli/settings.c:4913
 #, c-format
 msgid "'%s' is not a valid channel"
 msgstr "'%s' no es un canal válido"
 
-#: ../clients/cli/settings.c:5031
+#: ../clients/cli/settings.c:4919
 #, c-format
 msgid "'%ld' is not a valid channel"
 msgstr "'%ld' no es un canal válido"
 
-#: ../clients/cli/settings.c:5125
-#, fuzzy, c-format
+#: ../clients/cli/settings.c:5013
+#, c-format
 msgid "invalid option '%s', use 'default', 'never' or 'always'"
-msgstr "Opción '%s' es inválida o su valor es '%s'"
+msgstr "Opción '%s' es inválida, use 'default' 'never' o 'always'"
 
-#: ../clients/cli/settings.c:5186 ../clients/cli/settings.c:5225
-#: ../clients/cli/settings.c:5264
+#: ../clients/cli/settings.c:5074 ../clients/cli/settings.c:5113
+#: ../clients/cli/settings.c:5152
 #, c-format
 msgid "the property doesn't contain protocol '%s'"
-msgstr ""
+msgstr "la propiedad no contiene el protocolo '%s'"
 
-#: ../clients/cli/settings.c:5303
+#: ../clients/cli/settings.c:5191
 #, c-format
 msgid ""
 "'%s' not compatible with %s '%s', please change the key or set the right %s "
 "first."
 msgstr ""
+"'%s' no es compatible con %s '%s', por favor cambie la llave o establezca el "
+"derecho  %s primero."
 
-#: ../clients/cli/settings.c:5311
+#: ../clients/cli/settings.c:5199
 #, c-format
 msgid "WEP key is guessed to be of '%s'\n"
 msgstr "Clave WEP se cree que sea de '%s'\n"
 
-#: ../clients/cli/settings.c:5313
-#, fuzzy, c-format
+#: ../clients/cli/settings.c:5201
+#, c-format
 msgid "WEP key index set to '%d'\n"
-msgstr "Clave WEP se cree que sea de '%s'\n"
+msgstr "El índice de llave WEP se estableció a  '%d'\n"
 
-#: ../clients/cli/settings.c:5336
+#: ../clients/cli/settings.c:5224
 #, c-format
 msgid "'%s' not among [0 (unknown), 1 (key), 2 (passphrase)]"
 msgstr "'%s' no está entre [0 (desconocido), 1 (clave), 2 (frase de paso)]"
 
-#: ../clients/cli/settings.c:5352 ../clients/cli/settings.c:5355
-#: ../clients/cli/settings.c:5358 ../clients/cli/settings.c:5361
+#: ../clients/cli/settings.c:5240 ../clients/cli/settings.c:5243
+#: ../clients/cli/settings.c:5246 ../clients/cli/settings.c:5249
 #, c-format
 msgid ""
 "Warning: '%s' is not compatible with '%s' type, please change or delete the "
 "key.\n"
 msgstr ""
+"Advertencia: '%s' no es compatible con  el tipo '%s', por favor cambie o "
+"borre la clave.\n"
 
-#: ../clients/cli/settings.c:5374
+#: ../clients/cli/settings.c:5262
 #, c-format
 msgid ""
 "Enter the type of WEP keys. The accepted values are: 0 or unknown, 1 or key, "
@@ -6055,80 +6638,88 @@ msgstr ""
 "Ingrese e tipo de claves WEP. Los valores aceptados son: 0 o Desconocido, 1 "
 "o clave y 2 o frase de paso..\n"
 
-#: ../clients/cli/settings.c:5387
+#: ../clients/cli/settings.c:5275
 #, c-format
 msgid "'%s' is not a valid PSK"
 msgstr "'%s' no es un PSK válido"
 
-#: ../clients/cli/settings.c:5431
+#: ../clients/cli/settings.c:5319
 #, c-format
 msgid "'%s' is not a valid DCB flag"
 msgstr "'%s' no es un indicador DCB válido"
 
-#: ../clients/cli/settings.c:5454
+#: ../clients/cli/settings.c:5342
 #, c-format
 msgid "'%s' is not a DCB app priority"
 msgstr "'%s' no es una prioridad app DCB"
 
-#: ../clients/cli/settings.c:5480
+#: ../clients/cli/settings.c:5368
 msgid "must contain 8 comma-separated numbers"
 msgstr "debe contener 8 números separados por comas"
 
-#: ../clients/cli/settings.c:5497
+#: ../clients/cli/settings.c:5385
 #, c-format
 msgid "'%s' not a number between 0 and %u (inclusive) or %u"
 msgstr "'%s' no un número entre 0 y %u (inclusive) o %u"
 
-#: ../clients/cli/settings.c:5500
+#: ../clients/cli/settings.c:5388
 #, c-format
 msgid "'%s' not a number between 0 and %u (inclusive)"
 msgstr "'%s' no es un número entre 0 y %u (inclusive)"
 
-#: ../clients/cli/settings.c:5522
+#: ../clients/cli/settings.c:5410
 #, c-format
-msgid ""
-"Warning: changes will have no effect until '%s' includes 1 (enabled)\n"
+msgid "Warning: changes will have no effect until '%s' includes 1 (enabled)\n"
 "\n"
 msgstr ""
 "Advertencia: los cambios no tendrán efecto sino hasta que '%s' incluya 1 "
 "(habilitado)\n"
 "\n"
 
-#: ../clients/cli/settings.c:5575
+#: ../clients/cli/settings.c:5463
 #, c-format
 msgid "bandwidth percentages must total 100%%"
 msgstr "Los porcentajes de ancho de banda deben ser en total 100%%"
 
-#: ../clients/cli/settings.c:5661 ../clients/cli/settings.c:5667
+#: ../clients/cli/settings.c:5549 ../clients/cli/settings.c:5555
 msgid "SIM operator ID must be a 5 or 6 number MCCMNC code"
-msgstr ""
+msgstr "ID de operador SIM debe ser un código MCCMNC número 5 o 6 "
 
-#: ../clients/cli/settings.c:5710
-#, fuzzy, c-format
+#: ../clients/cli/settings.c:5598
+#, c-format
 msgid "invalid option '%s', use '%s' or '%s'"
-msgstr "Opción '%s' es inválida o su valor es '%s'"
+msgstr "Opción '%s' es inválida; use '%s' o '%s'"
 
-#: ../clients/cli/settings.c:7777
+#: ../clients/cli/settings.c:7644
 msgid "don't know how to get the property value"
 msgstr "No sé cómo obtener el valor de propiedad"
 
-#: ../clients/cli/settings.c:7830 ../clients/cli/settings.c:7870
+#: ../clients/cli/settings.c:7697 ../clients/cli/settings.c:7737
 msgid "the property can't be changed"
 msgstr "La propiedad no puede cambiarse"
 
-#: ../clients/cli/settings.c:7954
-#, fuzzy
+#: ../clients/cli/settings.c:7821
 msgid "(not available)"
-msgstr "no disponible"
+msgstr "(no disponible)"
 
-#: ../clients/cli/settings.c:7979
+#: ../clients/cli/settings.c:7846
 msgid "[NM property description]"
 msgstr "[Descripción de propiedad NM]"
 
-#: ../clients/cli/settings.c:7984
+#: ../clients/cli/settings.c:7851
 msgid "[nmcli specific description]"
 msgstr "[Descripción de propiedad nmcli]"
 
+#. ----------------------------------------------------------------------------
+#: ../clients/cli/settings.c:7900
+msgid "<hidden>"
+msgstr "<hidden>"
+
+#: ../clients/cli/utils.c:124
+#, c-format
+msgid "Error: value for '%s' argument is required."
+msgstr "Error: se requiere valor para argumento '%s'."
+
 #: ../clients/cli/utils.c:149
 #, c-format
 msgid "Error: Argument '%s' was expected, but '%s' provided."
@@ -6139,56 +6730,97 @@ msgstr "Error: Se esperaba argumento '%s', pero proporcionó '%s'."
 msgid "Error: Unexpected argument '%s'"
 msgstr "Error: Argumento inesperado '%s'"
 
+# auto translated by TM merge from project: NetworkManager, version: 0.9.8.2, DocId: NetworkManager
+#: ../clients/cli/utils.c:202
+#, c-format
+msgid "Error converting IP4 address '0x%X' to text form"
+msgstr "Error al convertir dirección IP4 '0x%X' a forma de texto"
+
+# auto translated by TM merge from project: NetworkManager, version: 0.9.8.2, DocId: NetworkManager
+#: ../clients/cli/utils.c:230
+#, c-format
+msgid "Error converting IP6 address '%s' to text form"
+msgstr "Error al convertir dirección IP6 '%s' a forma de texto"
+
 #. Translators: the first %s is the partial value entered by
 #. * the user, the second %s a list of compatible values.
-#.
-#: ../clients/cli/utils.c:492 ../clients/cli/utils.c:523
-#, fuzzy, c-format
+#. 
+#: ../clients/cli/utils.c:546 ../clients/cli/utils.c:577
+#, c-format
 msgid "'%s' is ambiguous (%s)"
-msgstr "'%s' es ambiguo (%s x %s)"
+msgstr "'%s' es ambiguo (%s)"
 
-#: ../clients/cli/utils.c:502
+#: ../clients/cli/utils.c:556
 #, c-format
 msgid "'%s' is not valid; use [%s] or [%s]"
 msgstr "'%s' no es válido; use [%s] or [%s]"
 
-#: ../clients/cli/utils.c:535
-#, fuzzy, c-format
+#: ../clients/cli/utils.c:589
+#, c-format
 msgid "'%s' is not valid; use [%s], [%s] or [%s]"
-msgstr "'%s' no es válido; use [%s] or [%s]"
+msgstr "'%s' no es válido; use [%s], [%s] o  [%s]"
 
-#: ../clients/cli/utils.c:634
+#: ../clients/cli/utils.c:688
 #, c-format
 msgid "'%s' is ambiguous (%s x %s)"
 msgstr "'%s' es ambiguo (%s x %s)"
 
-#: ../clients/cli/utils.c:646
+#: ../clients/cli/utils.c:700
 #, c-format
 msgid "missing name, try one of [%s]"
 msgstr "Falta el nombre, intente uno de [%s]"
 
-#: ../clients/cli/utils.c:893
+#: ../clients/cli/utils.c:964
 #, c-format
 msgid "field '%s' has to be alone"
 msgstr "el campo «%s» tiene que estar solo"
 
-#: ../clients/cli/utils.c:896
+#: ../clients/cli/utils.c:967
 #, c-format
 msgid "invalid field '%s'; allowed fields: %s"
 msgstr "Campo inválido '%s'; campos permitidos: %s"
 
-#: ../clients/cli/utils.c:953
+#: ../clients/cli/utils.c:1024
 msgid "Option '--terse' requires specifying '--fields'"
 msgstr "Opción «--terse» requiere especificar «--fields»"
 
-#: ../clients/cli/utils.c:957
+#: ../clients/cli/utils.c:1028
 #, c-format
 msgid "Option '--terse' requires specific '--fields' option values , not '%s'"
 msgstr "Opción «--terse» requiere valores de «--fields» específicos, no «%s»"
 
+#: ../clients/cli/utils.c:1390
+#, c-format
+msgid ""
+"Warning: nmcli (%s) and NetworkManager (%s) versions don't match. Use --"
+"nocheck to suppress the warning.\n"
+msgstr ""
+"Advertencia: las versiones de nmcli (%s) y de NetworkManager (%s) no "
+"coinciden. Use «--nocheck» para evitar el aviso.\n"
+
+#: ../clients/cli/utils.c:1399
+#, c-format
+msgid ""
+"Error: nmcli (%s) and NetworkManager (%s) versions don't match. Force "
+"execution using --nocheck, but the results are unpredictable."
+msgstr ""
+"Error: las versiones de nmcli (%s) y de NetworkManager (%s) no coinciden. "
+"Fuerce la ejecución usando «--nocheck», pero los resultados son "
+"impredecibles."
+
 #: ../clients/common/nm-polkit-listener.c:212
 msgid "An authentication session is already underway."
-msgstr ""
+msgstr "Ya hay una sesión de autenticación en marcha"
+
+#. TTLS and PEAP are actually much more complicated, but this complication
+#. * is not visible here since we only care about phase2 authentication
+#. * (and don't even care of which one)
+#. 
+#: ../clients/common/nm-secret-agent-simple.c:223
+#: ../clients/common/nm-secret-agent-simple.c:328
+#: ../clients/tui/nmt-page-dsl.c:66 ../clients/tui/nmt-page-wifi.c:332
+msgid "Username"
+msgstr "Nombre de usuario"
 
 #: ../clients/common/nm-secret-agent-simple.c:230
 #: ../clients/common/nm-secret-agent-simple.c:273
@@ -6197,10 +6829,9 @@ msgstr ""
 #: ../clients/common/nm-secret-agent-simple.c:492
 #: ../clients/common/nm-secret-agent-simple.c:507
 #: ../clients/common/nm-secret-agent-simple.c:525
-#: ../clients/common/nm-vpn-helpers.c:119
-#: ../clients/common/nm-vpn-helpers.c:120
-#: ../clients/common/nm-vpn-helpers.c:124
-#: ../clients/common/nm-vpn-helpers.c:127 ../clients/tui/nmt-page-dsl.c:75
+#: ../clients/common/nm-vpn-helpers.c:101
+#: ../clients/common/nm-vpn-helpers.c:102
+#: ../clients/common/nm-vpn-helpers.c:105 ../clients/tui/nmt-page-dsl.c:75
 #: ../clients/tui/nmt-page-wifi.c:277 ../clients/tui/nmt-page-wifi.c:308
 #: ../clients/tui/nmt-page-wifi.c:341
 msgid "Password"
@@ -6276,59 +6907,30 @@ msgid "A password is required to connect to '%s'."
 msgstr "Se requiere una contraseña para conectarse a '%s'."
 
 #: ../clients/common/nm-secret-agent-simple.c:537
-#, fuzzy
 msgid "VPN password required"
-msgstr "Se requiere código PIN"
+msgstr "Se requiere código VPN"
 
-#: ../clients/common/nm-vpn-helpers.c:48
-#, fuzzy, c-format
-msgid "unknown VPN plugin \"%s\""
-msgstr "Dominio de registro desconocido «%s»"
-
-#: ../clients/common/nm-vpn-helpers.c:59
-#, c-format
-msgid "cannot cannot load legacy-only VPN plugin \"%s\" for \"%s\""
-msgstr ""
+#: ../clients/common/nm-vpn-helpers.c:61
+msgid "could not get VPN plugin info"
+msgstr "No se pudo obtener información de complemento VPN"
 
-#: ../clients/common/nm-vpn-helpers.c:64
-#, c-format
-msgid ""
-"cannot load VPN plugin \"%s\" due to missing \"%s\". Missing client plugin?"
-msgstr ""
-
-#: ../clients/common/nm-vpn-helpers.c:69
-#, fuzzy, c-format
-msgid "failed to load VPN plugin \"%s\": %s"
-msgstr "Error: falló al modificar %s.%s: %s."
-
-#: ../clients/common/nm-vpn-helpers.c:121
-#, fuzzy
-msgid "Certificate password"
-msgstr "Contraseña de llave privada"
-
-#: ../clients/common/nm-vpn-helpers.c:122
-#, fuzzy
-msgid "HTTP proxy password"
-msgstr "Mostrar contraseña"
-
-#: ../clients/common/nm-vpn-helpers.c:125
-#: ../clients/common/nm-vpn-helpers.c:128
-#, fuzzy
+#: ../clients/common/nm-vpn-helpers.c:103
+#: ../clients/common/nm-vpn-helpers.c:106
 msgid "Group password"
-msgstr "Mostrar contraseña"
+msgstr "Agrupar contraseña"
 
-#: ../clients/common/nm-vpn-helpers.c:130 ../clients/tui/nmt-page-ip4.c:143
+#: ../clients/common/nm-vpn-helpers.c:108 ../clients/tui/nmt-page-ip4.c:143
 #: ../clients/tui/nmt-page-ip6.c:143
 msgid "Gateway"
 msgstr "Puerta de enlace"
 
-#: ../clients/common/nm-vpn-helpers.c:131
+#: ../clients/common/nm-vpn-helpers.c:109
 msgid "Cookie"
-msgstr ""
+msgstr "Cookie"
 
-#: ../clients/common/nm-vpn-helpers.c:132
+#: ../clients/common/nm-vpn-helpers.c:110
 msgid "Gateway certificate hash"
-msgstr ""
+msgstr "Hash de certificado de puerta de enlace "
 
 #: ../clients/nm-online.c:94
 msgid "Connecting"
@@ -6344,9 +6946,9 @@ msgstr ""
 
 # auto translated by TM merge from project: NetworkManager, version: 0.9.8.2, DocId: NetworkManager
 #: ../clients/nm-online.c:148
-#, fuzzy
 msgid "Exit immediately if NetworkManager is not running or connecting"
-msgstr "Salir inmediatamente si NetworkManager no está ejecutándose "
+msgstr ""
+"Salir inmediatamente si NetworkManager no está ejecutándose o conectándose"
 
 # auto translated by TM merge from project: NetworkManager, version: 0.9.8.2, DocId: NetworkManager
 #: ../clients/nm-online.c:149
@@ -6354,11 +6956,8 @@ msgid "Don't print anything"
 msgstr "No imprimir nada"
 
 #: ../clients/nm-online.c:150
-#, fuzzy
 msgid "Wait for NetworkManager startup instead of a connection"
-msgstr ""
-"Espera a que NetworkManager termine de activar las conexiones de red de "
-"inicio."
+msgstr "Esperar a que NetworkManager inicie en lugar que sea una conexión"
 
 #: ../clients/nm-online.c:171
 msgid ""
@@ -6377,7 +6976,7 @@ msgstr ""
 #: ../clients/tui/newt/nmt-newt-utils.c:177 ../clients/tui/nmt-editor.c:415
 #: ../clients/tui/nmt-password-dialog.c:174
 #: ../clients/tui/nmt-route-editor.c:122 ../clients/tui/nmtui-hostname.c:69
-#: ../clients/tui/nmtui.c:136
+#: ../clients/tui/nmtui.c:114
 msgid "OK"
 msgstr "Aceptar"
 
@@ -6393,55 +6992,37 @@ msgid "Editor failed: %s"
 msgstr "Falló el editor: %s"
 
 #: ../clients/tui/newt/nmt-newt-utils.c:373
-#, fuzzy, c-format
+#, c-format
 msgid "Editor failed with status %d"
-msgstr "Falló el editor: %s"
+msgstr "Falló el editor con estatus: %d"
 
 #: ../clients/tui/newt/nmt-newt-utils.c:375
-#, fuzzy, c-format
+#, c-format
 msgid "Editor failed with signal %d"
-msgstr "Falló el editor: %s"
+msgstr "Falló el editor con señal %d"
 
 #: ../clients/tui/newt/nmt-newt-utils.c:379
 #, c-format
 msgid "Could not re-read file: %s"
 msgstr "No se pudo leer archivo: %s"
 
-# auto translated by TM merge from project: virt-manager, version: 0.9.0, DocId: virt-manager
-#: ../clients/tui/nm-editor-utils.c:146 ../libnm-glib/nm-device.c:1859
-#: ../libnm/nm-device.c:1810
-msgid "Ethernet"
-msgstr "Ethernet"
-
 #: ../clients/tui/nm-editor-utils.c:150
 #, c-format
 msgid "Ethernet connection %d"
 msgstr "Conexión Ethernet %d"
 
-# auto translated by TM merge from project: control-center, version: 3.8.3, DocId: gnome-control-center-2.0
-#: ../clients/tui/nm-editor-utils.c:154 ../libnm-glib/nm-device.c:1861
-#: ../libnm/nm-device.c:1812
-msgid "Wi-Fi"
-msgstr "Inalámbrica"
-
 #: ../clients/tui/nm-editor-utils.c:158
 #, c-format
 msgid "Wi-Fi connection %d"
 msgstr "Conexión Wi-Fi %d"
 
-# auto translated by TM merge from project: RHEL Migration Planning Guide, version: 6.4, DocId: Networking
-#: ../clients/tui/nm-editor-utils.c:163 ../libnm-core/nm-connection.c:1748
-#: ../libnm-glib/nm-device.c:1871 ../libnm/nm-device.c:1822
-msgid "InfiniBand"
-msgstr "Infiniband"
-
 #: ../clients/tui/nm-editor-utils.c:167
 #, c-format
 msgid "InfiniBand connection %d"
 msgstr "Conexión InfiniBand %d"
 
-#: ../clients/tui/nm-editor-utils.c:172 ../libnm-glib/nm-device.c:1869
-#: ../libnm/nm-device.c:1820
+#: ../clients/tui/nm-editor-utils.c:172 ../libnm-glib/nm-device.c:1859
+#: ../libnm/nm-device.c:1810
 msgid "Mobile Broadband"
 msgstr "Banda ancha móvil"
 
@@ -6460,9 +7041,9 @@ msgid "DSL connection %d"
 msgstr "Conexión DSL %d"
 
 # auto translated by TM merge from project: virt-manager, version: 0.9.0, DocId: virt-manager
-#: ../clients/tui/nm-editor-utils.c:190 ../libnm-core/nm-connection.c:1740
-#: ../libnm-glib/nm-device.c:1873 ../libnm-util/nm-connection.c:1626
-#: ../libnm/nm-device.c:1824 ../src/settings/plugins/ifcfg-rh/reader.c:4195
+#: ../clients/tui/nm-editor-utils.c:190 ../libnm-core/nm-connection.c:1708
+#: ../libnm-glib/nm-device.c:1863 ../libnm-util/nm-connection.c:1626
+#: ../libnm/nm-device.c:1814 ../src/settings/plugins/ifcfg-rh/reader.c:4182
 msgid "Bond"
 msgstr "Vinculación"
 
@@ -6472,9 +7053,9 @@ msgid "Bond connection %d"
 msgstr "Conexión de vínculo %d"
 
 # auto translated by TM merge from project: RHN Satellite UI, version: 5.5, DocId: java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource
-#: ../clients/tui/nm-editor-utils.c:199 ../libnm-core/nm-connection.c:1744
-#: ../libnm-glib/nm-device.c:1877 ../libnm-util/nm-connection.c:1630
-#: ../libnm/nm-device.c:1828 ../src/settings/plugins/ifcfg-rh/reader.c:4492
+#: ../clients/tui/nm-editor-utils.c:199 ../libnm-core/nm-connection.c:1712
+#: ../libnm-glib/nm-device.c:1867 ../libnm-util/nm-connection.c:1630
+#: ../libnm/nm-device.c:1818 ../src/settings/plugins/ifcfg-rh/reader.c:4479
 msgid "Bridge"
 msgstr "Puente"
 
@@ -6483,9 +7064,9 @@ msgstr "Puente"
 msgid "Bridge connection %d"
 msgstr "Conexión en puente %d"
 
-#: ../clients/tui/nm-editor-utils.c:208 ../libnm-core/nm-connection.c:1742
-#: ../libnm-glib/nm-device.c:1875 ../libnm-util/nm-connection.c:1628
-#: ../libnm/nm-device.c:1826 ../src/settings/plugins/ifcfg-rh/reader.c:4301
+#: ../clients/tui/nm-editor-utils.c:208 ../libnm-core/nm-connection.c:1710
+#: ../libnm-glib/nm-device.c:1865 ../libnm-util/nm-connection.c:1628
+#: ../libnm/nm-device.c:1816 ../src/settings/plugins/ifcfg-rh/reader.c:4288
 msgid "Team"
 msgstr "Equipo "
 
@@ -6542,7 +7123,6 @@ msgid "Could not create editor for invalid connection '%s'."
 msgstr "No se pudo crear editor para conexión no válida '%s'."
 
 #: ../clients/tui/nmt-editor.c:111
-#, fuzzy
 msgid "Edit Connection"
 msgstr "Editar conexión"
 
@@ -6562,9 +7142,8 @@ msgstr "Nombre de perfil"
 
 # auto translated by TM merge from project: virt-manager, version: 0.9.0, DocId: virt-manager
 #: ../clients/tui/nmt-editor.c:331
-#, fuzzy
 msgid "Ethernet device"
-msgstr "Ethernet"
+msgstr "Dispositivo Ethernet"
 
 #: ../clients/tui/nmt-editor.c:333
 msgid "Device"
@@ -6692,7 +7271,7 @@ msgstr "Tiempo de caducidad"
 
 #: ../clients/tui/nmt-page-bridge.c:91
 msgid "Enable IGMP snooping"
-msgstr ""
+msgstr "Habilitar snooping IGMP"
 
 #: ../clients/tui/nmt-page-bridge.c:97
 msgid "Enable STP (Spanning Tree Protocol)"
@@ -6731,6 +7310,10 @@ msgstr "Conectado"
 msgid "INFINIBAND"
 msgstr "INFINIBAND"
 
+#: ../clients/tui/nmt-page-infiniband.c:88
+msgid "Transport mode"
+msgstr "Modo de transporte"
+
 #: ../clients/tui/nmt-page-ip4.c:38
 msgid "Disabled"
 msgstr "Desactivado"
@@ -6788,7 +7371,7 @@ msgstr "Nunca us"
 
 #: ../clients/tui/nmt-page-ip4.c:179 ../clients/tui/nmt-page-ip6.c:177
 msgid "Ignore automatically obtained routes"
-msgstr ""
+msgstr "Ignorar rutas obtenidas automáticamente"
 
 #: ../clients/tui/nmt-page-ip4.c:187
 msgid "Require IPv4 addressing for this connection"
@@ -6811,64 +7394,60 @@ msgid "Require IPv6 addressing for this connection"
 msgstr "Requiere dirigirse a IPv6 para esta conexión"
 
 #: ../clients/tui/nmt-page-ppp.c:131
-#, fuzzy
 msgid "PPP CONFIGURATION"
-msgstr "CONFIGURACIÓN IPv4"
+msgstr "CONFIGURACIÓN PPP"
 
 #: ../clients/tui/nmt-page-ppp.c:140
-#, fuzzy
 msgid "Allowed authentication methods:"
-msgstr "Autenticación"
+msgstr "Métodos de autenticación permitidos"
 
 #: ../clients/tui/nmt-page-ppp.c:147
-#, fuzzy
 msgid "EAP"
-msgstr "SALTO"
+msgstr "EAP"
 
 #: ../clients/tui/nmt-page-ppp.c:155
-#, fuzzy
 msgid "PAP"
-msgstr "AP"
+msgstr "PAP"
 
 #: ../clients/tui/nmt-page-ppp.c:163
 msgid "CHAP"
-msgstr ""
+msgstr "CHAP"
 
 #: ../clients/tui/nmt-page-ppp.c:171
 msgid "MSCHAPv2"
-msgstr ""
+msgstr "MSCHAPv2"
 
 #: ../clients/tui/nmt-page-ppp.c:179
 msgid "MSCHAP"
-msgstr ""
+msgstr "MSCHAP"
 
 #: ../clients/tui/nmt-page-ppp.c:195
 msgid "Use point-to-point encryption (MPPE)"
-msgstr ""
+msgstr "Usar cifrado punto-a-punto (MPPE)"
 
 #: ../clients/tui/nmt-page-ppp.c:207
 msgid "Require 128-bit encryption"
-msgstr ""
+msgstr "Requerir cifrado de 128-bits"
 
 #: ../clients/tui/nmt-page-ppp.c:217
 msgid "Use stateful MPPE"
-msgstr ""
+msgstr "Usar estados MPPE"
 
 #: ../clients/tui/nmt-page-ppp.c:229
 msgid "Allow BSD data compression"
-msgstr ""
+msgstr "Permitir compresión de datos BSD"
 
 #: ../clients/tui/nmt-page-ppp.c:237
 msgid "Allow Deflate data compression"
-msgstr ""
+msgstr "Permitir compresión de datos Deflate"
 
 #: ../clients/tui/nmt-page-ppp.c:245
 msgid "Use TCP header compression"
-msgstr ""
+msgstr "Usar compresión de cabeceras TCP"
 
 #: ../clients/tui/nmt-page-ppp.c:255
 msgid "Send PPP echo packets"
-msgstr ""
+msgstr "Enviar paquetes echo PPP"
 
 #: ../clients/tui/nmt-page-team-port.c:92
 msgid "TEAM PORT"
@@ -7048,21 +7627,23 @@ msgid ""
 "openconnect will be run to authenticate.\n"
 "It will return to nmtui when completed."
 msgstr ""
+"openconnect se ejecutará para autenticar.\n"
+"Retornará a nmtui cuando termine."
 
 #: ../clients/tui/nmtui-connect.c:68
-#, fuzzy, c-format
+#, c-format
 msgid "Error: openconnect failed: %s"
-msgstr "Error: Falló el borrado de conexión: %s"
+msgstr "Error: Falló openconnect: %s"
 
 #: ../clients/tui/nmtui-connect.c:75
 #, c-format
 msgid "openconnect failed with status %d"
-msgstr ""
+msgstr "Falló openconnect con estado %d"
 
 #: ../clients/tui/nmtui-connect.c:79
 #, c-format
 msgid "openconnect failed with signal %d"
-msgstr ""
+msgstr "Falló openconnect con señal %d"
 
 #: ../clients/tui/nmtui-connect.c:178
 msgid "Activation failed"
@@ -7086,14 +7667,10 @@ msgid "Deactivate"
 msgstr "Desactivar"
 
 #: ../clients/tui/nmtui-connect.c:413 ../clients/tui/nmtui-edit.c:120
-#: ../clients/tui/nmtui.c:130
+#: ../clients/tui/nmtui.c:108
 msgid "Quit"
 msgstr "Salir"
 
-#: ../clients/tui/nmtui-connect.c:413 ../clients/tui/nmtui-edit.c:120
-msgid "Back"
-msgstr ""
-
 #: ../clients/tui/nmtui-connect.c:436
 #, c-format
 msgid "No such connection '%s'"
@@ -7118,6 +7695,7 @@ msgid ""
 msgstr ""
 "Si está creando un VPN y la conexión VPN que usted desea crear no aparece en "
 "la lista, puede ser que usted no tenga el correcto complemento VPN instalado."
+""
 
 #: ../clients/tui/nmtui-edit.c:411 ../clients/tui/nmtui-edit.c:427
 msgid "New Connection"
@@ -7129,9 +7707,9 @@ msgid "Unable to delete connection: %s"
 msgstr "No se pudo borrar conexión: %s"
 
 #: ../clients/tui/nmtui-edit.c:505
-#, fuzzy, c-format
+#, c-format
 msgid "Could not delete connection '%s': %s"
-msgstr "No se pudo borrar conexión: %s"
+msgstr "No se pudo borrar conexión '%s': %s"
 
 #: ../clients/tui/nmtui-edit.c:527
 #, c-format
@@ -7177,28 +7755,29 @@ msgstr "Nuevo nombre de host"
 msgid "Set system hostname"
 msgstr "Establecer nombre de host de sistema"
 
-#: ../clients/tui/nmtui.c:104
+#: ../clients/tui/nmtui.c:83
 msgid "NetworkManager TUI"
 msgstr "NetworkManager TUI"
 
-#: ../clients/tui/nmtui.c:112
+#: ../clients/tui/nmtui.c:91
 msgid "Please select an option"
 msgstr "Por favor seleccione una opción"
 
-#: ../clients/tui/nmtui.c:160
+#: ../clients/tui/nmtui.c:143
 msgid "Usage"
 msgstr "Uso "
 
-#: ../clients/tui/nmtui.c:241
+#: ../clients/tui/nmtui.c:224
 msgid "Could not parse arguments"
 msgstr "No se pudieron leer los argumentos"
 
-#: ../clients/tui/nmtui.c:251
-#, fuzzy, c-format
+#: ../clients/tui/nmtui.c:234
+#, c-format
 msgid "Could not contact NetworkManager: %s.\n"
-msgstr "No se pudo activar conexión: %s"
+msgstr "No se pudo contactar NetworkManager: %s.\n"
+"\n"
 
-#: ../clients/tui/nmtui.c:256
+#: ../clients/tui/nmtui.c:239
 msgid "NetworkManager is not running."
 msgstr "NetworkManager no está funcionando."
 
@@ -7250,16 +7829,16 @@ msgstr "No se pudo decodificar la clave privada."
 
 #: ../libnm-core/crypto.c:272 ../libnm-util/crypto.c:283
 msgid "Failed to find expected PKCS#8 start tag."
-msgstr "Falló al buscar la etiqueta de inicio de PKCS#8."
+msgstr "No se pudo buscar la etiqueta de inicio de PKCS#8."
 
 #: ../libnm-core/crypto.c:280 ../libnm-util/crypto.c:291
 #, c-format
 msgid "Failed to find expected PKCS#8 end tag '%s'."
-msgstr "Falló al buscar la etiqueta de final «%s» de PKCS#8."
+msgstr "No se pudo buscar la etiqueta de final «%s» de PKCS#8."
 
 #: ../libnm-core/crypto.c:299 ../libnm-util/crypto.c:310
 msgid "Failed to decode PKCS#8 private key."
-msgstr "Falló al descifrar la clave privada PKCS#8."
+msgstr "No se pudo descifrar la clave privada PKCS#8."
 
 #: ../libnm-core/crypto.c:341 ../libnm-util/crypto.c:352
 #, c-format
@@ -7288,7 +7867,7 @@ msgstr "No se pudo determinar el tipo de clave privada."
 #: ../libnm-core/crypto.c:502
 #, c-format
 msgid "Password provided, but key was not encrypted."
-msgstr ""
+msgstr "Se proporcionó la contraseña, pero la clave no era cifrada"
 
 #: ../libnm-core/crypto.c:555 ../libnm-util/crypto.c:571
 #, c-format
@@ -7307,7 +7886,7 @@ msgstr "No se pudo decodificar el certificado."
 
 #: ../libnm-core/crypto_gnutls.c:48 ../libnm-util/crypto_gnutls.c:48
 msgid "Failed to initialize the crypto engine."
-msgstr "Falló al inicializar el motor de descifrado."
+msgstr "No se pudo inicializar el motor de descifrado."
 
 #: ../libnm-core/crypto_gnutls.c:99 ../libnm-util/crypto_gnutls.c:159
 #, c-format
@@ -7315,36 +7894,38 @@ msgid "Invalid IV length (must be at least %zd)."
 msgstr "Longitud IV no válida (debe ser al menos de %zd)."
 
 #: ../libnm-core/crypto_gnutls.c:115 ../libnm-util/crypto_gnutls.c:175
-#, fuzzy, c-format
+#, c-format
 msgid "Failed to initialize the decryption cipher context: %s (%s)"
-msgstr "Falló al inicializar el contexto de descifrado: %s / %s."
+msgstr ""
+"No se pudo inicializar el contexto del cifrador de descifrado: %s  (%s)."
 
 #: ../libnm-core/crypto_gnutls.c:124 ../libnm-util/crypto_gnutls.c:184
-#, fuzzy, c-format
+#, c-format
 msgid "Failed to decrypt the private key: %s (%s)"
-msgstr "Falló al descifrar la clave privada: %s / %s."
+msgstr "No se pudo descifrar la clave privada: %s (%s)"
 
 #: ../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 "Falló al descifrar la clave privada: longitud inesperada del relleno."
+msgstr ""
+"No se pudo descifrar la clave privada: longitud inesperada del relleno."
 
 #: ../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 "Falló al descifrar la clave privada."
+msgstr "No se pudo descifrar la clave privada."
 
 #: ../libnm-core/crypto_gnutls.c:224 ../libnm-util/crypto_gnutls.c:283
-#, fuzzy, c-format
+#, c-format
 msgid "Failed to initialize the encryption cipher context: %s (%s)"
-msgstr "Falló al inicializar el contexto de cifrador: %s / %s."
+msgstr "No se pudo inicializar el contexto de cifrador de cifrado: %s  (%s)."
 
 #: ../libnm-core/crypto_gnutls.c:233 ../libnm-util/crypto_gnutls.c:292
-#, fuzzy, c-format
+#, c-format
 msgid "Failed to encrypt the data: %s (%s)"
-msgstr "Falló al cifrar los datos: %s / %s."
+msgstr "No se pudo cifrar los datos: %s  (%s)"
 
 #: ../libnm-core/crypto_gnutls.c:276 ../libnm-util/crypto_gnutls.c:332
 #, c-format
@@ -7384,7 +7965,7 @@ msgstr "No se pudo decodificar el archivo PKCS#8: %s"
 #: ../libnm-core/crypto_nss.c:54 ../libnm-util/crypto_nss.c:53
 #, c-format
 msgid "Failed to initialize the crypto engine: %d."
-msgstr "Falló al inicializar el motor de cifrado: %d."
+msgstr "No se pudo inicializar el motor de cifrado: %d."
 
 #: ../libnm-core/crypto_nss.c:120 ../libnm-util/crypto_nss.c:170
 #, c-format
@@ -7394,33 +7975,33 @@ msgstr "Longitud IV no válida (debe ser al menos de %d)."
 #: ../libnm-core/crypto_nss.c:131 ../libnm-util/crypto_nss.c:181
 #, c-format
 msgid "Failed to initialize the decryption cipher slot."
-msgstr "Falló al inicializar la ranura de descifrado."
+msgstr "No se pudo inicializar la ranura de descifrado."
 
 #: ../libnm-core/crypto_nss.c:141 ../libnm-util/crypto_nss.c:191
 #, c-format
 msgid "Failed to set symmetric key for decryption."
-msgstr "Falló al establecer la clave simétrica para el descifrado."
+msgstr "No se pudo establecer la clave simétrica para el descifrado."
 
 #: ../libnm-core/crypto_nss.c:151 ../libnm-util/crypto_nss.c:201
 #, c-format
 msgid "Failed to set IV for decryption."
-msgstr "Falló al establecer IV para el descifrado."
+msgstr "No se pudo establecer IV para el descifrado."
 
 #: ../libnm-core/crypto_nss.c:159 ../libnm-util/crypto_nss.c:209
 #, c-format
 msgid "Failed to initialize the decryption context."
-msgstr "Falló al inicializar el contexto de descifrado."
+msgstr "No se pudo inicializar el contexto de descifrado."
 
 #: ../libnm-core/crypto_nss.c:172 ../libnm-util/crypto_nss.c:222
 #, c-format
 msgid "Failed to decrypt the private key: %d."
-msgstr "Falló al descifrar la clave privada: %d."
+msgstr "No se pudo descifrar la clave privada: %d."
 
 #: ../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 ""
-"Falló al descifrar la clave privada: los datos descifrados son demasiado "
+"No se pudo descifrar la clave privada: los datos descifrados son demasiado "
 "grandes."
 
 #: ../libnm-core/crypto_nss.c:191 ../libnm-util/crypto_nss.c:241
@@ -7431,27 +8012,27 @@ msgstr "Falló la finalización del descifrado de la clave privada: %d."
 #: ../libnm-core/crypto_nss.c:299 ../libnm-util/crypto_nss.c:345
 #, c-format
 msgid "Failed to initialize the encryption cipher slot."
-msgstr "Falló al inicializar la ranura de cifrado."
+msgstr "No se pudo inicializar la ranura de cifrado."
 
 #: ../libnm-core/crypto_nss.c:307 ../libnm-util/crypto_nss.c:353
 #, c-format
 msgid "Failed to set symmetric key for encryption."
-msgstr "Falló al establecer la clave simétrica para el cifrado."
+msgstr "No se pudo establecer la clave simétrica para el cifrado."
 
 #: ../libnm-core/crypto_nss.c:315 ../libnm-util/crypto_nss.c:361
 #, c-format
 msgid "Failed to set IV for encryption."
-msgstr "Falló al establecer IV para el cifrado."
+msgstr "No se pudo establecer IV para el cifrado."
 
 #: ../libnm-core/crypto_nss.c:323 ../libnm-util/crypto_nss.c:369
 #, c-format
 msgid "Failed to initialize the encryption context."
-msgstr "Falló al inicializar el contexto de cifrado."
+msgstr "No se pudo inicializar el contexto de cifrado."
 
 #: ../libnm-core/crypto_nss.c:331 ../libnm-util/crypto_nss.c:377
 #, c-format
 msgid "Failed to encrypt: %d."
-msgstr "Falló al cifrar: %d."
+msgstr "No se pudo cifrar: %d."
 
 #: ../libnm-core/crypto_nss.c:339 ../libnm-util/crypto_nss.c:385
 #, c-format
@@ -7466,7 +8047,7 @@ msgstr "No se pudo decodificar el certificado: %d"
 #: ../libnm-core/crypto_nss.c:420
 #, c-format
 msgid "Password must be UTF-8"
-msgstr ""
+msgstr "La contraseña debe ser UTF-8"
 
 #: ../libnm-core/crypto_nss.c:450 ../libnm-util/crypto_nss.c:488
 #, c-format
@@ -7487,55 +8068,51 @@ msgstr "No se pudo verificar el archivo PKCS#12: %d"
 msgid "Could not generate random data."
 msgstr "No se pudo generar datos aleatorios."
 
-#: ../libnm-core/nm-connection.c:225
+#: ../libnm-core/nm-connection.c:224
 msgid "wrong type; should be a list of strings."
-msgstr ""
+msgstr "Tipo errado; debe ser una lista de cadenas"
 
-#: ../libnm-core/nm-connection.c:295
-#, fuzzy
+#: ../libnm-core/nm-connection.c:294
 msgid "unknown setting name"
-msgstr "Error: parámetro desconocido '%s'\n"
+msgstr "Nombre de parámetro desconocido"
 
-#: ../libnm-core/nm-connection.c:307
-#, fuzzy
+#: ../libnm-core/nm-connection.c:306
 msgid "duplicate setting name"
-msgstr "Error: parámetro desconocido '%s'\n"
+msgstr "Nombre de parámetro duplicado"
 
-#: ../libnm-core/nm-connection.c:905
+#: ../libnm-core/nm-connection.c:873
 msgid "setting not found"
-msgstr ""
+msgstr "No se encontró el parámetro"
 
-#: ../libnm-core/nm-connection.c:969
-#, fuzzy
+#: ../libnm-core/nm-connection.c:937
 msgid "setting not allowed in slave connection"
-msgstr "El parámetro '%s' no está presente en la conexión.\n"
+msgstr "El parámetro  no es permitido en conexión esclava."
 
-#: ../libnm-core/nm-connection.c:980
+#: ../libnm-core/nm-connection.c:948
 msgid "setting is required for non-slave connections"
-msgstr ""
+msgstr "Se requiere el parámetro para conexiones no esclavas"
 
-#: ../libnm-core/nm-connection.c:1074
-#, fuzzy
+#: ../libnm-core/nm-connection.c:1042
 msgid "Unexpected failure to verify the connection"
-msgstr "No se pudo borrar conexión: %s"
+msgstr "Fallo inesperado para verificar la conexión"
 
-#: ../libnm-core/nm-connection.c:1107
-#, fuzzy
+#: ../libnm-core/nm-connection.c:1075
 msgid "Unexpected failure to normalize the connection"
-msgstr "No se pudo borrar conexión: %s"
+msgstr "Fallo inesperado, no fue posible normalizar la conexión"
 
-#: ../libnm-core/nm-connection.c:1608 ../libnm-core/nm-setting-8021x.c:2411
+#: ../libnm-core/nm-connection.c:1576 ../libnm-core/nm-setting-8021x.c:2411
 #: ../libnm-core/nm-setting-8021x.c:2428 ../libnm-core/nm-setting-8021x.c:2459
 #: ../libnm-core/nm-setting-8021x.c:2476 ../libnm-core/nm-setting-8021x.c:2518
 #: ../libnm-core/nm-setting-8021x.c:2530 ../libnm-core/nm-setting-8021x.c:2548
 #: ../libnm-core/nm-setting-8021x.c:2560 ../libnm-core/nm-setting-8021x.c:2584
 #: ../libnm-core/nm-setting-8021x.c:2749 ../libnm-core/nm-setting-adsl.c:189
 #: ../libnm-core/nm-setting-bluetooth.c:120
-#: ../libnm-core/nm-setting-bluetooth.c:138 ../libnm-core/nm-setting-cdma.c:141
+#: ../libnm-core/nm-setting-bluetooth.c:138
+#: ../libnm-core/nm-setting-cdma.c:141
 #: ../libnm-core/nm-setting-connection.c:837
 #: ../libnm-core/nm-setting-connection.c:876
 #: ../libnm-core/nm-setting-connection.c:989
-#: ../libnm-core/nm-setting-ip-config.c:2186
+#: ../libnm-core/nm-setting-ip-config.c:2167
 #: ../libnm-core/nm-setting-olpc-mesh.c:120
 #: ../libnm-core/nm-setting-pppoe.c:142 ../libnm-core/nm-setting-vpn.c:419
 #: ../libnm-core/nm-setting-vxlan.c:360 ../libnm-core/nm-setting-wimax.c:126
@@ -7547,8 +8124,10 @@ msgstr "No se pudo borrar conexión: %s"
 #: ../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-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
@@ -7566,210 +8145,204 @@ msgstr "Falta propiedad"
 #: ../libnm-core/nm-dbus-utils.c:188
 #, c-format
 msgid "Method returned type '%s', but expected '%s'"
-msgstr ""
+msgstr "El método devolvió el tipo «%s» pero se esperaba «%s»"
 
 #: ../libnm-core/nm-keyfile-reader.c:136
 msgid "ignoring missing number"
-msgstr ""
+msgstr "Ignorando el número faltante"
 
 #: ../libnm-core/nm-keyfile-reader.c:145
-#, fuzzy, c-format
+#, c-format
 msgid "ignoring invalid number '%s'"
-msgstr "Métrica inválida '%s'"
+msgstr "Ignorando número inválido '%s'"
 
 #: ../libnm-core/nm-keyfile-reader.c:165
-#, fuzzy, c-format
+#, c-format
 msgid "ignoring invalid %s address: %s"
-msgstr "Formato de dirección IPv4 inválido '%s'"
+msgstr "Ignorando dirección %s inválida: %s"
 
 #: ../libnm-core/nm-keyfile-reader.c:205
-#, fuzzy, c-format
+#, c-format
 msgid "ignoring invalid gateway '%s' for %s route"
-msgstr "Puerta de enlace inválida '%s'"
+msgstr "Ignorando puerta de enlace inválida '%s' para ruta %s"
 
 #: ../libnm-core/nm-keyfile-reader.c:225
-#, fuzzy, c-format
+#, c-format
 msgid "ignoring invalid %s route: %s"
-msgstr "Ruta IPv4 inválida '%s'"
+msgstr "Ignorando ruta %s inválida: %s"
 
 #: ../libnm-core/nm-keyfile-reader.c:343
 #, c-format
 msgid "unexpected character '%c' for address %s: '%s' (position %td)"
-msgstr ""
+msgstr "Carácter inesperado '%c' para la dirección %s: '%s' (posición %td)"
 
 #: ../libnm-core/nm-keyfile-reader.c:353
 #, c-format
 msgid "unexpected character '%c' for %s: '%s' (position %td)"
-msgstr ""
+msgstr "Carácter inesperado '%c' para %s: '%s' (posición %td)"
 
 #: ../libnm-core/nm-keyfile-reader.c:362
 #, c-format
 msgid "unexpected character '%c' in prefix length for %s: '%s' (position %td)"
 msgstr ""
+"Carácter inesperado '%c' en longitud de prefijo para %s: '%s' (posición %td)"
 
 #: ../libnm-core/nm-keyfile-reader.c:373
 #, c-format
 msgid "garbage at the end of value %s: '%s'"
-msgstr ""
+msgstr "Basura al final del valor %s: '%s'"
 
 #: ../libnm-core/nm-keyfile-reader.c:379
 #, c-format
 msgid "deprecated semicolon at the end of value %s: '%s'"
-msgstr ""
+msgstr "Dos puntos depreciados al final del valor %s: '%s'"
 
 #: ../libnm-core/nm-keyfile-reader.c:394
 #, c-format
 msgid "invalid prefix length for %s '%s', defaulting to %d"
-msgstr ""
+msgstr "Longitud de prefijo inválida para  %s '%s', se predetermina a %d"
 
 #: ../libnm-core/nm-keyfile-reader.c:401
 #, c-format
 msgid "missing prefix length for %s '%s', defaulting to %d"
-msgstr ""
+msgstr "Falta longitud de prefijo para  %s '%s', se predetermina a %d"
 
 #: ../libnm-core/nm-keyfile-reader.c:504
-#, fuzzy, c-format
+#, c-format
 msgid "ignoring invalid DNS server IPv4 address '%s'"
-msgstr "Formato de dirección IPv4 inválido '%s'"
+msgstr "Se ignora dirección inválida IPv4 de servidor DNS  '%s'"
 
 #: ../libnm-core/nm-keyfile-reader.c:543
-#, fuzzy, c-format
+#, c-format
 msgid "ignoring invalid DNS server IPv6 address '%s'"
-msgstr "Dirección IPv4 inválida '%s'"
+msgstr "Se ignora dirección inválida IPv4 de servidor DNS '%s'"
 
 #: ../libnm-core/nm-keyfile-reader.c:628 ../libnm-core/nm-keyfile-reader.c:769
 #: ../libnm-core/nm-keyfile-reader.c:1446
 #, c-format
 msgid "ignoring invalid byte element '%d' (not between 0 and 255 inclusive)"
-msgstr ""
+msgstr "Se ignora elemento inválido byte '%d' (no entre 0 y 255 inclusive)"
 
 #: ../libnm-core/nm-keyfile-reader.c:642
-#, fuzzy
 msgid "ignoring invalid MAC address"
-msgstr "No es una dirección MAC válida"
+msgstr "Se ignora dirección MAC inválida"
 
 #: ../libnm-core/nm-keyfile-reader.c:758
-#, fuzzy
 msgid "ignoring invalid binary property"
-msgstr "Error: propiedad inválida: %s\n"
+msgstr "Se ignora propiedad binaria inválida"
 
 #: ../libnm-core/nm-keyfile-reader.c:801
 msgid "ignoring invalid SSID"
-msgstr ""
+msgstr "Se ignora SSID inválido"
 
 #: ../libnm-core/nm-keyfile-reader.c:817
 msgid "ignoring invalid raw password"
-msgstr ""
+msgstr "Se ignora contraseña cruda inválida"
 
-#: ../libnm-core/nm-keyfile-reader.c:892 ../libnm-core/nm-keyfile-reader.c:1058
+#: ../libnm-core/nm-keyfile-reader.c:892
+#: ../libnm-core/nm-keyfile-reader.c:1058
 #, c-format
 msgid "certificate or key file '%s' does not exist"
-msgstr ""
+msgstr "No existe el certificado o el archivo de llaves '%s'"
 
 #: ../libnm-core/nm-keyfile-reader.c:897
-#, fuzzy, c-format
+#, c-format
 msgid "invalid key/cert value path \"%s\""
-msgstr "invalido '%s' o su valor '%s'"
+msgstr "Llave o ruta de valor de certificado'%s' inválidas"
 
 #: ../libnm-core/nm-keyfile-reader.c:935
 msgid "invalid key/cert value data:;base64, is not base64"
-msgstr ""
+msgstr "Llave o ruta de datos de valor de certificado; base64, no es base64"
 
 #: ../libnm-core/nm-keyfile-reader.c:948
 msgid "invalid key/cert value data:;base64,file://"
-msgstr ""
+msgstr "Llave o ruta de valor de certificado:;base64,file://"
 
 #: ../libnm-core/nm-keyfile-reader.c:1095
 msgid "invalid key/cert value is not a valid blob"
-msgstr ""
+msgstr "Llave o  valor de certificado no es un blob válido"
 
 #: ../libnm-core/nm-keyfile-reader.c:1100
-#, fuzzy
 msgid "invalid key/cert value"
-msgstr "invalido '%s' o su valor '%s'"
+msgstr "llave o valor de certificado inválidos"
 
 #: ../libnm-core/nm-keyfile-reader.c:1147
-#, fuzzy, c-format
+#, c-format
 msgid "invalid parity value '%s'"
-msgstr "invalido '%s' o su valor '%s'"
+msgstr "Valor de paridad invalido '%s'"
 
 #: ../libnm-core/nm-keyfile-reader.c:1347
-#, fuzzy, c-format
+#, c-format
 msgid "error loading setting value: %s"
-msgstr "Error: nombre de parámetro inválido; %s\n"
+msgstr "Error al cargar el valor del parámetro: %s"
 
 #: ../libnm-core/nm-keyfile-reader.c:1379
-#, fuzzy, c-format
+#, c-format
 msgid "invalid negative value (%i)"
-msgstr "Puerta de enlace inválida '%s'"
+msgstr "Valor negativo inválido (%i)"
 
 #: ../libnm-core/nm-keyfile-reader.c:1400
-#, fuzzy, c-format
+#, c-format
 msgid "invalid char value (%i)"
-msgstr "invalido '%s' o su valor '%s'"
+msgstr "valor de carácter invalido (%i)"
 
 #: ../libnm-core/nm-keyfile-reader.c:1423
-#, fuzzy, c-format
+#, c-format
 msgid "invalid int64 value (%s)"
-msgstr "invalido '%s' o su valor '%s'"
+msgstr "Valor int64 invalido (%s)"
 
 #: ../libnm-core/nm-keyfile-reader.c:1482
 #, c-format
 msgid "too large FLAGS property '%s' (%llu)"
-msgstr ""
+msgstr "Demasiado grande la propiedad FLAGS '%s'  (%llu)"
 
 #: ../libnm-core/nm-keyfile-reader.c:1495
-#, fuzzy, c-format
+#, c-format
 msgid "unhandled setting property type '%s'"
-msgstr "Error: inválido <setting>.<property> '%s'."
+msgstr "No se puede manejar tipo de parámetro '%s'."
 
 #: ../libnm-core/nm-keyfile-reader.c:1526
-#, fuzzy, c-format
+#, c-format
 msgid "invalid setting name '%s'"
-msgstr "Error: nombre de parámetro inválido; %s\n"
+msgstr "Nombre de parámetro inválido '%s' "
 
 #: ../libnm-core/nm-setting-8021x.c:414
-#, fuzzy
 msgid "data missing"
-msgstr "Falta propiedad "
+msgstr "Faltan datos"
 
 #: ../libnm-core/nm-setting-8021x.c:448
 msgid "binary data missing"
-msgstr ""
+msgstr "Faltan datos binarios"
 
 #: ../libnm-core/nm-setting-8021x.c:465
 msgid "file:// URI not NUL terminated"
-msgstr ""
+msgstr "file:// URI no terminó NUL"
 
 #: ../libnm-core/nm-setting-8021x.c:474
 msgid "file:// URI is empty"
-msgstr ""
+msgstr "file:// URI está vacía"
 
 #: ../libnm-core/nm-setting-8021x.c:482
-#, fuzzy
 msgid "file:// URI is not valid UTF-8"
-msgstr "index '%s' no es válido"
+msgstr "file:// URI no es un UTF-8 válido"
 
 #: ../libnm-core/nm-setting-8021x.c:681 ../libnm-util/nm-setting-8021x.c:639
 msgid "CA certificate must be in X.509 format"
-msgstr ""
+msgstr "Certificado CA debe estar en el formato X.509"
 
 #: ../libnm-core/nm-setting-8021x.c:1012 ../libnm-core/nm-setting-8021x.c:1276
 #: ../libnm-core/nm-setting-8021x.c:1612 ../libnm-util/nm-setting-8021x.c:957
 #: ../libnm-util/nm-setting-8021x.c:1220 ../libnm-util/nm-setting-8021x.c:1543
-#, fuzzy
 msgid "invalid certificate format"
-msgstr "Error al inicializar los datos del certificado: %s"
+msgstr "Formato de certificado es inválido"
 
 #: ../libnm-core/nm-setting-8021x.c:1895 ../libnm-util/nm-setting-8021x.c:1812
-#, fuzzy
 msgid "invalid private key"
-msgstr "Puerta de enlace inválida '%s'"
+msgstr "Llave privada inválida "
 
 #: ../libnm-core/nm-setting-8021x.c:2207 ../libnm-util/nm-setting-8021x.c:2123
-#, fuzzy
 msgid "invalid phase2 private key"
-msgstr "Falló al descifrar la clave privada."
+msgstr "Llave privada phase2 inválida"
 
 #: ../libnm-core/nm-setting-8021x.c:2418 ../libnm-core/nm-setting-8021x.c:2435
 #: ../libnm-core/nm-setting-8021x.c:2466 ../libnm-core/nm-setting-8021x.c:2483
@@ -7778,9 +8351,10 @@ msgstr "Falló al descifrar la clave privada."
 #: ../libnm-core/nm-setting-8021x.c:2591 ../libnm-core/nm-setting-adsl.c:196
 #: ../libnm-core/nm-setting-cdma.c:148 ../libnm-core/nm-setting-cdma.c:157
 #: ../libnm-core/nm-setting-connection.c:844
-#: ../libnm-core/nm-setting-connection.c:887 ../libnm-core/nm-setting-gsm.c:281
-#: ../libnm-core/nm-setting-gsm.c:338 ../libnm-core/nm-setting-gsm.c:375
-#: ../libnm-core/nm-setting-gsm.c:384 ../libnm-core/nm-setting-ip-config.c:2193
+#: ../libnm-core/nm-setting-connection.c:887
+#: ../libnm-core/nm-setting-gsm.c:281 ../libnm-core/nm-setting-gsm.c:338
+#: ../libnm-core/nm-setting-gsm.c:375 ../libnm-core/nm-setting-gsm.c:384
+#: ../libnm-core/nm-setting-ip-config.c:2174
 #: ../libnm-core/nm-setting-ip4-config.c:198
 #: ../libnm-core/nm-setting-ip4-config.c:205
 #: ../libnm-core/nm-setting-pppoe.c:149 ../libnm-core/nm-setting-pppoe.c:158
@@ -7796,8 +8370,9 @@ msgstr "Falló al descifrar la clave privada."
 #: ../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-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:170 ../libnm-util/nm-setting-pppoe.c:179
 #: ../libnm-util/nm-setting-vpn.c:432 ../libnm-util/nm-setting-vpn.c:442
@@ -7815,17 +8390,17 @@ msgid "has to match '%s' property for PKCS#12"
 msgstr "Debe coincidir con propiedad '%s' para PKCS#12"
 
 #: ../libnm-core/nm-setting-8021x.c:2723
-#, fuzzy, c-format
+#, c-format
 msgid "certificate is invalid: %s"
-msgstr "propiedad no es válida"
+msgstr "certificado es inválido: %s"
 
 #: ../libnm-core/nm-setting-8021x.c:2758
 #: ../libnm-core/nm-setting-bluetooth.c:129
 #: ../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:211
-#: ../libnm-core/nm-setting-ip6-config.c:222
+#: ../libnm-core/nm-setting-ip6-config.c:188
+#: ../libnm-core/nm-setting-ip6-config.c:199
 #: ../libnm-core/nm-setting-olpc-mesh.c:149
 #: ../libnm-core/nm-setting-wimax.c:144 ../libnm-core/nm-setting-wired.c:665
 #: ../libnm-core/nm-setting-wired.c:675
@@ -7863,21 +8438,23 @@ msgstr "propiedad no es válida"
 #: ../libnm-core/nm-setting-8021x.c:2783 ../libnm-core/nm-setting-8021x.c:2793
 #: ../libnm-core/nm-setting-8021x.c:2803 ../libnm-core/nm-setting-8021x.c:2813
 #: ../libnm-core/nm-setting-8021x.c:2823 ../libnm-core/nm-setting-adsl.c:208
-#: ../libnm-core/nm-setting-adsl.c:220 ../libnm-core/nm-setting-bluetooth.c:146
+#: ../libnm-core/nm-setting-adsl.c:220
+#: ../libnm-core/nm-setting-bluetooth.c:146
 #: ../libnm-core/nm-setting-wireless-security.c:870
 #: ../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-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' no es un valor válido para propiedad"
 
 #: ../libnm-core/nm-setting-bluetooth.c:168
-#, fuzzy, c-format
+#, c-format
 msgid "'%s' connection requires '%s' or '%s' setting"
-msgstr "requiere '%s' o el parámetro '%s'"
+msgstr "la conexión '%s' requiere '%s' o el parámetro '%s'"
 
 #: ../libnm-core/nm-setting-bond.c:485 ../libnm-util/nm-setting-bond.c:502
 #, c-format
@@ -7938,19 +8515,19 @@ msgid "'%s' is not a valid IPv4 address for '%s' option"
 msgstr "'%s' no es una diercción IPv4 válida para la opción '%s'"
 
 #: ../libnm-core/nm-setting-bond.c:676 ../libnm-util/nm-setting-bond.c:682
-#, fuzzy, c-format
+#, c-format
 msgid "'%s' option is only valid with mode '%s'"
-msgstr "opción '%s' es solamente válida para '%s=%s'"
+msgstr "La opción '%s' no es válida con modo '%s'"
 
 #: ../libnm-core/nm-setting-bond.c:687
 #, c-format
 msgid "'%s' and '%s' cannot have different values"
-msgstr ""
+msgstr "'%s' y '%s' no puede tener diferentes valores"
 
 #: ../libnm-core/nm-setting-bond.c:703
-#, fuzzy, c-format
+#, c-format
 msgid "'%s' option should be string"
-msgstr "opción '%s' está vacía"
+msgstr "opción '%s' debe ser una cadena"
 
 #: ../libnm-core/nm-setting-bridge-port.c:124
 #: ../libnm-core/nm-setting-bridge-port.c:136
@@ -7961,18 +8538,20 @@ msgid "'%d' is not a valid value for the property (should be <= %d)"
 msgstr "'%d' no es un valor válido para la propiedad (debe ser <= %d)"
 
 #: ../libnm-core/nm-setting-bridge-port.c:154
-#: ../libnm-core/nm-setting-team-port.c:109
-#, fuzzy, c-format
+#: ../libnm-core/nm-setting-team-port.c:97
+#, c-format
 msgid "missing setting"
-msgstr "Falta opción"
+msgstr "Falta parámetro"
 
 #: ../libnm-core/nm-setting-bridge-port.c:165
-#: ../libnm-core/nm-setting-team-port.c:120
+#: ../libnm-core/nm-setting-team-port.c:108
 #, c-format
 msgid ""
 "A connection with a '%s' setting must have the slave-type set to '%s'. "
 "Instead it is '%s'"
 msgstr ""
+"Una conexión con un parámetro '%s' debe tener un tipo de esclavo establecido "
+"para '%s'. En su lugar es '%s'"
 
 #: ../libnm-core/nm-setting-bridge.c:227 ../libnm-util/nm-setting-bridge.c:269
 #, c-format
@@ -7987,47 +8566,47 @@ msgid "is not a valid MAC address"
 msgstr "No es una dirección MAC válida"
 
 #: ../libnm-core/nm-setting-connection.c:816
-#, fuzzy, c-format
+#, c-format
 msgid "setting required for connection of type '%s'"
-msgstr "No se pudo crear editor para conexión '%s' del tipo '%s'"
+msgstr "Se requiere parámetro para conexión del tipo '%s'"
 
 #: ../libnm-core/nm-setting-connection.c:897
-#, fuzzy, c-format
+#, c-format
 msgid "connection type '%s' is not valid"
-msgstr "index '%s' no es válido"
+msgstr "Tipo de conexión '%s' no es válido"
 
 #: ../libnm-core/nm-setting-connection.c:932
 #: ../libnm-util/nm-setting-connection.c:877
-#, fuzzy, c-format
+#, c-format
 msgid "Unknown slave type '%s'"
-msgstr "Nivel de registro desconocido «%s»"
+msgstr "Tipo de esclavo es desconocido '%s'"
 
 #: ../libnm-core/nm-setting-connection.c:942
 #: ../libnm-util/nm-setting-connection.c:887
-#, fuzzy, c-format
+#, c-format
 msgid "Slave connections need a valid '%s' property"
-msgstr "'%s' conexiones requieren '%s' en esta propiedad"
+msgstr "Las conexiones esclavas requieren una propiedad '%s' válida"
 
 #: ../libnm-core/nm-setting-connection.c:963
 #: ../libnm-util/nm-setting-connection.c:897
 #, c-format
 msgid "Cannot set '%s' without '%s'"
-msgstr ""
+msgstr "No se puede establecer '%s' sin '%s'"
 
 #: ../libnm-core/nm-setting-connection.c:977
-#, fuzzy, c-format
+#, c-format
 msgid "metered value %d is not valid"
-msgstr "index '%s' no es válido"
+msgstr "Valor medido %d no es válido"
 
 #: ../libnm-core/nm-setting-connection.c:998
 #, c-format
 msgid "property type should be set to '%s'"
-msgstr ""
+msgstr "Tipo de propiedad debe establecerse a '%s'"
 
 #: ../libnm-core/nm-setting-connection.c:1013
-#, fuzzy, c-format
+#, c-format
 msgid "slave-type '%s' requires a '%s' setting in the connection"
-msgstr "requiere presencia de parámetro '%s' en la conexión"
+msgstr "tipo de esclavo '%s' requiere un parámetro '%s' en la conexión"
 
 #: ../libnm-core/nm-setting-connection.c:1023
 #, c-format
@@ -8035,6 +8614,8 @@ msgid ""
 "Detect a slave connection with '%s' set and a port type '%s'. '%s' should be "
 "set to '%s'"
 msgstr ""
+"Se detecta una conexión esclava sin establecer '%s' ni tipo de puerto '%s'. "
+"'%s' debe establecerse como '%s'"
 
 #: ../libnm-core/nm-setting-dcb.c:522 ../libnm-util/nm-setting-dcb.c:594
 msgid "flags invalid"
@@ -8082,13 +8663,12 @@ msgid "'%s' length is invalid (should be 5 or 6 digits)"
 msgstr "'%s' longitud es inválida (debe tener 5 o 6 dígitos)"
 
 #: ../libnm-core/nm-setting-gsm.c:397
-#, fuzzy
 msgid "property is empty or wrong size"
-msgstr "propiedad está vacía"
+msgstr "Puede ser que la propiedad esté vacía o que el tamaño esté errado"
 
 #: ../libnm-core/nm-setting-gsm.c:407
 msgid "property must contain only digits"
-msgstr ""
+msgstr "La propiedad debe contener únicamente dígitos"
 
 #: ../libnm-core/nm-setting-infiniband.c:217
 #: ../libnm-util/nm-setting-infiniband.c:231
@@ -8113,105 +8693,103 @@ msgid ""
 "interface name of software infiniband device must be '%s' or unset (instead "
 "it is '%s')"
 msgstr ""
+"El nombre de la interfaz del dispositivo de software infiniband debe ser "
+"'%s' o no establecido )en lugar de  '%s')"
 
 #: ../libnm-core/nm-setting-infiniband.c:286
 #, c-format
 msgid "mtu for transport mode '%s' can be at most %d but it is %d"
-msgstr ""
+msgstr "mtu para modo de transporte '%s' puede ser como máximo %d pero es %d"
 
 #: ../libnm-core/nm-setting-ip-config.c:133
-#, fuzzy, c-format
+#, c-format
 msgid "Missing IPv4 address"
-msgstr "Formato de dirección IPv4 inválido '%s'"
+msgstr "Falta la dirección IPv4"
 
 #: ../libnm-core/nm-setting-ip-config.c:133
-#, fuzzy, c-format
+#, c-format
 msgid "Missing IPv6 address"
-msgstr "Dirección IPv4 inválida '%s'"
+msgstr "Falta la dirección IPv6"
 
 #: ../libnm-core/nm-setting-ip-config.c:138
-#, fuzzy, c-format
+#, c-format
 msgid "Invalid IPv4 address '%s'"
 msgstr "Formato de dirección IPv4 inválido '%s'"
 
 #: ../libnm-core/nm-setting-ip-config.c:138
-#, fuzzy, c-format
+#, c-format
 msgid "Invalid IPv6 address '%s'"
-msgstr "Dirección IPv4 inválida '%s'"
+msgstr "Dirección IPv6 inválida '%s'"
 
 #: ../libnm-core/nm-setting-ip-config.c:153
-#, fuzzy, c-format
+#, c-format
 msgid "Invalid IPv4 address prefix '%u'"
-msgstr "Formato de dirección IPv4 inválido '%s'"
+msgstr "Prefijo de dirección IPv4 es inválido '%u'"
 
 #: ../libnm-core/nm-setting-ip-config.c:153
-#, fuzzy, c-format
+#, c-format
 msgid "Invalid IPv6 address prefix '%u'"
-msgstr "Dirección IPv4 inválida '%s'"
+msgstr "Prefijo de dirección IPv6 es inválido '%u'"
 
 #: ../libnm-core/nm-setting-ip-config.c:168
-#, fuzzy, c-format
+#, c-format
 msgid "Invalid routing metric '%s'"
-msgstr "Métrica inválida '%s'"
+msgstr "Métrica de enrutamiento es inválida '%s'"
 
-#: ../libnm-core/nm-setting-ip-config.c:2206
-#, fuzzy, c-format
+#: ../libnm-core/nm-setting-ip-config.c:2187
+#, c-format
 msgid "%d. DNS server address is invalid"
-msgstr "%d. dirección IPv4 es inválida"
+msgstr "%d. Dirección del servidor es inválida"
 
-#: ../libnm-core/nm-setting-ip-config.c:2222
-#, fuzzy, c-format
+#: ../libnm-core/nm-setting-ip-config.c:2203
+#, c-format
 msgid "%d. IP address is invalid"
-msgstr "%d. dirección IPv4 es inválida"
+msgstr "%d. Dirección Ip es inválida"
 
-#: ../libnm-core/nm-setting-ip-config.c:2234
-#, fuzzy, c-format
+#: ../libnm-core/nm-setting-ip-config.c:2215
+#, c-format
 msgid "%d. IP address has 'label' property with invalid type"
-msgstr "%d. dirección IPv4 tiene un prefijo inválido"
+msgstr "%d. Dirección IP tiene una propiedad 'label' de tipo inválido"
 
-#: ../libnm-core/nm-setting-ip-config.c:2243
-#, fuzzy, c-format
+#: ../libnm-core/nm-setting-ip-config.c:2224
+#, c-format
 msgid "%d. IP address has invalid label '%s'"
-msgstr "%d. dirección IPv4 tiene un prefijo inválido"
+msgstr "%d. Dirección IP tiene una etiqueta inválida '%s'"
 
-#: ../libnm-core/nm-setting-ip-config.c:2257
+#: ../libnm-core/nm-setting-ip-config.c:2238
 msgid "gateway cannot be set if there are no addresses configured"
 msgstr ""
+"La puerta de enlace no puede establecerse si no hay direcciones configuradas "
+""
 
-#: ../libnm-core/nm-setting-ip-config.c:2266
-#, fuzzy
+#: ../libnm-core/nm-setting-ip-config.c:2247
 msgid "gateway is invalid"
-msgstr "propiedad no es válida"
+msgstr "La puerta de enlace es inválida"
 
-#: ../libnm-core/nm-setting-ip-config.c:2280
+#: ../libnm-core/nm-setting-ip-config.c:2261
 #, c-format
 msgid "%d. route is invalid"
 msgstr "%d. ruta es inválida"
 
-#: ../libnm-core/nm-setting-ip-config.c:2289
+#: ../libnm-core/nm-setting-ip-config.c:2270
 #, c-format
 msgid "%d. route cannot be a default route"
-msgstr ""
-
-#: ../libnm-core/nm-setting-ip-config.c:2300
-#, fuzzy, c-format
-msgid "a gateway is incompatible with '%s'"
-msgstr "'%s=%s' es incompatible con '%s > 0'"
+msgstr "%d. ruta no puede ser una ruta predeterminada"
 
 #: ../libnm-core/nm-setting-ip4-config.c:143
-#: ../libnm-core/nm-setting-ip6-config.c:167
+#: ../libnm-core/nm-setting-ip6-config.c:144
 #: ../libnm-util/nm-setting-ip4-config.c:879
 #: ../libnm-util/nm-setting-ip6-config.c:843
-#, fuzzy, c-format
+#, c-format
 msgid "this property cannot be empty for '%s=%s'"
-msgstr "esta propiedad no tiene permiso para '%s=%s'"
+msgstr "esta propiedad no puede estar vacía 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:179
-#: ../libnm-core/nm-setting-ip6-config.c:189
-#: ../libnm-core/nm-setting-ip6-config.c:199
+#: ../libnm-core/nm-setting-ip6-config.c:156
+#: ../libnm-core/nm-setting-ip6-config.c:166
+#: ../libnm-core/nm-setting-ip6-config.c:176
 #: ../libnm-util/nm-setting-ip4-config.c:891
 #: ../libnm-util/nm-setting-ip4-config.c:901
 #: ../libnm-util/nm-setting-ip4-config.c:913
@@ -8223,31 +8801,20 @@ msgid "this property is not allowed for '%s=%s'"
 msgstr "esta propiedad no tiene permiso para '%s=%s'"
 
 #: ../libnm-core/nm-setting-ip4-config.c:214
-#, fuzzy, c-format
+#, c-format
 msgid "'%s' is not a valid FQDN"
-msgstr "'%s' no es un UUID válido"
+msgstr "'%s' no es un FQDN válido"
 
 #: ../libnm-core/nm-setting-ip4-config.c:223
 msgid "property cannot be set when dhcp-hostname is also set"
 msgstr ""
-
-#: ../libnm-core/nm-setting-ip6-config.c:237
-#, fuzzy
-msgid "value is not a valid token"
-msgstr "'%s' no es un UUID válido"
-
-#: ../libnm-core/nm-setting-ip6-config.c:248
-msgid "only makes sense with EUI64 address generation mode"
-msgstr ""
-
-#: ../libnm-core/nm-setting-ip6-config.c:260
-msgid "token is not in canonical form"
-msgstr ""
+"la propiedad no puede establecerse cuando el nombre de host dhcp también "
+"está establecido"
 
 #: ../libnm-core/nm-setting-ip-tunnel.c:318
-#, fuzzy, c-format
+#, c-format
 msgid "'%d' is not a valid tunnel mode"
-msgstr "'%d' no es un canal válido"
+msgstr "'%d' no es un modo de túnel válido"
 
 #: ../libnm-core/nm-setting-ip-tunnel.c:330
 #: ../libnm-core/nm-setting-macvlan.c:167 ../libnm-core/nm-setting-vlan.c:647
@@ -8258,23 +8825,25 @@ msgstr "'%s' ni es un UUID ni s un nombre de interfaz"
 
 #: ../libnm-core/nm-setting-ip-tunnel.c:341
 #: ../libnm-core/nm-setting-ip-tunnel.c:352
-#, fuzzy, c-format
+#, c-format
 msgid "'%s' is not a valid IPv%c address"
-msgstr "'%s' no es una dirección MAC válida"
+msgstr "'%s' no es una dirección IPv%c válida"
 
 #: ../libnm-core/nm-setting-ip-tunnel.c:366
 msgid "tunnel keys can only be specified for GRE tunnels"
-msgstr ""
+msgstr "Las llaves de túnel solamente pueden especificarse para túneles GRE "
 
 #: ../libnm-core/nm-setting-ip-tunnel.c:379
 #: ../libnm-core/nm-setting-ip-tunnel.c:395
-#, fuzzy, c-format
+#, c-format
 msgid "'%s' is not a valid tunnel key"
-msgstr "'%s' no es un canal válido"
+msgstr "'%s' no es una llave de túnel válida"
 
 #: ../libnm-core/nm-setting-ip-tunnel.c:407
 msgid "a fixed TTL is allowed only when path MTU discovery is enabled"
 msgstr ""
+"Un TTL fijo tiene permiso únicamente cuando el descubrimiento de ruta MTU "
+"está activado."
 
 #: ../libnm-core/nm-setting-macvlan.c:181 ../libnm-core/nm-setting-vlan.c:661
 #: ../libnm-util/nm-setting-vlan.c:580
@@ -8285,6 +8854,7 @@ msgstr "propiedad no se especificó y no es '%s:%s'"
 #: ../libnm-core/nm-setting-macvlan.c:192
 msgid "non promiscuous operation is allowed only in passthru mode"
 msgstr ""
+"Operaciones no promiscuas están autorizadas únicamente en modo passthru"
 
 #: ../libnm-core/nm-setting-olpc-mesh.c:130
 #: ../libnm-core/nm-setting-wireless.c:739
@@ -8312,19 +8882,19 @@ msgid "setting this property requires non-zero '%s' property"
 msgstr "Para establecer esta propiedad se requiere propiedad non-zero '%s'"
 
 #: ../libnm-core/nm-setting-tun.c:187
-#, fuzzy, c-format
+#, c-format
 msgid "'%u': invalid mode"
-msgstr "'%s' no es un modo Wi-Fi válido"
+msgstr "'%u' no es un modo válido"
 
 #: ../libnm-core/nm-setting-tun.c:197
-#, fuzzy, c-format
+#, c-format
 msgid "'%s': invalid user ID"
-msgstr "'%s' no es un UUID válido"
+msgstr "'%s': ID de usuario no es válido"
 
 #: ../libnm-core/nm-setting-tun.c:208
-#, fuzzy, c-format
+#, c-format
 msgid "'%s': invalid group ID"
-msgstr "'%s' no es un UUID válido"
+msgstr "'%s' ID de grupo no es válido"
 
 #: ../libnm-core/nm-setting-vlan.c:636 ../libnm-util/nm-setting-vlan.c:556
 #, c-format
@@ -8334,60 +8904,60 @@ msgstr "'%s' valor no coincide '%s=%s'"
 #: ../libnm-core/nm-setting-vlan.c:672 ../libnm-util/nm-setting-vlan.c:600
 #, c-format
 msgid "the vlan id must be in range 0-4094 but is %u"
-msgstr ""
+msgstr "El ID de vlan debe estar en el rango 0-4094 pero es %u"
 
 #: ../libnm-core/nm-setting-vlan.c:681 ../libnm-util/nm-setting-vlan.c:591
 msgid "flags are invalid"
 msgstr "Indicadores son inválidos"
 
 #: ../libnm-core/nm-setting-vpn.c:460
-#, fuzzy, c-format
+#, c-format
 msgid "secret was empty"
-msgstr "propiedad está vacía"
+msgstr "secreto estaba vacío"
 
 #: ../libnm-core/nm-setting-vpn.c:490
 msgid "setting contained a secret with an empty name"
-msgstr ""
+msgstr "parámetro contenía un secreto con un nombre vacío"
 
 #: ../libnm-core/nm-setting-vpn.c:498
 #, c-format
 msgid "secret value was empty"
-msgstr ""
+msgstr "El valor de secreto estaba vacío"
 
 #: ../libnm-core/nm-setting-vpn.c:545 ../libnm-core/nm-setting.c:1784
 msgid "not a secret property"
-msgstr ""
+msgstr "No es una propiedad de secreto"
 
 #: ../libnm-core/nm-setting-vpn.c:551
 msgid "secret is not of correct type"
-msgstr ""
+msgstr "secreto no es del tipo correcto"
 
 #: ../libnm-core/nm-setting-vpn.c:586
-#, fuzzy, c-format
+#, c-format
 msgid "failed to convert value '%s' to uint"
-msgstr "Error: falló al retirar el valor de '%s': %s\n"
+msgstr "No se pudo convertir el valor de '%s' a uint"
 
 #: ../libnm-core/nm-setting-vpn.c:594
 msgid "secret flags property not found"
-msgstr ""
+msgstr "No se encontró la propiedad de indicadores de secreto "
 
 #: ../libnm-core/nm-setting-vxlan.c:375
-#, fuzzy, c-format
+#, c-format
 msgid "'%s' is not a valid IP address"
-msgstr "'%s' no es una dirección MAC válida"
+msgstr "'%s' no es una dirección IP válida"
 
 #: ../libnm-core/nm-setting-vxlan.c:388
-#, fuzzy, c-format
+#, c-format
 msgid "'%s' is not a valid IP%c address"
-msgstr "'%s' no es una dirección MAC válida"
+msgstr "'%s' no es una dirección IP%c válida"
 
 #: ../libnm-core/nm-setting-vxlan.c:415
 #, c-format
 msgid "%d is greater than local port max %d"
-msgstr ""
+msgstr "%d es mayour que el máximo puerto local %d"
 
 #: ../libnm-core/nm-setting-wired.c:619 ../libnm-util/nm-setting-wired.c:613
-#, fuzzy, c-format
+#, c-format
 msgid "'%s' is not a valid Ethernet port value"
 msgstr "'%s' no es un valor de puerto Ethernet válido"
 
@@ -8403,11 +8973,12 @@ msgstr "invalido '%s' o su valor '%s'"
 
 #: ../libnm-core/nm-setting-wired.c:709
 msgid "Wake-on-LAN mode 'default' and 'ignore' are exclusive flags"
-msgstr ""
+msgstr "El modo Wake-on-LAN, 'default' e 'ignore' son indicadores exclusivos"
 
 #: ../libnm-core/nm-setting-wired.c:718
 msgid "Wake-on-LAN password can only be used with magic packet mode"
 msgstr ""
+"La contraseña Wake-on-LAN únicamente puede utilizarse con modo packet magic "
 
 #: ../libnm-core/nm-setting-wireless-security.c:882
 #: ../libnm-util/nm-setting-wireless-security.c:912
@@ -8452,223 +9023,207 @@ msgid "'%s' is not a valid band"
 msgstr "'%s' no es una banda válida"
 
 #: ../libnm-core/nm-setting-wireless.c:768
-#, fuzzy, c-format
+#, c-format
 msgid "'%s' requires setting '%s' property"
-msgstr "requiere propiedad de parámetro '%s'"
+msgstr "'%s' requiere establecer la propiedad '%s'"
 
 #: ../libnm-core/nm-setting.c:837
 #, c-format
 msgid "duplicate property"
-msgstr ""
+msgstr "Duplicar propiedad"
 
 #: ../libnm-core/nm-setting.c:865 ../libnm-core/nm-setting.c:912
 #, c-format
 msgid "can't set property of type '%s' from value of type '%s'"
-msgstr ""
+msgstr "No se puede establecer el tipo '%s' del valor de tipo '%s'"
 
 #: ../libnm-core/nm-setting.c:884 ../libnm-core/nm-setting.c:898
-#, fuzzy, c-format
+#, c-format
 msgid "failed to set property: %s"
-msgstr "Error: falló al establecer '%s' propiedad: %s\n"
+msgstr "No se pudo establecer propiedad: %s"
 
 #: ../libnm-core/nm-setting.c:926
-#, fuzzy, c-format
+#, c-format
 msgid "can not set property: %s"
-msgstr "Error: falló al establecer '%s' propiedad: %s\n"
+msgstr "No se pudo establecer propiedad: %s"
 
 # auto translated by TM merge from project: evolution-mapi, version: el6, DocId: evolution-mapi
 #: ../libnm-core/nm-setting.c:942
-#, fuzzy, c-format
+#, c-format
 msgid "unknown property"
 msgstr "Error desconocido"
 
 #: ../libnm-core/nm-setting.c:1682
 msgid "secret not found"
-msgstr ""
+msgstr "No se encontró secreto"
 
 #: ../libnm-core/nm-setting.c:1774
 msgid "secret is not set"
-msgstr ""
+msgstr "No se estableció secreto"
 
 # auto translated by TM merge from project: NetworkManager, version: 0.9.8.2, DocId: NetworkManager
-#: ../libnm-core/nm-utils.c:2445
-#, fuzzy, c-format
+#: ../libnm-core/nm-utils.c:2447
+#, c-format
 msgid "failed stat file %s: %s"
-msgstr "Falló al establecer máscara de señal: %d"
+msgstr "No se pudo establecer estadística %s: %s"
 
-#: ../libnm-core/nm-utils.c:2454
-#, fuzzy, c-format
+#: ../libnm-core/nm-utils.c:2456
+#, c-format
 msgid "not a file (%s)"
-msgstr "No se pudo cargar archivo '%s'\n"
+msgstr "No es un archivo (%s)"
 
-#: ../libnm-core/nm-utils.c:2465
-#, fuzzy, c-format
+#: ../libnm-core/nm-utils.c:2467
+#, c-format
 msgid "invalid file owner %d for %s"
-msgstr "Campo inválido '%s'; campos permitidos: %s"
+msgstr "Propietario de archivo inválido %d para %s"
 
-#: ../libnm-core/nm-utils.c:2476
+#: ../libnm-core/nm-utils.c:2478
 #, c-format
 msgid "file permissions for %s"
-msgstr ""
+msgstr "Permisos de archivos para %s"
 
-#: ../libnm-core/nm-utils.c:2486
+#: ../libnm-core/nm-utils.c:2488
 #, c-format
 msgid "reject %s"
-msgstr ""
+msgstr "Rechazar %s"
 
-#: ../libnm-core/nm-utils.c:2506
+#: ../libnm-core/nm-utils.c:2508
 #, c-format
 msgid "path is not absolute (%s)"
-msgstr ""
+msgstr "Ruta no es absoluta (%s)"
 
-#: ../libnm-core/nm-utils.c:2520
+#: ../libnm-core/nm-utils.c:2522
 #, c-format
 msgid "Plugin file does not exist (%s)"
-msgstr ""
+msgstr "El complemento de archivo no existe (%s)"
 
-#: ../libnm-core/nm-utils.c:2528
-#, fuzzy, c-format
+#: ../libnm-core/nm-utils.c:2530
+#, c-format
 msgid "Plugin is not a valid file (%s)"
-msgstr "'%s' no es un valor váldo para '%s'"
+msgstr "El complemento no es un archivo válido (%s)"
 
-#: ../libnm-core/nm-utils.c:2538
+#: ../libnm-core/nm-utils.c:2540
 #, c-format
 msgid "libtool archives are not supported (%s)"
-msgstr ""
+msgstr "Los archivos libtool no reciben soporte (%s)"
 
-#: ../libnm-core/nm-utils.c:2620 ../libnm-util/nm-utils.c:1803
+#: ../libnm-core/nm-utils.c:2622 ../libnm-util/nm-utils.c:1815
 #, c-format
 msgid "Could not find \"%s\" binary"
-msgstr ""
+msgstr "No se pudo encontrar el binario \"%s\" "
 
-#: ../libnm-core/nm-vpn-editor-plugin.c:296
+#: ../libnm-core/nm-vpn-editor-plugin.c:124
 #, c-format
-msgid "cannot load plugin \"%s\": %s"
-msgstr ""
+msgid "cannot load plugin %s"
+msgstr "No se puede cargar el complemento %s"
 
-#: ../libnm-core/nm-vpn-editor-plugin.c:307
+#: ../libnm-core/nm-vpn-editor-plugin.c:150
 #, c-format
-msgid "failed to load nm_vpn_editor_plugin_factory() from %s (%s)"
+msgid "cannot load VPN plugin in '%s': missing plugin name"
 msgstr ""
+"No se puede cargar el complemento VPN en '%s': falta el nombre del "
+"complemento"
 
-#: ../libnm-core/nm-vpn-editor-plugin.c:332
+#: ../libnm-core/nm-vpn-editor-plugin.c:157
 #, c-format
-msgid "unknown error initializing plugin %s"
+msgid "cannot load VPN plugin in '%s': invalid service name"
 msgstr ""
+"No se puede cargar el complemento VPN en '%s': nombre de servicio es "
+"inválido"
 
-#: ../libnm-core/nm-vpn-editor-plugin.c:349
+#: ../libnm-core/nm-vpn-editor-plugin.c:173
 #, c-format
-msgid "cannot load VPN plugin in '%s': missing plugin name"
-msgstr ""
+msgid "unknown error initializing plugin %s"
+msgstr "Error desconocido al inicializar el complemento %s"
 
-#: ../libnm-core/nm-vpn-editor-plugin.c:358
+#: ../libnm-core/nm-vpn-editor-plugin.c:185
 #, c-format
-msgid "cannot load VPN plugin in '%s': invalid service name"
-msgstr ""
+msgid "failed to load nm_vpn_editor_plugin_factory() from %s (%s)"
+msgstr "No se pudo cargar nm_vpn_editor_plugin_factory() desde %s (%s)"
 
-#: ../libnm-core/nm-vpn-editor-plugin.c:501
+#: ../libnm-core/nm-vpn-editor-plugin.c:292
 #, c-format
 msgid "the plugin does not support import capability"
-msgstr ""
+msgstr "El complemento no soporta la funcionalidad de importación "
 
-#: ../libnm-core/nm-vpn-editor-plugin.c:521
+#: ../libnm-core/nm-vpn-editor-plugin.c:312
 #, c-format
 msgid "the plugin does not support export capability"
-msgstr ""
+msgstr "El complemento no soporta la funcionalidad de exportación"
 
-#: ../libnm-core/nm-vpn-plugin-info.c:110
-#, fuzzy, c-format
+#: ../libnm-core/nm-vpn-plugin-info.c:109
+#, c-format
 msgid "missing filename"
-msgstr "Falta opción"
+msgstr "Falta nombre de archivo"
 
-#: ../libnm-core/nm-vpn-plugin-info.c:118
+#: ../libnm-core/nm-vpn-plugin-info.c:117
 #, c-format
 msgid "filename must be an absolute path (%s)"
-msgstr ""
+msgstr "El nombre de archivo debe ser una ruta absoluta (%s)"
 
-#: ../libnm-core/nm-vpn-plugin-info.c:127
+#: ../libnm-core/nm-vpn-plugin-info.c:126
 #, c-format
 msgid "filename has invalid format (%s)"
-msgstr ""
+msgstr "El nombre de archivo tiene un formato inválido (%s)"
 
-#: ../libnm-core/nm-vpn-plugin-info.c:450
+#: ../libnm-core/nm-vpn-plugin-info.c:383
 #, c-format
 msgid "there exists a conflicting plugin (%s) that has the same %s.%s value"
-msgstr ""
+msgstr "Hay un complemento en conflicto (%s) que tiene el mismo %s. Valor %s"
 
-#: ../libnm-core/nm-vpn-plugin-info.c:488
+#: ../libnm-core/nm-vpn-plugin-info.c:421
 #, c-format
 msgid "there exists a conflicting plugin with the same name (%s)"
-msgstr ""
+msgstr "Hay un complemento en conflicto con el mismo nombre (%s)"
 
-#: ../libnm-core/nm-vpn-plugin-info.c:1071
-#, fuzzy, c-format
+#: ../libnm-core/nm-vpn-plugin-info.c:740
+#, c-format
 msgid "missing \"plugin\" setting"
-msgstr "Falta opción"
+msgstr "Falta el parámetro 'plugin'"
 
-#: ../libnm-core/nm-vpn-plugin-info.c:1081
+#: ../libnm-core/nm-vpn-plugin-info.c:750
 #, c-format
 msgid "%s: don't retry loading plugin which already failed previously"
-msgstr ""
+msgstr "%s: No reintente cargar el complemento que ya haya fallado"
 
-#: ../libnm-core/nm-vpn-plugin-info.c:1175
+#: ../libnm-core/nm-vpn-plugin-info.c:842
 msgid "missing filename to load VPN plugin info"
 msgstr ""
+"Falta el nombre de archivo para cargar información del complemento VPN "
 
-#: ../libnm-core/nm-vpn-plugin-info.c:1187
+#: ../libnm-core/nm-vpn-plugin-info.c:854
 msgid "missing name for VPN plugin info"
-msgstr ""
+msgstr "Falta el nombre para la información de complemento VPN"
 
-#: ../libnm-core/nm-vpn-plugin-info.c:1196
+#: ../libnm-core/nm-vpn-plugin-info.c:863
 msgid "missing service for VPN plugin info"
-msgstr ""
+msgstr "Falta el servicio para la información del complemento VPN "
 
-#: ../libnm-glib/nm-device.c:1863 ../libnm/nm-device.c:1814
+#: ../libnm-glib/nm-device.c:1853 ../libnm/nm-device.c:1804
 msgid "Bluetooth"
 msgstr "Bluetooth"
 
-#: ../libnm-glib/nm-device.c:1865 ../libnm/nm-device.c:1816
-msgid "OLPC Mesh"
-msgstr "OLPC Mesh"
-
-#: ../libnm-glib/nm-device.c:1867 ../libnm/nm-device.c:1818
-msgid "WiMAX"
-msgstr "WiMAX"
-
-#: ../libnm-glib/nm-device.c:1881 ../libnm/nm-device.c:1832
-msgid "ADSL"
-msgstr "ADSL"
-
-#: ../libnm-glib/nm-device.c:1883 ../libnm/nm-device.c:1834
-#, fuzzy
+#: ../libnm-glib/nm-device.c:1873 ../libnm/nm-device.c:1824
 msgid "MACVLAN"
-msgstr "VLAN"
-
-#: ../libnm-glib/nm-device.c:1885 ../libnm/nm-device.c:1836
-msgid "VXLAN"
-msgstr ""
+msgstr "MACVLAN"
 
-#: ../libnm-glib/nm-device.c:1887 ../libnm/nm-device.c:1838
+#: ../libnm-glib/nm-device.c:1877 ../libnm/nm-device.c:1828
 msgid "IPTunnel"
-msgstr ""
-
-#: ../libnm-glib/nm-device.c:1889 ../libnm/nm-device.c:1840
-msgid "Tun"
-msgstr ""
+msgstr "IPTunnel"
 
-#: ../libnm-glib/nm-device.c:1891 ../libnm/nm-device.c:1842
+#: ../libnm-glib/nm-device.c:1881 ../libnm/nm-device.c:1832
 msgid "Veth"
-msgstr ""
+msgstr "Veth"
 
-#: ../libnm-glib/nm-device.c:1923 ../libnm/nm-device.c:1874
+#: ../libnm-glib/nm-device.c:1913 ../libnm/nm-device.c:1864
 msgid "Wired"
 msgstr "Cableado"
 
-#: ../libnm-glib/nm-device.c:1954 ../libnm/nm-device.c:1905
+#: ../libnm-glib/nm-device.c:1944 ../libnm/nm-device.c:1895
 msgid "PCI"
 msgstr "PCI"
 
-#: ../libnm-glib/nm-device.c:1956 ../libnm/nm-device.c:1907
+#: ../libnm-glib/nm-device.c:1946 ../libnm/nm-device.c:1897
 msgid "USB"
 msgstr "USB"
 
@@ -8677,33 +9232,32 @@ msgstr "USB"
 #. * "Ethernet"). You can change this to something like
 #. * "%2$s (%1$s)" if there's no grammatical way to combine
 #. * the strings otherwise.
-#.
-#: ../libnm-glib/nm-device.c:2052 ../libnm-glib/nm-device.c:2071
-#: ../libnm/nm-device.c:2001 ../libnm/nm-device.c:2020
+#. 
+#: ../libnm-glib/nm-device.c:2042 ../libnm-glib/nm-device.c:2061
+#: ../libnm/nm-device.c:1991 ../libnm/nm-device.c:2010
 #, c-format
 msgctxt "long device name"
 msgid "%s %s"
 msgstr "%s %s"
 
 #: ../libnm-glib/nm-remote-connection.c:149
-#, fuzzy
 msgid "Disconnected by D-Bus"
-msgstr "desconectado"
+msgstr "Desconectado por D-Bus"
 
 #: ../libnm-util/crypto_gnutls.c:84
 #, c-format
 msgid "Hash length too long (%d > %d)."
-msgstr ""
+msgstr "Tiene una longitud demasiado extensa (%d >%d)."
 
 #: ../libnm-util/crypto_gnutls.c:115
-#, fuzzy, c-format
+#, c-format
 msgid "Failed to initialize the MD5 engine: %s (%s)"
-msgstr "Falló al inicializar el motor MD5: %s / %s."
+msgstr "No se pudo inicializar el motor MD5: %s (%s)"
 
 #: ../libnm-util/crypto_nss.c:99
 #, c-format
 msgid "Failed to initialize the MD5 context: %d."
-msgstr "Falló al inicializar el contexto MD5: %d"
+msgstr "No se pudo inicializar el contexto MD5: %d"
 
 #: ../libnm-util/crypto_nss.c:460
 #, c-format
@@ -8737,24 +9291,24 @@ msgid "%d. route has invalid prefix"
 msgstr "%d. ruta tiene un prefijo inválido"
 
 #: ../libnm-util/nm-setting-ip6-config.c:910
-#, fuzzy, c-format
+#, c-format
 msgid "%d. IPv6 address is invalid"
-msgstr "%d. dirección IPv4 es inválida"
+msgstr "%d. dirección IPv6 es inválida"
 
 #: ../libnm-util/nm-setting-ip6-config.c:920
-#, fuzzy, c-format
+#, c-format
 msgid "%d. IPv6 address has invalid prefix"
-msgstr "%d. dirección IPv4 tiene un prefijo inválido"
+msgstr "%d. dirección IPv6 tiene un prefijo inválido"
 
 #: ../libnm-util/nm-setting-vpn.c:582
 #, c-format
 msgid "Failed to convert '%s' value '%s' to uint"
-msgstr ""
+msgstr "No se pudo convertir valor de  %s'  '%s' para uint"
 
 #: ../libnm-util/nm-setting-vpn.c:589
 #, c-format
 msgid "Secret flags property '%s' not found"
-msgstr ""
+msgstr "No se encontró propiedad  '%s'  de indicadores de secreto "
 
 #: ../libnm-util/nm-setting-wireless.c:807
 #, c-format
@@ -8762,203 +9316,189 @@ msgid "requires setting '%s' property"
 msgstr "requiere propiedad de parámetro '%s'"
 
 #: ../libnm/nm-device-adsl.c:74
-#, fuzzy
 msgid "The connection was not an ADSL connection."
-msgstr "conectando (iniciando conexiones secundarias)"
+msgstr "La conexión no era  ADSL"
 
 #: ../libnm/nm-device-bond.c:112
-#, fuzzy
 msgid "The connection was not a bond connection."
-msgstr "conectando (iniciando conexiones secundarias)"
+msgstr "La conexión no era de vínculo."
 
 #: ../libnm/nm-device-bridge.c:112
-#, fuzzy
 msgid "The connection was not a bridge connection."
-msgstr "conectando (iniciando conexiones secundarias)"
+msgstr "La conexión no era de puente."
 
 #: ../libnm/nm-device-bt.c:137
-#, fuzzy, c-format
+#, c-format
 msgid "The connection was not a Bluetooth connection."
-msgstr "Hay 1 argumento opcional para tipo de conexión 'bluetooth'.\n"
+msgstr "La conexión no era Bluetooth."
 
 #: ../libnm/nm-device-bt.c:146
 msgid "Invalid device Bluetooth address."
-msgstr ""
+msgstr "Dirección de dispositivo Bluetooth es inválida"
 
 #: ../libnm/nm-device-bt.c:153
 msgid "The Bluetooth addresses of the device and the connection didn't match."
-msgstr ""
+msgstr "Las direcciones Bluetooth del dispositivo y la conexión no coinciden"
 
 #: ../libnm/nm-device-bt.c:162
 msgid ""
 "The device is lacking Bluetooth capabilities required by the connection."
 msgstr ""
+"El dispositivo no tiene las funcionalidades Bluetooth requeridas para la "
+"conexión. "
 
 #: ../libnm/nm-device-ethernet.c:207
-#, fuzzy
 msgid "The connection was not an Ethernet or PPPoE connection."
-msgstr "Hay 4 argumentos opcionales para tipo de conexión 'PPPoE'.\n"
+msgstr "La conexión no era Ethernet ni PPPoE."
 
 #: ../libnm/nm-device-ethernet.c:222
 msgid "The connection and device differ in S390 subchannels."
-msgstr ""
+msgstr "La conexión y el dispositivo difieren en subcanales S390."
 
 #: ../libnm/nm-device-ethernet.c:232 ../libnm/nm-device-infiniband.c:102
 #: ../libnm/nm-device-wifi.c:604 ../libnm/nm-device-wimax.c:326
-#, fuzzy
 msgid "Invalid device MAC address."
 msgstr "No es una dirección MAC válida"
 
 #: ../libnm/nm-device-ethernet.c:237
 msgid "The MACs of the device and the connection do not match."
-msgstr ""
+msgstr "Las MAC del dispositivo y la conexión no coinciden."
 
 #: ../libnm/nm-device-ethernet.c:247
 #, c-format
 msgid "Invalid MAC in the blacklist: %s."
-msgstr ""
+msgstr "Dirección MAC inválida en lista negra:  %s"
 
 #: ../libnm/nm-device-ethernet.c:253
 #, c-format
 msgid "Device MAC (%s) is blacklisted by the connection."
-msgstr ""
+msgstr "Dispositivo MAC (%s) es puesto en lista negra por la conexión."
 
 #: ../libnm/nm-device-generic.c:91
-#, fuzzy
 msgid "The connection was not a generic connection."
-msgstr "conectando (iniciando conexiones secundarias)"
+msgstr "La conexión no era genérica."
 
 #: ../libnm/nm-device-generic.c:98
-#, fuzzy
 msgid "The connection did not specify an interface name."
-msgstr ""
-"La conexión InfiniBand P_Key no especificó el nombre de la interfaz padre"
+msgstr "La conexión no especificó un nombre de interfaz."
 
 #: ../libnm/nm-device-tun.c:209
-#, fuzzy
 msgid "The connection was not a tun connection."
-msgstr "conectando (iniciando conexiones secundarias)"
+msgstr "La conexión no era tun."
 
 #: ../libnm/nm-device-tun.c:218
-#, fuzzy
 msgid "The mode of the device and the connection didn't match"
-msgstr "La conexión activa del dispositivo desapareció"
+msgstr "El modo del dispositivo y la conexión no corresponden."
 
 #: ../libnm/nm-device-infiniband.c:94
-#, fuzzy
 msgid "The connection was not an InfiniBand connection."
-msgstr "Hay 5 argumentos opcionales para tipo de conexión 'Infiniband'.\n"
+msgstr "La conexión no era Infiniband."
 
 #: ../libnm/nm-device-infiniband.c:110 ../libnm/nm-device-wifi.c:611
 #: ../libnm/nm-device-wimax.c:333
 msgid "The MACs of the device and the connection didn't match."
-msgstr ""
+msgstr "Las MAC del dispositivo y la conexión no coinciden."
 
 #: ../libnm/nm-device-ip-tunnel.c:254
-#, fuzzy
 msgid "The connection was not an IP tunnel connection."
-msgstr "conectando (iniciando conexiones secundarias)"
+msgstr "La conexión no era de túnel IP "
 
 #: ../libnm/nm-device-macvlan.c:159
 msgid "The connection was not a MAC-VLAN connection."
-msgstr ""
+msgstr "La conexión no era MAC-VLAN"
 
 #: ../libnm/nm-device-modem.c:120
-#, fuzzy
 msgid "The connection was not a modem connection."
-msgstr "se eliminó la conexión"
+msgstr "La conexión no era de módem."
 
 #: ../libnm/nm-device-modem.c:128
-#, fuzzy
 msgid "The connection was not a valid modem connection."
-msgstr "conectando (iniciando conexiones secundarias)"
+msgstr "La conexión no era una conexión de módem válida."
 
 #: ../libnm/nm-device-modem.c:135
 msgid "The device is lacking capabilities required by the connection."
 msgstr ""
+"El dispositivo no tiene las funcionalidades requeridas para la conexión. "
 
 #: ../libnm/nm-device-olpc-mesh.c:115
-#, fuzzy
 msgid "The connection was not an OLPC Mesh connection."
-msgstr "Hay 2 argumentos opcionales para tipo de conexión 'OLPC'.\n"
+msgstr "La conexión no era OLPC Mesh. "
 
-#: ../libnm/nm-device-team.c:139
-#, fuzzy
+#: ../libnm/nm-device-team.c:118
 msgid "The connection was not a team connection."
-msgstr "se eliminó la conexión"
+msgstr "La conexión no era de equipo."
 
 #: ../libnm/nm-device-vlan.c:128
-#, fuzzy
 msgid "The connection was not a VLAN connection."
-msgstr "Hay 4 argumentos opcionales para tipo de conexión 'Vlan'.\n"
+msgstr "La conexión no era VLAN."
 
 #: ../libnm/nm-device-vlan.c:135
 msgid "The VLAN identifiers of the device and the connection didn't match."
-msgstr ""
+msgstr "Los identificadores VLAN del dispositivo y la conexión no coinciden."
 
 #: ../libnm/nm-device-vlan.c:148
 msgid "The hardware address of the device and the connection didn't match."
-msgstr ""
+msgstr "La dirección de hardware del dispositivo y la conexión no coinciden."
 
 #: ../libnm/nm-device-vxlan.c:387
-#, fuzzy
 msgid "The connection was not a VXLAN connection."
-msgstr "Hay 4 argumentos opcionales para tipo de conexión 'Vlan'.\n"
+msgstr "La conexión no era VLAN."
 
 #: ../libnm/nm-device-vxlan.c:394
 msgid "The VXLAN identifiers of the device and the connection didn't match."
-msgstr ""
+msgstr "Los identificadores VXLAN del dispositivo y la conexión no coinciden."
 
 #: ../libnm/nm-device-wifi.c:595
 msgid "The connection was not a Wi-Fi connection."
-msgstr ""
+msgstr "La conexión no era WI-FI."
 
 #: ../libnm/nm-device-wifi.c:631
 msgid "The device is lacking WPA capabilities required by the connection."
 msgstr ""
+"El dispositivo no tiene las funcionalidades WPA requeridas para la conexión. "
+""
 
 #: ../libnm/nm-device-wifi.c:638
-msgid "The device is lacking WPA2/RSN capabilities required by the connection."
+msgid ""
+"The device is lacking WPA2/RSN capabilities required by the connection."
 msgstr ""
+"El dispositivo no tiene las funcionalidades WPA2/RSN requeridas para la "
+"conexión. "
 
 #: ../libnm/nm-device-wimax.c:317
-#, fuzzy
 msgid "The connection was not a WiMAX connection."
-msgstr "Hay 1 argumento opcional para tipo de conexión 'WiMax'.\n"
+msgstr "La conexión no era WiMAX."
 
-#: ../libnm/nm-device.c:2739
-#, fuzzy, c-format
+#: ../libnm/nm-device.c:2729
+#, c-format
 msgid "The connection was not valid: %s"
-msgstr "Error: conexión no es válida: %s\n"
+msgstr "La conexión no era válida:  %s"
 
-#: ../libnm/nm-device.c:2748
+#: ../libnm/nm-device.c:2738
 #, c-format
 msgid "The interface names of the device and the connection didn't match."
-msgstr ""
+msgstr "Los nombres de interfaces del dispositivo y la conexión no coinciden."
 
-#: ../libnm/nm-manager.c:867
-#, fuzzy
+#: ../libnm/nm-manager.c:874
 msgid "Active connection could not be attached to the device"
-msgstr "conexión o dispositivo no activo"
+msgstr "La conexión activa no se pudo vincular al dispositivo."
 
 # auto translated by TM merge from project: NetworkManager, version: 0.9.8.2, DocId: NetworkManager
-#: ../libnm/nm-manager.c:1091
-#, fuzzy
+#: ../libnm/nm-manager.c:1098
 msgid "Active connection removed before it was initialized"
-msgstr "Activar detalles de la conexión"
+msgstr "Se retiró la conexión antes de que fuera inicializada."
 
 #: ../libnm/nm-object.c:1545 ../libnm/nm-object.c:1691
 msgid "Caller did not specify D-Bus path for object"
-msgstr ""
+msgstr "El invocador no especificó la ruta D-Bus para objeto."
 
 #: ../libnm/nm-remote-settings.c:261
 msgid "Connection removed before it was initialized"
-msgstr ""
+msgstr "Se retiró la conexión antes de que fuera inicializada."
 
 #: ../libnm/nm-vpn-plugin-old.c:957 ../libnm/nm-vpn-service-plugin.c:978
-#, fuzzy
 msgid "No service name specified"
-msgstr "Error: No interface specified."
+msgstr "No se especificó el nombre de servicio."
 
 #: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:1
 msgid "Enable or disable system networking"
@@ -8966,214 +9506,214 @@ msgstr "Activar o desactivar la red del sistema"
 
 #: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:2
 msgid "System policy prevents enabling or disabling system networking"
-msgstr "La política del sistema evita activar o desactivar la red del sistema"
+msgstr ""
+"La política del sistema evita activar o desactivar la red del sistema"
 
 #: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:3
-#, fuzzy
-msgid "Reload NetworkManager configuration"
-msgstr "Imprimir versión de NetworkManager version y salir"
-
-#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:4
-#, fuzzy
-msgid "System policy prevents reloading NetworkManager"
-msgstr "La política del sistema evita activar o desactivar la red del sistema"
-
-#: ../policy/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 ""
-"Poner NetworkManager a dormir o despertarlo (sólo lo debería usar el gestor "
-"de energía del sistema)"
+"Poner NetworkManager a dormir o despertarlo (sólo lo debería usar el "
+"gestor de energía del sistema)"
 
-#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:6
+#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:4
 msgid "System policy prevents putting NetworkManager to sleep or waking it up"
 msgstr ""
 "La política del sistema evita poner a NetworkManager a dormir o despertarlo"
 
-#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:7
+#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:5
 msgid "Enable or disable WiFi devices"
 msgstr "Activar o desactivar los dispositivos inalámbricos"
 
-#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:8
+#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:6
 msgid "System policy prevents enabling or disabling WiFi devices"
 msgstr ""
 "La política de sistema evita activar o desactivar los dispositivos "
 "inalámbricos"
 
-#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:9
+#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:7
 msgid "Enable or disable mobile broadband devices"
 msgstr "Activar o desactivar los dispositivos de banda ancha móvil"
 
-#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:10
+#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:8
 msgid "System policy prevents enabling or disabling mobile broadband devices"
 msgstr ""
-"La política del sistema evita activar o desactivar los dispositivos de banda "
-"ancha móvil"
+"La política del sistema evita activar o desactivar los dispositivos de "
+"banda ancha móvil"
 
-#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:11
+#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:9
 msgid "Enable or disable WiMAX mobile broadband devices"
 msgstr "Activar o desactivar los dispositivos de banda ancha móvil WiMAX"
 
-#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:12
+#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:10
 msgid ""
 "System policy prevents enabling or disabling WiMAX mobile broadband devices"
 msgstr ""
-"La política del sistema evita activar o desactivar los dispositivos de banda "
-"ancha móvil WiMAX"
+"La política del sistema evita activar o desactivar los dispositivos de "
+"banda ancha móvil WiMAX"
 
-#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:13
+#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:11
 msgid "Allow control of network connections"
 msgstr "Permitir controlar las conexiones de red"
 
-#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:14
+#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:12
 msgid "System policy prevents control of network connections"
 msgstr "La política de sistema evita el control de las conexiones de red"
 
-#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:15
+#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:13
 msgid "Connection sharing via a protected WiFi network"
 msgstr "Compartir conexión a través de una red WIFI protegida"
 
-#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:16
-msgid "System policy prevents sharing connections via a protected WiFi network"
+#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:14
+msgid ""
+"System policy prevents sharing connections via a protected WiFi network"
 msgstr ""
 "La política del sistema evita compartir conexiones a través de una red WiFi "
 "protegida"
 
-#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:17
+#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:15
 msgid "Connection sharing via an open WiFi network"
 msgstr "Compartir conexión a través de una red WIFI abierta"
 
-#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:18
+#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:16
 msgid "System policy prevents sharing connections via an open WiFi network"
 msgstr ""
 "La política del sistema evita compartir conexiones a través de una red WiFi "
 "abierta"
 
-#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:19
+#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:17
 msgid "Modify personal network connections"
 msgstr "Modificar las conexiones de red personales"
 
-#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:20
+#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:18
 msgid "System policy prevents modification of personal network settings"
 msgstr ""
 "La política del sistema evita la modificación de la configuración personal "
 "de la red"
 
-#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:21
+#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:19
 msgid "Modify network connections for all users"
 msgstr "Modificar las conexiones de red para todos los usuarios"
 
-#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:22
+#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:20
 msgid "System policy prevents modification of network settings for all users"
 msgstr ""
 "La política del sistema evita la modificación de la configuración de la red "
 "para todos los usuarios"
 
-#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:23
+#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:21
 msgid "Modify persistent system hostname"
 msgstr "Modificar nombre de host de sistema persistente"
 
-#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:24
+#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:22
 msgid "System policy prevents modification of the persistent system hostname"
 msgstr ""
 "La política del sistema evita la modificación del nombre persistente del "
 "sistema"
 
-#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:25
+#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:23
 msgid "Modify persistent global DNS configuration"
-msgstr ""
+msgstr "Modificar la configuración de DNS global persistente"
 
-#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:26
-#, fuzzy
+#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:24
 msgid ""
 "System policy prevents modification of the persistent global DNS "
 "configuration"
 msgstr ""
-"La política del sistema evita la modificación del nombre persistente del "
-"sistema"
+"La política del sistema evita la modificación de la configuración de DNS "
+"global  persistente."
 
-#: ../shared/nm-utils/nm-shared-utils.c:185
+#: ../shared/nm-shared-utils.c:208
 #, c-format
 msgid "object class '%s' has no property named '%s'"
-msgstr ""
+msgstr "Clase de objeto  '%s' no tiene la propiedad '%s'"
 
-#: ../shared/nm-utils/nm-shared-utils.c:192
+#: ../shared/nm-shared-utils.c:215
 #, c-format
 msgid "property '%s' of object class '%s' is not writable"
-msgstr ""
+msgstr "La propiedad '%s' de clase de objeto '%s' no es de escritura."
 
-#: ../shared/nm-utils/nm-shared-utils.c:199
+#: ../shared/nm-shared-utils.c:222
 #, c-format
 msgid ""
 "construct property \"%s\" for object '%s' can't be set after construction"
 msgstr ""
+"La propiedad de construcción  \"%s\" para objeto '%s' no se puede establecer "
+"después de la construcción"
 
-#: ../shared/nm-utils/nm-shared-utils.c:207
+#: ../shared/nm-shared-utils.c:230
 #, c-format
 msgid "'%s::%s' is not a valid property name; '%s' is not a GObject subtype"
 msgstr ""
+"'%s::%s' no es un nombre de propiedad válido; '%s' no es el subtipo GObject"
 
-#: ../shared/nm-utils/nm-shared-utils.c:216
+#: ../shared/nm-shared-utils.c:239
 #, c-format
 msgid "unable to set property '%s' of type '%s' from value of type '%s'"
 msgstr ""
+"No se puede establecer propiedad '%s' de tipo '%s' de un valor de tipo '%s'"
 
-#: ../shared/nm-utils/nm-shared-utils.c:227
+#: ../shared/nm-shared-utils.c:250
 #, c-format
 msgid ""
 "value \"%s\" of type '%s' is invalid or out of range for property '%s' of "
 "type '%s'"
 msgstr ""
+"El valor  \"%s\" de tipo '%s' es inválido o está fuera del rango para "
+"propiedad  '%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:112
-#, fuzzy, c-format
+#: ../src/NetworkManagerUtils.c:111
+#, c-format
 msgctxt "connection id fallback"
 msgid "%s %d"
-msgstr "%s %s"
+msgstr "%s %d"
 
-#: ../src/main.c:165 ../src/main.c:300
-#, fuzzy, c-format
+#: ../src/main.c:220 ../src/main.c:358
+#, c-format
 msgid "Failed to read configuration: %s\n"
-msgstr "Falló al leer configuración: (%d) %s\n"
+msgstr "No se pudo leer la configuración:  %s\n"
 
 #. Logging/debugging
-#: ../src/main.c:179 ../src/nm-iface-helper.c:298
+#: ../src/main.c:234 ../src/nm-iface-helper.c:298
 msgid "Print NetworkManager version and exit"
 msgstr "Imprimir versión de NetworkManager version y salir"
 
-#: ../src/main.c:180 ../src/nm-iface-helper.c:299
+#: ../src/main.c:235 ../src/nm-iface-helper.c:299
 msgid "Don't become a daemon"
 msgstr "No se convierta en demonio"
 
-#: ../src/main.c:181 ../src/nm-iface-helper.c:301
+#: ../src/main.c:236 ../src/nm-iface-helper.c:301
 #, c-format
 msgid "Log level: one of [%s]"
 msgstr "Nivel de registro: uno de [%s]"
 
-#: ../src/main.c:183 ../src/nm-iface-helper.c:303
+#: ../src/main.c:238 ../src/nm-iface-helper.c:303
 #, c-format
 msgid "Log domains separated by ',': any combination of [%s]"
 msgstr "Dominios de registro separados por ',': cualquier combinación de [%s]"
 
-#: ../src/main.c:185 ../src/nm-iface-helper.c:305
+#: ../src/main.c:240 ../src/nm-iface-helper.c:305
 msgid "Make all warnings fatal"
 msgstr "Hacer todas las advertencias fatales"
 
-#: ../src/main.c:186
+#: ../src/main.c:241
 msgid "Specify the location of a PID file"
 msgstr "Especificar el sitio del archivo PID"
 
-#: ../src/main.c:188
-#, fuzzy
+#: ../src/main.c:242
+msgid "State file location"
+msgstr "Estado del sitio de archivos"
+
+#: ../src/main.c:244
 msgid "Print NetworkManager configuration and exit"
-msgstr "Imprimir versión de NetworkManager version y salir"
+msgstr "Imprimir configuración NetworkManager y salir"
 
-#: ../src/main.c:198
+#: ../src/main.c:254
 msgid ""
 "NetworkManager monitors all network connections and automatically\n"
 "chooses the best connection to use.  It also allows the user to\n"
@@ -9186,518 +9726,527 @@ msgstr ""
 "los puntos de acceso con los que las tarjeta inalámbricas en el computador \n"
 "se deben asociar."
 
-#: ../src/main.c:285 ../src/main-utils.c:270 ../src/nm-iface-helper.c:393
+#: ../src/main.c:343 ../src/main-utils.c:269 ../src/nm-iface-helper.c:393
 #, c-format
 msgid "%s.  Please use --help to see a list of valid options.\n"
 msgstr "%s. Usar --help para ver la lista de opciones válidas.\n"
 
-#: ../src/main.c:290 ../src/nm-iface-helper.c:398
+#: ../src/main.c:348 ../src/nm-iface-helper.c:398
 #, c-format
 msgid "Ignoring unrecognized log domain(s) '%s' passed on command line.\n"
 msgstr ""
 "Ignorando dominio(s) de registro desconocido '%s' que pasó en línea de "
 "comandos.\n"
 
-#: ../src/main.c:315
+#: ../src/main.c:373
 #, c-format
 msgid "Error in configuration file: %s.\n"
 msgstr "Error en archivo de configuración: %s.\n"
 
-#: ../src/main.c:320
+#: ../src/main.c:378
 #, c-format
 msgid "Ignoring unrecognized log domain(s) '%s' from config files.\n"
 msgstr ""
 "Ignorando dominio(s) de registro desconocido '%s' desde archivos de "
 "configuración.\n"
 
-#: ../src/main.c:331 ../src/nm-iface-helper.c:408
+#: ../src/main.c:389 ../src/nm-iface-helper.c:408
 #, c-format
 msgid "Could not daemonize: %s [error %u]\n"
 msgstr "No se pudo demonizar: %s [error %u]\n"
 
-#: ../src/main-utils.c:98
+#: ../src/main-utils.c:99
 #, c-format
 msgid "Opening %s failed: %s\n"
-msgstr "Al abrir %s falló: %s\n"
+msgstr "No se pudo abrir %s: %s\n"
 
-#: ../src/main-utils.c:104
+#: ../src/main-utils.c:105
 #, c-format
 msgid "Writing to %s failed: %s\n"
-msgstr "Escritura a %s falló: %s\n"
+msgstr "No se pudo escribir a %s : %s\n"
 
-#: ../src/main-utils.c:109
+#: ../src/main-utils.c:110
 #, c-format
 msgid "Closing %s failed: %s\n"
-msgstr "Cierre %s falló: %s\n"
+msgstr "No se pudo cerrar %s: %s\n"
 
-#: ../src/main-utils.c:144
+#: ../src/main-utils.c:145
 #, c-format
 msgid "Cannot create '%s': %s"
-msgstr ""
+msgstr "No se puede crear  «%s»: %s"
 
-#: ../src/main-utils.c:196
-#, fuzzy, c-format
+#: ../src/main-utils.c:197
+#, c-format
 msgid "%s is already running (pid %ld)\n"
-msgstr "NetworkManager ya está en ejecución (pid %ld)\n"
+msgstr "%s ya está en ejecución (pid %ld)\n"
 
-#: ../src/main-utils.c:206
-#, fuzzy, c-format
+#: ../src/main-utils.c:207
+#, c-format
 msgid "You must be root to run %s!\n"
-msgstr "Debe ser root para ejecutar NetworkManager\n"
+msgstr "¡Debe ser root para poder ejecutar %s!\n"
+"\n"
 
-#: ../src/dhcp-manager/nm-dhcp-dhclient-utils.c:214
+#: ../src/dhcp-manager/nm-dhcp-dhclient-utils.c:213
 msgid "# Created by NetworkManager\n"
 msgstr "# Creado por NetworkManager\n"
 
-#: ../src/dhcp-manager/nm-dhcp-dhclient-utils.c:222
+#: ../src/dhcp-manager/nm-dhcp-dhclient-utils.c:220
 #, c-format
-msgid ""
-"# Merged from %s\n"
+msgid "# Merged from %s\n"
 "\n"
-msgstr ""
-"# Mezclado de %s\n"
+msgstr "# Mezclado de %s\n"
 "\n"
 
-#: ../src/devices/bluetooth/nm-bluez-device.c:200
+#: ../src/devices/adsl/nm-device-adsl.c:133
+msgid "ADSL connection"
+msgstr "Conexión ADSL"
+
+#: ../src/devices/bluetooth/nm-bluez-device.c:197
 #, c-format
 msgid "%s Network"
 msgstr "Red %s "
 
 #: ../src/devices/bluetooth/nm-device-bt.c:253
 msgid "PAN requested, but Bluetooth device does not support NAP"
-msgstr ""
+msgstr "PAN solicitado, pero el dispositivo Bluetooth no soporta NAP"
 
 #: ../src/devices/bluetooth/nm-device-bt.c:263
 msgid "PAN connections cannot specify GSM, CDMA, or serial settings"
 msgstr ""
+"Las conexiones PAN no pueden especificar GSM, CDMA, o parámetros seriales."
 
 #: ../src/devices/bluetooth/nm-device-bt.c:276
-#, fuzzy
 msgid "PAN connection"
-msgstr "Conexión PAN %d"
+msgstr "Conexión PAN"
 
 #: ../src/devices/bluetooth/nm-device-bt.c:283
 msgid "DUN requested, but Bluetooth device does not support DUN"
-msgstr ""
+msgstr "DUN solicitado, pero el dispositivo Bluetooth no soporta DUN"
 
 #: ../src/devices/bluetooth/nm-device-bt.c:293
 msgid "DUN connection must include a GSM or CDMA setting"
-msgstr ""
+msgstr "La conexión DUN debe incluir los parámetros GSM o CDMA."
 
 #: ../src/devices/bluetooth/nm-device-bt.c:303
-#: ../src/devices/wwan/nm-modem-broadband.c:687
-#, fuzzy
+#: ../src/devices/wwan/nm-modem-broadband.c:655
 msgid "GSM connection"
-msgstr "Conexión GSM %d"
+msgstr "Conexión GSM"
 
 #: ../src/devices/bluetooth/nm-device-bt.c:307
-#: ../src/devices/wwan/nm-modem-broadband.c:711
-#, fuzzy
+#: ../src/devices/wwan/nm-modem-broadband.c:679
 msgid "CDMA connection"
-msgstr "Conexión CDMA %d"
+msgstr "Conexión CDMA"
 
 #: ../src/devices/bluetooth/nm-device-bt.c:315
 msgid "Unknown/unhandled Bluetooth connection type"
-msgstr ""
+msgstr "No se conoce o maneja tipo de conexión Bluetooth."
 
 #: ../src/devices/bluetooth/nm-device-bt.c:336
-#: ../src/devices/nm-device-ethernet.c:1421
+#: ../src/devices/nm-device-ethernet.c:1415
 #: ../src/devices/nm-device-infiniband.c:193
-#: ../src/devices/wifi/nm-device-wifi.c:875
-#, fuzzy
+#: ../src/devices/wifi/nm-device-wifi.c:872
 msgid "connection does not match device"
-msgstr "conexión o dispositivo no activo"
+msgstr "La conexión no coincide con el dispositivo"
 
 #: ../src/devices/nm-device-bond.c:105
-#, fuzzy
 msgid "Bond connection"
-msgstr "Conexión de vínculo %d"
+msgstr "Conexión de vínculo"
 
 #: ../src/devices/nm-device-bridge.c:111
-#, fuzzy
 msgid "Bridge connection"
-msgstr "Conexión en puente %d"
+msgstr "Conexión de puente"
 
-#: ../src/devices/nm-device-ethernet.c:1402
-#, fuzzy
+#: ../src/devices/nm-device-ethernet.c:1396
 msgid "PPPoE connection"
-msgstr "Conexión PPPoE %d"
+msgstr "Conexión PPPoE"
 
-#: ../src/devices/nm-device-ethernet.c:1402
-#, fuzzy
+#: ../src/devices/nm-device-ethernet.c:1396
 msgid "Wired connection"
-msgstr "Conexión cableada %d"
+msgstr "Conexión cableada"
 
-#: ../src/devices/nm-device-ethernet-utils.c:36
+#: ../src/devices/nm-device-ethernet-utils.c:39
 #, c-format
 msgid "Wired connection %d"
 msgstr "Conexión cableada %d"
 
-#: ../src/devices/nm-device-ip-tunnel.c:347
-#, fuzzy
+#: ../src/devices/nm-device-infiniband.c:175
+msgid "InfiniBand connection"
+msgstr "Conexión InfiniBand"
+
+#: ../src/devices/nm-device-ip-tunnel.c:346
 msgid "IP tunnel connection"
-msgstr "Editar conexión"
+msgstr "Conexión de túnel IP"
 
-#: ../src/devices/nm-device-macvlan.c:436
-#, fuzzy
+#: ../src/devices/nm-device-macvlan.c:435
 msgid "MACVLAN connection"
-msgstr "Conexión VLAN %d"
+msgstr "Conexión MACVLAN"
 
 #: ../src/devices/nm-device-tun.c:129
-#, fuzzy
 msgid "TUN connection"
-msgstr "Conexión DUN %d"
+msgstr "Conexión TUN"
+
+#: ../src/devices/nm-device-vlan.c:457
+msgid "VLAN connection"
+msgstr "Conexión VLAN"
 
-#: ../src/devices/team/nm-device-team.c:121
-#, fuzzy
+#: ../src/devices/nm-device-vxlan.c:373
+msgid "VXLAN connection"
+msgstr "Conexión VXLAN"
+
+#: ../src/devices/team/nm-device-team.c:115
 msgid "Team connection"
-msgstr "Conexión de equipo %d"
+msgstr "Conexión de equipo"
 
 #: ../src/devices/wifi/nm-device-olpc-mesh.c:146
-#, fuzzy
 msgid "Mesh"
-msgstr "Malla %d"
+msgstr "Malla"
 
-#: ../src/devices/wifi/nm-device-wifi.c:842
+#: ../src/devices/wifi/nm-device-wifi.c:839
 msgid "WPA Ad-Hoc disabled due to kernel bugs"
-msgstr ""
+msgstr "WPA Ad-Hoc está inhabilitado debido a errores de kernel"
 
 #: ../src/devices/wifi/nm-wifi-ap-utils.c:42
-#, fuzzy, c-format
+#, c-format
 msgid "%s is incompatible with static WEP keys"
-msgstr "'%s=%s' es incompatible con '%s > 0'"
+msgstr "%s es incompatible con  llaves WEP estáticas"
 
 #: ../src/devices/wifi/nm-wifi-ap-utils.c:76
-#, fuzzy
 msgid "LEAP authentication requires a LEAP username"
-msgstr "Autenticación requerida por red inalámbrica"
+msgstr "Autenticación LEAP requiere un nombre de usuario LEAP"
 
 #: ../src/devices/wifi/nm-wifi-ap-utils.c:86
 msgid "LEAP username requires 'leap' authentication"
-msgstr ""
+msgstr "Nombre de usuario LEAP requiere autenticación 'leap'."
 
 #: ../src/devices/wifi/nm-wifi-ap-utils.c:99
 msgid "LEAP authentication requires IEEE 802.1x key management"
-msgstr ""
+msgstr "Autenticación LEAP requiere administración de llave IEEE 802.1x"
 
 #: ../src/devices/wifi/nm-wifi-ap-utils.c:119
 msgid "LEAP authentication is incompatible with Ad-Hoc mode"
-msgstr ""
+msgstr "Autenticación LEAP no es compatible con modo Ad-Hoc"
 
 #: ../src/devices/wifi/nm-wifi-ap-utils.c:131
 msgid "LEAP authentication is incompatible with 802.1x setting"
-msgstr ""
+msgstr "Autenticación LEAP es incompatible con  parámetro 802.1x."
 
 #: ../src/devices/wifi/nm-wifi-ap-utils.c:153
 #, c-format
 msgid "a connection using '%s' authentication cannot use WPA key management"
 msgstr ""
+"Una conexión que use  autenticación '%s' no puede usar administración de "
+"llave WPA."
 
 #: ../src/devices/wifi/nm-wifi-ap-utils.c:164
 #, c-format
 msgid "a connection using '%s' authentication cannot specify WPA protocols"
 msgstr ""
+"Una conexión que use autenticación'%s' no puede especificar protocolos WPA."
 
 #: ../src/devices/wifi/nm-wifi-ap-utils.c:180
 #: ../src/devices/wifi/nm-wifi-ap-utils.c:197
 #, c-format
 msgid "a connection using '%s' authentication cannot specify WPA ciphers"
 msgstr ""
+"Una conexión que use autenticación'%s' no puede especificar cifras WPA."
 
 #: ../src/devices/wifi/nm-wifi-ap-utils.c:209
 #, c-format
 msgid "a connection using '%s' authentication cannot specify a WPA password"
 msgstr ""
+"Una conexión que use autenticación'%s' no puede especificar contraseña WPA."
 
 #: ../src/devices/wifi/nm-wifi-ap-utils.c:240
-#, fuzzy
 msgid "Dynamic WEP requires an 802.1x setting"
-msgstr "WEP Dinámica (802.1x)"
+msgstr "WEP dinámica requiere un parámetro 802.1x."
 
 #: ../src/devices/wifi/nm-wifi-ap-utils.c:250
 #: ../src/devices/wifi/nm-wifi-ap-utils.c:278
 msgid "Dynamic WEP requires 'open' authentication"
-msgstr ""
+msgstr "WEP dinámica requiere autenticación 'open'."
 
 #: ../src/devices/wifi/nm-wifi-ap-utils.c:265
 msgid "Dynamic WEP requires 'ieee8021x' key management"
-msgstr ""
+msgstr "WEP dinámica requiere administración de llave 'ieee802x'."
 
 #: ../src/devices/wifi/nm-wifi-ap-utils.c:312
 msgid "WPA-PSK authentication is incompatible with 802.1x"
-msgstr ""
+msgstr "Autenticación WPA-PSK  es incompatible con  802.1x."
 
 #: ../src/devices/wifi/nm-wifi-ap-utils.c:322
-#, fuzzy
 msgid "WPA-PSK requires 'open' authentication"
-msgstr "Autenticación de Cableado 802.1X"
+msgstr "WPA-PSK requiere autenticación 'open'."
 
 #: ../src/devices/wifi/nm-wifi-ap-utils.c:334
 msgid "WPA Ad-Hoc authentication requires an Ad-Hoc mode AP"
-msgstr ""
+msgstr "Autenticación WPA-Ad-Hoc requiere un Ad-Hoc de modo AP."
 
 #: ../src/devices/wifi/nm-wifi-ap-utils.c:347
 msgid "WPA Ad-Hoc authentication requires 'wpa' protocol"
-msgstr ""
+msgstr "Autenticación WPA Ad-Hoc requiere protocolo 'wpa'."
 
 #: ../src/devices/wifi/nm-wifi-ap-utils.c:359
-#, fuzzy
 msgid "WPA Ad-Hoc authentication requires 'none' pairwise cipher"
-msgstr "Autenticación requerida por red inalámbrica"
+msgstr "Autenticación WPA Ad-Hoc requiere cifra pairwise 'none'."
 
 #: ../src/devices/wifi/nm-wifi-ap-utils.c:371
 msgid "WPA Ad-Hoc requires 'tkip' group cipher"
-msgstr ""
+msgstr "Autenticación WPA Ad-Hoc requiere cifra de grupo 'tkip'."
 
 #: ../src/devices/wifi/nm-wifi-ap-utils.c:385
 msgid "Access point does not support PSK but setting requires it"
-msgstr ""
+msgstr "Punto de acceso no soporta PSK pero el parámetro lo requiere."
 
 #: ../src/devices/wifi/nm-wifi-ap-utils.c:415
 msgid "WPA-EAP authentication requires an 802.1x setting"
-msgstr ""
+msgstr "Autenticación WPA-EAP requiere el parámetro 802.1x."
 
 #: ../src/devices/wifi/nm-wifi-ap-utils.c:425
-#, fuzzy
 msgid "WPA-EAP requires 'open' authentication"
-msgstr "Autenticación de Cableado 802.1X"
+msgstr "WPA-EAP requiere autenticación 'open'."
 
 #: ../src/devices/wifi/nm-wifi-ap-utils.c:436
 msgid "802.1x setting requires 'wpa-eap' key management"
-msgstr ""
+msgstr "El parámetro 802.1x requiere administración de llave 'wpa-eap'."
 
 #: ../src/devices/wifi/nm-wifi-ap-utils.c:449
 msgid "Access point does not support 802.1x but setting requires it"
-msgstr ""
+msgstr "Punto de acceso no soporta 802.1x  pero el parámetro lo requiere."
 
 #: ../src/devices/wifi/nm-wifi-ap-utils.c:477
 msgid ""
 "Access point mode is Ad-Hoc but setting requires Infrastructure security"
 msgstr ""
+"El modo de punto de acceso es Ad-Hoc, pero el parámetro requiere seguridad "
+"de Infrastructure."
 
 #: ../src/devices/wifi/nm-wifi-ap-utils.c:487
 msgid "Ad-Hoc mode is incompatible with 802.1x security"
-msgstr ""
+msgstr "El modo Ad-Hoc es incompatible con seguridad 802.1x."
 
 #: ../src/devices/wifi/nm-wifi-ap-utils.c:496
 msgid "Ad-Hoc mode is incompatible with LEAP security"
-msgstr ""
+msgstr "El modo Ad-Hoc es incompatible con seguridad LEAP."
 
 #: ../src/devices/wifi/nm-wifi-ap-utils.c:506
 msgid "Ad-Hoc mode requires 'open' authentication"
-msgstr ""
+msgstr "El modo Ad-Hoc requiere autenticación 'open'."
 
 #: ../src/devices/wifi/nm-wifi-ap-utils.c:516
 msgid ""
 "Access point mode is Infrastructure but setting requires Ad-Hoc security"
 msgstr ""
+"El modo de punto de acceso es Infrastructure, pero  el parámetro requiere "
+"seguridad Ad-Hoc."
 
 #: ../src/devices/wifi/nm-wifi-ap-utils.c:558
 #: ../src/devices/wifi/nm-wifi-ap-utils.c:588
 #, c-format
 msgid "connection does not match access point"
-msgstr ""
+msgstr "La conexión no coincide con el punto de acceso."
 
 #: ../src/devices/wifi/nm-wifi-ap-utils.c:612
 msgid "Access point is unencrypted but setting specifies security"
 msgstr ""
+"El punto de acceso no está cifrado pero el parámetro especifica seguridad."
 
 #: ../src/devices/wifi/nm-wifi-ap-utils.c:701
 msgid ""
 "WPA authentication is incompatible with non-EAP (original) LEAP or Dynamic "
 "WEP"
 msgstr ""
+"Autenticación WPA  es incompatible con non-EAP (original) LEAP o Dynamic WEP."
+""
 
 #: ../src/devices/wifi/nm-wifi-ap-utils.c:711
 msgid "WPA authentication is incompatible with Shared Key authentication"
-msgstr ""
+msgstr "Autenticación WPA  es incompatible con  autenticación de Shared Key."
 
 #: ../src/devices/wifi/nm-wifi-ap-utils.c:758
-#, fuzzy
 msgid "Failed to determine AP security information"
-msgstr "Falló al establecer la clave simétrica para el descifrado."
+msgstr "No se pudo  establecer la información de seguridad AP."
 
-#: ../src/devices/wwan/nm-modem-broadband.c:673
-#, fuzzy
+#: ../src/devices/wwan/nm-modem-broadband.c:641
 msgid "GSM mobile broadband connection requires a 'gsm' setting"
-msgstr "Conexión de banda ancha móvil %d"
+msgstr "La conexión de banda ancha móvil GSM requiere un parámetro 'gsm'."
 
-#: ../src/nm-config.c:500
+#: ../src/nm-config.c:465
 msgid "Config file location"
 msgstr "Sitio del archivo de configuración"
 
-#: ../src/nm-config.c:501
+#: ../src/nm-config.c:466
 msgid "Config directory location"
 msgstr "Sitio del directorio de configuración"
 
-#: ../src/nm-config.c:502
-#, fuzzy
+#: ../src/nm-config.c:467
 msgid "System config directory location"
-msgstr "Sitio del directorio de configuración"
+msgstr "Ubicación del directorio de configuración."
 
-#: ../src/nm-config.c:503
-#, fuzzy
+#: ../src/nm-config.c:468
 msgid "Internal config file location"
-msgstr "Sitio del archivo de configuración"
-
-#: ../src/nm-config.c:504
-msgid "State file location"
-msgstr "Estado del sitio de archivos"
+msgstr "Sitio del archivo de configuración interno"
 
-#: ../src/nm-config.c:505
+#: ../src/nm-config.c:469
 msgid "State file for no-auto-default devices"
-msgstr ""
+msgstr "Archivo de estado para los dispositivos no-auto-default."
 
-#: ../src/nm-config.c:506
+#: ../src/nm-config.c:470
 msgid "List of plugins separated by ','"
 msgstr "Lista de conectores separados por ','"
 
-#: ../src/nm-config.c:507
-#, fuzzy
+#: ../src/nm-config.c:471
 msgid "Quit after initial configuration"
-msgstr "Configuración nmcli actual:\n"
+msgstr "Salir después de la configuración inicial"
 
-#: ../src/nm-config.c:508 ../src/nm-iface-helper.c:300
+#: ../src/nm-config.c:472 ../src/nm-iface-helper.c:300
 msgid "Don't become a daemon, and log to stderr"
 msgstr "No se convierta en demonio y registre a stderr"
 
 #. These three are hidden for now, and should eventually just go away.
-#: ../src/nm-config.c:511
+#: ../src/nm-config.c:475
 msgid "An http(s) address for checking internet connectivity"
 msgstr "Una dirección http(s) a para verificación de conectividad de Internet"
 
-#: ../src/nm-config.c:512
+#: ../src/nm-config.c:476
 msgid "The interval between connectivity checks (in seconds)"
 msgstr "El intervalo entre chequeos de conectividad (en segundos)"
 
-#: ../src/nm-config.c:513
+#: ../src/nm-config.c:477
 msgid "The expected start of the response"
 msgstr "El inicio esperado de respuesta"
 
 #. Interface/IP config
 #: ../src/nm-iface-helper.c:281
-#, fuzzy
 msgid "The interface to manage"
-msgstr "Interfaz principal [none]: "
+msgstr "Interfaz a administrar"
 
 #: ../src/nm-iface-helper.c:281
 msgid "eth0"
-msgstr ""
+msgstr "eth0"
 
 #: ../src/nm-iface-helper.c:282
-#, fuzzy
 msgid "Connection UUID"
-msgstr "Conexión"
+msgstr "Conexión UUID"
 
 #: ../src/nm-iface-helper.c:282
 msgid "661e8cd0-b618-46b8-9dc9-31a52baaa16b"
-msgstr ""
+msgstr "661e8cd0-b618-46b8-9dc9-31a52baaa16b"
 
 #: ../src/nm-iface-helper.c:283
 msgid "Whether to manage IPv6 SLAAC"
-msgstr ""
+msgstr "Indica si se debe administrar o no IPv6 SLAAC"
 
 #: ../src/nm-iface-helper.c:284
 msgid "Whether SLAAC must be successful"
-msgstr ""
+msgstr "Indica si SLAAC debe estar correcto"
 
 #: ../src/nm-iface-helper.c:285
 msgid "Use an IPv6 temporary privacy address"
-msgstr ""
+msgstr "Usar una dirección de privacidad temporal IPv6."
 
 #: ../src/nm-iface-helper.c:286
-#, fuzzy
 msgid "Current DHCPv4 address"
-msgstr "Dirección MAC clonada"
+msgstr "Dirección DHCPv4 actual"
 
 #: ../src/nm-iface-helper.c:287
 msgid "Whether DHCPv4 must be successful"
-msgstr ""
+msgstr "Indica si DHCPv4 debe estar correcto"
 
 #: ../src/nm-iface-helper.c:288
-#, fuzzy
 msgid "Hex-encoded DHCPv4 client ID"
-msgstr "«%s» cliente DHCP sin soporte "
+msgstr "ID de cliente DHCPv4 codificado en hexadecimal."
 
 #: ../src/nm-iface-helper.c:289
 msgid "Hostname to send to DHCP server"
-msgstr ""
+msgstr "Nombre de host para enviar al servidor DHCP."
 
 #: ../src/nm-iface-helper.c:289
 msgid "barbar"
-msgstr ""
+msgstr "barbar"
 
 #: ../src/nm-iface-helper.c:290
 msgid "FQDN to send to DHCP server"
-msgstr ""
+msgstr "FQDN para enviar al servidor DHCP"
 
 #: ../src/nm-iface-helper.c:290
 msgid "host.domain.org"
-msgstr ""
+msgstr "host.domain.org"
 
 #: ../src/nm-iface-helper.c:291
-#, fuzzy
 msgid "Route priority for IPv4"
-msgstr "no hay prioridad para retirar"
+msgstr "Ruta de prioridad para IPv4."
 
 #: ../src/nm-iface-helper.c:291
 msgid "0"
-msgstr ""
+msgstr "0"
 
 #: ../src/nm-iface-helper.c:292
-#, fuzzy
 msgid "Route priority for IPv6"
-msgstr "no hay prioridad para retirar"
+msgstr "Ruta de prioridad para IPv6."
 
 #: ../src/nm-iface-helper.c:292
 msgid "1024"
-msgstr ""
+msgstr "1024"
 
 #: ../src/nm-iface-helper.c:293
 msgid "Hex-encoded Interface Identifier"
-msgstr ""
+msgstr "Identificador de interfaz codificado en hexadecimal."
 
 #: ../src/nm-iface-helper.c:294
 msgid "IPv6 SLAAC address generation mode"
-msgstr ""
+msgstr "Modo de generación de dirección IPv6 SLAAC."
 
 #: ../src/nm-iface-helper.c:295
 msgid ""
 "The logging backend configuration value. See logging.backend in "
 "NetworkManager.conf"
 msgstr ""
+"El valor de registro de configuración de fondo . Vea logging.backend en "
+"NetworkMananager.conf"
 
 #: ../src/nm-iface-helper.c:315
 msgid ""
 "nm-iface-helper is a small, standalone process that manages a single network "
 "interface."
 msgstr ""
+"nm-iface-helper es un proceso autónomo que administra una interfaz de red "
+"individual.."
 
 #: ../src/nm-iface-helper.c:374
 #, c-format
 msgid "An interface name and UUID are required\n"
-msgstr ""
+msgstr "Se requiere un nombre de interfaz y un UUID.\n"
+"\n"
 
 #: ../src/nm-iface-helper.c:380
 #, c-format
 msgid "Failed to find interface index for %s (%s)\n"
-msgstr ""
+msgstr "No se pudo obtener índice de interfaz para %s (%s)\n"
+"\n"
 
 #: ../src/nm-iface-helper.c:442
 #, c-format
 msgid "(%s): Invalid IID %s\n"
-msgstr ""
+msgstr "(%s): IID inváĺido %s\n"
 
-#: ../src/nm-logging.c:223
+#: ../src/nm-logging.c:216
 #, c-format
 msgid "Unknown log level '%s'"
 msgstr "Nivel de registro desconocido «%s»"
 
-#: ../src/nm-logging.c:318
+#: ../src/nm-logging.c:309
 #, c-format
 msgid "Unknown log domain '%s'"
 msgstr "Dominio de registro desconocido «%s»"
 
-#: ../src/settings/plugins/ifcfg-rh/reader.c:106
+#: ../src/nm-manager.c:3635
+msgid "VPN connection"
+msgstr "Conexión VPN"
+
+#: ../src/nm-sleep-monitor-systemd.c:131
+msgid "NetworkManager needs to turn off networks"
+msgstr "NetworkManager necesita apagar redes"
+
+#: ../src/settings/plugins/ifcfg-rh/reader.c:108
 msgid "System"
 msgstr "Sistema"
diff --git a/po/fr.po b/po/fr.po
index 130bea6e4f..5cd5651124 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -1,7 +1,7 @@
 # French translation of NetworkManager.
 # Copyright (C) 2004-2011 The GNOME Foundation.
 # This file is distributed under the same license as the NetworkManager package.
-#
+# 
 # Raphaël Tournoy <lexpas@free.fr>, 2004.
 # Stéphane Raimbault <stephane.raimbault@gmail.com>, 2006-2008.
 # Jonathan Ernst <jonathan@ernstfamily.ch>, 2007.
@@ -9,21 +9,20 @@
 # Sam Friedmann <sam.friedmann@redhat.com>, 2010.
 # Claude Paroz <claude@2xlibre.net>, 2011
 # Sam Friedmann <sfriedma@redhat.com>, 2010, 2014.
-# Lubomir Rintel <lkundrak@v3.sk>, 2016. #zanata
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-06-22 10:02+0200\n"
-"PO-Revision-Date: 2014-02-04 01:19-0500\n"
-"Last-Translator: Sam Friedmann <sfriedma@redhat.com>\n"
-"Language-Team: French <trans-fr@lists.fedoraproject.org>\n"
-"Language: fr\n"
+"POT-Creation-Date: 2016-04-29 14:24+0530\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"PO-Revision-Date: 2016-07-05 08:40+0000\n"
+"Last-Translator: Copied by Zanata <copied-by-zanata@zanata.org>\n"
+"Language-Team: French <trans-fr@lists.fedoraproject.org>\n"
+"Language: fr\n"
 "Plural-Forms: nplurals=2; plural=n>1;\n"
-"X-Generator: Zanata 3.8.4\n"
+"X-Generator: Zanata 3.9.3\n"
 
 #: ../clients/cli/agent.c:39
 #, c-format
@@ -33,9 +32,9 @@ msgid ""
 "COMMAND := { secret | polkit | all }\n"
 "\n"
 msgstr ""
-"Syntaxe : nmcli agent { COMMANDE | help }\n"
+"Syntaxe : nmcli agent { COMMAND | help }\n"
 "\n"
-"COMMANDE := { secret | polkit | all }\n"
+"COMMAND := { secret | polkit | all }\n"
 "\n"
 
 #: ../clients/cli/agent.c:47
@@ -58,6 +57,7 @@ msgstr ""
 "permet à nmcli de tourner en tâche de fond et de demander le cas échéant le "
 "mot de passe\n"
 "à l'utilisateur.\n"
+"\n"
 
 #: ../clients/cli/agent.c:57
 #, c-format
@@ -75,6 +75,7 @@ msgstr ""
 "Enregistre nmcli comme une action polkit pour la session utilisateur.\n"
 "Quand le démon polkit demande une autorisation, nmcli la relaiera à\n"
 "l'utilisateur et donnera la réponse à polkit.\n"
+"\n"
 
 #: ../clients/cli/agent.c:67
 #, c-format
@@ -109,23 +110,23 @@ msgstr "Erreur : l'initialisation de l'agent polkit a échoué : %s"
 #: ../clients/cli/agent.c:174
 #, c-format
 msgid "nmcli successfully registered as a polkit agent.\n"
-msgstr "nmcli est enregistré avec succès comme agent polkit.\n"
+msgstr "nmcli est enregistré comme agent polkit.\n"
 
-#: ../clients/cli/agent.c:206 ../clients/cli/connections.c:8703
-#: ../clients/cli/devices.c:3727 ../clients/cli/general.c:344
-#: ../clients/cli/general.c:473
+#: ../clients/cli/agent.c:206 ../clients/cli/connections.c:11050
+#: ../clients/cli/devices.c:3669 ../clients/cli/general.c:343
+#: ../clients/cli/general.c:484
 #, c-format
 msgid "Error: NetworkManager is not running."
 msgstr "Erreur : NetworkManager n'est pas lancé."
 
-#: ../clients/cli/agent.c:239
+#: ../clients/cli/agent.c:242
 #, c-format
 msgid "Error: 'agent' command '%s' is not valid."
 msgstr "Erreur : la commande « agent %s » est invalide."
 
 #: ../clients/cli/common.c:38 ../clients/cli/common.c:51
 #: ../clients/cli/common.c:59 ../clients/cli/common.c:71
-#: ../clients/cli/connections.c:237 ../clients/cli/connections.c:259
+#: ../clients/cli/connections.c:192 ../clients/cli/connections.c:214
 msgid "GROUP"
 msgstr "GROUPE"
 
@@ -137,7 +138,7 @@ msgstr "ADRESSE"
 #. 1
 #. 2
 #: ../clients/cli/common.c:40 ../clients/cli/common.c:61
-#: ../clients/cli/connections.c:262
+#: ../clients/cli/connections.c:217
 msgid "GATEWAY"
 msgstr "PASSERELLE"
 
@@ -208,7 +209,7 @@ msgstr "non-géré"
 msgid "unavailable"
 msgstr "indisponible"
 
-#: ../clients/cli/common.c:498 ../clients/cli/general.c:246
+#: ../clients/cli/common.c:498 ../clients/cli/general.c:245
 msgid "disconnected"
 msgstr "déconnecté"
 
@@ -236,11 +237,11 @@ msgstr "connexion (contrôle de la connectivité IP)"
 msgid "connecting (starting secondary connections)"
 msgstr "connexion (démarrage des connexions secondaires)"
 
-#: ../clients/cli/common.c:512 ../clients/cli/general.c:242
+#: ../clients/cli/common.c:512 ../clients/cli/general.c:241
 msgid "connected"
 msgstr "connecté"
 
-#: ../clients/cli/common.c:514 ../clients/cli/connections.c:690
+#: ../clients/cli/common.c:514 ../clients/cli/connections.c:648
 msgid "deactivating"
 msgstr "désactivation"
 
@@ -249,70 +250,69 @@ msgid "connection failed"
 msgstr "échec de la connexion"
 
 #: ../clients/cli/common.c:518 ../clients/cli/common.c:535
-#: ../clients/cli/connections.c:695 ../clients/cli/connections.c:718
-#: ../clients/cli/connections.c:1995 ../clients/cli/devices.c:1104
-#: ../clients/cli/devices.c:1145 ../clients/cli/devices.c:1147
-#: ../clients/cli/general.c:249 ../clients/cli/general.c:287
-#: ../clients/cli/general.c:422 ../clients/cli/general.c:437
-#: ../clients/cli/settings.c:845 ../clients/cli/settings.c:931
-#: ../clients/cli/settings.c:1315 ../clients/cli/settings.c:1954
-#: ../clients/cli/settings.c:3317
+#: ../clients/cli/connections.c:653 ../clients/cli/connections.c:676
+#: ../clients/cli/connections.c:1949 ../clients/cli/devices.c:1024
+#: ../clients/cli/devices.c:1065 ../clients/cli/devices.c:1067
+#: ../clients/cli/general.c:248 ../clients/cli/general.c:286
+#: ../clients/cli/general.c:432 ../clients/cli/general.c:448
+#: ../clients/cli/settings.c:839 ../clients/cli/settings.c:925
+#: ../clients/cli/settings.c:1265 ../clients/cli/settings.c:1901
+#: ../clients/cli/settings.c:3205 ../clients/cli/utils.c:1400
 #, c-format
 msgid "unknown"
 msgstr "inconnu"
 
 #. "CAPABILITIES"
-#: ../clients/cli/common.c:527 ../clients/cli/connections.c:975
-#: ../clients/cli/connections.c:977 ../clients/cli/connections.c:979
-#: ../clients/cli/connections.c:1013 ../clients/cli/connections.c:1082
-#: ../clients/cli/connections.c:1083 ../clients/cli/connections.c:1085
-#: ../clients/cli/connections.c:3291 ../clients/cli/connections.c:4414
-#: ../clients/cli/connections.c:6229 ../clients/cli/connections.c:6230
-#: ../clients/cli/devices.c:782 ../clients/cli/devices.c:1069
-#: ../clients/cli/devices.c:1070 ../clients/cli/devices.c:1071
-#: ../clients/cli/devices.c:1072 ../clients/cli/devices.c:1073
-#: ../clients/cli/devices.c:1108 ../clients/cli/devices.c:1110
-#: ../clients/cli/devices.c:1138 ../clients/cli/devices.c:1139
-#: ../clients/cli/devices.c:1140 ../clients/cli/devices.c:1141
-#: ../clients/cli/devices.c:1142 ../clients/cli/devices.c:1143
-#: ../clients/cli/devices.c:1144 ../clients/cli/devices.c:1146
-#: ../clients/cli/devices.c:1148 ../clients/cli/general.c:431
-#: ../clients/cli/settings.c:3312
+#: ../clients/cli/common.c:527 ../clients/cli/connections.c:933
+#: ../clients/cli/connections.c:935 ../clients/cli/connections.c:937
+#: ../clients/cli/connections.c:971 ../clients/cli/connections.c:1040
+#: ../clients/cli/connections.c:1041 ../clients/cli/connections.c:1043
+#: ../clients/cli/connections.c:3450 ../clients/cli/connections.c:8563
+#: ../clients/cli/connections.c:8564 ../clients/cli/devices.c:772
+#: ../clients/cli/devices.c:989 ../clients/cli/devices.c:990
+#: ../clients/cli/devices.c:991 ../clients/cli/devices.c:992
+#: ../clients/cli/devices.c:993 ../clients/cli/devices.c:1028
+#: ../clients/cli/devices.c:1030 ../clients/cli/devices.c:1058
+#: ../clients/cli/devices.c:1059 ../clients/cli/devices.c:1060
+#: ../clients/cli/devices.c:1061 ../clients/cli/devices.c:1062
+#: ../clients/cli/devices.c:1063 ../clients/cli/devices.c:1064
+#: ../clients/cli/devices.c:1066 ../clients/cli/devices.c:1068
+#: ../clients/cli/general.c:442 ../clients/cli/settings.c:3200
 msgid "yes"
 msgstr "oui"
 
-#: ../clients/cli/common.c:529 ../clients/cli/connections.c:975
-#: ../clients/cli/connections.c:977 ../clients/cli/connections.c:979
-#: ../clients/cli/connections.c:1082 ../clients/cli/connections.c:1083
-#: ../clients/cli/connections.c:1085 ../clients/cli/connections.c:3292
-#: ../clients/cli/connections.c:4413 ../clients/cli/connections.c:6229
-#: ../clients/cli/connections.c:6230 ../clients/cli/devices.c:782
-#: ../clients/cli/devices.c:1069 ../clients/cli/devices.c:1070
-#: ../clients/cli/devices.c:1071 ../clients/cli/devices.c:1072
-#: ../clients/cli/devices.c:1073 ../clients/cli/devices.c:1108
-#: ../clients/cli/devices.c:1110 ../clients/cli/devices.c:1138
-#: ../clients/cli/devices.c:1139 ../clients/cli/devices.c:1140
-#: ../clients/cli/devices.c:1141 ../clients/cli/devices.c:1142
-#: ../clients/cli/devices.c:1143 ../clients/cli/devices.c:1144
-#: ../clients/cli/devices.c:1146 ../clients/cli/devices.c:1148
-#: ../clients/cli/general.c:433 ../clients/cli/settings.c:3314
+#: ../clients/cli/common.c:529 ../clients/cli/connections.c:933
+#: ../clients/cli/connections.c:935 ../clients/cli/connections.c:937
+#: ../clients/cli/connections.c:1040 ../clients/cli/connections.c:1041
+#: ../clients/cli/connections.c:1043 ../clients/cli/connections.c:3451
+#: ../clients/cli/connections.c:8563 ../clients/cli/connections.c:8564
+#: ../clients/cli/devices.c:772 ../clients/cli/devices.c:989
+#: ../clients/cli/devices.c:990 ../clients/cli/devices.c:991
+#: ../clients/cli/devices.c:992 ../clients/cli/devices.c:993
+#: ../clients/cli/devices.c:1028 ../clients/cli/devices.c:1030
+#: ../clients/cli/devices.c:1058 ../clients/cli/devices.c:1059
+#: ../clients/cli/devices.c:1060 ../clients/cli/devices.c:1061
+#: ../clients/cli/devices.c:1062 ../clients/cli/devices.c:1063
+#: ../clients/cli/devices.c:1064 ../clients/cli/devices.c:1066
+#: ../clients/cli/devices.c:1068 ../clients/cli/general.c:444
+#: ../clients/cli/settings.c:3202
 msgid "no"
 msgstr "non"
 
 #: ../clients/cli/common.c:531
 msgid "yes (guessed)"
-msgstr "oui (par divination)"
+msgstr "oui (deviné)"
 
 #: ../clients/cli/common.c:533
 msgid "no (guessed)"
-msgstr "non (par divination)"
+msgstr "non (deviné)"
 
 #: ../clients/cli/common.c:544
 msgid "No reason given"
 msgstr "Aucun raison donnée"
 
 #. We should not really come here
-#: ../clients/cli/common.c:547 ../clients/cli/connections.c:3140
+#: ../clients/cli/common.c:547 ../clients/cli/connections.c:2976
 #, c-format
 msgid "Unknown error"
 msgstr "Erreur inconnue"
@@ -617,8 +617,8 @@ msgid "The device parent's management changed"
 msgstr "Le gestionnaire du périphérique parent a changé"
 
 #. TRANSLATORS: Unknown reason for a device state change (NMDeviceStateReason)
-#: ../clients/cli/common.c:734 ../libnm-glib/nm-device.c:1898
-#: ../libnm/nm-device.c:1849
+#: ../clients/cli/common.c:734 ../libnm-glib/nm-device.c:1888
+#: ../libnm/nm-device.c:1839
 msgid "Unknown"
 msgstr "Inconnu"
 
@@ -664,116 +664,69 @@ msgstr ""
 "l'option « --ask ».\n"
 
 #. define some prompts for connection editor
-#: ../clients/cli/connections.c:61
+#: ../clients/cli/connections.c:41
 msgid "Setting name? "
 msgstr "Nom du paramètre ?"
 
-#: ../clients/cli/connections.c:62
+#: ../clients/cli/connections.c:42
 msgid "Property name? "
 msgstr "Nom de la propriété ?"
 
-#: ../clients/cli/connections.c:63
+#: ../clients/cli/connections.c:43
 msgid "Enter connection type: "
 msgstr "Saisissez le type de connexion : "
 
 #. define some other prompts
-#: ../clients/cli/connections.c:66
-#, fuzzy
-msgid "Connection type"
+#: ../clients/cli/connections.c:46
+msgid "Connection type: "
 msgstr "Type de connexion :"
 
-#: ../clients/cli/connections.c:67
-#, fuzzy
-msgid "VPN type"
+#: ../clients/cli/connections.c:47
+msgid "VPN type: "
 msgstr "Type de VPN :"
 
-#: ../clients/cli/connections.c:68
-#, fuzzy
-msgid "Master"
+#: ../clients/cli/connections.c:48
+msgid "Master: "
 msgstr "Maître :"
 
-#: ../clients/cli/connections.c:70 ../clients/tui/nmt-page-infiniband.c:88
-msgid "Transport mode"
-msgstr "Mode de transport"
-
-#: ../clients/cli/connections.c:75
-#, fuzzy
-msgid "Bluetooth type"
-msgstr "Bluetooth type %s"
-
-#: ../clients/cli/connections.c:81
-#, fuzzy
-msgid "Bonding mode"
-msgstr "Mode de supervision de bonding %s"
-
-#: ../clients/cli/connections.c:83 ../clients/cli/connections.c:4014
-#, fuzzy
-msgid "Bonding monitoring mode"
-msgstr "Mode de supervision de bonding %s"
-
-#: ../clients/cli/connections.c:88
-#, fuzzy
-msgid "Protocol"
-msgstr "Protocole %s"
-
-#: ../clients/cli/connections.c:91
-msgid "Wi-Fi mode"
-msgstr "Mode Wi-Fi"
-
-#: ../clients/cli/connections.c:97
-msgid "ADSL encapsulation"
-msgstr "Encapsulation ADSL"
-
-#: ../clients/cli/connections.c:100
-#, fuzzy
-msgid "Tun mode"
-msgstr "Mode tunnel :"
-
-#: ../clients/cli/connections.c:105
-#, fuzzy
-msgid "IP Tunnel mode"
-msgstr "Mode tunnel :"
-
-#: ../clients/cli/connections.c:107
-#, fuzzy
-msgid "MACVLAN mode"
-msgstr "Mode MACVLAN : "
-
-#: ../clients/cli/connections.c:109
-#, fuzzy
-msgid "Connection (name, UUID, or path)"
+#: ../clients/cli/connections.c:49
+msgid "Connection (name, UUID, or path): "
 msgstr "Connexion (nom, UUID, ou chemin d'accès) : "
 
-#: ../clients/cli/connections.c:110
-#, fuzzy
-msgid "VPN connection (name, UUID, or path)"
+#: ../clients/cli/connections.c:50
+msgid "VPN connection (name, UUID, or path): "
 msgstr "Connexion VPN (nom, UUID, ou chemin) : "
 
-#: ../clients/cli/connections.c:111
-#, fuzzy
-msgid "Connection(s) (name, UUID, or path)"
+#: ../clients/cli/connections.c:51
+msgid "Connection(s) (name, UUID, or path): "
 msgstr "Connexion(s) (nom, UUID, ou path) : "
 
-#: ../clients/cli/connections.c:112
-#, fuzzy
-msgid "Connection(s) (name, UUID, path or apath)"
+#: ../clients/cli/connections.c:52
+msgid "Connection(s) (name, UUID, path or apath): "
 msgstr "Connexon(s) (nom, UUID, path ou apath) : "
 
+#: ../clients/cli/connections.c:53
+msgid "Tunnel mode: "
+msgstr "Mode tunnel :"
+
+#: ../clients/cli/connections.c:54
+msgid "MACVLAN mode: "
+msgstr "Mode MACVLAN : "
+
 #. 0
-#: ../clients/cli/connections.c:118 ../clients/cli/connections.c:238
+#: ../clients/cli/connections.c:73 ../clients/cli/connections.c:193
 #: ../clients/cli/devices.c:55 ../clients/cli/devices.c:89
 #: ../clients/cli/devices.c:99 ../clients/cli/devices.c:110
 #: ../clients/cli/devices.c:120 ../clients/cli/devices.c:137
 #: ../clients/cli/devices.c:150 ../clients/cli/devices.c:176
 #: ../clients/cli/devices.c:191 ../clients/cli/devices.c:200
-#: ../clients/cli/devices.c:210 ../clients/cli/devices.c:220
-#: ../clients/cli/devices.c:261
+#: ../clients/cli/devices.c:210 ../clients/cli/devices.c:251
 msgid "NAME"
 msgstr "NOM"
 
 #. 0
 #. 1
-#: ../clients/cli/connections.c:119 ../clients/cli/connections.c:239
+#: ../clients/cli/connections.c:74 ../clients/cli/connections.c:194
 msgid "UUID"
 msgstr "UUID"
 
@@ -781,35 +734,35 @@ msgstr "UUID"
 #. 0
 #. 1
 #. 2
-#: ../clients/cli/connections.c:120 ../clients/cli/connections.c:260
+#: ../clients/cli/connections.c:75 ../clients/cli/connections.c:215
 #: ../clients/cli/devices.c:41 ../clients/cli/devices.c:57
 #: ../clients/cli/devices.c:179
 msgid "TYPE"
 msgstr "TYPE"
 
 #. 2
-#: ../clients/cli/connections.c:121
+#: ../clients/cli/connections.c:76
 msgid "TIMESTAMP"
 msgstr "TIMESTAMP"
 
 #. 3
-#: ../clients/cli/connections.c:122
+#: ../clients/cli/connections.c:77
 msgid "TIMESTAMP-REAL"
 msgstr "TIMESTAMP-REAL"
 
 #. 4
 #. 16
-#: ../clients/cli/connections.c:123 ../clients/cli/devices.c:72
+#: ../clients/cli/connections.c:78 ../clients/cli/devices.c:72
 msgid "AUTOCONNECT"
 msgstr "AUTOCONNECT"
 
 #. 5
-#: ../clients/cli/connections.c:124
+#: ../clients/cli/connections.c:79
 msgid "AUTOCONNECT-PRIORITY"
 msgstr "AUTOCONNECT-PRIORITY"
 
 #. 6
-#: ../clients/cli/connections.c:125
+#: ../clients/cli/connections.c:80
 msgid "READONLY"
 msgstr "LECT. SEULE"
 
@@ -818,7 +771,7 @@ msgstr "LECT. SEULE"
 #. 2
 #. 15
 #. 5
-#: ../clients/cli/connections.c:126 ../clients/cli/connections.c:246
+#: ../clients/cli/connections.c:81 ../clients/cli/connections.c:201
 #: ../clients/cli/devices.c:43 ../clients/cli/devices.c:166
 #: ../clients/cli/devices.c:182
 msgid "DBUS-PATH"
@@ -827,7 +780,7 @@ msgstr "CHEMIN DBUS"
 #. 8
 #. 13
 #. 4
-#: ../clients/cli/connections.c:127 ../clients/cli/devices.c:164
+#: ../clients/cli/connections.c:82 ../clients/cli/devices.c:164
 #: ../clients/cli/devices.c:181
 msgid "ACTIVE"
 msgstr "ACTIF"
@@ -837,9 +790,9 @@ msgstr "ACTIF"
 #. 12
 #. 3
 #. 0
-#: ../clients/cli/connections.c:128 ../clients/cli/devices.c:40
+#: ../clients/cli/connections.c:83 ../clients/cli/devices.c:40
 #: ../clients/cli/devices.c:56 ../clients/cli/devices.c:163
-#: ../clients/cli/devices.c:180 ../clients/cli/devices.c:262
+#: ../clients/cli/devices.c:180 ../clients/cli/devices.c:252
 msgid "DEVICE"
 msgstr "PÉRIPHÉRIQUE"
 
@@ -848,41 +801,42 @@ msgstr "PÉRIPHÉRIQUE"
 #. 1
 #. 10
 #. 1
-#: ../clients/cli/connections.c:129 ../clients/cli/connections.c:241
+#: ../clients/cli/connections.c:84 ../clients/cli/connections.c:196
 #: ../clients/cli/devices.c:42 ../clients/cli/devices.c:66
-#: ../clients/cli/general.c:37
+#: ../clients/cli/general.c:36
 msgid "STATE"
 msgstr "ÉTAT"
 
 #. 11
-#: ../clients/cli/connections.c:130
+#: ../clients/cli/connections.c:85
 msgid "ACTIVE-PATH"
 msgstr "ACTIVE-PATH"
 
 #. 2
-#: ../clients/cli/connections.c:240
+#: ../clients/cli/connections.c:195
 msgid "DEVICES"
 msgstr "PÉRIPHÉRIQUES"
 
 #. 4
-#: ../clients/cli/connections.c:242
+#: ../clients/cli/connections.c:197
 msgid "DEFAULT"
 msgstr "PAR DÉFAUT"
 
 #. 5
-#: ../clients/cli/connections.c:243
+#: ../clients/cli/connections.c:198
 msgid "DEFAULT6"
 msgstr "DEFAULT6"
 
 #. 6
-#: ../clients/cli/connections.c:244
+#: ../clients/cli/connections.c:199
 msgid "SPEC-OBJECT"
 msgstr "SPEC-OBJECT"
 
 #. 7
 #. 4
-#: ../clients/cli/connections.c:245 ../clients/cli/connections.c:283
-#: ../clients/tui/nm-editor-utils.c:233
+#. Ask for optional 'vpn' arguments.
+#: ../clients/cli/connections.c:200 ../clients/cli/connections.c:238
+#: ../clients/cli/connections.c:4169 ../clients/tui/nm-editor-utils.c:233
 #: ../clients/tui/nmt-connect-connection-list.c:405
 msgid "VPN"
 msgstr "VPN"
@@ -890,70 +844,70 @@ msgstr "VPN"
 #. 9
 #. 5
 #. 22
-#: ../clients/cli/connections.c:247 ../clients/cli/devices.c:46
+#: ../clients/cli/connections.c:202 ../clients/cli/devices.c:46
 #: ../clients/cli/devices.c:78
 msgid "CON-PATH"
 msgstr "CON-PATH"
 
 #. 10
-#: ../clients/cli/connections.c:248
+#: ../clients/cli/connections.c:203
 msgid "ZONE"
 msgstr "ZONE"
 
 #. 11
-#: ../clients/cli/connections.c:249
+#: ../clients/cli/connections.c:204
 msgid "MASTER-PATH"
 msgstr "CHEMIN-MAÎTRE"
 
 #. 1
-#: ../clients/cli/connections.c:261
+#: ../clients/cli/connections.c:216
 msgid "USERNAME"
 msgstr "NOM D'UTILISATEUR"
 
 #. 3
-#: ../clients/cli/connections.c:263
+#: ../clients/cli/connections.c:218
 msgid "BANNER"
 msgstr "BANNIÈRE"
 
 #. 4
-#: ../clients/cli/connections.c:264
+#: ../clients/cli/connections.c:219
 msgid "VPN-STATE"
 msgstr "ÉTAT-VPN"
 
 #. 5
-#: ../clients/cli/connections.c:265
+#: ../clients/cli/connections.c:220
 msgid "CFG"
 msgstr "CFG"
 
-#: ../clients/cli/connections.c:278 ../clients/cli/devices.c:235
+#: ../clients/cli/connections.c:233 ../clients/cli/devices.c:225
 msgid "GENERAL"
 msgstr "GÉNÉRAL"
 
 #. 0
 #. 6
-#: ../clients/cli/connections.c:279 ../clients/cli/devices.c:242
+#: ../clients/cli/connections.c:234 ../clients/cli/devices.c:232
 msgid "IP4"
 msgstr "IP4"
 
 #. 1
 #. 7
-#: ../clients/cli/connections.c:280 ../clients/cli/devices.c:243
+#: ../clients/cli/connections.c:235 ../clients/cli/devices.c:233
 msgid "DHCP4"
 msgstr "DHCP4"
 
 #. 2
 #. 8
-#: ../clients/cli/connections.c:281 ../clients/cli/devices.c:244
+#: ../clients/cli/connections.c:236 ../clients/cli/devices.c:234
 msgid "IP6"
 msgstr "IP6"
 
 #. 3
 #. 9
-#: ../clients/cli/connections.c:282 ../clients/cli/devices.c:245
+#: ../clients/cli/connections.c:237 ../clients/cli/devices.c:235
 msgid "DHCP6"
 msgstr "DHCP6"
 
-#: ../clients/cli/connections.c:314
+#: ../clients/cli/connections.c:272
 #, c-format
 msgid ""
 "Usage: nmcli connection { COMMAND | help }\n"
@@ -969,8 +923,8 @@ msgid ""
 "\n"
 "  down [id | uuid | path | apath] <ID> ...\n"
 "\n"
-"  add COMMON_OPTIONS TYPE_SPECIFIC_OPTIONS SLAVE_OPTIONS IP_OPTIONS [-- "
-"([+|-]<setting>.<property> <value>)+]\n"
+"  add COMMON_OPTIONS TYPE_SPECIFIC_OPTIONS SLAVE_OPTIONS IP_OPTIONS [-- ([+|-"
+"]<setting>.<property> <value>)+]\n"
 "\n"
 "  modify [--temporary] [id | uuid | path] <ID> ([+|-]<setting>.<property> "
 "<value>)+\n"
@@ -1006,8 +960,8 @@ msgstr ""
 "\n"
 "  down [id | uuid | path | apath] <ID> ...\n"
 "\n"
-"  add COMMON_OPTIONS TYPE_SPECIFIC_OPTIONS SLAVE_OPTIONS IP_OPTIONS [-- "
-"([+|-]<setting>.<property> <value>)+]\n"
+"  add COMMON_OPTIONS TYPE_SPECIFIC_OPTIONS SLAVE_OPTIONS IP_OPTIONS [-- ([+|-"
+"]<setting>.<property> <value>)+]\n"
 "\n"
 "  modify [--temporary] [id | uuid | path] <ID> ([+|-]<setting>.<property> "
 "<value>)+\n"
@@ -1030,7 +984,7 @@ msgstr ""
 "  export [id | uuid | path] <ID> [<output file>]\n"
 "\n"
 
-#: ../clients/cli/connections.c:336
+#: ../clients/cli/connections.c:294
 #, c-format
 msgid ""
 "Usage: nmcli connection show { ARGUMENTS | help }\n"
@@ -1056,8 +1010,32 @@ msgid ""
 "account. Use global --show-secrets option to reveal associated secrets as "
 "well.\n"
 msgstr ""
-
-#: ../clients/cli/connections.c:357
+"Syntaxe : nmcli connection show { ARGUMENTS | help }\n"
+"\n"
+"ARGUMENTS := [--active] [--order <order spec>]\n"
+"\n"
+"Répertorie les profils de connexion sur-disque et en-mémoire, avec certaines "
+"actifs\n"
+"si un périphérique utilise ce profil de connexion. Sans paramètre, tous les\n"
+"les profils sont répertoriés. Lorsque l’option --active est spécifiée, seuls "
+"les profiles\n"
+"actifs sont affichés. --order permet d'ordonnancement des connexions "
+"personnalisées, (voir page de manuel).\n"
+"\n"
+"ARGUMENTS: = [--active] [id | uuid | chemin | apath] <ID>...\n"
+"\n"
+"Affiche les détails pour les connexions spécifiées. Par défaut, la "
+"configuration statique\n"
+"et les données de connexions actives sont affichées. Il est possible de "
+"filtrer la sortie\n"
+"avec un paramètre global '--fields'. Reportez-vous à la page de manuel pour "
+"plus d’informations.\n"
+"Lorsque l'option --active est spécifiée, seuls les profils actifs sont pris "
+"en\n"
+"compte. L'utilisation de l'option --show-secrets révéle également les "
+"secrets associés.\n"
+
+#: ../clients/cli/connections.c:315
 #, c-format
 msgid ""
 "Usage: nmcli connection up { ARGUMENTS | help }\n"
@@ -1081,19 +1059,19 @@ msgid ""
 "passwd-file - file with password(s) required to activate the connection\n"
 "\n"
 msgstr ""
-"Utilisation : nmcli connection up { ARGUMENTS | help }\n"
+"Syntaxe : nmcli connection up { ARGUMENTS | help }\n"
 "\n"
 "ARGUMENTS := [id | uuid | path] <ID> [ifname <ifname>] [ap <BSSID>] [nsp "
-"<name>]\n"
+"<name>] [passwd-file <file with passwords>]\n"
 "\n"
-"Activer une connexion sur un périphérique. Le profil à activer est identifié "
+"Active une connexion sur un périphérique. Le profil à activer est identifié "
 "par son\n"
 "nom, UUID ou chemin D-Bus.\n"
 "\n"
-"ARGUMENTS := ifname <ifname> [ap <BSSID>] [nsp <name>] [passwd-file <fichier "
-"contenant les mots de passe>]\n"
+"ARGUMENTS := ifname <ifname> [ap <BSSID>] [nsp <name>] [passwd-file <file "
+"with passwords>]\n"
 "\n"
-"Activer un périphérique avec une connexion. Le profil de connexion est "
+"Active un périphérique avec une connexion. Le profil de connexion est "
 "automatiquement\n"
 "sélectionné par NetworkManager.\n"
 "\n"
@@ -1104,8 +1082,8 @@ msgstr ""
 "de la connexion\n"
 "\n"
 
-#: ../clients/cli/connections.c:378
-#, fuzzy, c-format
+#: ../clients/cli/connections.c:336
+#, c-format
 msgid ""
 "Usage: nmcli connection down { ARGUMENTS | help }\n"
 "\n"
@@ -1117,24 +1095,23 @@ msgid ""
 "UUID or D-Bus path.\n"
 "\n"
 msgstr ""
-"Utilisation : nmcli connection down { ARGUMENTS | help }\n"
+"Syntaxe : nmcli connection down { ARGUMENTS | help }\n"
 "\n"
 "ARGUMENTS := [id | uuid | path | apath] <ID>\n"
 "\n"
-"Désactiver une connexion d'un périphérique (sans empêcher le périphérique "
+"Désactive une connexion d'un périphérique (sans empêcher le périphérique "
 "d'utiliser\n"
-"l'activation automatique). Le profil à désactiver est identifié par son "
-"nom,\n"
+"l'activation automatique). Le profil à désactiver est identifié par son nom,\n"
 "UUID ou chemin D-Bus.\n"
 "\n"
 
-#: ../clients/cli/connections.c:390
-#, fuzzy, c-format
+#: ../clients/cli/connections.c:348
+#, 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"
+"ARGUMENTS := COMMON_OPTIONS TYPE_SPECIFIC_OPTIONS SLAVE_OPTIONS IP_OPTIONS [-"
+"- ([+|-]<setting>.<property> <value>)+]\n"
 "\n"
 "  COMMON_OPTIONS:\n"
 "                  type <type>\n"
@@ -1221,8 +1198,8 @@ msgid ""
 "                  [path-cost <1-65535>]\n"
 "                  [hairpin yes|no]\n"
 "\n"
-"    vpn:          vpn-type vpnc|openvpn|pptp|openconnect|openswan|libreswan|"
-"ssh|l2tp|iodine|...\n"
+"    vpn:          vpn-type "
+"vpnc|openvpn|pptp|openconnect|openswan|libreswan|ssh|l2tp|iodine|...\n"
 "                  [user <username>]\n"
 "\n"
 "    olpc-mesh:    ssid <SSID>\n"
@@ -1270,15 +1247,19 @@ msgid ""
 "                  [ip6 <IPv6 address>] [gw6 <IPv6 gateway>]\n"
 "\n"
 msgstr ""
-"Utilisation : nmcli connection add { ARGUMENTS | help }\n"
+"Syntaxe : nmcli connection add { ARGUMENTS | help }\n"
 "\n"
-"ARGUMENTS := COMMON_OPTIONS TYPE_SPECIFIC_OPTIONS IP_OPTIONS\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"
@@ -1289,6 +1270,7 @@ msgstr ""
 "                  [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"
@@ -1315,7 +1297,7 @@ msgstr ""
 "    bluetooth:    [addr <bluetooth address>]\n"
 "                  [bt-type panu|dun-gsm|dun-cdma]\n"
 "\n"
-"    vlan:         dev <parent device (connection  UUID, ifname, or MAC)>\n"
+"    vlan:         dev <parent device (connection UUID, ifname, or MAC)>\n"
 "                  id <VLAN ID>\n"
 "                  [flags <VLAN flags>]\n"
 "                  [ingress <ingress priority mapping>]\n"
@@ -1332,12 +1314,13 @@ msgstr ""
 "                  [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)>\n"
+"    bond-slave:   master <master (ifname, or connection UUID or name)>\n"
 "\n"
 "    team:         [config <file>|<raw JSON data>]\n"
 "\n"
-"    team-slave:   master <master (ifname or connection UUID)>\n"
+"    team-slave:   master <master (ifname, or connection UUID or name)>\n"
 "                  [config <file>|<raw JSON data>]\n"
 "\n"
 "    bridge:       [stp yes|no]\n"
@@ -1346,25 +1329,64 @@ msgstr ""
 "                  [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)>\n"
+"    bridge-slave: master <master (ifname, or connection UUID or name)>\n"
 "                  [priority <0-63>]\n"
 "                  [path-cost <1-65535>]\n"
 "                  [hairpin yes|no]\n"
 "\n"
-"    vpn:          vpn-type vpnc|openvpn|pptp|openconnect|openswan\n"
+"    vpn:          vpn-type "
+"vpnc|openvpn|pptp|openconnect|openswan|libreswan|ssh|l2tp|iodine|...\n"
 "                  [user <username>]\n"
 "\n"
 "    olpc-mesh:    ssid <SSID>\n"
 "                  [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"
+"    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"
+"  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:502
+#: ../clients/cli/connections.c:460
 #, c-format
 msgid ""
 "Usage: nmcli connection modify { ARGUMENTS | help }\n"
@@ -1379,8 +1401,8 @@ msgid ""
 "\n"
 "Examples:\n"
 "nmcli con mod home-wifi wifi.ssid rakosnicek\n"
-"nmcli con mod em1-1 ipv4.method manual ipv4.addr \"192.168.1.2/24, "
-"10.10.1.5/8\"\n"
+"nmcli con mod em1-1 ipv4.method manual ipv4.addr \"192.168.1.2/24, 10.10.1.5/"
+"8\"\n"
 "nmcli con mod em1-1 +ipv4.dns 8.8.4.4\n"
 "nmcli con mod em1-1 -ipv4.dns 1\n"
 "nmcli con mod em1-1 -ipv6.addr \"abbe::cafe/56\"\n"
@@ -1388,8 +1410,32 @@ msgid ""
 "nmcli con mod bond0 -bond.options downdelay\n"
 "\n"
 msgstr ""
+"Syntaxe : nmcli connection modify { ARGUMENTS | help }\n"
+"\n"
+"ARGUMENTS := [id | uuid | path] <ID> ([+|-]<setting>.<property> <value>)+\n"
+"\n"
+"Modifie une ou plusieurs des propriétés du profil de connexion.\n"
+"Le profil est identifié par son nom, son UUID ou son D-Bus. Pour les "
+"propriétés aux valeurs multiples\n"
+"vous pouvez utiliser en option le préfixe « + » ou « -» préfixe devant le "
+"nom de la propriété.\n"
+"Le signe « + » permet l’ajout d’éléments au lieu d’écraser la valeur entière."
+"\n"
+"Le « - » signe permet de supprimer les éléments sélectionnés, plutôt que la "
+"valeur entière.\n"
+"\n"
+"Exemples :\n"
+"nmcli con mod home-wifi wifi.ssid rakosnicek\n"
+"nmcli con mod em1-1 ipv4.method manual ipv4.addr \"192.168.1.2/24, 10.10.1.5/"
+"8\"\n"
+"nmcli con mod em1-1 +ipv4.dns 8.8.4.4\n"
+"nmcli con mod em1-1 -ipv4.dns 1\n"
+"nmcli con mod em1-1 -ipv6.addr \"abbe::cafe/56\"\n"
+"nmcli con mod bond0 +bond.options mii=500\n"
+"nmcli con mod bond0 -bond.options downdelay\n"
+"\n"
 
-#: ../clients/cli/connections.c:525
+#: ../clients/cli/connections.c:483
 #, c-format
 msgid ""
 "Usage: nmcli connection clone { ARGUMENTS | help }\n"
@@ -1397,13 +1443,21 @@ msgid ""
 "ARGUMENTS := [--temporary] [id | uuid | path] <ID> <new name>\n"
 "\n"
 "Clone an existing connection profile. The newly created connection will be\n"
-"the exact copy of the <ID>, except the uuid property (will be generated) "
-"and\n"
+"the exact copy of the <ID>, except the uuid property (will be generated) and\n"
 "id (provided as <new name> argument).\n"
 "\n"
 msgstr ""
+"Syntaxe : nmcli connection clone { ARGUMENTS | help }\n"
+"\n"
+"ARGUMENTS := [--temporary] [id | uuid | path] <ID> <new name>\n"
+"\n"
+"Clone un profil de connexion existant. La connexion qui vient d'être créée "
+"sera une copie parfaite de <ID>, sauf pour la propriété uuid (qui va être "
+"générée) et\n"
+"l'id (fourni comme argument <new name>).\n"
+"\n"
 
-#: ../clients/cli/connections.c:537
+#: ../clients/cli/connections.c:495
 #, c-format
 msgid ""
 "Usage: nmcli connection edit { ARGUMENTS | help }\n"
@@ -1418,19 +1472,19 @@ msgid ""
 "Add a new connection profile in an interactive editor.\n"
 "\n"
 msgstr ""
-"Utilisation : nmcli connection edit { ARGUMENTS | help }\n"
+"Syntaxe : nmcli connection edit { ARGUMENTS | help }\n"
 "\n"
 "ARGUMENTS := [id | uuid | path] <ID>\n"
 "\n"
-"Modifier un profil de connexion dans un éditeur interactif.\n"
+"Modifie un profil de connexion dans un éditeur interactif.\n"
 "Le profil est identifié par son nom, UUID ou chemin D-Bus\n"
 "\n"
 "ARGUMENTS := [type <new connection type>] [con-name <new connection name>]\n"
 "\n"
-"Ajouter un nouveau profil de connexion dans un éditeur interactif.\n"
+"Ajoute un nouveau profil de connexion dans un éditeur interactif.\n"
 "\n"
 
-#: ../clients/cli/connections.c:552
+#: ../clients/cli/connections.c:510
 #, c-format
 msgid ""
 "Usage: nmcli connection delete { ARGUMENTS | help }\n"
@@ -1441,16 +1495,16 @@ msgid ""
 "The profile is identified by its name, UUID or D-Bus path.\n"
 "\n"
 msgstr ""
-"Utilisation : nmcli connection delete { ARGUMENTS | help }\n"
+"Syntaxe : nmcli connection delete { ARGUMENTS | help }\n"
 "\n"
 "ARGUMENTS := [id | uuid | path] <ID>\n"
 "\n"
-"Supprimer un profil de connexion.\n"
+"Supprime un profil de connexion.\n"
 "Le profil est identifié par son nom, UUID ou chemin D-Bus.\n"
 "\n"
 
-#: ../clients/cli/connections.c:563
-#, fuzzy, c-format
+#: ../clients/cli/connections.c:521
+#, c-format
 msgid ""
 "Usage: nmcli connection monitor { ARGUMENTS | help }\n"
 "\n"
@@ -1461,19 +1515,17 @@ msgid ""
 "Monitors all connection profiles in case none is specified.\n"
 "\n"
 msgstr ""
-"Utilisation : nmcli connection edit { ARGUMENTS | help }\n"
+"Syntaxe : nmcli connection edit { ARGUMENTS | help }\n"
 "\n"
 "ARGUMENTS := [id | uuid | path] <ID>\n"
 "\n"
-"Modifier un profil de connexion dans un éditeur interactif.\n"
-"Le profil est identifié par son nom, UUID ou chemin D-Bus\n"
-"\n"
-"ARGUMENTS := [type <new connection type>] [con-name <new connection name>]\n"
-"\n"
-"Ajouter un nouveau profil de connexion dans un éditeur interactif.\n"
+"Surveille les activités d'un profil de connexion.\n"
+"Cette commande affiche une ligne à chaque fois que la connection spécifiée "
+"est modifiée.\n"
+"Surveille tous les profils de connexion si rien n'est spécifié \n"
 "\n"
 
-#: ../clients/cli/connections.c:575
+#: ../clients/cli/connections.c:533
 #, c-format
 msgid ""
 "Usage: nmcli connection reload { help }\n"
@@ -1481,12 +1533,12 @@ msgid ""
 "Reload all connection files from disk.\n"
 "\n"
 msgstr ""
-"Utilisation : nmcli connection reload { help }\n"
+"Syntaxe : nmcli connection reload { help }\n"
 "\n"
-"Recharger tous les fichiers de connexion à partir du disque.\n"
+"Recharge tous les fichiers de connexion à partir du disque.\n"
 "\n"
 
-#: ../clients/cli/connections.c:583
+#: ../clients/cli/connections.c:541
 #, c-format
 msgid ""
 "Usage: nmcli connection load { ARGUMENTS | help }\n"
@@ -1499,18 +1551,18 @@ msgid ""
 "state.\n"
 "\n"
 msgstr ""
-"Utilisation : nmcli connection load { ARGUMENTS | help }\n"
+"Syntaxe : nmcli connection load { ARGUMENTS | help }\n"
 "\n"
 "ARGUMENTS := <filename> [<filename>...]\n"
 "\n"
-"Charger/recharger un ou plusieurs fichier(s) de connexion à partir du "
-"disque. Utiliser ceci après\n"
+"Charge/recharge un ou plusieurs fichier(s) de connexion à partir du disque. "
+"Utilise ceci après\n"
 "avoir manuellement modifié un fichier de connexion afin de vous assurer que "
 "NetworkManager est\n"
-"conscient de état le plus récent.\n"
+"conscient de l'état le plus récent.\n"
 "\n"
 
-#: ../clients/cli/connections.c:595
+#: ../clients/cli/connections.c:553
 #, c-format
 msgid ""
 "Usage: nmcli connection import { ARGUMENTS | help }\n"
@@ -1524,9 +1576,20 @@ msgid ""
 "is imported by NetworkManager VPN plugins.\n"
 "\n"
 msgstr ""
+"Syntaxe : nmcli connection import { ARGUMENTS | help }\n"
+"\n"
+"ARGUMENTS := [--temporary] type <type> file <file to import>\n"
+"\n"
+"Importe une configuration externe/étrangère comme profil de connexion de "
+"NetworkManager.\n"
+"Le type de fichier d'entrée est spécifié par l'option de type.\n"
+"Seules les configurations VPN sont prises en charge actuellement. La "
+"configuration\n"
+"est importée par les greffons de VPN du NetworkManager.\n"
+"\n"
 
-#: ../clients/cli/connections.c:608
-#, fuzzy, c-format
+#: ../clients/cli/connections.c:566
+#, c-format
 msgid ""
 "Usage: nmcli connection export { ARGUMENTS | help }\n"
 "\n"
@@ -1536,898 +1599,1327 @@ msgid ""
 "The data are directed to standard output or to a file if a name is given.\n"
 "\n"
 msgstr ""
-"Utilisation : nmcli connection delete { ARGUMENTS | help }\n"
+"Syntaxe : nmcli connection delete { ARGUMENTS | help }\n"
 "\n"
-"ARGUMENTS := [id | uuid | path] <ID>\n"
+"ARGUMENTS := [id | uuid | path] <ID> [<output file>]\n"
 "\n"
-"Supprimer un profil de connexion.\n"
-"Le profil est identifié par son nom, UUID ou chemin D-Bus.\n"
+"Exporte une connexion. Les connexions VPN uniquement sont prises en charge "
+"actuellement.\n"
+"Les données sont dirigées vers la sortie standard ou vers un fichier si un "
+"nom est donné.\n"
 "\n"
 
-#: ../clients/cli/connections.c:686
+#: ../clients/cli/connections.c:644
 msgid "activating"
 msgstr "activation"
 
-#: ../clients/cli/connections.c:688
+#: ../clients/cli/connections.c:646
 msgid "activated"
 msgstr "activé"
 
-#: ../clients/cli/connections.c:692
+#: ../clients/cli/connections.c:650
 msgid "deactivated"
 msgstr "désactivé"
 
-#: ../clients/cli/connections.c:704
+#: ../clients/cli/connections.c:662
 msgid "VPN connecting (prepare)"
 msgstr "Connexion VPN (préparation)"
 
-#: ../clients/cli/connections.c:706
+#: ../clients/cli/connections.c:664
 msgid "VPN connecting (need authentication)"
 msgstr "Connexion VPN (authentification requise)"
 
-#: ../clients/cli/connections.c:708
+#: ../clients/cli/connections.c:666
 msgid "VPN connecting"
 msgstr "Connexion VPN"
 
-#: ../clients/cli/connections.c:710
+#: ../clients/cli/connections.c:668
 msgid "VPN connecting (getting IP configuration)"
 msgstr "Connexion VPN (obtention de la configuration IP)"
 
-#: ../clients/cli/connections.c:712
+#: ../clients/cli/connections.c:670
 msgid "VPN connected"
 msgstr "VPN connecté"
 
-#: ../clients/cli/connections.c:714
+#: ../clients/cli/connections.c:672
 msgid "VPN connection failed"
 msgstr "Échec de la connexion VPN"
 
-#: ../clients/cli/connections.c:716
+#: ../clients/cli/connections.c:674
 msgid "VPN disconnected"
 msgstr "VPN déconnecté"
 
-#: ../clients/cli/connections.c:786
+#: ../clients/cli/connections.c:744
 #, c-format
 msgid "Error updating secrets for %s: %s\n"
 msgstr "Erreur lors de la mise à jour des secrets pour l'objet %s : %s\n"
 
-#: ../clients/cli/connections.c:806
+#: ../clients/cli/connections.c:764
 msgid "Connection profile details"
 msgstr "Informations de profil de connexion"
 
-#: ../clients/cli/connections.c:818 ../clients/cli/connections.c:1211
+#: ../clients/cli/connections.c:776 ../clients/cli/connections.c:1169
 #, c-format
 msgid "Error: 'connection show': %s"
 msgstr "Erreur : « connection show » : %s"
 
-#: ../clients/cli/connections.c:974 ../clients/cli/settings.c:1950
+#: ../clients/cli/connections.c:932 ../clients/cli/settings.c:1897
 msgid "never"
 msgstr "jamais"
 
-#: ../clients/cli/connections.c:1199
+#: ../clients/cli/connections.c:1157
 msgid "Activate connection details"
 msgstr "Informations d'activation de connexion"
 
-#: ../clients/cli/connections.c:1435
+#: ../clients/cli/connections.c:1393
 #, c-format
 msgid "invalid field '%s'; allowed fields: %s and %s, or %s,%s"
 msgstr "champ invalide « %s » ; champs autorisés : %s et %s, ou %s,%s"
 
-#: ../clients/cli/connections.c:1450 ../clients/cli/connections.c:1458
+#: ../clients/cli/connections.c:1408 ../clients/cli/connections.c:1416
 #, c-format
 msgid "'%s' has to be alone"
 msgstr "« %s » doit être seul"
 
 #. Add headers
-#: ../clients/cli/connections.c:1680
+#: ../clients/cli/connections.c:1634
 msgid "NetworkManager active profiles"
 msgstr "Profils actifs NetworkManager"
 
 # auto translated by TM merge from project: NetworkManager, version: 0.9.8.2, DocId: NetworkManager
-#: ../clients/cli/connections.c:1681
+#: ../clients/cli/connections.c:1635
 msgid "NetworkManager connection profiles"
 msgstr "Profils de connexion NetworkManager"
 
-#.
-#. * TODO(?): complete uuid, path or id
-#. if (nmc->complete) {
-#. quit ();
-#. }
-#.
-#: ../clients/cli/connections.c:1727 ../clients/cli/connections.c:2445
-#: ../clients/cli/connections.c:2467 ../clients/cli/connections.c:2476
-#: ../clients/cli/connections.c:2485 ../clients/cli/connections.c:2648
-#: ../clients/cli/connections.c:7777 ../clients/cli/connections.c:7896
-#: ../clients/cli/connections.c:8032 ../clients/cli/connections.c:8170
-#: ../clients/cli/connections.c:8289 ../clients/cli/connections.c:8300
-#: ../clients/cli/connections.c:8410 ../clients/cli/devices.c:2402
-#: ../clients/cli/devices.c:2410 ../clients/cli/devices.c:2736
-#: ../clients/cli/devices.c:2743 ../clients/cli/devices.c:2757
-#: ../clients/cli/devices.c:2764 ../clients/cli/devices.c:2781
-#: ../clients/cli/devices.c:2789 ../clients/cli/devices.c:2802
-#: ../clients/cli/devices.c:3166 ../clients/cli/devices.c:3173
-#: ../clients/cli/devices.c:3180 ../clients/cli/devices.c:3192
-#: ../clients/cli/devices.c:3205 ../clients/cli/devices.c:3212
-#: ../clients/cli/devices.c:3384 ../clients/cli/devices.c:3391
-#: ../clients/cli/devices.c:3564
+#: ../clients/cli/connections.c:1681 ../clients/cli/connections.c:2389
+#: ../clients/cli/connections.c:2411 ../clients/cli/connections.c:2420
+#: ../clients/cli/connections.c:2429 ../clients/cli/connections.c:2588
+#: ../clients/cli/connections.c:10156 ../clients/cli/connections.c:10273
+#: ../clients/cli/connections.c:10405 ../clients/cli/connections.c:10538
+#: ../clients/cli/connections.c:10648 ../clients/cli/connections.c:10659
+#: ../clients/cli/connections.c:10758 ../clients/cli/devices.c:2344
+#: ../clients/cli/devices.c:2352 ../clients/cli/devices.c:2675
+#: ../clients/cli/devices.c:2682 ../clients/cli/devices.c:2696
+#: ../clients/cli/devices.c:2703 ../clients/cli/devices.c:2720
+#: ../clients/cli/devices.c:2728 ../clients/cli/devices.c:2741
+#: ../clients/cli/devices.c:3105 ../clients/cli/devices.c:3112
+#: ../clients/cli/devices.c:3119 ../clients/cli/devices.c:3131
+#: ../clients/cli/devices.c:3144 ../clients/cli/devices.c:3151
+#: ../clients/cli/devices.c:3323 ../clients/cli/devices.c:3330
+#: ../clients/cli/devices.c:3503
 #, c-format
 msgid "Error: %s argument is missing."
 msgstr "Erreur : le paramètre %s est manquant."
 
-#: ../clients/cli/connections.c:1742
+#: ../clients/cli/connections.c:1696
 #, c-format
 msgid "Error: %s - no such connection profile."
 msgstr "Erreur : %s - profil de connexion introuvable."
 
-#: ../clients/cli/connections.c:1801 ../clients/cli/connections.c:2508
-#: ../clients/cli/connections.c:8825 ../clients/cli/devices.c:3353
-#: ../clients/cli/devices.c:3834 ../clients/cli/general.c:528
-#: ../clients/cli/general.c:577 ../clients/cli/general.c:594
-#: ../clients/cli/general.c:633 ../clients/cli/general.c:647
-#: ../clients/cli/general.c:765 ../clients/cli/general.c:812
-#: ../clients/cli/general.c:832
+#: ../clients/cli/connections.c:1755 ../clients/cli/connections.c:2452
+#: ../clients/cli/connections.c:11162 ../clients/cli/devices.c:3292
+#: ../clients/cli/devices.c:3779 ../clients/cli/general.c:539
+#: ../clients/cli/general.c:588 ../clients/cli/general.c:605
+#: ../clients/cli/general.c:644 ../clients/cli/general.c:658
+#: ../clients/cli/general.c:776 ../clients/cli/general.c:823
+#: ../clients/cli/general.c:843
 #, c-format
 msgid "Error: %s."
 msgstr "Erreur : %s."
 
-#: ../clients/cli/connections.c:1897
+#: ../clients/cli/connections.c:1851
 #, c-format
 msgid "no active connection on device '%s'"
 msgstr "aucune connexion active sur le périphérique « %s »"
 
-#: ../clients/cli/connections.c:1905
+#: ../clients/cli/connections.c:1859
 msgid "no active connection or device"
 msgstr "aucune connexion ou périphérique actif"
 
-#: ../clients/cli/connections.c:1956
+#: ../clients/cli/connections.c:1910
 #, c-format
 msgid "device '%s' not compatible with connection '%s'"
 msgstr "périphérique « %s » incompatible avec la connexion « %s »"
 
-#: ../clients/cli/connections.c:1959
+#: ../clients/cli/connections.c:1913
 #, c-format
 msgid "no device found for connection '%s'"
 msgstr "aucun périphérique trouvé pour la connexion « %s »"
 
-#: ../clients/cli/connections.c:1971
+#: ../clients/cli/connections.c:1925
 msgid "unknown reason"
 msgstr "raison inconnue"
 
-#: ../clients/cli/connections.c:1973 ../clients/cli/general.c:278
+#: ../clients/cli/connections.c:1927 ../clients/cli/general.c:277
 msgid "none"
 msgstr "aucun"
 
-#: ../clients/cli/connections.c:1975
+#: ../clients/cli/connections.c:1929
 msgid "the user was disconnected"
 msgstr "l'utilisateur a été déconnecté"
 
-#: ../clients/cli/connections.c:1977
+#: ../clients/cli/connections.c:1931
 msgid "the base network connection was interrupted"
 msgstr "la connexion réseau de base a été interrompue"
 
-#: ../clients/cli/connections.c:1979
+#: ../clients/cli/connections.c:1933
 msgid "the VPN service stopped unexpectedly"
 msgstr "arrêt inattendu du service VPN"
 
-#: ../clients/cli/connections.c:1981
+#: ../clients/cli/connections.c:1935
 msgid "the VPN service returned invalid configuration"
 msgstr "le service VPN a retourné une configuration non valide"
 
-#: ../clients/cli/connections.c:1983
+#: ../clients/cli/connections.c:1937
 msgid "the connection attempt timed out"
 msgstr "le délai d'attente de la tentative de connexion a été dépassé"
 
-#: ../clients/cli/connections.c:1985
+#: ../clients/cli/connections.c:1939
 msgid "the VPN service did not start in time"
 msgstr "le service VPN n'a pas démarré à temps"
 
-#: ../clients/cli/connections.c:1987
+#: ../clients/cli/connections.c:1941
 msgid "the VPN service failed to start"
 msgstr "échec du démarrage du service VPN"
 
-#: ../clients/cli/connections.c:1989
+#: ../clients/cli/connections.c:1943
 msgid "no valid VPN secrets"
 msgstr "aucun secret VPN valide"
 
-#: ../clients/cli/connections.c:1991
+#: ../clients/cli/connections.c:1945
 msgid "invalid VPN secrets"
 msgstr "secrets VPN non valides"
 
-#: ../clients/cli/connections.c:1993
+#: ../clients/cli/connections.c:1947
 msgid "the connection was removed"
 msgstr "la connexion a été supprimée"
 
-#: ../clients/cli/connections.c:2015 ../clients/cli/connections.c:2050
-#: ../clients/cli/connections.c:2211 ../clients/cli/connections.c:6120
+#: ../clients/cli/connections.c:1969 ../clients/cli/connections.c:1997
+#: ../clients/cli/connections.c:2158 ../clients/cli/connections.c:8454
 #, c-format
 msgid "Connection successfully activated (D-Bus active path: %s)\n"
-msgstr "Connexion activée avec succès (chemin D-Bus actif : %s)\n"
+msgstr "Connexion activée (chemin D-Bus actif : %s)\n"
 
-#: ../clients/cli/connections.c:2023
+#: ../clients/cli/connections.c:1976
 #, c-format
 msgid ""
 "Connection successfully activated (master waiting for slaves) (D-Bus active "
 "path: %s)\n"
 msgstr ""
-"Connexion activée avec succès (maître attendant les esclaves) (chemin D-Bus "
-"actif : %s)\n"
-
-#: ../clients/cli/connections.c:2030 ../clients/cli/connections.c:6126
-#, c-format
-msgid "Error: Connection activation failed.\n"
-msgstr "Erreur : échec de l'activation de la connexion.\n"
+"Connexion activée (maître attendant les esclaves) (chemin D-Bus actif : "
+"%s)\n"
 
-#: ../clients/cli/connections.c:2033 ../clients/cli/connections.c:2055
+#: ../clients/cli/connections.c:1980 ../clients/cli/connections.c:2002
 #, c-format
 msgid "Error: Connection activation failed."
 msgstr "Erreur : échec de l'activation de la connexion."
 
-#: ../clients/cli/connections.c:2106
+#: ../clients/cli/connections.c:2053
 #, c-format
 msgid "VPN connection successfully activated (D-Bus active path: %s)\n"
-msgstr "Connexion VPN activée avec succès (chemin D-Bus actif : %s)\n"
+msgstr "Connexion VPN activée (chemin D-Bus actif : %s)\n"
 
-#: ../clients/cli/connections.c:2114
+#: ../clients/cli/connections.c:2061
 #, c-format
 msgid "Error: Connection activation failed: %s."
 msgstr "Erreur : l'activation de la connexion a échoué : %s."
 
-#: ../clients/cli/connections.c:2133 ../clients/cli/devices.c:1506
+#: ../clients/cli/connections.c:2080 ../clients/cli/devices.c:1426
 #, c-format
 msgid "Error: Timeout %d sec expired."
 msgstr "Erreur : le délai d'attente de %d sec a expiré."
 
-#: ../clients/cli/connections.c:2193
+#: ../clients/cli/connections.c:2140
 #, c-format
 msgid "Error: Connection activation failed: %s"
 msgstr "Erreur : l'activation de la connexion a échoué : %s"
 
-#: ../clients/cli/connections.c:2278
+#: ../clients/cli/connections.c:2225
 #, c-format
 msgid "failed to read passwd-file '%s': %s"
 msgstr "Erreur : échec de lecture du fichier de mot de passe « %s » : %s"
 
-#: ../clients/cli/connections.c:2290
+#: ../clients/cli/connections.c:2237
 #, c-format
 msgid "missing colon in 'password' entry '%s'"
-msgstr ""
+msgstr "Virgule manquant dans la saisie du mot de passe  « %s »"
 
-#: ../clients/cli/connections.c:2298
+#: ../clients/cli/connections.c:2245
 #, c-format
 msgid "missing dot in 'password' entry '%s'"
-msgstr ""
+msgstr "Point manquant dans la saisie du mot de passe « %s »"
 
-#: ../clients/cli/connections.c:2311
+#: ../clients/cli/connections.c:2258
 #, c-format
 msgid "invalid setting name in 'password' entry '%s'"
-msgstr ""
+msgstr "Nom du paramètre non valide dans la saisie du mot de passe « %s »"
 
-#: ../clients/cli/connections.c:2367
+#: ../clients/cli/connections.c:2314
 #, c-format
 msgid "unknown device '%s'."
 msgstr "périphérique inconnu « %s »."
 
-#: ../clients/cli/connections.c:2372
+#: ../clients/cli/connections.c:2319
 msgid "neither a valid connection nor device given"
 msgstr "pas de connexion ni de périphérique valide n'a été donné"
 
-#: ../clients/cli/connections.c:2458
-#, fuzzy, c-format
+#: ../clients/cli/connections.c:2402
+#, c-format
 msgid "Error: Connection '%s' does not exist."
-msgstr "Erreur : la connexion n'est pas valide : %s\n"
+msgstr "Erreur : la connexion « %s » n'existe pas."
 
-#: ../clients/cli/connections.c:2493 ../clients/cli/devices.c:1405
-#: ../clients/cli/devices.c:2416 ../clients/cli/devices.c:2813
-#: ../clients/cli/devices.c:3397
+#: ../clients/cli/connections.c:2437 ../clients/cli/devices.c:1325
+#: ../clients/cli/devices.c:2358 ../clients/cli/devices.c:2752
+#: ../clients/cli/devices.c:3336
 #, c-format
 msgid "Unknown parameter: %s\n"
 msgstr "Paramètre inconnu : %s\n"
 
-#: ../clients/cli/connections.c:2518
+#: ../clients/cli/connections.c:2462
 msgid "preparing"
 msgstr "préparation"
 
-#: ../clients/cli/connections.c:2539
-#, fuzzy, c-format
+#: ../clients/cli/connections.c:2483
+#, c-format
 msgid "Connection '%s' (%s) successfully deleted.\n"
-msgstr "Connexion « %s » (%s) ajoutée avec succès.\n"
+msgstr "Connexion « %s » (%s) supprimée.\n"
 
-#: ../clients/cli/connections.c:2555
-#, fuzzy, c-format
+#: ../clients/cli/connections.c:2499
+#, c-format
 msgid "Connection '%s' successfully deactivated (D-Bus active path: %s)\n"
-msgstr "Connexion activée avec succès (chemin D-Bus actif : %s)\n"
+msgstr "Connexion « %s » activée (chemin D-Bus actif : %s)\n"
 
-#: ../clients/cli/connections.c:2630 ../clients/cli/connections.c:8018
-#: ../clients/cli/connections.c:8226
+#: ../clients/cli/connections.c:2570 ../clients/cli/connections.c:10391
+#: ../clients/cli/connections.c:10590
 #, c-format
 msgid "Error: No connection specified."
 msgstr "Erreur : aucune connexion spécifiée."
 
-#: ../clients/cli/connections.c:2662
-#, fuzzy, c-format
+#: ../clients/cli/connections.c:2602
+#, c-format
 msgid "Error: '%s' is not an active connection.\n"
-msgstr "Erreur : « %s » n'est pas une connexion active."
+msgstr "Erreur : « %s » n'est pas une connexion active.\n"
 
-#: ../clients/cli/connections.c:2663 ../clients/cli/connections.c:8047
+#: ../clients/cli/connections.c:2603 ../clients/cli/connections.c:10420
 #, c-format
 msgid "Error: not all active connections found."
-msgstr "Erreur : toutes les connexions n'ont pas été trouvées."
+msgstr "Erreur : les connexions n'ont pas toutes été trouvées."
 
-#: ../clients/cli/connections.c:2672
+#: ../clients/cli/connections.c:2612
 #, c-format
 msgid "Error: no active connection provided."
 msgstr "Erreur : aucune connexion fournie."
 
-#: ../clients/cli/connections.c:3120 ../clients/cli/utils.c:648
+#: ../clients/cli/connections.c:2955 ../clients/cli/utils.c:702
 #, c-format
 msgid "'%s' not among [%s]"
 msgstr "« %s » ne fait pas partie de [%s]"
 
-#: ../clients/cli/connections.c:3280
+#: ../clients/cli/connections.c:3032
 #, c-format
-msgid "Warning: master='%s' doesn't refer to any existing profile.\n"
-msgstr ""
-"Avertissement : master='%s' ne correspond à un aucun profil existant.\n"
+msgid "Error: '%s': '%s' is not a valid %s MAC address."
+msgstr "Erreur : « %s » : « %s » n'est pas une adresse MAC %s valide."
 
-#: ../clients/cli/connections.c:3451
+#. Ask for optional arguments
+#: ../clients/cli/connections.c:3033 ../clients/cli/connections.c:3565
+#: ../clients/tui/nm-editor-utils.c:163 ../libnm-core/nm-connection.c:1716
+#: ../libnm-glib/nm-device.c:1861 ../libnm/nm-device.c:1812
+msgid "InfiniBand"
+msgstr "InfiniBand"
+
+#: ../clients/cli/connections.c:3033 ../clients/tui/nm-editor-utils.c:146
+#: ../libnm-glib/nm-device.c:1849 ../libnm/nm-device.c:1800
+msgid "Ethernet"
+msgstr "Ethernet"
+
+#: ../clients/cli/connections.c:3053
 #, c-format
-msgid "Error: don't know how to create '%s' setting."
-msgstr "Erreur : je ne sais pas comment créer le paramètre « %s »."
+msgid "Error: 'mtu': '%s' is not a valid MTU."
+msgstr "Erreur : « mtu » : « %s » n'est pas un MTU valide."
 
-#: ../clients/cli/connections.c:3462
+#: ../clients/cli/connections.c:3069
 #, c-format
-msgid "Error: invalid property '%s': %s."
-msgstr "Erreur : propriété « %s » non valide : %s."
+msgid "Error: 'parent': '%s' is not a valid interface name."
+msgstr "Erreur : « parent » : « %s » n'est pas un nom d'interface valide."
 
-#: ../clients/cli/connections.c:3479
+#: ../clients/cli/connections.c:3090
 #, c-format
-msgid "Error: failed to modify %s.%s: %s."
-msgstr "Erreur : échec de la modification de %s.%s : %s."
+msgid "Error: 'p-key': '%s' is not a valid InfiniBand P_KEY."
+msgstr "Erreur : « p-key » : « %s » n'est pas une P_KEY InfiniBand valide."
 
-#: ../clients/cli/connections.c:3498
+#: ../clients/cli/connections.c:3105
 #, c-format
-msgid "Error: failed to remove a value from %s.%s: %s."
-msgstr "Erreur : échec lors de la supression d'une valeur de %s.%s : %s."
+msgid "Error: '%s' is not a valid UID/GID."
+msgstr "Erreur : « %s » n'est pas un UID/GID valide."
 
-#: ../clients/cli/connections.c:3524
-#, fuzzy, c-format
-msgid "Error: '%s' is mandatory."
-msgstr "Erreur : le paramètre « %s » n'est pas présent\n"
+#: ../clients/cli/connections.c:3149
+#, c-format
+msgid "Error: '%s': '%s' is not a valid %s %s."
+msgstr "Erreur : « %s » : « %s » n'est pas un objet %s valide %s ."
 
-#: ../clients/cli/connections.c:3556
-#, fuzzy, c-format
-msgid "Error: invalid slave type; %s."
-msgstr "Erreur : type de connexion non valide ; %s."
+#: ../clients/cli/connections.c:3162
+msgid "Wi-Fi mode"
+msgstr "Mode Wi-Fi"
 
-#: ../clients/cli/connections.c:3569
-#, c-format
-msgid "Error: invalid connection type; %s."
-msgstr "Erreur : type de connexion non valide ; %s."
+#: ../clients/cli/connections.c:3171
+msgid "InfiniBand transport mode"
+msgstr "Mode de transport Infiniband"
 
-#: ../clients/cli/connections.c:3744
-#, fuzzy, c-format
-msgid "Error: bad connection type: %s."
-msgstr "Erreur : type de connexion non valide ; %s."
+#: ../clients/cli/connections.c:3183
+msgid "ADSL protocol"
+msgstr "Protocole ADSL"
 
-#: ../clients/cli/connections.c:3802
-#, fuzzy, c-format
-msgid "Error: '%s' is not a valid interface nor '*'."
-msgstr ""
-"Erreur : « ifname » : « %s » ou « * » ne sont pas des noms d'interface "
-"valide."
+#: ../clients/cli/connections.c:3194
+msgid "ADSL encapsulation"
+msgstr "Encapsulation ADSL"
 
-#: ../clients/cli/connections.c:3825
-#, fuzzy
-msgid "Error: master is required"
-msgstr "Erreur : « master » est requis."
+# auto translated by TM merge from project: NetworkManager, version: 0.9.8.2, DocId: NetworkManager
+#: ../clients/cli/connections.c:3203
+msgid "TUN device mode"
+msgstr "Mode de périphérique TUN"
 
-#: ../clients/cli/connections.c:3883
-#, fuzzy, c-format
-msgid "Error: error adding bond option '%s=%s'."
-msgstr "Erreur : connexion inconnue : « %s »."
+#: ../clients/cli/connections.c:3216
+#, c-format
+msgid "Error: 'flags': '%s' is not valid; use <0-7>."
+msgstr "Erreur : « marqueurs » : « %s » n'est pas valide ; utilisez <0-7>."
 
-#: ../clients/cli/connections.c:3914
+#: ../clients/cli/connections.c:3238
 #, c-format
-msgid "Error: '%s' is not a valid monitoring mode; use '%s' or '%s'.\n"
-msgstr ""
-"Erreur : « %s » n'est pas un mode de contrôle valide ; utilisez « %s » ou "
-"« %s ».\n"
+msgid "Error: '%s': '%s' is not valid; %s "
+msgstr "Erreur : « %s » : « %s » n'est pas valide ; %s "
 
-#: ../clients/cli/connections.c:3945
+#: ../clients/cli/connections.c:3416
 #, c-format
-msgid "Error: 'bt-type': '%s' not valid; use [%s, %s (%s), %s]."
-msgstr "Erreur : « bt-type » : « %s » non valide ; utilisez [%s, %s (%s), %s]."
+msgid "Warning: master='%s' doesn't refer to any existing profile.\n"
+msgstr ""
+"Avertissement : master=« %s » ne correspond à un aucun profil existant.\n"
 
-#: ../clients/cli/connections.c:3972
-#, fuzzy
-msgid "Interface name [*]"
-msgstr "Nom de l'interface [*] : "
+#: ../clients/cli/connections.c:3441
+#, c-format
+msgid "Error: '%s': '%s' is not valid; use <%u-%u>."
+msgstr "Erreur : « %s » : « %s » n'est pas valide ; utilisez <%u-%u>."
 
-#: ../clients/cli/connections.c:3976
-#, fuzzy
-msgid "PPPoE username"
-msgstr "Nom d'utilisateur PPPoE : "
+#. Ask for optional arguments.
+#: ../clients/cli/connections.c:3497
+#, c-format
+msgid "There is %d optional argument for '%s' connection type.\n"
+msgid_plural "There are %d optional arguments for '%s' connection type.\n"
+msgstr[0] "Il existe %d argument optionnel pour le type de connexion « %s ».\n"
+msgstr[1] ""
+"Il existe %d arguments optionnels pour le type de connexion « %s ».\n"
 
-#: ../clients/cli/connections.c:3977 ../clients/cli/connections.c:3998
-#: ../clients/cli/connections.c:4000 ../clients/cli/connections.c:4049
-#, fuzzy
-msgid "Password [none]"
-msgstr "Mot de passe [none] : "
+#: ../clients/cli/connections.c:3500
+#, c-format
+msgid "Do you want to provide it? %s"
+msgid_plural "Do you want to provide them? %s"
+msgstr[0] "Souhaitez-vous le fournir ? %s"
+msgstr[1] "Souhaitez-vous les fournir ? %s"
 
-#: ../clients/cli/connections.c:3978
-#, fuzzy
-msgid "Service [none]"
-msgstr "Service [none] : "
+#. Ask for optional arguments
+#: ../clients/cli/connections.c:3517
+msgid "ethernet"
+msgstr "ethernet"
 
-#: ../clients/cli/connections.c:3979 ../clients/cli/connections.c:3982
-#: ../clients/cli/connections.c:3991
-#, fuzzy
-msgid "MTU [auto]"
+#: ../clients/cli/connections.c:3522 ../clients/cli/connections.c:3570
+#: ../clients/cli/connections.c:3704 ../clients/cli/connections.c:3783
+msgid "MTU [auto]: "
 msgstr "MTU [auto] : "
 
-#: ../clients/cli/connections.c:3980 ../clients/cli/connections.c:3983
-#: ../clients/cli/connections.c:3992 ../clients/cli/connections.c:3995
-#: ../clients/cli/connections.c:4036
-#, fuzzy
-msgid "MAC [none]"
+#: ../clients/cli/connections.c:3533 ../clients/cli/connections.c:3581
+#: ../clients/cli/connections.c:3676 ../clients/cli/connections.c:3715
+#: ../clients/cli/connections.c:4101
+msgid "MAC [none]: "
 msgstr "MAC [none] : "
 
-#: ../clients/cli/connections.c:3981 ../clients/cli/connections.c:3993
-#, fuzzy
-msgid "Cloned MAC [none]"
+#: ../clients/cli/connections.c:3544
+msgid "Cloned MAC [none]: "
 msgstr "MAC dupliqué [none] : "
 
-#: ../clients/cli/connections.c:3986
-#, fuzzy
-msgid "Parent interface [none]"
-msgstr "Interface parent [none] : "
+#: ../clients/cli/connections.c:3592
+#, c-format
+msgid "Transport mode %s"
+msgstr "Mode de transport %s"
+
+#: ../clients/cli/connections.c:3605
+msgid "Parent interface [none]: "
+msgstr "Interface parente [none] : "
 
-#: ../clients/cli/connections.c:3987
-#, fuzzy
-msgid "P_KEY [none]"
+#: ../clients/cli/connections.c:3616
+msgid "P_KEY [none]: "
 msgstr "P_KEY [none] : "
 
-#. 0
-#: ../clients/cli/connections.c:3988 ../clients/cli/connections.c:4043
-#: ../clients/cli/devices.c:151 ../clients/tui/nmt-page-wifi.c:224
-msgid "SSID"
-msgstr "SSID"
+#: ../clients/cli/connections.c:3626
+#, c-format
+msgid "Error: 'p-key' is mandatory when 'parent' is specified.\n"
+msgstr ""
+"Erreur : « p-key » est obligatoire lorsque le « parent » est spécifié.\n"
 
-#: ../clients/cli/connections.c:3994
-#, fuzzy
-msgid "WiMAX NSP name"
-msgstr "Nom NSP WiMAX : "
+#. Ask for optional arguments
+#: ../clients/cli/connections.c:3643 ../clients/tui/nm-editor-utils.c:154
+#: ../libnm-glib/nm-device.c:1851 ../libnm/nm-device.c:1802
+msgid "Wi-Fi"
+msgstr "Wi-Fi"
 
-#: ../clients/cli/connections.c:3996
-#, fuzzy
-msgid "APN"
-msgstr "PA"
+#: ../clients/cli/connections.c:3651 ../clients/cli/connections.c:6199
+#, c-format
+msgid "Mode %s"
+msgstr "Mode %s"
 
-#: ../clients/cli/connections.c:3997 ../clients/cli/connections.c:3999
-#: ../clients/cli/connections.c:4042
-#, fuzzy
-msgid "Username [none]"
+#. Ask for optional 'wimax' arguments.
+#: ../clients/cli/connections.c:3671 ../libnm-glib/nm-device.c:1857
+#: ../libnm/nm-device.c:1808
+msgid "WiMAX"
+msgstr "WiMAX"
+
+#. Ask for optional 'pppoe' arguments.
+#: ../clients/cli/connections.c:3694
+msgid "PPPoE"
+msgstr "PPPoE"
+
+#: ../clients/cli/connections.c:3698 ../clients/cli/connections.c:3736
+#: ../clients/cli/connections.c:4223
+msgid "Password [none]: "
+msgstr "Mot de passe [none] : "
+
+#: ../clients/cli/connections.c:3700
+msgid "Service [none]: "
+msgstr "Service [none] : "
+
+#. Ask for optional 'gsm' or 'cdma' arguments.
+#: ../clients/cli/connections.c:3730
+msgid "mobile broadband"
+msgstr "haut débit mobile"
+
+#: ../clients/cli/connections.c:3734 ../clients/cli/connections.c:4173
+msgid "Username [none]: "
 msgstr "Nom d'utilisateur [none] : "
 
-#: ../clients/cli/connections.c:4001
-#, fuzzy
-msgid "Bluetooth device address"
-msgstr "Adresse du périphérique Bluetooth : "
+#. Ask for optional 'bluetooth' arguments.
+#: ../clients/cli/connections.c:3749
+msgid "bluetooth"
+msgstr "bluetooth"
 
-#: ../clients/cli/connections.c:4004
-#, fuzzy
-msgid "VLAN parent device or connection UUID"
-msgstr "Périphérique parent VLAN ou connexion UUID : "
+#: ../clients/cli/connections.c:3756
+#, c-format
+msgid "Bluetooth type %s"
+msgstr "Bluetooth type %s"
 
-#: ../clients/cli/connections.c:4006
-#, fuzzy
-msgid "VLAN ID (<0-4094>)"
-msgstr "ID VLAN <0-4095> : "
+#: ../clients/cli/connections.c:3762
+#, c-format
+msgid "Error: 'bt-type': '%s' is not a valid bluetooth type.\n"
+msgstr "Erreur : « bt-type » : « %s » n'est pas un type bluetooth valide.\n"
 
-#: ../clients/cli/connections.c:4007
-#, fuzzy
-msgid "VLAN flags (<0-7>) [none]"
-msgstr "Indicateurs VLAN (<0-7>) [none] : "
+#. Ask for optional 'vlan' arguments.
+#. 13
+#: ../clients/cli/connections.c:3778 ../clients/cli/devices.c:239
+#: ../clients/tui/nm-editor-utils.c:217 ../clients/tui/nmt-page-vlan.c:94
+#: ../libnm-core/nm-connection.c:1714 ../libnm-glib/nm-device.c:1869
+#: ../libnm-util/nm-connection.c:1632 ../libnm/nm-device.c:1820
+msgid "VLAN"
+msgstr "VLAN"
+
+#: ../clients/cli/connections.c:3794
+msgid "VLAN flags (<0-7>) [none]: "
+msgstr "Marqueurs VLAN (<0-7>) [none] : "
 
-#: ../clients/cli/connections.c:4008
-#, fuzzy
-msgid "Ingress priority maps [none]"
+#: ../clients/cli/connections.c:3805
+msgid "Ingress priority maps [none]: "
 msgstr "Carte des priorités entrantes [none] : "
 
-#: ../clients/cli/connections.c:4009
-#, fuzzy
-msgid "Egress priority maps [none]"
+#: ../clients/cli/connections.c:3816
+msgid "Egress priority maps [none]: "
 msgstr "Carte des priorités sortantes [none] : "
 
-#: ../clients/cli/connections.c:4012
-#, fuzzy
-msgid "Bonding primary interface [none]"
+#: ../clients/cli/connections.c:3827
+msgid "Bonding mode [balance-rr]: "
+msgstr "Mode de liaison [balance-rr] : "
+
+#. Ask for optional 'bond' arguments.
+#: ../clients/cli/connections.c:3843
+msgid "bond"
+msgstr "bond"
+
+#: ../clients/cli/connections.c:3865
+msgid "Bonding primary interface [none]: "
 msgstr "Interface principale de liaison [none] : "
 
-#: ../clients/cli/connections.c:4016
-#, fuzzy
-msgid "Bonding miimon [100]"
+#: ../clients/cli/connections.c:3868
+#, c-format
+msgid "Error: 'primary': '%s' is not a valid interface name.\n"
+msgstr "Erreur : « primary » : « %s » n'est pas un nom d'interface valide.\n"
+
+#: ../clients/cli/connections.c:3876
+#, c-format
+msgid "Bonding monitoring mode %s"
+msgstr "Mode de supervision de bonding %s"
+
+#: ../clients/cli/connections.c:3882
+#, c-format
+msgid "Error: '%s' is not a valid monitoring mode; use '%s' or '%s'.\n"
+msgstr ""
+"Erreur : « %s » n'est pas un mode de contrôle valide ; utilisez « %s » ou "
+"« %s ».\n"
+
+#: ../clients/cli/connections.c:3891
+msgid "Bonding miimon [100]: "
 msgstr "miimon de liaison [100] : "
 
-#: ../clients/cli/connections.c:4017
-#, fuzzy
-msgid "Bonding downdelay [0]"
+#: ../clients/cli/connections.c:3894
+#, c-format
+msgid "Error: 'miimon': '%s' is not a valid number <0-%u>.\n"
+msgstr "Erreur : « miimon » : « %s » n'est pas un numéro valide <0-%u>.\n"
+
+#: ../clients/cli/connections.c:3902
+msgid "Bonding downdelay [0]: "
 msgstr "downdelay de liaison [0] : "
 
-#: ../clients/cli/connections.c:4018
-#, fuzzy
-msgid "Bonding updelay [0]"
+#: ../clients/cli/connections.c:3905
+#, c-format
+msgid "Error: 'downdelay': '%s' is not a valid number <0-%u>.\n"
+msgstr "Erreur : « downdelay » : « %s » n'est pas un numéro valide <0-%u>.\n"
+
+#: ../clients/cli/connections.c:3913
+msgid "Bonding updelay [0]: "
 msgstr "updelay de liaison [0] : "
 
-#: ../clients/cli/connections.c:4019
-#, fuzzy
-msgid "Bonding arp-interval [0]"
+#: ../clients/cli/connections.c:3916
+#, c-format
+msgid "Error: 'updelay': '%s' is not a valid number <0-%u>.\n"
+msgstr "Erreur : « updelay » : « %s » n'est pas un numéro valide <0-%u>.\n"
+
+#: ../clients/cli/connections.c:3925
+msgid "Bonding arp-interval [0]: "
 msgstr "arp-interval de liaison [0] : "
 
-#: ../clients/cli/connections.c:4021
-#, fuzzy
-msgid "Bonding arp-ip-target [none]"
+#: ../clients/cli/connections.c:3928
+#, c-format
+msgid "Error: 'arp-interval': '%s' is not a valid number <0-%u>.\n"
+msgstr ""
+"Erreur : « arp-interval » : « %s » n'est pas un numéro valide <0-%u>.\n"
+
+#. FIXME: verify the string
+#: ../clients/cli/connections.c:3936
+msgid "Bonding arp-ip-target [none]: "
 msgstr "arp-ip-target de liaison [none] : "
 
-#: ../clients/cli/connections.c:4023
-#, fuzzy
-msgid "LACP rate ('slow' or 'fast') [slow]"
+#: ../clients/cli/connections.c:3943
+msgid "LACP rate ('slow' or 'fast') [slow]: "
 msgstr "débit LACP (« slow » ou « fast ») [slow]: "
 
-#: ../clients/cli/connections.c:4025 ../clients/cli/connections.c:4026
-#, fuzzy
-msgid "Team JSON configuration [none]"
+#: ../clients/cli/connections.c:3949
+#, c-format
+msgid "Error: 'lacp_rate': '%s' is invalid ('slow' or 'fast').\n"
+msgstr "Erreur : « lacp_rate » : « %s » est invalide (« slow » ou « fast »).\n"
+
+#: ../clients/cli/connections.c:3972
+msgid "Team JSON configuration [none]: "
 msgstr "Configuration de l'équipe JSON [none] : "
 
-#: ../clients/cli/connections.c:4027
-#, fuzzy
-msgid "Enable STP [no]"
+#: ../clients/cli/connections.c:3989
+msgid "team"
+msgstr "équipe"
+
+#: ../clients/cli/connections.c:3995
+msgid "team-slave"
+msgstr "équipe-esclave"
+
+#. Ask for optional 'bridge' arguments.
+#: ../clients/cli/connections.c:4007
+msgid "bridge"
+msgstr "bridge"
+
+#: ../clients/cli/connections.c:4013
+#, c-format
+msgid "Enable STP %s"
 msgstr "Activer STP %s"
 
-#: ../clients/cli/connections.c:4029
-#, fuzzy
-msgid "STP priority [32768]"
+#: ../clients/cli/connections.c:4018
+#, c-format
+msgid "Error: 'stp': %s.\n"
+msgstr "Erreur : « stp » : %s.\n"
+
+#: ../clients/cli/connections.c:4026
+msgid "STP priority [32768]: "
 msgstr "Priorité STP [32768] : "
 
 #: ../clients/cli/connections.c:4030
-#, fuzzy
-msgid "Forward delay [15]"
+#, c-format
+msgid "Error: 'priority': '%s' is not a valid number <0-%d>.\n"
+msgstr "Erreur : « priority » : « %s » n'est pas un numéro valide <0-%d>.\n"
+
+#: ../clients/cli/connections.c:4038
+msgid "Forward delay [15]: "
 msgstr "Forward delay [15] : "
 
-#: ../clients/cli/connections.c:4031
-#, fuzzy
-msgid "Hello time [2]"
+#: ../clients/cli/connections.c:4042
+#, c-format
+msgid "Error: 'forward-delay': '%s' is not a valid number <2-30>.\n"
+msgstr ""
+"Erreur : « forward-delay » : « %s » n'est pas un numéro valide <2-30>.\n"
+
+#: ../clients/cli/connections.c:4051
+msgid "Hello time [2]: "
 msgstr "Hello time [2] : "
 
-#: ../clients/cli/connections.c:4032
-#, fuzzy
-msgid "Max age [20]"
+#: ../clients/cli/connections.c:4055
+#, c-format
+msgid "Error: 'hello-time': '%s' is not a valid number <1-10>.\n"
+msgstr "Erreur : « hello-time » : « %s » n'est pas un numéro valide <1-10>.\n"
+
+#: ../clients/cli/connections.c:4063
+msgid "Max age [20]: "
 msgstr "Max age [20] : "
 
-#: ../clients/cli/connections.c:4033
-#, fuzzy
-msgid "MAC address ageing time [300]"
+#: ../clients/cli/connections.c:4067
+#, c-format
+msgid "Error: 'max-age': '%s' is not a valid number <6-40>.\n"
+msgstr "Erreur : « max-age » : « %s » n'est pas un numéro valide <6-40>.\n"
+
+#: ../clients/cli/connections.c:4075
+msgid "MAC address ageing time [300]: "
 msgstr "MAC address ageing time [300] : "
 
-#: ../clients/cli/connections.c:4034
-#, fuzzy, c-format
-msgid "Enable IGMP snooping %s [no]"
+#: ../clients/cli/connections.c:4079
+#, c-format
+msgid "Error: 'ageing-time': '%s' is not a valid number <0-1000000>.\n"
+msgstr ""
+"Erreur : « ageing-time » : « %s » n'est pas un numéro valide <0-1000000>.\n"
+
+#: ../clients/cli/connections.c:4088
+#, c-format
+msgid "Enable IGMP snooping %s"
 msgstr "Activer l'écoute IGMP %s"
 
-#: ../clients/cli/connections.c:4037
-#, fuzzy
-msgid "Bridge port priority [32]"
+#: ../clients/cli/connections.c:4093
+#, c-format
+msgid "Error: 'multicast-snooping': %s.\n"
+msgstr "Erreur: « multicast-snooping » : %s.\n"
+
+#. Ask for optional 'bridge-slave' arguments.
+#: ../clients/cli/connections.c:4120
+msgid "bridge-slave"
+msgstr "bridge-slave"
+
+#: ../clients/cli/connections.c:4125
+msgid "Bridge port priority [32]: "
 msgstr "Priorité du port Bridge [32] : "
 
-#: ../clients/cli/connections.c:4038
-#, fuzzy
-msgid "Bridge port STP path cost [100]"
+#: ../clients/cli/connections.c:4138
+msgid "Bridge port STP path cost [100]: "
 msgstr "Coût du chemin d'accès STP du port Bridge [100] : "
 
-#: ../clients/cli/connections.c:4039
-#, fuzzy
-msgid "Hairpin [no]"
-msgstr "Mode Hairpin"
+#: ../clients/cli/connections.c:4152
+#, c-format
+msgid "Hairpin %s"
+msgstr "Hairpin %s"
+
+#: ../clients/cli/connections.c:4157
+#, c-format
+msgid "Error: 'hairpin': %s.\n"
+msgstr "Erreur : « hairpin » : %s.\n"
+
+#. Ask for optional 'olpc' arguments.
+#: ../clients/cli/connections.c:4184 ../libnm-glib/nm-device.c:1855
+#: ../libnm/nm-device.c:1806
+msgid "OLPC Mesh"
+msgstr "Maillage OLPC"
 
-#: ../clients/cli/connections.c:4044
-#, fuzzy
-msgid "OLPC Mesh channel [1]"
+#: ../clients/cli/connections.c:4189
+msgid "OLPC Mesh channel [1]: "
 msgstr "OLPC Mesh channel [1] : "
 
-#: ../clients/cli/connections.c:4045
-#, fuzzy
-msgid "DHCP anycast MAC address [none]"
+#: ../clients/cli/connections.c:4192
+#, c-format
+msgid "Error: 'channel': '%s' is not a valid number <1-13>.\n"
+msgstr "Erreur : « channel » : « %s » n'est pas un numéro valide <1-13>.\n"
+
+#: ../clients/cli/connections.c:4200
+msgid "DHCP anycast MAC address [none]: "
 msgstr "Adresse MAC anycast DHCP [none] : "
 
-#. TTLS and PEAP are actually much more complicated, but this complication
-#. * is not visible here since we only care about phase2 authentication
-#. * (and don't even care of which one)
-#.
-#: ../clients/cli/connections.c:4046
-#: ../clients/common/nm-secret-agent-simple.c:223
-#: ../clients/common/nm-secret-agent-simple.c:328
-#: ../clients/tui/nmt-page-dsl.c:66 ../clients/tui/nmt-page-wifi.c:332
-msgid "Username"
-msgstr "Nom d'utilisateur : "
+#. Ask for optional 'adsl' arguments.
+#: ../clients/cli/connections.c:4219 ../libnm-glib/nm-device.c:1871
+#: ../libnm/nm-device.c:1822
+msgid "ADSL"
+msgstr "ADSL"
 
-#: ../clients/cli/connections.c:4052
-#, fuzzy
-msgid "MACVLAN parent device or connection UUID"
-msgstr "Périphérique parent VLAN ou connexion UUID : "
+#: ../clients/cli/connections.c:4227
+#, c-format
+msgid "ADSL encapsulation %s"
+msgstr "Encapsulation ADSL %s"
 
-#: ../clients/cli/connections.c:4055
-msgid "Tap [no]"
-msgstr ""
+#. Ask for optional 'macvlan' arguments.
+#: ../clients/cli/connections.c:4245
+msgid "macvlan"
+msgstr "macvlan"
 
-#: ../clients/cli/connections.c:4057
-#, fuzzy
-msgid "VXLAN ID"
-msgstr "ID VLAN <0-4095> : "
+#: ../clients/cli/connections.c:4251
+#, c-format
+msgid "Tap %s"
+msgstr "Tap %s"
 
-#: ../clients/cli/connections.c:4058 ../clients/cli/connections.c:4076
-#, fuzzy
-msgid "Remote"
-msgstr "Supprimer"
+#: ../clients/cli/connections.c:4256
+#, c-format
+msgid "Error: 'tap': %s.\n"
+msgstr "Erreur : « tap » : %s.\n"
 
-#: ../clients/cli/connections.c:4059 ../clients/cli/connections.c:4077
-#, fuzzy
-msgid "Parent device [none]"
+#. Ask for optional 'vxlan' arguments.
+#: ../clients/cli/connections.c:4272 ../libnm-glib/nm-device.c:1875
+#: ../libnm/nm-device.c:1826
+msgid "VXLAN"
+msgstr "VXLAN"
+
+#: ../clients/cli/connections.c:4277 ../clients/cli/connections.c:4601
+msgid "Parent device [none]: "
 msgstr "Périphérique parent [none] : "
 
-#: ../clients/cli/connections.c:4060
-#, fuzzy
-msgid "Local address [none]"
-msgstr "Adresse MAC anycast DHCP [none] : "
+#: ../clients/cli/connections.c:4282 ../clients/cli/connections.c:4606
+#, c-format
+msgid "Error: 'dev': '%s' is neither UUID nor interface name.\n"
+msgstr "EErreur : « dev » : « %s » n'est pas un UUID, ni un nom d'interface.\n"
+
+#: ../clients/cli/connections.c:4291
+msgid "Local address [none]: "
+msgstr "Adresse locale [none] : "
 
-#: ../clients/cli/connections.c:4061
-msgid "Minimum source port [0]"
+#: ../clients/cli/connections.c:4296
+#, c-format
+msgid "Error: 'local': '%s' is not a valid IP address.\n"
+msgstr "Erreur : « local »: « %s » n'est pas une adresse IP valide.\n"
+
+#: ../clients/cli/connections.c:4305
+msgid "Minimum source port [0]: "
+msgstr "Port source minimum [0] : "
+
+#: ../clients/cli/connections.c:4309
+#, c-format
+msgid "Error: 'source-port-min': '%s' is not a valid number <0-65535>.\n"
 msgstr ""
+"Erreur : « source-port-min »: « %s » n'est pas un nombre valide <0-65535>.\n"
 
-#: ../clients/cli/connections.c:4062
-msgid "Maximum source port [0]"
+#: ../clients/cli/connections.c:4318
+msgid "Maximum source port [0]: "
+msgstr "Port source maximum [0] : "
+
+#: ../clients/cli/connections.c:4322
+#, c-format
+msgid "Error: 'source-port-max': '%s' is not a valid number <0-65535>.\n"
 msgstr ""
+"Erreur : « source-port-max » : « %s » n'est pas un numéro valide <0-65535>."
+"\n"
 
-#: ../clients/cli/connections.c:4063
-#, fuzzy
-msgid "Destination port [8472]"
-msgstr "Destination"
+#: ../clients/cli/connections.c:4331
+msgid "Destination port [8472]: "
+msgstr "Destination port [8472] : "
 
-#: ../clients/cli/connections.c:4066
-#, fuzzy
-msgid "User ID [none]"
-msgstr "Nom d'utilisateur [none] : "
+#: ../clients/cli/connections.c:4335
+#, c-format
+msgid "Error: 'destination-port': '%s' is not a valid number <0-65535>.\n"
+msgstr ""
+"Erreur : « destination-port » : « %s » n'est pas un numéro valide <0-65535>."
+"\n"
 
-#: ../clients/cli/connections.c:4067
-#, fuzzy
-msgid "Group ID [none]"
-msgstr "MAC [none] : "
+#: ../clients/cli/connections.c:4374
+msgid "IPv4 address (IP[/plen]) [none]: "
+msgstr "Adresse IPv4 (IP[/plen]) [none]: "
 
-#: ../clients/cli/connections.c:4068
-#, fuzzy
-msgid "Enable PI [no]"
-msgstr "Activer STP %s"
+#: ../clients/cli/connections.c:4376
+msgid "IPv6 address (IP[/plen]) [none]: "
+msgstr "Adresse IPv6 (IP[/plen]) [none]: "
 
-#: ../clients/cli/connections.c:4070
-msgid "Enable VNET header [no]"
-msgstr ""
+#: ../clients/cli/connections.c:4390
+#, c-format
+msgid "  Address successfully added: %s\n"
+msgstr "  Adresse ajoutée : %s\n"
 
-#: ../clients/cli/connections.c:4072
-msgid "Enable multi queue [no]"
-msgstr ""
+#: ../clients/cli/connections.c:4392
+#, c-format
+msgid "  Warning: address already present: %s\n"
+msgstr "  Avertissement : adresse déjà présente : %s\n"
 
-#: ../clients/cli/connections.c:4075
-#, fuzzy
-msgid "Local endpoint [none]"
-msgstr "Interface parent [none] : "
+#: ../clients/cli/connections.c:4394
+#, c-format
+msgid "  Warning: ignoring garbage at the end: '%s'\n"
+msgstr "  Avertissement : ignorer les poubelles à la fin : « %s »\n"
 
-#: ../clients/cli/connections.c:4078
-#, fuzzy
-msgid "IPv4 address (IP[/plen]) [none]"
-msgstr "Adresse IPv4 (IP[/plen]) [none]: "
+#: ../clients/cli/connections.c:4396 ../clients/cli/connections.c:5605
+#: ../clients/cli/connections.c:5652 ../clients/cli/connections.c:6569
+#: ../clients/cli/connections.c:6602
+msgid "Error: "
+msgstr "Erreur : "
 
-#: ../clients/cli/connections.c:4079
-#, fuzzy
-msgid "IPv4 gateway [none]"
+#: ../clients/cli/connections.c:4416
+msgid "IPv4 gateway [none]: "
 msgstr "Passerelle IPv4 [none] : "
 
-#: ../clients/cli/connections.c:4080
-#, fuzzy
-msgid "IPv6 address (IP[/plen]) [none]"
-msgstr "Adresse IPv6 (IP[/plen]) [none]: "
-
-#: ../clients/cli/connections.c:4081
-#, fuzzy
-msgid "IPv6 gateway [none]"
+#: ../clients/cli/connections.c:4419
+msgid "IPv6 gateway [none]: "
 msgstr "Passerelle IPv6 [none] : "
 
-#: ../clients/cli/connections.c:4205
+#: ../clients/cli/connections.c:4439
 #, c-format
-msgid "Error: value for '%s' is missing."
-msgstr "Erreur : la valeur de l'argument « %s » est requise."
+msgid "Error: invalid gateway address '%s'\n"
+msgstr "Erreur: adresse de passerelle invalide « %s »\n"
+
+#. Ask for IP addresses
+#: ../clients/cli/connections.c:4452
+#, c-format
+msgid "Do you want to add IP addresses? %s"
+msgstr "Souhaitez-vous ajouter des adresses IP ? %s"
+
+#: ../clients/cli/connections.c:4460
+#, c-format
+msgid "Press <Enter> to finish adding addresses.\n"
+msgstr "Cliquez sur <Enter> pour terminer d'ajouter les adresses.\n"
+
+#. Ask for optional 'tun' arguments.
+#: ../clients/cli/connections.c:4504 ../libnm-glib/nm-device.c:1879
+#: ../libnm/nm-device.c:1830
+msgid "Tun"
+msgstr "Tun"
+
+#: ../clients/cli/connections.c:4509
+msgid "User ID [none]: "
+msgstr "ID Utilisateur [none] : "
+
+#: ../clients/cli/connections.c:4522
+msgid "Group ID [none]: "
+msgstr "ID Groupe [none] : "
+
+#: ../clients/cli/connections.c:4536
+#, c-format
+msgid "Enable PI %s"
+msgstr "Activer PI %s"
+
+#: ../clients/cli/connections.c:4541
+#, c-format
+msgid "Error: 'pi': %s.\n"
+msgstr "Erreur : « pi » : %s.\n"
+
+#: ../clients/cli/connections.c:4549
+#, c-format
+msgid "Enable VNET header %s"
+msgstr "Activer en-tête VNET %s"
+
+#: ../clients/cli/connections.c:4554
+#, c-format
+msgid "Error: 'vnet-hdr': %s.\n"
+msgstr "Erreur : « vnet-hdr » : %s.\n"
+
+#: ../clients/cli/connections.c:4562
+#, c-format
+msgid "Enable multi queue %s"
+msgstr "Activer files d'attente multiples %s"
 
-#: ../clients/cli/connections.c:4252
+#: ../clients/cli/connections.c:4567
+#, c-format
+msgid "Error: 'multi-queue': %s.\n"
+msgstr "Erreur : « file d'attente mulitple » %s.\n"
+
+#. Ask for optional 'ip-tunnel' arguments.
+#: ../clients/cli/connections.c:4581
+msgid "IP Tunnel"
+msgstr "Tunnel IP"
+
+#: ../clients/cli/connections.c:4586
+msgid "Local endpoint [none]: "
+msgstr "Point de terminaison local [none] : "
+
+#: ../clients/cli/connections.c:4592
+#, c-format
+msgid "Error: 'local': '%s' is not valid; must be an IP address\n"
+msgstr ""
+"Erreur : 'local': « %s » n'est pas valide ; doit correspondre à une adresse "
+"IP\n"
+
+#: ../clients/cli/connections.c:4658 ../clients/cli/connections.c:10184
+#, c-format
 msgid "Error: <setting>.<property> argument is missing."
 msgstr "Erreur : l'argument <setting>.<property> est manquant."
 
-#: ../clients/cli/connections.c:4274
+#: ../clients/cli/connections.c:4663
+#, c-format
+msgid "Error: value for '%s' is missing."
+msgstr "Erreur : la valeur de l'argument « %s » est requise."
+
+#: ../clients/cli/connections.c:4681
+#, c-format
+msgid "Error: invalid <setting>.<property> '%s'."
+msgstr "Erreur : « %s » <setting>.<property> non valide."
+
+#: ../clients/cli/connections.c:4689
 #, c-format
 msgid "Error: invalid or not allowed setting '%s': %s."
 msgstr "Erreur : non valide, ou le paramètre « %s » n'est pas autorisé : %s."
 
-#: ../clients/cli/connections.c:4301
-#, fuzzy, c-format
-msgid "Error: '%s' is ambiguous (%s.%s or %s.%s)."
-msgstr "« %s » est ambigu (%s x %s)"
+#: ../clients/cli/connections.c:4700
+#, c-format
+msgid "Error: don't know how to create '%s' setting."
+msgstr "Erreur : je ne sais pas comment créer le paramètre « %s »."
 
-#: ../clients/cli/connections.c:4315
+#: ../clients/cli/connections.c:4710
 #, c-format
-msgid "Error: invalid <setting>.<property> '%s'."
-msgstr "Erreur : « %s » <setting>.<property> non valide."
+msgid "Error: invalid property '%s': %s."
+msgstr "Erreur : propriété « %s » non valide : %s."
 
-#: ../clients/cli/connections.c:4356 ../clients/cli/connections.c:7842
+#: ../clients/cli/connections.c:4722
 #, c-format
-msgid "Error: Failed to add '%s' connection: %s"
-msgstr "Erreur: impossible d'ajouter la connexion « %s » : %s"
+msgid "Error: failed to modify %s.%s: %s."
+msgstr "Erreur : échec de la modification de %s.%s : %s."
 
-#: ../clients/cli/connections.c:4361
+#: ../clients/cli/connections.c:4741
 #, c-format
-msgid "Connection '%s' (%s) successfully added.\n"
-msgstr "Connexion « %s » (%s) ajoutée avec succès.\n"
+msgid "Error: failed to remove a value from %s.%s: %s."
+msgstr "Erreur : échec lors de la supression d'une valeur de %s.%s : %s."
 
-#: ../clients/cli/connections.c:4477
+#: ../clients/cli/connections.c:4775
 #, c-format
 msgid ""
-"You can specify this option more than once. Press <Enter> when you're done.\n"
+"Warning: 'type' is ignored. Use 'nmcli connection add \"%s\" ...' instead."
 msgstr ""
+"Avertissement : le « type » est ignoré. Utiliser « nmcli connection add "
+"\"%s\" ... » à la place."
 
-#. Ask for optional arguments.
-#: ../clients/cli/connections.c:4515
-#, fuzzy, c-format
-msgid "There is %d optional setting for %s.\n"
-msgid_plural "There are %d optional settings for %s.\n"
-msgstr[0] "Il existe %d argument optionnel pour le type de connexion « %s ».\n"
-msgstr[1] ""
-"Il existe %d arguments optionnels pour le type de connexion « %s ».\n"
+#: ../clients/cli/connections.c:4783
+msgid "Error: redundant 'master' option."
+msgstr "Erreur : option « master » redondante."
+
+#: ../clients/cli/connections.c:4796
+msgid "Error: 'master' is required."
+msgstr "Erreur : « master » est requis."
 
-#: ../clients/cli/connections.c:4518
+#: ../clients/cli/connections.c:4950
 #, c-format
-msgid "Do you want to provide it? %s"
-msgid_plural "Do you want to provide them? %s"
-msgstr[0] "Souhaitez-vous le fournir ? %s"
-msgstr[1] "Souhaitez-vous les fournir ? %s"
+msgid "Error: 'parent': not valid without 'p-key'."
+msgstr "Erreur : « parent » : non valide sans « p-key »."
 
-#: ../clients/cli/connections.c:4532
-#, fuzzy
-msgid "Wired Ethernet"
-msgstr "Ethernet"
+#: ../clients/cli/connections.c:5005 ../clients/cli/connections.c:5967
+msgid "SSID: "
+msgstr "SSID : "
 
-#: ../clients/cli/connections.c:4534 ../src/devices/nm-device-infiniband.c:175
-#, fuzzy
-msgid "InfiniBand connection"
-msgstr "Connexion InfiniBand %d"
+#: ../clients/cli/connections.c:5008 ../clients/cli/connections.c:5970
+msgid "Error: 'ssid' is required."
+msgstr "Erreur : « ssid » est requis."
 
-#: ../clients/cli/connections.c:4536
-#, fuzzy
-msgid "Wi-Fi connection"
-msgstr "Connexion Wi-Fi %d"
+#: ../clients/cli/connections.c:5072
+msgid "WiMAX NSP name: "
+msgstr "Nom NSP WiMAX : "
 
-#: ../clients/cli/connections.c:4538
-#, fuzzy
-msgid "WiMAX connection"
-msgstr "Connexion CDMA %d"
+#: ../clients/cli/connections.c:5075
+msgid "Error: 'nsp' is required."
+msgstr "Erreur : « nsp » est requis."
 
-#: ../clients/cli/connections.c:4540
-msgid "PPPoE"
-msgstr "PPPoE"
+#: ../clients/cli/connections.c:5127
+msgid "PPPoE username: "
+msgstr "Nom d'utilisateur PPPoE : "
 
-#: ../clients/cli/connections.c:4542
-#, fuzzy
-msgid "CDMA mobile broadband connection"
-msgstr "Connexion haut débit mobile %d"
+#: ../clients/cli/connections.c:5130 ../clients/cli/connections.c:6037
+msgid "Error: 'username' is required."
+msgstr "Erreur : « nom d'utilisateur » est requis."
 
-#: ../clients/cli/connections.c:4544
-#, fuzzy
-msgid "GSM mobile broadband connection"
-msgstr "Connexion haut débit mobile %d"
+#: ../clients/cli/connections.c:5199
+msgid "APN: "
+msgstr "APN : "
 
-#: ../clients/cli/connections.c:4546
-#, fuzzy
-msgid "bluetooth connection"
-msgstr "Connexion de liaison %d"
+#: ../clients/cli/connections.c:5202
+msgid "Error: 'apn' is required."
+msgstr "Erreur : « apn » est requis."
 
-#: ../clients/cli/connections.c:4548 ../src/devices/nm-device-vlan.c:458
-#, fuzzy
-msgid "VLAN connection"
-msgstr "Connexion VLAN %d"
+#: ../clients/cli/connections.c:5260
+msgid "Bluetooth device address: "
+msgstr "Adresse du périphérique Bluetooth : "
 
-#: ../clients/cli/connections.c:4550
-#, fuzzy
-msgid "Bond device"
-msgstr "Ethernet"
+#: ../clients/cli/connections.c:5263
+msgid "Error: 'addr' is required."
+msgstr "Erreur : « addr » est requis."
 
-# auto translated by TM merge from project: NetworkManager, version: 0.9.8.2, DocId: NetworkManager
-#: ../clients/cli/connections.c:4552
-#, fuzzy
-msgid "Team device"
-msgstr "Mode de périphérique TUN"
+#: ../clients/cli/connections.c:5304
+#, c-format
+msgid "Error: 'bt-type': '%s' not valid; use [%s, %s (%s), %s]."
+msgstr ""
+"Erreur : « bt-type » : « %s » non valide ; utilisez [%s, %s (%s), %s]."
 
-#: ../clients/cli/connections.c:4554
-#, fuzzy
-msgid "Team port"
-msgstr "Équipe"
+#: ../clients/cli/connections.c:5348
+msgid "VLAN parent device or connection UUID: "
+msgstr "Périphérique parent VLAN ou connexion UUID : "
 
-#: ../clients/cli/connections.c:4556
-#, fuzzy
-msgid "Bridge device"
-msgstr "Ethernet"
+#: ../clients/cli/connections.c:5351 ../clients/cli/connections.c:6108
+msgid "Error: 'dev' is required."
+msgstr "Erreur : « dev » est requis."
 
-#: ../clients/cli/connections.c:4558
-#, fuzzy
-msgid "Bridge port"
-msgstr "Pont"
+#: ../clients/cli/connections.c:5355
+msgid "VLAN ID <0-4094>: "
+msgstr "VLAN ID <0-4094>: "
 
-#: ../clients/cli/connections.c:4560 ../src/nm-manager.c:3716
-msgid "VPN connection"
-msgstr "Connexion VPN"
+#: ../clients/cli/connections.c:5358 ../clients/cli/connections.c:6424
+msgid "Error: 'id' is required."
+msgstr "Erreur : « id » est requis."
 
-#: ../clients/cli/connections.c:4562
-#, fuzzy
-msgid "OLPC Mesh connection"
-msgstr "Connexion CDMA %d"
+#: ../clients/cli/connections.c:5364
+#, c-format
+msgid "Error: 'id': '%s' is not valid; use <0-4094>."
+msgstr "Erreur : « id » : « %s » est non valide ; utilisez <0-4094>."
 
-#: ../clients/cli/connections.c:4564 ../src/devices/adsl/nm-device-adsl.c:133
-#, fuzzy
-msgid "ADSL connection"
-msgstr "Connexion ADSL %d"
+#: ../clients/cli/connections.c:5374 ../clients/cli/connections.c:6116
+#, c-format
+msgid "Error: 'dev': '%s' is neither UUID, interface name, nor MAC."
+msgstr ""
+"Erreur : « dev » : « %s » n'est pas un UUID, un nom d'interface, ni une "
+"adresse MAC."
 
-#: ../clients/cli/connections.c:4566
-#, fuzzy
-msgid "macvlan connection"
-msgstr "Connexion de liaison %d"
+#: ../clients/cli/connections.c:5506
+#, c-format
+msgid "Error: 'mode': %s."
+msgstr "Erreur : « mode » : %s."
 
-#: ../clients/cli/connections.c:4568 ../src/devices/nm-device-vxlan.c:374
-#, fuzzy
-msgid "VXLAN connection"
-msgstr "Connexion VLAN %d"
+#: ../clients/cli/connections.c:5515
+#, c-format
+msgid "Error: 'primary': '%s' is not a valid interface name."
+msgstr "Erreur : « primary » : « %s » n'est pas un nom d'interface valide."
 
-# auto translated by TM merge from project: NetworkManager, version: 0.9.8.2, DocId: NetworkManager
-#: ../clients/cli/connections.c:4570
-#, fuzzy
-msgid "Tun device"
-msgstr "Mode de périphérique TUN"
+#: ../clients/cli/connections.c:5738
+#, c-format
+msgid "Error: 'stp': %s."
+msgstr "Erreur : « stp » : %s."
 
-#: ../clients/cli/connections.c:4572
-#, fuzzy
-msgid "IPv4 protocol"
-msgstr "Protocole ADSL"
+#: ../clients/cli/connections.c:5747
+#, c-format
+msgid "Error: 'multicast-snooping': %s."
+msgstr "Erreur : « multicast-snooping » : %s."
 
-#: ../clients/cli/connections.c:4574
-#, fuzzy
-msgid "IPv6 protocol"
-msgstr "Protocole ADSL"
+#: ../clients/cli/connections.c:5866
+#, c-format
+msgid "Error: 'hairpin': %s."
+msgstr "Erreur : « hairpin » : %s."
+
+#: ../clients/cli/connections.c:5915
+msgid "Error: 'vpn-type' is required."
+msgstr "Erreur : « vpn-type » est requis."
 
-#: ../clients/cli/connections.c:4657 ../clients/cli/utils.c:124
+#: ../clients/cli/connections.c:5922
 #, c-format
-msgid "Error: value for '%s' argument is required."
-msgstr "Erreur : la valeur de l'argument « %s » est requise."
+msgid "Warning: 'vpn-type': %s not known.\n"
+msgstr "Avertissement : « vpn-type » : %s est inconnu.\n"
 
-#: ../clients/cli/connections.c:4663
+#: ../clients/cli/connections.c:5983
+#, c-format
+msgid "Error: 'channel': '%s' is not valid; use <1-13>."
+msgstr "Erreur : « channel » : « %s » est non valide ; utilisez <1-13>."
+
+#: ../clients/cli/connections.c:6034
+msgid "Username: "
+msgstr "Nom d'utilisateur : "
+
+#: ../clients/cli/connections.c:6043
+#, c-format
+msgid "Protocol %s"
+msgstr "Protocole %s"
+
+#: ../clients/cli/connections.c:6046
+msgid "Error: 'protocol' is required."
+msgstr "Erreur : « protocol » est requis."
+
+#: ../clients/cli/connections.c:6105
+msgid "MACVLAN parent device or connection UUID: "
+msgstr "Périphérique parent MACVLAN ou connexion UUID : "
+
+#: ../clients/cli/connections.c:6125 ../clients/cli/connections.c:6205
+#: ../clients/cli/connections.c:6307
+msgid "Error: 'mode' is required."
+msgstr "Erreur : « mode » est requis."
+
+#: ../clients/cli/connections.c:6131
+msgid "Error: 'mode' is not valid."
+msgstr "Erreur : « mode » est non valide."
+
+#: ../clients/cli/connections.c:6144
+#, c-format
+msgid "Error: 'tap': %s."
+msgstr "Erreur : « tap » : %s."
+
+#: ../clients/cli/connections.c:6230
+#, c-format
+msgid "Error: 'pi': %s."
+msgstr "Erreur : « pi » : %s."
+
+#: ../clients/cli/connections.c:6241
+#, c-format
+msgid "Error: 'vnet-hdr': %s."
+msgstr "Erreur : « vnet-hdr » : %s."
+
+#: ../clients/cli/connections.c:6252
+#, c-format
+msgid "Error: 'multi-queue': %s."
+msgstr "Erreur : « multi-queue » : %s."
+
+#: ../clients/cli/connections.c:6321
+#, c-format
+msgid "Error: 'mode': '%s' is not valid, use one of %s"
+msgstr "Erreur : « mode » : « %s » n'est pas valide ; utiliser un %s "
+
+#: ../clients/cli/connections.c:6327
+msgid "Remote endpoint: "
+msgstr "Point de terminaison distant :"
+
+#: ../clients/cli/connections.c:6330 ../clients/cli/connections.c:6432
+msgid "Error: 'remote' is required."
+msgstr "Erreur : « remote » est requis."
+
+#: ../clients/cli/connections.c:6337
+#, c-format
+msgid "Error: 'remote': '%s' is not valid; must be an IP address"
+msgstr ""
+"Erreur : « remote » : « %s » n'est pas valide ; doit correspondre à une "
+"adresse IP"
+
+#: ../clients/cli/connections.c:6351
+#, c-format
+msgid "Error: 'local': '%s' is not valid; must be an IP address"
+msgstr ""
+"Erreur : « local » : « %s » n'est pas valide ; doit correspondre à une "
+"adresse IP"
+
+#: ../clients/cli/connections.c:6360 ../clients/cli/connections.c:6455
+#, c-format
+msgid "Error: 'dev': '%s' is neither UUID nor interface name."
+msgstr "Erreur : « dev » : « %s » n'est pas un UUID ou un nom d'interface."
+
+#: ../clients/cli/connections.c:6421
+msgid "VXLAN ID: "
+msgstr "ID VXLAN : "
+
+#: ../clients/cli/connections.c:6429
+msgid "Remote: "
+msgstr "Remote : "
+
+#: ../clients/cli/connections.c:6438
+#, c-format
+msgid "Error: 'id': '%s' is not valid; use <0-16777215>."
+msgstr "Erreur : « id » : « %s » n'est pas valide ; utiliser <0-16777215>."
+
+#: ../clients/cli/connections.c:6464
+#, c-format
+msgid "Error: 'remote': '%s' is not a valid IP address"
+msgstr "Erreur : « remote » : « %s » n'est pas une adresse IP valide"
+
+#: ../clients/cli/connections.c:6473
+#, c-format
+msgid "Error: 'local': '%s' is not a valid IP address"
+msgstr "Erreur : « local » : « %s » n'est pas une adresse IP valide"
+
+#: ../clients/cli/connections.c:6482
+#, c-format
+msgid "Error: 'source-port-min': %s is not valid; use <0-65535>."
+msgstr ""
+"Erreur : « source-port-min » : « %s » est non valide ; utilisez <0-65535>."
+
+#: ../clients/cli/connections.c:6491
+#, c-format
+msgid "Error: 'source-port-max': %s is not valid; use <0-65535>."
+msgstr ""
+"Erreur : « source-port-max » : « %s » n'est pas valide ; utilisez <0-65535>."
+
+#: ../clients/cli/connections.c:6500
+#, c-format
+msgid "Error: 'destination-port': %s is not valid; use <0-65535>."
+msgstr ""
+"Erreur : « destination-port » : « %s » est non valide ; utilisez <0-65535>."
+
+#: ../clients/cli/connections.c:6540
+#, c-format
+msgid "Error: '%s' is not a valid connection type."
+msgstr "Erreur : « %s » n'est pas un type de connexion valide."
+
+#: ../clients/cli/connections.c:6581
+#, c-format
+msgid "Error: IPv4 gateway specified without IPv4 addresses"
+msgstr "Erreur : passerelle IPv4 fournie sans adresses IPv4"
+
+#: ../clients/cli/connections.c:6585
+#, c-format
+msgid "Error: multiple IPv4 gateways specified"
+msgstr "Erreur : plusieurs passerelles IPv4 indiquées"
+
+#: ../clients/cli/connections.c:6589
+#, c-format
+msgid "Error: Invalid IPv4 gateway '%s'"
+msgstr "Erreur : passerelle IPv4 invalide « %s »"
+
+#: ../clients/cli/connections.c:6614
+#, c-format
+msgid "Error: IPv6 gateway specified without IPv6 addresses"
+msgstr "Erreur : passerelle IPv6 fournie sans adresses IPv6"
+
+#: ../clients/cli/connections.c:6618
+#, c-format
+msgid "Error: multiple IPv6 gateways specified"
+msgstr "Erreur : plusieurs passerelles IPv6 indiquées"
+
+#: ../clients/cli/connections.c:6622
+#, c-format
+msgid "Error: Invalid IPv6 gateway '%s'"
+msgstr "Erreur : passerelle IPv6 invalide « %s »"
+
+#: ../clients/cli/connections.c:6670 ../clients/cli/connections.c:10223
+#, c-format
+msgid "Error: Failed to add '%s' connection: %s"
+msgstr "Erreur: impossible d'ajouter la connexion « %s » : %s"
+
+#: ../clients/cli/connections.c:6675
+#, c-format
+msgid "Connection '%s' (%s) successfully added.\n"
+msgstr "Connexion « %s » (%s) ajoutée avec succès.\n"
+
+#: ../clients/cli/connections.c:6951 ../clients/cli/connections.c:10678
+#, c-format
+msgid "Error: 'type' argument is required."
+msgstr "Erreur : l'argument « type » est requis."
+
+#: ../clients/cli/connections.c:6959
+#, c-format
+msgid "Error: invalid connection type; %s."
+msgstr "Erreur : type de connexion non valide ; %s."
+
+#: ../clients/cli/connections.c:6968 ../clients/cli/devices.c:2164
+#, c-format
+msgid "Error: 'autoconnect': %s."
+msgstr "Erreur : « autoconnect » : %s."
+
+#: ../clients/cli/connections.c:6978
 #, c-format
 msgid "Error: 'save': %s."
 msgstr "Erreur: « save » : %s."
 
-#: ../clients/cli/connections.c:4732
-#, fuzzy, c-format
-msgid "Error: '%s' argument is required."
-msgstr "Erreur : l'argument « type » est requis."
+#: ../clients/cli/connections.c:6995
+msgid "Interface name [*]: "
+msgstr "Nom de l'interface [*] : "
 
-#: ../clients/cli/connections.c:5701
+#: ../clients/cli/connections.c:7000
+#, c-format
+msgid "Error: 'ifname' argument is required."
+msgstr "Erreur : l'argument « ifname » est requis."
+
+#: ../clients/cli/connections.c:7002
+#, c-format
+msgid "Error: mandatory 'ifname' not seen before '%s'."
+msgstr "Erreur : paramètre « ifname » non visible avant « %s »."
+
+#: ../clients/cli/connections.c:7011
+#, c-format
+msgid "Error: 'ifname': '%s' is not a valid interface nor '*'."
+msgstr ""
+"Erreur : « ifname » : « %s » ou « * » ne sont pas des noms d'interface "
+"valide."
+
+#: ../clients/cli/connections.c:8035
 #, c-format
 msgid "['%s' setting values]\n"
-msgstr "['%s' setting values]\n"
+msgstr "[« %s » setting values]\n"
 
 #. TRANSLATORS: do not translate command names and keywords before ::
 #. *              However, you should translate terms enclosed in <>.
-#.
-#: ../clients/cli/connections.c:5783
+#. 
+#: ../clients/cli/connections.c:8117
 #, c-format
 msgid ""
 "---[ Main menu ]---\n"
@@ -2462,7 +2954,7 @@ msgstr ""
 "nmcli    <conf-option> <value>       :: configuration de nmcli\n"
 "quit                                 :: quitter nmcli\n"
 
-#: ../clients/cli/connections.c:5810
+#: ../clients/cli/connections.c:8144
 #, c-format
 msgid ""
 "goto <setting>[.<prop>] | <prop>  :: enter setting/property for editing\n"
@@ -2476,20 +2968,18 @@ msgstr ""
 "goto <setting>[.<prop>] | <prop>  :: saisir le paramètre ou la propriété "
 "pour la modification\n"
 "\n"
-"Cette commande entre dans un paramètre ou une propriété pour le/la "
-"modifier.\n"
+"Cette commande entre dans un paramètre ou une propriété pour le/la modifier.\n"
 "\n"
 "Exemples : nmcli> goto connection\n"
 "          nmcli connection> goto secondaries\n"
 "          nmcli> goto ipv4.addresses\n"
 
-#: ../clients/cli/connections.c:5817
+#: ../clients/cli/connections.c:8151
 #, c-format
 msgid ""
 "remove <setting>[.<prop>]  :: remove setting or reset property value\n"
 "\n"
-"This command removes an entire setting from the connection, or if a "
-"property\n"
+"This command removes an entire setting from the connection, or if a property\n"
 "is given, resets that property to the default value.\n"
 "\n"
 "Examples: nmcli> remove wifi-sec\n"
@@ -2505,7 +2995,7 @@ msgstr ""
 "Exemples : nmcli> remove wifi-sec\n"
 "          nmcli> remove eth.mtu\n"
 
-#: ../clients/cli/connections.c:5824
+#: ../clients/cli/connections.c:8158
 #, c-format
 msgid ""
 "set [<setting>.<prop> <value>]  :: set property value\n"
@@ -2520,7 +3010,7 @@ msgstr ""
 "\n"
 "Exemple : nmcli> set con.id My connection\n"
 
-#: ../clients/cli/connections.c:5829
+#: ../clients/cli/connections.c:8163
 #, c-format
 msgid ""
 "describe [<setting>.<prop>]  :: describe property\n"
@@ -2533,7 +3023,7 @@ msgstr ""
 "Affiche la description de la propriété. Vous pouvez consulter la page du "
 "manuel nm-settings(5) pour afficher tous les paramètres et propriétés NM.\n"
 
-#: ../clients/cli/connections.c:5834
+#: ../clients/cli/connections.c:8168
 #, c-format
 msgid ""
 "print [all]  :: print setting or connection values\n"
@@ -2548,29 +3038,32 @@ msgstr ""
 "\n"
 "Exemple : nmcli ipv4> print all\n"
 
-#: ../clients/cli/connections.c:5839
-#, fuzzy, c-format
+#: ../clients/cli/connections.c:8173
+#, c-format
 msgid ""
 "verify [all | fix]  :: verify setting or connection validity\n"
 "\n"
 "Verifies whether the setting or connection is valid and can be saved later.\n"
-"It indicates invalid values on error. Some errors may be fixed "
-"automatically\n"
+"It indicates invalid values on error. Some errors may be fixed automatically\n"
 "by 'fix' option.\n"
 "\n"
 "Examples: nmcli> verify\n"
 "          nmcli> verify fix\n"
 "          nmcli bond> verify\n"
 msgstr ""
-"verify [all]  :: vérifier le paramètre ou la validité de la connexion\n"
+"verify [all]  : vérifier le paramètre ou la validité de la connexion\n"
 "\n"
-"Vérifiesi le paramètre ou la connexion est valide et peut être enregistré "
-"plus tard. Ceci indique les valeurs non valides lors d'erreurs.\n"
+"Vérifie si le paramètre ou la connexion est valide et peut être enregistré "
+"plus tard.\n"
+"Indique les valeurs non valides sur les erreurs. Certaines erreurs peuvent "
+"être corrigées automatiquement\n"
+"par l'option «fix ».\n"
 "\n"
 "Exemples : nmcli> verify\n"
-"          nmcli bond> verify\n"
+"          nmcli> verify fix\n"
+"          nmcli bond> verifyerify\n"
 
-#: ../clients/cli/connections.c:5848
+#: ../clients/cli/connections.c:8182
 #, c-format
 msgid ""
 "save [persistent|temporary]  :: save the connection\n"
@@ -2585,8 +3078,22 @@ msgid ""
 "connection\n"
 "profile must be deleted.\n"
 msgstr ""
-
-#: ../clients/cli/connections.c:5859
+"save [persistent|temporary]  : sauvegarder la connexion\n"
+"Envoie le profil de connexion au NetworkManager qui le sauvegardera\n"
+"de manière persistante, ou qui le gardera en mémoire. Une sauvegarde sans "
+"argument\n"
+"correspond à une sauvegarde persistante.\n"
+"Notez qu'une fois que vous aurez sauvegardé le profil de façon persistante, "
+"ces\n"
+"configurations seront conservées à l'amorçage et au démarrage. Les "
+"changements\n"
+"peuvent donc être persistants ou temporaires, mais tout changement "
+"temporaire ne\n"
+"persitera pas à l'amorçage ou au démarrage. Si vous souhaitez supprimer la "
+"connexion\n"
+"persitante, le profil de connexion devra être supprimé.\n"
+
+#: ../clients/cli/connections.c:8193
 #, c-format
 msgid ""
 "activate [<ifname>] [/<ap>|<nsp>]  :: activate the connection\n"
@@ -2607,26 +3114,22 @@ msgstr ""
 "/<ap>|<nsp> - AP (Wi-Fi) ou NSP (WiMAX) (ajouter avec ou lorsque <ifname> "
 "n'est pas spécifié)\n"
 
-#: ../clients/cli/connections.c:5866 ../clients/cli/connections.c:6025
+#: ../clients/cli/connections.c:8200 ../clients/cli/connections.c:8359
 #, c-format
-msgid ""
-"back  :: go to upper menu level\n"
+msgid "back  :: go to upper menu level\n"
 "\n"
-msgstr ""
-"back  :: aller au niveau supérieur du menu\n"
+msgstr "back  :: aller au niveau supérieur du menu\n"
 "\n"
 
-#: ../clients/cli/connections.c:5869
+#: ../clients/cli/connections.c:8203
 #, c-format
-msgid ""
-"help/? [<command>]  :: help for the nmcli commands\n"
+msgid "help/? [<command>]  :: help for the nmcli commands\n"
 "\n"
-msgstr ""
-"help/? [<command>]  :: aide pour les commandes nmcli\n"
+msgstr "help/? [<command>]  :: aide pour les commandes nmcli\n"
 "\n"
 
-#: ../clients/cli/connections.c:5872
-#, fuzzy, c-format
+#: ../clients/cli/connections.c:8206
+#, c-format
 msgid ""
 "nmcli [<conf-option> <value>]  :: nmcli configuration\n"
 "\n"
@@ -2645,13 +3148,13 @@ msgstr ""
 "Configure nmcli. Les options suivantes sont disponibles :\n"
 "status-line yes | no        [default: no]\n"
 "save-confirmation yes | no  [default: yes]\n"
-"prompt-color <0-8>          [default: 0]\n"
+"prompt-color <color> | <0-8> [default: 0]\n"
 "%s\n"
 "Exemples : nmcli> nmcli status-line yes\n"
 "          nmcli> nmcli save-confirmation no\n"
 "          nmcli> nmcli prompt-color 3\n"
 
-#: ../clients/cli/connections.c:5894 ../clients/cli/connections.c:6031
+#: ../clients/cli/connections.c:8228 ../clients/cli/connections.c:8365
 #, c-format
 msgid ""
 "quit  :: exit nmcli\n"
@@ -2665,16 +3168,16 @@ msgstr ""
 "modification n'est pas enregistrée, il est demandé à l'utilisateur de "
 "confirmer l'action.\n"
 
-#: ../clients/cli/connections.c:5899 ../clients/cli/connections.c:6036
-#: ../clients/cli/connections.c:6460 ../clients/cli/connections.c:7407
+#: ../clients/cli/connections.c:8233 ../clients/cli/connections.c:8370
+#: ../clients/cli/connections.c:8794 ../clients/cli/connections.c:9742
 #, c-format
 msgid "Unknown command: '%s'\n"
 msgstr "Commande inconnue : « %s »\n"
 
 #. TRANSLATORS: do not translate command names and keywords before ::
 #. *              However, you should translate terms enclosed in <>.
-#.
-#: ../clients/cli/connections.c:5965
+#. 
+#: ../clients/cli/connections.c:8299
 #, c-format
 msgid ""
 "---[ Property menu ]---\n"
@@ -2703,7 +3206,7 @@ msgstr ""
 "commande\n"
 "quit                             :: quitter nmcli\n"
 
-#: ../clients/cli/connections.c:5990
+#: ../clients/cli/connections.c:8324
 #, c-format
 msgid ""
 "set [<value>]  :: set new value\n"
@@ -2714,8 +3217,8 @@ msgstr ""
 "\n"
 "Cette commande définit la <value> (valeur) fournie à cette propriété\n"
 
-#: ../clients/cli/connections.c:5994
-#, fuzzy, c-format
+#: ../clients/cli/connections.c:8328
+#, c-format
 msgid ""
 "add [<value>]  :: append new value to the property\n"
 "\n"
@@ -2723,13 +3226,13 @@ msgid ""
 "container type. For single-valued properties the property value is replaced "
 "(same as 'set').\n"
 msgstr ""
-"add [<value>]  :: ajouter une nouvelle option à la propriété\n"
+"add [<value>]  :: ajouter une nouvelle valeur à la propriété\n"
 "\n"
 "Cette commande ajoute une <value> (valeur) fournie à cette propriété si la "
 "propriété est d'un type de conteneur. Pour les propriétés à valeur unique, "
 "ceci remplace la valeur (comme « set »).\n"
 
-#: ../clients/cli/connections.c:6000
+#: ../clients/cli/connections.c:8334
 #, c-format
 msgid ""
 "change  :: change current value\n"
@@ -2740,7 +3243,7 @@ msgstr ""
 "\n"
 "Affiche la valeur actuelle et permet sa modification.\n"
 
-#: ../clients/cli/connections.c:6004
+#: ../clients/cli/connections.c:8338
 #, c-format
 msgid ""
 "remove [<value>|<index>|<option name>]  :: delete the value\n"
@@ -2759,8 +3262,25 @@ msgid ""
 "          nmcli bond.options> remove downdelay\n"
 "\n"
 msgstr ""
+"remove [<value>|<index>|<option name>]  :: supprime la valeur\n"
+"\n"
+"Supprime la valeur de la propriété. Pour les propriétés à valeur unique, "
+"cela ramène\n"
+"la propriété à sa valeur par défaut. Pour les propriétés de type conteneur, "
+"cela supprime\n"
+"toutes les valeurs de cette propriété, ou bien, vous pouvez spécifier un "
+"argument pour\n"
+"supprimer un seul élément ou une option. L'argument est soit à une valeur ou "
+"à index\n"
+"à supprimer, ou un nom d'option (pour les propriétés avec des options ayant "
+"des noms).\n"
+"\n"
+"Exemples: 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:6015
+#: ../clients/cli/connections.c:8349
 #, c-format
 msgid ""
 "describe  :: describe property\n"
@@ -2774,7 +3294,7 @@ msgstr ""
 "manuel nm-settings(5) pour voir tous les paramètres et toutes les propriétés "
 "NM.\n"
 
-#: ../clients/cli/connections.c:6020
+#: ../clients/cli/connections.c:8354
 #, c-format
 msgid ""
 "print [property|setting|connection]  :: print property (setting, connection) "
@@ -2790,35 +3310,37 @@ msgstr ""
 "pourrez aussi afficher les valeurs de la totalité du paramètre ou de la "
 "connexion.\n"
 
-#: ../clients/cli/connections.c:6028
+#: ../clients/cli/connections.c:8362
 #, c-format
-msgid ""
-"help/? [<command>]  :: help for nmcli commands\n"
+msgid "help/? [<command>]  :: help for nmcli commands\n"
 "\n"
-msgstr ""
-"help/? [<command>]  :: aide pour les commandes nmcli\n"
+msgstr "help/? [<command>]  :: aide pour les commandes nmcli\n"
 "\n"
 
-#: ../clients/cli/connections.c:6209
+#: ../clients/cli/connections.c:8460
+#, c-format
+msgid "Error: Connection activation failed.\n"
+msgstr "Erreur : échec de l'activation de la connexion.\n"
+
+#: ../clients/cli/connections.c:8543
 #, c-format
 msgid "Error: setting '%s' is mandatory and cannot be removed.\n"
 msgstr ""
 "Erreur : le paramètre « %s » est obligatoire et ne peut pas être supprimé.\n"
 
 #. TRANSLATORS: status line in nmcli connection editor
-#: ../clients/cli/connections.c:6227
-#, fuzzy, c-format
+#: ../clients/cli/connections.c:8561
+#, c-format
 msgid "[ Type: %s | Name: %s | UUID: %s | Dirty: %s | Temp: %s ]\n"
-msgstr "[ Connection type: %s | name: %s | UUID: %s | dirty: %s ]\n"
+msgstr "[ Type: %s | Name: %s | UUID: %s | Dirty: %s | Temp: %s ]\n"
 
-#: ../clients/cli/connections.c:6263
-#, fuzzy, c-format
+#: ../clients/cli/connections.c:8597
+#, c-format
 msgid "The connection is not saved. Do you really want to quit? %s"
 msgstr ""
-"La connexion n'est pas enregistrée. Souhaitez-vous réellement quitter ? [y/"
-"n]\n"
+"La connexion n'est pas enregistrée. Souhaitez-vous réellement quitter ? %s"
 
-#: ../clients/cli/connections.c:6312
+#: ../clients/cli/connections.c:8646
 #, c-format
 msgid ""
 "The connection profile has been removed from another client. You may type "
@@ -2827,67 +3349,67 @@ msgstr ""
 "Le profil de connexion a été supprimé à partir d'un autre client. Vous "
 "pouvez saisir « enregistrer » dans le menu principal pour le restaurer.\n"
 
-#: ../clients/cli/connections.c:6337 ../clients/cli/connections.c:6758
-#: ../clients/cli/connections.c:6816
+#: ../clients/cli/connections.c:8671 ../clients/cli/connections.c:9093
+#: ../clients/cli/connections.c:9151
 #, c-format
 msgid "Allowed values for '%s' property: %s\n"
 msgstr "Valeurs autorisées pour la propriété « %s » : %s\n"
 
-#: ../clients/cli/connections.c:6341 ../clients/cli/connections.c:6762
-#: ../clients/cli/connections.c:6820
+#: ../clients/cli/connections.c:8675 ../clients/cli/connections.c:9097
+#: ../clients/cli/connections.c:9155
 #, c-format
 msgid "Enter '%s' value: "
 msgstr "Saisissez la valeur « %s » : "
 
-#: ../clients/cli/connections.c:6356 ../clients/cli/connections.c:6378
-#: ../clients/cli/connections.c:6766 ../clients/cli/connections.c:6825
+#: ../clients/cli/connections.c:8690 ../clients/cli/connections.c:8712
+#: ../clients/cli/connections.c:9101 ../clients/cli/connections.c:9160
 #, c-format
 msgid "Error: failed to set '%s' property: %s\n"
 msgstr "Erreur : échec du paramétrage de la propriété « %s » : %s\n"
 
-#: ../clients/cli/connections.c:6372
+#: ../clients/cli/connections.c:8706
 #, c-format
 msgid "Edit '%s' value: "
 msgstr "Paramétrer la valeur « %s » :"
 
-#: ../clients/cli/connections.c:6401
+#: ../clients/cli/connections.c:8735
 #, c-format
 msgid "Error: %s\n"
 msgstr "Erreur : %s\n"
 
-#: ../clients/cli/connections.c:6407 ../clients/cli/connections.c:6907
-#: ../clients/cli/connections.c:6955
+#: ../clients/cli/connections.c:8741 ../clients/cli/connections.c:9242
+#: ../clients/cli/connections.c:9290
 #, c-format
 msgid "Error: failed to remove value of '%s': %s\n"
 msgstr "Erreur : échec de la suppression de la valeur de « %s » : %s\n"
 
-#: ../clients/cli/connections.c:6428
+#: ../clients/cli/connections.c:8762
 #, c-format
 msgid "Unknown command argument: '%s'\n"
 msgstr "Argument de commande inconnu : « %s »\n"
 
-#: ../clients/cli/connections.c:6533
+#: ../clients/cli/connections.c:8867
 #, c-format
 msgid "Available settings: %s\n"
 msgstr "Paramètres disponibles : %s\n"
 
-#: ../clients/cli/connections.c:6545
+#: ../clients/cli/connections.c:8879
 #, c-format
 msgid "Error: invalid setting name; %s\n"
 msgstr "Erreur : nom de paramètre non valide ; %s\n"
 
-#: ../clients/cli/connections.c:6562
+#: ../clients/cli/connections.c:8896
 #, c-format
 msgid "Available properties: %s\n"
 msgstr "Propriétés disponibles : %s\n"
 
-#: ../clients/cli/connections.c:6570
+#: ../clients/cli/connections.c:8904
 #, c-format
 msgid "Error: property %s\n"
 msgstr "Erreur : propriété %s\n"
 
-#: ../clients/cli/connections.c:6611
-#, fuzzy, c-format
+#: ../clients/cli/connections.c:8945
+#, c-format
 msgid ""
 "Saving the connection with 'autoconnect=yes'. That might result in an "
 "immediate activation of the connection.\n"
@@ -2895,14 +3417,14 @@ msgid ""
 msgstr ""
 "Enregistrer la connexion avec « autoconnect=yes ». Ceci pourrait entraîner "
 "l'activation immédiate de la connexion.\n"
-"Souhaitez-vous tout de même enregistrer ? [yes] "
+"Souhaitez-vous tout de même enregistrer ? %s"
 
-#: ../clients/cli/connections.c:6700
+#: ../clients/cli/connections.c:9035
 #, c-format
 msgid "You may edit the following settings: %s\n"
 msgstr "Vous pouvez modifier les paramètres suivants : %s\n"
 
-#: ../clients/cli/connections.c:6728
+#: ../clients/cli/connections.c:9063
 #, c-format
 msgid ""
 "The connection profile has been removed from another client. You may type "
@@ -2911,226 +3433,223 @@ msgstr ""
 "Le profil de connexion a été supprimé à partir d'un autre client. Vous "
 "pouvez saisir « enregistrer » pour le restaurer.\n"
 
-#: ../clients/cli/connections.c:6770 ../clients/cli/connections.c:7000
+#: ../clients/cli/connections.c:9105 ../clients/cli/connections.c:9335
 #, c-format
 msgid "Error: no setting selected; valid are [%s]\n"
 msgstr "Erreur : aucun paramètre sélectionné ; [%s] sont valides\n"
 
-#: ../clients/cli/connections.c:6771
+#: ../clients/cli/connections.c:9106
 #, c-format
 msgid "use 'goto <setting>' first, or 'set <setting>.<property>'\n"
 msgstr "utilisez d'abord « goto <setting> » ou « set <setting>.<property> »\n"
 
-#: ../clients/cli/connections.c:6785 ../clients/cli/connections.c:6934
-#: ../clients/cli/connections.c:7022
+#: ../clients/cli/connections.c:9120 ../clients/cli/connections.c:9269
+#: ../clients/cli/connections.c:9357
 #, c-format
 msgid "Error: invalid setting argument '%s'; valid are [%s]\n"
 msgstr "Erreur : argument de paramètre « %s » non valide ; [%s] sont valides\n"
 
-#: ../clients/cli/connections.c:6795
+#: ../clients/cli/connections.c:9130
 #, c-format
 msgid "Error: missing setting for '%s' property\n"
 msgstr "Erreur : paramètre manquant pour la propriété « %s »\n"
 
-#: ../clients/cli/connections.c:6802
+#: ../clients/cli/connections.c:9137
 #, c-format
 msgid "Error: invalid property: %s\n"
 msgstr "Erreur : propriété non valide : %s\n"
 
-#: ../clients/cli/connections.c:6855
+#: ../clients/cli/connections.c:9190
 #, c-format
 msgid "Error: unknown setting '%s'\n"
 msgstr "Erreur : paramètre inconnu « %s »\n"
 
-#: ../clients/cli/connections.c:6868
+#: ../clients/cli/connections.c:9203
 #, c-format
 msgid "You may edit the following properties: %s\n"
 msgstr "Vous pouvez modifier les propriétés suivantes : %s\n"
 
-#: ../clients/cli/connections.c:6912
+#: ../clients/cli/connections.c:9247
 #, c-format
 msgid "Error: no argument given; valid are [%s]\n"
 msgstr "Erreur : aucun argument donné ; [%s] sont valides\n"
 
-#: ../clients/cli/connections.c:6931
+#: ../clients/cli/connections.c:9266
 #, c-format
 msgid "Setting '%s' is not present in the connection.\n"
 msgstr "Le paramètre « %s » n'est pas présent dans la connexion.\n"
 
-#: ../clients/cli/connections.c:6976
+#: ../clients/cli/connections.c:9311
 #, c-format
 msgid "Error: %s properties, nor it is a setting name.\n"
 msgstr ""
 "Erreur : %s propriétés, il ne s'agit pas non plus d'un nom de paramètre.\n"
 
-#: ../clients/cli/connections.c:7001
+#: ../clients/cli/connections.c:9336
 #, c-format
 msgid "use 'goto <setting>' first, or 'describe <setting>.<property>'\n"
 msgstr ""
 "utilisez d'abord « goto <setting> » ou « describe <setting>.<property> »\n"
 
-#: ../clients/cli/connections.c:7050
+#: ../clients/cli/connections.c:9385
 #, c-format
 msgid "Error: invalid property: %s, neither a valid setting name.\n"
 msgstr ""
 "Erreur : propriété non valide : %s, il ne s'agit pas non plus d'un nom de "
 "paramètre valide.\n"
 
-#: ../clients/cli/connections.c:7082
+#: ../clients/cli/connections.c:9417
 #, c-format
 msgid "Error: unknown setting: '%s'\n"
 msgstr "Erreur : paramètre inconnu : « %s »\n"
 
-#: ../clients/cli/connections.c:7087
-#, fuzzy, c-format
+#: ../clients/cli/connections.c:9422
+#, c-format
 msgid "Error: '%s' setting not present in the connection\n"
-msgstr "Le paramètre « %s » n'est pas présent dans la connexion.\n"
+msgstr "Erreur : le paramètre « %s » n'est pas présent dans la connexion.\n"
 
-#: ../clients/cli/connections.c:7115
-#, fuzzy, c-format
+#: ../clients/cli/connections.c:9450
+#, c-format
 msgid "Error: invalid property: %s%s\n"
-msgstr "Erreur : propriété non valide : %s\n"
+msgstr "Erreur : propriété non valide : %s%s,\n"
 
-#: ../clients/cli/connections.c:7117
-#, fuzzy
+#: ../clients/cli/connections.c:9452
 msgid ", neither a valid setting name"
-msgstr ""
-"Erreur : propriété non valide : %s, il ne s'agit pas non plus d'un nom de "
-"paramètre valide.\n"
+msgstr "il ne s'agit pas non plus d'un nom de paramètre valide."
 
-#: ../clients/cli/connections.c:7134
-#, fuzzy, c-format
+#: ../clients/cli/connections.c:9469
+#, c-format
 msgid "Invalid verify option: %s\n"
-msgstr "option « %s » non valide"
+msgstr "Option de vérification non valide : %s\n"
 
-#: ../clients/cli/connections.c:7142
+#: ../clients/cli/connections.c:9477
 #, c-format
 msgid "Verify setting '%s': %s\n"
 msgstr "Vérifier le paramètre « %s » : %s\n"
 
-#: ../clients/cli/connections.c:7157
+#: ../clients/cli/connections.c:9492
 #, c-format
 msgid "Verify connection: %s\n"
 msgstr "Vérifier la connexion : %s\n"
 
-#: ../clients/cli/connections.c:7160
+#: ../clients/cli/connections.c:9495
 #, c-format
 msgid "The error cannot be fixed automatically.\n"
-msgstr ""
+msgstr "L'erreur ne peut pas être résolue automatiquement.\n"
 
-#: ../clients/cli/connections.c:7177
-#, fuzzy, c-format
+#: ../clients/cli/connections.c:9512
+#, c-format
 msgid "Error: invalid argument '%s'\n"
-msgstr "Erreur : argument supplémentaire « %s » non valide."
+msgstr "Erreur : argument « %s » non valideerify\n"
 
-#: ../clients/cli/connections.c:7210
-#, fuzzy, c-format
+#: ../clients/cli/connections.c:9545
+#, c-format
 msgid "Error: Failed to save '%s' (%s) connection: %s\n"
-msgstr ""
-"Erreur : échec de l'enregistrement de la connexion « %s » (%s) : (%d) %s\n"
+msgstr "Erreur : échec de l'enregistrement de la connexion « %s » (%s) : %s\n"
 
-#: ../clients/cli/connections.c:7217
+#: ../clients/cli/connections.c:9552
 #, c-format
 msgid "Connection '%s' (%s) successfully saved.\n"
-msgstr "Connexion « %s » (%s) enregistrée avec succès.\n"
+msgstr "Connexion « %s » (%s) enregistrée.\n"
 
-#: ../clients/cli/connections.c:7218
-#, fuzzy, c-format
+#: ../clients/cli/connections.c:9553
+#, c-format
 msgid "Connection '%s' (%s) successfully updated.\n"
-msgstr "Connexion « %s » (%s) ajoutée avec succès.\n"
+msgstr "Connexion « %s » (%s) mise à jour.\n"
 
-#: ../clients/cli/connections.c:7251
+#: ../clients/cli/connections.c:9586
 #, c-format
 msgid "Error: connection verification failed: %s\n"
 msgstr "Erreur : échec de la vérification de la connexion : %s\n"
 
-#: ../clients/cli/connections.c:7252
+#: ../clients/cli/connections.c:9587
 msgid "(unknown error)"
 msgstr "(erreur inconnue)"
 
-#: ../clients/cli/connections.c:7253
+#: ../clients/cli/connections.c:9588
 #, c-format
 msgid "You may try running 'verify fix' to fix errors.\n"
-msgstr ""
+msgstr "Vous devriez exécuter « verify fix » pour régler les erreurs.erify\n"
 
-#: ../clients/cli/connections.c:7275
+#: ../clients/cli/connections.c:9610
 #, c-format
 msgid "Error: connection is not saved. Type 'save' first.\n"
 msgstr ""
-"Erreur : la connexion n'est pas enregistrée. Commencez par saisir « save ».\n"
+"Erreur : la connexion n'est pas enregistrée. Commencez par saisir « save »."
+"\n"
 
-#: ../clients/cli/connections.c:7279
+#: ../clients/cli/connections.c:9614
 #, c-format
 msgid "Error: connection is not valid: %s\n"
 msgstr "Erreur : la connexion n'est pas valide : %s\n"
 
-#: ../clients/cli/connections.c:7289
+#: ../clients/cli/connections.c:9624
 #, c-format
 msgid "Error: Cannot activate connection: %s.\n"
 msgstr "Erreur : impossible d'activer la connexion : %s.\n"
 
-#: ../clients/cli/connections.c:7299
-#, fuzzy, c-format
+#: ../clients/cli/connections.c:9634
+#, c-format
 msgid "Error: Failed to activate '%s' (%s) connection: %s\n"
-msgstr "Erreur : échec de l'activation de la connexion « %s » (%s) : (%d) %s\n"
+msgstr "Erreur : échec de l'activation de la connexion « %s » (%s) : %s\n"
 
-#: ../clients/cli/connections.c:7305
+#: ../clients/cli/connections.c:9640
 #, c-format
 msgid "Monitoring connection activation (press any key to continue)\n"
 msgstr ""
 "Contrôle de l'activation de la connexion (appuyez sur n'importe quelle "
 "touche pour continuer)\n"
 
-#: ../clients/cli/connections.c:7343
+#: ../clients/cli/connections.c:9678
 #, c-format
 msgid "Error: status-line: %s\n"
-msgstr "Erreur : status-line : %s\n"
+msgstr "Erreur : statut ligne : %s\n"
 
-#: ../clients/cli/connections.c:7351
+#: ../clients/cli/connections.c:9686
 #, c-format
 msgid "Error: save-confirmation: %s\n"
-msgstr "Erreur : save-confirmation : %s\n"
+msgstr "Erreur : sauvegarder confirmation : %s\n"
 
-#: ../clients/cli/connections.c:7359
-#, fuzzy, c-format
+#: ../clients/cli/connections.c:9694
+#, c-format
 msgid "Error: show-secrets: %s\n"
-msgstr "Erreur : « afficher les connexions actives » : %s"
+msgstr "Erreur : afficher les secrets : %s\n"
 
-#: ../clients/cli/connections.c:7368
-#, fuzzy, c-format
+#: ../clients/cli/connections.c:9703
+#, c-format
 msgid "Error: bad color: %s\n"
-msgstr "Erreur : propriété non valide : %s\n"
+msgstr "Erreur : mauvaise couleur : %s\n"
 
-#: ../clients/cli/connections.c:7382
+#: ../clients/cli/connections.c:9717
 #, c-format
 msgid "Current nmcli configuration:\n"
 msgstr "Configuration nmcli actuelle :\n"
 
-#: ../clients/cli/connections.c:7392
+#: ../clients/cli/connections.c:9727
 #, c-format
 msgid "Invalid configuration option '%s'; allowed [%s]\n"
 msgstr "Option de configuration « %s » non valide ; [%s] autorisé\n"
 
-#: ../clients/cli/connections.c:7593
+#: ../clients/cli/connections.c:9982
 #, c-format
 msgid "Error: only one of 'id', uuid, or 'path' can be provided."
 msgstr "Erreur : un seul « id », uuid, ou « path » peut être fourni."
 
-#: ../clients/cli/connections.c:7605 ../clients/cli/connections.c:7788
-#: ../clients/cli/connections.c:7795 ../clients/cli/connections.c:7929
-#: ../clients/cli/connections.c:8434
+#: ../clients/cli/connections.c:9994 ../clients/cli/connections.c:10171
+#: ../clients/cli/connections.c:10178 ../clients/cli/connections.c:10306
+#: ../clients/cli/connections.c:10782
 #, c-format
 msgid "Error: Unknown connection '%s'."
 msgstr "Erreur : connexion inconnue : « %s »."
 
-#: ../clients/cli/connections.c:7623
+#: ../clients/cli/connections.c:10012
 #, c-format
 msgid "Warning: editing existing connection '%s'; 'type' argument is ignored\n"
 msgstr ""
 "Avertissement : modification de la connexion existante « %s » ; l'argument "
 "« type » est ignoré\n"
 
-#: ../clients/cli/connections.c:7626
+#: ../clients/cli/connections.c:10015
 #, c-format
 msgid ""
 "Warning: editing existing connection '%s'; 'con-name' argument is ignored\n"
@@ -3138,242 +3657,224 @@ msgstr ""
 "Avertissement : modification de la connexion existante « %s » ; l'argument "
 "« con-name » est ignoré\n"
 
-#: ../clients/cli/connections.c:7640
+#: ../clients/cli/connections.c:10029
 #, c-format
 msgid "Valid connection types: %s\n"
 msgstr "Types de connexion valides : %s\n"
 
-#: ../clients/cli/connections.c:7642
+#: ../clients/cli/connections.c:10031
 #, c-format
 msgid "Error: invalid connection type; %s\n"
 msgstr "Erreur : type de connexion non valide ; %s\n"
 
-#: ../clients/cli/connections.c:7681
+#: ../clients/cli/connections.c:10070
 #, c-format
 msgid "===| nmcli interactive connection editor |==="
 msgstr "===| éditeur de connexions interactives nmcli |==="
 
-#: ../clients/cli/connections.c:7684
+#: ../clients/cli/connections.c:10073
 #, c-format
 msgid "Editing existing '%s' connection: '%s'"
 msgstr "Modification de la connexion « %s » : « %s »"
 
-#: ../clients/cli/connections.c:7686
+#: ../clients/cli/connections.c:10075
 #, c-format
 msgid "Adding a new '%s' connection"
 msgstr "Ajout d'une nouvelle connexion « %s »"
 
-#: ../clients/cli/connections.c:7688
+#: ../clients/cli/connections.c:10077
 #, c-format
 msgid "Type 'help' or '?' for available commands."
 msgstr "Saisissez « help » ou « ? » pour les commandes disponibles."
 
-#: ../clients/cli/connections.c:7690
+#: ../clients/cli/connections.c:10079
 #, c-format
 msgid "Type 'describe [<setting>.<prop>]' for detailed property description."
 msgstr ""
 "Saisissez « describe [<setting>.<prop>] »  pour une description de propriété "
 "détaillée."
 
-#: ../clients/cli/connections.c:7728
-#, fuzzy, c-format
+#: ../clients/cli/connections.c:10117
+#, c-format
 msgid "Error: Failed to modify connection '%s': %s"
-msgstr "Erreur : la modification de la connexion « %s » a échoué : (%d) %s"
+msgstr "Erreur : la modification de la connexion « %s » a échoué : %s"
 
-#: ../clients/cli/connections.c:7735
+#: ../clients/cli/connections.c:10124
 #, c-format
 msgid "Connection '%s' (%s) successfully modified.\n"
-msgstr "Connexion « %s » (%s) modifiée avec succès.\n"
+msgstr "Connexion « %s » (%s) modifiée.\n"
 
-#.
-#. * TODO(?) complete "uuid", "path", "id" or connection name.
-#. * (if we ever will move this here from shell completion script)
-#. if (nmc->complete) {
-#. quit ();
-#.
-#: ../clients/cli/connections.c:7761 ../clients/cli/connections.c:7885
-#: ../clients/cli/connections.c:8280 ../clients/cli/connections.c:8399
+#: ../clients/cli/connections.c:10146 ../clients/cli/connections.c:10262
+#: ../clients/cli/connections.c:10639 ../clients/cli/connections.c:10747
 #, c-format
 msgid "Error: No arguments provided."
 msgstr "Erreur : aucun argument fourni."
 
-#: ../clients/cli/connections.c:7847
+#: ../clients/cli/connections.c:10165 ../clients/cli/connections.c:10294
+#: ../clients/cli/connections.c:10776
+#, c-format
+msgid "Error: connection ID is missing."
+msgstr "Erreur : l'ID de connexion est manquant."
+
+#: ../clients/cli/connections.c:10228
 #, c-format
 msgid "%s (%s) cloned as %s (%s).\n"
-msgstr ""
+msgstr "%s (%s) clonée en tant que %s (%s).\n"
 
-#: ../clients/cli/connections.c:7883
-#, fuzzy
+#: ../clients/cli/connections.c:10260
 msgid "New connection name: "
-msgstr "Nouvelle connexion"
+msgstr "Nom de la nouvelle connexion :"
 
-#: ../clients/cli/connections.c:7904 ../clients/cli/connections.c:7922
-#, fuzzy, c-format
+#: ../clients/cli/connections.c:10281 ../clients/cli/connections.c:10299
+#, c-format
 msgid "Error: <new name> argument is missing."
-msgstr "Erreur : le paramètre %s est manquant."
+msgstr "Erreur : le paramètre <new name> est manquant."
 
-#: ../clients/cli/connections.c:7910
-#, fuzzy, c-format
+#: ../clients/cli/connections.c:10287
+#, c-format
 msgid "Error: unexpected extra argument '%s'."
 msgstr "Erreur : argument « %s » inattendu"
 
-#: ../clients/cli/connections.c:7917 ../clients/cli/connections.c:8428
+#: ../clients/cli/connections.c:10356
 #, c-format
-msgid "Error: connection ID is missing."
-msgstr "Erreur : l'ID de connexion est manquant."
-
-#: ../clients/cli/connections.c:7979
-#, fuzzy, c-format
 msgid "Error: not all connections deleted."
-msgstr "Erreur : aucune connexion spécifiée."
+msgstr "Erreur : les connexions n'ont pas toutes été supprimées."
 
-#: ../clients/cli/connections.c:7980
+#: ../clients/cli/connections.c:10357
 #, c-format
 msgid "Error: Connection deletion failed: %s"
 msgstr "Erreur : la suppression de la connexion a échoué : %s"
 
-#: ../clients/cli/connections.c:8046 ../clients/cli/connections.c:8179
+#: ../clients/cli/connections.c:10419 ../clients/cli/connections.c:10547
 #, c-format
 msgid "Error: unknown connection '%s'\n"
 msgstr "Erreur : connexion inconnue : « %s »\n"
 
-#: ../clients/cli/connections.c:8060
+#: ../clients/cli/connections.c:10433
 #, c-format
 msgid "Error: no connection provided."
 msgstr "Erreur : aucune connexion indiquée."
 
 #. truncate trailing ", "
-#: ../clients/cli/connections.c:8085
+#: ../clients/cli/connections.c:10458
 #, c-format
 msgid "Error: cannot delete unknown connection(s): %s."
 msgstr ""
 "Erreur : impossible de supprimer la(les) connexion(s) inconnue(s) : %s."
 
-#: ../clients/cli/connections.c:8097
-#, fuzzy, c-format
+#: ../clients/cli/connections.c:10470
+#, c-format
 msgid "%s: connection profile changed\n"
-msgstr "échec de la connexion"
+msgstr "%s: le profil de connexion a changé\n"
 
-#: ../clients/cli/connections.c:8123
-#, fuzzy, c-format
+#: ../clients/cli/connections.c:10496
+#, c-format
 msgid "%s: connection profile created\n"
-msgstr "échec de la connexion"
+msgstr "%s: profil de connection créé\n"
 
-#: ../clients/cli/connections.c:8132
-#, fuzzy, c-format
+#: ../clients/cli/connections.c:10505
+#, c-format
 msgid "%s: connection profile removed\n"
-msgstr "la connexion a été supprimée"
+msgstr "%s: profil de connexion supprimé\n"
 
-#: ../clients/cli/connections.c:8180
-#, fuzzy, c-format
+#: ../clients/cli/connections.c:10548
+#, c-format
 msgid "Error: not all connections found."
-msgstr "Erreur : « %s » n'est pas une commande « connection » valide."
+msgstr "Erreur : les connexions n'ont pas toutes été trouvées."
 
-#: ../clients/cli/connections.c:8205
+#: ../clients/cli/connections.c:10571
 #, c-format
 msgid "Error: failed to reload connections: %s."
 msgstr "Erreur : échec lors du rechargement des connexions : %s."
 
-#: ../clients/cli/connections.c:8239
+#: ../clients/cli/connections.c:10603
 #, c-format
 msgid "Error: failed to load connection: %s."
 msgstr "Erreur : échec lors du rechargement de la connexion : %s."
 
-#: ../clients/cli/connections.c:8247
+#: ../clients/cli/connections.c:10611
 #, c-format
 msgid "Could not load file '%s'\n"
 msgstr "Impossible de charger le fichier « %s »\n"
 
-#: ../clients/cli/connections.c:8256
-#, fuzzy
+#: ../clients/cli/connections.c:10620
 msgid "File to import: "
-msgstr "Le chiffrement a échoué : %d."
+msgstr "Fichier à importer :"
 
-#: ../clients/cli/connections.c:8296
+#: ../clients/cli/connections.c:10655
 #, c-format
 msgid "Warning: 'type' already specified, ignoring extra one.\n"
-msgstr ""
+msgstr "Avertissement : 'type' déjà spécifié, le second sera ignoré.\n"
 
-#: ../clients/cli/connections.c:8307
+#: ../clients/cli/connections.c:10666
 #, c-format
 msgid "Warning: 'file' already specified, ignoring extra one.\n"
-msgstr ""
+msgstr "Avertissement : 'fichier' déjà spécifié, le second sera ignoré.\n"
 
-#: ../clients/cli/connections.c:8309
-#, fuzzy, c-format
+#: ../clients/cli/connections.c:10668
+#, c-format
 msgid "Unknown parameter: %s"
-msgstr "Paramètre inconnu : %s\n"
+msgstr "Paramètre inconnu : %s"
 
-#: ../clients/cli/connections.c:8319
+#: ../clients/cli/connections.c:10683
 #, c-format
-msgid "Error: 'type' argument is required."
-msgstr "Erreur : l'argument « type » est requis."
-
-#: ../clients/cli/connections.c:8324
-#, fuzzy, c-format
 msgid "Error: 'file' argument is required."
-msgstr "Erreur : l'argument « ifname » est requis."
+msgstr "Erreur : l'argument «fichier » est requis."
 
-#: ../clients/cli/connections.c:8331
-#, fuzzy, c-format
-msgid "Error: failed to find VPN plugin for %s."
-msgstr "Erreur : échec de la modification de %s.%s : %s."
-
-#: ../clients/cli/connections.c:8339 ../clients/cli/connections.c:8450
-#, fuzzy, c-format
+#: ../clients/cli/connections.c:10691 ../clients/cli/connections.c:10798
+#, c-format
 msgid "Error: failed to load VPN plugin: %s."
-msgstr "Erreur : échec de la modification de %s.%s : %s."
+msgstr "Erreur : échec du chargement du greffon de VPN : %s."
 
-#: ../clients/cli/connections.c:8347
-#, fuzzy, c-format
+#: ../clients/cli/connections.c:10699
+#, c-format
 msgid "Error: failed to import '%s': %s."
-msgstr "Erreur : échec de la modification de %s.%s : %s."
+msgstr "Erreur : n'a pas pu importer « %s »: %s."
 
-#: ../clients/cli/connections.c:8397
-#, fuzzy
+#: ../clients/cli/connections.c:10745
 msgid "Output file name: "
-msgstr "nom du fichier"
+msgstr "Nom du fichier de sortie :"
 
-#: ../clients/cli/connections.c:8421
-#, fuzzy, c-format
+#: ../clients/cli/connections.c:10769
+#, c-format
 msgid "Error: unknown extra argument: '%s'."
-msgstr "Erreur : argument supplémentaire « %s » non valide."
+msgstr "Erreur : argument supplémentaire « %s » inconnu"
 
-#: ../clients/cli/connections.c:8441
-#, fuzzy, c-format
+#: ../clients/cli/connections.c:10789
+#, c-format
 msgid "Error: the connection is not VPN."
-msgstr "Erreur : la connexion n'est pas valide : %s\n"
+msgstr "Erreur : la connexion n'est pas VPN."
 
-#: ../clients/cli/connections.c:8462
-#, fuzzy, c-format
+#: ../clients/cli/connections.c:10810
+#, c-format
 msgid "Error: failed to create temporary file %s."
-msgstr "Impossible de créer le fichier temporaire : %s"
+msgstr "Erreur : impossible de créer le fichier temporaire %s"
 
-#: ../clients/cli/connections.c:8471
-#, fuzzy, c-format
+#: ../clients/cli/connections.c:10819
+#, c-format
 msgid "Error: failed to export '%s': %s."
-msgstr "Erreur : échec du paramétrage de la propriété « %s » : %s\n"
+msgstr "Erreur : n'a pas pu exporter « %s » : %s."
 
-#: ../clients/cli/connections.c:8482
-#, fuzzy, c-format
+#: ../clients/cli/connections.c:10830
+#, c-format
 msgid "Error: failed to read temporary file '%s': %s."
-msgstr "Erreur : échec de la suppression de la valeur de « %s » : %s\n"
+msgstr "Erreur : n'a pas pu lire le fichier temporaire « %s » : %s."
 
-#: ../clients/cli/connections.c:8628
+#: ../clients/cli/connections.c:10976
 #, c-format
 msgid "incorrect string '%s' of '--order' option"
 msgstr "chaîne incorrecte « %s » de l'option « --order »"
 
-#: ../clients/cli/connections.c:8654
+#: ../clients/cli/connections.c:11002
 #, c-format
 msgid "incorrect item '%s' in '--order' option"
 msgstr "élément incorrect « %s » de l'option « --order »"
 
-#: ../clients/cli/connections.c:8740
+#: ../clients/cli/connections.c:11089
 msgid "'--order' argument is missing"
 msgstr "l'argument de « --order » est manquant"
 
-#: ../clients/cli/connections.c:8816
+#: ../clients/cli/connections.c:11154
 #, c-format
 msgid "Error: '%s' is not valid 'connection' command."
 msgstr "Erreur : « %s » n'est pas une commande « connection » valide."
@@ -3518,7 +4019,7 @@ msgid "S390-SUBCHANNELS"
 msgstr "S390-SUBCHANNELS"
 
 #. 0
-#: ../clients/cli/devices.c:121 ../clients/cli/devices.c:741
+#: ../clients/cli/devices.c:121 ../clients/cli/devices.c:731
 msgid "WEP"
 msgstr "WEP"
 
@@ -3528,7 +4029,7 @@ msgid "WPA"
 msgstr "WPA"
 
 #. 2
-#: ../clients/cli/devices.c:123 ../clients/cli/devices.c:749
+#: ../clients/cli/devices.c:123 ../clients/cli/devices.c:739
 msgid "WPA2"
 msgstr "WPA2"
 
@@ -3544,7 +4045,7 @@ msgstr "CCMP"
 
 #. 5
 #. 2
-#: ../clients/cli/devices.c:126 ../clients/cli/devices.c:238
+#: ../clients/cli/devices.c:126 ../clients/cli/devices.c:228
 msgid "AP"
 msgstr "PA"
 
@@ -3588,6 +4089,11 @@ msgstr "TX-POW"
 msgid "BSID"
 msgstr "BSID"
 
+#. 0
+#: ../clients/cli/devices.c:151 ../clients/tui/nmt-page-wifi.c:224
+msgid "SSID"
+msgstr "SSID"
+
 #. 1
 #: ../clients/cli/devices.c:152
 msgid "SSID-HEX"
@@ -3651,155 +4157,142 @@ msgstr "*"
 
 #. 0
 #. 5
-#: ../clients/cli/devices.c:177 ../clients/cli/devices.c:241
+#: ../clients/cli/devices.c:177 ../clients/cli/devices.c:231
 msgid "NSP"
 msgstr "NSP"
 
 #. 0
-#: ../clients/cli/devices.c:192 ../clients/cli/devices.c:201
+#: ../clients/cli/devices.c:192
 msgid "SLAVES"
 msgstr "ESCLAVES"
 
-#. 1
-#: ../clients/cli/devices.c:202
-msgid "CONFIG"
-msgstr ""
-
 #. 0
-#: ../clients/cli/devices.c:211
+#: ../clients/cli/devices.c:201
 msgid "PARENT"
 msgstr "PARENT"
 
 #. 1
-#: ../clients/cli/devices.c:212
+#: ../clients/cli/devices.c:202
 msgid "ID"
 msgstr "ID"
 
 #. 0
-#: ../clients/cli/devices.c:221 ../clients/cli/devices.c:236
+#: ../clients/cli/devices.c:211 ../clients/cli/devices.c:226
 msgid "CAPABILITIES"
 msgstr "CAPACITÉS"
 
 #. 1
-#: ../clients/cli/devices.c:237
+#: ../clients/cli/devices.c:227
 msgid "WIFI-PROPERTIES"
 msgstr "PROPRIÉTÉS-WIFI"
 
 #. 3
-#: ../clients/cli/devices.c:239
+#: ../clients/cli/devices.c:229
 msgid "WIRED-PROPERTIES"
 msgstr "PROPRIÉTÉS-CABLÉES"
 
 #. 4
-#: ../clients/cli/devices.c:240
+#: ../clients/cli/devices.c:230
 msgid "WIMAX-PROPERTIES"
 msgstr "PROPRIÉTÉS-WIMAX"
 
 #. 10
-#: ../clients/cli/devices.c:246 ../clients/tui/nmt-page-bond.c:351
+#: ../clients/cli/devices.c:236 ../clients/tui/nmt-page-bond.c:351
 msgid "BOND"
 msgstr "LIEN"
 
 #. 11
-#: ../clients/cli/devices.c:247 ../clients/tui/nmt-page-team.c:145
+#: ../clients/cli/devices.c:237 ../clients/tui/nmt-page-team.c:145
 msgid "TEAM"
 msgstr "TEAM"
 
 #. 12
-#: ../clients/cli/devices.c:248 ../clients/tui/nmt-page-bridge.c:74
+#: ../clients/cli/devices.c:238 ../clients/tui/nmt-page-bridge.c:74
 msgid "BRIDGE"
 msgstr "BRIDGE"
 
-#. 13
-#: ../clients/cli/devices.c:249 ../clients/tui/nm-editor-utils.c:217
-#: ../clients/tui/nmt-page-vlan.c:94 ../libnm-core/nm-connection.c:1746
-#: ../libnm-glib/nm-device.c:1879 ../libnm-util/nm-connection.c:1632
-#: ../libnm/nm-device.c:1830
-msgid "VLAN"
-msgstr "VLAN"
-
 #. 14
-#: ../clients/cli/devices.c:250
+#: ../clients/cli/devices.c:240
 msgid "BLUETOOTH"
 msgstr "BLUETOOTH"
 
 #. 15
-#: ../clients/cli/devices.c:251
+#: ../clients/cli/devices.c:241
 msgid "CONNECTIONS"
 msgstr "CONNEXIONS"
 
 #. 1
-#: ../clients/cli/devices.c:263
+#: ../clients/cli/devices.c:253
 msgid "CHASSIS-ID"
 msgstr "CHASSIS-ID"
 
 #. 2
-#: ../clients/cli/devices.c:264
+#: ../clients/cli/devices.c:254
 msgid "PORT-ID"
 msgstr "PORT-ID"
 
 #. 3
-#: ../clients/cli/devices.c:265
+#: ../clients/cli/devices.c:255
 msgid "PORT-DESCRIPTION"
 msgstr "PORT-DESCRIPTION"
 
 #. 4
-#: ../clients/cli/devices.c:266
+#: ../clients/cli/devices.c:256
 msgid "SYSTEM-NAME"
 msgstr "SYSTEM-NAME"
 
 #. 5
-#: ../clients/cli/devices.c:267
+#: ../clients/cli/devices.c:257
 msgid "SYSTEM-DESCRIPTION"
 msgstr "SYSTEM-DESCRIPTION"
 
 #. 6
-#: ../clients/cli/devices.c:268
+#: ../clients/cli/devices.c:258
 msgid "SYSTEM-CAPABILITIES"
 msgstr "SYSTEM-CAPABILITIES"
 
 #. 7
-#: ../clients/cli/devices.c:269
+#: ../clients/cli/devices.c:259
 msgid "IEEE-802-1-PVID"
 msgstr "IEEE-802-1-PVID"
 
 #. 8
-#: ../clients/cli/devices.c:270
+#: ../clients/cli/devices.c:260
 msgid "IEEE-802-1-PPVID"
 msgstr "IEEE-802-1-PPVID"
 
 #. 9
-#: ../clients/cli/devices.c:271
+#: ../clients/cli/devices.c:261
 msgid "IEEE-802-1-PPVID-FLAGS"
 msgstr "IEEE-802-1-PPVID-FLAGS"
 
 #. 10
-#: ../clients/cli/devices.c:272
+#: ../clients/cli/devices.c:262
 msgid "IEEE-802-1-VID"
 msgstr "IEEE-802-1-VID"
 
 #. 11
-#: ../clients/cli/devices.c:273
+#: ../clients/cli/devices.c:263
 msgid "IEEE-802-1-VLAN-NAME"
 msgstr "IEEE-802-1-VLAN-NAME"
 
 #. 12
-#: ../clients/cli/devices.c:274
+#: ../clients/cli/devices.c:264
 msgid "DESTINATION"
 msgstr "DESTINATION"
 
 #. 13
-#: ../clients/cli/devices.c:275
+#: ../clients/cli/devices.c:265
 msgid "CHASSIS-ID-TYPE"
 msgstr "CHASSIS-ID-TYPE"
 
 #. 14
-#: ../clients/cli/devices.c:276
+#: ../clients/cli/devices.c:266
 msgid "PORT-ID-TYPE"
 msgstr "PORT-ID-TYPE"
 
-#: ../clients/cli/devices.c:293
-#, fuzzy, c-format
+#: ../clients/cli/devices.c:283
+#, c-format
 msgid ""
 "Usage: nmcli device { COMMAND | help }\n"
 "\n"
@@ -3814,7 +4307,7 @@ msgid ""
 "\n"
 "  connect <ifname>\n"
 "\n"
-"  reapply <ifname>\n"
+"  reapply <ifname> ...\n"
 "\n"
 "  disconnect <ifname> ...\n"
 "\n"
@@ -3837,32 +4330,43 @@ msgid ""
 "  lldp [list [ifname <ifname>]]\n"
 "\n"
 msgstr ""
-"Utilisation : nmcli device { COMMAND | help }\n"
-"\n"
-"COMMAND := { status | show | connect | disconnect | wifi | wimax }\n"
+"Syntaxe : nmcli device { COMMAND | help }\n"
 "\n"
-"COMMAND := { status | show | connect | disconnect | wifi }\n"
+"COMMAND := { status | show | connect | reapply | disconnect | delete | "
+"monitor | wifi | lldp }\n"
 "\n"
 "  status\n"
 "\n"
 "  show [<ifname>]\n"
 "\n"
+"  set [ifname] <ifname> [autoconnect yes|no] [managed yes|no]\n"
+"\n"
 "  connect <ifname>\n"
 "\n"
-"  disconnect <ifname>\n"
+"  reapply <ifname> ...\n"
+"\n"
+"  disconnect <ifname> ...\n"
+"\n"
+"  delete <ifname> ...\n"
+"\n"
+"  monitor <ifname> ...\n"
 "\n"
 "  wifi [list [ifname <ifname>] [bssid <BSSID>]]\n"
 "\n"
 "  wifi connect <(B)SSID> [password <password>] [wep-key-type key|phrase] "
 "[ifname <ifname>]\n"
-"                         [bssid <BSSID>] [name <name>] [private yes|no]\n"
+"                         [bssid <BSSID>] [name <name>] [private yes|no] "
+"[hidden yes|no]\n"
 "\n"
-"  wifi rescan [[ifname] <ifname>]\n"
+"  wifi hotspot [ifname <ifname>] [con-name <name>] [ssid <SSID>] [band a|bg] "
+"[channel <channel>] [password <password>]\n"
 "\n"
-"  wimax [list [ifname <ifname>] [nsp <name>]]\n"
+"  wifi rescan [ifname <ifname>] [[ssid <SSID to scan>] ...]\n"
+"\n"
+"  lldp [list [ifname <ifname>]]\n"
 "\n"
 
-#: ../clients/cli/devices.c:315
+#: ../clients/cli/devices.c:305
 #, c-format
 msgid ""
 "Usage: nmcli device status { help }\n"
@@ -3873,27 +4377,25 @@ msgid ""
 " TYPE       - device type\n"
 " STATE      - device state\n"
 " CONNECTION - connection activated on device (if any)\n"
-"Displayed columns can be changed using '--fields' global option. 'status' "
-"is\n"
-"the default command, which means 'nmcli device' calls 'nmcli device "
-"status'.\n"
+"Displayed columns can be changed using '--fields' global option. 'status' is\n"
+"the default command, which means 'nmcli device' calls 'nmcli device status'.\n"
 "\n"
 msgstr ""
-"Utilisation : nmcli device status { help }\n"
+"Syntaxe : nmcli device status { help }\n"
 "\n"
-"Afficher le statut de tous les périphériques.\n"
-"Par défaut, les colonnes suivantes sont affichées :\n"
-" DEVICE     - nom de l'interface\n"
-" TYPE       - type du périphérique\n"
-" STATE      - état du périphérique\n"
-" CONNECTION - connexion activée sur le périphérique (s'il y en a)\n"
+"Affiche le statut de tous les périphériques.\n"
+"Par défaut, on peut voir les colonnes suivantes :\n"
+" DEVICE     - interface name\n"
+" TYPE       - device type\n"
+" STATE      - device state\n"
+" CONNECTION - connection activated on device (if any)\n"
 "Les colonnes affichées peuvent être modifiées en utilisant l'option globale "
-"« --fields ».\n"
-"« status » est la commande par défaut, ce qui signifie que « nmcli device » "
-"appelle « nmcli device status ».\n"
+"'--fields'. status'\n"
+"est la commande par défaut, c-a-d que 'nmcli device' appelle 'nmcli device "
+"status'.\n"
 "\n"
 
-#: ../clients/cli/devices.c:330
+#: ../clients/cli/devices.c:320
 #, c-format
 msgid ""
 "Usage: nmcli device show { ARGUMENTS | help }\n"
@@ -3904,16 +4406,16 @@ msgid ""
 "The command lists details for all devices, or for a given device.\n"
 "\n"
 msgstr ""
-"Utilisation : nmcli device show { ARGUMENTS | help }\n"
+"Syntaxe : nmcli device show { ARGUMENTS | help }\n"
 "\n"
 "ARGUMENTS := [<ifname>]\n"
 "\n"
-"Afficher les détails du (ou des) périphérique(s).\n"
-"La commande répertorie les détails de tous les périphériques, ou d'un "
-"périphérique en particulier.\n"
+"Affiche les informations sur les périphériques.\n"
+"La commande afficher tous les détails de tous les périphériques, ou pour un "
+"périphérique donné.\n"
 "\n"
 
-#: ../clients/cli/devices.c:341
+#: ../clients/cli/devices.c:331
 #, c-format
 msgid ""
 "Usage: nmcli device connect { ARGUMENTS | help }\n"
@@ -3921,46 +4423,45 @@ msgid ""
 "ARGUMENTS := <ifname>\n"
 "\n"
 "Connect the device.\n"
-"NetworkManager will try to find a suitable connection that will be "
-"activated.\n"
+"NetworkManager will try to find a suitable connection that will be activated."
+"\n"
 "It will also consider connections that are not set to auto-connect.\n"
 "\n"
 msgstr ""
-"Utilisation : nmcli device connect { ARGUMENTS | help }\n"
+"Syntaxe : nmcli device connect { ARGUMENTS | help }\n"
 "\n"
 "ARGUMENTS := <ifname>\n"
 "\n"
-"Connecter le périphérique.\n"
-"NetworkManager tentera de trouver une connexion convenable qui sera "
-"activée.\n"
+"Connecte le périphérique.\n"
+"NetworkManager tentera de trouver une connexion convenable qui sera activée.\n"
 "NetworkManager envisagera aussi les connexions qui ne sont pas réglées sur "
 "auto-connect.\n"
 "\n"
 
-#: ../clients/cli/devices.c:353
-#, fuzzy, c-format
+#: ../clients/cli/devices.c:343
+#, c-format
 msgid ""
 "Usage: nmcli device reapply { ARGUMENTS | help }\n"
 "\n"
-"ARGUMENTS := <ifname>\n"
+"ARGUMENTS := <ifname> ...\n"
 "\n"
 "Attempts to update device with changes to the currently active connection\n"
 "made since it was last applied.\n"
 "\n"
 msgstr ""
-"Utilisation : nmcli device disconnect { ARGUMENTS | help }\n"
+"Syntaxe : nmcli device disconnect { ARGUMENTS | help }\n"
 "\n"
 "ARGUMENTS := <ifname>\n"
 "\n"
-"Déconnecter le périphérique.\n"
+"Déconnecte le périphérique.\n"
 "La commande déconnecte le périphérique et l'empêche d'activer "
 "automatiquement\n"
 "des connexions supplémentaires sans une intervention manuelle de "
 "l'utilisateur.\n"
 "\n"
 
-#: ../clients/cli/devices.c:364
-#, fuzzy, c-format
+#: ../clients/cli/devices.c:354
+#, c-format
 msgid ""
 "Usage: nmcli device disconnect { ARGUMENTS | help }\n"
 "\n"
@@ -3971,19 +4472,19 @@ msgid ""
 "further connections without user/manual intervention.\n"
 "\n"
 msgstr ""
-"Utilisation : nmcli device disconnect { ARGUMENTS | help }\n"
+"Syntaxe : nmcli device disconnect { ARGUMENTS | help }\n"
 "\n"
 "ARGUMENTS := <ifname>\n"
 "\n"
-"Déconnecter le périphérique.\n"
+"Déconnecte le périphérique.\n"
 "La commande déconnecte le périphérique et l'empêche d'activer "
 "automatiquement\n"
 "des connexions supplémentaires sans une intervention manuelle de "
 "l'utilisateur.\n"
 "\n"
 
-#: ../clients/cli/devices.c:376
-#, fuzzy, c-format
+#: ../clients/cli/devices.c:366
+#, c-format
 msgid ""
 "Usage: nmcli device delete { ARGUMENTS | help }\n"
 "\n"
@@ -3995,16 +4496,19 @@ msgid ""
 "command.\n"
 "\n"
 msgstr ""
-"Utilisation : nmcli device show { ARGUMENTS | help }\n"
+"Syntaxe : nmcli device show { ARGUMENTS | help }\n"
 "\n"
 "ARGUMENTS := [<ifname>]\n"
 "\n"
-"Afficher les détails du (ou des) périphérique(s).\n"
-"La commande répertorie les détails de tous les périphériques, ou d'un "
-"périphérique en particulier.\n"
+"Affiche les détails du (ou des) périphérique(s).\n"
+"La commande supprime les interfaces. Elle fonctionne uniquement pour les "
+"péréphériques\n"
+"(bonds, ponts, etc.). Les périphériques physiques ne peuvent pas être "
+"supprimés par la\n"
+"commande.\n"
 "\n"
 
-#: ../clients/cli/devices.c:389
+#: ../clients/cli/devices.c:379
 #, c-format
 msgid ""
 "Usage: nmcli device set { ARGUMENTS | help }\n"
@@ -4017,9 +4521,18 @@ msgid ""
 "Modify device properties.\n"
 "\n"
 msgstr ""
+"Syntaxe : nmcli device set { ARGUMENTS | help }\n"
+"\n"
+"ARGUMENTS := DEVICE { PROPERTY [ PROPERTY ... ] }\n"
+"DEVICE    := [ifname] <ifname> \n"
+"PROPERTY  := { autoconnect { yes | no } |\n"
+"             { managed { yes | no }\n"
+"\n"
+"Modifie les propriétés du périphérique.\n"
+"\n"
 
-#: ../clients/cli/devices.c:402
-#, fuzzy, c-format
+#: ../clients/cli/devices.c:392
+#, c-format
 msgid ""
 "Usage: nmcli device monitor { ARGUMENTS | help }\n"
 "\n"
@@ -4030,17 +4543,18 @@ msgid ""
 "Monitors all devices in case no interface is specified.\n"
 "\n"
 msgstr ""
-"Utilisation : nmcli device show { ARGUMENTS | help }\n"
+"Syntaxe : nmcli device show { ARGUMENTS | help }\n"
 "\n"
 "ARGUMENTS := [<ifname>]\n"
 "\n"
-"Afficher les détails du (ou des) périphérique(s).\n"
-"La commande répertorie les détails de tous les périphériques, ou d'un "
-"périphérique en particulier.\n"
+"Surveille l'activité du périphérique.\n"
+"Cette commande affiche une ligne quand les périphériques indiqués changent "
+"d'état.\n"
+"Surveille tous les périphériques si aucune interface n'est spécifiée.\n"
 "\n"
 
-#: ../clients/cli/devices.c:414
-#, fuzzy, c-format
+#: ../clients/cli/devices.c:404
+#, c-format
 msgid ""
 "Usage: nmcli device wifi { ARGUMENTS | help }\n"
 "\n"
@@ -4051,8 +4565,8 @@ msgid ""
 "List available Wi-Fi access points. The 'ifname' and 'bssid' options can be\n"
 "used to list APs for a particular interface, or with a specific BSSID.\n"
 "\n"
-"ARGUMENTS := connect <(B)SSID> [password <password>] [wep-key-type key|"
-"phrase] [ifname <ifname>]\n"
+"ARGUMENTS := connect <(B)SSID> [password <password>] [wep-key-type "
+"key|phrase] [ifname <ifname>]\n"
 "                    [bssid <BSSID>] [name <name>] [private yes|no] [hidden "
 "yes|no]\n"
 "\n"
@@ -4081,10 +4595,8 @@ msgid ""
 "\n"
 "ARGUMENTS := rescan [ifname <ifname>] [[ssid <SSID to scan>] ...]\n"
 "\n"
-"Request that NetworkManager immediately re-scan for available access "
-"points.\n"
-"NetworkManager scans Wi-Fi networks periodically, but in some cases it "
-"might\n"
+"Request that NetworkManager immediately re-scan for available access points.\n"
+"NetworkManager scans Wi-Fi networks periodically, but in some cases it might\n"
 "be useful to start scanning manually. 'ssid' allows scanning for a specific\n"
 "SSID, which is useful for APs with hidden SSIDs. More 'ssid' parameters can "
 "be\n"
@@ -4092,22 +4604,22 @@ msgid ""
 "use 'nmcli device wifi list' for that.\n"
 "\n"
 msgstr ""
-"Utilisation : nmcli device wifi { ARGUMENTS | help }\n"
+"Syntaxe : nmcli device wifi { ARGUMENTS | help }\n"
 "\n"
-"Effectuer des opérations sur des périphériques Wi-Fi.\n"
+"Effectue des opérations sur des périphériques Wi-Fi.\n"
 "\n"
 "ARGUMENTS := [list [ifname <ifname>] [bssid <BSSID>]]\n"
 "\n"
-"Répertorier les points d'accès Wi-Fi disponibles. Les options « ifname » et "
+"Répertorie les points d'accès Wi-Fi disponibles. Les options « ifname » et "
 "« bssid »\n"
 "peuvent être utilisées pour répertorier les points d'accès pour une "
 "interface en particulier, ou avec un BSSID spécifique.\n"
 "\n"
-"ARGUMENTS := connect <(B)SSID> [password <password>] [wep-key-type key|"
-"phrase] [ifname <ifname>]\n"
+"ARGUMENTS := connect <(B)SSID> [password <password>] [wep-key-type "
+"key|phrase] [ifname <ifname>]\n"
 "                    [bssid <BSSID>] [name <name>] [private yes|no]\n"
 "\n"
-"Connecter à un réseau Wi-Fi spécifié par SSID ou BSSID. La commande crée\n"
+"Connecte à un réseau Wi-Fi spécifié par SSID ou BSSID. La commande crée\n"
 "une nouvelle connexion, puis l'active sur un périphérique. Ceci correspond "
 "en ligne de commande\n"
 "à un clic sur SSID dans un client GUI. La commande crée toujours une "
@@ -4120,7 +4632,22 @@ msgstr ""
 "aussi\n"
 "supposé sur la configuration IP est obtenue via DHCP.\n"
 "\n"
-"ARGUMENTS := rescan [[ifname] <ifname>]\n"
+"ARGUMENTS := wifi hotspot [ifname <ifname>] [con-name <name>] [ssid <SSID>]\n"
+"                          [band a|bg] [channel <channel>] [password "
+"<password>]\n"
+"\n"
+"Crée un hotspot Wi-Fi. Utiliser 'connection down' or 'device disconnect'\n"
+"pour vous déconnecter du hotspot.\n"
+"Les paramètres du hotspot peuvent être influencés par les paramètres "
+"optionnels :\n"
+"ifname - périphérique Wi-Fi à utiliser\n"
+"con-name - nom du profil de connexion hotspot créé\n"
+"ssid - SSID du hotspot\n"
+"band - bande Wi-Fi à utiliser\n"
+"channel - canal Wi-Fi à utiliser\n"
+"password - mot de passe pour le hotspot\n"
+"\n"
+"ARGUMENTS := rescan [ifname <ifname>] [[ssid <SSID to scan>] ...]\n"
 "\n"
 "Requiert que NetworkManager effectue immédiatement un nouveau scan pour "
 "trouver les points d'accès disponibles.\n"
@@ -4131,336 +4658,329 @@ msgstr ""
 "veuillez utiliser « nmcli device wifi list » pour cela.\n"
 "\n"
 
-#: ../clients/cli/devices.c:461
-#, fuzzy, c-format
+#: ../clients/cli/devices.c:451
+#, c-format
 msgid ""
 "Usage: nmcli device lldp { ARGUMENTS | help }\n"
 "\n"
 "ARGUMENTS := [list [ifname <ifname>]]\n"
 "\n"
-"List neighboring devices discovered through LLDP. The 'ifname' option can "
-"be\n"
+"List neighboring devices discovered through LLDP. The 'ifname' option can be\n"
 "used to list neighbors for a particular interface.\n"
 "\n"
 msgstr ""
-"Utilisation : nmcli device wimax { ARGUMENTS | help }\n"
+"Syntaxe : nmcli device lldp { ARGUMENTS | help }\n"
 "\n"
-"Effectuer des opérations sur des périphériques WiMAX.\n"
-"\n"
-"ARGUMENTS := [list [ifname <ifname>] [nsp <name>]]\n"
+"ARGUMENTS := [list [ifname <ifname>]]\n"
 "\n"
-"Répertorier les NSP WiMAX disponibles. Les options « ifname » et « nsp » "
-"peuvent être utilisées pour\n"
-"répertorier les réseaux pour une interface en particulier, oou avec un NSP "
-"en particulier.\n"
+"Fait la liste de tous les périphériques à proximité via LLDP. L'option "
+"'ifname' peut être\n"
+"utilisée pour dresser cette liste pour une interface donnée.\n"
 "\n"
 
-#: ../clients/cli/devices.c:537 ../clients/cli/devices.c:1756
-#: ../clients/cli/devices.c:1765 ../clients/cli/devices.c:1956
-#: ../clients/cli/devices.c:2161 ../clients/cli/devices.c:2168
+#: ../clients/cli/devices.c:527 ../clients/cli/devices.c:1676
+#: ../clients/cli/devices.c:1685 ../clients/cli/devices.c:1879
+#: ../clients/cli/devices.c:2103 ../clients/cli/devices.c:2110
 #, c-format
 msgid "Error: No interface specified."
 msgstr "Erreur : aucune interface spécifiée."
 
-#: ../clients/cli/devices.c:557
+#: ../clients/cli/devices.c:547 ../clients/cli/devices.c:1899
 #, c-format
 msgid "Warning: argument '%s' is duplicated.\n"
-msgstr ""
+msgstr "Avertissement : l'argument « %s » est dupliqué.\n"
 
-#: ../clients/cli/devices.c:559
-#, fuzzy, c-format
+#: ../clients/cli/devices.c:549 ../clients/cli/devices.c:1901
+#, c-format
 msgid "Error: Device '%s' not found.\n"
-msgstr "Erreur : périphérique « %s » introuvable."
+msgstr "Erreur : périphérique « %s » introuvable.\n"
 
-#: ../clients/cli/devices.c:560
-#, fuzzy, c-format
+#: ../clients/cli/devices.c:550 ../clients/cli/devices.c:1902
+#, c-format
 msgid "Error: not all devices found."
-msgstr "Erreur : aucun périphérique Wi-Fi trouvé."
+msgstr "Erreur : les périphériques n'ont pas tous été trouvés."
 
-#: ../clients/cli/devices.c:660 ../clients/cli/devices.c:811
+#: ../clients/cli/devices.c:650 ../clients/cli/devices.c:801
 msgid "(none)"
 msgstr "(aucun)"
 
-#: ../clients/cli/devices.c:729
+#: ../clients/cli/devices.c:719
 #, c-format
 msgid "%u MHz"
 msgstr "%u MHz"
 
-#: ../clients/cli/devices.c:730
+#: ../clients/cli/devices.c:720
 #, c-format
 msgid "%u Mbit/s"
 msgstr "%u Mo/s"
 
-#: ../clients/cli/devices.c:745
+#: ../clients/cli/devices.c:735
 msgid "WPA1"
 msgstr "WPA1"
 
-#: ../clients/cli/devices.c:754
+#: ../clients/cli/devices.c:744
 msgid "802.1X"
 msgstr "802.1X"
 
-#: ../clients/cli/devices.c:770
+#: ../clients/cli/devices.c:760
 msgid "Ad-Hoc"
 msgstr "Ad-Hoc"
 
-#: ../clients/cli/devices.c:771
+#: ../clients/cli/devices.c:761
 msgid "Infra"
 msgstr "Infra"
 
-#: ../clients/cli/devices.c:772
+#: ../clients/cli/devices.c:762
 msgid "N/A"
 msgstr "N/A"
 
-#: ../clients/cli/devices.c:996
+#: ../clients/cli/devices.c:916
 msgid "Device details"
 msgstr "Détails de périphérique"
 
-#: ../clients/cli/devices.c:1008
+#: ../clients/cli/devices.c:928
 #, c-format
 msgid "Error: 'device show': %s"
 msgstr "Erreur : « device show » : %s"
 
-#: ../clients/cli/devices.c:1060 ../clients/cli/devices.c:1063
+#: ../clients/cli/devices.c:980 ../clients/cli/devices.c:983
 msgid "(unknown)"
 msgstr "(inconnu)"
 
-#: ../clients/cli/devices.c:1104
+#: ../clients/cli/devices.c:1024
 #, c-format
 msgid "%u Mb/s"
 msgstr "%u Mo/s"
 
-#: ../clients/cli/devices.c:1195
+#: ../clients/cli/devices.c:1115
 msgid "on"
 msgstr "marche"
 
-#: ../clients/cli/devices.c:1195
+#: ../clients/cli/devices.c:1115
 msgid "off"
 msgstr "arrêt"
 
-#: ../clients/cli/devices.c:1422
+#: ../clients/cli/devices.c:1342
 #, c-format
 msgid "Error: 'device status': %s"
 msgstr "Erreur : « device status » : %s"
 
 #. Add headers
-#: ../clients/cli/devices.c:1429
+#: ../clients/cli/devices.c:1349
 msgid "Status of devices"
 msgstr "État des périphériques"
 
-#: ../clients/cli/devices.c:1460 ../clients/cli/devices.c:3570
+#: ../clients/cli/devices.c:1380 ../clients/cli/devices.c:3509
 #, c-format
 msgid "Error: invalid extra argument '%s'."
 msgstr "Erreur : argument supplémentaire « %s » non valide."
 
-#: ../clients/cli/devices.c:1477 ../clients/cli/devices.c:1787
-#: ../clients/cli/devices.c:2184 ../clients/cli/devices.c:2454
-#: ../clients/cli/devices.c:3609
+#: ../clients/cli/devices.c:1397 ../clients/cli/devices.c:1707
+#: ../clients/cli/devices.c:2126 ../clients/cli/devices.c:2396
+#: ../clients/cli/devices.c:3548
 #, c-format
 msgid "Error: Device '%s' not found."
 msgstr "Erreur : périphérique « %s » introuvable."
 
-#: ../clients/cli/devices.c:1555
-#, fuzzy, c-format
+#: ../clients/cli/devices.c:1475
+#, c-format
 msgid "Device '%s' successfully activated with '%s'.\n"
-msgstr "Opération réussie : périphérique « %s » correctement activé."
+msgstr "Périphérique « %s » activé avec « %s ».\n"
 
-#: ../clients/cli/devices.c:1561
-#, fuzzy, c-format
+#: ../clients/cli/devices.c:1481
+#, c-format
 msgid "Error: Connection activation failed: (%d) %s.\n"
-msgstr "Erreur : échec de l'activation de la connexion : (%d) %s."
+msgstr "Erreur : échec de l'activation de la connexion : (%d) %s.\n"
 
-#: ../clients/cli/devices.c:1597
-#, fuzzy, c-format
+#: ../clients/cli/devices.c:1517
+#, c-format
 msgid "Error: Failed to setup a Wi-Fi hotspot: %s"
-msgstr "Erreur : échec du paramétrage du nom d'hôte : (%d) %s"
+msgstr "Erreur : échec lors de l'installation du Wi-Fi Hotspot : %s"
 
-#: ../clients/cli/devices.c:1600
-#, fuzzy, c-format
+#: ../clients/cli/devices.c:1520
+#, c-format
 msgid "Error: Failed to add/activate new connection: %s"
 msgstr ""
-"Erreur : échec de l'ajout ou de l'activation de la nouvelle connexion : (%d) "
-"%s"
+"Erreur : échec de l'ajout ou de l'activation de la nouvelle connexion : %s"
 
-#: ../clients/cli/devices.c:1610
-#, fuzzy, c-format
+#: ../clients/cli/devices.c:1530
+#, c-format
 msgid "Error: Failed to setup a Wi-Fi hotspot"
-msgstr "Erreur : échec du paramétrage du nom d'hôte : (%d) %s"
+msgstr "Erreur : échec lors de l'installation du Wi-Fi Hotspot"
 
-#: ../clients/cli/devices.c:1612
+#: ../clients/cli/devices.c:1532
 #, c-format
 msgid "Error: Failed to add/activate new connection: Unknown error"
 msgstr ""
 "Erreur : échec de l'ajout ou de l'activation de la nouvelle connexion : "
 "Erreur inconnue"
 
-#: ../clients/cli/devices.c:1624
+#: ../clients/cli/devices.c:1544
 #, c-format
 msgid "Connection with UUID '%s' created and activated on device '%s'\n"
 msgstr ""
 "Connexion avec l'UUID « %s » créé et activé sur le périphérique « %s »\n"
 
-#: ../clients/cli/devices.c:1627
-#, fuzzy, c-format
+#: ../clients/cli/devices.c:1547
+#, c-format
 msgid "Hotspot '%s' activated on device '%s'\n"
-msgstr ""
-"Connexion avec l'UUID « %s » créé et activé sur le périphérique « %s »\n"
+msgstr "Hotspot « %s » activé sur le périphérique « %s »\n"
 
-#: ../clients/cli/devices.c:1691
+#: ../clients/cli/devices.c:1611
 #, c-format
 msgid "Error: Device activation failed: %s"
 msgstr "Erreur : l'activation du périphérique a échoué : %s"
 
-#: ../clients/cli/devices.c:1700
-#, fuzzy, c-format
+#: ../clients/cli/devices.c:1620
+#, c-format
 msgid "Error: Device activation failed: device was disconnected"
-msgstr "Erreur : l'activation du périphérique a échoué : %s"
+msgstr ""
+"Erreur : l'activation du périphérique a échoué : le périphérique a été "
+"disconnecté"
 
-#: ../clients/cli/devices.c:1715
+#: ../clients/cli/devices.c:1635
 #, c-format
 msgid "Device '%s' has been connected.\n"
 msgstr "Le périphérique « %s » a été connecté.\n"
 
-#: ../clients/cli/devices.c:1771
+#: ../clients/cli/devices.c:1691
 #, c-format
 msgid "Error: extra argument not allowed: '%s'."
 msgstr "Erreur : argument supplémentaire non autorisé : « %s »."
 
-#: ../clients/cli/devices.c:1856 ../clients/cli/devices.c:1871
-#: ../clients/cli/devices.c:2022
-#, fuzzy, c-format
+#: ../clients/cli/devices.c:1776 ../clients/cli/devices.c:1791
+#: ../clients/cli/devices.c:1964
+#, c-format
 msgid "Device '%s' successfully disconnected.\n"
-msgstr "Opération réussie : périphérique « %s » correctement déconnecté."
+msgstr "Périphérique « %s » déconnecté.\n"
 
-#: ../clients/cli/devices.c:1859
-#, fuzzy, c-format
+#: ../clients/cli/devices.c:1779
+#, c-format
 msgid "Device '%s' successfully removed.\n"
-msgstr "Opération réussie : périphérique « %s » correctement activé."
+msgstr "Périphérique « %s »supprimé.\n"
 
-#: ../clients/cli/devices.c:1918
-#, fuzzy, c-format
-msgid "Error: Reapplying connection to device '%s' (%s) failed: %s"
-msgstr "Erreur : échec de la déconnexion du périphérique « %s » (%s) : %s"
+#: ../clients/cli/devices.c:1838
+#, c-format
+msgid "Error: not all connections reapplied."
+msgstr "Erreur : les connexions n'ont pas toutes été réappliquées."
 
-#: ../clients/cli/devices.c:1928
-#, fuzzy, c-format
-msgid "Connection successfully reapplied to device '%s'.\n"
-msgstr "Connexion activée avec succès (chemin D-Bus actif : %s)\n"
+#: ../clients/cli/devices.c:1839
+#, c-format
+msgid "Error: Reapplying connection to device '%s' (%s) failed: %s\n"
+msgstr "Erreur : échec de reconnexion du périphérique « %s » (%s) : %s\n"
 
-#: ../clients/cli/devices.c:1965
-#, fuzzy, c-format
-msgid "Error: unsupported argument '%s'."
-msgstr "Erreur : argument « %s » inattendu"
+#: ../clients/cli/devices.c:1849
+#, c-format
+msgid "Connection successfully reapplied to device '%s'.\n"
+msgstr "Connexion au périphérique réactivée : %s)\n"
 
-#: ../clients/cli/devices.c:1979
-#, fuzzy, c-format
-msgid "Error: device '%s' not found."
-msgstr "Erreur : périphérique « %s » introuvable."
+#: ../clients/cli/devices.c:1912
+#, c-format
+msgid "Error: no valid device provided."
+msgstr "Erreur : aucun périphérique valide trouvé."
 
-#: ../clients/cli/devices.c:2007
-#, fuzzy, c-format
+#: ../clients/cli/devices.c:1949
+#, c-format
 msgid "Error: not all devices disconnected."
-msgstr "Erreur : aucun périphérique Wi-Fi trouvé."
+msgstr "Erreur : tous les périphériques ne sont pas déconnectés."
 
-#: ../clients/cli/devices.c:2008
-#, fuzzy, c-format
+#: ../clients/cli/devices.c:1950
+#, c-format
 msgid "Error: Device '%s' (%s) disconnecting failed: %s\n"
-msgstr "Erreur : échec de la déconnexion du périphérique « %s » (%s) : %s"
+msgstr "Erreur : échec de la déconnexion du périphérique « %s » (%s) : %s\n"
 
-#: ../clients/cli/devices.c:2083
-#, fuzzy, c-format
+#: ../clients/cli/devices.c:2025
+#, c-format
 msgid "Error: not all devices deleted."
-msgstr "Erreur : aucun périphérique Wi-Fi trouvé."
+msgstr "Erreur : les périphériques n'ont pas tous été supprimés."
 
-#: ../clients/cli/devices.c:2084
-#, fuzzy, c-format
+#: ../clients/cli/devices.c:2026
+#, c-format
 msgid "Error: Device '%s' (%s) deletion failed: %s\n"
-msgstr "Erreur : échec de la déconnexion du périphérique « %s » (%s) : %s"
+msgstr "Erreur : la suppression du périphérique « %s » (%s) a échoué : %s\n"
 
-#: ../clients/cli/devices.c:2190
-#, fuzzy, c-format
+#: ../clients/cli/devices.c:2132
+#, c-format
 msgid "Error: No property specified."
-msgstr "Erreur : aucune connexion spécifiée."
+msgstr "Erreur : aucune propriété n'a été spécifiée."
 
-#: ../clients/cli/devices.c:2202 ../clients/cli/devices.c:2217
+#: ../clients/cli/devices.c:2144 ../clients/cli/devices.c:2159
 #, c-format
 msgid "Error: '%s' argument is missing."
-msgstr "Erreur&nbsp;: L'argument '%s' est manquant."
+msgstr "Erreur&nbsp;: l'argument « %s » est manquant."
 
-#: ../clients/cli/devices.c:2207
-#, fuzzy, c-format
+#: ../clients/cli/devices.c:2149
+#, c-format
 msgid "Error: 'managed': %s."
-msgstr "Erreur : « mode » : %s."
+msgstr "Erreur: 'géré': %s."
 
-#: ../clients/cli/devices.c:2222
+#: ../clients/cli/devices.c:2174
 #, c-format
-msgid "Error: 'autoconnect': %s."
-msgstr "Erreur : « autoconnect » : %s."
-
-#: ../clients/cli/devices.c:2232
-#, fuzzy, c-format
 msgid "Error: property '%s' is not known."
-msgstr "Erreur : propriété « %s » non valide : %s."
+msgstr "Erreur : propriété « %s » inconnue."
 
-#: ../clients/cli/devices.c:2278
-#, fuzzy, c-format
+#: ../clients/cli/devices.c:2220
+#, c-format
 msgid "%s: using connection '%s'\n"
-msgstr "Aucune connexion « %s »"
+msgstr "%s: utilisation de la connection « %s »\n"
 
-#: ../clients/cli/devices.c:2304
+#: ../clients/cli/devices.c:2246
 #, c-format
 msgid "%s: device created\n"
-msgstr ""
+msgstr "%s: périphérique créé\n"
 
 # auto translated by TM merge from project: NetworkManager, version: 0.9.8.2, DocId: NetworkManager
-#: ../clients/cli/devices.c:2311
-#, fuzzy, c-format
+#: ../clients/cli/devices.c:2253
+#, c-format
 msgid "%s: device removed\n"
-msgstr "Le périphérique a été supprimé"
+msgstr "%s: périphérique supprimé\n"
 
-#: ../clients/cli/devices.c:2397
+#: ../clients/cli/devices.c:2339
 msgid "Wi-Fi scan list"
 msgstr "Liste de balayage Wi-Fi"
 
-#: ../clients/cli/devices.c:2435
+#: ../clients/cli/devices.c:2377
 #, c-format
 msgid "Error: 'device wifi': %s"
 msgstr "Erreur : « device wifi » : %s"
 
-#: ../clients/cli/devices.c:2477 ../clients/cli/devices.c:2561
+#: ../clients/cli/devices.c:2419 ../clients/cli/devices.c:2500
 #, c-format
 msgid "Error: Access point with bssid '%s' not found."
 msgstr "Erreur : point d'accès avec bssid « %s » introuvable."
 
-#: ../clients/cli/devices.c:2504
-#, fuzzy, c-format
+#: ../clients/cli/devices.c:2446
+#, c-format
 msgid ""
 "Error: Device '%s' was not recognized as a Wi-Fi device, check "
 "NetworkManager Wi-Fi plugin."
-msgstr "Erreur : le périphérique « %s » n'est pas un périphérique Wi-Fi."
+msgstr ""
+"Erreur : le périphérique « %s » n'est pas un périphérique Wi-Fi. Vérifier le "
+"greffon Wi-Fi du NetworkManager."
 
-#: ../clients/cli/devices.c:2508 ../clients/cli/devices.c:2841
-#: ../clients/cli/devices.c:3261 ../clients/cli/devices.c:3410
+#: ../clients/cli/devices.c:2448 ../clients/cli/devices.c:2780
+#: ../clients/cli/devices.c:3200 ../clients/cli/devices.c:3349
 #, c-format
 msgid "Error: Device '%s' is not a Wi-Fi device."
 msgstr "Erreur : le périphérique « %s » n'est pas un périphérique Wi-Fi."
 
-#: ../clients/cli/devices.c:2721
+#: ../clients/cli/devices.c:2660
 msgid "SSID or BSSID: "
 msgstr "SSID ou BSSID : "
 
-#: ../clients/cli/devices.c:2726
+#: ../clients/cli/devices.c:2665
 #, c-format
 msgid "Error: SSID or BSSID are missing."
 msgstr "Erreur : SSID ou BSSID sont manquants."
 
-#: ../clients/cli/devices.c:2750
+#: ../clients/cli/devices.c:2689
 #, c-format
 msgid "Error: bssid argument value '%s' is not a valid BSSID."
 msgstr ""
 "Erreur : la valeur de l'argument bssid « %s » n'est pas une valeur BSSID "
 "valide."
 
-#: ../clients/cli/devices.c:2774
+#: ../clients/cli/devices.c:2713
 #, c-format
 msgid ""
 "Error: wep-key-type argument value '%s' is invalid, use 'key' or 'phrase'."
@@ -4468,209 +4988,213 @@ msgstr ""
 "Erreur : la valeur de l'argument wep-key-type « %s » est non valide, "
 "veuillez utiliser « key » ou « phrase »."
 
-#: ../clients/cli/devices.c:2794 ../clients/cli/devices.c:2807
+#: ../clients/cli/devices.c:2733 ../clients/cli/devices.c:2746
 #, c-format
 msgid "Error: %s: %s."
 msgstr "Erreur : %s : %s."
 
-#: ../clients/cli/devices.c:2822
+#: ../clients/cli/devices.c:2761
 #, c-format
 msgid "Error: BSSID to connect to (%s) differs from bssid argument (%s)."
 msgstr ""
 "Erreur : le BSSID devant se connecter à (%s) diffère de l'argument bssid "
 "(%s)."
 
-#: ../clients/cli/devices.c:2828
+#: ../clients/cli/devices.c:2767
 #, c-format
 msgid "Error: Parameter '%s' is neither SSID nor BSSID."
 msgstr "Erreur : le paramètre « %s » est ni un SSID, ni un BSSID."
 
-#: ../clients/cli/devices.c:2843 ../clients/cli/devices.c:3263
-#: ../clients/cli/devices.c:3412
+#: ../clients/cli/devices.c:2782 ../clients/cli/devices.c:3202
+#: ../clients/cli/devices.c:3351
 #, c-format
 msgid "Error: No Wi-Fi device found."
 msgstr "Erreur : aucun périphérique Wi-Fi trouvé."
 
-#: ../clients/cli/devices.c:2863
-#, fuzzy, c-format
+#: ../clients/cli/devices.c:2802
+#, c-format
 msgid "Error: Failed to scan hidden SSID: %s."
-msgstr "Erreur : échec de la modification de %s.%s : %s."
+msgstr "Erreur : impossible de scanner le SSID caché : %s."
 
-#: ../clients/cli/devices.c:2888
+#: ../clients/cli/devices.c:2827
 #, c-format
 msgid "Error: No network with SSID '%s' found."
 msgstr "Erreur : aucun réseau avec le SSID « %s » trouvé."
 
-#: ../clients/cli/devices.c:2890
+#: ../clients/cli/devices.c:2829
 #, c-format
 msgid "Error: No access point with BSSID '%s' found."
 msgstr "Erreur : aucun point d'accès avec le BSSID « %s » trouvé."
 
-#: ../clients/cli/devices.c:2932
+#: ../clients/cli/devices.c:2871
 #, c-format
 msgid ""
 "Warning: '%s' should be SSID for hidden APs; but it looks like a BSSID.\n"
 msgstr ""
+"Attention : « %s » doit correspondre à un SSID pour les points d'accès "
+"cachés ; mais il correspond à un BSSID.\n"
 
-#: ../clients/cli/devices.c:2946
+#: ../clients/cli/devices.c:2885
 msgid "Password: "
 msgstr "Mot de passe :"
 
-#: ../clients/cli/devices.c:3095
-#, fuzzy, c-format
+#: ../clients/cli/devices.c:3034
+#, c-format
 msgid "'%s' is not valid WPA PSK"
-msgstr "« %s » n'est pas un PSK valide"
+msgstr "« %s » n'est pas un WPA PSK valide"
 
-#: ../clients/cli/devices.c:3112
-#, fuzzy, c-format
+#: ../clients/cli/devices.c:3051
+#, c-format
 msgid "'%s' is not valid WEP key (it should be 5 or 13 ASCII chars)"
-msgstr "la longueur de « %s » n'est pas valide (devrait faire 5 ou 6 chiffres)"
+msgstr ""
+"« %s » n'est pas une clé WEP valide (devrait faire 5 ou 13 caractères ASCI)"
 
-#: ../clients/cli/devices.c:3128
+#: ../clients/cli/devices.c:3067
 #, c-format
 msgid "Hotspot password: %s\n"
-msgstr ""
+msgstr "Mot de passe hotspot : %s\n"
 
-#: ../clients/cli/devices.c:3186
-#, fuzzy, c-format
+#: ../clients/cli/devices.c:3125
+#, c-format
 msgid "Error: ssid is too long."
-msgstr "Erreur : « ssid » est requis."
+msgstr "Erreur : « ssid » est trop long."
 
-#: ../clients/cli/devices.c:3198
-#, fuzzy, c-format
+#: ../clients/cli/devices.c:3137
+#, c-format
 msgid "Error: band argument value '%s' is invalid; use 'a' or 'bg'."
 msgstr ""
-"Erreur : la valeur de l'argument wep-key-type « %s » est non valide, "
-"veuillez utiliser « key » ou « phrase »."
+"Erreur : la valeur de l'argument de bande « %s » est non valide, veuillez "
+"utiliser « a » ou « bg »."
 
-#: ../clients/cli/devices.c:3222
-#, fuzzy, c-format
+#: ../clients/cli/devices.c:3161
+#, c-format
 msgid "Error: Unknown parameter %s."
-msgstr "Paramètre inconnu : %s\n"
+msgstr "Erreur : paramètre inconnu : %s."
 
-#: ../clients/cli/devices.c:3241
-#, fuzzy, c-format
+#: ../clients/cli/devices.c:3180
+#, c-format
 msgid "Error: channel requires band too."
-msgstr "Erreur : « apn » est requis."
+msgstr "Erreur : le canal requiert une bande également."
 
-#: ../clients/cli/devices.c:3247
-#, fuzzy, c-format
+#: ../clients/cli/devices.c:3186
+#, c-format
 msgid "Error: channel '%s' not valid for band '%s'."
-msgstr "Erreur : « channel » : « %s » est non valide ; utilisez <1-13>."
+msgstr "Erreur : « canal» : « %s » est non valide pour la bande « %s »."
 
-#: ../clients/cli/devices.c:3275
-#, fuzzy, c-format
+#: ../clients/cli/devices.c:3214
+#, c-format
 msgid "Error: Device '%s' supports neither AP nor Ad-Hoc mode."
-msgstr "Erreur : le périphérique « %s » n'est pas un périphérique Wi-Fi."
+msgstr ""
+"Erreur : le périphérique « %s » ne supporte ni les modes AP ou Ad-Hoc."
 
-#: ../clients/cli/devices.c:3310
-#, fuzzy, c-format
+#: ../clients/cli/devices.c:3249
+#, c-format
 msgid "Error: Invalid 'password': %s."
-msgstr "Erreur : propriété « %s » non valide : %s."
+msgstr "Erreur : le mot de passe est non valide : « %s »"
 
-#: ../clients/cli/devices.c:3379
-#, fuzzy, c-format
+#: ../clients/cli/devices.c:3318
+#, c-format
 msgid "Error: '%s' cannot repeat."
-msgstr "Erreur : le paramètre « %s » n'est pas présent\n"
+msgstr "Erreur : le paramètre « %s » ne peut pas être répété."
 
-#: ../clients/cli/devices.c:3460
+#: ../clients/cli/devices.c:3399
 #, c-format
 msgid "Error: 'device wifi' command '%s' is not valid."
 msgstr "Erreur : commande « device wifi » « %s » non valide."
 
 #. Main header name
-#: ../clients/cli/devices.c:3486
+#: ../clients/cli/devices.c:3425
 msgid "Device LLDP neighbors"
-msgstr ""
+msgstr "Voisins du périphérique LLDP"
 
-#: ../clients/cli/devices.c:3589
-#, fuzzy, c-format
+#: ../clients/cli/devices.c:3528
+#, c-format
 msgid "Error: 'device lldp list': %s"
-msgstr "Erreur : « device status » : %s"
+msgstr "Erreur : « liste des périphériques lldp » : %s"
 
-#: ../clients/cli/devices.c:3636
-#, fuzzy, c-format
+#: ../clients/cli/devices.c:3575
+#, c-format
 msgid "Error: 'device lldp' command '%s' is not valid."
 msgstr "Erreur : commande « device wifi » « %s » non valide."
 
-#: ../clients/cli/devices.c:3825
+#: ../clients/cli/devices.c:3770
 #, c-format
 msgid "Error: 'dev' command '%s' is not valid."
 msgstr "Erreur : commande « dev » « %s » non valide."
 
-#: ../clients/cli/general.c:35
+#: ../clients/cli/general.c:34
 msgid "RUNNING"
 msgstr "ÉTAT FONCT."
 
 #. 0
-#: ../clients/cli/general.c:36
+#: ../clients/cli/general.c:35
 msgid "VERSION"
 msgstr "VERSION"
 
 #. 2
-#: ../clients/cli/general.c:38
+#: ../clients/cli/general.c:37
 msgid "STARTUP"
 msgstr "DÉMARRAGE"
 
 #. 3
-#: ../clients/cli/general.c:39
+#: ../clients/cli/general.c:38
 msgid "CONNECTIVITY"
 msgstr "CONNECTIVITÉ"
 
 #. 4
-#: ../clients/cli/general.c:40
+#: ../clients/cli/general.c:39
 msgid "NETWORKING"
 msgstr "RÉSEAU"
 
 #. 5
-#: ../clients/cli/general.c:41
+#: ../clients/cli/general.c:40
 msgid "WIFI-HW"
 msgstr "WIFI-HW"
 
 #. 6
-#: ../clients/cli/general.c:42
+#: ../clients/cli/general.c:41
 msgid "WIFI"
 msgstr "WIFI"
 
 #. 7
-#: ../clients/cli/general.c:43
+#: ../clients/cli/general.c:42
 msgid "WWAN-HW"
 msgstr "WWAN-HW"
 
 #. 8
-#: ../clients/cli/general.c:44
+#: ../clients/cli/general.c:43
 msgid "WWAN"
 msgstr "WWAN"
 
 #. 9
-#: ../clients/cli/general.c:45
+#: ../clients/cli/general.c:44
 msgid "WIMAX-HW"
 msgstr "WIMAX-HW"
 
 #. 10
-#: ../clients/cli/general.c:46
+#: ../clients/cli/general.c:45
 msgid "WIMAX"
 msgstr "WIMAX"
 
-#: ../clients/cli/general.c:62
+#: ../clients/cli/general.c:61
 msgid "PERMISSION"
 msgstr "PERMISSION"
 
 #. 0
-#: ../clients/cli/general.c:63
+#: ../clients/cli/general.c:62
 msgid "VALUE"
 msgstr "VALEUR"
 
-#: ../clients/cli/general.c:71
+#: ../clients/cli/general.c:70
 msgid "LEVEL"
 msgstr "NIVEAU"
 
 #. 0
-#: ../clients/cli/general.c:72
+#: ../clients/cli/general.c:71
 msgid "DOMAINS"
 msgstr "DOMAINES"
 
-#: ../clients/cli/general.c:86
+#: ../clients/cli/general.c:85
 #, c-format
 msgid ""
 "Usage: nmcli general { COMMAND | help }\n"
@@ -4686,7 +5210,7 @@ msgid ""
 "  logging [level <log level>] [domains <log domains>]\n"
 "\n"
 msgstr ""
-"Utilisation : nmcli general { COMMAND | help }\n"
+"Syntaxe : nmcli general { COMMAND | help }\n"
 "\n"
 "COMMAND := { status | hostname | permissions | logging }\n"
 "\n"
@@ -4699,7 +5223,7 @@ msgstr ""
 "  logging [level <log level>] [domains <log domains>]\n"
 "\n"
 
-#: ../clients/cli/general.c:97
+#: ../clients/cli/general.c:96
 #, c-format
 msgid ""
 "Usage: nmcli general status { help }\n"
@@ -4709,14 +5233,14 @@ msgid ""
 "status'\n"
 "\n"
 msgstr ""
-"Utilisation : nmcli general status { help }\n"
+"Syntaxe : nmcli general status { help }\n"
 "\n"
-"Afficher le statut général de NetworkManager.\n"
+"Affiche le statut général de NetworkManager.\n"
 "« status » est l'action par défaut, ce qui signifie que « nmcli gen » "
 "appelle « nmcli gen status »\n"
 "\n"
 
-#: ../clients/cli/general.c:106
+#: ../clients/cli/general.c:105
 #, c-format
 msgid ""
 "Usage: nmcli general hostname { ARGUMENTS | help }\n"
@@ -4725,22 +5249,22 @@ msgid ""
 "\n"
 "Get or change persistent system hostname.\n"
 "With no arguments, this prints currently configured hostname. When you pass\n"
-"a hostname, NetworkManager will set it as the new persistent system "
-"hostname.\n"
+"a hostname, NetworkManager will set it as the new persistent system hostname."
+"\n"
 "\n"
 msgstr ""
-"Utilisation : nmcli general hostname { ARGUMENTS | help }\n"
+"Syntaxe : nmcli general hostname { ARGUMENTS | help }\n"
 "\n"
 "ARGUMENTS := [<hostname>]\n"
 "\n"
-"Obtenir ou modifier le nom d'hôte persistant du système.\n"
+"Obtient ou modifie le nom d'hôte persistant du système.\n"
 "Sans arguments, ceci imprime le nom d'hôte actuellement configuré. Lorsque "
 "vous passez\n"
 "un nom d'hôte, NetworkManager va le définir comme étant le nouveau nom "
 "d'hôte persistant du système.\n"
 "\n"
 
-#: ../clients/cli/general.c:118
+#: ../clients/cli/general.c:117
 #, c-format
 msgid ""
 "Usage: nmcli general permissions { help }\n"
@@ -4748,12 +5272,12 @@ msgid ""
 "Show caller permissions for authenticated operations.\n"
 "\n"
 msgstr ""
-"Utilisation : nmcli general permissions { help }\n"
+"Syntaxe : nmcli general permissions { help }\n"
 "\n"
-"Afficher les permissions de l'appelant pour les opérations authentifiées.\n"
+"Affiche les permissions de l'appelant pour les opérations authentifiées.\n"
 "\n"
 
-#: ../clients/cli/general.c:126
+#: ../clients/cli/general.c:125
 #, c-format
 msgid ""
 "Usage: nmcli general logging { ARGUMENTS | help }\n"
@@ -4768,12 +5292,11 @@ msgid ""
 "for the list of possible logging domains.\n"
 "\n"
 msgstr ""
-"Utilisation : nmcli general logging { ARGUMENTS | help }\n"
+"Syntaxe : nmcli general logging { ARGUMENTS | help }\n"
 "\n"
 "ARGUMENTS := [level <log level>] [domains <log domains>]\n"
 "\n"
-"Obtenir ou modifier le niveau et les domaines de connexion de "
-"NetworkManager.\n"
+"Obtient ou modifie le niveau et les domaines de connexion de NetworkManager.\n"
 "Sans arguments, le niveau et les domaines de connexion sont affichés. Pour "
 "modifier\n"
 "l'état de connexion, fournissez le niveau et/ou le domaine. Veuillez "
@@ -4781,7 +5304,7 @@ msgstr ""
 "pour obtenir la liste des domaines de connexion possibles.\n"
 "\n"
 
-#: ../clients/cli/general.c:139
+#: ../clients/cli/general.c:138
 #, c-format
 msgid ""
 "Usage: nmcli networking { COMMAND | help }\n"
@@ -4795,7 +5318,7 @@ msgid ""
 "  connectivity [check]\n"
 "\n"
 msgstr ""
-"Utilisation : nmcli networking { COMMAND | help }\n"
+"Syntaxe : nmcli networking { COMMAND | help }\n"
 "\n"
 "COMMAND := { [ on | off | connectivity ] }\n"
 "\n"
@@ -4806,33 +5329,30 @@ msgstr ""
 "  connectivity [check]\n"
 "\n"
 
-#: ../clients/cli/general.c:149
+#: ../clients/cli/general.c:148
 #, c-format
-msgid ""
-"Usage: nmcli networking on { help }\n"
+msgid "Usage: nmcli networking on { help }\n"
 "\n"
 "Switch networking on.\n"
 "\n"
-msgstr ""
-"Utilisation : nmcli networking on { help }\n"
+msgstr "Syntaxe : nmcli networking on { help }\n"
 "\n"
-"Activer la mise en réseau.\n"
+"Active la mise en réseau.\n"
 "\n"
 
-#: ../clients/cli/general.c:157
+#: ../clients/cli/general.c:156
 #, c-format
-msgid ""
-"Usage: nmcli networking off { help }\n"
+msgid "Usage: nmcli networking off { help }\n"
 "\n"
 "Switch networking off.\n"
 "\n"
 msgstr ""
-"Utilisation : nmcli networking off { help }\n"
+"Syntaxe : nmcli networking off { help }\n"
 "\n"
-"Désactiver la mise en réseau.\n"
+"Désactive la mise en réseau.\n"
 "\n"
 
-#: ../clients/cli/general.c:165
+#: ../clients/cli/general.c:164
 #, c-format
 msgid ""
 "Usage: nmcli networking connectivity { ARGUMENTS | help }\n"
@@ -4840,21 +5360,21 @@ msgid ""
 "ARGUMENTS := [check]\n"
 "\n"
 "Get network connectivity state.\n"
-"The optional 'check' argument makes NetworkManager re-check the "
-"connectivity.\n"
+"The optional 'check' argument makes NetworkManager re-check the connectivity."
+"\n"
 "\n"
 msgstr ""
-"Utilisation : nmcli networking connectivity { ARGUMENTS | help }\n"
+"Syntaxe : nmcli networking connectivity { ARGUMENTS | help }\n"
 "\n"
 "ARGUMENTS := [check]\n"
 "\n"
-"Obtenir l'état de connectivité du réseau.\n"
+"Obtient l'état de connectivité du réseau.\n"
 "L'argument optionnel « check » fait que NetworkManager vérifie à nouveau la "
 "connectivité.\n"
 "\n"
 
-#: ../clients/cli/general.c:177
-#, fuzzy, c-format
+#: ../clients/cli/general.c:176
+#, c-format
 msgid ""
 "Usage: nmcli radio { COMMAND | help }\n"
 "\n"
@@ -4863,18 +5383,14 @@ msgid ""
 "  all | wifi | wwan [ on | off ]\n"
 "\n"
 msgstr ""
-"Utilisation : nmcli radio { COMMAND | help }\n"
-"\n"
-"COMMAND := { all | wifi | wwan | wimax }\n"
-"\n"
-"  all | wifi | wwan | wimax [ on | off ]\n"
+"Syntaxe : nmcli radio { COMMAND | help }\n"
 "\n"
 "COMMAND := { all | wifi | wwan }\n"
 "\n"
-"  all | wifi | wwan [ on | off ]\n"
+"  all | wifi | wwan | wimax [ on | off ]\n"
 "\n"
 
-#: ../clients/cli/general.c:186
+#: ../clients/cli/general.c:185
 #, c-format
 msgid ""
 "Usage: nmcli radio all { ARGUMENTS | help }\n"
@@ -4888,11 +5404,11 @@ msgstr ""
 "\n"
 "ARGUMENTS := [on | off]\n"
 "\n"
-"Obtenir le statut de tous les interrupteurs radios, les activer ou "
+"Obtient le statut de tous les interrupteurs radios, les activer ou "
 "désactiver.\n"
 "\n"
 
-#: ../clients/cli/general.c:196
+#: ../clients/cli/general.c:195
 #, c-format
 msgid ""
 "Usage: nmcli radio wifi { ARGUMENTS | help }\n"
@@ -4902,15 +5418,14 @@ msgid ""
 "Get status of Wi-Fi radio switch, or turn it on/off.\n"
 "\n"
 msgstr ""
-"Utilisation : nmcli radio wifi { ARGUMENTS | help }\n"
+"Syntaxe : nmcli radio wifi { ARGUMENTS | help }\n"
 "\n"
 "ARGUMENTS := [on | off]\n"
 "\n"
-"Obtenir le statut de l'interrupteur radio Wi-Fi, l'activer ou le "
-"désactiver.\n"
+"Obtient le statut de l'interrupteur radio Wi-Fi, l'activer ou le désactiver.\n"
 "\n"
 
-#: ../clients/cli/general.c:206
+#: ../clients/cli/general.c:205
 #, c-format
 msgid ""
 "Usage: nmcli radio wwan { ARGUMENTS | help }\n"
@@ -4920,15 +5435,15 @@ msgid ""
 "Get status of mobile broadband radio switch, or turn it on/off.\n"
 "\n"
 msgstr ""
-"Utilisation : nmcli radio wwan { ARGUMENTS | help }\n"
+"Syntaxe : nmcli radio wwan { ARGUMENTS | help }\n"
 "\n"
 "ARGUMENTS := [on | off]\n"
 "\n"
-"Obtenir le statut de l'interrupteur radio du haut débit mobile, l'activer ou "
+"Obtient le statut de l'interrupteur radio du haut débit mobile, l'activer ou "
 "le désactiver.\n"
 "\n"
 
-#: ../clients/cli/general.c:216
+#: ../clients/cli/general.c:215
 #, c-format
 msgid ""
 "Usage: nmcli monitor\n"
@@ -4937,205 +5452,207 @@ msgid ""
 "Prints a line whenever a change occurs in NetworkManager\n"
 "\n"
 msgstr ""
+"Syntaxe : nmcli monitor\n"
+"\n"
+"Surveille les changements du NetworkManager.\n"
+"Imprime une ligne à chaque changement du NetworkManager\n"
+"\n"
 
-#: ../clients/cli/general.c:234
+#: ../clients/cli/general.c:233
 msgid "asleep"
 msgstr "veille"
 
-#: ../clients/cli/general.c:236
+#: ../clients/cli/general.c:235
 msgid "connecting"
 msgstr "connexion"
 
-#: ../clients/cli/general.c:238
+#: ../clients/cli/general.c:237
 msgid "connected (local only)"
 msgstr "connecté (local seulement)"
 
-#: ../clients/cli/general.c:240
+#: ../clients/cli/general.c:239
 msgid "connected (site only)"
 msgstr "connecté (site seulement)"
 
-#: ../clients/cli/general.c:244
+#: ../clients/cli/general.c:243
 msgid "disconnecting"
 msgstr "déconnexion"
 
-#: ../clients/cli/general.c:280
+#: ../clients/cli/general.c:279
 msgid "portal"
 msgstr "portail"
 
-#: ../clients/cli/general.c:282
+#: ../clients/cli/general.c:281
 msgid "limited"
 msgstr "limité"
 
-#: ../clients/cli/general.c:284
+#: ../clients/cli/general.c:283
 msgid "full"
 msgstr "plein"
 
-#: ../clients/cli/general.c:335
+#: ../clients/cli/general.c:334
 #, c-format
 msgid "Error: only these fields are allowed: %s"
 msgstr "Erreur : seuls ces champs sont autorisés : %s"
 
-#: ../clients/cli/general.c:358
+#: ../clients/cli/general.c:360
 msgid "NetworkManager status"
 msgstr "État de NetworkManager"
 
-#: ../clients/cli/general.c:363
+#: ../clients/cli/general.c:365
 msgid "running"
 msgstr "actif"
 
-#: ../clients/cli/general.c:366
+#: ../clients/cli/general.c:368
 msgid "starting"
 msgstr "démarrage"
 
-#: ../clients/cli/general.c:366
+#: ../clients/cli/general.c:368
 msgid "started"
 msgstr "démarré"
 
-#: ../clients/cli/general.c:368 ../clients/cli/general.c:369
 #: ../clients/cli/general.c:370 ../clients/cli/general.c:371
-#: ../clients/cli/general.c:372
+#: ../clients/cli/general.c:372 ../clients/cli/general.c:373
+#: ../clients/cli/general.c:374
 msgid "enabled"
 msgstr "activé"
 
-#: ../clients/cli/general.c:368 ../clients/cli/general.c:369
 #: ../clients/cli/general.c:370 ../clients/cli/general.c:371
-#: ../clients/cli/general.c:372
+#: ../clients/cli/general.c:372 ../clients/cli/general.c:373
+#: ../clients/cli/general.c:374
 msgid "disabled"
 msgstr "désactivé"
 
-#: ../clients/cli/general.c:435
+#: ../clients/cli/general.c:446
 msgid "auth"
 msgstr "auth"
 
-#: ../clients/cli/general.c:464
+#: ../clients/cli/general.c:475
 #, c-format
 msgid "Error: 'general permissions': %s"
 msgstr "Erreur : « general permissions » : %s"
 
-#: ../clients/cli/general.c:478
+#: ../clients/cli/general.c:489
 msgid "NetworkManager permissions"
 msgstr "Permissions NetworkManager"
 
-#: ../clients/cli/general.c:519
+#: ../clients/cli/general.c:530
 #, c-format
 msgid "Error: 'general logging': %s"
 msgstr "Erreur : « general logging » : %s"
 
-#: ../clients/cli/general.c:534
+#: ../clients/cli/general.c:545
 msgid "NetworkManager logging"
 msgstr "Journalisation NetworkManager"
 
-#: ../clients/cli/general.c:556
-#, fuzzy, c-format
+#: ../clients/cli/general.c:567
+#, c-format
 msgid "Error: failed to set hostname: %s"
-msgstr "Erreur : échec du paramétrage du nom d'hôte : (%d) %s"
+msgstr "Erreur : n'a pas pu définir le nom d'hôte : %s"
 
-#: ../clients/cli/general.c:669
-#, fuzzy, c-format
+#: ../clients/cli/general.c:680
+#, c-format
 msgid "Error: failed to set logging: %s"
-msgstr "Erreur : accès refusé pour définir la journalisation ; %s"
+msgstr "Erreur : accès refusé pour définir la journalisation : %s"
 
-#: ../clients/cli/general.c:678
+#: ../clients/cli/general.c:689
 #, c-format
 msgid "Error: 'general' command '%s' is not valid."
 msgstr "Erreur : commande « general » « %s » non valide."
 
-#: ../clients/cli/general.c:696
+#: ../clients/cli/general.c:707
 #, c-format
 msgid "Error: '--fields' value '%s' is not valid here (allowed field: %s)"
 msgstr ""
-"Erreur : « la valeur --fields » « %s » n'est pas valide ici (champ "
-"autorisé : %s)"
+"Erreur : « la valeur --fields » « %s » n'est pas valide ici (champ autorisé :"
+" %s)"
 
-#: ../clients/cli/general.c:721
+#: ../clients/cli/general.c:732
 #, c-format
 msgid "Error: invalid '%s' argument: '%s' (use on/off)."
 msgstr "Erreur : argument « %s » non valide : « %s » (utilisez marche/arrêt)."
 
-#: ../clients/cli/general.c:732
+#: ../clients/cli/general.c:743
 msgid "Connectivity"
 msgstr "Connectivité"
 
-#: ../clients/cli/general.c:747
+#: ../clients/cli/general.c:758
 msgid "Networking"
 msgstr "Réseau"
 
-#: ../clients/cli/general.c:772
+#: ../clients/cli/general.c:783
 #, c-format
 msgid "Error: 'networking connectivity' command '%s' is not valid."
 msgstr "Erreur : commande « networking connectivity » « %s » non valide."
 
-#: ../clients/cli/general.c:788
+#: ../clients/cli/general.c:799
 #, c-format
 msgid "Error: 'networking' command '%s' is not valid."
 msgstr "Erreur : commande « networking » « %s » non valide."
 
-#: ../clients/cli/general.c:817 ../clients/cli/general.c:837
+#: ../clients/cli/general.c:828 ../clients/cli/general.c:848
 msgid "Radio switches"
 msgstr "Interrupteurs radio"
 
 #. no argument, show current WiFi state
-#: ../clients/cli/general.c:855
+#: ../clients/cli/general.c:866
 msgid "Wi-Fi radio switch"
 msgstr "Interrupteur radio Wi-Fi"
 
 #. no argument, show current WWAN (mobile broadband) state
-#: ../clients/cli/general.c:871
+#: ../clients/cli/general.c:882
 msgid "WWAN radio switch"
 msgstr "Interrupteur radio WWAN"
 
-#: ../clients/cli/general.c:882
+#: ../clients/cli/general.c:893
 #, c-format
 msgid "Error: 'radio' command '%s' is not valid."
 msgstr "Erreur : commande « radio » « %s » non valide."
 
-#: ../clients/cli/general.c:902
-#, fuzzy
+#: ../clients/cli/general.c:914
 msgid "NetworkManager has started"
-msgstr "État de NetworkManager"
+msgstr "Le NetworkManager a démarré"
 
-#: ../clients/cli/general.c:902
-#, fuzzy
+#: ../clients/cli/general.c:917
 msgid "NetworkManager has stopped"
-msgstr "État de NetworkManager"
+msgstr "Le NetworkManager est arrêté"
 
-#: ../clients/cli/general.c:913
-#, fuzzy, c-format
+#: ../clients/cli/general.c:931
+#, c-format
 msgid "Hostname set to '%s'\n"
-msgstr "Définir le nom d'hôte sur « %s »"
+msgstr "Nom d'hôte défini à « %s »\n"
 
-#: ../clients/cli/general.c:928
-#, fuzzy, c-format
+#: ../clients/cli/general.c:946
+#, c-format
 msgid "'%s' is now the primary connection\n"
-msgstr "Le paramètre « %s » n'est pas présent dans la connexion.\n"
+msgstr "« %s » est la connexion primaire.\n"
 
-#: ../clients/cli/general.c:930
-#, fuzzy, c-format
+#: ../clients/cli/general.c:948
+#, c-format
 msgid "There's no primary connection\n"
-msgstr "Vérifier la connexion : %s\n"
+msgstr "Il n'y a pas de connexion primaire\n"
 
-#: ../clients/cli/general.c:942
-#, fuzzy, c-format
+#: ../clients/cli/general.c:960
+#, c-format
 msgid "Connectivity is now '%s'\n"
-msgstr "Connectivité"
+msgstr "La connectivité est « %s » maintenant\n"
 
-#: ../clients/cli/general.c:955
-#, fuzzy, c-format
+#: ../clients/cli/general.c:973
+#, c-format
 msgid "Networkmanager is now in the '%s' state\n"
-msgstr "NetworkManager n'est pas en cours d'exécution."
+msgstr "Le Networlmanager est dans l'état « %s » maintenant\n"
 
-#: ../clients/cli/general.c:966
-#, fuzzy, c-format
+#: ../clients/cli/general.c:984
+#, c-format
 msgid "Error: 'monitor' command '%s' is not valid."
-msgstr "Erreur : commande « radio » « %s » non valide."
+msgstr "Erreur : commande « monitor » « %s » non valide."
 
-#: ../clients/cli/general.c:980
-#, fuzzy
+#: ../clients/cli/general.c:998
 msgid "Networkmanager is not running (waiting for it)\n"
-msgstr "NetworkManager n'est pas en cours d'exécution."
+msgstr "Networkmanager n'est pas en cours d'exécution (attendons)\n"
 
 #: ../clients/cli/nmcli.c:83
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "Usage: %s [OPTIONS] OBJECT { COMMAND | help }\n"
 "\n"
@@ -5143,11 +5660,12 @@ msgid ""
 "  -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"
+"  -c[olors] auto|yes|no                      whether to use colors in output\n"
 "  -f[ields] <field1,field2,...>|all|common   specify fields to output\n"
 "  -e[scape] yes|no                           escape columns separators in "
 "values\n"
+"  -n[ocheck]                                 don't check nmcli and "
+"NetworkManager versions\n"
 "  -a[sk]                                     ask for missing parameters\n"
 "  -s[how-secrets]                            allow displaying passwords\n"
 "  -w[ait] <seconds>                          set timeout waiting for "
@@ -5165,16 +5683,20 @@ msgid ""
 "  m[onitor]       monitor NetworkManager changes\n"
 "\n"
 msgstr ""
-"Utilisation : %s [OPTIONS] OBJECT { COMMAND | help }\n"
+"Syntaxe : %s [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"
 "  -e[scape] yes|no                           escape columns separators in "
 "values\n"
+"  -n[ocheck]                                 don't check nmcli and "
+"NetworkManager versions\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"
@@ -5186,364 +5708,362 @@ msgstr ""
 "  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"
 
-#: ../clients/cli/nmcli.c:142
+#: ../clients/cli/nmcli.c:143
 #, c-format
 msgid "Error: Object '%s' is unknown, try 'nmcli help'."
 msgstr "Erreur : objet « %s » inconnu, essayez « nmcli help »."
 
-#: ../clients/cli/nmcli.c:183
+#: ../clients/cli/nmcli.c:173
 #, c-format
 msgid "Error: Option '--terse' is specified the second time."
 msgstr "Erreur : option « --terse » est spécifiée la seconde fois."
 
-#: ../clients/cli/nmcli.c:188
+#: ../clients/cli/nmcli.c:178
 #, c-format
 msgid "Error: Option '--terse' is mutually exclusive with '--pretty'."
 msgstr "Erreur : option « --terse » mutuellement exclusive avec « --pretty »."
 
-#: ../clients/cli/nmcli.c:196
+#: ../clients/cli/nmcli.c:186
 #, c-format
 msgid "Error: Option '--pretty' is specified the second time."
 msgstr "Erreur : option « --pretty » est spécifiée la seconde fois."
 
-#: ../clients/cli/nmcli.c:201
+#: ../clients/cli/nmcli.c:191
 #, c-format
 msgid "Error: Option '--pretty' is mutually exclusive with '--terse'."
 msgstr "Erreur : option « --pretty » mutuellement exclusive avec « --terse »."
 
-#: ../clients/cli/nmcli.c:211 ../clients/cli/nmcli.c:227
-#: ../clients/cli/nmcli.c:245 ../clients/cli/nmcli.c:276
+#: ../clients/cli/nmcli.c:201 ../clients/cli/nmcli.c:217
+#: ../clients/cli/nmcli.c:235 ../clients/cli/nmcli.c:266
 #, c-format
 msgid "Error: missing argument for '%s' option."
 msgstr "Erreur : paramètre manquant pour l'option « %s »."
 
-#: ../clients/cli/nmcli.c:220 ../clients/cli/nmcli.c:238
-#: ../clients/cli/nmcli.c:254
+#: ../clients/cli/nmcli.c:210 ../clients/cli/nmcli.c:228
+#: ../clients/cli/nmcli.c:244
 #, c-format
 msgid "Error: '%s' is not valid argument for '%s' option."
 msgstr ""
 "Erreur : « %s » est n'est pas un paramètre valide pour l'option « %s »."
 
-#: ../clients/cli/nmcli.c:261
+#: ../clients/cli/nmcli.c:251
 #, c-format
 msgid "Error: fields for '%s' options are missing."
 msgstr "Erreur : les champs pour les options « %s » sont manquants."
 
-#: ../clients/cli/nmcli.c:281
+#: ../clients/cli/nmcli.c:271
 #, c-format
 msgid "Error: '%s' is not a valid timeout for '%s' option."
 msgstr ""
 "Erreur : « %s » est n'est pas un délai d'expiration valide pour l'option "
 "« %s »."
 
-#: ../clients/cli/nmcli.c:288
+#: ../clients/cli/nmcli.c:278
 #, c-format
 msgid "nmcli tool, version %s\n"
 msgstr "outil nmcli, version %s\n"
 
-#: ../clients/cli/nmcli.c:294
+#: ../clients/cli/nmcli.c:284
 #, c-format
 msgid "Error: Option '%s' is unknown, try 'nmcli -help'."
 msgstr "Erreur : option « %s » inconnue, essayez « nmcli -help »."
 
-#: ../clients/cli/nmcli.c:377 ../clients/cli/nmcli.c:387
-#, fuzzy, c-format
-msgid ""
-"\n"
+#: ../clients/cli/nmcli.c:367 ../clients/cli/nmcli.c:377
+#, c-format
+msgid "\n"
 "Error: nmcli terminated by signal %s (%d)\n"
-msgstr ""
-"\n"
-"Erreur : nmcli interrompu par le signal %d."
+msgstr "\n"
+"Erreur : nmcli interrompu par le signal %s (%d)\n"
 
-#: ../clients/cli/nmcli.c:418
-#, fuzzy, c-format
+#: ../clients/cli/nmcli.c:408
+#, c-format
 msgid "Failed to set signal mask: %d\n"
-msgstr "Impossible de définir le masque du signal : %d"
+msgstr "Erreur : nmcli interrompu par le signal %d\n"
 
-#: ../clients/cli/nmcli.c:425
-#, fuzzy, c-format
+#: ../clients/cli/nmcli.c:415
+#, c-format
 msgid "Failed to create signal handling thread: %d\n"
-msgstr "Échec de la création d'un thread de gestion du signal : %d"
+msgstr "Échec de la création de thread de gestion du signal : %d\n"
 
-#: ../clients/cli/nmcli.c:522 ../clients/nm-online.c:193
-#, fuzzy, c-format
+#: ../clients/cli/nmcli.c:512 ../clients/nm-online.c:193
+#, c-format
 msgid "Error: Could not create NMClient object: %s."
-msgstr "Erreur : impossible de créer l'objet NMClient."
+msgstr "Erreur : impossible de créer l'objet NMClient : %s."
 
-#: ../clients/cli/nmcli.c:539
+#: ../clients/cli/nmcli.c:529
 msgid "Success"
 msgstr "Succès"
 
 #: ../clients/cli/polkit-agent.c:66
-#, fuzzy, c-format
+#, c-format
 msgid "Authentication message: %s\n"
-msgstr "Authentification"
+msgstr "Message d'authentication : %s\n"
 
 #: ../clients/cli/polkit-agent.c:72
-#, fuzzy, c-format
+#, c-format
 msgid "Authentication error: %s\n"
-msgstr "Authentification"
+msgstr "Erreur d'authentication : %s\n"
 
 # auto translated by TM merge from project: control-center, version: 3.8.3, DocId: gnome-control-center-2.0
 #: ../clients/cli/polkit-agent.c:118
-#, fuzzy, c-format
+#, c-format
 msgid "Warning: polkit agent initialization failed: %s\n"
-msgstr "L'initialisation du modem a échoué"
+msgstr "Warning: l'initialisation de l'agent polkit a échoué : %s\n"
 
-#: ../clients/cli/settings.c:796
-#, fuzzy, c-format
+#: ../clients/cli/settings.c:790
+#, c-format
 msgid "%d (key)"
-msgstr "%d (hex-ascii-key)"
+msgstr "%d (clé)"
 
-#: ../clients/cli/settings.c:798
-#, fuzzy, c-format
+#: ../clients/cli/settings.c:792
+#, c-format
 msgid "%d (passphrase)"
-msgstr "%d (phrase de passe 104/128-bit)"
+msgstr "%d (phrase de passe)"
 
-#: ../clients/cli/settings.c:801 ../clients/cli/settings.c:887
+#: ../clients/cli/settings.c:795 ../clients/cli/settings.c:881
 #, c-format
 msgid "%d (unknown)"
 msgstr "%d (inconnu)"
 
-#: ../clients/cli/settings.c:830
+#: ../clients/cli/settings.c:824
 msgid "0 (NONE)"
 msgstr "0 (AUCUN)"
 
-#: ../clients/cli/settings.c:836
+#: ../clients/cli/settings.c:830
 msgid "REORDER_HEADERS, "
 msgstr "REORDER_HEADERS, "
 
-#: ../clients/cli/settings.c:838
+#: ../clients/cli/settings.c:832
 msgid "GVRP, "
 msgstr "GVRP, "
 
-#: ../clients/cli/settings.c:840
+#: ../clients/cli/settings.c:834
 msgid "LOOSE_BINDING, "
 msgstr "LOOSE_BINDING, "
 
-#: ../clients/cli/settings.c:842
-#, fuzzy
+#: ../clients/cli/settings.c:836
 msgid "MVRP, "
-msgstr "GVRP, "
+msgstr "MVRP, "
 
-#: ../clients/cli/settings.c:881
+#: ../clients/cli/settings.c:875
 #, c-format
 msgid "%d (disabled)"
 msgstr "%d (désactivé)"
 
-#: ../clients/cli/settings.c:883
+#: ../clients/cli/settings.c:877
 #, c-format
 msgid "%d (enabled, prefer public IP)"
 msgstr "%d (activé, IP publique préférée)"
 
-#: ../clients/cli/settings.c:885
+#: ../clients/cli/settings.c:879
 #, c-format
 msgid "%d (enabled, prefer temporary IP)"
 msgstr "%d (activé, IP temporaire préférée)"
 
-#: ../clients/cli/settings.c:900
-#, fuzzy, c-format
+#: ../clients/cli/settings.c:894
+#, c-format
 msgid "%d (no)"
-msgstr "%d (inconnu)"
+msgstr "%d (non)"
 
-#: ../clients/cli/settings.c:902
+#: ../clients/cli/settings.c:896
 #, c-format
 msgid "%d (yes)"
-msgstr ""
+msgstr "%d (oui)"
 
-#: ../clients/cli/settings.c:905 ../clients/cli/settings.c:1605
-#, fuzzy, c-format
+#: ../clients/cli/settings.c:899 ../clients/cli/settings.c:1554
+#, c-format
 msgid "%d (default)"
-msgstr "(par défaut)"
+msgstr "%d (par défaut)"
 
-#: ../clients/cli/settings.c:918
+#: ../clients/cli/settings.c:912
 msgid "0 (none)"
 msgstr "0 (aucun)"
 
-#: ../clients/cli/settings.c:924
+#: ../clients/cli/settings.c:918
 msgid "agent-owned, "
 msgstr "appartient-à-l'agent"
 
-#: ../clients/cli/settings.c:926
+#: ../clients/cli/settings.c:920
 msgid "not saved, "
 msgstr "non enregistré,"
 
-#: ../clients/cli/settings.c:928
+#: ../clients/cli/settings.c:922
 msgid "not required, "
 msgstr "non requis,"
 
-#: ../clients/cli/settings.c:977 ../clients/tui/nmt-mtu-entry.c:84
+#: ../clients/cli/settings.c:971 ../clients/tui/nmt-mtu-entry.c:84
 msgid "(default)"
 msgstr "(par défaut)"
 
-#. ----------------------------------------------------------------------------
-#: ../clients/cli/settings.c:1063 ../clients/cli/settings.c:1106
-#: ../clients/cli/settings.c:1140 ../clients/cli/settings.c:1167
-#: ../clients/cli/settings.c:8033
-msgid "<hidden>"
-msgstr ""
-
-#: ../clients/cli/settings.c:1302
+#: ../clients/cli/settings.c:1252
 msgid "0 (disabled)"
 msgstr "0 (désactivé)"
 
-#: ../clients/cli/settings.c:1308
+#: ../clients/cli/settings.c:1258
 msgid "enabled, "
 msgstr "activé, "
 
-#: ../clients/cli/settings.c:1310
+#: ../clients/cli/settings.c:1260
 msgid "advertise, "
 msgstr "annoncer, "
 
-#: ../clients/cli/settings.c:1312
+#: ../clients/cli/settings.c:1262
 msgid "willing, "
 msgstr "disposé, "
 
-#: ../clients/cli/settings.c:1340
+#: ../clients/cli/settings.c:1290
 msgid "-1 (unset)"
 msgstr "-1 (non-défini)"
 
-#: ../clients/cli/settings.c:1472 ../clients/cli/settings.c:1777
-#: ../clients/cli/settings.c:1917
+#: ../clients/cli/settings.c:1422 ../clients/cli/settings.c:1724
+#: ../clients/cli/settings.c:1864
 msgid "auto"
 msgstr "auto"
 
-#: ../clients/cli/settings.c:1485 ../clients/cli/settings.c:1948
+#: ../clients/cli/settings.c:1435 ../clients/cli/settings.c:1895
 msgid "default"
-msgstr "valeur(s) par défaut"
+msgstr "par défaut"
 
-#: ../clients/cli/settings.c:1607
-#, fuzzy, c-format
+#: ../clients/cli/settings.c:1556
+#, c-format
 msgid "%d (off)"
-msgstr "%d (inconnu)"
+msgstr "%d (désactivé)"
 
-#: ../clients/cli/settings.c:1823
+#: ../clients/cli/settings.c:1770
 #, c-format
 msgid ""
 "invalid option '%s', use a combination of [%s] or 'ignore', 'default' or "
 "'none'"
 msgstr ""
+"option non valide « %s », utilise une combinaison de [%s] ou 'ignore', "
+"'default' ou 'none'"
 
-#: ../clients/cli/settings.c:1834
+#: ../clients/cli/settings.c:1781
 msgid "'default' and 'ignore' are incompatible with other flags"
-msgstr ""
+msgstr "'default' et 'ignore' sont incompatibles avec les autres marqueurs"
 
-#: ../clients/cli/settings.c:1870
-#, fuzzy, c-format
+#: ../clients/cli/settings.c:1817
+#, c-format
 msgid "invalid mode '%s', use one of %s"
-msgstr "champ « %s » non valide ; champs autorisés : %s"
+msgstr "mode « %s » non valide ; utiliser un parmi %s"
 
-#: ../clients/cli/settings.c:1952
+#: ../clients/cli/settings.c:1899
 #, c-format
 msgid "always"
-msgstr ""
+msgstr "toujours"
 
-#: ../clients/cli/settings.c:2052 ../clients/cli/settings.c:3398
-#: ../clients/cli/settings.c:4590 ../clients/cli/settings.c:5093
+#: ../clients/cli/settings.c:1999 ../clients/cli/settings.c:3286
+#: ../clients/cli/settings.c:4478 ../clients/cli/settings.c:4981
 #: ../libnm-core/nm-keyfile-reader.c:573
-#, fuzzy, c-format
+#, c-format
 msgid "invalid option '%s', use one of [%s]"
-msgstr "l'option « %s » ou sa valeur « %s » est non valide"
+msgstr "option non valide « %s » ; utiliser un parmi [%s]"
 
-#: ../clients/cli/settings.c:2162
+#: ../clients/cli/settings.c:2116
 #, c-format
 msgid "Do you also want to set '%s' to '%s'? [yes]: "
 msgstr "Souhaitez-vous aussi définir « %s » sur « %s » ? [yes] : "
 
-#: ../clients/cli/settings.c:2164
+#: ../clients/cli/settings.c:2118
 #, c-format
 msgid "Do you also want to clear '%s'? [yes]: "
 msgstr "Souhaitez-vous aussi supprimer « %s » ? [yes] : "
 
-#: ../clients/cli/settings.c:2325
+#: ../clients/cli/settings.c:2279
 #, c-format
 msgid ""
 "Warning: %s.%s set to '%s', but it might be ignored in infrastructure mode\n"
 msgstr ""
+"Attention : %s.%s défini à '%s', mais il est possible que ce soit ignoré en "
+"mode d'infrastructure\n"
 
-#: ../clients/cli/settings.c:2344
+#: ../clients/cli/settings.c:2298
 #, c-format
 msgid "Warning: setting %s.%s requires removing ipv4 and ipv6 settings\n"
 msgstr ""
+"Atttention : configuration %s.%s exige que l'on supprime les configurations "
+"ipv4 et ipv6\n"
 
-#: ../clients/cli/settings.c:2346
-#, fuzzy
+#: ../clients/cli/settings.c:2300
 msgid "Do you want to remove them? [yes] "
-msgstr "Souhaitez-vous les fournir ? (oui/non) [yes]"
+msgstr "Souhaitez-vous les supprimer ? [oui]"
 
-#: ../clients/cli/settings.c:2482 ../clients/cli/settings.c:2877
-#: ../clients/cli/settings.c:5294
+#: ../clients/cli/settings.c:2396 ../clients/cli/settings.c:2791
+#: ../clients/cli/settings.c:5182
 #, c-format
 msgid "'%s' is not valid"
 msgstr "« %s » n'est pas valide"
 
-#: ../clients/cli/settings.c:2505
+#: ../clients/cli/settings.c:2419
 #, c-format
 msgid "'%d' is not valid; use <%d-%d>"
 msgstr "« %d » n'est pas valide ; utilisez <%d-%d>"
 
-#: ../clients/cli/settings.c:2527
-#, fuzzy, c-format
+#: ../clients/cli/settings.c:2441
+#, c-format
 msgid "'%lld' is not valid; use <%lld-%lld>"
-msgstr "« %d » n'est pas valide ; utilisez <%d-%d>"
+msgstr "« %lld » n'est pas valide ; utilisez <%lld-%lld>"
 
-#: ../clients/cli/settings.c:2549
-#, fuzzy, c-format
+#: ../clients/cli/settings.c:2463
+#, c-format
 msgid "'%u' is not valid; use <%u-%u>"
-msgstr "« %u » n'est pas valide ; utilisez <%d-%d>"
+msgstr "« %u » n'est pas valide ; utilisez <%u-%u>"
 
-#: ../clients/cli/settings.c:2588
-#, fuzzy, c-format
+#: ../clients/cli/settings.c:2502
+#, c-format
 msgid "'%u' flags are not valid; use combination of %s"
-msgstr "« %s » n'est pas valide ; utilisez [%s] ou [%s]"
+msgstr ""
+"les marqueurs « %u » ne sont pas valides ; utilisez une combinaison de %s"
 
-#: ../clients/cli/settings.c:2655
+#: ../clients/cli/settings.c:2569
 #, c-format
 msgid "'%s' is not valid; use <option>=<value>"
 msgstr "« %s » n'est pas valide ; utilisez <option>=<value>"
 
-#: ../clients/cli/settings.c:2689
+#: ../clients/cli/settings.c:2603
 #, c-format
 msgid "index '%s' is not valid"
 msgstr "index « %s » non valide"
 
-#: ../clients/cli/settings.c:2694 ../clients/cli/settings.c:2719
+#: ../clients/cli/settings.c:2608 ../clients/cli/settings.c:2633
 msgid "no item to remove"
 msgstr "aucun élément à supprimer"
 
-#: ../clients/cli/settings.c:2698 ../clients/cli/settings.c:2723
+#: ../clients/cli/settings.c:2612 ../clients/cli/settings.c:2637
 #, c-format
 msgid "index '%d' is not in range <0-%d>"
 msgstr "l'index « %d » ne se trouve pas dans la plage <0-%d>"
 
-#: ../clients/cli/settings.c:2738
+#: ../clients/cli/settings.c:2652
 #, c-format
 msgid "invalid option '%s'"
 msgstr "option « %s » non valide"
 
-#: ../clients/cli/settings.c:2740
+#: ../clients/cli/settings.c:2654
 msgid "missing option"
 msgstr "option manquante"
 
-#: ../clients/cli/settings.c:2767 ../clients/cli/settings.c:2787
-#: ../clients/cli/settings.c:2807 ../clients/cli/settings.c:2827
+#: ../clients/cli/settings.c:2681 ../clients/cli/settings.c:2701
+#: ../clients/cli/settings.c:2721 ../clients/cli/settings.c:2741
 #, c-format
 msgid "'%s' is not a valid number (or out of range)"
 msgstr "« %s » n'est pas un numéro valide (ou est hors de portée)"
 
-#: ../clients/cli/settings.c:2861
-#, fuzzy, c-format
+#: ../clients/cli/settings.c:2775
+#, c-format
 msgid "'%s' is not a valid value; use -1, 0 or 1"
-msgstr "« %s » n'est pas valide ; utilisez 0, 1, ou 2"
+msgstr "« %s » n'est pas valide ; utilisez -1, o ou 1"
 
-#: ../clients/cli/settings.c:2893
+#: ../clients/cli/settings.c:2807
 #, c-format
 msgid "'%s' is not a valid Ethernet MAC"
 msgstr "« %s » n'est pas une adresse Ethernet MAC valide"
 
-#: ../clients/cli/settings.c:2918 ../libnm-core/nm-setting-connection.c:864
+#: ../clients/cli/settings.c:2832 ../libnm-core/nm-setting-connection.c:864
 #: ../libnm-core/nm-setting-infiniband.c:255
 #: ../libnm-util/nm-setting-connection.c:834
 #: ../libnm-util/nm-setting-infiniband.c:269
@@ -5551,53 +6071,42 @@ msgstr "« %s » n'est pas une adresse Ethernet MAC valide"
 msgid "'%s' is not a valid interface name"
 msgstr "« %s » n'est pas un nom d'interface valide"
 
-#: ../clients/cli/settings.c:2942
-#, fuzzy, c-format
+#: ../clients/cli/settings.c:2856
+#, c-format
 msgid "'%s' is not a valid flag number; use <0-%d>"
-msgstr "« %s » n'est pas un canal valide ; utilisez <1-13>"
+msgstr "« %s » n'est pas un numéro de marqueur valide ; utilisez <0-%d>"
 
-#: ../clients/cli/settings.c:2954
+#: ../clients/cli/settings.c:2868
 #, c-format
 msgid "Warning: '%s' sum is higher than all flags => all flags set\n"
 msgstr ""
+"Attention : la somme « %s » est supérieure à celle de tous les marqueurs => "
+"tous les marqueurs définis\n"
 
-#: ../clients/cli/settings.c:2995
+#: ../clients/cli/settings.c:2909
 #, c-format
 msgid "'%s' is not a valid hex character"
 msgstr "« %s » n'est pas un caractère hex valide"
 
-#: ../clients/cli/settings.c:3025
+#: ../clients/cli/settings.c:2939
 #, c-format
 msgid "'%s' is not a valid MAC"
 msgstr "« %s » n'est pas une adresse MAC valide"
 
-#. Don't allow setting type unless the connection is brand new.
-#. * Just because it's a bad idea and the user wouldn't probably want that.
-#. * No technical reason, really.
-#. * Also, using uuid to see if the connection is brand new is a bit
-#. * 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/cli/settings.c:3053
-#, fuzzy, c-format
-msgid "Can not change the connection type"
-msgstr "Saisissez le type de connexion : "
-
-#: ../clients/cli/settings.c:3077 ../libnm-core/nm-setting-connection.c:853
+#: ../clients/cli/settings.c:2965 ../libnm-core/nm-setting-connection.c:853
 #: ../libnm-util/nm-setting-connection.c:791
 #, c-format
 msgid "'%s' is not a valid UUID"
 msgstr "« %s » n'est pas un UUID valide"
 
-#: ../clients/cli/settings.c:3144
+#: ../clients/cli/settings.c:3032
 #, c-format
 msgid "the property doesn't contain permission '%s'"
-msgstr ""
+msgstr "la propriété ne contient pas de permission « %s »"
 
-#: ../clients/cli/settings.c:3156
+#: ../clients/cli/settings.c:3044
 msgid ""
-"Enter a list of user permissions. This is a list of user names formatted "
-"as:\n"
+"Enter a list of user permissions. This is a list of user names formatted as:\n"
 "  [user:]<user name 1>, [user:]<user name 2>,...\n"
 "The items can be separated by commas or spaces.\n"
 "\n"
@@ -5610,42 +6119,40 @@ msgstr ""
 "\n"
 "Exemple : alice bob charlie\n"
 
-#: ../clients/cli/settings.c:3175
+#: ../clients/cli/settings.c:3063
 #, c-format
 msgid "'%s' is not valid master; use ifname or connection UUID"
 msgstr ""
 "« %s » n'est pas un maître valide ; utilisez ifname ou un UUID de connexion"
 
-#: ../clients/cli/settings.c:3219
+#: ../clients/cli/settings.c:3107
 #, c-format
 msgid "Warning: %s is not an UUID of any existing connection profile\n"
-msgstr ""
+msgstr "Avertissement : %s n'est pas un UUID de profil de connexion existant\n"
 
-#: ../clients/cli/settings.c:3223 ../clients/cli/settings.c:3239
+#: ../clients/cli/settings.c:3111 ../clients/cli/settings.c:3127
 #, c-format
 msgid "'%s' is not a VPN connection profile"
 msgstr "« %s » n'est pas un profil de connexion VPN"
 
-#: ../clients/cli/settings.c:3232
-#, fuzzy, c-format
+#: ../clients/cli/settings.c:3120
+#, c-format
 msgid "'%s' is not a name of any exiting profile"
-msgstr ""
-"« %s » n'est pas une configuration ou un nom de fichier d'équipe valide."
+msgstr "« %s » n'est pas un nom de profil existant"
 
-#: ../clients/cli/settings.c:3266
-#, fuzzy, c-format
+#: ../clients/cli/settings.c:3154
+#, c-format
 msgid "the value '%s' is not a valid UUID"
 msgstr "« %s » n'est pas un UUID valide"
 
-#: ../clients/cli/settings.c:3273
+#: ../clients/cli/settings.c:3161
 #, c-format
 msgid "the property doesn't contain UUID '%s'"
-msgstr ""
+msgstr "la propriété ne contient pas d'UUID « %s »"
 
-#: ../clients/cli/settings.c:3285
+#: ../clients/cli/settings.c:3173
 msgid ""
-"Enter secondary connections that should be activated when this connection "
-"is\n"
+"Enter secondary connections that should be activated when this connection is\n"
 "activated. Connections can be specified either by UUID or ID (name). nmcli\n"
 "transparently translates names to UUIDs. Note that NetworkManager only "
 "supports\n"
@@ -5659,14 +6166,13 @@ msgstr ""
 "UUID \n"
 "ou leur identifiant (nom), nmcli les traduisant de manière transparente en "
 "UUID.\n"
-"N.B. : NetworkManager ne prend en charge actuellement que les connexions "
-"VPN\n"
+"N.B. : NetworkManager ne prend en charge actuellement que les connexions VPN\n"
 "en tant que connexions secondaires.\n"
 "Les éléments peuvent être séparés par des virgules ou des espaces.\n"
 "\n"
 "Exemple : private-openvpn, fe6ba5d8-c2fc-4aae-b2e3-97efddd8d9a7\n"
 
-#: ../clients/cli/settings.c:3352
+#: ../clients/cli/settings.c:3240
 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"
@@ -5674,38 +6180,56 @@ msgid ""
 "'false','no','off' to set the connection as not metered\n"
 "'unknown' to let NetworkManager choose a value using some heuristics\n"
 msgstr ""
+"Saisir une valeur qui indique si la connexion est assujetie à un quota de "
+"données\n"
+"des coûts d'utilisation ou d'autres limitations. Les options acceptées sont :"
+"\n"
+"'true','yes','on' pour définir la connexion comme étant mesurée\n"
+"'false','no','off' pour définir la connexion comme  n'étant pas mesurée\n"
+"'unknown' permettre au NetworkManager de choisir une valeur à partir "
+"d'heuristiques\n"
 
-#: ../clients/cli/settings.c:3476
+#: ../clients/cli/settings.c:3364
 msgid "private key password not provided"
 msgstr "le mot de passe de la clé privée n'a pas été fourni"
 
-#: ../clients/cli/settings.c:3504
-#, fuzzy, c-format
+#: ../clients/cli/settings.c:3392
+#, c-format
 msgid "the property doesn't contain EAP method '%s'"
-msgstr "la propriété ne peut pas être modifiée"
+msgstr "la propriété ne contient pas de méthode EAP « %s »"
 
-#: ../clients/cli/settings.c:3521
+#: ../clients/cli/settings.c:3409
 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 ""
+"Saisir le chemin du fichier de certificat d’autorité (CA)  (peut être "
+"précédé de file://). [file://]<file path>\n"
+"Notez que nmcli ne supporte pas que l'on spécifie les certificats sous forme "
+"de données brutes de blob.\n"
+"Exemple : /home/cimrman/cacert.crt\n"
 
-#: ../clients/cli/settings.c:3540
+#: ../clients/cli/settings.c:3428
 #, c-format
 msgid "the property doesn't contain alternative subject match '%s'"
-msgstr ""
+msgstr "la propriété ne contient pas de sujet alternatif correspondant « %s »"
 
-#: ../clients/cli/settings.c:3556
+#: ../clients/cli/settings.c:3444
 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 ""
+"Saisir le chemin du certificat client (CA)  (peut être précédé de file://). "
+"[file://]<file path>\n"
+"Notez que nmcli ne supporte pas que l'on spécifie les certificats sous forme "
+"de données brutes de blob.\n"
+"Exemple : /home/cimrman/jara.crt\n"
 
-#: ../clients/cli/settings.c:3568
+#: ../clients/cli/settings.c:3456
 msgid ""
 "Enter file path to CA certificate for inner authentication (optionally "
 "prefixed\n"
@@ -5714,13 +6238,21 @@ msgid ""
 "Note that nmcli does not support specifying certificates as raw blob data.\n"
 "Example: /home/cimrman/ca-zweite-phase.crt\n"
 msgstr ""
+"Saisir le chemin du fichier de certificat d’autorité (CA) pour une "
+"authorisation interne (peut être précédé de file://).>\n"
+" [file://]<file path>\n"
+"Notez que nmcli ne supporte pas que l'on spécifie les certificats sous forme "
+"de données brutes de blob.\n"
+"Exemple : /home/cimrman/ca-zweite-phase.crt\n"
 
-#: ../clients/cli/settings.c:3588
+#: ../clients/cli/settings.c:3476
 #, c-format
 msgid "the property doesn't contain \"phase2\" alternative subject match '%s'"
 msgstr ""
+"la propriété ne contient pas de sujet alternatif « phase 2 » correspondant "
+"« %s »"
 
-#: ../clients/cli/settings.c:3604
+#: ../clients/cli/settings.c:3492
 msgid ""
 "Enter file path to client certificate for inner authentication (optionally "
 "prefixed\n"
@@ -5729,9 +6261,14 @@ msgid ""
 "Note that nmcli does not support specifying certificates as raw blob data.\n"
 "Example: /home/cimrman/jara-zweite-phase.crt\n"
 msgstr ""
+"Saisir le chemin du fichier de certificat client pour une authorisation "
+"interne (peut être précédé de file://).>\n"
+" [file://]<file path>\n"
+"Notez que nmcli ne supporte pas que l'on spécifie les certificats sous forme "
+"de données brutes de blob.\n"
+"Exemple : /home/cimrman/jara-zweite-phase.crt\n"
 
-#: ../clients/cli/settings.c:3624
-#, fuzzy
+#: ../clients/cli/settings.c:3512
 msgid ""
 "Enter path to a private key and the key password (if not set yet):\n"
 "  [file://]<file path> [<password>]\n"
@@ -5740,15 +6277,14 @@ msgid ""
 msgstr ""
 "Saisissez le chemin d'accès vers une clé privée et le mot de passe de la clé "
 "(s'il n'a pas déjà été défini) :\n"
-"  <file path> [<password>]\n"
+"  [file://]<file path> [<password>]\n"
 "Exemple : /home/cimrman/jara-priv-key Dardanely\n"
 
-#: ../clients/cli/settings.c:3695
+#: ../clients/cli/settings.c:3583
 msgid ""
 "Enter bytes as a list of hexadecimal values.\n"
 "Two formats are accepted:\n"
-"(a) a string of hexadecimal digits, where each two digits represent one "
-"byte\n"
+"(a) a string of hexadecimal digits, where each two digits represent one byte\n"
 "(b) space-separated list of bytes written as hexadecimal digits (with "
 "optional 0x/0X prefix, and optional leading 0).\n"
 "\n"
@@ -5766,7 +6302,7 @@ msgstr ""
 "Exemples : ab0455a6ea3a74C2\n"
 "          ab 4 55 0xa6 ea 3a 74 C2\n"
 
-#: ../clients/cli/settings.c:3816
+#: ../clients/cli/settings.c:3704
 #, c-format
 msgid ""
 "Enter a list of bonding options formatted as:\n"
@@ -5797,32 +6333,33 @@ msgstr ""
 "\n"
 "Exemple : mode=2,miimon=120\n"
 
-#: ../clients/cli/settings.c:3847
+#: ../clients/cli/settings.c:3735
 #, c-format
 msgid "'%s' is not a valid InfiniBand MAC"
 msgstr "« %s » n'est pas une adresse InfiniBand MAC valide"
 
-#: ../clients/cli/settings.c:3884
+#: ../clients/cli/settings.c:3772
 #, c-format
 msgid "'%s' is not a valid IBoIP P_Key"
 msgstr "« %s » n'est pas une clé IBoIP P_Key valide"
 
-#: ../clients/cli/settings.c:3915
-#, fuzzy, c-format
+#: ../clients/cli/settings.c:3803
+#, c-format
 msgid "'%s' is not valid (the format is: ip[/prefix] [next-hop] [metric])"
-msgstr "« %s » n'est pas valide (utilisez ip/[prefix] next-hop [metric])"
+msgstr ""
+"« %s » n'est pas valide (le format est ip[/prefix] [next-hop] [metric])"
 
-#: ../clients/cli/settings.c:3963 ../clients/cli/settings.c:3982
+#: ../clients/cli/settings.c:3851 ../clients/cli/settings.c:3870
 #, c-format
 msgid "invalid IPv4 address '%s'"
 msgstr "adresse IPv4 « %s » non valide"
 
-#: ../clients/cli/settings.c:3988 ../clients/cli/settings.c:4296
+#: ../clients/cli/settings.c:3876 ../clients/cli/settings.c:4184
 #, c-format
 msgid "the property doesn't contain DNS server '%s'"
-msgstr ""
+msgstr "la propriété ne contient pas de serveur DNS « %s »"
 
-#: ../clients/cli/settings.c:4000
+#: ../clients/cli/settings.c:3888
 msgid ""
 "Enter a list of IPv4 addresses of DNS servers.\n"
 "\n"
@@ -5832,23 +6369,22 @@ msgstr ""
 "\n"
 "Exemple : 8.8.8.8, 8.8.4.4\n"
 
-#: ../clients/cli/settings.c:4036 ../clients/cli/settings.c:4350
+#: ../clients/cli/settings.c:3924 ../clients/cli/settings.c:4238
 #, c-format
 msgid "the property doesn't contain DNS search domain '%s'"
-msgstr ""
+msgstr "la propriété ne contient pas de domaine de recherche DNS « %s »"
 
-#: ../clients/cli/settings.c:4074 ../clients/cli/settings.c:4388
+#: ../clients/cli/settings.c:3962 ../clients/cli/settings.c:4276
 #, c-format
 msgid "the property doesn't contain DNS option '%s'"
-msgstr ""
+msgstr "la propriété ne contient pas d'option DNS « %s »"
 
-#: ../clients/cli/settings.c:4128 ../clients/cli/settings.c:4441
+#: ../clients/cli/settings.c:4016 ../clients/cli/settings.c:4329
 #, c-format
 msgid "the property doesn't contain IP address '%s'"
-msgstr ""
+msgstr "la propriété ne contient pas d'adresse IP « %s »"
 
-#: ../clients/cli/settings.c:4141
-#, fuzzy
+#: ../clients/cli/settings.c:4029
 msgid ""
 "Enter a list of IPv4 addresses formatted as:\n"
 "  ip[/prefix], ip[/prefix],...\n"
@@ -5857,23 +6393,22 @@ msgid ""
 "Example: 192.168.1.5/24, 10.0.0.11/24\n"
 msgstr ""
 "Saisissez une liste des adresses IPv4 formatées comme suit :\n"
-"  ip[/prefix] [gateway], ip[/prefix] [gateway],...\n"
+"  ip[/prefix], ip[/prefix],...\n"
 "Le préfixe manquant est considéré comme un préfixe de 32.\n"
 "\n"
-"Exemple : 192.168.1.5/24 192.168.1.1, 10.0.0.11/24\n"
+"Exemple : 192.168.1.5/24, 10.0.0.11/24\n"
 
-#: ../clients/cli/settings.c:4157 ../clients/cli/settings.c:4470
-#, fuzzy, c-format
+#: ../clients/cli/settings.c:4045 ../clients/cli/settings.c:4358
+#, c-format
 msgid "invalid gateway address '%s'"
-msgstr "passerelle « %s » non valide"
+msgstr "adresse de passerelle « %s » non valide"
 
-#: ../clients/cli/settings.c:4212 ../clients/cli/settings.c:4525
-#, fuzzy, c-format
+#: ../clients/cli/settings.c:4100 ../clients/cli/settings.c:4413
+#, c-format
 msgid "the property doesn't contain route '%s'"
-msgstr "la propriété ne peut pas être modifiée"
+msgstr "la propriété ne contient pas la route « %s »"
 
-#: ../clients/cli/settings.c:4225
-#, fuzzy
+#: ../clients/cli/settings.c:4113
 msgid ""
 "Enter a list of IPv4 routes formatted as:\n"
 "  ip[/prefix] [next-hop] [metric],...\n"
@@ -5887,17 +6422,21 @@ msgid ""
 msgstr ""
 "Saisissez une liste des routes IPv4 formatée comme suit :\n"
 "  ip/[prefix] next-hop [metric],...\n"
+"\n"
 "Le préfixe manquant est considéré comme un préfixe de 32.\n"
-"La métrique manquante est considérée comme une métrique de 0.\n"
+"Le prochain rebond (hop) manquant est considéré comme 0.0.0.0.\n"
+"La métrique manquante est considérée comme une métrique par défaut (NM/noyau "
+"va définir une valeur par défaut).\n"
 "\n"
-"Exemple : 192.168.2.0/24 192.168.2.1 3, 10.1.0.0/16 10.0.0.254\n"
+"Examples: 192.168.2.0/24 192.168.2.1 3, 10.1.0.0/16 10.0.0.254\n"
+"          10.1.2.0/24\n"
 
-#: ../clients/cli/settings.c:4271 ../clients/cli/settings.c:4290
+#: ../clients/cli/settings.c:4159 ../clients/cli/settings.c:4178
 #, c-format
 msgid "invalid IPv6 address '%s'"
 msgstr "adresse IPv6 « %s » non valide"
 
-#: ../clients/cli/settings.c:4308
+#: ../clients/cli/settings.c:4196
 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 "
@@ -5918,8 +6457,7 @@ msgstr ""
 "\n"
 "Exemple : 2607:f0d0:1002:51::4, 2607:f0d0:1002:51::1\n"
 
-#: ../clients/cli/settings.c:4454
-#, fuzzy
+#: ../clients/cli/settings.c:4342
 msgid ""
 "Enter a list of IPv6 addresses formatted as:\n"
 "  ip[/prefix], ip[/prefix],...\n"
@@ -5928,14 +6466,12 @@ msgid ""
 "Example: 2607:f0d0:1002:51::4/64, 1050:0:0:0:5:600:300c:326b\n"
 msgstr ""
 "Saisissez une liste des adresses IPv6 formatées comme suit :\n"
-"  ip[/prefix] [gateway], ip[/prefix] [gateway],...\n"
+"  ip[/prefix], ip[/prefix],...\n"
 "Le préfixe manquant est considéré comme un préfixe de 128.\n"
 "\n"
-"Exemple : 2607:f0d0:1002:51::4/64 2607:f0d0:1002:51::1, "
-"1050:0:0:0:5:600:300c:326b\n"
+"Exemple : 2607:f0d0:1002:51::4/64, 1050:0:0:0:5:600:300c:326b\n"
 
-#: ../clients/cli/settings.c:4538
-#, fuzzy
+#: ../clients/cli/settings.c:4426
 msgid ""
 "Enter a list of IPv6 routes formatted as:\n"
 "  ip[/prefix] [next-hop] [metric],...\n"
@@ -5949,35 +6485,39 @@ msgid ""
 "          abbe::/64 55\n"
 msgstr ""
 "Saisissez une liste des routes IPv6 formatées comme suit :\n"
-"  ip/[prefix] next-hop [metric],...\n"
+"  ip[/prefix] [next-hop] [metric],...\n"
+"\n"
 "Le préfixe manquant est considéré comme un préfixe de 128.\n"
-"La métrique manquante est considérée comme une métrique de 0.\n"
+"Le prochain rebond (hop) manquant est considéré comme « :: ».\n"
+"La métrique manquante est considérée comme une métrique par défaut (NM/noyau "
+"va définir une valeur par défaut).\n"
 "\n"
 "Exemple : 2001:db8:beef:2::/64 2001:db8:beef::2, 2001:db8:beef:3::/64 2001:"
 "db8:beef::3 2\n"
+"          abbe::/64 55\n"
 
-#: ../clients/cli/settings.c:4555 ../libnm-core/nm-setting-gsm.c:363
+#: ../clients/cli/settings.c:4443 ../libnm-core/nm-setting-gsm.c:363
 #: ../libnm-util/nm-setting-gsm.c:364
 #, c-format
 msgid "'%s' is not a number"
 msgstr "« %s » n'est pas un numéro"
 
-#: ../clients/cli/settings.c:4562
+#: ../clients/cli/settings.c:4450
 #, c-format
 msgid "'%s' is not valid; use 0, 1, or 2"
 msgstr "« %s » n'est pas valide ; utilisez 0, 1, ou 2"
 
-#: ../clients/cli/settings.c:4609
+#: ../clients/cli/settings.c:4497
 #, c-format
 msgid "'%s' is not a valid channel; use <1-13>"
 msgstr "« %s » n'est pas un canal valide ; utilisez <1-13>"
 
-#: ../clients/cli/settings.c:4646
+#: ../clients/cli/settings.c:4534
 #, c-format
 msgid "'%s' is not valid; use [e, o, n]"
 msgstr "« %s » n'est pas valide ; utilisez [e, o, n]"
 
-#: ../clients/cli/settings.c:4674
+#: ../clients/cli/settings.c:4562
 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 "
@@ -5995,67 +6535,71 @@ msgstr ""
 "\"roundrobin\"}, \"ports\": {\"eth1\": {}, \"eth2\": {}} }\n"
 "          set team.config /etc/my-team.conf\n"
 
-#: ../clients/cli/settings.c:4714
+#: ../clients/cli/settings.c:4602
 msgid "no priority to remove"
 msgstr "aucune priorité à supprimer"
 
-#: ../clients/cli/settings.c:4718
+#: ../clients/cli/settings.c:4606
 #, c-format
 msgid "index '%d' is not in the range of <0-%d>"
 msgstr "l'index « %d » ne se trouve pas dans la plage <0-%d>"
 
-#: ../clients/cli/settings.c:4757
+#: ../clients/cli/settings.c:4645
 #, c-format
 msgid ""
-"Warning: only one mapping at a time is supported; taking the first one (%s)\n"
+"Warning: only one mapping at a time is supported; taking the first one "
+"(%s)\n"
 msgstr ""
+"Avertissement : un seul mappage à la fois est pris en charge ; le premier "
+"est retenu (%s)\n"
 
-#: ../clients/cli/settings.c:4764
-#, fuzzy, c-format
+#: ../clients/cli/settings.c:4652
+#, c-format
 msgid "the property doesn't contain mapping '%s'"
-msgstr "la propriété ne peut pas être modifiée"
+msgstr "la propriété ne contient pas le mappage « %s »"
 
-#: ../clients/cli/settings.c:4812
-#, fuzzy, c-format
+#: ../clients/cli/settings.c:4700
+#, c-format
 msgid "'%s' cannot be empty"
-msgstr "l'option « %s » est vide"
+msgstr "« %s » ne peut pas rester vide"
 
-#: ../clients/cli/settings.c:4886 ../clients/cli/settings.c:5053
-#: ../libnm-core/nm-setting-wired.c:651 ../libnm-core/nm-setting-wireless.c:820
-#: ../libnm-core/nm-setting-wireless.c:832 ../libnm-util/nm-setting-wired.c:646
+#: ../clients/cli/settings.c:4774 ../clients/cli/settings.c:4941
+#: ../libnm-core/nm-setting-wired.c:651
+#: ../libnm-core/nm-setting-wireless.c:820
+#: ../libnm-core/nm-setting-wireless.c:832
+#: ../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'est pas une adresse MAC valide"
 
-#: ../clients/cli/settings.c:4892 ../clients/cli/settings.c:5059
+#: ../clients/cli/settings.c:4780 ../clients/cli/settings.c:4947
 #, c-format
 msgid "the property doesn't contain MAC address '%s'"
-msgstr ""
+msgstr "la propriété ne contient pas d'adresse MAC « %s »"
 
-#: ../clients/cli/settings.c:4911
-#, fuzzy, c-format
+#: ../clients/cli/settings.c:4799
+#, c-format
 msgid "'%s' is not valid; 2 or 3 strings should be provided"
-msgstr "« %s » n'est pas valide ; 3 chaînes doivent être fournies"
+msgstr "« %s » n'est pas valide ; 2 ou 3 chaînes doivent être fournies"
 
-#: ../clients/cli/settings.c:4925
-#, fuzzy
+#: ../clients/cli/settings.c:4813
 msgid ""
 "Enter a list of subchannels (comma or space separated).\n"
 "\n"
 "Example: 0.0.0e20 0.0.0e21 0.0.0e22\n"
 msgstr ""
-"Saisissez une liste de trois canaux (séparés par des virgules ou espaces).\n"
+"Saisissez une liste de sous-canaux (séparés par des virgules ou espaces).\n"
 "\n"
 "Exemple : 0.0.0e20 0.0.0e21 0.0.0e22\n"
 
-#: ../clients/cli/settings.c:4947
+#: ../clients/cli/settings.c:4835
 #, c-format
 msgid "'%s' string value should consist of 1 - 199 characters"
-msgstr ""
+msgstr "« %s » doit consister à un nombre de 1 - 199 caractères"
 
-#: ../clients/cli/settings.c:4979
+#: ../clients/cli/settings.c:4867
 #, c-format
 msgid ""
 "Enter a list of S/390 options formatted as:\n"
@@ -6066,58 +6610,64 @@ msgstr ""
 "  option = <value>, option = <value>,...\n"
 "Options valides : %s\n"
 
-#: ../clients/cli/settings.c:5025
+#: ../clients/cli/settings.c:4913
 #, c-format
 msgid "'%s' is not a valid channel"
 msgstr "« %s » n'est pas un canal valide"
 
-#: ../clients/cli/settings.c:5031
+#: ../clients/cli/settings.c:4919
 #, c-format
 msgid "'%ld' is not a valid channel"
 msgstr "« %ld » n'est pas un canal valide"
 
-#: ../clients/cli/settings.c:5125
-#, fuzzy, c-format
+#: ../clients/cli/settings.c:5013
+#, c-format
 msgid "invalid option '%s', use 'default', 'never' or 'always'"
-msgstr "l'option « %s » ou sa valeur « %s » est non valide"
+msgstr ""
+"l'option « %s » n'est pas valide, utiliser plutôt « default »« never » ou « "
+"always »"
 
-#: ../clients/cli/settings.c:5186 ../clients/cli/settings.c:5225
-#: ../clients/cli/settings.c:5264
+#: ../clients/cli/settings.c:5074 ../clients/cli/settings.c:5113
+#: ../clients/cli/settings.c:5152
 #, c-format
 msgid "the property doesn't contain protocol '%s'"
-msgstr ""
+msgstr "la propriété ne contient pas le protocole « %s »"
 
-#: ../clients/cli/settings.c:5303
+#: ../clients/cli/settings.c:5191
 #, c-format
 msgid ""
 "'%s' not compatible with %s '%s', please change the key or set the right %s "
 "first."
 msgstr ""
+"« %s » n'est pas compatible avec %s « %s » ; veuillez changer la clé et "
+"définir le « %s » qui convient pour commencer."
 
-#: ../clients/cli/settings.c:5311
+#: ../clients/cli/settings.c:5199
 #, c-format
 msgid "WEP key is guessed to be of '%s'\n"
 msgstr "La clé WEP semble être de « %s »\n"
 
-#: ../clients/cli/settings.c:5313
-#, fuzzy, c-format
+#: ../clients/cli/settings.c:5201
+#, c-format
 msgid "WEP key index set to '%d'\n"
-msgstr "La clé WEP semble être de « %s »\n"
+msgstr "L'index de la clé WEP est défini à « %d »\n"
 
-#: ../clients/cli/settings.c:5336
+#: ../clients/cli/settings.c:5224
 #, c-format
 msgid "'%s' not among [0 (unknown), 1 (key), 2 (passphrase)]"
 msgstr "« %s » n'est pas parmi [0 (unknown), 1 (key), 2 (passphrase)]"
 
-#: ../clients/cli/settings.c:5352 ../clients/cli/settings.c:5355
-#: ../clients/cli/settings.c:5358 ../clients/cli/settings.c:5361
+#: ../clients/cli/settings.c:5240 ../clients/cli/settings.c:5243
+#: ../clients/cli/settings.c:5246 ../clients/cli/settings.c:5249
 #, c-format
 msgid ""
 "Warning: '%s' is not compatible with '%s' type, please change or delete the "
 "key.\n"
 msgstr ""
+"Avertissement : « %s » n'est pas compatible avec « %s » ; veuillez changer "
+"ou supprimer la clé.\n"
 
-#: ../clients/cli/settings.c:5374
+#: ../clients/cli/settings.c:5262
 #, c-format
 msgid ""
 "Enter the type of WEP keys. The accepted values are: 0 or unknown, 1 or key, "
@@ -6126,80 +6676,89 @@ msgstr ""
 "Saisissez le type des clés WEP. Les valeurs acceptées sont : 0 ou inconnu, 1 "
 "ou clé et 2 ou phrase de passe.\n"
 
-#: ../clients/cli/settings.c:5387
+#: ../clients/cli/settings.c:5275
 #, c-format
 msgid "'%s' is not a valid PSK"
 msgstr "« %s » n'est pas un PSK valide"
 
-#: ../clients/cli/settings.c:5431
+#: ../clients/cli/settings.c:5319
 #, c-format
 msgid "'%s' is not a valid DCB flag"
-msgstr "« %s » n'est pas un indicateur DCB valide"
+msgstr "« %s » n'est pas un marqueur DCB valide"
 
-#: ../clients/cli/settings.c:5454
+#: ../clients/cli/settings.c:5342
 #, c-format
 msgid "'%s' is not a DCB app priority"
 msgstr "« %s » n'est pas une priorité d'application DCB"
 
-#: ../clients/cli/settings.c:5480
+#: ../clients/cli/settings.c:5368
 msgid "must contain 8 comma-separated numbers"
 msgstr "doit contenir 8 numéros séparés par des virgules"
 
-#: ../clients/cli/settings.c:5497
+#: ../clients/cli/settings.c:5385
 #, c-format
 msgid "'%s' not a number between 0 and %u (inclusive) or %u"
 msgstr "« %s » n'est pas un numéro entre 0 et %u (inclus) ou %u"
 
-#: ../clients/cli/settings.c:5500
+#: ../clients/cli/settings.c:5388
 #, c-format
 msgid "'%s' not a number between 0 and %u (inclusive)"
 msgstr "« %s » n'est pas un numéro entre 0 et %u (inclus)"
 
-#: ../clients/cli/settings.c:5522
+#: ../clients/cli/settings.c:5410
 #, c-format
-msgid ""
-"Warning: changes will have no effect until '%s' includes 1 (enabled)\n"
+msgid "Warning: changes will have no effect until '%s' includes 1 (enabled)\n"
 "\n"
 msgstr ""
 "Avertissement : les changements ne prendront pas effet tant que « %s » "
 "n'inclue pas 1 (activé)\n"
 "\n"
 
-#: ../clients/cli/settings.c:5575
+#: ../clients/cli/settings.c:5463
 #, c-format
 msgid "bandwidth percentages must total 100%%"
 msgstr "le total des pourcentages doit totaliser 100%%"
 
-#: ../clients/cli/settings.c:5661 ../clients/cli/settings.c:5667
+#: ../clients/cli/settings.c:5549 ../clients/cli/settings.c:5555
 msgid "SIM operator ID must be a 5 or 6 number MCCMNC code"
 msgstr ""
+"L'ID de l'opérateur SIM doit correspondre à un code MCCMNC de 5 ou 6 numéros"
 
-#: ../clients/cli/settings.c:5710
-#, fuzzy, c-format
+#: ../clients/cli/settings.c:5598
+#, c-format
 msgid "invalid option '%s', use '%s' or '%s'"
-msgstr "l'option « %s » ou sa valeur « %s » est non valide"
+msgstr "option non valide « %s » ; utiliser « %s » ou « %s »"
 
-#: ../clients/cli/settings.c:7777
+#: ../clients/cli/settings.c:7644
 msgid "don't know how to get the property value"
 msgstr "je ne sais pas comment obtenir la valeur de la propriété"
 
-#: ../clients/cli/settings.c:7830 ../clients/cli/settings.c:7870
+#: ../clients/cli/settings.c:7697 ../clients/cli/settings.c:7737
 msgid "the property can't be changed"
 msgstr "la propriété ne peut pas être modifiée"
 
-#: ../clients/cli/settings.c:7954
-#, fuzzy
+#: ../clients/cli/settings.c:7821
 msgid "(not available)"
-msgstr "indisponible"
+msgstr "( non disponible)"
 
-#: ../clients/cli/settings.c:7979
+#: ../clients/cli/settings.c:7846
 msgid "[NM property description]"
 msgstr "[description de la propriété NM]"
 
-#: ../clients/cli/settings.c:7984
+#: ../clients/cli/settings.c:7851
 msgid "[nmcli specific description]"
 msgstr "[description spécifique de nmcli]"
 
+#. ----------------------------------------------------------------------------
+#: ../clients/cli/settings.c:7900
+msgid "<hidden>"
+msgstr "<hidden>"
+
+#: ../clients/cli/utils.c:124
+#, c-format
+msgid "Error: value for '%s' argument is required."
+msgstr "Erreur : la valeur de l'argument « %s » est requise."
+
 #: ../clients/cli/utils.c:149
 #, c-format
 msgid "Error: Argument '%s' was expected, but '%s' provided."
@@ -6210,58 +6769,97 @@ msgstr "Erreur : l'argument « %s » était attendu, mais « %s » a été
 msgid "Error: Unexpected argument '%s'"
 msgstr "Erreur : argument « %s » inattendu"
 
+#: ../clients/cli/utils.c:202
+#, c-format
+msgid "Error converting IP4 address '0x%X' to text form"
+msgstr "Erreur lors de la conversion de l'adresse IP4 « 0x%X » en texte"
+
+#: ../clients/cli/utils.c:230
+#, c-format
+msgid "Error converting IP6 address '%s' to text form"
+msgstr "Erreur lors de la conversion de l'adresse IP6 « %s » en texte"
+
 #. Translators: the first %s is the partial value entered by
 #. * the user, the second %s a list of compatible values.
-#.
-#: ../clients/cli/utils.c:492 ../clients/cli/utils.c:523
-#, fuzzy, c-format
+#. 
+#: ../clients/cli/utils.c:546 ../clients/cli/utils.c:577
+#, c-format
 msgid "'%s' is ambiguous (%s)"
-msgstr "« %s » est ambigu (%s x %s)"
+msgstr "« %s » est ambigu (%s)"
 
-#: ../clients/cli/utils.c:502
+#: ../clients/cli/utils.c:556
 #, c-format
 msgid "'%s' is not valid; use [%s] or [%s]"
 msgstr "« %s » n'est pas valide ; utilisez [%s] ou [%s]"
 
-#: ../clients/cli/utils.c:535
-#, fuzzy, c-format
+#: ../clients/cli/utils.c:589
+#, c-format
 msgid "'%s' is not valid; use [%s], [%s] or [%s]"
-msgstr "« %s » n'est pas valide ; utilisez [%s] ou [%s]"
+msgstr "« %s » n'est pas valide ; utilisez [%s], [%s] ou [%s]"
 
-#: ../clients/cli/utils.c:634
+#: ../clients/cli/utils.c:688
 #, c-format
 msgid "'%s' is ambiguous (%s x %s)"
 msgstr "« %s » est ambigu (%s x %s)"
 
-#: ../clients/cli/utils.c:646
+#: ../clients/cli/utils.c:700
 #, c-format
 msgid "missing name, try one of [%s]"
 msgstr "nom manquant, essayez l'un de [%s]"
 
-#: ../clients/cli/utils.c:893
+#: ../clients/cli/utils.c:964
 #, c-format
 msgid "field '%s' has to be alone"
 msgstr "champ « %s » doit être seul"
 
-#: ../clients/cli/utils.c:896
+#: ../clients/cli/utils.c:967
 #, c-format
 msgid "invalid field '%s'; allowed fields: %s"
 msgstr "champ « %s » non valide ; champs autorisés : %s"
 
-#: ../clients/cli/utils.c:953
+#: ../clients/cli/utils.c:1024
 msgid "Option '--terse' requires specifying '--fields'"
 msgstr "L'option « --terse » requiert la spécification de « --fields »"
 
-#: ../clients/cli/utils.c:957
+#: ../clients/cli/utils.c:1028
 #, c-format
 msgid "Option '--terse' requires specific '--fields' option values , not '%s'"
 msgstr ""
 "L'option « --terse » requiert des valeurs d'options « --fields » "
 "spécifiques, pas « %s »"
 
+#: ../clients/cli/utils.c:1390
+#, c-format
+msgid ""
+"Warning: nmcli (%s) and NetworkManager (%s) versions don't match. Use --"
+"nocheck to suppress the warning.\n"
+msgstr ""
+"Avertissement : les versions de nmcli (%s) et de NetworkManager (%s) ne "
+"correspondent pas. Utilisez --nocheck pour supprimer cet avertissement.\n"
+
+#: ../clients/cli/utils.c:1399
+#, c-format
+msgid ""
+"Error: nmcli (%s) and NetworkManager (%s) versions don't match. Force "
+"execution using --nocheck, but the results are unpredictable."
+msgstr ""
+"Erreur : les versions de nmcli (%s) et de NetworkManager (%s) ne "
+"correspondent pas. L'exécution peut être forcée avec --nocheck, mais les "
+"résultats sont imprévisibles."
+
 #: ../clients/common/nm-polkit-listener.c:212
 msgid "An authentication session is already underway."
-msgstr ""
+msgstr "Il y a déjà une session d'authentification en cours."
+
+#. TTLS and PEAP are actually much more complicated, but this complication
+#. * is not visible here since we only care about phase2 authentication
+#. * (and don't even care of which one)
+#. 
+#: ../clients/common/nm-secret-agent-simple.c:223
+#: ../clients/common/nm-secret-agent-simple.c:328
+#: ../clients/tui/nmt-page-dsl.c:66 ../clients/tui/nmt-page-wifi.c:332
+msgid "Username"
+msgstr "Nom d'utilisateur : "
 
 #: ../clients/common/nm-secret-agent-simple.c:230
 #: ../clients/common/nm-secret-agent-simple.c:273
@@ -6270,10 +6868,9 @@ msgstr ""
 #: ../clients/common/nm-secret-agent-simple.c:492
 #: ../clients/common/nm-secret-agent-simple.c:507
 #: ../clients/common/nm-secret-agent-simple.c:525
-#: ../clients/common/nm-vpn-helpers.c:119
-#: ../clients/common/nm-vpn-helpers.c:120
-#: ../clients/common/nm-vpn-helpers.c:124
-#: ../clients/common/nm-vpn-helpers.c:127 ../clients/tui/nmt-page-dsl.c:75
+#: ../clients/common/nm-vpn-helpers.c:101
+#: ../clients/common/nm-vpn-helpers.c:102
+#: ../clients/common/nm-vpn-helpers.c:105 ../clients/tui/nmt-page-dsl.c:75
 #: ../clients/tui/nmt-page-wifi.c:277 ../clients/tui/nmt-page-wifi.c:308
 #: ../clients/tui/nmt-page-wifi.c:341
 msgid "Password"
@@ -6349,60 +6946,30 @@ msgid "A password is required to connect to '%s'."
 msgstr "Un mot de passe est requis pour se connecter à « %s »."
 
 #: ../clients/common/nm-secret-agent-simple.c:537
-#, fuzzy
 msgid "VPN password required"
-msgstr "Code PIN requis"
-
-#: ../clients/common/nm-vpn-helpers.c:48
-#, fuzzy, c-format
-msgid "unknown VPN plugin \"%s\""
-msgstr "Domaine de journalisation « %s » inconnu"
-
-#: ../clients/common/nm-vpn-helpers.c:59
-#, c-format
-msgid "cannot cannot load legacy-only VPN plugin \"%s\" for \"%s\""
-msgstr ""
-
-#: ../clients/common/nm-vpn-helpers.c:64
-#, fuzzy, c-format
-msgid ""
-"cannot load VPN plugin \"%s\" due to missing \"%s\". Missing client plugin?"
-msgstr ""
-"impossible de charger le greffon VPN dans « %s » : nom de greffon manquant"
-
-#: ../clients/common/nm-vpn-helpers.c:69
-#, fuzzy, c-format
-msgid "failed to load VPN plugin \"%s\": %s"
-msgstr "Erreur : échec de la modification de %s.%s : %s."
-
-#: ../clients/common/nm-vpn-helpers.c:121
-#, fuzzy
-msgid "Certificate password"
-msgstr "Mot de passe de la clé privée"
+msgstr "Mot de passe VPN requis"
 
-#: ../clients/common/nm-vpn-helpers.c:122
-#, fuzzy
-msgid "HTTP proxy password"
-msgstr "Afficher le mot de passe"
+#: ../clients/common/nm-vpn-helpers.c:61
+msgid "could not get VPN plugin info"
+msgstr "impossible d'obtenir les infos de greffon de VPN"
 
-#: ../clients/common/nm-vpn-helpers.c:125
-#: ../clients/common/nm-vpn-helpers.c:128
-#, fuzzy
+#: ../clients/common/nm-vpn-helpers.c:103
+#: ../clients/common/nm-vpn-helpers.c:106
 msgid "Group password"
-msgstr "Afficher le mot de passe"
+msgstr "Mot de passe de groupe"
 
-#: ../clients/common/nm-vpn-helpers.c:130 ../clients/tui/nmt-page-ip4.c:143
+#: ../clients/common/nm-vpn-helpers.c:108 ../clients/tui/nmt-page-ip4.c:143
 #: ../clients/tui/nmt-page-ip6.c:143
 msgid "Gateway"
 msgstr "Passerelle"
 
-#: ../clients/common/nm-vpn-helpers.c:131
+#: ../clients/common/nm-vpn-helpers.c:109
 msgid "Cookie"
-msgstr ""
+msgstr "Cookie"
 
-#: ../clients/common/nm-vpn-helpers.c:132
+#: ../clients/common/nm-vpn-helpers.c:110
 msgid "Gateway certificate hash"
-msgstr ""
+msgstr "Hachage de certificat de passerelle"
 
 #: ../clients/nm-online.c:94
 msgid "Connecting"
@@ -6417,20 +6984,18 @@ msgstr ""
 "défaut est 30)"
 
 #: ../clients/nm-online.c:148
-#, fuzzy
 msgid "Exit immediately if NetworkManager is not running or connecting"
-msgstr "Quitter immédiatement si NetworkManager n'est pas en cours d'exécution"
+msgstr ""
+"Quitter immédiatement si NetworkManager n'exécute pas ou n'est pas en cours "
+"d'exécution"
 
 #: ../clients/nm-online.c:149
 msgid "Don't print anything"
 msgstr "Ne rien imprimer"
 
 #: ../clients/nm-online.c:150
-#, fuzzy
 msgid "Wait for NetworkManager startup instead of a connection"
-msgstr ""
-"Attend que NetworkManager finisse d'activer les connexion réseau de "
-"démarrage."
+msgstr "Attend que NetworkManager démarre au  lieu d'une connexion"
 
 #: ../clients/nm-online.c:171
 msgid ""
@@ -6448,7 +7013,7 @@ msgstr ""
 #: ../clients/tui/newt/nmt-newt-utils.c:177 ../clients/tui/nmt-editor.c:415
 #: ../clients/tui/nmt-password-dialog.c:174
 #: ../clients/tui/nmt-route-editor.c:122 ../clients/tui/nmtui-hostname.c:69
-#: ../clients/tui/nmtui.c:136
+#: ../clients/tui/nmtui.c:114
 msgid "OK"
 msgstr "Valider"
 
@@ -6464,52 +7029,37 @@ msgid "Editor failed: %s"
 msgstr "L'éditeur a échoué : %s"
 
 #: ../clients/tui/newt/nmt-newt-utils.c:373
-#, fuzzy, c-format
+#, c-format
 msgid "Editor failed with status %d"
-msgstr "L'éditeur a échoué : %s"
+msgstr "L'éditeur a échoué avec un statut %d"
 
 #: ../clients/tui/newt/nmt-newt-utils.c:375
-#, fuzzy, c-format
+#, c-format
 msgid "Editor failed with signal %d"
-msgstr "L'éditeur a échoué : %s"
+msgstr "L'éditeur a échoué avec un signal %d"
 
 #: ../clients/tui/newt/nmt-newt-utils.c:379
 #, c-format
 msgid "Could not re-read file: %s"
 msgstr "Impossible de relire le fichier : %s"
 
-#: ../clients/tui/nm-editor-utils.c:146 ../libnm-glib/nm-device.c:1859
-#: ../libnm/nm-device.c:1810
-msgid "Ethernet"
-msgstr "Ethernet"
-
 #: ../clients/tui/nm-editor-utils.c:150
 #, c-format
 msgid "Ethernet connection %d"
 msgstr "Connexion Ethernet %d"
 
-#: ../clients/tui/nm-editor-utils.c:154 ../libnm-glib/nm-device.c:1861
-#: ../libnm/nm-device.c:1812
-msgid "Wi-Fi"
-msgstr "Wi-Fi"
-
 #: ../clients/tui/nm-editor-utils.c:158
 #, c-format
 msgid "Wi-Fi connection %d"
 msgstr "Connexion Wi-Fi %d"
 
-#: ../clients/tui/nm-editor-utils.c:163 ../libnm-core/nm-connection.c:1748
-#: ../libnm-glib/nm-device.c:1871 ../libnm/nm-device.c:1822
-msgid "InfiniBand"
-msgstr "InfiniBand"
-
 #: ../clients/tui/nm-editor-utils.c:167
 #, c-format
 msgid "InfiniBand connection %d"
 msgstr "Connexion InfiniBand %d"
 
-#: ../clients/tui/nm-editor-utils.c:172 ../libnm-glib/nm-device.c:1869
-#: ../libnm/nm-device.c:1820
+#: ../clients/tui/nm-editor-utils.c:172 ../libnm-glib/nm-device.c:1859
+#: ../libnm/nm-device.c:1810
 msgid "Mobile Broadband"
 msgstr "Haut débit mobile"
 
@@ -6527,9 +7077,9 @@ msgstr "DSL"
 msgid "DSL connection %d"
 msgstr "Connexion DSL %d"
 
-#: ../clients/tui/nm-editor-utils.c:190 ../libnm-core/nm-connection.c:1740
-#: ../libnm-glib/nm-device.c:1873 ../libnm-util/nm-connection.c:1626
-#: ../libnm/nm-device.c:1824 ../src/settings/plugins/ifcfg-rh/reader.c:4195
+#: ../clients/tui/nm-editor-utils.c:190 ../libnm-core/nm-connection.c:1708
+#: ../libnm-glib/nm-device.c:1863 ../libnm-util/nm-connection.c:1626
+#: ../libnm/nm-device.c:1814 ../src/settings/plugins/ifcfg-rh/reader.c:4182
 msgid "Bond"
 msgstr "Liaison"
 
@@ -6538,9 +7088,9 @@ msgstr "Liaison"
 msgid "Bond connection %d"
 msgstr "Connexion de liaison %d"
 
-#: ../clients/tui/nm-editor-utils.c:199 ../libnm-core/nm-connection.c:1744
-#: ../libnm-glib/nm-device.c:1877 ../libnm-util/nm-connection.c:1630
-#: ../libnm/nm-device.c:1828 ../src/settings/plugins/ifcfg-rh/reader.c:4492
+#: ../clients/tui/nm-editor-utils.c:199 ../libnm-core/nm-connection.c:1712
+#: ../libnm-glib/nm-device.c:1867 ../libnm-util/nm-connection.c:1630
+#: ../libnm/nm-device.c:1818 ../src/settings/plugins/ifcfg-rh/reader.c:4479
 msgid "Bridge"
 msgstr "Pont"
 
@@ -6549,9 +7099,9 @@ msgstr "Pont"
 msgid "Bridge connection %d"
 msgstr "Connexion de pont %d"
 
-#: ../clients/tui/nm-editor-utils.c:208 ../libnm-core/nm-connection.c:1742
-#: ../libnm-glib/nm-device.c:1875 ../libnm-util/nm-connection.c:1628
-#: ../libnm/nm-device.c:1826 ../src/settings/plugins/ifcfg-rh/reader.c:4301
+#: ../clients/tui/nm-editor-utils.c:208 ../libnm-core/nm-connection.c:1710
+#: ../libnm-glib/nm-device.c:1865 ../libnm-util/nm-connection.c:1628
+#: ../libnm/nm-device.c:1816 ../src/settings/plugins/ifcfg-rh/reader.c:4288
 msgid "Team"
 msgstr "Équipe"
 
@@ -6609,7 +7159,6 @@ msgid "Could not create editor for invalid connection '%s'."
 msgstr "Impossible de créer un éditeur pour la connexion invalide « %s »."
 
 #: ../clients/tui/nmt-editor.c:111
-#, fuzzy
 msgid "Edit Connection"
 msgstr "Modifier la connexion"
 
@@ -6628,7 +7177,6 @@ msgid "Profile name"
 msgstr "Nom du profil"
 
 #: ../clients/tui/nmt-editor.c:331
-#, fuzzy
 msgid "Ethernet device"
 msgstr "Ethernet"
 
@@ -6758,7 +7306,7 @@ msgstr "Durée de vieillissement"
 
 #: ../clients/tui/nmt-page-bridge.c:91
 msgid "Enable IGMP snooping"
-msgstr ""
+msgstr "Activer le snoopingIGMP"
 
 #: ../clients/tui/nmt-page-bridge.c:97
 msgid "Enable STP (Spanning Tree Protocol)"
@@ -6797,6 +7345,10 @@ msgstr "Connecté"
 msgid "INFINIBAND"
 msgstr "INFINIBAND"
 
+#: ../clients/tui/nmt-page-infiniband.c:88
+msgid "Transport mode"
+msgstr "Mode de transport"
+
 #: ../clients/tui/nmt-page-ip4.c:38
 msgid "Disabled"
 msgstr "Désactivé"
@@ -6854,7 +7406,7 @@ msgstr "Ne jamais utiliser ce réseau comme route par défaut"
 
 #: ../clients/tui/nmt-page-ip4.c:179 ../clients/tui/nmt-page-ip6.c:177
 msgid "Ignore automatically obtained routes"
-msgstr ""
+msgstr "Ignorer les routes obtenues automatiquement"
 
 #: ../clients/tui/nmt-page-ip4.c:187
 msgid "Require IPv4 addressing for this connection"
@@ -6877,64 +7429,60 @@ msgid "Require IPv6 addressing for this connection"
 msgstr "Requiert l'adressage IPv6 pour cette connexion"
 
 #: ../clients/tui/nmt-page-ppp.c:131
-#, fuzzy
 msgid "PPP CONFIGURATION"
-msgstr "CONFIGURATION IPv4"
+msgstr "CONFIGURATION PPP"
 
 #: ../clients/tui/nmt-page-ppp.c:140
-#, fuzzy
 msgid "Allowed authentication methods:"
-msgstr "Authentification"
+msgstr "Méthodes d'authentification autorisées :"
 
 #: ../clients/tui/nmt-page-ppp.c:147
-#, fuzzy
 msgid "EAP"
-msgstr "LEAP"
+msgstr "EAP"
 
 #: ../clients/tui/nmt-page-ppp.c:155
-#, fuzzy
 msgid "PAP"
-msgstr "PA"
+msgstr "PAP"
 
 #: ../clients/tui/nmt-page-ppp.c:163
 msgid "CHAP"
-msgstr ""
+msgstr "CHAP"
 
 #: ../clients/tui/nmt-page-ppp.c:171
 msgid "MSCHAPv2"
-msgstr ""
+msgstr "MSCHAPv2"
 
 #: ../clients/tui/nmt-page-ppp.c:179
 msgid "MSCHAP"
-msgstr ""
+msgstr "MSCHAP"
 
 #: ../clients/tui/nmt-page-ppp.c:195
 msgid "Use point-to-point encryption (MPPE)"
-msgstr ""
+msgstr "Codification d'un point à un autre (MPPE)"
 
 #: ../clients/tui/nmt-page-ppp.c:207
 msgid "Require 128-bit encryption"
-msgstr ""
+msgstr "Codification 128-bit exigée"
 
 #: ../clients/tui/nmt-page-ppp.c:217
 msgid "Use stateful MPPE"
-msgstr ""
+msgstr "Utiliser MPPE stateful"
 
 #: ../clients/tui/nmt-page-ppp.c:229
 msgid "Allow BSD data compression"
-msgstr ""
+msgstr "Autoriser la décompression de données BSD"
 
 #: ../clients/tui/nmt-page-ppp.c:237
 msgid "Allow Deflate data compression"
-msgstr ""
+msgstr "Autoriser la déflation de compression de données"
 
 #: ../clients/tui/nmt-page-ppp.c:245
 msgid "Use TCP header compression"
-msgstr ""
+msgstr "Utiliser la compression de l'en-tête TCP"
 
 #: ../clients/tui/nmt-page-ppp.c:255
 msgid "Send PPP echo packets"
-msgstr ""
+msgstr "Envoyer les paquets d'échos PPP"
 
 #: ../clients/tui/nmt-page-team-port.c:92
 msgid "TEAM PORT"
@@ -7114,21 +7662,23 @@ msgid ""
 "openconnect will be run to authenticate.\n"
 "It will return to nmtui when completed."
 msgstr ""
+"openconnect sera exécuté pour authentifier.\n"
+"Retournera à nmtui une fois terminé."
 
 #: ../clients/tui/nmtui-connect.c:68
-#, fuzzy, c-format
+#, c-format
 msgid "Error: openconnect failed: %s"
-msgstr "Erreur : la suppression de la connexion a échoué : %s"
+msgstr "Erreur : openconnect a échoué : %s"
 
 #: ../clients/tui/nmtui-connect.c:75
 #, c-format
 msgid "openconnect failed with status %d"
-msgstr ""
+msgstr "openconnect a échoué avec pour statut %d"
 
 #: ../clients/tui/nmtui-connect.c:79
 #, c-format
 msgid "openconnect failed with signal %d"
-msgstr ""
+msgstr "openconnect a échoué avec un signal %d"
 
 #: ../clients/tui/nmtui-connect.c:178
 msgid "Activation failed"
@@ -7152,14 +7702,10 @@ msgid "Deactivate"
 msgstr "Désactiver"
 
 #: ../clients/tui/nmtui-connect.c:413 ../clients/tui/nmtui-edit.c:120
-#: ../clients/tui/nmtui.c:130
+#: ../clients/tui/nmtui.c:108
 msgid "Quit"
 msgstr "Quitter"
 
-#: ../clients/tui/nmtui-connect.c:413 ../clients/tui/nmtui-edit.c:120
-msgid "Back"
-msgstr ""
-
 #: ../clients/tui/nmtui-connect.c:436
 #, c-format
 msgid "No such connection '%s'"
@@ -7183,8 +7729,8 @@ msgid ""
 "not appear in the list, you may not have the correct VPN plugin installed."
 msgstr ""
 "Si vous êtes en train de créer un VPN et que la connexion VPN que vous "
-"souhaitez créer n'apparaît pas dans la liste, il se peut que le plugin VPN "
-"installé ne soit pas le le bon. "
+"souhaitez créer n'apparaît pas dans la liste, il se peut que le greffon VPN "
+"installé ne soit pas le bon. "
 
 #: ../clients/tui/nmtui-edit.c:411 ../clients/tui/nmtui-edit.c:427
 msgid "New Connection"
@@ -7196,9 +7742,9 @@ msgid "Unable to delete connection: %s"
 msgstr "Impossible de supprimer la connexion : %s"
 
 #: ../clients/tui/nmtui-edit.c:505
-#, fuzzy, c-format
+#, c-format
 msgid "Could not delete connection '%s': %s"
-msgstr "Impossible de supprimer la connexion : %s"
+msgstr "Impossible de supprimer la connexion : « %s » : %s"
 
 #: ../clients/tui/nmtui-edit.c:527
 #, c-format
@@ -7244,28 +7790,28 @@ msgstr "nouveau nom d'hôte"
 msgid "Set system hostname"
 msgstr "Définir le nom d'hôte du système"
 
-#: ../clients/tui/nmtui.c:104
+#: ../clients/tui/nmtui.c:83
 msgid "NetworkManager TUI"
 msgstr "NetworkManager TUI"
 
-#: ../clients/tui/nmtui.c:112
+#: ../clients/tui/nmtui.c:91
 msgid "Please select an option"
 msgstr "Veuillez sélectionner une option"
 
-#: ../clients/tui/nmtui.c:160
+#: ../clients/tui/nmtui.c:143
 msgid "Usage"
-msgstr "Utilisation"
+msgstr "Syntaxe"
 
-#: ../clients/tui/nmtui.c:241
+#: ../clients/tui/nmtui.c:224
 msgid "Could not parse arguments"
 msgstr "Impossible d'analyser les arguments"
 
-#: ../clients/tui/nmtui.c:251
-#, fuzzy, c-format
+#: ../clients/tui/nmtui.c:234
+#, c-format
 msgid "Could not contact NetworkManager: %s.\n"
-msgstr "Impossible d'activer la connexion : « %s »"
+msgstr "Impossible de contacter le NetworkManager : « %s »\n"
 
-#: ../clients/tui/nmtui.c:256
+#: ../clients/tui/nmtui.c:239
 msgid "NetworkManager is not running."
 msgstr "NetworkManager n'est pas en cours d'exécution."
 
@@ -7354,7 +7900,7 @@ msgstr "Impossible de déterminer le type de la clé privée."
 #: ../libnm-core/crypto.c:502
 #, c-format
 msgid "Password provided, but key was not encrypted."
-msgstr ""
+msgstr "Mot de passe donné, mais la clé n'était pas encryptée."
 
 #: ../libnm-core/crypto.c:555 ../libnm-util/crypto.c:571
 #, c-format
@@ -7381,15 +7927,15 @@ msgid "Invalid IV length (must be at least %zd)."
 msgstr "Longueur IV non valide (minimum %zd)."
 
 #: ../libnm-core/crypto_gnutls.c:115 ../libnm-util/crypto_gnutls.c:175
-#, fuzzy, c-format
+#, c-format
 msgid "Failed to initialize the decryption cipher context: %s (%s)"
 msgstr ""
-"L'initialisation du contexte du chiffre de déchiffrement a échoué : %s / %s."
+"L'initialisation du contexte du chiffre de déchiffrement a échoué : %s (%s)"
 
 #: ../libnm-core/crypto_gnutls.c:124 ../libnm-util/crypto_gnutls.c:184
-#, fuzzy, c-format
+#, c-format
 msgid "Failed to decrypt the private key: %s (%s)"
-msgstr "Le déchiffrement de la clé privée a échoué : %s / %s."
+msgstr "Le déchiffrement de la clé privée a échoué : %s (%s)"
 
 #: ../libnm-core/crypto_gnutls.c:134 ../libnm-core/crypto_nss.c:202
 #: ../libnm-util/crypto_gnutls.c:194 ../libnm-util/crypto_nss.c:252
@@ -7406,15 +7952,15 @@ msgid "Failed to decrypt the private key."
 msgstr "Le déchiffrement de la clé privée a échoué."
 
 #: ../libnm-core/crypto_gnutls.c:224 ../libnm-util/crypto_gnutls.c:283
-#, fuzzy, c-format
+#, c-format
 msgid "Failed to initialize the encryption cipher context: %s (%s)"
 msgstr ""
-"L'initialisation du contexte du cryptage de chiffrement a échoué : %s / %s."
+"L'initialisation du contexte du cryptage de chiffrement a échoué : %s (%s)"
 
 #: ../libnm-core/crypto_gnutls.c:233 ../libnm-util/crypto_gnutls.c:292
-#, fuzzy, c-format
+#, c-format
 msgid "Failed to encrypt the data: %s (%s)"
-msgstr "Le chiffrement des données a échoué : %s / %s."
+msgstr "Le chiffrement des données a échoué : %s (%s)"
 
 #: ../libnm-core/crypto_gnutls.c:276 ../libnm-util/crypto_gnutls.c:332
 #, c-format
@@ -7502,7 +8048,8 @@ msgstr "La finalisation du déchiffrement de la clé privée a échoué : %d."
 #: ../libnm-core/crypto_nss.c:299 ../libnm-util/crypto_nss.c:345
 #, c-format
 msgid "Failed to initialize the encryption cipher slot."
-msgstr "L'initialisation de l'emplacement du cryptage de chiffrement a échoué."
+msgstr ""
+"L'initialisation de l'emplacement du cryptage de chiffrement a échoué."
 
 #: ../libnm-core/crypto_nss.c:307 ../libnm-util/crypto_nss.c:353
 #, c-format
@@ -7537,7 +8084,7 @@ msgstr "Impossible de décoder le certificat : %d"
 #: ../libnm-core/crypto_nss.c:420
 #, c-format
 msgid "Password must be UTF-8"
-msgstr ""
+msgstr "Le mot de passe doit être UTF-8"
 
 #: ../libnm-core/crypto_nss.c:450 ../libnm-util/crypto_nss.c:488
 #, c-format
@@ -7558,55 +8105,51 @@ msgstr "Impossible de vérifier le fichier PKCS#12 : %d"
 msgid "Could not generate random data."
 msgstr "Impossible de générer des données aléatoires."
 
-#: ../libnm-core/nm-connection.c:225
+#: ../libnm-core/nm-connection.c:224
 msgid "wrong type; should be a list of strings."
-msgstr ""
+msgstr "Type erroné ; doit correspondre à une liste de chaînes."
 
-#: ../libnm-core/nm-connection.c:295
-#, fuzzy
+#: ../libnm-core/nm-connection.c:294
 msgid "unknown setting name"
-msgstr "Erreur : paramètre inconnu « %s »\n"
+msgstr "Nom de paramètre inconnu"
 
-#: ../libnm-core/nm-connection.c:307
-#, fuzzy
+#: ../libnm-core/nm-connection.c:306
 msgid "duplicate setting name"
-msgstr "Erreur : paramètre inconnu « %s »\n"
+msgstr "reproduire le nom du paramètre"
 
-#: ../libnm-core/nm-connection.c:905
+#: ../libnm-core/nm-connection.c:873
 msgid "setting not found"
-msgstr ""
+msgstr "paramètre non trouvé"
 
-#: ../libnm-core/nm-connection.c:969
-#, fuzzy
+#: ../libnm-core/nm-connection.c:937
 msgid "setting not allowed in slave connection"
-msgstr "Le paramètre « %s » n'est pas présent dans la connexion.\n"
+msgstr "le paramètre n'est pas accepté dans la connexion esclave"
 
-#: ../libnm-core/nm-connection.c:980
+#: ../libnm-core/nm-connection.c:948
 msgid "setting is required for non-slave connections"
-msgstr ""
+msgstr "paramètre requis pour les connexions non esclaves"
 
-#: ../libnm-core/nm-connection.c:1074
-#, fuzzy
+#: ../libnm-core/nm-connection.c:1042
 msgid "Unexpected failure to verify the connection"
-msgstr "Impossible de supprimer la connexion : %s"
+msgstr "Erreur inattendue lors de la vérification de la connexion"
 
-#: ../libnm-core/nm-connection.c:1107
-#, fuzzy
+#: ../libnm-core/nm-connection.c:1075
 msgid "Unexpected failure to normalize the connection"
-msgstr "Impossible de supprimer la connexion : %s"
+msgstr "Erreur inattendue lors de la normalisation de la connexion"
 
-#: ../libnm-core/nm-connection.c:1608 ../libnm-core/nm-setting-8021x.c:2411
+#: ../libnm-core/nm-connection.c:1576 ../libnm-core/nm-setting-8021x.c:2411
 #: ../libnm-core/nm-setting-8021x.c:2428 ../libnm-core/nm-setting-8021x.c:2459
 #: ../libnm-core/nm-setting-8021x.c:2476 ../libnm-core/nm-setting-8021x.c:2518
 #: ../libnm-core/nm-setting-8021x.c:2530 ../libnm-core/nm-setting-8021x.c:2548
 #: ../libnm-core/nm-setting-8021x.c:2560 ../libnm-core/nm-setting-8021x.c:2584
 #: ../libnm-core/nm-setting-8021x.c:2749 ../libnm-core/nm-setting-adsl.c:189
 #: ../libnm-core/nm-setting-bluetooth.c:120
-#: ../libnm-core/nm-setting-bluetooth.c:138 ../libnm-core/nm-setting-cdma.c:141
+#: ../libnm-core/nm-setting-bluetooth.c:138
+#: ../libnm-core/nm-setting-cdma.c:141
 #: ../libnm-core/nm-setting-connection.c:837
 #: ../libnm-core/nm-setting-connection.c:876
 #: ../libnm-core/nm-setting-connection.c:989
-#: ../libnm-core/nm-setting-ip-config.c:2186
+#: ../libnm-core/nm-setting-ip-config.c:2167
 #: ../libnm-core/nm-setting-olpc-mesh.c:120
 #: ../libnm-core/nm-setting-pppoe.c:142 ../libnm-core/nm-setting-vpn.c:419
 #: ../libnm-core/nm-setting-vxlan.c:360 ../libnm-core/nm-setting-wimax.c:126
@@ -7618,8 +8161,10 @@ msgstr "Impossible de supprimer la connexion : %s"
 #: ../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-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
@@ -7637,210 +8182,207 @@ msgstr "la propriété est manquante"
 #: ../libnm-core/nm-dbus-utils.c:188
 #, c-format
 msgid "Method returned type '%s', but expected '%s'"
-msgstr ""
+msgstr "La méthode a renvoyé le type « %s », mais « %s » était attendu"
 
 #: ../libnm-core/nm-keyfile-reader.c:136
 msgid "ignoring missing number"
-msgstr ""
+msgstr "numéro manquant ignoré"
 
 #: ../libnm-core/nm-keyfile-reader.c:145
-#, fuzzy, c-format
+#, c-format
 msgid "ignoring invalid number '%s'"
-msgstr "métrique « %s » non valide"
+msgstr "numéro « %s » ignoré"
 
 #: ../libnm-core/nm-keyfile-reader.c:165
-#, fuzzy, c-format
+#, c-format
 msgid "ignoring invalid %s address: %s"
-msgstr "adresse IPv4 « %s » non valide"
+msgstr "adresse non valide « %s » ignorée : %s"
 
 #: ../libnm-core/nm-keyfile-reader.c:205
-#, fuzzy, c-format
+#, c-format
 msgid "ignoring invalid gateway '%s' for %s route"
-msgstr "passerelle « %s » non valide"
+msgstr "passerelle non valide « %s » ignorée pour la route %s"
 
 #: ../libnm-core/nm-keyfile-reader.c:225
-#, fuzzy, c-format
+#, c-format
 msgid "ignoring invalid %s route: %s"
-msgstr "route IPv4 « %s » non valide"
+msgstr "route %s non valide ignorée : %s"
 
 #: ../libnm-core/nm-keyfile-reader.c:343
 #, c-format
 msgid "unexpected character '%c' for address %s: '%s' (position %td)"
-msgstr ""
+msgstr "le caractère inattendu « %c » de l'adresse %s : « %s » (position %td)"
 
 #: ../libnm-core/nm-keyfile-reader.c:353
 #, c-format
 msgid "unexpected character '%c' for %s: '%s' (position %td)"
-msgstr ""
+msgstr "caractère inattendu « %c » pour « %s » : « %s » (position %td)"
 
 #: ../libnm-core/nm-keyfile-reader.c:362
 #, c-format
 msgid "unexpected character '%c' in prefix length for %s: '%s' (position %td)"
 msgstr ""
+"caractère inattendu « %c » en longueur de préfixe pour %s : « %s » (position "
+"%td)"
 
 #: ../libnm-core/nm-keyfile-reader.c:373
 #, c-format
 msgid "garbage at the end of value %s: '%s'"
-msgstr ""
+msgstr "informations unutiles à la fin de %s : « %s »"
 
 #: ../libnm-core/nm-keyfile-reader.c:379
 #, c-format
 msgid "deprecated semicolon at the end of value %s: '%s'"
-msgstr ""
+msgstr "point virgule obsolète à la fin de %s : « %s »"
 
 #: ../libnm-core/nm-keyfile-reader.c:394
 #, c-format
 msgid "invalid prefix length for %s '%s', defaulting to %d"
-msgstr ""
+msgstr "longueur de préfixe non valide pour %s : « %s », valeur par défaut %d"
 
 #: ../libnm-core/nm-keyfile-reader.c:401
 #, c-format
 msgid "missing prefix length for %s '%s', defaulting to %d"
-msgstr ""
+msgstr "longueur de préfixe manquante pour %s : « %s », valeur par défaut %d"
 
 #: ../libnm-core/nm-keyfile-reader.c:504
-#, fuzzy, c-format
+#, c-format
 msgid "ignoring invalid DNS server IPv4 address '%s'"
-msgstr "adresse IPv4 « %s » non valide"
+msgstr "l'adresse IPv4 « %s » du serveur DNS non valide est ignorée"
 
 #: ../libnm-core/nm-keyfile-reader.c:543
-#, fuzzy, c-format
+#, c-format
 msgid "ignoring invalid DNS server IPv6 address '%s'"
-msgstr "adresse IPv6 « %s » non valide"
+msgstr "adresse IPv6 « %s » du serveur DNS non valide est ignorée"
 
 #: ../libnm-core/nm-keyfile-reader.c:628 ../libnm-core/nm-keyfile-reader.c:769
 #: ../libnm-core/nm-keyfile-reader.c:1446
 #, c-format
 msgid "ignoring invalid byte element '%d' (not between 0 and 255 inclusive)"
 msgstr ""
+"élément octet non valide « %d » ignoré (ne doit pas être compris entre 0 et "
+"255 inclus)"
 
 #: ../libnm-core/nm-keyfile-reader.c:642
-#, fuzzy
 msgid "ignoring invalid MAC address"
-msgstr "n'est pas une adresse MAC valide"
+msgstr "adresse MAC non valide ignorée"
 
 #: ../libnm-core/nm-keyfile-reader.c:758
-#, fuzzy
 msgid "ignoring invalid binary property"
-msgstr "Erreur : propriété non valide : %s\n"
+msgstr "propriété binaire non valide ignorée"
 
 #: ../libnm-core/nm-keyfile-reader.c:801
 msgid "ignoring invalid SSID"
-msgstr ""
+msgstr "SSID non valide ignoré"
 
 #: ../libnm-core/nm-keyfile-reader.c:817
 msgid "ignoring invalid raw password"
-msgstr ""
+msgstr "mot de passe brut non valid ignoré"
 
-#: ../libnm-core/nm-keyfile-reader.c:892 ../libnm-core/nm-keyfile-reader.c:1058
+#: ../libnm-core/nm-keyfile-reader.c:892
+#: ../libnm-core/nm-keyfile-reader.c:1058
 #, c-format
 msgid "certificate or key file '%s' does not exist"
-msgstr ""
+msgstr "certificat ou fichier clé « %s » n'existe pas"
 
 #: ../libnm-core/nm-keyfile-reader.c:897
-#, fuzzy, c-format
+#, c-format
 msgid "invalid key/cert value path \"%s\""
-msgstr "« %s » ou sa valeur « %s » n'est pas valide"
+msgstr "chemin de valeur de cert / clé non valide « %s »"
 
 #: ../libnm-core/nm-keyfile-reader.c:935
 msgid "invalid key/cert value data:;base64, is not base64"
-msgstr ""
+msgstr "clé non valide / cert data:;base64, n'est pas base64"
 
 #: ../libnm-core/nm-keyfile-reader.c:948
 msgid "invalid key/cert value data:;base64,file://"
-msgstr ""
+msgstr "valeur de clé / cert data non valide :;base64,file://"
 
 #: ../libnm-core/nm-keyfile-reader.c:1095
 msgid "invalid key/cert value is not a valid blob"
-msgstr ""
+msgstr "valeur de cert / clé non valide n'est pas un blob valide"
 
 #: ../libnm-core/nm-keyfile-reader.c:1100
-#, fuzzy
 msgid "invalid key/cert value"
-msgstr "« %s » ou sa valeur « %s » n'est pas valide"
+msgstr "valeur clé/cert non valide"
 
 #: ../libnm-core/nm-keyfile-reader.c:1147
-#, fuzzy, c-format
+#, c-format
 msgid "invalid parity value '%s'"
-msgstr "« %s » ou sa valeur « %s » n'est pas valide"
+msgstr "valeur de parité « %s » non valide"
 
 #: ../libnm-core/nm-keyfile-reader.c:1347
-#, fuzzy, c-format
+#, c-format
 msgid "error loading setting value: %s"
-msgstr "Erreur : nom de paramètre non valide ; %s\n"
+msgstr "erreur de chargement de la valeur du paramètre : %s"
 
 #: ../libnm-core/nm-keyfile-reader.c:1379
-#, fuzzy, c-format
+#, c-format
 msgid "invalid negative value (%i)"
-msgstr "passerelle « %s » non valide"
+msgstr "valeur négative non valide (%i)"
 
 #: ../libnm-core/nm-keyfile-reader.c:1400
-#, fuzzy, c-format
+#, c-format
 msgid "invalid char value (%i)"
-msgstr "« %s » ou sa valeur « %s » n'est pas valide"
+msgstr "valeur char non valide (%i)"
 
 #: ../libnm-core/nm-keyfile-reader.c:1423
-#, fuzzy, c-format
+#, c-format
 msgid "invalid int64 value (%s)"
-msgstr "« %s » ou sa valeur « %s » n'est pas valide"
+msgstr "valeur int64 non valide (%s)"
 
 #: ../libnm-core/nm-keyfile-reader.c:1482
 #, c-format
 msgid "too large FLAGS property '%s' (%llu)"
-msgstr ""
+msgstr "propriété FLAGS trop grande « %s » (%llu)"
 
 #: ../libnm-core/nm-keyfile-reader.c:1495
-#, fuzzy, c-format
+#, c-format
 msgid "unhandled setting property type '%s'"
-msgstr "Erreur : « %s » <setting>.<property> non valide."
+msgstr "type de propriété de configuration non prise en charge « %s »"
 
 #: ../libnm-core/nm-keyfile-reader.c:1526
-#, fuzzy, c-format
+#, c-format
 msgid "invalid setting name '%s'"
-msgstr "Erreur : nom de paramètre non valide ; %s\n"
+msgstr "nom de configuration non valide « %s »"
 
 #: ../libnm-core/nm-setting-8021x.c:414
-#, fuzzy
 msgid "data missing"
 msgstr "propriété manquante"
 
 #: ../libnm-core/nm-setting-8021x.c:448
 msgid "binary data missing"
-msgstr ""
+msgstr "donnée binaire manquante"
 
 #: ../libnm-core/nm-setting-8021x.c:465
 msgid "file:// URI not NUL terminated"
-msgstr ""
+msgstr "file:// URI non NUL terminé"
 
 #: ../libnm-core/nm-setting-8021x.c:474
 msgid "file:// URI is empty"
-msgstr ""
+msgstr "file:// URI vide"
 
 #: ../libnm-core/nm-setting-8021x.c:482
-#, fuzzy
 msgid "file:// URI is not valid UTF-8"
-msgstr "index « %s » non valide"
+msgstr "file:// URI n'est pas un UTF-8 valide"
 
 #: ../libnm-core/nm-setting-8021x.c:681 ../libnm-util/nm-setting-8021x.c:639
 msgid "CA certificate must be in X.509 format"
-msgstr ""
+msgstr "certificat CA doit être sous le format X.509"
 
 #: ../libnm-core/nm-setting-8021x.c:1012 ../libnm-core/nm-setting-8021x.c:1276
 #: ../libnm-core/nm-setting-8021x.c:1612 ../libnm-util/nm-setting-8021x.c:957
 #: ../libnm-util/nm-setting-8021x.c:1220 ../libnm-util/nm-setting-8021x.c:1543
-#, fuzzy
 msgid "invalid certificate format"
-msgstr "Erreur lors de l'initialisation des données du certificat : %s"
+msgstr "format de certificat non valide"
 
 #: ../libnm-core/nm-setting-8021x.c:1895 ../libnm-util/nm-setting-8021x.c:1812
-#, fuzzy
 msgid "invalid private key"
-msgstr "passerelle « %s » non valide"
+msgstr "clé privée non valide"
 
 #: ../libnm-core/nm-setting-8021x.c:2207 ../libnm-util/nm-setting-8021x.c:2123
-#, fuzzy
 msgid "invalid phase2 private key"
-msgstr "Le déchiffrement de la clé privée a échoué."
+msgstr "clé privée phase2 non valide"
 
 #: ../libnm-core/nm-setting-8021x.c:2418 ../libnm-core/nm-setting-8021x.c:2435
 #: ../libnm-core/nm-setting-8021x.c:2466 ../libnm-core/nm-setting-8021x.c:2483
@@ -7849,9 +8391,10 @@ msgstr "Le déchiffrement de la clé privée a échoué."
 #: ../libnm-core/nm-setting-8021x.c:2591 ../libnm-core/nm-setting-adsl.c:196
 #: ../libnm-core/nm-setting-cdma.c:148 ../libnm-core/nm-setting-cdma.c:157
 #: ../libnm-core/nm-setting-connection.c:844
-#: ../libnm-core/nm-setting-connection.c:887 ../libnm-core/nm-setting-gsm.c:281
-#: ../libnm-core/nm-setting-gsm.c:338 ../libnm-core/nm-setting-gsm.c:375
-#: ../libnm-core/nm-setting-gsm.c:384 ../libnm-core/nm-setting-ip-config.c:2193
+#: ../libnm-core/nm-setting-connection.c:887
+#: ../libnm-core/nm-setting-gsm.c:281 ../libnm-core/nm-setting-gsm.c:338
+#: ../libnm-core/nm-setting-gsm.c:375 ../libnm-core/nm-setting-gsm.c:384
+#: ../libnm-core/nm-setting-ip-config.c:2174
 #: ../libnm-core/nm-setting-ip4-config.c:198
 #: ../libnm-core/nm-setting-ip4-config.c:205
 #: ../libnm-core/nm-setting-pppoe.c:149 ../libnm-core/nm-setting-pppoe.c:158
@@ -7867,8 +8410,9 @@ msgstr "Le déchiffrement de la clé privée a échoué."
 #: ../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-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:170 ../libnm-util/nm-setting-pppoe.c:179
 #: ../libnm-util/nm-setting-vpn.c:432 ../libnm-util/nm-setting-vpn.c:442
@@ -7886,17 +8430,17 @@ msgid "has to match '%s' property for PKCS#12"
 msgstr "doit correspondre à la propriété « %s » pour PKCS#12"
 
 #: ../libnm-core/nm-setting-8021x.c:2723
-#, fuzzy, c-format
+#, c-format
 msgid "certificate is invalid: %s"
-msgstr "la propriété n'est pas valide"
+msgstr "certificat non valide : %s"
 
 #: ../libnm-core/nm-setting-8021x.c:2758
 #: ../libnm-core/nm-setting-bluetooth.c:129
 #: ../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:211
-#: ../libnm-core/nm-setting-ip6-config.c:222
+#: ../libnm-core/nm-setting-ip6-config.c:188
+#: ../libnm-core/nm-setting-ip6-config.c:199
 #: ../libnm-core/nm-setting-olpc-mesh.c:149
 #: ../libnm-core/nm-setting-wimax.c:144 ../libnm-core/nm-setting-wired.c:665
 #: ../libnm-core/nm-setting-wired.c:675
@@ -7929,31 +8473,33 @@ msgstr "la propriété n'est pas valide"
 #: ../libnm-util/nm-setting-wireless.c:838
 #: ../libnm-util/nm-setting-wireless.c:847
 msgid "property is invalid"
-msgstr "la propriété n'est pas valide"
+msgstr "propriété non valide"
 
 #: ../libnm-core/nm-setting-8021x.c:2783 ../libnm-core/nm-setting-8021x.c:2793
 #: ../libnm-core/nm-setting-8021x.c:2803 ../libnm-core/nm-setting-8021x.c:2813
 #: ../libnm-core/nm-setting-8021x.c:2823 ../libnm-core/nm-setting-adsl.c:208
-#: ../libnm-core/nm-setting-adsl.c:220 ../libnm-core/nm-setting-bluetooth.c:146
+#: ../libnm-core/nm-setting-adsl.c:220
+#: ../libnm-core/nm-setting-bluetooth.c:146
 #: ../libnm-core/nm-setting-wireless-security.c:870
 #: ../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-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 » n'est pas une valeur valide pour la propriété"
 
 #: ../libnm-core/nm-setting-bluetooth.c:168
-#, fuzzy, c-format
+#, c-format
 msgid "'%s' connection requires '%s' or '%s' setting"
-msgstr "requiert un paramètre « %s » ou « %s »"
+msgstr "la connexion « %s » requiert une configuration « %s » ou « %s »"
 
 #: ../libnm-core/nm-setting-bond.c:485 ../libnm-util/nm-setting-bond.c:502
 #, c-format
 msgid "invalid option '%s' or its value '%s'"
-msgstr "l'option « %s » ou sa valeur « %s » est non valide"
+msgstr "option « %s » ou sa valeur « %s » non valide"
 
 #: ../libnm-core/nm-setting-bond.c:510 ../libnm-util/nm-setting-bond.c:521
 #, c-format
@@ -8009,19 +8555,19 @@ msgid "'%s' is not a valid IPv4 address for '%s' option"
 msgstr "« %s » n'est pas une adresse IPv4 valide pour l'option « %s »"
 
 #: ../libnm-core/nm-setting-bond.c:676 ../libnm-util/nm-setting-bond.c:682
-#, fuzzy, c-format
+#, c-format
 msgid "'%s' option is only valid with mode '%s'"
-msgstr "l'option « %s » est uniquement valide pour « %s=%s »"
+msgstr "l'option « %s » est uniquement valide en mode « %s »"
 
 #: ../libnm-core/nm-setting-bond.c:687
 #, c-format
 msgid "'%s' and '%s' cannot have different values"
-msgstr ""
+msgstr "« %s » et « %s » ne peuvent pas avoir des valeur divergentes"
 
 #: ../libnm-core/nm-setting-bond.c:703
-#, fuzzy, c-format
+#, c-format
 msgid "'%s' option should be string"
-msgstr "l'option « %s » est vide"
+msgstr "l'option « %s » doit correspondre à une chaîne"
 
 #: ../libnm-core/nm-setting-bridge-port.c:124
 #: ../libnm-core/nm-setting-bridge-port.c:136
@@ -8033,18 +8579,20 @@ msgstr ""
 "« %d » n'est pas une valeur valide pour la propriété (et devrait être <= %d)"
 
 #: ../libnm-core/nm-setting-bridge-port.c:154
-#: ../libnm-core/nm-setting-team-port.c:109
-#, fuzzy, c-format
+#: ../libnm-core/nm-setting-team-port.c:97
+#, c-format
 msgid "missing setting"
-msgstr "option manquante"
+msgstr "configuration manquante"
 
 #: ../libnm-core/nm-setting-bridge-port.c:165
-#: ../libnm-core/nm-setting-team-port.c:120
+#: ../libnm-core/nm-setting-team-port.c:108
 #, c-format
 msgid ""
 "A connection with a '%s' setting must have the slave-type set to '%s'. "
 "Instead it is '%s'"
 msgstr ""
+"Une connexion qui aurait pour configuration « %s » doit avoir le type "
+"d'esclave (slave-type) défini sur « %s » au lieu de « %s »"
 
 #: ../libnm-core/nm-setting-bridge.c:227 ../libnm-util/nm-setting-bridge.c:269
 #, c-format
@@ -8059,48 +8607,49 @@ msgid "is not a valid MAC address"
 msgstr "n'est pas une adresse MAC valide"
 
 #: ../libnm-core/nm-setting-connection.c:816
-#, fuzzy, c-format
+#, c-format
 msgid "setting required for connection of type '%s'"
-msgstr ""
-"Impossible de créer un éditeur pour la connexion « %s » de type « %s »."
+msgstr "configuration requise pour les connexions de type « %s »."
 
 #: ../libnm-core/nm-setting-connection.c:897
-#, fuzzy, c-format
+#, c-format
 msgid "connection type '%s' is not valid"
-msgstr "index « %s » non valide"
+msgstr "type de connexion « %s » non valide"
 
 #: ../libnm-core/nm-setting-connection.c:932
 #: ../libnm-util/nm-setting-connection.c:877
-#, fuzzy, c-format
+#, c-format
 msgid "Unknown slave type '%s'"
-msgstr "Niveau de journalisation « %s » inconnu"
+msgstr "type d'esclave « %s » inconnu"
 
 #: ../libnm-core/nm-setting-connection.c:942
 #: ../libnm-util/nm-setting-connection.c:887
-#, fuzzy, c-format
+#, c-format
 msgid "Slave connections need a valid '%s' property"
-msgstr "les connexions « %s » requièrent que « %s » soit dans cette propriété"
+msgstr "les connexions esclaves requièrent une prorpiété « %s » valide"
 
 #: ../libnm-core/nm-setting-connection.c:963
 #: ../libnm-util/nm-setting-connection.c:897
 #, c-format
 msgid "Cannot set '%s' without '%s'"
-msgstr ""
+msgstr "Ne peut pas définir « %s » sans « %s »"
 
 #: ../libnm-core/nm-setting-connection.c:977
-#, fuzzy, c-format
+#, c-format
 msgid "metered value %d is not valid"
-msgstr "index « %s » non valide"
+msgstr "valeur contrôlée %d non valide"
 
 #: ../libnm-core/nm-setting-connection.c:998
 #, c-format
 msgid "property type should be set to '%s'"
-msgstr ""
+msgstr "le type de propriété doit être défini sur « %s »"
 
 #: ../libnm-core/nm-setting-connection.c:1013
-#, fuzzy, c-format
+#, c-format
 msgid "slave-type '%s' requires a '%s' setting in the connection"
-msgstr "requiert la présence du paramètre « %s » dans la connexion"
+msgstr ""
+"le type d'esclave « %s » requiert la présence du paramètre « %s » dans la "
+"connexion"
 
 #: ../libnm-core/nm-setting-connection.c:1023
 #, c-format
@@ -8108,6 +8657,8 @@ msgid ""
 "Detect a slave connection with '%s' set and a port type '%s'. '%s' should be "
 "set to '%s'"
 msgstr ""
+"Détecte une connexion esclave avec « %s » défini et un type de port « %s ». "
+"« %s » doit être défini sur « %s »"
 
 #: ../libnm-core/nm-setting-dcb.c:522 ../libnm-util/nm-setting-dcb.c:594
 msgid "flags invalid"
@@ -8153,16 +8704,16 @@ msgstr ""
 #: ../libnm-core/nm-setting-gsm.c:352 ../libnm-util/nm-setting-gsm.c:353
 #, c-format
 msgid "'%s' length is invalid (should be 5 or 6 digits)"
-msgstr "la longueur de « %s » n'est pas valide (devrait faire 5 ou 6 chiffres)"
+msgstr ""
+"la longueur de « %s » n'est pas valide (devrait faire 5 ou 6 chiffres)"
 
 #: ../libnm-core/nm-setting-gsm.c:397
-#, fuzzy
 msgid "property is empty or wrong size"
-msgstr "la propriété est vide"
+msgstr "la propriété est vide ou de la mauvaise taille"
 
 #: ../libnm-core/nm-setting-gsm.c:407
 msgid "property must contain only digits"
-msgstr ""
+msgstr "la propriété doit comprendre des chiffres uniquement"
 
 #: ../libnm-core/nm-setting-infiniband.c:217
 #: ../libnm-util/nm-setting-infiniband.c:231
@@ -8187,105 +8738,104 @@ msgid ""
 "interface name of software infiniband device must be '%s' or unset (instead "
 "it is '%s')"
 msgstr ""
+"le nom d'interface du périphérique de logiciel infinisband doit correspondre "
+"à « %s » ou ne doit pas être défini (au lieu de « %s »)"
 
 #: ../libnm-core/nm-setting-infiniband.c:286
 #, c-format
 msgid "mtu for transport mode '%s' can be at most %d but it is %d"
 msgstr ""
+"mtu pour le mode de transport « %s » but être %d au maximum et non pas %d"
 
 #: ../libnm-core/nm-setting-ip-config.c:133
-#, fuzzy, c-format
+#, c-format
 msgid "Missing IPv4 address"
-msgstr "adresse IPv4 « %s » non valide"
+msgstr "adresse IPv4 manquante"
 
 #: ../libnm-core/nm-setting-ip-config.c:133
-#, fuzzy, c-format
+#, c-format
 msgid "Missing IPv6 address"
-msgstr "adresse IPv6 « %s » non valide"
+msgstr "adresse IPv6 manquante"
 
 #: ../libnm-core/nm-setting-ip-config.c:138
-#, fuzzy, c-format
+#, c-format
 msgid "Invalid IPv4 address '%s'"
 msgstr "adresse IPv4 « %s » non valide"
 
 #: ../libnm-core/nm-setting-ip-config.c:138
-#, fuzzy, c-format
+#, c-format
 msgid "Invalid IPv6 address '%s'"
 msgstr "adresse IPv6 « %s » non valide"
 
 #: ../libnm-core/nm-setting-ip-config.c:153
-#, fuzzy, c-format
+#, c-format
 msgid "Invalid IPv4 address prefix '%u'"
-msgstr "adresse IPv4 « %s » non valide"
+msgstr "préfixe d'adresse IPv4 « %u » non valide"
 
 #: ../libnm-core/nm-setting-ip-config.c:153
-#, fuzzy, c-format
+#, c-format
 msgid "Invalid IPv6 address prefix '%u'"
-msgstr "adresse IPv6 « %s » non valide"
+msgstr "préfixe d'adresse IPv6 « %u » non valide"
 
 #: ../libnm-core/nm-setting-ip-config.c:168
-#, fuzzy, c-format
+#, c-format
 msgid "Invalid routing metric '%s'"
-msgstr "métrique « %s » non valide"
+msgstr "métrique de routage « %s » non valide"
 
-#: ../libnm-core/nm-setting-ip-config.c:2206
-#, fuzzy, c-format
+#: ../libnm-core/nm-setting-ip-config.c:2187
+#, c-format
 msgid "%d. DNS server address is invalid"
-msgstr "%d. L'adresse IPv4 n'est pas valide"
+msgstr "%d. L'adresse de serveur DNS n'est pas valide"
 
-#: ../libnm-core/nm-setting-ip-config.c:2222
-#, fuzzy, c-format
+#: ../libnm-core/nm-setting-ip-config.c:2203
+#, c-format
 msgid "%d. IP address is invalid"
-msgstr "%d. L'adresse IPv4 n'est pas valide"
+msgstr "%d. L'adresse IP n'est pas valide"
 
-#: ../libnm-core/nm-setting-ip-config.c:2234
-#, fuzzy, c-format
+#: ../libnm-core/nm-setting-ip-config.c:2215
+#, c-format
 msgid "%d. IP address has 'label' property with invalid type"
-msgstr "%d. Le préfixe de l'adresse IPv4 n'est pas valide"
+msgstr ""
+"%d. L'adresse IP a une propriété 'label' (étiquette) de type non valide"
 
-#: ../libnm-core/nm-setting-ip-config.c:2243
-#, fuzzy, c-format
+#: ../libnm-core/nm-setting-ip-config.c:2224
+#, c-format
 msgid "%d. IP address has invalid label '%s'"
-msgstr "%d. Le préfixe de l'adresse IPv4 n'est pas valide"
+msgstr "%d. L'adresse IP a une étiquette « %s » non valide"
 
-#: ../libnm-core/nm-setting-ip-config.c:2257
+#: ../libnm-core/nm-setting-ip-config.c:2238
 msgid "gateway cannot be set if there are no addresses configured"
 msgstr ""
+"la passerelle ne peut pas être définie si aucune adresse est configurée"
 
-#: ../libnm-core/nm-setting-ip-config.c:2266
-#, fuzzy
+#: ../libnm-core/nm-setting-ip-config.c:2247
 msgid "gateway is invalid"
-msgstr "la propriété n'est pas valide"
+msgstr "la passerelle n'est pas valide"
 
-#: ../libnm-core/nm-setting-ip-config.c:2280
+#: ../libnm-core/nm-setting-ip-config.c:2261
 #, c-format
 msgid "%d. route is invalid"
 msgstr "%d. La route n'est pas valide"
 
-#: ../libnm-core/nm-setting-ip-config.c:2289
+#: ../libnm-core/nm-setting-ip-config.c:2270
 #, c-format
 msgid "%d. route cannot be a default route"
-msgstr ""
-
-#: ../libnm-core/nm-setting-ip-config.c:2300
-#, fuzzy, c-format
-msgid "a gateway is incompatible with '%s'"
-msgstr "« %s=%s » est incompatible avec « %s > 0 »"
+msgstr "%d. La route ne peut pas être une route par défaut"
 
 #: ../libnm-core/nm-setting-ip4-config.c:143
-#: ../libnm-core/nm-setting-ip6-config.c:167
+#: ../libnm-core/nm-setting-ip6-config.c:144
 #: ../libnm-util/nm-setting-ip4-config.c:879
 #: ../libnm-util/nm-setting-ip6-config.c:843
-#, fuzzy, c-format
+#, c-format
 msgid "this property cannot be empty for '%s=%s'"
-msgstr "cette propriété n'est pas autorisée pour « %s=%s »"
+msgstr "cette propriété ne peut pas demeurer vide pour « %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:179
-#: ../libnm-core/nm-setting-ip6-config.c:189
-#: ../libnm-core/nm-setting-ip6-config.c:199
+#: ../libnm-core/nm-setting-ip6-config.c:156
+#: ../libnm-core/nm-setting-ip6-config.c:166
+#: ../libnm-core/nm-setting-ip6-config.c:176
 #: ../libnm-util/nm-setting-ip4-config.c:891
 #: ../libnm-util/nm-setting-ip4-config.c:901
 #: ../libnm-util/nm-setting-ip4-config.c:913
@@ -8297,31 +8847,20 @@ msgid "this property is not allowed for '%s=%s'"
 msgstr "cette propriété n'est pas autorisée pour « %s=%s »"
 
 #: ../libnm-core/nm-setting-ip4-config.c:214
-#, fuzzy, c-format
+#, c-format
 msgid "'%s' is not a valid FQDN"
-msgstr "« %s » n'est pas un UUID valide"
+msgstr "« %s » n'est pas un FQDN valide"
 
 #: ../libnm-core/nm-setting-ip4-config.c:223
 msgid "property cannot be set when dhcp-hostname is also set"
 msgstr ""
-
-#: ../libnm-core/nm-setting-ip6-config.c:237
-#, fuzzy
-msgid "value is not a valid token"
-msgstr "« %s » n'est pas un UUID valide"
-
-#: ../libnm-core/nm-setting-ip6-config.c:248
-msgid "only makes sense with EUI64 address generation mode"
-msgstr ""
-
-#: ../libnm-core/nm-setting-ip6-config.c:260
-msgid "token is not in canonical form"
-msgstr ""
+"la propriété ne peut pas être définie quand dhcp-hostname est également "
+"défini"
 
 #: ../libnm-core/nm-setting-ip-tunnel.c:318
-#, fuzzy, c-format
+#, c-format
 msgid "'%d' is not a valid tunnel mode"
-msgstr "« %d » n'est pas un canal valide"
+msgstr "« %d » n'est pas un mode de tunnel valide"
 
 #: ../libnm-core/nm-setting-ip-tunnel.c:330
 #: ../libnm-core/nm-setting-macvlan.c:167 ../libnm-core/nm-setting-vlan.c:647
@@ -8332,23 +8871,24 @@ msgstr "« %s » n'est pas un UUID, ni un nom d'interface"
 
 #: ../libnm-core/nm-setting-ip-tunnel.c:341
 #: ../libnm-core/nm-setting-ip-tunnel.c:352
-#, fuzzy, c-format
+#, c-format
 msgid "'%s' is not a valid IPv%c address"
-msgstr "« %s » n'est pas une adresse MAC valide"
+msgstr "« %s » n'est pas une adresse Iv%c valide"
 
 #: ../libnm-core/nm-setting-ip-tunnel.c:366
 msgid "tunnel keys can only be specified for GRE tunnels"
 msgstr ""
+"les clés de tunnel ne peuvent être spécifiées que pour les tunnels GRE"
 
 #: ../libnm-core/nm-setting-ip-tunnel.c:379
 #: ../libnm-core/nm-setting-ip-tunnel.c:395
-#, fuzzy, c-format
+#, c-format
 msgid "'%s' is not a valid tunnel key"
-msgstr "« %s » n'est pas un canal valide"
+msgstr "« %s » n'est pas une clé de tunnel valide"
 
 #: ../libnm-core/nm-setting-ip-tunnel.c:407
 msgid "a fixed TTL is allowed only when path MTU discovery is enabled"
-msgstr ""
+msgstr "un TTL fixe est permis quand le chemin MTU de découverte est actif"
 
 #: ../libnm-core/nm-setting-macvlan.c:181 ../libnm-core/nm-setting-vlan.c:661
 #: ../libnm-util/nm-setting-vlan.c:580
@@ -8358,7 +8898,7 @@ msgstr "la propriété n'est pas spécifiée et n'est pas « %s:%s »"
 
 #: ../libnm-core/nm-setting-macvlan.c:192
 msgid "non promiscuous operation is allowed only in passthru mode"
-msgstr ""
+msgstr "opération de non promiscuité autorisée en mode passthru uniquement "
 
 #: ../libnm-core/nm-setting-olpc-mesh.c:130
 #: ../libnm-core/nm-setting-wireless.c:739
@@ -8386,19 +8926,19 @@ msgid "setting this property requires non-zero '%s' property"
 msgstr "définir cette propriété requiert une propriété non-nulle « %s »"
 
 #: ../libnm-core/nm-setting-tun.c:187
-#, fuzzy, c-format
+#, c-format
 msgid "'%u': invalid mode"
-msgstr "« %s » n'est pas un mode Wi-Fi valide"
+msgstr "« %u » n'est pas un mode valide"
 
 #: ../libnm-core/nm-setting-tun.c:197
-#, fuzzy, c-format
+#, c-format
 msgid "'%s': invalid user ID"
-msgstr "« %s » n'est pas un UUID valide"
+msgstr "« %s » n'est pas un ID d'utilisateur valide"
 
 #: ../libnm-core/nm-setting-tun.c:208
-#, fuzzy, c-format
+#, c-format
 msgid "'%s': invalid group ID"
-msgstr "« %s » n'est pas un UUID valide"
+msgstr "« %s » n'est pas un ID de groupe valide"
 
 #: ../libnm-core/nm-setting-vlan.c:636 ../libnm-util/nm-setting-vlan.c:556
 #, c-format
@@ -8408,60 +8948,60 @@ msgstr "la valeur « %s » ne correspond pas à « %s=%s »"
 #: ../libnm-core/nm-setting-vlan.c:672 ../libnm-util/nm-setting-vlan.c:600
 #, c-format
 msgid "the vlan id must be in range 0-4094 but is %u"
-msgstr ""
+msgstr "l'id de vlan doit être entre 0-4094 mais est à %u"
 
 #: ../libnm-core/nm-setting-vlan.c:681 ../libnm-util/nm-setting-vlan.c:591
 msgid "flags are invalid"
 msgstr "les marqueurs ne sont pas valides"
 
 #: ../libnm-core/nm-setting-vpn.c:460
-#, fuzzy, c-format
+#, c-format
 msgid "secret was empty"
-msgstr "la propriété est vide"
+msgstr "secret vide"
 
 #: ../libnm-core/nm-setting-vpn.c:490
 msgid "setting contained a secret with an empty name"
-msgstr ""
+msgstr "configuration contenant un secret avec un nom vide"
 
 #: ../libnm-core/nm-setting-vpn.c:498
 #, c-format
 msgid "secret value was empty"
-msgstr ""
+msgstr "valeur de secret vide"
 
 #: ../libnm-core/nm-setting-vpn.c:545 ../libnm-core/nm-setting.c:1784
 msgid "not a secret property"
-msgstr ""
+msgstr "ne correspond pas à une propriété secrète"
 
 #: ../libnm-core/nm-setting-vpn.c:551
 msgid "secret is not of correct type"
-msgstr ""
+msgstr "secret de type erroné"
 
 #: ../libnm-core/nm-setting-vpn.c:586
-#, fuzzy, c-format
+#, c-format
 msgid "failed to convert value '%s' to uint"
-msgstr "Erreur : échec de la suppression de la valeur de « %s » : %s\n"
+msgstr "n'a pas pu convertir la valeur « %s » à uint"
 
 #: ../libnm-core/nm-setting-vpn.c:594
 msgid "secret flags property not found"
-msgstr ""
+msgstr "propriété de marqueur secrète non trouvée"
 
 #: ../libnm-core/nm-setting-vxlan.c:375
-#, fuzzy, c-format
+#, c-format
 msgid "'%s' is not a valid IP address"
-msgstr "« %s » n'est pas une adresse MAC valide"
+msgstr "« %s » n'est pas une adresse IP valide"
 
 #: ../libnm-core/nm-setting-vxlan.c:388
-#, fuzzy, c-format
+#, c-format
 msgid "'%s' is not a valid IP%c address"
-msgstr "« %s » n'est pas une adresse MAC valide"
+msgstr "« %s » n'est pas une adresse IP%c valide"
 
 #: ../libnm-core/nm-setting-vxlan.c:415
 #, c-format
 msgid "%d is greater than local port max %d"
-msgstr ""
+msgstr "%d est supérieure à la valeur du port local max %d"
 
 #: ../libnm-core/nm-setting-wired.c:619 ../libnm-util/nm-setting-wired.c:613
-#, fuzzy, c-format
+#, c-format
 msgid "'%s' is not a valid Ethernet port value"
 msgstr "« %s » n'est pas une valeur de port Ethernet valide"
 
@@ -8478,10 +9018,13 @@ msgstr "« %s » ou sa valeur « %s » n'est pas valide"
 #: ../libnm-core/nm-setting-wired.c:709
 msgid "Wake-on-LAN mode 'default' and 'ignore' are exclusive flags"
 msgstr ""
+"les modes « default » et « ignore » de Wake-on LAN sont des marqueurs "
+"exclusifs"
 
 #: ../libnm-core/nm-setting-wired.c:718
 msgid "Wake-on-LAN password can only be used with magic packet mode"
 msgstr ""
+"le mot de passe Wake-on-LAN ne peut pas être utilisé en mode magic packet"
 
 #: ../libnm-core/nm-setting-wireless-security.c:882
 #: ../libnm-util/nm-setting-wireless-security.c:912
@@ -8526,226 +9069,207 @@ msgid "'%s' is not a valid band"
 msgstr "« %s » n'est pas une bande valide"
 
 #: ../libnm-core/nm-setting-wireless.c:768
-#, fuzzy, c-format
+#, c-format
 msgid "'%s' requires setting '%s' property"
-msgstr "requiert de paramétrer la propriété « %s »"
+msgstr "« %s » requiert de paramétrer la propriété « %s »"
 
 #: ../libnm-core/nm-setting.c:837
 #, c-format
 msgid "duplicate property"
-msgstr ""
+msgstr "dupliquer la propriété"
 
 #: ../libnm-core/nm-setting.c:865 ../libnm-core/nm-setting.c:912
 #, c-format
 msgid "can't set property of type '%s' from value of type '%s'"
 msgstr ""
+"impossible de définir la propriété de type « %s » à partir de valeurs de "
+"type « %s »"
 
 #: ../libnm-core/nm-setting.c:884 ../libnm-core/nm-setting.c:898
-#, fuzzy, c-format
+#, c-format
 msgid "failed to set property: %s"
-msgstr "Erreur : échec du paramétrage de la propriété « %s » : %s\n"
+msgstr "n'a pas pu définir la propriété : %s"
 
 #: ../libnm-core/nm-setting.c:926
-#, fuzzy, c-format
+#, c-format
 msgid "can not set property: %s"
-msgstr "Erreur : échec du paramétrage de la propriété « %s » : %s\n"
+msgstr "n'a pas pu définir la propriété : %s"
 
 #: ../libnm-core/nm-setting.c:942
-#, fuzzy, c-format
+#, c-format
 msgid "unknown property"
-msgstr "erreur inconnue"
+msgstr "propriété inconnue"
 
 #: ../libnm-core/nm-setting.c:1682
 msgid "secret not found"
-msgstr ""
+msgstr "secret non trouvé"
 
 #: ../libnm-core/nm-setting.c:1774
 msgid "secret is not set"
-msgstr ""
+msgstr "secret non défini"
 
-#: ../libnm-core/nm-utils.c:2445
-#, fuzzy, c-format
+#: ../libnm-core/nm-utils.c:2447
+#, c-format
 msgid "failed stat file %s: %s"
-msgstr "Impossible de définir le masque du signal : %d"
+msgstr "échec fichier stat %s: %s"
 
-#: ../libnm-core/nm-utils.c:2454
-#, fuzzy, c-format
+#: ../libnm-core/nm-utils.c:2456
+#, c-format
 msgid "not a file (%s)"
-msgstr "Impossible de charger le fichier « %s »\n"
+msgstr "pas un fichier  (%s) "
 
-#: ../libnm-core/nm-utils.c:2465
-#, fuzzy, c-format
+#: ../libnm-core/nm-utils.c:2467
+#, c-format
 msgid "invalid file owner %d for %s"
-msgstr "champ « %s » non valide ; champs autorisés : %s"
+msgstr "propriétaire de fichier non valide %d pour %s"
 
-#: ../libnm-core/nm-utils.c:2476
+#: ../libnm-core/nm-utils.c:2478
 #, c-format
 msgid "file permissions for %s"
-msgstr ""
+msgstr "permissions de fichier pour %s"
 
-#: ../libnm-core/nm-utils.c:2486
+#: ../libnm-core/nm-utils.c:2488
 #, c-format
 msgid "reject %s"
-msgstr ""
+msgstr "rejète %s"
 
-#: ../libnm-core/nm-utils.c:2506
+#: ../libnm-core/nm-utils.c:2508
 #, c-format
 msgid "path is not absolute (%s)"
-msgstr ""
+msgstr "le chemin n'est pas absolu (%s)"
 
-#: ../libnm-core/nm-utils.c:2520
+#: ../libnm-core/nm-utils.c:2522
 #, c-format
 msgid "Plugin file does not exist (%s)"
-msgstr ""
+msgstr "le fichier de greffon n'existe pas (%s)"
 
-#: ../libnm-core/nm-utils.c:2528
-#, fuzzy, c-format
+#: ../libnm-core/nm-utils.c:2530
+#, c-format
 msgid "Plugin is not a valid file (%s)"
-msgstr "« %s » n'est pas une valeur valide pour « %s »"
+msgstr "Le greffon n'est pas un fichier valide (%s)"
 
-#: ../libnm-core/nm-utils.c:2538
+#: ../libnm-core/nm-utils.c:2540
 #, c-format
 msgid "libtool archives are not supported (%s)"
-msgstr ""
+msgstr "les archives libtool ne sont pas prises en charge (%s)"
 
-#: ../libnm-core/nm-utils.c:2620 ../libnm-util/nm-utils.c:1803
+#: ../libnm-core/nm-utils.c:2622 ../libnm-util/nm-utils.c:1815
 #, c-format
 msgid "Could not find \"%s\" binary"
-msgstr ""
-
-#: ../libnm-core/nm-vpn-editor-plugin.c:296
-#, fuzzy, c-format
-msgid "cannot load plugin \"%s\": %s"
-msgstr ""
-"impossible de charger le greffon VPN dans « %s » : nom de greffon manquant"
+msgstr "N'a pas pu trouver le binaire « %s »"
 
-#: ../libnm-core/nm-vpn-editor-plugin.c:307
+#: ../libnm-core/nm-vpn-editor-plugin.c:124
 #, c-format
-msgid "failed to load nm_vpn_editor_plugin_factory() from %s (%s)"
-msgstr ""
-"impossible de charger la méthode nm_vpn_editor_plugin_factory() depuis %s "
-"(%s)"
+msgid "cannot load plugin %s"
+msgstr "impossible de charger le greffon %s"
 
-#: ../libnm-core/nm-vpn-editor-plugin.c:332
-#, c-format
-msgid "unknown error initializing plugin %s"
-msgstr ""
-
-#: ../libnm-core/nm-vpn-editor-plugin.c:349
+#: ../libnm-core/nm-vpn-editor-plugin.c:150
 #, c-format
 msgid "cannot load VPN plugin in '%s': missing plugin name"
 msgstr ""
 "impossible de charger le greffon VPN dans « %s » : nom de greffon manquant"
 
-#: ../libnm-core/nm-vpn-editor-plugin.c:358
+#: ../libnm-core/nm-vpn-editor-plugin.c:157
 #, c-format
 msgid "cannot load VPN plugin in '%s': invalid service name"
 msgstr ""
 "impossible de charger le greffon VPN dans « %s » : nom de service manquant"
 
-#: ../libnm-core/nm-vpn-editor-plugin.c:501
+#: ../libnm-core/nm-vpn-editor-plugin.c:173
 #, c-format
-msgid "the plugin does not support import capability"
+msgid "unknown error initializing plugin %s"
+msgstr "erreur inconnue lors de l'initialisation du greffon %s"
+
+#: ../libnm-core/nm-vpn-editor-plugin.c:185
+#, c-format
+msgid "failed to load nm_vpn_editor_plugin_factory() from %s (%s)"
 msgstr ""
+"impossible de charger la méthode nm_vpn_editor_plugin_factory() depuis %s "
+"(%s)"
+
+#: ../libnm-core/nm-vpn-editor-plugin.c:292
+#, c-format
+msgid "the plugin does not support import capability"
+msgstr "le greffon ne prend pas en charge la fonction d'importation"
 
-#: ../libnm-core/nm-vpn-editor-plugin.c:521
+#: ../libnm-core/nm-vpn-editor-plugin.c:312
 #, c-format
 msgid "the plugin does not support export capability"
-msgstr ""
+msgstr "le greffon ne prend pas en charge la fonction d'exportation"
 
-#: ../libnm-core/nm-vpn-plugin-info.c:110
-#, fuzzy, c-format
+#: ../libnm-core/nm-vpn-plugin-info.c:109
+#, c-format
 msgid "missing filename"
-msgstr "option manquante"
+msgstr "nom de fichier manquant"
 
-#: ../libnm-core/nm-vpn-plugin-info.c:118
+#: ../libnm-core/nm-vpn-plugin-info.c:117
 #, c-format
 msgid "filename must be an absolute path (%s)"
-msgstr ""
+msgstr "le nom du fichier doit correspondre à un chemin absolu (%s)"
 
-#: ../libnm-core/nm-vpn-plugin-info.c:127
+#: ../libnm-core/nm-vpn-plugin-info.c:126
 #, c-format
 msgid "filename has invalid format (%s)"
-msgstr ""
+msgstr "le nom du fichier a un format non valide (%s)"
 
-#: ../libnm-core/nm-vpn-plugin-info.c:450
+#: ../libnm-core/nm-vpn-plugin-info.c:383
 #, c-format
 msgid "there exists a conflicting plugin (%s) that has the same %s.%s value"
 msgstr ""
+"il y a un greffon (%s) qui rentre en conflit et qui a la même valeur %s.%s"
 
-#: ../libnm-core/nm-vpn-plugin-info.c:488
+#: ../libnm-core/nm-vpn-plugin-info.c:421
 #, c-format
 msgid "there exists a conflicting plugin with the same name (%s)"
-msgstr ""
+msgstr "il y a un greffon qui rentre en conflit et qui a le même nom (%s)"
 
-#: ../libnm-core/nm-vpn-plugin-info.c:1071
-#, fuzzy, c-format
+#: ../libnm-core/nm-vpn-plugin-info.c:740
+#, c-format
 msgid "missing \"plugin\" setting"
-msgstr "option manquante"
+msgstr "paramètre \"plugin\" manquant"
 
-#: ../libnm-core/nm-vpn-plugin-info.c:1081
+#: ../libnm-core/nm-vpn-plugin-info.c:750
 #, c-format
 msgid "%s: don't retry loading plugin which already failed previously"
-msgstr ""
+msgstr "%s : n'essayez pas de charger le greffon qui a déjà échoué à nouveau"
 
-#: ../libnm-core/nm-vpn-plugin-info.c:1175
+#: ../libnm-core/nm-vpn-plugin-info.c:842
 msgid "missing filename to load VPN plugin info"
 msgstr "nom de fichier manquant pour charger les informations de greffon VPN"
 
-#: ../libnm-core/nm-vpn-plugin-info.c:1187
+#: ../libnm-core/nm-vpn-plugin-info.c:854
 msgid "missing name for VPN plugin info"
 msgstr "nom manquant pour les informations de greffon VPN"
 
-#: ../libnm-core/nm-vpn-plugin-info.c:1196
+#: ../libnm-core/nm-vpn-plugin-info.c:863
 msgid "missing service for VPN plugin info"
 msgstr "service manquant pour les informations de greffon VPN"
 
-#: ../libnm-glib/nm-device.c:1863 ../libnm/nm-device.c:1814
+#: ../libnm-glib/nm-device.c:1853 ../libnm/nm-device.c:1804
 msgid "Bluetooth"
 msgstr "Bluetooth"
 
-#: ../libnm-glib/nm-device.c:1865 ../libnm/nm-device.c:1816
-msgid "OLPC Mesh"
-msgstr "Maillage OLPC"
-
-#: ../libnm-glib/nm-device.c:1867 ../libnm/nm-device.c:1818
-msgid "WiMAX"
-msgstr "WiMAX"
-
-#: ../libnm-glib/nm-device.c:1881 ../libnm/nm-device.c:1832
-msgid "ADSL"
-msgstr "ADSL"
-
-#: ../libnm-glib/nm-device.c:1883 ../libnm/nm-device.c:1834
-#, fuzzy
+#: ../libnm-glib/nm-device.c:1873 ../libnm/nm-device.c:1824
 msgid "MACVLAN"
-msgstr "VLAN"
+msgstr "MACVLAN"
 
-#: ../libnm-glib/nm-device.c:1885 ../libnm/nm-device.c:1836
-msgid "VXLAN"
-msgstr "VXLAN"
-
-#: ../libnm-glib/nm-device.c:1887 ../libnm/nm-device.c:1838
+#: ../libnm-glib/nm-device.c:1877 ../libnm/nm-device.c:1828
 msgid "IPTunnel"
-msgstr ""
-
-#: ../libnm-glib/nm-device.c:1889 ../libnm/nm-device.c:1840
-msgid "Tun"
-msgstr ""
+msgstr "IPTunnel"
 
-#: ../libnm-glib/nm-device.c:1891 ../libnm/nm-device.c:1842
+#: ../libnm-glib/nm-device.c:1881 ../libnm/nm-device.c:1832
 msgid "Veth"
-msgstr ""
+msgstr "Veth"
 
-#: ../libnm-glib/nm-device.c:1923 ../libnm/nm-device.c:1874
+#: ../libnm-glib/nm-device.c:1913 ../libnm/nm-device.c:1864
 msgid "Wired"
 msgstr "Filaire"
 
-#: ../libnm-glib/nm-device.c:1954 ../libnm/nm-device.c:1905
+#: ../libnm-glib/nm-device.c:1944 ../libnm/nm-device.c:1895
 msgid "PCI"
 msgstr "PCI"
 
-#: ../libnm-glib/nm-device.c:1956 ../libnm/nm-device.c:1907
+#: ../libnm-glib/nm-device.c:1946 ../libnm/nm-device.c:1897
 msgid "USB"
 msgstr "USB"
 
@@ -8754,28 +9278,27 @@ msgstr "USB"
 #. * "Ethernet"). You can change this to something like
 #. * "%2$s (%1$s)" if there's no grammatical way to combine
 #. * the strings otherwise.
-#.
-#: ../libnm-glib/nm-device.c:2052 ../libnm-glib/nm-device.c:2071
-#: ../libnm/nm-device.c:2001 ../libnm/nm-device.c:2020
+#. 
+#: ../libnm-glib/nm-device.c:2042 ../libnm-glib/nm-device.c:2061
+#: ../libnm/nm-device.c:1991 ../libnm/nm-device.c:2010
 #, c-format
 msgctxt "long device name"
 msgid "%s %s"
 msgstr "%s %s"
 
 #: ../libnm-glib/nm-remote-connection.c:149
-#, fuzzy
 msgid "Disconnected by D-Bus"
-msgstr "déconnecté"
+msgstr "Déconnecté par D-Bus"
 
 #: ../libnm-util/crypto_gnutls.c:84
 #, c-format
 msgid "Hash length too long (%d > %d)."
-msgstr ""
+msgstr "Longueur de hachage trop longue (%d > %d)."
 
 #: ../libnm-util/crypto_gnutls.c:115
-#, fuzzy, c-format
+#, c-format
 msgid "Failed to initialize the MD5 engine: %s (%s)"
-msgstr "L'initialisation du moteur MD5 a échoué : %s / %s."
+msgstr "L'initialisation du moteur MD5 a échoué : %s (%s)"
 
 #: ../libnm-util/crypto_nss.c:99
 #, c-format
@@ -8814,24 +9337,24 @@ msgid "%d. route has invalid prefix"
 msgstr "%d. Le préfixe de la route n'est pas valide"
 
 #: ../libnm-util/nm-setting-ip6-config.c:910
-#, fuzzy, c-format
+#, c-format
 msgid "%d. IPv6 address is invalid"
-msgstr "%d. L'adresse IPv4 n'est pas valide"
+msgstr "%d. L'adresse IPv6 n'est pas valide"
 
 #: ../libnm-util/nm-setting-ip6-config.c:920
-#, fuzzy, c-format
+#, c-format
 msgid "%d. IPv6 address has invalid prefix"
-msgstr "%d. Le préfixe de l'adresse IPv4 n'est pas valide"
+msgstr "%d. Le préfixe de l'adresse IPv6 n'est pas valide"
 
 #: ../libnm-util/nm-setting-vpn.c:582
 #, c-format
 msgid "Failed to convert '%s' value '%s' to uint"
-msgstr ""
+msgstr "N'a pas pu convertir la valeur « %s » de  « %s » à uint"
 
 #: ../libnm-util/nm-setting-vpn.c:589
 #, c-format
 msgid "Secret flags property '%s' not found"
-msgstr ""
+msgstr "La propriété « %s » de marqueurs secrets n'a pas été trouvée"
 
 #: ../libnm-util/nm-setting-wireless.c:807
 #, c-format
@@ -8839,207 +9362,200 @@ msgid "requires setting '%s' property"
 msgstr "requiert de paramétrer la propriété « %s »"
 
 #: ../libnm/nm-device-adsl.c:74
-#, fuzzy
 msgid "The connection was not an ADSL connection."
-msgstr "connexion (démarrage des connexions secondaires)"
+msgstr "La connexion n'était pas une connexion ADSL."
 
 #: ../libnm/nm-device-bond.c:112
-#, fuzzy
 msgid "The connection was not a bond connection."
-msgstr "connexion (démarrage des connexions secondaires)"
+msgstr "La connexion n'était pas un connexion de liaison"
 
 #: ../libnm/nm-device-bridge.c:112
-#, fuzzy
 msgid "The connection was not a bridge connection."
-msgstr "connexion (démarrage des connexions secondaires)"
+msgstr "La connexion n'était pas une connexion de pontage"
 
 #: ../libnm/nm-device-bt.c:137
-#, fuzzy, c-format
+#, c-format
 msgid "The connection was not a Bluetooth connection."
-msgstr ""
-"Il existe 1 argument optionnel pour le type de connexion « bluetooth ».\n"
+msgstr "La connexion n'était pas une connexion Bluetooth"
 
 #: ../libnm/nm-device-bt.c:146
 msgid "Invalid device Bluetooth address."
-msgstr ""
+msgstr "Adresse de périphérique Bluetooth non valide"
 
 #: ../libnm/nm-device-bt.c:153
 msgid "The Bluetooth addresses of the device and the connection didn't match."
 msgstr ""
+"Les adresses Bluetooth du périphérique et la connexion ne correspondaient "
+"pas."
 
 #: ../libnm/nm-device-bt.c:162
 msgid ""
 "The device is lacking Bluetooth capabilities required by the connection."
 msgstr ""
+"Le périphérique ne possède pas les fonctionnalités Bluetooth requises pour "
+"établir la connexion."
 
 #: ../libnm/nm-device-ethernet.c:207
-#, fuzzy
 msgid "The connection was not an Ethernet or PPPoE connection."
-msgstr ""
-"Il existe 4 arguments optionnels pour le type de connexion « PPPoE ».\n"
+msgstr "La connexion n'était pas une connexion Ethernet ou PPPoE."
 
 #: ../libnm/nm-device-ethernet.c:222
 msgid "The connection and device differ in S390 subchannels."
-msgstr ""
+msgstr "La connexion et le périphérique diffèrent dans les sous-canaux S390."
 
 #: ../libnm/nm-device-ethernet.c:232 ../libnm/nm-device-infiniband.c:102
 #: ../libnm/nm-device-wifi.c:604 ../libnm/nm-device-wimax.c:326
-#, fuzzy
 msgid "Invalid device MAC address."
-msgstr "n'est pas une adresse MAC valide"
+msgstr "N'est pas une adresse MAC valide"
 
 #: ../libnm/nm-device-ethernet.c:237
 msgid "The MACs of the device and the connection do not match."
-msgstr ""
+msgstr "Les MAC de périphérique et de la connexion ne correspondent pas."
 
 #: ../libnm/nm-device-ethernet.c:247
 #, c-format
 msgid "Invalid MAC in the blacklist: %s."
-msgstr ""
+msgstr "MAC non valide, dans la liste noire : %s"
 
 #: ../libnm/nm-device-ethernet.c:253
 #, c-format
 msgid "Device MAC (%s) is blacklisted by the connection."
-msgstr ""
+msgstr "MAC (%s) du périphérique est sur la liste noire de la connexion."
 
 #: ../libnm/nm-device-generic.c:91
-#, fuzzy
 msgid "The connection was not a generic connection."
-msgstr "connexion (démarrage des connexions secondaires)"
+msgstr "La connexion n'était pas une connexion standard"
 
 #: ../libnm/nm-device-generic.c:98
-#, fuzzy
 msgid "The connection did not specify an interface name."
-msgstr ""
-"La connexion InfiniBand P_Key ne spécifie pas le nom de l'interface parent"
+msgstr "La connexion ne spécifiait pas de nom d'interface."
 
 #: ../libnm/nm-device-tun.c:209
-#, fuzzy
 msgid "The connection was not a tun connection."
-msgstr "connexion (démarrage des connexions secondaires)"
+msgstr "La connexion n'était pas une connexion tun."
 
 # auto translated by TM merge from project: NetworkManager, version: 0.9.8.2, DocId: NetworkManager
 #: ../libnm/nm-device-tun.c:218
-#, fuzzy
 msgid "The mode of the device and the connection didn't match"
-msgstr "La connexion active du périphérique a disparu"
+msgstr "Le mode du périphérique et de la connexion ne correspondaient pas."
 
 #: ../libnm/nm-device-infiniband.c:94
-#, fuzzy
 msgid "The connection was not an InfiniBand connection."
-msgstr ""
-"Il existe 5 arguments optionnels pour le type de connexion « InfiniBand ».\n"
+msgstr "La connexion n'était pas une connexion InfiniBand."
 
 #: ../libnm/nm-device-infiniband.c:110 ../libnm/nm-device-wifi.c:611
 #: ../libnm/nm-device-wimax.c:333
 msgid "The MACs of the device and the connection didn't match."
-msgstr ""
+msgstr "Les MAC de périphérique et de la connexion ne correspondaient pas."
 
 #: ../libnm/nm-device-ip-tunnel.c:254
-#, fuzzy
 msgid "The connection was not an IP tunnel connection."
-msgstr "connexion (démarrage des connexions secondaires)"
+msgstr "La connexion n'était pas une connexion de tunnel IP."
 
 #: ../libnm/nm-device-macvlan.c:159
 msgid "The connection was not a MAC-VLAN connection."
-msgstr ""
+msgstr "La connexion n'était pas une connexion MAC-VLAN."
 
 #: ../libnm/nm-device-modem.c:120
-#, fuzzy
 msgid "The connection was not a modem connection."
-msgstr "la connexion a été supprimée"
+msgstr "La connexion n'était pas une connexion de modem."
 
 #: ../libnm/nm-device-modem.c:128
-#, fuzzy
 msgid "The connection was not a valid modem connection."
-msgstr "connexion (démarrage des connexions secondaires)"
+msgstr "La connexion n'était pas une connexion de modem valide."
 
 #: ../libnm/nm-device-modem.c:135
 msgid "The device is lacking capabilities required by the connection."
 msgstr ""
+"Le périphérique ne possède pas les fonctionnalités requises par la connexion."
+""
 
 #: ../libnm/nm-device-olpc-mesh.c:115
-#, fuzzy
 msgid "The connection was not an OLPC Mesh connection."
-msgstr ""
-"Il existe 2 arguments optionnels pour le type de connexion « OLPC Mesh ».\n"
+msgstr "La connexion n'était pas une connexion « OLPC Mesh »."
 
-#: ../libnm/nm-device-team.c:139
-#, fuzzy
+#: ../libnm/nm-device-team.c:118
 msgid "The connection was not a team connection."
-msgstr "la connexion a été supprimée"
+msgstr "La connexion n'était pas une connexion team."
 
 #: ../libnm/nm-device-vlan.c:128
-#, fuzzy
 msgid "The connection was not a VLAN connection."
-msgstr "Il existe 4 arguments optionnels pour le type de connexion « VLAN ».\n"
+msgstr "La connexion n'était pas une connexion VLAN."
 
 #: ../libnm/nm-device-vlan.c:135
 msgid "The VLAN identifiers of the device and the connection didn't match."
 msgstr ""
+"Les identifiants VLAN du périphérique et de la connexion ne correspondaient "
+"pas."
 
 #: ../libnm/nm-device-vlan.c:148
 msgid "The hardware address of the device and the connection didn't match."
 msgstr ""
+"L'adresse de matériel du périphérique et de la connexion ne correspondait "
+"pas."
 
 #: ../libnm/nm-device-vxlan.c:387
-#, fuzzy
 msgid "The connection was not a VXLAN connection."
-msgstr "Il existe 4 arguments optionnels pour le type de connexion « VLAN ».\n"
+msgstr "La connexion n'était pas une connexion VXLAN."
 
 #: ../libnm/nm-device-vxlan.c:394
 msgid "The VXLAN identifiers of the device and the connection didn't match."
 msgstr ""
+"Les identifiants VXLAN du périphérique et de la connexion ne correspondaient "
+"pas."
 
 #: ../libnm/nm-device-wifi.c:595
 msgid "The connection was not a Wi-Fi connection."
-msgstr ""
+msgstr "La connexion n'était pas une connexion Wi-Fi."
 
 #: ../libnm/nm-device-wifi.c:631
 msgid "The device is lacking WPA capabilities required by the connection."
 msgstr ""
+"Le périphérique ne possède pas les fonctionnalités WPA requises par la "
+"connexion."
 
 #: ../libnm/nm-device-wifi.c:638
-msgid "The device is lacking WPA2/RSN capabilities required by the connection."
+msgid ""
+"The device is lacking WPA2/RSN capabilities required by the connection."
 msgstr ""
+"Le périphérique ne possède pas les fonctionnalités WPA2/RSN requises par la "
+"connexion."
 
 #: ../libnm/nm-device-wimax.c:317
-#, fuzzy
 msgid "The connection was not a WiMAX connection."
-msgstr "Il existe 1 argument optionnel pour le type de connexion « WiMax ».\n"
+msgstr "La connexion n'était pas une connexion WiMAX."
 
-#: ../libnm/nm-device.c:2739
-#, fuzzy, c-format
+#: ../libnm/nm-device.c:2729
+#, c-format
 msgid "The connection was not valid: %s"
-msgstr "Erreur : la connexion n'est pas valide : %s\n"
+msgstr "La connexion n'était pas valide : %s"
 
-#: ../libnm/nm-device.c:2748
+#: ../libnm/nm-device.c:2738
 #, c-format
 msgid "The interface names of the device and the connection didn't match."
 msgstr ""
+"Les noms d'interface du périphérique et de la connexion ne correspondaient "
+"pas."
 
-#: ../libnm/nm-manager.c:867
-#, fuzzy
+#: ../libnm/nm-manager.c:874
 msgid "Active connection could not be attached to the device"
-msgstr "aucune connexion ou périphérique actif"
+msgstr "La connexion active ne pouvait pas être attachée au périphérique"
 
-#: ../libnm/nm-manager.c:1091
-#, fuzzy
+#: ../libnm/nm-manager.c:1098
 msgid "Active connection removed before it was initialized"
-msgstr "Détails de la connexion active"
+msgstr "La connexion active a été supprimée avant d'être initialisée"
 
 #: ../libnm/nm-object.c:1545 ../libnm/nm-object.c:1691
 msgid "Caller did not specify D-Bus path for object"
-msgstr ""
+msgstr "L'appelant n'a pas spécifié de chemin D-Bus pour l'objet"
 
 #: ../libnm/nm-remote-settings.c:261
 msgid "Connection removed before it was initialized"
-msgstr ""
+msgstr "La connexion a été supprimée avant d'être initialisée"
 
 #: ../libnm/nm-vpn-plugin-old.c:957 ../libnm/nm-vpn-service-plugin.c:978
-#, fuzzy
 msgid "No service name specified"
-msgstr "Erreur : aucune interface spécifiée."
+msgstr "Aucun nom de service spécifié"
 
 #: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:1
 msgid "Enable or disable system networking"
@@ -9052,18 +9568,6 @@ msgstr ""
 "du système"
 
 #: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:3
-#, fuzzy
-msgid "Reload NetworkManager configuration"
-msgstr "Imprimer la version de NetworkManager et quitter"
-
-#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:4
-#, fuzzy
-msgid "System policy prevents reloading NetworkManager"
-msgstr ""
-"La politique du système empêche l'activation ou la désactivation du réseau "
-"du système"
-
-#: ../policy/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)"
@@ -9071,197 +9575,208 @@ msgstr ""
 "Mettre NetworkManager en veille ou le réveiller (utile uniquement pour la "
 "gestion d'énergie du système)"
 
-#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:6
+#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:4
 msgid "System policy prevents putting NetworkManager to sleep or waking it up"
 msgstr ""
 "La politique du système empêche la mise en veille et le réveil de "
 "NetworkManager"
 
-#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:7
+#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:5
 msgid "Enable or disable WiFi devices"
 msgstr "Activer ou désactiver des périphériques WiFi"
 
-#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:8
+#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:6
 msgid "System policy prevents enabling or disabling WiFi devices"
 msgstr ""
 "La politique du système empêche l'activation ou la désactivation de "
 "périphériques WiFi"
 
-#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:9
+#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:7
 msgid "Enable or disable mobile broadband devices"
 msgstr "Activer ou désactiver des périphériques mobiles à large bande"
 
-#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:10
+#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:8
 msgid "System policy prevents enabling or disabling mobile broadband devices"
 msgstr ""
 "La politique du système empêche l'activation ou la désactivation de "
 "périphériques mobiles à large bande"
 
-#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:11
+#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:9
 msgid "Enable or disable WiMAX mobile broadband devices"
 msgstr "Activer ou désactiver des périphériques WiMAX à large bande"
 
-#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:12
+#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:10
 msgid ""
 "System policy prevents enabling or disabling WiMAX mobile broadband devices"
 msgstr ""
 "La politique du système empêche l'activation ou la désactivation de "
 "périphériques WiMAX à large bande"
 
-#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:13
+#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:11
 msgid "Allow control of network connections"
 msgstr "Autoriser le contrôle des connexions réseau"
 
-#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:14
+#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:12
 msgid "System policy prevents control of network connections"
 msgstr "La politique du système empêche le contrôle des connexions réseau"
 
-#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:15
+#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:13
 msgid "Connection sharing via a protected WiFi network"
 msgstr "Partage de connexion via un réseau WiFi protégé"
 
-#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:16
-msgid "System policy prevents sharing connections via a protected WiFi network"
+#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:14
+msgid ""
+"System policy prevents sharing connections via a protected WiFi network"
 msgstr ""
 "La politique du système empêche tout partage des connexions via un réseau "
 "WiFi protégé"
 
-#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:17
+#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:15
 msgid "Connection sharing via an open WiFi network"
 msgstr "Partage de connexion via un réseau WiFi ouvert"
 
-#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:18
+#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:16
 msgid "System policy prevents sharing connections via an open WiFi network"
 msgstr ""
 "La politique du système empêche tout partage des connexions via un réseau "
 "WiFi ouvert"
 
-#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:19
+#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:17
 msgid "Modify personal network connections"
 msgstr "Modifier les connexions du réseau personnel"
 
-#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:20
+#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:18
 msgid "System policy prevents modification of personal network settings"
 msgstr ""
 "La politique du système empêche toute modification des paramètres réseau "
 "personnels"
 
-#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:21
+#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:19
 msgid "Modify network connections for all users"
 msgstr "Modifier les connexions réseau pour tous les utilisateurs"
 
-#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:22
+#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:20
 msgid "System policy prevents modification of network settings for all users"
 msgstr ""
 "La politique du système empêche toute modification des paramètres réseau "
 "pour tous les utilisateurs"
 
-#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:23
+#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:21
 msgid "Modify persistent system hostname"
 msgstr "Modifier le nom d'hôte persistant du système"
 
-#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:24
+#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:22
 msgid "System policy prevents modification of the persistent system hostname"
 msgstr ""
 "La politique du système empêche toute modification du nom d'hôte persistant "
 "du système"
 
-#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:25
+#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:23
 msgid "Modify persistent global DNS configuration"
-msgstr ""
+msgstr "Modifier la configuration DNS globale persistante"
 
-#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:26
-#, fuzzy
+#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:24
 msgid ""
 "System policy prevents modification of the persistent global DNS "
 "configuration"
 msgstr ""
-"La politique du système empêche toute modification du nom d'hôte persistant "
-"du système"
+"La politique du système empêche toute modification de la configuration DNS "
+"globale persistante"
 
-#: ../shared/nm-utils/nm-shared-utils.c:185
+#: ../shared/nm-shared-utils.c:208
 #, c-format
 msgid "object class '%s' has no property named '%s'"
-msgstr ""
+msgstr "classe d'objet « %s » n'a pas de propriété nommée « %s »"
 
-#: ../shared/nm-utils/nm-shared-utils.c:192
+#: ../shared/nm-shared-utils.c:215
 #, c-format
 msgid "property '%s' of object class '%s' is not writable"
-msgstr ""
+msgstr "propriété « %s » de la classe d'objet « %s » n'est pas en écriture"
 
-#: ../shared/nm-utils/nm-shared-utils.c:199
+#: ../shared/nm-shared-utils.c:222
 #, c-format
 msgid ""
 "construct property \"%s\" for object '%s' can't be set after construction"
 msgstr ""
+"propriété de construction « %s » de l'objet « %s » ne peut pas être définie "
+"après la construction"
 
-#: ../shared/nm-utils/nm-shared-utils.c:207
+#: ../shared/nm-shared-utils.c:230
 #, c-format
 msgid "'%s::%s' is not a valid property name; '%s' is not a GObject subtype"
 msgstr ""
+"« %s::%s » n'est pas un nom de propriété valide ; « %s » n'est pas un sous-"
+"type de GObject"
 
-#: ../shared/nm-utils/nm-shared-utils.c:216
+#: ../shared/nm-shared-utils.c:239
 #, c-format
 msgid "unable to set property '%s' of type '%s' from value of type '%s'"
 msgstr ""
+"impossible de définir la propriété « %s » de type « %s » à partir de valeurs "
+"de type « %s »"
 
-#: ../shared/nm-utils/nm-shared-utils.c:227
+#: ../shared/nm-shared-utils.c:250
 #, c-format
 msgid ""
 "value \"%s\" of type '%s' is invalid or out of range for property '%s' of "
 "type '%s'"
 msgstr ""
+"valeur « %s » de type « %s » est non valide ou en dehors de la plage de "
+"valeurs pour la propriété « %s » de type « %s »"
 
 #. Translators: the first %s is a prefix for the connection id, such
 #. * as "Wired Connection" or "VPN Connection". The %d is a number
 #. * that is combined with the first argument to create a unique
 #. * connection id.
-#: ../src/NetworkManagerUtils.c:112
-#, fuzzy, c-format
+#: ../src/NetworkManagerUtils.c:111
+#, c-format
 msgctxt "connection id fallback"
 msgid "%s %d"
-msgstr "%s %s"
+msgstr "%s %d"
 
-#: ../src/main.c:165 ../src/main.c:300
-#, fuzzy, c-format
+#: ../src/main.c:220 ../src/main.c:358
+#, c-format
 msgid "Failed to read configuration: %s\n"
-msgstr "Échec de la lecture de la configuration : (%d) %s\n"
+msgstr "Échec de la lecture de la configuration : %s\n"
 
 #. Logging/debugging
-#: ../src/main.c:179 ../src/nm-iface-helper.c:298
+#: ../src/main.c:234 ../src/nm-iface-helper.c:298
 msgid "Print NetworkManager version and exit"
 msgstr "Imprimer la version de NetworkManager et quitter"
 
-#: ../src/main.c:180 ../src/nm-iface-helper.c:299
+#: ../src/main.c:235 ../src/nm-iface-helper.c:299
 msgid "Don't become a daemon"
 msgstr "Ne pas devenir un démon"
 
-#: ../src/main.c:181 ../src/nm-iface-helper.c:301
+#: ../src/main.c:236 ../src/nm-iface-helper.c:301
 #, c-format
 msgid "Log level: one of [%s]"
 msgstr "Niveau du journal : un de [%s]"
 
-#: ../src/main.c:183 ../src/nm-iface-helper.c:303
+#: ../src/main.c:238 ../src/nm-iface-helper.c:303
 #, c-format
 msgid "Log domains separated by ',': any combination of [%s]"
 msgstr ""
 "Domaine de journalisation séparés par des virgules « , » : toute combinaison "
 "de [%s]"
 
-#: ../src/main.c:185 ../src/nm-iface-helper.c:305
+#: ../src/main.c:240 ../src/nm-iface-helper.c:305
 msgid "Make all warnings fatal"
 msgstr "Rendre tous les avertissements fatals"
 
-#: ../src/main.c:186
+#: ../src/main.c:241
 msgid "Specify the location of a PID file"
 msgstr "Spécifier l'emplacement d'un fichier PID"
 
-#: ../src/main.c:188
-#, fuzzy
+#: ../src/main.c:242
+msgid "State file location"
+msgstr "Indiquez l'emplacement du fichier"
+
+#: ../src/main.c:244
 msgid "Print NetworkManager configuration and exit"
-msgstr "Imprimer la version de NetworkManager et quitter"
+msgstr "Imprimer la configuration de NetworkManager et quitter"
 
-#: ../src/main.c:198
+#: ../src/main.c:254
 msgid ""
 "NetworkManager monitors all network connections and automatically\n"
 "chooses the best connection to use.  It also allows the user to\n"
@@ -9276,81 +9791,82 @@ msgstr ""
 "de\n"
 "l'ordinateur devraient s'associer."
 
-#: ../src/main.c:285 ../src/main-utils.c:270 ../src/nm-iface-helper.c:393
+#: ../src/main.c:343 ../src/main-utils.c:269 ../src/nm-iface-helper.c:393
 #, c-format
 msgid "%s.  Please use --help to see a list of valid options.\n"
 msgstr "%s. Utilisez --help pour afficher une liste d'options valides.\n"
 
-#: ../src/main.c:290 ../src/nm-iface-helper.c:398
+#: ../src/main.c:348 ../src/nm-iface-helper.c:398
 #, c-format
 msgid "Ignoring unrecognized log domain(s) '%s' passed on command line.\n"
 msgstr ""
 "Ignore le(s) domaine(s) de journalisation non reconnus « %s » sur la ligne "
 "de commande.\n"
 
-#: ../src/main.c:315
+#: ../src/main.c:373
 #, c-format
 msgid "Error in configuration file: %s.\n"
 msgstr "Erreur dans le fichier de configuration : %s.\n"
 
-#: ../src/main.c:320
+#: ../src/main.c:378
 #, c-format
 msgid "Ignoring unrecognized log domain(s) '%s' from config files.\n"
 msgstr ""
 "Ignore le(s) domaine(s) de journalisation non reconnus « %s » des fichiers "
 "de configuration.\n"
 
-#: ../src/main.c:331 ../src/nm-iface-helper.c:408
+#: ../src/main.c:389 ../src/nm-iface-helper.c:408
 #, c-format
 msgid "Could not daemonize: %s [error %u]\n"
 msgstr "Impossible de démoniser : %s [error %u]\n"
 
-#: ../src/main-utils.c:98
+#: ../src/main-utils.c:99
 #, c-format
 msgid "Opening %s failed: %s\n"
 msgstr "Échec de l'ouverture de  %s : %s\n"
 
-#: ../src/main-utils.c:104
+#: ../src/main-utils.c:105
 #, c-format
 msgid "Writing to %s failed: %s\n"
 msgstr "Échec de l'écriture sur %s : %s\n"
 
-#: ../src/main-utils.c:109
+#: ../src/main-utils.c:110
 #, c-format
 msgid "Closing %s failed: %s\n"
 msgstr "Échec de la fermeture de %s : %s\n"
 
-#: ../src/main-utils.c:144
+#: ../src/main-utils.c:145
 #, c-format
 msgid "Cannot create '%s': %s"
-msgstr ""
+msgstr "Impossible de créer « %s » : %s"
 
-#: ../src/main-utils.c:196
-#, fuzzy, c-format
+#: ../src/main-utils.c:197
+#, c-format
 msgid "%s is already running (pid %ld)\n"
-msgstr "NetworkManager est déjà en cours d'exécution (pid %ld)\n"
+msgstr "%s est déjà en cours d'exécution (pid %ld)\n"
 
-#: ../src/main-utils.c:206
-#, fuzzy, c-format
+#: ../src/main-utils.c:207
+#, c-format
 msgid "You must be root to run %s!\n"
 msgstr ""
-"Vous devez être connecté en tant que super-utilisateur pour exécuter "
-"NetworkManager !\n"
+"Vous devez être connecté en tant que super-utilisateur pour exécuter %s !\n"
 
-#: ../src/dhcp-manager/nm-dhcp-dhclient-utils.c:214
+#: ../src/dhcp-manager/nm-dhcp-dhclient-utils.c:213
 msgid "# Created by NetworkManager\n"
 msgstr "# Créé par NetworkManager\n"
 
-#: ../src/dhcp-manager/nm-dhcp-dhclient-utils.c:222
+#: ../src/dhcp-manager/nm-dhcp-dhclient-utils.c:220
 #, c-format
-msgid ""
-"# Merged from %s\n"
+msgid "# Merged from %s\n"
 "\n"
-msgstr ""
-"# Fusionné depuis %s\n"
+msgstr "# Fusionné depuis %s\n"
 "\n"
 
-#: ../src/devices/bluetooth/nm-bluez-device.c:200
+#: ../src/devices/adsl/nm-device-adsl.c:133
+msgid "ADSL connection"
+msgstr "Connexion ADSL"
+
+#: ../src/devices/bluetooth/nm-bluez-device.c:197
 #, c-format
 msgid "%s Network"
 msgstr "Réseau %s"
@@ -9358,353 +9874,359 @@ msgstr "Réseau %s"
 #: ../src/devices/bluetooth/nm-device-bt.c:253
 msgid "PAN requested, but Bluetooth device does not support NAP"
 msgstr ""
+"PAN exigé, sauf que le périphérique Bletooth ne prend pas NAP en charge"
 
 #: ../src/devices/bluetooth/nm-device-bt.c:263
 msgid "PAN connections cannot specify GSM, CDMA, or serial settings"
 msgstr ""
+"Les connexions PAN ne peuvent pas spécifier les configurations en série, "
+"GSM, ou CDMA."
 
 #: ../src/devices/bluetooth/nm-device-bt.c:276
-#, fuzzy
 msgid "PAN connection"
-msgstr "Connexion PAN %d"
+msgstr "Connexion PAN"
 
 #: ../src/devices/bluetooth/nm-device-bt.c:283
 msgid "DUN requested, but Bluetooth device does not support DUN"
 msgstr ""
+"DUN exigé, sauf que le périphérique Bletooth ne prend pas DUN en charge"
 
 #: ../src/devices/bluetooth/nm-device-bt.c:293
 msgid "DUN connection must include a GSM or CDMA setting"
-msgstr ""
+msgstr "La connexion DUN doit inclure une configuration GSM ou CDMA"
 
 #: ../src/devices/bluetooth/nm-device-bt.c:303
-#: ../src/devices/wwan/nm-modem-broadband.c:687
-#, fuzzy
+#: ../src/devices/wwan/nm-modem-broadband.c:655
 msgid "GSM connection"
-msgstr "Connexion GSM %d"
+msgstr "Connexion GSM"
 
 #: ../src/devices/bluetooth/nm-device-bt.c:307
-#: ../src/devices/wwan/nm-modem-broadband.c:711
-#, fuzzy
+#: ../src/devices/wwan/nm-modem-broadband.c:679
 msgid "CDMA connection"
-msgstr "Connexion CDMA %d"
+msgstr "Connexion CDMA"
 
 #: ../src/devices/bluetooth/nm-device-bt.c:315
 msgid "Unknown/unhandled Bluetooth connection type"
-msgstr ""
+msgstr "Type de connexion Bluetooth inconnu/non supporté"
 
 #: ../src/devices/bluetooth/nm-device-bt.c:336
-#: ../src/devices/nm-device-ethernet.c:1421
+#: ../src/devices/nm-device-ethernet.c:1415
 #: ../src/devices/nm-device-infiniband.c:193
-#: ../src/devices/wifi/nm-device-wifi.c:875
-#, fuzzy
+#: ../src/devices/wifi/nm-device-wifi.c:872
 msgid "connection does not match device"
-msgstr "aucune connexion ou périphérique actif"
+msgstr "la connexion ne correspond pas au périphérique"
 
 #: ../src/devices/nm-device-bond.c:105
-#, fuzzy
 msgid "Bond connection"
-msgstr "Connexion de liaison %d"
+msgstr "Connexion de liaison"
 
 #: ../src/devices/nm-device-bridge.c:111
-#, fuzzy
 msgid "Bridge connection"
-msgstr "Connexion de pont %d"
+msgstr "Connexion de pont"
 
-#: ../src/devices/nm-device-ethernet.c:1402
-#, fuzzy
+#: ../src/devices/nm-device-ethernet.c:1396
 msgid "PPPoE connection"
-msgstr "Connexion PPPoE %d"
+msgstr "Connexion PPPoE"
 
-#: ../src/devices/nm-device-ethernet.c:1402
-#, fuzzy
+#: ../src/devices/nm-device-ethernet.c:1396
 msgid "Wired connection"
-msgstr "Connexion filaire %d"
+msgstr "Connexion filaire"
 
-#: ../src/devices/nm-device-ethernet-utils.c:36
+#: ../src/devices/nm-device-ethernet-utils.c:39
 #, c-format
 msgid "Wired connection %d"
 msgstr "Connexion filaire %d"
 
-#: ../src/devices/nm-device-ip-tunnel.c:347
-#, fuzzy
+#: ../src/devices/nm-device-infiniband.c:175
+msgid "InfiniBand connection"
+msgstr "Connexion InfiniBand"
+
+#: ../src/devices/nm-device-ip-tunnel.c:346
 msgid "IP tunnel connection"
-msgstr "Modifier la connexion"
+msgstr "Connexion de tunnel IP"
 
-#: ../src/devices/nm-device-macvlan.c:436
-#, fuzzy
+#: ../src/devices/nm-device-macvlan.c:435
 msgid "MACVLAN connection"
-msgstr "Connexion VLAN %d"
+msgstr "Connexion MACVLAN"
 
 #: ../src/devices/nm-device-tun.c:129
-#, fuzzy
 msgid "TUN connection"
-msgstr "Connexion DUN %d"
+msgstr "Connexion TUN"
 
-#: ../src/devices/team/nm-device-team.c:121
-#, fuzzy
+#: ../src/devices/nm-device-vlan.c:457
+msgid "VLAN connection"
+msgstr "Connexion VLAN"
+
+#: ../src/devices/nm-device-vxlan.c:373
+msgid "VXLAN connection"
+msgstr "Connexion VXLAN"
+
+#: ../src/devices/team/nm-device-team.c:115
 msgid "Team connection"
-msgstr "Connexion de l'équipe %d"
+msgstr "Connexion Team"
 
 #: ../src/devices/wifi/nm-device-olpc-mesh.c:146
-#, fuzzy
 msgid "Mesh"
-msgstr "Réseau maillé %d"
+msgstr "Maillage"
 
-#: ../src/devices/wifi/nm-device-wifi.c:842
+#: ../src/devices/wifi/nm-device-wifi.c:839
 msgid "WPA Ad-Hoc disabled due to kernel bugs"
-msgstr ""
+msgstr "WPA Ad-Hoc désactivé pour cause de bogues dans le noyau"
 
 #: ../src/devices/wifi/nm-wifi-ap-utils.c:42
-#, fuzzy, c-format
+#, c-format
 msgid "%s is incompatible with static WEP keys"
-msgstr "« %s=%s » est incompatible avec « %s > 0 »"
+msgstr "%s incompatible avec clés statiques WEP"
 
 #: ../src/devices/wifi/nm-wifi-ap-utils.c:76
-#, fuzzy
 msgid "LEAP authentication requires a LEAP username"
-msgstr "L'authentification est requise par le réseau sans fil"
+msgstr "L'authentification LEP requiert un nom d'utilisateur LEAP"
 
 #: ../src/devices/wifi/nm-wifi-ap-utils.c:86
 msgid "LEAP username requires 'leap' authentication"
-msgstr ""
+msgstr "Le nom d'utilisateur LEAP requiert une authentification LEAP"
 
 #: ../src/devices/wifi/nm-wifi-ap-utils.c:99
 msgid "LEAP authentication requires IEEE 802.1x key management"
-msgstr ""
+msgstr "L'authentification LEAP requiert un gestion de clès IEEE 802.1x"
 
 #: ../src/devices/wifi/nm-wifi-ap-utils.c:119
 msgid "LEAP authentication is incompatible with Ad-Hoc mode"
-msgstr ""
+msgstr "L'authentification LEAP est incompatible avec le mode Ad_Hoc"
 
 #: ../src/devices/wifi/nm-wifi-ap-utils.c:131
 msgid "LEAP authentication is incompatible with 802.1x setting"
-msgstr ""
+msgstr "L'authentification LEAP est incompatible avec la configuration 802.1x"
 
 #: ../src/devices/wifi/nm-wifi-ap-utils.c:153
 #, c-format
 msgid "a connection using '%s' authentication cannot use WPA key management"
 msgstr ""
+"une connexion utilisant l'authentification « %s » ne peut pas utiliser une "
+"gestion de clés WPA"
 
 #: ../src/devices/wifi/nm-wifi-ap-utils.c:164
 #, c-format
 msgid "a connection using '%s' authentication cannot specify WPA protocols"
 msgstr ""
+"une connexion qui utilise une authentification « %s » ne peut pas spécifier "
+"de protocoles WPA"
 
 #: ../src/devices/wifi/nm-wifi-ap-utils.c:180
 #: ../src/devices/wifi/nm-wifi-ap-utils.c:197
 #, c-format
 msgid "a connection using '%s' authentication cannot specify WPA ciphers"
 msgstr ""
+"une connexion utilisant l'authentification « %s » ne peut pas spécifier de "
+"chiffrement WPA"
 
 #: ../src/devices/wifi/nm-wifi-ap-utils.c:209
 #, c-format
 msgid "a connection using '%s' authentication cannot specify a WPA password"
 msgstr ""
+"une connexion qui utilise une authentification « %s » ne peut pas indiquer "
+"un mot de passe WPA"
 
 #: ../src/devices/wifi/nm-wifi-ap-utils.c:240
-#, fuzzy
 msgid "Dynamic WEP requires an 802.1x setting"
-msgstr "WEP Dynamique (802.1x)"
+msgstr "WEP Dynamique requiert une configuration 802.1x"
 
 #: ../src/devices/wifi/nm-wifi-ap-utils.c:250
 #: ../src/devices/wifi/nm-wifi-ap-utils.c:278
 msgid "Dynamic WEP requires 'open' authentication"
-msgstr ""
+msgstr "WEP Dynamique requiert une authentification « open »"
 
 #: ../src/devices/wifi/nm-wifi-ap-utils.c:265
 msgid "Dynamic WEP requires 'ieee8021x' key management"
-msgstr ""
+msgstr "WEP Dynamique requiert une gestion de clés « ieee802x »"
 
 #: ../src/devices/wifi/nm-wifi-ap-utils.c:312
 msgid "WPA-PSK authentication is incompatible with 802.1x"
-msgstr ""
+msgstr "L'authentification WPA-PSK est incompatible avec 802.1x"
 
 #: ../src/devices/wifi/nm-wifi-ap-utils.c:322
-#, fuzzy
 msgid "WPA-PSK requires 'open' authentication"
-msgstr "Authentification filaire 802.1X"
+msgstr "Authentification « open » exige WPA-PSK"
 
 #: ../src/devices/wifi/nm-wifi-ap-utils.c:334
 msgid "WPA Ad-Hoc authentication requires an Ad-Hoc mode AP"
-msgstr ""
+msgstr "L'authentification WPA Ad-Hoc requiert un AP mode Ad-Hoc"
 
 #: ../src/devices/wifi/nm-wifi-ap-utils.c:347
 msgid "WPA Ad-Hoc authentication requires 'wpa' protocol"
-msgstr ""
+msgstr "L'authentification WPA Ad-Hoc requiert un protocole « wpa »"
 
 #: ../src/devices/wifi/nm-wifi-ap-utils.c:359
-#, fuzzy
 msgid "WPA Ad-Hoc authentication requires 'none' pairwise cipher"
-msgstr "L'authentification est requise par le réseau sans fil"
+msgstr ""
+"L'authentification WPA Ad-Hoc requiert un chiffrement « none » pairwise"
 
 #: ../src/devices/wifi/nm-wifi-ap-utils.c:371
 msgid "WPA Ad-Hoc requires 'tkip' group cipher"
-msgstr ""
+msgstr "WPA Ad-Hoc requiert un chiffrement de groupe « tkip »"
 
 #: ../src/devices/wifi/nm-wifi-ap-utils.c:385
 msgid "Access point does not support PSK but setting requires it"
-msgstr ""
+msgstr "Le point d'accès ne supporte pas PSK mais la configuration l'exige"
 
 #: ../src/devices/wifi/nm-wifi-ap-utils.c:415
 msgid "WPA-EAP authentication requires an 802.1x setting"
-msgstr ""
+msgstr "L'authentification WPA-EAP requiert une configuration 802.1x"
 
 #: ../src/devices/wifi/nm-wifi-ap-utils.c:425
-#, fuzzy
 msgid "WPA-EAP requires 'open' authentication"
-msgstr "Authentification filaire 802.1X"
+msgstr "WPA-EAP requiert une authentification « open »"
 
 #: ../src/devices/wifi/nm-wifi-ap-utils.c:436
 msgid "802.1x setting requires 'wpa-eap' key management"
-msgstr ""
+msgstr "La configuration 802.1x requiert une gestion de clé « wpa-eap »"
 
 #: ../src/devices/wifi/nm-wifi-ap-utils.c:449
 msgid "Access point does not support 802.1x but setting requires it"
 msgstr ""
+"Le point d'accès ne prend pas 802.1x en charge mais la configuration l'exige"
 
 #: ../src/devices/wifi/nm-wifi-ap-utils.c:477
 msgid ""
 "Access point mode is Ad-Hoc but setting requires Infrastructure security"
 msgstr ""
+"Le mode de point d'accès est Ad-Hoc mais la configuration exige une sécurité "
+"Infrastructure"
 
 #: ../src/devices/wifi/nm-wifi-ap-utils.c:487
 msgid "Ad-Hoc mode is incompatible with 802.1x security"
-msgstr ""
+msgstr "Le mode Ad-Hoc n'est pas compatible avec la sécurité 802.1x"
 
 #: ../src/devices/wifi/nm-wifi-ap-utils.c:496
 msgid "Ad-Hoc mode is incompatible with LEAP security"
-msgstr ""
+msgstr "Le mode Ad-Hoc n'est pas compatible avec la sécurité LEAP"
 
 #: ../src/devices/wifi/nm-wifi-ap-utils.c:506
 msgid "Ad-Hoc mode requires 'open' authentication"
-msgstr ""
+msgstr "Le mode Ad-Hoc requiert une authentification « open »"
 
 #: ../src/devices/wifi/nm-wifi-ap-utils.c:516
 msgid ""
 "Access point mode is Infrastructure but setting requires Ad-Hoc security"
 msgstr ""
+"Le mode de point d'accès est Infrastructure mais la configuration exige une "
+"sécurité Ad-Hoc"
 
 #: ../src/devices/wifi/nm-wifi-ap-utils.c:558
 #: ../src/devices/wifi/nm-wifi-ap-utils.c:588
 #, c-format
 msgid "connection does not match access point"
-msgstr ""
+msgstr "la connexion ne correspond pas au point d'acccès"
 
 #: ../src/devices/wifi/nm-wifi-ap-utils.c:612
 msgid "Access point is unencrypted but setting specifies security"
 msgstr ""
+"Le point d'accès est encrypté mais la configuration spécifie la sécurité"
 
 #: ../src/devices/wifi/nm-wifi-ap-utils.c:701
 msgid ""
 "WPA authentication is incompatible with non-EAP (original) LEAP or Dynamic "
 "WEP"
 msgstr ""
+"L'authentification WPA n'est pas compatible avec un LEAP non-EAP (original) "
+"ou une WEP Dynamique"
 
 #: ../src/devices/wifi/nm-wifi-ap-utils.c:711
 msgid "WPA authentication is incompatible with Shared Key authentication"
 msgstr ""
+"L'authentification WPA n'est pas compatible avec l'authentification de clés "
+"partagées"
 
 #: ../src/devices/wifi/nm-wifi-ap-utils.c:758
-#, fuzzy
 msgid "Failed to determine AP security information"
-msgstr "La définition de la clé symétrique pour le déchiffrement a échoué."
+msgstr "N'a pas pu déterminer les informations de sécurité AP"
 
-#: ../src/devices/wwan/nm-modem-broadband.c:673
-#, fuzzy
+#: ../src/devices/wwan/nm-modem-broadband.c:641
 msgid "GSM mobile broadband connection requires a 'gsm' setting"
-msgstr "Connexion haut débit mobile %d"
+msgstr ""
+"La connexion de bande passante mobile GSM exige une configuration «gsm »"
 
-#: ../src/nm-config.c:500
+#: ../src/nm-config.c:465
 msgid "Config file location"
 msgstr "Emplacement du fichier de configuration"
 
-#: ../src/nm-config.c:501
+#: ../src/nm-config.c:466
 msgid "Config directory location"
 msgstr "Emplacement du répertoire de configuration"
 
-#: ../src/nm-config.c:502
-#, fuzzy
+#: ../src/nm-config.c:467
 msgid "System config directory location"
-msgstr "Emplacement du répertoire de configuration"
+msgstr "Emplacement du répertoire de configuration système"
 
-#: ../src/nm-config.c:503
-#, fuzzy
+#: ../src/nm-config.c:468
 msgid "Internal config file location"
-msgstr "Emplacement du fichier de configuration"
-
-#: ../src/nm-config.c:504
-msgid "State file location"
-msgstr "Indiquez l'emplacement du fichier"
+msgstr "Emplacement du fichier de configuration interne"
 
-#: ../src/nm-config.c:505
+#: ../src/nm-config.c:469
 msgid "State file for no-auto-default devices"
-msgstr ""
+msgstr "Indiquer le fichier pour périphériques non-auto-par défaut"
 
-#: ../src/nm-config.c:506
+#: ../src/nm-config.c:470
 msgid "List of plugins separated by ','"
-msgstr "Liste des plugins séparée par des virgules « , »"
+msgstr "Liste des greffons séparée par des virgules « , »"
 
-#: ../src/nm-config.c:507
-#, fuzzy
+#: ../src/nm-config.c:471
 msgid "Quit after initial configuration"
-msgstr "Configuration nmcli actuelle :\n"
+msgstr "Sortie après la configuration initiale"
 
-#: ../src/nm-config.c:508 ../src/nm-iface-helper.c:300
+#: ../src/nm-config.c:472 ../src/nm-iface-helper.c:300
 msgid "Don't become a daemon, and log to stderr"
-msgstr "Ne pas devenir un démon et se connecter à stderr"
+msgstr "Ne pas devenir un démon, et se connecter à stderr"
 
 #. These three are hidden for now, and should eventually just go away.
-#: ../src/nm-config.c:511
+#: ../src/nm-config.c:475
 msgid "An http(s) address for checking internet connectivity"
 msgstr "Adresse http(s) pour vérifier la connectivité internet"
 
-#: ../src/nm-config.c:512
+#: ../src/nm-config.c:476
 msgid "The interval between connectivity checks (in seconds)"
 msgstr "Intervalle entre les vérifications de connectivité (en secondes)"
 
-#: ../src/nm-config.c:513
+#: ../src/nm-config.c:477
 msgid "The expected start of the response"
 msgstr "Début prévu de la réponse"
 
 #. Interface/IP config
 #: ../src/nm-iface-helper.c:281
-#, fuzzy
 msgid "The interface to manage"
-msgstr "Interface parent [none] : "
+msgstr "L'interface à gérer"
 
 #: ../src/nm-iface-helper.c:281
 msgid "eth0"
-msgstr ""
+msgstr "eth0"
 
 #: ../src/nm-iface-helper.c:282
-#, fuzzy
 msgid "Connection UUID"
-msgstr "connexion"
+msgstr "Connexion UUID"
 
 #: ../src/nm-iface-helper.c:282
 msgid "661e8cd0-b618-46b8-9dc9-31a52baaa16b"
-msgstr ""
+msgstr "661e8cd0-b618-46b8-9dc9-31a52baaa16b"
 
 #: ../src/nm-iface-helper.c:283
 msgid "Whether to manage IPv6 SLAAC"
-msgstr ""
+msgstr "Indique si on doit gérer IPv6 SLAAC"
 
 #: ../src/nm-iface-helper.c:284
 msgid "Whether SLAAC must be successful"
-msgstr ""
+msgstr "Indique si SLAAC doit avoir réussi"
 
 #: ../src/nm-iface-helper.c:285
 msgid "Use an IPv6 temporary privacy address"
-msgstr ""
+msgstr "Utiliser une adresse privée temporaire d'IPv6"
 
 #: ../src/nm-iface-helper.c:286
-#, fuzzy
 msgid "Current DHCPv4 address"
-msgstr "Adresse MAC clonée"
+msgstr "Adresse DHCPv4 actuelle"
 
 #: ../src/nm-iface-helper.c:287
 msgid "Whether DHCPv4 must be successful"
-msgstr ""
+msgstr "Indique si DHCPv4 doit avoir réussi"
 
 #: ../src/nm-iface-helper.c:288
 msgid "Hex-encoded DHCPv4 client ID"
@@ -9716,7 +10238,7 @@ msgstr "Nom d'hôte à envoyer au serveur DHCP"
 
 #: ../src/nm-iface-helper.c:289
 msgid "barbar"
-msgstr ""
+msgstr "barbar"
 
 #: ../src/nm-iface-helper.c:290
 msgid "FQDN to send to DHCP server"
@@ -9748,45 +10270,57 @@ msgstr "Identifiant d'interface encodé en hexadécimal"
 
 #: ../src/nm-iface-helper.c:294
 msgid "IPv6 SLAAC address generation mode"
-msgstr ""
+msgstr "Mode de génération d'adresses IPv6 SLAAC"
 
 #: ../src/nm-iface-helper.c:295
 msgid ""
 "The logging backend configuration value. See logging.backend in "
 "NetworkManager.conf"
 msgstr ""
+"La valeur de configuration du backend de journalisation. Voir logging."
+"backend dans NetworkManager.conf"
 
 #: ../src/nm-iface-helper.c:315
 msgid ""
 "nm-iface-helper is a small, standalone process that manages a single network "
 "interface."
 msgstr ""
+"nm-iface-helper est un petit processus autonome qui gère une interface de "
+"réseau unique."
 
 #: ../src/nm-iface-helper.c:374
-#, fuzzy, c-format
+#, c-format
 msgid "An interface name and UUID are required\n"
-msgstr "Un nom d'interface et un UUID sont requis"
+msgstr "UUID et Nom d'interface obligatoires\n"
 
 #: ../src/nm-iface-helper.c:380
 #, c-format
 msgid "Failed to find interface index for %s (%s)\n"
-msgstr ""
+msgstr "N'a pas pu trouver l'index d'interface pour %s (%s)\n"
 
 #: ../src/nm-iface-helper.c:442
 #, c-format
 msgid "(%s): Invalid IID %s\n"
-msgstr ""
+msgstr "(%s): IID non valide %s\n"
 
-#: ../src/nm-logging.c:223
+#: ../src/nm-logging.c:216
 #, c-format
 msgid "Unknown log level '%s'"
 msgstr "Niveau de journalisation « %s » inconnu"
 
-#: ../src/nm-logging.c:318
+#: ../src/nm-logging.c:309
 #, c-format
 msgid "Unknown log domain '%s'"
 msgstr "Domaine de journalisation « %s » inconnu"
 
-#: ../src/settings/plugins/ifcfg-rh/reader.c:106
+#: ../src/nm-manager.c:3635
+msgid "VPN connection"
+msgstr "Connexion VPN"
+
+#: ../src/nm-sleep-monitor-systemd.c:131
+msgid "NetworkManager needs to turn off networks"
+msgstr "NetworkManager doit fermer les réseaux"
+
+#: ../src/settings/plugins/ifcfg-rh/reader.c:108
 msgid "System"
 msgstr "Système"
diff --git a/po/it.po b/po/it.po
index 6ff45c6ca8..60e1b4f72f 100644
--- a/po/it.po
+++ b/po/it.po
@@ -4,22 +4,21 @@
 # Francesco Marletta <francesco.marletta@tiscali.it>, 2004, 2005, 2006, 2007, 2008, 2009, 2010.
 # Vincenzo Reale <smart2128@baslug.org>, 2011.
 # Milo Casagrande <milo@ubuntu.com>, 2011, 2012, 2013, 2014.
-# Lubomir Rintel <lkundrak@v3.sk>, 2016. #zanata
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-06-22 10:02+0200\n"
-"PO-Revision-Date: 2014-03-09 12:07-0400\n"
-"Last-Translator: Milo Casagrande <milo@milo.name>\n"
-"Language-Team: Italian <tp@lists.linux.it>\n"
-"Language: it\n"
+"POT-Creation-Date: 2016-04-29 14:24+0530\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"PO-Revision-Date: 2016-07-05 08:39+0000\n"
+"Last-Translator: Copied by Zanata <copied-by-zanata@zanata.org>\n"
+"Language-Team: Italian <tp@lists.linux.it>\n"
+"Language: it\n"
 "Plural-Forms: nplurals=2; plural=(n!=1);\n"
 "X-Launchpad-Export-Date: 2011-10-23 16:25+0000\n"
-"X-Generator: Zanata 3.8.4\n"
+"X-Generator: Zanata 3.9.3\n"
 
 #: ../clients/cli/agent.c:39
 #, c-format
@@ -107,21 +106,21 @@ msgstr "Errore: inizializzazione agente polkit non riuscita: %s"
 msgid "nmcli successfully registered as a polkit agent.\n"
 msgstr "nmcli registrato con successo come agente polkit.\n"
 
-#: ../clients/cli/agent.c:206 ../clients/cli/connections.c:8703
-#: ../clients/cli/devices.c:3727 ../clients/cli/general.c:344
-#: ../clients/cli/general.c:473
+#: ../clients/cli/agent.c:206 ../clients/cli/connections.c:11050
+#: ../clients/cli/devices.c:3669 ../clients/cli/general.c:343
+#: ../clients/cli/general.c:484
 #, c-format
 msgid "Error: NetworkManager is not running."
 msgstr "Errore: NetworkManager non è in esecuzione."
 
-#: ../clients/cli/agent.c:239
+#: ../clients/cli/agent.c:242
 #, c-format
 msgid "Error: 'agent' command '%s' is not valid."
 msgstr "Errore: comando \"agent\" \"%s\" non valido."
 
 #: ../clients/cli/common.c:38 ../clients/cli/common.c:51
 #: ../clients/cli/common.c:59 ../clients/cli/common.c:71
-#: ../clients/cli/connections.c:237 ../clients/cli/connections.c:259
+#: ../clients/cli/connections.c:192 ../clients/cli/connections.c:214
 msgid "GROUP"
 msgstr "GRUPPO"
 
@@ -133,7 +132,7 @@ msgstr "INDIRIZZO"
 #. 1
 #. 2
 #: ../clients/cli/common.c:40 ../clients/cli/common.c:61
-#: ../clients/cli/connections.c:262
+#: ../clients/cli/connections.c:217
 msgid "GATEWAY"
 msgstr "GATEWAY"
 
@@ -205,7 +204,7 @@ msgstr "non gestito"
 msgid "unavailable"
 msgstr "non disponibile"
 
-#: ../clients/cli/common.c:498 ../clients/cli/general.c:246
+#: ../clients/cli/common.c:498 ../clients/cli/general.c:245
 msgid "disconnected"
 msgstr "scollegato"
 
@@ -233,11 +232,11 @@ msgstr "connessione in corso (verifica connettività IP)"
 msgid "connecting (starting secondary connections)"
 msgstr "connessione in corso (avvio connessioni secondarie)"
 
-#: ../clients/cli/common.c:512 ../clients/cli/general.c:242
+#: ../clients/cli/common.c:512 ../clients/cli/general.c:241
 msgid "connected"
 msgstr "collegato"
 
-#: ../clients/cli/common.c:514 ../clients/cli/connections.c:690
+#: ../clients/cli/common.c:514 ../clients/cli/connections.c:648
 msgid "deactivating"
 msgstr "disattivazione"
 
@@ -246,53 +245,52 @@ msgid "connection failed"
 msgstr "connessione non riuscita"
 
 #: ../clients/cli/common.c:518 ../clients/cli/common.c:535
-#: ../clients/cli/connections.c:695 ../clients/cli/connections.c:718
-#: ../clients/cli/connections.c:1995 ../clients/cli/devices.c:1104
-#: ../clients/cli/devices.c:1145 ../clients/cli/devices.c:1147
-#: ../clients/cli/general.c:249 ../clients/cli/general.c:287
-#: ../clients/cli/general.c:422 ../clients/cli/general.c:437
-#: ../clients/cli/settings.c:845 ../clients/cli/settings.c:931
-#: ../clients/cli/settings.c:1315 ../clients/cli/settings.c:1954
-#: ../clients/cli/settings.c:3317
+#: ../clients/cli/connections.c:653 ../clients/cli/connections.c:676
+#: ../clients/cli/connections.c:1949 ../clients/cli/devices.c:1024
+#: ../clients/cli/devices.c:1065 ../clients/cli/devices.c:1067
+#: ../clients/cli/general.c:248 ../clients/cli/general.c:286
+#: ../clients/cli/general.c:432 ../clients/cli/general.c:448
+#: ../clients/cli/settings.c:839 ../clients/cli/settings.c:925
+#: ../clients/cli/settings.c:1265 ../clients/cli/settings.c:1901
+#: ../clients/cli/settings.c:3205 ../clients/cli/utils.c:1400
 #, c-format
 msgid "unknown"
 msgstr "sconosciuto"
 
 #. "CAPABILITIES"
-#: ../clients/cli/common.c:527 ../clients/cli/connections.c:975
-#: ../clients/cli/connections.c:977 ../clients/cli/connections.c:979
-#: ../clients/cli/connections.c:1013 ../clients/cli/connections.c:1082
-#: ../clients/cli/connections.c:1083 ../clients/cli/connections.c:1085
-#: ../clients/cli/connections.c:3291 ../clients/cli/connections.c:4414
-#: ../clients/cli/connections.c:6229 ../clients/cli/connections.c:6230
-#: ../clients/cli/devices.c:782 ../clients/cli/devices.c:1069
-#: ../clients/cli/devices.c:1070 ../clients/cli/devices.c:1071
-#: ../clients/cli/devices.c:1072 ../clients/cli/devices.c:1073
-#: ../clients/cli/devices.c:1108 ../clients/cli/devices.c:1110
-#: ../clients/cli/devices.c:1138 ../clients/cli/devices.c:1139
-#: ../clients/cli/devices.c:1140 ../clients/cli/devices.c:1141
-#: ../clients/cli/devices.c:1142 ../clients/cli/devices.c:1143
-#: ../clients/cli/devices.c:1144 ../clients/cli/devices.c:1146
-#: ../clients/cli/devices.c:1148 ../clients/cli/general.c:431
-#: ../clients/cli/settings.c:3312
+#: ../clients/cli/common.c:527 ../clients/cli/connections.c:933
+#: ../clients/cli/connections.c:935 ../clients/cli/connections.c:937
+#: ../clients/cli/connections.c:971 ../clients/cli/connections.c:1040
+#: ../clients/cli/connections.c:1041 ../clients/cli/connections.c:1043
+#: ../clients/cli/connections.c:3450 ../clients/cli/connections.c:8563
+#: ../clients/cli/connections.c:8564 ../clients/cli/devices.c:772
+#: ../clients/cli/devices.c:989 ../clients/cli/devices.c:990
+#: ../clients/cli/devices.c:991 ../clients/cli/devices.c:992
+#: ../clients/cli/devices.c:993 ../clients/cli/devices.c:1028
+#: ../clients/cli/devices.c:1030 ../clients/cli/devices.c:1058
+#: ../clients/cli/devices.c:1059 ../clients/cli/devices.c:1060
+#: ../clients/cli/devices.c:1061 ../clients/cli/devices.c:1062
+#: ../clients/cli/devices.c:1063 ../clients/cli/devices.c:1064
+#: ../clients/cli/devices.c:1066 ../clients/cli/devices.c:1068
+#: ../clients/cli/general.c:442 ../clients/cli/settings.c:3200
 msgid "yes"
 msgstr "sì"
 
-#: ../clients/cli/common.c:529 ../clients/cli/connections.c:975
-#: ../clients/cli/connections.c:977 ../clients/cli/connections.c:979
-#: ../clients/cli/connections.c:1082 ../clients/cli/connections.c:1083
-#: ../clients/cli/connections.c:1085 ../clients/cli/connections.c:3292
-#: ../clients/cli/connections.c:4413 ../clients/cli/connections.c:6229
-#: ../clients/cli/connections.c:6230 ../clients/cli/devices.c:782
-#: ../clients/cli/devices.c:1069 ../clients/cli/devices.c:1070
-#: ../clients/cli/devices.c:1071 ../clients/cli/devices.c:1072
-#: ../clients/cli/devices.c:1073 ../clients/cli/devices.c:1108
-#: ../clients/cli/devices.c:1110 ../clients/cli/devices.c:1138
-#: ../clients/cli/devices.c:1139 ../clients/cli/devices.c:1140
-#: ../clients/cli/devices.c:1141 ../clients/cli/devices.c:1142
-#: ../clients/cli/devices.c:1143 ../clients/cli/devices.c:1144
-#: ../clients/cli/devices.c:1146 ../clients/cli/devices.c:1148
-#: ../clients/cli/general.c:433 ../clients/cli/settings.c:3314
+#: ../clients/cli/common.c:529 ../clients/cli/connections.c:933
+#: ../clients/cli/connections.c:935 ../clients/cli/connections.c:937
+#: ../clients/cli/connections.c:1040 ../clients/cli/connections.c:1041
+#: ../clients/cli/connections.c:1043 ../clients/cli/connections.c:3451
+#: ../clients/cli/connections.c:8563 ../clients/cli/connections.c:8564
+#: ../clients/cli/devices.c:772 ../clients/cli/devices.c:989
+#: ../clients/cli/devices.c:990 ../clients/cli/devices.c:991
+#: ../clients/cli/devices.c:992 ../clients/cli/devices.c:993
+#: ../clients/cli/devices.c:1028 ../clients/cli/devices.c:1030
+#: ../clients/cli/devices.c:1058 ../clients/cli/devices.c:1059
+#: ../clients/cli/devices.c:1060 ../clients/cli/devices.c:1061
+#: ../clients/cli/devices.c:1062 ../clients/cli/devices.c:1063
+#: ../clients/cli/devices.c:1064 ../clients/cli/devices.c:1066
+#: ../clients/cli/devices.c:1068 ../clients/cli/general.c:444
+#: ../clients/cli/settings.c:3202
 msgid "no"
 msgstr "no"
 
@@ -309,7 +307,7 @@ msgid "No reason given"
 msgstr "Nessun motivo specificato"
 
 #. We should not really come here
-#: ../clients/cli/common.c:547 ../clients/cli/connections.c:3140
+#: ../clients/cli/common.c:547 ../clients/cli/connections.c:2976
 #, c-format
 msgid "Unknown error"
 msgstr "Errore sconosciuto"
@@ -564,8 +562,8 @@ msgid "The device parent's management changed"
 msgstr "La gestione del dispositivo genitore è stata modificata"
 
 #. TRANSLATORS: Unknown reason for a device state change (NMDeviceStateReason)
-#: ../clients/cli/common.c:734 ../libnm-glib/nm-device.c:1898
-#: ../libnm/nm-device.c:1849
+#: ../clients/cli/common.c:734 ../libnm-glib/nm-device.c:1888
+#: ../libnm/nm-device.c:1839
 msgid "Unknown"
 msgstr "Sconosciuto"
 
@@ -609,116 +607,69 @@ msgstr ""
 "può richiederla senza l'opzione \"--ask\".\n"
 
 #. define some prompts for connection editor
-#: ../clients/cli/connections.c:61
+#: ../clients/cli/connections.c:41
 msgid "Setting name? "
 msgstr "Nome impostazione? "
 
-#: ../clients/cli/connections.c:62
+#: ../clients/cli/connections.c:42
 msgid "Property name? "
 msgstr "Nome proprietà? "
 
-#: ../clients/cli/connections.c:63
+#: ../clients/cli/connections.c:43
 msgid "Enter connection type: "
 msgstr "Digitare il tipo di connessione:"
 
 #. define some other prompts
-#: ../clients/cli/connections.c:66
-#, fuzzy
-msgid "Connection type"
+#: ../clients/cli/connections.c:46
+msgid "Connection type: "
 msgstr "Tipo di connessione:"
 
-#: ../clients/cli/connections.c:67
-#, fuzzy
-msgid "VPN type"
+#: ../clients/cli/connections.c:47
+msgid "VPN type: "
 msgstr "Tipo di VPN: "
 
-#: ../clients/cli/connections.c:68
-#, fuzzy
-msgid "Master"
-msgstr "Bond master: "
-
-#: ../clients/cli/connections.c:70 ../clients/tui/nmt-page-infiniband.c:88
-msgid "Transport mode"
-msgstr "Modalità trasporto"
-
-#: ../clients/cli/connections.c:75
-#, fuzzy
-msgid "Bluetooth type"
-msgstr "Bluetooth tipo %s"
-
-#: ../clients/cli/connections.c:81
-#, fuzzy
-msgid "Bonding mode"
-msgstr "Modalità monitoraggio di aggregazione %s"
-
-#: ../clients/cli/connections.c:83 ../clients/cli/connections.c:4014
-#, fuzzy
-msgid "Bonding monitoring mode"
-msgstr "Modalità monitoraggio di aggregazione %s"
-
-#: ../clients/cli/connections.c:88
-#, fuzzy
-msgid "Protocol"
-msgstr "Protocollo %s"
-
-#: ../clients/cli/connections.c:91
-msgid "Wi-Fi mode"
-msgstr "Modalità Wi-Fi"
+#: ../clients/cli/connections.c:48
+msgid "Master: "
+msgstr "Master: "
 
-#: ../clients/cli/connections.c:97
-msgid "ADSL encapsulation"
-msgstr "Incapsulamento DSL"
-
-#: ../clients/cli/connections.c:100
-#, fuzzy
-msgid "Tun mode"
-msgstr "Modalità trasporto"
-
-#: ../clients/cli/connections.c:105
-#, fuzzy
-msgid "IP Tunnel mode"
-msgstr "Modifica connessione"
-
-#: ../clients/cli/connections.c:107
-#, fuzzy
-msgid "MACVLAN mode"
-msgstr "VLAN"
-
-#: ../clients/cli/connections.c:109
-#, fuzzy
-msgid "Connection (name, UUID, or path)"
+#: ../clients/cli/connections.c:49
+msgid "Connection (name, UUID, or path): "
 msgstr "Connessione (nome, UUID o percorso): "
 
-#: ../clients/cli/connections.c:110
-#, fuzzy
-msgid "VPN connection (name, UUID, or path)"
-msgstr "Connessione (nome, UUID o percorso): "
+#: ../clients/cli/connections.c:50
+msgid "VPN connection (name, UUID, or path): "
+msgstr "VPN connessione (nome, UUID o percorso): "
 
-#: ../clients/cli/connections.c:111
-#, fuzzy
-msgid "Connection(s) (name, UUID, or path)"
+#: ../clients/cli/connections.c:51
+msgid "Connection(s) (name, UUID, or path): "
 msgstr "Connessioni (nome, UUID o percorso): "
 
-#: ../clients/cli/connections.c:112
-#, fuzzy
-msgid "Connection(s) (name, UUID, path or apath)"
-msgstr "Connessione (nome, UUID o percorso): "
+#: ../clients/cli/connections.c:52
+msgid "Connection(s) (name, UUID, path or apath): "
+msgstr "Connessione (nome, UUID, percorso o apath): "
+
+#: ../clients/cli/connections.c:53
+msgid "Tunnel mode: "
+msgstr "Modalità tunnel: "
+
+#: ../clients/cli/connections.c:54
+msgid "MACVLAN mode: "
+msgstr "Modalità MACVLAN: "
 
 #. 0
-#: ../clients/cli/connections.c:118 ../clients/cli/connections.c:238
+#: ../clients/cli/connections.c:73 ../clients/cli/connections.c:193
 #: ../clients/cli/devices.c:55 ../clients/cli/devices.c:89
 #: ../clients/cli/devices.c:99 ../clients/cli/devices.c:110
 #: ../clients/cli/devices.c:120 ../clients/cli/devices.c:137
 #: ../clients/cli/devices.c:150 ../clients/cli/devices.c:176
 #: ../clients/cli/devices.c:191 ../clients/cli/devices.c:200
-#: ../clients/cli/devices.c:210 ../clients/cli/devices.c:220
-#: ../clients/cli/devices.c:261
+#: ../clients/cli/devices.c:210 ../clients/cli/devices.c:251
 msgid "NAME"
 msgstr "NOME"
 
 #. 0
 #. 1
-#: ../clients/cli/connections.c:119 ../clients/cli/connections.c:239
+#: ../clients/cli/connections.c:74 ../clients/cli/connections.c:194
 msgid "UUID"
 msgstr "UUID"
 
@@ -726,35 +677,35 @@ msgstr "UUID"
 #. 0
 #. 1
 #. 2
-#: ../clients/cli/connections.c:120 ../clients/cli/connections.c:260
+#: ../clients/cli/connections.c:75 ../clients/cli/connections.c:215
 #: ../clients/cli/devices.c:41 ../clients/cli/devices.c:57
 #: ../clients/cli/devices.c:179
 msgid "TYPE"
 msgstr "TIPO"
 
 #. 2
-#: ../clients/cli/connections.c:121
+#: ../clients/cli/connections.c:76
 msgid "TIMESTAMP"
 msgstr "TIMESTAMP"
 
 #. 3
-#: ../clients/cli/connections.c:122
+#: ../clients/cli/connections.c:77
 msgid "TIMESTAMP-REAL"
 msgstr "TIMESTAMP-REALE"
 
 #. 4
 #. 16
-#: ../clients/cli/connections.c:123 ../clients/cli/devices.c:72
+#: ../clients/cli/connections.c:78 ../clients/cli/devices.c:72
 msgid "AUTOCONNECT"
 msgstr "CONN-AUTOMATICA"
 
 #. 5
-#: ../clients/cli/connections.c:124
+#: ../clients/cli/connections.c:79
 msgid "AUTOCONNECT-PRIORITY"
 msgstr "PRIORITÀ-CONN-AUTOMATICA"
 
 #. 6
-#: ../clients/cli/connections.c:125
+#: ../clients/cli/connections.c:80
 msgid "READONLY"
 msgstr "SOLO LETTURA"
 
@@ -763,7 +714,7 @@ msgstr "SOLO LETTURA"
 #. 2
 #. 15
 #. 5
-#: ../clients/cli/connections.c:126 ../clients/cli/connections.c:246
+#: ../clients/cli/connections.c:81 ../clients/cli/connections.c:201
 #: ../clients/cli/devices.c:43 ../clients/cli/devices.c:166
 #: ../clients/cli/devices.c:182
 msgid "DBUS-PATH"
@@ -772,7 +723,7 @@ msgstr "PERCORSO-DBUS"
 #. 8
 #. 13
 #. 4
-#: ../clients/cli/connections.c:127 ../clients/cli/devices.c:164
+#: ../clients/cli/connections.c:82 ../clients/cli/devices.c:164
 #: ../clients/cli/devices.c:181
 msgid "ACTIVE"
 msgstr "ATTIVO"
@@ -782,9 +733,9 @@ msgstr "ATTIVO"
 #. 12
 #. 3
 #. 0
-#: ../clients/cli/connections.c:128 ../clients/cli/devices.c:40
+#: ../clients/cli/connections.c:83 ../clients/cli/devices.c:40
 #: ../clients/cli/devices.c:56 ../clients/cli/devices.c:163
-#: ../clients/cli/devices.c:180 ../clients/cli/devices.c:262
+#: ../clients/cli/devices.c:180 ../clients/cli/devices.c:252
 msgid "DEVICE"
 msgstr "DEVICE"
 
@@ -793,41 +744,42 @@ msgstr "DEVICE"
 #. 1
 #. 10
 #. 1
-#: ../clients/cli/connections.c:129 ../clients/cli/connections.c:241
+#: ../clients/cli/connections.c:84 ../clients/cli/connections.c:196
 #: ../clients/cli/devices.c:42 ../clients/cli/devices.c:66
-#: ../clients/cli/general.c:37
+#: ../clients/cli/general.c:36
 msgid "STATE"
 msgstr "STATO"
 
 #. 11
-#: ../clients/cli/connections.c:130
+#: ../clients/cli/connections.c:85
 msgid "ACTIVE-PATH"
 msgstr "PERCORSO-ATTIVO"
 
 #. 2
-#: ../clients/cli/connections.c:240
+#: ../clients/cli/connections.c:195
 msgid "DEVICES"
 msgstr "DISPOSITIVI"
 
 #. 4
-#: ../clients/cli/connections.c:242
+#: ../clients/cli/connections.c:197
 msgid "DEFAULT"
 msgstr "PREDEFINITO"
 
 #. 5
-#: ../clients/cli/connections.c:243
+#: ../clients/cli/connections.c:198
 msgid "DEFAULT6"
 msgstr "PREDEFINITO6"
 
 #. 6
-#: ../clients/cli/connections.c:244
+#: ../clients/cli/connections.c:199
 msgid "SPEC-OBJECT"
 msgstr "SPEC-OGGETTO"
 
 #. 7
 #. 4
-#: ../clients/cli/connections.c:245 ../clients/cli/connections.c:283
-#: ../clients/tui/nm-editor-utils.c:233
+#. Ask for optional 'vpn' arguments.
+#: ../clients/cli/connections.c:200 ../clients/cli/connections.c:238
+#: ../clients/cli/connections.c:4169 ../clients/tui/nm-editor-utils.c:233
 #: ../clients/tui/nmt-connect-connection-list.c:405
 msgid "VPN"
 msgstr "VPN"
@@ -835,71 +787,71 @@ msgstr "VPN"
 #. 9
 #. 5
 #. 22
-#: ../clients/cli/connections.c:247 ../clients/cli/devices.c:46
+#: ../clients/cli/connections.c:202 ../clients/cli/devices.c:46
 #: ../clients/cli/devices.c:78
 msgid "CON-PATH"
 msgstr "PERCORSO-CON"
 
 #. 10
-#: ../clients/cli/connections.c:248
+#: ../clients/cli/connections.c:203
 msgid "ZONE"
 msgstr "ZONA"
 
 #. 11
-#: ../clients/cli/connections.c:249
+#: ../clients/cli/connections.c:204
 msgid "MASTER-PATH"
 msgstr "PERCORSO-MASTER"
 
 #. 1
-#: ../clients/cli/connections.c:261
+#: ../clients/cli/connections.c:216
 msgid "USERNAME"
 msgstr "NOMEUTENTE"
 
 #. 3
-#: ../clients/cli/connections.c:263
+#: ../clients/cli/connections.c:218
 msgid "BANNER"
 msgstr "BANNER"
 
 #. 4
-#: ../clients/cli/connections.c:264
+#: ../clients/cli/connections.c:219
 msgid "VPN-STATE"
 msgstr "STATO-VPN"
 
 #. 5
-#: ../clients/cli/connections.c:265
+#: ../clients/cli/connections.c:220
 msgid "CFG"
 msgstr "CFG"
 
-#: ../clients/cli/connections.c:278 ../clients/cli/devices.c:235
+#: ../clients/cli/connections.c:233 ../clients/cli/devices.c:225
 msgid "GENERAL"
 msgstr "GENERALE"
 
 #. 0
 #. 6
-#: ../clients/cli/connections.c:279 ../clients/cli/devices.c:242
+#: ../clients/cli/connections.c:234 ../clients/cli/devices.c:232
 msgid "IP4"
 msgstr "IP4"
 
 #. 1
 #. 7
-#: ../clients/cli/connections.c:280 ../clients/cli/devices.c:243
+#: ../clients/cli/connections.c:235 ../clients/cli/devices.c:233
 msgid "DHCP4"
 msgstr "DHCP4"
 
 #. 2
 #. 8
-#: ../clients/cli/connections.c:281 ../clients/cli/devices.c:244
+#: ../clients/cli/connections.c:236 ../clients/cli/devices.c:234
 msgid "IP6"
 msgstr "IP6"
 
 #. 3
 #. 9
-#: ../clients/cli/connections.c:282 ../clients/cli/devices.c:245
+#: ../clients/cli/connections.c:237 ../clients/cli/devices.c:235
 msgid "DHCP6"
 msgstr "DHCP6"
 
-#: ../clients/cli/connections.c:314
-#, fuzzy, c-format
+#: ../clients/cli/connections.c:272
+#, c-format
 msgid ""
 "Usage: nmcli connection { COMMAND | help }\n"
 "\n"
@@ -914,8 +866,8 @@ msgid ""
 "\n"
 "  down [id | uuid | path | apath] <ID> ...\n"
 "\n"
-"  add COMMON_OPTIONS TYPE_SPECIFIC_OPTIONS SLAVE_OPTIONS IP_OPTIONS [-- "
-"([+|-]<setting>.<property> <value>)+]\n"
+"  add COMMON_OPTIONS TYPE_SPECIFIC_OPTIONS SLAVE_OPTIONS IP_OPTIONS [-- ([+|-"
+"]<setting>.<property> <value>)+]\n"
 "\n"
 "  modify [--temporary] [id | uuid | path] <ID> ([+|-]<setting>.<property> "
 "<value>)+\n"
@@ -940,32 +892,42 @@ msgid ""
 msgstr ""
 "Uso: mmcli connection { COMANDO | help }\n"
 "\n"
-"  COMANDO := { show | up | down | delete }\n"
+"COMANDO := { show | up | down | add | modify | edit | delete | monitor | "
+"reload | load }\n"
 "\n"
-"  show configured [[id | uuid | path ] <ID>]\n"
-"  show active     [[id | uuid | path | apath] <ID>]\n"
+"  show [--active] [--order <ordine spec>]\n"
+"  show [--active] [id | uuid | path | apath] <ID> ...\n"
 "\n"
-"  up [id | uuid | path] <ID> [ifname <nomeif>] [ap <BSSID>] [nsp <nome>]\n"
+"  up [[id | uuid | path] <ID>] [ifname <ifname>] [ap <BSSID>] [passwd-file "
+"<file con password>]\n"
 "\n"
-"  up [id | uuid | path] <ID> [ifname <nomeif>] [ap <BSSID>]\n"
+"  down [id | uuid | path | apath] <ID> ...\n"
 "\n"
-"  down [id | uuid | path | apath] <ID>\n"
+"  add OPZIONI_COMUNI OPZIONI_SPECIFICHE_TIPO OPZIONI_SLAVE OPZIONI_IP [-- "
+"([+|-]<impostazione>.<proprietà> <valore>)+]\n"
 "\n"
-"  add OPZIONI_COMUNI OPZIONI_SPECIFICHE OPZIONI_IP\n"
+"  modify [--temporary] [id | uuid | path] <ID> ([+|-]<impostazione>."
+"<proprietà> <valore>)+\n"
 "\n"
-"  modify [id | uuid | path] <ID> <impostazione>.<proprietà> <valore>\n"
+"  clone [--temporary] [id | uuid | path ] <ID> <nuovo nome>\n"
 "\n"
 "  edit [id | uuid | path] <ID>\n"
-"  edit [type <tipo_nuova_conn>] [con-name <nome_nuova_conn>]\n"
+"  edit [type <tipo_nuova_con>] [con-name <nome_nuova_con>]\n"
 "\n"
 "  delete [id | uuid | path] <ID>\n"
 "\n"
+"  monitor [id | uuid | path] <ID> ...\n"
+"\n"
 "  reload\n"
 "\n"
-"  load <nomefile> [<nomefile>...]\n"
+"  load <nome file> [ <nome file>... ]\n"
+"\n"
+"  import [--temporary] type <tipo> file <file da importare>\n"
+"\n"
+"  export [id | uuid | path] <ID> [<file di output>]\n"
 "\n"
 
-#: ../clients/cli/connections.c:336
+#: ../clients/cli/connections.c:294
 #, c-format
 msgid ""
 "Usage: nmcli connection show { ARGUMENTS | help }\n"
@@ -991,8 +953,32 @@ msgid ""
 "account. Use global --show-secrets option to reveal associated secrets as "
 "well.\n"
 msgstr ""
+"Utilizzo: nmcli connection show { ARGOMENTI | help }\n"
+"\n"
+"ARGOMENTI:= [--active] [--order <order spec>]\n"
+"\n"
+"Elenca i profili di connessione in memoria e su disco, alcuni dei quali "
+"possono anche essere\n"
+"attivi se un dispositivo sta utilizzando quel profilo di connessione. Senza "
+"parametri, sono elencati tutti i \n"
+"profili. Quando viene specificata l'opzione --active, sono visualizzati solo "
+"i profili\n"
+"attivi. --order permette di ordinare in modo personalizzato le connessioni "
+"(vedere la pagina del manuale).\n"
+"\n"
+"ARGOMENTI:= [--active] [id | uuid | path | apath] <ID> ...\n"
+"\n"
+"Mostra i dettagli per le connessioni specificate. Per impostazione "
+"predefinita, sono visualizzati i dati di configurazione statica\n"
+"e di connessione attivi. Si può filtrare l’output\n"
+"con l'opzione globale '--fields'. Per ulteriori informazioni, vedere la "
+"pagina del manuale.\n"
+"Quando viene specificata l'opzione --active, vengono considerati solo i "
+"profili\n"
+"attivi. Utilizzare l'opzione --show-secrets globale per rivelare anche i "
+"segreti associati.\n"
 
-#: ../clients/cli/connections.c:357
+#: ../clients/cli/connections.c:315
 #, c-format
 msgid ""
 "Usage: nmcli connection up { ARGUMENTS | help }\n"
@@ -1038,7 +1024,7 @@ msgstr ""
 "passwd-file - File con le password richieste per attivare la connessione\n"
 "\n"
 
-#: ../clients/cli/connections.c:378
+#: ../clients/cli/connections.c:336
 #, c-format
 msgid ""
 "Usage: nmcli connection down { ARGUMENTS | help }\n"
@@ -1060,13 +1046,13 @@ msgstr ""
 "tramite il suo nome, UUID o percorso D-Bus.\n"
 "\n"
 
-#: ../clients/cli/connections.c:390
-#, fuzzy, c-format
+#: ../clients/cli/connections.c:348
+#, 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"
+"ARGUMENTS := COMMON_OPTIONS TYPE_SPECIFIC_OPTIONS SLAVE_OPTIONS IP_OPTIONS [-"
+"- ([+|-]<setting>.<property> <value>)+]\n"
 "\n"
 "  COMMON_OPTIONS:\n"
 "                  type <type>\n"
@@ -1153,8 +1139,8 @@ msgid ""
 "                  [path-cost <1-65535>]\n"
 "                  [hairpin yes|no]\n"
 "\n"
-"    vpn:          vpn-type vpnc|openvpn|pptp|openconnect|openswan|libreswan|"
-"ssh|l2tp|iodine|...\n"
+"    vpn:          vpn-type "
+"vpnc|openvpn|pptp|openconnect|openswan|libreswan|ssh|l2tp|iodine|...\n"
 "                  [user <username>]\n"
 "\n"
 "    olpc-mesh:    ssid <SSID>\n"
@@ -1202,17 +1188,21 @@ msgid ""
 "                  [ip6 <IPv6 address>] [gw6 <IPv6 gateway>]\n"
 "\n"
 msgstr ""
-"Uso: mmcli connection add { OPZIONI | help }\n"
+"Uso: nmcli connection add { ARGOMENTI | help }\n"
 "\n"
-"  OPZIONI := OPZIONI_COMUNI OPZIONI_SPECIFICHE OPZIONI_IP\n"
+"ARGOMENTI := OPZIONI_COMUNI OPZIONI_SPECIFICHE_TIPO OPZIONI_SLAVE OPZIONI_IP "
+"[-- ([+|-]<impostazione>.<proprietà> <valore>)+]\n"
 "\n"
 "  OPZIONI_COMUNI:\n"
 "                  type <tipo>\n"
-"                  ifname <nome interfaccia>\n"
+"                  ifname <nome interfaccia> | \n"
 "                  [con-name <nome connessione>]\n"
 "                  [autoconnect yes|no]\n"
+"                  [save yes|no]\n"
+"                  [master <master (ifname o UUID o nome connessione)>]\n"
+"                  [slave-type <master connection type>]\n"
 "\n"
-"  OPZIONI_SPECIFICHE:\n"
+"  OPZIONI_SPECIFICHE_TIPO:\n"
 "    ethernet:     [mac <indirizzo MAC>]\n"
 "                  [cloned-mac <indirizzo MAC clonato>]\n"
 "                  [mtu <MTU>]\n"
@@ -1221,6 +1211,7 @@ msgstr ""
 "                  [mac <indirizzo MAC>]\n"
 "                  [cloned-mac <indirizzo MAC clonato>]\n"
 "                  [mtu <MTU>]\n"
+"                  [mode infrastructure|ap|adhoc]\n"
 "\n"
 "    wimax:        [mac <indirizzo MAC>]\n"
 "                  [nsp <NSP>]\n"
@@ -1231,7 +1222,7 @@ msgstr ""
 "                  [mtu <MTU>]\n"
 "                  [mac <indirizzo MAC>]\n"
 "\n"
-"    gsm:          apn <APN>]\n"
+"    gsm:          apn <APN>\n"
 "                  [user <nome utente>]\n"
 "                  [password <password>]\n"
 "\n"
@@ -1240,65 +1231,103 @@ msgstr ""
 "\n"
 "    infiniband:   [mac <indirizzo MAC>]\n"
 "                  [mtu <MTU>]\n"
-"                  [transport-mode <modalità>]\n"
+"                  [transport-mode datagram | connected]\n"
 "                  [parent <ifname>]\n"
-"                  [p-key <P_Key IPoIB>]\n"
+"                  [p-key <IPoIB P_Key>]\n"
 "\n"
 "    bluetooth:    [addr <indirizzo bluetooth>]\n"
 "                  [bt-type panu|dun-gsm|dun-cdma]\n"
 "\n"
-"    vlan:         dev <dispositivo genitore (UUID connessione, ifname o "
-"MAC)\n"
-"                  [id <id VLAN>]\n"
+"    vlan:         dev <dispositivo padre (UUID connessione, ifname o MAC)>\n"
+"                  id <ID VLAN>\n"
 "                  [flags <flag VLAN>]\n"
-"                  [ingress <corrispondenza priorità ingress>]\n"
-"                  [egress <corrispondenza priorità egress>]\n"
+"                  [ingress <mappatura priorità in ingresso>]\n"
+"                  [egress <mappatura priorità in uscita>]\n"
 "                  [mtu <MTU>]\n"
 "\n"
 "    bond:         [mode balance-rr (0) | active-backup (1) | balance-xor (2) "
-"|\n"
-"                        broadcast (3)  | 802.3ad (4)       | balance-tlb (5) "
-"|\n"
-"                        balance-alb (6)]\n"
-"                  [primary <nomeif>]\n"
+"| 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_traget <num>]\n"
+"                  [arp-interval <num>]\n"
+"                  [arp-ip-target <num>]\n"
+"                  [lacp-rate slow (0) | fast (1)]\n"
 "\n"
-"    bond-slave:   master <master (ifname o UUID connessione)\n"
+"    bond-slave:   master <master (ifname o UUID o nome connessione)>\n"
 "\n"
-"    team:         [config <configurazione json>]\n"
+"    team:         [config <file>|<dati JSON raw>]\n"
 "\n"
-"    team-slave:   master <master (ifname o UUID connessione)\n"
-"                  [config <file>|<dati JSON>]\n"
+"    team-slave:   master <master (ifname o UUID o nome connessione)>\n"
+"                  [config <file>|<dati JSON raw>]\n"
 "\n"
-"    bridge:       [stp yes|no>]\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 o UUID connessione)\n"
+"    bridge-slave: master <master (ifname o UUID o nome connessione)>\n"
 "                  [priority <0-63>]\n"
 "                  [path-cost <1-65535>]\n"
 "                  [hairpin yes|no]\n"
 "\n"
-"    vpn:          vpn-type vpnc|openvpn|pptp|openconnect|openswan\n"
-"                  [user <nome utente>]\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 <indirizzo MAC>]\n"
 "\n"
+"    adsl:         username <nome utente>\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 <IP endpoint remoto>\n"
+"                  [local <IP endpoint locale>]\n"
+"                  [dev <parent device (ifname o UUID connessione)>]\n"
+"\n"
+"    macvlan:      dev <dispositivo padre (UUID connessione, ifname o MAC)>\n"
+"                  mode vepa|bridge|private|passthru|source\n"
+"                  [tap yes|no]\n"
+"\n"
+"    vxlan:        id <ID VXLAN>\n"
+"                  remote <IP del gruppo multicast o indirizzo remoto>\n"
+"                  [local <IP sorgente>]\n"
+"                  [dev <parent device (ifname o UUID connessione)>]\n"
+"                  [source-port-min <0-65535>]\n"
+"                  [source-port-max <0-65535>]\n"
+"                  [destination-port <0-65535>]\n"
+"\n"
+"  OPZIONI_SLAVE:\n"
+"    bridge:       [priority <0-63>]\n"
+"                  [path-cost <1-65535>]\n"
+"                  [hairpin yes|no]\n"
+"\n"
+"    team:         [config <file>|<dati raw JSON>]\n"
+"\n"
 "  OPZIONI_IP:\n"
 "                  [ip4 <indirizzo IPv4>] [gw4 <gateway IPv4>]\n"
-"                  [ip6 <indirizzo IPv6>] [gw6 <gateway IPv6>]\n"
+"                  [ip6 <indirizzo IPv4>] [gw6 <gateway IPv6>]\n"
 "\n"
 
-#: ../clients/cli/connections.c:502
+#: ../clients/cli/connections.c:460
 #, c-format
 msgid ""
 "Usage: nmcli connection modify { ARGUMENTS | help }\n"
@@ -1313,8 +1342,8 @@ msgid ""
 "\n"
 "Examples:\n"
 "nmcli con mod home-wifi wifi.ssid rakosnicek\n"
-"nmcli con mod em1-1 ipv4.method manual ipv4.addr \"192.168.1.2/24, "
-"10.10.1.5/8\"\n"
+"nmcli con mod em1-1 ipv4.method manual ipv4.addr \"192.168.1.2/24, 10.10.1.5/"
+"8\"\n"
 "nmcli con mod em1-1 +ipv4.dns 8.8.4.4\n"
 "nmcli con mod em1-1 -ipv4.dns 1\n"
 "nmcli con mod em1-1 -ipv6.addr \"abbe::cafe/56\"\n"
@@ -1337,8 +1366,8 @@ msgstr ""
 "\n"
 "Esempi:\n"
 "nmcli con mod home-wifi wifi.ssid rakosnicek\n"
-"nmcli con mod em1-1 ipv4.method manual ipv4.addr \"192.168.1.2/24, "
-"10.10.1.5/8\"\n"
+"nmcli con mod em1-1 ipv4.method manual ipv4.addr \"192.168.1.2/24, 10.10.1.5/"
+"8\"\n"
 "nmcli con mod em1-1 +ipv4.dns 8.8.4.4\n"
 "nmcli con mod em1-1 -ipv4.dns 1\n"
 "nmcli con mod em1-1 -ipv6.addr \"abbe::cafe/56\"\n"
@@ -1346,7 +1375,7 @@ msgstr ""
 "nmcli con mod bond0 -bond.options downdelay\n"
 "\n"
 
-#: ../clients/cli/connections.c:525
+#: ../clients/cli/connections.c:483
 #, c-format
 msgid ""
 "Usage: nmcli connection clone { ARGUMENTS | help }\n"
@@ -1354,13 +1383,20 @@ msgid ""
 "ARGUMENTS := [--temporary] [id | uuid | path] <ID> <new name>\n"
 "\n"
 "Clone an existing connection profile. The newly created connection will be\n"
-"the exact copy of the <ID>, except the uuid property (will be generated) "
-"and\n"
+"the exact copy of the <ID>, except the uuid property (will be generated) and\n"
 "id (provided as <new name> argument).\n"
 "\n"
 msgstr ""
+"Utilizzo: nmcli connection clone { ARGOMENTI | help }\n"
+"\n"
+"ARGOMENTI:= [--temporary] [id | uuid | path] <ID> <nuovo nome>\n"
+"\n"
+"Clona un profilo di connessione esistente. La connessione appena creata\n"
+"sarà la copia esatta dell’<ID>, tranne per la proprietà uuid (generato) e\n"
+"id (fornito come argomento <nuovo nome>).\n"
+"\n"
 
-#: ../clients/cli/connections.c:537
+#: ../clients/cli/connections.c:495
 #, c-format
 msgid ""
 "Usage: nmcli connection edit { ARGUMENTS | help }\n"
@@ -1387,7 +1423,7 @@ msgstr ""
 "Aggiunge un nuovo profilo di connessione con un editor interattivo.\n"
 "\n"
 
-#: ../clients/cli/connections.c:552
+#: ../clients/cli/connections.c:510
 #, c-format
 msgid ""
 "Usage: nmcli connection delete { ARGUMENTS | help }\n"
@@ -1406,8 +1442,8 @@ msgstr ""
 "Il profilo viene identificato tramite il suo nome, UUID o percorso D-Bus.\n"
 "\n"
 
-#: ../clients/cli/connections.c:563
-#, fuzzy, c-format
+#: ../clients/cli/connections.c:521
+#, c-format
 msgid ""
 "Usage: nmcli connection monitor { ARGUMENTS | help }\n"
 "\n"
@@ -1418,19 +1454,17 @@ msgid ""
 "Monitors all connection profiles in case none is specified.\n"
 "\n"
 msgstr ""
-"Uso: mmcli connection edit { ARGOMENTI | help }\n"
+"Uso: nmcli connection monitor { ARGOMENTI | help }\n"
 "\n"
 "ARGOMENTI := [id | uuid | path] <ID>\n"
 "\n"
-"Modifica un profilo di connessione esistente con un editor interattivo.\n"
-"Il profile viene identificato tramite il suo nome, UUID o percorso D-Bus.\n"
-"\n"
-"ARGOMENTI := [type <nuovo tipo connessione>] [con-name <nome connessione>]\n"
-"\n"
-"Aggiunge un nuovo profilo di connessione con un editor interattivo.\n"
+"Monitora l'attività del profilo di connessione.\n"
+"Questo comando stampa una riga ogni volta che la connessione specificata "
+"cambia.\n"
+"Monitora tutti i profili di connessione se non ne viene specificato uno.\n"
 "\n"
 
-#: ../clients/cli/connections.c:575
+#: ../clients/cli/connections.c:533
 #, c-format
 msgid ""
 "Usage: nmcli connection reload { help }\n"
@@ -1443,7 +1477,7 @@ msgstr ""
 "Ricarica tutti i file della connessione dal disco.\n"
 "\n"
 
-#: ../clients/cli/connections.c:583
+#: ../clients/cli/connections.c:541
 #, c-format
 msgid ""
 "Usage: nmcli connection load { ARGUMENTS | help }\n"
@@ -1466,7 +1500,7 @@ msgstr ""
 "NetworkManager consideri le nuove modifiche.\n"
 "\n"
 
-#: ../clients/cli/connections.c:595
+#: ../clients/cli/connections.c:553
 #, c-format
 msgid ""
 "Usage: nmcli connection import { ARGUMENTS | help }\n"
@@ -1480,9 +1514,19 @@ msgid ""
 "is imported by NetworkManager VPN plugins.\n"
 "\n"
 msgstr ""
+"Utilizzo: nmcli connection import { ARGOMENTI | help }\n"
+"\n"
+"ARGOMENTI:= [--temporary] type <tipo> file <file da importare>\n"
+"\n"
+"Importa una configurazione esterna come profilo di connessione "
+"NetworkManager.\n"
+"Il tipo di file di input è specificato dall’opzione del tipo.\n"
+"Al momento sono supportate solo le configurazioni VPN. La configurazione\n"
+"è importata dai plug-in VPN di NetworkManager.\n"
+"\n"
 
-#: ../clients/cli/connections.c:608
-#, fuzzy, c-format
+#: ../clients/cli/connections.c:566
+#, c-format
 msgid ""
 "Usage: nmcli connection export { ARGUMENTS | help }\n"
 "\n"
@@ -1492,211 +1536,207 @@ msgid ""
 "The data are directed to standard output or to a file if a name is given.\n"
 "\n"
 msgstr ""
-"Uso: mmcli connection delete { ARGOMENTI | help }\n"
+"Uso: nmcli connection export { ARGOMENTI | help }\n"
 "\n"
-"ARGOMENTI := [id | uuid | path] <ID>\n"
+"ARGOMENTI:= [id | uuid | path] <ID> [<file di output>]\n"
 "\n"
-"Elimina un profilo di connessione.\n"
-"Il profilo viene identificato tramite il suo nome, UUID o percorso D-Bus.\n"
+"Esporta una connessione.  Al momento, sono supportate solo le connessioni "
+"VPN.\n"
+"I dati sono indirizzati verso lo standard output o verso un file, se viene "
+"fornito un nome.\n"
 "\n"
 
-#: ../clients/cli/connections.c:686
+#: ../clients/cli/connections.c:644
 msgid "activating"
 msgstr "attivazione"
 
-#: ../clients/cli/connections.c:688
+#: ../clients/cli/connections.c:646
 msgid "activated"
 msgstr "attivata"
 
-#: ../clients/cli/connections.c:692
+#: ../clients/cli/connections.c:650
 msgid "deactivated"
 msgstr "disattivata"
 
-#: ../clients/cli/connections.c:704
+#: ../clients/cli/connections.c:662
 msgid "VPN connecting (prepare)"
 msgstr "Connessione VPN (preparazione)"
 
-#: ../clients/cli/connections.c:706
+#: ../clients/cli/connections.c:664
 msgid "VPN connecting (need authentication)"
 msgstr "Connessione VPN (autenticazione necessaria)"
 
-#: ../clients/cli/connections.c:708
+#: ../clients/cli/connections.c:666
 msgid "VPN connecting"
 msgstr "Connessione VPN"
 
-#: ../clients/cli/connections.c:710
+#: ../clients/cli/connections.c:668
 msgid "VPN connecting (getting IP configuration)"
 msgstr "Connessione VPN (acquisizione configurazione IP)"
 
-#: ../clients/cli/connections.c:712
+#: ../clients/cli/connections.c:670
 msgid "VPN connected"
 msgstr "Connessi alla VPN"
 
-#: ../clients/cli/connections.c:714
+#: ../clients/cli/connections.c:672
 msgid "VPN connection failed"
 msgstr "Connessione VPN non riuscita"
 
-#: ../clients/cli/connections.c:716
+#: ../clients/cli/connections.c:674
 msgid "VPN disconnected"
 msgstr "Disconnessi dalla VPN"
 
-#: ../clients/cli/connections.c:786
+#: ../clients/cli/connections.c:744
 #, c-format
 msgid "Error updating secrets for %s: %s\n"
 msgstr "Errore nell'aggiornare i segreti per %s: %s\n"
 
-#: ../clients/cli/connections.c:806
+#: ../clients/cli/connections.c:764
 msgid "Connection profile details"
 msgstr "Dettagli profilo connessione"
 
-#: ../clients/cli/connections.c:818 ../clients/cli/connections.c:1211
+#: ../clients/cli/connections.c:776 ../clients/cli/connections.c:1169
 #, c-format
 msgid "Error: 'connection show': %s"
 msgstr "Errore: \"connection show\": %s"
 
-#: ../clients/cli/connections.c:974 ../clients/cli/settings.c:1950
+#: ../clients/cli/connections.c:932 ../clients/cli/settings.c:1897
 msgid "never"
 msgstr "mai"
 
-#: ../clients/cli/connections.c:1199
+#: ../clients/cli/connections.c:1157
 msgid "Activate connection details"
 msgstr "Attiva dettagli connessione"
 
-#: ../clients/cli/connections.c:1435
+#: ../clients/cli/connections.c:1393
 #, c-format
 msgid "invalid field '%s'; allowed fields: %s and %s, or %s,%s"
 msgstr "campo \"%s\" non valido; campi consentiti: %s e %s oppure %s,%s"
 
-#: ../clients/cli/connections.c:1450 ../clients/cli/connections.c:1458
+#: ../clients/cli/connections.c:1408 ../clients/cli/connections.c:1416
 #, c-format
 msgid "'%s' has to be alone"
 msgstr "\"%s\" deve essere isolato"
 
 #. Add headers
-#: ../clients/cli/connections.c:1680
+#: ../clients/cli/connections.c:1634
 msgid "NetworkManager active profiles"
 msgstr "Profili NetworkManager attivi"
 
-#: ../clients/cli/connections.c:1681
+#: ../clients/cli/connections.c:1635
 msgid "NetworkManager connection profiles"
 msgstr "Profili connessione NetworkManager"
 
-#.
-#. * TODO(?): complete uuid, path or id
-#. if (nmc->complete) {
-#. quit ();
-#. }
-#.
-#: ../clients/cli/connections.c:1727 ../clients/cli/connections.c:2445
-#: ../clients/cli/connections.c:2467 ../clients/cli/connections.c:2476
-#: ../clients/cli/connections.c:2485 ../clients/cli/connections.c:2648
-#: ../clients/cli/connections.c:7777 ../clients/cli/connections.c:7896
-#: ../clients/cli/connections.c:8032 ../clients/cli/connections.c:8170
-#: ../clients/cli/connections.c:8289 ../clients/cli/connections.c:8300
-#: ../clients/cli/connections.c:8410 ../clients/cli/devices.c:2402
-#: ../clients/cli/devices.c:2410 ../clients/cli/devices.c:2736
-#: ../clients/cli/devices.c:2743 ../clients/cli/devices.c:2757
-#: ../clients/cli/devices.c:2764 ../clients/cli/devices.c:2781
-#: ../clients/cli/devices.c:2789 ../clients/cli/devices.c:2802
-#: ../clients/cli/devices.c:3166 ../clients/cli/devices.c:3173
-#: ../clients/cli/devices.c:3180 ../clients/cli/devices.c:3192
-#: ../clients/cli/devices.c:3205 ../clients/cli/devices.c:3212
-#: ../clients/cli/devices.c:3384 ../clients/cli/devices.c:3391
-#: ../clients/cli/devices.c:3564
+#: ../clients/cli/connections.c:1681 ../clients/cli/connections.c:2389
+#: ../clients/cli/connections.c:2411 ../clients/cli/connections.c:2420
+#: ../clients/cli/connections.c:2429 ../clients/cli/connections.c:2588
+#: ../clients/cli/connections.c:10156 ../clients/cli/connections.c:10273
+#: ../clients/cli/connections.c:10405 ../clients/cli/connections.c:10538
+#: ../clients/cli/connections.c:10648 ../clients/cli/connections.c:10659
+#: ../clients/cli/connections.c:10758 ../clients/cli/devices.c:2344
+#: ../clients/cli/devices.c:2352 ../clients/cli/devices.c:2675
+#: ../clients/cli/devices.c:2682 ../clients/cli/devices.c:2696
+#: ../clients/cli/devices.c:2703 ../clients/cli/devices.c:2720
+#: ../clients/cli/devices.c:2728 ../clients/cli/devices.c:2741
+#: ../clients/cli/devices.c:3105 ../clients/cli/devices.c:3112
+#: ../clients/cli/devices.c:3119 ../clients/cli/devices.c:3131
+#: ../clients/cli/devices.c:3144 ../clients/cli/devices.c:3151
+#: ../clients/cli/devices.c:3323 ../clients/cli/devices.c:3330
+#: ../clients/cli/devices.c:3503
 #, c-format
 msgid "Error: %s argument is missing."
 msgstr "Errore: manca l'argomento %s."
 
-#: ../clients/cli/connections.c:1742
+#: ../clients/cli/connections.c:1696
 #, c-format
 msgid "Error: %s - no such connection profile."
 msgstr "Errore: %s - profilo di connessione inesistente."
 
-#: ../clients/cli/connections.c:1801 ../clients/cli/connections.c:2508
-#: ../clients/cli/connections.c:8825 ../clients/cli/devices.c:3353
-#: ../clients/cli/devices.c:3834 ../clients/cli/general.c:528
-#: ../clients/cli/general.c:577 ../clients/cli/general.c:594
-#: ../clients/cli/general.c:633 ../clients/cli/general.c:647
-#: ../clients/cli/general.c:765 ../clients/cli/general.c:812
-#: ../clients/cli/general.c:832
+#: ../clients/cli/connections.c:1755 ../clients/cli/connections.c:2452
+#: ../clients/cli/connections.c:11162 ../clients/cli/devices.c:3292
+#: ../clients/cli/devices.c:3779 ../clients/cli/general.c:539
+#: ../clients/cli/general.c:588 ../clients/cli/general.c:605
+#: ../clients/cli/general.c:644 ../clients/cli/general.c:658
+#: ../clients/cli/general.c:776 ../clients/cli/general.c:823
+#: ../clients/cli/general.c:843
 #, c-format
 msgid "Error: %s."
 msgstr "Errore: %s."
 
-#: ../clients/cli/connections.c:1897
+#: ../clients/cli/connections.c:1851
 #, c-format
 msgid "no active connection on device '%s'"
 msgstr "nessuna connessione attiva sul dispositivo «%s»"
 
-#: ../clients/cli/connections.c:1905
+#: ../clients/cli/connections.c:1859
 msgid "no active connection or device"
 msgstr "nessuna connessione o dispositivo attivo"
 
-#: ../clients/cli/connections.c:1956
+#: ../clients/cli/connections.c:1910
 #, c-format
 msgid "device '%s' not compatible with connection '%s'"
 msgstr "dispositivo «%s» non compatibile con la connessione «%s»"
 
-#: ../clients/cli/connections.c:1959
+#: ../clients/cli/connections.c:1913
 #, c-format
 msgid "no device found for connection '%s'"
 msgstr "nessun dispositivo trovato per la connessione «%s»"
 
-#: ../clients/cli/connections.c:1971
+#: ../clients/cli/connections.c:1925
 msgid "unknown reason"
 msgstr "motivo sconosciuto"
 
-#: ../clients/cli/connections.c:1973 ../clients/cli/general.c:278
+#: ../clients/cli/connections.c:1927 ../clients/cli/general.c:277
 msgid "none"
 msgstr "nessuno"
 
-#: ../clients/cli/connections.c:1975
+#: ../clients/cli/connections.c:1929
 msgid "the user was disconnected"
 msgstr "l'utente è stato scollegato"
 
-#: ../clients/cli/connections.c:1977
+#: ../clients/cli/connections.c:1931
 msgid "the base network connection was interrupted"
 msgstr "la connessione di rete di base è stata interrotta"
 
-#: ../clients/cli/connections.c:1979
+#: ../clients/cli/connections.c:1933
 msgid "the VPN service stopped unexpectedly"
 msgstr "il servizio VPN si è arrestato inaspettatamente"
 
-#: ../clients/cli/connections.c:1981
+#: ../clients/cli/connections.c:1935
 msgid "the VPN service returned invalid configuration"
 msgstr "il servizio VPN ha restituito una configurazione non valida"
 
-#: ../clients/cli/connections.c:1983
+#: ../clients/cli/connections.c:1937
 msgid "the connection attempt timed out"
 msgstr "il tentativo di connessione è scaduto"
 
-#: ../clients/cli/connections.c:1985
+#: ../clients/cli/connections.c:1939
 msgid "the VPN service did not start in time"
 msgstr "il servizio VPN non è stato avviato in tempo"
 
-#: ../clients/cli/connections.c:1987
+#: ../clients/cli/connections.c:1941
 msgid "the VPN service failed to start"
 msgstr "l'avvio del servizio VPN non è riuscito"
 
-#: ../clients/cli/connections.c:1989
+#: ../clients/cli/connections.c:1943
 msgid "no valid VPN secrets"
 msgstr "nessun segreto VPN valido"
 
-#: ../clients/cli/connections.c:1991
+#: ../clients/cli/connections.c:1945
 msgid "invalid VPN secrets"
 msgstr "segreti VPN non validi"
 
-#: ../clients/cli/connections.c:1993
+#: ../clients/cli/connections.c:1947
 msgid "the connection was removed"
 msgstr "la connessione è stata rimossa"
 
-#: ../clients/cli/connections.c:2015 ../clients/cli/connections.c:2050
-#: ../clients/cli/connections.c:2211 ../clients/cli/connections.c:6120
+#: ../clients/cli/connections.c:1969 ../clients/cli/connections.c:1997
+#: ../clients/cli/connections.c:2158 ../clients/cli/connections.c:8454
 #, c-format
 msgid "Connection successfully activated (D-Bus active path: %s)\n"
 msgstr "Connessione attivata con successo (percorso D-Bus attivo: %s)\n"
 
-#: ../clients/cli/connections.c:2023
+#: ../clients/cli/connections.c:1976
 #, c-format
 msgid ""
 "Connection successfully activated (master waiting for slaves) (D-Bus active "
@@ -1705,676 +1745,1093 @@ msgstr ""
 "Connessione attivata con successo (master in attesa di slave) (percorso D-"
 "Bus attivo: %s)\n"
 
-#: ../clients/cli/connections.c:2030 ../clients/cli/connections.c:6126
-#, c-format
-msgid "Error: Connection activation failed.\n"
-msgstr "Errore: attivazione connessione non riuscita.\n"
-
-#: ../clients/cli/connections.c:2033 ../clients/cli/connections.c:2055
+#: ../clients/cli/connections.c:1980 ../clients/cli/connections.c:2002
 #, c-format
 msgid "Error: Connection activation failed."
 msgstr "Errore: attivazione connessione non riuscita."
 
-#: ../clients/cli/connections.c:2106
+#: ../clients/cli/connections.c:2053
 #, c-format
 msgid "VPN connection successfully activated (D-Bus active path: %s)\n"
 msgstr "Connessione VPN attivata con successo (percorso D-Bus attivo: %s)\n"
 
-#: ../clients/cli/connections.c:2114
+#: ../clients/cli/connections.c:2061
 #, c-format
 msgid "Error: Connection activation failed: %s."
 msgstr "Errore: attivazione connessione non riuscita: %s."
 
-#: ../clients/cli/connections.c:2133 ../clients/cli/devices.c:1506
+#: ../clients/cli/connections.c:2080 ../clients/cli/devices.c:1426
 #, c-format
 msgid "Error: Timeout %d sec expired."
 msgstr "Errore: timeout, sono trascorsi %d secondi."
 
-#: ../clients/cli/connections.c:2193
+#: ../clients/cli/connections.c:2140
 #, c-format
 msgid "Error: Connection activation failed: %s"
 msgstr "Errore: attivazione connessione non riuscita: %s"
 
-#: ../clients/cli/connections.c:2278
+#: ../clients/cli/connections.c:2225
 #, c-format
 msgid "failed to read passwd-file '%s': %s"
 msgstr "Lettura del passwd-file \"%s\" non riuscita: %s"
 
-#: ../clients/cli/connections.c:2290
+#: ../clients/cli/connections.c:2237
 #, c-format
 msgid "missing colon in 'password' entry '%s'"
 msgstr "mancano i due punti nella voce \"password\" \"%s\""
 
-#: ../clients/cli/connections.c:2298
+#: ../clients/cli/connections.c:2245
 #, c-format
 msgid "missing dot in 'password' entry '%s'"
 msgstr "manca il punto nella voce \"password\" \"%s\""
 
-#: ../clients/cli/connections.c:2311
+#: ../clients/cli/connections.c:2258
 #, c-format
 msgid "invalid setting name in 'password' entry '%s'"
 msgstr "nome impostazione non valido nelle voce \"password\" \"%s\""
 
-#: ../clients/cli/connections.c:2367
+#: ../clients/cli/connections.c:2314
 #, c-format
 msgid "unknown device '%s'."
 msgstr "dispositivo «%s» sconosciuto."
 
-#: ../clients/cli/connections.c:2372
+#: ../clients/cli/connections.c:2319
 msgid "neither a valid connection nor device given"
 msgstr "non sono stati forniti un dispositivo e una connessione validi"
 
-#: ../clients/cli/connections.c:2458
+#: ../clients/cli/connections.c:2402
 #, c-format
 msgid "Error: Connection '%s' does not exist."
 msgstr "Errore: la connessione \"%s\" non esiste."
 
-#: ../clients/cli/connections.c:2493 ../clients/cli/devices.c:1405
-#: ../clients/cli/devices.c:2416 ../clients/cli/devices.c:2813
-#: ../clients/cli/devices.c:3397
+#: ../clients/cli/connections.c:2437 ../clients/cli/devices.c:1325
+#: ../clients/cli/devices.c:2358 ../clients/cli/devices.c:2752
+#: ../clients/cli/devices.c:3336
 #, c-format
 msgid "Unknown parameter: %s\n"
 msgstr "Parametro sconosciuto: %s\n"
 
-#: ../clients/cli/connections.c:2518
+#: ../clients/cli/connections.c:2462
 msgid "preparing"
 msgstr "preparazione"
 
-#: ../clients/cli/connections.c:2539
+#: ../clients/cli/connections.c:2483
 #, c-format
 msgid "Connection '%s' (%s) successfully deleted.\n"
 msgstr "Connessione \"%s\" (%s) eliminata con successo.\n"
 
-#: ../clients/cli/connections.c:2555
+#: ../clients/cli/connections.c:2499
 #, c-format
 msgid "Connection '%s' successfully deactivated (D-Bus active path: %s)\n"
 msgstr ""
 "Connessione \"%s\" disattivata con successo (percorso D-Bus attivo: %s)\n"
 
-#: ../clients/cli/connections.c:2630 ../clients/cli/connections.c:8018
-#: ../clients/cli/connections.c:8226
+#: ../clients/cli/connections.c:2570 ../clients/cli/connections.c:10391
+#: ../clients/cli/connections.c:10590
 #, c-format
 msgid "Error: No connection specified."
 msgstr "Errore: nessuna connessione specificata."
 
-#: ../clients/cli/connections.c:2662
+#: ../clients/cli/connections.c:2602
 #, c-format
 msgid "Error: '%s' is not an active connection.\n"
 msgstr "Errore: \"%s\" non è una connessione attiva.\n"
 
-#: ../clients/cli/connections.c:2663 ../clients/cli/connections.c:8047
+#: ../clients/cli/connections.c:2603 ../clients/cli/connections.c:10420
 #, c-format
 msgid "Error: not all active connections found."
 msgstr "Errore: non tutte le connessioni attive sono state trovate."
 
-#: ../clients/cli/connections.c:2672
+#: ../clients/cli/connections.c:2612
 #, c-format
 msgid "Error: no active connection provided."
 msgstr "Errore: nessuna connessione attiva fornita."
 
-#: ../clients/cli/connections.c:3120 ../clients/cli/utils.c:648
+#: ../clients/cli/connections.c:2955 ../clients/cli/utils.c:702
 #, c-format
 msgid "'%s' not among [%s]"
 msgstr "«%s» non tra [%s]"
 
-#: ../clients/cli/connections.c:3280
+#: ../clients/cli/connections.c:3032
 #, c-format
-msgid "Warning: master='%s' doesn't refer to any existing profile.\n"
-msgstr ""
-"Attenzione: master=\"%s\" non si riferisce ad alcun profilo esistente.\n"
+msgid "Error: '%s': '%s' is not a valid %s MAC address."
+msgstr "Errore: «%s»: «%s» non è un indirizzo MAC %s valido."
 
-#: ../clients/cli/connections.c:3451
-#, fuzzy, c-format
-msgid "Error: don't know how to create '%s' setting."
-msgstr "Errore: impossibile ottenere le impostazioni del sistema."
+#. Ask for optional arguments
+#: ../clients/cli/connections.c:3033 ../clients/cli/connections.c:3565
+#: ../clients/tui/nm-editor-utils.c:163 ../libnm-core/nm-connection.c:1716
+#: ../libnm-glib/nm-device.c:1861 ../libnm/nm-device.c:1812
+msgid "InfiniBand"
+msgstr "InfiniBand"
 
-#: ../clients/cli/connections.c:3462
-#, c-format
-msgid "Error: invalid property '%s': %s."
-msgstr "Errore: proprietà «%s» non valida: %s."
+#: ../clients/cli/connections.c:3033 ../clients/tui/nm-editor-utils.c:146
+#: ../libnm-glib/nm-device.c:1849 ../libnm/nm-device.c:1800
+msgid "Ethernet"
+msgstr "Ethernet"
 
-#: ../clients/cli/connections.c:3479
+#: ../clients/cli/connections.c:3053
 #, c-format
-msgid "Error: failed to modify %s.%s: %s."
-msgstr "Errore: modifica di %s.%s non riuscita: %s."
+msgid "Error: 'mtu': '%s' is not a valid MTU."
+msgstr "Errore: «mtu»: «%s» non è un MTU valido."
 
-#: ../clients/cli/connections.c:3498
+#: ../clients/cli/connections.c:3069
 #, c-format
-msgid "Error: failed to remove a value from %s.%s: %s."
-msgstr "Errore: rimozione di un valore da %s.%s non riuscita: %s."
+msgid "Error: 'parent': '%s' is not a valid interface name."
+msgstr "Errore: «parent»: «%s» non è un'interfaccia valida."
 
-#: ../clients/cli/connections.c:3524
-#, fuzzy, c-format
-msgid "Error: '%s' is mandatory."
-msgstr "Errore: impossibile ripetere \"%s\"."
+#: ../clients/cli/connections.c:3090
+#, c-format
+msgid "Error: 'p-key': '%s' is not a valid InfiniBand P_KEY."
+msgstr "Errore: «p-key»: «%s» non è un P_KEY InfiniBand valido."
 
-#: ../clients/cli/connections.c:3556
-#, fuzzy, c-format
-msgid "Error: invalid slave type; %s."
-msgstr "Errore: tipo di connessione non valido; %s."
+#: ../clients/cli/connections.c:3105
+#, c-format
+msgid "Error: '%s' is not a valid UID/GID."
+msgstr "Errore: «%s» non è un UID/GID valido."
 
-#: ../clients/cli/connections.c:3569
+#: ../clients/cli/connections.c:3149
 #, c-format
-msgid "Error: invalid connection type; %s."
-msgstr "Errore: tipo di connessione non valido; %s."
+msgid "Error: '%s': '%s' is not a valid %s %s."
+msgstr "Errore: \"%s\": \"%s\" non è \"%s\" valido %s."
 
-#: ../clients/cli/connections.c:3744
-#, fuzzy, c-format
-msgid "Error: bad connection type: %s."
-msgstr "Errore: tipo di connessione non valido; %s."
+#: ../clients/cli/connections.c:3162
+msgid "Wi-Fi mode"
+msgstr "Modalità Wi-Fi"
 
-#: ../clients/cli/connections.c:3802
-#, fuzzy, c-format
-msgid "Error: '%s' is not a valid interface nor '*'."
-msgstr "Errore: «ifname»: «%s» e «*» non sono interfacce valide."
+#: ../clients/cli/connections.c:3171
+msgid "InfiniBand transport mode"
+msgstr "Modalità trasporto InfiniBand"
 
-#: ../clients/cli/connections.c:3825
-#, fuzzy
-msgid "Error: master is required"
-msgstr "Errore: è richiesto «master»."
+#: ../clients/cli/connections.c:3183
+msgid "ADSL protocol"
+msgstr "Protocollo ADSL"
 
-#: ../clients/cli/connections.c:3883
-#, fuzzy, c-format
-msgid "Error: error adding bond option '%s=%s'."
-msgstr "Errore: connessione «%s» sconosciuta."
+#: ../clients/cli/connections.c:3194
+msgid "ADSL encapsulation"
+msgstr "Incapsulamento DSL"
+
+#: ../clients/cli/connections.c:3203
+msgid "TUN device mode"
+msgstr "Modalità dispositivo TUN"
 
-#: ../clients/cli/connections.c:3914
+#: ../clients/cli/connections.c:3216
 #, c-format
-msgid "Error: '%s' is not a valid monitoring mode; use '%s' or '%s'.\n"
-msgstr ""
-"Errore: «%s» non è una modalità di monitoraggio valida; usare «%s» o «%s».\n"
+msgid "Error: 'flags': '%s' is not valid; use <0-7>."
+msgstr "Errore: «flags»: «%s» non è valido; usare <0-7>."
 
-#: ../clients/cli/connections.c:3945
+#: ../clients/cli/connections.c:3238
 #, c-format
-msgid "Error: 'bt-type': '%s' not valid; use [%s, %s (%s), %s]."
-msgstr "Errore: «bt-type»: «%s» non valido; usare [%s, %s (%s), %s]."
+msgid "Error: '%s': '%s' is not valid; %s "
+msgstr "Errore: «%s»: «%s» non è valido; %s "
 
-#: ../clients/cli/connections.c:3972
-#, fuzzy
-msgid "Interface name [*]"
-msgstr "Nome interfaccia [*]: "
+#: ../clients/cli/connections.c:3416
+#, c-format
+msgid "Warning: master='%s' doesn't refer to any existing profile.\n"
+msgstr "Attenzione: master=\"%s\" non si riferisce ad alcun profilo esistente.\n"
 
-#: ../clients/cli/connections.c:3976
-#, fuzzy
-msgid "PPPoE username"
-msgstr "Nome utente PPPoE:"
+#: ../clients/cli/connections.c:3441
+#, c-format
+msgid "Error: '%s': '%s' is not valid; use <%u-%u>."
+msgstr "Errore: «%s»: «%s» non è valido; usare <%u-%u>."
 
-#: ../clients/cli/connections.c:3977 ../clients/cli/connections.c:3998
-#: ../clients/cli/connections.c:4000 ../clients/cli/connections.c:4049
-#, fuzzy
-msgid "Password [none]"
-msgstr "Password [nessuna]: "
+#. Ask for optional arguments.
+#: ../clients/cli/connections.c:3497
+#, c-format
+msgid "There is %d optional argument for '%s' connection type.\n"
+msgid_plural "There are %d optional arguments for '%s' connection type.\n"
+msgstr[0] "C'è %d argomento opzionale per il tipo di connessione \"%s\".\n"
+msgstr[1] "Ci sono %d argomenti opzionali per il tipo di connessione \"%s\".\n"
 
-#: ../clients/cli/connections.c:3978
-#, fuzzy
-msgid "Service [none]"
-msgstr "Servizio [nessuno]: "
+#: ../clients/cli/connections.c:3500
+#, c-format
+msgid "Do you want to provide it? %s"
+msgid_plural "Do you want to provide them? %s"
+msgstr[0] "Fornirlo ora?"
+msgstr[1] "Fornirli ora? %s"
 
-#: ../clients/cli/connections.c:3979 ../clients/cli/connections.c:3982
-#: ../clients/cli/connections.c:3991
-#, fuzzy
-msgid "MTU [auto]"
+#. Ask for optional arguments
+#: ../clients/cli/connections.c:3517
+msgid "ethernet"
+msgstr "ethernet"
+
+#: ../clients/cli/connections.c:3522 ../clients/cli/connections.c:3570
+#: ../clients/cli/connections.c:3704 ../clients/cli/connections.c:3783
+msgid "MTU [auto]: "
 msgstr "MTU [auto]: "
 
-#: ../clients/cli/connections.c:3980 ../clients/cli/connections.c:3983
-#: ../clients/cli/connections.c:3992 ../clients/cli/connections.c:3995
-#: ../clients/cli/connections.c:4036
-#, fuzzy
-msgid "MAC [none]"
+#: ../clients/cli/connections.c:3533 ../clients/cli/connections.c:3581
+#: ../clients/cli/connections.c:3676 ../clients/cli/connections.c:3715
+#: ../clients/cli/connections.c:4101
+msgid "MAC [none]: "
 msgstr "MAC [nessuno]: "
 
-#: ../clients/cli/connections.c:3981 ../clients/cli/connections.c:3993
-#, fuzzy
-msgid "Cloned MAC [none]"
+#: ../clients/cli/connections.c:3544
+msgid "Cloned MAC [none]: "
 msgstr "MAC clonato [nessuno]: "
 
-#: ../clients/cli/connections.c:3986
-#, fuzzy
-msgid "Parent interface [none]"
+#: ../clients/cli/connections.c:3592
+#, c-format
+msgid "Transport mode %s"
+msgstr "Modalità trasporto %s"
+
+#: ../clients/cli/connections.c:3605
+msgid "Parent interface [none]: "
 msgstr "Interfaccia genitore [nessuna]: "
 
-#: ../clients/cli/connections.c:3987
-#, fuzzy
-msgid "P_KEY [none]"
+#: ../clients/cli/connections.c:3616
+msgid "P_KEY [none]: "
 msgstr "P_KEY [nessuno]: "
 
-#. 0
-#: ../clients/cli/connections.c:3988 ../clients/cli/connections.c:4043
-#: ../clients/cli/devices.c:151 ../clients/tui/nmt-page-wifi.c:224
-msgid "SSID"
-msgstr "SSID"
+#: ../clients/cli/connections.c:3626
+#, c-format
+msgid "Error: 'p-key' is mandatory when 'parent' is specified.\n"
+msgstr "Errore: «p-key» è obbligatorio quanto «parent» è specificato.\n"
 
-#: ../clients/cli/connections.c:3994
-#, fuzzy
-msgid "WiMAX NSP name"
-msgstr "Nome NSP WiMAX: "
+#. Ask for optional arguments
+#: ../clients/cli/connections.c:3643 ../clients/tui/nm-editor-utils.c:154
+#: ../libnm-glib/nm-device.c:1851 ../libnm/nm-device.c:1802
+msgid "Wi-Fi"
+msgstr "Wi-Fi"
 
-#: ../clients/cli/connections.c:3996
-#, fuzzy
-msgid "APN"
-msgstr "AP"
+#: ../clients/cli/connections.c:3651 ../clients/cli/connections.c:6199
+#, c-format
+msgid "Mode %s"
+msgstr "Modalità %s"
 
-#: ../clients/cli/connections.c:3997 ../clients/cli/connections.c:3999
-#: ../clients/cli/connections.c:4042
-#, fuzzy
-msgid "Username [none]"
+#. Ask for optional 'wimax' arguments.
+#: ../clients/cli/connections.c:3671 ../libnm-glib/nm-device.c:1857
+#: ../libnm/nm-device.c:1808
+msgid "WiMAX"
+msgstr "WiMAX"
+
+#. Ask for optional 'pppoe' arguments.
+#: ../clients/cli/connections.c:3694
+msgid "PPPoE"
+msgstr "PPPoE"
+
+#: ../clients/cli/connections.c:3698 ../clients/cli/connections.c:3736
+#: ../clients/cli/connections.c:4223
+msgid "Password [none]: "
+msgstr "Password [nessuna]: "
+
+#: ../clients/cli/connections.c:3700
+msgid "Service [none]: "
+msgstr "Servizio [nessuno]: "
+
+#. Ask for optional 'gsm' or 'cdma' arguments.
+#: ../clients/cli/connections.c:3730
+msgid "mobile broadband"
+msgstr "banda larga mobile"
+
+#: ../clients/cli/connections.c:3734 ../clients/cli/connections.c:4173
+msgid "Username [none]: "
 msgstr "Nome utente [nessuno]: "
 
-#: ../clients/cli/connections.c:4001
-#, fuzzy
-msgid "Bluetooth device address"
-msgstr "Indirizzo dispositivo Bluetooth: "
+#. Ask for optional 'bluetooth' arguments.
+#: ../clients/cli/connections.c:3749
+msgid "bluetooth"
+msgstr "bluetooth"
 
-#: ../clients/cli/connections.c:4004
-#, fuzzy
-msgid "VLAN parent device or connection UUID"
-msgstr "Dispositivo genitore VLAN o UUID di connessione:"
+#: ../clients/cli/connections.c:3756
+#, c-format
+msgid "Bluetooth type %s"
+msgstr "Bluetooth tipo %s"
 
-#: ../clients/cli/connections.c:4006
-#, fuzzy
-msgid "VLAN ID (<0-4094>)"
-msgstr "ID VLAN <0-4095>: "
+#: ../clients/cli/connections.c:3762
+#, c-format
+msgid "Error: 'bt-type': '%s' is not a valid bluetooth type.\n"
+msgstr "Errore: «bt-type»: «%s» non è una tipologia di Bluetooth valida.\n"
 
-#: ../clients/cli/connections.c:4007
-#, fuzzy
-msgid "VLAN flags (<0-7>) [none]"
+#. Ask for optional 'vlan' arguments.
+#. 13
+#: ../clients/cli/connections.c:3778 ../clients/cli/devices.c:239
+#: ../clients/tui/nm-editor-utils.c:217 ../clients/tui/nmt-page-vlan.c:94
+#: ../libnm-core/nm-connection.c:1714 ../libnm-glib/nm-device.c:1869
+#: ../libnm-util/nm-connection.c:1632 ../libnm/nm-device.c:1820
+msgid "VLAN"
+msgstr "VLAN"
+
+#: ../clients/cli/connections.c:3794
+msgid "VLAN flags (<0-7>) [none]: "
 msgstr "Flag VLAN (<0-7>) [nessuno]: "
 
-#: ../clients/cli/connections.c:4008
-#, fuzzy
-msgid "Ingress priority maps [none]"
+#: ../clients/cli/connections.c:3805
+msgid "Ingress priority maps [none]: "
 msgstr "Mappe priorità ingress [nessuna]: "
 
-#: ../clients/cli/connections.c:4009
-#, fuzzy
-msgid "Egress priority maps [none]"
+#: ../clients/cli/connections.c:3816
+msgid "Egress priority maps [none]: "
 msgstr "Mappe priorità egress [nessuna]: "
 
-#: ../clients/cli/connections.c:4012
-#, fuzzy
-msgid "Bonding primary interface [none]"
+#: ../clients/cli/connections.c:3827
+msgid "Bonding mode [balance-rr]: "
+msgstr "Modalità di aggregazione [balance-rr]: "
+
+#. Ask for optional 'bond' arguments.
+#: ../clients/cli/connections.c:3843
+msgid "bond"
+msgstr "bond"
+
+#: ../clients/cli/connections.c:3865
+msgid "Bonding primary interface [none]: "
 msgstr "Interfaccia principale di aggregazione [nessuna]: "
 
-#: ../clients/cli/connections.c:4016
-#, fuzzy
-msgid "Bonding miimon [100]"
+#: ../clients/cli/connections.c:3868
+#, c-format
+msgid "Error: 'primary': '%s' is not a valid interface name.\n"
+msgstr "Errore: «primary»: «%s» non è un nome d'interfaccia valido.\n"
+
+#: ../clients/cli/connections.c:3876
+#, c-format
+msgid "Bonding monitoring mode %s"
+msgstr "Modalità monitoraggio di aggregazione %s"
+
+#: ../clients/cli/connections.c:3882
+#, c-format
+msgid "Error: '%s' is not a valid monitoring mode; use '%s' or '%s'.\n"
+msgstr ""
+"Errore: «%s» non è una modalità di monitoraggio valida; usare «%s» o «%s».\n"
+
+#: ../clients/cli/connections.c:3891
+msgid "Bonding miimon [100]: "
 msgstr "Miimon di aggregazione [100]: "
 
-#: ../clients/cli/connections.c:4017
-#, fuzzy
-msgid "Bonding downdelay [0]"
+#: ../clients/cli/connections.c:3894
+#, c-format
+msgid "Error: 'miimon': '%s' is not a valid number <0-%u>.\n"
+msgstr "Errore: «miimon»: «%s» non è un numero valido <0-%u>.\n"
+
+#: ../clients/cli/connections.c:3902
+msgid "Bonding downdelay [0]: "
 msgstr "Downdelay di aggregazione [0]: "
 
-#: ../clients/cli/connections.c:4018
-#, fuzzy
-msgid "Bonding updelay [0]"
+#: ../clients/cli/connections.c:3905
+#, c-format
+msgid "Error: 'downdelay': '%s' is not a valid number <0-%u>.\n"
+msgstr "Errore: «downdelay»: «%s» non è un numero valido <0-%u>.\n"
+
+#: ../clients/cli/connections.c:3913
+msgid "Bonding updelay [0]: "
 msgstr "Updelay di aggregazione [0]: "
 
-#: ../clients/cli/connections.c:4019
-#, fuzzy
-msgid "Bonding arp-interval [0]"
+#: ../clients/cli/connections.c:3916
+#, c-format
+msgid "Error: 'updelay': '%s' is not a valid number <0-%u>.\n"
+msgstr "Errore: «updelay»: «%s» non è un numero valido <0-%u>.\n"
+
+#: ../clients/cli/connections.c:3925
+msgid "Bonding arp-interval [0]: "
 msgstr "Arp-interval di aggregazione [0]: "
 
-#: ../clients/cli/connections.c:4021
-#, fuzzy
-msgid "Bonding arp-ip-target [none]"
+#: ../clients/cli/connections.c:3928
+#, c-format
+msgid "Error: 'arp-interval': '%s' is not a valid number <0-%u>.\n"
+msgstr "Errore: «arp-interval»: «%s» non è un numero valido <0-%u>.\n"
+
+#. FIXME: verify the string
+#: ../clients/cli/connections.c:3936
+msgid "Bonding arp-ip-target [none]: "
 msgstr "Arp-ip-target di aggregazione [nessuno]: "
 
-#: ../clients/cli/connections.c:4023
-#, fuzzy
-msgid "LACP rate ('slow' or 'fast') [slow]"
+#: ../clients/cli/connections.c:3943
+msgid "LACP rate ('slow' or 'fast') [slow]: "
 msgstr "Velocità LACP (\"slow\" o \"fast\") [slow]: "
 
-#: ../clients/cli/connections.c:4025 ../clients/cli/connections.c:4026
-#, fuzzy
-msgid "Team JSON configuration [none]"
+#: ../clients/cli/connections.c:3949
+#, c-format
+msgid "Error: 'lacp_rate': '%s' is invalid ('slow' or 'fast').\n"
+msgstr "Errore: \"lacp_rate\": \"%s\" non è valido (\"slow\" o \"fast\").\n"
+
+#: ../clients/cli/connections.c:3972
+msgid "Team JSON configuration [none]: "
 msgstr "Configurazione JSON team [nessuna]: "
 
-#: ../clients/cli/connections.c:4027
-#, fuzzy
-msgid "Enable STP [no]"
+#: ../clients/cli/connections.c:3989
+msgid "team"
+msgstr "team"
+
+#: ../clients/cli/connections.c:3995
+msgid "team-slave"
+msgstr "team-slave"
+
+#. Ask for optional 'bridge' arguments.
+#: ../clients/cli/connections.c:4007
+msgid "bridge"
+msgstr "bridge"
+
+#: ../clients/cli/connections.c:4013
+#, c-format
+msgid "Enable STP %s"
 msgstr "Abilitare STP %s"
 
-#: ../clients/cli/connections.c:4029
-#, fuzzy
-msgid "STP priority [32768]"
+#: ../clients/cli/connections.c:4018
+#, c-format
+msgid "Error: 'stp': %s.\n"
+msgstr "Errore: \"stp\": %s.\n"
+
+#: ../clients/cli/connections.c:4026
+msgid "STP priority [32768]: "
 msgstr "Priorità STP [32768]: "
 
 #: ../clients/cli/connections.c:4030
-#, fuzzy
-msgid "Forward delay [15]"
+#, c-format
+msgid "Error: 'priority': '%s' is not a valid number <0-%d>.\n"
+msgstr "Errore: «priority»: «%s» non è un numero valido <0-%d>.\n"
+
+#: ../clients/cli/connections.c:4038
+msgid "Forward delay [15]: "
 msgstr "Forward delay [15]: "
 
-#: ../clients/cli/connections.c:4031
-#, fuzzy
-msgid "Hello time [2]"
+#: ../clients/cli/connections.c:4042
+#, c-format
+msgid "Error: 'forward-delay': '%s' is not a valid number <2-30>.\n"
+msgstr "Errore: «forward-dealy»: «%s» non è un numero valido <2-30>.\n"
+
+#: ../clients/cli/connections.c:4051
+msgid "Hello time [2]: "
 msgstr "Hello time [2]: "
 
-#: ../clients/cli/connections.c:4032
-#, fuzzy
-msgid "Max age [20]"
+#: ../clients/cli/connections.c:4055
+#, c-format
+msgid "Error: 'hello-time': '%s' is not a valid number <1-10>.\n"
+msgstr "Errore: «hello-time»: «%s» non è un numero valido <1-10>.\n"
+
+#: ../clients/cli/connections.c:4063
+msgid "Max age [20]: "
 msgstr "Età massima [20]: "
 
-#: ../clients/cli/connections.c:4033
-#, fuzzy
-msgid "MAC address ageing time [300]"
+#: ../clients/cli/connections.c:4067
+#, c-format
+msgid "Error: 'max-age': '%s' is not a valid number <6-40>.\n"
+msgstr "Errore: «max-age»: «%s» non è un numero valido <6-40>.\n"
+
+#: ../clients/cli/connections.c:4075
+msgid "MAC address ageing time [300]: "
 msgstr "Tempo invecchiamento indirizzo MAC [300]: "
 
-#: ../clients/cli/connections.c:4034
+#: ../clients/cli/connections.c:4079
 #, c-format
-msgid "Enable IGMP snooping %s [no]"
-msgstr ""
+msgid "Error: 'ageing-time': '%s' is not a valid number <0-1000000>.\n"
+msgstr "Errore: «ageing-time»: «%s» non è un numero valido <0-1000000>.\n"
 
-#: ../clients/cli/connections.c:4037
-#, fuzzy
-msgid "Bridge port priority [32]"
+#: ../clients/cli/connections.c:4088
+#, c-format
+msgid "Enable IGMP snooping %s"
+msgstr "Abilita snooping IGMP %s"
+
+#: ../clients/cli/connections.c:4093
+#, c-format
+msgid "Error: 'multicast-snooping': %s.\n"
+msgstr "Errore: 'multicast-snooping': %s.\n"
+
+#. Ask for optional 'bridge-slave' arguments.
+#: ../clients/cli/connections.c:4120
+msgid "bridge-slave"
+msgstr "bridge-slave"
+
+#: ../clients/cli/connections.c:4125
+msgid "Bridge port priority [32]: "
 msgstr "Priorità porta bridge [32]: "
 
-#: ../clients/cli/connections.c:4038
-#, fuzzy
-msgid "Bridge port STP path cost [100]"
+#: ../clients/cli/connections.c:4138
+msgid "Bridge port STP path cost [100]: "
 msgstr "Costo percorso STP porta bridge [100]: "
 
-#: ../clients/cli/connections.c:4039
-#, fuzzy
-msgid "Hairpin [no]"
-msgstr "Modalità hairpin"
+#: ../clients/cli/connections.c:4152
+#, c-format
+msgid "Hairpin %s"
+msgstr "Hairpin %s"
+
+#: ../clients/cli/connections.c:4157
+#, c-format
+msgid "Error: 'hairpin': %s.\n"
+msgstr "Errore: \"hairpin\": \"%s\".\n"
 
-#: ../clients/cli/connections.c:4044
-#, fuzzy
-msgid "OLPC Mesh channel [1]"
+#. Ask for optional 'olpc' arguments.
+#: ../clients/cli/connections.c:4184 ../libnm-glib/nm-device.c:1855
+#: ../libnm/nm-device.c:1806
+msgid "OLPC Mesh"
+msgstr "Mesh OLPC"
+
+#: ../clients/cli/connections.c:4189
+msgid "OLPC Mesh channel [1]: "
 msgstr "Canale mesh OLPC [1]: "
 
-#: ../clients/cli/connections.c:4045
-#, fuzzy
-msgid "DHCP anycast MAC address [none]"
+#: ../clients/cli/connections.c:4192
+#, c-format
+msgid "Error: 'channel': '%s' is not a valid number <1-13>.\n"
+msgstr "Errore: «channel»: «%s» non è un numero valido <1-13>.\n"
+
+#: ../clients/cli/connections.c:4200
+msgid "DHCP anycast MAC address [none]: "
 msgstr "Indirizzo MAC DHCP anycast [nessuno]: "
 
-#. TTLS and PEAP are actually much more complicated, but this complication
-#. * is not visible here since we only care about phase2 authentication
-#. * (and don't even care of which one)
-#.
-#: ../clients/cli/connections.c:4046
-#: ../clients/common/nm-secret-agent-simple.c:223
-#: ../clients/common/nm-secret-agent-simple.c:328
-#: ../clients/tui/nmt-page-dsl.c:66 ../clients/tui/nmt-page-wifi.c:332
-msgid "Username"
-msgstr "Nome utente"
+#. Ask for optional 'adsl' arguments.
+#: ../clients/cli/connections.c:4219 ../libnm-glib/nm-device.c:1871
+#: ../libnm/nm-device.c:1822
+msgid "ADSL"
+msgstr "ADSL"
 
-#: ../clients/cli/connections.c:4052
-#, fuzzy
-msgid "MACVLAN parent device or connection UUID"
-msgstr "Dispositivo genitore VLAN o UUID di connessione:"
+#: ../clients/cli/connections.c:4227
+#, c-format
+msgid "ADSL encapsulation %s"
+msgstr "Incapsulamento ADSL %s"
 
-#: ../clients/cli/connections.c:4055
-msgid "Tap [no]"
-msgstr ""
+#. Ask for optional 'macvlan' arguments.
+#: ../clients/cli/connections.c:4245
+msgid "macvlan"
+msgstr "macvlan"
 
-#: ../clients/cli/connections.c:4057
-#, fuzzy
-msgid "VXLAN ID"
-msgstr "ID VLAN <0-4095>: "
+#: ../clients/cli/connections.c:4251
+#, c-format
+msgid "Tap %s"
+msgstr "Toccare %s"
 
-#: ../clients/cli/connections.c:4058 ../clients/cli/connections.c:4076
-#, fuzzy
-msgid "Remote"
-msgstr "Rimuovi"
+#: ../clients/cli/connections.c:4256
+#, c-format
+msgid "Error: 'tap': %s.\n"
+msgstr "Errore: 'tap': %s.\n"
 
-#: ../clients/cli/connections.c:4059 ../clients/cli/connections.c:4077
-#, fuzzy
-msgid "Parent device [none]"
-msgstr "Interfaccia genitore [nessuna]: "
+#. Ask for optional 'vxlan' arguments.
+#: ../clients/cli/connections.c:4272 ../libnm-glib/nm-device.c:1875
+#: ../libnm/nm-device.c:1826
+msgid "VXLAN"
+msgstr "VXLAN"
 
-#: ../clients/cli/connections.c:4060
-#, fuzzy
-msgid "Local address [none]"
-msgstr "Indirizzo MAC DHCP anycast [nessuno]: "
+#: ../clients/cli/connections.c:4277 ../clients/cli/connections.c:4601
+msgid "Parent device [none]: "
+msgstr "Dispositivo padre [nessuno]: "
 
-#: ../clients/cli/connections.c:4061
-msgid "Minimum source port [0]"
-msgstr ""
+#: ../clients/cli/connections.c:4282 ../clients/cli/connections.c:4606
+#, c-format
+msgid "Error: 'dev': '%s' is neither UUID nor interface name.\n"
+msgstr "Errore: 'dev': '%s' non è un UUID, né un nome di interfaccia.\n"
 
-#: ../clients/cli/connections.c:4062
-msgid "Maximum source port [0]"
-msgstr ""
+#: ../clients/cli/connections.c:4291
+msgid "Local address [none]: "
+msgstr "Indirizzo locale [nessuno]: "
 
-#: ../clients/cli/connections.c:4063
-#, fuzzy
-msgid "Destination port [8472]"
-msgstr "Destinazione"
+#: ../clients/cli/connections.c:4296
+#, c-format
+msgid "Error: 'local': '%s' is not a valid IP address.\n"
+msgstr "Errore: 'local': '%s'  non è un indirizzo IP valido.\n"
 
-#: ../clients/cli/connections.c:4066
-#, fuzzy
-msgid "User ID [none]"
-msgstr "Nome utente [nessuno]: "
+#: ../clients/cli/connections.c:4305
+msgid "Minimum source port [0]: "
+msgstr "Porta sorgente minima [0]: "
 
-#: ../clients/cli/connections.c:4067
-#, fuzzy
-msgid "Group ID [none]"
-msgstr "MAC [nessuno]: "
+#: ../clients/cli/connections.c:4309
+#, c-format
+msgid "Error: 'source-port-min': '%s' is not a valid number <0-65535>.\n"
+msgstr "Errore: 'source-port-min': '%s' non è un numero valido <0-65535>.\n"
 
-#: ../clients/cli/connections.c:4068
-#, fuzzy
-msgid "Enable PI [no]"
-msgstr "Abilitare STP %s"
+#: ../clients/cli/connections.c:4318
+msgid "Maximum source port [0]: "
+msgstr "Porta sorgente massima [0]: "
 
-#: ../clients/cli/connections.c:4070
-msgid "Enable VNET header [no]"
-msgstr ""
+#: ../clients/cli/connections.c:4322
+#, c-format
+msgid "Error: 'source-port-max': '%s' is not a valid number <0-65535>.\n"
+msgstr "Errore: 'source-port-max': '%s' non è un numero valido <0-65535>.\n"
 
-#: ../clients/cli/connections.c:4072
-msgid "Enable multi queue [no]"
-msgstr ""
+#: ../clients/cli/connections.c:4331
+msgid "Destination port [8472]: "
+msgstr "Porta destinazione [8472]: "
 
-#: ../clients/cli/connections.c:4075
-#, fuzzy
-msgid "Local endpoint [none]"
-msgstr "Interfaccia genitore [nessuna]: "
+#: ../clients/cli/connections.c:4335
+#, c-format
+msgid "Error: 'destination-port': '%s' is not a valid number <0-65535>.\n"
+msgstr "Errore: 'destination-port': '%s' non è un numero valido <0-65535>.\n"
 
-#: ../clients/cli/connections.c:4078
-#, fuzzy
-msgid "IPv4 address (IP[/plen]) [none]"
+#: ../clients/cli/connections.c:4374
+msgid "IPv4 address (IP[/plen]) [none]: "
 msgstr "Indirizzo IPv4 (IP[/plen]) [nessuno]: "
 
-#: ../clients/cli/connections.c:4079
-#, fuzzy
-msgid "IPv4 gateway [none]"
-msgstr "Gateway IPv4 [nessuno]: "
-
-#: ../clients/cli/connections.c:4080
-#, fuzzy
-msgid "IPv6 address (IP[/plen]) [none]"
+#: ../clients/cli/connections.c:4376
+msgid "IPv6 address (IP[/plen]) [none]: "
 msgstr "Indirizzo IPv6 (IP[/plen]) [nessuno]: "
 
-#: ../clients/cli/connections.c:4081
-#, fuzzy
-msgid "IPv6 gateway [none]"
+#: ../clients/cli/connections.c:4390
+#, c-format
+msgid "  Address successfully added: %s\n"
+msgstr "  Indirizzo aggiunto con successo: %s\n"
+
+#: ../clients/cli/connections.c:4392
+#, c-format
+msgid "  Warning: address already present: %s\n"
+msgstr "  Attenzione: indirizzo già presente: %s\n"
+
+#: ../clients/cli/connections.c:4394
+#, c-format
+msgid "  Warning: ignoring garbage at the end: '%s'\n"
+msgstr "  Attenzione: ignorati i dati non necessari alla fine: «%s»\n"
+
+#: ../clients/cli/connections.c:4396 ../clients/cli/connections.c:5605
+#: ../clients/cli/connections.c:5652 ../clients/cli/connections.c:6569
+#: ../clients/cli/connections.c:6602
+msgid "Error: "
+msgstr "Errore: "
+
+#: ../clients/cli/connections.c:4416
+msgid "IPv4 gateway [none]: "
+msgstr "Gateway IPv4 [nessuno]: "
+
+#: ../clients/cli/connections.c:4419
+msgid "IPv6 gateway [none]: "
 msgstr "Gateway IPv6 [nessuno]: "
 
-#: ../clients/cli/connections.c:4205
+#: ../clients/cli/connections.c:4439
 #, c-format
-msgid "Error: value for '%s' is missing."
-msgstr "Errore: manca il valore per \"%s\""
+msgid "Error: invalid gateway address '%s'\n"
+msgstr "Errore: indirizzo gateway \"%s\" non valido\n"
+
+#. Ask for IP addresses
+#: ../clients/cli/connections.c:4452
+#, c-format
+msgid "Do you want to add IP addresses? %s"
+msgstr "Aggiungere indirizzi IP? %s"
+
+#: ../clients/cli/connections.c:4460
+#, c-format
+msgid "Press <Enter> to finish adding addresses.\n"
+msgstr "Premere Invio per terminare l'immissione di indirizzi.\n"
+
+#. Ask for optional 'tun' arguments.
+#: ../clients/cli/connections.c:4504 ../libnm-glib/nm-device.c:1879
+#: ../libnm/nm-device.c:1830
+msgid "Tun"
+msgstr "Tun"
+
+#: ../clients/cli/connections.c:4509
+msgid "User ID [none]: "
+msgstr "ID utente [nessuno]: "
+
+#: ../clients/cli/connections.c:4522
+msgid "Group ID [none]: "
+msgstr "ID gruppo [nessuno]: "
+
+#: ../clients/cli/connections.c:4536
+#, c-format
+msgid "Enable PI %s"
+msgstr "Abilita PI %s"
 
-#: ../clients/cli/connections.c:4252
+#: ../clients/cli/connections.c:4541
+#, c-format
+msgid "Error: 'pi': %s.\n"
+msgstr "Errore: 'pi': %s.\n"
+
+#: ../clients/cli/connections.c:4549
+#, c-format
+msgid "Enable VNET header %s"
+msgstr "Abilita intestazione VNET %s"
+
+#: ../clients/cli/connections.c:4554
+#, c-format
+msgid "Error: 'vnet-hdr': %s.\n"
+msgstr "Errore: 'vnet-hdr': %s.\n"
+
+#: ../clients/cli/connections.c:4562
+#, c-format
+msgid "Enable multi queue %s"
+msgstr "Abilita coda multipla %s"
+
+#: ../clients/cli/connections.c:4567
+#, c-format
+msgid "Error: 'multi-queue': %s.\n"
+msgstr "Errore: 'multi-queue': %s.\n"
+
+#. Ask for optional 'ip-tunnel' arguments.
+#: ../clients/cli/connections.c:4581
+msgid "IP Tunnel"
+msgstr "Tunnel IP"
+
+#: ../clients/cli/connections.c:4586
+msgid "Local endpoint [none]: "
+msgstr "Endpoint locale [nessuno]: "
+
+#: ../clients/cli/connections.c:4592
+#, c-format
+msgid "Error: 'local': '%s' is not valid; must be an IP address\n"
+msgstr "Errore: 'local': '%s' non è valido; deve essere un indirizzo IP\n"
+
+#: ../clients/cli/connections.c:4658 ../clients/cli/connections.c:10184
+#, c-format
 msgid "Error: <setting>.<property> argument is missing."
 msgstr "Errore: manca l'argomento <impostazione>.<proprietà>."
 
-#: ../clients/cli/connections.c:4274
+#: ../clients/cli/connections.c:4663
+#, c-format
+msgid "Error: value for '%s' is missing."
+msgstr "Errore: manca il valore per \"%s\""
+
+#: ../clients/cli/connections.c:4681
+#, c-format
+msgid "Error: invalid <setting>.<property> '%s'."
+msgstr "Errore: <impostazione>.<proprietà> «%s» non valida."
+
+#: ../clients/cli/connections.c:4689
 #, c-format
 msgid "Error: invalid or not allowed setting '%s': %s."
 msgstr "Errore: impostazione «%s» non valida o non consentita: %s."
 
-#: ../clients/cli/connections.c:4301
-#, fuzzy, c-format
-msgid "Error: '%s' is ambiguous (%s.%s or %s.%s)."
-msgstr "«%s» è ambiguo (%s x %s)"
+#: ../clients/cli/connections.c:4700
+#, c-format
+msgid "Error: don't know how to create '%s' setting."
+msgstr "Errore: impossibile creare l'impostazione '%s'."
 
-#: ../clients/cli/connections.c:4315
+#: ../clients/cli/connections.c:4710
 #, c-format
-msgid "Error: invalid <setting>.<property> '%s'."
-msgstr "Errore: <impostazione>.<proprietà> «%s» non valida."
+msgid "Error: invalid property '%s': %s."
+msgstr "Errore: proprietà «%s» non valida: %s."
 
-#: ../clients/cli/connections.c:4356 ../clients/cli/connections.c:7842
+#: ../clients/cli/connections.c:4722
 #, c-format
-msgid "Error: Failed to add '%s' connection: %s"
-msgstr "Errore: aggiunta della connessione \"%s\" non riuscita: %s"
+msgid "Error: failed to modify %s.%s: %s."
+msgstr "Errore: modifica di %s.%s non riuscita: %s."
 
-#: ../clients/cli/connections.c:4361
+#: ../clients/cli/connections.c:4741
 #, c-format
-msgid "Connection '%s' (%s) successfully added.\n"
-msgstr "Connessione «%s» (%s) aggiunta con successo.\n"
+msgid "Error: failed to remove a value from %s.%s: %s."
+msgstr "Errore: rimozione di un valore da %s.%s non riuscita: %s."
 
-#: ../clients/cli/connections.c:4477
+#: ../clients/cli/connections.c:4775
 #, c-format
 msgid ""
-"You can specify this option more than once. Press <Enter> when you're done.\n"
+"Warning: 'type' is ignored. Use 'nmcli connection add \"%s\" ...' instead."
 msgstr ""
+"Avvertenza: 'type' ignorato. Utilizzare piuttosto 'nmcli connection add "
+"\"%s\" ...'."
 
-#. Ask for optional arguments.
-#: ../clients/cli/connections.c:4515
-#, fuzzy, c-format
-msgid "There is %d optional setting for %s.\n"
-msgid_plural "There are %d optional settings for %s.\n"
-msgstr[0] "C'è %d argomento opzionale per il tipo di connessione \"%s\".\n"
-msgstr[1] "Ci sono %d argomenti opzionali per il tipo di connessione \"%s\".\n"
+#: ../clients/cli/connections.c:4783
+msgid "Error: redundant 'master' option."
+msgstr "Errore: opzione 'master' ridondante."
 
-#: ../clients/cli/connections.c:4518
+#: ../clients/cli/connections.c:4796
+msgid "Error: 'master' is required."
+msgstr "Errore: è richiesto «master»."
+
+#: ../clients/cli/connections.c:4950
 #, c-format
-msgid "Do you want to provide it? %s"
-msgid_plural "Do you want to provide them? %s"
-msgstr[0] "Fornirlo ora?"
-msgstr[1] "Fornirli ora? %s"
+msgid "Error: 'parent': not valid without 'p-key'."
+msgstr "Errore: «parent»: non valido senza «p-key»."
 
-#: ../clients/cli/connections.c:4532
-#, fuzzy
-msgid "Wired Ethernet"
-msgstr "Ethernet"
+#: ../clients/cli/connections.c:5005 ../clients/cli/connections.c:5967
+msgid "SSID: "
+msgstr "SSID: "
 
-#: ../clients/cli/connections.c:4534 ../src/devices/nm-device-infiniband.c:175
-msgid "InfiniBand connection"
-msgstr "Connessione InfiniBand"
+#: ../clients/cli/connections.c:5008 ../clients/cli/connections.c:5970
+msgid "Error: 'ssid' is required."
+msgstr "Errore: è richiesto «ssid»."
 
-#: ../clients/cli/connections.c:4536
-#, fuzzy
-msgid "Wi-Fi connection"
-msgstr "Connessione Wi-Fi %d"
+#: ../clients/cli/connections.c:5072
+msgid "WiMAX NSP name: "
+msgstr "Nome NSP WiMAX: "
 
-#: ../clients/cli/connections.c:4538
-#, fuzzy
-msgid "WiMAX connection"
-msgstr "Connessione CDMA"
+#: ../clients/cli/connections.c:5075
+msgid "Error: 'nsp' is required."
+msgstr "Errore: è richiesto «nsp»."
 
-#: ../clients/cli/connections.c:4540
-msgid "PPPoE"
-msgstr "PPPoE"
+#: ../clients/cli/connections.c:5127
+msgid "PPPoE username: "
+msgstr "Nome utente PPPoE:"
 
-#: ../clients/cli/connections.c:4542
-#, fuzzy
-msgid "CDMA mobile broadband connection"
-msgstr "Connessione a banda larga mobile %d"
+#: ../clients/cli/connections.c:5130 ../clients/cli/connections.c:6037
+msgid "Error: 'username' is required."
+msgstr "Errore: è richiesto «username»."
 
-#: ../clients/cli/connections.c:4544
-#, fuzzy
-msgid "GSM mobile broadband connection"
-msgstr "Connessione a banda larga mobile %d"
+#: ../clients/cli/connections.c:5199
+msgid "APN: "
+msgstr "APN: "
 
-#: ../clients/cli/connections.c:4546
-#, fuzzy
-msgid "bluetooth connection"
-msgstr "Connessione aggregata"
+#: ../clients/cli/connections.c:5202
+msgid "Error: 'apn' is required."
+msgstr "Errore: è richiesto «apn»."
 
-#: ../clients/cli/connections.c:4548 ../src/devices/nm-device-vlan.c:458
-msgid "VLAN connection"
-msgstr "Connessione VLAN"
+#: ../clients/cli/connections.c:5260
+msgid "Bluetooth device address: "
+msgstr "Indirizzo dispositivo Bluetooth: "
 
-#: ../clients/cli/connections.c:4550
-#, fuzzy
-msgid "Bond device"
-msgstr "Dispositivo Ethernet"
+#: ../clients/cli/connections.c:5263
+msgid "Error: 'addr' is required."
+msgstr "Errore: è richiesto «addr»."
 
-#: ../clients/cli/connections.c:4552
-#, fuzzy
-msgid "Team device"
-msgstr "Il dispositivo è stato rimosso"
+#: ../clients/cli/connections.c:5304
+#, c-format
+msgid "Error: 'bt-type': '%s' not valid; use [%s, %s (%s), %s]."
+msgstr "Errore: «bt-type»: «%s» non valido; usare [%s, %s (%s), %s]."
 
-#: ../clients/cli/connections.c:4554
-#, fuzzy
-msgid "Team port"
-msgstr "Team"
+#: ../clients/cli/connections.c:5348
+msgid "VLAN parent device or connection UUID: "
+msgstr "Dispositivo genitore VLAN o UUID di connessione:"
 
-#: ../clients/cli/connections.c:4556
-#, fuzzy
-msgid "Bridge device"
-msgstr "Dispositivo Ethernet"
+#: ../clients/cli/connections.c:5351 ../clients/cli/connections.c:6108
+msgid "Error: 'dev' is required."
+msgstr "Errore: è richiesto «dev»."
 
-#: ../clients/cli/connections.c:4558
-#, fuzzy
-msgid "Bridge port"
-msgstr "Bridge"
+#: ../clients/cli/connections.c:5355
+msgid "VLAN ID <0-4094>: "
+msgstr "ID VLAN <0-4094>: "
 
-#: ../clients/cli/connections.c:4560 ../src/nm-manager.c:3716
-msgid "VPN connection"
-msgstr "Connessione VPN"
+#: ../clients/cli/connections.c:5358 ../clients/cli/connections.c:6424
+msgid "Error: 'id' is required."
+msgstr "Errore: è richiesto «id»."
 
-#: ../clients/cli/connections.c:4562
-#, fuzzy
-msgid "OLPC Mesh connection"
-msgstr "Connessione CDMA"
+#: ../clients/cli/connections.c:5364
+#, c-format
+msgid "Error: 'id': '%s' is not valid; use <0-4094>."
+msgstr "Errore: «id»: «%s» non è valido; usare <0-4094>."
 
-#: ../clients/cli/connections.c:4564 ../src/devices/adsl/nm-device-adsl.c:133
-msgid "ADSL connection"
-msgstr "Connessione ADSL"
+#: ../clients/cli/connections.c:5374 ../clients/cli/connections.c:6116
+#, c-format
+msgid "Error: 'dev': '%s' is neither UUID, interface name, nor MAC."
+msgstr ""
+"Errore: «dev»: «%s» non è né uno UUID né il nome di un'interfaccia né un MAC."
+""
 
-#: ../clients/cli/connections.c:4566
-#, fuzzy
-msgid "macvlan connection"
-msgstr "Connessione aggregata"
+#: ../clients/cli/connections.c:5506
+#, c-format
+msgid "Error: 'mode': %s."
+msgstr "Errore: «mode»: %s"
 
-#: ../clients/cli/connections.c:4568 ../src/devices/nm-device-vxlan.c:374
-#, fuzzy
-msgid "VXLAN connection"
-msgstr "Connessione VLAN %d"
+#: ../clients/cli/connections.c:5515
+#, c-format
+msgid "Error: 'primary': '%s' is not a valid interface name."
+msgstr "Errore: «primary»: «%s» non è un nome valido di interfaccia."
 
-#: ../clients/cli/connections.c:4570
-#, fuzzy
-msgid "Tun device"
-msgstr "Il dispositivo è stato rimosso"
+#: ../clients/cli/connections.c:5738
+#, c-format
+msgid "Error: 'stp': %s."
+msgstr "Errore: «stp»: %s."
 
-#: ../clients/cli/connections.c:4572
-#, fuzzy
-msgid "IPv4 protocol"
-msgstr "Protocollo ADSL"
+#: ../clients/cli/connections.c:5747
+#, c-format
+msgid "Error: 'multicast-snooping': %s."
+msgstr "Errore: 'multicast-snooping': %s."
 
-#: ../clients/cli/connections.c:4574
-#, fuzzy
-msgid "IPv6 protocol"
-msgstr "Protocollo ADSL"
+#: ../clients/cli/connections.c:5866
+#, c-format
+msgid "Error: 'hairpin': %s."
+msgstr "Errore: «hairpin»: %s."
+
+#: ../clients/cli/connections.c:5915
+msgid "Error: 'vpn-type' is required."
+msgstr "Errore: è richiesto «vpn-type»."
 
-#: ../clients/cli/connections.c:4657 ../clients/cli/utils.c:124
+#: ../clients/cli/connections.c:5922
 #, c-format
-msgid "Error: value for '%s' argument is required."
-msgstr "Errore: è richiesto il valore per l'argomento «%s»."
+msgid "Warning: 'vpn-type': %s not known.\n"
+msgstr "Attenzione: \"vpn-type\": %s sconosciuto.\n"
 
-#: ../clients/cli/connections.c:4663
+#: ../clients/cli/connections.c:5983
+#, c-format
+msgid "Error: 'channel': '%s' is not valid; use <1-13>."
+msgstr "Errore: «channel»: «%s» non è valido; usare <1-13>."
+
+#: ../clients/cli/connections.c:6034
+msgid "Username: "
+msgstr "Nome utente: "
+
+#: ../clients/cli/connections.c:6043
+#, c-format
+msgid "Protocol %s"
+msgstr "Protocollo %s"
+
+#: ../clients/cli/connections.c:6046
+msgid "Error: 'protocol' is required."
+msgstr "Errore: è richiesto \"protocollo\"."
+
+#: ../clients/cli/connections.c:6105
+msgid "MACVLAN parent device or connection UUID: "
+msgstr "Dispositivo genitore MACVLAN o UUID di connessione:"
+
+#: ../clients/cli/connections.c:6125 ../clients/cli/connections.c:6205
+#: ../clients/cli/connections.c:6307
+msgid "Error: 'mode' is required."
+msgstr "Errore: 'mode' richiesta."
+
+#: ../clients/cli/connections.c:6131
+msgid "Error: 'mode' is not valid."
+msgstr "Errore: 'mode' non valida."
+
+#: ../clients/cli/connections.c:6144
+#, c-format
+msgid "Error: 'tap': %s."
+msgstr "Errore: «tap»: %s."
+
+#: ../clients/cli/connections.c:6230
+#, c-format
+msgid "Error: 'pi': %s."
+msgstr "Errore: «pi»: %s."
+
+#: ../clients/cli/connections.c:6241
+#, c-format
+msgid "Error: 'vnet-hdr': %s."
+msgstr "Errore: «vnet-hdr»: %s."
+
+#: ../clients/cli/connections.c:6252
+#, c-format
+msgid "Error: 'multi-queue': %s."
+msgstr "Errore: «multi-queue»: %s."
+
+#: ../clients/cli/connections.c:6321
+#, c-format
+msgid "Error: 'mode': '%s' is not valid, use one of %s"
+msgstr "Errore: «mode»: «%s» non è valido; %s "
+
+#: ../clients/cli/connections.c:6327
+msgid "Remote endpoint: "
+msgstr "Punto finale remoto: "
+
+#: ../clients/cli/connections.c:6330 ../clients/cli/connections.c:6432
+msgid "Error: 'remote' is required."
+msgstr "Errore: 'remote' richiesta."
+
+#: ../clients/cli/connections.c:6337
+#, c-format
+msgid "Error: 'remote': '%s' is not valid; must be an IP address"
+msgstr "Errore: 'remote': '%s' non valido; deve essere un indirizzo IP"
+
+#: ../clients/cli/connections.c:6351
+#, c-format
+msgid "Error: 'local': '%s' is not valid; must be an IP address"
+msgstr "Errore: 'local': '%s' non valido; deve essere un indirizzo IP"
+
+#: ../clients/cli/connections.c:6360 ../clients/cli/connections.c:6455
+#, c-format
+msgid "Error: 'dev': '%s' is neither UUID nor interface name."
+msgstr "Errore: 'dev': '%s' non è un UUID, né un nome di interfaccia."
+
+#: ../clients/cli/connections.c:6421
+msgid "VXLAN ID: "
+msgstr "VXLAN ID: "
+
+#: ../clients/cli/connections.c:6429
+msgid "Remote: "
+msgstr "Remoto: "
+
+#: ../clients/cli/connections.c:6438
+#, c-format
+msgid "Error: 'id': '%s' is not valid; use <0-16777215>."
+msgstr "Errore: «id»: «%s» non è valido; usare <0-16777215>."
+
+#: ../clients/cli/connections.c:6464
+#, c-format
+msgid "Error: 'remote': '%s' is not a valid IP address"
+msgstr "Errore: 'remote': '%s' non è un indirizzo IP valido"
+
+#: ../clients/cli/connections.c:6473
+#, c-format
+msgid "Error: 'local': '%s' is not a valid IP address"
+msgstr "Errore: 'local': '%s' non è un indirizzo IP valido"
+
+#: ../clients/cli/connections.c:6482
+#, c-format
+msgid "Error: 'source-port-min': %s is not valid; use <0-65535>."
+msgstr "Errore: «source-port-min»: «%s» non è valido; usare <0-65535>."
+
+#: ../clients/cli/connections.c:6491
+#, c-format
+msgid "Error: 'source-port-max': %s is not valid; use <0-65535>."
+msgstr "Errore: «source-port-max»: «%s» non è valido; usare <0-65535>."
+
+#: ../clients/cli/connections.c:6500
+#, c-format
+msgid "Error: 'destination-port': %s is not valid; use <0-65535>."
+msgstr "Errore: «destination-port»: «%s» non è valido; usare <0-65535>."
+
+#: ../clients/cli/connections.c:6540
+#, c-format
+msgid "Error: '%s' is not a valid connection type."
+msgstr "Errore: «%s» non è tipo di connessione valido."
+
+#: ../clients/cli/connections.c:6581
+#, c-format
+msgid "Error: IPv4 gateway specified without IPv4 addresses"
+msgstr "Errore: gateway IPv4 specificato senza indirizzo IPv4"
+
+#: ../clients/cli/connections.c:6585
+#, c-format
+msgid "Error: multiple IPv4 gateways specified"
+msgstr "Errore: molteplici gateway IPv4 specificati"
+
+#: ../clients/cli/connections.c:6589
+#, c-format
+msgid "Error: Invalid IPv4 gateway '%s'"
+msgstr "Errore: gateway IPv4 \"%s\" non valido"
+
+#: ../clients/cli/connections.c:6614
+#, c-format
+msgid "Error: IPv6 gateway specified without IPv6 addresses"
+msgstr "Errore: gateway IPv6 specificato senza indirizzo IPv6"
+
+#: ../clients/cli/connections.c:6618
+#, c-format
+msgid "Error: multiple IPv6 gateways specified"
+msgstr "Errore: molteplici gateway IPv6 specificati"
+
+#: ../clients/cli/connections.c:6622
+#, c-format
+msgid "Error: Invalid IPv6 gateway '%s'"
+msgstr "Errore: gateway IPv6 \"%s\" non valido"
+
+#: ../clients/cli/connections.c:6670 ../clients/cli/connections.c:10223
+#, c-format
+msgid "Error: Failed to add '%s' connection: %s"
+msgstr "Errore: aggiunta della connessione \"%s\" non riuscita: %s"
+
+#: ../clients/cli/connections.c:6675
+#, c-format
+msgid "Connection '%s' (%s) successfully added.\n"
+msgstr "Connessione «%s» (%s) aggiunta con successo.\n"
+
+#: ../clients/cli/connections.c:6951 ../clients/cli/connections.c:10678
+#, c-format
+msgid "Error: 'type' argument is required."
+msgstr "Errore: è richiesto l'argomento «type»."
+
+#: ../clients/cli/connections.c:6959
+#, c-format
+msgid "Error: invalid connection type; %s."
+msgstr "Errore: tipo di connessione non valido; %s."
+
+#: ../clients/cli/connections.c:6968 ../clients/cli/devices.c:2164
+#, c-format
+msgid "Error: 'autoconnect': %s."
+msgstr "Errore: «autoconnect»: %s."
+
+#: ../clients/cli/connections.c:6978
 #, c-format
 msgid "Error: 'save': %s."
 msgstr "Errore: \"save\": %s."
 
-#: ../clients/cli/connections.c:4732
-#, fuzzy, c-format
-msgid "Error: '%s' argument is required."
-msgstr "Errore: è richiesto l'argomento «type»."
+#: ../clients/cli/connections.c:6995
+msgid "Interface name [*]: "
+msgstr "Nome interfaccia [*]: "
+
+#: ../clients/cli/connections.c:7000
+#, c-format
+msgid "Error: 'ifname' argument is required."
+msgstr "Errore: è richiesto l'argomento «ifname»."
+
+#: ../clients/cli/connections.c:7002
+#, c-format
+msgid "Error: mandatory 'ifname' not seen before '%s'."
+msgstr "Errore: \"ifname\" obbligatorio non trovato prima di \"%s\"."
+
+#: ../clients/cli/connections.c:7011
+#, c-format
+msgid "Error: 'ifname': '%s' is not a valid interface nor '*'."
+msgstr "Errore: «ifname»: «%s» e «*» non sono interfacce valide."
 
-#: ../clients/cli/connections.c:5701
+#: ../clients/cli/connections.c:8035
 #, c-format
 msgid "['%s' setting values]\n"
 msgstr "[impostazione valori di «%s»]\n"
 
 #. TRANSLATORS: do not translate command names and keywords before ::
 #. *              However, you should translate terms enclosed in <>.
-#.
-#: ../clients/cli/connections.c:5783
+#. 
+#: ../clients/cli/connections.c:8117
 #, c-format
 msgid ""
 "---[ Main menu ]---\n"
@@ -2395,11 +2852,9 @@ msgstr ""
 "---[ Menù principale ]---\n"
 "goto     [<impostazione> | <prop>]      :: Va a un'impostazione o proprietà\n"
 "remove   <impostazione>[.<prop>] | <prop>\n"
-"                                        :: Rimuove impostazione o "
-"ripristina\n"
+"                                        :: Rimuove impostazione o ripristina\n"
 "                                           il valore di una proprietà\n"
-"set      [<impostazione>.<prop> <val>]  :: Imposta il valore della "
-"proprietà\n"
+"set      [<impostazione>.<prop> <val>]  :: Imposta il valore della proprietà\n"
 "describe [<impostazione>.<prop>]        :: Descrive la proprietà\n"
 "print    [all | <impostazione>[.<propr>]\n"
 "                                        :: Stampa la connessione\n"
@@ -2412,7 +2867,7 @@ msgstr ""
 "mmcli    <opzione-conf> <val>           :: Configurazione di nmcli\n"
 "quit                                    :: Esce da nmcli\n"
 
-#: ../clients/cli/connections.c:5810
+#: ../clients/cli/connections.c:8144
 #, c-format
 msgid ""
 "goto <setting>[.<prop>] | <prop>  :: enter setting/property for editing\n"
@@ -2432,13 +2887,12 @@ msgstr ""
 "        nmcli connection> goto secondaries\n"
 "        nmcli> goto ipv4.addresses\n"
 
-#: ../clients/cli/connections.c:5817
+#: ../clients/cli/connections.c:8151
 #, c-format
 msgid ""
 "remove <setting>[.<prop>]  :: remove setting or reset property value\n"
 "\n"
-"This command removes an entire setting from the connection, or if a "
-"property\n"
+"This command removes an entire setting from the connection, or if a property\n"
 "is given, resets that property to the default value.\n"
 "\n"
 "Examples: nmcli> remove wifi-sec\n"
@@ -2453,7 +2907,7 @@ msgstr ""
 "Esempi: nmcli> remove wifi-sec\n"
 "        nmcli> remove eth.mtu\n"
 
-#: ../clients/cli/connections.c:5824
+#: ../clients/cli/connections.c:8158
 #, c-format
 msgid ""
 "set [<setting>.<prop> <value>]  :: set property value\n"
@@ -2468,7 +2922,7 @@ msgstr ""
 "\n"
 "Esempio: nmcli> set con.id La mia connessione\n"
 
-#: ../clients/cli/connections.c:5829
+#: ../clients/cli/connections.c:8163
 #, c-format
 msgid ""
 "describe [<setting>.<prop>]  :: describe property\n"
@@ -2478,12 +2932,11 @@ msgid ""
 msgstr ""
 "describe [<impostazione>.<prop>]  :: Descrive la proprietà\n"
 "\n"
-"Mostra la descrizione della proprietà. Per maggiori informazioni su tutte "
-"le\n"
+"Mostra la descrizione della proprietà. Per maggiori informazioni su tutte le\n"
 "impostazioni e proprietà di NM, consultare la pagina di manuale nm-"
 "settings(5).\n"
 
-#: ../clients/cli/connections.c:5834
+#: ../clients/cli/connections.c:8168
 #, c-format
 msgid ""
 "print [all]  :: print setting or connection values\n"
@@ -2498,14 +2951,13 @@ msgstr ""
 "\n"
 "Esempio: nmcli ipv4> print all\n"
 
-#: ../clients/cli/connections.c:5839
+#: ../clients/cli/connections.c:8173
 #, c-format
 msgid ""
 "verify [all | fix]  :: verify setting or connection validity\n"
 "\n"
 "Verifies whether the setting or connection is valid and can be saved later.\n"
-"It indicates invalid values on error. Some errors may be fixed "
-"automatically\n"
+"It indicates invalid values on error. Some errors may be fixed automatically\n"
 "by 'fix' option.\n"
 "\n"
 "Examples: nmcli> verify\n"
@@ -2523,7 +2975,7 @@ msgstr ""
 "        nmcli> verify fix\n"
 "        nmcli bond> verify\n"
 
-#: ../clients/cli/connections.c:5848
+#: ../clients/cli/connections.c:8182
 #, c-format
 msgid ""
 "save [persistent|temporary]  :: save the connection\n"
@@ -2547,13 +2999,13 @@ msgstr ""
 "mantenute\n"
 "ai successivi riavvii. Ulteriori modifiche possono essere anch'esse "
 "temporanee\n"
-"o permanenti, ma tutte quelle temporanee non verrano mantenute tra i "
-"riavvii.\n"
+"o permanenti, ma tutte quelle temporanee non verrano mantenute tra i riavvii."
+"\n"
 "Per rimuovere completamente la connessione permanente, è necessario "
 "eliminare\n"
 "definitivamente il profilo.\n"
 
-#: ../clients/cli/connections.c:5859
+#: ../clients/cli/connections.c:8193
 #, c-format
 msgid ""
 "activate [<ifname>] [/<ap>|<nsp>]  :: activate the connection\n"
@@ -2571,29 +3023,25 @@ msgstr ""
 "\n"
 "Opzioni disponibili:\n"
 "<nomeif>    - Device su cui la connessione verrà attivata\n"
-"/<ap>|<nsp> - AP (Wi-Fi) o NSP (WiMAX) (iniziare con / quando "
-"<ifname>              non è specificato)\n"
+"/<ap>|<nsp> - AP (Wi-Fi) o NSP (WiMAX) (iniziare con / quando <ifname>       "
+"       non è specificato)\n"
 
-#: ../clients/cli/connections.c:5866 ../clients/cli/connections.c:6025
+#: ../clients/cli/connections.c:8200 ../clients/cli/connections.c:8359
 #, c-format
-msgid ""
-"back  :: go to upper menu level\n"
+msgid "back  :: go to upper menu level\n"
 "\n"
-msgstr ""
-"back  :: Va al livello superiore del menù\n"
+msgstr "back  :: Va al livello superiore del menù\n"
 "\n"
 
-#: ../clients/cli/connections.c:5869
+#: ../clients/cli/connections.c:8203
 #, c-format
-msgid ""
-"help/? [<command>]  :: help for the nmcli commands\n"
+msgid "help/? [<command>]  :: help for the nmcli commands\n"
 "\n"
-msgstr ""
-"help/? [<comando>]  :: Aiuto per i comandi nmcli\n"
+msgstr "help/? [<comando>]  :: Aiuto per i comandi nmcli\n"
 "\n"
 
-#: ../clients/cli/connections.c:5872
-#, fuzzy, c-format
+#: ../clients/cli/connections.c:8206
+#, c-format
 msgid ""
 "nmcli [<conf-option> <value>]  :: nmcli configuration\n"
 "\n"
@@ -2607,18 +3055,19 @@ msgid ""
 "          nmcli> nmcli save-confirmation no\n"
 "          nmcli> nmcli prompt-color 3\n"
 msgstr ""
-"nmcli [<opzione-conf> <val>]  :: Configurazione di nmcli\n"
+"nmcli [<opzione-conf> <valore>]  :: nmcli configuration\n"
 "\n"
-"Configure nmcli. Sono disponibile le seguenti opzioni:\n"
-"status-line yes | no        [predefinito: no]\n"
-"save-confirmation yes | no  [predefinito: yes]\n"
-"prompt-color <0-8>          [predefinito: 0]\n"
+"Configura nmcli. Sono disponibili le seguenti opzioni:\n"
+"status-line yes | no          [default: no]\n"
+"save-confirmation yes | no    [default: yes]\n"
+"show-secrets yes | no         [default: no]\n"
+"prompt-color <colore> | <0-8>  [default: 0]\n"
 "%s\n"
 "Esempi: 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:5894 ../clients/cli/connections.c:6031
+#: ../clients/cli/connections.c:8228 ../clients/cli/connections.c:8365
 #, c-format
 msgid ""
 "quit  :: exit nmcli\n"
@@ -2632,16 +3081,16 @@ msgstr ""
 "salvata,\n"
 "viene richiesto di confermare l'azione.\n"
 
-#: ../clients/cli/connections.c:5899 ../clients/cli/connections.c:6036
-#: ../clients/cli/connections.c:6460 ../clients/cli/connections.c:7407
+#: ../clients/cli/connections.c:8233 ../clients/cli/connections.c:8370
+#: ../clients/cli/connections.c:8794 ../clients/cli/connections.c:9742
 #, c-format
 msgid "Unknown command: '%s'\n"
 msgstr "Comando sconosciuto «%s»\n"
 
 #. TRANSLATORS: do not translate command names and keywords before ::
 #. *              However, you should translate terms enclosed in <>.
-#.
-#: ../clients/cli/connections.c:5965
+#. 
+#: ../clients/cli/connections.c:8299
 #, c-format
 msgid ""
 "---[ Property menu ]---\n"
@@ -2671,7 +3120,7 @@ msgstr ""
 "                                      comando\n"
 "quit                               :: Esce da nmcli\n"
 
-#: ../clients/cli/connections.c:5990
+#: ../clients/cli/connections.c:8324
 #, c-format
 msgid ""
 "set [<value>]  :: set new value\n"
@@ -2682,7 +3131,7 @@ msgstr ""
 "\n"
 "Questo comando imposta il <valore> fornito a questa proprietà.\n"
 
-#: ../clients/cli/connections.c:5994
+#: ../clients/cli/connections.c:8328
 #, c-format
 msgid ""
 "add [<value>]  :: append new value to the property\n"
@@ -2697,7 +3146,7 @@ msgstr ""
 "tipo contenitore. Per proprietà a valore singolo rimpiazza il valore (come "
 "il comando \"set\").\n"
 
-#: ../clients/cli/connections.c:6000
+#: ../clients/cli/connections.c:8334
 #, c-format
 msgid ""
 "change  :: change current value\n"
@@ -2708,7 +3157,7 @@ msgstr ""
 "\n"
 "Visualizza il valore attuale e consente di modificarlo.\n"
 
-#: ../clients/cli/connections.c:6004
+#: ../clients/cli/connections.c:8338
 #, c-format
 msgid ""
 "remove [<value>|<index>|<option name>]  :: delete the value\n"
@@ -2731,11 +3180,9 @@ msgstr ""
 "\n"
 "Rimuove il valore della proprietà. Per proprietà di un solo valore, "
 "ripristina\n"
-"il valore predefinito. Per proprietà contenitore, ciò rimuove tutti i "
-"valori\n"
+"il valore predefinito. Per proprietà contenitore, ciò rimuove tutti i valori\n"
 "della proprietà oppure è possibile specificare un parametro per rimuovere\n"
-"solamente un singolo elemento o una singola opzione. Il parametro può "
-"essere\n"
+"solamente un singolo elemento o una singola opzione. Il parametro può essere\n"
 "l'indice dell'elemento da rimuovere o un nome di opzione (per proprietà con\n"
 "opzioni con nome).\n"
 "\n"
@@ -2744,7 +3191,7 @@ msgstr ""
 "        nmcli bond.options> remove downdelay\n"
 "\n"
 
-#: ../clients/cli/connections.c:6015
+#: ../clients/cli/connections.c:8349
 #, c-format
 msgid ""
 "describe  :: describe property\n"
@@ -2754,12 +3201,11 @@ msgid ""
 msgstr ""
 "describe  :: Descrive la proprietà\n"
 "\n"
-"Mostra la descrizione della proprietà. Per maggiori informazioni su tutte "
-"le\n"
+"Mostra la descrizione della proprietà. Per maggiori informazioni su tutte le\n"
 "impostazioni e proprietà di NM, consultare la pagina di manuale nm-"
 "settings(5).\n"
 
-#: ../clients/cli/connections.c:6020
+#: ../clients/cli/connections.c:8354
 #, c-format
 msgid ""
 "print [property|setting|connection]  :: print property (setting, connection) "
@@ -2771,36 +3217,38 @@ msgstr ""
 "print [property|setting|connection]  :: Stampa i valori della properità,\n"
 "                                        impostazione o connessione\n"
 "\n"
-"Mostra il valore della proprietà. Se viene fornito un argomento, è "
-"possibile\n"
+"Mostra il valore della proprietà. Se viene fornito un argomento, è possibile\n"
 "visualizzare i valori per l'impostazione o la connessione.\n"
 
-#: ../clients/cli/connections.c:6028
+#: ../clients/cli/connections.c:8362
 #, c-format
-msgid ""
-"help/? [<command>]  :: help for nmcli commands\n"
+msgid "help/? [<command>]  :: help for nmcli commands\n"
 "\n"
-msgstr ""
-"help/? [<comando>]  :: Aiuto per i comandi di nmcli\n"
+msgstr "help/? [<comando>]  :: Aiuto per i comandi di nmcli\n"
 "\n"
 
-#: ../clients/cli/connections.c:6209
+#: ../clients/cli/connections.c:8460
+#, c-format
+msgid "Error: Connection activation failed.\n"
+msgstr "Errore: attivazione connessione non riuscita.\n"
+
+#: ../clients/cli/connections.c:8543
 #, c-format
 msgid "Error: setting '%s' is mandatory and cannot be removed.\n"
 msgstr "Errore: l'impostazione «%s» è obbligatoria e non può essere rimossa.\n"
 
 #. TRANSLATORS: status line in nmcli connection editor
-#: ../clients/cli/connections.c:6227
+#: ../clients/cli/connections.c:8561
 #, c-format
 msgid "[ Type: %s | Name: %s | UUID: %s | Dirty: %s | Temp: %s ]\n"
 msgstr "[ Tipo: %s | Nome: %s | UUID: %s | Dirty: %s | Temp: %s ]\n"
 
-#: ../clients/cli/connections.c:6263
+#: ../clients/cli/connections.c:8597
 #, c-format
 msgid "The connection is not saved. Do you really want to quit? %s"
 msgstr "La connessione non è stata salvata. Uscire veramente? %s"
 
-#: ../clients/cli/connections.c:6312
+#: ../clients/cli/connections.c:8646
 #, c-format
 msgid ""
 "The connection profile has been removed from another client. You may type "
@@ -2809,66 +3257,66 @@ msgstr ""
 "Il profilo della connessione è stato rimosso da un altro client. È possibile "
 "digitare \"save\" nel menù principale per ripristinarla.\n"
 
-#: ../clients/cli/connections.c:6337 ../clients/cli/connections.c:6758
-#: ../clients/cli/connections.c:6816
+#: ../clients/cli/connections.c:8671 ../clients/cli/connections.c:9093
+#: ../clients/cli/connections.c:9151
 #, c-format
 msgid "Allowed values for '%s' property: %s\n"
 msgstr "Valori consentiti per la proprietà «%s»: %s\n"
 
-#: ../clients/cli/connections.c:6341 ../clients/cli/connections.c:6762
-#: ../clients/cli/connections.c:6820
+#: ../clients/cli/connections.c:8675 ../clients/cli/connections.c:9097
+#: ../clients/cli/connections.c:9155
 #, c-format
 msgid "Enter '%s' value: "
 msgstr "Inserire il valore per «%s»:"
 
-#: ../clients/cli/connections.c:6356 ../clients/cli/connections.c:6378
-#: ../clients/cli/connections.c:6766 ../clients/cli/connections.c:6825
+#: ../clients/cli/connections.c:8690 ../clients/cli/connections.c:8712
+#: ../clients/cli/connections.c:9101 ../clients/cli/connections.c:9160
 #, c-format
 msgid "Error: failed to set '%s' property: %s\n"
 msgstr "Errore: impostazione della proprietà «%s» non riuscita: %s\n"
 
-#: ../clients/cli/connections.c:6372
+#: ../clients/cli/connections.c:8706
 #, c-format
 msgid "Edit '%s' value: "
 msgstr "Modifica valore di «%s»: "
 
-#: ../clients/cli/connections.c:6401
+#: ../clients/cli/connections.c:8735
 #, c-format
 msgid "Error: %s\n"
 msgstr "Errore: %s\n"
 
-#: ../clients/cli/connections.c:6407 ../clients/cli/connections.c:6907
-#: ../clients/cli/connections.c:6955
+#: ../clients/cli/connections.c:8741 ../clients/cli/connections.c:9242
+#: ../clients/cli/connections.c:9290
 #, c-format
 msgid "Error: failed to remove value of '%s': %s\n"
 msgstr "Errore: rimozione del valore di «%s» non riuscita: %s\n"
 
-#: ../clients/cli/connections.c:6428
+#: ../clients/cli/connections.c:8762
 #, c-format
 msgid "Unknown command argument: '%s'\n"
 msgstr "Argomento sconosciuto del comando: «%s»\n"
 
-#: ../clients/cli/connections.c:6533
+#: ../clients/cli/connections.c:8867
 #, c-format
 msgid "Available settings: %s\n"
 msgstr "Impostazioni disponibili: %s\n"
 
-#: ../clients/cli/connections.c:6545
+#: ../clients/cli/connections.c:8879
 #, c-format
 msgid "Error: invalid setting name; %s\n"
 msgstr "Errore: nome impostazione non valido; %s\n"
 
-#: ../clients/cli/connections.c:6562
+#: ../clients/cli/connections.c:8896
 #, c-format
 msgid "Available properties: %s\n"
 msgstr "Proprietà disponibili: %s\n"
 
-#: ../clients/cli/connections.c:6570
+#: ../clients/cli/connections.c:8904
 #, c-format
 msgid "Error: property %s\n"
 msgstr "Errore: proprietà %s\n"
 
-#: ../clients/cli/connections.c:6611
+#: ../clients/cli/connections.c:8945
 #, c-format
 msgid ""
 "Saving the connection with 'autoconnect=yes'. That might result in an "
@@ -2879,12 +3327,12 @@ msgstr ""
 "connessione immediatamente.\n"
 "Salvarla veramente? %s"
 
-#: ../clients/cli/connections.c:6700
+#: ../clients/cli/connections.c:9035
 #, c-format
 msgid "You may edit the following settings: %s\n"
 msgstr "È possibile modificare le seguenti impostazioni: %s\n"
 
-#: ../clients/cli/connections.c:6728
+#: ../clients/cli/connections.c:9063
 #, c-format
 msgid ""
 "The connection profile has been removed from another client. You may type "
@@ -2893,221 +3341,221 @@ msgstr ""
 "Il profilo della connessione è stato rimosso da un altro client. È possibile "
 "digitare \"save\" per ripristinarla.\n"
 
-#: ../clients/cli/connections.c:6770 ../clients/cli/connections.c:7000
+#: ../clients/cli/connections.c:9105 ../clients/cli/connections.c:9335
 #, c-format
 msgid "Error: no setting selected; valid are [%s]\n"
 msgstr "Errore: selezione non impostata; valori validi sono [%s]\n"
 
-#: ../clients/cli/connections.c:6771
+#: ../clients/cli/connections.c:9106
 #, c-format
 msgid "use 'goto <setting>' first, or 'set <setting>.<property>'\n"
 msgstr "Prima usare «goto <impostazione>» o «set <impostazione>.<proprietà>»\n"
 
-#: ../clients/cli/connections.c:6785 ../clients/cli/connections.c:6934
-#: ../clients/cli/connections.c:7022
+#: ../clients/cli/connections.c:9120 ../clients/cli/connections.c:9269
+#: ../clients/cli/connections.c:9357
 #, c-format
 msgid "Error: invalid setting argument '%s'; valid are [%s]\n"
 msgstr ""
 "Errore: argomento «%s» dell'impostazione non valido; valori validi sono "
 "[%s]\n"
 
-#: ../clients/cli/connections.c:6795
+#: ../clients/cli/connections.c:9130
 #, c-format
 msgid "Error: missing setting for '%s' property\n"
 msgstr "Errore: manca l'impostazione per la proprietà «%s»\n"
 
-#: ../clients/cli/connections.c:6802
+#: ../clients/cli/connections.c:9137
 #, c-format
 msgid "Error: invalid property: %s\n"
 msgstr "Errore: proprità non valida: %s\n"
 
-#: ../clients/cli/connections.c:6855
+#: ../clients/cli/connections.c:9190
 #, c-format
 msgid "Error: unknown setting '%s'\n"
 msgstr "Errore: impostazione «%s» sconosciuta\n"
 
-#: ../clients/cli/connections.c:6868
+#: ../clients/cli/connections.c:9203
 #, c-format
 msgid "You may edit the following properties: %s\n"
 msgstr "È possibile modificare le seguenti proprietà: %s\n"
 
-#: ../clients/cli/connections.c:6912
+#: ../clients/cli/connections.c:9247
 #, c-format
 msgid "Error: no argument given; valid are [%s]\n"
 msgstr "Errore: nessun argomento fornito; argomenti validi sono [%s]\n"
 
-#: ../clients/cli/connections.c:6931
+#: ../clients/cli/connections.c:9266
 #, c-format
 msgid "Setting '%s' is not present in the connection.\n"
 msgstr "L'impostazione «%s» non è presente nella connessione.\n"
 
-#: ../clients/cli/connections.c:6976
+#: ../clients/cli/connections.c:9311
 #, c-format
 msgid "Error: %s properties, nor it is a setting name.\n"
 msgstr "Errore: proprietà %s, non è nemmeno il nome di un'impostazione.\n"
 
-#: ../clients/cli/connections.c:7001
+#: ../clients/cli/connections.c:9336
 #, c-format
 msgid "use 'goto <setting>' first, or 'describe <setting>.<property>'\n"
 msgstr ""
 "Prima usare «goto <impostazione>» o «describe <impostazione>.<proprietà>»\n"
 
-#: ../clients/cli/connections.c:7050
+#: ../clients/cli/connections.c:9385
 #, c-format
 msgid "Error: invalid property: %s, neither a valid setting name.\n"
 msgstr ""
 "Errore: proprietà non valida: %s, non è nemmeno il nome valido di "
 "un'impostazione.\n"
 
-#: ../clients/cli/connections.c:7082
+#: ../clients/cli/connections.c:9417
 #, c-format
 msgid "Error: unknown setting: '%s'\n"
 msgstr "Errore: impostazione sconosciuta: «%s»\n"
 
-#: ../clients/cli/connections.c:7087
+#: ../clients/cli/connections.c:9422
 #, c-format
 msgid "Error: '%s' setting not present in the connection\n"
 msgstr "Errore: impostazione \"%s\" non presente nella connessione\n"
 
-#: ../clients/cli/connections.c:7115
+#: ../clients/cli/connections.c:9450
 #, c-format
 msgid "Error: invalid property: %s%s\n"
 msgstr "Errore: proprietà non valida: %s%s\n"
 
-#: ../clients/cli/connections.c:7117
+#: ../clients/cli/connections.c:9452
 msgid ", neither a valid setting name"
 msgstr ", non è nemmeno il nome valido di un'impostazione"
 
-#: ../clients/cli/connections.c:7134
+#: ../clients/cli/connections.c:9469
 #, c-format
 msgid "Invalid verify option: %s\n"
 msgstr "Opzione di verifica non valida: %s\n"
 
-#: ../clients/cli/connections.c:7142
+#: ../clients/cli/connections.c:9477
 #, c-format
 msgid "Verify setting '%s': %s\n"
 msgstr "Verifica dell'impostazione «%s»: %s\n"
 
-#: ../clients/cli/connections.c:7157
+#: ../clients/cli/connections.c:9492
 #, c-format
 msgid "Verify connection: %s\n"
 msgstr "Verifica della connessione: %s\n"
 
-#: ../clients/cli/connections.c:7160
+#: ../clients/cli/connections.c:9495
 #, c-format
 msgid "The error cannot be fixed automatically.\n"
 msgstr "L'errore non può essere corretto automaticamente.\n"
 
-#: ../clients/cli/connections.c:7177
+#: ../clients/cli/connections.c:9512
 #, c-format
 msgid "Error: invalid argument '%s'\n"
 msgstr "Errore: parametro \"%s\" non valido\n"
 
-#: ../clients/cli/connections.c:7210
+#: ../clients/cli/connections.c:9545
 #, c-format
 msgid "Error: Failed to save '%s' (%s) connection: %s\n"
 msgstr "Errore: salvataggio della connessione \"%s\" (%s) non riuscita: %s\n"
 
-#: ../clients/cli/connections.c:7217
+#: ../clients/cli/connections.c:9552
 #, c-format
 msgid "Connection '%s' (%s) successfully saved.\n"
 msgstr "Connessione «%s» (%s) salvata con successo.\n"
 
-#: ../clients/cli/connections.c:7218
+#: ../clients/cli/connections.c:9553
 #, c-format
 msgid "Connection '%s' (%s) successfully updated.\n"
 msgstr "Connessione \"%s\" (%s) aggiornata con successo.\n"
 
-#: ../clients/cli/connections.c:7251
+#: ../clients/cli/connections.c:9586
 #, c-format
 msgid "Error: connection verification failed: %s\n"
 msgstr "Errore: verifica della connessione non riuscita: %s\n"
 
-#: ../clients/cli/connections.c:7252
+#: ../clients/cli/connections.c:9587
 msgid "(unknown error)"
 msgstr "(errore sconosciuto)"
 
-#: ../clients/cli/connections.c:7253
+#: ../clients/cli/connections.c:9588
 #, c-format
 msgid "You may try running 'verify fix' to fix errors.\n"
 msgstr "Provare a eseguire \"verify fix\" per correggere gli errori.\n"
 
-#: ../clients/cli/connections.c:7275
+#: ../clients/cli/connections.c:9610
 #, c-format
 msgid "Error: connection is not saved. Type 'save' first.\n"
 msgstr "Errore: la connessione non è stata salvata. Digitare «save».\n"
 
-#: ../clients/cli/connections.c:7279
+#: ../clients/cli/connections.c:9614
 #, c-format
 msgid "Error: connection is not valid: %s\n"
 msgstr "Errore: la connessione non è valida: %s\n"
 
-#: ../clients/cli/connections.c:7289
+#: ../clients/cli/connections.c:9624
 #, c-format
 msgid "Error: Cannot activate connection: %s.\n"
 msgstr "Errore: impossibile attivare la connessione: %s.\n"
 
-#: ../clients/cli/connections.c:7299
+#: ../clients/cli/connections.c:9634
 #, c-format
 msgid "Error: Failed to activate '%s' (%s) connection: %s\n"
 msgstr "Errore: attivazione della connessione \"%s\" (%s) non riuscita: %s\n"
 
-#: ../clients/cli/connections.c:7305
+#: ../clients/cli/connections.c:9640
 #, c-format
 msgid "Monitoring connection activation (press any key to continue)\n"
 msgstr ""
 "Monitoraggio attivazione connessione (premere un tasto per continuare)\n"
 
-#: ../clients/cli/connections.c:7343
+#: ../clients/cli/connections.c:9678
 #, c-format
 msgid "Error: status-line: %s\n"
 msgstr "Errore: status-line: %s\n"
 
-#: ../clients/cli/connections.c:7351
+#: ../clients/cli/connections.c:9686
 #, c-format
 msgid "Error: save-confirmation: %s\n"
 msgstr "Errore: save-confirmation: %s\n"
 
-#: ../clients/cli/connections.c:7359
+#: ../clients/cli/connections.c:9694
 #, c-format
 msgid "Error: show-secrets: %s\n"
 msgstr "Errore: show-secrets: %s\n"
 
-#: ../clients/cli/connections.c:7368
-#, fuzzy, c-format
+#: ../clients/cli/connections.c:9703
+#, c-format
 msgid "Error: bad color: %s\n"
-msgstr "Errore: proprità non valida: %s\n"
+msgstr "Errore: colore errato: %s\n"
 
-#: ../clients/cli/connections.c:7382
+#: ../clients/cli/connections.c:9717
 #, c-format
 msgid "Current nmcli configuration:\n"
 msgstr "Configurazione di nmcli attuale:\n"
 
-#: ../clients/cli/connections.c:7392
+#: ../clients/cli/connections.c:9727
 #, c-format
 msgid "Invalid configuration option '%s'; allowed [%s]\n"
 msgstr "Opzione di configurazione «%s» non valida; consentito [%s]\n"
 
-#: ../clients/cli/connections.c:7593
+#: ../clients/cli/connections.c:9982
 #, c-format
 msgid "Error: only one of 'id', uuid, or 'path' can be provided."
 msgstr "Errore: solo uno tra «id», uuid o «path» può essere fornito."
 
-#: ../clients/cli/connections.c:7605 ../clients/cli/connections.c:7788
-#: ../clients/cli/connections.c:7795 ../clients/cli/connections.c:7929
-#: ../clients/cli/connections.c:8434
+#: ../clients/cli/connections.c:9994 ../clients/cli/connections.c:10171
+#: ../clients/cli/connections.c:10178 ../clients/cli/connections.c:10306
+#: ../clients/cli/connections.c:10782
 #, c-format
 msgid "Error: Unknown connection '%s'."
 msgstr "Errore: connessione «%s» sconosciuta."
 
-#: ../clients/cli/connections.c:7623
+#: ../clients/cli/connections.c:10012
 #, c-format
 msgid "Warning: editing existing connection '%s'; 'type' argument is ignored\n"
 msgstr ""
 "Attenzione: modifica della connessione esistente «%s»; l'argomento «type» "
 "viene ignorato\n"
 
-#: ../clients/cli/connections.c:7626
+#: ../clients/cli/connections.c:10015
 #, c-format
 msgid ""
 "Warning: editing existing connection '%s'; 'con-name' argument is ignored\n"
@@ -3115,242 +3563,223 @@ msgstr ""
 "Attenzione: modifica della connessione esistente «%s»; l'argomento «con-"
 "name» viene ignorato\n"
 
-#: ../clients/cli/connections.c:7640
+#: ../clients/cli/connections.c:10029
 #, c-format
 msgid "Valid connection types: %s\n"
 msgstr "Tipi di connessione validi: %s\n"
 
-#: ../clients/cli/connections.c:7642
+#: ../clients/cli/connections.c:10031
 #, c-format
 msgid "Error: invalid connection type; %s\n"
 msgstr "Errore: tipo di connessione non valido; %s\n"
 
-#: ../clients/cli/connections.c:7681
+#: ../clients/cli/connections.c:10070
 #, c-format
 msgid "===| nmcli interactive connection editor |==="
 msgstr "===| Editor interattivo di connessione nmcli |==="
 
-#: ../clients/cli/connections.c:7684
+#: ../clients/cli/connections.c:10073
 #, c-format
 msgid "Editing existing '%s' connection: '%s'"
 msgstr "Modifica della connessione esistente «%s»: «%s»"
 
-#: ../clients/cli/connections.c:7686
+#: ../clients/cli/connections.c:10075
 #, c-format
 msgid "Adding a new '%s' connection"
 msgstr "Aggiunta di una nuova connessione «%s»"
 
-#: ../clients/cli/connections.c:7688
+#: ../clients/cli/connections.c:10077
 #, c-format
 msgid "Type 'help' or '?' for available commands."
 msgstr "Digitare «help» o «?» per i comandi disponibili."
 
-#: ../clients/cli/connections.c:7690
+#: ../clients/cli/connections.c:10079
 #, c-format
 msgid "Type 'describe [<setting>.<prop>]' for detailed property description."
 msgstr ""
 "Digitare «describe [<impostazione>.<prop>]» per informazioni dettagliate "
 "sulla proprietà."
 
-#: ../clients/cli/connections.c:7728
+#: ../clients/cli/connections.c:10117
 #, c-format
 msgid "Error: Failed to modify connection '%s': %s"
 msgstr "Errore: modifica della connessione \"%s\" non riuscita: %s"
 
-#: ../clients/cli/connections.c:7735
+#: ../clients/cli/connections.c:10124
 #, c-format
 msgid "Connection '%s' (%s) successfully modified.\n"
 msgstr "Connessione «%s» (%s) modificata con successo.\n"
 
-#.
-#. * TODO(?) complete "uuid", "path", "id" or connection name.
-#. * (if we ever will move this here from shell completion script)
-#. if (nmc->complete) {
-#. quit ();
-#.
-#: ../clients/cli/connections.c:7761 ../clients/cli/connections.c:7885
-#: ../clients/cli/connections.c:8280 ../clients/cli/connections.c:8399
+#: ../clients/cli/connections.c:10146 ../clients/cli/connections.c:10262
+#: ../clients/cli/connections.c:10639 ../clients/cli/connections.c:10747
 #, c-format
 msgid "Error: No arguments provided."
 msgstr "Errore: non è stato fornito alcun argomento."
 
-#: ../clients/cli/connections.c:7847
+#: ../clients/cli/connections.c:10165 ../clients/cli/connections.c:10294
+#: ../clients/cli/connections.c:10776
+#, c-format
+msgid "Error: connection ID is missing."
+msgstr "Errore: manca l'ID della connessione."
+
+#: ../clients/cli/connections.c:10228
 #, c-format
 msgid "%s (%s) cloned as %s (%s).\n"
-msgstr ""
+msgstr "%s (%s) clonato come %s (%s).\n"
 
-#: ../clients/cli/connections.c:7883
-#, fuzzy
+#: ../clients/cli/connections.c:10260
 msgid "New connection name: "
-msgstr "Nuova connessione"
+msgstr "Nuova connessione nome:"
 
-#: ../clients/cli/connections.c:7904 ../clients/cli/connections.c:7922
-#, fuzzy, c-format
+#: ../clients/cli/connections.c:10281 ../clients/cli/connections.c:10299
+#, c-format
 msgid "Error: <new name> argument is missing."
-msgstr "Errore: manca l'argomento %s."
+msgstr "Errore: argomento <new name> assente."
 
-#: ../clients/cli/connections.c:7910
-#, fuzzy, c-format
-msgid "Error: unexpected extra argument '%s'."
-msgstr "Errore: argomento «%s» non atteso."
-
-#: ../clients/cli/connections.c:7917 ../clients/cli/connections.c:8428
+#: ../clients/cli/connections.c:10287
 #, c-format
-msgid "Error: connection ID is missing."
-msgstr "Errore: manca l'ID della connessione."
+msgid "Error: unexpected extra argument '%s'."
+msgstr "Errore: argomento extra imprevisto '%s'."
 
-#: ../clients/cli/connections.c:7979
+#: ../clients/cli/connections.c:10356
 #, c-format
 msgid "Error: not all connections deleted."
 msgstr "Errore: non tutte le connessioni sono state eliminate."
 
-#: ../clients/cli/connections.c:7980
+#: ../clients/cli/connections.c:10357
 #, c-format
 msgid "Error: Connection deletion failed: %s"
 msgstr "Errore: eliminazione connessione non riuscita: %s"
 
-#: ../clients/cli/connections.c:8046 ../clients/cli/connections.c:8179
+#: ../clients/cli/connections.c:10419 ../clients/cli/connections.c:10547
 #, c-format
 msgid "Error: unknown connection '%s'\n"
 msgstr "Errore: connessione sconosciuta \"%s\"\n"
 
-#: ../clients/cli/connections.c:8060
+#: ../clients/cli/connections.c:10433
 #, c-format
 msgid "Error: no connection provided."
 msgstr "Errore: nessuna connessione fornita."
 
 #. truncate trailing ", "
-#: ../clients/cli/connections.c:8085
+#: ../clients/cli/connections.c:10458
 #, c-format
 msgid "Error: cannot delete unknown connection(s): %s."
 msgstr "Errore: impossibile eliminare connessioni sconosciute: %s."
 
-#: ../clients/cli/connections.c:8097
-#, fuzzy, c-format
+#: ../clients/cli/connections.c:10470
+#, c-format
 msgid "%s: connection profile changed\n"
-msgstr "connessione non riuscita"
+msgstr "%s: profilo di connessione modificato\n"
 
-#: ../clients/cli/connections.c:8123
-#, fuzzy, c-format
+#: ../clients/cli/connections.c:10496
+#, c-format
 msgid "%s: connection profile created\n"
-msgstr "connessione non riuscita"
+msgstr "%s: profilo di connessione creato\n"
 
-#: ../clients/cli/connections.c:8132
-#, fuzzy, c-format
+#: ../clients/cli/connections.c:10505
+#, c-format
 msgid "%s: connection profile removed\n"
-msgstr "la connessione è stata rimossa"
+msgstr "%s: profilo di connessione rimosso\n"
 
-#: ../clients/cli/connections.c:8180
-#, fuzzy, c-format
+#: ../clients/cli/connections.c:10548
+#, c-format
 msgid "Error: not all connections found."
-msgstr "Errore: «%s» non è un comando «connection» valido."
+msgstr "Errore: impossibile trovare tutte le connessioni."
 
-#: ../clients/cli/connections.c:8205
+#: ../clients/cli/connections.c:10571
 #, c-format
 msgid "Error: failed to reload connections: %s."
 msgstr "Errore: ricaricamento della connessione non riuscito: %s."
 
-#: ../clients/cli/connections.c:8239
+#: ../clients/cli/connections.c:10603
 #, c-format
 msgid "Error: failed to load connection: %s."
 msgstr "Errore: caricamento connessione non riuscita: %s."
 
-#: ../clients/cli/connections.c:8247
+#: ../clients/cli/connections.c:10611
 #, c-format
 msgid "Could not load file '%s'\n"
 msgstr "Impossibile caricare il file «%s»\n"
 
-#: ../clients/cli/connections.c:8256
-#, fuzzy
+#: ../clients/cli/connections.c:10620
 msgid "File to import: "
-msgstr "Cifratura non riuscita: %d."
+msgstr "File da importare: "
 
-#: ../clients/cli/connections.c:8296
+#: ../clients/cli/connections.c:10655
 #, c-format
 msgid "Warning: 'type' already specified, ignoring extra one.\n"
-msgstr ""
+msgstr "Avvertenza: 'type' già specificato, ignorato quello supplementare.\n"
 
-#: ../clients/cli/connections.c:8307
+#: ../clients/cli/connections.c:10666
 #, c-format
 msgid "Warning: 'file' already specified, ignoring extra one.\n"
-msgstr ""
+msgstr "Avvertenza: 'file' già specificato, ignorato quello supplementare.\n"
 
-#: ../clients/cli/connections.c:8309
-#, fuzzy, c-format
+#: ../clients/cli/connections.c:10668
+#, c-format
 msgid "Unknown parameter: %s"
-msgstr "Parametro sconosciuto: %s\n"
+msgstr "Parametro sconosciuto: %s"
 
-#: ../clients/cli/connections.c:8319
+#: ../clients/cli/connections.c:10683
 #, c-format
-msgid "Error: 'type' argument is required."
-msgstr "Errore: è richiesto l'argomento «type»."
-
-#: ../clients/cli/connections.c:8324
-#, fuzzy, c-format
 msgid "Error: 'file' argument is required."
-msgstr "Errore: è richiesto l'argomento «ifname»."
+msgstr "Errore: argomento 'file' obbligatorio."
 
-#: ../clients/cli/connections.c:8331
-#, fuzzy, c-format
-msgid "Error: failed to find VPN plugin for %s."
-msgstr "Errore: modifica di %s.%s non riuscita: %s."
-
-#: ../clients/cli/connections.c:8339 ../clients/cli/connections.c:8450
-#, fuzzy, c-format
+#: ../clients/cli/connections.c:10691 ../clients/cli/connections.c:10798
+#, c-format
 msgid "Error: failed to load VPN plugin: %s."
-msgstr "Errore: modifica di %s.%s non riuscita: %s."
+msgstr "Errore: impossibile caricare il plug-in della VPN: %s."
 
-#: ../clients/cli/connections.c:8347
-#, fuzzy, c-format
+#: ../clients/cli/connections.c:10699
+#, c-format
 msgid "Error: failed to import '%s': %s."
-msgstr "Errore: modifica di %s.%s non riuscita: %s."
+msgstr "Errore: impossibile importare '%s': %s."
 
-#: ../clients/cli/connections.c:8397
-#, fuzzy
+#: ../clients/cli/connections.c:10745
 msgid "Output file name: "
-msgstr "nomefile"
+msgstr "Nome file di output:"
 
-#: ../clients/cli/connections.c:8421
-#, fuzzy, c-format
+#: ../clients/cli/connections.c:10769
+#, c-format
 msgid "Error: unknown extra argument: '%s'."
-msgstr "Errore: parametro extra «%s» non valido."
+msgstr "Errore: parametro extra sconosciuto: '%s'."
 
-#: ../clients/cli/connections.c:8441
-#, fuzzy, c-format
+#: ../clients/cli/connections.c:10789
+#, c-format
 msgid "Error: the connection is not VPN."
-msgstr "Errore: la connessione non è valida: %s\n"
+msgstr "Errore: la connessione non è una VPN."
 
-#: ../clients/cli/connections.c:8462
-#, fuzzy, c-format
+#: ../clients/cli/connections.c:10810
+#, c-format
 msgid "Error: failed to create temporary file %s."
-msgstr "Impossibile decodificare il file temporaneo: %s"
+msgstr "Errore: impossibile creare file temporaneo %s."
 
-#: ../clients/cli/connections.c:8471
-#, fuzzy, c-format
+#: ../clients/cli/connections.c:10819
+#, c-format
 msgid "Error: failed to export '%s': %s."
-msgstr "Errore: impostazione della proprietà «%s» non riuscita: %s\n"
+msgstr "Errore: impossibile esportare '%s': %s."
 
-#: ../clients/cli/connections.c:8482
-#, fuzzy, c-format
+#: ../clients/cli/connections.c:10830
+#, c-format
 msgid "Error: failed to read temporary file '%s': %s."
-msgstr "Errore: rimozione del valore di «%s» non riuscita: %s\n"
+msgstr "Errore: impossibile leggere il file temporaneo '%s': %s."
 
-#: ../clients/cli/connections.c:8628
+#: ../clients/cli/connections.c:10976
 #, c-format
 msgid "incorrect string '%s' of '--order' option"
-msgstr ""
+msgstr "opzione stringa '%s' di '--order' errata"
 
-#: ../clients/cli/connections.c:8654
+#: ../clients/cli/connections.c:11002
 #, c-format
 msgid "incorrect item '%s' in '--order' option"
-msgstr ""
+msgstr "opzione elemento '%s' in '--order' errata"
 
-#: ../clients/cli/connections.c:8740
-#, fuzzy
+#: ../clients/cli/connections.c:11089
 msgid "'--order' argument is missing"
-msgstr "Errore: manca l'argomento %s."
+msgstr "Argomento '--order' assente"
 
-#: ../clients/cli/connections.c:8816
+#: ../clients/cli/connections.c:11154
 #, c-format
 msgid "Error: '%s' is not valid 'connection' command."
 msgstr "Errore: «%s» non è un comando «connection» valido."
@@ -3452,7 +3881,7 @@ msgstr "FIRMWARE-MANCANTE"
 #. 18
 #: ../clients/cli/devices.c:74
 msgid "NM-PLUGIN-MISSING"
-msgstr ""
+msgstr "PLUGIN NM ASSENTE"
 
 #. 19
 #: ../clients/cli/devices.c:75
@@ -3492,10 +3921,10 @@ msgstr "PORTANTE"
 #. 1
 #: ../clients/cli/devices.c:112
 msgid "S390-SUBCHANNELS"
-msgstr ""
+msgstr "CANALI SECONDARI S390"
 
 #. 0
-#: ../clients/cli/devices.c:121 ../clients/cli/devices.c:741
+#: ../clients/cli/devices.c:121 ../clients/cli/devices.c:731
 msgid "WEP"
 msgstr "WEP"
 
@@ -3505,7 +3934,7 @@ msgid "WPA"
 msgstr "WPA"
 
 #. 2
-#: ../clients/cli/devices.c:123 ../clients/cli/devices.c:749
+#: ../clients/cli/devices.c:123 ../clients/cli/devices.c:739
 msgid "WPA2"
 msgstr "WPA2"
 
@@ -3521,7 +3950,7 @@ msgstr "CCMP"
 
 #. 5
 #. 2
-#: ../clients/cli/devices.c:126 ../clients/cli/devices.c:238
+#: ../clients/cli/devices.c:126 ../clients/cli/devices.c:228
 msgid "AP"
 msgstr "AP"
 
@@ -3565,6 +3994,11 @@ msgstr "TX-POW"
 msgid "BSID"
 msgstr "BSID"
 
+#. 0
+#: ../clients/cli/devices.c:151 ../clients/tui/nmt-page-wifi.c:224
+msgid "SSID"
+msgstr "SSID"
+
 #. 1
 #: ../clients/cli/devices.c:152
 msgid "SSID-HEX"
@@ -3628,157 +4062,142 @@ msgstr "*"
 
 #. 0
 #. 5
-#: ../clients/cli/devices.c:177 ../clients/cli/devices.c:241
+#: ../clients/cli/devices.c:177 ../clients/cli/devices.c:231
 msgid "NSP"
 msgstr "NSP"
 
 #. 0
-#: ../clients/cli/devices.c:192 ../clients/cli/devices.c:201
+#: ../clients/cli/devices.c:192
 msgid "SLAVES"
 msgstr "SLAVE"
 
-#. 1
-#: ../clients/cli/devices.c:202
-msgid "CONFIG"
-msgstr ""
-
 #. 0
-#: ../clients/cli/devices.c:211
+#: ../clients/cli/devices.c:201
 msgid "PARENT"
 msgstr "GENITORE"
 
 #. 1
-#: ../clients/cli/devices.c:212
+#: ../clients/cli/devices.c:202
 msgid "ID"
 msgstr "ID"
 
 #. 0
-#: ../clients/cli/devices.c:221 ../clients/cli/devices.c:236
+#: ../clients/cli/devices.c:211 ../clients/cli/devices.c:226
 msgid "CAPABILITIES"
 msgstr "CAPACITÀ"
 
 #. 1
-#: ../clients/cli/devices.c:237
+#: ../clients/cli/devices.c:227
 msgid "WIFI-PROPERTIES"
 msgstr "PROPRIETÀ-WIFI"
 
 #. 3
-#: ../clients/cli/devices.c:239
+#: ../clients/cli/devices.c:229
 msgid "WIRED-PROPERTIES"
 msgstr "PROPRIETÀ-VIA-CAVO"
 
 #. 4
-#: ../clients/cli/devices.c:240
+#: ../clients/cli/devices.c:230
 msgid "WIMAX-PROPERTIES"
 msgstr "PROPRIETÀ-WIMAX"
 
 #. 10
-#: ../clients/cli/devices.c:246 ../clients/tui/nmt-page-bond.c:351
+#: ../clients/cli/devices.c:236 ../clients/tui/nmt-page-bond.c:351
 msgid "BOND"
 msgstr "BOND"
 
 #. 11
-#: ../clients/cli/devices.c:247 ../clients/tui/nmt-page-team.c:145
+#: ../clients/cli/devices.c:237 ../clients/tui/nmt-page-team.c:145
 msgid "TEAM"
 msgstr "TEAM"
 
 #. 12
-#: ../clients/cli/devices.c:248 ../clients/tui/nmt-page-bridge.c:74
+#: ../clients/cli/devices.c:238 ../clients/tui/nmt-page-bridge.c:74
 msgid "BRIDGE"
 msgstr "BRIDGE"
 
-#. 13
-#: ../clients/cli/devices.c:249 ../clients/tui/nm-editor-utils.c:217
-#: ../clients/tui/nmt-page-vlan.c:94 ../libnm-core/nm-connection.c:1746
-#: ../libnm-glib/nm-device.c:1879 ../libnm-util/nm-connection.c:1632
-#: ../libnm/nm-device.c:1830
-msgid "VLAN"
-msgstr "VLAN"
-
 #. 14
-#: ../clients/cli/devices.c:250
+#: ../clients/cli/devices.c:240
 msgid "BLUETOOTH"
 msgstr "BLUETOOTH"
 
 #. 15
-#: ../clients/cli/devices.c:251
+#: ../clients/cli/devices.c:241
 msgid "CONNECTIONS"
 msgstr "CONNESSIONI"
 
 #. 1
-#: ../clients/cli/devices.c:263
+#: ../clients/cli/devices.c:253
 msgid "CHASSIS-ID"
-msgstr ""
+msgstr "ID CHASSIS"
 
 #. 2
-#: ../clients/cli/devices.c:264
+#: ../clients/cli/devices.c:254
 msgid "PORT-ID"
-msgstr ""
+msgstr "ID PORTA"
 
 #. 3
-#: ../clients/cli/devices.c:265
+#: ../clients/cli/devices.c:255
 msgid "PORT-DESCRIPTION"
-msgstr ""
+msgstr "DESCRIZIONE PORTA"
 
 #. 4
-#: ../clients/cli/devices.c:266
-#, fuzzy
+#: ../clients/cli/devices.c:256
 msgid "SYSTEM-NAME"
-msgstr "NOMEUTENTE"
+msgstr "NOME DEL SISTEMA"
 
 #. 5
-#: ../clients/cli/devices.c:267
+#: ../clients/cli/devices.c:257
 msgid "SYSTEM-DESCRIPTION"
-msgstr ""
+msgstr "DESCRIZIONE SISTEMA"
 
 #. 6
-#: ../clients/cli/devices.c:268
-#, fuzzy
+#: ../clients/cli/devices.c:258
 msgid "SYSTEM-CAPABILITIES"
-msgstr "CAPACITÀ"
+msgstr "CAPACITÀ DEL SISTEMA"
 
 #. 7
-#: ../clients/cli/devices.c:269
+#: ../clients/cli/devices.c:259
 msgid "IEEE-802-1-PVID"
-msgstr ""
+msgstr "PVID IEEE-802-1"
 
 #. 8
-#: ../clients/cli/devices.c:270
+#: ../clients/cli/devices.c:260
 msgid "IEEE-802-1-PPVID"
-msgstr ""
+msgstr "PPVID IEEE-802-1"
 
 #. 9
-#: ../clients/cli/devices.c:271
+#: ../clients/cli/devices.c:261
 msgid "IEEE-802-1-PPVID-FLAGS"
-msgstr ""
+msgstr "FLAG PPVID IEEE-802-1"
 
 #. 10
-#: ../clients/cli/devices.c:272
+#: ../clients/cli/devices.c:262
 msgid "IEEE-802-1-VID"
-msgstr ""
+msgstr "VID IEEE-802-1"
 
 #. 11
-#: ../clients/cli/devices.c:273
+#: ../clients/cli/devices.c:263
 msgid "IEEE-802-1-VLAN-NAME"
-msgstr ""
+msgstr "NOME VLAN IEEE-802-1"
 
 #. 12
-#: ../clients/cli/devices.c:274
+#: ../clients/cli/devices.c:264
 msgid "DESTINATION"
-msgstr ""
+msgstr "DESTINAZIONE"
 
 #. 13
-#: ../clients/cli/devices.c:275
+#: ../clients/cli/devices.c:265
 msgid "CHASSIS-ID-TYPE"
-msgstr ""
+msgstr "TIPO ID CHASSIS"
 
 #. 14
-#: ../clients/cli/devices.c:276
+#: ../clients/cli/devices.c:266
 msgid "PORT-ID-TYPE"
-msgstr ""
+msgstr "TIPO ID PORTA"
 
-#: ../clients/cli/devices.c:293
-#, fuzzy, c-format
+#: ../clients/cli/devices.c:283
+#, c-format
 msgid ""
 "Usage: nmcli device { COMMAND | help }\n"
 "\n"
@@ -3793,7 +4212,7 @@ msgid ""
 "\n"
 "  connect <ifname>\n"
 "\n"
-"  reapply <ifname>\n"
+"  reapply <ifname> ...\n"
 "\n"
 "  disconnect <ifname> ...\n"
 "\n"
@@ -3818,30 +4237,41 @@ msgid ""
 msgstr ""
 "Uso: nmcli device { COMANDO | help }\n"
 "\n"
-"COMANDO := { status | show | connect | disconnect | wifi | wimax }\n"
-"\n"
-"COMANDO := { status | show | connect | disconnect | wifi }\n"
+"COMANDO := { status | show | connect | reapply | disconnect | delete | "
+"monitor | wifi | lldp }\n"
 "\n"
 "  status\n"
 "\n"
-"  show [<nomeif>]\n"
+"  show [<ifname>]\n"
 "\n"
-"  connect <nomeif>\n"
+"  set [ifname] <ifname> [autoconnect yes|no] [managed yes|no]\n"
 "\n"
-"  disconnect <nomeif>\n"
+"  connect <ifname>\n"
 "\n"
-"  wifi [list [ifname <nomeif>] [bssid <BSSID>]]\n"
+"  reapply <ifname> ...\n"
 "\n"
-"  wifi connect <(B)SSID> [password <password>] [wep-key-type key|phrase]\n"
-"                         [ifname <nomeif>] [bssid <BSSID>] [name <nome>]\n"
-"                         [private yes|no]\n"
+"  disconnect <ifname> ...\n"
 "\n"
-"  wifi rescan [[ifname] <nomeif>]\n"
+"  delete <ifname> ...\n"
+"\n"
+"  monitor <ifname> ...\n"
+"\n"
+"  wifi [list [ifname <ifname>] [bssid <BSSID>]]\n"
+"\n"
+"  wifi connect <(B)SSID> [password <password>] [wep-key-type key|phrase] "
+"[ifname <ifname>]\n"
+"                         [bssid <BSSID>] [name <nome>] [private yes|no] "
+"[hidden yes|no]\n"
 "\n"
-"  wimax [list [ifname <nomeif>] [nsp <nome>]]\n"
+"  wifi hotspot [ifname <ifname>] [con-name <nome>] [ssid <SSID>] [band a|bg] "
+"[channel <canale>] [password <password>]\n"
+"\n"
+"  wifi rescan [ifname <ifname>] [[ssid <SSID da analizzare>] ...]\n"
+"\n"
+"  lldp [list [ifname <ifname>]]\n"
 "\n"
 
-#: ../clients/cli/devices.c:315
+#: ../clients/cli/devices.c:305
 #, c-format
 msgid ""
 "Usage: nmcli device status { help }\n"
@@ -3852,10 +4282,8 @@ msgid ""
 " TYPE       - device type\n"
 " STATE      - device state\n"
 " CONNECTION - connection activated on device (if any)\n"
-"Displayed columns can be changed using '--fields' global option. 'status' "
-"is\n"
-"the default command, which means 'nmcli device' calls 'nmcli device "
-"status'.\n"
+"Displayed columns can be changed using '--fields' global option. 'status' is\n"
+"the default command, which means 'nmcli device' calls 'nmcli device status'.\n"
 "\n"
 msgstr ""
 "Uso: nmcli device status { help }\n"
@@ -3872,7 +4300,7 @@ msgstr ""
 "«nmcli device status».\n"
 "\n"
 
-#: ../clients/cli/devices.c:330
+#: ../clients/cli/devices.c:320
 #, c-format
 msgid ""
 "Usage: nmcli device show { ARGUMENTS | help }\n"
@@ -3891,7 +4319,7 @@ msgstr ""
 "Elenca i dettagli per i device o per uno specifico\n"
 "\n"
 
-#: ../clients/cli/devices.c:341
+#: ../clients/cli/devices.c:331
 #, c-format
 msgid ""
 "Usage: nmcli device connect { ARGUMENTS | help }\n"
@@ -3899,8 +4327,8 @@ msgid ""
 "ARGUMENTS := <ifname>\n"
 "\n"
 "Connect the device.\n"
-"NetworkManager will try to find a suitable connection that will be "
-"activated.\n"
+"NetworkManager will try to find a suitable connection that will be activated."
+"\n"
 "It will also consider connections that are not set to auto-connect.\n"
 "\n"
 msgstr ""
@@ -3913,28 +4341,27 @@ msgstr ""
 "Considera anche connessioni che non sono state impostate come automatiche.\n"
 "\n"
 
-#: ../clients/cli/devices.c:353
-#, fuzzy, c-format
+#: ../clients/cli/devices.c:343
+#, c-format
 msgid ""
 "Usage: nmcli device reapply { ARGUMENTS | help }\n"
 "\n"
-"ARGUMENTS := <ifname>\n"
+"ARGUMENTS := <ifname> ...\n"
 "\n"
 "Attempts to update device with changes to the currently active connection\n"
 "made since it was last applied.\n"
 "\n"
 msgstr ""
-"Uso: nmcli device disconnect { ARGOMENTI | help }\n"
+"Uso: nmcli device reapply { ARGOMENTI | help }\n"
 "\n"
-"ARGOMENTI := <nomeif> ...\n"
+"ARGOMENTI:= <ifname> ...\n"
 "\n"
-"Disconnette dispositivi.\n"
-"Il comando disconnette il dispositivo e fa in modo che non possa attivare "
-"più\n"
-"automaticamente connessione senza un intervento dell'utente o manuale.\n"
+"Tenta di aggiornare il dispositivo con le modifiche apportate all'ultima "
+"applicazione\n"
+"della connessione attualmente attiva.\n"
 "\n"
 
-#: ../clients/cli/devices.c:364
+#: ../clients/cli/devices.c:354
 #, c-format
 msgid ""
 "Usage: nmcli device disconnect { ARGUMENTS | help }\n"
@@ -3956,7 +4383,7 @@ msgstr ""
 "automaticamente connessione senza un intervento dell'utente o manuale.\n"
 "\n"
 
-#: ../clients/cli/devices.c:376
+#: ../clients/cli/devices.c:366
 #, c-format
 msgid ""
 "Usage: nmcli device delete { ARGUMENTS | help }\n"
@@ -3979,7 +4406,7 @@ msgstr ""
 "eliminati dal comando.\n"
 "\n"
 
-#: ../clients/cli/devices.c:389
+#: ../clients/cli/devices.c:379
 #, c-format
 msgid ""
 "Usage: nmcli device set { ARGUMENTS | help }\n"
@@ -3992,9 +4419,18 @@ msgid ""
 "Modify device properties.\n"
 "\n"
 msgstr ""
+"Utilizzo: nmcli device set { ARGOMENTI| help }\n"
+"\n"
+"ARGOMENTI:= DISPOSITIVO { PROPRIETÀ [ PROPRIETÀ... ] }\n"
+"DISPOSITIVO     := [ifname] <ifname> \n"
+"PROPRIETÀ:= { autoconnect { yes | no } |\n"
+"             { managed { yes | no }\n"
+"\n"
+"Modifica le proprietà del dispositivo.\n"
+"\n"
 
-#: ../clients/cli/devices.c:402
-#, fuzzy, c-format
+#: ../clients/cli/devices.c:392
+#, c-format
 msgid ""
 "Usage: nmcli device monitor { ARGUMENTS | help }\n"
 "\n"
@@ -4005,16 +4441,18 @@ msgid ""
 "Monitors all devices in case no interface is specified.\n"
 "\n"
 msgstr ""
-"Uso: mmcli device show { ARGOMENTI | help }\n"
+"Uso: nmcli device monitor { ARGOMENTI | help }\n"
 "\n"
-"ARGOMENTI := <nomeif>\n"
+"ARGOMENTI:= [<ifname>] ...\n"
 "\n"
-"Mostra i dettagli dei device.\n"
-"Elenca i dettagli per i device o per uno specifico\n"
+"Monitora l'attività del dispositivo device activity.\n"
+"Questo comando stampa una riga ogni volta che lo stato dei dispositivi "
+"specificati cambia.\n"
+"Monitora tutti i dispositivi se non viene specificata un'interfaccia.\n"
 "\n"
 
-#: ../clients/cli/devices.c:414
-#, fuzzy, c-format
+#: ../clients/cli/devices.c:404
+#, c-format
 msgid ""
 "Usage: nmcli device wifi { ARGUMENTS | help }\n"
 "\n"
@@ -4025,8 +4463,8 @@ msgid ""
 "List available Wi-Fi access points. The 'ifname' and 'bssid' options can be\n"
 "used to list APs for a particular interface, or with a specific BSSID.\n"
 "\n"
-"ARGUMENTS := connect <(B)SSID> [password <password>] [wep-key-type key|"
-"phrase] [ifname <ifname>]\n"
+"ARGUMENTS := connect <(B)SSID> [password <password>] [wep-key-type "
+"key|phrase] [ifname <ifname>]\n"
 "                    [bssid <BSSID>] [name <name>] [private yes|no] [hidden "
 "yes|no]\n"
 "\n"
@@ -4055,10 +4493,8 @@ msgid ""
 "\n"
 "ARGUMENTS := rescan [ifname <ifname>] [[ssid <SSID to scan>] ...]\n"
 "\n"
-"Request that NetworkManager immediately re-scan for available access "
-"points.\n"
-"NetworkManager scans Wi-Fi networks periodically, but in some cases it "
-"might\n"
+"Request that NetworkManager immediately re-scan for available access points.\n"
+"NetworkManager scans Wi-Fi networks periodically, but in some cases it might\n"
 "be useful to start scanning manually. 'ssid' allows scanning for a specific\n"
 "SSID, which is useful for APs with hidden SSIDs. More 'ssid' parameters can "
 "be\n"
@@ -4068,339 +4504,349 @@ msgid ""
 msgstr ""
 "Uso: nmcli device wifi { ARGOMENTI | help }\n"
 "\n"
-"Esegue operazioni su dispositivi Wi-Fi.\n"
+"Agisce sui dispositivi Wi-Fi.\n"
 "\n"
-"ARGOMENTI := [list [ifname <nomeif>] [bssid <BSSID>]]\n"
+"ARGOMENTI:= [list [ifname <ifname>] [bssid <BSSID>]]\n"
 "\n"
-"Elenca gli access point Wi-Fi disponibili. Le opzioni «ifname» e «nsp» "
+"Elenca i punti di accesso Wi-Fi disponibili. Le opzioni 'ifname' e 'bssid' "
 "possono\n"
-"essere usate per elencare gli access point per un'interfaccia o con un "
-"BSSID\n"
-"specifico.\n"
-"\n"
-"ARGOMENTI := connect <(B)SSID> [password <password>][wep-key-type key|"
-"phrase]\n"
-"                               [ifname <nomeif>] [bssid <BSSID>] [name "
-"<nome>]\n"
-"                               [private yes|no]\n"
-"\n"
-"Connette a una rete Wi-Fi specificata da un SSID o BSSID. Il comando crea "
-"una\n"
-"nuova connessione e la attiva su un device. Ciò equivale a fare clic su un\n"
-"SSID tramite un programma grafico. Il comando crea sempre una nuova "
-"connessione\n"
-"e quindi è più che altro utile per collegarsi a nuove reti Wi-Fi. Se esiste "
-"già\n"
-"una connessione per la rete, è consigliato attivare il profilo esiste in "
-"questo\n"
-"modo: nmcli con up id <nome>.\n"
-"Notare che, al momento, sono supportate solamente reti aperte, WEP e WPA-"
-"PSK.\n"
-"La configurazione IP si assume venga effettuata tramite DHCP.\n"
+"essere usati per elencare i punti di accesso per una specifica interfaccia o "
+"con un BSSID specifico.\n"
+"\n"
+"ARGOMENTI:= connect <(B)SSID> [password <password>] [wep-key-type "
+"key|phrase] [ifname <ifname>]\n"
+"                    [bssid <BSSID>] [name <nome>] [private yes|no] [hidden "
+"yes|no]\n"
+"\n"
+"Si collega a una rete Wi-Fi specificata dal SSID o BSSID. Il comando crea\n"
+"una nuova connessione, quindi la attiva su un dispositivo. Si tratta "
+"dell'equivalente\n"
+"da riga di comando del fare clic su un SSID in un client dell'interfaccia "
+"grafica. Il comando crea sempre\n"
+"una nuova connessione e pertanto risulta utile per connettersi a nuova reti "
+"Wi-Fi.\n"
+"Se esiste già una rete, è meglio prendere il profilo esistente\n"
+"nel seguente modo: nmcli con up id <nome>. Al momento\n"
+"sono supportate solo le reti WEP e WPA-PSK aperte. Si presume anche\n"
+"che la configurazione IP sia ottenuta tramite DHCP.\n"
+"\n"
+"ARGOMENTI:= wifi hotspot [ifname <ifname>] [con-name <nome>] [ssid <SSID>]\n"
+"                          [band a|bg] [channel <canale>] [password "
+"<password>]\n"
+"\n"
+"Crea un hotspot Wi-Fi. Utilizzare 'connection down' o 'device disconnect'\n"
+"per arrestare l'hotspot.\n"
+"I parametri dell'hotspot possono essere influenzati dai parametri opzionali:\n"
+"ifname - Wi-Fi device to use\n"
+"con-name - nome del profilo di connessione dell'hotspot creato\n"
+"ssid - SSID dell'hotspot\n"
+"band - banda Wi-Fi da utilizzare\n"
+"channel - canale Wi-Fi da utilizzare\n"
+"password - password da utilizzare per l'hotspot\n"
 "\n"
-"ARGOMENTI := rescan [[ifname] <nomeif>]\n"
+"ARGOMENTI:= rescan [ifname <ifname>] [[ssid <SSID da analizzare>] ...]\n"
 "\n"
-"Richiede una nuova scansione immediata di access point.\n"
-"NetworkManager analizza le reti Wi-Fi periodicamente, ma in alcuni casi\n"
-"potrebbe essere utile avviare una scansione manualmente. Questo comando non\n"
-"mostra gli access point, usare «nmcli device wifi list» per fare ciò.\n"
+"Request that NetworkManager immediately re-scan for available access points.\n"
+"NetworkManager esegue periodicamente la scansione delle reti Wi-Fi, ma in "
+"alcuni casi\n"
+"potrebbe essere utile iniziare la scansione manualmente. 'ssid' permette la "
+"ricerca di\n"
+"un SSID specifico, utile per punti di accesso con SSID nascosti. Possono "
+"essere forniti diversi parametri 'ssid'.Questo \n"
+"comando non mostra i punti di accesso.\n"
+"Per visualizzarli, utilizzare 'nmcli device wifi list'.\n"
 "\n"
 
-#: ../clients/cli/devices.c:461
-#, fuzzy, c-format
+#: ../clients/cli/devices.c:451
+#, c-format
 msgid ""
 "Usage: nmcli device lldp { ARGUMENTS | help }\n"
 "\n"
 "ARGUMENTS := [list [ifname <ifname>]]\n"
 "\n"
-"List neighboring devices discovered through LLDP. The 'ifname' option can "
-"be\n"
+"List neighboring devices discovered through LLDP. The 'ifname' option can be\n"
 "used to list neighbors for a particular interface.\n"
 "\n"
 msgstr ""
-"Uso: nmcli device wimax { ARGOMENTI | help }\n"
+"Uso: nmcli device lldp { ARGOMENTI | help }\n"
 "\n"
-"Esegue operazioni su dispositivi WiMAX.\n"
+"ARGOMENTI:= [list [ifname <ifname>]]\n"
 "\n"
-"ARGOMENTI := [list [ifname <nomeif>] [nsp <nome>]]\n"
-"\n"
-"Elenca gli NSP WiMAX disponibili. Le opzioni «ifname» e «nsp» possono "
-"essere\n"
-"usate per elencare le reti per un'interfaccia o con un NSP specifico.\n"
+"Elenca i dispositivi nelle vicinanze rilevati tramite LLDP. L'opzione "
+"'ifname' può\n"
+"essere utilizzata per elencare i dispositivi vicini per una specifica "
+"interfaccia.\n"
 "\n"
 
-#: ../clients/cli/devices.c:537 ../clients/cli/devices.c:1756
-#: ../clients/cli/devices.c:1765 ../clients/cli/devices.c:1956
-#: ../clients/cli/devices.c:2161 ../clients/cli/devices.c:2168
+#: ../clients/cli/devices.c:527 ../clients/cli/devices.c:1676
+#: ../clients/cli/devices.c:1685 ../clients/cli/devices.c:1879
+#: ../clients/cli/devices.c:2103 ../clients/cli/devices.c:2110
 #, c-format
 msgid "Error: No interface specified."
 msgstr "Errore: nessuna interfaccia specificata."
 
-#: ../clients/cli/devices.c:557
+#: ../clients/cli/devices.c:547 ../clients/cli/devices.c:1899
 #, c-format
 msgid "Warning: argument '%s' is duplicated.\n"
 msgstr "Attenzione: argomento \"%s\" duplicato.\n"
 
-#: ../clients/cli/devices.c:559
+#: ../clients/cli/devices.c:549 ../clients/cli/devices.c:1901
 #, c-format
 msgid "Error: Device '%s' not found.\n"
 msgstr "Errore: dispositivo \"%s\" non trovato.\n"
 
-#: ../clients/cli/devices.c:560
+#: ../clients/cli/devices.c:550 ../clients/cli/devices.c:1902
 #, c-format
 msgid "Error: not all devices found."
 msgstr "Errore: non tutti i dispositivi sono stati trovati."
 
-#: ../clients/cli/devices.c:660 ../clients/cli/devices.c:811
+#: ../clients/cli/devices.c:650 ../clients/cli/devices.c:801
 msgid "(none)"
 msgstr "(nessuno)"
 
-#: ../clients/cli/devices.c:729
+#: ../clients/cli/devices.c:719
 #, c-format
 msgid "%u MHz"
 msgstr "%u MHz"
 
-#: ../clients/cli/devices.c:730
+#: ../clients/cli/devices.c:720
 #, c-format
 msgid "%u Mbit/s"
 msgstr "%u Mbit/s"
 
-#: ../clients/cli/devices.c:745
+#: ../clients/cli/devices.c:735
 msgid "WPA1"
 msgstr "WPA1"
 
-#: ../clients/cli/devices.c:754
+#: ../clients/cli/devices.c:744
 msgid "802.1X"
 msgstr "802.1X"
 
-#: ../clients/cli/devices.c:770
+#: ../clients/cli/devices.c:760
 msgid "Ad-Hoc"
 msgstr "Ad-Hoc"
 
-#: ../clients/cli/devices.c:771
+#: ../clients/cli/devices.c:761
 msgid "Infra"
 msgstr "Infra"
 
-#: ../clients/cli/devices.c:772
+#: ../clients/cli/devices.c:762
 msgid "N/A"
 msgstr "N/D"
 
-#: ../clients/cli/devices.c:996
+#: ../clients/cli/devices.c:916
 msgid "Device details"
 msgstr "Informazioni dispositivo"
 
-#: ../clients/cli/devices.c:1008
+#: ../clients/cli/devices.c:928
 #, c-format
 msgid "Error: 'device show': %s"
 msgstr "Errore: «device show»: %s"
 
-#: ../clients/cli/devices.c:1060 ../clients/cli/devices.c:1063
+#: ../clients/cli/devices.c:980 ../clients/cli/devices.c:983
 msgid "(unknown)"
 msgstr "(sconosciuto)"
 
-#: ../clients/cli/devices.c:1104
+#: ../clients/cli/devices.c:1024
 #, c-format
 msgid "%u Mb/s"
 msgstr "%u Mb/s"
 
-#: ../clients/cli/devices.c:1195
+#: ../clients/cli/devices.c:1115
 msgid "on"
 msgstr "on"
 
-#: ../clients/cli/devices.c:1195
+#: ../clients/cli/devices.c:1115
 msgid "off"
 msgstr "off"
 
-#: ../clients/cli/devices.c:1422
+#: ../clients/cli/devices.c:1342
 #, c-format
 msgid "Error: 'device status': %s"
 msgstr "Errore: «device status»: %s"
 
 #. Add headers
-#: ../clients/cli/devices.c:1429
+#: ../clients/cli/devices.c:1349
 msgid "Status of devices"
 msgstr "Stato dispositivi"
 
-#: ../clients/cli/devices.c:1460 ../clients/cli/devices.c:3570
+#: ../clients/cli/devices.c:1380 ../clients/cli/devices.c:3509
 #, c-format
 msgid "Error: invalid extra argument '%s'."
 msgstr "Errore: parametro extra «%s» non valido."
 
-#: ../clients/cli/devices.c:1477 ../clients/cli/devices.c:1787
-#: ../clients/cli/devices.c:2184 ../clients/cli/devices.c:2454
-#: ../clients/cli/devices.c:3609
+#: ../clients/cli/devices.c:1397 ../clients/cli/devices.c:1707
+#: ../clients/cli/devices.c:2126 ../clients/cli/devices.c:2396
+#: ../clients/cli/devices.c:3548
 #, c-format
 msgid "Error: Device '%s' not found."
 msgstr "Errore: dispositivo «%s» non trovato."
 
-#: ../clients/cli/devices.c:1555
+#: ../clients/cli/devices.c:1475
 #, c-format
 msgid "Device '%s' successfully activated with '%s'.\n"
 msgstr "Dispositivo \"%s\" attivato con successo con \"%s\".\n"
 
-#: ../clients/cli/devices.c:1561
+#: ../clients/cli/devices.c:1481
 #, c-format
 msgid "Error: Connection activation failed: (%d) %s.\n"
 msgstr "Errore: attivazione connessione non riuscita: (%d) %s.\n"
 
-#: ../clients/cli/devices.c:1597
-#, fuzzy, c-format
+#: ../clients/cli/devices.c:1517
+#, c-format
 msgid "Error: Failed to setup a Wi-Fi hotspot: %s"
-msgstr "Errore: impostazione nome host non riuscita: (%d) %s"
+msgstr "Errore: impossibile configurare un hotspot Wi-Fi: %s"
 
-#: ../clients/cli/devices.c:1600
+#: ../clients/cli/devices.c:1520
 #, c-format
 msgid "Error: Failed to add/activate new connection: %s"
 msgstr "Errore: aggiunta/attivazione nuova connessione non riuscita: %s"
 
-#: ../clients/cli/devices.c:1610
-#, fuzzy, c-format
+#: ../clients/cli/devices.c:1530
+#, c-format
 msgid "Error: Failed to setup a Wi-Fi hotspot"
-msgstr "Errore: impostazione nome host non riuscita: (%d) %s"
+msgstr "Errore: impossibile configurare un hotspot Wi-Fi"
 
-#: ../clients/cli/devices.c:1612
+#: ../clients/cli/devices.c:1532
 #, c-format
 msgid "Error: Failed to add/activate new connection: Unknown error"
 msgstr ""
 "Errore: aggiunta/attivazione nuova connessione non riuscita: errore "
 "sconosciuto"
 
-#: ../clients/cli/devices.c:1624
+#: ../clients/cli/devices.c:1544
 #, c-format
 msgid "Connection with UUID '%s' created and activated on device '%s'\n"
 msgstr "Connessione con UUID «%s» creata e attivata sul dispositivo «%s»\n"
 
-#: ../clients/cli/devices.c:1627
-#, fuzzy, c-format
+#: ../clients/cli/devices.c:1547
+#, c-format
 msgid "Hotspot '%s' activated on device '%s'\n"
-msgstr "Connessione con UUID «%s» creata e attivata sul dispositivo «%s»\n"
+msgstr "Hotspot '%s' attivato sul dispositivo '%s'\n"
 
-#: ../clients/cli/devices.c:1691
+#: ../clients/cli/devices.c:1611
 #, c-format
 msgid "Error: Device activation failed: %s"
 msgstr "Errore: attivazione device non riuscita: %s"
 
-#: ../clients/cli/devices.c:1700
+#: ../clients/cli/devices.c:1620
 #, c-format
 msgid "Error: Device activation failed: device was disconnected"
 msgstr "Errore: attivazione dispositivo non riuscita: disconnesso"
 
-#: ../clients/cli/devices.c:1715
+#: ../clients/cli/devices.c:1635
 #, c-format
 msgid "Device '%s' has been connected.\n"
 msgstr "Il dispositivo «%s» è stato collegato.\n"
 
-#: ../clients/cli/devices.c:1771
+#: ../clients/cli/devices.c:1691
 #, c-format
 msgid "Error: extra argument not allowed: '%s'."
 msgstr "Errore: parametri extra non consentiti: «%s»."
 
-#: ../clients/cli/devices.c:1856 ../clients/cli/devices.c:1871
-#: ../clients/cli/devices.c:2022
+#: ../clients/cli/devices.c:1776 ../clients/cli/devices.c:1791
+#: ../clients/cli/devices.c:1964
 #, c-format
 msgid "Device '%s' successfully disconnected.\n"
 msgstr "Dispositivo \"%s\" scollegato con successo.\n"
 
-#: ../clients/cli/devices.c:1859
+#: ../clients/cli/devices.c:1779
 #, c-format
 msgid "Device '%s' successfully removed.\n"
 msgstr "Dispositivo \"%s\" rimosso con successo.\n"
 
-#: ../clients/cli/devices.c:1918
-#, fuzzy, c-format
-msgid "Error: Reapplying connection to device '%s' (%s) failed: %s"
-msgstr "Errore: eliminazione dispositivo \"%s\" (%s) non riuscita: %s\n"
+#: ../clients/cli/devices.c:1838
+#, c-format
+msgid "Error: not all connections reapplied."
+msgstr "Errore: non tutte le connessioni sono state riapplicate."
 
-#: ../clients/cli/devices.c:1928
-#, fuzzy, c-format
-msgid "Connection successfully reapplied to device '%s'.\n"
-msgstr "Connessione attivata con successo (percorso D-Bus attivo: %s)\n"
+#: ../clients/cli/devices.c:1839
+#, c-format
+msgid "Error: Reapplying connection to device '%s' (%s) failed: %s\n"
+msgstr ""
+"Errore: riapplicazione della connessione al dispositivo '%s' (%s) non "
+"riuscita: %s\n"
 
-#: ../clients/cli/devices.c:1965
-#, fuzzy, c-format
-msgid "Error: unsupported argument '%s'."
-msgstr "Errore: argomento «%s» non atteso."
+#: ../clients/cli/devices.c:1849
+#, c-format
+msgid "Connection successfully reapplied to device '%s'.\n"
+msgstr "Connessione riapplicata con successo al dispositivo '%s'.\n"
 
-#: ../clients/cli/devices.c:1979
-#, fuzzy, c-format
-msgid "Error: device '%s' not found."
-msgstr "Errore: dispositivo «%s» non trovato."
+#: ../clients/cli/devices.c:1912
+#, c-format
+msgid "Error: no valid device provided."
+msgstr "Errore: non sono stati forniti dispositivi validi"
 
-#: ../clients/cli/devices.c:2007
+#: ../clients/cli/devices.c:1949
 #, c-format
 msgid "Error: not all devices disconnected."
 msgstr "Errore: non tutte i dispositivi sono stati scollegati."
 
-#: ../clients/cli/devices.c:2008
+#: ../clients/cli/devices.c:1950
 #, c-format
 msgid "Error: Device '%s' (%s) disconnecting failed: %s\n"
 msgstr "Errore: scollegamento dispositivo \"%s\" (%s) non riuscito: %s\n"
 
-#: ../clients/cli/devices.c:2083
+#: ../clients/cli/devices.c:2025
 #, c-format
 msgid "Error: not all devices deleted."
 msgstr "Errore: non tutti i dispositivi sono stati eliminati."
 
-#: ../clients/cli/devices.c:2084
+#: ../clients/cli/devices.c:2026
 #, c-format
 msgid "Error: Device '%s' (%s) deletion failed: %s\n"
 msgstr "Errore: eliminazione dispositivo \"%s\" (%s) non riuscita: %s\n"
 
-#: ../clients/cli/devices.c:2190
-#, fuzzy, c-format
+#: ../clients/cli/devices.c:2132
+#, c-format
 msgid "Error: No property specified."
-msgstr "Errore: nessuna connessione specificata."
+msgstr "Errore: nessuna proprietà specificata."
 
-#: ../clients/cli/devices.c:2202 ../clients/cli/devices.c:2217
+#: ../clients/cli/devices.c:2144 ../clients/cli/devices.c:2159
 #, c-format
 msgid "Error: '%s' argument is missing."
 msgstr "Errore: L'argomento '%s' è mancante."
 
-#: ../clients/cli/devices.c:2207
-#, fuzzy, c-format
+#: ../clients/cli/devices.c:2149
+#, c-format
 msgid "Error: 'managed': %s."
-msgstr "Errore: «mode»: %s"
+msgstr "Errore: «managed»: %s."
 
-#: ../clients/cli/devices.c:2222
+#: ../clients/cli/devices.c:2174
 #, c-format
-msgid "Error: 'autoconnect': %s."
-msgstr "Errore: «autoconnect»: %s."
-
-#: ../clients/cli/devices.c:2232
-#, fuzzy, c-format
 msgid "Error: property '%s' is not known."
-msgstr "Errore: proprietà «%s» non valida: %s."
+msgstr "Errore: proprietà «%s» non valida."
 
-#: ../clients/cli/devices.c:2278
-#, fuzzy, c-format
+#: ../clients/cli/devices.c:2220
+#, c-format
 msgid "%s: using connection '%s'\n"
-msgstr "Errore nel salvare la connessione: %s"
+msgstr "%s: uso della connessione '%s'\n"
 
-#: ../clients/cli/devices.c:2304
+#: ../clients/cli/devices.c:2246
 #, c-format
 msgid "%s: device created\n"
-msgstr ""
+msgstr "%s: dispositivo creato\n"
 
-#: ../clients/cli/devices.c:2311
-#, fuzzy, c-format
+#: ../clients/cli/devices.c:2253
+#, c-format
 msgid "%s: device removed\n"
-msgstr "Il dispositivo è stato rimosso"
+msgstr "%s: dispositivo rimosso\n"
 
-#: ../clients/cli/devices.c:2397
+#: ../clients/cli/devices.c:2339
 msgid "Wi-Fi scan list"
 msgstr "Elenco analisi Wi-Fi"
 
-#: ../clients/cli/devices.c:2435
+#: ../clients/cli/devices.c:2377
 #, c-format
 msgid "Error: 'device wifi': %s"
 msgstr "Errore: «device wifi»: %s"
 
-#: ../clients/cli/devices.c:2477 ../clients/cli/devices.c:2561
+#: ../clients/cli/devices.c:2419 ../clients/cli/devices.c:2500
 #, c-format
 msgid "Error: Access point with bssid '%s' not found."
 msgstr "Errore: punto di accesso con bssid «%s» non trovato."
 
-#: ../clients/cli/devices.c:2504
+#: ../clients/cli/devices.c:2446
 #, c-format
 msgid ""
 "Error: Device '%s' was not recognized as a Wi-Fi device, check "
@@ -4409,70 +4855,71 @@ msgstr ""
 "Errore: il dispositivo \"%s\" non è stato riconosciuto come un dispositivo "
 "Wi-Fi, verificare il plugin Wi-Fi di NetworkManager."
 
-#: ../clients/cli/devices.c:2508 ../clients/cli/devices.c:2841
-#: ../clients/cli/devices.c:3261 ../clients/cli/devices.c:3410
+#: ../clients/cli/devices.c:2448 ../clients/cli/devices.c:2780
+#: ../clients/cli/devices.c:3200 ../clients/cli/devices.c:3349
 #, c-format
 msgid "Error: Device '%s' is not a Wi-Fi device."
 msgstr "Errore: il dispositivo «%s» non è un dispositivo Wi-Fi."
 
-#: ../clients/cli/devices.c:2721
+#: ../clients/cli/devices.c:2660
 msgid "SSID or BSSID: "
 msgstr "SSID o BSSID: "
 
-#: ../clients/cli/devices.c:2726
+#: ../clients/cli/devices.c:2665
 #, c-format
 msgid "Error: SSID or BSSID are missing."
 msgstr "Errore: SSID o BSSID mancante."
 
-#: ../clients/cli/devices.c:2750
+#: ../clients/cli/devices.c:2689
 #, c-format
 msgid "Error: bssid argument value '%s' is not a valid BSSID."
 msgstr "Errore: il valore «%s» di bssid non è un BSSID valido."
 
-#: ../clients/cli/devices.c:2774
+#: ../clients/cli/devices.c:2713
 #, c-format
 msgid ""
 "Error: wep-key-type argument value '%s' is invalid, use 'key' or 'phrase'."
 msgstr ""
 "Errore: il valore «%s» di wep-key-type non è valido, usare «key» o «phrase»."
 
-#: ../clients/cli/devices.c:2794 ../clients/cli/devices.c:2807
+#: ../clients/cli/devices.c:2733 ../clients/cli/devices.c:2746
 #, c-format
 msgid "Error: %s: %s."
 msgstr "Errore: %s: %s."
 
-#: ../clients/cli/devices.c:2822
+#: ../clients/cli/devices.c:2761
 #, c-format
 msgid "Error: BSSID to connect to (%s) differs from bssid argument (%s)."
-msgstr "Error: BSSID a cui connettersi (%s) diverso dall'argomento bssid (%s)."
+msgstr ""
+"Error: BSSID a cui connettersi (%s) diverso dall'argomento bssid (%s)."
 
-#: ../clients/cli/devices.c:2828
+#: ../clients/cli/devices.c:2767
 #, c-format
 msgid "Error: Parameter '%s' is neither SSID nor BSSID."
 msgstr "Errore: il parametro «%s» non è né SSID né BSSID."
 
-#: ../clients/cli/devices.c:2843 ../clients/cli/devices.c:3263
-#: ../clients/cli/devices.c:3412
+#: ../clients/cli/devices.c:2782 ../clients/cli/devices.c:3202
+#: ../clients/cli/devices.c:3351
 #, c-format
 msgid "Error: No Wi-Fi device found."
 msgstr "Errore: nessun dispositivo Wi-Fi trovato."
 
-#: ../clients/cli/devices.c:2863
+#: ../clients/cli/devices.c:2802
 #, c-format
 msgid "Error: Failed to scan hidden SSID: %s."
 msgstr "Errore: analisi dello SSID nascosto non riuscita: %s"
 
-#: ../clients/cli/devices.c:2888
+#: ../clients/cli/devices.c:2827
 #, c-format
 msgid "Error: No network with SSID '%s' found."
 msgstr "Errore: rete con SSID «%s» non trovata."
 
-#: ../clients/cli/devices.c:2890
+#: ../clients/cli/devices.c:2829
 #, c-format
 msgid "Error: No access point with BSSID '%s' found."
 msgstr "Errore: punto di accesso con BSSID «%s» non trovato."
 
-#: ../clients/cli/devices.c:2932
+#: ../clients/cli/devices.c:2871
 #, c-format
 msgid ""
 "Warning: '%s' should be SSID for hidden APs; but it looks like a BSSID.\n"
@@ -4480,164 +4927,167 @@ msgstr ""
 "Attenzione: \"%s\" dovrebbe essere lo SSID per AP nascosti, ma sembra un "
 "BSSID.\n"
 
-#: ../clients/cli/devices.c:2946
+#: ../clients/cli/devices.c:2885
 msgid "Password: "
 msgstr "Password: "
 
-#: ../clients/cli/devices.c:3095
-#, fuzzy, c-format
+#: ../clients/cli/devices.c:3034
+#, c-format
 msgid "'%s' is not valid WPA PSK"
-msgstr "«%s» non è una PSK valida"
+msgstr "«%s» non è una WPA PSK valida"
 
-#: ../clients/cli/devices.c:3112
-#, fuzzy, c-format
+#: ../clients/cli/devices.c:3051
+#, c-format
 msgid "'%s' is not valid WEP key (it should be 5 or 13 ASCII chars)"
-msgstr "la lunghezza di «%s» non è valida (dovrebbe essere di 5 o 6 cifre)"
+msgstr ""
+"'%s' non è una chiave WEP valida (deve essere lunga 5 o 13 caratteri ASCII)"
 
-#: ../clients/cli/devices.c:3128
+#: ../clients/cli/devices.c:3067
 #, c-format
 msgid "Hotspot password: %s\n"
-msgstr ""
+msgstr "Password hotspot: %s\n"
 
-#: ../clients/cli/devices.c:3186
-#, fuzzy, c-format
+#: ../clients/cli/devices.c:3125
+#, c-format
 msgid "Error: ssid is too long."
-msgstr "Errore: è richiesto «ssid»."
+msgstr "Errore: ssid troppo lungo."
 
-#: ../clients/cli/devices.c:3198
-#, fuzzy, c-format
+#: ../clients/cli/devices.c:3137
+#, c-format
 msgid "Error: band argument value '%s' is invalid; use 'a' or 'bg'."
 msgstr ""
-"Errore: il valore «%s» di wep-key-type non è valido, usare «key» o «phrase»."
+"Errore: valore argomento banda '%s' non valido; utilizzare 'a' o 'bg'."
 
-#: ../clients/cli/devices.c:3222
-#, fuzzy, c-format
+#: ../clients/cli/devices.c:3161
+#, c-format
 msgid "Error: Unknown parameter %s."
-msgstr "Parametro sconosciuto: %s\n"
+msgstr "Errore: parametro sconosciuto %s."
 
-#: ../clients/cli/devices.c:3241
-#, fuzzy, c-format
+#: ../clients/cli/devices.c:3180
+#, c-format
 msgid "Error: channel requires band too."
-msgstr "Errore: è richiesto «apn»."
+msgstr "Errore: il canale richiede anche la banda."
 
-#: ../clients/cli/devices.c:3247
-#, fuzzy, c-format
+#: ../clients/cli/devices.c:3186
+#, c-format
 msgid "Error: channel '%s' not valid for band '%s'."
-msgstr "Errore: «channel»: «%s» non è valido; usare <1-13>."
+msgstr "Errore: canale '%s' non valido per la banca '%s'."
 
-#: ../clients/cli/devices.c:3275
-#, fuzzy, c-format
+#: ../clients/cli/devices.c:3214
+#, c-format
 msgid "Error: Device '%s' supports neither AP nor Ad-Hoc mode."
-msgstr "Errore: il dispositivo «%s» non è un dispositivo Wi-Fi."
+msgstr ""
+"Errore: il dispositivo '%s' non supporta la modalità punto di accesso né ad-"
+"hoc."
 
-#: ../clients/cli/devices.c:3310
-#, fuzzy, c-format
+#: ../clients/cli/devices.c:3249
+#, c-format
 msgid "Error: Invalid 'password': %s."
-msgstr "Errore: proprietà «%s» non valida: %s."
+msgstr "Errore: 'password' non valida: %s."
 
-#: ../clients/cli/devices.c:3379
+#: ../clients/cli/devices.c:3318
 #, c-format
 msgid "Error: '%s' cannot repeat."
 msgstr "Errore: impossibile ripetere \"%s\"."
 
-#: ../clients/cli/devices.c:3460
+#: ../clients/cli/devices.c:3399
 #, c-format
 msgid "Error: 'device wifi' command '%s' is not valid."
 msgstr "Errore: il comando «device wifi» «%s» non è valido."
 
 #. Main header name
-#: ../clients/cli/devices.c:3486
+#: ../clients/cli/devices.c:3425
 msgid "Device LLDP neighbors"
-msgstr ""
+msgstr "Router adiacenti LLDP dispositivo"
 
-#: ../clients/cli/devices.c:3589
-#, fuzzy, c-format
+#: ../clients/cli/devices.c:3528
+#, c-format
 msgid "Error: 'device lldp list': %s"
-msgstr "Errore: «device status»: %s"
+msgstr "Errore: «device lldp list»: %s"
 
-#: ../clients/cli/devices.c:3636
-#, fuzzy, c-format
+#: ../clients/cli/devices.c:3575
+#, c-format
 msgid "Error: 'device lldp' command '%s' is not valid."
-msgstr "Errore: il comando «device wifi» «%s» non è valido."
+msgstr "Errore: il comando 'device lldp' '%s' non è valido."
 
-#: ../clients/cli/devices.c:3825
+#: ../clients/cli/devices.c:3770
 #, c-format
 msgid "Error: 'dev' command '%s' is not valid."
 msgstr "Errore: il comando «dev» «%s» non è valido."
 
-#: ../clients/cli/general.c:35
+#: ../clients/cli/general.c:34
 msgid "RUNNING"
 msgstr "IN ESECUZIONE"
 
 #. 0
-#: ../clients/cli/general.c:36
+#: ../clients/cli/general.c:35
 msgid "VERSION"
 msgstr "VERSIONE"
 
 #. 2
-#: ../clients/cli/general.c:38
+#: ../clients/cli/general.c:37
 msgid "STARTUP"
 msgstr "STARTUP"
 
 #. 3
-#: ../clients/cli/general.c:39
+#: ../clients/cli/general.c:38
 msgid "CONNECTIVITY"
 msgstr "CONNETTIVITÀ"
 
 #. 4
-#: ../clients/cli/general.c:40
+#: ../clients/cli/general.c:39
 msgid "NETWORKING"
 msgstr "NETWORK"
 
 #. 5
-#: ../clients/cli/general.c:41
+#: ../clients/cli/general.c:40
 msgid "WIFI-HW"
 msgstr "WIFI-HW"
 
 #. 6
-#: ../clients/cli/general.c:42
+#: ../clients/cli/general.c:41
 msgid "WIFI"
 msgstr "WIFI"
 
 #. 7
-#: ../clients/cli/general.c:43
+#: ../clients/cli/general.c:42
 msgid "WWAN-HW"
 msgstr "WWAN-HW"
 
 #. 8
-#: ../clients/cli/general.c:44
+#: ../clients/cli/general.c:43
 msgid "WWAN"
 msgstr "WWAN"
 
 #. 9
-#: ../clients/cli/general.c:45
+#: ../clients/cli/general.c:44
 msgid "WIMAX-HW"
 msgstr "WIMAX-HW"
 
 #. 10
-#: ../clients/cli/general.c:46
+#: ../clients/cli/general.c:45
 msgid "WIMAX"
 msgstr "WIMAX"
 
-#: ../clients/cli/general.c:62
+#: ../clients/cli/general.c:61
 msgid "PERMISSION"
 msgstr "PERMESSO"
 
 #. 0
-#: ../clients/cli/general.c:63
+#: ../clients/cli/general.c:62
 msgid "VALUE"
 msgstr "VALORE"
 
-#: ../clients/cli/general.c:71
+#: ../clients/cli/general.c:70
 msgid "LEVEL"
 msgstr "LIVELLO"
 
 #. 0
-#: ../clients/cli/general.c:72
+#: ../clients/cli/general.c:71
 msgid "DOMAINS"
 msgstr "DOMINI"
 
-#: ../clients/cli/general.c:86
+#: ../clients/cli/general.c:85
 #, c-format
 msgid ""
 "Usage: nmcli general { COMMAND | help }\n"
@@ -4666,7 +5116,7 @@ msgstr ""
 "  logging [level <livello registrazione>] [domains <domini registrazione>]\n"
 "\n"
 
-#: ../clients/cli/general.c:97
+#: ../clients/cli/general.c:96
 #, c-format
 msgid ""
 "Usage: nmcli general status { help }\n"
@@ -4682,7 +5132,7 @@ msgstr ""
 "L'azione predefinita è «status»: «mmcli gen» equivale a «mmcli gen status»\n"
 "\n"
 
-#: ../clients/cli/general.c:106
+#: ../clients/cli/general.c:105
 #, c-format
 msgid ""
 "Usage: nmcli general hostname { ARGUMENTS | help }\n"
@@ -4691,8 +5141,8 @@ msgid ""
 "\n"
 "Get or change persistent system hostname.\n"
 "With no arguments, this prints currently configured hostname. When you pass\n"
-"a hostname, NetworkManager will set it as the new persistent system "
-"hostname.\n"
+"a hostname, NetworkManager will set it as the new persistent system hostname."
+"\n"
 "\n"
 msgstr ""
 "Uso: nmcli general hostname { ARGOMENTI | help }\n"
@@ -4704,7 +5154,7 @@ msgstr ""
 "viene passato un nome host, viene impostato come il nuovo nome host.\n"
 "\n"
 
-#: ../clients/cli/general.c:118
+#: ../clients/cli/general.c:117
 #, c-format
 msgid ""
 "Usage: nmcli general permissions { help }\n"
@@ -4717,7 +5167,7 @@ msgstr ""
 "Mostra i permessi del chiamante per le operazioni autenticate.\n"
 "\n"
 
-#: ../clients/cli/general.c:126
+#: ../clients/cli/general.c:125
 #, c-format
 msgid ""
 "Usage: nmcli general logging { ARGUMENTS | help }\n"
@@ -4742,7 +5192,7 @@ msgstr ""
 "l'elenco dei possibili domini di registrazione, consultare la pagina man.\n"
 "\n"
 
-#: ../clients/cli/general.c:139
+#: ../clients/cli/general.c:138
 #, c-format
 msgid ""
 "Usage: nmcli networking { COMMAND | help }\n"
@@ -4767,33 +5217,29 @@ msgstr ""
 "  connectivity [check]\n"
 "\n"
 
-#: ../clients/cli/general.c:149
+#: ../clients/cli/general.c:148
 #, c-format
-msgid ""
-"Usage: nmcli networking on { help }\n"
+msgid "Usage: nmcli networking on { help }\n"
 "\n"
 "Switch networking on.\n"
 "\n"
-msgstr ""
-"Uso: mmcli networking on { help }\n"
+msgstr "Uso: mmcli networking on { help }\n"
 "\n"
 "Attiva la rete.\n"
 "\n"
 
-#: ../clients/cli/general.c:157
+#: ../clients/cli/general.c:156
 #, c-format
-msgid ""
-"Usage: nmcli networking off { help }\n"
+msgid "Usage: nmcli networking off { help }\n"
 "\n"
 "Switch networking off.\n"
 "\n"
-msgstr ""
-"Uso: mmcli networking off { help }\n"
+msgstr "Uso: mmcli networking off { help }\n"
 "\n"
 "Disattiva la rete.\n"
 "\n"
 
-#: ../clients/cli/general.c:165
+#: ../clients/cli/general.c:164
 #, c-format
 msgid ""
 "Usage: nmcli networking connectivity { ARGUMENTS | help }\n"
@@ -4801,8 +5247,8 @@ msgid ""
 "ARGUMENTS := [check]\n"
 "\n"
 "Get network connectivity state.\n"
-"The optional 'check' argument makes NetworkManager re-check the "
-"connectivity.\n"
+"The optional 'check' argument makes NetworkManager re-check the connectivity."
+"\n"
 "\n"
 msgstr ""
 "Uso: nmcli networking connectivity { ARGOMENTI | help }\n"
@@ -4813,8 +5259,8 @@ msgstr ""
 "L'argomento opzionale «check» fa ricontrollare la connettività.\n"
 "\n"
 
-#: ../clients/cli/general.c:177
-#, fuzzy, c-format
+#: ../clients/cli/general.c:176
+#, c-format
 msgid ""
 "Usage: nmcli radio { COMMAND | help }\n"
 "\n"
@@ -4825,16 +5271,12 @@ msgid ""
 msgstr ""
 "Uso: nmcli radio { COMANDO | help }\n"
 "\n"
-"COMANDO := { all | wifi | wwan | wimax }\n"
-"\n"
-"  all | wifi | wwan | wimax [ on | off ]\n"
-"\n"
-"COMANDO := { all | wifi | wwan }\n"
+"COMANDO:= { all | wifi | wwan }\n"
 "\n"
 "  all | wifi | wwan [ on | off ]\n"
 "\n"
 
-#: ../clients/cli/general.c:186
+#: ../clients/cli/general.c:185
 #, c-format
 msgid ""
 "Usage: nmcli radio all { ARGUMENTS | help }\n"
@@ -4851,7 +5293,7 @@ msgstr ""
 "Ottiene lo stato di tutti gli interruttori radio o li attiva/disattiva.\n"
 "\n"
 
-#: ../clients/cli/general.c:196
+#: ../clients/cli/general.c:195
 #, c-format
 msgid ""
 "Usage: nmcli radio wifi { ARGUMENTS | help }\n"
@@ -4868,7 +5310,7 @@ msgstr ""
 "Ottiene lo stato dell'interruttore Wi-Fi o lo attiva/disattiva.\n"
 "\n"
 
-#: ../clients/cli/general.c:206
+#: ../clients/cli/general.c:205
 #, c-format
 msgid ""
 "Usage: nmcli radio wwan { ARGUMENTS | help }\n"
@@ -4882,11 +5324,10 @@ msgstr ""
 "\n"
 "ARGOMENTI := [on | off]\n"
 "\n"
-"Ottiene lo stato dell'interruttore banda larga mobile o lo attiva/"
-"disattiva.\n"
+"Ottiene lo stato dell'interruttore banda larga mobile o lo attiva/disattiva.\n"
 "\n"
 
-#: ../clients/cli/general.c:216
+#: ../clients/cli/general.c:215
 #, c-format
 msgid ""
 "Usage: nmcli monitor\n"
@@ -4895,204 +5336,206 @@ msgid ""
 "Prints a line whenever a change occurs in NetworkManager\n"
 "\n"
 msgstr ""
+"Utilizzo: nmcli monitor\n"
+"\n"
+"Monitora le modifiche a NetworkManager.\n"
+"Stampa una riga per ogni modifica a NetworkManager\n"
+"\n"
 
-#: ../clients/cli/general.c:234
+#: ../clients/cli/general.c:233
 msgid "asleep"
 msgstr "dormiente"
 
-#: ../clients/cli/general.c:236
+#: ../clients/cli/general.c:235
 msgid "connecting"
 msgstr "connessione in corso"
 
-#: ../clients/cli/general.c:238
+#: ../clients/cli/general.c:237
 msgid "connected (local only)"
 msgstr "collegato (solo local)"
 
-#: ../clients/cli/general.c:240
+#: ../clients/cli/general.c:239
 msgid "connected (site only)"
 msgstr "collegato (solo site)"
 
-#: ../clients/cli/general.c:244
+#: ../clients/cli/general.c:243
 msgid "disconnecting"
 msgstr "disconnessione in corso"
 
-#: ../clients/cli/general.c:280
+#: ../clients/cli/general.c:279
 msgid "portal"
 msgstr "portale"
 
-#: ../clients/cli/general.c:282
+#: ../clients/cli/general.c:281
 msgid "limited"
 msgstr "limitato"
 
-#: ../clients/cli/general.c:284
+#: ../clients/cli/general.c:283
 msgid "full"
 msgstr "pieno"
 
-#: ../clients/cli/general.c:335
+#: ../clients/cli/general.c:334
 #, c-format
 msgid "Error: only these fields are allowed: %s"
 msgstr "Errore: solo questi campi sono consentiti: %s"
 
-#: ../clients/cli/general.c:358
+#: ../clients/cli/general.c:360
 msgid "NetworkManager status"
 msgstr "Stato NetworkManager"
 
-#: ../clients/cli/general.c:363
+#: ../clients/cli/general.c:365
 msgid "running"
 msgstr "in esecuzione"
 
-#: ../clients/cli/general.c:366
+#: ../clients/cli/general.c:368
 msgid "starting"
 msgstr "in avvio"
 
-#: ../clients/cli/general.c:366
+#: ../clients/cli/general.c:368
 msgid "started"
 msgstr "avviata"
 
-#: ../clients/cli/general.c:368 ../clients/cli/general.c:369
 #: ../clients/cli/general.c:370 ../clients/cli/general.c:371
-#: ../clients/cli/general.c:372
+#: ../clients/cli/general.c:372 ../clients/cli/general.c:373
+#: ../clients/cli/general.c:374
 msgid "enabled"
 msgstr "abilitato"
 
-#: ../clients/cli/general.c:368 ../clients/cli/general.c:369
 #: ../clients/cli/general.c:370 ../clients/cli/general.c:371
-#: ../clients/cli/general.c:372
+#: ../clients/cli/general.c:372 ../clients/cli/general.c:373
+#: ../clients/cli/general.c:374
 msgid "disabled"
 msgstr "disabilitato"
 
-#: ../clients/cli/general.c:435
+#: ../clients/cli/general.c:446
 msgid "auth"
 msgstr "autorizzazione"
 
-#: ../clients/cli/general.c:464
+#: ../clients/cli/general.c:475
 #, c-format
 msgid "Error: 'general permissions': %s"
 msgstr "Errore: «general permissions»: %s"
 
-#: ../clients/cli/general.c:478
+#: ../clients/cli/general.c:489
 msgid "NetworkManager permissions"
 msgstr "Permessi NetworkManager"
 
-#: ../clients/cli/general.c:519
+#: ../clients/cli/general.c:530
 #, c-format
 msgid "Error: 'general logging': %s"
 msgstr "Errore: «general logging»: %s"
 
-#: ../clients/cli/general.c:534
+#: ../clients/cli/general.c:545
 msgid "NetworkManager logging"
 msgstr "Registrazioni di NetworkManager"
 
-#: ../clients/cli/general.c:556
+#: ../clients/cli/general.c:567
 #, c-format
 msgid "Error: failed to set hostname: %s"
 msgstr "Errore: impostazione nome host non riuscita: %s"
 
-#: ../clients/cli/general.c:669
+#: ../clients/cli/general.c:680
 #, c-format
 msgid "Error: failed to set logging: %s"
 msgstr "Errore: impostazione della registrazione non riuscita: %s"
 
-#: ../clients/cli/general.c:678
+#: ../clients/cli/general.c:689
 #, c-format
 msgid "Error: 'general' command '%s' is not valid."
 msgstr "Errore: comando «general» «%s» non valido."
 
-#: ../clients/cli/general.c:696
+#: ../clients/cli/general.c:707
 #, c-format
 msgid "Error: '--fields' value '%s' is not valid here (allowed field: %s)"
 msgstr ""
 "Errore: qui il valore «--fields» «%s» non è valido (campo consentito: %s)"
 
-#: ../clients/cli/general.c:721
+#: ../clients/cli/general.c:732
 #, c-format
 msgid "Error: invalid '%s' argument: '%s' (use on/off)."
 msgstr "Errore: argomento «%s» non valido: «%s» (usare on/off)"
 
-#: ../clients/cli/general.c:732
+#: ../clients/cli/general.c:743
 msgid "Connectivity"
 msgstr "Connettività"
 
-#: ../clients/cli/general.c:747
+#: ../clients/cli/general.c:758
 msgid "Networking"
 msgstr "Rete"
 
-#: ../clients/cli/general.c:772
+#: ../clients/cli/general.c:783
 #, c-format
 msgid "Error: 'networking connectivity' command '%s' is not valid."
 msgstr "Errore: il comando «networking connectivity» «%s» non è valido."
 
-#: ../clients/cli/general.c:788
+#: ../clients/cli/general.c:799
 #, c-format
 msgid "Error: 'networking' command '%s' is not valid."
 msgstr "Errore: il comando «networking» «%s» non è valido."
 
-#: ../clients/cli/general.c:817 ../clients/cli/general.c:837
+#: ../clients/cli/general.c:828 ../clients/cli/general.c:848
 msgid "Radio switches"
 msgstr "Interruttori radio"
 
 #. no argument, show current WiFi state
-#: ../clients/cli/general.c:855
+#: ../clients/cli/general.c:866
 msgid "Wi-Fi radio switch"
 msgstr "Interruttore Wi-Fi"
 
 #. no argument, show current WWAN (mobile broadband) state
-#: ../clients/cli/general.c:871
+#: ../clients/cli/general.c:882
 msgid "WWAN radio switch"
 msgstr "Interruttore WWAN"
 
-#: ../clients/cli/general.c:882
+#: ../clients/cli/general.c:893
 #, c-format
 msgid "Error: 'radio' command '%s' is not valid."
 msgstr "Errore: il comando «radio» «%s» non è valido."
 
-#: ../clients/cli/general.c:902
-#, fuzzy
+#: ../clients/cli/general.c:914
 msgid "NetworkManager has started"
-msgstr "Stato NetworkManager"
+msgstr "NetworkManager avviato"
 
-#: ../clients/cli/general.c:902
-#, fuzzy
+#: ../clients/cli/general.c:917
 msgid "NetworkManager has stopped"
-msgstr "Stato NetworkManager"
+msgstr "NetworkManager fermato"
 
-#: ../clients/cli/general.c:913
-#, fuzzy, c-format
+#: ../clients/cli/general.c:931
+#, c-format
 msgid "Hostname set to '%s'\n"
-msgstr "Nome host impostato a «%s»"
+msgstr "Nome host impostato a '%s'\n"
 
-#: ../clients/cli/general.c:928
-#, fuzzy, c-format
+#: ../clients/cli/general.c:946
+#, c-format
 msgid "'%s' is now the primary connection\n"
-msgstr "L'impostazione «%s» non è presente nella connessione.\n"
+msgstr "'%s' ora è la connessione primaria\n"
 
-#: ../clients/cli/general.c:930
-#, fuzzy, c-format
+#: ../clients/cli/general.c:948
+#, c-format
 msgid "There's no primary connection\n"
-msgstr "Verifica della connessione: %s\n"
+msgstr "Nessuna connessione primaria\n"
 
-#: ../clients/cli/general.c:942
-#, fuzzy, c-format
+#: ../clients/cli/general.c:960
+#, c-format
 msgid "Connectivity is now '%s'\n"
-msgstr "Connettività"
+msgstr "La connettività ora è '%s'\n"
 
-#: ../clients/cli/general.c:955
-#, fuzzy, c-format
+#: ../clients/cli/general.c:973
+#, c-format
 msgid "Networkmanager is now in the '%s' state\n"
-msgstr "NetworkManager è entrato in pausa"
+msgstr "NetworkManager ora è in stato '%s'\n"
 
-#: ../clients/cli/general.c:966
-#, fuzzy, c-format
+#: ../clients/cli/general.c:984
+#, c-format
 msgid "Error: 'monitor' command '%s' is not valid."
-msgstr "Errore: il comando «radio» «%s» non è valido."
+msgstr "Errore: il comando 'monitor' '%s' non è valido."
 
-#: ../clients/cli/general.c:980
-#, fuzzy
+#: ../clients/cli/general.c:998
 msgid "Networkmanager is not running (waiting for it)\n"
-msgstr "NetworkManager è già in esecuzione (pid %ld)\n"
+msgstr "NetworkManager non in esecuzione (in attesa)\n"
 
 #: ../clients/cli/nmcli.c:83
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "Usage: %s [OPTIONS] OBJECT { COMMAND | help }\n"
 "\n"
@@ -5100,11 +5543,12 @@ msgid ""
 "  -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"
+"  -c[olors] auto|yes|no                      whether to use colors in output\n"
 "  -f[ields] <field1,field2,...>|all|common   specify fields to output\n"
 "  -e[scape] yes|no                           escape columns separators in "
 "values\n"
+"  -n[ocheck]                                 don't check nmcli and "
+"NetworkManager versions\n"
 "  -a[sk]                                     ask for missing parameters\n"
 "  -s[how-secrets]                            allow displaying passwords\n"
 "  -w[ait] <seconds>                          set timeout waiting for "
@@ -5128,107 +5572,112 @@ msgstr ""
 "  -t[erse]                                   Output conciso\n"
 "  -p[retty]                                  Output formattato\n"
 "  -m[ode] tabular|multiline                  Modalità output\n"
+"  -c[olors] auto|yes|no                      Indica se utilizzare i colori "
+"nell'output\n"
 "  -f[ields] <field1,field2,...>|all|common   Specifica i campi da mostrare\n"
 "  -e[scape] yes|no                           Esegue l'escape dei separatori\n"
 "                                             delle colonne nei valori\n"
+"  -n[ocheck]                                 Non verifica le versioni di "
+"nmcli e NetworkManager\n"
 "  -a[sk]                                     Chiede i parametri mancanti\n"
+"  -s[how-secrets]                            Permette la visualizzazione "
+"delle password\n"
 "  -w[ait] <secondi>                          Imposta il timeout di attesa "
-"per il\n"
-"                                             completamento delle operazioni\n"
+"per il  completamento delle operazioni\n"
 "  -v[ersion]                                 Mostra la versione del "
 "programma\n"
-"  -h[elp]                                    Stampa questo aiuto\n"
+"  -h[elp]                                    Stampa questa guida\n"
 "\n"
 "OGGETTO\n"
-"  g[eneral]       Stato e operazioni di NetworkManager\n"
+"  g[eneral]       Stato e operazioni generali di NetworkManager\n"
 "  n[etworking]    Controllo di rete generale\n"
 "  r[adio]         Interruttori radio di NetworkManager\n"
 "  c[onnection]    Connessioni di NetworkManager\n"
 "  d[evice]        Dispositivi gestiti da NetworkManager\n"
+"  a[gent]         Agente segreto o agente polkit NetworkManager\n"
+"  m[onitor]       Monitora le modifiche a NetworkManager\n"
 "\n"
 
-#: ../clients/cli/nmcli.c:142
+#: ../clients/cli/nmcli.c:143
 #, c-format
 msgid "Error: Object '%s' is unknown, try 'nmcli help'."
 msgstr "Errore: l'oggetto «%s» è sconosciuto, provare «nmcli help»."
 
-#: ../clients/cli/nmcli.c:183
+#: ../clients/cli/nmcli.c:173
 #, c-format
 msgid "Error: Option '--terse' is specified the second time."
 msgstr "Errore: l'opzione «--terse» è stata specificata una seconda volta."
 
-#: ../clients/cli/nmcli.c:188
+#: ../clients/cli/nmcli.c:178
 #, c-format
 msgid "Error: Option '--terse' is mutually exclusive with '--pretty'."
 msgstr "Errore: l'opzione «--terse» si esclude con «--pretty»."
 
-#: ../clients/cli/nmcli.c:196
+#: ../clients/cli/nmcli.c:186
 #, c-format
 msgid "Error: Option '--pretty' is specified the second time."
 msgstr "Errore: l'opzione «--pretty» è stata specificata una seconda volta."
 
-#: ../clients/cli/nmcli.c:201
+#: ../clients/cli/nmcli.c:191
 #, c-format
 msgid "Error: Option '--pretty' is mutually exclusive with '--terse'."
 msgstr "Errore: l'opzione «--pretty» si esclude con «--terse»."
 
-#: ../clients/cli/nmcli.c:211 ../clients/cli/nmcli.c:227
-#: ../clients/cli/nmcli.c:245 ../clients/cli/nmcli.c:276
+#: ../clients/cli/nmcli.c:201 ../clients/cli/nmcli.c:217
+#: ../clients/cli/nmcli.c:235 ../clients/cli/nmcli.c:266
 #, c-format
 msgid "Error: missing argument for '%s' option."
 msgstr "Errore: manca l'argomento per l'opzione «%s»."
 
-#: ../clients/cli/nmcli.c:220 ../clients/cli/nmcli.c:238
-#: ../clients/cli/nmcli.c:254
+#: ../clients/cli/nmcli.c:210 ../clients/cli/nmcli.c:228
+#: ../clients/cli/nmcli.c:244
 #, c-format
 msgid "Error: '%s' is not valid argument for '%s' option."
 msgstr "Errore: \"%s\" non è un argomento valido per l'opzione «%s»."
 
-#: ../clients/cli/nmcli.c:261
+#: ../clients/cli/nmcli.c:251
 #, c-format
 msgid "Error: fields for '%s' options are missing."
 msgstr "Errore: mancano i campi per le opzioni «%s»."
 
-#: ../clients/cli/nmcli.c:281
+#: ../clients/cli/nmcli.c:271
 #, c-format
 msgid "Error: '%s' is not a valid timeout for '%s' option."
 msgstr "Errore: «%s» non è un timeout valido per l'opzione «%s»."
 
-#: ../clients/cli/nmcli.c:288
+#: ../clients/cli/nmcli.c:278
 #, c-format
 msgid "nmcli tool, version %s\n"
 msgstr "Strumento nmcli, versione %s\n"
 
-#: ../clients/cli/nmcli.c:294
+#: ../clients/cli/nmcli.c:284
 #, c-format
 msgid "Error: Option '%s' is unknown, try 'nmcli -help'."
 msgstr "Errore: l'opzione «%s» è sconosciuta, provare «nmcli -help»."
 
-#: ../clients/cli/nmcli.c:377 ../clients/cli/nmcli.c:387
+#: ../clients/cli/nmcli.c:367 ../clients/cli/nmcli.c:377
 #, c-format
-msgid ""
-"\n"
+msgid "\n"
 "Error: nmcli terminated by signal %s (%d)\n"
-msgstr ""
-"\n"
+msgstr "\n"
 "Errore: mmcli terminato dal segnale %s (%d)\n"
 
-#: ../clients/cli/nmcli.c:418
+#: ../clients/cli/nmcli.c:408
 #, c-format
 msgid "Failed to set signal mask: %d\n"
 msgstr "Impostazione della maschera di segnale non riuscita: %d\n"
 
-#: ../clients/cli/nmcli.c:425
+#: ../clients/cli/nmcli.c:415
 #, c-format
 msgid "Failed to create signal handling thread: %d\n"
 msgstr "Creazione del thread per la gestione dei segnali non riuscita: %d\n"
 
-#: ../clients/cli/nmcli.c:522 ../clients/nm-online.c:193
+#: ../clients/cli/nmcli.c:512 ../clients/nm-online.c:193
 #, c-format
 msgid "Error: Could not create NMClient object: %s."
 msgstr "Errore: impossibile creare l'oggetto NMClient: %s."
 
-#: ../clients/cli/nmcli.c:539
+#: ../clients/cli/nmcli.c:529
 msgid "Success"
 msgstr "Successo"
 
@@ -5247,134 +5696,126 @@ msgstr "Errore di autenticazione: %s\n"
 msgid "Warning: polkit agent initialization failed: %s\n"
 msgstr "Attenzione: inizializzazione agente polkit non riuscita: %s\n"
 
-#: ../clients/cli/settings.c:796
+#: ../clients/cli/settings.c:790
 #, c-format
 msgid "%d (key)"
 msgstr "%d (chiave)"
 
-#: ../clients/cli/settings.c:798
+#: ../clients/cli/settings.c:792
 #, c-format
 msgid "%d (passphrase)"
 msgstr "%d (passphrase)"
 
-#: ../clients/cli/settings.c:801 ../clients/cli/settings.c:887
+#: ../clients/cli/settings.c:795 ../clients/cli/settings.c:881
 #, c-format
 msgid "%d (unknown)"
 msgstr "%d (sconosciuto)"
 
-#: ../clients/cli/settings.c:830
+#: ../clients/cli/settings.c:824
 msgid "0 (NONE)"
 msgstr "0 (NESSUNO)"
 
-#: ../clients/cli/settings.c:836
+#: ../clients/cli/settings.c:830
 msgid "REORDER_HEADERS, "
 msgstr "REORDER_HEADERS, "
 
-#: ../clients/cli/settings.c:838
+#: ../clients/cli/settings.c:832
 msgid "GVRP, "
 msgstr "GVRP, "
 
-#: ../clients/cli/settings.c:840
+#: ../clients/cli/settings.c:834
 msgid "LOOSE_BINDING, "
 msgstr "LOOSE_BINDING, "
 
-#: ../clients/cli/settings.c:842
-#, fuzzy
+#: ../clients/cli/settings.c:836
 msgid "MVRP, "
-msgstr "GVRP, "
+msgstr "MVRP, "
 
-#: ../clients/cli/settings.c:881
+#: ../clients/cli/settings.c:875
 #, c-format
 msgid "%d (disabled)"
 msgstr "%d (disabilitato)"
 
-#: ../clients/cli/settings.c:883
+#: ../clients/cli/settings.c:877
 #, c-format
 msgid "%d (enabled, prefer public IP)"
 msgstr "%d (abilitato, preferire IP pubblico)"
 
-#: ../clients/cli/settings.c:885
+#: ../clients/cli/settings.c:879
 #, c-format
 msgid "%d (enabled, prefer temporary IP)"
 msgstr "%d (abilitato, preferire IP temporaneo)"
 
-#: ../clients/cli/settings.c:900
+#: ../clients/cli/settings.c:894
 #, c-format
 msgid "%d (no)"
 msgstr "%d (no)"
 
-#: ../clients/cli/settings.c:902
+#: ../clients/cli/settings.c:896
 #, c-format
 msgid "%d (yes)"
 msgstr "%d (sì)"
 
-#: ../clients/cli/settings.c:905 ../clients/cli/settings.c:1605
+#: ../clients/cli/settings.c:899 ../clients/cli/settings.c:1554
 #, c-format
 msgid "%d (default)"
 msgstr "%d (predefinito)"
 
-#: ../clients/cli/settings.c:918
+#: ../clients/cli/settings.c:912
 msgid "0 (none)"
 msgstr "0 (nessuno)"
 
-#: ../clients/cli/settings.c:924
+#: ../clients/cli/settings.c:918
 msgid "agent-owned, "
 msgstr "proprietà agente, "
 
-#: ../clients/cli/settings.c:926
+#: ../clients/cli/settings.c:920
 msgid "not saved, "
 msgstr "non salvato, "
 
-#: ../clients/cli/settings.c:928
+#: ../clients/cli/settings.c:922
 msgid "not required, "
 msgstr "non richiesto, "
 
-#: ../clients/cli/settings.c:977 ../clients/tui/nmt-mtu-entry.c:84
+#: ../clients/cli/settings.c:971 ../clients/tui/nmt-mtu-entry.c:84
 msgid "(default)"
 msgstr "(predefinito)"
 
-#. ----------------------------------------------------------------------------
-#: ../clients/cli/settings.c:1063 ../clients/cli/settings.c:1106
-#: ../clients/cli/settings.c:1140 ../clients/cli/settings.c:1167
-#: ../clients/cli/settings.c:8033
-msgid "<hidden>"
-msgstr "<nascosta>"
-
-#: ../clients/cli/settings.c:1302
+#: ../clients/cli/settings.c:1252
 msgid "0 (disabled)"
 msgstr "0 (disabilitato)"
 
-#: ../clients/cli/settings.c:1308
+#: ../clients/cli/settings.c:1258
 msgid "enabled, "
 msgstr "abilitato,"
 
-#: ../clients/cli/settings.c:1310
+#: ../clients/cli/settings.c:1260
 msgid "advertise, "
 msgstr "pubblicizza, "
 
-#: ../clients/cli/settings.c:1312
+#: ../clients/cli/settings.c:1262
 msgid "willing, "
 msgstr "disponibile, "
 
-#: ../clients/cli/settings.c:1340
+#: ../clients/cli/settings.c:1290
 msgid "-1 (unset)"
 msgstr "-1 (non impostato)"
 
-#: ../clients/cli/settings.c:1472 ../clients/cli/settings.c:1777
-#: ../clients/cli/settings.c:1917
+#: ../clients/cli/settings.c:1422 ../clients/cli/settings.c:1724
+#: ../clients/cli/settings.c:1864
 msgid "auto"
 msgstr "auto"
 
-#: ../clients/cli/settings.c:1485 ../clients/cli/settings.c:1948
+#: ../clients/cli/settings.c:1435 ../clients/cli/settings.c:1895
 msgid "default"
 msgstr "predefinito"
 
-#: ../clients/cli/settings.c:1607
-#, fuzzy, c-format
+#: ../clients/cli/settings.c:1556
+#, c-format
 msgid "%d (off)"
-msgstr "%d (no)"
+msgstr "%d (off)"
 
-#: ../clients/cli/settings.c:1823
+#: ../clients/cli/settings.c:1770
 #, c-format
 msgid ""
 "invalid option '%s', use a combination of [%s] or 'ignore', 'default' or "
@@ -5383,38 +5824,38 @@ msgstr ""
 "opzione \"%s\" non valida, usare una combinazione di [%s] o \"ignore\", "
 "\"default\" oppure \"none\""
 
-#: ../clients/cli/settings.c:1834
+#: ../clients/cli/settings.c:1781
 msgid "'default' and 'ignore' are incompatible with other flags"
 msgstr "\"default\" e \"ignore\" sono incompatibili con altri flag"
 
-#: ../clients/cli/settings.c:1870
-#, fuzzy, c-format
+#: ../clients/cli/settings.c:1817
+#, c-format
 msgid "invalid mode '%s', use one of %s"
-msgstr "campo «%s» non valido; campi consentiti: %s"
+msgstr "modalità '%s' non valida, utilizzare una tra %s"
 
-#: ../clients/cli/settings.c:1952
+#: ../clients/cli/settings.c:1899
 #, c-format
 msgid "always"
-msgstr ""
+msgstr "sempre"
 
-#: ../clients/cli/settings.c:2052 ../clients/cli/settings.c:3398
-#: ../clients/cli/settings.c:4590 ../clients/cli/settings.c:5093
+#: ../clients/cli/settings.c:1999 ../clients/cli/settings.c:3286
+#: ../clients/cli/settings.c:4478 ../clients/cli/settings.c:4981
 #: ../libnm-core/nm-keyfile-reader.c:573
-#, fuzzy, c-format
+#, c-format
 msgid "invalid option '%s', use one of [%s]"
-msgstr "opzione «%s» o il suo valore «%s» non valido"
+msgstr "opzione '%s' non valida, utilizzare una tra [%s]"
 
-#: ../clients/cli/settings.c:2162
+#: ../clients/cli/settings.c:2116
 #, c-format
 msgid "Do you also want to set '%s' to '%s'? [yes]: "
 msgstr "Impostare anche «%s» a «%s»? [yes]: "
 
-#: ../clients/cli/settings.c:2164
+#: ../clients/cli/settings.c:2118
 #, c-format
 msgid "Do you also want to clear '%s'? [yes]: "
 msgstr "Cancellare anche «%s»? [yes]: "
 
-#: ../clients/cli/settings.c:2325
+#: ../clients/cli/settings.c:2279
 #, c-format
 msgid ""
 "Warning: %s.%s set to '%s', but it might be ignored in infrastructure mode\n"
@@ -5422,88 +5863,88 @@ msgstr ""
 "Attenzione: %s.%s impostata a \"%s\", ma potrebbe essere ignorata in "
 "modalità infrastructure\n"
 
-#: ../clients/cli/settings.c:2344
+#: ../clients/cli/settings.c:2298
 #, c-format
 msgid "Warning: setting %s.%s requires removing ipv4 and ipv6 settings\n"
 msgstr ""
 "Attenzione: l'impostazione %s.%s richiede la rimozione delle impostazione "
 "ipv4 e ipv6\n"
 
-#: ../clients/cli/settings.c:2346
+#: ../clients/cli/settings.c:2300
 msgid "Do you want to remove them? [yes] "
 msgstr "Rimuoverli ora? [sì] "
 
-#: ../clients/cli/settings.c:2482 ../clients/cli/settings.c:2877
-#: ../clients/cli/settings.c:5294
+#: ../clients/cli/settings.c:2396 ../clients/cli/settings.c:2791
+#: ../clients/cli/settings.c:5182
 #, c-format
 msgid "'%s' is not valid"
 msgstr "«%s» non è valido"
 
-#: ../clients/cli/settings.c:2505
+#: ../clients/cli/settings.c:2419
 #, c-format
 msgid "'%d' is not valid; use <%d-%d>"
 msgstr "«%d» non è valido; usare <%d-%d>"
 
-#: ../clients/cli/settings.c:2527
+#: ../clients/cli/settings.c:2441
 #, c-format
 msgid "'%lld' is not valid; use <%lld-%lld>"
 msgstr "\"%lld\" non è valido; usare <%lld-%lld>"
 
-#: ../clients/cli/settings.c:2549
+#: ../clients/cli/settings.c:2463
 #, c-format
 msgid "'%u' is not valid; use <%u-%u>"
 msgstr "\"%u\" non è valido; usare <%u-%u>"
 
-#: ../clients/cli/settings.c:2588
+#: ../clients/cli/settings.c:2502
 #, c-format
 msgid "'%u' flags are not valid; use combination of %s"
 msgstr "\"%u\" flag non sono validi, usare una combinazione di %s"
 
-#: ../clients/cli/settings.c:2655
+#: ../clients/cli/settings.c:2569
 #, c-format
 msgid "'%s' is not valid; use <option>=<value>"
 msgstr "«%s» non è valido; usare <opzione>=<valore>"
 
-#: ../clients/cli/settings.c:2689
+#: ../clients/cli/settings.c:2603
 #, c-format
 msgid "index '%s' is not valid"
 msgstr "l'indice «%s» non è valido"
 
-#: ../clients/cli/settings.c:2694 ../clients/cli/settings.c:2719
+#: ../clients/cli/settings.c:2608 ../clients/cli/settings.c:2633
 msgid "no item to remove"
 msgstr "nessun elemento da rimuovere"
 
-#: ../clients/cli/settings.c:2698 ../clients/cli/settings.c:2723
+#: ../clients/cli/settings.c:2612 ../clients/cli/settings.c:2637
 #, c-format
 msgid "index '%d' is not in range <0-%d>"
 msgstr "l'indice «%d» non è nell'intervallo <0-%d>"
 
-#: ../clients/cli/settings.c:2738
+#: ../clients/cli/settings.c:2652
 #, c-format
 msgid "invalid option '%s'"
 msgstr "opzione «%s» non valida"
 
-#: ../clients/cli/settings.c:2740
+#: ../clients/cli/settings.c:2654
 msgid "missing option"
 msgstr "opzione mancante"
 
-#: ../clients/cli/settings.c:2767 ../clients/cli/settings.c:2787
-#: ../clients/cli/settings.c:2807 ../clients/cli/settings.c:2827
+#: ../clients/cli/settings.c:2681 ../clients/cli/settings.c:2701
+#: ../clients/cli/settings.c:2721 ../clients/cli/settings.c:2741
 #, c-format
 msgid "'%s' is not a valid number (or out of range)"
 msgstr "«%s» non è un numero valido (o non è nell'intervallo)"
 
-#: ../clients/cli/settings.c:2861
+#: ../clients/cli/settings.c:2775
 #, c-format
 msgid "'%s' is not a valid value; use -1, 0 or 1"
 msgstr "\"%s\" non è valore valido; usare -1, 0 o 1"
 
-#: ../clients/cli/settings.c:2893
+#: ../clients/cli/settings.c:2807
 #, c-format
 msgid "'%s' is not a valid Ethernet MAC"
 msgstr "«%s» non è un MAC Ethernet valido"
 
-#: ../clients/cli/settings.c:2918 ../libnm-core/nm-setting-connection.c:864
+#: ../clients/cli/settings.c:2832 ../libnm-core/nm-setting-connection.c:864
 #: ../libnm-core/nm-setting-infiniband.c:255
 #: ../libnm-util/nm-setting-connection.c:834
 #: ../libnm-util/nm-setting-infiniband.c:269
@@ -5511,55 +5952,42 @@ msgstr "«%s» non è un MAC Ethernet valido"
 msgid "'%s' is not a valid interface name"
 msgstr "«%s» non è un nome valido di interfaccia"
 
-#: ../clients/cli/settings.c:2942
+#: ../clients/cli/settings.c:2856
 #, c-format
 msgid "'%s' is not a valid flag number; use <0-%d>"
 msgstr "\"%s\" non è un numero di flag valido; usare <0-%d>"
 
-#: ../clients/cli/settings.c:2954
+#: ../clients/cli/settings.c:2868
 #, c-format
 msgid "Warning: '%s' sum is higher than all flags => all flags set\n"
 msgstr ""
 "Attenzione: la somma \"%s\" è maggiore di tutti i flag => tutti i flag "
 "impostati\n"
 
-#: ../clients/cli/settings.c:2995
+#: ../clients/cli/settings.c:2909
 #, c-format
 msgid "'%s' is not a valid hex character"
 msgstr "«%s» non è un carattere hex valido"
 
-#: ../clients/cli/settings.c:3025
+#: ../clients/cli/settings.c:2939
 #, c-format
 msgid "'%s' is not a valid MAC"
 msgstr "«%s» non è un MAC valido"
 
-#. Don't allow setting type unless the connection is brand new.
-#. * Just because it's a bad idea and the user wouldn't probably want that.
-#. * No technical reason, really.
-#. * Also, using uuid to see if the connection is brand new is a bit
-#. * 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/cli/settings.c:3053
-#, fuzzy, c-format
-msgid "Can not change the connection type"
-msgstr "Tipo di connessione Bluetooth sconosciuta/non gestita"
-
-#: ../clients/cli/settings.c:3077 ../libnm-core/nm-setting-connection.c:853
+#: ../clients/cli/settings.c:2965 ../libnm-core/nm-setting-connection.c:853
 #: ../libnm-util/nm-setting-connection.c:791
 #, c-format
 msgid "'%s' is not a valid UUID"
 msgstr "«%s» non è uno UUID valido"
 
-#: ../clients/cli/settings.c:3144
+#: ../clients/cli/settings.c:3032
 #, c-format
 msgid "the property doesn't contain permission '%s'"
 msgstr "la proprietà non contiene il permesso \"%s\""
 
-#: ../clients/cli/settings.c:3156
+#: ../clients/cli/settings.c:3044
 msgid ""
-"Enter a list of user permissions. This is a list of user names formatted "
-"as:\n"
+"Enter a list of user permissions. This is a list of user names formatted as:\n"
 "  [user:]<user name 1>, [user:]<user name 2>,...\n"
 "The items can be separated by commas or spaces.\n"
 "\n"
@@ -5572,40 +6000,39 @@ msgstr ""
 "\n"
 "Esempio: mario carlo alice\n"
 
-#: ../clients/cli/settings.c:3175
+#: ../clients/cli/settings.c:3063
 #, c-format
 msgid "'%s' is not valid master; use ifname or connection UUID"
 msgstr "«%s» non è un master valido, usare ifname o lo UUID di connessione"
 
-#: ../clients/cli/settings.c:3219
+#: ../clients/cli/settings.c:3107
 #, c-format
 msgid "Warning: %s is not an UUID of any existing connection profile\n"
 msgstr "Attenzione: %s non è uno UUID di un profilo di connessione esistente\n"
 
-#: ../clients/cli/settings.c:3223 ../clients/cli/settings.c:3239
+#: ../clients/cli/settings.c:3111 ../clients/cli/settings.c:3127
 #, c-format
 msgid "'%s' is not a VPN connection profile"
 msgstr "\"%s\" non è un profilo di una connessione VPN"
 
-#: ../clients/cli/settings.c:3232
+#: ../clients/cli/settings.c:3120
 #, c-format
 msgid "'%s' is not a name of any exiting profile"
 msgstr "\"%s\" non è il nome di un profilo esistente"
 
-#: ../clients/cli/settings.c:3266
+#: ../clients/cli/settings.c:3154
 #, c-format
 msgid "the value '%s' is not a valid UUID"
 msgstr "il valore \"%s\" non è uno UUID valido"
 
-#: ../clients/cli/settings.c:3273
+#: ../clients/cli/settings.c:3161
 #, c-format
 msgid "the property doesn't contain UUID '%s'"
 msgstr "la proprietà non contiene lo UUID \"%s\""
 
-#: ../clients/cli/settings.c:3285
+#: ../clients/cli/settings.c:3173
 msgid ""
-"Enter secondary connections that should be activated when this connection "
-"is\n"
+"Enter secondary connections that should be activated when this connection is\n"
 "activated. Connections can be specified either by UUID or ID (name). nmcli\n"
 "transparently translates names to UUIDs. Note that NetworkManager only "
 "supports\n"
@@ -5622,7 +6049,7 @@ msgstr ""
 "\n"
 "Esempio: private-openvpn, fe6ba5d8-c2fc-4aae-b2e3-97efddd8d9a7\n"
 
-#: ../clients/cli/settings.c:3352
+#: ../clients/cli/settings.c:3240
 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"
@@ -5637,16 +6064,16 @@ msgstr ""
 "\"unknown\" per consentire a NetworkManager di scegliere un valore in base\n"
 "a delle euristiche\n"
 
-#: ../clients/cli/settings.c:3476
+#: ../clients/cli/settings.c:3364
 msgid "private key password not provided"
 msgstr "password della chiave privata non fornita"
 
-#: ../clients/cli/settings.c:3504
+#: ../clients/cli/settings.c:3392
 #, c-format
 msgid "the property doesn't contain EAP method '%s'"
 msgstr "la proprietà non contiene il metodo EAP \"%s\""
 
-#: ../clients/cli/settings.c:3521
+#: ../clients/cli/settings.c:3409
 msgid ""
 "Enter file path to CA certificate (optionally prefixed with file://).\n"
 "  [file://]<file path>\n"
@@ -5658,26 +6085,25 @@ msgstr ""
 "nmcli non supporta i certificati passati come puri dati binari.\n"
 "Esempio: /home/mario/cacert.crt\n"
 
-#: ../clients/cli/settings.c:3540
+#: ../clients/cli/settings.c:3428
 #, c-format
 msgid "the property doesn't contain alternative subject match '%s'"
 msgstr ""
 "la proprietà non contiene un oggetto alternativo che corrisponde a \"%s\""
 
-#: ../clients/cli/settings.c:3556
+#: ../clients/cli/settings.c:3444
 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 ""
-"Digitare il percorso al certificato client (col prefisso file:// "
-"opzionale):\n"
+"Digitare il percorso al certificato client (col prefisso file:// opzionale):\n"
 "  [file://]<percorso file>\n"
 "nmcli non supporta i certificati passati come puri dati binari.\n"
 "Esempio: /home/mario/jara.crt\n"
 
-#: ../clients/cli/settings.c:3568
+#: ../clients/cli/settings.c:3456
 msgid ""
 "Enter file path to CA certificate for inner authentication (optionally "
 "prefixed\n"
@@ -5692,14 +6118,14 @@ msgstr ""
 "nmcli non supporta i certificati passati come puri dati binari.\n"
 "Esempio: /home/mario/ca-zweite-phase.crt\n"
 
-#: ../clients/cli/settings.c:3588
+#: ../clients/cli/settings.c:3476
 #, c-format
 msgid "the property doesn't contain \"phase2\" alternative subject match '%s'"
 msgstr ""
 "la proprietà non contiene un oggetto alternativo \"phase2\" che corrisponde "
 "a \"%s\""
 
-#: ../clients/cli/settings.c:3604
+#: ../clients/cli/settings.c:3492
 msgid ""
 "Enter file path to client certificate for inner authentication (optionally "
 "prefixed\n"
@@ -5714,7 +6140,7 @@ msgstr ""
 "nmcli non supporta i certificati passati come puri dati binari.\n"
 "Esempio: /home/mario/jara-zweite-phase.crt\n"
 
-#: ../clients/cli/settings.c:3624
+#: ../clients/cli/settings.c:3512
 msgid ""
 "Enter path to a private key and the key password (if not set yet):\n"
 "  [file://]<file path> [<password>]\n"
@@ -5727,12 +6153,11 @@ msgstr ""
 "nmcli non supporta le chiavi private passate come puri dati binari.\n"
 "Esempio: /home/mario/jara-priv-key Passwordsicura\n"
 
-#: ../clients/cli/settings.c:3695
+#: ../clients/cli/settings.c:3583
 msgid ""
 "Enter bytes as a list of hexadecimal values.\n"
 "Two formats are accepted:\n"
-"(a) a string of hexadecimal digits, where each two digits represent one "
-"byte\n"
+"(a) a string of hexadecimal digits, where each two digits represent one byte\n"
 "(b) space-separated list of bytes written as hexadecimal digits (with "
 "optional 0x/0X prefix, and optional leading 0).\n"
 "\n"
@@ -5748,7 +6173,7 @@ msgstr ""
 "Esempi: ab0455a6ea3a74C2\n"
 "        ab 4 55 0xa6 ea 3a 74 C2\n"
 
-#: ../clients/cli/settings.c:3816
+#: ../clients/cli/settings.c:3704
 #, c-format
 msgid ""
 "Enter a list of bonding options formatted as:\n"
@@ -5779,32 +6204,32 @@ msgstr ""
 "\n"
 "Esempio: mode=2,miimon=120\n"
 
-#: ../clients/cli/settings.c:3847
+#: ../clients/cli/settings.c:3735
 #, c-format
 msgid "'%s' is not a valid InfiniBand MAC"
 msgstr "«%s» non è un MAC InfiniBand valido"
 
-#: ../clients/cli/settings.c:3884
+#: ../clients/cli/settings.c:3772
 #, c-format
 msgid "'%s' is not a valid IBoIP P_Key"
 msgstr "«%s» non è una P_Key IBoIP valida"
 
-#: ../clients/cli/settings.c:3915
+#: ../clients/cli/settings.c:3803
 #, c-format
 msgid "'%s' is not valid (the format is: ip[/prefix] [next-hop] [metric])"
 msgstr "\"%s\" non è valido (il formato è: ip[/prefisso] [next-hop] [metrica])"
 
-#: ../clients/cli/settings.c:3963 ../clients/cli/settings.c:3982
+#: ../clients/cli/settings.c:3851 ../clients/cli/settings.c:3870
 #, c-format
 msgid "invalid IPv4 address '%s'"
 msgstr "indirizzo IPv4 «%s» non valido"
 
-#: ../clients/cli/settings.c:3988 ../clients/cli/settings.c:4296
+#: ../clients/cli/settings.c:3876 ../clients/cli/settings.c:4184
 #, c-format
 msgid "the property doesn't contain DNS server '%s'"
 msgstr "la proprietà non contiene il server DNS \"%s\""
 
-#: ../clients/cli/settings.c:4000
+#: ../clients/cli/settings.c:3888
 msgid ""
 "Enter a list of IPv4 addresses of DNS servers.\n"
 "\n"
@@ -5814,22 +6239,22 @@ msgstr ""
 "\n"
 "Esempio: 8.8.8.8, 8.8.4.4\n"
 
-#: ../clients/cli/settings.c:4036 ../clients/cli/settings.c:4350
+#: ../clients/cli/settings.c:3924 ../clients/cli/settings.c:4238
 #, c-format
 msgid "the property doesn't contain DNS search domain '%s'"
 msgstr "la proprietà non contiene il dominio di ricerca DNS \"%s\""
 
-#: ../clients/cli/settings.c:4074 ../clients/cli/settings.c:4388
+#: ../clients/cli/settings.c:3962 ../clients/cli/settings.c:4276
 #, c-format
 msgid "the property doesn't contain DNS option '%s'"
-msgstr ""
+msgstr "la proprietà non contiene l’opzione DNS ‘%s’"
 
-#: ../clients/cli/settings.c:4128 ../clients/cli/settings.c:4441
+#: ../clients/cli/settings.c:4016 ../clients/cli/settings.c:4329
 #, c-format
 msgid "the property doesn't contain IP address '%s'"
 msgstr "la proprietà non contiene l'indirizzo IP \"%s\""
 
-#: ../clients/cli/settings.c:4141
+#: ../clients/cli/settings.c:4029
 msgid ""
 "Enter a list of IPv4 addresses formatted as:\n"
 "  ip[/prefix], ip[/prefix],...\n"
@@ -5843,17 +6268,17 @@ msgstr ""
 "\n"
 "Esempio: 192.168.1.5/24, 10.0.0.11/24\n"
 
-#: ../clients/cli/settings.c:4157 ../clients/cli/settings.c:4470
+#: ../clients/cli/settings.c:4045 ../clients/cli/settings.c:4358
 #, c-format
 msgid "invalid gateway address '%s'"
 msgstr "indirizzo gateway \"%s\" non valido"
 
-#: ../clients/cli/settings.c:4212 ../clients/cli/settings.c:4525
+#: ../clients/cli/settings.c:4100 ../clients/cli/settings.c:4413
 #, c-format
 msgid "the property doesn't contain route '%s'"
 msgstr "la proprietà non contiene l'instradamento \"%s\""
 
-#: ../clients/cli/settings.c:4225
+#: ../clients/cli/settings.c:4113
 msgid ""
 "Enter a list of IPv4 routes formatted as:\n"
 "  ip[/prefix] [next-hop] [metric],...\n"
@@ -5875,12 +6300,12 @@ msgstr ""
 "Esempio: 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/cli/settings.c:4271 ../clients/cli/settings.c:4290
+#: ../clients/cli/settings.c:4159 ../clients/cli/settings.c:4178
 #, c-format
 msgid "invalid IPv6 address '%s'"
 msgstr "indirizzo IPv6 «%s» non valido"
 
-#: ../clients/cli/settings.c:4308
+#: ../clients/cli/settings.c:4196
 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 "
@@ -5901,7 +6326,7 @@ msgstr ""
 "\n"
 "Esempio: 2607:f0d0:1002:51::4, 2607:f0d0:1002:51::1\n"
 
-#: ../clients/cli/settings.c:4454
+#: ../clients/cli/settings.c:4342
 msgid ""
 "Enter a list of IPv6 addresses formatted as:\n"
 "  ip[/prefix], ip[/prefix],...\n"
@@ -5915,7 +6340,7 @@ msgstr ""
 "\n"
 "Esempio: 2607:f0d0:1002:51::4/64, 1050:0:0:0:5:600:300c:326b\n"
 
-#: ../clients/cli/settings.c:4538
+#: ../clients/cli/settings.c:4426
 msgid ""
 "Enter a list of IPv6 routes formatted as:\n"
 "  ip[/prefix] [next-hop] [metric],...\n"
@@ -5938,28 +6363,28 @@ msgstr ""
 "db8:beef::3 2\n"
 "          abbe::/64 55\n"
 
-#: ../clients/cli/settings.c:4555 ../libnm-core/nm-setting-gsm.c:363
+#: ../clients/cli/settings.c:4443 ../libnm-core/nm-setting-gsm.c:363
 #: ../libnm-util/nm-setting-gsm.c:364
 #, c-format
 msgid "'%s' is not a number"
 msgstr "«%s» non è un numero"
 
-#: ../clients/cli/settings.c:4562
+#: ../clients/cli/settings.c:4450
 #, c-format
 msgid "'%s' is not valid; use 0, 1, or 2"
 msgstr "«%s» non è valido; usare 0, 1 o 2"
 
-#: ../clients/cli/settings.c:4609
+#: ../clients/cli/settings.c:4497
 #, c-format
 msgid "'%s' is not a valid channel; use <1-13>"
 msgstr "«%s» non è un canale valido; usare <1-13>"
 
-#: ../clients/cli/settings.c:4646
+#: ../clients/cli/settings.c:4534
 #, c-format
 msgid "'%s' is not valid; use [e, o, n]"
 msgstr "«%s» non è valido; usare [e, o, n]"
 
-#: ../clients/cli/settings.c:4674
+#: ../clients/cli/settings.c:4562
 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 "
@@ -5977,53 +6402,56 @@ msgstr ""
 "\"roundrobin\"}, \"ports\": {\"eth1\": {}, \"eth2\": {}} }\n"
 "          set team.config /etc/mio-team.conf\n"
 
-#: ../clients/cli/settings.c:4714
+#: ../clients/cli/settings.c:4602
 msgid "no priority to remove"
 msgstr "nessuna priorità da rimuovere"
 
-#: ../clients/cli/settings.c:4718
+#: ../clients/cli/settings.c:4606
 #, c-format
 msgid "index '%d' is not in the range of <0-%d>"
 msgstr "l'indice «%d» non è nell'intervallo <0-%d>"
 
-#: ../clients/cli/settings.c:4757
+#: ../clients/cli/settings.c:4645
 #, c-format
 msgid ""
-"Warning: only one mapping at a time is supported; taking the first one (%s)\n"
+"Warning: only one mapping at a time is supported; taking the first one "
+"(%s)\n"
 msgstr ""
 "Attenzione: solo una associazione alla volta è supportata, viene considerata "
 "solo la prima (%s)\n"
 
-#: ../clients/cli/settings.c:4764
+#: ../clients/cli/settings.c:4652
 #, c-format
 msgid "the property doesn't contain mapping '%s'"
 msgstr "la proprietà non contiene la mappatura \"%s\""
 
-#: ../clients/cli/settings.c:4812
+#: ../clients/cli/settings.c:4700
 #, c-format
 msgid "'%s' cannot be empty"
 msgstr "\"%s\" non può essere vuota"
 
-#: ../clients/cli/settings.c:4886 ../clients/cli/settings.c:5053
-#: ../libnm-core/nm-setting-wired.c:651 ../libnm-core/nm-setting-wireless.c:820
-#: ../libnm-core/nm-setting-wireless.c:832 ../libnm-util/nm-setting-wired.c:646
+#: ../clients/cli/settings.c:4774 ../clients/cli/settings.c:4941
+#: ../libnm-core/nm-setting-wired.c:651
+#: ../libnm-core/nm-setting-wireless.c:820
+#: ../libnm-core/nm-setting-wireless.c:832
+#: ../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» non è un indirizzo MAC valido"
 
-#: ../clients/cli/settings.c:4892 ../clients/cli/settings.c:5059
+#: ../clients/cli/settings.c:4780 ../clients/cli/settings.c:4947
 #, c-format
 msgid "the property doesn't contain MAC address '%s'"
 msgstr "la proprietà non contiene l'indirizzo MAC \"%s\""
 
-#: ../clients/cli/settings.c:4911
+#: ../clients/cli/settings.c:4799
 #, c-format
 msgid "'%s' is not valid; 2 or 3 strings should be provided"
 msgstr "\"%s\" non è valido; dovrebbero essere fornite 2 o 3 stringhe"
 
-#: ../clients/cli/settings.c:4925
+#: ../clients/cli/settings.c:4813
 msgid ""
 "Enter a list of subchannels (comma or space separated).\n"
 "\n"
@@ -6033,12 +6461,12 @@ msgstr ""
 "\n"
 "Esempio: 0.0.0e20 0.0.0e21 0.0.0e22\n"
 
-#: ../clients/cli/settings.c:4947
+#: ../clients/cli/settings.c:4835
 #, c-format
 msgid "'%s' string value should consist of 1 - 199 characters"
 msgstr "il valore stringa \"%s\" deve essere di 1 - 199 caratteri"
 
-#: ../clients/cli/settings.c:4979
+#: ../clients/cli/settings.c:4867
 #, c-format
 msgid ""
 "Enter a list of S/390 options formatted as:\n"
@@ -6049,28 +6477,28 @@ msgstr ""
 "  opzione = <valore>, opzione = <valore>,... \n"
 "Opzioni valide sono: %s\n"
 
-#: ../clients/cli/settings.c:5025
+#: ../clients/cli/settings.c:4913
 #, c-format
 msgid "'%s' is not a valid channel"
 msgstr "«%s» non è un canale valido"
 
-#: ../clients/cli/settings.c:5031
+#: ../clients/cli/settings.c:4919
 #, c-format
 msgid "'%ld' is not a valid channel"
 msgstr "«%ld» non è un canale valido"
 
-#: ../clients/cli/settings.c:5125
-#, fuzzy, c-format
+#: ../clients/cli/settings.c:5013
+#, c-format
 msgid "invalid option '%s', use 'default', 'never' or 'always'"
-msgstr "opzione «%s» o il suo valore «%s» non valido"
+msgstr "opzione '%s' non valida, utilizzare 'default', 'never' o 'always'"
 
-#: ../clients/cli/settings.c:5186 ../clients/cli/settings.c:5225
-#: ../clients/cli/settings.c:5264
+#: ../clients/cli/settings.c:5074 ../clients/cli/settings.c:5113
+#: ../clients/cli/settings.c:5152
 #, c-format
 msgid "the property doesn't contain protocol '%s'"
 msgstr "la proprietà non contiene il protocollo \"%s\""
 
-#: ../clients/cli/settings.c:5303
+#: ../clients/cli/settings.c:5191
 #, c-format
 msgid ""
 "'%s' not compatible with %s '%s', please change the key or set the right %s "
@@ -6079,23 +6507,23 @@ msgstr ""
 "\"%s\" non è compatibile con %s \"%s\", modificare la chiave o impostare per "
 "prima cosa il corretto %s."
 
-#: ../clients/cli/settings.c:5311
+#: ../clients/cli/settings.c:5199
 #, c-format
 msgid "WEP key is guessed to be of '%s'\n"
 msgstr "La chiave WEP è ipotizzata essere di «%s»\n"
 
-#: ../clients/cli/settings.c:5313
+#: ../clients/cli/settings.c:5201
 #, c-format
 msgid "WEP key index set to '%d'\n"
 msgstr "Indice della chiave WEP impostato a \"%d\"\n"
 
-#: ../clients/cli/settings.c:5336
+#: ../clients/cli/settings.c:5224
 #, c-format
 msgid "'%s' not among [0 (unknown), 1 (key), 2 (passphrase)]"
 msgstr "«%s» non tra [0 (sconosciuto), 1 (chiave), 2 (passphrase)]"
 
-#: ../clients/cli/settings.c:5352 ../clients/cli/settings.c:5355
-#: ../clients/cli/settings.c:5358 ../clients/cli/settings.c:5361
+#: ../clients/cli/settings.c:5240 ../clients/cli/settings.c:5243
+#: ../clients/cli/settings.c:5246 ../clients/cli/settings.c:5249
 #, c-format
 msgid ""
 "Warning: '%s' is not compatible with '%s' type, please change or delete the "
@@ -6104,7 +6532,7 @@ msgstr ""
 "Attenzione: \"%s\" non è compatibile con il tipo \"%s\", modificare o "
 "eliminare la chiave.\n"
 
-#: ../clients/cli/settings.c:5374
+#: ../clients/cli/settings.c:5262
 #, c-format
 msgid ""
 "Enter the type of WEP keys. The accepted values are: 0 or unknown, 1 or key, "
@@ -6113,79 +6541,88 @@ msgstr ""
 "Digitare il tipo di chiavi WEP. I valori accettati sono: 0 per sconosciuto, "
 "1 per chiave e 2 per passphrase.\n"
 
-#: ../clients/cli/settings.c:5387
+#: ../clients/cli/settings.c:5275
 #, c-format
 msgid "'%s' is not a valid PSK"
 msgstr "«%s» non è una PSK valida"
 
-#: ../clients/cli/settings.c:5431
+#: ../clients/cli/settings.c:5319
 #, c-format
 msgid "'%s' is not a valid DCB flag"
 msgstr "«%s» non è un flag DCB valido"
 
-#: ../clients/cli/settings.c:5454
+#: ../clients/cli/settings.c:5342
 #, c-format
 msgid "'%s' is not a DCB app priority"
 msgstr "«%s» non è una priorità di applicazione DCB"
 
-#: ../clients/cli/settings.c:5480
+#: ../clients/cli/settings.c:5368
 msgid "must contain 8 comma-separated numbers"
 msgstr "deve contenere 8 numeri separati da virgole"
 
-#: ../clients/cli/settings.c:5497
+#: ../clients/cli/settings.c:5385
 #, c-format
 msgid "'%s' not a number between 0 and %u (inclusive) or %u"
 msgstr "«%s» non è un numero tra 0 e %u (inclusivo) o %u"
 
-#: ../clients/cli/settings.c:5500
+#: ../clients/cli/settings.c:5388
 #, c-format
 msgid "'%s' not a number between 0 and %u (inclusive)"
 msgstr "«%s» non è un numero tra 0 e %u (inclusivo)"
 
-#: ../clients/cli/settings.c:5522
+#: ../clients/cli/settings.c:5410
 #, c-format
-msgid ""
-"Warning: changes will have no effect until '%s' includes 1 (enabled)\n"
+msgid "Warning: changes will have no effect until '%s' includes 1 (enabled)\n"
 "\n"
 msgstr ""
 "Attenzione: le modifiche non avranno alcun effetto finché «%s» include 1 "
 "(abilitato)\n"
 "\n"
 
-#: ../clients/cli/settings.c:5575
+#: ../clients/cli/settings.c:5463
 #, c-format
 msgid "bandwidth percentages must total 100%%"
 msgstr "le percentuali della banda devono totalizzare 100%%"
 
-#: ../clients/cli/settings.c:5661 ../clients/cli/settings.c:5667
+#: ../clients/cli/settings.c:5549 ../clients/cli/settings.c:5555
 msgid "SIM operator ID must be a 5 or 6 number MCCMNC code"
-msgstr ""
+msgstr "ID operatore SIM deve essere un codice MCCMNC di 5 o 6 numeri"
 
-#: ../clients/cli/settings.c:5710
-#, fuzzy, c-format
+#: ../clients/cli/settings.c:5598
+#, c-format
 msgid "invalid option '%s', use '%s' or '%s'"
-msgstr "opzione «%s» o il suo valore «%s» non valido"
+msgstr "opzione '%s' non valida, utilizzare '%s' o '%s'"
 
-#: ../clients/cli/settings.c:7777
+#: ../clients/cli/settings.c:7644
 msgid "don't know how to get the property value"
 msgstr "impossibile determinare come recuperare il valore della proprietà"
 
-#: ../clients/cli/settings.c:7830 ../clients/cli/settings.c:7870
+#: ../clients/cli/settings.c:7697 ../clients/cli/settings.c:7737
 msgid "the property can't be changed"
 msgstr "la proprietà non può essere modificata"
 
-#: ../clients/cli/settings.c:7954
+#: ../clients/cli/settings.c:7821
 msgid "(not available)"
 msgstr "(non disponibile)"
 
-#: ../clients/cli/settings.c:7979
+#: ../clients/cli/settings.c:7846
 msgid "[NM property description]"
 msgstr "[Descrizione proprietà NM]"
 
-#: ../clients/cli/settings.c:7984
+#: ../clients/cli/settings.c:7851
 msgid "[nmcli specific description]"
 msgstr "[Descrizione specifica di nmcli]"
 
+#. ----------------------------------------------------------------------------
+#: ../clients/cli/settings.c:7900
+msgid "<hidden>"
+msgstr "<nascosta>"
+
+#: ../clients/cli/utils.c:124
+#, c-format
+msgid "Error: value for '%s' argument is required."
+msgstr "Errore: è richiesto il valore per l'argomento «%s»."
+
 #: ../clients/cli/utils.c:149
 #, c-format
 msgid "Error: Argument '%s' was expected, but '%s' provided."
@@ -6196,59 +6633,98 @@ msgstr "Errore: atteso l'argomento «%s», ma è stato fornito «%s»."
 msgid "Error: Unexpected argument '%s'"
 msgstr "Errore: argomento «%s» non atteso."
 
+#: ../clients/cli/utils.c:202
+#, c-format
+msgid "Error converting IP4 address '0x%X' to text form"
+msgstr "Errore nel convertire l'indirizzo IP4 «0x%X» in formato testuale"
+
+#: ../clients/cli/utils.c:230
+#, c-format
+msgid "Error converting IP6 address '%s' to text form"
+msgstr "Errore nel convertire l'indirizzo IP6 «%s» in formato testuale"
+
 #. Translators: the first %s is the partial value entered by
 #. * the user, the second %s a list of compatible values.
-#.
-#: ../clients/cli/utils.c:492 ../clients/cli/utils.c:523
+#. 
+#: ../clients/cli/utils.c:546 ../clients/cli/utils.c:577
 #, c-format
 msgid "'%s' is ambiguous (%s)"
 msgstr "\"%s\" è ambiguo (%s)"
 
-#: ../clients/cli/utils.c:502
+#: ../clients/cli/utils.c:556
 #, c-format
 msgid "'%s' is not valid; use [%s] or [%s]"
 msgstr "«%s» non è valido; usare [%s] o [%s]"
 
-#: ../clients/cli/utils.c:535
+#: ../clients/cli/utils.c:589
 #, c-format
 msgid "'%s' is not valid; use [%s], [%s] or [%s]"
 msgstr "\"%s\" non è valido; usare [%s], [%s] o [%s]"
 
-#: ../clients/cli/utils.c:634
+#: ../clients/cli/utils.c:688
 #, c-format
 msgid "'%s' is ambiguous (%s x %s)"
 msgstr "«%s» è ambiguo (%s x %s)"
 
-#: ../clients/cli/utils.c:646
+#: ../clients/cli/utils.c:700
 #, c-format
 msgid "missing name, try one of [%s]"
 msgstr "manca il nome, provare uno tra [%s]"
 
-#: ../clients/cli/utils.c:893
+#: ../clients/cli/utils.c:964
 #, c-format
 msgid "field '%s' has to be alone"
 msgstr "il campo «%s» deve essere isolato"
 
-#: ../clients/cli/utils.c:896
+#: ../clients/cli/utils.c:967
 #, c-format
 msgid "invalid field '%s'; allowed fields: %s"
 msgstr "campo «%s» non valido; campi consentiti: %s"
 
-#: ../clients/cli/utils.c:953
+#: ../clients/cli/utils.c:1024
 msgid "Option '--terse' requires specifying '--fields'"
 msgstr "Con l'opzione «--terse» è necessario specificare «--fields»"
 
-#: ../clients/cli/utils.c:957
+#: ../clients/cli/utils.c:1028
 #, c-format
 msgid "Option '--terse' requires specific '--fields' option values , not '%s'"
 msgstr ""
 "L'opzione «--terse» richiede valori specifici dell'opzione «--fields», non "
 "«%s»"
 
+#: ../clients/cli/utils.c:1390
+#, c-format
+msgid ""
+"Warning: nmcli (%s) and NetworkManager (%s) versions don't match. Use --"
+"nocheck to suppress the warning.\n"
+msgstr ""
+"Attenzione: le versioni di nmcli (%s) e NetworkManager (%s) non "
+"corrispondono. Usare --nocheck per disabilitare questo avviso.\n"
+
+#: ../clients/cli/utils.c:1399
+#, c-format
+msgid ""
+"Error: nmcli (%s) and NetworkManager (%s) versions don't match. Force "
+"execution using --nocheck, but the results are unpredictable."
+msgstr ""
+"Errore: le versioni di nmcli (%s) e NetworkManager (%s) non corrispondono. È "
+"possibile forzare l'esecuzione utilizzando --nocheck, ma i risultati non "
+"sono prevedibili."
+
 #: ../clients/common/nm-polkit-listener.c:212
 msgid "An authentication session is already underway."
 msgstr "Una sessione di autenticazione è già in corso."
 
+#. TTLS and PEAP are actually much more complicated, but this complication
+#. * is not visible here since we only care about phase2 authentication
+#. * (and don't even care of which one)
+#. 
+#: ../clients/common/nm-secret-agent-simple.c:223
+#: ../clients/common/nm-secret-agent-simple.c:328
+#: ../clients/tui/nmt-page-dsl.c:66 ../clients/tui/nmt-page-wifi.c:332
+msgid "Username"
+msgstr "Nome utente"
+
 #: ../clients/common/nm-secret-agent-simple.c:230
 #: ../clients/common/nm-secret-agent-simple.c:273
 #: ../clients/common/nm-secret-agent-simple.c:303
@@ -6256,10 +6732,9 @@ msgstr "Una sessione di autenticazione è già in corso."
 #: ../clients/common/nm-secret-agent-simple.c:492
 #: ../clients/common/nm-secret-agent-simple.c:507
 #: ../clients/common/nm-secret-agent-simple.c:525
-#: ../clients/common/nm-vpn-helpers.c:119
-#: ../clients/common/nm-vpn-helpers.c:120
-#: ../clients/common/nm-vpn-helpers.c:124
-#: ../clients/common/nm-vpn-helpers.c:127 ../clients/tui/nmt-page-dsl.c:75
+#: ../clients/common/nm-vpn-helpers.c:101
+#: ../clients/common/nm-vpn-helpers.c:102
+#: ../clients/common/nm-vpn-helpers.c:105 ../clients/tui/nmt-page-dsl.c:75
 #: ../clients/tui/nmt-page-wifi.c:277 ../clients/tui/nmt-page-wifi.c:308
 #: ../clients/tui/nmt-page-wifi.c:341
 msgid "Password"
@@ -6338,52 +6813,25 @@ msgstr "È richiesta una password per collegarsi a «%s»."
 msgid "VPN password required"
 msgstr "Richiesta password VPN"
 
-#: ../clients/common/nm-vpn-helpers.c:48
-#, fuzzy, c-format
-msgid "unknown VPN plugin \"%s\""
-msgstr "Dominio di registrazione «%s» sconosciuto"
-
-#: ../clients/common/nm-vpn-helpers.c:59
-#, c-format
-msgid "cannot cannot load legacy-only VPN plugin \"%s\" for \"%s\""
-msgstr ""
+#: ../clients/common/nm-vpn-helpers.c:61
+msgid "could not get VPN plugin info"
+msgstr "impossibile ottenere le informazioni del plugin VPN"
 
-#: ../clients/common/nm-vpn-helpers.c:64
-#, c-format
-msgid ""
-"cannot load VPN plugin \"%s\" due to missing \"%s\". Missing client plugin?"
-msgstr ""
-
-#: ../clients/common/nm-vpn-helpers.c:69
-#, fuzzy, c-format
-msgid "failed to load VPN plugin \"%s\": %s"
-msgstr "Errore: modifica di %s.%s non riuscita: %s."
-
-#: ../clients/common/nm-vpn-helpers.c:121
-#, fuzzy
-msgid "Certificate password"
-msgstr "Password della chiave privata"
-
-#: ../clients/common/nm-vpn-helpers.c:122
-#, fuzzy
-msgid "HTTP proxy password"
-msgstr "Password di gruppo"
-
-#: ../clients/common/nm-vpn-helpers.c:125
-#: ../clients/common/nm-vpn-helpers.c:128
+#: ../clients/common/nm-vpn-helpers.c:103
+#: ../clients/common/nm-vpn-helpers.c:106
 msgid "Group password"
 msgstr "Password di gruppo"
 
-#: ../clients/common/nm-vpn-helpers.c:130 ../clients/tui/nmt-page-ip4.c:143
+#: ../clients/common/nm-vpn-helpers.c:108 ../clients/tui/nmt-page-ip4.c:143
 #: ../clients/tui/nmt-page-ip6.c:143
 msgid "Gateway"
 msgstr "Gateway"
 
-#: ../clients/common/nm-vpn-helpers.c:131
+#: ../clients/common/nm-vpn-helpers.c:109
 msgid "Cookie"
 msgstr "Cookie"
 
-#: ../clients/common/nm-vpn-helpers.c:132
+#: ../clients/common/nm-vpn-helpers.c:110
 msgid "Gateway certificate hash"
 msgstr "Hash certificato gateway"
 
@@ -6423,11 +6871,12 @@ msgstr ""
 msgid "Invalid option.  Please use --help to see a list of valid options."
 msgstr ""
 "Opzione non valida. Usare --help per ottenere un elenco delle opzioni valide."
+""
 
 #: ../clients/tui/newt/nmt-newt-utils.c:177 ../clients/tui/nmt-editor.c:415
 #: ../clients/tui/nmt-password-dialog.c:174
 #: ../clients/tui/nmt-route-editor.c:122 ../clients/tui/nmtui-hostname.c:69
-#: ../clients/tui/nmtui.c:136
+#: ../clients/tui/nmtui.c:114
 msgid "OK"
 msgstr "OK"
 
@@ -6457,38 +6906,23 @@ msgstr "Editor interrotto con segnale %d"
 msgid "Could not re-read file: %s"
 msgstr "Impossibile rileggere il file: %s"
 
-#: ../clients/tui/nm-editor-utils.c:146 ../libnm-glib/nm-device.c:1859
-#: ../libnm/nm-device.c:1810
-msgid "Ethernet"
-msgstr "Ethernet"
-
 #: ../clients/tui/nm-editor-utils.c:150
 #, c-format
 msgid "Ethernet connection %d"
 msgstr "Connessione Ethernet %d"
 
-#: ../clients/tui/nm-editor-utils.c:154 ../libnm-glib/nm-device.c:1861
-#: ../libnm/nm-device.c:1812
-msgid "Wi-Fi"
-msgstr "Wi-Fi"
-
 #: ../clients/tui/nm-editor-utils.c:158
 #, c-format
 msgid "Wi-Fi connection %d"
 msgstr "Connessione Wi-Fi %d"
 
-#: ../clients/tui/nm-editor-utils.c:163 ../libnm-core/nm-connection.c:1748
-#: ../libnm-glib/nm-device.c:1871 ../libnm/nm-device.c:1822
-msgid "InfiniBand"
-msgstr "InfiniBand"
-
 #: ../clients/tui/nm-editor-utils.c:167
 #, c-format
 msgid "InfiniBand connection %d"
 msgstr "Connessione InfiniBand %d"
 
-#: ../clients/tui/nm-editor-utils.c:172 ../libnm-glib/nm-device.c:1869
-#: ../libnm/nm-device.c:1820
+#: ../clients/tui/nm-editor-utils.c:172 ../libnm-glib/nm-device.c:1859
+#: ../libnm/nm-device.c:1810
 msgid "Mobile Broadband"
 msgstr "Banda larga mobile"
 
@@ -6506,9 +6940,9 @@ msgstr "DSL"
 msgid "DSL connection %d"
 msgstr "Connessione DSL %d"
 
-#: ../clients/tui/nm-editor-utils.c:190 ../libnm-core/nm-connection.c:1740
-#: ../libnm-glib/nm-device.c:1873 ../libnm-util/nm-connection.c:1626
-#: ../libnm/nm-device.c:1824 ../src/settings/plugins/ifcfg-rh/reader.c:4195
+#: ../clients/tui/nm-editor-utils.c:190 ../libnm-core/nm-connection.c:1708
+#: ../libnm-glib/nm-device.c:1863 ../libnm-util/nm-connection.c:1626
+#: ../libnm/nm-device.c:1814 ../src/settings/plugins/ifcfg-rh/reader.c:4182
 msgid "Bond"
 msgstr "Aggregata"
 
@@ -6517,9 +6951,9 @@ msgstr "Aggregata"
 msgid "Bond connection %d"
 msgstr "Connessione aggregata %d"
 
-#: ../clients/tui/nm-editor-utils.c:199 ../libnm-core/nm-connection.c:1744
-#: ../libnm-glib/nm-device.c:1877 ../libnm-util/nm-connection.c:1630
-#: ../libnm/nm-device.c:1828 ../src/settings/plugins/ifcfg-rh/reader.c:4492
+#: ../clients/tui/nm-editor-utils.c:199 ../libnm-core/nm-connection.c:1712
+#: ../libnm-glib/nm-device.c:1867 ../libnm-util/nm-connection.c:1630
+#: ../libnm/nm-device.c:1818 ../src/settings/plugins/ifcfg-rh/reader.c:4479
 msgid "Bridge"
 msgstr "Bridge"
 
@@ -6528,9 +6962,9 @@ msgstr "Bridge"
 msgid "Bridge connection %d"
 msgstr "Connessione bridge %d"
 
-#: ../clients/tui/nm-editor-utils.c:208 ../libnm-core/nm-connection.c:1742
-#: ../libnm-glib/nm-device.c:1875 ../libnm-util/nm-connection.c:1628
-#: ../libnm/nm-device.c:1826 ../src/settings/plugins/ifcfg-rh/reader.c:4301
+#: ../clients/tui/nm-editor-utils.c:208 ../libnm-core/nm-connection.c:1710
+#: ../libnm-glib/nm-device.c:1865 ../libnm-util/nm-connection.c:1628
+#: ../libnm/nm-device.c:1816 ../src/settings/plugins/ifcfg-rh/reader.c:4288
 msgid "Team"
 msgstr "Team"
 
@@ -6734,7 +7168,7 @@ msgstr "Tempo d'invecchiamento"
 
 #: ../clients/tui/nmt-page-bridge.c:91
 msgid "Enable IGMP snooping"
-msgstr ""
+msgstr "Abilita snooping IGMP"
 
 #: ../clients/tui/nmt-page-bridge.c:97
 msgid "Enable STP (Spanning Tree Protocol)"
@@ -6773,6 +7207,10 @@ msgstr "Collegato"
 msgid "INFINIBAND"
 msgstr "INFINIBAND"
 
+#: ../clients/tui/nmt-page-infiniband.c:88
+msgid "Transport mode"
+msgstr "Modalità trasporto"
+
 #: ../clients/tui/nmt-page-ip4.c:38
 msgid "Disabled"
 msgstr "Disabilitata"
@@ -7126,14 +7564,10 @@ msgid "Deactivate"
 msgstr "Disattiva"
 
 #: ../clients/tui/nmtui-connect.c:413 ../clients/tui/nmtui-edit.c:120
-#: ../clients/tui/nmtui.c:130
+#: ../clients/tui/nmtui.c:108
 msgid "Quit"
 msgstr "Esci"
 
-#: ../clients/tui/nmtui-connect.c:413 ../clients/tui/nmtui-edit.c:120
-msgid "Back"
-msgstr ""
-
 #: ../clients/tui/nmtui-connect.c:436
 #, c-format
 msgid "No such connection '%s'"
@@ -7218,28 +7652,28 @@ msgstr "nuovo nome host"
 msgid "Set system hostname"
 msgstr "Imposta il nome host del sistema"
 
-#: ../clients/tui/nmtui.c:104
+#: ../clients/tui/nmtui.c:83
 msgid "NetworkManager TUI"
 msgstr "NetworkManager TUI"
 
-#: ../clients/tui/nmtui.c:112
+#: ../clients/tui/nmtui.c:91
 msgid "Please select an option"
 msgstr "Selezionare un'opzione"
 
-#: ../clients/tui/nmtui.c:160
+#: ../clients/tui/nmtui.c:143
 msgid "Usage"
 msgstr "Uso"
 
-#: ../clients/tui/nmtui.c:241
+#: ../clients/tui/nmtui.c:224
 msgid "Could not parse arguments"
 msgstr "Impossibile analizzare gli argomenti"
 
-#: ../clients/tui/nmtui.c:251
+#: ../clients/tui/nmtui.c:234
 #, c-format
 msgid "Could not contact NetworkManager: %s.\n"
 msgstr "Impossibile contattare NetworkManager: %s.\n"
 
-#: ../clients/tui/nmtui.c:256
+#: ../clients/tui/nmtui.c:239
 msgid "NetworkManager is not running."
 msgstr "NetworkManager non è in esecuzione."
 
@@ -7355,14 +7789,14 @@ msgid "Invalid IV length (must be at least %zd)."
 msgstr "Lunghezza di IV non valida (deve essere almeno %zd)."
 
 #: ../libnm-core/crypto_gnutls.c:115 ../libnm-util/crypto_gnutls.c:175
-#, fuzzy, c-format
+#, c-format
 msgid "Failed to initialize the decryption cipher context: %s (%s)"
-msgstr "Inizializzazione del contesto di decifrazione non riuscita: %s / %s."
+msgstr "Inizializzazione del contesto di decifrazione fallita: %s (%s)"
 
 #: ../libnm-core/crypto_gnutls.c:124 ../libnm-util/crypto_gnutls.c:184
-#, fuzzy, c-format
+#, c-format
 msgid "Failed to decrypt the private key: %s (%s)"
-msgstr "Decifrazione della chiave privata non riuscita: %s / %s."
+msgstr "Decifrazione della chiave privata fallita: %s (%s)"
 
 #: ../libnm-core/crypto_gnutls.c:134 ../libnm-core/crypto_nss.c:202
 #: ../libnm-util/crypto_gnutls.c:194 ../libnm-util/crypto_nss.c:252
@@ -7379,14 +7813,16 @@ msgid "Failed to decrypt the private key."
 msgstr "Decifrazione della chiave privata non riuscita."
 
 #: ../libnm-core/crypto_gnutls.c:224 ../libnm-util/crypto_gnutls.c:283
-#, fuzzy, c-format
+#, c-format
 msgid "Failed to initialize the encryption cipher context: %s (%s)"
-msgstr "Inizializzazione contesto del cifratore non riuscita: %s / %s."
+msgstr ""
+"Inizializzazione contesto del cifratore di crittografia non riuscita: %s "
+"(%s)"
 
 #: ../libnm-core/crypto_gnutls.c:233 ../libnm-util/crypto_gnutls.c:292
-#, fuzzy, c-format
+#, c-format
 msgid "Failed to encrypt the data: %s (%s)"
-msgstr "Cifratura dati non riuscita: %s / %s."
+msgstr "Cifratura dati fallita: %s (%s)"
 
 #: ../libnm-core/crypto_gnutls.c:276 ../libnm-util/crypto_gnutls.c:332
 #, c-format
@@ -7530,51 +7966,51 @@ msgstr "Impossibile verificare il file PKCS#12: %d"
 msgid "Could not generate random data."
 msgstr "Impossibile generare dati casuali."
 
-#: ../libnm-core/nm-connection.c:225
+#: ../libnm-core/nm-connection.c:224
 msgid "wrong type; should be a list of strings."
 msgstr "tipo errato, dovrebbe essere un elenco di stringhe."
 
-#: ../libnm-core/nm-connection.c:295
+#: ../libnm-core/nm-connection.c:294
 msgid "unknown setting name"
 msgstr "nome impostazione sconosciuto"
 
-#: ../libnm-core/nm-connection.c:307
-#, fuzzy
+#: ../libnm-core/nm-connection.c:306
 msgid "duplicate setting name"
-msgstr "nome impostazione sconosciuto"
+msgstr "nome impostazione duplicato"
 
-#: ../libnm-core/nm-connection.c:905
+#: ../libnm-core/nm-connection.c:873
 msgid "setting not found"
 msgstr "impostazione non trovata"
 
-#: ../libnm-core/nm-connection.c:969
+#: ../libnm-core/nm-connection.c:937
 msgid "setting not allowed in slave connection"
 msgstr "impostazione non consentita nella connessione slave"
 
-#: ../libnm-core/nm-connection.c:980
+#: ../libnm-core/nm-connection.c:948
 msgid "setting is required for non-slave connections"
 msgstr "l'impostazione è richiesta per connessioni non slave"
 
-#: ../libnm-core/nm-connection.c:1074
+#: ../libnm-core/nm-connection.c:1042
 msgid "Unexpected failure to verify the connection"
 msgstr "Errore inatteso nel verificare la connessione"
 
-#: ../libnm-core/nm-connection.c:1107
+#: ../libnm-core/nm-connection.c:1075
 msgid "Unexpected failure to normalize the connection"
 msgstr "Errore inatteso nel normalizzare la connessione"
 
-#: ../libnm-core/nm-connection.c:1608 ../libnm-core/nm-setting-8021x.c:2411
+#: ../libnm-core/nm-connection.c:1576 ../libnm-core/nm-setting-8021x.c:2411
 #: ../libnm-core/nm-setting-8021x.c:2428 ../libnm-core/nm-setting-8021x.c:2459
 #: ../libnm-core/nm-setting-8021x.c:2476 ../libnm-core/nm-setting-8021x.c:2518
 #: ../libnm-core/nm-setting-8021x.c:2530 ../libnm-core/nm-setting-8021x.c:2548
 #: ../libnm-core/nm-setting-8021x.c:2560 ../libnm-core/nm-setting-8021x.c:2584
 #: ../libnm-core/nm-setting-8021x.c:2749 ../libnm-core/nm-setting-adsl.c:189
 #: ../libnm-core/nm-setting-bluetooth.c:120
-#: ../libnm-core/nm-setting-bluetooth.c:138 ../libnm-core/nm-setting-cdma.c:141
+#: ../libnm-core/nm-setting-bluetooth.c:138
+#: ../libnm-core/nm-setting-cdma.c:141
 #: ../libnm-core/nm-setting-connection.c:837
 #: ../libnm-core/nm-setting-connection.c:876
 #: ../libnm-core/nm-setting-connection.c:989
-#: ../libnm-core/nm-setting-ip-config.c:2186
+#: ../libnm-core/nm-setting-ip-config.c:2167
 #: ../libnm-core/nm-setting-olpc-mesh.c:120
 #: ../libnm-core/nm-setting-pppoe.c:142 ../libnm-core/nm-setting-vpn.c:419
 #: ../libnm-core/nm-setting-vxlan.c:360 ../libnm-core/nm-setting-wimax.c:126
@@ -7586,8 +8022,10 @@ msgstr "Errore inatteso nel normalizzare la connessione"
 #: ../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-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
@@ -7605,7 +8043,7 @@ msgstr "manca la proprietà"
 #: ../libnm-core/nm-dbus-utils.c:188
 #, c-format
 msgid "Method returned type '%s', but expected '%s'"
-msgstr ""
+msgstr "Il metodo ha restituito il tipo '%s', ma è previsto '%s'"
 
 #: ../libnm-core/nm-keyfile-reader.c:136
 msgid "ignoring missing number"
@@ -7645,8 +8083,8 @@ msgstr "carattere \"%c\" non atteso per %s: \"%s\" (posizione %td)"
 #, c-format
 msgid "unexpected character '%c' in prefix length for %s: '%s' (position %td)"
 msgstr ""
-"carattere \"%c\" non atteso nella lunghezza del prefisso per %s: \"%s"
-"\" (posizione %td)"
+"carattere \"%c\" non atteso nella lunghezza del prefisso per %s: \"%s\" "
+"(posizione %td)"
 
 #: ../libnm-core/nm-keyfile-reader.c:373
 #, c-format
@@ -7684,8 +8122,8 @@ msgstr "ignorato indirizzo server DNS IPv6 \"%s\" non valido"
 #, c-format
 msgid "ignoring invalid byte element '%d' (not between 0 and 255 inclusive)"
 msgstr ""
-"ignorato elemento byte \"%d\" non valido (non nell'intervallo inclusivo "
-"0-255)"
+"ignorato elemento byte \"%d\" non valido (non nell'intervallo inclusivo 0-"
+"255)"
 
 #: ../libnm-core/nm-keyfile-reader.c:642
 msgid "ignoring invalid MAC address"
@@ -7703,7 +8141,8 @@ msgstr "ignorato SSID non valido"
 msgid "ignoring invalid raw password"
 msgstr "ignorata password raw non valida"
 
-#: ../libnm-core/nm-keyfile-reader.c:892 ../libnm-core/nm-keyfile-reader.c:1058
+#: ../libnm-core/nm-keyfile-reader.c:892
+#: ../libnm-core/nm-keyfile-reader.c:1058
 #, c-format
 msgid "certificate or key file '%s' does not exist"
 msgstr "il certificato o il file chiave \"%s\" non esiste"
@@ -7814,9 +8253,10 @@ msgstr "chiave privata phase2 non valida"
 #: ../libnm-core/nm-setting-8021x.c:2591 ../libnm-core/nm-setting-adsl.c:196
 #: ../libnm-core/nm-setting-cdma.c:148 ../libnm-core/nm-setting-cdma.c:157
 #: ../libnm-core/nm-setting-connection.c:844
-#: ../libnm-core/nm-setting-connection.c:887 ../libnm-core/nm-setting-gsm.c:281
-#: ../libnm-core/nm-setting-gsm.c:338 ../libnm-core/nm-setting-gsm.c:375
-#: ../libnm-core/nm-setting-gsm.c:384 ../libnm-core/nm-setting-ip-config.c:2193
+#: ../libnm-core/nm-setting-connection.c:887
+#: ../libnm-core/nm-setting-gsm.c:281 ../libnm-core/nm-setting-gsm.c:338
+#: ../libnm-core/nm-setting-gsm.c:375 ../libnm-core/nm-setting-gsm.c:384
+#: ../libnm-core/nm-setting-ip-config.c:2174
 #: ../libnm-core/nm-setting-ip4-config.c:198
 #: ../libnm-core/nm-setting-ip4-config.c:205
 #: ../libnm-core/nm-setting-pppoe.c:149 ../libnm-core/nm-setting-pppoe.c:158
@@ -7832,8 +8272,9 @@ msgstr "chiave privata phase2 non valida"
 #: ../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-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:170 ../libnm-util/nm-setting-pppoe.c:179
 #: ../libnm-util/nm-setting-vpn.c:432 ../libnm-util/nm-setting-vpn.c:442
@@ -7860,8 +8301,8 @@ msgstr "certificato non valido: %s"
 #: ../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:211
-#: ../libnm-core/nm-setting-ip6-config.c:222
+#: ../libnm-core/nm-setting-ip6-config.c:188
+#: ../libnm-core/nm-setting-ip6-config.c:199
 #: ../libnm-core/nm-setting-olpc-mesh.c:149
 #: ../libnm-core/nm-setting-wimax.c:144 ../libnm-core/nm-setting-wired.c:665
 #: ../libnm-core/nm-setting-wired.c:675
@@ -7899,12 +8340,14 @@ msgstr "la proprietà non è valida"
 #: ../libnm-core/nm-setting-8021x.c:2783 ../libnm-core/nm-setting-8021x.c:2793
 #: ../libnm-core/nm-setting-8021x.c:2803 ../libnm-core/nm-setting-8021x.c:2813
 #: ../libnm-core/nm-setting-8021x.c:2823 ../libnm-core/nm-setting-adsl.c:208
-#: ../libnm-core/nm-setting-adsl.c:220 ../libnm-core/nm-setting-bluetooth.c:146
+#: ../libnm-core/nm-setting-adsl.c:220
+#: ../libnm-core/nm-setting-bluetooth.c:146
 #: ../libnm-core/nm-setting-wireless-security.c:870
 #: ../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-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"
@@ -7981,7 +8424,7 @@ msgstr "l'opzione \"%s\" è valida solamente con la modalità \"%s\""
 #: ../libnm-core/nm-setting-bond.c:687
 #, c-format
 msgid "'%s' and '%s' cannot have different values"
-msgstr ""
+msgstr "'%s' e '%s' non possono avere valori diversi"
 
 #: ../libnm-core/nm-setting-bond.c:703
 #, c-format
@@ -7997,13 +8440,13 @@ msgid "'%d' is not a valid value for the property (should be <= %d)"
 msgstr "«%d» non è un valore valido per la proprietà (dovrebbe essere <= %d)"
 
 #: ../libnm-core/nm-setting-bridge-port.c:154
-#: ../libnm-core/nm-setting-team-port.c:109
+#: ../libnm-core/nm-setting-team-port.c:97
 #, c-format
 msgid "missing setting"
 msgstr "impostazione mancante"
 
 #: ../libnm-core/nm-setting-bridge-port.c:165
-#: ../libnm-core/nm-setting-team-port.c:120
+#: ../libnm-core/nm-setting-team-port.c:108
 #, c-format
 msgid ""
 "A connection with a '%s' setting must have the slave-type set to '%s'. "
@@ -8073,8 +8516,8 @@ msgid ""
 "Detect a slave connection with '%s' set and a port type '%s'. '%s' should be "
 "set to '%s'"
 msgstr ""
-"Rilevata una connessione slave con \"%s\" impostato e un tipo di porta \"%s"
-"\". \"%s\" dovrebbe essere impostato a \"%s\""
+"Rilevata una connessione slave con \"%s\" impostato e un tipo di porta "
+"\"%s\". \"%s\" dovrebbe essere impostato a \"%s\""
 
 #: ../libnm-core/nm-setting-dcb.c:522 ../libnm-util/nm-setting-dcb.c:594
 msgid "flags invalid"
@@ -8122,13 +8565,12 @@ msgid "'%s' length is invalid (should be 5 or 6 digits)"
 msgstr "la lunghezza di «%s» non è valida (dovrebbe essere di 5 o 6 cifre)"
 
 #: ../libnm-core/nm-setting-gsm.c:397
-#, fuzzy
 msgid "property is empty or wrong size"
-msgstr "la proprietà è vuota"
+msgstr "la proprietà è vuota o della dimensione errata"
 
 #: ../libnm-core/nm-setting-gsm.c:407
 msgid "property must contain only digits"
-msgstr ""
+msgstr "property deve contenere solo cifre"
 
 #: ../libnm-core/nm-setting-infiniband.c:217
 #: ../libnm-util/nm-setting-infiniband.c:231
@@ -8154,8 +8596,8 @@ msgid ""
 "interface name of software infiniband device must be '%s' or unset (instead "
 "it is '%s')"
 msgstr ""
-"il nome dell'interfaccia del dispositivo software infiniband deve essere \"%s"
-"\" o non impostato (ora è \"%s\")"
+"il nome dell'interfaccia del dispositivo software infiniband deve essere "
+"\"%s\" o non impostato (ora è \"%s\")"
 
 #: ../libnm-core/nm-setting-infiniband.c:286
 #, c-format
@@ -8180,9 +8622,9 @@ msgid "Invalid IPv4 address '%s'"
 msgstr "Indirizzo IPv4 \"%s\" non valido"
 
 #: ../libnm-core/nm-setting-ip-config.c:138
-#, fuzzy, c-format
+#, c-format
 msgid "Invalid IPv6 address '%s'"
-msgstr "indirizzo IPv6 «%s» non valido"
+msgstr "Indirizzo IPv6 «%s» non valido"
 
 #: ../libnm-core/nm-setting-ip-config.c:153
 #, c-format
@@ -8190,60 +8632,55 @@ msgid "Invalid IPv4 address prefix '%u'"
 msgstr "Prefisso \"%u\" dell'indirizzo IPv4 non valido"
 
 #: ../libnm-core/nm-setting-ip-config.c:153
-#, fuzzy, c-format
+#, c-format
 msgid "Invalid IPv6 address prefix '%u'"
-msgstr "indirizzo IPv6 «%s» non valido"
+msgstr "Prefisso \"%u\" dell'indirizzo IPv6 non valido"
 
 #: ../libnm-core/nm-setting-ip-config.c:168
 #, c-format
 msgid "Invalid routing metric '%s'"
 msgstr "Metrica di instradamento \"%s\" non valida"
 
-#: ../libnm-core/nm-setting-ip-config.c:2206
+#: ../libnm-core/nm-setting-ip-config.c:2187
 #, c-format
 msgid "%d. DNS server address is invalid"
 msgstr "%d. Il server DNS non è valido"
 
-#: ../libnm-core/nm-setting-ip-config.c:2222
+#: ../libnm-core/nm-setting-ip-config.c:2203
 #, c-format
 msgid "%d. IP address is invalid"
 msgstr "%d. L'indirizzo IP non è valido"
 
-#: ../libnm-core/nm-setting-ip-config.c:2234
+#: ../libnm-core/nm-setting-ip-config.c:2215
 #, c-format
 msgid "%d. IP address has 'label' property with invalid type"
 msgstr "%d. Proprietà \"label\" dell'indirizzo IP di tipo non valido"
 
-#: ../libnm-core/nm-setting-ip-config.c:2243
+#: ../libnm-core/nm-setting-ip-config.c:2224
 #, c-format
 msgid "%d. IP address has invalid label '%s'"
 msgstr "%d. Label \"%s\" dell'indirizzo IP non valida"
 
-#: ../libnm-core/nm-setting-ip-config.c:2257
+#: ../libnm-core/nm-setting-ip-config.c:2238
 msgid "gateway cannot be set if there are no addresses configured"
 msgstr "impossibile impostare il gateway se non è configurato alcun indirizzo"
 
-#: ../libnm-core/nm-setting-ip-config.c:2266
+#: ../libnm-core/nm-setting-ip-config.c:2247
 msgid "gateway is invalid"
 msgstr "il gateway non è valido"
 
-#: ../libnm-core/nm-setting-ip-config.c:2280
+#: ../libnm-core/nm-setting-ip-config.c:2261
 #, c-format
 msgid "%d. route is invalid"
 msgstr "%d. L'instradamento non è valido"
 
-#: ../libnm-core/nm-setting-ip-config.c:2289
+#: ../libnm-core/nm-setting-ip-config.c:2270
 #, c-format
 msgid "%d. route cannot be a default route"
 msgstr "%d. L'instradamento non può essere quello predefinito"
 
-#: ../libnm-core/nm-setting-ip-config.c:2300
-#, fuzzy, c-format
-msgid "a gateway is incompatible with '%s'"
-msgstr "«%s=%s» non è compatibile con «%s > 0»"
-
 #: ../libnm-core/nm-setting-ip4-config.c:143
-#: ../libnm-core/nm-setting-ip6-config.c:167
+#: ../libnm-core/nm-setting-ip6-config.c:144
 #: ../libnm-util/nm-setting-ip4-config.c:879
 #: ../libnm-util/nm-setting-ip6-config.c:843
 #, c-format
@@ -8253,9 +8690,9 @@ msgstr "questa proprietà non può essere vuota per \"%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:179
-#: ../libnm-core/nm-setting-ip6-config.c:189
-#: ../libnm-core/nm-setting-ip6-config.c:199
+#: ../libnm-core/nm-setting-ip6-config.c:156
+#: ../libnm-core/nm-setting-ip6-config.c:166
+#: ../libnm-core/nm-setting-ip6-config.c:176
 #: ../libnm-util/nm-setting-ip4-config.c:891
 #: ../libnm-util/nm-setting-ip4-config.c:901
 #: ../libnm-util/nm-setting-ip4-config.c:913
@@ -8267,31 +8704,19 @@ msgid "this property is not allowed for '%s=%s'"
 msgstr "questa proprietà non è consentita per «%s=%s»"
 
 #: ../libnm-core/nm-setting-ip4-config.c:214
-#, fuzzy, c-format
+#, c-format
 msgid "'%s' is not a valid FQDN"
-msgstr "«%s» non è uno UUID valido"
+msgstr "'%s' non è un nome FQDN valido"
 
 #: ../libnm-core/nm-setting-ip4-config.c:223
 msgid "property cannot be set when dhcp-hostname is also set"
 msgstr ""
-
-#: ../libnm-core/nm-setting-ip6-config.c:237
-#, fuzzy
-msgid "value is not a valid token"
-msgstr "il valore \"%s\" non è uno UUID valido"
-
-#: ../libnm-core/nm-setting-ip6-config.c:248
-msgid "only makes sense with EUI64 address generation mode"
-msgstr ""
-
-#: ../libnm-core/nm-setting-ip6-config.c:260
-msgid "token is not in canonical form"
-msgstr ""
+"property non può essere impostata quando è anche impostato dhcp-hostname"
 
 #: ../libnm-core/nm-setting-ip-tunnel.c:318
-#, fuzzy, c-format
+#, c-format
 msgid "'%d' is not a valid tunnel mode"
-msgstr "«%d» non è un canale valido"
+msgstr "'%d' non è una modalità tunnel valida"
 
 #: ../libnm-core/nm-setting-ip-tunnel.c:330
 #: ../libnm-core/nm-setting-macvlan.c:167 ../libnm-core/nm-setting-vlan.c:647
@@ -8302,23 +8727,24 @@ msgstr "«%s» non è né uno UUID né il nome di un'interfaccia"
 
 #: ../libnm-core/nm-setting-ip-tunnel.c:341
 #: ../libnm-core/nm-setting-ip-tunnel.c:352
-#, fuzzy, c-format
+#, c-format
 msgid "'%s' is not a valid IPv%c address"
-msgstr "«%s» non è un indirizzo MAC valido"
+msgstr "«%s» non è un indirizzo IPv%c valido"
 
 #: ../libnm-core/nm-setting-ip-tunnel.c:366
 msgid "tunnel keys can only be specified for GRE tunnels"
-msgstr ""
+msgstr "le chiavi tunnel possono essere specificate solo per i tunnel GRE"
 
 #: ../libnm-core/nm-setting-ip-tunnel.c:379
 #: ../libnm-core/nm-setting-ip-tunnel.c:395
-#, fuzzy, c-format
+#, c-format
 msgid "'%s' is not a valid tunnel key"
-msgstr "«%s» non è un canale valido"
+msgstr "'%s' non è una chiave tunnel valida"
 
 #: ../libnm-core/nm-setting-ip-tunnel.c:407
 msgid "a fixed TTL is allowed only when path MTU discovery is enabled"
 msgstr ""
+"è ammesso un TTL fisso solo quando è abilitata la ricerca MTU del percorso"
 
 #: ../libnm-core/nm-setting-macvlan.c:181 ../libnm-core/nm-setting-vlan.c:661
 #: ../libnm-util/nm-setting-vlan.c:580
@@ -8328,7 +8754,7 @@ msgstr "la proprietà non è specificata e nemmeno «%s:%s» lo è"
 
 #: ../libnm-core/nm-setting-macvlan.c:192
 msgid "non promiscuous operation is allowed only in passthru mode"
-msgstr ""
+msgstr "operazione non promiscua ammessa solo in modalità passthru"
 
 #: ../libnm-core/nm-setting-olpc-mesh.c:130
 #: ../libnm-core/nm-setting-wireless.c:739
@@ -8356,19 +8782,19 @@ msgid "setting this property requires non-zero '%s' property"
 msgstr "l'impostazione di questa proprietà richiede che «%s» non sia zero"
 
 #: ../libnm-core/nm-setting-tun.c:187
-#, fuzzy, c-format
+#, c-format
 msgid "'%u': invalid mode"
-msgstr "«%s» non è una modalità Wi-Fi valida"
+msgstr "'%u': modalità non valida"
 
 #: ../libnm-core/nm-setting-tun.c:197
-#, fuzzy, c-format
+#, c-format
 msgid "'%s': invalid user ID"
-msgstr "«%s» non è uno UUID valido"
+msgstr "'%s': ID utente non valido"
 
 #: ../libnm-core/nm-setting-tun.c:208
-#, fuzzy, c-format
+#, c-format
 msgid "'%s': invalid group ID"
-msgstr "«%s» non è uno UUID valido"
+msgstr "'%s': ID gruppo non valido"
 
 #: ../libnm-core/nm-setting-vlan.c:636 ../libnm-util/nm-setting-vlan.c:556
 #, c-format
@@ -8378,7 +8804,7 @@ msgstr "il valore di «%s» non corrisponde a «%s=%s»"
 #: ../libnm-core/nm-setting-vlan.c:672 ../libnm-util/nm-setting-vlan.c:600
 #, c-format
 msgid "the vlan id must be in range 0-4094 but is %u"
-msgstr ""
+msgstr "id vlan deve essere nell’intervallo 0-4094, ma è %u"
 
 #: ../libnm-core/nm-setting-vlan.c:681 ../libnm-util/nm-setting-vlan.c:591
 msgid "flags are invalid"
@@ -8416,19 +8842,19 @@ msgid "secret flags property not found"
 msgstr "flag segreto della proprietà non trovato"
 
 #: ../libnm-core/nm-setting-vxlan.c:375
-#, fuzzy, c-format
+#, c-format
 msgid "'%s' is not a valid IP address"
-msgstr "«%s» non è un indirizzo MAC valido"
+msgstr "«%s» non è un indirizzo IP valido"
 
 #: ../libnm-core/nm-setting-vxlan.c:388
-#, fuzzy, c-format
+#, c-format
 msgid "'%s' is not a valid IP%c address"
-msgstr "«%s» non è un indirizzo MAC valido"
+msgstr "«%s» non è un indirizzo IP%c valido"
 
 #: ../libnm-core/nm-setting-vxlan.c:415
 #, c-format
 msgid "%d is greater than local port max %d"
-msgstr ""
+msgstr "%d è maggiore della porta locale max %d"
 
 #: ../libnm-core/nm-setting-wired.c:619 ../libnm-util/nm-setting-wired.c:613
 #, c-format
@@ -8505,28 +8931,29 @@ msgstr "\"%s\" richiede l'impostazione della proprietà \"%s\""
 #: ../libnm-core/nm-setting.c:837
 #, c-format
 msgid "duplicate property"
-msgstr ""
+msgstr "proprietà duplicata"
 
 #: ../libnm-core/nm-setting.c:865 ../libnm-core/nm-setting.c:912
 #, c-format
 msgid "can't set property of type '%s' from value of type '%s'"
 msgstr ""
-"impossibile impostare la proprietà di tipo \"%s\" da un valore di tipo \"%s\""
+"impossibile impostare la proprietà di tipo \"%s\" da un valore di tipo "
+"\"%s\""
 
 #: ../libnm-core/nm-setting.c:884 ../libnm-core/nm-setting.c:898
-#, fuzzy, c-format
+#, c-format
 msgid "failed to set property: %s"
-msgstr "Errore: impostazione della proprietà «%s» non riuscita: %s\n"
+msgstr "impossibile impostare la proprietà: %s"
 
 #: ../libnm-core/nm-setting.c:926
-#, fuzzy, c-format
+#, c-format
 msgid "can not set property: %s"
-msgstr "non è una proprietà segreta"
+msgstr "impossibile impostare la proprietà: %s"
 
 #: ../libnm-core/nm-setting.c:942
-#, fuzzy, c-format
+#, c-format
 msgid "unknown property"
-msgstr "errore sconosciuto"
+msgstr "proprietà sconosciuta"
 
 #: ../libnm-core/nm-setting.c:1682
 msgid "secret not found"
@@ -8536,184 +8963,163 @@ msgstr "segreto non trovato"
 msgid "secret is not set"
 msgstr "segreto non impostato"
 
-#: ../libnm-core/nm-utils.c:2445
-#, fuzzy, c-format
+#: ../libnm-core/nm-utils.c:2447
+#, c-format
 msgid "failed stat file %s: %s"
-msgstr "Impostazione della maschera di segnale non riuscita: %d"
+msgstr "stat file %s: %s non riuscito"
 
-#: ../libnm-core/nm-utils.c:2454
-#, fuzzy, c-format
+#: ../libnm-core/nm-utils.c:2456
+#, c-format
 msgid "not a file (%s)"
-msgstr "Impossibile caricare il file «%s»\n"
+msgstr "non è un file (%s)"
 
-#: ../libnm-core/nm-utils.c:2465
-#, fuzzy, c-format
+#: ../libnm-core/nm-utils.c:2467
+#, c-format
 msgid "invalid file owner %d for %s"
-msgstr "campo «%s» non valido; campi consentiti: %s"
+msgstr "proprietario file non valido %d per %s"
 
-#: ../libnm-core/nm-utils.c:2476
+#: ../libnm-core/nm-utils.c:2478
 #, c-format
 msgid "file permissions for %s"
-msgstr ""
+msgstr "permessi file per %s"
 
-#: ../libnm-core/nm-utils.c:2486
+#: ../libnm-core/nm-utils.c:2488
 #, c-format
 msgid "reject %s"
-msgstr ""
+msgstr "rifiuta %s"
 
-#: ../libnm-core/nm-utils.c:2506
+#: ../libnm-core/nm-utils.c:2508
 #, c-format
 msgid "path is not absolute (%s)"
-msgstr ""
+msgstr "il percorso non è assoluto (%s)"
 
-#: ../libnm-core/nm-utils.c:2520
+#: ../libnm-core/nm-utils.c:2522
 #, c-format
 msgid "Plugin file does not exist (%s)"
-msgstr ""
+msgstr "Il file di plugin non esiste (%s)"
 
-#: ../libnm-core/nm-utils.c:2528
-#, fuzzy, c-format
+#: ../libnm-core/nm-utils.c:2530
+#, c-format
 msgid "Plugin is not a valid file (%s)"
-msgstr "«%s» non è un valore valido per «%s»"
+msgstr "Il plugin non è un file valido (%s)"
 
-#: ../libnm-core/nm-utils.c:2538
+#: ../libnm-core/nm-utils.c:2540
 #, c-format
 msgid "libtool archives are not supported (%s)"
-msgstr ""
+msgstr "archivi libtool non supportati (%s)"
 
-#: ../libnm-core/nm-utils.c:2620 ../libnm-util/nm-utils.c:1803
+#: ../libnm-core/nm-utils.c:2622 ../libnm-util/nm-utils.c:1815
 #, c-format
 msgid "Could not find \"%s\" binary"
 msgstr "Impossibile trovare il binario di \"%s\""
 
-#: ../libnm-core/nm-vpn-editor-plugin.c:296
+#: ../libnm-core/nm-vpn-editor-plugin.c:124
 #, c-format
-msgid "cannot load plugin \"%s\": %s"
-msgstr ""
+msgid "cannot load plugin %s"
+msgstr "impossibile caricare il plugin %s"
 
-#: ../libnm-core/nm-vpn-editor-plugin.c:307
+#: ../libnm-core/nm-vpn-editor-plugin.c:150
 #, c-format
-msgid "failed to load nm_vpn_editor_plugin_factory() from %s (%s)"
-msgstr ""
+msgid "cannot load VPN plugin in '%s': missing plugin name"
+msgstr "impossibile caricare il plugin VPN su '%s': nome plugin assente"
 
-#: ../libnm-core/nm-vpn-editor-plugin.c:332
+#: ../libnm-core/nm-vpn-editor-plugin.c:157
 #, c-format
-msgid "unknown error initializing plugin %s"
-msgstr ""
+msgid "cannot load VPN plugin in '%s': invalid service name"
+msgstr "impossibile caricare il plugin VPN su '%s': nome servizio non valido"
 
-#: ../libnm-core/nm-vpn-editor-plugin.c:349
+#: ../libnm-core/nm-vpn-editor-plugin.c:173
 #, c-format
-msgid "cannot load VPN plugin in '%s': missing plugin name"
-msgstr ""
+msgid "unknown error initializing plugin %s"
+msgstr "errore sconosciuto durante l’inizializzazione del plugin %s"
 
-#: ../libnm-core/nm-vpn-editor-plugin.c:358
+#: ../libnm-core/nm-vpn-editor-plugin.c:185
 #, c-format
-msgid "cannot load VPN plugin in '%s': invalid service name"
-msgstr ""
+msgid "failed to load nm_vpn_editor_plugin_factory() from %s (%s)"
+msgstr "impossibile caricare nm_vpn_editor_plugin_factory() da %s (%s)"
 
-#: ../libnm-core/nm-vpn-editor-plugin.c:501
+#: ../libnm-core/nm-vpn-editor-plugin.c:292
 #, c-format
 msgid "the plugin does not support import capability"
-msgstr ""
+msgstr "il plugin non supporta la funzionalità di importazione"
 
-#: ../libnm-core/nm-vpn-editor-plugin.c:521
+#: ../libnm-core/nm-vpn-editor-plugin.c:312
 #, c-format
 msgid "the plugin does not support export capability"
-msgstr ""
+msgstr "il plugin non supporta la funzionalità di esportazione"
 
-#: ../libnm-core/nm-vpn-plugin-info.c:110
-#, fuzzy, c-format
+#: ../libnm-core/nm-vpn-plugin-info.c:109
+#, c-format
 msgid "missing filename"
-msgstr "opzione mancante"
+msgstr "nome file assente"
 
-#: ../libnm-core/nm-vpn-plugin-info.c:118
+#: ../libnm-core/nm-vpn-plugin-info.c:117
 #, c-format
 msgid "filename must be an absolute path (%s)"
-msgstr ""
+msgstr "nome file deve essere un percorso assoluto (%s)"
 
-#: ../libnm-core/nm-vpn-plugin-info.c:127
+#: ../libnm-core/nm-vpn-plugin-info.c:126
 #, c-format
 msgid "filename has invalid format (%s)"
-msgstr ""
+msgstr "formato non valido del nome file (%s)"
 
-#: ../libnm-core/nm-vpn-plugin-info.c:450
+#: ../libnm-core/nm-vpn-plugin-info.c:383
 #, c-format
 msgid "there exists a conflicting plugin (%s) that has the same %s.%s value"
-msgstr ""
+msgstr "è presente un plugin in conflitto (%s) con lo stesso valore %s.%s"
 
-#: ../libnm-core/nm-vpn-plugin-info.c:488
+#: ../libnm-core/nm-vpn-plugin-info.c:421
 #, c-format
 msgid "there exists a conflicting plugin with the same name (%s)"
-msgstr ""
+msgstr "è presente un plugin in conflitto con lo stesso nome (%s)"
 
-#: ../libnm-core/nm-vpn-plugin-info.c:1071
-#, fuzzy, c-format
+#: ../libnm-core/nm-vpn-plugin-info.c:740
+#, c-format
 msgid "missing \"plugin\" setting"
-msgstr "opzione mancante"
+msgstr "assente \"plugin\" impostazione"
 
-#: ../libnm-core/nm-vpn-plugin-info.c:1081
+#: ../libnm-core/nm-vpn-plugin-info.c:750
 #, c-format
 msgid "%s: don't retry loading plugin which already failed previously"
-msgstr ""
+msgstr "%s: non riprovare a caricare un plugin che non caricato in precedenza"
 
-#: ../libnm-core/nm-vpn-plugin-info.c:1175
+#: ../libnm-core/nm-vpn-plugin-info.c:842
 msgid "missing filename to load VPN plugin info"
-msgstr ""
+msgstr "nome file assente per caricare le informazioni del plugin VPN"
 
-#: ../libnm-core/nm-vpn-plugin-info.c:1187
+#: ../libnm-core/nm-vpn-plugin-info.c:854
 msgid "missing name for VPN plugin info"
-msgstr ""
+msgstr "nome assente per le informazioni del plugin VPN"
 
-#: ../libnm-core/nm-vpn-plugin-info.c:1196
+#: ../libnm-core/nm-vpn-plugin-info.c:863
 msgid "missing service for VPN plugin info"
-msgstr ""
+msgstr "servizio assente per le informazioni del plugin VPN"
 
-#: ../libnm-glib/nm-device.c:1863 ../libnm/nm-device.c:1814
+#: ../libnm-glib/nm-device.c:1853 ../libnm/nm-device.c:1804
 msgid "Bluetooth"
 msgstr "Bluetooth"
 
-#: ../libnm-glib/nm-device.c:1865 ../libnm/nm-device.c:1816
-msgid "OLPC Mesh"
-msgstr "Mesh OLPC"
-
-#: ../libnm-glib/nm-device.c:1867 ../libnm/nm-device.c:1818
-msgid "WiMAX"
-msgstr "WiMAX"
-
-#: ../libnm-glib/nm-device.c:1881 ../libnm/nm-device.c:1832
-msgid "ADSL"
-msgstr "ADSL"
-
-#: ../libnm-glib/nm-device.c:1883 ../libnm/nm-device.c:1834
-#, fuzzy
+#: ../libnm-glib/nm-device.c:1873 ../libnm/nm-device.c:1824
 msgid "MACVLAN"
-msgstr "VLAN"
+msgstr "MACVLAN"
 
-#: ../libnm-glib/nm-device.c:1885 ../libnm/nm-device.c:1836
-msgid "VXLAN"
-msgstr ""
-
-#: ../libnm-glib/nm-device.c:1887 ../libnm/nm-device.c:1838
+#: ../libnm-glib/nm-device.c:1877 ../libnm/nm-device.c:1828
 msgid "IPTunnel"
-msgstr ""
-
-#: ../libnm-glib/nm-device.c:1889 ../libnm/nm-device.c:1840
-msgid "Tun"
-msgstr ""
+msgstr "IPTunnel"
 
-#: ../libnm-glib/nm-device.c:1891 ../libnm/nm-device.c:1842
+#: ../libnm-glib/nm-device.c:1881 ../libnm/nm-device.c:1832
 msgid "Veth"
-msgstr ""
+msgstr "Veth"
 
-#: ../libnm-glib/nm-device.c:1923 ../libnm/nm-device.c:1874
+#: ../libnm-glib/nm-device.c:1913 ../libnm/nm-device.c:1864
 msgid "Wired"
 msgstr "Via cavo"
 
-#: ../libnm-glib/nm-device.c:1954 ../libnm/nm-device.c:1905
+#: ../libnm-glib/nm-device.c:1944 ../libnm/nm-device.c:1895
 msgid "PCI"
 msgstr "PCI"
 
-#: ../libnm-glib/nm-device.c:1956 ../libnm/nm-device.c:1907
+#: ../libnm-glib/nm-device.c:1946 ../libnm/nm-device.c:1897
 msgid "USB"
 msgstr "USB"
 
@@ -8722,9 +9128,9 @@ msgstr "USB"
 #. * "Ethernet"). You can change this to something like
 #. * "%2$s (%1$s)" if there's no grammatical way to combine
 #. * the strings otherwise.
-#.
-#: ../libnm-glib/nm-device.c:2052 ../libnm-glib/nm-device.c:2071
-#: ../libnm/nm-device.c:2001 ../libnm/nm-device.c:2020
+#. 
+#: ../libnm-glib/nm-device.c:2042 ../libnm-glib/nm-device.c:2061
+#: ../libnm/nm-device.c:1991 ../libnm/nm-device.c:2010
 #, c-format
 msgctxt "long device name"
 msgid "%s %s"
@@ -8737,12 +9143,12 @@ msgstr "Disconnesso da D-Bus"
 #: ../libnm-util/crypto_gnutls.c:84
 #, c-format
 msgid "Hash length too long (%d > %d)."
-msgstr ""
+msgstr "Lunghezza hash eccessiva (%d > %d)."
 
 #: ../libnm-util/crypto_gnutls.c:115
-#, fuzzy, c-format
+#, c-format
 msgid "Failed to initialize the MD5 engine: %s (%s)"
-msgstr "Inizializzazione del motore MD5 non riuscita: %s / %s"
+msgstr "Inizializzazione del motore MD5 fallita: %s (%s)"
 
 #: ../libnm-util/crypto_nss.c:99
 #, c-format
@@ -8844,7 +9250,7 @@ msgstr "La connessione non era una connessione Ethernet o PPPoE."
 
 #: ../libnm/nm-device-ethernet.c:222
 msgid "The connection and device differ in S390 subchannels."
-msgstr ""
+msgstr "Connessione e dispositivo differiscono sui canali secondari S390."
 
 #: ../libnm/nm-device-ethernet.c:232 ../libnm/nm-device-infiniband.c:102
 #: ../libnm/nm-device-wifi.c:604 ../libnm/nm-device-wimax.c:326
@@ -8853,17 +9259,18 @@ msgstr "Indirizzo MAC dispositivo non valido."
 
 #: ../libnm/nm-device-ethernet.c:237
 msgid "The MACs of the device and the connection do not match."
-msgstr ""
+msgstr "Gli indirizzi MAC del dispositivo e la connessione non corrispondono."
 
 #: ../libnm/nm-device-ethernet.c:247
 #, c-format
 msgid "Invalid MAC in the blacklist: %s."
-msgstr ""
+msgstr "Indirizzo MAC dispositivo non valido nella blacklist: %s."
 
 #: ../libnm/nm-device-ethernet.c:253
 #, c-format
 msgid "Device MAC (%s) is blacklisted by the connection."
 msgstr ""
+"Indirizzo MAC dispositivo (%s) inserito in blacklist dalla connessione."
 
 #: ../libnm/nm-device-generic.c:91
 msgid "The connection was not a generic connection."
@@ -8874,14 +9281,12 @@ msgid "The connection did not specify an interface name."
 msgstr "La connessione non ha specificato il nome di un'interfaccia."
 
 #: ../libnm/nm-device-tun.c:209
-#, fuzzy
 msgid "The connection was not a tun connection."
-msgstr "connessione in corso (avvio connessioni secondarie)"
+msgstr "La connessione non era una connessione tun."
 
 #: ../libnm/nm-device-tun.c:218
-#, fuzzy
 msgid "The mode of the device and the connection didn't match"
-msgstr "La connessione attiva del dispositivo è scomparsa"
+msgstr "La modalità del dispositivo e la connessione non corrispondono"
 
 #: ../libnm/nm-device-infiniband.c:94
 msgid "The connection was not an InfiniBand connection."
@@ -8893,13 +9298,12 @@ msgid "The MACs of the device and the connection didn't match."
 msgstr "Gli indirizzi MAC del dispositivo e la connessione non corrispondono."
 
 #: ../libnm/nm-device-ip-tunnel.c:254
-#, fuzzy
 msgid "The connection was not an IP tunnel connection."
-msgstr "connessione in corso (avvio connessioni secondarie)"
+msgstr "La connessione non è una connessione con tunnel IP."
 
 #: ../libnm/nm-device-macvlan.c:159
 msgid "The connection was not a MAC-VLAN connection."
-msgstr ""
+msgstr "La connessione non era una connessione MAC-VLAN."
 
 #: ../libnm/nm-device-modem.c:120
 msgid "The connection was not a modem connection."
@@ -8918,7 +9322,7 @@ msgstr ""
 msgid "The connection was not an OLPC Mesh connection."
 msgstr "La connessione non era una connessione Mesh OLPC."
 
-#: ../libnm/nm-device-team.c:139
+#: ../libnm/nm-device-team.c:118
 msgid "The connection was not a team connection."
 msgstr "La connessione non era una connessione team."
 
@@ -8937,13 +9341,13 @@ msgstr ""
 "L'indirizzo hardware del dispositivo e la connessione non corrispondono."
 
 #: ../libnm/nm-device-vxlan.c:387
-#, fuzzy
 msgid "The connection was not a VXLAN connection."
-msgstr "Ci sono 4 argomenti opzionali per il tipo di connessione «VLAN».\n"
+msgstr "La connessione non era una connessione VXLAN."
 
 #: ../libnm/nm-device-vxlan.c:394
 msgid "The VXLAN identifiers of the device and the connection didn't match."
 msgstr ""
+"Gli identificatori VXLAN del dispositivo e la connessione non corrispondono."
 
 #: ../libnm/nm-device-wifi.c:595
 msgid "The connection was not a Wi-Fi connection."
@@ -8956,7 +9360,8 @@ msgstr ""
 "connessione."
 
 #: ../libnm/nm-device-wifi.c:638
-msgid "The device is lacking WPA2/RSN capabilities required by the connection."
+msgid ""
+"The device is lacking WPA2/RSN capabilities required by the connection."
 msgstr ""
 "Il dispositivo non dispone delle funzionalità WPA2/RSN richieste dalla "
 "connessione."
@@ -8965,23 +9370,23 @@ msgstr ""
 msgid "The connection was not a WiMAX connection."
 msgstr "La connessione non era una connessione WiMAX."
 
-#: ../libnm/nm-device.c:2739
+#: ../libnm/nm-device.c:2729
 #, c-format
 msgid "The connection was not valid: %s"
 msgstr "La connessione non era valida: %s"
 
-#: ../libnm/nm-device.c:2748
+#: ../libnm/nm-device.c:2738
 #, c-format
 msgid "The interface names of the device and the connection didn't match."
 msgstr ""
 "Il nome dell'interfaccia del dispositivo e la connessione non corrispondono."
 
-#: ../libnm/nm-manager.c:867
+#: ../libnm/nm-manager.c:874
 msgid "Active connection could not be attached to the device"
 msgstr "La connessione attiva non può essere collegata al dispositivo"
 
 # [NdT] si tratta di un messaggio che descrive un’azione
-#: ../libnm/nm-manager.c:1091
+#: ../libnm/nm-manager.c:1098
 msgid "Active connection removed before it was initialized"
 msgstr "La connessione attiva è stata rimossa prima di essere inizializzata"
 
@@ -9008,18 +9413,6 @@ msgstr ""
 "sistema"
 
 #: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:3
-#, fuzzy
-msgid "Reload NetworkManager configuration"
-msgstr "Stampa la versione di NetworkManager ed esce"
-
-#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:4
-#, fuzzy
-msgid "System policy prevents reloading NetworkManager"
-msgstr ""
-"La politica di sistema impedisce di abilitare o disabilitare la rete di "
-"sistema"
-
-#: ../policy/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)"
@@ -9027,195 +9420,204 @@ msgstr ""
 "Sospende o riattiva NetworkManager (dovrebbe essere usato solo dalla "
 "gestione dell'alimentazione di sistema)"
 
-#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:6
+#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:4
 msgid "System policy prevents putting NetworkManager to sleep or waking it up"
 msgstr ""
 "La politica di sistema impedisce di sospendere e riattivare NetworkManager"
 
-#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:7
+#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:5
 msgid "Enable or disable WiFi devices"
 msgstr "Abilita o disabilita i dispositivi Wi-Fi"
 
-#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:8
+#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:6
 msgid "System policy prevents enabling or disabling WiFi devices"
 msgstr ""
 "La politica di sistema impedisce di abilitare o disabilitare i dispositivi "
 "Wi-Fi"
 
-#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:9
+#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:7
 msgid "Enable or disable mobile broadband devices"
 msgstr "Abilita o disabilita i dispositivi a banda larga mobile"
 
-#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:10
+#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:8
 msgid "System policy prevents enabling or disabling mobile broadband devices"
 msgstr ""
 "La politica di sistema impedisce di abilitare o disabilitare i dispositivi a "
 "banda larga mobile"
 
-#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:11
+#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:9
 msgid "Enable or disable WiMAX mobile broadband devices"
 msgstr "Abilita o disabilita i dispositivi WiMAX a banda larga mobile"
 
-#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:12
+#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:10
 msgid ""
 "System policy prevents enabling or disabling WiMAX mobile broadband devices"
 msgstr ""
 "La politica di sistema impedisce di abilitare o disabilitare i dispositivi "
 "WiMAX a banda larga mobile"
 
-#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:13
+#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:11
 msgid "Allow control of network connections"
 msgstr "Permette il controllo delle connessioni di rete"
 
-#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:14
+#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:12
 msgid "System policy prevents control of network connections"
-msgstr "La politica di sistema impedisce di controllare le connessioni di rete"
+msgstr ""
+"La politica di sistema impedisce di controllare le connessioni di rete"
 
-#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:15
+#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:13
 msgid "Connection sharing via a protected WiFi network"
 msgstr "Condivisione della connessione attraverso una rete Wi-Fi protetta"
 
-#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:16
-msgid "System policy prevents sharing connections via a protected WiFi network"
+#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:14
+msgid ""
+"System policy prevents sharing connections via a protected WiFi network"
 msgstr ""
 "La politica di sistema impedisce di condividere connessioni attraverso una "
 "rete Wi-Fi protetta"
 
-#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:17
+#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:15
 msgid "Connection sharing via an open WiFi network"
 msgstr "Condivisione della connessione attraverso una rete Wi-Fi aperta"
 
-#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:18
+#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:16
 msgid "System policy prevents sharing connections via an open WiFi network"
 msgstr ""
 "La politica di sistema impedisce di condividere connessioni attraverso una "
 "rete Wi-Fi aperta"
 
-#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:19
+#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:17
 msgid "Modify personal network connections"
 msgstr "Modifica le connessioni personali"
 
-#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:20
+#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:18
 msgid "System policy prevents modification of personal network settings"
 msgstr ""
 "La politica di sistema impedisce di modificare le impostazioni di rete "
 "personali"
 
-#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:21
+#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:19
 msgid "Modify network connections for all users"
 msgstr "Modifica le connessioni di sistema per tutti gli utenti"
 
-#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:22
+#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:20
 msgid "System policy prevents modification of network settings for all users"
 msgstr ""
 "La politica di sistema impedisce di modificare le impostazioni di rete per "
 "tutti gli utenti"
 
-#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:23
+#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:21
 msgid "Modify persistent system hostname"
 msgstr "Modifica del nome host persistente del sistema"
 
-#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:24
+#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:22
 msgid "System policy prevents modification of the persistent system hostname"
 msgstr ""
 "La politica di sistema impedisce di modificare il nome host persistente del "
 "sistema"
 
-#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:25
+#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:23
 msgid "Modify persistent global DNS configuration"
-msgstr ""
+msgstr "Modifica la configurazione DNS globale persistente"
 
-#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:26
-#, fuzzy
+#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:24
 msgid ""
 "System policy prevents modification of the persistent global DNS "
 "configuration"
 msgstr ""
-"La politica di sistema impedisce di modificare il nome host persistente del "
-"sistema"
+"La policy di sistema impedisce la modifica della configurazione DNS globale"
 
-#: ../shared/nm-utils/nm-shared-utils.c:185
+#: ../shared/nm-shared-utils.c:208
 #, c-format
 msgid "object class '%s' has no property named '%s'"
-msgstr ""
+msgstr "la classe dell’oggetto '%s' non ha proprietà chiamate '%s'"
 
-#: ../shared/nm-utils/nm-shared-utils.c:192
+#: ../shared/nm-shared-utils.c:215
 #, c-format
 msgid "property '%s' of object class '%s' is not writable"
-msgstr ""
+msgstr "la proprietà '%s' della classe oggetto '%s' non è scrivibile"
 
-#: ../shared/nm-utils/nm-shared-utils.c:199
+#: ../shared/nm-shared-utils.c:222
 #, c-format
 msgid ""
 "construct property \"%s\" for object '%s' can't be set after construction"
 msgstr ""
+"proprietà di costruzione \"%s\" per l’oggetto '%s' non impostabile dopo la "
+"costruzione"
 
-#: ../shared/nm-utils/nm-shared-utils.c:207
+#: ../shared/nm-shared-utils.c:230
 #, c-format
 msgid "'%s::%s' is not a valid property name; '%s' is not a GObject subtype"
 msgstr ""
+"'%s::%s' non è un nome di proprietà valido; '%s' non è un sottotipo GObject"
 
-#: ../shared/nm-utils/nm-shared-utils.c:216
-#, fuzzy, c-format
+#: ../shared/nm-shared-utils.c:239
+#, c-format
 msgid "unable to set property '%s' of type '%s' from value of type '%s'"
 msgstr ""
-"impossibile impostare la proprietà di tipo \"%s\" da un valore di tipo \"%s\""
+"impossibile impostare la proprietà '%s' di tipo '%s' dal valore di tipo '%s'"
 
-#: ../shared/nm-utils/nm-shared-utils.c:227
+#: ../shared/nm-shared-utils.c:250
 #, c-format
 msgid ""
 "value \"%s\" of type '%s' is invalid or out of range for property '%s' of "
 "type '%s'"
 msgstr ""
+"valore \"%s\" di tipo '%s' non valido o fuori dall’intervallo per la "
+"proprietà '%s' di 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:112
+#: ../src/NetworkManagerUtils.c:111
 #, c-format
 msgctxt "connection id fallback"
 msgid "%s %d"
 msgstr "%s %d"
 
-#: ../src/main.c:165 ../src/main.c:300
+#: ../src/main.c:220 ../src/main.c:358
 #, c-format
 msgid "Failed to read configuration: %s\n"
 msgstr "Lettura della configurazione non riuscita: %s\n"
 
 #. Logging/debugging
-#: ../src/main.c:179 ../src/nm-iface-helper.c:298
+#: ../src/main.c:234 ../src/nm-iface-helper.c:298
 msgid "Print NetworkManager version and exit"
 msgstr "Stampa la versione di NetworkManager ed esce"
 
-#: ../src/main.c:180 ../src/nm-iface-helper.c:299
+#: ../src/main.c:235 ../src/nm-iface-helper.c:299
 msgid "Don't become a daemon"
 msgstr "Non si avvia in modalità demone"
 
-#: ../src/main.c:181 ../src/nm-iface-helper.c:301
+#: ../src/main.c:236 ../src/nm-iface-helper.c:301
 #, c-format
 msgid "Log level: one of [%s]"
 msgstr "Livello di registrazione: uno di [%s]"
 
-#: ../src/main.c:183 ../src/nm-iface-helper.c:303
+#: ../src/main.c:238 ../src/nm-iface-helper.c:303
 #, c-format
 msgid "Log domains separated by ',': any combination of [%s]"
 msgstr ""
 "Domini di registrazione separati da «,»: qualsiasi combinazione di [%s]"
 
-#: ../src/main.c:185 ../src/nm-iface-helper.c:305
+#: ../src/main.c:240 ../src/nm-iface-helper.c:305
 msgid "Make all warnings fatal"
 msgstr "Rende tutti gli avvisi fatali"
 
-#: ../src/main.c:186
+#: ../src/main.c:241
 msgid "Specify the location of a PID file"
 msgstr "Specifica la posizione di un file PID"
 
-#: ../src/main.c:188
+#: ../src/main.c:242
+msgid "State file location"
+msgstr "Posizione file di stato"
+
+#: ../src/main.c:244
 msgid "Print NetworkManager configuration and exit"
 msgstr "Stampa la versione di NetworkManager ed esce"
 
-#: ../src/main.c:198
+#: ../src/main.c:254
 msgid ""
 "NetworkManager monitors all network connections and automatically\n"
 "chooses the best connection to use.  It also allows the user to\n"
@@ -9227,79 +9629,81 @@ msgstr ""
 "utenti di specificare gli access point Wi-Fi e quali schede\n"
 "Wi-Fi del computer associarvi."
 
-#: ../src/main.c:285 ../src/main-utils.c:270 ../src/nm-iface-helper.c:393
+#: ../src/main.c:343 ../src/main-utils.c:269 ../src/nm-iface-helper.c:393
 #, c-format
 msgid "%s.  Please use --help to see a list of valid options.\n"
 msgstr "%s. Usare --help per ottenere un elenco di opzioni valide.\n"
 
-#: ../src/main.c:290 ../src/nm-iface-helper.c:398
+#: ../src/main.c:348 ../src/nm-iface-helper.c:398
 #, c-format
 msgid "Ignoring unrecognized log domain(s) '%s' passed on command line.\n"
 msgstr ""
-"Domini di registrazione «%s» non riconosciuti passati sulla riga di "
-"comando.\n"
+"Domini di registrazione «%s» non riconosciuti passati sulla riga di comando."
+"\n"
 
-#: ../src/main.c:315
+#: ../src/main.c:373
 #, c-format
 msgid "Error in configuration file: %s.\n"
 msgstr "Errore nel file di configurazione: %s.\n"
 
-#: ../src/main.c:320
+#: ../src/main.c:378
 #, c-format
 msgid "Ignoring unrecognized log domain(s) '%s' from config files.\n"
 msgstr ""
 "I domini di registrazione «%s» non riconosciuti caricati dai file di "
 "configurazione vengono ignorati.\n"
 
-#: ../src/main.c:331 ../src/nm-iface-helper.c:408
+#: ../src/main.c:389 ../src/nm-iface-helper.c:408
 #, c-format
 msgid "Could not daemonize: %s [error %u]\n"
 msgstr "Impossibile avviare come demone: %s [errore %u]\n"
 
-#: ../src/main-utils.c:98
+#: ../src/main-utils.c:99
 #, c-format
 msgid "Opening %s failed: %s\n"
 msgstr "Apertura di %s non riuscita: %s\n"
 
-#: ../src/main-utils.c:104
+#: ../src/main-utils.c:105
 #, c-format
 msgid "Writing to %s failed: %s\n"
 msgstr "Scrittura su %s non riuscita: %s\n"
 
-#: ../src/main-utils.c:109
+#: ../src/main-utils.c:110
 #, c-format
 msgid "Closing %s failed: %s\n"
 msgstr "Chiusura di %s non riuscita: %s\n"
 
-#: ../src/main-utils.c:144
+#: ../src/main-utils.c:145
 #, c-format
 msgid "Cannot create '%s': %s"
 msgstr "Impossibile creare \"%s\": %s"
 
-#: ../src/main-utils.c:196
+#: ../src/main-utils.c:197
 #, c-format
 msgid "%s is already running (pid %ld)\n"
 msgstr "%s è già in esecuzione (pid %ld)\n"
 
-#: ../src/main-utils.c:206
+#: ../src/main-utils.c:207
 #, c-format
 msgid "You must be root to run %s!\n"
 msgstr "È necessario essere root per eseguire %s.\n"
 
-#: ../src/dhcp-manager/nm-dhcp-dhclient-utils.c:214
+#: ../src/dhcp-manager/nm-dhcp-dhclient-utils.c:213
 msgid "# Created by NetworkManager\n"
 msgstr "# Creato da NetworkManager\n"
 
-#: ../src/dhcp-manager/nm-dhcp-dhclient-utils.c:222
+#: ../src/dhcp-manager/nm-dhcp-dhclient-utils.c:220
 #, c-format
-msgid ""
-"# Merged from %s\n"
+msgid "# Merged from %s\n"
 "\n"
-msgstr ""
-"# Unito da %s\n"
+msgstr "# Unito da %s\n"
 "\n"
 
-#: ../src/devices/bluetooth/nm-bluez-device.c:200
+#: ../src/devices/adsl/nm-device-adsl.c:133
+msgid "ADSL connection"
+msgstr "Connessione ADSL"
+
+#: ../src/devices/bluetooth/nm-bluez-device.c:197
 #, c-format
 msgid "%s Network"
 msgstr "Rete %s"
@@ -9327,12 +9731,12 @@ msgid "DUN connection must include a GSM or CDMA setting"
 msgstr "La connessione DUN deve includere un'impostazione GSM o CDMA"
 
 #: ../src/devices/bluetooth/nm-device-bt.c:303
-#: ../src/devices/wwan/nm-modem-broadband.c:687
+#: ../src/devices/wwan/nm-modem-broadband.c:655
 msgid "GSM connection"
 msgstr "Connessione GSM"
 
 #: ../src/devices/bluetooth/nm-device-bt.c:307
-#: ../src/devices/wwan/nm-modem-broadband.c:711
+#: ../src/devices/wwan/nm-modem-broadband.c:679
 msgid "CDMA connection"
 msgstr "Connessione CDMA"
 
@@ -9341,9 +9745,9 @@ msgid "Unknown/unhandled Bluetooth connection type"
 msgstr "Tipo di connessione Bluetooth sconosciuta/non gestita"
 
 #: ../src/devices/bluetooth/nm-device-bt.c:336
-#: ../src/devices/nm-device-ethernet.c:1421
+#: ../src/devices/nm-device-ethernet.c:1415
 #: ../src/devices/nm-device-infiniband.c:193
-#: ../src/devices/wifi/nm-device-wifi.c:875
+#: ../src/devices/wifi/nm-device-wifi.c:872
 msgid "connection does not match device"
 msgstr "la connessione non corrisponde al dispositivo"
 
@@ -9355,35 +9759,44 @@ msgstr "Connessione aggregata"
 msgid "Bridge connection"
 msgstr "Connessione bridge"
 
-#: ../src/devices/nm-device-ethernet.c:1402
+#: ../src/devices/nm-device-ethernet.c:1396
 msgid "PPPoE connection"
 msgstr "Connessione PPPoE"
 
-#: ../src/devices/nm-device-ethernet.c:1402
+#: ../src/devices/nm-device-ethernet.c:1396
 msgid "Wired connection"
 msgstr "Connessione via cavo"
 
-#: ../src/devices/nm-device-ethernet-utils.c:36
+#: ../src/devices/nm-device-ethernet-utils.c:39
 #, c-format
 msgid "Wired connection %d"
 msgstr "Connessione via cavo %d"
 
-#: ../src/devices/nm-device-ip-tunnel.c:347
-#, fuzzy
+#: ../src/devices/nm-device-infiniband.c:175
+msgid "InfiniBand connection"
+msgstr "Connessione InfiniBand"
+
+#: ../src/devices/nm-device-ip-tunnel.c:346
 msgid "IP tunnel connection"
-msgstr "Modifica connessione"
+msgstr "Connessione con tunnel IP"
 
-#: ../src/devices/nm-device-macvlan.c:436
-#, fuzzy
+#: ../src/devices/nm-device-macvlan.c:435
 msgid "MACVLAN connection"
-msgstr "Connessione VLAN %d"
+msgstr "Connessione MACVLAN"
 
 #: ../src/devices/nm-device-tun.c:129
-#, fuzzy
 msgid "TUN connection"
-msgstr "Connessione DUN %d"
+msgstr "Connessione TUN"
+
+#: ../src/devices/nm-device-vlan.c:457
+msgid "VLAN connection"
+msgstr "Connessione VLAN"
+
+#: ../src/devices/nm-device-vxlan.c:373
+msgid "VXLAN connection"
+msgstr "Connessione VXLAN"
 
-#: ../src/devices/team/nm-device-team.c:121
+#: ../src/devices/team/nm-device-team.c:115
 msgid "Team connection"
 msgstr "Connessione team"
 
@@ -9391,7 +9804,7 @@ msgstr "Connessione team"
 msgid "Mesh"
 msgstr "Mesh"
 
-#: ../src/devices/wifi/nm-device-wifi.c:842
+#: ../src/devices/wifi/nm-device-wifi.c:839
 msgid "WPA Ad-Hoc disabled due to kernel bugs"
 msgstr "WPA Ad-Hoc disabilitata a causa di problemi col kernel"
 
@@ -9428,24 +9841,24 @@ msgstr ""
 "chiavi WPA"
 
 #: ../src/devices/wifi/nm-wifi-ap-utils.c:164
-#, fuzzy, c-format
+#, c-format
 msgid "a connection using '%s' authentication cannot specify WPA protocols"
 msgstr ""
 "Una connessione con autenticazione \"%s\" non può specificare protocolli WPA"
 
 #: ../src/devices/wifi/nm-wifi-ap-utils.c:180
 #: ../src/devices/wifi/nm-wifi-ap-utils.c:197
-#, fuzzy, c-format
+#, c-format
 msgid "a connection using '%s' authentication cannot specify WPA ciphers"
 msgstr ""
 "Una connessione con autenticazione \"%s\" non può specificare cifrari WPA"
 
 #: ../src/devices/wifi/nm-wifi-ap-utils.c:209
-#, fuzzy, c-format
+#, c-format
 msgid "a connection using '%s' authentication cannot specify a WPA password"
 msgstr ""
-"Una connessione con autenticazione \"%s\" non può specificare una password "
-"WPA"
+"una connessione che utilizza autenticazione '%s' non può specificare una "
+"password WPA"
 
 #: ../src/devices/wifi/nm-wifi-ap-utils.c:240
 msgid "Dynamic WEP requires an 802.1x setting"
@@ -9503,7 +9916,8 @@ msgstr "L'impostazione 802.1x richiede la gestione della chiave \"wpa-eap\""
 
 #: ../src/devices/wifi/nm-wifi-ap-utils.c:449
 msgid "Access point does not support 802.1x but setting requires it"
-msgstr "Il punto di accesso non supporta 802.1x, ma l'impostazione lo richiede"
+msgstr ""
+"Il punto di accesso non supporta 802.1x, ma l'impostazione lo richiede"
 
 #: ../src/devices/wifi/nm-wifi-ap-utils.c:477
 msgid ""
@@ -9561,59 +9975,53 @@ msgstr ""
 msgid "Failed to determine AP security information"
 msgstr "Determinazione delle informazioni di sicurezza AP non riuscita"
 
-#: ../src/devices/wwan/nm-modem-broadband.c:673
+#: ../src/devices/wwan/nm-modem-broadband.c:641
 msgid "GSM mobile broadband connection requires a 'gsm' setting"
 msgstr ""
 "La connessione a banda larga mobile GSM richiede un'impostazione \"gsm\""
 
-#: ../src/nm-config.c:500
+#: ../src/nm-config.c:465
 msgid "Config file location"
 msgstr "Posizione file di configurazione"
 
-#: ../src/nm-config.c:501
+#: ../src/nm-config.c:466
 msgid "Config directory location"
 msgstr "Posizione directory di configurazione"
 
-#: ../src/nm-config.c:502
-#, fuzzy
+#: ../src/nm-config.c:467
 msgid "System config directory location"
-msgstr "Posizione directory di configurazione"
+msgstr "Percorso directory di configurazione del sistema"
 
-#: ../src/nm-config.c:503
-#, fuzzy
+#: ../src/nm-config.c:468
 msgid "Internal config file location"
-msgstr "Posizione file di configurazione"
-
-#: ../src/nm-config.c:504
-msgid "State file location"
-msgstr "Posizione file di stato"
+msgstr "Percorso file di configurazione interna"
 
-#: ../src/nm-config.c:505
+#: ../src/nm-config.c:469
 msgid "State file for no-auto-default devices"
 msgstr "File di stato per dispositivi no-auto-default"
 
-#: ../src/nm-config.c:506
+#: ../src/nm-config.c:470
 msgid "List of plugins separated by ','"
 msgstr "Elenco di plugin separati da virgole"
 
-#: ../src/nm-config.c:507
+#: ../src/nm-config.c:471
 msgid "Quit after initial configuration"
 msgstr "Esci dopo la configurazione iniziale"
 
-#: ../src/nm-config.c:508 ../src/nm-iface-helper.c:300
+#: ../src/nm-config.c:472 ../src/nm-iface-helper.c:300
 msgid "Don't become a daemon, and log to stderr"
 msgstr "Non si avvia in modalità demone e registra su stderr"
 
 #. These three are hidden for now, and should eventually just go away.
-#: ../src/nm-config.c:511
+#: ../src/nm-config.c:475
 msgid "An http(s) address for checking internet connectivity"
 msgstr "Un indirizzo HTTP(S) per controllare la connessione"
 
-#: ../src/nm-config.c:512
+#: ../src/nm-config.c:476
 msgid "The interval between connectivity checks (in seconds)"
 msgstr "L'intervallo tra i controlli della connessione (in secondi)"
 
-#: ../src/nm-config.c:513
+#: ../src/nm-config.c:477
 msgid "The expected start of the response"
 msgstr "L'inizio atteso della risposta"
 
@@ -9668,11 +10076,11 @@ msgstr "barbar"
 
 #: ../src/nm-iface-helper.c:290
 msgid "FQDN to send to DHCP server"
-msgstr ""
+msgstr "FQDN da inviare al server DHCP"
 
 #: ../src/nm-iface-helper.c:290
 msgid "host.domain.org"
-msgstr ""
+msgstr "host.domain.org"
 
 #: ../src/nm-iface-helper.c:291
 msgid "Route priority for IPv4"
@@ -9696,13 +10104,15 @@ msgstr "Identificato interfaccia in codice hex"
 
 #: ../src/nm-iface-helper.c:294
 msgid "IPv6 SLAAC address generation mode"
-msgstr ""
+msgstr "Modalità generazione indirizzi SLAAC IPv6"
 
 #: ../src/nm-iface-helper.c:295
 msgid ""
 "The logging backend configuration value. See logging.backend in "
 "NetworkManager.conf"
 msgstr ""
+"Valore di configurazione backend di logging. Vedere logging.backend in "
+"NetworkManager.conf"
 
 #: ../src/nm-iface-helper.c:315
 msgid ""
@@ -9727,16 +10137,24 @@ msgstr "Ricerca dell'indice di interfaccia per %s (%s) non riuscita\n"
 msgid "(%s): Invalid IID %s\n"
 msgstr "(%s): IID %s non valido\n"
 
-#: ../src/nm-logging.c:223
+#: ../src/nm-logging.c:216
 #, c-format
 msgid "Unknown log level '%s'"
 msgstr "Livello di registrazione «%s» sconosciuto"
 
-#: ../src/nm-logging.c:318
+#: ../src/nm-logging.c:309
 #, c-format
 msgid "Unknown log domain '%s'"
 msgstr "Dominio di registrazione «%s» sconosciuto"
 
-#: ../src/settings/plugins/ifcfg-rh/reader.c:106
+#: ../src/nm-manager.c:3635
+msgid "VPN connection"
+msgstr "Connessione VPN"
+
+#: ../src/nm-sleep-monitor-systemd.c:131
+msgid "NetworkManager needs to turn off networks"
+msgstr "NetworkManager deve disabilitare le reti"
+
+#: ../src/settings/plugins/ifcfg-rh/reader.c:108
 msgid "System"
 msgstr "Sistema"
diff --git a/po/ja.po b/po/ja.po
index f516156569..127d592632 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -5,21 +5,20 @@
 # Satoru SATOH <ssato@redhat.com>, 2005-2007.
 # Kiyoto Hashida <khashida@redhat.com>, 2010.
 # Noriko Mizumoto <noriko@fedoraproject.org>, 2013 - 2014.
-# Lubomir Rintel <lkundrak@v3.sk>, 2016. #zanata
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-06-22 10:02+0200\n"
-"PO-Revision-Date: 2014-01-28 08:31-0500\n"
-"Last-Translator: noriko <noriko@redhat.com>\n"
-"Language-Team: Japanese <gnome-translation@gnome.gr.jp>\n"
-"Language: ja\n"
+"POT-Creation-Date: 2016-04-29 14:24+0530\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"PO-Revision-Date: 2016-07-05 08:38+0000\n"
+"Last-Translator: Copied by Zanata <copied-by-zanata@zanata.org>\n"
+"Language-Team: Japanese <gnome-translation@gnome.gr.jp>\n"
+"Language: ja\n"
 "Plural-Forms: Plural-Forms: nplurals=1; plural=0;\n"
-"X-Generator: Zanata 3.8.4\n"
+"X-Generator: Zanata 3.9.3\n"
 
 #: ../clients/cli/agent.c:39
 #, c-format
@@ -46,6 +45,12 @@ msgid ""
 "and if a password is required asks the user for it.\n"
 "\n"
 msgstr ""
+"使い方: nmcli agent secret { help }\n"
+"\n"
+"nmcli を NetworkManager シークレットエージェントとして実行します。NetworkManager "
+"がパスワードを必要とする場合は、登録されたエージェントにパスワードを尋ねます。このコマンドにより、nmcli "
+"が引き続き実行され、パスワードが必要な場合は、ユーザーにパスワードを尋ねます。\n"
+"\n"
 
 #: ../clients/cli/agent.c:57
 #, c-format
@@ -58,6 +63,11 @@ msgid ""
 "the response back to polkit.\n"
 "\n"
 msgstr ""
+"使い方: nmcli agent polkit { help }\n"
+"\n"
+"nmcli をユーザーセッションの polkit アクションとして登録します。\n"
+"polkit デーモンが承認を必要とする場合、nmcli はユーザーに尋ね、応答を polkit に返します。\n"
+"\n"
 
 #: ../clients/cli/agent.c:67
 #, c-format
@@ -67,42 +77,46 @@ msgid ""
 "Runs nmcli as both NetworkManager secret and a polkit agent.\n"
 "\n"
 msgstr ""
+"使い方: nmcli agent all { help }\n"
+"\n"
+"nmcli を NetworkManager シークレットと polkit エージェントとして実行します。\n"
+"\n"
 
 #: ../clients/cli/agent.c:149
 #, c-format
 msgid "nmcli successfully registered as a NetworkManager's secret agent.\n"
-msgstr ""
+msgstr "nmcli は NetworkManager のシークレットエージェントとして適切に登録されました。\n"
 
 #: ../clients/cli/agent.c:151
-#, fuzzy, c-format
+#, c-format
 msgid "Error: secret agent initialization failed"
-msgstr "モデムの初期化に失敗しました"
+msgstr "エラー: シークレットエージェントの初期化に失敗しました"
 
 #: ../clients/cli/agent.c:166
-#, fuzzy, c-format
+#, c-format
 msgid "Error: polkit agent initialization failed: %s"
-msgstr "エラー: 接続のアクティベーションに失敗: %s"
+msgstr "エラー: polkit エージェントの初期化に失敗しました: %s"
 
 #: ../clients/cli/agent.c:174
 #, c-format
 msgid "nmcli successfully registered as a polkit agent.\n"
-msgstr ""
+msgstr "nmcli が polkit エージェントとして適切に登録されました。\n"
 
-#: ../clients/cli/agent.c:206 ../clients/cli/connections.c:8703
-#: ../clients/cli/devices.c:3727 ../clients/cli/general.c:344
-#: ../clients/cli/general.c:473
+#: ../clients/cli/agent.c:206 ../clients/cli/connections.c:11050
+#: ../clients/cli/devices.c:3669 ../clients/cli/general.c:343
+#: ../clients/cli/general.c:484
 #, c-format
 msgid "Error: NetworkManager is not running."
 msgstr "エラー: NetworkManager が起動していません。"
 
-#: ../clients/cli/agent.c:239
-#, fuzzy, c-format
+#: ../clients/cli/agent.c:242
+#, c-format
 msgid "Error: 'agent' command '%s' is not valid."
-msgstr "エラー: 'general' のコマンド '%s' は有効なコマンドではありません。"
+msgstr "エラー: 'agent' コマンド '%s' は無効です。"
 
 #: ../clients/cli/common.c:38 ../clients/cli/common.c:51
 #: ../clients/cli/common.c:59 ../clients/cli/common.c:71
-#: ../clients/cli/connections.c:237 ../clients/cli/connections.c:259
+#: ../clients/cli/connections.c:192 ../clients/cli/connections.c:214
 msgid "GROUP"
 msgstr "グループ"
 
@@ -114,7 +128,7 @@ msgstr "アドレス"
 #. 1
 #. 2
 #: ../clients/cli/common.c:40 ../clients/cli/common.c:61
-#: ../clients/cli/connections.c:262
+#: ../clients/cli/connections.c:217
 msgid "GATEWAY"
 msgstr "ゲートウェイ"
 
@@ -144,9 +158,9 @@ msgid "OPTION"
 msgstr "オプション"
 
 #: ../clients/cli/common.c:376 ../clients/cli/common.c:436
-#, fuzzy, c-format
+#, c-format
 msgid "invalid prefix '%s'; <1-%d> allowed"
-msgstr "無効なプレフィックス '%s'; <1-32> 許可"
+msgstr "無効なプレフィックス '%s'; <1-%d> 許可"
 
 #: ../clients/cli/common.c:384
 #, c-format
@@ -158,7 +172,7 @@ msgstr "無効な IP アドレス: %s"
 msgid ""
 "the second component of route ('%s') is neither a next hop address nor a "
 "metric"
-msgstr ""
+msgstr "ルートの 2 番目の部分 ('%s') は、ネクストホップアドレスでもなく、メトリックでもありません"
 
 #: ../clients/cli/common.c:457
 #, c-format
@@ -172,7 +186,7 @@ msgstr "無効なルート: %s"
 
 #: ../clients/cli/common.c:477
 msgid "default route cannot be added (NetworkManager handles it by itself)"
-msgstr ""
+msgstr "デフォルトのルートは追加できません (NetworkManager 自体が処理します)"
 
 #: ../clients/cli/common.c:494
 msgid "unmanaged"
@@ -182,7 +196,7 @@ msgstr "管理無し"
 msgid "unavailable"
 msgstr "利用不可"
 
-#: ../clients/cli/common.c:498 ../clients/cli/general.c:246
+#: ../clients/cli/common.c:498 ../clients/cli/general.c:245
 msgid "disconnected"
 msgstr "切断済み"
 
@@ -210,11 +224,11 @@ msgstr "接続中（IP の接続性チェック）"
 msgid "connecting (starting secondary connections)"
 msgstr "接続中（セカンダリ接続を開始）"
 
-#: ../clients/cli/common.c:512 ../clients/cli/general.c:242
+#: ../clients/cli/common.c:512 ../clients/cli/general.c:241
 msgid "connected"
 msgstr "接続済み"
 
-#: ../clients/cli/common.c:514 ../clients/cli/connections.c:690
+#: ../clients/cli/common.c:514 ../clients/cli/connections.c:648
 msgid "deactivating"
 msgstr "停止中"
 
@@ -223,70 +237,69 @@ msgid "connection failed"
 msgstr "接続に失敗"
 
 #: ../clients/cli/common.c:518 ../clients/cli/common.c:535
-#: ../clients/cli/connections.c:695 ../clients/cli/connections.c:718
-#: ../clients/cli/connections.c:1995 ../clients/cli/devices.c:1104
-#: ../clients/cli/devices.c:1145 ../clients/cli/devices.c:1147
-#: ../clients/cli/general.c:249 ../clients/cli/general.c:287
-#: ../clients/cli/general.c:422 ../clients/cli/general.c:437
-#: ../clients/cli/settings.c:845 ../clients/cli/settings.c:931
-#: ../clients/cli/settings.c:1315 ../clients/cli/settings.c:1954
-#: ../clients/cli/settings.c:3317
+#: ../clients/cli/connections.c:653 ../clients/cli/connections.c:676
+#: ../clients/cli/connections.c:1949 ../clients/cli/devices.c:1024
+#: ../clients/cli/devices.c:1065 ../clients/cli/devices.c:1067
+#: ../clients/cli/general.c:248 ../clients/cli/general.c:286
+#: ../clients/cli/general.c:432 ../clients/cli/general.c:448
+#: ../clients/cli/settings.c:839 ../clients/cli/settings.c:925
+#: ../clients/cli/settings.c:1265 ../clients/cli/settings.c:1901
+#: ../clients/cli/settings.c:3205 ../clients/cli/utils.c:1400
 #, c-format
 msgid "unknown"
 msgstr "不明"
 
 #. "CAPABILITIES"
-#: ../clients/cli/common.c:527 ../clients/cli/connections.c:975
-#: ../clients/cli/connections.c:977 ../clients/cli/connections.c:979
-#: ../clients/cli/connections.c:1013 ../clients/cli/connections.c:1082
-#: ../clients/cli/connections.c:1083 ../clients/cli/connections.c:1085
-#: ../clients/cli/connections.c:3291 ../clients/cli/connections.c:4414
-#: ../clients/cli/connections.c:6229 ../clients/cli/connections.c:6230
-#: ../clients/cli/devices.c:782 ../clients/cli/devices.c:1069
-#: ../clients/cli/devices.c:1070 ../clients/cli/devices.c:1071
-#: ../clients/cli/devices.c:1072 ../clients/cli/devices.c:1073
-#: ../clients/cli/devices.c:1108 ../clients/cli/devices.c:1110
-#: ../clients/cli/devices.c:1138 ../clients/cli/devices.c:1139
-#: ../clients/cli/devices.c:1140 ../clients/cli/devices.c:1141
-#: ../clients/cli/devices.c:1142 ../clients/cli/devices.c:1143
-#: ../clients/cli/devices.c:1144 ../clients/cli/devices.c:1146
-#: ../clients/cli/devices.c:1148 ../clients/cli/general.c:431
-#: ../clients/cli/settings.c:3312
+#: ../clients/cli/common.c:527 ../clients/cli/connections.c:933
+#: ../clients/cli/connections.c:935 ../clients/cli/connections.c:937
+#: ../clients/cli/connections.c:971 ../clients/cli/connections.c:1040
+#: ../clients/cli/connections.c:1041 ../clients/cli/connections.c:1043
+#: ../clients/cli/connections.c:3450 ../clients/cli/connections.c:8563
+#: ../clients/cli/connections.c:8564 ../clients/cli/devices.c:772
+#: ../clients/cli/devices.c:989 ../clients/cli/devices.c:990
+#: ../clients/cli/devices.c:991 ../clients/cli/devices.c:992
+#: ../clients/cli/devices.c:993 ../clients/cli/devices.c:1028
+#: ../clients/cli/devices.c:1030 ../clients/cli/devices.c:1058
+#: ../clients/cli/devices.c:1059 ../clients/cli/devices.c:1060
+#: ../clients/cli/devices.c:1061 ../clients/cli/devices.c:1062
+#: ../clients/cli/devices.c:1063 ../clients/cli/devices.c:1064
+#: ../clients/cli/devices.c:1066 ../clients/cli/devices.c:1068
+#: ../clients/cli/general.c:442 ../clients/cli/settings.c:3200
 msgid "yes"
 msgstr "はい"
 
-#: ../clients/cli/common.c:529 ../clients/cli/connections.c:975
-#: ../clients/cli/connections.c:977 ../clients/cli/connections.c:979
-#: ../clients/cli/connections.c:1082 ../clients/cli/connections.c:1083
-#: ../clients/cli/connections.c:1085 ../clients/cli/connections.c:3292
-#: ../clients/cli/connections.c:4413 ../clients/cli/connections.c:6229
-#: ../clients/cli/connections.c:6230 ../clients/cli/devices.c:782
-#: ../clients/cli/devices.c:1069 ../clients/cli/devices.c:1070
-#: ../clients/cli/devices.c:1071 ../clients/cli/devices.c:1072
-#: ../clients/cli/devices.c:1073 ../clients/cli/devices.c:1108
-#: ../clients/cli/devices.c:1110 ../clients/cli/devices.c:1138
-#: ../clients/cli/devices.c:1139 ../clients/cli/devices.c:1140
-#: ../clients/cli/devices.c:1141 ../clients/cli/devices.c:1142
-#: ../clients/cli/devices.c:1143 ../clients/cli/devices.c:1144
-#: ../clients/cli/devices.c:1146 ../clients/cli/devices.c:1148
-#: ../clients/cli/general.c:433 ../clients/cli/settings.c:3314
+#: ../clients/cli/common.c:529 ../clients/cli/connections.c:933
+#: ../clients/cli/connections.c:935 ../clients/cli/connections.c:937
+#: ../clients/cli/connections.c:1040 ../clients/cli/connections.c:1041
+#: ../clients/cli/connections.c:1043 ../clients/cli/connections.c:3451
+#: ../clients/cli/connections.c:8563 ../clients/cli/connections.c:8564
+#: ../clients/cli/devices.c:772 ../clients/cli/devices.c:989
+#: ../clients/cli/devices.c:990 ../clients/cli/devices.c:991
+#: ../clients/cli/devices.c:992 ../clients/cli/devices.c:993
+#: ../clients/cli/devices.c:1028 ../clients/cli/devices.c:1030
+#: ../clients/cli/devices.c:1058 ../clients/cli/devices.c:1059
+#: ../clients/cli/devices.c:1060 ../clients/cli/devices.c:1061
+#: ../clients/cli/devices.c:1062 ../clients/cli/devices.c:1063
+#: ../clients/cli/devices.c:1064 ../clients/cli/devices.c:1066
+#: ../clients/cli/devices.c:1068 ../clients/cli/general.c:444
+#: ../clients/cli/settings.c:3202
 msgid "no"
 msgstr "いいえ"
 
 #: ../clients/cli/common.c:531
 msgid "yes (guessed)"
-msgstr ""
+msgstr "はい (推測)"
 
 #: ../clients/cli/common.c:533
 msgid "no (guessed)"
-msgstr ""
+msgstr "いいえ (推測)"
 
 #: ../clients/cli/common.c:544
 msgid "No reason given"
 msgstr "原因不明"
 
 #. We should not really come here
-#: ../clients/cli/common.c:547 ../clients/cli/connections.c:3140
+#: ../clients/cli/common.c:547 ../clients/cli/connections.c:2976
 #, c-format
 msgid "Unknown error"
 msgstr "不明なエラー"
@@ -306,8 +319,7 @@ msgstr "デバイスの設定準備ができませんでした"
 #: ../clients/cli/common.c:559
 msgid ""
 "IP configuration could not be reserved (no available address, timeout, etc.)"
-msgstr ""
-"IP 設定を確保できませんでした (利用可能なアドレスがない、タイムアウトなど)"
+msgstr "IP 設定を確保できませんでした (利用可能なアドレスがない、タイムアウトなど)"
 
 #: ../clients/cli/common.c:562
 msgid "The IP configuration is no longer valid"
@@ -514,9 +526,8 @@ msgid "teamd control failed"
 msgstr "teamd の制御に失敗しました"
 
 #: ../clients/cli/common.c:715
-#, fuzzy
 msgid "Modem failed or no longer available"
-msgstr "ModemManager は使用できません"
+msgstr "モデムで障害が発生したか、モデムが利用できなくなりました"
 
 #: ../clients/cli/common.c:718
 msgid "Modem now ready and available"
@@ -527,23 +538,20 @@ msgid "SIM PIN was incorrect"
 msgstr "SIM PIN が間違っています"
 
 #: ../clients/cli/common.c:724
-#, fuzzy
 msgid "New connection activation was enqueued"
-msgstr "エラー: 接続のアクティベートに失敗しました。"
+msgstr "新規接続アクティベーションがキューに格納されました"
 
 #: ../clients/cli/common.c:727
-#, fuzzy
 msgid "The device's parent changed"
-msgstr "このデバイスは削除されました"
+msgstr "デバイスの親が変更されました"
 
 #: ../clients/cli/common.c:730
-#, fuzzy
 msgid "The device parent's management changed"
-msgstr "このデバイスは削除されました"
+msgstr "デバイスの親の管理が変更されました"
 
 #. TRANSLATORS: Unknown reason for a device state change (NMDeviceStateReason)
-#: ../clients/cli/common.c:734 ../libnm-glib/nm-device.c:1898
-#: ../libnm/nm-device.c:1849
+#: ../clients/cli/common.c:734 ../libnm-glib/nm-device.c:1888
+#: ../libnm/nm-device.c:1839
 msgid "Unknown"
 msgstr "不明"
 
@@ -563,19 +571,19 @@ msgid "'%s' is not a valid team configuration or file name."
 msgstr "'%s' は有効な team 設定でもファイル名でもありません"
 
 #: ../clients/cli/common.c:958
-#, fuzzy, c-format
+#, c-format
 msgid "Error: openconnect failed: %s\n"
-msgstr "エラー: 接続の確認に失敗しました: %s\n"
+msgstr "エラー: openconnect が失敗しました: %s\n"
 
 #: ../clients/cli/common.c:965
-#, fuzzy, c-format
+#, c-format
 msgid "Error: openconnect failed with status %d\n"
-msgstr "エラー: 接続は無効です: %s\n"
+msgstr "エラー: openconnect がステータス %d で失敗しました\n"
 
 #: ../clients/cli/common.c:967
-#, fuzzy, c-format
+#, c-format
 msgid "Error: openconnect failed with signal %d\n"
-msgstr "エラー: 接続は無効です: %s\n"
+msgstr "エラー: openconnect がシグナル %d で失敗しました\n"
 
 #: ../clients/cli/common.c:1045
 #, c-format
@@ -583,119 +591,73 @@ msgid ""
 "Warning: password for '%s' not given in 'passwd-file' and nmcli cannot ask "
 "without '--ask' option.\n"
 msgstr ""
+"警告: '%s' のパスワードが 'passwd-file' で提供されていません。nmcli は '--ask' "
+"オプションがないと尋ねることができません。\n"
 
 #. define some prompts for connection editor
-#: ../clients/cli/connections.c:61
+#: ../clients/cli/connections.c:41
 msgid "Setting name? "
 msgstr "設定名は? "
 
-#: ../clients/cli/connections.c:62
+#: ../clients/cli/connections.c:42
 msgid "Property name? "
 msgstr "プロパティ名は? "
 
-#: ../clients/cli/connections.c:63
+#: ../clients/cli/connections.c:43
 msgid "Enter connection type: "
 msgstr "接続タイプを入力してください: "
 
 #. define some other prompts
-#: ../clients/cli/connections.c:66
-#, fuzzy
-msgid "Connection type"
+#: ../clients/cli/connections.c:46
+msgid "Connection type: "
 msgstr "接続タイプ: "
 
-#: ../clients/cli/connections.c:67
-#, fuzzy
-msgid "VPN type"
+#: ../clients/cli/connections.c:47
+msgid "VPN type: "
 msgstr "VPN タイプ: "
 
-#: ../clients/cli/connections.c:68
-#, fuzzy
-msgid "Master"
-msgstr "ボンドマスター: "
-
-#: ../clients/cli/connections.c:70 ../clients/tui/nmt-page-infiniband.c:88
-msgid "Transport mode"
-msgstr "トランスポートモード"
-
-#: ../clients/cli/connections.c:75
-#, fuzzy
-msgid "Bluetooth type"
-msgstr "Bluetooth"
-
-#: ../clients/cli/connections.c:81
-#, fuzzy
-msgid "Bonding mode"
-msgstr "リンクのモニタリング"
-
-#: ../clients/cli/connections.c:83 ../clients/cli/connections.c:4014
-#, fuzzy
-msgid "Bonding monitoring mode"
-msgstr "リンクのモニタリング"
-
-#: ../clients/cli/connections.c:88
-#, fuzzy
-msgid "Protocol"
-msgstr "プロトコル %s"
-
-#: ../clients/cli/connections.c:91
-msgid "Wi-Fi mode"
-msgstr "Wi-Fi モード"
-
-#: ../clients/cli/connections.c:97
-#, fuzzy
-msgid "ADSL encapsulation"
-msgstr "DSL 認証"
-
-#: ../clients/cli/connections.c:100
-#, fuzzy
-msgid "Tun mode"
-msgstr "トランスポートモード"
+#: ../clients/cli/connections.c:48
+msgid "Master: "
+msgstr "マスター: "
 
-#: ../clients/cli/connections.c:105
-#, fuzzy
-msgid "IP Tunnel mode"
-msgstr "接続の編集"
+#: ../clients/cli/connections.c:49
+msgid "Connection (name, UUID, or path): "
+msgstr "接続 (名前、UUID またはパス): "
 
-#: ../clients/cli/connections.c:107
-#, fuzzy
-msgid "MACVLAN mode"
-msgstr "VLAN"
+#: ../clients/cli/connections.c:50
+msgid "VPN connection (name, UUID, or path): "
+msgstr "VPN 接続 (名前、UUID またはパス): "
 
-#: ../clients/cli/connections.c:109
-#, fuzzy
-msgid "Connection (name, UUID, or path)"
+#: ../clients/cli/connections.c:51
+msgid "Connection(s) (name, UUID, or path): "
 msgstr "接続 (名前、UUID またはパス): "
 
-#: ../clients/cli/connections.c:110
-#, fuzzy
-msgid "VPN connection (name, UUID, or path)"
+#: ../clients/cli/connections.c:52
+msgid "Connection(s) (name, UUID, path or apath): "
 msgstr "接続 (名前、UUID またはパス): "
 
-#: ../clients/cli/connections.c:111
-#, fuzzy
-msgid "Connection(s) (name, UUID, or path)"
-msgstr "接続 (名前、UUID またはパス): "
+#: ../clients/cli/connections.c:53
+msgid "Tunnel mode: "
+msgstr "トンネルモード: "
 
-#: ../clients/cli/connections.c:112
-#, fuzzy
-msgid "Connection(s) (name, UUID, path or apath)"
-msgstr "接続 (名前、UUID またはパス): "
+#: ../clients/cli/connections.c:54
+msgid "MACVLAN mode: "
+msgstr "MACVLAN モード: "
 
 #. 0
-#: ../clients/cli/connections.c:118 ../clients/cli/connections.c:238
+#: ../clients/cli/connections.c:73 ../clients/cli/connections.c:193
 #: ../clients/cli/devices.c:55 ../clients/cli/devices.c:89
 #: ../clients/cli/devices.c:99 ../clients/cli/devices.c:110
 #: ../clients/cli/devices.c:120 ../clients/cli/devices.c:137
 #: ../clients/cli/devices.c:150 ../clients/cli/devices.c:176
 #: ../clients/cli/devices.c:191 ../clients/cli/devices.c:200
-#: ../clients/cli/devices.c:210 ../clients/cli/devices.c:220
-#: ../clients/cli/devices.c:261
+#: ../clients/cli/devices.c:210 ../clients/cli/devices.c:251
 msgid "NAME"
 msgstr "名前"
 
 #. 0
 #. 1
-#: ../clients/cli/connections.c:119 ../clients/cli/connections.c:239
+#: ../clients/cli/connections.c:74 ../clients/cli/connections.c:194
 msgid "UUID"
 msgstr "UUID"
 
@@ -703,36 +665,35 @@ msgstr "UUID"
 #. 0
 #. 1
 #. 2
-#: ../clients/cli/connections.c:120 ../clients/cli/connections.c:260
+#: ../clients/cli/connections.c:75 ../clients/cli/connections.c:215
 #: ../clients/cli/devices.c:41 ../clients/cli/devices.c:57
 #: ../clients/cli/devices.c:179
 msgid "TYPE"
 msgstr "タイプ"
 
 #. 2
-#: ../clients/cli/connections.c:121
+#: ../clients/cli/connections.c:76
 msgid "TIMESTAMP"
 msgstr "タイムスタンプ"
 
 #. 3
-#: ../clients/cli/connections.c:122
+#: ../clients/cli/connections.c:77
 msgid "TIMESTAMP-REAL"
 msgstr "タイムスタンプ-リアル"
 
 #. 4
 #. 16
-#: ../clients/cli/connections.c:123 ../clients/cli/devices.c:72
+#: ../clients/cli/connections.c:78 ../clients/cli/devices.c:72
 msgid "AUTOCONNECT"
 msgstr "自動接続"
 
 #. 5
-#: ../clients/cli/connections.c:124
-#, fuzzy
+#: ../clients/cli/connections.c:79
 msgid "AUTOCONNECT-PRIORITY"
-msgstr "自動接続"
+msgstr "AUTOCONNECT-PRIORITY"
 
 #. 6
-#: ../clients/cli/connections.c:125
+#: ../clients/cli/connections.c:80
 msgid "READONLY"
 msgstr "読み込み専用"
 
@@ -741,7 +702,7 @@ msgstr "読み込み専用"
 #. 2
 #. 15
 #. 5
-#: ../clients/cli/connections.c:126 ../clients/cli/connections.c:246
+#: ../clients/cli/connections.c:81 ../clients/cli/connections.c:201
 #: ../clients/cli/devices.c:43 ../clients/cli/devices.c:166
 #: ../clients/cli/devices.c:182
 msgid "DBUS-PATH"
@@ -750,7 +711,7 @@ msgstr "DBUS パス"
 #. 8
 #. 13
 #. 4
-#: ../clients/cli/connections.c:127 ../clients/cli/devices.c:164
+#: ../clients/cli/connections.c:82 ../clients/cli/devices.c:164
 #: ../clients/cli/devices.c:181
 msgid "ACTIVE"
 msgstr "アクティブ"
@@ -760,9 +721,9 @@ msgstr "アクティブ"
 #. 12
 #. 3
 #. 0
-#: ../clients/cli/connections.c:128 ../clients/cli/devices.c:40
+#: ../clients/cli/connections.c:83 ../clients/cli/devices.c:40
 #: ../clients/cli/devices.c:56 ../clients/cli/devices.c:163
-#: ../clients/cli/devices.c:180 ../clients/cli/devices.c:262
+#: ../clients/cli/devices.c:180 ../clients/cli/devices.c:252
 msgid "DEVICE"
 msgstr "デバイス"
 
@@ -771,42 +732,42 @@ msgstr "デバイス"
 #. 1
 #. 10
 #. 1
-#: ../clients/cli/connections.c:129 ../clients/cli/connections.c:241
+#: ../clients/cli/connections.c:84 ../clients/cli/connections.c:196
 #: ../clients/cli/devices.c:42 ../clients/cli/devices.c:66
-#: ../clients/cli/general.c:37
+#: ../clients/cli/general.c:36
 msgid "STATE"
 msgstr "状態"
 
 #. 11
-#: ../clients/cli/connections.c:130
-#, fuzzy
+#: ../clients/cli/connections.c:85
 msgid "ACTIVE-PATH"
-msgstr "マスターパス"
+msgstr "ACTIVE-PATH"
 
 #. 2
-#: ../clients/cli/connections.c:240
+#: ../clients/cli/connections.c:195
 msgid "DEVICES"
 msgstr "デバイス"
 
 #. 4
-#: ../clients/cli/connections.c:242
+#: ../clients/cli/connections.c:197
 msgid "DEFAULT"
 msgstr "デフォルト"
 
 #. 5
-#: ../clients/cli/connections.c:243
+#: ../clients/cli/connections.c:198
 msgid "DEFAULT6"
 msgstr "デフォルト6"
 
 #. 6
-#: ../clients/cli/connections.c:244
+#: ../clients/cli/connections.c:199
 msgid "SPEC-OBJECT"
 msgstr "スペックオブジェクト"
 
 #. 7
 #. 4
-#: ../clients/cli/connections.c:245 ../clients/cli/connections.c:283
-#: ../clients/tui/nm-editor-utils.c:233
+#. Ask for optional 'vpn' arguments.
+#: ../clients/cli/connections.c:200 ../clients/cli/connections.c:238
+#: ../clients/cli/connections.c:4169 ../clients/tui/nm-editor-utils.c:233
 #: ../clients/tui/nmt-connect-connection-list.c:405
 msgid "VPN"
 msgstr "VPN"
@@ -814,71 +775,71 @@ msgstr "VPN"
 #. 9
 #. 5
 #. 22
-#: ../clients/cli/connections.c:247 ../clients/cli/devices.c:46
+#: ../clients/cli/connections.c:202 ../clients/cli/devices.c:46
 #: ../clients/cli/devices.c:78
 msgid "CON-PATH"
 msgstr "CON パス"
 
 #. 10
-#: ../clients/cli/connections.c:248
+#: ../clients/cli/connections.c:203
 msgid "ZONE"
 msgstr "ゾーン"
 
 #. 11
-#: ../clients/cli/connections.c:249
+#: ../clients/cli/connections.c:204
 msgid "MASTER-PATH"
 msgstr "マスターパス"
 
 #. 1
-#: ../clients/cli/connections.c:261
+#: ../clients/cli/connections.c:216
 msgid "USERNAME"
 msgstr "ユーザー名"
 
 #. 3
-#: ../clients/cli/connections.c:263
+#: ../clients/cli/connections.c:218
 msgid "BANNER"
 msgstr "バナー"
 
 #. 4
-#: ../clients/cli/connections.c:264
+#: ../clients/cli/connections.c:219
 msgid "VPN-STATE"
 msgstr "VPN の状態"
 
 #. 5
-#: ../clients/cli/connections.c:265
+#: ../clients/cli/connections.c:220
 msgid "CFG"
 msgstr "CFG"
 
-#: ../clients/cli/connections.c:278 ../clients/cli/devices.c:235
+#: ../clients/cli/connections.c:233 ../clients/cli/devices.c:225
 msgid "GENERAL"
 msgstr "全般"
 
 #. 0
 #. 6
-#: ../clients/cli/connections.c:279 ../clients/cli/devices.c:242
+#: ../clients/cli/connections.c:234 ../clients/cli/devices.c:232
 msgid "IP4"
 msgstr "IP4"
 
 #. 1
 #. 7
-#: ../clients/cli/connections.c:280 ../clients/cli/devices.c:243
+#: ../clients/cli/connections.c:235 ../clients/cli/devices.c:233
 msgid "DHCP4"
 msgstr "DHCP4"
 
 #. 2
 #. 8
-#: ../clients/cli/connections.c:281 ../clients/cli/devices.c:244
+#: ../clients/cli/connections.c:236 ../clients/cli/devices.c:234
 msgid "IP6"
 msgstr "IP6"
 
 #. 3
 #. 9
-#: ../clients/cli/connections.c:282 ../clients/cli/devices.c:245
+#: ../clients/cli/connections.c:237 ../clients/cli/devices.c:235
 msgid "DHCP6"
 msgstr "DHCP6"
 
-#: ../clients/cli/connections.c:314
-#, fuzzy, c-format
+#: ../clients/cli/connections.c:272
+#, c-format
 msgid ""
 "Usage: nmcli connection { COMMAND | help }\n"
 "\n"
@@ -893,8 +854,8 @@ msgid ""
 "\n"
 "  down [id | uuid | path | apath] <ID> ...\n"
 "\n"
-"  add COMMON_OPTIONS TYPE_SPECIFIC_OPTIONS SLAVE_OPTIONS IP_OPTIONS [-- "
-"([+|-]<setting>.<property> <value>)+]\n"
+"  add COMMON_OPTIONS TYPE_SPECIFIC_OPTIONS SLAVE_OPTIONS IP_OPTIONS [-- ([+|-"
+"]<setting>.<property> <value>)+]\n"
 "\n"
 "  modify [--temporary] [id | uuid | path] <ID> ([+|-]<setting>.<property> "
 "<value>)+\n"
@@ -917,35 +878,44 @@ msgid ""
 "  export [id | uuid | path] <ID> [<output file>]\n"
 "\n"
 msgstr ""
-"使い方: nmcli connection { コマンド | help }\n"
+"Usage: nmcli connection { COMMAND | help }\n"
 "\n"
-"コマンドの種類 := { show | up | down | add | modify | edit | delete | reload "
-"| load }\n"
+"COMMAND := { show | up | down | add | modify | edit | delete | monitor | "
+"reload | load }\n"
 "\n"
-"  設定している [[id | uuid | path] <ID>] を表示する\n"
-"  アクティブな [[id | uuid | path | apath] <ID>] を表示する\n"
+"  show [--active] [--order <order spec>]\n"
+"  show [--active] [id | uuid | path | apath] <ID> ...\n"
 "\n"
-"  up [[id | uuid | path] <ID>] [ifname <ifname>] [ap <BSSID>] [nsp <name>]\n"
+"  up [[id | uuid | path] <ID>] [ifname <ifname>] [ap <BSSID>] [passwd-file "
+"<file with passwords>]\n"
 "\n"
-"  up [[id | uuid | path] <ID>] [ifname <ifname>] [ap <BSSID>]\n"
+"  down [id | uuid | path | apath] <ID> ...\n"
 "\n"
-"  down [id | uuid | path | apath] <ID>\n"
+"  add COMMON_OPTIONS TYPE_SPECIFIC_OPTIONS SLAVE_OPTIONS IP_OPTIONS [-- ([+|-"
+"]<setting>.<property> <value>)+]\n"
 "\n"
-"  add COMMON_OPTIONS TYPE_SPECIFIC_OPTIONS IP_OPTIONS\n"
+"  modify [--temporary] [id | uuid | path] <ID> ([+|-]<setting>.<property> "
+"<value>)+\n"
 "\n"
-"  modify [id | uuid | path] <ID> <setting>.<property> <value>\n"
+"  clone [--temporary] [id | uuid | path ] <ID> <new name>\n"
 "\n"
 "  edit [id | uuid | path] <ID>\n"
 "  edit [type <new_con_type>] [con-name <new_con_name>]\n"
 "\n"
 "  delete [id | uuid | path] <ID>\n"
 "\n"
+"  monitor [id | uuid | path] <ID> ...\n"
+"\n"
 "  reload\n"
 "\n"
 "  load <filename> [ <filename>... ]\n"
 "\n"
+"  import [--temporary] type <type> file <file to import>\n"
+"\n"
+"  export [id | uuid | path] <ID> [<output file>]\n"
+"\n"
 
-#: ../clients/cli/connections.c:336
+#: ../clients/cli/connections.c:294
 #, c-format
 msgid ""
 "Usage: nmcli connection show { ARGUMENTS | help }\n"
@@ -971,9 +941,24 @@ msgid ""
 "account. Use global --show-secrets option to reveal associated secrets as "
 "well.\n"
 msgstr ""
+"使い方: nmcli connection show { ARGUMENTS | help }\n"
+"\n"
+"ARGUMENTS := [--active] [--order <order spec>]\n"
+"\n"
+"メモリー内およびディスク上接続プロファイルを一覧表示します。一部の接続プロファイルは、デバイスが\n"
+"その接続プロファイルを使用している場合でもアクティブなことがあります。パラメーターがないと、\n"
+"すべてのプロファイルが一覧表示されます。--active オプションが指定された場合は、アクティブな\n"
+"プロファイルのみが表示されます。--order が指定された場合は、カスタムの接続順序が可能になります (man ページを参照)。\n"
+"\n"
+"ARGUMENTS := [--active] [id | uuid | path | apath] <ID> ...\n"
+"\n"
+"指定された接続の詳細を表示します。デフォルトでは、静的な接続とアクティブな\n"
+"接続データが表示されます。グローバルな '--fields' オプションを使用すると、出力をフィルタリング\n"
+"できます。--active オプションが指定された場合は、アクティブなプロファイルのみが考慮されます。\n"
+"関連するシークレットも表示する場合は、グローバルな --show-secrets オプションを使用します。\n"
 
-#: ../clients/cli/connections.c:357
-#, fuzzy, c-format
+#: ../clients/cli/connections.c:315
+#, c-format
 msgid ""
 "Usage: nmcli connection up { ARGUMENTS | help }\n"
 "\n"
@@ -996,26 +981,28 @@ 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 <ifname>] [ap <BSSID>] [nsp "
-"<name>]\n"
+"ARGUMENTS := [id | uuid | path] <ID> [ifname <ifname>] [ap <BSSID>] [nsp "
+"<name>] [passwd-file <file with passwords>]\n"
 "\n"
 "デバイス上の接続をアクティブにします。アクティブにするプロファイルは\n"
-"名前、UUID、D-Bus パスなどで識別します。\n"
+"名前、UUID、または D-Bus で識別します。\n"
 "\n"
-"引数の種類 := ifname <ifname> [ap <BSSID>] [nsp <name>]\n"
+"ARGUMENTS := ifname <ifname> [ap <BSSID>] [nsp <name>] [passwd-file <file "
+"with passwords>]\n"
 "\n"
 "接続を使ってデバイスをアクティブにします。接続プロファイルは \n"
 "NetworkManager により自動的に選択されます。\n"
 "\n"
-"ifname - 接続上にあるデバイスでアクティブにするデバイスを指定します\n"
-"ap     - 接続する AP を指定します (Wi-Fi の場合にのみ有効)\n"
-"nsp    - 接続する NSP を指定します (WiMAX の場合にのみ有効)\n"
+"ifname      - 接続をアクティブにするデバイスを指定します\n"
+"ap          - 接続する AP を指定します (Wi-Fi の場合にのみ有効)\n"
+"nsp         - 接続する NSP を指定します (WiMAX の場合にのみ有効)\n"
+"passwd-file - 接続をアクティブにするのに必要なパスワードを含むファイル\n"
 "\n"
 
-#: ../clients/cli/connections.c:378
-#, fuzzy, c-format
+#: ../clients/cli/connections.c:336
+#, c-format
 msgid ""
 "Usage: nmcli connection down { ARGUMENTS | help }\n"
 "\n"
@@ -1027,21 +1014,22 @@ 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、D-Bus パスなどで識別します。\n"
+"デバイスの接続を解除します (デバイスの自動アクティベーションは\n"
+"停止されません)。解除するプロファイルは名前、UUID、または D-Bus パス\n"
+"で識別します。\n"
 "\n"
 
-#: ../clients/cli/connections.c:390
-#, fuzzy, c-format
+#: ../clients/cli/connections.c:348
+#, 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"
+"ARGUMENTS := COMMON_OPTIONS TYPE_SPECIFIC_OPTIONS SLAVE_OPTIONS IP_OPTIONS [-"
+"- ([+|-]<setting>.<property> <value>)+]\n"
 "\n"
 "  COMMON_OPTIONS:\n"
 "                  type <type>\n"
@@ -1128,8 +1116,8 @@ msgid ""
 "                  [path-cost <1-65535>]\n"
 "                  [hairpin yes|no]\n"
 "\n"
-"    vpn:          vpn-type vpnc|openvpn|pptp|openconnect|openswan|libreswan|"
-"ssh|l2tp|iodine|...\n"
+"    vpn:          vpn-type "
+"vpnc|openvpn|pptp|openconnect|openswan|libreswan|ssh|l2tp|iodine|...\n"
 "                  [user <username>]\n"
 "\n"
 "    olpc-mesh:    ssid <SSID>\n"
@@ -1177,25 +1165,30 @@ msgid ""
 "                  [ip6 <IPv6 address>] [gw6 <IPv6 gateway>]\n"
 "\n"
 msgstr ""
-"使い方: nmcli connection add { 引数 | help }\n"
+"使い方: nmcli connection add { ARGUMENTS | help }\n"
 "\n"
-"引数 := COMMON_OPTIONS TYPE_SPECIFIC_OPTIONS IP_OPTIONS\n"
+"ARGUMENTS := COMMON_OPTIONS TYPE_SPECIFIC_OPTIONS SLAVE_OPTIONS IP_OPTIONS [-"
+"- ([+|-]<setting>.<property> <value>)+]\n"
 "\n"
 "  COMMON_OPTIONS:\n"
 "                  type <タイプ>\n"
 "                  ifname <インターフェース名> | \"*\"\n"
 "                  [con-name <接続名>]\n"
 "                  [autoconnect yes|no]\n"
+"                  [save yes|no]\n"
+"                  [master <マスター (ifname、接続、UUID、または名前)>]\n"
+"                  [slave-type <マスター接続タイプ>]\n"
 "\n"
 "  TYPE_SPECIFIC_OPTIONS:\n"
 "    ethernet:     [mac <MAC アドレス>]\n"
-"                  [cloned-mac <クローンの MAC アドレス>]\n"
+"                  [cloned-mac <クローン MAC アドレス>]\n"
 "                  [mtu <MTU>]\n"
 "\n"
 "    wifi:         ssid <SSID>\n"
 "                  [mac <MAC アドレス>]\n"
-"                  [cloned-mac <クローンの MAC アドレス>]\n"
+"                  [cloned-mac <クローン MAC アドレス>]\n"
 "                  [mtu <MTU>]\n"
+"                  [mode infrastructure|ap|adhoc]\n"
 "\n"
 "    wimax:        [mac <MAC アドレス>]\n"
 "                  [nsp <NSP>]\n"
@@ -1222,7 +1215,7 @@ msgstr ""
 "    bluetooth:    [addr <bluetooth アドレス>]\n"
 "                  [bt-type panu|dun-gsm|dun-cdma]\n"
 "\n"
-"    vlan:         dev <親デバイス (接続  UUID、ifname、MAC)>\n"
+"    vlan:         dev <親デバイス (接続 UUID、ifname、または MAC)>\n"
 "                  id <VLAN ID>\n"
 "                  [flags <VLAN フラグ>]\n"
 "                  [ingress <ingress 優先度マッピング>]\n"
@@ -1239,12 +1232,13 @@ msgstr ""
 "                  [updelay <数値>]\n"
 "                  [arp-interval <数値>]\n"
 "                  [arp-ip-target <数値>]\n"
+"                  [lacp-rate slow (0) | fast (1)]\n"
 "\n"
-"    bond-slave:   master <マスター (ifname または接続 UUID)>\n"
+"    bond-slave:   master <マスター (ifname、接続 UUID、名前)>\n"
 "\n"
 "    team:         [config <ファイル>|<JSON 生データ>]\n"
 "\n"
-"    team-slave:   master <マスター (ifname または接続 UUID)>\n"
+"    team-slave:   master <マスター (ifname、接続 UUID、または名前)>\n"
 "                  [config <ファイル>|<JSON 生データ>]\n"
 "\n"
 "    bridge:       [stp yes|no]\n"
@@ -1253,25 +1247,64 @@ msgstr ""
 "                  [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 <マスター (ifname または接続 UUID)>\n"
+"    bridge-slave: master <マスター (ifname、接続 UUID、または名前)>\n"
 "                  [priority <0-63>]\n"
 "                  [path-cost <1-65535>]\n"
 "                  [hairpin yes|no]\n"
 "\n"
-"    vpn:          vpn-type vpnc|openvpn|pptp|openconnect|openswan\n"
+"    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 <親デバイス (ifname または接続 UUID)>]\n"
+"\n"
+"    macvlan:      dev <親デバイス (接続 UUID、ifname、または 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 <親デバイス (ifname または接続 UUID)>]\n"
+"                  [source-port-min <0-65535>]\n"
+"                  [source-port-max <0-65535>]\n"
+"                  [destination-port <0-65535>]\n"
+"\n"
+"  SLAVE_OPTIONS:\n"
+"    bridge:       [priority <0-63>]\n"
+"                  [path-cost <1-65535>]\n"
+"                  [hairpin yes|no]\n"
+"\n"
+"    team:         [config <ファイル>|<JSON 生データ>]\n"
+"\n"
 "  IP_OPTIONS:\n"
 "                  [ip4 <IPv4 アドレス>] [gw4 <IPv4 ゲートウェイ>]\n"
 "                  [ip6 <IPv6 アドレス>] [gw6 <IPv6 ゲートウェイ>]\n"
 "\n"
 
-#: ../clients/cli/connections.c:502
+#: ../clients/cli/connections.c:460
 #, c-format
 msgid ""
 "Usage: nmcli connection modify { ARGUMENTS | help }\n"
@@ -1286,8 +1319,8 @@ msgid ""
 "\n"
 "Examples:\n"
 "nmcli con mod home-wifi wifi.ssid rakosnicek\n"
-"nmcli con mod em1-1 ipv4.method manual ipv4.addr \"192.168.1.2/24, "
-"10.10.1.5/8\"\n"
+"nmcli con mod em1-1 ipv4.method manual ipv4.addr \"192.168.1.2/24, 10.10.1.5/"
+"8\"\n"
 "nmcli con mod em1-1 +ipv4.dns 8.8.4.4\n"
 "nmcli con mod em1-1 -ipv4.dns 1\n"
 "nmcli con mod em1-1 -ipv6.addr \"abbe::cafe/56\"\n"
@@ -1295,8 +1328,28 @@ msgid ""
 "nmcli con mod bond0 -bond.options downdelay\n"
 "\n"
 msgstr ""
+"使い方: nmcli connection modify { ARGUMENTS | help }\n"
+"\n"
+"ARGUMENTS := [id | uuid | path] <ID> ([+|-]<setting>.<property> <value>)+\n"
+"\n"
+"接続プロファイルの 1 つ以上のプロパティーを変更します。\n"
+"プロファイルは名前、UUID、または D-Bus パスで識別されます。複数の値から成るプロパティーの場合は、\n"
+"プロパティー名にオプションの '+' または '-' プレフィックスを使用できます。\n"
+"'+' 記号を使用すると、値全体を上書きせずにアイテムを追加できます。\n"
+"'-' 記号を使用すると、値全体の代わりに、選択されたアイテムを削除できます。\n"
+"\n"
+"例:\n"
+"nmcli con mod home-wifi wifi.ssid rakosnicek\n"
+"nmcli con mod em1-1 ipv4.method manual ipv4.addr \"192.168.1.2/24, 10.10.1.5/"
+"8\"\n"
+"nmcli con mod em1-1 +ipv4.dns 8.8.4.4\n"
+"nmcli con mod em1-1 -ipv4.dns 1\n"
+"nmcli con mod em1-1 -ipv6.addr \"abbe::cafe/56\"\n"
+"nmcli con mod bond0 +bond.options mii=500\n"
+"nmcli con mod bond0 -bond.options downdelay\n"
+"\n"
 
-#: ../clients/cli/connections.c:525
+#: ../clients/cli/connections.c:483
 #, c-format
 msgid ""
 "Usage: nmcli connection clone { ARGUMENTS | help }\n"
@@ -1304,13 +1357,20 @@ msgid ""
 "ARGUMENTS := [--temporary] [id | uuid | path] <ID> <new name>\n"
 "\n"
 "Clone an existing connection profile. The newly created connection will be\n"
-"the exact copy of the <ID>, except the uuid property (will be generated) "
-"and\n"
+"the exact copy of the <ID>, except the uuid property (will be generated) and\n"
 "id (provided as <new name> argument).\n"
 "\n"
 msgstr ""
+"使い方: nmcli connection clone { ARGUMENTS | help }\n"
+"\n"
+"ARGUMENTS := [--temporary] [id | uuid | path] <ID> <新しい名前>\n"
+"\n"
+"既存の接続プロファイルをクローンします。新しく作成された接続は\n"
+"uuid プロパティー (生成されます) と id (<新しい名前> 引数として提供されます)\n"
+"を除き <ID> の完全なコピーになります。\n"
+"\n"
 
-#: ../clients/cli/connections.c:537
+#: ../clients/cli/connections.c:495
 #, c-format
 msgid ""
 "Usage: nmcli connection edit { ARGUMENTS | help }\n"
@@ -1337,7 +1397,7 @@ msgstr ""
 "インテラクティブなエディタで新しい接続プロファイルを追加します。\n"
 "\n"
 
-#: ../clients/cli/connections.c:552
+#: ../clients/cli/connections.c:510
 #, c-format
 msgid ""
 "Usage: nmcli connection delete { ARGUMENTS | help }\n"
@@ -1356,8 +1416,8 @@ msgstr ""
 "プロファイルは名前、UUID、D-Bus パスで識別します。\n"
 "\n"
 
-#: ../clients/cli/connections.c:563
-#, fuzzy, c-format
+#: ../clients/cli/connections.c:521
+#, c-format
 msgid ""
 "Usage: nmcli connection monitor { ARGUMENTS | help }\n"
 "\n"
@@ -1368,31 +1428,27 @@ msgid ""
 "Monitors all connection profiles in case none is specified.\n"
 "\n"
 msgstr ""
-"使い方: nmcli connection edit { 引数 | help }\n"
-"\n"
-"引数 := [id | uuid | path] <ID>\n"
+"使い方: nmcli connection monitor { ARGUMENTS | help }\n"
 "\n"
-"インテラクティブなエディタで既存の接続プロファイルを編集します。\n"
-"プロファイルは名前、UUID、D-Bus パスなどで識別します。\n"
-"\n"
-"引数 := [type <新しい接続タイプ>] [con-name <新しい接続名>]\n"
+"ARGUMENTS := [id | uuid | path] <ID> ...\n"
 "\n"
-"インテラクティブなエディタで新しい接続プロファイルを追加します。\n"
+"接続プロファイルアクティビティーを監視します。\n"
+"このコマンドにより、指定された接続が変更されると常に行が出力されます。\n"
+"何も指定されない場合は、すべての接続プロファイルを監視します。\n"
 "\n"
 
-#: ../clients/cli/connections.c:575
+#: ../clients/cli/connections.c:533
 #, c-format
 msgid ""
 "Usage: nmcli connection reload { help }\n"
 "\n"
 "Reload all connection files from disk.\n"
 "\n"
-msgstr ""
-"使い方: nmcli connection reload { help }\n"
+msgstr "使い方: nmcli connection reload { help }\n"
 "\n"
 "ディスクからすべての接続ファイルを再読み込みします。\n"
 
-#: ../clients/cli/connections.c:583
+#: ../clients/cli/connections.c:541
 #, c-format
 msgid ""
 "Usage: nmcli connection load { ARGUMENTS | help }\n"
@@ -1414,7 +1470,7 @@ msgstr ""
 "状態を認識させるため必ずこのコマンドを使用してください。\n"
 "\n"
 
-#: ../clients/cli/connections.c:595
+#: ../clients/cli/connections.c:553
 #, c-format
 msgid ""
 "Usage: nmcli connection import { ARGUMENTS | help }\n"
@@ -1428,9 +1484,18 @@ msgid ""
 "is imported by NetworkManager VPN plugins.\n"
 "\n"
 msgstr ""
+"使い方: nmcli connection import { ARGUMENTS | help }\n"
+"\n"
+"ARGUMENTS := [--temporary] type <タイプ> file <インポートするファイル>\n"
+"\n"
+"外部設定を NetworkManager 接続プロファイルとしてインポートします。\n"
+"入力ファイルの種類は type オプションで指定されます。\n"
+"現時点では VPN 設定のみがサポートされます。設定は\n"
+"NetworkManager VPN プラグインによりインポートされます。\n"
+"\n"
 
-#: ../clients/cli/connections.c:608
-#, fuzzy, c-format
+#: ../clients/cli/connections.c:566
+#, c-format
 msgid ""
 "Usage: nmcli connection export { ARGUMENTS | help }\n"
 "\n"
@@ -1440,894 +1505,1291 @@ msgid ""
 "The data are directed to standard output or to a file if a name is given.\n"
 "\n"
 msgstr ""
-"使い方: nmcli connection delete { 引数 | help }\n"
+"使い方: nmcli connection export { ARGUMENTS | help }\n"
 "\n"
-"引数 := [id | uuid | path] <ID>\n"
+"ARGUMENTS := [id | uuid | path] <ID> [<出力ファイル>]\n"
 "\n"
-"接続プロファイルを削除します。\n"
-"プロファイルは名前、UUID、D-Bus パスで識別します。\n"
+"接続をエクスポートします。現時点では、VPN 接続のみがサポートされます。\n"
+"データは標準出力またはファイル (名前が指定された場合) に送信されます。\n"
 "\n"
 
-#: ../clients/cli/connections.c:686
+#: ../clients/cli/connections.c:644
 msgid "activating"
 msgstr "アクティベート中"
 
-#: ../clients/cli/connections.c:688
+#: ../clients/cli/connections.c:646
 msgid "activated"
 msgstr "アクティベート済み"
 
-#: ../clients/cli/connections.c:692
+#: ../clients/cli/connections.c:650
 msgid "deactivated"
 msgstr "停止しました"
 
-#: ../clients/cli/connections.c:704
+#: ../clients/cli/connections.c:662
 msgid "VPN connecting (prepare)"
 msgstr "VPN 接続（準備）"
 
-#: ../clients/cli/connections.c:706
+#: ../clients/cli/connections.c:664
 msgid "VPN connecting (need authentication)"
 msgstr "VPN 接続（認証が必要）"
 
-#: ../clients/cli/connections.c:708
+#: ../clients/cli/connections.c:666
 msgid "VPN connecting"
 msgstr "VPN 接続"
 
-#: ../clients/cli/connections.c:710
+#: ../clients/cli/connections.c:668
 msgid "VPN connecting (getting IP configuration)"
 msgstr "VPN 接続（IP 設定を取得）"
 
-#: ../clients/cli/connections.c:712
+#: ../clients/cli/connections.c:670
 msgid "VPN connected"
 msgstr "VPN 接続済み"
 
-#: ../clients/cli/connections.c:714
+#: ../clients/cli/connections.c:672
 msgid "VPN connection failed"
 msgstr "VPN 接続失敗"
 
-#: ../clients/cli/connections.c:716
+#: ../clients/cli/connections.c:674
 msgid "VPN disconnected"
 msgstr "VPN 切断済み"
 
-#: ../clients/cli/connections.c:786
-#, fuzzy, c-format
+#: ../clients/cli/connections.c:744
+#, c-format
 msgid "Error updating secrets for %s: %s\n"
-msgstr "接続の保存中にエラーが発生しました: %s"
+msgstr "%s のシークレットの更新中にエラーが発生しました: %s\n"
 
-#: ../clients/cli/connections.c:806
+#: ../clients/cli/connections.c:764
 msgid "Connection profile details"
 msgstr "接続プロファイルの詳細"
 
-#: ../clients/cli/connections.c:818 ../clients/cli/connections.c:1211
-#, fuzzy, c-format
+#: ../clients/cli/connections.c:776 ../clients/cli/connections.c:1169
+#, c-format
 msgid "Error: 'connection show': %s"
-msgstr "エラー: 'device show': %s"
+msgstr "エラー: 'connection show': %s"
 
-#: ../clients/cli/connections.c:974 ../clients/cli/settings.c:1950
+#: ../clients/cli/connections.c:932 ../clients/cli/settings.c:1897
 msgid "never"
 msgstr "しない"
 
-#: ../clients/cli/connections.c:1199
-#, fuzzy
+#: ../clients/cli/connections.c:1157
 msgid "Activate connection details"
 msgstr "アクティブな接続の詳細"
 
-#: ../clients/cli/connections.c:1435
-#, fuzzy, c-format
+#: ../clients/cli/connections.c:1393
+#, c-format
 msgid "invalid field '%s'; allowed fields: %s and %s, or %s,%s"
-msgstr "'%s' は無効なフィールドです; 許可されているのは次のフィールドです: %s"
+msgstr "無効なフィールド '%s'; 許可されたフィールド: %s および %s、または %s、%s"
 
-#: ../clients/cli/connections.c:1450 ../clients/cli/connections.c:1458
-#, fuzzy, c-format
+#: ../clients/cli/connections.c:1408 ../clients/cli/connections.c:1416
+#, c-format
 msgid "'%s' has to be alone"
-msgstr "フィールド '%s' は孤立する必要があります"
+msgstr "'%s' は孤立する必要があります"
 
 #. Add headers
-#: ../clients/cli/connections.c:1680
-#, fuzzy
+#: ../clients/cli/connections.c:1634
 msgid "NetworkManager active profiles"
-msgstr "NetworkManager のステータス"
+msgstr "NetworkManager のアクティブなプロファイル"
 
-#: ../clients/cli/connections.c:1681
-#, fuzzy
+#: ../clients/cli/connections.c:1635
 msgid "NetworkManager connection profiles"
-msgstr "NetworkManager がスリープ状態に入りました"
-
-#.
-#. * TODO(?): complete uuid, path or id
-#. if (nmc->complete) {
-#. quit ();
-#. }
-#.
-#: ../clients/cli/connections.c:1727 ../clients/cli/connections.c:2445
-#: ../clients/cli/connections.c:2467 ../clients/cli/connections.c:2476
-#: ../clients/cli/connections.c:2485 ../clients/cli/connections.c:2648
-#: ../clients/cli/connections.c:7777 ../clients/cli/connections.c:7896
-#: ../clients/cli/connections.c:8032 ../clients/cli/connections.c:8170
-#: ../clients/cli/connections.c:8289 ../clients/cli/connections.c:8300
-#: ../clients/cli/connections.c:8410 ../clients/cli/devices.c:2402
-#: ../clients/cli/devices.c:2410 ../clients/cli/devices.c:2736
-#: ../clients/cli/devices.c:2743 ../clients/cli/devices.c:2757
-#: ../clients/cli/devices.c:2764 ../clients/cli/devices.c:2781
-#: ../clients/cli/devices.c:2789 ../clients/cli/devices.c:2802
-#: ../clients/cli/devices.c:3166 ../clients/cli/devices.c:3173
-#: ../clients/cli/devices.c:3180 ../clients/cli/devices.c:3192
-#: ../clients/cli/devices.c:3205 ../clients/cli/devices.c:3212
-#: ../clients/cli/devices.c:3384 ../clients/cli/devices.c:3391
-#: ../clients/cli/devices.c:3564
+msgstr "NetworkManager 接続プロファイル"
+
+#: ../clients/cli/connections.c:1681 ../clients/cli/connections.c:2389
+#: ../clients/cli/connections.c:2411 ../clients/cli/connections.c:2420
+#: ../clients/cli/connections.c:2429 ../clients/cli/connections.c:2588
+#: ../clients/cli/connections.c:10156 ../clients/cli/connections.c:10273
+#: ../clients/cli/connections.c:10405 ../clients/cli/connections.c:10538
+#: ../clients/cli/connections.c:10648 ../clients/cli/connections.c:10659
+#: ../clients/cli/connections.c:10758 ../clients/cli/devices.c:2344
+#: ../clients/cli/devices.c:2352 ../clients/cli/devices.c:2675
+#: ../clients/cli/devices.c:2682 ../clients/cli/devices.c:2696
+#: ../clients/cli/devices.c:2703 ../clients/cli/devices.c:2720
+#: ../clients/cli/devices.c:2728 ../clients/cli/devices.c:2741
+#: ../clients/cli/devices.c:3105 ../clients/cli/devices.c:3112
+#: ../clients/cli/devices.c:3119 ../clients/cli/devices.c:3131
+#: ../clients/cli/devices.c:3144 ../clients/cli/devices.c:3151
+#: ../clients/cli/devices.c:3323 ../clients/cli/devices.c:3330
+#: ../clients/cli/devices.c:3503
 #, c-format
 msgid "Error: %s argument is missing."
 msgstr "エラー: %s 引数がありません。"
 
-#: ../clients/cli/connections.c:1742
-#, fuzzy, c-format
+#: ../clients/cli/connections.c:1696
+#, c-format
 msgid "Error: %s - no such connection profile."
-msgstr "エラー: %s - そのような接続はありません。"
+msgstr "エラー: %s - そのような接続プロファイルはありません。"
 
-#: ../clients/cli/connections.c:1801 ../clients/cli/connections.c:2508
-#: ../clients/cli/connections.c:8825 ../clients/cli/devices.c:3353
-#: ../clients/cli/devices.c:3834 ../clients/cli/general.c:528
-#: ../clients/cli/general.c:577 ../clients/cli/general.c:594
-#: ../clients/cli/general.c:633 ../clients/cli/general.c:647
-#: ../clients/cli/general.c:765 ../clients/cli/general.c:812
-#: ../clients/cli/general.c:832
+#: ../clients/cli/connections.c:1755 ../clients/cli/connections.c:2452
+#: ../clients/cli/connections.c:11162 ../clients/cli/devices.c:3292
+#: ../clients/cli/devices.c:3779 ../clients/cli/general.c:539
+#: ../clients/cli/general.c:588 ../clients/cli/general.c:605
+#: ../clients/cli/general.c:644 ../clients/cli/general.c:658
+#: ../clients/cli/general.c:776 ../clients/cli/general.c:823
+#: ../clients/cli/general.c:843
 #, c-format
 msgid "Error: %s."
 msgstr "エラー: %s."
 
-#: ../clients/cli/connections.c:1897
+#: ../clients/cli/connections.c:1851
 #, c-format
 msgid "no active connection on device '%s'"
 msgstr "デバイス '%s' 上にアクティブな接続はありません"
 
-#: ../clients/cli/connections.c:1905
+#: ../clients/cli/connections.c:1859
 msgid "no active connection or device"
 msgstr "アクティブな接続またはデバイスがありません"
 
-#: ../clients/cli/connections.c:1956
+#: ../clients/cli/connections.c:1910
 #, c-format
 msgid "device '%s' not compatible with connection '%s'"
 msgstr "デバイス '%s' は接続 '%s' と互換性がありません"
 
-#: ../clients/cli/connections.c:1959
+#: ../clients/cli/connections.c:1913
 #, c-format
 msgid "no device found for connection '%s'"
 msgstr "接続 '%s'用のデバイスが見つかりません"
 
-#: ../clients/cli/connections.c:1971
+#: ../clients/cli/connections.c:1925
 msgid "unknown reason"
 msgstr "不明な理由"
 
-#: ../clients/cli/connections.c:1973 ../clients/cli/general.c:278
+#: ../clients/cli/connections.c:1927 ../clients/cli/general.c:277
 msgid "none"
 msgstr "なし"
 
-#: ../clients/cli/connections.c:1975
+#: ../clients/cli/connections.c:1929
 msgid "the user was disconnected"
 msgstr "ユーザーの接続が切断されました。"
 
-#: ../clients/cli/connections.c:1977
+#: ../clients/cli/connections.c:1931
 msgid "the base network connection was interrupted"
 msgstr "基本ネットワーク接続が妨害されました。"
 
-#: ../clients/cli/connections.c:1979
+#: ../clients/cli/connections.c:1933
 msgid "the VPN service stopped unexpectedly"
 msgstr "VPN サービスが予期しない停止をしました"
 
-#: ../clients/cli/connections.c:1981
+#: ../clients/cli/connections.c:1935
 msgid "the VPN service returned invalid configuration"
 msgstr "VPN サービスは無効な設定を返しました"
 
-#: ../clients/cli/connections.c:1983
+#: ../clients/cli/connections.c:1937
 msgid "the connection attempt timed out"
 msgstr "接続試行は時間切れです"
 
-#: ../clients/cli/connections.c:1985
+#: ../clients/cli/connections.c:1939
 msgid "the VPN service did not start in time"
 msgstr "VPN サービスは時間内に開始していません"
 
-#: ../clients/cli/connections.c:1987
+#: ../clients/cli/connections.c:1941
 msgid "the VPN service failed to start"
 msgstr "VPN サービスの開始は失敗しました"
 
-#: ../clients/cli/connections.c:1989
+#: ../clients/cli/connections.c:1943
 msgid "no valid VPN secrets"
 msgstr "有効な VPN シークレットはありません"
 
-#: ../clients/cli/connections.c:1991
+#: ../clients/cli/connections.c:1945
 msgid "invalid VPN secrets"
 msgstr "無効な VPN シークレット"
 
-#: ../clients/cli/connections.c:1993
+#: ../clients/cli/connections.c:1947
 msgid "the connection was removed"
 msgstr "接続は削除されました"
 
-#: ../clients/cli/connections.c:2015 ../clients/cli/connections.c:2050
-#: ../clients/cli/connections.c:2211 ../clients/cli/connections.c:6120
+#: ../clients/cli/connections.c:1969 ../clients/cli/connections.c:1997
+#: ../clients/cli/connections.c:2158 ../clients/cli/connections.c:8454
 #, c-format
 msgid "Connection successfully activated (D-Bus active path: %s)\n"
 msgstr "接続が正常にアクティベートされました (D-Bus アクティブパス: %s)\n"
 
-#: ../clients/cli/connections.c:2023
-#, fuzzy, c-format
+#: ../clients/cli/connections.c:1976
+#, c-format
 msgid ""
 "Connection successfully activated (master waiting for slaves) (D-Bus active "
 "path: %s)\n"
-msgstr "接続が正常にアクティベートされました (D-Bus アクティブパス: %s)\n"
-
-#: ../clients/cli/connections.c:2030 ../clients/cli/connections.c:6126
-#, c-format
-msgid "Error: Connection activation failed.\n"
-msgstr "エラー: 接続のアクティベートに失敗しました。\n"
+msgstr "接続が正常にアクティベートされました (マスターはスレーブを待機しています) (D-Bus アクティブパス: %s)\n"
 
-#: ../clients/cli/connections.c:2033 ../clients/cli/connections.c:2055
+#: ../clients/cli/connections.c:1980 ../clients/cli/connections.c:2002
 #, c-format
 msgid "Error: Connection activation failed."
 msgstr "エラー: 接続のアクティベートに失敗しました。"
 
-#: ../clients/cli/connections.c:2106
+#: ../clients/cli/connections.c:2053
 #, c-format
 msgid "VPN connection successfully activated (D-Bus active path: %s)\n"
 msgstr "VPN 接続が正常にアクティベートされました (D-Bus アクティブパス: %s)\n"
 
-#: ../clients/cli/connections.c:2114
+#: ../clients/cli/connections.c:2061
 #, c-format
 msgid "Error: Connection activation failed: %s."
 msgstr "エラー: 接続のアクティベートに失敗しました: %s。"
 
-#: ../clients/cli/connections.c:2133 ../clients/cli/devices.c:1506
+#: ../clients/cli/connections.c:2080 ../clients/cli/devices.c:1426
 #, c-format
 msgid "Error: Timeout %d sec expired."
 msgstr "エラー: 制限時間の %d 秒が経過"
 
-#: ../clients/cli/connections.c:2193
+#: ../clients/cli/connections.c:2140
 #, c-format
 msgid "Error: Connection activation failed: %s"
 msgstr "エラー: 接続のアクティベーションに失敗: %s"
 
-#: ../clients/cli/connections.c:2278
+#: ../clients/cli/connections.c:2225
 #, c-format
 msgid "failed to read passwd-file '%s': %s"
 msgstr "passwd-file '%s'の読み込みに失敗: %s"
 
-#: ../clients/cli/connections.c:2290
+#: ../clients/cli/connections.c:2237
 #, c-format
 msgid "missing colon in 'password' entry '%s'"
-msgstr ""
+msgstr "'password' エントリー '%s' にコロンがありません"
 
-#: ../clients/cli/connections.c:2298
+#: ../clients/cli/connections.c:2245
 #, c-format
 msgid "missing dot in 'password' entry '%s'"
-msgstr ""
+msgstr "'password' エントリー '%s' にドットがありません"
 
-#: ../clients/cli/connections.c:2311
+#: ../clients/cli/connections.c:2258
 #, c-format
 msgid "invalid setting name in 'password' entry '%s'"
-msgstr ""
+msgstr "'password' エントリー '%s' の設定名が無効です"
 
-#: ../clients/cli/connections.c:2367
+#: ../clients/cli/connections.c:2314
 #, c-format
 msgid "unknown device '%s'."
 msgstr "不明なデバイス '%s' です。"
 
-#: ../clients/cli/connections.c:2372
+#: ../clients/cli/connections.c:2319
 msgid "neither a valid connection nor device given"
 msgstr "有効な接続、デバイスいずれも指定されていません"
 
-#: ../clients/cli/connections.c:2458
+#: ../clients/cli/connections.c:2402
 #, c-format
 msgid "Error: Connection '%s' does not exist."
 msgstr "エラー: 接続 '%s' が存在しません。"
 
-#: ../clients/cli/connections.c:2493 ../clients/cli/devices.c:1405
-#: ../clients/cli/devices.c:2416 ../clients/cli/devices.c:2813
-#: ../clients/cli/devices.c:3397
+#: ../clients/cli/connections.c:2437 ../clients/cli/devices.c:1325
+#: ../clients/cli/devices.c:2358 ../clients/cli/devices.c:2752
+#: ../clients/cli/devices.c:3336
 #, c-format
 msgid "Unknown parameter: %s\n"
 msgstr "不明なパラメーター: %s\n"
 
-#: ../clients/cli/connections.c:2518
+#: ../clients/cli/connections.c:2462
 msgid "preparing"
 msgstr "準備中"
 
-#: ../clients/cli/connections.c:2539
+#: ../clients/cli/connections.c:2483
 #, c-format
 msgid "Connection '%s' (%s) successfully deleted.\n"
 msgstr "接続 '%s' (%s) が正常に削除されました。\n"
 
-#: ../clients/cli/connections.c:2555
+#: ../clients/cli/connections.c:2499
 #, c-format
 msgid "Connection '%s' successfully deactivated (D-Bus active path: %s)\n"
-msgstr ""
-"接続 '%s' が正常に非アクティブ化されました (D-Bus アクティブパス: %s)\n"
+msgstr "接続 '%s' が正常に非アクティブ化されました (D-Bus アクティブパス: %s)\n"
 
-#: ../clients/cli/connections.c:2630 ../clients/cli/connections.c:8018
-#: ../clients/cli/connections.c:8226
+#: ../clients/cli/connections.c:2570 ../clients/cli/connections.c:10391
+#: ../clients/cli/connections.c:10590
 #, c-format
 msgid "Error: No connection specified."
 msgstr "エラー: 接続が指定されていません。"
 
-#: ../clients/cli/connections.c:2662
-#, fuzzy, c-format
+#: ../clients/cli/connections.c:2602
+#, c-format
 msgid "Error: '%s' is not an active connection.\n"
-msgstr "エラー: '%s' はアクティブな接続ではありません。"
+msgstr "エラー: '%s' はアクティブな接続ではありません。\n"
 
-#: ../clients/cli/connections.c:2663 ../clients/cli/connections.c:8047
-#, fuzzy, c-format
+#: ../clients/cli/connections.c:2603 ../clients/cli/connections.c:10420
+#, c-format
 msgid "Error: not all active connections found."
-msgstr "エラー: '%s' はアクティブな接続ではありません。"
+msgstr "エラー: アクティブな一部の接続が見つかりません。"
 
-#: ../clients/cli/connections.c:2672
+#: ../clients/cli/connections.c:2612
 #, c-format
 msgid "Error: no active connection provided."
 msgstr "エラー: アクティブな接続がありません。"
 
-#: ../clients/cli/connections.c:3120 ../clients/cli/utils.c:648
+#: ../clients/cli/connections.c:2955 ../clients/cli/utils.c:702
 #, c-format
 msgid "'%s' not among [%s]"
 msgstr "'%s' は [%s] にはありません"
 
-#: ../clients/cli/connections.c:3280
+#: ../clients/cli/connections.c:3032
 #, c-format
-msgid "Warning: master='%s' doesn't refer to any existing profile.\n"
-msgstr ""
+msgid "Error: '%s': '%s' is not a valid %s MAC address."
+msgstr "エラー: ''%s': '%s' は有効な %s MAC アドレスではありません。"
 
-#: ../clients/cli/connections.c:3451
-#, fuzzy, c-format
-msgid "Error: don't know how to create '%s' setting."
-msgstr "エラー: システム設定を取得できませんでした"
+#. Ask for optional arguments
+#: ../clients/cli/connections.c:3033 ../clients/cli/connections.c:3565
+#: ../clients/tui/nm-editor-utils.c:163 ../libnm-core/nm-connection.c:1716
+#: ../libnm-glib/nm-device.c:1861 ../libnm/nm-device.c:1812
+msgid "InfiniBand"
+msgstr "InfiniBand"
 
-#: ../clients/cli/connections.c:3462
-#, c-format
-msgid "Error: invalid property '%s': %s."
-msgstr "エラー: 無効なプロパティ '%s': %s。"
+#: ../clients/cli/connections.c:3033 ../clients/tui/nm-editor-utils.c:146
+#: ../libnm-glib/nm-device.c:1849 ../libnm/nm-device.c:1800
+msgid "Ethernet"
+msgstr "Ethernet"
 
-#: ../clients/cli/connections.c:3479
+#: ../clients/cli/connections.c:3053
 #, c-format
-msgid "Error: failed to modify %s.%s: %s."
-msgstr "エラー: %s.%s の変更に失敗しました: %s。"
+msgid "Error: 'mtu': '%s' is not a valid MTU."
+msgstr "エラー: 'mtu': '%s' は有効な MTU ではありません。"
 
-#: ../clients/cli/connections.c:3498
-#, fuzzy, c-format
-msgid "Error: failed to remove a value from %s.%s: %s."
-msgstr "エラー: '%s' の値の削除に失敗しました: %s\n"
+#: ../clients/cli/connections.c:3069
+#, c-format
+msgid "Error: 'parent': '%s' is not a valid interface name."
+msgstr "エラー: 'parent': '%s' は有効なインターフェース名ではありません。"
 
-#: ../clients/cli/connections.c:3524
-#, fuzzy, c-format
-msgid "Error: '%s' is mandatory."
-msgstr "エラー: '%s' 設定はありません\n"
+#: ../clients/cli/connections.c:3090
+#, c-format
+msgid "Error: 'p-key': '%s' is not a valid InfiniBand P_KEY."
+msgstr "エラー: 'p-key': '%s' は有効な InfiniBand P_KEY ではありません。"
 
-#: ../clients/cli/connections.c:3556
-#, fuzzy, c-format
-msgid "Error: invalid slave type; %s."
-msgstr "エラー: 無効な接続タイプ; %s。"
+#: ../clients/cli/connections.c:3105
+#, c-format
+msgid "Error: '%s' is not a valid UID/GID."
+msgstr "エラー: '%s' は有効な UID/GID ではありません。"
 
-#: ../clients/cli/connections.c:3569
+#: ../clients/cli/connections.c:3149
 #, c-format
-msgid "Error: invalid connection type; %s."
-msgstr "エラー: 無効な接続タイプ; %s。"
+msgid "Error: '%s': '%s' is not a valid %s %s."
+msgstr "エラー: '%s': '%s' は有効な %s %s ではありません。"
 
-#: ../clients/cli/connections.c:3744
-#, fuzzy, c-format
-msgid "Error: bad connection type: %s."
-msgstr "エラー: 無効な接続タイプ; %s。"
+#: ../clients/cli/connections.c:3162
+msgid "Wi-Fi mode"
+msgstr "Wi-Fi モード"
 
-#: ../clients/cli/connections.c:3802
-#, fuzzy, c-format
-msgid "Error: '%s' is not a valid interface nor '*'."
-msgstr ""
-"エラー: 'ifname': '%s' は有効なインターフェースでも '*' でもありません。"
+#: ../clients/cli/connections.c:3171
+msgid "InfiniBand transport mode"
+msgstr "InfiniBand トランスポートモード"
 
-#: ../clients/cli/connections.c:3825
-#, fuzzy
-msgid "Error: master is required"
-msgstr "エラー: 'マスター' が必要です。"
+#: ../clients/cli/connections.c:3183
+msgid "ADSL protocol"
+msgstr "ADSL プロトコル"
 
-#: ../clients/cli/connections.c:3883
-#, fuzzy, c-format
-msgid "Error: error adding bond option '%s=%s'."
-msgstr "エラー: 不明な接続 '%s' です。"
+#: ../clients/cli/connections.c:3194
+msgid "ADSL encapsulation"
+msgstr "ADSL カプセル化"
+
+#: ../clients/cli/connections.c:3203
+msgid "TUN device mode"
+msgstr "TUN デバイスモード"
 
-#: ../clients/cli/connections.c:3914
+#: ../clients/cli/connections.c:3216
 #, c-format
-msgid "Error: '%s' is not a valid monitoring mode; use '%s' or '%s'.\n"
-msgstr ""
-"エラー: '%s' は無効なモニタリングモードです; '%s' または '%s' を使用してくだ"
-"さい。\n"
+msgid "Error: 'flags': '%s' is not valid; use <0-7>."
+msgstr "エラー: 'flags': '%s' は無効です; <0-7> を使用してください。"
 
-#: ../clients/cli/connections.c:3945
+#: ../clients/cli/connections.c:3238
 #, c-format
-msgid "Error: 'bt-type': '%s' not valid; use [%s, %s (%s), %s]."
-msgstr ""
-"エラー: 'bt-type': '%s' は無効です; [%s, %s (%s), %s] を使用してください。"
+msgid "Error: '%s': '%s' is not valid; %s "
+msgstr "エラー: '%s': '%s' は無効です; %s "
 
-#: ../clients/cli/connections.c:3972
-#, fuzzy
-msgid "Interface name [*]"
-msgstr "インターフェース名 [*]: "
+#: ../clients/cli/connections.c:3416
+#, c-format
+msgid "Warning: master='%s' doesn't refer to any existing profile.\n"
+msgstr "警告: master='%s' は既存のプロファイルを参照しません。\n"
 
-#: ../clients/cli/connections.c:3976
-#, fuzzy
-msgid "PPPoE username"
-msgstr "PPPoE ユーザー名: "
+#: ../clients/cli/connections.c:3441
+#, c-format
+msgid "Error: '%s': '%s' is not valid; use <%u-%u>."
+msgstr "エラー: '%s': '%s' は無効です; <%u-%u> を使用してください。"
 
-#: ../clients/cli/connections.c:3977 ../clients/cli/connections.c:3998
-#: ../clients/cli/connections.c:4000 ../clients/cli/connections.c:4049
-#, fuzzy
-msgid "Password [none]"
-msgstr "パスワード [none]: "
+#. Ask for optional arguments.
+#: ../clients/cli/connections.c:3497
+#, c-format
+msgid "There is %d optional argument for '%s' connection type.\n"
+msgid_plural "There are %d optional arguments for '%s' connection type.\n"
+msgstr[0] "'%2$s' 接続タイプには %1$d 種類のオプション引数があります。\n"
 
-#: ../clients/cli/connections.c:3978
-#, fuzzy
-msgid "Service [none]"
-msgstr "サービス [none]: "
+#: ../clients/cli/connections.c:3500
+#, c-format
+msgid "Do you want to provide it? %s"
+msgid_plural "Do you want to provide them? %s"
+msgstr[0] "指定しますか? %s"
+
+#. Ask for optional arguments
+#: ../clients/cli/connections.c:3517
+msgid "ethernet"
+msgstr "Ethernet"
 
-#: ../clients/cli/connections.c:3979 ../clients/cli/connections.c:3982
-#: ../clients/cli/connections.c:3991
-#, fuzzy
-msgid "MTU [auto]"
+#: ../clients/cli/connections.c:3522 ../clients/cli/connections.c:3570
+#: ../clients/cli/connections.c:3704 ../clients/cli/connections.c:3783
+msgid "MTU [auto]: "
 msgstr "MTU [auto]: "
 
-#: ../clients/cli/connections.c:3980 ../clients/cli/connections.c:3983
-#: ../clients/cli/connections.c:3992 ../clients/cli/connections.c:3995
-#: ../clients/cli/connections.c:4036
-#, fuzzy
-msgid "MAC [none]"
+#: ../clients/cli/connections.c:3533 ../clients/cli/connections.c:3581
+#: ../clients/cli/connections.c:3676 ../clients/cli/connections.c:3715
+#: ../clients/cli/connections.c:4101
+msgid "MAC [none]: "
 msgstr "MAC [none]: "
 
-#: ../clients/cli/connections.c:3981 ../clients/cli/connections.c:3993
-#, fuzzy
-msgid "Cloned MAC [none]"
+#: ../clients/cli/connections.c:3544
+msgid "Cloned MAC [none]: "
 msgstr "クローンの MAC [none]: "
 
-#: ../clients/cli/connections.c:3986
-#, fuzzy
-msgid "Parent interface [none]"
+#: ../clients/cli/connections.c:3592
+#, c-format
+msgid "Transport mode %s"
+msgstr "トランスポートモード %s"
+
+#: ../clients/cli/connections.c:3605
+msgid "Parent interface [none]: "
 msgstr "親インターフェース [none]: "
 
-#: ../clients/cli/connections.c:3987
-#, fuzzy
-msgid "P_KEY [none]"
+#: ../clients/cli/connections.c:3616
+msgid "P_KEY [none]: "
 msgstr "P_KEY [none]: "
 
-#. 0
-#: ../clients/cli/connections.c:3988 ../clients/cli/connections.c:4043
-#: ../clients/cli/devices.c:151 ../clients/tui/nmt-page-wifi.c:224
-msgid "SSID"
-msgstr "SSID"
+#: ../clients/cli/connections.c:3626
+#, c-format
+msgid "Error: 'p-key' is mandatory when 'parent' is specified.\n"
+msgstr "エラー: 'parent' を指定する場合、'p-key' は必須です。\n"
 
-#: ../clients/cli/connections.c:3994
-#, fuzzy
-msgid "WiMAX NSP name"
-msgstr "WiMAX NSP 名: "
+#. Ask for optional arguments
+#: ../clients/cli/connections.c:3643 ../clients/tui/nm-editor-utils.c:154
+#: ../libnm-glib/nm-device.c:1851 ../libnm/nm-device.c:1802
+msgid "Wi-Fi"
+msgstr "Wi-Fi"
 
-#: ../clients/cli/connections.c:3996
-#, fuzzy
-msgid "APN"
-msgstr "AP"
+#: ../clients/cli/connections.c:3651 ../clients/cli/connections.c:6199
+#, c-format
+msgid "Mode %s"
+msgstr "モード %s"
 
-#: ../clients/cli/connections.c:3997 ../clients/cli/connections.c:3999
-#: ../clients/cli/connections.c:4042
-#, fuzzy
-msgid "Username [none]"
+#. Ask for optional 'wimax' arguments.
+#: ../clients/cli/connections.c:3671 ../libnm-glib/nm-device.c:1857
+#: ../libnm/nm-device.c:1808
+msgid "WiMAX"
+msgstr "WiMAX"
+
+#. Ask for optional 'pppoe' arguments.
+#: ../clients/cli/connections.c:3694
+msgid "PPPoE"
+msgstr "PPPoE"
+
+#: ../clients/cli/connections.c:3698 ../clients/cli/connections.c:3736
+#: ../clients/cli/connections.c:4223
+msgid "Password [none]: "
+msgstr "パスワード [none]: "
+
+#: ../clients/cli/connections.c:3700
+msgid "Service [none]: "
+msgstr "サービス [none]: "
+
+#. Ask for optional 'gsm' or 'cdma' arguments.
+#: ../clients/cli/connections.c:3730
+msgid "mobile broadband"
+msgstr "モバイルブロードバンド"
+
+#: ../clients/cli/connections.c:3734 ../clients/cli/connections.c:4173
+msgid "Username [none]: "
 msgstr "ユーザー名 [none]: "
 
-#: ../clients/cli/connections.c:4001
-#, fuzzy
-msgid "Bluetooth device address"
-msgstr "Bluetooth デバイスアドレス: "
+#. Ask for optional 'bluetooth' arguments.
+#: ../clients/cli/connections.c:3749
+msgid "bluetooth"
+msgstr "bluetooth"
 
-#: ../clients/cli/connections.c:4004
-#, fuzzy
-msgid "VLAN parent device or connection UUID"
-msgstr "VLAN 親デバイスまたは接続 UUID: "
+#: ../clients/cli/connections.c:3756
+#, c-format
+msgid "Bluetooth type %s"
+msgstr "Bluetooth タイプ %s"
 
-#: ../clients/cli/connections.c:4006
-#, fuzzy
-msgid "VLAN ID (<0-4094>)"
-msgstr "VLAN ID <0-4095>: "
+#: ../clients/cli/connections.c:3762
+#, c-format
+msgid "Error: 'bt-type': '%s' is not a valid bluetooth type.\n"
+msgstr "エラー: ''bt-type': '%s' は有効な bluetooth タイプではありません。\n"
 
-#: ../clients/cli/connections.c:4007
-#, fuzzy
-msgid "VLAN flags (<0-7>) [none]"
+#. Ask for optional 'vlan' arguments.
+#. 13
+#: ../clients/cli/connections.c:3778 ../clients/cli/devices.c:239
+#: ../clients/tui/nm-editor-utils.c:217 ../clients/tui/nmt-page-vlan.c:94
+#: ../libnm-core/nm-connection.c:1714 ../libnm-glib/nm-device.c:1869
+#: ../libnm-util/nm-connection.c:1632 ../libnm/nm-device.c:1820
+msgid "VLAN"
+msgstr "VLAN"
+
+#: ../clients/cli/connections.c:3794
+msgid "VLAN flags (<0-7>) [none]: "
 msgstr "VLAN フラグ (<0-7>) [none]: "
 
-#: ../clients/cli/connections.c:4008
-#, fuzzy
-msgid "Ingress priority maps [none]"
+#: ../clients/cli/connections.c:3805
+msgid "Ingress priority maps [none]: "
 msgstr "イングレス優先度マップ [none]: "
 
-#: ../clients/cli/connections.c:4009
-#, fuzzy
-msgid "Egress priority maps [none]"
+#: ../clients/cli/connections.c:3816
+msgid "Egress priority maps [none]: "
 msgstr "イーグレス優先度マップ [none]: "
 
-#: ../clients/cli/connections.c:4012
-#, fuzzy
-msgid "Bonding primary interface [none]"
+#: ../clients/cli/connections.c:3827
+msgid "Bonding mode [balance-rr]: "
+msgstr "ボンドモード [balance-rr]: "
+
+#. Ask for optional 'bond' arguments.
+#: ../clients/cli/connections.c:3843
+msgid "bond"
+msgstr "ボンド"
+
+#: ../clients/cli/connections.c:3865
+msgid "Bonding primary interface [none]: "
 msgstr "ボンドのプライマリインターフェース [none]:"
 
-#: ../clients/cli/connections.c:4016
-#, fuzzy
-msgid "Bonding miimon [100]"
+#: ../clients/cli/connections.c:3868
+#, c-format
+msgid "Error: 'primary': '%s' is not a valid interface name.\n"
+msgstr "エラー: 'primary': '%s' は無効なインターフェース名です。\n"
+
+#: ../clients/cli/connections.c:3876
+#, c-format
+msgid "Bonding monitoring mode %s"
+msgstr "ボンディングモニタリングモード %s"
+
+#: ../clients/cli/connections.c:3882
+#, 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:3891
+msgid "Bonding miimon [100]: "
 msgstr "ボンドの miimon [100]:"
 
-#: ../clients/cli/connections.c:4017
-#, fuzzy
-msgid "Bonding downdelay [0]"
+#: ../clients/cli/connections.c:3894
+#, c-format
+msgid "Error: 'miimon': '%s' is not a valid number <0-%u>.\n"
+msgstr "エラー: 'miimon': '%s' は無効な数値です <0-%u>。\n"
+
+#: ../clients/cli/connections.c:3902
+msgid "Bonding downdelay [0]: "
 msgstr "ボンドの downdelay [0]: "
 
-#: ../clients/cli/connections.c:4018
-#, fuzzy
-msgid "Bonding updelay [0]"
+#: ../clients/cli/connections.c:3905
+#, c-format
+msgid "Error: 'downdelay': '%s' is not a valid number <0-%u>.\n"
+msgstr "エラー: 'downdelay': '%s' は無効な数値です <0-%u>。\n"
+
+#: ../clients/cli/connections.c:3913
+msgid "Bonding updelay [0]: "
 msgstr "ボンドの updelay [0]: "
 
-#: ../clients/cli/connections.c:4019
-#, fuzzy
-msgid "Bonding arp-interval [0]"
+#: ../clients/cli/connections.c:3916
+#, c-format
+msgid "Error: 'updelay': '%s' is not a valid number <0-%u>.\n"
+msgstr "エラー: 'updelay': '%s' は無効な数値です <0-%u>。\n"
+
+#: ../clients/cli/connections.c:3925
+msgid "Bonding arp-interval [0]: "
 msgstr "ボンドの arp-interval [0]: "
 
-#: ../clients/cli/connections.c:4021
-#, fuzzy
-msgid "Bonding arp-ip-target [none]"
+#: ../clients/cli/connections.c:3928
+#, c-format
+msgid "Error: 'arp-interval': '%s' is not a valid number <0-%u>.\n"
+msgstr "エラー: 'arp-interval': '%s' は無効な数値です <0-%u>。\n"
+
+#. FIXME: verify the string
+#: ../clients/cli/connections.c:3936
+msgid "Bonding arp-ip-target [none]: "
 msgstr "ボンドの arp-ip-target [none]: "
 
-#: ../clients/cli/connections.c:4023
-msgid "LACP rate ('slow' or 'fast') [slow]"
-msgstr ""
+#: ../clients/cli/connections.c:3943
+msgid "LACP rate ('slow' or 'fast') [slow]: "
+msgstr "LACP レート ('低速' または '高速') [低速]: "
 
-#: ../clients/cli/connections.c:4025 ../clients/cli/connections.c:4026
-#, fuzzy
-msgid "Team JSON configuration [none]"
+#: ../clients/cli/connections.c:3949
+#, c-format
+msgid "Error: 'lacp_rate': '%s' is invalid ('slow' or 'fast').\n"
+msgstr "エラー: 'lacp_rate': '%s' が無効です ('低速' または '高速')。\n"
+
+#: ../clients/cli/connections.c:3972
+msgid "Team JSON configuration [none]: "
 msgstr "team  JSON 設定 [none]: "
 
-#: ../clients/cli/connections.c:4027
-#, fuzzy
-msgid "Enable STP [no]"
-msgstr "STP の有効化 (yes/no) [yes]: "
+#: ../clients/cli/connections.c:3989
+msgid "team"
+msgstr "team "
+
+#: ../clients/cli/connections.c:3995
+msgid "team-slave"
+msgstr "team-slave"
+
+#. Ask for optional 'bridge' arguments.
+#: ../clients/cli/connections.c:4007
+msgid "bridge"
+msgstr "ブリッジ"
+
+#: ../clients/cli/connections.c:4013
+#, c-format
+msgid "Enable STP %s"
+msgstr "STP %s の有効化 "
 
-#: ../clients/cli/connections.c:4029
-#, fuzzy
-msgid "STP priority [32768]"
-msgstr "STP の優先度 [128]: "
+#: ../clients/cli/connections.c:4018
+#, c-format
+msgid "Error: 'stp': %s.\n"
+msgstr "エラー: 'stp': %s。\n"
+
+#: ../clients/cli/connections.c:4026
+msgid "STP priority [32768]: "
+msgstr "STP の優先度 [32768]: "
 
 #: ../clients/cli/connections.c:4030
-#, fuzzy
-msgid "Forward delay [15]"
+#, c-format
+msgid "Error: 'priority': '%s' is not a valid number <0-%d>.\n"
+msgstr "エラー: 'priority': '%s' は無効な数値です <0-%d>。\n"
+
+#: ../clients/cli/connections.c:4038
+msgid "Forward delay [15]: "
 msgstr "フォワード遅延 [15]:"
 
-#: ../clients/cli/connections.c:4031
-#, fuzzy
-msgid "Hello time [2]"
+#: ../clients/cli/connections.c:4042
+#, c-format
+msgid "Error: 'forward-delay': '%s' is not a valid number <2-30>.\n"
+msgstr "エラー: 'forward-delay': '%s' は無効な数値です <2-30>。\n"
+
+#: ../clients/cli/connections.c:4051
+msgid "Hello time [2]: "
 msgstr "Hello タイム [2]: "
 
-#: ../clients/cli/connections.c:4032
-#, fuzzy
-msgid "Max age [20]"
+#: ../clients/cli/connections.c:4055
+#, c-format
+msgid "Error: 'hello-time': '%s' is not a valid number <1-10>.\n"
+msgstr "エラー: 'hello-time': '%s' は無効な数値です <1-10>。\n"
+
+#: ../clients/cli/connections.c:4063
+msgid "Max age [20]: "
 msgstr "最大エイジ [20]: "
 
-#: ../clients/cli/connections.c:4033
-#, fuzzy
-msgid "MAC address ageing time [300]"
+#: ../clients/cli/connections.c:4067
+#, c-format
+msgid "Error: 'max-age': '%s' is not a valid number <6-40>.\n"
+msgstr "エラー: 'max-age': '%s' は無効な数値です <6-40>。\n"
+
+#: ../clients/cli/connections.c:4075
+msgid "MAC address ageing time [300]: "
 msgstr "MAC アドレスのエージングタイム [300]:"
 
-#: ../clients/cli/connections.c:4034
+#: ../clients/cli/connections.c:4079
+#, c-format
+msgid "Error: 'ageing-time': '%s' is not a valid number <0-1000000>.\n"
+msgstr "エラー: 'ageing-time': '%s' は無効な数値です <0-1000000>。\n"
+
+#: ../clients/cli/connections.c:4088
 #, c-format
-msgid "Enable IGMP snooping %s [no]"
-msgstr ""
+msgid "Enable IGMP snooping %s"
+msgstr "IGMP スヌーピング %s の有効化"
 
-#: ../clients/cli/connections.c:4037
-#, fuzzy
-msgid "Bridge port priority [32]"
+#: ../clients/cli/connections.c:4093
+#, c-format
+msgid "Error: 'multicast-snooping': %s.\n"
+msgstr "エラー: 'multicast-snooping': %s。\n"
+
+#. Ask for optional 'bridge-slave' arguments.
+#: ../clients/cli/connections.c:4120
+msgid "bridge-slave"
+msgstr "bridge-slave"
+
+#: ../clients/cli/connections.c:4125
+msgid "Bridge port priority [32]: "
 msgstr "ブリッジポートの優先度 [32]:"
 
-#: ../clients/cli/connections.c:4038
-#, fuzzy
-msgid "Bridge port STP path cost [100]"
+#: ../clients/cli/connections.c:4138
+msgid "Bridge port STP path cost [100]: "
 msgstr "ブリッジポートの STP パスコスト [100]: "
 
-#: ../clients/cli/connections.c:4039
-#, fuzzy
-msgid "Hairpin [no]"
-msgstr "ヘアピンモード"
+#: ../clients/cli/connections.c:4152
+#, c-format
+msgid "Hairpin %s"
+msgstr "ヘアピン %s"
 
-#: ../clients/cli/connections.c:4044
-#, fuzzy
-msgid "OLPC Mesh channel [1]"
+#: ../clients/cli/connections.c:4157
+#, c-format
+msgid "Error: 'hairpin': %s.\n"
+msgstr "エラー: 'hairpin': %s。\n"
+
+#. Ask for optional 'olpc' arguments.
+#: ../clients/cli/connections.c:4184 ../libnm-glib/nm-device.c:1855
+#: ../libnm/nm-device.c:1806
+msgid "OLPC Mesh"
+msgstr "OLPC メッシュ"
+
+#: ../clients/cli/connections.c:4189
+msgid "OLPC Mesh channel [1]: "
 msgstr "OLPC メッシュチャンネル [1]: "
 
-#: ../clients/cli/connections.c:4045
-#, fuzzy
-msgid "DHCP anycast MAC address [none]"
+#: ../clients/cli/connections.c:4192
+#, c-format
+msgid "Error: 'channel': '%s' is not a valid number <1-13>.\n"
+msgstr "エラー: 'channel': '%s' は無効な数値です <1-13>。\n"
+
+#: ../clients/cli/connections.c:4200
+msgid "DHCP anycast MAC address [none]: "
 msgstr "DHCP anycast MAC アドレス [none]: "
 
-#. TTLS and PEAP are actually much more complicated, but this complication
-#. * is not visible here since we only care about phase2 authentication
-#. * (and don't even care of which one)
-#.
-#: ../clients/cli/connections.c:4046
-#: ../clients/common/nm-secret-agent-simple.c:223
-#: ../clients/common/nm-secret-agent-simple.c:328
-#: ../clients/tui/nmt-page-dsl.c:66 ../clients/tui/nmt-page-wifi.c:332
-msgid "Username"
-msgstr "ユーザー名"
+#. Ask for optional 'adsl' arguments.
+#: ../clients/cli/connections.c:4219 ../libnm-glib/nm-device.c:1871
+#: ../libnm/nm-device.c:1822
+msgid "ADSL"
+msgstr "ADSL"
 
-#: ../clients/cli/connections.c:4052
-#, fuzzy
-msgid "MACVLAN parent device or connection UUID"
-msgstr "VLAN 親デバイスまたは接続 UUID: "
+#: ../clients/cli/connections.c:4227
+#, c-format
+msgid "ADSL encapsulation %s"
+msgstr "ADSL カプセル化 %s"
 
-#: ../clients/cli/connections.c:4055
-msgid "Tap [no]"
-msgstr ""
+#. Ask for optional 'macvlan' arguments.
+#: ../clients/cli/connections.c:4245
+msgid "macvlan"
+msgstr "macvlan"
 
-#: ../clients/cli/connections.c:4057
-#, fuzzy
-msgid "VXLAN ID"
-msgstr "VLAN ID <0-4095>: "
+#: ../clients/cli/connections.c:4251
+#, c-format
+msgid "Tap %s"
+msgstr "タップ %s"
 
-#: ../clients/cli/connections.c:4058 ../clients/cli/connections.c:4076
-#, fuzzy
-msgid "Remote"
-msgstr "削除"
+#: ../clients/cli/connections.c:4256
+#, c-format
+msgid "Error: 'tap': %s.\n"
+msgstr "エラー: 'タップ': %s。\n"
 
-#: ../clients/cli/connections.c:4059 ../clients/cli/connections.c:4077
-#, fuzzy
-msgid "Parent device [none]"
-msgstr "親インターフェース [none]: "
+#. Ask for optional 'vxlan' arguments.
+#: ../clients/cli/connections.c:4272 ../libnm-glib/nm-device.c:1875
+#: ../libnm/nm-device.c:1826
+msgid "VXLAN"
+msgstr "VXLAN"
 
-#: ../clients/cli/connections.c:4060
-#, fuzzy
-msgid "Local address [none]"
-msgstr "DHCP anycast MAC アドレス [none]: "
+#: ../clients/cli/connections.c:4277 ../clients/cli/connections.c:4601
+msgid "Parent device [none]: "
+msgstr "親デバイス [none]: "
 
-#: ../clients/cli/connections.c:4061
-msgid "Minimum source port [0]"
-msgstr ""
+#: ../clients/cli/connections.c:4282 ../clients/cli/connections.c:4606
+#, c-format
+msgid "Error: 'dev': '%s' is neither UUID nor interface name.\n"
+msgstr "エラー: 'dev': '%s' は UUID またはインターフェース名のいずれでもありません。\n"
 
-#: ../clients/cli/connections.c:4062
-msgid "Maximum source port [0]"
-msgstr ""
+#: ../clients/cli/connections.c:4291
+msgid "Local address [none]: "
+msgstr "ローカルアドレス [none]: "
 
-#: ../clients/cli/connections.c:4063
-#, fuzzy
-msgid "Destination port [8472]"
-msgstr "送信先"
+#: ../clients/cli/connections.c:4296
+#, c-format
+msgid "Error: 'local': '%s' is not a valid IP address.\n"
+msgstr "エラー: 'local': '%s' は有効な IP アドレスではありません。\n"
 
-#: ../clients/cli/connections.c:4066
-#, fuzzy
-msgid "User ID [none]"
-msgstr "ユーザー名 [none]: "
+#: ../clients/cli/connections.c:4305
+msgid "Minimum source port [0]: "
+msgstr "最小ソースポート [0]: "
 
-#: ../clients/cli/connections.c:4067
-#, fuzzy
-msgid "Group ID [none]"
-msgstr "MAC [none]: "
+#: ../clients/cli/connections.c:4309
+#, c-format
+msgid "Error: 'source-port-min': '%s' is not a valid number <0-65535>.\n"
+msgstr "エラー: 'source-port-min': '%s' は有効な数値ではありません <0-65535>。\n"
 
-#: ../clients/cli/connections.c:4068
-#, fuzzy
-msgid "Enable PI [no]"
-msgstr "STP の有効化 (yes/no) [yes]: "
+#: ../clients/cli/connections.c:4318
+msgid "Maximum source port [0]: "
+msgstr "最小ソースポート [0]: "
 
-#: ../clients/cli/connections.c:4070
-msgid "Enable VNET header [no]"
-msgstr ""
+#: ../clients/cli/connections.c:4322
+#, c-format
+msgid "Error: 'source-port-max': '%s' is not a valid number <0-65535>.\n"
+msgstr "エラー: 'source-port-max': '%s' は有効な数値ではありません <0-65535>。\n"
 
-#: ../clients/cli/connections.c:4072
-msgid "Enable multi queue [no]"
-msgstr ""
+#: ../clients/cli/connections.c:4331
+msgid "Destination port [8472]: "
+msgstr "送信先ポート [8472]: "
 
-#: ../clients/cli/connections.c:4075
-#, fuzzy
-msgid "Local endpoint [none]"
-msgstr "親インターフェース [none]: "
+#: ../clients/cli/connections.c:4335
+#, c-format
+msgid "Error: 'destination-port': '%s' is not a valid number <0-65535>.\n"
+msgstr "エラー: 'destination-port': '%s' は有効な数値ではありません <0-65535>。\n"
 
-#: ../clients/cli/connections.c:4078
-#, fuzzy
-msgid "IPv4 address (IP[/plen]) [none]"
-msgstr "IPv4 アドレス (IP[/plen] [gateway]) [none]: "
+#: ../clients/cli/connections.c:4374
+msgid "IPv4 address (IP[/plen]) [none]: "
+msgstr "IPv4 アドレス (IP[/plen]) [none]: "
 
-#: ../clients/cli/connections.c:4079
-#, fuzzy
-msgid "IPv4 gateway [none]"
-msgstr "IPv4 アドレス (IP[/plen] [gateway]) [none]: "
-
-#: ../clients/cli/connections.c:4080
-#, fuzzy
-msgid "IPv6 address (IP[/plen]) [none]"
-msgstr "IPv6 アドレス (IP[/plen] [gateway]) [none]: "
-
-#: ../clients/cli/connections.c:4081
-#, fuzzy
-msgid "IPv6 gateway [none]"
-msgstr "IPv6 アドレス (IP[/plen] [gateway]) [none]: "
-
-#: ../clients/cli/connections.c:4205
-#, fuzzy, c-format
-msgid "Error: value for '%s' is missing."
-msgstr "エラー: '%s' オプション用のフィールドがありません。"
+#: ../clients/cli/connections.c:4376
+msgid "IPv6 address (IP[/plen]) [none]: "
+msgstr "IPv6 アドレス (IP[/plen]) [none]: "
+
+#: ../clients/cli/connections.c:4390
+#, c-format
+msgid "  Address successfully added: %s\n"
+msgstr " アドレスが正常に追加されました: %s\n"
+
+#: ../clients/cli/connections.c:4392
+#, c-format
+msgid "  Warning: address already present: %s\n"
+msgstr " 警告: アドレスがすでにあります: %s\n"
 
-#: ../clients/cli/connections.c:4252
+#: ../clients/cli/connections.c:4394
+#, c-format
+msgid "  Warning: ignoring garbage at the end: '%s'\n"
+msgstr "  警告: 末尾の不要なデータを無視しています: '%s'\n"
+
+#: ../clients/cli/connections.c:4396 ../clients/cli/connections.c:5605
+#: ../clients/cli/connections.c:5652 ../clients/cli/connections.c:6569
+#: ../clients/cli/connections.c:6602
+msgid "Error: "
+msgstr "エラー: "
+
+#: ../clients/cli/connections.c:4416
+msgid "IPv4 gateway [none]: "
+msgstr "IPv4 ゲートウェイ [none]: "
+
+#: ../clients/cli/connections.c:4419
+msgid "IPv6 gateway [none]: "
+msgstr "IPv6 ゲートウェイ [none]: "
+
+#: ../clients/cli/connections.c:4439
+#, c-format
+msgid "Error: invalid gateway address '%s'\n"
+msgstr "エラー: 無効なゲートウェイアドレス '%s'\n"
+
+#. Ask for IP addresses
+#: ../clients/cli/connections.c:4452
+#, c-format
+msgid "Do you want to add IP addresses? %s"
+msgstr "IP アドレスを追加しますか? %s"
+
+#: ../clients/cli/connections.c:4460
+#, c-format
+msgid "Press <Enter> to finish adding addresses.\n"
+msgstr "<Enter> を押してアドレスの追加を終了します。\n"
+
+#. Ask for optional 'tun' arguments.
+#: ../clients/cli/connections.c:4504 ../libnm-glib/nm-device.c:1879
+#: ../libnm/nm-device.c:1830
+msgid "Tun"
+msgstr "Tun"
+
+#: ../clients/cli/connections.c:4509
+msgid "User ID [none]: "
+msgstr "ユーザー ID [none]: "
+
+#: ../clients/cli/connections.c:4522
+msgid "Group ID [none]: "
+msgstr "グループ ID [none]: "
+
+#: ../clients/cli/connections.c:4536
+#, c-format
+msgid "Enable PI %s"
+msgstr "PI %s の有効化"
+
+#: ../clients/cli/connections.c:4541
+#, c-format
+msgid "Error: 'pi': %s.\n"
+msgstr "エラー: 'pi': %s.\n"
+
+#: ../clients/cli/connections.c:4549
+#, c-format
+msgid "Enable VNET header %s"
+msgstr "VNET ヘッダー %s の有効化"
+
+#: ../clients/cli/connections.c:4554
+#, c-format
+msgid "Error: 'vnet-hdr': %s.\n"
+msgstr "エラー: 'vnet-hdr': %s。\n"
+
+#: ../clients/cli/connections.c:4562
+#, c-format
+msgid "Enable multi queue %s"
+msgstr "複数のキュー %s の有効化"
+
+#: ../clients/cli/connections.c:4567
+#, c-format
+msgid "Error: 'multi-queue': %s.\n"
+msgstr "エラー: 'multi-queue': %s。\n"
+
+#. Ask for optional 'ip-tunnel' arguments.
+#: ../clients/cli/connections.c:4581
+msgid "IP Tunnel"
+msgstr "IP トンネル"
+
+#: ../clients/cli/connections.c:4586
+msgid "Local endpoint [none]: "
+msgstr "ローカルエンドポイント [none]: "
+
+#: ../clients/cli/connections.c:4592
+#, c-format
+msgid "Error: 'local': '%s' is not valid; must be an IP address\n"
+msgstr "エラー: 'local': '%s' は有効ではありません。IP アドレスである必要があります\n"
+
+#: ../clients/cli/connections.c:4658 ../clients/cli/connections.c:10184
+#, c-format
 msgid "Error: <setting>.<property> argument is missing."
 msgstr "エラー: <setting>.<property> 引数がありません。"
 
-#: ../clients/cli/connections.c:4274
+#: ../clients/cli/connections.c:4663
+#, c-format
+msgid "Error: value for '%s' is missing."
+msgstr "エラー: '%s' の値が不明です。"
+
+#: ../clients/cli/connections.c:4681
+#, c-format
+msgid "Error: invalid <setting>.<property> '%s'."
+msgstr "エラー: 無効な <setting>.<property> '%s' です。"
+
+#: ../clients/cli/connections.c:4689
 #, c-format
 msgid "Error: invalid or not allowed setting '%s': %s."
 msgstr "エラー: 無効または許可されていない設定 '%s' です: %s。"
 
-#: ../clients/cli/connections.c:4301
-#, fuzzy, c-format
-msgid "Error: '%s' is ambiguous (%s.%s or %s.%s)."
-msgstr "'%s' が不明瞭です (%s x %s)"
+#: ../clients/cli/connections.c:4700
+#, c-format
+msgid "Error: don't know how to create '%s' setting."
+msgstr "エラー: '%s' 設定を作成する方法がわかりません。"
 
-#: ../clients/cli/connections.c:4315
+#: ../clients/cli/connections.c:4710
 #, c-format
-msgid "Error: invalid <setting>.<property> '%s'."
-msgstr "エラー: 無効な <setting>.<property> '%s' です。"
+msgid "Error: invalid property '%s': %s."
+msgstr "エラー: 無効なプロパティ '%s': %s。"
 
-#: ../clients/cli/connections.c:4356 ../clients/cli/connections.c:7842
-#, fuzzy, c-format
-msgid "Error: Failed to add '%s' connection: %s"
-msgstr "エラー: '%s' 接続の追加に失敗しました: (%d) %s"
+#: ../clients/cli/connections.c:4722
+#, c-format
+msgid "Error: failed to modify %s.%s: %s."
+msgstr "エラー: %s.%s の変更に失敗しました: %s。"
 
-#: ../clients/cli/connections.c:4361
+#: ../clients/cli/connections.c:4741
 #, c-format
-msgid "Connection '%s' (%s) successfully added.\n"
-msgstr "接続 '%s' (%s) が正常に追加されました。\n"
+msgid "Error: failed to remove a value from %s.%s: %s."
+msgstr "エラー: '%s' の値の削除に失敗しました、%s: %s。"
 
-#: ../clients/cli/connections.c:4477
+#: ../clients/cli/connections.c:4775
 #, c-format
 msgid ""
-"You can specify this option more than once. Press <Enter> when you're done.\n"
-msgstr ""
+"Warning: 'type' is ignored. Use 'nmcli connection add \"%s\" ...' instead."
+msgstr "警告: 'type' が無視されました。'nmcli connection add \"%s\" ...' を代わりに使用してください。"
 
-#. Ask for optional arguments.
-#: ../clients/cli/connections.c:4515
-#, fuzzy, c-format
-msgid "There is %d optional setting for %s.\n"
-msgid_plural "There are %d optional settings for %s.\n"
-msgstr[0] "'%s' 接続タイプには 1 種類のオプション引数があります。\n"
-
-#: ../clients/cli/connections.c:4518
-#, fuzzy, c-format
-msgid "Do you want to provide it? %s"
-msgid_plural "Do you want to provide them? %s"
-msgstr[0] "指定しますか? (yes/no) [yes] "
+#: ../clients/cli/connections.c:4783
+msgid "Error: redundant 'master' option."
+msgstr "エラー: 'master' オプションが冗長です。"
 
-#: ../clients/cli/connections.c:4532
-#, fuzzy
-msgid "Wired Ethernet"
-msgstr "Ethernet"
+#: ../clients/cli/connections.c:4796
+msgid "Error: 'master' is required."
+msgstr "エラー: 'マスター' が必要です。"
 
-#: ../clients/cli/connections.c:4534 ../src/devices/nm-device-infiniband.c:175
-#, fuzzy
-msgid "InfiniBand connection"
-msgstr "InfiniBand 接続 %d"
+#: ../clients/cli/connections.c:4950
+#, c-format
+msgid "Error: 'parent': not valid without 'p-key'."
+msgstr "エラー: 'parent': 'p-key' がないと使用できません。"
 
-#: ../clients/cli/connections.c:4536
-#, fuzzy
-msgid "Wi-Fi connection"
-msgstr "Wi-Fi 接続 %d"
+#: ../clients/cli/connections.c:5005 ../clients/cli/connections.c:5967
+msgid "SSID: "
+msgstr "SSID: "
 
-#: ../clients/cli/connections.c:4538
-#, fuzzy
-msgid "WiMAX connection"
-msgstr "CDMA 接続 %d"
+#: ../clients/cli/connections.c:5008 ../clients/cli/connections.c:5970
+msgid "Error: 'ssid' is required."
+msgstr "エラー: 'ssid' が必要です。"
 
-#: ../clients/cli/connections.c:4540
-msgid "PPPoE"
-msgstr ""
+#: ../clients/cli/connections.c:5072
+msgid "WiMAX NSP name: "
+msgstr "WiMAX NSP 名: "
 
-#: ../clients/cli/connections.c:4542
-#, fuzzy
-msgid "CDMA mobile broadband connection"
-msgstr "モバイルブロードバンド接続 %d"
+#: ../clients/cli/connections.c:5075
+msgid "Error: 'nsp' is required."
+msgstr "エラー: 'nsp' が必要です。"
 
-#: ../clients/cli/connections.c:4544
-#, fuzzy
-msgid "GSM mobile broadband connection"
-msgstr "モバイルブロードバンド接続 %d"
+#: ../clients/cli/connections.c:5127
+msgid "PPPoE username: "
+msgstr "PPPoE ユーザー名: "
 
-#: ../clients/cli/connections.c:4546
-#, fuzzy
-msgid "bluetooth connection"
-msgstr "ボンド接続 %d"
+#: ../clients/cli/connections.c:5130 ../clients/cli/connections.c:6037
+msgid "Error: 'username' is required."
+msgstr "エラー: 「ユーザー名」を入力してください。"
 
-#: ../clients/cli/connections.c:4548 ../src/devices/nm-device-vlan.c:458
-#, fuzzy
-msgid "VLAN connection"
-msgstr "VLAN 接続 %d"
+#: ../clients/cli/connections.c:5199
+msgid "APN: "
+msgstr "APN: "
 
-#: ../clients/cli/connections.c:4550
-#, fuzzy
-msgid "Bond device"
-msgstr "Ethernet"
+#: ../clients/cli/connections.c:5202
+msgid "Error: 'apn' is required."
+msgstr "エラー: 'apn' が必要です。"
 
-#: ../clients/cli/connections.c:4552
-#, fuzzy
-msgid "Team device"
-msgstr "このデバイスは削除されました"
+#: ../clients/cli/connections.c:5260
+msgid "Bluetooth device address: "
+msgstr "Bluetooth デバイスアドレス: "
 
-#: ../clients/cli/connections.c:4554
-#, fuzzy
-msgid "Team port"
-msgstr "team "
+#: ../clients/cli/connections.c:5263
+msgid "Error: 'addr' is required."
+msgstr "エラー: 'addr' が必要です。"
 
-#: ../clients/cli/connections.c:4556
-#, fuzzy
-msgid "Bridge device"
-msgstr "Ethernet"
+#: ../clients/cli/connections.c:5304
+#, c-format
+msgid "Error: 'bt-type': '%s' not valid; use [%s, %s (%s), %s]."
+msgstr "エラー: 'bt-type': '%s' は無効です; [%s, %s (%s), %s] を使用してください。"
 
-#: ../clients/cli/connections.c:4558
-#, fuzzy
-msgid "Bridge port"
-msgstr "ブリッジ"
+#: ../clients/cli/connections.c:5348
+msgid "VLAN parent device or connection UUID: "
+msgstr "VLAN 親デバイスまたは接続 UUID: "
 
-#: ../clients/cli/connections.c:4560 ../src/nm-manager.c:3716
-#, fuzzy
-msgid "VPN connection"
-msgstr "VPN 接続"
+#: ../clients/cli/connections.c:5351 ../clients/cli/connections.c:6108
+msgid "Error: 'dev' is required."
+msgstr "エラー: 'dev' が必要です。"
 
-#: ../clients/cli/connections.c:4562
-#, fuzzy
-msgid "OLPC Mesh connection"
-msgstr "CDMA 接続 %d"
+#: ../clients/cli/connections.c:5355
+msgid "VLAN ID <0-4094>: "
+msgstr "VLAN ID <0-4094>: "
 
-#: ../clients/cli/connections.c:4564 ../src/devices/adsl/nm-device-adsl.c:133
-#, fuzzy
-msgid "ADSL connection"
-msgstr "ADSL 接続 %d"
+#: ../clients/cli/connections.c:5358 ../clients/cli/connections.c:6424
+msgid "Error: 'id' is required."
+msgstr "エラー: 'id' が必要です。"
 
-#: ../clients/cli/connections.c:4566
-#, fuzzy
-msgid "macvlan connection"
-msgstr "ボンド接続 %d"
+#: ../clients/cli/connections.c:5364
+#, c-format
+msgid "Error: 'id': '%s' is not valid; use <0-4094>."
+msgstr "エラー: 'id': '%s' は無効です; <0-4094> を使用してください。"
 
-#: ../clients/cli/connections.c:4568 ../src/devices/nm-device-vxlan.c:374
-#, fuzzy
-msgid "VXLAN connection"
-msgstr "VLAN 接続 %d"
+#: ../clients/cli/connections.c:5374 ../clients/cli/connections.c:6116
+#, c-format
+msgid "Error: 'dev': '%s' is neither UUID, interface name, nor MAC."
+msgstr "エラー: 'dev': '%s' は UUID、インターフェース名、MAC のいずれでもありません。"
 
-#: ../clients/cli/connections.c:4570
-#, fuzzy
-msgid "Tun device"
-msgstr "このデバイスは削除されました"
+#: ../clients/cli/connections.c:5506
+#, c-format
+msgid "Error: 'mode': %s."
+msgstr "エラー: 'モード': %s。"
 
-#: ../clients/cli/connections.c:4572
-#, fuzzy
-msgid "IPv4 protocol"
-msgstr "ADSL プロトコル"
+#: ../clients/cli/connections.c:5515
+#, c-format
+msgid "Error: 'primary': '%s' is not a valid interface name."
+msgstr "エラー: 'primary': '%s' は無効なインターフェース名です。"
 
-#: ../clients/cli/connections.c:4574
-#, fuzzy
-msgid "IPv6 protocol"
-msgstr "ADSL プロトコル"
+#: ../clients/cli/connections.c:5738
+#, c-format
+msgid "Error: 'stp': %s."
+msgstr "エラー:'stp': %s。"
 
-#: ../clients/cli/connections.c:4657 ../clients/cli/utils.c:124
+#: ../clients/cli/connections.c:5747
 #, c-format
-msgid "Error: value for '%s' argument is required."
-msgstr "エラー: '%s' 引数の値が必要です。"
+msgid "Error: 'multicast-snooping': %s."
+msgstr "エラー: 'multicast-snooping': %s。"
 
-#: ../clients/cli/connections.c:4663
-#, fuzzy, c-format
-msgid "Error: 'save': %s."
-msgstr "エラー:'stp': %s。"
+#: ../clients/cli/connections.c:5866
+#, c-format
+msgid "Error: 'hairpin': %s."
+msgstr "エラー: 'ヘアピン': %s。"
+
+#: ../clients/cli/connections.c:5915
+msgid "Error: 'vpn-type' is required."
+msgstr "エラー: ’vpn タイプ’ が必要です。"
+
+#: ../clients/cli/connections.c:5922
+#, c-format
+msgid "Warning: 'vpn-type': %s not known.\n"
+msgstr "警告: 'vpn-type': %s が不明です。\n"
+
+#: ../clients/cli/connections.c:5983
+#, c-format
+msgid "Error: 'channel': '%s' is not valid; use <1-13>."
+msgstr "エラー: 'チャンネル': '%s' は無効です; <1-13> を使用してください。"
+
+#: ../clients/cli/connections.c:6034
+msgid "Username: "
+msgstr "ユーザー名: "
+
+#: ../clients/cli/connections.c:6043
+#, c-format
+msgid "Protocol %s"
+msgstr "プロトコル %s"
+
+#: ../clients/cli/connections.c:6046
+msgid "Error: 'protocol' is required."
+msgstr "エラー: 'protocol' が必要です。"
 
-#: ../clients/cli/connections.c:4732
-#, fuzzy, c-format
-msgid "Error: '%s' argument is required."
+#: ../clients/cli/connections.c:6105
+msgid "MACVLAN parent device or connection UUID: "
+msgstr "MACVLAN 親デバイスまたは接続 UUID: "
+
+#: ../clients/cli/connections.c:6125 ../clients/cli/connections.c:6205
+#: ../clients/cli/connections.c:6307
+msgid "Error: 'mode' is required."
+msgstr "エラー: 'mode' が必要です。"
+
+#: ../clients/cli/connections.c:6131
+msgid "Error: 'mode' is not valid."
+msgstr "エラー: 'mode' が無効です。"
+
+#: ../clients/cli/connections.c:6144
+#, c-format
+msgid "Error: 'tap': %s."
+msgstr "エラー: 'tap': %s。"
+
+#: ../clients/cli/connections.c:6230
+#, c-format
+msgid "Error: 'pi': %s."
+msgstr "エラー: 'pi': %s。"
+
+#: ../clients/cli/connections.c:6241
+#, c-format
+msgid "Error: 'vnet-hdr': %s."
+msgstr "エラー: 'vnet-hdr': %s。"
+
+#: ../clients/cli/connections.c:6252
+#, c-format
+msgid "Error: 'multi-queue': %s."
+msgstr "エラー: 'multi-queue': %s。"
+
+#: ../clients/cli/connections.c:6321
+#, c-format
+msgid "Error: 'mode': '%s' is not valid, use one of %s"
+msgstr "エラー: 'mode': '%s' は無効です。%s のいずれかを使用してください"
+
+#: ../clients/cli/connections.c:6327
+msgid "Remote endpoint: "
+msgstr "リモートエンドポイント: "
+
+#: ../clients/cli/connections.c:6330 ../clients/cli/connections.c:6432
+msgid "Error: 'remote' is required."
+msgstr "エラー: 'remote' が必要です。"
+
+#: ../clients/cli/connections.c:6337
+#, c-format
+msgid "Error: 'remote': '%s' is not valid; must be an IP address"
+msgstr "エラー: 'remote': '%s' は無効です。IP アドレスである必要があります"
+
+#: ../clients/cli/connections.c:6351
+#, c-format
+msgid "Error: 'local': '%s' is not valid; must be an IP address"
+msgstr "エラー: 'local': '%s' は無効です。IP アドレスである必要があります"
+
+#: ../clients/cli/connections.c:6360 ../clients/cli/connections.c:6455
+#, c-format
+msgid "Error: 'dev': '%s' is neither UUID nor interface name."
+msgstr "エラー: 'dev': '%s' は UUID またはインターフェース名のいずれでもありません。"
+
+#: ../clients/cli/connections.c:6421
+msgid "VXLAN ID: "
+msgstr "VXLAN ID: "
+
+#: ../clients/cli/connections.c:6429
+msgid "Remote: "
+msgstr "リモート: "
+
+#: ../clients/cli/connections.c:6438
+#, c-format
+msgid "Error: 'id': '%s' is not valid; use <0-16777215>."
+msgstr "エラー: 'id': '%s' は無効です; <0-16777215> を使用してください。"
+
+#: ../clients/cli/connections.c:6464
+#, c-format
+msgid "Error: 'remote': '%s' is not a valid IP address"
+msgstr "エラー: 'remote': '%s' は無効な IP アドレスです"
+
+#: ../clients/cli/connections.c:6473
+#, c-format
+msgid "Error: 'local': '%s' is not a valid IP address"
+msgstr "エラー: 'local': '%s' は無効な IP アドレスです"
+
+#: ../clients/cli/connections.c:6482
+#, c-format
+msgid "Error: 'source-port-min': %s is not valid; use <0-65535>."
+msgstr "エラー: 'source-port-min': %s は無効です。<0-65535> を使用してください"
+
+#: ../clients/cli/connections.c:6491
+#, c-format
+msgid "Error: 'source-port-max': %s is not valid; use <0-65535>."
+msgstr "エラー: 'source-port-max': %s は無効です。<0-65535> を使用してください。"
+
+#: ../clients/cli/connections.c:6500
+#, c-format
+msgid "Error: 'destination-port': %s is not valid; use <0-65535>."
+msgstr "エラー: 'destination-port': %s は無効です。<0-65535> を使用してください。"
+
+#: ../clients/cli/connections.c:6540
+#, c-format
+msgid "Error: '%s' is not a valid connection type."
+msgstr "エラー: '%s' は無効な接続タイプです。"
+
+#: ../clients/cli/connections.c:6581
+#, c-format
+msgid "Error: IPv4 gateway specified without IPv4 addresses"
+msgstr "エラー: IPv4 ゲートウェイが IPv4 アドレスなしで指定されました"
+
+#: ../clients/cli/connections.c:6585
+#, c-format
+msgid "Error: multiple IPv4 gateways specified"
+msgstr "エラー: 複数の IPv4 ゲートウェイが指定されています"
+
+#: ../clients/cli/connections.c:6589
+#, c-format
+msgid "Error: Invalid IPv4 gateway '%s'"
+msgstr "エラー: 無効な IPv4 ゲートウェイ '%s'"
+
+#: ../clients/cli/connections.c:6614
+#, c-format
+msgid "Error: IPv6 gateway specified without IPv6 addresses"
+msgstr "エラー: IPv6 ゲートウェイが IPv6 アドレスなしで指定されました"
+
+#: ../clients/cli/connections.c:6618
+#, c-format
+msgid "Error: multiple IPv6 gateways specified"
+msgstr "エラー: 複数の IPv6 ゲートウェイが指定されています"
+
+#: ../clients/cli/connections.c:6622
+#, c-format
+msgid "Error: Invalid IPv6 gateway '%s'"
+msgstr "エラー: 無効な IPv6 ゲートウェイ '%s'"
+
+#: ../clients/cli/connections.c:6670 ../clients/cli/connections.c:10223
+#, c-format
+msgid "Error: Failed to add '%s' connection: %s"
+msgstr "エラー: '%s' 接続の追加に失敗しました: %s"
+
+#: ../clients/cli/connections.c:6675
+#, c-format
+msgid "Connection '%s' (%s) successfully added.\n"
+msgstr "接続 '%s' (%s) が正常に追加されました。\n"
+
+#: ../clients/cli/connections.c:6951 ../clients/cli/connections.c:10678
+#, c-format
+msgid "Error: 'type' argument is required."
 msgstr "エラー: 'タイプ' 引数が必要です。"
 
-#: ../clients/cli/connections.c:5701
+#: ../clients/cli/connections.c:6959
+#, c-format
+msgid "Error: invalid connection type; %s."
+msgstr "エラー: 無効な接続タイプ; %s。"
+
+#: ../clients/cli/connections.c:6968 ../clients/cli/devices.c:2164
+#, c-format
+msgid "Error: 'autoconnect': %s."
+msgstr "エラー: '自動接続': %s。"
+
+#: ../clients/cli/connections.c:6978
+#, c-format
+msgid "Error: 'save': %s."
+msgstr "エラー: 'save': %s。"
+
+#: ../clients/cli/connections.c:6995
+msgid "Interface name [*]: "
+msgstr "インターフェース名 [*]: "
+
+#: ../clients/cli/connections.c:7000
+#, c-format
+msgid "Error: 'ifname' argument is required."
+msgstr "エラー: 「ifname」引数を入力してください。"
+
+#: ../clients/cli/connections.c:7002
+#, c-format
+msgid "Error: mandatory 'ifname' not seen before '%s'."
+msgstr "エラー: 必須の 'ifname' が '%s' の前にありません。"
+
+#: ../clients/cli/connections.c:7011
+#, c-format
+msgid "Error: 'ifname': '%s' is not a valid interface nor '*'."
+msgstr "エラー: 'ifname': '%s' は有効なインターフェースでも '*' でもありません。"
+
+#: ../clients/cli/connections.c:8035
 #, c-format
 msgid "['%s' setting values]\n"
 msgstr "['%s' 設定値]\n"
 
 #. TRANSLATORS: do not translate command names and keywords before ::
 #. *              However, you should translate terms enclosed in <>.
-#.
-#: ../clients/cli/connections.c:5783
-#, fuzzy, c-format
+#. 
+#: ../clients/cli/connections.c:8117
+#, c-format
 msgid ""
 "---[ Main menu ]---\n"
 "goto     [<setting> | <prop>]        :: go to a setting or property\n"
@@ -2345,21 +2807,20 @@ msgid ""
 "quit                                 :: exit nmcli\n"
 msgstr ""
 "---[ メインメニュー ]---\n"
-"goto     [<setting> | <prop>]        :: 設定またはプロパティに行く\n"
-"remove   <setting>[.<prop>] | <prop> :: 設定を削除する、またはプロパティ値を"
-"リセットする\n"
-"set      [<setting>.<prop> <value>]  :: プロパティ値を設定する\n"
-"describe [<setting>.<prop>]          :: プロパティを表示する\n"
-"print    [all]                       :: 接続を出力する\n"
-"verify   [all]                       :: 接続を検証する\n"
-"save                                 :: 接続を保存する\n"
+"goto     [<setting> | <prop>]        :: 設定またはプロパティーに移動する\n"
+"remove   <setting>[.<prop>] | <prop> :: 設定を削除する、またはプロパティー値をリセットする\n"
+"set      [<setting>.<prop> <value>]  :: プロパティー値を設定する\n"
+"describe [<setting>.<prop>]          :: プロパティーの説明を表示する\n"
+"print    [all | <setting>[.<prop>]]  :: 接続を出力する\n"
+"verify   [all | fix]                 :: 接続を検証する\n"
+"save     [persistent|temporary]      :: 接続を保存する\n"
 "activate [<ifname>] [/<ap>|<nsp>]    :: 接続をアクティベートする\n"
-"back                                 :: ひとつ上のレベルへ行く (戻る)\n"
+"back                                 :: ひとつ上のレベルに移動する (戻る)\n"
 "help/?   [<command>]                 :: このヘルプを表示する\n"
 "nmcli    <conf-option> <value>       :: nmcli 設定\n"
 "quit                                 :: nmcli を終了する\n"
 
-#: ../clients/cli/connections.c:5810
+#: ../clients/cli/connections.c:8144
 #, c-format
 msgid ""
 "goto <setting>[.<prop>] | <prop>  :: enter setting/property for editing\n"
@@ -2378,20 +2839,18 @@ msgstr ""
 "          nmcli connection> goto secondaries\n"
 "          nmcli> goto ipv4.addresses\n"
 
-#: ../clients/cli/connections.c:5817
+#: ../clients/cli/connections.c:8151
 #, c-format
 msgid ""
 "remove <setting>[.<prop>]  :: remove setting or reset property value\n"
 "\n"
-"This command removes an entire setting from the connection, or if a "
-"property\n"
+"This command removes an entire setting from the connection, or if a property\n"
 "is given, resets that property to the default value.\n"
 "\n"
 "Examples: nmcli> remove wifi-sec\n"
 "          nmcli> remove eth.mtu\n"
 msgstr ""
-"remove <setting>[.<prop>]  :: 設定を削除する、またはプロパティ値をリセットす"
-"る\n"
+"remove <setting>[.<prop>]  :: 設定を削除する、またはプロパティ値をリセットする\n"
 "\n"
 "このコマンドを使って接続から全設定を削除します。または、プロパティを\n"
 "指定している場合にはそのプロパティをデフォルト値としてリセットします。\n"
@@ -2399,7 +2858,7 @@ msgstr ""
 "例: nmcli> remove wifi-sec\n"
 "          nmcli> remove eth.mtu\n"
 
-#: ../clients/cli/connections.c:5824
+#: ../clients/cli/connections.c:8158
 #, c-format
 msgid ""
 "set [<setting>.<prop> <value>]  :: set property value\n"
@@ -2414,7 +2873,7 @@ msgstr ""
 "\n"
 "例: nmcli> set con.id My connection\n"
 
-#: ../clients/cli/connections.c:5829
+#: ../clients/cli/connections.c:8163
 #, c-format
 msgid ""
 "describe [<setting>.<prop>]  :: describe property\n"
@@ -2424,10 +2883,9 @@ msgid ""
 msgstr ""
 "describe [<setting>.<prop>]  :: プロパティ値を表示する\n"
 "\n"
-"プロパティ詳細を表示します。NM の設定およびプロパティの全詳細については nm-"
-"settings(5) の man ページを参照してください。\n"
+"プロパティ詳細を表示します。NM の設定およびプロパティの全詳細については nm-settings(5) の man ページを参照してください。\n"
 
-#: ../clients/cli/connections.c:5834
+#: ../clients/cli/connections.c:8168
 #, c-format
 msgid ""
 "print [all]  :: print setting or connection values\n"
@@ -2442,29 +2900,30 @@ msgstr ""
 "\n"
 "例: nmcli ipv4> print all\n"
 
-#: ../clients/cli/connections.c:5839
-#, fuzzy, c-format
+#: ../clients/cli/connections.c:8173
+#, c-format
 msgid ""
 "verify [all | fix]  :: verify setting or connection validity\n"
 "\n"
 "Verifies whether the setting or connection is valid and can be saved later.\n"
-"It indicates invalid values on error. Some errors may be fixed "
-"automatically\n"
+"It indicates invalid values on error. Some errors may be fixed automatically\n"
 "by 'fix' option.\n"
 "\n"
 "Examples: nmcli> verify\n"
 "          nmcli> verify fix\n"
 "          nmcli bond> verify\n"
 msgstr ""
-"verify [all]  :: 設定または接続の有効性の確認\n"
+"verify [all | fix]  :: 設定または接続の有効性を確認する\n"
 "\n"
-"設定または接続が有効かどうかを確認し、あとで保存することができます。エラーの"
-"場合には無効な値を表示します。\n"
+"設定または接続が有効かどうかを確認し、あとで保存することができます。\n"
+"エラーの場合には無効な値を表示します。'fix' オプションにより一部のエラーは自動的に\n"
+"修正されることがあります。\n"
 "\n"
 "例: nmcli> verify\n"
+"          nmcli> verify fix\n"
 "          nmcli bond> verify\n"
 
-#: ../clients/cli/connections.c:5848
+#: ../clients/cli/connections.c:8182
 #, c-format
 msgid ""
 "save [persistent|temporary]  :: save the connection\n"
@@ -2479,8 +2938,18 @@ msgid ""
 "connection\n"
 "profile must be deleted.\n"
 msgstr ""
+"save [persistent|temporary]  :: 接続を保存する\n"
+"\n"
+"接続プロファイルを NetworkManager に送信し、永続的に保存するか、\n"
+"メモリーにのみ保持します。引数がない 'save' は 'save persistent' を\n"
+"意味します。\n"
+"プロファイルを永続的に保存すると、これらの設定は、再起動しても\n"
+"保持されます。以降の変更も一時的または永続的に行なえますが\n"
+"一時的な変更は再起動後に保持されません。\n"
+"永続的な接続を完全に削除する場合は、接続プロファイルを削除する\n"
+"必要があります。\n"
 
-#: ../clients/cli/connections.c:5859
+#: ../clients/cli/connections.c:8193
 #, c-format
 msgid ""
 "activate [<ifname>] [/<ap>|<nsp>]  :: activate the connection\n"
@@ -2498,29 +2967,24 @@ msgstr ""
 "\n"
 "使用できるオプション:\n"
 "<ifname>    - このデバイスで接続をアクティベートする\n"
-"/<ap>|<nsp> - AP (Wi-Fi) または NSP (WiMAX) (<ifname> が指定されていない場合"
-"は / を先頭に付ける)\n"
+"/<ap>|<nsp> - AP (Wi-Fi) または NSP (WiMAX) (<ifname> が指定されていない場合は / を先頭に付ける)\n"
 
-#: ../clients/cli/connections.c:5866 ../clients/cli/connections.c:6025
+#: ../clients/cli/connections.c:8200 ../clients/cli/connections.c:8359
 #, c-format
-msgid ""
-"back  :: go to upper menu level\n"
+msgid "back  :: go to upper menu level\n"
 "\n"
-msgstr ""
-"back  :: 一つ上のメニューレベルに移動\n"
+msgstr "back  :: 一つ上のメニューレベルに移動\n"
 "\n"
 
-#: ../clients/cli/connections.c:5869
+#: ../clients/cli/connections.c:8203
 #, c-format
-msgid ""
-"help/? [<command>]  :: help for the nmcli commands\n"
+msgid "help/? [<command>]  :: help for the nmcli commands\n"
 "\n"
-msgstr ""
-"help/? [<command>]  :: nmcli コマンドのヘルプ\n"
+msgstr "help/? [<command>]  :: nmcli コマンドのヘルプ\n"
 "\n"
 
-#: ../clients/cli/connections.c:5872
-#, fuzzy, c-format
+#: ../clients/cli/connections.c:8206
+#, c-format
 msgid ""
 "nmcli [<conf-option> <value>]  :: nmcli configuration\n"
 "\n"
@@ -2537,37 +3001,36 @@ msgstr ""
 "nmcli [<conf-option> <value>]  :: nmcli 設定\n"
 "\n"
 "nmcli の設定を行ないます。次のオプションが使用可能です。\n"
-"status-line yes | no        [デフォルト: no]\n"
-"save-confirmation yes | no  [デフォルト: yes]\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"
 
-#: ../clients/cli/connections.c:5894 ../clients/cli/connections.c:6031
+#: ../clients/cli/connections.c:8228 ../clients/cli/connections.c:8365
 #, c-format
 msgid ""
 "quit  :: exit nmcli\n"
 "\n"
 "This command exits nmcli. When the connection being edited is not saved, the "
 "user is asked to confirm the action.\n"
-msgstr ""
-"quit  :: nmcli の終了\n"
+msgstr "quit  :: nmcli の終了\n"
 "\n"
-"nmcli を終了します。変更した接続の保存を行なっていない場合、この動作の確認が"
-"求められます。\n"
+"nmcli を終了します。変更した接続の保存を行なっていない場合、この動作の確認が求められます。\n"
 
-#: ../clients/cli/connections.c:5899 ../clients/cli/connections.c:6036
-#: ../clients/cli/connections.c:6460 ../clients/cli/connections.c:7407
+#: ../clients/cli/connections.c:8233 ../clients/cli/connections.c:8370
+#: ../clients/cli/connections.c:8794 ../clients/cli/connections.c:9742
 #, c-format
 msgid "Unknown command: '%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:5965
+#. 
+#: ../clients/cli/connections.c:8299
 #, c-format
 msgid ""
 "---[ Property menu ]---\n"
@@ -2593,19 +3056,18 @@ msgstr ""
 "help/?   [<command>]             :: このヘルプまたはコマンドの詳細を表示\n"
 "quit                             :: nmcli の終了\n"
 
-#: ../clients/cli/connections.c:5990
+#: ../clients/cli/connections.c:8324
 #, c-format
 msgid ""
 "set [<value>]  :: set new value\n"
 "\n"
 "This command sets provided <value> to this property\n"
-msgstr ""
-"set [<value>]  :: 新しい値の設定\n"
+msgstr "set [<value>]  :: 新しい値の設定\n"
 "\n"
 "このプロパティに指定した <value> を設定します。\n"
 
-#: ../clients/cli/connections.c:5994
-#, fuzzy, c-format
+#: ../clients/cli/connections.c:8328
+#, c-format
 msgid ""
 "add [<value>]  :: append new value to the property\n"
 "\n"
@@ -2613,23 +3075,22 @@ msgid ""
 "container type. For single-valued properties the property value is replaced "
 "(same as 'set').\n"
 msgstr ""
-"add [<value>]  :: プロパティに新規オプションを追加\n"
+"add [<value>]  :: プロパティーに新しい値を追加する\n"
 "\n"
-"このプロパティのタイプがコンテナーの場合、指定した <value> を追加します。単一"
-"値のプロパティの場合はその値が置換されます ('set' と同じ)。\n"
+"このコマンドを実行すると、プロパティーのタイプがコンテナーの場合に、指定した <value> "
+"がこのプロパティーに追加されます。単一値のプロパティーの場合は、そのプロパティー値が置換されます ('set' の場合と同じ)。\n"
 
-#: ../clients/cli/connections.c:6000
+#: ../clients/cli/connections.c:8334
 #, c-format
 msgid ""
 "change  :: change current value\n"
 "\n"
 "Displays current value and allows editing it.\n"
-msgstr ""
-"change  :: 現在の値を変更\n"
+msgstr "change  :: 現在の値を変更\n"
 "\n"
 "現在の値を表示し、その値を変更することができます。\n"
 
-#: ../clients/cli/connections.c:6004
+#: ../clients/cli/connections.c:8338
 #, c-format
 msgid ""
 "remove [<value>|<index>|<option name>]  :: delete the value\n"
@@ -2648,8 +3109,20 @@ msgid ""
 "          nmcli bond.options> remove downdelay\n"
 "\n"
 msgstr ""
+"remove [<value>|<index>|<option name>]  :: 値を削除する\n"
+"\n"
+"プロパティー値を削除します。単一値のプロパティーの場合は、\n"
+"プロパティーがデフォルト値に戻ります。コンテナータイププロパティーの場合は、\n"
+"そのプロパティーのすべての値が削除されます。または、単一アイテムまたはオプション\n"
+"のみを削除するために引数を指定することもできます。引数は削除するアイテムの値またはインデックスか、\n"
+"オプション名 (オプションが指定されたプロパティーの場合) のいずれかです。\n"
+"\n"
+"例: nmcli ipv4.dns> remove 8.8.8.8\n"
+"          nmcli ipv4.dns> remove 2\n"
+"          nmcli bond.options> remove downdelay\n"
+"\n"
 
-#: ../clients/cli/connections.c:6015
+#: ../clients/cli/connections.c:8349
 #, c-format
 msgid ""
 "describe  :: describe property\n"
@@ -2659,10 +3132,9 @@ msgid ""
 msgstr ""
 "describe  :: プロパティの詳細表示\n"
 "\n"
-"プロパティの詳細を表示します。NM 設定とプロパティの全詳細は nm-settings(5) "
-"man ページを参照してください。\n"
+"プロパティの詳細を表示します。NM 設定とプロパティの全詳細は nm-settings(5) man ページを参照してください。\n"
 
-#: ../clients/cli/connections.c:6020
+#: ../clients/cli/connections.c:8354
 #, c-format
 msgid ""
 "print [property|setting|connection]  :: print property (setting, connection) "
@@ -2673,578 +3145,552 @@ msgid ""
 msgstr ""
 "print [property|setting|connection]  :: プロパティ値の表示 (設定、接続)\n"
 "\n"
-"プロパティ値を表示します。引数を指定すると、設定または接続全体の値を表示させ"
-"ることもできます。\n"
+"プロパティ値を表示します。引数を指定すると、設定または接続全体の値を表示させることもできます。\n"
 
-#: ../clients/cli/connections.c:6028
+#: ../clients/cli/connections.c:8362
 #, c-format
-msgid ""
-"help/? [<command>]  :: help for nmcli commands\n"
+msgid "help/? [<command>]  :: help for nmcli commands\n"
 "\n"
-msgstr ""
-"help/? [<command>]  :: nmcli コマンドのヘルプ\n"
+msgstr "help/? [<command>]  :: nmcli コマンドのヘルプ\n"
 "\n"
 
-#: ../clients/cli/connections.c:6209
+#: ../clients/cli/connections.c:8460
+#, c-format
+msgid "Error: Connection activation failed.\n"
+msgstr "エラー: 接続のアクティベートに失敗しました。\n"
+
+#: ../clients/cli/connections.c:8543
 #, 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:6227
-#, fuzzy, c-format
+#: ../clients/cli/connections.c:8561
+#, c-format
 msgid "[ Type: %s | Name: %s | UUID: %s | Dirty: %s | Temp: %s ]\n"
-msgstr "[ 接続タイプ: %s | name: %s | UUID: %s | dirty: %s ]\n"
+msgstr "[ タイプ: %s | 名前: %s | UUID: %s | Dirty: %s | Temp: %s ]\n"
 
-#: ../clients/cli/connections.c:6263
-#, fuzzy, c-format
+#: ../clients/cli/connections.c:8597
+#, c-format
 msgid "The connection is not saved. Do you really want to quit? %s"
-msgstr "この接続は保存されません。本当に終了してよいですか? [y/n]\n"
+msgstr "この接続は保存されません。本当に終了しますか? %s"
 
-#: ../clients/cli/connections.c:6312
+#: ../clients/cli/connections.c:8646
 #, 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"
+msgstr "この接続プロファイルは別のクライアントからは削除されています。メインメニューで「save」と入力すると元に戻すことができます。\n"
 
-#: ../clients/cli/connections.c:6337 ../clients/cli/connections.c:6758
-#: ../clients/cli/connections.c:6816
+#: ../clients/cli/connections.c:8671 ../clients/cli/connections.c:9093
+#: ../clients/cli/connections.c:9151
 #, c-format
 msgid "Allowed values for '%s' property: %s\n"
 msgstr "'%s' プロパティに対して許可されている値: %s\n"
 
-#: ../clients/cli/connections.c:6341 ../clients/cli/connections.c:6762
-#: ../clients/cli/connections.c:6820
+#: ../clients/cli/connections.c:8675 ../clients/cli/connections.c:9097
+#: ../clients/cli/connections.c:9155
 #, c-format
 msgid "Enter '%s' value: "
 msgstr "'%s' 値を入力してください: "
 
-#: ../clients/cli/connections.c:6356 ../clients/cli/connections.c:6378
-#: ../clients/cli/connections.c:6766 ../clients/cli/connections.c:6825
+#: ../clients/cli/connections.c:8690 ../clients/cli/connections.c:8712
+#: ../clients/cli/connections.c:9101 ../clients/cli/connections.c:9160
 #, c-format
 msgid "Error: failed to set '%s' property: %s\n"
 msgstr "エラー: '%s' プロパティの設定に失敗しました: %s\n"
 
-#: ../clients/cli/connections.c:6372
+#: ../clients/cli/connections.c:8706
 #, c-format
 msgid "Edit '%s' value: "
 msgstr "'%s' 値の編集: "
 
-#: ../clients/cli/connections.c:6401
+#: ../clients/cli/connections.c:8735
 #, c-format
 msgid "Error: %s\n"
 msgstr "エラー: %s\n"
 
-#: ../clients/cli/connections.c:6407 ../clients/cli/connections.c:6907
-#: ../clients/cli/connections.c:6955
+#: ../clients/cli/connections.c:8741 ../clients/cli/connections.c:9242
+#: ../clients/cli/connections.c:9290
 #, c-format
 msgid "Error: failed to remove value of '%s': %s\n"
 msgstr "エラー: '%s' の値の削除に失敗しました: %s\n"
 
-#: ../clients/cli/connections.c:6428
+#: ../clients/cli/connections.c:8762
 #, c-format
 msgid "Unknown command argument: '%s'\n"
 msgstr "不明なコマンド引数: '%s'\n"
 
-#: ../clients/cli/connections.c:6533
+#: ../clients/cli/connections.c:8867
 #, c-format
 msgid "Available settings: %s\n"
 msgstr "使用可能な設定: %s\n"
 
-#: ../clients/cli/connections.c:6545
+#: ../clients/cli/connections.c:8879
 #, c-format
 msgid "Error: invalid setting name; %s\n"
 msgstr "エラー: 無効な設定名; %s\n"
 
-#: ../clients/cli/connections.c:6562
+#: ../clients/cli/connections.c:8896
 #, c-format
 msgid "Available properties: %s\n"
 msgstr "使用可能なプロパティ: %s\n"
 
-#: ../clients/cli/connections.c:6570
+#: ../clients/cli/connections.c:8904
 #, c-format
 msgid "Error: property %s\n"
 msgstr "エラー: プロパティ %s\n"
 
-#: ../clients/cli/connections.c:6611
-#, fuzzy, c-format
+#: ../clients/cli/connections.c:8945
+#, 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"
-"本当に保存しますか? [yes] "
+"'autoconnect=yes' でこの接続を保存しています。これにより直ちに接続がアクティベートされる可能性があります。\n"
+"本当に保存しますか? %s"
 
-#: ../clients/cli/connections.c:6700
+#: ../clients/cli/connections.c:9035
 #, c-format
 msgid "You may edit the following settings: %s\n"
 msgstr "次の設定を変更することができます: %s\n"
 
-#: ../clients/cli/connections.c:6728
+#: ../clients/cli/connections.c:9063
 #, 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:6770 ../clients/cli/connections.c:7000
+#: ../clients/cli/connections.c:9105 ../clients/cli/connections.c:9335
 #, c-format
 msgid "Error: no setting selected; valid are [%s]\n"
 msgstr "エラー: 設定が選択されていません; 有効な設定は [%s] になります\n"
 
-#: ../clients/cli/connections.c:6771
+#: ../clients/cli/connections.c:9106
 #, c-format
 msgid "use 'goto <setting>' first, or 'set <setting>.<property>'\n"
-msgstr ""
-"まず先に 'goto <setting>' を使用するか、'set <setting>.<property>' を使用して"
-"ください。\n"
+msgstr "まず先に 'goto <setting>' を使用するか、'set <setting>.<property>' を使用してください。\n"
 
-#: ../clients/cli/connections.c:6785 ../clients/cli/connections.c:6934
-#: ../clients/cli/connections.c:7022
+#: ../clients/cli/connections.c:9120 ../clients/cli/connections.c:9269
+#: ../clients/cli/connections.c:9357
 #, c-format
 msgid "Error: invalid setting argument '%s'; valid are [%s]\n"
 msgstr "エラー: 無効な設定引数 %s です; [%s] が有効な引数になります\n"
 
-#: ../clients/cli/connections.c:6795
+#: ../clients/cli/connections.c:9130
 #, c-format
 msgid "Error: missing setting for '%s' property\n"
 msgstr "エラー: '%s' プロパティ用の設定がありません\n"
 
-#: ../clients/cli/connections.c:6802
+#: ../clients/cli/connections.c:9137
 #, c-format
 msgid "Error: invalid property: %s\n"
 msgstr "エラー: 無効なプロパティ: %s\n"
 
-#: ../clients/cli/connections.c:6855
+#: ../clients/cli/connections.c:9190
 #, c-format
 msgid "Error: unknown setting '%s'\n"
 msgstr "エラー: 不明な設定 '%s'\n"
 
-#: ../clients/cli/connections.c:6868
+#: ../clients/cli/connections.c:9203
 #, c-format
 msgid "You may edit the following properties: %s\n"
 msgstr "変更できるのは次のプロパティになります: %s\n"
 
-#: ../clients/cli/connections.c:6912
+#: ../clients/cli/connections.c:9247
 #, c-format
 msgid "Error: no argument given; valid are [%s]\n"
 msgstr "エラー: 引数が指定されていません; [%s] が有効な引数になります\n"
 
-#: ../clients/cli/connections.c:6931
+#: ../clients/cli/connections.c:9266
 #, c-format
 msgid "Setting '%s' is not present in the connection.\n"
 msgstr "この接続には設定 '%s' はありません。\n"
 
-#: ../clients/cli/connections.c:6976
+#: ../clients/cli/connections.c:9311
 #, c-format
 msgid "Error: %s properties, nor it is a setting name.\n"
 msgstr "エラー: %s プロパティ、設定名でもありません。\n"
 
-#: ../clients/cli/connections.c:7001
+#: ../clients/cli/connections.c:9336
 #, c-format
 msgid "use 'goto <setting>' first, or 'describe <setting>.<property>'\n"
 msgstr ""
-"まず先に 'goto <setting>' を使用するか、'describe <setting>.<property>' を使"
-"用してください\n"
+"まず先に 'goto <setting>' を使用するか、'describe <setting>.<property>' を使用してください\n"
 
-#: ../clients/cli/connections.c:7050
+#: ../clients/cli/connections.c:9385
 #, c-format
 msgid "Error: invalid property: %s, neither a valid setting name.\n"
 msgstr "エラー: 無効なプロパティ: %s、有効な設定名でもありません。\n"
 
-#: ../clients/cli/connections.c:7082
+#: ../clients/cli/connections.c:9417
 #, c-format
 msgid "Error: unknown setting: '%s'\n"
 msgstr "エラー: 不明な設定: '%s'\n"
 
-#: ../clients/cli/connections.c:7087
-#, fuzzy, c-format
+#: ../clients/cli/connections.c:9422
+#, c-format
 msgid "Error: '%s' setting not present in the connection\n"
-msgstr "この接続には設定 '%s' はありません。\n"
+msgstr "エラー: この接続には設定 '%s' はありません。\n"
 
-#: ../clients/cli/connections.c:7115
+#: ../clients/cli/connections.c:9450
 #, c-format
 msgid "Error: invalid property: %s%s\n"
 msgstr "エラー: 無効なプロパティ: %s%s\n"
 
-#: ../clients/cli/connections.c:7117
-#, fuzzy
+#: ../clients/cli/connections.c:9452
 msgid ", neither a valid setting name"
-msgstr "エラー: 無効なプロパティ: %s、有効な設定名でもありません。\n"
+msgstr "有効な設定名でもありません。"
 
-#: ../clients/cli/connections.c:7134
-#, fuzzy, c-format
+#: ../clients/cli/connections.c:9469
+#, c-format
 msgid "Invalid verify option: %s\n"
-msgstr "無効なオプション '%s'"
+msgstr "無効な検証オプション: %s\n"
 
-#: ../clients/cli/connections.c:7142
+#: ../clients/cli/connections.c:9477
 #, c-format
 msgid "Verify setting '%s': %s\n"
 msgstr "設定 '%s' の確認: %s\n"
 
-#: ../clients/cli/connections.c:7157
+#: ../clients/cli/connections.c:9492
 #, c-format
 msgid "Verify connection: %s\n"
 msgstr "接続の確認: %s\n"
 
-#: ../clients/cli/connections.c:7160
+#: ../clients/cli/connections.c:9495
 #, c-format
 msgid "The error cannot be fixed automatically.\n"
-msgstr ""
+msgstr "エラーを自動的に修正できません\n"
 
-#: ../clients/cli/connections.c:7177
+#: ../clients/cli/connections.c:9512
 #, c-format
 msgid "Error: invalid argument '%s'\n"
 msgstr "エラー: 無効な引数 '%s'\n"
 
-#: ../clients/cli/connections.c:7210
-#, fuzzy, c-format
+#: ../clients/cli/connections.c:9545
+#, c-format
 msgid "Error: Failed to save '%s' (%s) connection: %s\n"
-msgstr "エラー: '%s' (%s) 接続の保存に失敗しました: (%d) %s\n"
+msgstr "エラー: '%s' (%s) 接続の保存に失敗しました: %s\n"
 
-#: ../clients/cli/connections.c:7217
+#: ../clients/cli/connections.c:9552
 #, c-format
 msgid "Connection '%s' (%s) successfully saved.\n"
 msgstr "接続 '%s' (%s) が正常に保存されました。\n"
 
-#: ../clients/cli/connections.c:7218
-#, fuzzy, c-format
+#: ../clients/cli/connections.c:9553
+#, c-format
 msgid "Connection '%s' (%s) successfully updated.\n"
-msgstr "接続 '%s' (%s) が正常に追加されました。\n"
+msgstr "接続 '%s' (%s) が正常に更新されました。\n"
 
-#: ../clients/cli/connections.c:7251
+#: ../clients/cli/connections.c:9586
 #, c-format
 msgid "Error: connection verification failed: %s\n"
 msgstr "エラー: 接続の確認に失敗しました: %s\n"
 
-#: ../clients/cli/connections.c:7252
+#: ../clients/cli/connections.c:9587
 msgid "(unknown error)"
 msgstr "(不明なエラー)"
 
-#: ../clients/cli/connections.c:7253
+#: ../clients/cli/connections.c:9588
 #, c-format
 msgid "You may try running 'verify fix' to fix errors.\n"
-msgstr ""
+msgstr "エラーを修正するために 'verify fix' の実行を試行できます。\n"
 
-#: ../clients/cli/connections.c:7275
+#: ../clients/cli/connections.c:9610
 #, c-format
 msgid "Error: connection is not saved. Type 'save' first.\n"
 msgstr "エラー: 接続は保存されていません。まず 'save' と入力します。\n"
 
-#: ../clients/cli/connections.c:7279
+#: ../clients/cli/connections.c:9614
 #, c-format
 msgid "Error: connection is not valid: %s\n"
 msgstr "エラー: 接続は無効です: %s\n"
 
-#: ../clients/cli/connections.c:7289
+#: ../clients/cli/connections.c:9624
 #, c-format
 msgid "Error: Cannot activate connection: %s.\n"
 msgstr "エラー: 接続をアクティベートできません: %s。\n"
 
-#: ../clients/cli/connections.c:7299
-#, fuzzy, c-format
+#: ../clients/cli/connections.c:9634
+#, c-format
 msgid "Error: Failed to activate '%s' (%s) connection: %s\n"
-msgstr "エラー: '%s' (%s) 接続のアクティベートに失敗しました: (%d) %s\n"
+msgstr "エラー: '%s' (%s) 接続のアクティベートに失敗しました: %s\n"
 
-#: ../clients/cli/connections.c:7305
+#: ../clients/cli/connections.c:9640
 #, c-format
 msgid "Monitoring connection activation (press any key to continue)\n"
 msgstr "モニタリング接続のアクティベート (いずれかのキーを押して続行する)\n"
 
-#: ../clients/cli/connections.c:7343
+#: ../clients/cli/connections.c:9678
 #, c-format
 msgid "Error: status-line: %s\n"
 msgstr "エラー: status-line: %s\n"
 
-#: ../clients/cli/connections.c:7351
+#: ../clients/cli/connections.c:9686
 #, c-format
 msgid "Error: save-confirmation: %s\n"
 msgstr "エラー: save-confirmation: %s\n"
 
-#: ../clients/cli/connections.c:7359
-#, fuzzy, c-format
+#: ../clients/cli/connections.c:9694
+#, c-format
 msgid "Error: show-secrets: %s\n"
-msgstr "エラー: 'show active': %s"
+msgstr "エラー: show-secrets: %s\n"
 
-#: ../clients/cli/connections.c:7368
-#, fuzzy, c-format
+#: ../clients/cli/connections.c:9703
+#, c-format
 msgid "Error: bad color: %s\n"
-msgstr "エラー: 無効なプロパティ: %s\n"
+msgstr "エラー: 不正な色: %s\n"
 
-#: ../clients/cli/connections.c:7382
+#: ../clients/cli/connections.c:9717
 #, c-format
 msgid "Current nmcli configuration:\n"
 msgstr "現在の nmcli 設定:\n"
 
-#: ../clients/cli/connections.c:7392
+#: ../clients/cli/connections.c:9727
 #, c-format
 msgid "Invalid configuration option '%s'; allowed [%s]\n"
 msgstr "無効な設定オプション '%s'; [%s] が許可されています\n"
 
-#: ../clients/cli/connections.c:7593
+#: ../clients/cli/connections.c:9982
 #, c-format
 msgid "Error: only one of 'id', uuid, or 'path' can be provided."
 msgstr "エラー: 指定できるのは 'id'、uuid、'path' のいずれか一つになります。"
 
-#: ../clients/cli/connections.c:7605 ../clients/cli/connections.c:7788
-#: ../clients/cli/connections.c:7795 ../clients/cli/connections.c:7929
-#: ../clients/cli/connections.c:8434
+#: ../clients/cli/connections.c:9994 ../clients/cli/connections.c:10171
+#: ../clients/cli/connections.c:10178 ../clients/cli/connections.c:10306
+#: ../clients/cli/connections.c:10782
 #, c-format
 msgid "Error: Unknown connection '%s'."
 msgstr "エラー: 不明な接続 '%s' です。"
 
-#: ../clients/cli/connections.c:7623
+#: ../clients/cli/connections.c:10012
 #, c-format
 msgid "Warning: editing existing connection '%s'; 'type' argument is ignored\n"
 msgstr "警告: 既存の接続 '%s' を編集しています;  'タイプ' 引数は無視されます\n"
 
-#: ../clients/cli/connections.c:7626
+#: ../clients/cli/connections.c:10015
 #, c-format
 msgid ""
 "Warning: editing existing connection '%s'; 'con-name' argument is ignored\n"
 msgstr "警告: 既存の接続 '%s' を編集しています; 'con 名' 引数は無視されます\n"
 
-#: ../clients/cli/connections.c:7640
+#: ../clients/cli/connections.c:10029
 #, c-format
 msgid "Valid connection types: %s\n"
 msgstr "有効な接続タイプ: %s\n"
 
-#: ../clients/cli/connections.c:7642
+#: ../clients/cli/connections.c:10031
 #, c-format
 msgid "Error: invalid connection type; %s\n"
 msgstr "エラー: 無効な接続タイプ; %s\n"
 
-#: ../clients/cli/connections.c:7681
+#: ../clients/cli/connections.c:10070
 #, c-format
 msgid "===| nmcli interactive connection editor |==="
 msgstr "===| nmcli インテラクティブ接続エディター |==="
 
-#: ../clients/cli/connections.c:7684
+#: ../clients/cli/connections.c:10073
 #, c-format
 msgid "Editing existing '%s' connection: '%s'"
 msgstr "既存の '%s' 接続を編集中: '%s'"
 
-#: ../clients/cli/connections.c:7686
+#: ../clients/cli/connections.c:10075
 #, c-format
 msgid "Adding a new '%s' connection"
 msgstr "新規の '%s' 接続を追加中"
 
-#: ../clients/cli/connections.c:7688
+#: ../clients/cli/connections.c:10077
 #, c-format
 msgid "Type 'help' or '?' for available commands."
 msgstr "使用できるコマンドを表示するには 'help' または '?' を入力します。"
 
-#: ../clients/cli/connections.c:7690
+#: ../clients/cli/connections.c:10079
 #, c-format
 msgid "Type 'describe [<setting>.<prop>]' for detailed property description."
-msgstr ""
-"プロパティ詳細を表示するには 'describe [<setting>.<prop>]' を入力します。"
+msgstr "プロパティ詳細を表示するには 'describe [<setting>.<prop>]' を入力します。"
 
-#: ../clients/cli/connections.c:7728
-#, fuzzy, c-format
+#: ../clients/cli/connections.c:10117
+#, c-format
 msgid "Error: Failed to modify connection '%s': %s"
-msgstr "エラー: 接続 '%s' の変更に失敗しました: (%d) %s"
+msgstr "エラー: 接続 '%s' の変更に失敗しました: %s"
 
-#: ../clients/cli/connections.c:7735
+#: ../clients/cli/connections.c:10124
 #, c-format
 msgid "Connection '%s' (%s) successfully modified.\n"
 msgstr "接続 '%s' (%s) が正常に変更されました。\n"
 
-#.
-#. * TODO(?) complete "uuid", "path", "id" or connection name.
-#. * (if we ever will move this here from shell completion script)
-#. if (nmc->complete) {
-#. quit ();
-#.
-#: ../clients/cli/connections.c:7761 ../clients/cli/connections.c:7885
-#: ../clients/cli/connections.c:8280 ../clients/cli/connections.c:8399
+#: ../clients/cli/connections.c:10146 ../clients/cli/connections.c:10262
+#: ../clients/cli/connections.c:10639 ../clients/cli/connections.c:10747
 #, c-format
 msgid "Error: No arguments provided."
 msgstr "エラー: 引数がありません。"
 
-#: ../clients/cli/connections.c:7847
+#: ../clients/cli/connections.c:10165 ../clients/cli/connections.c:10294
+#: ../clients/cli/connections.c:10776
+#, c-format
+msgid "Error: connection ID is missing."
+msgstr "エラー: 接続 ID がありません。"
+
+#: ../clients/cli/connections.c:10228
 #, c-format
 msgid "%s (%s) cloned as %s (%s).\n"
-msgstr ""
+msgstr "%s (%s) が %s (%s) としてクローンされました。\n"
 
-#: ../clients/cli/connections.c:7883
-#, fuzzy
+#: ../clients/cli/connections.c:10260
 msgid "New connection name: "
-msgstr "新規の接続"
+msgstr "新規の接続名:"
 
-#: ../clients/cli/connections.c:7904 ../clients/cli/connections.c:7922
+#: ../clients/cli/connections.c:10281 ../clients/cli/connections.c:10299
 #, c-format
 msgid "Error: <new name> argument is missing."
 msgstr "エラー: <new name> 引数がありません。"
 
-#: ../clients/cli/connections.c:7910
-#, fuzzy, c-format
+#: ../clients/cli/connections.c:10287
+#, c-format
 msgid "Error: unexpected extra argument '%s'."
-msgstr "エラー: 予期しない引数 '%s' です"
+msgstr "エラー: 予期しない追加の引数 '%s' です。"
 
-#: ../clients/cli/connections.c:7917 ../clients/cli/connections.c:8428
+#: ../clients/cli/connections.c:10356
 #, c-format
-msgid "Error: connection ID is missing."
-msgstr "エラー: 接続 ID がありません。"
-
-#: ../clients/cli/connections.c:7979
-#, fuzzy, c-format
 msgid "Error: not all connections deleted."
-msgstr "エラー: 接続が指定されていません。"
+msgstr "エラー: 一部の接続が削除されていません。"
 
-#: ../clients/cli/connections.c:7980
+#: ../clients/cli/connections.c:10357
 #, c-format
 msgid "Error: Connection deletion failed: %s"
 msgstr "エラー: 接続の削除に失敗しました: %s"
 
-#: ../clients/cli/connections.c:8046 ../clients/cli/connections.c:8179
+#: ../clients/cli/connections.c:10419 ../clients/cli/connections.c:10547
 #, c-format
 msgid "Error: unknown connection '%s'\n"
 msgstr "エラー: 不明な接続 '%s'\n"
 
-#: ../clients/cli/connections.c:8060
+#: ../clients/cli/connections.c:10433
 #, c-format
 msgid "Error: no connection provided."
 msgstr "エラー: 接続がありません。"
 
 #. truncate trailing ", "
-#: ../clients/cli/connections.c:8085
+#: ../clients/cli/connections.c:10458
 #, c-format
 msgid "Error: cannot delete unknown connection(s): %s."
 msgstr "エラー: 不明な接続を削除できません: %s。"
 
-#: ../clients/cli/connections.c:8097
-#, fuzzy, c-format
+#: ../clients/cli/connections.c:10470
+#, c-format
 msgid "%s: connection profile changed\n"
-msgstr "接続に失敗"
+msgstr "%s: 接続プロファイルが変更されました\n"
 
-#: ../clients/cli/connections.c:8123
-#, fuzzy, c-format
+#: ../clients/cli/connections.c:10496
+#, c-format
 msgid "%s: connection profile created\n"
-msgstr "接続に失敗"
+msgstr "%s: 接続プロファイルが作成されました\n"
 
-#: ../clients/cli/connections.c:8132
-#, fuzzy, c-format
+#: ../clients/cli/connections.c:10505
+#, c-format
 msgid "%s: connection profile removed\n"
-msgstr "接続は削除されました"
+msgstr "%s: 接続プロファイルが削除されました\n"
 
-#: ../clients/cli/connections.c:8180
-#, fuzzy, c-format
+#: ../clients/cli/connections.c:10548
+#, c-format
 msgid "Error: not all connections found."
-msgstr "エラー: '%s' は有効な '接続' コマンドではありません。"
+msgstr "エラー: 一部の接続が見つかりません。"
 
-#: ../clients/cli/connections.c:8205
-#, fuzzy, c-format
+#: ../clients/cli/connections.c:10571
+#, c-format
 msgid "Error: failed to reload connections: %s."
-msgstr "エラー: '%s' 接続の追加に失敗しました: (%d) %s"
+msgstr "エラー: 接続のリロードに失敗しました: %s。"
 
-#: ../clients/cli/connections.c:8239
-#, fuzzy, c-format
+#: ../clients/cli/connections.c:10603
+#, c-format
 msgid "Error: failed to load connection: %s."
-msgstr "エラー: '%s' 接続の追加に失敗しました: (%d) %s"
+msgstr "エラー: 接続のロードに失敗しました: %s。"
 
-#: ../clients/cli/connections.c:8247
+#: ../clients/cli/connections.c:10611
 #, c-format
 msgid "Could not load file '%s'\n"
 msgstr "'%s' ファイルを読み込めませんでした。\n"
 
-#: ../clients/cli/connections.c:8256
-#, fuzzy
+#: ../clients/cli/connections.c:10620
 msgid "File to import: "
-msgstr "暗号化に失敗しました: %d"
+msgstr "インポートするファイル:"
 
-#: ../clients/cli/connections.c:8296
+#: ../clients/cli/connections.c:10655
 #, c-format
 msgid "Warning: 'type' already specified, ignoring extra one.\n"
-msgstr ""
+msgstr "警告: 'type' はすでに指定されています。追加のものは無視されます。\n"
 
-#: ../clients/cli/connections.c:8307
+#: ../clients/cli/connections.c:10666
 #, c-format
 msgid "Warning: 'file' already specified, ignoring extra one.\n"
-msgstr ""
+msgstr "警告: 'file' はすでに指定されています。追加のものは無視されます。\n"
 
-#: ../clients/cli/connections.c:8309
-#, fuzzy, c-format
+#: ../clients/cli/connections.c:10668
+#, c-format
 msgid "Unknown parameter: %s"
-msgstr "不明なパラメーター: %s\n"
+msgstr "不明なパラメーター: %s"
 
-#: ../clients/cli/connections.c:8319
+#: ../clients/cli/connections.c:10683
 #, c-format
-msgid "Error: 'type' argument is required."
-msgstr "エラー: 'タイプ' 引数が必要です。"
-
-#: ../clients/cli/connections.c:8324
-#, fuzzy, c-format
 msgid "Error: 'file' argument is required."
-msgstr "エラー: 「ifname」引数を入力してください。"
+msgstr "エラー: 'file' 引数が必要です。"
 
-#: ../clients/cli/connections.c:8331
-#, fuzzy, c-format
-msgid "Error: failed to find VPN plugin for %s."
-msgstr "エラー: %s.%s の変更に失敗しました: %s。"
-
-#: ../clients/cli/connections.c:8339 ../clients/cli/connections.c:8450
-#, fuzzy, c-format
+#: ../clients/cli/connections.c:10691 ../clients/cli/connections.c:10798
+#, c-format
 msgid "Error: failed to load VPN plugin: %s."
-msgstr "エラー: %s.%s の変更に失敗しました: %s。"
+msgstr "エラー: VPN プラグインのロードに失敗しました: %s。"
 
-#: ../clients/cli/connections.c:8347
-#, fuzzy, c-format
+#: ../clients/cli/connections.c:10699
+#, c-format
 msgid "Error: failed to import '%s': %s."
-msgstr "エラー: %s.%s の変更に失敗しました: %s。"
+msgstr "エラー: '%s' のインポートに失敗しました: %s。"
 
-#: ../clients/cli/connections.c:8397
-#, fuzzy
+#: ../clients/cli/connections.c:10745
 msgid "Output file name: "
-msgstr "ファイル名"
+msgstr "出力ファイル名:"
 
-#: ../clients/cli/connections.c:8421
-#, fuzzy, c-format
+#: ../clients/cli/connections.c:10769
+#, c-format
 msgid "Error: unknown extra argument: '%s'."
-msgstr "エラー:  '%s' は無効な追加引数です。"
+msgstr "エラー: 不明な追加の引数: '%s'。"
 
-#: ../clients/cli/connections.c:8441
-#, fuzzy, c-format
+#: ../clients/cli/connections.c:10789
+#, c-format
 msgid "Error: the connection is not VPN."
-msgstr "エラー: 接続は無効です: %s\n"
+msgstr "エラー: 接続は VPN ではありません。"
 
-#: ../clients/cli/connections.c:8462
-#, fuzzy, c-format
+#: ../clients/cli/connections.c:10810
+#, c-format
 msgid "Error: failed to create temporary file %s."
-msgstr "一時ファイルを作成できませんでした: %s"
+msgstr "エラー: 一時ファイル %s の作成に失敗しました。"
 
-#: ../clients/cli/connections.c:8471
-#, fuzzy, c-format
+#: ../clients/cli/connections.c:10819
+#, c-format
 msgid "Error: failed to export '%s': %s."
-msgstr "エラー: '%s' プロパティの設定に失敗しました: %s\n"
+msgstr "エラー: '%s' のエクスポートに失敗しました: %s。"
 
-#: ../clients/cli/connections.c:8482
-#, fuzzy, c-format
+#: ../clients/cli/connections.c:10830
+#, c-format
 msgid "Error: failed to read temporary file '%s': %s."
-msgstr "エラー: '%s' の値の削除に失敗しました: %s\n"
+msgstr "エラー: 一時ファイル '%s' の読み取りに失敗しました: %s。"
 
-#: ../clients/cli/connections.c:8628
+#: ../clients/cli/connections.c:10976
 #, c-format
 msgid "incorrect string '%s' of '--order' option"
-msgstr ""
+msgstr "'--order' オプションの正しくない文字列 '%s'"
 
-#: ../clients/cli/connections.c:8654
+#: ../clients/cli/connections.c:11002
 #, c-format
 msgid "incorrect item '%s' in '--order' option"
-msgstr ""
+msgstr "'--order' オプションの正しくないアイテム '%s'"
 
-#: ../clients/cli/connections.c:8740
+#: ../clients/cli/connections.c:11089
 msgid "'--order' argument is missing"
 msgstr "'--order' 引数がありません"
 
-#: ../clients/cli/connections.c:8816
+#: ../clients/cli/connections.c:11154
 #, c-format
 msgid "Error: '%s' is not valid 'connection' command."
 msgstr "エラー: '%s' は有効な '接続' コマンドではありません。"
@@ -3255,7 +3701,6 @@ msgid "Interface: "
 msgstr "インターフェース: "
 
 #: ../clients/cli/devices.c:36
-#, fuzzy
 msgid "Interface(s): "
 msgstr "インターフェース: "
 
@@ -3273,9 +3718,8 @@ msgstr "接続 UUID"
 
 #. 2
 #: ../clients/cli/devices.c:58
-#, fuzzy
 msgid "NM-TYPE"
-msgstr "タイプ"
+msgstr "NM-TYPE"
 
 #. 3
 #: ../clients/cli/devices.c:59
@@ -3333,7 +3777,7 @@ msgstr "IP-IFACE"
 #. 2
 #: ../clients/cli/devices.c:70 ../clients/cli/devices.c:102
 msgid "IS-SOFTWARE"
-msgstr ""
+msgstr "IS-SOFTWARE"
 
 #. 15
 #: ../clients/cli/devices.c:71
@@ -3348,17 +3792,17 @@ msgstr "ファームウェア不足"
 #. 18
 #: ../clients/cli/devices.c:74
 msgid "NM-PLUGIN-MISSING"
-msgstr ""
+msgstr "NM-PLUGIN-MISSING"
 
 #. 19
 #: ../clients/cli/devices.c:75
 msgid "PHYS-PORT-ID"
-msgstr ""
+msgstr "PHYS-PORT-ID"
 
 #. 23
 #: ../clients/cli/devices.c:79
 msgid "METERED"
-msgstr ""
+msgstr "METERED"
 
 #. 0
 #: ../clients/cli/devices.c:90
@@ -3388,10 +3832,10 @@ msgstr "キャリア"
 #. 1
 #: ../clients/cli/devices.c:112
 msgid "S390-SUBCHANNELS"
-msgstr ""
+msgstr "S390-SUBCHANNELS"
 
 #. 0
-#: ../clients/cli/devices.c:121 ../clients/cli/devices.c:741
+#: ../clients/cli/devices.c:121 ../clients/cli/devices.c:731
 msgid "WEP"
 msgstr "WEP"
 
@@ -3401,7 +3845,7 @@ msgid "WPA"
 msgstr "WPA"
 
 #. 2
-#: ../clients/cli/devices.c:123 ../clients/cli/devices.c:749
+#: ../clients/cli/devices.c:123 ../clients/cli/devices.c:739
 msgid "WPA2"
 msgstr "WPA2"
 
@@ -3417,7 +3861,7 @@ msgstr "CCMP"
 
 #. 5
 #. 2
-#: ../clients/cli/devices.c:126 ../clients/cli/devices.c:238
+#: ../clients/cli/devices.c:126 ../clients/cli/devices.c:228
 msgid "AP"
 msgstr "AP"
 
@@ -3429,12 +3873,12 @@ msgstr "アドホック"
 #. 7
 #: ../clients/cli/devices.c:128
 msgid "2GHZ"
-msgstr ""
+msgstr "2GHZ"
 
 #. 8
 #: ../clients/cli/devices.c:129
 msgid "5GHZ"
-msgstr ""
+msgstr "5GHZ"
 
 #. 0
 #: ../clients/cli/devices.c:138
@@ -3461,6 +3905,11 @@ msgstr "TX-POW"
 msgid "BSID"
 msgstr "BSID"
 
+#. 0
+#: ../clients/cli/devices.c:151 ../clients/tui/nmt-page-wifi.c:224
+msgid "SSID"
+msgstr "SSID"
+
 #. 1
 #: ../clients/cli/devices.c:152
 msgid "SSID-HEX"
@@ -3524,157 +3973,142 @@ msgstr "*"
 
 #. 0
 #. 5
-#: ../clients/cli/devices.c:177 ../clients/cli/devices.c:241
+#: ../clients/cli/devices.c:177 ../clients/cli/devices.c:231
 msgid "NSP"
 msgstr "NSP"
 
 #. 0
-#: ../clients/cli/devices.c:192 ../clients/cli/devices.c:201
+#: ../clients/cli/devices.c:192
 msgid "SLAVES"
 msgstr "スレーブ"
 
-#. 1
-#: ../clients/cli/devices.c:202
-msgid "CONFIG"
-msgstr ""
-
 #. 0
-#: ../clients/cli/devices.c:211
+#: ../clients/cli/devices.c:201
 msgid "PARENT"
-msgstr ""
+msgstr "PARENT"
 
 #. 1
-#: ../clients/cli/devices.c:212
+#: ../clients/cli/devices.c:202
 msgid "ID"
 msgstr "ID"
 
 #. 0
-#: ../clients/cli/devices.c:221 ../clients/cli/devices.c:236
+#: ../clients/cli/devices.c:211 ../clients/cli/devices.c:226
 msgid "CAPABILITIES"
 msgstr "能力"
 
 #. 1
-#: ../clients/cli/devices.c:237
+#: ../clients/cli/devices.c:227
 msgid "WIFI-PROPERTIES"
 msgstr "WIFI-プロパティ"
 
 #. 3
-#: ../clients/cli/devices.c:239
+#: ../clients/cli/devices.c:229
 msgid "WIRED-PROPERTIES"
 msgstr "有線接続-プロパティ"
 
 #. 4
-#: ../clients/cli/devices.c:240
+#: ../clients/cli/devices.c:230
 msgid "WIMAX-PROPERTIES"
 msgstr "WIMAX-プロパティ"
 
 #. 10
-#: ../clients/cli/devices.c:246 ../clients/tui/nmt-page-bond.c:351
+#: ../clients/cli/devices.c:236 ../clients/tui/nmt-page-bond.c:351
 msgid "BOND"
 msgstr "ボンド"
 
 #. 11
-#: ../clients/cli/devices.c:247 ../clients/tui/nmt-page-team.c:145
+#: ../clients/cli/devices.c:237 ../clients/tui/nmt-page-team.c:145
 msgid "TEAM"
 msgstr "team"
 
 #. 12
-#: ../clients/cli/devices.c:248 ../clients/tui/nmt-page-bridge.c:74
+#: ../clients/cli/devices.c:238 ../clients/tui/nmt-page-bridge.c:74
 msgid "BRIDGE"
 msgstr "ブリッジ"
 
-#. 13
-#: ../clients/cli/devices.c:249 ../clients/tui/nm-editor-utils.c:217
-#: ../clients/tui/nmt-page-vlan.c:94 ../libnm-core/nm-connection.c:1746
-#: ../libnm-glib/nm-device.c:1879 ../libnm-util/nm-connection.c:1632
-#: ../libnm/nm-device.c:1830
-msgid "VLAN"
-msgstr "VLAN"
-
 #. 14
-#: ../clients/cli/devices.c:250
+#: ../clients/cli/devices.c:240
 msgid "BLUETOOTH"
 msgstr "BLUETOOTH"
 
 #. 15
-#: ../clients/cli/devices.c:251
+#: ../clients/cli/devices.c:241
 msgid "CONNECTIONS"
 msgstr "接続"
 
 #. 1
-#: ../clients/cli/devices.c:263
+#: ../clients/cli/devices.c:253
 msgid "CHASSIS-ID"
-msgstr ""
+msgstr "CHASSIS-ID"
 
 #. 2
-#: ../clients/cli/devices.c:264
+#: ../clients/cli/devices.c:254
 msgid "PORT-ID"
-msgstr ""
+msgstr "PORT-ID"
 
 #. 3
-#: ../clients/cli/devices.c:265
+#: ../clients/cli/devices.c:255
 msgid "PORT-DESCRIPTION"
-msgstr ""
+msgstr "PORT-DESCRIPTION"
 
 #. 4
-#: ../clients/cli/devices.c:266
-#, fuzzy
+#: ../clients/cli/devices.c:256
 msgid "SYSTEM-NAME"
-msgstr "ユーザー名"
+msgstr "SYSTEM-NAME"
 
 #. 5
-#: ../clients/cli/devices.c:267
+#: ../clients/cli/devices.c:257
 msgid "SYSTEM-DESCRIPTION"
-msgstr ""
+msgstr "SYSTEM-DESCRIPTION"
 
 #. 6
-#: ../clients/cli/devices.c:268
-#, fuzzy
+#: ../clients/cli/devices.c:258
 msgid "SYSTEM-CAPABILITIES"
-msgstr "能力"
+msgstr "SYSTEM-CAPABILITIES"
 
 #. 7
-#: ../clients/cli/devices.c:269
+#: ../clients/cli/devices.c:259
 msgid "IEEE-802-1-PVID"
-msgstr ""
+msgstr "IEEE-802-1-PVID"
 
 #. 8
-#: ../clients/cli/devices.c:270
+#: ../clients/cli/devices.c:260
 msgid "IEEE-802-1-PPVID"
-msgstr ""
+msgstr "IEEE-802-1-PPVID"
 
 #. 9
-#: ../clients/cli/devices.c:271
+#: ../clients/cli/devices.c:261
 msgid "IEEE-802-1-PPVID-FLAGS"
-msgstr ""
+msgstr "IEEE-802-1-PPVID-FLAGS"
 
 #. 10
-#: ../clients/cli/devices.c:272
+#: ../clients/cli/devices.c:262
 msgid "IEEE-802-1-VID"
-msgstr ""
+msgstr "IEEE-802-1-VID"
 
 #. 11
-#: ../clients/cli/devices.c:273
+#: ../clients/cli/devices.c:263
 msgid "IEEE-802-1-VLAN-NAME"
-msgstr ""
+msgstr "IEEE-802-1-VLAN-NAME"
 
 #. 12
-#: ../clients/cli/devices.c:274
+#: ../clients/cli/devices.c:264
 msgid "DESTINATION"
-msgstr ""
+msgstr "DESTINATION"
 
 #. 13
-#: ../clients/cli/devices.c:275
+#: ../clients/cli/devices.c:265
 msgid "CHASSIS-ID-TYPE"
-msgstr ""
+msgstr "CHASSIS-ID-TYPE"
 
 #. 14
-#: ../clients/cli/devices.c:276
+#: ../clients/cli/devices.c:266
 msgid "PORT-ID-TYPE"
-msgstr ""
+msgstr "PORT-ID-TYPE"
 
-#: ../clients/cli/devices.c:293
-#, fuzzy, c-format
+#: ../clients/cli/devices.c:283
+#, c-format
 msgid ""
 "Usage: nmcli device { COMMAND | help }\n"
 "\n"
@@ -3689,7 +4123,7 @@ msgid ""
 "\n"
 "  connect <ifname>\n"
 "\n"
-"  reapply <ifname>\n"
+"  reapply <ifname> ...\n"
 "\n"
 "  disconnect <ifname> ...\n"
 "\n"
@@ -3714,30 +4148,41 @@ msgid ""
 msgstr ""
 "使い方: nmcli device { コマンド | help }\n"
 "\n"
-"コマンド := { status | show | connect | disconnect | wifi | wimax }\n"
-"\n"
-"コマンド := { status | show | connect | disconnect | wifi }\n"
+"コマンド := { status | show | connect | reapply | disconnect | delete | monitor "
+"| wifi | lldp }\n"
 "\n"
 "  status\n"
 "\n"
 "  show [<ifname>]\n"
 "\n"
+"  set [ifname] <ifname> [autoconnect yes|no] [managed yes|no]\n"
+"\n"
 "  connect <ifname>\n"
 "\n"
-"  disconnect <ifname>\n"
+"  reapply <ifname> ...\n"
+"\n"
+"  disconnect <ifname> ...\n"
+"\n"
+"  delete <ifname> ...\n"
+"\n"
+"  monitor <ifname> ...\n"
 "\n"
 "  wifi [list [ifname <ifname>] [bssid <BSSID>]]\n"
 "\n"
 "  wifi connect <(B)SSID> [password <パスワード>] [wep-key-type key|phrase] "
 "[ifname <ifname>]\n"
-"                         [bssid <BSSID>] [name <名前>] [private yes|no]\n"
+"                         [bssid <BSSID>] [name <名前>] [private yes|no] "
+"[hidden yes|no]\n"
+"\n"
+"  wifi hotspot [ifname <ifname>] [con-name <名前>] [ssid <SSID>] [band a|bg] "
+"[channel <チャネル>] [password <パスワード>]\n"
 "\n"
-"  wifi rescan [[ifname] <ifname>]\n"
+"  wifi rescan [ifname <ifname>] [[ssid <スキャンする SSID>] ...]\n"
 "\n"
-"  wimax [list [ifname <ifname>] [nsp <名前>]]\n"
+"  lldp [list [ifname <ifname>]]\n"
 "\n"
 
-#: ../clients/cli/devices.c:315
+#: ../clients/cli/devices.c:305
 #, c-format
 msgid ""
 "Usage: nmcli device status { help }\n"
@@ -3748,10 +4193,8 @@ msgid ""
 " TYPE       - device type\n"
 " STATE      - device state\n"
 " CONNECTION - connection activated on device (if any)\n"
-"Displayed columns can be changed using '--fields' global option. 'status' "
-"is\n"
-"the default command, which means 'nmcli device' calls 'nmcli device "
-"status'.\n"
+"Displayed columns can be changed using '--fields' global option. 'status' is\n"
+"the default command, which means 'nmcli device' calls 'nmcli device status'.\n"
 "\n"
 msgstr ""
 "使い方: nmcli device status { help }\n"
@@ -3762,13 +4205,12 @@ msgstr ""
 " タイプ       - デバイスタイプ\n"
 " 状態      - デバイスの状態\n"
 " 接続 - デバイス上でアクティブにしている接続があればそれを表示\n"
-"'--fields' グローバルオプションを使用すると表示させる項目を変更することができ"
-"ます。\n"
-"'status' はデフォルトのコマンドで、'nmcli device' を実行すると 'nmcli device "
-"status' を実行したことになります。\n"
+"'--fields' グローバルオプションを使用すると表示させる項目を変更することができます。\n"
+"'status' はデフォルトのコマンドで、'nmcli device' を実行すると 'nmcli device status' "
+"を実行したことになります。\n"
 "\n"
 
-#: ../clients/cli/devices.c:330
+#: ../clients/cli/devices.c:320
 #, c-format
 msgid ""
 "Usage: nmcli device show { ARGUMENTS | help }\n"
@@ -3787,7 +4229,7 @@ msgstr ""
 "このコマンドですべてのデバイスまたは指定デバイスの詳細を表示させます。\n"
 "\n"
 
-#: ../clients/cli/devices.c:341
+#: ../clients/cli/devices.c:331
 #, c-format
 msgid ""
 "Usage: nmcli device connect { ARGUMENTS | help }\n"
@@ -3795,8 +4237,8 @@ msgid ""
 "ARGUMENTS := <ifname>\n"
 "\n"
 "Connect the device.\n"
-"NetworkManager will try to find a suitable connection that will be "
-"activated.\n"
+"NetworkManager will try to find a suitable connection that will be activated."
+"\n"
 "It will also consider connections that are not set to auto-connect.\n"
 "\n"
 msgstr ""
@@ -3809,28 +4251,27 @@ msgstr ""
 "auto-connect に設定されていない接続についても考慮されます。\n"
 "\n"
 
-#: ../clients/cli/devices.c:353
-#, fuzzy, c-format
+#: ../clients/cli/devices.c:343
+#, c-format
 msgid ""
 "Usage: nmcli device reapply { ARGUMENTS | help }\n"
 "\n"
-"ARGUMENTS := <ifname>\n"
+"ARGUMENTS := <ifname> ...\n"
 "\n"
 "Attempts to update device with changes to the currently active connection\n"
 "made since it was last applied.\n"
 "\n"
 msgstr ""
-"使い方: nmcli device disconnect { 引数 | help }\n"
+"使い方: nmcli device reapply { 引数 | help }\n"
 "\n"
-"引数 := <ifname>\n"
+"引数 := <ifname> ...\n"
 "\n"
-"デバイスの接続を切断します。\n"
-"デバイスの接続を切断することにより、これ以上手作業による切断処理を\n"
-"行わずとも自動アクティベートによる接続が行われないようにします。\n"
+"変更が最後に適用されてから現在アクティブな接続に対して行われた変更\n"
+"でデバイスの更新を試行します。\n"
 "\n"
 
-#: ../clients/cli/devices.c:364
-#, fuzzy, c-format
+#: ../clients/cli/devices.c:354
+#, c-format
 msgid ""
 "Usage: nmcli device disconnect { ARGUMENTS | help }\n"
 "\n"
@@ -3843,15 +4284,15 @@ msgid ""
 msgstr ""
 "使い方: nmcli device disconnect { 引数 | help }\n"
 "\n"
-"引数 := <ifname>\n"
+"引数 := <ifname> ...\n"
 "\n"
 "デバイスの接続を切断します。\n"
-"デバイスの接続を切断することにより、これ以上手作業による切断処理を\n"
-"行わずとも自動アクティベートによる接続が行われないようにします。\n"
+"このコマンドにより、デバイスの接続が切断され、ユーザーまたは手作業による介入なしで\n"
+"それ以降の接続が自動アクティベートされることが防がれます。\n"
 "\n"
 
-#: ../clients/cli/devices.c:376
-#, fuzzy, c-format
+#: ../clients/cli/devices.c:366
+#, c-format
 msgid ""
 "Usage: nmcli device delete { ARGUMENTS | help }\n"
 "\n"
@@ -3863,15 +4304,17 @@ msgid ""
 "command.\n"
 "\n"
 msgstr ""
-"使い方: nmcli device show { 引数 | help }\n"
+"使い方: nmcli device delete { 引数 | help }\n"
 "\n"
-"引数 := [<ifname>]\n"
+"引数 := <ifname> ...\n"
 "\n"
-"デバイスの詳細を表示します。\n"
-"このコマンドですべてのデバイスまたは指定デバイスの詳細を表示させます。\n"
+"ソフトウェアデバイスを削除します。\n"
+"このコマンドにより、インターフェースが削除されます。ソフトウェアデバイス\n"
+"(ボンドやブリッジなど) にのみ有効です。ハードウェアデバイスはこの\n"
+"コマンドで削除できません。\n"
 "\n"
 
-#: ../clients/cli/devices.c:389
+#: ../clients/cli/devices.c:379
 #, c-format
 msgid ""
 "Usage: nmcli device set { ARGUMENTS | help }\n"
@@ -3884,9 +4327,18 @@ msgid ""
 "Modify device properties.\n"
 "\n"
 msgstr ""
+"使い方: nmcli device set { 引数 | help }\n"
+"\n"
+"引数 := デバイス { プロパティー [ プロパティー ... ] }\n"
+"デバイス    := [ifname] <ifname> \n"
+"プロパティー  := { autoconnect { yes | no } |\n"
+"             { managed { yes | no }\n"
+"\n"
+"デバイスプロパティーを変更します。\n"
+"\n"
 
-#: ../clients/cli/devices.c:402
-#, fuzzy, c-format
+#: ../clients/cli/devices.c:392
+#, c-format
 msgid ""
 "Usage: nmcli device monitor { ARGUMENTS | help }\n"
 "\n"
@@ -3897,16 +4349,17 @@ msgid ""
 "Monitors all devices in case no interface is specified.\n"
 "\n"
 msgstr ""
-"使い方: nmcli device show { 引数 | help }\n"
+"使い方: nmcli device monitor { 引数 | help }\n"
 "\n"
-"引数 := [<ifname>]\n"
+"引数 := [<ifname>] ...\n"
 "\n"
-"デバイスの詳細を表示します。\n"
-"このコマンドですべてのデバイスまたは指定デバイスの詳細を表示させます。\n"
+"デバイスアクティビティーを監視します。\n"
+"このコマンドにより、指定されたデバイスの状態が変わるたびに行が出力されます。\n"
+"インターフェースが指定されない場合は、すべてのデバイスを監視します。\n"
 "\n"
 
-#: ../clients/cli/devices.c:414
-#, fuzzy, c-format
+#: ../clients/cli/devices.c:404
+#, c-format
 msgid ""
 "Usage: nmcli device wifi { ARGUMENTS | help }\n"
 "\n"
@@ -3917,8 +4370,8 @@ msgid ""
 "List available Wi-Fi access points. The 'ifname' and 'bssid' options can be\n"
 "used to list APs for a particular interface, or with a specific BSSID.\n"
 "\n"
-"ARGUMENTS := connect <(B)SSID> [password <password>] [wep-key-type key|"
-"phrase] [ifname <ifname>]\n"
+"ARGUMENTS := connect <(B)SSID> [password <password>] [wep-key-type "
+"key|phrase] [ifname <ifname>]\n"
 "                    [bssid <BSSID>] [name <name>] [private yes|no] [hidden "
 "yes|no]\n"
 "\n"
@@ -3947,10 +4400,8 @@ msgid ""
 "\n"
 "ARGUMENTS := rescan [ifname <ifname>] [[ssid <SSID to scan>] ...]\n"
 "\n"
-"Request that NetworkManager immediately re-scan for available access "
-"points.\n"
-"NetworkManager scans Wi-Fi networks periodically, but in some cases it "
-"might\n"
+"Request that NetworkManager immediately re-scan for available access points.\n"
+"NetworkManager scans Wi-Fi networks periodically, but in some cases it might\n"
 "be useful to start scanning manually. 'ssid' allows scanning for a specific\n"
 "SSID, which is useful for APs with hidden SSIDs. More 'ssid' parameters can "
 "be\n"
@@ -3964,574 +4415,565 @@ msgstr ""
 "\n"
 "引数 := [list [ifname <ifname>] [bssid <BSSID>]]\n"
 "\n"
-"使用可能な Wi-Fi アクセスポイントを一覧表示します。'ifname' と 'bssid' を使用"
-"すると、\n"
-"特定のインターフェース用、または指定 BSSID を持つ AP を表示することができま"
-"す。 \n"
+"使用可能な Wi-Fi アクセスポイントを一覧表示します。'ifname' オプションと 'bssid' オプションを使用すると、\n"
+"特定のインターフェース用の AP または特定の BSSID を持つ AP を一覧表示することができます。\n"
 "\n"
-"引数 := connect <(B)SSID> [password <パスワード>] [wep-key-type key|phrase] "
-"[ifname <ifname>]\n"
-"                    [bssid <BSSID>] [name <名前>] [private yes|no]\n"
-"\n"
-"SSID や BSSID で指定した Wi-Fi ネットワークへ接続します。コマンドにより新規"
-"の\n"
-"接続が作成され、デバイス上でアクティベートされます。このコマンドは、GUI \n"
-"クライアントで SSID をクリックした場合と同じ動作になります。常に新規の接続"
-"を\n"
-"作成するため、主に新規の Wi-Fi ネットワークに接続する場合に役に立つコマンドで"
-"す。\n"
-"ネットワーク用の接続がすでに存在する場合には、「nmcli con up id <名前>」を"
-"使って\n"
-"既存のプロファイルを立ち上げた方がよいでしょう。現時点でサポートされているの"
-"は \n"
-"WEP ネットワークおよび WPA-PSK  ネットワークのみのため注意してください。ま"
-"た、\n"
+"引数 := connect <(B)SSID> [password <パスワード>] [wep-key-type key|phrase] [ifname "
+"<ifname>]\n"
+"                    [bssid <BSSID>] [name <名前>] [private yes|no] [hidden "
+"yes|no]\n"
+"\n"
+"SSID または BSSID で指定した Wi-Fi ネットワークへ接続します。このコマンドにより新規の\n"
+"接続が作成され、デバイス上でアクティベートされます。これは、GUI\n"
+"クライアントで SSID をクリックした場合と同じ動作になります。常に新規の接続が\n"
+"作成されるため、主に新規の Wi-Fi ネットワークに接続する場合に役に立ちます。\n"
+"ネットワーク用の接続がすでに存在する場合は、「nmcli con up id <名前>」を使って\n"
+"既存のプロファイルを有効にすることが推奨されます。現時点でサポートされているのはオープンな\n"
+"WEP ネットワークおよび WPA-PSK  ネットワークのみであることに注意してください。また、\n"
 "IP 設定は DHCP で取得されるとみなされます。\n"
 "\n"
-"引数 := rescan [[ifname] <ifname>]\n"
+"ARGUMENTS := wifi hotspot [ifname <ifname>] [con-name <name>] [ssid <SSID>]\n"
+"                          [band a|bg] [channel <channel>] [password "
+"<password>]\n"
 "\n"
-"NetworkManager に使用可能なアクセスポイントの再スキャンを手動リクエストしま"
-"す。\n"
-"NetworkManager による Wi-Fi ネットワークのスキャンは定期的に行われますが、手"
-"作業に\n"
-"よるスキャンの開始を行うと便利な場合があります。このコマンドでは AP は表示さ"
-"れない\n"
-"ので注意してください。AP を表示させる場合は「nmcli device wifi list」を使用し"
-"ます。\n"
+"Create a Wi-Fi hotspot. Use 'connection down' or 'device disconnect'\n"
+"to stop the hotspot.\n"
+"Parameters of the hotspot can be influenced by the optional parameters:\n"
+"ifname - Wi-Fi device to use\n"
+"con-name - name of the created hotspot connection profile\n"
+"ssid - SSID of the hotspot\n"
+"band - Wi-Fi band to use\n"
+"channel - Wi-Fi channel to use\n"
+"password - password to use for the hotspot\n"
+"\n"
+"ARGUMENTS := rescan [ifname <ifname>] [[ssid <SSID to scan>] ...]\n"
+"\n"
+"Request that NetworkManager immediately re-scan for available access points.\n"
+"NetworkManager scans Wi-Fi networks periodically, but in some cases it might\n"
+"be useful to start scanning manually. 'ssid' allows scanning for a specific\n"
+"SSID, which is useful for APs with hidden SSIDs. More 'ssid' parameters can "
+"be\n"
+"given. Note that this command does not show the APs,\n"
+"use 'nmcli device wifi list' for that.\n"
 "\n"
 
-#: ../clients/cli/devices.c:461
-#, fuzzy, c-format
+#: ../clients/cli/devices.c:451
+#, c-format
 msgid ""
 "Usage: nmcli device lldp { ARGUMENTS | help }\n"
 "\n"
 "ARGUMENTS := [list [ifname <ifname>]]\n"
 "\n"
-"List neighboring devices discovered through LLDP. The 'ifname' option can "
-"be\n"
+"List neighboring devices discovered through LLDP. The 'ifname' option can be\n"
 "used to list neighbors for a particular interface.\n"
 "\n"
 msgstr ""
-"使い方: nmcli device wimax { 引数 | help }\n"
+"使い方: nmcli device lldp { 引数 | help }\n"
 "\n"
-"WiMAX デバイス上での操作を行います。\n"
+"引数 := [list [ifname <ifname>]]\n"
 "\n"
-"引数 := [list [ifname <ifname>] [nsp <名前>]]\n"
-"\n"
-"使用可能な WiMAX NSP を一覧表示します。'ifname' および 'nsp' オプションを使用"
-"すると特定\n"
-"のインターフェース用や指定 NSP を持つネットワーク一覧を表示させることができま"
-"す。\n"
+"LLDP を介して検出された近接デバイスを一覧表示します。'ifname' オプションを使用すると、\n"
+"特定のインターフェースの近接デバイスを一覧表示できます。\n"
 "\n"
 
-#: ../clients/cli/devices.c:537 ../clients/cli/devices.c:1756
-#: ../clients/cli/devices.c:1765 ../clients/cli/devices.c:1956
-#: ../clients/cli/devices.c:2161 ../clients/cli/devices.c:2168
+#: ../clients/cli/devices.c:527 ../clients/cli/devices.c:1676
+#: ../clients/cli/devices.c:1685 ../clients/cli/devices.c:1879
+#: ../clients/cli/devices.c:2103 ../clients/cli/devices.c:2110
 #, c-format
 msgid "Error: No interface specified."
 msgstr "エラー: インターフェースが指定されていません。"
 
-#: ../clients/cli/devices.c:557
+#: ../clients/cli/devices.c:547 ../clients/cli/devices.c:1899
 #, c-format
 msgid "Warning: argument '%s' is duplicated.\n"
-msgstr ""
+msgstr "警告: 引数 '%s' が重複しています。\n"
 
-#: ../clients/cli/devices.c:559
+#: ../clients/cli/devices.c:549 ../clients/cli/devices.c:1901
 #, c-format
 msgid "Error: Device '%s' not found.\n"
 msgstr "エラー: デバイス'%s' が見つかりません。\n"
 
-#: ../clients/cli/devices.c:560
-#, fuzzy, c-format
+#: ../clients/cli/devices.c:550 ../clients/cli/devices.c:1902
+#, c-format
 msgid "Error: not all devices found."
-msgstr "エラー: Wi-Fi デバイスが見つかりませんでした。"
+msgstr "エラー: 一部のデバイスが見つかりません。"
 
-#: ../clients/cli/devices.c:660 ../clients/cli/devices.c:811
+#: ../clients/cli/devices.c:650 ../clients/cli/devices.c:801
 msgid "(none)"
 msgstr "（なし）"
 
-#: ../clients/cli/devices.c:729
+#: ../clients/cli/devices.c:719
 #, c-format
 msgid "%u MHz"
 msgstr "%u MHz"
 
-#: ../clients/cli/devices.c:730
+#: ../clients/cli/devices.c:720
 #, c-format
 msgid "%u Mbit/s"
 msgstr "%u Mbit/s"
 
-#: ../clients/cli/devices.c:745
+#: ../clients/cli/devices.c:735
 msgid "WPA1"
 msgstr "WPA1"
 
-#: ../clients/cli/devices.c:754
+#: ../clients/cli/devices.c:744
 msgid "802.1X"
 msgstr "802.1X"
 
-#: ../clients/cli/devices.c:770
+#: ../clients/cli/devices.c:760
 msgid "Ad-Hoc"
 msgstr "アドホック"
 
-#: ../clients/cli/devices.c:771
+#: ../clients/cli/devices.c:761
 msgid "Infra"
 msgstr "インフラ"
 
-#: ../clients/cli/devices.c:772
+#: ../clients/cli/devices.c:762
 msgid "N/A"
 msgstr "なし"
 
-#: ../clients/cli/devices.c:996
+#: ../clients/cli/devices.c:916
 msgid "Device details"
 msgstr "デバイスの詳細"
 
-#: ../clients/cli/devices.c:1008
+#: ../clients/cli/devices.c:928
 #, c-format
 msgid "Error: 'device show': %s"
 msgstr "エラー: 'device show': %s"
 
-#: ../clients/cli/devices.c:1060 ../clients/cli/devices.c:1063
+#: ../clients/cli/devices.c:980 ../clients/cli/devices.c:983
 msgid "(unknown)"
 msgstr "(不明)"
 
-#: ../clients/cli/devices.c:1104
+#: ../clients/cli/devices.c:1024
 #, c-format
 msgid "%u Mb/s"
 msgstr "%u Mb/s"
 
-#: ../clients/cli/devices.c:1195
+#: ../clients/cli/devices.c:1115
 msgid "on"
 msgstr "オン"
 
-#: ../clients/cli/devices.c:1195
+#: ../clients/cli/devices.c:1115
 msgid "off"
 msgstr "オフ"
 
-#: ../clients/cli/devices.c:1422
+#: ../clients/cli/devices.c:1342
 #, c-format
 msgid "Error: 'device status': %s"
 msgstr "エラー: 'device status': %s"
 
 #. Add headers
-#: ../clients/cli/devices.c:1429
+#: ../clients/cli/devices.c:1349
 msgid "Status of devices"
 msgstr "デバイスの状態"
 
-#: ../clients/cli/devices.c:1460 ../clients/cli/devices.c:3570
+#: ../clients/cli/devices.c:1380 ../clients/cli/devices.c:3509
 #, c-format
 msgid "Error: invalid extra argument '%s'."
 msgstr "エラー:  '%s' は無効な追加引数です。"
 
-#: ../clients/cli/devices.c:1477 ../clients/cli/devices.c:1787
-#: ../clients/cli/devices.c:2184 ../clients/cli/devices.c:2454
-#: ../clients/cli/devices.c:3609
+#: ../clients/cli/devices.c:1397 ../clients/cli/devices.c:1707
+#: ../clients/cli/devices.c:2126 ../clients/cli/devices.c:2396
+#: ../clients/cli/devices.c:3548
 #, c-format
 msgid "Error: Device '%s' not found."
 msgstr "エラー: デバイス'%s' が見つかりません"
 
-#: ../clients/cli/devices.c:1555
-#, fuzzy, c-format
+#: ../clients/cli/devices.c:1475
+#, c-format
 msgid "Device '%s' successfully activated with '%s'.\n"
-msgstr "成功: デバイス '%s' は正常にアクティベートされました。"
+msgstr "デバイス '%s' が '%s' で正常にアクティベートされました。\n"
 
-#: ../clients/cli/devices.c:1561
+#: ../clients/cli/devices.c:1481
 #, c-format
 msgid "Error: Connection activation failed: (%d) %s.\n"
 msgstr "エラー: 接続のアクティベーションに失敗しました: (%d) %s.\n"
 
-#: ../clients/cli/devices.c:1597
+#: ../clients/cli/devices.c:1517
 #, c-format
 msgid "Error: Failed to setup a Wi-Fi hotspot: %s"
 msgstr "エラー: Wi-Fi hotspot の設定に失敗しました: %s"
 
-#: ../clients/cli/devices.c:1600
-#, fuzzy, c-format
+#: ../clients/cli/devices.c:1520
+#, c-format
 msgid "Error: Failed to add/activate new connection: %s"
-msgstr "エラー: 新規接続の追加、アクティベートに失敗しました: (%d) %s"
+msgstr "エラー: 新規接続の追加またはアクティベートに失敗しました: %s"
 
-#: ../clients/cli/devices.c:1610
+#: ../clients/cli/devices.c:1530
 #, c-format
 msgid "Error: Failed to setup a Wi-Fi hotspot"
 msgstr "エラー: Wi-Fi hotspot の設定に失敗しました"
 
-#: ../clients/cli/devices.c:1612
+#: ../clients/cli/devices.c:1532
 #, c-format
 msgid "Error: Failed to add/activate new connection: Unknown error"
 msgstr "エラー: 新規接続の追加、アクティベートに失敗しました: 不明なエラー"
 
-#: ../clients/cli/devices.c:1624
+#: ../clients/cli/devices.c:1544
 #, 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:1627
-#, fuzzy, c-format
+#: ../clients/cli/devices.c:1547
+#, c-format
 msgid "Hotspot '%s' activated on device '%s'\n"
-msgstr ""
-"UUID '%s' の接続が '%s' デバイス上に作成されアクティベートされました。\n"
+msgstr "ホットスポット '%s' がデバイス '%s' でアクティベートされました\n"
 
-#: ../clients/cli/devices.c:1691
+#: ../clients/cli/devices.c:1611
 #, c-format
 msgid "Error: Device activation failed: %s"
 msgstr "エラー: デバイスのアクティベートに失敗しました: %s"
 
-#: ../clients/cli/devices.c:1700
-#, fuzzy, c-format
+#: ../clients/cli/devices.c:1620
+#, c-format
 msgid "Error: Device activation failed: device was disconnected"
-msgstr "エラー: デバイスのアクティベートに失敗しました: %s"
+msgstr "エラー: デバイスのアクティベートに失敗しました: デバイスが切断されました"
 
-#: ../clients/cli/devices.c:1715
+#: ../clients/cli/devices.c:1635
 #, c-format
 msgid "Device '%s' has been connected.\n"
 msgstr "デバイス '%s'  は接続されています。\n"
 
-#: ../clients/cli/devices.c:1771
+#: ../clients/cli/devices.c:1691
 #, c-format
 msgid "Error: extra argument not allowed: '%s'."
 msgstr "エラー: 追加の引数は許可されていません: '%s'。"
 
-#: ../clients/cli/devices.c:1856 ../clients/cli/devices.c:1871
-#: ../clients/cli/devices.c:2022
+#: ../clients/cli/devices.c:1776 ../clients/cli/devices.c:1791
+#: ../clients/cli/devices.c:1964
 #, c-format
 msgid "Device '%s' successfully disconnected.\n"
 msgstr "デバイス '%s' が正常に切断されました。\n"
 
-#: ../clients/cli/devices.c:1859
+#: ../clients/cli/devices.c:1779
 #, c-format
 msgid "Device '%s' successfully removed.\n"
 msgstr "デバイス '%s' が正常に削除されました。\n"
 
-#: ../clients/cli/devices.c:1918
-#, fuzzy, c-format
-msgid "Error: Reapplying connection to device '%s' (%s) failed: %s"
-msgstr "エラー: デバイス '%s' (%s) の切断に失敗しました: %s"
+#: ../clients/cli/devices.c:1838
+#, c-format
+msgid "Error: not all connections reapplied."
+msgstr "エラー: 一部の接続が再適用されませんでした。"
 
-#: ../clients/cli/devices.c:1928
-#, fuzzy, c-format
-msgid "Connection successfully reapplied to device '%s'.\n"
-msgstr "接続が正常にアクティベートされました (D-Bus アクティブパス: %s)\n"
+#: ../clients/cli/devices.c:1839
+#, c-format
+msgid "Error: Reapplying connection to device '%s' (%s) failed: %s\n"
+msgstr "エラー: デバイス '%s' (%s) への接続の再適用に失敗しました: %s\n"
 
-#: ../clients/cli/devices.c:1965
-#, fuzzy, c-format
-msgid "Error: unsupported argument '%s'."
-msgstr "エラー: 予期しない引数 '%s' です"
+#: ../clients/cli/devices.c:1849
+#, c-format
+msgid "Connection successfully reapplied to device '%s'.\n"
+msgstr "接続がデバイス '%s' に正常に再適用されました。\n"
 
-#: ../clients/cli/devices.c:1979
-#, fuzzy, c-format
-msgid "Error: device '%s' not found."
-msgstr "エラー: デバイス'%s' が見つかりません"
+#: ../clients/cli/devices.c:1912
+#, c-format
+msgid "Error: no valid device provided."
+msgstr "エラー: 有効なデバイスが提供されていません。"
 
-#: ../clients/cli/devices.c:2007
-#, fuzzy, c-format
+#: ../clients/cli/devices.c:1949
+#, c-format
 msgid "Error: not all devices disconnected."
-msgstr "エラー: Wi-Fi デバイスが見つかりませんでした。"
+msgstr "エラー: 一部のデバイスが切断されませんでした。"
 
-#: ../clients/cli/devices.c:2008
+#: ../clients/cli/devices.c:1950
 #, c-format
 msgid "Error: Device '%s' (%s) disconnecting failed: %s\n"
 msgstr "エラー: デバイス '%s' (%s) の切断に失敗しました: %s\n"
 
-#: ../clients/cli/devices.c:2083
-#, fuzzy, c-format
+#: ../clients/cli/devices.c:2025
+#, c-format
 msgid "Error: not all devices deleted."
-msgstr "エラー: Wi-Fi デバイスが見つかりませんでした。"
+msgstr "エラー: 一部のデバイスが削除されませんでした。"
 
-#: ../clients/cli/devices.c:2084
-#, fuzzy, c-format
+#: ../clients/cli/devices.c:2026
+#, c-format
 msgid "Error: Device '%s' (%s) deletion failed: %s\n"
-msgstr "エラー: デバイス '%s' (%s) の切断に失敗しました: %s"
+msgstr "エラー: デバイス '%s' (%s) の削除に失敗しました: %s\n"
 
-#: ../clients/cli/devices.c:2190
-#, fuzzy, c-format
+#: ../clients/cli/devices.c:2132
+#, c-format
 msgid "Error: No property specified."
-msgstr "エラー: 接続が指定されていません。"
+msgstr "エラー: プロパティーが指定されていません。"
 
-#: ../clients/cli/devices.c:2202 ../clients/cli/devices.c:2217
+#: ../clients/cli/devices.c:2144 ../clients/cli/devices.c:2159
 #, c-format
 msgid "Error: '%s' argument is missing."
 msgstr "エラー: '%s' 引数がありません。"
 
-#: ../clients/cli/devices.c:2207
-#, fuzzy, c-format
+#: ../clients/cli/devices.c:2149
+#, c-format
 msgid "Error: 'managed': %s."
-msgstr "エラー: 'モード': %s。"
+msgstr "エラー: 'managed': %s。"
 
-#: ../clients/cli/devices.c:2222
+#: ../clients/cli/devices.c:2174
 #, c-format
-msgid "Error: 'autoconnect': %s."
-msgstr "エラー: '自動接続': %s。"
-
-#: ../clients/cli/devices.c:2232
-#, fuzzy, c-format
 msgid "Error: property '%s' is not known."
-msgstr "エラー: 無効なプロパティ '%s': %s。"
+msgstr "エラー: プロパティー '%s' が不明です。"
 
-#: ../clients/cli/devices.c:2278
-#, fuzzy, c-format
+#: ../clients/cli/devices.c:2220
+#, c-format
 msgid "%s: using connection '%s'\n"
-msgstr "そのような接続 '%s' はありません"
+msgstr "%s: 接続 '%s' を使用中\n"
 
-#: ../clients/cli/devices.c:2304
+#: ../clients/cli/devices.c:2246
 #, c-format
 msgid "%s: device created\n"
-msgstr ""
+msgstr "%s: デバイスが作成されました\n"
 
-#: ../clients/cli/devices.c:2311
-#, fuzzy, c-format
+#: ../clients/cli/devices.c:2253
+#, c-format
 msgid "%s: device removed\n"
-msgstr "このデバイスは削除されました"
+msgstr "%s: デバイスが削除されました\n"
 
-#: ../clients/cli/devices.c:2397
+#: ../clients/cli/devices.c:2339
 msgid "Wi-Fi scan list"
 msgstr "Wi-Fi スキャン一覧"
 
-#: ../clients/cli/devices.c:2435
+#: ../clients/cli/devices.c:2377
 #, c-format
 msgid "Error: 'device wifi': %s"
 msgstr "エラー: 'dev wifi': %s"
 
-#: ../clients/cli/devices.c:2477 ../clients/cli/devices.c:2561
+#: ../clients/cli/devices.c:2419 ../clients/cli/devices.c:2500
 #, c-format
 msgid "Error: Access point with bssid '%s' not found."
 msgstr "エラー: bssid '%s' のアクセスポイントが見つかりません。"
 
-#: ../clients/cli/devices.c:2504
-#, fuzzy, c-format
+#: ../clients/cli/devices.c:2446
+#, c-format
 msgid ""
 "Error: Device '%s' was not recognized as a Wi-Fi device, check "
 "NetworkManager Wi-Fi plugin."
-msgstr "エラー: デバイス '%s' は Wi-Fi デバイスではありません。"
+msgstr ""
+"エラー: デバイス '%s' が Wi-Fi デバイスとして認識されませんでした。NetworkManager Wi-Fi "
+"プラグインを確認してください。"
 
-#: ../clients/cli/devices.c:2508 ../clients/cli/devices.c:2841
-#: ../clients/cli/devices.c:3261 ../clients/cli/devices.c:3410
+#: ../clients/cli/devices.c:2448 ../clients/cli/devices.c:2780
+#: ../clients/cli/devices.c:3200 ../clients/cli/devices.c:3349
 #, c-format
 msgid "Error: Device '%s' is not a Wi-Fi device."
 msgstr "エラー: デバイス '%s' は Wi-Fi デバイスではありません。"
 
-#: ../clients/cli/devices.c:2721
+#: ../clients/cli/devices.c:2660
 msgid "SSID or BSSID: "
 msgstr "SSID または BSSID: "
 
-#: ../clients/cli/devices.c:2726
+#: ../clients/cli/devices.c:2665
 #, c-format
 msgid "Error: SSID or BSSID are missing."
 msgstr "エラー: SSID または BSSID がありません。"
 
-#: ../clients/cli/devices.c:2750
+#: ../clients/cli/devices.c:2689
 #, c-format
 msgid "Error: bssid argument value '%s' is not a valid BSSID."
 msgstr "エラー: bssid の引数値 '%s' は有効な BSSID ではありません。"
 
-#: ../clients/cli/devices.c:2774
+#: ../clients/cli/devices.c:2713
 #, 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:2794 ../clients/cli/devices.c:2807
+#: ../clients/cli/devices.c:2733 ../clients/cli/devices.c:2746
 #, c-format
 msgid "Error: %s: %s."
 msgstr "エラー: %s: %s。"
 
-#: ../clients/cli/devices.c:2822
+#: ../clients/cli/devices.c:2761
 #, c-format
 msgid "Error: BSSID to connect to (%s) differs from bssid argument (%s)."
-msgstr ""
-"エラー: (%s) が接続先となる BSSID は bssid 引数 (%s) により異なります。"
+msgstr "エラー: (%s) が接続先となる BSSID は bssid 引数 (%s) により異なります。"
 
-#: ../clients/cli/devices.c:2828
+#: ../clients/cli/devices.c:2767
 #, c-format
 msgid "Error: Parameter '%s' is neither SSID nor BSSID."
 msgstr "エラー: パラメーター '%s' は SSID、BSSID のいずれでもありません。"
 
-#: ../clients/cli/devices.c:2843 ../clients/cli/devices.c:3263
-#: ../clients/cli/devices.c:3412
+#: ../clients/cli/devices.c:2782 ../clients/cli/devices.c:3202
+#: ../clients/cli/devices.c:3351
 #, c-format
 msgid "Error: No Wi-Fi device found."
 msgstr "エラー: Wi-Fi デバイスが見つかりませんでした。"
 
-#: ../clients/cli/devices.c:2863
-#, fuzzy, c-format
+#: ../clients/cli/devices.c:2802
+#, c-format
 msgid "Error: Failed to scan hidden SSID: %s."
-msgstr "エラー: %s.%s の変更に失敗しました: %s。"
+msgstr "エラー: 非表示の SSID のスキャンに失敗しました: %s。"
 
-#: ../clients/cli/devices.c:2888
+#: ../clients/cli/devices.c:2827
 #, c-format
 msgid "Error: No network with SSID '%s' found."
 msgstr "エラー: SSID が '%s' のネットワークが見つかりませんでした。"
 
-#: ../clients/cli/devices.c:2890
+#: ../clients/cli/devices.c:2829
 #, c-format
 msgid "Error: No access point with BSSID '%s' found."
 msgstr "エラー: BSSID が '%s' のアクセスポイントが見つかりませんでした。"
 
-#: ../clients/cli/devices.c:2932
+#: ../clients/cli/devices.c:2871
 #, c-format
 msgid ""
 "Warning: '%s' should be SSID for hidden APs; but it looks like a BSSID.\n"
-msgstr ""
+msgstr "警告: '%s' は非表示の AP の SSID である必要がありますが、BSSID のようです。\n"
 
-#: ../clients/cli/devices.c:2946
+#: ../clients/cli/devices.c:2885
 msgid "Password: "
 msgstr "パスワード: "
 
-#: ../clients/cli/devices.c:3095
-#, fuzzy, c-format
+#: ../clients/cli/devices.c:3034
+#, c-format
 msgid "'%s' is not valid WPA PSK"
-msgstr "'%s' は有効な PSK ではありません"
+msgstr "'%s' は有効な WPA PSK ではありません"
 
-#: ../clients/cli/devices.c:3112
-#, fuzzy, c-format
+#: ../clients/cli/devices.c:3051
+#, c-format
 msgid "'%s' is not valid WEP key (it should be 5 or 13 ASCII chars)"
-msgstr "'%s' の長さは無効です (5 桁または 6 桁にしてください)"
+msgstr "'%s' は有効な WEP キーではありません (5 または 13 文字の ASCII 文字である必要があります)"
 
-#: ../clients/cli/devices.c:3128
+#: ../clients/cli/devices.c:3067
 #, c-format
 msgid "Hotspot password: %s\n"
-msgstr ""
+msgstr "ホットスポットのパスワード: %s\n"
 
-#: ../clients/cli/devices.c:3186
-#, fuzzy, c-format
+#: ../clients/cli/devices.c:3125
+#, c-format
 msgid "Error: ssid is too long."
-msgstr "エラー: 'ssid' が必要です。"
+msgstr "エラー: ssid が長すぎます。"
 
-#: ../clients/cli/devices.c:3198
-#, fuzzy, c-format
+#: ../clients/cli/devices.c:3137
+#, c-format
 msgid "Error: band argument value '%s' is invalid; use 'a' or 'bg'."
-msgstr ""
-"エラー: wep-key-type の引数値 '%s' は無効です。'key' または 'phrase' を使用し"
-"てください。"
+msgstr "エラー: バンド引数値 '%s' は無効です。'a' または 'bg' を使用してください。"
 
-#: ../clients/cli/devices.c:3222
+#: ../clients/cli/devices.c:3161
 #, c-format
 msgid "Error: Unknown parameter %s."
 msgstr "エラー: 不明なパラメータ %s です。"
 
-#: ../clients/cli/devices.c:3241
-#, fuzzy, c-format
+#: ../clients/cli/devices.c:3180
+#, c-format
 msgid "Error: channel requires band too."
-msgstr "エラー: 'apn' が必要です。"
+msgstr "エラー: チャネルにはバンドも必要です。"
 
-#: ../clients/cli/devices.c:3247
-#, fuzzy, c-format
+#: ../clients/cli/devices.c:3186
+#, c-format
 msgid "Error: channel '%s' not valid for band '%s'."
-msgstr "エラー: 'チャンネル': '%s' は無効です; <1-13> を使用してください。"
+msgstr "エラー: チャンネル '%s' はバンド '%s' に対して有効ではありません。"
 
-#: ../clients/cli/devices.c:3275
-#, fuzzy, c-format
+#: ../clients/cli/devices.c:3214
+#, c-format
 msgid "Error: Device '%s' supports neither AP nor Ad-Hoc mode."
-msgstr "エラー: デバイス '%s' は Wi-Fi デバイスではありません。"
+msgstr "エラー: デバイス '%s' は AP またはアドホックモードのいずれもサポートしません。"
 
-#: ../clients/cli/devices.c:3310
-#, fuzzy, c-format
+#: ../clients/cli/devices.c:3249
+#, c-format
 msgid "Error: Invalid 'password': %s."
-msgstr "エラー: 無効なプロパティ '%s': %s。"
+msgstr "エラー: 無効なパスワード: %s。"
 
-#: ../clients/cli/devices.c:3379
-#, fuzzy, c-format
+#: ../clients/cli/devices.c:3318
+#, c-format
 msgid "Error: '%s' cannot repeat."
-msgstr "エラー: '%s' 設定はありません\n"
+msgstr "エラー: '%s' を繰り返すことはできません。"
 
-#: ../clients/cli/devices.c:3460
+#: ../clients/cli/devices.c:3399
 #, c-format
 msgid "Error: 'device wifi' command '%s' is not valid."
 msgstr "エラー: 'dev wifi' のコマンド '%s' は有効なコマンドではありません。"
 
 #. Main header name
-#: ../clients/cli/devices.c:3486
+#: ../clients/cli/devices.c:3425
 msgid "Device LLDP neighbors"
-msgstr ""
+msgstr "LLDP 近接デバイス"
 
-#: ../clients/cli/devices.c:3589
-#, fuzzy, c-format
+#: ../clients/cli/devices.c:3528
+#, c-format
 msgid "Error: 'device lldp list': %s"
-msgstr "エラー: 'device status': %s"
+msgstr "エラー: 'device lldp list': %s"
 
-#: ../clients/cli/devices.c:3636
-#, fuzzy, c-format
+#: ../clients/cli/devices.c:3575
+#, c-format
 msgid "Error: 'device lldp' command '%s' is not valid."
-msgstr "エラー: 'dev wifi' のコマンド '%s' は有効なコマンドではありません。"
+msgstr "エラー: 'device lldp' コマンドは '%s' 有効ではありません。"
 
-#: ../clients/cli/devices.c:3825
+#: ../clients/cli/devices.c:3770
 #, c-format
 msgid "Error: 'dev' command '%s' is not valid."
 msgstr "エラー: 'dev' のコマンド '%s' は有効なコマンドではありません。"
 
-#: ../clients/cli/general.c:35
+#: ../clients/cli/general.c:34
 msgid "RUNNING"
 msgstr "実行中"
 
 #. 0
-#: ../clients/cli/general.c:36
+#: ../clients/cli/general.c:35
 msgid "VERSION"
 msgstr "バージョン"
 
 #. 2
-#: ../clients/cli/general.c:38
+#: ../clients/cli/general.c:37
 msgid "STARTUP"
 msgstr "スタートアップ"
 
 #. 3
-#: ../clients/cli/general.c:39
+#: ../clients/cli/general.c:38
 msgid "CONNECTIVITY"
 msgstr "接続性"
 
 #. 4
-#: ../clients/cli/general.c:40
+#: ../clients/cli/general.c:39
 msgid "NETWORKING"
 msgstr "ネットワーキング"
 
 #. 5
-#: ../clients/cli/general.c:41
+#: ../clients/cli/general.c:40
 msgid "WIFI-HW"
 msgstr "WIFI ハードウェア"
 
 #. 6
-#: ../clients/cli/general.c:42
+#: ../clients/cli/general.c:41
 msgid "WIFI"
 msgstr "WIFI"
 
 #. 7
-#: ../clients/cli/general.c:43
+#: ../clients/cli/general.c:42
 msgid "WWAN-HW"
 msgstr "WWAN ハードウェア"
 
 #. 8
-#: ../clients/cli/general.c:44
+#: ../clients/cli/general.c:43
 msgid "WWAN"
 msgstr "WWAN"
 
 #. 9
-#: ../clients/cli/general.c:45
+#: ../clients/cli/general.c:44
 msgid "WIMAX-HW"
 msgstr "WIMAX ハードウェア"
 
 #. 10
-#: ../clients/cli/general.c:46
+#: ../clients/cli/general.c:45
 msgid "WIMAX"
 msgstr "WIMAX"
 
-#: ../clients/cli/general.c:62
+#: ../clients/cli/general.c:61
 msgid "PERMISSION"
 msgstr "パーミッション"
 
 #. 0
-#: ../clients/cli/general.c:63
+#: ../clients/cli/general.c:62
 msgid "VALUE"
 msgstr "値"
 
-#: ../clients/cli/general.c:71
+#: ../clients/cli/general.c:70
 msgid "LEVEL"
 msgstr "レベル"
 
 #. 0
-#: ../clients/cli/general.c:72
+#: ../clients/cli/general.c:71
 msgid "DOMAINS"
 msgstr "ドメイン"
 
-#: ../clients/cli/general.c:86
+#: ../clients/cli/general.c:85
 #, c-format
 msgid ""
 "Usage: nmcli general { COMMAND | help }\n"
@@ -4560,7 +5002,7 @@ msgstr ""
 "  logging [level <ログレベル>] [domains <ログドメイン>]\n"
 "\n"
 
-#: ../clients/cli/general.c:97
+#: ../clients/cli/general.c:96
 #, c-format
 msgid ""
 "Usage: nmcli general status { help }\n"
@@ -4573,11 +5015,10 @@ msgstr ""
 "使い方: nmcli general status { help }\n"
 "\n"
 "NetworkManager の全般情報を表示します。\n"
-"'status' はデフォルトの動作となるため、'nmcli gen' を実行すると 'nmcli gen "
-"status' を実行したことになります。\n"
+"'status' はデフォルトの動作となるため、'nmcli gen' を実行すると 'nmcli gen status' を実行したことになります。\n"
 "\n"
 
-#: ../clients/cli/general.c:106
+#: ../clients/cli/general.c:105
 #, c-format
 msgid ""
 "Usage: nmcli general hostname { ARGUMENTS | help }\n"
@@ -4586,8 +5027,8 @@ msgid ""
 "\n"
 "Get or change persistent system hostname.\n"
 "With no arguments, this prints currently configured hostname. When you pass\n"
-"a hostname, NetworkManager will set it as the new persistent system "
-"hostname.\n"
+"a hostname, NetworkManager will set it as the new persistent system hostname."
+"\n"
 "\n"
 msgstr ""
 "使い方: nmcli general hostname { 引数 | help }\n"
@@ -4595,12 +5036,11 @@ msgstr ""
 "引数 := [<ホスト名>]\n"
 "\n"
 "システムの永続的なホスト名を取得または変更します。\n"
-"引数を付けずに実行すると現在、設定されているホスト名を出力します。ホスト名"
-"を\n"
+"引数を付けずに実行すると現在、設定されているホスト名を出力します。ホスト名を\n"
 "渡すと、そのホスト名をシステムの永続的なホスト名として新たに設定します。\n"
 "\n"
 
-#: ../clients/cli/general.c:118
+#: ../clients/cli/general.c:117
 #, c-format
 msgid ""
 "Usage: nmcli general permissions { help }\n"
@@ -4613,7 +5053,7 @@ msgstr ""
 "認証されている操作に対する呼び出し側のパーミッションを表示します。\n"
 "\n"
 
-#: ../clients/cli/general.c:126
+#: ../clients/cli/general.c:125
 #, c-format
 msgid ""
 "Usage: nmcli general logging { ARGUMENTS | help }\n"
@@ -4638,7 +5078,7 @@ msgstr ""
 "使用できるログ記録のドメイン一覧については man ページを参照してください。\n"
 "\n"
 
-#: ../clients/cli/general.c:139
+#: ../clients/cli/general.c:138
 #, c-format
 msgid ""
 "Usage: nmcli networking { COMMAND | help }\n"
@@ -4663,33 +5103,29 @@ msgstr ""
 "  connectivity [check]\n"
 "\n"
 
-#: ../clients/cli/general.c:149
+#: ../clients/cli/general.c:148
 #, c-format
-msgid ""
-"Usage: nmcli networking on { help }\n"
+msgid "Usage: nmcli networking on { help }\n"
 "\n"
 "Switch networking on.\n"
 "\n"
-msgstr ""
-"使い方: nmcli networking on { help }\n"
+msgstr "使い方: nmcli networking on { help }\n"
 "\n"
 "ネットワークをオンに切り替えます。\n"
 "\n"
 
-#: ../clients/cli/general.c:157
+#: ../clients/cli/general.c:156
 #, c-format
-msgid ""
-"Usage: nmcli networking off { help }\n"
+msgid "Usage: nmcli networking off { help }\n"
 "\n"
 "Switch networking off.\n"
 "\n"
-msgstr ""
-"使い方: nmcli networking off { help }\n"
+msgstr "使い方: nmcli networking off { help }\n"
 "\n"
 "ネットワークをオフに切り替えます。\n"
 "\n"
 
-#: ../clients/cli/general.c:165
+#: ../clients/cli/general.c:164
 #, c-format
 msgid ""
 "Usage: nmcli networking connectivity { ARGUMENTS | help }\n"
@@ -4697,8 +5133,8 @@ msgid ""
 "ARGUMENTS := [check]\n"
 "\n"
 "Get network connectivity state.\n"
-"The optional 'check' argument makes NetworkManager re-check the "
-"connectivity.\n"
+"The optional 'check' argument makes NetworkManager re-check the connectivity."
+"\n"
 "\n"
 msgstr ""
 "使い方: nmcli networking connectivity { 引数 | help }\n"
@@ -4708,8 +5144,8 @@ msgstr ""
 "ネットワークの接続状態を取得します。\n"
 "オプションの 'check' 引数を付けると接続を再チェックします。\n"
 
-#: ../clients/cli/general.c:177
-#, fuzzy, c-format
+#: ../clients/cli/general.c:176
+#, c-format
 msgid ""
 "Usage: nmcli radio { COMMAND | help }\n"
 "\n"
@@ -4720,16 +5156,12 @@ msgid ""
 msgstr ""
 "使い方: nmcli radio { コマンド | help }\n"
 "\n"
-"コマンドの種類 := { all | wifi | wwan | wimax }\n"
-"\n"
-"  all | wifi | wwan | wimax [ on | off ]\n"
-"\n"
-"コマンドの種類 := { all | wifi | wwan }\n"
+"コマンド := { all | wifi | wwan }\n"
 "\n"
 "  all | wifi | wwan [ on | off ]\n"
 "\n"
 
-#: ../clients/cli/general.c:186
+#: ../clients/cli/general.c:185
 #, c-format
 msgid ""
 "Usage: nmcli radio all { ARGUMENTS | help }\n"
@@ -4746,7 +5178,7 @@ msgstr ""
 "すべてのラジオスイッチの状態を取得、またはオンかオフにします。\n"
 "\n"
 
-#: ../clients/cli/general.c:196
+#: ../clients/cli/general.c:195
 #, c-format
 msgid ""
 "Usage: nmcli radio wifi { ARGUMENTS | help }\n"
@@ -4763,7 +5195,7 @@ msgstr ""
 "Wi-Fi ラジオスイッチの状態を取得、またはオンかオフにします。\n"
 "\n"
 
-#: ../clients/cli/general.c:206
+#: ../clients/cli/general.c:205
 #, c-format
 msgid ""
 "Usage: nmcli radio wwan { ARGUMENTS | help }\n"
@@ -4777,11 +5209,10 @@ msgstr ""
 "\n"
 "引数 := [on | off]\n"
 "\n"
-"モバイルブロードバンドのラジオスイッチの状態を取得、またはオンかオフにしま"
-"す。\n"
+"モバイルブロードバンドのラジオスイッチの状態を取得、またはオンかオフにします。\n"
 "\n"
 
-#: ../clients/cli/general.c:216
+#: ../clients/cli/general.c:215
 #, c-format
 msgid ""
 "Usage: nmcli monitor\n"
@@ -4790,205 +5221,205 @@ msgid ""
 "Prints a line whenever a change occurs in NetworkManager\n"
 "\n"
 msgstr ""
+"使い方: nmcli monitor\n"
+"\n"
+"NetworkManager の変更を監視します。\n"
+"NetworkManager で変更が行われるたびに行を出力します。\n"
+"\n"
 
-#: ../clients/cli/general.c:234
+#: ../clients/cli/general.c:233
 msgid "asleep"
 msgstr "休止中"
 
-#: ../clients/cli/general.c:236
+#: ../clients/cli/general.c:235
 msgid "connecting"
 msgstr "接続中"
 
-#: ../clients/cli/general.c:238
+#: ../clients/cli/general.c:237
 msgid "connected (local only)"
 msgstr "接続完了 (ローカルのみ)"
 
-#: ../clients/cli/general.c:240
+#: ../clients/cli/general.c:239
 msgid "connected (site only)"
 msgstr "接続完了 (サイトのみ)"
 
-#: ../clients/cli/general.c:244
+#: ../clients/cli/general.c:243
 msgid "disconnecting"
 msgstr "切断中"
 
-#: ../clients/cli/general.c:280
+#: ../clients/cli/general.c:279
 msgid "portal"
 msgstr "ポータル"
 
-#: ../clients/cli/general.c:282
+#: ../clients/cli/general.c:281
 msgid "limited"
 msgstr "制限付き"
 
-#: ../clients/cli/general.c:284
+#: ../clients/cli/general.c:283
 msgid "full"
 msgstr "完全"
 
-#: ../clients/cli/general.c:335
+#: ../clients/cli/general.c:334
 #, c-format
 msgid "Error: only these fields are allowed: %s"
 msgstr "エラー: 許可されているのは次のフィールドのみです: %s"
 
-#: ../clients/cli/general.c:358
+#: ../clients/cli/general.c:360
 msgid "NetworkManager status"
 msgstr "NetworkManager のステータス"
 
-#: ../clients/cli/general.c:363
+#: ../clients/cli/general.c:365
 msgid "running"
 msgstr "実行中"
 
-#: ../clients/cli/general.c:366
+#: ../clients/cli/general.c:368
 msgid "starting"
 msgstr "起動中"
 
-#: ../clients/cli/general.c:366
+#: ../clients/cli/general.c:368
 msgid "started"
 msgstr "起動しました"
 
-#: ../clients/cli/general.c:368 ../clients/cli/general.c:369
 #: ../clients/cli/general.c:370 ../clients/cli/general.c:371
-#: ../clients/cli/general.c:372
+#: ../clients/cli/general.c:372 ../clients/cli/general.c:373
+#: ../clients/cli/general.c:374
 msgid "enabled"
 msgstr "有効"
 
-#: ../clients/cli/general.c:368 ../clients/cli/general.c:369
 #: ../clients/cli/general.c:370 ../clients/cli/general.c:371
-#: ../clients/cli/general.c:372
+#: ../clients/cli/general.c:372 ../clients/cli/general.c:373
+#: ../clients/cli/general.c:374
 msgid "disabled"
 msgstr "無効"
 
-#: ../clients/cli/general.c:435
+#: ../clients/cli/general.c:446
 msgid "auth"
 msgstr "認証"
 
-#: ../clients/cli/general.c:464
+#: ../clients/cli/general.c:475
 #, c-format
 msgid "Error: 'general permissions': %s"
 msgstr "エラー: 'general permissions': %s"
 
-#: ../clients/cli/general.c:478
+#: ../clients/cli/general.c:489
 msgid "NetworkManager permissions"
 msgstr "NetworkManager のパーミッション"
 
-#: ../clients/cli/general.c:519
+#: ../clients/cli/general.c:530
 #, c-format
 msgid "Error: 'general logging': %s"
 msgstr "エラー: 'general logging': %s"
 
-#: ../clients/cli/general.c:534
+#: ../clients/cli/general.c:545
 msgid "NetworkManager logging"
 msgstr "NetworkManager のロギング"
 
-#: ../clients/cli/general.c:556
+#: ../clients/cli/general.c:567
 #, c-format
 msgid "Error: failed to set hostname: %s"
 msgstr "エラー: ホスト名の設定に失敗しました: %s"
 
-#: ../clients/cli/general.c:669
-#, fuzzy, c-format
+#: ../clients/cli/general.c:680
+#, c-format
 msgid "Error: failed to set logging: %s"
-msgstr "エラー: ロギング設定のアクセスが拒否されました; %s"
+msgstr "エラー: ロギングの設定に失敗しました: %s"
 
-#: ../clients/cli/general.c:678
+#: ../clients/cli/general.c:689
 #, c-format
 msgid "Error: 'general' command '%s' is not valid."
 msgstr "エラー: 'general' のコマンド '%s' は有効なコマンドではありません。"
 
-#: ../clients/cli/general.c:696
+#: ../clients/cli/general.c:707
 #, c-format
 msgid "Error: '--fields' value '%s' is not valid here (allowed field: %s)"
 msgstr "エラー: '--fields' の値 '%s' はここでは無効です (許可フィールド: %s)"
 
-#: ../clients/cli/general.c:721
+#: ../clients/cli/general.c:732
 #, c-format
 msgid "Error: invalid '%s' argument: '%s' (use on/off)."
 msgstr "エラー: 無効な '%s' 引数です: '%s' (on か off を使用してください)。"
 
-#: ../clients/cli/general.c:732
+#: ../clients/cli/general.c:743
 msgid "Connectivity"
 msgstr "接続性"
 
-#: ../clients/cli/general.c:747
+#: ../clients/cli/general.c:758
 msgid "Networking"
 msgstr "ネットワーキング"
 
-#: ../clients/cli/general.c:772
+#: ../clients/cli/general.c:783
 #, c-format
 msgid "Error: 'networking connectivity' command '%s' is not valid."
-msgstr ""
-"エラー: 'networking connectivity' のコマンド '%s' は有効なコマンドではありま"
-"せん。"
+msgstr "エラー: 'networking connectivity' のコマンド '%s' は有効なコマンドではありません。"
 
-#: ../clients/cli/general.c:788
+#: ../clients/cli/general.c:799
 #, c-format
 msgid "Error: 'networking' command '%s' is not valid."
 msgstr "エラー: 'networking' のコマンド '%s' は有効なコマンドではありません。"
 
-#: ../clients/cli/general.c:817 ../clients/cli/general.c:837
+#: ../clients/cli/general.c:828 ../clients/cli/general.c:848
 msgid "Radio switches"
 msgstr "ラジオスイッチ"
 
 #. no argument, show current WiFi state
-#: ../clients/cli/general.c:855
+#: ../clients/cli/general.c:866
 msgid "Wi-Fi radio switch"
 msgstr "Wi-Fi ラジオスイッチ"
 
 #. no argument, show current WWAN (mobile broadband) state
-#: ../clients/cli/general.c:871
+#: ../clients/cli/general.c:882
 msgid "WWAN radio switch"
 msgstr "WWAN ラジオスイッチ"
 
-#: ../clients/cli/general.c:882
+#: ../clients/cli/general.c:893
 #, c-format
 msgid "Error: 'radio' command '%s' is not valid."
 msgstr "エラー: 'radio' のコマンド '%s' は有効なコマンドではありません。"
 
-#: ../clients/cli/general.c:902
-#, fuzzy
+#: ../clients/cli/general.c:914
 msgid "NetworkManager has started"
-msgstr "NetworkManager のステータス"
+msgstr "NetworkManager  が起動されました"
 
-#: ../clients/cli/general.c:902
-#, fuzzy
+#: ../clients/cli/general.c:917
 msgid "NetworkManager has stopped"
-msgstr "NetworkManager のステータス"
+msgstr "NetworkManager が停止しました"
 
-#: ../clients/cli/general.c:913
-#, fuzzy, c-format
+#: ../clients/cli/general.c:931
+#, c-format
 msgid "Hostname set to '%s'\n"
-msgstr "ホスト名を '%s' に設定します"
+msgstr "ホスト名が '%s' に設定されました\n"
 
-#: ../clients/cli/general.c:928
-#, fuzzy, c-format
+#: ../clients/cli/general.c:946
+#, c-format
 msgid "'%s' is now the primary connection\n"
-msgstr "この接続には設定 '%s' はありません。\n"
+msgstr "'%s' はプライマリー接続です\n"
 
-#: ../clients/cli/general.c:930
-#, fuzzy, c-format
+#: ../clients/cli/general.c:948
+#, c-format
 msgid "There's no primary connection\n"
-msgstr "接続の確認: %s\n"
+msgstr "プライマリー接続がありません\n"
 
-#: ../clients/cli/general.c:942
-#, fuzzy, c-format
+#: ../clients/cli/general.c:960
+#, c-format
 msgid "Connectivity is now '%s'\n"
-msgstr "接続性"
+msgstr "接続性は '%s' です\n"
 
-#: ../clients/cli/general.c:955
-#, fuzzy, c-format
+#: ../clients/cli/general.c:973
+#, c-format
 msgid "Networkmanager is now in the '%s' state\n"
-msgstr "NetworkManager が実行していません。"
+msgstr "Networkmanager の状態は '%s' です\n"
 
-#: ../clients/cli/general.c:966
-#, fuzzy, c-format
+#: ../clients/cli/general.c:984
+#, c-format
 msgid "Error: 'monitor' command '%s' is not valid."
-msgstr "エラー: 'radio' のコマンド '%s' は有効なコマンドではありません。"
+msgstr "エラー: 'monitor' コマンド '%s' は有効ではありません。"
 
-#: ../clients/cli/general.c:980
-#, fuzzy
+#: ../clients/cli/general.c:998
 msgid "Networkmanager is not running (waiting for it)\n"
-msgstr "NetworkManager が実行していません。"
+msgstr "Networkmanager が実行されていません (待機中)\n"
 
 #: ../clients/cli/nmcli.c:83
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "Usage: %s [OPTIONS] OBJECT { COMMAND | help }\n"
 "\n"
@@ -4996,11 +5427,12 @@ msgid ""
 "  -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"
+"  -c[olors] auto|yes|no                      whether to use colors in output\n"
 "  -f[ields] <field1,field2,...>|all|common   specify fields to output\n"
 "  -e[scape] yes|no                           escape columns separators in "
 "values\n"
+"  -n[ocheck]                                 don't check nmcli and "
+"NetworkManager versions\n"
 "  -a[sk]                                     ask for missing parameters\n"
 "  -s[how-secrets]                            allow displaying passwords\n"
 "  -w[ait] <seconds>                          set timeout waiting for "
@@ -5022,16 +5454,17 @@ msgstr ""
 "\n"
 "オプション\n"
 "  -t[erse]                                   簡潔な出力\n"
-"  -p[retty]                                  人間が読みやすい出力\n"
+"  -p[retty]                                 人間が読みやすい出力\n"
 "  -m[ode] tabular|multiline                  出力モード\n"
+"  -c[olors] auto|yes|no                      出力で色を使用するかどうか\n"
 "  -f[ields] <field1,field2,...>|all|common   出力フィールドの指定\n"
-"  -e[scape] yes|no                           値内のコラムセパレーターをエス"
-"ケープ\n"
-"  -a[sk]                                     足りないパラメーターを問い合わせ"
-"る\n"
-"  -w[ait] <seconds>                          動作の完了を待機するタイムアウト"
-"を設定\n"
-"  -v[ersion]                                 プログラムバージョン\n"
+"  -e[scape] yes|no                           値内のコラムセパレーターをエスケープ\n"
+"  -n[ocheck]                                 nmcli および NetworkManager "
+"のバージョンをチェックしない\n"
+"  -a[sk]                                     足りないパラメーターを問い合わせる\n"
+"  -s[how-secrets]                            パスワードの表示を許可\n"
+"  -w[ait] <seconds>                          動作の完了を待機する場合のタイムアウトを設定\n"
+"  -v[ersion]                                 プログラムバージョンを表示\n"
 "  -h[elp]                                    このヘルプを出力\n"
 "\n"
 "オブジェクト\n"
@@ -5040,91 +5473,90 @@ msgstr ""
 "  r[adio]         NetworkManager ラジオスイッチ\n"
 "  c[onnection]    NetworkManager の接続\n"
 "  d[evice]        NetworkManager で管理しているデバイス\n"
+"  a[gent]         NetworkManager シークレットエージェントまたは polkit エージェント\n"
+"  m[onitor]       NetworkManager の変更を監視\n"
 "\n"
 
-#: ../clients/cli/nmcli.c:142
+#: ../clients/cli/nmcli.c:143
 #, c-format
 msgid "Error: Object '%s' is unknown, try 'nmcli help'."
-msgstr ""
-"エラー: オブジェクト '%s' は不明です。'nmcli help' を確認してください。"
+msgstr "エラー: オブジェクト '%s' は不明です。'nmcli help' を確認してください。"
 
-#: ../clients/cli/nmcli.c:183
+#: ../clients/cli/nmcli.c:173
 #, c-format
 msgid "Error: Option '--terse' is specified the second time."
 msgstr "エラー: オプション '--terse' が二度指定されています。"
 
-#: ../clients/cli/nmcli.c:188
+#: ../clients/cli/nmcli.c:178
 #, c-format
 msgid "Error: Option '--terse' is mutually exclusive with '--pretty'."
 msgstr "エラー: オプション '--terse' は '--pretty' と相互に排他的です。"
 
-#: ../clients/cli/nmcli.c:196
+#: ../clients/cli/nmcli.c:186
 #, c-format
 msgid "Error: Option '--pretty' is specified the second time."
 msgstr "エラー: オプション '--pretty' が二度指定されています。"
 
-#: ../clients/cli/nmcli.c:201
+#: ../clients/cli/nmcli.c:191
 #, c-format
 msgid "Error: Option '--pretty' is mutually exclusive with '--terse'."
 msgstr "エラー: オプション '--pretty' は '--terse' と相互に排他的です。"
 
-#: ../clients/cli/nmcli.c:211 ../clients/cli/nmcli.c:227
-#: ../clients/cli/nmcli.c:245 ../clients/cli/nmcli.c:276
+#: ../clients/cli/nmcli.c:201 ../clients/cli/nmcli.c:217
+#: ../clients/cli/nmcli.c:235 ../clients/cli/nmcli.c:266
 #, c-format
 msgid "Error: missing argument for '%s' option."
 msgstr "エラー: %s オプション用の引数がありません。"
 
-#: ../clients/cli/nmcli.c:220 ../clients/cli/nmcli.c:238
-#: ../clients/cli/nmcli.c:254
+#: ../clients/cli/nmcli.c:210 ../clients/cli/nmcli.c:228
+#: ../clients/cli/nmcli.c:244
 #, c-format
 msgid "Error: '%s' is not valid argument for '%s' option."
 msgstr "エラー: '%s' は '%s' オプション用の有効な引数ではありません。"
 
-#: ../clients/cli/nmcli.c:261
+#: ../clients/cli/nmcli.c:251
 #, c-format
 msgid "Error: fields for '%s' options are missing."
 msgstr "エラー: '%s' オプション用のフィールドがありません。"
 
-#: ../clients/cli/nmcli.c:281
+#: ../clients/cli/nmcli.c:271
 #, c-format
 msgid "Error: '%s' is not a valid timeout for '%s' option."
 msgstr "エラー: '%s' は '%s' オプションの有効なタイムアウトではありません。"
 
-#: ../clients/cli/nmcli.c:288
+#: ../clients/cli/nmcli.c:278
 #, c-format
 msgid "nmcli tool, version %s\n"
 msgstr "nmcli ツール、バージョン %s\n"
 
-#: ../clients/cli/nmcli.c:294
+#: ../clients/cli/nmcli.c:284
 #, c-format
 msgid "Error: Option '%s' is unknown, try 'nmcli -help'."
 msgstr "エラー: オプション '%s' は不明です、'nmcli -help' を確認してください。"
 
-#: ../clients/cli/nmcli.c:377 ../clients/cli/nmcli.c:387
-#, fuzzy, c-format
-msgid ""
-"\n"
+#: ../clients/cli/nmcli.c:367 ../clients/cli/nmcli.c:377
+#, c-format
+msgid "\n"
 "Error: nmcli terminated by signal %s (%d)\n"
-msgstr ""
-"\n"
-"エラー: 信号 %d により nmcli が終了しました。"
+msgstr "\n"
+"Error: nmcli がシグナル %s (%d) で終了しました\n"
 
-#: ../clients/cli/nmcli.c:418
-#, fuzzy, c-format
+#: ../clients/cli/nmcli.c:408
+#, c-format
 msgid "Failed to set signal mask: %d\n"
-msgstr "信号マスクの設定に失敗しました: %d"
+msgstr "シグナルマスクの設定に失敗しました: %d\n"
 
-#: ../clients/cli/nmcli.c:425
-#, fuzzy, c-format
+#: ../clients/cli/nmcli.c:415
+#, c-format
 msgid "Failed to create signal handling thread: %d\n"
-msgstr "信号処理スレッドの作成に失敗しました: %d"
+msgstr "シグナル処理スレッドの作成に失敗しました: %d\n"
 
-#: ../clients/cli/nmcli.c:522 ../clients/nm-online.c:193
-#, fuzzy, c-format
+#: ../clients/cli/nmcli.c:512 ../clients/nm-online.c:193
+#, c-format
 msgid "Error: Could not create NMClient object: %s."
-msgstr "エラー: NMClient オブジェクトを作成できませんでした。"
+msgstr "エラー: NMClient オブジェクトを作成できませんでした: %s。"
 
-#: ../clients/cli/nmcli.c:539
+#: ../clients/cli/nmcli.c:529
 msgid "Success"
 msgstr "成功"
 
@@ -5139,262 +5571,253 @@ msgid "Authentication error: %s\n"
 msgstr "認証エラー: %s\n"
 
 #: ../clients/cli/polkit-agent.c:118
-#, fuzzy, c-format
+#, c-format
 msgid "Warning: polkit agent initialization failed: %s\n"
-msgstr "モデムの初期化に失敗しました"
+msgstr "警告: polkit エージェントの初期化に失敗しました: %s\n"
 
-#: ../clients/cli/settings.c:796
-#, fuzzy, c-format
+#: ../clients/cli/settings.c:790
+#, c-format
 msgid "%d (key)"
-msgstr "%d (hex-ascii-key)"
+msgstr "%d (key)"
 
-#: ../clients/cli/settings.c:798
+#: ../clients/cli/settings.c:792
 #, c-format
 msgid "%d (passphrase)"
 msgstr "%d (パスフレーズ)"
 
-#: ../clients/cli/settings.c:801 ../clients/cli/settings.c:887
+#: ../clients/cli/settings.c:795 ../clients/cli/settings.c:881
 #, c-format
 msgid "%d (unknown)"
 msgstr "%d (不明)"
 
-#: ../clients/cli/settings.c:830
+#: ../clients/cli/settings.c:824
 msgid "0 (NONE)"
 msgstr "0 (なし)"
 
-#: ../clients/cli/settings.c:836
+#: ../clients/cli/settings.c:830
 msgid "REORDER_HEADERS, "
 msgstr "ヘッダーの順序変更、"
 
-#: ../clients/cli/settings.c:838
+#: ../clients/cli/settings.c:832
 msgid "GVRP, "
 msgstr "GVRP、"
 
-#: ../clients/cli/settings.c:840
+#: ../clients/cli/settings.c:834
 msgid "LOOSE_BINDING, "
 msgstr "結合を緩める、"
 
-#: ../clients/cli/settings.c:842
-#, fuzzy
+#: ../clients/cli/settings.c:836
 msgid "MVRP, "
-msgstr "GVRP、"
+msgstr "MVRP、"
 
-#: ../clients/cli/settings.c:881
+#: ../clients/cli/settings.c:875
 #, c-format
 msgid "%d (disabled)"
 msgstr "%d (無効)"
 
-#: ../clients/cli/settings.c:883
+#: ../clients/cli/settings.c:877
 #, c-format
 msgid "%d (enabled, prefer public IP)"
 msgstr "%d (有効、パブリック IP 優先)"
 
-#: ../clients/cli/settings.c:885
+#: ../clients/cli/settings.c:879
 #, c-format
 msgid "%d (enabled, prefer temporary IP)"
 msgstr "%d (有効、テンポラリ IP を優先)"
 
-#: ../clients/cli/settings.c:900
-#, fuzzy, c-format
+#: ../clients/cli/settings.c:894
+#, c-format
 msgid "%d (no)"
-msgstr "%d (不明)"
+msgstr "%d (no)"
 
-#: ../clients/cli/settings.c:902
+#: ../clients/cli/settings.c:896
 #, c-format
 msgid "%d (yes)"
-msgstr ""
+msgstr "%d (yes)"
 
-#: ../clients/cli/settings.c:905 ../clients/cli/settings.c:1605
-#, fuzzy, c-format
+#: ../clients/cli/settings.c:899 ../clients/cli/settings.c:1554
+#, c-format
 msgid "%d (default)"
-msgstr "(デフォルト)"
+msgstr "%d (default)"
 
-#: ../clients/cli/settings.c:918
+#: ../clients/cli/settings.c:912
 msgid "0 (none)"
 msgstr "0 (なし)"
 
-#: ../clients/cli/settings.c:924
+#: ../clients/cli/settings.c:918
 msgid "agent-owned, "
 msgstr "エージェント所有、 "
 
-#: ../clients/cli/settings.c:926
+#: ../clients/cli/settings.c:920
 msgid "not saved, "
 msgstr "未保存、 "
 
-#: ../clients/cli/settings.c:928
+#: ../clients/cli/settings.c:922
 msgid "not required, "
 msgstr "不必要、 "
 
-#: ../clients/cli/settings.c:977 ../clients/tui/nmt-mtu-entry.c:84
+#: ../clients/cli/settings.c:971 ../clients/tui/nmt-mtu-entry.c:84
 msgid "(default)"
 msgstr "(デフォルト)"
 
-#. ----------------------------------------------------------------------------
-#: ../clients/cli/settings.c:1063 ../clients/cli/settings.c:1106
-#: ../clients/cli/settings.c:1140 ../clients/cli/settings.c:1167
-#: ../clients/cli/settings.c:8033
-msgid "<hidden>"
-msgstr ""
-
-#: ../clients/cli/settings.c:1302
+#: ../clients/cli/settings.c:1252
 msgid "0 (disabled)"
 msgstr "0 (無効)"
 
-#: ../clients/cli/settings.c:1308
+#: ../clients/cli/settings.c:1258
 msgid "enabled, "
 msgstr "有効、"
 
-#: ../clients/cli/settings.c:1310
+#: ../clients/cli/settings.c:1260
 msgid "advertise, "
 msgstr "公表、"
 
-#: ../clients/cli/settings.c:1312
+#: ../clients/cli/settings.c:1262
 msgid "willing, "
 msgstr "用意がある、"
 
-#: ../clients/cli/settings.c:1340
+#: ../clients/cli/settings.c:1290
 msgid "-1 (unset)"
 msgstr "-1 (未設定)"
 
-#: ../clients/cli/settings.c:1472 ../clients/cli/settings.c:1777
-#: ../clients/cli/settings.c:1917
+#: ../clients/cli/settings.c:1422 ../clients/cli/settings.c:1724
+#: ../clients/cli/settings.c:1864
 msgid "auto"
 msgstr "自動"
 
-#: ../clients/cli/settings.c:1485 ../clients/cli/settings.c:1948
+#: ../clients/cli/settings.c:1435 ../clients/cli/settings.c:1895
 msgid "default"
 msgstr "デフォルト"
 
-#: ../clients/cli/settings.c:1607
-#, fuzzy, c-format
+#: ../clients/cli/settings.c:1556
+#, c-format
 msgid "%d (off)"
-msgstr "%d (不明)"
+msgstr "%d (off)"
 
-#: ../clients/cli/settings.c:1823
+#: ../clients/cli/settings.c:1770
 #, c-format
 msgid ""
 "invalid option '%s', use a combination of [%s] or 'ignore', 'default' or "
 "'none'"
-msgstr ""
+msgstr "無効なオプション '%s' です。[%s]、'ignore'、'default'、または 'none' の組み合わせを使用してください"
 
-#: ../clients/cli/settings.c:1834
+#: ../clients/cli/settings.c:1781
 msgid "'default' and 'ignore' are incompatible with other flags"
-msgstr ""
+msgstr "'default' と 'ignore' は他のフラグと使用できません"
 
-#: ../clients/cli/settings.c:1870
-#, fuzzy, c-format
+#: ../clients/cli/settings.c:1817
+#, c-format
 msgid "invalid mode '%s', use one of %s"
-msgstr "'%s' は無効なフィールドです; 許可されているのは次のフィールドです: %s"
+msgstr "無効なモード '%s' です。%s のいずれかを使用してください"
 
-#: ../clients/cli/settings.c:1952
+#: ../clients/cli/settings.c:1899
 #, c-format
 msgid "always"
-msgstr ""
+msgstr "always"
 
-#: ../clients/cli/settings.c:2052 ../clients/cli/settings.c:3398
-#: ../clients/cli/settings.c:4590 ../clients/cli/settings.c:5093
+#: ../clients/cli/settings.c:1999 ../clients/cli/settings.c:3286
+#: ../clients/cli/settings.c:4478 ../clients/cli/settings.c:4981
 #: ../libnm-core/nm-keyfile-reader.c:573
-#, fuzzy, c-format
+#, c-format
 msgid "invalid option '%s', use one of [%s]"
-msgstr "無効なオプション '%s'、またはその値 '%s' です"
+msgstr "無効なオプション '%s' です。[%s] のいずれかを使用してください"
 
-#: ../clients/cli/settings.c:2162
+#: ../clients/cli/settings.c:2116
 #, c-format
 msgid "Do you also want to set '%s' to '%s'? [yes]: "
 msgstr "'%s' を '%s' に設定しますか? [yes]: "
 
-#: ../clients/cli/settings.c:2164
+#: ../clients/cli/settings.c:2118
 #, c-format
 msgid "Do you also want to clear '%s'? [yes]: "
 msgstr "'%s' も消去しますか? [yes]: "
 
-#: ../clients/cli/settings.c:2325
+#: ../clients/cli/settings.c:2279
 #, c-format
 msgid ""
 "Warning: %s.%s set to '%s', but it might be ignored in infrastructure mode\n"
-msgstr ""
+msgstr "警告: %s.%s が '%s' に設定されましたが、インフラストラクチャモードでは無視されることがあります\n"
 
-#: ../clients/cli/settings.c:2344
+#: ../clients/cli/settings.c:2298
 #, c-format
 msgid "Warning: setting %s.%s requires removing ipv4 and ipv6 settings\n"
-msgstr ""
+msgstr "警告: %s.%s を設定するには、ipv4 と ipv6 の設定を削除する必要があります\n"
 
-#: ../clients/cli/settings.c:2346
-#, fuzzy
+#: ../clients/cli/settings.c:2300
 msgid "Do you want to remove them? [yes] "
-msgstr "指定しますか? (yes/no) [yes] "
+msgstr "削除しますか? [yes] "
 
-#: ../clients/cli/settings.c:2482 ../clients/cli/settings.c:2877
-#: ../clients/cli/settings.c:5294
+#: ../clients/cli/settings.c:2396 ../clients/cli/settings.c:2791
+#: ../clients/cli/settings.c:5182
 #, c-format
 msgid "'%s' is not valid"
 msgstr "'%s' は無効です"
 
-#: ../clients/cli/settings.c:2505
+#: ../clients/cli/settings.c:2419
 #, c-format
 msgid "'%d' is not valid; use <%d-%d>"
 msgstr "'%d' は無効です; <%d-%d> を使用してください"
 
-#: ../clients/cli/settings.c:2527
-#, fuzzy, c-format
+#: ../clients/cli/settings.c:2441
+#, c-format
 msgid "'%lld' is not valid; use <%lld-%lld>"
-msgstr "'%d' は無効です; <%d-%d> を使用してください"
+msgstr "'%lld' は有効ではありません。<%lld-%lld> を使用してください"
 
-#: ../clients/cli/settings.c:2549
-#, fuzzy, c-format
+#: ../clients/cli/settings.c:2463
+#, c-format
 msgid "'%u' is not valid; use <%u-%u>"
-msgstr "'%u' は無効です; <%d-%d> を使用してください"
+msgstr "'%u' は有効ではありません。<%u-%u> を使用してください"
 
-#: ../clients/cli/settings.c:2588
-#, fuzzy, c-format
+#: ../clients/cli/settings.c:2502
+#, c-format
 msgid "'%u' flags are not valid; use combination of %s"
-msgstr "'%s' は無効です; [%s] か [%s] を使用してください"
+msgstr "'%u' フラグは有効ではありません。%s の組み合わせを使用してください"
 
-#: ../clients/cli/settings.c:2655
+#: ../clients/cli/settings.c:2569
 #, c-format
 msgid "'%s' is not valid; use <option>=<value>"
 msgstr "'%s' は無効です; <option>=<value> を使用してください"
 
-#: ../clients/cli/settings.c:2689
+#: ../clients/cli/settings.c:2603
 #, c-format
 msgid "index '%s' is not valid"
 msgstr "インデックス '%s' は無効です"
 
-#: ../clients/cli/settings.c:2694 ../clients/cli/settings.c:2719
+#: ../clients/cli/settings.c:2608 ../clients/cli/settings.c:2633
 msgid "no item to remove"
 msgstr "削除するアイテムがありません"
 
-#: ../clients/cli/settings.c:2698 ../clients/cli/settings.c:2723
+#: ../clients/cli/settings.c:2612 ../clients/cli/settings.c:2637
 #, c-format
 msgid "index '%d' is not in range <0-%d>"
 msgstr "インデックス '%d' は範囲内にありません <0-%d>"
 
-#: ../clients/cli/settings.c:2738
+#: ../clients/cli/settings.c:2652
 #, c-format
 msgid "invalid option '%s'"
 msgstr "無効なオプション '%s'"
 
-#: ../clients/cli/settings.c:2740
+#: ../clients/cli/settings.c:2654
 msgid "missing option"
 msgstr "足りないオプション"
 
-#: ../clients/cli/settings.c:2767 ../clients/cli/settings.c:2787
-#: ../clients/cli/settings.c:2807 ../clients/cli/settings.c:2827
+#: ../clients/cli/settings.c:2681 ../clients/cli/settings.c:2701
+#: ../clients/cli/settings.c:2721 ../clients/cli/settings.c:2741
 #, c-format
 msgid "'%s' is not a valid number (or out of range)"
 msgstr "'%s' は有効な数字ではありません (または範囲外になります)"
 
-#: ../clients/cli/settings.c:2861
-#, fuzzy, c-format
+#: ../clients/cli/settings.c:2775
+#, c-format
 msgid "'%s' is not a valid value; use -1, 0 or 1"
-msgstr "'%s' は無効です; 0、1、2 のいずれかを使用してください。"
+msgstr "'%s' は有効な値ではありません。-1、0、または 1 を使用してください"
 
-#: ../clients/cli/settings.c:2893
+#: ../clients/cli/settings.c:2807
 #, c-format
 msgid "'%s' is not a valid Ethernet MAC"
 msgstr "'%s' は有効な Ethernet MAC ではありません"
 
-#: ../clients/cli/settings.c:2918 ../libnm-core/nm-setting-connection.c:864
+#: ../clients/cli/settings.c:2832 ../libnm-core/nm-setting-connection.c:864
 #: ../libnm-core/nm-setting-infiniband.c:255
 #: ../libnm-util/nm-setting-connection.c:834
 #: ../libnm-util/nm-setting-infiniband.c:269
@@ -5402,53 +5825,40 @@ msgstr "'%s' は有効な Ethernet MAC ではありません"
 msgid "'%s' is not a valid interface name"
 msgstr "'%s' は有効なインターフェース名ではありません"
 
-#: ../clients/cli/settings.c:2942
-#, fuzzy, c-format
+#: ../clients/cli/settings.c:2856
+#, c-format
 msgid "'%s' is not a valid flag number; use <0-%d>"
-msgstr "'%s' は有効なチャンネルではありません; <1-13> を使用してください"
+msgstr "'%s' は有効なフラグ番号ではありません。<0-%d> を使用してください"
 
-#: ../clients/cli/settings.c:2954
+#: ../clients/cli/settings.c:2868
 #, c-format
 msgid "Warning: '%s' sum is higher than all flags => all flags set\n"
-msgstr ""
+msgstr "警告: 合計 '%s' がすべてのフラグよりも大きいです => すべてのフラグが設定されています\n"
 
-#: ../clients/cli/settings.c:2995
+#: ../clients/cli/settings.c:2909
 #, c-format
 msgid "'%s' is not a valid hex character"
 msgstr "'%s' は有効な 16 進文字ではありません"
 
-#: ../clients/cli/settings.c:3025
+#: ../clients/cli/settings.c:2939
 #, c-format
 msgid "'%s' is not a valid MAC"
 msgstr "'%s' は有効な MAC ではありません"
 
-#. Don't allow setting type unless the connection is brand new.
-#. * Just because it's a bad idea and the user wouldn't probably want that.
-#. * No technical reason, really.
-#. * Also, using uuid to see if the connection is brand new is a bit
-#. * 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/cli/settings.c:3053
-#, fuzzy, c-format
-msgid "Can not change the connection type"
-msgstr "接続タイプを入力してください: "
-
-#: ../clients/cli/settings.c:3077 ../libnm-core/nm-setting-connection.c:853
+#: ../clients/cli/settings.c:2965 ../libnm-core/nm-setting-connection.c:853
 #: ../libnm-util/nm-setting-connection.c:791
 #, c-format
 msgid "'%s' is not a valid UUID"
 msgstr "'%s' は有効な UUID ではありません"
 
-#: ../clients/cli/settings.c:3144
+#: ../clients/cli/settings.c:3032
 #, c-format
 msgid "the property doesn't contain permission '%s'"
-msgstr ""
+msgstr "プロパティーにはパーミッション '%s' が含まれません"
 
-#: ../clients/cli/settings.c:3156
+#: ../clients/cli/settings.c:3044
 msgid ""
-"Enter a list of user permissions. This is a list of user names formatted "
-"as:\n"
+"Enter a list of user permissions. This is a list of user names formatted as:\n"
 "  [user:]<user name 1>, [user:]<user name 2>,...\n"
 "The items can be separated by commas or spaces.\n"
 "\n"
@@ -5460,41 +5870,39 @@ msgstr ""
 "\n"
 "例: alice bob charlie\n"
 
-#: ../clients/cli/settings.c:3175
+#: ../clients/cli/settings.c:3063
 #, c-format
 msgid "'%s' is not valid master; use ifname or connection UUID"
-msgstr ""
-"'%s' は 有効なマスターではありません: ifname か接続 UUID を使用してください。"
+msgstr "'%s' は 有効なマスターではありません: ifname か接続 UUID を使用してください。"
 
-#: ../clients/cli/settings.c:3219
+#: ../clients/cli/settings.c:3107
 #, c-format
 msgid "Warning: %s is not an UUID of any existing connection profile\n"
-msgstr ""
+msgstr "警告: %s は既存の接続プロファイルの UUID ではありません\n"
 
-#: ../clients/cli/settings.c:3223 ../clients/cli/settings.c:3239
-#, fuzzy, c-format
+#: ../clients/cli/settings.c:3111 ../clients/cli/settings.c:3127
+#, c-format
 msgid "'%s' is not a VPN connection profile"
-msgstr "エラー: '%s' は無効な接続タイプです。"
+msgstr "'%s' は VPN 接続プロファイルではありません"
 
-#: ../clients/cli/settings.c:3232
-#, fuzzy, c-format
+#: ../clients/cli/settings.c:3120
+#, c-format
 msgid "'%s' is not a name of any exiting profile"
-msgstr "'%s' は有効な team 設定でもファイル名でもありません"
+msgstr "'%s' は既存のプロファイルの名前ではありません"
 
-#: ../clients/cli/settings.c:3266
-#, fuzzy, c-format
+#: ../clients/cli/settings.c:3154
+#, c-format
 msgid "the value '%s' is not a valid UUID"
-msgstr "'%s' は有効な UUID ではありません"
+msgstr "値 '%s' は有効な UUID ではありません"
 
-#: ../clients/cli/settings.c:3273
+#: ../clients/cli/settings.c:3161
 #, c-format
 msgid "the property doesn't contain UUID '%s'"
-msgstr ""
+msgstr "プロパティーには UUID '%s' が含まれません"
 
-#: ../clients/cli/settings.c:3285
+#: ../clients/cli/settings.c:3173
 msgid ""
-"Enter secondary connections that should be activated when this connection "
-"is\n"
+"Enter secondary connections that should be activated when this connection is\n"
 "activated. Connections can be specified either by UUID or ID (name). nmcli\n"
 "transparently translates names to UUIDs. Note that NetworkManager only "
 "supports\n"
@@ -5503,8 +5911,15 @@ msgid ""
 "\n"
 "Example: private-openvpn, fe6ba5d8-c2fc-4aae-b2e3-97efddd8d9a7\n"
 msgstr ""
+"この接続がアクティベートされたときにアクティベートする必要がある\n"
+"セカンダリー接続を入力してください。接続は UUID または ID (名前) のいずれかで指定できます。nmcli\n"
+"は名前を透過的に UUID に変換します。NetworkManager は現時点では VPN をセカンダリー接続\n"
+"としてのみサポートします。\n"
+"項目はカンマまたはスペースで区切ることができます。\n"
+"\n"
+"例: private-openvpn, fe6ba5d8-c2fc-4aae-b2e3-97efddd8d9a7\n"
 
-#: ../clients/cli/settings.c:3352
+#: ../clients/cli/settings.c:3240
 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"
@@ -5512,38 +5927,51 @@ msgid ""
 "'false','no','off' to set the connection as not metered\n"
 "'unknown' to let NetworkManager choose a value using some heuristics\n"
 msgstr ""
+"接続がデータクォータ、使用コスト、または他の制限に基づくかどうかを\n"
+"示す値を入力します。使用できるオプション:\n"
+"接続を測定対象として設定する場合は 'true'、'yes'、'on'\n"
+"接続を非測定として設定する場合は 'false'、'no'、'off'\n"
+"NetworkManager でヒューリスティックを使用して値を選択できるようにする場合は 'unknown'\n"
 
-#: ../clients/cli/settings.c:3476
+#: ../clients/cli/settings.c:3364
 msgid "private key password not provided"
 msgstr "プライベートキーのパスワードが入力されていません"
 
-#: ../clients/cli/settings.c:3504
-#, fuzzy, c-format
+#: ../clients/cli/settings.c:3392
+#, c-format
 msgid "the property doesn't contain EAP method '%s'"
-msgstr "このプロパティは変更できません"
+msgstr "プロパティーには EAP メソッド '%s' が含まれません"
 
-#: ../clients/cli/settings.c:3521
+#: ../clients/cli/settings.c:3409
 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 ""
+"CA 証明書へのファイルパスを入力します (オプションで file:// を先頭に指定できます)。\n"
+"  [file://]<ファイルパス>\n"
+"nmcli では証明書をロー blob データとして指定できないことに注意してください。\n"
+"例: /home/cimrman/cacert.crt\n"
 
-#: ../clients/cli/settings.c:3540
+#: ../clients/cli/settings.c:3428
 #, c-format
 msgid "the property doesn't contain alternative subject match '%s'"
-msgstr ""
+msgstr "プロパティーには代替のサブジェクトマッチ '%s' が含まれません"
 
-#: ../clients/cli/settings.c:3556
+#: ../clients/cli/settings.c:3444
 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 ""
+"クライアント証明書へのファイルパスを入力します (オプションで file:// を先頭に指定できます)。\n"
+"  [file://]<ファイルパス>\n"
+"nmcli では証明書をロー blob データとして指定できないことに注意してください。\n"
+"例: /home/cimrman/jara.crt\n"
 
-#: ../clients/cli/settings.c:3568
+#: ../clients/cli/settings.c:3456
 msgid ""
 "Enter file path to CA certificate for inner authentication (optionally "
 "prefixed\n"
@@ -5552,13 +5980,18 @@ msgid ""
 "Note that nmcli does not support specifying certificates as raw blob data.\n"
 "Example: /home/cimrman/ca-zweite-phase.crt\n"
 msgstr ""
+"内部認証のために CA 証明書へのファイルパスを入力します (オプションで file:// を\n"
+"先頭に指定できます)。\n"
+"  [file://]<ファイルパス>\n"
+"nmcli では証明書をロー blob データとして指定できないことに注意してください。\n"
+"例: /home/cimrman/ca-zweite-phase.crt\n"
 
-#: ../clients/cli/settings.c:3588
+#: ../clients/cli/settings.c:3476
 #, c-format
 msgid "the property doesn't contain \"phase2\" alternative subject match '%s'"
-msgstr ""
+msgstr "プロパティーには代替の  \"phase2\" サブジェクトマッチ '%s' が含まれません"
 
-#: ../clients/cli/settings.c:3604
+#: ../clients/cli/settings.c:3492
 msgid ""
 "Enter file path to client certificate for inner authentication (optionally "
 "prefixed\n"
@@ -5567,26 +6000,29 @@ msgid ""
 "Note that nmcli does not support specifying certificates as raw blob data.\n"
 "Example: /home/cimrman/jara-zweite-phase.crt\n"
 msgstr ""
+"内部認証のためにクライアント証明書へのファイルパスを入力します (オプションで file:// を\n"
+"先頭に指定できます)。\n"
+"  [file://]<ファイルパス>\n"
+"nmcli では証明書をロー blob データとして指定できないことに注意してください。\n"
+"例: /home/cimrman/jara-zweite-phase.crt\n"
 
-#: ../clients/cli/settings.c:3624
-#, fuzzy
+#: ../clients/cli/settings.c:3512
 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 ""
-"プライベートキーへのパスとキーパスワード (まだ設定していない場合) を入力して"
-"ください:\n"
-"  <file path> [<password>]\n"
+"プライベートキーへのパスとキーパスワード (まだ設定していない場合) を入力してください:\n"
+"  [file://]<ファイルパス> [<パスワード>]\n"
+"nmcli ではプライベートキーをロー blob データとして指定できないことに注意してください。\n"
 "例: /home/cimrman/jara-priv-key Dardanely\n"
 
-#: ../clients/cli/settings.c:3695
+#: ../clients/cli/settings.c:3583
 msgid ""
 "Enter bytes as a list of hexadecimal values.\n"
 "Two formats are accepted:\n"
-"(a) a string of hexadecimal digits, where each two digits represent one "
-"byte\n"
+"(a) a string of hexadecimal digits, where each two digits represent one byte\n"
 "(b) space-separated list of bytes written as hexadecimal digits (with "
 "optional 0x/0X prefix, and optional leading 0).\n"
 "\n"
@@ -5596,13 +6032,12 @@ msgstr ""
 "16 進値の一覧のバイトを入力してください。\n"
 "入力できる形式は 2 種類あります。\n"
 "(a) 16 進の数字から成る列、2 桁で 1 バイト\n"
-"(b) 空白で区切った 16 進の数字の並び (オプションで 0x/0X プレフィックス、およ"
-"び先行の 0 を使用可能)\n"
+"(b) 空白で区切った 16 進の数字の並び (オプションで 0x/0X プレフィックス、および先行の 0 を使用可能)\n"
 "\n"
 "例: ab0455a6ea3a74C2\n"
 "          ab 4 55 0xa6 ea 3a 74 C2\n"
 
-#: ../clients/cli/settings.c:3816
+#: ../clients/cli/settings.c:3704
 #, c-format
 msgid ""
 "Enter a list of bonding options formatted as:\n"
@@ -5633,58 +6068,56 @@ msgstr ""
 "\n"
 "例: mode=2,miimon=120\n"
 
-#: ../clients/cli/settings.c:3847
+#: ../clients/cli/settings.c:3735
 #, c-format
 msgid "'%s' is not a valid InfiniBand MAC"
 msgstr "'%s' は有効な InfiniBand MAC ではありません"
 
-#: ../clients/cli/settings.c:3884
+#: ../clients/cli/settings.c:3772
 #, c-format
 msgid "'%s' is not a valid IBoIP P_Key"
 msgstr "'%s' は有効な IBoIP P_Key ではありません"
 
-#: ../clients/cli/settings.c:3915
-#, fuzzy, c-format
+#: ../clients/cli/settings.c:3803
+#, c-format
 msgid "'%s' is not valid (the format is: ip[/prefix] [next-hop] [metric])"
-msgstr "'%s' は無効です (ip/[prefix] next-hop [metric] を使用してください)"
+msgstr "'%s' は無効です (書式: ip[/prefix] [next-hop] [metric])"
 
-#: ../clients/cli/settings.c:3963 ../clients/cli/settings.c:3982
+#: ../clients/cli/settings.c:3851 ../clients/cli/settings.c:3870
 #, c-format
 msgid "invalid IPv4 address '%s'"
 msgstr "無効な IPv4 アドレス '%s'"
 
-#: ../clients/cli/settings.c:3988 ../clients/cli/settings.c:4296
+#: ../clients/cli/settings.c:3876 ../clients/cli/settings.c:4184
 #, c-format
 msgid "the property doesn't contain DNS server '%s'"
-msgstr ""
+msgstr "プロパティーには DNS サーバー '%s' が含まれません"
 
-#: ../clients/cli/settings.c:4000
+#: ../clients/cli/settings.c:3888
 msgid ""
 "Enter a list of IPv4 addresses of DNS servers.\n"
 "\n"
 "Example: 8.8.8.8, 8.8.4.4\n"
-msgstr ""
-"DNS サーバーの IPv4 アドレス一覧を入力してください。\n"
+msgstr "DNS サーバーの IPv4 アドレス一覧を入力してください。\n"
 "\n"
 "例: 8.8.8.8, 8.8.4.4\n"
 
-#: ../clients/cli/settings.c:4036 ../clients/cli/settings.c:4350
+#: ../clients/cli/settings.c:3924 ../clients/cli/settings.c:4238
 #, c-format
 msgid "the property doesn't contain DNS search domain '%s'"
-msgstr ""
+msgstr "プロパティーには DNS 検索ドメイン '%s' が含まれません"
 
-#: ../clients/cli/settings.c:4074 ../clients/cli/settings.c:4388
+#: ../clients/cli/settings.c:3962 ../clients/cli/settings.c:4276
 #, c-format
 msgid "the property doesn't contain DNS option '%s'"
-msgstr ""
+msgstr "プロパティーには DNS オプション '%s' が含まれません"
 
-#: ../clients/cli/settings.c:4128 ../clients/cli/settings.c:4441
+#: ../clients/cli/settings.c:4016 ../clients/cli/settings.c:4329
 #, c-format
 msgid "the property doesn't contain IP address '%s'"
-msgstr ""
+msgstr "プロパティーには IP アドレス '%s' が含まれません"
 
-#: ../clients/cli/settings.c:4141
-#, fuzzy
+#: ../clients/cli/settings.c:4029
 msgid ""
 "Enter a list of IPv4 addresses formatted as:\n"
 "  ip[/prefix], ip[/prefix],...\n"
@@ -5693,23 +6126,22 @@ msgid ""
 "Example: 192.168.1.5/24, 10.0.0.11/24\n"
 msgstr ""
 "次のような形式で IPv4 アドレスの一覧を入力してください。\n"
-"  ip[/prefix] [gateway], ip[/prefix] [gateway],...\n"
-"プレフィックスがないものはプレフィックス 32 とみなします。\n"
+"  ip[/prefix], ip[/prefix],...\n"
+"prefix が指定されない場合、プレフィックスは 32 と見なされます。\n"
 "\n"
-"例: 192.168.1.5/24 192.168.1.1, 10.0.0.11/24\n"
+"例: 192.168.1.5/24, 10.0.0.11/24\n"
 
-#: ../clients/cli/settings.c:4157 ../clients/cli/settings.c:4470
-#, fuzzy, c-format
+#: ../clients/cli/settings.c:4045 ../clients/cli/settings.c:4358
+#, c-format
 msgid "invalid gateway address '%s'"
-msgstr "無効なゲートウェイ '%s'"
+msgstr "無効なゲートウェイアドレス '%s'"
 
-#: ../clients/cli/settings.c:4212 ../clients/cli/settings.c:4525
-#, fuzzy, c-format
+#: ../clients/cli/settings.c:4100 ../clients/cli/settings.c:4413
+#, c-format
 msgid "the property doesn't contain route '%s'"
-msgstr "このプロパティは変更できません"
+msgstr "プロパティーにはルート '%s' が含まれません"
 
-#: ../clients/cli/settings.c:4225
-#, fuzzy
+#: ../clients/cli/settings.c:4113
 msgid ""
 "Enter a list of IPv4 routes formatted as:\n"
 "  ip[/prefix] [next-hop] [metric],...\n"
@@ -5722,18 +6154,21 @@ msgid ""
 "          10.1.2.0/24\n"
 msgstr ""
 "IPv4 ルートの一覧を次の形式で入力します。\n"
-"  ip/[prefix] next-hop [metric],...\n"
-"プレフィックスが足りない場合、プレフィックス 32 とみなされます。\n"
-"メトリックが足りない場合、メトリック 0 とみなされます。\n"
+"  ip[/prefix] [next-hop] [metric],...\n"
+"\n"
+"prefix が指定されない場合、プレフィックスは 32 と見なされます。\n"
+"next-hop が指定されない場合は、0.0.0.0 と見なされます。\n"
+"metric が指定されない場合は、デフォルト値と見なされます (NM/カーネルはデフォルト値を設定します)。\n"
 "\n"
 "例: 192.168.2.0/24 192.168.2.1 3, 10.1.0.0/16 10.0.0.254\n"
+"          10.1.2.0/24\n"
 
-#: ../clients/cli/settings.c:4271 ../clients/cli/settings.c:4290
+#: ../clients/cli/settings.c:4159 ../clients/cli/settings.c:4178
 #, c-format
 msgid "invalid IPv6 address '%s'"
 msgstr "無効な IPv6 アドレス '%s'"
 
-#: ../clients/cli/settings.c:4308
+#: ../clients/cli/settings.c:4196
 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 "
@@ -5744,16 +6179,14 @@ msgid ""
 "\n"
 "Example: 2607:f0d0:1002:51::4, 2607:f0d0:1002:51::1\n"
 msgstr ""
-"DNS サーバーの IPv6 アドレス一覧を入力します。IPv6 設定方法が 'auto' の場合"
-"は、自動設定で返されるアドレスに DNSサーバーが追加されます。 'shared' または "
-"'link-local' の IPv6  設定方法では DNS サーバーは使用できません。アップスト"
-"リームのネットワークがないためです。他の IPv6 設定方法ではすべて DNS サーバー"
-"はこの接続用の DNS サーバーとしてのみ使用されます。\n"
+"DNS サーバーの IPv6 アドレス一覧を入力します。IPv6 設定方法が 'auto' の場合は、自動設定で返されるアドレスに "
+"DNSサーバーが追加されます。 'shared' または 'link-local' の IPv6  設定方法では DNS "
+"サーバーは使用できません。アップストリームのネットワークがないためです。他の IPv6 設定方法ではすべて DNS サーバーはこの接続用の DNS "
+"サーバーとしてのみ使用されます。\n"
 "\n"
 "例: 2607:f0d0:1002:51::4, 2607:f0d0:1002:51::1\n"
 
-#: ../clients/cli/settings.c:4454
-#, fuzzy
+#: ../clients/cli/settings.c:4342
 msgid ""
 "Enter a list of IPv6 addresses formatted as:\n"
 "  ip[/prefix], ip[/prefix],...\n"
@@ -5762,14 +6195,12 @@ msgid ""
 "Example: 2607:f0d0:1002:51::4/64, 1050:0:0:0:5:600:300c:326b\n"
 msgstr ""
 "次のような形式で IPv6 アドレスの一覧を入力してください。\n"
-"  ip[/prefix] [gateway], ip[/prefix] [gateway],...\n"
-"プレフィックスがないものはプレフィックス 128 とみなします。\n"
+"  ip[/prefix], ip[/prefix],...\n"
+"prefix が指定されない場合、プレフィックスは 128 と見なされます。\n"
 "\n"
-"例: 2607:f0d0:1002:51::4/64 2607:f0d0:1002:51::1, "
-"1050:0:0:0:5:600:300c:326b\n"
+"例: 2607:f0d0:1002:51::4/64, 1050:0:0:0:5:600:300c:326b\n"
 
-#: ../clients/cli/settings.c:4538
-#, fuzzy
+#: ../clients/cli/settings.c:4426
 msgid ""
 "Enter a list of IPv6 routes formatted as:\n"
 "  ip[/prefix] [next-hop] [metric],...\n"
@@ -5783,35 +6214,38 @@ msgid ""
 "          abbe::/64 55\n"
 msgstr ""
 "IPv6 ルートの一覧を次の形式で入力します。\n"
-"  ip/[prefix] next-hop [metric],...\n"
-"プレフィックスが足りない場合、プレフィックス 128 とみなされます。\n"
-"メトリックが足りない場合、メトリック 0 とみなされます。\n"
+"  ip[/prefix] [next-hop] [metric],...\n"
+"\n"
+"prefix が指定されない場合、プレフィックスは 128 と見なされます。\n"
+"next-hop が指定されない場合は、\"::\" と見なされます。\n"
+"metric が指定されない場合は、デフォルト値と見なされます (NM/カーネルはデフォルト値を設定します)。\n"
 "\n"
-"例: 2001:db8:beef:2::/64 2001:db8:beef::2, 2001:db8:beef:3::/64 2001:db8:"
-"beef::3 2\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"
 
-#: ../clients/cli/settings.c:4555 ../libnm-core/nm-setting-gsm.c:363
+#: ../clients/cli/settings.c:4443 ../libnm-core/nm-setting-gsm.c:363
 #: ../libnm-util/nm-setting-gsm.c:364
 #, c-format
 msgid "'%s' is not a number"
 msgstr "'%s' は数字ではありません"
 
-#: ../clients/cli/settings.c:4562
+#: ../clients/cli/settings.c:4450
 #, c-format
 msgid "'%s' is not valid; use 0, 1, or 2"
 msgstr "'%s' は無効です; 0、1、2 のいずれかを使用してください。"
 
-#: ../clients/cli/settings.c:4609
+#: ../clients/cli/settings.c:4497
 #, c-format
 msgid "'%s' is not a valid channel; use <1-13>"
 msgstr "'%s' は有効なチャンネルではありません; <1-13> を使用してください"
 
-#: ../clients/cli/settings.c:4646
+#: ../clients/cli/settings.c:4534
 #, c-format
 msgid "'%s' is not valid; use [e, o, n]"
 msgstr "'%s' は無効です; [e, o, n] を使用してください"
 
-#: ../clients/cli/settings.c:4674
+#: ../clients/cli/settings.c:4562
 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 "
@@ -5821,76 +6255,75 @@ msgid ""
 "\"roundrobin\"}, \"ports\": {\"eth1\": {}, \"eth2\": {}} }\n"
 "          set team.config /etc/my-team.conf\n"
 msgstr ""
-"nmcli ではダイレクトの JSON 設定データ、設定を含むファイル名のいずれも受け取"
-"ることができます。設定を含むファイル名の場合、そのファイルが読み込まれてコン"
-"テンツがこのプロパティに置かれます。\n"
+"nmcli ではダイレクトの JSON "
+"設定データ、設定を含むファイル名のいずれも受け取ることができます。設定を含むファイル名の場合、そのファイルが読み込まれてコンテンツがこのプロパティに置かれます。\n"
 "\n"
 "例: set team.config { \"device\": \"team0\", \"runner\": {\"name\": "
 "\"roundrobin\"}, \"ports\": {\"eth1\": {}, \"eth2\": {}} }\n"
 "          set team.config /etc/my-team.conf\n"
 
-#: ../clients/cli/settings.c:4714
+#: ../clients/cli/settings.c:4602
 msgid "no priority to remove"
 msgstr "削除する優先度がありません"
 
-#: ../clients/cli/settings.c:4718
+#: ../clients/cli/settings.c:4606
 #, c-format
 msgid "index '%d' is not in the range of <0-%d>"
 msgstr "インデックス '%d' は <0-%d> の範囲内にありません"
 
-#: ../clients/cli/settings.c:4757
+#: ../clients/cli/settings.c:4645
 #, c-format
 msgid ""
-"Warning: only one mapping at a time is supported; taking the first one (%s)\n"
-msgstr ""
+"Warning: only one mapping at a time is supported; taking the first one "
+"(%s)\n"
+msgstr "警告: マッピングは一度に 1 つだけ行えます。最初のマッピング (%s) を行います\n"
 
-#: ../clients/cli/settings.c:4764
-#, fuzzy, c-format
+#: ../clients/cli/settings.c:4652
+#, c-format
 msgid "the property doesn't contain mapping '%s'"
-msgstr "このプロパティは変更できません"
+msgstr "プロパティーにはマッピング '%s' が含まれません"
 
-#: ../clients/cli/settings.c:4812
-#, fuzzy, c-format
+#: ../clients/cli/settings.c:4700
+#, c-format
 msgid "'%s' cannot be empty"
-msgstr "'%s' オプションが空白です"
+msgstr "'%s' を空白にすることはできません"
 
-#: ../clients/cli/settings.c:4886 ../clients/cli/settings.c:5053
-#: ../libnm-core/nm-setting-wired.c:651 ../libnm-core/nm-setting-wireless.c:820
-#: ../libnm-core/nm-setting-wireless.c:832 ../libnm-util/nm-setting-wired.c:646
+#: ../clients/cli/settings.c:4774 ../clients/cli/settings.c:4941
+#: ../libnm-core/nm-setting-wired.c:651
+#: ../libnm-core/nm-setting-wireless.c:820
+#: ../libnm-core/nm-setting-wireless.c:832
+#: ../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/cli/settings.c:4892 ../clients/cli/settings.c:5059
+#: ../clients/cli/settings.c:4780 ../clients/cli/settings.c:4947
 #, c-format
 msgid "the property doesn't contain MAC address '%s'"
-msgstr ""
+msgstr "プロパティーには MAC アドレス '%s' が含まれません"
 
-#: ../clients/cli/settings.c:4911
-#, fuzzy, c-format
+#: ../clients/cli/settings.c:4799
+#, c-format
 msgid "'%s' is not valid; 2 or 3 strings should be provided"
-msgstr "'%s' は無効です; 3 つの文字列を入力してください"
+msgstr "'%s' は無効です; 2  文字または 3 文字の文字列を入力してください"
 
-#: ../clients/cli/settings.c:4925
-#, fuzzy
+#: ../clients/cli/settings.c:4813
 msgid ""
 "Enter a list of subchannels (comma or space separated).\n"
 "\n"
 "Example: 0.0.0e20 0.0.0e21 0.0.0e22\n"
-msgstr ""
-"3 チャンネルの一覧を入力してください (チャンネル同士はコンマまたは空白で区切"
-"ります)。\n"
+msgstr "サブチャネルの一覧を入力します (カンマまたはスペースで区切ります)。\n"
 "\n"
 "例: 0.0.0e20 0.0.0e21 0.0.0e22\n"
 
-#: ../clients/cli/settings.c:4947
+#: ../clients/cli/settings.c:4835
 #, c-format
 msgid "'%s' string value should consist of 1 - 199 characters"
-msgstr ""
+msgstr "'%s' 文字列値は 1〜199 の文字で構成される必要があります"
 
-#: ../clients/cli/settings.c:4979
+#: ../clients/cli/settings.c:4867
 #, c-format
 msgid ""
 "Enter a list of S/390 options formatted as:\n"
@@ -5901,202 +6334,243 @@ msgstr ""
 "  option = <value>, option = <value>,...\n"
 "次が有効なオプションになります: %s\n"
 
-#: ../clients/cli/settings.c:5025
+#: ../clients/cli/settings.c:4913
 #, c-format
 msgid "'%s' is not a valid channel"
 msgstr "'%s' は有効なチャンネルではありません"
 
-#: ../clients/cli/settings.c:5031
+#: ../clients/cli/settings.c:4919
 #, c-format
 msgid "'%ld' is not a valid channel"
 msgstr "'%ld' は有効なチャンネルではありません"
 
-#: ../clients/cli/settings.c:5125
-#, fuzzy, c-format
+#: ../clients/cli/settings.c:5013
+#, c-format
 msgid "invalid option '%s', use 'default', 'never' or 'always'"
-msgstr "無効なオプション '%s'、またはその値 '%s' です"
+msgstr "無効なオプション '%s' です。'default'、'never'、または 'always' を使用してください"
 
-#: ../clients/cli/settings.c:5186 ../clients/cli/settings.c:5225
-#: ../clients/cli/settings.c:5264
+#: ../clients/cli/settings.c:5074 ../clients/cli/settings.c:5113
+#: ../clients/cli/settings.c:5152
 #, c-format
 msgid "the property doesn't contain protocol '%s'"
-msgstr ""
+msgstr "プロパティーにはプロトコル '%s' が含まれません"
 
-#: ../clients/cli/settings.c:5303
+#: ../clients/cli/settings.c:5191
 #, c-format
 msgid ""
 "'%s' not compatible with %s '%s', please change the key or set the right %s "
 "first."
-msgstr ""
+msgstr "'%s' と %s '%s' は互換性がありません。キーを変更するか、適切な %s を最初に設定してください。"
 
-#: ../clients/cli/settings.c:5311
+#: ../clients/cli/settings.c:5199
 #, c-format
 msgid "WEP key is guessed to be of '%s'\n"
 msgstr "WEP キーは '%s' であると仮定しています\n"
 
-#: ../clients/cli/settings.c:5313
-#, fuzzy, c-format
+#: ../clients/cli/settings.c:5201
+#, c-format
 msgid "WEP key index set to '%d'\n"
-msgstr "WEP キーは '%s' であると仮定しています\n"
+msgstr "WEP キーインデックスは '%d' に設定されます\n"
 
-#: ../clients/cli/settings.c:5336
+#: ../clients/cli/settings.c:5224
 #, c-format
 msgid "'%s' not among [0 (unknown), 1 (key), 2 (passphrase)]"
 msgstr "'%s' は [0 (unknown), 1 (key), 2 (passphrase)] にはありません"
 
-#: ../clients/cli/settings.c:5352 ../clients/cli/settings.c:5355
-#: ../clients/cli/settings.c:5358 ../clients/cli/settings.c:5361
+#: ../clients/cli/settings.c:5240 ../clients/cli/settings.c:5243
+#: ../clients/cli/settings.c:5246 ../clients/cli/settings.c:5249
 #, c-format
 msgid ""
 "Warning: '%s' is not compatible with '%s' type, please change or delete the "
 "key.\n"
-msgstr ""
+msgstr "警告: '%s' と '%s' タイプは互換性がありません。キーを変更するか、キーを削除してください。\n"
 
-#: ../clients/cli/settings.c:5374
+#: ../clients/cli/settings.c:5262
 #, c-format
 msgid ""
 "Enter the type of WEP keys. The accepted values are: 0 or unknown, 1 or key, "
 "and 2 or passphrase.\n"
 msgstr ""
-"WEP キーのタイプを入力します。使用できる値は、0 または unknown、1 または "
-"key、2 または passphrase です。\n"
+"WEP キーのタイプを入力します。使用できる値は、0 または unknown、1 または key、2 または passphrase です。\n"
 
-#: ../clients/cli/settings.c:5387
+#: ../clients/cli/settings.c:5275
 #, c-format
 msgid "'%s' is not a valid PSK"
 msgstr "'%s' は有効な PSK ではありません"
 
-#: ../clients/cli/settings.c:5431
+#: ../clients/cli/settings.c:5319
 #, c-format
 msgid "'%s' is not a valid DCB flag"
 msgstr "'%s' は有効な DCB フラグではありません"
 
-#: ../clients/cli/settings.c:5454
+#: ../clients/cli/settings.c:5342
 #, c-format
 msgid "'%s' is not a DCB app priority"
 msgstr "'%s' は DCB アプリケーションの優先度ではありません"
 
-#: ../clients/cli/settings.c:5480
+#: ../clients/cli/settings.c:5368
 msgid "must contain 8 comma-separated numbers"
 msgstr "コンマで区切った 8 つの番号を含ませてください"
 
-#: ../clients/cli/settings.c:5497
+#: ../clients/cli/settings.c:5385
 #, c-format
 msgid "'%s' not a number between 0 and %u (inclusive) or %u"
 msgstr "'%s' は 0 と %u (含む) または %u の間の数ではありません"
 
-#: ../clients/cli/settings.c:5500
+#: ../clients/cli/settings.c:5388
 #, c-format
 msgid "'%s' not a number between 0 and %u (inclusive)"
 msgstr "'%s' は 0 と %u (含む) の間の数ではありません"
 
-#: ../clients/cli/settings.c:5522
+#: ../clients/cli/settings.c:5410
 #, c-format
-msgid ""
-"Warning: changes will have no effect until '%s' includes 1 (enabled)\n"
+msgid "Warning: changes will have no effect until '%s' includes 1 (enabled)\n"
 "\n"
-msgstr ""
-"警告: 変更は '%s' に 1 (有効) を含ませるまで効果はありません\n"
+msgstr "警告: 変更は '%s' に 1 (有効) を含ませるまで効果はありません\n"
 "\n"
 
-#: ../clients/cli/settings.c:5575
+#: ../clients/cli/settings.c:5463
 #, c-format
 msgid "bandwidth percentages must total 100%%"
 msgstr "帯域幅のパーセンテージの合計は 100%% にならなければなりません"
 
-#: ../clients/cli/settings.c:5661 ../clients/cli/settings.c:5667
+#: ../clients/cli/settings.c:5549 ../clients/cli/settings.c:5555
 msgid "SIM operator ID must be a 5 or 6 number MCCMNC code"
-msgstr ""
+msgstr "SIM オペレーター IDは、5 桁または 6 桁の数字の MCCMNC コードである必要があります"
 
-#: ../clients/cli/settings.c:5710
-#, fuzzy, c-format
+#: ../clients/cli/settings.c:5598
+#, c-format
 msgid "invalid option '%s', use '%s' or '%s'"
-msgstr "無効なオプション '%s'、またはその値 '%s' です"
+msgstr "無効なオプション '%s' です。'%s' または '%s' を使用してください"
 
-#: ../clients/cli/settings.c:7777
+#: ../clients/cli/settings.c:7644
 msgid "don't know how to get the property value"
 msgstr "プロパティ値の取得方法がわかりません"
 
-#: ../clients/cli/settings.c:7830 ../clients/cli/settings.c:7870
+#: ../clients/cli/settings.c:7697 ../clients/cli/settings.c:7737
 msgid "the property can't be changed"
 msgstr "このプロパティは変更できません"
 
-#: ../clients/cli/settings.c:7954
-#, fuzzy
+#: ../clients/cli/settings.c:7821
 msgid "(not available)"
-msgstr "利用不可"
+msgstr "(利用不可)"
 
-#: ../clients/cli/settings.c:7979
+#: ../clients/cli/settings.c:7846
 msgid "[NM property description]"
 msgstr "[NM プロパティの詳細]"
 
-#: ../clients/cli/settings.c:7984
+#: ../clients/cli/settings.c:7851
 msgid "[nmcli specific description]"
 msgstr "[nmcli 固有の詳細]"
 
+#. ----------------------------------------------------------------------------
+#: ../clients/cli/settings.c:7900
+msgid "<hidden>"
+msgstr "<hidden>"
+
+#: ../clients/cli/utils.c:124
+#, c-format
+msgid "Error: value for '%s' argument is required."
+msgstr "エラー: '%s' 引数の値が必要です。"
+
 #: ../clients/cli/utils.c:149
 #, c-format
 msgid "Error: Argument '%s' was expected, but '%s' provided."
-msgstr ""
-"エラー: 引数 '%s' の入力が期待されていましたが、'%s' が入力されました。"
+msgstr "エラー: 引数 '%s' の入力が期待されていましたが、'%s' が入力されました。"
 
 #: ../clients/cli/utils.c:152
 #, c-format
 msgid "Error: Unexpected argument '%s'"
 msgstr "エラー: 予期しない引数 '%s' です"
 
+#: ../clients/cli/utils.c:202
+#, c-format
+msgid "Error converting IP4 address '0x%X' to text form"
+msgstr "IP4 アドレス 0x%X をテキスト形式に変換中にエラーが発生しました"
+
+#: ../clients/cli/utils.c:230
+#, c-format
+msgid "Error converting IP6 address '%s' to text form"
+msgstr "IP6 アドレス '%s' をテキスト形式に変換中にエラーが発生しました"
+
 #. Translators: the first %s is the partial value entered by
 #. * the user, the second %s a list of compatible values.
-#.
-#: ../clients/cli/utils.c:492 ../clients/cli/utils.c:523
-#, fuzzy, c-format
+#. 
+#: ../clients/cli/utils.c:546 ../clients/cli/utils.c:577
+#, c-format
 msgid "'%s' is ambiguous (%s)"
-msgstr "'%s' が不明瞭です (%s x %s)"
+msgstr "'%s' が不明瞭です (%s)"
 
-#: ../clients/cli/utils.c:502
+#: ../clients/cli/utils.c:556
 #, c-format
 msgid "'%s' is not valid; use [%s] or [%s]"
 msgstr "'%s' は無効です; [%s] か [%s] を使用してください"
 
-#: ../clients/cli/utils.c:535
-#, fuzzy, c-format
+#: ../clients/cli/utils.c:589
+#, c-format
 msgid "'%s' is not valid; use [%s], [%s] or [%s]"
-msgstr "'%s' は無効です; [%s] か [%s] を使用してください"
+msgstr "'%s' は無効です;  [%s]、[%s]、または [%s] を使用してください"
 
-#: ../clients/cli/utils.c:634
+#: ../clients/cli/utils.c:688
 #, c-format
 msgid "'%s' is ambiguous (%s x %s)"
 msgstr "'%s' が不明瞭です (%s x %s)"
 
-#: ../clients/cli/utils.c:646
+#: ../clients/cli/utils.c:700
 #, c-format
 msgid "missing name, try one of [%s]"
 msgstr "名前がありません、[%s] のうちのいずれかで試してみてください"
 
-#: ../clients/cli/utils.c:893
+#: ../clients/cli/utils.c:964
 #, c-format
 msgid "field '%s' has to be alone"
 msgstr "フィールド '%s' は孤立する必要があります"
 
-#: ../clients/cli/utils.c:896
+#: ../clients/cli/utils.c:967
 #, c-format
 msgid "invalid field '%s'; allowed fields: %s"
 msgstr "'%s' は無効なフィールドです; 許可されているのは次のフィールドです: %s"
 
-#: ../clients/cli/utils.c:953
+#: ../clients/cli/utils.c:1024
 msgid "Option '--terse' requires specifying '--fields'"
 msgstr "オプション '--terse' には '--fields' の指定が必要です"
 
-#: ../clients/cli/utils.c:957
+#: ../clients/cli/utils.c:1028
 #, c-format
 msgid "Option '--terse' requires specific '--fields' option values , not '%s'"
+msgstr "オプション'--terse' には特定の '--fields' オプションの値が必要で、 '%s' ではありません"
+
+#: ../clients/cli/utils.c:1390
+#, c-format
+msgid ""
+"Warning: nmcli (%s) and NetworkManager (%s) versions don't match. Use --"
+"nocheck to suppress the warning.\n"
 msgstr ""
-"オプション'--terse' には特定の '--fields' オプションの値が必要で、 '%s' では"
-"ありません"
+"警告: nmcli (%s) と NetworkManager (%s) のバージョンが一致しません。警告を回避する場合は --nocheck "
+"を使用します。\n"
+
+#: ../clients/cli/utils.c:1399
+#, c-format
+msgid ""
+"Error: nmcli (%s) and NetworkManager (%s) versions don't match. Force "
+"execution using --nocheck, but the results are unpredictable."
+msgstr ""
+"エラー: nmcli (%s) と NetworkManager (%s) のバージョンが一致しません。--nocheck "
+"を使用すると強制的に実行することはできますが、予測できない結果となります。"
 
 #: ../clients/common/nm-polkit-listener.c:212
 msgid "An authentication session is already underway."
-msgstr ""
+msgstr "認証セッションはすでに実行されています。"
+
+#. TTLS and PEAP are actually much more complicated, but this complication
+#. * is not visible here since we only care about phase2 authentication
+#. * (and don't even care of which one)
+#. 
+#: ../clients/common/nm-secret-agent-simple.c:223
+#: ../clients/common/nm-secret-agent-simple.c:328
+#: ../clients/tui/nmt-page-dsl.c:66 ../clients/tui/nmt-page-wifi.c:332
+msgid "Username"
+msgstr "ユーザー名"
 
 #: ../clients/common/nm-secret-agent-simple.c:230
 #: ../clients/common/nm-secret-agent-simple.c:273
@@ -6105,10 +6579,9 @@ msgstr ""
 #: ../clients/common/nm-secret-agent-simple.c:492
 #: ../clients/common/nm-secret-agent-simple.c:507
 #: ../clients/common/nm-secret-agent-simple.c:525
-#: ../clients/common/nm-vpn-helpers.c:119
-#: ../clients/common/nm-vpn-helpers.c:120
-#: ../clients/common/nm-vpn-helpers.c:124
-#: ../clients/common/nm-vpn-helpers.c:127 ../clients/tui/nmt-page-dsl.c:75
+#: ../clients/common/nm-vpn-helpers.c:101
+#: ../clients/common/nm-vpn-helpers.c:102
+#: ../clients/common/nm-vpn-helpers.c:105 ../clients/tui/nmt-page-dsl.c:75
 #: ../clients/tui/nmt-page-wifi.c:277 ../clients/tui/nmt-page-wifi.c:308
 #: ../clients/tui/nmt-page-wifi.c:341
 msgid "Password"
@@ -6141,9 +6614,7 @@ msgstr "ワイヤレスネットワークで必要とされる認証"
 msgid ""
 "Passwords or encryption keys are required to access the wireless network "
 "'%s'."
-msgstr ""
-"ワイヤレスネットワーク '%s' へのアクセスにはパスワードまたは暗号キーが必要で"
-"す。"
+msgstr "ワイヤレスネットワーク '%s' へのアクセスにはパスワードまたは暗号キーが必要です。"
 
 #: ../clients/common/nm-secret-agent-simple.c:457
 msgid "Wired 802.1X authentication"
@@ -6184,59 +6655,30 @@ msgid "A password is required to connect to '%s'."
 msgstr "'%s' への接続にはパスワードが必要です。"
 
 #: ../clients/common/nm-secret-agent-simple.c:537
-#, fuzzy
 msgid "VPN password required"
-msgstr "PIN コードが必要です"
-
-#: ../clients/common/nm-vpn-helpers.c:48
-#, fuzzy, c-format
-msgid "unknown VPN plugin \"%s\""
-msgstr "不明なログドメイン '%s'"
+msgstr "PIN パスワードが必要です"
 
-#: ../clients/common/nm-vpn-helpers.c:59
-#, c-format
-msgid "cannot cannot load legacy-only VPN plugin \"%s\" for \"%s\""
-msgstr ""
+#: ../clients/common/nm-vpn-helpers.c:61
+msgid "could not get VPN plugin info"
+msgstr "VPN プラグイン情報を取得できませんでした"
 
-#: ../clients/common/nm-vpn-helpers.c:64
-#, c-format
-msgid ""
-"cannot load VPN plugin \"%s\" due to missing \"%s\". Missing client plugin?"
-msgstr ""
-
-#: ../clients/common/nm-vpn-helpers.c:69
-#, fuzzy, c-format
-msgid "failed to load VPN plugin \"%s\": %s"
-msgstr "エラー: %s.%s の変更に失敗しました: %s。"
-
-#: ../clients/common/nm-vpn-helpers.c:121
-#, fuzzy
-msgid "Certificate password"
-msgstr "プライベートキーのパスワード"
-
-#: ../clients/common/nm-vpn-helpers.c:122
-#, fuzzy
-msgid "HTTP proxy password"
-msgstr "パスワードを表示する"
-
-#: ../clients/common/nm-vpn-helpers.c:125
-#: ../clients/common/nm-vpn-helpers.c:128
-#, fuzzy
+#: ../clients/common/nm-vpn-helpers.c:103
+#: ../clients/common/nm-vpn-helpers.c:106
 msgid "Group password"
-msgstr "パスワードを表示する"
+msgstr "グループパスワード"
 
-#: ../clients/common/nm-vpn-helpers.c:130 ../clients/tui/nmt-page-ip4.c:143
+#: ../clients/common/nm-vpn-helpers.c:108 ../clients/tui/nmt-page-ip4.c:143
 #: ../clients/tui/nmt-page-ip6.c:143
 msgid "Gateway"
 msgstr "ゲートウェイ"
 
-#: ../clients/common/nm-vpn-helpers.c:131
+#: ../clients/common/nm-vpn-helpers.c:109
 msgid "Cookie"
-msgstr ""
+msgstr "クッキー"
 
-#: ../clients/common/nm-vpn-helpers.c:132
+#: ../clients/common/nm-vpn-helpers.c:110
 msgid "Gateway certificate hash"
-msgstr ""
+msgstr "ゲートウェイ証明書ハッシュ"
 
 #: ../clients/nm-online.c:94
 msgid "Connecting"
@@ -6246,43 +6688,33 @@ msgstr "接続中"
 msgid ""
 "Time to wait for a connection, in seconds (without the option, default value "
 "is 30)"
-msgstr ""
-"接続を待機する時間を秒単位で指定する (オプションなしの場合、デフォルト値は "
-"30)"
+msgstr "接続を待機する時間を秒単位で指定する (オプションなしの場合、デフォルト値は 30)"
 
 #: ../clients/nm-online.c:148
-#, fuzzy
 msgid "Exit immediately if NetworkManager is not running or connecting"
-msgstr "NetworkManager が起動していない場合は直ちに終了する"
+msgstr "NetworkManager が実行中または接続中でない場合は直ちに終了します"
 
 #: ../clients/nm-online.c:149
 msgid "Don't print anything"
 msgstr "出力を抑制する"
 
 #: ../clients/nm-online.c:150
-#, fuzzy
 msgid "Wait for NetworkManager startup instead of a connection"
-msgstr ""
-"NetworkManager によりスタートアップネットワーク接続のアクティベートが完了され"
-"るのを待機します。"
+msgstr "接続の代わりに NetworkManager の起動を待機します"
 
 #: ../clients/nm-online.c:171
 msgid ""
 "Waits for NetworkManager to finish activating startup network connections."
-msgstr ""
-"NetworkManager によりスタートアップネットワーク接続のアクティベートが完了され"
-"るのを待機します。"
+msgstr "NetworkManager によりスタートアップネットワーク接続のアクティベートが完了されるのを待機します。"
 
 #: ../clients/nm-online.c:178 ../clients/nm-online.c:184
 msgid "Invalid option.  Please use --help to see a list of valid options."
-msgstr ""
-"無効なオプションです。--help を使用して有効なオプションの一覧を確認してくださ"
-"い。"
+msgstr "無効なオプションです。--help を使用して有効なオプションの一覧を確認してください。"
 
 #: ../clients/tui/newt/nmt-newt-utils.c:177 ../clients/tui/nmt-editor.c:415
 #: ../clients/tui/nmt-password-dialog.c:174
 #: ../clients/tui/nmt-route-editor.c:122 ../clients/tui/nmtui-hostname.c:69
-#: ../clients/tui/nmtui.c:136
+#: ../clients/tui/nmtui.c:114
 msgid "OK"
 msgstr "OK"
 
@@ -6298,52 +6730,37 @@ msgid "Editor failed: %s"
 msgstr "エディタが失敗しました: %s"
 
 #: ../clients/tui/newt/nmt-newt-utils.c:373
-#, fuzzy, c-format
+#, c-format
 msgid "Editor failed with status %d"
-msgstr "エディタが失敗しました: %s"
+msgstr "エディターがステータス %d で失敗しました"
 
 #: ../clients/tui/newt/nmt-newt-utils.c:375
-#, fuzzy, c-format
+#, c-format
 msgid "Editor failed with signal %d"
-msgstr "エディタが失敗しました: %s"
+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:146 ../libnm-glib/nm-device.c:1859
-#: ../libnm/nm-device.c:1810
-msgid "Ethernet"
-msgstr "Ethernet"
-
 #: ../clients/tui/nm-editor-utils.c:150
 #, c-format
 msgid "Ethernet connection %d"
 msgstr "イーサネット接続 %d"
 
-#: ../clients/tui/nm-editor-utils.c:154 ../libnm-glib/nm-device.c:1861
-#: ../libnm/nm-device.c:1812
-msgid "Wi-Fi"
-msgstr "Wi-Fi"
-
 #: ../clients/tui/nm-editor-utils.c:158
 #, c-format
 msgid "Wi-Fi connection %d"
 msgstr "Wi-Fi 接続 %d"
 
-#: ../clients/tui/nm-editor-utils.c:163 ../libnm-core/nm-connection.c:1748
-#: ../libnm-glib/nm-device.c:1871 ../libnm/nm-device.c:1822
-msgid "InfiniBand"
-msgstr "InfiniBand"
-
 #: ../clients/tui/nm-editor-utils.c:167
 #, c-format
 msgid "InfiniBand connection %d"
 msgstr "InfiniBand 接続 %d"
 
-#: ../clients/tui/nm-editor-utils.c:172 ../libnm-glib/nm-device.c:1869
-#: ../libnm/nm-device.c:1820
+#: ../clients/tui/nm-editor-utils.c:172 ../libnm-glib/nm-device.c:1859
+#: ../libnm/nm-device.c:1810
 msgid "Mobile Broadband"
 msgstr "モバイルブロードバンド"
 
@@ -6361,9 +6778,9 @@ msgstr "DSL"
 msgid "DSL connection %d"
 msgstr "DSL 接続 %d"
 
-#: ../clients/tui/nm-editor-utils.c:190 ../libnm-core/nm-connection.c:1740
-#: ../libnm-glib/nm-device.c:1873 ../libnm-util/nm-connection.c:1626
-#: ../libnm/nm-device.c:1824 ../src/settings/plugins/ifcfg-rh/reader.c:4195
+#: ../clients/tui/nm-editor-utils.c:190 ../libnm-core/nm-connection.c:1708
+#: ../libnm-glib/nm-device.c:1863 ../libnm-util/nm-connection.c:1626
+#: ../libnm/nm-device.c:1814 ../src/settings/plugins/ifcfg-rh/reader.c:4182
 msgid "Bond"
 msgstr "ボンド"
 
@@ -6372,9 +6789,9 @@ msgstr "ボンド"
 msgid "Bond connection %d"
 msgstr "ボンド接続 %d"
 
-#: ../clients/tui/nm-editor-utils.c:199 ../libnm-core/nm-connection.c:1744
-#: ../libnm-glib/nm-device.c:1877 ../libnm-util/nm-connection.c:1630
-#: ../libnm/nm-device.c:1828 ../src/settings/plugins/ifcfg-rh/reader.c:4492
+#: ../clients/tui/nm-editor-utils.c:199 ../libnm-core/nm-connection.c:1712
+#: ../libnm-glib/nm-device.c:1867 ../libnm-util/nm-connection.c:1630
+#: ../libnm/nm-device.c:1818 ../src/settings/plugins/ifcfg-rh/reader.c:4479
 msgid "Bridge"
 msgstr "ブリッジ"
 
@@ -6383,9 +6800,9 @@ msgstr "ブリッジ"
 msgid "Bridge connection %d"
 msgstr "ブリッジ接続 %d"
 
-#: ../clients/tui/nm-editor-utils.c:208 ../libnm-core/nm-connection.c:1742
-#: ../libnm-glib/nm-device.c:1875 ../libnm-util/nm-connection.c:1628
-#: ../libnm/nm-device.c:1826 ../src/settings/plugins/ifcfg-rh/reader.c:4301
+#: ../clients/tui/nm-editor-utils.c:208 ../libnm-core/nm-connection.c:1710
+#: ../libnm-glib/nm-device.c:1865 ../libnm-util/nm-connection.c:1628
+#: ../libnm/nm-device.c:1816 ../src/settings/plugins/ifcfg-rh/reader.c:4288
 msgid "Team"
 msgstr "team "
 
@@ -6442,7 +6859,6 @@ msgid "Could not create editor for invalid connection '%s'."
 msgstr "無効な接続 '%s' のエディタを作成できませんでした。"
 
 #: ../clients/tui/nmt-editor.c:111
-#, fuzzy
 msgid "Edit Connection"
 msgstr "接続の編集"
 
@@ -6461,9 +6877,8 @@ msgid "Profile name"
 msgstr "プロファイル名"
 
 #: ../clients/tui/nmt-editor.c:331
-#, fuzzy
 msgid "Ethernet device"
-msgstr "Ethernet"
+msgstr "Ethernet デバイス"
 
 #: ../clients/tui/nmt-editor.c:333
 msgid "Device"
@@ -6591,7 +7006,7 @@ msgstr "エージングタイム"
 
 #: ../clients/tui/nmt-page-bridge.c:91
 msgid "Enable IGMP snooping"
-msgstr ""
+msgstr "IGMP スヌーピングの有効化"
 
 #: ../clients/tui/nmt-page-bridge.c:97
 msgid "Enable STP (Spanning Tree Protocol)"
@@ -6630,6 +7045,10 @@ msgstr "接続されました"
 msgid "INFINIBAND"
 msgstr "インフィニバンド"
 
+#: ../clients/tui/nmt-page-infiniband.c:88
+msgid "Transport mode"
+msgstr "トランスポートモード"
+
 #: ../clients/tui/nmt-page-ip4.c:38
 msgid "Disabled"
 msgstr "無効"
@@ -6686,7 +7105,7 @@ msgstr "このネットワークはデフォルトのルートには使用しな
 
 #: ../clients/tui/nmt-page-ip4.c:179 ../clients/tui/nmt-page-ip6.c:177
 msgid "Ignore automatically obtained routes"
-msgstr ""
+msgstr "自動的に取得されたルートを無視"
 
 #: ../clients/tui/nmt-page-ip4.c:187
 msgid "Require IPv4 addressing for this connection"
@@ -6709,64 +7128,60 @@ msgid "Require IPv6 addressing for this connection"
 msgstr "この接続には IPv6 アドレス設定が必要になります"
 
 #: ../clients/tui/nmt-page-ppp.c:131
-#, fuzzy
 msgid "PPP CONFIGURATION"
-msgstr "IPv4 設定"
+msgstr "PPP 設定"
 
 #: ../clients/tui/nmt-page-ppp.c:140
-#, fuzzy
 msgid "Allowed authentication methods:"
-msgstr "認証"
+msgstr "許可された認証方法:"
 
 #: ../clients/tui/nmt-page-ppp.c:147
-#, fuzzy
 msgid "EAP"
-msgstr "LEAP"
+msgstr "EAP"
 
 #: ../clients/tui/nmt-page-ppp.c:155
-#, fuzzy
 msgid "PAP"
-msgstr "AP"
+msgstr "PAP"
 
 #: ../clients/tui/nmt-page-ppp.c:163
 msgid "CHAP"
-msgstr ""
+msgstr "CHAP"
 
 #: ../clients/tui/nmt-page-ppp.c:171
 msgid "MSCHAPv2"
-msgstr ""
+msgstr "MSCHAPv2"
 
 #: ../clients/tui/nmt-page-ppp.c:179
 msgid "MSCHAP"
-msgstr ""
+msgstr "MSCHAP"
 
 #: ../clients/tui/nmt-page-ppp.c:195
 msgid "Use point-to-point encryption (MPPE)"
-msgstr ""
+msgstr "MPPE (ポイントツーポイント暗号化) を使用"
 
 #: ../clients/tui/nmt-page-ppp.c:207
 msgid "Require 128-bit encryption"
-msgstr ""
+msgstr "128 ビット暗号化を要求"
 
 #: ../clients/tui/nmt-page-ppp.c:217
 msgid "Use stateful MPPE"
-msgstr ""
+msgstr "ステートフル MPPE を使用"
 
 #: ../clients/tui/nmt-page-ppp.c:229
 msgid "Allow BSD data compression"
-msgstr ""
+msgstr "BSD データ圧縮を許可"
 
 #: ../clients/tui/nmt-page-ppp.c:237
 msgid "Allow Deflate data compression"
-msgstr ""
+msgstr "Deflate データ圧縮を許可"
 
 #: ../clients/tui/nmt-page-ppp.c:245
 msgid "Use TCP header compression"
-msgstr ""
+msgstr "TCP ヘッダー圧縮を使用"
 
 #: ../clients/tui/nmt-page-ppp.c:255
 msgid "Send PPP echo packets"
-msgstr ""
+msgstr "PPP エコーパケットを送信"
 
 #: ../clients/tui/nmt-page-team-port.c:92
 msgid "TEAM PORT"
@@ -6945,22 +7360,23 @@ msgstr "削除"
 msgid ""
 "openconnect will be run to authenticate.\n"
 "It will return to nmtui when completed."
-msgstr ""
+msgstr "認証するために openconnect が実行されます。\n"
+"処理が完了すると、nmtui に戻ります。"
 
 #: ../clients/tui/nmtui-connect.c:68
-#, fuzzy, c-format
+#, c-format
 msgid "Error: openconnect failed: %s"
-msgstr "エラー: 接続の削除に失敗しました: %s"
+msgstr "エラー: openconnect が失敗しました: %s"
 
 #: ../clients/tui/nmtui-connect.c:75
 #, c-format
 msgid "openconnect failed with status %d"
-msgstr ""
+msgstr "openconnect がステータス %d で失敗しました"
 
 #: ../clients/tui/nmtui-connect.c:79
 #, c-format
 msgid "openconnect failed with signal %d"
-msgstr ""
+msgstr "openconnect がシグナル %d で失敗しました"
 
 #: ../clients/tui/nmtui-connect.c:178
 msgid "Activation failed"
@@ -6984,14 +7400,10 @@ msgid "Deactivate"
 msgstr "解除"
 
 #: ../clients/tui/nmtui-connect.c:413 ../clients/tui/nmtui-edit.c:120
-#: ../clients/tui/nmtui.c:130
+#: ../clients/tui/nmtui.c:108
 msgid "Quit"
 msgstr "終了"
 
-#: ../clients/tui/nmtui-connect.c:413 ../clients/tui/nmtui-edit.c:120
-msgid "Back"
-msgstr ""
-
 #: ../clients/tui/nmtui-connect.c:436
 #, c-format
 msgid "No such connection '%s'"
@@ -7013,9 +7425,7 @@ msgstr "作成したい接続タイプを選択してください。"
 msgid ""
 "If you are creating a VPN, and the VPN connection you wish to create does "
 "not appear in the list, you may not have the correct VPN plugin installed."
-msgstr ""
-"VPN の作成中、作成したい VPN 接続が一覧に表示されない場合、適切な VPN プラグ"
-"インがインストールされていない可能性があります。"
+msgstr "VPN の作成中、作成したい VPN 接続が一覧に表示されない場合、適切な VPN プラグインがインストールされていない可能性があります。"
 
 #: ../clients/tui/nmtui-edit.c:411 ../clients/tui/nmtui-edit.c:427
 msgid "New Connection"
@@ -7027,9 +7437,9 @@ msgid "Unable to delete connection: %s"
 msgstr "接続を削除できません: %s"
 
 #: ../clients/tui/nmtui-edit.c:505
-#, fuzzy, c-format
+#, c-format
 msgid "Could not delete connection '%s': %s"
-msgstr "接続を削除できませんでした: %s"
+msgstr "接続 '%s' を削除できませんでした: %s"
 
 #: ../clients/tui/nmtui-edit.c:527
 #, c-format
@@ -7075,28 +7485,28 @@ msgstr "新規のホスト名"
 msgid "Set system hostname"
 msgstr "システムのホスト名を設定する"
 
-#: ../clients/tui/nmtui.c:104
+#: ../clients/tui/nmtui.c:83
 msgid "NetworkManager TUI"
 msgstr "NetworkManager TUI"
 
-#: ../clients/tui/nmtui.c:112
+#: ../clients/tui/nmtui.c:91
 msgid "Please select an option"
 msgstr "オプションを選択してください"
 
-#: ../clients/tui/nmtui.c:160
+#: ../clients/tui/nmtui.c:143
 msgid "Usage"
 msgstr "使い方"
 
-#: ../clients/tui/nmtui.c:241
+#: ../clients/tui/nmtui.c:224
 msgid "Could not parse arguments"
 msgstr "引数を解析できませんでした"
 
-#: ../clients/tui/nmtui.c:251
-#, fuzzy, c-format
+#: ../clients/tui/nmtui.c:234
+#, c-format
 msgid "Could not contact NetworkManager: %s.\n"
-msgstr "接続をアクティベートできませんでした: %s"
+msgstr "NetworkManager に接続できませんでした: %s.\n"
 
-#: ../clients/tui/nmtui.c:256
+#: ../clients/tui/nmtui.c:239
 msgid "NetworkManager is not running."
 msgstr "NetworkManager が実行していません。"
 
@@ -7185,7 +7595,7 @@ msgstr "プライベートキーのタイプを判定できません。"
 #: ../libnm-core/crypto.c:502
 #, c-format
 msgid "Password provided, but key was not encrypted."
-msgstr ""
+msgstr "パスワードが提供されましたが、キーは暗号化されませんでした。"
 
 #: ../libnm-core/crypto.c:555 ../libnm-util/crypto.c:571
 #, c-format
@@ -7212,14 +7622,14 @@ msgid "Invalid IV length (must be at least %zd)."
 msgstr "IV の長さが無効です (最低 %zd の長さが必要)。"
 
 #: ../libnm-core/crypto_gnutls.c:115 ../libnm-util/crypto_gnutls.c:175
-#, fuzzy, c-format
+#, c-format
 msgid "Failed to initialize the decryption cipher context: %s (%s)"
-msgstr "復号化暗号文コンテキストの初期化に失敗しました: %s / %s。"
+msgstr "復号化暗号文コンテキストの初期化に失敗しました: %s (%s)"
 
 #: ../libnm-core/crypto_gnutls.c:124 ../libnm-util/crypto_gnutls.c:184
-#, fuzzy, c-format
+#, c-format
 msgid "Failed to decrypt the private key: %s (%s)"
-msgstr "プライベートキーの復号に失敗しました: %s / %s。"
+msgstr "プライベートキーの復号に失敗しました: %s (%s)"
 
 #: ../libnm-core/crypto_gnutls.c:134 ../libnm-core/crypto_nss.c:202
 #: ../libnm-util/crypto_gnutls.c:194 ../libnm-util/crypto_nss.c:252
@@ -7234,14 +7644,14 @@ msgid "Failed to decrypt the private key."
 msgstr "プライベートキーの復号に失敗しました。"
 
 #: ../libnm-core/crypto_gnutls.c:224 ../libnm-util/crypto_gnutls.c:283
-#, fuzzy, c-format
+#, c-format
 msgid "Failed to initialize the encryption cipher context: %s (%s)"
-msgstr "暗号化暗号文コンテキストの初期化に失敗しました: %s / %s。"
+msgstr "暗号化暗号文コンテキストの初期化に失敗しました: %s (%s)"
 
 #: ../libnm-core/crypto_gnutls.c:233 ../libnm-util/crypto_gnutls.c:292
-#, fuzzy, c-format
+#, c-format
 msgid "Failed to encrypt the data: %s (%s)"
-msgstr "データの暗号化に失敗しました: %s / %s。"
+msgstr "データの暗号化に失敗しました: %s (%s)"
 
 #: ../libnm-core/crypto_gnutls.c:276 ../libnm-util/crypto_gnutls.c:332
 #, c-format
@@ -7361,7 +7771,7 @@ msgstr "証明書のデコードができません: %d"
 #: ../libnm-core/crypto_nss.c:420
 #, c-format
 msgid "Password must be UTF-8"
-msgstr ""
+msgstr "パスワードは UTF-8 である必要があります"
 
 #: ../libnm-core/crypto_nss.c:450 ../libnm-util/crypto_nss.c:488
 #, c-format
@@ -7382,55 +7792,51 @@ msgstr "PKCS#12 ファイルを確証できません: %d"
 msgid "Could not generate random data."
 msgstr "ランダムデータを生成できません。"
 
-#: ../libnm-core/nm-connection.c:225
+#: ../libnm-core/nm-connection.c:224
 msgid "wrong type; should be a list of strings."
-msgstr ""
+msgstr "正しくないタイプ; 文字列のリストである必要があります。"
 
-#: ../libnm-core/nm-connection.c:295
-#, fuzzy
+#: ../libnm-core/nm-connection.c:294
 msgid "unknown setting name"
-msgstr "エラー: 不明な設定 '%s'\n"
+msgstr "不明な設定名"
 
-#: ../libnm-core/nm-connection.c:307
-#, fuzzy
+#: ../libnm-core/nm-connection.c:306
 msgid "duplicate setting name"
-msgstr "エラー: 不明な設定 '%s'\n"
+msgstr "重複する設定名"
 
-#: ../libnm-core/nm-connection.c:905
+#: ../libnm-core/nm-connection.c:873
 msgid "setting not found"
-msgstr ""
+msgstr "設定が見つかりません"
 
-#: ../libnm-core/nm-connection.c:969
-#, fuzzy
+#: ../libnm-core/nm-connection.c:937
 msgid "setting not allowed in slave connection"
-msgstr "この接続には設定 '%s' はありません。\n"
+msgstr "設定がスレーブ接続で許可されません"
 
-#: ../libnm-core/nm-connection.c:980
+#: ../libnm-core/nm-connection.c:948
 msgid "setting is required for non-slave connections"
-msgstr ""
+msgstr "設定は非スレーブ接続で必要です"
 
-#: ../libnm-core/nm-connection.c:1074
-#, fuzzy
+#: ../libnm-core/nm-connection.c:1042
 msgid "Unexpected failure to verify the connection"
-msgstr "接続を削除できません: %s"
+msgstr "接続を確認するときの予期しない障害"
 
-#: ../libnm-core/nm-connection.c:1107
-#, fuzzy
+#: ../libnm-core/nm-connection.c:1075
 msgid "Unexpected failure to normalize the connection"
-msgstr "接続を削除できません: %s"
+msgstr "接続を正規化するときの予期しない障害"
 
-#: ../libnm-core/nm-connection.c:1608 ../libnm-core/nm-setting-8021x.c:2411
+#: ../libnm-core/nm-connection.c:1576 ../libnm-core/nm-setting-8021x.c:2411
 #: ../libnm-core/nm-setting-8021x.c:2428 ../libnm-core/nm-setting-8021x.c:2459
 #: ../libnm-core/nm-setting-8021x.c:2476 ../libnm-core/nm-setting-8021x.c:2518
 #: ../libnm-core/nm-setting-8021x.c:2530 ../libnm-core/nm-setting-8021x.c:2548
 #: ../libnm-core/nm-setting-8021x.c:2560 ../libnm-core/nm-setting-8021x.c:2584
 #: ../libnm-core/nm-setting-8021x.c:2749 ../libnm-core/nm-setting-adsl.c:189
 #: ../libnm-core/nm-setting-bluetooth.c:120
-#: ../libnm-core/nm-setting-bluetooth.c:138 ../libnm-core/nm-setting-cdma.c:141
+#: ../libnm-core/nm-setting-bluetooth.c:138
+#: ../libnm-core/nm-setting-cdma.c:141
 #: ../libnm-core/nm-setting-connection.c:837
 #: ../libnm-core/nm-setting-connection.c:876
 #: ../libnm-core/nm-setting-connection.c:989
-#: ../libnm-core/nm-setting-ip-config.c:2186
+#: ../libnm-core/nm-setting-ip-config.c:2167
 #: ../libnm-core/nm-setting-olpc-mesh.c:120
 #: ../libnm-core/nm-setting-pppoe.c:142 ../libnm-core/nm-setting-vpn.c:419
 #: ../libnm-core/nm-setting-vxlan.c:360 ../libnm-core/nm-setting-wimax.c:126
@@ -7442,8 +7848,10 @@ msgstr "接続を削除できません: %s"
 #: ../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-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
@@ -7461,210 +7869,203 @@ msgstr "プロパティがありません"
 #: ../libnm-core/nm-dbus-utils.c:188
 #, c-format
 msgid "Method returned type '%s', but expected '%s'"
-msgstr ""
+msgstr "メソッドはタイプ '%s' を返しましたが、'%s' を想定していました"
 
 #: ../libnm-core/nm-keyfile-reader.c:136
 msgid "ignoring missing number"
-msgstr ""
+msgstr "不明な数字を無視"
 
 #: ../libnm-core/nm-keyfile-reader.c:145
-#, fuzzy, c-format
+#, c-format
 msgid "ignoring invalid number '%s'"
-msgstr "無効なメトリック '%s'"
+msgstr "無効な数字 '%s' を無視"
 
 #: ../libnm-core/nm-keyfile-reader.c:165
-#, fuzzy, c-format
+#, c-format
 msgid "ignoring invalid %s address: %s"
-msgstr "無効な IPv4 アドレス '%s'"
+msgstr "無効な %s アドレスを無視: %s"
 
 #: ../libnm-core/nm-keyfile-reader.c:205
-#, fuzzy, c-format
+#, c-format
 msgid "ignoring invalid gateway '%s' for %s route"
-msgstr "無効なゲートウェイ '%s'"
+msgstr "無効なゲートウェイ '%s' (%s ルート用) を無視"
 
 #: ../libnm-core/nm-keyfile-reader.c:225
-#, fuzzy, c-format
+#, c-format
 msgid "ignoring invalid %s route: %s"
-msgstr "無効な IPv4 ルート '%s'"
+msgstr "無効な %s ルートを無視: %s"
 
 #: ../libnm-core/nm-keyfile-reader.c:343
 #, c-format
 msgid "unexpected character '%c' for address %s: '%s' (position %td)"
-msgstr ""
+msgstr "アドレス %c の予期しない文字 '%s': '%s' (位置 %td)"
 
 #: ../libnm-core/nm-keyfile-reader.c:353
 #, c-format
 msgid "unexpected character '%c' for %s: '%s' (position %td)"
-msgstr ""
+msgstr "%c の予期しない文字 '%s': '%s' (位置 %td)"
 
 #: ../libnm-core/nm-keyfile-reader.c:362
 #, c-format
 msgid "unexpected character '%c' in prefix length for %s: '%s' (position %td)"
-msgstr ""
+msgstr "%c の予期しないプレフィックス長の文字 '%s': '%s' (位置 %td)"
 
 #: ../libnm-core/nm-keyfile-reader.c:373
 #, c-format
 msgid "garbage at the end of value %s: '%s'"
-msgstr ""
+msgstr "値 %s の後のガーベッジ: '%s'"
 
 #: ../libnm-core/nm-keyfile-reader.c:379
 #, c-format
 msgid "deprecated semicolon at the end of value %s: '%s'"
-msgstr ""
+msgstr "値 %s の後の非推奨のセミコロン: '%s'"
 
 #: ../libnm-core/nm-keyfile-reader.c:394
 #, c-format
 msgid "invalid prefix length for %s '%s', defaulting to %d"
-msgstr ""
+msgstr "%s '%s' の無効なプレフィックス長 (デフォルト値は %d)"
 
 #: ../libnm-core/nm-keyfile-reader.c:401
 #, c-format
 msgid "missing prefix length for %s '%s', defaulting to %d"
-msgstr ""
+msgstr "%s '%s' の不明なプレフィックス長 (デフォルト値は %d)"
 
 #: ../libnm-core/nm-keyfile-reader.c:504
-#, fuzzy, c-format
+#, c-format
 msgid "ignoring invalid DNS server IPv4 address '%s'"
-msgstr "無効な IPv4 アドレス '%s'"
+msgstr "無効な DNS サーバー IPv4 アドレス '%s' を無視"
 
 #: ../libnm-core/nm-keyfile-reader.c:543
-#, fuzzy, c-format
+#, c-format
 msgid "ignoring invalid DNS server IPv6 address '%s'"
-msgstr "無効な IPv6 アドレス '%s'"
+msgstr "無効な DNS サーバー IPv6 アドレス '%s' を無視"
 
 #: ../libnm-core/nm-keyfile-reader.c:628 ../libnm-core/nm-keyfile-reader.c:769
 #: ../libnm-core/nm-keyfile-reader.c:1446
 #, c-format
 msgid "ignoring invalid byte element '%d' (not between 0 and 255 inclusive)"
-msgstr ""
+msgstr "無効なバイト要素 '%d' (0〜255 以外) を無視"
 
 #: ../libnm-core/nm-keyfile-reader.c:642
-#, fuzzy
 msgid "ignoring invalid MAC address"
-msgstr "は有効な MAC アドレスではありません"
+msgstr "有効な MAC アドレスを無視"
 
 #: ../libnm-core/nm-keyfile-reader.c:758
-#, fuzzy
 msgid "ignoring invalid binary property"
-msgstr "エラー: 無効なプロパティ: %s\n"
+msgstr "無効なバイナリープロパティーを無視"
 
 #: ../libnm-core/nm-keyfile-reader.c:801
 msgid "ignoring invalid SSID"
-msgstr ""
+msgstr "無効な SSID を無視"
 
 #: ../libnm-core/nm-keyfile-reader.c:817
 msgid "ignoring invalid raw password"
-msgstr ""
+msgstr "無効な生パスワードを無視"
 
-#: ../libnm-core/nm-keyfile-reader.c:892 ../libnm-core/nm-keyfile-reader.c:1058
+#: ../libnm-core/nm-keyfile-reader.c:892
+#: ../libnm-core/nm-keyfile-reader.c:1058
 #, c-format
 msgid "certificate or key file '%s' does not exist"
-msgstr ""
+msgstr "証明書またはキーファイル '%s' が存在しません"
 
 #: ../libnm-core/nm-keyfile-reader.c:897
-#, fuzzy, c-format
+#, c-format
 msgid "invalid key/cert value path \"%s\""
-msgstr "無効な '%s' またはその値 '%s' です"
+msgstr "無効なキー/証明書値パス \"%s\""
 
 #: ../libnm-core/nm-keyfile-reader.c:935
 msgid "invalid key/cert value data:;base64, is not base64"
-msgstr ""
+msgstr "無効なキー/証明書値 data:;base64, が base64 ではありません"
 
 #: ../libnm-core/nm-keyfile-reader.c:948
 msgid "invalid key/cert value data:;base64,file://"
-msgstr ""
+msgstr "無効なキー/証明書値 data:;base64,file://"
 
 #: ../libnm-core/nm-keyfile-reader.c:1095
 msgid "invalid key/cert value is not a valid blob"
-msgstr ""
+msgstr "無効なキー/証明書値は有効なブロブではありません"
 
 #: ../libnm-core/nm-keyfile-reader.c:1100
-#, fuzzy
 msgid "invalid key/cert value"
-msgstr "無効な '%s' またはその値 '%s' です"
+msgstr "無効なキー/証明書値"
 
 #: ../libnm-core/nm-keyfile-reader.c:1147
-#, fuzzy, c-format
+#, c-format
 msgid "invalid parity value '%s'"
-msgstr "無効な '%s' またはその値 '%s' です"
+msgstr "無効なパリティー値 '%s'"
 
 #: ../libnm-core/nm-keyfile-reader.c:1347
-#, fuzzy, c-format
+#, c-format
 msgid "error loading setting value: %s"
-msgstr "エラー: 無効な設定名; %s\n"
+msgstr "設定値のロード中にエラーが発生しました: %s"
 
 #: ../libnm-core/nm-keyfile-reader.c:1379
-#, fuzzy, c-format
+#, c-format
 msgid "invalid negative value (%i)"
-msgstr "無効なゲートウェイ '%s'"
+msgstr "無効な負の値 (%i)"
 
 #: ../libnm-core/nm-keyfile-reader.c:1400
-#, fuzzy, c-format
+#, c-format
 msgid "invalid char value (%i)"
-msgstr "無効な '%s' またはその値 '%s' です"
+msgstr "無効な char 値 (%i)"
 
 #: ../libnm-core/nm-keyfile-reader.c:1423
-#, fuzzy, c-format
+#, c-format
 msgid "invalid int64 value (%s)"
-msgstr "無効な '%s' またはその値 '%s' です"
+msgstr "無効な int64 値 (%s)"
 
 #: ../libnm-core/nm-keyfile-reader.c:1482
 #, c-format
 msgid "too large FLAGS property '%s' (%llu)"
-msgstr ""
+msgstr "大きすぎる FLAGS プロパティー '%s' (%llu)"
 
 #: ../libnm-core/nm-keyfile-reader.c:1495
-#, fuzzy, c-format
+#, c-format
 msgid "unhandled setting property type '%s'"
-msgstr "エラー: 無効な <setting>.<property> '%s' です。"
+msgstr "プロパティータイプ '%s' の設定が未処理"
 
 #: ../libnm-core/nm-keyfile-reader.c:1526
-#, fuzzy, c-format
+#, c-format
 msgid "invalid setting name '%s'"
-msgstr "エラー: 無効な設定名; %s\n"
+msgstr "無効な設定名 '%s'"
 
 #: ../libnm-core/nm-setting-8021x.c:414
-#, fuzzy
 msgid "data missing"
-msgstr "プロパティがありません"
+msgstr "データがありません"
 
 #: ../libnm-core/nm-setting-8021x.c:448
 msgid "binary data missing"
-msgstr ""
+msgstr "バイナリーデータがありません"
 
 #: ../libnm-core/nm-setting-8021x.c:465
 msgid "file:// URI not NUL terminated"
-msgstr ""
+msgstr "file:// URI が NUL で終了していません"
 
 #: ../libnm-core/nm-setting-8021x.c:474
 msgid "file:// URI is empty"
-msgstr ""
+msgstr "file:// URI が空です"
 
 #: ../libnm-core/nm-setting-8021x.c:482
-#, fuzzy
 msgid "file:// URI is not valid UTF-8"
-msgstr "インデックス '%s' は無効です"
+msgstr "file:// URI が有効な UTF-8 ではありません"
 
 #: ../libnm-core/nm-setting-8021x.c:681 ../libnm-util/nm-setting-8021x.c:639
 msgid "CA certificate must be in X.509 format"
-msgstr ""
+msgstr "CA 証明書は X.509 形式である必要があります"
 
 #: ../libnm-core/nm-setting-8021x.c:1012 ../libnm-core/nm-setting-8021x.c:1276
 #: ../libnm-core/nm-setting-8021x.c:1612 ../libnm-util/nm-setting-8021x.c:957
 #: ../libnm-util/nm-setting-8021x.c:1220 ../libnm-util/nm-setting-8021x.c:1543
-#, fuzzy
 msgid "invalid certificate format"
-msgstr "証明書データの初期化にエラー発生: %s"
+msgstr "無効な証明書形式"
 
 #: ../libnm-core/nm-setting-8021x.c:1895 ../libnm-util/nm-setting-8021x.c:1812
-#, fuzzy
 msgid "invalid private key"
-msgstr "無効なゲートウェイ '%s'"
+msgstr "無効なプライベートキー"
 
 #: ../libnm-core/nm-setting-8021x.c:2207 ../libnm-util/nm-setting-8021x.c:2123
-#, fuzzy
 msgid "invalid phase2 private key"
-msgstr "プライベートキーの復号に失敗しました。"
+msgstr "無効な phase2 プライベートキー"
 
 #: ../libnm-core/nm-setting-8021x.c:2418 ../libnm-core/nm-setting-8021x.c:2435
 #: ../libnm-core/nm-setting-8021x.c:2466 ../libnm-core/nm-setting-8021x.c:2483
@@ -7673,9 +8074,10 @@ msgstr "プライベートキーの復号に失敗しました。"
 #: ../libnm-core/nm-setting-8021x.c:2591 ../libnm-core/nm-setting-adsl.c:196
 #: ../libnm-core/nm-setting-cdma.c:148 ../libnm-core/nm-setting-cdma.c:157
 #: ../libnm-core/nm-setting-connection.c:844
-#: ../libnm-core/nm-setting-connection.c:887 ../libnm-core/nm-setting-gsm.c:281
-#: ../libnm-core/nm-setting-gsm.c:338 ../libnm-core/nm-setting-gsm.c:375
-#: ../libnm-core/nm-setting-gsm.c:384 ../libnm-core/nm-setting-ip-config.c:2193
+#: ../libnm-core/nm-setting-connection.c:887
+#: ../libnm-core/nm-setting-gsm.c:281 ../libnm-core/nm-setting-gsm.c:338
+#: ../libnm-core/nm-setting-gsm.c:375 ../libnm-core/nm-setting-gsm.c:384
+#: ../libnm-core/nm-setting-ip-config.c:2174
 #: ../libnm-core/nm-setting-ip4-config.c:198
 #: ../libnm-core/nm-setting-ip4-config.c:205
 #: ../libnm-core/nm-setting-pppoe.c:149 ../libnm-core/nm-setting-pppoe.c:158
@@ -7691,8 +8093,9 @@ msgstr "プライベートキーの復号に失敗しました。"
 #: ../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-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:170 ../libnm-util/nm-setting-pppoe.c:179
 #: ../libnm-util/nm-setting-vpn.c:432 ../libnm-util/nm-setting-vpn.c:442
@@ -7710,17 +8113,17 @@ msgid "has to match '%s' property for PKCS#12"
 msgstr "PKCS#12 の '%s' プロパティと一致しなければなりません"
 
 #: ../libnm-core/nm-setting-8021x.c:2723
-#, fuzzy, c-format
+#, c-format
 msgid "certificate is invalid: %s"
-msgstr "プロパティが無効です"
+msgstr "証明書が無効です: %s"
 
 #: ../libnm-core/nm-setting-8021x.c:2758
 #: ../libnm-core/nm-setting-bluetooth.c:129
 #: ../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:211
-#: ../libnm-core/nm-setting-ip6-config.c:222
+#: ../libnm-core/nm-setting-ip6-config.c:188
+#: ../libnm-core/nm-setting-ip6-config.c:199
 #: ../libnm-core/nm-setting-olpc-mesh.c:149
 #: ../libnm-core/nm-setting-wimax.c:144 ../libnm-core/nm-setting-wired.c:665
 #: ../libnm-core/nm-setting-wired.c:675
@@ -7758,21 +8161,23 @@ msgstr "プロパティが無効です"
 #: ../libnm-core/nm-setting-8021x.c:2783 ../libnm-core/nm-setting-8021x.c:2793
 #: ../libnm-core/nm-setting-8021x.c:2803 ../libnm-core/nm-setting-8021x.c:2813
 #: ../libnm-core/nm-setting-8021x.c:2823 ../libnm-core/nm-setting-adsl.c:208
-#: ../libnm-core/nm-setting-adsl.c:220 ../libnm-core/nm-setting-bluetooth.c:146
+#: ../libnm-core/nm-setting-adsl.c:220
+#: ../libnm-core/nm-setting-bluetooth.c:146
 #: ../libnm-core/nm-setting-wireless-security.c:870
 #: ../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-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-bluetooth.c:168
-#, fuzzy, c-format
+#, c-format
 msgid "'%s' connection requires '%s' or '%s' setting"
-msgstr "'%s' または '%s' の設定が必要です"
+msgstr "'%s' 接続には '%s' または '%s' 設定が必要です"
 
 #: ../libnm-core/nm-setting-bond.c:485 ../libnm-util/nm-setting-bond.c:502
 #, c-format
@@ -7820,8 +8225,7 @@ msgstr "'%s=%s' は '%s' の有効な設定ではありません"
 #: ../libnm-util/nm-setting-bond.c:632 ../libnm-util/nm-setting-bond.c:668
 #, c-format
 msgid "'%s' option requires '%s' option to be set"
-msgstr ""
-"'%s' オプションを使用する場合は '%s' オプションを設定する必要があります"
+msgstr "'%s' オプションを使用する場合は '%s' オプションを設定する必要があります"
 
 #: ../libnm-core/nm-setting-bond.c:636 ../libnm-util/nm-setting-bond.c:643
 #, c-format
@@ -7834,19 +8238,19 @@ msgid "'%s' is not a valid IPv4 address for '%s' option"
 msgstr "'%s' は '%s' オプション用の有効な IPv4 アドレスではありません"
 
 #: ../libnm-core/nm-setting-bond.c:676 ../libnm-util/nm-setting-bond.c:682
-#, fuzzy, c-format
+#, c-format
 msgid "'%s' option is only valid with mode '%s'"
-msgstr "'%s' オプションは '%s=%s' の場合に限り有効です"
+msgstr "'%s' オプションはモード '%s' でのみ有効です"
 
 #: ../libnm-core/nm-setting-bond.c:687
 #, c-format
 msgid "'%s' and '%s' cannot have different values"
-msgstr ""
+msgstr "'%s' と '%s' の値は同じである必要があります"
 
 #: ../libnm-core/nm-setting-bond.c:703
-#, fuzzy, c-format
+#, c-format
 msgid "'%s' option should be string"
-msgstr "'%s' オプションが空白です"
+msgstr "'%s' オプションは文字列である必要があります"
 
 #: ../libnm-core/nm-setting-bridge-port.c:124
 #: ../libnm-core/nm-setting-bridge-port.c:136
@@ -7857,18 +8261,18 @@ msgid "'%d' is not a valid value for the property (should be <= %d)"
 msgstr "'%d' はプロパティの有効な値ではありません (%d 以下となるはずです)"
 
 #: ../libnm-core/nm-setting-bridge-port.c:154
-#: ../libnm-core/nm-setting-team-port.c:109
-#, fuzzy, c-format
+#: ../libnm-core/nm-setting-team-port.c:97
+#, c-format
 msgid "missing setting"
-msgstr "足りないオプション"
+msgstr "不明な設定"
 
 #: ../libnm-core/nm-setting-bridge-port.c:165
-#: ../libnm-core/nm-setting-team-port.c:120
+#: ../libnm-core/nm-setting-team-port.c:108
 #, c-format
 msgid ""
 "A connection with a '%s' setting must have the slave-type set to '%s'. "
 "Instead it is '%s'"
-msgstr ""
+msgstr "'%s' 設定の接続ではスレーブタイプは '%s' に設定する必要がありますが、'%s' に設定されています。"
 
 #: ../libnm-core/nm-setting-bridge.c:227 ../libnm-util/nm-setting-bridge.c:269
 #, c-format
@@ -7883,54 +8287,54 @@ msgid "is not a valid MAC address"
 msgstr "は有効な MAC アドレスではありません"
 
 #: ../libnm-core/nm-setting-connection.c:816
-#, fuzzy, c-format
+#, c-format
 msgid "setting required for connection of type '%s'"
-msgstr "接続 '%s'、タイプ '%s' 用のエディタを作成できませんでした。"
+msgstr "タイプ '%s' の接続には設定が必要です"
 
 #: ../libnm-core/nm-setting-connection.c:897
-#, fuzzy, c-format
+#, c-format
 msgid "connection type '%s' is not valid"
-msgstr "インデックス '%s' は無効です"
+msgstr "接続タイプ '%s' は無効です"
 
 #: ../libnm-core/nm-setting-connection.c:932
 #: ../libnm-util/nm-setting-connection.c:877
-#, fuzzy, c-format
+#, c-format
 msgid "Unknown slave type '%s'"
-msgstr "不明なログレベル '%s'"
+msgstr "不明なスレーブタイプ '%s'"
 
 #: ../libnm-core/nm-setting-connection.c:942
 #: ../libnm-util/nm-setting-connection.c:887
-#, fuzzy, c-format
+#, c-format
 msgid "Slave connections need a valid '%s' property"
-msgstr "'%s' の接続の場合、このプロパティに '%s' が必要になります"
+msgstr "スレーブ接続には有効な '%s' プロパティーが必要です"
 
 #: ../libnm-core/nm-setting-connection.c:963
 #: ../libnm-util/nm-setting-connection.c:897
 #, c-format
 msgid "Cannot set '%s' without '%s'"
-msgstr ""
+msgstr "'%s' を '%s' なしで設定できません"
 
 #: ../libnm-core/nm-setting-connection.c:977
-#, fuzzy, c-format
+#, c-format
 msgid "metered value %d is not valid"
-msgstr "インデックス '%s' は無効です"
+msgstr "測定値 %d は無効です"
 
 #: ../libnm-core/nm-setting-connection.c:998
 #, c-format
 msgid "property type should be set to '%s'"
-msgstr ""
+msgstr "プロパティータイプは '%s' に設定する必要があります"
 
 #: ../libnm-core/nm-setting-connection.c:1013
-#, fuzzy, c-format
+#, c-format
 msgid "slave-type '%s' requires a '%s' setting in the connection"
-msgstr "接続には '%s' 設定がなければなりません"
+msgstr "スレーブタイプ '%s' の接続には '%s' 設定が必要です"
 
 #: ../libnm-core/nm-setting-connection.c:1023
 #, c-format
 msgid ""
 "Detect a slave connection with '%s' set and a port type '%s'. '%s' should be "
 "set to '%s'"
-msgstr ""
+msgstr "'%s' が設定され、ポートタイプが '%s' のスレーブ接続を検出します。'%s' は '%s' に設定する必要があります"
 
 #: ../libnm-core/nm-setting-dcb.c:522 ../libnm-util/nm-setting-dcb.c:594
 msgid "flags invalid"
@@ -7978,13 +8382,12 @@ msgid "'%s' length is invalid (should be 5 or 6 digits)"
 msgstr "'%s' の長さは無効です (5 桁または 6 桁にしてください)"
 
 #: ../libnm-core/nm-setting-gsm.c:397
-#, fuzzy
 msgid "property is empty or wrong size"
-msgstr "プロパティが空です"
+msgstr "プロパティーが空、または間違ったサイズです"
 
 #: ../libnm-core/nm-setting-gsm.c:407
 msgid "property must contain only digits"
-msgstr ""
+msgstr "プロパティーには数字のみ含めることができます"
 
 #: ../libnm-core/nm-setting-infiniband.c:217
 #: ../libnm-util/nm-setting-infiniband.c:231
@@ -8007,106 +8410,100 @@ msgstr "InfiniBand P_Key 接続で親インターフェース名が指定され�
 msgid ""
 "interface name of software infiniband device must be '%s' or unset (instead "
 "it is '%s')"
-msgstr ""
+msgstr "ソフトウェア infiniband デバイスのインターフェース名は '%s' であるか、未設定である必要があります (実際には '%s')"
 
 #: ../libnm-core/nm-setting-infiniband.c:286
 #, c-format
 msgid "mtu for transport mode '%s' can be at most %d but it is %d"
-msgstr ""
+msgstr "トランスポートモード '%s' の mtu は最大で %d にすることができますが実際には %d です"
 
 #: ../libnm-core/nm-setting-ip-config.c:133
-#, fuzzy, c-format
+#, c-format
 msgid "Missing IPv4 address"
-msgstr "無効な IPv4 アドレス '%s'"
+msgstr "不明な IPv4 アドレス"
 
 #: ../libnm-core/nm-setting-ip-config.c:133
-#, fuzzy, c-format
+#, c-format
 msgid "Missing IPv6 address"
-msgstr "無効な IPv6 アドレス '%s'"
+msgstr "不明な IPv6 アドレス"
 
 #: ../libnm-core/nm-setting-ip-config.c:138
-#, fuzzy, c-format
+#, c-format
 msgid "Invalid IPv4 address '%s'"
 msgstr "無効な IPv4 アドレス '%s'"
 
 #: ../libnm-core/nm-setting-ip-config.c:138
-#, fuzzy, c-format
+#, c-format
 msgid "Invalid IPv6 address '%s'"
 msgstr "無効な IPv6 アドレス '%s'"
 
 #: ../libnm-core/nm-setting-ip-config.c:153
-#, fuzzy, c-format
+#, c-format
 msgid "Invalid IPv4 address prefix '%u'"
-msgstr "無効な IPv4 アドレス '%s'"
+msgstr "無効な IPv4 アドレスプレフィックス '%u'"
 
 #: ../libnm-core/nm-setting-ip-config.c:153
-#, fuzzy, c-format
+#, c-format
 msgid "Invalid IPv6 address prefix '%u'"
-msgstr "無効な IPv6 アドレス '%s'"
+msgstr "無効な IPv6 アドレスプレフィックス '%u'"
 
 #: ../libnm-core/nm-setting-ip-config.c:168
-#, fuzzy, c-format
+#, c-format
 msgid "Invalid routing metric '%s'"
-msgstr "無効なメトリック '%s'"
+msgstr "無効なルーティングメトリック '%s'"
 
-#: ../libnm-core/nm-setting-ip-config.c:2206
-#, fuzzy, c-format
+#: ../libnm-core/nm-setting-ip-config.c:2187
+#, c-format
 msgid "%d. DNS server address is invalid"
-msgstr "%d. IPv4 アドレスは無効です"
+msgstr "%d. DNS サーバーアドレスは無効です"
 
-#: ../libnm-core/nm-setting-ip-config.c:2222
-#, fuzzy, c-format
+#: ../libnm-core/nm-setting-ip-config.c:2203
+#, c-format
 msgid "%d. IP address is invalid"
-msgstr "%d. IPv4 アドレスは無効です"
+msgstr "%d. IP アドレスは無効です"
 
-#: ../libnm-core/nm-setting-ip-config.c:2234
-#, fuzzy, c-format
+#: ../libnm-core/nm-setting-ip-config.c:2215
+#, c-format
 msgid "%d. IP address has 'label' property with invalid type"
-msgstr "%d. IPv4 に無効なプレフィックスがあります"
+msgstr "%d. IP アドレスには無効なタイプの 'label' プロパティーがあります"
 
-#: ../libnm-core/nm-setting-ip-config.c:2243
-#, fuzzy, c-format
+#: ../libnm-core/nm-setting-ip-config.c:2224
+#, c-format
 msgid "%d. IP address has invalid label '%s'"
-msgstr "%d. IPv4 に無効なプレフィックスがあります"
+msgstr "%d. IP アドレスには無効なラベル '%s' があります"
 
-#: ../libnm-core/nm-setting-ip-config.c:2257
+#: ../libnm-core/nm-setting-ip-config.c:2238
 msgid "gateway cannot be set if there are no addresses configured"
-msgstr ""
+msgstr "アドレスが設定されない場合は、ゲートウェイを設定できません"
 
-#: ../libnm-core/nm-setting-ip-config.c:2266
-#, fuzzy
+#: ../libnm-core/nm-setting-ip-config.c:2247
 msgid "gateway is invalid"
-msgstr "プロパティが無効です"
+msgstr "ゲートウェイが無効です"
 
-#: ../libnm-core/nm-setting-ip-config.c:2280
+#: ../libnm-core/nm-setting-ip-config.c:2261
 #, c-format
 msgid "%d. route is invalid"
 msgstr "%d. ルートは無効です"
 
-#: ../libnm-core/nm-setting-ip-config.c:2289
+#: ../libnm-core/nm-setting-ip-config.c:2270
 #, c-format
 msgid "%d. route cannot be a default route"
-msgstr ""
-
-#: ../libnm-core/nm-setting-ip-config.c:2300
-#, fuzzy, c-format
-msgid "a gateway is incompatible with '%s'"
-msgstr "'%s=%s' は '%s > 0' とは互換性がありません"
+msgstr "%d. ルートをデフォルトルートにすることはできません"
 
 #: ../libnm-core/nm-setting-ip4-config.c:143
-#: ../libnm-core/nm-setting-ip6-config.c:167
+#: ../libnm-core/nm-setting-ip6-config.c:144
 #: ../libnm-util/nm-setting-ip4-config.c:879
 #: ../libnm-util/nm-setting-ip6-config.c:843
-#, fuzzy, c-format
+#, c-format
 msgid "this property cannot be empty for '%s=%s'"
-msgstr "このプロパティは '%s=%s' には許可されていません"
+msgstr "'%s=%s' のこのプロパティーを空にすることはできません"
 
 #: ../libnm-core/nm-setting-ip4-config.c:155
 #: ../libnm-core/nm-setting-ip4-config.c:165
 #: ../libnm-core/nm-setting-ip4-config.c:177
-#: ../libnm-core/nm-setting-ip6-config.c:179
-#: ../libnm-core/nm-setting-ip6-config.c:189
-#: ../libnm-core/nm-setting-ip6-config.c:199
+#: ../libnm-core/nm-setting-ip6-config.c:156
+#: ../libnm-core/nm-setting-ip6-config.c:166
+#: ../libnm-core/nm-setting-ip6-config.c:176
 #: ../libnm-util/nm-setting-ip4-config.c:891
 #: ../libnm-util/nm-setting-ip4-config.c:901
 #: ../libnm-util/nm-setting-ip4-config.c:913
@@ -8118,31 +8515,18 @@ msgid "this property is not allowed for '%s=%s'"
 msgstr "このプロパティは '%s=%s' には許可されていません"
 
 #: ../libnm-core/nm-setting-ip4-config.c:214
-#, fuzzy, c-format
+#, c-format
 msgid "'%s' is not a valid FQDN"
-msgstr "'%s' は有効な UUID ではありません"
+msgstr "'%s' は有効な FQDN ではありません"
 
 #: ../libnm-core/nm-setting-ip4-config.c:223
 msgid "property cannot be set when dhcp-hostname is also set"
-msgstr ""
-
-#: ../libnm-core/nm-setting-ip6-config.c:237
-#, fuzzy
-msgid "value is not a valid token"
-msgstr "'%s' は有効な UUID ではありません"
-
-#: ../libnm-core/nm-setting-ip6-config.c:248
-msgid "only makes sense with EUI64 address generation mode"
-msgstr ""
-
-#: ../libnm-core/nm-setting-ip6-config.c:260
-msgid "token is not in canonical form"
-msgstr ""
+msgstr "dhcp-hostname も設定されている場合は、プロパティーを設定できません"
 
 #: ../libnm-core/nm-setting-ip-tunnel.c:318
-#, fuzzy, c-format
+#, 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-macvlan.c:167 ../libnm-core/nm-setting-vlan.c:647
@@ -8153,23 +8537,23 @@ msgstr "'%s' は UUID、インターフェース名のいずれでもありま�
 
 #: ../libnm-core/nm-setting-ip-tunnel.c:341
 #: ../libnm-core/nm-setting-ip-tunnel.c:352
-#, fuzzy, c-format
+#, c-format
 msgid "'%s' is not a valid IPv%c address"
-msgstr "'%s' は有効な MAC アドレスではありません"
+msgstr "'%s' は有効な IPv%c アドレスではありません"
 
 #: ../libnm-core/nm-setting-ip-tunnel.c:366
 msgid "tunnel keys can only be specified for GRE tunnels"
-msgstr ""
+msgstr "トンネルキーは GRE トンネルに対してのみ指定できます"
 
 #: ../libnm-core/nm-setting-ip-tunnel.c:379
 #: ../libnm-core/nm-setting-ip-tunnel.c:395
-#, fuzzy, c-format
+#, c-format
 msgid "'%s' is not a valid tunnel key"
-msgstr "'%s' は有効なチャンネルではありません"
+msgstr "'%s' は有効なトンネルキーではありません"
 
 #: ../libnm-core/nm-setting-ip-tunnel.c:407
 msgid "a fixed TTL is allowed only when path MTU discovery is enabled"
-msgstr ""
+msgstr "固定 TTL は、パス MTU 検出が有効な場合のみ許可されます"
 
 #: ../libnm-core/nm-setting-macvlan.c:181 ../libnm-core/nm-setting-vlan.c:661
 #: ../libnm-util/nm-setting-vlan.c:580
@@ -8179,7 +8563,7 @@ msgstr "プロパティ、'%s:%s' いずれも指定されていません"
 
 #: ../libnm-core/nm-setting-macvlan.c:192
 msgid "non promiscuous operation is allowed only in passthru mode"
-msgstr ""
+msgstr "非プロミスキャス操作はパススルーモードでのみ許可されます"
 
 #: ../libnm-core/nm-setting-olpc-mesh.c:130
 #: ../libnm-core/nm-setting-wireless.c:739
@@ -8207,19 +8591,19 @@ msgid "setting this property requires non-zero '%s' property"
 msgstr "このプロパティを設定するにはゼロ以外の '%s' プロパティが必要です"
 
 #: ../libnm-core/nm-setting-tun.c:187
-#, fuzzy, c-format
+#, c-format
 msgid "'%u': invalid mode"
-msgstr "'%s' は有効な Wi-Fi モードではありません"
+msgstr "'%u': 無効なモード"
 
 #: ../libnm-core/nm-setting-tun.c:197
-#, fuzzy, c-format
+#, c-format
 msgid "'%s': invalid user ID"
-msgstr "'%s' は有効な UUID ではありません"
+msgstr "'%s': 無効なユーザー ID"
 
 #: ../libnm-core/nm-setting-tun.c:208
-#, fuzzy, c-format
+#, c-format
 msgid "'%s': invalid group ID"
-msgstr "'%s' は有効な UUID ではありません"
+msgstr "'%s': 無効なグループ ID"
 
 #: ../libnm-core/nm-setting-vlan.c:636 ../libnm-util/nm-setting-vlan.c:556
 #, c-format
@@ -8229,60 +8613,60 @@ msgstr "'%s' の値は '%s=%s' と一致しません"
 #: ../libnm-core/nm-setting-vlan.c:672 ../libnm-util/nm-setting-vlan.c:600
 #, c-format
 msgid "the vlan id must be in range 0-4094 but is %u"
-msgstr ""
+msgstr "vlan id は 0〜4094 の範囲内である必要がありますが、%u です"
 
 #: ../libnm-core/nm-setting-vlan.c:681 ../libnm-util/nm-setting-vlan.c:591
 msgid "flags are invalid"
 msgstr "フラグが無効です"
 
 #: ../libnm-core/nm-setting-vpn.c:460
-#, fuzzy, c-format
+#, c-format
 msgid "secret was empty"
-msgstr "プロパティが空です"
+msgstr "シークレットが空です"
 
 #: ../libnm-core/nm-setting-vpn.c:490
 msgid "setting contained a secret with an empty name"
-msgstr ""
+msgstr "設定に空の名前のシークレットが含まれていました"
 
 #: ../libnm-core/nm-setting-vpn.c:498
 #, c-format
 msgid "secret value was empty"
-msgstr ""
+msgstr "シークレット値が空でした"
 
 #: ../libnm-core/nm-setting-vpn.c:545 ../libnm-core/nm-setting.c:1784
 msgid "not a secret property"
-msgstr ""
+msgstr "シークレットプロパティーではありません"
 
 #: ../libnm-core/nm-setting-vpn.c:551
 msgid "secret is not of correct type"
-msgstr ""
+msgstr "シークレットのタイプが正しくありません"
 
 #: ../libnm-core/nm-setting-vpn.c:586
-#, fuzzy, c-format
+#, c-format
 msgid "failed to convert value '%s' to uint"
-msgstr "エラー: '%s' の値の削除に失敗しました: %s\n"
+msgstr "値 '%s' を uint に変換するのに失敗しました"
 
 #: ../libnm-core/nm-setting-vpn.c:594
 msgid "secret flags property not found"
-msgstr ""
+msgstr "シークレットフラグプロパティーが見つかりません"
 
 #: ../libnm-core/nm-setting-vxlan.c:375
-#, fuzzy, c-format
+#, c-format
 msgid "'%s' is not a valid IP address"
-msgstr "'%s' は有効な MAC アドレスではありません"
+msgstr "'%s' は有効な IP アドレスではありません"
 
 #: ../libnm-core/nm-setting-vxlan.c:388
-#, fuzzy, c-format
+#, c-format
 msgid "'%s' is not a valid IP%c address"
-msgstr "'%s' は有効な MAC アドレスではありません"
+msgstr "'%s' は有効な IP%c アドレスではありません"
 
 #: ../libnm-core/nm-setting-vxlan.c:415
 #, c-format
 msgid "%d is greater than local port max %d"
-msgstr ""
+msgstr "%d はローカルポートの最大 %d よりも大きいです"
 
 #: ../libnm-core/nm-setting-wired.c:619 ../libnm-util/nm-setting-wired.c:613
-#, fuzzy, c-format
+#, c-format
 msgid "'%s' is not a valid Ethernet port value"
 msgstr "'%s' は有効な Ethernet ポート値ではありません"
 
@@ -8298,11 +8682,11 @@ msgstr "無効な '%s' またはその値 '%s' です"
 
 #: ../libnm-core/nm-setting-wired.c:709
 msgid "Wake-on-LAN mode 'default' and 'ignore' are exclusive flags"
-msgstr ""
+msgstr "Wake-on-LAN モードの 'default' と 'ignore' は排他的なフラグです"
 
 #: ../libnm-core/nm-setting-wired.c:718
 msgid "Wake-on-LAN password can only be used with magic packet mode"
-msgstr ""
+msgstr "Wake-on-LAN パスワードはマジックパケットモードでのみ使用できます"
 
 #: ../libnm-core/nm-setting-wireless-security.c:882
 #: ../libnm-util/nm-setting-wireless-security.c:912
@@ -8347,221 +8731,200 @@ msgid "'%s' is not a valid band"
 msgstr "'%s' は有効なバンドではありません"
 
 #: ../libnm-core/nm-setting-wireless.c:768
-#, fuzzy, c-format
+#, c-format
 msgid "'%s' requires setting '%s' property"
-msgstr "'%s' プロパティの設定が必要です"
+msgstr "'%s' の場合は '%s' プロパティーを設定する必要があります"
 
 #: ../libnm-core/nm-setting.c:837
 #, c-format
 msgid "duplicate property"
-msgstr ""
+msgstr "重複するプロパティー"
 
 #: ../libnm-core/nm-setting.c:865 ../libnm-core/nm-setting.c:912
 #, c-format
 msgid "can't set property of type '%s' from value of type '%s'"
-msgstr ""
+msgstr "タイプ '%s' のプロパティーをタイプ '%s' の値から設定できません"
 
 #: ../libnm-core/nm-setting.c:884 ../libnm-core/nm-setting.c:898
-#, fuzzy, c-format
+#, c-format
 msgid "failed to set property: %s"
-msgstr "エラー: '%s' プロパティの設定に失敗しました: %s\n"
+msgstr "プロパティーの設定に失敗しました: %s"
 
 #: ../libnm-core/nm-setting.c:926
-#, fuzzy, c-format
+#, c-format
 msgid "can not set property: %s"
-msgstr "エラー: '%s' プロパティの設定に失敗しました: %s\n"
+msgstr "プロパティーを設定できません: %s"
 
 #: ../libnm-core/nm-setting.c:942
-#, fuzzy, c-format
+#, c-format
 msgid "unknown property"
-msgstr "不明なエラー"
+msgstr "不明なプロパティー"
 
 #: ../libnm-core/nm-setting.c:1682
 msgid "secret not found"
-msgstr ""
+msgstr "シークレットが見つかりません"
 
 #: ../libnm-core/nm-setting.c:1774
 msgid "secret is not set"
-msgstr ""
+msgstr "シークレットが設定されていません"
 
-#: ../libnm-core/nm-utils.c:2445
-#, fuzzy, c-format
+#: ../libnm-core/nm-utils.c:2447
+#, c-format
 msgid "failed stat file %s: %s"
-msgstr "信号マスクの設定に失敗しました: %d"
+msgstr "ファイル %s に対する stat の実行に失敗しました: %s"
 
-#: ../libnm-core/nm-utils.c:2454
-#, fuzzy, c-format
+#: ../libnm-core/nm-utils.c:2456
+#, c-format
 msgid "not a file (%s)"
-msgstr "'%s' ファイルを読み込めませんでした。\n"
+msgstr "ファイルではありません (%s)"
 
-#: ../libnm-core/nm-utils.c:2465
-#, fuzzy, c-format
+#: ../libnm-core/nm-utils.c:2467
+#, c-format
 msgid "invalid file owner %d for %s"
-msgstr "'%s' は無効なフィールドです; 許可されているのは次のフィールドです: %s"
+msgstr "%2$s の無効なファイル所有者 %1$d"
 
-#: ../libnm-core/nm-utils.c:2476
+#: ../libnm-core/nm-utils.c:2478
 #, c-format
 msgid "file permissions for %s"
-msgstr ""
+msgstr "%s のファイルパーミッション"
 
-#: ../libnm-core/nm-utils.c:2486
+#: ../libnm-core/nm-utils.c:2488
 #, c-format
 msgid "reject %s"
-msgstr ""
+msgstr "%s の拒否"
 
-#: ../libnm-core/nm-utils.c:2506
+#: ../libnm-core/nm-utils.c:2508
 #, c-format
 msgid "path is not absolute (%s)"
-msgstr ""
+msgstr "パスが絶対パスではありません (%s)"
 
-#: ../libnm-core/nm-utils.c:2520
+#: ../libnm-core/nm-utils.c:2522
 #, c-format
 msgid "Plugin file does not exist (%s)"
-msgstr ""
+msgstr "プラグインファイルが存在しません (%s)"
 
-#: ../libnm-core/nm-utils.c:2528
-#, fuzzy, c-format
+#: ../libnm-core/nm-utils.c:2530
+#, c-format
 msgid "Plugin is not a valid file (%s)"
-msgstr "'%s' は有効な '%s' の値ではありません"
+msgstr "プラグインが有効なファイルではありません (%s)"
 
-#: ../libnm-core/nm-utils.c:2538
+#: ../libnm-core/nm-utils.c:2540
 #, c-format
 msgid "libtool archives are not supported (%s)"
-msgstr ""
+msgstr "libtool アーカイブはサポートされていません (%s)"
 
-#: ../libnm-core/nm-utils.c:2620 ../libnm-util/nm-utils.c:1803
+#: ../libnm-core/nm-utils.c:2622 ../libnm-util/nm-utils.c:1815
 #, c-format
 msgid "Could not find \"%s\" binary"
-msgstr ""
+msgstr "\"%s\" バイナリーを見つけることができませんでした"
 
-#: ../libnm-core/nm-vpn-editor-plugin.c:296
+#: ../libnm-core/nm-vpn-editor-plugin.c:124
 #, c-format
-msgid "cannot load plugin \"%s\": %s"
-msgstr ""
+msgid "cannot load plugin %s"
+msgstr "プラグイン %s をロードできません"
 
-#: ../libnm-core/nm-vpn-editor-plugin.c:307
+#: ../libnm-core/nm-vpn-editor-plugin.c:150
 #, c-format
-msgid "failed to load nm_vpn_editor_plugin_factory() from %s (%s)"
-msgstr ""
+msgid "cannot load VPN plugin in '%s': missing plugin name"
+msgstr "'%s' で VPN プラグインをロードできません: 不明なプラグイン名"
 
-#: ../libnm-core/nm-vpn-editor-plugin.c:332
+#: ../libnm-core/nm-vpn-editor-plugin.c:157
 #, c-format
-msgid "unknown error initializing plugin %s"
-msgstr ""
+msgid "cannot load VPN plugin in '%s': invalid service name"
+msgstr "'%s' で VPN プラグインをロードできません: 無効なサービス名"
 
-#: ../libnm-core/nm-vpn-editor-plugin.c:349
+#: ../libnm-core/nm-vpn-editor-plugin.c:173
 #, c-format
-msgid "cannot load VPN plugin in '%s': missing plugin name"
-msgstr ""
+msgid "unknown error initializing plugin %s"
+msgstr "プラグイン %s の初期化中に不明なエラーが発生しました"
 
-#: ../libnm-core/nm-vpn-editor-plugin.c:358
+#: ../libnm-core/nm-vpn-editor-plugin.c:185
 #, c-format
-msgid "cannot load VPN plugin in '%s': invalid service name"
-msgstr ""
+msgid "failed to load nm_vpn_editor_plugin_factory() from %s (%s)"
+msgstr "%s (%s) からの nm_vpn_editor_plugin_factory() のロードに失敗しました"
 
-#: ../libnm-core/nm-vpn-editor-plugin.c:501
+#: ../libnm-core/nm-vpn-editor-plugin.c:292
 #, c-format
 msgid "the plugin does not support import capability"
-msgstr ""
+msgstr "プラグインはインポート機能をサポートしません"
 
-#: ../libnm-core/nm-vpn-editor-plugin.c:521
+#: ../libnm-core/nm-vpn-editor-plugin.c:312
 #, c-format
 msgid "the plugin does not support export capability"
-msgstr ""
+msgstr "プラグインはエクスポート機能をサポートしません"
 
-#: ../libnm-core/nm-vpn-plugin-info.c:110
-#, fuzzy, c-format
+#: ../libnm-core/nm-vpn-plugin-info.c:109
+#, c-format
 msgid "missing filename"
-msgstr "足りないオプション"
+msgstr "不明なファイル名"
 
-#: ../libnm-core/nm-vpn-plugin-info.c:118
+#: ../libnm-core/nm-vpn-plugin-info.c:117
 #, c-format
 msgid "filename must be an absolute path (%s)"
-msgstr ""
+msgstr "ファイル名は絶対パスである必要があります (%s)"
 
-#: ../libnm-core/nm-vpn-plugin-info.c:127
+#: ../libnm-core/nm-vpn-plugin-info.c:126
 #, c-format
 msgid "filename has invalid format (%s)"
-msgstr ""
+msgstr "ファイル名の形式が無効です (%s)"
 
-#: ../libnm-core/nm-vpn-plugin-info.c:450
+#: ../libnm-core/nm-vpn-plugin-info.c:383
 #, c-format
 msgid "there exists a conflicting plugin (%s) that has the same %s.%s value"
-msgstr ""
+msgstr "競合するプラグイン (%s) が存在します (同じ %s.%s 値を持ちます)。"
 
-#: ../libnm-core/nm-vpn-plugin-info.c:488
+#: ../libnm-core/nm-vpn-plugin-info.c:421
 #, c-format
 msgid "there exists a conflicting plugin with the same name (%s)"
-msgstr ""
+msgstr "同じ名前 (%s) の競合するプラグインが存在します"
 
-#: ../libnm-core/nm-vpn-plugin-info.c:1071
-#, fuzzy, c-format
+#: ../libnm-core/nm-vpn-plugin-info.c:740
+#, c-format
 msgid "missing \"plugin\" setting"
-msgstr "足りないオプション"
+msgstr "不明な \"plugin\" 設定"
 
-#: ../libnm-core/nm-vpn-plugin-info.c:1081
+#: ../libnm-core/nm-vpn-plugin-info.c:750
 #, c-format
 msgid "%s: don't retry loading plugin which already failed previously"
-msgstr ""
+msgstr "%s: 以前に失敗したプラグインのロードは再試行しないでください"
 
-#: ../libnm-core/nm-vpn-plugin-info.c:1175
+#: ../libnm-core/nm-vpn-plugin-info.c:842
 msgid "missing filename to load VPN plugin info"
-msgstr ""
+msgstr "VPN プラグイン情報をロードする不明なファイル名"
 
-#: ../libnm-core/nm-vpn-plugin-info.c:1187
+#: ../libnm-core/nm-vpn-plugin-info.c:854
 msgid "missing name for VPN plugin info"
-msgstr ""
+msgstr "VPN プラグイン情報の不明な名前"
 
-#: ../libnm-core/nm-vpn-plugin-info.c:1196
+#: ../libnm-core/nm-vpn-plugin-info.c:863
 msgid "missing service for VPN plugin info"
-msgstr ""
+msgstr "VPN プラグイン情報の不明なサービス"
 
-#: ../libnm-glib/nm-device.c:1863 ../libnm/nm-device.c:1814
+#: ../libnm-glib/nm-device.c:1853 ../libnm/nm-device.c:1804
 msgid "Bluetooth"
 msgstr "Bluetooth"
 
-#: ../libnm-glib/nm-device.c:1865 ../libnm/nm-device.c:1816
-msgid "OLPC Mesh"
-msgstr "OLPC メッシュ"
-
-#: ../libnm-glib/nm-device.c:1867 ../libnm/nm-device.c:1818
-msgid "WiMAX"
-msgstr "WiMAX"
-
-#: ../libnm-glib/nm-device.c:1881 ../libnm/nm-device.c:1832
-msgid "ADSL"
-msgstr "ADSL"
-
-#: ../libnm-glib/nm-device.c:1883 ../libnm/nm-device.c:1834
-#, fuzzy
+#: ../libnm-glib/nm-device.c:1873 ../libnm/nm-device.c:1824
 msgid "MACVLAN"
-msgstr "VLAN"
+msgstr "MACVLAN"
 
-#: ../libnm-glib/nm-device.c:1885 ../libnm/nm-device.c:1836
-msgid "VXLAN"
-msgstr ""
-
-#: ../libnm-glib/nm-device.c:1887 ../libnm/nm-device.c:1838
+#: ../libnm-glib/nm-device.c:1877 ../libnm/nm-device.c:1828
 msgid "IPTunnel"
-msgstr ""
-
-#: ../libnm-glib/nm-device.c:1889 ../libnm/nm-device.c:1840
-msgid "Tun"
-msgstr ""
+msgstr "IPTunnel"
 
-#: ../libnm-glib/nm-device.c:1891 ../libnm/nm-device.c:1842
+#: ../libnm-glib/nm-device.c:1881 ../libnm/nm-device.c:1832
 msgid "Veth"
-msgstr ""
+msgstr "Veth"
 
-#: ../libnm-glib/nm-device.c:1923 ../libnm/nm-device.c:1874
+#: ../libnm-glib/nm-device.c:1913 ../libnm/nm-device.c:1864
 msgid "Wired"
 msgstr "有線"
 
-#: ../libnm-glib/nm-device.c:1954 ../libnm/nm-device.c:1905
+#: ../libnm-glib/nm-device.c:1944 ../libnm/nm-device.c:1895
 msgid "PCI"
 msgstr "PCI"
 
-#: ../libnm-glib/nm-device.c:1956 ../libnm/nm-device.c:1907
+#: ../libnm-glib/nm-device.c:1946 ../libnm/nm-device.c:1897
 msgid "USB"
 msgstr "USB"
 
@@ -8570,28 +8933,27 @@ msgstr "USB"
 #. * "Ethernet"). You can change this to something like
 #. * "%2$s (%1$s)" if there's no grammatical way to combine
 #. * the strings otherwise.
-#.
-#: ../libnm-glib/nm-device.c:2052 ../libnm-glib/nm-device.c:2071
-#: ../libnm/nm-device.c:2001 ../libnm/nm-device.c:2020
+#. 
+#: ../libnm-glib/nm-device.c:2042 ../libnm-glib/nm-device.c:2061
+#: ../libnm/nm-device.c:1991 ../libnm/nm-device.c:2010
 #, c-format
 msgctxt "long device name"
 msgid "%s %s"
 msgstr "%s %s"
 
 #: ../libnm-glib/nm-remote-connection.c:149
-#, fuzzy
 msgid "Disconnected by D-Bus"
-msgstr "切断済み"
+msgstr "D-Bus により切断"
 
 #: ../libnm-util/crypto_gnutls.c:84
 #, c-format
 msgid "Hash length too long (%d > %d)."
-msgstr ""
+msgstr "ハッシュ長が長すぎます (%d > %d)。"
 
 #: ../libnm-util/crypto_gnutls.c:115
-#, fuzzy, c-format
+#, 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
@@ -8630,24 +8992,24 @@ msgid "%d. route has invalid prefix"
 msgstr "%d. ルートに無効なプレフィックスがあります"
 
 #: ../libnm-util/nm-setting-ip6-config.c:910
-#, fuzzy, c-format
+#, c-format
 msgid "%d. IPv6 address is invalid"
-msgstr "%d. IPv4 アドレスは無効です"
+msgstr "%d. IPv6 アドレスは無効です"
 
 #: ../libnm-util/nm-setting-ip6-config.c:920
-#, fuzzy, c-format
+#, c-format
 msgid "%d. IPv6 address has invalid prefix"
-msgstr "%d. IPv4 に無効なプレフィックスがあります"
+msgstr "%d. IPv6 アドレスのプレフィックスが無効です"
 
 #: ../libnm-util/nm-setting-vpn.c:582
 #, c-format
 msgid "Failed to convert '%s' value '%s' to uint"
-msgstr ""
+msgstr "'%s' 値 '%s' を uint に変換するのに失敗しました"
 
 #: ../libnm-util/nm-setting-vpn.c:589
 #, c-format
 msgid "Secret flags property '%s' not found"
-msgstr ""
+msgstr "シークレットフラグプロパティー '%s' が見つかりません"
 
 #: ../libnm-util/nm-setting-wireless.c:807
 #, c-format
@@ -8655,201 +9017,181 @@ msgid "requires setting '%s' property"
 msgstr "'%s' プロパティの設定が必要です"
 
 #: ../libnm/nm-device-adsl.c:74
-#, fuzzy
 msgid "The connection was not an ADSL connection."
-msgstr "接続中（セカンダリ接続を開始）"
+msgstr "接続は ADSL 接続ではありませんでした。"
 
 #: ../libnm/nm-device-bond.c:112
-#, fuzzy
 msgid "The connection was not a bond connection."
-msgstr "接続中（セカンダリ接続を開始）"
+msgstr "接続はボンド接続ではありませんでした。"
 
 #: ../libnm/nm-device-bridge.c:112
-#, fuzzy
 msgid "The connection was not a bridge connection."
-msgstr "接続中（セカンダリ接続を開始）"
+msgstr "接続はブリッジ接続ではありませんでした。"
 
 #: ../libnm/nm-device-bt.c:137
-#, fuzzy, c-format
+#, c-format
 msgid "The connection was not a Bluetooth connection."
-msgstr "'bluetooth' 接続タイプには 1 種類のオプション引数があります。\n"
+msgstr "接続は Bluetooth 接続ではありませんでした。"
 
 #: ../libnm/nm-device-bt.c:146
 msgid "Invalid device Bluetooth address."
-msgstr ""
+msgstr "無効なデバイス Bluetooth アドレスです。"
 
 #: ../libnm/nm-device-bt.c:153
 msgid "The Bluetooth addresses of the device and the connection didn't match."
-msgstr ""
+msgstr "デバイスと接続の Bluetooth アドレスが一致しませんでした。"
 
 #: ../libnm/nm-device-bt.c:162
 msgid ""
 "The device is lacking Bluetooth capabilities required by the connection."
-msgstr ""
+msgstr "デバイスには接続に必要な Bluetooth 機能がありません。"
 
 #: ../libnm/nm-device-ethernet.c:207
-#, fuzzy
 msgid "The connection was not an Ethernet or PPPoE connection."
-msgstr "「PPPoE」接続タイプの引数は 4 種類あります。\n"
+msgstr "接続は Ethernet または PPPoE 接続ではありませんでした。"
 
 #: ../libnm/nm-device-ethernet.c:222
 msgid "The connection and device differ in S390 subchannels."
-msgstr ""
+msgstr "接続とデバイスは S390 サブチャネルで異なります。"
 
 #: ../libnm/nm-device-ethernet.c:232 ../libnm/nm-device-infiniband.c:102
 #: ../libnm/nm-device-wifi.c:604 ../libnm/nm-device-wimax.c:326
-#, fuzzy
 msgid "Invalid device MAC address."
-msgstr "は有効な MAC アドレスではありません"
+msgstr "無効なデバイス MAC アドレスです。"
 
 #: ../libnm/nm-device-ethernet.c:237
 msgid "The MACs of the device and the connection do not match."
-msgstr ""
+msgstr "デバイスと接続の MAC アドレスが一致しませんでした。"
 
 #: ../libnm/nm-device-ethernet.c:247
 #, c-format
 msgid "Invalid MAC in the blacklist: %s."
-msgstr ""
+msgstr "ブラックリストの無効な MAC: %s。"
 
 #: ../libnm/nm-device-ethernet.c:253
 #, c-format
 msgid "Device MAC (%s) is blacklisted by the connection."
-msgstr ""
+msgstr "デバイス MAC (%s) は接続によりブラックリスト化されています。"
 
 #: ../libnm/nm-device-generic.c:91
-#, fuzzy
 msgid "The connection was not a generic connection."
-msgstr "接続中（セカンダリ接続を開始）"
+msgstr "接続は汎用的な接続ではありませんでした。"
 
 #: ../libnm/nm-device-generic.c:98
-#, fuzzy
 msgid "The connection did not specify an interface name."
-msgstr "InfiniBand P_Key 接続で親インターフェース名が指定されていませんでした"
+msgstr "接続でインターフェース名が指定されませんでした。"
 
 #: ../libnm/nm-device-tun.c:209
-#, fuzzy
 msgid "The connection was not a tun connection."
-msgstr "接続中（セカンダリ接続を開始）"
+msgstr "接続は tun 接続ではありませんでした。"
 
 #: ../libnm/nm-device-tun.c:218
-#, fuzzy
 msgid "The mode of the device and the connection didn't match"
-msgstr "このデバイスのアクティブな接続が消滅しました"
+msgstr "デバイスと接続のモードが一致しませんでした"
 
 #: ../libnm/nm-device-infiniband.c:94
-#, fuzzy
 msgid "The connection was not an InfiniBand connection."
-msgstr "'InfiniBand' 接続タイプには 5 種類のオプション引数があります。\n"
+msgstr "接続は InfiniBand 接続ではありませんでした。"
 
 #: ../libnm/nm-device-infiniband.c:110 ../libnm/nm-device-wifi.c:611
 #: ../libnm/nm-device-wimax.c:333
 msgid "The MACs of the device and the connection didn't match."
-msgstr ""
+msgstr "デバイスと接続の MAC アドレスが一致しませんでした。"
 
 #: ../libnm/nm-device-ip-tunnel.c:254
-#, fuzzy
 msgid "The connection was not an IP tunnel connection."
-msgstr "接続中（セカンダリ接続を開始）"
+msgstr "接続は IP トンネル接続ではありませんでした。"
 
 #: ../libnm/nm-device-macvlan.c:159
 msgid "The connection was not a MAC-VLAN connection."
-msgstr ""
+msgstr "接続は MAC-VLAN 接続ではありませんでした。"
 
 #: ../libnm/nm-device-modem.c:120
-#, fuzzy
 msgid "The connection was not a modem connection."
-msgstr "接続は削除されました"
+msgstr "接続はモデム接続ではありませんでした。"
 
 #: ../libnm/nm-device-modem.c:128
-#, fuzzy
 msgid "The connection was not a valid modem connection."
-msgstr "接続中（セカンダリ接続を開始）"
+msgstr "接続は有効なモデム接続ではありませんでした。"
 
 #: ../libnm/nm-device-modem.c:135
 msgid "The device is lacking capabilities required by the connection."
-msgstr ""
+msgstr "デバイスには接続に必要な機能がありません。"
 
 #: ../libnm/nm-device-olpc-mesh.c:115
-#, fuzzy
 msgid "The connection was not an OLPC Mesh connection."
-msgstr "’OLPC メッシュ' 接続タイプには 2 種類のオプション引数があります。\n"
+msgstr "接続は OLPC メッシュ接続ではありませんでした。"
 
-#: ../libnm/nm-device-team.c:139
-#, fuzzy
+#: ../libnm/nm-device-team.c:118
 msgid "The connection was not a team connection."
-msgstr "接続は削除されました"
+msgstr "接続は team 接続ではありませんでした。"
 
 #: ../libnm/nm-device-vlan.c:128
-#, fuzzy
 msgid "The connection was not a VLAN connection."
-msgstr "'VLAN' 接続タイプには 4 種類のオプション引数があります。\n"
+msgstr "接続は VLAN 接続ではありませんでした。"
 
 #: ../libnm/nm-device-vlan.c:135
 msgid "The VLAN identifiers of the device and the connection didn't match."
-msgstr ""
+msgstr "デバイスと接続の VLAN ID が一致しませんでした。"
 
 #: ../libnm/nm-device-vlan.c:148
 msgid "The hardware address of the device and the connection didn't match."
-msgstr ""
+msgstr "デバイスと接続のハードウェアアドレスが一致しませんでした。"
 
 #: ../libnm/nm-device-vxlan.c:387
-#, fuzzy
 msgid "The connection was not a VXLAN connection."
-msgstr "'VLAN' 接続タイプには 4 種類のオプション引数があります。\n"
+msgstr "接続は VXLAN 接続ではありませんでした。"
 
 #: ../libnm/nm-device-vxlan.c:394
 msgid "The VXLAN identifiers of the device and the connection didn't match."
-msgstr ""
+msgstr "デバイスと接続の VXLAN ID が一致しませんでした。"
 
 #: ../libnm/nm-device-wifi.c:595
 msgid "The connection was not a Wi-Fi connection."
-msgstr ""
+msgstr "接続は Wi-Fi 接続ではありませんでした。"
 
 #: ../libnm/nm-device-wifi.c:631
 msgid "The device is lacking WPA capabilities required by the connection."
-msgstr ""
+msgstr "デバイスには接続に必要な WPA 機能がありません。"
 
 #: ../libnm/nm-device-wifi.c:638
-msgid "The device is lacking WPA2/RSN capabilities required by the connection."
-msgstr ""
+msgid ""
+"The device is lacking WPA2/RSN capabilities required by the connection."
+msgstr "デバイスには接続に必要な WPA2/RSN 機能がありません。"
 
 #: ../libnm/nm-device-wimax.c:317
-#, fuzzy
 msgid "The connection was not a WiMAX connection."
-msgstr "'WiMax' 接続タイプには 1 種類のオプション引数があります。\n"
+msgstr "接続は WiMAX 接続ではありませんでした。"
 
-#: ../libnm/nm-device.c:2739
-#, fuzzy, c-format
+#: ../libnm/nm-device.c:2729
+#, c-format
 msgid "The connection was not valid: %s"
-msgstr "エラー: 接続は無効です: %s\n"
+msgstr "接続は有効ではありませんでした: %s"
 
-#: ../libnm/nm-device.c:2748
+#: ../libnm/nm-device.c:2738
 #, c-format
 msgid "The interface names of the device and the connection didn't match."
-msgstr ""
+msgstr "デバイスと接続のインターフェース名が一致しませんでした。"
 
-#: ../libnm/nm-manager.c:867
-#, fuzzy
+#: ../libnm/nm-manager.c:874
 msgid "Active connection could not be attached to the device"
-msgstr "アクティブな接続またはデバイスがありません"
+msgstr "アクティブな接続をデバイスに割り当てることができませんでした"
 
-#: ../libnm/nm-manager.c:1091
-#, fuzzy
+#: ../libnm/nm-manager.c:1098
 msgid "Active connection removed before it was initialized"
-msgstr "アクティブな接続の詳細"
+msgstr "アクティブな接続が初期化前に削除されました"
 
 #: ../libnm/nm-object.c:1545 ../libnm/nm-object.c:1691
 msgid "Caller did not specify D-Bus path for object"
-msgstr ""
+msgstr "呼び出し元がオブジェクトの D-Bus パスを指定しませんでした"
 
 #: ../libnm/nm-remote-settings.c:261
 msgid "Connection removed before it was initialized"
-msgstr ""
+msgstr "接続が初期化前に削除されました"
 
 #: ../libnm/nm-vpn-plugin-old.c:957 ../libnm/nm-vpn-service-plugin.c:978
-#, fuzzy
 msgid "No service name specified"
-msgstr "エラー: インターフェースが指定されていません。"
+msgstr "サービス名が指定されていません"
 
 #: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:1
 msgid "Enable or disable system networking"
@@ -8857,210 +9199,186 @@ msgstr "システムのネットワーキングを有効または無効にする
 
 #: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:2
 msgid "System policy prevents enabling or disabling system networking"
-msgstr ""
-"システムポリシーによりシステムのネットワーキングの有効化または無効化が阻止さ"
-"れます"
+msgstr "システムポリシーによりシステムのネットワーキングの有効化または無効化が阻止されます"
 
 #: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:3
-#, fuzzy
-msgid "Reload NetworkManager configuration"
-msgstr "NetworkManager のバージョンを表示して終了する"
-
-#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:4
-#, fuzzy
-msgid "System policy prevents reloading NetworkManager"
-msgstr ""
-"システムポリシーによりシステムのネットワーキングの有効化または無効化が阻止さ"
-"れます"
-
-#: ../policy/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 ""
-"NetworkManager をスリープ状態にする、またはスリープ状態から解除します (使用は"
-"システムの電源管理に限ってください)"
+msgstr "NetworkManager をスリープ状態にする、またはスリープ状態から解除します (使用はシステムの電源管理に限ってください)"
 
-#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:6
+#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:4
 msgid "System policy prevents putting NetworkManager to sleep or waking it up"
-msgstr ""
-"システムポリシーにより NetworkManager のスリープ状態への移行、またはスリープ"
-"状態からの解除が阻止されます"
+msgstr "システムポリシーにより NetworkManager のスリープ状態への移行、またはスリープ状態からの解除が阻止されます"
 
-#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:7
+#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:5
 msgid "Enable or disable WiFi devices"
 msgstr "Wi-Fi デバイスを有効または無効にする"
 
-#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:8
+#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:6
 msgid "System policy prevents enabling or disabling WiFi devices"
-msgstr ""
-"システムポリシーにより Wi-Fi デバイスの有効化または無効化が阻止されます"
+msgstr "システムポリシーにより Wi-Fi デバイスの有効化または無効化が阻止されます"
 
-#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:9
+#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:7
 msgid "Enable or disable mobile broadband devices"
 msgstr "モバイルブロードバンドのデバイスを有効または無効にする"
 
-#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:10
+#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:8
 msgid "System policy prevents enabling or disabling mobile broadband devices"
-msgstr ""
-"システムポリシーによりモバイルブロードバンドのデバイスの有効化または無効化が"
-"阻止されています"
+msgstr "システムポリシーによりモバイルブロードバンドのデバイスの有効化または無効化が阻止されています"
 
-#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:11
+#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:9
 msgid "Enable or disable WiMAX mobile broadband devices"
 msgstr "WiMAX モバイルブロードバンドのデバイスを有効または無効にする"
 
-#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:12
+#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:10
 msgid ""
 "System policy prevents enabling or disabling WiMAX mobile broadband devices"
-msgstr ""
-"システムポリシーにより WiMAX モバイルブロードバンドのデバイスの有効化または無"
-"効化が阻止されます"
+msgstr "システムポリシーにより WiMAX モバイルブロードバンドのデバイスの有効化または無効化が阻止されます"
 
-#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:13
+#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:11
 msgid "Allow control of network connections"
 msgstr "ネットワーク接続の制御を許可"
 
-#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:14
+#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:12
 msgid "System policy prevents control of network connections"
 msgstr "システムポリシーによりネットワーク接続の制御が阻止されます"
 
-#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:15
+#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:13
 msgid "Connection sharing via a protected WiFi network"
 msgstr "保護された Wi-Fi ネットワーク経由の接続共有"
 
-#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:16
-msgid "System policy prevents sharing connections via a protected WiFi network"
-msgstr ""
-"システムポリシーにより、保護された Wi-Fi ネットワーク経由の接続共有が阻止され"
-"ます。"
+#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:14
+msgid ""
+"System policy prevents sharing connections via a protected WiFi network"
+msgstr "システムポリシーにより、保護された Wi-Fi ネットワーク経由の接続共有が阻止されます。"
 
-#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:17
+#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:15
 msgid "Connection sharing via an open WiFi network"
 msgstr "保護されていない Wi-Fi ネットワーク経由の接続共有"
 
-#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:18
+#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:16
 msgid "System policy prevents sharing connections via an open WiFi network"
-msgstr ""
-"システムポリシーにより、保護されていない Wi-Fi ネットワーク経由の接続共有が阻"
-"止されます。"
+msgstr "システムポリシーにより、保護されていない Wi-Fi ネットワーク経由の接続共有が阻止されます。"
 
-#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:19
+#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:17
 msgid "Modify personal network connections"
 msgstr "個人のネットワーク接続を編集"
 
-#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:20
+#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:18
 msgid "System policy prevents modification of personal network settings"
 msgstr "システムポリシーにより個人のネットワーク設定の変更が阻止されます"
 
-#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:21
+#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:19
 msgid "Modify network connections for all users"
 msgstr "全ユーザーのネットワーク接続を編集"
 
-#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:22
+#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:20
 msgid "System policy prevents modification of network settings for all users"
 msgstr "システムポリシーにより全ユーザーのネットワーク設定の編集が阻止されます"
 
-#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:23
+#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:21
 msgid "Modify persistent system hostname"
 msgstr "永続的なシステムのホスト名を修正"
 
-#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:24
+#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:22
 msgid "System policy prevents modification of the persistent system hostname"
 msgstr "システムポリシーにより永続的なシステムのホスト名の修正が阻止されます"
 
-#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:25
+#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:23
 msgid "Modify persistent global DNS configuration"
-msgstr ""
+msgstr "永続的なグローバル DNS 設定の変更"
 
-#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:26
-#, fuzzy
+#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:24
 msgid ""
 "System policy prevents modification of the persistent global DNS "
 "configuration"
-msgstr "システムポリシーにより永続的なシステムのホスト名の修正が阻止されます"
+msgstr "システムポリシーにより永続的なグローバル DNS 設定の変更が阻止されます"
 
-#: ../shared/nm-utils/nm-shared-utils.c:185
+#: ../shared/nm-shared-utils.c:208
 #, c-format
 msgid "object class '%s' has no property named '%s'"
-msgstr ""
+msgstr "オブジェクトクラス '%s' には '%s' という名前のプロパティーがありません"
 
-#: ../shared/nm-utils/nm-shared-utils.c:192
+#: ../shared/nm-shared-utils.c:215
 #, c-format
 msgid "property '%s' of object class '%s' is not writable"
-msgstr ""
+msgstr "プロパティー '%s' (オブジェクトクラス '%s') が書き込み可能ではありません"
 
-#: ../shared/nm-utils/nm-shared-utils.c:199
+#: ../shared/nm-shared-utils.c:222
 #, c-format
 msgid ""
 "construct property \"%s\" for object '%s' can't be set after construction"
-msgstr ""
+msgstr "コンストラクトプロパティー \"%s\" (オブジェクト '%s') は構築後に設定できません"
 
-#: ../shared/nm-utils/nm-shared-utils.c:207
+#: ../shared/nm-shared-utils.c:230
 #, c-format
 msgid "'%s::%s' is not a valid property name; '%s' is not a GObject subtype"
-msgstr ""
+msgstr "'%s::%s' は有効なプロパティー名ではありません。'%s' は GObject サブタイプではありません"
 
-#: ../shared/nm-utils/nm-shared-utils.c:216
+#: ../shared/nm-shared-utils.c:239
 #, c-format
 msgid "unable to set property '%s' of type '%s' from value of type '%s'"
-msgstr ""
+msgstr "プロパティー '%s' (タイプ '%s') をタイプ '%s' の値から設定できません"
 
-#: ../shared/nm-utils/nm-shared-utils.c:227
+#: ../shared/nm-shared-utils.c:250
 #, c-format
 msgid ""
 "value \"%s\" of type '%s' is invalid or out of range for property '%s' of "
 "type '%s'"
-msgstr ""
+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:112
-#, fuzzy, c-format
+#: ../src/NetworkManagerUtils.c:111
+#, c-format
 msgctxt "connection id fallback"
 msgid "%s %d"
-msgstr "%s %s"
+msgstr "%s %d"
 
-#: ../src/main.c:165 ../src/main.c:300
-#, fuzzy, c-format
+#: ../src/main.c:220 ../src/main.c:358
+#, c-format
 msgid "Failed to read configuration: %s\n"
-msgstr "設定の読み込みに失敗しました: (%d) %s\n"
+msgstr "設定の読み込みに失敗しました: %s\n"
 
 #. Logging/debugging
-#: ../src/main.c:179 ../src/nm-iface-helper.c:298
+#: ../src/main.c:234 ../src/nm-iface-helper.c:298
 msgid "Print NetworkManager version and exit"
 msgstr "NetworkManager のバージョンを表示して終了する"
 
-#: ../src/main.c:180 ../src/nm-iface-helper.c:299
+#: ../src/main.c:235 ../src/nm-iface-helper.c:299
 msgid "Don't become a daemon"
 msgstr "デーモンにしない"
 
-#: ../src/main.c:181 ../src/nm-iface-helper.c:301
+#: ../src/main.c:236 ../src/nm-iface-helper.c:301
 #, c-format
 msgid "Log level: one of [%s]"
 msgstr "ログレベル: [%s] のいずれか"
 
-#: ../src/main.c:183 ../src/nm-iface-helper.c:303
+#: ../src/main.c:238 ../src/nm-iface-helper.c:303
 #, c-format
 msgid "Log domains separated by ',': any combination of [%s]"
 msgstr "「,」で区切ったログドメイン: [%s] の組み合わせ"
 
-#: ../src/main.c:185 ../src/nm-iface-helper.c:305
+#: ../src/main.c:240 ../src/nm-iface-helper.c:305
 msgid "Make all warnings fatal"
 msgstr "すべての警告を致命的にする"
 
-#: ../src/main.c:186
+#: ../src/main.c:241
 msgid "Specify the location of a PID file"
 msgstr "PID ファイルの場所を指定する"
 
-#: ../src/main.c:188
-#, fuzzy
+#: ../src/main.c:242
+msgid "State file location"
+msgstr "状態ファイルの場所"
+
+#: ../src/main.c:244
 msgid "Print NetworkManager configuration and exit"
-msgstr "NetworkManager のバージョンを表示して終了する"
+msgstr "NetworkManager の設定を表示して終了する"
 
-#: ../src/main.c:198
+#: ../src/main.c:254
 msgid ""
 "NetworkManager monitors all network connections and automatically\n"
 "chooses the best connection to use.  It also allows the user to\n"
@@ -9072,514 +9390,503 @@ msgstr ""
 "ワイヤレスカードを関連付けるべきワイヤレスアクセスポイントの\n"
 "ユーザーによる指定も許可されます。"
 
-#: ../src/main.c:285 ../src/main-utils.c:270 ../src/nm-iface-helper.c:393
+#: ../src/main.c:343 ../src/main-utils.c:269 ../src/nm-iface-helper.c:393
 #, c-format
 msgid "%s.  Please use --help to see a list of valid options.\n"
 msgstr "%s  --help を使用して有効なオプションの一覧を確認してください。\n"
 
-#: ../src/main.c:290 ../src/nm-iface-helper.c:398
+#: ../src/main.c:348 ../src/nm-iface-helper.c:398
 #, c-format
 msgid "Ignoring unrecognized log domain(s) '%s' passed on command line.\n"
 msgstr "コマンドラインに渡された未認識のログドメイン '%s' を無視します。\n"
 
-#: ../src/main.c:315
+#: ../src/main.c:373
 #, c-format
 msgid "Error in configuration file: %s.\n"
 msgstr "設定ファイルにエラーが発生しました: %s\n"
 
-#: ../src/main.c:320
+#: ../src/main.c:378
 #, c-format
 msgid "Ignoring unrecognized log domain(s) '%s' from config files.\n"
 msgstr "設定ファイルにある未認識のログドメイン '%s' を無視します。\n"
 
-#: ../src/main.c:331 ../src/nm-iface-helper.c:408
+#: ../src/main.c:389 ../src/nm-iface-helper.c:408
 #, c-format
 msgid "Could not daemonize: %s [error %u]\n"
 msgstr "デーモン化できませんでした: %s [エラー %u]\n"
 
-#: ../src/main-utils.c:98
+#: ../src/main-utils.c:99
 #, c-format
 msgid "Opening %s failed: %s\n"
 msgstr "%s のオープンに失敗しました: %s\n"
 
-#: ../src/main-utils.c:104
+#: ../src/main-utils.c:105
 #, c-format
 msgid "Writing to %s failed: %s\n"
 msgstr "%s への書き込みに失敗しました: %s\n"
 
-#: ../src/main-utils.c:109
+#: ../src/main-utils.c:110
 #, c-format
 msgid "Closing %s failed: %s\n"
 msgstr "%s のクローズに失敗しました: %s\n"
 
-#: ../src/main-utils.c:144
+#: ../src/main-utils.c:145
 #, c-format
 msgid "Cannot create '%s': %s"
-msgstr ""
+msgstr "'%s' を作成できません: %s"
 
-#: ../src/main-utils.c:196
-#, fuzzy, c-format
+#: ../src/main-utils.c:197
+#, c-format
 msgid "%s is already running (pid %ld)\n"
-msgstr "NetworkManager はすでに起動しています (pid %ld)\n"
+msgstr "%s はすでに実行中です (pid %ld)\n"
 
-#: ../src/main-utils.c:206
-#, fuzzy, c-format
+#: ../src/main-utils.c:207
+#, c-format
 msgid "You must be root to run %s!\n"
-msgstr "NetworkManager を実行するには root になる必要があります!\n"
+msgstr "%s! を実行するには root になる必要があります!\n"
 
-#: ../src/dhcp-manager/nm-dhcp-dhclient-utils.c:214
+#: ../src/dhcp-manager/nm-dhcp-dhclient-utils.c:213
 msgid "# Created by NetworkManager\n"
 msgstr "# NetworkManager で作成されています\n"
 
-#: ../src/dhcp-manager/nm-dhcp-dhclient-utils.c:222
+#: ../src/dhcp-manager/nm-dhcp-dhclient-utils.c:220
 #, c-format
-msgid ""
-"# Merged from %s\n"
+msgid "# Merged from %s\n"
 "\n"
-msgstr ""
-"# %s からマージされています\n"
+msgstr "# %s からマージされています\n"
 "\n"
 
-#: ../src/devices/bluetooth/nm-bluez-device.c:200
+#: ../src/devices/adsl/nm-device-adsl.c:133
+msgid "ADSL connection"
+msgstr "ADSL 接続"
+
+#: ../src/devices/bluetooth/nm-bluez-device.c:197
 #, c-format
 msgid "%s Network"
 msgstr "%s ネットワーク"
 
 #: ../src/devices/bluetooth/nm-device-bt.c:253
 msgid "PAN requested, but Bluetooth device does not support NAP"
-msgstr ""
+msgstr "PAN が要求されましたが、Bluetooth デバイスは NAP をサポートしません"
 
 #: ../src/devices/bluetooth/nm-device-bt.c:263
 msgid "PAN connections cannot specify GSM, CDMA, or serial settings"
-msgstr ""
+msgstr "PAN 接続は GSM、CDMA、またはシリアル設定を指定できません"
 
 #: ../src/devices/bluetooth/nm-device-bt.c:276
-#, fuzzy
 msgid "PAN connection"
-msgstr "PAN 接続 %d"
+msgstr "PAN 接続"
 
 #: ../src/devices/bluetooth/nm-device-bt.c:283
 msgid "DUN requested, but Bluetooth device does not support DUN"
-msgstr ""
+msgstr "DUN が要求されましたが、Bluetooth デバイスは DUN をサポートしません"
 
 #: ../src/devices/bluetooth/nm-device-bt.c:293
 msgid "DUN connection must include a GSM or CDMA setting"
-msgstr ""
+msgstr "DUN 接続には GSM または CDMA 設定が含まれる必要があります"
 
 #: ../src/devices/bluetooth/nm-device-bt.c:303
-#: ../src/devices/wwan/nm-modem-broadband.c:687
-#, fuzzy
+#: ../src/devices/wwan/nm-modem-broadband.c:655
 msgid "GSM connection"
-msgstr "GSM 接続 %d"
+msgstr "GSM 接続"
 
 #: ../src/devices/bluetooth/nm-device-bt.c:307
-#: ../src/devices/wwan/nm-modem-broadband.c:711
-#, fuzzy
+#: ../src/devices/wwan/nm-modem-broadband.c:679
 msgid "CDMA connection"
-msgstr "CDMA 接続 %d"
+msgstr "CDMA 接続"
 
 #: ../src/devices/bluetooth/nm-device-bt.c:315
 msgid "Unknown/unhandled Bluetooth connection type"
-msgstr ""
+msgstr "不明な/未処理の Bluetooth 接続タイプ"
 
 #: ../src/devices/bluetooth/nm-device-bt.c:336
-#: ../src/devices/nm-device-ethernet.c:1421
+#: ../src/devices/nm-device-ethernet.c:1415
 #: ../src/devices/nm-device-infiniband.c:193
-#: ../src/devices/wifi/nm-device-wifi.c:875
-#, fuzzy
+#: ../src/devices/wifi/nm-device-wifi.c:872
 msgid "connection does not match device"
-msgstr "アクティブな接続またはデバイスがありません"
+msgstr "接続がデバイスに一致しません"
 
 #: ../src/devices/nm-device-bond.c:105
-#, fuzzy
 msgid "Bond connection"
-msgstr "ボンド接続 %d"
+msgstr "ボンド接続"
 
 #: ../src/devices/nm-device-bridge.c:111
-#, fuzzy
 msgid "Bridge connection"
-msgstr "ブリッジ接続 %d"
+msgstr "ブリッジ接続"
 
-#: ../src/devices/nm-device-ethernet.c:1402
-#, fuzzy
+#: ../src/devices/nm-device-ethernet.c:1396
 msgid "PPPoE connection"
-msgstr "PPPoE 接続 %d"
+msgstr "PPPoE 接続"
 
-#: ../src/devices/nm-device-ethernet.c:1402
-#, fuzzy
+#: ../src/devices/nm-device-ethernet.c:1396
 msgid "Wired connection"
-msgstr "有線接続 %d"
+msgstr "有線接続"
 
-#: ../src/devices/nm-device-ethernet-utils.c:36
+#: ../src/devices/nm-device-ethernet-utils.c:39
 #, c-format
 msgid "Wired connection %d"
 msgstr "有線接続 %d"
 
-#: ../src/devices/nm-device-ip-tunnel.c:347
-#, fuzzy
+#: ../src/devices/nm-device-infiniband.c:175
+msgid "InfiniBand connection"
+msgstr "InfiniBand 接続"
+
+#: ../src/devices/nm-device-ip-tunnel.c:346
 msgid "IP tunnel connection"
-msgstr "接続の編集"
+msgstr "IP トンネル接続"
 
-#: ../src/devices/nm-device-macvlan.c:436
-#, fuzzy
+#: ../src/devices/nm-device-macvlan.c:435
 msgid "MACVLAN connection"
-msgstr "VLAN 接続 %d"
+msgstr "MACVLAN 接続"
 
 #: ../src/devices/nm-device-tun.c:129
-#, fuzzy
 msgid "TUN connection"
-msgstr "DUN 接続 %d"
+msgstr "TUN 接続"
+
+#: ../src/devices/nm-device-vlan.c:457
+msgid "VLAN connection"
+msgstr "VLAN 接続"
+
+#: ../src/devices/nm-device-vxlan.c:373
+msgid "VXLAN connection"
+msgstr "VXLAN 接続"
 
-#: ../src/devices/team/nm-device-team.c:121
-#, fuzzy
+#: ../src/devices/team/nm-device-team.c:115
 msgid "Team connection"
-msgstr "team 接続 %d"
+msgstr "team 接続"
 
 #: ../src/devices/wifi/nm-device-olpc-mesh.c:146
-#, fuzzy
 msgid "Mesh"
-msgstr "Mesh %d"
+msgstr "メッシュ"
 
-#: ../src/devices/wifi/nm-device-wifi.c:842
+#: ../src/devices/wifi/nm-device-wifi.c:839
 msgid "WPA Ad-Hoc disabled due to kernel bugs"
-msgstr ""
+msgstr "WPA アドホックはカーネルバグのため無効になりました"
 
 #: ../src/devices/wifi/nm-wifi-ap-utils.c:42
-#, fuzzy, c-format
+#, c-format
 msgid "%s is incompatible with static WEP keys"
-msgstr "'%s=%s' は '%s > 0' とは互換性がありません"
+msgstr "%s は静的 WEP キーと互換性がありません"
 
 #: ../src/devices/wifi/nm-wifi-ap-utils.c:76
-#, fuzzy
 msgid "LEAP authentication requires a LEAP username"
-msgstr "ワイヤレスネットワークで必要とされる認証"
+msgstr "LEAP 認証には LEAP ユーザー名が必要です"
 
 #: ../src/devices/wifi/nm-wifi-ap-utils.c:86
 msgid "LEAP username requires 'leap' authentication"
-msgstr ""
+msgstr "LEAP ユーザー名には 'leap' 認証が必要です"
 
 #: ../src/devices/wifi/nm-wifi-ap-utils.c:99
 msgid "LEAP authentication requires IEEE 802.1x key management"
-msgstr ""
+msgstr "LEAP 認証には IEEE 802.1x キー管理が必要です"
 
 #: ../src/devices/wifi/nm-wifi-ap-utils.c:119
 msgid "LEAP authentication is incompatible with Ad-Hoc mode"
-msgstr ""
+msgstr "LEAP 認証はアドホックモードと互換性がありません"
 
 #: ../src/devices/wifi/nm-wifi-ap-utils.c:131
 msgid "LEAP authentication is incompatible with 802.1x setting"
-msgstr ""
+msgstr "LEAP 認証は 802.1x 設定と互換性がありません"
 
 #: ../src/devices/wifi/nm-wifi-ap-utils.c:153
 #, c-format
 msgid "a connection using '%s' authentication cannot use WPA key management"
-msgstr ""
+msgstr "'%s' 認証を使用している接続は WPA キー管理を使用できません"
 
 #: ../src/devices/wifi/nm-wifi-ap-utils.c:164
 #, c-format
 msgid "a connection using '%s' authentication cannot specify WPA protocols"
-msgstr ""
+msgstr "'%s' 認証を使用している接続は WPA プロトコルを指定できません"
 
 #: ../src/devices/wifi/nm-wifi-ap-utils.c:180
 #: ../src/devices/wifi/nm-wifi-ap-utils.c:197
 #, c-format
 msgid "a connection using '%s' authentication cannot specify WPA ciphers"
-msgstr ""
+msgstr "'%s' 認証を使用している接続は WPA 暗号を指定できません"
 
 #: ../src/devices/wifi/nm-wifi-ap-utils.c:209
 #, c-format
 msgid "a connection using '%s' authentication cannot specify a WPA password"
-msgstr ""
+msgstr "'%s' 認証を使用している接続は WPA パスワードを指定できません"
 
 #: ../src/devices/wifi/nm-wifi-ap-utils.c:240
-#, fuzzy
 msgid "Dynamic WEP requires an 802.1x setting"
-msgstr "動的 WEP (802.1x)"
+msgstr "動的 WEP には 802.1x 設定が必要です"
 
 #: ../src/devices/wifi/nm-wifi-ap-utils.c:250
 #: ../src/devices/wifi/nm-wifi-ap-utils.c:278
 msgid "Dynamic WEP requires 'open' authentication"
-msgstr ""
+msgstr "動的 WEP には 'open' 認証が必要です"
 
 #: ../src/devices/wifi/nm-wifi-ap-utils.c:265
 msgid "Dynamic WEP requires 'ieee8021x' key management"
-msgstr ""
+msgstr "動的 WEP には 'ieee8021x' キー管理が必要です"
 
 #: ../src/devices/wifi/nm-wifi-ap-utils.c:312
 msgid "WPA-PSK authentication is incompatible with 802.1x"
-msgstr ""
+msgstr "WPA-PSK 認証は 802.1x と互換性がありません"
 
 #: ../src/devices/wifi/nm-wifi-ap-utils.c:322
-#, fuzzy
 msgid "WPA-PSK requires 'open' authentication"
-msgstr "有線 802.1X の認証"
+msgstr "WPA-PSK には 'open' 認証が必要です"
 
 #: ../src/devices/wifi/nm-wifi-ap-utils.c:334
 msgid "WPA Ad-Hoc authentication requires an Ad-Hoc mode AP"
-msgstr ""
+msgstr "WPA アドホック認証にはアドホックモード AP が必要です"
 
 #: ../src/devices/wifi/nm-wifi-ap-utils.c:347
 msgid "WPA Ad-Hoc authentication requires 'wpa' protocol"
-msgstr ""
+msgstr "WPA アドホック認証には 'wpa' プロトコルが必要です"
 
 #: ../src/devices/wifi/nm-wifi-ap-utils.c:359
-#, fuzzy
 msgid "WPA Ad-Hoc authentication requires 'none' pairwise cipher"
-msgstr "ワイヤレスネットワークで必要とされる認証"
+msgstr "WPA アドホック認証には 'none' ペア暗号が必要です"
 
 #: ../src/devices/wifi/nm-wifi-ap-utils.c:371
 msgid "WPA Ad-Hoc requires 'tkip' group cipher"
-msgstr ""
+msgstr "WPA アドホック認証には 'tkip' グループ暗号が必要です"
 
 #: ../src/devices/wifi/nm-wifi-ap-utils.c:385
 msgid "Access point does not support PSK but setting requires it"
-msgstr ""
+msgstr "アクセスポイントは PSK をサポートしませんが、設定では PSK が必要です"
 
 #: ../src/devices/wifi/nm-wifi-ap-utils.c:415
 msgid "WPA-EAP authentication requires an 802.1x setting"
-msgstr ""
+msgstr "WPA-EAP 認証には 802.1x 設定が必要です"
 
 #: ../src/devices/wifi/nm-wifi-ap-utils.c:425
-#, fuzzy
 msgid "WPA-EAP requires 'open' authentication"
-msgstr "有線 802.1X の認証"
+msgstr "WPA-EAP には 'open' 認証が必要です"
 
 #: ../src/devices/wifi/nm-wifi-ap-utils.c:436
 msgid "802.1x setting requires 'wpa-eap' key management"
-msgstr ""
+msgstr "802.1x 設定には 'wpa-eap' キー管理が必要です"
 
 #: ../src/devices/wifi/nm-wifi-ap-utils.c:449
 msgid "Access point does not support 802.1x but setting requires it"
-msgstr ""
+msgstr "アクセスポイントは 802.1x をサポートしませんが、設定では 802.1x 必要です"
 
 #: ../src/devices/wifi/nm-wifi-ap-utils.c:477
 msgid ""
 "Access point mode is Ad-Hoc but setting requires Infrastructure security"
-msgstr ""
+msgstr "アクセスポイントモードはアドホックですが、設定ではインフラストラクチャーセキュリティーが必要です"
 
 #: ../src/devices/wifi/nm-wifi-ap-utils.c:487
 msgid "Ad-Hoc mode is incompatible with 802.1x security"
-msgstr ""
+msgstr "アドホックモードは 802.1x セキュリティーと互換性がありません"
 
 #: ../src/devices/wifi/nm-wifi-ap-utils.c:496
 msgid "Ad-Hoc mode is incompatible with LEAP security"
-msgstr ""
+msgstr "アドホックモードは LEAP セキュリティーと互換性がありません"
 
 #: ../src/devices/wifi/nm-wifi-ap-utils.c:506
 msgid "Ad-Hoc mode requires 'open' authentication"
-msgstr ""
+msgstr "アドホックモードには 'open' 認証が必要です"
 
 #: ../src/devices/wifi/nm-wifi-ap-utils.c:516
 msgid ""
 "Access point mode is Infrastructure but setting requires Ad-Hoc security"
-msgstr ""
+msgstr "アクセスポイントモードはインフラストラクチャーですが、設定ではアドホックセキュリティーが必要です"
 
 #: ../src/devices/wifi/nm-wifi-ap-utils.c:558
 #: ../src/devices/wifi/nm-wifi-ap-utils.c:588
 #, c-format
 msgid "connection does not match access point"
-msgstr ""
+msgstr "接続がアクセスポイントに一致しません"
 
 #: ../src/devices/wifi/nm-wifi-ap-utils.c:612
 msgid "Access point is unencrypted but setting specifies security"
-msgstr ""
+msgstr "アクセスポイントは暗号化されていませんが、設定ではセキュリティーが指定されています"
 
 #: ../src/devices/wifi/nm-wifi-ap-utils.c:701
 msgid ""
 "WPA authentication is incompatible with non-EAP (original) LEAP or Dynamic "
 "WEP"
-msgstr ""
+msgstr "WPA 認証は非 EAP (オリジナル) LEAP または動的 WEP と互換性がありません"
 
 #: ../src/devices/wifi/nm-wifi-ap-utils.c:711
 msgid "WPA authentication is incompatible with Shared Key authentication"
-msgstr ""
+msgstr "WPA 認証は共有キー認証と互換性がありません"
 
 #: ../src/devices/wifi/nm-wifi-ap-utils.c:758
-#, fuzzy
 msgid "Failed to determine AP security information"
-msgstr "復号化用シンメトリックキーの設定に失敗しました。"
+msgstr "AP セキュリティー情報の決定に失敗しました。"
 
-#: ../src/devices/wwan/nm-modem-broadband.c:673
-#, fuzzy
+#: ../src/devices/wwan/nm-modem-broadband.c:641
 msgid "GSM mobile broadband connection requires a 'gsm' setting"
-msgstr "モバイルブロードバンド接続 %d"
+msgstr "GSM モバイルブロードバンド接続には 'gsm' 設定が必要です"
 
-#: ../src/nm-config.c:500
+#: ../src/nm-config.c:465
 msgid "Config file location"
 msgstr "設定ファイルの場所"
 
-#: ../src/nm-config.c:501
+#: ../src/nm-config.c:466
 msgid "Config directory location"
 msgstr "設定ディレクトリの場所"
 
-#: ../src/nm-config.c:502
-#, fuzzy
+#: ../src/nm-config.c:467
 msgid "System config directory location"
-msgstr "設定ディレクトリの場所"
+msgstr "システム設定ディレクトリーの場所"
 
-#: ../src/nm-config.c:503
-#, fuzzy
+#: ../src/nm-config.c:468
 msgid "Internal config file location"
-msgstr "設定ファイルの場所"
-
-#: ../src/nm-config.c:504
-msgid "State file location"
-msgstr "状態ファイルの場所"
+msgstr "内部設定ファイルの場所"
 
-#: ../src/nm-config.c:505
+#: ../src/nm-config.c:469
 msgid "State file for no-auto-default devices"
-msgstr ""
+msgstr "no-auto-default デバイスの状態ファイル"
 
-#: ../src/nm-config.c:506
+#: ../src/nm-config.c:470
 msgid "List of plugins separated by ','"
 msgstr "複数のプラグインを「,」で区切った一覧"
 
-#: ../src/nm-config.c:507
-#, fuzzy
+#: ../src/nm-config.c:471
 msgid "Quit after initial configuration"
-msgstr "現在の nmcli 設定:\n"
+msgstr "初期設定後に終了する"
 
-#: ../src/nm-config.c:508 ../src/nm-iface-helper.c:300
+#: ../src/nm-config.c:472 ../src/nm-iface-helper.c:300
 msgid "Don't become a daemon, and log to stderr"
 msgstr "デーモンにせず、stderr にログ記録する"
 
 #. These three are hidden for now, and should eventually just go away.
-#: ../src/nm-config.c:511
+#: ../src/nm-config.c:475
 msgid "An http(s) address for checking internet connectivity"
 msgstr "インターネットの接続性を確認するための http(s) アドレス"
 
-#: ../src/nm-config.c:512
+#: ../src/nm-config.c:476
 msgid "The interval between connectivity checks (in seconds)"
 msgstr "接続性チェックの間隔 (秒単位)"
 
-#: ../src/nm-config.c:513
+#: ../src/nm-config.c:477
 msgid "The expected start of the response"
 msgstr "期待されている応答の開始点"
 
 #. Interface/IP config
 #: ../src/nm-iface-helper.c:281
-#, fuzzy
 msgid "The interface to manage"
-msgstr "親インターフェース [none]: "
+msgstr "管理するインターフェース"
 
 #: ../src/nm-iface-helper.c:281
 msgid "eth0"
-msgstr ""
+msgstr "eth0"
 
 #: ../src/nm-iface-helper.c:282
-#, fuzzy
 msgid "Connection UUID"
-msgstr "接続"
+msgstr "接続 UUID"
 
 #: ../src/nm-iface-helper.c:282
 msgid "661e8cd0-b618-46b8-9dc9-31a52baaa16b"
-msgstr ""
+msgstr "661e8cd0-b618-46b8-9dc9-31a52baaa16b"
 
 #: ../src/nm-iface-helper.c:283
 msgid "Whether to manage IPv6 SLAAC"
-msgstr ""
+msgstr "IPv6 SLAAC を管理するかどうか"
 
 #: ../src/nm-iface-helper.c:284
 msgid "Whether SLAAC must be successful"
-msgstr ""
+msgstr "SLAAC が成功する必要があるかどうか"
 
 #: ../src/nm-iface-helper.c:285
 msgid "Use an IPv6 temporary privacy address"
-msgstr ""
+msgstr "IPv6 一時プライバシーアドレスの使用"
 
 #: ../src/nm-iface-helper.c:286
-#, fuzzy
 msgid "Current DHCPv4 address"
-msgstr "クローンの MAC アドレス"
+msgstr "現在の DHCPv4 アドレス"
 
 #: ../src/nm-iface-helper.c:287
 msgid "Whether DHCPv4 must be successful"
-msgstr ""
+msgstr "DHCPv4 が成功する必要があるかどうか"
 
 #: ../src/nm-iface-helper.c:288
-#, fuzzy
 msgid "Hex-encoded DHCPv4 client ID"
-msgstr "サポートの無い DHCP クライアント '%s'"
+msgstr "16 進エンコードされた DHCPv4 クライアント ID"
 
 #: ../src/nm-iface-helper.c:289
 msgid "Hostname to send to DHCP server"
-msgstr ""
+msgstr "DHCP サーバーに送信するホスト名"
 
 #: ../src/nm-iface-helper.c:289
 msgid "barbar"
-msgstr ""
+msgstr "barbar"
 
 #: ../src/nm-iface-helper.c:290
 msgid "FQDN to send to DHCP server"
-msgstr ""
+msgstr "DHCP サーバーに送信する FQDN"
 
 #: ../src/nm-iface-helper.c:290
 msgid "host.domain.org"
-msgstr ""
+msgstr "host.domain.org"
 
 #: ../src/nm-iface-helper.c:291
-#, fuzzy
 msgid "Route priority for IPv4"
-msgstr "削除する優先度がありません"
+msgstr "IPv4 のルート優先度"
 
 #: ../src/nm-iface-helper.c:291
 msgid "0"
-msgstr ""
+msgstr "0"
 
 #: ../src/nm-iface-helper.c:292
-#, fuzzy
 msgid "Route priority for IPv6"
-msgstr "削除する優先度がありません"
+msgstr "IPv6 のルート優先度"
 
 #: ../src/nm-iface-helper.c:292
 msgid "1024"
-msgstr ""
+msgstr "1024"
 
 #: ../src/nm-iface-helper.c:293
 msgid "Hex-encoded Interface Identifier"
-msgstr ""
+msgstr "16 進エンコードされたインターフェース ID"
 
 #: ../src/nm-iface-helper.c:294
 msgid "IPv6 SLAAC address generation mode"
-msgstr ""
+msgstr "IPv6 SLAAC アドレス生成モード"
 
 #: ../src/nm-iface-helper.c:295
 msgid ""
 "The logging backend configuration value. See logging.backend in "
 "NetworkManager.conf"
-msgstr ""
+msgstr "ロギングバックエンド設定値。NetworkManager.conf の logging.backend を参照してください"
 
 #: ../src/nm-iface-helper.c:315
 msgid ""
 "nm-iface-helper is a small, standalone process that manages a single network "
 "interface."
-msgstr ""
+msgstr "nm-iface-helper は、単一のネットワークインターフェースを管理する小さいスタンドアロンプロセスです。"
 
 #: ../src/nm-iface-helper.c:374
 #, c-format
 msgid "An interface name and UUID are required\n"
-msgstr ""
+msgstr "インターフェース名と UUID が’必要です\n"
 
 #: ../src/nm-iface-helper.c:380
 #, c-format
 msgid "Failed to find interface index for %s (%s)\n"
-msgstr ""
+msgstr "%s (%s) のインターフェースインデックスの検出に失敗しました\n"
 
 #: ../src/nm-iface-helper.c:442
 #, c-format
 msgid "(%s): Invalid IID %s\n"
-msgstr ""
+msgstr "(%s): 無効な IID %s\n"
 
-#: ../src/nm-logging.c:223
+#: ../src/nm-logging.c:216
 #, c-format
 msgid "Unknown log level '%s'"
 msgstr "不明なログレベル '%s'"
 
-#: ../src/nm-logging.c:318
+#: ../src/nm-logging.c:309
 #, c-format
 msgid "Unknown log domain '%s'"
 msgstr "不明なログドメイン '%s'"
 
-#: ../src/settings/plugins/ifcfg-rh/reader.c:106
+#: ../src/nm-manager.c:3635
+msgid "VPN connection"
+msgstr "VPN 接続"
+
+#: ../src/nm-sleep-monitor-systemd.c:131
+msgid "NetworkManager needs to turn off networks"
+msgstr "NetworkManager でネットワークをオフにする必要があります"
+
+#: ../src/settings/plugins/ifcfg-rh/reader.c:108
 msgid "System"
 msgstr "システム"
diff --git a/po/ko.po b/po/ko.po
index 3e9f7e33ec..558b93ebc0 100644
--- a/po/ko.po
+++ b/po/ko.po
@@ -2,33 +2,34 @@
 # networkmanager korean translation.
 # Copyright (C) 2007 THE NetworkManager'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the NetworkManager package.
-#
-#
+# 
+# 
 # Young-Ho Cha <ganadist@gmail.com>, 2006-2007.
 # Namhyung Kim <namhyung@gmail.com>, 2007.
 # Hyunsok Oh <enshahar@gmail.com>, 2010.
 # Hyunsok Oh <hoh@redhat.com>, 2010.
 # Changwoo Ryu <cwryu@debian.org>, 2011.
 # Seongho Cho <darkcircle.0426@gmail.com>, 2011.
-#
+# 
 # 주의:
 # - 이 프로그램의 이름인 "Network Manager"는 "네트워크 관리" 혹은
 #  "네트워크 관리 프로그램"으로 번역.
-# Lubomir Rintel <lkundrak@v3.sk>, 2016. #zanata
+# eukim <eukim@redhat.com>, 2016. #zanata
+# youli <youli@redhat.com>, 2016. #zanata
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-06-22 10:02+0200\n"
-"PO-Revision-Date: 2014-01-29 02:45-0500\n"
-"Last-Translator: eukim <eukim@redhat.com>\n"
-"Language-Team: GNOME Korea <gnome-kr@googlegroups.com>\n"
-"Language: ko\n"
+"POT-Creation-Date: 2016-04-29 14:24+0530\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"PO-Revision-Date: 2016-08-29 03:31+0000\n"
+"Last-Translator: eukim <eukim@redhat.com>\n"
+"Language-Team: GNOME Korea <gnome-kr@googlegroups.com>\n"
+"Language: ko\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Generator: Zanata 3.8.4\n"
+"X-Generator: Zanata 3.9.3\n"
 
 #: ../clients/cli/agent.c:39
 #, c-format
@@ -37,7 +38,10 @@ msgid ""
 "\n"
 "COMMAND := { secret | polkit | all }\n"
 "\n"
-msgstr ""
+msgstr "사용법: nmcli 에이전트 { 명령 | 도움말 }\n"
+"\n"
+"COMMAND := { Secret | polkit | 전체 }\n"
+"\n"
 
 #: ../clients/cli/agent.c:47
 #, c-format
@@ -50,6 +54,12 @@ msgid ""
 "and if a password is required asks the user for it.\n"
 "\n"
 msgstr ""
+"사용법: nmcli agent secret { 도움말 }\n"
+"\n"
+"nmcli를 네트워크 관리자 Secret 에이전트로 실행합니다. 네트워크 관리자가\n"
+"암호를 요구하는 경우 등록된 에이전트에게 이를 요청합니다. 이 명령은 계속해서 nmcli를 실행하며\n"
+" 암호가 필요한 경우 사용자에게 요청합니다.\n"
+"\n"
 
 #: ../clients/cli/agent.c:57
 #, c-format
@@ -62,6 +72,12 @@ msgid ""
 "the response back to polkit.\n"
 "\n"
 msgstr ""
+"사용법: nmcli agent polkit { 도움말 }\n"
+"\n"
+"nmcli를 사용자 세션의 polkit 작업으로 등록합니다.\n"
+"polkit 디먼에서 권한 부여를 요구하고, nmcli는 사용자에게 요청하고\n"
+"polkit에 다시 응답을 보냅니다.\n"
+"\n"
 
 #: ../clients/cli/agent.c:67
 #, c-format
@@ -71,42 +87,46 @@ msgid ""
 "Runs nmcli as both NetworkManager secret and a polkit agent.\n"
 "\n"
 msgstr ""
+"사용법: nmcli agent all { 도움말 }\n"
+"\n"
+"nmcli를 네트워크 관리자 Secret 및 polkit 에이전트로 실행합니다.\n"
+"\n"
 
 #: ../clients/cli/agent.c:149
 #, c-format
 msgid "nmcli successfully registered as a NetworkManager's secret agent.\n"
-msgstr ""
+msgstr "nmcli가 네트워크 관리자의 Secret 에이전트로 등록되었습니다.\n"
 
 #: ../clients/cli/agent.c:151
-#, fuzzy, c-format
+#, c-format
 msgid "Error: secret agent initialization failed"
-msgstr "모뎀 초기화 실패"
+msgstr "오류: secret 에이전트 초기화 실패"
 
 #: ../clients/cli/agent.c:166
-#, fuzzy, c-format
+#, c-format
 msgid "Error: polkit agent initialization failed: %s"
-msgstr "오류: 연결 활성화가 실패했습니다: %s"
+msgstr "오류: polkit 에이전트 초기화 실패: %s"
 
 #: ../clients/cli/agent.c:174
 #, c-format
 msgid "nmcli successfully registered as a polkit agent.\n"
-msgstr ""
+msgstr "nmcli가 polkit 에이전트로 등록되었습니다.\n"
 
-#: ../clients/cli/agent.c:206 ../clients/cli/connections.c:8703
-#: ../clients/cli/devices.c:3727 ../clients/cli/general.c:344
-#: ../clients/cli/general.c:473
+#: ../clients/cli/agent.c:206 ../clients/cli/connections.c:11050
+#: ../clients/cli/devices.c:3669 ../clients/cli/general.c:343
+#: ../clients/cli/general.c:484
 #, c-format
 msgid "Error: NetworkManager is not running."
 msgstr "오류: 네트워크 관리 프로그램이 실행 중이 아닙니다."
 
-#: ../clients/cli/agent.c:239
-#, fuzzy, c-format
+#: ../clients/cli/agent.c:242
+#, c-format
 msgid "Error: 'agent' command '%s' is not valid."
-msgstr "오류: 'general' 명령 '%s'이 올바르지 않습니다. "
+msgstr "오류: 'agent' 명령 '%s'이(가) 올바르지 않습니다."
 
 #: ../clients/cli/common.c:38 ../clients/cli/common.c:51
 #: ../clients/cli/common.c:59 ../clients/cli/common.c:71
-#: ../clients/cli/connections.c:237 ../clients/cli/connections.c:259
+#: ../clients/cli/connections.c:192 ../clients/cli/connections.c:214
 msgid "GROUP"
 msgstr "그룹 "
 
@@ -118,7 +138,7 @@ msgstr "주소"
 #. 1
 #. 2
 #: ../clients/cli/common.c:40 ../clients/cli/common.c:61
-#: ../clients/cli/connections.c:262
+#: ../clients/cli/connections.c:217
 msgid "GATEWAY"
 msgstr "게이트웨이"
 
@@ -148,21 +168,21 @@ msgid "OPTION"
 msgstr "옵션 "
 
 #: ../clients/cli/common.c:376 ../clients/cli/common.c:436
-#, fuzzy, c-format
+#, c-format
 msgid "invalid prefix '%s'; <1-%d> allowed"
-msgstr "잘못된 접두사 '%s'; <1-32> 허용됨 "
+msgstr "잘못된 접두사 '%s'; <1-%d> 허용됨 "
 
 #: ../clients/cli/common.c:384
-#, fuzzy, c-format
+#, c-format
 msgid "invalid IP address: %s"
-msgstr "잘못된 IPv4 주소 '%s'"
+msgstr "잘못된 IP 주소: %s"
 
 #: ../clients/cli/common.c:448
 #, c-format
 msgid ""
 "the second component of route ('%s') is neither a next hop address nor a "
 "metric"
-msgstr ""
+msgstr "라우팅('%s')의 두 번째 구성 요소가 다음 홉 주소나 메트릭이 아닙니다"
 
 #: ../clients/cli/common.c:457
 #, c-format
@@ -170,13 +190,13 @@ msgid "invalid metric '%s'"
 msgstr "잘못된 메트릭스 '%s'"
 
 #: ../clients/cli/common.c:465
-#, fuzzy, c-format
+#, c-format
 msgid "invalid route: %s"
-msgstr "잘못된 IPv4 라우팅 '%s'"
+msgstr "잘못된 라우팅: %s'"
 
 #: ../clients/cli/common.c:477
 msgid "default route cannot be added (NetworkManager handles it by itself)"
-msgstr ""
+msgstr "기본 라우팅을 추가할 수 없습니다(네트워크 관리자가 자동으로 처리)"
 
 #: ../clients/cli/common.c:494
 msgid "unmanaged"
@@ -186,7 +206,7 @@ msgstr "관리되지 않음"
 msgid "unavailable"
 msgstr "사용할 수 없음"
 
-#: ../clients/cli/common.c:498 ../clients/cli/general.c:246
+#: ../clients/cli/common.c:498 ../clients/cli/general.c:245
 msgid "disconnected"
 msgstr "연결 끊겼음"
 
@@ -214,11 +234,11 @@ msgstr "연결 중 (IP 연결 확인하는 중)"
 msgid "connecting (starting secondary connections)"
 msgstr "연결 중 (보조 연결 시작하는 중)"
 
-#: ../clients/cli/common.c:512 ../clients/cli/general.c:242
+#: ../clients/cli/common.c:512 ../clients/cli/general.c:241
 msgid "connected"
 msgstr "연결됨"
 
-#: ../clients/cli/common.c:514 ../clients/cli/connections.c:690
+#: ../clients/cli/common.c:514 ../clients/cli/connections.c:648
 msgid "deactivating"
 msgstr "활성화 해제하는 중"
 
@@ -227,70 +247,69 @@ msgid "connection failed"
 msgstr "연결 실패함"
 
 #: ../clients/cli/common.c:518 ../clients/cli/common.c:535
-#: ../clients/cli/connections.c:695 ../clients/cli/connections.c:718
-#: ../clients/cli/connections.c:1995 ../clients/cli/devices.c:1104
-#: ../clients/cli/devices.c:1145 ../clients/cli/devices.c:1147
-#: ../clients/cli/general.c:249 ../clients/cli/general.c:287
-#: ../clients/cli/general.c:422 ../clients/cli/general.c:437
-#: ../clients/cli/settings.c:845 ../clients/cli/settings.c:931
-#: ../clients/cli/settings.c:1315 ../clients/cli/settings.c:1954
-#: ../clients/cli/settings.c:3317
+#: ../clients/cli/connections.c:653 ../clients/cli/connections.c:676
+#: ../clients/cli/connections.c:1949 ../clients/cli/devices.c:1024
+#: ../clients/cli/devices.c:1065 ../clients/cli/devices.c:1067
+#: ../clients/cli/general.c:248 ../clients/cli/general.c:286
+#: ../clients/cli/general.c:432 ../clients/cli/general.c:448
+#: ../clients/cli/settings.c:839 ../clients/cli/settings.c:925
+#: ../clients/cli/settings.c:1265 ../clients/cli/settings.c:1901
+#: ../clients/cli/settings.c:3205 ../clients/cli/utils.c:1400
 #, c-format
 msgid "unknown"
 msgstr "알 수 없음"
 
 #. "CAPABILITIES"
-#: ../clients/cli/common.c:527 ../clients/cli/connections.c:975
-#: ../clients/cli/connections.c:977 ../clients/cli/connections.c:979
-#: ../clients/cli/connections.c:1013 ../clients/cli/connections.c:1082
-#: ../clients/cli/connections.c:1083 ../clients/cli/connections.c:1085
-#: ../clients/cli/connections.c:3291 ../clients/cli/connections.c:4414
-#: ../clients/cli/connections.c:6229 ../clients/cli/connections.c:6230
-#: ../clients/cli/devices.c:782 ../clients/cli/devices.c:1069
-#: ../clients/cli/devices.c:1070 ../clients/cli/devices.c:1071
-#: ../clients/cli/devices.c:1072 ../clients/cli/devices.c:1073
-#: ../clients/cli/devices.c:1108 ../clients/cli/devices.c:1110
-#: ../clients/cli/devices.c:1138 ../clients/cli/devices.c:1139
-#: ../clients/cli/devices.c:1140 ../clients/cli/devices.c:1141
-#: ../clients/cli/devices.c:1142 ../clients/cli/devices.c:1143
-#: ../clients/cli/devices.c:1144 ../clients/cli/devices.c:1146
-#: ../clients/cli/devices.c:1148 ../clients/cli/general.c:431
-#: ../clients/cli/settings.c:3312
+#: ../clients/cli/common.c:527 ../clients/cli/connections.c:933
+#: ../clients/cli/connections.c:935 ../clients/cli/connections.c:937
+#: ../clients/cli/connections.c:971 ../clients/cli/connections.c:1040
+#: ../clients/cli/connections.c:1041 ../clients/cli/connections.c:1043
+#: ../clients/cli/connections.c:3450 ../clients/cli/connections.c:8563
+#: ../clients/cli/connections.c:8564 ../clients/cli/devices.c:772
+#: ../clients/cli/devices.c:989 ../clients/cli/devices.c:990
+#: ../clients/cli/devices.c:991 ../clients/cli/devices.c:992
+#: ../clients/cli/devices.c:993 ../clients/cli/devices.c:1028
+#: ../clients/cli/devices.c:1030 ../clients/cli/devices.c:1058
+#: ../clients/cli/devices.c:1059 ../clients/cli/devices.c:1060
+#: ../clients/cli/devices.c:1061 ../clients/cli/devices.c:1062
+#: ../clients/cli/devices.c:1063 ../clients/cli/devices.c:1064
+#: ../clients/cli/devices.c:1066 ../clients/cli/devices.c:1068
+#: ../clients/cli/general.c:442 ../clients/cli/settings.c:3200
 msgid "yes"
 msgstr "예"
 
-#: ../clients/cli/common.c:529 ../clients/cli/connections.c:975
-#: ../clients/cli/connections.c:977 ../clients/cli/connections.c:979
-#: ../clients/cli/connections.c:1082 ../clients/cli/connections.c:1083
-#: ../clients/cli/connections.c:1085 ../clients/cli/connections.c:3292
-#: ../clients/cli/connections.c:4413 ../clients/cli/connections.c:6229
-#: ../clients/cli/connections.c:6230 ../clients/cli/devices.c:782
-#: ../clients/cli/devices.c:1069 ../clients/cli/devices.c:1070
-#: ../clients/cli/devices.c:1071 ../clients/cli/devices.c:1072
-#: ../clients/cli/devices.c:1073 ../clients/cli/devices.c:1108
-#: ../clients/cli/devices.c:1110 ../clients/cli/devices.c:1138
-#: ../clients/cli/devices.c:1139 ../clients/cli/devices.c:1140
-#: ../clients/cli/devices.c:1141 ../clients/cli/devices.c:1142
-#: ../clients/cli/devices.c:1143 ../clients/cli/devices.c:1144
-#: ../clients/cli/devices.c:1146 ../clients/cli/devices.c:1148
-#: ../clients/cli/general.c:433 ../clients/cli/settings.c:3314
+#: ../clients/cli/common.c:529 ../clients/cli/connections.c:933
+#: ../clients/cli/connections.c:935 ../clients/cli/connections.c:937
+#: ../clients/cli/connections.c:1040 ../clients/cli/connections.c:1041
+#: ../clients/cli/connections.c:1043 ../clients/cli/connections.c:3451
+#: ../clients/cli/connections.c:8563 ../clients/cli/connections.c:8564
+#: ../clients/cli/devices.c:772 ../clients/cli/devices.c:989
+#: ../clients/cli/devices.c:990 ../clients/cli/devices.c:991
+#: ../clients/cli/devices.c:992 ../clients/cli/devices.c:993
+#: ../clients/cli/devices.c:1028 ../clients/cli/devices.c:1030
+#: ../clients/cli/devices.c:1058 ../clients/cli/devices.c:1059
+#: ../clients/cli/devices.c:1060 ../clients/cli/devices.c:1061
+#: ../clients/cli/devices.c:1062 ../clients/cli/devices.c:1063
+#: ../clients/cli/devices.c:1064 ../clients/cli/devices.c:1066
+#: ../clients/cli/devices.c:1068 ../clients/cli/general.c:444
+#: ../clients/cli/settings.c:3202
 msgid "no"
 msgstr "아니요"
 
 #: ../clients/cli/common.c:531
 msgid "yes (guessed)"
-msgstr ""
+msgstr "예(추정됨)"
 
 #: ../clients/cli/common.c:533
 msgid "no (guessed)"
-msgstr ""
+msgstr "아니요(추정됨)"
 
 #: ../clients/cli/common.c:544
 msgid "No reason given"
 msgstr "이유 없음 "
 
 #. We should not really come here
-#: ../clients/cli/common.c:547 ../clients/cli/connections.c:3140
+#: ../clients/cli/common.c:547 ../clients/cli/connections.c:2976
 #, c-format
 msgid "Unknown error"
 msgstr "알 수 없는 오류 "
@@ -517,37 +536,32 @@ msgid "teamd control failed"
 msgstr "teamd 제어에 실패했습니다 "
 
 #: ../clients/cli/common.c:715
-#, fuzzy
 msgid "Modem failed or no longer available"
-msgstr "ModemManager를 사용할 수 없음 "
+msgstr "모뎀에 오류가 있거나 더 이상 사용 가능하지 않습니다."
 
 #: ../clients/cli/common.c:718
-#, fuzzy
 msgid "Modem now ready and available"
-msgstr "ModemManager를 사용할 수 없음 "
+msgstr "모뎀이 이제 준비되었으며 사용 가능합니다."
 
 #: ../clients/cli/common.c:721
 msgid "SIM PIN was incorrect"
-msgstr ""
+msgstr "SIM PIN이 잘못되었습니다"
 
 #: ../clients/cli/common.c:724
-#, fuzzy
 msgid "New connection activation was enqueued"
-msgstr "오류: 연결 활성화가 실패했습니다."
+msgstr "새 연결 활성화가 대기열에 추가되었습니다."
 
 #: ../clients/cli/common.c:727
-#, fuzzy
 msgid "The device's parent changed"
-msgstr "장치가 제거되었습니다 "
+msgstr "장치의 부모 항목이 변경되었습니다."
 
 #: ../clients/cli/common.c:730
-#, fuzzy
 msgid "The device parent's management changed"
-msgstr "장치가 제거되었습니다 "
+msgstr "장치 부모 항목의 관리가 변경되었습니다."
 
 #. TRANSLATORS: Unknown reason for a device state change (NMDeviceStateReason)
-#: ../clients/cli/common.c:734 ../libnm-glib/nm-device.c:1898
-#: ../libnm/nm-device.c:1849
+#: ../clients/cli/common.c:734 ../libnm-glib/nm-device.c:1888
+#: ../libnm/nm-device.c:1839
 msgid "Unknown"
 msgstr "알 수 없음"
 
@@ -567,19 +581,19 @@ msgid "'%s' is not a valid team configuration or file name."
 msgstr "'%s'은 올바른 팀 설정 또는 파일 이름이 아닙니다."
 
 #: ../clients/cli/common.c:958
-#, fuzzy, c-format
+#, c-format
 msgid "Error: openconnect failed: %s\n"
-msgstr "오류: 연결 확인에 실패했습니다: %s\n"
+msgstr "오류: openconnect 실패: %s\n"
 
 #: ../clients/cli/common.c:965
-#, fuzzy, c-format
+#, c-format
 msgid "Error: openconnect failed with status %d\n"
-msgstr "오류: 연결이 올바르지 않습니다: %s\n"
+msgstr "오류: openconnect 실패, 상태: %d\n"
 
 #: ../clients/cli/common.c:967
-#, fuzzy, c-format
+#, c-format
 msgid "Error: openconnect failed with signal %d\n"
-msgstr "오류: 연결이 올바르지 않습니다: %s\n"
+msgstr "오류: openconnect 실패, 신호: %d\n"
 
 #: ../clients/cli/common.c:1045
 #, c-format
@@ -587,119 +601,72 @@ msgid ""
 "Warning: password for '%s' not given in 'passwd-file' and nmcli cannot ask "
 "without '--ask' option.\n"
 msgstr ""
+"경고: '%s'의 암호가 'passwd-file'에 제공되지 않았으며 '--ask' 옵션 없이는 nmcli 요청이 불가능합니다.\n"
 
 #. define some prompts for connection editor
-#: ../clients/cli/connections.c:61
+#: ../clients/cli/connections.c:41
 msgid "Setting name? "
 msgstr "설정 이름은?"
 
-#: ../clients/cli/connections.c:62
+#: ../clients/cli/connections.c:42
 msgid "Property name? "
 msgstr "속성 이름은?"
 
-#: ../clients/cli/connections.c:63
+#: ../clients/cli/connections.c:43
 msgid "Enter connection type: "
 msgstr "연결 유형 입력: "
 
 #. define some other prompts
-#: ../clients/cli/connections.c:66
-#, fuzzy
-msgid "Connection type"
+#: ../clients/cli/connections.c:46
+msgid "Connection type: "
 msgstr "연결 유형: "
 
-#: ../clients/cli/connections.c:67
-#, fuzzy
-msgid "VPN type"
+#: ../clients/cli/connections.c:47
+msgid "VPN type: "
 msgstr "VPN 유형: "
 
-#: ../clients/cli/connections.c:68
-#, fuzzy
-msgid "Master"
-msgstr "본딩 마스터: "
-
-#: ../clients/cli/connections.c:70 ../clients/tui/nmt-page-infiniband.c:88
-msgid "Transport mode"
-msgstr "전송 모드 "
-
-#: ../clients/cli/connections.c:75
-#, fuzzy
-msgid "Bluetooth type"
-msgstr "블루투스"
-
-#: ../clients/cli/connections.c:81
-#, fuzzy
-msgid "Bonding mode"
-msgstr "링크 모니터링 "
-
-#: ../clients/cli/connections.c:83 ../clients/cli/connections.c:4014
-#, fuzzy
-msgid "Bonding monitoring mode"
-msgstr "링크 모니터링 "
-
-#: ../clients/cli/connections.c:88
-msgid "Protocol"
-msgstr ""
-
-#: ../clients/cli/connections.c:91
-#, fuzzy
-msgid "Wi-Fi mode"
-msgstr "Wi-Fi"
+#: ../clients/cli/connections.c:48
+msgid "Master: "
+msgstr "마스터: "
 
-#: ../clients/cli/connections.c:97
-#, fuzzy
-msgid "ADSL encapsulation"
-msgstr "DSL 인증 "
-
-#: ../clients/cli/connections.c:100
-#, fuzzy
-msgid "Tun mode"
-msgstr "전송 모드 "
-
-#: ../clients/cli/connections.c:105
-#, fuzzy
-msgid "IP Tunnel mode"
-msgstr "연결 편집 "
+#: ../clients/cli/connections.c:49
+msgid "Connection (name, UUID, or path): "
+msgstr "연결 (이름, UUID, 또는 경로): "
 
-#: ../clients/cli/connections.c:107
-#, fuzzy
-msgid "MACVLAN mode"
-msgstr "VLAN"
+#: ../clients/cli/connections.c:50
+msgid "VPN connection (name, UUID, or path): "
+msgstr "VPN 연결(이름, UUID 또는 경로): "
 
-#: ../clients/cli/connections.c:109
-#, fuzzy
-msgid "Connection (name, UUID, or path)"
-msgstr "연결 (이름, UUID, 또는 경로): "
+#: ../clients/cli/connections.c:51
+msgid "Connection(s) (name, UUID, or path): "
+msgstr "연결(이름, UUID 또는 경로): "
 
-#: ../clients/cli/connections.c:110
-#, fuzzy
-msgid "VPN connection (name, UUID, or path)"
-msgstr "연결 (이름, UUID, 또는 경로): "
+#: ../clients/cli/connections.c:52
+msgid "Connection(s) (name, UUID, path or apath): "
+msgstr "연결(이름, UUID, 경로 또는 apath): "
 
-#: ../clients/cli/connections.c:111
-#, fuzzy
-msgid "Connection(s) (name, UUID, or path)"
-msgstr "연결 (이름, UUID, 또는 경로): "
+#: ../clients/cli/connections.c:53
+msgid "Tunnel mode: "
+msgstr "터널 모드: "
 
-#: ../clients/cli/connections.c:112
-#, fuzzy
-msgid "Connection(s) (name, UUID, path or apath)"
-msgstr "연결 (이름, UUID, 또는 경로): "
+#: ../clients/cli/connections.c:54
+msgid "MACVLAN mode: "
+msgstr "MACVLAN 모드: "
 
 #. 0
-#: ../clients/cli/connections.c:118 ../clients/cli/connections.c:238
+#: ../clients/cli/connections.c:73 ../clients/cli/connections.c:193
 #: ../clients/cli/devices.c:55 ../clients/cli/devices.c:89
 #: ../clients/cli/devices.c:99 ../clients/cli/devices.c:110
 #: ../clients/cli/devices.c:120 ../clients/cli/devices.c:137
 #: ../clients/cli/devices.c:150 ../clients/cli/devices.c:176
 #: ../clients/cli/devices.c:191 ../clients/cli/devices.c:200
-#: ../clients/cli/devices.c:210 ../clients/cli/devices.c:220
-#: ../clients/cli/devices.c:261
+#: ../clients/cli/devices.c:210 ../clients/cli/devices.c:251
 msgid "NAME"
 msgstr "이름"
 
 #. 0
 #. 1
-#: ../clients/cli/connections.c:119 ../clients/cli/connections.c:239
+#: ../clients/cli/connections.c:74 ../clients/cli/connections.c:194
 msgid "UUID"
 msgstr "UUID"
 
@@ -707,36 +674,35 @@ msgstr "UUID"
 #. 0
 #. 1
 #. 2
-#: ../clients/cli/connections.c:120 ../clients/cli/connections.c:260
+#: ../clients/cli/connections.c:75 ../clients/cli/connections.c:215
 #: ../clients/cli/devices.c:41 ../clients/cli/devices.c:57
 #: ../clients/cli/devices.c:179
 msgid "TYPE"
 msgstr "유형"
 
 #. 2
-#: ../clients/cli/connections.c:121
+#: ../clients/cli/connections.c:76
 msgid "TIMESTAMP"
 msgstr "타임스탬프"
 
 #. 3
-#: ../clients/cli/connections.c:122
+#: ../clients/cli/connections.c:77
 msgid "TIMESTAMP-REAL"
 msgstr "실제 타임스탬프"
 
 #. 4
 #. 16
-#: ../clients/cli/connections.c:123 ../clients/cli/devices.c:72
+#: ../clients/cli/connections.c:78 ../clients/cli/devices.c:72
 msgid "AUTOCONNECT"
 msgstr "자동연결"
 
 #. 5
-#: ../clients/cli/connections.c:124
-#, fuzzy
+#: ../clients/cli/connections.c:79
 msgid "AUTOCONNECT-PRIORITY"
-msgstr "자동연결"
+msgstr "자동연결 우선 순위"
 
 #. 6
-#: ../clients/cli/connections.c:125
+#: ../clients/cli/connections.c:80
 msgid "READONLY"
 msgstr "읽기전용"
 
@@ -745,7 +711,7 @@ msgstr "읽기전용"
 #. 2
 #. 15
 #. 5
-#: ../clients/cli/connections.c:126 ../clients/cli/connections.c:246
+#: ../clients/cli/connections.c:81 ../clients/cli/connections.c:201
 #: ../clients/cli/devices.c:43 ../clients/cli/devices.c:166
 #: ../clients/cli/devices.c:182
 msgid "DBUS-PATH"
@@ -754,7 +720,7 @@ msgstr "DBUS 경로"
 #. 8
 #. 13
 #. 4
-#: ../clients/cli/connections.c:127 ../clients/cli/devices.c:164
+#: ../clients/cli/connections.c:82 ../clients/cli/devices.c:164
 #: ../clients/cli/devices.c:181
 msgid "ACTIVE"
 msgstr "활성"
@@ -764,9 +730,9 @@ msgstr "활성"
 #. 12
 #. 3
 #. 0
-#: ../clients/cli/connections.c:128 ../clients/cli/devices.c:40
+#: ../clients/cli/connections.c:83 ../clients/cli/devices.c:40
 #: ../clients/cli/devices.c:56 ../clients/cli/devices.c:163
-#: ../clients/cli/devices.c:180 ../clients/cli/devices.c:262
+#: ../clients/cli/devices.c:180 ../clients/cli/devices.c:252
 msgid "DEVICE"
 msgstr "장치"
 
@@ -775,42 +741,42 @@ msgstr "장치"
 #. 1
 #. 10
 #. 1
-#: ../clients/cli/connections.c:129 ../clients/cli/connections.c:241
+#: ../clients/cli/connections.c:84 ../clients/cli/connections.c:196
 #: ../clients/cli/devices.c:42 ../clients/cli/devices.c:66
-#: ../clients/cli/general.c:37
+#: ../clients/cli/general.c:36
 msgid "STATE"
 msgstr "상태"
 
 #. 11
-#: ../clients/cli/connections.c:130
-#, fuzzy
+#: ../clients/cli/connections.c:85
 msgid "ACTIVE-PATH"
-msgstr "마스터 경로"
+msgstr "활성 경로"
 
 #. 2
-#: ../clients/cli/connections.c:240
+#: ../clients/cli/connections.c:195
 msgid "DEVICES"
 msgstr "장치"
 
 #. 4
-#: ../clients/cli/connections.c:242
+#: ../clients/cli/connections.c:197
 msgid "DEFAULT"
 msgstr "디폴트"
 
 #. 5
-#: ../clients/cli/connections.c:243
+#: ../clients/cli/connections.c:198
 msgid "DEFAULT6"
 msgstr "디폴트6"
 
 #. 6
-#: ../clients/cli/connections.c:244
+#: ../clients/cli/connections.c:199
 msgid "SPEC-OBJECT"
 msgstr "스펙-객체"
 
 #. 7
 #. 4
-#: ../clients/cli/connections.c:245 ../clients/cli/connections.c:283
-#: ../clients/tui/nm-editor-utils.c:233
+#. Ask for optional 'vpn' arguments.
+#: ../clients/cli/connections.c:200 ../clients/cli/connections.c:238
+#: ../clients/cli/connections.c:4169 ../clients/tui/nm-editor-utils.c:233
 #: ../clients/tui/nmt-connect-connection-list.c:405
 msgid "VPN"
 msgstr "VPN"
@@ -818,71 +784,71 @@ msgstr "VPN"
 #. 9
 #. 5
 #. 22
-#: ../clients/cli/connections.c:247 ../clients/cli/devices.c:46
+#: ../clients/cli/connections.c:202 ../clients/cli/devices.c:46
 #: ../clients/cli/devices.c:78
 msgid "CON-PATH"
 msgstr "CON-경로"
 
 #. 10
-#: ../clients/cli/connections.c:248
+#: ../clients/cli/connections.c:203
 msgid "ZONE"
 msgstr "영역"
 
 #. 11
-#: ../clients/cli/connections.c:249
+#: ../clients/cli/connections.c:204
 msgid "MASTER-PATH"
 msgstr "마스터 경로"
 
 #. 1
-#: ../clients/cli/connections.c:261
+#: ../clients/cli/connections.c:216
 msgid "USERNAME"
 msgstr "사용자 이름"
 
 #. 3
-#: ../clients/cli/connections.c:263
+#: ../clients/cli/connections.c:218
 msgid "BANNER"
 msgstr "배너"
 
 #. 4
-#: ../clients/cli/connections.c:264
+#: ../clients/cli/connections.c:219
 msgid "VPN-STATE"
 msgstr "VPN-상태"
 
 #. 5
-#: ../clients/cli/connections.c:265
+#: ../clients/cli/connections.c:220
 msgid "CFG"
 msgstr "CFG"
 
-#: ../clients/cli/connections.c:278 ../clients/cli/devices.c:235
+#: ../clients/cli/connections.c:233 ../clients/cli/devices.c:225
 msgid "GENERAL"
 msgstr "일반"
 
 #. 0
 #. 6
-#: ../clients/cli/connections.c:279 ../clients/cli/devices.c:242
+#: ../clients/cli/connections.c:234 ../clients/cli/devices.c:232
 msgid "IP4"
 msgstr "IP4"
 
 #. 1
 #. 7
-#: ../clients/cli/connections.c:280 ../clients/cli/devices.c:243
+#: ../clients/cli/connections.c:235 ../clients/cli/devices.c:233
 msgid "DHCP4"
 msgstr "DHCP4"
 
 #. 2
 #. 8
-#: ../clients/cli/connections.c:281 ../clients/cli/devices.c:244
+#: ../clients/cli/connections.c:236 ../clients/cli/devices.c:234
 msgid "IP6"
 msgstr "IP6"
 
 #. 3
 #. 9
-#: ../clients/cli/connections.c:282 ../clients/cli/devices.c:245
+#: ../clients/cli/connections.c:237 ../clients/cli/devices.c:235
 msgid "DHCP6"
 msgstr "DHCP6"
 
-#: ../clients/cli/connections.c:314
-#, fuzzy, c-format
+#: ../clients/cli/connections.c:272
+#, c-format
 msgid ""
 "Usage: nmcli connection { COMMAND | help }\n"
 "\n"
@@ -897,8 +863,8 @@ msgid ""
 "\n"
 "  down [id | uuid | path | apath] <ID> ...\n"
 "\n"
-"  add COMMON_OPTIONS TYPE_SPECIFIC_OPTIONS SLAVE_OPTIONS IP_OPTIONS [-- "
-"([+|-]<setting>.<property> <value>)+]\n"
+"  add COMMON_OPTIONS TYPE_SPECIFIC_OPTIONS SLAVE_OPTIONS IP_OPTIONS [-- ([+|-"
+"]<setting>.<property> <value>)+]\n"
 "\n"
 "  modify [--temporary] [id | uuid | path] <ID> ([+|-]<setting>.<property> "
 "<value>)+\n"
@@ -923,32 +889,41 @@ msgid ""
 msgstr ""
 "사용법: nmcli connection { 명령 | help }\n"
 "\n"
-"명령 := { show | up | down | add | modify | edit | delete | reload | load }\n"
+"명령 := { show | up | down | add | modify | edit | delete | monitor | reload | "
+"load }\n"
 "\n"
-"  설정된 [[id | uuid | path] <ID>] 표시\n"
-"  활성화된     [[id | uuid | path | apath] <ID>] 표시\n"
+"  show [--active] [--order <지정된 순서>]\n"
+"  show [--active] [id | uuid | path | apath] <ID> ...\n"
 "\n"
-"  up [[id | uuid | path] <ID>] [ifname <ifname>] [ap <BSSID>] [nsp <name>]\n"
+"  up [[id | uuid | path] <ID>] [ifname <ifname>] [ap <BSSID>] [passwd-file "
+"<암호가 있는 파일>]\n"
 "\n"
-"  up [[id | uuid | path] <ID>] [ifname <ifname>] [ap <BSSID>]\n"
+"  down [id | uuid | path | apath] <ID> ...\n"
 "\n"
-"  down [id | uuid | path | apath] <ID>\n"
+"  add COMMON_OPTIONS TYPE_SPECIFIC_OPTIONS SLAVE_OPTIONS IP_OPTIONS [-- ([+|-"
+"]<설정>.<속성> <값>)+]\n"
 "\n"
-"  add COMMON_OPTIONS TYPE_SPECIFIC_OPTIONS IP_OPTIONS\n"
+"  modify [--temporary] [id | uuid | path] <ID> ([+|-]<설정>.<속성> <값>)+\n"
 "\n"
-"  modify [id | uuid | path] <ID> <setting>.<property> <value>\n"
+"  clone [--temporary] [id | uuid | path ] <ID> <새 이름>\n"
 "\n"
 "  edit [id | uuid | path] <ID>\n"
 "  edit [type <new_con_type>] [con-name <new_con_name>]\n"
 "\n"
 "  delete [id | uuid | path] <ID>\n"
 "\n"
+"  monitor [id | uuid | path] <ID> ...\n"
+"\n"
 "  reload\n"
 "\n"
-"  load <filename> [ <filename>... ]\n"
+"  load <파일 이름> [ <파일 이름>... ]\n"
+"\n"
+"  import [--temporary] type <유형> file <가져올 파일>\n"
+"\n"
+"  export [id | uuid | path] <ID> [<출력 파일>]\n"
 "\n"
 
-#: ../clients/cli/connections.c:336
+#: ../clients/cli/connections.c:294
 #, c-format
 msgid ""
 "Usage: nmcli connection show { ARGUMENTS | help }\n"
@@ -974,9 +949,25 @@ msgid ""
 "account. Use global --show-secrets option to reveal associated secrets as "
 "well.\n"
 msgstr ""
+"사용법: nmcli connection show { 인수 | 도움말 }\n"
+"\n"
+"인수 := [--active] [--order <순서 지정>]\n"
+"\n"
+"인메모리 및 온디스크 연결 프로필을 나열합니다. 이 중 일부는\n"
+"장치에서 해당 연결 프로필을 사용 중인 경우 함께 활성화될 수 있습니다. 매개변수가 없으면 모든\n"
+"프로필이 나열됩니다. --active 옵션이 지졍된 경우 활성\n"
+"프로필만 표시됩니다. --order를 사용하면 사용자 지정 연결 순서 지정을 수행할 수 있습니다(설명서 페이지 참조).\n"
+"\n"
+"인수 := [--active] [id | uuid | path | apath] <ID> ...\n"
+"\n"
+"지정된 연결에 대한 세부 정보를 표시합니다. 기본적으로 정적 구성\n"
+"및 활성 연결 데이터가 모두 표시됩니다. 출력을 글로벌 '--fields' 옵션을 사용하여\n"
+"필터링할 수 있습니다. 자세한 내용은 설명서 페이지를 참조하십시오.\n"
+"--active 옵션이 지정된 경우 활성 프로필만 \n"
+"고려됩니다. 글로벌 --show-secrets 옵션을 사용하면 관련 Secret도 함께 표시할 수 있습니다.\n"
 
-#: ../clients/cli/connections.c:357
-#, fuzzy, c-format
+#: ../clients/cli/connections.c:315
+#, c-format
 msgid ""
 "Usage: nmcli connection up { ARGUMENTS | help }\n"
 "\n"
@@ -1001,24 +992,25 @@ msgid ""
 msgstr ""
 "사용법: nmcli connection up { 인수 | help }\n"
 "\n"
-"인수 := [id | uuid | path] <ID> [ifname <ifname>] [ap <BSSID>] [nsp <name>]\n"
+"인수 := [id | uuid | path] <ID> [ifname <ifname>] [ap <BSSID>] [nsp <이름>] "
+"[passwd-file <암호가 있는 파일>]\n"
 "\n"
-"장치에 연결을 활성화합니다. 활성화할 프로파일은 이름, UUID D-Bus 경로 등으"
-"로\n"
-"식별합니다.\n"
+"장치에서 연결을 활성화합니다. 활성화할 프로파일은 장치의\n"
+"이름, UUID 또는 D-Bus 경로에 의해 식별됩니다.\n"
 "\n"
-"인수 := ifname <ifname> [ap <BSSID>] [nsp <name>]\n"
+"인수 := ifname <ifname> [ap <BSSID>] [nsp <이름>] [passwd-file  <암호가 있는 파일>]\n"
 "\n"
-"연결을 사용하여 장치를 활성화합니다. 연결 프로파일은 NetworkManager에 의해\n"
-"자동으로 선택됩니다.\n"
+"연결을 통해 장치를 활성화합니다. 연결 프로파일은\n"
+"NetworkManager에 의해 자동으로 선택됩니다.\n"
 "\n"
-"ifname - 연결을 활성화하고자 하는 장치를 지정합니다\n"
-"ap     - 연결을 위해 AP를 지정합니다 (Wi-Fi 경우에만 적용)\n"
-"nsp    - 연결을 위해 NSP를 지정합니다 (WiMAX의 경우에만 적용)\n"
+"ifname      - 연결을 활성화할 장치 지정\n"
+"ap          - 연결할 AP 지정(Wi-Fi에만 유효)\n"
+"nsp         - 연결할 NSP 지정(WiMAX에만 유효)\n"
+"passwd-file - 연결을 활성화하는 데 필요한 암호가 있는 파일\n"
 "\n"
 
-#: ../clients/cli/connections.c:378
-#, fuzzy, c-format
+#: ../clients/cli/connections.c:336
+#, c-format
 msgid ""
 "Usage: nmcli connection down { ARGUMENTS | help }\n"
 "\n"
@@ -1032,20 +1024,20 @@ msgid ""
 msgstr ""
 "사용법: nmcli connection down { 인수 | help }\n"
 "\n"
-"인수 := [id | uuid | path | apath] <ID>\n"
+"인수 := [id | uuid | path | apath] <ID> ...\n"
 "\n"
 "장치에서 연결을 해제합니다 (장치의 자동 활성화는 해제되지 않습니다)\n"
 "연결 해제할 프로파일은 이름, UUID, D-Bus 경로에 의해\n"
 "식별됩니다.\n"
 "\n"
 
-#: ../clients/cli/connections.c:390
-#, fuzzy, c-format
+#: ../clients/cli/connections.c:348
+#, 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"
+"ARGUMENTS := COMMON_OPTIONS TYPE_SPECIFIC_OPTIONS SLAVE_OPTIONS IP_OPTIONS [-"
+"- ([+|-]<setting>.<property> <value>)+]\n"
 "\n"
 "  COMMON_OPTIONS:\n"
 "                  type <type>\n"
@@ -1132,8 +1124,8 @@ msgid ""
 "                  [path-cost <1-65535>]\n"
 "                  [hairpin yes|no]\n"
 "\n"
-"    vpn:          vpn-type vpnc|openvpn|pptp|openconnect|openswan|libreswan|"
-"ssh|l2tp|iodine|...\n"
+"    vpn:          vpn-type "
+"vpnc|openvpn|pptp|openconnect|openswan|libreswan|ssh|l2tp|iodine|...\n"
 "                  [user <username>]\n"
 "\n"
 "    olpc-mesh:    ssid <SSID>\n"
@@ -1183,16 +1175,20 @@ msgid ""
 msgstr ""
 "사용법: nmcli connection add { 인수 | help }\n"
 "\n"
-"인수 := COMMON_OPTIONS TYPE_SPECIFIC_OPTIONS IP_OPTIONS\n"
+"인수 := COMMON_OPTIONS TYPE_SPECIFIC_OPTIONS SLAVE_OPTIONS IP_OPTIONS [-- ([+|-"
+"]<setting>.<property> <value>)+]\n"
 "\n"
 "  COMMON_OPTIONS:\n"
 "                  type <유형>\n"
 "                  ifname <인터페이스 이름> | \"*\"\n"
 "                  [con-name <연결 이름>]\n"
 "                  [autoconnect yes|no]\n"
+"                  [save yes|no]\n"
+"                  [master <마스터(ifname 또는 연결 UUID 또는 이름)>]\n"
+"                  [slave-type <마스터 연결 유형>]\n"
 "\n"
 "  TYPE_SPECIFIC_OPTIONS:\n"
-"    ethernet:     [mac <MAC 주소>]\n"
+"    ethernet:     [mac <MAC address>]\n"
 "                  [cloned-mac <복제된 MAC 주소>]\n"
 "                  [mtu <MTU>]\n"
 "\n"
@@ -1200,21 +1196,22 @@ msgstr ""
 "                  [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"
+"    pppoe:        username <PPPoE 사용자 이름>\n"
 "                  [password <PPPoE 암호>]\n"
 "                  [service <PPPoE 서비스 이름>]\n"
 "                  [mtu <MTU>]\n"
 "                  [mac <MAC 주소>]\n"
 "\n"
 "    gsm:          apn <APN>\n"
-"                  [user <사용자이름>]\n"
+"                  [user <사용자 이름>]\n"
 "                  [password <암호>]\n"
 "\n"
-"    cdma:         [user <사용자이름>]\n"
+"    cdma:         [user <사용자 이름>]\n"
 "                  [password <암호>]\n"
 "\n"
 "    infiniband:   [mac <MAC 주소>]\n"
@@ -1223,14 +1220,14 @@ msgstr ""
 "                  [parent <ifname>]\n"
 "                  [p-key <IPoIB P_Key>]\n"
 "\n"
-"    bluetooth:    [addr <bluetooth 주소>]\n"
+"    bluetooth:    [addr <블루투스 주소>]\n"
 "                  [bt-type panu|dun-gsm|dun-cdma]\n"
 "\n"
-"    vlan:         dev <부모 장치 (연결  UUID, ifname, MAC)>\n"
+"    vlan:         dev <부모 장치(연결 UUID, ifname 또는 MAC)>\n"
 "                  id <VLAN ID>\n"
-"                  [flags <VLAN 플래그>]\n"
-"                  [ingress <ingress 우선 순위 맵핑>]\n"
-"                  [egress <egress 우선순위 맵핑>]\n"
+"                  [flags <VLAN flags>]\n"
+"                  [ingress <ingress 우선 순위 매핑>]\n"
+"                  [egress <egress 우선 순위 매핑>]\n"
 "                  [mtu <MTU>]\n"
 "\n"
 "    bond:         [mode balance-rr (0) | active-backup (1) | balance-xor (2) "
@@ -1243,13 +1240,14 @@ msgstr ""
 "                  [updelay <숫자>]\n"
 "                  [arp-interval <숫자>]\n"
 "                  [arp-ip-target <숫자>]\n"
+"                  [lacp-rate slow (0) | fast (1)]\n"
 "\n"
-"    bond-slave:   master <마스터 (ifname 또는 연결 UUID)>\n"
+"    bond-slave:   master <마스터(ifname 또는 연결 UUID 또는 이름)>\n"
 "\n"
-"    team:         [config <파일>|<원 JSON 데이터>]\n"
+"    team:         [config <file>|<원시 JSON 데이터>]\n"
 "\n"
-"    team-slave:   master <마스터 (ifname 또는 연결 UUID)>\n"
-"                  [config <파일>|<원 JSON 데이터>]\n"
+"    team-slave:   master <마스터(ifname 또는 연결 UUID 또는 이름)>\n"
+"                  [config <file>|<원시 JSON 데이터>]\n"
 "\n"
 "    bridge:       [stp yes|no]\n"
 "                  [priority <숫자>]\n"
@@ -1257,25 +1255,64 @@ msgstr ""
 "                  [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 <마스터 (ifname 또는 연결 UUID)>\n"
+"    bridge-slave: master <마스터(ifname 또는 연결 UUID 또는 이름)>\n"
 "                  [priority <0-63>]\n"
 "                  [path-cost <1-65535>]\n"
 "                  [hairpin yes|no]\n"
 "\n"
-"    vpn:          vpn-type vpnc|openvpn|pptp|openconnect|openswan\n"
-"                  [user <사용자이름>]\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"
+"                  [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 <부모 장치(ifname 또는 연결 UUID)>]\n"
+"\n"
+"    macvlan:      dev <부모 장치(연결 UUID, ifname 또는 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 <부모 장치(ifname 또는 연결 UUID)>]\n"
+"                  [source-port-min <0-65535>]\n"
+"                  [source-port-max <0-65535>]\n"
+"                  [destination-port <0-65535>]\n"
+"\n"
+"  SLAVE_OPTIONS:\n"
+"    bridge:       [priority <0-63>]\n"
+"                  [path-cost <1-65535>]\n"
+"                  [hairpin yes|no]\n"
+"\n"
+"    team:         [config <file>|<원시 JSON 데이터>]\n"
 "\n"
 "  IP_OPTIONS:\n"
 "                  [ip4 <IPv4 주소>] [gw4 <IPv4 게이트웨이>]\n"
 "                  [ip6 <IPv6 주소>] [gw6 <IPv6 게이트웨이>]\n"
 "\n"
 
-#: ../clients/cli/connections.c:502
+#: ../clients/cli/connections.c:460
 #, c-format
 msgid ""
 "Usage: nmcli connection modify { ARGUMENTS | help }\n"
@@ -1290,8 +1327,8 @@ msgid ""
 "\n"
 "Examples:\n"
 "nmcli con mod home-wifi wifi.ssid rakosnicek\n"
-"nmcli con mod em1-1 ipv4.method manual ipv4.addr \"192.168.1.2/24, "
-"10.10.1.5/8\"\n"
+"nmcli con mod em1-1 ipv4.method manual ipv4.addr \"192.168.1.2/24, 10.10.1.5/"
+"8\"\n"
 "nmcli con mod em1-1 +ipv4.dns 8.8.4.4\n"
 "nmcli con mod em1-1 -ipv4.dns 1\n"
 "nmcli con mod em1-1 -ipv6.addr \"abbe::cafe/56\"\n"
@@ -1299,8 +1336,28 @@ msgid ""
 "nmcli con mod bond0 -bond.options downdelay\n"
 "\n"
 msgstr ""
+"사용법: nmcli connection modify { 인수 | 도움말 }\n"
+"\n"
+"인수 := [id | uuid | path] <ID> ([+|-]<설정>.<속성> <값>)+\n"
+"\n"
+"연결 프로필 속성을 1개 이상 수정합니다.\n"
+"프로필은 이름, UUID 또는 D-Bus 경로를 기준으로 식별됩니다. 값이 여러 개인\n"
+"속성의 경우 선택 사항인 '+' 또는 '-' 접두사를 속성 이름에 사용할 수 있습니다.\n"
+"'+' 기호를 사용하면 전체 값을 덮어쓰는 대신 항목을 추가할 수 있습니다.\n"
+"'-' 기호를 사용하면 전체 값이 아닌 선택한 항목만 제거할 수 있습니다.\n"
+"\n"
+"예:\n"
+"nmcli con mod home-wifi wifi.ssid rakosnicek\n"
+"nmcli con mod em1-1 ipv4.method manual ipv4.addr \\\"192.168.1.2/24, 10.10.1."
+"5/8\"\n"
+"nmcli con mod em1-1 +ipv4.dns 8.8.4.4\n"
+"nmcli con mod em1-1 -ipv4.dns 1\n"
+"nmcli con mod em1-1 -ipv6.addr \"abbe::cafe/56\"\n"
+"nmcli con mod bond0 +bond.options mii=500\n"
+"nmcli con mod bond0 -bond.options downdelay\n"
+"\n"
 
-#: ../clients/cli/connections.c:525
+#: ../clients/cli/connections.c:483
 #, c-format
 msgid ""
 "Usage: nmcli connection clone { ARGUMENTS | help }\n"
@@ -1308,13 +1365,20 @@ msgid ""
 "ARGUMENTS := [--temporary] [id | uuid | path] <ID> <new name>\n"
 "\n"
 "Clone an existing connection profile. The newly created connection will be\n"
-"the exact copy of the <ID>, except the uuid property (will be generated) "
-"and\n"
+"the exact copy of the <ID>, except the uuid property (will be generated) and\n"
 "id (provided as <new name> argument).\n"
 "\n"
 msgstr ""
+"사용법: nmcli connection clone { 인수 | 도움말 }\n"
+"\n"
+"인수 := [--temporary] [id | uuid | path] <ID> <새 이름>\n"
+"\n"
+"기존 연결 프로필을 복제합니다. 새로 생성된 연결은\n"
+"<ID>와 똑같은 사본이며, uuid 속성(생성 예정) 및\n"
+"ID(<새 이름> 인수로 제공됨)는 예외입니다.\n"
+"\n"
 
-#: ../clients/cli/connections.c:537
+#: ../clients/cli/connections.c:495
 #, c-format
 msgid ""
 "Usage: nmcli connection edit { ARGUMENTS | help }\n"
@@ -1341,7 +1405,7 @@ msgstr ""
 "상호 대화식 편집기에서 새 연결 프로파일을 추가합니다.\n"
 "\n"
 
-#: ../clients/cli/connections.c:552
+#: ../clients/cli/connections.c:510
 #, c-format
 msgid ""
 "Usage: nmcli connection delete { ARGUMENTS | help }\n"
@@ -1360,8 +1424,8 @@ msgstr ""
 "프로파일은 이름, UUID, D-Bus 경로로 식별합니다.\n"
 "\n"
 
-#: ../clients/cli/connections.c:563
-#, fuzzy, c-format
+#: ../clients/cli/connections.c:521
+#, c-format
 msgid ""
 "Usage: nmcli connection monitor { ARGUMENTS | help }\n"
 "\n"
@@ -1372,32 +1436,28 @@ msgid ""
 "Monitors all connection profiles in case none is specified.\n"
 "\n"
 msgstr ""
-"사용법: nmcli connection edit { 인수 | help }\n"
-"\n"
-"인수 := [id | uuid | path] <ID>\n"
-"\n"
-"상호 대화식 편집기에서 기존 연결 프로파일을 편집합니다.\n"
-"프로파일은 이름, UUID, D-Bus 경로로 식별합니다\n"
+"사용법: nmcli connection monitor { 인수 | help }\n"
 "\n"
-"인수 := [type <새 연결 유형>] [con-name <새 연결 이름>]\n"
+"인수 := [id | uuid | path] <ID> ...\n"
 "\n"
-"상호 대화식 편집기에서 새 연결 프로파일을 추가합니다.\n"
+"연결 프로파일 활동을 모니터링합니다.\n"
+"이 명령은 지정된 연결이 변경될 때마다 줄을 인쇄합니다.\n"
+"아무 것도 지정되지 않은 경우 모든 연결 프로파일을 모니터링합니다.\n"
 "\n"
 
-#: ../clients/cli/connections.c:575
+#: ../clients/cli/connections.c:533
 #, c-format
 msgid ""
 "Usage: nmcli connection reload { help }\n"
 "\n"
 "Reload all connection files from disk.\n"
 "\n"
-msgstr ""
-"사용법: nmcli connection reload { help }\n"
+msgstr "사용법: nmcli connection reload { help }\n"
 "\n"
 "디스크에서 모든 연결 파일을 다시 불러옵니다.\n"
 "\n"
 
-#: ../clients/cli/connections.c:583
+#: ../clients/cli/connections.c:541
 #, c-format
 msgid ""
 "Usage: nmcli connection load { ARGUMENTS | help }\n"
@@ -1414,13 +1474,12 @@ msgstr ""
 "\n"
 "인수 := <filename> [<filename>...]\n"
 "\n"
-"디스크에서 하나 이상의 연결 파일을 불러오기/다시 불러오기합니다. 수동으로 연"
-"결 파일을 편집한 후 \n"
+"디스크에서 하나 이상의 연결 파일을 불러오기/다시 불러오기합니다. 수동으로 연결 파일을 편집한 후 \n"
 "NetworkManager가 최신 상태를 인식할 수 있도록\n"
 "이 명령을 사용합니다.\n"
 "\n"
 
-#: ../clients/cli/connections.c:595
+#: ../clients/cli/connections.c:553
 #, c-format
 msgid ""
 "Usage: nmcli connection import { ARGUMENTS | help }\n"
@@ -1434,9 +1493,18 @@ msgid ""
 "is imported by NetworkManager VPN plugins.\n"
 "\n"
 msgstr ""
+"사용법: nmcli connection import { 인수 | 도움말 }\n"
+"\n"
+"인수 := [--temporary] type <유형> file <가져올 파일>\n"
+"\n"
+"외부/외래 구성을 네트워크 관리자 연결 프로필로 가져옵니다.\n"
+"입력 파일 유형은 유형 옵션에 의해 지정됩니다.\n"
+"현재 VPN 구성만 지원됩니다. 구성은\n"
+"네트워크 관리자 VPN 플러그인을 통해 가져옵니다.\n"
+"\n"
 
-#: ../clients/cli/connections.c:608
-#, fuzzy, c-format
+#: ../clients/cli/connections.c:566
+#, c-format
 msgid ""
 "Usage: nmcli connection export { ARGUMENTS | help }\n"
 "\n"
@@ -1446,890 +1514,1291 @@ msgid ""
 "The data are directed to standard output or to a file if a name is given.\n"
 "\n"
 msgstr ""
-"사용법: nmcli connection delete { 인수 | help }\n"
+"사용법: nmcli connection export { 인수 | help }\n"
 "\n"
-"인수 := [id | uuid | path] <ID>\n"
+"인수 := [id | uuid | path] <ID> [<출력 파일>]\n"
 "\n"
-"연결 프로파일을 삭제합니다.\n"
-"프로파일은 이름, UUID, D-Bus 경로로 식별합니다.\n"
+"연결을 내보냅니다. 현재로서는 VPN 연결만 지원됩니다.\n"
+"데이터는 표준 출력으로 이동되거나 파일로 디렉션됩니다(이름이 주어진 경우).\n"
 "\n"
 
-#: ../clients/cli/connections.c:686
+#: ../clients/cli/connections.c:644
 msgid "activating"
 msgstr "활성화중"
 
-#: ../clients/cli/connections.c:688
+#: ../clients/cli/connections.c:646
 msgid "activated"
 msgstr "활성화됨"
 
-#: ../clients/cli/connections.c:692
+#: ../clients/cli/connections.c:650
 msgid "deactivated"
 msgstr "비활성화됨"
 
-#: ../clients/cli/connections.c:704
+#: ../clients/cli/connections.c:662
 msgid "VPN connecting (prepare)"
 msgstr "VPN 연결 중 (준비)"
 
-#: ../clients/cli/connections.c:706
+#: ../clients/cli/connections.c:664
 msgid "VPN connecting (need authentication)"
 msgstr "VPN 연결 중 (인증 필요)"
 
-#: ../clients/cli/connections.c:708
+#: ../clients/cli/connections.c:666
 msgid "VPN connecting"
 msgstr "VPN 연결 중"
 
-#: ../clients/cli/connections.c:710
+#: ../clients/cli/connections.c:668
 msgid "VPN connecting (getting IP configuration)"
 msgstr "VPN 연결 중 (IP 설정 얻는 중)"
 
-#: ../clients/cli/connections.c:712
+#: ../clients/cli/connections.c:670
 msgid "VPN connected"
 msgstr "VPN 연결 됨"
 
-#: ../clients/cli/connections.c:714
+#: ../clients/cli/connections.c:672
 msgid "VPN connection failed"
 msgstr "VPN 연결 실패"
 
-#: ../clients/cli/connections.c:716
+#: ../clients/cli/connections.c:674
 msgid "VPN disconnected"
 msgstr "VPN 연결 끊겼음"
 
-#: ../clients/cli/connections.c:786
-#, fuzzy, c-format
+#: ../clients/cli/connections.c:744
+#, c-format
 msgid "Error updating secrets for %s: %s\n"
-msgstr "연결을 저장하는 도중 오류 발생: %s"
+msgstr "%s의 secret 업데이트 도중 오류 발생: %s\n"
 
-#: ../clients/cli/connections.c:806
-#, fuzzy
+#: ../clients/cli/connections.c:764
 msgid "Connection profile details"
-msgstr "연결 상세 정보"
+msgstr "연결 프로파일 세부 정보"
 
-#: ../clients/cli/connections.c:818 ../clients/cli/connections.c:1211
-#, fuzzy, c-format
+#: ../clients/cli/connections.c:776 ../clients/cli/connections.c:1169
+#, c-format
 msgid "Error: 'connection show': %s"
-msgstr "오류: 'device show': %s"
+msgstr "오류: 'connection show': %s"
 
-#: ../clients/cli/connections.c:974 ../clients/cli/settings.c:1950
+#: ../clients/cli/connections.c:932 ../clients/cli/settings.c:1897
 msgid "never"
 msgstr "하지않음"
 
-#: ../clients/cli/connections.c:1199
-#, fuzzy
+#: ../clients/cli/connections.c:1157
 msgid "Activate connection details"
-msgstr "활성화된 연결 상세 정보 "
+msgstr "연결 세부 정보 활성화"
 
-#: ../clients/cli/connections.c:1435
-#, fuzzy, c-format
+#: ../clients/cli/connections.c:1393
+#, c-format
 msgid "invalid field '%s'; allowed fields: %s and %s, or %s,%s"
-msgstr "잘못된 필드 '%s'; 허용되는 필드: %s"
+msgstr "잘못된 필드 '%s', 허용된 필드: %s 및 %s 또는 %s,%s"
 
-#: ../clients/cli/connections.c:1450 ../clients/cli/connections.c:1458
-#, fuzzy, c-format
+#: ../clients/cli/connections.c:1408 ../clients/cli/connections.c:1416
+#, c-format
 msgid "'%s' has to be alone"
-msgstr "'%s' 필드는 혼자만 있어야만 합니다"
+msgstr "'%s'은(는) 독립형이어야 합니다."
 
 #. Add headers
-#: ../clients/cli/connections.c:1680
-#, fuzzy
+#: ../clients/cli/connections.c:1634
 msgid "NetworkManager active profiles"
-msgstr "네트워크 관리 상태"
+msgstr "NetworkManager 활성 프로파일"
 
-#: ../clients/cli/connections.c:1681
-#, fuzzy
+#: ../clients/cli/connections.c:1635
 msgid "NetworkManager connection profiles"
-msgstr "네트워크 관리자가 슬립 상태에 있습니다 "
-
-#.
-#. * TODO(?): complete uuid, path or id
-#. if (nmc->complete) {
-#. quit ();
-#. }
-#.
-#: ../clients/cli/connections.c:1727 ../clients/cli/connections.c:2445
-#: ../clients/cli/connections.c:2467 ../clients/cli/connections.c:2476
-#: ../clients/cli/connections.c:2485 ../clients/cli/connections.c:2648
-#: ../clients/cli/connections.c:7777 ../clients/cli/connections.c:7896
-#: ../clients/cli/connections.c:8032 ../clients/cli/connections.c:8170
-#: ../clients/cli/connections.c:8289 ../clients/cli/connections.c:8300
-#: ../clients/cli/connections.c:8410 ../clients/cli/devices.c:2402
-#: ../clients/cli/devices.c:2410 ../clients/cli/devices.c:2736
-#: ../clients/cli/devices.c:2743 ../clients/cli/devices.c:2757
-#: ../clients/cli/devices.c:2764 ../clients/cli/devices.c:2781
-#: ../clients/cli/devices.c:2789 ../clients/cli/devices.c:2802
-#: ../clients/cli/devices.c:3166 ../clients/cli/devices.c:3173
-#: ../clients/cli/devices.c:3180 ../clients/cli/devices.c:3192
-#: ../clients/cli/devices.c:3205 ../clients/cli/devices.c:3212
-#: ../clients/cli/devices.c:3384 ../clients/cli/devices.c:3391
-#: ../clients/cli/devices.c:3564
+msgstr "NetworkManager 연결 프로파일"
+
+#: ../clients/cli/connections.c:1681 ../clients/cli/connections.c:2389
+#: ../clients/cli/connections.c:2411 ../clients/cli/connections.c:2420
+#: ../clients/cli/connections.c:2429 ../clients/cli/connections.c:2588
+#: ../clients/cli/connections.c:10156 ../clients/cli/connections.c:10273
+#: ../clients/cli/connections.c:10405 ../clients/cli/connections.c:10538
+#: ../clients/cli/connections.c:10648 ../clients/cli/connections.c:10659
+#: ../clients/cli/connections.c:10758 ../clients/cli/devices.c:2344
+#: ../clients/cli/devices.c:2352 ../clients/cli/devices.c:2675
+#: ../clients/cli/devices.c:2682 ../clients/cli/devices.c:2696
+#: ../clients/cli/devices.c:2703 ../clients/cli/devices.c:2720
+#: ../clients/cli/devices.c:2728 ../clients/cli/devices.c:2741
+#: ../clients/cli/devices.c:3105 ../clients/cli/devices.c:3112
+#: ../clients/cli/devices.c:3119 ../clients/cli/devices.c:3131
+#: ../clients/cli/devices.c:3144 ../clients/cli/devices.c:3151
+#: ../clients/cli/devices.c:3323 ../clients/cli/devices.c:3330
+#: ../clients/cli/devices.c:3503
 #, c-format
 msgid "Error: %s argument is missing."
 msgstr "오류: %s 인자가 없습니다."
 
-#: ../clients/cli/connections.c:1742
-#, fuzzy, c-format
+#: ../clients/cli/connections.c:1696
+#, c-format
 msgid "Error: %s - no such connection profile."
-msgstr "오류: %s - 그런 연결이 없습니다."
+msgstr "오류: %s - 해당 연결 프로파일이 없습니다."
 
-#: ../clients/cli/connections.c:1801 ../clients/cli/connections.c:2508
-#: ../clients/cli/connections.c:8825 ../clients/cli/devices.c:3353
-#: ../clients/cli/devices.c:3834 ../clients/cli/general.c:528
-#: ../clients/cli/general.c:577 ../clients/cli/general.c:594
-#: ../clients/cli/general.c:633 ../clients/cli/general.c:647
-#: ../clients/cli/general.c:765 ../clients/cli/general.c:812
-#: ../clients/cli/general.c:832
+#: ../clients/cli/connections.c:1755 ../clients/cli/connections.c:2452
+#: ../clients/cli/connections.c:11162 ../clients/cli/devices.c:3292
+#: ../clients/cli/devices.c:3779 ../clients/cli/general.c:539
+#: ../clients/cli/general.c:588 ../clients/cli/general.c:605
+#: ../clients/cli/general.c:644 ../clients/cli/general.c:658
+#: ../clients/cli/general.c:776 ../clients/cli/general.c:823
+#: ../clients/cli/general.c:843
 #, c-format
 msgid "Error: %s."
 msgstr "오류: %s."
 
-#: ../clients/cli/connections.c:1897
+#: ../clients/cli/connections.c:1851
 #, c-format
 msgid "no active connection on device '%s'"
 msgstr "장치 '%s'에 활성화된 연결이 없습니다"
 
-#: ../clients/cli/connections.c:1905
+#: ../clients/cli/connections.c:1859
 msgid "no active connection or device"
 msgstr "활성화된 연결이나 장치가 없습니다"
 
-#: ../clients/cli/connections.c:1956
+#: ../clients/cli/connections.c:1910
 #, c-format
 msgid "device '%s' not compatible with connection '%s'"
 msgstr "'%s' 장치는 '%s' 연결과 호환되지 않습니다"
 
-#: ../clients/cli/connections.c:1959
+#: ../clients/cli/connections.c:1913
 #, c-format
 msgid "no device found for connection '%s'"
 msgstr "연결 '%s'에 대한 장치를 찾을 수 없습니다"
 
-#: ../clients/cli/connections.c:1971
+#: ../clients/cli/connections.c:1925
 msgid "unknown reason"
 msgstr "알 수 없는 이유"
 
-#: ../clients/cli/connections.c:1973 ../clients/cli/general.c:278
+#: ../clients/cli/connections.c:1927 ../clients/cli/general.c:277
 msgid "none"
 msgstr "없음"
 
-#: ../clients/cli/connections.c:1975
+#: ../clients/cli/connections.c:1929
 msgid "the user was disconnected"
 msgstr "사용자 연결이 끊어졌습니다"
 
-#: ../clients/cli/connections.c:1977
+#: ../clients/cli/connections.c:1931
 msgid "the base network connection was interrupted"
 msgstr "기반 네트워크 연결이 중지되었습니다"
 
-#: ../clients/cli/connections.c:1979
+#: ../clients/cli/connections.c:1933
 msgid "the VPN service stopped unexpectedly"
 msgstr "VPN 서비스가 예기치 못하게 중단되었습니다"
 
-#: ../clients/cli/connections.c:1981
+#: ../clients/cli/connections.c:1935
 msgid "the VPN service returned invalid configuration"
 msgstr "VPN 서비스가 잘못된 설정을 반환했습니다"
 
-#: ../clients/cli/connections.c:1983
+#: ../clients/cli/connections.c:1937
 msgid "the connection attempt timed out"
 msgstr "연결 시도가 시간을 초과했습니다"
 
-#: ../clients/cli/connections.c:1985
+#: ../clients/cli/connections.c:1939
 msgid "the VPN service did not start in time"
 msgstr "VPN 서비스가 제 시간에 시작되지 않았습니다"
 
-#: ../clients/cli/connections.c:1987
+#: ../clients/cli/connections.c:1941
 msgid "the VPN service failed to start"
 msgstr "VPN 서비스를 시작하는 데 실패했습니다"
 
-#: ../clients/cli/connections.c:1989
+#: ../clients/cli/connections.c:1943
 msgid "no valid VPN secrets"
 msgstr "올바른 VPN 비밀 정보가 없습니다"
 
-#: ../clients/cli/connections.c:1991
+#: ../clients/cli/connections.c:1945
 msgid "invalid VPN secrets"
 msgstr "잘못된 VPN 비밀정보"
 
-#: ../clients/cli/connections.c:1993
+#: ../clients/cli/connections.c:1947
 msgid "the connection was removed"
 msgstr "연결이 제거되었습니다"
 
-#: ../clients/cli/connections.c:2015 ../clients/cli/connections.c:2050
-#: ../clients/cli/connections.c:2211 ../clients/cli/connections.c:6120
+#: ../clients/cli/connections.c:1969 ../clients/cli/connections.c:1997
+#: ../clients/cli/connections.c:2158 ../clients/cli/connections.c:8454
 #, c-format
 msgid "Connection successfully activated (D-Bus active path: %s)\n"
 msgstr "연결이 성공적으로 활성화되었습니다 (D-Bus 활성 경로: %s)\n"
 
-#: ../clients/cli/connections.c:2023
-#, fuzzy, c-format
+#: ../clients/cli/connections.c:1976
+#, c-format
 msgid ""
 "Connection successfully activated (master waiting for slaves) (D-Bus active "
 "path: %s)\n"
-msgstr "연결이 성공적으로 활성화되었습니다 (D-Bus 활성 경로: %s)\n"
-
-#: ../clients/cli/connections.c:2030 ../clients/cli/connections.c:6126
-#, c-format
-msgid "Error: Connection activation failed.\n"
-msgstr "오류: 연결 활성화에 실패했습니다.\n"
+msgstr "연결이 성공적으로 활성화되었습니다(마스터가 슬레이브 대기 중)(D-Bus 활성 경로: %s).\n"
 
-#: ../clients/cli/connections.c:2033 ../clients/cli/connections.c:2055
+#: ../clients/cli/connections.c:1980 ../clients/cli/connections.c:2002
 #, c-format
 msgid "Error: Connection activation failed."
 msgstr "오류: 연결 활성화가 실패했습니다."
 
-#: ../clients/cli/connections.c:2106
+#: ../clients/cli/connections.c:2053
 #, c-format
 msgid "VPN connection successfully activated (D-Bus active path: %s)\n"
 msgstr "VPN 연결이 성공적으로 활성화되었습니다 (D-Bus 활성 경로: %s)\n"
 
-#: ../clients/cli/connections.c:2114
+#: ../clients/cli/connections.c:2061
 #, c-format
 msgid "Error: Connection activation failed: %s."
 msgstr "오류: 연결 활성화가 실패했습니다: %s."
 
-#: ../clients/cli/connections.c:2133 ../clients/cli/devices.c:1506
+#: ../clients/cli/connections.c:2080 ../clients/cli/devices.c:1426
 #, c-format
 msgid "Error: Timeout %d sec expired."
 msgstr "오류: 제한시간 %d초를 초과했습니다."
 
-#: ../clients/cli/connections.c:2193
+#: ../clients/cli/connections.c:2140
 #, c-format
 msgid "Error: Connection activation failed: %s"
 msgstr "오류: 연결 활성화가 실패했습니다: %s"
 
-#: ../clients/cli/connections.c:2278
-#, fuzzy, c-format
+#: ../clients/cli/connections.c:2225
+#, c-format
 msgid "failed to read passwd-file '%s': %s"
-msgstr "오류: '%s' 값을 삭제하는데 실패했습니다: %s\n"
+msgstr "passwd-file '%s' 읽기 실패: %s"
 
-#: ../clients/cli/connections.c:2290
+#: ../clients/cli/connections.c:2237
 #, c-format
 msgid "missing colon in 'password' entry '%s'"
-msgstr ""
+msgstr "'암호' 항목 '%s'에 콜론 누락"
 
-#: ../clients/cli/connections.c:2298
+#: ../clients/cli/connections.c:2245
 #, c-format
 msgid "missing dot in 'password' entry '%s'"
-msgstr ""
+msgstr "'암호' 항목 '%s'에 점 누락"
 
-#: ../clients/cli/connections.c:2311
+#: ../clients/cli/connections.c:2258
 #, c-format
 msgid "invalid setting name in 'password' entry '%s'"
-msgstr ""
+msgstr "'암호' 항목 '%s'의 설정 이름이 잘못됨"
 
-#: ../clients/cli/connections.c:2367
+#: ../clients/cli/connections.c:2314
 #, c-format
 msgid "unknown device '%s'."
 msgstr "알 수 없는 장치 '%s'."
 
-#: ../clients/cli/connections.c:2372
+#: ../clients/cli/connections.c:2319
 msgid "neither a valid connection nor device given"
 msgstr "유효한 연결 및 장치 모두 지정되어 있지 않습니다 "
 
-#: ../clients/cli/connections.c:2458
-#, fuzzy, c-format
+#: ../clients/cli/connections.c:2402
+#, c-format
 msgid "Error: Connection '%s' does not exist."
-msgstr "오류: 연결이 올바르지 않습니다: %s\n"
+msgstr "오류: 연결 '%s'이(가) 존재하지 않습니다."
 
-#: ../clients/cli/connections.c:2493 ../clients/cli/devices.c:1405
-#: ../clients/cli/devices.c:2416 ../clients/cli/devices.c:2813
-#: ../clients/cli/devices.c:3397
+#: ../clients/cli/connections.c:2437 ../clients/cli/devices.c:1325
+#: ../clients/cli/devices.c:2358 ../clients/cli/devices.c:2752
+#: ../clients/cli/devices.c:3336
 #, c-format
 msgid "Unknown parameter: %s\n"
 msgstr "알려져있지 않은 매개변수입니다: %s\n"
 
-#: ../clients/cli/connections.c:2518
+#: ../clients/cli/connections.c:2462
 msgid "preparing"
 msgstr "준비하는 중"
 
-#: ../clients/cli/connections.c:2539
-#, fuzzy, c-format
+#: ../clients/cli/connections.c:2483
+#, c-format
 msgid "Connection '%s' (%s) successfully deleted.\n"
-msgstr "연결 '%s' (%s)이 성공적으로 추가되었습니다.\n"
+msgstr "연결 '%s'(%s)이(가) 성공적으로 삭제되었습니다.\n"
 
-#: ../clients/cli/connections.c:2555
-#, fuzzy, c-format
+#: ../clients/cli/connections.c:2499
+#, c-format
 msgid "Connection '%s' successfully deactivated (D-Bus active path: %s)\n"
-msgstr "연결이 성공적으로 활성화되었습니다 (D-Bus 활성 경로: %s)\n"
+msgstr "연결 '%s'이(가) 성공적으로 비활성화되었습니다(D-Bus 활성 경로: %s).\n"
 
-#: ../clients/cli/connections.c:2630 ../clients/cli/connections.c:8018
-#: ../clients/cli/connections.c:8226
+#: ../clients/cli/connections.c:2570 ../clients/cli/connections.c:10391
+#: ../clients/cli/connections.c:10590
 #, c-format
 msgid "Error: No connection specified."
 msgstr "오류: 연결이 지정되어 있지 않습니다. "
 
-#: ../clients/cli/connections.c:2662
-#, fuzzy, c-format
+#: ../clients/cli/connections.c:2602
+#, c-format
 msgid "Error: '%s' is not an active connection.\n"
-msgstr "오류: '%s'는 활성 연결이 아닙니다. "
+msgstr "오류: '%s'는 활성 연결이 아닙니다.\n"
 
-#: ../clients/cli/connections.c:2663 ../clients/cli/connections.c:8047
-#, fuzzy, c-format
+#: ../clients/cli/connections.c:2603 ../clients/cli/connections.c:10420
+#, c-format
 msgid "Error: not all active connections found."
-msgstr "오류: '%s'는 활성 연결이 아닙니다. "
+msgstr "오류: 일부 활성 연결을 찾을 수 없습니다. "
 
-#: ../clients/cli/connections.c:2672
-#, fuzzy, c-format
+#: ../clients/cli/connections.c:2612
+#, c-format
 msgid "Error: no active connection provided."
-msgstr "오류: 연결을 활성화할 수 없음: %s.\n"
+msgstr "오류: 활성 연결이 제공되지 않았습니다."
 
-#: ../clients/cli/connections.c:3120 ../clients/cli/utils.c:648
+#: ../clients/cli/connections.c:2955 ../clients/cli/utils.c:702
 #, c-format
 msgid "'%s' not among [%s]"
 msgstr "'%s'는 [%s]에 없습니다 "
 
-#: ../clients/cli/connections.c:3280
+#: ../clients/cli/connections.c:3032
 #, c-format
-msgid "Warning: master='%s' doesn't refer to any existing profile.\n"
-msgstr ""
+msgid "Error: '%s': '%s' is not a valid %s MAC address."
+msgstr "오류: '%s': '%s'는 올바른 %s MAC 주소가 아닙니다. "
 
-#: ../clients/cli/connections.c:3451
-#, fuzzy, c-format
-msgid "Error: don't know how to create '%s' setting."
-msgstr "오류: 시스템 설정을 얻을 수 없습니다."
+#. Ask for optional arguments
+#: ../clients/cli/connections.c:3033 ../clients/cli/connections.c:3565
+#: ../clients/tui/nm-editor-utils.c:163 ../libnm-core/nm-connection.c:1716
+#: ../libnm-glib/nm-device.c:1861 ../libnm/nm-device.c:1812
+msgid "InfiniBand"
+msgstr "InfiniBand"
 
-#: ../clients/cli/connections.c:3462
-#, c-format
-msgid "Error: invalid property '%s': %s."
-msgstr "오류: 잘못된 속성 '%s': %s."
+#: ../clients/cli/connections.c:3033 ../clients/tui/nm-editor-utils.c:146
+#: ../libnm-glib/nm-device.c:1849 ../libnm/nm-device.c:1800
+msgid "Ethernet"
+msgstr "이더넷"
 
-#: ../clients/cli/connections.c:3479
+#: ../clients/cli/connections.c:3053
 #, c-format
-msgid "Error: failed to modify %s.%s: %s."
-msgstr "오류: %s.%s 수정에 실패했습니다: %s."
+msgid "Error: 'mtu': '%s' is not a valid MTU."
+msgstr "오류: 'mtu': '%s'는 올바른 MTU가 아닙니다."
 
-#: ../clients/cli/connections.c:3498
-#, fuzzy, c-format
-msgid "Error: failed to remove a value from %s.%s: %s."
-msgstr "오류: '%s' 값을 삭제하는데 실패했습니다: %s\n"
+#: ../clients/cli/connections.c:3069
+#, c-format
+msgid "Error: 'parent': '%s' is not a valid interface name."
+msgstr "오류: 'parent': '%s'는 올바른 인터페이스 이름이 아닙니다."
 
-#: ../clients/cli/connections.c:3524
-#, fuzzy, c-format
-msgid "Error: '%s' is mandatory."
-msgstr "오류: '%s' 설정이 없습니다\n"
+#: ../clients/cli/connections.c:3090
+#, c-format
+msgid "Error: 'p-key': '%s' is not a valid InfiniBand P_KEY."
+msgstr "오류: 'p-key': '%s'는 올바른 InfiniBand P_KEY가 아닙니다."
 
-#: ../clients/cli/connections.c:3556
-#, fuzzy, c-format
-msgid "Error: invalid slave type; %s."
-msgstr "오류: 잘못된 연결 유형; %s."
+#: ../clients/cli/connections.c:3105
+#, c-format
+msgid "Error: '%s' is not a valid UID/GID."
+msgstr "오류: '%s'은(는) 유효한 UID/GID가 아닙니다."
 
-#: ../clients/cli/connections.c:3569
+#: ../clients/cli/connections.c:3149
 #, c-format
-msgid "Error: invalid connection type; %s."
-msgstr "오류: 잘못된 연결 유형; %s."
+msgid "Error: '%s': '%s' is not a valid %s %s."
+msgstr "오류: '%s': '%s'은(는) 유효한 %s %s이(가) 아닙니다."
 
-#: ../clients/cli/connections.c:3744
-#, fuzzy, c-format
-msgid "Error: bad connection type: %s."
-msgstr "오류: 잘못된 연결 유형; %s."
+#: ../clients/cli/connections.c:3162
+msgid "Wi-Fi mode"
+msgstr "Wi-Fi 모드"
 
-#: ../clients/cli/connections.c:3802
-#, fuzzy, c-format
-msgid "Error: '%s' is not a valid interface nor '*'."
-msgstr "오류: 'ifname': '%s'는 올바른 인터페이스 또는 '*'가 아닙니다."
+#: ../clients/cli/connections.c:3171
+msgid "InfiniBand transport mode"
+msgstr "InfiniBand 전송 모드"
 
-#: ../clients/cli/connections.c:3825
-#, fuzzy
-msgid "Error: master is required"
-msgstr "오류: 'master'가 필요합니다. "
+#: ../clients/cli/connections.c:3183
+msgid "ADSL protocol"
+msgstr "ADSL 프로토콜"
 
-#: ../clients/cli/connections.c:3883
-#, fuzzy, c-format
-msgid "Error: error adding bond option '%s=%s'."
-msgstr "오류: 알 수 없는 연결 '%s'."
+#: ../clients/cli/connections.c:3194
+msgid "ADSL encapsulation"
+msgstr "ADSL 캡슐화"
+
+#: ../clients/cli/connections.c:3203
+msgid "TUN device mode"
+msgstr "TUN 장치 모드"
 
-#: ../clients/cli/connections.c:3914
+#: ../clients/cli/connections.c:3216
 #, c-format
-msgid "Error: '%s' is not a valid monitoring mode; use '%s' or '%s'.\n"
-msgstr ""
-"오류: '%s'는 올바른 모니터링 모드가 아닙니다; '%s' 또는 '%s'를 사용합니다.\n"
+msgid "Error: 'flags': '%s' is not valid; use <0-7>."
+msgstr "오류: 'flags': '%s'는 올바르지 않습니다; <0-7>을 사용합니다."
 
-#: ../clients/cli/connections.c:3945
+#: ../clients/cli/connections.c:3238
 #, c-format
-msgid "Error: 'bt-type': '%s' not valid; use [%s, %s (%s), %s]."
-msgstr ""
-"오류: 'bt-type': '%s'이 올바르지 않습니다; [%s, %s (%s), %s]를 사용합니다."
+msgid "Error: '%s': '%s' is not valid; %s "
+msgstr "오류: '%s': '%s'는 올바르지 않습니다; %s"
 
-#: ../clients/cli/connections.c:3972
-#, fuzzy
-msgid "Interface name [*]"
-msgstr "인터페이스 이름 [*]: "
+#: ../clients/cli/connections.c:3416
+#, c-format
+msgid "Warning: master='%s' doesn't refer to any existing profile.\n"
+msgstr "경고: master='%s'이(가) 기존 프로필을 참조하지 않습니다.\n"
 
-#: ../clients/cli/connections.c:3976
-#, fuzzy
-msgid "PPPoE username"
-msgstr "PPPoE 사용자 이름: "
+#: ../clients/cli/connections.c:3441
+#, c-format
+msgid "Error: '%s': '%s' is not valid; use <%u-%u>."
+msgstr "오류: '%s': '%s'는 올바르지 않습니다; <%u-%u>를 사용합니다. "
 
-#: ../clients/cli/connections.c:3977 ../clients/cli/connections.c:3998
-#: ../clients/cli/connections.c:4000 ../clients/cli/connections.c:4049
-#, fuzzy
-msgid "Password [none]"
-msgstr "암호 [none]: "
+#. Ask for optional arguments.
+#: ../clients/cli/connections.c:3497
+#, c-format
+msgid "There is %d optional argument for '%s' connection type.\n"
+msgid_plural "There are %d optional arguments for '%s' connection type.\n"
+msgstr[0] "%d개의 옵션 인수가 ('%s' 연결 유형의 경우)있습니다.\n"
 
-#: ../clients/cli/connections.c:3978
-#, fuzzy
-msgid "Service [none]"
-msgstr "서비스 [none]: "
+#: ../clients/cli/connections.c:3500
+#, c-format
+msgid "Do you want to provide it? %s"
+msgid_plural "Do you want to provide them? %s"
+msgstr[0] "지정하시겠습니까? %s"
+
+#. Ask for optional arguments
+#: ../clients/cli/connections.c:3517
+msgid "ethernet"
+msgstr "이더넷"
 
-#: ../clients/cli/connections.c:3979 ../clients/cli/connections.c:3982
-#: ../clients/cli/connections.c:3991
-#, fuzzy
-msgid "MTU [auto]"
+#: ../clients/cli/connections.c:3522 ../clients/cli/connections.c:3570
+#: ../clients/cli/connections.c:3704 ../clients/cli/connections.c:3783
+msgid "MTU [auto]: "
 msgstr "MTU [auto]: "
 
-#: ../clients/cli/connections.c:3980 ../clients/cli/connections.c:3983
-#: ../clients/cli/connections.c:3992 ../clients/cli/connections.c:3995
-#: ../clients/cli/connections.c:4036
-#, fuzzy
-msgid "MAC [none]"
+#: ../clients/cli/connections.c:3533 ../clients/cli/connections.c:3581
+#: ../clients/cli/connections.c:3676 ../clients/cli/connections.c:3715
+#: ../clients/cli/connections.c:4101
+msgid "MAC [none]: "
 msgstr "MAC [none]: "
 
-#: ../clients/cli/connections.c:3981 ../clients/cli/connections.c:3993
-#, fuzzy
-msgid "Cloned MAC [none]"
+#: ../clients/cli/connections.c:3544
+msgid "Cloned MAC [none]: "
 msgstr "복제된 MAC [none]: "
 
-#: ../clients/cli/connections.c:3986
-#, fuzzy
-msgid "Parent interface [none]"
+#: ../clients/cli/connections.c:3592
+#, c-format
+msgid "Transport mode %s"
+msgstr "전송 모드 %s"
+
+#: ../clients/cli/connections.c:3605
+msgid "Parent interface [none]: "
 msgstr "부모 인터페이스 [none]: "
 
-#: ../clients/cli/connections.c:3987
-#, fuzzy
-msgid "P_KEY [none]"
+#: ../clients/cli/connections.c:3616
+msgid "P_KEY [none]: "
 msgstr "P_KEY [none]: "
 
-#. 0
-#: ../clients/cli/connections.c:3988 ../clients/cli/connections.c:4043
-#: ../clients/cli/devices.c:151 ../clients/tui/nmt-page-wifi.c:224
-msgid "SSID"
-msgstr "SSID"
+#: ../clients/cli/connections.c:3626
+#, c-format
+msgid "Error: 'p-key' is mandatory when 'parent' is specified.\n"
+msgstr "오류: 'parent'를 지정하면 'p-key'는 필수입니다.\n"
 
-#: ../clients/cli/connections.c:3994
-#, fuzzy
-msgid "WiMAX NSP name"
-msgstr "WiMAX NSP 이름: "
+#. Ask for optional arguments
+#: ../clients/cli/connections.c:3643 ../clients/tui/nm-editor-utils.c:154
+#: ../libnm-glib/nm-device.c:1851 ../libnm/nm-device.c:1802
+msgid "Wi-Fi"
+msgstr "Wi-Fi"
 
-#: ../clients/cli/connections.c:3996
-#, fuzzy
-msgid "APN"
-msgstr "AP"
+#: ../clients/cli/connections.c:3651 ../clients/cli/connections.c:6199
+#, c-format
+msgid "Mode %s"
+msgstr "모드 %s"
 
-#: ../clients/cli/connections.c:3997 ../clients/cli/connections.c:3999
-#: ../clients/cli/connections.c:4042
-#, fuzzy
-msgid "Username [none]"
+#. Ask for optional 'wimax' arguments.
+#: ../clients/cli/connections.c:3671 ../libnm-glib/nm-device.c:1857
+#: ../libnm/nm-device.c:1808
+msgid "WiMAX"
+msgstr "WiMAX"
+
+#. Ask for optional 'pppoe' arguments.
+#: ../clients/cli/connections.c:3694
+msgid "PPPoE"
+msgstr "PPPoE"
+
+#: ../clients/cli/connections.c:3698 ../clients/cli/connections.c:3736
+#: ../clients/cli/connections.c:4223
+msgid "Password [none]: "
+msgstr "암호 [none]: "
+
+#: ../clients/cli/connections.c:3700
+msgid "Service [none]: "
+msgstr "서비스 [none]: "
+
+#. Ask for optional 'gsm' or 'cdma' arguments.
+#: ../clients/cli/connections.c:3730
+msgid "mobile broadband"
+msgstr "모바일 광대역"
+
+#: ../clients/cli/connections.c:3734 ../clients/cli/connections.c:4173
+msgid "Username [none]: "
 msgstr "사용자 이름 [none]: "
 
-#: ../clients/cli/connections.c:4001
-#, fuzzy
-msgid "Bluetooth device address"
-msgstr "블루투스 장치 주소: "
+#. Ask for optional 'bluetooth' arguments.
+#: ../clients/cli/connections.c:3749
+msgid "bluetooth"
+msgstr "블루투스"
 
-#: ../clients/cli/connections.c:4004
-#, fuzzy
-msgid "VLAN parent device or connection UUID"
-msgstr "VLAN 부모 장치 또는 연결 UUID: "
+#: ../clients/cli/connections.c:3756
+#, c-format
+msgid "Bluetooth type %s"
+msgstr "블루투스 유형 %s"
 
-#: ../clients/cli/connections.c:4006
-#, fuzzy
-msgid "VLAN ID (<0-4094>)"
-msgstr "VLAN ID <0-4095>: "
+#: ../clients/cli/connections.c:3762
+#, c-format
+msgid "Error: 'bt-type': '%s' is not a valid bluetooth type.\n"
+msgstr "오류: 'bt-type': '%s'은 올바른 블루투스 유형이 아닙니다.\n"
 
-#: ../clients/cli/connections.c:4007
-#, fuzzy
-msgid "VLAN flags (<0-7>) [none]"
+#. Ask for optional 'vlan' arguments.
+#. 13
+#: ../clients/cli/connections.c:3778 ../clients/cli/devices.c:239
+#: ../clients/tui/nm-editor-utils.c:217 ../clients/tui/nmt-page-vlan.c:94
+#: ../libnm-core/nm-connection.c:1714 ../libnm-glib/nm-device.c:1869
+#: ../libnm-util/nm-connection.c:1632 ../libnm/nm-device.c:1820
+msgid "VLAN"
+msgstr "VLAN"
+
+#: ../clients/cli/connections.c:3794
+msgid "VLAN flags (<0-7>) [none]: "
 msgstr "VLAN 플래그 (<0-7>) [none]: "
 
-#: ../clients/cli/connections.c:4008
-#, fuzzy
-msgid "Ingress priority maps [none]"
+#: ../clients/cli/connections.c:3805
+msgid "Ingress priority maps [none]: "
 msgstr "Ingress 우선 순위 맵 [none]: "
 
-#: ../clients/cli/connections.c:4009
-#, fuzzy
-msgid "Egress priority maps [none]"
+#: ../clients/cli/connections.c:3816
+msgid "Egress priority maps [none]: "
 msgstr "Egress 우선 순위 맵 [none]: "
 
-#: ../clients/cli/connections.c:4012
-#, fuzzy
-msgid "Bonding primary interface [none]"
+#: ../clients/cli/connections.c:3827
+msgid "Bonding mode [balance-rr]: "
+msgstr "본딩 모드 [balance-rr]: "
+
+#. Ask for optional 'bond' arguments.
+#: ../clients/cli/connections.c:3843
+msgid "bond"
+msgstr "본딩"
+
+#: ../clients/cli/connections.c:3865
+msgid "Bonding primary interface [none]: "
 msgstr "본딩 기본 인터페이스 [none]: "
 
-#: ../clients/cli/connections.c:4016
-#, fuzzy
-msgid "Bonding miimon [100]"
+#: ../clients/cli/connections.c:3868
+#, c-format
+msgid "Error: 'primary': '%s' is not a valid interface name.\n"
+msgstr "오류: 'primary': '%s'는 올바른 인터페이스 이름이 아닙니다.\n"
+
+#: ../clients/cli/connections.c:3876
+#, c-format
+msgid "Bonding monitoring mode %s"
+msgstr "본딩 모니터링 모드 %s"
+
+#: ../clients/cli/connections.c:3882
+#, 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:3891
+msgid "Bonding miimon [100]: "
 msgstr "본딩 miimon [100]: "
 
-#: ../clients/cli/connections.c:4017
-#, fuzzy
-msgid "Bonding downdelay [0]"
+#: ../clients/cli/connections.c:3894
+#, c-format
+msgid "Error: 'miimon': '%s' is not a valid number <0-%u>.\n"
+msgstr "오류: 'miimon': '%s'는 올바른 번호 <0-%u>가 아닙니다.\n"
+
+#: ../clients/cli/connections.c:3902
+msgid "Bonding downdelay [0]: "
 msgstr "본딩 downdelay [0]: "
 
-#: ../clients/cli/connections.c:4018
-#, fuzzy
-msgid "Bonding updelay [0]"
+#: ../clients/cli/connections.c:3905
+#, c-format
+msgid "Error: 'downdelay': '%s' is not a valid number <0-%u>.\n"
+msgstr "오류: 'downdelay': '%s'는 올바른 번호 <0-%u>가 아닙니다.\n"
+
+#: ../clients/cli/connections.c:3913
+msgid "Bonding updelay [0]: "
 msgstr "본딩 updelay [0]: "
 
-#: ../clients/cli/connections.c:4019
-#, fuzzy
-msgid "Bonding arp-interval [0]"
+#: ../clients/cli/connections.c:3916
+#, c-format
+msgid "Error: 'updelay': '%s' is not a valid number <0-%u>.\n"
+msgstr "오류: 'updelay': '%s'는 올바른 번호 <0-%u>가 아닙니다.\n"
+
+#: ../clients/cli/connections.c:3925
+msgid "Bonding arp-interval [0]: "
 msgstr "본딩 arp-interval [0]: "
 
-#: ../clients/cli/connections.c:4021
-#, fuzzy
-msgid "Bonding arp-ip-target [none]"
+#: ../clients/cli/connections.c:3928
+#, c-format
+msgid "Error: 'arp-interval': '%s' is not a valid number <0-%u>.\n"
+msgstr "오류: 'arp-interval': '%s'는 올바른 번호 <0-%u>가 아닙니다.\n"
+
+#. FIXME: verify the string
+#: ../clients/cli/connections.c:3936
+msgid "Bonding arp-ip-target [none]: "
 msgstr "본딩 arp-ip-target [none]: "
 
-#: ../clients/cli/connections.c:4023
-msgid "LACP rate ('slow' or 'fast') [slow]"
-msgstr ""
+#: ../clients/cli/connections.c:3943
+msgid "LACP rate ('slow' or 'fast') [slow]: "
+msgstr "LACP 속도('느림' 또는 '빠름') [slow]: "
 
-#: ../clients/cli/connections.c:4025 ../clients/cli/connections.c:4026
-#, fuzzy
-msgid "Team JSON configuration [none]"
+#: ../clients/cli/connections.c:3949
+#, c-format
+msgid "Error: 'lacp_rate': '%s' is invalid ('slow' or 'fast').\n"
+msgstr "오류: 'lacp_rate': '%s'은(는) 잘못되었습니다('느림' 또는 '빠름').\n"
+
+#: ../clients/cli/connections.c:3972
+msgid "Team JSON configuration [none]: "
 msgstr "팀 JSON 설정 [none]: "
 
-#: ../clients/cli/connections.c:4027
-#, fuzzy
-msgid "Enable STP [no]"
-msgstr "STP 활성화 (예/아니오) [예]:"
+#: ../clients/cli/connections.c:3989
+msgid "team"
+msgstr "팀"
+
+#: ../clients/cli/connections.c:3995
+msgid "team-slave"
+msgstr "팀-슬레이브"
+
+#. Ask for optional 'bridge' arguments.
+#: ../clients/cli/connections.c:4007
+msgid "bridge"
+msgstr "브리지 "
+
+#: ../clients/cli/connections.c:4013
+#, c-format
+msgid "Enable STP %s"
+msgstr "STP %s 활성화"
+
+#: ../clients/cli/connections.c:4018
+#, c-format
+msgid "Error: 'stp': %s.\n"
+msgstr "오류: 'stp': %s.\n"
 
-#: ../clients/cli/connections.c:4029
-#, fuzzy
-msgid "STP priority [32768]"
-msgstr "STP 우선 순위 [128]: "
+#: ../clients/cli/connections.c:4026
+msgid "STP priority [32768]: "
+msgstr "STP 우선 순위 [32768]: "
 
 #: ../clients/cli/connections.c:4030
-#, fuzzy
-msgid "Forward delay [15]"
+#, c-format
+msgid "Error: 'priority': '%s' is not a valid number <0-%d>.\n"
+msgstr "오류: 'priority': '%s'는 올바른 번호 <0-%d>가 아닙니다.\n"
+
+#: ../clients/cli/connections.c:4038
+msgid "Forward delay [15]: "
 msgstr "포워드 지연 [15]: "
 
-#: ../clients/cli/connections.c:4031
-#, fuzzy
-msgid "Hello time [2]"
+#: ../clients/cli/connections.c:4042
+#, c-format
+msgid "Error: 'forward-delay': '%s' is not a valid number <2-30>.\n"
+msgstr "오류: 'forward-delay': '%s'는 올바른 번호 <2-30>가 아닙니다.\n"
+
+#: ../clients/cli/connections.c:4051
+msgid "Hello time [2]: "
 msgstr "Hello 타임 [2]: "
 
-#: ../clients/cli/connections.c:4032
-#, fuzzy
-msgid "Max age [20]"
+#: ../clients/cli/connections.c:4055
+#, c-format
+msgid "Error: 'hello-time': '%s' is not a valid number <1-10>.\n"
+msgstr "오류: 'hello-time': '%s'는 올바른 번호 <1-10>가 아닙니다.\n"
+
+#: ../clients/cli/connections.c:4063
+msgid "Max age [20]: "
 msgstr "최대 경과 시간 [20]: "
 
-#: ../clients/cli/connections.c:4033
-#, fuzzy
-msgid "MAC address ageing time [300]"
+#: ../clients/cli/connections.c:4067
+#, c-format
+msgid "Error: 'max-age': '%s' is not a valid number <6-40>.\n"
+msgstr "오류: 'max-age': '%s'는 올바른 번호 <6-40>가 아닙니다.\n"
+
+#: ../clients/cli/connections.c:4075
+msgid "MAC address ageing time [300]: "
 msgstr "MAC 주소 경과 시간 [300]: "
 
-#: ../clients/cli/connections.c:4034
+#: ../clients/cli/connections.c:4079
 #, c-format
-msgid "Enable IGMP snooping %s [no]"
-msgstr ""
+msgid "Error: 'ageing-time': '%s' is not a valid number <0-1000000>.\n"
+msgstr "오류: 'ageing-time': '%s'는 올바른 번호 <0-1000000>가 아닙니다.\n"
+
+#: ../clients/cli/connections.c:4088
+#, c-format
+msgid "Enable IGMP snooping %s"
+msgstr "IGMP 스누핑 %s 활성화"
+
+#: ../clients/cli/connections.c:4093
+#, c-format
+msgid "Error: 'multicast-snooping': %s.\n"
+msgstr "오류: 'multicast-snooping': %s.\n"
+
+#. Ask for optional 'bridge-slave' arguments.
+#: ../clients/cli/connections.c:4120
+msgid "bridge-slave"
+msgstr "브리지-슬레이브"
 
-#: ../clients/cli/connections.c:4037
-#, fuzzy
-msgid "Bridge port priority [32]"
+#: ../clients/cli/connections.c:4125
+msgid "Bridge port priority [32]: "
 msgstr "브리지 포트 우선 순위 [32]: "
 
-#: ../clients/cli/connections.c:4038
-#, fuzzy
-msgid "Bridge port STP path cost [100]"
+#: ../clients/cli/connections.c:4138
+msgid "Bridge port STP path cost [100]: "
 msgstr "브리지 포트 STP 경로 비용 [100]: "
 
-#: ../clients/cli/connections.c:4039
-#, fuzzy
-msgid "Hairpin [no]"
-msgstr "Hairpin 모드 "
+#: ../clients/cli/connections.c:4152
+#, c-format
+msgid "Hairpin %s"
+msgstr "Hairpin %s"
+
+#: ../clients/cli/connections.c:4157
+#, c-format
+msgid "Error: 'hairpin': %s.\n"
+msgstr "오류: 'hairpin': %s.\n"
+
+#. Ask for optional 'olpc' arguments.
+#: ../clients/cli/connections.c:4184 ../libnm-glib/nm-device.c:1855
+#: ../libnm/nm-device.c:1806
+msgid "OLPC Mesh"
+msgstr "OLPC 메시"
 
-#: ../clients/cli/connections.c:4044
-#, fuzzy
-msgid "OLPC Mesh channel [1]"
+#: ../clients/cli/connections.c:4189
+msgid "OLPC Mesh channel [1]: "
 msgstr "OLPC 메시 채널 [1]: "
 
-#: ../clients/cli/connections.c:4045
-#, fuzzy
-msgid "DHCP anycast MAC address [none]"
+#: ../clients/cli/connections.c:4192
+#, c-format
+msgid "Error: 'channel': '%s' is not a valid number <1-13>.\n"
+msgstr "오류: 'channel': '%s'는 올바른 번호 <1-13>가 아닙니다.\n"
+
+#: ../clients/cli/connections.c:4200
+msgid "DHCP anycast MAC address [none]: "
 msgstr "DHCP anycast MAC 주소 [none]: "
 
-#. TTLS and PEAP are actually much more complicated, but this complication
-#. * is not visible here since we only care about phase2 authentication
-#. * (and don't even care of which one)
-#.
-#: ../clients/cli/connections.c:4046
-#: ../clients/common/nm-secret-agent-simple.c:223
-#: ../clients/common/nm-secret-agent-simple.c:328
-#: ../clients/tui/nmt-page-dsl.c:66 ../clients/tui/nmt-page-wifi.c:332
-msgid "Username"
-msgstr "사용자 이름 "
+#. Ask for optional 'adsl' arguments.
+#: ../clients/cli/connections.c:4219 ../libnm-glib/nm-device.c:1871
+#: ../libnm/nm-device.c:1822
+msgid "ADSL"
+msgstr "ADSL"
 
-#: ../clients/cli/connections.c:4052
-#, fuzzy
-msgid "MACVLAN parent device or connection UUID"
-msgstr "VLAN 부모 장치 또는 연결 UUID: "
+#: ../clients/cli/connections.c:4227
+#, c-format
+msgid "ADSL encapsulation %s"
+msgstr "ADSL 캡슐화 %s"
 
-#: ../clients/cli/connections.c:4055
-msgid "Tap [no]"
-msgstr ""
+#. Ask for optional 'macvlan' arguments.
+#: ../clients/cli/connections.c:4245
+msgid "macvlan"
+msgstr "macvlan"
 
-#: ../clients/cli/connections.c:4057
-#, fuzzy
-msgid "VXLAN ID"
-msgstr "VLAN ID <0-4095>: "
+#: ../clients/cli/connections.c:4251
+#, c-format
+msgid "Tap %s"
+msgstr "%s 탭"
 
-#: ../clients/cli/connections.c:4058 ../clients/cli/connections.c:4076
-#, fuzzy
-msgid "Remote"
-msgstr "삭제"
+#: ../clients/cli/connections.c:4256
+#, c-format
+msgid "Error: 'tap': %s.\n"
+msgstr "오류: 'tap': %s.\n"
 
-#: ../clients/cli/connections.c:4059 ../clients/cli/connections.c:4077
-#, fuzzy
-msgid "Parent device [none]"
-msgstr "부모 인터페이스 [none]: "
+#. Ask for optional 'vxlan' arguments.
+#: ../clients/cli/connections.c:4272 ../libnm-glib/nm-device.c:1875
+#: ../libnm/nm-device.c:1826
+msgid "VXLAN"
+msgstr "VXLAN"
 
-#: ../clients/cli/connections.c:4060
-#, fuzzy
-msgid "Local address [none]"
-msgstr "DHCP anycast MAC 주소 [none]: "
+#: ../clients/cli/connections.c:4277 ../clients/cli/connections.c:4601
+msgid "Parent device [none]: "
+msgstr "부모 장치 [none]: "
 
-#: ../clients/cli/connections.c:4061
-msgid "Minimum source port [0]"
-msgstr ""
+#: ../clients/cli/connections.c:4282 ../clients/cli/connections.c:4606
+#, c-format
+msgid "Error: 'dev': '%s' is neither UUID nor interface name.\n"
+msgstr "오류: 'dev': '%s'은(는) UUID 또는 인터페이스 이름이 아닙니다.\n"
 
-#: ../clients/cli/connections.c:4062
-msgid "Maximum source port [0]"
-msgstr ""
+#: ../clients/cli/connections.c:4291
+msgid "Local address [none]: "
+msgstr "로컬 주소 [none]: "
 
-#: ../clients/cli/connections.c:4063
-#, fuzzy
-msgid "Destination port [8472]"
-msgstr "대상 "
+#: ../clients/cli/connections.c:4296
+#, c-format
+msgid "Error: 'local': '%s' is not a valid IP address.\n"
+msgstr "오류: 'local': '%s'은(는) 유효한 IP 주소가 아닙니다.\n"
+
+#: ../clients/cli/connections.c:4305
+msgid "Minimum source port [0]: "
+msgstr "최소 소스 포트 [0]: "
+
+#: ../clients/cli/connections.c:4309
+#, c-format
+msgid "Error: 'source-port-min': '%s' is not a valid number <0-65535>.\n"
+msgstr "오류: 'source-port-min': '%s'은(는) 유효한 숫자 <0-65535>가 아닙니다.\n"
+
+#: ../clients/cli/connections.c:4318
+msgid "Maximum source port [0]: "
+msgstr "최대 소스 포트 [0]: "
+
+#: ../clients/cli/connections.c:4322
+#, c-format
+msgid "Error: 'source-port-max': '%s' is not a valid number <0-65535>.\n"
+msgstr "오류: 'source-port-max': '%s'은(는) 유효한 숫자 <0-65535>가 아닙니다.\n"
+
+#: ../clients/cli/connections.c:4331
+msgid "Destination port [8472]: "
+msgstr "대상 포트 [8472]: "
+
+#: ../clients/cli/connections.c:4335
+#, c-format
+msgid "Error: 'destination-port': '%s' is not a valid number <0-65535>.\n"
+msgstr "오류: 'destination-port': '%s'은(는) 유효한 숫자 <0-65535>가 아닙니다.\n"
+
+#: ../clients/cli/connections.c:4374
+msgid "IPv4 address (IP[/plen]) [none]: "
+msgstr "IPv4 주소 (IP[/plen]) [none]: "
+
+#: ../clients/cli/connections.c:4376
+msgid "IPv6 address (IP[/plen]) [none]: "
+msgstr "IPv6 주소 (IP[/plen]) [none]: "
+
+#: ../clients/cli/connections.c:4390
+#, c-format
+msgid "  Address successfully added: %s\n"
+msgstr "  주소가 성공적으로 추가됨: %s\n"
+
+#: ../clients/cli/connections.c:4392
+#, c-format
+msgid "  Warning: address already present: %s\n"
+msgstr "  경고: 주소가 이미 존재함: %s\n"
+
+#: ../clients/cli/connections.c:4394
+#, c-format
+msgid "  Warning: ignoring garbage at the end: '%s'\n"
+msgstr "  경고: 마지막에 불필요한 데이터를 무시합니다: '%s'\n"
+
+#: ../clients/cli/connections.c:4396 ../clients/cli/connections.c:5605
+#: ../clients/cli/connections.c:5652 ../clients/cli/connections.c:6569
+#: ../clients/cli/connections.c:6602
+msgid "Error: "
+msgstr "오류: "
 
-#: ../clients/cli/connections.c:4066
-#, fuzzy
-msgid "User ID [none]"
+#: ../clients/cli/connections.c:4416
+msgid "IPv4 gateway [none]: "
+msgstr "IPv4 게이트웨이 [none]: "
+
+#: ../clients/cli/connections.c:4419
+msgid "IPv6 gateway [none]: "
+msgstr "IPv6 게이트웨이 [none]: "
+
+#: ../clients/cli/connections.c:4439
+#, c-format
+msgid "Error: invalid gateway address '%s'\n"
+msgstr "오류: 잘못된 게이트웨이 주소 '%s'\n"
+
+#. Ask for IP addresses
+#: ../clients/cli/connections.c:4452
+#, c-format
+msgid "Do you want to add IP addresses? %s"
+msgstr "IP 주소를 추가하시겠습니까? %s"
+
+#: ../clients/cli/connections.c:4460
+#, c-format
+msgid "Press <Enter> to finish adding addresses.\n"
+msgstr "<Enter> 키를 눌러 주소 추가를 종료합니다.\n"
+
+#. Ask for optional 'tun' arguments.
+#: ../clients/cli/connections.c:4504 ../libnm-glib/nm-device.c:1879
+#: ../libnm/nm-device.c:1830
+msgid "Tun"
+msgstr "Tun"
+
+#: ../clients/cli/connections.c:4509
+msgid "User ID [none]: "
 msgstr "사용자 이름 [none]: "
 
-#: ../clients/cli/connections.c:4067
-#, fuzzy
-msgid "Group ID [none]"
-msgstr "MAC [none]: "
+#: ../clients/cli/connections.c:4522
+msgid "Group ID [none]: "
+msgstr "그룹 ID [none]: "
 
-#: ../clients/cli/connections.c:4068
-#, fuzzy
-msgid "Enable PI [no]"
-msgstr "STP 활성화 (예/아니오) [예]:"
+#: ../clients/cli/connections.c:4536
+#, c-format
+msgid "Enable PI %s"
+msgstr "PI %s 활성화"
 
-#: ../clients/cli/connections.c:4070
-msgid "Enable VNET header [no]"
-msgstr ""
+#: ../clients/cli/connections.c:4541
+#, c-format
+msgid "Error: 'pi': %s.\n"
+msgstr "오류: 'pi': %s.\n"
 
-#: ../clients/cli/connections.c:4072
-msgid "Enable multi queue [no]"
-msgstr ""
+#: ../clients/cli/connections.c:4549
+#, c-format
+msgid "Enable VNET header %s"
+msgstr "VNET 헤더 %s 활성화"
 
-#: ../clients/cli/connections.c:4075
-#, fuzzy
-msgid "Local endpoint [none]"
-msgstr "부모 인터페이스 [none]: "
+#: ../clients/cli/connections.c:4554
+#, c-format
+msgid "Error: 'vnet-hdr': %s.\n"
+msgstr "오류: 'vnet-hdr': %s.\n"
+
+#: ../clients/cli/connections.c:4562
+#, c-format
+msgid "Enable multi queue %s"
+msgstr "다중 대기열 %s 활성화"
 
-#: ../clients/cli/connections.c:4078
-#, fuzzy
-msgid "IPv4 address (IP[/plen]) [none]"
-msgstr "IPv4 주소 (IP[/plen] [gateway]) [none]: "
+#: ../clients/cli/connections.c:4567
+#, c-format
+msgid "Error: 'multi-queue': %s.\n"
+msgstr "오류: 'multi-queue': %s.\n"
 
-#: ../clients/cli/connections.c:4079
-#, fuzzy
-msgid "IPv4 gateway [none]"
-msgstr "IPv4 주소 (IP[/plen] [gateway]) [none]: "
-
-#: ../clients/cli/connections.c:4080
-#, fuzzy
-msgid "IPv6 address (IP[/plen]) [none]"
-msgstr "IPv6 주소 (IP[/plen] [gateway]) [none]: "
-
-#: ../clients/cli/connections.c:4081
-#, fuzzy
-msgid "IPv6 gateway [none]"
-msgstr "IPv6 주소 (IP[/plen] [gateway]) [none]: "
-
-#: ../clients/cli/connections.c:4205
-#, fuzzy, c-format
-msgid "Error: value for '%s' is missing."
-msgstr "오류: '%s'옵션에 대해 필드가 없습니다."
+#. Ask for optional 'ip-tunnel' arguments.
+#: ../clients/cli/connections.c:4581
+msgid "IP Tunnel"
+msgstr "IP 터널"
+
+#: ../clients/cli/connections.c:4586
+msgid "Local endpoint [none]: "
+msgstr "로컬 끝점 [none]: "
 
-#: ../clients/cli/connections.c:4252
+#: ../clients/cli/connections.c:4592
+#, c-format
+msgid "Error: 'local': '%s' is not valid; must be an IP address\n"
+msgstr "오류: 'local': '%s'은(는) 유효하지 않습니다. IP 주소여야 합니다.\n"
+
+#: ../clients/cli/connections.c:4658 ../clients/cli/connections.c:10184
+#, c-format
 msgid "Error: <setting>.<property> argument is missing."
 msgstr "오류: <setting>.<property> 인수가 누락되어 있습니다."
 
-#: ../clients/cli/connections.c:4274
+#: ../clients/cli/connections.c:4663
+#, c-format
+msgid "Error: value for '%s' is missing."
+msgstr "오류: '%s'의 값이 누락되었습니다."
+
+#: ../clients/cli/connections.c:4681
+#, c-format
+msgid "Error: invalid <setting>.<property> '%s'."
+msgstr "오류: 잘못된 <setting>.<property> '%s'입니다."
+
+#: ../clients/cli/connections.c:4689
 #, c-format
 msgid "Error: invalid or not allowed setting '%s': %s."
 msgstr "오류: 잘못된 또는 허용되지 않는 설정 '%s': %s."
 
-#: ../clients/cli/connections.c:4301
-#, fuzzy, c-format
-msgid "Error: '%s' is ambiguous (%s.%s or %s.%s)."
-msgstr "'%s'는 애매모호합니다 (%s x %s)"
+#: ../clients/cli/connections.c:4700
+#, c-format
+msgid "Error: don't know how to create '%s' setting."
+msgstr "오류: '%s' 설정을 생성하는 방법을 알 수 없습니다."
 
-#: ../clients/cli/connections.c:4315
+#: ../clients/cli/connections.c:4710
 #, c-format
-msgid "Error: invalid <setting>.<property> '%s'."
-msgstr "오류: 잘못된 <setting>.<property> '%s'입니다."
+msgid "Error: invalid property '%s': %s."
+msgstr "오류: 잘못된 속성 '%s': %s."
 
-#: ../clients/cli/connections.c:4356 ../clients/cli/connections.c:7842
-#, fuzzy, c-format
-msgid "Error: Failed to add '%s' connection: %s"
-msgstr "오류: '%s' 연결을 추가하는데 실패했습니다: (%d) %s"
+#: ../clients/cli/connections.c:4722
+#, c-format
+msgid "Error: failed to modify %s.%s: %s."
+msgstr "오류: %s.%s 수정에 실패했습니다: %s."
 
-#: ../clients/cli/connections.c:4361
+#: ../clients/cli/connections.c:4741
 #, c-format
-msgid "Connection '%s' (%s) successfully added.\n"
-msgstr "연결 '%s' (%s)이 성공적으로 추가되었습니다.\n"
+msgid "Error: failed to remove a value from %s.%s: %s."
+msgstr "오류: %s.%s의 값 제거 실패: %s."
 
-#: ../clients/cli/connections.c:4477
+#: ../clients/cli/connections.c:4775
 #, c-format
 msgid ""
-"You can specify this option more than once. Press <Enter> when you're done.\n"
-msgstr ""
+"Warning: 'type' is ignored. Use 'nmcli connection add \"%s\" ...' instead."
+msgstr "경고: '유형'이 무시됩니다. 대신 'nmcli 연결 추가 \"%s\" ...'을(를) 사용하십시오."
 
-#. Ask for optional arguments.
-#: ../clients/cli/connections.c:4515
-#, fuzzy, c-format
-msgid "There is %d optional setting for %s.\n"
-msgid_plural "There are %d optional settings for %s.\n"
-msgstr[0] "'%s' 연결 유형에는 1 개의 옵션 인수가 있습니다.\n"
-
-#: ../clients/cli/connections.c:4518
-#, fuzzy, c-format
-msgid "Do you want to provide it? %s"
-msgid_plural "Do you want to provide them? %s"
-msgstr[0] "지정 하시겠습니까? (예/아니오) [예]"
+#: ../clients/cli/connections.c:4783
+msgid "Error: redundant 'master' option."
+msgstr "오류: 중복 '마스터' 옵션."
 
-#: ../clients/cli/connections.c:4532
-#, fuzzy
-msgid "Wired Ethernet"
-msgstr "이더넷"
+#: ../clients/cli/connections.c:4796
+msgid "Error: 'master' is required."
+msgstr "오류: 'master'가 필요합니다. "
 
-#: ../clients/cli/connections.c:4534 ../src/devices/nm-device-infiniband.c:175
-#, fuzzy
-msgid "InfiniBand connection"
-msgstr "InfiniBand 연결 %d"
+#: ../clients/cli/connections.c:4950
+#, c-format
+msgid "Error: 'parent': not valid without 'p-key'."
+msgstr "오류: 'parent': 'p-key'가 없으면 올바르지 않습니다."
 
-#: ../clients/cli/connections.c:4536
-#, fuzzy
-msgid "Wi-Fi connection"
-msgstr "Wi-Fi 연결 %d"
+#: ../clients/cli/connections.c:5005 ../clients/cli/connections.c:5967
+msgid "SSID: "
+msgstr "SSID: "
 
-#: ../clients/cli/connections.c:4538
-#, fuzzy
-msgid "WiMAX connection"
-msgstr "CDMA 연결 %d"
+#: ../clients/cli/connections.c:5008 ../clients/cli/connections.c:5970
+msgid "Error: 'ssid' is required."
+msgstr "오류: 'ssid'가 필요합니다. "
 
-#: ../clients/cli/connections.c:4540
-msgid "PPPoE"
-msgstr ""
+#: ../clients/cli/connections.c:5072
+msgid "WiMAX NSP name: "
+msgstr "WiMAX NSP 이름: "
 
-#: ../clients/cli/connections.c:4542
-#, fuzzy
-msgid "CDMA mobile broadband connection"
-msgstr "모바일 광대역 연결 %d"
+#: ../clients/cli/connections.c:5075
+msgid "Error: 'nsp' is required."
+msgstr "오류: 'nsp'가 필요합니다. "
 
-#: ../clients/cli/connections.c:4544
-#, fuzzy
-msgid "GSM mobile broadband connection"
-msgstr "모바일 광대역 연결 %d"
+#: ../clients/cli/connections.c:5127
+msgid "PPPoE username: "
+msgstr "PPPoE 사용자 이름: "
 
-#: ../clients/cli/connections.c:4546
-#, fuzzy
-msgid "bluetooth connection"
-msgstr "Bond 연결 %d"
+#: ../clients/cli/connections.c:5130 ../clients/cli/connections.c:6037
+msgid "Error: 'username' is required."
+msgstr "오류: '사용자 이름'을 입력해야 합니다."
 
-#: ../clients/cli/connections.c:4548 ../src/devices/nm-device-vlan.c:458
-#, fuzzy
-msgid "VLAN connection"
-msgstr "VLAN 연결 %d"
+#: ../clients/cli/connections.c:5199
+msgid "APN: "
+msgstr "APN: "
 
-#: ../clients/cli/connections.c:4550
-#, fuzzy
-msgid "Bond device"
-msgstr "이더넷"
+#: ../clients/cli/connections.c:5202
+msgid "Error: 'apn' is required."
+msgstr "오류: 'apn'이 필요합니다. "
 
-#: ../clients/cli/connections.c:4552
-#, fuzzy
-msgid "Team device"
-msgstr "장치가 제거되었습니다 "
+#: ../clients/cli/connections.c:5260
+msgid "Bluetooth device address: "
+msgstr "블루투스 장치 주소: "
 
-#: ../clients/cli/connections.c:4554
-#, fuzzy
-msgid "Team port"
-msgstr "팀 "
+#: ../clients/cli/connections.c:5263
+msgid "Error: 'addr' is required."
+msgstr "오류: 'addr'가 필요합니다."
 
-#: ../clients/cli/connections.c:4556
-#, fuzzy
-msgid "Bridge device"
-msgstr "이더넷"
+#: ../clients/cli/connections.c:5304
+#, c-format
+msgid "Error: 'bt-type': '%s' not valid; use [%s, %s (%s), %s]."
+msgstr "오류: 'bt-type': '%s'이 올바르지 않습니다; [%s, %s (%s), %s]를 사용합니다."
 
-#: ../clients/cli/connections.c:4558
-#, fuzzy
-msgid "Bridge port"
-msgstr "브리지 "
+#: ../clients/cli/connections.c:5348
+msgid "VLAN parent device or connection UUID: "
+msgstr "VLAN 부모 장치 또는 연결 UUID: "
 
-#: ../clients/cli/connections.c:4560 ../src/nm-manager.c:3716
-#, fuzzy
-msgid "VPN connection"
-msgstr "VPN 연결 중"
+#: ../clients/cli/connections.c:5351 ../clients/cli/connections.c:6108
+msgid "Error: 'dev' is required."
+msgstr "오류: 'dev'가 필요합니다. "
 
-#: ../clients/cli/connections.c:4562
-#, fuzzy
-msgid "OLPC Mesh connection"
-msgstr "CDMA 연결 %d"
+#: ../clients/cli/connections.c:5355
+msgid "VLAN ID <0-4094>: "
+msgstr "VLAN ID <0-4094>: "
 
-#: ../clients/cli/connections.c:4564 ../src/devices/adsl/nm-device-adsl.c:133
-#, fuzzy
-msgid "ADSL connection"
-msgstr "ADSL 연결 %d"
+#: ../clients/cli/connections.c:5358 ../clients/cli/connections.c:6424
+msgid "Error: 'id' is required."
+msgstr "오류: 'id'가 필요합니다. "
 
-#: ../clients/cli/connections.c:4566
-#, fuzzy
-msgid "macvlan connection"
-msgstr "Bond 연결 %d"
+#: ../clients/cli/connections.c:5364
+#, c-format
+msgid "Error: 'id': '%s' is not valid; use <0-4094>."
+msgstr "오류: 'id': '%s'이(가) 유효하지 않습니다. <0-4094>를 사용하십시오."
 
-#: ../clients/cli/connections.c:4568 ../src/devices/nm-device-vxlan.c:374
-#, fuzzy
-msgid "VXLAN connection"
-msgstr "VLAN 연결 %d"
+#: ../clients/cli/connections.c:5374 ../clients/cli/connections.c:6116
+#, c-format
+msgid "Error: 'dev': '%s' is neither UUID, interface name, nor MAC."
+msgstr "오류: 'dev': '%s'는 UUID, 인터페이스 이름, MAC이 아닙니다. "
 
-#: ../clients/cli/connections.c:4570
-#, fuzzy
-msgid "Tun device"
-msgstr "장치가 제거되었습니다 "
+#: ../clients/cli/connections.c:5506
+#, c-format
+msgid "Error: 'mode': %s."
+msgstr "오류: 'mode': %s."
 
-#: ../clients/cli/connections.c:4572
-msgid "IPv4 protocol"
-msgstr ""
+#: ../clients/cli/connections.c:5515
+#, c-format
+msgid "Error: 'primary': '%s' is not a valid interface name."
+msgstr "오류: 'primary': '%s'는 올바른 인터페이스 이름이 아닙니다."
 
-#: ../clients/cli/connections.c:4574
-msgid "IPv6 protocol"
-msgstr ""
+#: ../clients/cli/connections.c:5738
+#, c-format
+msgid "Error: 'stp': %s."
+msgstr "오류: 'stp': %s."
 
-#: ../clients/cli/connections.c:4657 ../clients/cli/utils.c:124
+#: ../clients/cli/connections.c:5747
 #, c-format
-msgid "Error: value for '%s' argument is required."
-msgstr "오류: '%s' 인수 값이 필요합니다. "
+msgid "Error: 'multicast-snooping': %s."
+msgstr "오류: 'multicast-snooping': %s."
 
-#: ../clients/cli/connections.c:4663
-#, fuzzy, c-format
-msgid "Error: 'save': %s."
-msgstr "오류: 'stp': %s."
+#: ../clients/cli/connections.c:5866
+#, c-format
+msgid "Error: 'hairpin': %s."
+msgstr "오류: 'hairpin': %s."
+
+#: ../clients/cli/connections.c:5915
+msgid "Error: 'vpn-type' is required."
+msgstr "오류: 'vpn-type'이 필요합니다. "
+
+#: ../clients/cli/connections.c:5922
+#, c-format
+msgid "Warning: 'vpn-type': %s not known.\n"
+msgstr "경고: 'vpn-type': %s은(는) 알 수 없습니다.\n"
+
+#: ../clients/cli/connections.c:5983
+#, c-format
+msgid "Error: 'channel': '%s' is not valid; use <1-13>."
+msgstr "오류: 'channel': '%s'이 올바르지 않습니다; <1-13>을 사용합니다. "
+
+#: ../clients/cli/connections.c:6034
+msgid "Username: "
+msgstr "사용자 이름: "
+
+#: ../clients/cli/connections.c:6043
+#, c-format
+msgid "Protocol %s"
+msgstr "프로토콜 %s"
+
+#: ../clients/cli/connections.c:6046
+msgid "Error: 'protocol' is required."
+msgstr "오류: 'protocol'이 필요합니다."
+
+#: ../clients/cli/connections.c:6105
+msgid "MACVLAN parent device or connection UUID: "
+msgstr "MACVLAN 부모 장치 또는 연결 UUID: "
+
+#: ../clients/cli/connections.c:6125 ../clients/cli/connections.c:6205
+#: ../clients/cli/connections.c:6307
+msgid "Error: 'mode' is required."
+msgstr "오류: 'mode'가 필요합니다."
+
+#: ../clients/cli/connections.c:6131
+msgid "Error: 'mode' is not valid."
+msgstr "오류: 'mode'가 유효하지 않습니다."
 
-#: ../clients/cli/connections.c:4732
-#, fuzzy, c-format
-msgid "Error: '%s' argument is required."
+#: ../clients/cli/connections.c:6144
+#, c-format
+msgid "Error: 'tap': %s."
+msgstr "오류: 'tap': %s."
+
+#: ../clients/cli/connections.c:6230
+#, c-format
+msgid "Error: 'pi': %s."
+msgstr "오류: 'pi': %s."
+
+#: ../clients/cli/connections.c:6241
+#, c-format
+msgid "Error: 'vnet-hdr': %s."
+msgstr "오류: 'vnet-hdr': %s."
+
+#: ../clients/cli/connections.c:6252
+#, c-format
+msgid "Error: 'multi-queue': %s."
+msgstr "오류: 'multi-queue': %s."
+
+#: ../clients/cli/connections.c:6321
+#, c-format
+msgid "Error: 'mode': '%s' is not valid, use one of %s"
+msgstr "오류: 'mode': '%s'이(가) 유효하지 않습니다. %s 중 하나를 사용하십시오."
+
+#: ../clients/cli/connections.c:6327
+msgid "Remote endpoint: "
+msgstr "원격 끝점: "
+
+#: ../clients/cli/connections.c:6330 ../clients/cli/connections.c:6432
+msgid "Error: 'remote' is required."
+msgstr "오류: 'remote'가 필요합니다."
+
+#: ../clients/cli/connections.c:6337
+#, c-format
+msgid "Error: 'remote': '%s' is not valid; must be an IP address"
+msgstr "오류: 'remote': '%s'이(가) 유효하지 않습니다. IP 주소여야 합니다."
+
+#: ../clients/cli/connections.c:6351
+#, c-format
+msgid "Error: 'local': '%s' is not valid; must be an IP address"
+msgstr "오류: 'local': '%s'이(가) 유효하지 않습니다. IP 주소여야 합니다."
+
+#: ../clients/cli/connections.c:6360 ../clients/cli/connections.c:6455
+#, c-format
+msgid "Error: 'dev': '%s' is neither UUID nor interface name."
+msgstr "오류: 'dev': '%s'이(가) UUID 또는 인터페이스 이름이 아닙니다."
+
+#: ../clients/cli/connections.c:6421
+msgid "VXLAN ID: "
+msgstr "VXLAN ID: "
+
+#: ../clients/cli/connections.c:6429
+msgid "Remote: "
+msgstr "원격: "
+
+#: ../clients/cli/connections.c:6438
+#, c-format
+msgid "Error: 'id': '%s' is not valid; use <0-16777215>."
+msgstr "오류: 'id': '%s'이(가) 유효하지 않습니다. <0-16777215>를 사용하십시오."
+
+#: ../clients/cli/connections.c:6464
+#, c-format
+msgid "Error: 'remote': '%s' is not a valid IP address"
+msgstr "오류: 'remote': '%s'이(가) 유효한 IP 주소가 아닙니다."
+
+#: ../clients/cli/connections.c:6473
+#, c-format
+msgid "Error: 'local': '%s' is not a valid IP address"
+msgstr "오류: 'local': '%s'이(가) 유효한 IP 주소가 아닙니다."
+
+#: ../clients/cli/connections.c:6482
+#, c-format
+msgid "Error: 'source-port-min': %s is not valid; use <0-65535>."
+msgstr "오류: 'source-port-min': %s이(가) 유효하지 않습니다. <0-65535>를 사용하십시오."
+
+#: ../clients/cli/connections.c:6491
+#, c-format
+msgid "Error: 'source-port-max': %s is not valid; use <0-65535>."
+msgstr "오류: 'source-port-max': %s이(가) 유효하지 않습니다.<0-65535>를 사용하십시오."
+
+#: ../clients/cli/connections.c:6500
+#, c-format
+msgid "Error: 'destination-port': %s is not valid; use <0-65535>."
+msgstr "오류: 'destination-port': %s이(가) 유효하지 않습니다. <0-65535>를 사용하십시오."
+
+#: ../clients/cli/connections.c:6540
+#, c-format
+msgid "Error: '%s' is not a valid connection type."
+msgstr "오류: '%s'는 올바른 연결 유형이 아닙니다. "
+
+#: ../clients/cli/connections.c:6581
+#, c-format
+msgid "Error: IPv4 gateway specified without IPv4 addresses"
+msgstr "오류: IPv4 게이트웨이가 IPv4 주소 없이 지정되었습니다."
+
+#: ../clients/cli/connections.c:6585
+#, c-format
+msgid "Error: multiple IPv4 gateways specified"
+msgstr "오류: 여러 IPv4 게이트웨이가 지정되었습니다."
+
+#: ../clients/cli/connections.c:6589
+#, c-format
+msgid "Error: Invalid IPv4 gateway '%s'"
+msgstr "오류: 잘못된 IPv4 게이트웨이 '%s'"
+
+#: ../clients/cli/connections.c:6614
+#, c-format
+msgid "Error: IPv6 gateway specified without IPv6 addresses"
+msgstr "오류: IPv6 게이트웨이가 IPv6 주소 없이 지정되었습니다."
+
+#: ../clients/cli/connections.c:6618
+#, c-format
+msgid "Error: multiple IPv6 gateways specified"
+msgstr "오류: 여러 IPv6 게이트웨이가 지정되었습니다."
+
+#: ../clients/cli/connections.c:6622
+#, c-format
+msgid "Error: Invalid IPv6 gateway '%s'"
+msgstr "오류: 잘못된 IPv6 게이트웨이 '%s'"
+
+#: ../clients/cli/connections.c:6670 ../clients/cli/connections.c:10223
+#, c-format
+msgid "Error: Failed to add '%s' connection: %s"
+msgstr "오류: '%s' 연결 추가 실패: %s"
+
+#: ../clients/cli/connections.c:6675
+#, c-format
+msgid "Connection '%s' (%s) successfully added.\n"
+msgstr "연결 '%s' (%s)이 성공적으로 추가되었습니다.\n"
+
+#: ../clients/cli/connections.c:6951 ../clients/cli/connections.c:10678
+#, c-format
+msgid "Error: 'type' argument is required."
 msgstr "오류: 'type' 인수가 필요합니다. "
 
-#: ../clients/cli/connections.c:5701
+#: ../clients/cli/connections.c:6959
+#, c-format
+msgid "Error: invalid connection type; %s."
+msgstr "오류: 잘못된 연결 유형; %s."
+
+#: ../clients/cli/connections.c:6968 ../clients/cli/devices.c:2164
+#, c-format
+msgid "Error: 'autoconnect': %s."
+msgstr "오류: 'autoconnect': %s."
+
+#: ../clients/cli/connections.c:6978
+#, c-format
+msgid "Error: 'save': %s."
+msgstr "오류: 'save': %s."
+
+#: ../clients/cli/connections.c:6995
+msgid "Interface name [*]: "
+msgstr "인터페이스 이름 [*]: "
+
+#: ../clients/cli/connections.c:7000
+#, c-format
+msgid "Error: 'ifname' argument is required."
+msgstr "오류: 'ifname' 인수를 지정해야 합니다."
+
+#: ../clients/cli/connections.c:7002
+#, c-format
+msgid "Error: mandatory 'ifname' not seen before '%s'."
+msgstr "오류: '%s' 앞에 필수 'ifname'이 보이지 않습니다."
+
+#: ../clients/cli/connections.c:7011
+#, c-format
+msgid "Error: 'ifname': '%s' is not a valid interface nor '*'."
+msgstr "오류: 'ifname': '%s'는 올바른 인터페이스 또는 '*'가 아닙니다."
+
+#: ../clients/cli/connections.c:8035
 #, c-format
 msgid "['%s' setting values]\n"
 msgstr "['%s' 설정 값]\n"
 
 #. TRANSLATORS: do not translate command names and keywords before ::
 #. *              However, you should translate terms enclosed in <>.
-#.
-#: ../clients/cli/connections.c:5783
-#, fuzzy, c-format
+#. 
+#: ../clients/cli/connections.c:8117
+#, c-format
 msgid ""
 "---[ Main menu ]---\n"
 "goto     [<setting> | <prop>]        :: go to a setting or property\n"
@@ -2347,20 +2816,20 @@ msgid ""
 "quit                                 :: exit nmcli\n"
 msgstr ""
 "---[ Main menu ]---\n"
-"goto     [<setting> | <prop>]        :: 설정 또는 속성으로 가기\n"
-"remove   <setting>[.<prop>] | <prop> :: 설정을 제거하거나 속성 값을 재설정\n"
+"goto     [<setting> | <prop>]        :: 설정 또는 속성으로 이동\n"
+"remove   <setting>[.<prop>] | <prop> :: 설정 제거 또는 속성 값 재설정\n"
 "set      [<setting>.<prop> <value>]  :: 속성 값 설정\n"
 "describe [<setting>.<prop>]          :: 속성 설명\n"
-"print    [all]                       :: 연결 출력\n"
-"verify   [all]                       :: 연결 확인\n"
-"save                                 :: 연결 저장\n"
+"print    [all | <setting>[.<prop>]]  :: 연결 인쇄\n"
+"verify   [all | fix]                 :: 연결 확인\n"
+"save     [persistent|temporary]      :: 연결 저장\n"
 "activate [<ifname>] [/<ap>|<nsp>]    :: 연결 활성화\n"
-"back                                 :: 한 단계 위로 이동 (되돌아가기)\n"
-"help/?   [<command>]                 :: 도움말 출력\n"
-"nmcli    <conf-option> <value>       :: nmcli 설정\n"
+"back                                 :: 한 레벨 위로 이동(뒤로)\n"
+"help/?   [<command>]                 :: 이 도움말 인쇄\n"
+"nmcli    <conf-option> <value>       :: nmcli 구성\n"
 "quit                                 :: nmcli 종료\n"
 
-#: ../clients/cli/connections.c:5810
+#: ../clients/cli/connections.c:8144
 #, c-format
 msgid ""
 "goto <setting>[.<prop>] | <prop>  :: enter setting/property for editing\n"
@@ -2379,13 +2848,12 @@ msgstr ""
 "          nmcli connection> goto secondaries\n"
 "          nmcli> goto ipv4.addresses\n"
 
-#: ../clients/cli/connections.c:5817
+#: ../clients/cli/connections.c:8151
 #, c-format
 msgid ""
 "remove <setting>[.<prop>]  :: remove setting or reset property value\n"
 "\n"
-"This command removes an entire setting from the connection, or if a "
-"property\n"
+"This command removes an entire setting from the connection, or if a property\n"
 "is given, resets that property to the default value.\n"
 "\n"
 "Examples: nmcli> remove wifi-sec\n"
@@ -2393,14 +2861,13 @@ msgid ""
 msgstr ""
 "remove <setting>[.<prop>]  :: 설정을 제거하거나 속성 값을 재설정\n"
 "\n"
-"이 명령을 사용하여 연결에서 모든 설정을 제거하거나 속성이 지정되어 있는 경"
-"우 \n"
+"이 명령을 사용하여 연결에서 모든 설정을 제거하거나 속성이 지정되어 있는 경우 \n"
 "속성을 기본값으로 다시 설정합니다.\n"
 "\n"
 "예: nmcli> remove wifi-sec\n"
 "          nmcli> remove eth.mtu\n"
 
-#: ../clients/cli/connections.c:5824
+#: ../clients/cli/connections.c:8158
 #, c-format
 msgid ""
 "set [<setting>.<prop> <value>]  :: set property value\n"
@@ -2415,7 +2882,7 @@ msgstr ""
 "\n"
 "예: nmcli> set con.id My connection\n"
 
-#: ../clients/cli/connections.c:5829
+#: ../clients/cli/connections.c:8163
 #, c-format
 msgid ""
 "describe [<setting>.<prop>]  :: describe property\n"
@@ -2425,10 +2892,9 @@ msgid ""
 msgstr ""
 "describe [<setting>.<prop>]  :: 속성 설명\n"
 "\n"
-"속성 설명을 표시합니다. NM 설정 및 속성에 대한 자세한 설명은 nm-settings(5) "
-"man 페이지에서 참조하십시오.\n"
+"속성 설명을 표시합니다. NM 설정 및 속성에 대한 자세한 설명은 nm-settings(5) man 페이지에서 참조하십시오.\n"
 
-#: ../clients/cli/connections.c:5834
+#: ../clients/cli/connections.c:8168
 #, c-format
 msgid ""
 "print [all]  :: print setting or connection values\n"
@@ -2443,29 +2909,30 @@ msgstr ""
 "\n"
 "예: nmcli ipv4> print all\n"
 
-#: ../clients/cli/connections.c:5839
-#, fuzzy, c-format
+#: ../clients/cli/connections.c:8173
+#, c-format
 msgid ""
 "verify [all | fix]  :: verify setting or connection validity\n"
 "\n"
 "Verifies whether the setting or connection is valid and can be saved later.\n"
-"It indicates invalid values on error. Some errors may be fixed "
-"automatically\n"
+"It indicates invalid values on error. Some errors may be fixed automatically\n"
 "by 'fix' option.\n"
 "\n"
 "Examples: nmcli> verify\n"
 "          nmcli> verify fix\n"
 "          nmcli bond> verify\n"
 msgstr ""
-"verify [all]  :: 설정 또는 연결 유효성을 확인\n"
+"verify [all | fix]  :: 설정 또는 연결 유효성 확인\n"
 "\n"
-"설정 또는 연결이 올바른지 여부를 확인하고 나중에 저장할 수 있습니다. 이는 오"
-"류에서 잘못된 값을 표시합니다.\n"
+"설정 또는 연결이 유효하며 나중에 저장할 수 있는지 확인합니다.\n"
+"이는 잘못된 값을 오류로 표시합니다. 일부 오류는\n"
+"'fix' 옵션을 통해 자동으로 수정될 수 있습니다.\n"
 "\n"
 "예: nmcli> verify\n"
+"          nmcli> verify fix\n"
 "          nmcli bond> verify\n"
 
-#: ../clients/cli/connections.c:5848
+#: ../clients/cli/connections.c:8182
 #, c-format
 msgid ""
 "save [persistent|temporary]  :: save the connection\n"
@@ -2480,8 +2947,17 @@ msgid ""
 "connection\n"
 "profile must be deleted.\n"
 msgstr ""
+"verify [all | fix]  :: 설정 또는 연결 유효성 확인\n"
+"\n"
+"설정 또는 연결이 유효하며 나중에 저장할 수 있는지 확인합니다.\n"
+"이는 잘못된 값을 오류로 표시합니다. 일부 오류는\n"
+"'fix' 옵션을 통해 자동으로 수정될 수 있습니다.\n"
+"\n"
+"예: nmcli> verify\n"
+"          nmcli> verify fix\n"
+"          nmcli bond> verify\n"
 
-#: ../clients/cli/connections.c:5859
+#: ../clients/cli/connections.c:8193
 #, c-format
 msgid ""
 "activate [<ifname>] [/<ap>|<nsp>]  :: activate the connection\n"
@@ -2499,29 +2975,24 @@ msgstr ""
 "\n"
 "사용 가능한 옵션:\n"
 "<ifname>    - /<ap>|<nsp> - AP (Wi-Fi) 또는 NSP (WiMAX)에서 \n"
-"연결이 활성화될 장치 (prepend with / when <ifname>이 지정되어 있지 않을 경"
-"우 /를 선두에 붙임)\n"
+"연결이 활성화될 장치 (prepend with / when <ifname>이 지정되어 있지 않을 경우 /를 선두에 붙임)\n"
 
-#: ../clients/cli/connections.c:5866 ../clients/cli/connections.c:6025
+#: ../clients/cli/connections.c:8200 ../clients/cli/connections.c:8359
 #, c-format
-msgid ""
-"back  :: go to upper menu level\n"
+msgid "back  :: go to upper menu level\n"
 "\n"
-msgstr ""
-"back  :: 위의 메뉴 레벨로 이동\n"
+msgstr "back  :: 위의 메뉴 레벨로 이동\n"
 "\n"
 
-#: ../clients/cli/connections.c:5869
+#: ../clients/cli/connections.c:8203
 #, c-format
-msgid ""
-"help/? [<command>]  :: help for the nmcli commands\n"
+msgid "help/? [<command>]  :: help for the nmcli commands\n"
 "\n"
-msgstr ""
-"help/? [<command>]  :: nmcli 명령 도움말\n"
+msgstr "help/? [<command>]  :: nmcli 명령 도움말\n"
 "\n"
 
-#: ../clients/cli/connections.c:5872
-#, fuzzy, c-format
+#: ../clients/cli/connections.c:8206
+#, c-format
 msgid ""
 "nmcli [<conf-option> <value>]  :: nmcli configuration\n"
 "\n"
@@ -2535,18 +3006,19 @@ msgid ""
 "          nmcli> nmcli save-confirmation no\n"
 "          nmcli> nmcli prompt-color 3\n"
 msgstr ""
-"nmcli [<conf-option> <value>]  :: nmcli 설정\n"
+"nmcli [<conf-option> <value>]  :: nmcli 구성\n"
 "\n"
-"nmcli를 설정합니다. 다음과 같은 옵션을 사용할 수 있습니다:\n"
-"status-line yes | no        [기본값: no]\n"
-"save-confirmation yes | no  [기본값: yes]\n"
-"prompt-color <0-8>          [기본값: 0]\n"
+"nmcli를 구성합니다. 다음과 같은 옵션을 사용할 수 있습니다.\n"
+"status-line yes | no          [default: no]\n"
+"save-confirmation yes | no    [default: yes]\n"
+"show-secrets yes | no         [default: no]\n"
+"prompt-color <color> | <0-8>  [default: 0]\n"
 "%s\n"
 "예: nmcli> nmcli status-line yes\n"
 "          nmcli> nmcli save-confirmation no\n"
 "          nmcli> nmcli prompt-color 3\n"
 
-#: ../clients/cli/connections.c:5894 ../clients/cli/connections.c:6031
+#: ../clients/cli/connections.c:8228 ../clients/cli/connections.c:8365
 #, c-format
 msgid ""
 "quit  :: exit nmcli\n"
@@ -2556,19 +3028,18 @@ msgid ""
 msgstr ""
 "quit  :: nmcli 종료\n"
 "\n"
-"이 명령은 nmcli를 종료합니다. 편집된 연결을 저장하지 않으면 사용자에게 확인"
-"이 요구됩니다.\n"
+"이 명령은 nmcli를 종료합니다. 편집된 연결을 저장하지 않으면 사용자에게 확인이 요구됩니다.\n"
 
-#: ../clients/cli/connections.c:5899 ../clients/cli/connections.c:6036
-#: ../clients/cli/connections.c:6460 ../clients/cli/connections.c:7407
+#: ../clients/cli/connections.c:8233 ../clients/cli/connections.c:8370
+#: ../clients/cli/connections.c:8794 ../clients/cli/connections.c:9742
 #, c-format
 msgid "Unknown command: '%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:5965
+#. 
+#: ../clients/cli/connections.c:8299
 #, c-format
 msgid ""
 "---[ Property menu ]---\n"
@@ -2594,19 +3065,18 @@ msgstr ""
 "help/?[<command>]           :: 이 도움말 또는 명령의 상세 정보 출력\n"
 "quit          :: nmcli 종료\n"
 
-#: ../clients/cli/connections.c:5990
+#: ../clients/cli/connections.c:8324
 #, c-format
 msgid ""
 "set [<value>]  :: set new value\n"
 "\n"
 "This command sets provided <value> to this property\n"
-msgstr ""
-"set [<value>]  :: 새로운 값을 설정\n"
+msgstr "set [<value>]  :: 새로운 값을 설정\n"
 "\n"
 "이 명령은 속성에 지정된 <value>를 설정합니다\n"
 
-#: ../clients/cli/connections.c:5994
-#, fuzzy, c-format
+#: ../clients/cli/connections.c:8328
+#, c-format
 msgid ""
 "add [<value>]  :: append new value to the property\n"
 "\n"
@@ -2614,23 +3084,22 @@ msgid ""
 "container type. For single-valued properties the property value is replaced "
 "(same as 'set').\n"
 msgstr ""
-"add [<value>]  :: 속성에 새 옵션 추가\n"
+"[<값>] 추가 :: 속성에 새 값 추가\n"
 "\n"
-"속성이 컨테이너 유형일 경우 이 명령은 속성에 지정된 <value>를 추가합니다. 단"
-"일 값 속성의 경우 이는 값을 대체합니다 ('set'과 동일).\n"
+"이 명령은 속성이 컨테이너 유형인 경우 제공된 <값>을 이 속성에 추가합니다.단일 값 속성에 대해 속성 값이 교체됩니다.('set'와 "
+"동일).\n"
 
-#: ../clients/cli/connections.c:6000
+#: ../clients/cli/connections.c:8334
 #, c-format
 msgid ""
 "change  :: change current value\n"
 "\n"
 "Displays current value and allows editing it.\n"
-msgstr ""
-"change  :: 현재 값 변경\n"
+msgstr "change  :: 현재 값 변경\n"
 "\n"
 "현재 값을 표시하고 이를 편집할 수 있습니다.\n"
 
-#: ../clients/cli/connections.c:6004
+#: ../clients/cli/connections.c:8338
 #, c-format
 msgid ""
 "remove [<value>|<index>|<option name>]  :: delete the value\n"
@@ -2649,8 +3118,20 @@ msgid ""
 "          nmcli bond.options> remove downdelay\n"
 "\n"
 msgstr ""
+"remove [<값>|<인덱스>|<옵션 이름>]  :: 값 삭제\n"
+"\n"
+"속성 값을 제거합니다. 단일 값 속성의 경우 속성을\n"
+"기본값으로 다시 설정합니다. 컨테이너 유형 속성의 경우 해당 속성의\n"
+"모든 값을 제거하거나 인수를 지정하여\n"
+"단일 항목이나 옵션만 제거할 수 있습니다. 인수는 제거할 항목의\n"
+"값 또는 인덱스이거나 옵션 이름(옵션 이름이 지정된 속성의 경우)입니다.\n"
+"\n"
+"예: nmcli ipv4.dns> remove 8.8.8.8\n"
+"          nmcli ipv4.dns> remove 2\n"
+"          nmcli bond.options> remove downdelay\n"
+"\n"
 
-#: ../clients/cli/connections.c:6015
+#: ../clients/cli/connections.c:8349
 #, c-format
 msgid ""
 "describe  :: describe property\n"
@@ -2660,10 +3141,9 @@ msgid ""
 msgstr ""
 "describe  :: 속성 설명\n"
 "\n"
-"속성 설명을 표시합니다. NM 설정 및 속성에 대한 자세한 설명은 nm-settings(5) "
-"man 페이지에서 참조하십시오.\n"
+"속성 설명을 표시합니다. NM 설정 및 속성에 대한 자세한 설명은 nm-settings(5) man 페이지에서 참조하십시오.\n"
 
-#: ../clients/cli/connections.c:6020
+#: ../clients/cli/connections.c:8354
 #, c-format
 msgid ""
 "print [property|setting|connection]  :: print property (setting, connection) "
@@ -2674,579 +3154,551 @@ msgid ""
 msgstr ""
 "print [property|setting|connection]  :: 속성 (설정, 연결) 값 출력\n"
 "\n"
-"속성 값을 표시합니다. 인수를 지정하여 전체 설정 또는 연결에 대한 값을 표시할 "
-"수 있습니다.\n"
+"속성 값을 표시합니다. 인수를 지정하여 전체 설정 또는 연결에 대한 값을 표시할 수 있습니다.\n"
 
-#: ../clients/cli/connections.c:6028
+#: ../clients/cli/connections.c:8362
 #, c-format
-msgid ""
-"help/? [<command>]  :: help for nmcli commands\n"
+msgid "help/? [<command>]  :: help for nmcli commands\n"
 "\n"
-msgstr ""
-"help/? [<command>]  :: nmcli 명령 도움말\n"
+msgstr "help/? [<command>]  :: nmcli 명령 도움말\n"
 "\n"
 
-#: ../clients/cli/connections.c:6209
+#: ../clients/cli/connections.c:8460
+#, c-format
+msgid "Error: Connection activation failed.\n"
+msgstr "오류: 연결 활성화에 실패했습니다.\n"
+
+#: ../clients/cli/connections.c:8543
 #, 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:6227
-#, fuzzy, c-format
+#: ../clients/cli/connections.c:8561
+#, c-format
 msgid "[ Type: %s | Name: %s | UUID: %s | Dirty: %s | Temp: %s ]\n"
-msgstr "[ Connection type: %s | name: %s | UUID: %s | dirty: %s ]\n"
+msgstr "[ Type: %s | Name: %s | UUID: %s | Dirty: %s | Temp: %s ]\n"
 
-#: ../clients/cli/connections.c:6263
-#, fuzzy, c-format
+#: ../clients/cli/connections.c:8597
+#, c-format
 msgid "The connection is not saved. Do you really want to quit? %s"
-msgstr "연결이 저장되지 않았습니다. 정말로 종료하시겠습니까? [y/n]\n"
+msgstr "연결이 저장되지 않았습니다. 정말로 종료하시겠습니까? %s"
 
-#: ../clients/cli/connections.c:6312
+#: ../clients/cli/connections.c:8646
 #, 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"
+msgstr "연결 프로파일이 다른 클라이언트에서 삭제되었습니다. 메인 메뉴에서 'save'를 입력하면 이를 복구할 수 있습니다.\n"
 
-#: ../clients/cli/connections.c:6337 ../clients/cli/connections.c:6758
-#: ../clients/cli/connections.c:6816
+#: ../clients/cli/connections.c:8671 ../clients/cli/connections.c:9093
+#: ../clients/cli/connections.c:9151
 #, c-format
 msgid "Allowed values for '%s' property: %s\n"
 msgstr "'%s' 속성에 대해 허용되는 값: %s\n"
 
-#: ../clients/cli/connections.c:6341 ../clients/cli/connections.c:6762
-#: ../clients/cli/connections.c:6820
+#: ../clients/cli/connections.c:8675 ../clients/cli/connections.c:9097
+#: ../clients/cli/connections.c:9155
 #, c-format
 msgid "Enter '%s' value: "
 msgstr "'%s' 값 입력: "
 
-#: ../clients/cli/connections.c:6356 ../clients/cli/connections.c:6378
-#: ../clients/cli/connections.c:6766 ../clients/cli/connections.c:6825
+#: ../clients/cli/connections.c:8690 ../clients/cli/connections.c:8712
+#: ../clients/cli/connections.c:9101 ../clients/cli/connections.c:9160
 #, c-format
 msgid "Error: failed to set '%s' property: %s\n"
 msgstr "오류: '%s' 속성을 설정하는데 실패했습니다: %s\n"
 
-#: ../clients/cli/connections.c:6372
+#: ../clients/cli/connections.c:8706
 #, c-format
 msgid "Edit '%s' value: "
 msgstr "'%s' 값 편집: "
 
-#: ../clients/cli/connections.c:6401
+#: ../clients/cli/connections.c:8735
 #, c-format
 msgid "Error: %s\n"
 msgstr "오류: %s\n"
 
-#: ../clients/cli/connections.c:6407 ../clients/cli/connections.c:6907
-#: ../clients/cli/connections.c:6955
+#: ../clients/cli/connections.c:8741 ../clients/cli/connections.c:9242
+#: ../clients/cli/connections.c:9290
 #, c-format
 msgid "Error: failed to remove value of '%s': %s\n"
 msgstr "오류: '%s' 값을 삭제하는데 실패했습니다: %s\n"
 
-#: ../clients/cli/connections.c:6428
+#: ../clients/cli/connections.c:8762
 #, c-format
 msgid "Unknown command argument: '%s'\n"
 msgstr "알 수 없는 명령 인수: '%s'\n"
 
-#: ../clients/cli/connections.c:6533
+#: ../clients/cli/connections.c:8867
 #, c-format
 msgid "Available settings: %s\n"
 msgstr "사용 가능한 설정: %s\n"
 
-#: ../clients/cli/connections.c:6545
+#: ../clients/cli/connections.c:8879
 #, c-format
 msgid "Error: invalid setting name; %s\n"
 msgstr "오류: 잘못된 설정 이름; %s\n"
 
-#: ../clients/cli/connections.c:6562
+#: ../clients/cli/connections.c:8896
 #, c-format
 msgid "Available properties: %s\n"
 msgstr "사용 가능한 속성: %s\n"
 
-#: ../clients/cli/connections.c:6570
+#: ../clients/cli/connections.c:8904
 #, c-format
 msgid "Error: property %s\n"
 msgstr "오류: 속성 %s\n"
 
-#: ../clients/cli/connections.c:6611
-#, fuzzy, c-format
+#: ../clients/cli/connections.c:8945
+#, 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"
-"정말로 저장하시겠습니까? [예]"
+"연결을 'autoconnect=yes'로 저장합니다.이로 인해 연결이 즉시 활성화될 수 있습니다.\n"
+"그래도 저장하시겠습니까? %s"
 
-#: ../clients/cli/connections.c:6700
+#: ../clients/cli/connections.c:9035
 #, c-format
 msgid "You may edit the following settings: %s\n"
 msgstr "다음 설정을 편집할 수 있습니다: %s\n"
 
-#: ../clients/cli/connections.c:6728
+#: ../clients/cli/connections.c:9063
 #, 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:6770 ../clients/cli/connections.c:7000
+#: ../clients/cli/connections.c:9105 ../clients/cli/connections.c:9335
 #, c-format
 msgid "Error: no setting selected; valid are [%s]\n"
 msgstr "오류: 설정이 선택되어 있지 않습니다; 유효한 설정은 [%s]입니다\n"
 
-#: ../clients/cli/connections.c:6771
+#: ../clients/cli/connections.c:9106
 #, c-format
 msgid "use 'goto <setting>' first, or 'set <setting>.<property>'\n"
-msgstr ""
-"'goto <setting>'를 먼저 사용하거나 'set <setting>.<property>'를 사용합니다.\n"
+msgstr "'goto <setting>'를 먼저 사용하거나 'set <setting>.<property>'를 사용합니다.\n"
 
-#: ../clients/cli/connections.c:6785 ../clients/cli/connections.c:6934
-#: ../clients/cli/connections.c:7022
+#: ../clients/cli/connections.c:9120 ../clients/cli/connections.c:9269
+#: ../clients/cli/connections.c:9357
 #, c-format
 msgid "Error: invalid setting argument '%s'; valid are [%s]\n"
 msgstr "오류: 잘못된 설정 인수 '%s'; 올바른 인수는 [%s]입니다\n"
 
-#: ../clients/cli/connections.c:6795
+#: ../clients/cli/connections.c:9130
 #, c-format
 msgid "Error: missing setting for '%s' property\n"
 msgstr "오류: '%s' 속성 설정이 누락되어 있음\n"
 
-#: ../clients/cli/connections.c:6802
+#: ../clients/cli/connections.c:9137
 #, c-format
 msgid "Error: invalid property: %s\n"
 msgstr "오류: 잘못된 속성: %s\n"
 
-#: ../clients/cli/connections.c:6855
+#: ../clients/cli/connections.c:9190
 #, c-format
 msgid "Error: unknown setting '%s'\n"
 msgstr "오류: 알 수 없는 설정 '%s'\n"
 
-#: ../clients/cli/connections.c:6868
+#: ../clients/cli/connections.c:9203
 #, c-format
 msgid "You may edit the following properties: %s\n"
 msgstr "다음 속성을 편집할 수 있습니다: %s\n"
 
-#: ../clients/cli/connections.c:6912
+#: ../clients/cli/connections.c:9247
 #, c-format
 msgid "Error: no argument given; valid are [%s]\n"
 msgstr "오류: 인수가 지정되어 있지 않습니다; 올바른 인수는 [%s]입니다\n"
 
-#: ../clients/cli/connections.c:6931
+#: ../clients/cli/connections.c:9266
 #, c-format
 msgid "Setting '%s' is not present in the connection.\n"
 msgstr "연결에 설정 '%s'이 없습니다.\n"
 
-#: ../clients/cli/connections.c:6976
+#: ../clients/cli/connections.c:9311
 #, c-format
 msgid "Error: %s properties, nor it is a setting name.\n"
 msgstr "오류: %s 속성, 설정 이름이 아닙니다.\n"
 
-#: ../clients/cli/connections.c:7001
+#: ../clients/cli/connections.c:9336
 #, c-format
 msgid "use 'goto <setting>' first, or 'describe <setting>.<property>'\n"
-msgstr ""
-"'goto <setting>'를 먼저 사용하거나 'describe <setting>.<property>'를 사용합니"
-"다.\n"
+msgstr "'goto <setting>'를 먼저 사용하거나 'describe <setting>.<property>'를 사용합니다.\n"
 
-#: ../clients/cli/connections.c:7050
+#: ../clients/cli/connections.c:9385
 #, c-format
 msgid "Error: invalid property: %s, neither a valid setting name.\n"
 msgstr "오류: 잘못된 속성: %s, 올바른 설정 이름이 아닙니다.\n"
 
-#: ../clients/cli/connections.c:7082
+#: ../clients/cli/connections.c:9417
 #, c-format
 msgid "Error: unknown setting: '%s'\n"
 msgstr "오류: 알 수 없는 설정: '%s'\n"
 
-#: ../clients/cli/connections.c:7087
-#, fuzzy, c-format
+#: ../clients/cli/connections.c:9422
+#, c-format
 msgid "Error: '%s' setting not present in the connection\n"
-msgstr "연결에 설정 '%s'이 없습니다.\n"
+msgstr "오류: '%s' 설정이 연결에 없습니다.\n"
 
-#: ../clients/cli/connections.c:7115
-#, fuzzy, c-format
+#: ../clients/cli/connections.c:9450
+#, c-format
 msgid "Error: invalid property: %s%s\n"
-msgstr "오류: 잘못된 속성: %s\n"
+msgstr "오류: 잘못된 속성: %s%s\n"
 
-#: ../clients/cli/connections.c:7117
-#, fuzzy
+#: ../clients/cli/connections.c:9452
 msgid ", neither a valid setting name"
-msgstr "오류: 잘못된 속성: %s, 올바른 설정 이름이 아닙니다.\n"
+msgstr ", 유효한 설정 이름이 아닙니다."
 
-#: ../clients/cli/connections.c:7134
-#, fuzzy, c-format
+#: ../clients/cli/connections.c:9469
+#, c-format
 msgid "Invalid verify option: %s\n"
-msgstr "잘못된 옵션 '%s'"
+msgstr "잘못된 확인 옵션: %s\n"
 
-#: ../clients/cli/connections.c:7142
+#: ../clients/cli/connections.c:9477
 #, c-format
 msgid "Verify setting '%s': %s\n"
 msgstr "'%s' 설정 확인: %s\n"
 
-#: ../clients/cli/connections.c:7157
+#: ../clients/cli/connections.c:9492
 #, c-format
 msgid "Verify connection: %s\n"
 msgstr "연결 확인: %s\n"
 
-#: ../clients/cli/connections.c:7160
+#: ../clients/cli/connections.c:9495
 #, c-format
 msgid "The error cannot be fixed automatically.\n"
-msgstr ""
+msgstr "오류를 자동으로 수정할 수 없습니다.\n"
 
-#: ../clients/cli/connections.c:7177
-#, fuzzy, c-format
+#: ../clients/cli/connections.c:9512
+#, c-format
 msgid "Error: invalid argument '%s'\n"
-msgstr "오류: 잘못된 추가 인수 '%s'입니다."
+msgstr "오류: 잘못된 인수 '%s'\n"
 
-#: ../clients/cli/connections.c:7210
-#, fuzzy, c-format
+#: ../clients/cli/connections.c:9545
+#, c-format
 msgid "Error: Failed to save '%s' (%s) connection: %s\n"
-msgstr "오류: '%s' (%s) 연결을 저장하는데 실패했습니다: (%d) %s\n"
+msgstr "오류: '%s'(%s) 연결 저장 실패: %s\n"
 
-#: ../clients/cli/connections.c:7217
+#: ../clients/cli/connections.c:9552
 #, c-format
 msgid "Connection '%s' (%s) successfully saved.\n"
 msgstr "연결 '%s' (%s)이 성공적으로 저장되었습니다.\n"
 
-#: ../clients/cli/connections.c:7218
-#, fuzzy, c-format
+#: ../clients/cli/connections.c:9553
+#, c-format
 msgid "Connection '%s' (%s) successfully updated.\n"
-msgstr "연결 '%s' (%s)이 성공적으로 추가되었습니다.\n"
+msgstr "연결 '%s'(%s)이(가) 성공적으로 업데이트되었습니다.\n"
 
-#: ../clients/cli/connections.c:7251
+#: ../clients/cli/connections.c:9586
 #, c-format
 msgid "Error: connection verification failed: %s\n"
 msgstr "오류: 연결 확인에 실패했습니다: %s\n"
 
-#: ../clients/cli/connections.c:7252
+#: ../clients/cli/connections.c:9587
 msgid "(unknown error)"
 msgstr "(알 수 없는 오류)"
 
-#: ../clients/cli/connections.c:7253
+#: ../clients/cli/connections.c:9588
 #, c-format
 msgid "You may try running 'verify fix' to fix errors.\n"
-msgstr ""
+msgstr "오류를 수정하려면 'verify fix'를 실행해 볼 수 있습니다.\n"
 
-#: ../clients/cli/connections.c:7275
+#: ../clients/cli/connections.c:9610
 #, c-format
 msgid "Error: connection is not saved. Type 'save' first.\n"
 msgstr "오류: 연결이 저장되어 있지 않습니다. 먼저 'save'를 입력합니다.\n"
 
-#: ../clients/cli/connections.c:7279
+#: ../clients/cli/connections.c:9614
 #, c-format
 msgid "Error: connection is not valid: %s\n"
 msgstr "오류: 연결이 올바르지 않습니다: %s\n"
 
-#: ../clients/cli/connections.c:7289
+#: ../clients/cli/connections.c:9624
 #, c-format
 msgid "Error: Cannot activate connection: %s.\n"
 msgstr "오류: 연결을 활성화할 수 없음: %s.\n"
 
-#: ../clients/cli/connections.c:7299
-#, fuzzy, c-format
+#: ../clients/cli/connections.c:9634
+#, c-format
 msgid "Error: Failed to activate '%s' (%s) connection: %s\n"
-msgstr "오류: '%s' (%s) 연결 활성화에 실패했습니다: (%d) %s\n"
+msgstr "오류: '%s'(%s) 연결 활성화 실패: %s\n"
 
-#: ../clients/cli/connections.c:7305
+#: ../clients/cli/connections.c:9640
 #, c-format
 msgid "Monitoring connection activation (press any key to continue)\n"
 msgstr "모니터링 연결 활성화 (아무키나 눌러 계속 진행합니다)\n"
 
-#: ../clients/cli/connections.c:7343
+#: ../clients/cli/connections.c:9678
 #, c-format
 msgid "Error: status-line: %s\n"
 msgstr "오류: status-line: %s\n"
 
-#: ../clients/cli/connections.c:7351
+#: ../clients/cli/connections.c:9686
 #, c-format
 msgid "Error: save-confirmation: %s\n"
 msgstr "오류: save-confirmation: %s\n"
 
-#: ../clients/cli/connections.c:7359
-#, fuzzy, c-format
+#: ../clients/cli/connections.c:9694
+#, c-format
 msgid "Error: show-secrets: %s\n"
-msgstr "오류: 'show active': %s"
+msgstr "오류: show-secrets: %s\n"
 
-#: ../clients/cli/connections.c:7368
-#, fuzzy, c-format
+#: ../clients/cli/connections.c:9703
+#, c-format
 msgid "Error: bad color: %s\n"
-msgstr "오류: 잘못된 속성: %s\n"
+msgstr "오류: 색 오류: %s\n"
 
-#: ../clients/cli/connections.c:7382
+#: ../clients/cli/connections.c:9717
 #, c-format
 msgid "Current nmcli configuration:\n"
 msgstr "현재 nmcli 설정:\n"
 
-#: ../clients/cli/connections.c:7392
+#: ../clients/cli/connections.c:9727
 #, c-format
 msgid "Invalid configuration option '%s'; allowed [%s]\n"
 msgstr "잘못된 설정 옵션 '%s'; [%s] 허용됨\n"
 
-#: ../clients/cli/connections.c:7593
+#: ../clients/cli/connections.c:9982
 #, c-format
 msgid "Error: only one of 'id', uuid, or 'path' can be provided."
 msgstr "오류: 'id', uuid, 'path' 중 하나만 지정할 수 있습니다."
 
-#: ../clients/cli/connections.c:7605 ../clients/cli/connections.c:7788
-#: ../clients/cli/connections.c:7795 ../clients/cli/connections.c:7929
-#: ../clients/cli/connections.c:8434
+#: ../clients/cli/connections.c:9994 ../clients/cli/connections.c:10171
+#: ../clients/cli/connections.c:10178 ../clients/cli/connections.c:10306
+#: ../clients/cli/connections.c:10782
 #, c-format
 msgid "Error: Unknown connection '%s'."
 msgstr "오류: 알 수 없는 연결 '%s'."
 
-#: ../clients/cli/connections.c:7623
+#: ../clients/cli/connections.c:10012
 #, c-format
 msgid "Warning: editing existing connection '%s'; 'type' argument is ignored\n"
 msgstr "경고: 기존 연결 '%s'을 편집하는 중입니다; 'type' 인수를 무시합니다\n"
 
-#: ../clients/cli/connections.c:7626
+#: ../clients/cli/connections.c:10015
 #, 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:7640
+#: ../clients/cli/connections.c:10029
 #, c-format
 msgid "Valid connection types: %s\n"
 msgstr "올바른 연결 유형: %s\n"
 
-#: ../clients/cli/connections.c:7642
+#: ../clients/cli/connections.c:10031
 #, c-format
 msgid "Error: invalid connection type; %s\n"
 msgstr "오류: 잘못된 연결 유형; %s\n"
 
-#: ../clients/cli/connections.c:7681
+#: ../clients/cli/connections.c:10070
 #, c-format
 msgid "===| nmcli interactive connection editor |==="
 msgstr "===| nmcli 상호 대화식 연결 편집기 |==="
 
-#: ../clients/cli/connections.c:7684
+#: ../clients/cli/connections.c:10073
 #, c-format
 msgid "Editing existing '%s' connection: '%s'"
 msgstr "기존 '%s' 연결을 편집하는 중입니다: '%s'"
 
-#: ../clients/cli/connections.c:7686
+#: ../clients/cli/connections.c:10075
 #, c-format
 msgid "Adding a new '%s' connection"
 msgstr "새로운 '%s' 연결을 추가하고 있습니다 "
 
-#: ../clients/cli/connections.c:7688
+#: ../clients/cli/connections.c:10077
 #, c-format
 msgid "Type 'help' or '?' for available commands."
 msgstr "사용 가능한 명령을 보려면 'help' 또는 '?'를 입력합니다."
 
-#: ../clients/cli/connections.c:7690
+#: ../clients/cli/connections.c:10079
 #, c-format
 msgid "Type 'describe [<setting>.<prop>]' for detailed property description."
-msgstr ""
-"상세 속성 정보를 표시하려면 'describe [<setting>.<prop>]'를 입력합니다."
+msgstr "상세 속성 정보를 표시하려면 'describe [<setting>.<prop>]'를 입력합니다."
 
-#: ../clients/cli/connections.c:7728
-#, fuzzy, c-format
+#: ../clients/cli/connections.c:10117
+#, c-format
 msgid "Error: Failed to modify connection '%s': %s"
-msgstr "오류: 연결 '%s' 수정에 실패했습니다: (%d) %s"
+msgstr "오류: 연결 '%s' 수정 실패: %s"
 
-#: ../clients/cli/connections.c:7735
+#: ../clients/cli/connections.c:10124
 #, c-format
 msgid "Connection '%s' (%s) successfully modified.\n"
 msgstr "연결 '%s' (%s)이 성공적으로 추가되었습니다.\n"
 
-#.
-#. * TODO(?) complete "uuid", "path", "id" or connection name.
-#. * (if we ever will move this here from shell completion script)
-#. if (nmc->complete) {
-#. quit ();
-#.
-#: ../clients/cli/connections.c:7761 ../clients/cli/connections.c:7885
-#: ../clients/cli/connections.c:8280 ../clients/cli/connections.c:8399
+#: ../clients/cli/connections.c:10146 ../clients/cli/connections.c:10262
+#: ../clients/cli/connections.c:10639 ../clients/cli/connections.c:10747
 #, c-format
 msgid "Error: No arguments provided."
 msgstr "오류: 인수가 지정되어 있지 않습니다."
 
-#: ../clients/cli/connections.c:7847
+#: ../clients/cli/connections.c:10165 ../clients/cli/connections.c:10294
+#: ../clients/cli/connections.c:10776
+#, c-format
+msgid "Error: connection ID is missing."
+msgstr "오류: 연결 ID가 누락되어 있습니다."
+
+#: ../clients/cli/connections.c:10228
 #, c-format
 msgid "%s (%s) cloned as %s (%s).\n"
-msgstr ""
+msgstr "%s(%s)(이)가 %s(%s)(으)로 복제되었습니다.\n"
 
-#: ../clients/cli/connections.c:7883
-#, fuzzy
+#: ../clients/cli/connections.c:10260
 msgid "New connection name: "
-msgstr "새 연결 "
+msgstr "새 연결 이름: "
 
-#: ../clients/cli/connections.c:7904 ../clients/cli/connections.c:7922
-#, fuzzy, c-format
+#: ../clients/cli/connections.c:10281 ../clients/cli/connections.c:10299
+#, c-format
 msgid "Error: <new name> argument is missing."
-msgstr "오류: %s 인자가 없습니다."
+msgstr "오류: <new name> 인수가 누락되었습니다."
 
-#: ../clients/cli/connections.c:7910
-#, fuzzy, c-format
+#: ../clients/cli/connections.c:10287
+#, c-format
 msgid "Error: unexpected extra argument '%s'."
-msgstr "오류: 예상치 못한 인수 '%s'"
+msgstr "오류: 예상치 못한 추가 인수 '%s'."
 
-#: ../clients/cli/connections.c:7917 ../clients/cli/connections.c:8428
+#: ../clients/cli/connections.c:10356
 #, c-format
-msgid "Error: connection ID is missing."
-msgstr "오류: 연결 ID가 누락되어 있습니다."
-
-#: ../clients/cli/connections.c:7979
-#, fuzzy, c-format
 msgid "Error: not all connections deleted."
-msgstr "오류: 연결이 지정되어 있지 않습니다. "
+msgstr "오류: 일부 연결이 삭제되지 않았습니다."
 
-#: ../clients/cli/connections.c:7980
+#: ../clients/cli/connections.c:10357
 #, c-format
 msgid "Error: Connection deletion failed: %s"
 msgstr "오류: 연결 삭제에 실패했습니다: %s"
 
-#: ../clients/cli/connections.c:8046 ../clients/cli/connections.c:8179
-#, fuzzy, c-format
+#: ../clients/cli/connections.c:10419 ../clients/cli/connections.c:10547
+#, c-format
 msgid "Error: unknown connection '%s'\n"
-msgstr "오류: 알 수 없는 연결: %s\n"
+msgstr "오류: 알 수 없는 연결 '%s'\n"
 
-#: ../clients/cli/connections.c:8060
-#, fuzzy, c-format
+#: ../clients/cli/connections.c:10433
+#, c-format
 msgid "Error: no connection provided."
-msgstr "오류: 연결이 지정되어 있지 않습니다. "
+msgstr "오류: 연결이 제공되지 않았습니다."
 
 #. truncate trailing ", "
-#: ../clients/cli/connections.c:8085
+#: ../clients/cli/connections.c:10458
 #, c-format
 msgid "Error: cannot delete unknown connection(s): %s."
 msgstr "오류: 알 수 없는 연결을 삭제할 수 없습니다: %s."
 
-#: ../clients/cli/connections.c:8097
-#, fuzzy, c-format
+#: ../clients/cli/connections.c:10470
+#, c-format
 msgid "%s: connection profile changed\n"
-msgstr "연결 실패함"
+msgstr "%s: 연결 프로파일이 변경되었습니다.\n"
 
-#: ../clients/cli/connections.c:8123
-#, fuzzy, c-format
+#: ../clients/cli/connections.c:10496
+#, c-format
 msgid "%s: connection profile created\n"
-msgstr "연결 실패함"
+msgstr "%s: 연결 프로파일이 생성되었습니다.\n"
 
-#: ../clients/cli/connections.c:8132
-#, fuzzy, c-format
+#: ../clients/cli/connections.c:10505
+#, c-format
 msgid "%s: connection profile removed\n"
-msgstr "연결이 제거되었습니다"
+msgstr "%s: 연결 프로파일이 제거되었습니다.\n"
 
-#: ../clients/cli/connections.c:8180
-#, fuzzy, c-format
+#: ../clients/cli/connections.c:10548
+#, c-format
 msgid "Error: not all connections found."
-msgstr "오류: '%s'는 올바른 'connection' 명령이 아닙니다. "
+msgstr "오류: 일부 연결을 찾을 수 없습니다."
 
-#: ../clients/cli/connections.c:8205
-#, fuzzy, c-format
+#: ../clients/cli/connections.c:10571
+#, c-format
 msgid "Error: failed to reload connections: %s."
-msgstr "오류: '%s' 연결을 추가하는데 실패했습니다: (%d) %s"
+msgstr "오류: 연결 다시 불러오기 실패: %s."
 
-#: ../clients/cli/connections.c:8239
-#, fuzzy, c-format
+#: ../clients/cli/connections.c:10603
+#, c-format
 msgid "Error: failed to load connection: %s."
-msgstr "오류: '%s' 연결을 추가하는데 실패했습니다: (%d) %s"
+msgstr "오류: 연결 불러오기 실패: %s."
 
-#: ../clients/cli/connections.c:8247
+#: ../clients/cli/connections.c:10611
 #, c-format
 msgid "Could not load file '%s'\n"
 msgstr "파일 '%s'을 불러올 수 없습니다\n"
 
-#: ../clients/cli/connections.c:8256
-#, fuzzy
+#: ../clients/cli/connections.c:10620
 msgid "File to import: "
-msgstr "암호화에 실패했습니다: %d."
+msgstr "가져올 파일: "
 
-#: ../clients/cli/connections.c:8296
+#: ../clients/cli/connections.c:10655
 #, c-format
 msgid "Warning: 'type' already specified, ignoring extra one.\n"
-msgstr ""
+msgstr "경고: '유형'이 이미 지정되어 있어 추가 유형을 무시합니다.\n"
 
-#: ../clients/cli/connections.c:8307
+#: ../clients/cli/connections.c:10666
 #, c-format
 msgid "Warning: 'file' already specified, ignoring extra one.\n"
-msgstr ""
+msgstr "경고: '파일'이 이미 지정되어 있어 추가 파일을 무시합니다.\n"
 
-#: ../clients/cli/connections.c:8309
-#, fuzzy, c-format
+#: ../clients/cli/connections.c:10668
+#, c-format
 msgid "Unknown parameter: %s"
-msgstr "알려져있지 않은 매개변수입니다: %s\n"
+msgstr "알 수 없는 매개변수: %s"
 
-#: ../clients/cli/connections.c:8319
+#: ../clients/cli/connections.c:10683
 #, c-format
-msgid "Error: 'type' argument is required."
-msgstr "오류: 'type' 인수가 필요합니다. "
-
-#: ../clients/cli/connections.c:8324
-#, fuzzy, c-format
 msgid "Error: 'file' argument is required."
-msgstr "오류: 'ifname' 인수를 지정해야 합니다."
-
-#: ../clients/cli/connections.c:8331
-#, fuzzy, c-format
-msgid "Error: failed to find VPN plugin for %s."
-msgstr "오류: %s.%s 수정에 실패했습니다: %s."
+msgstr "오류: 'file' 인수가 필요합니다."
 
-#: ../clients/cli/connections.c:8339 ../clients/cli/connections.c:8450
-#, fuzzy, c-format
+#: ../clients/cli/connections.c:10691 ../clients/cli/connections.c:10798
+#, c-format
 msgid "Error: failed to load VPN plugin: %s."
-msgstr "오류: %s.%s 수정에 실패했습니다: %s."
+msgstr "오류: VPN 플러그인 불러오기 실패: %s."
 
-#: ../clients/cli/connections.c:8347
-#, fuzzy, c-format
+#: ../clients/cli/connections.c:10699
+#, c-format
 msgid "Error: failed to import '%s': %s."
-msgstr "오류: %s.%s 수정에 실패했습니다: %s."
+msgstr "오류: '%s' 가져오기 실패: %s."
 
-#: ../clients/cli/connections.c:8397
-#, fuzzy
+#: ../clients/cli/connections.c:10745
 msgid "Output file name: "
-msgstr "파일명"
+msgstr "출력 파일 이름: "
 
-#: ../clients/cli/connections.c:8421
-#, fuzzy, c-format
+#: ../clients/cli/connections.c:10769
+#, c-format
 msgid "Error: unknown extra argument: '%s'."
-msgstr "오류: 잘못된 추가 인수 '%s'입니다."
+msgstr "오류: 알 수 없는 추가 인수: '%s'."
 
-#: ../clients/cli/connections.c:8441
-#, fuzzy, c-format
+#: ../clients/cli/connections.c:10789
+#, c-format
 msgid "Error: the connection is not VPN."
-msgstr "오류: 연결이 올바르지 않습니다: %s\n"
+msgstr "오류: 연결이 VPN이 아닙니다."
 
-#: ../clients/cli/connections.c:8462
-#, fuzzy, c-format
+#: ../clients/cli/connections.c:10810
+#, c-format
 msgid "Error: failed to create temporary file %s."
-msgstr "임시 파일을 생성할 수 없음: %s"
+msgstr "오류: 임시 파일 %s을(를) 생성할 수 없습니다."
 
-#: ../clients/cli/connections.c:8471
-#, fuzzy, c-format
+#: ../clients/cli/connections.c:10819
+#, c-format
 msgid "Error: failed to export '%s': %s."
-msgstr "오류: '%s' 속성을 설정하는데 실패했습니다: %s\n"
+msgstr "오류: '%s' 내보내기 실패: %s."
 
-#: ../clients/cli/connections.c:8482
-#, fuzzy, c-format
+#: ../clients/cli/connections.c:10830
+#, c-format
 msgid "Error: failed to read temporary file '%s': %s."
-msgstr "오류: '%s' 값을 삭제하는데 실패했습니다: %s\n"
+msgstr "오류: 임시 파일 '%s' 읽기 실패: %s."
 
-#: ../clients/cli/connections.c:8628
+#: ../clients/cli/connections.c:10976
 #, c-format
 msgid "incorrect string '%s' of '--order' option"
-msgstr ""
+msgstr "'--order' 옵션의 문자열 '%s'이(가) 잘못되었습니다."
 
-#: ../clients/cli/connections.c:8654
+#: ../clients/cli/connections.c:11002
 #, c-format
 msgid "incorrect item '%s' in '--order' option"
-msgstr ""
+msgstr "'--order' 옵션의 항목 '%s'이(가) 잘못되었습니다."
 
-#: ../clients/cli/connections.c:8740
-#, fuzzy
+#: ../clients/cli/connections.c:11089
 msgid "'--order' argument is missing"
-msgstr "오류: %s 인자가 없습니다."
+msgstr "'--order' 인수가 누락되었습니다."
 
-#: ../clients/cli/connections.c:8816
+#: ../clients/cli/connections.c:11154
 #, c-format
 msgid "Error: '%s' is not valid 'connection' command."
 msgstr "오류: '%s'는 올바른 'connection' 명령이 아닙니다. "
@@ -3257,7 +3709,6 @@ msgid "Interface: "
 msgstr "인터페이스: "
 
 #: ../clients/cli/devices.c:36
-#, fuzzy
 msgid "Interface(s): "
 msgstr "인터페이스: "
 
@@ -3275,9 +3726,8 @@ msgstr "CON-UUID"
 
 #. 2
 #: ../clients/cli/devices.c:58
-#, fuzzy
 msgid "NM-TYPE"
-msgstr "유형"
+msgstr "NM 유형"
 
 #. 3
 #: ../clients/cli/devices.c:59
@@ -3335,7 +3785,7 @@ msgstr "IP-IFACE"
 #. 2
 #: ../clients/cli/devices.c:70 ../clients/cli/devices.c:102
 msgid "IS-SOFTWARE"
-msgstr ""
+msgstr "IS-SOFTWARE"
 
 #. 15
 #: ../clients/cli/devices.c:71
@@ -3350,17 +3800,17 @@ msgstr "펌웨어 없음"
 #. 18
 #: ../clients/cli/devices.c:74
 msgid "NM-PLUGIN-MISSING"
-msgstr ""
+msgstr "NM 플러그인 누락"
 
 #. 19
 #: ../clients/cli/devices.c:75
 msgid "PHYS-PORT-ID"
-msgstr ""
+msgstr "PHYS 포트 ID"
 
 #. 23
 #: ../clients/cli/devices.c:79
 msgid "METERED"
-msgstr ""
+msgstr "측정됨"
 
 #. 0
 #: ../clients/cli/devices.c:90
@@ -3390,10 +3840,10 @@ msgstr "캐리어"
 #. 1
 #: ../clients/cli/devices.c:112
 msgid "S390-SUBCHANNELS"
-msgstr ""
+msgstr "S390-SUBCHANNELS"
 
 #. 0
-#: ../clients/cli/devices.c:121 ../clients/cli/devices.c:741
+#: ../clients/cli/devices.c:121 ../clients/cli/devices.c:731
 msgid "WEP"
 msgstr "WEP"
 
@@ -3403,7 +3853,7 @@ msgid "WPA"
 msgstr "WPA"
 
 #. 2
-#: ../clients/cli/devices.c:123 ../clients/cli/devices.c:749
+#: ../clients/cli/devices.c:123 ../clients/cli/devices.c:739
 msgid "WPA2"
 msgstr "WPA2"
 
@@ -3419,7 +3869,7 @@ msgstr "CCMP"
 
 #. 5
 #. 2
-#: ../clients/cli/devices.c:126 ../clients/cli/devices.c:238
+#: ../clients/cli/devices.c:126 ../clients/cli/devices.c:228
 msgid "AP"
 msgstr "AP"
 
@@ -3431,12 +3881,12 @@ msgstr "ADHOC"
 #. 7
 #: ../clients/cli/devices.c:128
 msgid "2GHZ"
-msgstr ""
+msgstr "2GHZ"
 
 #. 8
 #: ../clients/cli/devices.c:129
 msgid "5GHZ"
-msgstr ""
+msgstr "5GHZ"
 
 #. 0
 #: ../clients/cli/devices.c:138
@@ -3463,6 +3913,11 @@ msgstr "TX-POW"
 msgid "BSID"
 msgstr "BSID"
 
+#. 0
+#: ../clients/cli/devices.c:151 ../clients/tui/nmt-page-wifi.c:224
+msgid "SSID"
+msgstr "SSID"
+
 #. 1
 #: ../clients/cli/devices.c:152
 msgid "SSID-HEX"
@@ -3526,157 +3981,142 @@ msgstr "*"
 
 #. 0
 #. 5
-#: ../clients/cli/devices.c:177 ../clients/cli/devices.c:241
+#: ../clients/cli/devices.c:177 ../clients/cli/devices.c:231
 msgid "NSP"
 msgstr "NSP"
 
 #. 0
-#: ../clients/cli/devices.c:192 ../clients/cli/devices.c:201
+#: ../clients/cli/devices.c:192
 msgid "SLAVES"
 msgstr "슬레이브 "
 
-#. 1
-#: ../clients/cli/devices.c:202
-msgid "CONFIG"
-msgstr ""
-
 #. 0
-#: ../clients/cli/devices.c:211
+#: ../clients/cli/devices.c:201
 msgid "PARENT"
-msgstr ""
+msgstr "부모"
 
 #. 1
-#: ../clients/cli/devices.c:212
+#: ../clients/cli/devices.c:202
 msgid "ID"
 msgstr "ID"
 
 #. 0
-#: ../clients/cli/devices.c:221 ../clients/cli/devices.c:236
+#: ../clients/cli/devices.c:211 ../clients/cli/devices.c:226
 msgid "CAPABILITIES"
 msgstr "기능"
 
 #. 1
-#: ../clients/cli/devices.c:237
+#: ../clients/cli/devices.c:227
 msgid "WIFI-PROPERTIES"
 msgstr "WIFI 속성"
 
 #. 3
-#: ../clients/cli/devices.c:239
+#: ../clients/cli/devices.c:229
 msgid "WIRED-PROPERTIES"
 msgstr "유선 속성"
 
 #. 4
-#: ../clients/cli/devices.c:240
+#: ../clients/cli/devices.c:230
 msgid "WIMAX-PROPERTIES"
 msgstr "WIMAX 속성"
 
 #. 10
-#: ../clients/cli/devices.c:246 ../clients/tui/nmt-page-bond.c:351
+#: ../clients/cli/devices.c:236 ../clients/tui/nmt-page-bond.c:351
 msgid "BOND"
 msgstr "본딩 "
 
 #. 11
-#: ../clients/cli/devices.c:247 ../clients/tui/nmt-page-team.c:145
+#: ../clients/cli/devices.c:237 ../clients/tui/nmt-page-team.c:145
 msgid "TEAM"
 msgstr "팀 "
 
 #. 12
-#: ../clients/cli/devices.c:248 ../clients/tui/nmt-page-bridge.c:74
+#: ../clients/cli/devices.c:238 ../clients/tui/nmt-page-bridge.c:74
 msgid "BRIDGE"
 msgstr "브릿지"
 
-#. 13
-#: ../clients/cli/devices.c:249 ../clients/tui/nm-editor-utils.c:217
-#: ../clients/tui/nmt-page-vlan.c:94 ../libnm-core/nm-connection.c:1746
-#: ../libnm-glib/nm-device.c:1879 ../libnm-util/nm-connection.c:1632
-#: ../libnm/nm-device.c:1830
-msgid "VLAN"
-msgstr "VLAN"
-
 #. 14
-#: ../clients/cli/devices.c:250
+#: ../clients/cli/devices.c:240
 msgid "BLUETOOTH"
-msgstr ""
+msgstr "블루투스"
 
 #. 15
-#: ../clients/cli/devices.c:251
+#: ../clients/cli/devices.c:241
 msgid "CONNECTIONS"
 msgstr "연결"
 
 #. 1
-#: ../clients/cli/devices.c:263
+#: ../clients/cli/devices.c:253
 msgid "CHASSIS-ID"
-msgstr ""
+msgstr "섀시 ID"
 
 #. 2
-#: ../clients/cli/devices.c:264
+#: ../clients/cli/devices.c:254
 msgid "PORT-ID"
-msgstr ""
+msgstr "포트 ID"
 
 #. 3
-#: ../clients/cli/devices.c:265
+#: ../clients/cli/devices.c:255
 msgid "PORT-DESCRIPTION"
-msgstr ""
+msgstr "포트 설명"
 
 #. 4
-#: ../clients/cli/devices.c:266
-#, fuzzy
+#: ../clients/cli/devices.c:256
 msgid "SYSTEM-NAME"
-msgstr "사용자 이름"
+msgstr "시스템 이름"
 
 #. 5
-#: ../clients/cli/devices.c:267
+#: ../clients/cli/devices.c:257
 msgid "SYSTEM-DESCRIPTION"
-msgstr ""
+msgstr "시스템 설명"
 
 #. 6
-#: ../clients/cli/devices.c:268
-#, fuzzy
+#: ../clients/cli/devices.c:258
 msgid "SYSTEM-CAPABILITIES"
-msgstr "기능"
+msgstr "시스템 기능"
 
 #. 7
-#: ../clients/cli/devices.c:269
+#: ../clients/cli/devices.c:259
 msgid "IEEE-802-1-PVID"
-msgstr ""
+msgstr "IEEE 802 1 PVID"
 
 #. 8
-#: ../clients/cli/devices.c:270
+#: ../clients/cli/devices.c:260
 msgid "IEEE-802-1-PPVID"
-msgstr ""
+msgstr "IEEE 802 1 PPVID"
 
 #. 9
-#: ../clients/cli/devices.c:271
+#: ../clients/cli/devices.c:261
 msgid "IEEE-802-1-PPVID-FLAGS"
-msgstr ""
+msgstr "IEEE 802 1 PPVID 플래그"
 
 #. 10
-#: ../clients/cli/devices.c:272
+#: ../clients/cli/devices.c:262
 msgid "IEEE-802-1-VID"
-msgstr ""
+msgstr "IEEE 802 1 VID"
 
 #. 11
-#: ../clients/cli/devices.c:273
+#: ../clients/cli/devices.c:263
 msgid "IEEE-802-1-VLAN-NAME"
-msgstr ""
+msgstr "IEEE 802 1 VLAN 이름"
 
 #. 12
-#: ../clients/cli/devices.c:274
+#: ../clients/cli/devices.c:264
 msgid "DESTINATION"
-msgstr ""
+msgstr "대상"
 
 #. 13
-#: ../clients/cli/devices.c:275
+#: ../clients/cli/devices.c:265
 msgid "CHASSIS-ID-TYPE"
-msgstr ""
+msgstr "섀시 ID 유형"
 
 #. 14
-#: ../clients/cli/devices.c:276
+#: ../clients/cli/devices.c:266
 msgid "PORT-ID-TYPE"
-msgstr ""
+msgstr "포트 ID 유형"
 
-#: ../clients/cli/devices.c:293
-#, fuzzy, c-format
+#: ../clients/cli/devices.c:283
+#, c-format
 msgid ""
 "Usage: nmcli device { COMMAND | help }\n"
 "\n"
@@ -3691,7 +4131,7 @@ msgid ""
 "\n"
 "  connect <ifname>\n"
 "\n"
-"  reapply <ifname>\n"
+"  reapply <ifname> ...\n"
 "\n"
 "  disconnect <ifname> ...\n"
 "\n"
@@ -3716,30 +4156,41 @@ msgid ""
 msgstr ""
 "사용법: nmcli device { 명령 | help }\n"
 "\n"
-"명령 := { status | show | connect | disconnect | wifi | wimax }\n"
-"\n"
-"명령 := { status | show | connect | disconnect | wifi }\n"
+"명령 := { status | show | connect | reapply | disconnect | delete | monitor | "
+"wifi | lldp }\n"
 "\n"
 "  status\n"
 "\n"
 "  show [<ifname>]\n"
 "\n"
+"  set [ifname] <ifname> [autoconnect yes|no] [managed yes|no]\n"
+"\n"
 "  connect <ifname>\n"
 "\n"
-"  disconnect <ifname>\n"
+"  reapply <ifname> ...\n"
+"\n"
+"  disconnect <ifname> ...\n"
+"\n"
+"  delete <ifname> ...\n"
+"\n"
+"  monitor <ifname> ...\n"
 "\n"
 "  wifi [list [ifname <ifname>] [bssid <BSSID>]]\n"
 "\n"
-"  wifi connect <(B)SSID> [암호 <password>] [wep-key-type key|phrase] [ifname "
+"  wifi connect <(B)SSID> [password <암호>] [wep-key-type key|phrase] [ifname "
 "<ifname>]\n"
-"                         [bssid <BSSID>] [이름 <name>] [private yes|no]\n"
+"                         [bssid <BSSID>] [name <이름>] [private yes|no] "
+"[hidden yes|no]\n"
+"\n"
+"  wifi hotspot [ifname <ifname>] [con-name <이름>] [ssid <SSID>] [band a|bg] "
+"[channel <채널>] [password <암호>]\n"
 "\n"
-"  wifi rescan [[ifname] <ifname>]\n"
+"  wifi rescan [ifname <ifname>] [[ssid <스캔할 SSID>] ...]\n"
 "\n"
-"  wimax [list [ifname <ifname>] [nsp <name>]]\n"
+"  lldp [list [ifname <ifname>]]\n"
 "\n"
 
-#: ../clients/cli/devices.c:315
+#: ../clients/cli/devices.c:305
 #, c-format
 msgid ""
 "Usage: nmcli device status { help }\n"
@@ -3750,10 +4201,8 @@ msgid ""
 " TYPE       - device type\n"
 " STATE      - device state\n"
 " CONNECTION - connection activated on device (if any)\n"
-"Displayed columns can be changed using '--fields' global option. 'status' "
-"is\n"
-"the default command, which means 'nmcli device' calls 'nmcli device "
-"status'.\n"
+"Displayed columns can be changed using '--fields' global option. 'status' is\n"
+"the default command, which means 'nmcli device' calls 'nmcli device status'.\n"
 "\n"
 msgstr ""
 "사용법: nmcli device status { help }\n"
@@ -3764,13 +4213,11 @@ msgstr ""
 " TYPE       - 장치 유형\n"
 " STATE      - 장치 상태\n"
 " CONNECTION - 장치에서 활성화된 연결 (있을 경우)\n"
-"'--fields' 글로벌 옵션을 사용하여 표시할 항목을 변경할 수 있습니다. "
-"'status'는\n"
-"기본 명령으로, 'nmcli device'를 실행하면 'nmcli device status'를 호출합니"
-"다.\n"
+"'--fields' 글로벌 옵션을 사용하여 표시할 항목을 변경할 수 있습니다. 'status'는\n"
+"기본 명령으로, 'nmcli device'를 실행하면 'nmcli device status'를 호출합니다.\n"
 "\n"
 
-#: ../clients/cli/devices.c:330
+#: ../clients/cli/devices.c:320
 #, c-format
 msgid ""
 "Usage: nmcli device show { ARGUMENTS | help }\n"
@@ -3789,7 +4236,7 @@ msgstr ""
 "이 명령은 모든 장치 또는 지정된 장치의 상세 정보를 표시합니다.\n"
 "\n"
 
-#: ../clients/cli/devices.c:341
+#: ../clients/cli/devices.c:331
 #, c-format
 msgid ""
 "Usage: nmcli device connect { ARGUMENTS | help }\n"
@@ -3797,8 +4244,8 @@ msgid ""
 "ARGUMENTS := <ifname>\n"
 "\n"
 "Connect the device.\n"
-"NetworkManager will try to find a suitable connection that will be "
-"activated.\n"
+"NetworkManager will try to find a suitable connection that will be activated."
+"\n"
 "It will also consider connections that are not set to auto-connect.\n"
 "\n"
 msgstr ""
@@ -3811,28 +4258,27 @@ msgstr ""
 "또한 자동 연결로 설정되지 않은 연결도 검색합니다.\n"
 "\n"
 
-#: ../clients/cli/devices.c:353
-#, fuzzy, c-format
+#: ../clients/cli/devices.c:343
+#, c-format
 msgid ""
 "Usage: nmcli device reapply { ARGUMENTS | help }\n"
 "\n"
-"ARGUMENTS := <ifname>\n"
+"ARGUMENTS := <ifname> ...\n"
 "\n"
 "Attempts to update device with changes to the currently active connection\n"
 "made since it was last applied.\n"
 "\n"
 msgstr ""
-"사용법: nmcli device disconnect { 인수 | help }\n"
+"사용법: nmcli device reapply { 인수 | help }\n"
 "\n"
-"인수 := <ifname>\n"
+"인수 := <ifname> ...\n"
 "\n"
-"장치 연결을 해제합니다.\n"
-"이 명령은 장치 연결을 해제하고 사용자/수동 작업없이\n"
-"자동 활성화에 의해 연결되지 않게 합니다.\n"
+"마지막 적용 이후 현재 활성인 연결에 대한 변경 사항으로\n"
+"장치를 업데이트하려는 시도가 있었습니다.\n"
 "\n"
 
-#: ../clients/cli/devices.c:364
-#, fuzzy, c-format
+#: ../clients/cli/devices.c:354
+#, c-format
 msgid ""
 "Usage: nmcli device disconnect { ARGUMENTS | help }\n"
 "\n"
@@ -3845,15 +4291,15 @@ msgid ""
 msgstr ""
 "사용법: nmcli device disconnect { 인수 | help }\n"
 "\n"
-"인수 := <ifname>\n"
+"ARGUMENTS := <ifname> ...\n"
 "\n"
-"장치 연결을 해제합니다.\n"
-"이 명령은 장치 연결을 해제하고 사용자/수동 작업없이\n"
-"자동 활성화에 의해 연결되지 않게 합니다.\n"
+"장치의 연결을 해제합니다.\n"
+"이 명령은 장치의 연결을 해제하며 사용자/수동 개입 없이\n"
+"추가 연결이 자동 활성화되지 않도록 합니다.\n"
 "\n"
 
-#: ../clients/cli/devices.c:376
-#, fuzzy, c-format
+#: ../clients/cli/devices.c:366
+#, c-format
 msgid ""
 "Usage: nmcli device delete { ARGUMENTS | help }\n"
 "\n"
@@ -3865,15 +4311,17 @@ msgid ""
 "command.\n"
 "\n"
 msgstr ""
-"사용법: nmcli device show { 인수 | help }\n"
+"사용법: nmcli device delete { 인수 | help }\n"
 "\n"
-"인수 := [<ifname>]\n"
+"인수 := <ifname> ...\n"
 "\n"
-"장치의 상세 정보를 표시합니다.\n"
-"이 명령은 모든 장치 또는 지정된 장치의 상세 정보를 표시합니다.\n"
+"소프트웨어 장치를 삭제합니다.\n"
+"이 명령은 인터페이스를 제거하며, 소프트웨어 장치(본딩, 브리지 등)에만\n"
+"적용됩니다. 하드웨어 장치는 이 명령으로 삭제할 수\n"
+"없습니다.\n"
 "\n"
 
-#: ../clients/cli/devices.c:389
+#: ../clients/cli/devices.c:379
 #, c-format
 msgid ""
 "Usage: nmcli device set { ARGUMENTS | help }\n"
@@ -3886,9 +4334,18 @@ msgid ""
 "Modify device properties.\n"
 "\n"
 msgstr ""
+"사용법: nmcli device set { 인수 | 도움말 }\n"
+"\n"
+"인수 := 장치 { 속성 [ PROPERTY ... ] }\n"
+"장치    := [ifname] <ifname> \n"
+"속성  := { 자동 연결 { 예 | 아니요 } |\n"
+"             { 관리 여부 { 예 | 아니요 }\n"
+"\n"
+"장치 속성을 수정합니다.\n"
+"\n"
 
-#: ../clients/cli/devices.c:402
-#, fuzzy, c-format
+#: ../clients/cli/devices.c:392
+#, c-format
 msgid ""
 "Usage: nmcli device monitor { ARGUMENTS | help }\n"
 "\n"
@@ -3899,16 +4356,17 @@ msgid ""
 "Monitors all devices in case no interface is specified.\n"
 "\n"
 msgstr ""
-"사용법: nmcli device show { 인수 | help }\n"
+"사용법: nmcli device monitor { 인수 | help }\n"
 "\n"
-"인수 := [<ifname>]\n"
+"인수 := [<ifname>] ...\n"
 "\n"
-"장치의 상세 정보를 표시합니다.\n"
-"이 명령은 모든 장치 또는 지정된 장치의 상세 정보를 표시합니다.\n"
+"장치 활동을 모니터링합니다.\n"
+"이 명령은 지정된 장치의 상태가 변경될 때마다 줄을 인쇄합니다.\n"
+"인터페이스가 지정되지 않은 경우 모든 장치를 모니터링합니다.\n"
 "\n"
 
-#: ../clients/cli/devices.c:414
-#, fuzzy, c-format
+#: ../clients/cli/devices.c:404
+#, c-format
 msgid ""
 "Usage: nmcli device wifi { ARGUMENTS | help }\n"
 "\n"
@@ -3919,8 +4377,8 @@ msgid ""
 "List available Wi-Fi access points. The 'ifname' and 'bssid' options can be\n"
 "used to list APs for a particular interface, or with a specific BSSID.\n"
 "\n"
-"ARGUMENTS := connect <(B)SSID> [password <password>] [wep-key-type key|"
-"phrase] [ifname <ifname>]\n"
+"ARGUMENTS := connect <(B)SSID> [password <password>] [wep-key-type "
+"key|phrase] [ifname <ifname>]\n"
 "                    [bssid <BSSID>] [name <name>] [private yes|no] [hidden "
 "yes|no]\n"
 "\n"
@@ -3949,10 +4407,8 @@ msgid ""
 "\n"
 "ARGUMENTS := rescan [ifname <ifname>] [[ssid <SSID to scan>] ...]\n"
 "\n"
-"Request that NetworkManager immediately re-scan for available access "
-"points.\n"
-"NetworkManager scans Wi-Fi networks periodically, but in some cases it "
-"might\n"
+"Request that NetworkManager immediately re-scan for available access points.\n"
+"NetworkManager scans Wi-Fi networks periodically, but in some cases it might\n"
 "be useful to start scanning manually. 'ssid' allows scanning for a specific\n"
 "SSID, which is useful for APs with hidden SSIDs. More 'ssid' parameters can "
 "be\n"
@@ -3962,567 +4418,566 @@ msgid ""
 msgstr ""
 "사용법: nmcli device wifi { 인수 | help }\n"
 "\n"
-"장치에서 작업을 수행합니다.\n"
+"Wi-Fi 장치에 대해 작업을 수행합니다.\n"
 "\n"
 "인수 := [list [ifname <ifname>] [bssid <BSSID>]]\n"
 "\n"
-"사용 가능한 Wi-Fi 액세스 포인트를 나열합니다. 'ifname' 및 'bssid' 옵션은 특"
-"정 인터페이스 또는 특정 BSSID를 갖는\n"
-"AP를 나열하는데 사용될 수 있습니다.\n"
+"사용 가능한 Wi-Fi 액세스 지점을 나열합니다. 'ifname' 및 'bssid' 옵션은\n"
+"특정 인터페이스에 대한 AP를 나열하는 데 사용하거나 특정 BSSID와 함께 사용할 수 있습니다.\n"
 "\n"
-"인수 := connect <(B)SSID> [암호 <password>] [wep-key-type key|phrase] "
-"[ifname <ifname>]\n"
-"                    [bssid <BSSID>] [이름 <name>] [private yes|no]\n"
-"\n"
-"SSID 또는 BSSID에서 지정한 Wi-Fi 네트워크에 연결합니다. 명령은 새로운 연결"
-"을\n"
-"생성하고 장치에 활성화합니다. 이 명령은 GUI 클라이언트에서 SSID를 클릭하는 것"
-"과\n"
-"동일하게 작동합니다. 이 명령은 항상 새로운 연결을 생성하므로 주로\n"
-"새로운 Wi-Fi 네트워크에 연결하는데 유용합니다.\n"
-"이미 네트워크에 연결이 존재하는 경우 nmcli con up id <name>을 사용하여 \n"
-"기존 프로파일을 가져오는 것이 좋습니다.\n"
-"현재 WEP 및 WPA-PSK 네트워크만 지원되고 있음에 유의하십시오.\n"
-"IP 설정은 DHCP를 통해 가져온것으로 간주합니다.\n"
-"\n"
-"인수 := rescan [[ifname] <ifname>]\n"
-"\n"
-"NetworkManager가 사용 가능한 액세스 포인트를 다시 검색할 것을 바로 요청합니"
-"다.\n"
-"NetworkManager는 정기적으로 Wi-Fi 네트워크를 검색하지만 경우에 따라\n"
-"수동으로 검색을 시작하는 것이 유용할 수 도 있습니다. 이 명령은 AP를 표시하지 "
-"않음에 유의하십시오.\n"
-"AP를 표시 할 경우 'nmcli device wifi list'를 사용합니다.\n"
-"\n"
-
-#: ../clients/cli/devices.c:461
-#, fuzzy, c-format
+"인수 := connect <(B)SSID> [password <암호>] [wep-key-type key|phrase] [ifname "
+"<ifname>]\n"
+"                    [bssid <BSSID>] [name <이름>] [private yes|no] [hidden "
+"yes|no]\n"
+"\n"
+"SSID 또는 BSSID에 의해 지정된 Wi-Fi 네트워크에 연결합니다. 이 명령은\n"
+"새 연결을 생성한 후 장치에서 이 연결을 활성화합니다. 이는 명령줄\n"
+"GUI 클라이언트에서 SSID 클릭의 명령줄 대응 항목입니다. 이 명령은 항상\n"
+"새 연결을 생성하며 이에 따라 새 Wi-Fi 네트워크에 연결하는 데 주로 유용합니다.\n"
+"네트워크에 대한 연결이 이미 존재하는 경우\n"
+"기존 프로파일을 다음과 같이 가져오는 것이 낫습니다. nmcli con up id <name>.\n"
+"현재는 열려 있을 때만 WEP 및 WPA-PSK 네트워크가 지원됩니다.\n"
+"또한, IP 구성이 DHCP를 통해 획득된 것이라고 가정합니다.\n"
+"\n"
+"인수 := wifi hotspot [ifname <ifname>] [con-name <이름>] [ssid <SSID>]\n"
+"                          [band a|bg] [channel <채널>] [password <암호>]\n"
+"\n"
+"Wi-Fi 핫스폿을 생성합니다. 'connection down' 또는 'device disconnect'를 사용하여\n"
+"핫스폿을 중지합니다.\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 <ifname>] [[ssid <스캔할 SSID>] ...]\n"
+"\n"
+"NetworkManager에서 사용 가능한 액세스 지점을 즉시 재스캔하도록 요청합니다.\n"
+"NetworkManager는 Wi-Fi 네트워크를 주기적으로 스캔하지만 일부 경우에는\n"
+"스캔을 수동으로 시작하는 것이 유용할 수 있습니다. 'ssid'를 통해 특정\n"
+"SSID를 스캔할 수 있으며 이는 숨겨진 SSID의 AP에 유용합니다. 더 많은 'ssid' 매개변수가제공될 수\n"
+"있습니다. 이 명령은 AP를 표시하지 않으며\n"
+"해당 항목에 대한 'nmcli device wifi list'를 사용합니다.\n"
+"\n"
+
+#: ../clients/cli/devices.c:451
+#, c-format
 msgid ""
 "Usage: nmcli device lldp { ARGUMENTS | help }\n"
 "\n"
 "ARGUMENTS := [list [ifname <ifname>]]\n"
 "\n"
-"List neighboring devices discovered through LLDP. The 'ifname' option can "
-"be\n"
+"List neighboring devices discovered through LLDP. The 'ifname' option can be\n"
 "used to list neighbors for a particular interface.\n"
 "\n"
 msgstr ""
-"사용법: nmcli device wimax { 인수 | help }\n"
-"\n"
-"WiMAX 장치에서 작업을 수행합니다.\n"
+"사용법: nmcli device lldp { 인수 | help }\n"
 "\n"
-"인수 := [list [ifname <ifname>] [nsp <name>]]\n"
+"인수 := [list [ifname <ifname>]]\n"
 "\n"
-"사용 가능한 WiMAX NSP를 나열합니다. 'ifname' 및 'nsp' 옵션을 사용하여 특정 인"
-"터페이스나\n"
-"특정 NSP를 갖는 네트워크 목록을 표시할 수 있습니다.\n"
+"LLDP를 통해 발견된 인접한 장치를 나열합니다.\n"
+"'ifname' 옵션은 특정 인터페이스에 대해 인접 항목을 나열하는 데 사용할 수 있습니다.\n"
 "\n"
 
-#: ../clients/cli/devices.c:537 ../clients/cli/devices.c:1756
-#: ../clients/cli/devices.c:1765 ../clients/cli/devices.c:1956
-#: ../clients/cli/devices.c:2161 ../clients/cli/devices.c:2168
+#: ../clients/cli/devices.c:527 ../clients/cli/devices.c:1676
+#: ../clients/cli/devices.c:1685 ../clients/cli/devices.c:1879
+#: ../clients/cli/devices.c:2103 ../clients/cli/devices.c:2110
 #, c-format
 msgid "Error: No interface specified."
 msgstr "오류: 인터페이스가 지정되어 있지 않습니다."
 
-#: ../clients/cli/devices.c:557
+#: ../clients/cli/devices.c:547 ../clients/cli/devices.c:1899
 #, c-format
 msgid "Warning: argument '%s' is duplicated.\n"
-msgstr ""
+msgstr "경고: 인수 '%s'(이)가 중복되었습니다.\n"
 
-#: ../clients/cli/devices.c:559
-#, fuzzy, c-format
+#: ../clients/cli/devices.c:549 ../clients/cli/devices.c:1901
+#, c-format
 msgid "Error: Device '%s' not found.\n"
-msgstr "오류: '%s' 장치를 찾을 수 없습니다."
+msgstr "오류: 장치 '%s'을(를) 찾을 수 없습니다.\n"
 
-#: ../clients/cli/devices.c:560
-#, fuzzy, c-format
+#: ../clients/cli/devices.c:550 ../clients/cli/devices.c:1902
+#, c-format
 msgid "Error: not all devices found."
-msgstr "오류: Wi-Fi 장치를 찾을 수 없습니다."
+msgstr "오류: 일부 장치를 찾을 수 없습니다."
 
-#: ../clients/cli/devices.c:660 ../clients/cli/devices.c:811
+#: ../clients/cli/devices.c:650 ../clients/cli/devices.c:801
 msgid "(none)"
 msgstr "(없음)"
 
-#: ../clients/cli/devices.c:729
+#: ../clients/cli/devices.c:719
 #, c-format
 msgid "%u MHz"
 msgstr "%u MHz"
 
-#: ../clients/cli/devices.c:730
+#: ../clients/cli/devices.c:720
 #, c-format
 msgid "%u Mbit/s"
 msgstr "%u Mbit/s"
 
-#: ../clients/cli/devices.c:745
+#: ../clients/cli/devices.c:735
 msgid "WPA1"
 msgstr "WPA1"
 
-#: ../clients/cli/devices.c:754
+#: ../clients/cli/devices.c:744
 msgid "802.1X"
 msgstr "802.1X"
 
-#: ../clients/cli/devices.c:770
+#: ../clients/cli/devices.c:760
 msgid "Ad-Hoc"
 msgstr "애드혹"
 
-#: ../clients/cli/devices.c:771
+#: ../clients/cli/devices.c:761
 msgid "Infra"
 msgstr "인프라"
 
-#: ../clients/cli/devices.c:772
+#: ../clients/cli/devices.c:762
 msgid "N/A"
 msgstr "해당 없음 "
 
-#: ../clients/cli/devices.c:996
+#: ../clients/cli/devices.c:916
 msgid "Device details"
 msgstr "장치 상세정보"
 
-#: ../clients/cli/devices.c:1008
+#: ../clients/cli/devices.c:928
 #, c-format
 msgid "Error: 'device show': %s"
 msgstr "오류: 'device show': %s"
 
-#: ../clients/cli/devices.c:1060 ../clients/cli/devices.c:1063
+#: ../clients/cli/devices.c:980 ../clients/cli/devices.c:983
 msgid "(unknown)"
 msgstr "(알 수 없음)"
 
-#: ../clients/cli/devices.c:1104
+#: ../clients/cli/devices.c:1024
 #, c-format
 msgid "%u Mb/s"
 msgstr "%u Mb/s"
 
-#: ../clients/cli/devices.c:1195
+#: ../clients/cli/devices.c:1115
 msgid "on"
 msgstr "켜짐"
 
-#: ../clients/cli/devices.c:1195
+#: ../clients/cli/devices.c:1115
 msgid "off"
 msgstr "꺼짐"
 
-#: ../clients/cli/devices.c:1422
+#: ../clients/cli/devices.c:1342
 #, c-format
 msgid "Error: 'device status': %s"
 msgstr "오류: 'device status': %s"
 
 #. Add headers
-#: ../clients/cli/devices.c:1429
+#: ../clients/cli/devices.c:1349
 msgid "Status of devices"
 msgstr "장치 상태"
 
-#: ../clients/cli/devices.c:1460 ../clients/cli/devices.c:3570
+#: ../clients/cli/devices.c:1380 ../clients/cli/devices.c:3509
 #, c-format
 msgid "Error: invalid extra argument '%s'."
 msgstr "오류: 잘못된 추가 인수 '%s'입니다."
 
-#: ../clients/cli/devices.c:1477 ../clients/cli/devices.c:1787
-#: ../clients/cli/devices.c:2184 ../clients/cli/devices.c:2454
-#: ../clients/cli/devices.c:3609
+#: ../clients/cli/devices.c:1397 ../clients/cli/devices.c:1707
+#: ../clients/cli/devices.c:2126 ../clients/cli/devices.c:2396
+#: ../clients/cli/devices.c:3548
 #, c-format
 msgid "Error: Device '%s' not found."
 msgstr "오류: '%s' 장치를 찾을 수 없습니다."
 
-#: ../clients/cli/devices.c:1555
-#, fuzzy, c-format
+#: ../clients/cli/devices.c:1475
+#, c-format
 msgid "Device '%s' successfully activated with '%s'.\n"
-msgstr "성공: 장치 '%s'를 성공적으로 활성화했습니다."
+msgstr "장치 '%s'이(가) '%s'을(를) 통해 성공적으로 활성화되었습니다.\n"
 
-#: ../clients/cli/devices.c:1561
-#, fuzzy, c-format
+#: ../clients/cli/devices.c:1481
+#, c-format
 msgid "Error: Connection activation failed: (%d) %s.\n"
-msgstr "오류: 연결 활성화에 실패했습니다: (%d) %s."
+msgstr "오류: 연결 활성화 실패: (%d) %s.\n"
 
-#: ../clients/cli/devices.c:1597
-#, fuzzy, c-format
+#: ../clients/cli/devices.c:1517
+#, c-format
 msgid "Error: Failed to setup a Wi-Fi hotspot: %s"
-msgstr "오류: 호스트 이름 설정에 실패했습니다: (%d) %s"
+msgstr "오류: Wi-Fi 핫스폿 설정 실패: %s"
 
-#: ../clients/cli/devices.c:1600
-#, fuzzy, c-format
+#: ../clients/cli/devices.c:1520
+#, c-format
 msgid "Error: Failed to add/activate new connection: %s"
-msgstr "오류: 새 연결을 추가/활성화하는데 실패했습니다: (%d) %s"
+msgstr "오류: 새 연결 추가/활성화 실패: %s"
 
-#: ../clients/cli/devices.c:1610
-#, fuzzy, c-format
+#: ../clients/cli/devices.c:1530
+#, c-format
 msgid "Error: Failed to setup a Wi-Fi hotspot"
-msgstr "오류: 호스트 이름 설정에 실패했습니다: (%d) %s"
+msgstr "오류: Wi-Fi 핫스폿을 설정할 수 없습니다."
 
-#: ../clients/cli/devices.c:1612
+#: ../clients/cli/devices.c:1532
 #, c-format
 msgid "Error: Failed to add/activate new connection: Unknown error"
 msgstr "오류: 새 연결을 추가/활성화하는데 실패했습니다: 알 수 없는 오류 "
 
-#: ../clients/cli/devices.c:1624
+#: ../clients/cli/devices.c:1544
 #, c-format
 msgid "Connection with UUID '%s' created and activated on device '%s'\n"
 msgstr "장치 '%s'에 UUID '%s'인 연결이 생성 및 활성화되었습니다 \n"
 
-#: ../clients/cli/devices.c:1627
-#, fuzzy, c-format
+#: ../clients/cli/devices.c:1547
+#, c-format
 msgid "Hotspot '%s' activated on device '%s'\n"
-msgstr "장치 '%s'에 UUID '%s'인 연결이 생성 및 활성화되었습니다 \n"
+msgstr "핫스폿 '%s'이(가) 장치 '%s'에서 활성화되었습니다.\n"
 
-#: ../clients/cli/devices.c:1691
+#: ../clients/cli/devices.c:1611
 #, c-format
 msgid "Error: Device activation failed: %s"
 msgstr "오류: 장치 활성화에 실패했습니다: %s"
 
-#: ../clients/cli/devices.c:1700
-#, fuzzy, c-format
+#: ../clients/cli/devices.c:1620
+#, c-format
 msgid "Error: Device activation failed: device was disconnected"
-msgstr "오류: 장치 활성화에 실패했습니다: %s"
+msgstr "오류: 장치 활성화 실패: 장치의 연결이 해제되었습니다."
 
-#: ../clients/cli/devices.c:1715
+#: ../clients/cli/devices.c:1635
 #, c-format
 msgid "Device '%s' has been connected.\n"
 msgstr "장치 '%s'가 연결되었습니다.\n"
 
-#: ../clients/cli/devices.c:1771
+#: ../clients/cli/devices.c:1691
 #, c-format
 msgid "Error: extra argument not allowed: '%s'."
 msgstr "오류: 추가 인수가 허용되지 않음: '%s'."
 
-#: ../clients/cli/devices.c:1856 ../clients/cli/devices.c:1871
-#: ../clients/cli/devices.c:2022
-#, fuzzy, c-format
+#: ../clients/cli/devices.c:1776 ../clients/cli/devices.c:1791
+#: ../clients/cli/devices.c:1964
+#, c-format
 msgid "Device '%s' successfully disconnected.\n"
-msgstr "성공: '%s' 장치를 성공적으로 연결 해제했습니다."
+msgstr "장치 '%s'의 연결이 성공적으로 해제되었습니다.\n"
 
-#: ../clients/cli/devices.c:1859
-#, fuzzy, c-format
+#: ../clients/cli/devices.c:1779
+#, c-format
 msgid "Device '%s' successfully removed.\n"
-msgstr "성공: 장치 '%s'를 성공적으로 활성화했습니다."
+msgstr "장치 '%s'이(가) 성공적으로 제거되었습니다.\n"
 
-#: ../clients/cli/devices.c:1918
-#, fuzzy, c-format
-msgid "Error: Reapplying connection to device '%s' (%s) failed: %s"
-msgstr "오류: 장치 '%s' (%s)의 연결 해제가 실패했습니다: %s"
+#: ../clients/cli/devices.c:1838
+#, c-format
+msgid "Error: not all connections reapplied."
+msgstr "오류: 일부 연결을 재적용할 수 없습니다."
 
-#: ../clients/cli/devices.c:1928
-#, fuzzy, c-format
-msgid "Connection successfully reapplied to device '%s'.\n"
-msgstr "연결이 성공적으로 활성화되었습니다 (D-Bus 활성 경로: %s)\n"
+#: ../clients/cli/devices.c:1839
+#, c-format
+msgid "Error: Reapplying connection to device '%s' (%s) failed: %s\n"
+msgstr "오류: 장치 '%s'(%s)에 대한 연결 재적용 실패: %s\n"
 
-#: ../clients/cli/devices.c:1965
-#, fuzzy, c-format
-msgid "Error: unsupported argument '%s'."
-msgstr "오류: 예상치 못한 인수 '%s'"
+#: ../clients/cli/devices.c:1849
+#, c-format
+msgid "Connection successfully reapplied to device '%s'.\n"
+msgstr "장치 '%s'에 연결이 성공적으로 재적용되었습니다.\n"
 
-#: ../clients/cli/devices.c:1979
-#, fuzzy, c-format
-msgid "Error: device '%s' not found."
-msgstr "오류: '%s' 장치를 찾을 수 없습니다."
+#: ../clients/cli/devices.c:1912
+#, c-format
+msgid "Error: no valid device provided."
+msgstr "오류: 유효한 장치가 제공되지 않았습니다."
 
-#: ../clients/cli/devices.c:2007
-#, fuzzy, c-format
+#: ../clients/cli/devices.c:1949
+#, c-format
 msgid "Error: not all devices disconnected."
-msgstr "오류: Wi-Fi 장치를 찾을 수 없습니다."
+msgstr "오류: 일부 장치의 연결을 해제할 수 없습니다."
 
-#: ../clients/cli/devices.c:2008
-#, fuzzy, c-format
+#: ../clients/cli/devices.c:1950
+#, c-format
 msgid "Error: Device '%s' (%s) disconnecting failed: %s\n"
-msgstr "오류: 장치 '%s' (%s)의 연결 해제가 실패했습니다: %s"
+msgstr "오류: 장치 '%s'(%s)의 연결 해제 실패: %s\n"
 
-#: ../clients/cli/devices.c:2083
-#, fuzzy, c-format
+#: ../clients/cli/devices.c:2025
+#, c-format
 msgid "Error: not all devices deleted."
-msgstr "오류: Wi-Fi 장치를 찾을 수 없습니다."
+msgstr "오류: 일부 장치를 삭제할 수 없습니다."
 
-#: ../clients/cli/devices.c:2084
-#, fuzzy, c-format
+#: ../clients/cli/devices.c:2026
+#, c-format
 msgid "Error: Device '%s' (%s) deletion failed: %s\n"
-msgstr "오류: 장치 '%s' (%s)의 연결 해제가 실패했습니다: %s"
+msgstr "오류: 장치 '%s'(%s) 삭제 실패: %s\n"
 
-#: ../clients/cli/devices.c:2190
-#, fuzzy, c-format
+#: ../clients/cli/devices.c:2132
+#, c-format
 msgid "Error: No property specified."
-msgstr "오류: 연결이 지정되어 있지 않습니다. "
+msgstr "오류: 속성이 지정되지 않았습니다."
 
-#: ../clients/cli/devices.c:2202 ../clients/cli/devices.c:2217
+#: ../clients/cli/devices.c:2144 ../clients/cli/devices.c:2159
 #, c-format
 msgid "Error: '%s' argument is missing."
 msgstr "오류: '%s' 인자가 없습니다."
 
-#: ../clients/cli/devices.c:2207
-#, fuzzy, c-format
+#: ../clients/cli/devices.c:2149
+#, c-format
 msgid "Error: 'managed': %s."
-msgstr "오류: 'mode': %s."
+msgstr "오류: 'managed': %s."
 
-#: ../clients/cli/devices.c:2222
+#: ../clients/cli/devices.c:2174
 #, c-format
-msgid "Error: 'autoconnect': %s."
-msgstr "오류: 'autoconnect': %s."
-
-#: ../clients/cli/devices.c:2232
-#, fuzzy, c-format
 msgid "Error: property '%s' is not known."
-msgstr "오류: 잘못된 속성 '%s': %s."
+msgstr "오류: 속성 '%s'은(는) 알 수 없습니다."
 
-#: ../clients/cli/devices.c:2278
-#, fuzzy, c-format
+#: ../clients/cli/devices.c:2220
+#, c-format
 msgid "%s: using connection '%s'\n"
-msgstr "해당 연결 '%s'이 없습니다 "
+msgstr "%s: 연결 '%s' 사용 중\n"
 
-#: ../clients/cli/devices.c:2304
+#: ../clients/cli/devices.c:2246
 #, c-format
 msgid "%s: device created\n"
-msgstr ""
+msgstr "%s: 장치가 생성되었습니다.\n"
 
-#: ../clients/cli/devices.c:2311
-#, fuzzy, c-format
+#: ../clients/cli/devices.c:2253
+#, c-format
 msgid "%s: device removed\n"
-msgstr "장치가 제거되었습니다 "
+msgstr "%s: 장치가 제거되었습니다.\n"
 
-#: ../clients/cli/devices.c:2397
+#: ../clients/cli/devices.c:2339
 msgid "Wi-Fi scan list"
 msgstr "Wi-Fi 스캔 목록 "
 
-#: ../clients/cli/devices.c:2435
+#: ../clients/cli/devices.c:2377
 #, c-format
 msgid "Error: 'device wifi': %s"
 msgstr "오류: 'device wifi': %s"
 
-#: ../clients/cli/devices.c:2477 ../clients/cli/devices.c:2561
+#: ../clients/cli/devices.c:2419 ../clients/cli/devices.c:2500
 #, c-format
 msgid "Error: Access point with bssid '%s' not found."
 msgstr "오류: bssid '%s'인 액세스 지점을 찾을 수 없습니다."
 
-#: ../clients/cli/devices.c:2504
-#, fuzzy, c-format
+#: ../clients/cli/devices.c:2446
+#, c-format
 msgid ""
 "Error: Device '%s' was not recognized as a Wi-Fi device, check "
 "NetworkManager Wi-Fi plugin."
-msgstr "오류: '%s' 장치는 Wi-Fi 장치가 아닙니다."
+msgstr ""
+"오류: 장치 '%s'이(가) Wi-Fi 장치로 인식되지 않았습니다.NetworkManager Wi-Fi 플러그인을 확인하십시오."
 
-#: ../clients/cli/devices.c:2508 ../clients/cli/devices.c:2841
-#: ../clients/cli/devices.c:3261 ../clients/cli/devices.c:3410
+#: ../clients/cli/devices.c:2448 ../clients/cli/devices.c:2780
+#: ../clients/cli/devices.c:3200 ../clients/cli/devices.c:3349
 #, c-format
 msgid "Error: Device '%s' is not a Wi-Fi device."
 msgstr "오류: '%s' 장치는 Wi-Fi 장치가 아닙니다."
 
-#: ../clients/cli/devices.c:2721
+#: ../clients/cli/devices.c:2660
 msgid "SSID or BSSID: "
 msgstr "SSID 또는 BSSID: "
 
-#: ../clients/cli/devices.c:2726
+#: ../clients/cli/devices.c:2665
 #, c-format
 msgid "Error: SSID or BSSID are missing."
 msgstr "오류: SSID 또는 BSSID가 누락되어 있습니다."
 
-#: ../clients/cli/devices.c:2750
+#: ../clients/cli/devices.c:2689
 #, c-format
 msgid "Error: bssid argument value '%s' is not a valid BSSID."
 msgstr "오류: bssid 인수 값 '%s'은 올바른 BSSID가 아닙니다."
 
-#: ../clients/cli/devices.c:2774
+#: ../clients/cli/devices.c:2713
 #, 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:2794 ../clients/cli/devices.c:2807
+#: ../clients/cli/devices.c:2733 ../clients/cli/devices.c:2746
 #, c-format
 msgid "Error: %s: %s."
 msgstr "오류: %s: %s."
 
-#: ../clients/cli/devices.c:2822
+#: ../clients/cli/devices.c:2761
 #, c-format
 msgid "Error: BSSID to connect to (%s) differs from bssid argument (%s)."
 msgstr "오류: (%s)에 연결하려는 BSSID는 bssid 인수 (%s)와 다릅니다."
 
-#: ../clients/cli/devices.c:2828
+#: ../clients/cli/devices.c:2767
 #, c-format
 msgid "Error: Parameter '%s' is neither SSID nor BSSID."
 msgstr "오류: 매개 변수 '%s'는 SSID 또는 BSSID가 아닙니다."
 
-#: ../clients/cli/devices.c:2843 ../clients/cli/devices.c:3263
-#: ../clients/cli/devices.c:3412
+#: ../clients/cli/devices.c:2782 ../clients/cli/devices.c:3202
+#: ../clients/cli/devices.c:3351
 #, c-format
 msgid "Error: No Wi-Fi device found."
 msgstr "오류: Wi-Fi 장치를 찾을 수 없습니다."
 
-#: ../clients/cli/devices.c:2863
-#, fuzzy, c-format
+#: ../clients/cli/devices.c:2802
+#, c-format
 msgid "Error: Failed to scan hidden SSID: %s."
-msgstr "오류: %s.%s 수정에 실패했습니다: %s."
+msgstr "오류: 숨겨진 SSID 스캔 실패: %s."
 
-#: ../clients/cli/devices.c:2888
+#: ../clients/cli/devices.c:2827
 #, c-format
 msgid "Error: No network with SSID '%s' found."
 msgstr "오류: SSID '%s'인 네트워크를 찾을 수 없습니다."
 
-#: ../clients/cli/devices.c:2890
+#: ../clients/cli/devices.c:2829
 #, c-format
 msgid "Error: No access point with BSSID '%s' found."
 msgstr "오류: BSSID '%s'인 액세스 지점을 찾을 수 없습니다."
 
-#: ../clients/cli/devices.c:2932
+#: ../clients/cli/devices.c:2871
 #, c-format
 msgid ""
 "Warning: '%s' should be SSID for hidden APs; but it looks like a BSSID.\n"
-msgstr ""
+msgstr "경고: 숨겨진 AP의 경우 '%s'(이)가 SSID여야 하지만 BSSID인 것 같습니다.\n"
 
-#: ../clients/cli/devices.c:2946
+#: ../clients/cli/devices.c:2885
 msgid "Password: "
 msgstr "암호: "
 
-#: ../clients/cli/devices.c:3095
-#, fuzzy, c-format
+#: ../clients/cli/devices.c:3034
+#, c-format
 msgid "'%s' is not valid WPA PSK"
-msgstr "'%s'는 올바른 PSK가 아닙니다 "
+msgstr "'%s'은(는) 유효한 WPA PSK가 아닙니다."
 
-#: ../clients/cli/devices.c:3112
-#, fuzzy, c-format
+#: ../clients/cli/devices.c:3051
+#, c-format
 msgid "'%s' is not valid WEP key (it should be 5 or 13 ASCII chars)"
-msgstr "'%s' 길이가 잘못되어 있습니다 (5 또는 6 자리여야 함) "
+msgstr "'%s'은(는) 유효한 WEP 키가 아닙니다(5 또는 13 ASCII 문자여야 함)."
 
-#: ../clients/cli/devices.c:3128
+#: ../clients/cli/devices.c:3067
 #, c-format
 msgid "Hotspot password: %s\n"
-msgstr ""
+msgstr "핫스팟 암호: %s\n"
 
-#: ../clients/cli/devices.c:3186
-#, fuzzy, c-format
+#: ../clients/cli/devices.c:3125
+#, c-format
 msgid "Error: ssid is too long."
-msgstr "오류: 'ssid'가 필요합니다. "
+msgstr "오류: ssid가 너무 깁니다."
 
-#: ../clients/cli/devices.c:3198
-#, fuzzy, c-format
+#: ../clients/cli/devices.c:3137
+#, c-format
 msgid "Error: band argument value '%s' is invalid; use 'a' or 'bg'."
-msgstr ""
-"오류: wep-key-type 인수 값 '%s'은 유효하지 않습니다. 'key' 또는 'phrase'를 사"
-"용합니다."
+msgstr "오류: 밴드 인수 값 '%s'이(가) 잘못되었습니다. 'a' 또는 'bg'를 사용하십시오."
 
-#: ../clients/cli/devices.c:3222
-#, fuzzy, c-format
+#: ../clients/cli/devices.c:3161
+#, c-format
 msgid "Error: Unknown parameter %s."
-msgstr "알려져있지 않은 매개변수입니다: %s\n"
+msgstr "오류: 알 수 없는 매개변수 %s."
 
-#: ../clients/cli/devices.c:3241
-#, fuzzy, c-format
+#: ../clients/cli/devices.c:3180
+#, c-format
 msgid "Error: channel requires band too."
-msgstr "오류: 'apn'이 필요합니다. "
+msgstr "오류: 채널에는 밴드도 필요합니다."
 
-#: ../clients/cli/devices.c:3247
-#, fuzzy, c-format
+#: ../clients/cli/devices.c:3186
+#, c-format
 msgid "Error: channel '%s' not valid for band '%s'."
-msgstr "오류: 'channel': '%s'이 올바르지 않습니다; <1-13>을 사용합니다. "
+msgstr "오류: 채널 '%s'이(가) 밴드 '%s'에 유효하지 않습니다."
 
-#: ../clients/cli/devices.c:3275
-#, fuzzy, c-format
+#: ../clients/cli/devices.c:3214
+#, c-format
 msgid "Error: Device '%s' supports neither AP nor Ad-Hoc mode."
-msgstr "오류: '%s' 장치는 Wi-Fi 장치가 아닙니다."
+msgstr "오류: 장치 '%s'이(가) AP 또는 애드혹 모드를 지원하지 않습니다."
 
-#: ../clients/cli/devices.c:3310
-#, fuzzy, c-format
+#: ../clients/cli/devices.c:3249
+#, c-format
 msgid "Error: Invalid 'password': %s."
-msgstr "오류: 잘못된 속성 '%s': %s."
+msgstr "오류: 잘못된 'password': %s."
 
-#: ../clients/cli/devices.c:3379
-#, fuzzy, c-format
+#: ../clients/cli/devices.c:3318
+#, c-format
 msgid "Error: '%s' cannot repeat."
-msgstr "오류: '%s' 설정이 없습니다\n"
+msgstr "오류: '%s'은(는) 반복할 수 없습니다."
 
-#: ../clients/cli/devices.c:3460
+#: ../clients/cli/devices.c:3399
 #, c-format
 msgid "Error: 'device wifi' command '%s' is not valid."
 msgstr "오류: 'device wifi' 명령 '%s'이(가) 올바르지 않습니다."
 
 #. Main header name
-#: ../clients/cli/devices.c:3486
+#: ../clients/cli/devices.c:3425
 msgid "Device LLDP neighbors"
-msgstr ""
+msgstr "장치 LLDP 인접 라우터"
 
-#: ../clients/cli/devices.c:3589
-#, fuzzy, c-format
+#: ../clients/cli/devices.c:3528
+#, c-format
 msgid "Error: 'device lldp list': %s"
-msgstr "오류: 'device status': %s"
+msgstr "오류: 'device lldp list': %s"
 
-#: ../clients/cli/devices.c:3636
-#, fuzzy, c-format
+#: ../clients/cli/devices.c:3575
+#, c-format
 msgid "Error: 'device lldp' command '%s' is not valid."
-msgstr "오류: 'device wifi' 명령 '%s'이(가) 올바르지 않습니다."
+msgstr "오류: 'device lldp' 명령 '%s'이(가) 유효하지 않습니다."
 
-#: ../clients/cli/devices.c:3825
+#: ../clients/cli/devices.c:3770
 #, c-format
 msgid "Error: 'dev' command '%s' is not valid."
 msgstr "오류: 'dev' 명령어 '%s'이(가) 바르지 않습니다."
 
-#: ../clients/cli/general.c:35
+#: ../clients/cli/general.c:34
 msgid "RUNNING"
 msgstr "실행중"
 
 #. 0
-#: ../clients/cli/general.c:36
+#: ../clients/cli/general.c:35
 msgid "VERSION"
 msgstr "버전"
 
 #. 2
-#: ../clients/cli/general.c:38
+#: ../clients/cli/general.c:37
 msgid "STARTUP"
 msgstr "시작 "
 
 #. 3
-#: ../clients/cli/general.c:39
+#: ../clients/cli/general.c:38
 msgid "CONNECTIVITY"
 msgstr "연결 "
 
 #. 4
-#: ../clients/cli/general.c:40
+#: ../clients/cli/general.c:39
 msgid "NETWORKING"
 msgstr "네트워킹 "
 
 #. 5
-#: ../clients/cli/general.c:41
+#: ../clients/cli/general.c:40
 msgid "WIFI-HW"
 msgstr "WIFI-HW"
 
 #. 6
-#: ../clients/cli/general.c:42
+#: ../clients/cli/general.c:41
 msgid "WIFI"
 msgstr "WIFI"
 
 #. 7
-#: ../clients/cli/general.c:43
+#: ../clients/cli/general.c:42
 msgid "WWAN-HW"
 msgstr "WWAN-HW"
 
 #. 8
-#: ../clients/cli/general.c:44
+#: ../clients/cli/general.c:43
 msgid "WWAN"
 msgstr "WWAN"
 
 #. 9
-#: ../clients/cli/general.c:45
+#: ../clients/cli/general.c:44
 msgid "WIMAX-HW"
 msgstr "WIMAX-HW"
 
 #. 10
-#: ../clients/cli/general.c:46
+#: ../clients/cli/general.c:45
 msgid "WIMAX"
 msgstr "와이맥스"
 
-#: ../clients/cli/general.c:62
+#: ../clients/cli/general.c:61
 msgid "PERMISSION"
 msgstr "권한 "
 
 #. 0
-#: ../clients/cli/general.c:63
+#: ../clients/cli/general.c:62
 msgid "VALUE"
 msgstr "값 "
 
-#: ../clients/cli/general.c:71
+#: ../clients/cli/general.c:70
 msgid "LEVEL"
 msgstr "레벨 "
 
 #. 0
-#: ../clients/cli/general.c:72
+#: ../clients/cli/general.c:71
 msgid "DOMAINS"
 msgstr "도메인 "
 
-#: ../clients/cli/general.c:86
+#: ../clients/cli/general.c:85
 #, c-format
 msgid ""
 "Usage: nmcli general { COMMAND | help }\n"
@@ -4551,7 +5006,7 @@ msgstr ""
 "  logging [level <log level>] [domains <log domains>]\n"
 "\n"
 
-#: ../clients/cli/general.c:97
+#: ../clients/cli/general.c:96
 #, c-format
 msgid ""
 "Usage: nmcli general status { help }\n"
@@ -4564,11 +5019,10 @@ msgstr ""
 "사용법: nmcli general status { help }\n"
 "\n"
 "NetworkManager의 일반 정보를 표시합니다.\n"
-"'status'는 기본 동작으로 'nmcli gen'을 실행하면 'nmcli gen status'를 실행한 "
-"것입니다\n"
+"'status'는 기본 동작으로 'nmcli gen'을 실행하면 'nmcli gen status'를 실행한 것입니다\n"
 "\n"
 
-#: ../clients/cli/general.c:106
+#: ../clients/cli/general.c:105
 #, c-format
 msgid ""
 "Usage: nmcli general hostname { ARGUMENTS | help }\n"
@@ -4577,8 +5031,8 @@ msgid ""
 "\n"
 "Get or change persistent system hostname.\n"
 "With no arguments, this prints currently configured hostname. When you pass\n"
-"a hostname, NetworkManager will set it as the new persistent system "
-"hostname.\n"
+"a hostname, NetworkManager will set it as the new persistent system hostname."
+"\n"
 "\n"
 msgstr ""
 "사용법: nmcli general hostname { 인수 | help }\n"
@@ -4586,26 +5040,23 @@ msgstr ""
 "인수 := [<hostname>]\n"
 "\n"
 "시스템의 영구적인 호스트 이름을 가져오거나 변경합니다.\n"
-"인수없이 실행하면, 이는 현재 설정되어 있는 호스트 이름을 출력합니다. 호스트 "
-"이름을 전달하면\n"
-"NetworkManager는 해당 호스트 이름을 시스템의 영구적인 호스트 이름으로 새로 설"
-"정합니다.\n"
+"인수없이 실행하면, 이는 현재 설정되어 있는 호스트 이름을 출력합니다. 호스트 이름을 전달하면\n"
+"NetworkManager는 해당 호스트 이름을 시스템의 영구적인 호스트 이름으로 새로 설정합니다.\n"
 "\n"
 
-#: ../clients/cli/general.c:118
+#: ../clients/cli/general.c:117
 #, c-format
 msgid ""
 "Usage: nmcli general permissions { help }\n"
 "\n"
 "Show caller permissions for authenticated operations.\n"
 "\n"
-msgstr ""
-"사용법: nmcli general permissions { help }\n"
+msgstr "사용법: nmcli general permissions { help }\n"
 "\n"
 "인증된 작업의 호출 권한을 표시합니다.\n"
 "\n"
 
-#: ../clients/cli/general.c:126
+#: ../clients/cli/general.c:125
 #, c-format
 msgid ""
 "Usage: nmcli general logging { ARGUMENTS | help }\n"
@@ -4626,12 +5077,11 @@ msgstr ""
 "\n"
 "NetworkManager 로깅 레벨 및 도메인을 검색하거나 변경합니다.\n"
 "인수없이 실행하면 현재 로깅 레벨 및 도메인이 표시됩니다. 로그 기록 상태를\n"
-"변경하려면 레벨 및 도메인중 하나 또는 모두를 제공합니다. 사용 가능한 로깅 도"
-"메인 목록은 man 페이지에서\n"
+"변경하려면 레벨 및 도메인중 하나 또는 모두를 제공합니다. 사용 가능한 로깅 도메인 목록은 man 페이지에서\n"
 "참조하십시오.\n"
 "\n"
 
-#: ../clients/cli/general.c:139
+#: ../clients/cli/general.c:138
 #, c-format
 msgid ""
 "Usage: nmcli networking { COMMAND | help }\n"
@@ -4656,33 +5106,29 @@ msgstr ""
 "  connectivity [check]\n"
 "\n"
 
-#: ../clients/cli/general.c:149
+#: ../clients/cli/general.c:148
 #, c-format
-msgid ""
-"Usage: nmcli networking on { help }\n"
+msgid "Usage: nmcli networking on { help }\n"
 "\n"
 "Switch networking on.\n"
 "\n"
-msgstr ""
-"사용법: nmcli networking on { help }\n"
+msgstr "사용법: nmcli networking on { help }\n"
 "\n"
 "네트워크를 켭니다.\n"
 "\n"
 
-#: ../clients/cli/general.c:157
+#: ../clients/cli/general.c:156
 #, c-format
-msgid ""
-"Usage: nmcli networking off { help }\n"
+msgid "Usage: nmcli networking off { help }\n"
 "\n"
 "Switch networking off.\n"
 "\n"
-msgstr ""
-"사용법: nmcli networking off { help }\n"
+msgstr "사용법: nmcli networking off { help }\n"
 "\n"
 "네트워크를 끕니다.\n"
 "\n"
 
-#: ../clients/cli/general.c:165
+#: ../clients/cli/general.c:164
 #, c-format
 msgid ""
 "Usage: nmcli networking connectivity { ARGUMENTS | help }\n"
@@ -4690,8 +5136,8 @@ msgid ""
 "ARGUMENTS := [check]\n"
 "\n"
 "Get network connectivity state.\n"
-"The optional 'check' argument makes NetworkManager re-check the "
-"connectivity.\n"
+"The optional 'check' argument makes NetworkManager re-check the connectivity."
+"\n"
 "\n"
 msgstr ""
 "사용법: nmcli networking connectivity { 인수 | help }\n"
@@ -4702,8 +5148,8 @@ msgstr ""
 "옵션의 'check' 인수를 사용하면 NetworkManager가 연결을 다시 확인합니다.\n"
 "\n"
 
-#: ../clients/cli/general.c:177
-#, fuzzy, c-format
+#: ../clients/cli/general.c:176
+#, c-format
 msgid ""
 "Usage: nmcli radio { COMMAND | help }\n"
 "\n"
@@ -4714,16 +5160,12 @@ msgid ""
 msgstr ""
 "사용법: nmcli radio { 명령 | help }\n"
 "\n"
-"명령 := { all | wifi | wwan | wimax }\n"
-"\n"
-"  all | wifi | wwan | wimax [ on | off ]\n"
-"\n"
 "명령 := { all | wifi | wwan }\n"
 "\n"
 "  all | wifi | wwan [ on | off ]\n"
 "\n"
 
-#: ../clients/cli/general.c:186
+#: ../clients/cli/general.c:185
 #, c-format
 msgid ""
 "Usage: nmcli radio all { ARGUMENTS | help }\n"
@@ -4740,7 +5182,7 @@ msgstr ""
 "모든 라디오 스위치의 상태를 가져오거나 이를 활성화/비활성화합니다.\n"
 "\n"
 
-#: ../clients/cli/general.c:196
+#: ../clients/cli/general.c:195
 #, c-format
 msgid ""
 "Usage: nmcli radio wifi { ARGUMENTS | help }\n"
@@ -4757,7 +5199,7 @@ msgstr ""
 "Wi-Fi 라디오 스위치의 상태를 가져오거나 이를 활성화/비활성화합니다.\n"
 "\n"
 
-#: ../clients/cli/general.c:206
+#: ../clients/cli/general.c:205
 #, c-format
 msgid ""
 "Usage: nmcli radio wwan { ARGUMENTS | help }\n"
@@ -4774,7 +5216,7 @@ msgstr ""
 "모바일 광대역 라디오 스위치의 상태를 가져오거나 이를 활성화/비활성화합니다\n"
 "\n"
 
-#: ../clients/cli/general.c:216
+#: ../clients/cli/general.c:215
 #, c-format
 msgid ""
 "Usage: nmcli monitor\n"
@@ -4783,203 +5225,205 @@ msgid ""
 "Prints a line whenever a change occurs in NetworkManager\n"
 "\n"
 msgstr ""
+"사용법: nmcli monitor\n"
+"\n"
+"네트워크 관리자 변경 사항을 모니터링합니다.\n"
+"네트워크 관리자에 변경이 발생할 때마다 행을 출력합니다.\n"
+"\n"
 
-#: ../clients/cli/general.c:234
+#: ../clients/cli/general.c:233
 msgid "asleep"
 msgstr "사용 일시 중지"
 
-#: ../clients/cli/general.c:236
+#: ../clients/cli/general.c:235
 msgid "connecting"
 msgstr "연결"
 
-#: ../clients/cli/general.c:238
+#: ../clients/cli/general.c:237
 msgid "connected (local only)"
 msgstr "연결됨 (로컬 전용)"
 
-#: ../clients/cli/general.c:240
+#: ../clients/cli/general.c:239
 msgid "connected (site only)"
 msgstr "연결됨 (사이트 전용)"
 
-#: ../clients/cli/general.c:244
+#: ../clients/cli/general.c:243
 msgid "disconnecting"
 msgstr "연결 끊는 중"
 
-#: ../clients/cli/general.c:280
+#: ../clients/cli/general.c:279
 msgid "portal"
 msgstr "포털 "
 
-#: ../clients/cli/general.c:282
+#: ../clients/cli/general.c:281
 msgid "limited"
 msgstr "제한됨 "
 
-#: ../clients/cli/general.c:284
+#: ../clients/cli/general.c:283
 msgid "full"
 msgstr "전체"
 
-#: ../clients/cli/general.c:335
+#: ../clients/cli/general.c:334
 #, c-format
 msgid "Error: only these fields are allowed: %s"
 msgstr "오류: 다음 필드만 허용됨: %s"
 
-#: ../clients/cli/general.c:358
+#: ../clients/cli/general.c:360
 msgid "NetworkManager status"
 msgstr "네트워크 관리 상태"
 
-#: ../clients/cli/general.c:363
+#: ../clients/cli/general.c:365
 msgid "running"
 msgstr "실행 중"
 
-#: ../clients/cli/general.c:366
+#: ../clients/cli/general.c:368
 msgid "starting"
 msgstr "시작하는 중"
 
-#: ../clients/cli/general.c:366
+#: ../clients/cli/general.c:368
 msgid "started"
 msgstr "시작됨"
 
-#: ../clients/cli/general.c:368 ../clients/cli/general.c:369
 #: ../clients/cli/general.c:370 ../clients/cli/general.c:371
-#: ../clients/cli/general.c:372
+#: ../clients/cli/general.c:372 ../clients/cli/general.c:373
+#: ../clients/cli/general.c:374
 msgid "enabled"
 msgstr "사용"
 
-#: ../clients/cli/general.c:368 ../clients/cli/general.c:369
 #: ../clients/cli/general.c:370 ../clients/cli/general.c:371
-#: ../clients/cli/general.c:372
+#: ../clients/cli/general.c:372 ../clients/cli/general.c:373
+#: ../clients/cli/general.c:374
 msgid "disabled"
 msgstr "사용 않음"
 
-#: ../clients/cli/general.c:435
+#: ../clients/cli/general.c:446
 msgid "auth"
 msgstr "인증 "
 
-#: ../clients/cli/general.c:464
+#: ../clients/cli/general.c:475
 #, c-format
 msgid "Error: 'general permissions': %s"
 msgstr "오류: 'general permissions': %s"
 
-#: ../clients/cli/general.c:478
+#: ../clients/cli/general.c:489
 msgid "NetworkManager permissions"
 msgstr "NetworkManager 권한"
 
-#: ../clients/cli/general.c:519
+#: ../clients/cli/general.c:530
 #, c-format
 msgid "Error: 'general logging': %s"
 msgstr "오류: 'general logging': %s"
 
-#: ../clients/cli/general.c:534
+#: ../clients/cli/general.c:545
 msgid "NetworkManager logging"
 msgstr "NetworkManager 로깅 "
 
-#: ../clients/cli/general.c:556
-#, fuzzy, c-format
+#: ../clients/cli/general.c:567
+#, c-format
 msgid "Error: failed to set hostname: %s"
-msgstr "오류: 호스트 이름 설정에 실패했습니다: (%d) %s"
+msgstr "오류: 호스트 이름 설정 실패: %s"
 
-#: ../clients/cli/general.c:669
-#, fuzzy, c-format
+#: ../clients/cli/general.c:680
+#, c-format
 msgid "Error: failed to set logging: %s"
-msgstr "오류: 로깅 설정 액세스가 거부되었습니다; %s"
+msgstr "오류: 로깅 설정 실패: %s"
 
-#: ../clients/cli/general.c:678
+#: ../clients/cli/general.c:689
 #, c-format
 msgid "Error: 'general' command '%s' is not valid."
 msgstr "오류: 'general' 명령 '%s'이 올바르지 않습니다. "
 
-#: ../clients/cli/general.c:696
+#: ../clients/cli/general.c:707
 #, c-format
 msgid "Error: '--fields' value '%s' is not valid here (allowed field: %s)"
 msgstr "오류: '--fields' 값 '%s'은(는) 올바르지 않습니다 (허용되는 필드: %s)"
 
-#: ../clients/cli/general.c:721
+#: ../clients/cli/general.c:732
 #, c-format
 msgid "Error: invalid '%s' argument: '%s' (use on/off)."
 msgstr "오류: 잘못된 '%s' 인수입니다: '%s' (on/off 사용)."
 
-#: ../clients/cli/general.c:732
+#: ../clients/cli/general.c:743
 msgid "Connectivity"
 msgstr "연결 관련 "
 
-#: ../clients/cli/general.c:747
+#: ../clients/cli/general.c:758
 msgid "Networking"
 msgstr "네트워킹"
 
-#: ../clients/cli/general.c:772
+#: ../clients/cli/general.c:783
 #, c-format
 msgid "Error: 'networking connectivity' command '%s' is not valid."
 msgstr "오류: 'networking connectivity' 명령 '%s'이(가) 올바르지 않습니다."
 
-#: ../clients/cli/general.c:788
+#: ../clients/cli/general.c:799
 #, c-format
 msgid "Error: 'networking' command '%s' is not valid."
 msgstr "오류: 'networking' 명령 '%s'이 올바르지 않습니다."
 
-#: ../clients/cli/general.c:817 ../clients/cli/general.c:837
+#: ../clients/cli/general.c:828 ../clients/cli/general.c:848
 msgid "Radio switches"
 msgstr "라디오 스위치 "
 
 #. no argument, show current WiFi state
-#: ../clients/cli/general.c:855
+#: ../clients/cli/general.c:866
 msgid "Wi-Fi radio switch"
 msgstr "Wi-Fi 라디오 스위치 "
 
 #. no argument, show current WWAN (mobile broadband) state
-#: ../clients/cli/general.c:871
+#: ../clients/cli/general.c:882
 msgid "WWAN radio switch"
 msgstr "WWAN 라디오 스위치 "
 
-#: ../clients/cli/general.c:882
+#: ../clients/cli/general.c:893
 #, c-format
 msgid "Error: 'radio' command '%s' is not valid."
 msgstr "오류: 'radio' 명령 '%s'이(가) 올바르지 않습니다."
 
-#: ../clients/cli/general.c:902
-#, fuzzy
+#: ../clients/cli/general.c:914
 msgid "NetworkManager has started"
-msgstr "네트워크 관리 상태"
+msgstr "NetworkManager가 시작되었습니다."
 
-#: ../clients/cli/general.c:902
-#, fuzzy
+#: ../clients/cli/general.c:917
 msgid "NetworkManager has stopped"
-msgstr "네트워크 관리 상태"
+msgstr "NetworkManager가 중지되었습니다."
 
-#: ../clients/cli/general.c:913
-#, fuzzy, c-format
+#: ../clients/cli/general.c:931
+#, c-format
 msgid "Hostname set to '%s'\n"
-msgstr "호스트 이름을 '%s'로 설정 "
+msgstr "호스트 이름이 '%s'(으)로 설정되었습니다.\n"
 
-#: ../clients/cli/general.c:928
-#, fuzzy, c-format
+#: ../clients/cli/general.c:946
+#, c-format
 msgid "'%s' is now the primary connection\n"
-msgstr "연결에 설정 '%s'이 없습니다.\n"
+msgstr "'%s'이(가) 이제 1차 연결입니다.\n"
 
-#: ../clients/cli/general.c:930
-#, fuzzy, c-format
+#: ../clients/cli/general.c:948
+#, c-format
 msgid "There's no primary connection\n"
-msgstr "연결 확인: %s\n"
+msgstr "1차 연결이 없습니다.\n"
 
-#: ../clients/cli/general.c:942
-#, fuzzy, c-format
+#: ../clients/cli/general.c:960
+#, c-format
 msgid "Connectivity is now '%s'\n"
-msgstr "연결 관련 "
+msgstr "연결이 이제 '%s'입니다.\n"
 
-#: ../clients/cli/general.c:955
-#, fuzzy, c-format
+#: ../clients/cli/general.c:973
+#, c-format
 msgid "Networkmanager is now in the '%s' state\n"
-msgstr "NetworkManager가 실행되고 있지 않습니다."
+msgstr "Networkmanager가 이제 '%s' 상태입니다.\n"
 
-#: ../clients/cli/general.c:966
-#, fuzzy, c-format
+#: ../clients/cli/general.c:984
+#, c-format
 msgid "Error: 'monitor' command '%s' is not valid."
-msgstr "오류: 'radio' 명령 '%s'이(가) 올바르지 않습니다."
+msgstr "오류: 'monitor' 명령 '%s'이(가) 유효하지 않습니다."
 
-#: ../clients/cli/general.c:980
-#, fuzzy
+#: ../clients/cli/general.c:998
 msgid "Networkmanager is not running (waiting for it)\n"
-msgstr "NetworkManager가 실행되고 있지 않습니다."
+msgstr "Networkmanager가 실행 중이 아닙니다(대기 중).\n"
 
 #: ../clients/cli/nmcli.c:83
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "Usage: %s [OPTIONS] OBJECT { COMMAND | help }\n"
 "\n"
@@ -4987,11 +5431,12 @@ msgid ""
 "  -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"
+"  -c[olors] auto|yes|no                      whether to use colors in output\n"
 "  -f[ields] <field1,field2,...>|all|common   specify fields to output\n"
 "  -e[scape] yes|no                           escape columns separators in "
 "values\n"
+"  -n[ocheck]                                 don't check nmcli and "
+"NetworkManager versions\n"
 "  -a[sk]                                     ask for missing parameters\n"
 "  -s[how-secrets]                            allow displaying passwords\n"
 "  -w[ait] <seconds>                          set timeout waiting for "
@@ -5009,384 +5454,376 @@ msgid ""
 "  m[onitor]       monitor NetworkManager changes\n"
 "\n"
 msgstr ""
-"사용법: %s [옵션] 객체 { 명령 | help }\n"
+"사용법: %s [OPTIONS] OBJECT { 명령 | help }\n"
 "\n"
 "옵션\n"
-"  -t[erse]                                   간결한 출력\n"
-"  -p[retty]                                  보기 좋게 출력 \n"
+"  -t[erse]                                   terse 출력\n"
+"  -p[retty]                                  pretty 출력\n"
 "  -m[ode] tabular|multiline                  출력 모드\n"
-"  -f[ields] <field1,field2,...>|all|common   출력할 필드 지정\n"
-"  -e[scape] yes|no                           값으로된 칼럼 분리기에서 나가"
-"기 \n"
-"  -a[sk]                                     누락된 매개 변수 요청 \n"
-"  -w[ait] <seconds>                          동작 완료의 대기 시간을 설정\n"
+"  -c[olors] auto|yes|no                      출력에 색을 사용할지 여부\n"
+"  -f[ields] <field1,field2,...>|all|common   출력에 필드 지정\n"
+"  -e[scape] yes|no                           이스케이프 열 구분 기호values\n"
+"  -n[ocheck]                                 nmcli을 확인하지 않고NetworkManager "
+"versions\n"
+"  -a[sk]                                     누락된 매개변수 물어보기\n"
+"  -s[how-secrets]                            암호 표시 허용\n"
+"  -w[ait] <seconds>                          제한시간 대기 설정finishing operations\n"
 "  -v[ersion]                                 프로그램 버전 표시\n"
-"  -h[elp]                                    도움말 출력\n"
+"  -h[elp]                                    이 도움말 인쇄\n"
 "\n"
-"객체\n"
-"  g[eneral]       NetworkManager의 일반적인 상태 및 동작\n"
+"OBJECT\n"
+"  g[eneral]       NetworkManager의 일반적인 상태 및 작동\n"
 "  n[etworking]    전반적인 네트워크 제어\n"
 "  r[adio]         NetworkManager 라디오 스위치\n"
-"  c[onnection]    NetworkManager 연결\n"
+"  c[onnection]    NetworkManager의 연결\n"
 "  d[evice]        NetworkManager에 의해 관리되는 장치\n"
+"  a[gent]         NetworkManager secret 에이전트 또는 polkit 에이전트\n"
+"  m[onitor]       NetworkManager 변경 모니터링\n"
 "\n"
 
-#: ../clients/cli/nmcli.c:142
+#: ../clients/cli/nmcli.c:143
 #, c-format
 msgid "Error: Object '%s' is unknown, try 'nmcli help'."
 msgstr "대상 '%s'이(가) 알려져 있지 않습니다. 'nmcli help'를 해 보십시오."
 
-#: ../clients/cli/nmcli.c:183
+#: ../clients/cli/nmcli.c:173
 #, c-format
 msgid "Error: Option '--terse' is specified the second time."
 msgstr "오류: 옵션 '--terse'가 두번째로 설정되었습니다."
 
-#: ../clients/cli/nmcli.c:188
+#: ../clients/cli/nmcli.c:178
 #, c-format
 msgid "Error: Option '--terse' is mutually exclusive with '--pretty'."
 msgstr "오류: 옵션 '--terse'를 '--pretty'와 함께 사용할 수 없습니다."
 
-#: ../clients/cli/nmcli.c:196
+#: ../clients/cli/nmcli.c:186
 #, c-format
 msgid "Error: Option '--pretty' is specified the second time."
 msgstr "오류: 옵션 '--pretty'가 두번째로 설정되었습니다."
 
-#: ../clients/cli/nmcli.c:201
+#: ../clients/cli/nmcli.c:191
 #, c-format
 msgid "Error: Option '--pretty' is mutually exclusive with '--terse'."
 msgstr "오류: 옵션 '--pretty'를 '--terse'와 함께 사용할 수 없습니다."
 
-#: ../clients/cli/nmcli.c:211 ../clients/cli/nmcli.c:227
-#: ../clients/cli/nmcli.c:245 ../clients/cli/nmcli.c:276
+#: ../clients/cli/nmcli.c:201 ../clients/cli/nmcli.c:217
+#: ../clients/cli/nmcli.c:235 ../clients/cli/nmcli.c:266
 #, c-format
 msgid "Error: missing argument for '%s' option."
 msgstr "오류: '%s' 옵션에 인자가 없습니다."
 
-#: ../clients/cli/nmcli.c:220 ../clients/cli/nmcli.c:238
-#: ../clients/cli/nmcli.c:254
+#: ../clients/cli/nmcli.c:210 ../clients/cli/nmcli.c:228
+#: ../clients/cli/nmcli.c:244
 #, c-format
 msgid "Error: '%s' is not valid argument for '%s' option."
 msgstr "오류: '%s'은(는) 올바른 인자가 아닙니다 ('%s' 옵션에 사용)."
 
-#: ../clients/cli/nmcli.c:261
+#: ../clients/cli/nmcli.c:251
 #, c-format
 msgid "Error: fields for '%s' options are missing."
 msgstr "오류: '%s'옵션에 대해 필드가 없습니다."
 
-#: ../clients/cli/nmcli.c:281
+#: ../clients/cli/nmcli.c:271
 #, c-format
 msgid "Error: '%s' is not a valid timeout for '%s' option."
 msgstr "오류: '%s'은 '%s' 옵션의 올바른 시간 제한이 아닙니다."
 
-#: ../clients/cli/nmcli.c:288
+#: ../clients/cli/nmcli.c:278
 #, c-format
 msgid "nmcli tool, version %s\n"
 msgstr "nmcli 도구, 버전 %s\n"
 
-#: ../clients/cli/nmcli.c:294
+#: ../clients/cli/nmcli.c:284
 #, c-format
 msgid "Error: Option '%s' is unknown, try 'nmcli -help'."
 msgstr "오류: '%s' 옵션은 알려져 있지 않습니다. 'nmcli -help'를 해 보십시오."
 
-#: ../clients/cli/nmcli.c:377 ../clients/cli/nmcli.c:387
-#, fuzzy, c-format
-msgid ""
-"\n"
+#: ../clients/cli/nmcli.c:367 ../clients/cli/nmcli.c:377
+#, c-format
+msgid "\n"
 "Error: nmcli terminated by signal %s (%d)\n"
-msgstr ""
-"\n"
-"오류: 신호 %d에 의해 nmcli가 종료되었습니다. "
+msgstr "\n"
+"오류: nmcli가 신호 %s(%d)에 의해 종료되었습니다.\n"
 
-#: ../clients/cli/nmcli.c:418
-#, fuzzy, c-format
+#: ../clients/cli/nmcli.c:408
+#, c-format
 msgid "Failed to set signal mask: %d\n"
-msgstr "신호 마스크 설정에 실패했습니다: %d"
+msgstr "신호 마스크 설정 실패: %d\n"
 
-#: ../clients/cli/nmcli.c:425
-#, fuzzy, c-format
+#: ../clients/cli/nmcli.c:415
+#, c-format
 msgid "Failed to create signal handling thread: %d\n"
-msgstr "신호 처리 스레드를 생성하는데 실패했습니다: %d"
+msgstr "신호 처리 스레드 생성 실패: %d\n"
 
-#: ../clients/cli/nmcli.c:522 ../clients/nm-online.c:193
-#, fuzzy, c-format
+#: ../clients/cli/nmcli.c:512 ../clients/nm-online.c:193
+#, c-format
 msgid "Error: Could not create NMClient object: %s."
-msgstr "오류: NMClient 오브젝트를 만들 수 없습니다."
+msgstr "오류: NMClient 개체를 생성할 수 없음: %s."
 
-#: ../clients/cli/nmcli.c:539
+#: ../clients/cli/nmcli.c:529
 msgid "Success"
 msgstr "성공"
 
 #: ../clients/cli/polkit-agent.c:66
-#, fuzzy, c-format
+#, c-format
 msgid "Authentication message: %s\n"
-msgstr "인증"
+msgstr "인증 메시지: %s\n"
 
 #: ../clients/cli/polkit-agent.c:72
-#, fuzzy, c-format
+#, c-format
 msgid "Authentication error: %s\n"
-msgstr "인증"
+msgstr "인증 오류: %s\n"
 
 #: ../clients/cli/polkit-agent.c:118
-#, fuzzy, c-format
+#, c-format
 msgid "Warning: polkit agent initialization failed: %s\n"
-msgstr "모뎀 초기화 실패"
+msgstr "경고: polkit 에이전트 초기화 실패: %s\n"
 
-#: ../clients/cli/settings.c:796
-#, fuzzy, c-format
+#: ../clients/cli/settings.c:790
+#, c-format
 msgid "%d (key)"
-msgstr "%d (16진 아시키 열쇠글)"
+msgstr "%d(키)"
 
-#: ../clients/cli/settings.c:798
-#, fuzzy, c-format
+#: ../clients/cli/settings.c:792
+#, c-format
 msgid "%d (passphrase)"
-msgstr "%d (104/128-비트 열쇠글)"
+msgstr "%d(암호)"
 
-#: ../clients/cli/settings.c:801 ../clients/cli/settings.c:887
+#: ../clients/cli/settings.c:795 ../clients/cli/settings.c:881
 #, c-format
 msgid "%d (unknown)"
 msgstr "%d (알 수 없음)"
 
-#: ../clients/cli/settings.c:830
+#: ../clients/cli/settings.c:824
 msgid "0 (NONE)"
 msgstr "0 (없음)"
 
-#: ../clients/cli/settings.c:836
+#: ../clients/cli/settings.c:830
 msgid "REORDER_HEADERS, "
 msgstr "REORDER_HEADERS, "
 
-#: ../clients/cli/settings.c:838
+#: ../clients/cli/settings.c:832
 msgid "GVRP, "
 msgstr "GVRP, "
 
-#: ../clients/cli/settings.c:840
+#: ../clients/cli/settings.c:834
 msgid "LOOSE_BINDING, "
 msgstr "LOOSE_BINDING, "
 
-#: ../clients/cli/settings.c:842
-#, fuzzy
+#: ../clients/cli/settings.c:836
 msgid "MVRP, "
-msgstr "GVRP, "
+msgstr "MVRP, "
 
-#: ../clients/cli/settings.c:881
+#: ../clients/cli/settings.c:875
 #, c-format
 msgid "%d (disabled)"
 msgstr "%d (비활성화됨)"
 
-#: ../clients/cli/settings.c:883
+#: ../clients/cli/settings.c:877
 #, c-format
 msgid "%d (enabled, prefer public IP)"
 msgstr "%d (활성화됨, 공개 IP를 선호)"
 
-#: ../clients/cli/settings.c:885
+#: ../clients/cli/settings.c:879
 #, c-format
 msgid "%d (enabled, prefer temporary IP)"
 msgstr "%d (활성화됨, 임시 IP를 선호)"
 
-#: ../clients/cli/settings.c:900
-#, fuzzy, c-format
+#: ../clients/cli/settings.c:894
+#, c-format
 msgid "%d (no)"
-msgstr "%d (알 수 없음)"
+msgstr "%d(아니요)"
 
-#: ../clients/cli/settings.c:902
+#: ../clients/cli/settings.c:896
 #, c-format
 msgid "%d (yes)"
-msgstr ""
+msgstr "%d (예)"
 
-#: ../clients/cli/settings.c:905 ../clients/cli/settings.c:1605
-#, fuzzy, c-format
+#: ../clients/cli/settings.c:899 ../clients/cli/settings.c:1554
+#, c-format
 msgid "%d (default)"
-msgstr "(기본값)"
+msgstr "%d(기본값)"
 
-#: ../clients/cli/settings.c:918
+#: ../clients/cli/settings.c:912
 msgid "0 (none)"
 msgstr "0 (없음)"
 
-#: ../clients/cli/settings.c:924
+#: ../clients/cli/settings.c:918
 msgid "agent-owned, "
 msgstr "에이전트 소유 "
 
-#: ../clients/cli/settings.c:926
+#: ../clients/cli/settings.c:920
 msgid "not saved, "
 msgstr "저장되지 않음 "
 
-#: ../clients/cli/settings.c:928
+#: ../clients/cli/settings.c:922
 msgid "not required, "
 msgstr "필요하지 않음 "
 
-#: ../clients/cli/settings.c:977 ../clients/tui/nmt-mtu-entry.c:84
+#: ../clients/cli/settings.c:971 ../clients/tui/nmt-mtu-entry.c:84
 msgid "(default)"
 msgstr "(기본값)"
 
-#. ----------------------------------------------------------------------------
-#: ../clients/cli/settings.c:1063 ../clients/cli/settings.c:1106
-#: ../clients/cli/settings.c:1140 ../clients/cli/settings.c:1167
-#: ../clients/cli/settings.c:8033
-msgid "<hidden>"
-msgstr ""
-
-#: ../clients/cli/settings.c:1302
+#: ../clients/cli/settings.c:1252
 msgid "0 (disabled)"
 msgstr "0 (비활성화됨)"
 
-#: ../clients/cli/settings.c:1308
+#: ../clients/cli/settings.c:1258
 msgid "enabled, "
 msgstr "활성화됨, "
 
-#: ../clients/cli/settings.c:1310
+#: ../clients/cli/settings.c:1260
 msgid "advertise, "
 msgstr "통지,"
 
-#: ../clients/cli/settings.c:1312
+#: ../clients/cli/settings.c:1262
 msgid "willing, "
 msgstr "준비됨,"
 
-#: ../clients/cli/settings.c:1340
+#: ../clients/cli/settings.c:1290
 msgid "-1 (unset)"
 msgstr "-1 (미설정)"
 
-#: ../clients/cli/settings.c:1472 ../clients/cli/settings.c:1777
-#: ../clients/cli/settings.c:1917
+#: ../clients/cli/settings.c:1422 ../clients/cli/settings.c:1724
+#: ../clients/cli/settings.c:1864
 msgid "auto"
 msgstr "자동"
 
-#: ../clients/cli/settings.c:1485 ../clients/cli/settings.c:1948
+#: ../clients/cli/settings.c:1435 ../clients/cli/settings.c:1895
 msgid "default"
 msgstr "기본값 "
 
-#: ../clients/cli/settings.c:1607
-#, fuzzy, c-format
+#: ../clients/cli/settings.c:1556
+#, c-format
 msgid "%d (off)"
-msgstr "%d (알 수 없음)"
+msgstr "%d(끄기)"
 
-#: ../clients/cli/settings.c:1823
+#: ../clients/cli/settings.c:1770
 #, c-format
 msgid ""
 "invalid option '%s', use a combination of [%s] or 'ignore', 'default' or "
 "'none'"
 msgstr ""
+"옵션 '%s'이(가) 잘못되었습니다. [%s] 또는 'ignore', 'default' 또는 'none'을 조합하여 사용하십시오."
 
-#: ../clients/cli/settings.c:1834
+#: ../clients/cli/settings.c:1781
 msgid "'default' and 'ignore' are incompatible with other flags"
-msgstr ""
+msgstr "'default' 및 'ignore'는 다른 플래그와 호환되지 않습니다."
 
-#: ../clients/cli/settings.c:1870
-#, fuzzy, c-format
+#: ../clients/cli/settings.c:1817
+#, c-format
 msgid "invalid mode '%s', use one of %s"
-msgstr "잘못된 필드 '%s'; 허용되는 필드: %s"
+msgstr "잘못된 모드 '%s', %s 중 하나를 사용하십시오."
 
-#: ../clients/cli/settings.c:1952
+#: ../clients/cli/settings.c:1899
 #, c-format
 msgid "always"
-msgstr ""
+msgstr "항상"
 
-#: ../clients/cli/settings.c:2052 ../clients/cli/settings.c:3398
-#: ../clients/cli/settings.c:4590 ../clients/cli/settings.c:5093
+#: ../clients/cli/settings.c:1999 ../clients/cli/settings.c:3286
+#: ../clients/cli/settings.c:4478 ../clients/cli/settings.c:4981
 #: ../libnm-core/nm-keyfile-reader.c:573
-#, fuzzy, c-format
+#, c-format
 msgid "invalid option '%s', use one of [%s]"
-msgstr "잘못된 옵션 '%s' 또는 옵션 값 '%s'"
+msgstr "잘못된 옵션 '%s', [%s] 중 하나를 사용하십시오."
 
-#: ../clients/cli/settings.c:2162
+#: ../clients/cli/settings.c:2116
 #, c-format
 msgid "Do you also want to set '%s' to '%s'? [yes]: "
 msgstr "'%s'을 '%s'에 설정하시겠습니까? [예]:"
 
-#: ../clients/cli/settings.c:2164
+#: ../clients/cli/settings.c:2118
 #, c-format
 msgid "Do you also want to clear '%s'? [yes]: "
 msgstr "'%s'을 삭제하시겠습니까? [예]: "
 
-#: ../clients/cli/settings.c:2325
+#: ../clients/cli/settings.c:2279
 #, c-format
 msgid ""
 "Warning: %s.%s set to '%s', but it might be ignored in infrastructure mode\n"
-msgstr ""
+msgstr "경고: %s.%s(이)가 '%s'(으)로 설정되어 있지만, 인프라 모드에서는 무시될 수 있습니다.\n"
 
-#: ../clients/cli/settings.c:2344
+#: ../clients/cli/settings.c:2298
 #, c-format
 msgid "Warning: setting %s.%s requires removing ipv4 and ipv6 settings\n"
-msgstr ""
+msgstr "경고: 설정 %s.%s의 경우 ipv4 및 ipv6 설정을 제거해야 합니다.\n"
 
-#: ../clients/cli/settings.c:2346
-#, fuzzy
+#: ../clients/cli/settings.c:2300
 msgid "Do you want to remove them? [yes] "
-msgstr "지정 하시겠습니까? (예/아니오) [예]"
+msgstr "제거하시겠습니까? [예] "
 
-#: ../clients/cli/settings.c:2482 ../clients/cli/settings.c:2877
-#: ../clients/cli/settings.c:5294
+#: ../clients/cli/settings.c:2396 ../clients/cli/settings.c:2791
+#: ../clients/cli/settings.c:5182
 #, c-format
 msgid "'%s' is not valid"
 msgstr "'%s'이 올바르지 않습니다 "
 
-#: ../clients/cli/settings.c:2505
+#: ../clients/cli/settings.c:2419
 #, c-format
 msgid "'%d' is not valid; use <%d-%d>"
-msgstr ""
-"'%d'이 올바르지 않습니다; <%d-%d>을\n"
+msgstr "'%d'이 올바르지 않습니다; <%d-%d>을\n"
 "(를) 사용합니다"
 
-#: ../clients/cli/settings.c:2527
-#, fuzzy, c-format
+#: ../clients/cli/settings.c:2441
+#, c-format
 msgid "'%lld' is not valid; use <%lld-%lld>"
-msgstr ""
-"'%d'이 올바르지 않습니다; <%d-%d>을\n"
-"(를) 사용합니다"
+msgstr "'%lld'이(가) 유효하지 않습니다. <%lld-%lld>을(를) 사용합니다."
 
-#: ../clients/cli/settings.c:2549
-#, fuzzy, c-format
+#: ../clients/cli/settings.c:2463
+#, c-format
 msgid "'%u' is not valid; use <%u-%u>"
-msgstr "'%u'이 올바르지 않습니다; <%d-%d>을(를) 사용합니다 "
+msgstr "'%u'이 올바르지 않습니다; <%u-%u>을(를) 사용합니다 "
 
-#: ../clients/cli/settings.c:2588
-#, fuzzy, c-format
+#: ../clients/cli/settings.c:2502
+#, c-format
 msgid "'%u' flags are not valid; use combination of %s"
-msgstr "'%s'는 올바르지 않습니다; [%s] 또는 [%s]를 사용합니다 "
+msgstr "'%u' 플래그가 유효하지 않습니다. %s 결합을 사용하십시오."
 
-#: ../clients/cli/settings.c:2655
+#: ../clients/cli/settings.c:2569
 #, c-format
 msgid "'%s' is not valid; use <option>=<value>"
 msgstr "'%s'가 올바르지 않습니다; <option>=<value>를 사용합니다 "
 
-#: ../clients/cli/settings.c:2689
+#: ../clients/cli/settings.c:2603
 #, c-format
 msgid "index '%s' is not valid"
 msgstr "인덱스 '%s'가 올바르지 않습니다 "
 
-#: ../clients/cli/settings.c:2694 ../clients/cli/settings.c:2719
+#: ../clients/cli/settings.c:2608 ../clients/cli/settings.c:2633
 msgid "no item to remove"
 msgstr "삭제할 항목이 없습니다 "
 
-#: ../clients/cli/settings.c:2698 ../clients/cli/settings.c:2723
+#: ../clients/cli/settings.c:2612 ../clients/cli/settings.c:2637
 #, c-format
 msgid "index '%d' is not in range <0-%d>"
 msgstr "인덱스 '%d'가 범위 <0-%d>에 없습니다 "
 
-#: ../clients/cli/settings.c:2738
+#: ../clients/cli/settings.c:2652
 #, c-format
 msgid "invalid option '%s'"
 msgstr "잘못된 옵션 '%s'"
 
-#: ../clients/cli/settings.c:2740
+#: ../clients/cli/settings.c:2654
 msgid "missing option"
 msgstr "누락된 옵션 "
 
-#: ../clients/cli/settings.c:2767 ../clients/cli/settings.c:2787
-#: ../clients/cli/settings.c:2807 ../clients/cli/settings.c:2827
+#: ../clients/cli/settings.c:2681 ../clients/cli/settings.c:2701
+#: ../clients/cli/settings.c:2721 ../clients/cli/settings.c:2741
 #, c-format
 msgid "'%s' is not a valid number (or out of range)"
 msgstr "'%s'은 올바른 번호가 아닙니다 (또는 범위 밖의 번호)"
 
-#: ../clients/cli/settings.c:2861
-#, fuzzy, c-format
+#: ../clients/cli/settings.c:2775
+#, c-format
 msgid "'%s' is not a valid value; use -1, 0 or 1"
-msgstr "'%s'은 올바르지 않습니다; 0, 1, 2를 사용합니다 "
+msgstr "'%s'이(가) 유효하지 않습니다. -1, 0 또는 1을 사용하십시오."
 
-#: ../clients/cli/settings.c:2893
+#: ../clients/cli/settings.c:2807
 #, c-format
 msgid "'%s' is not a valid Ethernet MAC"
 msgstr "'%s'은 올바른 이더넷 MAC이 아닙니다 "
 
-#: ../clients/cli/settings.c:2918 ../libnm-core/nm-setting-connection.c:864
+#: ../clients/cli/settings.c:2832 ../libnm-core/nm-setting-connection.c:864
 #: ../libnm-core/nm-setting-infiniband.c:255
 #: ../libnm-util/nm-setting-connection.c:834
 #: ../libnm-util/nm-setting-infiniband.c:269
@@ -5394,99 +5831,84 @@ msgstr "'%s'은 올바른 이더넷 MAC이 아닙니다 "
 msgid "'%s' is not a valid interface name"
 msgstr "'%s'은(는) 올바른 인터페이스 이름이 아닙니다"
 
-#: ../clients/cli/settings.c:2942
-#, fuzzy, c-format
+#: ../clients/cli/settings.c:2856
+#, c-format
 msgid "'%s' is not a valid flag number; use <0-%d>"
-msgstr "'%s'은 올바른 채널이 아닙니다; <1-13>을 사용합니다 "
+msgstr "'%s'은(는) 유효한 플래그 번호가 아닙니다. <0-%d>을(를) 사용하십시오."
 
-#: ../clients/cli/settings.c:2954
+#: ../clients/cli/settings.c:2868
 #, c-format
 msgid "Warning: '%s' sum is higher than all flags => all flags set\n"
-msgstr ""
+msgstr "경고: '%s' 합계가 모든 플래그보다 높습니다. => 설정된 모든 플래그\n"
 
-#: ../clients/cli/settings.c:2995
+#: ../clients/cli/settings.c:2909
 #, c-format
 msgid "'%s' is not a valid hex character"
 msgstr "'%s'는 올바른 16 진수 문자가 아닙니다 "
 
-#: ../clients/cli/settings.c:3025
+#: ../clients/cli/settings.c:2939
 #, c-format
 msgid "'%s' is not a valid MAC"
 msgstr "'%s'은 올바른 MAC이 아닙니다 "
 
-#. Don't allow setting type unless the connection is brand new.
-#. * Just because it's a bad idea and the user wouldn't probably want that.
-#. * No technical reason, really.
-#. * Also, using uuid to see if the connection is brand new is a bit
-#. * 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/cli/settings.c:3053
-#, fuzzy, c-format
-msgid "Can not change the connection type"
-msgstr "연결 유형 입력: "
-
-#: ../clients/cli/settings.c:3077 ../libnm-core/nm-setting-connection.c:853
+#: ../clients/cli/settings.c:2965 ../libnm-core/nm-setting-connection.c:853
 #: ../libnm-util/nm-setting-connection.c:791
 #, c-format
 msgid "'%s' is not a valid UUID"
 msgstr "'%s'은 올바른 UUID가 아닙니다 "
 
-#: ../clients/cli/settings.c:3144
+#: ../clients/cli/settings.c:3032
 #, c-format
 msgid "the property doesn't contain permission '%s'"
-msgstr ""
+msgstr "속성에 권한 '%s'(이)가 포함되어 있지 않습니다."
 
-#: ../clients/cli/settings.c:3156
+#: ../clients/cli/settings.c:3044
 msgid ""
-"Enter a list of user permissions. This is a list of user names formatted "
-"as:\n"
+"Enter a list of user permissions. This is a list of user names formatted as:\n"
 "  [user:]<user name 1>, [user:]<user name 2>,...\n"
 "The items can be separated by commas or spaces.\n"
 "\n"
 "Example: alice bob charlie\n"
 msgstr ""
-"사용자 권한 목록을 입력합니다. 다음과 같은 형식으로된 사용자 이름 목록입니"
-"다: \n"
+"사용자 권한 목록을 입력합니다. 다음과 같은 형식으로된 사용자 이름 목록입니다: \n"
 "  [user:]<user name 1>, [user:]<user name 2>,...\n"
 "여러 사용자 이름은 쉼표나 공백으로 구분할 수 있습니다.\n"
 "\n"
 "예: alice bob charlie\n"
 
-#: ../clients/cli/settings.c:3175
+#: ../clients/cli/settings.c:3063
 #, c-format
 msgid "'%s' is not valid master; use ifname or connection UUID"
 msgstr "'%s'는 올바른 마스터가 아닙니다; ifname 또는 연결 UUID를 사용합니다 "
 
-#: ../clients/cli/settings.c:3219
+#: ../clients/cli/settings.c:3107
 #, c-format
 msgid "Warning: %s is not an UUID of any existing connection profile\n"
-msgstr ""
+msgstr "경고: %s은(는) 기존 연결 프로필의 UUID가 아닙니다.\n"
 
-#: ../clients/cli/settings.c:3223 ../clients/cli/settings.c:3239
-#, fuzzy, c-format
+#: ../clients/cli/settings.c:3111 ../clients/cli/settings.c:3127
+#, c-format
 msgid "'%s' is not a VPN connection profile"
-msgstr "오류: '%s'는 올바른 연결 유형이 아닙니다. "
+msgstr "'%s'은(는) VPN 연결 프로파일이 아닙니다."
 
-#: ../clients/cli/settings.c:3232
-#, fuzzy, c-format
+#: ../clients/cli/settings.c:3120
+#, c-format
 msgid "'%s' is not a name of any exiting profile"
-msgstr "'%s'은 올바른 팀 설정 또는 파일 이름이 아닙니다."
+msgstr "'%s'은(는) 기존 프로파일의 이름이 아닙니다."
 
-#: ../clients/cli/settings.c:3266
-#, fuzzy, c-format
+#: ../clients/cli/settings.c:3154
+#, c-format
 msgid "the value '%s' is not a valid UUID"
-msgstr "'%s'은 올바른 UUID가 아닙니다 "
+msgstr "값 '%s'은(는) 유효한 UUID가 아닙니다."
 
-#: ../clients/cli/settings.c:3273
+#: ../clients/cli/settings.c:3161
 #, c-format
 msgid "the property doesn't contain UUID '%s'"
-msgstr ""
+msgstr "속성에 UUID '%s'(이)가 포함되어 있지 않습니다."
 
-#: ../clients/cli/settings.c:3285
+#: ../clients/cli/settings.c:3173
 msgid ""
-"Enter secondary connections that should be activated when this connection "
-"is\n"
+"Enter secondary connections that should be activated when this connection is\n"
 "activated. Connections can be specified either by UUID or ID (name). nmcli\n"
 "transparently translates names to UUIDs. Note that NetworkManager only "
 "supports\n"
@@ -5495,8 +5917,15 @@ msgid ""
 "\n"
 "Example: private-openvpn, fe6ba5d8-c2fc-4aae-b2e3-97efddd8d9a7\n"
 msgstr ""
+"이 연결이 활성화되었을 때 활성화해야 하는 보조 연결을\n"
+"입력하십시오. 연결은 UUID 또는 ID(이름)로 지정할 수 있습니다. nmcli는\n"
+"투명한 방식으로 이름을 UUID로 변환합니다. 현재 네트워크 관리자는 VPN을\n"
+"보조 연결로만 지원합니다.\n"
+"항목은 쉼표나 공백으로 구분할 수 있습니다.\n"
+"\n"
+"예: private-openvpn, fe6ba5d8-c2fc-4aae-b2e3-97efddd8d9a7\n"
 
-#: ../clients/cli/settings.c:3352
+#: ../clients/cli/settings.c:3240
 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"
@@ -5504,38 +5933,51 @@ msgid ""
 "'false','no','off' to set the connection as not metered\n"
 "'unknown' to let NetworkManager choose a value using some heuristics\n"
 msgstr ""
+"연결이 데이터\n"
+"할당량, 사용량 비용 또는 기타 제한 사항을 요구하는지를 나타내는 값을 입력하십시오. 허용되는 옵션은 다음과 같습니다.\n"
+"연결을 데이터 통신으로 설정하는 경우: 'true', 'yes', 'on'\n"
+"연결을 데이터 통신으로 설정하지 않은 경우: 'false', 'no', 'off'\n"
+"네트워크 관리자가 일부 추론을 사용하여 값을 선택하게 하는 경우: 'unknown'\n"
 
-#: ../clients/cli/settings.c:3476
+#: ../clients/cli/settings.c:3364
 msgid "private key password not provided"
 msgstr "개인키 암호가 지정되어 있지 않습니다 "
 
-#: ../clients/cli/settings.c:3504
-#, fuzzy, c-format
+#: ../clients/cli/settings.c:3392
+#, c-format
 msgid "the property doesn't contain EAP method '%s'"
-msgstr "속성을 변경할 수 없습니다 "
+msgstr "속성에 EAP 메서드가 포함되어 있지 않습니다.'%s'"
 
-#: ../clients/cli/settings.c:3521
+#: ../clients/cli/settings.c:3409
 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 ""
+"CA 인증서의 파일 경로를 입력합니다(선택적으로 접두사 file://이 추가됨).\n"
+"  [file://]<파일 경로>\n"
+"nmcli는 인증서를 원시 blob 데이터로 지정하도록 지원하지 않습니다.\n"
+"예: /home/cimrman/cacert.crt\n"
 
-#: ../clients/cli/settings.c:3540
+#: ../clients/cli/settings.c:3428
 #, c-format
 msgid "the property doesn't contain alternative subject match '%s'"
-msgstr ""
+msgstr "속성에 대체 주체 일치 항목 '%s'(이)가 포함되어 있지 않습니다."
 
-#: ../clients/cli/settings.c:3556
+#: ../clients/cli/settings.c:3444
 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 ""
+"클라이언트 인증서의 파일 경로를 입력합니다(선택적으로 접두사 file://이 추가됨).\n"
+"  [file://]<파일 경로>\n"
+"nmcli는 인증서를 원시 blob 데이터로 지정하도록 지원하지 않습니다.\n"
+"예: /home/cimrman/jara.crt\n"
 
-#: ../clients/cli/settings.c:3568
+#: ../clients/cli/settings.c:3456
 msgid ""
 "Enter file path to CA certificate for inner authentication (optionally "
 "prefixed\n"
@@ -5544,13 +5986,18 @@ msgid ""
 "Note that nmcli does not support specifying certificates as raw blob data.\n"
 "Example: /home/cimrman/ca-zweite-phase.crt\n"
 msgstr ""
+"내부 인증을 위한 CA 인증서의 파일 경로를 입력합니다(선택적으로 접두사\n"
+" file://이 추가됨).\n"
+"  [file://]<파일 경로>\n"
+"nmcli는 인증서를 원시 blob 데이터로 지정하도록 지원하지 않습니다.\n"
+"예: /home/cimrman/ca-zweite-phase.crt\n"
 
-#: ../clients/cli/settings.c:3588
+#: ../clients/cli/settings.c:3476
 #, c-format
 msgid "the property doesn't contain \"phase2\" alternative subject match '%s'"
-msgstr ""
+msgstr "속성에 'phase2' 대체 주제 항목 '%s'(이)가 포함되어 있지 않습니다."
 
-#: ../clients/cli/settings.c:3604
+#: ../clients/cli/settings.c:3492
 msgid ""
 "Enter file path to client certificate for inner authentication (optionally "
 "prefixed\n"
@@ -5559,25 +6006,29 @@ msgid ""
 "Note that nmcli does not support specifying certificates as raw blob data.\n"
 "Example: /home/cimrman/jara-zweite-phase.crt\n"
 msgstr ""
+"내부 인증을 위한 클라이언트 인증서의 파일 경로를 입력합니다(선택적으로 접두사\n"
+" file://이 추가됨).\n"
+"  [file://]<파일 경로>\n"
+"nmcli는 인증서를 원시 blob 데이터로 지정하도록 지원하지 않습니다.\n"
+"예: /home/cimrman/jara-zweite-phase.crt\n"
 
-#: ../clients/cli/settings.c:3624
-#, fuzzy
+#: ../clients/cli/settings.c:3512
 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 ""
-"개인키로의 경로 및 키 암호 (아직 설정되지 않은 경우)를 입력합니다:\n"
-"  <file path> [<password>]\n"
+"개인 키 및 키 암호의 경로를 입력하십시오(아직 설정하지 않은 경우).\n"
+"  [file://]<파일 경로> [<암호>]\n"
+"nmcli는 원시 blob 데이터처럼 개인 키를 지정하는 것을 지원하지 않습니다.\n"
 "예: /home/cimrman/jara-priv-key Dardanely\n"
 
-#: ../clients/cli/settings.c:3695
+#: ../clients/cli/settings.c:3583
 msgid ""
 "Enter bytes as a list of hexadecimal values.\n"
 "Two formats are accepted:\n"
-"(a) a string of hexadecimal digits, where each two digits represent one "
-"byte\n"
+"(a) a string of hexadecimal digits, where each two digits represent one byte\n"
 "(b) space-separated list of bytes written as hexadecimal digits (with "
 "optional 0x/0X prefix, and optional leading 0).\n"
 "\n"
@@ -5586,15 +6037,13 @@ msgid ""
 msgstr ""
 "16 진수 값 목록을 바이트 단위로 입력합니다.\n"
 "다음의 두 가지 형식으로 입력할 수 있습니다:\n"
-"(a) 16 진수 숫자로 구성된 문자열, 여기서 각각의 두 자리수는 하나의 바이트를 "
-"나타냄\n"
-"(b) 공백으로 구분된 16 진수 숫자의 바이트 목록 (옵션으로 0x/0X 접두사 및 선"
-"행 0을 사용).\n"
+"(a) 16 진수 숫자로 구성된 문자열, 여기서 각각의 두 자리수는 하나의 바이트를 나타냄\n"
+"(b) 공백으로 구분된 16 진수 숫자의 바이트 목록 (옵션으로 0x/0X 접두사 및 선행 0을 사용).\n"
 "\n"
 "      예: ab0455a6ea3a74C2\n"
 "          ab 4 55 0xa6 ea 3a 74 C2\n"
 
-#: ../clients/cli/settings.c:3816
+#: ../clients/cli/settings.c:3704
 #, c-format
 msgid ""
 "Enter a list of bonding options formatted as:\n"
@@ -5625,58 +6074,56 @@ msgstr ""
 "\n"
 "예: mode=2,miimon=120\n"
 
-#: ../clients/cli/settings.c:3847
+#: ../clients/cli/settings.c:3735
 #, c-format
 msgid "'%s' is not a valid InfiniBand MAC"
 msgstr "'%s'는 올바른 InfiniBand MAC이 아닙니다"
 
-#: ../clients/cli/settings.c:3884
+#: ../clients/cli/settings.c:3772
 #, c-format
 msgid "'%s' is not a valid IBoIP P_Key"
 msgstr "'%s'는 올바른 IBoIP P_Key가 아닙니다 "
 
-#: ../clients/cli/settings.c:3915
-#, fuzzy, c-format
+#: ../clients/cli/settings.c:3803
+#, c-format
 msgid "'%s' is not valid (the format is: ip[/prefix] [next-hop] [metric])"
-msgstr "'%s'은 올바르지 않습니다 (ip/[prefix] next-hop [metric]를 사용)"
+msgstr "'%s'이(가) 유효하지 않습니다(형식: ip[/prefix] [next-hop] [metric])"
 
-#: ../clients/cli/settings.c:3963 ../clients/cli/settings.c:3982
+#: ../clients/cli/settings.c:3851 ../clients/cli/settings.c:3870
 #, c-format
 msgid "invalid IPv4 address '%s'"
 msgstr "잘못된 IPv4 주소 '%s'"
 
-#: ../clients/cli/settings.c:3988 ../clients/cli/settings.c:4296
+#: ../clients/cli/settings.c:3876 ../clients/cli/settings.c:4184
 #, c-format
 msgid "the property doesn't contain DNS server '%s'"
-msgstr ""
+msgstr "속성에 DNS 서버 '%s'(이)가 포함되어 있지 않습니다."
 
-#: ../clients/cli/settings.c:4000
+#: ../clients/cli/settings.c:3888
 msgid ""
 "Enter a list of IPv4 addresses of DNS servers.\n"
 "\n"
 "Example: 8.8.8.8, 8.8.4.4\n"
-msgstr ""
-"DNS 서버의 IPv4 주소 목록을 입력하십시오.\n"
+msgstr "DNS 서버의 IPv4 주소 목록을 입력하십시오.\n"
 "\n"
 "Example: 8.8.8.8, 8.8.4.4\n"
 
-#: ../clients/cli/settings.c:4036 ../clients/cli/settings.c:4350
+#: ../clients/cli/settings.c:3924 ../clients/cli/settings.c:4238
 #, c-format
 msgid "the property doesn't contain DNS search domain '%s'"
-msgstr ""
+msgstr "속성에 DNS 검색 도메인 '%s'(이)가 포함되어 있지 않습니다."
 
-#: ../clients/cli/settings.c:4074 ../clients/cli/settings.c:4388
+#: ../clients/cli/settings.c:3962 ../clients/cli/settings.c:4276
 #, c-format
 msgid "the property doesn't contain DNS option '%s'"
-msgstr ""
+msgstr "속성에 DNS 옵션 '%s'(이)가 포함되어 있지 않습니다."
 
-#: ../clients/cli/settings.c:4128 ../clients/cli/settings.c:4441
+#: ../clients/cli/settings.c:4016 ../clients/cli/settings.c:4329
 #, c-format
 msgid "the property doesn't contain IP address '%s'"
-msgstr ""
+msgstr "속성에 IP 주소 '%s'(이)가 포함되어 있지 않습니다."
 
-#: ../clients/cli/settings.c:4141
-#, fuzzy
+#: ../clients/cli/settings.c:4029
 msgid ""
 "Enter a list of IPv4 addresses formatted as:\n"
 "  ip[/prefix], ip[/prefix],...\n"
@@ -5684,24 +6131,23 @@ msgid ""
 "\n"
 "Example: 192.168.1.5/24, 10.0.0.11/24\n"
 msgstr ""
-"다음과 같은 형식으로 IPv4 주소 목록을 입력하십시오:\n"
-"  ip[/prefix] [gateway], ip[/prefix] [gateway],...\n"
-"누락된 접두사는 접두사 32로 간주합니다.\n"
+"다음과 같은 형식으로 IPv4 주소를 입력하십시오.\n"
+"  ip[/prefix], ip[/prefix],...\n"
+"누락된 접두어는 접두어 32로 간주됩니다.\n"
 "\n"
-"예: 192.168.1.5/24 192.168.1.1, 10.0.0.11/24\n"
+"예: 192.168.1.5/24, 10.0.0.11/24\n"
 
-#: ../clients/cli/settings.c:4157 ../clients/cli/settings.c:4470
-#, fuzzy, c-format
+#: ../clients/cli/settings.c:4045 ../clients/cli/settings.c:4358
+#, c-format
 msgid "invalid gateway address '%s'"
-msgstr "잘못된 게이트웨이 '%s'"
+msgstr "잘못된 게이트웨이 주소 '%s'"
 
-#: ../clients/cli/settings.c:4212 ../clients/cli/settings.c:4525
-#, fuzzy, c-format
+#: ../clients/cli/settings.c:4100 ../clients/cli/settings.c:4413
+#, c-format
 msgid "the property doesn't contain route '%s'"
-msgstr "속성을 변경할 수 없습니다 "
+msgstr "속성에 라우팅 '%s'이(가) 포함되어 있지 않습니다."
 
-#: ../clients/cli/settings.c:4225
-#, fuzzy
+#: ../clients/cli/settings.c:4113
 msgid ""
 "Enter a list of IPv4 routes formatted as:\n"
 "  ip[/prefix] [next-hop] [metric],...\n"
@@ -5713,19 +6159,22 @@ 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 ""
-"다음과 같은 형식으로 IPv4 라우팅 목록을 입력합니다:\n"
-"  ip/[prefix] next-hop [metric],...\n"
-"누락된 접두사는 접두사 32로 간주합니다.\n"
-"누락된 수치는 수치 0으로 간주합니다.\n"
+"다음과 같은 형식으로 IPv4 라우팅 목록을 입력하십시오.\n"
+"ip[/prefix] [next-hop] [metric],...\n"
+"\n"
+"누락된 접두어는 접두어 32로 간주됩니다.\n"
+"누락된 다음 홉은 0.0.0.0으로 간주됩니다.\n"
+"누락된 메트릭은 기본값(NM/커널에서 기본값이 설정됨)을 의미합니다.\n"
 "\n"
 "예: 192.168.2.0/24 192.168.2.1 3, 10.1.0.0/16 10.0.0.254\n"
+"          10.1.2.0/24\n"
 
-#: ../clients/cli/settings.c:4271 ../clients/cli/settings.c:4290
+#: ../clients/cli/settings.c:4159 ../clients/cli/settings.c:4178
 #, c-format
 msgid "invalid IPv6 address '%s'"
 msgstr "잘못된 IPv6 주소 '%s'"
 
-#: ../clients/cli/settings.c:4308
+#: ../clients/cli/settings.c:4196
 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 "
@@ -5736,16 +6185,13 @@ 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/cli/settings.c:4454
-#, fuzzy
+#: ../clients/cli/settings.c:4342
 msgid ""
 "Enter a list of IPv6 addresses formatted as:\n"
 "  ip[/prefix], ip[/prefix],...\n"
@@ -5753,15 +6199,13 @@ msgid ""
 "\n"
 "Example: 2607:f0d0:1002:51::4/64, 1050:0:0:0:5:600:300c:326b\n"
 msgstr ""
-"다음과 같은 형식으로 IPv6 주소 목록을 입력합니다:\n"
-"  ip[/prefix] [gateway], ip[/prefix] [gateway],...\n"
-"누락된 접두사는 접두사 128로 간주합니다.\n"
+"다음과 같은 형식으로 IPv6 주소 목록을 입력하십시오.\n"
+"  ip[/prefix], ip[/prefix],...\n"
+"누락된 접두어는 접두어 128로 간주됩니다.\n"
 "\n"
-"예: 2607:f0d0:1002:51::4/64 2607:f0d0:1002:51::1, "
-"1050:0:0:0:5:600:300c:326b\n"
+"예: 2607:f0d0:1002:51::4/64, 1050:0:0:0:5:600:300c:326b\n"
 
-#: ../clients/cli/settings.c:4538
-#, fuzzy
+#: ../clients/cli/settings.c:4426
 msgid ""
 "Enter a list of IPv6 routes formatted as:\n"
 "  ip[/prefix] [next-hop] [metric],...\n"
@@ -5774,36 +6218,39 @@ msgid ""
 "db8:beef::3 2\n"
 "          abbe::/64 55\n"
 msgstr ""
-"다음과 같은 형식으로 IPv6 라우팅 목록을 입력합니다:\n"
-"  ip/[prefix] next-hop [metric],...\n"
-"누락된 접두사는 접두사 128로 간주합니다.\n"
-"누락된 수치는 수치 0으로 간주합니다.\n"
+"다음과 같은 형식으로 IPv6 라우팅 목록을 입력하십시오.\n"
+"  ip[/prefix] [next-hop] [metric],...\n"
+"\n"
+"누락된 접두어는 접두어 128로 간주됩니다.\n"
+"누락된 다음 홉은 \"::\"(으)로 간주됩니다.\n"
+"누락된 메트릭은 기본값(NM/커널에서 기본값이 설정됨)을 의미합니다.\n"
 "\n"
-"예: 2001:db8:beef:2::/64 2001:db8:beef::2, 2001:db8:beef:3::/64 2001:db8:"
-"beef::3 2\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"
 
-#: ../clients/cli/settings.c:4555 ../libnm-core/nm-setting-gsm.c:363
+#: ../clients/cli/settings.c:4443 ../libnm-core/nm-setting-gsm.c:363
 #: ../libnm-util/nm-setting-gsm.c:364
 #, c-format
 msgid "'%s' is not a number"
 msgstr "'%s'은 번호가 아닙니다 "
 
-#: ../clients/cli/settings.c:4562
+#: ../clients/cli/settings.c:4450
 #, c-format
 msgid "'%s' is not valid; use 0, 1, or 2"
 msgstr "'%s'은 올바르지 않습니다; 0, 1, 2를 사용합니다 "
 
-#: ../clients/cli/settings.c:4609
+#: ../clients/cli/settings.c:4497
 #, c-format
 msgid "'%s' is not a valid channel; use <1-13>"
 msgstr "'%s'은 올바른 채널이 아닙니다; <1-13>을 사용합니다 "
 
-#: ../clients/cli/settings.c:4646
+#: ../clients/cli/settings.c:4534
 #, c-format
 msgid "'%s' is not valid; use [e, o, n]"
 msgstr "'%s'은 올바르지 않습니다; [e, o, n]을 사용합니다 "
 
-#: ../clients/cli/settings.c:4674
+#: ../clients/cli/settings.c:4562
 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 "
@@ -5813,74 +6260,75 @@ msgid ""
 "\"roundrobin\"}, \"ports\": {\"eth1\": {}, \"eth2\": {}} }\n"
 "          set team.config /etc/my-team.conf\n"
 msgstr ""
-"nmcli는 다이렉트 JSON 설정 데이터 및 설정이 포함된 파일 이름 모두를 받을 수 "
-"있습니다. 설정이 포함된 파일의 경우 파일을 읽어 컨텐츠를 속성에 배치합니다.\n"
+"nmcli는 다이렉트 JSON 설정 데이터 및 설정이 포함된 파일 이름 모두를 받을 수 있습니다. 설정이 포함된 파일의 경우 파일을 읽어 "
+"컨텐츠를 속성에 배치합니다.\n"
 "\n"
 "예: set team.config { \"device\": \"team0\", \"runner\": {\"name\": "
 "\"roundrobin\"}, \"ports\": {\"eth1\": {}, \"eth2\": {}} }\n"
 "          set team.config /etc/my-team.conf\n"
 
-#: ../clients/cli/settings.c:4714
+#: ../clients/cli/settings.c:4602
 msgid "no priority to remove"
 msgstr "삭제할 우선 순위가 없습니다 "
 
-#: ../clients/cli/settings.c:4718
+#: ../clients/cli/settings.c:4606
 #, c-format
 msgid "index '%d' is not in the range of <0-%d>"
 msgstr "인덱스 '%d'가 범위 <0-%d>에 없습니다 "
 
-#: ../clients/cli/settings.c:4757
+#: ../clients/cli/settings.c:4645
 #, c-format
 msgid ""
-"Warning: only one mapping at a time is supported; taking the first one (%s)\n"
-msgstr ""
+"Warning: only one mapping at a time is supported; taking the first one "
+"(%s)\n"
+msgstr "경고: 한 번에 1회의 매핑만 지원됩니다. 첫 번째 항목(%s)을 가져옵니다.\n"
 
-#: ../clients/cli/settings.c:4764
-#, fuzzy, c-format
+#: ../clients/cli/settings.c:4652
+#, c-format
 msgid "the property doesn't contain mapping '%s'"
-msgstr "속성을 변경할 수 없습니다 "
+msgstr "속성에 매핑 '%s'이(가) 포함되어 있지 않습니다."
 
-#: ../clients/cli/settings.c:4812
-#, fuzzy, c-format
+#: ../clients/cli/settings.c:4700
+#, c-format
 msgid "'%s' cannot be empty"
-msgstr "'%s' 옵션이 비어있습니다 "
+msgstr "'%s'은(는) 비어 있을 수 없습니다."
 
-#: ../clients/cli/settings.c:4886 ../clients/cli/settings.c:5053
-#: ../libnm-core/nm-setting-wired.c:651 ../libnm-core/nm-setting-wireless.c:820
-#: ../libnm-core/nm-setting-wireless.c:832 ../libnm-util/nm-setting-wired.c:646
+#: ../clients/cli/settings.c:4774 ../clients/cli/settings.c:4941
+#: ../libnm-core/nm-setting-wired.c:651
+#: ../libnm-core/nm-setting-wireless.c:820
+#: ../libnm-core/nm-setting-wireless.c:832
+#: ../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/cli/settings.c:4892 ../clients/cli/settings.c:5059
+#: ../clients/cli/settings.c:4780 ../clients/cli/settings.c:4947
 #, c-format
 msgid "the property doesn't contain MAC address '%s'"
-msgstr ""
+msgstr "속성에 MAC 주소 '%s'(이)가 포함되어 있지 않습니다."
 
-#: ../clients/cli/settings.c:4911
-#, fuzzy, c-format
+#: ../clients/cli/settings.c:4799
+#, c-format
 msgid "'%s' is not valid; 2 or 3 strings should be provided"
-msgstr "'%s'이 올바르지 않습니다; 3 개의 문자열을 지정해야 합니다 "
+msgstr "'%s'이(가) 유효하지 않습니다. 2개 또는 3개 문자열을 입력해야 합니다."
 
-#: ../clients/cli/settings.c:4925
-#, fuzzy
+#: ../clients/cli/settings.c:4813
 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"
+msgstr "하위 채널 목록을 입력하십시오(쉼표 또는 공백으로 구분).\n"
 "\n"
 "예: 0.0.0e20 0.0.0e21 0.0.0e22\n"
 
-#: ../clients/cli/settings.c:4947
+#: ../clients/cli/settings.c:4835
 #, c-format
 msgid "'%s' string value should consist of 1 - 199 characters"
-msgstr ""
+msgstr "'%s' 문자열 값은 1~199자로 구성해야 합니다."
 
-#: ../clients/cli/settings.c:4979
+#: ../clients/cli/settings.c:4867
 #, c-format
 msgid ""
 "Enter a list of S/390 options formatted as:\n"
@@ -5891,139 +6339,145 @@ msgstr ""
 "  option = <value>, option = <value>,...\n"
 "올바른 옵션은 다음과 같습니다: %s\n"
 
-#: ../clients/cli/settings.c:5025
+#: ../clients/cli/settings.c:4913
 #, c-format
 msgid "'%s' is not a valid channel"
 msgstr "'%s'는 올바른 채널이 아닙니다 "
 
-#: ../clients/cli/settings.c:5031
+#: ../clients/cli/settings.c:4919
 #, c-format
 msgid "'%ld' is not a valid channel"
 msgstr "'%ld'는 올바른 채널이 아닙니다 "
 
-#: ../clients/cli/settings.c:5125
-#, fuzzy, c-format
+#: ../clients/cli/settings.c:5013
+#, c-format
 msgid "invalid option '%s', use 'default', 'never' or 'always'"
-msgstr "잘못된 옵션 '%s' 또는 옵션 값 '%s'"
+msgstr "잘못된 옵션 '%s', '기본값', '하지않음' 또는 '항상'을 사용하십시오."
 
-#: ../clients/cli/settings.c:5186 ../clients/cli/settings.c:5225
-#: ../clients/cli/settings.c:5264
+#: ../clients/cli/settings.c:5074 ../clients/cli/settings.c:5113
+#: ../clients/cli/settings.c:5152
 #, c-format
 msgid "the property doesn't contain protocol '%s'"
-msgstr ""
+msgstr "속성에 프로토콜 '%s'(이)가 포함되어 있지 않습니다."
 
-#: ../clients/cli/settings.c:5303
+#: ../clients/cli/settings.c:5191
 #, c-format
 msgid ""
 "'%s' not compatible with %s '%s', please change the key or set the right %s "
 "first."
-msgstr ""
+msgstr "'%s'은(는) %s '%s'(와)과 호환되지 않습니다. 키를 변경하거나 올바른 %s(을)를 먼저 설정하십시오."
 
-#: ../clients/cli/settings.c:5311
+#: ../clients/cli/settings.c:5199
 #, c-format
 msgid "WEP key is guessed to be of '%s'\n"
 msgstr "WEP 키는 '%s'라고 가정합니다\n"
 
-#: ../clients/cli/settings.c:5313
-#, fuzzy, c-format
+#: ../clients/cli/settings.c:5201
+#, c-format
 msgid "WEP key index set to '%d'\n"
-msgstr "WEP 키는 '%s'라고 가정합니다\n"
+msgstr "WEP 키 인덱스가 '%d'으(로) 설정되었습니다.\n"
 
-#: ../clients/cli/settings.c:5336
+#: ../clients/cli/settings.c:5224
 #, c-format
 msgid "'%s' not among [0 (unknown), 1 (key), 2 (passphrase)]"
 msgstr "'%s'는 [0 (알 수 없음), 1 (키), 2 (암호)]가 아닙니다 "
 
-#: ../clients/cli/settings.c:5352 ../clients/cli/settings.c:5355
-#: ../clients/cli/settings.c:5358 ../clients/cli/settings.c:5361
+#: ../clients/cli/settings.c:5240 ../clients/cli/settings.c:5243
+#: ../clients/cli/settings.c:5246 ../clients/cli/settings.c:5249
 #, c-format
 msgid ""
 "Warning: '%s' is not compatible with '%s' type, please change or delete the "
 "key.\n"
-msgstr ""
+msgstr "경고: '%s'은(는) '%s' 유형과 호환되지 않습니다. 키를 변경하거나 삭제하십시오.\n"
 
-#: ../clients/cli/settings.c:5374
+#: ../clients/cli/settings.c:5262
 #, c-format
 msgid ""
 "Enter the type of WEP keys. The accepted values are: 0 or unknown, 1 or key, "
 "and 2 or passphrase.\n"
 msgstr ""
-"WEP 키 유형을 입력합니다. 사용할 수 있는 값은 다음과 같습니다: 0 또는 알 수 "
-"없음, 1 또는 키, 2 또는 암호입니다.\n"
+"WEP 키 유형을 입력합니다. 사용할 수 있는 값은 다음과 같습니다: 0 또는 알 수 없음, 1 또는 키, 2 또는 암호입니다.\n"
 
-#: ../clients/cli/settings.c:5387
+#: ../clients/cli/settings.c:5275
 #, c-format
 msgid "'%s' is not a valid PSK"
 msgstr "'%s'는 올바른 PSK가 아닙니다 "
 
-#: ../clients/cli/settings.c:5431
+#: ../clients/cli/settings.c:5319
 #, c-format
 msgid "'%s' is not a valid DCB flag"
 msgstr "'%s'은(는) 올바른 DCB 플래그가 아닙니다"
 
-#: ../clients/cli/settings.c:5454
+#: ../clients/cli/settings.c:5342
 #, c-format
 msgid "'%s' is not a DCB app priority"
 msgstr "'%s'은(는) DCB 애플리케이션 우선 순위가 아닙니다 "
 
-#: ../clients/cli/settings.c:5480
+#: ../clients/cli/settings.c:5368
 msgid "must contain 8 comma-separated numbers"
 msgstr "쉼표로 구분된 8 개의 번호가 포함되어 있어야 합니다 "
 
-#: ../clients/cli/settings.c:5497
+#: ../clients/cli/settings.c:5385
 #, c-format
 msgid "'%s' not a number between 0 and %u (inclusive) or %u"
 msgstr "'%s'은 0에서 %u (포함) 또는 %u 사이의 숫자가 아닙니다 "
 
-#: ../clients/cli/settings.c:5500
+#: ../clients/cli/settings.c:5388
 #, c-format
 msgid "'%s' not a number between 0 and %u (inclusive)"
 msgstr "'%s'은 0에서 %u (포함) 사이의 숫자가 아닙니다 "
 
-#: ../clients/cli/settings.c:5522
+#: ../clients/cli/settings.c:5410
 #, c-format
-msgid ""
-"Warning: changes will have no effect until '%s' includes 1 (enabled)\n"
+msgid "Warning: changes will have no effect until '%s' includes 1 (enabled)\n"
 "\n"
-msgstr ""
-"경고: 변경 사항은 '%s'에 1 (활성화)를 포함할 때 까지 효력이 없습니다\n"
+msgstr "경고: 변경 사항은 '%s'에 1 (활성화)를 포함할 때 까지 효력이 없습니다\n"
 "\n"
 
-#: ../clients/cli/settings.c:5575
+#: ../clients/cli/settings.c:5463
 #, c-format
 msgid "bandwidth percentages must total 100%%"
 msgstr "대역폭 비율은 총 100%%가 되어야 합니다 "
 
-#: ../clients/cli/settings.c:5661 ../clients/cli/settings.c:5667
+#: ../clients/cli/settings.c:5549 ../clients/cli/settings.c:5555
 msgid "SIM operator ID must be a 5 or 6 number MCCMNC code"
-msgstr ""
+msgstr "SIM 연산자 ID는 5 또는 6자리 MCCMNC 코드여야 합니다."
 
-#: ../clients/cli/settings.c:5710
-#, fuzzy, c-format
+#: ../clients/cli/settings.c:5598
+#, c-format
 msgid "invalid option '%s', use '%s' or '%s'"
-msgstr "잘못된 옵션 '%s' 또는 옵션 값 '%s'"
+msgstr "잘못된 옵션 '%s', '%s' 또는 '%s'을(를) 사용하십시오."
 
-#: ../clients/cli/settings.c:7777
+#: ../clients/cli/settings.c:7644
 msgid "don't know how to get the property value"
 msgstr "속성 값을 가져오는 방법을 모릅니다 "
 
-#: ../clients/cli/settings.c:7830 ../clients/cli/settings.c:7870
+#: ../clients/cli/settings.c:7697 ../clients/cli/settings.c:7737
 msgid "the property can't be changed"
 msgstr "속성을 변경할 수 없습니다 "
 
-#: ../clients/cli/settings.c:7954
-#, fuzzy
+#: ../clients/cli/settings.c:7821
 msgid "(not available)"
-msgstr "사용할 수 없음"
+msgstr "(사용할 수 없음)"
 
-#: ../clients/cli/settings.c:7979
+#: ../clients/cli/settings.c:7846
 msgid "[NM property description]"
 msgstr "[NM 속성 설명]"
 
-#: ../clients/cli/settings.c:7984
+#: ../clients/cli/settings.c:7851
 msgid "[nmcli specific description]"
 msgstr "[nmcli 상세 설명]"
 
+#. ----------------------------------------------------------------------------
+#: ../clients/cli/settings.c:7900
+msgid "<hidden>"
+msgstr "<숨김>"
+
+#: ../clients/cli/utils.c:124
+#, c-format
+msgid "Error: value for '%s' argument is required."
+msgstr "오류: '%s' 인수 값이 필요합니다. "
+
 #: ../clients/cli/utils.c:149
 #, c-format
 msgid "Error: Argument '%s' was expected, but '%s' provided."
@@ -6034,56 +6488,94 @@ msgstr "오류: 인수 '%s'가 필요하지만 '%s'가 지정되었습니다."
 msgid "Error: Unexpected argument '%s'"
 msgstr "오류: 예상치 못한 인수 '%s'"
 
+#: ../clients/cli/utils.c:202
+#, c-format
+msgid "Error converting IP4 address '0x%X' to text form"
+msgstr "IP4 주소 '0x%X'를 텍스트 형식으로 변환하는 동안 오류가 발생했습니다"
+
+#: ../clients/cli/utils.c:230
+#, c-format
+msgid "Error converting IP6 address '%s' to text form"
+msgstr "IP6 주소 '%s'를 텍스트 형식으로 변환하는 동안 오류가 발생했습니다 "
+
 #. Translators: the first %s is the partial value entered by
 #. * the user, the second %s a list of compatible values.
-#.
-#: ../clients/cli/utils.c:492 ../clients/cli/utils.c:523
-#, fuzzy, c-format
+#. 
+#: ../clients/cli/utils.c:546 ../clients/cli/utils.c:577
+#, c-format
 msgid "'%s' is ambiguous (%s)"
-msgstr "'%s'는 애매모호합니다 (%s x %s)"
+msgstr "'%s'이(가) 불분명합니다(%s)."
 
-#: ../clients/cli/utils.c:502
+#: ../clients/cli/utils.c:556
 #, c-format
 msgid "'%s' is not valid; use [%s] or [%s]"
 msgstr "'%s'는 올바르지 않습니다; [%s] 또는 [%s]를 사용합니다 "
 
-#: ../clients/cli/utils.c:535
-#, fuzzy, c-format
+#: ../clients/cli/utils.c:589
+#, c-format
 msgid "'%s' is not valid; use [%s], [%s] or [%s]"
-msgstr "'%s'는 올바르지 않습니다; [%s] 또는 [%s]를 사용합니다 "
+msgstr "'%s'이(가) 유효하지 않습니다. [%s], [%s] 또는 [%s]을(를) 사용하십시오."
 
-#: ../clients/cli/utils.c:634
+#: ../clients/cli/utils.c:688
 #, c-format
 msgid "'%s' is ambiguous (%s x %s)"
 msgstr "'%s'는 애매모호합니다 (%s x %s)"
 
-#: ../clients/cli/utils.c:646
+#: ../clients/cli/utils.c:700
 #, c-format
 msgid "missing name, try one of [%s]"
 msgstr "이름이 누락되어 있습니다, [%s] 중 하나를 시도합니다 "
 
-#: ../clients/cli/utils.c:893
+#: ../clients/cli/utils.c:964
 #, c-format
 msgid "field '%s' has to be alone"
 msgstr "'%s' 필드는 혼자만 있어야만 합니다"
 
-#: ../clients/cli/utils.c:896
+#: ../clients/cli/utils.c:967
 #, c-format
 msgid "invalid field '%s'; allowed fields: %s"
 msgstr "잘못된 필드 '%s'; 허용되는 필드: %s"
 
-#: ../clients/cli/utils.c:953
+#: ../clients/cli/utils.c:1024
 msgid "Option '--terse' requires specifying '--fields'"
 msgstr "옵션 '--terse'는 '--fields' 설정을 요구합니다"
 
-#: ../clients/cli/utils.c:957
+#: ../clients/cli/utils.c:1028
 #, c-format
 msgid "Option '--terse' requires specific '--fields' option values , not '%s'"
 msgstr "옵션 '--terse'는 '%s'이(가) 아닌 구체적인 '--fields' 값을 요구합니다"
 
+#: ../clients/cli/utils.c:1390
+#, c-format
+msgid ""
+"Warning: nmcli (%s) and NetworkManager (%s) versions don't match. Use --"
+"nocheck to suppress the warning.\n"
+msgstr ""
+"경고: nmcli (%s) 및 네트워크 관리 (%s) 버전이 맞지 않습니다. 이 경고를 무시하려면 --nocheck 옵션을 사용하십시오."
+"\n"
+
+#: ../clients/cli/utils.c:1399
+#, c-format
+msgid ""
+"Error: nmcli (%s) and NetworkManager (%s) versions don't match. Force "
+"execution using --nocheck, but the results are unpredictable."
+msgstr ""
+"경고: nmcli (%s) 및 네트워크 관리 (%s) 버전이 맞지 않습니다. --nocheck 옵션을 사용했으므로 계속하지만, 예상치 "
+"못한 결과가 나타날 수 있습니다."
+
 #: ../clients/common/nm-polkit-listener.c:212
 msgid "An authentication session is already underway."
-msgstr ""
+msgstr "인증 세션이 이미 진행 중입니다."
+
+#. TTLS and PEAP are actually much more complicated, but this complication
+#. * is not visible here since we only care about phase2 authentication
+#. * (and don't even care of which one)
+#. 
+#: ../clients/common/nm-secret-agent-simple.c:223
+#: ../clients/common/nm-secret-agent-simple.c:328
+#: ../clients/tui/nmt-page-dsl.c:66 ../clients/tui/nmt-page-wifi.c:332
+msgid "Username"
+msgstr "사용자 이름 "
 
 #: ../clients/common/nm-secret-agent-simple.c:230
 #: ../clients/common/nm-secret-agent-simple.c:273
@@ -6092,10 +6584,9 @@ msgstr ""
 #: ../clients/common/nm-secret-agent-simple.c:492
 #: ../clients/common/nm-secret-agent-simple.c:507
 #: ../clients/common/nm-secret-agent-simple.c:525
-#: ../clients/common/nm-vpn-helpers.c:119
-#: ../clients/common/nm-vpn-helpers.c:120
-#: ../clients/common/nm-vpn-helpers.c:124
-#: ../clients/common/nm-vpn-helpers.c:127 ../clients/tui/nmt-page-dsl.c:75
+#: ../clients/common/nm-vpn-helpers.c:101
+#: ../clients/common/nm-vpn-helpers.c:102
+#: ../clients/common/nm-vpn-helpers.c:105 ../clients/tui/nmt-page-dsl.c:75
 #: ../clients/tui/nmt-page-wifi.c:277 ../clients/tui/nmt-page-wifi.c:308
 #: ../clients/tui/nmt-page-wifi.c:341
 msgid "Password"
@@ -6169,59 +6660,30 @@ msgid "A password is required to connect to '%s'."
 msgstr "'%s'에 연결하려면 암호가 필요합니다."
 
 #: ../clients/common/nm-secret-agent-simple.c:537
-#, fuzzy
 msgid "VPN password required"
-msgstr "PIN 코드가 필요합니다"
+msgstr "VPN 암호가 필요합니다."
 
-#: ../clients/common/nm-vpn-helpers.c:48
-#, fuzzy, c-format
-msgid "unknown VPN plugin \"%s\""
-msgstr "알려지지 않은 로그 영역 '%s'"
+#: ../clients/common/nm-vpn-helpers.c:61
+msgid "could not get VPN plugin info"
+msgstr "VPN 플러그인 정보를 가져올 수 없습니다"
 
-#: ../clients/common/nm-vpn-helpers.c:59
-#, c-format
-msgid "cannot cannot load legacy-only VPN plugin \"%s\" for \"%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 ""
-
-#: ../clients/common/nm-vpn-helpers.c:69
-#, fuzzy, c-format
-msgid "failed to load VPN plugin \"%s\": %s"
-msgstr "오류: %s.%s 수정에 실패했습니다: %s."
-
-#: ../clients/common/nm-vpn-helpers.c:121
-#, fuzzy
-msgid "Certificate password"
-msgstr "개인 키 암호"
-
-#: ../clients/common/nm-vpn-helpers.c:122
-#, fuzzy
-msgid "HTTP proxy password"
-msgstr "암호 표시 "
-
-#: ../clients/common/nm-vpn-helpers.c:125
-#: ../clients/common/nm-vpn-helpers.c:128
-#, fuzzy
+#: ../clients/common/nm-vpn-helpers.c:103
+#: ../clients/common/nm-vpn-helpers.c:106
 msgid "Group password"
-msgstr "암호 표시 "
+msgstr "그룹 암호"
 
-#: ../clients/common/nm-vpn-helpers.c:130 ../clients/tui/nmt-page-ip4.c:143
+#: ../clients/common/nm-vpn-helpers.c:108 ../clients/tui/nmt-page-ip4.c:143
 #: ../clients/tui/nmt-page-ip6.c:143
 msgid "Gateway"
 msgstr "게이트웨이"
 
-#: ../clients/common/nm-vpn-helpers.c:131
+#: ../clients/common/nm-vpn-helpers.c:109
 msgid "Cookie"
-msgstr ""
+msgstr "쿠키"
 
-#: ../clients/common/nm-vpn-helpers.c:132
+#: ../clients/common/nm-vpn-helpers.c:110
 msgid "Gateway certificate hash"
-msgstr ""
+msgstr "게이트웨이 인증서 해시"
 
 #: ../clients/nm-online.c:94
 msgid "Connecting"
@@ -6234,25 +6696,21 @@ msgid ""
 msgstr "연결 대기 시간, 초 단위 (옵션 없음, 기본값은 30임) "
 
 #: ../clients/nm-online.c:148
-#, fuzzy
 msgid "Exit immediately if NetworkManager is not running or connecting"
-msgstr "NetworkManager가 실행되고 있지 않을 경우 즉시 종료 "
+msgstr "NetworkManager가 실행 중이지 않거나 연결되지 않는 경우 즉시 종료 "
 
 #: ../clients/nm-online.c:149
 msgid "Don't print anything"
 msgstr "아무것도 출력하지 않음 "
 
 #: ../clients/nm-online.c:150
-#, fuzzy
 msgid "Wait for NetworkManager startup instead of a connection"
-msgstr ""
-"NetworkManager가 시작 네트워크 연결을 활성화 완료할 때 까지 대기합니다."
+msgstr "연결 대신 NetworkManager 시작을 대기합니다."
 
 #: ../clients/nm-online.c:171
 msgid ""
 "Waits for NetworkManager to finish activating startup network connections."
-msgstr ""
-"NetworkManager가 시작 네트워크 연결을 활성화 완료할 때 까지 대기합니다."
+msgstr "NetworkManager가 시작 네트워크 연결을 활성화 완료할 때 까지 대기합니다."
 
 #: ../clients/nm-online.c:178 ../clients/nm-online.c:184
 msgid "Invalid option.  Please use --help to see a list of valid options."
@@ -6261,7 +6719,7 @@ msgstr "잘못된 옵션입니다. --help를 사용하여 유효한 옵션 목�
 #: ../clients/tui/newt/nmt-newt-utils.c:177 ../clients/tui/nmt-editor.c:415
 #: ../clients/tui/nmt-password-dialog.c:174
 #: ../clients/tui/nmt-route-editor.c:122 ../clients/tui/nmtui-hostname.c:69
-#: ../clients/tui/nmtui.c:136
+#: ../clients/tui/nmtui.c:114
 msgid "OK"
 msgstr "OK"
 
@@ -6277,52 +6735,37 @@ msgid "Editor failed: %s"
 msgstr "편집기 실패: %s"
 
 #: ../clients/tui/newt/nmt-newt-utils.c:373
-#, fuzzy, c-format
+#, c-format
 msgid "Editor failed with status %d"
-msgstr "편집기 실패: %s"
+msgstr "편집기 오류, 상태: %d"
 
 #: ../clients/tui/newt/nmt-newt-utils.c:375
-#, fuzzy, c-format
+#, c-format
 msgid "Editor failed with signal %d"
-msgstr "편집기 실패: %s"
+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:146 ../libnm-glib/nm-device.c:1859
-#: ../libnm/nm-device.c:1810
-msgid "Ethernet"
-msgstr "이더넷"
-
 #: ../clients/tui/nm-editor-utils.c:150
 #, c-format
 msgid "Ethernet connection %d"
 msgstr "이더넷 연결 %d"
 
-#: ../clients/tui/nm-editor-utils.c:154 ../libnm-glib/nm-device.c:1861
-#: ../libnm/nm-device.c:1812
-msgid "Wi-Fi"
-msgstr "Wi-Fi"
-
 #: ../clients/tui/nm-editor-utils.c:158
 #, c-format
 msgid "Wi-Fi connection %d"
 msgstr "Wi-Fi 연결 %d"
 
-#: ../clients/tui/nm-editor-utils.c:163 ../libnm-core/nm-connection.c:1748
-#: ../libnm-glib/nm-device.c:1871 ../libnm/nm-device.c:1822
-msgid "InfiniBand"
-msgstr "InfiniBand"
-
 #: ../clients/tui/nm-editor-utils.c:167
 #, c-format
 msgid "InfiniBand connection %d"
 msgstr "InfiniBand 연결 %d"
 
-#: ../clients/tui/nm-editor-utils.c:172 ../libnm-glib/nm-device.c:1869
-#: ../libnm/nm-device.c:1820
+#: ../clients/tui/nm-editor-utils.c:172 ../libnm-glib/nm-device.c:1859
+#: ../libnm/nm-device.c:1810
 msgid "Mobile Broadband"
 msgstr "모바일 광대역"
 
@@ -6340,9 +6783,9 @@ msgstr "DSL"
 msgid "DSL connection %d"
 msgstr "DSL 연결 %d"
 
-#: ../clients/tui/nm-editor-utils.c:190 ../libnm-core/nm-connection.c:1740
-#: ../libnm-glib/nm-device.c:1873 ../libnm-util/nm-connection.c:1626
-#: ../libnm/nm-device.c:1824 ../src/settings/plugins/ifcfg-rh/reader.c:4195
+#: ../clients/tui/nm-editor-utils.c:190 ../libnm-core/nm-connection.c:1708
+#: ../libnm-glib/nm-device.c:1863 ../libnm-util/nm-connection.c:1626
+#: ../libnm/nm-device.c:1814 ../src/settings/plugins/ifcfg-rh/reader.c:4182
 msgid "Bond"
 msgstr "본딩 "
 
@@ -6351,9 +6794,9 @@ msgstr "본딩 "
 msgid "Bond connection %d"
 msgstr "Bond 연결 %d"
 
-#: ../clients/tui/nm-editor-utils.c:199 ../libnm-core/nm-connection.c:1744
-#: ../libnm-glib/nm-device.c:1877 ../libnm-util/nm-connection.c:1630
-#: ../libnm/nm-device.c:1828 ../src/settings/plugins/ifcfg-rh/reader.c:4492
+#: ../clients/tui/nm-editor-utils.c:199 ../libnm-core/nm-connection.c:1712
+#: ../libnm-glib/nm-device.c:1867 ../libnm-util/nm-connection.c:1630
+#: ../libnm/nm-device.c:1818 ../src/settings/plugins/ifcfg-rh/reader.c:4479
 msgid "Bridge"
 msgstr "브리지 "
 
@@ -6362,9 +6805,9 @@ msgstr "브리지 "
 msgid "Bridge connection %d"
 msgstr "브리지 연결 %d"
 
-#: ../clients/tui/nm-editor-utils.c:208 ../libnm-core/nm-connection.c:1742
-#: ../libnm-glib/nm-device.c:1875 ../libnm-util/nm-connection.c:1628
-#: ../libnm/nm-device.c:1826 ../src/settings/plugins/ifcfg-rh/reader.c:4301
+#: ../clients/tui/nm-editor-utils.c:208 ../libnm-core/nm-connection.c:1710
+#: ../libnm-glib/nm-device.c:1865 ../libnm-util/nm-connection.c:1628
+#: ../libnm/nm-device.c:1816 ../src/settings/plugins/ifcfg-rh/reader.c:4288
 msgid "Team"
 msgstr "팀 "
 
@@ -6421,9 +6864,8 @@ msgid "Could not create editor for invalid connection '%s'."
 msgstr "잘못된 연결 '%s'에 대한 편집기를 생성할 수 없습니다."
 
 #: ../clients/tui/nmt-editor.c:111
-#, fuzzy
 msgid "Edit Connection"
-msgstr "연결 편집 "
+msgstr "연결 편집"
 
 #: ../clients/tui/nmt-editor.c:164
 #, c-format
@@ -6440,9 +6882,8 @@ msgid "Profile name"
 msgstr "프로파일 이름"
 
 #: ../clients/tui/nmt-editor.c:331
-#, fuzzy
 msgid "Ethernet device"
-msgstr "이더넷"
+msgstr "이더넷 장치"
 
 #: ../clients/tui/nmt-editor.c:333
 msgid "Device"
@@ -6570,7 +7011,7 @@ msgstr "유효 기간 "
 
 #: ../clients/tui/nmt-page-bridge.c:91
 msgid "Enable IGMP snooping"
-msgstr ""
+msgstr "IGMP 스누핑 활성화"
 
 #: ../clients/tui/nmt-page-bridge.c:97
 msgid "Enable STP (Spanning Tree Protocol)"
@@ -6609,6 +7050,10 @@ msgstr "연결됨"
 msgid "INFINIBAND"
 msgstr "인피니밴드 "
 
+#: ../clients/tui/nmt-page-infiniband.c:88
+msgid "Transport mode"
+msgstr "전송 모드 "
+
 #: ../clients/tui/nmt-page-ip4.c:38
 msgid "Disabled"
 msgstr "비활성화됨 "
@@ -6665,7 +7110,7 @@ msgstr "기본 라우팅으로 이 네트워크를 사용하지 않습니다 "
 
 #: ../clients/tui/nmt-page-ip4.c:179 ../clients/tui/nmt-page-ip6.c:177
 msgid "Ignore automatically obtained routes"
-msgstr ""
+msgstr "자동으로 가져온 라우팅을 무시합니다"
 
 #: ../clients/tui/nmt-page-ip4.c:187
 msgid "Require IPv4 addressing for this connection"
@@ -6688,64 +7133,60 @@ msgid "Require IPv6 addressing for this connection"
 msgstr "이 연결에는 IPv6 주소 설정이 필요합니다 "
 
 #: ../clients/tui/nmt-page-ppp.c:131
-#, fuzzy
 msgid "PPP CONFIGURATION"
-msgstr "IPv4 설정 "
+msgstr "PPP 구성"
 
 #: ../clients/tui/nmt-page-ppp.c:140
-#, fuzzy
 msgid "Allowed authentication methods:"
-msgstr "인증"
+msgstr "허용된 인증 방법:"
 
 #: ../clients/tui/nmt-page-ppp.c:147
-#, fuzzy
 msgid "EAP"
-msgstr "LEAP"
+msgstr "EAP"
 
 #: ../clients/tui/nmt-page-ppp.c:155
-#, fuzzy
 msgid "PAP"
-msgstr "AP"
+msgstr "PAP"
 
 #: ../clients/tui/nmt-page-ppp.c:163
 msgid "CHAP"
-msgstr ""
+msgstr "CHAP"
 
 #: ../clients/tui/nmt-page-ppp.c:171
 msgid "MSCHAPv2"
-msgstr ""
+msgstr "MSCHAPv2"
 
 #: ../clients/tui/nmt-page-ppp.c:179
 msgid "MSCHAP"
-msgstr ""
+msgstr "MSCHAP"
 
 #: ../clients/tui/nmt-page-ppp.c:195
 msgid "Use point-to-point encryption (MPPE)"
-msgstr ""
+msgstr "PTP(Point-to-Point) 암호화(MPPE) 사용"
 
 #: ../clients/tui/nmt-page-ppp.c:207
 msgid "Require 128-bit encryption"
-msgstr ""
+msgstr "128비트 암호화 요구"
 
 #: ../clients/tui/nmt-page-ppp.c:217
 msgid "Use stateful MPPE"
-msgstr ""
+msgstr "상태 저장 MPPE 사용"
 
 #: ../clients/tui/nmt-page-ppp.c:229
 msgid "Allow BSD data compression"
-msgstr ""
+msgstr "BSD 데이터 압축 허용"
 
 #: ../clients/tui/nmt-page-ppp.c:237
 msgid "Allow Deflate data compression"
-msgstr ""
+msgstr "Deflate 데이터 압축 허용"
 
 #: ../clients/tui/nmt-page-ppp.c:245
 msgid "Use TCP header compression"
-msgstr ""
+msgstr "TCP 헤더 압축 사용"
 
 #: ../clients/tui/nmt-page-ppp.c:255
 msgid "Send PPP echo packets"
-msgstr ""
+msgstr "PPP 에코 패킷 전송"
 
 #: ../clients/tui/nmt-page-team-port.c:92
 msgid "TEAM PORT"
@@ -6924,22 +7365,23 @@ msgstr "삭제"
 msgid ""
 "openconnect will be run to authenticate.\n"
 "It will return to nmtui when completed."
-msgstr ""
+msgstr "인증을 위해 openconnect를 실행합니다.\n"
+"완료 시 nmtui로 돌아갑니다."
 
 #: ../clients/tui/nmtui-connect.c:68
-#, fuzzy, c-format
+#, c-format
 msgid "Error: openconnect failed: %s"
-msgstr "오류: 연결 삭제에 실패했습니다: %s"
+msgstr "오류: openconnect 실패: %s"
 
 #: ../clients/tui/nmtui-connect.c:75
 #, c-format
 msgid "openconnect failed with status %d"
-msgstr ""
+msgstr "openconnect에 실패했습니다(상태 %d)."
 
 #: ../clients/tui/nmtui-connect.c:79
 #, c-format
 msgid "openconnect failed with signal %d"
-msgstr ""
+msgstr "openconnect에 실패했습니다(신호 %d)."
 
 #: ../clients/tui/nmtui-connect.c:178
 msgid "Activation failed"
@@ -6963,14 +7405,10 @@ msgid "Deactivate"
 msgstr "비활성화 "
 
 #: ../clients/tui/nmtui-connect.c:413 ../clients/tui/nmtui-edit.c:120
-#: ../clients/tui/nmtui.c:130
+#: ../clients/tui/nmtui.c:108
 msgid "Quit"
 msgstr "종료 "
 
-#: ../clients/tui/nmtui-connect.c:413 ../clients/tui/nmtui-edit.c:120
-msgid "Back"
-msgstr ""
-
 #: ../clients/tui/nmtui-connect.c:436
 #, c-format
 msgid "No such connection '%s'"
@@ -6992,9 +7430,7 @@ msgstr "생성하고자 하는 연결 유형을 선택합니다."
 msgid ""
 "If you are creating a VPN, and the VPN connection you wish to create does "
 "not appear in the list, you may not have the correct VPN plugin installed."
-msgstr ""
-"VPN을 생성할 경우 생성하고자 하는 VPN 연결은 목록에 표시되지 않으므로 올바른 "
-"VPN 플러그인을 설치할 수 없습니다."
+msgstr "VPN을 생성할 경우 생성하고자 하는 VPN 연결은 목록에 표시되지 않으므로 올바른 VPN 플러그인을 설치할 수 없습니다."
 
 #: ../clients/tui/nmtui-edit.c:411 ../clients/tui/nmtui-edit.c:427
 msgid "New Connection"
@@ -7006,9 +7442,9 @@ msgid "Unable to delete connection: %s"
 msgstr "연결을 삭제할 수 없음: %s"
 
 #: ../clients/tui/nmtui-edit.c:505
-#, fuzzy, c-format
+#, c-format
 msgid "Could not delete connection '%s': %s"
-msgstr "연결을 삭제할 수 없음: %s"
+msgstr "연결 '%s'을(를) 삭제할 수 없음: %s"
 
 #: ../clients/tui/nmtui-edit.c:527
 #, c-format
@@ -7054,28 +7490,28 @@ msgstr "새 호스트 이름 "
 msgid "Set system hostname"
 msgstr "시스템의 호스트 이름 설정 "
 
-#: ../clients/tui/nmtui.c:104
+#: ../clients/tui/nmtui.c:83
 msgid "NetworkManager TUI"
 msgstr "NetworkManager TUI"
 
-#: ../clients/tui/nmtui.c:112
+#: ../clients/tui/nmtui.c:91
 msgid "Please select an option"
 msgstr "옵션을 선택하십시오 "
 
-#: ../clients/tui/nmtui.c:160
+#: ../clients/tui/nmtui.c:143
 msgid "Usage"
 msgstr "사용법 "
 
-#: ../clients/tui/nmtui.c:241
+#: ../clients/tui/nmtui.c:224
 msgid "Could not parse arguments"
 msgstr "인자를 해석할 수 없습니다"
 
-#: ../clients/tui/nmtui.c:251
-#, fuzzy, c-format
+#: ../clients/tui/nmtui.c:234
+#, c-format
 msgid "Could not contact NetworkManager: %s.\n"
-msgstr "연결을 활성화할 수 없음: %s"
+msgstr "NetworkManager에 접속할 수 없음: %s.\n"
 
-#: ../clients/tui/nmtui.c:256
+#: ../clients/tui/nmtui.c:239
 msgid "NetworkManager is not running."
 msgstr "NetworkManager가 실행되고 있지 않습니다."
 
@@ -7164,7 +7600,7 @@ msgstr "비밀 키 유형을 결정할 수 없습니다."
 #: ../libnm-core/crypto.c:502
 #, c-format
 msgid "Password provided, but key was not encrypted."
-msgstr ""
+msgstr "암호가 제공되었지만 키가 암호화되지 않았습니다."
 
 #: ../libnm-core/crypto.c:555 ../libnm-util/crypto.c:571
 #, c-format
@@ -7191,14 +7627,14 @@ msgid "Invalid IV length (must be at least %zd)."
 msgstr "잘못된 IV 길이 (최소한 %zd바이트 이상이어야 함)."
 
 #: ../libnm-core/crypto_gnutls.c:115 ../libnm-util/crypto_gnutls.c:175
-#, fuzzy, c-format
+#, c-format
 msgid "Failed to initialize the decryption cipher context: %s (%s)"
-msgstr "암호 해독 문맥을 초기화하는 데 실패했습니다: %s / %s."
+msgstr "해독 암호 컨텍스트 초기화 실패: %s (%s)"
 
 #: ../libnm-core/crypto_gnutls.c:124 ../libnm-util/crypto_gnutls.c:184
-#, fuzzy, c-format
+#, c-format
 msgid "Failed to decrypt the private key: %s (%s)"
-msgstr "비밀 키를 해독하는 데 실패했습니다: %s / %s."
+msgstr "개인 키 해독 실패: %s (%s)"
 
 #: ../libnm-core/crypto_gnutls.c:134 ../libnm-core/crypto_nss.c:202
 #: ../libnm-util/crypto_gnutls.c:194 ../libnm-util/crypto_nss.c:252
@@ -7213,14 +7649,14 @@ msgid "Failed to decrypt the private key."
 msgstr "비밀 키를 해독하는 데 실패했습니다."
 
 #: ../libnm-core/crypto_gnutls.c:224 ../libnm-util/crypto_gnutls.c:283
-#, fuzzy, c-format
+#, c-format
 msgid "Failed to initialize the encryption cipher context: %s (%s)"
-msgstr "암호화 문맥을 초기화하는 데 실패했습니다: %s / %s."
+msgstr "암호화 암호 컨텍스트 초기화 실패: %s (%s)"
 
 #: ../libnm-core/crypto_gnutls.c:233 ../libnm-util/crypto_gnutls.c:292
-#, fuzzy, c-format
+#, c-format
 msgid "Failed to encrypt the data: %s (%s)"
-msgstr "데이터를 암호화하는 데 실패했습니다: %s / %s."
+msgstr "데이터 암호화 실패: %s (%s)"
 
 #: ../libnm-core/crypto_gnutls.c:276 ../libnm-util/crypto_gnutls.c:332
 #, c-format
@@ -7340,7 +7776,7 @@ msgstr "인증서를 복호화할 수 없습니다: %d."
 #: ../libnm-core/crypto_nss.c:420
 #, c-format
 msgid "Password must be UTF-8"
-msgstr ""
+msgstr "암호는 UTF-8이어야 합니다"
 
 #: ../libnm-core/crypto_nss.c:450 ../libnm-util/crypto_nss.c:488
 #, c-format
@@ -7361,55 +7797,51 @@ msgstr "PKCS#12 파일을 검증할 수 없습니다: %d"
 msgid "Could not generate random data."
 msgstr "랜덤 데이터를 생성할 수 없습니다."
 
-#: ../libnm-core/nm-connection.c:225
+#: ../libnm-core/nm-connection.c:224
 msgid "wrong type; should be a list of strings."
-msgstr ""
+msgstr "잘못된 유형입니다. 문자열 목록이어야 합니다."
 
-#: ../libnm-core/nm-connection.c:295
-#, fuzzy
+#: ../libnm-core/nm-connection.c:294
 msgid "unknown setting name"
-msgstr "오류: 알 수 없는 설정 '%s'\n"
+msgstr "알 수 없는 설정 이름"
 
-#: ../libnm-core/nm-connection.c:307
-#, fuzzy
+#: ../libnm-core/nm-connection.c:306
 msgid "duplicate setting name"
-msgstr "오류: 알 수 없는 설정 '%s'\n"
+msgstr "중복 설정 이름"
 
-#: ../libnm-core/nm-connection.c:905
+#: ../libnm-core/nm-connection.c:873
 msgid "setting not found"
-msgstr ""
+msgstr "설정을 찾을 수 없습니다"
 
-#: ../libnm-core/nm-connection.c:969
-#, fuzzy
+#: ../libnm-core/nm-connection.c:937
 msgid "setting not allowed in slave connection"
-msgstr "연결에 설정 '%s'이 없습니다.\n"
+msgstr "슬레이브 연결에서는 설정이 허용되지 않습니다."
 
-#: ../libnm-core/nm-connection.c:980
+#: ../libnm-core/nm-connection.c:948
 msgid "setting is required for non-slave connections"
-msgstr ""
+msgstr "비 슬레이브 연결에 설정이 필요합니다"
 
-#: ../libnm-core/nm-connection.c:1074
-#, fuzzy
+#: ../libnm-core/nm-connection.c:1042
 msgid "Unexpected failure to verify the connection"
-msgstr "연결을 삭제할 수 없음: %s"
+msgstr "연결을 확인하는 데 예상치 못한 오류가 발생했습니다."
 
-#: ../libnm-core/nm-connection.c:1107
-#, fuzzy
+#: ../libnm-core/nm-connection.c:1075
 msgid "Unexpected failure to normalize the connection"
-msgstr "연결을 삭제할 수 없음: %s"
+msgstr "연결을 정규화하는 데 예상치 못한 오류가 발생했습니다."
 
-#: ../libnm-core/nm-connection.c:1608 ../libnm-core/nm-setting-8021x.c:2411
+#: ../libnm-core/nm-connection.c:1576 ../libnm-core/nm-setting-8021x.c:2411
 #: ../libnm-core/nm-setting-8021x.c:2428 ../libnm-core/nm-setting-8021x.c:2459
 #: ../libnm-core/nm-setting-8021x.c:2476 ../libnm-core/nm-setting-8021x.c:2518
 #: ../libnm-core/nm-setting-8021x.c:2530 ../libnm-core/nm-setting-8021x.c:2548
 #: ../libnm-core/nm-setting-8021x.c:2560 ../libnm-core/nm-setting-8021x.c:2584
 #: ../libnm-core/nm-setting-8021x.c:2749 ../libnm-core/nm-setting-adsl.c:189
 #: ../libnm-core/nm-setting-bluetooth.c:120
-#: ../libnm-core/nm-setting-bluetooth.c:138 ../libnm-core/nm-setting-cdma.c:141
+#: ../libnm-core/nm-setting-bluetooth.c:138
+#: ../libnm-core/nm-setting-cdma.c:141
 #: ../libnm-core/nm-setting-connection.c:837
 #: ../libnm-core/nm-setting-connection.c:876
 #: ../libnm-core/nm-setting-connection.c:989
-#: ../libnm-core/nm-setting-ip-config.c:2186
+#: ../libnm-core/nm-setting-ip-config.c:2167
 #: ../libnm-core/nm-setting-olpc-mesh.c:120
 #: ../libnm-core/nm-setting-pppoe.c:142 ../libnm-core/nm-setting-vpn.c:419
 #: ../libnm-core/nm-setting-vxlan.c:360 ../libnm-core/nm-setting-wimax.c:126
@@ -7421,8 +7853,10 @@ msgstr "연결을 삭제할 수 없음: %s"
 #: ../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-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
@@ -7440,210 +7874,203 @@ msgstr "속성이 누락되어 있습니다 "
 #: ../libnm-core/nm-dbus-utils.c:188
 #, c-format
 msgid "Method returned type '%s', but expected '%s'"
-msgstr ""
+msgstr "메소드가 유형 '%s'(을)를 반환했지만 '%s'(이)가 예상됩니다"
 
 #: ../libnm-core/nm-keyfile-reader.c:136
 msgid "ignoring missing number"
-msgstr ""
+msgstr "누락된 숫자 무시"
 
 #: ../libnm-core/nm-keyfile-reader.c:145
-#, fuzzy, c-format
+#, c-format
 msgid "ignoring invalid number '%s'"
-msgstr "잘못된 메트릭스 '%s'"
+msgstr "잘못된 숫자 '%s' 무시"
 
 #: ../libnm-core/nm-keyfile-reader.c:165
-#, fuzzy, c-format
+#, c-format
 msgid "ignoring invalid %s address: %s"
-msgstr "잘못된 IPv4 주소 '%s'"
+msgstr "잘못된 %s 주소 무시: %s"
 
 #: ../libnm-core/nm-keyfile-reader.c:205
-#, fuzzy, c-format
+#, c-format
 msgid "ignoring invalid gateway '%s' for %s route"
-msgstr "잘못된 게이트웨이 '%s'"
+msgstr "%s 라우팅에 대한 잘못된 게이트웨이 '%s' 무시"
 
 #: ../libnm-core/nm-keyfile-reader.c:225
-#, fuzzy, c-format
+#, c-format
 msgid "ignoring invalid %s route: %s"
-msgstr "잘못된 IPv4 라우팅 '%s'"
+msgstr "잘못된 %s 라우팅 무시: %s"
 
 #: ../libnm-core/nm-keyfile-reader.c:343
 #, c-format
 msgid "unexpected character '%c' for address %s: '%s' (position %td)"
-msgstr ""
+msgstr "예기치 못한 문자 '%c'(이)가 주소 %s에 사용됨: '%s'(위치 %td)"
 
 #: ../libnm-core/nm-keyfile-reader.c:353
 #, c-format
 msgid "unexpected character '%c' for %s: '%s' (position %td)"
-msgstr ""
+msgstr "예기치 못한 문자 '%c'(이)가 %s에 사용됨: '%s'(위치 %td)"
 
 #: ../libnm-core/nm-keyfile-reader.c:362
 #, c-format
 msgid "unexpected character '%c' in prefix length for %s: '%s' (position %td)"
-msgstr ""
+msgstr "예기치 못한 문자 '%c'(이)가 %s의 접두사 길이에 사용됨: '%s'(위치 %td)"
 
 #: ../libnm-core/nm-keyfile-reader.c:373
 #, c-format
 msgid "garbage at the end of value %s: '%s'"
-msgstr ""
+msgstr "값 %s 끝에 가비지: '%s'"
 
 #: ../libnm-core/nm-keyfile-reader.c:379
 #, c-format
 msgid "deprecated semicolon at the end of value %s: '%s'"
-msgstr ""
+msgstr "값 %s 끝에 세미콜론 사용하지 않음: '%s'"
 
 #: ../libnm-core/nm-keyfile-reader.c:394
 #, c-format
 msgid "invalid prefix length for %s '%s', defaulting to %d"
-msgstr ""
+msgstr "%s '%s'의 접두사 길이가 잘못되었습니다. %d(을)를 기본값으로 설정합니다"
 
 #: ../libnm-core/nm-keyfile-reader.c:401
 #, c-format
 msgid "missing prefix length for %s '%s', defaulting to %d"
-msgstr ""
+msgstr "%s '%s'의 접두사 길이가 누락되었습니다. %d(을)를 기본값으로 설정합니다"
 
 #: ../libnm-core/nm-keyfile-reader.c:504
-#, fuzzy, c-format
+#, c-format
 msgid "ignoring invalid DNS server IPv4 address '%s'"
-msgstr "잘못된 IPv4 주소 '%s'"
+msgstr "잘못된 DNS 서버 IPv4 주소 '%s' 무시"
 
 #: ../libnm-core/nm-keyfile-reader.c:543
-#, fuzzy, c-format
+#, c-format
 msgid "ignoring invalid DNS server IPv6 address '%s'"
-msgstr "잘못된 IPv6 주소 '%s'"
+msgstr "잘못된 DNS 서버 IPv6 주소 '%s' 무시"
 
 #: ../libnm-core/nm-keyfile-reader.c:628 ../libnm-core/nm-keyfile-reader.c:769
 #: ../libnm-core/nm-keyfile-reader.c:1446
 #, c-format
 msgid "ignoring invalid byte element '%d' (not between 0 and 255 inclusive)"
-msgstr ""
+msgstr "잘못된 바이트 요소 '%d' 무시(0~255 포함되지 않음)."
 
 #: ../libnm-core/nm-keyfile-reader.c:642
-#, fuzzy
 msgid "ignoring invalid MAC address"
-msgstr "올바른 MAC 주소가 아닙니다 "
+msgstr "잘못된 MAC 주소 무시"
 
 #: ../libnm-core/nm-keyfile-reader.c:758
-#, fuzzy
 msgid "ignoring invalid binary property"
-msgstr "오류: 잘못된 속성: %s\n"
+msgstr "잘못된 바이너리 속성 무시"
 
 #: ../libnm-core/nm-keyfile-reader.c:801
 msgid "ignoring invalid SSID"
-msgstr ""
+msgstr "잘못된 SSID 무시"
 
 #: ../libnm-core/nm-keyfile-reader.c:817
 msgid "ignoring invalid raw password"
-msgstr ""
+msgstr "잘못된 원시 암호 무시"
 
-#: ../libnm-core/nm-keyfile-reader.c:892 ../libnm-core/nm-keyfile-reader.c:1058
+#: ../libnm-core/nm-keyfile-reader.c:892
+#: ../libnm-core/nm-keyfile-reader.c:1058
 #, c-format
 msgid "certificate or key file '%s' does not exist"
-msgstr ""
+msgstr "인증서 또는 키 파일 '%s'(이)가 존재하지 않습니다"
 
 #: ../libnm-core/nm-keyfile-reader.c:897
-#, fuzzy, c-format
+#, c-format
 msgid "invalid key/cert value path \"%s\""
-msgstr "잘못된 '%s' 또는 값 '%s'"
+msgstr "잘못된 키/인증 값 경로 \"%s\""
 
 #: ../libnm-core/nm-keyfile-reader.c:935
 msgid "invalid key/cert value data:;base64, is not base64"
-msgstr ""
+msgstr "잘못된 키/인증서 값 data:;base64,가 base64가 아닙니다"
 
 #: ../libnm-core/nm-keyfile-reader.c:948
 msgid "invalid key/cert value data:;base64,file://"
-msgstr ""
+msgstr "잘못된 키/인증서 data:;base64,file://"
 
 #: ../libnm-core/nm-keyfile-reader.c:1095
 msgid "invalid key/cert value is not a valid blob"
-msgstr ""
+msgstr "잘못된 키/인증서 값이 유효한 blob가 아닙니다"
 
 #: ../libnm-core/nm-keyfile-reader.c:1100
-#, fuzzy
 msgid "invalid key/cert value"
-msgstr "잘못된 '%s' 또는 값 '%s'"
+msgstr "잘못된 키/인증 값"
 
 #: ../libnm-core/nm-keyfile-reader.c:1147
-#, fuzzy, c-format
+#, c-format
 msgid "invalid parity value '%s'"
-msgstr "잘못된 '%s' 또는 값 '%s'"
+msgstr "잘못된 패리티 값 '%s'"
 
 #: ../libnm-core/nm-keyfile-reader.c:1347
-#, fuzzy, c-format
+#, c-format
 msgid "error loading setting value: %s"
-msgstr "오류: 잘못된 설정 이름; %s\n"
+msgstr "설정 값 불러오기 오류: %s"
 
 #: ../libnm-core/nm-keyfile-reader.c:1379
-#, fuzzy, c-format
+#, c-format
 msgid "invalid negative value (%i)"
-msgstr "잘못된 게이트웨이 '%s'"
+msgstr "잘못된 음수 값(%i)"
 
 #: ../libnm-core/nm-keyfile-reader.c:1400
-#, fuzzy, c-format
+#, c-format
 msgid "invalid char value (%i)"
-msgstr "잘못된 '%s' 또는 값 '%s'"
+msgstr "잘못된 문자 값(%i)"
 
 #: ../libnm-core/nm-keyfile-reader.c:1423
-#, fuzzy, c-format
+#, c-format
 msgid "invalid int64 value (%s)"
-msgstr "잘못된 '%s' 또는 값 '%s'"
+msgstr "잘못된 int64 값(%s)"
 
 #: ../libnm-core/nm-keyfile-reader.c:1482
 #, c-format
 msgid "too large FLAGS property '%s' (%llu)"
-msgstr ""
+msgstr "너무 큰 FLAGS 속성 '%s'(%llu)"
 
 #: ../libnm-core/nm-keyfile-reader.c:1495
-#, fuzzy, c-format
+#, c-format
 msgid "unhandled setting property type '%s'"
-msgstr "오류: 잘못된 <setting>.<property> '%s'입니다."
+msgstr "처리되지 않은 설정 속성 유형 '%s'"
 
 #: ../libnm-core/nm-keyfile-reader.c:1526
-#, fuzzy, c-format
+#, c-format
 msgid "invalid setting name '%s'"
-msgstr "오류: 잘못된 설정 이름; %s\n"
+msgstr "잘못된 설정 이름 '%s'"
 
 #: ../libnm-core/nm-setting-8021x.c:414
-#, fuzzy
 msgid "data missing"
-msgstr "속성이 누락되어 있습니다 "
+msgstr "데이터 누락"
 
 #: ../libnm-core/nm-setting-8021x.c:448
 msgid "binary data missing"
-msgstr ""
+msgstr "바이너리 데이터 누락"
 
 #: ../libnm-core/nm-setting-8021x.c:465
 msgid "file:// URI not NUL terminated"
-msgstr ""
+msgstr "file:// URI가 NUL 종료되지 않음"
 
 #: ../libnm-core/nm-setting-8021x.c:474
 msgid "file:// URI is empty"
-msgstr ""
+msgstr "file:// URI가 비어 있습니다"
 
 #: ../libnm-core/nm-setting-8021x.c:482
-#, fuzzy
 msgid "file:// URI is not valid UTF-8"
-msgstr "인덱스 '%s'가 올바르지 않습니다 "
+msgstr "file:// URI는 유효하지 않은 UTF-8입니다."
 
 #: ../libnm-core/nm-setting-8021x.c:681 ../libnm-util/nm-setting-8021x.c:639
 msgid "CA certificate must be in X.509 format"
-msgstr ""
+msgstr "CA 인증서는 X.509 형식이어야 합니다"
 
 #: ../libnm-core/nm-setting-8021x.c:1012 ../libnm-core/nm-setting-8021x.c:1276
 #: ../libnm-core/nm-setting-8021x.c:1612 ../libnm-util/nm-setting-8021x.c:957
 #: ../libnm-util/nm-setting-8021x.c:1220 ../libnm-util/nm-setting-8021x.c:1543
-#, fuzzy
 msgid "invalid certificate format"
-msgstr "인증서 정보를 초기화하는 중 오류가 발생했습니다: %s"
+msgstr "잘못된 인증서 형식"
 
 #: ../libnm-core/nm-setting-8021x.c:1895 ../libnm-util/nm-setting-8021x.c:1812
-#, fuzzy
 msgid "invalid private key"
-msgstr "잘못된 게이트웨이 '%s'"
+msgstr "잘못된 개인 키"
 
 #: ../libnm-core/nm-setting-8021x.c:2207 ../libnm-util/nm-setting-8021x.c:2123
-#, fuzzy
 msgid "invalid phase2 private key"
-msgstr "비밀 키를 해독하는 데 실패했습니다."
+msgstr "잘못된 phase2 개인 키"
 
 #: ../libnm-core/nm-setting-8021x.c:2418 ../libnm-core/nm-setting-8021x.c:2435
 #: ../libnm-core/nm-setting-8021x.c:2466 ../libnm-core/nm-setting-8021x.c:2483
@@ -7652,9 +8079,10 @@ msgstr "비밀 키를 해독하는 데 실패했습니다."
 #: ../libnm-core/nm-setting-8021x.c:2591 ../libnm-core/nm-setting-adsl.c:196
 #: ../libnm-core/nm-setting-cdma.c:148 ../libnm-core/nm-setting-cdma.c:157
 #: ../libnm-core/nm-setting-connection.c:844
-#: ../libnm-core/nm-setting-connection.c:887 ../libnm-core/nm-setting-gsm.c:281
-#: ../libnm-core/nm-setting-gsm.c:338 ../libnm-core/nm-setting-gsm.c:375
-#: ../libnm-core/nm-setting-gsm.c:384 ../libnm-core/nm-setting-ip-config.c:2193
+#: ../libnm-core/nm-setting-connection.c:887
+#: ../libnm-core/nm-setting-gsm.c:281 ../libnm-core/nm-setting-gsm.c:338
+#: ../libnm-core/nm-setting-gsm.c:375 ../libnm-core/nm-setting-gsm.c:384
+#: ../libnm-core/nm-setting-ip-config.c:2174
 #: ../libnm-core/nm-setting-ip4-config.c:198
 #: ../libnm-core/nm-setting-ip4-config.c:205
 #: ../libnm-core/nm-setting-pppoe.c:149 ../libnm-core/nm-setting-pppoe.c:158
@@ -7670,8 +8098,9 @@ msgstr "비밀 키를 해독하는 데 실패했습니다."
 #: ../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-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:170 ../libnm-util/nm-setting-pppoe.c:179
 #: ../libnm-util/nm-setting-vpn.c:432 ../libnm-util/nm-setting-vpn.c:442
@@ -7689,17 +8118,17 @@ msgid "has to match '%s' property for PKCS#12"
 msgstr "PKCS#12의 '%s' 속성과 일치해야 합니다 "
 
 #: ../libnm-core/nm-setting-8021x.c:2723
-#, fuzzy, c-format
+#, c-format
 msgid "certificate is invalid: %s"
-msgstr "속성이 잘못되어 있습니다 "
+msgstr "인증서가 잘못됨: %s"
 
 #: ../libnm-core/nm-setting-8021x.c:2758
 #: ../libnm-core/nm-setting-bluetooth.c:129
 #: ../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:211
-#: ../libnm-core/nm-setting-ip6-config.c:222
+#: ../libnm-core/nm-setting-ip6-config.c:188
+#: ../libnm-core/nm-setting-ip6-config.c:199
 #: ../libnm-core/nm-setting-olpc-mesh.c:149
 #: ../libnm-core/nm-setting-wimax.c:144 ../libnm-core/nm-setting-wired.c:665
 #: ../libnm-core/nm-setting-wired.c:675
@@ -7737,21 +8166,23 @@ msgstr "속성이 잘못되어 있습니다 "
 #: ../libnm-core/nm-setting-8021x.c:2783 ../libnm-core/nm-setting-8021x.c:2793
 #: ../libnm-core/nm-setting-8021x.c:2803 ../libnm-core/nm-setting-8021x.c:2813
 #: ../libnm-core/nm-setting-8021x.c:2823 ../libnm-core/nm-setting-adsl.c:208
-#: ../libnm-core/nm-setting-adsl.c:220 ../libnm-core/nm-setting-bluetooth.c:146
+#: ../libnm-core/nm-setting-adsl.c:220
+#: ../libnm-core/nm-setting-bluetooth.c:146
 #: ../libnm-core/nm-setting-wireless-security.c:870
 #: ../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-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-bluetooth.c:168
-#, fuzzy, c-format
+#, c-format
 msgid "'%s' connection requires '%s' or '%s' setting"
-msgstr "'%s' 또는 '%s' 설정이 필요합니다 "
+msgstr "'%s' 연결에는 '%s' 또는 '%s' 설정이 필요합니다."
 
 #: ../libnm-core/nm-setting-bond.c:485 ../libnm-util/nm-setting-bond.c:502
 #, c-format
@@ -7812,19 +8243,19 @@ msgid "'%s' is not a valid IPv4 address for '%s' option"
 msgstr "'%s'는 '%s' 옵션의 올바른 IPv4 주소가 아닙니다 "
 
 #: ../libnm-core/nm-setting-bond.c:676 ../libnm-util/nm-setting-bond.c:682
-#, fuzzy, c-format
+#, c-format
 msgid "'%s' option is only valid with mode '%s'"
-msgstr "'%s' 옵션은 '%s=%s'에만 유효합니다 "
+msgstr "'%s' 옵션은 모드 '%s'에서만 유효합니다."
 
 #: ../libnm-core/nm-setting-bond.c:687
 #, c-format
 msgid "'%s' and '%s' cannot have different values"
-msgstr ""
+msgstr "'%s' 및 '%s'에는 다른 값이 포함될 수 없습니다"
 
 #: ../libnm-core/nm-setting-bond.c:703
-#, fuzzy, c-format
+#, c-format
 msgid "'%s' option should be string"
-msgstr "'%s' 옵션이 비어있습니다 "
+msgstr "'%s' 옵션은 문자열이어야 합니다."
 
 #: ../libnm-core/nm-setting-bridge-port.c:124
 #: ../libnm-core/nm-setting-bridge-port.c:136
@@ -7835,18 +8266,18 @@ msgid "'%d' is not a valid value for the property (should be <= %d)"
 msgstr "'%d'는 속성의 올바른 값이 아닙니다 (<= %d이어야 함)"
 
 #: ../libnm-core/nm-setting-bridge-port.c:154
-#: ../libnm-core/nm-setting-team-port.c:109
-#, fuzzy, c-format
+#: ../libnm-core/nm-setting-team-port.c:97
+#, c-format
 msgid "missing setting"
-msgstr "누락된 옵션 "
+msgstr "누락된 설정"
 
 #: ../libnm-core/nm-setting-bridge-port.c:165
-#: ../libnm-core/nm-setting-team-port.c:120
+#: ../libnm-core/nm-setting-team-port.c:108
 #, c-format
 msgid ""
 "A connection with a '%s' setting must have the slave-type set to '%s'. "
 "Instead it is '%s'"
-msgstr ""
+msgstr "'%s' 설정이 있는 연결에는 슬레이브 유형을 '%s'(으)로 설정해야 합니다. 현재 '%s'입니다"
 
 #: ../libnm-core/nm-setting-bridge.c:227 ../libnm-util/nm-setting-bridge.c:269
 #, c-format
@@ -7861,54 +8292,54 @@ msgid "is not a valid MAC address"
 msgstr "올바른 MAC 주소가 아닙니다 "
 
 #: ../libnm-core/nm-setting-connection.c:816
-#, fuzzy, c-format
+#, c-format
 msgid "setting required for connection of type '%s'"
-msgstr "유형 '%s'의 연결 '%s'에 대한 편집기를 생성할 수 없습니다."
+msgstr "설정에는 유형 '%s'의 연결이 필요합니다."
 
 #: ../libnm-core/nm-setting-connection.c:897
-#, fuzzy, c-format
+#, c-format
 msgid "connection type '%s' is not valid"
-msgstr "인덱스 '%s'가 올바르지 않습니다 "
+msgstr "연결 유형 '%s'이(가) 유효하지 않습니다."
 
 #: ../libnm-core/nm-setting-connection.c:932
 #: ../libnm-util/nm-setting-connection.c:877
-#, fuzzy, c-format
+#, c-format
 msgid "Unknown slave type '%s'"
-msgstr "알려지지 않은 로그 수준 '%s'"
+msgstr "알 수 없는 슬레이브 유형 '%s'"
 
 #: ../libnm-core/nm-setting-connection.c:942
 #: ../libnm-util/nm-setting-connection.c:887
-#, fuzzy, c-format
+#, c-format
 msgid "Slave connections need a valid '%s' property"
-msgstr "'%s' 연결에는 속성에 '%s'이 필요합니다 "
+msgstr "슬레이브 연결에는 유효한 '%s' 속성이 필요합니다."
 
 #: ../libnm-core/nm-setting-connection.c:963
 #: ../libnm-util/nm-setting-connection.c:897
 #, c-format
 msgid "Cannot set '%s' without '%s'"
-msgstr ""
+msgstr "'%s' 없이는 '%s'을(를) 설정할 수 없습니다"
 
 #: ../libnm-core/nm-setting-connection.c:977
-#, fuzzy, c-format
+#, c-format
 msgid "metered value %d is not valid"
-msgstr "인덱스 '%s'가 올바르지 않습니다 "
+msgstr "측정된 값 %d이(가) 유효하지 않습니다."
 
 #: ../libnm-core/nm-setting-connection.c:998
 #, c-format
 msgid "property type should be set to '%s'"
-msgstr ""
+msgstr "속성 유형을 '%s'(으)로 설정해야 합니다"
 
 #: ../libnm-core/nm-setting-connection.c:1013
-#, fuzzy, c-format
+#, c-format
 msgid "slave-type '%s' requires a '%s' setting in the connection"
-msgstr "연결에 '%s' 설정이 필요합니다 "
+msgstr "연결에서 slave-type '%s'에는 '%s' 설정이 필요합니다."
 
 #: ../libnm-core/nm-setting-connection.c:1023
 #, c-format
 msgid ""
 "Detect a slave connection with '%s' set and a port type '%s'. '%s' should be "
 "set to '%s'"
-msgstr ""
+msgstr "'%s'(으)로 설정되고 포트 유형이 '%s'인 슬레이브 연결을 감지합니다. '%s'은(는) '%s'(으)로 설정해야 합니다"
 
 #: ../libnm-core/nm-setting-dcb.c:522 ../libnm-util/nm-setting-dcb.c:594
 msgid "flags invalid"
@@ -7956,13 +8387,12 @@ msgid "'%s' length is invalid (should be 5 or 6 digits)"
 msgstr "'%s' 길이가 잘못되어 있습니다 (5 또는 6 자리여야 함) "
 
 #: ../libnm-core/nm-setting-gsm.c:397
-#, fuzzy
 msgid "property is empty or wrong size"
-msgstr "속성이 비어 있습니다 "
+msgstr "속성이 비어 있거나 크기가 잘못되었습니다."
 
 #: ../libnm-core/nm-setting-gsm.c:407
 msgid "property must contain only digits"
-msgstr ""
+msgstr "속성에는 숫자만 포함되야 합니다"
 
 #: ../libnm-core/nm-setting-infiniband.c:217
 #: ../libnm-util/nm-setting-infiniband.c:231
@@ -7977,8 +8407,7 @@ msgstr "부모를 지정하는 경우 P_Key를 지정해야 합니다 "
 #: ../libnm-core/nm-setting-infiniband.c:235
 #: ../libnm-util/nm-setting-infiniband.c:249
 msgid "InfiniBand P_Key connection did not specify parent interface name"
-msgstr ""
-"InfiniBand P_Key 연결에서 부모 인터페이스 이름이 지정되어 있지 않습니다 "
+msgstr "InfiniBand P_Key 연결에서 부모 인터페이스 이름이 지정되어 있지 않습니다 "
 
 #: ../libnm-core/nm-setting-infiniband.c:271
 #: ../libnm-util/nm-setting-infiniband.c:285
@@ -7986,106 +8415,100 @@ msgstr ""
 msgid ""
 "interface name of software infiniband device must be '%s' or unset (instead "
 "it is '%s')"
-msgstr ""
+msgstr "소프트웨어 InfiniBand 장치의 인터페이스 이름은 '%s'이거나 설정 해제해야 합니다(현재 '%s'임)"
 
 #: ../libnm-core/nm-setting-infiniband.c:286
 #, c-format
 msgid "mtu for transport mode '%s' can be at most %d but it is %d"
-msgstr ""
+msgstr "전송 모드 '%s'의 MTU는 최대 %d이지만 현재 %d입니다"
 
 #: ../libnm-core/nm-setting-ip-config.c:133
-#, fuzzy, c-format
+#, c-format
 msgid "Missing IPv4 address"
-msgstr "잘못된 IPv4 주소 '%s'"
+msgstr "누락된 IPv4 주소"
 
 #: ../libnm-core/nm-setting-ip-config.c:133
-#, fuzzy, c-format
+#, c-format
 msgid "Missing IPv6 address"
-msgstr "잘못된 IPv6 주소 '%s'"
+msgstr "누락된 IPv6 주소"
 
 #: ../libnm-core/nm-setting-ip-config.c:138
-#, fuzzy, c-format
+#, c-format
 msgid "Invalid IPv4 address '%s'"
 msgstr "잘못된 IPv4 주소 '%s'"
 
 #: ../libnm-core/nm-setting-ip-config.c:138
-#, fuzzy, c-format
+#, c-format
 msgid "Invalid IPv6 address '%s'"
 msgstr "잘못된 IPv6 주소 '%s'"
 
 #: ../libnm-core/nm-setting-ip-config.c:153
-#, fuzzy, c-format
+#, c-format
 msgid "Invalid IPv4 address prefix '%u'"
-msgstr "잘못된 IPv4 주소 '%s'"
+msgstr "잘못된 IPv4 주소 접두어 '%u'"
 
 #: ../libnm-core/nm-setting-ip-config.c:153
-#, fuzzy, c-format
+#, c-format
 msgid "Invalid IPv6 address prefix '%u'"
-msgstr "잘못된 IPv6 주소 '%s'"
+msgstr "잘못된 IPv6 주소 접두어 '%u'"
 
 #: ../libnm-core/nm-setting-ip-config.c:168
-#, fuzzy, c-format
+#, c-format
 msgid "Invalid routing metric '%s'"
-msgstr "잘못된 메트릭스 '%s'"
+msgstr "잘못된 라우팅 메트릭 '%s'"
 
-#: ../libnm-core/nm-setting-ip-config.c:2206
-#, fuzzy, c-format
+#: ../libnm-core/nm-setting-ip-config.c:2187
+#, c-format
 msgid "%d. DNS server address is invalid"
-msgstr "%d. IPv4 주소는 잘못되어 있습니다 "
+msgstr "%d. DNS 서버는 잘못되어 있습니다 "
 
-#: ../libnm-core/nm-setting-ip-config.c:2222
-#, fuzzy, c-format
+#: ../libnm-core/nm-setting-ip-config.c:2203
+#, c-format
 msgid "%d. IP address is invalid"
-msgstr "%d. IPv4 주소는 잘못되어 있습니다 "
+msgstr "%d. IP 주소가 유효하지 않습니다."
 
-#: ../libnm-core/nm-setting-ip-config.c:2234
-#, fuzzy, c-format
+#: ../libnm-core/nm-setting-ip-config.c:2215
+#, c-format
 msgid "%d. IP address has 'label' property with invalid type"
-msgstr "%d. IPv4 주소에는 잘못된 접두어가 있습니다 "
+msgstr "%d. IP 주소에 잘못된 유형의 'label' 속성이 있습니다."
 
-#: ../libnm-core/nm-setting-ip-config.c:2243
-#, fuzzy, c-format
+#: ../libnm-core/nm-setting-ip-config.c:2224
+#, c-format
 msgid "%d. IP address has invalid label '%s'"
-msgstr "%d. IPv4 주소에는 잘못된 접두어가 있습니다 "
+msgstr "%d. IP 주소에 잘못된 레이블 '%s'이(가) 있습니다."
 
-#: ../libnm-core/nm-setting-ip-config.c:2257
+#: ../libnm-core/nm-setting-ip-config.c:2238
 msgid "gateway cannot be set if there are no addresses configured"
-msgstr ""
+msgstr "주소를 구성하지 않으면 게이트웨이를 설정할 수 없습니다"
 
-#: ../libnm-core/nm-setting-ip-config.c:2266
-#, fuzzy
+#: ../libnm-core/nm-setting-ip-config.c:2247
 msgid "gateway is invalid"
-msgstr "속성이 잘못되어 있습니다 "
+msgstr "게이트웨이가 잘못되었습니다."
 
-#: ../libnm-core/nm-setting-ip-config.c:2280
+#: ../libnm-core/nm-setting-ip-config.c:2261
 #, c-format
 msgid "%d. route is invalid"
 msgstr "%d. 라우팅이 잘못되어 있습니다 "
 
-#: ../libnm-core/nm-setting-ip-config.c:2289
+#: ../libnm-core/nm-setting-ip-config.c:2270
 #, c-format
 msgid "%d. route cannot be a default route"
-msgstr ""
-
-#: ../libnm-core/nm-setting-ip-config.c:2300
-#, fuzzy, c-format
-msgid "a gateway is incompatible with '%s'"
-msgstr "'%s=%s'은 '%s > 0'와 호환하지 않습니다 "
+msgstr "%d. 라우팅은 기본 라우팅을 사용할 수 없습니다"
 
 #: ../libnm-core/nm-setting-ip4-config.c:143
-#: ../libnm-core/nm-setting-ip6-config.c:167
+#: ../libnm-core/nm-setting-ip6-config.c:144
 #: ../libnm-util/nm-setting-ip4-config.c:879
 #: ../libnm-util/nm-setting-ip6-config.c:843
-#, fuzzy, c-format
+#, c-format
 msgid "this property cannot be empty for '%s=%s'"
-msgstr "이 속성은 '%s=%s'에 대해 허용되지 않습니다 "
+msgstr "이 속성은 '%s=%s'에 대해 비어 있을 수 없습니다."
 
 #: ../libnm-core/nm-setting-ip4-config.c:155
 #: ../libnm-core/nm-setting-ip4-config.c:165
 #: ../libnm-core/nm-setting-ip4-config.c:177
-#: ../libnm-core/nm-setting-ip6-config.c:179
-#: ../libnm-core/nm-setting-ip6-config.c:189
-#: ../libnm-core/nm-setting-ip6-config.c:199
+#: ../libnm-core/nm-setting-ip6-config.c:156
+#: ../libnm-core/nm-setting-ip6-config.c:166
+#: ../libnm-core/nm-setting-ip6-config.c:176
 #: ../libnm-util/nm-setting-ip4-config.c:891
 #: ../libnm-util/nm-setting-ip4-config.c:901
 #: ../libnm-util/nm-setting-ip4-config.c:913
@@ -8097,31 +8520,18 @@ msgid "this property is not allowed for '%s=%s'"
 msgstr "이 속성은 '%s=%s'에 대해 허용되지 않습니다 "
 
 #: ../libnm-core/nm-setting-ip4-config.c:214
-#, fuzzy, c-format
+#, c-format
 msgid "'%s' is not a valid FQDN"
-msgstr "'%s'은 올바른 UUID가 아닙니다 "
+msgstr "'%s'은(는) 유효한 FQDN이 아닙니다."
 
 #: ../libnm-core/nm-setting-ip4-config.c:223
 msgid "property cannot be set when dhcp-hostname is also set"
-msgstr ""
-
-#: ../libnm-core/nm-setting-ip6-config.c:237
-#, fuzzy
-msgid "value is not a valid token"
-msgstr "'%s'은 올바른 UUID가 아닙니다 "
-
-#: ../libnm-core/nm-setting-ip6-config.c:248
-msgid "only makes sense with EUI64 address generation mode"
-msgstr ""
-
-#: ../libnm-core/nm-setting-ip6-config.c:260
-msgid "token is not in canonical form"
-msgstr ""
+msgstr "dhcp-hostname도 설정된 경우 속성을 설정할 수 없습니다"
 
 #: ../libnm-core/nm-setting-ip-tunnel.c:318
-#, fuzzy, c-format
+#, 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-macvlan.c:167 ../libnm-core/nm-setting-vlan.c:647
@@ -8132,23 +8542,23 @@ msgstr "'%s'은 UUID 또는 인터페이스 이름이 아닙니다 "
 
 #: ../libnm-core/nm-setting-ip-tunnel.c:341
 #: ../libnm-core/nm-setting-ip-tunnel.c:352
-#, fuzzy, c-format
+#, c-format
 msgid "'%s' is not a valid IPv%c address"
-msgstr "'%s'은 올바른 MAC 주소가 아닙니다 "
+msgstr "'%s'은(는) 유효한 IPv%c 주소가 아닙니다."
 
 #: ../libnm-core/nm-setting-ip-tunnel.c:366
 msgid "tunnel keys can only be specified for GRE tunnels"
-msgstr ""
+msgstr "터널 키는 GRE 터널에 대해서만 지정할 수 있습니다"
 
 #: ../libnm-core/nm-setting-ip-tunnel.c:379
 #: ../libnm-core/nm-setting-ip-tunnel.c:395
-#, fuzzy, c-format
+#, c-format
 msgid "'%s' is not a valid tunnel key"
-msgstr "'%s'는 올바른 채널이 아닙니다 "
+msgstr "'%s'는 유효한 키가 아닙니다."
 
 #: ../libnm-core/nm-setting-ip-tunnel.c:407
 msgid "a fixed TTL is allowed only when path MTU discovery is enabled"
-msgstr ""
+msgstr "고정 TTL은 경로 MTU 검색이 활성화된 경우에만 허용됩니다"
 
 #: ../libnm-core/nm-setting-macvlan.c:181 ../libnm-core/nm-setting-vlan.c:661
 #: ../libnm-util/nm-setting-vlan.c:580
@@ -8158,7 +8568,7 @@ msgstr "속성이 지정되어 있지 않고 '%s:%s'도 아닙니다 "
 
 #: ../libnm-core/nm-setting-macvlan.c:192
 msgid "non promiscuous operation is allowed only in passthru mode"
-msgstr ""
+msgstr "비 무차별 작업은 passthru 모드에서만 허용됩니다"
 
 #: ../libnm-core/nm-setting-olpc-mesh.c:130
 #: ../libnm-core/nm-setting-wireless.c:739
@@ -8186,19 +8596,19 @@ msgid "setting this property requires non-zero '%s' property"
 msgstr "이 속성을 설정하려면 0이 아닌 '%s' 속성이 필요합니다 "
 
 #: ../libnm-core/nm-setting-tun.c:187
-#, fuzzy, c-format
+#, c-format
 msgid "'%u': invalid mode"
-msgstr "'%s'은 올바른 Wi-Fi 모드가 아닙니다 "
+msgstr "'%u': 잘못된 모드"
 
 #: ../libnm-core/nm-setting-tun.c:197
-#, fuzzy, c-format
+#, c-format
 msgid "'%s': invalid user ID"
-msgstr "'%s'은 올바른 UUID가 아닙니다 "
+msgstr "'%s': 잘못된 사용자 ID"
 
 #: ../libnm-core/nm-setting-tun.c:208
-#, fuzzy, c-format
+#, c-format
 msgid "'%s': invalid group ID"
-msgstr "'%s'은 올바른 UUID가 아닙니다 "
+msgstr "'%s': 잘못된 그룹 ID"
 
 #: ../libnm-core/nm-setting-vlan.c:636 ../libnm-util/nm-setting-vlan.c:556
 #, c-format
@@ -8208,62 +8618,62 @@ msgstr "'%s' 값은 '%s=%s'와 일치하지 않습니다 "
 #: ../libnm-core/nm-setting-vlan.c:672 ../libnm-util/nm-setting-vlan.c:600
 #, c-format
 msgid "the vlan id must be in range 0-4094 but is %u"
-msgstr ""
+msgstr "vlan ID가 0~4094 범위에 속해야 하지만 현재 %u입니다"
 
 #: ../libnm-core/nm-setting-vlan.c:681 ../libnm-util/nm-setting-vlan.c:591
 msgid "flags are invalid"
 msgstr "플래그가 잘못되어 있습니다 "
 
 #: ../libnm-core/nm-setting-vpn.c:460
-#, fuzzy, c-format
+#, c-format
 msgid "secret was empty"
-msgstr "속성이 비어 있습니다 "
+msgstr "secret이 비어 있었습니다."
 
 #: ../libnm-core/nm-setting-vpn.c:490
 msgid "setting contained a secret with an empty name"
-msgstr ""
+msgstr "설정에 이름이 빈 Secret이 포합되어 있습니다"
 
 #: ../libnm-core/nm-setting-vpn.c:498
 #, c-format
 msgid "secret value was empty"
-msgstr ""
+msgstr "Secret 값이 비어 있었습니다"
 
 #: ../libnm-core/nm-setting-vpn.c:545 ../libnm-core/nm-setting.c:1784
 msgid "not a secret property"
-msgstr ""
+msgstr "Secret 속성이 아님"
 
 #: ../libnm-core/nm-setting-vpn.c:551
 msgid "secret is not of correct type"
-msgstr ""
+msgstr "Secret은 올바른 유형이 아닙니다"
 
 #: ../libnm-core/nm-setting-vpn.c:586
-#, fuzzy, c-format
+#, c-format
 msgid "failed to convert value '%s' to uint"
-msgstr "오류: '%s' 값을 삭제하는데 실패했습니다: %s\n"
+msgstr "값 '%s'을(를) 유닛으로 변환할 수 없습니다."
 
 #: ../libnm-core/nm-setting-vpn.c:594
 msgid "secret flags property not found"
-msgstr ""
+msgstr "Secret 플래그 속성을 찾을 수 없음"
 
 #: ../libnm-core/nm-setting-vxlan.c:375
-#, fuzzy, c-format
+#, c-format
 msgid "'%s' is not a valid IP address"
-msgstr "'%s'은 올바른 MAC 주소가 아닙니다 "
+msgstr "'%s'은(는) 유효한 IP 주소가 아닙니다."
 
 #: ../libnm-core/nm-setting-vxlan.c:388
-#, fuzzy, c-format
+#, c-format
 msgid "'%s' is not a valid IP%c address"
-msgstr "'%s'은 올바른 MAC 주소가 아닙니다 "
+msgstr "'%s'은(는) 유효한 IP%c 주소가 아닙니다."
 
 #: ../libnm-core/nm-setting-vxlan.c:415
 #, c-format
 msgid "%d is greater than local port max %d"
-msgstr ""
+msgstr "%d이(가) 로컬 포트 최대 %d보다 큽니다"
 
 #: ../libnm-core/nm-setting-wired.c:619 ../libnm-util/nm-setting-wired.c:613
-#, fuzzy, c-format
+#, c-format
 msgid "'%s' is not a valid Ethernet port value"
-msgstr "'%s'은 올바른 이더넷 포트 값이 아닙니다 "
+msgstr "'%s'은(는) 유효한 이더넷 포트 값이 아닙니다."
 
 #: ../libnm-core/nm-setting-wired.c:629 ../libnm-util/nm-setting-wired.c:623
 #, c-format
@@ -8277,11 +8687,11 @@ msgstr "잘못된 '%s' 또는 값 '%s'"
 
 #: ../libnm-core/nm-setting-wired.c:709
 msgid "Wake-on-LAN mode 'default' and 'ignore' are exclusive flags"
-msgstr ""
+msgstr "Wake-on-LAN 모드 'default' 및 'ignore'는 독점 플래그입니다"
 
 #: ../libnm-core/nm-setting-wired.c:718
 msgid "Wake-on-LAN password can only be used with magic packet mode"
-msgstr ""
+msgstr "Wake-on-LAN 암호는 매직 패킷 모드에서만 사용할 수 있습니다"
 
 #: ../libnm-core/nm-setting-wireless-security.c:882
 #: ../libnm-util/nm-setting-wireless-security.c:912
@@ -8326,221 +8736,200 @@ msgid "'%s' is not a valid band"
 msgstr "'%s'는 올바른 밴드가 아닙니다 "
 
 #: ../libnm-core/nm-setting-wireless.c:768
-#, fuzzy, c-format
+#, c-format
 msgid "'%s' requires setting '%s' property"
-msgstr "'%s' 속성 설정이 필요합니다 "
+msgstr "'%s'에는 설정 '%s' 속성이 필요합니다."
 
 #: ../libnm-core/nm-setting.c:837
 #, c-format
 msgid "duplicate property"
-msgstr ""
+msgstr "중복 속성"
 
 #: ../libnm-core/nm-setting.c:865 ../libnm-core/nm-setting.c:912
 #, c-format
 msgid "can't set property of type '%s' from value of type '%s'"
-msgstr ""
+msgstr "유형 '%s'의 속성을 유형 '%s'의 값에서 설정할 수 없습니다"
 
 #: ../libnm-core/nm-setting.c:884 ../libnm-core/nm-setting.c:898
-#, fuzzy, c-format
+#, c-format
 msgid "failed to set property: %s"
-msgstr "오류: '%s' 속성을 설정하는데 실패했습니다: %s\n"
+msgstr "속성 설정 실패: %s"
 
 #: ../libnm-core/nm-setting.c:926
-#, fuzzy, c-format
+#, c-format
 msgid "can not set property: %s"
-msgstr "오류: '%s' 속성을 설정하는데 실패했습니다: %s\n"
+msgstr "속성을 설정할 수 없음: %s"
 
 #: ../libnm-core/nm-setting.c:942
-#, fuzzy, c-format
+#, c-format
 msgid "unknown property"
-msgstr "알 수 없는 오류"
+msgstr "알 수 없는 속성"
 
 #: ../libnm-core/nm-setting.c:1682
 msgid "secret not found"
-msgstr ""
+msgstr "Secret을 찾을 수 없음"
 
 #: ../libnm-core/nm-setting.c:1774
 msgid "secret is not set"
-msgstr ""
+msgstr "Secret이 설정되지 않았습니다"
 
-#: ../libnm-core/nm-utils.c:2445
-#, fuzzy, c-format
+#: ../libnm-core/nm-utils.c:2447
+#, c-format
 msgid "failed stat file %s: %s"
-msgstr "신호 마스크 설정에 실패했습니다: %d"
+msgstr "실패한 통계 파일 %s: %s"
 
-#: ../libnm-core/nm-utils.c:2454
-#, fuzzy, c-format
+#: ../libnm-core/nm-utils.c:2456
+#, c-format
 msgid "not a file (%s)"
-msgstr "파일 '%s'을 불러올 수 없습니다\n"
+msgstr "파일이 아닙니다(%s)."
 
-#: ../libnm-core/nm-utils.c:2465
-#, fuzzy, c-format
+#: ../libnm-core/nm-utils.c:2467
+#, c-format
 msgid "invalid file owner %d for %s"
-msgstr "잘못된 필드 '%s'; 허용되는 필드: %s"
+msgstr "%2$s의 잘못된 파일 소유자 %1$d"
 
-#: ../libnm-core/nm-utils.c:2476
+#: ../libnm-core/nm-utils.c:2478
 #, c-format
 msgid "file permissions for %s"
-msgstr ""
+msgstr "%s의 파일 권한"
 
-#: ../libnm-core/nm-utils.c:2486
+#: ../libnm-core/nm-utils.c:2488
 #, c-format
 msgid "reject %s"
-msgstr ""
+msgstr "%s 거부"
 
-#: ../libnm-core/nm-utils.c:2506
+#: ../libnm-core/nm-utils.c:2508
 #, c-format
 msgid "path is not absolute (%s)"
-msgstr ""
+msgstr "절대 경로가 아닙니다(%s)"
 
-#: ../libnm-core/nm-utils.c:2520
+#: ../libnm-core/nm-utils.c:2522
 #, c-format
 msgid "Plugin file does not exist (%s)"
-msgstr ""
+msgstr "플러그인 파일이 존재하지 않습니다(%s)"
 
-#: ../libnm-core/nm-utils.c:2528
-#, fuzzy, c-format
+#: ../libnm-core/nm-utils.c:2530
+#, c-format
 msgid "Plugin is not a valid file (%s)"
-msgstr "'%s'은 '%s'의 올바른 값이 아닙니다 "
+msgstr "플러그인이 유효한 파일이 아닙니다(%s)"
 
-#: ../libnm-core/nm-utils.c:2538
+#: ../libnm-core/nm-utils.c:2540
 #, c-format
 msgid "libtool archives are not supported (%s)"
-msgstr ""
+msgstr "립툴 아카이브가 지원되지 않습니다(%s)"
 
-#: ../libnm-core/nm-utils.c:2620 ../libnm-util/nm-utils.c:1803
+#: ../libnm-core/nm-utils.c:2622 ../libnm-util/nm-utils.c:1815
 #, c-format
 msgid "Could not find \"%s\" binary"
-msgstr ""
+msgstr "'%s' 바이너리를 찾을 수 없습니다"
 
-#: ../libnm-core/nm-vpn-editor-plugin.c:296
+#: ../libnm-core/nm-vpn-editor-plugin.c:124
 #, c-format
-msgid "cannot load plugin \"%s\": %s"
-msgstr ""
+msgid "cannot load plugin %s"
+msgstr "플러그인 %s을(를) 로드할 수 없습니다"
 
-#: ../libnm-core/nm-vpn-editor-plugin.c:307
+#: ../libnm-core/nm-vpn-editor-plugin.c:150
 #, c-format
-msgid "failed to load nm_vpn_editor_plugin_factory() from %s (%s)"
-msgstr ""
+msgid "cannot load VPN plugin in '%s': missing plugin name"
+msgstr "'%s'에 VPN 플러그인을 로드할 수 없음: 플러그인 이름 누락"
 
-#: ../libnm-core/nm-vpn-editor-plugin.c:332
+#: ../libnm-core/nm-vpn-editor-plugin.c:157
 #, c-format
-msgid "unknown error initializing plugin %s"
-msgstr ""
+msgid "cannot load VPN plugin in '%s': invalid service name"
+msgstr "'%s'에 VPN 플러그인을 로드할 수 없음: 잘못된 서비스 이름"
 
-#: ../libnm-core/nm-vpn-editor-plugin.c:349
+#: ../libnm-core/nm-vpn-editor-plugin.c:173
 #, c-format
-msgid "cannot load VPN plugin in '%s': missing plugin name"
-msgstr ""
+msgid "unknown error initializing plugin %s"
+msgstr "플러그인 %s(을)를 초기화하는 동안 알 수 없는 오류 발생"
 
-#: ../libnm-core/nm-vpn-editor-plugin.c:358
+#: ../libnm-core/nm-vpn-editor-plugin.c:185
 #, c-format
-msgid "cannot load VPN plugin in '%s': invalid service name"
-msgstr ""
+msgid "failed to load nm_vpn_editor_plugin_factory() from %s (%s)"
+msgstr "%s(%s)(으)로부터 nm_vpn_editor_plugin_factory() 로드에 실패했습니다"
 
-#: ../libnm-core/nm-vpn-editor-plugin.c:501
+#: ../libnm-core/nm-vpn-editor-plugin.c:292
 #, c-format
 msgid "the plugin does not support import capability"
-msgstr ""
+msgstr "플러그인에서 가져오기 기능을 지원하지 않습니다"
 
-#: ../libnm-core/nm-vpn-editor-plugin.c:521
+#: ../libnm-core/nm-vpn-editor-plugin.c:312
 #, c-format
 msgid "the plugin does not support export capability"
-msgstr ""
+msgstr "플러그인에서 내보내기 기능을 지원하지 않습니다"
 
-#: ../libnm-core/nm-vpn-plugin-info.c:110
-#, fuzzy, c-format
+#: ../libnm-core/nm-vpn-plugin-info.c:109
+#, c-format
 msgid "missing filename"
-msgstr "누락된 옵션 "
+msgstr "누락된 파일 이름"
 
-#: ../libnm-core/nm-vpn-plugin-info.c:118
+#: ../libnm-core/nm-vpn-plugin-info.c:117
 #, c-format
 msgid "filename must be an absolute path (%s)"
-msgstr ""
+msgstr "파일 이름은 절대 경로여야 합니다(%s)"
 
-#: ../libnm-core/nm-vpn-plugin-info.c:127
+#: ../libnm-core/nm-vpn-plugin-info.c:126
 #, c-format
 msgid "filename has invalid format (%s)"
-msgstr ""
+msgstr "파일 이름에 잘못된 형식이 포함되어 있습니다(%s)"
 
-#: ../libnm-core/nm-vpn-plugin-info.c:450
+#: ../libnm-core/nm-vpn-plugin-info.c:383
 #, c-format
 msgid "there exists a conflicting plugin (%s) that has the same %s.%s value"
-msgstr ""
+msgstr "동일한 %s.%s 값이 포함된 충돌하는 플러그인(%s)이 존재합니다"
 
-#: ../libnm-core/nm-vpn-plugin-info.c:488
+#: ../libnm-core/nm-vpn-plugin-info.c:421
 #, c-format
 msgid "there exists a conflicting plugin with the same name (%s)"
-msgstr ""
+msgstr "동일한 이름을 가진 충돌하는 플러그인이 존재합니다(%s)"
 
-#: ../libnm-core/nm-vpn-plugin-info.c:1071
-#, fuzzy, c-format
+#: ../libnm-core/nm-vpn-plugin-info.c:740
+#, c-format
 msgid "missing \"plugin\" setting"
-msgstr "누락된 옵션 "
+msgstr "누락된 \"plugin\" 설정"
 
-#: ../libnm-core/nm-vpn-plugin-info.c:1081
+#: ../libnm-core/nm-vpn-plugin-info.c:750
 #, c-format
 msgid "%s: don't retry loading plugin which already failed previously"
-msgstr ""
+msgstr "%s: 이전에 이미 실패한 플러그인은 다시 로드하지 마십시오"
 
-#: ../libnm-core/nm-vpn-plugin-info.c:1175
+#: ../libnm-core/nm-vpn-plugin-info.c:842
 msgid "missing filename to load VPN plugin info"
-msgstr ""
+msgstr "VPN 플러그인 정보를 로드하기 위한 파일 이름 누락"
 
-#: ../libnm-core/nm-vpn-plugin-info.c:1187
+#: ../libnm-core/nm-vpn-plugin-info.c:854
 msgid "missing name for VPN plugin info"
-msgstr ""
+msgstr "VPN 플로그인 정보의 이름 누락"
 
-#: ../libnm-core/nm-vpn-plugin-info.c:1196
+#: ../libnm-core/nm-vpn-plugin-info.c:863
 msgid "missing service for VPN plugin info"
-msgstr ""
+msgstr "VPN 플러그인 정보의 서비스 누락"
 
-#: ../libnm-glib/nm-device.c:1863 ../libnm/nm-device.c:1814
+#: ../libnm-glib/nm-device.c:1853 ../libnm/nm-device.c:1804
 msgid "Bluetooth"
 msgstr "블루투스"
 
-#: ../libnm-glib/nm-device.c:1865 ../libnm/nm-device.c:1816
-msgid "OLPC Mesh"
-msgstr "OLPC 메시"
-
-#: ../libnm-glib/nm-device.c:1867 ../libnm/nm-device.c:1818
-msgid "WiMAX"
-msgstr "WiMAX"
-
-#: ../libnm-glib/nm-device.c:1881 ../libnm/nm-device.c:1832
-msgid "ADSL"
-msgstr "ADSL"
-
-#: ../libnm-glib/nm-device.c:1883 ../libnm/nm-device.c:1834
-#, fuzzy
+#: ../libnm-glib/nm-device.c:1873 ../libnm/nm-device.c:1824
 msgid "MACVLAN"
-msgstr "VLAN"
-
-#: ../libnm-glib/nm-device.c:1885 ../libnm/nm-device.c:1836
-msgid "VXLAN"
-msgstr ""
+msgstr "MACVLAN"
 
-#: ../libnm-glib/nm-device.c:1887 ../libnm/nm-device.c:1838
+#: ../libnm-glib/nm-device.c:1877 ../libnm/nm-device.c:1828
 msgid "IPTunnel"
-msgstr ""
-
-#: ../libnm-glib/nm-device.c:1889 ../libnm/nm-device.c:1840
-msgid "Tun"
-msgstr ""
+msgstr "IPTunnel"
 
-#: ../libnm-glib/nm-device.c:1891 ../libnm/nm-device.c:1842
+#: ../libnm-glib/nm-device.c:1881 ../libnm/nm-device.c:1832
 msgid "Veth"
-msgstr ""
+msgstr "Veth"
 
-#: ../libnm-glib/nm-device.c:1923 ../libnm/nm-device.c:1874
+#: ../libnm-glib/nm-device.c:1913 ../libnm/nm-device.c:1864
 msgid "Wired"
 msgstr "유선"
 
-#: ../libnm-glib/nm-device.c:1954 ../libnm/nm-device.c:1905
+#: ../libnm-glib/nm-device.c:1944 ../libnm/nm-device.c:1895
 msgid "PCI"
 msgstr "PCI"
 
-#: ../libnm-glib/nm-device.c:1956 ../libnm/nm-device.c:1907
+#: ../libnm-glib/nm-device.c:1946 ../libnm/nm-device.c:1897
 msgid "USB"
 msgstr "USB"
 
@@ -8549,28 +8938,27 @@ msgstr "USB"
 #. * "Ethernet"). You can change this to something like
 #. * "%2$s (%1$s)" if there's no grammatical way to combine
 #. * the strings otherwise.
-#.
-#: ../libnm-glib/nm-device.c:2052 ../libnm-glib/nm-device.c:2071
-#: ../libnm/nm-device.c:2001 ../libnm/nm-device.c:2020
+#. 
+#: ../libnm-glib/nm-device.c:2042 ../libnm-glib/nm-device.c:2061
+#: ../libnm/nm-device.c:1991 ../libnm/nm-device.c:2010
 #, c-format
 msgctxt "long device name"
 msgid "%s %s"
 msgstr "%s %s"
 
 #: ../libnm-glib/nm-remote-connection.c:149
-#, fuzzy
 msgid "Disconnected by D-Bus"
-msgstr "연결 끊겼음"
+msgstr "D-Bus에 의해 연결 해제됨"
 
 #: ../libnm-util/crypto_gnutls.c:84
 #, c-format
 msgid "Hash length too long (%d > %d)."
-msgstr ""
+msgstr "해시 길이가 너무 깁니다(%d > %d)"
 
 #: ../libnm-util/crypto_gnutls.c:115
-#, fuzzy, c-format
+#, 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
@@ -8609,24 +8997,24 @@ msgid "%d. route has invalid prefix"
 msgstr "%d. 라우팅에는 잘못된 접두어가 있습니다 "
 
 #: ../libnm-util/nm-setting-ip6-config.c:910
-#, fuzzy, c-format
+#, c-format
 msgid "%d. IPv6 address is invalid"
-msgstr "%d. IPv4 주소는 잘못되어 있습니다 "
+msgstr "%d. IPv6 주소가 잘못되었습니다."
 
 #: ../libnm-util/nm-setting-ip6-config.c:920
-#, fuzzy, c-format
+#, c-format
 msgid "%d. IPv6 address has invalid prefix"
-msgstr "%d. IPv4 주소에는 잘못된 접두어가 있습니다 "
+msgstr "%d. IPv6 주소에 잘못된 접두어가 있습니다."
 
 #: ../libnm-util/nm-setting-vpn.c:582
 #, c-format
 msgid "Failed to convert '%s' value '%s' to uint"
-msgstr ""
+msgstr "'%s' 값 '%s'(을)를 단위로 변환하는 데 실패했습니다"
 
 #: ../libnm-util/nm-setting-vpn.c:589
 #, c-format
 msgid "Secret flags property '%s' not found"
-msgstr ""
+msgstr "secret 플래그 속성 '%s'(을)를 찾을 수 없음"
 
 #: ../libnm-util/nm-setting-wireless.c:807
 #, c-format
@@ -8634,202 +9022,181 @@ msgid "requires setting '%s' property"
 msgstr "'%s' 속성 설정이 필요합니다 "
 
 #: ../libnm/nm-device-adsl.c:74
-#, fuzzy
 msgid "The connection was not an ADSL connection."
-msgstr "연결 중 (보조 연결 시작하는 중)"
+msgstr "연결이 ADSL 연결이 아니었습니다."
 
 #: ../libnm/nm-device-bond.c:112
-#, fuzzy
 msgid "The connection was not a bond connection."
-msgstr "연결 중 (보조 연결 시작하는 중)"
+msgstr "연결이 본딩 연결이 아니었습니다."
 
 #: ../libnm/nm-device-bridge.c:112
-#, fuzzy
 msgid "The connection was not a bridge connection."
-msgstr "연결 중 (보조 연결 시작하는 중)"
+msgstr "연결이 브리지 연결이 아니었습니다."
 
 #: ../libnm/nm-device-bt.c:137
-#, fuzzy, c-format
+#, c-format
 msgid "The connection was not a Bluetooth connection."
-msgstr "'bluetooth' 연결 유형에는 1 가지 옵션 인수가 있습니다.\n"
+msgstr "연결이 블루투스 연결이 아니었습니다."
 
 #: ../libnm/nm-device-bt.c:146
 msgid "Invalid device Bluetooth address."
-msgstr ""
+msgstr "잘못된 장치 블루투스 주소."
 
 #: ../libnm/nm-device-bt.c:153
 msgid "The Bluetooth addresses of the device and the connection didn't match."
-msgstr ""
+msgstr "장치의 블루투스 주소와 연결이 일치하지 않습니다."
 
 #: ../libnm/nm-device-bt.c:162
 msgid ""
 "The device is lacking Bluetooth capabilities required by the connection."
-msgstr ""
+msgstr "장치에는 연결에 필요한 블루투스 기능이 없습니다."
 
 #: ../libnm/nm-device-ethernet.c:207
-#, fuzzy
 msgid "The connection was not an Ethernet or PPPoE connection."
-msgstr "'PPPoE' 연결 유형에는 4 가지 옵션 인수가 있습니다.\n"
+msgstr "연결이 이더넷 또는 PPPoE 연결이 아니었습니다."
 
 #: ../libnm/nm-device-ethernet.c:222
 msgid "The connection and device differ in S390 subchannels."
-msgstr ""
+msgstr "S390 하위 채널에서 연결과 장치가 다릅니다."
 
 #: ../libnm/nm-device-ethernet.c:232 ../libnm/nm-device-infiniband.c:102
 #: ../libnm/nm-device-wifi.c:604 ../libnm/nm-device-wimax.c:326
-#, fuzzy
 msgid "Invalid device MAC address."
-msgstr "올바른 MAC 주소가 아닙니다 "
+msgstr "잘못된 장치 MAC 주소입니다."
 
 #: ../libnm/nm-device-ethernet.c:237
 msgid "The MACs of the device and the connection do not match."
-msgstr ""
+msgstr "장치와 연결의 MAC이 일치하지 않습니다."
 
 #: ../libnm/nm-device-ethernet.c:247
 #, c-format
 msgid "Invalid MAC in the blacklist: %s."
-msgstr ""
+msgstr "차단 목록의 잘못된 MAC: %s."
 
 #: ../libnm/nm-device-ethernet.c:253
 #, c-format
 msgid "Device MAC (%s) is blacklisted by the connection."
-msgstr ""
+msgstr "장치 MAC(%s)이 연결에 의해 차단되었습니다."
 
 #: ../libnm/nm-device-generic.c:91
-#, fuzzy
 msgid "The connection was not a generic connection."
-msgstr "연결 중 (보조 연결 시작하는 중)"
+msgstr "연결이 일반 연결이 아니었습니다."
 
 #: ../libnm/nm-device-generic.c:98
-#, fuzzy
 msgid "The connection did not specify an interface name."
-msgstr ""
-"InfiniBand P_Key 연결에서 부모 인터페이스 이름이 지정되어 있지 않습니다 "
+msgstr "연결에서 인터페이스 이름이 지정되지 않았습니다."
 
 #: ../libnm/nm-device-tun.c:209
-#, fuzzy
 msgid "The connection was not a tun connection."
-msgstr "연결 중 (보조 연결 시작하는 중)"
+msgstr "연결이 tun 연결이 아니었습니다."
 
 #: ../libnm/nm-device-tun.c:218
-#, fuzzy
 msgid "The mode of the device and the connection didn't match"
-msgstr "장치의 활성 연결이 사라졌습니다 "
+msgstr "장치와 연결의 모드가 일치하지 않았습니다."
 
 #: ../libnm/nm-device-infiniband.c:94
-#, fuzzy
 msgid "The connection was not an InfiniBand connection."
-msgstr "'InfiniBand' 연결 유형에는 5 가지 옵션 인수가 있습니다.\n"
+msgstr "연결이 InfiniBand 연결이 아니었습니다."
 
 #: ../libnm/nm-device-infiniband.c:110 ../libnm/nm-device-wifi.c:611
 #: ../libnm/nm-device-wimax.c:333
 msgid "The MACs of the device and the connection didn't match."
-msgstr ""
+msgstr "장치와 연결의 MAC이 일치하지 않습니다."
 
 #: ../libnm/nm-device-ip-tunnel.c:254
-#, fuzzy
 msgid "The connection was not an IP tunnel connection."
-msgstr "연결 중 (보조 연결 시작하는 중)"
+msgstr "연결이 IP 터널 연결이 아니었습니다."
 
 #: ../libnm/nm-device-macvlan.c:159
 msgid "The connection was not a MAC-VLAN connection."
-msgstr ""
+msgstr "MAC-VLAN 연결이 아닙니다."
 
 #: ../libnm/nm-device-modem.c:120
-#, fuzzy
 msgid "The connection was not a modem connection."
-msgstr "연결이 제거되었습니다"
+msgstr "연결이 모뎀 연결이 아니었습니다."
 
 #: ../libnm/nm-device-modem.c:128
-#, fuzzy
 msgid "The connection was not a valid modem connection."
-msgstr "연결 중 (보조 연결 시작하는 중)"
+msgstr "연결이 유효한 모뎀 연결이 아니었습니다."
 
 #: ../libnm/nm-device-modem.c:135
 msgid "The device is lacking capabilities required by the connection."
-msgstr ""
+msgstr "장치에는 연결에 필요한 기능이 없습니다."
 
 #: ../libnm/nm-device-olpc-mesh.c:115
-#, fuzzy
 msgid "The connection was not an OLPC Mesh connection."
-msgstr "'OLPC Mesh' 연결 유형에는 2 가지 옵션 인수가 있습니다.\n"
+msgstr "연결이 OLPC 메시 연결이 아니었습니다."
 
-#: ../libnm/nm-device-team.c:139
-#, fuzzy
+#: ../libnm/nm-device-team.c:118
 msgid "The connection was not a team connection."
-msgstr "연결이 제거되었습니다"
+msgstr "연결이 팀 연결이 아니었습니다."
 
 #: ../libnm/nm-device-vlan.c:128
-#, fuzzy
 msgid "The connection was not a VLAN connection."
-msgstr "'VLAN' 연결 유형에는 4 가지 옵션 인수가 있습니다.\n"
+msgstr "연결이 VLAN 연결이 아니었습니다."
 
 #: ../libnm/nm-device-vlan.c:135
 msgid "The VLAN identifiers of the device and the connection didn't match."
-msgstr ""
+msgstr "장치와 연결의 VLAN 식별자가 일치하지 않습니다."
 
 #: ../libnm/nm-device-vlan.c:148
 msgid "The hardware address of the device and the connection didn't match."
-msgstr ""
+msgstr "장치와 연결의 하드웨어 주소가 일치하지 않습니다."
 
 #: ../libnm/nm-device-vxlan.c:387
-#, fuzzy
 msgid "The connection was not a VXLAN connection."
-msgstr "'VLAN' 연결 유형에는 4 가지 옵션 인수가 있습니다.\n"
+msgstr "연결이 VXLAN 연결이 아니었습니다."
 
 #: ../libnm/nm-device-vxlan.c:394
 msgid "The VXLAN identifiers of the device and the connection didn't match."
-msgstr ""
+msgstr "장치와 연결의 VXLAN 식별자가 일치하지 않습니다."
 
 #: ../libnm/nm-device-wifi.c:595
 msgid "The connection was not a Wi-Fi connection."
-msgstr ""
+msgstr "Wi-Fi 연결이 아닙니다."
 
 #: ../libnm/nm-device-wifi.c:631
 msgid "The device is lacking WPA capabilities required by the connection."
-msgstr ""
+msgstr "장치에는 연결에 필요한 WPA 기능이 없습니다."
 
 #: ../libnm/nm-device-wifi.c:638
-msgid "The device is lacking WPA2/RSN capabilities required by the connection."
-msgstr ""
+msgid ""
+"The device is lacking WPA2/RSN capabilities required by the connection."
+msgstr "장치에는 연결에 필요한 WPA2/RSN 기능이 없습니다."
 
 #: ../libnm/nm-device-wimax.c:317
-#, fuzzy
 msgid "The connection was not a WiMAX connection."
-msgstr "'WiMax' 연결 유형에는 1 가지 옵션 인수가 있습니다.\n"
+msgstr "연결이 WiMAX 연결이 아니었습니다."
 
-#: ../libnm/nm-device.c:2739
-#, fuzzy, c-format
+#: ../libnm/nm-device.c:2729
+#, c-format
 msgid "The connection was not valid: %s"
-msgstr "오류: 연결이 올바르지 않습니다: %s\n"
+msgstr "연결이 유효하지 않았음: %s"
 
-#: ../libnm/nm-device.c:2748
+#: ../libnm/nm-device.c:2738
 #, c-format
 msgid "The interface names of the device and the connection didn't match."
-msgstr ""
+msgstr "장치와 연결의 인터페이스 이름이 일치하지 않습니다."
 
-#: ../libnm/nm-manager.c:867
-#, fuzzy
+#: ../libnm/nm-manager.c:874
 msgid "Active connection could not be attached to the device"
-msgstr "활성화된 연결이나 장치가 없습니다"
+msgstr "활성 연결을 장치에 연결할 수 없습니다."
 
-#: ../libnm/nm-manager.c:1091
-#, fuzzy
+#: ../libnm/nm-manager.c:1098
 msgid "Active connection removed before it was initialized"
-msgstr "활성화된 연결 상세 정보 "
+msgstr "활성 연결이 초기화되기 전에 제거되었습니다."
 
 #: ../libnm/nm-object.c:1545 ../libnm/nm-object.c:1691
 msgid "Caller did not specify D-Bus path for object"
-msgstr ""
+msgstr "호출자가 개체의 D-Bus 경로를 지정하지 않았습니다"
 
 #: ../libnm/nm-remote-settings.c:261
 msgid "Connection removed before it was initialized"
-msgstr ""
+msgstr "연결이 초기화 이전에 제거되었습니다"
 
 #: ../libnm/nm-vpn-plugin-old.c:957 ../libnm/nm-vpn-service-plugin.c:978
-#, fuzzy
 msgid "No service name specified"
-msgstr "오류: 인터페이스가 지정되어 있지 않습니다."
+msgstr "서비스 이름이 지정되지 않았습니다."
 
 #: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:1
 msgid "Enable or disable system networking"
@@ -8840,194 +9207,183 @@ msgid "System policy prevents enabling or disabling system networking"
 msgstr "시스템 정책이 시스템 네트워크의 사용 여부 설정을 금지합니다"
 
 #: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:3
-#, fuzzy
-msgid "Reload NetworkManager configuration"
-msgstr "네트워크 관리자 버전 정보를 출력하고 종료합니다 "
-
-#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:4
-#, fuzzy
-msgid "System policy prevents reloading NetworkManager"
-msgstr "시스템 정책이 시스템 네트워크의 사용 여부 설정을 금지합니다"
-
-#: ../policy/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 "네트워크 관리 프로그램을 일시 중지하거나 다시 시작합니다 (시스템 전원 관리에서만 사용)"
 
-#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:6
+#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:4
 msgid "System policy prevents putting NetworkManager to sleep or waking it up"
-msgstr ""
-"시스템 정책이 네트워크 관리 프로그램의 일시 중지나 다시 시작을 금지합니다"
+msgstr "시스템 정책이 네트워크 관리 프로그램의 일시 중지나 다시 시작을 금지합니다"
 
-#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:7
+#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:5
 msgid "Enable or disable WiFi devices"
 msgstr "WiFi 장치 사용 여부"
 
-#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:8
+#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:6
 msgid "System policy prevents enabling or disabling WiFi devices"
 msgstr "시스템 정책이 WiFi 장치 사용 여부 설정을 금지합니다"
 
-#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:9
+#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:7
 msgid "Enable or disable mobile broadband devices"
 msgstr "모바일 광대역 장치 사용 여부"
 
-#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:10
+#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:8
 msgid "System policy prevents enabling or disabling mobile broadband devices"
 msgstr "시스템 정책이 모바일 광대역 장치의 사용 여부 설정을 금지합니다"
 
-#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:11
+#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:9
 msgid "Enable or disable WiMAX mobile broadband devices"
 msgstr "와이맥스 모바일 광대역 장치 사용 여부"
 
-#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:12
+#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:10
 msgid ""
 "System policy prevents enabling or disabling WiMAX mobile broadband devices"
-msgstr ""
-"시스템 정책이 와이맥스 모바일 광대역 장치의 사용 여부 설정을 금지합니다"
+msgstr "시스템 정책이 와이맥스 모바일 광대역 장치의 사용 여부 설정을 금지합니다"
 
-#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:13
+#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:11
 msgid "Allow control of network connections"
 msgstr "네트워크 연결 조작 허용"
 
-#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:14
+#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:12
 msgid "System policy prevents control of network connections"
 msgstr "시스템 정책이 네트워크 연결 조작을 금지합니다"
 
-#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:15
+#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:13
 msgid "Connection sharing via a protected WiFi network"
 msgstr "보호된 WiFi 네트워크를 통한 연결 공유"
 
-#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:16
-msgid "System policy prevents sharing connections via a protected WiFi network"
+#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:14
+msgid ""
+"System policy prevents sharing connections via a protected WiFi network"
 msgstr "시스템 정책이 보호된 WiFi 네트워크를 통한 연결 공유를 금지합니다"
 
-#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:17
+#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:15
 msgid "Connection sharing via an open WiFi network"
 msgstr "열린 WiFi 네트워크를 통한 연결 공유"
 
-#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:18
+#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:16
 msgid "System policy prevents sharing connections via an open WiFi network"
 msgstr "시스템 정책이 열린 WiFi 네트워크를 통한 연결 공유를 금지합니다"
 
-#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:19
+#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:17
 msgid "Modify personal network connections"
 msgstr "개인 네트워크 연결을 수정합니다"
 
-#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:20
+#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:18
 msgid "System policy prevents modification of personal network settings"
 msgstr "시스템 정책이 개인 네트워크 설정의 수정을 금지합니다"
 
-#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:21
+#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:19
 msgid "Modify network connections for all users"
 msgstr "모든 사용자의 네트워크 연결을 수정합니다"
 
-#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:22
+#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:20
 msgid "System policy prevents modification of network settings for all users"
 msgstr "시스템 정책이 모든 사용자의 네트워크 설정의 수정을 금지합니다"
 
-#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:23
+#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:21
 msgid "Modify persistent system hostname"
 msgstr "영구적인 시스템 호스트 이름을 수정합니다"
 
-#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:24
+#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:22
 msgid "System policy prevents modification of the persistent system hostname"
 msgstr "시스템 정책이 호스트 이름의 변경을 금지합니다"
 
-#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:25
+#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:23
 msgid "Modify persistent global DNS configuration"
-msgstr ""
+msgstr "영구 글로벌 DNS 구성 수정"
 
-#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:26
-#, fuzzy
+#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:24
 msgid ""
 "System policy prevents modification of the persistent global DNS "
 "configuration"
-msgstr "시스템 정책이 호스트 이름의 변경을 금지합니다"
+msgstr "시스템 정책이 영구적인 글로벌 DNS 구성의 수정을 금지합니다."
 
-#: ../shared/nm-utils/nm-shared-utils.c:185
+#: ../shared/nm-shared-utils.c:208
 #, c-format
 msgid "object class '%s' has no property named '%s'"
-msgstr ""
+msgstr "개체 클래스 '%s'에 이름이 '%s'인 속성이 없습니다"
 
-#: ../shared/nm-utils/nm-shared-utils.c:192
+#: ../shared/nm-shared-utils.c:215
 #, c-format
 msgid "property '%s' of object class '%s' is not writable"
-msgstr ""
+msgstr "개체 클래스의 '%s'의 속성 '%s'에는 쓸 수 없습니다"
 
-#: ../shared/nm-utils/nm-shared-utils.c:199
+#: ../shared/nm-shared-utils.c:222
 #, c-format
 msgid ""
 "construct property \"%s\" for object '%s' can't be set after construction"
-msgstr ""
+msgstr "구성 후에는 개체 '%s'의 구성 속성 ''%s''을(를) 설정할 수 없습니다"
 
-#: ../shared/nm-utils/nm-shared-utils.c:207
+#: ../shared/nm-shared-utils.c:230
 #, c-format
 msgid "'%s::%s' is not a valid property name; '%s' is not a GObject subtype"
-msgstr ""
+msgstr "'%s::%s'은(는) 올바른 속성 이름이 아닙니다. '%s'은(는) GObject 하위 유형이 아닙니다"
 
-#: ../shared/nm-utils/nm-shared-utils.c:216
+#: ../shared/nm-shared-utils.c:239
 #, c-format
 msgid "unable to set property '%s' of type '%s' from value of type '%s'"
-msgstr ""
+msgstr "유형 '%s'의 값에서 유형 '%s'의 속성 '%s'(을)를 설정할 수 없습니다"
 
-#: ../shared/nm-utils/nm-shared-utils.c:227
+#: ../shared/nm-shared-utils.c:250
 #, c-format
 msgid ""
 "value \"%s\" of type '%s' is invalid or out of range for property '%s' of "
 "type '%s'"
-msgstr ""
+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:112
-#, fuzzy, c-format
+#: ../src/NetworkManagerUtils.c:111
+#, c-format
 msgctxt "connection id fallback"
 msgid "%s %d"
-msgstr "%s %s"
+msgstr "%s %d"
 
-#: ../src/main.c:165 ../src/main.c:300
-#, fuzzy, c-format
+#: ../src/main.c:220 ../src/main.c:358
+#, c-format
 msgid "Failed to read configuration: %s\n"
-msgstr "설정을 읽는데 실패했습니다: (%d) %s\n"
+msgstr "구성 읽기 실패: %s\n"
 
 #. Logging/debugging
-#: ../src/main.c:179 ../src/nm-iface-helper.c:298
+#: ../src/main.c:234 ../src/nm-iface-helper.c:298
 msgid "Print NetworkManager version and exit"
 msgstr "네트워크 관리자 버전 정보를 출력하고 종료합니다 "
 
-#: ../src/main.c:180 ../src/nm-iface-helper.c:299
+#: ../src/main.c:235 ../src/nm-iface-helper.c:299
 msgid "Don't become a daemon"
 msgstr "데몬이 되지 않습니다 "
 
-#: ../src/main.c:181 ../src/nm-iface-helper.c:301
+#: ../src/main.c:236 ../src/nm-iface-helper.c:301
 #, c-format
 msgid "Log level: one of [%s]"
 msgstr "로그 수준: [%s] 중 하나 "
 
-#: ../src/main.c:183 ../src/nm-iface-helper.c:303
+#: ../src/main.c:238 ../src/nm-iface-helper.c:303
 #, c-format
 msgid "Log domains separated by ',': any combination of [%s]"
 msgstr "','로 구분된 로그 도메인: [%s]의 조합 "
 
-#: ../src/main.c:185 ../src/nm-iface-helper.c:305
+#: ../src/main.c:240 ../src/nm-iface-helper.c:305
 msgid "Make all warnings fatal"
 msgstr "모든 경고를 치명적인 것으로 취급합니다"
 
-#: ../src/main.c:186
+#: ../src/main.c:241
 msgid "Specify the location of a PID file"
 msgstr "PID 파일의 위치를 지정합니다 "
 
-#: ../src/main.c:188
-#, fuzzy
+#: ../src/main.c:242
+msgid "State file location"
+msgstr "상태 파일 위치 "
+
+#: ../src/main.c:244
 msgid "Print NetworkManager configuration and exit"
-msgstr "네트워크 관리자 버전 정보를 출력하고 종료합니다 "
+msgstr "NetworkManager 구성을 인쇄하고 종료합니다."
 
-#: ../src/main.c:198
+#: ../src/main.c:254
 msgid ""
 "NetworkManager monitors all network connections and automatically\n"
 "chooses the best connection to use.  It also allows the user to\n"
@@ -9039,514 +9395,504 @@ msgstr ""
 "지점을 지정하여 컴퓨터에 있는 무선 카드에 \n"
 "연결할 수 있게 합니다."
 
-#: ../src/main.c:285 ../src/main-utils.c:270 ../src/nm-iface-helper.c:393
+#: ../src/main.c:343 ../src/main-utils.c:269 ../src/nm-iface-helper.c:393
 #, c-format
 msgid "%s.  Please use --help to see a list of valid options.\n"
 msgstr "%s. 올바른 옵션의 목록을 보려면 --help 옵션을 이용하십시오.\n"
 
-#: ../src/main.c:290 ../src/nm-iface-helper.c:398
+#: ../src/main.c:348 ../src/nm-iface-helper.c:398
 #, c-format
 msgid "Ignoring unrecognized log domain(s) '%s' passed on command line.\n"
 msgstr "명령행에 전달된 인식할 수 없는 로그 도메인 '%s'을 무시합니다.\n"
 
-#: ../src/main.c:315
+#: ../src/main.c:373
 #, c-format
 msgid "Error in configuration file: %s.\n"
 msgstr "설정 파일에 오류가 발생했습니다: %s.\n"
 
-#: ../src/main.c:320
+#: ../src/main.c:378
 #, c-format
 msgid "Ignoring unrecognized log domain(s) '%s' from config files.\n"
 msgstr "설정 파일에서 인식할 수 없는 로그 도메인 '%s'을 무시합니다.\n"
 
-#: ../src/main.c:331 ../src/nm-iface-helper.c:408
+#: ../src/main.c:389 ../src/nm-iface-helper.c:408
 #, c-format
 msgid "Could not daemonize: %s [error %u]\n"
 msgstr "데몬화할 수 없습니다: %s [error %u]\n"
 
-#: ../src/main-utils.c:98
+#: ../src/main-utils.c:99
 #, c-format
 msgid "Opening %s failed: %s\n"
 msgstr "%s을 여는데 실패했습니다: %s\n"
 
-#: ../src/main-utils.c:104
+#: ../src/main-utils.c:105
 #, c-format
 msgid "Writing to %s failed: %s\n"
 msgstr "%s에 쓰는데 실패했습니다: %s\n"
 
-#: ../src/main-utils.c:109
+#: ../src/main-utils.c:110
 #, c-format
 msgid "Closing %s failed: %s\n"
 msgstr "%s를 종료하는데 실패했습니다: %s\n"
 
-#: ../src/main-utils.c:144
+#: ../src/main-utils.c:145
 #, c-format
 msgid "Cannot create '%s': %s"
-msgstr ""
+msgstr "'%s'을(를) 생성할 수 없음: %s"
 
-#: ../src/main-utils.c:196
-#, fuzzy, c-format
+#: ../src/main-utils.c:197
+#, c-format
 msgid "%s is already running (pid %ld)\n"
-msgstr "네트워크 관리 프로그램이 이미 실행되고 있습니다 (pid %ld)\n"
+msgstr "%s이(가) 이미 실행 중입니다(pid %ld).\n"
 
-#: ../src/main-utils.c:206
-#, fuzzy, c-format
+#: ../src/main-utils.c:207
+#, c-format
 msgid "You must be root to run %s!\n"
-msgstr "root로 NetworkManager를 실행해야 합니다!\n"
+msgstr "%s!을(를) 실행하려면 root여야 합니다.\n"
 
-#: ../src/dhcp-manager/nm-dhcp-dhclient-utils.c:214
+#: ../src/dhcp-manager/nm-dhcp-dhclient-utils.c:213
 msgid "# Created by NetworkManager\n"
 msgstr "# 네트워크 관리에서 만들어 냄\n"
 
-#: ../src/dhcp-manager/nm-dhcp-dhclient-utils.c:222
+#: ../src/dhcp-manager/nm-dhcp-dhclient-utils.c:220
 #, c-format
-msgid ""
-"# Merged from %s\n"
+msgid "# Merged from %s\n"
 "\n"
-msgstr ""
-"# %s에서 합침\n"
+msgstr "# %s에서 합침\n"
 "\n"
 
-#: ../src/devices/bluetooth/nm-bluez-device.c:200
+#: ../src/devices/adsl/nm-device-adsl.c:133
+msgid "ADSL connection"
+msgstr "ADSL 연결"
+
+#: ../src/devices/bluetooth/nm-bluez-device.c:197
 #, c-format
 msgid "%s Network"
 msgstr "%s 네트워크 "
 
 #: ../src/devices/bluetooth/nm-device-bt.c:253
 msgid "PAN requested, but Bluetooth device does not support NAP"
-msgstr ""
+msgstr "PAN이 요청되었지만 블루투스 장치에서 NAP를 지원하지 않습니다"
 
 #: ../src/devices/bluetooth/nm-device-bt.c:263
 msgid "PAN connections cannot specify GSM, CDMA, or serial settings"
-msgstr ""
+msgstr "PAN 연결에서 GSM, CDMA 또는 직렬 설정을 지정할 수 없습니다"
 
 #: ../src/devices/bluetooth/nm-device-bt.c:276
-#, fuzzy
 msgid "PAN connection"
-msgstr "PAN 연결 %d"
+msgstr "PAN 연결"
 
 #: ../src/devices/bluetooth/nm-device-bt.c:283
 msgid "DUN requested, but Bluetooth device does not support DUN"
-msgstr ""
+msgstr "DUN이 요청되었지만 블루투스 장치에서 DUN을 지원하지 않습니다"
 
 #: ../src/devices/bluetooth/nm-device-bt.c:293
 msgid "DUN connection must include a GSM or CDMA setting"
-msgstr ""
+msgstr "DUN 연결에는 GSM 또는 CDMA 설정을 포함해야 합니다"
 
 #: ../src/devices/bluetooth/nm-device-bt.c:303
-#: ../src/devices/wwan/nm-modem-broadband.c:687
-#, fuzzy
+#: ../src/devices/wwan/nm-modem-broadband.c:655
 msgid "GSM connection"
-msgstr "GSM 연결 %d"
+msgstr "GSM 연결"
 
 #: ../src/devices/bluetooth/nm-device-bt.c:307
-#: ../src/devices/wwan/nm-modem-broadband.c:711
-#, fuzzy
+#: ../src/devices/wwan/nm-modem-broadband.c:679
 msgid "CDMA connection"
-msgstr "CDMA 연결 %d"
+msgstr "CDMA 연결"
 
 #: ../src/devices/bluetooth/nm-device-bt.c:315
 msgid "Unknown/unhandled Bluetooth connection type"
-msgstr ""
+msgstr "알 수 없거나 처리되지 않은 블루투스 연결 유형"
 
 #: ../src/devices/bluetooth/nm-device-bt.c:336
-#: ../src/devices/nm-device-ethernet.c:1421
+#: ../src/devices/nm-device-ethernet.c:1415
 #: ../src/devices/nm-device-infiniband.c:193
-#: ../src/devices/wifi/nm-device-wifi.c:875
-#, fuzzy
+#: ../src/devices/wifi/nm-device-wifi.c:872
 msgid "connection does not match device"
-msgstr "활성화된 연결이나 장치가 없습니다"
+msgstr "연결이 장치와 일치하지 않습니다."
 
 #: ../src/devices/nm-device-bond.c:105
-#, fuzzy
 msgid "Bond connection"
-msgstr "Bond 연결 %d"
+msgstr "본딩 연결"
 
 #: ../src/devices/nm-device-bridge.c:111
-#, fuzzy
 msgid "Bridge connection"
-msgstr "브리지 연결 %d"
+msgstr "브리지 연결"
 
-#: ../src/devices/nm-device-ethernet.c:1402
-#, fuzzy
+#: ../src/devices/nm-device-ethernet.c:1396
 msgid "PPPoE connection"
-msgstr "PPPoE 연결 %d"
+msgstr "PPPoE 연결"
 
-#: ../src/devices/nm-device-ethernet.c:1402
-#, fuzzy
+#: ../src/devices/nm-device-ethernet.c:1396
 msgid "Wired connection"
-msgstr "유선 연결 %d"
+msgstr "유선 연결"
 
-#: ../src/devices/nm-device-ethernet-utils.c:36
+#: ../src/devices/nm-device-ethernet-utils.c:39
 #, c-format
 msgid "Wired connection %d"
 msgstr "유선 연결 %d"
 
-#: ../src/devices/nm-device-ip-tunnel.c:347
-#, fuzzy
+#: ../src/devices/nm-device-infiniband.c:175
+msgid "InfiniBand connection"
+msgstr "InfiniBand 연결"
+
+#: ../src/devices/nm-device-ip-tunnel.c:346
 msgid "IP tunnel connection"
-msgstr "연결 편집 "
+msgstr "IP 터널 연결"
 
-#: ../src/devices/nm-device-macvlan.c:436
-#, fuzzy
+#: ../src/devices/nm-device-macvlan.c:435
 msgid "MACVLAN connection"
-msgstr "VLAN 연결 %d"
+msgstr "MACVLAN 연결"
 
 #: ../src/devices/nm-device-tun.c:129
-#, fuzzy
 msgid "TUN connection"
-msgstr "DUN 연결 %d"
+msgstr "TUN 연결"
+
+#: ../src/devices/nm-device-vlan.c:457
+msgid "VLAN connection"
+msgstr "VLAN 연결"
 
-#: ../src/devices/team/nm-device-team.c:121
-#, fuzzy
+#: ../src/devices/nm-device-vxlan.c:373
+msgid "VXLAN connection"
+msgstr "VXLAN 연결"
+
+#: ../src/devices/team/nm-device-team.c:115
 msgid "Team connection"
-msgstr "팀 연결 %d"
+msgstr "팀 연결"
 
 #: ../src/devices/wifi/nm-device-olpc-mesh.c:146
-#, fuzzy
 msgid "Mesh"
-msgstr "메시 %d"
+msgstr "메시"
 
-#: ../src/devices/wifi/nm-device-wifi.c:842
+#: ../src/devices/wifi/nm-device-wifi.c:839
 msgid "WPA Ad-Hoc disabled due to kernel bugs"
-msgstr ""
+msgstr "커널 버그로 인해 WPA 애드혹이 비활성화됨"
 
 #: ../src/devices/wifi/nm-wifi-ap-utils.c:42
-#, fuzzy, c-format
+#, c-format
 msgid "%s is incompatible with static WEP keys"
-msgstr "'%s=%s'은 '%s > 0'와 호환하지 않습니다 "
+msgstr "%s은(는) 정적 WEP 키와 호환되지 않습니다."
 
 #: ../src/devices/wifi/nm-wifi-ap-utils.c:76
-#, fuzzy
 msgid "LEAP authentication requires a LEAP username"
-msgstr "무선 네트워크에서 인증이 필요합니다"
+msgstr "LEAP 인증에는 LEAP 사용자 이름이 필요합니다."
 
 #: ../src/devices/wifi/nm-wifi-ap-utils.c:86
 msgid "LEAP username requires 'leap' authentication"
-msgstr ""
+msgstr "LEAP 사용자 이름에 'leap' 인증이 필요합니다"
 
 #: ../src/devices/wifi/nm-wifi-ap-utils.c:99
 msgid "LEAP authentication requires IEEE 802.1x key management"
-msgstr ""
+msgstr "LEAP 인증에 IEEE 802.1x 키 관리가 필요합니다"
 
 #: ../src/devices/wifi/nm-wifi-ap-utils.c:119
 msgid "LEAP authentication is incompatible with Ad-Hoc mode"
-msgstr ""
+msgstr "LEAP 인증이 애드혹 모드와 호환되지 않습니다"
 
 #: ../src/devices/wifi/nm-wifi-ap-utils.c:131
 msgid "LEAP authentication is incompatible with 802.1x setting"
-msgstr ""
+msgstr "LEAP 인증이 802.1x 설정과 호환되지 않습니다"
 
 #: ../src/devices/wifi/nm-wifi-ap-utils.c:153
 #, c-format
 msgid "a connection using '%s' authentication cannot use WPA key management"
-msgstr ""
+msgstr "'%s' 인증을 사용하는 연결에는 WPA 키 관리를 사용할 수 없습니다"
 
 #: ../src/devices/wifi/nm-wifi-ap-utils.c:164
 #, c-format
 msgid "a connection using '%s' authentication cannot specify WPA protocols"
-msgstr ""
+msgstr "'%s' 인증을 사용하는 연결에는 WPA 프로토콜을 지정할 수 없습니다"
 
 #: ../src/devices/wifi/nm-wifi-ap-utils.c:180
 #: ../src/devices/wifi/nm-wifi-ap-utils.c:197
 #, c-format
 msgid "a connection using '%s' authentication cannot specify WPA ciphers"
-msgstr ""
+msgstr "'%s' 인증을 사용하는 연결에는 WPA 암호화를 지정할 수 없습니다"
 
 #: ../src/devices/wifi/nm-wifi-ap-utils.c:209
 #, c-format
 msgid "a connection using '%s' authentication cannot specify a WPA password"
-msgstr ""
+msgstr "'%s' 인증을 사용하는 연결에는 WPA 암호를 지정할 수 없습니다"
 
 #: ../src/devices/wifi/nm-wifi-ap-utils.c:240
-#, fuzzy
 msgid "Dynamic WEP requires an 802.1x setting"
-msgstr "동적 WEP (802.1x)"
+msgstr "동적 WEP에는 802.1x 설정이 필요합니다."
 
 #: ../src/devices/wifi/nm-wifi-ap-utils.c:250
 #: ../src/devices/wifi/nm-wifi-ap-utils.c:278
 msgid "Dynamic WEP requires 'open' authentication"
-msgstr ""
+msgstr "동적 WEP에는 '공개' 인증이 필요합니다"
 
 #: ../src/devices/wifi/nm-wifi-ap-utils.c:265
 msgid "Dynamic WEP requires 'ieee8021x' key management"
-msgstr ""
+msgstr "동적 WEP에는 'ieee8021x' 키 관리가 필요합니다"
 
 #: ../src/devices/wifi/nm-wifi-ap-utils.c:312
 msgid "WPA-PSK authentication is incompatible with 802.1x"
-msgstr ""
+msgstr "WPA-PSK 인증이 802.1x와 호환되지 않습니다"
 
 #: ../src/devices/wifi/nm-wifi-ap-utils.c:322
-#, fuzzy
 msgid "WPA-PSK requires 'open' authentication"
-msgstr "유선 802.1X 인증"
+msgstr "WPA-PSK에는 'open' 인증이 필요합니다."
 
 #: ../src/devices/wifi/nm-wifi-ap-utils.c:334
 msgid "WPA Ad-Hoc authentication requires an Ad-Hoc mode AP"
-msgstr ""
+msgstr "WPA 애드혹 인증에는 애드혹 모드 AP가 필요합니다"
 
 #: ../src/devices/wifi/nm-wifi-ap-utils.c:347
 msgid "WPA Ad-Hoc authentication requires 'wpa' protocol"
-msgstr ""
+msgstr "WPA 애드혹 인증에는 'wpa' 프로토콜이 필요합니다"
 
 #: ../src/devices/wifi/nm-wifi-ap-utils.c:359
-#, fuzzy
 msgid "WPA Ad-Hoc authentication requires 'none' pairwise cipher"
-msgstr "무선 네트워크에서 인증이 필요합니다"
+msgstr "WPA 애드혹 인증에는 'none' pairwise 암호가 필요합니다."
 
 #: ../src/devices/wifi/nm-wifi-ap-utils.c:371
 msgid "WPA Ad-Hoc requires 'tkip' group cipher"
-msgstr ""
+msgstr "WPA 애드혹에는 'tkip' 그룹 암호화가 필요합니다"
 
 #: ../src/devices/wifi/nm-wifi-ap-utils.c:385
 msgid "Access point does not support PSK but setting requires it"
-msgstr ""
+msgstr "액세스 지점에서 PSK를 지원하지 않지만 설정에는 필요합니다"
 
 #: ../src/devices/wifi/nm-wifi-ap-utils.c:415
 msgid "WPA-EAP authentication requires an 802.1x setting"
-msgstr ""
+msgstr "WPA-EAP 인증에는 802.1x 설정이 필요합니다"
 
 #: ../src/devices/wifi/nm-wifi-ap-utils.c:425
-#, fuzzy
 msgid "WPA-EAP requires 'open' authentication"
-msgstr "유선 802.1X 인증"
+msgstr "WPA-EAP에는 'open' 인증이 필요합니다."
 
 #: ../src/devices/wifi/nm-wifi-ap-utils.c:436
 msgid "802.1x setting requires 'wpa-eap' key management"
-msgstr ""
+msgstr "802.1x 설정에는 'wpa-eap' 키 관리가 필요합니다"
 
 #: ../src/devices/wifi/nm-wifi-ap-utils.c:449
 msgid "Access point does not support 802.1x but setting requires it"
-msgstr ""
+msgstr "액세스 지점에서 802.1x를 지원하지 않지만 설정에는 필요합니다"
 
 #: ../src/devices/wifi/nm-wifi-ap-utils.c:477
 msgid ""
 "Access point mode is Ad-Hoc but setting requires Infrastructure security"
-msgstr ""
+msgstr "액세스 지점 모드는 애드혹이지만 설정에는 인프라 보안이 필요합니다"
 
 #: ../src/devices/wifi/nm-wifi-ap-utils.c:487
 msgid "Ad-Hoc mode is incompatible with 802.1x security"
-msgstr ""
+msgstr "애드혹 모드는 802.1x 보안과 호환되지 않습니다"
 
 #: ../src/devices/wifi/nm-wifi-ap-utils.c:496
 msgid "Ad-Hoc mode is incompatible with LEAP security"
-msgstr ""
+msgstr "애드혹 모드는 LEAP 보안과 호환되지 않습니다"
 
 #: ../src/devices/wifi/nm-wifi-ap-utils.c:506
 msgid "Ad-Hoc mode requires 'open' authentication"
-msgstr ""
+msgstr "애드혹 모드에는 '공개' 인증이 필요합니다"
 
 #: ../src/devices/wifi/nm-wifi-ap-utils.c:516
 msgid ""
 "Access point mode is Infrastructure but setting requires Ad-Hoc security"
-msgstr ""
+msgstr "액세스 지점 모드는 인프라이지만 설정에는 애드혹 보안이 필요합니다"
 
 #: ../src/devices/wifi/nm-wifi-ap-utils.c:558
 #: ../src/devices/wifi/nm-wifi-ap-utils.c:588
 #, c-format
 msgid "connection does not match access point"
-msgstr ""
+msgstr "연결이 액세스 지점과 일치하지 않습니다"
 
 #: ../src/devices/wifi/nm-wifi-ap-utils.c:612
 msgid "Access point is unencrypted but setting specifies security"
-msgstr ""
+msgstr "액세스 지점이 암호화 해제되었지만 설정에서 보안을 지정합니다"
 
 #: ../src/devices/wifi/nm-wifi-ap-utils.c:701
 msgid ""
 "WPA authentication is incompatible with non-EAP (original) LEAP or Dynamic "
 "WEP"
-msgstr ""
+msgstr "WPA 인증은 비 EAP(원본) LEAP 또는 동적 WEP와 호환되지 않습니다"
 
 #: ../src/devices/wifi/nm-wifi-ap-utils.c:711
 msgid "WPA authentication is incompatible with Shared Key authentication"
-msgstr ""
+msgstr "WPA 인증은 공유 키 인증과 호환되지 않습니다"
 
 #: ../src/devices/wifi/nm-wifi-ap-utils.c:758
-#, fuzzy
 msgid "Failed to determine AP security information"
-msgstr "해독을 위한 대칭키를 설정하는 데 실패했습니다."
+msgstr "AP 보안 정보를 판별할 수 없습니다."
 
-#: ../src/devices/wwan/nm-modem-broadband.c:673
-#, fuzzy
+#: ../src/devices/wwan/nm-modem-broadband.c:641
 msgid "GSM mobile broadband connection requires a 'gsm' setting"
-msgstr "모바일 광대역 연결 %d"
+msgstr "GSM 모바일 광대역 연결에는 'gsm' 설정이 필요합니다."
 
-#: ../src/nm-config.c:500
+#: ../src/nm-config.c:465
 msgid "Config file location"
 msgstr "설정 파일 위치 "
 
-#: ../src/nm-config.c:501
+#: ../src/nm-config.c:466
 msgid "Config directory location"
 msgstr "설정 디렉토리 위치 "
 
-#: ../src/nm-config.c:502
-#, fuzzy
+#: ../src/nm-config.c:467
 msgid "System config directory location"
-msgstr "설정 디렉토리 위치 "
+msgstr "시스템 구성 디렉터리 위치"
 
-#: ../src/nm-config.c:503
-#, fuzzy
+#: ../src/nm-config.c:468
 msgid "Internal config file location"
-msgstr "설정 파일 위치 "
-
-#: ../src/nm-config.c:504
-msgid "State file location"
-msgstr "상태 파일 위치 "
+msgstr "내부 구성 파일 위치"
 
-#: ../src/nm-config.c:505
+#: ../src/nm-config.c:469
 msgid "State file for no-auto-default devices"
-msgstr ""
+msgstr "no-auto-default 장치의 상태 파일"
 
-#: ../src/nm-config.c:506
+#: ../src/nm-config.c:470
 msgid "List of plugins separated by ','"
 msgstr "','로 구분된 플러그인 목록 "
 
-#: ../src/nm-config.c:507
-#, fuzzy
+#: ../src/nm-config.c:471
 msgid "Quit after initial configuration"
-msgstr "현재 nmcli 설정:\n"
+msgstr "초기 구성 후 종료"
 
-#: ../src/nm-config.c:508 ../src/nm-iface-helper.c:300
+#: ../src/nm-config.c:472 ../src/nm-iface-helper.c:300
 msgid "Don't become a daemon, and log to stderr"
 msgstr "데몬이 되지 않고 stderr에 기록합니다 "
 
 #. These three are hidden for now, and should eventually just go away.
-#: ../src/nm-config.c:511
+#: ../src/nm-config.c:475
 msgid "An http(s) address for checking internet connectivity"
 msgstr "인터넷 연결을 확인하기 위한 http(s) 주소 "
 
-#: ../src/nm-config.c:512
+#: ../src/nm-config.c:476
 msgid "The interval between connectivity checks (in seconds)"
 msgstr "연결 확인 사이의 간격 (초 단위)"
 
-#: ../src/nm-config.c:513
+#: ../src/nm-config.c:477
 msgid "The expected start of the response"
 msgstr "예상되는 응답 시작 "
 
 #. Interface/IP config
 #: ../src/nm-iface-helper.c:281
-#, fuzzy
 msgid "The interface to manage"
-msgstr "부모 인터페이스 [none]: "
+msgstr "관리 인터페이스"
 
 #: ../src/nm-iface-helper.c:281
 msgid "eth0"
-msgstr ""
+msgstr "eth0"
 
 #: ../src/nm-iface-helper.c:282
-#, fuzzy
 msgid "Connection UUID"
-msgstr "연결  "
+msgstr "연결 UUID"
 
 #: ../src/nm-iface-helper.c:282
 msgid "661e8cd0-b618-46b8-9dc9-31a52baaa16b"
-msgstr ""
+msgstr "661e8cd0-b618-46b8-9dc9-31a52baaa16b"
 
 #: ../src/nm-iface-helper.c:283
 msgid "Whether to manage IPv6 SLAAC"
-msgstr ""
+msgstr "IPv6 SLAAC 관리 여부"
 
 #: ../src/nm-iface-helper.c:284
 msgid "Whether SLAAC must be successful"
-msgstr ""
+msgstr "SLAAC 성공 필요 여부"
 
 #: ../src/nm-iface-helper.c:285
 msgid "Use an IPv6 temporary privacy address"
-msgstr ""
+msgstr "IPv6 임시 비공개 주소 사용"
 
 #: ../src/nm-iface-helper.c:286
-#, fuzzy
 msgid "Current DHCPv4 address"
-msgstr "복제된 MAC 주소"
+msgstr "현재 DHCPv4 주소"
 
 #: ../src/nm-iface-helper.c:287
 msgid "Whether DHCPv4 must be successful"
-msgstr ""
+msgstr "DHCPv4 성공 필요 여부"
 
 #: ../src/nm-iface-helper.c:288
-#, fuzzy
 msgid "Hex-encoded DHCPv4 client ID"
-msgstr "지원하지 않는 DHCP 클라이언트 '%s'"
+msgstr "16진수 인코딩 DHCPv4 클라이언트 ID"
 
 #: ../src/nm-iface-helper.c:289
 msgid "Hostname to send to DHCP server"
-msgstr ""
+msgstr "DHCP 서버로 전송할 호스트 이름"
 
 #: ../src/nm-iface-helper.c:289
 msgid "barbar"
-msgstr ""
+msgstr "barbar"
 
 #: ../src/nm-iface-helper.c:290
 msgid "FQDN to send to DHCP server"
-msgstr ""
+msgstr "DHCP 서버로 전송할 FQDN"
 
 #: ../src/nm-iface-helper.c:290
 msgid "host.domain.org"
-msgstr ""
+msgstr "host.domain.org"
 
 #: ../src/nm-iface-helper.c:291
-#, fuzzy
 msgid "Route priority for IPv4"
-msgstr "삭제할 우선 순위가 없습니다 "
+msgstr "IPv4의 라우팅 우선 순위"
 
 #: ../src/nm-iface-helper.c:291
 msgid "0"
-msgstr ""
+msgstr "0"
 
 #: ../src/nm-iface-helper.c:292
-#, fuzzy
 msgid "Route priority for IPv6"
-msgstr "삭제할 우선 순위가 없습니다 "
+msgstr "IPv6의 라우팅 우선 순위"
 
+# translation auto-copied from project RHEL LVM Administration, version 6.1, document Device_Map_App
 #: ../src/nm-iface-helper.c:292
 msgid "1024"
-msgstr ""
+msgstr "1024"
 
 #: ../src/nm-iface-helper.c:293
 msgid "Hex-encoded Interface Identifier"
-msgstr ""
+msgstr "16 진수로 인코딩된 인터페이스 식별자"
 
 #: ../src/nm-iface-helper.c:294
 msgid "IPv6 SLAAC address generation mode"
-msgstr ""
+msgstr "IPv6 SLAAC 주소 생성 모드"
 
 #: ../src/nm-iface-helper.c:295
 msgid ""
 "The logging backend configuration value. See logging.backend in "
 "NetworkManager.conf"
-msgstr ""
+msgstr "로깅 백엔드 구성 값입니다. NetworkManager.conf에서 logging.backend를 확인하십시오"
 
 #: ../src/nm-iface-helper.c:315
 msgid ""
 "nm-iface-helper is a small, standalone process that manages a single network "
 "interface."
-msgstr ""
+msgstr "nm-iface-helper는 단일 네트워크 인터페이스를 관리하는 소규모 독립 프로세스입니다."
 
 #: ../src/nm-iface-helper.c:374
 #, c-format
 msgid "An interface name and UUID are required\n"
-msgstr ""
+msgstr "인터페이스 및 UUID가 필요합니다\n"
 
 #: ../src/nm-iface-helper.c:380
 #, c-format
 msgid "Failed to find interface index for %s (%s)\n"
-msgstr ""
+msgstr "%s(%s)의 인터페이스 인덱스를 찾는 데 실패했습니다\n"
 
 #: ../src/nm-iface-helper.c:442
 #, c-format
 msgid "(%s): Invalid IID %s\n"
-msgstr ""
+msgstr "(%s): 잘못된 IID %s\n"
 
-#: ../src/nm-logging.c:223
+#: ../src/nm-logging.c:216
 #, c-format
 msgid "Unknown log level '%s'"
 msgstr "알려지지 않은 로그 수준 '%s'"
 
-#: ../src/nm-logging.c:318
+#: ../src/nm-logging.c:309
 #, c-format
 msgid "Unknown log domain '%s'"
 msgstr "알려지지 않은 로그 영역 '%s'"
 
-#: ../src/settings/plugins/ifcfg-rh/reader.c:106
+#: ../src/nm-manager.c:3635
+msgid "VPN connection"
+msgstr "VPN 연결"
+
+#: ../src/nm-sleep-monitor-systemd.c:131
+msgid "NetworkManager needs to turn off networks"
+msgstr "NetworkManager는 네트워크를 꺼야 합니다 "
+
+#: ../src/settings/plugins/ifcfg-rh/reader.c:108
 msgid "System"
 msgstr "시스템"
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 8bb54a58c5..c264ab0ad4 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -9,21 +9,20 @@
 # Enrico Nicoletto <liverig@gmail.com>, 2013.
 # gcintra <gcintra@redhat.com>, 2013, 2014.
 # Rafael Fontenelle <rafaelff@gnome.org>, 2013, 2015, 2016.
-# Lubomir Rintel <lkundrak@v3.sk>, 2016. #zanata
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-06-22 10:02+0200\n"
-"PO-Revision-Date: 2016-05-04 07:11-0400\n"
-"Last-Translator: Rafael Fontenelle <rafaelff@gnome.org>\n"
-"Language-Team: Brazilian Portuguese <gnome-pt_br-list@gnome.org>\n"
-"Language: pt-BR\n"
+"POT-Creation-Date: 2016-04-29 14:24+0530\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"PO-Revision-Date: 2016-07-05 08:43+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"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
-"X-Generator: Zanata 3.8.4\n"
+"X-Generator: Zanata 3.9.3\n"
 "X-Project-Style: gnome\n"
 
 #: ../clients/cli/agent.c:39
@@ -34,7 +33,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"
@@ -111,21 +110,21 @@ msgstr "Erro: inicialização do agente de polkit falhou: %s"
 msgid "nmcli successfully registered as a polkit agent.\n"
 msgstr "nmcli registrado com sucesso como um agente de polkit.\n"
 
-#: ../clients/cli/agent.c:206 ../clients/cli/connections.c:8703
-#: ../clients/cli/devices.c:3727 ../clients/cli/general.c:344
-#: ../clients/cli/general.c:473
+#: ../clients/cli/agent.c:206 ../clients/cli/connections.c:11050
+#: ../clients/cli/devices.c:3669 ../clients/cli/general.c:343
+#: ../clients/cli/general.c:484
 #, c-format
 msgid "Error: NetworkManager is not running."
 msgstr "Erro: O NetworkManager não está em execução."
 
-#: ../clients/cli/agent.c:239
+#: ../clients/cli/agent.c:242
 #, c-format
 msgid "Error: 'agent' command '%s' is not valid."
 msgstr "Erro: comando de \"%s\" de \"agente\" não é válido."
 
 #: ../clients/cli/common.c:38 ../clients/cli/common.c:51
 #: ../clients/cli/common.c:59 ../clients/cli/common.c:71
-#: ../clients/cli/connections.c:237 ../clients/cli/connections.c:259
+#: ../clients/cli/connections.c:192 ../clients/cli/connections.c:214
 msgid "GROUP"
 msgstr "GRUPO"
 
@@ -137,7 +136,7 @@ msgstr "ENDEREÇO"
 #. 1
 #. 2
 #: ../clients/cli/common.c:40 ../clients/cli/common.c:61
-#: ../clients/cli/connections.c:262
+#: ../clients/cli/connections.c:217
 msgid "GATEWAY"
 msgstr "MÁQUINA"
 
@@ -208,7 +207,7 @@ msgstr "não gerenciável"
 msgid "unavailable"
 msgstr "não disponível"
 
-#: ../clients/cli/common.c:498 ../clients/cli/general.c:246
+#: ../clients/cli/common.c:498 ../clients/cli/general.c:245
 msgid "disconnected"
 msgstr "desconectado"
 
@@ -236,11 +235,11 @@ msgstr "conectando (verificando conectividade de IP)"
 msgid "connecting (starting secondary connections)"
 msgstr "conectando (iniciando conexões secundárias)"
 
-#: ../clients/cli/common.c:512 ../clients/cli/general.c:242
+#: ../clients/cli/common.c:512 ../clients/cli/general.c:241
 msgid "connected"
 msgstr "conectado"
 
-#: ../clients/cli/common.c:514 ../clients/cli/connections.c:690
+#: ../clients/cli/common.c:514 ../clients/cli/connections.c:648
 msgid "deactivating"
 msgstr "desativando"
 
@@ -249,53 +248,52 @@ msgid "connection failed"
 msgstr "falha na conexão"
 
 #: ../clients/cli/common.c:518 ../clients/cli/common.c:535
-#: ../clients/cli/connections.c:695 ../clients/cli/connections.c:718
-#: ../clients/cli/connections.c:1995 ../clients/cli/devices.c:1104
-#: ../clients/cli/devices.c:1145 ../clients/cli/devices.c:1147
-#: ../clients/cli/general.c:249 ../clients/cli/general.c:287
-#: ../clients/cli/general.c:422 ../clients/cli/general.c:437
-#: ../clients/cli/settings.c:845 ../clients/cli/settings.c:931
-#: ../clients/cli/settings.c:1315 ../clients/cli/settings.c:1954
-#: ../clients/cli/settings.c:3317
+#: ../clients/cli/connections.c:653 ../clients/cli/connections.c:676
+#: ../clients/cli/connections.c:1949 ../clients/cli/devices.c:1024
+#: ../clients/cli/devices.c:1065 ../clients/cli/devices.c:1067
+#: ../clients/cli/general.c:248 ../clients/cli/general.c:286
+#: ../clients/cli/general.c:432 ../clients/cli/general.c:448
+#: ../clients/cli/settings.c:839 ../clients/cli/settings.c:925
+#: ../clients/cli/settings.c:1265 ../clients/cli/settings.c:1901
+#: ../clients/cli/settings.c:3205 ../clients/cli/utils.c:1400
 #, c-format
 msgid "unknown"
 msgstr "desconhecido"
 
 #. "CAPABILITIES"
-#: ../clients/cli/common.c:527 ../clients/cli/connections.c:975
-#: ../clients/cli/connections.c:977 ../clients/cli/connections.c:979
-#: ../clients/cli/connections.c:1013 ../clients/cli/connections.c:1082
-#: ../clients/cli/connections.c:1083 ../clients/cli/connections.c:1085
-#: ../clients/cli/connections.c:3291 ../clients/cli/connections.c:4414
-#: ../clients/cli/connections.c:6229 ../clients/cli/connections.c:6230
-#: ../clients/cli/devices.c:782 ../clients/cli/devices.c:1069
-#: ../clients/cli/devices.c:1070 ../clients/cli/devices.c:1071
-#: ../clients/cli/devices.c:1072 ../clients/cli/devices.c:1073
-#: ../clients/cli/devices.c:1108 ../clients/cli/devices.c:1110
-#: ../clients/cli/devices.c:1138 ../clients/cli/devices.c:1139
-#: ../clients/cli/devices.c:1140 ../clients/cli/devices.c:1141
-#: ../clients/cli/devices.c:1142 ../clients/cli/devices.c:1143
-#: ../clients/cli/devices.c:1144 ../clients/cli/devices.c:1146
-#: ../clients/cli/devices.c:1148 ../clients/cli/general.c:431
-#: ../clients/cli/settings.c:3312
+#: ../clients/cli/common.c:527 ../clients/cli/connections.c:933
+#: ../clients/cli/connections.c:935 ../clients/cli/connections.c:937
+#: ../clients/cli/connections.c:971 ../clients/cli/connections.c:1040
+#: ../clients/cli/connections.c:1041 ../clients/cli/connections.c:1043
+#: ../clients/cli/connections.c:3450 ../clients/cli/connections.c:8563
+#: ../clients/cli/connections.c:8564 ../clients/cli/devices.c:772
+#: ../clients/cli/devices.c:989 ../clients/cli/devices.c:990
+#: ../clients/cli/devices.c:991 ../clients/cli/devices.c:992
+#: ../clients/cli/devices.c:993 ../clients/cli/devices.c:1028
+#: ../clients/cli/devices.c:1030 ../clients/cli/devices.c:1058
+#: ../clients/cli/devices.c:1059 ../clients/cli/devices.c:1060
+#: ../clients/cli/devices.c:1061 ../clients/cli/devices.c:1062
+#: ../clients/cli/devices.c:1063 ../clients/cli/devices.c:1064
+#: ../clients/cli/devices.c:1066 ../clients/cli/devices.c:1068
+#: ../clients/cli/general.c:442 ../clients/cli/settings.c:3200
 msgid "yes"
 msgstr "sim"
 
-#: ../clients/cli/common.c:529 ../clients/cli/connections.c:975
-#: ../clients/cli/connections.c:977 ../clients/cli/connections.c:979
-#: ../clients/cli/connections.c:1082 ../clients/cli/connections.c:1083
-#: ../clients/cli/connections.c:1085 ../clients/cli/connections.c:3292
-#: ../clients/cli/connections.c:4413 ../clients/cli/connections.c:6229
-#: ../clients/cli/connections.c:6230 ../clients/cli/devices.c:782
-#: ../clients/cli/devices.c:1069 ../clients/cli/devices.c:1070
-#: ../clients/cli/devices.c:1071 ../clients/cli/devices.c:1072
-#: ../clients/cli/devices.c:1073 ../clients/cli/devices.c:1108
-#: ../clients/cli/devices.c:1110 ../clients/cli/devices.c:1138
-#: ../clients/cli/devices.c:1139 ../clients/cli/devices.c:1140
-#: ../clients/cli/devices.c:1141 ../clients/cli/devices.c:1142
-#: ../clients/cli/devices.c:1143 ../clients/cli/devices.c:1144
-#: ../clients/cli/devices.c:1146 ../clients/cli/devices.c:1148
-#: ../clients/cli/general.c:433 ../clients/cli/settings.c:3314
+#: ../clients/cli/common.c:529 ../clients/cli/connections.c:933
+#: ../clients/cli/connections.c:935 ../clients/cli/connections.c:937
+#: ../clients/cli/connections.c:1040 ../clients/cli/connections.c:1041
+#: ../clients/cli/connections.c:1043 ../clients/cli/connections.c:3451
+#: ../clients/cli/connections.c:8563 ../clients/cli/connections.c:8564
+#: ../clients/cli/devices.c:772 ../clients/cli/devices.c:989
+#: ../clients/cli/devices.c:990 ../clients/cli/devices.c:991
+#: ../clients/cli/devices.c:992 ../clients/cli/devices.c:993
+#: ../clients/cli/devices.c:1028 ../clients/cli/devices.c:1030
+#: ../clients/cli/devices.c:1058 ../clients/cli/devices.c:1059
+#: ../clients/cli/devices.c:1060 ../clients/cli/devices.c:1061
+#: ../clients/cli/devices.c:1062 ../clients/cli/devices.c:1063
+#: ../clients/cli/devices.c:1064 ../clients/cli/devices.c:1066
+#: ../clients/cli/devices.c:1068 ../clients/cli/general.c:444
+#: ../clients/cli/settings.c:3202
 msgid "no"
 msgstr "não"
 
@@ -312,7 +310,7 @@ msgid "No reason given"
 msgstr "Nenhuma razão fornecida"
 
 #. We should not really come here
-#: ../clients/cli/common.c:547 ../clients/cli/connections.c:3140
+#: ../clients/cli/common.c:547 ../clients/cli/connections.c:2976
 #, c-format
 msgid "Unknown error"
 msgstr "Erro desconhecido"
@@ -565,8 +563,8 @@ msgid "The device parent's management changed"
 msgstr "O gerenciamento do pai do dispositivo foi alterado"
 
 #. TRANSLATORS: Unknown reason for a device state change (NMDeviceStateReason)
-#: ../clients/cli/common.c:734 ../libnm-glib/nm-device.c:1898
-#: ../libnm/nm-device.c:1849
+#: ../clients/cli/common.c:734 ../libnm-glib/nm-device.c:1888
+#: ../libnm/nm-device.c:1839
 msgid "Unknown"
 msgstr "Desconhecido"
 
@@ -610,116 +608,69 @@ msgstr ""
 "solicitar sem a opção '--ask\".\n"
 
 #. define some prompts for connection editor
-#: ../clients/cli/connections.c:61
+#: ../clients/cli/connections.c:41
 msgid "Setting name? "
 msgstr "Nome configuração? "
 
-#: ../clients/cli/connections.c:62
+#: ../clients/cli/connections.c:42
 msgid "Property name? "
 msgstr "Nome propriedade? "
 
-#: ../clients/cli/connections.c:63
+#: ../clients/cli/connections.c:43
 msgid "Enter connection type: "
 msgstr "Digite o tipo de conexão: "
 
 #. define some other prompts
-#: ../clients/cli/connections.c:66
-#, fuzzy
-msgid "Connection type"
+#: ../clients/cli/connections.c:46
+msgid "Connection type: "
 msgstr "Tipo de conexão: "
 
-#: ../clients/cli/connections.c:67
-#, fuzzy
-msgid "VPN type"
+#: ../clients/cli/connections.c:47
+msgid "VPN type: "
 msgstr "Tipo de VPN: "
 
-#: ../clients/cli/connections.c:68
-#, fuzzy
-msgid "Master"
+#: ../clients/cli/connections.c:48
+msgid "Master: "
 msgstr "Mestre: "
 
-#: ../clients/cli/connections.c:70 ../clients/tui/nmt-page-infiniband.c:88
-msgid "Transport mode"
-msgstr "Modo de Transporte"
-
-#: ../clients/cli/connections.c:75
-#, fuzzy
-msgid "Bluetooth type"
-msgstr "Bluetooth tipo %s"
-
-#: ../clients/cli/connections.c:81
-#, fuzzy
-msgid "Bonding mode"
-msgstr "Modo de monitoramento %s da vinculação"
-
-#: ../clients/cli/connections.c:83 ../clients/cli/connections.c:4014
-#, fuzzy
-msgid "Bonding monitoring mode"
-msgstr "Modo de monitoramento %s da vinculação"
-
-#: ../clients/cli/connections.c:88
-#, fuzzy
-msgid "Protocol"
-msgstr "Protocolo %s"
-
-#: ../clients/cli/connections.c:91
-msgid "Wi-Fi mode"
-msgstr "Modo Wi-Fi"
-
-#: ../clients/cli/connections.c:97
-msgid "ADSL encapsulation"
-msgstr "Encapsulamento ADSL"
-
-#: ../clients/cli/connections.c:100
-#, fuzzy
-msgid "Tun mode"
-msgstr "Modo túnel: "
-
-#: ../clients/cli/connections.c:105
-#, fuzzy
-msgid "IP Tunnel mode"
-msgstr "Modo túnel: "
-
-#: ../clients/cli/connections.c:107
-#, fuzzy
-msgid "MACVLAN mode"
-msgstr "Modo MACVLAN: "
-
-#: ../clients/cli/connections.c:109
-#, fuzzy
-msgid "Connection (name, UUID, or path)"
+#: ../clients/cli/connections.c:49
+msgid "Connection (name, UUID, or path): "
 msgstr "Conexão (nome, UUID ou caminho): "
 
-#: ../clients/cli/connections.c:110
-#, fuzzy
-msgid "VPN connection (name, UUID, or path)"
+#: ../clients/cli/connections.c:50
+msgid "VPN connection (name, UUID, or path): "
 msgstr "Conexão VPN (nome, UUID ou caminho): "
 
-#: ../clients/cli/connections.c:111
-#, fuzzy
-msgid "Connection(s) (name, UUID, or path)"
+#: ../clients/cli/connections.c:51
+msgid "Connection(s) (name, UUID, or path): "
 msgstr "Conexão(ões) (nome, UUID ou caminho): "
 
-#: ../clients/cli/connections.c:112
-#, fuzzy
-msgid "Connection(s) (name, UUID, path or apath)"
+#: ../clients/cli/connections.c:52
+msgid "Connection(s) (name, UUID, path or apath): "
 msgstr "Conexão(ões) (nome, UUID, caminho ou \"apath\"): "
 
+#: ../clients/cli/connections.c:53
+msgid "Tunnel mode: "
+msgstr "Modo túnel: "
+
+#: ../clients/cli/connections.c:54
+msgid "MACVLAN mode: "
+msgstr "Modo MACVLAN: "
+
 #. 0
-#: ../clients/cli/connections.c:118 ../clients/cli/connections.c:238
+#: ../clients/cli/connections.c:73 ../clients/cli/connections.c:193
 #: ../clients/cli/devices.c:55 ../clients/cli/devices.c:89
 #: ../clients/cli/devices.c:99 ../clients/cli/devices.c:110
 #: ../clients/cli/devices.c:120 ../clients/cli/devices.c:137
 #: ../clients/cli/devices.c:150 ../clients/cli/devices.c:176
 #: ../clients/cli/devices.c:191 ../clients/cli/devices.c:200
-#: ../clients/cli/devices.c:210 ../clients/cli/devices.c:220
-#: ../clients/cli/devices.c:261
+#: ../clients/cli/devices.c:210 ../clients/cli/devices.c:251
 msgid "NAME"
 msgstr "NOME"
 
 #. 0
 #. 1
-#: ../clients/cli/connections.c:119 ../clients/cli/connections.c:239
+#: ../clients/cli/connections.c:74 ../clients/cli/connections.c:194
 msgid "UUID"
 msgstr "UUID"
 
@@ -727,35 +678,35 @@ msgstr "UUID"
 #. 0
 #. 1
 #. 2
-#: ../clients/cli/connections.c:120 ../clients/cli/connections.c:260
+#: ../clients/cli/connections.c:75 ../clients/cli/connections.c:215
 #: ../clients/cli/devices.c:41 ../clients/cli/devices.c:57
 #: ../clients/cli/devices.c:179
 msgid "TYPE"
 msgstr "TIPO"
 
 #. 2
-#: ../clients/cli/connections.c:121
+#: ../clients/cli/connections.c:76
 msgid "TIMESTAMP"
 msgstr "HORÁRIO"
 
 #. 3
-#: ../clients/cli/connections.c:122
+#: ../clients/cli/connections.c:77
 msgid "TIMESTAMP-REAL"
 msgstr "HORÁRIO-REAL"
 
 #. 4
 #. 16
-#: ../clients/cli/connections.c:123 ../clients/cli/devices.c:72
+#: ../clients/cli/connections.c:78 ../clients/cli/devices.c:72
 msgid "AUTOCONNECT"
 msgstr "AUTOCONECTAR"
 
 #. 5
-#: ../clients/cli/connections.c:124
+#: ../clients/cli/connections.c:79
 msgid "AUTOCONNECT-PRIORITY"
 msgstr "PRIORIDADE-AUTOCONECTAR"
 
 #. 6
-#: ../clients/cli/connections.c:125
+#: ../clients/cli/connections.c:80
 msgid "READONLY"
 msgstr "SOMENTE-LEITURA"
 
@@ -764,7 +715,7 @@ msgstr "SOMENTE-LEITURA"
 #. 2
 #. 15
 #. 5
-#: ../clients/cli/connections.c:126 ../clients/cli/connections.c:246
+#: ../clients/cli/connections.c:81 ../clients/cli/connections.c:201
 #: ../clients/cli/devices.c:43 ../clients/cli/devices.c:166
 #: ../clients/cli/devices.c:182
 msgid "DBUS-PATH"
@@ -773,7 +724,7 @@ msgstr "CAMINHO DBUS"
 #. 8
 #. 13
 #. 4
-#: ../clients/cli/connections.c:127 ../clients/cli/devices.c:164
+#: ../clients/cli/connections.c:82 ../clients/cli/devices.c:164
 #: ../clients/cli/devices.c:181
 msgid "ACTIVE"
 msgstr "ATIVO"
@@ -783,9 +734,9 @@ msgstr "ATIVO"
 #. 12
 #. 3
 #. 0
-#: ../clients/cli/connections.c:128 ../clients/cli/devices.c:40
+#: ../clients/cli/connections.c:83 ../clients/cli/devices.c:40
 #: ../clients/cli/devices.c:56 ../clients/cli/devices.c:163
-#: ../clients/cli/devices.c:180 ../clients/cli/devices.c:262
+#: ../clients/cli/devices.c:180 ../clients/cli/devices.c:252
 msgid "DEVICE"
 msgstr "DISPOSITIVO"
 
@@ -794,41 +745,42 @@ msgstr "DISPOSITIVO"
 #. 1
 #. 10
 #. 1
-#: ../clients/cli/connections.c:129 ../clients/cli/connections.c:241
+#: ../clients/cli/connections.c:84 ../clients/cli/connections.c:196
 #: ../clients/cli/devices.c:42 ../clients/cli/devices.c:66
-#: ../clients/cli/general.c:37
+#: ../clients/cli/general.c:36
 msgid "STATE"
 msgstr "ESTADO"
 
 #. 11
-#: ../clients/cli/connections.c:130
+#: ../clients/cli/connections.c:85
 msgid "ACTIVE-PATH"
 msgstr "CAMINHO ATIVO"
 
 #. 2
-#: ../clients/cli/connections.c:240
+#: ../clients/cli/connections.c:195
 msgid "DEVICES"
 msgstr "DISPOSITIVOS"
 
 #. 4
-#: ../clients/cli/connections.c:242
+#: ../clients/cli/connections.c:197
 msgid "DEFAULT"
 msgstr "PADRÃO"
 
 #. 5
-#: ../clients/cli/connections.c:243
+#: ../clients/cli/connections.c:198
 msgid "DEFAULT6"
 msgstr "PADRÃO6"
 
 #. 6
-#: ../clients/cli/connections.c:244
+#: ../clients/cli/connections.c:199
 msgid "SPEC-OBJECT"
 msgstr "OBJETO-ESPEC"
 
 #. 7
 #. 4
-#: ../clients/cli/connections.c:245 ../clients/cli/connections.c:283
-#: ../clients/tui/nm-editor-utils.c:233
+#. Ask for optional 'vpn' arguments.
+#: ../clients/cli/connections.c:200 ../clients/cli/connections.c:238
+#: ../clients/cli/connections.c:4169 ../clients/tui/nm-editor-utils.c:233
 #: ../clients/tui/nmt-connect-connection-list.c:405
 msgid "VPN"
 msgstr "VPN"
@@ -836,70 +788,70 @@ msgstr "VPN"
 #. 9
 #. 5
 #. 22
-#: ../clients/cli/connections.c:247 ../clients/cli/devices.c:46
+#: ../clients/cli/connections.c:202 ../clients/cli/devices.c:46
 #: ../clients/cli/devices.c:78
 msgid "CON-PATH"
 msgstr "CAMINHO CON"
 
 #. 10
-#: ../clients/cli/connections.c:248
+#: ../clients/cli/connections.c:203
 msgid "ZONE"
 msgstr "ZONA"
 
 #. 11
-#: ../clients/cli/connections.c:249
+#: ../clients/cli/connections.c:204
 msgid "MASTER-PATH"
 msgstr "CAMINHO MESTRE"
 
 #. 1
-#: ../clients/cli/connections.c:261
+#: ../clients/cli/connections.c:216
 msgid "USERNAME"
 msgstr "NOME DE USUÁRIO"
 
 #. 3
-#: ../clients/cli/connections.c:263
+#: ../clients/cli/connections.c:218
 msgid "BANNER"
 msgstr "BANNER"
 
 #. 4
-#: ../clients/cli/connections.c:264
+#: ../clients/cli/connections.c:219
 msgid "VPN-STATE"
 msgstr "ESTADO VPN"
 
 #. 5
-#: ../clients/cli/connections.c:265
+#: ../clients/cli/connections.c:220
 msgid "CFG"
 msgstr "CFG"
 
-#: ../clients/cli/connections.c:278 ../clients/cli/devices.c:235
+#: ../clients/cli/connections.c:233 ../clients/cli/devices.c:225
 msgid "GENERAL"
 msgstr "GERAL"
 
 #. 0
 #. 6
-#: ../clients/cli/connections.c:279 ../clients/cli/devices.c:242
+#: ../clients/cli/connections.c:234 ../clients/cli/devices.c:232
 msgid "IP4"
 msgstr "IP4"
 
 #. 1
 #. 7
-#: ../clients/cli/connections.c:280 ../clients/cli/devices.c:243
+#: ../clients/cli/connections.c:235 ../clients/cli/devices.c:233
 msgid "DHCP4"
 msgstr "DHCP4"
 
 #. 2
 #. 8
-#: ../clients/cli/connections.c:281 ../clients/cli/devices.c:244
+#: ../clients/cli/connections.c:236 ../clients/cli/devices.c:234
 msgid "IP6"
 msgstr "IP6"
 
 #. 3
 #. 9
-#: ../clients/cli/connections.c:282 ../clients/cli/devices.c:245
+#: ../clients/cli/connections.c:237 ../clients/cli/devices.c:235
 msgid "DHCP6"
 msgstr "DHCP6"
 
-#: ../clients/cli/connections.c:314
+#: ../clients/cli/connections.c:272
 #, c-format
 msgid ""
 "Usage: nmcli connection { COMMAND | help }\n"
@@ -915,8 +867,8 @@ msgid ""
 "\n"
 "  down [id | uuid | path | apath] <ID> ...\n"
 "\n"
-"  add COMMON_OPTIONS TYPE_SPECIFIC_OPTIONS SLAVE_OPTIONS IP_OPTIONS [-- "
-"([+|-]<setting>.<property> <value>)+]\n"
+"  add COMMON_OPTIONS TYPE_SPECIFIC_OPTIONS SLAVE_OPTIONS IP_OPTIONS [-- ([+|-"
+"]<setting>.<property> <value>)+]\n"
 "\n"
 "  modify [--temporary] [id | uuid | path] <ID> ([+|-]<setting>.<property> "
 "<value>)+\n"
@@ -976,7 +928,7 @@ msgstr ""
 "  export [id | uuid | path] <ID> [<arquivo de saída>]\n"
 "\n"
 
-#: ../clients/cli/connections.c:336
+#: ../clients/cli/connections.c:294
 #, c-format
 msgid ""
 "Usage: nmcli connection show { ARGUMENTS | help }\n"
@@ -1022,7 +974,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:357
+#: ../clients/cli/connections.c:315
 #, c-format
 msgid ""
 "Usage: nmcli connection up { ARGUMENTS | help }\n"
@@ -1051,8 +1003,7 @@ msgstr ""
 "ARGUMENTOS := [id | uuid | path] <ID> [ifname <nome-if>] [ap <BSSID>] [nsp "
 "<nome>] [passwd-file <arquivo com senhas>]\n"
 "\n"
-"Ativa uma conexão em um dispositivo. O perfil para ativar é identificado "
-"por\n"
+"Ativa uma conexão em um dispositivo. O perfil para ativar é identificado por\n"
 "seu nome, UUID ou caminho do D-Bus.\n"
 "\n"
 "ARGUMENTOS := ifname <nome-if> [ap <BSSID>] [nsp <nome>] [passwd-file "
@@ -1067,7 +1018,7 @@ msgstr ""
 "passwd-file - arquivo com senha(s) necessária(s) para ativar a conexão\n"
 "\n"
 
-#: ../clients/cli/connections.c:378
+#: ../clients/cli/connections.c:336
 #, c-format
 msgid ""
 "Usage: nmcli connection down { ARGUMENTS | help }\n"
@@ -1089,13 +1040,13 @@ msgstr ""
 "seu nome, UUID ou caminho do D-Bus.\n"
 "\n"
 
-#: ../clients/cli/connections.c:390
+#: ../clients/cli/connections.c:348
 #, 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"
+"ARGUMENTS := COMMON_OPTIONS TYPE_SPECIFIC_OPTIONS SLAVE_OPTIONS IP_OPTIONS [-"
+"- ([+|-]<setting>.<property> <value>)+]\n"
 "\n"
 "  COMMON_OPTIONS:\n"
 "                  type <type>\n"
@@ -1182,8 +1133,8 @@ msgid ""
 "                  [path-cost <1-65535>]\n"
 "                  [hairpin yes|no]\n"
 "\n"
-"    vpn:          vpn-type vpnc|openvpn|pptp|openconnect|openswan|libreswan|"
-"ssh|l2tp|iodine|...\n"
+"    vpn:          vpn-type "
+"vpnc|openvpn|pptp|openconnect|openswan|libreswan|ssh|l2tp|iodine|...\n"
 "                  [user <username>]\n"
 "\n"
 "    olpc-mesh:    ssid <SSID>\n"
@@ -1233,8 +1184,8 @@ msgid ""
 msgstr ""
 "Uso: nmcli connection add { ARGUMENTOS | help }\n"
 "\n"
-"ARGUMENTOS := OPÇÕES_COMUNS OPÇÕES_ESPECÍFICAS_TIPO OPÇÕES_IP [-- "
-"([+|-]<definição>.<propriedade> <valor>)+]\n"
+"ARGUMENTOS := OPÇÕES_COMUNS OPÇÕES_ESPECÍFICAS_TIPO OPÇÕES_IP [-- ([+|-"
+"]<definição>.<propriedade> <valor>)+]\n"
 "\n"
 "  OPÇÕES_COMUNS:\n"
 "                  type <tipo>\n"
@@ -1324,8 +1275,8 @@ msgstr ""
 "                  [path-cost <1-65535>]\n"
 "                  [hairpin yes|no]\n"
 "\n"
-"    vpn:          vpn-type vpnc|openvpn|pptp|openconnect|openswan|libreswan|"
-"ssh|l2tp|iodine|...\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"
@@ -1373,7 +1324,7 @@ msgstr ""
 "                  [ip6 <endereço IPv6>] [gw6 <gateway IPv6>]\n"
 "\n"
 
-#: ../clients/cli/connections.c:502
+#: ../clients/cli/connections.c:460
 #, c-format
 msgid ""
 "Usage: nmcli connection modify { ARGUMENTS | help }\n"
@@ -1388,8 +1339,8 @@ msgid ""
 "\n"
 "Examples:\n"
 "nmcli con mod home-wifi wifi.ssid rakosnicek\n"
-"nmcli con mod em1-1 ipv4.method manual ipv4.addr \"192.168.1.2/24, "
-"10.10.1.5/8\"\n"
+"nmcli con mod em1-1 ipv4.method manual ipv4.addr \"192.168.1.2/24, 10.10.1.5/"
+"8\"\n"
 "nmcli con mod em1-1 +ipv4.dns 8.8.4.4\n"
 "nmcli con mod em1-1 -ipv4.dns 1\n"
 "nmcli con mod em1-1 -ipv6.addr \"abbe::cafe/56\"\n"
@@ -1411,8 +1362,8 @@ msgstr ""
 "\n"
 "Exemplos:\n"
 "nmcli con mod home-wifi wifi.ssid rakosnicek\n"
-"nmcli con mod em1-1 ipv4.method manual ipv4.addr \"192.168.1.2/24, "
-"10.10.1.5/8\"\n"
+"nmcli con mod em1-1 ipv4.method manual ipv4.addr \"192.168.1.2/24, 10.10.1.5/"
+"8\"\n"
 "nmcli con mod em1-1 +ipv4.dns 8.8.4.4\n"
 "nmcli con mod em1-1 -ipv4.dns 1\n"
 "nmcli con mod em1-1 -ipv6.addr \"abbe::cafe/56\"\n"
@@ -1420,7 +1371,7 @@ msgstr ""
 "nmcli con mod bond0 -bond.options downdelay\n"
 "\n"
 
-#: ../clients/cli/connections.c:525
+#: ../clients/cli/connections.c:483
 #, c-format
 msgid ""
 "Usage: nmcli connection clone { ARGUMENTS | help }\n"
@@ -1428,8 +1379,7 @@ msgid ""
 "ARGUMENTS := [--temporary] [id | uuid | path] <ID> <new name>\n"
 "\n"
 "Clone an existing connection profile. The newly created connection will be\n"
-"the exact copy of the <ID>, except the uuid property (will be generated) "
-"and\n"
+"the exact copy of the <ID>, except the uuid property (will be generated) and\n"
 "id (provided as <new name> argument).\n"
 "\n"
 msgstr ""
@@ -1437,13 +1387,12 @@ msgstr ""
 "\n"
 "ARGUMENTOS := [--temporary] [id | uuid | path] <ID> <novo nome>\n"
 "\n"
-"Clona um perfil de conexão existente. A nova conexão criada será cópia "
-"exata\n"
+"Clona um perfil de conexão existente. A nova conexão criada será cópia exata\n"
 "do <ID>, exceto pela propriedade uuid (será gerada) e id (fornecida como\n"
 "argumento <novo nome>).\n"
 "\n"
 
-#: ../clients/cli/connections.c:537
+#: ../clients/cli/connections.c:495
 #, c-format
 msgid ""
 "Usage: nmcli connection edit { ARGUMENTS | help }\n"
@@ -1470,7 +1419,7 @@ msgstr ""
 "Adiciona um novo perfil de conexão em um editor interativo.\n"
 "\n"
 
-#: ../clients/cli/connections.c:552
+#: ../clients/cli/connections.c:510
 #, c-format
 msgid ""
 "Usage: nmcli connection delete { ARGUMENTS | help }\n"
@@ -1489,7 +1438,7 @@ msgstr ""
 "O perfil é identificado por seu nome, UUID ou caminho de D-Bus.\n"
 "\n"
 
-#: ../clients/cli/connections.c:563
+#: ../clients/cli/connections.c:521
 #, c-format
 msgid ""
 "Usage: nmcli connection monitor { ARGUMENTS | help }\n"
@@ -1510,7 +1459,7 @@ msgstr ""
 "Monitora todos os perfis de conexão no caso de nenhuma ser especificada.\n"
 "\n"
 
-#: ../clients/cli/connections.c:575
+#: ../clients/cli/connections.c:533
 #, c-format
 msgid ""
 "Usage: nmcli connection reload { help }\n"
@@ -1523,7 +1472,7 @@ msgstr ""
 "Recarrega todos os arquivos de conexão do disco.\n"
 "\n"
 
-#: ../clients/cli/connections.c:583
+#: ../clients/cli/connections.c:541
 #, c-format
 msgid ""
 "Usage: nmcli connection load { ARGUMENTS | help }\n"
@@ -1545,7 +1494,7 @@ msgstr ""
 "saiba do seu último estado.\n"
 "\n"
 
-#: ../clients/cli/connections.c:595
+#: ../clients/cli/connections.c:553
 #, c-format
 msgid ""
 "Usage: nmcli connection import { ARGUMENTS | help }\n"
@@ -1563,14 +1512,13 @@ msgstr ""
 "\n"
 "ARGUMENTOS := [--temporary] type <tipo> file <arquivo a ser importado>\n"
 "\n"
-"Importa uma configuração externa como o perfil de conexão do "
-"NetworkManager.\n"
+"Importa uma configuração externa como o perfil de conexão do NetworkManager.\n"
 "O tipo de arquivo de entrada é especificado pela opção type.\n"
 "Apenas configurações de VPN possuem suporte no momento. A configuração\n"
 "é importada pelos plug-ins VPN do NetworkManager.\n"
 "\n"
 
-#: ../clients/cli/connections.c:608
+#: ../clients/cli/connections.c:566
 #, c-format
 msgid ""
 "Usage: nmcli connection export { ARGUMENTS | help }\n"
@@ -1590,203 +1538,197 @@ msgstr ""
 "se um nome for informado.\n"
 "\n"
 
-#: ../clients/cli/connections.c:686
+#: ../clients/cli/connections.c:644
 msgid "activating"
 msgstr "ativando"
 
-#: ../clients/cli/connections.c:688
+#: ../clients/cli/connections.c:646
 msgid "activated"
 msgstr "ativado"
 
-#: ../clients/cli/connections.c:692
+#: ../clients/cli/connections.c:650
 msgid "deactivated"
 msgstr "desativado"
 
-#: ../clients/cli/connections.c:704
+#: ../clients/cli/connections.c:662
 msgid "VPN connecting (prepare)"
 msgstr "Conexão VPN (preparando)"
 
-#: ../clients/cli/connections.c:706
+#: ../clients/cli/connections.c:664
 msgid "VPN connecting (need authentication)"
 msgstr "Conexão VPN (precisa de autenticação)"
 
-#: ../clients/cli/connections.c:708
+#: ../clients/cli/connections.c:666
 msgid "VPN connecting"
 msgstr "Conexão VPN"
 
-#: ../clients/cli/connections.c:710
+#: ../clients/cli/connections.c:668
 msgid "VPN connecting (getting IP configuration)"
 msgstr "Conexão VPN (obtendo configuração de IP)"
 
-#: ../clients/cli/connections.c:712
+#: ../clients/cli/connections.c:670
 msgid "VPN connected"
 msgstr "VPN conectada"
 
-#: ../clients/cli/connections.c:714
+#: ../clients/cli/connections.c:672
 msgid "VPN connection failed"
 msgstr "Conexão VPN falhou"
 
-#: ../clients/cli/connections.c:716
+#: ../clients/cli/connections.c:674
 msgid "VPN disconnected"
 msgstr "VPN desconectada"
 
-#: ../clients/cli/connections.c:786
+#: ../clients/cli/connections.c:744
 #, c-format
 msgid "Error updating secrets for %s: %s\n"
 msgstr "Erro ao atualizar segredos para %s: %s\n"
 
-#: ../clients/cli/connections.c:806
+#: ../clients/cli/connections.c:764
 msgid "Connection profile details"
 msgstr "Detalhes do perfil de conexão"
 
-#: ../clients/cli/connections.c:818 ../clients/cli/connections.c:1211
+#: ../clients/cli/connections.c:776 ../clients/cli/connections.c:1169
 #, c-format
 msgid "Error: 'connection show': %s"
 msgstr "Erro: \"connection show\": %s"
 
-#: ../clients/cli/connections.c:974 ../clients/cli/settings.c:1950
+#: ../clients/cli/connections.c:932 ../clients/cli/settings.c:1897
 msgid "never"
 msgstr "nunca"
 
-#: ../clients/cli/connections.c:1199
+#: ../clients/cli/connections.c:1157
 msgid "Activate connection details"
 msgstr "Ativar detalhes da conexão"
 
-#: ../clients/cli/connections.c:1435
+#: ../clients/cli/connections.c:1393
 #, 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"
 
-#: ../clients/cli/connections.c:1450 ../clients/cli/connections.c:1458
+#: ../clients/cli/connections.c:1408 ../clients/cli/connections.c:1416
 #, c-format
 msgid "'%s' has to be alone"
 msgstr "\"%s\" tem que ser um só"
 
 #. Add headers
-#: ../clients/cli/connections.c:1680
+#: ../clients/cli/connections.c:1634
 msgid "NetworkManager active profiles"
 msgstr "Perfis ativos do NetworkManager"
 
-#: ../clients/cli/connections.c:1681
+#: ../clients/cli/connections.c:1635
 msgid "NetworkManager connection profiles"
 msgstr "Perfis de conexão do NetworkManager"
 
-#.
-#. * TODO(?): complete uuid, path or id
-#. if (nmc->complete) {
-#. quit ();
-#. }
-#.
-#: ../clients/cli/connections.c:1727 ../clients/cli/connections.c:2445
-#: ../clients/cli/connections.c:2467 ../clients/cli/connections.c:2476
-#: ../clients/cli/connections.c:2485 ../clients/cli/connections.c:2648
-#: ../clients/cli/connections.c:7777 ../clients/cli/connections.c:7896
-#: ../clients/cli/connections.c:8032 ../clients/cli/connections.c:8170
-#: ../clients/cli/connections.c:8289 ../clients/cli/connections.c:8300
-#: ../clients/cli/connections.c:8410 ../clients/cli/devices.c:2402
-#: ../clients/cli/devices.c:2410 ../clients/cli/devices.c:2736
-#: ../clients/cli/devices.c:2743 ../clients/cli/devices.c:2757
-#: ../clients/cli/devices.c:2764 ../clients/cli/devices.c:2781
-#: ../clients/cli/devices.c:2789 ../clients/cli/devices.c:2802
-#: ../clients/cli/devices.c:3166 ../clients/cli/devices.c:3173
-#: ../clients/cli/devices.c:3180 ../clients/cli/devices.c:3192
-#: ../clients/cli/devices.c:3205 ../clients/cli/devices.c:3212
-#: ../clients/cli/devices.c:3384 ../clients/cli/devices.c:3391
-#: ../clients/cli/devices.c:3564
+#: ../clients/cli/connections.c:1681 ../clients/cli/connections.c:2389
+#: ../clients/cli/connections.c:2411 ../clients/cli/connections.c:2420
+#: ../clients/cli/connections.c:2429 ../clients/cli/connections.c:2588
+#: ../clients/cli/connections.c:10156 ../clients/cli/connections.c:10273
+#: ../clients/cli/connections.c:10405 ../clients/cli/connections.c:10538
+#: ../clients/cli/connections.c:10648 ../clients/cli/connections.c:10659
+#: ../clients/cli/connections.c:10758 ../clients/cli/devices.c:2344
+#: ../clients/cli/devices.c:2352 ../clients/cli/devices.c:2675
+#: ../clients/cli/devices.c:2682 ../clients/cli/devices.c:2696
+#: ../clients/cli/devices.c:2703 ../clients/cli/devices.c:2720
+#: ../clients/cli/devices.c:2728 ../clients/cli/devices.c:2741
+#: ../clients/cli/devices.c:3105 ../clients/cli/devices.c:3112
+#: ../clients/cli/devices.c:3119 ../clients/cli/devices.c:3131
+#: ../clients/cli/devices.c:3144 ../clients/cli/devices.c:3151
+#: ../clients/cli/devices.c:3323 ../clients/cli/devices.c:3330
+#: ../clients/cli/devices.c:3503
 #, c-format
 msgid "Error: %s argument is missing."
 msgstr "Erro: está faltando o argumento %s."
 
-#: ../clients/cli/connections.c:1742
+#: ../clients/cli/connections.c:1696
 #, c-format
 msgid "Error: %s - no such connection profile."
 msgstr "Erro: %s - perfil de conexão inexistente."
 
-#: ../clients/cli/connections.c:1801 ../clients/cli/connections.c:2508
-#: ../clients/cli/connections.c:8825 ../clients/cli/devices.c:3353
-#: ../clients/cli/devices.c:3834 ../clients/cli/general.c:528
-#: ../clients/cli/general.c:577 ../clients/cli/general.c:594
-#: ../clients/cli/general.c:633 ../clients/cli/general.c:647
-#: ../clients/cli/general.c:765 ../clients/cli/general.c:812
-#: ../clients/cli/general.c:832
+#: ../clients/cli/connections.c:1755 ../clients/cli/connections.c:2452
+#: ../clients/cli/connections.c:11162 ../clients/cli/devices.c:3292
+#: ../clients/cli/devices.c:3779 ../clients/cli/general.c:539
+#: ../clients/cli/general.c:588 ../clients/cli/general.c:605
+#: ../clients/cli/general.c:644 ../clients/cli/general.c:658
+#: ../clients/cli/general.c:776 ../clients/cli/general.c:823
+#: ../clients/cli/general.c:843
 #, c-format
 msgid "Error: %s."
 msgstr "Erro: %s."
 
-#: ../clients/cli/connections.c:1897
+#: ../clients/cli/connections.c:1851
 #, c-format
 msgid "no active connection on device '%s'"
 msgstr "nenhuma conexão ativa no dispositivo \"%s\""
 
-#: ../clients/cli/connections.c:1905
+#: ../clients/cli/connections.c:1859
 msgid "no active connection or device"
 msgstr "nenhuma conexão ou dispositivo ativo"
 
-#: ../clients/cli/connections.c:1956
+#: ../clients/cli/connections.c:1910
 #, c-format
 msgid "device '%s' not compatible with connection '%s'"
 msgstr "dispositivo \"%s\" não é compatível com a conexão \"%s\""
 
-#: ../clients/cli/connections.c:1959
+#: ../clients/cli/connections.c:1913
 #, c-format
 msgid "no device found for connection '%s'"
 msgstr "nenhum dispositivo encontrado para a conexão \"%s\""
 
-#: ../clients/cli/connections.c:1971
+#: ../clients/cli/connections.c:1925
 msgid "unknown reason"
 msgstr "razão desconhecida"
 
-#: ../clients/cli/connections.c:1973 ../clients/cli/general.c:278
+#: ../clients/cli/connections.c:1927 ../clients/cli/general.c:277
 msgid "none"
 msgstr "nenhum(a)"
 
-#: ../clients/cli/connections.c:1975
+#: ../clients/cli/connections.c:1929
 msgid "the user was disconnected"
 msgstr "o usuário foi desconectado"
 
-#: ../clients/cli/connections.c:1977
+#: ../clients/cli/connections.c:1931
 msgid "the base network connection was interrupted"
 msgstr "a conexão base de rede foi interrompida"
 
-#: ../clients/cli/connections.c:1979
+#: ../clients/cli/connections.c:1933
 msgid "the VPN service stopped unexpectedly"
 msgstr "o serviço VPN parou inesperadamente"
 
-#: ../clients/cli/connections.c:1981
+#: ../clients/cli/connections.c:1935
 msgid "the VPN service returned invalid configuration"
 msgstr "o serviço VPN retornou uma configuração inválida"
 
-#: ../clients/cli/connections.c:1983
+#: ../clients/cli/connections.c:1937
 msgid "the connection attempt timed out"
 msgstr "a tentativa de conexão esgotou o tempo limite"
 
-#: ../clients/cli/connections.c:1985
+#: ../clients/cli/connections.c:1939
 msgid "the VPN service did not start in time"
 msgstr "o serviço VPN não iniciou a tempo"
 
-#: ../clients/cli/connections.c:1987
+#: ../clients/cli/connections.c:1941
 msgid "the VPN service failed to start"
 msgstr "o serviço VPN falhou ao iniciar"
 
-#: ../clients/cli/connections.c:1989
+#: ../clients/cli/connections.c:1943
 msgid "no valid VPN secrets"
 msgstr "sem segredos VPN válidos"
 
-#: ../clients/cli/connections.c:1991
+#: ../clients/cli/connections.c:1945
 msgid "invalid VPN secrets"
 msgstr "segredos VPN inválidos"
 
-#: ../clients/cli/connections.c:1993
+#: ../clients/cli/connections.c:1947
 msgid "the connection was removed"
 msgstr "a conexão foi removida"
 
-#: ../clients/cli/connections.c:2015 ../clients/cli/connections.c:2050
-#: ../clients/cli/connections.c:2211 ../clients/cli/connections.c:6120
+#: ../clients/cli/connections.c:1969 ../clients/cli/connections.c:1997
+#: ../clients/cli/connections.c:2158 ../clients/cli/connections.c:8454
 #, 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:2023
+#: ../clients/cli/connections.c:1976
 #, c-format
 msgid ""
 "Connection successfully activated (master waiting for slaves) (D-Bus active "
@@ -1795,677 +1737,1089 @@ msgstr ""
 "Conexão ativada com sucesso (mestre aguardando por escravos) (caminho D-Bus "
 "ativo: %s)\n"
 
-#: ../clients/cli/connections.c:2030 ../clients/cli/connections.c:6126
-#, c-format
-msgid "Error: Connection activation failed.\n"
-msgstr "Erro: Ativação da conexão falhou.\n"
-
-#: ../clients/cli/connections.c:2033 ../clients/cli/connections.c:2055
+#: ../clients/cli/connections.c:1980 ../clients/cli/connections.c:2002
 #, c-format
 msgid "Error: Connection activation failed."
 msgstr "Erro: Ativação da conexão falhou."
 
-#: ../clients/cli/connections.c:2106
+#: ../clients/cli/connections.c:2053
 #, c-format
 msgid "VPN connection successfully activated (D-Bus active path: %s)\n"
 msgstr "Conexão VPN ativada com sucesso (caminho D-Bus ativo: %s)\n"
 
-#: ../clients/cli/connections.c:2114
+#: ../clients/cli/connections.c:2061
 #, c-format
 msgid "Error: Connection activation failed: %s."
 msgstr "Erro: Ativação da conexão falhou: %s."
 
-#: ../clients/cli/connections.c:2133 ../clients/cli/devices.c:1506
+#: ../clients/cli/connections.c:2080 ../clients/cli/devices.c:1426
 #, c-format
 msgid "Error: Timeout %d sec expired."
 msgstr "Erro: Tempo limite de %d seg expirou."
 
-#: ../clients/cli/connections.c:2193
+#: ../clients/cli/connections.c:2140
 #, c-format
 msgid "Error: Connection activation failed: %s"
 msgstr "Erro: Ativação da conexão falhou: %s"
 
-#: ../clients/cli/connections.c:2278
+#: ../clients/cli/connections.c:2225
 #, c-format
 msgid "failed to read passwd-file '%s': %s"
 msgstr "falha ao ler arquivo-passwd \"%s\": %s"
 
-#: ../clients/cli/connections.c:2290
+#: ../clients/cli/connections.c:2237
 #, c-format
 msgid "missing colon in 'password' entry '%s'"
 msgstr "faltando vírgula na entrada \"password\" \"%s\""
 
-#: ../clients/cli/connections.c:2298
+#: ../clients/cli/connections.c:2245
 #, c-format
 msgid "missing dot in 'password' entry '%s'"
 msgstr "faltando ponto na entrada \"password\" \"%s\""
 
-#: ../clients/cli/connections.c:2311
+#: ../clients/cli/connections.c:2258
 #, c-format
 msgid "invalid setting name in 'password' entry '%s'"
 msgstr "nome inválido de definição na entrada \"password\" \"%s\""
 
-#: ../clients/cli/connections.c:2367
+#: ../clients/cli/connections.c:2314
 #, c-format
 msgid "unknown device '%s'."
 msgstr "dispositivo \"%s\" desconhecido."
 
-#: ../clients/cli/connections.c:2372
+#: ../clients/cli/connections.c:2319
 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:2458
+#: ../clients/cli/connections.c:2402
 #, c-format
 msgid "Error: Connection '%s' does not exist."
 msgstr "Erro: Conexão \"%s\" não existe."
 
-#: ../clients/cli/connections.c:2493 ../clients/cli/devices.c:1405
-#: ../clients/cli/devices.c:2416 ../clients/cli/devices.c:2813
-#: ../clients/cli/devices.c:3397
+#: ../clients/cli/connections.c:2437 ../clients/cli/devices.c:1325
+#: ../clients/cli/devices.c:2358 ../clients/cli/devices.c:2752
+#: ../clients/cli/devices.c:3336
 #, c-format
 msgid "Unknown parameter: %s\n"
 msgstr "Parâmetro desconhecido: %s\n"
 
-#: ../clients/cli/connections.c:2518
+#: ../clients/cli/connections.c:2462
 msgid "preparing"
 msgstr "preparando"
 
-#: ../clients/cli/connections.c:2539
+#: ../clients/cli/connections.c:2483
 #, c-format
 msgid "Connection '%s' (%s) successfully deleted.\n"
 msgstr "A conexão \"%s\" (%s) foi excluída com sucesso.\n"
 
-#: ../clients/cli/connections.c:2555
+#: ../clients/cli/connections.c:2499
 #, 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"
 
-#: ../clients/cli/connections.c:2630 ../clients/cli/connections.c:8018
-#: ../clients/cli/connections.c:8226
+#: ../clients/cli/connections.c:2570 ../clients/cli/connections.c:10391
+#: ../clients/cli/connections.c:10590
 #, c-format
 msgid "Error: No connection specified."
 msgstr "Erro: nenhuma conexão especificada."
 
-#: ../clients/cli/connections.c:2662
+#: ../clients/cli/connections.c:2602
 #, c-format
 msgid "Error: '%s' is not an active connection.\n"
 msgstr "Erro: \"%s\" não é uma conexão ativa.\n"
 
-#: ../clients/cli/connections.c:2663 ../clients/cli/connections.c:8047
+#: ../clients/cli/connections.c:2603 ../clients/cli/connections.c:10420
 #, c-format
 msgid "Error: not all active connections found."
 msgstr "Erro: nem todas as conexões ativas foram encontradas."
 
-#: ../clients/cli/connections.c:2672
+#: ../clients/cli/connections.c:2612
 #, c-format
 msgid "Error: no active connection provided."
 msgstr "Erro: não foi fornecida nenhuma conexão ativa."
 
-#: ../clients/cli/connections.c:3120 ../clients/cli/utils.c:648
+#: ../clients/cli/connections.c:2955 ../clients/cli/utils.c:702
 #, c-format
 msgid "'%s' not among [%s]"
 msgstr "\"%s\" não está entre [%s]"
 
-#: ../clients/cli/connections.c:3280
+#: ../clients/cli/connections.c:3032
 #, 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"
+msgid "Error: '%s': '%s' is not a valid %s MAC address."
+msgstr "Erro: \"%s\": \"%s\" não é um endereço MAC %s válido."
+
+#. Ask for optional arguments
+#: ../clients/cli/connections.c:3033 ../clients/cli/connections.c:3565
+#: ../clients/tui/nm-editor-utils.c:163 ../libnm-core/nm-connection.c:1716
+#: ../libnm-glib/nm-device.c:1861 ../libnm/nm-device.c:1812
+msgid "InfiniBand"
+msgstr "InfiniBand"
+
+#: ../clients/cli/connections.c:3033 ../clients/tui/nm-editor-utils.c:146
+#: ../libnm-glib/nm-device.c:1849 ../libnm/nm-device.c:1800
+msgid "Ethernet"
+msgstr "Ethernet"
 
-#: ../clients/cli/connections.c:3451
+#: ../clients/cli/connections.c:3053
 #, c-format
-msgid "Error: don't know how to create '%s' setting."
-msgstr "Erro: não sei como criar a definição \"%s\"."
+msgid "Error: 'mtu': '%s' is not a valid MTU."
+msgstr "Erro: \"mtu\": \"%s\" não é um MTU válido."
 
-#: ../clients/cli/connections.c:3462
+#: ../clients/cli/connections.c:3069
 #, c-format
-msgid "Error: invalid property '%s': %s."
-msgstr "Erro: propriedade inválida \"%s\": %s."
+msgid "Error: 'parent': '%s' is not a valid interface name."
+msgstr "Erro: \"parent\": \"%s\" não é um nome de interface válido."
 
-#: ../clients/cli/connections.c:3479
+#: ../clients/cli/connections.c:3090
 #, c-format
-msgid "Error: failed to modify %s.%s: %s."
-msgstr "Erro: falha ao modificar %s.%s: %s."
+msgid "Error: 'p-key': '%s' is not a valid InfiniBand P_KEY."
+msgstr "Erro: a \"p-key\": \"%s\" não é uma P_KEY InfiniBand válida."
 
-#: ../clients/cli/connections.c:3498
+#: ../clients/cli/connections.c:3105
 #, c-format
-msgid "Error: failed to remove a value from %s.%s: %s."
-msgstr "Erro: falha ao remover um valor de %s.%s: %s."
+msgid "Error: '%s' is not a valid UID/GID."
+msgstr "Erro: \"%s\" não é um UID/GID válido."
 
-#: ../clients/cli/connections.c:3524
-#, fuzzy, c-format
-msgid "Error: '%s' is mandatory."
-msgstr "Erro: \"%s\" não pode repetir."
+#: ../clients/cli/connections.c:3149
+#, c-format
+msgid "Error: '%s': '%s' is not a valid %s %s."
+msgstr "Erro: \"%s\": \"%s\" não é um %s válido %s."
 
-#: ../clients/cli/connections.c:3556
-#, fuzzy, c-format
-msgid "Error: invalid slave type; %s."
-msgstr "Erro: tipo de conexão inválido; %s."
+#: ../clients/cli/connections.c:3162
+msgid "Wi-Fi mode"
+msgstr "Modo Wi-Fi"
 
-#: ../clients/cli/connections.c:3569
-#, c-format
-msgid "Error: invalid connection type; %s."
-msgstr "Erro: tipo de conexão inválido; %s."
+#: ../clients/cli/connections.c:3171
+msgid "InfiniBand transport mode"
+msgstr "Modo de transporte de InfiniBand"
 
-#: ../clients/cli/connections.c:3744
-#, fuzzy, c-format
-msgid "Error: bad connection type: %s."
-msgstr "Erro: tipo de conexão inválido; %s."
+#: ../clients/cli/connections.c:3183
+msgid "ADSL protocol"
+msgstr "Protocolo ADSL"
 
-#: ../clients/cli/connections.c:3802
-#, fuzzy, c-format
-msgid "Error: '%s' is not a valid interface nor '*'."
-msgstr "Erro: \"ifname\": \"%s\" não é uma interface válida nem '*'."
+#: ../clients/cli/connections.c:3194
+msgid "ADSL encapsulation"
+msgstr "Encapsulamento ADSL"
 
-#: ../clients/cli/connections.c:3825
-#, fuzzy
-msgid "Error: master is required"
-msgstr "Erro: é necessário o \"master\"."
+#: ../clients/cli/connections.c:3203
+msgid "TUN device mode"
+msgstr "Modo de dispositivo TUN"
 
-#: ../clients/cli/connections.c:3883
-#, fuzzy, c-format
-msgid "Error: error adding bond option '%s=%s'."
-msgstr "Erro: conexão desconhecida: \"%s\"."
+#: ../clients/cli/connections.c:3216
+#, c-format
+msgid "Error: 'flags': '%s' is not valid; use <0-7>."
+msgstr "Erro: \"flags\": \"%s\" não é válido; use <0-7>."
 
-#: ../clients/cli/connections.c:3914
+#: ../clients/cli/connections.c:3238
 #, 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"
+msgid "Error: '%s': '%s' is not valid; %s "
+msgstr "Erro: \"%s\": \"%s\" não é válido; %s "
 
-#: ../clients/cli/connections.c:3945
+#: ../clients/cli/connections.c:3416
 #, c-format
-msgid "Error: 'bt-type': '%s' not valid; use [%s, %s (%s), %s]."
-msgstr "Erro: \"bt-type\": \"%s\" não é válido; use [%s, %s (%s), %s]."
+msgid "Warning: master='%s' doesn't refer to any existing profile.\n"
+msgstr "Aviso: master=\"%s\" se refere a nenhum perfil existente.\n"
 
-#: ../clients/cli/connections.c:3972
-#, fuzzy
-msgid "Interface name [*]"
-msgstr "Nome da interface [*]: "
+#: ../clients/cli/connections.c:3441
+#, c-format
+msgid "Error: '%s': '%s' is not valid; use <%u-%u>."
+msgstr "Erro: \"%s\": \"%s\" não é válido; use <%u-%u>."
 
-#: ../clients/cli/connections.c:3976
-#, fuzzy
-msgid "PPPoE username"
-msgstr "Nome de usuário do PPPoE: "
+#. Ask for optional arguments.
+#: ../clients/cli/connections.c:3497
+#, c-format
+msgid "There is %d optional argument for '%s' connection type.\n"
+msgid_plural "There are %d optional arguments for '%s' connection type.\n"
+msgstr[0] "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:3977 ../clients/cli/connections.c:3998
-#: ../clients/cli/connections.c:4000 ../clients/cli/connections.c:4049
-#, fuzzy
-msgid "Password [none]"
-msgstr "Senha [nenhuma]: "
+#: ../clients/cli/connections.c:3500
+#, 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:3978
-#, fuzzy
-msgid "Service [none]"
-msgstr "Serviço [nenhum]: "
+#. Ask for optional arguments
+#: ../clients/cli/connections.c:3517
+msgid "ethernet"
+msgstr "ethernet"
 
-#: ../clients/cli/connections.c:3979 ../clients/cli/connections.c:3982
-#: ../clients/cli/connections.c:3991
-#, fuzzy
-msgid "MTU [auto]"
+#: ../clients/cli/connections.c:3522 ../clients/cli/connections.c:3570
+#: ../clients/cli/connections.c:3704 ../clients/cli/connections.c:3783
+msgid "MTU [auto]: "
 msgstr "MTU [auto]: "
 
-#: ../clients/cli/connections.c:3980 ../clients/cli/connections.c:3983
-#: ../clients/cli/connections.c:3992 ../clients/cli/connections.c:3995
-#: ../clients/cli/connections.c:4036
-#, fuzzy
-msgid "MAC [none]"
+#: ../clients/cli/connections.c:3533 ../clients/cli/connections.c:3581
+#: ../clients/cli/connections.c:3676 ../clients/cli/connections.c:3715
+#: ../clients/cli/connections.c:4101
+msgid "MAC [none]: "
 msgstr "MAC [nenhum]: "
 
-#: ../clients/cli/connections.c:3981 ../clients/cli/connections.c:3993
-#, fuzzy
-msgid "Cloned MAC [none]"
+#: ../clients/cli/connections.c:3544
+msgid "Cloned MAC [none]: "
 msgstr "MAC clonado [nenhum]: "
 
-#: ../clients/cli/connections.c:3986
-#, fuzzy
-msgid "Parent interface [none]"
+#: ../clients/cli/connections.c:3592
+#, c-format
+msgid "Transport mode %s"
+msgstr "Modo de transporte %s"
+
+#: ../clients/cli/connections.c:3605
+msgid "Parent interface [none]: "
 msgstr "Interface principal [nenhuma]: "
 
-#: ../clients/cli/connections.c:3987
-#, fuzzy
-msgid "P_KEY [none]"
+#: ../clients/cli/connections.c:3616
+msgid "P_KEY [none]: "
 msgstr "P_KEY [nenhum]: "
 
-#. 0
-#: ../clients/cli/connections.c:3988 ../clients/cli/connections.c:4043
-#: ../clients/cli/devices.c:151 ../clients/tui/nmt-page-wifi.c:224
-msgid "SSID"
-msgstr "SSID"
+#: ../clients/cli/connections.c:3626
+#, c-format
+msgid "Error: 'p-key' is mandatory when 'parent' is specified.\n"
+msgstr "Erro: \"p-key\" é obrigatório quando \"parent\" é especificado.\n"
 
-#: ../clients/cli/connections.c:3994
-#, fuzzy
-msgid "WiMAX NSP name"
-msgstr "Nome do NSP WiMAX: "
+#. Ask for optional arguments
+#: ../clients/cli/connections.c:3643 ../clients/tui/nm-editor-utils.c:154
+#: ../libnm-glib/nm-device.c:1851 ../libnm/nm-device.c:1802
+msgid "Wi-Fi"
+msgstr "Sem fio (Wi-Fi)"
 
-#: ../clients/cli/connections.c:3996
-#, fuzzy
-msgid "APN"
-msgstr "AP"
+#: ../clients/cli/connections.c:3651 ../clients/cli/connections.c:6199
+#, c-format
+msgid "Mode %s"
+msgstr "Modo %s"
 
-#: ../clients/cli/connections.c:3997 ../clients/cli/connections.c:3999
-#: ../clients/cli/connections.c:4042
-#, fuzzy
-msgid "Username [none]"
+#. Ask for optional 'wimax' arguments.
+#: ../clients/cli/connections.c:3671 ../libnm-glib/nm-device.c:1857
+#: ../libnm/nm-device.c:1808
+msgid "WiMAX"
+msgstr "WiMAX"
+
+#. Ask for optional 'pppoe' arguments.
+#: ../clients/cli/connections.c:3694
+msgid "PPPoE"
+msgstr "PPPoE"
+
+#: ../clients/cli/connections.c:3698 ../clients/cli/connections.c:3736
+#: ../clients/cli/connections.c:4223
+msgid "Password [none]: "
+msgstr "Senha [nenhuma]: "
+
+#: ../clients/cli/connections.c:3700
+msgid "Service [none]: "
+msgstr "Serviço [nenhum]: "
+
+#. Ask for optional 'gsm' or 'cdma' arguments.
+#: ../clients/cli/connections.c:3730
+msgid "mobile broadband"
+msgstr "banda larga móvel"
+
+#: ../clients/cli/connections.c:3734 ../clients/cli/connections.c:4173
+msgid "Username [none]: "
 msgstr "Nome de usuário [nenhum]: "
 
-#: ../clients/cli/connections.c:4001
-#, fuzzy
-msgid "Bluetooth device address"
-msgstr "Endereço de dispositivo Bluetooth: "
+#. Ask for optional 'bluetooth' arguments.
+#: ../clients/cli/connections.c:3749
+msgid "bluetooth"
+msgstr "bluetooth"
 
-#: ../clients/cli/connections.c:4004
-#, fuzzy
-msgid "VLAN parent device or connection UUID"
-msgstr "Dispositivo VLAN principal ou conexão UUID: "
+#: ../clients/cli/connections.c:3756
+#, c-format
+msgid "Bluetooth type %s"
+msgstr "Bluetooth tipo %s"
 
-#: ../clients/cli/connections.c:4006
-#, fuzzy
-msgid "VLAN ID (<0-4094>)"
-msgstr "ID da VLAN <0-4094>: "
+#: ../clients/cli/connections.c:3762
+#, c-format
+msgid "Error: 'bt-type': '%s' is not a valid bluetooth type.\n"
+msgstr "Erro: o \"bt-type\": \"%s\" não é um tipo bluetooth válido.\n"
 
-#: ../clients/cli/connections.c:4007
-#, fuzzy
-msgid "VLAN flags (<0-7>) [none]"
+#. Ask for optional 'vlan' arguments.
+#. 13
+#: ../clients/cli/connections.c:3778 ../clients/cli/devices.c:239
+#: ../clients/tui/nm-editor-utils.c:217 ../clients/tui/nmt-page-vlan.c:94
+#: ../libnm-core/nm-connection.c:1714 ../libnm-glib/nm-device.c:1869
+#: ../libnm-util/nm-connection.c:1632 ../libnm/nm-device.c:1820
+msgid "VLAN"
+msgstr "VLAN"
+
+#: ../clients/cli/connections.c:3794
+msgid "VLAN flags (<0-7>) [none]: "
 msgstr "Sinalizadores VLAN (<0-7>) [nenhum]: "
 
-#: ../clients/cli/connections.c:4008
-#, fuzzy
-msgid "Ingress priority maps [none]"
+#: ../clients/cli/connections.c:3805
+msgid "Ingress priority maps [none]: "
 msgstr "Mapas de prioridade de ingresso [nenhum]: "
 
-#: ../clients/cli/connections.c:4009
-#, fuzzy
-msgid "Egress priority maps [none]"
+#: ../clients/cli/connections.c:3816
+msgid "Egress priority maps [none]: "
 msgstr "Mapas de prioridade de egresso [nenhum]: "
 
-#: ../clients/cli/connections.c:4012
-#, fuzzy
-msgid "Bonding primary interface [none]"
+#: ../clients/cli/connections.c:3827
+msgid "Bonding mode [balance-rr]: "
+msgstr "Modo de vinculação [balance-rr]: "
+
+#. Ask for optional 'bond' arguments.
+#: ../clients/cli/connections.c:3843
+msgid "bond"
+msgstr "vínculo"
+
+#: ../clients/cli/connections.c:3865
+msgid "Bonding primary interface [none]: "
 msgstr "Interface primária da vinculação [nenhuma]: "
 
-#: ../clients/cli/connections.c:4016
-#, fuzzy
-msgid "Bonding miimon [100]"
+#: ../clients/cli/connections.c:3868
+#, c-format
+msgid "Error: 'primary': '%s' is not a valid interface name.\n"
+msgstr "Erro: \"primary\": \"%s\" não é um nome de interface válido.\n"
+
+#: ../clients/cli/connections.c:3876
+#, c-format
+msgid "Bonding monitoring mode %s"
+msgstr "Modo de monitoramento %s da vinculação"
+
+#: ../clients/cli/connections.c:3882
+#, 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"
+
+#: ../clients/cli/connections.c:3891
+msgid "Bonding miimon [100]: "
 msgstr "Vinculação miimon [100]: "
 
-#: ../clients/cli/connections.c:4017
-#, fuzzy
-msgid "Bonding downdelay [0]"
+#: ../clients/cli/connections.c:3894
+#, c-format
+msgid "Error: 'miimon': '%s' is not a valid number <0-%u>.\n"
+msgstr "Erro: \"miimon\": \"%s\" não é um número válido <0-%u>.\n"
+
+#: ../clients/cli/connections.c:3902
+msgid "Bonding downdelay [0]: "
 msgstr "Vinculação downdelay [0]: "
 
-#: ../clients/cli/connections.c:4018
-#, fuzzy
-msgid "Bonding updelay [0]"
+#: ../clients/cli/connections.c:3905
+#, c-format
+msgid "Error: 'downdelay': '%s' is not a valid number <0-%u>.\n"
+msgstr "Erro: \"downdelay\": \"%s\" não é um número válido <0-%u>.\n"
+
+#: ../clients/cli/connections.c:3913
+msgid "Bonding updelay [0]: "
 msgstr "Vinculação updelay [0]: "
 
-#: ../clients/cli/connections.c:4019
-#, fuzzy
-msgid "Bonding arp-interval [0]"
+#: ../clients/cli/connections.c:3916
+#, c-format
+msgid "Error: 'updelay': '%s' is not a valid number <0-%u>.\n"
+msgstr "Erro: \"updelay\": \"%s\" não é um número válido <0-%u>.\n"
+
+#: ../clients/cli/connections.c:3925
+msgid "Bonding arp-interval [0]: "
 msgstr "Vinculação intervalo arp [0]: "
 
-#: ../clients/cli/connections.c:4021
-#, fuzzy
-msgid "Bonding arp-ip-target [none]"
+#: ../clients/cli/connections.c:3928
+#, c-format
+msgid "Error: 'arp-interval': '%s' is not a valid number <0-%u>.\n"
+msgstr "Erro: 'arp-interval': '%s' não é um número válido <0-%u>.\n"
+
+#. FIXME: verify the string
+#: ../clients/cli/connections.c:3936
+msgid "Bonding arp-ip-target [none]: "
 msgstr "Vinculação arp-ip-destino [nenhum]: "
 
-#: ../clients/cli/connections.c:4023
-#, fuzzy
-msgid "LACP rate ('slow' or 'fast') [slow]"
+#: ../clients/cli/connections.c:3943
+msgid "LACP rate ('slow' or 'fast') [slow]: "
 msgstr "Taxa LACP (\"slow\" ou \"fast\") [slow]: "
 
-#: ../clients/cli/connections.c:4025 ../clients/cli/connections.c:4026
-#, fuzzy
-msgid "Team JSON configuration [none]"
+#: ../clients/cli/connections.c:3949
+#, c-format
+msgid "Error: 'lacp_rate': '%s' is invalid ('slow' or 'fast').\n"
+msgstr "Erro: \"lacp_rate\": \"%s\" é inválido (\"slow\" ou \"fast\").\n"
+
+#: ../clients/cli/connections.c:3972
+msgid "Team JSON configuration [none]: "
 msgstr "Configuração da União JSON [nenhum]: "
 
-#: ../clients/cli/connections.c:4027
-#, fuzzy
-msgid "Enable STP [no]"
+#: ../clients/cli/connections.c:3989
+msgid "team"
+msgstr "união"
+
+#: ../clients/cli/connections.c:3995
+msgid "team-slave"
+msgstr "união-escrava"
+
+#. Ask for optional 'bridge' arguments.
+#: ../clients/cli/connections.c:4007
+msgid "bridge"
+msgstr "ponte"
+
+#: ../clients/cli/connections.c:4013
+#, c-format
+msgid "Enable STP %s"
 msgstr "Habilitar STP %s"
 
-#: ../clients/cli/connections.c:4029
-#, fuzzy
-msgid "STP priority [32768]"
+#: ../clients/cli/connections.c:4018
+#, c-format
+msgid "Error: 'stp': %s.\n"
+msgstr "Erro: \"stp\": %s.\n"
+
+#: ../clients/cli/connections.c:4026
+msgid "STP priority [32768]: "
 msgstr "Prioridade STP [32768]: "
 
 #: ../clients/cli/connections.c:4030
-#, fuzzy
-msgid "Forward delay [15]"
+#, c-format
+msgid "Error: 'priority': '%s' is not a valid number <0-%d>.\n"
+msgstr "Erro: \"priority\": \"%s\" não é um número válido <0-%d>.\n"
+
+#: ../clients/cli/connections.c:4038
+msgid "Forward delay [15]: "
 msgstr "Atraso de encaminhamento [15]: "
 
-#: ../clients/cli/connections.c:4031
-#, fuzzy
-msgid "Hello time [2]"
+#: ../clients/cli/connections.c:4042
+#, c-format
+msgid "Error: 'forward-delay': '%s' is not a valid number <2-30>.\n"
+msgstr "Errr: \"forward-delay\": \"%s\" não é um número válido <2-30>.\n"
+
+#: ../clients/cli/connections.c:4051
+msgid "Hello time [2]: "
 msgstr "Tempo de saudação [2]: "
 
-#: ../clients/cli/connections.c:4032
-#, fuzzy
-msgid "Max age [20]"
+#: ../clients/cli/connections.c:4055
+#, c-format
+msgid "Error: 'hello-time': '%s' is not a valid number <1-10>.\n"
+msgstr "Erro: \"hello-time\": \"%s\" não é um número válido <1-10>.\n"
+
+#: ../clients/cli/connections.c:4063
+msgid "Max age [20]: "
 msgstr "Tempo de expiração máximo [20]: "
 
-#: ../clients/cli/connections.c:4033
-#, fuzzy
-msgid "MAC address ageing time [300]"
+#: ../clients/cli/connections.c:4067
+#, c-format
+msgid "Error: 'max-age': '%s' is not a valid number <6-40>.\n"
+msgstr "Erro: \"max-age\": \"%s\" não é um número válido <6-40>.\n"
+
+#: ../clients/cli/connections.c:4075
+msgid "MAC address ageing time [300]: "
 msgstr "Tempo de vencimento do endereço MAC [300]: "
 
-#: ../clients/cli/connections.c:4034
-#, fuzzy, c-format
-msgid "Enable IGMP snooping %s [no]"
+#: ../clients/cli/connections.c:4079
+#, c-format
+msgid "Error: 'ageing-time': '%s' is not a valid number <0-1000000>.\n"
+msgstr "Erro: \"ageing-time\": \"%s\" não é um número válido <0-1000000>.\n"
+
+#: ../clients/cli/connections.c:4088
+#, c-format
+msgid "Enable IGMP snooping %s"
 msgstr "Habilitar IGMP snooping %s"
 
-#: ../clients/cli/connections.c:4037
-#, fuzzy
-msgid "Bridge port priority [32]"
+#: ../clients/cli/connections.c:4093
+#, c-format
+msgid "Error: 'multicast-snooping': %s.\n"
+msgstr "Erro: \"multicast-snooping\": %s.\n"
+
+#. Ask for optional 'bridge-slave' arguments.
+#: ../clients/cli/connections.c:4120
+msgid "bridge-slave"
+msgstr "ponte-escrava"
+
+#: ../clients/cli/connections.c:4125
+msgid "Bridge port priority [32]: "
 msgstr "Prioridade da porta da ponte [32]: "
 
-#: ../clients/cli/connections.c:4038
-#, fuzzy
-msgid "Bridge port STP path cost [100]"
+#: ../clients/cli/connections.c:4138
+msgid "Bridge port STP path cost [100]: "
 msgstr "Custo do caminho STP da porta da ponte [100]: "
 
-#: ../clients/cli/connections.c:4039
-#, fuzzy
-msgid "Hairpin [no]"
-msgstr "Modo do hairpin"
+#: ../clients/cli/connections.c:4152
+#, c-format
+msgid "Hairpin %s"
+msgstr "Hairpin %s"
+
+#: ../clients/cli/connections.c:4157
+#, c-format
+msgid "Error: 'hairpin': %s.\n"
+msgstr "Erro: 'hairpin': %s.\n"
 
-#: ../clients/cli/connections.c:4044
-#, fuzzy
-msgid "OLPC Mesh channel [1]"
+#. Ask for optional 'olpc' arguments.
+#: ../clients/cli/connections.c:4184 ../libnm-glib/nm-device.c:1855
+#: ../libnm/nm-device.c:1806
+msgid "OLPC Mesh"
+msgstr "OLPC Mesh"
+
+#: ../clients/cli/connections.c:4189
+msgid "OLPC Mesh channel [1]: "
 msgstr "Canal da OLPC Mesh [1]: "
 
-#: ../clients/cli/connections.c:4045
-#, fuzzy
-msgid "DHCP anycast MAC address [none]"
+#: ../clients/cli/connections.c:4192
+#, c-format
+msgid "Error: 'channel': '%s' is not a valid number <1-13>.\n"
+msgstr "Erro: \"channel\": \"%s\" não é um número válido <1-13>.\n"
+
+#: ../clients/cli/connections.c:4200
+msgid "DHCP anycast MAC address [none]: "
 msgstr "Endereço MAC de difusão DHCP [nenhum]: "
 
-#. TTLS and PEAP are actually much more complicated, but this complication
-#. * is not visible here since we only care about phase2 authentication
-#. * (and don't even care of which one)
-#.
-#: ../clients/cli/connections.c:4046
-#: ../clients/common/nm-secret-agent-simple.c:223
-#: ../clients/common/nm-secret-agent-simple.c:328
-#: ../clients/tui/nmt-page-dsl.c:66 ../clients/tui/nmt-page-wifi.c:332
-msgid "Username"
-msgstr "Nome de usuário"
+#. Ask for optional 'adsl' arguments.
+#: ../clients/cli/connections.c:4219 ../libnm-glib/nm-device.c:1871
+#: ../libnm/nm-device.c:1822
+msgid "ADSL"
+msgstr "ADSL"
 
-#: ../clients/cli/connections.c:4052
-#, fuzzy
-msgid "MACVLAN parent device or connection UUID"
-msgstr "Dispositivo MACVLAN pai ou UUID de conexão: "
+#: ../clients/cli/connections.c:4227
+#, c-format
+msgid "ADSL encapsulation %s"
+msgstr "Encapsulamento ADSL %s"
 
-#: ../clients/cli/connections.c:4055
-msgid "Tap [no]"
-msgstr ""
+#. Ask for optional 'macvlan' arguments.
+#: ../clients/cli/connections.c:4245
+msgid "macvlan"
+msgstr "macvlan"
 
-#: ../clients/cli/connections.c:4057
-#, fuzzy
-msgid "VXLAN ID"
-msgstr "ID da VXLAN: "
+#: ../clients/cli/connections.c:4251
+#, c-format
+msgid "Tap %s"
+msgstr "Tap %s"
 
-#: ../clients/cli/connections.c:4058 ../clients/cli/connections.c:4076
-#, fuzzy
-msgid "Remote"
-msgstr "Remote: "
+#: ../clients/cli/connections.c:4256
+#, c-format
+msgid "Error: 'tap': %s.\n"
+msgstr "Erro: \"tap\": %s.\n"
+
+#. Ask for optional 'vxlan' arguments.
+#: ../clients/cli/connections.c:4272 ../libnm-glib/nm-device.c:1875
+#: ../libnm/nm-device.c:1826
+msgid "VXLAN"
+msgstr "VXLAN"
 
-#: ../clients/cli/connections.c:4059 ../clients/cli/connections.c:4077
-#, fuzzy
-msgid "Parent device [none]"
+#: ../clients/cli/connections.c:4277 ../clients/cli/connections.c:4601
+msgid "Parent device [none]: "
 msgstr "Interface pai [nenhuma]: "
 
-#: ../clients/cli/connections.c:4060
-#, fuzzy
-msgid "Local address [none]"
+#: ../clients/cli/connections.c:4282 ../clients/cli/connections.c:4606
+#, c-format
+msgid "Error: 'dev': '%s' is neither UUID nor interface name.\n"
+msgstr "Erro: \"dev\": \"%s\" não é um UUID nem nome de interface.\n"
+
+#: ../clients/cli/connections.c:4291
+msgid "Local address [none]: "
 msgstr "Endereço local [nenhum]: "
 
-#: ../clients/cli/connections.c:4061
-#, fuzzy
-msgid "Minimum source port [0]"
+#: ../clients/cli/connections.c:4296
+#, c-format
+msgid "Error: 'local': '%s' is not a valid IP address.\n"
+msgstr "Erro: \"local\": \"%s\" não é um endereço IP válido.\n"
+
+#: ../clients/cli/connections.c:4305
+msgid "Minimum source port [0]: "
 msgstr "Porta de origem mínima [0]: "
 
-#: ../clients/cli/connections.c:4062
-#, fuzzy
-msgid "Maximum source port [0]"
+#: ../clients/cli/connections.c:4309
+#, c-format
+msgid "Error: 'source-port-min': '%s' is not a valid number <0-65535>.\n"
+msgstr "Erro: \"source-port-min\": \"%s\" não é um número válido <0-65535>.\n"
+
+#: ../clients/cli/connections.c:4318
+msgid "Maximum source port [0]: "
 msgstr "Porta de origem máxima [0]: "
 
-#: ../clients/cli/connections.c:4063
-#, fuzzy
-msgid "Destination port [8472]"
+#: ../clients/cli/connections.c:4322
+#, c-format
+msgid "Error: 'source-port-max': '%s' is not a valid number <0-65535>.\n"
+msgstr "Erro: \"source-port-max\": \"%s\" não é um número válido <0-65535>.\n"
+
+#: ../clients/cli/connections.c:4331
+msgid "Destination port [8472]: "
 msgstr "Porta de destino [8472]: "
 
-#: ../clients/cli/connections.c:4066
-#, fuzzy
-msgid "User ID [none]"
+#: ../clients/cli/connections.c:4335
+#, c-format
+msgid "Error: 'destination-port': '%s' is not a valid number <0-65535>.\n"
+msgstr "Erro: \"destination-port\": \"%s\" não é um número válido <0-65535>.\n"
+
+#: ../clients/cli/connections.c:4374
+msgid "IPv4 address (IP[/plen]) [none]: "
+msgstr "Endereço IPv4 (IP[/plen]) [nenhum]: "
+
+#: ../clients/cli/connections.c:4376
+msgid "IPv6 address (IP[/plen]) [none]: "
+msgstr "Endereço IPv6 (IP[/plen]) [nenhum]: "
+
+#: ../clients/cli/connections.c:4390
+#, c-format
+msgid "  Address successfully added: %s\n"
+msgstr "  Endereço adicionado com sucesso: %s\n"
+
+#: ../clients/cli/connections.c:4392
+#, c-format
+msgid "  Warning: address already present: %s\n"
+msgstr "  Aviso: endereço já existente: %s\n"
+
+#: ../clients/cli/connections.c:4394
+#, c-format
+msgid "  Warning: ignoring garbage at the end: '%s'\n"
+msgstr "  Aviso: ignorando lixo ao final: '%s'\n"
+
+#: ../clients/cli/connections.c:4396 ../clients/cli/connections.c:5605
+#: ../clients/cli/connections.c:5652 ../clients/cli/connections.c:6569
+#: ../clients/cli/connections.c:6602
+msgid "Error: "
+msgstr "Erro: "
+
+#: ../clients/cli/connections.c:4416
+msgid "IPv4 gateway [none]: "
+msgstr "Gateway IPv4 [nenhum]: "
+
+#: ../clients/cli/connections.c:4419
+msgid "IPv6 gateway [none]: "
+msgstr "Gateway IPv6 [nenhum]: "
+
+#: ../clients/cli/connections.c:4439
+#, c-format
+msgid "Error: invalid gateway address '%s'\n"
+msgstr "Erro: endereço de gateway \"%s\" inválido\n"
+
+#. Ask for IP addresses
+#: ../clients/cli/connections.c:4452
+#, c-format
+msgid "Do you want to add IP addresses? %s"
+msgstr "Você deseja adicionar endereços de IP? %s"
+
+#: ../clients/cli/connections.c:4460
+#, c-format
+msgid "Press <Enter> to finish adding addresses.\n"
+msgstr "Pressione <Enter> para concluir a adição de endereços.\n"
+
+#. Ask for optional 'tun' arguments.
+#: ../clients/cli/connections.c:4504 ../libnm-glib/nm-device.c:1879
+#: ../libnm/nm-device.c:1830
+msgid "Tun"
+msgstr "Tun"
+
+#: ../clients/cli/connections.c:4509
+msgid "User ID [none]: "
 msgstr "ID de usuário [nenhum]: "
 
-#: ../clients/cli/connections.c:4067
-#, fuzzy
-msgid "Group ID [none]"
+#: ../clients/cli/connections.c:4522
+msgid "Group ID [none]: "
 msgstr "ID do grupo [nenhum]: "
 
-#: ../clients/cli/connections.c:4068
-#, fuzzy
-msgid "Enable PI [no]"
+#: ../clients/cli/connections.c:4536
+#, c-format
+msgid "Enable PI %s"
 msgstr "Habilitar PI %s"
 
-#: ../clients/cli/connections.c:4070
-#, fuzzy
-msgid "Enable VNET header [no]"
+#: ../clients/cli/connections.c:4541
+#, c-format
+msgid "Error: 'pi': %s.\n"
+msgstr "Erro: \"pi\": %s.\n"
+
+#: ../clients/cli/connections.c:4549
+#, c-format
+msgid "Enable VNET header %s"
 msgstr "Habilitar cabeçalho VNET %s"
 
-#: ../clients/cli/connections.c:4072
-#, fuzzy
-msgid "Enable multi queue [no]"
+#: ../clients/cli/connections.c:4554
+#, c-format
+msgid "Error: 'vnet-hdr': %s.\n"
+msgstr "Erro: \"vnet-hdr\": %s.\n"
+
+#: ../clients/cli/connections.c:4562
+#, c-format
+msgid "Enable multi queue %s"
 msgstr "Habilitar múltiplas filas %s"
 
-#: ../clients/cli/connections.c:4075
-#, fuzzy
-msgid "Local endpoint [none]"
-msgstr "Ponto local [nenhum]: "
+#: ../clients/cli/connections.c:4567
+#, c-format
+msgid "Error: 'multi-queue': %s.\n"
+msgstr "Erro: 'mode': %s.\n"
 
-#: ../clients/cli/connections.c:4078
-#, fuzzy
-msgid "IPv4 address (IP[/plen]) [none]"
-msgstr "Endereço IPv4 (IP[/plen]) [nenhum]: "
+#. Ask for optional 'ip-tunnel' arguments.
+#: ../clients/cli/connections.c:4581
+msgid "IP Tunnel"
+msgstr "Túnel IP"
 
-#: ../clients/cli/connections.c:4079
-#, fuzzy
-msgid "IPv4 gateway [none]"
-msgstr "Gateway IPv4 [nenhum]: "
+#: ../clients/cli/connections.c:4586
+msgid "Local endpoint [none]: "
+msgstr "Ponto local [nenhum]: "
 
-#: ../clients/cli/connections.c:4080
-#, fuzzy
-msgid "IPv6 address (IP[/plen]) [none]"
-msgstr "Endereço IPv6 (IP[/plen]) [nenhum]: "
+#: ../clients/cli/connections.c:4592
+#, c-format
+msgid "Error: 'local': '%s' is not valid; must be an IP address\n"
+msgstr "Erro: \"local\": \"%s\" não é válido; deve ser um endereço IP\n"
 
-#: ../clients/cli/connections.c:4081
-#, fuzzy
-msgid "IPv6 gateway [none]"
-msgstr "Gateway IPv6 [nenhum]: "
+#: ../clients/cli/connections.c:4658 ../clients/cli/connections.c:10184
+#, c-format
+msgid "Error: <setting>.<property> argument is missing."
+msgstr "Erro: está faltando argumento <definição>.<propriedade>."
 
-#: ../clients/cli/connections.c:4205
+#: ../clients/cli/connections.c:4663
 #, c-format
 msgid "Error: value for '%s' is missing."
 msgstr "Erro: está faltando um valor para \"%s\"."
 
-#: ../clients/cli/connections.c:4252
-msgid "Error: <setting>.<property> argument is missing."
-msgstr "Erro: está faltando argumento <definição>.<propriedade>."
+#: ../clients/cli/connections.c:4681
+#, c-format
+msgid "Error: invalid <setting>.<property> '%s'."
+msgstr "Erro: <definição>.<propriedade> \"%s\" inválida."
 
-#: ../clients/cli/connections.c:4274
+#: ../clients/cli/connections.c:4689
 #, c-format
 msgid "Error: invalid or not allowed setting '%s': %s."
 msgstr "Erro: definição inválida ou não permitida \"%s\": %s."
 
-#: ../clients/cli/connections.c:4301
-#, fuzzy, c-format
-msgid "Error: '%s' is ambiguous (%s.%s or %s.%s)."
-msgstr "\"%s\" é ambíguo (%s x %s)"
+#: ../clients/cli/connections.c:4700
+#, c-format
+msgid "Error: don't know how to create '%s' setting."
+msgstr "Erro: não sei como criar a definição \"%s\"."
 
-#: ../clients/cli/connections.c:4315
+#: ../clients/cli/connections.c:4710
 #, c-format
-msgid "Error: invalid <setting>.<property> '%s'."
-msgstr "Erro: <definição>.<propriedade> \"%s\" inválida."
+msgid "Error: invalid property '%s': %s."
+msgstr "Erro: propriedade inválida \"%s\": %s."
 
-#: ../clients/cli/connections.c:4356 ../clients/cli/connections.c:7842
+#: ../clients/cli/connections.c:4722
 #, c-format
-msgid "Error: Failed to add '%s' connection: %s"
-msgstr "Erro: falha ao adicionar a conexão \"%s\": %s"
+msgid "Error: failed to modify %s.%s: %s."
+msgstr "Erro: falha ao modificar %s.%s: %s."
 
-#: ../clients/cli/connections.c:4361
+#: ../clients/cli/connections.c:4741
 #, c-format
-msgid "Connection '%s' (%s) successfully added.\n"
-msgstr "A conexão \"%s\" (%s) foi adicionada com sucesso.\n"
+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:4477
+#: ../clients/cli/connections.c:4775
 #, c-format
 msgid ""
-"You can specify this option more than once. Press <Enter> when you're done.\n"
+"Warning: 'type' is ignored. Use 'nmcli connection add \"%s\" ...' instead."
 msgstr ""
+"Aviso: \"type\" é ignorado. Use \"nmcli connection add '%s' ...\" em seu "
+"lugar."
 
-#. Ask for optional arguments.
-#: ../clients/cli/connections.c:4515
-#, 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 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:4783
+msgid "Error: redundant 'master' option."
+msgstr "Erro: opção \"master\" redundante."
 
-#: ../clients/cli/connections.c:4518
+#: ../clients/cli/connections.c:4796
+msgid "Error: 'master' is required."
+msgstr "Erro: é necessário o \"master\"."
+
+#: ../clients/cli/connections.c:4950
 #, 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"
+msgid "Error: 'parent': not valid without 'p-key'."
+msgstr "Erro: \"parent\": não é válido sem \"p-key\"."
 
-#: ../clients/cli/connections.c:4532
-#, fuzzy
-msgid "Wired Ethernet"
-msgstr "Ethernet"
+#: ../clients/cli/connections.c:5005 ../clients/cli/connections.c:5967
+msgid "SSID: "
+msgstr "SSID: "
 
-#: ../clients/cli/connections.c:4534 ../src/devices/nm-device-infiniband.c:175
-msgid "InfiniBand connection"
-msgstr "Conexão InfiniBand"
+#: ../clients/cli/connections.c:5008 ../clients/cli/connections.c:5970
+msgid "Error: 'ssid' is required."
+msgstr "Erro: é necessário o \"ssid\"."
 
-#: ../clients/cli/connections.c:4536
-#, fuzzy
-msgid "Wi-Fi connection"
-msgstr "Conexão de Wi-Fi %d"
+#: ../clients/cli/connections.c:5072
+msgid "WiMAX NSP name: "
+msgstr "Nome do NSP WiMAX: "
 
-#: ../clients/cli/connections.c:4538
-#, fuzzy
-msgid "WiMAX connection"
-msgstr "Conexão CDMA"
+#: ../clients/cli/connections.c:5075
+msgid "Error: 'nsp' is required."
+msgstr "Erro: é necessário o \"nsp\"."
 
-#: ../clients/cli/connections.c:4540
-msgid "PPPoE"
-msgstr "PPPoE"
+#: ../clients/cli/connections.c:5127
+msgid "PPPoE username: "
+msgstr "Nome de usuário do PPPoE: "
 
-#: ../clients/cli/connections.c:4542
-#, fuzzy
-msgid "CDMA mobile broadband connection"
-msgstr "Conexão de Banda larga móvel %d"
+#: ../clients/cli/connections.c:5130 ../clients/cli/connections.c:6037
+msgid "Error: 'username' is required."
+msgstr "Erro: \"nome de usuário\" é necessário."
 
-#: ../clients/cli/connections.c:4544
-#, fuzzy
-msgid "GSM mobile broadband connection"
-msgstr "Conexão de Banda larga móvel %d"
+#: ../clients/cli/connections.c:5199
+msgid "APN: "
+msgstr "Nome do ponto de acesso (APN): "
 
-#: ../clients/cli/connections.c:4546
-#, fuzzy
-msgid "bluetooth connection"
-msgstr "Conexão vinculada"
+#: ../clients/cli/connections.c:5202
+msgid "Error: 'apn' is required."
+msgstr "Erro: é necessário o \"apn\"."
 
-#: ../clients/cli/connections.c:4548 ../src/devices/nm-device-vlan.c:458
-msgid "VLAN connection"
-msgstr "Conexão VLAN"
+#: ../clients/cli/connections.c:5260
+msgid "Bluetooth device address: "
+msgstr "Endereço de dispositivo Bluetooth: "
 
-#: ../clients/cli/connections.c:4550
-#, fuzzy
-msgid "Bond device"
-msgstr "Dispositivo Ethernet"
+#: ../clients/cli/connections.c:5263
+msgid "Error: 'addr' is required."
+msgstr "Erro: é necessário o \"addr\"."
 
-#: ../clients/cli/connections.c:4552
-#, fuzzy
-msgid "Team device"
-msgstr "Modo de dispositivo TUN"
+#: ../clients/cli/connections.c:5304
+#, c-format
+msgid "Error: 'bt-type': '%s' not valid; use [%s, %s (%s), %s]."
+msgstr "Erro: \"bt-type\": \"%s\" não é válido; use [%s, %s (%s), %s]."
 
-#: ../clients/cli/connections.c:4554
-#, fuzzy
-msgid "Team port"
-msgstr "União"
+#: ../clients/cli/connections.c:5348
+msgid "VLAN parent device or connection UUID: "
+msgstr "Dispositivo VLAN principal ou conexão UUID: "
 
-#: ../clients/cli/connections.c:4556
-#, fuzzy
-msgid "Bridge device"
-msgstr "Dispositivo Ethernet"
+#: ../clients/cli/connections.c:5351 ../clients/cli/connections.c:6108
+msgid "Error: 'dev' is required."
+msgstr "Erro: é necessário o \"dev\"."
 
-#: ../clients/cli/connections.c:4558
-#, fuzzy
-msgid "Bridge port"
-msgstr "Ponte"
+#: ../clients/cli/connections.c:5355
+msgid "VLAN ID <0-4094>: "
+msgstr "ID da VLAN <0-4094>: "
 
-#: ../clients/cli/connections.c:4560 ../src/nm-manager.c:3716
-msgid "VPN connection"
-msgstr "Conexão VPN"
+#: ../clients/cli/connections.c:5358 ../clients/cli/connections.c:6424
+msgid "Error: 'id' is required."
+msgstr "Erro: é necessário o \"id\"."
 
-#: ../clients/cli/connections.c:4562
-#, fuzzy
-msgid "OLPC Mesh connection"
-msgstr "Conexão CDMA"
+#: ../clients/cli/connections.c:5364
+#, c-format
+msgid "Error: 'id': '%s' is not valid; use <0-4094>."
+msgstr "Erro: \"id\": \"%s\" não é válido; use <0-4094>."
 
-#: ../clients/cli/connections.c:4564 ../src/devices/adsl/nm-device-adsl.c:133
-msgid "ADSL connection"
-msgstr "Conexão ADSL"
+#: ../clients/cli/connections.c:5374 ../clients/cli/connections.c:6116
+#, c-format
+msgid "Error: 'dev': '%s' is neither UUID, interface name, nor MAC."
+msgstr "Erro: \"dev\": \"%s\" não é um UUID, nome de interface, e nem um MAC."
 
-#: ../clients/cli/connections.c:4566
-#, fuzzy
-msgid "macvlan connection"
-msgstr "Conexão vinculada"
+#: ../clients/cli/connections.c:5506
+#, c-format
+msgid "Error: 'mode': %s."
+msgstr "Erro: \"mode\": %s."
 
-#: ../clients/cli/connections.c:4568 ../src/devices/nm-device-vxlan.c:374
-msgid "VXLAN connection"
-msgstr "Conexão VXLAN"
+#: ../clients/cli/connections.c:5515
+#, c-format
+msgid "Error: 'primary': '%s' is not a valid interface name."
+msgstr "Erro: \"primary\": \"%s\" não é um nome de interface válido."
 
-#: ../clients/cli/connections.c:4570
-#, fuzzy
-msgid "Tun device"
-msgstr "Modo de dispositivo TUN"
+#: ../clients/cli/connections.c:5738
+#, c-format
+msgid "Error: 'stp': %s."
+msgstr "Erro: \"stp\": %s."
 
-#: ../clients/cli/connections.c:4572
-#, fuzzy
-msgid "IPv4 protocol"
-msgstr "Protocolo ADSL"
+#: ../clients/cli/connections.c:5747
+#, c-format
+msgid "Error: 'multicast-snooping': %s."
+msgstr "Erro: \"multicast-snooping\": %s."
 
-#: ../clients/cli/connections.c:4574
-#, fuzzy
-msgid "IPv6 protocol"
-msgstr "Protocolo ADSL"
+#: ../clients/cli/connections.c:5866
+#, c-format
+msgid "Error: 'hairpin': %s."
+msgstr "Erro: 'hairpin': %s."
+
+#: ../clients/cli/connections.c:5915
+msgid "Error: 'vpn-type' is required."
+msgstr "Erro: é necessário o \"vpn-type\"."
 
-#: ../clients/cli/connections.c:4657 ../clients/cli/utils.c:124
+#: ../clients/cli/connections.c:5922
 #, c-format
-msgid "Error: value for '%s' argument is required."
-msgstr "Erro: é necessário valor para o argumento \"%s\"."
+msgid "Warning: 'vpn-type': %s not known.\n"
+msgstr "Aviso: \"vpn-type\": %s desconhecido.\n"
 
-#: ../clients/cli/connections.c:4663
+#: ../clients/cli/connections.c:5983
+#, c-format
+msgid "Error: 'channel': '%s' is not valid; use <1-13>."
+msgstr "Erro: \"channel\": \"%s\" não é válido; use <1-13>."
+
+#: ../clients/cli/connections.c:6034
+msgid "Username: "
+msgstr "Nome de usuário: "
+
+#: ../clients/cli/connections.c:6043
+#, c-format
+msgid "Protocol %s"
+msgstr "Protocolo %s"
+
+#: ../clients/cli/connections.c:6046
+msgid "Error: 'protocol' is required."
+msgstr "Erro: é necessário o \"protocol\"."
+
+#: ../clients/cli/connections.c:6105
+msgid "MACVLAN parent device or connection UUID: "
+msgstr "Dispositivo MACVLAN pai ou UUID de conexão: "
+
+#: ../clients/cli/connections.c:6125 ../clients/cli/connections.c:6205
+#: ../clients/cli/connections.c:6307
+msgid "Error: 'mode' is required."
+msgstr "Erro: é necessário o \"mode\"."
+
+#: ../clients/cli/connections.c:6131
+msgid "Error: 'mode' is not valid."
+msgstr "Erro: \"mode\" não é válido."
+
+#: ../clients/cli/connections.c:6144
+#, c-format
+msgid "Error: 'tap': %s."
+msgstr "Erro: \"tap\": %s."
+
+#: ../clients/cli/connections.c:6230
+#, c-format
+msgid "Error: 'pi': %s."
+msgstr "Erro: \"pi\": %s."
+
+#: ../clients/cli/connections.c:6241
+#, c-format
+msgid "Error: 'vnet-hdr': %s."
+msgstr "Erro: \"vnet-hdr\": %s."
+
+#: ../clients/cli/connections.c:6252
+#, c-format
+msgid "Error: 'multi-queue': %s."
+msgstr "Erro: \"multi-queue\": %s."
+
+#: ../clients/cli/connections.c:6321
+#, c-format
+msgid "Error: 'mode': '%s' is not valid, use one of %s"
+msgstr "Erro: \"mode\": \"%s\" não é um válido, use um de %s"
+
+#: ../clients/cli/connections.c:6327
+msgid "Remote endpoint: "
+msgstr "Ponto remoto: "
+
+#: ../clients/cli/connections.c:6330 ../clients/cli/connections.c:6432
+msgid "Error: 'remote' is required."
+msgstr "Erro: é necessário o \"remote\"."
+
+#: ../clients/cli/connections.c:6337
+#, c-format
+msgid "Error: 'remote': '%s' is not valid; must be an IP address"
+msgstr "Erro: \"remote\": \"%s\" não é um válido, deve ser um endereço IP"
+
+#: ../clients/cli/connections.c:6351
+#, c-format
+msgid "Error: 'local': '%s' is not valid; must be an IP address"
+msgstr "Erro: \"local\": \"%s\" não é um válido, deve ser um endereço IP"
+
+#: ../clients/cli/connections.c:6360 ../clients/cli/connections.c:6455
+#, c-format
+msgid "Error: 'dev': '%s' is neither UUID nor interface name."
+msgstr "Erro: \"dev\": \"%s\" não é um UUID nem um nome de interface."
+
+#: ../clients/cli/connections.c:6421
+msgid "VXLAN ID: "
+msgstr "ID da VXLAN: "
+
+#: ../clients/cli/connections.c:6429
+msgid "Remote: "
+msgstr "Remote: "
+
+#: ../clients/cli/connections.c:6438
+#, c-format
+msgid "Error: 'id': '%s' is not valid; use <0-16777215>."
+msgstr "Erro: \"id\": \"%s\" não é válido; use <0-16777215>."
+
+#: ../clients/cli/connections.c:6464
+#, c-format
+msgid "Error: 'remote': '%s' is not a valid IP address"
+msgstr "Erro: \"remote\": \"%s\" não é um endereço IP válido"
+
+#: ../clients/cli/connections.c:6473
+#, c-format
+msgid "Error: 'local': '%s' is not a valid IP address"
+msgstr "Erro: \"local\": \"%s\" não é um endereço IP válido"
+
+#: ../clients/cli/connections.c:6482
+#, c-format
+msgid "Error: 'source-port-min': %s is not valid; use <0-65535>."
+msgstr "Erro: \"source-port-min\": %s não é válido; use <0-65535>."
+
+#: ../clients/cli/connections.c:6491
+#, c-format
+msgid "Error: 'source-port-max': %s is not valid; use <0-65535>."
+msgstr "Erro: \"source-port-max\": %s não é válido; use <0-65535>."
+
+#: ../clients/cli/connections.c:6500
+#, c-format
+msgid "Error: 'destination-port': %s is not valid; use <0-65535>."
+msgstr "Erro: \"destination-port\": %s não é válido; use <0-65535>."
+
+#: ../clients/cli/connections.c:6540
+#, c-format
+msgid "Error: '%s' is not a valid connection type."
+msgstr "Erro: \"%s\" não é um tipo de conexão válido."
+
+#: ../clients/cli/connections.c:6581
+#, c-format
+msgid "Error: IPv4 gateway specified without IPv4 addresses"
+msgstr "Erro: gateway IPv4 especificado sem endereços IPv4"
+
+#: ../clients/cli/connections.c:6585
+#, c-format
+msgid "Error: multiple IPv4 gateways specified"
+msgstr "Erro: múltiplos gateways IPv4 especificados"
+
+#: ../clients/cli/connections.c:6589
+#, c-format
+msgid "Error: Invalid IPv4 gateway '%s'"
+msgstr "Erro: gateway IPv4 \"%s\" inválido"
+
+#: ../clients/cli/connections.c:6614
+#, c-format
+msgid "Error: IPv6 gateway specified without IPv6 addresses"
+msgstr "Erro: gateway IPv6 especificado sem endereços IPv6"
+
+#: ../clients/cli/connections.c:6618
+#, c-format
+msgid "Error: multiple IPv6 gateways specified"
+msgstr "Erro: múltiplos gateways IPv6 especificados"
+
+#: ../clients/cli/connections.c:6622
+#, c-format
+msgid "Error: Invalid IPv6 gateway '%s'"
+msgstr "Erro: gateway IPv6 \"%s\" inválido"
+
+#: ../clients/cli/connections.c:6670 ../clients/cli/connections.c:10223
+#, c-format
+msgid "Error: Failed to add '%s' connection: %s"
+msgstr "Erro: falha ao adicionar a conexão \"%s\": %s"
+
+#: ../clients/cli/connections.c:6675
+#, c-format
+msgid "Connection '%s' (%s) successfully added.\n"
+msgstr "A conexão \"%s\" (%s) foi adicionada com sucesso.\n"
+
+#: ../clients/cli/connections.c:6951 ../clients/cli/connections.c:10678
+#, c-format
+msgid "Error: 'type' argument is required."
+msgstr "Erro: é necessário o argumento \"type\"."
+
+#: ../clients/cli/connections.c:6959
+#, c-format
+msgid "Error: invalid connection type; %s."
+msgstr "Erro: tipo de conexão inválido; %s."
+
+#: ../clients/cli/connections.c:6968 ../clients/cli/devices.c:2164
+#, c-format
+msgid "Error: 'autoconnect': %s."
+msgstr "Erro: \"autoconnect\": %s."
+
+#: ../clients/cli/connections.c:6978
 #, c-format
 msgid "Error: 'save': %s."
 msgstr "Erro: \"save\": %s."
 
-#: ../clients/cli/connections.c:4732
-#, fuzzy, c-format
-msgid "Error: '%s' argument is required."
-msgstr "Erro: é necessário o argumento \"type\"."
+#: ../clients/cli/connections.c:6995
+msgid "Interface name [*]: "
+msgstr "Nome da interface [*]: "
 
-#: ../clients/cli/connections.c:5701
+#: ../clients/cli/connections.c:7000
+#, c-format
+msgid "Error: 'ifname' argument is required."
+msgstr "Erro: é necessário o argumento \"ifname\"."
+
+#: ../clients/cli/connections.c:7002
+#, c-format
+msgid "Error: mandatory 'ifname' not seen before '%s'."
+msgstr "Erro: \"ifname\" obrigatório não foi encontrado antes de \"%s\"."
+
+#: ../clients/cli/connections.c:7011
+#, c-format
+msgid "Error: 'ifname': '%s' is not a valid interface nor '*'."
+msgstr "Erro: \"ifname\": \"%s\" não é uma interface válida nem '*'."
+
+#: ../clients/cli/connections.c:8035
 #, c-format
 msgid "['%s' setting values]\n"
 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:5783
+#. 
+#: ../clients/cli/connections.c:8117
 #, c-format
 msgid ""
 "---[ Main menu ]---\n"
@@ -2498,7 +2852,7 @@ msgstr ""
 "nmcli    <opção-conf> <valor>      :: configuração do nmcli\n"
 "quit                               :: sai do nmcli\n"
 
-#: ../clients/cli/connections.c:5810
+#: ../clients/cli/connections.c:8144
 #, c-format
 msgid ""
 "goto <setting>[.<prop>] | <prop>  :: enter setting/property for editing\n"
@@ -2517,13 +2871,12 @@ msgstr ""
 "          nmcli connection> goto secondaries\n"
 "          nmcli> goto ipv4.addresses\n"
 
-#: ../clients/cli/connections.c:5817
+#: ../clients/cli/connections.c:8151
 #, c-format
 msgid ""
 "remove <setting>[.<prop>]  :: remove setting or reset property value\n"
 "\n"
-"This command removes an entire setting from the connection, or if a "
-"property\n"
+"This command removes an entire setting from the connection, or if a property\n"
 "is given, resets that property to the default value.\n"
 "\n"
 "Examples: nmcli> remove wifi-sec\n"
@@ -2538,7 +2891,7 @@ msgstr ""
 "Exemplos: nmcli> remove wifi-sec\n"
 "          nmcli> remove eth.mtu\n"
 
-#: ../clients/cli/connections.c:5824
+#: ../clients/cli/connections.c:8158
 #, c-format
 msgid ""
 "set [<setting>.<prop> <value>]  :: set property value\n"
@@ -2553,7 +2906,7 @@ msgstr ""
 "\n"
 "Exemplo: nmcli> set con.id Minha conexão\n"
 
-#: ../clients/cli/connections.c:5829
+#: ../clients/cli/connections.c:8163
 #, c-format
 msgid ""
 "describe [<setting>.<prop>]  :: describe property\n"
@@ -2566,7 +2919,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:5834
+#: ../clients/cli/connections.c:8168
 #, c-format
 msgid ""
 "print [all]  :: print setting or connection values\n"
@@ -2581,14 +2934,13 @@ msgstr ""
 "\n"
 "Exemplo: nmcli ipv4> print all\n"
 
-#: ../clients/cli/connections.c:5839
+#: ../clients/cli/connections.c:8173
 #, c-format
 msgid ""
 "verify [all | fix]  :: verify setting or connection validity\n"
 "\n"
 "Verifies whether the setting or connection is valid and can be saved later.\n"
-"It indicates invalid values on error. Some errors may be fixed "
-"automatically\n"
+"It indicates invalid values on error. Some errors may be fixed automatically\n"
 "by 'fix' option.\n"
 "\n"
 "Examples: nmcli> verify\n"
@@ -2605,7 +2957,7 @@ msgstr ""
 "          nmcli> verify fix\n"
 "          nmcli bond> verify\n"
 
-#: ../clients/cli/connections.c:5848
+#: ../clients/cli/connections.c:8182
 #, c-format
 msgid ""
 "save [persistent|temporary]  :: save the connection\n"
@@ -2622,8 +2974,7 @@ msgid ""
 msgstr ""
 "save [persistent|temporary]  :: salva a conexão\n"
 "\n"
-"Envia o perfil da conexão ao NetworkManager que vai salvá-lo "
-"permanentemente\n"
+"Envia o perfil da conexão ao NetworkManager que vai salvá-lo permanentemente\n"
 "ou vai apenas mantê-lo na memória. \"save\" sem um argumento significa\n"
 "\"save persistent\".\n"
 "Note que assim que você salvar o perfil persistentemente, aquelas\n"
@@ -2633,7 +2984,7 @@ msgstr ""
 "remover por completo a conexão permanente, o perfil de conexão deve ser\n"
 "excluído.\n"
 
-#: ../clients/cli/connections.c:5859
+#: ../clients/cli/connections.c:8193
 #, c-format
 msgid ""
 "activate [<ifname>] [/<ap>|<nsp>]  :: activate the connection\n"
@@ -2654,25 +3005,21 @@ msgstr ""
 "/<ap>|<nsp>  - ponto de acesso (Wi-Fi) ou provedor de serviço de rede "
 "(WiMAX) (preceda com / quando o <nome-if> não for especificado)\n"
 
-#: ../clients/cli/connections.c:5866 ../clients/cli/connections.c:6025
+#: ../clients/cli/connections.c:8200 ../clients/cli/connections.c:8359
 #, c-format
-msgid ""
-"back  :: go to upper menu level\n"
+msgid "back  :: go to upper menu level\n"
 "\n"
-msgstr ""
-"back  :: vai ao nível de menu superior\n"
+msgstr "back  :: vai ao nível de menu superior\n"
 "\n"
 
-#: ../clients/cli/connections.c:5869
+#: ../clients/cli/connections.c:8203
 #, c-format
-msgid ""
-"help/? [<command>]  :: help for the nmcli commands\n"
+msgid "help/? [<command>]  :: help for the nmcli commands\n"
 "\n"
-msgstr ""
-"help/? [<command>]  :: ajuda para os comandos do nmcli\n"
+msgstr "help/? [<command>]  :: ajuda para os comandos do nmcli\n"
 "\n"
 
-#: ../clients/cli/connections.c:5872
+#: ../clients/cli/connections.c:8206
 #, c-format
 msgid ""
 "nmcli [<conf-option> <value>]  :: nmcli configuration\n"
@@ -2699,7 +3046,7 @@ msgstr ""
 "          nmcli> nmcli save-confirmation no\n"
 "          nmcli> nmcli prompt-color 3\n"
 
-#: ../clients/cli/connections.c:5894 ../clients/cli/connections.c:6031
+#: ../clients/cli/connections.c:8228 ../clients/cli/connections.c:8365
 #, c-format
 msgid ""
 "quit  :: exit nmcli\n"
@@ -2712,16 +3059,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:5899 ../clients/cli/connections.c:6036
-#: ../clients/cli/connections.c:6460 ../clients/cli/connections.c:7407
+#: ../clients/cli/connections.c:8233 ../clients/cli/connections.c:8370
+#: ../clients/cli/connections.c:8794 ../clients/cli/connections.c:9742
 #, c-format
 msgid "Unknown command: '%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:5965
+#. 
+#: ../clients/cli/connections.c:8299
 #, c-format
 msgid ""
 "---[ Property menu ]---\n"
@@ -2745,11 +3092,10 @@ msgstr ""
 "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"
+"help/?   [<comando>]             :: exibe esta ajuda ou descrição de comando\n"
 "quit                             :: sai do nmcli\n"
 
-#: ../clients/cli/connections.c:5990
+#: ../clients/cli/connections.c:8324
 #, c-format
 msgid ""
 "set [<value>]  :: set new value\n"
@@ -2760,7 +3106,7 @@ msgstr ""
 "\n"
 "Este comando configura o <valor> fornecido à propriedade\n"
 
-#: ../clients/cli/connections.c:5994
+#: ../clients/cli/connections.c:8328
 #, c-format
 msgid ""
 "add [<value>]  :: append new value to the property\n"
@@ -2775,7 +3121,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:6000
+#: ../clients/cli/connections.c:8334
 #, c-format
 msgid ""
 "change  :: change current value\n"
@@ -2786,7 +3132,7 @@ msgstr ""
 "\n"
 "Exibe o valor atual e permite sua edição.\n"
 
-#: ../clients/cli/connections.c:6004
+#: ../clients/cli/connections.c:8338
 #, c-format
 msgid ""
 "remove [<value>|<index>|<option name>]  :: delete the value\n"
@@ -2807,8 +3153,7 @@ msgid ""
 msgstr ""
 "remove [<valor>|<índice>|<nome-opção>]  :: exclui o valor\n"
 "\n"
-"Remove o valor da propriedade. Para propriedades de valor único, isso "
-"define\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"
@@ -2820,7 +3165,7 @@ msgstr ""
 "          nmcli bond.options> remove downdelay\n"
 "\n"
 
-#: ../clients/cli/connections.c:6015
+#: ../clients/cli/connections.c:8349
 #, c-format
 msgid ""
 "describe  :: describe property\n"
@@ -2833,7 +3178,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:6020
+#: ../clients/cli/connections.c:8354
 #, c-format
 msgid ""
 "print [property|setting|connection]  :: print property (setting, connection) "
@@ -2848,100 +3193,103 @@ 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:6028
+#: ../clients/cli/connections.c:8362
 #, c-format
-msgid ""
-"help/? [<command>]  :: help for nmcli commands\n"
+msgid "help/? [<command>]  :: help for nmcli commands\n"
 "\n"
-msgstr ""
-"help/? [<comando>]  :: ajuda para os comandos do nmcli\n"
+msgstr "help/? [<comando>]  :: ajuda para os comandos do nmcli\n"
 "\n"
 
-#: ../clients/cli/connections.c:6209
+#: ../clients/cli/connections.c:8460
+#, c-format
+msgid "Error: Connection activation failed.\n"
+msgstr "Erro: Ativação da conexão falhou.\n"
+
+#: ../clients/cli/connections.c:8543
 #, 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"
 
 #. TRANSLATORS: status line in nmcli connection editor
-#: ../clients/cli/connections.c:6227
+#: ../clients/cli/connections.c:8561
 #, 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:6263
+#: ../clients/cli/connections.c:8597
 #, 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:6312
+#: ../clients/cli/connections.c:8646
 #, 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:6337 ../clients/cli/connections.c:6758
-#: ../clients/cli/connections.c:6816
+#: ../clients/cli/connections.c:8671 ../clients/cli/connections.c:9093
+#: ../clients/cli/connections.c:9151
 #, c-format
 msgid "Allowed values for '%s' property: %s\n"
 msgstr "Valores permitidos para a propriedade \"%s\": %s\n"
 
-#: ../clients/cli/connections.c:6341 ../clients/cli/connections.c:6762
-#: ../clients/cli/connections.c:6820
+#: ../clients/cli/connections.c:8675 ../clients/cli/connections.c:9097
+#: ../clients/cli/connections.c:9155
 #, c-format
 msgid "Enter '%s' value: "
 msgstr "Digite o valor de \"%s\": "
 
-#: ../clients/cli/connections.c:6356 ../clients/cli/connections.c:6378
-#: ../clients/cli/connections.c:6766 ../clients/cli/connections.c:6825
+#: ../clients/cli/connections.c:8690 ../clients/cli/connections.c:8712
+#: ../clients/cli/connections.c:9101 ../clients/cli/connections.c:9160
 #, c-format
 msgid "Error: failed to set '%s' property: %s\n"
 msgstr "Erro: falha ao definir a propriedade \"%s\": %s\n"
 
-#: ../clients/cli/connections.c:6372
+#: ../clients/cli/connections.c:8706
 #, c-format
 msgid "Edit '%s' value: "
 msgstr "Edite o valor de \"%s\": "
 
-#: ../clients/cli/connections.c:6401
+#: ../clients/cli/connections.c:8735
 #, c-format
 msgid "Error: %s\n"
 msgstr "Erro: %s\n"
 
-#: ../clients/cli/connections.c:6407 ../clients/cli/connections.c:6907
-#: ../clients/cli/connections.c:6955
+#: ../clients/cli/connections.c:8741 ../clients/cli/connections.c:9242
+#: ../clients/cli/connections.c:9290
 #, c-format
 msgid "Error: failed to remove value of '%s': %s\n"
 msgstr "Erro: falha ao remover valor de \"%s\": %s\n"
 
-#: ../clients/cli/connections.c:6428
+#: ../clients/cli/connections.c:8762
 #, c-format
 msgid "Unknown command argument: '%s'\n"
 msgstr "Argumento de comando desconhecido: \"%s\"\n"
 
-#: ../clients/cli/connections.c:6533
+#: ../clients/cli/connections.c:8867
 #, c-format
 msgid "Available settings: %s\n"
 msgstr "Configurações disponíveis: %s\n"
 
-#: ../clients/cli/connections.c:6545
+#: ../clients/cli/connections.c:8879
 #, c-format
 msgid "Error: invalid setting name; %s\n"
 msgstr "Erro: nome de configuração inválido; %s\n"
 
-#: ../clients/cli/connections.c:6562
+#: ../clients/cli/connections.c:8896
 #, c-format
 msgid "Available properties: %s\n"
 msgstr "Propriedades disponíveis: %s\n"
 
-#: ../clients/cli/connections.c:6570
+#: ../clients/cli/connections.c:8904
 #, c-format
 msgid "Error: property %s\n"
 msgstr "Erro: propriedade %s\n"
 
-#: ../clients/cli/connections.c:6611
+#: ../clients/cli/connections.c:8945
 #, c-format
 msgid ""
 "Saving the connection with 'autoconnect=yes'. That might result in an "
@@ -2952,232 +3300,233 @@ msgstr ""
 "ativação imediata da conexão.\n"
 "Você ainda deseja salvar? %s"
 
-#: ../clients/cli/connections.c:6700
+#: ../clients/cli/connections.c:9035
 #, 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:6728
+#: ../clients/cli/connections.c:9063
 #, 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:6770 ../clients/cli/connections.c:7000
+#: ../clients/cli/connections.c:9105 ../clients/cli/connections.c:9335
 #, 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:6771
+#: ../clients/cli/connections.c:9106
 #, 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:6785 ../clients/cli/connections.c:6934
-#: ../clients/cli/connections.c:7022
+#: ../clients/cli/connections.c:9120 ../clients/cli/connections.c:9269
+#: ../clients/cli/connections.c:9357
 #, 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"
 
-#: ../clients/cli/connections.c:6795
+#: ../clients/cli/connections.c:9130
 #, c-format
 msgid "Error: missing setting for '%s' property\n"
 msgstr "Erro: falta configuração para a propriedade \"%s\"\n"
 
-#: ../clients/cli/connections.c:6802
+#: ../clients/cli/connections.c:9137
 #, c-format
 msgid "Error: invalid property: %s\n"
 msgstr "Erro: propriedade inválida: %s\n"
 
-#: ../clients/cli/connections.c:6855
+#: ../clients/cli/connections.c:9190
 #, c-format
 msgid "Error: unknown setting '%s'\n"
 msgstr "Erro: definição desconhecida: \"%s\"\n"
 
-#: ../clients/cli/connections.c:6868
+#: ../clients/cli/connections.c:9203
 #, c-format
 msgid "You may edit the following properties: %s\n"
 msgstr "Você pode editar as seguintes propriedades: %s\n"
 
-#: ../clients/cli/connections.c:6912
+#: ../clients/cli/connections.c:9247
 #, 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:6931
+#: ../clients/cli/connections.c:9266
 #, 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"
 
-#: ../clients/cli/connections.c:6976
+#: ../clients/cli/connections.c:9311
 #, 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:7001
+#: ../clients/cli/connections.c:9336
 #, 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:7050
+#: ../clients/cli/connections.c:9385
 #, 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:7082
+#: ../clients/cli/connections.c:9417
 #, c-format
 msgid "Error: unknown setting: '%s'\n"
 msgstr "Erro: definição desconhecida: \"%s\"\n"
 
-#: ../clients/cli/connections.c:7087
+#: ../clients/cli/connections.c:9422
 #, 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"
 
-#: ../clients/cli/connections.c:7115
+#: ../clients/cli/connections.c:9450
 #, c-format
 msgid "Error: invalid property: %s%s\n"
 msgstr "Erro: propriedade inválida: %s%s\n"
 
-#: ../clients/cli/connections.c:7117
+#: ../clients/cli/connections.c:9452
 msgid ", neither a valid setting name"
 msgstr ", tampouco um nome de configuração válido"
 
-#: ../clients/cli/connections.c:7134
+#: ../clients/cli/connections.c:9469
 #, c-format
 msgid "Invalid verify option: %s\n"
 msgstr "Opção de verificação inválida: %s\n"
 
-#: ../clients/cli/connections.c:7142
+#: ../clients/cli/connections.c:9477
 #, c-format
 msgid "Verify setting '%s': %s\n"
 msgstr "Verificar configuração \"%s\": %s\n"
 
-#: ../clients/cli/connections.c:7157
+#: ../clients/cli/connections.c:9492
 #, c-format
 msgid "Verify connection: %s\n"
 msgstr "Verificar conexão: %s\n"
 
-#: ../clients/cli/connections.c:7160
+#: ../clients/cli/connections.c:9495
 #, c-format
 msgid "The error cannot be fixed automatically.\n"
 msgstr "O erro não pode ser corrigido automaticamente.\n"
 
-#: ../clients/cli/connections.c:7177
+#: ../clients/cli/connections.c:9512
 #, c-format
 msgid "Error: invalid argument '%s'\n"
 msgstr "Erro: argumento \"%s\" inválido\n"
 
-#: ../clients/cli/connections.c:7210
+#: ../clients/cli/connections.c:9545
 #, c-format
 msgid "Error: Failed to save '%s' (%s) connection: %s\n"
 msgstr "Erro: Falha ao salvar a conexão \"%s\" (%s): %s\n"
 
-#: ../clients/cli/connections.c:7217
+#: ../clients/cli/connections.c:9552
 #, c-format
 msgid "Connection '%s' (%s) successfully saved.\n"
 msgstr "A conexão \"%s\" (%s) foi salva com sucesso.\n"
 
-#: ../clients/cli/connections.c:7218
+#: ../clients/cli/connections.c:9553
 #, c-format
 msgid "Connection '%s' (%s) successfully updated.\n"
 msgstr "A conexão \"%s\" (%s) foi atualizada com sucesso.\n"
 
-#: ../clients/cli/connections.c:7251
+#: ../clients/cli/connections.c:9586
 #, c-format
 msgid "Error: connection verification failed: %s\n"
 msgstr "Erro: verificação de conexão falhou: %s\n"
 
-#: ../clients/cli/connections.c:7252
+#: ../clients/cli/connections.c:9587
 msgid "(unknown error)"
 msgstr "(erro desconhecido)"
 
-#: ../clients/cli/connections.c:7253
+#: ../clients/cli/connections.c:9588
 #, c-format
 msgid "You may try running 'verify fix' to fix errors.\n"
 msgstr "Você pode tentar executar \"verify fix\" para corrigir erros.\n"
 
-#: ../clients/cli/connections.c:7275
+#: ../clients/cli/connections.c:9610
 #, 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"
 
-#: ../clients/cli/connections.c:7279
+#: ../clients/cli/connections.c:9614
 #, 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:7289
+#: ../clients/cli/connections.c:9624
 #, 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:7299
+#: ../clients/cli/connections.c:9634
 #, c-format
 msgid "Error: Failed to activate '%s' (%s) connection: %s\n"
 msgstr "Erro: Falha ao ativar a conexão \"%s\" (%s): %s\n"
 
-#: ../clients/cli/connections.c:7305
+#: ../clients/cli/connections.c:9640
 #, c-format
 msgid "Monitoring connection activation (press any key to continue)\n"
 msgstr ""
 "Monitorando ativação da conexão (pressione qualquer tecla para continuar)\n"
 
-#: ../clients/cli/connections.c:7343
+#: ../clients/cli/connections.c:9678
 #, c-format
 msgid "Error: status-line: %s\n"
 msgstr "Erro: estado da linha (\"status-line\"): %s\n"
 
-#: ../clients/cli/connections.c:7351
+#: ../clients/cli/connections.c:9686
 #, c-format
 msgid "Error: save-confirmation: %s\n"
 msgstr "Erro: salvar confirmação: %s\n"
 
-#: ../clients/cli/connections.c:7359
+#: ../clients/cli/connections.c:9694
 #, c-format
 msgid "Error: show-secrets: %s\n"
 msgstr "Erro: show-secrets: %s\n"
 
-#: ../clients/cli/connections.c:7368
+#: ../clients/cli/connections.c:9703
 #, c-format
 msgid "Error: bad color: %s\n"
 msgstr "Erro: cor inválida: %s\n"
 
-#: ../clients/cli/connections.c:7382
+#: ../clients/cli/connections.c:9717
 #, c-format
 msgid "Current nmcli configuration:\n"
 msgstr "Configuração atual do nmcli:\n"
 
-#: ../clients/cli/connections.c:7392
+#: ../clients/cli/connections.c:9727
 #, c-format
 msgid "Invalid configuration option '%s'; allowed [%s]\n"
 msgstr "A opção de configuração \"%s\" é inválida; é permitido [%s]\n"
 
-#: ../clients/cli/connections.c:7593
+#: ../clients/cli/connections.c:9982
 #, c-format
 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:7605 ../clients/cli/connections.c:7788
-#: ../clients/cli/connections.c:7795 ../clients/cli/connections.c:7929
-#: ../clients/cli/connections.c:8434
+#: ../clients/cli/connections.c:9994 ../clients/cli/connections.c:10171
+#: ../clients/cli/connections.c:10178 ../clients/cli/connections.c:10306
+#: ../clients/cli/connections.c:10782
 #, c-format
 msgid "Error: Unknown connection '%s'."
 msgstr "Erro: conexão desconhecida: \"%s\"."
 
-#: ../clients/cli/connections.c:7623
+#: ../clients/cli/connections.c:10012
 #, 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:7626
+#: ../clients/cli/connections.c:10015
 #, c-format
 msgid ""
 "Warning: editing existing connection '%s'; 'con-name' argument is ignored\n"
@@ -3185,238 +3534,223 @@ msgstr ""
 "Aviso: editando a conexão existente \"%s\"; o argumento \"con-name\" é "
 "ignorado\n"
 
-#: ../clients/cli/connections.c:7640
+#: ../clients/cli/connections.c:10029
 #, c-format
 msgid "Valid connection types: %s\n"
 msgstr "Tipos de conexões válidos: %s\n"
 
-#: ../clients/cli/connections.c:7642
+#: ../clients/cli/connections.c:10031
 #, c-format
 msgid "Error: invalid connection type; %s\n"
 msgstr "Erro: tipo de conexão inválido; %s\n"
 
-#: ../clients/cli/connections.c:7681
+#: ../clients/cli/connections.c:10070
 #, c-format
 msgid "===| nmcli interactive connection editor |==="
 msgstr "===| editor interativo de conexões do nmcli |==="
 
-#: ../clients/cli/connections.c:7684
+#: ../clients/cli/connections.c:10073
 #, c-format
 msgid "Editing existing '%s' connection: '%s'"
 msgstr "Editando conexão existente \"%s\": \"%s\""
 
-#: ../clients/cli/connections.c:7686
+#: ../clients/cli/connections.c:10075
 #, c-format
 msgid "Adding a new '%s' connection"
 msgstr "Adicionando uma nova conexão \"%s\""
 
-#: ../clients/cli/connections.c:7688
+#: ../clients/cli/connections.c:10077
 #, c-format
 msgid "Type 'help' or '?' for available commands."
 msgstr "Digite \"help\" ou \"?\" para comandos disponíveis."
 
-#: ../clients/cli/connections.c:7690
+#: ../clients/cli/connections.c:10079
 #, c-format
 msgid "Type 'describe [<setting>.<prop>]' for detailed property description."
 msgstr ""
 "Digite \"describe [<definição>.<propriedade>]\" para exibir descrição "
 "detalhada da propriedade."
 
-#: ../clients/cli/connections.c:7728
+#: ../clients/cli/connections.c:10117
 #, c-format
 msgid "Error: Failed to modify connection '%s': %s"
 msgstr "Erro: Falha ao modificar a conexão \"%s\": %s"
 
-#: ../clients/cli/connections.c:7735
+#: ../clients/cli/connections.c:10124
 #, c-format
 msgid "Connection '%s' (%s) successfully modified.\n"
 msgstr "A conexão \"%s\" (%s) foi modificada com sucesso.\n"
 
-#.
-#. * TODO(?) complete "uuid", "path", "id" or connection name.
-#. * (if we ever will move this here from shell completion script)
-#. if (nmc->complete) {
-#. quit ();
-#.
-#: ../clients/cli/connections.c:7761 ../clients/cli/connections.c:7885
-#: ../clients/cli/connections.c:8280 ../clients/cli/connections.c:8399
+#: ../clients/cli/connections.c:10146 ../clients/cli/connections.c:10262
+#: ../clients/cli/connections.c:10639 ../clients/cli/connections.c:10747
 #, c-format
 msgid "Error: No arguments provided."
 msgstr "Erro: nenhum argumento foi fornecido."
 
-#: ../clients/cli/connections.c:7847
+#: ../clients/cli/connections.c:10165 ../clients/cli/connections.c:10294
+#: ../clients/cli/connections.c:10776
+#, c-format
+msgid "Error: connection ID is missing."
+msgstr "Erro: está faltando o ID da conexão."
+
+#: ../clients/cli/connections.c:10228
 #, c-format
 msgid "%s (%s) cloned as %s (%s).\n"
 msgstr "%s (%s) clonada como %s (%s).\n"
 
-#: ../clients/cli/connections.c:7883
+#: ../clients/cli/connections.c:10260
 msgid "New connection name: "
 msgstr "Nome da nova conexão: "
 
-#: ../clients/cli/connections.c:7904 ../clients/cli/connections.c:7922
+#: ../clients/cli/connections.c:10281 ../clients/cli/connections.c:10299
 #, c-format
 msgid "Error: <new name> argument is missing."
 msgstr "Erro: está faltando o argumento <novo nome>."
 
-#: ../clients/cli/connections.c:7910
+#: ../clients/cli/connections.c:10287
 #, c-format
 msgid "Error: unexpected extra argument '%s'."
 msgstr "Erro: o argumento extra \"%s\" é inesperado."
 
-#: ../clients/cli/connections.c:7917 ../clients/cli/connections.c:8428
-#, c-format
-msgid "Error: connection ID is missing."
-msgstr "Erro: está faltando o ID da conexão."
-
-#: ../clients/cli/connections.c:7979
+#: ../clients/cli/connections.c:10356
 #, c-format
 msgid "Error: not all connections deleted."
 msgstr "Erro: nem todas as conexões ativas foram excluídas."
 
-#: ../clients/cli/connections.c:7980
+#: ../clients/cli/connections.c:10357
 #, c-format
 msgid "Error: Connection deletion failed: %s"
 msgstr "Erro: a exclusão da conexão falhou: %s"
 
-#: ../clients/cli/connections.c:8046 ../clients/cli/connections.c:8179
+#: ../clients/cli/connections.c:10419 ../clients/cli/connections.c:10547
 #, c-format
 msgid "Error: unknown connection '%s'\n"
 msgstr "Erro: conexão desconhecida \"%s\"\n"
 
-#: ../clients/cli/connections.c:8060
+#: ../clients/cli/connections.c:10433
 #, c-format
 msgid "Error: no connection provided."
 msgstr "Erro: nenhuma conexão fornecida."
 
 #. truncate trailing ", "
-#: ../clients/cli/connections.c:8085
+#: ../clients/cli/connections.c:10458
 #, 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:8097
+#: ../clients/cli/connections.c:10470
 #, c-format
 msgid "%s: connection profile changed\n"
 msgstr "%s: perfil de conexão alterada\n"
 
-#: ../clients/cli/connections.c:8123
+#: ../clients/cli/connections.c:10496
 #, c-format
 msgid "%s: connection profile created\n"
 msgstr "%s: perfil de conexão criada\n"
 
-#: ../clients/cli/connections.c:8132
+#: ../clients/cli/connections.c:10505
 #, c-format
 msgid "%s: connection profile removed\n"
 msgstr "%s: perfil de conexão removida\n"
 
-#: ../clients/cli/connections.c:8180
+#: ../clients/cli/connections.c:10548
 #, c-format
 msgid "Error: not all connections found."
 msgstr "Erro: nem todas as conexões foram encontradas."
 
-#: ../clients/cli/connections.c:8205
+#: ../clients/cli/connections.c:10571
 #, c-format
 msgid "Error: failed to reload connections: %s."
 msgstr "Erro: falha ao recarregar conexões: %s."
 
-#: ../clients/cli/connections.c:8239
+#: ../clients/cli/connections.c:10603
 #, c-format
 msgid "Error: failed to load connection: %s."
 msgstr "Erro: falha ao carregar conexão: %s."
 
-#: ../clients/cli/connections.c:8247
+#: ../clients/cli/connections.c:10611
 #, c-format
 msgid "Could not load file '%s'\n"
 msgstr "Não foi possível carregar arquivo \"%s\"\n"
 
-#: ../clients/cli/connections.c:8256
+#: ../clients/cli/connections.c:10620
 msgid "File to import: "
 msgstr "Arquivo a ser importado: "
 
-#: ../clients/cli/connections.c:8296
+#: ../clients/cli/connections.c:10655
 #, c-format
 msgid "Warning: 'type' already specified, ignoring extra one.\n"
 msgstr "Aviso: \"type\" já especificado, ignorando o extra.\n"
 
-#: ../clients/cli/connections.c:8307
+#: ../clients/cli/connections.c:10666
 #, c-format
 msgid "Warning: 'file' already specified, ignoring extra one.\n"
 msgstr "Aviso: \"file\" já especificado, ignorando o extra.\n"
 
-#: ../clients/cli/connections.c:8309
+#: ../clients/cli/connections.c:10668
 #, c-format
 msgid "Unknown parameter: %s"
 msgstr "Parâmetro desconhecido: %s"
 
-#: ../clients/cli/connections.c:8319
-#, c-format
-msgid "Error: 'type' argument is required."
-msgstr "Erro: é necessário o argumento \"type\"."
-
-#: ../clients/cli/connections.c:8324
+#: ../clients/cli/connections.c:10683
 #, c-format
 msgid "Error: 'file' argument is required."
 msgstr "Erro: é necessário o argumento \"file\"."
 
-#: ../clients/cli/connections.c:8331
-#, fuzzy, c-format
-msgid "Error: failed to find VPN plugin for %s."
-msgstr "Erro: falha ao carregar plug-in VPN: %s."
-
-#: ../clients/cli/connections.c:8339 ../clients/cli/connections.c:8450
+#: ../clients/cli/connections.c:10691 ../clients/cli/connections.c:10798
 #, c-format
 msgid "Error: failed to load VPN plugin: %s."
 msgstr "Erro: falha ao carregar plug-in VPN: %s."
 
-#: ../clients/cli/connections.c:8347
+#: ../clients/cli/connections.c:10699
 #, c-format
 msgid "Error: failed to import '%s': %s."
 msgstr "Erro: falha ao importar \"%s\": %s."
 
-#: ../clients/cli/connections.c:8397
+#: ../clients/cli/connections.c:10745
 msgid "Output file name: "
 msgstr "Nome de arquivo de saída: "
 
-#: ../clients/cli/connections.c:8421
+#: ../clients/cli/connections.c:10769
 #, c-format
 msgid "Error: unknown extra argument: '%s'."
 msgstr "Erro: argumento extra desconhecida: \"%s\"."
 
-#: ../clients/cli/connections.c:8441
+#: ../clients/cli/connections.c:10789
 #, c-format
 msgid "Error: the connection is not VPN."
 msgstr "Erro: a conexão não é VPN."
 
-#: ../clients/cli/connections.c:8462
+#: ../clients/cli/connections.c:10810
 #, c-format
 msgid "Error: failed to create temporary file %s."
 msgstr "Erro: falha ao criar o arquivo temporário %s."
 
-#: ../clients/cli/connections.c:8471
+#: ../clients/cli/connections.c:10819
 #, c-format
 msgid "Error: failed to export '%s': %s."
 msgstr "Erro: falha ao exportar \"%s\": %s."
 
-#: ../clients/cli/connections.c:8482
+#: ../clients/cli/connections.c:10830
 #, c-format
 msgid "Error: failed to read temporary file '%s': %s."
 msgstr "Erro: falha ao ler o arquivo temporário \"%s\": %s."
 
-#: ../clients/cli/connections.c:8628
+#: ../clients/cli/connections.c:10976
 #, c-format
 msgid "incorrect string '%s' of '--order' option"
 msgstr "string incorreta \"%s\" da opção \"--order\""
 
-#: ../clients/cli/connections.c:8654
+#: ../clients/cli/connections.c:11002
 #, c-format
 msgid "incorrect item '%s' in '--order' option"
 msgstr "item incorreto \"%s\" na opção \"--order\""
 
-#: ../clients/cli/connections.c:8740
+#: ../clients/cli/connections.c:11089
 msgid "'--order' argument is missing"
 msgstr "o argumento \"--order\" está faltando"
 
-#: ../clients/cli/connections.c:8816
+#: ../clients/cli/connections.c:11154
 #, c-format
 msgid "Error: '%s' is not valid 'connection' command."
 msgstr "Erro: \"%s\" não é um comando de \"connection\" válido."
@@ -3561,7 +3895,7 @@ msgid "S390-SUBCHANNELS"
 msgstr "SUBCANAIS-S390"
 
 #. 0
-#: ../clients/cli/devices.c:121 ../clients/cli/devices.c:741
+#: ../clients/cli/devices.c:121 ../clients/cli/devices.c:731
 msgid "WEP"
 msgstr "WEP"
 
@@ -3571,7 +3905,7 @@ msgid "WPA"
 msgstr "WPA"
 
 #. 2
-#: ../clients/cli/devices.c:123 ../clients/cli/devices.c:749
+#: ../clients/cli/devices.c:123 ../clients/cli/devices.c:739
 msgid "WPA2"
 msgstr "WPA2"
 
@@ -3587,7 +3921,7 @@ msgstr "CCMP"
 
 #. 5
 #. 2
-#: ../clients/cli/devices.c:126 ../clients/cli/devices.c:238
+#: ../clients/cli/devices.c:126 ../clients/cli/devices.c:228
 msgid "AP"
 msgstr "AP"
 
@@ -3631,6 +3965,11 @@ msgstr "TX-POW"
 msgid "BSID"
 msgstr "BSID"
 
+#. 0
+#: ../clients/cli/devices.c:151 ../clients/tui/nmt-page-wifi.c:224
+msgid "SSID"
+msgstr "SSID"
+
 #. 1
 #: ../clients/cli/devices.c:152
 msgid "SSID-HEX"
@@ -3694,154 +4033,141 @@ msgstr "*"
 
 #. 0
 #. 5
-#: ../clients/cli/devices.c:177 ../clients/cli/devices.c:241
+#: ../clients/cli/devices.c:177 ../clients/cli/devices.c:231
 msgid "NSP"
 msgstr "NSP"
 
 #. 0
-#: ../clients/cli/devices.c:192 ../clients/cli/devices.c:201
+#: ../clients/cli/devices.c:192
 msgid "SLAVES"
 msgstr "ESCRAVOS"
 
-#. 1
-#: ../clients/cli/devices.c:202
-msgid "CONFIG"
-msgstr ""
-
 #. 0
-#: ../clients/cli/devices.c:211
+#: ../clients/cli/devices.c:201
 msgid "PARENT"
 msgstr "PAI"
 
 #. 1
-#: ../clients/cli/devices.c:212
+#: ../clients/cli/devices.c:202
 msgid "ID"
 msgstr "ID"
 
 #. 0
-#: ../clients/cli/devices.c:221 ../clients/cli/devices.c:236
+#: ../clients/cli/devices.c:211 ../clients/cli/devices.c:226
 msgid "CAPABILITIES"
 msgstr "CAPACIDADES"
 
 #. 1
-#: ../clients/cli/devices.c:237
+#: ../clients/cli/devices.c:227
 msgid "WIFI-PROPERTIES"
 msgstr "PROPRIEDADES-WI-FI"
 
 #. 3
-#: ../clients/cli/devices.c:239
+#: ../clients/cli/devices.c:229
 msgid "WIRED-PROPERTIES"
 msgstr "PROPRIEDADES-CABO"
 
 #. 4
-#: ../clients/cli/devices.c:240
+#: ../clients/cli/devices.c:230
 msgid "WIMAX-PROPERTIES"
 msgstr "PROPRIEDADES-WIMAX"
 
 #. 10
-#: ../clients/cli/devices.c:246 ../clients/tui/nmt-page-bond.c:351
+#: ../clients/cli/devices.c:236 ../clients/tui/nmt-page-bond.c:351
 msgid "BOND"
 msgstr "VÍNCULO"
 
 #. 11
-#: ../clients/cli/devices.c:247 ../clients/tui/nmt-page-team.c:145
+#: ../clients/cli/devices.c:237 ../clients/tui/nmt-page-team.c:145
 msgid "TEAM"
 msgstr "UNIÃO"
 
 #. 12
-#: ../clients/cli/devices.c:248 ../clients/tui/nmt-page-bridge.c:74
+#: ../clients/cli/devices.c:238 ../clients/tui/nmt-page-bridge.c:74
 msgid "BRIDGE"
 msgstr "PONTE"
 
-#. 13
-#: ../clients/cli/devices.c:249 ../clients/tui/nm-editor-utils.c:217
-#: ../clients/tui/nmt-page-vlan.c:94 ../libnm-core/nm-connection.c:1746
-#: ../libnm-glib/nm-device.c:1879 ../libnm-util/nm-connection.c:1632
-#: ../libnm/nm-device.c:1830
-msgid "VLAN"
-msgstr "VLAN"
-
 #. 14
-#: ../clients/cli/devices.c:250
+#: ../clients/cli/devices.c:240
 msgid "BLUETOOTH"
 msgstr "BLUETOOTH"
 
 #. 15
-#: ../clients/cli/devices.c:251
+#: ../clients/cli/devices.c:241
 msgid "CONNECTIONS"
 msgstr "CONEXÕES"
 
 #. 1
-#: ../clients/cli/devices.c:263
+#: ../clients/cli/devices.c:253
 msgid "CHASSIS-ID"
 msgstr "ID-CHASSIS"
 
 #. 2
-#: ../clients/cli/devices.c:264
+#: ../clients/cli/devices.c:254
 msgid "PORT-ID"
 msgstr "ID-PORTA"
 
 #. 3
-#: ../clients/cli/devices.c:265
+#: ../clients/cli/devices.c:255
 msgid "PORT-DESCRIPTION"
 msgstr "DESCRIÇÃO-PORTA"
 
 #. 4
-#: ../clients/cli/devices.c:266
+#: ../clients/cli/devices.c:256
 msgid "SYSTEM-NAME"
 msgstr "NOME-SISTEMA"
 
 #. 5
-#: ../clients/cli/devices.c:267
+#: ../clients/cli/devices.c:257
 msgid "SYSTEM-DESCRIPTION"
 msgstr "DESCRIÇÃO-SISTEMA"
 
 #. 6
-#: ../clients/cli/devices.c:268
+#: ../clients/cli/devices.c:258
 msgid "SYSTEM-CAPABILITIES"
 msgstr "CAPACIDADES-SISTEMA"
 
 #. 7
-#: ../clients/cli/devices.c:269
+#: ../clients/cli/devices.c:259
 msgid "IEEE-802-1-PVID"
 msgstr "PVID-IEEE-802-1"
 
 #. 8
-#: ../clients/cli/devices.c:270
+#: ../clients/cli/devices.c:260
 msgid "IEEE-802-1-PPVID"
 msgstr "PPVID-IEEE-802-1"
 
 #. 9
-#: ../clients/cli/devices.c:271
+#: ../clients/cli/devices.c:261
 msgid "IEEE-802-1-PPVID-FLAGS"
 msgstr "PPVID-SINALIZADORES-IEEE-802-1"
 
 #. 10
-#: ../clients/cli/devices.c:272
+#: ../clients/cli/devices.c:262
 msgid "IEEE-802-1-VID"
 msgstr "VID-IEEE-802-1"
 
 #. 11
-#: ../clients/cli/devices.c:273
+#: ../clients/cli/devices.c:263
 msgid "IEEE-802-1-VLAN-NAME"
 msgstr "VLAN-NOME-IEEE-802-1"
 
 #. 12
-#: ../clients/cli/devices.c:274
+#: ../clients/cli/devices.c:264
 msgid "DESTINATION"
 msgstr "DESTINAÇÃO"
 
 #. 13
-#: ../clients/cli/devices.c:275
+#: ../clients/cli/devices.c:265
 msgid "CHASSIS-ID-TYPE"
 msgstr "TIPO-ID-CHASSIS"
 
 #. 14
-#: ../clients/cli/devices.c:276
+#: ../clients/cli/devices.c:266
 msgid "PORT-ID-TYPE"
 msgstr "TIPO-ID-PORTA"
 
-#: ../clients/cli/devices.c:293
+#: ../clients/cli/devices.c:283
 #, c-format
 msgid ""
 "Usage: nmcli device { COMMAND | help }\n"
@@ -3857,7 +4183,7 @@ msgid ""
 "\n"
 "  connect <ifname>\n"
 "\n"
-"  reapply <ifname>\n"
+"  reapply <ifname> ...\n"
 "\n"
 "  disconnect <ifname> ...\n"
 "\n"
@@ -3893,7 +4219,7 @@ msgstr ""
 "\n"
 "  connect <nome-if>\n"
 "\n"
-"  reapply <nome-if>\n"
+"  reapply <nome-if> ...\n"
 "\n"
 "  disconnect <nome-if> ...\n"
 "\n"
@@ -3908,15 +4234,15 @@ msgstr ""
 "                         [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"
+"  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:315
+#: ../clients/cli/devices.c:305
 #, c-format
 msgid ""
 "Usage: nmcli device status { help }\n"
@@ -3927,10 +4253,8 @@ msgid ""
 " TYPE       - device type\n"
 " STATE      - device state\n"
 " CONNECTION - connection activated on device (if any)\n"
-"Displayed columns can be changed using '--fields' global option. 'status' "
-"is\n"
-"the default command, which means 'nmcli device' calls 'nmcli device "
-"status'.\n"
+"Displayed columns can be changed using '--fields' global option. 'status' is\n"
+"the default command, which means 'nmcli device' calls 'nmcli device status'.\n"
 "\n"
 msgstr ""
 "Uso: nmcli device status { help }\n"
@@ -3941,13 +4265,13 @@ msgstr ""
 " 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"
+"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:330
+#: ../clients/cli/devices.c:320
 #, c-format
 msgid ""
 "Usage: nmcli device show { ARGUMENTS | help }\n"
@@ -3967,7 +4291,7 @@ msgstr ""
 "dispositivos dados.\n"
 "\n"
 
-#: ../clients/cli/devices.c:341
+#: ../clients/cli/devices.c:331
 #, c-format
 msgid ""
 "Usage: nmcli device connect { ARGUMENTS | help }\n"
@@ -3975,8 +4299,8 @@ msgid ""
 "ARGUMENTS := <ifname>\n"
 "\n"
 "Connect the device.\n"
-"NetworkManager will try to find a suitable connection that will be "
-"activated.\n"
+"NetworkManager will try to find a suitable connection that will be activated."
+"\n"
 "It will also consider connections that are not set to auto-connect.\n"
 "\n"
 msgstr ""
@@ -3986,16 +4310,15 @@ msgstr ""
 "\n"
 "Conecta o dispositivo.\n"
 "NetworkManager tentará encontrar uma conexão adequada que será ativada.\n"
-"Também irá considerar conexões que não sejam configuradas para auto-"
-"connect.\n"
+"Também irá considerar conexões que não sejam configuradas para auto-connect.\n"
 "\n"
 
-#: ../clients/cli/devices.c:353
+#: ../clients/cli/devices.c:343
 #, c-format
 msgid ""
 "Usage: nmcli device reapply { ARGUMENTS | help }\n"
 "\n"
-"ARGUMENTS := <ifname>\n"
+"ARGUMENTS := <ifname> ...\n"
 "\n"
 "Attempts to update device with changes to the currently active connection\n"
 "made since it was last applied.\n"
@@ -4003,13 +4326,13 @@ msgid ""
 msgstr ""
 "Uso: nmcli device reapply { ARGUMENTOS | help }\n"
 "\n"
-"ARGUMENTOS := <nome-if>\n"
+"ARGUMENTOS := <nome-if> ...\n"
 "\n"
 "Tenta atualizar o dispositivo com as alterações à conexão atualmente ativa\n"
 "feitas desde a última aplicação.\n"
 "\n"
 
-#: ../clients/cli/devices.c:364
+#: ../clients/cli/devices.c:354
 #, c-format
 msgid ""
 "Usage: nmcli device disconnect { ARGUMENTS | help }\n"
@@ -4030,7 +4353,7 @@ msgstr ""
 "conexões futuras sem a intervenção do usuário/manual.\n"
 "\n"
 
-#: ../clients/cli/devices.c:376
+#: ../clients/cli/devices.c:366
 #, c-format
 msgid ""
 "Usage: nmcli device delete { ARGUMENTS | help }\n"
@@ -4053,7 +4376,7 @@ msgstr ""
 "ser excluído por este comando.\n"
 "\n"
 
-#: ../clients/cli/devices.c:389
+#: ../clients/cli/devices.c:379
 #, c-format
 msgid ""
 "Usage: nmcli device set { ARGUMENTS | help }\n"
@@ -4076,7 +4399,7 @@ msgstr ""
 "Modifica as propriedades do dispositivo.\n"
 "\n"
 
-#: ../clients/cli/devices.c:402
+#: ../clients/cli/devices.c:392
 #, c-format
 msgid ""
 "Usage: nmcli device monitor { ARGUMENTS | help }\n"
@@ -4097,7 +4420,7 @@ msgstr ""
 "Monitora todos os perfis de conexão no caso de nenhuma ser especificada.\n"
 "\n"
 
-#: ../clients/cli/devices.c:414
+#: ../clients/cli/devices.c:404
 #, c-format
 msgid ""
 "Usage: nmcli device wifi { ARGUMENTS | help }\n"
@@ -4109,8 +4432,8 @@ msgid ""
 "List available Wi-Fi access points. The 'ifname' and 'bssid' options can be\n"
 "used to list APs for a particular interface, or with a specific BSSID.\n"
 "\n"
-"ARGUMENTS := connect <(B)SSID> [password <password>] [wep-key-type key|"
-"phrase] [ifname <ifname>]\n"
+"ARGUMENTS := connect <(B)SSID> [password <password>] [wep-key-type "
+"key|phrase] [ifname <ifname>]\n"
 "                    [bssid <BSSID>] [name <name>] [private yes|no] [hidden "
 "yes|no]\n"
 "\n"
@@ -4139,10 +4462,8 @@ msgid ""
 "\n"
 "ARGUMENTS := rescan [ifname <ifname>] [[ssid <SSID to scan>] ...]\n"
 "\n"
-"Request that NetworkManager immediately re-scan for available access "
-"points.\n"
-"NetworkManager scans Wi-Fi networks periodically, but in some cases it "
-"might\n"
+"Request that NetworkManager immediately re-scan for available access points.\n"
+"NetworkManager scans Wi-Fi networks periodically, but in some cases it might\n"
 "be useful to start scanning manually. 'ssid' allows scanning for a specific\n"
 "SSID, which is useful for APs with hidden SSIDs. More 'ssid' parameters can "
 "be\n"
@@ -4156,13 +4477,12 @@ msgstr ""
 "\n"
 "ARGUMENTOS := [list [ifname <nome-if>] [bssid <BSSID>]]\n"
 "\n"
-"Lista pontos de acesso de Wi-Fi disponíveis. As opções \"ifname\" e \"bssid"
-"\"\n"
+"Lista pontos de acesso de Wi-Fi disponíveis. As opções \"ifname\" e "
+"\"bssid\"\n"
 "podem ser usadas para listar APs para uma interface específica, ou com um\n"
 "BSSID específico.\n"
 "\n"
-"ARGUMENTOS := connect <(B)SSID> [password <senha>] [wep-key-type key|"
-"phrase]\n"
+"ARGUMENTOS := connect <(B)SSID> [password <senha>] [wep-key-type key|phrase]\n"
 "                       [ifname <nome-if>] [bssid <BSSID>] [name <nome>]\n"
 "                       [private yes|no]\n"
 "\n"
@@ -4170,8 +4490,7 @@ msgstr ""
 "nova conexão e então ativa-a em um dispositivo. Isto é um parceiro de linha\n"
 "de comando para clicar um SSID em um cliente GUI. O comando sempre cria uma\n"
 "nova conexão e então é útil principalmente para conectar à novas rede Wi-Fi\n"
-"se uma conexão para a rede já existe, é melhor traga o perfil existente "
-"como\n"
+"se uma conexão para a rede já existe, é melhor traga o perfil existente como\n"
 "se segue: nmcli con up id <name>. Note que somente as redes abertas WEP e\n"
 "WPA-PSK são suportadas no momento. Presume-se também que a configuração IP\n"
 "seja obtida via DHCP.\n"
@@ -4205,15 +4524,14 @@ msgstr ""
 "os APs, use 'nmcli device wifi list' para isto.\n"
 "\n"
 
-#: ../clients/cli/devices.c:461
+#: ../clients/cli/devices.c:451
 #, c-format
 msgid ""
 "Usage: nmcli device lldp { ARGUMENTS | help }\n"
 "\n"
 "ARGUMENTS := [list [ifname <ifname>]]\n"
 "\n"
-"List neighboring devices discovered through LLDP. The 'ifname' option can "
-"be\n"
+"List neighboring devices discovered through LLDP. The 'ifname' option can be\n"
 "used to list neighbors for a particular interface.\n"
 "\n"
 msgstr ""
@@ -4221,281 +4539,275 @@ msgstr ""
 "\n"
 "ARGUMENTOS := [list [ifname <nome-if>] [nsp <nome>]]\n"
 "\n"
-"Lista dispositivos vizinhos descobertos por meio de LLDP. A opção \"ifname"
-"\"\n"
+"Lista dispositivos vizinhos descobertos por meio de LLDP. A opção \"ifname\"\n"
 "pode ser usada para listar vizinhos de uma interface específica.\n"
 "\n"
 
-#: ../clients/cli/devices.c:537 ../clients/cli/devices.c:1756
-#: ../clients/cli/devices.c:1765 ../clients/cli/devices.c:1956
-#: ../clients/cli/devices.c:2161 ../clients/cli/devices.c:2168
+#: ../clients/cli/devices.c:527 ../clients/cli/devices.c:1676
+#: ../clients/cli/devices.c:1685 ../clients/cli/devices.c:1879
+#: ../clients/cli/devices.c:2103 ../clients/cli/devices.c:2110
 #, c-format
 msgid "Error: No interface specified."
 msgstr "Erro: Nenhuma interface especificada."
 
-#: ../clients/cli/devices.c:557
+#: ../clients/cli/devices.c:547 ../clients/cli/devices.c:1899
 #, c-format
 msgid "Warning: argument '%s' is duplicated.\n"
 msgstr "Aviso: o argumento \"%s\" está duplicado.\n"
 
-#: ../clients/cli/devices.c:559
+#: ../clients/cli/devices.c:549 ../clients/cli/devices.c:1901
 #, c-format
 msgid "Error: Device '%s' not found.\n"
 msgstr "Erro: Dispositivo \"%s\" não encontrado.\n"
 
-#: ../clients/cli/devices.c:560
+#: ../clients/cli/devices.c:550 ../clients/cli/devices.c:1902
 #, c-format
 msgid "Error: not all devices found."
 msgstr "Erro: nenhum todos dispositivos encontrados."
 
-#: ../clients/cli/devices.c:660 ../clients/cli/devices.c:811
+#: ../clients/cli/devices.c:650 ../clients/cli/devices.c:801
 msgid "(none)"
 msgstr "(nenhum(a))"
 
-#: ../clients/cli/devices.c:729
+#: ../clients/cli/devices.c:719
 #, c-format
 msgid "%u MHz"
 msgstr "%u MHz"
 
-#: ../clients/cli/devices.c:730
+#: ../clients/cli/devices.c:720
 #, c-format
 msgid "%u Mbit/s"
 msgstr "%u Mbit/s"
 
-#: ../clients/cli/devices.c:745
+#: ../clients/cli/devices.c:735
 msgid "WPA1"
 msgstr "WPA1"
 
-#: ../clients/cli/devices.c:754
+#: ../clients/cli/devices.c:744
 msgid "802.1X"
 msgstr "802.1X"
 
-#: ../clients/cli/devices.c:770
+#: ../clients/cli/devices.c:760
 msgid "Ad-Hoc"
 msgstr "Ad-Hoc"
 
-#: ../clients/cli/devices.c:771
+#: ../clients/cli/devices.c:761
 msgid "Infra"
 msgstr "Infra"
 
-#: ../clients/cli/devices.c:772
+#: ../clients/cli/devices.c:762
 msgid "N/A"
 msgstr "N/A"
 
-#: ../clients/cli/devices.c:996
+#: ../clients/cli/devices.c:916
 msgid "Device details"
 msgstr "Detalhes do dispositivo"
 
-#: ../clients/cli/devices.c:1008
+#: ../clients/cli/devices.c:928
 #, c-format
 msgid "Error: 'device show': %s"
 msgstr "Erro: \"device show\": %s"
 
-#: ../clients/cli/devices.c:1060 ../clients/cli/devices.c:1063
+#: ../clients/cli/devices.c:980 ../clients/cli/devices.c:983
 msgid "(unknown)"
 msgstr "(desconhecido)"
 
-#: ../clients/cli/devices.c:1104
+#: ../clients/cli/devices.c:1024
 #, c-format
 msgid "%u Mb/s"
 msgstr "%u Mb/s"
 
-#: ../clients/cli/devices.c:1195
+#: ../clients/cli/devices.c:1115
 msgid "on"
 msgstr "ligado"
 
-#: ../clients/cli/devices.c:1195
+#: ../clients/cli/devices.c:1115
 msgid "off"
 msgstr "desligado"
 
-#: ../clients/cli/devices.c:1422
+#: ../clients/cli/devices.c:1342
 #, c-format
 msgid "Error: 'device status': %s"
 msgstr "Erro: \"device status\": %s"
 
 #. Add headers
-#: ../clients/cli/devices.c:1429
+#: ../clients/cli/devices.c:1349
 msgid "Status of devices"
 msgstr "Status dos dispositivos"
 
-#: ../clients/cli/devices.c:1460 ../clients/cli/devices.c:3570
+#: ../clients/cli/devices.c:1380 ../clients/cli/devices.c:3509
 #, c-format
 msgid "Error: invalid extra argument '%s'."
 msgstr "Erro: Argumento extra \"%s\" inválido."
 
-#: ../clients/cli/devices.c:1477 ../clients/cli/devices.c:1787
-#: ../clients/cli/devices.c:2184 ../clients/cli/devices.c:2454
-#: ../clients/cli/devices.c:3609
+#: ../clients/cli/devices.c:1397 ../clients/cli/devices.c:1707
+#: ../clients/cli/devices.c:2126 ../clients/cli/devices.c:2396
+#: ../clients/cli/devices.c:3548
 #, c-format
 msgid "Error: Device '%s' not found."
 msgstr "Erro: Dispositivo \"%s\" não localizado."
 
-#: ../clients/cli/devices.c:1555
+#: ../clients/cli/devices.c:1475
 #, c-format
 msgid "Device '%s' successfully activated with '%s'.\n"
 msgstr "Dispositivo \"%s\" ativado com sucesso com \"%s\".\n"
 
-#: ../clients/cli/devices.c:1561
+#: ../clients/cli/devices.c:1481
 #, 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:1597
+#: ../clients/cli/devices.c:1517
 #, 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:1600
+#: ../clients/cli/devices.c:1520
 #, 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:1610
+#: ../clients/cli/devices.c:1530
 #, c-format
 msgid "Error: Failed to setup a Wi-Fi hotspot"
 msgstr "Erro: Falha ao definir um hotspot Wi-Fi"
 
-#: ../clients/cli/devices.c:1612
+#: ../clients/cli/devices.c:1532
 #, 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:1624
+#: ../clients/cli/devices.c:1544
 #, 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"
 
-#: ../clients/cli/devices.c:1627
+#: ../clients/cli/devices.c:1547
 #, c-format
 msgid "Hotspot '%s' activated on device '%s'\n"
 msgstr "Hotspot \"%s\" ativado no dispositivo \"%s\"\n"
 
-#: ../clients/cli/devices.c:1691
+#: ../clients/cli/devices.c:1611
 #, c-format
 msgid "Error: Device activation failed: %s"
 msgstr "Erro: Ativação do dispositivo falhou: %s"
 
-#: ../clients/cli/devices.c:1700
+#: ../clients/cli/devices.c:1620
 #, 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:1715
+#: ../clients/cli/devices.c:1635
 #, c-format
 msgid "Device '%s' has been connected.\n"
 msgstr "O dispositivo \"%s\" foi conectado.\n"
 
-#: ../clients/cli/devices.c:1771
+#: ../clients/cli/devices.c:1691
 #, c-format
 msgid "Error: extra argument not allowed: '%s'."
 msgstr "Erro: argumento extra não permitido: \"%s\"."
 
-#: ../clients/cli/devices.c:1856 ../clients/cli/devices.c:1871
-#: ../clients/cli/devices.c:2022
+#: ../clients/cli/devices.c:1776 ../clients/cli/devices.c:1791
+#: ../clients/cli/devices.c:1964
 #, c-format
 msgid "Device '%s' successfully disconnected.\n"
 msgstr "Dispositivo \"%s\" desconectado com sucesso.\n"
 
-#: ../clients/cli/devices.c:1859
+#: ../clients/cli/devices.c:1779
 #, c-format
 msgid "Device '%s' successfully removed.\n"
 msgstr "Dispositivo \"%s\" removido com sucesso.\n"
 
-#: ../clients/cli/devices.c:1918
+#: ../clients/cli/devices.c:1838
 #, 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"
+msgid "Error: not all connections reapplied."
+msgstr "Erro: nem todas as conexões foram reaplicadas."
 
-#: ../clients/cli/devices.c:1928
+#: ../clients/cli/devices.c:1839
 #, c-format
-msgid "Connection successfully reapplied to device '%s'.\n"
-msgstr "Conexão reaplicada com sucesso no dispositivo \"%s\".\n"
+msgid "Error: Reapplying connection to device '%s' (%s) failed: %s\n"
+msgstr "Erro: a reaplicação da conexão no dispositivo \"%s\" (%s) falhou: %s\n"
 
-#: ../clients/cli/devices.c:1965
+#: ../clients/cli/devices.c:1849
 #, c-format
-msgid "Error: unsupported argument '%s'."
-msgstr "Erro: argumento \"%s\" sem suporte."
+msgid "Connection successfully reapplied to device '%s'.\n"
+msgstr "Conexão reaplicada com sucesso no dispositivo \"%s\".\n"
 
-#: ../clients/cli/devices.c:1979
+#: ../clients/cli/devices.c:1912
 #, c-format
-msgid "Error: device '%s' not found."
-msgstr "Erro: dispositivo \"%s\" não localizado."
+msgid "Error: no valid device provided."
+msgstr "Erro: nem todos os dispositivos fornecidos."
 
-#: ../clients/cli/devices.c:2007
+#: ../clients/cli/devices.c:1949
 #, c-format
 msgid "Error: not all devices disconnected."
 msgstr "Erro: nem todos os dispositivos foram desconectados."
 
-#: ../clients/cli/devices.c:2008
+#: ../clients/cli/devices.c:1950
 #, c-format
 msgid "Error: Device '%s' (%s) disconnecting failed: %s\n"
 msgstr "Erro: a desconexão do dispositivo \"%s\" (%s) falhou: %s\n"
 
-#: ../clients/cli/devices.c:2083
+#: ../clients/cli/devices.c:2025
 #, c-format
 msgid "Error: not all devices deleted."
 msgstr "Erro: nem todos os dispositivos foram excluídos."
 
-#: ../clients/cli/devices.c:2084
+#: ../clients/cli/devices.c:2026
 #, c-format
 msgid "Error: Device '%s' (%s) deletion failed: %s\n"
 msgstr "Erro: a exclusão do dispositivo \"%s\" (%s) falhou: %s\n"
 
-#: ../clients/cli/devices.c:2190
+#: ../clients/cli/devices.c:2132
 #, c-format
 msgid "Error: No property specified."
 msgstr "Erro: nenhuma conexão especificada."
 
-#: ../clients/cli/devices.c:2202 ../clients/cli/devices.c:2217
+#: ../clients/cli/devices.c:2144 ../clients/cli/devices.c:2159
 #, c-format
 msgid "Error: '%s' argument is missing."
 msgstr "Erro: está faltando o argumento %s."
 
-#: ../clients/cli/devices.c:2207
+#: ../clients/cli/devices.c:2149
 #, c-format
 msgid "Error: 'managed': %s."
 msgstr "Erro: \"managed\": %s."
 
-#: ../clients/cli/devices.c:2222
-#, c-format
-msgid "Error: 'autoconnect': %s."
-msgstr "Erro: \"autoconnect\": %s."
-
-#: ../clients/cli/devices.c:2232
+#: ../clients/cli/devices.c:2174
 #, c-format
 msgid "Error: property '%s' is not known."
 msgstr "Erro: propriedade \"%s\" não é conhecida."
 
-#: ../clients/cli/devices.c:2278
+#: ../clients/cli/devices.c:2220
 #, c-format
 msgid "%s: using connection '%s'\n"
 msgstr "%s: usando a conexão \"%s\"\n"
 
-#: ../clients/cli/devices.c:2304
+#: ../clients/cli/devices.c:2246
 #, c-format
 msgid "%s: device created\n"
 msgstr "%s: dispositivo criado\n"
 
-#: ../clients/cli/devices.c:2311
+#: ../clients/cli/devices.c:2253
 #, c-format
 msgid "%s: device removed\n"
 msgstr "%s: dispositivo removido\n"
 
-#: ../clients/cli/devices.c:2397
+#: ../clients/cli/devices.c:2339
 msgid "Wi-Fi scan list"
 msgstr "Lista de varredura de redes sem fio (Wi-Fi)"
 
-#: ../clients/cli/devices.c:2435
+#: ../clients/cli/devices.c:2377
 #, c-format
 msgid "Error: 'device wifi': %s"
 msgstr "Erro: \"device wifi\": %s"
 
-#: ../clients/cli/devices.c:2477 ../clients/cli/devices.c:2561
+#: ../clients/cli/devices.c:2419 ../clients/cli/devices.c:2500
 #, 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:2504
+#: ../clients/cli/devices.c:2446
 #, c-format
 msgid ""
 "Error: Device '%s' was not recognized as a Wi-Fi device, check "
@@ -4504,27 +4816,27 @@ msgstr ""
 "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:2508 ../clients/cli/devices.c:2841
-#: ../clients/cli/devices.c:3261 ../clients/cli/devices.c:3410
+#: ../clients/cli/devices.c:2448 ../clients/cli/devices.c:2780
+#: ../clients/cli/devices.c:3200 ../clients/cli/devices.c:3349
 #, c-format
 msgid "Error: Device '%s' is not a Wi-Fi device."
 msgstr "Erro: o dispositivo \"%s\" não é um dispositivo Wi-Fi."
 
-#: ../clients/cli/devices.c:2721
+#: ../clients/cli/devices.c:2660
 msgid "SSID or BSSID: "
 msgstr "SSID ou BSSID: "
 
-#: ../clients/cli/devices.c:2726
+#: ../clients/cli/devices.c:2665
 #, c-format
 msgid "Error: SSID or BSSID are missing."
 msgstr "Erro: SSID ou BSSID estão faltando."
 
-#: ../clients/cli/devices.c:2750
+#: ../clients/cli/devices.c:2689
 #, 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."
 
-#: ../clients/cli/devices.c:2774
+#: ../clients/cli/devices.c:2713
 #, c-format
 msgid ""
 "Error: wep-key-type argument value '%s' is invalid, use 'key' or 'phrase'."
@@ -4532,43 +4844,43 @@ msgstr ""
 "Erro: o valor do argumento wep-key-type \"%s\" é inválido, utilize \"key\" "
 "ou \"phrase\"."
 
-#: ../clients/cli/devices.c:2794 ../clients/cli/devices.c:2807
+#: ../clients/cli/devices.c:2733 ../clients/cli/devices.c:2746
 #, c-format
 msgid "Error: %s: %s."
 msgstr "Erro: %s: %s."
 
-#: ../clients/cli/devices.c:2822
+#: ../clients/cli/devices.c:2761
 #, 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:2828
+#: ../clients/cli/devices.c:2767
 #, c-format
 msgid "Error: Parameter '%s' is neither SSID nor BSSID."
 msgstr "Erro: o parâmetro \"%s\" não é SSID nem BSSID."
 
-#: ../clients/cli/devices.c:2843 ../clients/cli/devices.c:3263
-#: ../clients/cli/devices.c:3412
+#: ../clients/cli/devices.c:2782 ../clients/cli/devices.c:3202
+#: ../clients/cli/devices.c:3351
 #, c-format
 msgid "Error: No Wi-Fi device found."
 msgstr "Erro: nenhum dispositivo Wi-Fi encontrado."
 
-#: ../clients/cli/devices.c:2863
+#: ../clients/cli/devices.c:2802
 #, c-format
 msgid "Error: Failed to scan hidden SSID: %s."
 msgstr "Erro: falha ao scanear SSID oculto: %s."
 
-#: ../clients/cli/devices.c:2888
+#: ../clients/cli/devices.c:2827
 #, c-format
 msgid "Error: No network with SSID '%s' found."
 msgstr "Erro: nenhuma rede com SSID \"%s\" foi encontrada."
 
-#: ../clients/cli/devices.c:2890
+#: ../clients/cli/devices.c:2829
 #, c-format
 msgid "Error: No access point with BSSID '%s' found."
 msgstr "Erro: nenhum ponto de acesso com BSSID \"%s\" encontrado."
 
-#: ../clients/cli/devices.c:2932
+#: ../clients/cli/devices.c:2871
 #, c-format
 msgid ""
 "Warning: '%s' should be SSID for hidden APs; but it looks like a BSSID.\n"
@@ -4576,166 +4888,166 @@ msgstr ""
 "Aviso: \"%s\" deveria ser SSID para APs ocultos, mas ele se parece com um "
 "BSSID.\n"
 
-#: ../clients/cli/devices.c:2946
+#: ../clients/cli/devices.c:2885
 msgid "Password: "
 msgstr "Senha: "
 
-#: ../clients/cli/devices.c:3095
+#: ../clients/cli/devices.c:3034
 #, c-format
 msgid "'%s' is not valid WPA PSK"
 msgstr "\"%s\" não é um WPA PSK válido"
 
-#: ../clients/cli/devices.c:3112
+#: ../clients/cli/devices.c:3051
 #, 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)"
 
-#: ../clients/cli/devices.c:3128
+#: ../clients/cli/devices.c:3067
 #, c-format
 msgid "Hotspot password: %s\n"
 msgstr "Senha do hotspot: %s\n"
 
-#: ../clients/cli/devices.c:3186
+#: ../clients/cli/devices.c:3125
 #, c-format
 msgid "Error: ssid is too long."
 msgstr "Erro: ssid grande demais."
 
-#: ../clients/cli/devices.c:3198
+#: ../clients/cli/devices.c:3137
 #, 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:3222
+#: ../clients/cli/devices.c:3161
 #, c-format
 msgid "Error: Unknown parameter %s."
 msgstr "Erro: parâmetro desconhecido %s."
 
-#: ../clients/cli/devices.c:3241
+#: ../clients/cli/devices.c:3180
 #, c-format
 msgid "Error: channel requires band too."
 msgstr "Erro: canal necessita de banda também."
 
-#: ../clients/cli/devices.c:3247
+#: ../clients/cli/devices.c:3186
 #, c-format
 msgid "Error: channel '%s' not valid for band '%s'."
 msgstr "Erro: canal \"%s\" não válido para banda \"%s\"."
 
-#: ../clients/cli/devices.c:3275
+#: ../clients/cli/devices.c:3214
 #, 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."
 
-#: ../clients/cli/devices.c:3310
+#: ../clients/cli/devices.c:3249
 #, c-format
 msgid "Error: Invalid 'password': %s."
 msgstr "Erro: \"password\" inválida: %s."
 
-#: ../clients/cli/devices.c:3379
+#: ../clients/cli/devices.c:3318
 #, c-format
 msgid "Error: '%s' cannot repeat."
 msgstr "Erro: \"%s\" não pode repetir."
 
-#: ../clients/cli/devices.c:3460
+#: ../clients/cli/devices.c:3399
 #, c-format
 msgid "Error: 'device wifi' command '%s' is not valid."
 msgstr "Erro: o comando \"%s\" de \"device wifi\" não é válido."
 
 #. Main header name
-#: ../clients/cli/devices.c:3486
+#: ../clients/cli/devices.c:3425
 msgid "Device LLDP neighbors"
 msgstr "Vizinhos LLDP do dispositivo"
 
-#: ../clients/cli/devices.c:3589
+#: ../clients/cli/devices.c:3528
 #, c-format
 msgid "Error: 'device lldp list': %s"
 msgstr "Erro: \"device lldp list\": %s"
 
-#: ../clients/cli/devices.c:3636
+#: ../clients/cli/devices.c:3575
 #, c-format
 msgid "Error: 'device lldp' command '%s' is not valid."
 msgstr "Erro: o comando \"%s\" de \"device lldp\" não é válido."
 
-#: ../clients/cli/devices.c:3825
+#: ../clients/cli/devices.c:3770
 #, c-format
 msgid "Error: 'dev' command '%s' is not valid."
 msgstr "Erro: comando \"dev %s\" é inválido."
 
-#: ../clients/cli/general.c:35
+#: ../clients/cli/general.c:34
 msgid "RUNNING"
 msgstr "EXECUTANDO"
 
 #. 0
-#: ../clients/cli/general.c:36
+#: ../clients/cli/general.c:35
 msgid "VERSION"
 msgstr "VERSÃO"
 
 #. 2
-#: ../clients/cli/general.c:38
+#: ../clients/cli/general.c:37
 msgid "STARTUP"
 msgstr "INICIALIZAÇÃO"
 
 #. 3
-#: ../clients/cli/general.c:39
+#: ../clients/cli/general.c:38
 msgid "CONNECTIVITY"
 msgstr "CONECTIVIDADE"
 
 #. 4
-#: ../clients/cli/general.c:40
+#: ../clients/cli/general.c:39
 msgid "NETWORKING"
 msgstr "REDE"
 
 #. 5
-#: ../clients/cli/general.c:41
+#: ../clients/cli/general.c:40
 msgid "WIFI-HW"
 msgstr "HW-WIFI"
 
 #. 6
-#: ../clients/cli/general.c:42
+#: ../clients/cli/general.c:41
 msgid "WIFI"
 msgstr "WIFI"
 
 #. 7
-#: ../clients/cli/general.c:43
+#: ../clients/cli/general.c:42
 msgid "WWAN-HW"
 msgstr "HW-WWAN"
 
 #. 8
-#: ../clients/cli/general.c:44
+#: ../clients/cli/general.c:43
 msgid "WWAN"
 msgstr "WWAN"
 
 #. 9
-#: ../clients/cli/general.c:45
+#: ../clients/cli/general.c:44
 msgid "WIMAX-HW"
 msgstr "HW-WIMAX"
 
 #. 10
-#: ../clients/cli/general.c:46
+#: ../clients/cli/general.c:45
 msgid "WIMAX"
 msgstr "WIMAX"
 
-#: ../clients/cli/general.c:62
+#: ../clients/cli/general.c:61
 msgid "PERMISSION"
 msgstr "PERMISSÃO"
 
 #. 0
-#: ../clients/cli/general.c:63
+#: ../clients/cli/general.c:62
 msgid "VALUE"
 msgstr "VALOR"
 
-#: ../clients/cli/general.c:71
+#: ../clients/cli/general.c:70
 msgid "LEVEL"
 msgstr "NÍVEL"
 
 #. 0
-#: ../clients/cli/general.c:72
+#: ../clients/cli/general.c:71
 msgid "DOMAINS"
 msgstr "DOMÍNIOS"
 
-#: ../clients/cli/general.c:86
+#: ../clients/cli/general.c:85
 #, c-format
 msgid ""
 "Usage: nmcli general { COMMAND | help }\n"
@@ -4764,7 +5076,7 @@ msgstr ""
 "  logging [level <nível de log>] [domains <domínios de log>]\n"
 "\n"
 
-#: ../clients/cli/general.c:97
+#: ../clients/cli/general.c:96
 #, c-format
 msgid ""
 "Usage: nmcli general status { help }\n"
@@ -4781,7 +5093,7 @@ msgstr ""
 "gen status\"\n"
 "\n"
 
-#: ../clients/cli/general.c:106
+#: ../clients/cli/general.c:105
 #, c-format
 msgid ""
 "Usage: nmcli general hostname { ARGUMENTS | help }\n"
@@ -4790,8 +5102,8 @@ msgid ""
 "\n"
 "Get or change persistent system hostname.\n"
 "With no arguments, this prints currently configured hostname. When you pass\n"
-"a hostname, NetworkManager will set it as the new persistent system "
-"hostname.\n"
+"a hostname, NetworkManager will set it as the new persistent system hostname."
+"\n"
 "\n"
 msgstr ""
 "Uso: nmcli general hostname { ARGUMENTOS | help }\n"
@@ -4805,7 +5117,7 @@ msgstr ""
 "de sistema persistente.\n"
 "\n"
 
-#: ../clients/cli/general.c:118
+#: ../clients/cli/general.c:117
 #, c-format
 msgid ""
 "Usage: nmcli general permissions { help }\n"
@@ -4818,7 +5130,7 @@ msgstr ""
 "Exibir permissões de quem chama para operações autenticadas.\n"
 "\n"
 
-#: ../clients/cli/general.c:126
+#: ../clients/cli/general.c:125
 #, c-format
 msgid ""
 "Usage: nmcli general logging { ARGUMENTS | help }\n"
@@ -4844,7 +5156,7 @@ msgstr ""
 "registro de log possíveis.\n"
 "\n"
 
-#: ../clients/cli/general.c:139
+#: ../clients/cli/general.c:138
 #, c-format
 msgid ""
 "Usage: nmcli networking { COMMAND | help }\n"
@@ -4869,33 +5181,29 @@ msgstr ""
 "  connectivity [check]\n"
 "\n"
 
-#: ../clients/cli/general.c:149
+#: ../clients/cli/general.c:148
 #, c-format
-msgid ""
-"Usage: nmcli networking on { help }\n"
+msgid "Usage: nmcli networking on { help }\n"
 "\n"
 "Switch networking on.\n"
 "\n"
-msgstr ""
-"Uso: nmcli networking on { help }\n"
+msgstr "Uso: nmcli networking on { help }\n"
 "\n"
 "Ativa a rede.\n"
 "\n"
 
-#: ../clients/cli/general.c:157
+#: ../clients/cli/general.c:156
 #, c-format
-msgid ""
-"Usage: nmcli networking off { help }\n"
+msgid "Usage: nmcli networking off { help }\n"
 "\n"
 "Switch networking off.\n"
 "\n"
-msgstr ""
-"Uso: nmcli networking off { help }\n"
+msgstr "Uso: nmcli networking off { help }\n"
 "\n"
 "Desativa a rede.\n"
 "\n"
 
-#: ../clients/cli/general.c:165
+#: ../clients/cli/general.c:164
 #, c-format
 msgid ""
 "Usage: nmcli networking connectivity { ARGUMENTS | help }\n"
@@ -4903,8 +5211,8 @@ msgid ""
 "ARGUMENTS := [check]\n"
 "\n"
 "Get network connectivity state.\n"
-"The optional 'check' argument makes NetworkManager re-check the "
-"connectivity.\n"
+"The optional 'check' argument makes NetworkManager re-check the connectivity."
+"\n"
 "\n"
 msgstr ""
 "Uso: nmcli networking connectivity { ARGUMENTOS | help }\n"
@@ -4916,7 +5224,7 @@ msgstr ""
 "verifica novamente a conexão.\n"
 "\n"
 
-#: ../clients/cli/general.c:177
+#: ../clients/cli/general.c:176
 #, c-format
 msgid ""
 "Usage: nmcli radio { COMMAND | help }\n"
@@ -4933,7 +5241,7 @@ msgstr ""
 "  all | wifi | wwan [ on | off ]\n"
 "\n"
 
-#: ../clients/cli/general.c:186
+#: ../clients/cli/general.c:185
 #, c-format
 msgid ""
 "Usage: nmcli radio all { ARGUMENTS | help }\n"
@@ -4950,7 +5258,7 @@ msgstr ""
 "Obtém status de todos os interruptores de radio, ou os ativa ou desativa.\n"
 "\n"
 
-#: ../clients/cli/general.c:196
+#: ../clients/cli/general.c:195
 #, c-format
 msgid ""
 "Usage: nmcli radio wifi { ARGUMENTS | help }\n"
@@ -4967,7 +5275,7 @@ msgstr ""
 "Obtém status do interruptor de radio Wi-Fi, ou os ativa ou desativa.\n"
 "\n"
 
-#: ../clients/cli/general.c:206
+#: ../clients/cli/general.c:205
 #, c-format
 msgid ""
 "Usage: nmcli radio wwan { ARGUMENTS | help }\n"
@@ -4981,11 +5289,11 @@ msgstr ""
 "\n"
 "ARGUMENTOS := [on | off]\n"
 "\n"
-"Obtém status de um radio switch de banda larga móvel, 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:216
+#: ../clients/cli/general.c:215
 #, c-format
 msgid ""
 "Usage: nmcli monitor\n"
@@ -5000,196 +5308,196 @@ msgstr ""
 "Exibe uma linha quando uma alteração ocorrer no NetworkManager\n"
 "\n"
 
-#: ../clients/cli/general.c:234
+#: ../clients/cli/general.c:233
 msgid "asleep"
 msgstr "adormecido"
 
-#: ../clients/cli/general.c:236
+#: ../clients/cli/general.c:235
 msgid "connecting"
 msgstr "conectando"
 
-#: ../clients/cli/general.c:238
+#: ../clients/cli/general.c:237
 msgid "connected (local only)"
 msgstr "conectado (somente local)"
 
-#: ../clients/cli/general.c:240
+#: ../clients/cli/general.c:239
 msgid "connected (site only)"
 msgstr "conectado (somente site)"
 
-#: ../clients/cli/general.c:244
+#: ../clients/cli/general.c:243
 msgid "disconnecting"
 msgstr "desconectando"
 
-#: ../clients/cli/general.c:280
+#: ../clients/cli/general.c:279
 msgid "portal"
 msgstr "portal"
 
-#: ../clients/cli/general.c:282
+#: ../clients/cli/general.c:281
 msgid "limited"
 msgstr "limitada"
 
-#: ../clients/cli/general.c:284
+#: ../clients/cli/general.c:283
 msgid "full"
 msgstr "completa"
 
-#: ../clients/cli/general.c:335
+#: ../clients/cli/general.c:334
 #, c-format
 msgid "Error: only these fields are allowed: %s"
 msgstr "Erro: somente estes campos são permitidos: %s"
 
-#: ../clients/cli/general.c:358
+#: ../clients/cli/general.c:360
 msgid "NetworkManager status"
 msgstr "Status do NetworkManager"
 
-#: ../clients/cli/general.c:363
+#: ../clients/cli/general.c:365
 msgid "running"
 msgstr "executando"
 
-#: ../clients/cli/general.c:366
+#: ../clients/cli/general.c:368
 msgid "starting"
 msgstr "iniciando"
 
-#: ../clients/cli/general.c:366
+#: ../clients/cli/general.c:368
 msgid "started"
 msgstr "iniciado"
 
-#: ../clients/cli/general.c:368 ../clients/cli/general.c:369
 #: ../clients/cli/general.c:370 ../clients/cli/general.c:371
-#: ../clients/cli/general.c:372
+#: ../clients/cli/general.c:372 ../clients/cli/general.c:373
+#: ../clients/cli/general.c:374
 msgid "enabled"
 msgstr "habilitado"
 
-#: ../clients/cli/general.c:368 ../clients/cli/general.c:369
 #: ../clients/cli/general.c:370 ../clients/cli/general.c:371
-#: ../clients/cli/general.c:372
+#: ../clients/cli/general.c:372 ../clients/cli/general.c:373
+#: ../clients/cli/general.c:374
 msgid "disabled"
 msgstr "desabilitado"
 
-#: ../clients/cli/general.c:435
+#: ../clients/cli/general.c:446
 msgid "auth"
 msgstr "autenticação"
 
-#: ../clients/cli/general.c:464
+#: ../clients/cli/general.c:475
 #, c-format
 msgid "Error: 'general permissions': %s"
 msgstr "Erro: \"general permissions\": %s"
 
-#: ../clients/cli/general.c:478
+#: ../clients/cli/general.c:489
 msgid "NetworkManager permissions"
 msgstr "Permissões do NetworkManager"
 
-#: ../clients/cli/general.c:519
+#: ../clients/cli/general.c:530
 #, c-format
 msgid "Error: 'general logging': %s"
 msgstr "Erro: \"gravação registros gerais\": %s"
 
-#: ../clients/cli/general.c:534
+#: ../clients/cli/general.c:545
 msgid "NetworkManager logging"
 msgstr "Gravação de registros do NetworkManager"
 
-#: ../clients/cli/general.c:556
+#: ../clients/cli/general.c:567
 #, c-format
 msgid "Error: failed to set hostname: %s"
 msgstr "Erro: falha ao definir nome de máquina: %s"
 
-#: ../clients/cli/general.c:669
+#: ../clients/cli/general.c:680
 #, 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:678
+#: ../clients/cli/general.c:689
 #, c-format
 msgid "Error: 'general' command '%s' is not valid."
 msgstr "Erro: o comando \"%s\" de \"general\" não é válido."
 
-#: ../clients/cli/general.c:696
+#: ../clients/cli/general.c:707
 #, 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)"
 
-#: ../clients/cli/general.c:721
+#: ../clients/cli/general.c:732
 #, c-format
 msgid "Error: invalid '%s' argument: '%s' (use on/off)."
 msgstr "Erro: argumento \"%s\" inválido: \"%s\" (use on/off)."
 
-#: ../clients/cli/general.c:732
+#: ../clients/cli/general.c:743
 msgid "Connectivity"
 msgstr "Conectividade"
 
-#: ../clients/cli/general.c:747
+#: ../clients/cli/general.c:758
 msgid "Networking"
 msgstr "Rede"
 
-#: ../clients/cli/general.c:772
+#: ../clients/cli/general.c:783
 #, c-format
 msgid "Error: 'networking connectivity' command '%s' is not valid."
 msgstr "Erro: o comando \"%s\" de \"network connectivity\" não é válido."
 
-#: ../clients/cli/general.c:788
+#: ../clients/cli/general.c:799
 #, c-format
 msgid "Error: 'networking' command '%s' is not valid."
 msgstr "Erro: o comando \"%s\" de \"networking\" não é válido."
 
-#: ../clients/cli/general.c:817 ../clients/cli/general.c:837
+#: ../clients/cli/general.c:828 ../clients/cli/general.c:848
 msgid "Radio switches"
 msgstr "Alternadores de rádio"
 
 #. no argument, show current WiFi state
-#: ../clients/cli/general.c:855
+#: ../clients/cli/general.c:866
 msgid "Wi-Fi radio switch"
 msgstr "Alternador de rádio Wi-Fi"
 
 #. no argument, show current WWAN (mobile broadband) state
-#: ../clients/cli/general.c:871
+#: ../clients/cli/general.c:882
 msgid "WWAN radio switch"
 msgstr "Alternador de rádio WWAN"
 
-#: ../clients/cli/general.c:882
+#: ../clients/cli/general.c:893
 #, c-format
 msgid "Error: 'radio' command '%s' is not valid."
 msgstr "Erro: o comando \"%s\" de \"radio\" não é válido."
 
-#: ../clients/cli/general.c:902
+#: ../clients/cli/general.c:914
 msgid "NetworkManager has started"
 msgstr "NetworkManager foi iniciado"
 
-#: ../clients/cli/general.c:902
+#: ../clients/cli/general.c:917
 msgid "NetworkManager has stopped"
 msgstr "NetworkManager foi parado"
 
-#: ../clients/cli/general.c:913
+#: ../clients/cli/general.c:931
 #, c-format
 msgid "Hostname set to '%s'\n"
 msgstr "Nome de máquina definido para \"%s\"\n"
 
-#: ../clients/cli/general.c:928
+#: ../clients/cli/general.c:946
 #, c-format
 msgid "'%s' is now the primary connection\n"
 msgstr "\"%s\" agora é a conexão primária\n"
 
-#: ../clients/cli/general.c:930
+#: ../clients/cli/general.c:948
 #, c-format
 msgid "There's no primary connection\n"
 msgstr "Não há conexão primária\n"
 
-#: ../clients/cli/general.c:942
+#: ../clients/cli/general.c:960
 #, c-format
 msgid "Connectivity is now '%s'\n"
 msgstr "Conectividade agora é \"%s\"\n"
 
-#: ../clients/cli/general.c:955
+#: ../clients/cli/general.c:973
 #, c-format
 msgid "Networkmanager is now in the '%s' state\n"
 msgstr "NetworkManager não está no estado \"%s\"\n"
 
-#: ../clients/cli/general.c:966
+#: ../clients/cli/general.c:984
 #, c-format
 msgid "Error: 'monitor' command '%s' is not valid."
 msgstr "Erro: comando de \"%s\" de \"monitor\" não é válido."
 
-#: ../clients/cli/general.c:980
+#: ../clients/cli/general.c:998
 msgid "Networkmanager is not running (waiting for it)\n"
 msgstr "NetworkManager não está em execução (espere por ele)\n"
 
@@ -5202,11 +5510,12 @@ msgid ""
 "  -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"
+"  -c[olors] auto|yes|no                      whether to use colors in output\n"
 "  -f[ields] <field1,field2,...>|all|common   specify fields to output\n"
 "  -e[scape] yes|no                           escape columns separators in "
 "values\n"
+"  -n[ocheck]                                 don't check nmcli and "
+"NetworkManager versions\n"
 "  -a[sk]                                     ask for missing parameters\n"
 "  -s[how-secrets]                            allow displaying passwords\n"
 "  -w[ait] <seconds>                          set timeout waiting for "
@@ -5233,8 +5542,9 @@ msgstr ""
 "  -f[ields] <campo1,campo2,...>|all|common especifica os campos para saída\n"
 "  -e[scape] yes|no                         descarta separadores de colunas\n"
 "                                            em valores\n"
-"  -a[sk]                                   questiona sobre os parâmetros "
-"que\n"
+"  -n[ocheck]                               não verifica as versões do nmcli\n"
+"                                            e do NetworkManager\n"
+"  -a[sk]                                   questiona sobre os parâmetros que\n"
 "                                            faltam\n"
 "  -s[how-secrets]                          permite exibir senhas\n"
 "  -w[ait] <segundos>                       define tempo de espera para\n"
@@ -5252,88 +5562,86 @@ msgstr ""
 "  m[onitor]       monitora alterações do NetworkManager\n"
 "\n"
 
-#: ../clients/cli/nmcli.c:142
+#: ../clients/cli/nmcli.c:143
 #, c-format
 msgid "Error: Object '%s' is unknown, try 'nmcli help'."
 msgstr "Erro: Objeto \"%s\" é desconhecido, tente \"nmcli help\"."
 
-#: ../clients/cli/nmcli.c:183
+#: ../clients/cli/nmcli.c:173
 #, c-format
 msgid "Error: Option '--terse' is specified the second time."
 msgstr "Erro: Opção \"--terse\" especificada pela segunda vez."
 
-#: ../clients/cli/nmcli.c:188
+#: ../clients/cli/nmcli.c:178
 #, c-format
 msgid "Error: Option '--terse' is mutually exclusive with '--pretty'."
 msgstr "Erro: Opção \"--terse\" é mutualmente exclusiva com \"--pretty\"."
 
-#: ../clients/cli/nmcli.c:196
+#: ../clients/cli/nmcli.c:186
 #, c-format
 msgid "Error: Option '--pretty' is specified the second time."
 msgstr "Erro: Opção \"--pretty\" especificada pela segunda vez."
 
-#: ../clients/cli/nmcli.c:201
+#: ../clients/cli/nmcli.c:191
 #, c-format
 msgid "Error: Option '--pretty' is mutually exclusive with '--terse'."
 msgstr "Erro: Opção \"--pretty\" é mutualmente exclusiva com \"--terse\"."
 
-#: ../clients/cli/nmcli.c:211 ../clients/cli/nmcli.c:227
-#: ../clients/cli/nmcli.c:245 ../clients/cli/nmcli.c:276
+#: ../clients/cli/nmcli.c:201 ../clients/cli/nmcli.c:217
+#: ../clients/cli/nmcli.c:235 ../clients/cli/nmcli.c:266
 #, c-format
 msgid "Error: missing argument for '%s' option."
 msgstr "Erro: faltando argumento para a opção \"%s\"."
 
-#: ../clients/cli/nmcli.c:220 ../clients/cli/nmcli.c:238
-#: ../clients/cli/nmcli.c:254
+#: ../clients/cli/nmcli.c:210 ../clients/cli/nmcli.c:228
+#: ../clients/cli/nmcli.c:244
 #, 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\"."
 
-#: ../clients/cli/nmcli.c:261
+#: ../clients/cli/nmcli.c:251
 #, c-format
 msgid "Error: fields for '%s' options are missing."
 msgstr "Erro: faltando campos para as opções \"%s\"."
 
-#: ../clients/cli/nmcli.c:281
+#: ../clients/cli/nmcli.c:271
 #, c-format
 msgid "Error: '%s' is not a valid timeout for '%s' option."
 msgstr "Erro: \"%s\" não é um tempo de espera válido para a opção \"%s\"."
 
-#: ../clients/cli/nmcli.c:288
+#: ../clients/cli/nmcli.c:278
 #, c-format
 msgid "nmcli tool, version %s\n"
 msgstr "ferramenta nmcli, versão %s\n"
 
-#: ../clients/cli/nmcli.c:294
+#: ../clients/cli/nmcli.c:284
 #, c-format
 msgid "Error: Option '%s' is unknown, try 'nmcli -help'."
 msgstr "Erro: Opção \"%s\" é desconhecida, tente \"nmcli -help\"."
 
-#: ../clients/cli/nmcli.c:377 ../clients/cli/nmcli.c:387
+#: ../clients/cli/nmcli.c:367 ../clients/cli/nmcli.c:377
 #, c-format
-msgid ""
-"\n"
+msgid "\n"
 "Error: nmcli terminated by signal %s (%d)\n"
-msgstr ""
-"\n"
+msgstr "\n"
 "Erro: nmcli foi finalizado com sinal %s (%d)\n"
 
-#: ../clients/cli/nmcli.c:418
+#: ../clients/cli/nmcli.c:408
 #, c-format
 msgid "Failed to set signal mask: %d\n"
 msgstr "Falha ao definir máscara do sinal: %d\n"
 
-#: ../clients/cli/nmcli.c:425
+#: ../clients/cli/nmcli.c:415
 #, c-format
 msgid "Failed to create signal handling thread: %d\n"
 msgstr "Falha ao criar o segmento de manipulação de sinal: %d\n"
 
-#: ../clients/cli/nmcli.c:522 ../clients/nm-online.c:193
+#: ../clients/cli/nmcli.c:512 ../clients/nm-online.c:193
 #, c-format
 msgid "Error: Could not create NMClient object: %s."
 msgstr "Erro: não foi possível criar objeto NMClient: %s."
 
-#: ../clients/cli/nmcli.c:539
+#: ../clients/cli/nmcli.c:529
 msgid "Success"
 msgstr "Sucesso"
 
@@ -5352,133 +5660,126 @@ msgstr "Erro de autenticação: %s\n"
 msgid "Warning: polkit agent initialization failed: %s\n"
 msgstr "Aviso: inicialização agente de polkit falhou: %s\n"
 
-#: ../clients/cli/settings.c:796
+#: ../clients/cli/settings.c:790
 #, c-format
 msgid "%d (key)"
 msgstr "%d (chave)"
 
-#: ../clients/cli/settings.c:798
+#: ../clients/cli/settings.c:792
 #, c-format
 msgid "%d (passphrase)"
 msgstr "%d (palavra-chave)"
 
-#: ../clients/cli/settings.c:801 ../clients/cli/settings.c:887
+#: ../clients/cli/settings.c:795 ../clients/cli/settings.c:881
 #, c-format
 msgid "%d (unknown)"
 msgstr "%d (desconhecido)"
 
-#: ../clients/cli/settings.c:830
+#: ../clients/cli/settings.c:824
 msgid "0 (NONE)"
 msgstr "0 (NENHUM(A))"
 
-#: ../clients/cli/settings.c:836
+#: ../clients/cli/settings.c:830
 msgid "REORDER_HEADERS, "
 msgstr "REORDENAR_CABEÇALHOS, "
 
-#: ../clients/cli/settings.c:838
+#: ../clients/cli/settings.c:832
 msgid "GVRP, "
 msgstr "GVRP, "
 
-#: ../clients/cli/settings.c:840
+#: ../clients/cli/settings.c:834
 msgid "LOOSE_BINDING, "
 msgstr "PERDA_VÍNCULO, "
 
-#: ../clients/cli/settings.c:842
+#: ../clients/cli/settings.c:836
 msgid "MVRP, "
 msgstr "MVRP, "
 
-#: ../clients/cli/settings.c:881
+#: ../clients/cli/settings.c:875
 #, c-format
 msgid "%d (disabled)"
 msgstr "%d (desabilitada)"
 
-#: ../clients/cli/settings.c:883
+#: ../clients/cli/settings.c:877
 #, c-format
 msgid "%d (enabled, prefer public IP)"
 msgstr "%d (ativada, prefere IP público)"
 
-#: ../clients/cli/settings.c:885
+#: ../clients/cli/settings.c:879
 #, c-format
 msgid "%d (enabled, prefer temporary IP)"
 msgstr "%d (ativada, prefere IP temporário)"
 
-#: ../clients/cli/settings.c:900
+#: ../clients/cli/settings.c:894
 #, c-format
 msgid "%d (no)"
 msgstr "%d (não)"
 
-#: ../clients/cli/settings.c:902
+#: ../clients/cli/settings.c:896
 #, c-format
 msgid "%d (yes)"
 msgstr "%d (sim)"
 
-#: ../clients/cli/settings.c:905 ../clients/cli/settings.c:1605
+#: ../clients/cli/settings.c:899 ../clients/cli/settings.c:1554
 #, c-format
 msgid "%d (default)"
 msgstr "%d (padrão)"
 
-#: ../clients/cli/settings.c:918
+#: ../clients/cli/settings.c:912
 msgid "0 (none)"
 msgstr "0 (nenhum(a))"
 
-#: ../clients/cli/settings.c:924
+#: ../clients/cli/settings.c:918
 msgid "agent-owned, "
 msgstr "pertence-ao-agente, "
 
-#: ../clients/cli/settings.c:926
+#: ../clients/cli/settings.c:920
 msgid "not saved, "
 msgstr "não salvo, "
 
-#: ../clients/cli/settings.c:928
+#: ../clients/cli/settings.c:922
 msgid "not required, "
 msgstr "não requisitado, "
 
-#: ../clients/cli/settings.c:977 ../clients/tui/nmt-mtu-entry.c:84
+#: ../clients/cli/settings.c:971 ../clients/tui/nmt-mtu-entry.c:84
 msgid "(default)"
 msgstr "(padrão)"
 
-#. ----------------------------------------------------------------------------
-#: ../clients/cli/settings.c:1063 ../clients/cli/settings.c:1106
-#: ../clients/cli/settings.c:1140 ../clients/cli/settings.c:1167
-#: ../clients/cli/settings.c:8033
-msgid "<hidden>"
-msgstr "<oculto>"
-
-#: ../clients/cli/settings.c:1302
+#: ../clients/cli/settings.c:1252
 msgid "0 (disabled)"
 msgstr "0 (desativado)"
 
-#: ../clients/cli/settings.c:1308
+#: ../clients/cli/settings.c:1258
 msgid "enabled, "
 msgstr "habilitado, "
 
-#: ../clients/cli/settings.c:1310
+#: ../clients/cli/settings.c:1260
 msgid "advertise, "
 msgstr "publicar, "
 
-#: ../clients/cli/settings.c:1312
+#: ../clients/cli/settings.c:1262
 msgid "willing, "
 msgstr "desejando, "
 
-#: ../clients/cli/settings.c:1340
+#: ../clients/cli/settings.c:1290
 msgid "-1 (unset)"
 msgstr "-1 (indefinido)"
 
-#: ../clients/cli/settings.c:1472 ../clients/cli/settings.c:1777
-#: ../clients/cli/settings.c:1917
+#: ../clients/cli/settings.c:1422 ../clients/cli/settings.c:1724
+#: ../clients/cli/settings.c:1864
 msgid "auto"
 msgstr "auto"
 
-#: ../clients/cli/settings.c:1485 ../clients/cli/settings.c:1948
+#: ../clients/cli/settings.c:1435 ../clients/cli/settings.c:1895
 msgid "default"
 msgstr "padrão"
 
-#: ../clients/cli/settings.c:1607
+#: ../clients/cli/settings.c:1556
 #, c-format
 msgid "%d (off)"
 msgstr "%d (desligado)"
 
-#: ../clients/cli/settings.c:1823
+#: ../clients/cli/settings.c:1770
 #, c-format
 msgid ""
 "invalid option '%s', use a combination of [%s] or 'ignore', 'default' or "
@@ -5487,38 +5788,38 @@ msgstr ""
 "opção inválida \"%s\"; use uma combinação de [%s] ou \"ignore\", \"default\" "
 "ou \"none\""
 
-#: ../clients/cli/settings.c:1834
+#: ../clients/cli/settings.c:1781
 msgid "'default' and 'ignore' are incompatible with other flags"
 msgstr "\"default\" e \"ignore\" são incompatíveis com outros sinalizadores"
 
-#: ../clients/cli/settings.c:1870
+#: ../clients/cli/settings.c:1817
 #, c-format
 msgid "invalid mode '%s', use one of %s"
 msgstr "modo inválido \"%s\", use um de %s"
 
-#: ../clients/cli/settings.c:1952
+#: ../clients/cli/settings.c:1899
 #, c-format
 msgid "always"
 msgstr "sempre"
 
-#: ../clients/cli/settings.c:2052 ../clients/cli/settings.c:3398
-#: ../clients/cli/settings.c:4590 ../clients/cli/settings.c:5093
+#: ../clients/cli/settings.c:1999 ../clients/cli/settings.c:3286
+#: ../clients/cli/settings.c:4478 ../clients/cli/settings.c:4981
 #: ../libnm-core/nm-keyfile-reader.c:573
 #, c-format
 msgid "invalid option '%s', use one of [%s]"
 msgstr "opção inválida \"%s\", use um de [%s]"
 
-#: ../clients/cli/settings.c:2162
+#: ../clients/cli/settings.c:2116
 #, c-format
 msgid "Do you also want to set '%s' to '%s'? [yes]: "
 msgstr "Você também deseja definir \"%s\" para \"%s\"? [sim]: "
 
-#: ../clients/cli/settings.c:2164
+#: ../clients/cli/settings.c:2118
 #, c-format
 msgid "Do you also want to clear '%s'? [yes]: "
 msgstr "Você também deseja limpar \"%s\"? [sim]: "
 
-#: ../clients/cli/settings.c:2325
+#: ../clients/cli/settings.c:2279
 #, c-format
 msgid ""
 "Warning: %s.%s set to '%s', but it might be ignored in infrastructure mode\n"
@@ -5526,86 +5827,86 @@ msgstr ""
 "Aviso: %s.%s define para \"%s\", mas ele pode ser ignorado no modo "
 "infraestrutura\n"
 
-#: ../clients/cli/settings.c:2344
+#: ../clients/cli/settings.c:2298
 #, c-format
 msgid "Warning: setting %s.%s requires removing ipv4 and ipv6 settings\n"
 msgstr "Aviso: definição %s.%s requer remover as definições de ipv4 e ipv6\n"
 
-#: ../clients/cli/settings.c:2346
+#: ../clients/cli/settings.c:2300
 msgid "Do you want to remove them? [yes] "
 msgstr "Você deseja removê-las? [sim] "
 
-#: ../clients/cli/settings.c:2482 ../clients/cli/settings.c:2877
-#: ../clients/cli/settings.c:5294
+#: ../clients/cli/settings.c:2396 ../clients/cli/settings.c:2791
+#: ../clients/cli/settings.c:5182
 #, c-format
 msgid "'%s' is not valid"
 msgstr "\"%s\" não é válido"
 
-#: ../clients/cli/settings.c:2505
+#: ../clients/cli/settings.c:2419
 #, c-format
 msgid "'%d' is not valid; use <%d-%d>"
 msgstr "\"%d\" não é válido; use <%d-%d>"
 
-#: ../clients/cli/settings.c:2527
+#: ../clients/cli/settings.c:2441
 #, c-format
 msgid "'%lld' is not valid; use <%lld-%lld>"
 msgstr "\"%lld\" não é valida; use <%lld-%lld>"
 
-#: ../clients/cli/settings.c:2549
+#: ../clients/cli/settings.c:2463
 #, c-format
 msgid "'%u' is not valid; use <%u-%u>"
 msgstr "\"%u\" não é valida; use <%u-%u>"
 
-#: ../clients/cli/settings.c:2588
+#: ../clients/cli/settings.c:2502
 #, 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"
 
-#: ../clients/cli/settings.c:2655
+#: ../clients/cli/settings.c:2569
 #, c-format
 msgid "'%s' is not valid; use <option>=<value>"
 msgstr "\"%s\" não é válido; use <opção>=<valor>"
 
-#: ../clients/cli/settings.c:2689
+#: ../clients/cli/settings.c:2603
 #, c-format
 msgid "index '%s' is not valid"
 msgstr "\"%s\" não é um índice válido"
 
-#: ../clients/cli/settings.c:2694 ../clients/cli/settings.c:2719
+#: ../clients/cli/settings.c:2608 ../clients/cli/settings.c:2633
 msgid "no item to remove"
 msgstr "nenhum item para remover"
 
-#: ../clients/cli/settings.c:2698 ../clients/cli/settings.c:2723
+#: ../clients/cli/settings.c:2612 ../clients/cli/settings.c:2637
 #, c-format
 msgid "index '%d' is not in range <0-%d>"
 msgstr "índice \"%d\" está fora da faixa <0-%d>"
 
-#: ../clients/cli/settings.c:2738
+#: ../clients/cli/settings.c:2652
 #, c-format
 msgid "invalid option '%s'"
 msgstr "A opção \"%s\" é inválida"
 
-#: ../clients/cli/settings.c:2740
+#: ../clients/cli/settings.c:2654
 msgid "missing option"
 msgstr "falta opção"
 
-#: ../clients/cli/settings.c:2767 ../clients/cli/settings.c:2787
-#: ../clients/cli/settings.c:2807 ../clients/cli/settings.c:2827
+#: ../clients/cli/settings.c:2681 ../clients/cli/settings.c:2701
+#: ../clients/cli/settings.c:2721 ../clients/cli/settings.c:2741
 #, 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)"
 
-#: ../clients/cli/settings.c:2861
+#: ../clients/cli/settings.c:2775
 #, c-format
 msgid "'%s' is not a valid value; use -1, 0 or 1"
 msgstr "\"%s\" não é um valor válido; use -1, 0 ou 1"
 
-#: ../clients/cli/settings.c:2893
+#: ../clients/cli/settings.c:2807
 #, c-format
 msgid "'%s' is not a valid Ethernet MAC"
 msgstr "\"%s\" não é um MAC de porta ethernet válido"
 
-#: ../clients/cli/settings.c:2918 ../libnm-core/nm-setting-connection.c:864
+#: ../clients/cli/settings.c:2832 ../libnm-core/nm-setting-connection.c:864
 #: ../libnm-core/nm-setting-infiniband.c:255
 #: ../libnm-util/nm-setting-connection.c:834
 #: ../libnm-util/nm-setting-infiniband.c:269
@@ -5613,55 +5914,42 @@ msgstr "\"%s\" não é um MAC de porta ethernet válido"
 msgid "'%s' is not a valid interface name"
 msgstr "\"%s\" não é um nome de interface válido"
 
-#: ../clients/cli/settings.c:2942
+#: ../clients/cli/settings.c:2856
 #, 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/cli/settings.c:2954
+#: ../clients/cli/settings.c:2868
 #, c-format
 msgid "Warning: '%s' sum is higher than all flags => all flags set\n"
 msgstr ""
 "Aviso: soma \"%s\" é maior do que todas os sinalizadores => todos "
 "sinalizadores definidos\n"
 
-#: ../clients/cli/settings.c:2995
+#: ../clients/cli/settings.c:2909
 #, c-format
 msgid "'%s' is not a valid hex character"
 msgstr "\"%s\" não é um caracter hexadecimal válido"
 
-#: ../clients/cli/settings.c:3025
+#: ../clients/cli/settings.c:2939
 #, c-format
 msgid "'%s' is not a valid MAC"
 msgstr "\"%s\" não é um MAC válido"
 
-#. Don't allow setting type unless the connection is brand new.
-#. * Just because it's a bad idea and the user wouldn't probably want that.
-#. * No technical reason, really.
-#. * Also, using uuid to see if the connection is brand new is a bit
-#. * 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/cli/settings.c:3053
-#, fuzzy, c-format
-msgid "Can not change the connection type"
-msgstr "Tipo de conexão Bluetooth desconhecida/não manipulada"
-
-#: ../clients/cli/settings.c:3077 ../libnm-core/nm-setting-connection.c:853
+#: ../clients/cli/settings.c:2965 ../libnm-core/nm-setting-connection.c:853
 #: ../libnm-util/nm-setting-connection.c:791
 #, c-format
 msgid "'%s' is not a valid UUID"
 msgstr "\"%s\" não é um UUID válido"
 
-#: ../clients/cli/settings.c:3144
+#: ../clients/cli/settings.c:3032
 #, c-format
 msgid "the property doesn't contain permission '%s'"
 msgstr "a propriedade não contém a permissão \"%s\""
 
-#: ../clients/cli/settings.c:3156
+#: ../clients/cli/settings.c:3044
 msgid ""
-"Enter a list of user permissions. This is a list of user names formatted "
-"as:\n"
+"Enter a list of user permissions. This is a list of user names formatted as:\n"
 "  [user:]<user name 1>, [user:]<user name 2>,...\n"
 "The items can be separated by commas or spaces.\n"
 "\n"
@@ -5674,40 +5962,39 @@ msgstr ""
 "\n"
 "Exemplo: alice bob carlos\n"
 
-#: ../clients/cli/settings.c:3175
+#: ../clients/cli/settings.c:3063
 #, 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"
 
-#: ../clients/cli/settings.c:3219
+#: ../clients/cli/settings.c:3107
 #, 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:3223 ../clients/cli/settings.c:3239
+#: ../clients/cli/settings.c:3111 ../clients/cli/settings.c:3127
 #, c-format
 msgid "'%s' is not a VPN connection profile"
 msgstr "\"%s\" não é um perfil de conexão VPN"
 
-#: ../clients/cli/settings.c:3232
+#: ../clients/cli/settings.c:3120
 #, c-format
 msgid "'%s' is not a name of any exiting profile"
 msgstr "\"%s\" não é um nome de um perfil existente"
 
-#: ../clients/cli/settings.c:3266
+#: ../clients/cli/settings.c:3154
 #, c-format
 msgid "the value '%s' is not a valid UUID"
 msgstr "o valor \"%s\" não é um UUID válido"
 
-#: ../clients/cli/settings.c:3273
+#: ../clients/cli/settings.c:3161
 #, c-format
 msgid "the property doesn't contain UUID '%s'"
 msgstr "a propriedade não contém UUID \"%s\""
 
-#: ../clients/cli/settings.c:3285
+#: ../clients/cli/settings.c:3173
 msgid ""
-"Enter secondary connections that should be activated when this connection "
-"is\n"
+"Enter secondary connections that should be activated when this connection is\n"
 "activated. Connections can be specified either by UUID or ID (name). nmcli\n"
 "transparently translates names to UUIDs. Note that NetworkManager only "
 "supports\n"
@@ -5724,7 +6011,7 @@ msgstr ""
 "\n"
 "Exemplo: private-openvpn, fe6ba5d8-c2fc-4aae-b2e3-97efddd8d9a7\n"
 
-#: ../clients/cli/settings.c:3352
+#: ../clients/cli/settings.c:3240
 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"
@@ -5738,16 +6025,16 @@ 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/cli/settings.c:3476
+#: ../clients/cli/settings.c:3364
 msgid "private key password not provided"
 msgstr "não foi fornecida a senha da chave privada"
 
-#: ../clients/cli/settings.c:3504
+#: ../clients/cli/settings.c:3392
 #, c-format
 msgid "the property doesn't contain EAP method '%s'"
 msgstr "a propriedade não contém um método EAP \"%s\""
 
-#: ../clients/cli/settings.c:3521
+#: ../clients/cli/settings.c:3409
 msgid ""
 "Enter file path to CA certificate (optionally prefixed with file://).\n"
 "  [file://]<file path>\n"
@@ -5763,13 +6050,12 @@ msgstr ""
 "não tratados.\n"
 "Exemplo: /home/cimrman/cert-ca.crt\n"
 
-#: ../clients/cli/settings.c:3540
+#: ../clients/cli/settings.c:3428
 #, 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/cli/settings.c:3556
+#: ../clients/cli/settings.c:3444
 msgid ""
 "Enter file path to client certificate (optionally prefixed with file://).\n"
 "  [file://]<file path>\n"
@@ -5783,7 +6069,7 @@ msgstr ""
 "blob não tratados.\n"
 "Exemplo: /home/cimrman/jara.crt\n"
 
-#: ../clients/cli/settings.c:3568
+#: ../clients/cli/settings.c:3456
 msgid ""
 "Enter file path to CA certificate for inner authentication (optionally "
 "prefixed\n"
@@ -5799,14 +6085,14 @@ msgstr ""
 "blob não tratados.\n"
 "Exemplo: /home/cimrman/ac-segunda-fase.crt\n"
 
-#: ../clients/cli/settings.c:3588
+#: ../clients/cli/settings.c:3476
 #, 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\""
 
-#: ../clients/cli/settings.c:3604
+#: ../clients/cli/settings.c:3492
 msgid ""
 "Enter file path to client certificate for inner authentication (optionally "
 "prefixed\n"
@@ -5815,15 +6101,15 @@ msgid ""
 "Note that nmcli does not support specifying certificates as raw blob data.\n"
 "Example: /home/cimrman/jara-zweite-phase.crt\n"
 msgstr ""
-"Insira o caminho do arquivo para um certificado de cliente para "
-"autenticação \n"
+"Insira o caminho do arquivo para um certificado de cliente 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/jara-segunda-fase.crt\n"
 
-#: ../clients/cli/settings.c:3624
+#: ../clients/cli/settings.c:3512
 msgid ""
 "Enter path to a private key and the key password (if not set yet):\n"
 "  [file://]<file path> [<password>]\n"
@@ -5837,12 +6123,11 @@ msgstr ""
 "dados blob não-tratados.\n"
 "Exemplo: /home/fulanodetal/jara-priv-key SenhaSegredo\n"
 
-#: ../clients/cli/settings.c:3695
+#: ../clients/cli/settings.c:3583
 msgid ""
 "Enter bytes as a list of hexadecimal values.\n"
 "Two formats are accepted:\n"
-"(a) a string of hexadecimal digits, where each two digits represent one "
-"byte\n"
+"(a) a string of hexadecimal digits, where each two digits represent one byte\n"
 "(b) space-separated list of bytes written as hexadecimal digits (with "
 "optional 0x/0X prefix, and optional leading 0).\n"
 "\n"
@@ -5859,7 +6144,7 @@ msgstr ""
 "Exemplos: ab0455a6ea3a74C2\n"
 "          ab 4 55 0xa6 ea 3a 74 C2\n"
 
-#: ../clients/cli/settings.c:3816
+#: ../clients/cli/settings.c:3704
 #, c-format
 msgid ""
 "Enter a list of bonding options formatted as:\n"
@@ -5890,33 +6175,32 @@ msgstr ""
 "\n"
 "Exemplo: mode=2,miimon=120\n"
 
-#: ../clients/cli/settings.c:3847
+#: ../clients/cli/settings.c:3735
 #, c-format
 msgid "'%s' is not a valid InfiniBand MAC"
 msgstr "\"%s\" não é um MAC InfiniBand válido"
 
-#: ../clients/cli/settings.c:3884
+#: ../clients/cli/settings.c:3772
 #, c-format
 msgid "'%s' is not a valid IBoIP P_Key"
 msgstr "\"%s\" não é uma P_Key IBoIP válida"
 
-#: ../clients/cli/settings.c:3915
+#: ../clients/cli/settings.c:3803
 #, c-format
 msgid "'%s' is not valid (the format is: ip[/prefix] [next-hop] [metric])"
-msgstr ""
-"\"%s\" não é válido; (o formato é: ip/[prefixo] [prox-salto] [métrica])"
+msgstr "\"%s\" não é válido; (o formato é: ip/[prefixo] [prox-salto] [métrica])"
 
-#: ../clients/cli/settings.c:3963 ../clients/cli/settings.c:3982
+#: ../clients/cli/settings.c:3851 ../clients/cli/settings.c:3870
 #, c-format
 msgid "invalid IPv4 address '%s'"
 msgstr "\"%s\" não é um endereço IPv4 válido"
 
-#: ../clients/cli/settings.c:3988 ../clients/cli/settings.c:4296
+#: ../clients/cli/settings.c:3876 ../clients/cli/settings.c:4184
 #, c-format
 msgid "the property doesn't contain DNS server '%s'"
 msgstr "a propriedade não contém o servidor DNS \"%s\""
 
-#: ../clients/cli/settings.c:4000
+#: ../clients/cli/settings.c:3888
 msgid ""
 "Enter a list of IPv4 addresses of DNS servers.\n"
 "\n"
@@ -5926,22 +6210,22 @@ msgstr ""
 "\n"
 "Exemplo: 8.8.8.8, 8.8.4.4\n"
 
-#: ../clients/cli/settings.c:4036 ../clients/cli/settings.c:4350
+#: ../clients/cli/settings.c:3924 ../clients/cli/settings.c:4238
 #, 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\""
 
-#: ../clients/cli/settings.c:4074 ../clients/cli/settings.c:4388
+#: ../clients/cli/settings.c:3962 ../clients/cli/settings.c:4276
 #, c-format
 msgid "the property doesn't contain DNS option '%s'"
 msgstr "a propriedade não contém a opção DNS \"%s\""
 
-#: ../clients/cli/settings.c:4128 ../clients/cli/settings.c:4441
+#: ../clients/cli/settings.c:4016 ../clients/cli/settings.c:4329
 #, c-format
 msgid "the property doesn't contain IP address '%s'"
 msgstr "a propriedade não contém o endereço IP \"%s\""
 
-#: ../clients/cli/settings.c:4141
+#: ../clients/cli/settings.c:4029
 msgid ""
 "Enter a list of IPv4 addresses formatted as:\n"
 "  ip[/prefix], ip[/prefix],...\n"
@@ -5955,17 +6239,17 @@ msgstr ""
 "\n"
 "Exemplo: 192.168.1.5/24, 10.0.0.11/24\n"
 
-#: ../clients/cli/settings.c:4157 ../clients/cli/settings.c:4470
+#: ../clients/cli/settings.c:4045 ../clients/cli/settings.c:4358
 #, c-format
 msgid "invalid gateway address '%s'"
 msgstr "endereço de gateway \"%s\" inválido"
 
-#: ../clients/cli/settings.c:4212 ../clients/cli/settings.c:4525
+#: ../clients/cli/settings.c:4100 ../clients/cli/settings.c:4413
 #, c-format
 msgid "the property doesn't contain route '%s'"
 msgstr "a propriedade não contém a rota \"%s\""
 
-#: ../clients/cli/settings.c:4225
+#: ../clients/cli/settings.c:4113
 msgid ""
 "Enter a list of IPv4 routes formatted as:\n"
 "  ip[/prefix] [next-hop] [metric],...\n"
@@ -5988,12 +6272,12 @@ 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/cli/settings.c:4271 ../clients/cli/settings.c:4290
+#: ../clients/cli/settings.c:4159 ../clients/cli/settings.c:4178
 #, c-format
 msgid "invalid IPv6 address '%s'"
 msgstr "\"%s\" não é um endereço IPv6 válido"
 
-#: ../clients/cli/settings.c:4308
+#: ../clients/cli/settings.c:4196
 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 "
@@ -6014,7 +6298,7 @@ msgstr ""
 "\n"
 "Exemplo: 2607:f0d0:1002:51::4, 2607:f0d0:1002:51::1\n"
 
-#: ../clients/cli/settings.c:4454
+#: ../clients/cli/settings.c:4342
 msgid ""
 "Enter a list of IPv6 addresses formatted as:\n"
 "  ip[/prefix], ip[/prefix],...\n"
@@ -6028,7 +6312,7 @@ msgstr ""
 "\n"
 "Exemplo: 2607:f0d0:1002:51::4/64, 1050:0:0:0:5:600:300c:326b\n"
 
-#: ../clients/cli/settings.c:4538
+#: ../clients/cli/settings.c:4426
 msgid ""
 "Enter a list of IPv6 routes formatted as:\n"
 "  ip[/prefix] [next-hop] [metric],...\n"
@@ -6053,28 +6337,28 @@ msgstr ""
 "db8:beef::3 2\n"
 "          abbe::/64 55\n"
 
-#: ../clients/cli/settings.c:4555 ../libnm-core/nm-setting-gsm.c:363
+#: ../clients/cli/settings.c:4443 ../libnm-core/nm-setting-gsm.c:363
 #: ../libnm-util/nm-setting-gsm.c:364
 #, c-format
 msgid "'%s' is not a number"
 msgstr "%s não é um número"
 
-#: ../clients/cli/settings.c:4562
+#: ../clients/cli/settings.c:4450
 #, c-format
 msgid "'%s' is not valid; use 0, 1, or 2"
 msgstr "\"%s\" não é válido; use 0, 1, ou 2"
 
-#: ../clients/cli/settings.c:4609
+#: ../clients/cli/settings.c:4497
 #, c-format
 msgid "'%s' is not a valid channel; use <1-13>"
 msgstr "\"%s\" não é um canal válido; use <1-13>"
 
-#: ../clients/cli/settings.c:4646
+#: ../clients/cli/settings.c:4534
 #, c-format
 msgid "'%s' is not valid; use [e, o, n]"
 msgstr "\"%s\" não é válido; use [e, o, n]"
 
-#: ../clients/cli/settings.c:4674
+#: ../clients/cli/settings.c:4562
 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 "
@@ -6092,52 +6376,55 @@ msgstr ""
 "\"roundrobin\"}, \"ports\": {\"eth1\": {}, \"eth2\": {}} }\n"
 "          set team.config /etc/minha-união.conf\n"
 
-#: ../clients/cli/settings.c:4714
+#: ../clients/cli/settings.c:4602
 msgid "no priority to remove"
 msgstr "sem prioridade para remover"
 
-#: ../clients/cli/settings.c:4718
+#: ../clients/cli/settings.c:4606
 #, c-format
 msgid "index '%d' is not in the range of <0-%d>"
 msgstr "índice \"%d\" está fora da faixa de <0-%d>"
 
-#: ../clients/cli/settings.c:4757
+#: ../clients/cli/settings.c:4645
 #, c-format
 msgid ""
-"Warning: only one mapping at a time is supported; taking the first one (%s)\n"
+"Warning: only one mapping at a time is supported; taking the first one "
+"(%s)\n"
 msgstr ""
 "Aviso: há suporte a apenas um mapeamento por vez; tomando o primeiro (%s)\n"
 
-#: ../clients/cli/settings.c:4764
+#: ../clients/cli/settings.c:4652
 #, c-format
 msgid "the property doesn't contain mapping '%s'"
 msgstr "a propriedade não contém o mapeamento de \"%s\""
 
-#: ../clients/cli/settings.c:4812
+#: ../clients/cli/settings.c:4700
 #, c-format
 msgid "'%s' cannot be empty"
 msgstr "\"%s\" não pode estar vazio"
 
-#: ../clients/cli/settings.c:4886 ../clients/cli/settings.c:5053
-#: ../libnm-core/nm-setting-wired.c:651 ../libnm-core/nm-setting-wireless.c:820
-#: ../libnm-core/nm-setting-wireless.c:832 ../libnm-util/nm-setting-wired.c:646
+#: ../clients/cli/settings.c:4774 ../clients/cli/settings.c:4941
+#: ../libnm-core/nm-setting-wired.c:651
+#: ../libnm-core/nm-setting-wireless.c:820
+#: ../libnm-core/nm-setting-wireless.c:832
+#: ../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"
 
-#: ../clients/cli/settings.c:4892 ../clients/cli/settings.c:5059
+#: ../clients/cli/settings.c:4780 ../clients/cli/settings.c:4947
 #, c-format
 msgid "the property doesn't contain MAC address '%s'"
 msgstr "a propriedade não contém o endereço MAC \"%s\""
 
-#: ../clients/cli/settings.c:4911
+#: ../clients/cli/settings.c:4799
 #, 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"
 
-#: ../clients/cli/settings.c:4925
+#: ../clients/cli/settings.c:4813
 msgid ""
 "Enter a list of subchannels (comma or space separated).\n"
 "\n"
@@ -6147,12 +6434,12 @@ msgstr ""
 "\n"
 "Exemplo: 0.0.0e20 0.0.0e21 0.0.0e22\n"
 
-#: ../clients/cli/settings.c:4947
+#: ../clients/cli/settings.c:4835
 #, c-format
 msgid "'%s' string value should consist of 1 - 199 characters"
 msgstr "valor da string \"%s\" deveria consistir em 1 - 199 caracteres"
 
-#: ../clients/cli/settings.c:4979
+#: ../clients/cli/settings.c:4867
 #, c-format
 msgid ""
 "Enter a list of S/390 options formatted as:\n"
@@ -6163,28 +6450,28 @@ msgstr ""
 "  option = <valor>, option = <valor>,... \n"
 "Opções válidas são: %s\n"
 
-#: ../clients/cli/settings.c:5025
+#: ../clients/cli/settings.c:4913
 #, c-format
 msgid "'%s' is not a valid channel"
 msgstr "\"%s\" não é um canal válido"
 
-#: ../clients/cli/settings.c:5031
+#: ../clients/cli/settings.c:4919
 #, c-format
 msgid "'%ld' is not a valid channel"
 msgstr "\"%ld\" não é um canal válido"
 
-#: ../clients/cli/settings.c:5125
+#: ../clients/cli/settings.c:5013
 #, c-format
 msgid "invalid option '%s', use 'default', 'never' or 'always'"
 msgstr "opção \"%s\" inválida, use \"default\", \"never\" ou \"always\""
 
-#: ../clients/cli/settings.c:5186 ../clients/cli/settings.c:5225
-#: ../clients/cli/settings.c:5264
+#: ../clients/cli/settings.c:5074 ../clients/cli/settings.c:5113
+#: ../clients/cli/settings.c:5152
 #, c-format
 msgid "the property doesn't contain protocol '%s'"
 msgstr "a propriedade não contém o protocolo \"%s\""
 
-#: ../clients/cli/settings.c:5303
+#: ../clients/cli/settings.c:5191
 #, c-format
 msgid ""
 "'%s' not compatible with %s '%s', please change the key or set the right %s "
@@ -6193,25 +6480,25 @@ msgstr ""
 "\"%s\" não é compatível com %s \"%s\", por favor altere a chave ou defina o "
 "%s correto primeiro."
 
-#: ../clients/cli/settings.c:5311
+#: ../clients/cli/settings.c:5199
 #, c-format
 msgid "WEP key is guessed to be of '%s'\n"
 msgstr "Supõe-se que a chave WEP seja \"%s\"\n"
 
-#: ../clients/cli/settings.c:5313
+#: ../clients/cli/settings.c:5201
 #, c-format
 msgid "WEP key index set to '%d'\n"
 msgstr "Índice da chave WEP definida para \"%d\"\n"
 
-#: ../clients/cli/settings.c:5336
+#: ../clients/cli/settings.c:5224
 #, c-format
 msgid "'%s' not among [0 (unknown), 1 (key), 2 (passphrase)]"
 msgstr ""
 "\"%s\" não está nas proximidades [0 (desconhecido), 1 (chave), 2 (palavra-"
 "chave)]"
 
-#: ../clients/cli/settings.c:5352 ../clients/cli/settings.c:5355
-#: ../clients/cli/settings.c:5358 ../clients/cli/settings.c:5361
+#: ../clients/cli/settings.c:5240 ../clients/cli/settings.c:5243
+#: ../clients/cli/settings.c:5246 ../clients/cli/settings.c:5249
 #, c-format
 msgid ""
 "Warning: '%s' is not compatible with '%s' type, please change or delete the "
@@ -6220,7 +6507,7 @@ msgstr ""
 "Aviso: \"%s\" não é compatível com o tipo \"%s\", por favor altere ou exclua "
 "a chave.\n"
 
-#: ../clients/cli/settings.c:5374
+#: ../clients/cli/settings.c:5262
 #, c-format
 msgid ""
 "Enter the type of WEP keys. The accepted values are: 0 or unknown, 1 or key, "
@@ -6229,78 +6516,87 @@ 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/cli/settings.c:5387
+#: ../clients/cli/settings.c:5275
 #, c-format
 msgid "'%s' is not a valid PSK"
 msgstr "\"%s\" não é um PSK válido"
 
-#: ../clients/cli/settings.c:5431
+#: ../clients/cli/settings.c:5319
 #, c-format
 msgid "'%s' is not a valid DCB flag"
 msgstr "'%s' não é uma opção DCB válida"
 
-#: ../clients/cli/settings.c:5454
+#: ../clients/cli/settings.c:5342
 #, c-format
 msgid "'%s' is not a DCB app priority"
 msgstr "'%s' não é uma prioridade de app de DCB"
 
-#: ../clients/cli/settings.c:5480
+#: ../clients/cli/settings.c:5368
 msgid "must contain 8 comma-separated numbers"
 msgstr "deve conter 8 números separados por vírgulas"
 
-#: ../clients/cli/settings.c:5497
+#: ../clients/cli/settings.c:5385
 #, 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"
 
-#: ../clients/cli/settings.c:5500
+#: ../clients/cli/settings.c:5388
 #, c-format
 msgid "'%s' not a number between 0 and %u (inclusive)"
 msgstr "'%s' não um número entre 0 e %u (inclusive)"
 
-#: ../clients/cli/settings.c:5522
+#: ../clients/cli/settings.c:5410
 #, c-format
-msgid ""
-"Warning: changes will have no effect until '%s' includes 1 (enabled)\n"
+msgid "Warning: changes will have no effect until '%s' includes 1 (enabled)\n"
 "\n"
 msgstr ""
 "Aviso: mudanças não tomarão efeito até '%s' incluindo 1 (habilitado)\n"
 "\n"
 
-#: ../clients/cli/settings.c:5575
+#: ../clients/cli/settings.c:5463
 #, c-format
 msgid "bandwidth percentages must total 100%%"
 msgstr "porcentagem da largura de banda deve totalizar 100%%"
 
-#: ../clients/cli/settings.c:5661 ../clients/cli/settings.c:5667
+#: ../clients/cli/settings.c:5549 ../clients/cli/settings.c:5555
 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/cli/settings.c:5710
+#: ../clients/cli/settings.c:5598
 #, c-format
 msgid "invalid option '%s', use '%s' or '%s'"
 msgstr "opção \"%s\" inválida, use \"%s\" ou \"%s\""
 
-#: ../clients/cli/settings.c:7777
+#: ../clients/cli/settings.c:7644
 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:7830 ../clients/cli/settings.c:7870
+#: ../clients/cli/settings.c:7697 ../clients/cli/settings.c:7737
 msgid "the property can't be changed"
 msgstr "a propriedade não pode ser alterada"
 
-#: ../clients/cli/settings.c:7954
+#: ../clients/cli/settings.c:7821
 msgid "(not available)"
 msgstr "(não disponível)"
 
-#: ../clients/cli/settings.c:7979
+#: ../clients/cli/settings.c:7846
 msgid "[NM property description]"
 msgstr "[descrição propriedade NM]"
 
-#: ../clients/cli/settings.c:7984
+#: ../clients/cli/settings.c:7851
 msgid "[nmcli specific description]"
 msgstr "[descrição específica do nmcli]"
 
+#. ----------------------------------------------------------------------------
+#: ../clients/cli/settings.c:7900
+msgid "<hidden>"
+msgstr "<oculto>"
+
+#: ../clients/cli/utils.c:124
+#, c-format
+msgid "Error: value for '%s' argument is required."
+msgstr "Erro: é necessário valor para o argumento \"%s\"."
+
 #: ../clients/cli/utils.c:149
 #, c-format
 msgid "Error: Argument '%s' was expected, but '%s' provided."
@@ -6311,57 +6607,95 @@ msgstr "Erro: era esperado o argumento \"%s\", porém foi fornecido \"%s\"."
 msgid "Error: Unexpected argument '%s'"
 msgstr "Erro: o argumento \"%s\" é inesperado"
 
+#: ../clients/cli/utils.c:202
+#, c-format
+msgid "Error converting IP4 address '0x%X' to text form"
+msgstr "Erro ao converter endereço IP4 \"0x%X\" para o formato texto"
+
+#: ../clients/cli/utils.c:230
+#, c-format
+msgid "Error converting IP6 address '%s' to text form"
+msgstr "Erro ao converter endereço IP6 \"%s\" para o formato texto"
+
 #. Translators: the first %s is the partial value entered by
 #. * the user, the second %s a list of compatible values.
-#.
-#: ../clients/cli/utils.c:492 ../clients/cli/utils.c:523
+#. 
+#: ../clients/cli/utils.c:546 ../clients/cli/utils.c:577
 #, c-format
 msgid "'%s' is ambiguous (%s)"
 msgstr "\"%s\" é ambíguo (%s)"
 
-#: ../clients/cli/utils.c:502
+#: ../clients/cli/utils.c:556
 #, c-format
 msgid "'%s' is not valid; use [%s] or [%s]"
 msgstr "\"%s\" não é válido; use [%s] ou [%s]"
 
-#: ../clients/cli/utils.c:535
+#: ../clients/cli/utils.c:589
 #, c-format
 msgid "'%s' is not valid; use [%s], [%s] or [%s]"
 msgstr "\"%s\" não é válido; use [%s], [%s] ou [%s]"
 
-#: ../clients/cli/utils.c:634
+#: ../clients/cli/utils.c:688
 #, c-format
 msgid "'%s' is ambiguous (%s x %s)"
 msgstr "\"%s\" é ambíguo (%s x %s)"
 
-#: ../clients/cli/utils.c:646
+#: ../clients/cli/utils.c:700
 #, c-format
 msgid "missing name, try one of [%s]"
 msgstr "nome em falta, tente um de [%s]"
 
-#: ../clients/cli/utils.c:893
+#: ../clients/cli/utils.c:964
 #, c-format
 msgid "field '%s' has to be alone"
 msgstr "campo \"%s\" tem que ser um só"
 
-#: ../clients/cli/utils.c:896
+#: ../clients/cli/utils.c:967
 #, c-format
 msgid "invalid field '%s'; allowed fields: %s"
 msgstr "campo inválido '%s'; campos permitidos: %s"
 
-#: ../clients/cli/utils.c:953
+#: ../clients/cli/utils.c:1024
 msgid "Option '--terse' requires specifying '--fields'"
 msgstr "Opção \"--terse\" requer especificação de \"--fields\""
 
-#: ../clients/cli/utils.c:957
+#: ../clients/cli/utils.c:1028
 #, c-format
 msgid "Option '--terse' requires specific '--fields' option values , not '%s'"
 msgstr "Opção \"--terse\" requer valores da opção \"--fields\", não \"%s\""
 
+#: ../clients/cli/utils.c:1390
+#, c-format
+msgid ""
+"Warning: nmcli (%s) and NetworkManager (%s) versions don't match. Use --"
+"nocheck to suppress the warning.\n"
+msgstr ""
+"Aviso: As versões do nmcli (%s) e do NetworkManager (%s) não correspondem. "
+"Use --nocheck para omitir este aviso.\n"
+
+#: ../clients/cli/utils.c:1399
+#, c-format
+msgid ""
+"Error: nmcli (%s) and NetworkManager (%s) versions don't match. Force "
+"execution using --nocheck, but the results are unpredictable."
+msgstr ""
+"Aviso: As versões do nmcli (%s) e do NetworkManager (%s) não correspondem. "
+"Force a execução usando --nocheck, mas os resultados são imprevisíveis."
+
 #: ../clients/common/nm-polkit-listener.c:212
 msgid "An authentication session is already underway."
 msgstr "Uma sessão de autenticação já está ocorrendo."
 
+#. TTLS and PEAP are actually much more complicated, but this complication
+#. * is not visible here since we only care about phase2 authentication
+#. * (and don't even care of which one)
+#. 
+#: ../clients/common/nm-secret-agent-simple.c:223
+#: ../clients/common/nm-secret-agent-simple.c:328
+#: ../clients/tui/nmt-page-dsl.c:66 ../clients/tui/nmt-page-wifi.c:332
+msgid "Username"
+msgstr "Nome de usuário"
+
 #: ../clients/common/nm-secret-agent-simple.c:230
 #: ../clients/common/nm-secret-agent-simple.c:273
 #: ../clients/common/nm-secret-agent-simple.c:303
@@ -6369,10 +6703,9 @@ msgstr "Uma sessão de autenticação já está ocorrendo."
 #: ../clients/common/nm-secret-agent-simple.c:492
 #: ../clients/common/nm-secret-agent-simple.c:507
 #: ../clients/common/nm-secret-agent-simple.c:525
-#: ../clients/common/nm-vpn-helpers.c:119
-#: ../clients/common/nm-vpn-helpers.c:120
-#: ../clients/common/nm-vpn-helpers.c:124
-#: ../clients/common/nm-vpn-helpers.c:127 ../clients/tui/nmt-page-dsl.c:75
+#: ../clients/common/nm-vpn-helpers.c:101
+#: ../clients/common/nm-vpn-helpers.c:102
+#: ../clients/common/nm-vpn-helpers.c:105 ../clients/tui/nmt-page-dsl.c:75
 #: ../clients/tui/nmt-page-wifi.c:277 ../clients/tui/nmt-page-wifi.c:308
 #: ../clients/tui/nmt-page-wifi.c:341
 msgid "Password"
@@ -6451,53 +6784,25 @@ msgstr "Requer uma senha para conectar ao \"%s\"."
 msgid "VPN password required"
 msgstr "Senha de VPN necessária"
 
-#: ../clients/common/nm-vpn-helpers.c:48
-#, fuzzy, c-format
-msgid "unknown VPN plugin \"%s\""
-msgstr "não foi possível carregar plug-in \"%s\": %s"
-
-#: ../clients/common/nm-vpn-helpers.c:59
-#, fuzzy, c-format
-msgid "cannot cannot load legacy-only VPN plugin \"%s\" for \"%s\""
-msgstr "não foi possível carregar plug-in \"%s\": %s"
-
-#: ../clients/common/nm-vpn-helpers.c:64
-#, 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 de VPN em \"%s\": faltando nome do plug-in"
-
-#: ../clients/common/nm-vpn-helpers.c:69
-#, fuzzy, c-format
-msgid "failed to load VPN plugin \"%s\": %s"
-msgstr "Erro: falha ao carregar plug-in VPN: %s."
-
-#: ../clients/common/nm-vpn-helpers.c:121
-#, fuzzy
-msgid "Certificate password"
-msgstr "Senha de chave privada"
-
-#: ../clients/common/nm-vpn-helpers.c:122
-#, fuzzy
-msgid "HTTP proxy password"
-msgstr "Senha do grupo"
+#: ../clients/common/nm-vpn-helpers.c:61
+msgid "could not get VPN plugin info"
+msgstr "não foi possível obter informação de plug-in VPN"
 
-#: ../clients/common/nm-vpn-helpers.c:125
-#: ../clients/common/nm-vpn-helpers.c:128
+#: ../clients/common/nm-vpn-helpers.c:103
+#: ../clients/common/nm-vpn-helpers.c:106
 msgid "Group password"
 msgstr "Senha do grupo"
 
-#: ../clients/common/nm-vpn-helpers.c:130 ../clients/tui/nmt-page-ip4.c:143
+#: ../clients/common/nm-vpn-helpers.c:108 ../clients/tui/nmt-page-ip4.c:143
 #: ../clients/tui/nmt-page-ip6.c:143
 msgid "Gateway"
 msgstr "Gateway"
 
-#: ../clients/common/nm-vpn-helpers.c:131
+#: ../clients/common/nm-vpn-helpers.c:109
 msgid "Cookie"
 msgstr "Cookie"
 
-#: ../clients/common/nm-vpn-helpers.c:132
+#: ../clients/common/nm-vpn-helpers.c:110
 msgid "Gateway certificate hash"
 msgstr "Hash de certificado do gateway"
 
@@ -6516,7 +6821,8 @@ msgstr ""
 #: ../clients/nm-online.c:148
 msgid "Exit immediately if NetworkManager is not running or connecting"
 msgstr ""
-"Sair 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:149
 msgid "Don't print anything"
@@ -6541,7 +6847,7 @@ msgstr ""
 #: ../clients/tui/newt/nmt-newt-utils.c:177 ../clients/tui/nmt-editor.c:415
 #: ../clients/tui/nmt-password-dialog.c:174
 #: ../clients/tui/nmt-route-editor.c:122 ../clients/tui/nmtui-hostname.c:69
-#: ../clients/tui/nmtui.c:136
+#: ../clients/tui/nmtui.c:114
 msgid "OK"
 msgstr "OK"
 
@@ -6571,38 +6877,23 @@ msgstr "Editor falhou com sinal %d"
 msgid "Could not re-read file: %s"
 msgstr "Não foi possível re-ler arquivo: %s"
 
-#: ../clients/tui/nm-editor-utils.c:146 ../libnm-glib/nm-device.c:1859
-#: ../libnm/nm-device.c:1810
-msgid "Ethernet"
-msgstr "Ethernet"
-
 #: ../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:154 ../libnm-glib/nm-device.c:1861
-#: ../libnm/nm-device.c:1812
-msgid "Wi-Fi"
-msgstr "Sem fio (Wi-Fi)"
-
 #: ../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:163 ../libnm-core/nm-connection.c:1748
-#: ../libnm-glib/nm-device.c:1871 ../libnm/nm-device.c:1822
-msgid "InfiniBand"
-msgstr "InfiniBand"
-
 #: ../clients/tui/nm-editor-utils.c:167
 #, c-format
 msgid "InfiniBand connection %d"
 msgstr "Conexão InfiniBand %d"
 
-#: ../clients/tui/nm-editor-utils.c:172 ../libnm-glib/nm-device.c:1869
-#: ../libnm/nm-device.c:1820
+#: ../clients/tui/nm-editor-utils.c:172 ../libnm-glib/nm-device.c:1859
+#: ../libnm/nm-device.c:1810
 msgid "Mobile Broadband"
 msgstr "Banda Larga Móvel"
 
@@ -6620,9 +6911,9 @@ msgstr "DSL"
 msgid "DSL connection %d"
 msgstr "Conexão DSL %d"
 
-#: ../clients/tui/nm-editor-utils.c:190 ../libnm-core/nm-connection.c:1740
-#: ../libnm-glib/nm-device.c:1873 ../libnm-util/nm-connection.c:1626
-#: ../libnm/nm-device.c:1824 ../src/settings/plugins/ifcfg-rh/reader.c:4195
+#: ../clients/tui/nm-editor-utils.c:190 ../libnm-core/nm-connection.c:1708
+#: ../libnm-glib/nm-device.c:1863 ../libnm-util/nm-connection.c:1626
+#: ../libnm/nm-device.c:1814 ../src/settings/plugins/ifcfg-rh/reader.c:4182
 msgid "Bond"
 msgstr "Vínculo"
 
@@ -6631,9 +6922,9 @@ msgstr "Vínculo"
 msgid "Bond connection %d"
 msgstr "Conexão vinculada %d"
 
-#: ../clients/tui/nm-editor-utils.c:199 ../libnm-core/nm-connection.c:1744
-#: ../libnm-glib/nm-device.c:1877 ../libnm-util/nm-connection.c:1630
-#: ../libnm/nm-device.c:1828 ../src/settings/plugins/ifcfg-rh/reader.c:4492
+#: ../clients/tui/nm-editor-utils.c:199 ../libnm-core/nm-connection.c:1712
+#: ../libnm-glib/nm-device.c:1867 ../libnm-util/nm-connection.c:1630
+#: ../libnm/nm-device.c:1818 ../src/settings/plugins/ifcfg-rh/reader.c:4479
 msgid "Bridge"
 msgstr "Ponte"
 
@@ -6642,9 +6933,9 @@ msgstr "Ponte"
 msgid "Bridge connection %d"
 msgstr "Conexão de Ponte %d"
 
-#: ../clients/tui/nm-editor-utils.c:208 ../libnm-core/nm-connection.c:1742
-#: ../libnm-glib/nm-device.c:1875 ../libnm-util/nm-connection.c:1628
-#: ../libnm/nm-device.c:1826 ../src/settings/plugins/ifcfg-rh/reader.c:4301
+#: ../clients/tui/nm-editor-utils.c:208 ../libnm-core/nm-connection.c:1710
+#: ../libnm-glib/nm-device.c:1865 ../libnm-util/nm-connection.c:1628
+#: ../libnm/nm-device.c:1816 ../src/settings/plugins/ifcfg-rh/reader.c:4288
 msgid "Team"
 msgstr "União"
 
@@ -6887,6 +7178,10 @@ msgstr "Conectado"
 msgid "INFINIBAND"
 msgstr "INFINIBAND"
 
+#: ../clients/tui/nmt-page-infiniband.c:88
+msgid "Transport mode"
+msgstr "Modo de Transporte"
+
 #: ../clients/tui/nmt-page-ip4.c:38
 msgid "Disabled"
 msgstr "Desabilitado"
@@ -7240,14 +7535,10 @@ msgid "Deactivate"
 msgstr "Desativar"
 
 #: ../clients/tui/nmtui-connect.c:413 ../clients/tui/nmtui-edit.c:120
-#: ../clients/tui/nmtui.c:130
+#: ../clients/tui/nmtui.c:108
 msgid "Quit"
 msgstr "Cancelar"
 
-#: ../clients/tui/nmtui-connect.c:413 ../clients/tui/nmtui-edit.c:120
-msgid "Back"
-msgstr "Voltar"
-
 #: ../clients/tui/nmtui-connect.c:436
 #, c-format
 msgid "No such connection '%s'"
@@ -7331,28 +7622,28 @@ msgstr "novo nome de máquina"
 msgid "Set system hostname"
 msgstr "Definir nome de máquina do sistema"
 
-#: ../clients/tui/nmtui.c:104
+#: ../clients/tui/nmtui.c:83
 msgid "NetworkManager TUI"
 msgstr "NetworkManager TUI"
 
-#: ../clients/tui/nmtui.c:112
+#: ../clients/tui/nmtui.c:91
 msgid "Please select an option"
 msgstr "Por favor selecione uma opção"
 
-#: ../clients/tui/nmtui.c:160
+#: ../clients/tui/nmtui.c:143
 msgid "Usage"
 msgstr "Uso"
 
-#: ../clients/tui/nmtui.c:241
+#: ../clients/tui/nmtui.c:224
 msgid "Could not parse arguments"
 msgstr "Não foi possível analisar argumentos"
 
-#: ../clients/tui/nmtui.c:251
+#: ../clients/tui/nmtui.c:234
 #, c-format
 msgid "Could not contact NetworkManager: %s.\n"
 msgstr "Não foi possível contatar o NetworkManager: %s.\n"
 
-#: ../clients/tui/nmtui.c:256
+#: ../clients/tui/nmtui.c:239
 msgid "NetworkManager is not running."
 msgstr "NetworkManager não está em execução."
 
@@ -7642,50 +7933,51 @@ 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:225
+#: ../libnm-core/nm-connection.c:224
 msgid "wrong type; should be a list of strings."
 msgstr "tipo incorreto; deveria ser uma lista de strings."
 
-#: ../libnm-core/nm-connection.c:295
+#: ../libnm-core/nm-connection.c:294
 msgid "unknown setting name"
 msgstr "nome de definição desconhecido"
 
-#: ../libnm-core/nm-connection.c:307
+#: ../libnm-core/nm-connection.c:306
 msgid "duplicate setting name"
 msgstr "nome de definição duplicado"
 
-#: ../libnm-core/nm-connection.c:905
+#: ../libnm-core/nm-connection.c:873
 msgid "setting not found"
 msgstr "definição não localizada"
 
-#: ../libnm-core/nm-connection.c:969
+#: ../libnm-core/nm-connection.c:937
 msgid "setting not allowed in slave connection"
 msgstr "definição não permitida para conexão escrava"
 
-#: ../libnm-core/nm-connection.c:980
+#: ../libnm-core/nm-connection.c:948
 msgid "setting is required for non-slave connections"
 msgstr "definição é exigida para conexões não escravas"
 
-#: ../libnm-core/nm-connection.c:1074
+#: ../libnm-core/nm-connection.c:1042
 msgid "Unexpected failure to verify the connection"
 msgstr "Falha inesperada ao verificar a conexão"
 
-#: ../libnm-core/nm-connection.c:1107
+#: ../libnm-core/nm-connection.c:1075
 msgid "Unexpected failure to normalize the connection"
 msgstr "Falha inesperada ao normalizar a conexão"
 
-#: ../libnm-core/nm-connection.c:1608 ../libnm-core/nm-setting-8021x.c:2411
+#: ../libnm-core/nm-connection.c:1576 ../libnm-core/nm-setting-8021x.c:2411
 #: ../libnm-core/nm-setting-8021x.c:2428 ../libnm-core/nm-setting-8021x.c:2459
 #: ../libnm-core/nm-setting-8021x.c:2476 ../libnm-core/nm-setting-8021x.c:2518
 #: ../libnm-core/nm-setting-8021x.c:2530 ../libnm-core/nm-setting-8021x.c:2548
 #: ../libnm-core/nm-setting-8021x.c:2560 ../libnm-core/nm-setting-8021x.c:2584
 #: ../libnm-core/nm-setting-8021x.c:2749 ../libnm-core/nm-setting-adsl.c:189
 #: ../libnm-core/nm-setting-bluetooth.c:120
-#: ../libnm-core/nm-setting-bluetooth.c:138 ../libnm-core/nm-setting-cdma.c:141
+#: ../libnm-core/nm-setting-bluetooth.c:138
+#: ../libnm-core/nm-setting-cdma.c:141
 #: ../libnm-core/nm-setting-connection.c:837
 #: ../libnm-core/nm-setting-connection.c:876
 #: ../libnm-core/nm-setting-connection.c:989
-#: ../libnm-core/nm-setting-ip-config.c:2186
+#: ../libnm-core/nm-setting-ip-config.c:2167
 #: ../libnm-core/nm-setting-olpc-mesh.c:120
 #: ../libnm-core/nm-setting-pppoe.c:142 ../libnm-core/nm-setting-vpn.c:419
 #: ../libnm-core/nm-setting-vxlan.c:360 ../libnm-core/nm-setting-wimax.c:126
@@ -7697,8 +7989,10 @@ msgstr "Falha inesperada ao normalizar a conexão"
 #: ../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-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
@@ -7812,7 +8106,8 @@ msgstr "ignorando SSID inválido"
 msgid "ignoring invalid raw password"
 msgstr "ignorando senha não tratada inválida"
 
-#: ../libnm-core/nm-keyfile-reader.c:892 ../libnm-core/nm-keyfile-reader.c:1058
+#: ../libnm-core/nm-keyfile-reader.c:892
+#: ../libnm-core/nm-keyfile-reader.c:1058
 #, c-format
 msgid "certificate or key file '%s' does not exist"
 msgstr "certificado ou arquivo de chave \"%s\" não existe"
@@ -7923,9 +8218,10 @@ msgstr "chave privada de phase2 inválida"
 #: ../libnm-core/nm-setting-8021x.c:2591 ../libnm-core/nm-setting-adsl.c:196
 #: ../libnm-core/nm-setting-cdma.c:148 ../libnm-core/nm-setting-cdma.c:157
 #: ../libnm-core/nm-setting-connection.c:844
-#: ../libnm-core/nm-setting-connection.c:887 ../libnm-core/nm-setting-gsm.c:281
-#: ../libnm-core/nm-setting-gsm.c:338 ../libnm-core/nm-setting-gsm.c:375
-#: ../libnm-core/nm-setting-gsm.c:384 ../libnm-core/nm-setting-ip-config.c:2193
+#: ../libnm-core/nm-setting-connection.c:887
+#: ../libnm-core/nm-setting-gsm.c:281 ../libnm-core/nm-setting-gsm.c:338
+#: ../libnm-core/nm-setting-gsm.c:375 ../libnm-core/nm-setting-gsm.c:384
+#: ../libnm-core/nm-setting-ip-config.c:2174
 #: ../libnm-core/nm-setting-ip4-config.c:198
 #: ../libnm-core/nm-setting-ip4-config.c:205
 #: ../libnm-core/nm-setting-pppoe.c:149 ../libnm-core/nm-setting-pppoe.c:158
@@ -7941,8 +8237,9 @@ msgstr "chave privada de phase2 inválida"
 #: ../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-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:170 ../libnm-util/nm-setting-pppoe.c:179
 #: ../libnm-util/nm-setting-vpn.c:432 ../libnm-util/nm-setting-vpn.c:442
@@ -7969,8 +8266,8 @@ msgstr "certificado é inválido: %s"
 #: ../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:211
-#: ../libnm-core/nm-setting-ip6-config.c:222
+#: ../libnm-core/nm-setting-ip6-config.c:188
+#: ../libnm-core/nm-setting-ip6-config.c:199
 #: ../libnm-core/nm-setting-olpc-mesh.c:149
 #: ../libnm-core/nm-setting-wimax.c:144 ../libnm-core/nm-setting-wired.c:665
 #: ../libnm-core/nm-setting-wired.c:675
@@ -8008,12 +8305,14 @@ msgstr "propriedade é inválida"
 #: ../libnm-core/nm-setting-8021x.c:2783 ../libnm-core/nm-setting-8021x.c:2793
 #: ../libnm-core/nm-setting-8021x.c:2803 ../libnm-core/nm-setting-8021x.c:2813
 #: ../libnm-core/nm-setting-8021x.c:2823 ../libnm-core/nm-setting-adsl.c:208
-#: ../libnm-core/nm-setting-adsl.c:220 ../libnm-core/nm-setting-bluetooth.c:146
+#: ../libnm-core/nm-setting-adsl.c:220
+#: ../libnm-core/nm-setting-bluetooth.c:146
 #: ../libnm-core/nm-setting-wireless-security.c:870
 #: ../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-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"
@@ -8047,7 +8346,7 @@ msgstr "\"%s\" não é um valor válido para \"%s\""
 #: ../libnm-core/nm-setting-bond.c:547 ../libnm-util/nm-setting-bond.c:554
 #, c-format
 msgid "'%s=%s' is incompatible with '%s > 0'"
-msgstr "\"%s=%s\" é incompatível com \"%s > 0\""
+msgstr "\"%s=%s\" não é compatível com \"%s > 0\""
 
 #: ../libnm-core/nm-setting-bond.c:560 ../libnm-util/nm-setting-bond.c:567
 #, c-format
@@ -8106,13 +8405,13 @@ msgid "'%d' is not a valid value for the property (should be <= %d)"
 msgstr "\"%d\" não é um valor válido para a propriedade (deveria ser <= %d)"
 
 #: ../libnm-core/nm-setting-bridge-port.c:154
-#: ../libnm-core/nm-setting-team-port.c:109
+#: ../libnm-core/nm-setting-team-port.c:97
 #, c-format
 msgid "missing setting"
 msgstr "faltando definição"
 
 #: ../libnm-core/nm-setting-bridge-port.c:165
-#: ../libnm-core/nm-setting-team-port.c:120
+#: ../libnm-core/nm-setting-team-port.c:108
 #, c-format
 msgid ""
 "A connection with a '%s' setting must have the slave-type set to '%s'. "
@@ -8304,51 +8603,46 @@ msgstr "Endereço IPv6 com prefixo inválido \"%u\""
 msgid "Invalid routing metric '%s'"
 msgstr "Métrica roteamento inválida \"%s\""
 
-#: ../libnm-core/nm-setting-ip-config.c:2206
+#: ../libnm-core/nm-setting-ip-config.c:2187
 #, 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:2222
+#: ../libnm-core/nm-setting-ip-config.c:2203
 #, c-format
 msgid "%d. IP address is invalid"
 msgstr "%d. Endereço IP é inválido"
 
-#: ../libnm-core/nm-setting-ip-config.c:2234
+#: ../libnm-core/nm-setting-ip-config.c:2215
 #, 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"
 
-#: ../libnm-core/nm-setting-ip-config.c:2243
+#: ../libnm-core/nm-setting-ip-config.c:2224
 #, c-format
 msgid "%d. IP address has invalid label '%s'"
 msgstr "%d. Endereço IPv4 possui um rótulo \"%s\" inválido"
 
-#: ../libnm-core/nm-setting-ip-config.c:2257
+#: ../libnm-core/nm-setting-ip-config.c:2238
 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:2266
+#: ../libnm-core/nm-setting-ip-config.c:2247
 msgid "gateway is invalid"
 msgstr "gateway é inválido"
 
-#: ../libnm-core/nm-setting-ip-config.c:2280
+#: ../libnm-core/nm-setting-ip-config.c:2261
 #, c-format
 msgid "%d. route is invalid"
 msgstr "%d: rota é inválida"
 
-#: ../libnm-core/nm-setting-ip-config.c:2289
+#: ../libnm-core/nm-setting-ip-config.c:2270
 #, 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:2300
-#, c-format
-msgid "a gateway is incompatible with '%s'"
-msgstr "um gateway é incompatível com \"%s\""
-
 #: ../libnm-core/nm-setting-ip4-config.c:143
-#: ../libnm-core/nm-setting-ip6-config.c:167
+#: ../libnm-core/nm-setting-ip6-config.c:144
 #: ../libnm-util/nm-setting-ip4-config.c:879
 #: ../libnm-util/nm-setting-ip6-config.c:843
 #, c-format
@@ -8358,9 +8652,9 @@ 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:179
-#: ../libnm-core/nm-setting-ip6-config.c:189
-#: ../libnm-core/nm-setting-ip6-config.c:199
+#: ../libnm-core/nm-setting-ip6-config.c:156
+#: ../libnm-core/nm-setting-ip6-config.c:166
+#: ../libnm-core/nm-setting-ip6-config.c:176
 #: ../libnm-util/nm-setting-ip4-config.c:891
 #: ../libnm-util/nm-setting-ip4-config.c:901
 #: ../libnm-util/nm-setting-ip4-config.c:913
@@ -8381,20 +8675,6 @@ 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-ip6-config.c:237
-#, fuzzy
-msgid "value is not a valid token"
-msgstr "o valor \"%s\" não é um UUID válido"
-
-#: ../libnm-core/nm-setting-ip6-config.c:248
-#, fuzzy
-msgid "only makes sense with EUI64 address generation mode"
-msgstr "modo de geração de endereço SLAAC IPv6"
-
-#: ../libnm-core/nm-setting-ip6-config.c:260
-msgid "token is not in canonical form"
-msgstr ""
-
 #: ../libnm-core/nm-setting-ip-tunnel.c:318
 #, c-format
 msgid "'%d' is not a valid tunnel mode"
@@ -8556,8 +8836,7 @@ msgstr "\"%s\" ou seu valor \"%s\" é inválido"
 
 #: ../libnm-core/nm-setting-wired.c:709
 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:718
 msgid "Wake-on-LAN password can only be used with magic packet mode"
@@ -8644,185 +8923,165 @@ msgstr "segredo não localizado"
 msgid "secret is not set"
 msgstr "segredo não está definido"
 
-#: ../libnm-core/nm-utils.c:2445
+#: ../libnm-core/nm-utils.c:2447
 #, c-format
 msgid "failed stat file %s: %s"
 msgstr "falha ao obter estado do arquivo %s: %s"
 
-#: ../libnm-core/nm-utils.c:2454
+#: ../libnm-core/nm-utils.c:2456
 #, c-format
 msgid "not a file (%s)"
 msgstr "não é um arquivo (%s)"
 
-#: ../libnm-core/nm-utils.c:2465
+#: ../libnm-core/nm-utils.c:2467
 #, c-format
 msgid "invalid file owner %d for %s"
 msgstr "proprietário %d de arquivo inválido para %s"
 
-#: ../libnm-core/nm-utils.c:2476
+#: ../libnm-core/nm-utils.c:2478
 #, c-format
 msgid "file permissions for %s"
 msgstr "permissões de arquivo para %s"
 
-#: ../libnm-core/nm-utils.c:2486
+#: ../libnm-core/nm-utils.c:2488
 #, c-format
 msgid "reject %s"
 msgstr "rejeitar %s"
 
-#: ../libnm-core/nm-utils.c:2506
+#: ../libnm-core/nm-utils.c:2508
 #, c-format
 msgid "path is not absolute (%s)"
 msgstr "o caminho não é absoluto (%s)"
 
-#: ../libnm-core/nm-utils.c:2520
+#: ../libnm-core/nm-utils.c:2522
 #, c-format
 msgid "Plugin file does not exist (%s)"
 msgstr "O arquivo do plug-in não existe (%s)"
 
-#: ../libnm-core/nm-utils.c:2528
+#: ../libnm-core/nm-utils.c:2530
 #, 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:2538
+#: ../libnm-core/nm-utils.c:2540
 #, c-format
 msgid "libtool archives are not supported (%s)"
 msgstr "Não há suporte a arquivos de libtool (%s)"
 
-#: ../libnm-core/nm-utils.c:2620 ../libnm-util/nm-utils.c:1803
+#: ../libnm-core/nm-utils.c:2622 ../libnm-util/nm-utils.c:1815
 #, c-format
 msgid "Could not find \"%s\" binary"
 msgstr "Não foi possível localizar o executável \"%s\""
 
-#: ../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"
-
-#: ../libnm-core/nm-vpn-editor-plugin.c:307
+#: ../libnm-core/nm-vpn-editor-plugin.c:124
 #, c-format
-msgid "failed to load nm_vpn_editor_plugin_factory() from %s (%s)"
-msgstr "falha ao carregar nm_vpn_editor_plugin_factory() de %s (%s)"
+msgid "cannot load plugin %s"
+msgstr "não foi possível carregar plug-in %s"
 
-#: ../libnm-core/nm-vpn-editor-plugin.c:332
-#, c-format
-msgid "unknown error initializing plugin %s"
-msgstr "erro desconhecido de inicialização do plug-in %s"
-
-#: ../libnm-core/nm-vpn-editor-plugin.c:349
+#: ../libnm-core/nm-vpn-editor-plugin.c:150
 #, 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"
 
-#: ../libnm-core/nm-vpn-editor-plugin.c:358
+#: ../libnm-core/nm-vpn-editor-plugin.c:157
 #, 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"
 
-#: ../libnm-core/nm-vpn-editor-plugin.c:501
+#: ../libnm-core/nm-vpn-editor-plugin.c:173
+#, c-format
+msgid "unknown error initializing plugin %s"
+msgstr "erro desconhecido de inicialização do plug-in %s"
+
+#: ../libnm-core/nm-vpn-editor-plugin.c:185
+#, c-format
+msgid "failed to load nm_vpn_editor_plugin_factory() from %s (%s)"
+msgstr "falha ao carregar nm_vpn_editor_plugin_factory() de %s (%s)"
+
+#: ../libnm-core/nm-vpn-editor-plugin.c:292
 #, c-format
 msgid "the plugin does not support import capability"
 msgstr "o plug-in não oferece suporte à capacidade de importação"
 
-#: ../libnm-core/nm-vpn-editor-plugin.c:521
+#: ../libnm-core/nm-vpn-editor-plugin.c:312
 #, c-format
 msgid "the plugin does not support export capability"
 msgstr "o plug-in não oferece suporte à capacidade de exportação"
 
-#: ../libnm-core/nm-vpn-plugin-info.c:110
+#: ../libnm-core/nm-vpn-plugin-info.c:109
 #, c-format
 msgid "missing filename"
 msgstr "faltando nome de arquivo"
 
-#: ../libnm-core/nm-vpn-plugin-info.c:118
+#: ../libnm-core/nm-vpn-plugin-info.c:117
 #, c-format
 msgid "filename must be an absolute path (%s)"
 msgstr "nome de arquivo deve ser um caminho absoluto (%s)"
 
-#: ../libnm-core/nm-vpn-plugin-info.c:127
+#: ../libnm-core/nm-vpn-plugin-info.c:126
 #, c-format
 msgid "filename has invalid format (%s)"
 msgstr "nome de arquivo possui formato inválido (%s)"
 
-#: ../libnm-core/nm-vpn-plugin-info.c:450
+#: ../libnm-core/nm-vpn-plugin-info.c:383
 #, c-format
 msgid "there exists a conflicting plugin (%s) that has the same %s.%s value"
 msgstr "há um plug-in conflitante (%s) que possui o mesmo valor %s.%s"
 
-#: ../libnm-core/nm-vpn-plugin-info.c:488
+#: ../libnm-core/nm-vpn-plugin-info.c:421
 #, c-format
 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:1071
+#: ../libnm-core/nm-vpn-plugin-info.c:740
 #, c-format
 msgid "missing \"plugin\" setting"
 msgstr "faltando definição \"plugin\""
 
-#: ../libnm-core/nm-vpn-plugin-info.c:1081
+#: ../libnm-core/nm-vpn-plugin-info.c:750
 #, 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:1175
+#: ../libnm-core/nm-vpn-plugin-info.c:842
 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:1187
+#: ../libnm-core/nm-vpn-plugin-info.c:854
 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:1196
+#: ../libnm-core/nm-vpn-plugin-info.c:863
 msgid "missing service for VPN plugin info"
 msgstr "faltando serviço para informação de plug-in de VPN"
 
-#: ../libnm-glib/nm-device.c:1863 ../libnm/nm-device.c:1814
+#: ../libnm-glib/nm-device.c:1853 ../libnm/nm-device.c:1804
 msgid "Bluetooth"
 msgstr "Bluetooth"
 
-#: ../libnm-glib/nm-device.c:1865 ../libnm/nm-device.c:1816
-msgid "OLPC Mesh"
-msgstr "OLPC Mesh"
-
-#: ../libnm-glib/nm-device.c:1867 ../libnm/nm-device.c:1818
-msgid "WiMAX"
-msgstr "WiMAX"
-
-#: ../libnm-glib/nm-device.c:1881 ../libnm/nm-device.c:1832
-msgid "ADSL"
-msgstr "ADSL"
-
-#: ../libnm-glib/nm-device.c:1883 ../libnm/nm-device.c:1834
+#: ../libnm-glib/nm-device.c:1873 ../libnm/nm-device.c:1824
 msgid "MACVLAN"
 msgstr "MACVLAN"
 
-#: ../libnm-glib/nm-device.c:1885 ../libnm/nm-device.c:1836
-msgid "VXLAN"
-msgstr "VXLAN"
-
-#: ../libnm-glib/nm-device.c:1887 ../libnm/nm-device.c:1838
+#: ../libnm-glib/nm-device.c:1877 ../libnm/nm-device.c:1828
 msgid "IPTunnel"
 msgstr "IPTunnel"
 
-#: ../libnm-glib/nm-device.c:1889 ../libnm/nm-device.c:1840
-msgid "Tun"
-msgstr "Tun"
-
-#: ../libnm-glib/nm-device.c:1891 ../libnm/nm-device.c:1842
+#: ../libnm-glib/nm-device.c:1881 ../libnm/nm-device.c:1832
 msgid "Veth"
 msgstr "Veth"
 
-#: ../libnm-glib/nm-device.c:1923 ../libnm/nm-device.c:1874
+#: ../libnm-glib/nm-device.c:1913 ../libnm/nm-device.c:1864
 msgid "Wired"
 msgstr "Cabeada"
 
-#: ../libnm-glib/nm-device.c:1954 ../libnm/nm-device.c:1905
+#: ../libnm-glib/nm-device.c:1944 ../libnm/nm-device.c:1895
 msgid "PCI"
 msgstr "PCI"
 
-#: ../libnm-glib/nm-device.c:1956 ../libnm/nm-device.c:1907
+#: ../libnm-glib/nm-device.c:1946 ../libnm/nm-device.c:1897
 msgid "USB"
 msgstr "USB"
 
@@ -8831,9 +9090,9 @@ msgstr "USB"
 #. * "Ethernet"). You can change this to something like
 #. * "%2$s (%1$s)" if there's no grammatical way to combine
 #. * the strings otherwise.
-#.
-#: ../libnm-glib/nm-device.c:2052 ../libnm-glib/nm-device.c:2071
-#: ../libnm/nm-device.c:2001 ../libnm/nm-device.c:2020
+#. 
+#: ../libnm-glib/nm-device.c:2042 ../libnm-glib/nm-device.c:2061
+#: ../libnm/nm-device.c:1991 ../libnm/nm-device.c:2010
 #, c-format
 msgctxt "long device name"
 msgid "%s %s"
@@ -9020,7 +9279,7 @@ 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-team.c:139
+#: ../libnm/nm-device-team.c:118
 msgid "The connection was not a team connection."
 msgstr "A conexão não era de união."
 
@@ -9055,28 +9314,29 @@ 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:638
-msgid "The device is lacking WPA2/RSN capabilities required by the connection."
+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."
 
 #: ../libnm/nm-device-wimax.c:317
 msgid "The connection was not a WiMAX connection."
 msgstr "A conexão não era WiMAX."
 
-#: ../libnm/nm-device.c:2739
+#: ../libnm/nm-device.c:2729
 #, c-format
 msgid "The connection was not valid: %s"
 msgstr "A conexão não era válida: %s"
 
-#: ../libnm/nm-device.c:2748
+#: ../libnm/nm-device.c:2738
 #, 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:867
+#: ../libnm/nm-manager.c:874
 msgid "Active connection could not be attached to the device"
 msgstr "Conexão ativa não pôde ser atribuída ao dispositivo"
 
-#: ../libnm/nm-manager.c:1091
+#: ../libnm/nm-manager.c:1098
 msgid "Active connection removed before it was initialized"
 msgstr "Conexão ativa removida antes de ser inicializada"
 
@@ -9103,18 +9363,6 @@ msgstr ""
 "redes"
 
 #: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:3
-#, fuzzy
-msgid "Reload NetworkManager configuration"
-msgstr "Imprime a configuração do NetworkManager e sai"
-
-#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:4
-#, fuzzy
-msgid "System policy prevents reloading NetworkManager"
-msgstr ""
-"Políticas de sistema previnem habilitação ou desabilitação do sistema de "
-"redes"
-
-#: ../policy/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)"
@@ -9122,104 +9370,106 @@ msgstr ""
 "Põe o NetworkManager para dormir ou acordar (deve ser usado somente pelo "
 "sistema de gerenciamento de energia)"
 
-#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:6
+#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:4
 msgid "System policy prevents putting NetworkManager to sleep or waking it up"
 msgstr ""
 "Políticas de sistema previnem que se coloque o NetworkManager para dormir ou "
 "acordar"
 
-#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:7
+#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:5
 msgid "Enable or disable WiFi devices"
 msgstr "Habilita ou desabilita dispositivos WiFi"
 
-#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:8
+#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:6
 msgid "System policy prevents enabling or disabling WiFi devices"
 msgstr ""
 "Políticas de sistema previnem a habilitação ou desabilitação de dispositivos "
 "WiFi"
 
-#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:9
+#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:7
 msgid "Enable or disable mobile broadband devices"
 msgstr "Habilita ou desabilita dispositivos móveis de banda larga"
 
-#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:10
+#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:8
 msgid "System policy prevents enabling or disabling mobile broadband devices"
 msgstr ""
 "Políticas de sistema previnem a habilitação ou desabilitação de dispositivos "
 "móveis de banda larga"
 
-#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:11
+#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:9
 msgid "Enable or disable WiMAX mobile broadband devices"
 msgstr "Habilita ou desabilita dispositivos móveis WiMAX"
 
-#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:12
+#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:10
 msgid ""
 "System policy prevents enabling or disabling WiMAX mobile broadband devices"
 msgstr ""
 "Políticas de sistema previnem a habilitação ou desabilitação de dispositivos "
 "móveis de banda larga WiMAX"
 
-#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:13
+#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:11
 msgid "Allow control of network connections"
 msgstr "Permite o controle de conexões de rede"
 
-#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:14
+#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:12
 msgid "System policy prevents control of network connections"
 msgstr "Políticas de sistema previnem o controle de conexões de rede"
 
-#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:15
+#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:13
 msgid "Connection sharing via a protected WiFi network"
 msgstr "Compartilhamento de conexão via rede sem fio protegida"
 
-#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:16
-msgid "System policy prevents sharing connections via a protected WiFi network"
+#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:14
+msgid ""
+"System policy prevents sharing connections via a protected WiFi network"
 msgstr ""
 "Políticas de sistema previnem compartilhamento de conexões através de uma "
 "rede sem fio protegida"
 
-#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:17
+#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:15
 msgid "Connection sharing via an open WiFi network"
 msgstr "Compartilhamento de conexão via rede sem fio aberta"
 
-#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:18
+#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:16
 msgid "System policy prevents sharing connections via an open WiFi network"
 msgstr ""
 "Políticas de sistema previnem compartilhamento de conexões através de uma "
 "rede sem fio aberta"
 
-#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:19
+#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:17
 msgid "Modify personal network connections"
 msgstr "Modificar conexões pessoais de rede"
 
-#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:20
+#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:18
 msgid "System policy prevents modification of personal network settings"
 msgstr ""
-"Políticas de sistema previnem modificação das configurações pessoais de redes"
+"Políticas de sistema previnem modificação das configurações pessoais de "
+"redes"
 
-#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:21
+#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:19
 msgid "Modify network connections for all users"
 msgstr "Modificar conexões de rede para todos os usuários"
 
-#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:22
+#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:20
 msgid "System policy prevents modification of network settings for all users"
 msgstr ""
 "Políticas de sistema previnem modificação das configurações de rede para "
 "todos os usuários"
 
-#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:23
+#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:21
 msgid "Modify persistent system hostname"
 msgstr "Modificar máquina de sistema persistente"
 
-#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:24
+#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:22
 msgid "System policy prevents modification of the persistent system hostname"
 msgstr ""
 "Políticas de sistema previnem modificação da máquina do sistema persistente"
 
-#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:25
+#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:23
 msgid "Modify persistent global DNS configuration"
 msgstr "Modificar configuração de DNS persistente global"
 
-#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:26
+#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:24
 msgid ""
 "System policy prevents modification of the persistent global DNS "
 "configuration"
@@ -9227,17 +9477,17 @@ msgstr ""
 "Políticas de sistema previnem modificação da configuração de DNS global "
 "persistente"
 
-#: ../shared/nm-utils/nm-shared-utils.c:185
+#: ../shared/nm-shared-utils.c:208
 #, c-format
 msgid "object class '%s' has no property named '%s'"
 msgstr "a classe de objeto \"%s\" não possui uma propriedade chamada \"%s\""
 
-#: ../shared/nm-utils/nm-shared-utils.c:192
+#: ../shared/nm-shared-utils.c:215
 #, 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"
 
-#: ../shared/nm-utils/nm-shared-utils.c:199
+#: ../shared/nm-shared-utils.c:222
 #, c-format
 msgid ""
 "construct property \"%s\" for object '%s' can't be set after construction"
@@ -9245,21 +9495,21 @@ msgstr ""
 "a propriedade de construtor \"%s\" para objeto \"%s\" não pode ser definido "
 "após construção"
 
-#: ../shared/nm-utils/nm-shared-utils.c:207
+#: ../shared/nm-shared-utils.c:230
 #, 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 "
 "GObject"
 
-#: ../shared/nm-utils/nm-shared-utils.c:216
+#: ../shared/nm-shared-utils.c:239
 #, 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\""
 
-#: ../shared/nm-utils/nm-shared-utils.c:227
+#: ../shared/nm-shared-utils.c:250
 #, c-format
 msgid ""
 "value \"%s\" of type '%s' is invalid or out of range for property '%s' of "
@@ -9272,49 +9522,53 @@ 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:112
+#: ../src/NetworkManagerUtils.c:111
 #, c-format
 msgctxt "connection id fallback"
 msgid "%s %d"
 msgstr "%s %d"
 
-#: ../src/main.c:165 ../src/main.c:300
+#: ../src/main.c:220 ../src/main.c:358
 #, c-format
 msgid "Failed to read configuration: %s\n"
 msgstr "Falha ao ler configuração: %s\n"
 
 #. Logging/debugging
-#: ../src/main.c:179 ../src/nm-iface-helper.c:298
+#: ../src/main.c:234 ../src/nm-iface-helper.c:298
 msgid "Print NetworkManager version and exit"
 msgstr "Imprime a versão do NetworkManager e sai"
 
-#: ../src/main.c:180 ../src/nm-iface-helper.c:299
+#: ../src/main.c:235 ../src/nm-iface-helper.c:299
 msgid "Don't become a daemon"
 msgstr "Não se torna um daemon"
 
-#: ../src/main.c:181 ../src/nm-iface-helper.c:301
+#: ../src/main.c:236 ../src/nm-iface-helper.c:301
 #, c-format
 msgid "Log level: one of [%s]"
 msgstr "Nível de registro: um dos [%s]"
 
-#: ../src/main.c:183 ../src/nm-iface-helper.c:303
+#: ../src/main.c:238 ../src/nm-iface-helper.c:303
 #, c-format
 msgid "Log domains separated by ',': any combination of [%s]"
 msgstr "Domínios de registro separados por \",\": qualquer combinação de [%s]"
 
-#: ../src/main.c:185 ../src/nm-iface-helper.c:305
+#: ../src/main.c:240 ../src/nm-iface-helper.c:305
 msgid "Make all warnings fatal"
 msgstr "Torna todos os avisos fatais"
 
-#: ../src/main.c:186
+#: ../src/main.c:241
 msgid "Specify the location of a PID file"
 msgstr "Especifica a localização de um arquivo PID"
 
-#: ../src/main.c:188
+#: ../src/main.c:242
+msgid "State file location"
+msgstr "Localização do arquivo de estado"
+
+#: ../src/main.c:244
 msgid "Print NetworkManager configuration and exit"
 msgstr "Imprime a configuração do NetworkManager e sai"
 
-#: ../src/main.c:198
+#: ../src/main.c:254
 msgid ""
 "NetworkManager monitors all network connections and automatically\n"
 "chooses the best connection to use.  It also allows the user to\n"
@@ -9326,78 +9580,80 @@ msgstr ""
 "especifique pontos de acesso sem fio os quais cartões sem fio no\n"
 "computador podem ser associados."
 
-#: ../src/main.c:285 ../src/main-utils.c:270 ../src/nm-iface-helper.c:393
+#: ../src/main.c:343 ../src/main-utils.c:269 ../src/nm-iface-helper.c:393
 #, 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:290 ../src/nm-iface-helper.c:398
+#: ../src/main.c:348 ../src/nm-iface-helper.c:398
 #, 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:315
+#: ../src/main.c:373
 #, c-format
 msgid "Error in configuration file: %s.\n"
 msgstr "Erro no arquivo de configuração: %s.\n"
 
-#: ../src/main.c:320
+#: ../src/main.c:378
 #, 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:331 ../src/nm-iface-helper.c:408
+#: ../src/main.c:389 ../src/nm-iface-helper.c:408
 #, c-format
 msgid "Could not daemonize: %s [error %u]\n"
 msgstr "Não foi possível tornar um daemon: %s [erro %u]\n"
 
-#: ../src/main-utils.c:98
+#: ../src/main-utils.c:99
 #, c-format
 msgid "Opening %s failed: %s\n"
 msgstr "Abertura de %s falhou: %s\n"
 
-#: ../src/main-utils.c:104
+#: ../src/main-utils.c:105
 #, c-format
 msgid "Writing to %s failed: %s\n"
 msgstr "Escrita para %s falhou: %s\n"
 
-#: ../src/main-utils.c:109
+#: ../src/main-utils.c:110
 #, c-format
 msgid "Closing %s failed: %s\n"
 msgstr "Fechamento de %s falhou: %s\n"
 
-#: ../src/main-utils.c:144
+#: ../src/main-utils.c:145
 #, c-format
 msgid "Cannot create '%s': %s"
 msgstr "Não foi possível criar \"%s\": %s"
 
-#: ../src/main-utils.c:196
+#: ../src/main-utils.c:197
 #, c-format
 msgid "%s is already running (pid %ld)\n"
 msgstr "%s já está em execução (pid %ld)\n"
 
-#: ../src/main-utils.c:206
+#: ../src/main-utils.c:207
 #, c-format
 msgid "You must be root to run %s!\n"
 msgstr "Você precisa ser superusuário para executar %s!\n"
 
-#: ../src/dhcp-manager/nm-dhcp-dhclient-utils.c:214
+#: ../src/dhcp-manager/nm-dhcp-dhclient-utils.c:213
 msgid "# Created by NetworkManager\n"
 msgstr "# Criado pelo NetworkManager\n"
 
-#: ../src/dhcp-manager/nm-dhcp-dhclient-utils.c:222
+#: ../src/dhcp-manager/nm-dhcp-dhclient-utils.c:220
 #, c-format
-msgid ""
-"# Merged from %s\n"
+msgid "# Merged from %s\n"
 "\n"
-msgstr ""
-"# Mesclado de %s\n"
+msgstr "# Mesclado de %s\n"
 "\n"
 
-#: ../src/devices/bluetooth/nm-bluez-device.c:200
+#: ../src/devices/adsl/nm-device-adsl.c:133
+msgid "ADSL connection"
+msgstr "Conexão ADSL"
+
+#: ../src/devices/bluetooth/nm-bluez-device.c:197
 #, c-format
 msgid "%s Network"
 msgstr "Rede %s"
@@ -9423,12 +9679,12 @@ 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:303
-#: ../src/devices/wwan/nm-modem-broadband.c:687
+#: ../src/devices/wwan/nm-modem-broadband.c:655
 msgid "GSM connection"
 msgstr "Conexão GSM"
 
 #: ../src/devices/bluetooth/nm-device-bt.c:307
-#: ../src/devices/wwan/nm-modem-broadband.c:711
+#: ../src/devices/wwan/nm-modem-broadband.c:679
 msgid "CDMA connection"
 msgstr "Conexão CDMA"
 
@@ -9437,9 +9693,9 @@ msgid "Unknown/unhandled Bluetooth connection type"
 msgstr "Tipo de conexão Bluetooth desconhecida/não manipulada"
 
 #: ../src/devices/bluetooth/nm-device-bt.c:336
-#: ../src/devices/nm-device-ethernet.c:1421
+#: ../src/devices/nm-device-ethernet.c:1415
 #: ../src/devices/nm-device-infiniband.c:193
-#: ../src/devices/wifi/nm-device-wifi.c:875
+#: ../src/devices/wifi/nm-device-wifi.c:872
 msgid "connection does not match device"
 msgstr "conexão não corresponde ao dispositivo"
 
@@ -9451,24 +9707,28 @@ msgstr "Conexão vinculada"
 msgid "Bridge connection"
 msgstr "Conexão de ponte"
 
-#: ../src/devices/nm-device-ethernet.c:1402
+#: ../src/devices/nm-device-ethernet.c:1396
 msgid "PPPoE connection"
 msgstr "Conexão PPPoE"
 
-#: ../src/devices/nm-device-ethernet.c:1402
+#: ../src/devices/nm-device-ethernet.c:1396
 msgid "Wired connection"
 msgstr "Conexão cabeada"
 
-#: ../src/devices/nm-device-ethernet-utils.c:36
+#: ../src/devices/nm-device-ethernet-utils.c:39
 #, c-format
 msgid "Wired connection %d"
 msgstr "Conexão cabeada %d"
 
-#: ../src/devices/nm-device-ip-tunnel.c:347
+#: ../src/devices/nm-device-infiniband.c:175
+msgid "InfiniBand connection"
+msgstr "Conexão InfiniBand"
+
+#: ../src/devices/nm-device-ip-tunnel.c:346
 msgid "IP tunnel connection"
 msgstr "Conexão de túnel IP"
 
-#: ../src/devices/nm-device-macvlan.c:436
+#: ../src/devices/nm-device-macvlan.c:435
 msgid "MACVLAN connection"
 msgstr "Conexão MACVLAN"
 
@@ -9476,7 +9736,15 @@ msgstr "Conexão MACVLAN"
 msgid "TUN connection"
 msgstr "Conexão TUN"
 
-#: ../src/devices/team/nm-device-team.c:121
+#: ../src/devices/nm-device-vlan.c:457
+msgid "VLAN connection"
+msgstr "Conexão VLAN"
+
+#: ../src/devices/nm-device-vxlan.c:373
+msgid "VXLAN connection"
+msgstr "Conexão VXLAN"
+
+#: ../src/devices/team/nm-device-team.c:115
 msgid "Team connection"
 msgstr "Conexão de união"
 
@@ -9484,7 +9752,7 @@ msgstr "Conexão de união"
 msgid "Mesh"
 msgstr "Mesh"
 
-#: ../src/devices/wifi/nm-device-wifi.c:842
+#: ../src/devices/wifi/nm-device-wifi.c:839
 msgid "WPA Ad-Hoc disabled due to kernel bugs"
 msgstr "Ad-Hoc WPA desabilitada por causa de erros no kernel"
 
@@ -9649,56 +9917,53 @@ 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:673
+#: ../src/devices/wwan/nm-modem-broadband.c:641
 msgid "GSM mobile broadband connection requires a 'gsm' setting"
 msgstr "Conexão de banda larga móvel (GSM) requer uma configuração \"gsm\""
 
-#: ../src/nm-config.c:500
+#: ../src/nm-config.c:465
 msgid "Config file location"
 msgstr "Localização do arquivo de configuração"
 
-#: ../src/nm-config.c:501
+#: ../src/nm-config.c:466
 msgid "Config directory location"
 msgstr "Localização do diretório de configuração"
 
-#: ../src/nm-config.c:502
+#: ../src/nm-config.c:467
 msgid "System config directory location"
 msgstr "Localização do diretório de configuração do sistema"
 
-#: ../src/nm-config.c:503
+#: ../src/nm-config.c:468
 msgid "Internal config file location"
 msgstr "Localização do arquivo de configuração interna"
 
-#: ../src/nm-config.c:504
-msgid "State file location"
-msgstr "Localização do arquivo de estado"
-
-#: ../src/nm-config.c:505
+#: ../src/nm-config.c:469
 msgid "State file for no-auto-default devices"
 msgstr "Arquivo de estado para dispositivos no-auto-default"
 
-#: ../src/nm-config.c:506
+#: ../src/nm-config.c:470
 msgid "List of plugins separated by ','"
 msgstr "Lista de plug-ins separada por \",\""
 
-#: ../src/nm-config.c:507
+#: ../src/nm-config.c:471
 msgid "Quit after initial configuration"
 msgstr "Sair após configuração inicial"
 
-#: ../src/nm-config.c:508 ../src/nm-iface-helper.c:300
+#: ../src/nm-config.c:472 ../src/nm-iface-helper.c:300
 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:511
+#: ../src/nm-config.c:475
 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:512
+#: ../src/nm-config.c:476
 msgid "The interval between connectivity checks (in seconds)"
-msgstr "O intervalo de tempo entre verificações de conectividade (em segundos)"
+msgstr ""
+"O intervalo de tempo entre verificações de conectividade (em segundos)"
 
-#: ../src/nm-config.c:513
+#: ../src/nm-config.c:477
 msgid "The expected start of the response"
 msgstr "O início esperado da resposta"
 
@@ -9814,16 +10079,24 @@ msgstr "Falha em localizar índice de interfaces para %s (%s)\n"
 msgid "(%s): Invalid IID %s\n"
 msgstr "(%s): IID %s inválido\n"
 
-#: ../src/nm-logging.c:223
+#: ../src/nm-logging.c:216
 #, c-format
 msgid "Unknown log level '%s'"
 msgstr "Nível de registro \"%s\" desconhecido"
 
-#: ../src/nm-logging.c:318
+#: ../src/nm-logging.c:309
 #, c-format
 msgid "Unknown log domain '%s'"
 msgstr "Domínio de registro \"%s\" desconhecido"
 
-#: ../src/settings/plugins/ifcfg-rh/reader.c:106
+#: ../src/nm-manager.c:3635
+msgid "VPN connection"
+msgstr "Conexão VPN"
+
+#: ../src/nm-sleep-monitor-systemd.c:131
+msgid "NetworkManager needs to turn off networks"
+msgstr "O NetworkManager precisa desligar as redes"
+
+#: ../src/settings/plugins/ifcfg-rh/reader.c:108
 msgid "System"
 msgstr "Sistema"
diff --git a/po/ru.po b/po/ru.po
index 722b196801..c8de67b93d 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -1,8 +1,8 @@
 # translation of ru.po to
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
-#
-#
+# 
+# 
 # Leonid Kanter <leon@asplinux.ru>, 2006, 2007.
 # Артём Попов <artfwo@gmail.com>, 2009.
 # Yulia <ypoyarko@redhat.com>, 2010.
@@ -10,23 +10,22 @@
 # Yuri Kozlov <yuray@komyakino.ru>, 2011.
 # Yuri Myasoedov <omerta13@yandex.ru>, 2012.
 # Stas Solovey <whats_up@tut.by>, 2012, 2014, 2015.
-# Lubomir Rintel <lkundrak@v3.sk>, 2016. #zanata
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-06-22 10:02+0200\n"
-"PO-Revision-Date: 2015-02-26 06:25-0500\n"
-"Last-Translator: Stas Solovey <whats_up@tut.by>\n"
-"Language-Team: Русский <gnome-cyr@gnome.org>\n"
-"Language: ru\n"
+"POT-Creation-Date: 2016-04-29 14:24+0530\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"PO-Revision-Date: 2016-07-05 08:45+0000\n"
+"Last-Translator: Copied by Zanata <copied-by-zanata@zanata.org>\n"
+"Language-Team: Русский <gnome-cyr@gnome.org>\n"
+"Language: ru\n"
 "X-Launchpad-Export-Date: 2012-10-20 12:08+0000\n"
-"X-Generator: Zanata 3.8.4\n"
-"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
-"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
+"X-Generator: Zanata 3.9.3\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && "
+"n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
 
 #: ../clients/cli/agent.c:39
 #, c-format
@@ -52,6 +51,13 @@ msgid ""
 "and if a password is required asks the user for it.\n"
 "\n"
 msgstr ""
+"Формат: nmcli agent secret { help }\n"
+"\n"
+"Запускает nmcli в режиме агента регистрационных данных NetworkManager. \n"
+"Если NetworkManager потребуется пароль, в первую очередь он будет\n"
+"обращаться к зарегистрированным агентам. Эта команда будет \n"
+"поддерживать nmcli в запущенном состоянии и, если понадобится пароль, \n"
+"запросит его у пользователя.\n"
 
 #: ../clients/cli/agent.c:57
 #, c-format
@@ -64,6 +70,12 @@ msgid ""
 "the response back to polkit.\n"
 "\n"
 msgstr ""
+"Формат: nmcli agent polkit { help }\n"
+"\n"
+"Регистрирует nmcli как действие polkit для сеанса пользователя.\n"
+"Когда фоновой службе polkit потребуется авторизация, \n"
+"nmcli отправит пользователю запрос и вернет полученный\n"
+"ответ обратно polkit.\n"
 
 #: ../clients/cli/agent.c:67
 #, c-format
@@ -73,42 +85,46 @@ msgid ""
 "Runs nmcli as both NetworkManager secret and a polkit agent.\n"
 "\n"
 msgstr ""
+"Формат: nmcli agent all { help }\n"
+"\n"
+"Запускает nmcli и как агент паролей NetworkManager, и как агент polkit.\n"
+"\n"
 
 #: ../clients/cli/agent.c:149
 #, c-format
 msgid "nmcli successfully registered as a NetworkManager's secret agent.\n"
-msgstr ""
+msgstr "nmcli был успешно зарегистрирован как агент паролей NetworkManager.\n"
 
 #: ../clients/cli/agent.c:151
-#, fuzzy, c-format
+#, c-format
 msgid "Error: secret agent initialization failed"
-msgstr "Не удалось инициализировать модем"
+msgstr "Ошибка: сбой инициализации агента паролей"
 
 #: ../clients/cli/agent.c:166
-#, fuzzy, c-format
+#, c-format
 msgid "Error: polkit agent initialization failed: %s"
-msgstr "Ошибка: сбой активации соединения: %s"
+msgstr "Ошибка: не удалось инициализировать агент polkit: %s"
 
 #: ../clients/cli/agent.c:174
 #, c-format
 msgid "nmcli successfully registered as a polkit agent.\n"
-msgstr ""
+msgstr "nmcli был успешно зарегистрирован как агент polkit.\n"
 
-#: ../clients/cli/agent.c:206 ../clients/cli/connections.c:8703
-#: ../clients/cli/devices.c:3727 ../clients/cli/general.c:344
-#: ../clients/cli/general.c:473
+#: ../clients/cli/agent.c:206 ../clients/cli/connections.c:11050
+#: ../clients/cli/devices.c:3669 ../clients/cli/general.c:343
+#: ../clients/cli/general.c:484
 #, c-format
 msgid "Error: NetworkManager is not running."
 msgstr "Ошибка: NetworkManager не запущен."
 
-#: ../clients/cli/agent.c:239
+#: ../clients/cli/agent.c:242
 #, c-format
 msgid "Error: 'agent' command '%s' is not valid."
 msgstr "Ошибка. Неверная команда «agent %s»."
 
 #: ../clients/cli/common.c:38 ../clients/cli/common.c:51
 #: ../clients/cli/common.c:59 ../clients/cli/common.c:71
-#: ../clients/cli/connections.c:237 ../clients/cli/connections.c:259
+#: ../clients/cli/connections.c:192 ../clients/cli/connections.c:214
 msgid "GROUP"
 msgstr "ГРУППА"
 
@@ -120,7 +136,7 @@ msgstr "АДРЕС"
 #. 1
 #. 2
 #: ../clients/cli/common.c:40 ../clients/cli/common.c:61
-#: ../clients/cli/connections.c:262
+#: ../clients/cli/connections.c:217
 msgid "GATEWAY"
 msgstr "ШЛЮЗ"
 
@@ -165,6 +181,8 @@ msgid ""
 "the second component of route ('%s') is neither a next hop address nor a "
 "metric"
 msgstr ""
+"второй компонент маршрута («%s») не содержит адрес точки перехода или "
+"метрику"
 
 #: ../clients/cli/common.c:457
 #, c-format
@@ -190,7 +208,7 @@ msgstr "без управления"
 msgid "unavailable"
 msgstr "недоступен"
 
-#: ../clients/cli/common.c:498 ../clients/cli/general.c:246
+#: ../clients/cli/common.c:498 ../clients/cli/general.c:245
 msgid "disconnected"
 msgstr "отключено"
 
@@ -218,11 +236,11 @@ msgstr "подключение (проверка IP-подключения)"
 msgid "connecting (starting secondary connections)"
 msgstr "подключение (запуск второстепенных соединений)"
 
-#: ../clients/cli/common.c:512 ../clients/cli/general.c:242
+#: ../clients/cli/common.c:512 ../clients/cli/general.c:241
 msgid "connected"
 msgstr "подключено"
 
-#: ../clients/cli/common.c:514 ../clients/cli/connections.c:690
+#: ../clients/cli/common.c:514 ../clients/cli/connections.c:648
 msgid "deactivating"
 msgstr "деактивация"
 
@@ -231,70 +249,69 @@ msgid "connection failed"
 msgstr "сбой соединения"
 
 #: ../clients/cli/common.c:518 ../clients/cli/common.c:535
-#: ../clients/cli/connections.c:695 ../clients/cli/connections.c:718
-#: ../clients/cli/connections.c:1995 ../clients/cli/devices.c:1104
-#: ../clients/cli/devices.c:1145 ../clients/cli/devices.c:1147
-#: ../clients/cli/general.c:249 ../clients/cli/general.c:287
-#: ../clients/cli/general.c:422 ../clients/cli/general.c:437
-#: ../clients/cli/settings.c:845 ../clients/cli/settings.c:931
-#: ../clients/cli/settings.c:1315 ../clients/cli/settings.c:1954
-#: ../clients/cli/settings.c:3317
+#: ../clients/cli/connections.c:653 ../clients/cli/connections.c:676
+#: ../clients/cli/connections.c:1949 ../clients/cli/devices.c:1024
+#: ../clients/cli/devices.c:1065 ../clients/cli/devices.c:1067
+#: ../clients/cli/general.c:248 ../clients/cli/general.c:286
+#: ../clients/cli/general.c:432 ../clients/cli/general.c:448
+#: ../clients/cli/settings.c:839 ../clients/cli/settings.c:925
+#: ../clients/cli/settings.c:1265 ../clients/cli/settings.c:1901
+#: ../clients/cli/settings.c:3205 ../clients/cli/utils.c:1400
 #, c-format
 msgid "unknown"
 msgstr "неизвестно"
 
 #. "CAPABILITIES"
-#: ../clients/cli/common.c:527 ../clients/cli/connections.c:975
-#: ../clients/cli/connections.c:977 ../clients/cli/connections.c:979
-#: ../clients/cli/connections.c:1013 ../clients/cli/connections.c:1082
-#: ../clients/cli/connections.c:1083 ../clients/cli/connections.c:1085
-#: ../clients/cli/connections.c:3291 ../clients/cli/connections.c:4414
-#: ../clients/cli/connections.c:6229 ../clients/cli/connections.c:6230
-#: ../clients/cli/devices.c:782 ../clients/cli/devices.c:1069
-#: ../clients/cli/devices.c:1070 ../clients/cli/devices.c:1071
-#: ../clients/cli/devices.c:1072 ../clients/cli/devices.c:1073
-#: ../clients/cli/devices.c:1108 ../clients/cli/devices.c:1110
-#: ../clients/cli/devices.c:1138 ../clients/cli/devices.c:1139
-#: ../clients/cli/devices.c:1140 ../clients/cli/devices.c:1141
-#: ../clients/cli/devices.c:1142 ../clients/cli/devices.c:1143
-#: ../clients/cli/devices.c:1144 ../clients/cli/devices.c:1146
-#: ../clients/cli/devices.c:1148 ../clients/cli/general.c:431
-#: ../clients/cli/settings.c:3312
+#: ../clients/cli/common.c:527 ../clients/cli/connections.c:933
+#: ../clients/cli/connections.c:935 ../clients/cli/connections.c:937
+#: ../clients/cli/connections.c:971 ../clients/cli/connections.c:1040
+#: ../clients/cli/connections.c:1041 ../clients/cli/connections.c:1043
+#: ../clients/cli/connections.c:3450 ../clients/cli/connections.c:8563
+#: ../clients/cli/connections.c:8564 ../clients/cli/devices.c:772
+#: ../clients/cli/devices.c:989 ../clients/cli/devices.c:990
+#: ../clients/cli/devices.c:991 ../clients/cli/devices.c:992
+#: ../clients/cli/devices.c:993 ../clients/cli/devices.c:1028
+#: ../clients/cli/devices.c:1030 ../clients/cli/devices.c:1058
+#: ../clients/cli/devices.c:1059 ../clients/cli/devices.c:1060
+#: ../clients/cli/devices.c:1061 ../clients/cli/devices.c:1062
+#: ../clients/cli/devices.c:1063 ../clients/cli/devices.c:1064
+#: ../clients/cli/devices.c:1066 ../clients/cli/devices.c:1068
+#: ../clients/cli/general.c:442 ../clients/cli/settings.c:3200
 msgid "yes"
 msgstr "да"
 
-#: ../clients/cli/common.c:529 ../clients/cli/connections.c:975
-#: ../clients/cli/connections.c:977 ../clients/cli/connections.c:979
-#: ../clients/cli/connections.c:1082 ../clients/cli/connections.c:1083
-#: ../clients/cli/connections.c:1085 ../clients/cli/connections.c:3292
-#: ../clients/cli/connections.c:4413 ../clients/cli/connections.c:6229
-#: ../clients/cli/connections.c:6230 ../clients/cli/devices.c:782
-#: ../clients/cli/devices.c:1069 ../clients/cli/devices.c:1070
-#: ../clients/cli/devices.c:1071 ../clients/cli/devices.c:1072
-#: ../clients/cli/devices.c:1073 ../clients/cli/devices.c:1108
-#: ../clients/cli/devices.c:1110 ../clients/cli/devices.c:1138
-#: ../clients/cli/devices.c:1139 ../clients/cli/devices.c:1140
-#: ../clients/cli/devices.c:1141 ../clients/cli/devices.c:1142
-#: ../clients/cli/devices.c:1143 ../clients/cli/devices.c:1144
-#: ../clients/cli/devices.c:1146 ../clients/cli/devices.c:1148
-#: ../clients/cli/general.c:433 ../clients/cli/settings.c:3314
+#: ../clients/cli/common.c:529 ../clients/cli/connections.c:933
+#: ../clients/cli/connections.c:935 ../clients/cli/connections.c:937
+#: ../clients/cli/connections.c:1040 ../clients/cli/connections.c:1041
+#: ../clients/cli/connections.c:1043 ../clients/cli/connections.c:3451
+#: ../clients/cli/connections.c:8563 ../clients/cli/connections.c:8564
+#: ../clients/cli/devices.c:772 ../clients/cli/devices.c:989
+#: ../clients/cli/devices.c:990 ../clients/cli/devices.c:991
+#: ../clients/cli/devices.c:992 ../clients/cli/devices.c:993
+#: ../clients/cli/devices.c:1028 ../clients/cli/devices.c:1030
+#: ../clients/cli/devices.c:1058 ../clients/cli/devices.c:1059
+#: ../clients/cli/devices.c:1060 ../clients/cli/devices.c:1061
+#: ../clients/cli/devices.c:1062 ../clients/cli/devices.c:1063
+#: ../clients/cli/devices.c:1064 ../clients/cli/devices.c:1066
+#: ../clients/cli/devices.c:1068 ../clients/cli/general.c:444
+#: ../clients/cli/settings.c:3202
 msgid "no"
 msgstr "нет"
 
 #: ../clients/cli/common.c:531
 msgid "yes (guessed)"
-msgstr ""
+msgstr "да (предположительно)"
 
 #: ../clients/cli/common.c:533
 msgid "no (guessed)"
-msgstr ""
+msgstr "нет (предположительно)"
 
 #: ../clients/cli/common.c:544
 msgid "No reason given"
 msgstr "Причина не указана"
 
 #. We should not really come here
-#: ../clients/cli/common.c:547 ../clients/cli/connections.c:3140
+#: ../clients/cli/common.c:547 ../clients/cli/connections.c:2976
 #, c-format
 msgid "Unknown error"
 msgstr "Неизвестная ошибка"
@@ -524,37 +541,32 @@ msgid "teamd control failed"
 msgstr "Не удалось настроить teamd"
 
 #: ../clients/cli/common.c:715
-#, fuzzy
 msgid "Modem failed or no longer available"
-msgstr "ModemManager недоступен"
+msgstr "Произошел сбой модема, или он больше не доступен"
 
 #: ../clients/cli/common.c:718
-#, fuzzy
 msgid "Modem now ready and available"
-msgstr "ModemManager недоступен"
+msgstr "Модем недоступен"
 
 #: ../clients/cli/common.c:721
 msgid "SIM PIN was incorrect"
-msgstr "Неверный PIN-код SIM-карты"
+msgstr "PIN-код SIM-карты указан неверно"
 
 #: ../clients/cli/common.c:724
-#, fuzzy
 msgid "New connection activation was enqueued"
-msgstr "Ошибка: сбой активации соединения."
+msgstr "Действие активации соединение поставлено в очередь"
 
 #: ../clients/cli/common.c:727
-#, fuzzy
 msgid "The device's parent changed"
-msgstr "Устройство извлечено"
+msgstr "Родительское устройство было изменено"
 
 #: ../clients/cli/common.c:730
-#, fuzzy
 msgid "The device parent's management changed"
-msgstr "Устройство извлечено"
+msgstr "Параметры управления родительским устройством изменились"
 
 #. TRANSLATORS: Unknown reason for a device state change (NMDeviceStateReason)
-#: ../clients/cli/common.c:734 ../libnm-glib/nm-device.c:1898
-#: ../libnm/nm-device.c:1849
+#: ../clients/cli/common.c:734 ../libnm-glib/nm-device.c:1888
+#: ../libnm/nm-device.c:1839
 msgid "Unknown"
 msgstr "Неизвестно"
 
@@ -575,19 +587,19 @@ msgstr ""
 "Недопустимое имя файла или неверная конфигурация агрегации (team): «%s»"
 
 #: ../clients/cli/common.c:958
-#, fuzzy, c-format
+#, c-format
 msgid "Error: openconnect failed: %s\n"
-msgstr "Ошибка. Проверка соединения завершилась неудачей: %s\n"
+msgstr "Ошибка openconnect: %s\n"
 
 #: ../clients/cli/common.c:965
-#, fuzzy, c-format
+#, c-format
 msgid "Error: openconnect failed with status %d\n"
-msgstr "Ошибка редактора: %s"
+msgstr "Ошибка: выполнение openconnect завершилось неудачей. Код: %d\n"
 
 #: ../clients/cli/common.c:967
-#, fuzzy, c-format
+#, c-format
 msgid "Error: openconnect failed with signal %d\n"
-msgstr "Ошибка редактора: %s"
+msgstr "Ошибка: выполнение openconnect завершилось неудачей. Сигнал: %d\n"
 
 #: ../clients/cli/common.c:1045
 #, c-format
@@ -595,118 +607,73 @@ 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"
 
 #. define some prompts for connection editor
-#: ../clients/cli/connections.c:61
+#: ../clients/cli/connections.c:41
 msgid "Setting name? "
 msgstr "Настройка имени?"
 
-#: ../clients/cli/connections.c:62
+#: ../clients/cli/connections.c:42
 msgid "Property name? "
 msgstr "Имя свойства?"
 
-#: ../clients/cli/connections.c:63
+#: ../clients/cli/connections.c:43
 msgid "Enter connection type: "
 msgstr "Выберите тип соединения:"
 
 #. define some other prompts
-#: ../clients/cli/connections.c:66
-#, fuzzy
-msgid "Connection type"
+#: ../clients/cli/connections.c:46
+msgid "Connection type: "
 msgstr "Тип соединения:"
 
-#: ../clients/cli/connections.c:67
-#, fuzzy
-msgid "VPN type"
+#: ../clients/cli/connections.c:47
+msgid "VPN type: "
 msgstr "Тип VPN:"
 
-#: ../clients/cli/connections.c:68
-#, fuzzy
-msgid "Master"
-msgstr "Мастер-агрегации (Bond):"
-
-#: ../clients/cli/connections.c:70 ../clients/tui/nmt-page-infiniband.c:88
-msgid "Transport mode"
-msgstr "Транспортный режим"
-
-#: ../clients/cli/connections.c:75
-#, fuzzy
-msgid "Bluetooth type"
-msgstr "Тип Bluetooth: %s"
-
-#: ../clients/cli/connections.c:81
-#, fuzzy
-msgid "Bonding mode"
-msgstr "Режим мониторинга агрегации (Bond): %s"
-
-#: ../clients/cli/connections.c:83 ../clients/cli/connections.c:4014
-#, fuzzy
-msgid "Bonding monitoring mode"
-msgstr "Режим мониторинга агрегации (Bond): %s"
-
-#: ../clients/cli/connections.c:88
-msgid "Protocol"
-msgstr ""
-
-#: ../clients/cli/connections.c:91
-msgid "Wi-Fi mode"
-msgstr "Режим Wi-Fi"
-
-#: ../clients/cli/connections.c:97
-#, fuzzy
-msgid "ADSL encapsulation"
-msgstr "Аутентификация DSL"
-
-#: ../clients/cli/connections.c:100
-#, fuzzy
-msgid "Tun mode"
-msgstr "Транспортный режим"
+#: ../clients/cli/connections.c:48
+msgid "Master: "
+msgstr "Мастер:"
 
-#: ../clients/cli/connections.c:105
-#, fuzzy
-msgid "IP Tunnel mode"
-msgstr "Соединение PAN"
+#: ../clients/cli/connections.c:49
+msgid "Connection (name, UUID, or path): "
+msgstr "Соединение (имя, UUID или путь):"
 
-#: ../clients/cli/connections.c:107
-#, fuzzy
-msgid "MACVLAN mode"
-msgstr "VLAN"
+#: ../clients/cli/connections.c:50
+msgid "VPN connection (name, UUID, or path): "
+msgstr "Соединение VPN (имя, UUID или путь):"
 
-#: ../clients/cli/connections.c:109
-#, fuzzy
-msgid "Connection (name, UUID, or path)"
-msgstr "Соединение (имя, UUID, или путь):"
+#: ../clients/cli/connections.c:51
+msgid "Connection(s) (name, UUID, or path): "
+msgstr "Соединения (имя, UUID или путь):"
 
-#: ../clients/cli/connections.c:110
-#, fuzzy
-msgid "VPN connection (name, UUID, or path)"
-msgstr "Соединение (имя, UUID, или путь):"
+#: ../clients/cli/connections.c:52
+msgid "Connection(s) (name, UUID, path or apath): "
+msgstr "Соединения (имя, UUID, путь или apath):"
 
-#: ../clients/cli/connections.c:111
-#, fuzzy
-msgid "Connection(s) (name, UUID, or path)"
-msgstr "Соединение (имя, UUID, или путь):"
+#: ../clients/cli/connections.c:53
+msgid "Tunnel mode: "
+msgstr "Туннельный режим:"
 
-#: ../clients/cli/connections.c:112
-#, fuzzy
-msgid "Connection(s) (name, UUID, path or apath)"
-msgstr "Соединение (имя, UUID, или путь):"
+#: ../clients/cli/connections.c:54
+msgid "MACVLAN mode: "
+msgstr "Режим MACVLAN:"
 
 #. 0
-#: ../clients/cli/connections.c:118 ../clients/cli/connections.c:238
+#: ../clients/cli/connections.c:73 ../clients/cli/connections.c:193
 #: ../clients/cli/devices.c:55 ../clients/cli/devices.c:89
 #: ../clients/cli/devices.c:99 ../clients/cli/devices.c:110
 #: ../clients/cli/devices.c:120 ../clients/cli/devices.c:137
 #: ../clients/cli/devices.c:150 ../clients/cli/devices.c:176
 #: ../clients/cli/devices.c:191 ../clients/cli/devices.c:200
-#: ../clients/cli/devices.c:210 ../clients/cli/devices.c:220
-#: ../clients/cli/devices.c:261
+#: ../clients/cli/devices.c:210 ../clients/cli/devices.c:251
 msgid "NAME"
 msgstr "ИМЯ"
 
 #. 0
 #. 1
-#: ../clients/cli/connections.c:119 ../clients/cli/connections.c:239
+#: ../clients/cli/connections.c:74 ../clients/cli/connections.c:194
 msgid "UUID"
 msgstr "UUID"
 
@@ -714,36 +681,35 @@ msgstr "UUID"
 #. 0
 #. 1
 #. 2
-#: ../clients/cli/connections.c:120 ../clients/cli/connections.c:260
+#: ../clients/cli/connections.c:75 ../clients/cli/connections.c:215
 #: ../clients/cli/devices.c:41 ../clients/cli/devices.c:57
 #: ../clients/cli/devices.c:179
 msgid "TYPE"
 msgstr "ТИП"
 
 #. 2
-#: ../clients/cli/connections.c:121
+#: ../clients/cli/connections.c:76
 msgid "TIMESTAMP"
 msgstr "МЕТКА ВРЕМЕНИ"
 
 #. 3
-#: ../clients/cli/connections.c:122
+#: ../clients/cli/connections.c:77
 msgid "TIMESTAMP-REAL"
 msgstr "ДЕЙСТВ. МЕТКА ВРЕМЕНИ"
 
 #. 4
 #. 16
-#: ../clients/cli/connections.c:123 ../clients/cli/devices.c:72
+#: ../clients/cli/connections.c:78 ../clients/cli/devices.c:72
 msgid "AUTOCONNECT"
 msgstr "АВТОПОДКЛЮЧЕНИЕ"
 
 #. 5
-#: ../clients/cli/connections.c:124
-#, fuzzy
+#: ../clients/cli/connections.c:79
 msgid "AUTOCONNECT-PRIORITY"
-msgstr "АВТОПОДКЛЮЧЕНИЕ"
+msgstr "ПРИОРИТЕТ-АВТОПОДКЛЮЧЕНИЯ"
 
 #. 6
-#: ../clients/cli/connections.c:125
+#: ../clients/cli/connections.c:80
 msgid "READONLY"
 msgstr "ТОЛЬКО ДЛЯ ЧТЕНИЯ"
 
@@ -752,7 +718,7 @@ msgstr "ТОЛЬКО ДЛЯ ЧТЕНИЯ"
 #. 2
 #. 15
 #. 5
-#: ../clients/cli/connections.c:126 ../clients/cli/connections.c:246
+#: ../clients/cli/connections.c:81 ../clients/cli/connections.c:201
 #: ../clients/cli/devices.c:43 ../clients/cli/devices.c:166
 #: ../clients/cli/devices.c:182
 msgid "DBUS-PATH"
@@ -761,7 +727,7 @@ msgstr "DBUS-PATH"
 #. 8
 #. 13
 #. 4
-#: ../clients/cli/connections.c:127 ../clients/cli/devices.c:164
+#: ../clients/cli/connections.c:82 ../clients/cli/devices.c:164
 #: ../clients/cli/devices.c:181
 msgid "ACTIVE"
 msgstr "АКТИВЕН"
@@ -771,9 +737,9 @@ msgstr "АКТИВЕН"
 #. 12
 #. 3
 #. 0
-#: ../clients/cli/connections.c:128 ../clients/cli/devices.c:40
+#: ../clients/cli/connections.c:83 ../clients/cli/devices.c:40
 #: ../clients/cli/devices.c:56 ../clients/cli/devices.c:163
-#: ../clients/cli/devices.c:180 ../clients/cli/devices.c:262
+#: ../clients/cli/devices.c:180 ../clients/cli/devices.c:252
 msgid "DEVICE"
 msgstr "УСТРОЙСТВО"
 
@@ -782,42 +748,42 @@ msgstr "УСТРОЙСТВО"
 #. 1
 #. 10
 #. 1
-#: ../clients/cli/connections.c:129 ../clients/cli/connections.c:241
+#: ../clients/cli/connections.c:84 ../clients/cli/connections.c:196
 #: ../clients/cli/devices.c:42 ../clients/cli/devices.c:66
-#: ../clients/cli/general.c:37
+#: ../clients/cli/general.c:36
 msgid "STATE"
 msgstr "СОСТОЯНИЕ"
 
 #. 11
-#: ../clients/cli/connections.c:130
-#, fuzzy
+#: ../clients/cli/connections.c:85
 msgid "ACTIVE-PATH"
-msgstr "МАСТЕР-ПУТЬ"
+msgstr "АКТИВНЫЙ-ПУТЬ"
 
 #. 2
-#: ../clients/cli/connections.c:240
+#: ../clients/cli/connections.c:195
 msgid "DEVICES"
 msgstr "УСТРОЙСТВА"
 
 #. 4
-#: ../clients/cli/connections.c:242
+#: ../clients/cli/connections.c:197
 msgid "DEFAULT"
 msgstr "ПО УМОЛЧАНИЮ"
 
 #. 5
-#: ../clients/cli/connections.c:243
+#: ../clients/cli/connections.c:198
 msgid "DEFAULT6"
 msgstr "ПО УМОЛЧАНИЮ 6"
 
 #. 6
-#: ../clients/cli/connections.c:244
+#: ../clients/cli/connections.c:199
 msgid "SPEC-OBJECT"
 msgstr "SPEC-OBJECT"
 
 #. 7
 #. 4
-#: ../clients/cli/connections.c:245 ../clients/cli/connections.c:283
-#: ../clients/tui/nm-editor-utils.c:233
+#. Ask for optional 'vpn' arguments.
+#: ../clients/cli/connections.c:200 ../clients/cli/connections.c:238
+#: ../clients/cli/connections.c:4169 ../clients/tui/nm-editor-utils.c:233
 #: ../clients/tui/nmt-connect-connection-list.c:405
 msgid "VPN"
 msgstr "VPN"
@@ -825,71 +791,71 @@ msgstr "VPN"
 #. 9
 #. 5
 #. 22
-#: ../clients/cli/connections.c:247 ../clients/cli/devices.c:46
+#: ../clients/cli/connections.c:202 ../clients/cli/devices.c:46
 #: ../clients/cli/devices.c:78
 msgid "CON-PATH"
 msgstr "ПУТЬ ПОДКЛЮЧЕНИЯ"
 
 #. 10
-#: ../clients/cli/connections.c:248
+#: ../clients/cli/connections.c:203
 msgid "ZONE"
 msgstr "ЗОНА"
 
 #. 11
-#: ../clients/cli/connections.c:249
+#: ../clients/cli/connections.c:204
 msgid "MASTER-PATH"
 msgstr "МАСТЕР-ПУТЬ"
 
 #. 1
-#: ../clients/cli/connections.c:261
+#: ../clients/cli/connections.c:216
 msgid "USERNAME"
 msgstr "ИМЯ_ПОЛЬЗОВАТЕЛЯ"
 
 #. 3
-#: ../clients/cli/connections.c:263
+#: ../clients/cli/connections.c:218
 msgid "BANNER"
 msgstr "БАННЕР"
 
 #. 4
-#: ../clients/cli/connections.c:264
+#: ../clients/cli/connections.c:219
 msgid "VPN-STATE"
 msgstr "СТАТУС VPN"
 
 #. 5
-#: ../clients/cli/connections.c:265
+#: ../clients/cli/connections.c:220
 msgid "CFG"
 msgstr "CFG"
 
-#: ../clients/cli/connections.c:278 ../clients/cli/devices.c:235
+#: ../clients/cli/connections.c:233 ../clients/cli/devices.c:225
 msgid "GENERAL"
 msgstr "ОБЩИЕ"
 
 #. 0
 #. 6
-#: ../clients/cli/connections.c:279 ../clients/cli/devices.c:242
+#: ../clients/cli/connections.c:234 ../clients/cli/devices.c:232
 msgid "IP4"
 msgstr "IP4"
 
 #. 1
 #. 7
-#: ../clients/cli/connections.c:280 ../clients/cli/devices.c:243
+#: ../clients/cli/connections.c:235 ../clients/cli/devices.c:233
 msgid "DHCP4"
 msgstr "DHCP4"
 
 #. 2
 #. 8
-#: ../clients/cli/connections.c:281 ../clients/cli/devices.c:244
+#: ../clients/cli/connections.c:236 ../clients/cli/devices.c:234
 msgid "IP6"
 msgstr "IP6"
 
 #. 3
 #. 9
-#: ../clients/cli/connections.c:282 ../clients/cli/devices.c:245
+#: ../clients/cli/connections.c:237 ../clients/cli/devices.c:235
 msgid "DHCP6"
 msgstr "DHCP6"
 
-#: ../clients/cli/connections.c:314
-#, fuzzy, c-format
+#: ../clients/cli/connections.c:272
+#, c-format
 msgid ""
 "Usage: nmcli connection { COMMAND | help }\n"
 "\n"
@@ -904,8 +870,8 @@ msgid ""
 "\n"
 "  down [id | uuid | path | apath] <ID> ...\n"
 "\n"
-"  add COMMON_OPTIONS TYPE_SPECIFIC_OPTIONS SLAVE_OPTIONS IP_OPTIONS [-- "
-"([+|-]<setting>.<property> <value>)+]\n"
+"  add COMMON_OPTIONS TYPE_SPECIFIC_OPTIONS SLAVE_OPTIONS IP_OPTIONS [-- ([+|-"
+"]<setting>.<property> <value>)+]\n"
 "\n"
 "  modify [--temporary] [id | uuid | path] <ID> ([+|-]<setting>.<property> "
 "<value>)+\n"
@@ -930,33 +896,42 @@ msgid ""
 msgstr ""
 "Формат: nmcli connection { КОМАНДА | help }\n"
 "\n"
-"КОМАНДА := { show | up | down | add | modify | edit | delete | reload | "
-"load }\n"
+"КОМАНДА := { show | up | down | add | modify | edit | delete | monitor | "
+"reload | load }\n"
 "\n"
-"  show configured [[id | uuid | путь] <ID>]\n"
-"  show active     [[id | uuid | путь | абс.путь] <ID>]\n"
+"  show [--active] [--order <порядок>]\n"
+"  show [--active] [id | uuid | path | apath] <ID> ...\n"
 "\n"
-"  up [[id | uuid | путь] <ID>] [ifname <имя>] [ap <BSSID>] [nsp <имя>]\n"
+"  up [[id | uuid | путь] <ID>] [ifname <имя>] [ap <BSSID>] [passwd-file "
+"<файл_паролей>]\n"
 "\n"
-"  up [[id | uuid | путь] <ID>] [ifname <имя>] [ap <BSSID>]\n"
+"  down [id | uuid | path | apath] <ID>\n"
 "\n"
-"  down [id | uuid | путь | абс.путь] <ID>\n"
+"  add ОБЩИЕ_ПАРАМЕТРЫ  СОБСТВЕННЫЕ_ПАРАМЕТРЫ  "
+"ПАРАМЕТРЫ_ПОДЧИНЕННЫХ_КОМПОНЕНТОВ ПАРАМЕТРЫ_IP  [-- ([+|-]<параметр>."
+"<свойство> <значение>)+]\n"
 "\n"
-"  add ОБЩИЕ_ПАРАМЕТРЫ  ПАРАМЕТРЫ_ТИПА  ПАРАМЕТРЫ_IP\n"
+"  modify [--temporary] [id | uuid | path] <ID>  ([+|-]<параметр>.<свойство> "
+"<значение>)+\n"
 "\n"
-"  modify [id | uuid | путь] <ID> <параметр>.<свойство> <значение>\n"
+"   clone [--temporary] [id | uuid | path ] <ID> <новое_имя>\n"
 "\n"
-"  edit [id | uuid | путь] <ID>\n"
+"  edit [id | uuid | path] <ID>\n"
 "  edit [type <новый_тип>] [con-name <новое_имя>]\n"
 "\n"
-"  delete [id | uuid | путь] <ID>\n"
+"  delete [id | uuid | path] <ID>\n"
+"\n"
+"  monitor [id | uuid | path] <ID> ...\n"
 "\n"
 "  reload\n"
 "\n"
 "  load <файл> [ <файл>... ]\n"
 "\n"
+"  import [--temporary] type <тип> file <импортируемый_файл>\n"
+"\n"
+"  export [id | uuid | path] <ID> [<выходной_файл>]\n"
 
-#: ../clients/cli/connections.c:336
+#: ../clients/cli/connections.c:294
 #, c-format
 msgid ""
 "Usage: nmcli connection show { ARGUMENTS | help }\n"
@@ -982,9 +957,28 @@ msgid ""
 "account. Use global --show-secrets option to reveal associated secrets as "
 "well.\n"
 msgstr ""
+"Формат: nmcli connection show { АРГУМЕНТЫ | help }\n"
+"\n"
+"АРГУМЕНТЫ := [--active] [--order <порядок>]\n"
+"\n"
+"Возвращает профили соединений, хранящиеся в памяти и на диске, некоторые\n"
+"из которых могут уже использоваться устройствами и находиться в активном "
+"состоянии.\n"
+"Если аргументы не заданы, будут показаны все доступные профили.\n"
+"Аргумент --active предназначен для просмотра списка активных профилей;\n"
+"--order позволяет изменить порядок соединений (см. страницу man).\n"
+"\n"
+"АРГУМЕНТЫ := [--active] [id | uuid | path | apath] <ID> ...\n"
+"\n"
+"Возвращает информацию об указанных соединениях. По умолчанию вывод \n"
+"будет содержать данные активных и статических соединений. Вывод команды\n"
+"можно дополнительно отфильтровать с помощью глобального параметра --fields.\n"
+"За подробной информацией обратитесь к справочной странице.\n"
+"Аргумент --active предназначен для просмотра списка активных профилей;\n"
+"глобальный ключ --show-secrets добавляет в вывод соответствующие секреты.\n"
 
-#: ../clients/cli/connections.c:357
-#, fuzzy, c-format
+#: ../clients/cli/connections.c:315
+#, c-format
 msgid ""
 "Usage: nmcli connection up { ARGUMENTS | help }\n"
 "\n"
@@ -1010,23 +1004,24 @@ msgstr ""
 "Формат: nmcli connection up { АРГУМЕНТЫ | help }\n"
 "\n"
 "АРГУМЕНТЫ := [id | uuid | path] <ID> [ifname <интерфейс>] [ap <BSSID>] [nsp "
-"<имя>]\n"
+"<имя>]  [passwd-file <файл_паролей>]\n"
 "\n"
-"Подключение выбранного устройства. \n"
-"Профиль определяется по имени, UUID или пути D-Bus.\n"
+"Активация подключения выбранного устройства. \n"
+"Профиль соединения определяется по имени, UUID или пути D-Bus.\n"
 "\n"
-"АРГУМЕНТЫ := ifname <интерфейс> [ap <BSSID>] [nsp <имя>]\n"
+"АРГУМЕНТЫ := ifname <интерфейс> [ap <BSSID>] [nsp <имя>] [passwd-file "
+"<файл_паролей>]\n"
 "\n"
-"Подключение выбранного устройства. \n"
+"Активация подключения выбранного устройства. \n"
 "NetworkManager автоматически выберет профиль соединения.\n"
 "\n"
 "ifname — подключаемый интерфейс\n"
 "ap     — точка подключения (только для Wi-Fi)\n"
 "nsp    — NSP (только для WiMAX)\n"
-"\n"
+"passwd-file — файл с паролями, необходимыми для установки соединения.\n"
 
-#: ../clients/cli/connections.c:378
-#, fuzzy, c-format
+#: ../clients/cli/connections.c:336
+#, c-format
 msgid ""
 "Usage: nmcli connection down { ARGUMENTS | help }\n"
 "\n"
@@ -1040,21 +1035,19 @@ msgid ""
 msgstr ""
 "Формат: nmcli connection down { АРГУМЕНТЫ | help }\n"
 "\n"
-"АРГУМЕНТЫ := [id | uuid | path | apath] <ID>\n"
+"АРГУМЕНТЫ := [id | uuid | path | apath] <ID> ...\n"
 "\n"
-"Отключение соединения с устройством, не ограничивая подключение в "
-"дальнейшем.\n"
+"Отключение соединения без ограничения возможности\n"
+"автоматической установки соединения в будущем. \n"
 "Профиль определяется по имени, UUID или пути D-Bus.\n"
-"\n"
-"\n"
 
-#: ../clients/cli/connections.c:390
-#, fuzzy, c-format
+#: ../clients/cli/connections.c:348
+#, 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"
+"ARGUMENTS := COMMON_OPTIONS TYPE_SPECIFIC_OPTIONS SLAVE_OPTIONS IP_OPTIONS [-"
+"- ([+|-]<setting>.<property> <value>)+]\n"
 "\n"
 "  COMMON_OPTIONS:\n"
 "                  type <type>\n"
@@ -1141,8 +1134,8 @@ msgid ""
 "                  [path-cost <1-65535>]\n"
 "                  [hairpin yes|no]\n"
 "\n"
-"    vpn:          vpn-type vpnc|openvpn|pptp|openconnect|openswan|libreswan|"
-"ssh|l2tp|iodine|...\n"
+"    vpn:          vpn-type "
+"vpnc|openvpn|pptp|openconnect|openswan|libreswan|ssh|l2tp|iodine|...\n"
 "                  [user <username>]\n"
 "\n"
 "    olpc-mesh:    ssid <SSID>\n"
@@ -1192,15 +1185,19 @@ msgid ""
 msgstr ""
 "Формат: nmcli connection add { АРГУМЕНТЫ | help }\n"
 "\n"
-"АРГУМЕНТЫ := ОБЩИЕ_ПАРАМЕТРЫ ПАРАМЕТРЫ_СОЕДИНЕНИЯ ПАРАМЕТРЫ_IP\n"
+"АРГУМЕНТЫ := ОБЩИЕ ТИПОВЫЕ ПОДЧИНЕННЫЕ IP-ПАРАМЕТРЫ [-- ([+|-]<параметр>."
+"<свойство> <значение>)+]\n"
 "\n"
 "  ОБЩИЕ ПАРАМЕТРЫ:\n"
 "                  type <тип>\n"
 "                  ifname <интерфейс> | \"*\"\n"
 "                  [con-name <соединение>]\n"
 "                  [autoconnect yes|no]\n"
+"                  [save yes|no]\n"
+"                  [master <мастер (ifname или же UUID или имя соединения)>]\n"
+"                  [slave-type <тип_соединения>]\n"
 "\n"
-"  ПАРАМЕТРЫ_СОЕДИНЕНИЯ:\n"
+"  ТИПОВЫЕ ПАРАМЕТРЫ:\n"
 "    ethernet:     [mac <MAC-адрес>]\n"
 "                  [cloned-mac <клонированный MAC-адрес>]\n"
 "                  [mtu <MTU>]\n"
@@ -1209,6 +1206,7 @@ msgstr ""
 "                  [mac <MAC-адрес>]\n"
 "                  [cloned-mac <клонированный MAC-адрес>]\n"
 "                  [mtu <MTU>]\n"
+"                  [mode infrastructure|ap|adhoc]\n"
 "\n"
 "    wimax:        [mac <MAC-адрес>]\n"
 "                  [nsp <NSP>]\n"
@@ -1235,8 +1233,8 @@ msgstr ""
 "    bluetooth:    [addr <адрес bluetooth>]\n"
 "                  [bt-type panu|dun-gsm|dun-cdma]\n"
 "\n"
-"    vlan:         dev <родительское устройство (UUID соединения, имя "
-"интерфейса или MAC)>\n"
+"    vlan:         dev <род. устройство (UUID соединения, имя интерфейса или "
+"MAC-адрес)>\n"
 "                  id <VLAN ID>\n"
 "                  [flags <флаги VLAN>]\n"
 "                  [ingress <соответствие приоритета на входе>]\n"
@@ -1253,13 +1251,14 @@ msgstr ""
 "                  [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 <file>|<данные JSON>]\n"
+"                  [config <файл>|<данные JSON>]\n"
 "\n"
 "    bridge:       [stp yes|no]\n"
 "                  [priority <число>]\n"
@@ -1267,25 +1266,64 @@ msgstr ""
 "                  [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\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"
-"  IP_OPTIONS:\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 <родитель (ifname или UUID)>]\n"
+"\n"
+"    macvlan:      dev <родитель (UUID, ifname или 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 <родитель (ifname или UUID)>]\n"
+"                  [source-port-min <0-65535>]\n"
+"                  [source-port-max <0-65535>]\n"
+"                  [destination-port <0-65535>]\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:502
+#: ../clients/cli/connections.c:460
 #, c-format
 msgid ""
 "Usage: nmcli connection modify { ARGUMENTS | help }\n"
@@ -1300,8 +1338,8 @@ msgid ""
 "\n"
 "Examples:\n"
 "nmcli con mod home-wifi wifi.ssid rakosnicek\n"
-"nmcli con mod em1-1 ipv4.method manual ipv4.addr \"192.168.1.2/24, "
-"10.10.1.5/8\"\n"
+"nmcli con mod em1-1 ipv4.method manual ipv4.addr \"192.168.1.2/24, 10.10.1.5/"
+"8\"\n"
 "nmcli con mod em1-1 +ipv4.dns 8.8.4.4\n"
 "nmcli con mod em1-1 -ipv4.dns 1\n"
 "nmcli con mod em1-1 -ipv6.addr \"abbe::cafe/56\"\n"
@@ -1309,8 +1347,29 @@ msgid ""
 "nmcli con mod bond0 -bond.options downdelay\n"
 "\n"
 msgstr ""
+"Формат: nmcli connection modify { АРГУМЕНТЫ | help }\n"
+"\n"
+"АРГУМЕНТЫ := [id | uuid | path] <ID> ([+|-]<параметр>.<свойство> "
+"<значение>)+\n"
+"\n"
+"Позволяет изменить один или несколько параметров профиля соединения.\n"
+"Профиль идентифицируется по имени, идентификатору UUID или пути D-Bus.\n"
+"Для изменения свойств, содержащих несколько значений, используйте\n"
+"префиксы «+» и «-» перед именем свойства.\n"
+"«+»  добавляет новые значения вместо перезаписи существующих;\n"
+"«-» позволяет выборочно удалить значения.\n"
+"\n"
+"Примеры:\n"
+"nmcli con mod home-wifi wifi.ssid rakosnicek\n"
+"nmcli con mod em1-1 ipv4.method manual ipv4.addr \"192.168.1.2/24, 10.10.1.5/"
+"8\"\n"
+"nmcli con mod em1-1 +ipv4.dns 8.8.4.4\n"
+"nmcli con mod em1-1 -ipv4.dns 1\n"
+"nmcli con mod em1-1 -ipv6.addr \"abbe::cafe/56\"\n"
+"nmcli con mod bond0 +bond.options mii=500\n"
+"nmcli con mod bond0 -bond.options downdelay\n"
 
-#: ../clients/cli/connections.c:525
+#: ../clients/cli/connections.c:483
 #, c-format
 msgid ""
 "Usage: nmcli connection clone { ARGUMENTS | help }\n"
@@ -1318,13 +1377,20 @@ msgid ""
 "ARGUMENTS := [--temporary] [id | uuid | path] <ID> <new name>\n"
 "\n"
 "Clone an existing connection profile. The newly created connection will be\n"
-"the exact copy of the <ID>, except the uuid property (will be generated) "
-"and\n"
+"the exact copy of the <ID>, except the uuid property (will be generated) and\n"
 "id (provided as <new name> argument).\n"
 "\n"
 msgstr ""
+"Формат: nmcli connection clone { АРГУМЕНТЫ | help }\n"
+"\n"
+"АРГУМЕНТЫ := [id | uuid | path] <ID> <новое имя>\n"
+"\n"
+"Клонирование профиля соединения. Новый профиль будет содержать\n"
+"точную копию профиля, заданного с помощью <ID>, за исключением\n"
+"идентификатора UUID (генерируется автоматически) \n"
+"и id (определяется на основании аргумента <новое имя>).\n"
 
-#: ../clients/cli/connections.c:537
+#: ../clients/cli/connections.c:495
 #, c-format
 msgid ""
 "Usage: nmcli connection edit { ARGUMENTS | help }\n"
@@ -1351,7 +1417,7 @@ msgstr ""
 "Добавление нового профиля соединения в интерактивном редакторе.\n"
 "\n"
 
-#: ../clients/cli/connections.c:552
+#: ../clients/cli/connections.c:510
 #, c-format
 msgid ""
 "Usage: nmcli connection delete { ARGUMENTS | help }\n"
@@ -1370,8 +1436,8 @@ msgstr ""
 "Профиль определяется по имени, UUID или пути D-Bus.\n"
 "\n"
 
-#: ../clients/cli/connections.c:563
-#, fuzzy, c-format
+#: ../clients/cli/connections.c:521
+#, c-format
 msgid ""
 "Usage: nmcli connection monitor { ARGUMENTS | help }\n"
 "\n"
@@ -1382,19 +1448,15 @@ msgid ""
 "Monitors all connection profiles in case none is specified.\n"
 "\n"
 msgstr ""
-"Формат: nmcli connection edit { АРГУМЕНТЫ | help }\n"
-"\n"
-"АРГУМЕНТЫ := [id | uuid | путь] <ID>\n"
+"Формат: nmcli connection monitor { АРГУМЕНТЫ | help }\n"
 "\n"
-"Изменение существующего профиля соединения.\n"
-"Профиль определяется по имени, UUID или пути D-Bus.\n"
-"\n"
-"АРГУМЕНТЫ := [type <новый_тип>] [con-name <новое_имя>]\n"
-"\n"
-"Добавление нового профиля соединения в интерактивном редакторе.\n"
+"АРГУМЕНТЫ := [id | uuid | path] <ID>\n"
 "\n"
+"Мониторинг изменений профиля соединения.\n"
+"Эта команда выводит новую строку в ответ на изменения профиля.\n"
+"Если профиль не указан явно, будут отслеживаться все профили.\n"
 
-#: ../clients/cli/connections.c:575
+#: ../clients/cli/connections.c:533
 #, c-format
 msgid ""
 "Usage: nmcli connection reload { help }\n"
@@ -1407,7 +1469,7 @@ msgstr ""
 "Перезагрузка файлов соединений с диска.\n"
 "\n"
 
-#: ../clients/cli/connections.c:583
+#: ../clients/cli/connections.c:541
 #, c-format
 msgid ""
 "Usage: nmcli connection load { ARGUMENTS | help }\n"
@@ -1424,12 +1486,12 @@ msgstr ""
 "\n"
 "АРГУМЕНТЫ := <filename> [<файл>...]\n"
 "\n"
-"Загружает файлы соединений с диска. \n"
-"Обычно используется после изменения файлов соединений вручную.\n"
+"Загружает/перезагружает файлы соединений с диска. \n"
+"Обычно используется после редактирования файлов вручную.\n"
 "\n"
 "\n"
 
-#: ../clients/cli/connections.c:595
+#: ../clients/cli/connections.c:553
 #, c-format
 msgid ""
 "Usage: nmcli connection import { ARGUMENTS | help }\n"
@@ -1443,9 +1505,19 @@ msgid ""
 "is imported by NetworkManager VPN plugins.\n"
 "\n"
 msgstr ""
+"Формат: nmcli connection import { АРГУМЕНТЫ | help }\n"
+"\n"
+"АРГУМЕНТЫ := [--temporary] type <тип> file <файл>\n"
+"\n"
+"Импорт другой/внешней конфигурации и создание\n"
+"профиля соединения NetwrokManager на ее основе. \n"
+"Тип входного файла определяется аргументом type.\n"
+"В настоящее время поддерживаются только соединения VPN.\n"
+"Импорт данных осуществляется дополнительными \n"
+"модулями VPN для NetworkManager.\n"
 
-#: ../clients/cli/connections.c:608
-#, fuzzy, c-format
+#: ../clients/cli/connections.c:566
+#, c-format
 msgid ""
 "Usage: nmcli connection export { ARGUMENTS | help }\n"
 "\n"
@@ -1455,899 +1527,1329 @@ msgid ""
 "The data are directed to standard output or to a file if a name is given.\n"
 "\n"
 msgstr ""
-"Формат: nmcli connection delete { АРГУМЕНТЫ | help }\n"
+"Формат: nmcli connection export { АРГУМЕНТЫ | help }\n"
 "\n"
 "АРГУМЕНТЫ := [id | uuid | path] <ID>\n"
 "\n"
-"Удаление профиля соединения.\n"
-"Профиль определяется по имени, UUID или пути D-Bus.\n"
-"\n"
+"Экспорт соединения. В настоящее время поддерживаются только соединения VPN.\n"
+"Экспортируемые данные будут направлены в стандартный поток вывода \n"
+"или, если указано имя файла, в файл.\n"
 
-#: ../clients/cli/connections.c:686
+#: ../clients/cli/connections.c:644
 msgid "activating"
 msgstr "активация"
 
-#: ../clients/cli/connections.c:688
+#: ../clients/cli/connections.c:646
 msgid "activated"
 msgstr "включено"
 
-#: ../clients/cli/connections.c:692
+#: ../clients/cli/connections.c:650
 msgid "deactivated"
 msgstr "отключено"
 
-#: ../clients/cli/connections.c:704
+#: ../clients/cli/connections.c:662
 msgid "VPN connecting (prepare)"
 msgstr "Подключение VPN (подготовка)"
 
-#: ../clients/cli/connections.c:706
+#: ../clients/cli/connections.c:664
 msgid "VPN connecting (need authentication)"
 msgstr "Подключение VPN (требуется аутентификация)"
 
-#: ../clients/cli/connections.c:708
+#: ../clients/cli/connections.c:666
 msgid "VPN connecting"
 msgstr "Подключение VPN"
 
-#: ../clients/cli/connections.c:710
+#: ../clients/cli/connections.c:668
 msgid "VPN connecting (getting IP configuration)"
 msgstr "Подключение VPN (получение конфигурации IP)"
 
-#: ../clients/cli/connections.c:712
+#: ../clients/cli/connections.c:670
 msgid "VPN connected"
 msgstr "VPN подключён"
 
-#: ../clients/cli/connections.c:714
+#: ../clients/cli/connections.c:672
 msgid "VPN connection failed"
 msgstr "Сбой подключения VPN"
 
-#: ../clients/cli/connections.c:716
+#: ../clients/cli/connections.c:674
 msgid "VPN disconnected"
 msgstr "VPN отключён"
 
-#: ../clients/cli/connections.c:786
-#, fuzzy, c-format
+#: ../clients/cli/connections.c:744
+#, c-format
 msgid "Error updating secrets for %s: %s\n"
-msgstr "Ошибка при сохранении соединения: %s"
+msgstr "Ошибка при обновлении секретов для %s: %s\n"
 
-#: ../clients/cli/connections.c:806
-#, fuzzy
+#: ../clients/cli/connections.c:764
 msgid "Connection profile details"
-msgstr "Свойства подключения"
+msgstr "Свойства профиля соединения"
 
-#: ../clients/cli/connections.c:818 ../clients/cli/connections.c:1211
-#, fuzzy, c-format
+#: ../clients/cli/connections.c:776 ../clients/cli/connections.c:1169
+#, c-format
 msgid "Error: 'connection show': %s"
-msgstr "Ошибка «device show»: %s"
+msgstr "Ошибка «connection show»: %s"
 
-#: ../clients/cli/connections.c:974 ../clients/cli/settings.c:1950
+#: ../clients/cli/connections.c:932 ../clients/cli/settings.c:1897
 msgid "never"
 msgstr "никогда"
 
-#: ../clients/cli/connections.c:1199
-#, fuzzy
+#: ../clients/cli/connections.c:1157
 msgid "Activate connection details"
 msgstr "Сведения об активном соединении"
 
-#: ../clients/cli/connections.c:1435
-#, fuzzy, c-format
+#: ../clients/cli/connections.c:1393
+#, c-format
 msgid "invalid field '%s'; allowed fields: %s and %s, or %s,%s"
-msgstr "неверное поле «%s»; допустимые поля: %s"
+msgstr "неверное поле «%s»; допустимые поля: %s и %s или %s,%s"
 
-#: ../clients/cli/connections.c:1450 ../clients/cli/connections.c:1458
-#, fuzzy, c-format
+#: ../clients/cli/connections.c:1408 ../clients/cli/connections.c:1416
+#, c-format
 msgid "'%s' has to be alone"
-msgstr "поле «%s» должно быть единственным"
+msgstr "«%s» не может использоваться с чем-либо другим"
 
 #. Add headers
-#: ../clients/cli/connections.c:1680
-#, fuzzy
+#: ../clients/cli/connections.c:1634
 msgid "NetworkManager active profiles"
-msgstr "Состояние NetworkManager"
+msgstr "Активные профили NetworkManager"
 
-#: ../clients/cli/connections.c:1681
-#, fuzzy
+#: ../clients/cli/connections.c:1635
 msgid "NetworkManager connection profiles"
-msgstr "NetworkManager перешёл в спящий режим"
-
-#.
-#. * TODO(?): complete uuid, path or id
-#. if (nmc->complete) {
-#. quit ();
-#. }
-#.
-#: ../clients/cli/connections.c:1727 ../clients/cli/connections.c:2445
-#: ../clients/cli/connections.c:2467 ../clients/cli/connections.c:2476
-#: ../clients/cli/connections.c:2485 ../clients/cli/connections.c:2648
-#: ../clients/cli/connections.c:7777 ../clients/cli/connections.c:7896
-#: ../clients/cli/connections.c:8032 ../clients/cli/connections.c:8170
-#: ../clients/cli/connections.c:8289 ../clients/cli/connections.c:8300
-#: ../clients/cli/connections.c:8410 ../clients/cli/devices.c:2402
-#: ../clients/cli/devices.c:2410 ../clients/cli/devices.c:2736
-#: ../clients/cli/devices.c:2743 ../clients/cli/devices.c:2757
-#: ../clients/cli/devices.c:2764 ../clients/cli/devices.c:2781
-#: ../clients/cli/devices.c:2789 ../clients/cli/devices.c:2802
-#: ../clients/cli/devices.c:3166 ../clients/cli/devices.c:3173
-#: ../clients/cli/devices.c:3180 ../clients/cli/devices.c:3192
-#: ../clients/cli/devices.c:3205 ../clients/cli/devices.c:3212
-#: ../clients/cli/devices.c:3384 ../clients/cli/devices.c:3391
-#: ../clients/cli/devices.c:3564
+msgstr "Профили соединений NetworkManager"
+
+#: ../clients/cli/connections.c:1681 ../clients/cli/connections.c:2389
+#: ../clients/cli/connections.c:2411 ../clients/cli/connections.c:2420
+#: ../clients/cli/connections.c:2429 ../clients/cli/connections.c:2588
+#: ../clients/cli/connections.c:10156 ../clients/cli/connections.c:10273
+#: ../clients/cli/connections.c:10405 ../clients/cli/connections.c:10538
+#: ../clients/cli/connections.c:10648 ../clients/cli/connections.c:10659
+#: ../clients/cli/connections.c:10758 ../clients/cli/devices.c:2344
+#: ../clients/cli/devices.c:2352 ../clients/cli/devices.c:2675
+#: ../clients/cli/devices.c:2682 ../clients/cli/devices.c:2696
+#: ../clients/cli/devices.c:2703 ../clients/cli/devices.c:2720
+#: ../clients/cli/devices.c:2728 ../clients/cli/devices.c:2741
+#: ../clients/cli/devices.c:3105 ../clients/cli/devices.c:3112
+#: ../clients/cli/devices.c:3119 ../clients/cli/devices.c:3131
+#: ../clients/cli/devices.c:3144 ../clients/cli/devices.c:3151
+#: ../clients/cli/devices.c:3323 ../clients/cli/devices.c:3330
+#: ../clients/cli/devices.c:3503
 #, c-format
 msgid "Error: %s argument is missing."
 msgstr "Ошибка: отсутствует аргумент %s."
 
-#: ../clients/cli/connections.c:1742
-#, fuzzy, c-format
+#: ../clients/cli/connections.c:1696
+#, c-format
 msgid "Error: %s - no such connection profile."
-msgstr "Ошибка: неизвестное подключение %s."
+msgstr "Ошибка: профиль %s не обнаружен."
 
-#: ../clients/cli/connections.c:1801 ../clients/cli/connections.c:2508
-#: ../clients/cli/connections.c:8825 ../clients/cli/devices.c:3353
-#: ../clients/cli/devices.c:3834 ../clients/cli/general.c:528
-#: ../clients/cli/general.c:577 ../clients/cli/general.c:594
-#: ../clients/cli/general.c:633 ../clients/cli/general.c:647
-#: ../clients/cli/general.c:765 ../clients/cli/general.c:812
-#: ../clients/cli/general.c:832
+#: ../clients/cli/connections.c:1755 ../clients/cli/connections.c:2452
+#: ../clients/cli/connections.c:11162 ../clients/cli/devices.c:3292
+#: ../clients/cli/devices.c:3779 ../clients/cli/general.c:539
+#: ../clients/cli/general.c:588 ../clients/cli/general.c:605
+#: ../clients/cli/general.c:644 ../clients/cli/general.c:658
+#: ../clients/cli/general.c:776 ../clients/cli/general.c:823
+#: ../clients/cli/general.c:843
 #, c-format
 msgid "Error: %s."
 msgstr "Ошибка: %s."
 
-#: ../clients/cli/connections.c:1897
+#: ../clients/cli/connections.c:1851
 #, c-format
 msgid "no active connection on device '%s'"
 msgstr "на устройстве «%s» нет активных соединений"
 
-#: ../clients/cli/connections.c:1905
+#: ../clients/cli/connections.c:1859
 msgid "no active connection or device"
 msgstr "на устройстве нет активных соединений"
 
-#: ../clients/cli/connections.c:1956
+#: ../clients/cli/connections.c:1910
 #, c-format
 msgid "device '%s' not compatible with connection '%s'"
 msgstr "устройство «%s» несовместимо с соединением «%s»"
 
-#: ../clients/cli/connections.c:1959
+#: ../clients/cli/connections.c:1913
 #, c-format
 msgid "no device found for connection '%s'"
 msgstr "не найдено устройство для соединения «%s»"
 
-#: ../clients/cli/connections.c:1971
+#: ../clients/cli/connections.c:1925
 msgid "unknown reason"
 msgstr "неизвестная причина"
 
-#: ../clients/cli/connections.c:1973 ../clients/cli/general.c:278
+#: ../clients/cli/connections.c:1927 ../clients/cli/general.c:277
 msgid "none"
 msgstr "нет"
 
-#: ../clients/cli/connections.c:1975
+#: ../clients/cli/connections.c:1929
 msgid "the user was disconnected"
 msgstr "пользователь был отключён"
 
-#: ../clients/cli/connections.c:1977
+#: ../clients/cli/connections.c:1931
 msgid "the base network connection was interrupted"
 msgstr "основное соединение с сетью было разорвано"
 
-#: ../clients/cli/connections.c:1979
+#: ../clients/cli/connections.c:1933
 msgid "the VPN service stopped unexpectedly"
 msgstr "служба VPN внезапно прекратила работу"
 
-#: ../clients/cli/connections.c:1981
+#: ../clients/cli/connections.c:1935
 msgid "the VPN service returned invalid configuration"
 msgstr "служба VPN вернула недопустимую конфигурацию"
 
-#: ../clients/cli/connections.c:1983
+#: ../clients/cli/connections.c:1937
 msgid "the connection attempt timed out"
 msgstr "время ожидания соединения истекло"
 
-#: ../clients/cli/connections.c:1985
+#: ../clients/cli/connections.c:1939
 msgid "the VPN service did not start in time"
 msgstr "служба VPN не была запущена вовремя"
 
-#: ../clients/cli/connections.c:1987
+#: ../clients/cli/connections.c:1941
 msgid "the VPN service failed to start"
 msgstr "не удалось запустить службу VPN"
 
-#: ../clients/cli/connections.c:1989
+#: ../clients/cli/connections.c:1943
 msgid "no valid VPN secrets"
 msgstr "нет верных секретов VPN"
 
-#: ../clients/cli/connections.c:1991
+#: ../clients/cli/connections.c:1945
 msgid "invalid VPN secrets"
 msgstr "неверные секреты VPN"
 
-#: ../clients/cli/connections.c:1993
+#: ../clients/cli/connections.c:1947
 msgid "the connection was removed"
 msgstr "соединение удалено"
 
-#: ../clients/cli/connections.c:2015 ../clients/cli/connections.c:2050
-#: ../clients/cli/connections.c:2211 ../clients/cli/connections.c:6120
+#: ../clients/cli/connections.c:1969 ../clients/cli/connections.c:1997
+#: ../clients/cli/connections.c:2158 ../clients/cli/connections.c:8454
 #, c-format
 msgid "Connection successfully activated (D-Bus active path: %s)\n"
 msgstr "Соединение успешно активировано (адрес действующего D-Bus: %s)\n"
 
-#: ../clients/cli/connections.c:2023
-#, fuzzy, c-format
+#: ../clients/cli/connections.c:1976
+#, c-format
 msgid ""
 "Connection successfully activated (master waiting for slaves) (D-Bus active "
 "path: %s)\n"
-msgstr "Соединение успешно активировано (адрес действующего D-Bus: %s)\n"
-
-#: ../clients/cli/connections.c:2030 ../clients/cli/connections.c:6126
-#, c-format
-msgid "Error: Connection activation failed.\n"
-msgstr "Ошибка. Не удалось активировать соединение.\n"
+msgstr ""
+"Соединение успешно активировано: мастер ожидает активации подчиненных "
+"(активный адрес D-Bus: %s)\n"
 
-#: ../clients/cli/connections.c:2033 ../clients/cli/connections.c:2055
+#: ../clients/cli/connections.c:1980 ../clients/cli/connections.c:2002
 #, c-format
 msgid "Error: Connection activation failed."
 msgstr "Ошибка: сбой активации соединения."
 
-#: ../clients/cli/connections.c:2106
+#: ../clients/cli/connections.c:2053
 #, c-format
 msgid "VPN connection successfully activated (D-Bus active path: %s)\n"
 msgstr "VPN-соединение успешно установлено (адрес действующего D-Bus: %s)\n"
 
-#: ../clients/cli/connections.c:2114
+#: ../clients/cli/connections.c:2061
 #, c-format
 msgid "Error: Connection activation failed: %s."
 msgstr "Ошибка: сбой активации соединения: %s."
 
-#: ../clients/cli/connections.c:2133 ../clients/cli/devices.c:1506
+#: ../clients/cli/connections.c:2080 ../clients/cli/devices.c:1426
 #, c-format
 msgid "Error: Timeout %d sec expired."
 msgstr "Ошибка: превышено время ожидания (%d с)."
 
-#: ../clients/cli/connections.c:2193
+#: ../clients/cli/connections.c:2140
 #, c-format
 msgid "Error: Connection activation failed: %s"
 msgstr "Ошибка: сбой активации соединения: %s"
 
-#: ../clients/cli/connections.c:2278
-#, fuzzy, c-format
+#: ../clients/cli/connections.c:2225
+#, c-format
 msgid "failed to read passwd-file '%s': %s"
-msgstr "Ошибка. Не удалось изменить значение  «%s»: %s\n"
+msgstr "Не удалось прочитать файл passwd  «%s»: %s"
 
-#: ../clients/cli/connections.c:2290
+#: ../clients/cli/connections.c:2237
 #, c-format
 msgid "missing colon in 'password' entry '%s'"
-msgstr ""
+msgstr "отсутствует двоеточие в записи «password»: «%s»"
 
-#: ../clients/cli/connections.c:2298
+#: ../clients/cli/connections.c:2245
 #, c-format
 msgid "missing dot in 'password' entry '%s'"
-msgstr ""
+msgstr "отсутствует точка в записи «password»: «%s»"
 
-#: ../clients/cli/connections.c:2311
+#: ../clients/cli/connections.c:2258
 #, c-format
 msgid "invalid setting name in 'password' entry '%s'"
-msgstr ""
+msgstr "неверное имя параметра в в записи «password»: «%s»"
 
-#: ../clients/cli/connections.c:2367
+#: ../clients/cli/connections.c:2314
 #, c-format
 msgid "unknown device '%s'."
 msgstr "неизвестное устройство «%s»"
 
-#: ../clients/cli/connections.c:2372
+#: ../clients/cli/connections.c:2319
 msgid "neither a valid connection nor device given"
 msgstr "недействительное подключение или устройство не определено"
 
-#: ../clients/cli/connections.c:2458
-#, fuzzy, c-format
+#: ../clients/cli/connections.c:2402
+#, c-format
 msgid "Error: Connection '%s' does not exist."
-msgstr "Ошибка. Недействительное соединение: %s\n"
+msgstr "Ошибка. Соединение «%s» не существует."
 
-#: ../clients/cli/connections.c:2493 ../clients/cli/devices.c:1405
-#: ../clients/cli/devices.c:2416 ../clients/cli/devices.c:2813
-#: ../clients/cli/devices.c:3397
+#: ../clients/cli/connections.c:2437 ../clients/cli/devices.c:1325
+#: ../clients/cli/devices.c:2358 ../clients/cli/devices.c:2752
+#: ../clients/cli/devices.c:3336
 #, c-format
 msgid "Unknown parameter: %s\n"
 msgstr "Неизвестный параметр: %s\n"
 
-#: ../clients/cli/connections.c:2518
+#: ../clients/cli/connections.c:2462
 msgid "preparing"
 msgstr "подготовка"
 
-#: ../clients/cli/connections.c:2539
-#, fuzzy, c-format
+#: ../clients/cli/connections.c:2483
+#, c-format
 msgid "Connection '%s' (%s) successfully deleted.\n"
-msgstr "Соединение «%s» (%s) добавлено.\n"
+msgstr "Соединение «%s» (%s) удалено.\n"
 
-#: ../clients/cli/connections.c:2555
-#, fuzzy, c-format
+#: ../clients/cli/connections.c:2499
+#, c-format
 msgid "Connection '%s' successfully deactivated (D-Bus active path: %s)\n"
-msgstr "Соединение успешно активировано (адрес действующего D-Bus: %s)\n"
+msgstr "Соединение «%s» успешно отключено (активный адрес D-Bus: %s)\n"
 
-#: ../clients/cli/connections.c:2630 ../clients/cli/connections.c:8018
-#: ../clients/cli/connections.c:8226
+#: ../clients/cli/connections.c:2570 ../clients/cli/connections.c:10391
+#: ../clients/cli/connections.c:10590
 #, c-format
 msgid "Error: No connection specified."
-msgstr "Ошибка. Соединение не определено."
+msgstr "Ошибка. Соединение не задано."
 
-#: ../clients/cli/connections.c:2662
-#, fuzzy, c-format
+#: ../clients/cli/connections.c:2602
+#, c-format
 msgid "Error: '%s' is not an active connection.\n"
-msgstr "Ошибка: «%s» не является активным соединением."
+msgstr "Ошибка: «%s» не является активным соединением.\n"
 
-#: ../clients/cli/connections.c:2663 ../clients/cli/connections.c:8047
-#, fuzzy, c-format
+#: ../clients/cli/connections.c:2603 ../clients/cli/connections.c:10420
+#, c-format
 msgid "Error: not all active connections found."
-msgstr "Ошибка: «%s» не является активным соединением."
+msgstr "Ошибка. Обнаружены не все активные соединения."
 
-#: ../clients/cli/connections.c:2672
-#, fuzzy, c-format
+#: ../clients/cli/connections.c:2612
+#, c-format
 msgid "Error: no active connection provided."
-msgstr "Ошибка: неизвестное подключение %s."
+msgstr "Ошибка. Необходимо предоставить активное соединение."
 
-#: ../clients/cli/connections.c:3120 ../clients/cli/utils.c:648
+#: ../clients/cli/connections.c:2955 ../clients/cli/utils.c:702
 #, c-format
 msgid "'%s' not among [%s]"
 msgstr "«%s» не входит в %s"
 
-#: ../clients/cli/connections.c:3280
+#: ../clients/cli/connections.c:3032
 #, c-format
-msgid "Warning: master='%s' doesn't refer to any existing profile.\n"
-msgstr ""
+msgid "Error: '%s': '%s' is not a valid %s MAC address."
+msgstr "Ошибка. «%s»: «%s» не является действительным %s MAC-адресом."
 
-#: ../clients/cli/connections.c:3451
-#, fuzzy, c-format
-msgid "Error: don't know how to create '%s' setting."
-msgstr "Ошибка. Не удалось получить системные параметры."
+#. Ask for optional arguments
+#: ../clients/cli/connections.c:3033 ../clients/cli/connections.c:3565
+#: ../clients/tui/nm-editor-utils.c:163 ../libnm-core/nm-connection.c:1716
+#: ../libnm-glib/nm-device.c:1861 ../libnm/nm-device.c:1812
+msgid "InfiniBand"
+msgstr "InfiniBand"
 
-#: ../clients/cli/connections.c:3462
-#, c-format
-msgid "Error: invalid property '%s': %s."
-msgstr "Ошибка. Недопустимое свойство «%s»: %s."
+#: ../clients/cli/connections.c:3033 ../clients/tui/nm-editor-utils.c:146
+#: ../libnm-glib/nm-device.c:1849 ../libnm/nm-device.c:1800
+msgid "Ethernet"
+msgstr "Ethernet"
 
-#: ../clients/cli/connections.c:3479
+#: ../clients/cli/connections.c:3053
 #, c-format
-msgid "Error: failed to modify %s.%s: %s."
-msgstr "Ошибка. Не удалось изменить %s.%s: %s."
+msgid "Error: 'mtu': '%s' is not a valid MTU."
+msgstr "Ошибка «mtu». Недействительный MTU: «%s» "
 
-#: ../clients/cli/connections.c:3498
-#, fuzzy, c-format
-msgid "Error: failed to remove a value from %s.%s: %s."
-msgstr "Ошибка. Не удалось изменить значение  «%s»: %s\n"
+#: ../clients/cli/connections.c:3069
+#, c-format
+msgid "Error: 'parent': '%s' is not a valid interface name."
+msgstr "Ошибка «parent». Недействительное имя интерфейса: «%s» "
 
-#: ../clients/cli/connections.c:3524
-#, fuzzy, c-format
-msgid "Error: '%s' is mandatory."
-msgstr "Ошибка. Параметр «%s» не определен.\n"
+#: ../clients/cli/connections.c:3090
+#, c-format
+msgid "Error: 'p-key': '%s' is not a valid InfiniBand P_KEY."
+msgstr "Ошибка «p-key». Недействительный InfiniBand P_KEY: «%s»"
 
-#: ../clients/cli/connections.c:3556
-#, fuzzy, c-format
-msgid "Error: invalid slave type; %s."
-msgstr "Ошибка. Недопустимый тип соединения: %s."
+#: ../clients/cli/connections.c:3105
+#, c-format
+msgid "Error: '%s' is not a valid UID/GID."
+msgstr "Ошибка. Недействительный UID/GID: «%s»"
 
-#: ../clients/cli/connections.c:3569
+#: ../clients/cli/connections.c:3149
 #, c-format
-msgid "Error: invalid connection type; %s."
-msgstr "Ошибка. Недопустимый тип соединения: %s."
+msgid "Error: '%s': '%s' is not a valid %s %s."
+msgstr "Ошибка. «%s»: «%s» не содержит действительный %s %s."
 
-#: ../clients/cli/connections.c:3744
-#, fuzzy, c-format
-msgid "Error: bad connection type: %s."
-msgstr "Ошибка. Недопустимый тип соединения: %s."
+#: ../clients/cli/connections.c:3162
+msgid "Wi-Fi mode"
+msgstr "Режим Wi-Fi"
 
-#: ../clients/cli/connections.c:3802
-#, fuzzy, c-format
-msgid "Error: '%s' is not a valid interface nor '*'."
-msgstr ""
-"Ошибка «ifname». Недействительный интерфейс: «%s». Укажите другой интерфейс "
-"или «*»."
+#: ../clients/cli/connections.c:3171
+msgid "InfiniBand transport mode"
+msgstr "Транспортный режим InfiniBand"
 
-#: ../clients/cli/connections.c:3825
-#, fuzzy
-msgid "Error: master is required"
-msgstr "Ошибка. Необходимо определить «master»."
+#: ../clients/cli/connections.c:3183
+msgid "ADSL protocol"
+msgstr "Протокол ADSL"
 
-#: ../clients/cli/connections.c:3883
-#, fuzzy, c-format
-msgid "Error: error adding bond option '%s=%s'."
-msgstr "Ошибка. Неизвестное соединение: «%s»."
+#: ../clients/cli/connections.c:3194
+msgid "ADSL encapsulation"
+msgstr "Инкапсуляция ADSL"
+
+#: ../clients/cli/connections.c:3203
+msgid "TUN device mode"
+msgstr "Режим устройства TUN"
 
-#: ../clients/cli/connections.c:3914
+#: ../clients/cli/connections.c:3216
 #, c-format
-msgid "Error: '%s' is not a valid monitoring mode; use '%s' or '%s'.\n"
-msgstr ""
-"Ошибка. Недопустимый режим мониторинга: «%s». Используйте «%s» или  «%s».\n"
+msgid "Error: 'flags': '%s' is not valid; use <0-7>."
+msgstr "Ошибка «flags». Неверное значение: «%s». Допустимые значения: <0-7>."
 
-#: ../clients/cli/connections.c:3945
+#: ../clients/cli/connections.c:3238
 #, c-format
-msgid "Error: 'bt-type': '%s' not valid; use [%s, %s (%s), %s]."
+msgid "Error: '%s': '%s' is not valid; %s "
+msgstr "Error: '%s': '%s' is not valid; %s "
+
+#: ../clients/cli/connections.c:3416
+#, c-format
+msgid "Warning: master='%s' doesn't refer to any existing profile.\n"
 msgstr ""
-"Ошибка «bt-type». Неверное значение «%s». Используйте [%s, %s (%s), %s]."
+"Предупреждение: мастер «%s» не относится ни к одному существующему профилю."
+"\n"
 
-#: ../clients/cli/connections.c:3972
-#, fuzzy
-msgid "Interface name [*]"
-msgstr "Имя интерфейса [*]: "
+#: ../clients/cli/connections.c:3441
+#, c-format
+msgid "Error: '%s': '%s' is not valid; use <%u-%u>."
+msgstr "Ошибка «%s». Недействительный «%s»: используйте <%u-%u>."
 
-#: ../clients/cli/connections.c:3976
-#, fuzzy
-msgid "PPPoE username"
-msgstr "Пользователь PPPoE:"
+#. Ask for optional arguments.
+#: ../clients/cli/connections.c:3497
+#, c-format
+msgid "There is %d optional argument for '%s' connection type.\n"
+msgid_plural "There are %d optional arguments for '%s' connection type.\n"
+msgstr[0] ""
+"При настройке соединений %2$s допускается использование %1$d дополнительного "
+"аргумента.\n"
+msgstr[1] ""
+"При настройке соединений %2$s допускается использование %1$d дополнительных "
+"аргументов.\n"
+msgstr[2] ""
+"При настройке соединений %2$s допускается использование %1$d дополнительных "
+"аргументов.\n"
 
-#: ../clients/cli/connections.c:3977 ../clients/cli/connections.c:3998
-#: ../clients/cli/connections.c:4000 ../clients/cli/connections.c:4049
-#, fuzzy
-msgid "Password [none]"
-msgstr "Пароль [нет]: "
+#: ../clients/cli/connections.c:3500
+#, c-format
+msgid "Do you want to provide it? %s"
+msgid_plural "Do you want to provide them? %s"
+msgstr[0] "Хотите его предоставить? %s"
+msgstr[1] "Хотите их предоставить? %s"
+msgstr[2] "Хотите их предоставить? %s"
 
-#: ../clients/cli/connections.c:3978
-#, fuzzy
-msgid "Service [none]"
-msgstr "Служба [нет]: "
+#. Ask for optional arguments
+#: ../clients/cli/connections.c:3517
+msgid "ethernet"
+msgstr "Ethernet"
 
-#: ../clients/cli/connections.c:3979 ../clients/cli/connections.c:3982
-#: ../clients/cli/connections.c:3991
-#, fuzzy
-msgid "MTU [auto]"
+#: ../clients/cli/connections.c:3522 ../clients/cli/connections.c:3570
+#: ../clients/cli/connections.c:3704 ../clients/cli/connections.c:3783
+msgid "MTU [auto]: "
 msgstr "MTU [авто]: "
 
-#: ../clients/cli/connections.c:3980 ../clients/cli/connections.c:3983
-#: ../clients/cli/connections.c:3992 ../clients/cli/connections.c:3995
-#: ../clients/cli/connections.c:4036
-#, fuzzy
-msgid "MAC [none]"
+#: ../clients/cli/connections.c:3533 ../clients/cli/connections.c:3581
+#: ../clients/cli/connections.c:3676 ../clients/cli/connections.c:3715
+#: ../clients/cli/connections.c:4101
+msgid "MAC [none]: "
 msgstr "MAC [нет]: "
 
-#: ../clients/cli/connections.c:3981 ../clients/cli/connections.c:3993
-#, fuzzy
-msgid "Cloned MAC [none]"
+#: ../clients/cli/connections.c:3544
+msgid "Cloned MAC [none]: "
 msgstr "Клонированный MAC [нет]:"
 
-#: ../clients/cli/connections.c:3986
-#, fuzzy
-msgid "Parent interface [none]"
+#: ../clients/cli/connections.c:3592
+#, c-format
+msgid "Transport mode %s"
+msgstr "Транспортный режим %s"
+
+#: ../clients/cli/connections.c:3605
+msgid "Parent interface [none]: "
 msgstr "Родительский интерфейс [нет]:"
 
-#: ../clients/cli/connections.c:3987
-#, fuzzy
-msgid "P_KEY [none]"
+#: ../clients/cli/connections.c:3616
+msgid "P_KEY [none]: "
 msgstr "P_KEY [нет]: "
 
-#. 0
-#: ../clients/cli/connections.c:3988 ../clients/cli/connections.c:4043
-#: ../clients/cli/devices.c:151 ../clients/tui/nmt-page-wifi.c:224
-msgid "SSID"
-msgstr "SSID"
+#: ../clients/cli/connections.c:3626
+#, c-format
+msgid "Error: 'p-key' is mandatory when 'parent' is specified.\n"
+msgstr "Ошибка. Если задан «parent», необходимо определить «p-key» \n"
 
-#: ../clients/cli/connections.c:3994
-#, fuzzy
-msgid "WiMAX NSP name"
-msgstr "Имя WiMAX NSP"
+#. Ask for optional arguments
+#: ../clients/cli/connections.c:3643 ../clients/tui/nm-editor-utils.c:154
+#: ../libnm-glib/nm-device.c:1851 ../libnm/nm-device.c:1802
+msgid "Wi-Fi"
+msgstr "Wi-Fi"
 
-#: ../clients/cli/connections.c:3996
-#, fuzzy
-msgid "APN"
-msgstr "ТОЧКА ДОСТУПА"
+#: ../clients/cli/connections.c:3651 ../clients/cli/connections.c:6199
+#, c-format
+msgid "Mode %s"
+msgstr "Режим %s"
 
-#: ../clients/cli/connections.c:3997 ../clients/cli/connections.c:3999
-#: ../clients/cli/connections.c:4042
-#, fuzzy
-msgid "Username [none]"
+#. Ask for optional 'wimax' arguments.
+#: ../clients/cli/connections.c:3671 ../libnm-glib/nm-device.c:1857
+#: ../libnm/nm-device.c:1808
+msgid "WiMAX"
+msgstr "WiMAX"
+
+#. Ask for optional 'pppoe' arguments.
+#: ../clients/cli/connections.c:3694
+msgid "PPPoE"
+msgstr "PPPoE"
+
+#: ../clients/cli/connections.c:3698 ../clients/cli/connections.c:3736
+#: ../clients/cli/connections.c:4223
+msgid "Password [none]: "
+msgstr "Пароль [нет]: "
+
+#: ../clients/cli/connections.c:3700
+msgid "Service [none]: "
+msgstr "Служба [нет]: "
+
+#. Ask for optional 'gsm' or 'cdma' arguments.
+#: ../clients/cli/connections.c:3730
+msgid "mobile broadband"
+msgstr "мобильное широкополосное"
+
+#: ../clients/cli/connections.c:3734 ../clients/cli/connections.c:4173
+msgid "Username [none]: "
 msgstr "Пользователь [нет]: "
 
-#: ../clients/cli/connections.c:4001
-#, fuzzy
-msgid "Bluetooth device address"
-msgstr "Адрес устройства Bluetooth:"
+#. Ask for optional 'bluetooth' arguments.
+#: ../clients/cli/connections.c:3749
+msgid "bluetooth"
+msgstr "bluetooth"
 
-#: ../clients/cli/connections.c:4004
-#, fuzzy
-msgid "VLAN parent device or connection UUID"
-msgstr "Родительское устройство VLAN или подключение UUID:"
+#: ../clients/cli/connections.c:3756
+#, c-format
+msgid "Bluetooth type %s"
+msgstr "Тип Bluetooth: %s"
 
-#: ../clients/cli/connections.c:4006
-#, fuzzy
-msgid "VLAN ID (<0-4094>)"
-msgstr "VLAN ID <0-4095>: "
+#: ../clients/cli/connections.c:3762
+#, c-format
+msgid "Error: 'bt-type': '%s' is not a valid bluetooth type.\n"
+msgstr "Ошибка: «bt-type»: «%s» не является допустимым типом bluetooth.\n"
 
-#: ../clients/cli/connections.c:4007
-#, fuzzy
-msgid "VLAN flags (<0-7>) [none]"
+#. Ask for optional 'vlan' arguments.
+#. 13
+#: ../clients/cli/connections.c:3778 ../clients/cli/devices.c:239
+#: ../clients/tui/nm-editor-utils.c:217 ../clients/tui/nmt-page-vlan.c:94
+#: ../libnm-core/nm-connection.c:1714 ../libnm-glib/nm-device.c:1869
+#: ../libnm-util/nm-connection.c:1632 ../libnm/nm-device.c:1820
+msgid "VLAN"
+msgstr "VLAN"
+
+#: ../clients/cli/connections.c:3794
+msgid "VLAN flags (<0-7>) [none]: "
 msgstr "Флаги VLAN (<0-7>) [нет]: "
 
-#: ../clients/cli/connections.c:4008
-#, fuzzy
-msgid "Ingress priority maps [none]"
+#: ../clients/cli/connections.c:3805
+msgid "Ingress priority maps [none]: "
 msgstr "Соответствие приоритета на входе [нет]:"
 
-#: ../clients/cli/connections.c:4009
-#, fuzzy
-msgid "Egress priority maps [none]"
+#: ../clients/cli/connections.c:3816
+msgid "Egress priority maps [none]: "
 msgstr "Соответствие приоритета на выходе [нет]:"
 
-#: ../clients/cli/connections.c:4012
-#, fuzzy
-msgid "Bonding primary interface [none]"
+#: ../clients/cli/connections.c:3827
+msgid "Bonding mode [balance-rr]: "
+msgstr "Режим агрегации (Bond) [balance-rr]: "
+
+#. Ask for optional 'bond' arguments.
+#: ../clients/cli/connections.c:3843
+msgid "bond"
+msgstr "агрегированное (Bond)"
+
+#: ../clients/cli/connections.c:3865
+msgid "Bonding primary interface [none]: "
 msgstr "Основной интерфейс агрегации (Bond) [нет]:"
 
-#: ../clients/cli/connections.c:4016
-#, fuzzy
-msgid "Bonding miimon [100]"
+#: ../clients/cli/connections.c:3868
+#, c-format
+msgid "Error: 'primary': '%s' is not a valid interface name.\n"
+msgstr "Ошибка: «primary»: «%s» не является допустимым именем интерфейса.\n"
+
+#: ../clients/cli/connections.c:3876
+#, c-format
+msgid "Bonding monitoring mode %s"
+msgstr "Режим мониторинга агрегации (Bond): %s"
+
+#: ../clients/cli/connections.c:3882
+#, 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:3891
+msgid "Bonding miimon [100]: "
 msgstr "Bonding miimon [100]: "
 
-#: ../clients/cli/connections.c:4017
-#, fuzzy
-msgid "Bonding downdelay [0]"
+#: ../clients/cli/connections.c:3894
+#, c-format
+msgid "Error: 'miimon': '%s' is not a valid number <0-%u>.\n"
+msgstr "Ошибка «miimon». Недопустимое значение «%s». Ожидается: <0-%u>.\n"
+
+#: ../clients/cli/connections.c:3902
+msgid "Bonding downdelay [0]: "
 msgstr "Bonding downdelay [0]: "
 
-#: ../clients/cli/connections.c:4018
-#, fuzzy
-msgid "Bonding updelay [0]"
+#: ../clients/cli/connections.c:3905
+#, c-format
+msgid "Error: 'downdelay': '%s' is not a valid number <0-%u>.\n"
+msgstr "Ошибка «downdelay». Недопустимое значение «%s». Ожидается: <0-%u>.\n"
+
+#: ../clients/cli/connections.c:3913
+msgid "Bonding updelay [0]: "
 msgstr "Bonding updelay [0]: "
 
-#: ../clients/cli/connections.c:4019
-#, fuzzy
-msgid "Bonding arp-interval [0]"
+#: ../clients/cli/connections.c:3916
+#, c-format
+msgid "Error: 'updelay': '%s' is not a valid number <0-%u>.\n"
+msgstr "Ошибка «updelay». Недопустимое значение «%s». Ожидается: <0-%u>.\n"
+
+#: ../clients/cli/connections.c:3925
+msgid "Bonding arp-interval [0]: "
 msgstr "Bonding arp-interval [0]: "
 
-#: ../clients/cli/connections.c:4021
-#, fuzzy
-msgid "Bonding arp-ip-target [none]"
+#: ../clients/cli/connections.c:3928
+#, c-format
+msgid "Error: 'arp-interval': '%s' is not a valid number <0-%u>.\n"
+msgstr ""
+"Ошибка «arp-interval». Недопустимое значение «%s». Ожидается: <0-%u>.\n"
+
+#. FIXME: verify the string
+#: ../clients/cli/connections.c:3936
+msgid "Bonding arp-ip-target [none]: "
 msgstr "Bonding arp-ip-target [нет]: "
 
-#: ../clients/cli/connections.c:4023
-#, fuzzy
-msgid "LACP rate ('slow' or 'fast') [slow]"
+#: ../clients/cli/connections.c:3943
+msgid "LACP rate ('slow' or 'fast') [slow]: "
 msgstr "Скорость LACP (slow/fast) [slow]:"
 
-#: ../clients/cli/connections.c:4025 ../clients/cli/connections.c:4026
-#, fuzzy
-msgid "Team JSON configuration [none]"
+#: ../clients/cli/connections.c:3949
+#, c-format
+msgid "Error: 'lacp_rate': '%s' is invalid ('slow' or 'fast').\n"
+msgstr "Ошибка. Недопустимое значение lacp_rate: «%s» («slow» или «fast»).\n"
+
+#: ../clients/cli/connections.c:3972
+msgid "Team JSON configuration [none]: "
 msgstr "Конфигурация JSON агрегированного соединения (team) [нет]:"
 
-#: ../clients/cli/connections.c:4027
-#, fuzzy
-msgid "Enable STP [no]"
+#: ../clients/cli/connections.c:3989
+msgid "team"
+msgstr "агрегированное (team)"
+
+#: ../clients/cli/connections.c:3995
+msgid "team-slave"
+msgstr "Слейв агрегированного соединения (team)"
+
+#. Ask for optional 'bridge' arguments.
+#: ../clients/cli/connections.c:4007
+msgid "bridge"
+msgstr "мост"
+
+#: ../clients/cli/connections.c:4013
+#, c-format
+msgid "Enable STP %s"
 msgstr "Включить STP %s"
 
-#: ../clients/cli/connections.c:4029
-#, fuzzy
-msgid "STP priority [32768]"
+#: ../clients/cli/connections.c:4018
+#, c-format
+msgid "Error: 'stp': %s.\n"
+msgstr "Ошибка: «stp»: %s.\n"
+
+#: ../clients/cli/connections.c:4026
+msgid "STP priority [32768]: "
 msgstr "Приоритет STP [32768]: "
 
 #: ../clients/cli/connections.c:4030
-#, fuzzy
-msgid "Forward delay [15]"
+#, c-format
+msgid "Error: 'priority': '%s' is not a valid number <0-%d>.\n"
+msgstr "Недопустимое значение «priority»: «%s». Ожидается: <0-%d>.\n"
+
+#: ../clients/cli/connections.c:4038
+msgid "Forward delay [15]: "
 msgstr "Forward delay [15]:"
 
-#: ../clients/cli/connections.c:4031
-#, fuzzy
-msgid "Hello time [2]"
+#: ../clients/cli/connections.c:4042
+#, c-format
+msgid "Error: 'forward-delay': '%s' is not a valid number <2-30>.\n"
+msgstr ""
+"Ошибка «forward-delay». Недопустимое значение «%s». Ожидается: <2-30>.\n"
+
+#: ../clients/cli/connections.c:4051
+msgid "Hello time [2]: "
 msgstr "Hello time [2]: "
 
-#: ../clients/cli/connections.c:4032
-#, fuzzy
-msgid "Max age [20]"
+#: ../clients/cli/connections.c:4055
+#, c-format
+msgid "Error: 'hello-time': '%s' is not a valid number <1-10>.\n"
+msgstr "Недопустимое значение «hello-time»: «%s». Ожидается: <1-10>.\n"
+
+#: ../clients/cli/connections.c:4063
+msgid "Max age [20]: "
 msgstr "Max age [20]: "
 
-#: ../clients/cli/connections.c:4033
-#, fuzzy
-msgid "MAC address ageing time [300]"
+#: ../clients/cli/connections.c:4067
+#, c-format
+msgid "Error: 'max-age': '%s' is not a valid number <6-40>.\n"
+msgstr "Недопустимое значение «max-age»: «%s». Ожидается: <6-40>.\n"
+
+#: ../clients/cli/connections.c:4075
+msgid "MAC address ageing time [300]: "
 msgstr "Время действия MAC-адреса [300]: "
 
-#: ../clients/cli/connections.c:4034
-#, fuzzy, c-format
-msgid "Enable IGMP snooping %s [no]"
+#: ../clients/cli/connections.c:4079
+#, c-format
+msgid "Error: 'ageing-time': '%s' is not a valid number <0-1000000>.\n"
+msgstr "Недопустимое значение «ageing-time»: «%s». Ожидается: <0-1000000>.\n"
+
+#: ../clients/cli/connections.c:4088
+#, c-format
+msgid "Enable IGMP snooping %s"
 msgstr "Включить IGMP snooping %s"
 
-#: ../clients/cli/connections.c:4037
-#, fuzzy
-msgid "Bridge port priority [32]"
+#: ../clients/cli/connections.c:4093
+#, c-format
+msgid "Error: 'multicast-snooping': %s.\n"
+msgstr "Ошибка «multicast-snooping»: %s\n"
+
+#. Ask for optional 'bridge-slave' arguments.
+#: ../clients/cli/connections.c:4120
+msgid "bridge-slave"
+msgstr "Слейв соединения типа «мост»"
+
+#: ../clients/cli/connections.c:4125
+msgid "Bridge port priority [32]: "
 msgstr "Приоритет порта моста [32]: "
 
-#: ../clients/cli/connections.c:4038
-#, fuzzy
-msgid "Bridge port STP path cost [100]"
+#: ../clients/cli/connections.c:4138
+msgid "Bridge port STP path cost [100]: "
 msgstr "Стоимость STP порта моста [100]: "
 
-#: ../clients/cli/connections.c:4039
-#, fuzzy
-msgid "Hairpin [no]"
-msgstr "Режим разворота пакетов"
+#: ../clients/cli/connections.c:4152
+#, c-format
+msgid "Hairpin %s"
+msgstr "Разворот пакетов %s"
 
-#: ../clients/cli/connections.c:4044
-#, fuzzy
-msgid "OLPC Mesh channel [1]"
+#: ../clients/cli/connections.c:4157
+#, c-format
+msgid "Error: 'hairpin': %s.\n"
+msgstr "Ошибка. «hairpin»:  %s\n"
+
+#. Ask for optional 'olpc' arguments.
+#: ../clients/cli/connections.c:4184 ../libnm-glib/nm-device.c:1855
+#: ../libnm/nm-device.c:1806
+msgid "OLPC Mesh"
+msgstr "OLPC Mesh"
+
+#: ../clients/cli/connections.c:4189
+msgid "OLPC Mesh channel [1]: "
 msgstr "Канал OLPC mesh [1]:"
 
-#: ../clients/cli/connections.c:4045
-#, fuzzy
-msgid "DHCP anycast MAC address [none]"
+#: ../clients/cli/connections.c:4192
+#, c-format
+msgid "Error: 'channel': '%s' is not a valid number <1-13>.\n"
+msgstr "Ошибка «channel». Недопустимое значение «%s». Ожидается: <1-13>.\n"
+
+#: ../clients/cli/connections.c:4200
+msgid "DHCP anycast MAC address [none]: "
 msgstr "MAC-адрес рассылки DHCP [нет]:"
 
-#. TTLS and PEAP are actually much more complicated, but this complication
-#. * is not visible here since we only care about phase2 authentication
-#. * (and don't even care of which one)
-#.
-#: ../clients/cli/connections.c:4046
-#: ../clients/common/nm-secret-agent-simple.c:223
-#: ../clients/common/nm-secret-agent-simple.c:328
-#: ../clients/tui/nmt-page-dsl.c:66 ../clients/tui/nmt-page-wifi.c:332
-msgid "Username"
-msgstr "Пользователь"
+#. Ask for optional 'adsl' arguments.
+#: ../clients/cli/connections.c:4219 ../libnm-glib/nm-device.c:1871
+#: ../libnm/nm-device.c:1822
+msgid "ADSL"
+msgstr "ADSL"
 
-#: ../clients/cli/connections.c:4052
-#, fuzzy
-msgid "MACVLAN parent device or connection UUID"
-msgstr "Родительское устройство VLAN или подключение UUID:"
+#: ../clients/cli/connections.c:4227
+#, c-format
+msgid "ADSL encapsulation %s"
+msgstr "Инкапсуляция ADSL %s"
 
-#: ../clients/cli/connections.c:4055
-msgid "Tap [no]"
-msgstr ""
+#. Ask for optional 'macvlan' arguments.
+#: ../clients/cli/connections.c:4245
+msgid "macvlan"
+msgstr "macvlan"
 
-#: ../clients/cli/connections.c:4057
-#, fuzzy
-msgid "VXLAN ID"
-msgstr "VLAN ID <0-4095>: "
+#: ../clients/cli/connections.c:4251
+#, c-format
+msgid "Tap %s"
+msgstr "Tap %s"
 
-#: ../clients/cli/connections.c:4058 ../clients/cli/connections.c:4076
-#, fuzzy
-msgid "Remote"
-msgstr "Удалить"
+#: ../clients/cli/connections.c:4256
+#, c-format
+msgid "Error: 'tap': %s.\n"
+msgstr "Ошибка. «tap»: %s\n"
 
-#: ../clients/cli/connections.c:4059 ../clients/cli/connections.c:4077
-#, fuzzy
-msgid "Parent device [none]"
-msgstr "Родительский интерфейс [нет]:"
+#. Ask for optional 'vxlan' arguments.
+#: ../clients/cli/connections.c:4272 ../libnm-glib/nm-device.c:1875
+#: ../libnm/nm-device.c:1826
+msgid "VXLAN"
+msgstr "VXLAN"
 
-#: ../clients/cli/connections.c:4060
-#, fuzzy
-msgid "Local address [none]"
-msgstr "MAC-адрес рассылки DHCP [нет]:"
+#: ../clients/cli/connections.c:4277 ../clients/cli/connections.c:4601
+msgid "Parent device [none]: "
+msgstr "Родительское устройство [нет]:"
+
+#: ../clients/cli/connections.c:4282 ../clients/cli/connections.c:4606
+#, c-format
+msgid "Error: 'dev': '%s' is neither UUID nor interface name.\n"
+msgstr "Ошибка «dev». «%s» может содержать UUID и имя интерфейса.\n"
+
+#: ../clients/cli/connections.c:4291
+msgid "Local address [none]: "
+msgstr "Локальный адрес [нет]:"
 
-#: ../clients/cli/connections.c:4061
-msgid "Minimum source port [0]"
+#: ../clients/cli/connections.c:4296
+#, c-format
+msgid "Error: 'local': '%s' is not a valid IP address.\n"
+msgstr "Ошибка. «local»: «%s» не является действительным IP-адресом.\n"
+
+#: ../clients/cli/connections.c:4305
+msgid "Minimum source port [0]: "
+msgstr "Минимальный исходный порт [0]: "
+
+#: ../clients/cli/connections.c:4309
+#, c-format
+msgid "Error: 'source-port-min': '%s' is not a valid number <0-65535>.\n"
 msgstr ""
+"Ошибка «source-port-min». Недопустимое значение «%s». Ожидается: <0-65535>."
+"\n"
 
-#: ../clients/cli/connections.c:4062
-msgid "Maximum source port [0]"
+#: ../clients/cli/connections.c:4318
+msgid "Maximum source port [0]: "
+msgstr "Максимальный исходный порт [0]: "
+
+#: ../clients/cli/connections.c:4322
+#, c-format
+msgid "Error: 'source-port-max': '%s' is not a valid number <0-65535>.\n"
 msgstr ""
+"Ошибка «source-port-max». Недопустимое значение «%s». Ожидается: <0-65535>."
+"\n"
 
-#: ../clients/cli/connections.c:4063
-#, fuzzy
-msgid "Destination port [8472]"
-msgstr "Назначение"
+#: ../clients/cli/connections.c:4331
+msgid "Destination port [8472]: "
+msgstr "Порт назначения [8472]:"
 
-#: ../clients/cli/connections.c:4066
-#, fuzzy
-msgid "User ID [none]"
-msgstr "Пользователь [нет]: "
+#: ../clients/cli/connections.c:4335
+#, c-format
+msgid "Error: 'destination-port': '%s' is not a valid number <0-65535>.\n"
+msgstr ""
+"Ошибка «destination-port». Недопустимое значение «%s». Ожидается: <0-65535>."
+"\n"
 
-#: ../clients/cli/connections.c:4067
-#, fuzzy
-msgid "Group ID [none]"
-msgstr "MAC [нет]: "
+#: ../clients/cli/connections.c:4374
+msgid "IPv4 address (IP[/plen]) [none]: "
+msgstr "Адрес IPv4 (IP[/plen]) [нет]: "
 
-#: ../clients/cli/connections.c:4068
-#, fuzzy
-msgid "Enable PI [no]"
-msgstr "Включить STP %s"
+#: ../clients/cli/connections.c:4376
+msgid "IPv6 address (IP[/plen]) [none]: "
+msgstr "Адрес IPv6 (IP[/plen]) [нет]: "
 
-#: ../clients/cli/connections.c:4070
-#, fuzzy
-msgid "Enable VNET header [no]"
-msgstr "Включить STP %s"
+#: ../clients/cli/connections.c:4390
+#, c-format
+msgid "  Address successfully added: %s\n"
+msgstr "Адрес успешно добавлен: %s\n"
 
-#: ../clients/cli/connections.c:4072
-msgid "Enable multi queue [no]"
-msgstr ""
+#: ../clients/cli/connections.c:4392
+#, c-format
+msgid "  Warning: address already present: %s\n"
+msgstr "Предупреждение. Адрес уже используется: %s\n"
 
-#: ../clients/cli/connections.c:4075
-#, fuzzy
-msgid "Local endpoint [none]"
-msgstr "Родительский интерфейс [нет]:"
+#: ../clients/cli/connections.c:4394
+#, c-format
+msgid "  Warning: ignoring garbage at the end: '%s'\n"
+msgstr "Предупреждение. Игнорируется мусор в конце: «%s».\n"
 
-#: ../clients/cli/connections.c:4078
-#, fuzzy
-msgid "IPv4 address (IP[/plen]) [none]"
-msgstr "Адрес IPv4 (IP[/plen] [шлюз]) [нет]: "
+#: ../clients/cli/connections.c:4396 ../clients/cli/connections.c:5605
+#: ../clients/cli/connections.c:5652 ../clients/cli/connections.c:6569
+#: ../clients/cli/connections.c:6602
+msgid "Error: "
+msgstr "Ошибка:"
 
-#: ../clients/cli/connections.c:4079
-#, fuzzy
-msgid "IPv4 gateway [none]"
-msgstr "Адрес IPv4 (IP[/plen] [шлюз]) [нет]: "
-
-#: ../clients/cli/connections.c:4080
-#, fuzzy
-msgid "IPv6 address (IP[/plen]) [none]"
-msgstr "Адрес IPv6 (IP[/plen] [шлюз]) [нет]: "
-
-#: ../clients/cli/connections.c:4081
-#, fuzzy
-msgid "IPv6 gateway [none]"
-msgstr "Адрес IPv6 (IP[/plen] [шлюз]) [нет]: "
-
-#: ../clients/cli/connections.c:4205
-#, fuzzy, c-format
-msgid "Error: value for '%s' is missing."
-msgstr "Ошибка: отсутствуют поля для параметров «%s»."
+#: ../clients/cli/connections.c:4416
+msgid "IPv4 gateway [none]: "
+msgstr "Шлюз IPv4 [нет]: "
+
+#: ../clients/cli/connections.c:4419
+msgid "IPv6 gateway [none]: "
+msgstr "Шлюз IPv6 [нет]: "
 
-#: ../clients/cli/connections.c:4252
+#: ../clients/cli/connections.c:4439
+#, c-format
+msgid "Error: invalid gateway address '%s'\n"
+msgstr "Ошибка. Неверный адрес шлюза: «%s».\n"
+
+#. Ask for IP addresses
+#: ../clients/cli/connections.c:4452
+#, c-format
+msgid "Do you want to add IP addresses? %s"
+msgstr "Добавить IP-адреса? %s"
+
+#: ../clients/cli/connections.c:4460
+#, c-format
+msgid "Press <Enter> to finish adding addresses.\n"
+msgstr "Нажмите <Enter>, чтобы завершить процедуру добавления адресов.\n"
+
+#. Ask for optional 'tun' arguments.
+#: ../clients/cli/connections.c:4504 ../libnm-glib/nm-device.c:1879
+#: ../libnm/nm-device.c:1830
+msgid "Tun"
+msgstr "Tun"
+
+#: ../clients/cli/connections.c:4509
+msgid "User ID [none]: "
+msgstr "Идентификатор пользователя [нет]: "
+
+#: ../clients/cli/connections.c:4522
+msgid "Group ID [none]: "
+msgstr "Идентификатор группы [нет]: "
+
+#: ../clients/cli/connections.c:4536
+#, c-format
+msgid "Enable PI %s"
+msgstr "Включить PI %s"
+
+#: ../clients/cli/connections.c:4541
+#, c-format
+msgid "Error: 'pi': %s.\n"
+msgstr "Ошибка «pi»: %s\n"
+
+#: ../clients/cli/connections.c:4549
+#, c-format
+msgid "Enable VNET header %s"
+msgstr "Включить заголовок VNET %s"
+
+#: ../clients/cli/connections.c:4554
+#, c-format
+msgid "Error: 'vnet-hdr': %s.\n"
+msgstr "Ошибка «vnet-hdr»: %s.\n"
+
+#: ../clients/cli/connections.c:4562
+#, c-format
+msgid "Enable multi queue %s"
+msgstr "Включить несколько очередей %s"
+
+#: ../clients/cli/connections.c:4567
+#, c-format
+msgid "Error: 'multi-queue': %s.\n"
+msgstr "Ошибка «multi-queue»: %s\n"
+
+#. Ask for optional 'ip-tunnel' arguments.
+#: ../clients/cli/connections.c:4581
+msgid "IP Tunnel"
+msgstr "Туннель IP"
+
+#: ../clients/cli/connections.c:4586
+msgid "Local endpoint [none]: "
+msgstr "Локальная конечная точка [нет]:"
+
+#: ../clients/cli/connections.c:4592
+#, c-format
+msgid "Error: 'local': '%s' is not valid; must be an IP address\n"
+msgstr "Ошибка «local»: «%s» не является действительным IP-адресом.\n"
+
+#: ../clients/cli/connections.c:4658 ../clients/cli/connections.c:10184
+#, c-format
 msgid "Error: <setting>.<property> argument is missing."
-msgstr "Ошибка. Отсутствует аргумент <параметр>.<свойство>"
+msgstr "Ошибка: отсутствует аргумент <параметр>.<свойство>"
+
+#: ../clients/cli/connections.c:4663
+#, c-format
+msgid "Error: value for '%s' is missing."
+msgstr "Ошибка: отсутствует значение «%s»."
 
-#: ../clients/cli/connections.c:4274
+#: ../clients/cli/connections.c:4681
+#, c-format
+msgid "Error: invalid <setting>.<property> '%s'."
+msgstr "Ошибка <параметр>.<свойство>: «%s»."
+
+#: ../clients/cli/connections.c:4689
 #, c-format
 msgid "Error: invalid or not allowed setting '%s': %s."
 msgstr "Ошибка. Недопустимый параметр «%s»: %s."
 
-#: ../clients/cli/connections.c:4301
-#, fuzzy, c-format
-msgid "Error: '%s' is ambiguous (%s.%s or %s.%s)."
-msgstr "Неоднозначное значение «%s» (%s x %s)"
+#: ../clients/cli/connections.c:4700
+#, c-format
+msgid "Error: don't know how to create '%s' setting."
+msgstr "Ошибка: неизвестно, как создать параметр «%s»"
 
-#: ../clients/cli/connections.c:4315
+#: ../clients/cli/connections.c:4710
 #, c-format
-msgid "Error: invalid <setting>.<property> '%s'."
-msgstr "Ошибка <параметр>.<свойство>: «%s»."
+msgid "Error: invalid property '%s': %s."
+msgstr "Ошибка. Недопустимое свойство «%s»: %s."
 
-#: ../clients/cli/connections.c:4356 ../clients/cli/connections.c:7842
-#, fuzzy, c-format
-msgid "Error: Failed to add '%s' connection: %s"
-msgstr "Ошибка. Не удалось добавить соединение «%s»: (%d) %s"
+#: ../clients/cli/connections.c:4722
+#, c-format
+msgid "Error: failed to modify %s.%s: %s."
+msgstr "Ошибка. Не удалось изменить %s.%s: %s."
 
-#: ../clients/cli/connections.c:4361
+#: ../clients/cli/connections.c:4741
 #, c-format
-msgid "Connection '%s' (%s) successfully added.\n"
-msgstr "Соединение «%s» (%s) добавлено.\n"
+msgid "Error: failed to remove a value from %s.%s: %s."
+msgstr "Ошибка. Не удалось удалить значение из %s.%s: %s."
 
-#: ../clients/cli/connections.c:4477
+#: ../clients/cli/connections.c:4775
 #, c-format
 msgid ""
-"You can specify this option more than once. Press <Enter> when you're done.\n"
+"Warning: 'type' is ignored. Use 'nmcli connection add \"%s\" ...' instead."
 msgstr ""
+"Предупреждение: «type» игнорируется. Используйте «nmcli connection add "
+"\"%s\" ..»"
 
-#. Ask for optional arguments.
-#: ../clients/cli/connections.c:4515
-#, fuzzy, c-format
-msgid "There is %d optional setting for %s.\n"
-msgid_plural "There are %d optional settings for %s.\n"
-msgstr[0] ""
-"При настройке соединений %s допускается использование одного дополнительного "
-"аргумента.\n"
-msgstr[1] ""
-"При настройке соединений %s допускается использование одного дополнительного "
-"аргумента.\n"
-msgstr[2] ""
-"При настройке соединений %s допускается использование одного дополнительного "
-"аргумента.\n"
+#: ../clients/cli/connections.c:4783
+msgid "Error: redundant 'master' option."
+msgstr "Ошибка: лишний параметр «master»."
 
-#: ../clients/cli/connections.c:4518
-#, fuzzy, c-format
-msgid "Do you want to provide it? %s"
-msgid_plural "Do you want to provide them? %s"
-msgstr[0] "Хотите его определить? (Да, нет) [да]"
-msgstr[1] "Хотите его определить? (Да, нет) [да]"
-msgstr[2] "Хотите его определить? (Да, нет) [да]"
+#: ../clients/cli/connections.c:4796
+msgid "Error: 'master' is required."
+msgstr "Ошибка: необходимо определить «master»."
 
-#: ../clients/cli/connections.c:4532
-#, fuzzy
-msgid "Wired Ethernet"
-msgstr "Ethernet"
+#: ../clients/cli/connections.c:4950
+#, c-format
+msgid "Error: 'parent': not valid without 'p-key'."
+msgstr "Ошибка «parent». Недействительно без «p-key». "
 
-#: ../clients/cli/connections.c:4534 ../src/devices/nm-device-infiniband.c:175
-msgid "InfiniBand connection"
-msgstr "Соединение InfiniBand"
+#: ../clients/cli/connections.c:5005 ../clients/cli/connections.c:5967
+msgid "SSID: "
+msgstr "SSID: "
 
-#: ../clients/cli/connections.c:4536
-#, fuzzy
-msgid "Wi-Fi connection"
-msgstr "Соединение Wi-Fi %d"
+#: ../clients/cli/connections.c:5008 ../clients/cli/connections.c:5970
+msgid "Error: 'ssid' is required."
+msgstr "Ошибка. Необходимо определить «ssid»."
 
-#: ../clients/cli/connections.c:4538
-#, fuzzy
-msgid "WiMAX connection"
-msgstr "Соединение CDMA"
+#: ../clients/cli/connections.c:5072
+msgid "WiMAX NSP name: "
+msgstr "Имя WiMAX NSP"
 
-#: ../clients/cli/connections.c:4540
-msgid "PPPoE"
-msgstr "PPPoE"
+#: ../clients/cli/connections.c:5075
+msgid "Error: 'nsp' is required."
+msgstr "Ошибка. Необходимо определить «nsp»."
 
-#: ../clients/cli/connections.c:4542
-#, fuzzy
-msgid "CDMA mobile broadband connection"
-msgstr "Мобильное соединение %d"
+#: ../clients/cli/connections.c:5127
+msgid "PPPoE username: "
+msgstr "Пользователь PPPoE:"
 
-#: ../clients/cli/connections.c:4544
-#, fuzzy
-msgid "GSM mobile broadband connection"
-msgstr "Мобильное соединение %d"
+#: ../clients/cli/connections.c:5130 ../clients/cli/connections.c:6037
+msgid "Error: 'username' is required."
+msgstr "Ошибка. Необходимо определить имя пользователя."
 
-#: ../clients/cli/connections.c:4546
-#, fuzzy
-msgid "bluetooth connection"
-msgstr "Агрегированное (Bond) соединение"
+#: ../clients/cli/connections.c:5199
+msgid "APN: "
+msgstr "APN: "
 
-#: ../clients/cli/connections.c:4548 ../src/devices/nm-device-vlan.c:458
-msgid "VLAN connection"
-msgstr "Соединение VLAN"
+#: ../clients/cli/connections.c:5202
+msgid "Error: 'apn' is required."
+msgstr "Ошибка. Необходимо определить «apn»."
 
-#: ../clients/cli/connections.c:4550
-#, fuzzy
-msgid "Bond device"
-msgstr "Ethernet"
+#: ../clients/cli/connections.c:5260
+msgid "Bluetooth device address: "
+msgstr "Адрес устройства Bluetooth:"
 
-#: ../clients/cli/connections.c:4552
-#, fuzzy
-msgid "Team device"
-msgstr "Устройство извлечено"
+#: ../clients/cli/connections.c:5263
+msgid "Error: 'addr' is required."
+msgstr "Ошибка. Необходимо определить «addr»."
 
-#: ../clients/cli/connections.c:4554
-#, fuzzy
-msgid "Team port"
-msgstr "Агрегированное (Team)"
+#: ../clients/cli/connections.c:5304
+#, c-format
+msgid "Error: 'bt-type': '%s' not valid; use [%s, %s (%s), %s]."
+msgstr ""
+"Ошибка «bt-type». Неверное значение «%s». Используйте [%s, %s (%s), %s]."
 
-#: ../clients/cli/connections.c:4556
-#, fuzzy
-msgid "Bridge device"
-msgstr "Ethernet"
+#: ../clients/cli/connections.c:5348
+msgid "VLAN parent device or connection UUID: "
+msgstr "Родительское устройство VLAN или подключение UUID:"
 
-#: ../clients/cli/connections.c:4558
-#, fuzzy
-msgid "Bridge port"
-msgstr "Мост"
+#: ../clients/cli/connections.c:5351 ../clients/cli/connections.c:6108
+msgid "Error: 'dev' is required."
+msgstr "Ошибка. Необходимо определить «dev»."
 
-#: ../clients/cli/connections.c:4560 ../src/nm-manager.c:3716
-msgid "VPN connection"
-msgstr "VPN-соединение"
+#: ../clients/cli/connections.c:5355
+msgid "VLAN ID <0-4094>: "
+msgstr "VLAN ID <0-4094>: "
 
-#: ../clients/cli/connections.c:4562
-#, fuzzy
-msgid "OLPC Mesh connection"
-msgstr "Соединение CDMA"
+#: ../clients/cli/connections.c:5358 ../clients/cli/connections.c:6424
+msgid "Error: 'id' is required."
+msgstr "Ошибка: необходимо определить «id»."
 
-#: ../clients/cli/connections.c:4564 ../src/devices/adsl/nm-device-adsl.c:133
-msgid "ADSL connection"
-msgstr "Соединение ADSL"
+#: ../clients/cli/connections.c:5364
+#, c-format
+msgid "Error: 'id': '%s' is not valid; use <0-4094>."
+msgstr "Ошибка «id»: неверное значение «%s». Допустимые значения: <0-4094>."
 
-#: ../clients/cli/connections.c:4566
-#, fuzzy
-msgid "macvlan connection"
-msgstr "Агрегированное (Bond) соединение"
+#: ../clients/cli/connections.c:5374 ../clients/cli/connections.c:6116
+#, c-format
+msgid "Error: 'dev': '%s' is neither UUID, interface name, nor MAC."
+msgstr ""
+"Ошибка «dev». «%s» может содержать UUID, имя интерфейса или MAC-адрес."
 
-#: ../clients/cli/connections.c:4568 ../src/devices/nm-device-vxlan.c:374
-#, fuzzy
-msgid "VXLAN connection"
-msgstr "Соединение VLAN"
+#: ../clients/cli/connections.c:5506
+#, c-format
+msgid "Error: 'mode': %s."
+msgstr "Ошибка «mode»: %s"
 
-#: ../clients/cli/connections.c:4570
-#, fuzzy
-msgid "Tun device"
-msgstr "Устройство извлечено"
+#: ../clients/cli/connections.c:5515
+#, c-format
+msgid "Error: 'primary': '%s' is not a valid interface name."
+msgstr "Ошибка «primary». Недействительное имя интерфейса: «%s»."
+
+#: ../clients/cli/connections.c:5738
+#, c-format
+msgid "Error: 'stp': %s."
+msgstr "Ошибка «stp»: %s"
+
+#: ../clients/cli/connections.c:5747
+#, c-format
+msgid "Error: 'multicast-snooping': %s."
+msgstr "Ошибка «multicast-snooping»: %s"
+
+#: ../clients/cli/connections.c:5866
+#, c-format
+msgid "Error: 'hairpin': %s."
+msgstr "Ошибка «hairpin»: %s"
+
+#: ../clients/cli/connections.c:5915
+msgid "Error: 'vpn-type' is required."
+msgstr "Ошибка. Необходимо определить «vpn-type»."
+
+#: ../clients/cli/connections.c:5922
+#, c-format
+msgid "Warning: 'vpn-type': %s not known.\n"
+msgstr "Предупреждение «vpn-type»: неизвестное значение %s.\n"
+
+#: ../clients/cli/connections.c:5983
+#, c-format
+msgid "Error: 'channel': '%s' is not valid; use <1-13>."
+msgstr ""
+"Ошибка «channel»: неверное значение «%s». Допустимые значения: <1-13>."
+
+#: ../clients/cli/connections.c:6034
+msgid "Username: "
+msgstr "Пользователь: "
+
+#: ../clients/cli/connections.c:6043
+#, c-format
+msgid "Protocol %s"
+msgstr "Протокол %s"
+
+#: ../clients/cli/connections.c:6046
+msgid "Error: 'protocol' is required."
+msgstr "Ошибка: необходимо определить «protocol»."
+
+#: ../clients/cli/connections.c:6105
+msgid "MACVLAN parent device or connection UUID: "
+msgstr "Родительское устройство MACVLAN или UUID соединения:"
+
+#: ../clients/cli/connections.c:6125 ../clients/cli/connections.c:6205
+#: ../clients/cli/connections.c:6307
+msgid "Error: 'mode' is required."
+msgstr "Ошибка: необходимо определить «mode»."
+
+#: ../clients/cli/connections.c:6131
+msgid "Error: 'mode' is not valid."
+msgstr "Ошибка: неверное значение «mode»."
+
+#: ../clients/cli/connections.c:6144
+#, c-format
+msgid "Error: 'tap': %s."
+msgstr "Ошибка «tap»: %s"
+
+#: ../clients/cli/connections.c:6230
+#, c-format
+msgid "Error: 'pi': %s."
+msgstr "Ошибка «pi»: %s"
+
+#: ../clients/cli/connections.c:6241
+#, c-format
+msgid "Error: 'vnet-hdr': %s."
+msgstr "Ошибка «vnet-hdr»: %s"
+
+#: ../clients/cli/connections.c:6252
+#, c-format
+msgid "Error: 'multi-queue': %s."
+msgstr "Ошибка «multi-queue»: %s"
+
+#: ../clients/cli/connections.c:6321
+#, c-format
+msgid "Error: 'mode': '%s' is not valid, use one of %s"
+msgstr "Ошибка «mode»: неверное значение «%s». Допустимые значения: %s"
 
-#: ../clients/cli/connections.c:4572
-msgid "IPv4 protocol"
+#: ../clients/cli/connections.c:6327
+msgid "Remote endpoint: "
+msgstr "Удаленная конечная точка:"
+
+#: ../clients/cli/connections.c:6330 ../clients/cli/connections.c:6432
+msgid "Error: 'remote' is required."
+msgstr "Ошибка: необходимо определить «remote»."
+
+#: ../clients/cli/connections.c:6337
+#, c-format
+msgid "Error: 'remote': '%s' is not valid; must be an IP address"
+msgstr "Ошибка «remote»: «%s» не является действительным IP-адресом."
+
+#: ../clients/cli/connections.c:6351
+#, c-format
+msgid "Error: 'local': '%s' is not valid; must be an IP address"
+msgstr "Ошибка «local»: «%s» не является действительным IP-адресом."
+
+#: ../clients/cli/connections.c:6360 ../clients/cli/connections.c:6455
+#, c-format
+msgid "Error: 'dev': '%s' is neither UUID nor interface name."
+msgstr "Ошибка «dev»: «%s» может содержать UUID или имя интерфейса."
+
+#: ../clients/cli/connections.c:6421
+msgid "VXLAN ID: "
+msgstr "VXLAN ID:"
+
+#: ../clients/cli/connections.c:6429
+msgid "Remote: "
+msgstr "Удаленный:"
+
+#: ../clients/cli/connections.c:6438
+#, c-format
+msgid "Error: 'id': '%s' is not valid; use <0-16777215>."
 msgstr ""
+"Ошибка «id»: неверное значение «%s». Допустимые значения: <0-16777215>."
 
-#: ../clients/cli/connections.c:4574
-msgid "IPv6 protocol"
+#: ../clients/cli/connections.c:6464
+#, c-format
+msgid "Error: 'remote': '%s' is not a valid IP address"
+msgstr "Ошибка «remote»: «%s» не является действительным IP-адресом."
+
+#: ../clients/cli/connections.c:6473
+#, c-format
+msgid "Error: 'local': '%s' is not a valid IP address"
+msgstr "Ошибка «local»: «%s» не является действительным IP-адресом."
+
+#: ../clients/cli/connections.c:6482
+#, c-format
+msgid "Error: 'source-port-min': %s is not valid; use <0-65535>."
 msgstr ""
+"Ошибка «source-port-min»: неверное значение «%s». Допустимые значения: <0-"
+"65535>."
 
-#: ../clients/cli/connections.c:4657 ../clients/cli/utils.c:124
+#: ../clients/cli/connections.c:6491
 #, c-format
-msgid "Error: value for '%s' argument is required."
-msgstr "Ошибка. Значение «%s» является обязательным."
+msgid "Error: 'source-port-max': %s is not valid; use <0-65535>."
+msgstr ""
+"Ошибка «source-port-max»: неверное значение «%s». Допустимые значения: <0-"
+"65535>."
 
-#: ../clients/cli/connections.c:4663
-#, fuzzy, c-format
+#: ../clients/cli/connections.c:6500
+#, c-format
+msgid "Error: 'destination-port': %s is not valid; use <0-65535>."
+msgstr ""
+"Ошибка «destination-port»: неверное значение «%s». Допустимые значения: <0-"
+"65535>."
+
+#: ../clients/cli/connections.c:6540
+#, c-format
+msgid "Error: '%s' is not a valid connection type."
+msgstr "Ошибка. Недопустимый тип соединения: «%s»"
+
+#: ../clients/cli/connections.c:6581
+#, c-format
+msgid "Error: IPv4 gateway specified without IPv4 addresses"
+msgstr "Ошибка: шлюз IPv4 был определен без адресов IPv4"
+
+#: ../clients/cli/connections.c:6585
+#, c-format
+msgid "Error: multiple IPv4 gateways specified"
+msgstr "Ошибка: указано несколько шлюзов IPv4"
+
+#: ../clients/cli/connections.c:6589
+#, c-format
+msgid "Error: Invalid IPv4 gateway '%s'"
+msgstr "Ошибка: «%s» не является действительным шлюзом IPv4"
+
+#: ../clients/cli/connections.c:6614
+#, c-format
+msgid "Error: IPv6 gateway specified without IPv6 addresses"
+msgstr "Ошибка: шлюз IPv6 был определен без адресов IPv6"
+
+#: ../clients/cli/connections.c:6618
+#, c-format
+msgid "Error: multiple IPv6 gateways specified"
+msgstr "Ошибка: указано несколько шлюзов IPv6"
+
+#: ../clients/cli/connections.c:6622
+#, c-format
+msgid "Error: Invalid IPv6 gateway '%s'"
+msgstr "Ошибка: «%s» не является действительным шлюзом IPv6"
+
+#: ../clients/cli/connections.c:6670 ../clients/cli/connections.c:10223
+#, c-format
+msgid "Error: Failed to add '%s' connection: %s"
+msgstr "Ошибка. Не удалось добавить соединение «%s»: %s"
+
+#: ../clients/cli/connections.c:6675
+#, c-format
+msgid "Connection '%s' (%s) successfully added.\n"
+msgstr "Соединение «%s» (%s) добавлено.\n"
+
+#: ../clients/cli/connections.c:6951 ../clients/cli/connections.c:10678
+#, c-format
+msgid "Error: 'type' argument is required."
+msgstr "Ошибка: необходимо указать «type»."
+
+#: ../clients/cli/connections.c:6959
+#, c-format
+msgid "Error: invalid connection type; %s."
+msgstr "Ошибка. Недопустимый тип соединения: %s."
+
+#: ../clients/cli/connections.c:6968 ../clients/cli/devices.c:2164
+#, c-format
+msgid "Error: 'autoconnect': %s."
+msgstr "Ошибка «autoconnect»: %s."
+
+#: ../clients/cli/connections.c:6978
+#, c-format
 msgid "Error: 'save': %s."
-msgstr "Ошибка «stp»: %s"
+msgstr "Ошибка «save»: %s"
 
-#: ../clients/cli/connections.c:4732
-#, fuzzy, c-format
-msgid "Error: '%s' argument is required."
-msgstr "Ошибка. Аргумент «type» является обязательным."
+#: ../clients/cli/connections.c:6995
+msgid "Interface name [*]: "
+msgstr "Имя интерфейса [*]: "
 
-#: ../clients/cli/connections.c:5701
+#: ../clients/cli/connections.c:7000
+#, c-format
+msgid "Error: 'ifname' argument is required."
+msgstr "Ошибка: необходимо указать «ifname»."
+
+#: ../clients/cli/connections.c:7002
+#, c-format
+msgid "Error: mandatory 'ifname' not seen before '%s'."
+msgstr ""
+"Ошибка:  «ifname» является обязательным параметром, который должен "
+"предшествовать «%s»."
+
+#: ../clients/cli/connections.c:7011
+#, c-format
+msgid "Error: 'ifname': '%s' is not a valid interface nor '*'."
+msgstr ""
+"Ошибка «ifname»: недействительный интерфейс «%s». Укажите другой интерфейс "
+"или «*»."
+
+#: ../clients/cli/connections.c:8035
 #, c-format
 msgid "['%s' setting values]\n"
 msgstr "[«%s» устанавливает значения]\n"
 
 #. TRANSLATORS: do not translate command names and keywords before ::
 #. *              However, you should translate terms enclosed in <>.
-#.
-#: ../clients/cli/connections.c:5783
+#. 
+#: ../clients/cli/connections.c:8117
 #, c-format
 msgid ""
 "---[ Main menu ]---\n"
@@ -2386,7 +2888,7 @@ msgstr ""
 "nmcli    <параметр> <значение>                 :: конфигурация nmcli\n"
 "quit                                           :: выход\n"
 
-#: ../clients/cli/connections.c:5810
+#: ../clients/cli/connections.c:8144
 #, c-format
 msgid ""
 "goto <setting>[.<prop>] | <prop>  :: enter setting/property for editing\n"
@@ -2406,13 +2908,12 @@ msgstr ""
 "          nmcli connection> goto secondaries\n"
 "          nmcli> goto ipv4.addresses\n"
 
-#: ../clients/cli/connections.c:5817
+#: ../clients/cli/connections.c:8151
 #, c-format
 msgid ""
 "remove <setting>[.<prop>]  :: remove setting or reset property value\n"
 "\n"
-"This command removes an entire setting from the connection, or if a "
-"property\n"
+"This command removes an entire setting from the connection, or if a property\n"
 "is given, resets that property to the default value.\n"
 "\n"
 "Examples: nmcli> remove wifi-sec\n"
@@ -2426,7 +2927,7 @@ msgstr ""
 "Примеры: nmcli> remove wifi-sec\n"
 "          nmcli> remove eth.mtu\n"
 
-#: ../clients/cli/connections.c:5824
+#: ../clients/cli/connections.c:8158
 #, c-format
 msgid ""
 "set [<setting>.<prop> <value>]  :: set property value\n"
@@ -2441,7 +2942,7 @@ msgstr ""
 "\n"
 "Пример: nmcli> set con.id My connection\n"
 
-#: ../clients/cli/connections.c:5829
+#: ../clients/cli/connections.c:8163
 #, c-format
 msgid ""
 "describe [<setting>.<prop>]  :: describe property\n"
@@ -2454,7 +2955,7 @@ msgstr ""
 "Возвращает описание свойства. Полный список параметров и их значений можно "
 "найти на справочной странице nm-settings(5).\n"
 
-#: ../clients/cli/connections.c:5834
+#: ../clients/cli/connections.c:8168
 #, c-format
 msgid ""
 "print [all]  :: print setting or connection values\n"
@@ -2469,28 +2970,31 @@ msgstr ""
 "\n"
 "Пример: nmcli ipv4> print all\n"
 
-#: ../clients/cli/connections.c:5839
-#, fuzzy, c-format
+#: ../clients/cli/connections.c:8173
+#, c-format
 msgid ""
 "verify [all | fix]  :: verify setting or connection validity\n"
 "\n"
 "Verifies whether the setting or connection is valid and can be saved later.\n"
-"It indicates invalid values on error. Some errors may be fixed "
-"automatically\n"
+"It indicates invalid values on error. Some errors may be fixed automatically\n"
 "by 'fix' option.\n"
 "\n"
 "Examples: nmcli> verify\n"
 "          nmcli> verify fix\n"
 "          nmcli bond> verify\n"
 msgstr ""
-"verify [all]  :: проверка параметров соединения\n"
+"verify [all | fix]  :: проверка параметров или соединения в целом\n"
 "\n"
-"Проверяет соединение и возвращает неверные значения.\n"
+"Подтверждает правильность параметра или соединения для последующего \n"
+"сохранения. В случае обнаружения ошибок возвращает неверные значения.\n"
+"Некоторые ошибки могут быть исправлены автоматически \n"
+"с помощью параметра  «fix».\n"
 "\n"
 "Примеры: nmcli> verify\n"
+"          nmcli> verify fix\n"
 "          nmcli bond> verify\n"
 
-#: ../clients/cli/connections.c:5848
+#: ../clients/cli/connections.c:8182
 #, c-format
 msgid ""
 "save [persistent|temporary]  :: save the connection\n"
@@ -2505,8 +3009,19 @@ msgid ""
 "connection\n"
 "profile must be deleted.\n"
 msgstr ""
+"save [persistent|temporary]  :: сохранить соединение\n"
+"\n"
+"Передает профиль соединения в NetworkManager, который либо сохранит его,\n"
+"либо будет держать его в памяти. Указание «save» без аргументов по умолчанию\n"
+"интерпретирует команду как «save persistent».\n"
+"Обратите внимание, что после сохранения профиля его настройки будут\n"
+"сохраняться после перезагрузки системы и перезапуска программы. \n"
+"Все последующие изменения также могут быть как временными, \n"
+"так и постоянными. Временные изменения не сохраняются после перезагрузки.\n"
+"Если вы хотите полностью удалить сохраненное соединение, необходимо\n"
+"удалить его профиль. \n"
 
-#: ../clients/cli/connections.c:5859
+#: ../clients/cli/connections.c:8193
 #, c-format
 msgid ""
 "activate [<ifname>] [/<ap>|<nsp>]  :: activate the connection\n"
@@ -2527,26 +3042,22 @@ msgstr ""
 "/<ap>|<nsp> - AP (Wi-Fi) или NSP (WiMAX) (если интерфейс не задан, в начале "
 "строки надо добавить /)\n"
 
-#: ../clients/cli/connections.c:5866 ../clients/cli/connections.c:6025
+#: ../clients/cli/connections.c:8200 ../clients/cli/connections.c:8359
 #, c-format
-msgid ""
-"back  :: go to upper menu level\n"
+msgid "back  :: go to upper menu level\n"
 "\n"
-msgstr ""
-"back  :: возврат к предыдущему меню\n"
+msgstr "back  :: возврат к предыдущему меню\n"
 "\n"
 
-#: ../clients/cli/connections.c:5869
+#: ../clients/cli/connections.c:8203
 #, c-format
-msgid ""
-"help/? [<command>]  :: help for the nmcli commands\n"
+msgid "help/? [<command>]  :: help for the nmcli commands\n"
 "\n"
-msgstr ""
-"help/? [<команда>]  :: справка по командам nmcli\n"
+msgstr "help/? [<команда>]  :: справка по командам nmcli\n"
 "\n"
 
-#: ../clients/cli/connections.c:5872
-#, fuzzy, c-format
+#: ../clients/cli/connections.c:8206
+#, c-format
 msgid ""
 "nmcli [<conf-option> <value>]  :: nmcli configuration\n"
 "\n"
@@ -2560,18 +3071,19 @@ msgid ""
 "          nmcli> nmcli save-confirmation no\n"
 "          nmcli> nmcli prompt-color 3\n"
 msgstr ""
-"nmcli [<параметр> <значение>]  :: конфигурация nmcli\n"
+"nmcli [<параметр> <значение>]  :: настройка nmcli\n"
 "\n"
 "Доступные параметры:\n"
-"status-line yes | no        [по умолчанию: no]\n"
+"status-line yes | no          [по умолчанию: no]\n"
 "save-confirmation yes | no  [по умолчанию: yes]\n"
-"prompt-color <0-8>          [по умолчанию: 0]\n"
+"show-secrets yes | no         [по умолчанию: no]\n"
+"prompt-color <color> | <0-8>  [по умолчанию: 0]\n"
 "%s\n"
 "Примеры: nmcli> nmcli status-line yes\n"
 "          nmcli> nmcli save-confirmation no\n"
 "          nmcli> nmcli prompt-color 3\n"
 
-#: ../clients/cli/connections.c:5894 ../clients/cli/connections.c:6031
+#: ../clients/cli/connections.c:8228 ../clients/cli/connections.c:8365
 #, c-format
 msgid ""
 "quit  :: exit nmcli\n"
@@ -2583,16 +3095,16 @@ msgstr ""
 "\n"
 "Если изменения соединения не сохранены, появится окно подтверждения.\n"
 
-#: ../clients/cli/connections.c:5899 ../clients/cli/connections.c:6036
-#: ../clients/cli/connections.c:6460 ../clients/cli/connections.c:7407
+#: ../clients/cli/connections.c:8233 ../clients/cli/connections.c:8370
+#: ../clients/cli/connections.c:8794 ../clients/cli/connections.c:9742
 #, c-format
 msgid "Unknown command: '%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:5965
+#. 
+#: ../clients/cli/connections.c:8299
 #, c-format
 msgid ""
 "---[ Property menu ]---\n"
@@ -2618,7 +3130,7 @@ msgstr ""
 "help/?   [<команда>]             :: показать справку или описание команды\n"
 "quit                             :: выход из nmcli\n"
 
-#: ../clients/cli/connections.c:5990
+#: ../clients/cli/connections.c:8324
 #, c-format
 msgid ""
 "set [<value>]  :: set new value\n"
@@ -2629,7 +3141,7 @@ msgstr ""
 "\n"
 "Эта команда определяет новое значение свойства.\n"
 
-#: ../clients/cli/connections.c:5994
+#: ../clients/cli/connections.c:8328
 #, c-format
 msgid ""
 "add [<value>]  :: append new value to the property\n"
@@ -2640,11 +3152,11 @@ msgid ""
 msgstr ""
 "add [<значение>]  :: добавление нового значения свойства\n"
 "\n"
-"Эта команда добавляет новое значение свойства к списку существующих "
-"значений. Если же свойство имеет единственное значение, оно будет "
-"переопределено (что равносильно команде «set»).\n"
+"Эта команда добавляет новое значение свойства к списку существующих значений."
+" Если же свойство имеет единственное значение, оно будет переопределено (что "
+"равносильно команде «set»).\n"
 
-#: ../clients/cli/connections.c:6000
+#: ../clients/cli/connections.c:8334
 #, c-format
 msgid ""
 "change  :: change current value\n"
@@ -2655,7 +3167,7 @@ msgstr ""
 "\n"
 "Показывает значение и позволяет его отредактировать.\n"
 
-#: ../clients/cli/connections.c:6004
+#: ../clients/cli/connections.c:8338
 #, c-format
 msgid ""
 "remove [<value>|<index>|<option name>]  :: delete the value\n"
@@ -2674,8 +3186,22 @@ msgid ""
 "          nmcli bond.options> remove downdelay\n"
 "\n"
 msgstr ""
+"remove [<значение>|<индекс>|<имя параметра>]  :: удалить значение\n"
+"\n"
+"Удаление значения свойства. Для свойств, имеющих одно значение,\n"
+"это эквивалентно сбросу его значения в исходное состояние.\n"
+"Для свойств категории «контейнер» это означает удаление\n"
+"всех значений свойства. Дополнительно можно указать аргумент\n"
+"для выборочного изъятия отдельной записи или параметра.\n"
+"В качестве аргумента может использоваться значение, индекс\n"
+"удаляемого элемента или название параметра (для свойств\n"
+"с именованными параметрами).\n"
+"\n"
+"Примеры:  nmcli ipv4.dns> remove 8.8.8.8\n"
+"          nmcli ipv4.dns> remove 2\n"
+"          nmcli bond.options> remove downdelay\n"
 
-#: ../clients/cli/connections.c:6015
+#: ../clients/cli/connections.c:8349
 #, c-format
 msgid ""
 "describe  :: describe property\n"
@@ -2688,7 +3214,7 @@ msgstr ""
 "Возвращает описание свойства. Полный список параметров и их значений можно "
 "найти на справочной странице nm-settings(5).\n"
 
-#: ../clients/cli/connections.c:6020
+#: ../clients/cli/connections.c:8354
 #, c-format
 msgid ""
 "print [property|setting|connection]  :: print property (setting, connection) "
@@ -2703,32 +3229,35 @@ msgstr ""
 "Если аргумент не указан, возвращает значение свойства. Укажите параметр или "
 "соединение, чтобы получить соответствующую информацию.\n"
 
-#: ../clients/cli/connections.c:6028
+#: ../clients/cli/connections.c:8362
 #, c-format
-msgid ""
-"help/? [<command>]  :: help for nmcli commands\n"
+msgid "help/? [<command>]  :: help for nmcli commands\n"
 "\n"
-msgstr ""
-"help/? [<команда>]  :: справка по командам nmcli\n"
+msgstr "help/? [<команда>]  :: справка по командам nmcli\n"
 "\n"
 
-#: ../clients/cli/connections.c:6209
+#: ../clients/cli/connections.c:8460
+#, c-format
+msgid "Error: Connection activation failed.\n"
+msgstr "Ошибка. Не удалось активировать соединение.\n"
+
+#: ../clients/cli/connections.c:8543
 #, 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:6227
-#, fuzzy, c-format
+#: ../clients/cli/connections.c:8561
+#, c-format
 msgid "[ Type: %s | Name: %s | UUID: %s | Dirty: %s | Temp: %s ]\n"
-msgstr "[Тип соединения: %s | имя: %s | UUID: %s | грязное: %s ]\n"
+msgstr "[Тип: %s | Имя: %s | UUID: %s | Не сохранено: %s | Временно.: %s ]\n"
 
-#: ../clients/cli/connections.c:6263
-#, fuzzy, c-format
+#: ../clients/cli/connections.c:8597
+#, c-format
 msgid "The connection is not saved. Do you really want to quit? %s"
-msgstr "Соединение не сохранено. Вы действительно хотите выйти? [y/n]\n"
+msgstr "Соединение не сохранено. Вы действительно хотите выйти? %s"
 
-#: ../clients/cli/connections.c:6312
+#: ../clients/cli/connections.c:8646
 #, c-format
 msgid ""
 "The connection profile has been removed from another client. You may type "
@@ -2737,82 +3266,82 @@ msgstr ""
 "Профиль соединения был удален из другого клиента. Чтобы его восстановить, "
 "введите «save».\n"
 
-#: ../clients/cli/connections.c:6337 ../clients/cli/connections.c:6758
-#: ../clients/cli/connections.c:6816
+#: ../clients/cli/connections.c:8671 ../clients/cli/connections.c:9093
+#: ../clients/cli/connections.c:9151
 #, c-format
 msgid "Allowed values for '%s' property: %s\n"
 msgstr "Допустимые значения «%s»: %s\n"
 
-#: ../clients/cli/connections.c:6341 ../clients/cli/connections.c:6762
-#: ../clients/cli/connections.c:6820
+#: ../clients/cli/connections.c:8675 ../clients/cli/connections.c:9097
+#: ../clients/cli/connections.c:9155
 #, c-format
 msgid "Enter '%s' value: "
 msgstr "Введите значение «%s»:"
 
-#: ../clients/cli/connections.c:6356 ../clients/cli/connections.c:6378
-#: ../clients/cli/connections.c:6766 ../clients/cli/connections.c:6825
+#: ../clients/cli/connections.c:8690 ../clients/cli/connections.c:8712
+#: ../clients/cli/connections.c:9101 ../clients/cli/connections.c:9160
 #, c-format
 msgid "Error: failed to set '%s' property: %s\n"
 msgstr "Ошибка. Не удалось установить свойство «%s»: %s\n"
 
-#: ../clients/cli/connections.c:6372
+#: ../clients/cli/connections.c:8706
 #, c-format
 msgid "Edit '%s' value: "
 msgstr "Измените значение «%s»:"
 
-#: ../clients/cli/connections.c:6401
+#: ../clients/cli/connections.c:8735
 #, c-format
 msgid "Error: %s\n"
 msgstr "Ошибка: %s\n"
 
-#: ../clients/cli/connections.c:6407 ../clients/cli/connections.c:6907
-#: ../clients/cli/connections.c:6955
+#: ../clients/cli/connections.c:8741 ../clients/cli/connections.c:9242
+#: ../clients/cli/connections.c:9290
 #, c-format
 msgid "Error: failed to remove value of '%s': %s\n"
 msgstr "Ошибка. Не удалось изменить значение «%s»: %s\n"
 
-#: ../clients/cli/connections.c:6428
+#: ../clients/cli/connections.c:8762
 #, c-format
 msgid "Unknown command argument: '%s'\n"
 msgstr "Неизвестный аргумент команды: «%s»\n"
 
-#: ../clients/cli/connections.c:6533
+#: ../clients/cli/connections.c:8867
 #, c-format
 msgid "Available settings: %s\n"
 msgstr "Доступные параметры: %s\n"
 
-#: ../clients/cli/connections.c:6545
+#: ../clients/cli/connections.c:8879
 #, c-format
 msgid "Error: invalid setting name; %s\n"
 msgstr "Ошибка. Недопустимое значение параметра: %s\n"
 
-#: ../clients/cli/connections.c:6562
+#: ../clients/cli/connections.c:8896
 #, c-format
 msgid "Available properties: %s\n"
 msgstr "Доступные свойства: %s\n"
 
-#: ../clients/cli/connections.c:6570
+#: ../clients/cli/connections.c:8904
 #, c-format
 msgid "Error: property %s\n"
 msgstr "Ошибка свойства %s\n"
 
-#: ../clients/cli/connections.c:6611
+#: ../clients/cli/connections.c:8945
 #, 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"
+"Вы собираетесь сохранить соединение с установленным параметром «autoconnect="
+"yes», что может привести к его немедленной активации.\n"
 "Сохранить? %s"
 
-#: ../clients/cli/connections.c:6700
+#: ../clients/cli/connections.c:9035
 #, c-format
 msgid "You may edit the following settings: %s\n"
 msgstr "Разрешается изменить следующие параметры: %s\n"
 
-#: ../clients/cli/connections.c:6728
+#: ../clients/cli/connections.c:9063
 #, c-format
 msgid ""
 "The connection profile has been removed from another client. You may type "
@@ -2821,217 +3350,216 @@ msgstr ""
 "Профиль соединения был удален из другого клиента. Чтобы его восстановить, "
 "введите «save».\n"
 
-#: ../clients/cli/connections.c:6770 ../clients/cli/connections.c:7000
+#: ../clients/cli/connections.c:9105 ../clients/cli/connections.c:9335
 #, c-format
 msgid "Error: no setting selected; valid are [%s]\n"
 msgstr "Ошибка. Параметр не выбран. Допускается: [%s]\n"
 
-#: ../clients/cli/connections.c:6771
+#: ../clients/cli/connections.c:9106
 #, c-format
 msgid "use 'goto <setting>' first, or 'set <setting>.<property>'\n"
 msgstr "используйте «goto <параметр>» или «set <параметр>.<свойство>»\n"
 
-#: ../clients/cli/connections.c:6785 ../clients/cli/connections.c:6934
-#: ../clients/cli/connections.c:7022
+#: ../clients/cli/connections.c:9120 ../clients/cli/connections.c:9269
+#: ../clients/cli/connections.c:9357
 #, c-format
 msgid "Error: invalid setting argument '%s'; valid are [%s]\n"
 msgstr "Ошибка. Недопустимый аргумент «%s». Допускается: [%s]\n"
 
-#: ../clients/cli/connections.c:6795
+#: ../clients/cli/connections.c:9130
 #, c-format
 msgid "Error: missing setting for '%s' property\n"
 msgstr "Ошибка. Нет определения свойства «%s»\n"
 
-#: ../clients/cli/connections.c:6802
+#: ../clients/cli/connections.c:9137
 #, c-format
 msgid "Error: invalid property: %s\n"
 msgstr "Ошибка. Недействительное свойство: %s\n"
 
-#: ../clients/cli/connections.c:6855
+#: ../clients/cli/connections.c:9190
 #, c-format
 msgid "Error: unknown setting '%s'\n"
 msgstr "Ошибка: неизвестный параметр: %s\n"
 
-#: ../clients/cli/connections.c:6868
+#: ../clients/cli/connections.c:9203
 #, c-format
 msgid "You may edit the following properties: %s\n"
 msgstr "Вы можете изменить следующие свойства: %s\n"
 
-#: ../clients/cli/connections.c:6912
+#: ../clients/cli/connections.c:9247
 #, c-format
 msgid "Error: no argument given; valid are [%s]\n"
 msgstr "Ошибка. Аргумент не задан. Допускается: [%s]\n"
 
-#: ../clients/cli/connections.c:6931
+#: ../clients/cli/connections.c:9266
 #, c-format
 msgid "Setting '%s' is not present in the connection.\n"
 msgstr "Параметр «%s» не определен в соединении.\n"
 
-#: ../clients/cli/connections.c:6976
+#: ../clients/cli/connections.c:9311
 #, c-format
 msgid "Error: %s properties, nor it is a setting name.\n"
 msgstr "Ошибка. %s не является именем параметра или свойства.\n"
 
-#: ../clients/cli/connections.c:7001
+#: ../clients/cli/connections.c:9336
 #, c-format
 msgid "use 'goto <setting>' first, or 'describe <setting>.<property>'\n"
 msgstr "используйте «goto <параметр>» или «describe <параметр>.<свойство>»\n"
 
-#: ../clients/cli/connections.c:7050
+#: ../clients/cli/connections.c:9385
 #, c-format
 msgid "Error: invalid property: %s, neither a valid setting name.\n"
 msgstr "Недопустимое свойство %s или неверное имя параметра.\n"
 
-#: ../clients/cli/connections.c:7082
+#: ../clients/cli/connections.c:9417
 #, c-format
 msgid "Error: unknown setting: '%s'\n"
 msgstr "Ошибка. Неизвестный параметр: %s\n"
 
-#: ../clients/cli/connections.c:7087
-#, fuzzy, c-format
+#: ../clients/cli/connections.c:9422
+#, c-format
 msgid "Error: '%s' setting not present in the connection\n"
-msgstr "Параметр «%s» не определен в соединении.\n"
+msgstr "Ошибка: в соединении не определен параметр «%s»\n"
 
-#: ../clients/cli/connections.c:7115
-#, fuzzy, c-format
+#: ../clients/cli/connections.c:9450
+#, c-format
 msgid "Error: invalid property: %s%s\n"
-msgstr "Ошибка. Недействительное свойство: %s\n"
+msgstr "Ошибка: недействительное свойство %s%s\n"
 
-#: ../clients/cli/connections.c:7117
-#, fuzzy
+#: ../clients/cli/connections.c:9452
 msgid ", neither a valid setting name"
-msgstr "Недопустимое свойство %s или неверное имя параметра.\n"
+msgstr "и не является действительным именем параметра"
 
-#: ../clients/cli/connections.c:7134
+#: ../clients/cli/connections.c:9469
 #, c-format
 msgid "Invalid verify option: %s\n"
 msgstr "Недопустимый параметр verify: «%s»\n"
 
-#: ../clients/cli/connections.c:7142
+#: ../clients/cli/connections.c:9477
 #, c-format
 msgid "Verify setting '%s': %s\n"
 msgstr "Проверьте параметр «%s»: %s\n"
 
-#: ../clients/cli/connections.c:7157
+#: ../clients/cli/connections.c:9492
 #, c-format
 msgid "Verify connection: %s\n"
 msgstr "Проверьте соединение: %s\n"
 
-#: ../clients/cli/connections.c:7160
+#: ../clients/cli/connections.c:9495
 #, c-format
 msgid "The error cannot be fixed automatically.\n"
 msgstr "Эта ошибка не может быть исправлена автоматически.\n"
 
-#: ../clients/cli/connections.c:7177
-#, fuzzy, c-format
+#: ../clients/cli/connections.c:9512
+#, c-format
 msgid "Error: invalid argument '%s'\n"
-msgstr "Ошибка. Недопустимый дополнительный аргумент: «%s»."
+msgstr "Ошибка: недопустимый аргумент «%s»\n"
 
-#: ../clients/cli/connections.c:7210
-#, fuzzy, c-format
+#: ../clients/cli/connections.c:9545
+#, c-format
 msgid "Error: Failed to save '%s' (%s) connection: %s\n"
-msgstr "Ошибка. Не удалось сохранить соединение «%s» (%s): (%d) %s\n"
+msgstr "Ошибка: не удалось сохранить соединение «%s» (%s): %s\n"
 
-#: ../clients/cli/connections.c:7217
+#: ../clients/cli/connections.c:9552
 #, c-format
 msgid "Connection '%s' (%s) successfully saved.\n"
 msgstr "Соединение «%s» (%s) сохранено.\n"
 
-#: ../clients/cli/connections.c:7218
-#, fuzzy, c-format
+#: ../clients/cli/connections.c:9553
+#, c-format
 msgid "Connection '%s' (%s) successfully updated.\n"
-msgstr "Соединение «%s» (%s) добавлено.\n"
+msgstr "Соединение «%s» (%s) успешно обновлено.\n"
 
-#: ../clients/cli/connections.c:7251
+#: ../clients/cli/connections.c:9586
 #, c-format
 msgid "Error: connection verification failed: %s\n"
 msgstr "Ошибка. Проверка соединения завершилась неудачей: %s\n"
 
-#: ../clients/cli/connections.c:7252
+#: ../clients/cli/connections.c:9587
 msgid "(unknown error)"
 msgstr "(неизвестная ошибка)"
 
-#: ../clients/cli/connections.c:7253
+#: ../clients/cli/connections.c:9588
 #, c-format
 msgid "You may try running 'verify fix' to fix errors.\n"
-msgstr ""
+msgstr "Для исправления ошибок вы можете попробовать выполнить «verify fix».\n"
 
-#: ../clients/cli/connections.c:7275
+#: ../clients/cli/connections.c:9610
 #, c-format
 msgid "Error: connection is not saved. Type 'save' first.\n"
 msgstr "Ошибка. Соединение не сохранено. Сначала введите «type».\n"
 
-#: ../clients/cli/connections.c:7279
+#: ../clients/cli/connections.c:9614
 #, c-format
 msgid "Error: connection is not valid: %s\n"
 msgstr "Ошибка. Недействительное соединение: %s\n"
 
-#: ../clients/cli/connections.c:7289
+#: ../clients/cli/connections.c:9624
 #, c-format
 msgid "Error: Cannot activate connection: %s.\n"
 msgstr "Ошибка. Не удалось активировать соединение: %s\n"
 
-#: ../clients/cli/connections.c:7299
-#, fuzzy, c-format
+#: ../clients/cli/connections.c:9634
+#, c-format
 msgid "Error: Failed to activate '%s' (%s) connection: %s\n"
-msgstr "Ошибка. Не удалось активировать соединение «%s» (%s): (%d) %s\n"
+msgstr "Ошибка: не удалось активировать соединение «%s» (%s): %s\n"
 
-#: ../clients/cli/connections.c:7305
+#: ../clients/cli/connections.c:9640
 #, c-format
 msgid "Monitoring connection activation (press any key to continue)\n"
 msgstr ""
 "Контроль активации соединения (нажмите любую клавишу для продолжения)\n"
 
-#: ../clients/cli/connections.c:7343
+#: ../clients/cli/connections.c:9678
 #, c-format
 msgid "Error: status-line: %s\n"
 msgstr "Ошибка status-line: %s\n"
 
-#: ../clients/cli/connections.c:7351
+#: ../clients/cli/connections.c:9686
 #, c-format
 msgid "Error: save-confirmation: %s\n"
 msgstr "Ошибка save-confirmation: %s\n"
 
-#: ../clients/cli/connections.c:7359
-#, fuzzy, c-format
+#: ../clients/cli/connections.c:9694
+#, c-format
 msgid "Error: show-secrets: %s\n"
-msgstr "Ошибка «show active»: %s"
+msgstr "Ошибка show secrets: %s\n"
 
-#: ../clients/cli/connections.c:7368
-#, fuzzy, c-format
+#: ../clients/cli/connections.c:9703
+#, c-format
 msgid "Error: bad color: %s\n"
-msgstr "Ошибка. Недействительное свойство: %s\n"
+msgstr "Ошибка: недопустимый цвет: %s\n"
 
-#: ../clients/cli/connections.c:7382
+#: ../clients/cli/connections.c:9717
 #, c-format
 msgid "Current nmcli configuration:\n"
 msgstr "Текущая конфигурация nmcli:\n"
 
-#: ../clients/cli/connections.c:7392
+#: ../clients/cli/connections.c:9727
 #, c-format
 msgid "Invalid configuration option '%s'; allowed [%s]\n"
 msgstr "Недопустимый параметр конфигурации «%s». Допускается: [%s]\n"
 
-#: ../clients/cli/connections.c:7593
+#: ../clients/cli/connections.c:9982
 #, c-format
 msgid "Error: only one of 'id', uuid, or 'path' can be provided."
 msgstr "Ошибка. Допускается только одно значение: «id», «uuid» или «path»."
 
-#: ../clients/cli/connections.c:7605 ../clients/cli/connections.c:7788
-#: ../clients/cli/connections.c:7795 ../clients/cli/connections.c:7929
-#: ../clients/cli/connections.c:8434
+#: ../clients/cli/connections.c:9994 ../clients/cli/connections.c:10171
+#: ../clients/cli/connections.c:10178 ../clients/cli/connections.c:10306
+#: ../clients/cli/connections.c:10782
 #, c-format
 msgid "Error: Unknown connection '%s'."
 msgstr "Ошибка. Неизвестное соединение: «%s»."
 
-#: ../clients/cli/connections.c:7623
+#: ../clients/cli/connections.c:10012
 #, c-format
 msgid "Warning: editing existing connection '%s'; 'type' argument is ignored\n"
 msgstr ""
 "Предупреждение. При редактировании соединения «%s» аргумент «type» будет "
 "пропущен.\n"
 
-#: ../clients/cli/connections.c:7626
+#: ../clients/cli/connections.c:10015
 #, c-format
 msgid ""
 "Warning: editing existing connection '%s'; 'con-name' argument is ignored\n"
@@ -3039,241 +3567,224 @@ msgstr ""
 "Предупреждение. При редактировании соединения «%s» аргумент «con-name» будет "
 "пропущен.\n"
 
-#: ../clients/cli/connections.c:7640
+#: ../clients/cli/connections.c:10029
 #, c-format
 msgid "Valid connection types: %s\n"
 msgstr "Доступные типы подключений: %s\n"
 
-#: ../clients/cli/connections.c:7642
+#: ../clients/cli/connections.c:10031
 #, c-format
 msgid "Error: invalid connection type; %s\n"
 msgstr "Ошибка. Недопустимый тип соединения: %s.\n"
 
-#: ../clients/cli/connections.c:7681
+#: ../clients/cli/connections.c:10070
 #, c-format
 msgid "===| nmcli interactive connection editor |==="
 msgstr "===| интерактивный редактор соединений nmcli |==="
 
-#: ../clients/cli/connections.c:7684
+#: ../clients/cli/connections.c:10073
 #, c-format
 msgid "Editing existing '%s' connection: '%s'"
 msgstr "Редактируется соединение «%s»: «%s»"
 
-#: ../clients/cli/connections.c:7686
+#: ../clients/cli/connections.c:10075
 #, c-format
 msgid "Adding a new '%s' connection"
 msgstr "Добавление нового соединения «%s»"
 
-#: ../clients/cli/connections.c:7688
+#: ../clients/cli/connections.c:10077
 #, c-format
 msgid "Type 'help' or '?' for available commands."
 msgstr "Для просмотра доступных команд введите «help» или «?»"
 
-#: ../clients/cli/connections.c:7690
+#: ../clients/cli/connections.c:10079
 #, c-format
 msgid "Type 'describe [<setting>.<prop>]' for detailed property description."
 msgstr ""
 "Для просмотра описания свойства введите «describe [<параметр>.<свойство>]»."
 
-#: ../clients/cli/connections.c:7728
-#, fuzzy, c-format
+#: ../clients/cli/connections.c:10117
+#, c-format
 msgid "Error: Failed to modify connection '%s': %s"
-msgstr "Ошибка. Не удалось изменить соединение «%s»: (%d) %s"
+msgstr "Ошибка: не удалось изменить соединение «%s»: %s"
 
-#: ../clients/cli/connections.c:7735
+#: ../clients/cli/connections.c:10124
 #, c-format
 msgid "Connection '%s' (%s) successfully modified.\n"
-msgstr "Соединение «%s» (%s) изменено.\n"
+msgstr "Соединение «%s» (%s) успешно изменено.\n"
 
-#.
-#. * TODO(?) complete "uuid", "path", "id" or connection name.
-#. * (if we ever will move this here from shell completion script)
-#. if (nmc->complete) {
-#. quit ();
-#.
-#: ../clients/cli/connections.c:7761 ../clients/cli/connections.c:7885
-#: ../clients/cli/connections.c:8280 ../clients/cli/connections.c:8399
+#: ../clients/cli/connections.c:10146 ../clients/cli/connections.c:10262
+#: ../clients/cli/connections.c:10639 ../clients/cli/connections.c:10747
 #, c-format
 msgid "Error: No arguments provided."
 msgstr "Ошибка. Аргументы не определены."
 
-#: ../clients/cli/connections.c:7847
+#: ../clients/cli/connections.c:10165 ../clients/cli/connections.c:10294
+#: ../clients/cli/connections.c:10776
+#, c-format
+msgid "Error: connection ID is missing."
+msgstr "Ошибка. Идентификатор соединения отсутствует."
+
+#: ../clients/cli/connections.c:10228
 #, c-format
 msgid "%s (%s) cloned as %s (%s).\n"
-msgstr ""
+msgstr "%s (%s) было клонировано в %s (%s).\n"
 
-#: ../clients/cli/connections.c:7883
-#, fuzzy
+#: ../clients/cli/connections.c:10260
 msgid "New connection name: "
-msgstr "Новое соединение"
+msgstr "Название нового соединения:"
 
-#: ../clients/cli/connections.c:7904 ../clients/cli/connections.c:7922
-#, fuzzy, c-format
+#: ../clients/cli/connections.c:10281 ../clients/cli/connections.c:10299
+#, c-format
 msgid "Error: <new name> argument is missing."
-msgstr "Ошибка: отсутствует аргумент %s."
+msgstr "Ошибка: отсутствует <новое имя>."
 
-#: ../clients/cli/connections.c:7910
-#, fuzzy, c-format
+#: ../clients/cli/connections.c:10287
+#, c-format
 msgid "Error: unexpected extra argument '%s'."
-msgstr "Ошибка. Непредвиденный аргумент: «%s»"
+msgstr "Ошибка: непредвиденный дополнительный аргумент: «%s»"
 
-#: ../clients/cli/connections.c:7917 ../clients/cli/connections.c:8428
+#: ../clients/cli/connections.c:10356
 #, c-format
-msgid "Error: connection ID is missing."
-msgstr "Ошибка. Идентификатор соединения отсутствует."
-
-#: ../clients/cli/connections.c:7979
-#, fuzzy, c-format
 msgid "Error: not all connections deleted."
-msgstr "Ошибка: «%s» не является активным соединением."
+msgstr "Ошибка: не все соединения были удалены."
 
-#: ../clients/cli/connections.c:7980
+#: ../clients/cli/connections.c:10357
 #, c-format
 msgid "Error: Connection deletion failed: %s"
-msgstr "Ошибка: сбой удаления соединения: %s"
+msgstr "Ошибка: сбой удаления соединения %s"
 
-#: ../clients/cli/connections.c:8046 ../clients/cli/connections.c:8179
-#, fuzzy, c-format
+#: ../clients/cli/connections.c:10419 ../clients/cli/connections.c:10547
+#, c-format
 msgid "Error: unknown connection '%s'\n"
-msgstr "Ошибка. Неизвестное соединение: %s\n"
+msgstr "Ошибка: неизвестное соединение %s\n"
 
-#: ../clients/cli/connections.c:8060
-#, fuzzy, c-format
+#: ../clients/cli/connections.c:10433
+#, c-format
 msgid "Error: no connection provided."
-msgstr "Ошибка: неизвестное подключение %s."
+msgstr "Ошибка: соединение не указано."
 
 #. truncate trailing ", "
-#: ../clients/cli/connections.c:8085
+#: ../clients/cli/connections.c:10458
 #, c-format
 msgid "Error: cannot delete unknown connection(s): %s."
-msgstr "Ошибка. Не удалось удалить неизвестные соединения: %s"
+msgstr "Ошибка: невозможно удалить неизвестные соединения: %s"
 
-#: ../clients/cli/connections.c:8097
-#, fuzzy, c-format
+#: ../clients/cli/connections.c:10470
+#, c-format
 msgid "%s: connection profile changed\n"
-msgstr "Свойства подключения"
+msgstr "%s: профиль соединения изменился\n"
 
-#: ../clients/cli/connections.c:8123
-#, fuzzy, c-format
+#: ../clients/cli/connections.c:10496
+#, c-format
 msgid "%s: connection profile created\n"
-msgstr "Свойства подключения"
+msgstr "%s: профиль соединения создан\n"
 
-#: ../clients/cli/connections.c:8132
-#, fuzzy, c-format
+#: ../clients/cli/connections.c:10505
+#, c-format
 msgid "%s: connection profile removed\n"
-msgstr "соединение удалено"
+msgstr "%s: профиль соединения удален\n"
 
-#: ../clients/cli/connections.c:8180
-#, fuzzy, c-format
+#: ../clients/cli/connections.c:10548
+#, c-format
 msgid "Error: not all connections found."
-msgstr "Ошибка: «%s» не является активным соединением."
+msgstr "Ошибка: обнаружены не все соединения."
 
-#: ../clients/cli/connections.c:8205
-#, fuzzy, c-format
+#: ../clients/cli/connections.c:10571
+#, c-format
 msgid "Error: failed to reload connections: %s."
-msgstr "Ошибка. Не удалось добавить соединение «%s»: (%d) %s"
+msgstr "Ошибка. Не удалось перезагрузить соединения: %s"
 
-#: ../clients/cli/connections.c:8239
-#, fuzzy, c-format
+#: ../clients/cli/connections.c:10603
+#, c-format
 msgid "Error: failed to load connection: %s."
-msgstr "Ошибка. Не удалось добавить соединение «%s»: (%d) %s"
+msgstr "Ошибка. Не удалось загрузить соединение: %s"
 
-#: ../clients/cli/connections.c:8247
+#: ../clients/cli/connections.c:10611
 #, c-format
 msgid "Could not load file '%s'\n"
 msgstr "Не удалось загрузить «%s»\n"
 
-#: ../clients/cli/connections.c:8256
-#, fuzzy
+#: ../clients/cli/connections.c:10620
 msgid "File to import: "
-msgstr "Не удалось зашифровать: %d."
+msgstr "Импортируемый файл:"
 
-#: ../clients/cli/connections.c:8296
+#: ../clients/cli/connections.c:10655
 #, c-format
 msgid "Warning: 'type' already specified, ignoring extra one.\n"
 msgstr ""
+"Предупреждение: «type» уже указан, второе вхождение будет игнорироваться.\n"
 
-#: ../clients/cli/connections.c:8307
+#: ../clients/cli/connections.c:10666
 #, c-format
 msgid "Warning: 'file' already specified, ignoring extra one.\n"
 msgstr ""
+"Предупреждение: «file» уже указан, второе вхождение будет игнорироваться.\n"
 
-#: ../clients/cli/connections.c:8309
-#, fuzzy, c-format
+#: ../clients/cli/connections.c:10668
+#, c-format
 msgid "Unknown parameter: %s"
-msgstr "Неизвестный параметр: %s\n"
+msgstr "Неизвестный параметр: %s"
 
-#: ../clients/cli/connections.c:8319
+#: ../clients/cli/connections.c:10683
 #, c-format
-msgid "Error: 'type' argument is required."
-msgstr "Ошибка. Аргумент «type» является обязательным."
-
-#: ../clients/cli/connections.c:8324
-#, fuzzy, c-format
 msgid "Error: 'file' argument is required."
-msgstr "Ошибка. Требуется аргумент «ifname»."
-
-#: ../clients/cli/connections.c:8331
-#, fuzzy, c-format
-msgid "Error: failed to find VPN plugin for %s."
-msgstr "Ошибка. Не удалось добавить соединение «%s»: (%d) %s"
+msgstr "Ошибка: необходимо указать «file»."
 
-#: ../clients/cli/connections.c:8339 ../clients/cli/connections.c:8450
-#, fuzzy, c-format
+#: ../clients/cli/connections.c:10691 ../clients/cli/connections.c:10798
+#, c-format
 msgid "Error: failed to load VPN plugin: %s."
-msgstr "Ошибка. Не удалось добавить соединение «%s»: (%d) %s"
+msgstr "Ошибка: не удалось загрузить модуль VPN: %s"
 
-#: ../clients/cli/connections.c:8347
-#, fuzzy, c-format
+#: ../clients/cli/connections.c:10699
+#, c-format
 msgid "Error: failed to import '%s': %s."
-msgstr "Ошибка. Не удалось изменить %s.%s: %s."
+msgstr "Ошибка импорта «%s»: %s."
 
-#: ../clients/cli/connections.c:8397
-#, fuzzy
+#: ../clients/cli/connections.c:10745
 msgid "Output file name: "
-msgstr "имя файла"
+msgstr "Имя выходного файла:"
 
-#: ../clients/cli/connections.c:8421
-#, fuzzy, c-format
+#: ../clients/cli/connections.c:10769
+#, c-format
 msgid "Error: unknown extra argument: '%s'."
-msgstr "Ошибка. Недопустимый дополнительный аргумент: «%s»."
+msgstr "Ошибка. Неизвестный дополнительный аргумент: «%s»."
 
-#: ../clients/cli/connections.c:8441
-#, fuzzy, c-format
+#: ../clients/cli/connections.c:10789
+#, c-format
 msgid "Error: the connection is not VPN."
-msgstr "Ошибка. Недействительное соединение: %s\n"
+msgstr "Ошибка: соединение не является соединением VPN."
 
-#: ../clients/cli/connections.c:8462
-#, fuzzy, c-format
+#: ../clients/cli/connections.c:10810
+#, c-format
 msgid "Error: failed to create temporary file %s."
-msgstr "Не удалось создать временный файл: %s"
+msgstr "Ошибка: не удалось создать временный файл: %s"
 
-#: ../clients/cli/connections.c:8471
-#, fuzzy, c-format
+#: ../clients/cli/connections.c:10819
+#, c-format
 msgid "Error: failed to export '%s': %s."
-msgstr "Ошибка. Не удалось установить свойство «%s»: %s\n"
+msgstr "Ошибка экспорта «%s»: %s"
 
-#: ../clients/cli/connections.c:8482
-#, fuzzy, c-format
+#: ../clients/cli/connections.c:10830
+#, c-format
 msgid "Error: failed to read temporary file '%s': %s."
-msgstr "Ошибка. Не удалось изменить значение «%s»: %s\n"
+msgstr "Ошибка: не удалось прочитать временный файл «%s»: %s"
 
-#: ../clients/cli/connections.c:8628
+#: ../clients/cli/connections.c:10976
 #, c-format
 msgid "incorrect string '%s' of '--order' option"
-msgstr ""
+msgstr "неверная строка «%s» в параметре «--order»"
 
-#: ../clients/cli/connections.c:8654
+#: ../clients/cli/connections.c:11002
 #, c-format
 msgid "incorrect item '%s' in '--order' option"
-msgstr ""
+msgstr "неверный элемент «%s» в параметре «--order»"
 
-#: ../clients/cli/connections.c:8740
-#, fuzzy
+#: ../clients/cli/connections.c:11089
 msgid "'--order' argument is missing"
-msgstr "Ошибка: отсутствует аргумент %s."
+msgstr "отсутствует аргумент «--order»"
 
-#: ../clients/cli/connections.c:8816
+#: ../clients/cli/connections.c:11154
 #, c-format
 msgid "Error: '%s' is not valid 'connection' command."
 msgstr "Ошибка. Недопустимая команда «connection»: «%s»"
@@ -3284,9 +3795,8 @@ msgid "Interface: "
 msgstr "Интерфейс:"
 
 #: ../clients/cli/devices.c:36
-#, fuzzy
 msgid "Interface(s): "
-msgstr "Интерфейс:"
+msgstr "Интерфейсы:"
 
 #. 3
 #. 20
@@ -3302,9 +3812,8 @@ msgstr "UUID СОЕДИНЕНИЯ"
 
 #. 2
 #: ../clients/cli/devices.c:58
-#, fuzzy
 msgid "NM-TYPE"
-msgstr "ТИП"
+msgstr "ТИП-NM"
 
 #. 3
 #: ../clients/cli/devices.c:59
@@ -3362,7 +3871,7 @@ msgstr "IP_ИНТЕРФЕЙСА"
 #. 2
 #: ../clients/cli/devices.c:70 ../clients/cli/devices.c:102
 msgid "IS-SOFTWARE"
-msgstr ""
+msgstr "ПРОГРАММНЫЙ"
 
 #. 15
 #: ../clients/cli/devices.c:71
@@ -3377,17 +3886,17 @@ msgstr "ТРЕБУЕТСЯ ПРОШИВКА"
 #. 18
 #: ../clients/cli/devices.c:74
 msgid "NM-PLUGIN-MISSING"
-msgstr ""
+msgstr "ОТСУТСТВУЕТ-МОДУЛЬ-NM"
 
 #. 19
 #: ../clients/cli/devices.c:75
 msgid "PHYS-PORT-ID"
-msgstr ""
+msgstr "ID-ФИЗ-ПОРТА"
 
 #. 23
 #: ../clients/cli/devices.c:79
 msgid "METERED"
-msgstr ""
+msgstr "ЛИМИТНЫЙ"
 
 #. 0
 #: ../clients/cli/devices.c:90
@@ -3417,10 +3926,10 @@ msgstr "НЕСУЩАЯ"
 #. 1
 #: ../clients/cli/devices.c:112
 msgid "S390-SUBCHANNELS"
-msgstr ""
+msgstr "ПОДКАНАЛЫ-S390"
 
 #. 0
-#: ../clients/cli/devices.c:121 ../clients/cli/devices.c:741
+#: ../clients/cli/devices.c:121 ../clients/cli/devices.c:731
 msgid "WEP"
 msgstr "WEP"
 
@@ -3430,7 +3939,7 @@ msgid "WPA"
 msgstr "WPA"
 
 #. 2
-#: ../clients/cli/devices.c:123 ../clients/cli/devices.c:749
+#: ../clients/cli/devices.c:123 ../clients/cli/devices.c:739
 msgid "WPA2"
 msgstr "WPA2"
 
@@ -3446,7 +3955,7 @@ msgstr "CCMP"
 
 #. 5
 #. 2
-#: ../clients/cli/devices.c:126 ../clients/cli/devices.c:238
+#: ../clients/cli/devices.c:126 ../clients/cli/devices.c:228
 msgid "AP"
 msgstr "ТОЧКА ДОСТУПА"
 
@@ -3458,12 +3967,12 @@ msgstr "ADHOC"
 #. 7
 #: ../clients/cli/devices.c:128
 msgid "2GHZ"
-msgstr ""
+msgstr "2 ГГц"
 
 #. 8
 #: ../clients/cli/devices.c:129
 msgid "5GHZ"
-msgstr ""
+msgstr "5 ГГц"
 
 #. 0
 #: ../clients/cli/devices.c:138
@@ -3490,6 +3999,11 @@ msgstr "TX-POW"
 msgid "BSID"
 msgstr "BSID"
 
+#. 0
+#: ../clients/cli/devices.c:151 ../clients/tui/nmt-page-wifi.c:224
+msgid "SSID"
+msgstr "SSID"
+
 #. 1
 #: ../clients/cli/devices.c:152
 msgid "SSID-HEX"
@@ -3553,157 +4067,142 @@ msgstr "*"
 
 #. 0
 #. 5
-#: ../clients/cli/devices.c:177 ../clients/cli/devices.c:241
+#: ../clients/cli/devices.c:177 ../clients/cli/devices.c:231
 msgid "NSP"
 msgstr "NSP"
 
 #. 0
-#: ../clients/cli/devices.c:192 ../clients/cli/devices.c:201
+#: ../clients/cli/devices.c:192
 msgid "SLAVES"
 msgstr "СЛЕЙВЫ"
 
-#. 1
-#: ../clients/cli/devices.c:202
-msgid "CONFIG"
-msgstr ""
-
 #. 0
-#: ../clients/cli/devices.c:211
+#: ../clients/cli/devices.c:201
 msgid "PARENT"
-msgstr ""
+msgstr "РОДИТЕЛЬ"
 
 #. 1
-#: ../clients/cli/devices.c:212
+#: ../clients/cli/devices.c:202
 msgid "ID"
 msgstr "ID"
 
 #. 0
-#: ../clients/cli/devices.c:221 ../clients/cli/devices.c:236
+#: ../clients/cli/devices.c:211 ../clients/cli/devices.c:226
 msgid "CAPABILITIES"
 msgstr "ВОЗМОЖНОСТИ"
 
 #. 1
-#: ../clients/cli/devices.c:237
+#: ../clients/cli/devices.c:227
 msgid "WIFI-PROPERTIES"
 msgstr "СВОЙСТВА WIFI"
 
 #. 3
-#: ../clients/cli/devices.c:239
+#: ../clients/cli/devices.c:229
 msgid "WIRED-PROPERTIES"
 msgstr "СВОЙСТВА ПРОВОДНОГО СОЕДИНЕНИЯ"
 
 #. 4
-#: ../clients/cli/devices.c:240
+#: ../clients/cli/devices.c:230
 msgid "WIMAX-PROPERTIES"
 msgstr "СВОЙСТВА WIMAX"
 
 #. 10
-#: ../clients/cli/devices.c:246 ../clients/tui/nmt-page-bond.c:351
+#: ../clients/cli/devices.c:236 ../clients/tui/nmt-page-bond.c:351
 msgid "BOND"
 msgstr "АГРЕГАЦИЯ (BOND)"
 
 #. 11
-#: ../clients/cli/devices.c:247 ../clients/tui/nmt-page-team.c:145
+#: ../clients/cli/devices.c:237 ../clients/tui/nmt-page-team.c:145
 msgid "TEAM"
 msgstr "АГРЕГАЦИЯ (TEAM)"
 
 #. 12
-#: ../clients/cli/devices.c:248 ../clients/tui/nmt-page-bridge.c:74
+#: ../clients/cli/devices.c:238 ../clients/tui/nmt-page-bridge.c:74
 msgid "BRIDGE"
 msgstr "МОСТ"
 
-#. 13
-#: ../clients/cli/devices.c:249 ../clients/tui/nm-editor-utils.c:217
-#: ../clients/tui/nmt-page-vlan.c:94 ../libnm-core/nm-connection.c:1746
-#: ../libnm-glib/nm-device.c:1879 ../libnm-util/nm-connection.c:1632
-#: ../libnm/nm-device.c:1830
-msgid "VLAN"
-msgstr "VLAN"
-
 #. 14
-#: ../clients/cli/devices.c:250
+#: ../clients/cli/devices.c:240
 msgid "BLUETOOTH"
 msgstr "BLUETOOTH"
 
 #. 15
-#: ../clients/cli/devices.c:251
+#: ../clients/cli/devices.c:241
 msgid "CONNECTIONS"
 msgstr "СОЕДИНЕНИЯ"
 
 #. 1
-#: ../clients/cli/devices.c:263
+#: ../clients/cli/devices.c:253
 msgid "CHASSIS-ID"
-msgstr ""
+msgstr "ID-ШАССИ"
 
 #. 2
-#: ../clients/cli/devices.c:264
+#: ../clients/cli/devices.c:254
 msgid "PORT-ID"
-msgstr ""
+msgstr "ID-ПОРТА"
 
 #. 3
-#: ../clients/cli/devices.c:265
+#: ../clients/cli/devices.c:255
 msgid "PORT-DESCRIPTION"
-msgstr ""
+msgstr "ОПИСАНИЕ-ПОРТА"
 
 #. 4
-#: ../clients/cli/devices.c:266
-#, fuzzy
+#: ../clients/cli/devices.c:256
 msgid "SYSTEM-NAME"
-msgstr "ИМЯ_ПОЛЬЗОВАТЕЛЯ"
+msgstr "ИМЯ-СИСТЕМЫ"
 
 #. 5
-#: ../clients/cli/devices.c:267
+#: ../clients/cli/devices.c:257
 msgid "SYSTEM-DESCRIPTION"
-msgstr ""
+msgstr "ОПИСАНИЕ-СИСТЕМЫ"
 
 #. 6
-#: ../clients/cli/devices.c:268
-#, fuzzy
+#: ../clients/cli/devices.c:258
 msgid "SYSTEM-CAPABILITIES"
-msgstr "ВОЗМОЖНОСТИ"
+msgstr "ВОЗМОЖНОСТИ-СИСТЕМЫ"
 
 #. 7
-#: ../clients/cli/devices.c:269
+#: ../clients/cli/devices.c:259
 msgid "IEEE-802-1-PVID"
-msgstr ""
+msgstr "PVID-IEEE-802-1"
 
 #. 8
-#: ../clients/cli/devices.c:270
+#: ../clients/cli/devices.c:260
 msgid "IEEE-802-1-PPVID"
-msgstr ""
+msgstr "PPVID-IEEE-802-1"
 
 #. 9
-#: ../clients/cli/devices.c:271
+#: ../clients/cli/devices.c:261
 msgid "IEEE-802-1-PPVID-FLAGS"
-msgstr ""
+msgstr "ФЛАГИ-PPVID-IEEE-802-1"
 
 #. 10
-#: ../clients/cli/devices.c:272
+#: ../clients/cli/devices.c:262
 msgid "IEEE-802-1-VID"
-msgstr ""
+msgstr "VID-IEEE-802-1"
 
 #. 11
-#: ../clients/cli/devices.c:273
+#: ../clients/cli/devices.c:263
 msgid "IEEE-802-1-VLAN-NAME"
-msgstr ""
+msgstr "ИМЯ-VLAN-IEEE-802-1"
 
 #. 12
-#: ../clients/cli/devices.c:274
+#: ../clients/cli/devices.c:264
 msgid "DESTINATION"
-msgstr ""
+msgstr "НАЗНАЧЕНИЕ"
 
 #. 13
-#: ../clients/cli/devices.c:275
+#: ../clients/cli/devices.c:265
 msgid "CHASSIS-ID-TYPE"
-msgstr ""
+msgstr "ТИП-ID-ШАССИ"
 
 #. 14
-#: ../clients/cli/devices.c:276
+#: ../clients/cli/devices.c:266
 msgid "PORT-ID-TYPE"
-msgstr ""
+msgstr "ТИП-ID-ПОРТА"
 
-#: ../clients/cli/devices.c:293
-#, fuzzy, c-format
+#: ../clients/cli/devices.c:283
+#, c-format
 msgid ""
 "Usage: nmcli device { COMMAND | help }\n"
 "\n"
@@ -3718,7 +4217,7 @@ msgid ""
 "\n"
 "  connect <ifname>\n"
 "\n"
-"  reapply <ifname>\n"
+"  reapply <ifname> ...\n"
 "\n"
 "  disconnect <ifname> ...\n"
 "\n"
@@ -3741,32 +4240,42 @@ msgid ""
 "  lldp [list [ifname <ifname>]]\n"
 "\n"
 msgstr ""
-"Формат: nmcli device { КОМАНДА | help }\n"
-"\n"
-"КОМАНДА := { status | show | connect | disconnect | wifi | wimax }\n"
+"ФОРМАТ: nmcli device { КОМАНДА | help }\n"
 "\n"
-"КОМАНДА := { status | show | connect | disconnect | wifi }\n"
+"КОМАНДА := { status | show | connect | reapply | 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"
-"  disconnect <интерфейс>\n"
+"  reapply <интерфейс> ...\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]\n"
+"                         [bssid <BSSID>] [name <имя>] [private yes|no] "
+"[hidden yes|no]\n"
 "\n"
-"  wifi rescan [[ifname] <интерфейс>]\n"
+"  wifi hotspot [ifname <интерфейс>] [con-name <имя>] [ssid <SSID>] [band "
+"a|bg] [channel <канал>] [password <пароль>]\n"
 "\n"
-"  wimax [list [ifname <интерфейс>] [nsp <имя>]]\n"
+"  wifi rescan [ifname <интерфейс>] [[ssid <SSID для сканирования>] ...]\n"
 "\n"
+"  lldp [list [ifname <интерфейс>]]\n"
 
-#: ../clients/cli/devices.c:315
+#: ../clients/cli/devices.c:305
 #, c-format
 msgid ""
 "Usage: nmcli device status { help }\n"
@@ -3777,15 +4286,13 @@ msgid ""
 " TYPE       - device type\n"
 " STATE      - device state\n"
 " CONNECTION - connection activated on device (if any)\n"
-"Displayed columns can be changed using '--fields' global option. 'status' "
-"is\n"
-"the default command, which means 'nmcli device' calls 'nmcli device "
-"status'.\n"
+"Displayed columns can be changed using '--fields' global option. 'status' is\n"
+"the default command, which means 'nmcli device' calls 'nmcli device status'.\n"
 "\n"
 msgstr ""
 "Формат: nmcli device status { help }\n"
 "\n"
-"Возвращает статус всех устройств.\n"
+"Возвращает состояние всех устройств.\n"
 "По умолчанию будут показаны столбцы:\n"
 " УСТРОЙСТВО     -  имя интерфейса\n"
 " ТИП       -  тип устройства\n"
@@ -3796,7 +4303,7 @@ msgstr ""
 "gen status».\n"
 "\n"
 
-#: ../clients/cli/devices.c:330
+#: ../clients/cli/devices.c:320
 #, c-format
 msgid ""
 "Usage: nmcli device show { ARGUMENTS | help }\n"
@@ -3815,7 +4322,7 @@ msgstr ""
 "отдельно выбранном устройстве.\n"
 "\n"
 
-#: ../clients/cli/devices.c:341
+#: ../clients/cli/devices.c:331
 #, c-format
 msgid ""
 "Usage: nmcli device connect { ARGUMENTS | help }\n"
@@ -3823,8 +4330,8 @@ msgid ""
 "ARGUMENTS := <ifname>\n"
 "\n"
 "Connect the device.\n"
-"NetworkManager will try to find a suitable connection that will be "
-"activated.\n"
+"NetworkManager will try to find a suitable connection that will be activated."
+"\n"
 "It will also consider connections that are not set to auto-connect.\n"
 "\n"
 msgstr ""
@@ -3837,28 +4344,27 @@ msgstr ""
 "принимая во внимание соединения без включенных функций\n"
 "автоматического запуска.\n"
 
-#: ../clients/cli/devices.c:353
-#, fuzzy, c-format
+#: ../clients/cli/devices.c:343
+#, c-format
 msgid ""
 "Usage: nmcli device reapply { ARGUMENTS | help }\n"
 "\n"
-"ARGUMENTS := <ifname>\n"
+"ARGUMENTS := <ifname> ...\n"
 "\n"
 "Attempts to update device with changes to the currently active connection\n"
 "made since it was last applied.\n"
 "\n"
 msgstr ""
-"Формат: nmcli device disconnect { АРГУМЕНТЫ | help }\n"
-"\n"
-"АРГУМЕНТЫ := <интерфейс>\n"
-"\n"
-"Отключает устройство и предотвращает повторную\n"
-"активацию соединений без вмешательства пользователя.\n"
+"Формат: nmcli device reapply { АРГУМЕНТЫ | help }\n"
 "\n"
+"АРГУМЕНТЫ := <интерфейс> ...\n"
 "\n"
+"Предпринимает попытку обновить устройство в соответствии \n"
+"с изменениями, которым подверглось активное соединение\n"
+"с момента его активации.\n"
 
-#: ../clients/cli/devices.c:364
-#, fuzzy, c-format
+#: ../clients/cli/devices.c:354
+#, c-format
 msgid ""
 "Usage: nmcli device disconnect { ARGUMENTS | help }\n"
 "\n"
@@ -3871,15 +4377,13 @@ msgid ""
 msgstr ""
 "Формат: nmcli device disconnect { АРГУМЕНТЫ | help }\n"
 "\n"
-"АРГУМЕНТЫ := <интерфейс>\n"
+"АРГУМЕНТЫ := <интерфейс> ...\n"
 "\n"
 "Отключает устройство и предотвращает повторную\n"
 "активацию соединений без вмешательства пользователя.\n"
-"\n"
-"\n"
 
-#: ../clients/cli/devices.c:376
-#, fuzzy, c-format
+#: ../clients/cli/devices.c:366
+#, c-format
 msgid ""
 "Usage: nmcli device delete { ARGUMENTS | help }\n"
 "\n"
@@ -3891,15 +4395,16 @@ msgid ""
 "command.\n"
 "\n"
 msgstr ""
-"Формат: nmcli device show { АРГУМЕНТЫ | help }\n"
+"Формат: nmcli device delete { АРГУМЕНТЫ | help }\n"
 "\n"
-"АРГУМЕНТЫ := [<интерфейс>]\n"
-"\n"
-"Показывает информацию обо всех или\n"
-"отдельно выбранном устройстве.\n"
+"АРГУМЕНТЫ := <интерфейс> ...\n"
 "\n"
+"Удаление программных устройств.\n"
+"Это команда удаляет интерфейсы. Работает только для программных \n"
+"устройств (агрегированных устройств, мостов и т.п.).  \n"
+"Аппаратные устройства эта команда удалить не может.\n"
 
-#: ../clients/cli/devices.c:389
+#: ../clients/cli/devices.c:379
 #, c-format
 msgid ""
 "Usage: nmcli device set { ARGUMENTS | help }\n"
@@ -3912,9 +4417,17 @@ msgid ""
 "Modify device properties.\n"
 "\n"
 msgstr ""
+"Формат: nmcli device set { АРГУМЕНТЫ | help }\n"
+"\n"
+"АРГУМЕНТЫ := УСТРОЙСТВО { СВОЙСТВО [ СВОЙСТВО ... ] }\n"
+"УСТРОЙСТВО    := [ifname] <интерфейс> \n"
+"PROPERTY  := { autoconnect { yes | no } |\n"
+"             { managed { yes | no }\n"
+"\n"
+"Изменить свойства устройства.\n"
 
-#: ../clients/cli/devices.c:402
-#, fuzzy, c-format
+#: ../clients/cli/devices.c:392
+#, c-format
 msgid ""
 "Usage: nmcli device monitor { ARGUMENTS | help }\n"
 "\n"
@@ -3925,16 +4438,18 @@ msgid ""
 "Monitors all devices in case no interface is specified.\n"
 "\n"
 msgstr ""
-"Формат: nmcli device show { АРГУМЕНТЫ | help }\n"
+"Формат: nmcli device monitor { АРГУМЕНТЫ | help }\n"
 "\n"
 "АРГУМЕНТЫ := [<интерфейс>]\n"
 "\n"
-"Показывает информацию обо всех или\n"
-"отдельно выбранном устройстве.\n"
-"\n"
+"Мониторинг активности устройства.\n"
+"Эта команда выводит новую строку каждый раз,\n"
+"когда будет меняться состояние заданного устройства.\n"
+"Если интерфейс не указан, будут отслеживаться \n"
+"все устройства.\n"
 
-#: ../clients/cli/devices.c:414
-#, fuzzy, c-format
+#: ../clients/cli/devices.c:404
+#, c-format
 msgid ""
 "Usage: nmcli device wifi { ARGUMENTS | help }\n"
 "\n"
@@ -3945,8 +4460,8 @@ msgid ""
 "List available Wi-Fi access points. The 'ifname' and 'bssid' options can be\n"
 "used to list APs for a particular interface, or with a specific BSSID.\n"
 "\n"
-"ARGUMENTS := connect <(B)SSID> [password <password>] [wep-key-type key|"
-"phrase] [ifname <ifname>]\n"
+"ARGUMENTS := connect <(B)SSID> [password <password>] [wep-key-type "
+"key|phrase] [ifname <ifname>]\n"
 "                    [bssid <BSSID>] [name <name>] [private yes|no] [hidden "
 "yes|no]\n"
 "\n"
@@ -3975,10 +4490,8 @@ msgid ""
 "\n"
 "ARGUMENTS := rescan [ifname <ifname>] [[ssid <SSID to scan>] ...]\n"
 "\n"
-"Request that NetworkManager immediately re-scan for available access "
-"points.\n"
-"NetworkManager scans Wi-Fi networks periodically, but in some cases it "
-"might\n"
+"Request that NetworkManager immediately re-scan for available access points.\n"
+"NetworkManager scans Wi-Fi networks periodically, but in some cases it might\n"
 "be useful to start scanning manually. 'ssid' allows scanning for a specific\n"
 "SSID, which is useful for APs with hidden SSIDs. More 'ssid' parameters can "
 "be\n"
@@ -3992,352 +4505,370 @@ msgstr ""
 "\n"
 "АРГУМЕНТЫ := [list [ifname <интерфейс>] [bssid <BSSID>]]\n"
 "\n"
-"Возвращает доступные точки подключения к беспроводной сети. \n"
+"Возвращает доступные точки доступа к беспроводной сети. \n"
 "«ifname» и «bssid» позволяют получить список точек доступа \n"
 "для заданного интерфейса или BSSID.\n"
 "\n"
-"ARGUMENTS := connect <(B)SSID> [password <пароль>] [wep-key-type key|phrase] "
+"АРГУМЕНТЫ := connect <(B)SSID> [password <пароль>] [wep-key-type key|phrase] "
 "[ifname <интерфейс>]\n"
-"                    [bssid <BSSID>] [name <имя>] [private yes|no]\n"
+"                    [bssid <BSSID>] [name <имя>] [private yes|no] [hidden "
+"yes|no]\n"
 "\n"
 "Подключение к беспроводной сети, заданной с помощью SSID или BSSID. \n"
 "Команда создаст новое соединение и использует его для подключения к сети. \n"
 "Эта команда аналогична выбору SSID в окне графического клиента. \n"
 "Так как каждый раз будет создаваться новое соединение, \n"
-"этот способ подходит для подключения к новым сетям. \n"
+"этот способ подходит для подключения к новым сетям Wi-Fi. \n"
 "Для существующих соединений рекомендуется использовать «nmcli con up id "
 "<имя>».\n"
 "В настоящий момент поддерживаются только открытые сети  WEP и WPA-PSK. \n"
 "По умолчанию подразумевается, что конфигурация IP настраивается через DHCP.\n"
 "\n"
-"АРГУМЕНТЫ := rescan [[ifname] <интерфейс>]\n"
+"АРГУМЕНТЫ := wifi hotspot [ifname <интерфейс>] [con-name <имя>] [ssid "
+"<SSID>]\n"
+"                          [band a|bg] [channel <канал>] [password <пароль>]\n"
+"\n"
+"Создать точку доступа Wi-Fi. \n"
+"Чтобы остановить работу точки доступа,используйте \n"
+"«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"
 "Немедленный поиск доступных точек доступа. \n"
-"NetworkManager периодически проверяет наличие беспроводных сетей, \n"
-"но иногда это надо сделать сразу. Эта команда не показывает список \n"
-"точек доступа — для этой цели служит «nmcli device wifi list».\n"
+"NetworkManager в любом случае периодически проверяет наличие \n"
+"беспроводных сетей, но иногда это надо сделать сразу. \n"
+"Параметр «ssid» позволяет указать точный SSID, что помогает\n"
+"найти точки доступа со скрытым SSID.\n"
+"Эта команда не показывает список точек доступа — \n"
+"для этой цели служит «nmcli device wifi list».\n"
 
-#: ../clients/cli/devices.c:461
-#, fuzzy, c-format
+#: ../clients/cli/devices.c:451
+#, c-format
 msgid ""
 "Usage: nmcli device lldp { ARGUMENTS | help }\n"
 "\n"
 "ARGUMENTS := [list [ifname <ifname>]]\n"
 "\n"
-"List neighboring devices discovered through LLDP. The 'ifname' option can "
-"be\n"
+"List neighboring devices discovered through LLDP. The 'ifname' option can be\n"
 "used to list neighbors for a particular interface.\n"
 "\n"
 msgstr ""
-"Формат: nmcli device wimax { АРГУМЕНТЫ | help }\n"
-"\n"
-"Выполнение операции над устройствами WiMAX.\n"
+"Формат: nmcli device lldp { АРГУМЕНТЫ | help }\n"
 "\n"
-"АРГУМЕНТЫ := [list [ifname <интерфейс>] [nsp <имя>]]\n"
-"\n"
-"Возвращает список доступных WiMAX NSP. С помощью параметров \n"
-"«ifname» и «ncp» можно выбрать сети для конкретного интерфейса или NCP.\n"
+"АРГУМЕНТЫ := [list [ifname <интерфейс>]\n"
 "\n"
+"Показать ближайшие устройства, обнаруженные с помощью LLDP.\n"
+"Параметр «ifname» позволяет получить список соседей\n"
+"для определенного интерфейса.\n"
 
-#: ../clients/cli/devices.c:537 ../clients/cli/devices.c:1756
-#: ../clients/cli/devices.c:1765 ../clients/cli/devices.c:1956
-#: ../clients/cli/devices.c:2161 ../clients/cli/devices.c:2168
+#: ../clients/cli/devices.c:527 ../clients/cli/devices.c:1676
+#: ../clients/cli/devices.c:1685 ../clients/cli/devices.c:1879
+#: ../clients/cli/devices.c:2103 ../clients/cli/devices.c:2110
 #, c-format
 msgid "Error: No interface specified."
 msgstr "Ошибка. Интерфейс не определен."
 
-#: ../clients/cli/devices.c:557
+#: ../clients/cli/devices.c:547 ../clients/cli/devices.c:1899
 #, c-format
 msgid "Warning: argument '%s' is duplicated.\n"
-msgstr ""
+msgstr "Предупреждение: аргумент «%s» дублируется.\n"
 
-#: ../clients/cli/devices.c:559
-#, fuzzy, c-format
+#: ../clients/cli/devices.c:549 ../clients/cli/devices.c:1901
+#, c-format
 msgid "Error: Device '%s' not found.\n"
-msgstr "Ошибка: не найдено устройство «%s»."
+msgstr "Ошибка: «%s» не обнаружено.\n"
 
-#: ../clients/cli/devices.c:560
-#, fuzzy, c-format
+#: ../clients/cli/devices.c:550 ../clients/cli/devices.c:1902
+#, c-format
 msgid "Error: not all devices found."
-msgstr "Ошибка: устройства Wi-Fi не найдены."
+msgstr "Ошибка: обнаружены не все устройства."
 
-#: ../clients/cli/devices.c:660 ../clients/cli/devices.c:811
+#: ../clients/cli/devices.c:650 ../clients/cli/devices.c:801
 msgid "(none)"
 msgstr "(нет)"
 
-#: ../clients/cli/devices.c:729
+#: ../clients/cli/devices.c:719
 #, c-format
 msgid "%u MHz"
 msgstr "%u МГц"
 
-#: ../clients/cli/devices.c:730
+#: ../clients/cli/devices.c:720
 #, c-format
 msgid "%u Mbit/s"
 msgstr "%u МБ/с"
 
-#: ../clients/cli/devices.c:745
+#: ../clients/cli/devices.c:735
 msgid "WPA1"
 msgstr "WPA1"
 
-#: ../clients/cli/devices.c:754
+#: ../clients/cli/devices.c:744
 msgid "802.1X"
 msgstr "802.1X"
 
-#: ../clients/cli/devices.c:770
+#: ../clients/cli/devices.c:760
 msgid "Ad-Hoc"
 msgstr "Ad-Hoc"
 
-#: ../clients/cli/devices.c:771
+#: ../clients/cli/devices.c:761
 msgid "Infra"
 msgstr "Инфраструктура"
 
-#: ../clients/cli/devices.c:772
+#: ../clients/cli/devices.c:762
 msgid "N/A"
 msgstr "Н/Д"
 
-#: ../clients/cli/devices.c:996
+#: ../clients/cli/devices.c:916
 msgid "Device details"
 msgstr "Сведения об устройстве"
 
-#: ../clients/cli/devices.c:1008
+#: ../clients/cli/devices.c:928
 #, c-format
 msgid "Error: 'device show': %s"
 msgstr "Ошибка «device show»: %s"
 
-#: ../clients/cli/devices.c:1060 ../clients/cli/devices.c:1063
+#: ../clients/cli/devices.c:980 ../clients/cli/devices.c:983
 msgid "(unknown)"
 msgstr "(неизвестно)"
 
-#: ../clients/cli/devices.c:1104
+#: ../clients/cli/devices.c:1024
 #, c-format
 msgid "%u Mb/s"
 msgstr "%u Мб/c"
 
-#: ../clients/cli/devices.c:1195
+#: ../clients/cli/devices.c:1115
 msgid "on"
 msgstr "вкл."
 
-#: ../clients/cli/devices.c:1195
+#: ../clients/cli/devices.c:1115
 msgid "off"
 msgstr "выкл."
 
-#: ../clients/cli/devices.c:1422
+#: ../clients/cli/devices.c:1342
 #, c-format
 msgid "Error: 'device status': %s"
 msgstr "Ошибка: «device status»: %s"
 
 #. Add headers
-#: ../clients/cli/devices.c:1429
+#: ../clients/cli/devices.c:1349
 msgid "Status of devices"
 msgstr "Состояние устройств"
 
-#: ../clients/cli/devices.c:1460 ../clients/cli/devices.c:3570
+#: ../clients/cli/devices.c:1380 ../clients/cli/devices.c:3509
 #, c-format
 msgid "Error: invalid extra argument '%s'."
 msgstr "Ошибка. Недопустимый дополнительный аргумент: «%s»."
 
-#: ../clients/cli/devices.c:1477 ../clients/cli/devices.c:1787
-#: ../clients/cli/devices.c:2184 ../clients/cli/devices.c:2454
-#: ../clients/cli/devices.c:3609
+#: ../clients/cli/devices.c:1397 ../clients/cli/devices.c:1707
+#: ../clients/cli/devices.c:2126 ../clients/cli/devices.c:2396
+#: ../clients/cli/devices.c:3548
 #, c-format
 msgid "Error: Device '%s' not found."
 msgstr "Ошибка: не найдено устройство «%s»."
 
-#: ../clients/cli/devices.c:1555
-#, fuzzy, c-format
+#: ../clients/cli/devices.c:1475
+#, c-format
 msgid "Device '%s' successfully activated with '%s'.\n"
-msgstr "Устройство «%s» успешно подключено."
+msgstr "Устройство «%s» успешно активировано с помощью «%s».\n"
 
-#: ../clients/cli/devices.c:1561
-#, fuzzy, c-format
+#: ../clients/cli/devices.c:1481
+#, c-format
 msgid "Error: Connection activation failed: (%d) %s.\n"
-msgstr "Ошибка: сбой активации соединения: (%d) %s."
+msgstr "Ошибка: сбой активации соединения: (%d) %s.\n"
 
-#: ../clients/cli/devices.c:1597
-#, fuzzy, c-format
+#: ../clients/cli/devices.c:1517
+#, c-format
 msgid "Error: Failed to setup a Wi-Fi hotspot: %s"
-msgstr "Ошибка. Не удалось установить имя узла: (%d) %s"
+msgstr "Ошибка. Не удалось настроить точку доступа Wi-Fi: %s"
 
-#: ../clients/cli/devices.c:1600
-#, fuzzy, c-format
+#: ../clients/cli/devices.c:1520
+#, c-format
 msgid "Error: Failed to add/activate new connection: %s"
-msgstr "Ошибка: не удалось добавить или активировать новое соединение: (%d) %s"
+msgstr "Ошибка: не удалось добавить или активировать новое соединение: %s"
 
-#: ../clients/cli/devices.c:1610
-#, fuzzy, c-format
+#: ../clients/cli/devices.c:1530
+#, c-format
 msgid "Error: Failed to setup a Wi-Fi hotspot"
-msgstr "Ошибка. Не удалось установить имя узла: (%d) %s"
+msgstr "Ошибка: не удалось настроить точку доступа Wi-Fi"
 
-#: ../clients/cli/devices.c:1612
+#: ../clients/cli/devices.c:1532
 #, c-format
 msgid "Error: Failed to add/activate new connection: Unknown error"
 msgstr ""
 "Ошибка: не удалось добавить или активировать новое соединение: неизвестная "
 "ошибка"
 
-#: ../clients/cli/devices.c:1624
+#: ../clients/cli/devices.c:1544
 #, c-format
 msgid "Connection with UUID '%s' created and activated on device '%s'\n"
 msgstr "Соединение с UUID «%s» создано и задействовано на устройстве «%s»\n"
 
-#: ../clients/cli/devices.c:1627
-#, fuzzy, c-format
+#: ../clients/cli/devices.c:1547
+#, c-format
 msgid "Hotspot '%s' activated on device '%s'\n"
-msgstr "Соединение с UUID «%s» создано и задействовано на устройстве «%s»\n"
+msgstr "Точка доступа «%s» активирована на устройсте «%s»\n"
+"\n"
 
-#: ../clients/cli/devices.c:1691
+#: ../clients/cli/devices.c:1611
 #, c-format
 msgid "Error: Device activation failed: %s"
-msgstr "Ошибка. Не удалось отключить устройство: %s"
+msgstr "Ошибка. Не удалось активировать устройство: %s"
 
-#: ../clients/cli/devices.c:1700
-#, fuzzy, c-format
+#: ../clients/cli/devices.c:1620
+#, c-format
 msgid "Error: Device activation failed: device was disconnected"
-msgstr "Ошибка. Не удалось отключить устройство: %s"
+msgstr "Ошибка. Не удалось активировать устройство: устройство отключено"
 
-#: ../clients/cli/devices.c:1715
+#: ../clients/cli/devices.c:1635
 #, c-format
 msgid "Device '%s' has been connected.\n"
 msgstr "Устройство «%s» подключено.\n"
 
-#: ../clients/cli/devices.c:1771
+#: ../clients/cli/devices.c:1691
 #, c-format
 msgid "Error: extra argument not allowed: '%s'."
 msgstr "Ошибка. Дополнительный аргумент не разрешен: «%s»."
 
-#: ../clients/cli/devices.c:1856 ../clients/cli/devices.c:1871
-#: ../clients/cli/devices.c:2022
-#, fuzzy, c-format
+#: ../clients/cli/devices.c:1776 ../clients/cli/devices.c:1791
+#: ../clients/cli/devices.c:1964
+#, c-format
 msgid "Device '%s' successfully disconnected.\n"
-msgstr "Выполнено: устройство «%s» отключено."
+msgstr "Выполнено: устройство «%s» отключено.\n"
 
-#: ../clients/cli/devices.c:1859
-#, fuzzy, c-format
+#: ../clients/cli/devices.c:1779
+#, c-format
 msgid "Device '%s' successfully removed.\n"
-msgstr "Выполнено: устройство «%s» отключено."
+msgstr "Устройство «%s» отключено.\n"
 
-#: ../clients/cli/devices.c:1918
-#, fuzzy, c-format
-msgid "Error: Reapplying connection to device '%s' (%s) failed: %s"
-msgstr "Ошибка: не удалось отключить устройство «%s» (%s): %s"
+#: ../clients/cli/devices.c:1838
+#, c-format
+msgid "Error: not all connections reapplied."
+msgstr "Ошибка: не все соединения были повторно применены."
 
-#: ../clients/cli/devices.c:1928
-#, fuzzy, c-format
-msgid "Connection successfully reapplied to device '%s'.\n"
-msgstr "Соединение успешно активировано (адрес действующего D-Bus: %s)\n"
+#: ../clients/cli/devices.c:1839
+#, c-format
+msgid "Error: Reapplying connection to device '%s' (%s) failed: %s\n"
+msgstr ""
+"Ошибка: попытка применения соединения к устройству «%s» (%s) завершилось "
+"неудачей: %s\n"
 
-#: ../clients/cli/devices.c:1965
-#, fuzzy, c-format
-msgid "Error: unsupported argument '%s'."
-msgstr "Ошибка. Непредвиденный аргумент: «%s»"
+#: ../clients/cli/devices.c:1849
+#, c-format
+msgid "Connection successfully reapplied to device '%s'.\n"
+msgstr "Соединение снова применено к устройству «%s».\n"
 
-#: ../clients/cli/devices.c:1979
-#, fuzzy, c-format
-msgid "Error: device '%s' not found."
-msgstr "Ошибка: не найдено устройство «%s»."
+#: ../clients/cli/devices.c:1912
+#, c-format
+msgid "Error: no valid device provided."
+msgstr "Ошибка: не задано действительное устройство."
 
-#: ../clients/cli/devices.c:2007
-#, fuzzy, c-format
+#: ../clients/cli/devices.c:1949
+#, c-format
 msgid "Error: not all devices disconnected."
-msgstr "Ошибка: «%s» не является активным соединением."
+msgstr "Ошибка: отключены не все устройства."
 
-#: ../clients/cli/devices.c:2008
-#, fuzzy, c-format
+#: ../clients/cli/devices.c:1950
+#, c-format
 msgid "Error: Device '%s' (%s) disconnecting failed: %s\n"
-msgstr "Ошибка: не удалось отключить устройство «%s» (%s): %s"
+msgstr ""
+"Ошибка: попытка отключения устройства «%s» (%s) завершилось неудачей: %s\n"
 
-#: ../clients/cli/devices.c:2083
-#, fuzzy, c-format
+#: ../clients/cli/devices.c:2025
+#, c-format
 msgid "Error: not all devices deleted."
-msgstr "Ошибка: устройства Wi-Fi не найдены."
+msgstr "Ошибка: удалены не все устройства."
 
-#: ../clients/cli/devices.c:2084
-#, fuzzy, c-format
+#: ../clients/cli/devices.c:2026
+#, c-format
 msgid "Error: Device '%s' (%s) deletion failed: %s\n"
-msgstr "Ошибка: не удалось отключить устройство «%s» (%s): %s"
+msgstr "Ошибка: не удается удалить устройство «%s» (%s): %s\n"
 
-#: ../clients/cli/devices.c:2190
-#, fuzzy, c-format
+#: ../clients/cli/devices.c:2132
+#, c-format
 msgid "Error: No property specified."
-msgstr "Ошибка. Соединение не определено."
+msgstr "Ошибка: свойство не определено."
 
-#: ../clients/cli/devices.c:2202 ../clients/cli/devices.c:2217
+#: ../clients/cli/devices.c:2144 ../clients/cli/devices.c:2159
 #, c-format
 msgid "Error: '%s' argument is missing."
 msgstr "Ошибка: отсутствует аргумент «%s»"
 
-#: ../clients/cli/devices.c:2207
-#, fuzzy, c-format
+#: ../clients/cli/devices.c:2149
+#, c-format
 msgid "Error: 'managed': %s."
-msgstr "Ошибка «mode»: %s"
+msgstr "Ошибка «managed»: %s"
 
-#: ../clients/cli/devices.c:2222
+#: ../clients/cli/devices.c:2174
 #, c-format
-msgid "Error: 'autoconnect': %s."
-msgstr "Ошибка «autoconnect»: %s."
-
-#: ../clients/cli/devices.c:2232
-#, fuzzy, c-format
 msgid "Error: property '%s' is not known."
-msgstr "Ошибка. Недопустимое свойство «%s»: %s."
+msgstr "Ошибка: неизвестное свойство «%s»."
 
-#: ../clients/cli/devices.c:2278
-#, fuzzy, c-format
+#: ../clients/cli/devices.c:2220
+#, c-format
 msgid "%s: using connection '%s'\n"
-msgstr "Нет соединения «%s»."
+msgstr "%s: использует соединение «%s».\n"
 
-#: ../clients/cli/devices.c:2304
+#: ../clients/cli/devices.c:2246
 #, c-format
 msgid "%s: device created\n"
-msgstr ""
+msgstr "%s: устройство создано\n"
 
-#: ../clients/cli/devices.c:2311
-#, fuzzy, c-format
+#: ../clients/cli/devices.c:2253
+#, c-format
 msgid "%s: device removed\n"
-msgstr "Устройство извлечено"
+msgstr "%s: устройство удалено\n"
 
-#: ../clients/cli/devices.c:2397
+#: ../clients/cli/devices.c:2339
 msgid "Wi-Fi scan list"
 msgstr "Список сканирования Wi-Fi"
 
-#: ../clients/cli/devices.c:2435
+#: ../clients/cli/devices.c:2377
 #, c-format
 msgid "Error: 'device wifi': %s"
 msgstr "Ошибка «device wifi»: «%s»"
 
-#: ../clients/cli/devices.c:2477 ../clients/cli/devices.c:2561
+#: ../clients/cli/devices.c:2419 ../clients/cli/devices.c:2500
 #, c-format
 msgid "Error: Access point with bssid '%s' not found."
 msgstr "Ошибка: точка доступа с bssid «%s» не найдена."
 
-#: ../clients/cli/devices.c:2504
-#, fuzzy, c-format
+#: ../clients/cli/devices.c:2446
+#, c-format
 msgid ""
 "Error: Device '%s' was not recognized as a Wi-Fi device, check "
 "NetworkManager Wi-Fi plugin."
-msgstr "Ошибка: «%s» не является устройством WiFi."
+msgstr ""
+"Ошибка: «%s» не распознается как устройство Wi-Fi. Проверьте модуль Wi-Fi "
+"для NetworkManager."
 
-#: ../clients/cli/devices.c:2508 ../clients/cli/devices.c:2841
-#: ../clients/cli/devices.c:3261 ../clients/cli/devices.c:3410
+#: ../clients/cli/devices.c:2448 ../clients/cli/devices.c:2780
+#: ../clients/cli/devices.c:3200 ../clients/cli/devices.c:3349
 #, c-format
 msgid "Error: Device '%s' is not a Wi-Fi device."
 msgstr "Ошибка: «%s» не является устройством WiFi."
 
-#: ../clients/cli/devices.c:2721
+#: ../clients/cli/devices.c:2660
 msgid "SSID or BSSID: "
 msgstr "SSID или BSSID: "
 
-#: ../clients/cli/devices.c:2726
+#: ../clients/cli/devices.c:2665
 #, c-format
 msgid "Error: SSID or BSSID are missing."
 msgstr "Ошибка: не указан SSID или BSSID."
 
-#: ../clients/cli/devices.c:2750
+#: ../clients/cli/devices.c:2689
 #, c-format
 msgid "Error: bssid argument value '%s' is not a valid BSSID."
 msgstr "Ошибка: недопустимое значение аргумента bssid «%s»."
 
-#: ../clients/cli/devices.c:2774
+#: ../clients/cli/devices.c:2713
 #, c-format
 msgid ""
 "Error: wep-key-type argument value '%s' is invalid, use 'key' or 'phrase'."
@@ -4345,208 +4876,212 @@ msgstr ""
 "Ошибка: недопустимое значение аргумента wep-key-type «%s»; используйте «key» "
 "или «phrase»."
 
-#: ../clients/cli/devices.c:2794 ../clients/cli/devices.c:2807
+#: ../clients/cli/devices.c:2733 ../clients/cli/devices.c:2746
 #, c-format
 msgid "Error: %s: %s."
 msgstr "Ошибка: %s: %s."
 
-#: ../clients/cli/devices.c:2822
+#: ../clients/cli/devices.c:2761
 #, c-format
 msgid "Error: BSSID to connect to (%s) differs from bssid argument (%s)."
 msgstr ""
 "Ошибка: BSSID для подключения к (%s) отличается от bssid аргумента (%s)."
 
-#: ../clients/cli/devices.c:2828
+#: ../clients/cli/devices.c:2767
 #, c-format
 msgid "Error: Parameter '%s' is neither SSID nor BSSID."
 msgstr "Ошибка: параметр «%s» не является SSID или BSSID."
 
-#: ../clients/cli/devices.c:2843 ../clients/cli/devices.c:3263
-#: ../clients/cli/devices.c:3412
+#: ../clients/cli/devices.c:2782 ../clients/cli/devices.c:3202
+#: ../clients/cli/devices.c:3351
 #, c-format
 msgid "Error: No Wi-Fi device found."
 msgstr "Ошибка: устройства Wi-Fi не найдены."
 
-#: ../clients/cli/devices.c:2863
-#, fuzzy, c-format
+#: ../clients/cli/devices.c:2802
+#, c-format
 msgid "Error: Failed to scan hidden SSID: %s."
-msgstr "Ошибка. Отказ доступа при настройке журналирования, %s"
+msgstr "Ошибка: скрытый SSID не может сканироваться: %s"
 
-#: ../clients/cli/devices.c:2888
+#: ../clients/cli/devices.c:2827
 #, c-format
 msgid "Error: No network with SSID '%s' found."
 msgstr "Ошибка: не найдена сеть с SSID «%s»."
 
-#: ../clients/cli/devices.c:2890
+#: ../clients/cli/devices.c:2829
 #, c-format
 msgid "Error: No access point with BSSID '%s' found."
 msgstr "Ошибка: точка доступа с BSSID «%s» не найдена."
 
-#: ../clients/cli/devices.c:2932
+#: ../clients/cli/devices.c:2871
 #, c-format
 msgid ""
 "Warning: '%s' should be SSID for hidden APs; but it looks like a BSSID.\n"
 msgstr ""
+"Предупреждение: «%s» должен содержать SSID для скрытой точки доступа, но "
+"обнаружен BSSID.\n"
 
-#: ../clients/cli/devices.c:2946
+#: ../clients/cli/devices.c:2885
 msgid "Password: "
 msgstr "Пароль:"
 
-#: ../clients/cli/devices.c:3095
-#, fuzzy, c-format
+#: ../clients/cli/devices.c:3034
+#, c-format
 msgid "'%s' is not valid WPA PSK"
-msgstr "«%s» не является действительным PSK"
+msgstr "«%s» не является действительным WPA PSK"
 
-#: ../clients/cli/devices.c:3112
-#, fuzzy, c-format
+#: ../clients/cli/devices.c:3051
+#, c-format
 msgid "'%s' is not valid WEP key (it should be 5 or 13 ASCII chars)"
-msgstr "«%s» должно содержать 5-6 цифр"
+msgstr ""
+"«%s» не является действительным ключом WEP (должен содержать 5 или 13 "
+"символов ASCII)"
 
-#: ../clients/cli/devices.c:3128
+#: ../clients/cli/devices.c:3067
 #, c-format
 msgid "Hotspot password: %s\n"
-msgstr ""
+msgstr "Пароль точки доступа: %s\n"
 
-#: ../clients/cli/devices.c:3186
-#, fuzzy, c-format
+#: ../clients/cli/devices.c:3125
+#, c-format
 msgid "Error: ssid is too long."
-msgstr "Ошибка. Необходимо определить «ssid»."
+msgstr "Ошибка: слишком длинный SSID."
 
-#: ../clients/cli/devices.c:3198
-#, fuzzy, c-format
+#: ../clients/cli/devices.c:3137
+#, c-format
 msgid "Error: band argument value '%s' is invalid; use 'a' or 'bg'."
 msgstr ""
-"Ошибка: недопустимое значение аргумента wep-key-type «%s»; используйте «key» "
-"или «phrase»."
+"Ошибка: недопустимое значение аргумента «band»: «%s». Используйте «a» или "
+"«bg»."
 
-#: ../clients/cli/devices.c:3222
-#, fuzzy, c-format
+#: ../clients/cli/devices.c:3161
+#, c-format
 msgid "Error: Unknown parameter %s."
-msgstr "Неизвестный параметр: %s\n"
+msgstr "Ошибка: неизвестный параметр: %s"
 
-#: ../clients/cli/devices.c:3241
-#, fuzzy, c-format
+#: ../clients/cli/devices.c:3180
+#, c-format
 msgid "Error: channel requires band too."
-msgstr "Ошибка. Необходимо определить «apn»."
+msgstr "Ошибка: для канала тоже необходимо определить полосу."
 
-#: ../clients/cli/devices.c:3247
-#, fuzzy, c-format
+#: ../clients/cli/devices.c:3186
+#, c-format
 msgid "Error: channel '%s' not valid for band '%s'."
-msgstr "Ошибка «channel». Неверное значение «%s». Допустимые значения: <1-13>."
+msgstr "Ошибка: недопустимый канал «%s» для полосы «%s»."
 
-#: ../clients/cli/devices.c:3275
-#, fuzzy, c-format
+#: ../clients/cli/devices.c:3214
+#, c-format
 msgid "Error: Device '%s' supports neither AP nor Ad-Hoc mode."
-msgstr "Ошибка: «%s» не является устройством WiFi."
+msgstr "Ошибка: «%s» не поддерживает режим точки доступа или Ad-Hoc."
 
-#: ../clients/cli/devices.c:3310
-#, fuzzy, c-format
+#: ../clients/cli/devices.c:3249
+#, c-format
 msgid "Error: Invalid 'password': %s."
-msgstr "Ошибка. Недопустимое свойство «%s»: %s."
+msgstr "Ошибка: неверный «password»: %s."
 
-#: ../clients/cli/devices.c:3379
-#, fuzzy, c-format
+#: ../clients/cli/devices.c:3318
+#, c-format
 msgid "Error: '%s' cannot repeat."
-msgstr "Ошибка. Параметр «%s» не определен.\n"
+msgstr "Ошибка: «%s» не может повторяться."
 
-#: ../clients/cli/devices.c:3460
+#: ../clients/cli/devices.c:3399
 #, c-format
 msgid "Error: 'device wifi' command '%s' is not valid."
-msgstr "Ошибка. Неверная команда «device wifi»: «%s»."
+msgstr "Ошибка: неверная команда «device wifi»: «%s»."
 
 #. Main header name
-#: ../clients/cli/devices.c:3486
+#: ../clients/cli/devices.c:3425
 msgid "Device LLDP neighbors"
-msgstr ""
+msgstr "Соседи LLDP"
 
-#: ../clients/cli/devices.c:3589
-#, fuzzy, c-format
+#: ../clients/cli/devices.c:3528
+#, c-format
 msgid "Error: 'device lldp list': %s"
-msgstr "Ошибка: «device status»: %s"
+msgstr "Ошибка: «device lldp list»: %s"
 
-#: ../clients/cli/devices.c:3636
-#, fuzzy, c-format
+#: ../clients/cli/devices.c:3575
+#, c-format
 msgid "Error: 'device lldp' command '%s' is not valid."
-msgstr "Ошибка. Неверная команда «device wifi»: «%s»."
+msgstr "Ошибка: неверная команда «device lldp»: «%s»."
 
-#: ../clients/cli/devices.c:3825
+#: ../clients/cli/devices.c:3770
 #, c-format
 msgid "Error: 'dev' command '%s' is not valid."
 msgstr "Ошибка. Неверная команда «dev»: «%s»."
 
-#: ../clients/cli/general.c:35
+#: ../clients/cli/general.c:34
 msgid "RUNNING"
 msgstr "ВЫПОЛНЯЕТСЯ"
 
 #. 0
-#: ../clients/cli/general.c:36
+#: ../clients/cli/general.c:35
 msgid "VERSION"
 msgstr "ВЕРСИЯ"
 
 #. 2
-#: ../clients/cli/general.c:38
+#: ../clients/cli/general.c:37
 msgid "STARTUP"
 msgstr "ЗАПУСК"
 
 #. 3
-#: ../clients/cli/general.c:39
+#: ../clients/cli/general.c:38
 msgid "CONNECTIVITY"
 msgstr "СВЯЗЬ"
 
 #. 4
-#: ../clients/cli/general.c:40
+#: ../clients/cli/general.c:39
 msgid "NETWORKING"
 msgstr "СЕТЬ"
 
 #. 5
-#: ../clients/cli/general.c:41
+#: ../clients/cli/general.c:40
 msgid "WIFI-HW"
 msgstr "WIFI-HW"
 
 #. 6
-#: ../clients/cli/general.c:42
+#: ../clients/cli/general.c:41
 msgid "WIFI"
 msgstr "WIFI"
 
 #. 7
-#: ../clients/cli/general.c:43
+#: ../clients/cli/general.c:42
 msgid "WWAN-HW"
 msgstr "WWAN-HW"
 
 #. 8
-#: ../clients/cli/general.c:44
+#: ../clients/cli/general.c:43
 msgid "WWAN"
 msgstr "WWAN"
 
 #. 9
-#: ../clients/cli/general.c:45
+#: ../clients/cli/general.c:44
 msgid "WIMAX-HW"
 msgstr "WIMAX-HW"
 
 #. 10
-#: ../clients/cli/general.c:46
+#: ../clients/cli/general.c:45
 msgid "WIMAX"
 msgstr "WIMAX"
 
-#: ../clients/cli/general.c:62
+#: ../clients/cli/general.c:61
 msgid "PERMISSION"
 msgstr "РАЗРЕШЕНИЕ"
 
 #. 0
-#: ../clients/cli/general.c:63
+#: ../clients/cli/general.c:62
 msgid "VALUE"
 msgstr "ЗНАЧЕНИЕ"
 
-#: ../clients/cli/general.c:71
+#: ../clients/cli/general.c:70
 msgid "LEVEL"
 msgstr "УРОВЕНЬ"
 
 #. 0
-#: ../clients/cli/general.c:72
+#: ../clients/cli/general.c:71
 msgid "DOMAINS"
 msgstr "ДОМЕНЫ"
 
-#: ../clients/cli/general.c:86
+#: ../clients/cli/general.c:85
 #, c-format
 msgid ""
 "Usage: nmcli general { COMMAND | help }\n"
@@ -4575,7 +5110,7 @@ msgstr ""
 "  logging [level <уровень>] [domains <домены>]\n"
 "\n"
 
-#: ../clients/cli/general.c:97
+#: ../clients/cli/general.c:96
 #, c-format
 msgid ""
 "Usage: nmcli general status { help }\n"
@@ -4592,7 +5127,7 @@ msgstr ""
 "gen status».\n"
 "\n"
 
-#: ../clients/cli/general.c:106
+#: ../clients/cli/general.c:105
 #, c-format
 msgid ""
 "Usage: nmcli general hostname { ARGUMENTS | help }\n"
@@ -4601,8 +5136,8 @@ msgid ""
 "\n"
 "Get or change persistent system hostname.\n"
 "With no arguments, this prints currently configured hostname. When you pass\n"
-"a hostname, NetworkManager will set it as the new persistent system "
-"hostname.\n"
+"a hostname, NetworkManager will set it as the new persistent system hostname."
+"\n"
 "\n"
 msgstr ""
 "Формат: nmcli general hostname { АРГУМЕНТЫ | help }\n"
@@ -4614,7 +5149,7 @@ msgstr ""
 "В противном случае имя узла будет изменено. \n"
 "\n"
 
-#: ../clients/cli/general.c:118
+#: ../clients/cli/general.c:117
 #, c-format
 msgid ""
 "Usage: nmcli general permissions { help }\n"
@@ -4627,7 +5162,7 @@ msgstr ""
 "Возвращает разрешения для закрытых операций.\n"
 "\n"
 
-#: ../clients/cli/general.c:126
+#: ../clients/cli/general.c:125
 #, c-format
 msgid ""
 "Usage: nmcli general logging { ARGUMENTS | help }\n"
@@ -4651,7 +5186,7 @@ msgstr ""
 "Полный список доменов можно найти на справочной странице команды.\n"
 "\n"
 
-#: ../clients/cli/general.c:139
+#: ../clients/cli/general.c:138
 #, c-format
 msgid ""
 "Usage: nmcli networking { COMMAND | help }\n"
@@ -4676,33 +5211,29 @@ msgstr ""
 "  connectivity [check]\n"
 "\n"
 
-#: ../clients/cli/general.c:149
+#: ../clients/cli/general.c:148
 #, c-format
-msgid ""
-"Usage: nmcli networking on { help }\n"
+msgid "Usage: nmcli networking on { help }\n"
 "\n"
 "Switch networking on.\n"
 "\n"
-msgstr ""
-"Формат: nmcli networking on { help }\n"
+msgstr "Формат: nmcli networking on { help }\n"
 "\n"
 "Включает сетевые функции.\n"
 "\n"
 
-#: ../clients/cli/general.c:157
+#: ../clients/cli/general.c:156
 #, c-format
-msgid ""
-"Usage: nmcli networking off { help }\n"
+msgid "Usage: nmcli networking off { help }\n"
 "\n"
 "Switch networking off.\n"
 "\n"
-msgstr ""
-"Формат: nmcli networking off { help }\n"
+msgstr "Формат: nmcli networking off { help }\n"
 "\n"
 "Отключает сетевые функции.\n"
 "\n"
 
-#: ../clients/cli/general.c:165
+#: ../clients/cli/general.c:164
 #, c-format
 msgid ""
 "Usage: nmcli networking connectivity { ARGUMENTS | help }\n"
@@ -4710,8 +5241,8 @@ msgid ""
 "ARGUMENTS := [check]\n"
 "\n"
 "Get network connectivity state.\n"
-"The optional 'check' argument makes NetworkManager re-check the "
-"connectivity.\n"
+"The optional 'check' argument makes NetworkManager re-check the connectivity."
+"\n"
 "\n"
 msgstr ""
 "Формат: nmcli networking connectivity { АРГУМЕНТЫ | help }\n"
@@ -4722,8 +5253,8 @@ msgstr ""
 "Дополнительный аргумент «check» повторно проверяет подключение.\n"
 "\n"
 
-#: ../clients/cli/general.c:177
-#, fuzzy, c-format
+#: ../clients/cli/general.c:176
+#, c-format
 msgid ""
 "Usage: nmcli radio { COMMAND | help }\n"
 "\n"
@@ -4734,16 +5265,11 @@ msgid ""
 msgstr ""
 "ФОРМАТ: nmcli radio { КОМАНДА | help }\n"
 "\n"
-"КОМАНДА := { all | wifi | wwan | wimax }\n"
-"\n"
-"  all | wifi | wwan | wimax [ on | off ]\n"
-"\n"
 "КОМАНДА := { all | wifi | wwan }\n"
 "\n"
-"  all | wifi | wwan [ on | off ]\n"
-"\n"
+"  all | wifi | wwan  [ on | off ]\n"
 
-#: ../clients/cli/general.c:186
+#: ../clients/cli/general.c:185
 #, c-format
 msgid ""
 "Usage: nmcli radio all { ARGUMENTS | help }\n"
@@ -4760,7 +5286,7 @@ msgstr ""
 "Просмотр и изменение статуса всех переключателей.\n"
 "\n"
 
-#: ../clients/cli/general.c:196
+#: ../clients/cli/general.c:195
 #, c-format
 msgid ""
 "Usage: nmcli radio wifi { ARGUMENTS | help }\n"
@@ -4777,7 +5303,7 @@ msgstr ""
 "Просмотр и изменение статуса переключателя Wi-Fi.\n"
 "\n"
 
-#: ../clients/cli/general.c:206
+#: ../clients/cli/general.c:205
 #, c-format
 msgid ""
 "Usage: nmcli radio wwan { ARGUMENTS | help }\n"
@@ -4794,7 +5320,7 @@ msgstr ""
 "Просмотр и изменение статуса переключателя мобильного соединения.\n"
 "\n"
 
-#: ../clients/cli/general.c:216
+#: ../clients/cli/general.c:215
 #, c-format
 msgid ""
 "Usage: nmcli monitor\n"
@@ -4803,203 +5329,205 @@ msgid ""
 "Prints a line whenever a change occurs in NetworkManager\n"
 "\n"
 msgstr ""
+"Формат: nmcli monitor\n"
+"\n"
+"Мониторинг изменений NetworkManager.\n"
+"Выводит новую строку при каждом изменении в NetworkManager.\n"
 
-#: ../clients/cli/general.c:234
+#: ../clients/cli/general.c:233
 msgid "asleep"
 msgstr "спящий"
 
-#: ../clients/cli/general.c:236
+#: ../clients/cli/general.c:235
 msgid "connecting"
 msgstr "подключение"
 
-#: ../clients/cli/general.c:238
+#: ../clients/cli/general.c:237
 msgid "connected (local only)"
 msgstr "подключен (локально)"
 
-#: ../clients/cli/general.c:240
+#: ../clients/cli/general.c:239
 msgid "connected (site only)"
 msgstr "подключен (на узле)"
 
-#: ../clients/cli/general.c:244
+#: ../clients/cli/general.c:243
 msgid "disconnecting"
 msgstr "отключение"
 
-#: ../clients/cli/general.c:280
+#: ../clients/cli/general.c:279
 msgid "portal"
 msgstr "портал"
 
-#: ../clients/cli/general.c:282
+#: ../clients/cli/general.c:281
 msgid "limited"
 msgstr "ограничено"
 
-#: ../clients/cli/general.c:284
+#: ../clients/cli/general.c:283
 msgid "full"
 msgstr "полностью"
 
-#: ../clients/cli/general.c:335
+#: ../clients/cli/general.c:334
 #, c-format
 msgid "Error: only these fields are allowed: %s"
 msgstr "Ошибка. Допустимые поля: %s"
 
-#: ../clients/cli/general.c:358
+#: ../clients/cli/general.c:360
 msgid "NetworkManager status"
 msgstr "Состояние NetworkManager"
 
-#: ../clients/cli/general.c:363
+#: ../clients/cli/general.c:365
 msgid "running"
 msgstr "выполняется"
 
-#: ../clients/cli/general.c:366
+#: ../clients/cli/general.c:368
 msgid "starting"
 msgstr "запускается"
 
-#: ../clients/cli/general.c:366
+#: ../clients/cli/general.c:368
 msgid "started"
 msgstr "запущено"
 
-#: ../clients/cli/general.c:368 ../clients/cli/general.c:369
 #: ../clients/cli/general.c:370 ../clients/cli/general.c:371
-#: ../clients/cli/general.c:372
+#: ../clients/cli/general.c:372 ../clients/cli/general.c:373
+#: ../clients/cli/general.c:374
 msgid "enabled"
 msgstr "включен"
 
-#: ../clients/cli/general.c:368 ../clients/cli/general.c:369
 #: ../clients/cli/general.c:370 ../clients/cli/general.c:371
-#: ../clients/cli/general.c:372
+#: ../clients/cli/general.c:372 ../clients/cli/general.c:373
+#: ../clients/cli/general.c:374
 msgid "disabled"
 msgstr "отключен"
 
-#: ../clients/cli/general.c:435
+#: ../clients/cli/general.c:446
 msgid "auth"
 msgstr "подлинный"
 
-#: ../clients/cli/general.c:464
+#: ../clients/cli/general.c:475
 #, c-format
 msgid "Error: 'general permissions': %s"
 msgstr "Ошибка общих разрешений: %s"
 
-#: ../clients/cli/general.c:478
+#: ../clients/cli/general.c:489
 msgid "NetworkManager permissions"
 msgstr "Разрешения NetworkManager"
 
-#: ../clients/cli/general.c:519
+#: ../clients/cli/general.c:530
 #, c-format
 msgid "Error: 'general logging': %s"
 msgstr "Ошибка «general logging»: %s"
 
-#: ../clients/cli/general.c:534
+#: ../clients/cli/general.c:545
 msgid "NetworkManager logging"
 msgstr "Ведение журналов NetworkManager"
 
-#: ../clients/cli/general.c:556
-#, fuzzy, c-format
+#: ../clients/cli/general.c:567
+#, c-format
 msgid "Error: failed to set hostname: %s"
-msgstr "Ошибка. Не удалось установить имя узла: (%d) %s"
+msgstr "Ошибка: не удалось установить имя узла: %s"
 
-#: ../clients/cli/general.c:669
-#, fuzzy, c-format
+#: ../clients/cli/general.c:680
+#, c-format
 msgid "Error: failed to set logging: %s"
-msgstr "Ошибка. Отказ доступа при настройке журналирования, %s"
+msgstr "Ошибка: не удалось настроить параметры ведения журнала: %s"
 
-#: ../clients/cli/general.c:678
+#: ../clients/cli/general.c:689
 #, c-format
 msgid "Error: 'general' command '%s' is not valid."
 msgstr "Ошибка. Недопустимая команда «general»: «%s»."
 
-#: ../clients/cli/general.c:696
+#: ../clients/cli/general.c:707
 #, c-format
 msgid "Error: '--fields' value '%s' is not valid here (allowed field: %s)"
 msgstr "Недопустимое поле «--fields»: «%s». Допускается: %s"
 
-#: ../clients/cli/general.c:721
+#: ../clients/cli/general.c:732
 #, c-format
 msgid "Error: invalid '%s' argument: '%s' (use on/off)."
-msgstr "Недопустимый аргумент «%s»: «%s». Может принимать значения on или off."
+msgstr ""
+"Недопустимый аргумент «%s»: «%s». Может принимать значения on или off."
 
-#: ../clients/cli/general.c:732
+#: ../clients/cli/general.c:743
 msgid "Connectivity"
 msgstr "Соединение"
 
-#: ../clients/cli/general.c:747
+#: ../clients/cli/general.c:758
 msgid "Networking"
 msgstr "Сеть"
 
-#: ../clients/cli/general.c:772
+#: ../clients/cli/general.c:783
 #, c-format
 msgid "Error: 'networking connectivity' command '%s' is not valid."
 msgstr "Ошибка. Недопустимая команда «networking connectivity»: «%s»."
 
-#: ../clients/cli/general.c:788
+#: ../clients/cli/general.c:799
 #, c-format
 msgid "Error: 'networking' command '%s' is not valid."
 msgstr "Ошибка. Недопустимая команда «networking»: «%s»."
 
-#: ../clients/cli/general.c:817 ../clients/cli/general.c:837
+#: ../clients/cli/general.c:828 ../clients/cli/general.c:848
 msgid "Radio switches"
 msgstr "Переключатели"
 
 #. no argument, show current WiFi state
-#: ../clients/cli/general.c:855
+#: ../clients/cli/general.c:866
 msgid "Wi-Fi radio switch"
 msgstr "Переключатель Wi-Fi"
 
 #. no argument, show current WWAN (mobile broadband) state
-#: ../clients/cli/general.c:871
+#: ../clients/cli/general.c:882
 msgid "WWAN radio switch"
 msgstr "Переключатель WWAN"
 
-#: ../clients/cli/general.c:882
+#: ../clients/cli/general.c:893
 #, c-format
 msgid "Error: 'radio' command '%s' is not valid."
 msgstr "Ошибка. Недопустимая команда «radio»: «%s»."
 
-#: ../clients/cli/general.c:902
-#, fuzzy
+#: ../clients/cli/general.c:914
 msgid "NetworkManager has started"
-msgstr "Состояние NetworkManager"
+msgstr "NetworkManager запущен"
 
-#: ../clients/cli/general.c:902
-#, fuzzy
+#: ../clients/cli/general.c:917
 msgid "NetworkManager has stopped"
-msgstr "Состояние NetworkManager"
+msgstr "NetworkManager остановлен"
 
-#: ../clients/cli/general.c:913
-#, fuzzy, c-format
+#: ../clients/cli/general.c:931
+#, c-format
 msgid "Hostname set to '%s'\n"
-msgstr "Изменить имя узла на «%s»"
+msgstr "Установлено имя узла «%s»\n"
 
-#: ../clients/cli/general.c:928
-#, fuzzy, c-format
+#: ../clients/cli/general.c:946
+#, c-format
 msgid "'%s' is now the primary connection\n"
-msgstr "Ошибка. Недопустимый тип соединения: «%s»"
+msgstr "«%s» не является основным подключением.\n"
 
-#: ../clients/cli/general.c:930
-#, fuzzy, c-format
+#: ../clients/cli/general.c:948
+#, c-format
 msgid "There's no primary connection\n"
-msgstr "Агрегированное (Team) соединение"
+msgstr "Нет основного соединения\n"
 
-#: ../clients/cli/general.c:942
-#, fuzzy, c-format
+#: ../clients/cli/general.c:960
+#, c-format
 msgid "Connectivity is now '%s'\n"
-msgstr "Соединение"
+msgstr "Уровень соединения: «%s»\n"
 
-#: ../clients/cli/general.c:955
-#, fuzzy, c-format
+#: ../clients/cli/general.c:973
+#, c-format
 msgid "Networkmanager is now in the '%s' state\n"
-msgstr "NetworkManager не работает."
+msgstr "NetworkManager находится в состоянии «%s»\n"
 
-#: ../clients/cli/general.c:966
-#, fuzzy, c-format
+#: ../clients/cli/general.c:984
+#, c-format
 msgid "Error: 'monitor' command '%s' is not valid."
-msgstr "Ошибка. Недопустимая команда «general»: «%s»."
+msgstr "Ошибка: неверная команда «monitor»: «%s»."
 
-#: ../clients/cli/general.c:980
-#, fuzzy
+#: ../clients/cli/general.c:998
 msgid "Networkmanager is not running (waiting for it)\n"
-msgstr "NetworkManager не работает."
+msgstr "NetworkManager не работает (ожидание запуска)\n"
 
 #: ../clients/cli/nmcli.c:83
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "Usage: %s [OPTIONS] OBJECT { COMMAND | help }\n"
 "\n"
@@ -5007,11 +5535,12 @@ msgid ""
 "  -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"
+"  -c[olors] auto|yes|no                      whether to use colors in output\n"
 "  -f[ields] <field1,field2,...>|all|common   specify fields to output\n"
 "  -e[scape] yes|no                           escape columns separators in "
 "values\n"
+"  -n[ocheck]                                 don't check nmcli and "
+"NetworkManager versions\n"
 "  -a[sk]                                     ask for missing parameters\n"
 "  -s[how-secrets]                            allow displaying passwords\n"
 "  -w[ait] <seconds>                          set timeout waiting for "
@@ -5038,8 +5567,11 @@ msgstr ""
 "  -f[ields] <поле1,поле2,...>|all|common   поля вывода\n"
 "  -e[scape] yes|no                           использовать значения "
 "разделителей столбцов \n"
+"  -n[ocheck]                                 не проверять версии nmcli и "
+"NetworkManager\n"
 "  -a[sk]                                     запрашивать ввод недостающих "
 "параметров\n"
+"  -s[how-secrets]                            разрешить вывод паролей\n"
 "  -w[ait] <секунды>                          время ожидания завершения "
 "операции\n"
 "  -v[ersion]                                 показать версию \n"
@@ -5051,359 +5583,356 @@ msgstr ""
 "  r[adio]         переключатели NetworkManager\n"
 "  c[onnection]    соединения NetworkManager\n"
 "  d[evice]        устройства под управлением NetworkManager\n"
+"  a[gent]         агент паролей NetworkManager или агент polkit\n"
+"  m[onitor]       мониторинг изменений NetworkManager\n"
 "\n"
 
-#: ../clients/cli/nmcli.c:142
+#: ../clients/cli/nmcli.c:143
 #, c-format
 msgid "Error: Object '%s' is unknown, try 'nmcli help'."
 msgstr "Неизвестный объект «%s». Попробуйте выполнить «nmcli help»."
 
-#: ../clients/cli/nmcli.c:183
+#: ../clients/cli/nmcli.c:173
 #, c-format
 msgid "Error: Option '--terse' is specified the second time."
 msgstr "Ошибка. Параметр «--terse» указан дважды."
 
-#: ../clients/cli/nmcli.c:188
+#: ../clients/cli/nmcli.c:178
 #, c-format
 msgid "Error: Option '--terse' is mutually exclusive with '--pretty'."
 msgstr "Ошибка: параметры «--terse» и «--pretty» взаимоисключаемы."
 
-#: ../clients/cli/nmcli.c:196
+#: ../clients/cli/nmcli.c:186
 #, c-format
 msgid "Error: Option '--pretty' is specified the second time."
 msgstr "Ошибка: параметр «--pretty» указан дважды."
 
-#: ../clients/cli/nmcli.c:201
+#: ../clients/cli/nmcli.c:191
 #, c-format
 msgid "Error: Option '--pretty' is mutually exclusive with '--terse'."
 msgstr "Ошибка: параметры «--pretty» и «--terse» взаимоисключаемы."
 
-#: ../clients/cli/nmcli.c:211 ../clients/cli/nmcli.c:227
-#: ../clients/cli/nmcli.c:245 ../clients/cli/nmcli.c:276
+#: ../clients/cli/nmcli.c:201 ../clients/cli/nmcli.c:217
+#: ../clients/cli/nmcli.c:235 ../clients/cli/nmcli.c:266
 #, c-format
 msgid "Error: missing argument for '%s' option."
 msgstr "Ошибка: отсутствует аргумент параметра «%s»."
 
-#: ../clients/cli/nmcli.c:220 ../clients/cli/nmcli.c:238
-#: ../clients/cli/nmcli.c:254
+#: ../clients/cli/nmcli.c:210 ../clients/cli/nmcli.c:228
+#: ../clients/cli/nmcli.c:244
 #, c-format
 msgid "Error: '%s' is not valid argument for '%s' option."
 msgstr "Ошибка: недопустимый аргумент «%s» для параметра «%s»."
 
-#: ../clients/cli/nmcli.c:261
+#: ../clients/cli/nmcli.c:251
 #, c-format
 msgid "Error: fields for '%s' options are missing."
 msgstr "Ошибка: отсутствуют поля для параметров «%s»."
 
-#: ../clients/cli/nmcli.c:281
+#: ../clients/cli/nmcli.c:271
 #, c-format
 msgid "Error: '%s' is not a valid timeout for '%s' option."
 msgstr "Ошибка. Недопустимое время ожидания («%s») для параметра «%s»."
 
-#: ../clients/cli/nmcli.c:288
+#: ../clients/cli/nmcli.c:278
 #, c-format
 msgid "nmcli tool, version %s\n"
 msgstr "утилита nmcli, версия %s\n"
 
-#: ../clients/cli/nmcli.c:294
+#: ../clients/cli/nmcli.c:284
 #, c-format
 msgid "Error: Option '%s' is unknown, try 'nmcli -help'."
-msgstr "Ошибка: неизвестный параметр «%s». Попробуйте выполнить «nmcli -help»."
+msgstr ""
+"Ошибка: неизвестный параметр «%s». Попробуйте выполнить «nmcli -help»."
 
-#: ../clients/cli/nmcli.c:377 ../clients/cli/nmcli.c:387
-#, fuzzy, c-format
-msgid ""
-"\n"
+#: ../clients/cli/nmcli.c:367 ../clients/cli/nmcli.c:377
+#, c-format
+msgid "\n"
 "Error: nmcli terminated by signal %s (%d)\n"
-msgstr ""
-"\n"
-"Ошибка. Работа nmcli прервана по сигналу %d."
+msgstr "\n"
+"Ошибка: работа nmcli прервана по сигналу %s (%d).\n"
 
-#: ../clients/cli/nmcli.c:418
-#, fuzzy, c-format
+#: ../clients/cli/nmcli.c:408
+#, c-format
 msgid "Failed to set signal mask: %d\n"
-msgstr "Ошибка установки маски сигнала: %d"
+msgstr "Не удалось настроить маску сигнала: %d\n"
 
-#: ../clients/cli/nmcli.c:425
-#, fuzzy, c-format
+#: ../clients/cli/nmcli.c:415
+#, c-format
 msgid "Failed to create signal handling thread: %d\n"
-msgstr "Ошибка создания потока обработки сигнала: %d"
+msgstr "Ошибка создания потока обработки сигнала: %d\n"
 
-#: ../clients/cli/nmcli.c:522 ../clients/nm-online.c:193
-#, fuzzy, c-format
+#: ../clients/cli/nmcli.c:512 ../clients/nm-online.c:193
+#, c-format
 msgid "Error: Could not create NMClient object: %s."
-msgstr "Ошибка: невозможно создать объект NMClient."
+msgstr "Ошибка: не удалось создать объект NMClient: %s."
 
-#: ../clients/cli/nmcli.c:539
+#: ../clients/cli/nmcli.c:529
 msgid "Success"
 msgstr "Успешно"
 
 #: ../clients/cli/polkit-agent.c:66
-#, fuzzy, c-format
+#, c-format
 msgid "Authentication message: %s\n"
-msgstr "Аутентификация"
+msgstr "Сообщение аутентификации: %s\n"
 
 #: ../clients/cli/polkit-agent.c:72
-#, fuzzy, c-format
+#, c-format
 msgid "Authentication error: %s\n"
-msgstr "Аутентификация"
+msgstr "Ошибка аутентификации: %s\n"
 
 #: ../clients/cli/polkit-agent.c:118
-#, fuzzy, c-format
+#, c-format
 msgid "Warning: polkit agent initialization failed: %s\n"
-msgstr "Не удалось инициализировать модем"
+msgstr "Предупреждение: не удалось инициализировать агент polkit: %s\n"
 
-#: ../clients/cli/settings.c:796
-#, fuzzy, c-format
+#: ../clients/cli/settings.c:790
+#, c-format
 msgid "%d (key)"
-msgstr "%d (16-теричный ASCII-ключ)"
+msgstr "%d (ключ)"
 
-#: ../clients/cli/settings.c:798
-#, fuzzy, c-format
+#: ../clients/cli/settings.c:792
+#, c-format
 msgid "%d (passphrase)"
-msgstr "%d (104/128-битная парольная фраза)"
+msgstr "%d (парольная фраза)"
 
-#: ../clients/cli/settings.c:801 ../clients/cli/settings.c:887
+#: ../clients/cli/settings.c:795 ../clients/cli/settings.c:881
 #, c-format
 msgid "%d (unknown)"
 msgstr "%d (неизвестно)"
 
-#: ../clients/cli/settings.c:830
+#: ../clients/cli/settings.c:824
 msgid "0 (NONE)"
 msgstr "0 (НЕТ)"
 
-#: ../clients/cli/settings.c:836
+#: ../clients/cli/settings.c:830
 msgid "REORDER_HEADERS, "
 msgstr "УПОРЯДОЧИТЬ_ЗАГОЛОВКИ,"
 
-#: ../clients/cli/settings.c:838
+#: ../clients/cli/settings.c:832
 msgid "GVRP, "
 msgstr "GVRP, "
 
-#: ../clients/cli/settings.c:840
+#: ../clients/cli/settings.c:834
 msgid "LOOSE_BINDING, "
 msgstr "LOOSE_BINDING, "
 
-#: ../clients/cli/settings.c:842
+#: ../clients/cli/settings.c:836
 msgid "MVRP, "
 msgstr "MVRP, "
 
-#: ../clients/cli/settings.c:881
+#: ../clients/cli/settings.c:875
 #, c-format
 msgid "%d (disabled)"
 msgstr "%d (отключено)"
 
-#: ../clients/cli/settings.c:883
+#: ../clients/cli/settings.c:877
 #, c-format
 msgid "%d (enabled, prefer public IP)"
 msgstr "%d (включено, предпочитая открытый IP)"
 
-#: ../clients/cli/settings.c:885
+#: ../clients/cli/settings.c:879
 #, c-format
 msgid "%d (enabled, prefer temporary IP)"
 msgstr "%d (включено, предпочитая временный IP)"
 
-#: ../clients/cli/settings.c:900
-#, fuzzy, c-format
+#: ../clients/cli/settings.c:894
+#, c-format
 msgid "%d (no)"
-msgstr "%d (неизвестно)"
+msgstr "%d (нет)"
 
-#: ../clients/cli/settings.c:902
-#, fuzzy, c-format
+#: ../clients/cli/settings.c:896
+#, c-format
 msgid "%d (yes)"
-msgstr "%d (16-теричный ASCII-ключ)"
+msgstr "%d (да)"
 
-#: ../clients/cli/settings.c:905 ../clients/cli/settings.c:1605
-#, fuzzy, c-format
+#: ../clients/cli/settings.c:899 ../clients/cli/settings.c:1554
+#, c-format
 msgid "%d (default)"
-msgstr "(по умолчанию)"
+msgstr "%d (по умолчанию)"
 
-#: ../clients/cli/settings.c:918
+#: ../clients/cli/settings.c:912
 msgid "0 (none)"
 msgstr "0 (нет)"
 
-#: ../clients/cli/settings.c:924
+#: ../clients/cli/settings.c:918
 msgid "agent-owned, "
 msgstr "под управлением агента,"
 
-#: ../clients/cli/settings.c:926
+#: ../clients/cli/settings.c:920
 msgid "not saved, "
 msgstr "не сохранено,"
 
-#: ../clients/cli/settings.c:928
+#: ../clients/cli/settings.c:922
 msgid "not required, "
 msgstr "не требуется,"
 
-#: ../clients/cli/settings.c:977 ../clients/tui/nmt-mtu-entry.c:84
+#: ../clients/cli/settings.c:971 ../clients/tui/nmt-mtu-entry.c:84
 msgid "(default)"
 msgstr "(по умолчанию)"
 
-#. ----------------------------------------------------------------------------
-#: ../clients/cli/settings.c:1063 ../clients/cli/settings.c:1106
-#: ../clients/cli/settings.c:1140 ../clients/cli/settings.c:1167
-#: ../clients/cli/settings.c:8033
-msgid "<hidden>"
-msgstr ""
-
-#: ../clients/cli/settings.c:1302
+#: ../clients/cli/settings.c:1252
 msgid "0 (disabled)"
 msgstr "0 (отключено)"
 
-#: ../clients/cli/settings.c:1308
+#: ../clients/cli/settings.c:1258
 msgid "enabled, "
 msgstr "включено,"
 
-#: ../clients/cli/settings.c:1310
+#: ../clients/cli/settings.c:1260
 msgid "advertise, "
 msgstr "объявление,"
 
-#: ../clients/cli/settings.c:1312
+#: ../clients/cli/settings.c:1262
 msgid "willing, "
 msgstr "разрешение,"
 
-#: ../clients/cli/settings.c:1340
+#: ../clients/cli/settings.c:1290
 msgid "-1 (unset)"
 msgstr "-1 (не задано)"
 
-#: ../clients/cli/settings.c:1472 ../clients/cli/settings.c:1777
-#: ../clients/cli/settings.c:1917
+#: ../clients/cli/settings.c:1422 ../clients/cli/settings.c:1724
+#: ../clients/cli/settings.c:1864
 msgid "auto"
 msgstr "автоматически"
 
-#: ../clients/cli/settings.c:1485 ../clients/cli/settings.c:1948
+#: ../clients/cli/settings.c:1435 ../clients/cli/settings.c:1895
 msgid "default"
 msgstr "по умолчанию"
 
-#: ../clients/cli/settings.c:1607
-#, fuzzy, c-format
+#: ../clients/cli/settings.c:1556
+#, c-format
 msgid "%d (off)"
-msgstr "%d (неизвестно)"
+msgstr "%d (выключено)"
 
-#: ../clients/cli/settings.c:1823
+#: ../clients/cli/settings.c:1770
 #, c-format
 msgid ""
 "invalid option '%s', use a combination of [%s] or 'ignore', 'default' or "
 "'none'"
 msgstr ""
+"неверный параметр «%s»; используйте комбинацию  [%s] или «ignore», «default» "
+"или «none»"
 
-#: ../clients/cli/settings.c:1834
+#: ../clients/cli/settings.c:1781
 msgid "'default' and 'ignore' are incompatible with other flags"
-msgstr ""
+msgstr "«default» и «ignore» несовместимы с другими флагами"
 
-#: ../clients/cli/settings.c:1870
-#, fuzzy, c-format
+#: ../clients/cli/settings.c:1817
+#, c-format
 msgid "invalid mode '%s', use one of %s"
-msgstr "неверное поле «%s»; допустимые поля: %s"
+msgstr "неверный режим «%s»; допустимые значения: %s"
 
-#: ../clients/cli/settings.c:1952
+#: ../clients/cli/settings.c:1899
 #, c-format
 msgid "always"
 msgstr "всегда"
 
-#: ../clients/cli/settings.c:2052 ../clients/cli/settings.c:3398
-#: ../clients/cli/settings.c:4590 ../clients/cli/settings.c:5093
+#: ../clients/cli/settings.c:1999 ../clients/cli/settings.c:3286
+#: ../clients/cli/settings.c:4478 ../clients/cli/settings.c:4981
 #: ../libnm-core/nm-keyfile-reader.c:573
-#, fuzzy, c-format
+#, c-format
 msgid "invalid option '%s', use one of [%s]"
-msgstr "недопустимый параметр «%s» или его значение «%s»"
+msgstr "недопустимый параметр «%s»; допустимые значения: [%s]"
 
-#: ../clients/cli/settings.c:2162
+#: ../clients/cli/settings.c:2116
 #, c-format
 msgid "Do you also want to set '%s' to '%s'? [yes]: "
 msgstr "Присвоить «%s» значение «%s»? [да]:"
 
-#: ../clients/cli/settings.c:2164
+#: ../clients/cli/settings.c:2118
 #, c-format
 msgid "Do you also want to clear '%s'? [yes]: "
 msgstr "Очистить «%s»? [да]:"
 
-#: ../clients/cli/settings.c:2325
+#: ../clients/cli/settings.c:2279
 #, c-format
 msgid ""
 "Warning: %s.%s set to '%s', but it might be ignored in infrastructure mode\n"
 msgstr ""
+"Предупреждение: %s.%s имеет значение «%s», но будет игнорироваться в режиме "
+"инфраструктуры\n"
 
-#: ../clients/cli/settings.c:2344
+#: ../clients/cli/settings.c:2298
 #, c-format
 msgid "Warning: setting %s.%s requires removing ipv4 and ipv6 settings\n"
-msgstr ""
+msgstr "Предупреждение: %s.%s требует удаления параметров ipv4 и ipv6\n"
 
-#: ../clients/cli/settings.c:2346
-#, fuzzy
+#: ../clients/cli/settings.c:2300
 msgid "Do you want to remove them? [yes] "
-msgstr "Хотите их определить? (Да или нет)"
+msgstr "Хотите их удалить? [да]"
 
-#: ../clients/cli/settings.c:2482 ../clients/cli/settings.c:2877
-#: ../clients/cli/settings.c:5294
+#: ../clients/cli/settings.c:2396 ../clients/cli/settings.c:2791
+#: ../clients/cli/settings.c:5182
 #, c-format
 msgid "'%s' is not valid"
 msgstr "Недопустимое значение «%s»"
 
-#: ../clients/cli/settings.c:2505
+#: ../clients/cli/settings.c:2419
 #, c-format
 msgid "'%d' is not valid; use <%d-%d>"
 msgstr "«%d» выходит за пределы диапазона <%d-%d>"
 
-#: ../clients/cli/settings.c:2527
-#, fuzzy, c-format
+#: ../clients/cli/settings.c:2441
+#, c-format
 msgid "'%lld' is not valid; use <%lld-%lld>"
-msgstr "«%d» выходит за пределы диапазона  <%d-%d>"
+msgstr "Недопустимое значение «%lld». Используйте <%lld-%lld>"
 
-#: ../clients/cli/settings.c:2549
-#, fuzzy, c-format
+#: ../clients/cli/settings.c:2463
+#, c-format
 msgid "'%u' is not valid; use <%u-%u>"
-msgstr "«%u» выходит за пределы  <%d-%d>"
+msgstr "«%u» выходит за пределы <%u-%u>"
 
-#: ../clients/cli/settings.c:2588
-#, fuzzy, c-format
+#: ../clients/cli/settings.c:2502
+#, c-format
 msgid "'%u' flags are not valid; use combination of %s"
-msgstr "Недопустимое значение «%s». Ожидается [%s] или  [%s]"
+msgstr "Неверные флаги «%u». Используйте комбинацию %s"
 
-#: ../clients/cli/settings.c:2655
+#: ../clients/cli/settings.c:2569
 #, c-format
 msgid "'%s' is not valid; use <option>=<value>"
 msgstr "Недопустимое значение «%s». Используйте формат: <параметр>=<значение>"
 
-#: ../clients/cli/settings.c:2689
+#: ../clients/cli/settings.c:2603
 #, c-format
 msgid "index '%s' is not valid"
 msgstr "Недопустимый индекс «%s»."
 
-#: ../clients/cli/settings.c:2694 ../clients/cli/settings.c:2719
+#: ../clients/cli/settings.c:2608 ../clients/cli/settings.c:2633
 msgid "no item to remove"
 msgstr "нечего удалять"
 
-#: ../clients/cli/settings.c:2698 ../clients/cli/settings.c:2723
+#: ../clients/cli/settings.c:2612 ../clients/cli/settings.c:2637
 #, c-format
 msgid "index '%d' is not in range <0-%d>"
 msgstr "Индекс «%d» выходит за пределы диапазона <0-%d>"
 
-#: ../clients/cli/settings.c:2738
+#: ../clients/cli/settings.c:2652
 #, c-format
 msgid "invalid option '%s'"
 msgstr "Недопустимый параметр «%s»"
 
-#: ../clients/cli/settings.c:2740
+#: ../clients/cli/settings.c:2654
 msgid "missing option"
 msgstr "пропущен параметр"
 
-#: ../clients/cli/settings.c:2767 ../clients/cli/settings.c:2787
-#: ../clients/cli/settings.c:2807 ../clients/cli/settings.c:2827
+#: ../clients/cli/settings.c:2681 ../clients/cli/settings.c:2701
+#: ../clients/cli/settings.c:2721 ../clients/cli/settings.c:2741
 #, c-format
 msgid "'%s' is not a valid number (or out of range)"
 msgstr "Число выходит за пределы диапазона или определено неверно: «%s»"
 
-#: ../clients/cli/settings.c:2861
-#, fuzzy, c-format
+#: ../clients/cli/settings.c:2775
+#, c-format
 msgid "'%s' is not a valid value; use -1, 0 or 1"
-msgstr "Недопустимое значение «%s». Используйте 0, 1 или 2."
+msgstr "Недопустимое значение «%s». Используйте -1, 0 или 1."
 
-#: ../clients/cli/settings.c:2893
+#: ../clients/cli/settings.c:2807
 #, c-format
 msgid "'%s' is not a valid Ethernet MAC"
 msgstr "Недействительный MAC Ethernet: «%s»"
 
-#: ../clients/cli/settings.c:2918 ../libnm-core/nm-setting-connection.c:864
+#: ../clients/cli/settings.c:2832 ../libnm-core/nm-setting-connection.c:864
 #: ../libnm-core/nm-setting-infiniband.c:255
 #: ../libnm-util/nm-setting-connection.c:834
 #: ../libnm-util/nm-setting-infiniband.c:269
@@ -5411,53 +5940,42 @@ msgstr "Недействительный MAC Ethernet: «%s»"
 msgid "'%s' is not a valid interface name"
 msgstr "Недействительное имя интерфейса: «%s»"
 
-#: ../clients/cli/settings.c:2942
-#, fuzzy, c-format
+#: ../clients/cli/settings.c:2856
+#, c-format
 msgid "'%s' is not a valid flag number; use <0-%d>"
-msgstr "Недопустимое значение  «%s». Используйте значения от 1 до 13."
+msgstr "Неверный номер флага «%s». Используйте <0-%d>"
 
-#: ../clients/cli/settings.c:2954
+#: ../clients/cli/settings.c:2868
 #, c-format
 msgid "Warning: '%s' sum is higher than all flags => all flags set\n"
 msgstr ""
+"Предупреждение: сумма «%s» превышает значения всех флагов  => установлены "
+"все флаги\n"
 
-#: ../clients/cli/settings.c:2995
+#: ../clients/cli/settings.c:2909
 #, c-format
 msgid "'%s' is not a valid hex character"
 msgstr "Неверное шестнадцатеричное значение: «%s»"
 
-#: ../clients/cli/settings.c:3025
+#: ../clients/cli/settings.c:2939
 #, c-format
 msgid "'%s' is not a valid MAC"
 msgstr "Недействительный MAC-адрес: «%s»"
 
-#. Don't allow setting type unless the connection is brand new.
-#. * Just because it's a bad idea and the user wouldn't probably want that.
-#. * No technical reason, really.
-#. * Also, using uuid to see if the connection is brand new is a bit
-#. * 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/cli/settings.c:3053
-#, fuzzy, c-format
-msgid "Can not change the connection type"
-msgstr "Выберите тип соединения:"
-
-#: ../clients/cli/settings.c:3077 ../libnm-core/nm-setting-connection.c:853
+#: ../clients/cli/settings.c:2965 ../libnm-core/nm-setting-connection.c:853
 #: ../libnm-util/nm-setting-connection.c:791
 #, c-format
 msgid "'%s' is not a valid UUID"
 msgstr "Недействительный UUID: «%s»"
 
-#: ../clients/cli/settings.c:3144
+#: ../clients/cli/settings.c:3032
 #, c-format
 msgid "the property doesn't contain permission '%s'"
-msgstr ""
+msgstr "свойство не содержит разрешение «%s»"
 
-#: ../clients/cli/settings.c:3156
+#: ../clients/cli/settings.c:3044
 msgid ""
-"Enter a list of user permissions. This is a list of user names formatted "
-"as:\n"
+"Enter a list of user permissions. This is a list of user names formatted as:\n"
 "  [user:]<user name 1>, [user:]<user name 2>,...\n"
 "The items can be separated by commas or spaces.\n"
 "\n"
@@ -5469,42 +5987,41 @@ msgstr ""
 "\n"
 "Пример: alice bob charlie\n"
 
-#: ../clients/cli/settings.c:3175
+#: ../clients/cli/settings.c:3063
 #, c-format
 msgid "'%s' is not valid master; use ifname or connection UUID"
 msgstr ""
 "Недействительный мастер: «%s». Используйте имя интерфейса или UUID "
 "соединения."
 
-#: ../clients/cli/settings.c:3219
+#: ../clients/cli/settings.c:3107
 #, c-format
 msgid "Warning: %s is not an UUID of any existing connection profile\n"
-msgstr ""
+msgstr "Предупреждение: %s не содержит UUID существующего профиля соединения\n"
 
-#: ../clients/cli/settings.c:3223 ../clients/cli/settings.c:3239
-#, fuzzy, c-format
+#: ../clients/cli/settings.c:3111 ../clients/cli/settings.c:3127
+#, c-format
 msgid "'%s' is not a VPN connection profile"
-msgstr "Ошибка. Недопустимый тип соединения: «%s»"
+msgstr "«%s» не является профилем соединения VPN"
 
-#: ../clients/cli/settings.c:3232
-#, fuzzy, c-format
+#: ../clients/cli/settings.c:3120
+#, c-format
 msgid "'%s' is not a name of any exiting profile"
-msgstr "Недопустимое имя файла или неверная конфигурация группы: «%s»"
+msgstr "«%s» не содержит имя существующего профиля"
 
-#: ../clients/cli/settings.c:3266
-#, fuzzy, c-format
+#: ../clients/cli/settings.c:3154
+#, c-format
 msgid "the value '%s' is not a valid UUID"
-msgstr "Недействительный UUID:  «%s»"
+msgstr "«%s» не содержит действительный UUID"
 
-#: ../clients/cli/settings.c:3273
+#: ../clients/cli/settings.c:3161
 #, c-format
 msgid "the property doesn't contain UUID '%s'"
-msgstr ""
+msgstr "свойство не содержит UUID «%s»"
 
-#: ../clients/cli/settings.c:3285
+#: ../clients/cli/settings.c:3173
 msgid ""
-"Enter secondary connections that should be activated when this connection "
-"is\n"
+"Enter secondary connections that should be activated when this connection is\n"
 "activated. Connections can be specified either by UUID or ID (name). nmcli\n"
 "transparently translates names to UUIDs. Note that NetworkManager only "
 "supports\n"
@@ -5513,8 +6030,17 @@ msgid ""
 "\n"
 "Example: private-openvpn, fe6ba5d8-c2fc-4aae-b2e3-97efddd8d9a7\n"
 msgstr ""
+"Укажите вторичные соединения, которые должны быть активированы при активации "
+"этого соединения.\n"
+"Соединение можно указать с помощью UUID или идентификатора (названия).\n"
+"nmcli осуществляет прозрачное преобразование названий в UUID. \n"
+"В настоящее время NetworkManager может использовать только соединения VPN\n"
+"в качестве вторичных соединений. Для перечисления записей используйте "
+"запятые или пробелы.\n"
+"\n"
+"Пример: private-openvpn, fe6ba5d8-c2fc-4aae-b2e3-97efddd8d9a7\n"
 
-#: ../clients/cli/settings.c:3352
+#: ../clients/cli/settings.c:3240
 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"
@@ -5522,38 +6048,56 @@ msgid ""
 "'false','no','off' to set the connection as not metered\n"
 "'unknown' to let NetworkManager choose a value using some heuristics\n"
 msgstr ""
+"Введите значение, которое будет диктовать, должно ли соединение подвергаться\n"
+"квотированию данных, лимитированию стоимости или другим ограничениям.\n"
+"Доступные параметры:\n"
+"«true», «yes», «on» — включить лимитное подключение\n"
+"«false», «no», «off» — подключить как безлимитное\n"
+"«unknown» — позволить NetworkManager выбирать значение с помощью "
+"эвристических методов\n"
 
-#: ../clients/cli/settings.c:3476
+#: ../clients/cli/settings.c:3364
 msgid "private key password not provided"
-msgstr "Не указан пароль частного ключа "
+msgstr "Не указан пароль закрытого ключа "
 
-#: ../clients/cli/settings.c:3504
-#, fuzzy, c-format
+#: ../clients/cli/settings.c:3392
+#, c-format
 msgid "the property doesn't contain EAP method '%s'"
-msgstr "свойство не может быть изменено"
+msgstr "свойство не содержит метод EAP «%s»"
 
-#: ../clients/cli/settings.c:3521
+#: ../clients/cli/settings.c:3409
 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 ""
+"Введите путь к сертификату центра сертификации (с дополнительным префиксом "
+"file://).\n"
+"  [file://]<путь к файлу>\n"
+"Обратите внимание, что nmcli не поддерживает определение сертификата с "
+"помощью простого массива данных.\n"
+"Пример: /home/cimrman/cacert.crt\n"
 
-#: ../clients/cli/settings.c:3540
+#: ../clients/cli/settings.c:3428
 #, c-format
 msgid "the property doesn't contain alternative subject match '%s'"
-msgstr ""
+msgstr "свойство не содержит альтернативное соответствие темы «%s»"
 
-#: ../clients/cli/settings.c:3556
+#: ../clients/cli/settings.c:3444
 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 ""
+"Введите путь к сертификату клиента (с дополнительным префиксом file://).\n"
+"  [file://]<путь к файлу>\n"
+"Обратите внимание, что nmcli не поддерживает определение сертификата с "
+"помощью простого массива данных.\n"
+"Пример: /home/cimrman/jara.crt\n"
 
-#: ../clients/cli/settings.c:3568
+#: ../clients/cli/settings.c:3456
 msgid ""
 "Enter file path to CA certificate for inner authentication (optionally "
 "prefixed\n"
@@ -5562,13 +6106,19 @@ msgid ""
 "Note that nmcli does not support specifying certificates as raw blob data.\n"
 "Example: /home/cimrman/ca-zweite-phase.crt\n"
 msgstr ""
+"Введите путь к сертификату центра сертификации для внутренней аутентификации\n"
+"(с дополнительным префиксом file://).\n"
+"  [file://]<путь к файлу>\n"
+"Обратите внимание, что nmcli не поддерживает определение сертификата с "
+"помощью простого массива данных.\n"
+"Пример:  /home/cimrman/ca-zweite-phase.crt\n"
 
-#: ../clients/cli/settings.c:3588
+#: ../clients/cli/settings.c:3476
 #, c-format
 msgid "the property doesn't contain \"phase2\" alternative subject match '%s'"
-msgstr ""
+msgstr "свойство не содержит альтернативное соответствие темы «%s» для фазы 2"
 
-#: ../clients/cli/settings.c:3604
+#: ../clients/cli/settings.c:3492
 msgid ""
 "Enter file path to client certificate for inner authentication (optionally "
 "prefixed\n"
@@ -5577,25 +6127,31 @@ msgid ""
 "Note that nmcli does not support specifying certificates as raw blob data.\n"
 "Example: /home/cimrman/jara-zweite-phase.crt\n"
 msgstr ""
+"Введите путь к сертификату клиента для внутренней аутентификации\n"
+"(с дополнительным префиксом file://).\n"
+"  [file://]<путь к файлу>\n"
+"Обратите внимание, что nmcli не поддерживает определение сертификата с "
+"помощью простого массива данных.\n"
+"Пример:  /home/cimrman/jara-zweite-phase.crt\n"
 
-#: ../clients/cli/settings.c:3624
-#, fuzzy
+#: ../clients/cli/settings.c:3512
 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 ""
-"Введите адрес закрытого ключа и пароль  (если еще не определен):\n"
-"  <путь> [<пароль>]\n"
+"Введите адрес закрытого ключа и пароль (если еще не определен):\n"
+"  [file://]<путь> [<пароль>]\n"
+"Обратите внимание, что nmcli не поддерживает определение сертификата с "
+"помощью простого массива данных.\n"
 "Пример: /home/cimrman/jara-priv-key Dardanely\n"
 
-#: ../clients/cli/settings.c:3695
+#: ../clients/cli/settings.c:3583
 msgid ""
 "Enter bytes as a list of hexadecimal values.\n"
 "Two formats are accepted:\n"
-"(a) a string of hexadecimal digits, where each two digits represent one "
-"byte\n"
+"(a) a string of hexadecimal digits, where each two digits represent one byte\n"
 "(b) space-separated list of bytes written as hexadecimal digits (with "
 "optional 0x/0X prefix, and optional leading 0).\n"
 "\n"
@@ -5611,7 +6167,7 @@ msgstr ""
 "Примеры: ab0455a6ea3a74C2\n"
 "          ab 4 55 0xa6 ea 3a 74 C2\n"
 
-#: ../clients/cli/settings.c:3816
+#: ../clients/cli/settings.c:3704
 #, c-format
 msgid ""
 "Enter a list of bonding options formatted as:\n"
@@ -5642,60 +6198,58 @@ msgstr ""
 "\n"
 "Пример: mode=2,miimon=120\n"
 
-#: ../clients/cli/settings.c:3847
+#: ../clients/cli/settings.c:3735
 #, c-format
 msgid "'%s' is not a valid InfiniBand MAC"
 msgstr "Недействительный MAC InfiniBand: «%s»"
 
-#: ../clients/cli/settings.c:3884
+#: ../clients/cli/settings.c:3772
 #, c-format
 msgid "'%s' is not a valid IBoIP P_Key"
 msgstr "Недопустимое значение IBoIP P_Key: «%s»"
 
-#: ../clients/cli/settings.c:3915
-#, fuzzy, c-format
+#: ../clients/cli/settings.c:3803
+#, c-format
 msgid "'%s' is not valid (the format is: ip[/prefix] [next-hop] [metric])"
 msgstr ""
-"Недействительное значение  «%s». Допустимый формат:  ip[/префикс] next-hop "
-"[метрика]."
+"Недействительное значение «%s». Допустимый формат:  ip[/префикс] "
+"[следующий_переход] [метрика])"
 
-#: ../clients/cli/settings.c:3963 ../clients/cli/settings.c:3982
+#: ../clients/cli/settings.c:3851 ../clients/cli/settings.c:3870
 #, c-format
 msgid "invalid IPv4 address '%s'"
 msgstr "недопустимый адрес IPv4: «%s»"
 
-#: ../clients/cli/settings.c:3988 ../clients/cli/settings.c:4296
+#: ../clients/cli/settings.c:3876 ../clients/cli/settings.c:4184
 #, c-format
 msgid "the property doesn't contain DNS server '%s'"
-msgstr ""
+msgstr "свойство не содержит DNS-сервер «%s»"
 
-#: ../clients/cli/settings.c:4000
+#: ../clients/cli/settings.c:3888
 msgid ""
 "Enter a list of IPv4 addresses of DNS servers.\n"
 "\n"
 "Example: 8.8.8.8, 8.8.4.4\n"
-msgstr ""
-"Введите список адресов IPv4 серверов DNS.\n"
+msgstr "Введите список адресов IPv4 серверов DNS.\n"
 "\n"
 "Пример: 8.8.8.8, 8.8.4.4\n"
 
-#: ../clients/cli/settings.c:4036 ../clients/cli/settings.c:4350
+#: ../clients/cli/settings.c:3924 ../clients/cli/settings.c:4238
 #, c-format
 msgid "the property doesn't contain DNS search domain '%s'"
-msgstr ""
+msgstr "свойство не содержит домен поиска DNS «%s»"
 
-#: ../clients/cli/settings.c:4074 ../clients/cli/settings.c:4388
-#, fuzzy, c-format
+#: ../clients/cli/settings.c:3962 ../clients/cli/settings.c:4276
+#, c-format
 msgid "the property doesn't contain DNS option '%s'"
-msgstr "свойство не может быть изменено"
+msgstr "свойство не содержит параметра DNS «%s»"
 
-#: ../clients/cli/settings.c:4128 ../clients/cli/settings.c:4441
+#: ../clients/cli/settings.c:4016 ../clients/cli/settings.c:4329
 #, c-format
 msgid "the property doesn't contain IP address '%s'"
-msgstr ""
+msgstr "свойство не содержит IP-адрес «%s»"
 
-#: ../clients/cli/settings.c:4141
-#, fuzzy
+#: ../clients/cli/settings.c:4029
 msgid ""
 "Enter a list of IPv4 addresses formatted as:\n"
 "  ip[/prefix], ip[/prefix],...\n"
@@ -5704,23 +6258,22 @@ msgid ""
 "Example: 192.168.1.5/24, 10.0.0.11/24\n"
 msgstr ""
 "Введите список адресов IPv4 в формате:\n"
-"  ip[/префикс] [шлюз], ip[/префикс] [шлюз],...\n"
-"По умолчанию исполльзуется префикс 32.\n"
+"  ip[/префикс], ip[/префикс],...\n"
+"По умолчанию используется префикс 32.\n"
 "\n"
 "Пример: 92.168.1.5/24 192.168.1.1, 10.0.0.11/24\n"
 
-#: ../clients/cli/settings.c:4157 ../clients/cli/settings.c:4470
-#, fuzzy, c-format
+#: ../clients/cli/settings.c:4045 ../clients/cli/settings.c:4358
+#, c-format
 msgid "invalid gateway address '%s'"
-msgstr "недопустимый шлюз «%s»"
+msgstr "недопустимый адрес шлюза «%s»"
 
-#: ../clients/cli/settings.c:4212 ../clients/cli/settings.c:4525
-#, fuzzy, c-format
+#: ../clients/cli/settings.c:4100 ../clients/cli/settings.c:4413
+#, c-format
 msgid "the property doesn't contain route '%s'"
-msgstr "свойство не может быть изменено"
+msgstr "свойство не содержит маршрут «%s»"
 
-#: ../clients/cli/settings.c:4225
-#, fuzzy
+#: ../clients/cli/settings.c:4113
 msgid ""
 "Enter a list of IPv4 routes formatted as:\n"
 "  ip[/prefix] [next-hop] [metric],...\n"
@@ -5733,18 +6286,22 @@ msgid ""
 "          10.1.2.0/24\n"
 msgstr ""
 "Введите список маршрутов IPv4 в формате:\n"
-"  ip/[префикс] след.переход [метрика],...\n"
+"  ip/[префикс] [след.переход] [метрика],...\n"
+"\n"
 "Если префикс не определен, по умолчанию используется 32.\n"
-"Если метрика не определена, по умолчанию используется 0.\n"
+"Если следующий переход не указан, по умолчанию используется 0.0.0.0.\n"
+"Если метрика не определена, будет использоваться типовая метрика\n"
+"(в соответствии с настройками NetworkManager или ядра)\n"
 "\n"
-"Пример: 192.168.2.0/24 192.168.2.1 3, 10.1.0.0/16 10.0.0.254\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"
 
-#: ../clients/cli/settings.c:4271 ../clients/cli/settings.c:4290
+#: ../clients/cli/settings.c:4159 ../clients/cli/settings.c:4178
 #, c-format
 msgid "invalid IPv6 address '%s'"
 msgstr "недопустимый адрес IPv6: «%s»"
 
-#: ../clients/cli/settings.c:4308
+#: ../clients/cli/settings.c:4196
 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 "
@@ -5763,8 +6320,7 @@ msgstr ""
 "\n"
 "Пример: 2607:f0d0:1002:51::4, 2607:f0d0:1002:51::1\n"
 
-#: ../clients/cli/settings.c:4454
-#, fuzzy
+#: ../clients/cli/settings.c:4342
 msgid ""
 "Enter a list of IPv6 addresses formatted as:\n"
 "  ip[/prefix], ip[/prefix],...\n"
@@ -5773,14 +6329,13 @@ msgid ""
 "Example: 2607:f0d0:1002:51::4/64, 1050:0:0:0:5:600:300c:326b\n"
 msgstr ""
 "Введите список адресов IPv6 в формате:\n"
-"  ip[/префикс] [шлюз], ip[/префикс] [шлюз],...\n"
-"По умолчанию исполльзуется префикс 128.\n"
+"  ip[/префикс], ip[/префикс],...\n"
+"По умолчанию используется префикс 128.\n"
 "\n"
-"Пример: 2607:f0d0:1002:51::4/64 2607:f0d0:1002:51::1, "
-"1050:0:0:0:5:600:300c:326b\n"
+"Пример: 2607:f0d0:1002:51::4/64 2607:f0d0:1002:51::1, 1050:0:0:0:5:600:300c:"
+"326b\n"
 
-#: ../clients/cli/settings.c:4538
-#, fuzzy
+#: ../clients/cli/settings.c:4426
 msgid ""
 "Enter a list of IPv6 routes formatted as:\n"
 "  ip[/prefix] [next-hop] [metric],...\n"
@@ -5794,35 +6349,39 @@ msgid ""
 "          abbe::/64 55\n"
 msgstr ""
 "Введите список маршрутов IPv6 в формате:\n"
-"  ip/[префикс] след.переход [метрика],...\n"
-"Если префикс не определен, по умолчанию используется 128.\n"
-"Если метрика не определена, по умолчанию используется 0.\n"
+"  ip/[префикс] [след.переход] [метрика],...\n"
+"\n"
+"Если префикс не определен, по умолчанию используется 32.\n"
+"Если следующий переход не указан, по умолчанию используется «::».\n"
+"Если метрика не определена, будет использоваться типовая метрика\n"
+"(в соответствии с настройками NetworkManager или ядра)\n"
 "\n"
-"Пример: 2001:db8:beef:2::/64 2001:db8:beef::2, 2001:db8:beef:3::/64 2001:db8:"
-"beef::3 2\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"
 
-#: ../clients/cli/settings.c:4555 ../libnm-core/nm-setting-gsm.c:363
+#: ../clients/cli/settings.c:4443 ../libnm-core/nm-setting-gsm.c:363
 #: ../libnm-util/nm-setting-gsm.c:364
 #, c-format
 msgid "'%s' is not a number"
 msgstr " «%s» не является числом"
 
-#: ../clients/cli/settings.c:4562
+#: ../clients/cli/settings.c:4450
 #, c-format
 msgid "'%s' is not valid; use 0, 1, or 2"
 msgstr "Недопустимое значение «%s». Используйте 0, 1 или 2."
 
-#: ../clients/cli/settings.c:4609
+#: ../clients/cli/settings.c:4497
 #, c-format
 msgid "'%s' is not a valid channel; use <1-13>"
 msgstr "Недопустимое значение «%s». Используйте значения от 1 до 13."
 
-#: ../clients/cli/settings.c:4646
+#: ../clients/cli/settings.c:4534
 #, c-format
 msgid "'%s' is not valid; use [e, o, n]"
 msgstr "Неверное значение «%s». Допустимые значения: [e, o, n]."
 
-#: ../clients/cli/settings.c:4674
+#: ../clients/cli/settings.c:4562
 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 "
@@ -5838,67 +6397,71 @@ msgstr ""
 "\"roundrobin\"}, \"ports\": {\"eth1\": {}, \"eth2\": {}} }\n"
 "          set team.config /etc/my-team.conf\n"
 
-#: ../clients/cli/settings.c:4714
+#: ../clients/cli/settings.c:4602
 msgid "no priority to remove"
 msgstr "нет приоритета для удаления"
 
-#: ../clients/cli/settings.c:4718
+#: ../clients/cli/settings.c:4606
 #, c-format
 msgid "index '%d' is not in the range of <0-%d>"
 msgstr "Индекс «%d» выходит за пределы диапазона <0-%d>"
 
-#: ../clients/cli/settings.c:4757
+#: ../clients/cli/settings.c:4645
 #, c-format
 msgid ""
-"Warning: only one mapping at a time is supported; taking the first one (%s)\n"
+"Warning: only one mapping at a time is supported; taking the first one "
+"(%s)\n"
 msgstr ""
+"Предупреждение: допускается использование только одного сопоставления. Будет "
+"выбрано первое из них: (%s)\n"
 
-#: ../clients/cli/settings.c:4764
-#, fuzzy, c-format
+#: ../clients/cli/settings.c:4652
+#, c-format
 msgid "the property doesn't contain mapping '%s'"
-msgstr "свойство не может быть изменено"
+msgstr "свойство не содержит соответствие «%s»"
 
-#: ../clients/cli/settings.c:4812
-#, fuzzy, c-format
+#: ../clients/cli/settings.c:4700
+#, c-format
 msgid "'%s' cannot be empty"
-msgstr "Пустой параметр: «%s»"
+msgstr "«%s» не может быть пустым"
 
-#: ../clients/cli/settings.c:4886 ../clients/cli/settings.c:5053
-#: ../libnm-core/nm-setting-wired.c:651 ../libnm-core/nm-setting-wireless.c:820
-#: ../libnm-core/nm-setting-wireless.c:832 ../libnm-util/nm-setting-wired.c:646
+#: ../clients/cli/settings.c:4774 ../clients/cli/settings.c:4941
+#: ../libnm-core/nm-setting-wired.c:651
+#: ../libnm-core/nm-setting-wireless.c:820
+#: ../libnm-core/nm-setting-wireless.c:832
+#: ../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 "Недействительный MAC-адрес: «%s»"
 
-#: ../clients/cli/settings.c:4892 ../clients/cli/settings.c:5059
+#: ../clients/cli/settings.c:4780 ../clients/cli/settings.c:4947
 #, c-format
 msgid "the property doesn't contain MAC address '%s'"
-msgstr ""
+msgstr "свойство не содержит MAC-адрес «%s»"
 
-#: ../clients/cli/settings.c:4911
-#, fuzzy, c-format
+#: ../clients/cli/settings.c:4799
+#, c-format
 msgid "'%s' is not valid; 2 or 3 strings should be provided"
-msgstr "Строка «%s» должна содержать три значения."
+msgstr "Недопустимое значение: «%s». Необходимо указать 2 или 3 строки."
 
-#: ../clients/cli/settings.c:4925
-#, fuzzy
+#: ../clients/cli/settings.c:4813
 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/cli/settings.c:4947
+#: ../clients/cli/settings.c:4835
 #, c-format
 msgid "'%s' string value should consist of 1 - 199 characters"
-msgstr ""
+msgstr "строка «%s» может содержать от 1 до 199 знаков"
 
-#: ../clients/cli/settings.c:4979
+#: ../clients/cli/settings.c:4867
 #, c-format
 msgid ""
 "Enter a list of S/390 options formatted as:\n"
@@ -5909,140 +6472,154 @@ msgstr ""
 "  параметр = <значение>, параметр = <значение>,...\n"
 "Допустимые параметры: %s\n"
 
-#: ../clients/cli/settings.c:5025
+#: ../clients/cli/settings.c:4913
 #, c-format
 msgid "'%s' is not a valid channel"
 msgstr "Недопустимый канал «%s»."
 
-#: ../clients/cli/settings.c:5031
+#: ../clients/cli/settings.c:4919
 #, c-format
 msgid "'%ld' is not a valid channel"
 msgstr "Недопустимый канал «%ld»."
 
-#: ../clients/cli/settings.c:5125
-#, fuzzy, c-format
+#: ../clients/cli/settings.c:5013
+#, c-format
 msgid "invalid option '%s', use 'default', 'never' or 'always'"
-msgstr "недопустимый параметр «%s» или его значение «%s»"
+msgstr ""
+"недопустимый параметр «%s»; используйте «default», «never» или «always»"
 
-#: ../clients/cli/settings.c:5186 ../clients/cli/settings.c:5225
-#: ../clients/cli/settings.c:5264
+#: ../clients/cli/settings.c:5074 ../clients/cli/settings.c:5113
+#: ../clients/cli/settings.c:5152
 #, c-format
 msgid "the property doesn't contain protocol '%s'"
-msgstr ""
+msgstr "свойство не содержит протокол «%s»"
 
-#: ../clients/cli/settings.c:5303
+#: ../clients/cli/settings.c:5191
 #, c-format
 msgid ""
 "'%s' not compatible with %s '%s', please change the key or set the right %s "
 "first."
-msgstr ""
+msgstr "«%s» несовместим с %s «%s». Измените ключ или корректно настройте %s"
 
-#: ../clients/cli/settings.c:5311
+#: ../clients/cli/settings.c:5199
 #, c-format
 msgid "WEP key is guessed to be of '%s'\n"
 msgstr "Ключ WEP определен как «%s»\n"
 
-#: ../clients/cli/settings.c:5313
-#, fuzzy, c-format
+#: ../clients/cli/settings.c:5201
+#, c-format
 msgid "WEP key index set to '%d'\n"
-msgstr "Ключ WEP определен как «%s»\n"
+msgstr "Индекс ключа WEP определен как «%d»\n"
 
-#: ../clients/cli/settings.c:5336
+#: ../clients/cli/settings.c:5224
 #, c-format
 msgid "'%s' not among [0 (unknown), 1 (key), 2 (passphrase)]"
-msgstr "«%s» может быть равно [0 (неизвестно), 1 (ключ), 2 (парольная фраза)]"
+msgstr ""
+"«%s» может иметь одно из нескольких значений: [0 (неизвестно), 1 (ключ), 2 "
+"(парольная фраза)]"
 
-#: ../clients/cli/settings.c:5352 ../clients/cli/settings.c:5355
-#: ../clients/cli/settings.c:5358 ../clients/cli/settings.c:5361
+#: ../clients/cli/settings.c:5240 ../clients/cli/settings.c:5243
+#: ../clients/cli/settings.c:5246 ../clients/cli/settings.c:5249
 #, c-format
 msgid ""
 "Warning: '%s' is not compatible with '%s' type, please change or delete the "
 "key.\n"
 msgstr ""
+"Предупреждение: «%s» несовместим с типом «%s». Измените его или удалите ключ."
+"\n"
 
-#: ../clients/cli/settings.c:5374
+#: ../clients/cli/settings.c:5262
 #, c-format
 msgid ""
 "Enter the type of WEP keys. The accepted values are: 0 or unknown, 1 or key, "
 "and 2 or passphrase.\n"
 msgstr ""
-"Определите тип ключей WEP. Возможные значения: 0 (неизвестно), 1 (ключ), 2 "
+"Укажите тип ключей WEP. Возможные значения: 0 (неизвестно), 1 (ключ), 2 "
 "(парольная фраза).\n"
 
-#: ../clients/cli/settings.c:5387
+#: ../clients/cli/settings.c:5275
 #, c-format
 msgid "'%s' is not a valid PSK"
 msgstr "«%s» не является действительным PSK"
 
-#: ../clients/cli/settings.c:5431
+#: ../clients/cli/settings.c:5319
 #, c-format
 msgid "'%s' is not a valid DCB flag"
 msgstr "«%s» не содержит допустимый флаг DCB"
 
-#: ../clients/cli/settings.c:5454
+#: ../clients/cli/settings.c:5342
 #, c-format
 msgid "'%s' is not a DCB app priority"
 msgstr "«%s» не содержит приоритет приложения DCB"
 
-#: ../clients/cli/settings.c:5480
+#: ../clients/cli/settings.c:5368
 msgid "must contain 8 comma-separated numbers"
 msgstr "должен содержать 8 чисел, разделенных запятой"
 
-#: ../clients/cli/settings.c:5497
+#: ../clients/cli/settings.c:5385
 #, c-format
 msgid "'%s' not a number between 0 and %u (inclusive) or %u"
 msgstr "«%s» не является числом в диапазоне от 0 до %u включительно или %u"
 
-#: ../clients/cli/settings.c:5500
+#: ../clients/cli/settings.c:5388
 #, c-format
 msgid "'%s' not a number between 0 and %u (inclusive)"
 msgstr "«%s» не является числом в диапазоне от 0 до %u включительно"
 
-#: ../clients/cli/settings.c:5522
+#: ../clients/cli/settings.c:5410
 #, c-format
-msgid ""
-"Warning: changes will have no effect until '%s' includes 1 (enabled)\n"
+msgid "Warning: changes will have no effect until '%s' includes 1 (enabled)\n"
 "\n"
 msgstr ""
 "Предупреждение. Изменения вступят в силу, только когда «%s» будет равно 1 "
 "(включено)\n"
 "\n"
 
-#: ../clients/cli/settings.c:5575
+#: ../clients/cli/settings.c:5463
 #, c-format
 msgid "bandwidth percentages must total 100%%"
-msgstr "сумма процентных частей пропускной способности должна быть равна 100%%"
+msgstr ""
+"сумма процентных частей пропускной способности должна быть равна 100%%"
 
-#: ../clients/cli/settings.c:5661 ../clients/cli/settings.c:5667
+#: ../clients/cli/settings.c:5549 ../clients/cli/settings.c:5555
 msgid "SIM operator ID must be a 5 or 6 number MCCMNC code"
-msgstr ""
+msgstr "Идентификатор оператора SIM должен содержать код MCCMNC из 5-6 цифр"
 
-#: ../clients/cli/settings.c:5710
-#, fuzzy, c-format
+#: ../clients/cli/settings.c:5598
+#, c-format
 msgid "invalid option '%s', use '%s' or '%s'"
-msgstr "недопустимый параметр «%s» или его значение «%s»"
+msgstr "недопустимый параметр «%s»; используйте «%s» или «%s»"
 
-#: ../clients/cli/settings.c:7777
+#: ../clients/cli/settings.c:7644
 msgid "don't know how to get the property value"
 msgstr "неизвестно, как получить значение свойства"
 
-#: ../clients/cli/settings.c:7830 ../clients/cli/settings.c:7870
+#: ../clients/cli/settings.c:7697 ../clients/cli/settings.c:7737
 msgid "the property can't be changed"
 msgstr "свойство не может быть изменено"
 
-#: ../clients/cli/settings.c:7954
-#, fuzzy
+#: ../clients/cli/settings.c:7821
 msgid "(not available)"
-msgstr "недоступен"
+msgstr "(недоступно)"
 
-#: ../clients/cli/settings.c:7979
+#: ../clients/cli/settings.c:7846
 msgid "[NM property description]"
-msgstr "[описание свойства NM]"
+msgstr "[описание свойства NetworkManager]"
 
-#: ../clients/cli/settings.c:7984
+#: ../clients/cli/settings.c:7851
 msgid "[nmcli specific description]"
 msgstr "[описание в nmcli]"
 
+#. ----------------------------------------------------------------------------
+#: ../clients/cli/settings.c:7900
+msgid "<hidden>"
+msgstr "<hidden>"
+
+#: ../clients/cli/utils.c:124
+#, c-format
+msgid "Error: value for '%s' argument is required."
+msgstr "Ошибка: необходимо указать значение аргумента «%s»."
+
 #: ../clients/cli/utils.c:149
 #, c-format
 msgid "Error: Argument '%s' was expected, but '%s' provided."
@@ -6053,57 +6630,96 @@ msgstr "Ошибка. Ожидается аргумент «%s», а получ�
 msgid "Error: Unexpected argument '%s'"
 msgstr "Ошибка. Непредвиденный аргумент: «%s»"
 
+#: ../clients/cli/utils.c:202
+#, c-format
+msgid "Error converting IP4 address '0x%X' to text form"
+msgstr "Ошибка преобразования адреса IP4 «0x%X» в текстовый формат"
+
+#: ../clients/cli/utils.c:230
+#, c-format
+msgid "Error converting IP6 address '%s' to text form"
+msgstr "Ошибка преобразования адреса IP6 «%s» в текстовый формат"
+
 #. Translators: the first %s is the partial value entered by
 #. * the user, the second %s a list of compatible values.
-#.
-#: ../clients/cli/utils.c:492 ../clients/cli/utils.c:523
-#, fuzzy, c-format
+#. 
+#: ../clients/cli/utils.c:546 ../clients/cli/utils.c:577
+#, c-format
 msgid "'%s' is ambiguous (%s)"
-msgstr "Неоднозначное значение «%s» (%s x %s)"
+msgstr "Неоднозначное значение: «%s» (%s)"
 
-#: ../clients/cli/utils.c:502
+#: ../clients/cli/utils.c:556
 #, c-format
 msgid "'%s' is not valid; use [%s] or [%s]"
 msgstr "Недопустимое значение «%s». Ожидается [%s] или  [%s]"
 
-#: ../clients/cli/utils.c:535
-#, fuzzy, c-format
+#: ../clients/cli/utils.c:589
+#, c-format
 msgid "'%s' is not valid; use [%s], [%s] or [%s]"
-msgstr "Недопустимое значение «%s». Ожидается [%s] или  [%s]"
+msgstr "Недопустимое значение «%s». Ожидается [%s], [%s] или [%s]"
 
-#: ../clients/cli/utils.c:634
+#: ../clients/cli/utils.c:688
 #, c-format
 msgid "'%s' is ambiguous (%s x %s)"
 msgstr "Неоднозначное значение «%s» (%s x %s)"
 
-#: ../clients/cli/utils.c:646
+#: ../clients/cli/utils.c:700
 #, c-format
 msgid "missing name, try one of [%s]"
 msgstr "имя не определено, попробуйте выбрать значение из [%s]"
 
-#: ../clients/cli/utils.c:893
+#: ../clients/cli/utils.c:964
 #, c-format
 msgid "field '%s' has to be alone"
 msgstr "поле «%s» должно быть единственным"
 
-#: ../clients/cli/utils.c:896
+#: ../clients/cli/utils.c:967
 #, c-format
 msgid "invalid field '%s'; allowed fields: %s"
 msgstr "неверное поле «%s»; допустимые поля: %s"
 
-#: ../clients/cli/utils.c:953
+#: ../clients/cli/utils.c:1024
 msgid "Option '--terse' requires specifying '--fields'"
 msgstr "Параметр «--terse» требует указания «--fields»"
 
-#: ../clients/cli/utils.c:957
+#: ../clients/cli/utils.c:1028
 #, c-format
 msgid "Option '--terse' requires specific '--fields' option values , not '%s'"
 msgstr ""
 "Параметр «--terse» требует определённых значений «--fields», но не «%s»"
 
+#: ../clients/cli/utils.c:1390
+#, c-format
+msgid ""
+"Warning: nmcli (%s) and NetworkManager (%s) versions don't match. Use --"
+"nocheck to suppress the warning.\n"
+msgstr ""
+"Предупреждение: версии nmcli (%s) и NetworkManager (%s) не совпадают. "
+"Используйте --nocheck для подавления этого предупреждения.\n"
+
+#: ../clients/cli/utils.c:1399
+#, c-format
+msgid ""
+"Error: nmcli (%s) and NetworkManager (%s) versions don't match. Force "
+"execution using --nocheck, but the results are unpredictable."
+msgstr ""
+"Ошибка: версии nmcli (%s) и NetworkManager (%s) не совпадают. Для "
+"принудительного запуска используйте --nocheck, но результаты не предсказуемы."
+""
+
 #: ../clients/common/nm-polkit-listener.c:212
 msgid "An authentication session is already underway."
-msgstr ""
+msgstr "Сеанс аутентификации уже выполняется."
+
+#. TTLS and PEAP are actually much more complicated, but this complication
+#. * is not visible here since we only care about phase2 authentication
+#. * (and don't even care of which one)
+#. 
+#: ../clients/common/nm-secret-agent-simple.c:223
+#: ../clients/common/nm-secret-agent-simple.c:328
+#: ../clients/tui/nmt-page-dsl.c:66 ../clients/tui/nmt-page-wifi.c:332
+msgid "Username"
+msgstr "Пользователь"
 
 #: ../clients/common/nm-secret-agent-simple.c:230
 #: ../clients/common/nm-secret-agent-simple.c:273
@@ -6112,10 +6728,9 @@ msgstr ""
 #: ../clients/common/nm-secret-agent-simple.c:492
 #: ../clients/common/nm-secret-agent-simple.c:507
 #: ../clients/common/nm-secret-agent-simple.c:525
-#: ../clients/common/nm-vpn-helpers.c:119
-#: ../clients/common/nm-vpn-helpers.c:120
-#: ../clients/common/nm-vpn-helpers.c:124
-#: ../clients/common/nm-vpn-helpers.c:127 ../clients/tui/nmt-page-dsl.c:75
+#: ../clients/common/nm-vpn-helpers.c:101
+#: ../clients/common/nm-vpn-helpers.c:102
+#: ../clients/common/nm-vpn-helpers.c:105 ../clients/tui/nmt-page-dsl.c:75
 #: ../clients/tui/nmt-page-wifi.c:277 ../clients/tui/nmt-page-wifi.c:308
 #: ../clients/tui/nmt-page-wifi.c:341
 msgid "Password"
@@ -6190,60 +6805,30 @@ msgid "A password is required to connect to '%s'."
 msgstr "Для подключения к «%s» требуется пароль."
 
 #: ../clients/common/nm-secret-agent-simple.c:537
-#, fuzzy
 msgid "VPN password required"
-msgstr "Требуется PIN"
-
-#: ../clients/common/nm-vpn-helpers.c:48
-#, fuzzy, c-format
-msgid "unknown VPN plugin \"%s\""
-msgstr "Неизвестный домен журналирования «%s»"
-
-#: ../clients/common/nm-vpn-helpers.c:59
-#, c-format
-msgid "cannot cannot load legacy-only VPN plugin \"%s\" for \"%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 ""
-
-#: ../clients/common/nm-vpn-helpers.c:69
-#, fuzzy, c-format
-msgid "failed to load VPN plugin \"%s\": %s"
-msgstr "Ошибка. Не удалось добавить соединение «%s»: (%d) %s"
-
-#: ../clients/common/nm-vpn-helpers.c:121
-#, fuzzy
-msgid "Certificate password"
-msgstr "Пароль секретного ключа"
+msgstr "Требуется пароль VPN"
 
-#: ../clients/common/nm-vpn-helpers.c:122
-#, fuzzy
-msgid "HTTP proxy password"
-msgstr "Показать пароль"
+#: ../clients/common/nm-vpn-helpers.c:61
+msgid "could not get VPN plugin info"
+msgstr "не удалось получить данные о модуле VPN"
 
-#: ../clients/common/nm-vpn-helpers.c:125
-#: ../clients/common/nm-vpn-helpers.c:128
-#, fuzzy
+#: ../clients/common/nm-vpn-helpers.c:103
+#: ../clients/common/nm-vpn-helpers.c:106
 msgid "Group password"
-msgstr "Показать пароль"
+msgstr "Пароль группы"
 
-#: ../clients/common/nm-vpn-helpers.c:130 ../clients/tui/nmt-page-ip4.c:143
+#: ../clients/common/nm-vpn-helpers.c:108 ../clients/tui/nmt-page-ip4.c:143
 #: ../clients/tui/nmt-page-ip6.c:143
 msgid "Gateway"
 msgstr "Шлюз"
 
-#: ../clients/common/nm-vpn-helpers.c:131
+#: ../clients/common/nm-vpn-helpers.c:109
 msgid "Cookie"
-msgstr ""
+msgstr "Cookie"
 
-#: ../clients/common/nm-vpn-helpers.c:132
-#, fuzzy
+#: ../clients/common/nm-vpn-helpers.c:110
 msgid "Gateway certificate hash"
-msgstr "Ошибка инициализации данных сертификата: %s"
+msgstr "Хэш сертификата шлюза"
 
 #: ../clients/nm-online.c:94
 msgid "Connecting"
@@ -6256,18 +6841,18 @@ msgid ""
 msgstr "Время ожидания соединения в секундах (по умолчанию 30)"
 
 #: ../clients/nm-online.c:148
-#, fuzzy
 msgid "Exit immediately if NetworkManager is not running or connecting"
-msgstr "Выйти немедленно, если NetworkManager не запущен"
+msgstr ""
+"Немедленно завершить работу, если NetworkManager не запущен или пытается "
+"установить соединение"
 
 #: ../clients/nm-online.c:149
 msgid "Don't print anything"
 msgstr "Ничего не выводить"
 
 #: ../clients/nm-online.c:150
-#, fuzzy
 msgid "Wait for NetworkManager startup instead of a connection"
-msgstr "Ожидать успешного соединения в NetworkManager."
+msgstr "Ожидать запуска NetworkManager, а не установки соединения"
 
 #: ../clients/nm-online.c:171
 msgid ""
@@ -6281,7 +6866,7 @@ msgstr "Неверный параметр. Используйте --help для
 #: ../clients/tui/newt/nmt-newt-utils.c:177 ../clients/tui/nmt-editor.c:415
 #: ../clients/tui/nmt-password-dialog.c:174
 #: ../clients/tui/nmt-route-editor.c:122 ../clients/tui/nmtui-hostname.c:69
-#: ../clients/tui/nmtui.c:136
+#: ../clients/tui/nmtui.c:114
 msgid "OK"
 msgstr "OK"
 
@@ -6297,52 +6882,37 @@ msgid "Editor failed: %s"
 msgstr "Ошибка редактора: %s"
 
 #: ../clients/tui/newt/nmt-newt-utils.c:373
-#, fuzzy, c-format
+#, c-format
 msgid "Editor failed with status %d"
-msgstr "Ошибка редактора: %s"
+msgstr "Ошибка редактора. Код выхода: %d"
 
 #: ../clients/tui/newt/nmt-newt-utils.c:375
-#, fuzzy, c-format
+#, c-format
 msgid "Editor failed with signal %d"
-msgstr "Ошибка редактора: %s"
+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:146 ../libnm-glib/nm-device.c:1859
-#: ../libnm/nm-device.c:1810
-msgid "Ethernet"
-msgstr "Ethernet"
+msgstr "Не удалось повторно прочитать файл: %s"
 
 #: ../clients/tui/nm-editor-utils.c:150
 #, c-format
 msgid "Ethernet connection %d"
 msgstr "Проводное соединение %d"
 
-#: ../clients/tui/nm-editor-utils.c:154 ../libnm-glib/nm-device.c:1861
-#: ../libnm/nm-device.c:1812
-msgid "Wi-Fi"
-msgstr "Wi-Fi"
-
 #: ../clients/tui/nm-editor-utils.c:158
 #, c-format
 msgid "Wi-Fi connection %d"
 msgstr "Соединение Wi-Fi %d"
 
-#: ../clients/tui/nm-editor-utils.c:163 ../libnm-core/nm-connection.c:1748
-#: ../libnm-glib/nm-device.c:1871 ../libnm/nm-device.c:1822
-msgid "InfiniBand"
-msgstr "InfiniBand"
-
 #: ../clients/tui/nm-editor-utils.c:167
 #, c-format
 msgid "InfiniBand connection %d"
 msgstr "Соединение InfiniBand %d"
 
-#: ../clients/tui/nm-editor-utils.c:172 ../libnm-glib/nm-device.c:1869
-#: ../libnm/nm-device.c:1820
+#: ../clients/tui/nm-editor-utils.c:172 ../libnm-glib/nm-device.c:1859
+#: ../libnm/nm-device.c:1810
 msgid "Mobile Broadband"
 msgstr "Мобильное"
 
@@ -6360,9 +6930,9 @@ msgstr "DSL"
 msgid "DSL connection %d"
 msgstr "Cоединение DSL %d"
 
-#: ../clients/tui/nm-editor-utils.c:190 ../libnm-core/nm-connection.c:1740
-#: ../libnm-glib/nm-device.c:1873 ../libnm-util/nm-connection.c:1626
-#: ../libnm/nm-device.c:1824 ../src/settings/plugins/ifcfg-rh/reader.c:4195
+#: ../clients/tui/nm-editor-utils.c:190 ../libnm-core/nm-connection.c:1708
+#: ../libnm-glib/nm-device.c:1863 ../libnm-util/nm-connection.c:1626
+#: ../libnm/nm-device.c:1814 ../src/settings/plugins/ifcfg-rh/reader.c:4182
 msgid "Bond"
 msgstr "Агрегированное (Bond)"
 
@@ -6371,9 +6941,9 @@ msgstr "Агрегированное (Bond)"
 msgid "Bond connection %d"
 msgstr "Агрегированное (Bond) соединение %d"
 
-#: ../clients/tui/nm-editor-utils.c:199 ../libnm-core/nm-connection.c:1744
-#: ../libnm-glib/nm-device.c:1877 ../libnm-util/nm-connection.c:1630
-#: ../libnm/nm-device.c:1828 ../src/settings/plugins/ifcfg-rh/reader.c:4492
+#: ../clients/tui/nm-editor-utils.c:199 ../libnm-core/nm-connection.c:1712
+#: ../libnm-glib/nm-device.c:1867 ../libnm-util/nm-connection.c:1630
+#: ../libnm/nm-device.c:1818 ../src/settings/plugins/ifcfg-rh/reader.c:4479
 msgid "Bridge"
 msgstr "Мост"
 
@@ -6382,9 +6952,9 @@ msgstr "Мост"
 msgid "Bridge connection %d"
 msgstr "Соединение типа «мост» %d"
 
-#: ../clients/tui/nm-editor-utils.c:208 ../libnm-core/nm-connection.c:1742
-#: ../libnm-glib/nm-device.c:1875 ../libnm-util/nm-connection.c:1628
-#: ../libnm/nm-device.c:1826 ../src/settings/plugins/ifcfg-rh/reader.c:4301
+#: ../clients/tui/nm-editor-utils.c:208 ../libnm-core/nm-connection.c:1710
+#: ../libnm-glib/nm-device.c:1865 ../libnm-util/nm-connection.c:1628
+#: ../libnm/nm-device.c:1816 ../src/settings/plugins/ifcfg-rh/reader.c:4288
 msgid "Team"
 msgstr "Агрегированное (Team)"
 
@@ -6459,9 +7029,8 @@ msgid "Profile name"
 msgstr "Имя профиля"
 
 #: ../clients/tui/nmt-editor.c:331
-#, fuzzy
 msgid "Ethernet device"
-msgstr "Ethernet"
+msgstr "Устройство Ethernet"
 
 #: ../clients/tui/nmt-editor.c:333
 msgid "Device"
@@ -6588,9 +7157,8 @@ msgid "Aging time"
 msgstr "Время старения"
 
 #: ../clients/tui/nmt-page-bridge.c:91
-#, fuzzy
 msgid "Enable IGMP snooping"
-msgstr "Включить IGMP snooping %s"
+msgstr "Включить отслеживание IGMP"
 
 #: ../clients/tui/nmt-page-bridge.c:97
 msgid "Enable STP (Spanning Tree Protocol)"
@@ -6629,6 +7197,10 @@ msgstr "Подключено"
 msgid "INFINIBAND"
 msgstr "INFINIBAND"
 
+#: ../clients/tui/nmt-page-infiniband.c:88
+msgid "Transport mode"
+msgstr "Транспортный режим"
+
 #: ../clients/tui/nmt-page-ip4.c:38
 msgid "Disabled"
 msgstr "Отключено"
@@ -6687,7 +7259,7 @@ msgstr "Не использовать эту сеть для текущего м
 
 #: ../clients/tui/nmt-page-ip4.c:179 ../clients/tui/nmt-page-ip6.c:177
 msgid "Ignore automatically obtained routes"
-msgstr ""
+msgstr "Игнорировать автоматически полученные маршруты"
 
 #: ../clients/tui/nmt-page-ip4.c:187
 msgid "Require IPv4 addressing for this connection"
@@ -6714,9 +7286,8 @@ msgid "PPP CONFIGURATION"
 msgstr "КОНФИГУРАЦИЯ PPP"
 
 #: ../clients/tui/nmt-page-ppp.c:140
-#, fuzzy
 msgid "Allowed authentication methods:"
-msgstr "Аутентификация"
+msgstr "Разрешенные методы аутентификации:"
 
 #: ../clients/tui/nmt-page-ppp.c:147
 msgid "EAP"
@@ -6740,31 +7311,31 @@ msgstr "MSCHAP"
 
 #: ../clients/tui/nmt-page-ppp.c:195
 msgid "Use point-to-point encryption (MPPE)"
-msgstr ""
+msgstr "Использовать шифрование MPPE"
 
 #: ../clients/tui/nmt-page-ppp.c:207
 msgid "Require 128-bit encryption"
-msgstr ""
+msgstr "Требовать 128-битное шифрование"
 
 #: ../clients/tui/nmt-page-ppp.c:217
 msgid "Use stateful MPPE"
-msgstr ""
+msgstr "Использовать MPPE с сохранением состояния"
 
 #: ../clients/tui/nmt-page-ppp.c:229
 msgid "Allow BSD data compression"
-msgstr ""
+msgstr "Разрешить сжатие данных BSD"
 
 #: ../clients/tui/nmt-page-ppp.c:237
 msgid "Allow Deflate data compression"
-msgstr ""
+msgstr "Разрешить сжатие данных Deflate"
 
 #: ../clients/tui/nmt-page-ppp.c:245
 msgid "Use TCP header compression"
-msgstr ""
+msgstr "Использовать сжатие заголовков TCP"
 
 #: ../clients/tui/nmt-page-ppp.c:255
 msgid "Send PPP echo packets"
-msgstr ""
+msgstr "Отправлять эхо-пакеты PPP"
 
 #: ../clients/tui/nmt-page-team-port.c:92
 msgid "TEAM PORT"
@@ -6944,25 +7515,27 @@ msgid ""
 "openconnect will be run to authenticate.\n"
 "It will return to nmtui when completed."
 msgstr ""
+"Для осуществления аутентификации будет запущен openconnect.\n"
+"После завершения управление снова будет передано nmtui."
 
 #: ../clients/tui/nmtui-connect.c:68
-#, fuzzy, c-format
+#, c-format
 msgid "Error: openconnect failed: %s"
-msgstr "Ошибка: сбой удаления соединения: %s"
+msgstr "Выполнение openconnect завершилось неудачей: %s"
 
 #: ../clients/tui/nmtui-connect.c:75
-#, fuzzy, c-format
+#, c-format
 msgid "openconnect failed with status %d"
-msgstr "Ошибка редактора: %s"
+msgstr "Выполнение openconnect завершилось неудачей. Код: %d"
 
 #: ../clients/tui/nmtui-connect.c:79
-#, fuzzy, c-format
+#, c-format
 msgid "openconnect failed with signal %d"
-msgstr "Ошибка редактора: %s"
+msgstr "Выполнение openconnect завершилось неудачей. Сигнал: %d"
 
 #: ../clients/tui/nmtui-connect.c:178
 msgid "Activation failed"
-msgstr "Ошибка подключения"
+msgstr "Ошибка активации"
 
 #: ../clients/tui/nmtui-connect.c:233
 msgid "Connecting..."
@@ -6971,7 +7544,7 @@ msgstr "Подключение..."
 #: ../clients/tui/nmtui-connect.c:268 ../clients/tui/nmtui-connect.c:299
 #, c-format
 msgid "Could not activate connection: %s"
-msgstr "Не удалось подключиться к %s"
+msgstr "Не удалось установить соединение: %s"
 
 #: ../clients/tui/nmtui-connect.c:359 ../clients/tui/nmtui-connect.c:408
 msgid "Activate"
@@ -6982,14 +7555,10 @@ msgid "Deactivate"
 msgstr "Отключить"
 
 #: ../clients/tui/nmtui-connect.c:413 ../clients/tui/nmtui-edit.c:120
-#: ../clients/tui/nmtui.c:130
+#: ../clients/tui/nmtui.c:108
 msgid "Quit"
 msgstr "Выйти"
 
-#: ../clients/tui/nmtui-connect.c:413 ../clients/tui/nmtui-edit.c:120
-msgid "Back"
-msgstr ""
-
 #: ../clients/tui/nmtui-connect.c:436
 #, c-format
 msgid "No such connection '%s'"
@@ -7025,14 +7594,14 @@ msgid "Unable to delete connection: %s"
 msgstr "Не удалось удалить соединение: %s"
 
 #: ../clients/tui/nmtui-edit.c:505
-#, fuzzy, c-format
+#, c-format
 msgid "Could not delete connection '%s': %s"
-msgstr "Не удалось удалить соединение: %s"
+msgstr "Не удается удалить соединение «%s»: %s"
 
 #: ../clients/tui/nmtui-edit.c:527
 #, 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"
@@ -7073,28 +7642,28 @@ msgstr "новое имя узла"
 msgid "Set system hostname"
 msgstr "Измените имя узла"
 
-#: ../clients/tui/nmtui.c:104
+#: ../clients/tui/nmtui.c:83
 msgid "NetworkManager TUI"
 msgstr "TUI NetworkManager"
 
-#: ../clients/tui/nmtui.c:112
+#: ../clients/tui/nmtui.c:91
 msgid "Please select an option"
 msgstr "Выберите вариант"
 
-#: ../clients/tui/nmtui.c:160
+#: ../clients/tui/nmtui.c:143
 msgid "Usage"
 msgstr "Использование"
 
-#: ../clients/tui/nmtui.c:241
+#: ../clients/tui/nmtui.c:224
 msgid "Could not parse arguments"
 msgstr "Не удалось обработать аргументы"
 
-#: ../clients/tui/nmtui.c:251
-#, fuzzy, c-format
+#: ../clients/tui/nmtui.c:234
+#, c-format
 msgid "Could not contact NetworkManager: %s.\n"
-msgstr "Не удалось подключиться к %s"
+msgstr "Не удалось связаться с  NetworkManager: %s.\n"
 
-#: ../clients/tui/nmtui.c:256
+#: ../clients/tui/nmtui.c:239
 msgid "NetworkManager is not running."
 msgstr "NetworkManager не работает."
 
@@ -7183,17 +7752,17 @@ msgstr "Не удалось определить тип личного ключ�
 #: ../libnm-core/crypto.c:502
 #, c-format
 msgid "Password provided, but key was not encrypted."
-msgstr ""
+msgstr "Пароль предоставлен, но ключ не зашифрован."
 
 #: ../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: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:582 ../libnm-util/crypto.c:598
 #, c-format
@@ -7202,7 +7771,7 @@ msgstr "Не удалось расшифровать сертификат."
 
 #: ../libnm-core/crypto_gnutls.c:48 ../libnm-util/crypto_gnutls.c:48
 msgid "Failed to initialize the crypto engine."
-msgstr "Не удалось инициализировать криптографический модуль."
+msgstr "Не удалось инициализировать криптографический механизм."
 
 #: ../libnm-core/crypto_gnutls.c:99 ../libnm-util/crypto_gnutls.c:159
 #, c-format
@@ -7210,9 +7779,9 @@ msgid "Invalid IV length (must be at least %zd)."
 msgstr "Недопустимая длина ВИ (минимально %zd)."
 
 #: ../libnm-core/crypto_gnutls.c:115 ../libnm-util/crypto_gnutls.c:175
-#, fuzzy, c-format
+#, c-format
 msgid "Failed to initialize the decryption cipher context: %s (%s)"
-msgstr "Не удалось инициализировать контекст шифра декодирования: %s / %s."
+msgstr "Не удалось инициализировать контекст шифра декодирования: %s  (%s)."
 
 #: ../libnm-core/crypto_gnutls.c:124 ../libnm-util/crypto_gnutls.c:184
 #, c-format
@@ -7232,14 +7801,14 @@ msgid "Failed to decrypt the private key."
 msgstr "Не удалось расшифровать личный ключ."
 
 #: ../libnm-core/crypto_gnutls.c:224 ../libnm-util/crypto_gnutls.c:283
-#, fuzzy, c-format
+#, c-format
 msgid "Failed to initialize the encryption cipher context: %s (%s)"
-msgstr "Не удалось инициализировать контекст кода шифрования: %s / %s."
+msgstr "Не удалось инициализировать контекст кода шифрования: %s (%s)."
 
 #: ../libnm-core/crypto_gnutls.c:233 ../libnm-util/crypto_gnutls.c:292
-#, fuzzy, c-format
+#, c-format
 msgid "Failed to encrypt the data: %s (%s)"
-msgstr "Не удалось зашифровать данные: %s / %s."
+msgstr "Не удалось зашифровать данные: %s (%s)."
 
 #: ../libnm-core/crypto_gnutls.c:276 ../libnm-util/crypto_gnutls.c:332
 #, c-format
@@ -7361,7 +7930,7 @@ msgstr "Не удалось расшифровать сертификат: %d"
 #: ../libnm-core/crypto_nss.c:420
 #, c-format
 msgid "Password must be UTF-8"
-msgstr ""
+msgstr "Пароль должен использовать кодировку UTF-8"
 
 #: ../libnm-core/crypto_nss.c:450 ../libnm-util/crypto_nss.c:488
 #, c-format
@@ -7382,55 +7951,51 @@ msgstr "Не удалось проверить файл PKCS#12: %d"
 msgid "Could not generate random data."
 msgstr "Ошибка при генерации случайных данных."
 
-#: ../libnm-core/nm-connection.c:225
+#: ../libnm-core/nm-connection.c:224
 msgid "wrong type; should be a list of strings."
-msgstr ""
+msgstr "неверный тип; должен содержать список строк."
 
-#: ../libnm-core/nm-connection.c:295
-#, fuzzy
+#: ../libnm-core/nm-connection.c:294
 msgid "unknown setting name"
-msgstr "Ошибка: неизвестный параметр: %s\n"
+msgstr "неизвестное имя параметра"
 
-#: ../libnm-core/nm-connection.c:307
-#, fuzzy
+#: ../libnm-core/nm-connection.c:306
 msgid "duplicate setting name"
-msgstr "Ошибка: неизвестный параметр: %s\n"
+msgstr "повторяющееся имя параметра"
 
-#: ../libnm-core/nm-connection.c:905
+#: ../libnm-core/nm-connection.c:873
 msgid "setting not found"
-msgstr ""
+msgstr "параметр не найден"
 
-#: ../libnm-core/nm-connection.c:969
-#, fuzzy
+#: ../libnm-core/nm-connection.c:937
 msgid "setting not allowed in slave connection"
-msgstr "Параметр «%s» не определен в соединении.\n"
+msgstr "параметр не может использоваться подчиненными соединениями"
 
-#: ../libnm-core/nm-connection.c:980
+#: ../libnm-core/nm-connection.c:948
 msgid "setting is required for non-slave connections"
-msgstr ""
+msgstr "параметр обязателен для неподчиненных соединений"
 
-#: ../libnm-core/nm-connection.c:1074
-#, fuzzy
+#: ../libnm-core/nm-connection.c:1042
 msgid "Unexpected failure to verify the connection"
-msgstr "Не удалось удалить соединение: %s"
+msgstr "Непредвиденная ошибка при проверке соединения"
 
-#: ../libnm-core/nm-connection.c:1107
-#, fuzzy
+#: ../libnm-core/nm-connection.c:1075
 msgid "Unexpected failure to normalize the connection"
-msgstr "Не удалось удалить соединение: %s"
+msgstr "Непредвиденная ошибка при нормализации соединения"
 
-#: ../libnm-core/nm-connection.c:1608 ../libnm-core/nm-setting-8021x.c:2411
+#: ../libnm-core/nm-connection.c:1576 ../libnm-core/nm-setting-8021x.c:2411
 #: ../libnm-core/nm-setting-8021x.c:2428 ../libnm-core/nm-setting-8021x.c:2459
 #: ../libnm-core/nm-setting-8021x.c:2476 ../libnm-core/nm-setting-8021x.c:2518
 #: ../libnm-core/nm-setting-8021x.c:2530 ../libnm-core/nm-setting-8021x.c:2548
 #: ../libnm-core/nm-setting-8021x.c:2560 ../libnm-core/nm-setting-8021x.c:2584
 #: ../libnm-core/nm-setting-8021x.c:2749 ../libnm-core/nm-setting-adsl.c:189
 #: ../libnm-core/nm-setting-bluetooth.c:120
-#: ../libnm-core/nm-setting-bluetooth.c:138 ../libnm-core/nm-setting-cdma.c:141
+#: ../libnm-core/nm-setting-bluetooth.c:138
+#: ../libnm-core/nm-setting-cdma.c:141
 #: ../libnm-core/nm-setting-connection.c:837
 #: ../libnm-core/nm-setting-connection.c:876
 #: ../libnm-core/nm-setting-connection.c:989
-#: ../libnm-core/nm-setting-ip-config.c:2186
+#: ../libnm-core/nm-setting-ip-config.c:2167
 #: ../libnm-core/nm-setting-olpc-mesh.c:120
 #: ../libnm-core/nm-setting-pppoe.c:142 ../libnm-core/nm-setting-vpn.c:419
 #: ../libnm-core/nm-setting-vxlan.c:360 ../libnm-core/nm-setting-wimax.c:126
@@ -7442,8 +8007,10 @@ msgstr "Не удалось удалить соединение: %s"
 #: ../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-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
@@ -7461,211 +8028,211 @@ msgstr "свойство не определено"
 #: ../libnm-core/nm-dbus-utils.c:188
 #, c-format
 msgid "Method returned type '%s', but expected '%s'"
-msgstr ""
+msgstr "Метод вернул тип «%s», но ожидалось «%s»"
 
 #: ../libnm-core/nm-keyfile-reader.c:136
 msgid "ignoring missing number"
-msgstr ""
+msgstr "игнорируется пропущенное число"
 
 #: ../libnm-core/nm-keyfile-reader.c:145
-#, fuzzy, c-format
+#, c-format
 msgid "ignoring invalid number '%s'"
-msgstr "недопустимая метрика «%s»"
+msgstr "игнорируется неверное число:  «%s»"
 
 #: ../libnm-core/nm-keyfile-reader.c:165
-#, fuzzy, c-format
+#, c-format
 msgid "ignoring invalid %s address: %s"
-msgstr "недопустимый адрес IPv4: «%s»"
+msgstr "игнорируется неверный адрес %s: %s"
 
 #: ../libnm-core/nm-keyfile-reader.c:205
 #, c-format
 msgid "ignoring invalid gateway '%s' for %s route"
-msgstr ""
+msgstr "игнорируется неверный шлюз «%s» для маршрута %s"
 
 #: ../libnm-core/nm-keyfile-reader.c:225
-#, fuzzy, c-format
+#, c-format
 msgid "ignoring invalid %s route: %s"
-msgstr "недопустимый маршрут IPv4: «%s»"
+msgstr "игнорируется неверный маршрут %s: %s"
 
 #: ../libnm-core/nm-keyfile-reader.c:343
 #, c-format
 msgid "unexpected character '%c' for address %s: '%s' (position %td)"
-msgstr ""
+msgstr "непредвиденный символ «%c» адреса %s: «%s» (позиция %td)"
 
 #: ../libnm-core/nm-keyfile-reader.c:353
 #, c-format
 msgid "unexpected character '%c' for %s: '%s' (position %td)"
-msgstr ""
+msgstr "непредвиденный символ «%c» для %s: «%s» (позиция %td)"
 
 #: ../libnm-core/nm-keyfile-reader.c:362
 #, c-format
 msgid "unexpected character '%c' in prefix length for %s: '%s' (position %td)"
 msgstr ""
+"непредвиденный символ «%c» в длине префикса для %s: «%s» (позиция %td)"
 
 #: ../libnm-core/nm-keyfile-reader.c:373
 #, c-format
 msgid "garbage at the end of value %s: '%s'"
-msgstr ""
+msgstr "лишние данные в конце значения %s: «%s»"
 
 #: ../libnm-core/nm-keyfile-reader.c:379
 #, c-format
 msgid "deprecated semicolon at the end of value %s: '%s'"
-msgstr ""
+msgstr "устаревшая точка с запятой в конце значения %s: «%s»"
 
 #: ../libnm-core/nm-keyfile-reader.c:394
 #, c-format
 msgid "invalid prefix length for %s '%s', defaulting to %d"
 msgstr ""
+"недопустимая длина префикса для %s «%s»; по умолчанию будет использоваться "
+"%d"
 
 #: ../libnm-core/nm-keyfile-reader.c:401
 #, c-format
 msgid "missing prefix length for %s '%s', defaulting to %d"
 msgstr ""
+"не указана длина префикса для %s «%s»; по умолчанию будет использоваться %d"
 
 #: ../libnm-core/nm-keyfile-reader.c:504
-#, fuzzy, c-format
+#, c-format
 msgid "ignoring invalid DNS server IPv4 address '%s'"
-msgstr "недопустимый адрес IPv4: «%s»"
+msgstr "игнорируется недопустимый адрес IPv4 сервера DNS: «%s»"
 
 #: ../libnm-core/nm-keyfile-reader.c:543
-#, fuzzy, c-format
+#, c-format
 msgid "ignoring invalid DNS server IPv6 address '%s'"
-msgstr "недопустимый адрес IPv6: «%s»"
+msgstr "игнорируется недопустимый адрес IPv6 сервера DNS: «%s»"
 
 #: ../libnm-core/nm-keyfile-reader.c:628 ../libnm-core/nm-keyfile-reader.c:769
 #: ../libnm-core/nm-keyfile-reader.c:1446
 #, c-format
 msgid "ignoring invalid byte element '%d' (not between 0 and 255 inclusive)"
 msgstr ""
+"игнорируется недопустимый байтовый элемент «%d» (должен лежать в диапазоне "
+"от 0 до 255)"
 
 #: ../libnm-core/nm-keyfile-reader.c:642
-#, fuzzy
 msgid "ignoring invalid MAC address"
-msgstr "недопустимый MAC-адрес"
+msgstr "игнорируется недопустимый MAC-адрес"
 
 #: ../libnm-core/nm-keyfile-reader.c:758
-#, fuzzy
 msgid "ignoring invalid binary property"
-msgstr "Ошибка. Недействительное свойство: %s\n"
+msgstr "игнорируется недействительное двоичное свойство"
 
 #: ../libnm-core/nm-keyfile-reader.c:801
 msgid "ignoring invalid SSID"
-msgstr ""
+msgstr "игнорируется недействительный SSID"
 
 #: ../libnm-core/nm-keyfile-reader.c:817
 msgid "ignoring invalid raw password"
-msgstr ""
+msgstr "игнорируется неверный пароль в необработанном виде"
 
-#: ../libnm-core/nm-keyfile-reader.c:892 ../libnm-core/nm-keyfile-reader.c:1058
-#, fuzzy, c-format
+#: ../libnm-core/nm-keyfile-reader.c:892
+#: ../libnm-core/nm-keyfile-reader.c:1058
+#, c-format
 msgid "certificate or key file '%s' does not exist"
-msgstr "Ошибка. Недействительное соединение: %s\n"
+msgstr "файла сертификата или ключа «%s» не существует"
 
 #: ../libnm-core/nm-keyfile-reader.c:897
-#, fuzzy, c-format
+#, c-format
 msgid "invalid key/cert value path \"%s\""
-msgstr "недопустимый параметр «%s» или его значение «%s»"
+msgstr "неверный путь к ключу/сертификату: «%s»"
 
 #: ../libnm-core/nm-keyfile-reader.c:935
 msgid "invalid key/cert value data:;base64, is not base64"
-msgstr ""
+msgstr "недопустимые данные ключа/сертификата: не является base64"
 
 #: ../libnm-core/nm-keyfile-reader.c:948
 msgid "invalid key/cert value data:;base64,file://"
-msgstr ""
+msgstr "недопустимые данные ключа/сертификата data:;base64,file://"
 
 #: ../libnm-core/nm-keyfile-reader.c:1095
-#, fuzzy
 msgid "invalid key/cert value is not a valid blob"
-msgstr "Недействительный UUID:  «%s»"
+msgstr ""
+"недопустимое значение ключа/сертификата: не содержит действительный большой "
+"двоичный объект"
 
 #: ../libnm-core/nm-keyfile-reader.c:1100
-#, fuzzy
 msgid "invalid key/cert value"
-msgstr "недопустимый параметр «%s» или его значение «%s»"
+msgstr "недопустимое значение ключа/сертификата"
 
 #: ../libnm-core/nm-keyfile-reader.c:1147
-#, fuzzy, c-format
+#, c-format
 msgid "invalid parity value '%s'"
-msgstr "недопустимый параметр «%s» или его значение «%s»"
+msgstr "недопустимое значение четности: «%s»"
 
 #: ../libnm-core/nm-keyfile-reader.c:1347
-#, fuzzy, c-format
+#, c-format
 msgid "error loading setting value: %s"
-msgstr "Ошибка. Недопустимое значение параметра: %s\n"
+msgstr "произошла ошибка при загрузке значения параметра: %s"
 
 #: ../libnm-core/nm-keyfile-reader.c:1379
-#, fuzzy, c-format
+#, c-format
 msgid "invalid negative value (%i)"
-msgstr "недопустимый шлюз «%s»"
+msgstr "недопустимое отрицательное значение (%i)"
 
 #: ../libnm-core/nm-keyfile-reader.c:1400
-#, fuzzy, c-format
+#, c-format
 msgid "invalid char value (%i)"
-msgstr "недопустимый маршрут IPv4: «%s»"
+msgstr "недопустимое символьное значение (%i)"
 
 #: ../libnm-core/nm-keyfile-reader.c:1423
-#, fuzzy, c-format
+#, c-format
 msgid "invalid int64 value (%s)"
-msgstr "недопустимый параметр «%s» или его значение «%s»"
+msgstr "недопустимое значение int64 (%s)"
 
 #: ../libnm-core/nm-keyfile-reader.c:1482
 #, c-format
 msgid "too large FLAGS property '%s' (%llu)"
-msgstr ""
+msgstr "слишком большое значение свойства FLAGS «%s» (%llu)"
 
 #: ../libnm-core/nm-keyfile-reader.c:1495
-#, fuzzy, c-format
+#, c-format
 msgid "unhandled setting property type '%s'"
-msgstr "Ошибка <параметр>.<свойство>: «%s»."
+msgstr "необрабатываемый тип свойства параметра «%s»"
 
 #: ../libnm-core/nm-keyfile-reader.c:1526
-#, fuzzy, c-format
+#, c-format
 msgid "invalid setting name '%s'"
-msgstr "Ошибка. Недопустимое значение параметра: %s\n"
+msgstr "недопустимое название параметра «%s»"
 
 #: ../libnm-core/nm-setting-8021x.c:414
-#, fuzzy
 msgid "data missing"
-msgstr "свойство не определено"
+msgstr "отсутствуют данные"
 
 #: ../libnm-core/nm-setting-8021x.c:448
 msgid "binary data missing"
-msgstr ""
+msgstr "отсутствуют двоичные данные"
 
 #: ../libnm-core/nm-setting-8021x.c:465
 msgid "file:// URI not NUL terminated"
-msgstr ""
+msgstr "URI-адрес file:// не заканчивается на NUL"
 
 #: ../libnm-core/nm-setting-8021x.c:474
 msgid "file:// URI is empty"
-msgstr ""
+msgstr "Пустой URI-адрес file://"
 
 #: ../libnm-core/nm-setting-8021x.c:482
-#, fuzzy
 msgid "file:// URI is not valid UTF-8"
-msgstr "Недопустимый индекс «%s»."
+msgstr "URI-адрес file:// не использует кодировку UTF-8"
 
 #: ../libnm-core/nm-setting-8021x.c:681 ../libnm-util/nm-setting-8021x.c:639
 msgid "CA certificate must be in X.509 format"
-msgstr ""
+msgstr "Сертификат центра сертификации должен быть в формате X.509"
 
 #: ../libnm-core/nm-setting-8021x.c:1012 ../libnm-core/nm-setting-8021x.c:1276
 #: ../libnm-core/nm-setting-8021x.c:1612 ../libnm-util/nm-setting-8021x.c:957
 #: ../libnm-util/nm-setting-8021x.c:1220 ../libnm-util/nm-setting-8021x.c:1543
-#, fuzzy
 msgid "invalid certificate format"
-msgstr "Ошибка инициализации данных сертификата: %s"
+msgstr "недействительный формат сертификата"
 
 #: ../libnm-core/nm-setting-8021x.c:1895 ../libnm-util/nm-setting-8021x.c:1812
-#, fuzzy
 msgid "invalid private key"
-msgstr "недопустимый шлюз «%s»"
+msgstr "недействительный закрытый ключ"
 
 #: ../libnm-core/nm-setting-8021x.c:2207 ../libnm-util/nm-setting-8021x.c:2123
-#, fuzzy
 msgid "invalid phase2 private key"
-msgstr "Не удалось расшифровать личный ключ."
+msgstr "недействительный закрытый ключ фазы 2"
 
 #: ../libnm-core/nm-setting-8021x.c:2418 ../libnm-core/nm-setting-8021x.c:2435
 #: ../libnm-core/nm-setting-8021x.c:2466 ../libnm-core/nm-setting-8021x.c:2483
@@ -7674,9 +8241,10 @@ msgstr "Не удалось расшифровать личный ключ."
 #: ../libnm-core/nm-setting-8021x.c:2591 ../libnm-core/nm-setting-adsl.c:196
 #: ../libnm-core/nm-setting-cdma.c:148 ../libnm-core/nm-setting-cdma.c:157
 #: ../libnm-core/nm-setting-connection.c:844
-#: ../libnm-core/nm-setting-connection.c:887 ../libnm-core/nm-setting-gsm.c:281
-#: ../libnm-core/nm-setting-gsm.c:338 ../libnm-core/nm-setting-gsm.c:375
-#: ../libnm-core/nm-setting-gsm.c:384 ../libnm-core/nm-setting-ip-config.c:2193
+#: ../libnm-core/nm-setting-connection.c:887
+#: ../libnm-core/nm-setting-gsm.c:281 ../libnm-core/nm-setting-gsm.c:338
+#: ../libnm-core/nm-setting-gsm.c:375 ../libnm-core/nm-setting-gsm.c:384
+#: ../libnm-core/nm-setting-ip-config.c:2174
 #: ../libnm-core/nm-setting-ip4-config.c:198
 #: ../libnm-core/nm-setting-ip4-config.c:205
 #: ../libnm-core/nm-setting-pppoe.c:149 ../libnm-core/nm-setting-pppoe.c:158
@@ -7692,8 +8260,9 @@ msgstr "Не удалось расшифровать личный ключ."
 #: ../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-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:170 ../libnm-util/nm-setting-pppoe.c:179
 #: ../libnm-util/nm-setting-vpn.c:432 ../libnm-util/nm-setting-vpn.c:442
@@ -7711,17 +8280,17 @@ msgid "has to match '%s' property for PKCS#12"
 msgstr "должно соответствовать свойству «%s» для PKCS#12"
 
 #: ../libnm-core/nm-setting-8021x.c:2723
-#, fuzzy, c-format
+#, c-format
 msgid "certificate is invalid: %s"
-msgstr "неверное свойство"
+msgstr "недействительный сертификат: %s"
 
 #: ../libnm-core/nm-setting-8021x.c:2758
 #: ../libnm-core/nm-setting-bluetooth.c:129
 #: ../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:211
-#: ../libnm-core/nm-setting-ip6-config.c:222
+#: ../libnm-core/nm-setting-ip6-config.c:188
+#: ../libnm-core/nm-setting-ip6-config.c:199
 #: ../libnm-core/nm-setting-olpc-mesh.c:149
 #: ../libnm-core/nm-setting-wimax.c:144 ../libnm-core/nm-setting-wired.c:665
 #: ../libnm-core/nm-setting-wired.c:675
@@ -7759,21 +8328,23 @@ msgstr "неверное свойство"
 #: ../libnm-core/nm-setting-8021x.c:2783 ../libnm-core/nm-setting-8021x.c:2793
 #: ../libnm-core/nm-setting-8021x.c:2803 ../libnm-core/nm-setting-8021x.c:2813
 #: ../libnm-core/nm-setting-8021x.c:2823 ../libnm-core/nm-setting-adsl.c:208
-#: ../libnm-core/nm-setting-adsl.c:220 ../libnm-core/nm-setting-bluetooth.c:146
+#: ../libnm-core/nm-setting-adsl.c:220
+#: ../libnm-core/nm-setting-bluetooth.c:146
 #: ../libnm-core/nm-setting-wireless-security.c:870
 #: ../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-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-bluetooth.c:168
-#, fuzzy, c-format
+#, c-format
 msgid "'%s' connection requires '%s' or '%s' setting"
-msgstr "требует определения «%s» или  «%s»"
+msgstr "соединение «%s» требует настройки параметра  «%s» или  «%s»"
 
 #: ../libnm-core/nm-setting-bond.c:485 ../libnm-util/nm-setting-bond.c:502
 #, c-format
@@ -7834,19 +8405,19 @@ msgid "'%s' is not a valid IPv4 address for '%s' option"
 msgstr "Недопустимый адрес IPv4 («%s») для «%s»."
 
 #: ../libnm-core/nm-setting-bond.c:676 ../libnm-util/nm-setting-bond.c:682
-#, fuzzy, c-format
+#, c-format
 msgid "'%s' option is only valid with mode '%s'"
-msgstr "Параметр «%s» действителен только для «%s=%s»."
+msgstr "параметр «%s» действителен только в режиме «%s»"
 
 #: ../libnm-core/nm-setting-bond.c:687
 #, c-format
 msgid "'%s' and '%s' cannot have different values"
-msgstr ""
+msgstr "«%s» и «%s» не могут иметь разные значения"
 
 #: ../libnm-core/nm-setting-bond.c:703
-#, fuzzy, c-format
+#, c-format
 msgid "'%s' option should be string"
-msgstr "Пустой параметр: «%s»"
+msgstr "параметр «%s» должен содержать строку"
 
 #: ../libnm-core/nm-setting-bridge-port.c:124
 #: ../libnm-core/nm-setting-bridge-port.c:136
@@ -7857,18 +8428,20 @@ msgid "'%d' is not a valid value for the property (should be <= %d)"
 msgstr "Недопустимое значение свойства: «%d» (должно быть <= %d)."
 
 #: ../libnm-core/nm-setting-bridge-port.c:154
-#: ../libnm-core/nm-setting-team-port.c:109
-#, fuzzy, c-format
+#: ../libnm-core/nm-setting-team-port.c:97
+#, c-format
 msgid "missing setting"
-msgstr "требует определения «%s» или  «%s»"
+msgstr "пропущен параметр"
 
 #: ../libnm-core/nm-setting-bridge-port.c:165
-#: ../libnm-core/nm-setting-team-port.c:120
+#: ../libnm-core/nm-setting-team-port.c:108
 #, c-format
 msgid ""
 "A connection with a '%s' setting must have the slave-type set to '%s'. "
 "Instead it is '%s'"
 msgstr ""
+"Соединение с параметром «%s» должно иметь тип подчиненности «%s» (обнаружено "
+" «%s»)"
 
 #: ../libnm-core/nm-setting-bridge.c:227 ../libnm-util/nm-setting-bridge.c:269
 #, c-format
@@ -7883,47 +8456,48 @@ msgid "is not a valid MAC address"
 msgstr "недопустимый MAC-адрес"
 
 #: ../libnm-core/nm-setting-connection.c:816
-#, fuzzy, c-format
+#, c-format
 msgid "setting required for connection of type '%s'"
-msgstr "Не удалось открыть окно редактора для соединения  «%s» типа  «%s»."
+msgstr "параметр обязателен для типа соединения  «%s»"
 
 #: ../libnm-core/nm-setting-connection.c:897
-#, fuzzy, c-format
+#, c-format
 msgid "connection type '%s' is not valid"
-msgstr "Недопустимый индекс  «%s»."
+msgstr "недопустимый тип соединения «%s»"
 
 #: ../libnm-core/nm-setting-connection.c:932
 #: ../libnm-util/nm-setting-connection.c:877
-#, fuzzy, c-format
+#, c-format
 msgid "Unknown slave type '%s'"
-msgstr "Неизвестный уровень журналирования «%s»"
+msgstr "неизвестный тип подчиненного соединения: «%s»"
 
 #: ../libnm-core/nm-setting-connection.c:942
 #: ../libnm-util/nm-setting-connection.c:887
-#, fuzzy, c-format
+#, c-format
 msgid "Slave connections need a valid '%s' property"
-msgstr "Сбой службы общего подключения"
+msgstr "Подчиненные соединения должны иметь действительное свойство  «%s»"
 
 #: ../libnm-core/nm-setting-connection.c:963
 #: ../libnm-util/nm-setting-connection.c:897
-#, fuzzy, c-format
+#, c-format
 msgid "Cannot set '%s' without '%s'"
-msgstr "не сохранено,"
+msgstr " «%s» не может быть настраиваться без  «%s»"
 
 #: ../libnm-core/nm-setting-connection.c:977
-#, fuzzy, c-format
+#, c-format
 msgid "metered value %d is not valid"
-msgstr "Недействительный UUID:  «%s»"
+msgstr "недействительное лимитное значение %d"
 
 #: ../libnm-core/nm-setting-connection.c:998
 #, c-format
 msgid "property type should be set to '%s'"
-msgstr ""
+msgstr "свойство должно иметь тип «%s»"
 
 #: ../libnm-core/nm-setting-connection.c:1013
-#, fuzzy, c-format
+#, c-format
 msgid "slave-type '%s' requires a '%s' setting in the connection"
-msgstr "требует наличия  «%s» в определении соединения"
+msgstr ""
+"для подчиненного соединения типа  «%s» необходимо определить параметр «%s»"
 
 #: ../libnm-core/nm-setting-connection.c:1023
 #, c-format
@@ -7931,6 +8505,8 @@ msgid ""
 "Detect a slave connection with '%s' set and a port type '%s'. '%s' should be "
 "set to '%s'"
 msgstr ""
+"Определить подчиненное соединение с установленным «%s» и типом порта  «%s».  "
+"«%s» должно иметь значение  «%s»."
 
 #: ../libnm-core/nm-setting-dcb.c:522 ../libnm-util/nm-setting-dcb.c:594
 msgid "flags invalid"
@@ -7978,14 +8554,12 @@ msgid "'%s' length is invalid (should be 5 or 6 digits)"
 msgstr "«%s» должно содержать 5-6 цифр"
 
 #: ../libnm-core/nm-setting-gsm.c:397
-#, fuzzy
 msgid "property is empty or wrong size"
-msgstr "пустое свойство"
+msgstr "свойство пустое или имеет неверный размер"
 
 #: ../libnm-core/nm-setting-gsm.c:407
-#, fuzzy
 msgid "property must contain only digits"
-msgstr "свойство не может быть изменено"
+msgstr "свойство может содержать только цифры"
 
 #: ../libnm-core/nm-setting-infiniband.c:217
 #: ../libnm-util/nm-setting-infiniband.c:231
@@ -8000,7 +8574,7 @@ msgstr "При определении родительского интерфе�
 #: ../libnm-core/nm-setting-infiniband.c:235
 #: ../libnm-util/nm-setting-infiniband.c:249
 msgid "InfiniBand P_Key connection did not specify parent interface name"
-msgstr "InfiniBand P_Key не содержит имя родительского интерфеса"
+msgstr "InfiniBand P_Key не содержит имени родительского интерфеса"
 
 #: ../libnm-core/nm-setting-infiniband.c:271
 #: ../libnm-util/nm-setting-infiniband.c:285
@@ -8009,105 +8583,101 @@ msgid ""
 "interface name of software infiniband device must be '%s' or unset (instead "
 "it is '%s')"
 msgstr ""
+"интерфейс программного устройства InfiniBand может иметь имя  «%s» или "
+"оставаться пустым (а не  «%s»)"
 
 #: ../libnm-core/nm-setting-infiniband.c:286
 #, c-format
 msgid "mtu for transport mode '%s' can be at most %d but it is %d"
-msgstr ""
+msgstr "mtu транспортного режима  «%s» не может превышать %d (обнаружено %d)"
 
 #: ../libnm-core/nm-setting-ip-config.c:133
-#, fuzzy, c-format
+#, c-format
 msgid "Missing IPv4 address"
-msgstr "недопустимый адрес IPv4: «%s»"
+msgstr "Отсутствует адрес IPv4"
 
 #: ../libnm-core/nm-setting-ip-config.c:133
-#, fuzzy, c-format
+#, c-format
 msgid "Missing IPv6 address"
-msgstr "недопустимый адрес IPv6: «%s»"
+msgstr "Отсутствует адрес IPv6"
 
 #: ../libnm-core/nm-setting-ip-config.c:138
-#, fuzzy, c-format
+#, c-format
 msgid "Invalid IPv4 address '%s'"
-msgstr "недопустимый адрес IPv4: «%s»"
+msgstr "Недопустимый адрес IPv4: «%s»"
 
 #: ../libnm-core/nm-setting-ip-config.c:138
-#, fuzzy, c-format
+#, c-format
 msgid "Invalid IPv6 address '%s'"
-msgstr "недопустимый адрес IPv6: «%s»"
+msgstr "Недопустимый адрес IPv6: «%s»"
 
 #: ../libnm-core/nm-setting-ip-config.c:153
-#, fuzzy, c-format
+#, c-format
 msgid "Invalid IPv4 address prefix '%u'"
-msgstr "недопустимый адрес IPv4: «%s»"
+msgstr "Недопустимый префикс адреса IPv4: «%u»"
 
 #: ../libnm-core/nm-setting-ip-config.c:153
-#, fuzzy, c-format
+#, c-format
 msgid "Invalid IPv6 address prefix '%u'"
-msgstr "недопустимый адрес IPv6: «%s»"
+msgstr "Недопустимый префикс адреса IPv6: «%u»"
 
 #: ../libnm-core/nm-setting-ip-config.c:168
-#, fuzzy, c-format
+#, c-format
 msgid "Invalid routing metric '%s'"
-msgstr "недопустимая метрика «%s»"
+msgstr "Недопустимая метрика маршрутизации: «%s»"
 
-#: ../libnm-core/nm-setting-ip-config.c:2206
-#, fuzzy, c-format
+#: ../libnm-core/nm-setting-ip-config.c:2187
+#, c-format
 msgid "%d. DNS server address is invalid"
-msgstr "%d. Неверный адрес IPv4"
+msgstr "%d. Неверный адрес DNS-сервера"
 
-#: ../libnm-core/nm-setting-ip-config.c:2222
-#, fuzzy, c-format
+#: ../libnm-core/nm-setting-ip-config.c:2203
+#, c-format
 msgid "%d. IP address is invalid"
-msgstr "%d. Неверный адрес IPv4"
+msgstr "%d. Неверный IP-адрес"
 
-#: ../libnm-core/nm-setting-ip-config.c:2234
-#, fuzzy, c-format
+#: ../libnm-core/nm-setting-ip-config.c:2215
+#, c-format
 msgid "%d. IP address has 'label' property with invalid type"
-msgstr "%d. Адрес IPv4 содержит недопустимый префикс"
+msgstr "%d. IP-адрес содержит свойство  «label» недопустимого типа"
 
-#: ../libnm-core/nm-setting-ip-config.c:2243
-#, fuzzy, c-format
+#: ../libnm-core/nm-setting-ip-config.c:2224
+#, c-format
 msgid "%d. IP address has invalid label '%s'"
-msgstr "%d. Адрес IPv4 содержит недопустимый префикс"
+msgstr "%d. IP-адрес содержит неверную метку «%s»"
 
-#: ../libnm-core/nm-setting-ip-config.c:2257
+#: ../libnm-core/nm-setting-ip-config.c:2238
 msgid "gateway cannot be set if there are no addresses configured"
-msgstr ""
+msgstr "шлюз не может быть настроен, если заданы адреса"
 
-#: ../libnm-core/nm-setting-ip-config.c:2266
-#, fuzzy
+#: ../libnm-core/nm-setting-ip-config.c:2247
 msgid "gateway is invalid"
-msgstr "неверное свойство"
+msgstr "неверный шлюз"
 
-#: ../libnm-core/nm-setting-ip-config.c:2280
+#: ../libnm-core/nm-setting-ip-config.c:2261
 #, c-format
 msgid "%d. route is invalid"
 msgstr "%d. Неверный маршрут"
 
-#: ../libnm-core/nm-setting-ip-config.c:2289
+#: ../libnm-core/nm-setting-ip-config.c:2270
 #, c-format
 msgid "%d. route cannot be a default route"
-msgstr ""
-
-#: ../libnm-core/nm-setting-ip-config.c:2300
-#, fuzzy, c-format
-msgid "a gateway is incompatible with '%s'"
-msgstr " «%s=%s» несовместимо с «%s > 0»"
+msgstr "%d. Нельзя выбрать маршрут по умолчанию"
 
 #: ../libnm-core/nm-setting-ip4-config.c:143
-#: ../libnm-core/nm-setting-ip6-config.c:167
+#: ../libnm-core/nm-setting-ip6-config.c:144
 #: ../libnm-util/nm-setting-ip4-config.c:879
 #: ../libnm-util/nm-setting-ip6-config.c:843
-#, fuzzy, c-format
+#, c-format
 msgid "this property cannot be empty for '%s=%s'"
-msgstr "это свойство не может использоваться для «%s=%s»"
+msgstr "это свойство не может быть пустым для «%s=%s»"
 
 #: ../libnm-core/nm-setting-ip4-config.c:155
 #: ../libnm-core/nm-setting-ip4-config.c:165
 #: ../libnm-core/nm-setting-ip4-config.c:177
-#: ../libnm-core/nm-setting-ip6-config.c:179
-#: ../libnm-core/nm-setting-ip6-config.c:189
-#: ../libnm-core/nm-setting-ip6-config.c:199
+#: ../libnm-core/nm-setting-ip6-config.c:156
+#: ../libnm-core/nm-setting-ip6-config.c:166
+#: ../libnm-core/nm-setting-ip6-config.c:176
 #: ../libnm-util/nm-setting-ip4-config.c:891
 #: ../libnm-util/nm-setting-ip4-config.c:901
 #: ../libnm-util/nm-setting-ip4-config.c:913
@@ -8116,34 +8686,22 @@ msgstr "это свойство не может использоваться д�
 #: ../libnm-util/nm-setting-ip6-config.c:875
 #, c-format
 msgid "this property is not allowed for '%s=%s'"
-msgstr "это свойство не может использоваться для «%s=%s»"
+msgstr "это свойство не разрешено для «%s=%s»"
 
 #: ../libnm-core/nm-setting-ip4-config.c:214
-#, fuzzy, c-format
+#, c-format
 msgid "'%s' is not a valid FQDN"
-msgstr "Недействительный UUID: «%s»"
+msgstr "«%s»: недействительное полное имя (FQDN)"
 
 #: ../libnm-core/nm-setting-ip4-config.c:223
 msgid "property cannot be set when dhcp-hostname is also set"
 msgstr ""
-
-#: ../libnm-core/nm-setting-ip6-config.c:237
-#, fuzzy
-msgid "value is not a valid token"
-msgstr "Недействительный UUID:  «%s»"
-
-#: ../libnm-core/nm-setting-ip6-config.c:248
-msgid "only makes sense with EUI64 address generation mode"
-msgstr ""
-
-#: ../libnm-core/nm-setting-ip6-config.c:260
-msgid "token is not in canonical form"
-msgstr ""
+"свойство не может быть настроено, если определено значение dhcp-hostname"
 
 #: ../libnm-core/nm-setting-ip-tunnel.c:318
-#, fuzzy, c-format
+#, 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-macvlan.c:167 ../libnm-core/nm-setting-vlan.c:647
@@ -8154,23 +8712,24 @@ msgstr "«%s» может содержать UUID или имя интерфей
 
 #: ../libnm-core/nm-setting-ip-tunnel.c:341
 #: ../libnm-core/nm-setting-ip-tunnel.c:352
-#, fuzzy, c-format
+#, c-format
 msgid "'%s' is not a valid IPv%c address"
-msgstr "Недействительный MAC-адрес: «%s»"
+msgstr "Недействительный адрес IPv%2$c: «%1$s»"
 
 #: ../libnm-core/nm-setting-ip-tunnel.c:366
 msgid "tunnel keys can only be specified for GRE tunnels"
-msgstr ""
+msgstr "ключи туннеля могут определяться только для туннелей GRE"
 
 #: ../libnm-core/nm-setting-ip-tunnel.c:379
 #: ../libnm-core/nm-setting-ip-tunnel.c:395
-#, fuzzy, c-format
+#, c-format
 msgid "'%s' is not a valid tunnel key"
-msgstr "Недопустимый канал «%s»."
+msgstr "Недопустимый ключ туннеля: «%s»"
 
 #: ../libnm-core/nm-setting-ip-tunnel.c:407
 msgid "a fixed TTL is allowed only when path MTU discovery is enabled"
 msgstr ""
+"выбор фиксированного TTL возможен только при включении обнаружения MTU"
 
 #: ../libnm-core/nm-setting-macvlan.c:181 ../libnm-core/nm-setting-vlan.c:661
 #: ../libnm-util/nm-setting-vlan.c:580
@@ -8180,7 +8739,7 @@ msgstr "Не определено свойство и «%s:%s»"
 
 #: ../libnm-core/nm-setting-macvlan.c:192
 msgid "non promiscuous operation is allowed only in passthru mode"
-msgstr ""
+msgstr "разнородные действия возможны только в сквозном режиме"
 
 #: ../libnm-core/nm-setting-olpc-mesh.c:130
 #: ../libnm-core/nm-setting-wireless.c:739
@@ -8210,19 +8769,19 @@ msgstr ""
 "значение"
 
 #: ../libnm-core/nm-setting-tun.c:187
-#, fuzzy, c-format
+#, c-format
 msgid "'%u': invalid mode"
-msgstr "«%s» не является допустимым режимом Wi-Fi"
+msgstr "«%u»: неверный режим"
 
 #: ../libnm-core/nm-setting-tun.c:197
-#, fuzzy, c-format
+#, c-format
 msgid "'%s': invalid user ID"
-msgstr "Недействительный UUID: «%s»"
+msgstr "«%s»: неверный идентификатор пользователя"
 
 #: ../libnm-core/nm-setting-tun.c:208
-#, fuzzy, c-format
+#, c-format
 msgid "'%s': invalid group ID"
-msgstr "Недействительный UUID: «%s»"
+msgstr "«%s»: недействительный идентификатор группы"
 
 #: ../libnm-core/nm-setting-vlan.c:636 ../libnm-util/nm-setting-vlan.c:556
 #, c-format
@@ -8233,56 +8792,58 @@ msgstr "Значение «%s» не соответствует «%s=%s»"
 #, c-format
 msgid "the vlan id must be in range 0-4094 but is %u"
 msgstr ""
+"идентификатор VLAN может содержать число в диапазоне от 0 до 4094 "
+"(обнаружено %u)"
 
 #: ../libnm-core/nm-setting-vlan.c:681 ../libnm-util/nm-setting-vlan.c:591
 msgid "flags are invalid"
 msgstr "неверные флаги"
 
 #: ../libnm-core/nm-setting-vpn.c:460
-#, fuzzy, c-format
+#, c-format
 msgid "secret was empty"
-msgstr "пустое свойство"
+msgstr "пустой пароль"
 
 #: ../libnm-core/nm-setting-vpn.c:490
 msgid "setting contained a secret with an empty name"
-msgstr ""
+msgstr "параметр содержит пароль с пустым именем"
 
 #: ../libnm-core/nm-setting-vpn.c:498
 #, c-format
 msgid "secret value was empty"
-msgstr ""
+msgstr "пустое значение пароля"
 
 #: ../libnm-core/nm-setting-vpn.c:545 ../libnm-core/nm-setting.c:1784
 msgid "not a secret property"
-msgstr ""
+msgstr "не является секретным свойством"
 
 #: ../libnm-core/nm-setting-vpn.c:551
 msgid "secret is not of correct type"
-msgstr ""
+msgstr "неверный тип секрета"
 
 #: ../libnm-core/nm-setting-vpn.c:586
-#, fuzzy, c-format
+#, c-format
 msgid "failed to convert value '%s' to uint"
-msgstr "Ошибка. Не удалось изменить значение  «%s»: %s\n"
+msgstr "не удалось преобразовать значение  «%s» в uint"
 
 #: ../libnm-core/nm-setting-vpn.c:594
 msgid "secret flags property not found"
-msgstr ""
+msgstr "свойство флагов секретов не обнаружено"
 
 #: ../libnm-core/nm-setting-vxlan.c:375
-#, fuzzy, c-format
+#, c-format
 msgid "'%s' is not a valid IP address"
-msgstr "Недействительный MAC-адрес: «%s»"
+msgstr "недействительный IP-адрес: «%s»"
 
 #: ../libnm-core/nm-setting-vxlan.c:388
-#, fuzzy, c-format
+#, c-format
 msgid "'%s' is not a valid IP%c address"
-msgstr "Недействительный MAC-адрес: «%s»"
+msgstr "недействительный адрес IP%2$c: «%1$s»"
 
 #: ../libnm-core/nm-setting-vxlan.c:415
 #, c-format
 msgid "%d is greater than local port max %d"
-msgstr ""
+msgstr "%d превышает максимально допустимый номер локального порта, %d"
 
 #: ../libnm-core/nm-setting-wired.c:619 ../libnm-util/nm-setting-wired.c:613
 #, c-format
@@ -8302,10 +8863,11 @@ msgstr "недопустимый параметр «%s» или его знач�
 #: ../libnm-core/nm-setting-wired.c:709
 msgid "Wake-on-LAN mode 'default' and 'ignore' are exclusive flags"
 msgstr ""
+"Флаги режима  Wake-on-LAN «default» и «ignore» являются взаимоисключающими"
 
 #: ../libnm-core/nm-setting-wired.c:718
 msgid "Wake-on-LAN password can only be used with magic packet mode"
-msgstr ""
+msgstr "Пароль Wake-on-LAN может использоваться только в режиме magic packet"
 
 #: ../libnm-core/nm-setting-wireless-security.c:882
 #: ../libnm-util/nm-setting-wireless-security.c:912
@@ -8357,214 +8919,197 @@ msgstr "«%s» требует установки свойства «%s»"
 #: ../libnm-core/nm-setting.c:837
 #, c-format
 msgid "duplicate property"
-msgstr ""
+msgstr "дублируемое свойство"
 
 #: ../libnm-core/nm-setting.c:865 ../libnm-core/nm-setting.c:912
 #, c-format
 msgid "can't set property of type '%s' from value of type '%s'"
 msgstr ""
+"свойство типа «%s» не может быть настроено на основании значения типа «%s»"
 
 #: ../libnm-core/nm-setting.c:884 ../libnm-core/nm-setting.c:898
-#, fuzzy, c-format
+#, c-format
 msgid "failed to set property: %s"
-msgstr "Ошибка. Не удалось установить свойство «%s»: %s\n"
+msgstr "не удалось установить свойство: %s"
 
 #: ../libnm-core/nm-setting.c:926
-#, fuzzy, c-format
+#, c-format
 msgid "can not set property: %s"
-msgstr "Ошибка. Не удалось установить свойство «%s»: %s\n"
+msgstr "свойство не может быть настроено: %s"
 
 #: ../libnm-core/nm-setting.c:942
-#, fuzzy, c-format
+#, c-format
 msgid "unknown property"
-msgstr "неизвестная ошибка"
+msgstr "неизвестное свойство"
 
 #: ../libnm-core/nm-setting.c:1682
 msgid "secret not found"
-msgstr ""
+msgstr "секрет не найден"
 
 #: ../libnm-core/nm-setting.c:1774
 msgid "secret is not set"
-msgstr ""
+msgstr "секрет не настроен"
 
-#: ../libnm-core/nm-utils.c:2445
-#, fuzzy, c-format
+#: ../libnm-core/nm-utils.c:2447
+#, c-format
 msgid "failed stat file %s: %s"
-msgstr "Ошибка. Не удалось изменить значение  «%s»: %s\n"
+msgstr "не удалось получить статические данные для файла %s: %s"
 
-#: ../libnm-core/nm-utils.c:2454
-#, fuzzy, c-format
+#: ../libnm-core/nm-utils.c:2456
+#, c-format
 msgid "not a file (%s)"
-msgstr "Не удалось загрузить «%s»\n"
+msgstr "не является файлом (%s)"
 
-#: ../libnm-core/nm-utils.c:2465
-#, fuzzy, c-format
+#: ../libnm-core/nm-utils.c:2467
+#, c-format
 msgid "invalid file owner %d for %s"
-msgstr "неверное поле «%s»; допустимые поля: %s"
+msgstr "неверный владелец файла %d для %s"
 
-#: ../libnm-core/nm-utils.c:2476
+#: ../libnm-core/nm-utils.c:2478
 #, c-format
 msgid "file permissions for %s"
-msgstr ""
+msgstr "права доступа к файлам для %s"
 
-#: ../libnm-core/nm-utils.c:2486
+#: ../libnm-core/nm-utils.c:2488
 #, c-format
 msgid "reject %s"
-msgstr ""
+msgstr "отказать %s"
 
-#: ../libnm-core/nm-utils.c:2506
+#: ../libnm-core/nm-utils.c:2508
 #, c-format
 msgid "path is not absolute (%s)"
-msgstr ""
+msgstr "путь не является абсолютным (%s)"
 
-#: ../libnm-core/nm-utils.c:2520
+#: ../libnm-core/nm-utils.c:2522
 #, c-format
 msgid "Plugin file does not exist (%s)"
-msgstr ""
+msgstr "Файл модуля не существует (%s)"
 
-#: ../libnm-core/nm-utils.c:2528
-#, fuzzy, c-format
+#: ../libnm-core/nm-utils.c:2530
+#, c-format
 msgid "Plugin is not a valid file (%s)"
-msgstr "«%s» — недопустимое значение «%s» "
+msgstr "Модуль не является действительным файлом (%s)"
 
-#: ../libnm-core/nm-utils.c:2538
+#: ../libnm-core/nm-utils.c:2540
 #, c-format
 msgid "libtool archives are not supported (%s)"
-msgstr ""
+msgstr "архивы libtool не поддерживаются (%s)"
 
-#: ../libnm-core/nm-utils.c:2620 ../libnm-util/nm-utils.c:1803
+#: ../libnm-core/nm-utils.c:2622 ../libnm-util/nm-utils.c:1815
 #, c-format
 msgid "Could not find \"%s\" binary"
 msgstr "Не удалось найти бинарный файл «%s»"
 
-#: ../libnm-core/nm-vpn-editor-plugin.c:296
+#: ../libnm-core/nm-vpn-editor-plugin.c:124
 #, c-format
-msgid "cannot load plugin \"%s\": %s"
-msgstr ""
+msgid "cannot load plugin %s"
+msgstr "невозможно загрузить модуль %s"
 
-#: ../libnm-core/nm-vpn-editor-plugin.c:307
+#: ../libnm-core/nm-vpn-editor-plugin.c:150
 #, c-format
-msgid "failed to load nm_vpn_editor_plugin_factory() from %s (%s)"
-msgstr ""
+msgid "cannot load VPN plugin in '%s': missing plugin name"
+msgstr "невозможно загрузить модуль VPN в «%s»: отсутствует имя модуля"
 
-#: ../libnm-core/nm-vpn-editor-plugin.c:332
+#: ../libnm-core/nm-vpn-editor-plugin.c:157
 #, c-format
-msgid "unknown error initializing plugin %s"
-msgstr ""
+msgid "cannot load VPN plugin in '%s': invalid service name"
+msgstr "невозможно загрузить модуль VPN в «%s»: недопустимое имя службы"
 
-#: ../libnm-core/nm-vpn-editor-plugin.c:349
+#: ../libnm-core/nm-vpn-editor-plugin.c:173
 #, c-format
-msgid "cannot load VPN plugin in '%s': missing plugin name"
-msgstr ""
+msgid "unknown error initializing plugin %s"
+msgstr "неизвестная ошибка при инициализации модуля %s"
 
-#: ../libnm-core/nm-vpn-editor-plugin.c:358
+#: ../libnm-core/nm-vpn-editor-plugin.c:185
 #, c-format
-msgid "cannot load VPN plugin in '%s': invalid service name"
-msgstr ""
+msgid "failed to load nm_vpn_editor_plugin_factory() from %s (%s)"
+msgstr "не удалось загрузить nm_vpn_editor_plugin_factory() из %s (%s)"
 
-#: ../libnm-core/nm-vpn-editor-plugin.c:501
+#: ../libnm-core/nm-vpn-editor-plugin.c:292
 #, c-format
 msgid "the plugin does not support import capability"
-msgstr ""
+msgstr "модуль не поддерживает импорт"
 
-#: ../libnm-core/nm-vpn-editor-plugin.c:521
+#: ../libnm-core/nm-vpn-editor-plugin.c:312
 #, c-format
 msgid "the plugin does not support export capability"
-msgstr ""
+msgstr "модуль не поддерживает экспорт"
 
-#: ../libnm-core/nm-vpn-plugin-info.c:110
-#, fuzzy, c-format
+#: ../libnm-core/nm-vpn-plugin-info.c:109
+#, c-format
 msgid "missing filename"
-msgstr "пропущен параметр"
+msgstr "имя файла не указано"
 
-#: ../libnm-core/nm-vpn-plugin-info.c:118
+#: ../libnm-core/nm-vpn-plugin-info.c:117
 #, c-format
 msgid "filename must be an absolute path (%s)"
-msgstr ""
+msgstr "в качестве имени файла необходимо указать абсолютный путь (%s)"
 
-#: ../libnm-core/nm-vpn-plugin-info.c:127
+#: ../libnm-core/nm-vpn-plugin-info.c:126
 #, c-format
 msgid "filename has invalid format (%s)"
-msgstr ""
+msgstr "неверный формат имени файла (%s)"
 
-#: ../libnm-core/nm-vpn-plugin-info.c:450
+#: ../libnm-core/nm-vpn-plugin-info.c:383
 #, c-format
 msgid "there exists a conflicting plugin (%s) that has the same %s.%s value"
 msgstr ""
+"обнаружен конфликт с модулем (%s), который имеет такое же значение %s.%s "
 
-#: ../libnm-core/nm-vpn-plugin-info.c:488
+#: ../libnm-core/nm-vpn-plugin-info.c:421
 #, c-format
 msgid "there exists a conflicting plugin with the same name (%s)"
-msgstr ""
+msgstr "обнаружен конфликтный модуль с таким же именем (%s)"
 
-#: ../libnm-core/nm-vpn-plugin-info.c:1071
-#, fuzzy, c-format
+#: ../libnm-core/nm-vpn-plugin-info.c:740
+#, c-format
 msgid "missing \"plugin\" setting"
-msgstr "требует определения «%s» или  «%s»"
+msgstr "отсутствует параметр «plugin»"
 
-#: ../libnm-core/nm-vpn-plugin-info.c:1081
+#: ../libnm-core/nm-vpn-plugin-info.c:750
 #, c-format
 msgid "%s: don't retry loading plugin which already failed previously"
 msgstr ""
+"%s: не пытаться повторно загрузить модуль, который уже сталкивался с "
+"ошибками"
 
-#: ../libnm-core/nm-vpn-plugin-info.c:1175
+#: ../libnm-core/nm-vpn-plugin-info.c:842
 msgid "missing filename to load VPN plugin info"
-msgstr ""
+msgstr "отсутствует имя файла для загрузки информации о модуле VPN"
 
-#: ../libnm-core/nm-vpn-plugin-info.c:1187
+#: ../libnm-core/nm-vpn-plugin-info.c:854
 msgid "missing name for VPN plugin info"
-msgstr ""
+msgstr "отсутствует имя для получения информации о модуле VPN"
 
-#: ../libnm-core/nm-vpn-plugin-info.c:1196
+#: ../libnm-core/nm-vpn-plugin-info.c:863
 msgid "missing service for VPN plugin info"
-msgstr ""
+msgstr "отсутствует служба для получения информации о модуле VPN"
 
-#: ../libnm-glib/nm-device.c:1863 ../libnm/nm-device.c:1814
+#: ../libnm-glib/nm-device.c:1853 ../libnm/nm-device.c:1804
 msgid "Bluetooth"
 msgstr "Bluetooth"
 
-#: ../libnm-glib/nm-device.c:1865 ../libnm/nm-device.c:1816
-msgid "OLPC Mesh"
-msgstr "OLPC Mesh"
-
-#: ../libnm-glib/nm-device.c:1867 ../libnm/nm-device.c:1818
-msgid "WiMAX"
-msgstr "WiMAX"
-
-#: ../libnm-glib/nm-device.c:1881 ../libnm/nm-device.c:1832
-msgid "ADSL"
-msgstr "ADSL"
-
-#: ../libnm-glib/nm-device.c:1883 ../libnm/nm-device.c:1834
-#, fuzzy
+#: ../libnm-glib/nm-device.c:1873 ../libnm/nm-device.c:1824
 msgid "MACVLAN"
-msgstr "VLAN"
+msgstr "MACVLAN"
 
-#: ../libnm-glib/nm-device.c:1885 ../libnm/nm-device.c:1836
-msgid "VXLAN"
-msgstr ""
-
-#: ../libnm-glib/nm-device.c:1887 ../libnm/nm-device.c:1838
+#: ../libnm-glib/nm-device.c:1877 ../libnm/nm-device.c:1828
 msgid "IPTunnel"
-msgstr ""
-
-#: ../libnm-glib/nm-device.c:1889 ../libnm/nm-device.c:1840
-msgid "Tun"
-msgstr ""
+msgstr "IP-туннель"
 
-#: ../libnm-glib/nm-device.c:1891 ../libnm/nm-device.c:1842
+#: ../libnm-glib/nm-device.c:1881 ../libnm/nm-device.c:1832
 msgid "Veth"
-msgstr ""
+msgstr "Veth"
 
-#: ../libnm-glib/nm-device.c:1923 ../libnm/nm-device.c:1874
+#: ../libnm-glib/nm-device.c:1913 ../libnm/nm-device.c:1864
 msgid "Wired"
 msgstr "Проводное"
 
-#: ../libnm-glib/nm-device.c:1954 ../libnm/nm-device.c:1905
+#: ../libnm-glib/nm-device.c:1944 ../libnm/nm-device.c:1895
 msgid "PCI"
 msgstr "PCI"
 
-#: ../libnm-glib/nm-device.c:1956 ../libnm/nm-device.c:1907
+#: ../libnm-glib/nm-device.c:1946 ../libnm/nm-device.c:1897
 msgid "USB"
 msgstr "USB"
 
@@ -8573,9 +9118,9 @@ msgstr "USB"
 #. * "Ethernet"). You can change this to something like
 #. * "%2$s (%1$s)" if there's no grammatical way to combine
 #. * the strings otherwise.
-#.
-#: ../libnm-glib/nm-device.c:2052 ../libnm-glib/nm-device.c:2071
-#: ../libnm/nm-device.c:2001 ../libnm/nm-device.c:2020
+#. 
+#: ../libnm-glib/nm-device.c:2042 ../libnm-glib/nm-device.c:2061
+#: ../libnm/nm-device.c:1991 ../libnm/nm-device.c:2010
 #, c-format
 msgctxt "long device name"
 msgid "%s %s"
@@ -8588,12 +9133,12 @@ msgstr "Отключено через D-Bus"
 #: ../libnm-util/crypto_gnutls.c:84
 #, c-format
 msgid "Hash length too long (%d > %d)."
-msgstr ""
+msgstr "Длина хэша превышает максимально допустимую (%d > %d)."
 
 #: ../libnm-util/crypto_gnutls.c:115
-#, fuzzy, c-format
+#, 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
@@ -8632,24 +9177,24 @@ msgid "%d. route has invalid prefix"
 msgstr "%d. Маршрут содержит недопустимый префикс"
 
 #: ../libnm-util/nm-setting-ip6-config.c:910
-#, fuzzy, c-format
+#, c-format
 msgid "%d. IPv6 address is invalid"
-msgstr "%d. Неверный адрес IPv4"
+msgstr "%d. Неверный адрес IPv6"
 
 #: ../libnm-util/nm-setting-ip6-config.c:920
-#, fuzzy, c-format
+#, c-format
 msgid "%d. IPv6 address has invalid prefix"
-msgstr "%d. Адрес IPv4 содержит недопустимый префикс"
+msgstr "%d. Адрес IPv6 имеет недопустимый префикс"
 
 #: ../libnm-util/nm-setting-vpn.c:582
 #, c-format
 msgid "Failed to convert '%s' value '%s' to uint"
-msgstr ""
+msgstr "Не удалось преобразовать значение  «%s»  «%s» в uint"
 
 #: ../libnm-util/nm-setting-vpn.c:589
 #, c-format
 msgid "Secret flags property '%s' not found"
-msgstr ""
+msgstr "Свойство флагов секретов «%s» не найдено"
 
 #: ../libnm-util/nm-setting-wireless.c:807
 #, c-format
@@ -8657,83 +9202,76 @@ msgid "requires setting '%s' property"
 msgstr "требует определения свойства «%s»"
 
 #: ../libnm/nm-device-adsl.c:74
-#, fuzzy
 msgid "The connection was not an ADSL connection."
-msgstr "подключение (запуск второстепенных соединений)"
+msgstr "Это не соединение ADSL."
 
 #: ../libnm/nm-device-bond.c:112
-#, fuzzy
 msgid "The connection was not a bond connection."
-msgstr "подключение (запуск второстепенных соединений)"
+msgstr "Это не агрегированное соединение (bond)."
 
 #: ../libnm/nm-device-bridge.c:112
-#, fuzzy
 msgid "The connection was not a bridge connection."
-msgstr "подключение (запуск второстепенных соединений)"
+msgstr "Это не мостовое соединение."
 
 #: ../libnm/nm-device-bt.c:137
-#, fuzzy, c-format
+#, c-format
 msgid "The connection was not a Bluetooth connection."
-msgstr "Для соединений Bluetooth доступен один дополнительный аргумент.\n"
+msgstr "Это не соединение Bluetooth."
 
 #: ../libnm/nm-device-bt.c:146
 msgid "Invalid device Bluetooth address."
-msgstr ""
+msgstr "Неверный адрес устройства Bluetooth."
 
 #: ../libnm/nm-device-bt.c:153
 msgid "The Bluetooth addresses of the device and the connection didn't match."
-msgstr ""
+msgstr "Адреса Bluetooth устройства и соединения не совпадают."
 
 #: ../libnm/nm-device-bt.c:162
 msgid ""
 "The device is lacking Bluetooth capabilities required by the connection."
 msgstr ""
+"Устройство не поддерживает возможности Bluetooth, запрашиваемые этим "
+"соединением."
 
 #: ../libnm/nm-device-ethernet.c:207
-#, fuzzy
 msgid "The connection was not an Ethernet or PPPoE connection."
-msgstr ""
-"При настройке соединений PPPoE допускается использование четырех "
-"дополнительных аргументов.\n"
+msgstr "Это соединение не является соединением Ethernet или PPPoE."
 
 #: ../libnm/nm-device-ethernet.c:222
 msgid "The connection and device differ in S390 subchannels."
 msgstr ""
+"В каналах S390 обнаружены несоответствия между устройством и соединением."
 
 #: ../libnm/nm-device-ethernet.c:232 ../libnm/nm-device-infiniband.c:102
 #: ../libnm/nm-device-wifi.c:604 ../libnm/nm-device-wimax.c:326
-#, fuzzy
 msgid "Invalid device MAC address."
-msgstr "недопустимый MAC-адрес"
+msgstr "Неверный MAC-адрес устройства."
 
 #: ../libnm/nm-device-ethernet.c:237
 msgid "The MACs of the device and the connection do not match."
-msgstr ""
+msgstr "МАС-адреса устройства и соединения не совпадают."
 
 #: ../libnm/nm-device-ethernet.c:247
 #, c-format
 msgid "Invalid MAC in the blacklist: %s."
-msgstr ""
+msgstr "Неверный MAC-адрес в «черном» списке: %s"
 
 #: ../libnm/nm-device-ethernet.c:253
 #, c-format
 msgid "Device MAC (%s) is blacklisted by the connection."
-msgstr ""
+msgstr "MAC-адрес устройства (%s) был добавлен соединением в «черный» список."
 
 #: ../libnm/nm-device-generic.c:91
-#, fuzzy
 msgid "The connection was not a generic connection."
-msgstr "подключение (запуск второстепенных соединений)"
+msgstr "Это соединение не относится к общему типу."
 
 #: ../libnm/nm-device-generic.c:98
-#, fuzzy
 msgid "The connection did not specify an interface name."
-msgstr "InfiniBand P_Key не содержит имя родительского интерфеса"
+msgstr "Это соединение не определяет название интерфейса."
 
 #: ../libnm/nm-device-tun.c:209
-#, fuzzy
 msgid "The connection was not a tun connection."
-msgstr "соединение удалено"
+msgstr "Это соединение не является туннельным."
 
 #: ../libnm/nm-device-tun.c:218
 msgid "The mode of the device and the connection didn't match"
@@ -8741,118 +9279,112 @@ msgstr "Режим работы устройства не соответству
 
 #: ../libnm/nm-device-infiniband.c:94
 msgid "The connection was not an InfiniBand connection."
-msgstr "Это не соединение не относится к InfiniBand."
+msgstr "Это соединение не относится к InfiniBand."
 
 #: ../libnm/nm-device-infiniband.c:110 ../libnm/nm-device-wifi.c:611
 #: ../libnm/nm-device-wimax.c:333
 msgid "The MACs of the device and the connection didn't match."
-msgstr ""
+msgstr "МАС-адреса устройства и соединения не совпадают."
 
 #: ../libnm/nm-device-ip-tunnel.c:254
-#, fuzzy
 msgid "The connection was not an IP tunnel connection."
-msgstr "соединение удалено"
+msgstr "Соединение не является IP-туннелем."
 
 #: ../libnm/nm-device-macvlan.c:159
-#, fuzzy
 msgid "The connection was not a MAC-VLAN connection."
-msgstr "Для соединений «VLAN» доступно четыре дополнительных аргумента.\n"
+msgstr "Это соединение не относится к MAC-VLAN."
 
 #: ../libnm/nm-device-modem.c:120
-#, fuzzy
 msgid "The connection was not a modem connection."
-msgstr "соединение удалено"
+msgstr "Это соединение не является модемным подключением."
 
 #: ../libnm/nm-device-modem.c:128
-#, fuzzy
 msgid "The connection was not a valid modem connection."
-msgstr "подключение (запуск второстепенных соединений)"
+msgstr "Это соединение не является действительным модемным подключением."
 
 #: ../libnm/nm-device-modem.c:135
 msgid "The device is lacking capabilities required by the connection."
 msgstr ""
+"Устройство не поддерживает возможности, запрашиваемые этим соединением."
 
 #: ../libnm/nm-device-olpc-mesh.c:115
-#, fuzzy
 msgid "The connection was not an OLPC Mesh connection."
-msgstr "Для соединений «OLPC Mesh» доступно два дополнительных аргумента.\n"
+msgstr "Это соединение не является соединением OLPC Mesh."
 
-#: ../libnm/nm-device-team.c:139
-#, fuzzy
+#: ../libnm/nm-device-team.c:118
 msgid "The connection was not a team connection."
-msgstr "соединение удалено"
+msgstr "Это не агрегированное соединение (team)."
 
 #: ../libnm/nm-device-vlan.c:128
-#, fuzzy
 msgid "The connection was not a VLAN connection."
-msgstr "Для соединений «VLAN» доступно четыре дополнительных аргумента.\n"
+msgstr "Это соединение не является соединением VLAN."
 
 #: ../libnm/nm-device-vlan.c:135
 msgid "The VLAN identifiers of the device and the connection didn't match."
-msgstr ""
+msgstr "Идентификаторы VLAN устройства и соединения не совпадают."
 
 #: ../libnm/nm-device-vlan.c:148
 msgid "The hardware address of the device and the connection didn't match."
-msgstr ""
+msgstr "Аппаратные адреса устройства и соединения не совпадают."
 
 #: ../libnm/nm-device-vxlan.c:387
-#, fuzzy
 msgid "The connection was not a VXLAN connection."
-msgstr "Для соединений «VLAN» доступно четыре дополнительных аргумента.\n"
+msgstr "Это соединение не является соединением VXLAN."
 
 #: ../libnm/nm-device-vxlan.c:394
 msgid "The VXLAN identifiers of the device and the connection didn't match."
-msgstr ""
+msgstr "Идентификаторы VXLAN устройства и соединения не совпадают."
 
 #: ../libnm/nm-device-wifi.c:595
 msgid "The connection was not a Wi-Fi connection."
-msgstr ""
+msgstr "Это соединение не является соединением Wi-Fi."
 
 #: ../libnm/nm-device-wifi.c:631
 msgid "The device is lacking WPA capabilities required by the connection."
 msgstr ""
+"Устройство не поддерживает возможности WPA, запрашиваемые этим соединением."
 
 #: ../libnm/nm-device-wifi.c:638
-msgid "The device is lacking WPA2/RSN capabilities required by the connection."
+msgid ""
+"The device is lacking WPA2/RSN capabilities required by the connection."
 msgstr ""
+"Устройство не поддерживает возможности WPA2/RSN, запрашиваемые этим "
+"соединением."
 
 #: ../libnm/nm-device-wimax.c:317
-#, fuzzy
 msgid "The connection was not a WiMAX connection."
-msgstr "Для соединений «WiMax» доступен один дополнительный аргумент.\n"
+msgstr "Это соединение не относится к WiMAX."
 
-#: ../libnm/nm-device.c:2739
-#, fuzzy, c-format
+#: ../libnm/nm-device.c:2729
+#, c-format
 msgid "The connection was not valid: %s"
-msgstr "Ошибка. Недействительное соединение: %s\n"
+msgstr "Недействительное соединение: %s"
 
-#: ../libnm/nm-device.c:2748
+#: ../libnm/nm-device.c:2738
 #, c-format
 msgid "The interface names of the device and the connection didn't match."
-msgstr ""
+msgstr "Имена интерфейсов устройства и соединения не совпадают."
 
-#: ../libnm/nm-manager.c:867
-#, fuzzy
+#: ../libnm/nm-manager.c:874
 msgid "Active connection could not be attached to the device"
-msgstr "на устройстве нет активных соединений"
+msgstr "Активное соединение не может быть привязано к устройству."
 
-#: ../libnm/nm-manager.c:1091
-#, fuzzy
+#: ../libnm/nm-manager.c:1098
 msgid "Active connection removed before it was initialized"
-msgstr "Сведения об активном соединении"
+msgstr ""
+"Активное соединение было удалено прежде, чем оно было инициализировано"
 
 #: ../libnm/nm-object.c:1545 ../libnm/nm-object.c:1691
 msgid "Caller did not specify D-Bus path for object"
-msgstr ""
+msgstr "Функция вызова не указала путь D-Bus для объекта"
 
 #: ../libnm/nm-remote-settings.c:261
 msgid "Connection removed before it was initialized"
-msgstr ""
+msgstr "Соединение было удалено прежде, чем оно было инициализировано"
 
 #: ../libnm/nm-vpn-plugin-old.c:957 ../libnm/nm-vpn-service-plugin.c:978
-#, fuzzy
 msgid "No service name specified"
-msgstr "Ошибка. Интерфейс не определен."
+msgstr "Не указано имя службы."
 
 #: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:1
 msgid "Enable or disable system networking"
@@ -8864,17 +9396,6 @@ msgstr ""
 "Системная политика препятствует включению или отключению сетевой подсистемы"
 
 #: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:3
-#, fuzzy
-msgid "Reload NetworkManager configuration"
-msgstr "Показать версию NetworkManager и выйти"
-
-#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:4
-#, fuzzy
-msgid "System policy prevents reloading NetworkManager"
-msgstr ""
-"Системная политика препятствует включению или отключению сетевой подсистемы"
-
-#: ../policy/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)"
@@ -8882,190 +9403,201 @@ msgstr ""
 "Перевести NetworkManager в режим сна или пробудить его (должно "
 "использоваться только системой управления питанием)"
 
-#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:6
+#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:4
 msgid "System policy prevents putting NetworkManager to sleep or waking it up"
 msgstr ""
 "Системная политика не разрешает переводить NetworkManager в режим сна или "
 "пробуждать его"
 
-#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:7
+#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:5
 msgid "Enable or disable WiFi devices"
 msgstr "Включить или выключить устройства WiFi"
 
-#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:8
+#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:6
 msgid "System policy prevents enabling or disabling WiFi devices"
 msgstr "Системная политика запрещает включение и выключение WiFi устройств"
 
-#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:9
+#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:7
 msgid "Enable or disable mobile broadband devices"
 msgstr "Включить или выключить устройства широкополосных мобильных сетей"
 
-#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:10
+#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:8
 msgid "System policy prevents enabling or disabling mobile broadband devices"
 msgstr ""
 "Системная политика запрещает включение или выключение устройств "
 "широкополосной мобильной связи"
 
-#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:11
+#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:9
 msgid "Enable or disable WiMAX mobile broadband devices"
 msgstr "Включить или выключить устройства мобильных сетей WiMax"
 
-#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:12
+#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:10
 msgid ""
 "System policy prevents enabling or disabling WiMAX mobile broadband devices"
 msgstr ""
 "Системная политика запрещает включение или выключение устройств мобильной "
 "связи WiMAX"
 
-#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:13
+#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:11
 msgid "Allow control of network connections"
 msgstr "Разрешить контроль сетевых подключений"
 
-#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:14
+#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:12
 msgid "System policy prevents control of network connections"
 msgstr "Системная политика запрещает управление подключениями."
 
-#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:15
+#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:13
 msgid "Connection sharing via a protected WiFi network"
 msgstr "Совместное использование соединений в закрытой сети WiFi"
 
-#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:16
-msgid "System policy prevents sharing connections via a protected WiFi network"
+#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:14
+msgid ""
+"System policy prevents sharing connections via a protected WiFi network"
 msgstr ""
 "Системная политика запрещает совместное использование соединений в закрытой "
 "сети WiFi"
 
-#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:17
+#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:15
 msgid "Connection sharing via an open WiFi network"
 msgstr "Совместное использование соединений в открытой сети WiFi"
 
-#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:18
+#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:16
 msgid "System policy prevents sharing connections via an open WiFi network"
 msgstr ""
 "Системная политика запрещает совместное использование соединений в открытой "
 "сети WiFi"
 
-#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:19
+#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:17
 msgid "Modify personal network connections"
 msgstr "Редактировать личные настройки подключения"
 
-#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:20
+#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:18
 msgid "System policy prevents modification of personal network settings"
 msgstr "Системная политика запрещает изменение персональных настроек сети"
 
-#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:21
+#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:19
 msgid "Modify network connections for all users"
 msgstr "Изменить подключения доступные всем пользователям"
 
-#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:22
+#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:20
 msgid "System policy prevents modification of network settings for all users"
-msgstr "Системная политика запрещает изменение настроек для всех пользователей"
+msgstr ""
+"Системная политика запрещает изменение настроек для всех пользователей"
 
-#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:23
+#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:21
 msgid "Modify persistent system hostname"
 msgstr "Изменить постоянное имя узла компьютера"
 
-#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:24
+#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:22
 msgid "System policy prevents modification of the persistent system hostname"
 msgstr ""
 "Системная политика запрещает изменение постоянного имени узла компьютера"
 
-#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:25
-#, fuzzy
+#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:23
 msgid "Modify persistent global DNS configuration"
-msgstr "Текущая конфигурация nmcli:\n"
+msgstr "Изменить постоянную глобальную конфигурацию DNS"
 
-#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:26
-#, fuzzy
+#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:24
 msgid ""
 "System policy prevents modification of the persistent global DNS "
 "configuration"
 msgstr ""
-"Системная политика запрещает изменение постоянного имени узла компьютера"
+"Системная политика запрещает изменение постоянной глобальной конфигурации "
+"DNS"
 
-#: ../shared/nm-utils/nm-shared-utils.c:185
+#: ../shared/nm-shared-utils.c:208
 #, c-format
 msgid "object class '%s' has no property named '%s'"
-msgstr ""
+msgstr "класс объекта «%s» не содержит свойства «%s»"
 
-#: ../shared/nm-utils/nm-shared-utils.c:192
+#: ../shared/nm-shared-utils.c:215
 #, c-format
 msgid "property '%s' of object class '%s' is not writable"
-msgstr ""
+msgstr "свойство «%s» класса объекта «%s» недоступно  для записи"
 
-#: ../shared/nm-utils/nm-shared-utils.c:199
+#: ../shared/nm-shared-utils.c:222
 #, c-format
 msgid ""
 "construct property \"%s\" for object '%s' can't be set after construction"
 msgstr ""
+"формирование свойства «%s» для объекта «%s» не может быть настроено после "
+"сборки"
 
-#: ../shared/nm-utils/nm-shared-utils.c:207
+#: ../shared/nm-shared-utils.c:230
 #, 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:216
+#: ../shared/nm-shared-utils.c:239
 #, 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:227
+#: ../shared/nm-shared-utils.c:250
 #, c-format
 msgid ""
 "value \"%s\" of type '%s' is invalid or out of range for property '%s' of "
 "type '%s'"
 msgstr ""
+"значение «%s» с типом «%s» неверное или выходит за пределы диапазона для "
+"свойства «%s» с типом «%s»"
 
 #. Translators: the first %s is a prefix for the connection id, such
 #. * as "Wired Connection" or "VPN Connection". The %d is a number
 #. * that is combined with the first argument to create a unique
 #. * connection id.
-#: ../src/NetworkManagerUtils.c:112
+#: ../src/NetworkManagerUtils.c:111
 #, c-format
 msgctxt "connection id fallback"
 msgid "%s %d"
 msgstr "%s %d"
 
-#: ../src/main.c:165 ../src/main.c:300
-#, fuzzy, c-format
+#: ../src/main.c:220 ../src/main.c:358
+#, c-format
 msgid "Failed to read configuration: %s\n"
-msgstr "Не удалось прочитать конфигурацию: (%d) %s\n"
+msgstr "Не удалось прочитать конфигурацию: %s\n"
 
 #. Logging/debugging
-#: ../src/main.c:179 ../src/nm-iface-helper.c:298
+#: ../src/main.c:234 ../src/nm-iface-helper.c:298
 msgid "Print NetworkManager version and exit"
 msgstr "Показать версию NetworkManager и выйти"
 
-#: ../src/main.c:180 ../src/nm-iface-helper.c:299
+#: ../src/main.c:235 ../src/nm-iface-helper.c:299
 msgid "Don't become a daemon"
 msgstr "Не использовать в качестве службы"
 
-#: ../src/main.c:181 ../src/nm-iface-helper.c:301
+#: ../src/main.c:236 ../src/nm-iface-helper.c:301
 #, c-format
 msgid "Log level: one of [%s]"
 msgstr "Уровень журнала: одно значение из [%s]"
 
-#: ../src/main.c:183 ../src/nm-iface-helper.c:303
+#: ../src/main.c:238 ../src/nm-iface-helper.c:303
 #, c-format
 msgid "Log domains separated by ',': any combination of [%s]"
 msgstr ""
 "Домены журналов должны быть перечислены через запятую и могут содержать "
 "любую комбинацию [%s]. "
 
-#: ../src/main.c:185 ../src/nm-iface-helper.c:305
+#: ../src/main.c:240 ../src/nm-iface-helper.c:305
 msgid "Make all warnings fatal"
 msgstr "Сделать все предупреждения критическими"
 
-#: ../src/main.c:186
+#: ../src/main.c:241
 msgid "Specify the location of a PID file"
 msgstr "Укажите расположение PID файла"
 
-#: ../src/main.c:188
-#, fuzzy
+#: ../src/main.c:242
+msgid "State file location"
+msgstr "Расположение файла состояния"
+
+#: ../src/main.c:244
 msgid "Print NetworkManager configuration and exit"
-msgstr "Показать версию NetworkManager и выйти"
+msgstr "Показать настройки NetworkManager и выйти"
 
-#: ../src/main.c:198
+#: ../src/main.c:254
 msgid ""
 "NetworkManager monitors all network connections and automatically\n"
 "chooses the best connection to use.  It also allows the user to\n"
@@ -9073,92 +9605,95 @@ msgid ""
 "should associate with."
 msgstr ""
 "NetworkManager отслеживает все сетевые соединения и автоматически\n"
-"выбирает для использования наиболее подходящее соединение. А также "
-"позволяет\n"
-"пользователю задать беспроводным картам точки доступа, с которыми они \n"
-"должны ассоциироваться."
+"выбирает для использования наиболее подходящее соединение. \n"
+"А также позволяет пользователю задать беспроводные точки доступа, \n"
+"с которыми будут ассоциированы сетевые карты."
 
-#: ../src/main.c:285 ../src/main-utils.c:270 ../src/nm-iface-helper.c:393
+#: ../src/main.c:343 ../src/main-utils.c:269 ../src/nm-iface-helper.c:393
 #, c-format
 msgid "%s.  Please use --help to see a list of valid options.\n"
 msgstr "%s. Используйте --help для вывода списка допустимых параметров.\n"
 
-#: ../src/main.c:290 ../src/nm-iface-helper.c:398
+#: ../src/main.c:348 ../src/nm-iface-helper.c:398
 #, c-format
 msgid "Ignoring unrecognized log domain(s) '%s' passed on command line.\n"
 msgstr "Неизвестные домены журналов «%s» в строке команды. Пропускаются...\n"
 
-#: ../src/main.c:315
+#: ../src/main.c:373
 #, c-format
 msgid "Error in configuration file: %s.\n"
 msgstr "Ошибка в файле конфигурации: %s\n"
 
-#: ../src/main.c:320
+#: ../src/main.c:378
 #, c-format
 msgid "Ignoring unrecognized log domain(s) '%s' from config files.\n"
 msgstr ""
 "Неизвестный домен журналов «%s» в файле конфигурации. Пропускается...\n"
 
-#: ../src/main.c:331 ../src/nm-iface-helper.c:408
+#: ../src/main.c:389 ../src/nm-iface-helper.c:408
 #, c-format
 msgid "Could not daemonize: %s [error %u]\n"
 msgstr "Невозможно преобразовать в службу: %s [ошибка %u]\n"
 
-#: ../src/main-utils.c:98
+#: ../src/main-utils.c:99
 #, c-format
 msgid "Opening %s failed: %s\n"
 msgstr "При открытии %s произошла ошибка: %s\n"
 
-#: ../src/main-utils.c:104
+#: ../src/main-utils.c:105
 #, c-format
 msgid "Writing to %s failed: %s\n"
 msgstr "При записи в %s произошла ошибка: %s\n"
 
-#: ../src/main-utils.c:109
+#: ../src/main-utils.c:110
 #, c-format
 msgid "Closing %s failed: %s\n"
 msgstr "При закрытии %s произошла ошибка: %s\n"
 
-#: ../src/main-utils.c:144
-#, fuzzy, c-format
+#: ../src/main-utils.c:145
+#, c-format
 msgid "Cannot create '%s': %s"
-msgstr "не сохранено,"
+msgstr "Не удалось создать «%s»: %s"
 
-#: ../src/main-utils.c:196
+#: ../src/main-utils.c:197
 #, c-format
 msgid "%s is already running (pid %ld)\n"
 msgstr "%s уже запущен (pid %ld)\n"
 
-#: ../src/main-utils.c:206
+#: ../src/main-utils.c:207
 #, c-format
 msgid "You must be root to run %s!\n"
 msgstr "Вы должны быть суперпользователем для запуска %s\n"
 
-#: ../src/dhcp-manager/nm-dhcp-dhclient-utils.c:214
+#: ../src/dhcp-manager/nm-dhcp-dhclient-utils.c:213
 msgid "# Created by NetworkManager\n"
 msgstr "# Создано в NetworkManager\n"
 
-#: ../src/dhcp-manager/nm-dhcp-dhclient-utils.c:222
+#: ../src/dhcp-manager/nm-dhcp-dhclient-utils.c:220
 #, c-format
-msgid ""
-"# Merged from %s\n"
+msgid "# Merged from %s\n"
 "\n"
-msgstr ""
-"# Объединено с %s\n"
+msgstr "# Объединено с %s\n"
 "\n"
 
-#: ../src/devices/bluetooth/nm-bluez-device.c:200
+#: ../src/devices/adsl/nm-device-adsl.c:133
+msgid "ADSL connection"
+msgstr "Соединение ADSL"
+
+#: ../src/devices/bluetooth/nm-bluez-device.c:197
 #, c-format
 msgid "%s Network"
 msgstr "Сеть %s"
 
 #: ../src/devices/bluetooth/nm-device-bt.c:253
 msgid "PAN requested, but Bluetooth device does not support NAP"
-msgstr ""
+msgstr "Устройство Bluetooth не поддерживает запрашиваемые функции PAN"
 
 #: ../src/devices/bluetooth/nm-device-bt.c:263
 msgid "PAN connections cannot specify GSM, CDMA, or serial settings"
 msgstr ""
+"Соединения PAN не могут определять параметры GSM, CDMA и последовательных "
+"устройств"
 
 #: ../src/devices/bluetooth/nm-device-bt.c:276
 msgid "PAN connection"
@@ -9166,33 +9701,32 @@ msgstr "Соединение PAN"
 
 #: ../src/devices/bluetooth/nm-device-bt.c:283
 msgid "DUN requested, but Bluetooth device does not support DUN"
-msgstr ""
+msgstr "Устройство Bluetooth не поддерживает запрашиваемые функции DUN"
 
 #: ../src/devices/bluetooth/nm-device-bt.c:293
 msgid "DUN connection must include a GSM or CDMA setting"
-msgstr ""
+msgstr "Соединение DUN должно включать параметр GSM или CDMA"
 
 #: ../src/devices/bluetooth/nm-device-bt.c:303
-#: ../src/devices/wwan/nm-modem-broadband.c:687
+#: ../src/devices/wwan/nm-modem-broadband.c:655
 msgid "GSM connection"
 msgstr "Соединение GSM"
 
 #: ../src/devices/bluetooth/nm-device-bt.c:307
-#: ../src/devices/wwan/nm-modem-broadband.c:711
+#: ../src/devices/wwan/nm-modem-broadband.c:679
 msgid "CDMA connection"
 msgstr "Соединение CDMA"
 
 #: ../src/devices/bluetooth/nm-device-bt.c:315
 msgid "Unknown/unhandled Bluetooth connection type"
-msgstr ""
+msgstr "Неизвестный или необрабатываемый тип соединения Bluetooth"
 
 #: ../src/devices/bluetooth/nm-device-bt.c:336
-#: ../src/devices/nm-device-ethernet.c:1421
+#: ../src/devices/nm-device-ethernet.c:1415
 #: ../src/devices/nm-device-infiniband.c:193
-#: ../src/devices/wifi/nm-device-wifi.c:875
-#, fuzzy
+#: ../src/devices/wifi/nm-device-wifi.c:872
 msgid "connection does not match device"
-msgstr "Недопустимый индекс  «%s»."
+msgstr "соединение не соответствует устройству"
 
 #: ../src/devices/nm-device-bond.c:105
 msgid "Bond connection"
@@ -9200,335 +9734,349 @@ msgstr "Агрегированное (Bond) соединение"
 
 #: ../src/devices/nm-device-bridge.c:111
 msgid "Bridge connection"
-msgstr "Соединение типа «мост»"
+msgstr "Мостовое соединение"
 
-#: ../src/devices/nm-device-ethernet.c:1402
+#: ../src/devices/nm-device-ethernet.c:1396
 msgid "PPPoE connection"
 msgstr "Соединение PPPoE"
 
-#: ../src/devices/nm-device-ethernet.c:1402
+#: ../src/devices/nm-device-ethernet.c:1396
 msgid "Wired connection"
 msgstr "Проводное соединение"
 
-#: ../src/devices/nm-device-ethernet-utils.c:36
+#: ../src/devices/nm-device-ethernet-utils.c:39
 #, c-format
 msgid "Wired connection %d"
 msgstr "Проводное соединение %d"
 
-#: ../src/devices/nm-device-ip-tunnel.c:347
-#, fuzzy
+#: ../src/devices/nm-device-infiniband.c:175
+msgid "InfiniBand connection"
+msgstr "Соединение InfiniBand"
+
+#: ../src/devices/nm-device-ip-tunnel.c:346
 msgid "IP tunnel connection"
-msgstr "Соединение PAN"
+msgstr "Соединение IP-туннель"
 
-#: ../src/devices/nm-device-macvlan.c:436
-#, fuzzy
+#: ../src/devices/nm-device-macvlan.c:435
 msgid "MACVLAN connection"
-msgstr "Соединение VLAN"
+msgstr "Соединение MACVLAN"
 
 #: ../src/devices/nm-device-tun.c:129
-#, fuzzy
 msgid "TUN connection"
-msgstr "Подключение DUN %d"
+msgstr "Соединение TUN"
+
+#: ../src/devices/nm-device-vlan.c:457
+msgid "VLAN connection"
+msgstr "Соединение VLAN"
+
+#: ../src/devices/nm-device-vxlan.c:373
+msgid "VXLAN connection"
+msgstr "Соединение VXLAN"
 
-#: ../src/devices/team/nm-device-team.c:121
+#: ../src/devices/team/nm-device-team.c:115
 msgid "Team connection"
 msgstr "Агрегированное (Team) соединение"
 
 #: ../src/devices/wifi/nm-device-olpc-mesh.c:146
-#, fuzzy
 msgid "Mesh"
-msgstr "Mesh %d"
+msgstr "Mesh"
 
-#: ../src/devices/wifi/nm-device-wifi.c:842
+#: ../src/devices/wifi/nm-device-wifi.c:839
 msgid "WPA Ad-Hoc disabled due to kernel bugs"
-msgstr ""
+msgstr "WPA Ad-Hoc отключен из-за ошибок ядра"
 
 #: ../src/devices/wifi/nm-wifi-ap-utils.c:42
-#, fuzzy, c-format
+#, c-format
 msgid "%s is incompatible with static WEP keys"
-msgstr " «%s=%s» несовместимо с  «%s > 0»"
+msgstr " «%s» несовместим со статическими ключами WEP"
 
 #: ../src/devices/wifi/nm-wifi-ap-utils.c:76
-#, fuzzy
 msgid "LEAP authentication requires a LEAP username"
-msgstr "Для доступа к беспроводной сети требуется аутентификация"
+msgstr "Для аутентификации LEAP необходимо указать имя пользователя LEAP"
 
 #: ../src/devices/wifi/nm-wifi-ap-utils.c:86
 msgid "LEAP username requires 'leap' authentication"
-msgstr ""
+msgstr "Имя пользователя LEAP требует выбора аутентификации «leap»"
 
 #: ../src/devices/wifi/nm-wifi-ap-utils.c:99
 msgid "LEAP authentication requires IEEE 802.1x key management"
-msgstr ""
+msgstr "Для аутентификации LEAP потребуется управлять ключами IEEE 802.1x"
 
 #: ../src/devices/wifi/nm-wifi-ap-utils.c:119
 msgid "LEAP authentication is incompatible with Ad-Hoc mode"
-msgstr ""
+msgstr "Аутентификация LEAP несовместима с режимом Ad-Hoc"
 
 #: ../src/devices/wifi/nm-wifi-ap-utils.c:131
 msgid "LEAP authentication is incompatible with 802.1x setting"
-msgstr ""
+msgstr "Аутентификация LEAP несовместима с параметром  802.1x"
 
 #: ../src/devices/wifi/nm-wifi-ap-utils.c:153
 #, c-format
 msgid "a connection using '%s' authentication cannot use WPA key management"
 msgstr ""
+"соединение, использующее аутентификацию «%s», не может использовать "
+"управление ключами WPA"
 
 #: ../src/devices/wifi/nm-wifi-ap-utils.c:164
 #, c-format
 msgid "a connection using '%s' authentication cannot specify WPA protocols"
 msgstr ""
+"соединение, использующее аутентификацию «%s», не может использовать "
+"протоколы WPA"
 
 #: ../src/devices/wifi/nm-wifi-ap-utils.c:180
 #: ../src/devices/wifi/nm-wifi-ap-utils.c:197
 #, c-format
 msgid "a connection using '%s' authentication cannot specify WPA ciphers"
 msgstr ""
+"соединение, использующее аутентификацию «%s», не может использовать шифры "
+"WPA"
 
 #: ../src/devices/wifi/nm-wifi-ap-utils.c:209
 #, c-format
 msgid "a connection using '%s' authentication cannot specify a WPA password"
 msgstr ""
+"соединение, использующее аутентификацию «%s», не может использовать пароль "
+"WPA"
 
 #: ../src/devices/wifi/nm-wifi-ap-utils.c:240
-#, fuzzy
 msgid "Dynamic WEP requires an 802.1x setting"
-msgstr "Динамический WEP (802.1x)"
+msgstr "Динамический WEP требует установки параметра 802.1x"
 
 #: ../src/devices/wifi/nm-wifi-ap-utils.c:250
 #: ../src/devices/wifi/nm-wifi-ap-utils.c:278
 msgid "Dynamic WEP requires 'open' authentication"
-msgstr ""
+msgstr "Динамический WEP должен использовать аутентификацию «open»"
 
 #: ../src/devices/wifi/nm-wifi-ap-utils.c:265
 msgid "Dynamic WEP requires 'ieee8021x' key management"
-msgstr ""
+msgstr "Динамический WEP должен использовать управление ключами «ieee8021x»"
 
 #: ../src/devices/wifi/nm-wifi-ap-utils.c:312
 msgid "WPA-PSK authentication is incompatible with 802.1x"
-msgstr ""
+msgstr "Аутентификация WPA-PSK несовместима с 802.1x"
 
 #: ../src/devices/wifi/nm-wifi-ap-utils.c:322
-#, fuzzy
 msgid "WPA-PSK requires 'open' authentication"
-msgstr "Аутентификация проводного соединения 802.1X"
+msgstr "WPA-PSK должен использовать аутентификацию «open»"
 
 #: ../src/devices/wifi/nm-wifi-ap-utils.c:334
 msgid "WPA Ad-Hoc authentication requires an Ad-Hoc mode AP"
 msgstr ""
+"Аутентификация WPA Ad-Hoc работает только, если точка доступа использует "
+"режим Ad-Hoc"
 
 #: ../src/devices/wifi/nm-wifi-ap-utils.c:347
 msgid "WPA Ad-Hoc authentication requires 'wpa' protocol"
-msgstr ""
+msgstr "Аутентификация WPA Ad-Hoc должна использовать протокол «wpa»"
 
 #: ../src/devices/wifi/nm-wifi-ap-utils.c:359
-#, fuzzy
 msgid "WPA Ad-Hoc authentication requires 'none' pairwise cipher"
-msgstr "Для доступа к беспроводной сети требуется аутентификация"
+msgstr "Аутентификация WPA Ad-Hoc должна использовать парный шифр «none»"
 
 #: ../src/devices/wifi/nm-wifi-ap-utils.c:371
 msgid "WPA Ad-Hoc requires 'tkip' group cipher"
-msgstr ""
+msgstr "WPA Ad-Hoc должен использовать групповой шифр «tkip»"
 
 #: ../src/devices/wifi/nm-wifi-ap-utils.c:385
 msgid "Access point does not support PSK but setting requires it"
 msgstr ""
+"Точка доступа не поддерживает PSK, в то время как параметр предусматривает "
+"необходимость его использования"
 
 #: ../src/devices/wifi/nm-wifi-ap-utils.c:415
 msgid "WPA-EAP authentication requires an 802.1x setting"
-msgstr ""
+msgstr "Аутентификация WPA-LEAP требует установки параметра 802.1x"
 
 #: ../src/devices/wifi/nm-wifi-ap-utils.c:425
-#, fuzzy
 msgid "WPA-EAP requires 'open' authentication"
-msgstr "Аутентификация проводного соединения 802.1X"
+msgstr "WPA-EAP должен использовать аутентификацию «open»"
 
 #: ../src/devices/wifi/nm-wifi-ap-utils.c:436
 msgid "802.1x setting requires 'wpa-eap' key management"
-msgstr ""
+msgstr "802.1x должен использовать управление ключами «wpa-eap»"
 
 #: ../src/devices/wifi/nm-wifi-ap-utils.c:449
 msgid "Access point does not support 802.1x but setting requires it"
 msgstr ""
+"Точка доступа не поддерживает 802.1x, в то время как параметр "
+"предусматривает необходимость его использования"
 
 #: ../src/devices/wifi/nm-wifi-ap-utils.c:477
 msgid ""
 "Access point mode is Ad-Hoc but setting requires Infrastructure security"
 msgstr ""
+"Точка доступа использует режим Ad-Hoc, в то время как параметр "
+"предусматривает необходимость использования режима инфраструктуры"
 
 #: ../src/devices/wifi/nm-wifi-ap-utils.c:487
 msgid "Ad-Hoc mode is incompatible with 802.1x security"
-msgstr ""
+msgstr "Режим Ad-Hoc несовместим с защитой 802.1x"
 
 #: ../src/devices/wifi/nm-wifi-ap-utils.c:496
 msgid "Ad-Hoc mode is incompatible with LEAP security"
-msgstr ""
+msgstr "Режим Ad-Hoc несовместим с защитой LEAP"
 
 #: ../src/devices/wifi/nm-wifi-ap-utils.c:506
 msgid "Ad-Hoc mode requires 'open' authentication"
-msgstr ""
+msgstr "Режим Ad-Hoc должен использовать аутентификацию «open»"
 
 #: ../src/devices/wifi/nm-wifi-ap-utils.c:516
 msgid ""
 "Access point mode is Infrastructure but setting requires Ad-Hoc security"
 msgstr ""
+"Точка доступа использует режим инфраструктуры, в то время как параметр "
+"предусматривает необходимость использования Ad-Hoc"
 
 #: ../src/devices/wifi/nm-wifi-ap-utils.c:558
 #: ../src/devices/wifi/nm-wifi-ap-utils.c:588
 #, c-format
 msgid "connection does not match access point"
-msgstr ""
+msgstr "соединение не соответствует точке доступа"
 
 #: ../src/devices/wifi/nm-wifi-ap-utils.c:612
 msgid "Access point is unencrypted but setting specifies security"
 msgstr ""
+"Точка доступа не использует шифрование, в то время как параметр "
+"предусматривает необходимость защиты"
 
 #: ../src/devices/wifi/nm-wifi-ap-utils.c:701
 msgid ""
 "WPA authentication is incompatible with non-EAP (original) LEAP or Dynamic "
 "WEP"
 msgstr ""
+"Аутентификация WPA несовместима с LEAP без EAP (изначально) или динамическим "
+"WEP"
 
 #: ../src/devices/wifi/nm-wifi-ap-utils.c:711
 msgid "WPA authentication is incompatible with Shared Key authentication"
 msgstr ""
+"Аутентификация WPA несовместима с аутентификацией с использованием "
+"совместного ключа"
 
 #: ../src/devices/wifi/nm-wifi-ap-utils.c:758
-#, fuzzy
 msgid "Failed to determine AP security information"
-msgstr "Не удалось задать симметричный ключ расшифровки."
+msgstr "Не удалось получить информацию о защите точки доступа"
 
-#: ../src/devices/wwan/nm-modem-broadband.c:673
-#, fuzzy
+#: ../src/devices/wwan/nm-modem-broadband.c:641
 msgid "GSM mobile broadband connection requires a 'gsm' setting"
-msgstr "Мобильное соединение %d"
+msgstr "Мобильное соединение GSM требует установки параметра «gsm»"
 
-#: ../src/nm-config.c:500
+#: ../src/nm-config.c:465
 msgid "Config file location"
 msgstr "Расположение файла конфигурации"
 
-#: ../src/nm-config.c:501
+#: ../src/nm-config.c:466
 msgid "Config directory location"
 msgstr "Путь к каталогу конфигурации"
 
-#: ../src/nm-config.c:502
-#, fuzzy
+#: ../src/nm-config.c:467
 msgid "System config directory location"
-msgstr "Путь к каталогу конфигурации"
+msgstr "Расположение каталога с системными настройками"
 
-#: ../src/nm-config.c:503
-#, fuzzy
+#: ../src/nm-config.c:468
 msgid "Internal config file location"
-msgstr "Расположение файла конфигурации"
+msgstr "Расположение внутреннего файла конфигурации"
 
-#: ../src/nm-config.c:504
-msgid "State file location"
-msgstr "Расположение файла состояния"
-
-#: ../src/nm-config.c:505
+#: ../src/nm-config.c:469
 msgid "State file for no-auto-default devices"
 msgstr ""
+"Файл состояния для устройств, которые автоматически не устанавливают "
+"параметры по умолчанию"
 
-#: ../src/nm-config.c:506
+#: ../src/nm-config.c:470
 msgid "List of plugins separated by ','"
 msgstr "Список модулей (через запятую)"
 
-#: ../src/nm-config.c:507
-#, fuzzy
+#: ../src/nm-config.c:471
 msgid "Quit after initial configuration"
-msgstr "Текущая конфигурация nmcli:\n"
+msgstr "Выйти после исходной настройки"
 
-#: ../src/nm-config.c:508 ../src/nm-iface-helper.c:300
+#: ../src/nm-config.c:472 ../src/nm-iface-helper.c:300
 msgid "Don't become a daemon, and log to stderr"
 msgstr "Не работать в режиме службы и не входить в stderr"
 
 #. These three are hidden for now, and should eventually just go away.
-#: ../src/nm-config.c:511
+#: ../src/nm-config.c:475
 msgid "An http(s) address for checking internet connectivity"
 msgstr "http(s) адрес для проверки соединения с Интернетом"
 
-#: ../src/nm-config.c:512
+#: ../src/nm-config.c:476
 msgid "The interval between connectivity checks (in seconds)"
 msgstr "Интервал между проверками соединения (в секундах)"
 
-#: ../src/nm-config.c:513
+#: ../src/nm-config.c:477
 msgid "The expected start of the response"
 msgstr "Ожидается начало ответа"
 
 #. Interface/IP config
 #: ../src/nm-iface-helper.c:281
-#, fuzzy
 msgid "The interface to manage"
-msgstr "Родительский интерфейс [нет]:"
+msgstr "Интерфейс для управления"
 
 #: ../src/nm-iface-helper.c:281
 msgid "eth0"
 msgstr "eth0"
 
 #: ../src/nm-iface-helper.c:282
-#, fuzzy
 msgid "Connection UUID"
-msgstr "соединение"
+msgstr "UUID соединения"
 
 #: ../src/nm-iface-helper.c:282
 msgid "661e8cd0-b618-46b8-9dc9-31a52baaa16b"
-msgstr ""
+msgstr "661e8cd0-b618-46b8-9dc9-31a52baaa16b"
 
 #: ../src/nm-iface-helper.c:283
 msgid "Whether to manage IPv6 SLAAC"
-msgstr ""
+msgstr "Разрешает управлять IPv6 SLAAC"
 
 #: ../src/nm-iface-helper.c:284
 msgid "Whether SLAAC must be successful"
-msgstr ""
+msgstr "Должен ли SLAAC быть успешным"
 
 #: ../src/nm-iface-helper.c:285
 msgid "Use an IPv6 temporary privacy address"
-msgstr ""
+msgstr "Использовать временный частный адрес IPv6"
 
 #: ../src/nm-iface-helper.c:286
-#, fuzzy
 msgid "Current DHCPv4 address"
-msgstr "Клонированный MAC-адрес"
+msgstr "Текущий адрес DHCPv4"
 
 #: ../src/nm-iface-helper.c:287
 msgid "Whether DHCPv4 must be successful"
-msgstr ""
+msgstr "Должен ли DHCPv4 быть успешным"
 
 #: ../src/nm-iface-helper.c:288
-#, fuzzy
 msgid "Hex-encoded DHCPv4 client ID"
-msgstr "клиент DHCP «%s» не поддерживается"
+msgstr "Идентификатор клиента DHCPv4, зашифрованный в шестнадцатеричном виде"
 
 #: ../src/nm-iface-helper.c:289
 msgid "Hostname to send to DHCP server"
-msgstr ""
+msgstr "Имя узла для передачи серверу DHCP"
 
 #: ../src/nm-iface-helper.c:289
 msgid "barbar"
-msgstr ""
+msgstr "чточто"
 
 #: ../src/nm-iface-helper.c:290
 msgid "FQDN to send to DHCP server"
-msgstr ""
+msgstr "Полное имя узла (FQDN) для передаче серверу DHCP"
 
 #: ../src/nm-iface-helper.c:290
 msgid "host.domain.org"
-msgstr ""
+msgstr "узел.домен.org"
 
 #: ../src/nm-iface-helper.c:291
-#, fuzzy
 msgid "Route priority for IPv4"
-msgstr "нет приоритета для удаления"
+msgstr "Приоритет маршрута для IPv4"
 
 #: ../src/nm-iface-helper.c:291
 msgid "0"
 msgstr "0"
 
 #: ../src/nm-iface-helper.c:292
-#, fuzzy
 msgid "Route priority for IPv6"
-msgstr "нет приоритета для удаления"
+msgstr "Приоритет маршрута для IPv6"
 
 #: ../src/nm-iface-helper.c:292
 msgid "1024"
@@ -9536,49 +10084,61 @@ msgstr "1024"
 
 #: ../src/nm-iface-helper.c:293
 msgid "Hex-encoded Interface Identifier"
-msgstr ""
+msgstr "Идентификатор интерфейса, зашифрованный в шестнадцатеричном виде"
 
 #: ../src/nm-iface-helper.c:294
 msgid "IPv6 SLAAC address generation mode"
-msgstr ""
+msgstr "Режим генерации адреса IPv6 SLAAC"
 
 #: ../src/nm-iface-helper.c:295
 msgid ""
 "The logging backend configuration value. See logging.backend in "
 "NetworkManager.conf"
 msgstr ""
+"Значение настройки механизма ведения журнала. См. logging.backend в "
+"NetworkManager.conf"
 
 #: ../src/nm-iface-helper.c:315
 msgid ""
 "nm-iface-helper is a small, standalone process that manages a single network "
 "interface."
 msgstr ""
+"nm-iface-helper — небольшой независимый процесс, осуществляющий управление "
+"отдельным сетевым интерфейсом."
 
 #: ../src/nm-iface-helper.c:374
 #, c-format
 msgid "An interface name and UUID are required\n"
-msgstr ""
+msgstr "Необходимо указать имя интерфейса и UUID\n"
 
 #: ../src/nm-iface-helper.c:380
-#, fuzzy, c-format
+#, c-format
 msgid "Failed to find interface index for %s (%s)\n"
-msgstr "Не удалось найти закрывающий тег PKCS#8 — «%s»."
+msgstr "Не удалось найти индекс интерфейса для %s (%s)\n"
 
 #: ../src/nm-iface-helper.c:442
 #, c-format
 msgid "(%s): Invalid IID %s\n"
-msgstr ""
+msgstr "(%s): недействительный IID %s\n"
 
-#: ../src/nm-logging.c:223
+#: ../src/nm-logging.c:216
 #, c-format
 msgid "Unknown log level '%s'"
-msgstr "Неизвестный уровень журналирования «%s»"
+msgstr "Неизвестный уровень ведения журнала «%s»"
 
-#: ../src/nm-logging.c:318
+#: ../src/nm-logging.c:309
 #, c-format
 msgid "Unknown log domain '%s'"
 msgstr "Неизвестный домен журналирования «%s»"
 
-#: ../src/settings/plugins/ifcfg-rh/reader.c:106
+#: ../src/nm-manager.c:3635
+msgid "VPN connection"
+msgstr "VPN-соединение"
+
+#: ../src/nm-sleep-monitor-systemd.c:131
+msgid "NetworkManager needs to turn off networks"
+msgstr "NetworkManager должен отключить сети"
+
+#: ../src/settings/plugins/ifcfg-rh/reader.c:108
 msgid "System"
 msgstr "Система"
diff --git a/po/zh_CN.po b/po/zh_CN.po
index adba7bc1d5..f334f608d5 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -2,33 +2,24 @@
 # 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.
-# Lubomir Rintel <lkundrak@v3.sk>, 2016. #zanata
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-06-22 10:02+0200\n"
-"PO-Revision-Date: 2016-04-29 04:03-0400\n"
-"Last-Translator: Mingye Wang (Arthur2e5) <arthur200126@gmail.com>\n"
-"Language-Team: Chinese (China) <i18n-zh@googlegroups.com>\n"
-"Language: zh-CN\n"
+"POT-Creation-Date: 2016-04-29 14:24+0530\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"PO-Revision-Date: 2016-07-05 08:38+0000\n"
+"Last-Translator: Copied by Zanata <copied-by-zanata@zanata.org>\n"
+"Language-Team: Chinese (simplified) <i18n-zh@googlegroups.com>\n"
+"Language: zh-CN\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Generator: Zanata 3.8.4\n"
+"X-Generator: Zanata 3.9.3\n"
 
 #: ../clients/cli/agent.c:39
 #, c-format
@@ -38,9 +29,9 @@ msgid ""
 "COMMAND := { secret | polkit | all }\n"
 "\n"
 msgstr ""
-"用法：nmcli agent { 命令 | help }\n"
+"用法: nmcli agent { COMMAND | help }\n"
 "\n"
-"命令 := { secret | polkit | all }\n"
+"COMMAND := { secret | polkit | all }\n"
 "\n"
 
 #: ../clients/cli/agent.c:47
@@ -54,12 +45,10 @@ msgid ""
 "and if a password is required asks the user for it.\n"
 "\n"
 msgstr ""
-"用法：nmcli agent secret { help }\n"
-"\n"
-"运行 nmcli 作为网络管理器密钥代理。当网络管理器需要密码时就向\n"
-"已注册的代理要。此命令会保持 nmcli 运行而且如果需要密码时就向\n"
-"用户请求提供。\n"
+"用法: nmcli agent secret { help }\n"
 "\n"
+"将 nmcli 作为 NetworkManager 安全代理运行。当 NetworkManager 要求密码时，它将请求注册的代理提供。这个命令将使 "
+"nmcli 保持运行，如果要求密码则会请求用户提供。\n"
 "\n"
 
 #: ../clients/cli/agent.c:57
@@ -73,10 +62,9 @@ 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:67
@@ -87,20 +75,20 @@ 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 同时作为网络管理器密钥和 polkit 代理。\n"
+"将 nmcli 作为 NetworkManager 安全代理及 polkit 代理运行。\n"
 "\n"
 
 #: ../clients/cli/agent.c:149
 #, c-format
 msgid "nmcli successfully registered as a NetworkManager's secret agent.\n"
-msgstr "nmcli 已成功地注册为网络管理器的密钥代理。\n"
+msgstr "nmcli 已成功地注册为 NetworkManager 的安全代理。\n"
 
 #: ../clients/cli/agent.c:151
 #, c-format
 msgid "Error: secret agent initialization failed"
-msgstr "错误：密钥代理初始化失败"
+msgstr "错误：安全代理初始化失败"
 
 #: ../clients/cli/agent.c:166
 #, c-format
@@ -110,25 +98,25 @@ msgstr "错误：polkit 代理初始化失败：%s"
 #: ../clients/cli/agent.c:174
 #, c-format
 msgid "nmcli successfully registered as a polkit agent.\n"
-msgstr "nmcli 已成功注册为 polkit 代理。\n"
+msgstr "nmcli 已成功地注册为 polkit 代理。\n"
 
-#: ../clients/cli/agent.c:206 ../clients/cli/connections.c:8703
-#: ../clients/cli/devices.c:3727 ../clients/cli/general.c:344
-#: ../clients/cli/general.c:473
+#: ../clients/cli/agent.c:206 ../clients/cli/connections.c:11050
+#: ../clients/cli/devices.c:3669 ../clients/cli/general.c:343
+#: ../clients/cli/general.c:484
 #, c-format
 msgid "Error: NetworkManager is not running."
-msgstr "错误：网络管理器未运行。"
+msgstr "错误：NetworkManager 未运行。"
 
-#: ../clients/cli/agent.c:239
+#: ../clients/cli/agent.c:242
 #, c-format
 msgid "Error: 'agent' command '%s' is not valid."
-msgstr "错误：“agent”命令“%s”无效。"
+msgstr "错误：' agent' 命令 '%s' 无效。"
 
 #: ../clients/cli/common.c:38 ../clients/cli/common.c:51
 #: ../clients/cli/common.c:59 ../clients/cli/common.c:71
-#: ../clients/cli/connections.c:237 ../clients/cli/connections.c:259
+#: ../clients/cli/connections.c:192 ../clients/cli/connections.c:214
 msgid "GROUP"
-msgstr "群组"
+msgstr "组"
 
 #. 0
 #: ../clients/cli/common.c:39 ../clients/cli/common.c:60
@@ -138,14 +126,14 @@ msgstr "地址"
 #. 1
 #. 2
 #: ../clients/cli/common.c:40 ../clients/cli/common.c:61
-#: ../clients/cli/connections.c:262
+#: ../clients/cli/connections.c:217
 msgid "GATEWAY"
 msgstr "网关"
 
 #. 2
 #: ../clients/cli/common.c:41 ../clients/cli/common.c:62
 msgid "ROUTE"
-msgstr "路由"
+msgstr "路由器"
 
 #. 3
 #: ../clients/cli/common.c:42 ../clients/cli/common.c:63
@@ -170,7 +158,7 @@ msgstr "选项"
 #: ../clients/cli/common.c:376 ../clients/cli/common.c:436
 #, c-format
 msgid "invalid prefix '%s'; <1-%d> allowed"
-msgstr "无效前缀“%s”；允许 <1-%d>"
+msgstr "无效前缀 '%s'：允许的范围是 <1-%d>"
 
 #: ../clients/cli/common.c:384
 #, c-format
@@ -182,12 +170,12 @@ msgstr "无效的 IP 地址：%s"
 msgid ""
 "the second component of route ('%s') is neither a next hop address nor a "
 "metric"
-msgstr "路由 （“%s”）的第二组分既不是下一跳地址也不是跃点"
+msgstr "路由（'%s'）的第二个部分既不是下一个 hop 地址，也不是一个度量单位。"
 
 #: ../clients/cli/common.c:457
 #, c-format
 msgid "invalid metric '%s'"
-msgstr "无效跃点“%s”"
+msgstr "无效度量 '%s'"
 
 #: ../clients/cli/common.c:465
 #, c-format
@@ -196,17 +184,17 @@ msgstr "无效的路由：%s"
 
 #: ../clients/cli/common.c:477
 msgid "default route cannot be added (NetworkManager handles it by itself)"
-msgstr "默认路由无法被添加（网络管理器自行处理它）"
+msgstr "无法添加默认的路由（NetworkManager 自己进行处理）"
 
 #: ../clients/cli/common.c:494
 msgid "unmanaged"
-msgstr "未托管"
+msgstr "未管理"
 
 #: ../clients/cli/common.c:496
 msgid "unavailable"
 msgstr "不可用"
 
-#: ../clients/cli/common.c:498 ../clients/cli/general.c:246
+#: ../clients/cli/common.c:498 ../clients/cli/general.c:245
 msgid "disconnected"
 msgstr "已断开"
 
@@ -224,145 +212,147 @@ msgstr "连接中(需要验证)"
 
 #: ../clients/cli/common.c:506
 msgid "connecting (getting IP configuration)"
-msgstr "正在连接(正在获取 IP 配置)"
+msgstr "连接中(获得 IP 配置)"
 
 #: ../clients/cli/common.c:508
 msgid "connecting (checking IP connectivity)"
-msgstr "正在连接(正在检查 IP 连通性)"
+msgstr "连接中（正在检查 IP 连接性）"
 
 #: ../clients/cli/common.c:510
 msgid "connecting (starting secondary connections)"
-msgstr "正在连接(正在启用第二连接)"
+msgstr "连接中（开始二次连接）"
 
-#: ../clients/cli/common.c:512 ../clients/cli/general.c:242
+#: ../clients/cli/common.c:512 ../clients/cli/general.c:241
 msgid "connected"
 msgstr "连接的"
 
-#: ../clients/cli/common.c:514 ../clients/cli/connections.c:690
+#: ../clients/cli/common.c:514 ../clients/cli/connections.c:648
 msgid "deactivating"
-msgstr "正在停用"
+msgstr "取消激活中"
 
 #: ../clients/cli/common.c:516
 msgid "connection failed"
 msgstr "连接失败"
 
 #: ../clients/cli/common.c:518 ../clients/cli/common.c:535
-#: ../clients/cli/connections.c:695 ../clients/cli/connections.c:718
-#: ../clients/cli/connections.c:1995 ../clients/cli/devices.c:1104
-#: ../clients/cli/devices.c:1145 ../clients/cli/devices.c:1147
-#: ../clients/cli/general.c:249 ../clients/cli/general.c:287
-#: ../clients/cli/general.c:422 ../clients/cli/general.c:437
-#: ../clients/cli/settings.c:845 ../clients/cli/settings.c:931
-#: ../clients/cli/settings.c:1315 ../clients/cli/settings.c:1954
-#: ../clients/cli/settings.c:3317
+#: ../clients/cli/connections.c:653 ../clients/cli/connections.c:676
+#: ../clients/cli/connections.c:1949 ../clients/cli/devices.c:1024
+#: ../clients/cli/devices.c:1065 ../clients/cli/devices.c:1067
+#: ../clients/cli/general.c:248 ../clients/cli/general.c:286
+#: ../clients/cli/general.c:432 ../clients/cli/general.c:448
+#: ../clients/cli/settings.c:839 ../clients/cli/settings.c:925
+#: ../clients/cli/settings.c:1265 ../clients/cli/settings.c:1901
+#: ../clients/cli/settings.c:3205 ../clients/cli/utils.c:1400
 #, c-format
 msgid "unknown"
 msgstr "未知"
 
 #. "CAPABILITIES"
-#: ../clients/cli/common.c:527 ../clients/cli/connections.c:975
-#: ../clients/cli/connections.c:977 ../clients/cli/connections.c:979
-#: ../clients/cli/connections.c:1013 ../clients/cli/connections.c:1082
-#: ../clients/cli/connections.c:1083 ../clients/cli/connections.c:1085
-#: ../clients/cli/connections.c:3291 ../clients/cli/connections.c:4414
-#: ../clients/cli/connections.c:6229 ../clients/cli/connections.c:6230
-#: ../clients/cli/devices.c:782 ../clients/cli/devices.c:1069
-#: ../clients/cli/devices.c:1070 ../clients/cli/devices.c:1071
-#: ../clients/cli/devices.c:1072 ../clients/cli/devices.c:1073
-#: ../clients/cli/devices.c:1108 ../clients/cli/devices.c:1110
-#: ../clients/cli/devices.c:1138 ../clients/cli/devices.c:1139
-#: ../clients/cli/devices.c:1140 ../clients/cli/devices.c:1141
-#: ../clients/cli/devices.c:1142 ../clients/cli/devices.c:1143
-#: ../clients/cli/devices.c:1144 ../clients/cli/devices.c:1146
-#: ../clients/cli/devices.c:1148 ../clients/cli/general.c:431
-#: ../clients/cli/settings.c:3312
+#: ../clients/cli/common.c:527 ../clients/cli/connections.c:933
+#: ../clients/cli/connections.c:935 ../clients/cli/connections.c:937
+#: ../clients/cli/connections.c:971 ../clients/cli/connections.c:1040
+#: ../clients/cli/connections.c:1041 ../clients/cli/connections.c:1043
+#: ../clients/cli/connections.c:3450 ../clients/cli/connections.c:8563
+#: ../clients/cli/connections.c:8564 ../clients/cli/devices.c:772
+#: ../clients/cli/devices.c:989 ../clients/cli/devices.c:990
+#: ../clients/cli/devices.c:991 ../clients/cli/devices.c:992
+#: ../clients/cli/devices.c:993 ../clients/cli/devices.c:1028
+#: ../clients/cli/devices.c:1030 ../clients/cli/devices.c:1058
+#: ../clients/cli/devices.c:1059 ../clients/cli/devices.c:1060
+#: ../clients/cli/devices.c:1061 ../clients/cli/devices.c:1062
+#: ../clients/cli/devices.c:1063 ../clients/cli/devices.c:1064
+#: ../clients/cli/devices.c:1066 ../clients/cli/devices.c:1068
+#: ../clients/cli/general.c:442 ../clients/cli/settings.c:3200
 msgid "yes"
 msgstr "是"
 
-#: ../clients/cli/common.c:529 ../clients/cli/connections.c:975
-#: ../clients/cli/connections.c:977 ../clients/cli/connections.c:979
-#: ../clients/cli/connections.c:1082 ../clients/cli/connections.c:1083
-#: ../clients/cli/connections.c:1085 ../clients/cli/connections.c:3292
-#: ../clients/cli/connections.c:4413 ../clients/cli/connections.c:6229
-#: ../clients/cli/connections.c:6230 ../clients/cli/devices.c:782
-#: ../clients/cli/devices.c:1069 ../clients/cli/devices.c:1070
-#: ../clients/cli/devices.c:1071 ../clients/cli/devices.c:1072
-#: ../clients/cli/devices.c:1073 ../clients/cli/devices.c:1108
-#: ../clients/cli/devices.c:1110 ../clients/cli/devices.c:1138
-#: ../clients/cli/devices.c:1139 ../clients/cli/devices.c:1140
-#: ../clients/cli/devices.c:1141 ../clients/cli/devices.c:1142
-#: ../clients/cli/devices.c:1143 ../clients/cli/devices.c:1144
-#: ../clients/cli/devices.c:1146 ../clients/cli/devices.c:1148
-#: ../clients/cli/general.c:433 ../clients/cli/settings.c:3314
+#: ../clients/cli/common.c:529 ../clients/cli/connections.c:933
+#: ../clients/cli/connections.c:935 ../clients/cli/connections.c:937
+#: ../clients/cli/connections.c:1040 ../clients/cli/connections.c:1041
+#: ../clients/cli/connections.c:1043 ../clients/cli/connections.c:3451
+#: ../clients/cli/connections.c:8563 ../clients/cli/connections.c:8564
+#: ../clients/cli/devices.c:772 ../clients/cli/devices.c:989
+#: ../clients/cli/devices.c:990 ../clients/cli/devices.c:991
+#: ../clients/cli/devices.c:992 ../clients/cli/devices.c:993
+#: ../clients/cli/devices.c:1028 ../clients/cli/devices.c:1030
+#: ../clients/cli/devices.c:1058 ../clients/cli/devices.c:1059
+#: ../clients/cli/devices.c:1060 ../clients/cli/devices.c:1061
+#: ../clients/cli/devices.c:1062 ../clients/cli/devices.c:1063
+#: ../clients/cli/devices.c:1064 ../clients/cli/devices.c:1066
+#: ../clients/cli/devices.c:1068 ../clients/cli/general.c:444
+#: ../clients/cli/settings.c:3202
 msgid "no"
 msgstr "否"
 
 #: ../clients/cli/common.c:531
 msgid "yes (guessed)"
-msgstr "是（猜测所得）"
+msgstr "是（猜测）"
 
 #: ../clients/cli/common.c:533
 msgid "no (guessed)"
-msgstr "否（猜测所得）"
+msgstr "否（猜测）"
 
+# auto translated by TM merge from project: NetworkManager, version: 0.9.8.2, DocId: NetworkManager
 #: ../clients/cli/common.c:544
 msgid "No reason given"
-msgstr "未给出原因"
+msgstr "没有给出理由"
 
 #. We should not really come here
-#: ../clients/cli/common.c:547 ../clients/cli/connections.c:3140
+#: ../clients/cli/common.c:547 ../clients/cli/connections.c:2976
 #, c-format
 msgid "Unknown error"
 msgstr "未知错误"
 
 #: ../clients/cli/common.c:550
 msgid "Device is now managed"
-msgstr "设备现在已托管"
+msgstr "现在已管理的设备"
 
 #: ../clients/cli/common.c:553
 msgid "Device is now unmanaged"
-msgstr "设备现在未托管"
+msgstr "现在未管理的设备"
 
+# auto translated by TM merge from project: NetworkManager, version: 0.9.8.2, DocId: NetworkManager
 #: ../clients/cli/common.c:556
 msgid "The device could not be readied for configuration"
-msgstr "设备配置未就绪"
+msgstr "无法让该设备准备配置"
 
 #: ../clients/cli/common.c:559
 msgid ""
 "IP configuration could not be reserved (no available address, timeout, etc.)"
-msgstr "IP 配置无法保留(无可用地址，超时等)"
+msgstr "IP 配置无法保留（没有可用地址，超时等等。）"
 
 #: ../clients/cli/common.c:562
 msgid "The IP configuration is no longer valid"
-msgstr "IP 配置不再有效"
+msgstr "该 IP 配置不再有效"
 
 #: ../clients/cli/common.c:565
 msgid "Secrets were required, but not provided"
-msgstr "需要认证凭据，但未提供"
+msgstr "需要 secrets 但没有提供。"
 
 #: ../clients/cli/common.c:568
 msgid "802.1X supplicant disconnected"
-msgstr "802.1X 客户端已断开连接"
+msgstr "802.1X 请求被断开"
 
 #: ../clients/cli/common.c:571
 msgid "802.1X supplicant configuration failed"
-msgstr "802.1X 客户端配置失败"
+msgstr "802.1X 请求配置失败"
 
+# auto translated by TM merge from project: NetworkManager, version: 0.9.8.2, DocId: NetworkManager
 #: ../clients/cli/common.c:574
 msgid "802.1X supplicant failed"
-msgstr "802.1X 客户端失败"
+msgstr "802.1X 请求失败"
 
 #: ../clients/cli/common.c:577
 msgid "802.1X supplicant took too long to authenticate"
-msgstr "802.1X 客户端认证时间过长"
+msgstr "802.1X 请求时间太长无法验证"
 
 #: ../clients/cli/common.c:580
 msgid "PPP service failed to start"
-msgstr "PPP 服务无法启动"
+msgstr "PPP 服务启动失败"
 
 #: ../clients/cli/common.c:583
 msgid "PPP service disconnected"
-msgstr "PPP 服务已断开连接"
+msgstr "PPP 服务已断开"
 
 # auto translated by TM merge from project: control-center, version: 3.8.3, DocId: gnome-control-center-2.0
 #: ../clients/cli/common.c:586
@@ -371,7 +361,7 @@ msgstr "PPP 失败"
 
 #: ../clients/cli/common.c:589
 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/cli/common.c:592
@@ -382,9 +372,10 @@ msgstr "DHCP 客户端错误"
 msgid "DHCP client failed"
 msgstr "DHCP 客户端失败"
 
+# auto translated by TM merge from project: control-center, version: 3.8.3, DocId: gnome-control-center-2.0
 #: ../clients/cli/common.c:598
 msgid "Shared connection service failed to start"
-msgstr "共享连接服务无法启动"
+msgstr "共享连接服务启动失败"
 
 #: ../clients/cli/common.c:601
 msgid "Shared connection service failed"
@@ -392,19 +383,19 @@ msgstr "共享连接服务失败"
 
 #: ../clients/cli/common.c:604
 msgid "AutoIP service failed to start"
-msgstr "自动 IP(AutoIP) 服务无法启动"
+msgstr "AutoIP 服务启动失败"
 
 #: ../clients/cli/common.c:607
 msgid "AutoIP service error"
-msgstr "自动 IP(AutoIP) 服务出错"
+msgstr "AutoIP 服务出错"
 
 #: ../clients/cli/common.c:610
 msgid "AutoIP service failed"
-msgstr "自动 IP(AutoIP) 服务失败"
+msgstr "AutoIP 服务失败"
 
 #: ../clients/cli/common.c:613
 msgid "The line is busy"
-msgstr "线路忙"
+msgstr "线路繁忙"
 
 #: ../clients/cli/common.c:616
 msgid "No dial tone"
@@ -432,7 +423,7 @@ msgstr "无法选择指定的 APN"
 
 #: ../clients/cli/common.c:634
 msgid "Not searching for networks"
-msgstr "不搜索网络"
+msgstr "未搜索网络"
 
 #: ../clients/cli/common.c:637
 msgid "Network registration denied"
@@ -444,43 +435,43 @@ msgstr "网络注册超时"
 
 #: ../clients/cli/common.c:643
 msgid "Failed to register with the requested network"
-msgstr "无法注册请求的网络"
+msgstr "无法在请求的网络上注册"
 
 #: ../clients/cli/common.c:646
 msgid "PIN check failed"
-msgstr "PIN 检查失败"
+msgstr "PIN 检查未通过"
 
 #: ../clients/cli/common.c:649
 msgid "Necessary firmware for the device may be missing"
-msgstr "该设备所需固件可能丢失"
+msgstr "可能缺少必要的设备固件"
 
 #: ../clients/cli/common.c:652
 msgid "The device was removed"
-msgstr "设备被移除"
+msgstr "设备被删除"
 
 #: ../clients/cli/common.c:655
 msgid "NetworkManager went to sleep"
-msgstr "网络管理器挂起"
+msgstr "NetworkManager 进入睡眠状态"
 
 #: ../clients/cli/common.c:658
 msgid "The device's active connection disappeared"
-msgstr "设备的活动连接已消失"
+msgstr "该设备的活跃连接消失"
 
 #: ../clients/cli/common.c:661
 msgid "Device disconnected by user or client"
-msgstr "用户/客户端断开了设备连接"
+msgstr "用户或者客户端断开与该设备的连接"
 
 #: ../clients/cli/common.c:664
 msgid "Carrier/link changed"
-msgstr "载波/连接已更改"
+msgstr "载波/链接已变更"
 
 #: ../clients/cli/common.c:667
 msgid "The device's existing connection was assumed"
-msgstr "假定设备已有连接"
+msgstr "已恢复设备的现有连接"
 
 #: ../clients/cli/common.c:670
 msgid "The supplicant is now available"
-msgstr "客户端目前可用"
+msgstr "请求现已可用"
 
 #: ../clients/cli/common.c:673
 msgid "The modem could not be found"
@@ -488,63 +479,74 @@ msgstr "未找到调制解调器"
 
 #: ../clients/cli/common.c:676
 msgid "The Bluetooth connection failed or timed out"
-msgstr "蓝牙连接失败或超时"
+msgstr "蓝牙连接失败或者超时"
 
+# auto translated by TM merge from project: NetworkManager, version: 0.9.8.2, DocId: NetworkManager
 #: ../clients/cli/common.c:679
 msgid "GSM Modem's SIM card not inserted"
-msgstr "GSM 调制解调器的 SIM 卡未插入"
+msgstr "未插入 GSM 调制解调器的 SIM 卡"
 
 #: ../clients/cli/common.c:682
 msgid "GSM Modem's SIM PIN required"
-msgstr "GSM 调制解调器的 SIM 需要 PIN 码"
+msgstr "需要 GSM 调制解调器 SIM 卡的 PIN 码"
 
+# auto translated by TM merge from project: NetworkManager, version: 0.9.8.2, DocId: NetworkManager
 #: ../clients/cli/common.c:685
 msgid "GSM Modem's SIM PUK required"
-msgstr "GSM 调制解调器的 SIM 需要 PUK 码"
+msgstr "需要 GSM 调制解调器 SIM 卡的 PUK 码"
 
+# auto translated by TM merge from project: NetworkManager, version: 0.9.8.2, DocId: NetworkManager
 #: ../clients/cli/common.c:688
 msgid "GSM Modem's SIM wrong"
-msgstr "GSM 调制解调器的 SIM 错误"
+msgstr "GSM 调制解调器的 SIM 卡错误"
 
+# auto translated by TM merge from project: control-center, version: 3.8.3, DocId: gnome-control-center-2.0
 #: ../clients/cli/common.c:691
 msgid "InfiniBand device does not support connected mode"
-msgstr "高速网络连接设备不支持已连接的模式"
+msgstr "高速互联设备不支持已连接模式"
 
+# auto translated by TM merge from project: NetworkManager, version: 0.9.8.2, DocId: NetworkManager
 #: ../clients/cli/common.c:694
 msgid "A dependency of the connection failed"
-msgstr "连接的依赖关系失败"
+msgstr "连接的相依性失败"
 
+# auto translated by TM merge from project: NetworkManager, version: 0.9.8.2, DocId: NetworkManager
 #: ../clients/cli/common.c:697
 msgid "A problem with the RFC 2684 Ethernet over ADSL bridge"
-msgstr "RFC 2684 以太网在 ADSL 网桥处出现问题"
+msgstr "ADSL 桥接的 RFC 2684 网卡有问题"
 
+# auto translated by TM merge from project: NetworkManager, version: 0.9.8.2, DocId: NetworkManager
 #: ../clients/cli/common.c:700
 msgid "ModemManager is unavailable"
-msgstr "调制解调器管理器不可用"
+msgstr "ModemManager 不可用"
 
+# auto translated by TM merge from project: NetworkManager, version: 0.9.8.2, DocId: NetworkManager
 #: ../clients/cli/common.c:703
 msgid "The Wi-Fi network could not be found"
-msgstr "未找到 Wi-Fi 网络"
+msgstr "无法找到 Wi-Fi 网络"
 
+# auto translated by TM merge from project: NetworkManager, version: 0.9.8.2, DocId: NetworkManager
 #: ../clients/cli/common.c:706
 msgid "A secondary connection of the base connection failed"
-msgstr "基础连接的备选连接失败"
+msgstr "基础连接失败后的二次连接"
 
 #: ../clients/cli/common.c:709
 msgid "DCB or FCoE setup failed"
-msgstr "DCB 或 FCoE 设置失败"
+msgstr "DCB 或者 FCoE 设置失败"
 
 #: ../clients/cli/common.c:712
 msgid "teamd control failed"
 msgstr "teamd 控制失败"
 
+# auto translated by TM merge from project: NetworkManager, version: 0.9.8.2, DocId: NetworkManager
 #: ../clients/cli/common.c:715
 msgid "Modem failed or no longer available"
-msgstr "调制解调器失败或不再可用"
+msgstr "调制解调器出现故障或不再可用"
 
+# auto translated by TM merge from project: NetworkManager, version: 0.9.8.2, DocId: NetworkManager
 #: ../clients/cli/common.c:718
 msgid "Modem now ready and available"
-msgstr "调制解调器已就绪并可用"
+msgstr "调制解调器现在已准备好且可用"
 
 #: ../clients/cli/common.c:721
 msgid "SIM PIN was incorrect"
@@ -552,36 +554,36 @@ msgstr "SIM PIN 不正确"
 
 #: ../clients/cli/common.c:724
 msgid "New connection activation was enqueued"
-msgstr "新的连接激活操作已加入队列"
+msgstr "新连接激活已排队"
 
 #: ../clients/cli/common.c:727
 msgid "The device's parent changed"
-msgstr "设备的上级已更改"
+msgstr "设备的参数已修改"
 
 #: ../clients/cli/common.c:730
 msgid "The device parent's management changed"
-msgstr "设备的上级管理已更改"
+msgstr "父设备的管理已修改"
 
 #. TRANSLATORS: Unknown reason for a device state change (NMDeviceStateReason)
-#: ../clients/cli/common.c:734 ../libnm-glib/nm-device.c:1898
-#: ../libnm/nm-device.c:1849
+#: ../clients/cli/common.c:734 ../libnm-glib/nm-device.c:1888
+#: ../libnm/nm-device.c:1839
 msgid "Unknown"
 msgstr "未知"
 
 #: ../clients/cli/common.c:776
 #, c-format
 msgid "invalid priority map '%s'"
-msgstr "无效的优先级映射“%s”"
+msgstr "无效优先权映射 '%s'"
 
 #: ../clients/cli/common.c:783 ../clients/cli/common.c:789
 #, c-format
 msgid "priority '%s' is not valid (<0-%ld>)"
-msgstr "优先级“%s”无效 (<0-%ld>)"
+msgstr "优先权 '%s' 无效（<0-%ld>）"
 
 #: ../clients/cli/common.c:856
 #, c-format
 msgid "'%s' is not a valid team configuration or file name."
-msgstr "“%s” 是无效的群组设置或文件名。"
+msgstr "'%s' 不是有效团队配置或者文件名。"
 
 #: ../clients/cli/common.c:958
 #, c-format
@@ -591,134 +593,84 @@ msgstr "错误：openconnect 失败：%s\n"
 #: ../clients/cli/common.c:965
 #, c-format
 msgid "Error: openconnect failed with status %d\n"
-msgstr "错误：openconnect 失败，状态 %d\n"
+msgstr "错误：openconnect 失败，状态为 %d\n"
 
 #: ../clients/cli/common.c:967
 #, c-format
 msgid "Error: openconnect failed with signal %d\n"
-msgstr "错误：openconnect 失败，信号 %d\n"
+msgstr "错误：openconnect 失败，信号为 %d\n"
 
 #: ../clients/cli/common.c:1045
 #, c-format
 msgid ""
 "Warning: password for '%s' not given in 'passwd-file' and nmcli cannot ask "
 "without '--ask' option.\n"
-msgstr ""
-"警告：用于“%s”的密码没有在“passwd-file”中给出和 nmcli 无法在没有“--ask”选项下"
-"请求。\n"
+msgstr "警告： 'passwd-file' 里没有给出 '%s' 的密码，nmcli 无法用 '--ask' 选项进行请求。\n"
 
 #. define some prompts for connection editor
-#: ../clients/cli/connections.c:61
+#: ../clients/cli/connections.c:41
 msgid "Setting name? "
 msgstr "设置名称？"
 
-#: ../clients/cli/connections.c:62
+#: ../clients/cli/connections.c:42
 msgid "Property name? "
-msgstr "属性名称? "
+msgstr "属性名称？"
 
-#: ../clients/cli/connections.c:63
+#: ../clients/cli/connections.c:43
 msgid "Enter connection type: "
 msgstr "输入连接类型："
 
 #. define some other prompts
-#: ../clients/cli/connections.c:66
-#, fuzzy
-msgid "Connection type"
+#: ../clients/cli/connections.c:46
+msgid "Connection type: "
 msgstr "连接类型："
 
-#: ../clients/cli/connections.c:67
-#, fuzzy
-msgid "VPN type"
+#: ../clients/cli/connections.c:47
+msgid "VPN type: "
 msgstr "VPN 类型："
 
-#: ../clients/cli/connections.c:68
-#, fuzzy
-msgid "Master"
-msgstr "主连接："
+#: ../clients/cli/connections.c:48
+msgid "Master: "
+msgstr "主服务器： "
 
-#: ../clients/cli/connections.c:70 ../clients/tui/nmt-page-infiniband.c:88
-msgid "Transport mode"
-msgstr "传输模式"
+#: ../clients/cli/connections.c:49
+msgid "Connection (name, UUID, or path): "
+msgstr "连接（名称、UUID、或者路径）："
 
-#: ../clients/cli/connections.c:75
-#, fuzzy
-msgid "Bluetooth type"
-msgstr "蓝牙类型 %s"
-
-#: ../clients/cli/connections.c:81
-#, fuzzy
-msgid "Bonding mode"
-msgstr "绑定监控模式 %s"
+#: ../clients/cli/connections.c:50
+msgid "VPN connection (name, UUID, or path): "
+msgstr "VPN 连接（名称、UUID、或者路径）："
 
-#: ../clients/cli/connections.c:83 ../clients/cli/connections.c:4014
-#, fuzzy
-msgid "Bonding monitoring mode"
-msgstr "绑定监控模式 %s"
-
-#: ../clients/cli/connections.c:88
-#, fuzzy
-msgid "Protocol"
-msgstr "协议 %s"
+#: ../clients/cli/connections.c:51
+msgid "Connection(s) (name, UUID, or path): "
+msgstr "连接（名称、UUID、或者路径）："
 
-#: ../clients/cli/connections.c:91
-msgid "Wi-Fi mode"
-msgstr "Wi-Fi 模式"
+#: ../clients/cli/connections.c:52
+msgid "Connection(s) (name, UUID, path or apath): "
+msgstr "连接（名称、UUID、路径或者 apath）："
 
-#: ../clients/cli/connections.c:97
-msgid "ADSL encapsulation"
-msgstr "ADSL 封装"
+#: ../clients/cli/connections.c:53
+msgid "Tunnel mode: "
+msgstr "管道模式："
 
-#: ../clients/cli/connections.c:100
-#, fuzzy
-msgid "Tun mode"
-msgstr "隧道模式："
-
-#: ../clients/cli/connections.c:105
-#, fuzzy
-msgid "IP Tunnel mode"
-msgstr "隧道模式："
-
-#: ../clients/cli/connections.c:107
-#, fuzzy
-msgid "MACVLAN mode"
-msgstr "MACVLAN 模式："
-
-#: ../clients/cli/connections.c:109
-#, fuzzy
-msgid "Connection (name, UUID, or path)"
-msgstr "连接（名称、UUID 或路径）："
-
-#: ../clients/cli/connections.c:110
-#, fuzzy
-msgid "VPN connection (name, UUID, or path)"
-msgstr "VPN 连接（名称、UUID 或路径）："
-
-#: ../clients/cli/connections.c:111
-#, fuzzy
-msgid "Connection(s) (name, UUID, or path)"
-msgstr "连接（名称、UUID 或路径）："
-
-# apath = active path
-#: ../clients/cli/connections.c:112
-#, fuzzy
-msgid "Connection(s) (name, UUID, path or apath)"
-msgstr "连接（名称、UUID、路径或活动路径）："
+#: ../clients/cli/connections.c:54
+msgid "MACVLAN mode: "
+msgstr "MACVLAN 模式： "
 
 #. 0
-#: ../clients/cli/connections.c:118 ../clients/cli/connections.c:238
+#: ../clients/cli/connections.c:73 ../clients/cli/connections.c:193
 #: ../clients/cli/devices.c:55 ../clients/cli/devices.c:89
 #: ../clients/cli/devices.c:99 ../clients/cli/devices.c:110
 #: ../clients/cli/devices.c:120 ../clients/cli/devices.c:137
 #: ../clients/cli/devices.c:150 ../clients/cli/devices.c:176
 #: ../clients/cli/devices.c:191 ../clients/cli/devices.c:200
-#: ../clients/cli/devices.c:210 ../clients/cli/devices.c:220
-#: ../clients/cli/devices.c:261
+#: ../clients/cli/devices.c:210 ../clients/cli/devices.c:251
 msgid "NAME"
 msgstr "名称"
 
 #. 0
 #. 1
-#: ../clients/cli/connections.c:119 ../clients/cli/connections.c:239
+#: ../clients/cli/connections.c:74 ../clients/cli/connections.c:194
 msgid "UUID"
 msgstr "UUID"
 
@@ -726,53 +678,54 @@ msgstr "UUID"
 #. 0
 #. 1
 #. 2
-#: ../clients/cli/connections.c:120 ../clients/cli/connections.c:260
+#: ../clients/cli/connections.c:75 ../clients/cli/connections.c:215
 #: ../clients/cli/devices.c:41 ../clients/cli/devices.c:57
 #: ../clients/cli/devices.c:179
 msgid "TYPE"
 msgstr "类型"
 
 #. 2
-#: ../clients/cli/connections.c:121
+#: ../clients/cli/connections.c:76
 msgid "TIMESTAMP"
 msgstr "时间戳"
 
 #. 3
-#: ../clients/cli/connections.c:122
+#: ../clients/cli/connections.c:77
 msgid "TIMESTAMP-REAL"
 msgstr "真实时间戳"
 
 #. 4
 #. 16
-#: ../clients/cli/connections.c:123 ../clients/cli/devices.c:72
+#: ../clients/cli/connections.c:78 ../clients/cli/devices.c:72
 msgid "AUTOCONNECT"
 msgstr "自动连接"
 
 #. 5
-#: ../clients/cli/connections.c:124
+#: ../clients/cli/connections.c:79
 msgid "AUTOCONNECT-PRIORITY"
-msgstr "自动连接优先级"
+msgstr "AUTOCONNECT-PRIORITY"
 
 #. 6
-#: ../clients/cli/connections.c:125
+#: ../clients/cli/connections.c:80
 msgid "READONLY"
 msgstr "只读"
 
+# auto translated by TM merge from project: NetworkManager, version: 0.9.8.2, DocId: NetworkManager
 #. 7
 #. 8
 #. 2
 #. 15
 #. 5
-#: ../clients/cli/connections.c:126 ../clients/cli/connections.c:246
+#: ../clients/cli/connections.c:81 ../clients/cli/connections.c:201
 #: ../clients/cli/devices.c:43 ../clients/cli/devices.c:166
 #: ../clients/cli/devices.c:182
 msgid "DBUS-PATH"
-msgstr "DBUS路径"
+msgstr "DBUS-PATH"
 
 #. 8
 #. 13
 #. 4
-#: ../clients/cli/connections.c:127 ../clients/cli/devices.c:164
+#: ../clients/cli/connections.c:82 ../clients/cli/devices.c:164
 #: ../clients/cli/devices.c:181
 msgid "ACTIVE"
 msgstr "活跃"
@@ -782,9 +735,9 @@ msgstr "活跃"
 #. 12
 #. 3
 #. 0
-#: ../clients/cli/connections.c:128 ../clients/cli/devices.c:40
+#: ../clients/cli/connections.c:83 ../clients/cli/devices.c:40
 #: ../clients/cli/devices.c:56 ../clients/cli/devices.c:163
-#: ../clients/cli/devices.c:180 ../clients/cli/devices.c:262
+#: ../clients/cli/devices.c:180 ../clients/cli/devices.c:252
 msgid "DEVICE"
 msgstr "设备"
 
@@ -793,112 +746,113 @@ msgstr "设备"
 #. 1
 #. 10
 #. 1
-#: ../clients/cli/connections.c:129 ../clients/cli/connections.c:241
+#: ../clients/cli/connections.c:84 ../clients/cli/connections.c:196
 #: ../clients/cli/devices.c:42 ../clients/cli/devices.c:66
-#: ../clients/cli/general.c:37
+#: ../clients/cli/general.c:36
 msgid "STATE"
 msgstr "状态"
 
 #. 11
-#: ../clients/cli/connections.c:130
+#: ../clients/cli/connections.c:85
 msgid "ACTIVE-PATH"
-msgstr "活动路径"
+msgstr "ACTIVE-PATH"
 
 #. 2
-#: ../clients/cli/connections.c:240
+#: ../clients/cli/connections.c:195
 msgid "DEVICES"
 msgstr "设备"
 
 #. 4
-#: ../clients/cli/connections.c:242
+#: ../clients/cli/connections.c:197
 msgid "DEFAULT"
 msgstr "默认"
 
 #. 5
-#: ../clients/cli/connections.c:243
+#: ../clients/cli/connections.c:198
 msgid "DEFAULT6"
-msgstr "默认6"
+msgstr "DEFAULT6"
 
 #. 6
-#: ../clients/cli/connections.c:244
+#: ../clients/cli/connections.c:199
 msgid "SPEC-OBJECT"
-msgstr "指定对象"
+msgstr "SPEC 对象"
 
 #. 7
 #. 4
-#: ../clients/cli/connections.c:245 ../clients/cli/connections.c:283
-#: ../clients/tui/nm-editor-utils.c:233
+#. Ask for optional 'vpn' arguments.
+#: ../clients/cli/connections.c:200 ../clients/cli/connections.c:238
+#: ../clients/cli/connections.c:4169 ../clients/tui/nm-editor-utils.c:233
 #: ../clients/tui/nmt-connect-connection-list.c:405
 msgid "VPN"
-msgstr "VPN 参数"
+msgstr "VPN"
 
 #. 9
 #. 5
 #. 22
-#: ../clients/cli/connections.c:247 ../clients/cli/devices.c:46
+#: ../clients/cli/connections.c:202 ../clients/cli/devices.c:46
 #: ../clients/cli/devices.c:78
 msgid "CON-PATH"
-msgstr "连接路径"
+msgstr "CON-PATH"
 
 #. 10
-#: ../clients/cli/connections.c:248
+#: ../clients/cli/connections.c:203
 msgid "ZONE"
-msgstr "区"
+msgstr "ZONE"
 
 #. 11
-#: ../clients/cli/connections.c:249
+#: ../clients/cli/connections.c:204
 msgid "MASTER-PATH"
-msgstr "主路径"
+msgstr "MASTER-PATH"
 
 #. 1
-#: ../clients/cli/connections.c:261
+#: ../clients/cli/connections.c:216
 msgid "USERNAME"
-msgstr "用户名"
+msgstr "USERNAME"
 
 #. 3
-#: ../clients/cli/connections.c:263
+#: ../clients/cli/connections.c:218
 msgid "BANNER"
-msgstr "连接标语"
+msgstr "BANNER"
 
 #. 4
-#: ../clients/cli/connections.c:264
+#: ../clients/cli/connections.c:219
 msgid "VPN-STATE"
-msgstr "VPN状态"
+msgstr "VPN-STATE"
 
 #. 5
-#: ../clients/cli/connections.c:265
+#: ../clients/cli/connections.c:220
 msgid "CFG"
-msgstr "配置"
+msgstr "CFG"
 
-#: ../clients/cli/connections.c:278 ../clients/cli/devices.c:235
+#: ../clients/cli/connections.c:233 ../clients/cli/devices.c:225
 msgid "GENERAL"
 msgstr "常规"
 
 #. 0
 #. 6
-#: ../clients/cli/connections.c:279 ../clients/cli/devices.c:242
+#: ../clients/cli/connections.c:234 ../clients/cli/devices.c:232
 msgid "IP4"
 msgstr "IP4"
 
 #. 1
 #. 7
-#: ../clients/cli/connections.c:280 ../clients/cli/devices.c:243
+#: ../clients/cli/connections.c:235 ../clients/cli/devices.c:233
 msgid "DHCP4"
 msgstr "DHCP4"
 
 #. 2
 #. 8
-#: ../clients/cli/connections.c:281 ../clients/cli/devices.c:244
+#: ../clients/cli/connections.c:236 ../clients/cli/devices.c:234
 msgid "IP6"
 msgstr "IP6"
 
 #. 3
 #. 9
-#: ../clients/cli/connections.c:282 ../clients/cli/devices.c:245
+#: ../clients/cli/connections.c:237 ../clients/cli/devices.c:235
 msgid "DHCP6"
 msgstr "DHCP6"
 
-#: ../clients/cli/connections.c:314
+#: ../clients/cli/connections.c:272
 #, c-format
 msgid ""
 "Usage: nmcli connection { COMMAND | help }\n"
@@ -914,8 +868,8 @@ msgid ""
 "\n"
 "  down [id | uuid | path | apath] <ID> ...\n"
 "\n"
-"  add COMMON_OPTIONS TYPE_SPECIFIC_OPTIONS SLAVE_OPTIONS IP_OPTIONS [-- "
-"([+|-]<setting>.<property> <value>)+]\n"
+"  add COMMON_OPTIONS TYPE_SPECIFIC_OPTIONS SLAVE_OPTIONS IP_OPTIONS [-- ([+|-"
+"]<setting>.<property> <value>)+]\n"
 "\n"
 "  modify [--temporary] [id | uuid | path] <ID> ([+|-]<setting>.<property> "
 "<value>)+\n"
@@ -938,28 +892,29 @@ msgid ""
 "  export [id | uuid | path] <ID> [<output file>]\n"
 "\n"
 msgstr ""
-"用法：nmcli connection { 命令 | help }\n"
+"用法：nmcli connection { COMMAND | help }\n"
 "\n"
-"命令 := { show | up | down | add | modify | edit | delete | monitor | reload "
-"| load }\n"
+"COMMAND := { show | up | down | add | modify | edit | delete | monitor | "
+"reload | load }\n"
 "\n"
-"  show [--active] [--order <旧的指定>]\n"
+"  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 COMMON_OPTIONS TYPE_SPECIFIC_OPTIONS SLAVE_OPTIONS IP_OPTIONS [-- "
-"([+|-]<设置>.<属性> <值>)+]\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"
@@ -967,14 +922,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:336
+#: ../clients/cli/connections.c:294
 #, c-format
 msgid ""
 "Usage: nmcli connection show { ARGUMENTS | help }\n"
@@ -1000,23 +955,20 @@ 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"
-"正在使用那些连接配置文件。不带参数，所有的配置文件会被列出。当指\n"
-"定 --active 选项时，只显示活动的配置文件。--order 选项允许自定义连接\n"
-"顺序（见手册页）。\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”选项就可以过滤输出。 请参阅手册页了\n"
-"解更多信息。当指定全局选项“--active”时，只考虑活动的配置文件在内。\n"
-"使用全局 --show--secrets 选项可以一并显示密钥。\n"
+"显示指定的连接的细节。在默认情况下，静态配置和活动连接数据都会被显示。您可以用全局的 '--fields' 选项过滤输出。更多信息请参考手册页。当指定 -"
+"-active 选项时，只会考虑活动的配置集。请使用全局的 --show-secrets 选项来显示关联的秘密。\n"
 
-#: ../clients/cli/connections.c:357
+#: ../clients/cli/connections.c:315
 #, c-format
 msgid ""
 "Usage: nmcli connection up { ARGUMENTS | help }\n"
@@ -1040,25 +992,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"
-"激活连接上的设备。连接配置文件由网络管理器自动选择。 \n"
+"用连接激活设备。NetworkManager 会自动选择连接配置集。\n"
 "\n"
-"ifname      - 指定连接所在要激活的设备\n"
+"ifname      - 指定激活连接所用的设备\n"
 "ap          - 指定要连接的 AP（只对 Wi-Fi 有效）\n"
-"nsp         - 指定要连接到的 NSP（只对 WiMAX 有效）\n"
-"passwd-file - 激活连接所需要的带密码的文件\n"
-"\n"
+"nsp         - 指定要连接的 NSP（只对 WiMAX 有效）\n"
+"passwd-file - 激活连接所需的密码\n"
 
-#: ../clients/cli/connections.c:378
+#: ../clients/cli/connections.c:336
 #, c-format
 msgid ""
 "Usage: nmcli connection down { ARGUMENTS | help }\n"
@@ -1071,21 +1022,20 @@ 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"
-"停止来自设备上的连接（不防止设备以后的自动激活）。要取消激活的配置\n"
-"文件由它的名称、UUID 或 D-Bus 路径确定。\n"
+"取消激活设备的连接（无需阻止设备再次自动激活）。要取消激活的配置集是由它的名称、UUID 或 D-Bus 路径来确定的。\n"
 "\n"
 
-#: ../clients/cli/connections.c:390
+#: ../clients/cli/connections.c:348
 #, 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"
+"ARGUMENTS := COMMON_OPTIONS TYPE_SPECIFIC_OPTIONS SLAVE_OPTIONS IP_OPTIONS [-"
+"- ([+|-]<setting>.<property> <value>)+]\n"
 "\n"
 "  COMMON_OPTIONS:\n"
 "                  type <type>\n"
@@ -1172,8 +1122,8 @@ msgid ""
 "                  [path-cost <1-65535>]\n"
 "                  [hairpin yes|no]\n"
 "\n"
-"    vpn:          vpn-type vpnc|openvpn|pptp|openconnect|openswan|libreswan|"
-"ssh|l2tp|iodine|...\n"
+"    vpn:          vpn-type "
+"vpnc|openvpn|pptp|openconnect|openswan|libreswan|ssh|l2tp|iodine|...\n"
 "                  [user <username>]\n"
 "\n"
 "    olpc-mesh:    ssid <SSID>\n"
@@ -1221,106 +1171,107 @@ msgid ""
 "                  [ip6 <IPv6 address>] [gw6 <IPv6 gateway>]\n"
 "\n"
 msgstr ""
-"用法：nmcli connection add { 参数 | help }\n"
+"用法：nmcli connection add { ARGUMENTS | help }\n"
 "\n"
-"参数 := 通用选项 类型指定选项 从选项 IP选项 [-- ([+|-]<设置>.<属性> <值>)+]\n"
+"ARGUMENTS := COMMON_OPTIONS TYPE_SPECIFIC_OPTIONS SLAVE_OPTIONS IP_OPTIONS [-"
+"- ([+|-]<setting>.<property> <value>)+]\n"
 "\n"
-"  通用选项：\n"
-"                  type <类型>\n"
-"                  ifname <接口名称> | \"*\"\n"
-"                  [con-name <连接名称>]\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 <主连接（接口名称或是连接的 UUID 或名称）>]\n"
-"                  [slave-type <主连接类型>]\n"
+"                  [master <master (ifname, or connection UUID or name)>]\n"
+"                  [slave-type <master connection type>]\n"
 "\n"
-"  类型指定选项：\n"
-"    ethernet:     [mac <MAC 地址>]\n"
-"                  [cloned-mac <克隆的 MAC 地址>]\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 地址>]\n"
-"                  [cloned-mac <克隆的 MAC 地址>]\n"
+"                  [mac <MAC address>]\n"
+"                  [cloned-mac <cloned MAC address>]\n"
 "                  [mtu <MTU>]\n"
 "                  [mode infrastructure|ap|adhoc]\n"
 "\n"
-"    wimax:        [mac <MAC 地址>]\n"
+"    wimax:        [mac <MAC address>]\n"
 "                  [nsp <NSP>]\n"
 "\n"
-"    pppoe:        username <PPPoE 用户名>\n"
-"                  [password <PPPoE 密码>]\n"
-"                  [service <PPPoE 服务名>]\n"
+"    pppoe:        username <PPPoE username>\n"
+"                  [password <PPPoE password>]\n"
+"                  [service <PPPoE service name>]\n"
 "                  [mtu <MTU>]\n"
-"                  [mac <MAC 地址>]\n"
+"                  [mac <MAC address>]\n"
 "\n"
 "    gsm:          apn <APN>\n"
-"                  [user <用户名>]\n"
-"                  [password <密码>]\n"
+"                  [user <username>]\n"
+"                  [password <password>]\n"
 "\n"
-"    cdma:         [user <用户名>]\n"
-"                  [password <密码>]\n"
+"    cdma:         [user <username>]\n"
+"                  [password <password>]\n"
 "\n"
-"    infiniband:   [mac <MAC 地址>]\n"
+"    infiniband:   [mac <MAC address>]\n"
 "                  [mtu <MTU>]\n"
 "                  [transport-mode datagram | connected]\n"
-"                  [parent <接口名称>]\n"
+"                  [parent <ifname>]\n"
 "                  [p-key <IPoIB P_Key>]\n"
 "\n"
-"    bluetooth:    [addr <蓝牙地址>]\n"
+"    bluetooth:    [addr <bluetooth address>]\n"
 "                  [bt-type panu|dun-gsm|dun-cdma]\n"
 "\n"
-"    vlan:         dev <上级设备（连接 UUID、接口名称或 MAC）>\n"
+"    vlan:         dev <parent device (connection UUID, ifname, or MAC)>\n"
 "                  id <VLAN ID>\n"
-"                  [flags <VLAN 标志>]\n"
-"                  [ingress <入口优先级映射>]\n"
-"                  [egress <出口优先级映射>]\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 <接口名称>]\n"
-"                  [miimon <数值>]\n"
-"                  [downdelay <数值>]\n"
-"                  [updelay <数值>]\n"
-"                  [arp-interval <数值>]\n"
-"                  [arp-ip-target <数值>]\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 <主（接口名称或是连接的 UUID 或名称）>\n"
+"    bond-slave:   master <master (ifname, or connection UUID or name)>\n"
 "\n"
-"    team:         [config <文件>|<原始 JSON 数据>]\n"
+"    team:         [config <file>|<raw JSON data>]\n"
 "\n"
-"    team-slave:   master <主（接口名称或是连接的 UUID 或名称）>\n"
-"                  [config <文件>|<原始 JSON 数据>]\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 <数值>]\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 地址>]\n"
+"                  [mac <MAC address>]\n"
 "\n"
-"    bridge-slave: master <主（接口名称或是连接的 UUID 或名称）>\n"
+"    bridge-slave: master <master (ifname, or connection UUID or name)>\n"
 "                  [priority <0-63>]\n"
 "                  [path-cost <1-65535>]\n"
 "                  [hairpin yes|no]\n"
 "\n"
-"    vpn:          vpn-type vpnc|openvpn|pptp|openconnect|openswan|libreswan|"
-"ssh|l2tp|iodine|...\n"
-"                  [user <用户名>]\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 地址>]\n"
+"                  [dhcp-anycast <MAC address>]\n"
 "\n"
-"    adsl:         username <用户名>\n"
+"    adsl:         username <username>\n"
 "                  protocol pppoa|pppoe|ipoatm\n"
-"                  [password <密码>]\n"
+"                  [password <password>]\n"
 "                  [encapsulation vcmux|llc]\n"
 "\n"
 "    tun:          mode tun|tap\n"
@@ -1331,18 +1282,18 @@ msgstr ""
 "                  [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"
+"                  remote <remote endpoint IP>\n"
+"                  [local <local endpoint IP>]\n"
+"                  [dev <parent device (ifname or connection UUID)>]\n"
 "\n"
-"    macvlan:      dev <上级设备（连接 UUID、接口名称或 MAC）>\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 或远程地址>\n"
-"                  [local <源 IP>]\n"
-"                  [dev <上级设备（接口名称或连接 UUID）>]\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"
@@ -1352,14 +1303,14 @@ msgstr ""
 "                  [path-cost <1-65535>]\n"
 "                  [hairpin yes|no]\n"
 "\n"
-"    team:         [config <文件>|<原始 JSON 数据>]\n"
+"    team:         [config <file>|<raw JSON data>]\n"
 "\n"
-"  IP 选项：\n"
-"                  [ip4 <IPv4 地址>] [gw4 <IPv4 网关>]\n"
-"                  [ip6 <IPv6 地址>] [gw6 <IPv6 网关>]\n"
+"  IP_OPTIONS:\n"
+"                  [ip4 <IPv4 address>] [gw4 <IPv4 gateway>]\n"
+"                  [ip6 <IPv6 address>] [gw6 <IPv6 gateway>]\n"
 "\n"
 
-#: ../clients/cli/connections.c:502
+#: ../clients/cli/connections.c:460
 #, c-format
 msgid ""
 "Usage: nmcli connection modify { ARGUMENTS | help }\n"
@@ -1374,8 +1325,8 @@ msgid ""
 "\n"
 "Examples:\n"
 "nmcli con mod home-wifi wifi.ssid rakosnicek\n"
-"nmcli con mod em1-1 ipv4.method manual ipv4.addr \"192.168.1.2/24, "
-"10.10.1.5/8\"\n"
+"nmcli con mod em1-1 ipv4.method manual ipv4.addr \"192.168.1.2/24, 10.10.1.5/"
+"8\"\n"
 "nmcli con mod em1-1 +ipv4.dns 8.8.4.4\n"
 "nmcli con mod em1-1 -ipv4.dns 1\n"
 "nmcli con mod em1-1 -ipv6.addr \"abbe::cafe/56\"\n"
@@ -1383,20 +1334,17 @@ 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"
-"修改连接配置文件的一个或更多属性。\n"
-"该配置文件由名称、UUID 或 D-Bus 路径确定。对于多值属性，可以使用可选"
-"的“+”或“-”前插到属性名称。\n"
-"“+”符号允许追加项目而不是覆盖去全部的值。\n"
-"“-”符号允许移除所选项目而不是全部的值。\n"
+"修改连接配置集的一个或多个属性。配置集是由其名称、UUID 或 D-Bus 路径来确定的。对于具有多个值的属性，您可以为属性名称使用可选的 '+' 或 "
+"'-' 前缀。'+' 标志允许附加项而不是覆盖整个值。'-' 标志允许删除选择的项而不是整个值。\n"
 "\n"
 "示例：\n"
 "nmcli con mod home-wifi wifi.ssid rakosnicek\n"
-"nmcli con mod em1-1 ipv4.method manual ipv4.addr \"192.168.1.2/24, "
-"10.10.1.5/8\"\n"
+"nmcli con mod em1-1 ipv4.method manual ipv4.addr \"192.168.1.2/24, 10.10.1.5/"
+"8\"\n"
 "nmcli con mod em1-1 +ipv4.dns 8.8.4.4\n"
 "nmcli con mod em1-1 -ipv4.dns 1\n"
 "nmcli con mod em1-1 -ipv6.addr \"abbe::cafe/56\"\n"
@@ -1404,7 +1352,7 @@ msgstr ""
 "nmcli con mod bond0 -bond.options downdelay\n"
 "\n"
 
-#: ../clients/cli/connections.c:525
+#: ../clients/cli/connections.c:483
 #, c-format
 msgid ""
 "Usage: nmcli connection clone { ARGUMENTS | help }\n"
@@ -1412,20 +1360,18 @@ msgid ""
 "ARGUMENTS := [--temporary] [id | uuid | path] <ID> <new name>\n"
 "\n"
 "Clone an existing connection profile. The newly created connection will be\n"
-"the exact copy of the <ID>, except the uuid property (will be generated) "
-"and\n"
+"the exact copy of the <ID>, except the uuid property (will be generated) and\n"
 "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> 的完全复制，\n"
-"除了 uuid 属性（将被生成）和 id（提供为 <新名称> 的参数）。\n"
+"克隆现有的连接配置集。新创建的连接将是 <ID> 的拷贝，除了 UUID 属性（将被生成）和 ID（作为 <new name> 参数提供）不同。\n"
 "\n"
 
-#: ../clients/cli/connections.c:537
+#: ../clients/cli/connections.c:495
 #, c-format
 msgid ""
 "Usage: nmcli connection edit { ARGUMENTS | help }\n"
@@ -1440,19 +1386,19 @@ msgid ""
 "Add a new connection profile in an interactive editor.\n"
 "\n"
 msgstr ""
-"用法：nmcli connection edit { 参数 | help }\n"
+"用法：nmcli connection edit { ARGUMENTS | help }\n"
 "\n"
-"参数 := [id | uuid | path] <ID>\n"
+"ARGUMENTS := [id | uuid | path] <ID>\n"
 "\n"
-"在交互式编辑器中编辑已有的连接配置文件。\n"
-"该配置文件由名称、UUID 或 D-Bus 路径确定。\n"
+"Edit an existing connection profile in an interactive editor.\n"
+"The profile is identified by its name, UUID or D-Bus path\n"
 "\n"
-"参数 := [type <新连接类型>] [con-name <新连接名称>]\n"
+"ARGUMENTS := [type <new connection type>] [con-name <new connection name>]\n"
 "\n"
-"在交互式编辑器中添加新的连接配置文件。\n"
+"Add a new connection profile in an interactive editor.\n"
 "\n"
 
-#: ../clients/cli/connections.c:552
+#: ../clients/cli/connections.c:510
 #, c-format
 msgid ""
 "Usage: nmcli connection delete { ARGUMENTS | help }\n"
@@ -1463,15 +1409,15 @@ msgid ""
 "The profile is identified by its name, UUID or D-Bus path.\n"
 "\n"
 msgstr ""
-"用法：nmcli connection delete { 参数 | help }\n"
+"用法：nmcli connection delete { ARGUMENTS | help }\n"
 "\n"
-"参数 := [id | uuid | path] <ID>\n"
+"ARGUMENTS := [id | uuid | path] <ID>\n"
 "\n"
-"删除一个连接配置文件。\n"
-"该配置文件由名称、UUID 或 D-Bus 路径确定。\n"
+"Delete a connection profile.\n"
+"The profile is identified by its name, UUID or D-Bus path.\n"
 "\n"
 
-#: ../clients/cli/connections.c:563
+#: ../clients/cli/connections.c:521
 #, c-format
 msgid ""
 "Usage: nmcli connection monitor { ARGUMENTS | help }\n"
@@ -1483,17 +1429,13 @@ msgid ""
 "Monitors all connection profiles in case none is specified.\n"
 "\n"
 msgstr ""
-"用法：nmcli connection monitor { 参数 | help }\n"
-"\n"
-"参数 := [id | uuid | path] <ID> ...\n"
-"\n"
-"监控连接配置文件的活动。\n"
-"此命令输出一行只要指定的连接一改变。\n"
-"如果没有指定就监控所有的连接。\n"
+"用法：nmcli connection monitor { ARGUMENTS | help }\n"
 "\n"
+"ARGUMENTS := [id | uuid | path] <ID> ...\n"
 "\n"
+"监控连接配置集活动。每当指定的连接修改时，这个命令会打印一行。如果没有指定则监控所有的连接。 \n"
 
-#: ../clients/cli/connections.c:575
+#: ../clients/cli/connections.c:533
 #, c-format
 msgid ""
 "Usage: nmcli connection reload { help }\n"
@@ -1503,10 +1445,10 @@ msgid ""
 msgstr ""
 "用法：nmcli connection reload { help }\n"
 "\n"
-"从磁盘重新载入所有的连接文件。\n"
+"Reload all connection files from disk.\n"
 "\n"
 
-#: ../clients/cli/connections.c:583
+#: ../clients/cli/connections.c:541
 #, c-format
 msgid ""
 "Usage: nmcli connection load { ARGUMENTS | help }\n"
@@ -1519,16 +1461,17 @@ msgid ""
 "state.\n"
 "\n"
 msgstr ""
-"用法：nmcli connection load { 参数 | help }\n"
+"用法： nmcli connection load { ARGUMENTS | help }\n"
 "\n"
-"参数 := <文件名> [<文件名>...]\n"
+"ARGUMENTS := <filename> [<filename>...]\n"
 "\n"
-"从磁盘加载/重载一个或多个连接文件。在手动编辑\n"
-"连接文件后使用此方法以确保网络管理器能注意到\n"
-"最新状态。\n"
+"Load/reload one or more connection files from disk. Use this after manually\n"
+"editing a connection file to ensure that NetworkManager is aware of its "
+"latest\n"
+"state.\n"
 "\n"
 
-#: ../clients/cli/connections.c:595
+#: ../clients/cli/connections.c:553
 #, c-format
 msgid ""
 "Usage: nmcli connection import { ARGUMENTS | help }\n"
@@ -1542,17 +1485,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"
-"导入对外/外部配置文件作为网络管理器的连接配置文件。\n"
-"输入文件的类型在类型选项中指定。\n"
-"现在只支持 VPN 配置。配置由网络管\n"
-"理器的 VPN 插件导入。\n"
+"将外部配置作为 NetworkManager 连接配置导入。输入文件的类型是由 type 选项指定的。目前只支持 VPN 配置。配置是通过 "
+"NetworkManager VPN 插件导入的。\n"
 "\n"
 
-#: ../clients/cli/connections.c:608
+#: ../clients/cli/connections.c:566
 #, c-format
 msgid ""
 "Usage: nmcli connection export { ARGUMENTS | help }\n"
@@ -1563,888 +1504,1291 @@ 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"
-"标准输出或者如果给定了名称就定向到文件。\n"
+"ARGUMENTS := [id | uuid | path] <ID> [<output file>]\n"
 "\n"
+"导出连接。目前只支持 VPN 连接。数据会导出到标准输出或指定的文件。\n"
 
-#: ../clients/cli/connections.c:686
+#: ../clients/cli/connections.c:644
 msgid "activating"
 msgstr "激活中"
 
-#: ../clients/cli/connections.c:688
+#: ../clients/cli/connections.c:646
 msgid "activated"
 msgstr "已激活"
 
-#: ../clients/cli/connections.c:692
+#: ../clients/cli/connections.c:650
 msgid "deactivated"
-msgstr "已取消激活"
+msgstr "已取消激活的"
 
-#: ../clients/cli/connections.c:704
+#: ../clients/cli/connections.c:662
 msgid "VPN connecting (prepare)"
 msgstr "VPN 连接(准备)"
 
-#: ../clients/cli/connections.c:706
+#: ../clients/cli/connections.c:664
 msgid "VPN connecting (need authentication)"
 msgstr "VPN 连接中(需要验证)"
 
-#: ../clients/cli/connections.c:708
+#: ../clients/cli/connections.c:666
 msgid "VPN connecting"
 msgstr "VPN 连接中"
 
-#: ../clients/cli/connections.c:710
+#: ../clients/cli/connections.c:668
 msgid "VPN connecting (getting IP configuration)"
 msgstr "VPN 连接中(获取 IP 配置)"
 
-#: ../clients/cli/connections.c:712
+#: ../clients/cli/connections.c:670
 msgid "VPN connected"
-msgstr "VPN 已连接"
+msgstr "VPN 连接"
 
-#: ../clients/cli/connections.c:714
+#: ../clients/cli/connections.c:672
 msgid "VPN connection failed"
 msgstr "VPN 连接失败"
 
-#: ../clients/cli/connections.c:716
+#: ../clients/cli/connections.c:674
 msgid "VPN disconnected"
-msgstr "VPN 已断开"
+msgstr "断开 VPN 连接"
 
-#: ../clients/cli/connections.c:786
+#: ../clients/cli/connections.c:744
 #, c-format
 msgid "Error updating secrets for %s: %s\n"
-msgstr "为 %s 更新密钥时出错：%s\n"
+msgstr "更新 %s 的秘密出错：%s\n"
 
-#: ../clients/cli/connections.c:806
+#: ../clients/cli/connections.c:764
 msgid "Connection profile details"
-msgstr "连接配置文件详情"
+msgstr "连接配置集详情"
 
-#: ../clients/cli/connections.c:818 ../clients/cli/connections.c:1211
+#: ../clients/cli/connections.c:776 ../clients/cli/connections.c:1169
 #, c-format
 msgid "Error: 'connection show': %s"
-msgstr "错误：“connection show”：%s"
+msgstr "错误：'connection show': %s"
 
-#: ../clients/cli/connections.c:974 ../clients/cli/settings.c:1950
+#: ../clients/cli/connections.c:932 ../clients/cli/settings.c:1897
 msgid "never"
 msgstr "从不"
 
-#: ../clients/cli/connections.c:1199
-#, fuzzy
+#: ../clients/cli/connections.c:1157
 msgid "Activate connection details"
-msgstr "活跃连接详情"
+msgstr "激活连接细节"
 
-#: ../clients/cli/connections.c:1435
+#: ../clients/cli/connections.c:1393
 #, 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:1450 ../clients/cli/connections.c:1458
+#: ../clients/cli/connections.c:1408 ../clients/cli/connections.c:1416
 #, c-format
 msgid "'%s' has to be alone"
-msgstr "“%s”必须是单独的"
+msgstr "'%s' 必须是单独的"
 
 #. Add headers
-#: ../clients/cli/connections.c:1680
+#: ../clients/cli/connections.c:1634
 msgid "NetworkManager active profiles"
-msgstr "网络管理器的活跃配置文件"
+msgstr "NetworkManager 的活动配置集"
 
-#: ../clients/cli/connections.c:1681
+#: ../clients/cli/connections.c:1635
 msgid "NetworkManager connection profiles"
-msgstr "网络管理器连接配置文件"
-
-#.
-#. * TODO(?): complete uuid, path or id
-#. if (nmc->complete) {
-#. quit ();
-#. }
-#.
-#: ../clients/cli/connections.c:1727 ../clients/cli/connections.c:2445
-#: ../clients/cli/connections.c:2467 ../clients/cli/connections.c:2476
-#: ../clients/cli/connections.c:2485 ../clients/cli/connections.c:2648
-#: ../clients/cli/connections.c:7777 ../clients/cli/connections.c:7896
-#: ../clients/cli/connections.c:8032 ../clients/cli/connections.c:8170
-#: ../clients/cli/connections.c:8289 ../clients/cli/connections.c:8300
-#: ../clients/cli/connections.c:8410 ../clients/cli/devices.c:2402
-#: ../clients/cli/devices.c:2410 ../clients/cli/devices.c:2736
-#: ../clients/cli/devices.c:2743 ../clients/cli/devices.c:2757
-#: ../clients/cli/devices.c:2764 ../clients/cli/devices.c:2781
-#: ../clients/cli/devices.c:2789 ../clients/cli/devices.c:2802
-#: ../clients/cli/devices.c:3166 ../clients/cli/devices.c:3173
-#: ../clients/cli/devices.c:3180 ../clients/cli/devices.c:3192
-#: ../clients/cli/devices.c:3205 ../clients/cli/devices.c:3212
-#: ../clients/cli/devices.c:3384 ../clients/cli/devices.c:3391
-#: ../clients/cli/devices.c:3564
+msgstr "NetworkManager 连接配置集"
+
+#: ../clients/cli/connections.c:1681 ../clients/cli/connections.c:2389
+#: ../clients/cli/connections.c:2411 ../clients/cli/connections.c:2420
+#: ../clients/cli/connections.c:2429 ../clients/cli/connections.c:2588
+#: ../clients/cli/connections.c:10156 ../clients/cli/connections.c:10273
+#: ../clients/cli/connections.c:10405 ../clients/cli/connections.c:10538
+#: ../clients/cli/connections.c:10648 ../clients/cli/connections.c:10659
+#: ../clients/cli/connections.c:10758 ../clients/cli/devices.c:2344
+#: ../clients/cli/devices.c:2352 ../clients/cli/devices.c:2675
+#: ../clients/cli/devices.c:2682 ../clients/cli/devices.c:2696
+#: ../clients/cli/devices.c:2703 ../clients/cli/devices.c:2720
+#: ../clients/cli/devices.c:2728 ../clients/cli/devices.c:2741
+#: ../clients/cli/devices.c:3105 ../clients/cli/devices.c:3112
+#: ../clients/cli/devices.c:3119 ../clients/cli/devices.c:3131
+#: ../clients/cli/devices.c:3144 ../clients/cli/devices.c:3151
+#: ../clients/cli/devices.c:3323 ../clients/cli/devices.c:3330
+#: ../clients/cli/devices.c:3503
 #, c-format
 msgid "Error: %s argument is missing."
 msgstr "错误：缺少 %s 参数。"
 
-#: ../clients/cli/connections.c:1742
+#: ../clients/cli/connections.c:1696
 #, c-format
 msgid "Error: %s - no such connection profile."
-msgstr "错误：%s - 没有这个连接配置文件。"
+msgstr "错误：%s - 没有这样的连接配置集。"
 
-#: ../clients/cli/connections.c:1801 ../clients/cli/connections.c:2508
-#: ../clients/cli/connections.c:8825 ../clients/cli/devices.c:3353
-#: ../clients/cli/devices.c:3834 ../clients/cli/general.c:528
-#: ../clients/cli/general.c:577 ../clients/cli/general.c:594
-#: ../clients/cli/general.c:633 ../clients/cli/general.c:647
-#: ../clients/cli/general.c:765 ../clients/cli/general.c:812
-#: ../clients/cli/general.c:832
+#: ../clients/cli/connections.c:1755 ../clients/cli/connections.c:2452
+#: ../clients/cli/connections.c:11162 ../clients/cli/devices.c:3292
+#: ../clients/cli/devices.c:3779 ../clients/cli/general.c:539
+#: ../clients/cli/general.c:588 ../clients/cli/general.c:605
+#: ../clients/cli/general.c:644 ../clients/cli/general.c:658
+#: ../clients/cli/general.c:776 ../clients/cli/general.c:823
+#: ../clients/cli/general.c:843
 #, c-format
 msgid "Error: %s."
 msgstr "错误：%s。"
 
-#: ../clients/cli/connections.c:1897
+#: ../clients/cli/connections.c:1851
 #, c-format
 msgid "no active connection on device '%s'"
-msgstr "设备“%s”中没有活跃连接"
+msgstr "设备 '%s' 中没有活跃连接"
 
-#: ../clients/cli/connections.c:1905
+#: ../clients/cli/connections.c:1859
 msgid "no active connection or device"
 msgstr "没有活跃连接或者设备"
 
-#: ../clients/cli/connections.c:1956
+#: ../clients/cli/connections.c:1910
 #, c-format
 msgid "device '%s' not compatible with connection '%s'"
-msgstr "设备“%s”不兼容连接“%s”"
+msgstr "设备 '%s' 不兼容连接 '%s'"
 
-#: ../clients/cli/connections.c:1959
+#: ../clients/cli/connections.c:1913
 #, c-format
 msgid "no device found for connection '%s'"
-msgstr "没有找到可用于连接“%s”的设备"
+msgstr "没有找到可用于连接 '%s' 的设备"
 
-#: ../clients/cli/connections.c:1971
+#: ../clients/cli/connections.c:1925
 msgid "unknown reason"
 msgstr "未知原因"
 
-#: ../clients/cli/connections.c:1973 ../clients/cli/general.c:278
+#: ../clients/cli/connections.c:1927 ../clients/cli/general.c:277
 msgid "none"
 msgstr "无"
 
-#: ../clients/cli/connections.c:1975
+#: ../clients/cli/connections.c:1929
 msgid "the user was disconnected"
 msgstr "用户已断开连接"
 
-#: ../clients/cli/connections.c:1977
+#: ../clients/cli/connections.c:1931
 msgid "the base network connection was interrupted"
 msgstr "基点网络连接中断"
 
-#: ../clients/cli/connections.c:1979
+#: ../clients/cli/connections.c:1933
 msgid "the VPN service stopped unexpectedly"
 msgstr "VPN 服务意外停止"
 
-#: ../clients/cli/connections.c:1981
+#: ../clients/cli/connections.c:1935
 msgid "the VPN service returned invalid configuration"
 msgstr "VPN 服务返回无效配置"
 
-#: ../clients/cli/connections.c:1983
+#: ../clients/cli/connections.c:1937
 msgid "the connection attempt timed out"
 msgstr "连接尝试超时"
 
-#: ../clients/cli/connections.c:1985
+#: ../clients/cli/connections.c:1939
 msgid "the VPN service did not start in time"
 msgstr "VPN 连接没有按时启动"
 
-#: ../clients/cli/connections.c:1987
+#: ../clients/cli/connections.c:1941
 msgid "the VPN service failed to start"
 msgstr "VPN 服务启动失败"
 
-#: ../clients/cli/connections.c:1989
+#: ../clients/cli/connections.c:1943
 msgid "no valid VPN secrets"
 msgstr "没有有效的 VPN 加密"
 
-#: ../clients/cli/connections.c:1991
+#: ../clients/cli/connections.c:1945
 msgid "invalid VPN secrets"
 msgstr "无效 VPN 加密"
 
-#: ../clients/cli/connections.c:1993
+#: ../clients/cli/connections.c:1947
 msgid "the connection was removed"
 msgstr "连接被删除"
 
-#: ../clients/cli/connections.c:2015 ../clients/cli/connections.c:2050
-#: ../clients/cli/connections.c:2211 ../clients/cli/connections.c:6120
+#: ../clients/cli/connections.c:1969 ../clients/cli/connections.c:1997
+#: ../clients/cli/connections.c:2158 ../clients/cli/connections.c:8454
 #, c-format
 msgid "Connection successfully activated (D-Bus active path: %s)\n"
-msgstr "连接已成功激活（D-Bus 活动路径：%s）\n"
+msgstr "成功激活的连接（D-Bus 激活路径：%s）\n"
 
-#: ../clients/cli/connections.c:2023
+#: ../clients/cli/connections.c:1976
 #, c-format
 msgid ""
 "Connection successfully activated (master waiting for slaves) (D-Bus active "
 "path: %s)\n"
-msgstr "连接已成功激活（主连接正等待从连接）（D-Bus 活动路径：%s）\n"
+msgstr "成功激活（主服务器等待从服务器）连接（D-Bus 激活路径：%s）\n"
 
-#: ../clients/cli/connections.c:2030 ../clients/cli/connections.c:6126
-#, c-format
-msgid "Error: Connection activation failed.\n"
-msgstr "错误：激活连接失败。\n"
-
-#: ../clients/cli/connections.c:2033 ../clients/cli/connections.c:2055
+#: ../clients/cli/connections.c:1980 ../clients/cli/connections.c:2002
 #, c-format
 msgid "Error: Connection activation failed."
 msgstr "错误：激活连接失败。"
 
-#: ../clients/cli/connections.c:2106
+#: ../clients/cli/connections.c:2053
 #, c-format
 msgid "VPN connection successfully activated (D-Bus active path: %s)\n"
-msgstr "VPN 连接成功激活(D-Bus 活动路径：%s)\n"
+msgstr "成功激活的 VPN 连接（D-Bus 激活路径：%s）\n"
 
-#: ../clients/cli/connections.c:2114
+#: ../clients/cli/connections.c:2061
 #, c-format
 msgid "Error: Connection activation failed: %s."
 msgstr "错误：激活连接失败：%s。"
 
-#: ../clients/cli/connections.c:2133 ../clients/cli/devices.c:1506
+#: ../clients/cli/connections.c:2080 ../clients/cli/devices.c:1426
 #, c-format
 msgid "Error: Timeout %d sec expired."
 msgstr "错误：超时 %d 秒过期。"
 
-#: ../clients/cli/connections.c:2193
+#: ../clients/cli/connections.c:2140
 #, c-format
 msgid "Error: Connection activation failed: %s"
 msgstr "错误：激活连接失败：%s"
 
-#: ../clients/cli/connections.c:2278
+#: ../clients/cli/connections.c:2225
 #, c-format
 msgid "failed to read passwd-file '%s': %s"
-msgstr "读取带密码的文件“%s”失败：%s"
+msgstr "读取 passwd-file '%s' 失败：%s"
 
-#: ../clients/cli/connections.c:2290
+#: ../clients/cli/connections.c:2237
 #, c-format
 msgid "missing colon in 'password' entry '%s'"
-msgstr "“password” 条目 “%s” 缺少冒号"
+msgstr "'password' 条目 '%s' 缺失了冒号"
 
-#: ../clients/cli/connections.c:2298
+#: ../clients/cli/connections.c:2245
 #, c-format
 msgid "missing dot in 'password' entry '%s'"
-msgstr "“password” 条目 “%s” 缺少点"
+msgstr "'password' 条目 '%s' 缺失了点号"
 
-#: ../clients/cli/connections.c:2311
+#: ../clients/cli/connections.c:2258
 #, c-format
 msgid "invalid setting name in 'password' entry '%s'"
-msgstr "在 “password” 条目 “%s” 中设置名称无效"
+msgstr "'password' 条目 '%s' 里出现无效的设置名称"
 
-#: ../clients/cli/connections.c:2367
+#: ../clients/cli/connections.c:2314
 #, c-format
 msgid "unknown device '%s'."
-msgstr "未知设备“%s”"
+msgstr "未知设备 '%s'。"
 
-#: ../clients/cli/connections.c:2372
+#: ../clients/cli/connections.c:2319
 msgid "neither a valid connection nor device given"
-msgstr "没有给定有效连接或者设备"
+msgstr "给定无效连接或者设备"
 
-#: ../clients/cli/connections.c:2458
+#: ../clients/cli/connections.c:2402
 #, c-format
 msgid "Error: Connection '%s' does not exist."
-msgstr "错误：连接“%s”不存在。"
+msgstr "错误：连接 '%s' 不存在。"
 
-#: ../clients/cli/connections.c:2493 ../clients/cli/devices.c:1405
-#: ../clients/cli/devices.c:2416 ../clients/cli/devices.c:2813
-#: ../clients/cli/devices.c:3397
+#: ../clients/cli/connections.c:2437 ../clients/cli/devices.c:1325
+#: ../clients/cli/devices.c:2358 ../clients/cli/devices.c:2752
+#: ../clients/cli/devices.c:3336
 #, c-format
 msgid "Unknown parameter: %s\n"
 msgstr "未知参数：%s\n"
 
-#: ../clients/cli/connections.c:2518
+#: ../clients/cli/connections.c:2462
 msgid "preparing"
-msgstr "正在准备"
+msgstr "准备中"
 
-#: ../clients/cli/connections.c:2539
+#: ../clients/cli/connections.c:2483
 #, c-format
 msgid "Connection '%s' (%s) successfully deleted.\n"
-msgstr "连接“%s”(%s) 已成功删除。\n"
+msgstr "成功删除连接 '%s'（%s）。\n"
 
-#: ../clients/cli/connections.c:2555
+#: ../clients/cli/connections.c:2499
 #, c-format
 msgid "Connection '%s' successfully deactivated (D-Bus active path: %s)\n"
-msgstr "连接“%s”已成功取消激活（D-Bus 活动路径：%s）\n"
+msgstr "成功取消激活连接 '%s'（D-Bus 活动路径：%s）\n"
+"\n"
 
-#: ../clients/cli/connections.c:2630 ../clients/cli/connections.c:8018
-#: ../clients/cli/connections.c:8226
+#: ../clients/cli/connections.c:2570 ../clients/cli/connections.c:10391
+#: ../clients/cli/connections.c:10590
 #, c-format
 msgid "Error: No connection specified."
 msgstr "错误：未指定连接。"
 
-#: ../clients/cli/connections.c:2662
+#: ../clients/cli/connections.c:2602
 #, c-format
 msgid "Error: '%s' is not an active connection.\n"
-msgstr "错误：“%s”并非活跃连接。\n"
+msgstr "错误：'%s' 不是活跃连接。\n"
 
-#: ../clients/cli/connections.c:2663 ../clients/cli/connections.c:8047
+#: ../clients/cli/connections.c:2603 ../clients/cli/connections.c:10420
 #, c-format
 msgid "Error: not all active connections found."
-msgstr "错误：没有找到所有活跃连接。"
+msgstr "错误：未找到所有的活动连接。"
 
-#: ../clients/cli/connections.c:2672
+#: ../clients/cli/connections.c:2612
 #, c-format
 msgid "Error: no active connection provided."
-msgstr "错误：未提供活跃连接。"
+msgstr "错误：未提供活动连接。"
 
-#: ../clients/cli/connections.c:3120 ../clients/cli/utils.c:648
+#: ../clients/cli/connections.c:2955 ../clients/cli/utils.c:702
 #, c-format
 msgid "'%s' not among [%s]"
-msgstr "“%s”不在 [%s] 之间"
+msgstr "'%s' 不在 [%s] 中"
+
+#: ../clients/cli/connections.c:3032
+#, c-format
+msgid "Error: '%s': '%s' is not a valid %s MAC address."
+msgstr "错误：'%s': '%s' 不是有效 %s MAC 地址。"
+
+#. Ask for optional arguments
+#: ../clients/cli/connections.c:3033 ../clients/cli/connections.c:3565
+#: ../clients/tui/nm-editor-utils.c:163 ../libnm-core/nm-connection.c:1716
+#: ../libnm-glib/nm-device.c:1861 ../libnm/nm-device.c:1812
+msgid "InfiniBand"
+msgstr "InfiniBand"
 
-#: ../clients/cli/connections.c:3280
+#: ../clients/cli/connections.c:3033 ../clients/tui/nm-editor-utils.c:146
+#: ../libnm-glib/nm-device.c:1849 ../libnm/nm-device.c:1800
+msgid "Ethernet"
+msgstr "以太网"
+
+#: ../clients/cli/connections.c:3053
+#, c-format
+msgid "Error: 'mtu': '%s' is not a valid MTU."
+msgstr "错误：'mtu': '%s' 不是有效 MTU。"
+
+#: ../clients/cli/connections.c:3069
+#, c-format
+msgid "Error: 'parent': '%s' is not a valid interface name."
+msgstr "错误：'parent': '%s' 不是有效接口名。"
+
+#: ../clients/cli/connections.c:3090
+#, c-format
+msgid "Error: 'p-key': '%s' is not a valid InfiniBand P_KEY."
+msgstr "错误：'p-key': '%s' 不是有效 InfiniBand P_KEY。"
+
+#: ../clients/cli/connections.c:3105
+#, c-format
+msgid "Error: '%s' is not a valid UID/GID."
+msgstr "错误：'%s' 不是有效的 UID/GID。"
+
+#: ../clients/cli/connections.c:3149
+#, c-format
+msgid "Error: '%s': '%s' is not a valid %s %s."
+msgstr "错误：'%s': '%s' 不是有效的 %s %s。"
+
+#: ../clients/cli/connections.c:3162
+msgid "Wi-Fi mode"
+msgstr "Wi-Fi 模式"
+
+#: ../clients/cli/connections.c:3171
+msgid "InfiniBand transport mode"
+msgstr "InfiniBand 传输模式"
+
+#: ../clients/cli/connections.c:3183
+msgid "ADSL protocol"
+msgstr "ADSL 协议"
+
+#: ../clients/cli/connections.c:3194
+msgid "ADSL encapsulation"
+msgstr "ADSL 封装"
+
+#: ../clients/cli/connections.c:3203
+msgid "TUN device mode"
+msgstr "TUN 设备模式"
+
+#: ../clients/cli/connections.c:3216
+#, c-format
+msgid "Error: 'flags': '%s' is not valid; use <0-7>."
+msgstr "错误：'flags': '%s' 无效；使用 <0-7>。"
+
+#: ../clients/cli/connections.c:3238
+#, c-format
+msgid "Error: '%s': '%s' is not valid; %s "
+msgstr "错误：'%s': '%s' 无效; %s"
+
+#: ../clients/cli/connections.c:3416
 #, c-format
 msgid "Warning: master='%s' doesn't refer to any existing profile.\n"
-msgstr "警告：主连接=“%s”没有引用任何已有的配置文件。\n"
+msgstr "警告: master='%s' 没有应用任何现有的配置集。\n"
 
-#: ../clients/cli/connections.c:3451
+#: ../clients/cli/connections.c:3441
 #, c-format
-msgid "Error: don't know how to create '%s' setting."
-msgstr "错误：不知道如何创建“%s”设置。"
+msgid "Error: '%s': '%s' is not valid; use <%u-%u>."
+msgstr "错误：'%s': '%s' 无效；使用 <%u-%u>。"
 
-#: ../clients/cli/connections.c:3462
+#. Ask for optional arguments.
+#: ../clients/cli/connections.c:3497
 #, c-format
-msgid "Error: invalid property '%s': %s."
-msgstr "错误：无效的属性“%s”：%s。"
+msgid "There is %d optional argument for '%s' connection type.\n"
+msgid_plural "There are %d optional arguments for '%s' connection type.\n"
+msgstr[0] "'%2$s' 连接类型有 %1$d 个可选参数。\n"
 
-#: ../clients/cli/connections.c:3479
+#: ../clients/cli/connections.c:3500
 #, c-format
-msgid "Error: failed to modify %s.%s: %s."
-msgstr "错误：修改 %s.%s 失败：%s。"
+msgid "Do you want to provide it? %s"
+msgid_plural "Do you want to provide them? %s"
+msgstr[0] "您要提供它吗？%s"
+
+#. Ask for optional arguments
+#: ../clients/cli/connections.c:3517
+msgid "ethernet"
+msgstr "以太网"
 
-#: ../clients/cli/connections.c:3498
+#: ../clients/cli/connections.c:3522 ../clients/cli/connections.c:3570
+#: ../clients/cli/connections.c:3704 ../clients/cli/connections.c:3783
+msgid "MTU [auto]: "
+msgstr "MTU [auto]: "
+
+#: ../clients/cli/connections.c:3533 ../clients/cli/connections.c:3581
+#: ../clients/cli/connections.c:3676 ../clients/cli/connections.c:3715
+#: ../clients/cli/connections.c:4101
+msgid "MAC [none]: "
+msgstr "MAC [none]: "
+
+#: ../clients/cli/connections.c:3544
+msgid "Cloned MAC [none]: "
+msgstr "克隆的 MAC [none]: "
+
+#: ../clients/cli/connections.c:3592
 #, c-format
-msgid "Error: failed to remove a value from %s.%s: %s."
-msgstr "错误：移除来自 %s.%s 的值失败：%s。"
+msgid "Transport mode %s"
+msgstr "传输模式 %s"
 
-#: ../clients/cli/connections.c:3524
-#, fuzzy, c-format
-msgid "Error: '%s' is mandatory."
-msgstr "错误：设置“%s”是必填的而且无法移除。\n"
+#: ../clients/cli/connections.c:3605
+msgid "Parent interface [none]: "
+msgstr "上级接口 [none]："
 
-#: ../clients/cli/connections.c:3556
-#, fuzzy, c-format
-msgid "Error: invalid slave type; %s."
-msgstr "错误：无效的连接类型；%s。"
+#: ../clients/cli/connections.c:3616
+msgid "P_KEY [none]: "
+msgstr "P_KEY [none]: "
 
-#: ../clients/cli/connections.c:3569
+#: ../clients/cli/connections.c:3626
 #, c-format
-msgid "Error: invalid connection type; %s."
-msgstr "错误：无效的连接类型；%s。"
+msgid "Error: 'p-key' is mandatory when 'parent' is specified.\n"
+msgstr "错误：指定 'parent' 时 'p-key' 是强制性的。\n"
+
+#. Ask for optional arguments
+#: ../clients/cli/connections.c:3643 ../clients/tui/nm-editor-utils.c:154
+#: ../libnm-glib/nm-device.c:1851 ../libnm/nm-device.c:1802
+msgid "Wi-Fi"
+msgstr "Wi-Fi"
+
+#: ../clients/cli/connections.c:3651 ../clients/cli/connections.c:6199
+#, c-format
+msgid "Mode %s"
+msgstr "模式 %s"
+
+#. Ask for optional 'wimax' arguments.
+#: ../clients/cli/connections.c:3671 ../libnm-glib/nm-device.c:1857
+#: ../libnm/nm-device.c:1808
+msgid "WiMAX"
+msgstr "WiMAX"
+
+#. Ask for optional 'pppoe' arguments.
+#: ../clients/cli/connections.c:3694
+msgid "PPPoE"
+msgstr "PPPoE"
+
+#: ../clients/cli/connections.c:3698 ../clients/cli/connections.c:3736
+#: ../clients/cli/connections.c:4223
+msgid "Password [none]: "
+msgstr "密码 [none]: "
 
-#: ../clients/cli/connections.c:3744
-#, fuzzy, c-format
-msgid "Error: bad connection type: %s."
-msgstr "错误：无效的连接类型；%s。"
+#: ../clients/cli/connections.c:3700
+msgid "Service [none]: "
+msgstr "服务[无]："
+
+#. Ask for optional 'gsm' or 'cdma' arguments.
+#: ../clients/cli/connections.c:3730
+msgid "mobile broadband"
+msgstr "移动宽带"
 
-#: ../clients/cli/connections.c:3802
-#, fuzzy, c-format
-msgid "Error: '%s' is not a valid interface nor '*'."
-msgstr "错误：“ifname”：“%s”不是有效的接口名称或“*”。"
+#: ../clients/cli/connections.c:3734 ../clients/cli/connections.c:4173
+msgid "Username [none]: "
+msgstr "用户名 [none]: "
 
-#: ../clients/cli/connections.c:3825
-#, fuzzy
-msgid "Error: master is required"
-msgstr "错误：需要“master”。"
+#. Ask for optional 'bluetooth' arguments.
+#: ../clients/cli/connections.c:3749
+msgid "bluetooth"
+msgstr "蓝牙"
 
-#: ../clients/cli/connections.c:3883
-#, fuzzy, c-format
-msgid "Error: error adding bond option '%s=%s'."
-msgstr "错误：未知连接“%s”。"
+#: ../clients/cli/connections.c:3756
+#, c-format
+msgid "Bluetooth type %s"
+msgstr "蓝牙类型 %s"
 
-#: ../clients/cli/connections.c:3914
+#: ../clients/cli/connections.c:3762
+#, c-format
+msgid "Error: 'bt-type': '%s' is not a valid bluetooth type.\n"
+msgstr "错误：'bt-type': '%s' 不是有效蓝牙类型。\n"
+
+#. Ask for optional 'vlan' arguments.
+#. 13
+#: ../clients/cli/connections.c:3778 ../clients/cli/devices.c:239
+#: ../clients/tui/nm-editor-utils.c:217 ../clients/tui/nmt-page-vlan.c:94
+#: ../libnm-core/nm-connection.c:1714 ../libnm-glib/nm-device.c:1869
+#: ../libnm-util/nm-connection.c:1632 ../libnm/nm-device.c:1820
+msgid "VLAN"
+msgstr "VLAN"
+
+#: ../clients/cli/connections.c:3794
+msgid "VLAN flags (<0-7>) [none]: "
+msgstr "VLAN 标签 (<0-7>) [none]: "
+
+#: ../clients/cli/connections.c:3805
+msgid "Ingress priority maps [none]: "
+msgstr "入口首选项映射 [none]: "
+
+#: ../clients/cli/connections.c:3816
+msgid "Egress priority maps [none]: "
+msgstr "出口首选项映射 [none]: "
+
+#: ../clients/cli/connections.c:3827
+msgid "Bonding mode [balance-rr]: "
+msgstr "绑定模式 [balance-rr]: "
+
+#. Ask for optional 'bond' arguments.
+#: ../clients/cli/connections.c:3843
+msgid "bond"
+msgstr "绑定"
+
+#: ../clients/cli/connections.c:3865
+msgid "Bonding primary interface [none]: "
+msgstr "绑定的主接口 [none]: "
+
+#: ../clients/cli/connections.c:3868
+#, c-format
+msgid "Error: 'primary': '%s' is not a valid interface name.\n"
+msgstr "错误：'primary': '%s' 不是有效接口名。\n"
+
+#: ../clients/cli/connections.c:3876
+#, c-format
+msgid "Bonding monitoring mode %s"
+msgstr "链接监控模式 %s"
+
+#: ../clients/cli/connections.c:3882
 #, 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:3891
+msgid "Bonding miimon [100]: "
+msgstr "绑定 miimon [100]: "
 
-#: ../clients/cli/connections.c:3945
+#: ../clients/cli/connections.c:3894
 #, c-format
-msgid "Error: 'bt-type': '%s' not valid; use [%s, %s (%s), %s]."
-msgstr "错误：“bt-type”：“%s”无效；使用 [%s, %s (%s), %s]。"
+msgid "Error: 'miimon': '%s' is not a valid number <0-%u>.\n"
+msgstr "错误：'miimon': '%s' 不是有效数字 <0-%u>。\n"
 
-#: ../clients/cli/connections.c:3972
-#, fuzzy
-msgid "Interface name [*]"
-msgstr "接口名称 [*]："
+#: ../clients/cli/connections.c:3902
+msgid "Bonding downdelay [0]: "
+msgstr "捆绑的 downdelay [0]: "
 
-#: ../clients/cli/connections.c:3976
-#, fuzzy
-msgid "PPPoE username"
-msgstr "PPPoE 用户名："
+#: ../clients/cli/connections.c:3905
+#, c-format
+msgid "Error: 'downdelay': '%s' is not a valid number <0-%u>.\n"
+msgstr "错误：'downdelay': '%s' 不是有效数 <0-%u>。\n"
 
-#: ../clients/cli/connections.c:3977 ../clients/cli/connections.c:3998
-#: ../clients/cli/connections.c:4000 ../clients/cli/connections.c:4049
-#, fuzzy
-msgid "Password [none]"
-msgstr "密码 [无]："
-
-#: ../clients/cli/connections.c:3978
-#, fuzzy
-msgid "Service [none]"
-msgstr "服务 [无]："
-
-#: ../clients/cli/connections.c:3979 ../clients/cli/connections.c:3982
-#: ../clients/cli/connections.c:3991
-#, fuzzy
-msgid "MTU [auto]"
-msgstr "MTU [自动]："
-
-#: ../clients/cli/connections.c:3980 ../clients/cli/connections.c:3983
-#: ../clients/cli/connections.c:3992 ../clients/cli/connections.c:3995
-#: ../clients/cli/connections.c:4036
-#, fuzzy
-msgid "MAC [none]"
-msgstr "MAC [无]："
-
-#: ../clients/cli/connections.c:3981 ../clients/cli/connections.c:3993
-#, fuzzy
-msgid "Cloned MAC [none]"
-msgstr "复制的 MAC 地址 [无]："
-
-#: ../clients/cli/connections.c:3986
-#, fuzzy
-msgid "Parent interface [none]"
-msgstr "上级接口 [无]："
-
-#: ../clients/cli/connections.c:3987
-#, fuzzy
-msgid "P_KEY [none]"
-msgstr "P_KEY [无]："
+#: ../clients/cli/connections.c:3913
+msgid "Bonding updelay [0]: "
+msgstr "捆绑的 updelay [0]: "
 
-#. 0
-#: ../clients/cli/connections.c:3988 ../clients/cli/connections.c:4043
-#: ../clients/cli/devices.c:151 ../clients/tui/nmt-page-wifi.c:224
-msgid "SSID"
-msgstr "SSID"
+#: ../clients/cli/connections.c:3916
+#, c-format
+msgid "Error: 'updelay': '%s' is not a valid number <0-%u>.\n"
+msgstr "错误：'updelay': '%s' 不是有效数字 <0-%u>。\n"
 
-#: ../clients/cli/connections.c:3994
-#, fuzzy
-msgid "WiMAX NSP name"
-msgstr "WiMAX NSP 名称："
+#: ../clients/cli/connections.c:3925
+msgid "Bonding arp-interval [0]: "
+msgstr "捆绑的 arp-interval [0]: "
 
-#: ../clients/cli/connections.c:3996
-#, fuzzy
-msgid "APN"
-msgstr "访问点"
+#: ../clients/cli/connections.c:3928
+#, c-format
+msgid "Error: 'arp-interval': '%s' is not a valid number <0-%u>.\n"
+msgstr "错误：'arp-interval': '%s' 不是有效数字 <0-%u>。\n"
 
-#: ../clients/cli/connections.c:3997 ../clients/cli/connections.c:3999
-#: ../clients/cli/connections.c:4042
-#, fuzzy
-msgid "Username [none]"
-msgstr "用户名 [无]："
+#. FIXME: verify the string
+#: ../clients/cli/connections.c:3936
+msgid "Bonding arp-ip-target [none]: "
+msgstr "绑定的 arp-ip-target [none]: "
 
-#: ../clients/cli/connections.c:4001
-#, fuzzy
-msgid "Bluetooth device address"
-msgstr "蓝牙设备地址："
+#: ../clients/cli/connections.c:3943
+msgid "LACP rate ('slow' or 'fast') [slow]: "
+msgstr "LACP 速度 ('slow' 或 'fast') [slow]: "
+
+#: ../clients/cli/connections.c:3949
+#, c-format
+msgid "Error: 'lacp_rate': '%s' is invalid ('slow' or 'fast').\n"
+msgstr "错误：'lacp_rate': '%s' 是无效的（'slow' 或 'fast'）。\n"
+
+#: ../clients/cli/connections.c:3972
+msgid "Team JSON configuration [none]: "
+msgstr "Team JSON 配置 [none]："
 
-#: ../clients/cli/connections.c:4004
-#, fuzzy
-msgid "VLAN parent device or connection UUID"
-msgstr "VLAN 上级设备或连接 UUID："
+#: ../clients/cli/connections.c:3989
+msgid "team"
+msgstr "team"
 
-#: ../clients/cli/connections.c:4006
-#, fuzzy
-msgid "VLAN ID (<0-4094>)"
-msgstr "VLAN ID <0-4095>："
+#: ../clients/cli/connections.c:3995
+msgid "team-slave"
+msgstr "team-slave"
 
+#. Ask for optional 'bridge' arguments.
 #: ../clients/cli/connections.c:4007
-#, fuzzy
-msgid "VLAN flags (<0-7>) [none]"
-msgstr "VLAN 标志 (<0-7>) [无]："
-
-#: ../clients/cli/connections.c:4008
-#, fuzzy
-msgid "Ingress priority maps [none]"
-msgstr "入口优先级映射 [无]："
-
-#: ../clients/cli/connections.c:4009
-#, fuzzy
-msgid "Egress priority maps [none]"
-msgstr "出口优先级映射 [无]："
-
-#: ../clients/cli/connections.c:4012
-#, fuzzy
-msgid "Bonding primary interface [none]"
-msgstr "绑定主要接口 [无]："
-
-# https://www.centos.org/docs/5/html/5.1/Deployment_Guide/s3-modules-bonding-directives.html
-# 链接有下面几个术语的定义，不过应该不用翻译，作为参考。
-#: ../clients/cli/connections.c:4016
-#, fuzzy
-msgid "Bonding miimon [100]"
-msgstr "绑定 miimon [100]："
-
-#: ../clients/cli/connections.c:4017
-#, fuzzy
-msgid "Bonding downdelay [0]"
-msgstr "绑定 downdelay [0]："
+msgid "bridge"
+msgstr "桥接"
 
-#: ../clients/cli/connections.c:4018
-#, fuzzy
-msgid "Bonding updelay [0]"
-msgstr "绑定 updelay [0]："
-
-#: ../clients/cli/connections.c:4019
-#, fuzzy
-msgid "Bonding arp-interval [0]"
-msgstr "绑定 arp-interval [0]："
-
-#: ../clients/cli/connections.c:4021
-#, fuzzy
-msgid "Bonding arp-ip-target [none]"
-msgstr "绑定 arp-ip-target [none]："
-
-#: ../clients/cli/connections.c:4023
-#, fuzzy
-msgid "LACP rate ('slow' or 'fast') [slow]"
-msgstr "LACP 速率（“slow”或“fast”）[slow]："
-
-#: ../clients/cli/connections.c:4025 ../clients/cli/connections.c:4026
-#, fuzzy
-msgid "Team JSON configuration [none]"
-msgstr "群组 JSON 配置 [无]： "
-
-#: ../clients/cli/connections.c:4027
-#, fuzzy
-msgid "Enable STP [no]"
+#: ../clients/cli/connections.c:4013
+#, c-format
+msgid "Enable STP %s"
 msgstr "启用 STP %s"
 
-#: ../clients/cli/connections.c:4029
-#, fuzzy
-msgid "STP priority [32768]"
-msgstr "STP 优先级 [32768]："
+#: ../clients/cli/connections.c:4018
+#, c-format
+msgid "Error: 'stp': %s.\n"
+msgstr "错误：'stp': %s。\n"
+
+#: ../clients/cli/connections.c:4026
+msgid "STP priority [32768]: "
+msgstr "STP 优先级 [32768]: "
 
 #: ../clients/cli/connections.c:4030
-#, fuzzy
-msgid "Forward delay [15]"
-msgstr "转发延时 [15]："
-
-#: ../clients/cli/connections.c:4031
-#, fuzzy
-msgid "Hello time [2]"
-msgstr "问候时间 [2]："
-
-#: ../clients/cli/connections.c:4032
-#, fuzzy
-msgid "Max age [20]"
-msgstr "最大寿命 [20]："
-
-#: ../clients/cli/connections.c:4033
-#, fuzzy
-msgid "MAC address ageing time [300]"
-msgstr "MAC 地址老化时间 [300]："
-
-#: ../clients/cli/connections.c:4034
-#, fuzzy, c-format
-msgid "Enable IGMP snooping %s [no]"
-msgstr "启用 IGMP 监听 %s"
-
-#: ../clients/cli/connections.c:4037
-#, fuzzy
-msgid "Bridge port priority [32]"
-msgstr "桥接端口优先级 [32]："
+#, c-format
+msgid "Error: 'priority': '%s' is not a valid number <0-%d>.\n"
+msgstr "错误：'priority': '%s' 不是有效数字 <0-%d>。\n"
 
 #: ../clients/cli/connections.c:4038
-#, fuzzy
-msgid "Bridge port STP path cost [100]"
-msgstr "桥接端口 STP 路径开销 [100]："
+msgid "Forward delay [15]: "
+msgstr "转发延迟 [15]: "
 
-#: ../clients/cli/connections.c:4039
-#, fuzzy
-msgid "Hairpin [no]"
-msgstr "Hairpin 模式"
+#: ../clients/cli/connections.c:4042
+#, c-format
+msgid "Error: 'forward-delay': '%s' is not a valid number <2-30>.\n"
+msgstr "错误：'forward-delay': '%s' 不是有效数字 <2-30>。\n"
 
-#: ../clients/cli/connections.c:4044
-#, fuzzy
-msgid "OLPC Mesh channel [1]"
-msgstr "OLPC Mesh 频道 [1]："
+#: ../clients/cli/connections.c:4051
+msgid "Hello time [2]: "
+msgstr "祝贺时间 [2]: "
 
-#: ../clients/cli/connections.c:4045
-#, fuzzy
-msgid "DHCP anycast MAC address [none]"
-msgstr "DHCP 任意广播 MAC 地址 [无]："
+#: ../clients/cli/connections.c:4055
+#, c-format
+msgid "Error: 'hello-time': '%s' is not a valid number <1-10>.\n"
+msgstr "错误：'hello-time': '%s' 不是有效数字 <1-10>。\n"
 
-#. TTLS and PEAP are actually much more complicated, but this complication
-#. * is not visible here since we only care about phase2 authentication
-#. * (and don't even care of which one)
-#.
-#: ../clients/cli/connections.c:4046
-#: ../clients/common/nm-secret-agent-simple.c:223
-#: ../clients/common/nm-secret-agent-simple.c:328
-#: ../clients/tui/nmt-page-dsl.c:66 ../clients/tui/nmt-page-wifi.c:332
-msgid "Username"
-msgstr "用户名"
+#: ../clients/cli/connections.c:4063
+msgid "Max age [20]: "
+msgstr "最大值 [20]: "
+
+#: ../clients/cli/connections.c:4067
+#, c-format
+msgid "Error: 'max-age': '%s' is not a valid number <6-40>.\n"
+msgstr "错误：'max-age': '%s' 不是有效数字 <6-40>。\n"
 
-#: ../clients/cli/connections.c:4052
-#, fuzzy
-msgid "MACVLAN parent device or connection UUID"
-msgstr "MACVLAN 上级设备或连接 UUID："
+#: ../clients/cli/connections.c:4075
+msgid "MAC address ageing time [300]: "
+msgstr "MAC 地址过期时间 [300]: "
 
-#: ../clients/cli/connections.c:4055
-msgid "Tap [no]"
-msgstr ""
+#: ../clients/cli/connections.c:4079
+#, c-format
+msgid "Error: 'ageing-time': '%s' is not a valid number <0-1000000>.\n"
+msgstr "错误：'ageing-time': '%s' 不是有效数字 <0-1000000>。\n"
+
+#: ../clients/cli/connections.c:4088
+#, c-format
+msgid "Enable IGMP snooping %s"
+msgstr "启用 IGMP snooping %s"
 
-#: ../clients/cli/connections.c:4057
-#, fuzzy
-msgid "VXLAN ID"
-msgstr "VXLAN ID："
+#: ../clients/cli/connections.c:4093
+#, c-format
+msgid "Error: 'multicast-snooping': %s.\n"
+msgstr "错误：'multicast-snooping': %s。\n"
 
-#: ../clients/cli/connections.c:4058 ../clients/cli/connections.c:4076
-#, fuzzy
-msgid "Remote"
-msgstr "远程："
+#. Ask for optional 'bridge-slave' arguments.
+#: ../clients/cli/connections.c:4120
+msgid "bridge-slave"
+msgstr "bridge-slave"
 
-#: ../clients/cli/connections.c:4059 ../clients/cli/connections.c:4077
-#, fuzzy
-msgid "Parent device [none]"
-msgstr "上级设备 [无]："
+#: ../clients/cli/connections.c:4125
+msgid "Bridge port priority [32]: "
+msgstr "桥接端口优先级 [32]: "
 
-#: ../clients/cli/connections.c:4060
-#, fuzzy
-msgid "Local address [none]"
-msgstr "本地地址 [无]："
+#: ../clients/cli/connections.c:4138
+msgid "Bridge port STP path cost [100]: "
+msgstr "桥接端口 STP 路径成本 [100]: "
 
-#: ../clients/cli/connections.c:4061
-#, fuzzy
-msgid "Minimum source port [0]"
-msgstr "最小来源端口 [0]："
+#: ../clients/cli/connections.c:4152
+#, c-format
+msgid "Hairpin %s"
+msgstr "Hairpin %s"
 
-#: ../clients/cli/connections.c:4062
-#, fuzzy
-msgid "Maximum source port [0]"
-msgstr "最大来源端口 [0]："
+#: ../clients/cli/connections.c:4157
+#, c-format
+msgid "Error: 'hairpin': %s.\n"
+msgstr "错误：'hairpin': %s。\n"
 
-#: ../clients/cli/connections.c:4063
-#, fuzzy
-msgid "Destination port [8472]"
-msgstr "目标端口 [8472]："
+#. Ask for optional 'olpc' arguments.
+#: ../clients/cli/connections.c:4184 ../libnm-glib/nm-device.c:1855
+#: ../libnm/nm-device.c:1806
+msgid "OLPC Mesh"
+msgstr "OLPC Mesh"
 
-#: ../clients/cli/connections.c:4066
-#, fuzzy
-msgid "User ID [none]"
-msgstr "用户 ID [无]："
+#: ../clients/cli/connections.c:4189
+msgid "OLPC Mesh channel [1]: "
+msgstr "OLPC Mesh 频道 [1]: "
 
-#: ../clients/cli/connections.c:4067
-#, fuzzy
-msgid "Group ID [none]"
-msgstr "群组 ID [无]："
+#: ../clients/cli/connections.c:4192
+#, c-format
+msgid "Error: 'channel': '%s' is not a valid number <1-13>.\n"
+msgstr "错误：'channel': '%s' 不是有效数字 <1-13>。\n"
 
-#: ../clients/cli/connections.c:4068
-#, fuzzy
-msgid "Enable PI [no]"
+#: ../clients/cli/connections.c:4200
+msgid "DHCP anycast MAC address [none]: "
+msgstr "DHCP 选播 MAC 地址 [none]："
+
+#. Ask for optional 'adsl' arguments.
+#: ../clients/cli/connections.c:4219 ../libnm-glib/nm-device.c:1871
+#: ../libnm/nm-device.c:1822
+msgid "ADSL"
+msgstr "ADSL"
+
+#: ../clients/cli/connections.c:4227
+#, c-format
+msgid "ADSL encapsulation %s"
+msgstr "ADSL 封装 %s"
+
+#. Ask for optional 'macvlan' arguments.
+#: ../clients/cli/connections.c:4245
+msgid "macvlan"
+msgstr "macvlan"
+
+#: ../clients/cli/connections.c:4251
+#, c-format
+msgid "Tap %s"
+msgstr "轻触 %s"
+
+#: ../clients/cli/connections.c:4256
+#, c-format
+msgid "Error: 'tap': %s.\n"
+msgstr "错误：'stp': %s。\n"
+
+#. Ask for optional 'vxlan' arguments.
+#: ../clients/cli/connections.c:4272 ../libnm-glib/nm-device.c:1875
+#: ../libnm/nm-device.c:1826
+msgid "VXLAN"
+msgstr "VXLAN"
+
+#: ../clients/cli/connections.c:4277 ../clients/cli/connections.c:4601
+msgid "Parent device [none]: "
+msgstr "父设备 [none]："
+
+#: ../clients/cli/connections.c:4282 ../clients/cli/connections.c:4606
+#, c-format
+msgid "Error: 'dev': '%s' is neither UUID nor interface name.\n"
+msgstr "错误：'dev': '%s' 不是 UUID，也不是接口名。\n"
+
+#: ../clients/cli/connections.c:4291
+msgid "Local address [none]: "
+msgstr "本地地址 [none]："
+
+#: ../clients/cli/connections.c:4296
+#, c-format
+msgid "Error: 'local': '%s' is not a valid IP address.\n"
+msgstr "错误：'local': '%s' 不是有效的 IP 地址。\n"
+
+#: ../clients/cli/connections.c:4305
+msgid "Minimum source port [0]: "
+msgstr "最小的源端口 [0]："
+
+#: ../clients/cli/connections.c:4309
+#, c-format
+msgid "Error: 'source-port-min': '%s' is not a valid number <0-65535>.\n"
+msgstr "错误：'source-port-min': '%s' 不是有效数字 <0-65535>。\n"
+
+#: ../clients/cli/connections.c:4318
+msgid "Maximum source port [0]: "
+msgstr "最大的源端口 [0]："
+
+#: ../clients/cli/connections.c:4322
+#, c-format
+msgid "Error: 'source-port-max': '%s' is not a valid number <0-65535>.\n"
+msgstr "错误：'source-port-max': '%s' 不是有效数字 <0-65535>。\n"
+
+#: ../clients/cli/connections.c:4331
+msgid "Destination port [8472]: "
+msgstr "目的端口 [8472]："
+
+#: ../clients/cli/connections.c:4335
+#, c-format
+msgid "Error: 'destination-port': '%s' is not a valid number <0-65535>.\n"
+msgstr "错误：'destination-port': '%s' 不是有效数字 <0-65535>。\n"
+
+#: ../clients/cli/connections.c:4374
+msgid "IPv4 address (IP[/plen]) [none]: "
+msgstr "IPv4 地址 (IP[/plen]) [none]: "
+
+#: ../clients/cli/connections.c:4376
+msgid "IPv6 address (IP[/plen]) [none]: "
+msgstr "IPv6 地址 (IP[/plen]) [none]: "
+
+#: ../clients/cli/connections.c:4390
+#, c-format
+msgid "  Address successfully added: %s\n"
+msgstr "成功添加地址：%s\n"
+"\n"
+
+#: ../clients/cli/connections.c:4392
+#, c-format
+msgid "  Warning: address already present: %s\n"
+msgstr "  警告：地址已存在：%s\n"
+
+#: ../clients/cli/connections.c:4394
+#, c-format
+msgid "  Warning: ignoring garbage at the end: '%s'\n"
+msgstr "  警告：忽略结尾处的无用信息：'%s'\n"
+
+#: ../clients/cli/connections.c:4396 ../clients/cli/connections.c:5605
+#: ../clients/cli/connections.c:5652 ../clients/cli/connections.c:6569
+#: ../clients/cli/connections.c:6602
+msgid "Error: "
+msgstr "错误："
+
+#: ../clients/cli/connections.c:4416
+msgid "IPv4 gateway [none]: "
+msgstr "IPv4 网关 [none]: "
+
+#: ../clients/cli/connections.c:4419
+msgid "IPv6 gateway [none]: "
+msgstr "IPv6 网关 [none]: "
+
+#: ../clients/cli/connections.c:4439
+#, c-format
+msgid "Error: invalid gateway address '%s'\n"
+msgstr "错误：无效的网关地址 '%s'\n"
+
+#. Ask for IP addresses
+#: ../clients/cli/connections.c:4452
+#, c-format
+msgid "Do you want to add IP addresses? %s"
+msgstr "您要添加 IP 地址吗？%s"
+
+#: ../clients/cli/connections.c:4460
+#, c-format
+msgid "Press <Enter> to finish adding addresses.\n"
+msgstr "按 <Enter> 完成添加地址。\n"
+
+#. Ask for optional 'tun' arguments.
+#: ../clients/cli/connections.c:4504 ../libnm-glib/nm-device.c:1879
+#: ../libnm/nm-device.c:1830
+msgid "Tun"
+msgstr "Tun"
+
+#: ../clients/cli/connections.c:4509
+msgid "User ID [none]: "
+msgstr "用户 ID [none]: "
+
+#: ../clients/cli/connections.c:4522
+msgid "Group ID [none]: "
+msgstr "组 ID [none]: "
+
+#: ../clients/cli/connections.c:4536
+#, c-format
+msgid "Enable PI %s"
 msgstr "启用 PI %s"
 
-#: ../clients/cli/connections.c:4070
-#, fuzzy
-msgid "Enable VNET header [no]"
-msgstr "启用 VNET 首部 %s"
+#: ../clients/cli/connections.c:4541
+#, c-format
+msgid "Error: 'pi': %s.\n"
+msgstr "错误: 'pi': %s。\n"
 
-#: ../clients/cli/connections.c:4072
-#, fuzzy
-msgid "Enable multi queue [no]"
-msgstr "启用多队列 %s"
+#: ../clients/cli/connections.c:4549
+#, c-format
+msgid "Enable VNET header %s"
+msgstr "启用 VNET 头部 %s"
 
-#: ../clients/cli/connections.c:4075
-#, fuzzy
-msgid "Local endpoint [none]"
-msgstr "本地端点 (endpoint) [无]："
+#: ../clients/cli/connections.c:4554
+#, c-format
+msgid "Error: 'vnet-hdr': %s.\n"
+msgstr "错误：'vnet-hdr': %s。\n"
 
-#: ../clients/cli/connections.c:4078
-#, fuzzy
-msgid "IPv4 address (IP[/plen]) [none]"
-msgstr "IPv4 地址 (IP[/plen]) [无]："
+#: ../clients/cli/connections.c:4562
+#, c-format
+msgid "Enable multi queue %s"
+msgstr "启用多重队列 %s"
 
-#: ../clients/cli/connections.c:4079
-#, fuzzy
-msgid "IPv4 gateway [none]"
-msgstr "IPv4 网关 [无]："
+#: ../clients/cli/connections.c:4567
+#, c-format
+msgid "Error: 'multi-queue': %s.\n"
+msgstr "错误：'multi-queue': %s。\n"
+"\n"
 
-#: ../clients/cli/connections.c:4080
-#, fuzzy
-msgid "IPv6 address (IP[/plen]) [none]"
-msgstr "IPv6 地址 (IP[/plen]) [无]："
+#. Ask for optional 'ip-tunnel' arguments.
+#: ../clients/cli/connections.c:4581
+msgid "IP Tunnel"
+msgstr "IP 隧道"
 
-#: ../clients/cli/connections.c:4081
-#, fuzzy
-msgid "IPv6 gateway [none]"
-msgstr "IPv6 网关 [无]："
+#: ../clients/cli/connections.c:4586
+msgid "Local endpoint [none]: "
+msgstr "本地端口 [none]: "
 
-#: ../clients/cli/connections.c:4205
+#: ../clients/cli/connections.c:4592
 #, c-format
-msgid "Error: value for '%s' is missing."
-msgstr "错误：缺少用于“%s”的值。"
+msgid "Error: 'local': '%s' is not valid; must be an IP address\n"
+msgstr "错误：'local': '%s' 是无效的，它必须为 IP 地址。\n"
 
-#: ../clients/cli/connections.c:4252
+#: ../clients/cli/connections.c:4658 ../clients/cli/connections.c:10184
+#, c-format
 msgid "Error: <setting>.<property> argument is missing."
-msgstr "错误：缺少 <设置>.<属性> 参数。"
+msgstr "错误：<setting>。缺少 <property> 参数。"
 
-#: ../clients/cli/connections.c:4274
+#: ../clients/cli/connections.c:4663
+#, c-format
+msgid "Error: value for '%s' is missing."
+msgstr "错误：缺失了 '%s' 的值。"
+
+#: ../clients/cli/connections.c:4681
+#, c-format
+msgid "Error: invalid <setting>.<property> '%s'."
+msgstr "错误：无效 <setting>。<property> '%s'。"
+
+#: ../clients/cli/connections.c:4689
 #, c-format
 msgid "Error: invalid or not allowed setting '%s': %s."
-msgstr "错误：无效或不允许的设置“%s”：%s。"
+msgstr "错误：无效或者不允许的设置 '%s': %s。"
 
-#: ../clients/cli/connections.c:4301
-#, fuzzy, c-format
-msgid "Error: '%s' is ambiguous (%s.%s or %s.%s)."
-msgstr "“%s” 含义模糊 (%s x %s)"
+#: ../clients/cli/connections.c:4700
+#, c-format
+msgid "Error: don't know how to create '%s' setting."
+msgstr "错误：不知道如何创建 '%s' 设置。"
 
-#: ../clients/cli/connections.c:4315
+#: ../clients/cli/connections.c:4710
 #, c-format
-msgid "Error: invalid <setting>.<property> '%s'."
-msgstr "错误：无效的 <设置>.<属性> “%s”。"
+msgid "Error: invalid property '%s': %s."
+msgstr "错误：无效属性 '%s': %s。"
 
-#: ../clients/cli/connections.c:4356 ../clients/cli/connections.c:7842
+#: ../clients/cli/connections.c:4722
 #, c-format
-msgid "Error: Failed to add '%s' connection: %s"
-msgstr "错误：添加“%s”连接失败：%s"
+msgid "Error: failed to modify %s.%s: %s."
+msgstr "错误：修改 %s 失败。%s: %s。"
 
-#: ../clients/cli/connections.c:4361
+#: ../clients/cli/connections.c:4741
 #, c-format
-msgid "Connection '%s' (%s) successfully added.\n"
-msgstr "连接“%s”(%s) 已成功添加。\n"
+msgid "Error: failed to remove a value from %s.%s: %s."
+msgstr "错误：从 %s.%s 删除值失败：%s。"
 
-#: ../clients/cli/connections.c:4477
+#: ../clients/cli/connections.c:4775
 #, c-format
 msgid ""
-"You can specify this option more than once. Press <Enter> when you're done.\n"
-msgstr ""
+"Warning: 'type' is ignored. Use 'nmcli connection add \"%s\" ...' instead."
+msgstr "警告：'type' 被忽略。请使用 'nmcli connection add \"%s\" ...'。"
 
-#. Ask for optional arguments.
-#: ../clients/cli/connections.c:4515
-#, fuzzy, c-format
-msgid "There is %d optional setting for %s.\n"
-msgid_plural "There are %d optional settings for %s.\n"
-msgstr[0] "有 %d 可选参数可用于“%s”连接类型。\n"
+#: ../clients/cli/connections.c:4783
+msgid "Error: redundant 'master' option."
+msgstr "错误：冗余的 'master' 选项。"
+
+#: ../clients/cli/connections.c:4796
+msgid "Error: 'master' is required."
+msgstr "错误：需要 'master'。"
 
-#: ../clients/cli/connections.c:4518
+#: ../clients/cli/connections.c:4950
 #, c-format
-msgid "Do you want to provide it? %s"
-msgid_plural "Do you want to provide them? %s"
-msgstr[0] "您想提供它们吗？%s"
+msgid "Error: 'parent': not valid without 'p-key'."
+msgstr "错误：'parent': 无 'p-key' 则无效。"
 
-#: ../clients/cli/connections.c:4532
-#, fuzzy
-msgid "Wired Ethernet"
-msgstr "以太网"
+#: ../clients/cli/connections.c:5005 ../clients/cli/connections.c:5967
+msgid "SSID: "
+msgstr "SSID: "
 
-#: ../clients/cli/connections.c:4534 ../src/devices/nm-device-infiniband.c:175
-msgid "InfiniBand connection"
-msgstr "InfiniBand 连接"
+#: ../clients/cli/connections.c:5008 ../clients/cli/connections.c:5970
+msgid "Error: 'ssid' is required."
+msgstr "错误：不需要 'ssid'。"
 
-#: ../clients/cli/connections.c:4536
-#, fuzzy
-msgid "Wi-Fi connection"
-msgstr "Wi-Fi 连接 %d"
+#: ../clients/cli/connections.c:5072
+msgid "WiMAX NSP name: "
+msgstr "WiMAX NSP 名称："
 
-#: ../clients/cli/connections.c:4538
-#, fuzzy
-msgid "WiMAX connection"
-msgstr "CDMA 连接"
+#: ../clients/cli/connections.c:5075
+msgid "Error: 'nsp' is required."
+msgstr "错误：不需要 'nsp'。"
 
-#: ../clients/cli/connections.c:4540
-msgid "PPPoE"
-msgstr "PPPoE 参数"
+#: ../clients/cli/connections.c:5127
+msgid "PPPoE username: "
+msgstr "PPPoE 用户名："
 
-#: ../clients/cli/connections.c:4542
-#, fuzzy
-msgid "CDMA mobile broadband connection"
-msgstr "移动宽带连接 %d"
+#: ../clients/cli/connections.c:5130 ../clients/cli/connections.c:6037
+msgid "Error: 'username' is required."
+msgstr "错误：需要 'username'。"
 
-#: ../clients/cli/connections.c:4544
-#, fuzzy
-msgid "GSM mobile broadband connection"
-msgstr "移动宽带连接 %d"
+#: ../clients/cli/connections.c:5199
+msgid "APN: "
+msgstr "APN: "
 
-#: ../clients/cli/connections.c:4546
-#, fuzzy
-msgid "bluetooth connection"
-msgstr "绑定连接"
+#: ../clients/cli/connections.c:5202
+msgid "Error: 'apn' is required."
+msgstr "错误：需要 'apn'。"
 
-#: ../clients/cli/connections.c:4548 ../src/devices/nm-device-vlan.c:458
-msgid "VLAN connection"
-msgstr "VLAN 连接"
+#: ../clients/cli/connections.c:5260
+msgid "Bluetooth device address: "
+msgstr "蓝牙设备地址："
 
-#: ../clients/cli/connections.c:4550
-#, fuzzy
-msgid "Bond device"
-msgstr "以太网设备"
+#: ../clients/cli/connections.c:5263
+msgid "Error: 'addr' is required."
+msgstr "错误：需要 'addr'。"
 
-#: ../clients/cli/connections.c:4552
-#, fuzzy
-msgid "Team device"
-msgstr "TUN 设备模式"
+#: ../clients/cli/connections.c:5304
+#, c-format
+msgid "Error: 'bt-type': '%s' not valid; use [%s, %s (%s), %s]."
+msgstr "错误：'bt-type': '%s' 无效；使用 [%s, %s (%s), %s]。"
 
-#: ../clients/cli/connections.c:4554
-#, fuzzy
-msgid "Team port"
-msgstr "组队"
-
-#: ../clients/cli/connections.c:4556
-#, fuzzy
-msgid "Bridge device"
-msgstr "以太网设备"
-
-#: ../clients/cli/connections.c:4558
-#, fuzzy
-msgid "Bridge port"
-msgstr "桥接"
+#: ../clients/cli/connections.c:5348
+msgid "VLAN parent device or connection UUID: "
+msgstr "VLAN 上级设备或者连接 UUID："
 
-#: ../clients/cli/connections.c:4560 ../src/nm-manager.c:3716
-msgid "VPN connection"
-msgstr "VPN 连接"
+#: ../clients/cli/connections.c:5351 ../clients/cli/connections.c:6108
+msgid "Error: 'dev' is required."
+msgstr "错误：需要 'dev'。"
 
-#: ../clients/cli/connections.c:4562
-#, fuzzy
-msgid "OLPC Mesh connection"
-msgstr "CDMA 连接"
+#: ../clients/cli/connections.c:5355
+msgid "VLAN ID <0-4094>: "
+msgstr "VLAN ID <0-4094>: "
 
-#: ../clients/cli/connections.c:4564 ../src/devices/adsl/nm-device-adsl.c:133
-msgid "ADSL connection"
-msgstr "ADSL 连接"
+#: ../clients/cli/connections.c:5358 ../clients/cli/connections.c:6424
+msgid "Error: 'id' is required."
+msgstr "错误：需要 'id'。"
 
-#: ../clients/cli/connections.c:4566
-#, fuzzy
-msgid "macvlan connection"
-msgstr "绑定连接"
+#: ../clients/cli/connections.c:5364
+#, c-format
+msgid "Error: 'id': '%s' is not valid; use <0-4094>."
+msgstr "错误：'id': '%s' 是无效的，请使用 <0-4094>。"
 
-#: ../clients/cli/connections.c:4568 ../src/devices/nm-device-vxlan.c:374
-msgid "VXLAN connection"
-msgstr "VXLAN 连接"
+#: ../clients/cli/connections.c:5374 ../clients/cli/connections.c:6116
+#, c-format
+msgid "Error: 'dev': '%s' is neither UUID, interface name, nor MAC."
+msgstr "错误：'dev': '%s' 不是 UUID、接口名或者 MAC。"
 
-#: ../clients/cli/connections.c:4570
-#, fuzzy
-msgid "Tun device"
-msgstr "TUN 设备模式"
+#: ../clients/cli/connections.c:5506
+#, c-format
+msgid "Error: 'mode': %s."
+msgstr "错误：'mode': %s。"
 
-#: ../clients/cli/connections.c:4572
-#, fuzzy
-msgid "IPv4 protocol"
-msgstr "ADSL 协议"
+#: ../clients/cli/connections.c:5515
+#, c-format
+msgid "Error: 'primary': '%s' is not a valid interface name."
+msgstr "错误：'primary': '%s' 不是有效接口名。"
 
-#: ../clients/cli/connections.c:4574
-#, fuzzy
-msgid "IPv6 protocol"
-msgstr "ADSL 协议"
+#: ../clients/cli/connections.c:5738
+#, c-format
+msgid "Error: 'stp': %s."
+msgstr "错误：'stp': %s。"
 
-#: ../clients/cli/connections.c:4657 ../clients/cli/utils.c:124
+#: ../clients/cli/connections.c:5747
 #, c-format
-msgid "Error: value for '%s' argument is required."
-msgstr "错误：需要 “%s” 参数值。"
+msgid "Error: 'multicast-snooping': %s."
+msgstr "错误：'multicast-snooping': %s。"
 
-#: ../clients/cli/connections.c:4663
+#: ../clients/cli/connections.c:5866
+#, c-format
+msgid "Error: 'hairpin': %s."
+msgstr "错误：'hairpin': %s。"
+
+#: ../clients/cli/connections.c:5915
+msgid "Error: 'vpn-type' is required."
+msgstr "错误：需要 'vpn-type'。"
+
+#: ../clients/cli/connections.c:5922
+#, c-format
+msgid "Warning: 'vpn-type': %s not known.\n"
+msgstr "警告: 'vpn-type': %s 是未知的。\n"
+
+#: ../clients/cli/connections.c:5983
+#, c-format
+msgid "Error: 'channel': '%s' is not valid; use <1-13>."
+msgstr "错误：'channel': '%s' 无效；使用 <1-13>。"
+
+#: ../clients/cli/connections.c:6034
+msgid "Username: "
+msgstr "用户名："
+
+#: ../clients/cli/connections.c:6043
+#, c-format
+msgid "Protocol %s"
+msgstr "协议 %s"
+
+#: ../clients/cli/connections.c:6046
+msgid "Error: 'protocol' is required."
+msgstr "错误：'protocol'  是必需的。"
+
+#: ../clients/cli/connections.c:6105
+msgid "MACVLAN parent device or connection UUID: "
+msgstr "MACVLAN 父设备或连接 UUID ："
+
+#: ../clients/cli/connections.c:6125 ../clients/cli/connections.c:6205
+#: ../clients/cli/connections.c:6307
+msgid "Error: 'mode' is required."
+msgstr "错误：'mode' 是必需的。"
+
+#: ../clients/cli/connections.c:6131
+msgid "Error: 'mode' is not valid."
+msgstr "错误：'mode' 是无效的。"
+
+#: ../clients/cli/connections.c:6144
+#, c-format
+msgid "Error: 'tap': %s."
+msgstr "错误：'tap': %s。"
+
+#: ../clients/cli/connections.c:6230
+#, c-format
+msgid "Error: 'pi': %s."
+msgstr "错误：'pi': %s。"
+
+#: ../clients/cli/connections.c:6241
+#, c-format
+msgid "Error: 'vnet-hdr': %s."
+msgstr "错误：'vnet-hdr': %s。"
+
+#: ../clients/cli/connections.c:6252
+#, c-format
+msgid "Error: 'multi-queue': %s."
+msgstr "错误：'multi-queue': %s。"
+
+#: ../clients/cli/connections.c:6321
+#, c-format
+msgid "Error: 'mode': '%s' is not valid, use one of %s"
+msgstr "错误：'mode': '%s' 是无效的，请使用 %s 之一。"
+
+#: ../clients/cli/connections.c:6327
+msgid "Remote endpoint: "
+msgstr "远程端点："
+
+#: ../clients/cli/connections.c:6330 ../clients/cli/connections.c:6432
+msgid "Error: 'remote' is required."
+msgstr "错误：'remote' 是必需的。"
+
+#: ../clients/cli/connections.c:6337
+#, c-format
+msgid "Error: 'remote': '%s' is not valid; must be an IP address"
+msgstr "错误：'remote': '%s' 是无效的，它必须为 IP 地址。"
+
+#: ../clients/cli/connections.c:6351
+#, c-format
+msgid "Error: 'local': '%s' is not valid; must be an IP address"
+msgstr "错误：'local': '%s' 是无效的，它必须为 IP 地址。"
+
+#: ../clients/cli/connections.c:6360 ../clients/cli/connections.c:6455
+#, c-format
+msgid "Error: 'dev': '%s' is neither UUID nor interface name."
+msgstr "错误：'dev': '%s' 不是 UUID，也不是接口名。"
+
+#: ../clients/cli/connections.c:6421
+msgid "VXLAN ID: "
+msgstr "VXLAN ID: "
+
+#: ../clients/cli/connections.c:6429
+msgid "Remote: "
+msgstr "远程的："
+
+#: ../clients/cli/connections.c:6438
+#, c-format
+msgid "Error: 'id': '%s' is not valid; use <0-16777215>."
+msgstr "错误：'id': '%s' 无效；使用 <0-16777215>。"
+
+#: ../clients/cli/connections.c:6464
+#, c-format
+msgid "Error: 'remote': '%s' is not a valid IP address"
+msgstr "错误：'remote': '%s' 不是有效的 IP 地址"
+
+#: ../clients/cli/connections.c:6473
+#, c-format
+msgid "Error: 'local': '%s' is not a valid IP address"
+msgstr "错误：'local': '%s' 不是有效的 IP 地址"
+
+#: ../clients/cli/connections.c:6482
+#, c-format
+msgid "Error: 'source-port-min': %s is not valid; use <0-65535>."
+msgstr "错误：'source-port-min': '%s' 无效；使用 <0-65535>。"
+
+#: ../clients/cli/connections.c:6491
+#, c-format
+msgid "Error: 'source-port-max': %s is not valid; use <0-65535>."
+msgstr "错误：'source-port-max': '%s' 无效；使用 <0-65535>。"
+
+#: ../clients/cli/connections.c:6500
+#, c-format
+msgid "Error: 'destination-port': %s is not valid; use <0-65535>."
+msgstr "错误：'destination-port': '%s' 无效；使用 <0-65535>。"
+
+#: ../clients/cli/connections.c:6540
+#, c-format
+msgid "Error: '%s' is not a valid connection type."
+msgstr "错误： '%s' 为无效连接类型。"
+
+#: ../clients/cli/connections.c:6581
+#, c-format
+msgid "Error: IPv4 gateway specified without IPv4 addresses"
+msgstr "错误：未用 IPv4 地址指定 IPv4 网关"
+
+#: ../clients/cli/connections.c:6585
+#, c-format
+msgid "Error: multiple IPv4 gateways specified"
+msgstr "错误：指定了多重 IPv4 网关"
+
+#: ../clients/cli/connections.c:6589
+#, c-format
+msgid "Error: Invalid IPv4 gateway '%s'"
+msgstr "错误：无效的 IPv4 网关 '%s'"
+
+#: ../clients/cli/connections.c:6614
+#, c-format
+msgid "Error: IPv6 gateway specified without IPv6 addresses"
+msgstr "错误：未用 IPv6 地址指定 IPv6 网关"
+
+#: ../clients/cli/connections.c:6618
+#, c-format
+msgid "Error: multiple IPv6 gateways specified"
+msgstr "错误：指定了多个 IPv6 网关接口"
+
+#: ../clients/cli/connections.c:6622
+#, c-format
+msgid "Error: Invalid IPv6 gateway '%s'"
+msgstr "错误：无效的 IPv6 网关 '%s'"
+
+#: ../clients/cli/connections.c:6670 ../clients/cli/connections.c:10223
+#, c-format
+msgid "Error: Failed to add '%s' connection: %s"
+msgstr "错误：添加 '%s' 连接失败：%s"
+
+#: ../clients/cli/connections.c:6675
+#, c-format
+msgid "Connection '%s' (%s) successfully added.\n"
+msgstr "成功添加的连接 '%s'（%s）。\n"
+
+#: ../clients/cli/connections.c:6951 ../clients/cli/connections.c:10678
+#, c-format
+msgid "Error: 'type' argument is required."
+msgstr "错误：需要 'type' 参数。"
+
+#: ../clients/cli/connections.c:6959
+#, c-format
+msgid "Error: invalid connection type; %s."
+msgstr "错误：无效的连接类型；%s"
+
+#: ../clients/cli/connections.c:6968 ../clients/cli/devices.c:2164
+#, c-format
+msgid "Error: 'autoconnect': %s."
+msgstr "错误：'autoconnect': %s。"
+
+#: ../clients/cli/connections.c:6978
 #, c-format
 msgid "Error: 'save': %s."
-msgstr "错误：“save”：%s。"
+msgstr "错误：'save': %s。"
+
+#: ../clients/cli/connections.c:6995
+msgid "Interface name [*]: "
+msgstr "接口名 [*]: "
+
+#: ../clients/cli/connections.c:7000
+#, c-format
+msgid "Error: 'ifname' argument is required."
+msgstr "错误：需要'ifname' 参数。"
+
+#: ../clients/cli/connections.c:7002
+#, c-format
+msgid "Error: mandatory 'ifname' not seen before '%s'."
+msgstr "错误：在 '%s' 前未看到强制的 'ifname'。"
 
-#: ../clients/cli/connections.c:4732
-#, fuzzy, c-format
-msgid "Error: '%s' argument is required."
-msgstr "错误：需要“type”参数。"
+#: ../clients/cli/connections.c:7011
+#, c-format
+msgid "Error: 'ifname': '%s' is not a valid interface nor '*'."
+msgstr "错误：'ifname': '%s' 不是有效接口名。"
 
-#: ../clients/cli/connections.c:5701
+#: ../clients/cli/connections.c:8035
 #, c-format
 msgid "['%s' setting values]\n"
-msgstr "[“%s”设置值]\n"
+msgstr "['%s' setting values]\n"
 
 #. TRANSLATORS: do not translate command names and keywords before ::
 #. *              However, you should translate terms enclosed in <>.
-#.
-#: ../clients/cli/connections.c:5783
+#. 
+#: ../clients/cli/connections.c:8117
 #, c-format
 msgid ""
 "---[ Main menu ]---\n"
@@ -2462,21 +2806,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 配置\n"
-"quit                                 :: 退出 nmcli\n"
-
-#: ../clients/cli/connections.c:5810
+"---[ 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:8144
 #, c-format
 msgid ""
 "goto <setting>[.<prop>] | <prop>  :: enter setting/property for editing\n"
@@ -2487,34 +2832,33 @@ msgid ""
 "          nmcli connection> goto secondaries\n"
 "          nmcli> goto ipv4.addresses\n"
 msgstr ""
-"goto <设置>[.<属性>] | <属性>  :: 进入设置/属性进行编辑\n"
+"进入 <setting>[.<prop>] | <prop>  :: 输入要编辑的设置/属性\n"
 "\n"
-"该命令进入设置或属性来进行编辑。\n"
+"这个命令可进入要编辑的设置或者属性。\n"
 "\n"
-"示例：nmcli> goto connection\n"
+"Examples: nmcli> goto connection\n"
 "          nmcli connection> goto secondaries\n"
 "          nmcli> goto ipv4.addresses\n"
 
-#: ../clients/cli/connections.c:5817
+#: ../clients/cli/connections.c:8151
 #, c-format
 msgid ""
 "remove <setting>[.<prop>]  :: remove setting or reset property value\n"
 "\n"
-"This command removes an entire setting from the connection, or if a "
-"property\n"
+"This command removes an entire setting from the connection, or if a property\n"
 "is given, resets that property to the default value.\n"
 "\n"
 "Examples: nmcli> remove wifi-sec\n"
 "          nmcli> remove eth.mtu\n"
 msgstr ""
-"remove <设置>[.<属性>]  :: 移除设置或重置属性值\n"
+"remove <setting>[.<prop>]  :: remove setting or reset property value\n"
 "\n"
-"该命令移除来自连接的输入项设置，或者如果给定属性，重置该属性为默认值。\n"
+"这个命令删除整个连接中的设置，或者如果给定属性，则将该属性重置为默认值。\n"
 "\n"
-"示例：nmcli> remove wifi-sec\n"
+"Examples: nmcli> remove wifi-sec\n"
 "          nmcli> remove eth.mtu\n"
 
-#: ../clients/cli/connections.c:5824
+#: ../clients/cli/connections.c:8158
 #, c-format
 msgid ""
 "set [<setting>.<prop> <value>]  :: set property value\n"
@@ -2523,13 +2867,13 @@ msgid ""
 "\n"
 "Example: nmcli> set con.id My connection\n"
 msgstr ""
-"set [<设置>.<属性> <值>]  :: 设置属性值\n"
+"set [<setting>.<prop> <value>]  :: set property value\n"
 "\n"
-"该命令用于设置属性值。\n"
+"这个命令设定属性值。\n"
 "\n"
-"示例：nmcli> set con.id 我的连接\n"
+"Example: nmcli> set con.id My connection\n"
 
-#: ../clients/cli/connections.c:5829
+#: ../clients/cli/connections.c:8163
 #, c-format
 msgid ""
 "describe [<setting>.<prop>]  :: describe property\n"
@@ -2537,12 +2881,11 @@ msgid ""
 "Shows property description. You can consult nm-settings(5) manual page to "
 "see all NM settings and properties.\n"
 msgstr ""
-"describe [<设置>.<属性>]  :: 描述属性\n"
+"describe [<setting>.<prop>]  :: describe property\n"
 "\n"
-"显示属性描述。您肯依参阅 nm-settings(5) 手册页来查看全部的网络管理器设置和属"
-"性。\n"
+"显示属性描述。您可以参考 nm-settings(5) 手册页面查看所有 NM 设置和属性。\n"
 
-#: ../clients/cli/connections.c:5834
+#: ../clients/cli/connections.c:8168
 #, c-format
 msgid ""
 "print [all]  :: print setting or connection values\n"
@@ -2551,36 +2894,34 @@ msgid ""
 "\n"
 "Example: nmcli ipv4> print all\n"
 msgstr ""
-"print [all]  :: 输出设置或连接值\n"
+"print [all]  :: print setting or connection values\n"
 "\n"
-"显示当前属性或全部的连接。\n"
+"显示当前属性或者整个连接。\n"
 "\n"
-"示例：nmcli ipv4> print all\n"
+"Example: nmcli ipv4> print all\n"
 
-#: ../clients/cli/connections.c:5839
+#: ../clients/cli/connections.c:8173
 #, c-format
 msgid ""
 "verify [all | fix]  :: verify setting or connection validity\n"
 "\n"
 "Verifies whether the setting or connection is valid and can be saved later.\n"
-"It indicates invalid values on error. Some errors may be fixed "
-"automatically\n"
+"It indicates invalid values on error. Some errors may be fixed automatically\n"
 "by 'fix' option.\n"
 "\n"
 "Examples: nmcli> verify\n"
 "          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\n"
 "          nmcli> verify fix\n"
 "          nmcli bond> verify\n"
 
-#: ../clients/cli/connections.c:5848
+#: ../clients/cli/connections.c:8182
 #, c-format
 msgid ""
 "save [persistent|temporary]  :: save the connection\n"
@@ -2595,15 +2936,18 @@ msgid ""
 "connection\n"
 "profile must be deleted.\n"
 msgstr ""
-"save [persistent|temporary]  :: 保存该连接\n"
+"save [persistent|temporary]  :: 保存连接\n"
 "\n"
-"发送该连接配置文件到网络管理器，要么就永久保存要么只保存在内存里。\n"
-"“save” 不带参数表示“save persistent”。\n"
-"注意，一旦您选择永久保存配置文件，那些设置将在重启后保存。\n"
-"之后的更改也可以是临时或永久的，但是任何临时更改在重启后不会存在。\n"
-"如果您想要完全移除永久连接，必须删除该连接的配置文件。\n"
+"发送连接配置集到 NetworkManager，或是永久保存 ，\n"
+"或是只保存在内存里。不带参数的 'save' \n"
+"表示 'save persistent'。\n"
+"请注意，一旦您永久地保存了配置集，这些设置在\n"
+"重启后都会存在。随后的修改可以是临时的，也\n"
+"可以是永久的，但任何临时的修改在重启后都会复原。\n"
+"如果您项完全删除持久性连接，连接配置集就必须\n"
+"被删除。\n"
 
-#: ../clients/cli/connections.c:5859
+#: ../clients/cli/connections.c:8193
 #, c-format
 msgid ""
 "activate [<ifname>] [/<ap>|<nsp>]  :: activate the connection\n"
@@ -2615,33 +2959,29 @@ 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"
-"<接口名称>    - 该连接将会激活的设备\n"
-"/<ap>|<nsp> - AP (Wi-Fi) 或 NSP (WiMAX) (前插 / 当 <接口名称> 未指定)\n"
+"可用选项：\n"
+"<ifname>    - 在其中激活连接的设备。\n"
+"/<ap>|<nsp> - AP (Wi-Fi) 或者 NSP (WiMAX) (未指定 <ifname> 时用 / 做前缀。)\n"
 
-#: ../clients/cli/connections.c:5866 ../clients/cli/connections.c:6025
+#: ../clients/cli/connections.c:8200 ../clients/cli/connections.c:8359
 #, c-format
-msgid ""
-"back  :: go to upper menu level\n"
+msgid "back  :: go to upper menu level\n"
 "\n"
-msgstr ""
-"back  :: 转到上级菜单\n"
+msgstr "back  :: go to upper menu level\n"
 "\n"
 
-#: ../clients/cli/connections.c:5869
+#: ../clients/cli/connections.c:8203
 #, c-format
-msgid ""
-"help/? [<command>]  :: help for the nmcli commands\n"
+msgid "help/? [<command>]  :: help for the nmcli commands\n"
 "\n"
-msgstr ""
-"help/? [<命令>]  :: nmcli 命令的帮助\n"
+msgstr "help/? [<command>]  :: help for the nmcli commands\n"
 "\n"
 
-#: ../clients/cli/connections.c:5872
+#: ../clients/cli/connections.c:8206
 #, c-format
 msgid ""
 "nmcli [<conf-option> <value>]  :: nmcli configuration\n"
@@ -2656,40 +2996,39 @@ 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"
+"配置 nmcli。以下是可用选项：\n"
+"status-line yes | no          [default: no]\n"
+"save-confirmation yes | no    [default: yes]\n"
+"show-secrets yes | no         [default: no]\n"
+"prompt-color <color> | <0-8>  [default: 0]\n"
 "%s\n"
-"示例：nmcli> nmcli status-line yes\n"
+"示例: nmcli> nmcli status-line yes\n"
 "          nmcli> nmcli save-confirmation no\n"
 "          nmcli> nmcli prompt-color 3\n"
 
-#: ../clients/cli/connections.c:5894 ../clients/cli/connections.c:6031
+#: ../clients/cli/connections.c:8228 ../clients/cli/connections.c:8365
 #, c-format
 msgid ""
 "quit  :: exit nmcli\n"
 "\n"
 "This command exits nmcli. When the connection being edited is not saved, the "
 "user is asked to confirm the action.\n"
-msgstr ""
-"quit  :: 退出 nmcli\n"
+msgstr "quit  :: exit nmcli\n"
 "\n"
-"此命令用于退出 nmcli。当被编辑的连接没有保存，会询问用户确定操作。\n"
+"这个命令退出 nmcli。当要编辑的连接没有被保存时，会询问用户是否执行此操作。\n"
 
-#: ../clients/cli/connections.c:5899 ../clients/cli/connections.c:6036
-#: ../clients/cli/connections.c:6460 ../clients/cli/connections.c:7407
+#: ../clients/cli/connections.c:8233 ../clients/cli/connections.c:8370
+#: ../clients/cli/connections.c:8794 ../clients/cli/connections.c:9742
 #, 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:5965
+#. 
+#: ../clients/cli/connections.c:8299
 #, c-format
 msgid ""
 "---[ Property menu ]---\n"
@@ -2704,29 +3043,29 @@ msgid ""
 "help/?   [<command>]             :: print this help or command description\n"
 "quit                             :: exit nmcli\n"
 msgstr ""
-"---[ 属性菜单 ]---\n"
-"set      [<值>]               :: 设置新值\n"
-"add      [<值>]               :: 添加新选项到属性\n"
-"change                           :: 更改当前值\n"
-"remove   [<目录> | <选项>]    :: 删除该值\n"
-"describe                         :: 描述属性\n"
-"print    [setting | connection]  :: 输出 (设置/连接) 值\n"
-"back                             :: 转到上一级\n"
-"help/?   [<命令>]             :: 输出该帮助或命令描述\n"
-"quit                             :: 退出 nmcli\n"
-
-#: ../clients/cli/connections.c:5990
+"---[ Property menu ]---\n"
+"set      [<value>]               :: set new value\n"
+"add      [<value>]               :: add new option to the property\n"
+"change                           :: change current value\n"
+"remove   [<index> | <option>]    :: delete the value\n"
+"describe                         :: describe property\n"
+"print    [setting | connection]  :: print property (setting/connection) "
+"value(s)\n"
+"back                             :: go to upper level\n"
+"help/?   [<command>]             :: print this help or command description\n"
+"quit                             :: exit nmcli\n"
+
+#: ../clients/cli/connections.c:8324
 #, c-format
 msgid ""
 "set [<value>]  :: set new value\n"
 "\n"
 "This command sets provided <value> to this property\n"
-msgstr ""
-"set [<值>]  :: 设置新值\n"
+msgstr "set [<value>]  :: set new value\n"
 "\n"
-"此命令用于设置提供的 <值> 到该属性\n"
+"这个命令将提供的 <value> 设定到属性中。\n"
 
-#: ../clients/cli/connections.c:5994
+#: ../clients/cli/connections.c:8328
 #, c-format
 msgid ""
 "add [<value>]  :: append new value to the property\n"
@@ -2735,23 +3074,22 @@ msgid ""
 "container type. For single-valued properties the property value is replaced "
 "(same as 'set').\n"
 msgstr ""
-"add [<值>]  :: 添加新值到属性\n"
+"add [<value>]  :: 附加新值到这个属性\n"
+"\n"
+"如果该属性为容器类型，则这个命令在这个属性中添加提供的 <value>。对于单值属性，它会替换该值（和‘set’一样）。\n"
 "\n"
-"此命令添加提供的 <值> 到该属性，如果该属性术语容器类型。对于单值属性，属性值"
-"将被替代 (与“set”相同)。\n"
 
-#: ../clients/cli/connections.c:6000
+#: ../clients/cli/connections.c:8334
 #, c-format
 msgid ""
 "change  :: change current value\n"
 "\n"
 "Displays current value and allows editing it.\n"
-msgstr ""
-"change  :: 更改当前值\n"
+msgstr "change  :: change current value\n"
 "\n"
-"显示当前值并允许编辑它。\n"
+"显示当前值并允许编辑。\n"
 
-#: ../clients/cli/connections.c:6004
+#: ../clients/cli/connections.c:8338
 #, c-format
 msgid ""
 "remove [<value>|<index>|<option name>]  :: delete the value\n"
@@ -2770,19 +3108,20 @@ msgid ""
 "          nmcli bond.options> remove downdelay\n"
 "\n"
 msgstr ""
-"remove [<值>|<目录>|<选项名称>]  :: 删除该值\n"
+"remove [<value>|<index>|<option name>]  :: 删除属性值\n"
 "\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 8.8.8.8\n"
 "          nmcli ipv4.dns> remove 2\n"
 "          nmcli bond.options> remove downdelay\n"
 "\n"
 
-#: ../clients/cli/connections.c:6015
+#: ../clients/cli/connections.c:8349
 #, c-format
 msgid ""
 "describe  :: describe property\n"
@@ -2790,12 +3129,11 @@ msgid ""
 "Shows property description. You can consult nm-settings(5) manual page to "
 "see all NM settings and properties.\n"
 msgstr ""
-"describe  :: 描述属性\n"
+"describe  :: describe property\n"
 "\n"
-"显示属性描述。您可以参阅 nm-settings(5) 手册页来查看所有的网络管理器设置和属"
-"性。\n"
+"显示属性描述。您可以参考 nm-settings(5) 手册页面查看所有 NM 设置和属性。\n"
 
-#: ../clients/cli/connections.c:6020
+#: ../clients/cli/connections.c:8354
 #, c-format
 msgid ""
 "print [property|setting|connection]  :: print property (setting, connection) "
@@ -2804,569 +3142,557 @@ 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]  :: print property (setting, connection) "
+"value(s)\n"
 "\n"
-"显示属性。提供一项命令，您可以为全部设置或连接显示值。\n"
+"显示属性值。提供您还可以为整个设置或者连接显示的值。\n"
 
-#: ../clients/cli/connections.c:6028
+#: ../clients/cli/connections.c:8362
 #, c-format
-msgid ""
-"help/? [<command>]  :: help for nmcli commands\n"
+msgid "help/? [<command>]  :: help for nmcli commands\n"
 "\n"
-msgstr ""
-"help/? [<命令>]  :: nmcli 命令的帮护\n"
+msgstr "help/? [<command>]  :: help for nmcli commands\n"
 "\n"
 
-#: ../clients/cli/connections.c:6209
+#: ../clients/cli/connections.c:8460
+#, c-format
+msgid "Error: Connection activation failed.\n"
+msgstr "错误：激活连接失败。\n"
+
+#: ../clients/cli/connections.c:8543
 #, 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:6227
+#: ../clients/cli/connections.c:8561
 #, c-format
 msgid "[ Type: %s | Name: %s | UUID: %s | Dirty: %s | Temp: %s ]\n"
 msgstr "[ Type: %s | Name: %s | UUID: %s | Dirty: %s | Temp: %s ]\n"
 
-#: ../clients/cli/connections.c:6263
+#: ../clients/cli/connections.c:8597
 #, c-format
 msgid "The connection is not saved. Do you really want to quit? %s"
-msgstr "连接还未保存。您真的想要退出吗？%s"
+msgstr "连接未保存。您真的要退出吗？%s"
 
-#: ../clients/cli/connections.c:6312
+#: ../clients/cli/connections.c:8646
 #, 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"
+msgstr "已从另一个客户端中删除连接侧写。您需要在主菜单中输入 'save'恢复它。\n"
 
-#: ../clients/cli/connections.c:6337 ../clients/cli/connections.c:6758
-#: ../clients/cli/connections.c:6816
+#: ../clients/cli/connections.c:8671 ../clients/cli/connections.c:9093
+#: ../clients/cli/connections.c:9151
 #, c-format
 msgid "Allowed values for '%s' property: %s\n"
-msgstr "对于“%s”属性允许的值：%s\n"
+msgstr "'%s' 属性的可用值：%s\n"
 
-#: ../clients/cli/connections.c:6341 ../clients/cli/connections.c:6762
-#: ../clients/cli/connections.c:6820
+#: ../clients/cli/connections.c:8675 ../clients/cli/connections.c:9097
+#: ../clients/cli/connections.c:9155
 #, c-format
 msgid "Enter '%s' value: "
-msgstr "输入“%s”值："
+msgstr "输入 '%s' 值："
 
-#: ../clients/cli/connections.c:6356 ../clients/cli/connections.c:6378
-#: ../clients/cli/connections.c:6766 ../clients/cli/connections.c:6825
+#: ../clients/cli/connections.c:8690 ../clients/cli/connections.c:8712
+#: ../clients/cli/connections.c:9101 ../clients/cli/connections.c:9160
 #, c-format
 msgid "Error: failed to set '%s' property: %s\n"
-msgstr "错误：设置“%s”属性失败：%s\n"
+msgstr "错误：设定 '%s' 属性失败：%s\n"
 
-#: ../clients/cli/connections.c:6372
+#: ../clients/cli/connections.c:8706
 #, c-format
 msgid "Edit '%s' value: "
-msgstr "编辑“%s”值："
+msgstr "编辑 '%s' 值："
 
-#: ../clients/cli/connections.c:6401
+#: ../clients/cli/connections.c:8735
 #, c-format
 msgid "Error: %s\n"
 msgstr "错误：%s\n"
 
-#: ../clients/cli/connections.c:6407 ../clients/cli/connections.c:6907
-#: ../clients/cli/connections.c:6955
+#: ../clients/cli/connections.c:8741 ../clients/cli/connections.c:9242
+#: ../clients/cli/connections.c:9290
 #, c-format
 msgid "Error: failed to remove value of '%s': %s\n"
-msgstr "错误：移除“%s”的值失败：%s\n"
+msgstr "错误：删除 '%s' 值失败：%s\n"
 
-#: ../clients/cli/connections.c:6428
+#: ../clients/cli/connections.c:8762
 #, c-format
 msgid "Unknown command argument: '%s'\n"
-msgstr "未知命令参数：“%s”\n"
+msgstr "未知命令参数：'%s'\n"
 
-#: ../clients/cli/connections.c:6533
+#: ../clients/cli/connections.c:8867
 #, c-format
 msgid "Available settings: %s\n"
-msgstr "有效设置：%s\n"
+msgstr "可用设置：%s\n"
 
-#: ../clients/cli/connections.c:6545
+#: ../clients/cli/connections.c:8879
 #, c-format
 msgid "Error: invalid setting name; %s\n"
-msgstr "错误：无效的设置名称；%s\n"
+msgstr "错误：无效设置名称；%s\n"
 
-#: ../clients/cli/connections.c:6562
+#: ../clients/cli/connections.c:8896
 #, c-format
 msgid "Available properties: %s\n"
-msgstr "有效属性：%s\n"
+msgstr "可用属性：%s\n"
 
-#: ../clients/cli/connections.c:6570
+#: ../clients/cli/connections.c:8904
 #, c-format
 msgid "Error: property %s\n"
 msgstr "错误：属性 %s\n"
 
-#: ../clients/cli/connections.c:6611
+#: ../clients/cli/connections.c:8945
 #, 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"
+msgstr "使用 'autoconnect=yes' 保存该连接。这样会立即激活该连接。\n"
+"您还要保存吗？ %s"
 
-#: ../clients/cli/connections.c:6700
+#: ../clients/cli/connections.c:9035
 #, c-format
 msgid "You may edit the following settings: %s\n"
-msgstr "您可编辑下列设置：%s\n"
+msgstr "您可以编辑如下设置：%s\n"
 
-#: ../clients/cli/connections.c:6728
+#: ../clients/cli/connections.c:9063
 #, 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:6770 ../clients/cli/connections.c:7000
+#: ../clients/cli/connections.c:9105 ../clients/cli/connections.c:9335
 #, c-format
 msgid "Error: no setting selected; valid are [%s]\n"
-msgstr "错误：未选择设置；有效的为 [%s]\n"
+msgstr "错误：未选择设置；有效值为 [%s]\n"
 
-#: ../clients/cli/connections.c:6771
+#: ../clients/cli/connections.c:9106
 #, c-format
 msgid "use 'goto <setting>' first, or 'set <setting>.<property>'\n"
-msgstr "先使用“goto <设置>”，或“set <设置>.<属性>”\n"
+msgstr "使用 'goto <setting>' 或者 'set <setting>。<property>'\n"
 
-#: ../clients/cli/connections.c:6785 ../clients/cli/connections.c:6934
-#: ../clients/cli/connections.c:7022
+#: ../clients/cli/connections.c:9120 ../clients/cli/connections.c:9269
+#: ../clients/cli/connections.c:9357
 #, c-format
 msgid "Error: invalid setting argument '%s'; valid are [%s]\n"
-msgstr "错误：无效的设置参数“%s”；有效的为 [%s]\n"
+msgstr "错误：无效设置参数 '%s'；有效值为 [%s]\n"
 
-#: ../clients/cli/connections.c:6795
+#: ../clients/cli/connections.c:9130
 #, c-format
 msgid "Error: missing setting for '%s' property\n"
-msgstr "错误：缺少用于“%s”属性的设置\n"
+msgstr "错误：缺少 '%s' 属性设置\n"
 
-#: ../clients/cli/connections.c:6802
+#: ../clients/cli/connections.c:9137
 #, c-format
 msgid "Error: invalid property: %s\n"
 msgstr "错误：无效属性：%s\n"
 
-#: ../clients/cli/connections.c:6855
+#: ../clients/cli/connections.c:9190
 #, c-format
 msgid "Error: unknown setting '%s'\n"
-msgstr "错误：未知设置“%s”\n"
+msgstr "错误：位置设置 '%s'\n"
 
-#: ../clients/cli/connections.c:6868
+#: ../clients/cli/connections.c:9203
 #, c-format
 msgid "You may edit the following properties: %s\n"
-msgstr "您可以编辑下列属性：%s\n"
+msgstr "您可以编辑以下属性：%s\n"
 
-#: ../clients/cli/connections.c:6912
+#: ../clients/cli/connections.c:9247
 #, c-format
 msgid "Error: no argument given; valid are [%s]\n"
-msgstr "错误：未给定参数：有效的为 [%s]\n"
+msgstr "错误：为给出参数；有效值为 [%s]\n"
 
-#: ../clients/cli/connections.c:6931
+#: ../clients/cli/connections.c:9266
 #, c-format
 msgid "Setting '%s' is not present in the connection.\n"
-msgstr "设置“%s”未在连接里提供。\n"
+msgstr "该连接中未显示设置 '%s'。\n"
 
-#: ../clients/cli/connections.c:6976
+#: ../clients/cli/connections.c:9311
 #, c-format
 msgid "Error: %s properties, nor it is a setting name.\n"
-msgstr "错误：%s 属性，也不是设置名称。\n"
+msgstr "错误：%s 属性，它不是设置名称。\n"
 
-#: ../clients/cli/connections.c:7001
+#: ../clients/cli/connections.c:9336
 #, c-format
 msgid "use 'goto <setting>' first, or 'describe <setting>.<property>'\n"
-msgstr "先使用“goto <设置>”，或“describe <设置>.<属性>”\n"
+msgstr "首先使用 'goto <setting>' 或者 'describe <setting>。<property>'\n"
 
-#: ../clients/cli/connections.c:7050
+#: ../clients/cli/connections.c:9385
 #, c-format
 msgid "Error: invalid property: %s, neither a valid setting name.\n"
-msgstr "错误：无效属性：%s，也不是有效的设置名称。\n"
+msgstr "错误：无效属性：%s，也不是有效设置名称。\n"
 
-#: ../clients/cli/connections.c:7082
+#: ../clients/cli/connections.c:9417
 #, c-format
 msgid "Error: unknown setting: '%s'\n"
-msgstr "错误：未知设置：“%s”\n"
+msgstr "错误：未知设置：'%s'\n"
 
-#: ../clients/cli/connections.c:7087
+#: ../clients/cli/connections.c:9422
 #, c-format
 msgid "Error: '%s' setting not present in the connection\n"
-msgstr "错误：设置“%s”未在连接里提供。\n"
+msgstr "错误：该连接中未出现设置 '%s'\n"
 
-#: ../clients/cli/connections.c:7115
+#: ../clients/cli/connections.c:9450
 #, c-format
 msgid "Error: invalid property: %s%s\n"
 msgstr "错误：无效属性：%s%s\n"
 
-#: ../clients/cli/connections.c:7117
+#: ../clients/cli/connections.c:9452
 msgid ", neither a valid setting name"
 msgstr "，也不是有效的设置名称"
 
-#: ../clients/cli/connections.c:7134
+#: ../clients/cli/connections.c:9469
 #, c-format
 msgid "Invalid verify option: %s\n"
-msgstr "无效的验证选项：%s\n"
+msgstr "无效的检验选项：%s\n"
 
-#: ../clients/cli/connections.c:7142
+#: ../clients/cli/connections.c:9477
 #, c-format
 msgid "Verify setting '%s': %s\n"
-msgstr "验证设置“%s”：%s\n"
+msgstr "确认设置 '%s': %s\n"
 
-#: ../clients/cli/connections.c:7157
+#: ../clients/cli/connections.c:9492
 #, c-format
 msgid "Verify connection: %s\n"
-msgstr "验证连接：%s\n"
+msgstr "确认连接：%s\n"
 
-#: ../clients/cli/connections.c:7160
+#: ../clients/cli/connections.c:9495
 #, c-format
 msgid "The error cannot be fixed automatically.\n"
-msgstr "该错误无法被自动修复。\n"
+msgstr "错误无法自动修复。\n"
 
-#: ../clients/cli/connections.c:7177
+#: ../clients/cli/connections.c:9512
 #, c-format
 msgid "Error: invalid argument '%s'\n"
-msgstr "错误：无效的参数“%s”\n"
+msgstr "错误：无效的参数 '%s'\n"
 
-#: ../clients/cli/connections.c:7210
+#: ../clients/cli/connections.c:9545
 #, 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:7217
+#: ../clients/cli/connections.c:9552
 #, c-format
 msgid "Connection '%s' (%s) successfully saved.\n"
-msgstr "连接“%s” (%s)  已成功保存。\n"
+msgstr "成功保存连接 '%s' (%s)。\n"
 
-#: ../clients/cli/connections.c:7218
+#: ../clients/cli/connections.c:9553
 #, c-format
 msgid "Connection '%s' (%s) successfully updated.\n"
-msgstr "连接“%s” (%s)  已成功更新。\n"
+msgstr "成功地更新了连接 '%s'（%s）。\n"
 
-#: ../clients/cli/connections.c:7251
+#: ../clients/cli/connections.c:9586
 #, c-format
 msgid "Error: connection verification failed: %s\n"
-msgstr "错误：连接验证失败：%s。\n"
+msgstr "错误：连接验证失败：%s\n"
 
-#: ../clients/cli/connections.c:7252
+#: ../clients/cli/connections.c:9587
 msgid "(unknown error)"
-msgstr "（未知错误）"
+msgstr "(未知错误)"
 
-#: ../clients/cli/connections.c:7253
+#: ../clients/cli/connections.c:9588
 #, 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:7275
+#: ../clients/cli/connections.c:9610
 #, c-format
 msgid "Error: connection is not saved. Type 'save' first.\n"
-msgstr "错误：连接还未保存。先输入“save”。\n"
+msgstr "错误：未保存连接。请首先输入 'save'。\n"
 
-#: ../clients/cli/connections.c:7279
+#: ../clients/cli/connections.c:9614
 #, c-format
 msgid "Error: connection is not valid: %s\n"
-msgstr "错误：连接是无效的：%s\n"
+msgstr "错误：连接无效：%s\n"
 
-#: ../clients/cli/connections.c:7289
+#: ../clients/cli/connections.c:9624
 #, c-format
 msgid "Error: Cannot activate connection: %s.\n"
 msgstr "错误：无法激活连接：%s。\n"
 
-#: ../clients/cli/connections.c:7299
+#: ../clients/cli/connections.c:9634
 #, 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:7305
+#: ../clients/cli/connections.c:9640
 #, c-format
 msgid "Monitoring connection activation (press any key to continue)\n"
-msgstr "正在监控连接激活（按任意键继续）\n"
+msgstr "激活监控连接（按任意间继续）\n"
 
-#: ../clients/cli/connections.c:7343
+#: ../clients/cli/connections.c:9678
 #, c-format
 msgid "Error: status-line: %s\n"
-msgstr "错误：status-line：%s\n"
+msgstr "错误：status-line: %s\n"
 
-#: ../clients/cli/connections.c:7351
+#: ../clients/cli/connections.c:9686
 #, c-format
 msgid "Error: save-confirmation: %s\n"
-msgstr "错误：save-confirmation：%s\n"
+msgstr "错误：save-confirmation: %s\n"
 
-#: ../clients/cli/connections.c:7359
+#: ../clients/cli/connections.c:9694
 #, c-format
 msgid "Error: show-secrets: %s\n"
-msgstr "错误：show-secrets：%s\n"
+msgstr "错误：show-secrets: %s\n"
 
-#: ../clients/cli/connections.c:7368
+#: ../clients/cli/connections.c:9703
 #, c-format
 msgid "Error: bad color: %s\n"
 msgstr "错误：错误的颜色：%s\n"
 
-#: ../clients/cli/connections.c:7382
+#: ../clients/cli/connections.c:9717
 #, c-format
 msgid "Current nmcli configuration:\n"
 msgstr "当前 nmcli 配置：\n"
 
-#: ../clients/cli/connections.c:7392
+#: ../clients/cli/connections.c:9727
 #, c-format
 msgid "Invalid configuration option '%s'; allowed [%s]\n"
-msgstr "无效的配置选项“%s”；允许 [%s]\n"
+msgstr "无效配置选项 '%s'；应为 [%s]\n"
 
-#: ../clients/cli/connections.c:7593
+#: ../clients/cli/connections.c:9982
 #, c-format
 msgid "Error: only one of 'id', uuid, or 'path' can be provided."
-msgstr "错误：只能提供“id”、uuid 或“路径”之一。"
+msgstr "错误：只能提供 'id', uuid, 或者 'path' 之一。"
 
-#: ../clients/cli/connections.c:7605 ../clients/cli/connections.c:7788
-#: ../clients/cli/connections.c:7795 ../clients/cli/connections.c:7929
-#: ../clients/cli/connections.c:8434
+#: ../clients/cli/connections.c:9994 ../clients/cli/connections.c:10171
+#: ../clients/cli/connections.c:10178 ../clients/cli/connections.c:10306
+#: ../clients/cli/connections.c:10782
 #, c-format
 msgid "Error: Unknown connection '%s'."
-msgstr "错误：未知连接“%s”。"
+msgstr "错误：未知连接：'%s'."
 
-#: ../clients/cli/connections.c:7623
+#: ../clients/cli/connections.c:10012
 #, 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:7626
+#: ../clients/cli/connections.c:10015
 #, 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:7640
+#: ../clients/cli/connections.c:10029
 #, c-format
 msgid "Valid connection types: %s\n"
-msgstr "无效的连接类型：%s\n"
+msgstr "无效连接类型：%s\n"
 
-#: ../clients/cli/connections.c:7642
+#: ../clients/cli/connections.c:10031
 #, c-format
 msgid "Error: invalid connection type; %s\n"
 msgstr "错误：无效的连接类型；%s\n"
 
-#: ../clients/cli/connections.c:7681
+#: ../clients/cli/connections.c:10070
 #, c-format
 msgid "===| nmcli interactive connection editor |==="
-msgstr "===| nmcli 交互式连接编辑器 |==="
+msgstr "===| nmcli interactive connection editor |==="
 
-#: ../clients/cli/connections.c:7684
+#: ../clients/cli/connections.c:10073
 #, c-format
 msgid "Editing existing '%s' connection: '%s'"
-msgstr "正在编辑已存的连接“%s”：“%s”"
+msgstr "编辑现有 '%s' 连接：'%s'"
 
-#: ../clients/cli/connections.c:7686
+#: ../clients/cli/connections.c:10075
 #, c-format
 msgid "Adding a new '%s' connection"
-msgstr "正在添加新的“%s”连接"
+msgstr "添加新 '%s' 连接"
 
-#: ../clients/cli/connections.c:7688
+#: ../clients/cli/connections.c:10077
 #, c-format
 msgid "Type 'help' or '?' for available commands."
-msgstr "对于可用的命令输入“help”或“?”。"
+msgstr "输入 'help' 或者 '?' 查看可用命令。"
 
-#: ../clients/cli/connections.c:7690
+#: ../clients/cli/connections.c:10079
 #, c-format
 msgid "Type 'describe [<setting>.<prop>]' for detailed property description."
-msgstr "输入“describe [<设置>.<属性>]”来获得详细的属性描述。"
+msgstr "输入 'describe [<setting>.<prop>]' 查看详细的属性说明。"
 
-#: ../clients/cli/connections.c:7728
+#: ../clients/cli/connections.c:10117
 #, c-format
 msgid "Error: Failed to modify connection '%s': %s"
-msgstr "错误：修改连接“%s”失败：%s"
+msgstr "错误：修改连接 '%s' 失败：%s"
 
-#: ../clients/cli/connections.c:7735
+#: ../clients/cli/connections.c:10124
 #, c-format
 msgid "Connection '%s' (%s) successfully modified.\n"
-msgstr "连接“%s”(%s) 已成功修改。\n"
+msgstr "成功修改连接 '%s' (%s)。\n"
 
-#.
-#. * TODO(?) complete "uuid", "path", "id" or connection name.
-#. * (if we ever will move this here from shell completion script)
-#. if (nmc->complete) {
-#. quit ();
-#.
-#: ../clients/cli/connections.c:7761 ../clients/cli/connections.c:7885
-#: ../clients/cli/connections.c:8280 ../clients/cli/connections.c:8399
+#: ../clients/cli/connections.c:10146 ../clients/cli/connections.c:10262
+#: ../clients/cli/connections.c:10639 ../clients/cli/connections.c:10747
 #, c-format
 msgid "Error: No arguments provided."
-msgstr "错误：没有提供参数。"
+msgstr "错误：未提供参数。"
 
-#: ../clients/cli/connections.c:7847
+#: ../clients/cli/connections.c:10165 ../clients/cli/connections.c:10294
+#: ../clients/cli/connections.c:10776
+#, c-format
+msgid "Error: connection ID is missing."
+msgstr "错误：缺少连接 ID。"
+
+#: ../clients/cli/connections.c:10228
 #, 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:7883
+#: ../clients/cli/connections.c:10260
 msgid "New connection name: "
 msgstr "新连接名称："
 
-#: ../clients/cli/connections.c:7904 ../clients/cli/connections.c:7922
+#: ../clients/cli/connections.c:10281 ../clients/cli/connections.c:10299
 #, c-format
 msgid "Error: <new name> argument is missing."
 msgstr "错误：缺少 <new name> 参数。"
 
-#: ../clients/cli/connections.c:7910
+#: ../clients/cli/connections.c:10287
 #, c-format
 msgid "Error: unexpected extra argument '%s'."
-msgstr "错误：意外的额外参数“%s”。"
-
-#: ../clients/cli/connections.c:7917 ../clients/cli/connections.c:8428
-#, c-format
-msgid "Error: connection ID is missing."
-msgstr "错误：缺少连接 ID。"
+msgstr "错误：意外的额外参数 '%s'。"
 
-#: ../clients/cli/connections.c:7979
+#: ../clients/cli/connections.c:10356
 #, c-format
 msgid "Error: not all connections deleted."
-msgstr "错误：不是所有的连接都已删除。"
+msgstr "错误：未删除所有的连接。"
 
-#: ../clients/cli/connections.c:7980
+#: ../clients/cli/connections.c:10357
 #, c-format
 msgid "Error: Connection deletion failed: %s"
-msgstr "错误：连接删除失败：%s"
+msgstr "错误：删除连接失败：%s"
 
-#: ../clients/cli/connections.c:8046 ../clients/cli/connections.c:8179
+#: ../clients/cli/connections.c:10419 ../clients/cli/connections.c:10547
 #, c-format
 msgid "Error: unknown connection '%s'\n"
-msgstr "错误：未知连接“%s”\n"
+msgstr "错误：未知连接 '%s'\n"
+"\n"
 
-#: ../clients/cli/connections.c:8060
+#: ../clients/cli/connections.c:10433
 #, c-format
 msgid "Error: no connection provided."
-msgstr "错误：没有提供连接。"
+msgstr "错误：未提供连接。"
 
 #. truncate trailing ", "
-#: ../clients/cli/connections.c:8085
+#: ../clients/cli/connections.c:10458
 #, c-format
 msgid "Error: cannot delete unknown connection(s): %s."
 msgstr "错误：无法删除未知连接：%s。"
 
-#: ../clients/cli/connections.c:8097
+#: ../clients/cli/connections.c:10470
 #, c-format
 msgid "%s: connection profile changed\n"
-msgstr "%s：连接配置文件已改变\n"
+msgstr "%s: 连接配置集已改动\n"
 
-#: ../clients/cli/connections.c:8123
+#: ../clients/cli/connections.c:10496
 #, c-format
 msgid "%s: connection profile created\n"
-msgstr "%s：连接配置文件已创建\n"
+msgstr "%s: 连接配置集已创建\n"
 
-#: ../clients/cli/connections.c:8132
+#: ../clients/cli/connections.c:10505
 #, c-format
 msgid "%s: connection profile removed\n"
-msgstr "%s：连接配置已移除\n"
+msgstr "%s: 连接配置集已删除\n"
 
-#: ../clients/cli/connections.c:8180
-#, fuzzy, c-format
+#: ../clients/cli/connections.c:10548
+#, c-format
 msgid "Error: not all connections found."
-msgstr "错误：没有找到所有活跃连接。"
+msgstr "错误：未找到所有连接。"
 
-#: ../clients/cli/connections.c:8205
+#: ../clients/cli/connections.c:10571
 #, c-format
 msgid "Error: failed to reload connections: %s."
-msgstr "错误：重新载入连接失败：%s。"
+msgstr "错误：重载连接失败：%s。"
 
-#: ../clients/cli/connections.c:8239
+#: ../clients/cli/connections.c:10603
 #, c-format
 msgid "Error: failed to load connection: %s."
 msgstr "错误：加载连接失败：%s。"
 
-#: ../clients/cli/connections.c:8247
+#: ../clients/cli/connections.c:10611
 #, c-format
 msgid "Could not load file '%s'\n"
-msgstr "无法加载文件“%s”\n"
+msgstr "无法载入文件 '%s'\n"
 
-#: ../clients/cli/connections.c:8256
+#: ../clients/cli/connections.c:10620
 msgid "File to import: "
 msgstr "要导入的文件："
 
-#: ../clients/cli/connections.c:8296
+#: ../clients/cli/connections.c:10655
 #, c-format
 msgid "Warning: 'type' already specified, ignoring extra one.\n"
-msgstr "警告：“type”已经指定了，正在忽略多余的。\n"
+msgstr "警告：已指定 'type'，忽略额外的选项。\n"
 
-#: ../clients/cli/connections.c:8307
+#: ../clients/cli/connections.c:10666
 #, c-format
 msgid "Warning: 'file' already specified, ignoring extra one.\n"
-msgstr "警告：“file”已经指定了，正在忽略多余的。\n"
+msgstr "警告：已指定 'file'，忽略额外的选项。\n"
 
-#: ../clients/cli/connections.c:8309
+#: ../clients/cli/connections.c:10668
 #, c-format
 msgid "Unknown parameter: %s"
 msgstr "未知参数：%s"
 
-#: ../clients/cli/connections.c:8319
-#, c-format
-msgid "Error: 'type' argument is required."
-msgstr "错误：需要“type”参数。"
-
-#: ../clients/cli/connections.c:8324
+#: ../clients/cli/connections.c:10683
 #, c-format
 msgid "Error: 'file' argument is required."
-msgstr "错误：需要“file”参数。"
+msgstr "错误：需要'file' 参数。"
 
-#: ../clients/cli/connections.c:8331
-#, fuzzy, c-format
-msgid "Error: failed to find VPN plugin for %s."
-msgstr "错误：加载 VPN 插件失败：%s。"
-
-#: ../clients/cli/connections.c:8339 ../clients/cli/connections.c:8450
+#: ../clients/cli/connections.c:10691 ../clients/cli/connections.c:10798
 #, c-format
 msgid "Error: failed to load VPN plugin: %s."
 msgstr "错误：加载 VPN 插件失败：%s。"
 
-#: ../clients/cli/connections.c:8347
+#: ../clients/cli/connections.c:10699
 #, c-format
 msgid "Error: failed to import '%s': %s."
-msgstr "错误：导入“%s”失败：%s。"
+msgstr "错误：导入失败 '%s'：%s。"
 
-#: ../clients/cli/connections.c:8397
+#: ../clients/cli/connections.c:10745
 msgid "Output file name: "
-msgstr "输出文件名称："
+msgstr "输出文件名："
 
-#: ../clients/cli/connections.c:8421
+#: ../clients/cli/connections.c:10769
 #, c-format
 msgid "Error: unknown extra argument: '%s'."
-msgstr "错误：未知的额外参数：“%s”。"
+msgstr "错误：未知的额外参数：'%s'。"
 
-#: ../clients/cli/connections.c:8441
+#: ../clients/cli/connections.c:10789
 #, c-format
 msgid "Error: the connection is not VPN."
-msgstr "错误：连接不为 VPN。"
+msgstr "错误：连接不是 VPN。"
 
-#: ../clients/cli/connections.c:8462
+#: ../clients/cli/connections.c:10810
 #, c-format
 msgid "Error: failed to create temporary file %s."
 msgstr "错误：创建临时文件 %s 失败。"
 
-#: ../clients/cli/connections.c:8471
+#: ../clients/cli/connections.c:10819
 #, c-format
 msgid "Error: failed to export '%s': %s."
-msgstr "错误：导出“%s”失败：%s。"
+msgstr "错误：导出 '%s' 失败：%s。"
 
-#: ../clients/cli/connections.c:8482
+#: ../clients/cli/connections.c:10830
 #, c-format
 msgid "Error: failed to read temporary file '%s': %s."
-msgstr "错误：读取临时文件“%s”失败：%s。"
+msgstr "错误：读取临时文件 '%s' 失败：%s。"
 
-#: ../clients/cli/connections.c:8628
+#: ../clients/cli/connections.c:10976
 #, c-format
 msgid "incorrect string '%s' of '--order' option"
-msgstr "“--order”选项的错误字符串“%s”"
+msgstr "'--order' 选项的错误字符串 '%s' "
 
-#: ../clients/cli/connections.c:8654
+#: ../clients/cli/connections.c:11002
 #, c-format
 msgid "incorrect item '%s' in '--order' option"
-msgstr "“--order”选项的错误项目“%s”"
+msgstr "'--order' 选项里的错误项 '%s' "
 
-#: ../clients/cli/connections.c:8740
+#: ../clients/cli/connections.c:11089
 msgid "'--order' argument is missing"
-msgstr "缺少“--order”参数"
+msgstr "缺少 '--order' 参数"
 
-#: ../clients/cli/connections.c:8816
+#: ../clients/cli/connections.c:11154
 #, c-format
 msgid "Error: '%s' is not valid 'connection' command."
-msgstr "错误：“%s” 是无效的 “connection” 命令。"
+msgstr "错误：'%s' 不是有效 'connection' 命令。"
 
 #. define some prompts
 #: ../clients/cli/devices.c:35
@@ -3374,7 +3700,6 @@ msgid "Interface: "
 msgstr "接口："
 
 #: ../clients/cli/devices.c:36
-#, fuzzy
 msgid "Interface(s): "
 msgstr "接口："
 
@@ -3382,7 +3707,7 @@ msgstr "接口："
 #. 20
 #: ../clients/cli/devices.c:44 ../clients/cli/devices.c:76
 msgid "CONNECTION"
-msgstr "连接"
+msgstr "CONNECTION"
 
 #. 4
 #. 21
@@ -3393,17 +3718,17 @@ msgstr "CON-UUID"
 #. 2
 #: ../clients/cli/devices.c:58
 msgid "NM-TYPE"
-msgstr "NM-类型"
+msgstr "NM-TYPE"
 
 #. 3
 #: ../clients/cli/devices.c:59
 msgid "VENDOR"
-msgstr "厂商"
+msgstr "VENDOR"
 
 #. 4
 #: ../clients/cli/devices.c:60
 msgid "PRODUCT"
-msgstr "产品"
+msgstr "PRODUCT"
 
 #. 5
 #: ../clients/cli/devices.c:61
@@ -3413,12 +3738,12 @@ msgstr "驱动程序"
 #. 6
 #: ../clients/cli/devices.c:62
 msgid "DRIVER-VERSION"
-msgstr "驱动程序版本"
+msgstr "DRIVER-VERSION"
 
 #. 7
 #: ../clients/cli/devices.c:63
 msgid "FIRMWARE-VERSION"
-msgstr "固件版本"
+msgstr "FIRMWARE-VERSION"
 
 #. 8
 #: ../clients/cli/devices.c:64
@@ -3435,7 +3760,7 @@ msgstr "MTU"
 #. 11
 #: ../clients/cli/devices.c:67
 msgid "REASON"
-msgstr "原因"
+msgstr "REASON"
 
 #. 12
 #: ../clients/cli/devices.c:68
@@ -3451,42 +3776,42 @@ msgstr "IP-IFACE"
 #. 2
 #: ../clients/cli/devices.c:70 ../clients/cli/devices.c:102
 msgid "IS-SOFTWARE"
-msgstr "是否软件"
+msgstr "IS-SOFTWARE"
 
 #. 15
 #: ../clients/cli/devices.c:71
 msgid "NM-MANAGED"
-msgstr "被 NM 管理"
+msgstr "NM-MANAGED"
 
 #. 17
 #: ../clients/cli/devices.c:73
 msgid "FIRMWARE-MISSING"
-msgstr "固件缺失"
+msgstr "FIRMWARE-MISSING"
 
 #. 18
 #: ../clients/cli/devices.c:74
 msgid "NM-PLUGIN-MISSING"
-msgstr "网络管理器插件缺失"
+msgstr "NM-PLUGIN-MISSING"
 
 #. 19
 #: ../clients/cli/devices.c:75
 msgid "PHYS-PORT-ID"
-msgstr "物理端口 ID"
+msgstr "PHYS-PORT-ID"
 
 #. 23
 #: ../clients/cli/devices.c:79
 msgid "METERED"
-msgstr "计费"
+msgstr "METERED"
 
 #. 0
 #: ../clients/cli/devices.c:90
 msgid "AVAILABLE-CONNECTION-PATHS"
-msgstr "可用连接路径"
+msgstr "AVAILABLE-CONNECTION-PATHS"
 
 #. 1
 #: ../clients/cli/devices.c:91
 msgid "AVAILABLE-CONNECTIONS"
-msgstr "可用连接"
+msgstr "AVAILABLE-CONNECTIONS"
 
 #. 0
 #: ../clients/cli/devices.c:100
@@ -3501,15 +3826,15 @@ msgstr "速度"
 #. 0
 #: ../clients/cli/devices.c:111
 msgid "CARRIER"
-msgstr "载波"
+msgstr "容器"
 
 #. 1
 #: ../clients/cli/devices.c:112
 msgid "S390-SUBCHANNELS"
-msgstr "S390 子频段"
+msgstr "S390-SUBCHANNELS"
 
 #. 0
-#: ../clients/cli/devices.c:121 ../clients/cli/devices.c:741
+#: ../clients/cli/devices.c:121 ../clients/cli/devices.c:731
 msgid "WEP"
 msgstr "WEP"
 
@@ -3519,7 +3844,7 @@ msgid "WPA"
 msgstr "WPA"
 
 #. 2
-#: ../clients/cli/devices.c:123 ../clients/cli/devices.c:749
+#: ../clients/cli/devices.c:123 ../clients/cli/devices.c:739
 msgid "WPA2"
 msgstr "WPA2"
 
@@ -3535,9 +3860,9 @@ msgstr "CCMP"
 
 #. 5
 #. 2
-#: ../clients/cli/devices.c:126 ../clients/cli/devices.c:238
+#: ../clients/cli/devices.c:126 ../clients/cli/devices.c:228
 msgid "AP"
-msgstr "访问点"
+msgstr "AP"
 
 #. 6
 #: ../clients/cli/devices.c:127
@@ -3557,7 +3882,7 @@ msgstr "5GHZ"
 #. 0
 #: ../clients/cli/devices.c:138
 msgid "CTR-FREQ"
-msgstr "CTR 频率"
+msgstr "CTR-FREQ"
 
 #. 1
 #: ../clients/cli/devices.c:139
@@ -3579,6 +3904,11 @@ msgstr "TX-POW"
 msgid "BSID"
 msgstr "BSID"
 
+#. 0
+#: ../clients/cli/devices.c:151 ../clients/tui/nmt-page-wifi.c:224
+msgid "SSID"
+msgstr "SSID"
+
 #. 1
 #: ../clients/cli/devices.c:152
 msgid "SSID-HEX"
@@ -3592,22 +3922,22 @@ msgstr "BSSID"
 #. 3
 #: ../clients/cli/devices.c:154
 msgid "MODE"
-msgstr "模式"
+msgstr "型号"
 
 #. 4
 #: ../clients/cli/devices.c:155
 msgid "CHAN"
-msgstr "频段"
+msgstr "CHAN"
 
 #. 5
 #: ../clients/cli/devices.c:156
 msgid "FREQ"
-msgstr "频率"
+msgstr "FREQ"
 
 #. 6
 #: ../clients/cli/devices.c:157
 msgid "RATE"
-msgstr "速率"
+msgstr "频率"
 
 #. 7
 #. 1
@@ -3628,12 +3958,12 @@ msgstr "安全性"
 #. 10
 #: ../clients/cli/devices.c:161
 msgid "WPA-FLAGS"
-msgstr "WPA标志"
+msgstr "WPA-标志"
 
 #. 11
 #: ../clients/cli/devices.c:162
 msgid "RSN-FLAGS"
-msgstr "RSN标志"
+msgstr "RSN-标志"
 
 #. 14
 #: ../clients/cli/devices.c:165
@@ -3642,160 +3972,142 @@ msgstr "*"
 
 #. 0
 #. 5
-#: ../clients/cli/devices.c:177 ../clients/cli/devices.c:241
+#: ../clients/cli/devices.c:177 ../clients/cli/devices.c:231
 msgid "NSP"
 msgstr "NSP"
 
 #. 0
-#: ../clients/cli/devices.c:192 ../clients/cli/devices.c:201
+#: ../clients/cli/devices.c:192
 msgid "SLAVES"
-msgstr "从"
-
-#. 1
-#: ../clients/cli/devices.c:202
-msgid "CONFIG"
-msgstr ""
+msgstr "SLAVES"
 
 #. 0
-#: ../clients/cli/devices.c:211
+#: ../clients/cli/devices.c:201
 msgid "PARENT"
-msgstr "父"
+msgstr "PARENT"
 
 #. 1
-#: ../clients/cli/devices.c:212
+#: ../clients/cli/devices.c:202
 msgid "ID"
 msgstr "ID"
 
 #. 0
-#: ../clients/cli/devices.c:221 ../clients/cli/devices.c:236
+#: ../clients/cli/devices.c:211 ../clients/cli/devices.c:226
 msgid "CAPABILITIES"
 msgstr "功能"
 
 #. 1
-#: ../clients/cli/devices.c:237
+#: ../clients/cli/devices.c:227
 msgid "WIFI-PROPERTIES"
 msgstr "WIFI 属性"
 
 #. 3
-#: ../clients/cli/devices.c:239
+#: ../clients/cli/devices.c:229
 msgid "WIRED-PROPERTIES"
 msgstr "有线连接属性"
 
 #. 4
-#: ../clients/cli/devices.c:240
+#: ../clients/cli/devices.c:230
 msgid "WIMAX-PROPERTIES"
-msgstr "WIMAX 属性"
+msgstr "WIMAX-PROPERTIES"
 
 #. 10
-#: ../clients/cli/devices.c:246 ../clients/tui/nmt-page-bond.c:351
+#: ../clients/cli/devices.c:236 ../clients/tui/nmt-page-bond.c:351
 msgid "BOND"
 msgstr "BOND"
 
 #. 11
-#: ../clients/cli/devices.c:247 ../clients/tui/nmt-page-team.c:145
+#: ../clients/cli/devices.c:237 ../clients/tui/nmt-page-team.c:145
 msgid "TEAM"
-msgstr "群组"
+msgstr "TEAM"
 
 #. 12
-#: ../clients/cli/devices.c:248 ../clients/tui/nmt-page-bridge.c:74
+#: ../clients/cli/devices.c:238 ../clients/tui/nmt-page-bridge.c:74
 msgid "BRIDGE"
 msgstr "桥接"
 
-#. 13
-#: ../clients/cli/devices.c:249 ../clients/tui/nm-editor-utils.c:217
-#: ../clients/tui/nmt-page-vlan.c:94 ../libnm-core/nm-connection.c:1746
-#: ../libnm-glib/nm-device.c:1879 ../libnm-util/nm-connection.c:1632
-#: ../libnm/nm-device.c:1830
-msgid "VLAN"
-msgstr "VLAN 参数"
-
 #. 14
-#: ../clients/cli/devices.c:250
+#: ../clients/cli/devices.c:240
 msgid "BLUETOOTH"
-msgstr "蓝牙"
+msgstr "BLUETOOTH"
 
 #. 15
-#: ../clients/cli/devices.c:251
+#: ../clients/cli/devices.c:241
 msgid "CONNECTIONS"
-msgstr "连接"
+msgstr "CONNECTIONS"
 
 #. 1
-#: ../clients/cli/devices.c:263
-#, fuzzy
+#: ../clients/cli/devices.c:253
 msgid "CHASSIS-ID"
-msgstr "ID："
+msgstr "CHASSIS-ID"
 
 #. 2
-#: ../clients/cli/devices.c:264
+#: ../clients/cli/devices.c:254
 msgid "PORT-ID"
-msgstr "端口 ID"
+msgstr "PORT-ID"
 
 #. 3
-#: ../clients/cli/devices.c:265
+#: ../clients/cli/devices.c:255
 msgid "PORT-DESCRIPTION"
-msgstr "端口描述"
+msgstr "PORT-DESCRIPTION"
 
 #. 4
-#: ../clients/cli/devices.c:266
+#: ../clients/cli/devices.c:256
 msgid "SYSTEM-NAME"
-msgstr "系统名称"
+msgstr "SYSTEM-NAME"
 
 #. 5
-#: ../clients/cli/devices.c:267
+#: ../clients/cli/devices.c:257
 msgid "SYSTEM-DESCRIPTION"
-msgstr "系统描述"
+msgstr "SYSTEM-DESCRIPTION"
 
 #. 6
-#: ../clients/cli/devices.c:268
+#: ../clients/cli/devices.c:258
 msgid "SYSTEM-CAPABILITIES"
-msgstr "系统功能"
+msgstr "SYSTEM-CAPABILITIES"
 
 #. 7
-#: ../clients/cli/devices.c:269
+#: ../clients/cli/devices.c:259
 msgid "IEEE-802-1-PVID"
 msgstr "IEEE-802-1-PVID"
 
 #. 8
-#: ../clients/cli/devices.c:270
+#: ../clients/cli/devices.c:260
 msgid "IEEE-802-1-PPVID"
 msgstr "IEEE-802-1-PPVID"
 
 #. 9
-#: ../clients/cli/devices.c:271
-#, fuzzy
+#: ../clients/cli/devices.c:261
 msgid "IEEE-802-1-PPVID-FLAGS"
-msgstr "IEEE-802-1-PPVID"
+msgstr "IEEE-802-1-PPVID-FLAGS"
 
 #. 10
-#: ../clients/cli/devices.c:272
+#: ../clients/cli/devices.c:262
 msgid "IEEE-802-1-VID"
 msgstr "IEEE-802-1-VID"
 
 #. 11
-#: ../clients/cli/devices.c:273
-#, fuzzy
+#: ../clients/cli/devices.c:263
 msgid "IEEE-802-1-VLAN-NAME"
-msgstr "IEEE-802-1-PVID"
+msgstr "IEEE-802-1-VLAN-NAME"
 
 #. 12
-#: ../clients/cli/devices.c:274
-#, fuzzy
+#: ../clients/cli/devices.c:264
 msgid "DESTINATION"
-msgstr "目标"
+msgstr "DESTINATION"
 
 #. 13
-#: ../clients/cli/devices.c:275
-#, fuzzy
+#: ../clients/cli/devices.c:265
 msgid "CHASSIS-ID-TYPE"
-msgstr "边类型的唯一标识。"
+msgstr "CHASSIS-ID-TYPE"
 
 #. 14
-#: ../clients/cli/devices.c:276
+#: ../clients/cli/devices.c:266
 msgid "PORT-ID-TYPE"
-msgstr "端口 ID 类型"
+msgstr "PORT-ID-TYPE"
 
-#: ../clients/cli/devices.c:293
-#, fuzzy, c-format
+#: ../clients/cli/devices.c:283
+#, c-format
 msgid ""
 "Usage: nmcli device { COMMAND | help }\n"
 "\n"
@@ -3810,7 +4122,7 @@ msgid ""
 "\n"
 "  connect <ifname>\n"
 "\n"
-"  reapply <ifname>\n"
+"  reapply <ifname> ...\n"
 "\n"
 "  disconnect <ifname> ...\n"
 "\n"
@@ -3833,43 +4145,43 @@ msgid ""
 "  lldp [list [ifname <ifname>]]\n"
 "\n"
 msgstr ""
-"用法：nmcli device { 命令 | help }\n"
+"用法：nmcli device { COMMAND | help }\n"
 "\n"
-"命令 := { status | show | connect | reapply | disconnect | delete | monitor "
-"| wifi | lldp }\n"
+"COMMAND := { status | show | connect | reapply | disconnect | delete | "
+"monitor | wifi | lldp }\n"
 "\n"
 "  status\n"
 "\n"
-"  show [<接口名称>]\n"
+"  show [<ifname>]\n"
 "\n"
-"  set [ifname] <接口名称> [autoconnect yes|no] [managed yes|no]\n"
+"  set [ifname] <ifname> [autoconnect yes|no] [managed yes|no]\n"
 "\n"
-"  connect <接口名称>\n"
+"  connect <ifname>\n"
 "\n"
-"  reapply <接口名称> ...\n"
+"  reapply <ifname> ...\n"
 "\n"
-"  disconnect <接口名称> ...\n"
+"  disconnect <ifname> ...\n"
 "\n"
-"  delete <接口名称> ...\n"
+"  delete <ifname> ...\n"
 "\n"
-"  monitor <接口名称> ...\n"
+"  monitor <ifname> ...\n"
 "\n"
-"  wifi [list [ifname <接口名称>] [bssid <BSSID>]]\n"
+"  wifi [list [ifname <ifname>] [bssid <BSSID>]]\n"
 "\n"
-"  wifi connect <(B)SSID> [password <密码>] [wep-key-type key|phrase] [ifname "
-"<接口名称>]\n"
-"                         [bssid <BSSID>] [name <名称>] [private yes|no] "
+"  wifi connect <(B)SSID> [password <password>] [wep-key-type key|phrase] "
+"[ifname <ifname>]\n"
+"                         [bssid <BSSID>] [name <name>] [private yes|no] "
 "[hidden yes|no]\n"
 "\n"
-"  wifi hotspot [ifname <接口名称>] [con-name <名称>] [ssid <SSID>] [band a|"
-"bg] [channel <频段>] [password <密码>]\n"
+"  wifi hotspot [ifname <ifname>] [con-name <name>] [ssid <SSID>] [band a|bg] "
+"[channel <channel>] [password <password>]\n"
 "\n"
-"  wifi rescan [ifname <接口名称>] [[ssid <要扫描的 SSID>] ...]\n"
+"  wifi rescan [ifname <ifname>] [[ssid <SSID to scan>] ...]\n"
 "\n"
-"  lldp [list [ifname <接口名称>]]\n"
+"  lldp [list [ifname <ifname>]]\n"
 "\n"
 
-#: ../clients/cli/devices.c:315
+#: ../clients/cli/devices.c:305
 #, c-format
 msgid ""
 "Usage: nmcli device status { help }\n"
@@ -3880,24 +4192,23 @@ msgid ""
 " TYPE       - device type\n"
 " STATE      - device state\n"
 " CONNECTION - connection activated on device (if any)\n"
-"Displayed columns can be changed using '--fields' global option. 'status' "
-"is\n"
-"the default command, which means 'nmcli device' calls 'nmcli device "
-"status'.\n"
+"Displayed columns can be changed using '--fields' global option. 'status' is\n"
+"the default command, which means 'nmcli device' calls 'nmcli device status'.\n"
 "\n"
 msgstr ""
 "用法：nmcli device status { help }\n"
 "\n"
-"显示全部设备的状态。\n"
-"默认情况下，显示下列：\n"
-" DEVICE     - 接口名称\n"
-" TYPE       - 设备类型\n"
-" STATE      - 设备状态\n"
-" CONNECTION - 设备上激活的连接（如果有的话）\n"
-"显示哪些列可以通过“--fields”全局选项改变。\n"
-"“status” 是默认命令，也就是说 “nmcli device” 会调用 “nmcli device status”。\n"
+"显示所有设备的状态。\n"
+"默认情况下显示以下栏：\n"
+" DEVICE     - interface name\n"
+" TYPE       - device type\n"
+" STATE      - device state\n"
+" CONNECTION - connection activated on device (if any)\n"
+"可使用 '--fields' 全局选项更改显示栏。 'status' 是\n"
+"默认命令，意思是 'nmcli device' 调用 'nmcli device status'。\n"
+"\n"
 
-#: ../clients/cli/devices.c:330
+#: ../clients/cli/devices.c:320
 #, c-format
 msgid ""
 "Usage: nmcli device show { ARGUMENTS | help }\n"
@@ -3916,7 +4227,7 @@ msgstr ""
 "该命令列出所有设备或者给定设备详情。\n"
 "\n"
 
-#: ../clients/cli/devices.c:341
+#: ../clients/cli/devices.c:331
 #, c-format
 msgid ""
 "Usage: nmcli device connect { ARGUMENTS | help }\n"
@@ -3924,8 +4235,8 @@ msgid ""
 "ARGUMENTS := <ifname>\n"
 "\n"
 "Connect the device.\n"
-"NetworkManager will try to find a suitable connection that will be "
-"activated.\n"
+"NetworkManager will try to find a suitable connection that will be activated."
+"\n"
 "It will also consider connections that are not set to auto-connect.\n"
 "\n"
 msgstr ""
@@ -3938,27 +4249,25 @@ msgstr ""
 "它也将考虑哪些没有设定为 set to auto-connect 的连接。\n"
 "\n"
 
-#: ../clients/cli/devices.c:353
-#, fuzzy, c-format
+#: ../clients/cli/devices.c:343
+#, c-format
 msgid ""
 "Usage: nmcli device reapply { ARGUMENTS | help }\n"
 "\n"
-"ARGUMENTS := <ifname>\n"
+"ARGUMENTS := <ifname> ...\n"
 "\n"
 "Attempts to update device with changes to the currently active connection\n"
 "made since it was last applied.\n"
 "\n"
 msgstr ""
-"用法：nmcli device disconnect { ARGUMENTS | help }\n"
+"用法：nmcli device reapply { ARGUMENTS | help }\n"
 "\n"
 "ARGUMENTS := <ifname>\n"
 "\n"
-"断开该设备。\n"
-"该命令断开该设备并方式其在没有用户/菜单\n"
-"互动的情况下自动激活进一步的连接。\n"
+"试图用自上次应用后对当前活动连接的修改更新设备。\n"
 "\n"
 
-#: ../clients/cli/devices.c:364
+#: ../clients/cli/devices.c:354
 #, c-format
 msgid ""
 "Usage: nmcli device disconnect { ARGUMENTS | help }\n"
@@ -3972,13 +4281,14 @@ msgid ""
 msgstr ""
 "用法：nmcli device disconnect { ARGUMENTS | help }\n"
 "\n"
-"参数：= <ifname> ...\n"
+"ARGUMENTS := <ifname>\n"
 "\n"
-"断开设备。\n"
-"命令断开设备连接并阻止他在没有用户/手动干预的情况下自动激活继续连接。\n"
+"断开该设备。\n"
+"该命令断开该设备并防止其在没有用户/手动干预\n"
+"的情况下自动激活进一步的连接。\n"
 "\n"
 
-#: ../clients/cli/devices.c:376
+#: ../clients/cli/devices.c:366
 #, c-format
 msgid ""
 "Usage: nmcli device delete { ARGUMENTS | help }\n"
@@ -3993,14 +4303,14 @@ msgid ""
 msgstr ""
 "用法：nmcli device delete { ARGUMENTS | help }\n"
 "\n"
-"参数：= <ifname> ...\n"
+"ARGUMENTS := <ifname> ...\n"
 "\n"
 "删除软件设备。\n"
-"该命令删除接口。它仅适用于软件的设备（如绑定，桥接等）。\n"
-"硬件设备无法用命令删除。\n"
+"这个命令删除接口。它仅用于软件设备。\n"
+"（例如 Bond、Bridge 等）。硬件设备不能用这个命令来删除。\n"
 "\n"
 
-#: ../clients/cli/devices.c:389
+#: ../clients/cli/devices.c:379
 #, c-format
 msgid ""
 "Usage: nmcli device set { ARGUMENTS | help }\n"
@@ -4013,9 +4323,18 @@ msgid ""
 "Modify device properties.\n"
 "\n"
 msgstr ""
+"用法：nmcli device set { ARGUMENTS | help }\n"
+"\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:402
-#, fuzzy, c-format
+#: ../clients/cli/devices.c:392
+#, c-format
 msgid ""
 "Usage: nmcli device monitor { ARGUMENTS | help }\n"
 "\n"
@@ -4026,16 +4345,17 @@ msgid ""
 "Monitors all devices in case no interface is specified.\n"
 "\n"
 msgstr ""
-"用法：nmcli device show { ARGUMENTS | help }\n"
+"用法：nmcli device monitor { ARGUMENTS | help }\n"
 "\n"
-"ARGUMENTS := [<ifname>]\n"
+"ARGUMENTS := [<ifname>] ...\n"
 "\n"
-"显示设备详情。\n"
-"该命令列出所有设备或者给定设备详情。\n"
+"监控设备活动。\n"
+"每当指定的设备改变状态，这个命令将打印一行信息。\n"
+"如果没有指定接口，则监控所有设备。\n"
 "\n"
 
-#: ../clients/cli/devices.c:414
-#, fuzzy, c-format
+#: ../clients/cli/devices.c:404
+#, c-format
 msgid ""
 "Usage: nmcli device wifi { ARGUMENTS | help }\n"
 "\n"
@@ -4046,8 +4366,8 @@ msgid ""
 "List available Wi-Fi access points. The 'ifname' and 'bssid' options can be\n"
 "used to list APs for a particular interface, or with a specific BSSID.\n"
 "\n"
-"ARGUMENTS := connect <(B)SSID> [password <password>] [wep-key-type key|"
-"phrase] [ifname <ifname>]\n"
+"ARGUMENTS := connect <(B)SSID> [password <password>] [wep-key-type "
+"key|phrase] [ifname <ifname>]\n"
 "                    [bssid <BSSID>] [name <name>] [private yes|no] [hidden "
 "yes|no]\n"
 "\n"
@@ -4076,10 +4396,8 @@ msgid ""
 "\n"
 "ARGUMENTS := rescan [ifname <ifname>] [[ssid <SSID to scan>] ...]\n"
 "\n"
-"Request that NetworkManager immediately re-scan for available access "
-"points.\n"
-"NetworkManager scans Wi-Fi networks periodically, but in some cases it "
-"might\n"
+"Request that NetworkManager immediately re-scan for available access points.\n"
+"NetworkManager scans Wi-Fi networks periodically, but in some cases it might\n"
 "be useful to start scanning manually. 'ssid' allows scanning for a specific\n"
 "SSID, which is useful for APs with hidden SSIDs. More 'ssid' parameters can "
 "be\n"
@@ -4089,559 +4407,567 @@ msgid ""
 msgstr ""
 "用法：nmcli device wifi { ARGUMENTS | help }\n"
 "\n"
-"在 Wi-Fi 失败中执行操作。\n"
+"在 Wi-Fi 设备上执行操作。\n"
 "\n"
 "ARGUMENTS := [list [ifname <ifname>] [bssid <BSSID>]]\n"
 "\n"
 "列出可用 Wi-Fi 接入点。可使用 'ifname' 和 'bssid' 选项\n"
-"列出具体接口或者指定 BSSID 的 AP。\n"
+"或专有的 BSSID 列出具体接口的 AP。\n"
 "\n"
-"ARGUMENTS := connect <(B)SSID> [password <password>] [wep-key-type key|"
-"phrase] [ifname <ifname>]\n"
-"                    [bssid <BSSID>] [name <name>] [private yes|no]\n"
+"ARGUMENTS := connect <(B)SSID> [password <password>] [wep-key-type "
+"key|phrase] [ifname <ifname>]\n"
+"                    [bssid <BSSID>] [name <name>] [private yes|no] [hidden "
+"yes|no]\n"
 "\n"
 "连接到由 SSID 或者 BSSID 指定的 Wi-Fi 网络。该命令生成\n"
-"新连接并在设备中将其激活。这是在 GUI 客户端\n"
-"中点击 SSID 形成的命令行副本。该命令总是生成一个\n"
+"新连接并在设备中将其激活。这是对应点击 GUI 客户端\n"
+"里 SSID 的命令行。该命令总是生成一个\n"
 "新连接，因此主要用于连接到新 Wi-Fi\n"
 "网络。如果该网络已存在，最好使用如下\n"
-"已存在的侧写：nmcli con up id <name>. 注：\n"
+"已存在的配置集：nmcli con up id <name>。请注意，\n"
 "目前只支持 Open、WEP 和 WPA-PSK 网络。同时也假设\n"
 "通过 DHCP 获得 IP 配置。\n"
 "\n"
-"ARGUMENTS := rescan [[ifname] <ifname>]\n"
+"ARGUMENTS := wifi hotspot [ifname <ifname>] [con-name <name>] [ssid <SSID>]\n"
+"                          [band a|bg] [channel <channel>] [password "
+"<password>]\n"
+"\n"
+"创建一个 Wi-Fi 热点。使用 'connection down' 或 'device disconnect' 停止这个热点。可通过下列参数设置热点：\n"
+"ifname - Wi-Fi device to use\n"
+"con-name - name of the created hotspot connection profile\n"
+"ssid - SSID of the hotspot\n"
+"band - Wi-Fi band to use\n"
+"channel - Wi-Fi channel to use\n"
+"password - password to use for the hotspot\n"
+"\n"
+"ARGUMENTS := rescan [ifname <ifname>] [[ssid <SSID to scan>] ...]\n"
 "\n"
 "请求 NetworkManager 立即重新扫描可用接入点。\n"
 "NetworkManager 周期性扫描 Wi-Fi 网络，但也可以\n"
-"启动手动扫描。注：这个命令不显示\n"
-"AP，使用 'nmcli device wifi list' 显示 AP。\n"
+"启动手动扫描。'ssid'' 允许扫描特定的 SSID，\n"
+"这对于带有隐藏 SSID 的 AP 很有用。\n"
+"请注意，这个命令不显示 AP，\n"
+"请使用 'nmcli device wifi list' 显示 AP。\n"
+"\n"
 "\n"
 
-#: ../clients/cli/devices.c:461
-#, fuzzy, c-format
+#: ../clients/cli/devices.c:451
+#, c-format
 msgid ""
 "Usage: nmcli device lldp { ARGUMENTS | help }\n"
 "\n"
 "ARGUMENTS := [list [ifname <ifname>]]\n"
 "\n"
-"List neighboring devices discovered through LLDP. The 'ifname' option can "
-"be\n"
+"List neighboring devices discovered through LLDP. The 'ifname' option can be\n"
 "used to list neighbors for a particular interface.\n"
 "\n"
 msgstr ""
-"用法：nmcli device wimax { ARGUMENTS | help }\n"
+"用法：nmcli device lldp { ARGUMENTS | help }\n"
 "\n"
-"在 WiMAX 设备中执行操作。\n"
-"\n"
-"ARGUMENTS := [list [ifname <ifname>] [nsp <name>]]\n"
+"ARGUMENTS := [list [ifname <ifname>]]\n"
 "\n"
-"列出可用 WiMAX NSP。可使用 'ifname' 和 'nsp' 选项\n"
-"列出具体接口或者 NSP 的网络。\n"
+"列出通过 LLDP 发现的邻居设备。可使用 'ifname' 选项\n"
+"列出具体接口的邻居设备。\n"
 "\n"
 
-#: ../clients/cli/devices.c:537 ../clients/cli/devices.c:1756
-#: ../clients/cli/devices.c:1765 ../clients/cli/devices.c:1956
-#: ../clients/cli/devices.c:2161 ../clients/cli/devices.c:2168
+#: ../clients/cli/devices.c:527 ../clients/cli/devices.c:1676
+#: ../clients/cli/devices.c:1685 ../clients/cli/devices.c:1879
+#: ../clients/cli/devices.c:2103 ../clients/cli/devices.c:2110
 #, c-format
 msgid "Error: No interface specified."
-msgstr "错误：没有指定接口。"
+msgstr "错误：未指定接口。"
 
-#: ../clients/cli/devices.c:557
+#: ../clients/cli/devices.c:547 ../clients/cli/devices.c:1899
 #, c-format
 msgid "Warning: argument '%s' is duplicated.\n"
-msgstr "警告：参数 “%s” 重复。\n"
+msgstr "警告：重复的参数 '%s'\n"
 
-#: ../clients/cli/devices.c:559
+#: ../clients/cli/devices.c:549 ../clients/cli/devices.c:1901
 #, c-format
 msgid "Error: Device '%s' not found.\n"
-msgstr "错误：没有找到设备 “%s”。\n"
+msgstr "错误：没有找到设备 '%s'。\n"
 
-#: ../clients/cli/devices.c:560
+#: ../clients/cli/devices.c:550 ../clients/cli/devices.c:1902
 #, c-format
 msgid "Error: not all devices found."
-msgstr "错误：没有找到所有设备。"
+msgstr "错误：未找到所有设备。"
 
-#: ../clients/cli/devices.c:660 ../clients/cli/devices.c:811
+#: ../clients/cli/devices.c:650 ../clients/cli/devices.c:801
 msgid "(none)"
-msgstr "（无）"
+msgstr "(无)"
 
-#: ../clients/cli/devices.c:729
+#: ../clients/cli/devices.c:719
 #, c-format
 msgid "%u MHz"
 msgstr "%u MHz"
 
-#: ../clients/cli/devices.c:730
+#: ../clients/cli/devices.c:720
 #, c-format
 msgid "%u Mbit/s"
 msgstr "%u Mbit/s"
 
-#: ../clients/cli/devices.c:745
+#: ../clients/cli/devices.c:735
 msgid "WPA1"
 msgstr "WPA1"
 
-#: ../clients/cli/devices.c:754
+#: ../clients/cli/devices.c:744
 msgid "802.1X"
 msgstr "802.1X"
 
-#: ../clients/cli/devices.c:770
+#: ../clients/cli/devices.c:760
 msgid "Ad-Hoc"
 msgstr "Ad-Hoc"
 
-#: ../clients/cli/devices.c:771
+#: ../clients/cli/devices.c:761
 msgid "Infra"
-msgstr "红外"
+msgstr "Infra"
 
-#: ../clients/cli/devices.c:772
+#: ../clients/cli/devices.c:762
 msgid "N/A"
-msgstr "不可用"
+msgstr "N/A"
 
-#: ../clients/cli/devices.c:996
+#: ../clients/cli/devices.c:916
 msgid "Device details"
 msgstr "设备详情"
 
-#: ../clients/cli/devices.c:1008
+#: ../clients/cli/devices.c:928
 #, c-format
 msgid "Error: 'device show': %s"
-msgstr "错误：“device show”：%s"
+msgstr "错误：'device show': %s"
 
-#: ../clients/cli/devices.c:1060 ../clients/cli/devices.c:1063
+#: ../clients/cli/devices.c:980 ../clients/cli/devices.c:983
 msgid "(unknown)"
-msgstr "（未知）"
+msgstr "(未知)"
 
-#: ../clients/cli/devices.c:1104
+#: ../clients/cli/devices.c:1024
 #, c-format
 msgid "%u Mb/s"
 msgstr "%u Mb/s"
 
-#: ../clients/cli/devices.c:1195
+#: ../clients/cli/devices.c:1115
 msgid "on"
 msgstr "开"
 
-#: ../clients/cli/devices.c:1195
+#: ../clients/cli/devices.c:1115
 msgid "off"
 msgstr "关"
 
-#: ../clients/cli/devices.c:1422
+#: ../clients/cli/devices.c:1342
 #, c-format
 msgid "Error: 'device status': %s"
-msgstr "错误：“dev status”: %s"
+msgstr "错误：'device status': %s"
 
 #. Add headers
-#: ../clients/cli/devices.c:1429
+#: ../clients/cli/devices.c:1349
 msgid "Status of devices"
 msgstr "设备状态"
 
-#: ../clients/cli/devices.c:1460 ../clients/cli/devices.c:3570
+#: ../clients/cli/devices.c:1380 ../clients/cli/devices.c:3509
 #, c-format
 msgid "Error: invalid extra argument '%s'."
-msgstr "错误：无效的额外参数“%s”。"
+msgstr "错误：无效额外参数E '%s'。"
 
-#: ../clients/cli/devices.c:1477 ../clients/cli/devices.c:1787
-#: ../clients/cli/devices.c:2184 ../clients/cli/devices.c:2454
-#: ../clients/cli/devices.c:3609
+#: ../clients/cli/devices.c:1397 ../clients/cli/devices.c:1707
+#: ../clients/cli/devices.c:2126 ../clients/cli/devices.c:2396
+#: ../clients/cli/devices.c:3548
 #, c-format
 msgid "Error: Device '%s' not found."
-msgstr "错误：没有找到设备“%s”。"
+msgstr "错误：没有找到设备 '%s'。"
 
-#: ../clients/cli/devices.c:1555
+#: ../clients/cli/devices.c:1475
 #, c-format
 msgid "Device '%s' successfully activated with '%s'.\n"
-msgstr "设备 “%s” 已成功由“%s”激活 。\n"
+msgstr "成功用 '%s' 激活了设备 '%s'。\n"
 
-#: ../clients/cli/devices.c:1561
+#: ../clients/cli/devices.c:1481
 #, c-format
 msgid "Error: Connection activation failed: (%d) %s.\n"
-msgstr "错误：连接激活失败：(%d) %s。\n"
+msgstr "错误：连接激活失败：（%d）%s。\n"
 
-#: ../clients/cli/devices.c:1597
-#, fuzzy, c-format
+#: ../clients/cli/devices.c:1517
+#, c-format
 msgid "Error: Failed to setup a Wi-Fi hotspot: %s"
-msgstr "错误：设定主机名失败：(%d) %s"
+msgstr "错误：设定 Wi-Fi 热点失败：%s"
 
-#: ../clients/cli/devices.c:1600
+#: ../clients/cli/devices.c:1520
 #, c-format
 msgid "Error: Failed to add/activate new connection: %s"
-msgstr "错误：无法增加/激活新连接：%s"
+msgstr "错误：添加/激活新连接失败：%s"
 
-#: ../clients/cli/devices.c:1610
-#, fuzzy, c-format
+#: ../clients/cli/devices.c:1530
+#, c-format
 msgid "Error: Failed to setup a Wi-Fi hotspot"
-msgstr "错误：设定主机名失败：(%d) %s"
+msgstr "错误：设定 Wi-Fi 热点失败"
 
-#: ../clients/cli/devices.c:1612
+#: ../clients/cli/devices.c:1532
 #, c-format
 msgid "Error: Failed to add/activate new connection: Unknown error"
-msgstr "错误：无法添加/激活新连接：未知错误"
+msgstr "错误：添加/激活新连接失败：未知错误"
 
-#: ../clients/cli/devices.c:1624
+#: ../clients/cli/devices.c:1544
 #, c-format
 msgid "Connection with UUID '%s' created and activated on device '%s'\n"
-msgstr "UUID 为“%s”的连接已创建并在设备“%s”上激活\n"
+msgstr "使用 UUI的 '%s' 连接，并在设备 '%s' 中激活。\n"
 
-#: ../clients/cli/devices.c:1627
+#: ../clients/cli/devices.c:1547
 #, c-format
 msgid "Hotspot '%s' activated on device '%s'\n"
-msgstr "热点 “%s” 已在上设备 “%s” 激活\n"
+msgstr "设备 '%s' 上激活的热点 '%s'\n"
+"\n"
 
-#: ../clients/cli/devices.c:1691
+#: ../clients/cli/devices.c:1611
 #, c-format
 msgid "Error: Device activation failed: %s"
-msgstr "错误：激活设备失败：%s"
+msgstr "错误：设备激活失败：%s"
 
-#: ../clients/cli/devices.c:1700
+#: ../clients/cli/devices.c:1620
 #, c-format
 msgid "Error: Device activation failed: device was disconnected"
-msgstr "错误：设备激活失败：设备断开连接"
+msgstr "错误：设备激活失败：设备已断开连接"
 
-#: ../clients/cli/devices.c:1715
+#: ../clients/cli/devices.c:1635
 #, c-format
 msgid "Device '%s' has been connected.\n"
-msgstr "设备“%s”已连接。\n"
+msgstr "已连接设备 '%s'。\n"
 
-#: ../clients/cli/devices.c:1771
+#: ../clients/cli/devices.c:1691
 #, c-format
 msgid "Error: extra argument not allowed: '%s'."
-msgstr "错误：不允许的额外参数 “%s”。"
+msgstr "错误：不允许的额外参数 '%s'。"
 
-#: ../clients/cli/devices.c:1856 ../clients/cli/devices.c:1871
-#: ../clients/cli/devices.c:2022
+#: ../clients/cli/devices.c:1776 ../clients/cli/devices.c:1791
+#: ../clients/cli/devices.c:1964
 #, c-format
 msgid "Device '%s' successfully disconnected.\n"
-msgstr "设备 “%s” 成功断开。\n"
+msgstr "成功断开设备 '%s'。\n"
 
-#: ../clients/cli/devices.c:1859
+#: ../clients/cli/devices.c:1779
 #, c-format
 msgid "Device '%s' successfully removed.\n"
-msgstr "设备 “%s” 成功删除。\n"
+msgstr "成功删除设备 '%s'。\n"
 
-#: ../clients/cli/devices.c:1918
-#, fuzzy, c-format
-msgid "Error: Reapplying connection to device '%s' (%s) failed: %s"
-msgstr "错误：保存“%s”(%s) 连接失败：%s\n"
+#: ../clients/cli/devices.c:1838
+#, c-format
+msgid "Error: not all connections reapplied."
+msgstr "错误：未重新应用所有连接。"
 
-#: ../clients/cli/devices.c:1928
-#, fuzzy, c-format
-msgid "Connection successfully reapplied to device '%s'.\n"
-msgstr "设备 “%s” 已成功由“%s”激活 。\n"
+#: ../clients/cli/devices.c:1839
+#, c-format
+msgid "Error: Reapplying connection to device '%s' (%s) failed: %s\n"
+msgstr "错误：重新应用连接到设备 '%s'(%s)失败：%s\n"
 
-#: ../clients/cli/devices.c:1965
-#, fuzzy, c-format
-msgid "Error: unsupported argument '%s'."
-msgstr "错误：意外参数 “%s”"
+#: ../clients/cli/devices.c:1849
+#, c-format
+msgid "Connection successfully reapplied to device '%s'.\n"
+msgstr "成功重新应用连接到设备 '%s'。\n"
 
-#: ../clients/cli/devices.c:1979
-#, fuzzy, c-format
-msgid "Error: device '%s' not found."
-msgstr "错误：没有找到设备“%s”。"
+#: ../clients/cli/devices.c:1912
+#, c-format
+msgid "Error: no valid device provided."
+msgstr "错误：未提供有效的设备。"
 
-#: ../clients/cli/devices.c:2007
+#: ../clients/cli/devices.c:1949
 #, c-format
 msgid "Error: not all devices disconnected."
-msgstr "错误：不是所有的设备断开连接。"
+msgstr "错误：未断开所有设备。"
 
-#: ../clients/cli/devices.c:2008
+#: ../clients/cli/devices.c:1950
 #, 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:2083
+#: ../clients/cli/devices.c:2025
 #, c-format
 msgid "Error: not all devices deleted."
-msgstr "错误：不是所有的设备被删除。"
+msgstr "错误：未删除所有设备。"
 
-#: ../clients/cli/devices.c:2084
+#: ../clients/cli/devices.c:2026
 #, 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:2190
-#, fuzzy, c-format
+#: ../clients/cli/devices.c:2132
+#, c-format
 msgid "Error: No property specified."
-msgstr "错误：属性 %s\n"
+msgstr "错误：未指定属性。"
 
-#: ../clients/cli/devices.c:2202 ../clients/cli/devices.c:2217
+#: ../clients/cli/devices.c:2144 ../clients/cli/devices.c:2159
 #, c-format
 msgid "Error: '%s' argument is missing."
-msgstr "错误：缺少 “%s” 参数。"
+msgstr "错误：缺少 '%s' 参数。"
 
-#: ../clients/cli/devices.c:2207
-#, fuzzy, c-format
+#: ../clients/cli/devices.c:2149
+#, c-format
 msgid "Error: 'managed': %s."
-msgstr "管理者："
+msgstr "错误：'managed': %s。"
 
-#: ../clients/cli/devices.c:2222
+#: ../clients/cli/devices.c:2174
 #, c-format
-msgid "Error: 'autoconnect': %s."
-msgstr "错误：“autoconnect”：%s。"
-
-#: ../clients/cli/devices.c:2232
-#, fuzzy, c-format
 msgid "Error: property '%s' is not known."
-msgstr "错误：无效的属性“%s”：%s。"
+msgstr "错误：属性 '%s' 是未知的。"
 
-#: ../clients/cli/devices.c:2278
-#, fuzzy, c-format
+#: ../clients/cli/devices.c:2220
+#, c-format
 msgid "%s: using connection '%s'\n"
-msgstr "无此连接“%s”"
+msgstr "%s: 在使用连接 '%s'\n"
+"\n"
 
-#: ../clients/cli/devices.c:2304
+#: ../clients/cli/devices.c:2246
 #, c-format
 msgid "%s: device created\n"
-msgstr ""
+msgstr "%s: 设备已创建\n"
 
-#: ../clients/cli/devices.c:2311
-#, fuzzy, c-format
+#: ../clients/cli/devices.c:2253
+#, c-format
 msgid "%s: device removed\n"
-msgstr "设备 “%s” 成功删除。\n"
+msgstr "%s：设备已删除\n"
 
-#: ../clients/cli/devices.c:2397
+#: ../clients/cli/devices.c:2339
 msgid "Wi-Fi scan list"
 msgstr "Wi-Fi 扫描列表"
 
-#: ../clients/cli/devices.c:2435
+#: ../clients/cli/devices.c:2377
 #, c-format
 msgid "Error: 'device wifi': %s"
-msgstr "错误：“device wifi”：%s"
+msgstr "错误：'device wifi': %s"
 
-#: ../clients/cli/devices.c:2477 ../clients/cli/devices.c:2561
+#: ../clients/cli/devices.c:2419 ../clients/cli/devices.c:2500
 #, c-format
 msgid "Error: Access point with bssid '%s' not found."
-msgstr "错误：未找到 bssid 是“%s”的访问点。"
+msgstr "错误：未找到 bssid '%s' 的接入点。"
 
-#: ../clients/cli/devices.c:2504
+#: ../clients/cli/devices.c:2446
 #, 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 插件。"
+msgstr "错误：设备 '%s' 不被识别为 Wi-Fi 设备，请检查 NetworkManager Wi-Fi 插件。"
 
-#: ../clients/cli/devices.c:2508 ../clients/cli/devices.c:2841
-#: ../clients/cli/devices.c:3261 ../clients/cli/devices.c:3410
+#: ../clients/cli/devices.c:2448 ../clients/cli/devices.c:2780
+#: ../clients/cli/devices.c:3200 ../clients/cli/devices.c:3349
 #, c-format
 msgid "Error: Device '%s' is not a Wi-Fi device."
-msgstr "错误：设备“%s”不是 Wi-Fi 设备。"
+msgstr "错误：设备 '%s' 不是一个 Wi-Fi 设备。"
 
-#: ../clients/cli/devices.c:2721
+#: ../clients/cli/devices.c:2660
 msgid "SSID or BSSID: "
-msgstr "SSID 或 BSSID："
+msgstr "SSID 或者 BSSID："
 
-#: ../clients/cli/devices.c:2726
+#: ../clients/cli/devices.c:2665
 #, c-format
 msgid "Error: SSID or BSSID are missing."
-msgstr "错误：缺少 SSID/BSSID。"
+msgstr "错误：缺少 SSID 或者 BSSID。"
 
-#: ../clients/cli/devices.c:2750
+#: ../clients/cli/devices.c:2689
 #, 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:2774
+#: ../clients/cli/devices.c:2713
 #, 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:2794 ../clients/cli/devices.c:2807
+#: ../clients/cli/devices.c:2733 ../clients/cli/devices.c:2746
 #, c-format
 msgid "Error: %s: %s."
-msgstr "错误：%s：%s。"
+msgstr "错误：%s: %s。"
 
-#: ../clients/cli/devices.c:2822
+#: ../clients/cli/devices.c:2761
 #, 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:2828
+#: ../clients/cli/devices.c:2767
 #, c-format
 msgid "Error: Parameter '%s' is neither SSID nor BSSID."
-msgstr "错误：参数“%s”不是 SSID 或 BSSID。"
+msgstr "错误：参数 '%s' 不是 SSID，也不是 BSSID。"
 
-#: ../clients/cli/devices.c:2843 ../clients/cli/devices.c:3263
-#: ../clients/cli/devices.c:3412
+#: ../clients/cli/devices.c:2782 ../clients/cli/devices.c:3202
+#: ../clients/cli/devices.c:3351
 #, c-format
 msgid "Error: No Wi-Fi device found."
-msgstr "错误：未发现 Wi-Fi 设备。"
+msgstr "错误：未找到 Wi-Fi 设备。"
 
-#: ../clients/cli/devices.c:2863
-#, fuzzy, c-format
+#: ../clients/cli/devices.c:2802
+#, c-format
 msgid "Error: Failed to scan hidden SSID: %s."
-msgstr "错误：修改 %s 失败。%s: %s。"
+msgstr "错误：扫描隐藏的 SSID 失败：%s。"
 
-#: ../clients/cli/devices.c:2888
+#: ../clients/cli/devices.c:2827
 #, c-format
 msgid "Error: No network with SSID '%s' found."
-msgstr "错误：未发现 SSID 是“%s”的网络。"
+msgstr "错误：未找到 SSID 为 '%s' 的网络。"
 
-#: ../clients/cli/devices.c:2890
+#: ../clients/cli/devices.c:2829
 #, c-format
 msgid "Error: No access point with BSSID '%s' found."
-msgstr "错误：未找到 BSSID 是“%s”的访问点。"
+msgstr "错误：未找到 BSSID '%s' 的接入点。"
 
-#: ../clients/cli/devices.c:2932
+#: ../clients/cli/devices.c:2871
 #, c-format
 msgid ""
 "Warning: '%s' should be SSID for hidden APs; but it looks like a BSSID.\n"
-msgstr ""
+msgstr "警告：'%s' 应该是隐藏 AP 的 SSID，但看起来像 BSSID。\n"
 
-#: ../clients/cli/devices.c:2946
+#: ../clients/cli/devices.c:2885
 msgid "Password: "
 msgstr "密码："
 
-#: ../clients/cli/devices.c:3095
-#, fuzzy, c-format
+#: ../clients/cli/devices.c:3034
+#, c-format
 msgid "'%s' is not valid WPA PSK"
-msgstr "“%s” 是无效 PSK"
+msgstr "'%s' 是无效的 WPA PSK"
 
-#: ../clients/cli/devices.c:3112
-#, fuzzy, c-format
+#: ../clients/cli/devices.c:3051
+#, c-format
 msgid "'%s' is not valid WEP key (it should be 5 or 13 ASCII chars)"
-msgstr "“%s”长度无效(应为5位或6位数)"
+msgstr "'%s' 不是有效的 WEP 密钥（它应该是 5 或 13 个 ASCII 字符）"
 
-#: ../clients/cli/devices.c:3128
-#, fuzzy, c-format
+#: ../clients/cli/devices.c:3067
+#, c-format
 msgid "Hotspot password: %s\n"
-msgstr "请输入 %s 在 %s 上的密码:"
+msgstr "热点密码：%s\n"
 
-#: ../clients/cli/devices.c:3186
-#, fuzzy, c-format
+#: ../clients/cli/devices.c:3125
+#, c-format
 msgid "Error: ssid is too long."
-msgstr "错误：需要“ssid”。"
+msgstr "错误：SSID 太长。"
 
-#: ../clients/cli/devices.c:3198
-#, fuzzy, c-format
+#: ../clients/cli/devices.c:3137
+#, c-format
 msgid "Error: band argument value '%s' is invalid; use 'a' or 'bg'."
-msgstr "错误：wep-key-type 参数值“%s”无效，请使用“key”或“phrase”。"
+msgstr "错误：band 参数值 '%s' 无效，请使用 'a' 或 'bg'。"
 
-#: ../clients/cli/devices.c:3222
-#, fuzzy, c-format
+#: ../clients/cli/devices.c:3161
+#, c-format
 msgid "Error: Unknown parameter %s."
-msgstr "未知参数：%s\n"
+msgstr "错误：未知参数 %s。"
 
-#: ../clients/cli/devices.c:3241
-#, fuzzy, c-format
+#: ../clients/cli/devices.c:3180
+#, c-format
 msgid "Error: channel requires band too."
-msgstr "错误：需要 'apn'。"
+msgstr "错误：频道也需要 band。"
 
-#: ../clients/cli/devices.c:3247
-#, fuzzy, c-format
+#: ../clients/cli/devices.c:3186
+#, c-format
 msgid "Error: channel '%s' not valid for band '%s'."
-msgstr "错误：“channel”：“%s”不是有效的数值 <1-13>。\n"
+msgstr "错误：band '%s' 的 channel '%s' 无效。"
 
-#: ../clients/cli/devices.c:3275
-#, fuzzy, c-format
+#: ../clients/cli/devices.c:3214
+#, c-format
 msgid "Error: Device '%s' supports neither AP nor Ad-Hoc mode."
-msgstr "错误：设备“%s”不是 WiFi 设备。"
+msgstr "错误：设备 '%s' 既不支持 AP 也不支持 Ad-Hoc 模式。"
 
-#: ../clients/cli/devices.c:3310
-#, fuzzy, c-format
+#: ../clients/cli/devices.c:3249
+#, c-format
 msgid "Error: Invalid 'password': %s."
-msgstr "<b>错误：无效的用户名或密码</b>"
+msgstr "错误：无效 'password'：%s。"
 
-#: ../clients/cli/devices.c:3379
-#, fuzzy, c-format
+#: ../clients/cli/devices.c:3318
+#, c-format
 msgid "Error: '%s' cannot repeat."
-msgstr "错误：设置“%s”是必填的而且无法移除。\n"
+msgstr "错误：'%s' 不能重复。"
 
-#: ../clients/cli/devices.c:3460
+#: ../clients/cli/devices.c:3399
 #, c-format
 msgid "Error: 'device wifi' command '%s' is not valid."
-msgstr "错误：“device wifi”命令“%s”无效。"
+msgstr "错误：'device wifi' 命令 '%s' 无效。"
 
 #. Main header name
-#: ../clients/cli/devices.c:3486
-#, fuzzy
+#: ../clients/cli/devices.c:3425
 msgid "Device LLDP neighbors"
-msgstr "邻国："
+msgstr "设备 LLDP 邻居"
 
-#: ../clients/cli/devices.c:3589
-#, fuzzy, c-format
+#: ../clients/cli/devices.c:3528
+#, c-format
 msgid "Error: 'device lldp list': %s"
-msgstr "错误：没有找到设备“%s”。"
+msgstr "错误：'device lldp list'：%s"
 
-#: ../clients/cli/devices.c:3636
-#, fuzzy, c-format
+#: ../clients/cli/devices.c:3575
+#, c-format
 msgid "Error: 'device lldp' command '%s' is not valid."
-msgstr "错误：“device wifi”命令“%s”无效。"
+msgstr "错误：'device lldp' 命令 '%s' 无效。"
 
-#: ../clients/cli/devices.c:3825
+#: ../clients/cli/devices.c:3770
 #, c-format
 msgid "Error: 'dev' command '%s' is not valid."
-msgstr "错误：“dev”命令“%s”无效。"
+msgstr "错误：'dev' 命令 '%s' 无效。"
 
-#: ../clients/cli/general.c:35
+#: ../clients/cli/general.c:34
 msgid "RUNNING"
 msgstr "运行中"
 
 #. 0
-#: ../clients/cli/general.c:36
+#: ../clients/cli/general.c:35
 msgid "VERSION"
-msgstr "版本"
+msgstr "VERSION"
 
 #. 2
-#: ../clients/cli/general.c:38
+#: ../clients/cli/general.c:37
 msgid "STARTUP"
-msgstr "启动"
+msgstr "STARTUP"
 
 #. 3
-#: ../clients/cli/general.c:39
+#: ../clients/cli/general.c:38
 msgid "CONNECTIVITY"
-msgstr "连接"
+msgstr "CONNECTIVITY"
 
 #. 4
-#: ../clients/cli/general.c:40
+#: ../clients/cli/general.c:39
 msgid "NETWORKING"
-msgstr "网络"
+msgstr "NETWORKING"
 
 #. 5
-#: ../clients/cli/general.c:41
+#: ../clients/cli/general.c:40
 msgid "WIFI-HW"
 msgstr "WIFI-HW"
 
 #. 6
-#: ../clients/cli/general.c:42
+#: ../clients/cli/general.c:41
 msgid "WIFI"
 msgstr "WIFI"
 
 #. 7
-#: ../clients/cli/general.c:43
+#: ../clients/cli/general.c:42
 msgid "WWAN-HW"
 msgstr "WWAN-HW"
 
 #. 8
-#: ../clients/cli/general.c:44
+#: ../clients/cli/general.c:43
 msgid "WWAN"
 msgstr "WWAN"
 
 #. 9
-#: ../clients/cli/general.c:45
+#: ../clients/cli/general.c:44
 msgid "WIMAX-HW"
 msgstr "WIMAX-HW"
 
 #. 10
-#: ../clients/cli/general.c:46
+#: ../clients/cli/general.c:45
 msgid "WIMAX"
 msgstr "WIMAX"
 
-#: ../clients/cli/general.c:62
+#: ../clients/cli/general.c:61
 msgid "PERMISSION"
-msgstr "权限"
+msgstr "PERMISSION"
 
 #. 0
-#: ../clients/cli/general.c:63
+#: ../clients/cli/general.c:62
 msgid "VALUE"
-msgstr "值"
+msgstr "VALUE"
 
-#: ../clients/cli/general.c:71
+#: ../clients/cli/general.c:70
 msgid "LEVEL"
-msgstr "级别"
+msgstr "LEVEL"
 
 #. 0
-#: ../clients/cli/general.c:72
+#: ../clients/cli/general.c:71
 msgid "DOMAINS"
-msgstr "域"
+msgstr "DOMAINS"
 
-#: ../clients/cli/general.c:86
+#: ../clients/cli/general.c:85
 #, c-format
 msgid ""
 "Usage: nmcli general { COMMAND | help }\n"
@@ -4670,7 +4996,7 @@ msgstr ""
 "  logging [level <log level>] [domains <log domains>]\n"
 "\n"
 
-#: ../clients/cli/general.c:97
+#: ../clients/cli/general.c:96
 #, c-format
 msgid ""
 "Usage: nmcli general status { help }\n"
@@ -4683,10 +5009,10 @@ msgstr ""
 "用法：nmcli general status { help }\n"
 "\n"
 "显示 NetworkManager 的总体状态。\n"
-"“status” 是默认动作，即 “nmcli gen” 调用 “nmcli gen status”\n"
+"'status' 是默认动作，即 'nmcli gen' 调用 'nmcli gen status'\n"
 "\n"
 
-#: ../clients/cli/general.c:106
+#: ../clients/cli/general.c:105
 #, c-format
 msgid ""
 "Usage: nmcli general hostname { ARGUMENTS | help }\n"
@@ -4695,8 +5021,8 @@ msgid ""
 "\n"
 "Get or change persistent system hostname.\n"
 "With no arguments, this prints currently configured hostname. When you pass\n"
-"a hostname, NetworkManager will set it as the new persistent system "
-"hostname.\n"
+"a hostname, NetworkManager will set it as the new persistent system hostname."
+"\n"
 "\n"
 msgstr ""
 "用法：nmcli general hostname { ARGUMENTS | help }\n"
@@ -4708,20 +5034,19 @@ msgstr ""
 "NetworkManager 会将其设定为新的持久系统主机名。\n"
 "\n"
 
-#: ../clients/cli/general.c:118
+#: ../clients/cli/general.c:117
 #, c-format
 msgid ""
 "Usage: nmcli general permissions { help }\n"
 "\n"
 "Show caller permissions for authenticated operations.\n"
 "\n"
-msgstr ""
-"用法：nmcli general permissions { help }\n"
+msgstr "用法：nmcli general permissions { help }\n"
 "\n"
 "显示认证操作的调用程序权限。\n"
 "\n"
 
-#: ../clients/cli/general.c:126
+#: ../clients/cli/general.c:125
 #, c-format
 msgid ""
 "Usage: nmcli general logging { ARGUMENTS | help }\n"
@@ -4746,7 +5071,7 @@ msgstr ""
 "请参看 man page。\n"
 "\n"
 
-#: ../clients/cli/general.c:139
+#: ../clients/cli/general.c:138
 #, c-format
 msgid ""
 "Usage: nmcli networking { COMMAND | help }\n"
@@ -4771,33 +5096,29 @@ msgstr ""
 "  connectivity [check]\n"
 "\n"
 
-#: ../clients/cli/general.c:149
+#: ../clients/cli/general.c:148
 #, c-format
-msgid ""
-"Usage: nmcli networking on { help }\n"
+msgid "Usage: nmcli networking on { help }\n"
 "\n"
 "Switch networking on.\n"
 "\n"
-msgstr ""
-"用法：nmcli networking on { help }\n"
+msgstr "用法：nmcli networking on { help }\n"
 "\n"
 "打开联网。\n"
 "\n"
 
-#: ../clients/cli/general.c:157
+#: ../clients/cli/general.c:156
 #, c-format
-msgid ""
-"Usage: nmcli networking off { help }\n"
+msgid "Usage: nmcli networking off { help }\n"
 "\n"
 "Switch networking off.\n"
 "\n"
-msgstr ""
-"用法：nmcli networking off { help }\n"
+msgstr "用法：nmcli networking off { help }\n"
 "\n"
 "关闭联网。\n"
 "\n"
 
-#: ../clients/cli/general.c:165
+#: ../clients/cli/general.c:164
 #, c-format
 msgid ""
 "Usage: nmcli networking connectivity { ARGUMENTS | help }\n"
@@ -4805,8 +5126,8 @@ msgid ""
 "ARGUMENTS := [check]\n"
 "\n"
 "Get network connectivity state.\n"
-"The optional 'check' argument makes NetworkManager re-check the "
-"connectivity.\n"
+"The optional 'check' argument makes NetworkManager re-check the connectivity."
+"\n"
 "\n"
 msgstr ""
 "用法：nmcli networking connectivity { ARGUMENTS | help }\n"
@@ -4814,11 +5135,11 @@ msgstr ""
 "ARGUMENTS := [check]\n"
 "\n"
 "获得网络连接性状态。\n"
-"可选的 “check” 参数可让 NetworkManager 重新检查连接性。\n"
+"可选的 'check' 参数可让 NetworkManager 重新检查连接性。\n"
 "\n"
 
-#: ../clients/cli/general.c:177
-#, fuzzy, c-format
+#: ../clients/cli/general.c:176
+#, c-format
 msgid ""
 "Usage: nmcli radio { COMMAND | help }\n"
 "\n"
@@ -4829,16 +5150,12 @@ msgid ""
 msgstr ""
 "用法：nmcli radio { COMMAND | help }\n"
 "\n"
-"COMMAND := { all | wifi | wwan | wimax }\n"
-"\n"
-"  all | wifi | wwan | wimax [ on | off ]\n"
-"\n"
 "COMMAND := { all | wifi | wwan }\n"
 "\n"
 "  all | wifi | wwan [ on | off ]\n"
 "\n"
 
-#: ../clients/cli/general.c:186
+#: ../clients/cli/general.c:185
 #, c-format
 msgid ""
 "Usage: nmcli radio all { ARGUMENTS | help }\n"
@@ -4855,7 +5172,7 @@ msgstr ""
 "获得所有单选按钮状态，或者打开/关闭它们。\n"
 "\n"
 
-#: ../clients/cli/general.c:196
+#: ../clients/cli/general.c:195
 #, c-format
 msgid ""
 "Usage: nmcli radio wifi { ARGUMENTS | help }\n"
@@ -4872,7 +5189,7 @@ msgstr ""
 "获得 Wi-Fi 单选开关状态，或者打开/关闭它。\n"
 "\n"
 
-#: ../clients/cli/general.c:206
+#: ../clients/cli/general.c:205
 #, c-format
 msgid ""
 "Usage: nmcli radio wwan { ARGUMENTS | help }\n"
@@ -4889,7 +5206,7 @@ msgstr ""
 "获得移动宽带单选按钮状态，或者打开/关闭它。\n"
 "\n"
 
-#: ../clients/cli/general.c:216
+#: ../clients/cli/general.c:215
 #, c-format
 msgid ""
 "Usage: nmcli monitor\n"
@@ -4898,203 +5215,205 @@ msgid ""
 "Prints a line whenever a change occurs in NetworkManager\n"
 "\n"
 msgstr ""
+"用法：nmcli monitor\n"
+"\n"
+"监控 NetworkManager 的改动。\n"
+"每当 NetworkManager 出现改动时打印一行信息。\n"
+"\n"
 
-#: ../clients/cli/general.c:234
+#: ../clients/cli/general.c:233
 msgid "asleep"
 msgstr "睡眠"
 
-#: ../clients/cli/general.c:236
+#: ../clients/cli/general.c:235
 msgid "connecting"
 msgstr "连接中"
 
-#: ../clients/cli/general.c:238
+#: ../clients/cli/general.c:237
 msgid "connected (local only)"
-msgstr "已连接(仅本地)"
+msgstr "已连接（只在本地）"
 
-#: ../clients/cli/general.c:240
+#: ../clients/cli/general.c:239
 msgid "connected (site only)"
-msgstr "已连接(仅站点)"
+msgstr "已连接（只在网站）"
 
-#: ../clients/cli/general.c:244
+#: ../clients/cli/general.c:243
 msgid "disconnecting"
 msgstr "正在断开连接"
 
-#: ../clients/cli/general.c:280
+#: ../clients/cli/general.c:279
 msgid "portal"
 msgstr "入口"
 
-#: ../clients/cli/general.c:282
+#: ../clients/cli/general.c:281
 msgid "limited"
-msgstr "受限"
+msgstr "有限的"
 
-#: ../clients/cli/general.c:284
+#: ../clients/cli/general.c:283
 msgid "full"
-msgstr "完全"
+msgstr "全部"
 
-#: ../clients/cli/general.c:335
+#: ../clients/cli/general.c:334
 #, c-format
 msgid "Error: only these fields are allowed: %s"
 msgstr "错误：只允许使用这些字段：%s"
 
-#: ../clients/cli/general.c:358
+#: ../clients/cli/general.c:360
 msgid "NetworkManager status"
 msgstr "网络管理器状态"
 
-#: ../clients/cli/general.c:363
+#: ../clients/cli/general.c:365
 msgid "running"
 msgstr "运行中"
 
-#: ../clients/cli/general.c:366
+#: ../clients/cli/general.c:368
 msgid "starting"
-msgstr "正在启动"
+msgstr "启动中"
 
-#: ../clients/cli/general.c:366
+#: ../clients/cli/general.c:368
 msgid "started"
-msgstr "开始时间"
+msgstr "已启动"
 
-#: ../clients/cli/general.c:368 ../clients/cli/general.c:369
 #: ../clients/cli/general.c:370 ../clients/cli/general.c:371
-#: ../clients/cli/general.c:372
+#: ../clients/cli/general.c:372 ../clients/cli/general.c:373
+#: ../clients/cli/general.c:374
 msgid "enabled"
 msgstr "已启用"
 
-#: ../clients/cli/general.c:368 ../clients/cli/general.c:369
 #: ../clients/cli/general.c:370 ../clients/cli/general.c:371
-#: ../clients/cli/general.c:372
+#: ../clients/cli/general.c:372 ../clients/cli/general.c:373
+#: ../clients/cli/general.c:374
 msgid "disabled"
 msgstr "已禁用"
 
-#: ../clients/cli/general.c:435
+#: ../clients/cli/general.c:446
 msgid "auth"
 msgstr "认证"
 
-# XXX: 这里考虑一下要不要翻译
-# XXX: Should we translate this?
-#: ../clients/cli/general.c:464
+#: ../clients/cli/general.c:475
 #, c-format
 msgid "Error: 'general permissions': %s"
-msgstr "错误：“general permissions”: %s"
+msgstr "错误：'general permissions': %s"
 
-#: ../clients/cli/general.c:478
+#: ../clients/cli/general.c:489
 msgid "NetworkManager permissions"
-msgstr "网络管理器权限"
+msgstr "NetworkManager 权限"
 
-#: ../clients/cli/general.c:519
+#: ../clients/cli/general.c:530
 #, c-format
 msgid "Error: 'general logging': %s"
-msgstr "错误：“general logging”: %s"
+msgstr "错误：'general logging': %s"
 
-#: ../clients/cli/general.c:534
+#: ../clients/cli/general.c:545
 msgid "NetworkManager logging"
 msgstr "NetworkManager 日志"
 
-#: ../clients/cli/general.c:556
+#: ../clients/cli/general.c:567
 #, c-format
 msgid "Error: failed to set hostname: %s"
-msgstr "错误：无法设置主机名：%s"
+msgstr "错误：设定主机名失败：%s"
 
-#: ../clients/cli/general.c:669
+#: ../clients/cli/general.c:680
 #, c-format
 msgid "Error: failed to set logging: %s"
-msgstr "错误：无法设置日志：%s"
+msgstr "错误：设置日志失败：%s"
 
-#: ../clients/cli/general.c:678
+#: ../clients/cli/general.c:689
 #, c-format
 msgid "Error: 'general' command '%s' is not valid."
-msgstr "错误：“general” 命令 “%s” 无效。"
+msgstr "错误：'general' 命令 '%s' 无效。"
 
-#: ../clients/cli/general.c:696
+#: ../clients/cli/general.c:707
 #, 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:721
+#: ../clients/cli/general.c:732
 #, c-format
 msgid "Error: invalid '%s' argument: '%s' (use on/off)."
-msgstr "错误：无效的“%s”参数：“%s”（使用 on/off）。"
+msgstr "错误：无效 '%s' 参数：'%s'（使用 on/off）。"
 
-#: ../clients/cli/general.c:732
+#: ../clients/cli/general.c:743
 msgid "Connectivity"
-msgstr "连接"
+msgstr "连接性"
 
-#: ../clients/cli/general.c:747
+#: ../clients/cli/general.c:758
 msgid "Networking"
-msgstr "网络"
+msgstr "联网"
 
-#: ../clients/cli/general.c:772
+#: ../clients/cli/general.c:783
 #, c-format
 msgid "Error: 'networking connectivity' command '%s' is not valid."
-msgstr "错误：“networking connectivity” 命令 “%s” 无效。"
+msgstr "错误：'networking connectivity' 命令 '%s' 无效。"
 
-#: ../clients/cli/general.c:788
+#: ../clients/cli/general.c:799
 #, c-format
 msgid "Error: 'networking' command '%s' is not valid."
-msgstr "错误：“networking” 命令 “%s” 无效。"
+msgstr "错误：'networking' 命令 '%s' 无效。"
 
-#: ../clients/cli/general.c:817 ../clients/cli/general.c:837
+#: ../clients/cli/general.c:828 ../clients/cli/general.c:848
 msgid "Radio switches"
-msgstr "无线开关"
+msgstr "收音机开关"
 
 #. no argument, show current WiFi state
-#: ../clients/cli/general.c:855
+#: ../clients/cli/general.c:866
 msgid "Wi-Fi radio switch"
-msgstr "Wi-Fi 无线开关"
+msgstr "Wi-Fi 收音机开关"
 
 #. no argument, show current WWAN (mobile broadband) state
-#: ../clients/cli/general.c:871
+#: ../clients/cli/general.c:882
 msgid "WWAN radio switch"
-msgstr "WWAN 无线开关"
+msgstr "WWAN 收音机开关"
 
-#: ../clients/cli/general.c:882
+#: ../clients/cli/general.c:893
 #, c-format
 msgid "Error: 'radio' command '%s' is not valid."
-msgstr "错误：“radio” 命令 “%s” 无效。"
+msgstr "错误：'radio' 命令 '%s' 无效。"
 
-#: ../clients/cli/general.c:902
+#: ../clients/cli/general.c:914
 msgid "NetworkManager has started"
-msgstr "网络管理器已启动"
+msgstr "NetworkManager 已启动"
 
-#: ../clients/cli/general.c:902
+#: ../clients/cli/general.c:917
 msgid "NetworkManager has stopped"
-msgstr "网络管理器已停止"
+msgstr "NetworkManager 已停止"
 
-#: ../clients/cli/general.c:913
-#, fuzzy, c-format
+#: ../clients/cli/general.c:931
+#, c-format
 msgid "Hostname set to '%s'\n"
-msgstr "主机名已设为“%s”"
+msgstr "将主机名设定为 '%s'\n"
 
-#: ../clients/cli/general.c:928
-#, fuzzy, c-format
+#: ../clients/cli/general.c:946
+#, c-format
 msgid "'%s' is now the primary connection\n"
-msgstr "错误：“primary”：“%s” 是无效的接口名称。\n"
+msgstr "'%s' 现在是主连接\n"
 
-#: ../clients/cli/general.c:930
-#, fuzzy, c-format
+#: ../clients/cli/general.c:948
+#, c-format
 msgid "There's no primary connection\n"
-msgstr "第一个"
+msgstr "没有主连接\n"
 
-#: ../clients/cli/general.c:942
-#, fuzzy, c-format
+#: ../clients/cli/general.c:960
+#, c-format
 msgid "Connectivity is now '%s'\n"
-msgstr "连接"
+msgstr "连接性现在是 '%s'\n"
 
-#: ../clients/cli/general.c:955
-#, fuzzy, c-format
+#: ../clients/cli/general.c:973
+#, c-format
 msgid "Networkmanager is now in the '%s' state\n"
-msgstr "无法连接 NetworkManager：%s。\n"
+msgstr "NetworkManager 现在处于 '%s' 状态。\n"
 
-#: ../clients/cli/general.c:966
-#, fuzzy, c-format
+#: ../clients/cli/general.c:984
+#, c-format
 msgid "Error: 'monitor' command '%s' is not valid."
-msgstr "错误：“general” 命令“%s”无效。"
+msgstr "错误：'monitor' 命令 '%s' 无效。"
 
-#: ../clients/cli/general.c:980
-#, fuzzy
+#: ../clients/cli/general.c:998
 msgid "Networkmanager is not running (waiting for it)\n"
-msgstr "错误：网络管理器未运行。"
+msgstr "NetworkManager 未运行（等待中）。\n"
 
 #: ../clients/cli/nmcli.c:83
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "Usage: %s [OPTIONS] OBJECT { COMMAND | help }\n"
 "\n"
@@ -5102,11 +5421,12 @@ msgid ""
 "  -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"
+"  -c[olors] auto|yes|no                      whether to use colors in output\n"
 "  -f[ields] <field1,field2,...>|all|common   specify fields to output\n"
 "  -e[scape] yes|no                           escape columns separators in "
 "values\n"
+"  -n[ocheck]                                 don't check nmcli and "
+"NetworkManager versions\n"
 "  -a[sk]                                     ask for missing parameters\n"
 "  -s[how-secrets]                            allow displaying passwords\n"
 "  -w[ait] <seconds>                          set timeout waiting for "
@@ -5124,433 +5444,417 @@ msgid ""
 "  m[onitor]       monitor NetworkManager changes\n"
 "\n"
 msgstr ""
-"用法：%s [选项] 对象 { 命令 | help }\n"
-"\n"
-"选项\n"
-"  -t[erse]                                   简洁输出\n"
-"  -p[retty]                                  易读输出\n"
-"  -m[ode] tabular|multiline                  输出方式\n"
-"  -f[ields] <field1,field2,...>|all|common   指定输出字段\n"
-"  -e[scape] yes|no                           对值中的列分隔符进行转义\n"
-"  -n[ocheck]                                 不检测 nmcli 和网络管理器版本\n"
-"  -a[sk]                                     询问缺少的参数\n"
-"  -w[ait] <seconds>                          设置等待操作完成的时长\n"
-"  -v[ersion]                                 显示程序版本\n"
-"  -h[elp]                                    打印此帮助\n"
-"\n"
-"对象\n"
-"  g[eneral]       网络管理器的常规状态和操作\n"
-"  n[etworking]    整体网络控制\n"
-"  r[adio]         网络管理器的无线开关\n"
-"  c[onnection]    网络管理器的连接\n"
-"  d[evice]        网络管理器所管理的设备\n"
-"\n"
-
-#: ../clients/cli/nmcli.c:142
+"用法：%s [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"
+"  -e[scape] yes|no                           escape columns separators in "
+"values\n"
+"  -n[ocheck]                                 don't check nmcli and "
+"NetworkManager versions\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"
+
+#: ../clients/cli/nmcli.c:143
 #, c-format
 msgid "Error: Object '%s' is unknown, try 'nmcli help'."
-msgstr "错误：对象“%s”未知，请尝试“nmcli help”。"
+msgstr "错误：对象 '%s' 未知，尝试 'nmcli help'。"
 
-#: ../clients/cli/nmcli.c:183
+#: ../clients/cli/nmcli.c:173
 #, c-format
 msgid "Error: Option '--terse' is specified the second time."
-msgstr "错误：第二次指定选项 “--terse”。"
+msgstr "错误：第二次指定选项 '--terse'。"
 
-#: ../clients/cli/nmcli.c:188
+#: ../clients/cli/nmcli.c:178
 #, c-format
 msgid "Error: Option '--terse' is mutually exclusive with '--pretty'."
-msgstr "错误：选项 “--terse” 与 “--pretty” 相互排斥。"
+msgstr "错误：选项 '--terse' 与 '--pretty' 相互排斥。"
 
-#: ../clients/cli/nmcli.c:196
+#: ../clients/cli/nmcli.c:186
 #, c-format
 msgid "Error: Option '--pretty' is specified the second time."
-msgstr "错误：第二次指定选项 “--pretty”。"
+msgstr "错误：第二次指定选项 '--pretty'。"
 
-#: ../clients/cli/nmcli.c:201
+#: ../clients/cli/nmcli.c:191
 #, c-format
 msgid "Error: Option '--pretty' is mutually exclusive with '--terse'."
-msgstr "错误：选项 “--pretty” 与 “--terse” 相互排斥。"
+msgstr "错误：选项 '--pretty' 与 '--terse' 相互排斥。"
 
-#: ../clients/cli/nmcli.c:211 ../clients/cli/nmcli.c:227
-#: ../clients/cli/nmcli.c:245 ../clients/cli/nmcli.c:276
+#: ../clients/cli/nmcli.c:201 ../clients/cli/nmcli.c:217
+#: ../clients/cli/nmcli.c:235 ../clients/cli/nmcli.c:266
 #, c-format
 msgid "Error: missing argument for '%s' option."
-msgstr "错误：“%s” 选项缺少参数。"
+msgstr "错误：'%s' 选项缺少参数。"
 
-#: ../clients/cli/nmcli.c:220 ../clients/cli/nmcli.c:238
-#: ../clients/cli/nmcli.c:254
+#: ../clients/cli/nmcli.c:210 ../clients/cli/nmcli.c:228
+#: ../clients/cli/nmcli.c:244
 #, c-format
 msgid "Error: '%s' is not valid argument for '%s' option."
-msgstr "错误：“%s” 不是 “%s” 选项的有效参数。"
+msgstr "错误：'%s' 不是 '%s' 选项的有效参数。"
 
-#: ../clients/cli/nmcli.c:261
+#: ../clients/cli/nmcli.c:251
 #, c-format
 msgid "Error: fields for '%s' options are missing."
-msgstr "错误：缺少 “%s” 选项字段。"
+msgstr "错误：缺少 '%s' 选项字段。"
 
-#: ../clients/cli/nmcli.c:281
+#: ../clients/cli/nmcli.c:271
 #, c-format
 msgid "Error: '%s' is not a valid timeout for '%s' option."
 msgstr "错误：'%s' 不是 '%s' 选项的有效超时。"
 
-#: ../clients/cli/nmcli.c:288
+#: ../clients/cli/nmcli.c:278
 #, c-format
 msgid "nmcli tool, version %s\n"
 msgstr "nmcli 工具，版本 %s\n"
 
-#: ../clients/cli/nmcli.c:294
+#: ../clients/cli/nmcli.c:284
 #, c-format
 msgid "Error: Option '%s' is unknown, try 'nmcli -help'."
-msgstr "错误：选项 “%s” 未知，尝试 “nmcli -help”。"
+msgstr "错误：选项 '%s' 未知，尝试 'nmcli -help'。"
 
-#: ../clients/cli/nmcli.c:377 ../clients/cli/nmcli.c:387
+#: ../clients/cli/nmcli.c:367 ../clients/cli/nmcli.c:377
 #, c-format
-msgid ""
-"\n"
+msgid "\n"
 "Error: nmcli terminated by signal %s (%d)\n"
-msgstr ""
-"\n"
-"错误：nmcli 终止于信号 %s (%d)\n"
+msgstr "\n"
+"错误：nmcli 被信号 %s (%d) 终止。\n"
 
-#: ../clients/cli/nmcli.c:418
+#: ../clients/cli/nmcli.c:408
 #, c-format
 msgid "Failed to set signal mask: %d\n"
-msgstr "无法设置信号掩码：%d\n"
+msgstr "设定信号掩码失败：%d\n"
 
-#: ../clients/cli/nmcli.c:425
+#: ../clients/cli/nmcli.c:415
 #, c-format
 msgid "Failed to create signal handling thread: %d\n"
-msgstr "无法创建信号处理线程：%d\n"
+msgstr "创建信号处理线程失败：%d\n"
 
-#: ../clients/cli/nmcli.c:522 ../clients/nm-online.c:193
+#: ../clients/cli/nmcli.c:512 ../clients/nm-online.c:193
 #, c-format
 msgid "Error: Could not create NMClient object: %s."
 msgstr "错误：无法创建 NMClient 对象：%s。"
 
-#: ../clients/cli/nmcli.c:539
+#: ../clients/cli/nmcli.c:529
 msgid "Success"
 msgstr "成功"
 
 #: ../clients/cli/polkit-agent.c:66
 #, c-format
 msgid "Authentication message: %s\n"
-msgstr "认证信息：%s\n"
+msgstr "验证消息：%s\n"
 
 #: ../clients/cli/polkit-agent.c:72
 #, c-format
 msgid "Authentication error: %s\n"
-msgstr "认证错误：%s\n"
+msgstr "验证错误：%s\n"
 
 #: ../clients/cli/polkit-agent.c:118
 #, c-format
 msgid "Warning: polkit agent initialization failed: %s\n"
 msgstr "警告：polkit 代理初始化失败：%s\n"
 
-#: ../clients/cli/settings.c:796
+#: ../clients/cli/settings.c:790
 #, c-format
 msgid "%d (key)"
-msgstr "%d（密钥）"
+msgstr "%d (密钥)"
 
-#: ../clients/cli/settings.c:798
+#: ../clients/cli/settings.c:792
 #, c-format
 msgid "%d (passphrase)"
-msgstr "%d（密码短语）"
+msgstr "%d (密码短语)"
 
-#: ../clients/cli/settings.c:801 ../clients/cli/settings.c:887
+#: ../clients/cli/settings.c:795 ../clients/cli/settings.c:881
 #, c-format
 msgid "%d (unknown)"
 msgstr "%d (未知)"
 
-#: ../clients/cli/settings.c:830
+#: ../clients/cli/settings.c:824
 msgid "0 (NONE)"
-msgstr "0 (无)"
+msgstr "0 (NONE)"
 
-#: ../clients/cli/settings.c:836
+#: ../clients/cli/settings.c:830
 msgid "REORDER_HEADERS, "
-msgstr "记录头、"
+msgstr "REORDER_HEADERS, "
 
-#: ../clients/cli/settings.c:838
+#: ../clients/cli/settings.c:832
 msgid "GVRP, "
-msgstr "GVRP、"
+msgstr "GVRP, "
 
-#: ../clients/cli/settings.c:840
+#: ../clients/cli/settings.c:834
 msgid "LOOSE_BINDING, "
-msgstr "LOOSE_BINDING， "
+msgstr "LOOSE_BINDING, "
 
-#: ../clients/cli/settings.c:842
+#: ../clients/cli/settings.c:836
 msgid "MVRP, "
-msgstr "MVRP、"
+msgstr "MVRP, "
 
-#: ../clients/cli/settings.c:881
+#: ../clients/cli/settings.c:875
 #, c-format
 msgid "%d (disabled)"
 msgstr "%d (已禁用)"
 
-#: ../clients/cli/settings.c:883
+#: ../clients/cli/settings.c:877
 #, c-format
 msgid "%d (enabled, prefer public IP)"
 msgstr "%d (已启用，首选公共 IP)"
 
-#: ../clients/cli/settings.c:885
+#: ../clients/cli/settings.c:879
 #, c-format
 msgid "%d (enabled, prefer temporary IP)"
 msgstr "%d (已启用，首选临时 IP)"
 
-#: ../clients/cli/settings.c:900
+#: ../clients/cli/settings.c:894
 #, c-format
 msgid "%d (no)"
-msgstr "%d（否）"
+msgstr "%d (否)"
 
-#: ../clients/cli/settings.c:902
+#: ../clients/cli/settings.c:896
 #, c-format
 msgid "%d (yes)"
-msgstr "%d（是）"
+msgstr "%d (是)"
 
-#: ../clients/cli/settings.c:905 ../clients/cli/settings.c:1605
+#: ../clients/cli/settings.c:899 ../clients/cli/settings.c:1554
 #, c-format
 msgid "%d (default)"
-msgstr "%d（默认）"
+msgstr "%d (默认)"
 
-#: ../clients/cli/settings.c:918
+#: ../clients/cli/settings.c:912
 msgid "0 (none)"
-msgstr "0（无）"
+msgstr "0 (无)"
 
-#: ../clients/cli/settings.c:924
+#: ../clients/cli/settings.c:918
 msgid "agent-owned, "
-msgstr "为代理拥有、"
+msgstr "代理拥有的"
 
-#: ../clients/cli/settings.c:926
+#: ../clients/cli/settings.c:920
 msgid "not saved, "
-msgstr "未保存、"
+msgstr "未保存的"
 
-#: ../clients/cli/settings.c:928
+#: ../clients/cli/settings.c:922
 msgid "not required, "
-msgstr "不必须、"
+msgstr "未要求的"
 
-#: ../clients/cli/settings.c:977 ../clients/tui/nmt-mtu-entry.c:84
+#: ../clients/cli/settings.c:971 ../clients/tui/nmt-mtu-entry.c:84
 msgid "(default)"
-msgstr "（默认）"
+msgstr "(默认)"
 
-#. ----------------------------------------------------------------------------
-#: ../clients/cli/settings.c:1063 ../clients/cli/settings.c:1106
-#: ../clients/cli/settings.c:1140 ../clients/cli/settings.c:1167
-#: ../clients/cli/settings.c:8033
-msgid "<hidden>"
-msgstr "<隐藏>"
-
-#: ../clients/cli/settings.c:1302
+#: ../clients/cli/settings.c:1252
 msgid "0 (disabled)"
-msgstr "0（禁用）"
+msgstr "0 (禁用)"
 
-#: ../clients/cli/settings.c:1308
+#: ../clients/cli/settings.c:1258
 msgid "enabled, "
-msgstr "已启用、"
+msgstr "已启用，"
 
-#: ../clients/cli/settings.c:1310
+#: ../clients/cli/settings.c:1260
 msgid "advertise, "
 msgstr "广告，"
 
-#: ../clients/cli/settings.c:1312
+#: ../clients/cli/settings.c:1262
 msgid "willing, "
-msgstr "willing， "
+msgstr "愿意，"
 
-#: ../clients/cli/settings.c:1340
+#: ../clients/cli/settings.c:1290
 msgid "-1 (unset)"
-msgstr "-1（未设）"
+msgstr "-1 (未设置)"
 
-#: ../clients/cli/settings.c:1472 ../clients/cli/settings.c:1777
-#: ../clients/cli/settings.c:1917
+#: ../clients/cli/settings.c:1422 ../clients/cli/settings.c:1724
+#: ../clients/cli/settings.c:1864
 msgid "auto"
 msgstr "自动"
 
-#: ../clients/cli/settings.c:1485 ../clients/cli/settings.c:1948
+#: ../clients/cli/settings.c:1435 ../clients/cli/settings.c:1895
 msgid "default"
 msgstr "默认"
 
-#: ../clients/cli/settings.c:1607
+#: ../clients/cli/settings.c:1556
 #, c-format
 msgid "%d (off)"
-msgstr "%d（关）"
+msgstr "%d (off)"
 
-#: ../clients/cli/settings.c:1823
-#, fuzzy, c-format
+#: ../clients/cli/settings.c:1770
+#, c-format
 msgid ""
 "invalid option '%s', use a combination of [%s] or 'ignore', 'default' or "
 "'none'"
-msgstr "无效选项“%s”或值“%s”"
+msgstr "无效选项 '%s'，请使用 [%s] 或 'ignore'、'default' 或 'none' 的组合。"
 
-#: ../clients/cli/settings.c:1834
-#, fuzzy
+#: ../clients/cli/settings.c:1781
 msgid "'default' and 'ignore' are incompatible with other flags"
-msgstr "网络唤醒模式 “default” 和 “ignore” 为排他性标志"
+msgstr "'default' 和 'ignore' 和其他标记不兼容"
 
-#: ../clients/cli/settings.c:1870
-#, fuzzy, c-format
+#: ../clients/cli/settings.c:1817
+#, c-format
 msgid "invalid mode '%s', use one of %s"
-msgstr "错误：“mode”：“%s”是无效的，使用 %s 中的一个"
+msgstr "无效模式 '%s'，请使用 %s 中的一个。"
 
-#: ../clients/cli/settings.c:1952
-#, fuzzy, c-format
+#: ../clients/cli/settings.c:1899
+#, c-format
 msgid "always"
-msgstr "(常值)"
+msgstr "总是"
 
-#: ../clients/cli/settings.c:2052 ../clients/cli/settings.c:3398
-#: ../clients/cli/settings.c:4590 ../clients/cli/settings.c:5093
+#: ../clients/cli/settings.c:1999 ../clients/cli/settings.c:3286
+#: ../clients/cli/settings.c:4478 ../clients/cli/settings.c:4981
 #: ../libnm-core/nm-keyfile-reader.c:573
-#, fuzzy, c-format
+#, c-format
 msgid "invalid option '%s', use one of [%s]"
-msgstr "%s：无效选项 -- %c\n"
+msgstr "无效选项 '%s'，请使用 [%s] 中的一个。"
 
-#: ../clients/cli/settings.c:2162
+#: ../clients/cli/settings.c:2116
 #, 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:2164
+#: ../clients/cli/settings.c:2118
 #, c-format
 msgid "Do you also want to clear '%s'? [yes]: "
-msgstr "您还要清除 “%s” 吗？ [yes]："
+msgstr "您还要清除 '%s' 吗？ [yes]："
 
-#: ../clients/cli/settings.c:2325
+#: ../clients/cli/settings.c:2279
 #, c-format
 msgid ""
 "Warning: %s.%s set to '%s', but it might be ignored in infrastructure mode\n"
-msgstr "警告：%s.%s 设置成 “%s”，它可能在基础模式中被忽略\n"
+msgstr "警告：设置 %s.%s 为 '%s'，但在 infrastructure 模式下它可能被忽略。\n"
 
-#: ../clients/cli/settings.c:2344
+#: ../clients/cli/settings.c:2298
 #, 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:2346
+#: ../clients/cli/settings.c:2300
 msgid "Do you want to remove them? [yes] "
-msgstr "您想要删除他们吗？ [是] "
+msgstr "您要删除它们吗？[yes]"
 
-#: ../clients/cli/settings.c:2482 ../clients/cli/settings.c:2877
-#: ../clients/cli/settings.c:5294
+#: ../clients/cli/settings.c:2396 ../clients/cli/settings.c:2791
+#: ../clients/cli/settings.c:5182
 #, c-format
 msgid "'%s' is not valid"
-msgstr "“%s” 无效"
+msgstr "'%s' 无效"
 
-#: ../clients/cli/settings.c:2505
+#: ../clients/cli/settings.c:2419
 #, c-format
 msgid "'%d' is not valid; use <%d-%d>"
-msgstr "“%d” 无效；请使用 <%d-%d>"
+msgstr "'%d' 无效；请使用 <%d-%d>"
 
-#: ../clients/cli/settings.c:2527
+#: ../clients/cli/settings.c:2441
 #, c-format
 msgid "'%lld' is not valid; use <%lld-%lld>"
-msgstr "“%lld” 无效；使用 <%lld-%lld>"
+msgstr "'%lld' 无效；请使用 <%lld-%lld>"
 
-#: ../clients/cli/settings.c:2549
+#: ../clients/cli/settings.c:2463
 #, c-format
 msgid "'%u' is not valid; use <%u-%u>"
-msgstr "“%u” 无效；使用 <%u-%u>"
+msgstr "'%u' 无效，请使用 <%u-%u>"
 
-#: ../clients/cli/settings.c:2588
-#, fuzzy, c-format
+#: ../clients/cli/settings.c:2502
+#, c-format
 msgid "'%u' flags are not valid; use combination of %s"
-msgstr "错误：“flag”：“%s”是无效的；使用 <0-7>。"
+msgstr "'%u' 标记无效，请使用 %s 组合"
 
-#: ../clients/cli/settings.c:2655
+#: ../clients/cli/settings.c:2569
 #, c-format
 msgid "'%s' is not valid; use <option>=<value>"
-msgstr "“%s” 无效，请使用 <option>=<value>"
+msgstr "'%s' 无效，请使用 <option>=<value>"
 
-#: ../clients/cli/settings.c:2689
+#: ../clients/cli/settings.c:2603
 #, c-format
 msgid "index '%s' is not valid"
-msgstr "目录“%s”是无效的"
+msgstr "索引 '%s' 无效"
 
-#: ../clients/cli/settings.c:2694 ../clients/cli/settings.c:2719
+#: ../clients/cli/settings.c:2608 ../clients/cli/settings.c:2633
 msgid "no item to remove"
-msgstr "没有要删除的项"
+msgstr "未删除任何项目"
 
-#: ../clients/cli/settings.c:2698 ../clients/cli/settings.c:2723
+#: ../clients/cli/settings.c:2612 ../clients/cli/settings.c:2637
 #, c-format
 msgid "index '%d' is not in range <0-%d>"
-msgstr "索引“%d”超出了范围 <0-%d>"
+msgstr "索引 '%d' 不在范围 <0-%d> 中"
 
-#: ../clients/cli/settings.c:2738
+#: ../clients/cli/settings.c:2652
 #, c-format
 msgid "invalid option '%s'"
-msgstr "无效选项“%s”"
+msgstr "无效选项 '%s'"
 
-#: ../clients/cli/settings.c:2740
+#: ../clients/cli/settings.c:2654
 msgid "missing option"
 msgstr "缺少选项"
 
-#: ../clients/cli/settings.c:2767 ../clients/cli/settings.c:2787
-#: ../clients/cli/settings.c:2807 ../clients/cli/settings.c:2827
+#: ../clients/cli/settings.c:2681 ../clients/cli/settings.c:2701
+#: ../clients/cli/settings.c:2721 ../clients/cli/settings.c:2741
 #, c-format
 msgid "'%s' is not a valid number (or out of range)"
-msgstr "“%s”不是有效的值(或超出范围)"
+msgstr "'%s' 是无效数字（或超出范围）"
 
-#: ../clients/cli/settings.c:2861
+#: ../clients/cli/settings.c:2775
 #, c-format
 msgid "'%s' is not a valid value; use -1, 0 or 1"
-msgstr "“%s” 不是有效值；使用 -1、0 或 1"
+msgstr "'%s' 无效，请使用 -1、0 或 1。"
 
-#: ../clients/cli/settings.c:2893
+#: ../clients/cli/settings.c:2807
 #, c-format
 msgid "'%s' is not a valid Ethernet MAC"
-msgstr "“%s”不是有效的以太网 MAC"
+msgstr "'%s' 不是有效以太网 MAC"
 
-#: ../clients/cli/settings.c:2918 ../libnm-core/nm-setting-connection.c:864
+#: ../clients/cli/settings.c:2832 ../libnm-core/nm-setting-connection.c:864
 #: ../libnm-core/nm-setting-infiniband.c:255
 #: ../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' 不是有效接口名称"
 
-#: ../clients/cli/settings.c:2942
+#: ../clients/cli/settings.c:2856
 #, c-format
 msgid "'%s' is not a valid flag number; use <0-%d>"
-msgstr "“%s” 是无效的标志号；使用 <0-%d>"
+msgstr "'%s' 是无效的标记数字，请使用 <0-%d>。"
 
-#: ../clients/cli/settings.c:2954
+#: ../clients/cli/settings.c:2868
 #, c-format
 msgid "Warning: '%s' sum is higher than all flags => all flags set\n"
-msgstr "警告：“%s” 的总和大于所有标识设置\n"
+msgstr "警告：'%s' 总计高于 all flags => all flags 集合\n"
 
-#: ../clients/cli/settings.c:2995
+#: ../clients/cli/settings.c:2909
 #, c-format
 msgid "'%s' is not a valid hex character"
-msgstr "“%s” 不是有效十六进制字符串"
+msgstr "'%s' 不是有效十六进制字符串"
 
-#: ../clients/cli/settings.c:3025
+#: ../clients/cli/settings.c:2939
 #, c-format
 msgid "'%s' is not a valid MAC"
-msgstr "“%s”不是有效的 MAC 地址"
-
-#. Don't allow setting type unless the connection is brand new.
-#. * Just because it's a bad idea and the user wouldn't probably want that.
-#. * No technical reason, really.
-#. * Also, using uuid to see if the connection is brand new is a bit
-#. * 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/cli/settings.c:3053
-#, fuzzy, c-format
-msgid "Can not change the connection type"
-msgstr "未知/未处理的蓝牙连接类型"
-
-#: ../clients/cli/settings.c:3077 ../libnm-core/nm-setting-connection.c:853
+msgstr "'%s' 不是有效 MAC"
+
+#: ../clients/cli/settings.c:2965 ../libnm-core/nm-setting-connection.c:853
 #: ../libnm-util/nm-setting-connection.c:791
 #, c-format
 msgid "'%s' is not a valid UUID"
-msgstr "“%s”不是有效的 UUID"
+msgstr "'%s' 不是有效的 UUID"
 
-#: ../clients/cli/settings.c:3144
+#: ../clients/cli/settings.c:3032
 #, c-format
 msgid "the property doesn't contain permission '%s'"
-msgstr "该属性不包含权限 “%s”"
+msgstr "属性没有包含权限 '%s'"
 
-#: ../clients/cli/settings.c:3156
+#: ../clients/cli/settings.c:3044
 msgid ""
-"Enter a list of user permissions. This is a list of user names formatted "
-"as:\n"
+"Enter a list of user permissions. This is a list of user names formatted as:\n"
 "  [user:]<user name 1>, [user:]<user name 2>,...\n"
 "The items can be separated by commas or spaces.\n"
 "\n"
@@ -5562,40 +5866,39 @@ msgstr ""
 "\n"
 "例如：alice bob charlie\n"
 
-#: ../clients/cli/settings.c:3175
+#: ../clients/cli/settings.c:3063
 #, c-format
 msgid "'%s' is not valid master; use ifname or connection UUID"
-msgstr "“%s” 不是有效主接口；使用 ifname 或者连接 UUID"
+msgstr "'%s' 不是有效主接口；使用 ifname 或者连接 UUID"
 
-#: ../clients/cli/settings.c:3219
+#: ../clients/cli/settings.c:3107
 #, 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:3223 ../clients/cli/settings.c:3239
+#: ../clients/cli/settings.c:3111 ../clients/cli/settings.c:3127
 #, c-format
 msgid "'%s' is not a VPN connection profile"
-msgstr "“%s” 不是一个 VPN 连接配置文件"
+msgstr "'%s' 不是一个 VPN 连接配置集"
 
-#: ../clients/cli/settings.c:3232
+#: ../clients/cli/settings.c:3120
 #, c-format
 msgid "'%s' is not a name of any exiting profile"
-msgstr "“%s”不是任何现有配置文件的名字"
+msgstr "'%s' 不是任何现有配置集的名称"
 
-#: ../clients/cli/settings.c:3266
+#: ../clients/cli/settings.c:3154
 #, c-format
 msgid "the value '%s' is not a valid UUID"
-msgstr "“%s” 的值不是有效的 UUID"
+msgstr "'%s' 值不是有效的 UUID"
 
-#: ../clients/cli/settings.c:3273
+#: ../clients/cli/settings.c:3161
 #, c-format
 msgid "the property doesn't contain UUID '%s'"
-msgstr "该属性不包含 UUID “%s”"
+msgstr "属性没有包含 UUID '%s'"
 
-#: ../clients/cli/settings.c:3285
+#: ../clients/cli/settings.c:3173
 msgid ""
-"Enter secondary connections that should be activated when this connection "
-"is\n"
+"Enter secondary connections that should be activated when this connection is\n"
 "activated. Connections can be specified either by UUID or ID (name). nmcli\n"
 "transparently translates names to UUIDs. Note that NetworkManager only "
 "supports\n"
@@ -5604,15 +5907,14 @@ msgid ""
 "\n"
 "Example: private-openvpn, fe6ba5d8-c2fc-4aae-b2e3-97efddd8d9a7\n"
 msgstr ""
-"输入辅助连接，当激活此连接时，辅助连接应该被激活。\n"
-"连接可以通过 UUID 或 ID（名称）来指定。\n"
-"nmcli 透明地将名称转换为 UUID。\n"
-"请注意，NetworkManager 暂时只支持 VPN 作为辅助连接。\n"
-"该项可以用逗号或空格隔开。\n"
+"输入当这个连接激活时应该被激活的二级连接。连接可用\n"
+"UUID 或 ID（名称）指定。nmcli 将名称透明的转换为 UUID。\n"
+"请注意，目前 NetworkManager 只支持将 VPN 作为二级连接。\n"
+"这些项可用逗号或空格隔开。\n"
 "\n"
-"例如： private-openvpn, fe6ba5d8-c2fc-4aae-b2e3-97efddd8d9a7\n"
+"示例：private-openvpn, fe6ba5d8-c2fc-4aae-b2e3-97efddd8d9a7\n"
 
-#: ../clients/cli/settings.c:3352
+#: ../clients/cli/settings.c:3240
 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"
@@ -5620,46 +5922,51 @@ msgid ""
 "'false','no','off' to set the connection as not metered\n"
 "'unknown' to let NetworkManager choose a value using some heuristics\n"
 msgstr ""
+"输入的值表示连接是否有数据配额、使用成本或其他限制。\n"
+"可接受的选项是：\n"
+"'true','yes','on'，设置连接为可度量的\n"
+"'false','no','off'，设置连接为不可度量的\n"
+"'unknown'， 让 NetworkManager 使用一些启发式算法选择值\n"
 
-#: ../clients/cli/settings.c:3476
+#: ../clients/cli/settings.c:3364
 msgid "private key password not provided"
 msgstr "未提供专用密钥"
 
-#: ../clients/cli/settings.c:3504
+#: ../clients/cli/settings.c:3392
 #, c-format
 msgid "the property doesn't contain EAP method '%s'"
-msgstr "该属性不包含 EAP 方法 “%s”"
+msgstr "属性不能包含 EAP 方法 '%s'"
 
-#: ../clients/cli/settings.c:3521
+#: ../clients/cli/settings.c:3409
 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 ""
-"输入 CA 证书文件路径(可选的前缀 file://)。\n"
+"输入 CA 证书的文件路径（前缀可选择 file://）。\n"
 "  [file://]<file path>\n"
-"请注意，nmcli 不支持指定的证书作为原始 blob 数据。\n"
-"例如：/home/cimrman/cacert.crt\n"
+"请注意，nmcli 不支持将证书指定为原始 blob 数据。\n"
+"示例：/home/cimrman/cacert.crt\n"
 
-#: ../clients/cli/settings.c:3540
+#: ../clients/cli/settings.c:3428
 #, c-format
 msgid "the property doesn't contain alternative subject match '%s'"
-msgstr "该属性不包含匹配 “%s” 的其他主题"
+msgstr "属性没有包含匹配 '%s' 的替代主体"
 
-#: ../clients/cli/settings.c:3556
+#: ../clients/cli/settings.c:3444
 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 ""
-"输入客户端认证文件路径(可选的前缀 file://)。\n"
+"输入客户证书的文件路径（前缀可选择 file://）。\n"
 "  [file://]<file path>\n"
-"请注意，nmcli 不支持指定的证书作为原始 blob 数据。\n"
-"例如：/home/cimrman/jara.crt\n"
+"请注意，nmcli 不支持将证书指定为原始 blob 数据。\n"
+"示例：/home/cimrman/jara.crt\n"
 
-#: ../clients/cli/settings.c:3568
+#: ../clients/cli/settings.c:3456
 msgid ""
 "Enter file path to CA certificate for inner authentication (optionally "
 "prefixed\n"
@@ -5668,17 +5975,17 @@ msgid ""
 "Note that nmcli does not support specifying certificates as raw blob data.\n"
 "Example: /home/cimrman/ca-zweite-phase.crt\n"
 msgstr ""
-"为内部认证输入 CA 证书文件路径(可选的前缀 file://)。\n"
+"输入内部验证的 CA 证书的文件路径（前缀可选择 file://）。\n"
 "  [file://]<file path>\n"
-"请注意，nmcli 不支持指定的证书作为原始 blob 数据。\n"
-"例如：/home/cimrman/ca-zweite-phase.crt\n"
+"请注意，nmcli 不支持将证书指定为原始 blob 数据。\n"
+"示例：/home/cimrman/ca-zweite-phase.crt\n"
 
-#: ../clients/cli/settings.c:3588
+#: ../clients/cli/settings.c:3476
 #, c-format
 msgid "the property doesn't contain \"phase2\" alternative subject match '%s'"
-msgstr "属性不包含 “phase2” 匹配的 “%s” 的其他主题"
+msgstr "属性没有包含匹配 '%s' 的 \"phase2\" 替代主体"
 
-#: ../clients/cli/settings.c:3604
+#: ../clients/cli/settings.c:3492
 msgid ""
 "Enter file path to client certificate for inner authentication (optionally "
 "prefixed\n"
@@ -5687,29 +5994,28 @@ msgid ""
 "Note that nmcli does not support specifying certificates as raw blob data.\n"
 "Example: /home/cimrman/jara-zweite-phase.crt\n"
 msgstr ""
-"为内部认证输入客户端认证文件路径(可选的前缀 file://)。\n"
+"输入内部验证的客户证书的文件路径（前缀可选择 file://）。\n"
 "  [file://]<file path>\n"
-"请注意，nmcli 不支持指定的证书作为原始 blob 数据。\n"
-"例如：/home/cimrman/jara-zweite-phase.crt\n"
+"请注意，nmcli 不支持将证书指定为原始 blob 数据。\n"
+"示例：/home/cimrman/jara-zweite-phase.crt\n"
 
-#: ../clients/cli/settings.c:3624
+#: ../clients/cli/settings.c:3512
 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 ""
-"输入私钥和密钥密码路径(如果没有设置)：\n"
+"输入私有密钥和密钥密码的路径（如果还没有设置）：\n"
 "  [file://]<file path> [<password>]\n"
-"请注意，nmcli 不支持指定的私钥作为原始 blob 数据。\n"
-"例如：/home/cimrman/jara-priv-key Dardanely\n"
+"请注意，nmcli 不支持将私有密钥指定为原始 blob 数据。\n"
+"示例：/home/cimrman/jara-priv-key Dardanely\n"
 
-#: ../clients/cli/settings.c:3695
+#: ../clients/cli/settings.c:3583
 msgid ""
 "Enter bytes as a list of hexadecimal values.\n"
 "Two formats are accepted:\n"
-"(a) a string of hexadecimal digits, where each two digits represent one "
-"byte\n"
+"(a) a string of hexadecimal digits, where each two digits represent one byte\n"
 "(b) space-separated list of bytes written as hexadecimal digits (with "
 "optional 0x/0X prefix, and optional leading 0).\n"
 "\n"
@@ -5719,13 +6025,12 @@ msgstr ""
 "输入十六进制值列表。\n"
 "可使用两种格式：\n"
 "(a) 十六进制数字字符串，每两个数字代表一个字节。\n"
-"(b) 用空格分开的采用十六进制数字写入的字节（选项有0x/0X 前缀以及自选的 0 开"
-"头）。\n"
+"(b) 用空格分开的采用十六进制数字写入的字节（选项有0x/0X 前缀以及自选的 0 开头）。\n"
 "\n"
 "例如：ab0455a6ea3a74C2\n"
 "     ab 4 55 0xa6 ea 3a 74 C2\n"
 
-#: ../clients/cli/settings.c:3816
+#: ../clients/cli/settings.c:3704
 #, c-format
 msgid ""
 "Enter a list of bonding options formatted as:\n"
@@ -5745,7 +6050,7 @@ msgstr ""
 "输入绑定选项列表，格式为：\n"
 "  option = <value>, option = <value>,... \n"
 "有效选项为： %s\n"
-"“mode” 可作为名称或者数字提供：\n"
+"'mode' 可作为名称或者数字提供：\n"
 "balance-rr    = 0\n"
 "active-backup = 1\n"
 "balance-xor   = 2\n"
@@ -5756,57 +6061,56 @@ msgstr ""
 "\n"
 "示例：mode=2,miimon=120\n"
 
-#: ../clients/cli/settings.c:3847
+#: ../clients/cli/settings.c:3735
 #, c-format
 msgid "'%s' is not a valid InfiniBand MAC"
-msgstr "“%s” 是无效InfiniBand MAC"
+msgstr "'%s' 是无效InfiniBand MAC"
 
-#: ../clients/cli/settings.c:3884
+#: ../clients/cli/settings.c:3772
 #, c-format
 msgid "'%s' is not a valid IBoIP P_Key"
-msgstr "“%s”不是有效的 IBoIP P_Key"
+msgstr "'%s' 是无效 IBoIP P_Key"
 
-#: ../clients/cli/settings.c:3915
+#: ../clients/cli/settings.c:3803
 #, c-format
 msgid "'%s' is not valid (the format is: ip[/prefix] [next-hop] [metric])"
-msgstr "“%s” 无效 (格式为：ip[/prefix] [next-hop] [metric])"
+msgstr "'%s' 无效（格式为：ip[/prefix] [next-hop] [metric]）"
 
-#: ../clients/cli/settings.c:3963 ../clients/cli/settings.c:3982
+#: ../clients/cli/settings.c:3851 ../clients/cli/settings.c:3870
 #, c-format
 msgid "invalid IPv4 address '%s'"
-msgstr "无效的 IPv4 地址“%s”"
+msgstr "无效 IPv4 地址 '%s'"
 
-#: ../clients/cli/settings.c:3988 ../clients/cli/settings.c:4296
+#: ../clients/cli/settings.c:3876 ../clients/cli/settings.c:4184
 #, c-format
 msgid "the property doesn't contain DNS server '%s'"
-msgstr "该属性不包含 DNS 服务器 “%s”"
+msgstr "属性没有包含 DNS 服务器 '%s'"
 
-#: ../clients/cli/settings.c:4000
+#: ../clients/cli/settings.c:3888
 msgid ""
 "Enter a list of IPv4 addresses of DNS servers.\n"
 "\n"
 "Example: 8.8.8.8, 8.8.4.4\n"
-msgstr ""
-"输入 DNS 服务器的 IPv4 地址列表。\n"
+msgstr "输入 DNS 服务器的 IPv4 地址列表。\n"
 "\n"
 "示例：8.8.8.8, 8.8.4.4\n"
 
-#: ../clients/cli/settings.c:4036 ../clients/cli/settings.c:4350
+#: ../clients/cli/settings.c:3924 ../clients/cli/settings.c:4238
 #, c-format
 msgid "the property doesn't contain DNS search domain '%s'"
-msgstr "该属性不包含 DNS 搜索域 “%s”"
+msgstr "属性没有包含 DNS 搜索域 '%s'"
 
-#: ../clients/cli/settings.c:4074 ../clients/cli/settings.c:4388
-#, fuzzy, c-format
+#: ../clients/cli/settings.c:3962 ../clients/cli/settings.c:4276
+#, c-format
 msgid "the property doesn't contain DNS option '%s'"
-msgstr "该属性不包含 DNS 搜索域“%s”"
+msgstr "属性没有包含 DNS 选项 '%s'"
 
-#: ../clients/cli/settings.c:4128 ../clients/cli/settings.c:4441
+#: ../clients/cli/settings.c:4016 ../clients/cli/settings.c:4329
 #, c-format
 msgid "the property doesn't contain IP address '%s'"
-msgstr "该属性不包含 IP 地址 “%s”"
+msgstr "属性没有包含 IP 地址 '%s'"
 
-#: ../clients/cli/settings.c:4141
+#: ../clients/cli/settings.c:4029
 msgid ""
 "Enter a list of IPv4 addresses formatted as:\n"
 "  ip[/prefix], ip[/prefix],...\n"
@@ -5814,23 +6118,23 @@ msgid ""
 "\n"
 "Example: 192.168.1.5/24, 10.0.0.11/24\n"
 msgstr ""
-"输入 IPv4 地址列表，格式如下：\n"
-"  ip[/prefix]，ip[/prefix],...\n"
-"缺少前缀的，前缀被视为32。\n"
+"输入 IPv4 地址列表，格式为：\n"
+"  ip[/prefix], ip[/prefix],...\n"
+"缺少前缀则默认为 32。\n"
 "\n"
-"例如：192.168.1.5/24，10.0.0.11/24\n"
+"示例：192.168.1.5/24, 10.0.0.11/24\n"
 
-#: ../clients/cli/settings.c:4157 ../clients/cli/settings.c:4470
+#: ../clients/cli/settings.c:4045 ../clients/cli/settings.c:4358
 #, c-format
 msgid "invalid gateway address '%s'"
-msgstr "无效的网关地址 “%s”"
+msgstr "无效网关地址 '%s'"
 
-#: ../clients/cli/settings.c:4212 ../clients/cli/settings.c:4525
+#: ../clients/cli/settings.c:4100 ../clients/cli/settings.c:4413
 #, c-format
 msgid "the property doesn't contain route '%s'"
-msgstr "该属性不包含路由 “%s”"
+msgstr "属性没有包含路由 '%s'"
 
-#: ../clients/cli/settings.c:4225
+#: ../clients/cli/settings.c:4113
 msgid ""
 "Enter a list of IPv4 routes formatted as:\n"
 "  ip[/prefix] [next-hop] [metric],...\n"
@@ -5842,22 +6146,21 @@ 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 ""
-"输入 IPv4 路由列表，格式如下：\n"
+"输入 IPv4 路由列表，格式为：\n"
 "  ip[/prefix] [next-hop] [metric],...\n"
+"缺少前缀则默认为 32。\n"
+"缺少 next-hop 则默认为 0.0.0.0。\n"
+"缺少度量衡则使用默认值（NM/kernel 将设置默认值）。\n"
 "\n"
-"缺少前缀的，前缀被视为32。\n"
-"缺少下一跳的被视为 0.0.0.0。\n"
-"缺少度量意味着默认 (NM/内核将设置默认值)。\n"
-"\n"
-"例如：192.168.2.0/24 192.168.2.1 3，10.1.0.0/16 10.0.0.254\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"
 
-#: ../clients/cli/settings.c:4271 ../clients/cli/settings.c:4290
+#: ../clients/cli/settings.c:4159 ../clients/cli/settings.c:4178
 #, c-format
 msgid "invalid IPv6 address '%s'"
-msgstr "无效的 IPv6 地址“%s”"
+msgstr "无效 IPv6 地址 '%s'"
 
-#: ../clients/cli/settings.c:4308
+#: ../clients/cli/settings.c:4196
 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 "
@@ -5868,14 +6171,13 @@ 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/cli/settings.c:4454
+#: ../clients/cli/settings.c:4342
 msgid ""
 "Enter a list of IPv6 addresses formatted as:\n"
 "  ip[/prefix], ip[/prefix],...\n"
@@ -5883,14 +6185,13 @@ msgid ""
 "\n"
 "Example: 2607:f0d0:1002:51::4/64, 1050:0:0:0:5:600:300c:326b\n"
 msgstr ""
-"输入 IPv6 地址列表，格式如下：\n"
-"  ip[/prefix]，ip[/prefix]，...\n"
-"\n"
-"缺少前缀的，前缀被视为128。\n"
+"输入 IPv6 地址列表，格式为：\n"
+"  ip[/prefix], ip[/prefix],...\n"
+"缺少前缀则默认为 128。\n"
 "\n"
-"例如：2607:f0d0:1002:51::4/64，1050:0:0:0:5:600:300c:326b\n"
+"示例：2607:f0d0:1002:51::4/64, 1050:0:0:0:5:600:300c:326b\n"
 
-#: ../clients/cli/settings.c:4538
+#: ../clients/cli/settings.c:4426
 msgid ""
 "Enter a list of IPv6 routes formatted as:\n"
 "  ip[/prefix] [next-hop] [metric],...\n"
@@ -5903,39 +6204,38 @@ msgid ""
 "db8:beef::3 2\n"
 "          abbe::/64 55\n"
 msgstr ""
-"输入 IPv6 路由列表，格式如下：\n"
-"  ip[/prefix] [next-hop] [metric]。...\n"
-"\n"
-"缺少前缀的，前缀被视为128。\n"
-"缺少下一跳被看作是 “::” 。\n"
-"缺少度量意味着默认 (NM/内核将设置默认值)。\n"
+"输入 IPv6 路由列表，格式为：\n"
+"  ip[/prefix] [next-hop] [metric],...\n"
+"缺少前缀则默认为 128。\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"
+"示例：2001:db8:beef:2::/64 2001:db8:beef::2, 2001:db8:beef:3::/64 2001:db8:beef:"
+":3 2\n"
 "          abbe::/64 55\n"
 
-#: ../clients/cli/settings.c:4555 ../libnm-core/nm-setting-gsm.c:363
+#: ../clients/cli/settings.c:4443 ../libnm-core/nm-setting-gsm.c:363
 #: ../libnm-util/nm-setting-gsm.c:364
 #, c-format
 msgid "'%s' is not a number"
-msgstr "“%s”不是一个数字"
+msgstr "'%s' 不是一个数字"
 
-#: ../clients/cli/settings.c:4562
+#: ../clients/cli/settings.c:4450
 #, c-format
 msgid "'%s' is not valid; use 0, 1, or 2"
-msgstr "“%s” 无效，请使用 0、1 或者 2。"
+msgstr "'%s' 无效，请使用 0、1 或者 2。"
 
-#: ../clients/cli/settings.c:4609
+#: ../clients/cli/settings.c:4497
 #, c-format
 msgid "'%s' is not a valid channel; use <1-13>"
-msgstr "“%s”不是有效的信道；请使用 <1-13>"
+msgstr "'%s' 是无效频道，请使用 <1-13>。"
 
-#: ../clients/cli/settings.c:4646
+#: ../clients/cli/settings.c:4534
 #, c-format
 msgid "'%s' is not valid; use [e, o, n]"
-msgstr "“%s” 无效，请使用 [e, o, n]。"
+msgstr "'%s' 无效，请使用 [e, o, n]。"
 
-#: ../clients/cli/settings.c:4674
+#: ../clients/cli/settings.c:4562
 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 "
@@ -5945,73 +6245,74 @@ msgid ""
 "\"roundrobin\"}, \"ports\": {\"eth1\": {}, \"eth2\": {}} }\n"
 "          set team.config /etc/my-team.conf\n"
 msgstr ""
-"nmcli 可接受直接 JSON 配置数据和包含该配置的文件名。在后一种情况下会读取该文"
-"件并将内容放到这个属性中。\n"
+"nmcli 可接受直接 JSON 配置数据和包含该配置的文件名。在后一种情况下会读取该文件并将内容放到这个属性中。\n"
 "\n"
 "例如：set team.config { \"device\": \"team0\", \"runner\": {\"name\": "
 "\"roundrobin\"}, \"ports\": {\"eth1\": {}, \"eth2\": {}} }\n"
 "          set team.config /etc/my-team.conf\n"
 
-#: ../clients/cli/settings.c:4714
+#: ../clients/cli/settings.c:4602
 msgid "no priority to remove"
 msgstr "未删除任何优先级"
 
-#: ../clients/cli/settings.c:4718
+#: ../clients/cli/settings.c:4606
 #, c-format
 msgid "index '%d' is not in the range of <0-%d>"
-msgstr "索引“%d”超出了范围 <0-%d>"
+msgstr "索引 '%d' 不在范围 <0-%d> 中"
 
-#: ../clients/cli/settings.c:4757
+#: ../clients/cli/settings.c:4645
 #, c-format
 msgid ""
-"Warning: only one mapping at a time is supported; taking the first one (%s)\n"
-msgstr "警告：在同一时间只有一个映射支持；取第一个 (%s)\n"
+"Warning: only one mapping at a time is supported; taking the first one "
+"(%s)\n"
+msgstr "警告：不支持一次只映射一次；使用第一个（%s）\n"
 
-#: ../clients/cli/settings.c:4764
+#: ../clients/cli/settings.c:4652
 #, c-format
 msgid "the property doesn't contain mapping '%s'"
-msgstr "该属性不包含映射 “%s”"
+msgstr "属性没有包含映射 '%s'"
 
-#: ../clients/cli/settings.c:4812
-#, fuzzy, c-format
+#: ../clients/cli/settings.c:4700
+#, c-format
 msgid "'%s' cannot be empty"
-msgstr "“%s=%s” 的这个属性不能为空"
+msgstr "'%s' 不能为空"
 
-#: ../clients/cli/settings.c:4886 ../clients/cli/settings.c:5053
-#: ../libnm-core/nm-setting-wired.c:651 ../libnm-core/nm-setting-wireless.c:820
-#: ../libnm-core/nm-setting-wireless.c:832 ../libnm-util/nm-setting-wired.c:646
+#: ../clients/cli/settings.c:4774 ../clients/cli/settings.c:4941
+#: ../libnm-core/nm-setting-wired.c:651
+#: ../libnm-core/nm-setting-wireless.c:820
+#: ../libnm-core/nm-setting-wireless.c:832
+#: ../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/cli/settings.c:4892 ../clients/cli/settings.c:5059
+#: ../clients/cli/settings.c:4780 ../clients/cli/settings.c:4947
 #, c-format
 msgid "the property doesn't contain MAC address '%s'"
-msgstr "该属性不包含 MAC 地址 “%s”"
+msgstr "属性没有包含 MAC 地址 '%s'"
 
-#: ../clients/cli/settings.c:4911
+#: ../clients/cli/settings.c:4799
 #, c-format
 msgid "'%s' is not valid; 2 or 3 strings should be provided"
-msgstr "“%s” 无效；应提供 2 个或 3 个字符串"
+msgstr "'%s' 无效；应提供两至三个字符串。"
 
-#: ../clients/cli/settings.c:4925
+#: ../clients/cli/settings.c:4813
 msgid ""
 "Enter a list of subchannels (comma or space separated).\n"
 "\n"
 "Example: 0.0.0e20 0.0.0e21 0.0.0e22\n"
-msgstr ""
-"输入 IPv4 地址列表 (用分号或空格分隔)。\n"
+msgstr "输入子频道列表（用逗号或者空格分开）。\n"
 "\n"
-"例如： 0.0.0e20 0.0.0e21 0.0.0e22\n"
+"示例：0.0.0e20 0.0.0e21 0.0.0e22\n"
 
-#: ../clients/cli/settings.c:4947
+#: ../clients/cli/settings.c:4835
 #, c-format
 msgid "'%s' string value should consist of 1 - 199 characters"
-msgstr ""
+msgstr "'%s' 字符串值应该由 1 - 199 个字符组成"
 
-#: ../clients/cli/settings.c:4979
+#: ../clients/cli/settings.c:4867
 #, c-format
 msgid ""
 "Enter a list of S/390 options formatted as:\n"
@@ -6022,198 +6323,239 @@ msgstr ""
 "  option = <value>, option = <value>,... \n"
 "有效选项为：%s\n"
 
-#: ../clients/cli/settings.c:5025
+#: ../clients/cli/settings.c:4913
 #, c-format
 msgid "'%s' is not a valid channel"
-msgstr "“%s” 是无效的通道"
+msgstr "“%s”不是有效的频道"
 
-#: ../clients/cli/settings.c:5031
+#: ../clients/cli/settings.c:4919
 #, c-format
 msgid "'%ld' is not a valid channel"
-msgstr "“%ld”不是有效频道"
+msgstr "'%ld' 不是有效频道"
 
-#: ../clients/cli/settings.c:5125
-#, fuzzy, c-format
+#: ../clients/cli/settings.c:5013
+#, c-format
 msgid "invalid option '%s', use 'default', 'never' or 'always'"
-msgstr "无效选项“%s”或值“%s”"
+msgstr "无效选项 '%s'，请使用 'default'、'never' 或 'always'"
 
-#: ../clients/cli/settings.c:5186 ../clients/cli/settings.c:5225
-#: ../clients/cli/settings.c:5264
+#: ../clients/cli/settings.c:5074 ../clients/cli/settings.c:5113
+#: ../clients/cli/settings.c:5152
 #, c-format
 msgid "the property doesn't contain protocol '%s'"
-msgstr "该属性不包含协议 “%s”"
+msgstr "属性没有包含协议 '%s'"
 
-#: ../clients/cli/settings.c:5303
+#: ../clients/cli/settings.c:5191
 #, 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/cli/settings.c:5311
+#: ../clients/cli/settings.c:5199
 #, c-format
 msgid "WEP key is guessed to be of '%s'\n"
-msgstr "猜测 WEP 密钥为 “%s”\n"
+msgstr "猜测 WEP 密钥为 '%s'\n"
 
-#: ../clients/cli/settings.c:5313
+#: ../clients/cli/settings.c:5201
 #, c-format
 msgid "WEP key index set to '%d'\n"
-msgstr "WEP 密钥索引设置为 “%d”\n"
+msgstr "设置 WEP 密钥为 '%d'\n"
+"\n"
 
-#: ../clients/cli/settings.c:5336
+#: ../clients/cli/settings.c:5224
 #, c-format
 msgid "'%s' not among [0 (unknown), 1 (key), 2 (passphrase)]"
-msgstr "“%s” 不是 [0 (unknown), 1 (key), 2 (passphrase)]"
+msgstr "'%s' 不是 [0 (unknown), 1 (key), 2 (passphrase)]"
 
-#: ../clients/cli/settings.c:5352 ../clients/cli/settings.c:5355
-#: ../clients/cli/settings.c:5358 ../clients/cli/settings.c:5361
+#: ../clients/cli/settings.c:5240 ../clients/cli/settings.c:5243
+#: ../clients/cli/settings.c:5246 ../clients/cli/settings.c:5249
 #, c-format
 msgid ""
 "Warning: '%s' is not compatible with '%s' type, please change or delete the "
 "key.\n"
-msgstr "警告：“%s” 与 “%s” 类型不兼容，请更改或删除密钥。\n"
+msgstr "警告：'%s' 和 '%s' 类型不兼容，请修改或删除密钥。\n"
 
-#: ../clients/cli/settings.c:5374
+#: ../clients/cli/settings.c:5262
 #, c-format
 msgid ""
 "Enter the type of WEP keys. The accepted values are: 0 or unknown, 1 or key, "
 "and 2 or passphrase.\n"
-msgstr ""
-"输入 WEP 密钥类型。可接受的值为：0 或者 unknown, 1 或者 key, 以及 2 或者 "
-"passphrase。\n"
+msgstr "输入 WEP 密钥类型。可接受的值为：0 或者 unknown, 1 或者 key, 以及 2 或者 passphrase。\n"
 
-#: ../clients/cli/settings.c:5387
+#: ../clients/cli/settings.c:5275
 #, c-format
 msgid "'%s' is not a valid PSK"
-msgstr "“%s” 是无效 PSK"
+msgstr "'%s' 是无效 PSK"
 
-#: ../clients/cli/settings.c:5431
+#: ../clients/cli/settings.c:5319
 #, c-format
 msgid "'%s' is not a valid DCB flag"
-msgstr "“%s” 不是有效 DCB 标签"
+msgstr "'%s' 不是有效 DCB 标签"
 
-#: ../clients/cli/settings.c:5454
+#: ../clients/cli/settings.c:5342
 #, c-format
 msgid "'%s' is not a DCB app priority"
-msgstr "“%s” 不是 DCB app 优先权"
+msgstr "'%s' 不是 DCB app 优先权"
 
-#: ../clients/cli/settings.c:5480
+#: ../clients/cli/settings.c:5368
 msgid "must contain 8 comma-separated numbers"
 msgstr "必须包含 8 个用逗号分开的数字"
 
-#: ../clients/cli/settings.c:5497
+#: ../clients/cli/settings.c:5385
 #, 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/cli/settings.c:5500
+#: ../clients/cli/settings.c:5388
 #, c-format
 msgid "'%s' not a number between 0 and %u (inclusive)"
-msgstr "“%s” 不是 0 和 %u (包含该数字) 之间的数字"
+msgstr "'%s' 不是 0 和 %u (包含该数字) 之间的数字"
 
-#: ../clients/cli/settings.c:5522
+#: ../clients/cli/settings.c:5410
 #, c-format
-msgid ""
-"Warning: changes will have no effect until '%s' includes 1 (enabled)\n"
+msgid "Warning: changes will have no effect until '%s' includes 1 (enabled)\n"
 "\n"
-msgstr ""
-"警告：除非 “%s” 包括 1 (启用)，否则更改无法生效。\n"
+msgstr "警告：除非 '%s' 包括 1 (启用)，否则更改无法生效。\n"
 "\n"
 
-#: ../clients/cli/settings.c:5575
+#: ../clients/cli/settings.c:5463
 #, c-format
 msgid "bandwidth percentages must total 100%%"
 msgstr "贷款百分比必须为 100%%"
 
-#: ../clients/cli/settings.c:5661 ../clients/cli/settings.c:5667
+#: ../clients/cli/settings.c:5549 ../clients/cli/settings.c:5555
 msgid "SIM operator ID must be a 5 or 6 number MCCMNC code"
-msgstr ""
+msgstr "SIM 操作员 ID 必须为 5 或 6 个数字的 MCCMNC 代码"
 
-#: ../clients/cli/settings.c:5710
-#, fuzzy, c-format
+#: ../clients/cli/settings.c:5598
+#, c-format
 msgid "invalid option '%s', use '%s' or '%s'"
-msgstr "无效的验证选项：%s\n"
+msgstr "无效选项 '%s'，请使用 '%s' 或 '%s'"
 
-#: ../clients/cli/settings.c:7777
+#: ../clients/cli/settings.c:7644
 msgid "don't know how to get the property value"
 msgstr "不知道如何获得属性值"
 
-#: ../clients/cli/settings.c:7830 ../clients/cli/settings.c:7870
+#: ../clients/cli/settings.c:7697 ../clients/cli/settings.c:7737
 msgid "the property can't be changed"
 msgstr "无法更改属性"
 
-#: ../clients/cli/settings.c:7954
+#: ../clients/cli/settings.c:7821
 msgid "(not available)"
-msgstr "（不可用）"
+msgstr "(不可用)"
 
-#: ../clients/cli/settings.c:7979
+#: ../clients/cli/settings.c:7846
 msgid "[NM property description]"
 msgstr "[NM 属性描述]"
 
-#: ../clients/cli/settings.c:7984
+#: ../clients/cli/settings.c:7851
 msgid "[nmcli specific description]"
 msgstr "[nmcli 具体描述]"
 
+#. ----------------------------------------------------------------------------
+#: ../clients/cli/settings.c:7900
+msgid "<hidden>"
+msgstr "<hidden>"
+
+#: ../clients/cli/utils.c:124
+#, c-format
+msgid "Error: value for '%s' argument is required."
+msgstr "错误：需要 '%s' 参数值。"
+
 #: ../clients/cli/utils.c:149
 #, c-format
 msgid "Error: Argument '%s' was expected, but '%s' provided."
-msgstr "错误：需要参数 “%s” 但给出的是 “%s”。"
+msgstr "错误：需要参数 '%s' 但给出的是 '%s'。"
 
 #: ../clients/cli/utils.c:152
 #, c-format
 msgid "Error: Unexpected argument '%s'"
-msgstr "错误：意外参数 “%s”"
+msgstr "错误：意外参数 '%s'"
+
+#: ../clients/cli/utils.c:202
+#, c-format
+msgid "Error converting IP4 address '0x%X' to text form"
+msgstr "将 IP4 地址 '0x%X' 转换为文本格式出错"
+
+#: ../clients/cli/utils.c:230
+#, c-format
+msgid "Error converting IP6 address '%s' to text form"
+msgstr "将 IP6 地址 '%s' 转换为文本格式出错"
 
 #. Translators: the first %s is the partial value entered by
 #. * the user, the second %s a list of compatible values.
-#.
-#: ../clients/cli/utils.c:492 ../clients/cli/utils.c:523
-#, fuzzy, c-format
+#. 
+#: ../clients/cli/utils.c:546 ../clients/cli/utils.c:577
+#, c-format
 msgid "'%s' is ambiguous (%s)"
-msgstr "“%s”含义模糊（%s）"
+msgstr "'%s' 含义模糊（%s）"
 
-#: ../clients/cli/utils.c:502
+#: ../clients/cli/utils.c:556
 #, c-format
 msgid "'%s' is not valid; use [%s] or [%s]"
-msgstr "“%s” 无效，请使用 [%s] 或者 [%s]"
+msgstr "'%s' 无效，请使用 [%s] 或者 [%s]"
 
-#: ../clients/cli/utils.c:535
-#, fuzzy, c-format
+#: ../clients/cli/utils.c:589
+#, c-format
 msgid "'%s' is not valid; use [%s], [%s] or [%s]"
-msgstr "错误：“bt-type”：“%s”无效；使用 [%s, %s (%s), %s]。"
+msgstr "'%s' 无效，请使用 [%s]、[%s] 或者 [%s]"
 
-#: ../clients/cli/utils.c:634
+#: ../clients/cli/utils.c:688
 #, c-format
 msgid "'%s' is ambiguous (%s x %s)"
-msgstr "“%s” 含义模糊 (%s x %s)"
+msgstr "'%s' 含义模糊 (%s x %s)"
 
-#: ../clients/cli/utils.c:646
+#: ../clients/cli/utils.c:700
 #, c-format
 msgid "missing name, try one of [%s]"
 msgstr "缺少名称，请尝试使用 [%s] 之一。"
 
-#: ../clients/cli/utils.c:893
+#: ../clients/cli/utils.c:964
 #, c-format
 msgid "field '%s' has to be alone"
-msgstr "字段“%s”必须是单独的"
+msgstr "字段 '%s' 必须是单独的"
 
-#: ../clients/cli/utils.c:896
+#: ../clients/cli/utils.c:967
 #, c-format
 msgid "invalid field '%s'; allowed fields: %s"
-msgstr "无效字段“%s”；允许字段：%s"
+msgstr "无效字段 '%s'; 允许的字段为：%s"
 
-#: ../clients/cli/utils.c:953
+#: ../clients/cli/utils.c:1024
 msgid "Option '--terse' requires specifying '--fields'"
-msgstr "选项 “--terse” 要求指定 “--fields”"
+msgstr "选项 '--terse' 要求指定 '--fields'"
 
-#: ../clients/cli/utils.c:957
+#: ../clients/cli/utils.c:1028
 #, c-format
 msgid "Option '--terse' requires specific '--fields' option values , not '%s'"
-msgstr "选项 “--terse” 需要特定 “--fields” 选项值，不是 “%s”"
+msgstr "选项 '--terse' 需要特定 '--fields' 选项值，不是 '%s'"
+
+#: ../clients/cli/utils.c:1390
+#, c-format
+msgid ""
+"Warning: nmcli (%s) and NetworkManager (%s) versions don't match. Use --"
+"nocheck to suppress the warning.\n"
+msgstr "警告：nmcli (%s) 和 NetworkManager (%s) 版本不匹配。请使用 --nocheck 抑制警告。\n"
+
+#: ../clients/cli/utils.c:1399
+#, c-format
+msgid ""
+"Error: nmcli (%s) and NetworkManager (%s) versions don't match. Force "
+"execution using --nocheck, but the results are unpredictable."
+msgstr "错误：nmcli (%s) 和 NetworkManager (%s) 版本不匹配。强制执行请使用 --nocheck，但结果无法预测。"
 
 #: ../clients/common/nm-polkit-listener.c:212
 msgid "An authentication session is already underway."
-msgstr "身份认证会话已经在进行。"
+msgstr "验证会话已在进行。"
+
+#. TTLS and PEAP are actually much more complicated, but this complication
+#. * is not visible here since we only care about phase2 authentication
+#. * (and don't even care of which one)
+#. 
+#: ../clients/common/nm-secret-agent-simple.c:223
+#: ../clients/common/nm-secret-agent-simple.c:328
+#: ../clients/tui/nmt-page-dsl.c:66 ../clients/tui/nmt-page-wifi.c:332
+msgid "Username"
+msgstr "用户名"
 
 #: ../clients/common/nm-secret-agent-simple.c:230
 #: ../clients/common/nm-secret-agent-simple.c:273
@@ -6222,10 +6564,9 @@ msgstr "身份认证会话已经在进行。"
 #: ../clients/common/nm-secret-agent-simple.c:492
 #: ../clients/common/nm-secret-agent-simple.c:507
 #: ../clients/common/nm-secret-agent-simple.c:525
-#: ../clients/common/nm-vpn-helpers.c:119
-#: ../clients/common/nm-vpn-helpers.c:120
-#: ../clients/common/nm-vpn-helpers.c:124
-#: ../clients/common/nm-vpn-helpers.c:127 ../clients/tui/nmt-page-dsl.c:75
+#: ../clients/common/nm-vpn-helpers.c:101
+#: ../clients/common/nm-vpn-helpers.c:102
+#: ../clients/common/nm-vpn-helpers.c:105 ../clients/tui/nmt-page-dsl.c:75
 #: ../clients/tui/nmt-page-wifi.c:277 ../clients/tui/nmt-page-wifi.c:308
 #: ../clients/tui/nmt-page-wifi.c:341
 msgid "Password"
@@ -6237,7 +6578,7 @@ msgstr "身份"
 
 #: ../clients/common/nm-secret-agent-simple.c:248
 msgid "Private key password"
-msgstr "私钥密码"
+msgstr "专用密钥密码"
 
 #: ../clients/common/nm-secret-agent-simple.c:289
 #: ../clients/tui/nmt-page-wifi.c:289
@@ -6251,14 +6592,14 @@ msgstr "服务"
 
 #: ../clients/common/nm-secret-agent-simple.c:448
 msgid "Authentication required by wireless network"
-msgstr "无线网络要求身份认证"
+msgstr "无线网络所需认证"
 
 #: ../clients/common/nm-secret-agent-simple.c:449
 #, 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:457
 msgid "Wired 802.1X authentication"
@@ -6274,7 +6615,7 @@ msgstr "DSL 认证"
 
 #: ../clients/common/nm-secret-agent-simple.c:477
 msgid "PIN code required"
-msgstr "需要 PIN 码"
+msgstr "所需 PIN 代码"
 
 #: ../clients/common/nm-secret-agent-simple.c:478
 msgid "PIN code is needed for the mobile broadband device"
@@ -6296,83 +6637,55 @@ msgstr "移动宽带网络密码"
 #: ../clients/common/nm-secret-agent-simple.c:542
 #, c-format
 msgid "A password is required to connect to '%s'."
-msgstr "需要密码来连接到“%s”。"
+msgstr "连接到“%s”需要密码。"
 
 #: ../clients/common/nm-secret-agent-simple.c:537
 msgid "VPN password required"
-msgstr "需要 VPN 密码"
-
-#: ../clients/common/nm-vpn-helpers.c:48
-#, fuzzy, c-format
-msgid "unknown VPN plugin \"%s\""
-msgstr "无法加载插件 %s"
-
-#: ../clients/common/nm-vpn-helpers.c:59
-#, c-format
-msgid "cannot cannot load legacy-only VPN plugin \"%s\" for \"%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 ""
-
-#: ../clients/common/nm-vpn-helpers.c:69
-#, fuzzy, c-format
-msgid "failed to load VPN plugin \"%s\": %s"
-msgstr "错误：加载 VPN 插件失败：%s。"
+msgstr "要求 VPN 密码"
 
-#: ../clients/common/nm-vpn-helpers.c:121
-#, fuzzy
-msgid "Certificate password"
-msgstr "私钥密码"
-
-#: ../clients/common/nm-vpn-helpers.c:122
-#, fuzzy
-msgid "HTTP proxy password"
-msgstr "组密码"
+#: ../clients/common/nm-vpn-helpers.c:61
+msgid "could not get VPN plugin info"
+msgstr "无法获取 VPN 插件信息"
 
-#: ../clients/common/nm-vpn-helpers.c:125
-#: ../clients/common/nm-vpn-helpers.c:128
+#: ../clients/common/nm-vpn-helpers.c:103
+#: ../clients/common/nm-vpn-helpers.c:106
 msgid "Group password"
 msgstr "组密码"
 
-#: ../clients/common/nm-vpn-helpers.c:130 ../clients/tui/nmt-page-ip4.c:143
+#: ../clients/common/nm-vpn-helpers.c:108 ../clients/tui/nmt-page-ip4.c:143
 #: ../clients/tui/nmt-page-ip6.c:143
 msgid "Gateway"
 msgstr "网关"
 
-#: ../clients/common/nm-vpn-helpers.c:131
+#: ../clients/common/nm-vpn-helpers.c:109
 msgid "Cookie"
 msgstr "Cookie"
 
-#: ../clients/common/nm-vpn-helpers.c:132
-#, fuzzy
+#: ../clients/common/nm-vpn-helpers.c:110
 msgid "Gateway certificate hash"
-msgstr "网关"
+msgstr "网关证书哈希"
 
 #: ../clients/nm-online.c:94
 msgid "Connecting"
-msgstr "正在连接"
+msgstr "连接中"
 
 #: ../clients/nm-online.c:147
 msgid ""
 "Time to wait for a connection, in seconds (without the option, default value "
 "is 30)"
-msgstr "等待连接时间，以秒计(没有该选项时，默认为 30)"
+msgstr "等待连接的时间，单位秒（没有此选项时默认值为 30）"
 
 #: ../clients/nm-online.c:148
 msgid "Exit immediately if NetworkManager is not running or connecting"
-msgstr "NetworkManager 未运行或未连接时，立即退出"
+msgstr "如果 NetworkManager 未运行或连接则立即退出"
 
 #: ../clients/nm-online.c:149
 msgid "Don't print anything"
-msgstr "不输出任何结果"
+msgstr "不要显示任何信息"
 
 #: ../clients/nm-online.c:150
 msgid "Wait for NetworkManager startup instead of a connection"
-msgstr "等待 NetworkManager 启动而非某个连接的启动"
+msgstr "等待 NetworkManager 启动而不是连接"
 
 #: ../clients/nm-online.c:171
 msgid ""
@@ -6381,12 +6694,12 @@ msgstr "等待 NetworkManager 完成激活启动网络连接。"
 
 #: ../clients/nm-online.c:178 ../clients/nm-online.c:184
 msgid "Invalid option.  Please use --help to see a list of valid options."
-msgstr "无效选项。请使用 --help 查看有效选项列表。"
+msgstr "无效选项。  请使用 --help 查看有效选项列表。"
 
 #: ../clients/tui/newt/nmt-newt-utils.c:177 ../clients/tui/nmt-editor.c:415
 #: ../clients/tui/nmt-password-dialog.c:174
 #: ../clients/tui/nmt-route-editor.c:122 ../clients/tui/nmtui-hostname.c:69
-#: ../clients/tui/nmtui.c:136
+#: ../clients/tui/nmtui.c:114
 msgid "OK"
 msgstr "确定"
 
@@ -6404,7 +6717,7 @@ msgstr "编辑器失败：%s"
 #: ../clients/tui/newt/nmt-newt-utils.c:373
 #, c-format
 msgid "Editor failed with status %d"
-msgstr "编辑器失败，状态 %d"
+msgstr "编辑器失败，状态码：%d"
 
 #: ../clients/tui/newt/nmt-newt-utils.c:375
 #, c-format
@@ -6414,47 +6727,32 @@ 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:146 ../libnm-glib/nm-device.c:1859
-#: ../libnm/nm-device.c:1810
-msgid "Ethernet"
-msgstr "以太网"
+msgstr "无法创新读取文件：%s"
 
 #: ../clients/tui/nm-editor-utils.c:150
 #, c-format
 msgid "Ethernet connection %d"
 msgstr "以太网连接 %d"
 
-#: ../clients/tui/nm-editor-utils.c:154 ../libnm-glib/nm-device.c:1861
-#: ../libnm/nm-device.c:1812
-msgid "Wi-Fi"
-msgstr "Wi-Fi 参数"
-
 #: ../clients/tui/nm-editor-utils.c:158
 #, c-format
 msgid "Wi-Fi connection %d"
 msgstr "Wi-Fi 连接 %d"
 
-#: ../clients/tui/nm-editor-utils.c:163 ../libnm-core/nm-connection.c:1748
-#: ../libnm-glib/nm-device.c:1871 ../libnm/nm-device.c:1822
-msgid "InfiniBand"
-msgstr "InfiniBand 参数"
-
 #: ../clients/tui/nm-editor-utils.c:167
 #, c-format
 msgid "InfiniBand connection %d"
-msgstr "高速网络连接 %d"
+msgstr "InfiniBand 连接 %d"
 
-#: ../clients/tui/nm-editor-utils.c:172 ../libnm-glib/nm-device.c:1869
-#: ../libnm/nm-device.c:1820
+#: ../clients/tui/nm-editor-utils.c:172 ../libnm-glib/nm-device.c:1859
+#: ../libnm/nm-device.c:1810
 msgid "Mobile Broadband"
-msgstr "移动宽带"
+msgstr "移动带宽"
 
 #: ../clients/tui/nm-editor-utils.c:175
 #, c-format
 msgid "Mobile broadband connection %d"
-msgstr "移动宽带连接 %d"
+msgstr "移动带宽连接 %d"
 
 #: ../clients/tui/nm-editor-utils.c:181 ../clients/tui/nmt-page-dsl.c:62
 msgid "DSL"
@@ -6465,38 +6763,38 @@ msgstr "DSL"
 msgid "DSL connection %d"
 msgstr "DSL 连接 %d"
 
-#: ../clients/tui/nm-editor-utils.c:190 ../libnm-core/nm-connection.c:1740
-#: ../libnm-glib/nm-device.c:1873 ../libnm-util/nm-connection.c:1626
-#: ../libnm/nm-device.c:1824 ../src/settings/plugins/ifcfg-rh/reader.c:4195
+#: ../clients/tui/nm-editor-utils.c:190 ../libnm-core/nm-connection.c:1708
+#: ../libnm-glib/nm-device.c:1863 ../libnm-util/nm-connection.c:1626
+#: ../libnm/nm-device.c:1814 ../src/settings/plugins/ifcfg-rh/reader.c:4182
 msgid "Bond"
-msgstr "绑定"
+msgstr "捆绑"
 
 #: ../clients/tui/nm-editor-utils.c:194
 #, c-format
 msgid "Bond connection %d"
 msgstr "绑定连接 %d"
 
-#: ../clients/tui/nm-editor-utils.c:199 ../libnm-core/nm-connection.c:1744
-#: ../libnm-glib/nm-device.c:1877 ../libnm-util/nm-connection.c:1630
-#: ../libnm/nm-device.c:1828 ../src/settings/plugins/ifcfg-rh/reader.c:4492
+#: ../clients/tui/nm-editor-utils.c:199 ../libnm-core/nm-connection.c:1712
+#: ../libnm-glib/nm-device.c:1867 ../libnm-util/nm-connection.c:1630
+#: ../libnm/nm-device.c:1818 ../src/settings/plugins/ifcfg-rh/reader.c:4479
 msgid "Bridge"
 msgstr "桥接"
 
 #: ../clients/tui/nm-editor-utils.c:204
 #, c-format
 msgid "Bridge connection %d"
-msgstr "桥式连接 %d"
+msgstr "桥接连接 %d"
 
-#: ../clients/tui/nm-editor-utils.c:208 ../libnm-core/nm-connection.c:1742
-#: ../libnm-glib/nm-device.c:1875 ../libnm-util/nm-connection.c:1628
-#: ../libnm/nm-device.c:1826 ../src/settings/plugins/ifcfg-rh/reader.c:4301
+#: ../clients/tui/nm-editor-utils.c:208 ../libnm-core/nm-connection.c:1710
+#: ../libnm-glib/nm-device.c:1865 ../libnm-util/nm-connection.c:1628
+#: ../libnm/nm-device.c:1816 ../src/settings/plugins/ifcfg-rh/reader.c:4288
 msgid "Team"
-msgstr "组队"
+msgstr "团队"
 
 #: ../clients/tui/nm-editor-utils.c:213
 #, c-format
 msgid "Team connection %d"
-msgstr "组队连接 %d"
+msgstr "Team 连接 %d"
 
 #: ../clients/tui/nm-editor-utils.c:221
 #, c-format
@@ -6510,7 +6808,7 @@ msgstr "VPN 连接 %d"
 
 #: ../clients/tui/nmt-device-entry.c:370
 msgid "Select..."
-msgstr "选择..."
+msgstr "选择......"
 
 #: ../clients/tui/nmt-edit-connection-list.c:110
 msgid "Add"
@@ -6520,7 +6818,7 @@ msgstr "添加"
 #: ../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 "编辑..."
+msgstr "编辑......"
 
 #: ../clients/tui/nmt-edit-connection-list.c:116
 #: ../clients/tui/nmtui-edit.c:526
@@ -6543,10 +6841,9 @@ msgstr "无法为类型 '%s' 的连接 '%s'创建编辑器。"
 #: ../clients/tui/nmt-editor.c:101
 #, c-format
 msgid "Could not create editor for invalid connection '%s'."
-msgstr "无法为无效的连接“%s”创建编辑器。"
+msgstr "无法为无效连接  '%s' 创建编辑器。"
 
 #: ../clients/tui/nmt-editor.c:111
-#, fuzzy
 msgid "Edit Connection"
 msgstr "编辑连接"
 
@@ -6562,11 +6859,11 @@ msgstr "无法添加新连接：%s"
 
 #: ../clients/tui/nmt-editor.c:320
 msgid "Profile name"
-msgstr "配置名称"
+msgstr "配置文件名称"
 
 #: ../clients/tui/nmt-editor.c:331
 msgid "Ethernet device"
-msgstr "以太网设备"
+msgstr "以太设备"
 
 #: ../clients/tui/nmt-editor.c:333
 msgid "Device"
@@ -6579,7 +6876,7 @@ msgstr "自动连接"
 
 #: ../clients/tui/nmt-editor.c:397
 msgid "Available to all users"
-msgstr "对所有用户有效"
+msgstr "可用于所有用户"
 
 #: ../clients/tui/nmt-editor.c:412 ../clients/tui/nmt-password-dialog.c:171
 #: ../clients/tui/nmt-route-editor.c:115 ../clients/tui/nmtui-edit.c:217
@@ -6593,15 +6890,15 @@ msgstr "字节"
 
 #: ../clients/tui/nmt-page-bond.c:84
 msgid "Round-robin"
-msgstr "轮询"
+msgstr "循环"
 
 #: ../clients/tui/nmt-page-bond.c:85
 msgid "Active Backup"
-msgstr "热备"
+msgstr "激活备份"
 
 #: ../clients/tui/nmt-page-bond.c:86
 msgid "XOR"
-msgstr "异或"
+msgstr "XOR"
 
 #: ../clients/tui/nmt-page-bond.c:87
 msgid "Broadcast"
@@ -6613,15 +6910,15 @@ msgstr "802.3ad"
 
 #: ../clients/tui/nmt-page-bond.c:89
 msgid "Adaptive Transmit Load Balancing (tlb)"
-msgstr "自适应传输负载均衡 (tlb)"
+msgstr "适配器传输负载均衡 (tlb)"
 
 #: ../clients/tui/nmt-page-bond.c:90
 msgid "Adaptive Load Balancing (alb)"
-msgstr "自适应负载均衡 (alb)"
+msgstr "适配器负载平衡 (alb)"
 
 #: ../clients/tui/nmt-page-bond.c:96
 msgid "MII (recommended)"
-msgstr "MII（推荐）"
+msgstr "MII (推荐)"
 
 #: ../clients/tui/nmt-page-bond.c:97
 msgid "ARP"
@@ -6630,25 +6927,25 @@ msgstr "ARP"
 #: ../clients/tui/nmt-page-bond.c:355 ../clients/tui/nmt-page-bridge.c:78
 #: ../clients/tui/nmt-page-team.c:152
 msgid "Slaves"
-msgstr "从机"
+msgstr "辅助"
 
 #: ../clients/tui/nmt-page-bond.c:367 ../clients/tui/nmt-page-wifi.c:230
 msgid "Mode"
-msgstr "模式"
+msgstr "型号"
 
 #: ../clients/tui/nmt-page-bond.c:373
 msgid "Primary"
-msgstr "主机"
+msgstr "主要"
 
 #: ../clients/tui/nmt-page-bond.c:379
 msgid "Link monitoring"
-msgstr "链路监控"
+msgstr "链接监控"
 
 #: ../clients/tui/nmt-page-bond.c:385 ../clients/tui/nmt-page-bond.c:392
 #: ../clients/tui/nmt-page-bond.c:399 ../clients/tui/nmt-page-bond.c:406
 msgctxt "milliseconds"
 msgid "ms"
-msgstr "毫秒"
+msgstr "ms"
 
 #: ../clients/tui/nmt-page-bond.c:386 ../clients/tui/nmt-page-bond.c:407
 msgid "Monitoring frequency"
@@ -6656,11 +6953,11 @@ msgstr "监控频率"
 
 #: ../clients/tui/nmt-page-bond.c:393
 msgid "Link up delay"
-msgstr "链接建立延时"
+msgstr "联接延迟"
 
 #: ../clients/tui/nmt-page-bond.c:400
 msgid "Link down delay"
-msgstr "链接断开延时"
+msgstr "取消联接延迟"
 
 #: ../clients/tui/nmt-page-bond.c:413
 msgid "ARP targets"
@@ -6673,11 +6970,11 @@ msgstr "桥接端口"
 #: ../clients/tui/nmt-page-bridge-port.c:67
 #: ../clients/tui/nmt-page-bridge.c:110
 msgid "Priority"
-msgstr "优先级"
+msgstr "优先权"
 
 #: ../clients/tui/nmt-page-bridge-port.c:73
 msgid "Path cost"
-msgstr "路径开销"
+msgstr "路径成本"
 
 #: ../clients/tui/nmt-page-bridge-port.c:75
 msgid "Hairpin mode"
@@ -6690,27 +6987,27 @@ msgstr "秒"
 
 #: ../clients/tui/nmt-page-bridge.c:89
 msgid "Aging time"
-msgstr "老化时间"
+msgstr "过期时间"
 
 #: ../clients/tui/nmt-page-bridge.c:91
 msgid "Enable IGMP snooping"
-msgstr "启用 IGMP 监听"
+msgstr "启用 IGMP snooping"
 
 #: ../clients/tui/nmt-page-bridge.c:97
 msgid "Enable STP (Spanning Tree Protocol)"
-msgstr "启用 STP（跨树协议）"
+msgstr "启用 STP (扩张树协议)"
 
 #: ../clients/tui/nmt-page-bridge.c:120
 msgid "Forward delay"
-msgstr "转发延时"
+msgstr "转发延迟"
 
 #: ../clients/tui/nmt-page-bridge.c:130
 msgid "Hello time"
-msgstr "问候时间"
+msgstr "祝贺时间"
 
 #: ../clients/tui/nmt-page-bridge.c:140
 msgid "Max age"
-msgstr "最大寿命"
+msgstr "最大年龄"
 
 #: ../clients/tui/nmt-page-ethernet.c:70
 msgid "ETHERNET"
@@ -6719,11 +7016,11 @@ msgstr "以太网"
 #: ../clients/tui/nmt-page-ethernet.c:77 ../clients/tui/nmt-page-vlan.c:122
 #: ../clients/tui/nmt-page-wifi.c:364
 msgid "Cloned MAC address"
-msgstr "复制的 MAC 地址"
+msgstr "克隆的 MAC 地址"
 
 #: ../clients/tui/nmt-page-infiniband.c:47
 msgid "Datagram"
-msgstr "数据报"
+msgstr "Datagram"
 
 #: ../clients/tui/nmt-page-infiniband.c:48
 msgid "Connected"
@@ -6733,6 +7030,10 @@ msgstr "已连接"
 msgid "INFINIBAND"
 msgstr "INFINIBAND"
 
+#: ../clients/tui/nmt-page-infiniband.c:88
+msgid "Transport mode"
+msgstr "传输模式"
+
 #: ../clients/tui/nmt-page-ip4.c:38
 msgid "Disabled"
 msgstr "已禁用"
@@ -6743,7 +7044,7 @@ msgstr "自动"
 
 #: ../clients/tui/nmt-page-ip4.c:40 ../clients/tui/nmt-page-ip6.c:41
 msgid "Link-Local"
-msgstr "本地链路"
+msgstr "联接-本地"
 
 #: ../clients/tui/nmt-page-ip4.c:41 ../clients/tui/nmt-page-ip6.c:42
 msgid "Manual"
@@ -6751,11 +7052,11 @@ msgstr "手动"
 
 #: ../clients/tui/nmt-page-ip4.c:42
 msgid "Shared"
-msgstr "共享"
+msgstr "共享的"
 
 #: ../clients/tui/nmt-page-ip4.c:82 ../clients/tui/nmt-page-ip6.c:82
 msgid "(No custom routes)"
-msgstr "（没有自定义路由）"
+msgstr "(无自定义路线)"
 
 #: ../clients/tui/nmt-page-ip4.c:85 ../clients/tui/nmt-page-ip6.c:85
 #, c-format
@@ -6781,11 +7082,11 @@ msgstr "搜索域"
 
 #: ../clients/tui/nmt-page-ip4.c:171 ../clients/tui/nmt-page-ip6.c:169
 msgid "Routing"
-msgstr "路由"
+msgstr "路由选择"
 
 #: ../clients/tui/nmt-page-ip4.c:173 ../clients/tui/nmt-page-ip6.c:171
 msgid "Never use this network for default route"
-msgstr "始终不使用此网络于默认路由"
+msgstr "从不使用这个网络作为默认路线"
 
 #: ../clients/tui/nmt-page-ip4.c:179 ../clients/tui/nmt-page-ip6.c:177
 msgid "Ignore automatically obtained routes"
@@ -6793,7 +7094,7 @@ msgstr "忽略自动获取的路由"
 
 #: ../clients/tui/nmt-page-ip4.c:187
 msgid "Require IPv4 addressing for this connection"
-msgstr "需要 IPv4 地址完成这个连接"
+msgstr "这个连接需要 IPv4 地址"
 
 #: ../clients/tui/nmt-page-ip6.c:38
 msgid "Ignore"
@@ -6801,7 +7102,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"
@@ -6809,7 +7110,7 @@ msgstr "IPv6 配置"
 
 #: ../clients/tui/nmt-page-ip6.c:185
 msgid "Require IPv6 addressing for this connection"
-msgstr "需要 IPv6 地址完成这个连接"
+msgstr "这个连接需要 IPv6 地址"
 
 #: ../clients/tui/nmt-page-ppp.c:131
 msgid "PPP CONFIGURATION"
@@ -6817,7 +7118,7 @@ msgstr "PPP 配置"
 
 #: ../clients/tui/nmt-page-ppp.c:140
 msgid "Allowed authentication methods:"
-msgstr "允许的认证方法："
+msgstr "允许的验证方法："
 
 #: ../clients/tui/nmt-page-ppp.c:147
 msgid "EAP"
@@ -6865,11 +7166,11 @@ msgstr "使用 TCP 头压缩"
 
 #: ../clients/tui/nmt-page-ppp.c:255
 msgid "Send PPP echo packets"
-msgstr "发送 PPP 回响包"
+msgstr "发送 PPP 回响数据包"
 
 #: ../clients/tui/nmt-page-team-port.c:92
 msgid "TEAM PORT"
-msgstr "群组端口"
+msgstr "TEAM 端口"
 
 #: ../clients/tui/nmt-page-team-port.c:99 ../clients/tui/nmt-page-team.c:163
 msgid "JSON configuration"
@@ -6881,7 +7182,7 @@ msgstr "上级"
 
 #: ../clients/tui/nmt-page-vlan.c:114
 msgid "VLAN id"
-msgstr "VLAN 标识"
+msgstr "VLAN id"
 
 #: ../clients/tui/nmt-page-wifi.c:64
 msgctxt "Wi-Fi"
@@ -6890,7 +7191,7 @@ msgstr "客户端"
 
 #: ../clients/tui/nmt-page-wifi.c:65
 msgid "Access Point"
-msgstr "接入点"
+msgstr "切入点"
 
 #: ../clients/tui/nmt-page-wifi.c:66
 msgid "Ad-Hoc Network"
@@ -6926,11 +7227,11 @@ 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-bit Key (Hex 或者 ASCII)"
 
 #: ../clients/tui/nmt-page-wifi.c:84
 msgid "WEP 128-bit Passphrase"
-msgstr "WEP 128位 密码"
+msgstr "WEP 128-字节密码短语"
 
 #: ../clients/tui/nmt-page-wifi.c:85
 msgid "Dynamic WEP (802.1x)"
@@ -6943,7 +7244,7 @@ msgstr "LEAP"
 #: ../clients/tui/nmt-page-wifi.c:91
 msgctxt "WEP key index"
 msgid "1 (Default)"
-msgstr "1（默认）"
+msgstr "1 (默认)"
 
 #: ../clients/tui/nmt-page-wifi.c:92
 msgctxt "WEP key index"
@@ -6966,7 +7267,7 @@ msgstr "开放系统"
 
 #: ../clients/tui/nmt-page-wifi.c:100
 msgid "Shared Key"
-msgstr "共享密钥"
+msgstr "共享的密钥"
 
 #: ../clients/tui/nmt-page-wifi.c:214
 msgid "WI-FI"
@@ -6974,7 +7275,7 @@ msgstr "WI-FI"
 
 #: ../clients/tui/nmt-page-wifi.c:256
 msgid "Channel"
-msgstr "信道"
+msgstr "频道"
 
 #: ../clients/tui/nmt-page-wifi.c:261
 msgid "Security"
@@ -6984,7 +7285,7 @@ msgstr "安全性"
 #. FIXME
 #: ../clients/tui/nmt-page-wifi.c:282
 msgid "(No support for wpa-enterprise yet...)"
-msgstr "（还未支持 wpa-enterprise…）"
+msgstr "(尚未支持 wpa-企业...)"
 
 #: ../clients/tui/nmt-page-wifi.c:292 ../clients/tui/nmt-page-wifi.c:311
 msgid "WEP index"
@@ -7002,7 +7303,7 @@ msgstr "(尚未支持动态-wep ...)"
 
 #: ../clients/tui/nmt-password-fields.c:128
 msgid "Ask for this password every time"
-msgstr "每次都询问这个密码"
+msgstr "每次都询问密码"
 
 #: ../clients/tui/nmt-password-fields.c:129
 msgid "Show password"
@@ -7010,7 +7311,7 @@ msgstr "显示密码"
 
 #: ../clients/tui/nmt-route-table.c:191
 msgid "Destination"
-msgstr "目标"
+msgstr "目标位置"
 
 #: ../clients/tui/nmt-route-table.c:191
 msgid "Prefix"
@@ -7022,7 +7323,7 @@ msgstr "下一步 Hop"
 
 #: ../clients/tui/nmt-route-table.c:208
 msgid "Metric"
-msgstr "权重"
+msgstr "公制"
 
 #: ../clients/tui/nmt-route-table.c:228
 msgid "No custom routes are defined."
@@ -7044,7 +7345,7 @@ msgstr "移除"
 msgid ""
 "openconnect will be run to authenticate.\n"
 "It will return to nmtui when completed."
-msgstr ""
+msgstr "openconnect 将运行以进行验证，完成后它将返回至 nmtui。"
 
 #: ../clients/tui/nmtui-connect.c:68
 #, c-format
@@ -7054,20 +7355,20 @@ msgstr "错误：openconnect 失败：%s"
 #: ../clients/tui/nmtui-connect.c:75
 #, c-format
 msgid "openconnect failed with status %d"
-msgstr "openconnect 失败，状态 %d"
+msgstr "openconnect 失败，状态为 %d"
 
 #: ../clients/tui/nmtui-connect.c:79
 #, c-format
 msgid "openconnect failed with signal %d"
-msgstr "openconnect 失败，信号 %d"
+msgstr "openconnect 失败，信号为 %d"
 
 #: ../clients/tui/nmtui-connect.c:178
 msgid "Activation failed"
-msgstr "启用失败"
+msgstr "激活失败"
 
 #: ../clients/tui/nmtui-connect.c:233
 msgid "Connecting..."
-msgstr "正在连接…"
+msgstr "连接中......"
 
 #: ../clients/tui/nmtui-connect.c:268 ../clients/tui/nmtui-connect.c:299
 #, c-format
@@ -7080,25 +7381,21 @@ msgstr "激活"
 
 #: ../clients/tui/nmtui-connect.c:361
 msgid "Deactivate"
-msgstr "禁用"
+msgstr "取消激活"
 
 #: ../clients/tui/nmtui-connect.c:413 ../clients/tui/nmtui-edit.c:120
-#: ../clients/tui/nmtui.c:130
+#: ../clients/tui/nmtui.c:108
 msgid "Quit"
 msgstr "退出"
 
-#: ../clients/tui/nmtui-connect.c:413 ../clients/tui/nmtui-edit.c:120
-msgid "Back"
-msgstr "返回"
-
 #: ../clients/tui/nmtui-connect.c:436
 #, c-format
 msgid "No such connection '%s'"
-msgstr "无此连接“%s”"
+msgstr "没有此类连接 '%s'"
 
 #: ../clients/tui/nmtui-connect.c:438
 msgid "Connection is already active"
-msgstr "连接已经激活"
+msgstr "连接已激活"
 
 #: ../clients/tui/nmtui-edit.c:225
 msgid "Create"
@@ -7112,13 +7409,11 @@ msgstr "选择您要创建的辅助连接类型。"
 msgid ""
 "If you are creating a VPN, and the VPN connection you wish to create does "
 "not appear in the list, you may not have the correct VPN plugin installed."
-msgstr ""
-"如果您想创建一个 VPN 但列表中没有您想要创建的 VPN 类型，这很可能是您没有安装"
-"正确的 VPN 插件。"
+msgstr "如果您要创建以便 VPN，且这个您想要创建的 VPN 连接没有出现在列表中，您可能买有安装正确的 VPN 插件。"
 
 #: ../clients/tui/nmtui-edit.c:411 ../clients/tui/nmtui-edit.c:427
 msgid "New Connection"
-msgstr "新建连接"
+msgstr "新连接"
 
 #: ../clients/tui/nmtui-edit.c:466
 #, c-format
@@ -7128,16 +7423,16 @@ msgstr "无法删除连接：%s"
 #: ../clients/tui/nmtui-edit.c:505
 #, c-format
 msgid "Could not delete connection '%s': %s"
-msgstr "无法删除连接“%s”：%s"
+msgstr "无法删除连接 '%s': %s"
 
 #: ../clients/tui/nmtui-edit.c:527
 #, 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"
-msgstr "设置主机名"
+msgstr "设定主机名"
 
 #: ../clients/tui/nmtui-hostname.c:53
 msgid "Hostname"
@@ -7147,12 +7442,12 @@ 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"
+msgstr "无法设定主机名：%s"
 
 #: ../clients/tui/nmtui.c:53 ../clients/tui/nmtui.c:56
 msgid "connection"
@@ -7164,7 +7459,7 @@ msgstr "编辑连接"
 
 #: ../clients/tui/nmtui.c:57
 msgid "Activate a connection"
-msgstr "启用连接"
+msgstr "激活连接"
 
 #: ../clients/tui/nmtui.c:59
 msgid "new hostname"
@@ -7172,32 +7467,32 @@ msgstr "新主机名"
 
 #: ../clients/tui/nmtui.c:60
 msgid "Set system hostname"
-msgstr "设置系统主机名"
+msgstr "设定系统主机名"
 
-#: ../clients/tui/nmtui.c:104
+#: ../clients/tui/nmtui.c:83
 msgid "NetworkManager TUI"
-msgstr "网络管理器 TUI"
+msgstr "NetworkManager TUI"
 
-#: ../clients/tui/nmtui.c:112
+#: ../clients/tui/nmtui.c:91
 msgid "Please select an option"
-msgstr "请选择选项"
+msgstr "请选择一个选项"
 
-#: ../clients/tui/nmtui.c:160
+#: ../clients/tui/nmtui.c:143
 msgid "Usage"
-msgstr "用法"
+msgstr "用量"
 
-#: ../clients/tui/nmtui.c:241
+#: ../clients/tui/nmtui.c:224
 msgid "Could not parse arguments"
 msgstr "无法解析参数"
 
-#: ../clients/tui/nmtui.c:251
+#: ../clients/tui/nmtui.c:234
 #, c-format
 msgid "Could not contact NetworkManager: %s.\n"
-msgstr "无法连接 NetworkManager：%s。\n"
+msgstr "无法联系  NetworkManager：%s\n"
 
-#: ../clients/tui/nmtui.c:256
+#: ../clients/tui/nmtui.c:239
 msgid "NetworkManager is not running."
-msgstr "网络管理器未运行。"
+msgstr "NetworkManager 未运行。"
 
 #: ../libnm-core/crypto.c:118 ../libnm-util/crypto.c:131
 #, c-format
@@ -7237,7 +7532,7 @@ msgstr "错误的 PEM 文件格式：DEK-Info 标签中的初始向量格式无�
 #: ../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:218 ../libnm-util/crypto.c:231
 #, c-format
@@ -7246,16 +7541,16 @@ msgstr "无法解码私钥。"
 
 #: ../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: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:299 ../libnm-util/crypto.c:310
 msgid "Failed to decode PKCS#8 private key."
-msgstr "无法解码 PKCS#8 私钥。"
+msgstr "解码 PKCS#8 私钥失败。"
 
 #: ../libnm-core/crypto.c:341 ../libnm-util/crypto.c:352
 #, c-format
@@ -7274,7 +7569,7 @@ msgstr "初始向量中包含非十六进制数字。"
 #: ../libnm-util/crypto_nss.c:162 ../libnm-util/crypto_nss.c:323
 #, c-format
 msgid "Private key cipher '%s' was unknown."
-msgstr "未知专用密钥密码“%s”。"
+msgstr "未知专用密钥密码 '%s'。"
 
 #: ../libnm-core/crypto.c:494 ../libnm-util/crypto.c:516
 #, c-format
@@ -7284,17 +7579,17 @@ msgstr "无法确定私钥类型。"
 #: ../libnm-core/crypto.c:502
 #, c-format
 msgid "Password provided, but key was not encrypted."
-msgstr "提供了密码，但密钥不加密。"
+msgstr "已提供密码，但密钥没有加密。"
 
 #: ../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: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:582 ../libnm-util/crypto.c:598
 #, c-format
@@ -7311,14 +7606,14 @@ msgid "Invalid IV length (must be at least %zd)."
 msgstr "无效初始向量长度(至少为为 %zd)。"
 
 #: ../libnm-core/crypto_gnutls.c:115 ../libnm-util/crypto_gnutls.c:175
-#, fuzzy, c-format
+#, c-format
 msgid "Failed to initialize the decryption cipher context: %s (%s)"
-msgstr "初始化解密计算内容失败：%s / %s。"
+msgstr "初始化解密计算内容失败：%s (%s)。"
 
 #: ../libnm-core/crypto_gnutls.c:124 ../libnm-util/crypto_gnutls.c:184
-#, fuzzy, c-format
+#, c-format
 msgid "Failed to decrypt the private key: %s (%s)"
-msgstr "解密私钥失败：%d。"
+msgstr "解密私钥失败：%s (%s)"
 
 #: ../libnm-core/crypto_gnutls.c:134 ../libnm-core/crypto_nss.c:202
 #: ../libnm-util/crypto_gnutls.c:194 ../libnm-util/crypto_nss.c:252
@@ -7333,14 +7628,14 @@ msgid "Failed to decrypt the private key."
 msgstr "解密私钥失败。"
 
 #: ../libnm-core/crypto_gnutls.c:224 ../libnm-util/crypto_gnutls.c:283
-#, fuzzy, c-format
+#, c-format
 msgid "Failed to initialize the encryption cipher context: %s (%s)"
-msgstr "初始化加密计算内容失败：%s / %s。"
+msgstr "初始化加密计算内容失败：%s (%s)。"
 
 #: ../libnm-core/crypto_gnutls.c:233 ../libnm-util/crypto_gnutls.c:292
-#, fuzzy, c-format
+#, c-format
 msgid "Failed to encrypt the data: %s (%s)"
-msgstr "发送数据失败，原因：%s"
+msgstr "加密数据失败：%s (%s)。"
 
 #: ../libnm-core/crypto_gnutls.c:276 ../libnm-util/crypto_gnutls.c:332
 #, c-format
@@ -7415,7 +7710,7 @@ msgstr "解密私钥失败：%d。"
 #: ../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 "解密私钥失败：解密后的数据太大。"
+msgstr "解密私钥失败：解密数据太大。"
 
 #: ../libnm-core/crypto_nss.c:191 ../libnm-util/crypto_nss.c:241
 #, c-format
@@ -7425,7 +7720,7 @@ msgstr "结束解密私钥失败：%d。"
 #: ../libnm-core/crypto_nss.c:299 ../libnm-util/crypto_nss.c:345
 #, c-format
 msgid "Failed to initialize the encryption cipher slot."
-msgstr "初始化加密计算插槽空间失败。"
+msgstr "初始化加密计算插槽失败。"
 
 #: ../libnm-core/crypto_nss.c:307 ../libnm-util/crypto_nss.c:353
 #, c-format
@@ -7460,7 +7755,7 @@ msgstr "无法解码证书：%d"
 #: ../libnm-core/crypto_nss.c:420
 #, c-format
 msgid "Password must be UTF-8"
-msgstr "密码必须是 UTF-8 编码"
+msgstr "密码必须是 UTF-8 格式"
 
 #: ../libnm-core/crypto_nss.c:450 ../libnm-util/crypto_nss.c:488
 #, c-format
@@ -7481,51 +7776,51 @@ msgstr "无法校验 PKCS#12 文件：%d"
 msgid "Could not generate random data."
 msgstr "无法生成随机数据。"
 
-#: ../libnm-core/nm-connection.c:225
+#: ../libnm-core/nm-connection.c:224
 msgid "wrong type; should be a list of strings."
-msgstr "错误类型；应该是一个字符串列表。"
+msgstr "错误的类型，应该是一个字符串列表。"
 
-#: ../libnm-core/nm-connection.c:295
+#: ../libnm-core/nm-connection.c:294
 msgid "unknown setting name"
 msgstr "未知的设置名称"
 
-#: ../libnm-core/nm-connection.c:307
-#, fuzzy
+#: ../libnm-core/nm-connection.c:306
 msgid "duplicate setting name"
-msgstr "复制模板名称"
+msgstr "重复的设置名称"
 
-#: ../libnm-core/nm-connection.c:905
+#: ../libnm-core/nm-connection.c:873
 msgid "setting not found"
-msgstr "找不到设置"
+msgstr "未找到设置"
 
-#: ../libnm-core/nm-connection.c:969
+#: ../libnm-core/nm-connection.c:937
 msgid "setting not allowed in slave connection"
-msgstr "在从属连接中不允许设置"
+msgstr "从连接中不允许设置"
 
-#: ../libnm-core/nm-connection.c:980
+#: ../libnm-core/nm-connection.c:948
 msgid "setting is required for non-slave connections"
-msgstr "非从属连接中需要设置"
+msgstr "对于非从连接，设置是必需的。"
 
-#: ../libnm-core/nm-connection.c:1074
+#: ../libnm-core/nm-connection.c:1042
 msgid "Unexpected failure to verify the connection"
-msgstr "验证连接意外失败"
+msgstr "检验连接意外地失败"
 
-#: ../libnm-core/nm-connection.c:1107
+#: ../libnm-core/nm-connection.c:1075
 msgid "Unexpected failure to normalize the connection"
-msgstr "标准化连接意外失败"
+msgstr "正常化连接意外地失败"
 
-#: ../libnm-core/nm-connection.c:1608 ../libnm-core/nm-setting-8021x.c:2411
+#: ../libnm-core/nm-connection.c:1576 ../libnm-core/nm-setting-8021x.c:2411
 #: ../libnm-core/nm-setting-8021x.c:2428 ../libnm-core/nm-setting-8021x.c:2459
 #: ../libnm-core/nm-setting-8021x.c:2476 ../libnm-core/nm-setting-8021x.c:2518
 #: ../libnm-core/nm-setting-8021x.c:2530 ../libnm-core/nm-setting-8021x.c:2548
 #: ../libnm-core/nm-setting-8021x.c:2560 ../libnm-core/nm-setting-8021x.c:2584
 #: ../libnm-core/nm-setting-8021x.c:2749 ../libnm-core/nm-setting-adsl.c:189
 #: ../libnm-core/nm-setting-bluetooth.c:120
-#: ../libnm-core/nm-setting-bluetooth.c:138 ../libnm-core/nm-setting-cdma.c:141
+#: ../libnm-core/nm-setting-bluetooth.c:138
+#: ../libnm-core/nm-setting-cdma.c:141
 #: ../libnm-core/nm-setting-connection.c:837
 #: ../libnm-core/nm-setting-connection.c:876
 #: ../libnm-core/nm-setting-connection.c:989
-#: ../libnm-core/nm-setting-ip-config.c:2186
+#: ../libnm-core/nm-setting-ip-config.c:2167
 #: ../libnm-core/nm-setting-olpc-mesh.c:120
 #: ../libnm-core/nm-setting-pppoe.c:142 ../libnm-core/nm-setting-vpn.c:419
 #: ../libnm-core/nm-setting-vxlan.c:360 ../libnm-core/nm-setting-wimax.c:126
@@ -7537,8 +7832,10 @@ msgstr "标准化连接意外失败"
 #: ../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-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
@@ -7554,9 +7851,9 @@ msgid "property is missing"
 msgstr "缺少属性"
 
 #: ../libnm-core/nm-dbus-utils.c:188
-#, fuzzy, c-format
+#, c-format
 msgid "Method returned type '%s', but expected '%s'"
-msgstr "方法%s%s%s类型不兼容"
+msgstr "方法返回类型 '%s'，但期望的是 '%s'"
 
 #: ../libnm-core/nm-keyfile-reader.c:136
 msgid "ignoring missing number"
@@ -7565,7 +7862,7 @@ msgstr "忽略缺失的数字"
 #: ../libnm-core/nm-keyfile-reader.c:145
 #, c-format
 msgid "ignoring invalid number '%s'"
-msgstr "忽略无效的数字 “%s”"
+msgstr "忽略无效的数字 '%s'"
 
 #: ../libnm-core/nm-keyfile-reader.c:165
 #, c-format
@@ -7573,9 +7870,9 @@ msgid "ignoring invalid %s address: %s"
 msgstr "忽略无效的 %s 地址：%s"
 
 #: ../libnm-core/nm-keyfile-reader.c:205
-#, fuzzy, c-format
+#, c-format
 msgid "ignoring invalid gateway '%s' for %s route"
-msgstr "无效网关 '%s'"
+msgstr "忽略 %s 路由的无效网关 '%s'"
 
 #: ../libnm-core/nm-keyfile-reader.c:225
 #, c-format
@@ -7585,53 +7882,53 @@ msgstr "忽略无效的 %s 路由：%s"
 #: ../libnm-core/nm-keyfile-reader.c:343
 #, c-format
 msgid "unexpected character '%c' for address %s: '%s' (position %td)"
-msgstr "意外字符 “%c”(地址 %s): “%s” (位置 %td)"
+msgstr "地址 %2$s: '%3$s' (位置 %4$td) 里意外的字符 '%1$c'"
 
 #: ../libnm-core/nm-keyfile-reader.c:353
 #, c-format
 msgid "unexpected character '%c' for %s: '%s' (position %td)"
-msgstr "意外字符 “%c” (%s): “%s” (位置 %td)"
+msgstr "%2$s: '%3$s' (位置 %4$td) 里意外的字符 '%1$c'"
 
 #: ../libnm-core/nm-keyfile-reader.c:362
 #, c-format
 msgid "unexpected character '%c' in prefix length for %s: '%s' (position %td)"
-msgstr "意外字符 “%c”(在 %s 的前缀长度中): “%s” (位置 %td)"
+msgstr "%2$s: '%3$s' (位置 %4$td) 的前缀长度里意外的字符 '%1$c'"
 
 #: ../libnm-core/nm-keyfile-reader.c:373
 #, c-format
 msgid "garbage at the end of value %s: '%s'"
-msgstr "在值 %s 的结尾有垃圾：“%s”"
+msgstr "值 %s: '%s' 结尾的无用信息"
 
 #: ../libnm-core/nm-keyfile-reader.c:379
 #, c-format
 msgid "deprecated semicolon at the end of value %s: '%s'"
-msgstr "在 %s 值结尾不赞成使用分号: “%s”"
+msgstr "值 %s: '%s' 结尾已舍弃的分号"
 
 #: ../libnm-core/nm-keyfile-reader.c:394
 #, c-format
 msgid "invalid prefix length for %s '%s', defaulting to %d"
-msgstr "%s “%s” 无效前缀长度，默认为 %d"
+msgstr "%s '%s' 的无效前缀长度，默认为 %d。"
 
 #: ../libnm-core/nm-keyfile-reader.c:401
 #, 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:504
 #, c-format
 msgid "ignoring invalid DNS server IPv4 address '%s'"
-msgstr "忽略无效的 DNS 服务器 IPv4 地址 “%s”"
+msgstr "忽略无效的 DNS 服务器 IPv4 地址 '%s'"
 
 #: ../libnm-core/nm-keyfile-reader.c:543
 #, c-format
 msgid "ignoring invalid DNS server IPv6 address '%s'"
-msgstr "忽略无效的 DNS 服务器 IPv6 地址 “%s”"
+msgstr "忽略无效的 DNS 服务器 IPv6 地址 '%s'"
 
 #: ../libnm-core/nm-keyfile-reader.c:628 ../libnm-core/nm-keyfile-reader.c:769
 #: ../libnm-core/nm-keyfile-reader.c:1446
 #, c-format
 msgid "ignoring invalid byte element '%d' (not between 0 and 255 inclusive)"
-msgstr "忽略无效字节元素 “%d”（不在 0 和 255 之间）"
+msgstr "忽略无效的字节元素 '%d'（不在 0 和 255 之间）"
 
 #: ../libnm-core/nm-keyfile-reader.c:642
 msgid "ignoring invalid MAC address"
@@ -7649,15 +7946,16 @@ msgstr "忽略无效的 SSID"
 msgid "ignoring invalid raw password"
 msgstr "忽略无效的原始密码"
 
-#: ../libnm-core/nm-keyfile-reader.c:892 ../libnm-core/nm-keyfile-reader.c:1058
+#: ../libnm-core/nm-keyfile-reader.c:892
+#: ../libnm-core/nm-keyfile-reader.c:1058
 #, c-format
 msgid "certificate or key file '%s' does not exist"
-msgstr "证书或密钥文件 “%s” 不存在"
+msgstr "证书或密钥文件 '%s' 不存在"
 
 #: ../libnm-core/nm-keyfile-reader.c:897
 #, c-format
 msgid "invalid key/cert value path \"%s\""
-msgstr "无效的密钥/证书值路径 “%s”"
+msgstr "无效的密钥/证书值路径 \"%s\""
 
 #: ../libnm-core/nm-keyfile-reader.c:935
 msgid "invalid key/cert value data:;base64, is not base64"
@@ -7669,7 +7967,7 @@ msgstr "无效的密钥/证书值数据:;base64，file://"
 
 #: ../libnm-core/nm-keyfile-reader.c:1095
 msgid "invalid key/cert value is not a valid blob"
-msgstr "无效的 key/cert 值是无效的 blob"
+msgstr "无效的密钥/证书值不是有效的 blob"
 
 #: ../libnm-core/nm-keyfile-reader.c:1100
 msgid "invalid key/cert value"
@@ -7678,12 +7976,12 @@ msgstr "无效的密钥/证书值"
 #: ../libnm-core/nm-keyfile-reader.c:1147
 #, c-format
 msgid "invalid parity value '%s'"
-msgstr "无效的奇偶校验值 “%s”"
+msgstr "无效的奇偶校验值 '%s'"
 
 #: ../libnm-core/nm-keyfile-reader.c:1347
 #, c-format
 msgid "error loading setting value: %s"
-msgstr "读取设定值出错：%s"
+msgstr "加载设置值出错：%s"
 
 #: ../libnm-core/nm-keyfile-reader.c:1379
 #, c-format
@@ -7693,27 +7991,27 @@ msgstr "无效的负值 (%i)"
 #: ../libnm-core/nm-keyfile-reader.c:1400
 #, c-format
 msgid "invalid char value (%i)"
-msgstr "无效字符值 (%i)"
+msgstr "无效的字符值 (%i)"
 
 #: ../libnm-core/nm-keyfile-reader.c:1423
 #, c-format
 msgid "invalid int64 value (%s)"
-msgstr "int64 值无效 (%s)"
+msgstr "无效的 int64 值 (%s)"
 
 #: ../libnm-core/nm-keyfile-reader.c:1482
 #, c-format
 msgid "too large FLAGS property '%s' (%llu)"
-msgstr "FLAGS 属性 “%s” (%llu) 太大"
+msgstr "过大的 FLAGS 属性 '%s' (%llu)"
 
 #: ../libnm-core/nm-keyfile-reader.c:1495
 #, c-format
 msgid "unhandled setting property type '%s'"
-msgstr "未处理的设置属性类型 “%s”"
+msgstr "未处理的设置属性类型 '%s'"
 
 #: ../libnm-core/nm-keyfile-reader.c:1526
 #, c-format
 msgid "invalid setting name '%s'"
-msgstr "设置名称无效 “%s”"
+msgstr "无效的设置名称 '%s'"
 
 #: ../libnm-core/nm-setting-8021x.c:414
 msgid "data missing"
@@ -7725,7 +8023,7 @@ msgstr "二进制数据缺失"
 
 #: ../libnm-core/nm-setting-8021x.c:465
 msgid "file:// URI not NUL terminated"
-msgstr "file:// URI 非 NUL 结尾"
+msgstr "file:// URI 不是以 NUL 结束的"
 
 #: ../libnm-core/nm-setting-8021x.c:474
 msgid "file:// URI is empty"
@@ -7733,11 +8031,11 @@ msgstr "file:// URI 为空"
 
 #: ../libnm-core/nm-setting-8021x.c:482
 msgid "file:// URI is not valid UTF-8"
-msgstr "file:// URI 为无效的 UTF-8 编码"
+msgstr "file:// URI 不是有效的 UTF-8"
 
 #: ../libnm-core/nm-setting-8021x.c:681 ../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:1012 ../libnm-core/nm-setting-8021x.c:1276
 #: ../libnm-core/nm-setting-8021x.c:1612 ../libnm-util/nm-setting-8021x.c:957
@@ -7747,11 +8045,11 @@ msgstr "无效的证书格式"
 
 #: ../libnm-core/nm-setting-8021x.c:1895 ../libnm-util/nm-setting-8021x.c:1812
 msgid "invalid private key"
-msgstr "无效的私钥"
+msgstr "无效的私有密钥"
 
 #: ../libnm-core/nm-setting-8021x.c:2207 ../libnm-util/nm-setting-8021x.c:2123
 msgid "invalid phase2 private key"
-msgstr "无效的第二阶段私钥"
+msgstr "无效的二阶段私有密钥"
 
 #: ../libnm-core/nm-setting-8021x.c:2418 ../libnm-core/nm-setting-8021x.c:2435
 #: ../libnm-core/nm-setting-8021x.c:2466 ../libnm-core/nm-setting-8021x.c:2483
@@ -7760,9 +8058,10 @@ msgstr "无效的第二阶段私钥"
 #: ../libnm-core/nm-setting-8021x.c:2591 ../libnm-core/nm-setting-adsl.c:196
 #: ../libnm-core/nm-setting-cdma.c:148 ../libnm-core/nm-setting-cdma.c:157
 #: ../libnm-core/nm-setting-connection.c:844
-#: ../libnm-core/nm-setting-connection.c:887 ../libnm-core/nm-setting-gsm.c:281
-#: ../libnm-core/nm-setting-gsm.c:338 ../libnm-core/nm-setting-gsm.c:375
-#: ../libnm-core/nm-setting-gsm.c:384 ../libnm-core/nm-setting-ip-config.c:2193
+#: ../libnm-core/nm-setting-connection.c:887
+#: ../libnm-core/nm-setting-gsm.c:281 ../libnm-core/nm-setting-gsm.c:338
+#: ../libnm-core/nm-setting-gsm.c:375 ../libnm-core/nm-setting-gsm.c:384
+#: ../libnm-core/nm-setting-ip-config.c:2174
 #: ../libnm-core/nm-setting-ip4-config.c:198
 #: ../libnm-core/nm-setting-ip4-config.c:205
 #: ../libnm-core/nm-setting-pppoe.c:149 ../libnm-core/nm-setting-pppoe.c:158
@@ -7778,8 +8077,9 @@ msgstr "无效的第二阶段私钥"
 #: ../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-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:170 ../libnm-util/nm-setting-pppoe.c:179
 #: ../libnm-util/nm-setting-vpn.c:432 ../libnm-util/nm-setting-vpn.c:442
@@ -7794,20 +8094,20 @@ msgstr "属性为空"
 #: ../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:2723
 #, c-format
 msgid "certificate is invalid: %s"
-msgstr "证书无效：%s"
+msgstr "证书是无效的：%s"
 
 #: ../libnm-core/nm-setting-8021x.c:2758
 #: ../libnm-core/nm-setting-bluetooth.c:129
 #: ../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:211
-#: ../libnm-core/nm-setting-ip6-config.c:222
+#: ../libnm-core/nm-setting-ip6-config.c:188
+#: ../libnm-core/nm-setting-ip6-config.c:199
 #: ../libnm-core/nm-setting-olpc-mesh.c:149
 #: ../libnm-core/nm-setting-wimax.c:144 ../libnm-core/nm-setting-wired.c:665
 #: ../libnm-core/nm-setting-wired.c:675
@@ -7845,61 +8145,63 @@ msgstr "属性无效"
 #: ../libnm-core/nm-setting-8021x.c:2783 ../libnm-core/nm-setting-8021x.c:2793
 #: ../libnm-core/nm-setting-8021x.c:2803 ../libnm-core/nm-setting-8021x.c:2813
 #: ../libnm-core/nm-setting-8021x.c:2823 ../libnm-core/nm-setting-adsl.c:208
-#: ../libnm-core/nm-setting-adsl.c:220 ../libnm-core/nm-setting-bluetooth.c:146
+#: ../libnm-core/nm-setting-adsl.c:220
+#: ../libnm-core/nm-setting-bluetooth.c:146
 #: ../libnm-core/nm-setting-wireless-security.c:870
 #: ../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-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-bluetooth.c:168
 #, c-format
 msgid "'%s' connection requires '%s' or '%s' setting"
-msgstr "“%s” 连接需要 “%s” 或 “%s” 设置"
+msgstr "'%s' 连接需要 '%s' 或者 '%s' 设置"
 
 #: ../libnm-core/nm-setting-bond.c:485 ../libnm-util/nm-setting-bond.c:502
 #, c-format
 msgid "invalid option '%s' or its value '%s'"
-msgstr "无效选项“%s”或值“%s”"
+msgstr "无效选项 '%s' 或其值 '%s'"
 
 #: ../libnm-core/nm-setting-bond.c:510 ../libnm-util/nm-setting-bond.c:521
 #, c-format
 msgid "only one of '%s' and '%s' can be set"
-msgstr "只能设置“%s”和“%s”中的一个"
+msgstr "只能设置 '%s' 和 '%s' 中的一个"
 
 #: ../libnm-core/nm-setting-bond.c:523 ../libnm-util/nm-setting-bond.c:532
 #, c-format
 msgid "mandatory option '%s' is missing"
-msgstr "缺少强制选项 “%s”"
+msgstr "缺少强制选项 '%s'"
 
 #: ../libnm-core/nm-setting-bond.c:533 ../libnm-util/nm-setting-bond.c:541
 #, c-format
 msgid "'%s' is not a valid value for '%s'"
-msgstr "“%s”不是“%s”的有效取值"
+msgstr "'%s' 不是 '%s' 的有效值"
 
 #: ../libnm-core/nm-setting-bond.c:547 ../libnm-util/nm-setting-bond.c:554
 #, 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:560 ../libnm-util/nm-setting-bond.c:567
 #, c-format
 msgid "'%s' is not a valid interface name for '%s' option"
-msgstr "“%s” 不是 “%s” 选项的有效接口名"
+msgstr "'%s' 不是 '%s' 选项的有效接口名"
 
 #: ../libnm-core/nm-setting-bond.c:570 ../libnm-util/nm-setting-bond.c:577
 #, 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:583 ../libnm-util/nm-setting-bond.c:590
 #, 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:596 ../libnm-core/nm-setting-bond.c:605
 #: ../libnm-core/nm-setting-bond.c:625 ../libnm-core/nm-setting-bond.c:661
@@ -7907,32 +8209,32 @@ msgstr "“%s=%s”不是“%s”的有效配置"
 #: ../libnm-util/nm-setting-bond.c:632 ../libnm-util/nm-setting-bond.c:668
 #, c-format
 msgid "'%s' option requires '%s' option to be set"
-msgstr "“%s” 选项需要设置 “%s” 选项"
+msgstr "'%s' 选项需要设置 '%s' 选项"
 
 #: ../libnm-core/nm-setting-bond.c:636 ../libnm-util/nm-setting-bond.c:643
 #, c-format
 msgid "'%s' option is empty"
-msgstr "“%s”选项为空"
+msgstr "'%s' 选项为空"
 
 #: ../libnm-core/nm-setting-bond.c:648 ../libnm-util/nm-setting-bond.c:655
 #, 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:676 ../libnm-util/nm-setting-bond.c:682
 #, c-format
 msgid "'%s' option is only valid with mode '%s'"
-msgstr "“%s” 选项仅对模式 “%s” 有效"
+msgstr "'%s' 选项只在 '%s' 模式里有效"
 
 #: ../libnm-core/nm-setting-bond.c:687
-#, fuzzy, c-format
+#, c-format
 msgid "'%s' and '%s' cannot have different values"
-msgstr "列表不能有默认值（键值 %s）。"
+msgstr "'%s' 和 '%s' 不能有不同的值"
 
 #: ../libnm-core/nm-setting-bond.c:703
 #, c-format
 msgid "'%s' option should be string"
-msgstr "“%s” 选项应该是字符串"
+msgstr "'%s' 选项应该为字符串"
 
 #: ../libnm-core/nm-setting-bridge-port.c:124
 #: ../libnm-core/nm-setting-bridge-port.c:136
@@ -7940,91 +8242,91 @@ msgstr "“%s” 选项应该是字符串"
 #: ../libnm-util/nm-setting-bridge-port.c:166
 #, c-format
 msgid "'%d' is not a valid value for the property (should be <= %d)"
-msgstr "“%d”不是该属性的有效取值(应 <= %d)"
+msgstr "'%d' 不是该属性有效值（应为 <= %d）"
 
 #: ../libnm-core/nm-setting-bridge-port.c:154
-#: ../libnm-core/nm-setting-team-port.c:109
+#: ../libnm-core/nm-setting-team-port.c:97
 #, c-format
 msgid "missing setting"
 msgstr "缺少设置"
 
 #: ../libnm-core/nm-setting-bridge-port.c:165
-#: ../libnm-core/nm-setting-team-port.c:120
+#: ../libnm-core/nm-setting-team-port.c:108
 #, c-format
 msgid ""
 "A connection with a '%s' setting must have the slave-type set to '%s'. "
 "Instead it is '%s'"
-msgstr "使用 “%s” 设置的连接必须将从属类型设置为 “%s”。相反，它是 “%s”"
+msgstr "具有 '%s' 设置的连接必须将 slave-type 设置为 '%s'。而它是 '%s'。"
 
 #: ../libnm-core/nm-setting-bridge.c:227 ../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:244 ../libnm-core/nm-setting-wired.c:639
 #: ../libnm-core/nm-setting-wired.c:699 ../libnm-core/nm-setting-wired.c:727
 #: ../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 地址"
+msgstr "不是有效 MAC 地址"
 
 #: ../libnm-core/nm-setting-connection.c:816
 #, c-format
 msgid "setting required for connection of type '%s'"
-msgstr "“%s”类型的连接需要设置"
+msgstr "类型为 '%s' 的连接要求的设置"
 
 #: ../libnm-core/nm-setting-connection.c:897
 #, c-format
 msgid "connection type '%s' is not valid"
-msgstr "连接类型 “%s” 无效"
+msgstr "连接类型 '%s' 无效"
 
 #: ../libnm-core/nm-setting-connection.c:932
 #: ../libnm-util/nm-setting-connection.c:877
 #, c-format
 msgid "Unknown slave type '%s'"
-msgstr "未知的从类型 “%s”"
+msgstr "未知的从类型 '%s'"
 
 #: ../libnm-core/nm-setting-connection.c:942
 #: ../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:963
 #: ../libnm-util/nm-setting-connection.c:897
 #, c-format
 msgid "Cannot set '%s' without '%s'"
-msgstr ""
+msgstr "没有 '%s' 无法设置 '%s'"
 
 #: ../libnm-core/nm-setting-connection.c:977
-#, fuzzy, c-format
+#, c-format
 msgid "metered value %d is not valid"
-msgstr "“%d”不是该属性的有效取值(应 <= %d)"
+msgstr "测量值 %d 无效"
 
 #: ../libnm-core/nm-setting-connection.c:998
 #, c-format
 msgid "property type should be set to '%s'"
-msgstr "属性类型应该设置为 “%s”"
+msgstr "属性类型应该设置为 '%s'"
 
 #: ../libnm-core/nm-setting-connection.c:1013
 #, c-format
 msgid "slave-type '%s' requires a '%s' setting in the connection"
-msgstr "在连接中从属类型 “%s” 需要 “%s” 设置"
+msgstr "slave-type '%s' 要求连接中有 '%s' 设置"
 
 #: ../libnm-core/nm-setting-connection.c:1023
 #, 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-dcb.c:522 ../libnm-util/nm-setting-dcb.c:594
 msgid "flags invalid"
-msgstr "标志无效"
+msgstr "标签无效"
 
 #: ../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:557 ../libnm-core/nm-setting-dcb.c:606
 #: ../libnm-util/nm-setting-dcb.c:629 ../libnm-util/nm-setting-dcb.c:678
@@ -8042,41 +8344,39 @@ msgstr "sum 不是 100%"
 #: ../libnm-core/nm-setting-dcb.c:615 ../libnm-core/nm-setting-dcb.c:647
 #: ../libnm-util/nm-setting-dcb.c:687 ../libnm-util/nm-setting-dcb.c:719
 msgid "property invalid"
-msgstr "属性无效"
+msgstr "无效属性"
 
 #: ../libnm-core/nm-setting-dcb.c:637 ../libnm-util/nm-setting-dcb.c:709
 msgid "property missing"
-msgstr "缺少属性"
+msgstr "缺少的属性"
 
 #: ../libnm-core/nm-setting-gsm.c:294 ../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:326 ../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:352 ../libnm-util/nm-setting-gsm.c:353
 #, c-format
 msgid "'%s' length is invalid (should be 5 or 6 digits)"
-msgstr "“%s”长度无效（应为5位或6位数）"
+msgstr "'%s' 长度无效（应为 5 或者 6 个数字）"
 
 #: ../libnm-core/nm-setting-gsm.c:397
-#, fuzzy
 msgid "property is empty or wrong size"
-msgstr "属性为空"
+msgstr "属性为空或大小错误"
 
 #: ../libnm-core/nm-setting-gsm.c:407
-#, fuzzy
 msgid "property must contain only digits"
-msgstr "设备属性 %1 必须包含 %2"
+msgstr "属性必须只包含数字"
 
 #: ../libnm-core/nm-setting-infiniband.c:217
 #: ../libnm-util/nm-setting-infiniband.c:231
 msgid "not a valid interface name"
-msgstr "不是有效的接口名称"
+msgstr "不是有效接口名"
 
 #: ../libnm-core/nm-setting-infiniband.c:225
 #: ../libnm-util/nm-setting-infiniband.c:239
@@ -8094,105 +8394,100 @@ msgstr "InfiniBand P_Key 连接未指定上级接口名"
 msgid ""
 "interface name of software infiniband device must be '%s' or unset (instead "
 "it is '%s')"
-msgstr "软件 infiniband 设备接口名称必须为 “%s” 或 unset (而不能是现在的 “%s”)"
+msgstr "软件 infiniband 设备的接口名必须为 '%s' 或未设置（相反它是 '%s'）"
 
 #: ../libnm-core/nm-setting-infiniband.c:286
 #, 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
 msgid "Missing IPv4 address"
-msgstr "缺少 IPv4 地址"
+msgstr "缺失 IPv4 地址"
 
 #: ../libnm-core/nm-setting-ip-config.c:133
 #, c-format
 msgid "Missing IPv6 address"
-msgstr "缺少 IPv6 地址"
+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:2206
+#: ../libnm-core/nm-setting-ip-config.c:2187
 #, c-format
 msgid "%d. DNS server address is invalid"
 msgstr "%d。DNS 服务器地址无效"
 
-#: ../libnm-core/nm-setting-ip-config.c:2222
+#: ../libnm-core/nm-setting-ip-config.c:2203
 #, c-format
 msgid "%d. IP address is invalid"
 msgstr "%d。IP 地址无效"
 
-#: ../libnm-core/nm-setting-ip-config.c:2234
+#: ../libnm-core/nm-setting-ip-config.c:2215
 #, c-format
 msgid "%d. IP address has 'label' property with invalid type"
-msgstr "%d。IP 地址无效类型的 “lable”(标签)属性"
+msgstr "%d。IP 地址有无效类型的 'label' 属性"
 
-#: ../libnm-core/nm-setting-ip-config.c:2243
+#: ../libnm-core/nm-setting-ip-config.c:2224
 #, 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:2257
+#: ../libnm-core/nm-setting-ip-config.c:2238
 msgid "gateway cannot be set if there are no addresses configured"
-msgstr "如果没有已配置的地址，无法设置网关"
+msgstr "如果没有配置地址，网关会无法设置。"
 
-#: ../libnm-core/nm-setting-ip-config.c:2266
+#: ../libnm-core/nm-setting-ip-config.c:2247
 msgid "gateway is invalid"
 msgstr "网关无效"
 
-#: ../libnm-core/nm-setting-ip-config.c:2280
+#: ../libnm-core/nm-setting-ip-config.c:2261
 #, c-format
 msgid "%d. route is invalid"
-msgstr "%d。路由无效"
+msgstr "%d。路由无效。"
 
-#: ../libnm-core/nm-setting-ip-config.c:2289
+#: ../libnm-core/nm-setting-ip-config.c:2270
 #, c-format
 msgid "%d. route cannot be a default route"
-msgstr "%d。不能是默认路由"
-
-#: ../libnm-core/nm-setting-ip-config.c:2300
-#, fuzzy, c-format
-msgid "a gateway is incompatible with '%s'"
-msgstr "错误：无效的网关地址“%s”\n"
+msgstr "%d。路由不能是默认路由"
 
 #: ../libnm-core/nm-setting-ip4-config.c:143
-#: ../libnm-core/nm-setting-ip6-config.c:167
+#: ../libnm-core/nm-setting-ip6-config.c:144
 #: ../libnm-util/nm-setting-ip4-config.c:879
 #: ../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:155
 #: ../libnm-core/nm-setting-ip4-config.c:165
 #: ../libnm-core/nm-setting-ip4-config.c:177
-#: ../libnm-core/nm-setting-ip6-config.c:179
-#: ../libnm-core/nm-setting-ip6-config.c:189
-#: ../libnm-core/nm-setting-ip6-config.c:199
+#: ../libnm-core/nm-setting-ip6-config.c:156
+#: ../libnm-core/nm-setting-ip6-config.c:166
+#: ../libnm-core/nm-setting-ip6-config.c:176
 #: ../libnm-util/nm-setting-ip4-config.c:891
 #: ../libnm-util/nm-setting-ip4-config.c:901
 #: ../libnm-util/nm-setting-ip4-config.c:913
@@ -8201,78 +8496,65 @@ msgstr "“%s=%s” 的这个属性不能为空"
 #: ../libnm-util/nm-setting-ip6-config.c:875
 #, c-format
 msgid "this property is not allowed for '%s=%s'"
-msgstr "此属性不允许用于“%s=%s”"
+msgstr "'%s=%s' 不允许使用这个属性"
 
 #: ../libnm-core/nm-setting-ip4-config.c:214
 #, c-format
 msgid "'%s' is not a valid FQDN"
-msgstr "“%s”不是有效的 FQDN"
+msgstr "'%s' 不是有效的 FQDN"
 
 #: ../libnm-core/nm-setting-ip4-config.c:223
 msgid "property cannot be set when dhcp-hostname is also set"
-msgstr ""
-
-#: ../libnm-core/nm-setting-ip6-config.c:237
-#, fuzzy
-msgid "value is not a valid token"
-msgstr "“%s” 的值不是有效的 UUID"
-
-#: ../libnm-core/nm-setting-ip6-config.c:248
-msgid "only makes sense with EUI64 address generation mode"
-msgstr ""
-
-#: ../libnm-core/nm-setting-ip6-config.c:260
-msgid "token is not in canonical form"
-msgstr ""
+msgstr "当设置了 dhcp-hostname 则不能设置属性"
 
 #: ../libnm-core/nm-setting-ip-tunnel.c:318
-#, fuzzy, c-format
+#, c-format
 msgid "'%d' is not a valid tunnel mode"
-msgstr "隧道模式："
+msgstr "'%d' 是无效的隧道模式"
 
 #: ../libnm-core/nm-setting-ip-tunnel.c:330
 #: ../libnm-core/nm-setting-macvlan.c:167 ../libnm-core/nm-setting-vlan.c:647
 #: ../libnm-core/nm-setting-vxlan.c:403 ../libnm-util/nm-setting-vlan.c:567
 #, c-format
 msgid "'%s' is neither an UUID nor an interface name"
-msgstr "“%s”不是 UUID 或接口名称"
+msgstr "'%s' 不是 UUID 也不是接口名"
 
 #: ../libnm-core/nm-setting-ip-tunnel.c:341
 #: ../libnm-core/nm-setting-ip-tunnel.c:352
-#, fuzzy, c-format
+#, c-format
 msgid "'%s' is not a valid IPv%c address"
-msgstr "“%s”不是有效的 IP%c 地址"
+msgstr "'%s' 不是有效的 IPv%c 地址"
 
 #: ../libnm-core/nm-setting-ip-tunnel.c:366
 msgid "tunnel keys can only be specified for GRE tunnels"
-msgstr ""
+msgstr "只能为 GRE 隧道指定隧道密钥"
 
 #: ../libnm-core/nm-setting-ip-tunnel.c:379
 #: ../libnm-core/nm-setting-ip-tunnel.c:395
-#, fuzzy, c-format
+#, c-format
 msgid "'%s' is not a valid tunnel key"
-msgstr "“%s”不是有效的 IBoIP P_Key"
+msgstr "'%s' 不是有效的频道密钥"
 
 #: ../libnm-core/nm-setting-ip-tunnel.c:407
 msgid "a fixed TTL is allowed only when path MTU discovery is enabled"
-msgstr ""
+msgstr "只有启用路径 MTU 发现时才允许固定的 TTL"
 
 #: ../libnm-core/nm-setting-macvlan.c:181 ../libnm-core/nm-setting-vlan.c:661
 #: ../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-macvlan.c:192
 msgid "non promiscuous operation is allowed only in passthru mode"
-msgstr ""
+msgstr "只有 passthru 模式才允许 non-promiscuous 操作"
 
 #: ../libnm-core/nm-setting-olpc-mesh.c:130
 #: ../libnm-core/nm-setting-wireless.c:739
 #: ../libnm-util/nm-setting-olpc-mesh.c:132
 #: ../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:139
 #: ../libnm-core/nm-setting-wireless.c:779
@@ -8280,87 +8562,87 @@ msgstr "SSID 长度超出范围<1-32>字节"
 #: ../libnm-util/nm-setting-wireless.c:818
 #, c-format
 msgid "'%d' is not a valid channel"
-msgstr "“%d”不是有效的信道"
+msgstr "'%d' 是无效频道"
 
 #: ../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: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-tun.c:187
 #, c-format
 msgid "'%u': invalid mode"
-msgstr "“%u”︰无效模式"
+msgstr "'%u'：无效模式"
 
 #: ../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:208
 #, c-format
 msgid "'%s': invalid group ID"
-msgstr "“%s”︰无效组 ID"
+msgstr "'%s'：无效的组 ID"
 
 #: ../libnm-core/nm-setting-vlan.c:636 ../libnm-util/nm-setting-vlan.c:556
 #, c-format
 msgid "'%s' value doesn't match '%s=%s'"
-msgstr "“%s”值与“%s=%s”不符"
+msgstr "'%s' 值与 '%s=%s' 不匹配"
 
 #: ../libnm-core/nm-setting-vlan.c:672 ../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:681 ../libnm-util/nm-setting-vlan.c:591
 msgid "flags are invalid"
-msgstr "标志无效"
+msgstr "标签无效"
 
 #: ../libnm-core/nm-setting-vpn.c:460
 #, c-format
 msgid "secret was empty"
-msgstr "密钥为空"
+msgstr "秘密（secret）为空"
 
 #: ../libnm-core/nm-setting-vpn.c:490
 msgid "setting contained a secret with an empty name"
-msgstr "设置包含了一个带空名称的密钥"
+msgstr "设置包含具有空名称的秘密"
 
 #: ../libnm-core/nm-setting-vpn.c:498
 #, c-format
 msgid "secret value was empty"
-msgstr "密钥数值为空"
+msgstr "秘密（secret）值为空"
 
 #: ../libnm-core/nm-setting-vpn.c:545 ../libnm-core/nm-setting.c:1784
 msgid "not a secret property"
-msgstr "不为一项密钥属性"
+msgstr "不是 secret 属性"
 
 #: ../libnm-core/nm-setting-vpn.c:551
 msgid "secret is not of correct type"
-msgstr "密钥类型不正确"
+msgstr "Secret 不是正确的类型"
 
 #: ../libnm-core/nm-setting-vpn.c:586
 #, c-format
 msgid "failed to convert value '%s' to uint"
-msgstr "转换数值 “%s” 到 uint 失败"
+msgstr "转换 '%s' 值为 uint 失败"
 
 #: ../libnm-core/nm-setting-vpn.c:594
 msgid "secret flags property not found"
-msgstr "secret 标志属性未找到"
+msgstr "未找到 Secret flags 属性"
 
 #: ../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-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:415
 #, c-format
@@ -8370,72 +8652,72 @@ msgstr "%d 大于本地端口最大值 %d"
 #: ../libnm-core/nm-setting-wired.c:619 ../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:629 ../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:688 ../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:709
 msgid "Wake-on-LAN mode 'default' and 'ignore' are exclusive flags"
-msgstr "网络唤醒模式 “default” 和 “ignore” 为排他性标志"
+msgstr "Wake-on-LAN 模式 'default' 和 'ignore' 是相互排斥的标记"
 
 #: ../libnm-core/nm-setting-wired.c:718
 msgid "Wake-on-LAN password can only be used with magic packet mode"
-msgstr "网络唤醒密码只能在魔法封包模式下使用"
+msgstr "Wake-on-LAN 密码只能用于 magic packet 模式"
 
 #: ../libnm-core/nm-setting-wireless-security.c:882
 #: ../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:903
 #: ../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:924
 #: ../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:979
 #: ../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:1009
 #: ../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.c:748
 #: ../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:758
 #: ../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:768
 #, c-format
 msgid "'%s' requires setting '%s' property"
-msgstr "“%s” 需要设置 “%s” 属性"
+msgstr "'%s' 需要设置 '%s' 属性"
 
 #: ../libnm-core/nm-setting.c:837
 #, c-format
@@ -8445,17 +8727,17 @@ msgstr "重复的属性"
 #: ../libnm-core/nm-setting.c:865 ../libnm-core/nm-setting.c:912
 #, c-format
 msgid "can't set property of type '%s' from value of type '%s'"
-msgstr "无法设置类型 “%s” 的属性(从类型为“%s”的值)"
+msgstr "无法从类型为 '%s' 的值设置类型为 '%s' 的属性"
 
 #: ../libnm-core/nm-setting.c:884 ../libnm-core/nm-setting.c:898
 #, c-format
 msgid "failed to set property: %s"
-msgstr "设置属性失败：%s"
+msgstr "设定属性失败：%s"
 
 #: ../libnm-core/nm-setting.c:926
 #, c-format
 msgid "can not set property: %s"
-msgstr "不能设置属性：%s"
+msgstr "无法设定属性：%s"
 
 #: ../libnm-core/nm-setting.c:942
 #, c-format
@@ -8464,192 +8746,169 @@ msgstr "未知属性"
 
 #: ../libnm-core/nm-setting.c:1682
 msgid "secret not found"
-msgstr "未找到密钥"
+msgstr "未找到 secret"
 
 #: ../libnm-core/nm-setting.c:1774
 msgid "secret is not set"
-msgstr "未设置密钥"
+msgstr "未设置 secret"
 
-#: ../libnm-core/nm-utils.c:2445
-#, fuzzy, c-format
+#: ../libnm-core/nm-utils.c:2447
+#, c-format
 msgid "failed stat file %s: %s"
-msgstr "%s：stat 失败：%s"
+msgstr "统计文件 %s 失败：%s"
 
-#: ../libnm-core/nm-utils.c:2454
+#: ../libnm-core/nm-utils.c:2456
 #, c-format
 msgid "not a file (%s)"
 msgstr "不是一个文件 (%s)"
 
-#: ../libnm-core/nm-utils.c:2465
-#, fuzzy, c-format
+#: ../libnm-core/nm-utils.c:2467
+#, c-format
 msgid "invalid file owner %d for %s"
-msgstr "file：无效文件（file）操作：%s"
+msgstr "%2$s 的无效文件所有者 %1$d"
 
-#: ../libnm-core/nm-utils.c:2476
-#, fuzzy, c-format
+#: ../libnm-core/nm-utils.c:2478
+#, c-format
 msgid "file permissions for %s"
-msgstr "设置%s 的权限"
+msgstr "%s 的文件权限"
 
-#: ../libnm-core/nm-utils.c:2486
+#: ../libnm-core/nm-utils.c:2488
 #, c-format
 msgid "reject %s"
 msgstr "拒绝 %s"
 
-#: ../libnm-core/nm-utils.c:2506
-#, fuzzy, c-format
+#: ../libnm-core/nm-utils.c:2508
+#, c-format
 msgid "path is not absolute (%s)"
-msgstr "“%1” 不是绝对路径。"
+msgstr "路径不是绝对路径 (%s)"
 
-#: ../libnm-core/nm-utils.c:2520
-#, fuzzy, c-format
+#: ../libnm-core/nm-utils.c:2522
+#, c-format
 msgid "Plugin file does not exist (%s)"
-msgstr "插件模块 %s 不存在"
+msgstr "插件文件不存在 (%s)"
 
-#: ../libnm-core/nm-utils.c:2528
-#, fuzzy, c-format
+#: ../libnm-core/nm-utils.c:2530
+#, c-format
 msgid "Plugin is not a valid file (%s)"
-msgstr "文件“%1”不是有效的 Qt 插件。"
+msgstr "插件不是有效的文件 (%s)"
 
-#: ../libnm-core/nm-utils.c:2538
-#, fuzzy, c-format
+#: ../libnm-core/nm-utils.c:2540
+#, c-format
 msgid "libtool archives are not supported (%s)"
-msgstr "全部支持的归档文件 ("
+msgstr "不支持 libtool 归档 (%s)"
 
-#: ../libnm-core/nm-utils.c:2620 ../libnm-util/nm-utils.c:1803
+#: ../libnm-core/nm-utils.c:2622 ../libnm-util/nm-utils.c:1815
 #, c-format
 msgid "Could not find \"%s\" binary"
-msgstr "找不到 “%s” 二进制"
+msgstr "无法找到 \"%s\" 二进制文件"
 
-#: ../libnm-core/nm-vpn-editor-plugin.c:296
-#, fuzzy, c-format
-msgid "cannot load plugin \"%s\": %s"
+#: ../libnm-core/nm-vpn-editor-plugin.c:124
+#, c-format
+msgid "cannot load plugin %s"
 msgstr "无法加载插件 %s"
 
-#: ../libnm-core/nm-vpn-editor-plugin.c:307
+#: ../libnm-core/nm-vpn-editor-plugin.c:150
 #, c-format
-msgid "failed to load nm_vpn_editor_plugin_factory() from %s (%s)"
-msgstr ""
+msgid "cannot load VPN plugin in '%s': missing plugin name"
+msgstr "无法在 '%s' 里加载 VPN 插件：缺少插件名称。"
 
-#: ../libnm-core/nm-vpn-editor-plugin.c:332
-#, fuzzy, c-format
-msgid "unknown error initializing plugin %s"
-msgstr "初始化插件时出错“%1”"
+#: ../libnm-core/nm-vpn-editor-plugin.c:157
+#, c-format
+msgid "cannot load VPN plugin in '%s': invalid service name"
+msgstr "无法在 '%s' 里加载 VPN 插件：无效的服务名称。"
 
-#: ../libnm-core/nm-vpn-editor-plugin.c:349
+#: ../libnm-core/nm-vpn-editor-plugin.c:173
 #, c-format
-msgid "cannot load VPN plugin in '%s': missing plugin name"
-msgstr ""
+msgid "unknown error initializing plugin %s"
+msgstr "初始化插件 %s 时出现未知错误"
 
-#: ../libnm-core/nm-vpn-editor-plugin.c:358
+#: ../libnm-core/nm-vpn-editor-plugin.c:185
 #, c-format
-msgid "cannot load VPN plugin in '%s': invalid service name"
-msgstr ""
+msgid "failed to load nm_vpn_editor_plugin_factory() from %s (%s)"
+msgstr "从 %s (%s) 加载 nm_vpn_editor_plugin_factory() 失败"
 
-#: ../libnm-core/nm-vpn-editor-plugin.c:501
+#: ../libnm-core/nm-vpn-editor-plugin.c:292
 #, c-format
 msgid "the plugin does not support import capability"
-msgstr ""
+msgstr "插件不支持导入功能"
 
-#: ../libnm-core/nm-vpn-editor-plugin.c:521
+#: ../libnm-core/nm-vpn-editor-plugin.c:312
 #, c-format
 msgid "the plugin does not support export capability"
-msgstr ""
+msgstr "插件不支持导出功能"
 
-#: ../libnm-core/nm-vpn-plugin-info.c:110
+#: ../libnm-core/nm-vpn-plugin-info.c:109
 #, c-format
 msgid "missing filename"
 msgstr "缺少文件名"
 
-#: ../libnm-core/nm-vpn-plugin-info.c:118
+#: ../libnm-core/nm-vpn-plugin-info.c:117
 #, c-format
 msgid "filename must be an absolute path (%s)"
-msgstr ""
+msgstr "文件名必须为绝对路径 (%s)"
 
-#: ../libnm-core/nm-vpn-plugin-info.c:127
-#, fuzzy, c-format
+#: ../libnm-core/nm-vpn-plugin-info.c:126
+#, c-format
 msgid "filename has invalid format (%s)"
-msgstr "%s“%s”的格式无效"
+msgstr "文件名具有无效的格式 (%s)"
 
-#: ../libnm-core/nm-vpn-plugin-info.c:450
+#: ../libnm-core/nm-vpn-plugin-info.c:383
 #, c-format
 msgid "there exists a conflicting plugin (%s) that has the same %s.%s value"
-msgstr ""
+msgstr "已存在冲突的具有相同 %s.%s 值的插件（%s）"
 
-#: ../libnm-core/nm-vpn-plugin-info.c:488
+#: ../libnm-core/nm-vpn-plugin-info.c:421
 #, c-format
 msgid "there exists a conflicting plugin with the same name (%s)"
-msgstr ""
+msgstr "已存在冲突的具有相同名称（%s）的插件"
 
-#: ../libnm-core/nm-vpn-plugin-info.c:1071
-#, fuzzy, c-format
+#: ../libnm-core/nm-vpn-plugin-info.c:740
+#, c-format
 msgid "missing \"plugin\" setting"
-msgstr "缺少插件"
+msgstr "缺少 \"plugin\" 设置"
 
-#: ../libnm-core/nm-vpn-plugin-info.c:1081
+#: ../libnm-core/nm-vpn-plugin-info.c:750
 #, c-format
 msgid "%s: don't retry loading plugin which already failed previously"
-msgstr ""
+msgstr "%s：不要重新加载之前已失败的插件"
 
-#: ../libnm-core/nm-vpn-plugin-info.c:1175
+#: ../libnm-core/nm-vpn-plugin-info.c:842
 msgid "missing filename to load VPN plugin info"
-msgstr ""
+msgstr "缺少文件名来加载 VPN 插件信息"
 
-#: ../libnm-core/nm-vpn-plugin-info.c:1187
-#, fuzzy
+#: ../libnm-core/nm-vpn-plugin-info.c:854
 msgid "missing name for VPN plugin info"
-msgstr "无法获取 VPN 插件信息"
+msgstr "缺少 VPN 插件信息的名称"
 
-#: ../libnm-core/nm-vpn-plugin-info.c:1196
-#, fuzzy
+#: ../libnm-core/nm-vpn-plugin-info.c:863
 msgid "missing service for VPN plugin info"
-msgstr "无法获取 VPN 插件信息"
+msgstr "缺少 VPN 插件信息的服务"
 
-#: ../libnm-glib/nm-device.c:1863 ../libnm/nm-device.c:1814
+#: ../libnm-glib/nm-device.c:1853 ../libnm/nm-device.c:1804
 msgid "Bluetooth"
 msgstr "蓝牙"
 
-#: ../libnm-glib/nm-device.c:1865 ../libnm/nm-device.c:1816
-msgid "OLPC Mesh"
-msgstr "OLPC Mesh"
-
-#: ../libnm-glib/nm-device.c:1867 ../libnm/nm-device.c:1818
-msgid "WiMAX"
-msgstr "WiMAX 参数"
-
-#: ../libnm-glib/nm-device.c:1881 ../libnm/nm-device.c:1832
-msgid "ADSL"
-msgstr "ADSL 参数"
-
-#: ../libnm-glib/nm-device.c:1883 ../libnm/nm-device.c:1834
-#, fuzzy
+#: ../libnm-glib/nm-device.c:1873 ../libnm/nm-device.c:1824
 msgid "MACVLAN"
-msgstr "MACVLAN 模式："
-
-#: ../libnm-glib/nm-device.c:1885 ../libnm/nm-device.c:1836
-msgid "VXLAN"
-msgstr "VXLAN 参数"
+msgstr "MACVLAN"
 
-#: ../libnm-glib/nm-device.c:1887 ../libnm/nm-device.c:1838
+#: ../libnm-glib/nm-device.c:1877 ../libnm/nm-device.c:1828
 msgid "IPTunnel"
-msgstr ""
-
-#: ../libnm-glib/nm-device.c:1889 ../libnm/nm-device.c:1840
-msgid "Tun"
-msgstr "Tun 参数"
+msgstr "IPTunnel"
 
-#: ../libnm-glib/nm-device.c:1891 ../libnm/nm-device.c:1842
+#: ../libnm-glib/nm-device.c:1881 ../libnm/nm-device.c:1832
 msgid "Veth"
-msgstr ""
+msgstr "Veth"
 
-#: ../libnm-glib/nm-device.c:1923 ../libnm/nm-device.c:1874
+#: ../libnm-glib/nm-device.c:1913 ../libnm/nm-device.c:1864
 msgid "Wired"
-msgstr "有线连接"
+msgstr "有线的"
 
-#: ../libnm-glib/nm-device.c:1954 ../libnm/nm-device.c:1905
+#: ../libnm-glib/nm-device.c:1944 ../libnm/nm-device.c:1895
 msgid "PCI"
 msgstr "PCI"
 
-#: ../libnm-glib/nm-device.c:1956 ../libnm/nm-device.c:1907
+#: ../libnm-glib/nm-device.c:1946 ../libnm/nm-device.c:1897
 msgid "USB"
 msgstr "USB"
 
@@ -8658,9 +8917,9 @@ msgstr "USB"
 #. * "Ethernet"). You can change this to something like
 #. * "%2$s (%1$s)" if there's no grammatical way to combine
 #. * the strings otherwise.
-#.
-#: ../libnm-glib/nm-device.c:2052 ../libnm-glib/nm-device.c:2071
-#: ../libnm/nm-device.c:2001 ../libnm/nm-device.c:2020
+#. 
+#: ../libnm-glib/nm-device.c:2042 ../libnm-glib/nm-device.c:2061
+#: ../libnm/nm-device.c:1991 ../libnm/nm-device.c:2010
 #, c-format
 msgctxt "long device name"
 msgid "%s %s"
@@ -8668,17 +8927,17 @@ msgstr "%s %s"
 
 #: ../libnm-glib/nm-remote-connection.c:149
 msgid "Disconnected by D-Bus"
-msgstr "由 D-Bus 断开"
+msgstr "被 D-Bus 断开"
 
 #: ../libnm-util/crypto_gnutls.c:84
 #, c-format
 msgid "Hash length too long (%d > %d)."
-msgstr ""
+msgstr "Hash 长度太常 (%d > %d)。"
 
 #: ../libnm-util/crypto_gnutls.c:115
-#, fuzzy, c-format
+#, 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
@@ -8693,70 +8952,70 @@ msgstr "无法将密码转换为 USC2 方式：%d"
 #: ../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-connection.c:862
 #, c-format
 msgid "requires presence of '%s' setting in the connection"
-msgstr "要求连接中存在“%s”设置"
+msgstr "需要在该连接中有 '%s' 设置"
 
 #: ../libnm-util/nm-setting-ip4-config.c:957
 #, c-format
 msgid "%d. IPv4 address is invalid"
-msgstr "%d。IPv4 地址无效"
+msgstr "%d。IPv4 地址无效。"
 
 #: ../libnm-util/nm-setting-ip4-config.c:967
 #, c-format
 msgid "%d. IPv4 address has invalid prefix"
-msgstr "%d。IPv4 地址前缀无效"
+msgstr "%d。IPv4 地址有无效前缀。"
 
 #: ../libnm-util/nm-setting-ip4-config.c:983
 #: ../libnm-util/nm-setting-ip6-config.c:936
 #, c-format
 msgid "%d. route has invalid prefix"
-msgstr "%d。路由前缀无效"
+msgstr "%d。路由有无效前缀。"
 
 #: ../libnm-util/nm-setting-ip6-config.c:910
 #, c-format
 msgid "%d. IPv6 address is invalid"
-msgstr "%d。IPv6 地址无效"
+msgstr "%d. IPv6 地址无效。"
 
 #: ../libnm-util/nm-setting-ip6-config.c:920
 #, c-format
 msgid "%d. IPv6 address has invalid prefix"
-msgstr "%d。IPv6 地址具有无效的前缀"
+msgstr "%d. IPv6 地址有无效前缀。"
 
 #: ../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:589
 #, c-format
 msgid "Secret flags property '%s' not found"
-msgstr "Secret 标志属性 “%s” 未找到"
+msgstr "未找到 Secret flags 属性 '%s'"
 
 #: ../libnm-util/nm-setting-wireless.c:807
 #, c-format
 msgid "requires setting '%s' property"
-msgstr "要求设置“%s”属性"
+msgstr "需要设置 '%s' 属性"
 
 #: ../libnm/nm-device-adsl.c:74
 msgid "The connection was not an ADSL connection."
-msgstr "此连接不是一个 ADSL 连接。"
+msgstr "这个连接不是一个 ADSL 连接。"
 
 #: ../libnm/nm-device-bond.c:112
 msgid "The connection was not a bond connection."
-msgstr "此连接不是一个绑定连接。"
+msgstr "这个连接不是一个 Bond 连接。"
 
 #: ../libnm/nm-device-bridge.c:112
 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:146
 msgid "Invalid device Bluetooth address."
@@ -8764,20 +9023,20 @@ msgstr "无效的设备蓝牙地址。"
 
 #: ../libnm/nm-device-bt.c:153
 msgid "The Bluetooth addresses of the device and the connection didn't match."
-msgstr "设备的蓝牙地址与连接不匹配。"
+msgstr "设备和连接的蓝牙地址不匹配。"
 
 #: ../libnm/nm-device-bt.c:162
 msgid ""
 "The device is lacking Bluetooth capabilities required by the connection."
-msgstr "该设备缺乏连接所需的蓝牙功能。"
+msgstr "设备缺少连接所要求的蓝牙功能。"
 
 #: ../libnm/nm-device-ethernet.c:207
 msgid "The connection was not an Ethernet or PPPoE connection."
-msgstr "此连接不是一个以太网或 PPPoE 连接。"
+msgstr "这个连接不是 Ethernet 或 PPPoE 连接。"
 
 #: ../libnm/nm-device-ethernet.c:222
 msgid "The connection and device differ in S390 subchannels."
-msgstr ""
+msgstr "连接和设备在 S390 子通道有所不同。"
 
 #: ../libnm/nm-device-ethernet.c:232 ../libnm/nm-device-infiniband.c:102
 #: ../libnm/nm-device-wifi.c:604 ../libnm/nm-device-wimax.c:326
@@ -8785,144 +9044,138 @@ msgid "Invalid device MAC address."
 msgstr "无效的设备 MAC 地址。"
 
 #: ../libnm/nm-device-ethernet.c:237
-#, fuzzy
 msgid "The MACs of the device and the connection do not match."
-msgstr "设备的 MAC 地址与连接不匹配。"
+msgstr "设备和连接的 MAC 地址不匹配。"
 
 #: ../libnm/nm-device-ethernet.c:247
-#, fuzzy, c-format
+#, c-format
 msgid "Invalid MAC in the blacklist: %s."
-msgstr "忽略无效的 MAC 地址"
+msgstr "黑名单里无效的 MAC 地址：%s。"
 
 #: ../libnm/nm-device-ethernet.c:253
-#, fuzzy, c-format
+#, c-format
 msgid "Device MAC (%s) is blacklisted by the connection."
-msgstr "设备“%s”不兼容连接“%s”"
+msgstr "设备 MAC（%s）别连接放入了黑名单。"
 
 #: ../libnm/nm-device-generic.c:91
 msgid "The connection was not a generic connection."
-msgstr "此连接不是一个通用连接。"
+msgstr "这个连接不是一个通用的连接。"
 
 #: ../libnm/nm-device-generic.c:98
 msgid "The connection did not specify an interface name."
-msgstr "连接未指定接口名称。"
+msgstr "这个连接未指定接口名。"
 
 #: ../libnm/nm-device-tun.c:209
-#, fuzzy
 msgid "The connection was not a tun connection."
-msgstr "TUN 连接"
+msgstr "这个连接不是一个 tun 连接。"
 
 #: ../libnm/nm-device-tun.c:218
-#, fuzzy
 msgid "The mode of the device and the connection didn't match"
-msgstr "设备的 MAC 地址与连接不匹配。"
+msgstr "设备和连接的模式不匹配"
 
 #: ../libnm/nm-device-infiniband.c:94
 msgid "The connection was not an InfiniBand connection."
-msgstr "此连接不是一个 InfiniBand 连接。"
+msgstr "这个连接不是一个 InfiniBand 连接。"
 
 #: ../libnm/nm-device-infiniband.c:110 ../libnm/nm-device-wifi.c:611
 #: ../libnm/nm-device-wimax.c:333
 msgid "The MACs of the device and the connection didn't match."
-msgstr "设备的 MAC 地址与连接不匹配。"
+msgstr "设备和连接的 MAC 地址不匹配。"
 
 #: ../libnm/nm-device-ip-tunnel.c:254
-#, fuzzy
 msgid "The connection was not an IP tunnel connection."
-msgstr "IP 隧道连接"
+msgstr "这个连接不是一个 IP 隧道连接。"
 
 #: ../libnm/nm-device-macvlan.c:159
-#, fuzzy
 msgid "The connection was not a MAC-VLAN connection."
-msgstr "此连接不是一个 VLAN 连接。"
+msgstr "这个连接不是一个 MAC-VLAN 连接。"
 
 #: ../libnm/nm-device-modem.c:120
 msgid "The connection was not a modem connection."
-msgstr "此连接不是一个调制解调器连接连接。"
+msgstr "这个连接不是一个调制解调器连接。"
 
 #: ../libnm/nm-device-modem.c:128
 msgid "The connection was not a valid modem connection."
-msgstr "此连接不是一个有效的调制解调器连接。"
+msgstr "这个连接不是一个有效的调制解调器连接。"
 
 #: ../libnm/nm-device-modem.c:135
 msgid "The device is lacking capabilities required by the connection."
-msgstr "该设备缺乏连接所需的功能。"
+msgstr "设备缺少连接所要求的功能。"
 
 #: ../libnm/nm-device-olpc-mesh.c:115
 msgid "The connection was not an OLPC Mesh connection."
-msgstr "此连接不是一个 OLPC 网格连接。"
+msgstr "这个连接不是一个 'OLPC Mesh' 连接。"
 
-#: ../libnm/nm-device-team.c:139
+#: ../libnm/nm-device-team.c:118
 msgid "The connection was not a team connection."
-msgstr "此连接不是一个群组连接。"
+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."
-msgstr "VLAN 设备标识符与连接不匹配。"
+msgstr "设备和连接的 VLAN 标识符不匹配。"
 
 #: ../libnm/nm-device-vlan.c:148
 msgid "The hardware address of the device and the connection didn't match."
-msgstr "设备的硬件地址与连接不匹配。"
+msgstr "设备和连接的硬件地址不匹配。"
 
 #: ../libnm/nm-device-vxlan.c:387
-#, fuzzy
 msgid "The connection was not a VXLAN connection."
-msgstr "VXLAN 连接"
+msgstr "这个连接不是 VXLAN 连接。"
 
 #: ../libnm/nm-device-vxlan.c:394
-#, fuzzy
 msgid "The VXLAN identifiers of the device and the connection didn't match."
-msgstr "VLAN 设备标识符与连接不匹配。"
+msgstr "设备和连接的 VXLAN 标识符不匹配。"
 
 #: ../libnm/nm-device-wifi.c:595
 msgid "The connection was not a Wi-Fi connection."
-msgstr "此连接不是一个 Wi-Fi 连接。"
+msgstr "这个连接不是一个 Wi-Fi 连接。"
 
 #: ../libnm/nm-device-wifi.c:631
 msgid "The device is lacking WPA capabilities required by the connection."
-msgstr "该设备缺乏由连接所需 WPA 功能。"
+msgstr "设备缺少连接所要求的 WPA 功能"
 
 #: ../libnm/nm-device-wifi.c:638
-msgid "The device is lacking WPA2/RSN capabilities required by the connection."
-msgstr "该设备缺乏由连接所需 WPA2/RSN 功能。"
+msgid ""
+"The device is lacking WPA2/RSN capabilities required by the connection."
+msgstr "设备缺少连接所要求的 WPA2/RSN 功能"
 
 #: ../libnm/nm-device-wimax.c:317
 msgid "The connection was not a WiMAX connection."
-msgstr "此连接不是一个 WiMAX 连接。"
+msgstr "这个连接不是 WiMAX 连接。"
 
-#: ../libnm/nm-device.c:2739
+#: ../libnm/nm-device.c:2729
 #, c-format
 msgid "The connection was not valid: %s"
-msgstr "此连接无效：%s"
+msgstr "连接无效：%s"
 
-#: ../libnm/nm-device.c:2748
+#: ../libnm/nm-device.c:2738
 #, c-format
 msgid "The interface names of the device and the connection didn't match."
-msgstr "设备的接口名称与连接不匹配。"
+msgstr "这个设备的接口名和连接不匹配。"
 
-#: ../libnm/nm-manager.c:867
+#: ../libnm/nm-manager.c:874
 msgid "Active connection could not be attached to the device"
-msgstr "活动连接无法连接到设备"
+msgstr "活动连接无法附加到设备上"
 
-#: ../libnm/nm-manager.c:1091
+#: ../libnm/nm-manager.c:1098
 msgid "Active connection removed before it was initialized"
-msgstr "在它初始化之前，删除活动连接"
+msgstr "活动连接在初始化之前无法被删除"
 
 #: ../libnm/nm-object.c:1545 ../libnm/nm-object.c:1691
 msgid "Caller did not specify D-Bus path for object"
-msgstr "访问者无法指定 D-Bus 路径或者对象"
+msgstr "调用者没有指定对象的 D-Bus 路径"
 
 #: ../libnm/nm-remote-settings.c:261
 msgid "Connection removed before it was initialized"
-msgstr "在它初始化之前，连接删除"
+msgstr "连接在初始化之前被删除"
 
 #: ../libnm/nm-vpn-plugin-old.c:957 ../libnm/nm-vpn-service-plugin.c:978
 msgid "No service name specified"
-msgstr "未指定服务名称"
+msgstr "未指定服务"
 
 #: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:1
 msgid "Enable or disable system networking"
@@ -8933,269 +9186,264 @@ msgid "System policy prevents enabling or disabling system networking"
 msgstr "系统策略阻止启用或禁用系统网络"
 
 #: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:3
-#, fuzzy
-msgid "Reload NetworkManager configuration"
-msgstr "输出网络管理器配置并退出"
-
-#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:4
-#, fuzzy
-msgid "System policy prevents reloading NetworkManager"
-msgstr "系统策略阻止启用或禁用系统网络"
-
-#: ../policy/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 "挂起或唤醒 NetworkManager (应仅用于系统电源管理)"
 
-#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:6
+#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:4
 msgid "System policy prevents putting NetworkManager to sleep or waking it up"
-msgstr "系统策略阻止挂起或唤醒网络管理器"
+msgstr "系统策略阻止挂起或唤醒 NetworkManager"
 
-#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:7
+#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:5
 msgid "Enable or disable WiFi devices"
 msgstr "启用或禁用 WiFi 设备"
 
-#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:8
+#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:6
 msgid "System policy prevents enabling or disabling WiFi devices"
 msgstr "系统策略阻止启用或禁用 WiFi 设备"
 
-#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:9
+#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:7
 msgid "Enable or disable mobile broadband devices"
 msgstr "启用或禁用移动宽带设备"
 
-#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:10
+#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:8
 msgid "System policy prevents enabling or disabling mobile broadband devices"
 msgstr "系统策略阻止启用或禁用移动宽带设备"
 
-#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:11
+#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:9
 msgid "Enable or disable WiMAX mobile broadband devices"
-msgstr "启用/禁用 WiMAX 移动宽带设备"
+msgstr "启用或者禁用 WiMAX 移动宽带设备"
 
-#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:12
+#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:10
 msgid ""
 "System policy prevents enabling or disabling WiMAX mobile broadband devices"
-msgstr "系统策略阻止启用或禁用 WiMAX 移动宽带设备"
+msgstr "阻止启用或禁用 WiMAX 移动宽带设备的系统策略"
 
-#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:13
+#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:11
 msgid "Allow control of network connections"
 msgstr "允许控制网络连接"
 
-#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:14
+#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:12
 msgid "System policy prevents control of network connections"
 msgstr "系统策略阻止更改网络连接"
 
-#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:15
+#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:13
 msgid "Connection sharing via a protected WiFi network"
 msgstr "通过受保护的 WiFi 网络共享连接"
 
-#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:16
-msgid "System policy prevents sharing connections via a protected WiFi network"
+#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:14
+msgid ""
+"System policy prevents sharing connections via a protected WiFi network"
 msgstr "系统策略阻止使用受保护的 WiFi 网络共享连接"
 
-#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:17
+#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:15
 msgid "Connection sharing via an open WiFi network"
-msgstr "通过开放 WiFi 网络共享连接"
+msgstr "通过公开 WiFi 网络共享连接"
 
-#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:18
+#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:16
 msgid "System policy prevents sharing connections via an open WiFi network"
-msgstr "系统策略阻止使用开放 WiFi 网络共享连接"
+msgstr "系统策略阻止使用公开 WiFi 网络共享连接"
 
-#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:19
+#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:17
 msgid "Modify personal network connections"
-msgstr "更改个人网络连接"
+msgstr "修改个人网络连接"
 
-#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:20
+#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:18
 msgid "System policy prevents modification of personal network settings"
-msgstr "系统策略阻止更改个人网络设置"
+msgstr "防止修改个人网络设置的系统策略"
 
-#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:21
+#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:19
 msgid "Modify network connections for all users"
-msgstr "更改所有用户的网络连接"
+msgstr "为所有用户修改网络连接"
 
-#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:22
+#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:20
 msgid "System policy prevents modification of network settings for all users"
-msgstr "系统策略阻止更改全部用户的共用网络设置"
+msgstr "系统策略防止为所有用户修改网络设置"
 
-#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:23
+#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:21
 msgid "Modify persistent system hostname"
 msgstr "更改系统固有主机名"
 
-#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:24
+#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:22
 msgid "System policy prevents modification of the persistent system hostname"
 msgstr "系统策略阻止更改系统固有主机名"
 
-#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:25
+#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:23
 msgid "Modify persistent global DNS configuration"
-msgstr ""
+msgstr "修改持久性全局 DNS 配置"
 
-#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:26
-#, fuzzy
+#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:24
 msgid ""
 "System policy prevents modification of the persistent global DNS "
 "configuration"
-msgstr "系统策略阻止更改系统固有主机名"
+msgstr "系统策略阻止更改持久性全局 DNS 配置"
 
-#: ../shared/nm-utils/nm-shared-utils.c:185
-#, fuzzy, c-format
+#: ../shared/nm-shared-utils.c:208
+#, c-format
 msgid "object class '%s' has no property named '%s'"
-msgstr "类‘%s’没有名为‘%s’的方法能够匹配签字‘%s’"
+msgstr "对象类 '%s' 没有名为 '%s' 的属性"
 
-#: ../shared/nm-utils/nm-shared-utils.c:192
-#, fuzzy, c-format
+#: ../shared/nm-shared-utils.c:215
+#, c-format
 msgid "property '%s' of object class '%s' is not writable"
-msgstr "无法创建目标类“%s”：不支持"
+msgstr "对象类 '%s' 的 '%s' 属性是不可写的"
 
-#: ../shared/nm-utils/nm-shared-utils.c:199
+#: ../shared/nm-shared-utils.c:222
 #, c-format
 msgid ""
 "construct property \"%s\" for object '%s' can't be set after construction"
-msgstr ""
+msgstr "对象 '%s' 的构造属性 \"%s\" 在构造后不能被设置"
 
-#: ../shared/nm-utils/nm-shared-utils.c:207
-#, fuzzy, c-format
+#: ../shared/nm-shared-utils.c:230
+#, c-format
 msgid "'%s::%s' is not a valid property name; '%s' is not a GObject subtype"
-msgstr "错误：无效属性：%s，也不是有效的设置名称。\n"
+msgstr "'%s::%s' 不是有效的属性名，'%s' 不是 GObject 子类型。"
 
-#: ../shared/nm-utils/nm-shared-utils.c:216
-#, fuzzy, c-format
+#: ../shared/nm-shared-utils.c:239
+#, c-format
 msgid "unable to set property '%s' of type '%s' from value of type '%s'"
-msgstr "无法设置类型 “%s” 的属性(从类型为“%s”的值)"
+msgstr "无法从类型 '%s' 的值设置类型为 '%s' 的属性 '%s'"
 
-#: ../shared/nm-utils/nm-shared-utils.c:227
+#: ../shared/nm-shared-utils.c:250
 #, c-format
 msgid ""
 "value \"%s\" of type '%s' is invalid or out of range for property '%s' of "
 "type '%s'"
-msgstr ""
+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:112
+#: ../src/NetworkManagerUtils.c:111
 #, c-format
 msgctxt "connection id fallback"
 msgid "%s %d"
 msgstr "%s %d"
 
-#: ../src/main.c:165 ../src/main.c:300
-#, fuzzy, c-format
+#: ../src/main.c:220 ../src/main.c:358
+#, c-format
 msgid "Failed to read configuration: %s\n"
-msgstr "fts_read 失败：%s"
+msgstr "读取配置失败：%s\n"
 
 #. Logging/debugging
-#: ../src/main.c:179 ../src/nm-iface-helper.c:298
+#: ../src/main.c:234 ../src/nm-iface-helper.c:298
 msgid "Print NetworkManager version and exit"
-msgstr "输出网络管理器版本并退出"
+msgstr "显示 NetworkManager 版本并退出"
 
-#: ../src/main.c:180 ../src/nm-iface-helper.c:299
+#: ../src/main.c:235 ../src/nm-iface-helper.c:299
 msgid "Don't become a daemon"
-msgstr "不成为守护进程"
+msgstr "不要成为守护进程"
 
-#: ../src/main.c:181 ../src/nm-iface-helper.c:301
+#: ../src/main.c:236 ../src/nm-iface-helper.c:301
 #, c-format
 msgid "Log level: one of [%s]"
-msgstr "日志级别：取 [%s] 之一"
+msgstr "日志等级: [%s] 之一"
 
-#: ../src/main.c:183 ../src/nm-iface-helper.c:303
+#: ../src/main.c:238 ../src/nm-iface-helper.c:303
 #, c-format
 msgid "Log domains separated by ',': any combination of [%s]"
-msgstr "以 “,” 分开的日志域：可以是 [%s] 的任意组合"
+msgstr "以 ',' 分开的日志域：可以是 [%s] 的任意组合"
 
-#: ../src/main.c:185 ../src/nm-iface-helper.c:305
+#: ../src/main.c:240 ../src/nm-iface-helper.c:305
 msgid "Make all warnings fatal"
-msgstr "视所有警告为致命错误"
+msgstr "置所有警告为致命错误"
 
-#: ../src/main.c:186
+#: ../src/main.c:241
 msgid "Specify the location of a PID file"
-msgstr "指定一个 PID 文件的位置"
+msgstr "指定 PID 文件位置"
+
+#: ../src/main.c:242
+msgid "State file location"
+msgstr "状态文件位置"
 
-#: ../src/main.c:188
+#: ../src/main.c:244
 msgid "Print NetworkManager configuration and exit"
-msgstr "输出网络管理器配置并退出"
+msgstr "打印 NetworkManager 配置并退出"
 
-#: ../src/main.c:198
+#: ../src/main.c:254
 msgid ""
 "NetworkManager monitors all network connections and automatically\n"
 "chooses the best connection to use.  It also allows the user to\n"
 "specify wireless access points which wireless cards in the computer\n"
 "should associate with."
-msgstr ""
-"网络管理器监视所有网络连接，并自动选择要使用的最佳连接。\n"
-"它还允许用户指定计算机无线网卡连接的无线访问点。"
+msgstr "NetworkManager 监控所有网络连接并自动\n"
+"选择最佳连接使用。它还可让用户\n"
+"指定无线连接点，即计算机中\n"
+"应与之关联的无线网卡。"
 
-#: ../src/main.c:285 ../src/main-utils.c:270 ../src/nm-iface-helper.c:393
+#: ../src/main.c:343 ../src/main-utils.c:269 ../src/nm-iface-helper.c:393
 #, c-format
 msgid "%s.  Please use --help to see a list of valid options.\n"
 msgstr "%s。请使用 --help 查看有效选项列表。\n"
 
-#: ../src/main.c:290 ../src/nm-iface-helper.c:398
+#: ../src/main.c:348 ../src/nm-iface-helper.c:398
 #, c-format
 msgid "Ignoring unrecognized log domain(s) '%s' passed on command line.\n"
-msgstr "正在忽略传给命令行的未识别日志域“%s”\n"
+msgstr "忽略命令行中给出的无法识别的日志域 '%s'。\n"
 
-#: ../src/main.c:315
+#: ../src/main.c:373
 #, c-format
 msgid "Error in configuration file: %s.\n"
-msgstr "配置文件有错误：%s。\n"
+msgstr "配置文件出错：%s。\n"
 
-#: ../src/main.c:320
+#: ../src/main.c:378
 #, c-format
 msgid "Ignoring unrecognized log domain(s) '%s' from config files.\n"
-msgstr "正在忽略来自配置文件的未识别日志域“%s”。\n"
+msgstr "忽略配置文件中无法识别的日志域 '%s'。\n"
 
-#: ../src/main.c:331 ../src/nm-iface-helper.c:408
+#: ../src/main.c:389 ../src/nm-iface-helper.c:408
 #, c-format
 msgid "Could not daemonize: %s [error %u]\n"
-msgstr "无法设为守护进程：%s [错误 %u]\n"
+msgstr "无法守护进程化：%s [error %u]\n"
 
-#: ../src/main-utils.c:98
+#: ../src/main-utils.c:99
 #, c-format
 msgid "Opening %s failed: %s\n"
 msgstr "打开 %s 失败：%s\n"
 
-#: ../src/main-utils.c:104
+#: ../src/main-utils.c:105
 #, c-format
 msgid "Writing to %s failed: %s\n"
 msgstr "写入 %s 失败：%s\n"
 
-#: ../src/main-utils.c:109
+#: ../src/main-utils.c:110
 #, c-format
 msgid "Closing %s failed: %s\n"
 msgstr "关闭 %s 失败：%s\n"
 
-#: ../src/main-utils.c:144
+#: ../src/main-utils.c:145
 #, c-format
 msgid "Cannot create '%s': %s"
-msgstr "无法创建“%s”：%s"
+msgstr "无法创建 '%s'：%s"
 
-#: ../src/main-utils.c:196
+#: ../src/main-utils.c:197
 #, c-format
 msgid "%s is already running (pid %ld)\n"
 msgstr "%s 已在运行中 (pid %ld)\n"
 
-#: ../src/main-utils.c:206
+#: ../src/main-utils.c:207
 #, c-format
 msgid "You must be root to run %s!\n"
-msgstr ""
-"您必须以 root 用户身份运行 %s\n"
-"！\n"
+msgstr "运行 %s 必须是根用户！\n"
 
-#: ../src/dhcp-manager/nm-dhcp-dhclient-utils.c:214
+#: ../src/dhcp-manager/nm-dhcp-dhclient-utils.c:213
 msgid "# Created by NetworkManager\n"
 msgstr "# 由 NetworkManger 创建\n"
 
-#: ../src/dhcp-manager/nm-dhcp-dhclient-utils.c:222
+#: ../src/dhcp-manager/nm-dhcp-dhclient-utils.c:220
 #, c-format
-msgid ""
-"# Merged from %s\n"
+msgid "# Merged from %s\n"
 "\n"
-msgstr ""
-"# 合并自 %s\n"
+msgstr "# 合并自 %s\n"
 "\n"
 
-#: ../src/devices/bluetooth/nm-bluez-device.c:200
+#: ../src/devices/adsl/nm-device-adsl.c:133
+msgid "ADSL connection"
+msgstr "ADSL 连接"
+
+#: ../src/devices/bluetooth/nm-bluez-device.c:197
 #, c-format
 msgid "%s Network"
 msgstr "%s 网络"
@@ -9206,38 +9454,38 @@ msgstr "PAN 已请求，但蓝牙设备不支持 NAP"
 
 #: ../src/devices/bluetooth/nm-device-bt.c:263
 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:276
 msgid "PAN connection"
-msgstr "个人局域网 (PAN) 连接"
+msgstr "PAN 连接"
 
 #: ../src/devices/bluetooth/nm-device-bt.c:283
 msgid "DUN requested, but Bluetooth device does not support DUN"
-msgstr "DUN 已请求，但蓝牙设备不支持 DUN"
+msgstr "DUN 已请求，但 Bluetooth 设备不支持 DUN"
 
 #: ../src/devices/bluetooth/nm-device-bt.c:293
 msgid "DUN connection must include a GSM or CDMA setting"
-msgstr "DUN 连接必须包含一个 GSM 或 CDMA 设置"
+msgstr "DUN 连接必须包含 GSM 或 CDMA 设置"
 
 #: ../src/devices/bluetooth/nm-device-bt.c:303
-#: ../src/devices/wwan/nm-modem-broadband.c:687
+#: ../src/devices/wwan/nm-modem-broadband.c:655
 msgid "GSM connection"
 msgstr "GSM 连接"
 
 #: ../src/devices/bluetooth/nm-device-bt.c:307
-#: ../src/devices/wwan/nm-modem-broadband.c:711
+#: ../src/devices/wwan/nm-modem-broadband.c:679
 msgid "CDMA connection"
 msgstr "CDMA 连接"
 
 #: ../src/devices/bluetooth/nm-device-bt.c:315
 msgid "Unknown/unhandled Bluetooth connection type"
-msgstr "未知/未处理的蓝牙连接类型"
+msgstr "未知的/未处理的蓝牙连接类型"
 
 #: ../src/devices/bluetooth/nm-device-bt.c:336
-#: ../src/devices/nm-device-ethernet.c:1421
+#: ../src/devices/nm-device-ethernet.c:1415
 #: ../src/devices/nm-device-infiniband.c:193
-#: ../src/devices/wifi/nm-device-wifi.c:875
+#: ../src/devices/wifi/nm-device-wifi.c:872
 msgid "connection does not match device"
 msgstr "连接不匹配设备"
 
@@ -9247,26 +9495,30 @@ msgstr "绑定连接"
 
 #: ../src/devices/nm-device-bridge.c:111
 msgid "Bridge connection"
-msgstr "桥式连接"
+msgstr "桥接连接"
 
-#: ../src/devices/nm-device-ethernet.c:1402
+#: ../src/devices/nm-device-ethernet.c:1396
 msgid "PPPoE connection"
 msgstr "PPPoE 连接"
 
-#: ../src/devices/nm-device-ethernet.c:1402
+#: ../src/devices/nm-device-ethernet.c:1396
 msgid "Wired connection"
 msgstr "有线连接"
 
-#: ../src/devices/nm-device-ethernet-utils.c:36
+#: ../src/devices/nm-device-ethernet-utils.c:39
 #, c-format
 msgid "Wired connection %d"
 msgstr "有线连接 %d"
 
-#: ../src/devices/nm-device-ip-tunnel.c:347
+#: ../src/devices/nm-device-infiniband.c:175
+msgid "InfiniBand connection"
+msgstr "InfiniBand 连接"
+
+#: ../src/devices/nm-device-ip-tunnel.c:346
 msgid "IP tunnel connection"
 msgstr "IP 隧道连接"
 
-#: ../src/devices/nm-device-macvlan.c:436
+#: ../src/devices/nm-device-macvlan.c:435
 msgid "MACVLAN connection"
 msgstr "MACVLAN 连接"
 
@@ -9274,142 +9526,150 @@ msgstr "MACVLAN 连接"
 msgid "TUN connection"
 msgstr "TUN 连接"
 
-#: ../src/devices/team/nm-device-team.c:121
+#: ../src/devices/nm-device-vlan.c:457
+msgid "VLAN connection"
+msgstr "VLAN 连接"
+
+#: ../src/devices/nm-device-vxlan.c:373
+msgid "VXLAN connection"
+msgstr "VXLAN 连接"
+
+#: ../src/devices/team/nm-device-team.c:115
 msgid "Team connection"
-msgstr "组队连接"
+msgstr "Team 连接"
 
 #: ../src/devices/wifi/nm-device-olpc-mesh.c:146
 msgid "Mesh"
-msgstr "网格"
+msgstr "Mesh"
 
-#: ../src/devices/wifi/nm-device-wifi.c:842
+#: ../src/devices/wifi/nm-device-wifi.c:839
 msgid "WPA Ad-Hoc disabled due to kernel bugs"
-msgstr "WPA Ad-Hoc 由于内核缺陷被禁用"
+msgstr "由于内核程序错误禁用了 WPA Ad-Hoc"
 
 #: ../src/devices/wifi/nm-wifi-ap-utils.c:42
 #, c-format
 msgid "%s is incompatible with static WEP keys"
-msgstr "%s 与静态 WEP 密钥不兼容"
+msgstr "%s 不兼容静态 WEP 密钥"
 
 #: ../src/devices/wifi/nm-wifi-ap-utils.c:76
 msgid "LEAP authentication requires a LEAP username"
-msgstr "LEAP 验证需要 LEAP 用户名"
+msgstr "LEAP 验证要求 LEAP 用户名"
 
 #: ../src/devices/wifi/nm-wifi-ap-utils.c:86
 msgid "LEAP username requires 'leap' authentication"
-msgstr "LEAP 用户名需要 “leap” 验证"
+msgstr "LEAP 用户名要求 'leap' 验证"
 
 #: ../src/devices/wifi/nm-wifi-ap-utils.c:99
 msgid "LEAP authentication requires IEEE 802.1x key management"
-msgstr "LEAP 验证需要 IEEE 802.1x 密钥管理"
+msgstr "LEAP 验证要求 IEEE 802.1x 密钥管理"
 
 #: ../src/devices/wifi/nm-wifi-ap-utils.c:119
 msgid "LEAP authentication is incompatible with Ad-Hoc mode"
-msgstr "LEAP 验证与 Ad-Hoc 模式不兼容"
+msgstr "LEAP 验证和 Ad-Hoc 模式不兼容"
 
 #: ../src/devices/wifi/nm-wifi-ap-utils.c:131
 msgid "LEAP authentication is incompatible with 802.1x setting"
-msgstr "LEAP 验证与 802.1x 设置不兼容"
+msgstr "LEAP 验证和 802.1x 设置不兼容"
 
 #: ../src/devices/wifi/nm-wifi-ap-utils.c:153
 #, c-format
 msgid "a connection using '%s' authentication cannot use WPA key management"
-msgstr "一个使用 “%s” 认证的连接无法使用 WPA 密钥管理"
+msgstr "使用 '%s' 验证的连接无法使用 WPA 密钥管理"
 
 #: ../src/devices/wifi/nm-wifi-ap-utils.c:164
-#, fuzzy, c-format
+#, c-format
 msgid "a connection using '%s' authentication cannot specify WPA protocols"
-msgstr "一个使用 “%s” 认证的连接无法使用 WPA 密钥管理"
+msgstr "使用 '%s' 验证的连接无法指定 WPA 协议"
 
 #: ../src/devices/wifi/nm-wifi-ap-utils.c:180
 #: ../src/devices/wifi/nm-wifi-ap-utils.c:197
-#, fuzzy, c-format
+#, c-format
 msgid "a connection using '%s' authentication cannot specify WPA ciphers"
-msgstr "一个使用 “%s” 认证的连接无法使用 WPA 密钥管理"
+msgstr "使用 '%s' 验证的连接无法指定 WPA 密文"
 
 #: ../src/devices/wifi/nm-wifi-ap-utils.c:209
-#, fuzzy, c-format
+#, c-format
 msgid "a connection using '%s' authentication cannot specify a WPA password"
-msgstr "一个使用 “%s” 认证的连接无法使用 WPA 密钥管理"
+msgstr "使用 '%s' 验证的连接无法指定 WPA 密码"
 
 #: ../src/devices/wifi/nm-wifi-ap-utils.c:240
 msgid "Dynamic WEP requires an 802.1x setting"
-msgstr "动态 WEP 需要对 802.1x 设置"
+msgstr "动态 WEP 要求 802.1x 设置"
 
 #: ../src/devices/wifi/nm-wifi-ap-utils.c:250
 #: ../src/devices/wifi/nm-wifi-ap-utils.c:278
 msgid "Dynamic WEP requires 'open' authentication"
-msgstr "动态 WEP 需要 “open” 认证"
+msgstr "动态 WEP 要求 'open' 验证"
 
 #: ../src/devices/wifi/nm-wifi-ap-utils.c:265
 msgid "Dynamic WEP requires 'ieee8021x' key management"
-msgstr "动态 WEP 需要 “ieee8021x” 密钥管理 "
+msgstr "动态 WEP 要求 'ieee8021x' 密钥管理"
 
 #: ../src/devices/wifi/nm-wifi-ap-utils.c:312
 msgid "WPA-PSK authentication is incompatible with 802.1x"
-msgstr "WPA-PSK 身份认证 与 802.1x 不兼容"
+msgstr "WPA-PSK 验证和 802.1x 是兼容的"
 
 #: ../src/devices/wifi/nm-wifi-ap-utils.c:322
 msgid "WPA-PSK requires 'open' authentication"
-msgstr "WPA-PSK 需要“开放”认证"
+msgstr "WPA-PSK 要求 'open' 验证"
 
 #: ../src/devices/wifi/nm-wifi-ap-utils.c:334
 msgid "WPA Ad-Hoc authentication requires an Ad-Hoc mode AP"
-msgstr "WPA Ad-Hoc 认证需要一个 Ad-Hoc 模式的 AP"
+msgstr "WPA Ad-Hoc 验证要求 Ad-Hoc 模式的 AP"
 
 #: ../src/devices/wifi/nm-wifi-ap-utils.c:347
 msgid "WPA Ad-Hoc authentication requires 'wpa' protocol"
-msgstr "WPA Ad-Hoc 认证需要用 “wpa” 协议"
+msgstr "WPA Ad-Hoc 验证要求 'wpa' 协议"
 
 #: ../src/devices/wifi/nm-wifi-ap-utils.c:359
 msgid "WPA Ad-Hoc authentication requires 'none' pairwise cipher"
-msgstr "WPA Ad-Hoc 认证要求 “none” 成对密码"
+msgstr "WPA Ad-Hoc 验证要求 'none' 配对密码"
 
 #: ../src/devices/wifi/nm-wifi-ap-utils.c:371
 msgid "WPA Ad-Hoc requires 'tkip' group cipher"
-msgstr "WPA  Ad-Hoc 需要 “TKIP” 加密组"
+msgstr "WPA Ad-Hoc 要求 'tkip' 组密码"
 
 #: ../src/devices/wifi/nm-wifi-ap-utils.c:385
 msgid "Access point does not support PSK but setting requires it"
-msgstr "接入点不支持 PSK，但设置需要它"
+msgstr "接入点不支持 PSK 但设置要求它"
 
 #: ../src/devices/wifi/nm-wifi-ap-utils.c:415
 msgid "WPA-EAP authentication requires an 802.1x setting"
-msgstr "WPA-EAP 身份验证需要进行 802.1x 设置"
+msgstr "WPA-EAP 验证要求 802.1x 设置"
 
 #: ../src/devices/wifi/nm-wifi-ap-utils.c:425
 msgid "WPA-EAP requires 'open' authentication"
-msgstr "WPA-EAP 需要 “open” 认证"
+msgstr "WPA-EAP 要求 'open' 验证"
 
 #: ../src/devices/wifi/nm-wifi-ap-utils.c:436
 msgid "802.1x setting requires 'wpa-eap' key management"
-msgstr "802.1x 设置需要 “WPA-EAP” 密钥管理"
+msgstr "802.1x 设置要求 'wpa-eap' 密钥管理"
 
 #: ../src/devices/wifi/nm-wifi-ap-utils.c:449
 msgid "Access point does not support 802.1x but setting requires it"
-msgstr "接入点不支持 802.1x，但设置需要它"
+msgstr "接入点不支持 802.1x 但设置要求它"
 
 #: ../src/devices/wifi/nm-wifi-ap-utils.c:477
 msgid ""
 "Access point mode is Ad-Hoc but setting requires Infrastructure security"
-msgstr "接入点模式是 Ad-Hoc ，但设置需要基础设施安全 "
+msgstr "接入点模式是 Ad-Hoc 但设置要求 Infrastructure 安全性"
 
 #: ../src/devices/wifi/nm-wifi-ap-utils.c:487
 msgid "Ad-Hoc mode is incompatible with 802.1x security"
-msgstr "Ad-Hoc 模式与 802.1x 安全不兼容"
+msgstr "Ad-Hoc 模式和 802.1x 安全性不兼容"
 
 #: ../src/devices/wifi/nm-wifi-ap-utils.c:496
 msgid "Ad-Hoc mode is incompatible with LEAP security"
-msgstr "Ad-Hoc 模式与 LEAP 安全不兼容"
+msgstr "Ad-Hoc 模式和 LEAP 安全性不兼容"
 
 #: ../src/devices/wifi/nm-wifi-ap-utils.c:506
 msgid "Ad-Hoc mode requires 'open' authentication"
-msgstr "Ad-Hoc 模式需要 “open” 认证"
+msgstr "Ad-Hoc 模式要求 'open' 验证"
 
 #: ../src/devices/wifi/nm-wifi-ap-utils.c:516
 msgid ""
 "Access point mode is Infrastructure but setting requires Ad-Hoc security"
-msgstr "接入点模式是基础设施，但设置要求 Ad-Hoc 安全"
+msgstr "接入点模式是 Infrastructure 但设置要求 Ad-Hoc 安全性"
 
 #: ../src/devices/wifi/nm-wifi-ap-utils.c:558
 #: ../src/devices/wifi/nm-wifi-ap-utils.c:588
@@ -9419,81 +9679,75 @@ msgstr "连接不匹配接入点"
 
 #: ../src/devices/wifi/nm-wifi-ap-utils.c:612
 msgid "Access point is unencrypted but setting specifies security"
-msgstr "接入点不加密，但设置指定了安全设置"
+msgstr "接入点未加密但设置指定了安全性"
 
 #: ../src/devices/wifi/nm-wifi-ap-utils.c:701
 msgid ""
 "WPA authentication is incompatible with non-EAP (original) LEAP or Dynamic "
 "WEP"
-msgstr "WPA 身份认证与非 EAP (原始) LEAP 或者动态 WEP 不兼容"
+msgstr "WPA 验证和非 EAP（原始的）LEAP 或动态 WEP 不兼容"
 
 #: ../src/devices/wifi/nm-wifi-ap-utils.c:711
 msgid "WPA authentication is incompatible with Shared Key authentication"
-msgstr "WPA 身份认证与共享密钥认证不兼容"
+msgstr "WPA 验证和 Shared Key 验证不兼容"
 
 #: ../src/devices/wifi/nm-wifi-ap-utils.c:758
 msgid "Failed to determine AP security information"
-msgstr "未能确定 AP 的安全信息"
+msgstr "确定 AP 安全信息失败"
 
-#: ../src/devices/wwan/nm-modem-broadband.c:673
+#: ../src/devices/wwan/nm-modem-broadband.c:641
 msgid "GSM mobile broadband connection requires a 'gsm' setting"
-msgstr "GSM 移动宽带连接需要 “gsm” 设置"
+msgstr "GSM 移动宽带连接要求 'gsm' 设置"
 
-#: ../src/nm-config.c:500
+#: ../src/nm-config.c:465
 msgid "Config file location"
 msgstr "配置文件位置"
 
-#: ../src/nm-config.c:501
+#: ../src/nm-config.c:466
 msgid "Config directory location"
 msgstr "配置目录位置"
 
-#: ../src/nm-config.c:502
-#, fuzzy
+#: ../src/nm-config.c:467
 msgid "System config directory location"
-msgstr "配置目录位置"
+msgstr "系统配置目录位置"
 
-#: ../src/nm-config.c:503
-#, fuzzy
+#: ../src/nm-config.c:468
 msgid "Internal config file location"
-msgstr "配置文件位置"
-
-#: ../src/nm-config.c:504
-msgid "State file location"
-msgstr "状态文件位置"
+msgstr "内部的配置文件位置"
 
-#: ../src/nm-config.c:505
+#: ../src/nm-config.c:469
 msgid "State file for no-auto-default devices"
-msgstr "非自动默认设备的状态文件"
+msgstr "no-auto-default 设备的状态文件"
 
-#: ../src/nm-config.c:506
+#: ../src/nm-config.c:470
 msgid "List of plugins separated by ','"
-msgstr "插件列表，以“,”隔开"
+msgstr "以 ',' 分开的插件列表"
 
-#: ../src/nm-config.c:507
+#: ../src/nm-config.c:471
 msgid "Quit after initial configuration"
 msgstr "初始配置后退出"
 
-#: ../src/nm-config.c:508 ../src/nm-iface-helper.c:300
+#: ../src/nm-config.c:472 ../src/nm-iface-helper.c:300
 msgid "Don't become a daemon, and log to stderr"
-msgstr "不成为守护进程，并向 stderr 打印日志"
+msgstr "不要成为守护进程并在 stderr 中记录"
 
 #. These three are hidden for now, and should eventually just go away.
-#: ../src/nm-config.c:511
+#: ../src/nm-config.c:475
 msgid "An http(s) address for checking internet connectivity"
-msgstr "检查网络连通用的 http(s) 地址"
+msgstr "检查互联网连接性的 http（s）地址"
 
-#: ../src/nm-config.c:512
+#: ../src/nm-config.c:476
 msgid "The interval between connectivity checks (in seconds)"
-msgstr "网络连通检查间隔(秒)"
+msgstr "检查连接性的时间间隔（单位秒）"
 
-#: ../src/nm-config.c:513
+#: ../src/nm-config.c:477
 msgid "The expected start of the response"
-msgstr "预期的响应开头"
+msgstr "预期的响应开始"
 
 #. Interface/IP config
 #: ../src/nm-iface-helper.c:281
 msgid "The interface to manage"
-msgstr "接口管理"
+msgstr "要管理的接口"
 
 #: ../src/nm-iface-helper.c:281
 msgid "eth0"
@@ -9513,36 +9767,35 @@ msgstr "是否管理 IPv6 SLAAC"
 
 #: ../src/nm-iface-helper.c:284
 msgid "Whether SLAAC must be successful"
-msgstr "是否 SLAAC 必须成功"
+msgstr "SLAAC 是否必须是成功的"
 
 #: ../src/nm-iface-helper.c:285
 msgid "Use an IPv6 temporary privacy address"
-msgstr "使用一个 IPv6 临时保密地址"
+msgstr "使用 IPv6 临时私有地址"
 
 #: ../src/nm-iface-helper.c:286
 msgid "Current DHCPv4 address"
-msgstr "当前 DHCPv4 地址"
+msgstr "当前的 DHCPv4 地址"
 
 #: ../src/nm-iface-helper.c:287
 msgid "Whether DHCPv4 must be successful"
-msgstr "是否 DHCPv4 必须成功"
+msgstr "DHCPv4 是否必须是成功的"
 
 #: ../src/nm-iface-helper.c:288
 msgid "Hex-encoded DHCPv4 client ID"
-msgstr "十六进制编码的 DHCPv4 客户端 ID"
+msgstr "十六进制编码的 DHCPv4 客户 ID"
 
 #: ../src/nm-iface-helper.c:289
 msgid "Hostname to send to DHCP server"
-msgstr "主机名发送给 DHCP 服务器"
+msgstr "发送至 DHCP 服务器的主机名"
 
 #: ../src/nm-iface-helper.c:289
 msgid "barbar"
 msgstr "barbar"
 
 #: ../src/nm-iface-helper.c:290
-#, fuzzy
 msgid "FQDN to send to DHCP server"
-msgstr "主机名发送给 DHCP 服务器"
+msgstr "发送至 DHCP 服务器的全限定名"
 
 #: ../src/nm-iface-helper.c:290
 msgid "host.domain.org"
@@ -9550,7 +9803,7 @@ msgstr "host.domain.org"
 
 #: ../src/nm-iface-helper.c:291
 msgid "Route priority for IPv4"
-msgstr "IPv4 路由优先级"
+msgstr "IPv4 的路由优先级"
 
 #: ../src/nm-iface-helper.c:291
 msgid "0"
@@ -9558,7 +9811,7 @@ msgstr "0"
 
 #: ../src/nm-iface-helper.c:292
 msgid "Route priority for IPv6"
-msgstr "IPv6 路由优先级"
+msgstr "IPv6 的路由优先级"
 
 #: ../src/nm-iface-helper.c:292
 msgid "1024"
@@ -9570,45 +9823,53 @@ msgstr "十六进制编码的接口标识符"
 
 #: ../src/nm-iface-helper.c:294
 msgid "IPv6 SLAAC address generation mode"
-msgstr ""
+msgstr "IPv6 SLAAC 地址生成模式"
 
 #: ../src/nm-iface-helper.c:295
 msgid ""
 "The logging backend configuration value. See logging.backend in "
 "NetworkManager.conf"
-msgstr ""
+msgstr "日志后台配置的值。请参考 NetworkManager.conf 里的 logging.backend "
 
 #: ../src/nm-iface-helper.c:315
 msgid ""
 "nm-iface-helper is a small, standalone process that manages a single network "
 "interface."
-msgstr "nm-iface-helper 是一个小的、独立的进程，用来管理单独的网络接口。"
+msgstr "nm-iface-helper 是一个管理单个网络接口的小型独立进程。"
 
 #: ../src/nm-iface-helper.c:374
 #, c-format
 msgid "An interface name and UUID are required\n"
-msgstr "需要接口名称和 UUID\n"
+msgstr "接口名称和 UUID 是必需的\n"
 
 #: ../src/nm-iface-helper.c:380
 #, c-format
 msgid "Failed to find interface index for %s (%s)\n"
-msgstr "无法找到 %s (%s) 的接口索引\n"
+msgstr "寻找 %s(%s) 的接口索引失败\n"
 
 #: ../src/nm-iface-helper.c:442
 #, c-format
 msgid "(%s): Invalid IID %s\n"
-msgstr "(%s)：无效的 IID %s\n"
+msgstr "(%s): 无效的 IID %s\n"
 
-#: ../src/nm-logging.c:223
+#: ../src/nm-logging.c:216
 #, c-format
 msgid "Unknown log level '%s'"
-msgstr "未知日志等级“%s”"
+msgstr "未知日志等级 '%s'"
 
-#: ../src/nm-logging.c:318
+#: ../src/nm-logging.c:309
 #, c-format
 msgid "Unknown log domain '%s'"
-msgstr "未知日志域“%s”"
+msgstr "未知日志域 '%s'"
+
+#: ../src/nm-manager.c:3635
+msgid "VPN connection"
+msgstr "VPN 连接"
+
+#: ../src/nm-sleep-monitor-systemd.c:131
+msgid "NetworkManager needs to turn off networks"
+msgstr "NetworkManager 需要关闭网络"
 
-#: ../src/settings/plugins/ifcfg-rh/reader.c:106
+#: ../src/settings/plugins/ifcfg-rh/reader.c:108
 msgid "System"
 msgstr "系统"
diff --git a/po/zh_TW.po b/po/zh_TW.po
index 9a85a2c899..6f3cb1d6ca 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -1,28 +1,27 @@
 # translation of zh_TW.po to Traditional Chinese
 # Traditional Chinese translation of Network Manager.
 # Copyright (C) 2005, 2010 Free Software Foundation, Inc.
-#
+# 
 # Woodman Tuen <wmtuen@gmail.com>, 2005.
 # Chao-Hsiung Liao <j_h_liau@yahoo.com.tw>, 2008.
 # Chester Cheng <ccheng 於 redhat>, 2010.
 # Chester Cheng <ccheng@紅帽子>, 2010.
 # Terry Chuang <tchuang at redhat>, 2010.
 # Terry Chuang <tchuang@redhat.com>, 2010.
-# Lubomir Rintel <lkundrak@v3.sk>, 2016. #zanata
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-06-22 10:02+0200\n"
-"PO-Revision-Date: 2014-01-28 02:24-0500\n"
-"Last-Translator: tchuang <tchuang@redhat.com>\n"
-"Language-Team: Traditional Chinese <zh@li.org>\n"
-"Language: zh-TW\n"
+"POT-Creation-Date: 2016-04-29 14:24+0530\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"PO-Revision-Date: 2016-07-05 08:42+0000\n"
+"Last-Translator: Copied by Zanata <copied-by-zanata@zanata.org>\n"
+"Language-Team: Traditional Chinese <zh@li.org>\n"
+"Language: zh-TW\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Generator: Zanata 3.8.4\n"
+"X-Generator: Zanata 3.9.3\n"
 
 #: ../clients/cli/agent.c:39
 #, c-format
@@ -86,21 +85,21 @@ msgstr "錯誤：啟動連線失敗：%s"
 msgid "nmcli successfully registered as a polkit agent.\n"
 msgstr ""
 
-#: ../clients/cli/agent.c:206 ../clients/cli/connections.c:8703
-#: ../clients/cli/devices.c:3727 ../clients/cli/general.c:344
-#: ../clients/cli/general.c:473
+#: ../clients/cli/agent.c:206 ../clients/cli/connections.c:11050
+#: ../clients/cli/devices.c:3669 ../clients/cli/general.c:343
+#: ../clients/cli/general.c:484
 #, c-format
 msgid "Error: NetworkManager is not running."
 msgstr "錯誤：NetworkManager 未執行。"
 
-#: ../clients/cli/agent.c:239
+#: ../clients/cli/agent.c:242
 #, fuzzy, c-format
 msgid "Error: 'agent' command '%s' is not valid."
 msgstr "錯誤：「general」指令「%s」無效。"
 
 #: ../clients/cli/common.c:38 ../clients/cli/common.c:51
 #: ../clients/cli/common.c:59 ../clients/cli/common.c:71
-#: ../clients/cli/connections.c:237 ../clients/cli/connections.c:259
+#: ../clients/cli/connections.c:192 ../clients/cli/connections.c:214
 msgid "GROUP"
 msgstr "GROUP"
 
@@ -112,7 +111,7 @@ msgstr "ADDRESS"
 #. 1
 #. 2
 #: ../clients/cli/common.c:40 ../clients/cli/common.c:61
-#: ../clients/cli/connections.c:262
+#: ../clients/cli/connections.c:217
 msgid "GATEWAY"
 msgstr "GATEWAY"
 
@@ -180,7 +179,7 @@ msgstr "不受管理的"
 msgid "unavailable"
 msgstr "無法使用"
 
-#: ../clients/cli/common.c:498 ../clients/cli/general.c:246
+#: ../clients/cli/common.c:498 ../clients/cli/general.c:245
 msgid "disconnected"
 msgstr "離線"
 
@@ -208,11 +207,11 @@ msgstr "正在連線（正在檢查 IP 連線）"
 msgid "connecting (starting secondary connections)"
 msgstr "正在連線（正在啟用次要連線）"
 
-#: ../clients/cli/common.c:512 ../clients/cli/general.c:242
+#: ../clients/cli/common.c:512 ../clients/cli/general.c:241
 msgid "connected"
 msgstr "已連線"
 
-#: ../clients/cli/common.c:514 ../clients/cli/connections.c:690
+#: ../clients/cli/common.c:514 ../clients/cli/connections.c:648
 msgid "deactivating"
 msgstr "正在停用"
 
@@ -221,53 +220,52 @@ msgid "connection failed"
 msgstr "連線失敗"
 
 #: ../clients/cli/common.c:518 ../clients/cli/common.c:535
-#: ../clients/cli/connections.c:695 ../clients/cli/connections.c:718
-#: ../clients/cli/connections.c:1995 ../clients/cli/devices.c:1104
-#: ../clients/cli/devices.c:1145 ../clients/cli/devices.c:1147
-#: ../clients/cli/general.c:249 ../clients/cli/general.c:287
-#: ../clients/cli/general.c:422 ../clients/cli/general.c:437
-#: ../clients/cli/settings.c:845 ../clients/cli/settings.c:931
-#: ../clients/cli/settings.c:1315 ../clients/cli/settings.c:1954
-#: ../clients/cli/settings.c:3317
+#: ../clients/cli/connections.c:653 ../clients/cli/connections.c:676
+#: ../clients/cli/connections.c:1949 ../clients/cli/devices.c:1024
+#: ../clients/cli/devices.c:1065 ../clients/cli/devices.c:1067
+#: ../clients/cli/general.c:248 ../clients/cli/general.c:286
+#: ../clients/cli/general.c:432 ../clients/cli/general.c:448
+#: ../clients/cli/settings.c:839 ../clients/cli/settings.c:925
+#: ../clients/cli/settings.c:1265 ../clients/cli/settings.c:1901
+#: ../clients/cli/settings.c:3205 ../clients/cli/utils.c:1400
 #, c-format
 msgid "unknown"
 msgstr "不明"
 
 #. "CAPABILITIES"
-#: ../clients/cli/common.c:527 ../clients/cli/connections.c:975
-#: ../clients/cli/connections.c:977 ../clients/cli/connections.c:979
-#: ../clients/cli/connections.c:1013 ../clients/cli/connections.c:1082
-#: ../clients/cli/connections.c:1083 ../clients/cli/connections.c:1085
-#: ../clients/cli/connections.c:3291 ../clients/cli/connections.c:4414
-#: ../clients/cli/connections.c:6229 ../clients/cli/connections.c:6230
-#: ../clients/cli/devices.c:782 ../clients/cli/devices.c:1069
-#: ../clients/cli/devices.c:1070 ../clients/cli/devices.c:1071
-#: ../clients/cli/devices.c:1072 ../clients/cli/devices.c:1073
-#: ../clients/cli/devices.c:1108 ../clients/cli/devices.c:1110
-#: ../clients/cli/devices.c:1138 ../clients/cli/devices.c:1139
-#: ../clients/cli/devices.c:1140 ../clients/cli/devices.c:1141
-#: ../clients/cli/devices.c:1142 ../clients/cli/devices.c:1143
-#: ../clients/cli/devices.c:1144 ../clients/cli/devices.c:1146
-#: ../clients/cli/devices.c:1148 ../clients/cli/general.c:431
-#: ../clients/cli/settings.c:3312
+#: ../clients/cli/common.c:527 ../clients/cli/connections.c:933
+#: ../clients/cli/connections.c:935 ../clients/cli/connections.c:937
+#: ../clients/cli/connections.c:971 ../clients/cli/connections.c:1040
+#: ../clients/cli/connections.c:1041 ../clients/cli/connections.c:1043
+#: ../clients/cli/connections.c:3450 ../clients/cli/connections.c:8563
+#: ../clients/cli/connections.c:8564 ../clients/cli/devices.c:772
+#: ../clients/cli/devices.c:989 ../clients/cli/devices.c:990
+#: ../clients/cli/devices.c:991 ../clients/cli/devices.c:992
+#: ../clients/cli/devices.c:993 ../clients/cli/devices.c:1028
+#: ../clients/cli/devices.c:1030 ../clients/cli/devices.c:1058
+#: ../clients/cli/devices.c:1059 ../clients/cli/devices.c:1060
+#: ../clients/cli/devices.c:1061 ../clients/cli/devices.c:1062
+#: ../clients/cli/devices.c:1063 ../clients/cli/devices.c:1064
+#: ../clients/cli/devices.c:1066 ../clients/cli/devices.c:1068
+#: ../clients/cli/general.c:442 ../clients/cli/settings.c:3200
 msgid "yes"
 msgstr "是"
 
-#: ../clients/cli/common.c:529 ../clients/cli/connections.c:975
-#: ../clients/cli/connections.c:977 ../clients/cli/connections.c:979
-#: ../clients/cli/connections.c:1082 ../clients/cli/connections.c:1083
-#: ../clients/cli/connections.c:1085 ../clients/cli/connections.c:3292
-#: ../clients/cli/connections.c:4413 ../clients/cli/connections.c:6229
-#: ../clients/cli/connections.c:6230 ../clients/cli/devices.c:782
-#: ../clients/cli/devices.c:1069 ../clients/cli/devices.c:1070
-#: ../clients/cli/devices.c:1071 ../clients/cli/devices.c:1072
-#: ../clients/cli/devices.c:1073 ../clients/cli/devices.c:1108
-#: ../clients/cli/devices.c:1110 ../clients/cli/devices.c:1138
-#: ../clients/cli/devices.c:1139 ../clients/cli/devices.c:1140
-#: ../clients/cli/devices.c:1141 ../clients/cli/devices.c:1142
-#: ../clients/cli/devices.c:1143 ../clients/cli/devices.c:1144
-#: ../clients/cli/devices.c:1146 ../clients/cli/devices.c:1148
-#: ../clients/cli/general.c:433 ../clients/cli/settings.c:3314
+#: ../clients/cli/common.c:529 ../clients/cli/connections.c:933
+#: ../clients/cli/connections.c:935 ../clients/cli/connections.c:937
+#: ../clients/cli/connections.c:1040 ../clients/cli/connections.c:1041
+#: ../clients/cli/connections.c:1043 ../clients/cli/connections.c:3451
+#: ../clients/cli/connections.c:8563 ../clients/cli/connections.c:8564
+#: ../clients/cli/devices.c:772 ../clients/cli/devices.c:989
+#: ../clients/cli/devices.c:990 ../clients/cli/devices.c:991
+#: ../clients/cli/devices.c:992 ../clients/cli/devices.c:993
+#: ../clients/cli/devices.c:1028 ../clients/cli/devices.c:1030
+#: ../clients/cli/devices.c:1058 ../clients/cli/devices.c:1059
+#: ../clients/cli/devices.c:1060 ../clients/cli/devices.c:1061
+#: ../clients/cli/devices.c:1062 ../clients/cli/devices.c:1063
+#: ../clients/cli/devices.c:1064 ../clients/cli/devices.c:1066
+#: ../clients/cli/devices.c:1068 ../clients/cli/general.c:444
+#: ../clients/cli/settings.c:3202
 msgid "no"
 msgstr "否"
 
@@ -284,7 +282,7 @@ msgid "No reason given"
 msgstr "未提供理由"
 
 #. We should not really come here
-#: ../clients/cli/common.c:547 ../clients/cli/connections.c:3140
+#: ../clients/cli/common.c:547 ../clients/cli/connections.c:2976
 #, c-format
 msgid "Unknown error"
 msgstr "不明的錯誤"
@@ -540,8 +538,8 @@ msgid "The device parent's management changed"
 msgstr "裝置已移除"
 
 #. TRANSLATORS: Unknown reason for a device state change (NMDeviceStateReason)
-#: ../clients/cli/common.c:734 ../libnm-glib/nm-device.c:1898
-#: ../libnm/nm-device.c:1849
+#: ../clients/cli/common.c:734 ../libnm-glib/nm-device.c:1888
+#: ../libnm/nm-device.c:1839
 msgid "Unknown"
 msgstr "不明"
 
@@ -583,117 +581,73 @@ msgid ""
 msgstr ""
 
 #. define some prompts for connection editor
-#: ../clients/cli/connections.c:61
+#: ../clients/cli/connections.c:41
 msgid "Setting name? "
 msgstr "設定名稱？"
 
-#: ../clients/cli/connections.c:62
+#: ../clients/cli/connections.c:42
 msgid "Property name? "
 msgstr "屬性名稱？"
 
-#: ../clients/cli/connections.c:63
+#: ../clients/cli/connections.c:43
 msgid "Enter connection type: "
 msgstr "輸入連線類型："
 
 #. define some other prompts
-#: ../clients/cli/connections.c:66
-#, fuzzy
-msgid "Connection type"
+#: ../clients/cli/connections.c:46
+msgid "Connection type: "
 msgstr "連線類型："
 
-#: ../clients/cli/connections.c:67
-#, fuzzy
-msgid "VPN type"
+#: ../clients/cli/connections.c:47
+msgid "VPN type: "
 msgstr "VPN 類型："
 
-#: ../clients/cli/connections.c:68
+#: ../clients/cli/connections.c:48
 #, fuzzy
-msgid "Master"
+msgid "Master: "
 msgstr "Bond master："
 
-#: ../clients/cli/connections.c:70 ../clients/tui/nmt-page-infiniband.c:88
-msgid "Transport mode"
-msgstr "傳輸模式"
-
-#: ../clients/cli/connections.c:75
-#, fuzzy
-msgid "Bluetooth type"
-msgstr "藍牙"
-
-#: ../clients/cli/connections.c:81
-#, fuzzy
-msgid "Bonding mode"
-msgstr "連結監控"
-
-#: ../clients/cli/connections.c:83 ../clients/cli/connections.c:4014
-#, fuzzy
-msgid "Bonding monitoring mode"
-msgstr "連結監控"
-
-#: ../clients/cli/connections.c:88
-msgid "Protocol"
-msgstr ""
-
-#: ../clients/cli/connections.c:91
-#, fuzzy
-msgid "Wi-Fi mode"
-msgstr "無線網路"
-
-#: ../clients/cli/connections.c:97
-#, fuzzy
-msgid "ADSL encapsulation"
-msgstr "DSL 身份認證"
-
-#: ../clients/cli/connections.c:100
-#, fuzzy
-msgid "Tun mode"
-msgstr "傳輸模式"
-
-#: ../clients/cli/connections.c:105
-#, fuzzy
-msgid "IP Tunnel mode"
-msgstr "編輯連線"
-
-#: ../clients/cli/connections.c:107
-#, fuzzy
-msgid "MACVLAN mode"
-msgstr "VLAN"
-
-#: ../clients/cli/connections.c:109
-#, fuzzy
-msgid "Connection (name, UUID, or path)"
+#: ../clients/cli/connections.c:49
+msgid "Connection (name, UUID, or path): "
 msgstr "連線（名稱、UUID 或是路徑）："
 
-#: ../clients/cli/connections.c:110
+#: ../clients/cli/connections.c:50
 #, fuzzy
-msgid "VPN connection (name, UUID, or path)"
+msgid "VPN connection (name, UUID, or path): "
 msgstr "連線（名稱、UUID 或是路徑）："
 
-#: ../clients/cli/connections.c:111
+#: ../clients/cli/connections.c:51
 #, fuzzy
-msgid "Connection(s) (name, UUID, or path)"
+msgid "Connection(s) (name, UUID, or path): "
 msgstr "連線（名稱、UUID 或是路徑）："
 
-#: ../clients/cli/connections.c:112
+#: ../clients/cli/connections.c:52
 #, fuzzy
-msgid "Connection(s) (name, UUID, path or apath)"
+msgid "Connection(s) (name, UUID, path or apath): "
 msgstr "連線（名稱、UUID 或是路徑）："
 
+#: ../clients/cli/connections.c:53
+msgid "Tunnel mode: "
+msgstr ""
+
+#: ../clients/cli/connections.c:54
+msgid "MACVLAN mode: "
+msgstr ""
+
 #. 0
-#: ../clients/cli/connections.c:118 ../clients/cli/connections.c:238
+#: ../clients/cli/connections.c:73 ../clients/cli/connections.c:193
 #: ../clients/cli/devices.c:55 ../clients/cli/devices.c:89
 #: ../clients/cli/devices.c:99 ../clients/cli/devices.c:110
 #: ../clients/cli/devices.c:120 ../clients/cli/devices.c:137
 #: ../clients/cli/devices.c:150 ../clients/cli/devices.c:176
 #: ../clients/cli/devices.c:191 ../clients/cli/devices.c:200
-#: ../clients/cli/devices.c:210 ../clients/cli/devices.c:220
-#: ../clients/cli/devices.c:261
+#: ../clients/cli/devices.c:210 ../clients/cli/devices.c:251
 msgid "NAME"
 msgstr "NAME"
 
 #. 0
 #. 1
-#: ../clients/cli/connections.c:119 ../clients/cli/connections.c:239
+#: ../clients/cli/connections.c:74 ../clients/cli/connections.c:194
 msgid "UUID"
 msgstr "UUID"
 
@@ -701,36 +655,36 @@ msgstr "UUID"
 #. 0
 #. 1
 #. 2
-#: ../clients/cli/connections.c:120 ../clients/cli/connections.c:260
+#: ../clients/cli/connections.c:75 ../clients/cli/connections.c:215
 #: ../clients/cli/devices.c:41 ../clients/cli/devices.c:57
 #: ../clients/cli/devices.c:179
 msgid "TYPE"
 msgstr "TYPE"
 
 #. 2
-#: ../clients/cli/connections.c:121
+#: ../clients/cli/connections.c:76
 msgid "TIMESTAMP"
 msgstr "TIMESTAMP"
 
 #. 3
-#: ../clients/cli/connections.c:122
+#: ../clients/cli/connections.c:77
 msgid "TIMESTAMP-REAL"
 msgstr "TIMESTAMP-REAL"
 
 #. 4
 #. 16
-#: ../clients/cli/connections.c:123 ../clients/cli/devices.c:72
+#: ../clients/cli/connections.c:78 ../clients/cli/devices.c:72
 msgid "AUTOCONNECT"
 msgstr "AUTOCONNECT"
 
 #. 5
-#: ../clients/cli/connections.c:124
+#: ../clients/cli/connections.c:79
 #, fuzzy
 msgid "AUTOCONNECT-PRIORITY"
 msgstr "AUTOCONNECT"
 
 #. 6
-#: ../clients/cli/connections.c:125
+#: ../clients/cli/connections.c:80
 msgid "READONLY"
 msgstr "READONLY"
 
@@ -739,7 +693,7 @@ msgstr "READONLY"
 #. 2
 #. 15
 #. 5
-#: ../clients/cli/connections.c:126 ../clients/cli/connections.c:246
+#: ../clients/cli/connections.c:81 ../clients/cli/connections.c:201
 #: ../clients/cli/devices.c:43 ../clients/cli/devices.c:166
 #: ../clients/cli/devices.c:182
 msgid "DBUS-PATH"
@@ -748,7 +702,7 @@ msgstr "DBUS-PATH"
 #. 8
 #. 13
 #. 4
-#: ../clients/cli/connections.c:127 ../clients/cli/devices.c:164
+#: ../clients/cli/connections.c:82 ../clients/cli/devices.c:164
 #: ../clients/cli/devices.c:181
 msgid "ACTIVE"
 msgstr "ACTIVE"
@@ -758,9 +712,9 @@ msgstr "ACTIVE"
 #. 12
 #. 3
 #. 0
-#: ../clients/cli/connections.c:128 ../clients/cli/devices.c:40
+#: ../clients/cli/connections.c:83 ../clients/cli/devices.c:40
 #: ../clients/cli/devices.c:56 ../clients/cli/devices.c:163
-#: ../clients/cli/devices.c:180 ../clients/cli/devices.c:262
+#: ../clients/cli/devices.c:180 ../clients/cli/devices.c:252
 msgid "DEVICE"
 msgstr "DEVICE"
 
@@ -769,42 +723,43 @@ msgstr "DEVICE"
 #. 1
 #. 10
 #. 1
-#: ../clients/cli/connections.c:129 ../clients/cli/connections.c:241
+#: ../clients/cli/connections.c:84 ../clients/cli/connections.c:196
 #: ../clients/cli/devices.c:42 ../clients/cli/devices.c:66
-#: ../clients/cli/general.c:37
+#: ../clients/cli/general.c:36
 msgid "STATE"
 msgstr "STATE"
 
 #. 11
-#: ../clients/cli/connections.c:130
+#: ../clients/cli/connections.c:85
 #, fuzzy
 msgid "ACTIVE-PATH"
 msgstr "MASTER-PATH"
 
 #. 2
-#: ../clients/cli/connections.c:240
+#: ../clients/cli/connections.c:195
 msgid "DEVICES"
 msgstr "DEVICES"
 
 #. 4
-#: ../clients/cli/connections.c:242
+#: ../clients/cli/connections.c:197
 msgid "DEFAULT"
 msgstr "DEFAULT"
 
 #. 5
-#: ../clients/cli/connections.c:243
+#: ../clients/cli/connections.c:198
 msgid "DEFAULT6"
 msgstr "DEFAULT6"
 
 #. 6
-#: ../clients/cli/connections.c:244
+#: ../clients/cli/connections.c:199
 msgid "SPEC-OBJECT"
 msgstr "SPEC-OBJECT"
 
 #. 7
 #. 4
-#: ../clients/cli/connections.c:245 ../clients/cli/connections.c:283
-#: ../clients/tui/nm-editor-utils.c:233
+#. Ask for optional 'vpn' arguments.
+#: ../clients/cli/connections.c:200 ../clients/cli/connections.c:238
+#: ../clients/cli/connections.c:4169 ../clients/tui/nm-editor-utils.c:233
 #: ../clients/tui/nmt-connect-connection-list.c:405
 msgid "VPN"
 msgstr "VPN"
@@ -812,70 +767,70 @@ msgstr "VPN"
 #. 9
 #. 5
 #. 22
-#: ../clients/cli/connections.c:247 ../clients/cli/devices.c:46
+#: ../clients/cli/connections.c:202 ../clients/cli/devices.c:46
 #: ../clients/cli/devices.c:78
 msgid "CON-PATH"
 msgstr "CON-PATH"
 
 #. 10
-#: ../clients/cli/connections.c:248
+#: ../clients/cli/connections.c:203
 msgid "ZONE"
 msgstr "ZONE"
 
 #. 11
-#: ../clients/cli/connections.c:249
+#: ../clients/cli/connections.c:204
 msgid "MASTER-PATH"
 msgstr "MASTER-PATH"
 
 #. 1
-#: ../clients/cli/connections.c:261
+#: ../clients/cli/connections.c:216
 msgid "USERNAME"
 msgstr "USERNAME"
 
 #. 3
-#: ../clients/cli/connections.c:263
+#: ../clients/cli/connections.c:218
 msgid "BANNER"
 msgstr "BANNER"
 
 #. 4
-#: ../clients/cli/connections.c:264
+#: ../clients/cli/connections.c:219
 msgid "VPN-STATE"
 msgstr "VPN-STATE"
 
 #. 5
-#: ../clients/cli/connections.c:265
+#: ../clients/cli/connections.c:220
 msgid "CFG"
 msgstr "CFG"
 
-#: ../clients/cli/connections.c:278 ../clients/cli/devices.c:235
+#: ../clients/cli/connections.c:233 ../clients/cli/devices.c:225
 msgid "GENERAL"
 msgstr "GENERAL"
 
 #. 0
 #. 6
-#: ../clients/cli/connections.c:279 ../clients/cli/devices.c:242
+#: ../clients/cli/connections.c:234 ../clients/cli/devices.c:232
 msgid "IP4"
 msgstr "IP4"
 
 #. 1
 #. 7
-#: ../clients/cli/connections.c:280 ../clients/cli/devices.c:243
+#: ../clients/cli/connections.c:235 ../clients/cli/devices.c:233
 msgid "DHCP4"
 msgstr "DHCP4"
 
 #. 2
 #. 8
-#: ../clients/cli/connections.c:281 ../clients/cli/devices.c:244
+#: ../clients/cli/connections.c:236 ../clients/cli/devices.c:234
 msgid "IP6"
 msgstr "IP6"
 
 #. 3
 #. 9
-#: ../clients/cli/connections.c:282 ../clients/cli/devices.c:245
+#: ../clients/cli/connections.c:237 ../clients/cli/devices.c:235
 msgid "DHCP6"
 msgstr "DHCP6"
 
-#: ../clients/cli/connections.c:314
+#: ../clients/cli/connections.c:272
 #, fuzzy, c-format
 msgid ""
 "Usage: nmcli connection { COMMAND | help }\n"
@@ -891,8 +846,8 @@ msgid ""
 "\n"
 "  down [id | uuid | path | apath] <ID> ...\n"
 "\n"
-"  add COMMON_OPTIONS TYPE_SPECIFIC_OPTIONS SLAVE_OPTIONS IP_OPTIONS [-- "
-"([+|-]<setting>.<property> <value>)+]\n"
+"  add COMMON_OPTIONS TYPE_SPECIFIC_OPTIONS SLAVE_OPTIONS IP_OPTIONS [-- ([+|-"
+"]<setting>.<property> <value>)+]\n"
 "\n"
 "  modify [--temporary] [id | uuid | path] <ID> ([+|-]<setting>.<property> "
 "<value>)+\n"
@@ -917,8 +872,8 @@ msgid ""
 msgstr ""
 "Usage: nmcli connection { COMMAND | help }\n"
 "\n"
-"COMMAND := { show | up | down | add | modify | edit | delete | reload | "
-"load }\n"
+"COMMAND := { show | up | down | add | modify | edit | delete | reload | load "
+"}\n"
 "\n"
 "  show configured [[id | uuid | path] <ID>]\n"
 "  show active     [[id | uuid | path | apath] <ID>]\n"
@@ -943,7 +898,7 @@ msgstr ""
 "  load <filename> [ <filename>... ]\n"
 "\n"
 
-#: ../clients/cli/connections.c:336
+#: ../clients/cli/connections.c:294
 #, c-format
 msgid ""
 "Usage: nmcli connection show { ARGUMENTS | help }\n"
@@ -970,7 +925,7 @@ msgid ""
 "well.\n"
 msgstr ""
 
-#: ../clients/cli/connections.c:357
+#: ../clients/cli/connections.c:315
 #, fuzzy, c-format
 msgid ""
 "Usage: nmcli connection up { ARGUMENTS | help }\n"
@@ -1013,7 +968,7 @@ msgstr ""
 "nsp    - specifies NSP to connect to (only valid for WiMAX)\n"
 "\n"
 
-#: ../clients/cli/connections.c:378
+#: ../clients/cli/connections.c:336
 #, fuzzy, c-format
 msgid ""
 "Usage: nmcli connection down { ARGUMENTS | help }\n"
@@ -1036,13 +991,13 @@ msgstr ""
 "UUID or D-Bus path.\n"
 "\n"
 
-#: ../clients/cli/connections.c:390
+#: ../clients/cli/connections.c:348
 #, 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"
+"ARGUMENTS := COMMON_OPTIONS TYPE_SPECIFIC_OPTIONS SLAVE_OPTIONS IP_OPTIONS [-"
+"- ([+|-]<setting>.<property> <value>)+]\n"
 "\n"
 "  COMMON_OPTIONS:\n"
 "                  type <type>\n"
@@ -1129,8 +1084,8 @@ msgid ""
 "                  [path-cost <1-65535>]\n"
 "                  [hairpin yes|no]\n"
 "\n"
-"    vpn:          vpn-type vpnc|openvpn|pptp|openconnect|openswan|libreswan|"
-"ssh|l2tp|iodine|...\n"
+"    vpn:          vpn-type "
+"vpnc|openvpn|pptp|openconnect|openswan|libreswan|ssh|l2tp|iodine|...\n"
 "                  [user <username>]\n"
 "\n"
 "    olpc-mesh:    ssid <SSID>\n"
@@ -1272,7 +1227,7 @@ msgstr ""
 "                  [ip6 <IPv6 address>] [gw6 <IPv6 gateway>]\n"
 "\n"
 
-#: ../clients/cli/connections.c:502
+#: ../clients/cli/connections.c:460
 #, c-format
 msgid ""
 "Usage: nmcli connection modify { ARGUMENTS | help }\n"
@@ -1287,8 +1242,8 @@ msgid ""
 "\n"
 "Examples:\n"
 "nmcli con mod home-wifi wifi.ssid rakosnicek\n"
-"nmcli con mod em1-1 ipv4.method manual ipv4.addr \"192.168.1.2/24, "
-"10.10.1.5/8\"\n"
+"nmcli con mod em1-1 ipv4.method manual ipv4.addr \"192.168.1.2/24, 10.10.1.5/"
+"8\"\n"
 "nmcli con mod em1-1 +ipv4.dns 8.8.4.4\n"
 "nmcli con mod em1-1 -ipv4.dns 1\n"
 "nmcli con mod em1-1 -ipv6.addr \"abbe::cafe/56\"\n"
@@ -1297,7 +1252,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: ../clients/cli/connections.c:525
+#: ../clients/cli/connections.c:483
 #, c-format
 msgid ""
 "Usage: nmcli connection clone { ARGUMENTS | help }\n"
@@ -1305,13 +1260,12 @@ msgid ""
 "ARGUMENTS := [--temporary] [id | uuid | path] <ID> <new name>\n"
 "\n"
 "Clone an existing connection profile. The newly created connection will be\n"
-"the exact copy of the <ID>, except the uuid property (will be generated) "
-"and\n"
+"the exact copy of the <ID>, except the uuid property (will be generated) and\n"
 "id (provided as <new name> argument).\n"
 "\n"
 msgstr ""
 
-#: ../clients/cli/connections.c:537
+#: ../clients/cli/connections.c:495
 #, c-format
 msgid ""
 "Usage: nmcli connection edit { ARGUMENTS | help }\n"
@@ -1338,7 +1292,7 @@ msgstr ""
 "Add a new connection profile in an interactive editor.\n"
 "\n"
 
-#: ../clients/cli/connections.c:552
+#: ../clients/cli/connections.c:510
 #, c-format
 msgid ""
 "Usage: nmcli connection delete { ARGUMENTS | help }\n"
@@ -1357,7 +1311,7 @@ msgstr ""
 "The profile is identified by its name, UUID or D-Bus path.\n"
 "\n"
 
-#: ../clients/cli/connections.c:563
+#: ../clients/cli/connections.c:521
 #, fuzzy, c-format
 msgid ""
 "Usage: nmcli connection monitor { ARGUMENTS | help }\n"
@@ -1381,7 +1335,7 @@ msgstr ""
 "Add a new connection profile in an interactive editor.\n"
 "\n"
 
-#: ../clients/cli/connections.c:575
+#: ../clients/cli/connections.c:533
 #, c-format
 msgid ""
 "Usage: nmcli connection reload { help }\n"
@@ -1394,7 +1348,7 @@ msgstr ""
 "Reload all connection files from disk.\n"
 "\n"
 
-#: ../clients/cli/connections.c:583
+#: ../clients/cli/connections.c:541
 #, c-format
 msgid ""
 "Usage: nmcli connection load { ARGUMENTS | help }\n"
@@ -1417,7 +1371,7 @@ msgstr ""
 "state.\n"
 "\n"
 
-#: ../clients/cli/connections.c:595
+#: ../clients/cli/connections.c:553
 #, c-format
 msgid ""
 "Usage: nmcli connection import { ARGUMENTS | help }\n"
@@ -1432,7 +1386,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: ../clients/cli/connections.c:608
+#: ../clients/cli/connections.c:566
 #, fuzzy, c-format
 msgid ""
 "Usage: nmcli connection export { ARGUMENTS | help }\n"
@@ -1451,880 +1405,1315 @@ msgstr ""
 "The profile is identified by its name, UUID or D-Bus path.\n"
 "\n"
 
-#: ../clients/cli/connections.c:686
+#: ../clients/cli/connections.c:644
 msgid "activating"
 msgstr "啟用中"
 
-#: ../clients/cli/connections.c:688
+#: ../clients/cli/connections.c:646
 msgid "activated"
 msgstr "已啟用"
 
 # auto translated by TM merge from project: firewalld, version: 0.3.4, DocId: firewalld
-#: ../clients/cli/connections.c:692
+#: ../clients/cli/connections.c:650
 msgid "deactivated"
 msgstr "已停止"
 
-#: ../clients/cli/connections.c:704
+#: ../clients/cli/connections.c:662
 msgid "VPN connecting (prepare)"
 msgstr "VPN 連線（準備）"
 
-#: ../clients/cli/connections.c:706
+#: ../clients/cli/connections.c:664
 msgid "VPN connecting (need authentication)"
 msgstr "VPN 連線（需要身份認證）"
 
-#: ../clients/cli/connections.c:708
+#: ../clients/cli/connections.c:666
 msgid "VPN connecting"
 msgstr "VPN 連線"
 
-#: ../clients/cli/connections.c:710
+#: ../clients/cli/connections.c:668
 msgid "VPN connecting (getting IP configuration)"
 msgstr "VPN 連線（取得 IP 配置）"
 
-#: ../clients/cli/connections.c:712
+#: ../clients/cli/connections.c:670
 msgid "VPN connected"
 msgstr "VPN 已連線"
 
-#: ../clients/cli/connections.c:714
+#: ../clients/cli/connections.c:672
 msgid "VPN connection failed"
 msgstr "VPN 連線失敗"
 
-#: ../clients/cli/connections.c:716
+#: ../clients/cli/connections.c:674
 msgid "VPN disconnected"
 msgstr "VPN 已離線"
 
-#: ../clients/cli/connections.c:786
+#: ../clients/cli/connections.c:744
 #, fuzzy, c-format
 msgid "Error updating secrets for %s: %s\n"
 msgstr "儲存連線錯誤：%s"
 
-#: ../clients/cli/connections.c:806
+#: ../clients/cli/connections.c:764
 #, fuzzy
 msgid "Connection profile details"
 msgstr "連線詳情"
 
-#: ../clients/cli/connections.c:818 ../clients/cli/connections.c:1211
+#: ../clients/cli/connections.c:776 ../clients/cli/connections.c:1169
 #, fuzzy, c-format
 msgid "Error: 'connection show': %s"
 msgstr "錯誤：「device show」：%s"
 
-#: ../clients/cli/connections.c:974 ../clients/cli/settings.c:1950
+#: ../clients/cli/connections.c:932 ../clients/cli/settings.c:1897
 msgid "never"
 msgstr "永不"
 
-#: ../clients/cli/connections.c:1199
+#: ../clients/cli/connections.c:1157
 #, fuzzy
 msgid "Activate connection details"
 msgstr "有效連線的詳細資訊"
 
-#: ../clients/cli/connections.c:1435
+#: ../clients/cli/connections.c:1393
 #, fuzzy, c-format
 msgid "invalid field '%s'; allowed fields: %s and %s, or %s,%s"
 msgstr "無效的欄位「%s」; 允許的欄位：%s"
 
-#: ../clients/cli/connections.c:1450 ../clients/cli/connections.c:1458
+#: ../clients/cli/connections.c:1408 ../clients/cli/connections.c:1416
 #, fuzzy, c-format
 msgid "'%s' has to be alone"
 msgstr "欄位 '%s' 必須是單獨的"
 
 #. Add headers
-#: ../clients/cli/connections.c:1680
+#: ../clients/cli/connections.c:1634
 #, fuzzy
 msgid "NetworkManager active profiles"
 msgstr "NetworkManager 狀態"
 
-#: ../clients/cli/connections.c:1681
+#: ../clients/cli/connections.c:1635
 #, fuzzy
 msgid "NetworkManager connection profiles"
 msgstr "NetworkManager 進入了睡眠狀態"
 
-#.
-#. * TODO(?): complete uuid, path or id
-#. if (nmc->complete) {
-#. quit ();
-#. }
-#.
-#: ../clients/cli/connections.c:1727 ../clients/cli/connections.c:2445
-#: ../clients/cli/connections.c:2467 ../clients/cli/connections.c:2476
-#: ../clients/cli/connections.c:2485 ../clients/cli/connections.c:2648
-#: ../clients/cli/connections.c:7777 ../clients/cli/connections.c:7896
-#: ../clients/cli/connections.c:8032 ../clients/cli/connections.c:8170
-#: ../clients/cli/connections.c:8289 ../clients/cli/connections.c:8300
-#: ../clients/cli/connections.c:8410 ../clients/cli/devices.c:2402
-#: ../clients/cli/devices.c:2410 ../clients/cli/devices.c:2736
-#: ../clients/cli/devices.c:2743 ../clients/cli/devices.c:2757
-#: ../clients/cli/devices.c:2764 ../clients/cli/devices.c:2781
-#: ../clients/cli/devices.c:2789 ../clients/cli/devices.c:2802
-#: ../clients/cli/devices.c:3166 ../clients/cli/devices.c:3173
-#: ../clients/cli/devices.c:3180 ../clients/cli/devices.c:3192
-#: ../clients/cli/devices.c:3205 ../clients/cli/devices.c:3212
-#: ../clients/cli/devices.c:3384 ../clients/cli/devices.c:3391
-#: ../clients/cli/devices.c:3564
+#: ../clients/cli/connections.c:1681 ../clients/cli/connections.c:2389
+#: ../clients/cli/connections.c:2411 ../clients/cli/connections.c:2420
+#: ../clients/cli/connections.c:2429 ../clients/cli/connections.c:2588
+#: ../clients/cli/connections.c:10156 ../clients/cli/connections.c:10273
+#: ../clients/cli/connections.c:10405 ../clients/cli/connections.c:10538
+#: ../clients/cli/connections.c:10648 ../clients/cli/connections.c:10659
+#: ../clients/cli/connections.c:10758 ../clients/cli/devices.c:2344
+#: ../clients/cli/devices.c:2352 ../clients/cli/devices.c:2675
+#: ../clients/cli/devices.c:2682 ../clients/cli/devices.c:2696
+#: ../clients/cli/devices.c:2703 ../clients/cli/devices.c:2720
+#: ../clients/cli/devices.c:2728 ../clients/cli/devices.c:2741
+#: ../clients/cli/devices.c:3105 ../clients/cli/devices.c:3112
+#: ../clients/cli/devices.c:3119 ../clients/cli/devices.c:3131
+#: ../clients/cli/devices.c:3144 ../clients/cli/devices.c:3151
+#: ../clients/cli/devices.c:3323 ../clients/cli/devices.c:3330
+#: ../clients/cli/devices.c:3503
 #, c-format
 msgid "Error: %s argument is missing."
 msgstr "錯誤：沒有 %s 參數。"
 
-#: ../clients/cli/connections.c:1742
+#: ../clients/cli/connections.c:1696
 #, fuzzy, c-format
 msgid "Error: %s - no such connection profile."
 msgstr "錯誤：%s - 此連線不存在。"
 
-#: ../clients/cli/connections.c:1801 ../clients/cli/connections.c:2508
-#: ../clients/cli/connections.c:8825 ../clients/cli/devices.c:3353
-#: ../clients/cli/devices.c:3834 ../clients/cli/general.c:528
-#: ../clients/cli/general.c:577 ../clients/cli/general.c:594
-#: ../clients/cli/general.c:633 ../clients/cli/general.c:647
-#: ../clients/cli/general.c:765 ../clients/cli/general.c:812
-#: ../clients/cli/general.c:832
+#: ../clients/cli/connections.c:1755 ../clients/cli/connections.c:2452
+#: ../clients/cli/connections.c:11162 ../clients/cli/devices.c:3292
+#: ../clients/cli/devices.c:3779 ../clients/cli/general.c:539
+#: ../clients/cli/general.c:588 ../clients/cli/general.c:605
+#: ../clients/cli/general.c:644 ../clients/cli/general.c:658
+#: ../clients/cli/general.c:776 ../clients/cli/general.c:823
+#: ../clients/cli/general.c:843
 #, c-format
 msgid "Error: %s."
 msgstr "錯誤：%s。"
 
-#: ../clients/cli/connections.c:1897
+#: ../clients/cli/connections.c:1851
 #, c-format
 msgid "no active connection on device '%s'"
 msgstr "裝置「%s」上沒有使用中的連線"
 
-#: ../clients/cli/connections.c:1905
+#: ../clients/cli/connections.c:1859
 msgid "no active connection or device"
 msgstr "沒有使用中的連線或裝置"
 
-#: ../clients/cli/connections.c:1956
+#: ../clients/cli/connections.c:1910
 #, c-format
 msgid "device '%s' not compatible with connection '%s'"
 msgstr "裝置「%s」和連線「%s」不相容"
 
-#: ../clients/cli/connections.c:1959
+#: ../clients/cli/connections.c:1913
 #, c-format
 msgid "no device found for connection '%s'"
 msgstr "連線「%s」沒有找到任何裝置"
 
-#: ../clients/cli/connections.c:1971
+#: ../clients/cli/connections.c:1925
 msgid "unknown reason"
 msgstr "原因不明"
 
-#: ../clients/cli/connections.c:1973 ../clients/cli/general.c:278
+#: ../clients/cli/connections.c:1927 ../clients/cli/general.c:277
 msgid "none"
 msgstr "none"
 
-#: ../clients/cli/connections.c:1975
+#: ../clients/cli/connections.c:1929
 msgid "the user was disconnected"
 msgstr "該使用者已經斷線"
 
-#: ../clients/cli/connections.c:1977
+#: ../clients/cli/connections.c:1931
 msgid "the base network connection was interrupted"
 msgstr "基礎的網路連線已經中斷"
 
-#: ../clients/cli/connections.c:1979
+#: ../clients/cli/connections.c:1933
 msgid "the VPN service stopped unexpectedly"
 msgstr "VPN 服務無預期停止"
 
-#: ../clients/cli/connections.c:1981
+#: ../clients/cli/connections.c:1935
 msgid "the VPN service returned invalid configuration"
 msgstr "VPN 服務傳回無效的配置"
 
-#: ../clients/cli/connections.c:1983
+#: ../clients/cli/connections.c:1937
 msgid "the connection attempt timed out"
 msgstr "嚐試連線已經逾時"
 
-#: ../clients/cli/connections.c:1985
+#: ../clients/cli/connections.c:1939
 msgid "the VPN service did not start in time"
 msgstr "VPN 服務並沒有按時開始"
 
-#: ../clients/cli/connections.c:1987
+#: ../clients/cli/connections.c:1941
 msgid "the VPN service failed to start"
 msgstr "VPN 服務無法開始"
 
-#: ../clients/cli/connections.c:1989
+#: ../clients/cli/connections.c:1943
 msgid "no valid VPN secrets"
 msgstr "VPN 密碼不正確"
 
-#: ../clients/cli/connections.c:1991
+#: ../clients/cli/connections.c:1945
 msgid "invalid VPN secrets"
 msgstr "VPN 密碼不正確"
 
-#: ../clients/cli/connections.c:1993
+#: ../clients/cli/connections.c:1947
 msgid "the connection was removed"
 msgstr "連線已移除"
 
-#: ../clients/cli/connections.c:2015 ../clients/cli/connections.c:2050
-#: ../clients/cli/connections.c:2211 ../clients/cli/connections.c:6120
+#: ../clients/cli/connections.c:1969 ../clients/cli/connections.c:1997
+#: ../clients/cli/connections.c:2158 ../clients/cli/connections.c:8454
 #, c-format
 msgid "Connection successfully activated (D-Bus active path: %s)\n"
 msgstr "連線已成功啟用（D-Bus 啟用路徑：%s）\n"
 
-#: ../clients/cli/connections.c:2023
+#: ../clients/cli/connections.c:1976
 #, fuzzy, c-format
 msgid ""
 "Connection successfully activated (master waiting for slaves) (D-Bus active "
 "path: %s)\n"
 msgstr "連線已成功啟用（D-Bus 啟用路徑：%s）\n"
 
-#: ../clients/cli/connections.c:2030 ../clients/cli/connections.c:6126
-#, c-format
-msgid "Error: Connection activation failed.\n"
-msgstr "錯誤：連線啟用失敗。\n"
-
-#: ../clients/cli/connections.c:2033 ../clients/cli/connections.c:2055
+#: ../clients/cli/connections.c:1980 ../clients/cli/connections.c:2002
 #, c-format
 msgid "Error: Connection activation failed."
 msgstr "錯誤：啟動連線失敗。"
 
-#: ../clients/cli/connections.c:2106
+#: ../clients/cli/connections.c:2053
 #, c-format
 msgid "VPN connection successfully activated (D-Bus active path: %s)\n"
 msgstr "VPN 連線已成功啟用（D-Bus 啟用路徑：%s）\n"
 
-#: ../clients/cli/connections.c:2114
+#: ../clients/cli/connections.c:2061
 #, c-format
 msgid "Error: Connection activation failed: %s."
 msgstr "錯誤：啟動連線失敗：%s。"
 
-#: ../clients/cli/connections.c:2133 ../clients/cli/devices.c:1506
+#: ../clients/cli/connections.c:2080 ../clients/cli/devices.c:1426
 #, c-format
 msgid "Error: Timeout %d sec expired."
 msgstr "錯誤：逾時 %d 秒。"
 
-#: ../clients/cli/connections.c:2193
+#: ../clients/cli/connections.c:2140
 #, c-format
 msgid "Error: Connection activation failed: %s"
 msgstr "錯誤：啟動連線失敗：%s"
 
-#: ../clients/cli/connections.c:2278
+#: ../clients/cli/connections.c:2225
 #, fuzzy, c-format
 msgid "failed to read passwd-file '%s': %s"
 msgstr "錯誤：移除「%s」的值失敗：%s\n"
 
-#: ../clients/cli/connections.c:2290
+#: ../clients/cli/connections.c:2237
 #, c-format
 msgid "missing colon in 'password' entry '%s'"
 msgstr ""
 
-#: ../clients/cli/connections.c:2298
+#: ../clients/cli/connections.c:2245
 #, c-format
 msgid "missing dot in 'password' entry '%s'"
 msgstr ""
 
-#: ../clients/cli/connections.c:2311
+#: ../clients/cli/connections.c:2258
 #, c-format
 msgid "invalid setting name in 'password' entry '%s'"
 msgstr ""
 
-#: ../clients/cli/connections.c:2367
+#: ../clients/cli/connections.c:2314
 #, c-format
 msgid "unknown device '%s'."
 msgstr "不明的裝置「%s」。"
 
-#: ../clients/cli/connections.c:2372
+#: ../clients/cli/connections.c:2319
 msgid "neither a valid connection nor device given"
 msgstr "連線無效或是無裝置"
 
-#: ../clients/cli/connections.c:2458
+#: ../clients/cli/connections.c:2402
 #, fuzzy, c-format
 msgid "Error: Connection '%s' does not exist."
 msgstr "錯誤：連線無效：%s\n"
 
-#: ../clients/cli/connections.c:2493 ../clients/cli/devices.c:1405
-#: ../clients/cli/devices.c:2416 ../clients/cli/devices.c:2813
-#: ../clients/cli/devices.c:3397
+#: ../clients/cli/connections.c:2437 ../clients/cli/devices.c:1325
+#: ../clients/cli/devices.c:2358 ../clients/cli/devices.c:2752
+#: ../clients/cli/devices.c:3336
 #, c-format
 msgid "Unknown parameter: %s\n"
 msgstr "不明的參數：%s\n"
 
-#: ../clients/cli/connections.c:2518
+#: ../clients/cli/connections.c:2462
 msgid "preparing"
 msgstr "正在準備"
 
-#: ../clients/cli/connections.c:2539
+#: ../clients/cli/connections.c:2483
 #, fuzzy, c-format
 msgid "Connection '%s' (%s) successfully deleted.\n"
 msgstr "連線「%s」 (%s) 已成功新增。\n"
 
-#: ../clients/cli/connections.c:2555
+#: ../clients/cli/connections.c:2499
 #, fuzzy, c-format
 msgid "Connection '%s' successfully deactivated (D-Bus active path: %s)\n"
 msgstr "連線已成功啟用（D-Bus 啟用路徑：%s）\n"
 
-#: ../clients/cli/connections.c:2630 ../clients/cli/connections.c:8018
-#: ../clients/cli/connections.c:8226
+#: ../clients/cli/connections.c:2570 ../clients/cli/connections.c:10391
+#: ../clients/cli/connections.c:10590
 #, c-format
 msgid "Error: No connection specified."
 msgstr "錯誤：尚未指定連線。"
 
-#: ../clients/cli/connections.c:2662
+#: ../clients/cli/connections.c:2602
 #, fuzzy, c-format
 msgid "Error: '%s' is not an active connection.\n"
 msgstr "錯誤：「%s」並非啟用中的連線。"
 
-#: ../clients/cli/connections.c:2663 ../clients/cli/connections.c:8047
+#: ../clients/cli/connections.c:2603 ../clients/cli/connections.c:10420
 #, fuzzy, c-format
 msgid "Error: not all active connections found."
 msgstr "錯誤：「%s」並非啟用中的連線。"
 
-#: ../clients/cli/connections.c:2672
+#: ../clients/cli/connections.c:2612
 #, fuzzy, c-format
 msgid "Error: no active connection provided."
 msgstr "錯誤：無法啟用連線：%s。\n"
 
-#: ../clients/cli/connections.c:3120 ../clients/cli/utils.c:648
+#: ../clients/cli/connections.c:2955 ../clients/cli/utils.c:702
 #, c-format
 msgid "'%s' not among [%s]"
 msgstr "「%s」不在「%s」之間"
 
-#: ../clients/cli/connections.c:3280
+#: ../clients/cli/connections.c:3032
 #, c-format
-msgid "Warning: master='%s' doesn't refer to any existing profile.\n"
-msgstr ""
+msgid "Error: '%s': '%s' is not a valid %s MAC address."
+msgstr "錯誤：「%s」：「%s」不是個有效的 %s MAC 位址。"
 
-#: ../clients/cli/connections.c:3451
-#, fuzzy, c-format
-msgid "Error: don't know how to create '%s' setting."
-msgstr "錯誤：無法取得系統設定。"
+#. Ask for optional arguments
+#: ../clients/cli/connections.c:3033 ../clients/cli/connections.c:3565
+#: ../clients/tui/nm-editor-utils.c:163 ../libnm-core/nm-connection.c:1716
+#: ../libnm-glib/nm-device.c:1861 ../libnm/nm-device.c:1812
+msgid "InfiniBand"
+msgstr "InfiniBand"
 
-#: ../clients/cli/connections.c:3462
+#: ../clients/cli/connections.c:3033 ../clients/tui/nm-editor-utils.c:146
+#: ../libnm-glib/nm-device.c:1849 ../libnm/nm-device.c:1800
+msgid "Ethernet"
+msgstr "Ethernet"
+
+#: ../clients/cli/connections.c:3053
 #, c-format
-msgid "Error: invalid property '%s': %s."
-msgstr "錯誤：無效的內容「%s」：%s。"
+msgid "Error: 'mtu': '%s' is not a valid MTU."
+msgstr "錯誤：「mtu」：「%s」不是個有效的 MTU。"
 
-#: ../clients/cli/connections.c:3479
+#: ../clients/cli/connections.c:3069
 #, c-format
-msgid "Error: failed to modify %s.%s: %s."
-msgstr "錯誤：無法修改 %s.%s：%s。"
+msgid "Error: 'parent': '%s' is not a valid interface name."
+msgstr "錯誤：「parent」：「%s」不是組有效的介面卡名稱。"
 
-#: ../clients/cli/connections.c:3498
-#, fuzzy, c-format
-msgid "Error: failed to remove a value from %s.%s: %s."
-msgstr "錯誤：移除「%s」的值失敗：%s\n"
+#: ../clients/cli/connections.c:3090
+#, c-format
+msgid "Error: 'p-key': '%s' is not a valid InfiniBand P_KEY."
+msgstr "錯誤：「p-key」：「%s」不是組有效的 InfiniBand P_KEY。"
 
-#: ../clients/cli/connections.c:3524
+#: ../clients/cli/connections.c:3105
 #, fuzzy, c-format
-msgid "Error: '%s' is mandatory."
-msgstr "錯誤：「%s」設定不存在\n"
+msgid "Error: '%s' is not a valid UID/GID."
+msgstr "錯誤：「mtu」：「%s」不是個有效的 MTU。"
 
-#: ../clients/cli/connections.c:3556
+#: ../clients/cli/connections.c:3149
 #, fuzzy, c-format
-msgid "Error: invalid slave type; %s."
-msgstr "錯誤：無效的連線類型；%s。"
+msgid "Error: '%s': '%s' is not a valid %s %s."
+msgstr "錯誤：「%s」：「%s」無效；%s"
 
-#: ../clients/cli/connections.c:3569
-#, c-format
-msgid "Error: invalid connection type; %s."
-msgstr "錯誤：無效的連線類型；%s。"
+#: ../clients/cli/connections.c:3162
+#, fuzzy
+msgid "Wi-Fi mode"
+msgstr "無線網路"
 
-#: ../clients/cli/connections.c:3744
-#, fuzzy, c-format
-msgid "Error: bad connection type: %s."
-msgstr "錯誤：無效的連線類型；%s。"
+#: ../clients/cli/connections.c:3171
+#, fuzzy
+msgid "InfiniBand transport mode"
+msgstr "傳輸模式"
 
-#: ../clients/cli/connections.c:3802
-#, fuzzy, c-format
-msgid "Error: '%s' is not a valid interface nor '*'."
-msgstr "錯誤：「ifname」：「%s」不是個有效的介面卡或是「*」。"
+#: ../clients/cli/connections.c:3183
+msgid "ADSL protocol"
+msgstr ""
 
-#: ../clients/cli/connections.c:3825
+#: ../clients/cli/connections.c:3194
 #, fuzzy
-msgid "Error: master is required"
-msgstr "錯誤：需要「mater」。"
+msgid "ADSL encapsulation"
+msgstr "DSL 身份認證"
 
-#: ../clients/cli/connections.c:3883
-#, fuzzy, c-format
-msgid "Error: error adding bond option '%s=%s'."
-msgstr "錯誤：不明的連線「%s」。"
+#: ../clients/cli/connections.c:3203
+#, fuzzy
+msgid "TUN device mode"
+msgstr "裝置已移除"
 
-#: ../clients/cli/connections.c:3914
+#: ../clients/cli/connections.c:3216
 #, c-format
-msgid "Error: '%s' is not a valid monitoring mode; use '%s' or '%s'.\n"
-msgstr "錯誤：「%s」不是個有效的監控模式；請使用「%s」或是「%s」。\n"
+msgid "Error: 'flags': '%s' is not valid; use <0-7>."
+msgstr "錯誤：「flags」：「%s」無效；使用 <0-7>。"
 
-#: ../clients/cli/connections.c:3945
+#: ../clients/cli/connections.c:3238
 #, c-format
-msgid "Error: 'bt-type': '%s' not valid; use [%s, %s (%s), %s]."
-msgstr "錯誤：「bt-type」：「%s」無效；請使用 [%s, %s (%s), %s]。"
+msgid "Error: '%s': '%s' is not valid; %s "
+msgstr "錯誤：「%s」：「%s」無效；%s"
 
-#: ../clients/cli/connections.c:3972
-#, fuzzy
-msgid "Interface name [*]"
-msgstr "介面卡名稱 [*]："
+#: ../clients/cli/connections.c:3416
+#, c-format
+msgid "Warning: master='%s' doesn't refer to any existing profile.\n"
+msgstr ""
 
-#: ../clients/cli/connections.c:3976
-#, fuzzy
-msgid "PPPoE username"
-msgstr "PPPoE 使用者名稱："
+#: ../clients/cli/connections.c:3441
+#, c-format
+msgid "Error: '%s': '%s' is not valid; use <%u-%u>."
+msgstr "錯誤：「%s」：「%s」無效；使用 <%u-%u>。"
 
-#: ../clients/cli/connections.c:3977 ../clients/cli/connections.c:3998
-#: ../clients/cli/connections.c:4000 ../clients/cli/connections.c:4049
-#, fuzzy
-msgid "Password [none]"
-msgstr "密碼 [none]："
+#. Ask for optional arguments.
+#: ../clients/cli/connections.c:3497
+#, fuzzy, c-format
+msgid "There is %d optional argument for '%s' connection type.\n"
+msgid_plural "There are %d optional arguments for '%s' connection type.\n"
+msgstr[0] "「%s」的連線類型有一個選用引數。\n"
 
-#: ../clients/cli/connections.c:3978
-#, fuzzy
-msgid "Service [none]"
-msgstr "服務 [none]："
+#: ../clients/cli/connections.c:3500
+#, fuzzy, c-format
+msgid "Do you want to provide it? %s"
+msgid_plural "Do you want to provide them? %s"
+msgstr[0] "您是否希望提供它？（yes/no）[yes]"
 
-#: ../clients/cli/connections.c:3979 ../clients/cli/connections.c:3982
-#: ../clients/cli/connections.c:3991
-#, fuzzy
-msgid "MTU [auto]"
+#. Ask for optional arguments
+#: ../clients/cli/connections.c:3517
+msgid "ethernet"
+msgstr "乙太網路"
+
+#: ../clients/cli/connections.c:3522 ../clients/cli/connections.c:3570
+#: ../clients/cli/connections.c:3704 ../clients/cli/connections.c:3783
+msgid "MTU [auto]: "
 msgstr "MTU [auto]："
 
-#: ../clients/cli/connections.c:3980 ../clients/cli/connections.c:3983
-#: ../clients/cli/connections.c:3992 ../clients/cli/connections.c:3995
-#: ../clients/cli/connections.c:4036
-#, fuzzy
-msgid "MAC [none]"
+#: ../clients/cli/connections.c:3533 ../clients/cli/connections.c:3581
+#: ../clients/cli/connections.c:3676 ../clients/cli/connections.c:3715
+#: ../clients/cli/connections.c:4101
+msgid "MAC [none]: "
 msgstr "MAC [none]："
 
-#: ../clients/cli/connections.c:3981 ../clients/cli/connections.c:3993
-#, fuzzy
-msgid "Cloned MAC [none]"
+#: ../clients/cli/connections.c:3544
+msgid "Cloned MAC [none]: "
 msgstr "Cloned MAC [none]："
 
-#: ../clients/cli/connections.c:3986
-#, fuzzy
-msgid "Parent interface [none]"
+#: ../clients/cli/connections.c:3592
+#, fuzzy, c-format
+msgid "Transport mode %s"
+msgstr "傳輸模式"
+
+#: ../clients/cli/connections.c:3605
+msgid "Parent interface [none]: "
 msgstr "父介面卡 [none]："
 
-#: ../clients/cli/connections.c:3987
-#, fuzzy
-msgid "P_KEY [none]"
+#: ../clients/cli/connections.c:3616
+msgid "P_KEY [none]: "
 msgstr "P_KEY [none]："
 
-#. 0
-#: ../clients/cli/connections.c:3988 ../clients/cli/connections.c:4043
-#: ../clients/cli/devices.c:151 ../clients/tui/nmt-page-wifi.c:224
-msgid "SSID"
-msgstr "SSID"
+#: ../clients/cli/connections.c:3626
+#, c-format
+msgid "Error: 'p-key' is mandatory when 'parent' is specified.\n"
+msgstr "錯誤：當指定了「parent」時，「p-key」是必要的。\n"
 
-#: ../clients/cli/connections.c:3994
-#, fuzzy
-msgid "WiMAX NSP name"
-msgstr "WiMAX NSP 名稱："
+#. Ask for optional arguments
+#: ../clients/cli/connections.c:3643 ../clients/tui/nm-editor-utils.c:154
+#: ../libnm-glib/nm-device.c:1851 ../libnm/nm-device.c:1802
+msgid "Wi-Fi"
+msgstr "無線網路"
 
-#: ../clients/cli/connections.c:3996
-#, fuzzy
-msgid "APN"
-msgstr "AP"
+#: ../clients/cli/connections.c:3651 ../clients/cli/connections.c:6199
+#, fuzzy, c-format
+msgid "Mode %s"
+msgstr "模式"
 
-#: ../clients/cli/connections.c:3997 ../clients/cli/connections.c:3999
-#: ../clients/cli/connections.c:4042
+#. Ask for optional 'wimax' arguments.
+#: ../clients/cli/connections.c:3671 ../libnm-glib/nm-device.c:1857
+#: ../libnm/nm-device.c:1808
+msgid "WiMAX"
+msgstr "WiMAX"
+
+#. Ask for optional 'pppoe' arguments.
+#: ../clients/cli/connections.c:3694
+msgid "PPPoE"
+msgstr ""
+
+#: ../clients/cli/connections.c:3698 ../clients/cli/connections.c:3736
+#: ../clients/cli/connections.c:4223
+msgid "Password [none]: "
+msgstr "密碼 [none]："
+
+#: ../clients/cli/connections.c:3700
+msgid "Service [none]: "
+msgstr "服務 [none]："
+
+#. Ask for optional 'gsm' or 'cdma' arguments.
+#: ../clients/cli/connections.c:3730
 #, fuzzy
-msgid "Username [none]"
+msgid "mobile broadband"
+msgstr "行動寬頻"
+
+#: ../clients/cli/connections.c:3734 ../clients/cli/connections.c:4173
+msgid "Username [none]: "
 msgstr "使用者名稱 [none]："
 
-#: ../clients/cli/connections.c:4001
+#. Ask for optional 'bluetooth' arguments.
+#: ../clients/cli/connections.c:3749
 #, fuzzy
-msgid "Bluetooth device address"
-msgstr "藍牙裝置位址："
+msgid "bluetooth"
+msgstr "藍牙"
 
-#: ../clients/cli/connections.c:4004
-#, fuzzy
-msgid "VLAN parent device or connection UUID"
-msgstr "VLAN 父裝置或連線 UUID："
+#: ../clients/cli/connections.c:3756
+#, fuzzy, c-format
+msgid "Bluetooth type %s"
+msgstr "藍牙"
 
-#: ../clients/cli/connections.c:4006
-#, fuzzy
-msgid "VLAN ID (<0-4094>)"
-msgstr "VLAN ID <0-4095>："
+#: ../clients/cli/connections.c:3762
+#, c-format
+msgid "Error: 'bt-type': '%s' is not a valid bluetooth type.\n"
+msgstr "錯誤：「bt-type」：「%s」不是個有效的藍牙類型。\n"
 
-#: ../clients/cli/connections.c:4007
-#, fuzzy
-msgid "VLAN flags (<0-7>) [none]"
+#. Ask for optional 'vlan' arguments.
+#. 13
+#: ../clients/cli/connections.c:3778 ../clients/cli/devices.c:239
+#: ../clients/tui/nm-editor-utils.c:217 ../clients/tui/nmt-page-vlan.c:94
+#: ../libnm-core/nm-connection.c:1714 ../libnm-glib/nm-device.c:1869
+#: ../libnm-util/nm-connection.c:1632 ../libnm/nm-device.c:1820
+msgid "VLAN"
+msgstr "VLAN"
+
+#: ../clients/cli/connections.c:3794
+msgid "VLAN flags (<0-7>) [none]: "
 msgstr "VLAN 旗標（<0-7>）[none]："
 
-#: ../clients/cli/connections.c:4008
-#, fuzzy
-msgid "Ingress priority maps [none]"
+#: ../clients/cli/connections.c:3805
+msgid "Ingress priority maps [none]: "
 msgstr "Ingress 優先順序對映 [none]："
 
-#: ../clients/cli/connections.c:4009
-#, fuzzy
-msgid "Egress priority maps [none]"
+#: ../clients/cli/connections.c:3816
+msgid "Egress priority maps [none]: "
 msgstr "Egress 優先順序對映 [none]："
 
-#: ../clients/cli/connections.c:4012
-#, fuzzy
-msgid "Bonding primary interface [none]"
+#: ../clients/cli/connections.c:3827
+msgid "Bonding mode [balance-rr]: "
+msgstr "Bonding 模式 [balance-rr]："
+
+#. Ask for optional 'bond' arguments.
+#: ../clients/cli/connections.c:3843
+msgid "bond"
+msgstr ""
+
+#: ../clients/cli/connections.c:3865
+msgid "Bonding primary interface [none]: "
 msgstr "Bonding 主要介面卡 [none]："
 
-#: ../clients/cli/connections.c:4016
-#, fuzzy
-msgid "Bonding miimon [100]"
+#: ../clients/cli/connections.c:3868
+#, c-format
+msgid "Error: 'primary': '%s' is not a valid interface name.\n"
+msgstr "錯誤：「primary」：「%s」不是組有效的介面卡名稱。\n"
+
+#: ../clients/cli/connections.c:3876
+#, fuzzy, c-format
+msgid "Bonding monitoring mode %s"
+msgstr "連結監控"
+
+#: ../clients/cli/connections.c:3882
+#, 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:3891
+msgid "Bonding miimon [100]: "
 msgstr "Bonding miimon [100]："
 
-#: ../clients/cli/connections.c:4017
-#, fuzzy
-msgid "Bonding downdelay [0]"
+#: ../clients/cli/connections.c:3894
+#, c-format
+msgid "Error: 'miimon': '%s' is not a valid number <0-%u>.\n"
+msgstr "錯誤：「miimon」：「%s」不是個有效的數字 <0-%u>。\n"
+
+#: ../clients/cli/connections.c:3902
+msgid "Bonding downdelay [0]: "
 msgstr "Bonding downdelay [0]："
 
-#: ../clients/cli/connections.c:4018
-#, fuzzy
-msgid "Bonding updelay [0]"
+#: ../clients/cli/connections.c:3905
+#, c-format
+msgid "Error: 'downdelay': '%s' is not a valid number <0-%u>.\n"
+msgstr "錯誤：「downdelay」：「%s」不是個有效的數字 <0-%u>。\n"
+
+#: ../clients/cli/connections.c:3913
+msgid "Bonding updelay [0]: "
 msgstr "Bonding updelay [0]："
 
-#: ../clients/cli/connections.c:4019
-#, fuzzy
-msgid "Bonding arp-interval [0]"
+#: ../clients/cli/connections.c:3916
+#, c-format
+msgid "Error: 'updelay': '%s' is not a valid number <0-%u>.\n"
+msgstr "錯誤：「updelay」：「%s」不是個有效的數字 <0-%u>。\n"
+
+#: ../clients/cli/connections.c:3925
+msgid "Bonding arp-interval [0]: "
 msgstr "Bonding arp-interval [0]："
 
-#: ../clients/cli/connections.c:4021
-#, fuzzy
-msgid "Bonding arp-ip-target [none]"
+#: ../clients/cli/connections.c:3928
+#, c-format
+msgid "Error: 'arp-interval': '%s' is not a valid number <0-%u>.\n"
+msgstr "錯誤：「arp-interval」：「%s」不是個有效的數字 <0-%u>。\n"
+
+#. FIXME: verify the string
+#: ../clients/cli/connections.c:3936
+msgid "Bonding arp-ip-target [none]: "
 msgstr "Bonding arp-ip-target [none]："
 
-#: ../clients/cli/connections.c:4023
-msgid "LACP rate ('slow' or 'fast') [slow]"
+#: ../clients/cli/connections.c:3943
+msgid "LACP rate ('slow' or 'fast') [slow]: "
 msgstr ""
 
-#: ../clients/cli/connections.c:4025 ../clients/cli/connections.c:4026
-#, fuzzy
-msgid "Team JSON configuration [none]"
+#: ../clients/cli/connections.c:3949
+#, fuzzy, c-format
+msgid "Error: 'lacp_rate': '%s' is invalid ('slow' or 'fast').\n"
+msgstr "錯誤：「master」：「%s」不是個有效的 UUID 或是介面卡。"
+
+#: ../clients/cli/connections.c:3972
+msgid "Team JSON configuration [none]: "
 msgstr "團隊 JSON 的配置 [none]："
 
-#: ../clients/cli/connections.c:4027
+#: ../clients/cli/connections.c:3989
+msgid "team"
+msgstr "team"
+
+#: ../clients/cli/connections.c:3995
+msgid "team-slave"
+msgstr "team-slave"
+
+#. Ask for optional 'bridge' arguments.
+#: ../clients/cli/connections.c:4007
 #, fuzzy
-msgid "Enable STP [no]"
+msgid "bridge"
+msgstr "橋接"
+
+#: ../clients/cli/connections.c:4013
+#, fuzzy, c-format
+msgid "Enable STP %s"
 msgstr "啟用 STP（yes/no）[yes]："
 
-#: ../clients/cli/connections.c:4029
+#: ../clients/cli/connections.c:4018
+#, fuzzy, c-format
+msgid "Error: 'stp': %s.\n"
+msgstr "錯誤：「stp」：%s。"
+
+#: ../clients/cli/connections.c:4026
 #, fuzzy
-msgid "STP priority [32768]"
+msgid "STP priority [32768]: "
 msgstr "STP 優先順序 [128]："
 
 #: ../clients/cli/connections.c:4030
-#, fuzzy
-msgid "Forward delay [15]"
+#, c-format
+msgid "Error: 'priority': '%s' is not a valid number <0-%d>.\n"
+msgstr "錯誤：「priority」：「%s」不是個有效的數字 <0-%d>。\n"
+
+#: ../clients/cli/connections.c:4038
+msgid "Forward delay [15]: "
 msgstr "Forward delay [15]："
 
-#: ../clients/cli/connections.c:4031
-#, fuzzy
-msgid "Hello time [2]"
+#: ../clients/cli/connections.c:4042
+#, c-format
+msgid "Error: 'forward-delay': '%s' is not a valid number <2-30>.\n"
+msgstr "錯誤：「forward-delay」：「%s」不是個有效的數字 <2-30>。\n"
+
+#: ../clients/cli/connections.c:4051
+msgid "Hello time [2]: "
 msgstr "Hello time [2]："
 
-#: ../clients/cli/connections.c:4032
-#, fuzzy
-msgid "Max age [20]"
+#: ../clients/cli/connections.c:4055
+#, c-format
+msgid "Error: 'hello-time': '%s' is not a valid number <1-10>.\n"
+msgstr "錯誤：「hello-time」：「%s」不是個有效的數字 <1-10>。\n"
+
+#: ../clients/cli/connections.c:4063
+msgid "Max age [20]: "
 msgstr "Max age [20]："
 
-#: ../clients/cli/connections.c:4033
-#, fuzzy
-msgid "MAC address ageing time [300]"
+#: ../clients/cli/connections.c:4067
+#, c-format
+msgid "Error: 'max-age': '%s' is not a valid number <6-40>.\n"
+msgstr "錯誤：「max-age」：「%s」不是個有效的數字 <6-40>。\n"
+
+#: ../clients/cli/connections.c:4075
+msgid "MAC address ageing time [300]: "
 msgstr "MAC address ageing time [300]："
 
-#: ../clients/cli/connections.c:4034
+#: ../clients/cli/connections.c:4079
+#, c-format
+msgid "Error: 'ageing-time': '%s' is not a valid number <0-1000000>.\n"
+msgstr "錯誤：「ageing-time」：「%s」不是個有效的數字 <0-1000000>。\n"
+
+#: ../clients/cli/connections.c:4088
 #, c-format
-msgid "Enable IGMP snooping %s [no]"
+msgid "Enable IGMP snooping %s"
 msgstr ""
 
-#: ../clients/cli/connections.c:4037
+#: ../clients/cli/connections.c:4093
+#, fuzzy, c-format
+msgid "Error: 'multicast-snooping': %s.\n"
+msgstr "錯誤：「stp」：%s。"
+
+#. Ask for optional 'bridge-slave' arguments.
+#: ../clients/cli/connections.c:4120
 #, fuzzy
-msgid "Bridge port priority [32]"
+msgid "bridge-slave"
+msgstr "team-slave"
+
+#: ../clients/cli/connections.c:4125
+msgid "Bridge port priority [32]: "
 msgstr "橋接連接埠優先順序 [32]："
 
-#: ../clients/cli/connections.c:4038
-#, fuzzy
-msgid "Bridge port STP path cost [100]"
+#: ../clients/cli/connections.c:4138
+msgid "Bridge port STP path cost [100]: "
 msgstr "橋接連接埠 STP path cost [100]："
 
-#: ../clients/cli/connections.c:4039
-#, fuzzy
-msgid "Hairpin [no]"
+#: ../clients/cli/connections.c:4152
+#, fuzzy, c-format
+msgid "Hairpin %s"
 msgstr "Hairpin 模式"
 
-#: ../clients/cli/connections.c:4044
-#, fuzzy
-msgid "OLPC Mesh channel [1]"
+#: ../clients/cli/connections.c:4157
+#, fuzzy, c-format
+msgid "Error: 'hairpin': %s.\n"
+msgstr "錯誤：「hairpin」：%s。"
+
+#. Ask for optional 'olpc' arguments.
+#: ../clients/cli/connections.c:4184 ../libnm-glib/nm-device.c:1855
+#: ../libnm/nm-device.c:1806
+msgid "OLPC Mesh"
+msgstr "OLPC Mesh"
+
+#: ../clients/cli/connections.c:4189
+msgid "OLPC Mesh channel [1]: "
 msgstr "OLPC Mesh channel [1]："
 
-#: ../clients/cli/connections.c:4045
-#, fuzzy
-msgid "DHCP anycast MAC address [none]"
+#: ../clients/cli/connections.c:4192
+#, c-format
+msgid "Error: 'channel': '%s' is not a valid number <1-13>.\n"
+msgstr "錯誤：「channel」：「%s」不是個有效的數字 <1-13>。\n"
+
+#: ../clients/cli/connections.c:4200
+msgid "DHCP anycast MAC address [none]: "
 msgstr "DHCP anycast MAC address [none]："
 
-#. TTLS and PEAP are actually much more complicated, but this complication
-#. * is not visible here since we only care about phase2 authentication
-#. * (and don't even care of which one)
-#.
-#: ../clients/cli/connections.c:4046
-#: ../clients/common/nm-secret-agent-simple.c:223
-#: ../clients/common/nm-secret-agent-simple.c:328
-#: ../clients/tui/nmt-page-dsl.c:66 ../clients/tui/nmt-page-wifi.c:332
-msgid "Username"
-msgstr "使用者名稱"
+#. Ask for optional 'adsl' arguments.
+#: ../clients/cli/connections.c:4219 ../libnm-glib/nm-device.c:1871
+#: ../libnm/nm-device.c:1822
+msgid "ADSL"
+msgstr "ADSL"
 
-#: ../clients/cli/connections.c:4052
-#, fuzzy
-msgid "MACVLAN parent device or connection UUID"
-msgstr "VLAN 父裝置或連線 UUID："
+#: ../clients/cli/connections.c:4227
+#, fuzzy, c-format
+msgid "ADSL encapsulation %s"
+msgstr "ADSL 連線 %d"
 
-#: ../clients/cli/connections.c:4055
-msgid "Tap [no]"
+#. Ask for optional 'macvlan' arguments.
+#: ../clients/cli/connections.c:4245
+msgid "macvlan"
 msgstr ""
 
-#: ../clients/cli/connections.c:4057
-#, fuzzy
-msgid "VXLAN ID"
-msgstr "VLAN ID <0-4095>："
+#: ../clients/cli/connections.c:4251
+#, c-format
+msgid "Tap %s"
+msgstr ""
 
-#: ../clients/cli/connections.c:4058 ../clients/cli/connections.c:4076
-#, fuzzy
-msgid "Remote"
-msgstr "移除"
+#: ../clients/cli/connections.c:4256
+#, fuzzy, c-format
+msgid "Error: 'tap': %s.\n"
+msgstr "錯誤：「stp」：%s。"
 
-#: ../clients/cli/connections.c:4059 ../clients/cli/connections.c:4077
+#. Ask for optional 'vxlan' arguments.
+#: ../clients/cli/connections.c:4272 ../libnm-glib/nm-device.c:1875
+#: ../libnm/nm-device.c:1826
+msgid "VXLAN"
+msgstr ""
+
+#: ../clients/cli/connections.c:4277 ../clients/cli/connections.c:4601
 #, fuzzy
-msgid "Parent device [none]"
+msgid "Parent device [none]: "
 msgstr "父介面卡 [none]："
 
-#: ../clients/cli/connections.c:4060
+#: ../clients/cli/connections.c:4282 ../clients/cli/connections.c:4606
+#, fuzzy, c-format
+msgid "Error: 'dev': '%s' is neither UUID nor interface name.\n"
+msgstr "錯誤：「dev」：「%s」不是 UUID、介面卡名稱，或是 MAC。"
+
+#: ../clients/cli/connections.c:4291
 #, fuzzy
-msgid "Local address [none]"
+msgid "Local address [none]: "
 msgstr "DHCP anycast MAC address [none]："
 
-#: ../clients/cli/connections.c:4061
-msgid "Minimum source port [0]"
+#: ../clients/cli/connections.c:4296
+#, fuzzy, c-format
+msgid "Error: 'local': '%s' is not a valid IP address.\n"
+msgstr "錯誤：「%s」：「%s」不是個有效的 %s MAC 位址。"
+
+#: ../clients/cli/connections.c:4305
+msgid "Minimum source port [0]: "
 msgstr ""
 
-#: ../clients/cli/connections.c:4062
-msgid "Maximum source port [0]"
+#: ../clients/cli/connections.c:4309
+#, fuzzy, c-format
+msgid "Error: 'source-port-min': '%s' is not a valid number <0-65535>.\n"
+msgstr "錯誤：「priority」：「%s」不是個有效的數字 <0-%d>。\n"
+
+#: ../clients/cli/connections.c:4318
+msgid "Maximum source port [0]: "
 msgstr ""
 
-#: ../clients/cli/connections.c:4063
+#: ../clients/cli/connections.c:4322
+#, fuzzy, c-format
+msgid "Error: 'source-port-max': '%s' is not a valid number <0-65535>.\n"
+msgstr "錯誤：「priority」：「%s」不是個有效的數字 <0-%d>。\n"
+
+#: ../clients/cli/connections.c:4331
 #, fuzzy
-msgid "Destination port [8472]"
+msgid "Destination port [8472]: "
 msgstr "目的"
 
-#: ../clients/cli/connections.c:4066
-#, fuzzy
-msgid "User ID [none]"
-msgstr "使用者名稱 [none]："
+#: ../clients/cli/connections.c:4335
+#, fuzzy, c-format
+msgid "Error: 'destination-port': '%s' is not a valid number <0-65535>.\n"
+msgstr "錯誤：「miimon」：「%s」不是個有效的數字 <0-%u>。\n"
 
-#: ../clients/cli/connections.c:4067
+#: ../clients/cli/connections.c:4374
 #, fuzzy
-msgid "Group ID [none]"
-msgstr "MAC [none]："
+msgid "IPv4 address (IP[/plen]) [none]: "
+msgstr "IPv4 address (IP[/plen] [gateway]) [none]："
 
-#: ../clients/cli/connections.c:4068
+#: ../clients/cli/connections.c:4376
 #, fuzzy
-msgid "Enable PI [no]"
-msgstr "啟用 STP（yes/no）[yes]："
+msgid "IPv6 address (IP[/plen]) [none]: "
+msgstr "IPv6 address (IP[/plen] [gateway]) [none]："
 
-#: ../clients/cli/connections.c:4070
-msgid "Enable VNET header [no]"
-msgstr ""
+#: ../clients/cli/connections.c:4390
+#, fuzzy, c-format
+msgid "  Address successfully added: %s\n"
+msgstr "位址已成功新增：%s %s\n"
 
-#: ../clients/cli/connections.c:4072
-msgid "Enable multi queue [no]"
-msgstr ""
+#: ../clients/cli/connections.c:4392
+#, fuzzy, c-format
+msgid "  Warning: address already present: %s\n"
+msgstr "警告：位址已存在：%s %s\n"
 
-#: ../clients/cli/connections.c:4075
-#, fuzzy
-msgid "Local endpoint [none]"
-msgstr "父介面卡 [none]："
+#: ../clients/cli/connections.c:4394
+#, c-format
+msgid "  Warning: ignoring garbage at the end: '%s'\n"
+msgstr "警告：將忽略尾端不必要的項目：「%s」\n"
 
-#: ../clients/cli/connections.c:4078
-#, fuzzy
-msgid "IPv4 address (IP[/plen]) [none]"
-msgstr "IPv4 address (IP[/plen] [gateway]) [none]："
+#: ../clients/cli/connections.c:4396 ../clients/cli/connections.c:5605
+#: ../clients/cli/connections.c:5652 ../clients/cli/connections.c:6569
+#: ../clients/cli/connections.c:6602
+msgid "Error: "
+msgstr "錯誤："
 
-#: ../clients/cli/connections.c:4079
+#: ../clients/cli/connections.c:4416
 #, fuzzy
-msgid "IPv4 gateway [none]"
+msgid "IPv4 gateway [none]: "
 msgstr "IPv4 address (IP[/plen] [gateway]) [none]："
 
-#: ../clients/cli/connections.c:4080
+#: ../clients/cli/connections.c:4419
 #, fuzzy
-msgid "IPv6 address (IP[/plen]) [none]"
+msgid "IPv6 gateway [none]: "
 msgstr "IPv6 address (IP[/plen] [gateway]) [none]："
 
-#: ../clients/cli/connections.c:4081
+#: ../clients/cli/connections.c:4439
+#, fuzzy, c-format
+msgid "Error: invalid gateway address '%s'\n"
+msgstr "錯誤：無效的額外引數「%s」。"
+
+#. Ask for IP addresses
+#: ../clients/cli/connections.c:4452
+#, fuzzy, c-format
+msgid "Do you want to add IP addresses? %s"
+msgstr "您是否希望新增 IP 位址？（yes/no）[yes]"
+
+#: ../clients/cli/connections.c:4460
+#, c-format
+msgid "Press <Enter> to finish adding addresses.\n"
+msgstr "按下 <Enter> 來完成新增位址。\n"
+
+#. Ask for optional 'tun' arguments.
+#: ../clients/cli/connections.c:4504 ../libnm-glib/nm-device.c:1879
+#: ../libnm/nm-device.c:1830
+msgid "Tun"
+msgstr ""
+
+#: ../clients/cli/connections.c:4509
 #, fuzzy
-msgid "IPv6 gateway [none]"
-msgstr "IPv6 address (IP[/plen] [gateway]) [none]："
+msgid "User ID [none]: "
+msgstr "使用者名稱 [none]："
 
-#: ../clients/cli/connections.c:4205
+#: ../clients/cli/connections.c:4522
+#, fuzzy
+msgid "Group ID [none]: "
+msgstr "MAC [none]："
+
+#: ../clients/cli/connections.c:4536
+#, c-format
+msgid "Enable PI %s"
+msgstr ""
+
+#: ../clients/cli/connections.c:4541
 #, fuzzy, c-format
-msgid "Error: value for '%s' is missing."
-msgstr "錯誤：找不到 '%s' 選項的欄位。"
+msgid "Error: 'pi': %s.\n"
+msgstr "錯誤：「stp」：%s。"
 
-#: ../clients/cli/connections.c:4252
-msgid "Error: <setting>.<property> argument is missing."
-msgstr "錯誤：<setting>.<property> 引數遺失。"
+#: ../clients/cli/connections.c:4549
+#, c-format
+msgid "Enable VNET header %s"
+msgstr ""
+
+#: ../clients/cli/connections.c:4554
+#, fuzzy, c-format
+msgid "Error: 'vnet-hdr': %s.\n"
+msgstr "錯誤：「vpn-type」：%s。"
 
-#: ../clients/cli/connections.c:4274
+#: ../clients/cli/connections.c:4562
 #, c-format
-msgid "Error: invalid or not allowed setting '%s': %s."
-msgstr "錯誤：設定「%s」無效或不被允許：%s。"
+msgid "Enable multi queue %s"
+msgstr ""
 
-#: ../clients/cli/connections.c:4301
+#: ../clients/cli/connections.c:4567
 #, fuzzy, c-format
-msgid "Error: '%s' is ambiguous (%s.%s or %s.%s)."
-msgstr "「%s」意義含糊不清（%s x %s）"
+msgid "Error: 'multi-queue': %s.\n"
+msgstr "錯誤：「mode」：%s。"
+
+#. Ask for optional 'ip-tunnel' arguments.
+#: ../clients/cli/connections.c:4581
+msgid "IP Tunnel"
+msgstr ""
+
+#: ../clients/cli/connections.c:4586
+#, fuzzy
+msgid "Local endpoint [none]: "
+msgstr "父介面卡 [none]："
+
+#: ../clients/cli/connections.c:4592
+#, fuzzy, c-format
+msgid "Error: 'local': '%s' is not valid; must be an IP address\n"
+msgstr "錯誤：「%s」：「%s」不是個有效的 %s MAC 位址。"
+
+#: ../clients/cli/connections.c:4658 ../clients/cli/connections.c:10184
+#, c-format
+msgid "Error: <setting>.<property> argument is missing."
+msgstr "錯誤：<setting>.<property> 引數遺失。"
+
+#: ../clients/cli/connections.c:4663
+#, fuzzy, c-format
+msgid "Error: value for '%s' is missing."
+msgstr "錯誤：找不到 '%s' 選項的欄位。"
 
-#: ../clients/cli/connections.c:4315
+#: ../clients/cli/connections.c:4681
 #, c-format
 msgid "Error: invalid <setting>.<property> '%s'."
 msgstr "錯誤：無效的 <setting>.<property> '%s'。"
 
-#: ../clients/cli/connections.c:4356 ../clients/cli/connections.c:7842
+#: ../clients/cli/connections.c:4689
+#, c-format
+msgid "Error: invalid or not allowed setting '%s': %s."
+msgstr "錯誤：設定「%s」無效或不被允許：%s。"
+
+#: ../clients/cli/connections.c:4700
 #, fuzzy, c-format
-msgid "Error: Failed to add '%s' connection: %s"
-msgstr "錯誤：無法新增「%s」連線：(%d) %s"
+msgid "Error: don't know how to create '%s' setting."
+msgstr "錯誤：無法取得系統設定。"
 
-#: ../clients/cli/connections.c:4361
+#: ../clients/cli/connections.c:4710
 #, c-format
-msgid "Connection '%s' (%s) successfully added.\n"
-msgstr "連線「%s」 (%s) 已成功新增。\n"
+msgid "Error: invalid property '%s': %s."
+msgstr "錯誤：無效的內容「%s」：%s。"
+
+#: ../clients/cli/connections.c:4722
+#, c-format
+msgid "Error: failed to modify %s.%s: %s."
+msgstr "錯誤：無法修改 %s.%s：%s。"
+
+#: ../clients/cli/connections.c:4741
+#, fuzzy, c-format
+msgid "Error: failed to remove a value from %s.%s: %s."
+msgstr "錯誤：移除「%s」的值失敗：%s\n"
 
-#: ../clients/cli/connections.c:4477
+#: ../clients/cli/connections.c:4775
 #, c-format
 msgid ""
-"You can specify this option more than once. Press <Enter> when you're done.\n"
+"Warning: 'type' is ignored. Use 'nmcli connection add \"%s\" ...' instead."
 msgstr ""
 
-#. Ask for optional arguments.
-#: ../clients/cli/connections.c:4515
+#: ../clients/cli/connections.c:4783
+#, fuzzy
+msgid "Error: redundant 'master' option."
+msgstr "錯誤：'%s' 選項的引數遺失。"
+
+#: ../clients/cli/connections.c:4796
+msgid "Error: 'master' is required."
+msgstr "錯誤：需要「mater」。"
+
+#: ../clients/cli/connections.c:4950
+#, c-format
+msgid "Error: 'parent': not valid without 'p-key'."
+msgstr "錯誤：「parent」：缺少「p-key」無效。"
+
+#: ../clients/cli/connections.c:5005 ../clients/cli/connections.c:5967
+msgid "SSID: "
+msgstr "SSID："
+
+#: ../clients/cli/connections.c:5008 ../clients/cli/connections.c:5970
+msgid "Error: 'ssid' is required."
+msgstr "錯誤：需要「ssid」。"
+
+#: ../clients/cli/connections.c:5072
+msgid "WiMAX NSP name: "
+msgstr "WiMAX NSP 名稱："
+
+#: ../clients/cli/connections.c:5075
+msgid "Error: 'nsp' is required."
+msgstr "錯誤：需要「nsp」。"
+
+#: ../clients/cli/connections.c:5127
+msgid "PPPoE username: "
+msgstr "PPPoE 使用者名稱："
+
+#: ../clients/cli/connections.c:5130 ../clients/cli/connections.c:6037
+msgid "Error: 'username' is required."
+msgstr "錯誤：需要「username」。"
+
+#: ../clients/cli/connections.c:5199
+msgid "APN: "
+msgstr "APN："
+
+#: ../clients/cli/connections.c:5202
+msgid "Error: 'apn' is required."
+msgstr "錯誤：需要「apn」。"
+
+#: ../clients/cli/connections.c:5260
+msgid "Bluetooth device address: "
+msgstr "藍牙裝置位址："
+
+#: ../clients/cli/connections.c:5263
+msgid "Error: 'addr' is required."
+msgstr "錯誤：需要「addr」。"
+
+#: ../clients/cli/connections.c:5304
+#, c-format
+msgid "Error: 'bt-type': '%s' not valid; use [%s, %s (%s), %s]."
+msgstr "錯誤：「bt-type」：「%s」無效；請使用 [%s, %s (%s), %s]。"
+
+#: ../clients/cli/connections.c:5348
+msgid "VLAN parent device or connection UUID: "
+msgstr "VLAN 父裝置或連線 UUID："
+
+#: ../clients/cli/connections.c:5351 ../clients/cli/connections.c:6108
+msgid "Error: 'dev' is required."
+msgstr "錯誤：需要「dev」。"
+
+#: ../clients/cli/connections.c:5355
+#, fuzzy
+msgid "VLAN ID <0-4094>: "
+msgstr "VLAN ID <0-4095>："
+
+#: ../clients/cli/connections.c:5358 ../clients/cli/connections.c:6424
+msgid "Error: 'id' is required."
+msgstr "錯誤：需要「id」。"
+
+#: ../clients/cli/connections.c:5364
 #, fuzzy, c-format
-msgid "There is %d optional setting for %s.\n"
-msgid_plural "There are %d optional settings for %s.\n"
-msgstr[0] "「%s」的連線類型有一個選用引數。\n"
+msgid "Error: 'id': '%s' is not valid; use <0-4094>."
+msgstr "錯誤：「id」：「%s」無效；請使用 <0-4095>。"
+
+#: ../clients/cli/connections.c:5374 ../clients/cli/connections.c:6116
+#, c-format
+msgid "Error: 'dev': '%s' is neither UUID, interface name, nor MAC."
+msgstr "錯誤：「dev」：「%s」不是 UUID、介面卡名稱，或是 MAC。"
 
-#: ../clients/cli/connections.c:4518
+#: ../clients/cli/connections.c:5506
+#, c-format
+msgid "Error: 'mode': %s."
+msgstr "錯誤：「mode」：%s。"
+
+#: ../clients/cli/connections.c:5515
+#, c-format
+msgid "Error: 'primary': '%s' is not a valid interface name."
+msgstr "錯誤：「primary」：「%s」不是組有效的介面卡名稱。"
+
+#: ../clients/cli/connections.c:5738
+#, c-format
+msgid "Error: 'stp': %s."
+msgstr "錯誤：「stp」：%s。"
+
+#: ../clients/cli/connections.c:5747
 #, fuzzy, c-format
-msgid "Do you want to provide it? %s"
-msgid_plural "Do you want to provide them? %s"
-msgstr[0] "您是否希望提供它？（yes/no）[yes]"
+msgid "Error: 'multicast-snooping': %s."
+msgstr "錯誤：「stp」：%s。"
 
-#: ../clients/cli/connections.c:4532
-#, fuzzy
-msgid "Wired Ethernet"
-msgstr "Ethernet"
+#: ../clients/cli/connections.c:5866
+#, c-format
+msgid "Error: 'hairpin': %s."
+msgstr "錯誤：「hairpin」：%s。"
 
-#: ../clients/cli/connections.c:4534 ../src/devices/nm-device-infiniband.c:175
-#, fuzzy
-msgid "InfiniBand connection"
-msgstr "InfiniBand 連線 %d"
+#: ../clients/cli/connections.c:5915
+msgid "Error: 'vpn-type' is required."
+msgstr "錯誤：需要「vpn-type」。"
 
-#: ../clients/cli/connections.c:4536
-#, fuzzy
-msgid "Wi-Fi connection"
-msgstr "Wi-Fi 連線 %d"
+#: ../clients/cli/connections.c:5922
+#, fuzzy, c-format
+msgid "Warning: 'vpn-type': %s not known.\n"
+msgstr "錯誤：「vpn-type」：%s。"
 
-#: ../clients/cli/connections.c:4538
-#, fuzzy
-msgid "WiMAX connection"
-msgstr "CDMA 連線 %d"
+#: ../clients/cli/connections.c:5983
+#, c-format
+msgid "Error: 'channel': '%s' is not valid; use <1-13>."
+msgstr "錯誤：「channel」：「%s」無效；請使用 <1-13>。"
 
-#: ../clients/cli/connections.c:4540
-msgid "PPPoE"
+#: ../clients/cli/connections.c:6034
+msgid "Username: "
+msgstr "使用者名稱："
+
+#: ../clients/cli/connections.c:6043
+#, c-format
+msgid "Protocol %s"
 msgstr ""
 
-#: ../clients/cli/connections.c:4542
+#: ../clients/cli/connections.c:6046
 #, fuzzy
-msgid "CDMA mobile broadband connection"
-msgstr "行動寬頻連線 %d"
+msgid "Error: 'protocol' is required."
+msgstr "錯誤：需要「nsp」。"
 
-#: ../clients/cli/connections.c:4544
+#: ../clients/cli/connections.c:6105
 #, fuzzy
-msgid "GSM mobile broadband connection"
-msgstr "行動寬頻連線 %d"
+msgid "MACVLAN parent device or connection UUID: "
+msgstr "VLAN 父裝置或連線 UUID："
 
-#: ../clients/cli/connections.c:4546
+#: ../clients/cli/connections.c:6125 ../clients/cli/connections.c:6205
+#: ../clients/cli/connections.c:6307
 #, fuzzy
-msgid "bluetooth connection"
-msgstr "Bond 連線 %d"
+msgid "Error: 'mode' is required."
+msgstr "錯誤：需要「dev」。"
 
-#: ../clients/cli/connections.c:4548 ../src/devices/nm-device-vlan.c:458
+#: ../clients/cli/connections.c:6131
 #, fuzzy
-msgid "VLAN connection"
-msgstr "VLAN 連線 %d"
+msgid "Error: 'mode' is not valid."
+msgstr "錯誤：「dev」指令「%s」不合乎規定。"
 
-#: ../clients/cli/connections.c:4550
-#, fuzzy
-msgid "Bond device"
-msgstr "Ethernet"
+#: ../clients/cli/connections.c:6144
+#, fuzzy, c-format
+msgid "Error: 'tap': %s."
+msgstr "錯誤：「stp」：%s。"
 
-#: ../clients/cli/connections.c:4552
-#, fuzzy
-msgid "Team device"
-msgstr "裝置已移除"
+#: ../clients/cli/connections.c:6230
+#, fuzzy, c-format
+msgid "Error: 'pi': %s."
+msgstr "錯誤：「stp」：%s。"
 
-#: ../clients/cli/connections.c:4554
-#, fuzzy
-msgid "Team port"
-msgstr "Team"
+#: ../clients/cli/connections.c:6241
+#, fuzzy, c-format
+msgid "Error: 'vnet-hdr': %s."
+msgstr "錯誤：「vpn-type」：%s。"
 
-#: ../clients/cli/connections.c:4556
-#, fuzzy
-msgid "Bridge device"
-msgstr "Ethernet"
+#: ../clients/cli/connections.c:6252
+#, fuzzy, c-format
+msgid "Error: 'multi-queue': %s."
+msgstr "錯誤：「mode」：%s。"
 
-#: ../clients/cli/connections.c:4558
-#, fuzzy
-msgid "Bridge port"
-msgstr "橋接"
+#: ../clients/cli/connections.c:6321
+#, fuzzy, c-format
+msgid "Error: 'mode': '%s' is not valid, use one of %s"
+msgstr "錯誤：「%s」：「%s」無效；%s"
 
-#: ../clients/cli/connections.c:4560 ../src/nm-manager.c:3716
-#, fuzzy
-msgid "VPN connection"
-msgstr "VPN 連線"
+#: ../clients/cli/connections.c:6327
+msgid "Remote endpoint: "
+msgstr ""
 
-#: ../clients/cli/connections.c:4562
+#: ../clients/cli/connections.c:6330 ../clients/cli/connections.c:6432
 #, fuzzy
-msgid "OLPC Mesh connection"
-msgstr "CDMA 連線 %d"
+msgid "Error: 'remote' is required."
+msgstr "錯誤：需要「mater」。"
 
-#: ../clients/cli/connections.c:4564 ../src/devices/adsl/nm-device-adsl.c:133
-#, fuzzy
-msgid "ADSL connection"
-msgstr "ADSL 連線 %d"
+#: ../clients/cli/connections.c:6337
+#, fuzzy, c-format
+msgid "Error: 'remote': '%s' is not valid; must be an IP address"
+msgstr "錯誤：「%s」：「%s」不是個有效的 %s MAC 位址。"
 
-#: ../clients/cli/connections.c:4566
-#, fuzzy
-msgid "macvlan connection"
-msgstr "Bond 連線 %d"
+#: ../clients/cli/connections.c:6351
+#, fuzzy, c-format
+msgid "Error: 'local': '%s' is not valid; must be an IP address"
+msgstr "錯誤：「%s」：「%s」不是個有效的 %s MAC 位址。"
 
-#: ../clients/cli/connections.c:4568 ../src/devices/nm-device-vxlan.c:374
+#: ../clients/cli/connections.c:6360 ../clients/cli/connections.c:6455
+#, fuzzy, c-format
+msgid "Error: 'dev': '%s' is neither UUID nor interface name."
+msgstr "錯誤：「dev」：「%s」不是 UUID、介面卡名稱，或是 MAC。"
+
+#: ../clients/cli/connections.c:6421
 #, fuzzy
-msgid "VXLAN connection"
-msgstr "VLAN 連線 %d"
+msgid "VXLAN ID: "
+msgstr "VLAN ID <0-4095>："
 
-#: ../clients/cli/connections.c:4570
+#: ../clients/cli/connections.c:6429
 #, fuzzy
-msgid "Tun device"
-msgstr "裝置已移除"
+msgid "Remote: "
+msgstr "移除"
+
+#: ../clients/cli/connections.c:6438
+#, fuzzy, c-format
+msgid "Error: 'id': '%s' is not valid; use <0-16777215>."
+msgstr "錯誤：「id」：「%s」無效；請使用 <0-4095>。"
+
+#: ../clients/cli/connections.c:6464
+#, fuzzy, c-format
+msgid "Error: 'remote': '%s' is not a valid IP address"
+msgstr "錯誤：「%s」：「%s」不是個有效的 %s MAC 位址。"
+
+#: ../clients/cli/connections.c:6473
+#, fuzzy, c-format
+msgid "Error: 'local': '%s' is not a valid IP address"
+msgstr "錯誤：「%s」：「%s」不是個有效的 %s MAC 位址。"
+
+#: ../clients/cli/connections.c:6482
+#, fuzzy, c-format
+msgid "Error: 'source-port-min': %s is not valid; use <0-65535>."
+msgstr "錯誤：「id」：「%s」無效；請使用 <0-4095>。"
+
+#: ../clients/cli/connections.c:6491
+#, fuzzy, c-format
+msgid "Error: 'source-port-max': %s is not valid; use <0-65535>."
+msgstr "錯誤：「flags」：「%s」無效；使用 <0-7>。"
 
-#: ../clients/cli/connections.c:4572
-msgid "IPv4 protocol"
+#: ../clients/cli/connections.c:6500
+#, fuzzy, c-format
+msgid "Error: 'destination-port': %s is not valid; use <0-65535>."
+msgstr "錯誤：「id」：「%s」無效；請使用 <0-4095>。"
+
+#: ../clients/cli/connections.c:6540
+#, c-format
+msgid "Error: '%s' is not a valid connection type."
+msgstr "錯誤：「%s」不是個有效的連線類型。"
+
+#: ../clients/cli/connections.c:6581
+#, c-format
+msgid "Error: IPv4 gateway specified without IPv4 addresses"
 msgstr ""
 
-#: ../clients/cli/connections.c:4574
-msgid "IPv6 protocol"
+#: ../clients/cli/connections.c:6585
+#, fuzzy, c-format
+msgid "Error: multiple IPv4 gateways specified"
+msgstr "錯誤：尚未指定介面卡。"
+
+#: ../clients/cli/connections.c:6589
+#, fuzzy, c-format
+msgid "Error: Invalid IPv4 gateway '%s'"
+msgstr "無效的閘道器「%s」"
+
+#: ../clients/cli/connections.c:6614
+#, c-format
+msgid "Error: IPv6 gateway specified without IPv6 addresses"
 msgstr ""
 
-#: ../clients/cli/connections.c:4657 ../clients/cli/utils.c:124
+#: ../clients/cli/connections.c:6618
+#, fuzzy, c-format
+msgid "Error: multiple IPv6 gateways specified"
+msgstr "錯誤：尚未指定介面卡。"
+
+#: ../clients/cli/connections.c:6622
+#, fuzzy, c-format
+msgid "Error: Invalid IPv6 gateway '%s'"
+msgstr "無效的閘道器「%s」"
+
+#: ../clients/cli/connections.c:6670 ../clients/cli/connections.c:10223
+#, fuzzy, c-format
+msgid "Error: Failed to add '%s' connection: %s"
+msgstr "錯誤：無法新增「%s」連線：(%d) %s"
+
+#: ../clients/cli/connections.c:6675
 #, c-format
-msgid "Error: value for '%s' argument is required."
-msgstr "錯誤：「%s」引數需要有個值。"
+msgid "Connection '%s' (%s) successfully added.\n"
+msgstr "連線「%s」 (%s) 已成功新增。\n"
 
-#: ../clients/cli/connections.c:4663
+#: ../clients/cli/connections.c:6951 ../clients/cli/connections.c:10678
+#, c-format
+msgid "Error: 'type' argument is required."
+msgstr "錯誤：需要「type」引數。"
+
+#: ../clients/cli/connections.c:6959
+#, c-format
+msgid "Error: invalid connection type; %s."
+msgstr "錯誤：無效的連線類型；%s。"
+
+#: ../clients/cli/connections.c:6968 ../clients/cli/devices.c:2164
+#, c-format
+msgid "Error: 'autoconnect': %s."
+msgstr "錯誤：「autoconnect」：%s。"
+
+#: ../clients/cli/connections.c:6978
 #, fuzzy, c-format
 msgid "Error: 'save': %s."
 msgstr "錯誤：「stp」：%s。"
 
-#: ../clients/cli/connections.c:4732
-#, fuzzy, c-format
-msgid "Error: '%s' argument is required."
-msgstr "錯誤：需要「type」引數。"
+#: ../clients/cli/connections.c:6995
+msgid "Interface name [*]: "
+msgstr "介面卡名稱 [*]："
+
+#: ../clients/cli/connections.c:7000
+#, c-format
+msgid "Error: 'ifname' argument is required."
+msgstr "錯誤：需要「ifname」引數。"
+
+#: ../clients/cli/connections.c:7002
+#, c-format
+msgid "Error: mandatory 'ifname' not seen before '%s'."
+msgstr ""
 
-#: ../clients/cli/connections.c:5701
+#: ../clients/cli/connections.c:7011
+#, c-format
+msgid "Error: 'ifname': '%s' is not a valid interface nor '*'."
+msgstr "錯誤：「ifname」：「%s」不是個有效的介面卡或是「*」。"
+
+#: ../clients/cli/connections.c:8035
 #, c-format
 msgid "['%s' setting values]\n"
 msgstr "[「%s」設定值]\n"
 
 #. TRANSLATORS: do not translate command names and keywords before ::
 #. *              However, you should translate terms enclosed in <>.
-#.
-#: ../clients/cli/connections.c:5783
+#. 
+#: ../clients/cli/connections.c:8117
 #, fuzzy, c-format
 msgid ""
 "---[ Main menu ]---\n"
@@ -2356,7 +2745,7 @@ msgstr ""
 "nmcli    <conf-option> <value>       :: nmcli 配置\n"
 "quit                                 :: 退出 nmcli\n"
 
-#: ../clients/cli/connections.c:5810
+#: ../clients/cli/connections.c:8144
 #, c-format
 msgid ""
 "goto <setting>[.<prop>] | <prop>  :: enter setting/property for editing\n"
@@ -2375,13 +2764,12 @@ msgstr ""
 "          nmcli connection> goto secondaries\n"
 "          nmcli> goto ipv4.addresses\n"
 
-#: ../clients/cli/connections.c:5817
+#: ../clients/cli/connections.c:8151
 #, c-format
 msgid ""
 "remove <setting>[.<prop>]  :: remove setting or reset property value\n"
 "\n"
-"This command removes an entire setting from the connection, or if a "
-"property\n"
+"This command removes an entire setting from the connection, or if a property\n"
 "is given, resets that property to the default value.\n"
 "\n"
 "Examples: nmcli> remove wifi-sec\n"
@@ -2395,7 +2783,7 @@ msgstr ""
 "範例：nmcli> remove wifi-sec\n"
 "          nmcli> remove eth.mtu\n"
 
-#: ../clients/cli/connections.c:5824
+#: ../clients/cli/connections.c:8158
 #, c-format
 msgid ""
 "set [<setting>.<prop> <value>]  :: set property value\n"
@@ -2410,7 +2798,7 @@ msgstr ""
 "\n"
 "範例：nmcli> set con.id My connection\n"
 
-#: ../clients/cli/connections.c:5829
+#: ../clients/cli/connections.c:8163
 #, c-format
 msgid ""
 "describe [<setting>.<prop>]  :: describe property\n"
@@ -2420,10 +2808,9 @@ msgid ""
 msgstr ""
 "describe [<setting>.<prop>]  :: 描述內容\n"
 "\n"
-"顯示內容的描述。您可查看 nm-settings(5) man page，以檢視所有的 NM 設定和內容"
-"屬性。\n"
+"顯示內容的描述。您可查看 nm-settings(5) man page，以檢視所有的 NM 設定和內容屬性。\n"
 
-#: ../clients/cli/connections.c:5834
+#: ../clients/cli/connections.c:8168
 #, c-format
 msgid ""
 "print [all]  :: print setting or connection values\n"
@@ -2431,21 +2818,19 @@ msgid ""
 "Shows current property or the whole connection.\n"
 "\n"
 "Example: nmcli ipv4> print all\n"
-msgstr ""
-"print [all]  :: 印出設定或是連線值\n"
+msgstr "print [all]  :: 印出設定或是連線值\n"
 "\n"
 "顯示目前的內容或是整個連線。\n"
 "\n"
 "範例：nmcli ipv4> print all\n"
 
-#: ../clients/cli/connections.c:5839
+#: ../clients/cli/connections.c:8173
 #, fuzzy, c-format
 msgid ""
 "verify [all | fix]  :: verify setting or connection validity\n"
 "\n"
 "Verifies whether the setting or connection is valid and can be saved later.\n"
-"It indicates invalid values on error. Some errors may be fixed "
-"automatically\n"
+"It indicates invalid values on error. Some errors may be fixed automatically\n"
 "by 'fix' option.\n"
 "\n"
 "Examples: nmcli> verify\n"
@@ -2459,7 +2844,7 @@ msgstr ""
 "範例：nmcli> verify\n"
 "          nmcli bond> verify\n"
 
-#: ../clients/cli/connections.c:5848
+#: ../clients/cli/connections.c:8182
 #, c-format
 msgid ""
 "save [persistent|temporary]  :: save the connection\n"
@@ -2475,7 +2860,7 @@ msgid ""
 "profile must be deleted.\n"
 msgstr ""
 
-#: ../clients/cli/connections.c:5859
+#: ../clients/cli/connections.c:8193
 #, c-format
 msgid ""
 "activate [<ifname>] [/<ap>|<nsp>]  :: activate the connection\n"
@@ -2493,28 +2878,23 @@ msgstr ""
 "\n"
 "可用選項：\n"
 "<ifname>    - 連線將會被啟用於的裝置\n"
-"  /<ap>|<nsp> - AP（Wi-Fi）或是 NSP（WiMAX）（當未指定 <ifname> 時，以 / 作為"
-"前置）\n"
+"  /<ap>|<nsp> - AP（Wi-Fi）或是 NSP（WiMAX）（當未指定 <ifname> 時，以 / 作為前置）\n"
 
-#: ../clients/cli/connections.c:5866 ../clients/cli/connections.c:6025
+#: ../clients/cli/connections.c:8200 ../clients/cli/connections.c:8359
 #, c-format
-msgid ""
-"back  :: go to upper menu level\n"
+msgid "back  :: go to upper menu level\n"
 "\n"
-msgstr ""
-"back  :: 往上返回上一層的選單\n"
+msgstr "back  :: 往上返回上一層的選單\n"
 "\n"
 
-#: ../clients/cli/connections.c:5869
+#: ../clients/cli/connections.c:8203
 #, c-format
-msgid ""
-"help/? [<command>]  :: help for the nmcli commands\n"
+msgid "help/? [<command>]  :: help for the nmcli commands\n"
 "\n"
-msgstr ""
-"help/? [<command>]  :: nmcli 指令的協助\n"
+msgstr "help/? [<command>]  :: nmcli 指令的協助\n"
 "\n"
 
-#: ../clients/cli/connections.c:5872
+#: ../clients/cli/connections.c:8206
 #, fuzzy, c-format
 msgid ""
 "nmcli [<conf-option> <value>]  :: nmcli configuration\n"
@@ -2540,28 +2920,27 @@ msgstr ""
 "          nmcli> nmcli save-confirmation no\n"
 "          nmcli> nmcli prompt-color 3\n"
 
-#: ../clients/cli/connections.c:5894 ../clients/cli/connections.c:6031
+#: ../clients/cli/connections.c:8228 ../clients/cli/connections.c:8365
 #, c-format
 msgid ""
 "quit  :: exit nmcli\n"
 "\n"
 "This command exits nmcli. When the connection being edited is not saved, the "
 "user is asked to confirm the action.\n"
-msgstr ""
-"quit  :: 退出 nmcli\n"
+msgstr "quit  :: 退出 nmcli\n"
 "\n"
 "這項指令會退出 nmcli。當被編輯的連線尚未儲存時，使用者會被要求確認動作。\n"
 
-#: ../clients/cli/connections.c:5899 ../clients/cli/connections.c:6036
-#: ../clients/cli/connections.c:6460 ../clients/cli/connections.c:7407
+#: ../clients/cli/connections.c:8233 ../clients/cli/connections.c:8370
+#: ../clients/cli/connections.c:8794 ../clients/cli/connections.c:9742
 #, c-format
 msgid "Unknown command: '%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:5965
+#. 
+#: ../clients/cli/connections.c:8299
 #, c-format
 msgid ""
 "---[ Property menu ]---\n"
@@ -2587,18 +2966,17 @@ msgstr ""
 "help/?   [<command>]             :: 印出此協助或指令描述\n"
 "quit                             :: 退出 nmcli\n"
 
-#: ../clients/cli/connections.c:5990
+#: ../clients/cli/connections.c:8324
 #, c-format
 msgid ""
 "set [<value>]  :: set new value\n"
 "\n"
 "This command sets provided <value> to this property\n"
-msgstr ""
-"set [<value>]  :: 設定新的值\n"
+msgstr "set [<value>]  :: 設定新的值\n"
 "\n"
 "這項指令會將提供的 <value> 設置至此內容\n"
 
-#: ../clients/cli/connections.c:5994
+#: ../clients/cli/connections.c:8328
 #, fuzzy, c-format
 msgid ""
 "add [<value>]  :: append new value to the property\n"
@@ -2609,21 +2987,19 @@ msgid ""
 msgstr ""
 "add [<value>]  :: 新增選項至內容\n"
 "\n"
-"這項指令會將提供的 <value> 新增至此內容（若這項內容乃 container 類型的話）。"
-"若是單值的內容，它會將值替換掉（和「set」相同）。\n"
+"這項指令會將提供的 <value> 新增至此內容（若這項內容乃 container 類型的話）。若是單值的內容，它會將值替換掉（和「set」相同）。\n"
 
-#: ../clients/cli/connections.c:6000
+#: ../clients/cli/connections.c:8334
 #, c-format
 msgid ""
 "change  :: change current value\n"
 "\n"
 "Displays current value and allows editing it.\n"
-msgstr ""
-"change  :: 更改目前的值\n"
+msgstr "change  :: 更改目前的值\n"
 "\n"
 "顯示目前的值，並允許對其進行編輯。\n"
 
-#: ../clients/cli/connections.c:6004
+#: ../clients/cli/connections.c:8338
 #, c-format
 msgid ""
 "remove [<value>|<index>|<option name>]  :: delete the value\n"
@@ -2643,7 +3019,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: ../clients/cli/connections.c:6015
+#: ../clients/cli/connections.c:8349
 #, c-format
 msgid ""
 "describe  :: describe property\n"
@@ -2653,10 +3029,9 @@ msgid ""
 msgstr ""
 "describe  :: 描述內容\n"
 "\n"
-"顯示內容的描述。您可查看 nm-settings(5) man page 以檢視所有的 NM 設定和內"
-"容。\n"
+"顯示內容的描述。您可查看 nm-settings(5) man page 以檢視所有的 NM 設定和內容。\n"
 
-#: ../clients/cli/connections.c:6020
+#: ../clients/cli/connections.c:8354
 #, c-format
 msgid ""
 "print [property|setting|connection]  :: print property (setting, connection) "
@@ -2669,567 +3044,553 @@ msgstr ""
 "\n"
 "顯示內容的值。提供一項引數，您亦可顯示整個設定或是連線的值。\n"
 
-#: ../clients/cli/connections.c:6028
+#: ../clients/cli/connections.c:8362
 #, c-format
-msgid ""
-"help/? [<command>]  :: help for nmcli commands\n"
+msgid "help/? [<command>]  :: help for nmcli commands\n"
 "\n"
-msgstr ""
-"help/? [<command>]  :: nmcli 指令的協助\n"
+msgstr "help/? [<command>]  :: nmcli 指令的協助\n"
 "\n"
 
-#: ../clients/cli/connections.c:6209
+#: ../clients/cli/connections.c:8460
+#, c-format
+msgid "Error: Connection activation failed.\n"
+msgstr "錯誤：連線啟用失敗。\n"
+
+#: ../clients/cli/connections.c:8543
 #, 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:6227
+#: ../clients/cli/connections.c:8561
 #, fuzzy, c-format
 msgid "[ Type: %s | Name: %s | UUID: %s | Dirty: %s | Temp: %s ]\n"
 msgstr "[ Connection type: %s | name: %s | UUID: %s | dirty: %s ]\n"
 
-#: ../clients/cli/connections.c:6263
+#: ../clients/cli/connections.c:8597
 #, fuzzy, c-format
 msgid "The connection is not saved. Do you really want to quit? %s"
 msgstr "連線尚未儲存。您是否真的希望退出？[y/n]\n"
 
-#: ../clients/cli/connections.c:6312
+#: ../clients/cli/connections.c:8646
 #, 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 ""
-"連線設定檔已經從另一個客戶端上移除。您可以在主選單輸入「儲存」來復原。\n"
+msgstr "連線設定檔已經從另一個客戶端上移除。您可以在主選單輸入「儲存」來復原。\n"
 
-#: ../clients/cli/connections.c:6337 ../clients/cli/connections.c:6758
-#: ../clients/cli/connections.c:6816
+#: ../clients/cli/connections.c:8671 ../clients/cli/connections.c:9093
+#: ../clients/cli/connections.c:9151
 #, c-format
 msgid "Allowed values for '%s' property: %s\n"
 msgstr "「%s」內容所能使用的值：%s\n"
 
-#: ../clients/cli/connections.c:6341 ../clients/cli/connections.c:6762
-#: ../clients/cli/connections.c:6820
+#: ../clients/cli/connections.c:8675 ../clients/cli/connections.c:9097
+#: ../clients/cli/connections.c:9155
 #, c-format
 msgid "Enter '%s' value: "
 msgstr "輸入「%s」的值："
 
-#: ../clients/cli/connections.c:6356 ../clients/cli/connections.c:6378
-#: ../clients/cli/connections.c:6766 ../clients/cli/connections.c:6825
+#: ../clients/cli/connections.c:8690 ../clients/cli/connections.c:8712
+#: ../clients/cli/connections.c:9101 ../clients/cli/connections.c:9160
 #, c-format
 msgid "Error: failed to set '%s' property: %s\n"
 msgstr "錯誤：設置「%s」內容失敗：%s\n"
 
-#: ../clients/cli/connections.c:6372
+#: ../clients/cli/connections.c:8706
 #, c-format
 msgid "Edit '%s' value: "
 msgstr "編輯「%s」的值："
 
-#: ../clients/cli/connections.c:6401
+#: ../clients/cli/connections.c:8735
 #, c-format
 msgid "Error: %s\n"
 msgstr "錯誤：%s\n"
 
-#: ../clients/cli/connections.c:6407 ../clients/cli/connections.c:6907
-#: ../clients/cli/connections.c:6955
+#: ../clients/cli/connections.c:8741 ../clients/cli/connections.c:9242
+#: ../clients/cli/connections.c:9290
 #, c-format
 msgid "Error: failed to remove value of '%s': %s\n"
 msgstr "錯誤：移除「%s」的值失敗：%s\n"
 
-#: ../clients/cli/connections.c:6428
+#: ../clients/cli/connections.c:8762
 #, c-format
 msgid "Unknown command argument: '%s'\n"
 msgstr "不明的檔案引數：「%s」\n"
 
-#: ../clients/cli/connections.c:6533
+#: ../clients/cli/connections.c:8867
 #, c-format
 msgid "Available settings: %s\n"
 msgstr "可用設定：%s\n"
 
-#: ../clients/cli/connections.c:6545
+#: ../clients/cli/connections.c:8879
 #, c-format
 msgid "Error: invalid setting name; %s\n"
 msgstr "錯誤：無效的設定名稱；%s\n"
 
-#: ../clients/cli/connections.c:6562
+#: ../clients/cli/connections.c:8896
 #, c-format
 msgid "Available properties: %s\n"
 msgstr "可用的內容：%s\n"
 
-#: ../clients/cli/connections.c:6570
+#: ../clients/cli/connections.c:8904
 #, c-format
 msgid "Error: property %s\n"
 msgstr "錯誤：內容 %s\n"
 
-#: ../clients/cli/connections.c:6611
+#: ../clients/cli/connections.c:8945
 #, fuzzy, 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"
+msgstr "以「autoconnect=yes」儲存連線。這可能會即刻將連線啟用。\n"
 "您是否還是希望儲存？[是]"
 
-#: ../clients/cli/connections.c:6700
+#: ../clients/cli/connections.c:9035
 #, c-format
 msgid "You may edit the following settings: %s\n"
 msgstr "您可編輯以下設定：%s\n"
 
-#: ../clients/cli/connections.c:6728
+#: ../clients/cli/connections.c:9063
 #, c-format
 msgid ""
 "The connection profile has been removed from another client. You may type "
 "'save' to restore it.\n"
 msgstr "連線設定檔已經從另一個客戶端上移除。您可輸入「儲存」來復原。\n"
 
-#: ../clients/cli/connections.c:6770 ../clients/cli/connections.c:7000
+#: ../clients/cli/connections.c:9105 ../clients/cli/connections.c:9335
 #, c-format
 msgid "Error: no setting selected; valid are [%s]\n"
 msgstr "錯誤：尚未選擇設定；有效的值爲「%s」\n"
 
-#: ../clients/cli/connections.c:6771
+#: ../clients/cli/connections.c:9106
 #, c-format
 msgid "use 'goto <setting>' first, or 'set <setting>.<property>'\n"
 msgstr "先使用「goto <setting>」，或是「set <setting>.<property>」\n"
 
-#: ../clients/cli/connections.c:6785 ../clients/cli/connections.c:6934
-#: ../clients/cli/connections.c:7022
+#: ../clients/cli/connections.c:9120 ../clients/cli/connections.c:9269
+#: ../clients/cli/connections.c:9357
 #, c-format
 msgid "Error: invalid setting argument '%s'; valid are [%s]\n"
 msgstr "錯誤：無效的設定引數「%s」；有效的值爲「%s」\n"
 
-#: ../clients/cli/connections.c:6795
+#: ../clients/cli/connections.c:9130
 #, c-format
 msgid "Error: missing setting for '%s' property\n"
 msgstr "錯誤：「%s」內容的設定遺失\n"
 
-#: ../clients/cli/connections.c:6802
+#: ../clients/cli/connections.c:9137
 #, c-format
 msgid "Error: invalid property: %s\n"
 msgstr "錯誤：無效的內容：%s\n"
 
-#: ../clients/cli/connections.c:6855
+#: ../clients/cli/connections.c:9190
 #, c-format
 msgid "Error: unknown setting '%s'\n"
 msgstr "錯誤：「%s」設定不明\n"
 
-#: ../clients/cli/connections.c:6868
+#: ../clients/cli/connections.c:9203
 #, c-format
 msgid "You may edit the following properties: %s\n"
 msgstr "您可編輯下列內容：%s\n"
 
-#: ../clients/cli/connections.c:6912
+#: ../clients/cli/connections.c:9247
 #, c-format
 msgid "Error: no argument given; valid are [%s]\n"
 msgstr "錯誤：尚未提供引數；有效的值爲「%s」\n"
 
-#: ../clients/cli/connections.c:6931
+#: ../clients/cli/connections.c:9266
 #, c-format
 msgid "Setting '%s' is not present in the connection.\n"
 msgstr "設定「%s」不存在連線中。\n"
 
-#: ../clients/cli/connections.c:6976
+#: ../clients/cli/connections.c:9311
 #, c-format
 msgid "Error: %s properties, nor it is a setting name.\n"
 msgstr "錯誤：%s 內容，它也不是組設定名稱。\n"
 
-#: ../clients/cli/connections.c:7001
+#: ../clients/cli/connections.c:9336
 #, c-format
 msgid "use 'goto <setting>' first, or 'describe <setting>.<property>'\n"
 msgstr "先使用「goto <setting>」，或是「describe <setting>.<property>」\n"
 
-#: ../clients/cli/connections.c:7050
+#: ../clients/cli/connections.c:9385
 #, c-format
 msgid "Error: invalid property: %s, neither a valid setting name.\n"
 msgstr "錯誤：無效的內容：%s，也不是組有效的設定名稱。\n"
 
-#: ../clients/cli/connections.c:7082
+#: ../clients/cli/connections.c:9417
 #, c-format
 msgid "Error: unknown setting: '%s'\n"
 msgstr "錯誤：不明的設定：「%s」\n"
 
-#: ../clients/cli/connections.c:7087
+#: ../clients/cli/connections.c:9422
 #, fuzzy, c-format
 msgid "Error: '%s' setting not present in the connection\n"
 msgstr "設定「%s」不存在連線中。\n"
 
-#: ../clients/cli/connections.c:7115
+#: ../clients/cli/connections.c:9450
 #, fuzzy, c-format
 msgid "Error: invalid property: %s%s\n"
 msgstr "錯誤：無效的內容：%s\n"
 
-#: ../clients/cli/connections.c:7117
+#: ../clients/cli/connections.c:9452
 #, fuzzy
 msgid ", neither a valid setting name"
 msgstr "錯誤：無效的內容：%s，也不是組有效的設定名稱。\n"
 
-#: ../clients/cli/connections.c:7134
+#: ../clients/cli/connections.c:9469
 #, fuzzy, c-format
 msgid "Invalid verify option: %s\n"
 msgstr "無效的選項「%s」"
 
-#: ../clients/cli/connections.c:7142
+#: ../clients/cli/connections.c:9477
 #, c-format
 msgid "Verify setting '%s': %s\n"
 msgstr "驗證設定「%s」：%s\n"
 
-#: ../clients/cli/connections.c:7157
+#: ../clients/cli/connections.c:9492
 #, c-format
 msgid "Verify connection: %s\n"
 msgstr "驗證連線：%s\n"
 
-#: ../clients/cli/connections.c:7160
+#: ../clients/cli/connections.c:9495
 #, c-format
 msgid "The error cannot be fixed automatically.\n"
 msgstr ""
 
-#: ../clients/cli/connections.c:7177
+#: ../clients/cli/connections.c:9512
 #, fuzzy, c-format
 msgid "Error: invalid argument '%s'\n"
 msgstr "錯誤：無效的額外引數「%s」。"
 
-#: ../clients/cli/connections.c:7210
+#: ../clients/cli/connections.c:9545
 #, fuzzy, c-format
 msgid "Error: Failed to save '%s' (%s) connection: %s\n"
 msgstr "錯誤：儲存「%s」(%s)連線失敗：(%d) %s\n"
 
-#: ../clients/cli/connections.c:7217
+#: ../clients/cli/connections.c:9552
 #, c-format
 msgid "Connection '%s' (%s) successfully saved.\n"
 msgstr "連線「%s」(%s) 已成功儲存。\n"
 
-#: ../clients/cli/connections.c:7218
+#: ../clients/cli/connections.c:9553
 #, fuzzy, c-format
 msgid "Connection '%s' (%s) successfully updated.\n"
 msgstr "連線「%s」 (%s) 已成功新增。\n"
 
-#: ../clients/cli/connections.c:7251
+#: ../clients/cli/connections.c:9586
 #, c-format
 msgid "Error: connection verification failed: %s\n"
 msgstr "錯誤：連線驗證失敗：%s\n"
 
-#: ../clients/cli/connections.c:7252
+#: ../clients/cli/connections.c:9587
 msgid "(unknown error)"
 msgstr "（不明錯誤）"
 
-#: ../clients/cli/connections.c:7253
+#: ../clients/cli/connections.c:9588
 #, c-format
 msgid "You may try running 'verify fix' to fix errors.\n"
 msgstr ""
 
-#: ../clients/cli/connections.c:7275
+#: ../clients/cli/connections.c:9610
 #, c-format
 msgid "Error: connection is not saved. Type 'save' first.\n"
 msgstr "錯誤：連線尚未儲存。請先輸入「save」。\n"
 
-#: ../clients/cli/connections.c:7279
+#: ../clients/cli/connections.c:9614
 #, c-format
 msgid "Error: connection is not valid: %s\n"
 msgstr "錯誤：連線無效：%s\n"
 
-#: ../clients/cli/connections.c:7289
+#: ../clients/cli/connections.c:9624
 #, c-format
 msgid "Error: Cannot activate connection: %s.\n"
 msgstr "錯誤：無法啟用連線：%s。\n"
 
-#: ../clients/cli/connections.c:7299
+#: ../clients/cli/connections.c:9634
 #, fuzzy, c-format
 msgid "Error: Failed to activate '%s' (%s) connection: %s\n"
 msgstr "錯誤：啟用「%s」(%s) 連線失敗：(%d) %s\n"
 
-#: ../clients/cli/connections.c:7305
+#: ../clients/cli/connections.c:9640
 #, c-format
 msgid "Monitoring connection activation (press any key to continue)\n"
 msgstr "監控連線啟用（按下任何鍵以繼續進行）\n"
 
-#: ../clients/cli/connections.c:7343
+#: ../clients/cli/connections.c:9678
 #, c-format
 msgid "Error: status-line: %s\n"
 msgstr "錯誤：status-line：%s\n"
 
-#: ../clients/cli/connections.c:7351
+#: ../clients/cli/connections.c:9686
 #, c-format
 msgid "Error: save-confirmation: %s\n"
 msgstr "錯誤：save-confirmation：%s\n"
 
-#: ../clients/cli/connections.c:7359
+#: ../clients/cli/connections.c:9694
 #, fuzzy, c-format
 msgid "Error: show-secrets: %s\n"
 msgstr "錯誤：「show active」：%s"
 
-#: ../clients/cli/connections.c:7368
+#: ../clients/cli/connections.c:9703
 #, fuzzy, c-format
 msgid "Error: bad color: %s\n"
 msgstr "錯誤：無效的內容：%s\n"
 
-#: ../clients/cli/connections.c:7382
+#: ../clients/cli/connections.c:9717
 #, c-format
 msgid "Current nmcli configuration:\n"
 msgstr "目前的 nmcli 配置：\n"
 
-#: ../clients/cli/connections.c:7392
+#: ../clients/cli/connections.c:9727
 #, c-format
 msgid "Invalid configuration option '%s'; allowed [%s]\n"
 msgstr "無效的配置選項「%s」；允許「%s」\n"
 
-#: ../clients/cli/connections.c:7593
+#: ../clients/cli/connections.c:9982
 #, c-format
 msgid "Error: only one of 'id', uuid, or 'path' can be provided."
 msgstr "錯誤：只能提供「id」、uuid 或是「path」其中一項。"
 
-#: ../clients/cli/connections.c:7605 ../clients/cli/connections.c:7788
-#: ../clients/cli/connections.c:7795 ../clients/cli/connections.c:7929
-#: ../clients/cli/connections.c:8434
+#: ../clients/cli/connections.c:9994 ../clients/cli/connections.c:10171
+#: ../clients/cli/connections.c:10178 ../clients/cli/connections.c:10306
+#: ../clients/cli/connections.c:10782
 #, c-format
 msgid "Error: Unknown connection '%s'."
 msgstr "錯誤：不明的連線「%s」。"
 
-#: ../clients/cli/connections.c:7623
+#: ../clients/cli/connections.c:10012
 #, c-format
 msgid "Warning: editing existing connection '%s'; 'type' argument is ignored\n"
 msgstr "警告：正要編輯既有的連線「%s」；「type」引數已忽略\n"
 
-#: ../clients/cli/connections.c:7626
+#: ../clients/cli/connections.c:10015
 #, c-format
 msgid ""
 "Warning: editing existing connection '%s'; 'con-name' argument is ignored\n"
 msgstr "警告：正要編輯既有的連線「%s」；「con-name」引數已忽略\n"
 
-#: ../clients/cli/connections.c:7640
+#: ../clients/cli/connections.c:10029
 #, c-format
 msgid "Valid connection types: %s\n"
 msgstr "有效的連線類型：%s\n"
 
-#: ../clients/cli/connections.c:7642
+#: ../clients/cli/connections.c:10031
 #, c-format
 msgid "Error: invalid connection type; %s\n"
 msgstr "錯誤：無效的連線類型；%s\n"
 
-#: ../clients/cli/connections.c:7681
+#: ../clients/cli/connections.c:10070
 #, c-format
 msgid "===| nmcli interactive connection editor |==="
 msgstr "===| nmcli 互動式連線編輯程式 |==="
 
-#: ../clients/cli/connections.c:7684
+#: ../clients/cli/connections.c:10073
 #, c-format
 msgid "Editing existing '%s' connection: '%s'"
 msgstr "編輯既有的「%s」連線：「%s」"
 
-#: ../clients/cli/connections.c:7686
+#: ../clients/cli/connections.c:10075
 #, c-format
 msgid "Adding a new '%s' connection"
 msgstr "新增一項「%s」連線"
 
-#: ../clients/cli/connections.c:7688
+#: ../clients/cli/connections.c:10077
 #, c-format
 msgid "Type 'help' or '?' for available commands."
 msgstr "輸入「help」或是「?」以取得可用指令。"
 
-#: ../clients/cli/connections.c:7690
+#: ../clients/cli/connections.c:10079
 #, c-format
 msgid "Type 'describe [<setting>.<prop>]' for detailed property description."
 msgstr "輸入「describe [<setting>.<prop>]」以取得詳細的內容描述。"
 
-#: ../clients/cli/connections.c:7728
+#: ../clients/cli/connections.c:10117
 #, fuzzy, c-format
 msgid "Error: Failed to modify connection '%s': %s"
 msgstr "錯誤：修改連線「%s」失敗：(%d) %s"
 
-#: ../clients/cli/connections.c:7735
+#: ../clients/cli/connections.c:10124
 #, c-format
 msgid "Connection '%s' (%s) successfully modified.\n"
 msgstr "連線「%s」(%s) 已成功修改。\n"
 
-#.
-#. * TODO(?) complete "uuid", "path", "id" or connection name.
-#. * (if we ever will move this here from shell completion script)
-#. if (nmc->complete) {
-#. quit ();
-#.
-#: ../clients/cli/connections.c:7761 ../clients/cli/connections.c:7885
-#: ../clients/cli/connections.c:8280 ../clients/cli/connections.c:8399
+#: ../clients/cli/connections.c:10146 ../clients/cli/connections.c:10262
+#: ../clients/cli/connections.c:10639 ../clients/cli/connections.c:10747
 #, c-format
 msgid "Error: No arguments provided."
 msgstr "錯誤：未提供引數。"
 
-#: ../clients/cli/connections.c:7847
+#: ../clients/cli/connections.c:10165 ../clients/cli/connections.c:10294
+#: ../clients/cli/connections.c:10776
+#, c-format
+msgid "Error: connection ID is missing."
+msgstr "錯誤：連線 ID 遺失。"
+
+#: ../clients/cli/connections.c:10228
 #, c-format
 msgid "%s (%s) cloned as %s (%s).\n"
 msgstr ""
 
-#: ../clients/cli/connections.c:7883
+#: ../clients/cli/connections.c:10260
 #, fuzzy
 msgid "New connection name: "
 msgstr "新連線"
 
-#: ../clients/cli/connections.c:7904 ../clients/cli/connections.c:7922
+#: ../clients/cli/connections.c:10281 ../clients/cli/connections.c:10299
 #, fuzzy, c-format
 msgid "Error: <new name> argument is missing."
 msgstr "錯誤：沒有 %s 參數。"
 
-#: ../clients/cli/connections.c:7910
+#: ../clients/cli/connections.c:10287
 #, fuzzy, c-format
 msgid "Error: unexpected extra argument '%s'."
 msgstr "錯誤：非預期的引數「%s」"
 
-#: ../clients/cli/connections.c:7917 ../clients/cli/connections.c:8428
-#, c-format
-msgid "Error: connection ID is missing."
-msgstr "錯誤：連線 ID 遺失。"
-
-#: ../clients/cli/connections.c:7979
+#: ../clients/cli/connections.c:10356
 #, fuzzy, c-format
 msgid "Error: not all connections deleted."
 msgstr "錯誤：尚未指定連線。"
 
-#: ../clients/cli/connections.c:7980
+#: ../clients/cli/connections.c:10357
 #, c-format
 msgid "Error: Connection deletion failed: %s"
 msgstr "錯誤：連線刪除失敗：%s"
 
-#: ../clients/cli/connections.c:8046 ../clients/cli/connections.c:8179
+#: ../clients/cli/connections.c:10419 ../clients/cli/connections.c:10547
 #, fuzzy, c-format
 msgid "Error: unknown connection '%s'\n"
 msgstr "錯誤：不明的連線：%s\n"
 
-#: ../clients/cli/connections.c:8060
+#: ../clients/cli/connections.c:10433
 #, fuzzy, c-format
 msgid "Error: no connection provided."
 msgstr "錯誤：尚未指定連線。"
 
 #. truncate trailing ", "
-#: ../clients/cli/connections.c:8085
+#: ../clients/cli/connections.c:10458
 #, c-format
 msgid "Error: cannot delete unknown connection(s): %s."
 msgstr "錯誤：無法刪除不明的連線：%s。"
 
-#: ../clients/cli/connections.c:8097
+#: ../clients/cli/connections.c:10470
 #, fuzzy, c-format
 msgid "%s: connection profile changed\n"
 msgstr "連線失敗"
 
-#: ../clients/cli/connections.c:8123
+#: ../clients/cli/connections.c:10496
 #, fuzzy, c-format
 msgid "%s: connection profile created\n"
 msgstr "連線失敗"
 
-#: ../clients/cli/connections.c:8132
+#: ../clients/cli/connections.c:10505
 #, fuzzy, c-format
 msgid "%s: connection profile removed\n"
 msgstr "連線已移除"
 
-#: ../clients/cli/connections.c:8180
+#: ../clients/cli/connections.c:10548
 #, fuzzy, c-format
 msgid "Error: not all connections found."
 msgstr "錯誤：「%s」不是個有效的「connection」指令。"
 
-#: ../clients/cli/connections.c:8205
+#: ../clients/cli/connections.c:10571
 #, fuzzy, c-format
 msgid "Error: failed to reload connections: %s."
 msgstr "錯誤：無法新增「%s」連線：(%d) %s"
 
-#: ../clients/cli/connections.c:8239
+#: ../clients/cli/connections.c:10603
 #, fuzzy, c-format
 msgid "Error: failed to load connection: %s."
 msgstr "錯誤：無法新增「%s」連線：(%d) %s"
 
-#: ../clients/cli/connections.c:8247
+#: ../clients/cli/connections.c:10611
 #, c-format
 msgid "Could not load file '%s'\n"
 msgstr "無法載入檔案「%s」\n"
 
-#: ../clients/cli/connections.c:8256
+#: ../clients/cli/connections.c:10620
 #, fuzzy
 msgid "File to import: "
 msgstr "加密失敗：%d。"
 
-#: ../clients/cli/connections.c:8296
+#: ../clients/cli/connections.c:10655
 #, c-format
 msgid "Warning: 'type' already specified, ignoring extra one.\n"
 msgstr ""
 
-#: ../clients/cli/connections.c:8307
+#: ../clients/cli/connections.c:10666
 #, c-format
 msgid "Warning: 'file' already specified, ignoring extra one.\n"
 msgstr ""
 
-#: ../clients/cli/connections.c:8309
+#: ../clients/cli/connections.c:10668
 #, fuzzy, c-format
 msgid "Unknown parameter: %s"
 msgstr "不明的參數：%s\n"
 
-#: ../clients/cli/connections.c:8319
-#, c-format
-msgid "Error: 'type' argument is required."
-msgstr "錯誤：需要「type」引數。"
-
-#: ../clients/cli/connections.c:8324
+#: ../clients/cli/connections.c:10683
 #, fuzzy, c-format
 msgid "Error: 'file' argument is required."
 msgstr "錯誤：需要「ifname」引數。"
 
-#: ../clients/cli/connections.c:8331
-#, fuzzy, c-format
-msgid "Error: failed to find VPN plugin for %s."
-msgstr "錯誤：無法修改 %s.%s：%s。"
-
-#: ../clients/cli/connections.c:8339 ../clients/cli/connections.c:8450
+#: ../clients/cli/connections.c:10691 ../clients/cli/connections.c:10798
 #, fuzzy, c-format
 msgid "Error: failed to load VPN plugin: %s."
 msgstr "錯誤：無法修改 %s.%s：%s。"
 
-#: ../clients/cli/connections.c:8347
+#: ../clients/cli/connections.c:10699
 #, fuzzy, c-format
 msgid "Error: failed to import '%s': %s."
 msgstr "錯誤：無法修改 %s.%s：%s。"
 
-#: ../clients/cli/connections.c:8397
+#: ../clients/cli/connections.c:10745
 #, fuzzy
 msgid "Output file name: "
 msgstr "檔案名稱"
 
-#: ../clients/cli/connections.c:8421
+#: ../clients/cli/connections.c:10769
 #, fuzzy, c-format
 msgid "Error: unknown extra argument: '%s'."
 msgstr "錯誤：無效的額外引數「%s」。"
 
-#: ../clients/cli/connections.c:8441
+#: ../clients/cli/connections.c:10789
 #, fuzzy, c-format
 msgid "Error: the connection is not VPN."
 msgstr "錯誤：連線無效：%s\n"
 
-#: ../clients/cli/connections.c:8462
+#: ../clients/cli/connections.c:10810
 #, fuzzy, c-format
 msgid "Error: failed to create temporary file %s."
 msgstr "無法建立暫時性檔案：%s"
 
-#: ../clients/cli/connections.c:8471
+#: ../clients/cli/connections.c:10819
 #, fuzzy, c-format
 msgid "Error: failed to export '%s': %s."
 msgstr "錯誤：設置「%s」內容失敗：%s\n"
 
-#: ../clients/cli/connections.c:8482
+#: ../clients/cli/connections.c:10830
 #, fuzzy, c-format
 msgid "Error: failed to read temporary file '%s': %s."
 msgstr "錯誤：移除「%s」的值失敗：%s\n"
 
-#: ../clients/cli/connections.c:8628
+#: ../clients/cli/connections.c:10976
 #, c-format
 msgid "incorrect string '%s' of '--order' option"
 msgstr ""
 
-#: ../clients/cli/connections.c:8654
+#: ../clients/cli/connections.c:11002
 #, c-format
 msgid "incorrect item '%s' in '--order' option"
 msgstr ""
 
-#: ../clients/cli/connections.c:8740
+#: ../clients/cli/connections.c:11089
 #, fuzzy
 msgid "'--order' argument is missing"
 msgstr "錯誤：沒有 %s 參數。"
 
-#: ../clients/cli/connections.c:8816
+#: ../clients/cli/connections.c:11154
 #, c-format
 msgid "Error: '%s' is not valid 'connection' command."
 msgstr "錯誤：「%s」不是個有效的「connection」指令。"
@@ -3376,7 +3737,7 @@ msgid "S390-SUBCHANNELS"
 msgstr ""
 
 #. 0
-#: ../clients/cli/devices.c:121 ../clients/cli/devices.c:741
+#: ../clients/cli/devices.c:121 ../clients/cli/devices.c:731
 msgid "WEP"
 msgstr "WEP"
 
@@ -3386,7 +3747,7 @@ msgid "WPA"
 msgstr "WPA"
 
 #. 2
-#: ../clients/cli/devices.c:123 ../clients/cli/devices.c:749
+#: ../clients/cli/devices.c:123 ../clients/cli/devices.c:739
 msgid "WPA2"
 msgstr "WPA2"
 
@@ -3402,7 +3763,7 @@ msgstr "CCMP"
 
 #. 5
 #. 2
-#: ../clients/cli/devices.c:126 ../clients/cli/devices.c:238
+#: ../clients/cli/devices.c:126 ../clients/cli/devices.c:228
 msgid "AP"
 msgstr "AP"
 
@@ -3446,6 +3807,11 @@ msgstr "TX-POW"
 msgid "BSID"
 msgstr "BSID"
 
+#. 0
+#: ../clients/cli/devices.c:151 ../clients/tui/nmt-page-wifi.c:224
+msgid "SSID"
+msgstr "SSID"
+
 #. 1
 #: ../clients/cli/devices.c:152
 msgid "SSID-HEX"
@@ -3509,156 +3875,143 @@ msgstr "*"
 
 #. 0
 #. 5
-#: ../clients/cli/devices.c:177 ../clients/cli/devices.c:241
+#: ../clients/cli/devices.c:177 ../clients/cli/devices.c:231
 msgid "NSP"
 msgstr "NSP"
 
 #. 0
-#: ../clients/cli/devices.c:192 ../clients/cli/devices.c:201
+#: ../clients/cli/devices.c:192
 msgid "SLAVES"
 msgstr "SLAVES"
 
-#. 1
-#: ../clients/cli/devices.c:202
-msgid "CONFIG"
-msgstr ""
-
 #. 0
-#: ../clients/cli/devices.c:211
+#: ../clients/cli/devices.c:201
 msgid "PARENT"
 msgstr ""
 
 #. 1
-#: ../clients/cli/devices.c:212
+#: ../clients/cli/devices.c:202
 msgid "ID"
 msgstr "ID"
 
 #. 0
-#: ../clients/cli/devices.c:221 ../clients/cli/devices.c:236
+#: ../clients/cli/devices.c:211 ../clients/cli/devices.c:226
 msgid "CAPABILITIES"
 msgstr "CAPABILITIES"
 
 #. 1
-#: ../clients/cli/devices.c:237
+#: ../clients/cli/devices.c:227
 msgid "WIFI-PROPERTIES"
 msgstr "WIFI-PROPERTIES"
 
 #. 3
-#: ../clients/cli/devices.c:239
+#: ../clients/cli/devices.c:229
 msgid "WIRED-PROPERTIES"
 msgstr "WIRED-PROPERTIES"
 
 #. 4
-#: ../clients/cli/devices.c:240
+#: ../clients/cli/devices.c:230
 msgid "WIMAX-PROPERTIES"
 msgstr "WIMAX-PROPERTIES"
 
 #. 10
-#: ../clients/cli/devices.c:246 ../clients/tui/nmt-page-bond.c:351
+#: ../clients/cli/devices.c:236 ../clients/tui/nmt-page-bond.c:351
 msgid "BOND"
 msgstr "BOND"
 
 #. 11
-#: ../clients/cli/devices.c:247 ../clients/tui/nmt-page-team.c:145
+#: ../clients/cli/devices.c:237 ../clients/tui/nmt-page-team.c:145
 msgid "TEAM"
 msgstr "團隊"
 
 #. 12
-#: ../clients/cli/devices.c:248 ../clients/tui/nmt-page-bridge.c:74
+#: ../clients/cli/devices.c:238 ../clients/tui/nmt-page-bridge.c:74
 msgid "BRIDGE"
 msgstr "BRIDGE"
 
-#. 13
-#: ../clients/cli/devices.c:249 ../clients/tui/nm-editor-utils.c:217
-#: ../clients/tui/nmt-page-vlan.c:94 ../libnm-core/nm-connection.c:1746
-#: ../libnm-glib/nm-device.c:1879 ../libnm-util/nm-connection.c:1632
-#: ../libnm/nm-device.c:1830
-msgid "VLAN"
-msgstr "VLAN"
-
 #. 14
-#: ../clients/cli/devices.c:250
+#: ../clients/cli/devices.c:240
 msgid "BLUETOOTH"
 msgstr ""
 
 #. 15
-#: ../clients/cli/devices.c:251
+#: ../clients/cli/devices.c:241
 msgid "CONNECTIONS"
 msgstr "CONNECTIONS"
 
 #. 1
-#: ../clients/cli/devices.c:263
+#: ../clients/cli/devices.c:253
 msgid "CHASSIS-ID"
 msgstr ""
 
 #. 2
-#: ../clients/cli/devices.c:264
+#: ../clients/cli/devices.c:254
 msgid "PORT-ID"
 msgstr ""
 
 #. 3
-#: ../clients/cli/devices.c:265
+#: ../clients/cli/devices.c:255
 msgid "PORT-DESCRIPTION"
 msgstr ""
 
 #. 4
-#: ../clients/cli/devices.c:266
+#: ../clients/cli/devices.c:256
 #, fuzzy
 msgid "SYSTEM-NAME"
 msgstr "USERNAME"
 
 #. 5
-#: ../clients/cli/devices.c:267
+#: ../clients/cli/devices.c:257
 msgid "SYSTEM-DESCRIPTION"
 msgstr ""
 
 #. 6
-#: ../clients/cli/devices.c:268
+#: ../clients/cli/devices.c:258
 #, fuzzy
 msgid "SYSTEM-CAPABILITIES"
 msgstr "CAPABILITIES"
 
 #. 7
-#: ../clients/cli/devices.c:269
+#: ../clients/cli/devices.c:259
 msgid "IEEE-802-1-PVID"
 msgstr ""
 
 #. 8
-#: ../clients/cli/devices.c:270
+#: ../clients/cli/devices.c:260
 msgid "IEEE-802-1-PPVID"
 msgstr ""
 
 #. 9
-#: ../clients/cli/devices.c:271
+#: ../clients/cli/devices.c:261
 msgid "IEEE-802-1-PPVID-FLAGS"
 msgstr ""
 
 #. 10
-#: ../clients/cli/devices.c:272
+#: ../clients/cli/devices.c:262
 msgid "IEEE-802-1-VID"
 msgstr ""
 
 #. 11
-#: ../clients/cli/devices.c:273
+#: ../clients/cli/devices.c:263
 msgid "IEEE-802-1-VLAN-NAME"
 msgstr ""
 
 #. 12
-#: ../clients/cli/devices.c:274
+#: ../clients/cli/devices.c:264
 msgid "DESTINATION"
 msgstr ""
 
 #. 13
-#: ../clients/cli/devices.c:275
+#: ../clients/cli/devices.c:265
 msgid "CHASSIS-ID-TYPE"
 msgstr ""
 
 #. 14
-#: ../clients/cli/devices.c:276
+#: ../clients/cli/devices.c:266
 msgid "PORT-ID-TYPE"
 msgstr ""
 
-#: ../clients/cli/devices.c:293
+#: ../clients/cli/devices.c:283
 #, fuzzy, c-format
 msgid ""
 "Usage: nmcli device { COMMAND | help }\n"
@@ -3674,7 +4027,7 @@ msgid ""
 "\n"
 "  connect <ifname>\n"
 "\n"
-"  reapply <ifname>\n"
+"  reapply <ifname> ...\n"
 "\n"
 "  disconnect <ifname> ...\n"
 "\n"
@@ -3722,7 +4075,7 @@ msgstr ""
 "  wimax [list [ifname <ifname>] [nsp <name>]]\n"
 "\n"
 
-#: ../clients/cli/devices.c:315
+#: ../clients/cli/devices.c:305
 #, c-format
 msgid ""
 "Usage: nmcli device status { help }\n"
@@ -3733,10 +4086,8 @@ msgid ""
 " TYPE       - device type\n"
 " STATE      - device state\n"
 " CONNECTION - connection activated on device (if any)\n"
-"Displayed columns can be changed using '--fields' global option. 'status' "
-"is\n"
-"the default command, which means 'nmcli device' calls 'nmcli device "
-"status'.\n"
+"Displayed columns can be changed using '--fields' global option. 'status' is\n"
+"the default command, which means 'nmcli device' calls 'nmcli device status'.\n"
 "\n"
 msgstr ""
 "Usage: nmcli device status { help }\n"
@@ -3747,13 +4098,11 @@ msgstr ""
 " TYPE       - device type\n"
 " STATE      - device state\n"
 " CONNECTION - connection activated on device (if any)\n"
-"Displayed columns can be changed using '--fields' global option. 'status' "
-"is\n"
-"the default command, which means 'nmcli device' calls 'nmcli device "
-"status'.\n"
+"Displayed columns can be changed using '--fields' global option. 'status' is\n"
+"the default command, which means 'nmcli device' calls 'nmcli device status'.\n"
 "\n"
 
-#: ../clients/cli/devices.c:330
+#: ../clients/cli/devices.c:320
 #, c-format
 msgid ""
 "Usage: nmcli device show { ARGUMENTS | help }\n"
@@ -3772,7 +4121,7 @@ msgstr ""
 "The command lists details for all devices, or for a given device.\n"
 "\n"
 
-#: ../clients/cli/devices.c:341
+#: ../clients/cli/devices.c:331
 #, c-format
 msgid ""
 "Usage: nmcli device connect { ARGUMENTS | help }\n"
@@ -3780,8 +4129,8 @@ msgid ""
 "ARGUMENTS := <ifname>\n"
 "\n"
 "Connect the device.\n"
-"NetworkManager will try to find a suitable connection that will be "
-"activated.\n"
+"NetworkManager will try to find a suitable connection that will be activated."
+"\n"
 "It will also consider connections that are not set to auto-connect.\n"
 "\n"
 msgstr ""
@@ -3790,17 +4139,17 @@ msgstr ""
 "ARGUMENTS := <ifname>\n"
 "\n"
 "Connect the device.\n"
-"NetworkManager will try to find a suitable connection that will be "
-"activated.\n"
+"NetworkManager will try to find a suitable connection that will be activated."
+"\n"
 "It will also consider connections that are not set to auto-connect.\n"
 "\n"
 
-#: ../clients/cli/devices.c:353
+#: ../clients/cli/devices.c:343
 #, fuzzy, c-format
 msgid ""
 "Usage: nmcli device reapply { ARGUMENTS | help }\n"
 "\n"
-"ARGUMENTS := <ifname>\n"
+"ARGUMENTS := <ifname> ...\n"
 "\n"
 "Attempts to update device with changes to the currently active connection\n"
 "made since it was last applied.\n"
@@ -3815,7 +4164,7 @@ msgstr ""
 "further connections without user/manual intervention.\n"
 "\n"
 
-#: ../clients/cli/devices.c:364
+#: ../clients/cli/devices.c:354
 #, fuzzy, c-format
 msgid ""
 "Usage: nmcli device disconnect { ARGUMENTS | help }\n"
@@ -3836,7 +4185,7 @@ msgstr ""
 "further connections without user/manual intervention.\n"
 "\n"
 
-#: ../clients/cli/devices.c:376
+#: ../clients/cli/devices.c:366
 #, fuzzy, c-format
 msgid ""
 "Usage: nmcli device delete { ARGUMENTS | help }\n"
@@ -3857,7 +4206,7 @@ msgstr ""
 "The command lists details for all devices, or for a given device.\n"
 "\n"
 
-#: ../clients/cli/devices.c:389
+#: ../clients/cli/devices.c:379
 #, c-format
 msgid ""
 "Usage: nmcli device set { ARGUMENTS | help }\n"
@@ -3871,7 +4220,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: ../clients/cli/devices.c:402
+#: ../clients/cli/devices.c:392
 #, fuzzy, c-format
 msgid ""
 "Usage: nmcli device monitor { ARGUMENTS | help }\n"
@@ -3891,7 +4240,7 @@ msgstr ""
 "The command lists details for all devices, or for a given device.\n"
 "\n"
 
-#: ../clients/cli/devices.c:414
+#: ../clients/cli/devices.c:404
 #, fuzzy, c-format
 msgid ""
 "Usage: nmcli device wifi { ARGUMENTS | help }\n"
@@ -3903,8 +4252,8 @@ msgid ""
 "List available Wi-Fi access points. The 'ifname' and 'bssid' options can be\n"
 "used to list APs for a particular interface, or with a specific BSSID.\n"
 "\n"
-"ARGUMENTS := connect <(B)SSID> [password <password>] [wep-key-type key|"
-"phrase] [ifname <ifname>]\n"
+"ARGUMENTS := connect <(B)SSID> [password <password>] [wep-key-type "
+"key|phrase] [ifname <ifname>]\n"
 "                    [bssid <BSSID>] [name <name>] [private yes|no] [hidden "
 "yes|no]\n"
 "\n"
@@ -3933,10 +4282,8 @@ msgid ""
 "\n"
 "ARGUMENTS := rescan [ifname <ifname>] [[ssid <SSID to scan>] ...]\n"
 "\n"
-"Request that NetworkManager immediately re-scan for available access "
-"points.\n"
-"NetworkManager scans Wi-Fi networks periodically, but in some cases it "
-"might\n"
+"Request that NetworkManager immediately re-scan for available access points.\n"
+"NetworkManager scans Wi-Fi networks periodically, but in some cases it might\n"
 "be useful to start scanning manually. 'ssid' allows scanning for a specific\n"
 "SSID, which is useful for APs with hidden SSIDs. More 'ssid' parameters can "
 "be\n"
@@ -3953,8 +4300,8 @@ msgstr ""
 "List available Wi-Fi access points. The 'ifname' and 'bssid' options can be\n"
 "used to list APs for a particular interface, or with a specific BSSID.\n"
 "\n"
-"ARGUMENTS := connect <(B)SSID> [password <password>] [wep-key-type key|"
-"phrase] [ifname <ifname>]\n"
+"ARGUMENTS := connect <(B)SSID> [password <password>] [wep-key-type "
+"key|phrase] [ifname <ifname>]\n"
 "                    [bssid <BSSID>] [name <name>] [private yes|no]\n"
 "\n"
 "Connect to a Wi-Fi network specified by SSID or BSSID. The command creates\n"
@@ -3968,23 +4315,20 @@ msgstr ""
 "\n"
 "ARGUMENTS := rescan [[ifname] <ifname>]\n"
 "\n"
-"Request that NetworkManager immediately re-scan for available access "
-"points.\n"
-"NetworkManager scans Wi-Fi networks periodically, but in some cases it "
-"might\n"
+"Request that NetworkManager immediately re-scan for available access points.\n"
+"NetworkManager scans Wi-Fi networks periodically, but in some cases it might\n"
 "be useful to start scanning manually. Note that this command does not show\n"
 "the APs, use 'nmcli device wifi list' for that.\n"
 "\n"
 
-#: ../clients/cli/devices.c:461
+#: ../clients/cli/devices.c:451
 #, fuzzy, c-format
 msgid ""
 "Usage: nmcli device lldp { ARGUMENTS | help }\n"
 "\n"
 "ARGUMENTS := [list [ifname <ifname>]]\n"
 "\n"
-"List neighboring devices discovered through LLDP. The 'ifname' option can "
-"be\n"
+"List neighboring devices discovered through LLDP. The 'ifname' option can be\n"
 "used to list neighbors for a particular interface.\n"
 "\n"
 msgstr ""
@@ -3998,508 +4342,503 @@ msgstr ""
 "list networks for a particular interface, or with a specific NSP.\n"
 "\n"
 
-#: ../clients/cli/devices.c:537 ../clients/cli/devices.c:1756
-#: ../clients/cli/devices.c:1765 ../clients/cli/devices.c:1956
-#: ../clients/cli/devices.c:2161 ../clients/cli/devices.c:2168
+#: ../clients/cli/devices.c:527 ../clients/cli/devices.c:1676
+#: ../clients/cli/devices.c:1685 ../clients/cli/devices.c:1879
+#: ../clients/cli/devices.c:2103 ../clients/cli/devices.c:2110
 #, c-format
 msgid "Error: No interface specified."
 msgstr "錯誤：尚未指定介面卡。"
 
-#: ../clients/cli/devices.c:557
+#: ../clients/cli/devices.c:547 ../clients/cli/devices.c:1899
 #, c-format
 msgid "Warning: argument '%s' is duplicated.\n"
 msgstr ""
 
-#: ../clients/cli/devices.c:559
+#: ../clients/cli/devices.c:549 ../clients/cli/devices.c:1901
 #, fuzzy, c-format
 msgid "Error: Device '%s' not found.\n"
 msgstr "錯誤：找不到「%s」裝置。"
 
-#: ../clients/cli/devices.c:560
+#: ../clients/cli/devices.c:550 ../clients/cli/devices.c:1902
 #, fuzzy, c-format
 msgid "Error: not all devices found."
 msgstr "錯誤：找不到 Wi-Fi 裝置。"
 
-#: ../clients/cli/devices.c:660 ../clients/cli/devices.c:811
+#: ../clients/cli/devices.c:650 ../clients/cli/devices.c:801
 msgid "(none)"
 msgstr "(none)"
 
-#: ../clients/cli/devices.c:729
+#: ../clients/cli/devices.c:719
 #, c-format
 msgid "%u MHz"
 msgstr "%u MHz"
 
-#: ../clients/cli/devices.c:730
+#: ../clients/cli/devices.c:720
 #, c-format
 msgid "%u Mbit/s"
 msgstr "%u Mbit/s"
 
-#: ../clients/cli/devices.c:745
+#: ../clients/cli/devices.c:735
 msgid "WPA1"
 msgstr "WPA1"
 
-#: ../clients/cli/devices.c:754
+#: ../clients/cli/devices.c:744
 msgid "802.1X"
 msgstr "802.1X"
 
-#: ../clients/cli/devices.c:770
+#: ../clients/cli/devices.c:760
 msgid "Ad-Hoc"
 msgstr "Ad-Hoc"
 
-#: ../clients/cli/devices.c:771
+#: ../clients/cli/devices.c:761
 msgid "Infra"
 msgstr "Infra"
 
 # auto translated by TM merge from project: gnome-system-monitor, version: 3.8.2.1, DocId: gnome-system-monitor
-#: ../clients/cli/devices.c:772
+#: ../clients/cli/devices.c:762
 msgid "N/A"
 msgstr "N/A"
 
-#: ../clients/cli/devices.c:996
+#: ../clients/cli/devices.c:916
 msgid "Device details"
 msgstr "裝置詳細資訊"
 
-#: ../clients/cli/devices.c:1008
+#: ../clients/cli/devices.c:928
 #, c-format
 msgid "Error: 'device show': %s"
 msgstr "錯誤：「device show」：%s"
 
-#: ../clients/cli/devices.c:1060 ../clients/cli/devices.c:1063
+#: ../clients/cli/devices.c:980 ../clients/cli/devices.c:983
 msgid "(unknown)"
 msgstr "(不明)"
 
-#: ../clients/cli/devices.c:1104
+#: ../clients/cli/devices.c:1024
 #, c-format
 msgid "%u Mb/s"
 msgstr "%u Mb/s"
 
-#: ../clients/cli/devices.c:1195
+#: ../clients/cli/devices.c:1115
 msgid "on"
 msgstr "開"
 
-#: ../clients/cli/devices.c:1195
+#: ../clients/cli/devices.c:1115
 msgid "off"
 msgstr "關"
 
-#: ../clients/cli/devices.c:1422
+#: ../clients/cli/devices.c:1342
 #, c-format
 msgid "Error: 'device status': %s"
 msgstr "錯誤：「device status」：%s"
 
 #. Add headers
-#: ../clients/cli/devices.c:1429
+#: ../clients/cli/devices.c:1349
 msgid "Status of devices"
 msgstr "裝置的狀態"
 
-#: ../clients/cli/devices.c:1460 ../clients/cli/devices.c:3570
+#: ../clients/cli/devices.c:1380 ../clients/cli/devices.c:3509
 #, c-format
 msgid "Error: invalid extra argument '%s'."
 msgstr "錯誤：無效的額外引數「%s」。"
 
-#: ../clients/cli/devices.c:1477 ../clients/cli/devices.c:1787
-#: ../clients/cli/devices.c:2184 ../clients/cli/devices.c:2454
-#: ../clients/cli/devices.c:3609
+#: ../clients/cli/devices.c:1397 ../clients/cli/devices.c:1707
+#: ../clients/cli/devices.c:2126 ../clients/cli/devices.c:2396
+#: ../clients/cli/devices.c:3548
 #, c-format
 msgid "Error: Device '%s' not found."
 msgstr "錯誤：找不到「%s」裝置。"
 
-#: ../clients/cli/devices.c:1555
+#: ../clients/cli/devices.c:1475
 #, fuzzy, c-format
 msgid "Device '%s' successfully activated with '%s'.\n"
 msgstr "成功：裝置「%s」已成功啟用。"
 
-#: ../clients/cli/devices.c:1561
+#: ../clients/cli/devices.c:1481
 #, fuzzy, c-format
 msgid "Error: Connection activation failed: (%d) %s.\n"
 msgstr "錯誤：連線啟用失敗：(%d) %s。"
 
-#: ../clients/cli/devices.c:1597
+#: ../clients/cli/devices.c:1517
 #, fuzzy, c-format
 msgid "Error: Failed to setup a Wi-Fi hotspot: %s"
 msgstr "錯誤：無法設定主機名稱：(%d) %s"
 
-#: ../clients/cli/devices.c:1600
+#: ../clients/cli/devices.c:1520
 #, fuzzy, c-format
 msgid "Error: Failed to add/activate new connection: %s"
 msgstr "錯誤：新增/啟用新連線失敗：(%d) %s"
 
-#: ../clients/cli/devices.c:1610
+#: ../clients/cli/devices.c:1530
 #, fuzzy, c-format
 msgid "Error: Failed to setup a Wi-Fi hotspot"
 msgstr "錯誤：無法設定主機名稱：(%d) %s"
 
-#: ../clients/cli/devices.c:1612
+#: ../clients/cli/devices.c:1532
 #, c-format
 msgid "Error: Failed to add/activate new connection: Unknown error"
 msgstr "錯誤：新增/啟用新連線失敗：不明的錯誤"
 
-#: ../clients/cli/devices.c:1624
+#: ../clients/cli/devices.c:1544
 #, c-format
 msgid "Connection with UUID '%s' created and activated on device '%s'\n"
 msgstr "UUID 爲「%s」的連線已建立並啟用於「%s」裝置上\n"
 
-#: ../clients/cli/devices.c:1627
+#: ../clients/cli/devices.c:1547
 #, fuzzy, c-format
 msgid "Hotspot '%s' activated on device '%s'\n"
 msgstr "UUID 爲「%s」的連線已建立並啟用於「%s」裝置上\n"
 
-#: ../clients/cli/devices.c:1691
+#: ../clients/cli/devices.c:1611
 #, c-format
 msgid "Error: Device activation failed: %s"
 msgstr "錯誤：裝置啟用失敗：%s"
 
-#: ../clients/cli/devices.c:1700
+#: ../clients/cli/devices.c:1620
 #, fuzzy, c-format
 msgid "Error: Device activation failed: device was disconnected"
 msgstr "錯誤：裝置啟用失敗：%s"
 
-#: ../clients/cli/devices.c:1715
+#: ../clients/cli/devices.c:1635
 #, c-format
 msgid "Device '%s' has been connected.\n"
 msgstr "裝置「%s」已連上。\n"
 
-#: ../clients/cli/devices.c:1771
+#: ../clients/cli/devices.c:1691
 #, c-format
 msgid "Error: extra argument not allowed: '%s'."
 msgstr "錯誤：不允許額外的引數：「%s」。"
 
-#: ../clients/cli/devices.c:1856 ../clients/cli/devices.c:1871
-#: ../clients/cli/devices.c:2022
+#: ../clients/cli/devices.c:1776 ../clients/cli/devices.c:1791
+#: ../clients/cli/devices.c:1964
 #, fuzzy, c-format
 msgid "Device '%s' successfully disconnected.\n"
 msgstr "成功：裝置「%s」已經成功地斷線。"
 
-#: ../clients/cli/devices.c:1859
+#: ../clients/cli/devices.c:1779
 #, fuzzy, c-format
 msgid "Device '%s' successfully removed.\n"
 msgstr "成功：裝置「%s」已成功啟用。"
 
-#: ../clients/cli/devices.c:1918
+#: ../clients/cli/devices.c:1838
+#, fuzzy, c-format
+msgid "Error: not all connections reapplied."
+msgstr "錯誤：尚未指定連線。"
+
+#: ../clients/cli/devices.c:1839
 #, fuzzy, c-format
-msgid "Error: Reapplying connection to device '%s' (%s) failed: %s"
+msgid "Error: Reapplying connection to device '%s' (%s) failed: %s\n"
 msgstr "錯誤：裝置「%s」（%s）斷線失敗：%s"
 
-#: ../clients/cli/devices.c:1928
+#: ../clients/cli/devices.c:1849
 #, fuzzy, c-format
 msgid "Connection successfully reapplied to device '%s'.\n"
 msgstr "連線已成功啟用（D-Bus 啟用路徑：%s）\n"
 
-#: ../clients/cli/devices.c:1965
-#, fuzzy, c-format
-msgid "Error: unsupported argument '%s'."
-msgstr "錯誤：非預期的引數「%s」"
-
-#: ../clients/cli/devices.c:1979
+#: ../clients/cli/devices.c:1912
 #, fuzzy, c-format
-msgid "Error: device '%s' not found."
-msgstr "錯誤：找不到「%s」裝置。"
+msgid "Error: no valid device provided."
+msgstr "錯誤：找不到 Wi-Fi 裝置。"
 
-#: ../clients/cli/devices.c:2007
+#: ../clients/cli/devices.c:1949
 #, fuzzy, c-format
 msgid "Error: not all devices disconnected."
 msgstr "錯誤：找不到 Wi-Fi 裝置。"
 
-#: ../clients/cli/devices.c:2008
+#: ../clients/cli/devices.c:1950
 #, fuzzy, c-format
 msgid "Error: Device '%s' (%s) disconnecting failed: %s\n"
 msgstr "錯誤：裝置「%s」（%s）斷線失敗：%s"
 
-#: ../clients/cli/devices.c:2083
+#: ../clients/cli/devices.c:2025
 #, fuzzy, c-format
 msgid "Error: not all devices deleted."
 msgstr "錯誤：找不到 Wi-Fi 裝置。"
 
-#: ../clients/cli/devices.c:2084
+#: ../clients/cli/devices.c:2026
 #, fuzzy, c-format
 msgid "Error: Device '%s' (%s) deletion failed: %s\n"
 msgstr "錯誤：裝置「%s」（%s）斷線失敗：%s"
 
-#: ../clients/cli/devices.c:2190
+#: ../clients/cli/devices.c:2132
 #, fuzzy, c-format
 msgid "Error: No property specified."
 msgstr "錯誤：尚未指定連線。"
 
-#: ../clients/cli/devices.c:2202 ../clients/cli/devices.c:2217
+#: ../clients/cli/devices.c:2144 ../clients/cli/devices.c:2159
 #, c-format
 msgid "Error: '%s' argument is missing."
 msgstr "錯誤：找不到「%s」參數。"
 
-#: ../clients/cli/devices.c:2207
+#: ../clients/cli/devices.c:2149
 #, fuzzy, c-format
 msgid "Error: 'managed': %s."
 msgstr "錯誤：「mode」：%s。"
 
-#: ../clients/cli/devices.c:2222
-#, c-format
-msgid "Error: 'autoconnect': %s."
-msgstr "錯誤：「autoconnect」：%s。"
-
-#: ../clients/cli/devices.c:2232
+#: ../clients/cli/devices.c:2174
 #, fuzzy, c-format
 msgid "Error: property '%s' is not known."
 msgstr "錯誤：無效的內容「%s」：%s。"
 
-#: ../clients/cli/devices.c:2278
+#: ../clients/cli/devices.c:2220
 #, fuzzy, c-format
 msgid "%s: using connection '%s'\n"
 msgstr "沒有此連線「%s」"
 
-#: ../clients/cli/devices.c:2304
+#: ../clients/cli/devices.c:2246
 #, c-format
 msgid "%s: device created\n"
 msgstr ""
 
-#: ../clients/cli/devices.c:2311
+#: ../clients/cli/devices.c:2253
 #, fuzzy, c-format
 msgid "%s: device removed\n"
 msgstr "裝置已移除"
 
-#: ../clients/cli/devices.c:2397
+#: ../clients/cli/devices.c:2339
 msgid "Wi-Fi scan list"
 msgstr "Wi-Fi 掃描清單"
 
-#: ../clients/cli/devices.c:2435
+#: ../clients/cli/devices.c:2377
 #, c-format
 msgid "Error: 'device wifi': %s"
 msgstr "錯誤：「device wifi」：%s"
 
-#: ../clients/cli/devices.c:2477 ../clients/cli/devices.c:2561
+#: ../clients/cli/devices.c:2419 ../clients/cli/devices.c:2500
 #, c-format
 msgid "Error: Access point with bssid '%s' not found."
 msgstr "錯誤：找不到 bssid 爲「%s」的存取點。"
 
-#: ../clients/cli/devices.c:2504
+#: ../clients/cli/devices.c:2446
 #, fuzzy, c-format
 msgid ""
 "Error: Device '%s' was not recognized as a Wi-Fi device, check "
 "NetworkManager Wi-Fi plugin."
 msgstr "錯誤：裝置「%s」不是個 Wi-Fi 裝置。"
 
-#: ../clients/cli/devices.c:2508 ../clients/cli/devices.c:2841
-#: ../clients/cli/devices.c:3261 ../clients/cli/devices.c:3410
+#: ../clients/cli/devices.c:2448 ../clients/cli/devices.c:2780
+#: ../clients/cli/devices.c:3200 ../clients/cli/devices.c:3349
 #, c-format
 msgid "Error: Device '%s' is not a Wi-Fi device."
 msgstr "錯誤：裝置「%s」不是個 Wi-Fi 裝置。"
 
-#: ../clients/cli/devices.c:2721
+#: ../clients/cli/devices.c:2660
 msgid "SSID or BSSID: "
 msgstr "SSID 或 BSSID："
 
-#: ../clients/cli/devices.c:2726
+#: ../clients/cli/devices.c:2665
 #, c-format
 msgid "Error: SSID or BSSID are missing."
 msgstr "錯誤：SSID 或 BSSID 遺失。"
 
-#: ../clients/cli/devices.c:2750
+#: ../clients/cli/devices.c:2689
 #, c-format
 msgid "Error: bssid argument value '%s' is not a valid BSSID."
 msgstr "錯誤：bssid 引數值「%s」不是個有效的 BSSID。"
 
-#: ../clients/cli/devices.c:2774
+#: ../clients/cli/devices.c:2713
 #, c-format
 msgid ""
 "Error: wep-key-type argument value '%s' is invalid, use 'key' or 'phrase'."
 msgstr "錯誤：wep-key-type 引數值「%s」無效，請使用「key」或是「phrase」。"
 
-#: ../clients/cli/devices.c:2794 ../clients/cli/devices.c:2807
+#: ../clients/cli/devices.c:2733 ../clients/cli/devices.c:2746
 #, c-format
 msgid "Error: %s: %s."
 msgstr "錯誤：%s：%s。"
 
-#: ../clients/cli/devices.c:2822
+#: ../clients/cli/devices.c:2761
 #, c-format
 msgid "Error: BSSID to connect to (%s) differs from bssid argument (%s)."
 msgstr "錯誤：欲連上的 BSSID（%s）與 bssid 引數（%s）不同。"
 
-#: ../clients/cli/devices.c:2828
+#: ../clients/cli/devices.c:2767
 #, c-format
 msgid "Error: Parameter '%s' is neither SSID nor BSSID."
 msgstr "錯誤：參數「%s」既不是 SSID 也不是 BSSID。"
 
-#: ../clients/cli/devices.c:2843 ../clients/cli/devices.c:3263
-#: ../clients/cli/devices.c:3412
+#: ../clients/cli/devices.c:2782 ../clients/cli/devices.c:3202
+#: ../clients/cli/devices.c:3351
 #, c-format
 msgid "Error: No Wi-Fi device found."
 msgstr "錯誤：找不到 Wi-Fi 裝置。"
 
-#: ../clients/cli/devices.c:2863
+#: ../clients/cli/devices.c:2802
 #, fuzzy, c-format
 msgid "Error: Failed to scan hidden SSID: %s."
 msgstr "錯誤：無法修改 %s.%s：%s。"
 
-#: ../clients/cli/devices.c:2888
+#: ../clients/cli/devices.c:2827
 #, c-format
 msgid "Error: No network with SSID '%s' found."
 msgstr "錯誤：找不到 SSID 爲「%s」的網路。"
 
-#: ../clients/cli/devices.c:2890
+#: ../clients/cli/devices.c:2829
 #, c-format
 msgid "Error: No access point with BSSID '%s' found."
 msgstr "錯誤：找不到 BSSID 爲「%s」的存取點。"
 
-#: ../clients/cli/devices.c:2932
+#: ../clients/cli/devices.c:2871
 #, c-format
 msgid ""
 "Warning: '%s' should be SSID for hidden APs; but it looks like a BSSID.\n"
 msgstr ""
 
-#: ../clients/cli/devices.c:2946
+#: ../clients/cli/devices.c:2885
 msgid "Password: "
 msgstr "密碼："
 
-#: ../clients/cli/devices.c:3095
+#: ../clients/cli/devices.c:3034
 #, fuzzy, c-format
 msgid "'%s' is not valid WPA PSK"
 msgstr "「%s」不是個有效的 PSK"
 
-#: ../clients/cli/devices.c:3112
+#: ../clients/cli/devices.c:3051
 #, fuzzy, c-format
 msgid "'%s' is not valid WEP key (it should be 5 or 13 ASCII chars)"
 msgstr "'%s' 的長度不合規定（應為 5 或 6 位數）"
 
-#: ../clients/cli/devices.c:3128
+#: ../clients/cli/devices.c:3067
 #, c-format
 msgid "Hotspot password: %s\n"
 msgstr ""
 
-#: ../clients/cli/devices.c:3186
+#: ../clients/cli/devices.c:3125
 #, fuzzy, c-format
 msgid "Error: ssid is too long."
 msgstr "錯誤：需要「ssid」。"
 
-#: ../clients/cli/devices.c:3198
+#: ../clients/cli/devices.c:3137
 #, fuzzy, c-format
 msgid "Error: band argument value '%s' is invalid; use 'a' or 'bg'."
 msgstr "錯誤：wep-key-type 引數值「%s」無效，請使用「key」或是「phrase」。"
 
-#: ../clients/cli/devices.c:3222
+#: ../clients/cli/devices.c:3161
 #, fuzzy, c-format
 msgid "Error: Unknown parameter %s."
 msgstr "不明的參數：%s\n"
 
-#: ../clients/cli/devices.c:3241
+#: ../clients/cli/devices.c:3180
 #, fuzzy, c-format
 msgid "Error: channel requires band too."
 msgstr "錯誤：需要「apn」。"
 
-#: ../clients/cli/devices.c:3247
+#: ../clients/cli/devices.c:3186
 #, fuzzy, c-format
 msgid "Error: channel '%s' not valid for band '%s'."
 msgstr "錯誤：「channel」：「%s」無效；請使用 <1-13>。"
 
-#: ../clients/cli/devices.c:3275
+#: ../clients/cli/devices.c:3214
 #, fuzzy, c-format
 msgid "Error: Device '%s' supports neither AP nor Ad-Hoc mode."
 msgstr "錯誤：裝置「%s」不是個 Wi-Fi 裝置。"
 
-#: ../clients/cli/devices.c:3310
+#: ../clients/cli/devices.c:3249
 #, fuzzy, c-format
 msgid "Error: Invalid 'password': %s."
 msgstr "錯誤：無效的內容「%s」：%s。"
 
-#: ../clients/cli/devices.c:3379
+#: ../clients/cli/devices.c:3318
 #, fuzzy, c-format
 msgid "Error: '%s' cannot repeat."
 msgstr "錯誤：「%s」設定不存在\n"
 
-#: ../clients/cli/devices.c:3460
+#: ../clients/cli/devices.c:3399
 #, c-format
 msgid "Error: 'device wifi' command '%s' is not valid."
 msgstr "錯誤：「device wifi」指令「%s」無效。"
 
 #. Main header name
-#: ../clients/cli/devices.c:3486
+#: ../clients/cli/devices.c:3425
 msgid "Device LLDP neighbors"
 msgstr ""
 
-#: ../clients/cli/devices.c:3589
+#: ../clients/cli/devices.c:3528
 #, fuzzy, c-format
 msgid "Error: 'device lldp list': %s"
 msgstr "錯誤：「device status」：%s"
 
-#: ../clients/cli/devices.c:3636
+#: ../clients/cli/devices.c:3575
 #, fuzzy, c-format
 msgid "Error: 'device lldp' command '%s' is not valid."
 msgstr "錯誤：「device wifi」指令「%s」無效。"
 
-#: ../clients/cli/devices.c:3825
+#: ../clients/cli/devices.c:3770
 #, c-format
 msgid "Error: 'dev' command '%s' is not valid."
 msgstr "錯誤：「dev」指令「%s」不合乎規定。"
 
-#: ../clients/cli/general.c:35
+#: ../clients/cli/general.c:34
 msgid "RUNNING"
 msgstr "RUNNING"
 
 #. 0
-#: ../clients/cli/general.c:36
+#: ../clients/cli/general.c:35
 msgid "VERSION"
 msgstr "VERSION"
 
 #. 2
-#: ../clients/cli/general.c:38
+#: ../clients/cli/general.c:37
 msgid "STARTUP"
 msgstr "STARTUP"
 
 #. 3
-#: ../clients/cli/general.c:39
+#: ../clients/cli/general.c:38
 msgid "CONNECTIVITY"
 msgstr "CONNECTIVITY"
 
 #. 4
-#: ../clients/cli/general.c:40
+#: ../clients/cli/general.c:39
 msgid "NETWORKING"
 msgstr "NETWORKING"
 
 #. 5
-#: ../clients/cli/general.c:41
+#: ../clients/cli/general.c:40
 msgid "WIFI-HW"
 msgstr "WIFI-HW"
 
 #. 6
-#: ../clients/cli/general.c:42
+#: ../clients/cli/general.c:41
 msgid "WIFI"
 msgstr "WIFI-HARDWARE"
 
 #. 7
-#: ../clients/cli/general.c:43
+#: ../clients/cli/general.c:42
 msgid "WWAN-HW"
 msgstr "WWAN-HW"
 
 #. 8
-#: ../clients/cli/general.c:44
+#: ../clients/cli/general.c:43
 msgid "WWAN"
 msgstr "WWAN"
 
 #. 9
-#: ../clients/cli/general.c:45
+#: ../clients/cli/general.c:44
 msgid "WIMAX-HW"
 msgstr "WIMAX-HW"
 
 #. 10
-#: ../clients/cli/general.c:46
+#: ../clients/cli/general.c:45
 msgid "WIMAX"
 msgstr "WIMAX"
 
-#: ../clients/cli/general.c:62
+#: ../clients/cli/general.c:61
 msgid "PERMISSION"
 msgstr "PERMISSION"
 
 #. 0
-#: ../clients/cli/general.c:63
+#: ../clients/cli/general.c:62
 msgid "VALUE"
 msgstr "VALUE"
 
-#: ../clients/cli/general.c:71
+#: ../clients/cli/general.c:70
 msgid "LEVEL"
 msgstr "LEVEL"
 
 #. 0
-#: ../clients/cli/general.c:72
+#: ../clients/cli/general.c:71
 msgid "DOMAINS"
 msgstr "DOMAINS"
 
-#: ../clients/cli/general.c:86
+#: ../clients/cli/general.c:85
 #, c-format
 msgid ""
 "Usage: nmcli general { COMMAND | help }\n"
@@ -4528,7 +4867,7 @@ msgstr ""
 "  logging [level <log level>] [domains <log domains>]\n"
 "\n"
 
-#: ../clients/cli/general.c:97
+#: ../clients/cli/general.c:96
 #, c-format
 msgid ""
 "Usage: nmcli general status { help }\n"
@@ -4545,7 +4884,7 @@ msgstr ""
 "status'\n"
 "\n"
 
-#: ../clients/cli/general.c:106
+#: ../clients/cli/general.c:105
 #, c-format
 msgid ""
 "Usage: nmcli general hostname { ARGUMENTS | help }\n"
@@ -4554,8 +4893,8 @@ msgid ""
 "\n"
 "Get or change persistent system hostname.\n"
 "With no arguments, this prints currently configured hostname. When you pass\n"
-"a hostname, NetworkManager will set it as the new persistent system "
-"hostname.\n"
+"a hostname, NetworkManager will set it as the new persistent system hostname."
+"\n"
 "\n"
 msgstr ""
 "Usage: nmcli general hostname { ARGUMENTS | help }\n"
@@ -4564,11 +4903,11 @@ msgstr ""
 "\n"
 "Get or change persistent system hostname.\n"
 "With no arguments, this prints currently configured hostname. When you pass\n"
-"a hostname, NetworkManager will set it as the new persistent system "
-"hostname.\n"
+"a hostname, NetworkManager will set it as the new persistent system hostname."
+"\n"
 "\n"
 
-#: ../clients/cli/general.c:118
+#: ../clients/cli/general.c:117
 #, c-format
 msgid ""
 "Usage: nmcli general permissions { help }\n"
@@ -4581,7 +4920,7 @@ msgstr ""
 "Show caller permissions for authenticated operations.\n"
 "\n"
 
-#: ../clients/cli/general.c:126
+#: ../clients/cli/general.c:125
 #, c-format
 msgid ""
 "Usage: nmcli general logging { ARGUMENTS | help }\n"
@@ -4608,7 +4947,7 @@ msgstr ""
 "for the list of possible logging domains.\n"
 "\n"
 
-#: ../clients/cli/general.c:139
+#: ../clients/cli/general.c:138
 #, c-format
 msgid ""
 "Usage: nmcli networking { COMMAND | help }\n"
@@ -4633,33 +4972,29 @@ msgstr ""
 "  connectivity [check]\n"
 "\n"
 
-#: ../clients/cli/general.c:149
+#: ../clients/cli/general.c:148
 #, c-format
-msgid ""
-"Usage: nmcli networking on { help }\n"
+msgid "Usage: nmcli networking on { help }\n"
 "\n"
 "Switch networking on.\n"
 "\n"
-msgstr ""
-"Usage: nmcli networking on { help }\n"
+msgstr "Usage: nmcli networking on { help }\n"
 "\n"
 "Switch networking on.\n"
 "\n"
 
-#: ../clients/cli/general.c:157
+#: ../clients/cli/general.c:156
 #, c-format
-msgid ""
-"Usage: nmcli networking off { help }\n"
+msgid "Usage: nmcli networking off { help }\n"
 "\n"
 "Switch networking off.\n"
 "\n"
-msgstr ""
-"Usage: nmcli networking off { help }\n"
+msgstr "Usage: nmcli networking off { help }\n"
 "\n"
 "Switch networking off.\n"
 "\n"
 
-#: ../clients/cli/general.c:165
+#: ../clients/cli/general.c:164
 #, c-format
 msgid ""
 "Usage: nmcli networking connectivity { ARGUMENTS | help }\n"
@@ -4667,8 +5002,8 @@ msgid ""
 "ARGUMENTS := [check]\n"
 "\n"
 "Get network connectivity state.\n"
-"The optional 'check' argument makes NetworkManager re-check the "
-"connectivity.\n"
+"The optional 'check' argument makes NetworkManager re-check the connectivity."
+"\n"
 "\n"
 msgstr ""
 "Usage: nmcli networking connectivity { ARGUMENTS | help }\n"
@@ -4676,11 +5011,11 @@ msgstr ""
 "ARGUMENTS := [check]\n"
 "\n"
 "Get network connectivity state.\n"
-"The optional 'check' argument makes NetworkManager re-check the "
-"connectivity.\n"
+"The optional 'check' argument makes NetworkManager re-check the connectivity."
+"\n"
 "\n"
 
-#: ../clients/cli/general.c:177
+#: ../clients/cli/general.c:176
 #, fuzzy, c-format
 msgid ""
 "Usage: nmcli radio { COMMAND | help }\n"
@@ -4701,7 +5036,7 @@ msgstr ""
 "  all | wifi | wwan [ on | off ]\n"
 "\n"
 
-#: ../clients/cli/general.c:186
+#: ../clients/cli/general.c:185
 #, c-format
 msgid ""
 "Usage: nmcli radio all { ARGUMENTS | help }\n"
@@ -4718,7 +5053,7 @@ msgstr ""
 "Get status of all radio switches, or turn them on/off.\n"
 "\n"
 
-#: ../clients/cli/general.c:196
+#: ../clients/cli/general.c:195
 #, c-format
 msgid ""
 "Usage: nmcli radio wifi { ARGUMENTS | help }\n"
@@ -4735,7 +5070,7 @@ msgstr ""
 "Get status of Wi-Fi radio switch, or turn it on/off.\n"
 "\n"
 
-#: ../clients/cli/general.c:206
+#: ../clients/cli/general.c:205
 #, c-format
 msgid ""
 "Usage: nmcli radio wwan { ARGUMENTS | help }\n"
@@ -4752,7 +5087,7 @@ msgstr ""
 "Get status of mobile broadband radio switch, or turn it on/off.\n"
 "\n"
 
-#: ../clients/cli/general.c:216
+#: ../clients/cli/general.c:215
 #, c-format
 msgid ""
 "Usage: nmcli monitor\n"
@@ -4762,196 +5097,196 @@ msgid ""
 "\n"
 msgstr ""
 
-#: ../clients/cli/general.c:234
+#: ../clients/cli/general.c:233
 msgid "asleep"
 msgstr "睡眠中"
 
-#: ../clients/cli/general.c:236
+#: ../clients/cli/general.c:235
 msgid "connecting"
 msgstr "連線中"
 
-#: ../clients/cli/general.c:238
+#: ../clients/cli/general.c:237
 msgid "connected (local only)"
 msgstr "已連上（只有本機）"
 
-#: ../clients/cli/general.c:240
+#: ../clients/cli/general.c:239
 msgid "connected (site only)"
 msgstr "已連上（只有網站）"
 
-#: ../clients/cli/general.c:244
+#: ../clients/cli/general.c:243
 msgid "disconnecting"
 msgstr "正在切斷連線"
 
-#: ../clients/cli/general.c:280
+#: ../clients/cli/general.c:279
 msgid "portal"
 msgstr "入口網站"
 
-#: ../clients/cli/general.c:282
+#: ../clients/cli/general.c:281
 msgid "limited"
 msgstr "受限"
 
-#: ../clients/cli/general.c:284
+#: ../clients/cli/general.c:283
 msgid "full"
 msgstr "已滿"
 
-#: ../clients/cli/general.c:335
+#: ../clients/cli/general.c:334
 #, c-format
 msgid "Error: only these fields are allowed: %s"
 msgstr "錯誤：只允許這些欄位：%s"
 
-#: ../clients/cli/general.c:358
+#: ../clients/cli/general.c:360
 msgid "NetworkManager status"
 msgstr "NetworkManager 狀態"
 
-#: ../clients/cli/general.c:363
+#: ../clients/cli/general.c:365
 msgid "running"
 msgstr "執行中"
 
-#: ../clients/cli/general.c:366
+#: ../clients/cli/general.c:368
 msgid "starting"
 msgstr "正在開始"
 
-#: ../clients/cli/general.c:366
+#: ../clients/cli/general.c:368
 msgid "started"
 msgstr "已開始"
 
-#: ../clients/cli/general.c:368 ../clients/cli/general.c:369
 #: ../clients/cli/general.c:370 ../clients/cli/general.c:371
-#: ../clients/cli/general.c:372
+#: ../clients/cli/general.c:372 ../clients/cli/general.c:373
+#: ../clients/cli/general.c:374
 msgid "enabled"
 msgstr "已啟用"
 
-#: ../clients/cli/general.c:368 ../clients/cli/general.c:369
 #: ../clients/cli/general.c:370 ../clients/cli/general.c:371
-#: ../clients/cli/general.c:372
+#: ../clients/cli/general.c:372 ../clients/cli/general.c:373
+#: ../clients/cli/general.c:374
 msgid "disabled"
 msgstr "已停用"
 
-#: ../clients/cli/general.c:435
+#: ../clients/cli/general.c:446
 msgid "auth"
 msgstr "auth"
 
-#: ../clients/cli/general.c:464
+#: ../clients/cli/general.c:475
 #, c-format
 msgid "Error: 'general permissions': %s"
 msgstr "錯誤：「general permissions」：%s"
 
-#: ../clients/cli/general.c:478
+#: ../clients/cli/general.c:489
 msgid "NetworkManager permissions"
 msgstr "NetworkManager 權限"
 
-#: ../clients/cli/general.c:519
+#: ../clients/cli/general.c:530
 #, c-format
 msgid "Error: 'general logging': %s"
 msgstr "錯誤：「general logging」：%s"
 
-#: ../clients/cli/general.c:534
+#: ../clients/cli/general.c:545
 msgid "NetworkManager logging"
 msgstr "NetworkManager 日誌"
 
-#: ../clients/cli/general.c:556
+#: ../clients/cli/general.c:567
 #, fuzzy, c-format
 msgid "Error: failed to set hostname: %s"
 msgstr "錯誤：無法設定主機名稱：(%d) %s"
 
-#: ../clients/cli/general.c:669
+#: ../clients/cli/general.c:680
 #, fuzzy, c-format
 msgid "Error: failed to set logging: %s"
 msgstr "錯誤：設置日誌的存取被拒絕；%s"
 
-#: ../clients/cli/general.c:678
+#: ../clients/cli/general.c:689
 #, c-format
 msgid "Error: 'general' command '%s' is not valid."
 msgstr "錯誤：「general」指令「%s」無效。"
 
-#: ../clients/cli/general.c:696
+#: ../clients/cli/general.c:707
 #, c-format
 msgid "Error: '--fields' value '%s' is not valid here (allowed field: %s)"
 msgstr "錯誤：「--fields」值「%s」在此無效（允許的欄位：%s）"
 
-#: ../clients/cli/general.c:721
+#: ../clients/cli/general.c:732
 #, c-format
 msgid "Error: invalid '%s' argument: '%s' (use on/off)."
 msgstr "錯誤：無效的「%s」引數：「%s」（請使用 on/off）。"
 
-#: ../clients/cli/general.c:732
+#: ../clients/cli/general.c:743
 msgid "Connectivity"
 msgstr "連線性"
 
-#: ../clients/cli/general.c:747
+#: ../clients/cli/general.c:758
 msgid "Networking"
 msgstr "網路作業"
 
-#: ../clients/cli/general.c:772
+#: ../clients/cli/general.c:783
 #, c-format
 msgid "Error: 'networking connectivity' command '%s' is not valid."
 msgstr "錯誤：「network connectivity」指令「%s」無效。"
 
-#: ../clients/cli/general.c:788
+#: ../clients/cli/general.c:799
 #, c-format
 msgid "Error: 'networking' command '%s' is not valid."
 msgstr "錯誤：「networking」指令「%s」無效。"
 
-#: ../clients/cli/general.c:817 ../clients/cli/general.c:837
+#: ../clients/cli/general.c:828 ../clients/cli/general.c:848
 msgid "Radio switches"
 msgstr "Radio 開關"
 
 #. no argument, show current WiFi state
-#: ../clients/cli/general.c:855
+#: ../clients/cli/general.c:866
 msgid "Wi-Fi radio switch"
 msgstr "Wi-fi radio 開關"
 
 #. no argument, show current WWAN (mobile broadband) state
-#: ../clients/cli/general.c:871
+#: ../clients/cli/general.c:882
 msgid "WWAN radio switch"
 msgstr "WWAN radio 開關"
 
-#: ../clients/cli/general.c:882
+#: ../clients/cli/general.c:893
 #, c-format
 msgid "Error: 'radio' command '%s' is not valid."
 msgstr "錯誤：「radio」指令「%s」無效。"
 
-#: ../clients/cli/general.c:902
+#: ../clients/cli/general.c:914
 #, fuzzy
 msgid "NetworkManager has started"
 msgstr "NetworkManager 狀態"
 
-#: ../clients/cli/general.c:902
+#: ../clients/cli/general.c:917
 #, fuzzy
 msgid "NetworkManager has stopped"
 msgstr "NetworkManager 狀態"
 
-#: ../clients/cli/general.c:913
+#: ../clients/cli/general.c:931
 #, fuzzy, c-format
 msgid "Hostname set to '%s'\n"
 msgstr "將主機名稱設定為「%s」"
 
-#: ../clients/cli/general.c:928
+#: ../clients/cli/general.c:946
 #, fuzzy, c-format
 msgid "'%s' is now the primary connection\n"
 msgstr "設定「%s」不存在連線中。\n"
 
-#: ../clients/cli/general.c:930
+#: ../clients/cli/general.c:948
 #, fuzzy, c-format
 msgid "There's no primary connection\n"
 msgstr "驗證連線：%s\n"
 
-#: ../clients/cli/general.c:942
+#: ../clients/cli/general.c:960
 #, fuzzy, c-format
 msgid "Connectivity is now '%s'\n"
 msgstr "連線性"
 
-#: ../clients/cli/general.c:955
+#: ../clients/cli/general.c:973
 #, fuzzy, c-format
 msgid "Networkmanager is now in the '%s' state\n"
 msgstr "NetworkManager 並不在執行中。"
 
-#: ../clients/cli/general.c:966
+#: ../clients/cli/general.c:984
 #, fuzzy, c-format
 msgid "Error: 'monitor' command '%s' is not valid."
 msgstr "錯誤：「radio」指令「%s」無效。"
 
-#: ../clients/cli/general.c:980
+#: ../clients/cli/general.c:998
 #, fuzzy
 msgid "Networkmanager is not running (waiting for it)\n"
 msgstr "NetworkManager 並不在執行中。"
@@ -4965,11 +5300,12 @@ msgid ""
 "  -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"
+"  -c[olors] auto|yes|no                      whether to use colors in output\n"
 "  -f[ields] <field1,field2,...>|all|common   specify fields to output\n"
 "  -e[scape] yes|no                           escape columns separators in "
 "values\n"
+"  -n[ocheck]                                 don't check nmcli and "
+"NetworkManager versions\n"
 "  -a[sk]                                     ask for missing parameters\n"
 "  -s[how-secrets]                            allow displaying passwords\n"
 "  -w[ait] <seconds>                          set timeout waiting for "
@@ -4996,6 +5332,8 @@ msgstr ""
 "  -f[ields] <field1,field2,...>|all|common   specify fields to output\n"
 "  -e[scape] yes|no                           escape columns separators in "
 "values\n"
+"  -n[ocheck]                                 don't check nmcli and "
+"NetworkManager versions\n"
 "  -a[sk]                                     ask for missing parameters\n"
 "  -w[ait] <seconds>                          set timeout waiting for "
 "finishing operations\n"
@@ -5010,88 +5348,86 @@ msgstr ""
 "  d[evice]        devices managed by NetworkManager\n"
 "\n"
 
-#: ../clients/cli/nmcli.c:142
+#: ../clients/cli/nmcli.c:143
 #, c-format
 msgid "Error: Object '%s' is unknown, try 'nmcli help'."
 msgstr "錯誤：物件 '%s' 不明，請嘗試 'nmcli help'。"
 
-#: ../clients/cli/nmcli.c:183
+#: ../clients/cli/nmcli.c:173
 #, c-format
 msgid "Error: Option '--terse' is specified the second time."
 msgstr "錯誤：選項 '--terse' 已指定了第二次。"
 
-#: ../clients/cli/nmcli.c:188
+#: ../clients/cli/nmcli.c:178
 #, c-format
 msgid "Error: Option '--terse' is mutually exclusive with '--pretty'."
 msgstr "錯誤：選項 '--terse' 和 '--pretty' 是互斥的。"
 
-#: ../clients/cli/nmcli.c:196
+#: ../clients/cli/nmcli.c:186
 #, c-format
 msgid "Error: Option '--pretty' is specified the second time."
 msgstr "錯誤：選項 '--pretty' 已指定了第二次。"
 
-#: ../clients/cli/nmcli.c:201
+#: ../clients/cli/nmcli.c:191
 #, c-format
 msgid "Error: Option '--pretty' is mutually exclusive with '--terse'."
 msgstr "錯誤：選項 '--pretty' 和 '--terse' 是互斥的。"
 
-#: ../clients/cli/nmcli.c:211 ../clients/cli/nmcli.c:227
-#: ../clients/cli/nmcli.c:245 ../clients/cli/nmcli.c:276
+#: ../clients/cli/nmcli.c:201 ../clients/cli/nmcli.c:217
+#: ../clients/cli/nmcli.c:235 ../clients/cli/nmcli.c:266
 #, c-format
 msgid "Error: missing argument for '%s' option."
 msgstr "錯誤：'%s' 選項的引數遺失。"
 
-#: ../clients/cli/nmcli.c:220 ../clients/cli/nmcli.c:238
-#: ../clients/cli/nmcli.c:254
+#: ../clients/cli/nmcli.c:210 ../clients/cli/nmcli.c:228
+#: ../clients/cli/nmcli.c:244
 #, c-format
 msgid "Error: '%s' is not valid argument for '%s' option."
 msgstr "錯誤：'%s' 不是 '%s' 選項的有效引數。"
 
-#: ../clients/cli/nmcli.c:261
+#: ../clients/cli/nmcli.c:251
 #, c-format
 msgid "Error: fields for '%s' options are missing."
 msgstr "錯誤：找不到 '%s' 選項的欄位。"
 
-#: ../clients/cli/nmcli.c:281
+#: ../clients/cli/nmcli.c:271
 #, c-format
 msgid "Error: '%s' is not a valid timeout for '%s' option."
 msgstr "錯誤：「%s」不是「%s」選項的有效逾時值。"
 
-#: ../clients/cli/nmcli.c:288
+#: ../clients/cli/nmcli.c:278
 #, c-format
 msgid "nmcli tool, version %s\n"
 msgstr "nmcli 工具，版本 %s\n"
 
-#: ../clients/cli/nmcli.c:294
+#: ../clients/cli/nmcli.c:284
 #, c-format
 msgid "Error: Option '%s' is unknown, try 'nmcli -help'."
 msgstr "錯誤：選項 '%s' 不明，請嚐試 'nmcli -help'。"
 
-#: ../clients/cli/nmcli.c:377 ../clients/cli/nmcli.c:387
+#: ../clients/cli/nmcli.c:367 ../clients/cli/nmcli.c:377
 #, fuzzy, c-format
-msgid ""
-"\n"
+msgid "\n"
 "Error: nmcli terminated by signal %s (%d)\n"
-msgstr ""
-"\n"
+msgstr "\n"
 "錯誤：nmcli 已被訊號 %d 終止。"
 
-#: ../clients/cli/nmcli.c:418
+#: ../clients/cli/nmcli.c:408
 #, fuzzy, c-format
 msgid "Failed to set signal mask: %d\n"
 msgstr "無法設置訊號遮罩：%d"
 
-#: ../clients/cli/nmcli.c:425
+#: ../clients/cli/nmcli.c:415
 #, fuzzy, c-format
 msgid "Failed to create signal handling thread: %d\n"
 msgstr "無法建立訊號處理執行續：%d"
 
-#: ../clients/cli/nmcli.c:522 ../clients/nm-online.c:193
+#: ../clients/cli/nmcli.c:512 ../clients/nm-online.c:193
 #, fuzzy, c-format
 msgid "Error: Could not create NMClient object: %s."
 msgstr "錯誤：無法建立 NMClient 物件。"
 
-#: ../clients/cli/nmcli.c:539
+#: ../clients/cli/nmcli.c:529
 msgid "Success"
 msgstr "成功"
 
@@ -5110,258 +5446,251 @@ msgstr "身份認證"
 msgid "Warning: polkit agent initialization failed: %s\n"
 msgstr "數據機初始化失敗"
 
-#: ../clients/cli/settings.c:796
+#: ../clients/cli/settings.c:790
 #, fuzzy, c-format
 msgid "%d (key)"
 msgstr "%d（十六進位的 ascii-key）"
 
-#: ../clients/cli/settings.c:798
+#: ../clients/cli/settings.c:792
 #, fuzzy, c-format
 msgid "%d (passphrase)"
 msgstr "%d（104/128 位元密碼）"
 
-#: ../clients/cli/settings.c:801 ../clients/cli/settings.c:887
+#: ../clients/cli/settings.c:795 ../clients/cli/settings.c:881
 #, c-format
 msgid "%d (unknown)"
 msgstr "%d（不明）"
 
-#: ../clients/cli/settings.c:830
+#: ../clients/cli/settings.c:824
 msgid "0 (NONE)"
 msgstr "0 (NONE)"
 
-#: ../clients/cli/settings.c:836
+#: ../clients/cli/settings.c:830
 msgid "REORDER_HEADERS, "
 msgstr "REORDER_HEADERS, "
 
-#: ../clients/cli/settings.c:838
+#: ../clients/cli/settings.c:832
 msgid "GVRP, "
 msgstr "GVRP, "
 
-#: ../clients/cli/settings.c:840
+#: ../clients/cli/settings.c:834
 msgid "LOOSE_BINDING, "
 msgstr "LOOSE_BINDING, "
 
-#: ../clients/cli/settings.c:842
+#: ../clients/cli/settings.c:836
 #, fuzzy
 msgid "MVRP, "
 msgstr "GVRP, "
 
-#: ../clients/cli/settings.c:881
+#: ../clients/cli/settings.c:875
 #, c-format
 msgid "%d (disabled)"
 msgstr "%d (已停用)"
 
-#: ../clients/cli/settings.c:883
+#: ../clients/cli/settings.c:877
 #, c-format
 msgid "%d (enabled, prefer public IP)"
 msgstr "%d (已啟用，建議使用公用 IP)"
 
-#: ../clients/cli/settings.c:885
+#: ../clients/cli/settings.c:879
 #, c-format
 msgid "%d (enabled, prefer temporary IP)"
 msgstr "%d (已啟用，建議使用暫時性 IP)"
 
-#: ../clients/cli/settings.c:900
+#: ../clients/cli/settings.c:894
 #, fuzzy, c-format
 msgid "%d (no)"
 msgstr "%d（不明）"
 
-#: ../clients/cli/settings.c:902
+#: ../clients/cli/settings.c:896
 #, c-format
 msgid "%d (yes)"
 msgstr ""
 
-#: ../clients/cli/settings.c:905 ../clients/cli/settings.c:1605
+#: ../clients/cli/settings.c:899 ../clients/cli/settings.c:1554
 #, fuzzy, c-format
 msgid "%d (default)"
 msgstr "（預設）"
 
-#: ../clients/cli/settings.c:918
+#: ../clients/cli/settings.c:912
 msgid "0 (none)"
 msgstr "0 (none)"
 
-#: ../clients/cli/settings.c:924
+#: ../clients/cli/settings.c:918
 msgid "agent-owned, "
 msgstr "agent-owned, "
 
-#: ../clients/cli/settings.c:926
+#: ../clients/cli/settings.c:920
 msgid "not saved, "
 msgstr "not saved, "
 
-#: ../clients/cli/settings.c:928
+#: ../clients/cli/settings.c:922
 msgid "not required, "
 msgstr "not required, "
 
-#: ../clients/cli/settings.c:977 ../clients/tui/nmt-mtu-entry.c:84
+#: ../clients/cli/settings.c:971 ../clients/tui/nmt-mtu-entry.c:84
 msgid "(default)"
 msgstr "（預設）"
 
-#. ----------------------------------------------------------------------------
-#: ../clients/cli/settings.c:1063 ../clients/cli/settings.c:1106
-#: ../clients/cli/settings.c:1140 ../clients/cli/settings.c:1167
-#: ../clients/cli/settings.c:8033
-msgid "<hidden>"
-msgstr ""
-
-#: ../clients/cli/settings.c:1302
+#: ../clients/cli/settings.c:1252
 msgid "0 (disabled)"
 msgstr "0（已停用）"
 
-#: ../clients/cli/settings.c:1308
+#: ../clients/cli/settings.c:1258
 msgid "enabled, "
 msgstr "enabled, "
 
-#: ../clients/cli/settings.c:1310
+#: ../clients/cli/settings.c:1260
 msgid "advertise, "
 msgstr "advertise, "
 
-#: ../clients/cli/settings.c:1312
+#: ../clients/cli/settings.c:1262
 msgid "willing, "
 msgstr "willing, "
 
-#: ../clients/cli/settings.c:1340
+#: ../clients/cli/settings.c:1290
 msgid "-1 (unset)"
 msgstr "-1（反設定）"
 
-#: ../clients/cli/settings.c:1472 ../clients/cli/settings.c:1777
-#: ../clients/cli/settings.c:1917
+#: ../clients/cli/settings.c:1422 ../clients/cli/settings.c:1724
+#: ../clients/cli/settings.c:1864
 msgid "auto"
 msgstr "auto"
 
-#: ../clients/cli/settings.c:1485 ../clients/cli/settings.c:1948
+#: ../clients/cli/settings.c:1435 ../clients/cli/settings.c:1895
 msgid "default"
 msgstr "default"
 
-#: ../clients/cli/settings.c:1607
+#: ../clients/cli/settings.c:1556
 #, fuzzy, c-format
 msgid "%d (off)"
 msgstr "%d（不明）"
 
-#: ../clients/cli/settings.c:1823
+#: ../clients/cli/settings.c:1770
 #, c-format
 msgid ""
 "invalid option '%s', use a combination of [%s] or 'ignore', 'default' or "
 "'none'"
 msgstr ""
 
-#: ../clients/cli/settings.c:1834
+#: ../clients/cli/settings.c:1781
 msgid "'default' and 'ignore' are incompatible with other flags"
 msgstr ""
 
-#: ../clients/cli/settings.c:1870
+#: ../clients/cli/settings.c:1817
 #, fuzzy, c-format
 msgid "invalid mode '%s', use one of %s"
 msgstr "無效的欄位「%s」; 允許的欄位：%s"
 
-#: ../clients/cli/settings.c:1952
+#: ../clients/cli/settings.c:1899
 #, c-format
 msgid "always"
 msgstr ""
 
-#: ../clients/cli/settings.c:2052 ../clients/cli/settings.c:3398
-#: ../clients/cli/settings.c:4590 ../clients/cli/settings.c:5093
+#: ../clients/cli/settings.c:1999 ../clients/cli/settings.c:3286
+#: ../clients/cli/settings.c:4478 ../clients/cli/settings.c:4981
 #: ../libnm-core/nm-keyfile-reader.c:573
 #, fuzzy, c-format
 msgid "invalid option '%s', use one of [%s]"
 msgstr "不合於規定的選項 '%s' 或其值為 '%s'"
 
-#: ../clients/cli/settings.c:2162
+#: ../clients/cli/settings.c:2116
 #, c-format
 msgid "Do you also want to set '%s' to '%s'? [yes]: "
 msgstr "您是否也希望將「%s」設為「%s」？[yes]："
 
-#: ../clients/cli/settings.c:2164
+#: ../clients/cli/settings.c:2118
 #, c-format
 msgid "Do you also want to clear '%s'? [yes]: "
 msgstr "您是否也希望清除「%s」？[yes]："
 
-#: ../clients/cli/settings.c:2325
+#: ../clients/cli/settings.c:2279
 #, c-format
 msgid ""
 "Warning: %s.%s set to '%s', but it might be ignored in infrastructure mode\n"
 msgstr ""
 
-#: ../clients/cli/settings.c:2344
+#: ../clients/cli/settings.c:2298
 #, c-format
 msgid "Warning: setting %s.%s requires removing ipv4 and ipv6 settings\n"
 msgstr ""
 
-#: ../clients/cli/settings.c:2346
+#: ../clients/cli/settings.c:2300
 #, fuzzy
 msgid "Do you want to remove them? [yes] "
 msgstr "您是否希望提供它們？（yes/no）[yes]"
 
-#: ../clients/cli/settings.c:2482 ../clients/cli/settings.c:2877
-#: ../clients/cli/settings.c:5294
+#: ../clients/cli/settings.c:2396 ../clients/cli/settings.c:2791
+#: ../clients/cli/settings.c:5182
 #, c-format
 msgid "'%s' is not valid"
 msgstr "「%s」無效"
 
-#: ../clients/cli/settings.c:2505
+#: ../clients/cli/settings.c:2419
 #, c-format
 msgid "'%d' is not valid; use <%d-%d>"
 msgstr "「%d」無效；請使用 <%d-%d>"
 
-#: ../clients/cli/settings.c:2527
+#: ../clients/cli/settings.c:2441
 #, fuzzy, c-format
 msgid "'%lld' is not valid; use <%lld-%lld>"
 msgstr "「%d」無效；請使用 <%d-%d>"
 
-#: ../clients/cli/settings.c:2549
+#: ../clients/cli/settings.c:2463
 #, fuzzy, c-format
 msgid "'%u' is not valid; use <%u-%u>"
 msgstr "「%u」無效；請使用 <%d-%d>"
 
-#: ../clients/cli/settings.c:2588
+#: ../clients/cli/settings.c:2502
 #, fuzzy, c-format
 msgid "'%u' flags are not valid; use combination of %s"
 msgstr "「%s」無效；請使用「%s」或是「%s」"
 
-#: ../clients/cli/settings.c:2655
+#: ../clients/cli/settings.c:2569
 #, c-format
 msgid "'%s' is not valid; use <option>=<value>"
 msgstr "「%s」無效；請使用 <option>=<value>"
 
-#: ../clients/cli/settings.c:2689
+#: ../clients/cli/settings.c:2603
 #, c-format
 msgid "index '%s' is not valid"
 msgstr "索引「%s」無效"
 
-#: ../clients/cli/settings.c:2694 ../clients/cli/settings.c:2719
+#: ../clients/cli/settings.c:2608 ../clients/cli/settings.c:2633
 msgid "no item to remove"
 msgstr "沒有可移除的項目"
 
-#: ../clients/cli/settings.c:2698 ../clients/cli/settings.c:2723
+#: ../clients/cli/settings.c:2612 ../clients/cli/settings.c:2637
 #, c-format
 msgid "index '%d' is not in range <0-%d>"
 msgstr "索引「%d」不在範圍內 <0-%d>"
 
-#: ../clients/cli/settings.c:2738
+#: ../clients/cli/settings.c:2652
 #, c-format
 msgid "invalid option '%s'"
 msgstr "無效的選項「%s」"
 
-#: ../clients/cli/settings.c:2740
+#: ../clients/cli/settings.c:2654
 msgid "missing option"
 msgstr "遺失選項"
 
-#: ../clients/cli/settings.c:2767 ../clients/cli/settings.c:2787
-#: ../clients/cli/settings.c:2807 ../clients/cli/settings.c:2827
+#: ../clients/cli/settings.c:2681 ../clients/cli/settings.c:2701
+#: ../clients/cli/settings.c:2721 ../clients/cli/settings.c:2741
 #, c-format
 msgid "'%s' is not a valid number (or out of range)"
 msgstr "「%s」不是個有效的數字（或是不在範圍內）"
 
-#: ../clients/cli/settings.c:2861
+#: ../clients/cli/settings.c:2775
 #, fuzzy, c-format
 msgid "'%s' is not a valid value; use -1, 0 or 1"
 msgstr "「%s」無效；請使用 0、1 或 2"
 
-#: ../clients/cli/settings.c:2893
+#: ../clients/cli/settings.c:2807
 #, c-format
 msgid "'%s' is not a valid Ethernet MAC"
 msgstr "「%s」不是個有效的乙太網路 MAC"
 
-#: ../clients/cli/settings.c:2918 ../libnm-core/nm-setting-connection.c:864
+#: ../clients/cli/settings.c:2832 ../libnm-core/nm-setting-connection.c:864
 #: ../libnm-core/nm-setting-infiniband.c:255
 #: ../libnm-util/nm-setting-connection.c:834
 #: ../libnm-util/nm-setting-infiniband.c:269
@@ -5369,53 +5698,40 @@ msgstr "「%s」不是個有效的乙太網路 MAC"
 msgid "'%s' is not a valid interface name"
 msgstr "「%s」不是組有效的介面卡名稱"
 
-#: ../clients/cli/settings.c:2942
+#: ../clients/cli/settings.c:2856
 #, fuzzy, c-format
 msgid "'%s' is not a valid flag number; use <0-%d>"
 msgstr "「%s」不是個有效的頻道；請使用 <1-13>"
 
-#: ../clients/cli/settings.c:2954
+#: ../clients/cli/settings.c:2868
 #, c-format
 msgid "Warning: '%s' sum is higher than all flags => all flags set\n"
 msgstr ""
 
-#: ../clients/cli/settings.c:2995
+#: ../clients/cli/settings.c:2909
 #, c-format
 msgid "'%s' is not a valid hex character"
 msgstr "「%s」不是個有效的十六進位字元"
 
-#: ../clients/cli/settings.c:3025
+#: ../clients/cli/settings.c:2939
 #, c-format
 msgid "'%s' is not a valid MAC"
 msgstr "「%s」不是個有效的 MAC"
 
-#. Don't allow setting type unless the connection is brand new.
-#. * Just because it's a bad idea and the user wouldn't probably want that.
-#. * No technical reason, really.
-#. * Also, using uuid to see if the connection is brand new is a bit
-#. * 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/cli/settings.c:3053
-#, fuzzy, c-format
-msgid "Can not change the connection type"
-msgstr "輸入連線類型："
-
-#: ../clients/cli/settings.c:3077 ../libnm-core/nm-setting-connection.c:853
+#: ../clients/cli/settings.c:2965 ../libnm-core/nm-setting-connection.c:853
 #: ../libnm-util/nm-setting-connection.c:791
 #, c-format
 msgid "'%s' is not a valid UUID"
 msgstr "「%s」不是個有效的 UUID"
 
-#: ../clients/cli/settings.c:3144
+#: ../clients/cli/settings.c:3032
 #, c-format
 msgid "the property doesn't contain permission '%s'"
 msgstr ""
 
-#: ../clients/cli/settings.c:3156
+#: ../clients/cli/settings.c:3044
 msgid ""
-"Enter a list of user permissions. This is a list of user names formatted "
-"as:\n"
+"Enter a list of user permissions. This is a list of user names formatted as:\n"
 "  [user:]<user name 1>, [user:]<user name 2>,...\n"
 "The items can be separated by commas or spaces.\n"
 "\n"
@@ -5427,40 +5743,39 @@ msgstr ""
 "\n"
 "例如：alice bob charlie\n"
 
-#: ../clients/cli/settings.c:3175
+#: ../clients/cli/settings.c:3063
 #, c-format
 msgid "'%s' is not valid master; use ifname or connection UUID"
 msgstr "「%s」不是個有效的 master；請使用 ifname 或是連線 UUID"
 
-#: ../clients/cli/settings.c:3219
+#: ../clients/cli/settings.c:3107
 #, c-format
 msgid "Warning: %s is not an UUID of any existing connection profile\n"
 msgstr ""
 
-#: ../clients/cli/settings.c:3223 ../clients/cli/settings.c:3239
+#: ../clients/cli/settings.c:3111 ../clients/cli/settings.c:3127
 #, fuzzy, c-format
 msgid "'%s' is not a VPN connection profile"
 msgstr "錯誤：「%s」不是個有效的連線類型。"
 
-#: ../clients/cli/settings.c:3232
+#: ../clients/cli/settings.c:3120
 #, fuzzy, c-format
 msgid "'%s' is not a name of any exiting profile"
 msgstr "'%s' 不是合於規定的 team 配置或檔名"
 
-#: ../clients/cli/settings.c:3266
+#: ../clients/cli/settings.c:3154
 #, fuzzy, c-format
 msgid "the value '%s' is not a valid UUID"
 msgstr "「%s」不是個有效的 UUID"
 
-#: ../clients/cli/settings.c:3273
+#: ../clients/cli/settings.c:3161
 #, c-format
 msgid "the property doesn't contain UUID '%s'"
 msgstr ""
 
-#: ../clients/cli/settings.c:3285
+#: ../clients/cli/settings.c:3173
 msgid ""
-"Enter secondary connections that should be activated when this connection "
-"is\n"
+"Enter secondary connections that should be activated when this connection is\n"
 "activated. Connections can be specified either by UUID or ID (name). nmcli\n"
 "transparently translates names to UUIDs. Note that NetworkManager only "
 "supports\n"
@@ -5470,7 +5785,7 @@ msgid ""
 "Example: private-openvpn, fe6ba5d8-c2fc-4aae-b2e3-97efddd8d9a7\n"
 msgstr ""
 
-#: ../clients/cli/settings.c:3352
+#: ../clients/cli/settings.c:3240
 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"
@@ -5479,16 +5794,16 @@ msgid ""
 "'unknown' to let NetworkManager choose a value using some heuristics\n"
 msgstr ""
 
-#: ../clients/cli/settings.c:3476
+#: ../clients/cli/settings.c:3364
 msgid "private key password not provided"
 msgstr "未提供私密金鑰密碼"
 
-#: ../clients/cli/settings.c:3504
+#: ../clients/cli/settings.c:3392
 #, fuzzy, c-format
 msgid "the property doesn't contain EAP method '%s'"
 msgstr "內容不可更改"
 
-#: ../clients/cli/settings.c:3521
+#: ../clients/cli/settings.c:3409
 msgid ""
 "Enter file path to CA certificate (optionally prefixed with file://).\n"
 "  [file://]<file path>\n"
@@ -5496,12 +5811,12 @@ msgid ""
 "Example: /home/cimrman/cacert.crt\n"
 msgstr ""
 
-#: ../clients/cli/settings.c:3540
+#: ../clients/cli/settings.c:3428
 #, c-format
 msgid "the property doesn't contain alternative subject match '%s'"
 msgstr ""
 
-#: ../clients/cli/settings.c:3556
+#: ../clients/cli/settings.c:3444
 msgid ""
 "Enter file path to client certificate (optionally prefixed with file://).\n"
 "  [file://]<file path>\n"
@@ -5509,7 +5824,7 @@ msgid ""
 "Example: /home/cimrman/jara.crt\n"
 msgstr ""
 
-#: ../clients/cli/settings.c:3568
+#: ../clients/cli/settings.c:3456
 msgid ""
 "Enter file path to CA certificate for inner authentication (optionally "
 "prefixed\n"
@@ -5519,12 +5834,12 @@ msgid ""
 "Example: /home/cimrman/ca-zweite-phase.crt\n"
 msgstr ""
 
-#: ../clients/cli/settings.c:3588
+#: ../clients/cli/settings.c:3476
 #, c-format
 msgid "the property doesn't contain \"phase2\" alternative subject match '%s'"
 msgstr ""
 
-#: ../clients/cli/settings.c:3604
+#: ../clients/cli/settings.c:3492
 msgid ""
 "Enter file path to client certificate for inner authentication (optionally "
 "prefixed\n"
@@ -5534,7 +5849,7 @@ msgid ""
 "Example: /home/cimrman/jara-zweite-phase.crt\n"
 msgstr ""
 
-#: ../clients/cli/settings.c:3624
+#: ../clients/cli/settings.c:3512
 #, fuzzy
 msgid ""
 "Enter path to a private key and the key password (if not set yet):\n"
@@ -5546,12 +5861,11 @@ msgstr ""
 "  <file path> [<password>]\n"
 "範例：/home/cimrman/jara-priv-key Dardanely\n"
 
-#: ../clients/cli/settings.c:3695
+#: ../clients/cli/settings.c:3583
 msgid ""
 "Enter bytes as a list of hexadecimal values.\n"
 "Two formats are accepted:\n"
-"(a) a string of hexadecimal digits, where each two digits represent one "
-"byte\n"
+"(a) a string of hexadecimal digits, where each two digits represent one byte\n"
 "(b) space-separated list of bytes written as hexadecimal digits (with "
 "optional 0x/0X prefix, and optional leading 0).\n"
 "\n"
@@ -5561,13 +5875,12 @@ msgstr ""
 "以十六進位的值來輸入位元組。\n"
 "接受的格式有兩種：\n"
 "(a) 十六進位數字字串，每兩個數字代表一個位元組\n"
-"(b) 以空格區隔開來的一列十六進位數字位元組清單（包含選用性的 0x/0x 前綴以及選"
-"用性的前置 0）。\n"
+"(b) 以空格區隔開來的一列十六進位數字位元組清單（包含選用性的 0x/0x 前綴以及選用性的前置 0）。\n"
 "\n"
 "範例：ab0455a6ea3a74C2\n"
 "          ab 4 55 0xa6 ea 3a 74 C2\n"
 
-#: ../clients/cli/settings.c:3816
+#: ../clients/cli/settings.c:3704
 #, c-format
 msgid ""
 "Enter a list of bonding options formatted as:\n"
@@ -5598,57 +5911,56 @@ msgstr ""
 "\n"
 "範例：mode=2,miimon=120\n"
 
-#: ../clients/cli/settings.c:3847
+#: ../clients/cli/settings.c:3735
 #, c-format
 msgid "'%s' is not a valid InfiniBand MAC"
 msgstr "「%s」不是個有效的 InfiniBand MAC"
 
-#: ../clients/cli/settings.c:3884
+#: ../clients/cli/settings.c:3772
 #, c-format
 msgid "'%s' is not a valid IBoIP P_Key"
 msgstr "「%s」不是個有效的 IBoIP P_Key"
 
-#: ../clients/cli/settings.c:3915
+#: ../clients/cli/settings.c:3803
 #, fuzzy, c-format
 msgid "'%s' is not valid (the format is: ip[/prefix] [next-hop] [metric])"
 msgstr "「%s」無效（請使用 ip/[prefix] next-hop [metric]）"
 
-#: ../clients/cli/settings.c:3963 ../clients/cli/settings.c:3982
+#: ../clients/cli/settings.c:3851 ../clients/cli/settings.c:3870
 #, c-format
 msgid "invalid IPv4 address '%s'"
 msgstr "無效的 IPv4 位址「%s」"
 
-#: ../clients/cli/settings.c:3988 ../clients/cli/settings.c:4296
+#: ../clients/cli/settings.c:3876 ../clients/cli/settings.c:4184
 #, c-format
 msgid "the property doesn't contain DNS server '%s'"
 msgstr ""
 
-#: ../clients/cli/settings.c:4000
+#: ../clients/cli/settings.c:3888
 msgid ""
 "Enter a list of IPv4 addresses of DNS servers.\n"
 "\n"
 "Example: 8.8.8.8, 8.8.4.4\n"
-msgstr ""
-"輸入一列 DNS 伺服器的 IPv4 位址。\n"
+msgstr "輸入一列 DNS 伺服器的 IPv4 位址。\n"
 "\n"
 "範例：8.8.8.8, 8.8.4.4\n"
 
-#: ../clients/cli/settings.c:4036 ../clients/cli/settings.c:4350
+#: ../clients/cli/settings.c:3924 ../clients/cli/settings.c:4238
 #, c-format
 msgid "the property doesn't contain DNS search domain '%s'"
 msgstr ""
 
-#: ../clients/cli/settings.c:4074 ../clients/cli/settings.c:4388
+#: ../clients/cli/settings.c:3962 ../clients/cli/settings.c:4276
 #, c-format
 msgid "the property doesn't contain DNS option '%s'"
 msgstr ""
 
-#: ../clients/cli/settings.c:4128 ../clients/cli/settings.c:4441
+#: ../clients/cli/settings.c:4016 ../clients/cli/settings.c:4329
 #, c-format
 msgid "the property doesn't contain IP address '%s'"
 msgstr ""
 
-#: ../clients/cli/settings.c:4141
+#: ../clients/cli/settings.c:4029
 #, fuzzy
 msgid ""
 "Enter a list of IPv4 addresses formatted as:\n"
@@ -5663,17 +5975,17 @@ msgstr ""
 "\n"
 "範例：192.168.1.5/24 192.168.1.1, 10.0.0.11/24\n"
 
-#: ../clients/cli/settings.c:4157 ../clients/cli/settings.c:4470
+#: ../clients/cli/settings.c:4045 ../clients/cli/settings.c:4358
 #, fuzzy, c-format
 msgid "invalid gateway address '%s'"
 msgstr "無效的閘道器「%s」"
 
-#: ../clients/cli/settings.c:4212 ../clients/cli/settings.c:4525
+#: ../clients/cli/settings.c:4100 ../clients/cli/settings.c:4413
 #, fuzzy, c-format
 msgid "the property doesn't contain route '%s'"
 msgstr "內容不可更改"
 
-#: ../clients/cli/settings.c:4225
+#: ../clients/cli/settings.c:4113
 #, fuzzy
 msgid ""
 "Enter a list of IPv4 routes formatted as:\n"
@@ -5693,12 +6005,12 @@ msgstr ""
 "\n"
 "Example: 192.168.2.0/24 192.168.2.1 3, 10.1.0.0/16 10.0.0.254\n"
 
-#: ../clients/cli/settings.c:4271 ../clients/cli/settings.c:4290
+#: ../clients/cli/settings.c:4159 ../clients/cli/settings.c:4178
 #, c-format
 msgid "invalid IPv6 address '%s'"
 msgstr "無效的 IPv6 位址「%s」"
 
-#: ../clients/cli/settings.c:4308
+#: ../clients/cli/settings.c:4196
 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 "
@@ -5709,14 +6021,13 @@ 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/cli/settings.c:4454
+#: ../clients/cli/settings.c:4342
 #, fuzzy
 msgid ""
 "Enter a list of IPv6 addresses formatted as:\n"
@@ -5729,10 +6040,10 @@ msgstr ""
 "  ip[/prefix] [gateway], ip[/prefix] [gateway],...\n"
 "遺失的前綴會被視為 128 這個前綴。\n"
 "\n"
-"範例：2607:f0d0:1002:51::4/64 2607:f0d0:1002:51::1, "
-"1050:0:0:0:5:600:300c:326b\n"
+"範例：2607:f0d0:1002:51::4/64 2607:f0d0:1002:51::1, 1050:0:0:0:5:600:300c:"
+"326b\n"
 
-#: ../clients/cli/settings.c:4538
+#: ../clients/cli/settings.c:4426
 #, fuzzy
 msgid ""
 "Enter a list of IPv6 routes formatted as:\n"
@@ -5754,28 +6065,28 @@ msgstr ""
 "Example: 2001:db8:beef:2::/64 2001:db8:beef::2, 2001:db8:beef:3::/64 2001:"
 "db8:beef::3 2\n"
 
-#: ../clients/cli/settings.c:4555 ../libnm-core/nm-setting-gsm.c:363
+#: ../clients/cli/settings.c:4443 ../libnm-core/nm-setting-gsm.c:363
 #: ../libnm-util/nm-setting-gsm.c:364
 #, c-format
 msgid "'%s' is not a number"
 msgstr "「%s」不是個數字"
 
-#: ../clients/cli/settings.c:4562
+#: ../clients/cli/settings.c:4450
 #, c-format
 msgid "'%s' is not valid; use 0, 1, or 2"
 msgstr "「%s」無效；請使用 0、1 或 2"
 
-#: ../clients/cli/settings.c:4609
+#: ../clients/cli/settings.c:4497
 #, c-format
 msgid "'%s' is not a valid channel; use <1-13>"
 msgstr "「%s」不是個有效的頻道；請使用 <1-13>"
 
-#: ../clients/cli/settings.c:4646
+#: ../clients/cli/settings.c:4534
 #, c-format
 msgid "'%s' is not valid; use [e, o, n]"
 msgstr "「%s」無效；請使用 [e, o, n]"
 
-#: ../clients/cli/settings.c:4674
+#: ../clients/cli/settings.c:4562
 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 "
@@ -5785,217 +6096,223 @@ msgid ""
 "\"roundrobin\"}, \"ports\": {\"eth1\": {}, \"eth2\": {}} }\n"
 "          set team.config /etc/my-team.conf\n"
 msgstr ""
-"nmcli 能接受直接的 JSON 配置資料以及一組包含了配置的檔案名稱。當在第二種情況"
-"下時，檔案會被讀取並且內容會被放入此內容中。\n"
+"nmcli 能接受直接的 JSON 配置資料以及一組包含了配置的檔案名稱。當在第二種情況下時，檔案會被讀取並且內容會被放入此內容中。\n"
 "\n"
 "範例：set team.config { \"device\": \"team0\", \"runner\": {\"name\": "
 "\"roundrobin\"}, \"ports\": {\"eth1\": {}, \"eth2\": {}} }\n"
 "          set team.config /etc/my-team.conf\n"
 
-#: ../clients/cli/settings.c:4714
+#: ../clients/cli/settings.c:4602
 msgid "no priority to remove"
 msgstr "沒有可移除的優先順序"
 
-#: ../clients/cli/settings.c:4718
+#: ../clients/cli/settings.c:4606
 #, c-format
 msgid "index '%d' is not in the range of <0-%d>"
 msgstr "索引「%d」不在 <0-%d> 的範圍內"
 
-#: ../clients/cli/settings.c:4757
+#: ../clients/cli/settings.c:4645
 #, c-format
 msgid ""
-"Warning: only one mapping at a time is supported; taking the first one (%s)\n"
+"Warning: only one mapping at a time is supported; taking the first one "
+"(%s)\n"
 msgstr ""
 
-#: ../clients/cli/settings.c:4764
+#: ../clients/cli/settings.c:4652
 #, fuzzy, c-format
 msgid "the property doesn't contain mapping '%s'"
 msgstr "內容不可更改"
 
-#: ../clients/cli/settings.c:4812
+#: ../clients/cli/settings.c:4700
 #, fuzzy, c-format
 msgid "'%s' cannot be empty"
 msgstr "未設定 '%s' 選項"
 
-#: ../clients/cli/settings.c:4886 ../clients/cli/settings.c:5053
-#: ../libnm-core/nm-setting-wired.c:651 ../libnm-core/nm-setting-wireless.c:820
-#: ../libnm-core/nm-setting-wireless.c:832 ../libnm-util/nm-setting-wired.c:646
+#: ../clients/cli/settings.c:4774 ../clients/cli/settings.c:4941
+#: ../libnm-core/nm-setting-wired.c:651
+#: ../libnm-core/nm-setting-wireless.c:820
+#: ../libnm-core/nm-setting-wireless.c:832
+#: ../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/cli/settings.c:4892 ../clients/cli/settings.c:5059
+#: ../clients/cli/settings.c:4780 ../clients/cli/settings.c:4947
 #, c-format
 msgid "the property doesn't contain MAC address '%s'"
 msgstr ""
 
-#: ../clients/cli/settings.c:4911
+#: ../clients/cli/settings.c:4799
 #, fuzzy, c-format
 msgid "'%s' is not valid; 2 or 3 strings should be provided"
 msgstr "「%s」無效；應提供三個字串"
 
-#: ../clients/cli/settings.c:4925
+#: ../clients/cli/settings.c:4813
 #, fuzzy
 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"
+msgstr "輸入一列三個頻道（以逗號或空格區隔開）。\n"
 "\n"
 "範例：0.0.0e20 0.0.0e21 0.0.0e22\n"
 
-#: ../clients/cli/settings.c:4947
+#: ../clients/cli/settings.c:4835
 #, c-format
 msgid "'%s' string value should consist of 1 - 199 characters"
 msgstr ""
 
-#: ../clients/cli/settings.c:4979
+#: ../clients/cli/settings.c:4867
 #, c-format
 msgid ""
 "Enter a list of S/390 options formatted as:\n"
 "  option = <value>, option = <value>,...\n"
 "Valid options are: %s\n"
-msgstr ""
-"輸入一列 S/390 選項，格式為：\n"
+msgstr "輸入一列 S/390 選項，格式為：\n"
 "  option = <value>, option = <value>,...\n"
 "可用選項為：%s\n"
 
-#: ../clients/cli/settings.c:5025
+#: ../clients/cli/settings.c:4913
 #, c-format
 msgid "'%s' is not a valid channel"
 msgstr "「%s」不是個有效的頻道"
 
-#: ../clients/cli/settings.c:5031
+#: ../clients/cli/settings.c:4919
 #, c-format
 msgid "'%ld' is not a valid channel"
 msgstr "「%ld」不是個有效的頻道"
 
-#: ../clients/cli/settings.c:5125
+#: ../clients/cli/settings.c:5013
 #, fuzzy, c-format
 msgid "invalid option '%s', use 'default', 'never' or 'always'"
 msgstr "不合於規定的選項 '%s' 或其值為 '%s'"
 
-#: ../clients/cli/settings.c:5186 ../clients/cli/settings.c:5225
-#: ../clients/cli/settings.c:5264
+#: ../clients/cli/settings.c:5074 ../clients/cli/settings.c:5113
+#: ../clients/cli/settings.c:5152
 #, c-format
 msgid "the property doesn't contain protocol '%s'"
 msgstr ""
 
-#: ../clients/cli/settings.c:5303
+#: ../clients/cli/settings.c:5191
 #, c-format
 msgid ""
 "'%s' not compatible with %s '%s', please change the key or set the right %s "
 "first."
 msgstr ""
 
-#: ../clients/cli/settings.c:5311
+#: ../clients/cli/settings.c:5199
 #, c-format
 msgid "WEP key is guessed to be of '%s'\n"
 msgstr "預測 WEP key 為「%s」\n"
 
-#: ../clients/cli/settings.c:5313
+#: ../clients/cli/settings.c:5201
 #, fuzzy, c-format
 msgid "WEP key index set to '%d'\n"
 msgstr "預測 WEP key 為「%s」\n"
 
-#: ../clients/cli/settings.c:5336
+#: ../clients/cli/settings.c:5224
 #, c-format
 msgid "'%s' not among [0 (unknown), 1 (key), 2 (passphrase)]"
 msgstr "「%s」不在 [0 (unknown), 1 (key), 2 (passphrase)] 之間"
 
-#: ../clients/cli/settings.c:5352 ../clients/cli/settings.c:5355
-#: ../clients/cli/settings.c:5358 ../clients/cli/settings.c:5361
+#: ../clients/cli/settings.c:5240 ../clients/cli/settings.c:5243
+#: ../clients/cli/settings.c:5246 ../clients/cli/settings.c:5249
 #, c-format
 msgid ""
 "Warning: '%s' is not compatible with '%s' type, please change or delete the "
 "key.\n"
 msgstr ""
 
-#: ../clients/cli/settings.c:5374
+#: ../clients/cli/settings.c:5262
 #, c-format
 msgid ""
 "Enter the type of WEP keys. The accepted values are: 0 or unknown, 1 or key, "
 "and 2 or passphrase.\n"
-msgstr ""
-"輸入 WEP key 的類型。接受的值為：0 或 unknown、1 或 key，以及 2 或 "
-"passphrase。\n"
+msgstr "輸入 WEP key 的類型。接受的值為：0 或 unknown、1 或 key，以及 2 或 passphrase。\n"
 
-#: ../clients/cli/settings.c:5387
+#: ../clients/cli/settings.c:5275
 #, c-format
 msgid "'%s' is not a valid PSK"
 msgstr "「%s」不是個有效的 PSK"
 
-#: ../clients/cli/settings.c:5431
+#: ../clients/cli/settings.c:5319
 #, c-format
 msgid "'%s' is not a valid DCB flag"
 msgstr "「%s」不是有效的 DCB 旗標"
 
-#: ../clients/cli/settings.c:5454
+#: ../clients/cli/settings.c:5342
 #, c-format
 msgid "'%s' is not a DCB app priority"
 msgstr "「%s」不是有效的 DCP 應用程式優先順序"
 
-#: ../clients/cli/settings.c:5480
+#: ../clients/cli/settings.c:5368
 msgid "must contain 8 comma-separated numbers"
 msgstr "必須包含 8 個以逗號區隔開的數字"
 
-#: ../clients/cli/settings.c:5497
+#: ../clients/cli/settings.c:5385
 #, c-format
 msgid "'%s' not a number between 0 and %u (inclusive) or %u"
 msgstr "「%s」不是組介於 0 和（包含）%u 之間的數字或是 %u"
 
-#: ../clients/cli/settings.c:5500
+#: ../clients/cli/settings.c:5388
 #, c-format
 msgid "'%s' not a number between 0 and %u (inclusive)"
 msgstr "「%s」不是組介於 0 和（包含）%u 之間的數字"
 
-#: ../clients/cli/settings.c:5522
+#: ../clients/cli/settings.c:5410
 #, c-format
-msgid ""
-"Warning: changes will have no effect until '%s' includes 1 (enabled)\n"
+msgid "Warning: changes will have no effect until '%s' includes 1 (enabled)\n"
 "\n"
-msgstr ""
-"警告：在「%s」包含 1（啟用）之前，變更將不會生效\n"
+msgstr "警告：在「%s」包含 1（啟用）之前，變更將不會生效\n"
 "\n"
 
-#: ../clients/cli/settings.c:5575
+#: ../clients/cli/settings.c:5463
 #, c-format
 msgid "bandwidth percentages must total 100%%"
 msgstr "頻寬比率總額必須是 100%%"
 
-#: ../clients/cli/settings.c:5661 ../clients/cli/settings.c:5667
+#: ../clients/cli/settings.c:5549 ../clients/cli/settings.c:5555
 msgid "SIM operator ID must be a 5 or 6 number MCCMNC code"
 msgstr ""
 
-#: ../clients/cli/settings.c:5710
+#: ../clients/cli/settings.c:5598
 #, fuzzy, c-format
 msgid "invalid option '%s', use '%s' or '%s'"
 msgstr "不合於規定的選項 '%s' 或其值為 '%s'"
 
-#: ../clients/cli/settings.c:7777
+#: ../clients/cli/settings.c:7644
 msgid "don't know how to get the property value"
 msgstr "不知如何取得內容值"
 
-#: ../clients/cli/settings.c:7830 ../clients/cli/settings.c:7870
+#: ../clients/cli/settings.c:7697 ../clients/cli/settings.c:7737
 msgid "the property can't be changed"
 msgstr "內容不可更改"
 
-#: ../clients/cli/settings.c:7954
+#: ../clients/cli/settings.c:7821
 #, fuzzy
 msgid "(not available)"
 msgstr "無法使用"
 
-#: ../clients/cli/settings.c:7979
+#: ../clients/cli/settings.c:7846
 msgid "[NM property description]"
 msgstr "[NM property description]"
 
-#: ../clients/cli/settings.c:7984
+#: ../clients/cli/settings.c:7851
 msgid "[nmcli specific description]"
 msgstr "[nmcli specific description]"
 
+#. ----------------------------------------------------------------------------
+#: ../clients/cli/settings.c:7900
+msgid "<hidden>"
+msgstr ""
+
+#: ../clients/cli/utils.c:124
+#, c-format
+msgid "Error: value for '%s' argument is required."
+msgstr "錯誤：「%s」引數需要有個值。"
+
 #: ../clients/cli/utils.c:149
 #, c-format
 msgid "Error: Argument '%s' was expected, but '%s' provided."
@@ -6006,57 +6323,91 @@ msgstr "錯誤：預期「%s」引數，但卻提供了「%s」。"
 msgid "Error: Unexpected argument '%s'"
 msgstr "錯誤：非預期的引數「%s」"
 
+#: ../clients/cli/utils.c:202
+#, c-format
+msgid "Error converting IP4 address '0x%X' to text form"
+msgstr "將 IP4 位址「0x%X」轉換為文字格式時發生了錯誤"
+
+#: ../clients/cli/utils.c:230
+#, c-format
+msgid "Error converting IP6 address '%s' to text form"
+msgstr "將 IP6 位址「%s」轉換為文字格式時發生了錯誤"
+
 #. Translators: the first %s is the partial value entered by
 #. * the user, the second %s a list of compatible values.
-#.
-#: ../clients/cli/utils.c:492 ../clients/cli/utils.c:523
+#. 
+#: ../clients/cli/utils.c:546 ../clients/cli/utils.c:577
 #, fuzzy, c-format
 msgid "'%s' is ambiguous (%s)"
 msgstr "「%s」意義含糊不清（%s x %s）"
 
-#: ../clients/cli/utils.c:502
+#: ../clients/cli/utils.c:556
 #, c-format
 msgid "'%s' is not valid; use [%s] or [%s]"
 msgstr "「%s」無效；請使用「%s」或是「%s」"
 
-#: ../clients/cli/utils.c:535
+#: ../clients/cli/utils.c:589
 #, fuzzy, c-format
 msgid "'%s' is not valid; use [%s], [%s] or [%s]"
 msgstr "「%s」無效；請使用「%s」或是「%s」"
 
-#: ../clients/cli/utils.c:634
+#: ../clients/cli/utils.c:688
 #, c-format
 msgid "'%s' is ambiguous (%s x %s)"
 msgstr "「%s」意義含糊不清（%s x %s）"
 
-#: ../clients/cli/utils.c:646
+#: ../clients/cli/utils.c:700
 #, c-format
 msgid "missing name, try one of [%s]"
 msgstr "名稱遺失，請嘗試 [%s] 其中之一"
 
-#: ../clients/cli/utils.c:893
+#: ../clients/cli/utils.c:964
 #, c-format
 msgid "field '%s' has to be alone"
 msgstr "欄位 '%s' 必須是單獨的"
 
-#: ../clients/cli/utils.c:896
+#: ../clients/cli/utils.c:967
 #, c-format
 msgid "invalid field '%s'; allowed fields: %s"
 msgstr "無效的欄位「%s」; 允許的欄位：%s"
 
-#: ../clients/cli/utils.c:953
+#: ../clients/cli/utils.c:1024
 msgid "Option '--terse' requires specifying '--fields'"
 msgstr "選項 '--terse' 需指定 '--fields'"
 
-#: ../clients/cli/utils.c:957
+#: ../clients/cli/utils.c:1028
 #, c-format
 msgid "Option '--terse' requires specific '--fields' option values , not '%s'"
 msgstr "選項 '--terse' 需要特定的 '--fields' 選項值，而不是 '%s'"
 
+#: ../clients/cli/utils.c:1390
+#, c-format
+msgid ""
+"Warning: nmcli (%s) and NetworkManager (%s) versions don't match. Use --"
+"nocheck to suppress the warning.\n"
+msgstr "警告：nmcli（%s）和 NetworkManager（%s）的版本不符。請使用 --nocheck 來抑止警告訊息。\n"
+
+#: ../clients/cli/utils.c:1399
+#, c-format
+msgid ""
+"Error: nmcli (%s) and NetworkManager (%s) versions don't match. Force "
+"execution using --nocheck, but the results are unpredictable."
+msgstr "錯誤：nmcli（%s）和 NetworkManager（%s）的版本不符。請使用 --nocheck 來強制執行，不過結果無法預期。"
+
 #: ../clients/common/nm-polkit-listener.c:212
 msgid "An authentication session is already underway."
 msgstr ""
 
+#. TTLS and PEAP are actually much more complicated, but this complication
+#. * is not visible here since we only care about phase2 authentication
+#. * (and don't even care of which one)
+#. 
+#: ../clients/common/nm-secret-agent-simple.c:223
+#: ../clients/common/nm-secret-agent-simple.c:328
+#: ../clients/tui/nmt-page-dsl.c:66 ../clients/tui/nmt-page-wifi.c:332
+msgid "Username"
+msgstr "使用者名稱"
+
 #: ../clients/common/nm-secret-agent-simple.c:230
 #: ../clients/common/nm-secret-agent-simple.c:273
 #: ../clients/common/nm-secret-agent-simple.c:303
@@ -6064,10 +6415,9 @@ msgstr ""
 #: ../clients/common/nm-secret-agent-simple.c:492
 #: ../clients/common/nm-secret-agent-simple.c:507
 #: ../clients/common/nm-secret-agent-simple.c:525
-#: ../clients/common/nm-vpn-helpers.c:119
-#: ../clients/common/nm-vpn-helpers.c:120
-#: ../clients/common/nm-vpn-helpers.c:124
-#: ../clients/common/nm-vpn-helpers.c:127 ../clients/tui/nmt-page-dsl.c:75
+#: ../clients/common/nm-vpn-helpers.c:101
+#: ../clients/common/nm-vpn-helpers.c:102
+#: ../clients/common/nm-vpn-helpers.c:105 ../clients/tui/nmt-page-dsl.c:75
 #: ../clients/tui/nmt-page-wifi.c:277 ../clients/tui/nmt-page-wifi.c:308
 #: ../clients/tui/nmt-page-wifi.c:341
 msgid "Password"
@@ -6145,53 +6495,26 @@ msgstr "需要密碼才能連線至「%s」。"
 msgid "VPN password required"
 msgstr "需要 PIN 碼"
 
-#: ../clients/common/nm-vpn-helpers.c:48
-#, fuzzy, c-format
-msgid "unknown VPN plugin \"%s\""
-msgstr "不明日誌網域「%s」"
-
-#: ../clients/common/nm-vpn-helpers.c:59
-#, c-format
-msgid "cannot cannot load legacy-only VPN plugin \"%s\" for \"%s\""
-msgstr ""
-
-#: ../clients/common/nm-vpn-helpers.c:64
-#, c-format
-msgid ""
-"cannot load VPN plugin \"%s\" due to missing \"%s\". Missing client plugin?"
+#: ../clients/common/nm-vpn-helpers.c:61
+msgid "could not get VPN plugin info"
 msgstr ""
 
-#: ../clients/common/nm-vpn-helpers.c:69
-#, fuzzy, c-format
-msgid "failed to load VPN plugin \"%s\": %s"
-msgstr "錯誤：無法修改 %s.%s：%s。"
-
-#: ../clients/common/nm-vpn-helpers.c:121
-#, fuzzy
-msgid "Certificate password"
-msgstr "私密金鑰的密碼"
-
-#: ../clients/common/nm-vpn-helpers.c:122
-#, fuzzy
-msgid "HTTP proxy password"
-msgstr "顯示密碼"
-
-#: ../clients/common/nm-vpn-helpers.c:125
-#: ../clients/common/nm-vpn-helpers.c:128
+#: ../clients/common/nm-vpn-helpers.c:103
+#: ../clients/common/nm-vpn-helpers.c:106
 #, fuzzy
 msgid "Group password"
 msgstr "顯示密碼"
 
-#: ../clients/common/nm-vpn-helpers.c:130 ../clients/tui/nmt-page-ip4.c:143
+#: ../clients/common/nm-vpn-helpers.c:108 ../clients/tui/nmt-page-ip4.c:143
 #: ../clients/tui/nmt-page-ip6.c:143
 msgid "Gateway"
 msgstr "閘道器"
 
-#: ../clients/common/nm-vpn-helpers.c:131
+#: ../clients/common/nm-vpn-helpers.c:109
 msgid "Cookie"
 msgstr ""
 
-#: ../clients/common/nm-vpn-helpers.c:132
+#: ../clients/common/nm-vpn-helpers.c:110
 msgid "Gateway certificate hash"
 msgstr ""
 
@@ -6231,7 +6554,7 @@ msgstr "無效的選項。請使用 --help 來查看可用選項的清單。"
 #: ../clients/tui/newt/nmt-newt-utils.c:177 ../clients/tui/nmt-editor.c:415
 #: ../clients/tui/nmt-password-dialog.c:174
 #: ../clients/tui/nmt-route-editor.c:122 ../clients/tui/nmtui-hostname.c:69
-#: ../clients/tui/nmtui.c:136
+#: ../clients/tui/nmtui.c:114
 msgid "OK"
 msgstr "確定"
 
@@ -6261,38 +6584,23 @@ msgstr "編輯程式錯誤：%s"
 msgid "Could not re-read file: %s"
 msgstr "無法重新讀取檔案：%s"
 
-#: ../clients/tui/nm-editor-utils.c:146 ../libnm-glib/nm-device.c:1859
-#: ../libnm/nm-device.c:1810
-msgid "Ethernet"
-msgstr "Ethernet"
-
 #: ../clients/tui/nm-editor-utils.c:150
 #, c-format
 msgid "Ethernet connection %d"
 msgstr "乙太網路連線 %d"
 
-#: ../clients/tui/nm-editor-utils.c:154 ../libnm-glib/nm-device.c:1861
-#: ../libnm/nm-device.c:1812
-msgid "Wi-Fi"
-msgstr "無線網路"
-
 #: ../clients/tui/nm-editor-utils.c:158
 #, c-format
 msgid "Wi-Fi connection %d"
 msgstr "Wi-Fi 連線 %d"
 
-#: ../clients/tui/nm-editor-utils.c:163 ../libnm-core/nm-connection.c:1748
-#: ../libnm-glib/nm-device.c:1871 ../libnm/nm-device.c:1822
-msgid "InfiniBand"
-msgstr "InfiniBand"
-
 #: ../clients/tui/nm-editor-utils.c:167
 #, c-format
 msgid "InfiniBand connection %d"
 msgstr "InfiniBand 連線 %d"
 
-#: ../clients/tui/nm-editor-utils.c:172 ../libnm-glib/nm-device.c:1869
-#: ../libnm/nm-device.c:1820
+#: ../clients/tui/nm-editor-utils.c:172 ../libnm-glib/nm-device.c:1859
+#: ../libnm/nm-device.c:1810
 msgid "Mobile Broadband"
 msgstr "行動寬頻"
 
@@ -6310,9 +6618,9 @@ msgstr "DSL"
 msgid "DSL connection %d"
 msgstr "DSL 連線 %d"
 
-#: ../clients/tui/nm-editor-utils.c:190 ../libnm-core/nm-connection.c:1740
-#: ../libnm-glib/nm-device.c:1873 ../libnm-util/nm-connection.c:1626
-#: ../libnm/nm-device.c:1824 ../src/settings/plugins/ifcfg-rh/reader.c:4195
+#: ../clients/tui/nm-editor-utils.c:190 ../libnm-core/nm-connection.c:1708
+#: ../libnm-glib/nm-device.c:1863 ../libnm-util/nm-connection.c:1626
+#: ../libnm/nm-device.c:1814 ../src/settings/plugins/ifcfg-rh/reader.c:4182
 msgid "Bond"
 msgstr "Bond"
 
@@ -6321,9 +6629,9 @@ msgstr "Bond"
 msgid "Bond connection %d"
 msgstr "Bond 連線 %d"
 
-#: ../clients/tui/nm-editor-utils.c:199 ../libnm-core/nm-connection.c:1744
-#: ../libnm-glib/nm-device.c:1877 ../libnm-util/nm-connection.c:1630
-#: ../libnm/nm-device.c:1828 ../src/settings/plugins/ifcfg-rh/reader.c:4492
+#: ../clients/tui/nm-editor-utils.c:199 ../libnm-core/nm-connection.c:1712
+#: ../libnm-glib/nm-device.c:1867 ../libnm-util/nm-connection.c:1630
+#: ../libnm/nm-device.c:1818 ../src/settings/plugins/ifcfg-rh/reader.c:4479
 msgid "Bridge"
 msgstr "橋接"
 
@@ -6332,9 +6640,9 @@ msgstr "橋接"
 msgid "Bridge connection %d"
 msgstr "橋接連線 %d"
 
-#: ../clients/tui/nm-editor-utils.c:208 ../libnm-core/nm-connection.c:1742
-#: ../libnm-glib/nm-device.c:1875 ../libnm-util/nm-connection.c:1628
-#: ../libnm/nm-device.c:1826 ../src/settings/plugins/ifcfg-rh/reader.c:4301
+#: ../clients/tui/nm-editor-utils.c:208 ../libnm-core/nm-connection.c:1710
+#: ../libnm-glib/nm-device.c:1865 ../libnm-util/nm-connection.c:1628
+#: ../libnm/nm-device.c:1816 ../src/settings/plugins/ifcfg-rh/reader.c:4288
 msgid "Team"
 msgstr "Team"
 
@@ -6579,6 +6887,10 @@ msgstr "已連線"
 msgid "INFINIBAND"
 msgstr "INFINIBAND"
 
+#: ../clients/tui/nmt-page-infiniband.c:88
+msgid "Transport mode"
+msgstr "傳輸模式"
+
 #: ../clients/tui/nmt-page-ip4.c:38
 msgid "Disabled"
 msgstr "已停用"
@@ -6668,26 +6980,24 @@ msgid "Allowed authentication methods:"
 msgstr "身份認證"
 
 #: ../clients/tui/nmt-page-ppp.c:147
-#, fuzzy
 msgid "EAP"
-msgstr "LEAP"
+msgstr "EAP"
 
 #: ../clients/tui/nmt-page-ppp.c:155
-#, fuzzy
 msgid "PAP"
-msgstr "AP"
+msgstr "PAP"
 
 #: ../clients/tui/nmt-page-ppp.c:163
 msgid "CHAP"
-msgstr ""
+msgstr "CHAP"
 
 #: ../clients/tui/nmt-page-ppp.c:171
 msgid "MSCHAPv2"
-msgstr ""
+msgstr "MSCHAPv2"
 
 #: ../clients/tui/nmt-page-ppp.c:179
 msgid "MSCHAP"
-msgstr ""
+msgstr "MSCHAP"
 
 #: ../clients/tui/nmt-page-ppp.c:195
 msgid "Use point-to-point encryption (MPPE)"
@@ -6933,14 +7243,10 @@ msgid "Deactivate"
 msgstr "取消啟動"
 
 #: ../clients/tui/nmtui-connect.c:413 ../clients/tui/nmtui-edit.c:120
-#: ../clients/tui/nmtui.c:130
+#: ../clients/tui/nmtui.c:108
 msgid "Quit"
 msgstr "離開"
 
-#: ../clients/tui/nmtui-connect.c:413 ../clients/tui/nmtui-edit.c:120
-msgid "Back"
-msgstr ""
-
 #: ../clients/tui/nmtui-connect.c:436
 #, c-format
 msgid "No such connection '%s'"
@@ -6962,9 +7268,7 @@ msgstr "選擇您想要建立的連線類型。"
 msgid ""
 "If you are creating a VPN, and the VPN connection you wish to create does "
 "not appear in the list, you may not have the correct VPN plugin installed."
-msgstr ""
-"如果您要建立 VPN，但此 VPN 連線沒有出現在清單上，您可能尚未安裝正確的 VPN 外"
-"掛程式。"
+msgstr "如果您要建立 VPN，但此 VPN 連線沒有出現在清單上，您可能尚未安裝正確的 VPN 外掛程式。"
 
 #: ../clients/tui/nmtui-edit.c:411 ../clients/tui/nmtui-edit.c:427
 msgid "New Connection"
@@ -7024,28 +7328,28 @@ msgstr "新主機名稱"
 msgid "Set system hostname"
 msgstr "設定系統的主機名稱"
 
-#: ../clients/tui/nmtui.c:104
+#: ../clients/tui/nmtui.c:83
 msgid "NetworkManager TUI"
 msgstr "NetworkManager 文字介面"
 
-#: ../clients/tui/nmtui.c:112
+#: ../clients/tui/nmtui.c:91
 msgid "Please select an option"
 msgstr "請選擇一個選項"
 
-#: ../clients/tui/nmtui.c:160
+#: ../clients/tui/nmtui.c:143
 msgid "Usage"
 msgstr "用法"
 
-#: ../clients/tui/nmtui.c:241
+#: ../clients/tui/nmtui.c:224
 msgid "Could not parse arguments"
 msgstr "無法剖析引數"
 
-#: ../clients/tui/nmtui.c:251
+#: ../clients/tui/nmtui.c:234
 #, fuzzy, c-format
 msgid "Could not contact NetworkManager: %s.\n"
 msgstr "無法啟動連線：%s"
 
-#: ../clients/tui/nmtui.c:256
+#: ../clients/tui/nmtui.c:239
 msgid "NetworkManager is not running."
 msgstr "NetworkManager 並不在執行中。"
 
@@ -7331,55 +7635,56 @@ msgstr "無法驗證 PKCS#12 檔案：%d"
 msgid "Could not generate random data."
 msgstr "無法產生隨機資料。"
 
-#: ../libnm-core/nm-connection.c:225
+#: ../libnm-core/nm-connection.c:224
 msgid "wrong type; should be a list of strings."
 msgstr ""
 
-#: ../libnm-core/nm-connection.c:295
+#: ../libnm-core/nm-connection.c:294
 #, fuzzy
 msgid "unknown setting name"
 msgstr "錯誤：「%s」設定不明\n"
 
-#: ../libnm-core/nm-connection.c:307
+#: ../libnm-core/nm-connection.c:306
 #, fuzzy
 msgid "duplicate setting name"
 msgstr "錯誤：「%s」設定不明\n"
 
-#: ../libnm-core/nm-connection.c:905
+#: ../libnm-core/nm-connection.c:873
 msgid "setting not found"
 msgstr ""
 
-#: ../libnm-core/nm-connection.c:969
+#: ../libnm-core/nm-connection.c:937
 #, fuzzy
 msgid "setting not allowed in slave connection"
 msgstr "設定「%s」不存在連線中。\n"
 
-#: ../libnm-core/nm-connection.c:980
+#: ../libnm-core/nm-connection.c:948
 msgid "setting is required for non-slave connections"
 msgstr ""
 
-#: ../libnm-core/nm-connection.c:1074
+#: ../libnm-core/nm-connection.c:1042
 #, fuzzy
 msgid "Unexpected failure to verify the connection"
 msgstr "無法刪除連線：%s"
 
-#: ../libnm-core/nm-connection.c:1107
+#: ../libnm-core/nm-connection.c:1075
 #, fuzzy
 msgid "Unexpected failure to normalize the connection"
 msgstr "無法刪除連線：%s"
 
-#: ../libnm-core/nm-connection.c:1608 ../libnm-core/nm-setting-8021x.c:2411
+#: ../libnm-core/nm-connection.c:1576 ../libnm-core/nm-setting-8021x.c:2411
 #: ../libnm-core/nm-setting-8021x.c:2428 ../libnm-core/nm-setting-8021x.c:2459
 #: ../libnm-core/nm-setting-8021x.c:2476 ../libnm-core/nm-setting-8021x.c:2518
 #: ../libnm-core/nm-setting-8021x.c:2530 ../libnm-core/nm-setting-8021x.c:2548
 #: ../libnm-core/nm-setting-8021x.c:2560 ../libnm-core/nm-setting-8021x.c:2584
 #: ../libnm-core/nm-setting-8021x.c:2749 ../libnm-core/nm-setting-adsl.c:189
 #: ../libnm-core/nm-setting-bluetooth.c:120
-#: ../libnm-core/nm-setting-bluetooth.c:138 ../libnm-core/nm-setting-cdma.c:141
+#: ../libnm-core/nm-setting-bluetooth.c:138
+#: ../libnm-core/nm-setting-cdma.c:141
 #: ../libnm-core/nm-setting-connection.c:837
 #: ../libnm-core/nm-setting-connection.c:876
 #: ../libnm-core/nm-setting-connection.c:989
-#: ../libnm-core/nm-setting-ip-config.c:2186
+#: ../libnm-core/nm-setting-ip-config.c:2167
 #: ../libnm-core/nm-setting-olpc-mesh.c:120
 #: ../libnm-core/nm-setting-pppoe.c:142 ../libnm-core/nm-setting-vpn.c:419
 #: ../libnm-core/nm-setting-vxlan.c:360 ../libnm-core/nm-setting-wimax.c:126
@@ -7391,8 +7696,10 @@ msgstr "無法刪除連線：%s"
 #: ../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-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
@@ -7505,7 +7812,8 @@ msgstr ""
 msgid "ignoring invalid raw password"
 msgstr ""
 
-#: ../libnm-core/nm-keyfile-reader.c:892 ../libnm-core/nm-keyfile-reader.c:1058
+#: ../libnm-core/nm-keyfile-reader.c:892
+#: ../libnm-core/nm-keyfile-reader.c:1058
 #, c-format
 msgid "certificate or key file '%s' does not exist"
 msgstr ""
@@ -7622,9 +7930,10 @@ msgstr "解密私密金鑰失敗。"
 #: ../libnm-core/nm-setting-8021x.c:2591 ../libnm-core/nm-setting-adsl.c:196
 #: ../libnm-core/nm-setting-cdma.c:148 ../libnm-core/nm-setting-cdma.c:157
 #: ../libnm-core/nm-setting-connection.c:844
-#: ../libnm-core/nm-setting-connection.c:887 ../libnm-core/nm-setting-gsm.c:281
-#: ../libnm-core/nm-setting-gsm.c:338 ../libnm-core/nm-setting-gsm.c:375
-#: ../libnm-core/nm-setting-gsm.c:384 ../libnm-core/nm-setting-ip-config.c:2193
+#: ../libnm-core/nm-setting-connection.c:887
+#: ../libnm-core/nm-setting-gsm.c:281 ../libnm-core/nm-setting-gsm.c:338
+#: ../libnm-core/nm-setting-gsm.c:375 ../libnm-core/nm-setting-gsm.c:384
+#: ../libnm-core/nm-setting-ip-config.c:2174
 #: ../libnm-core/nm-setting-ip4-config.c:198
 #: ../libnm-core/nm-setting-ip4-config.c:205
 #: ../libnm-core/nm-setting-pppoe.c:149 ../libnm-core/nm-setting-pppoe.c:158
@@ -7640,8 +7949,9 @@ msgstr "解密私密金鑰失敗。"
 #: ../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-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:170 ../libnm-util/nm-setting-pppoe.c:179
 #: ../libnm-util/nm-setting-vpn.c:432 ../libnm-util/nm-setting-vpn.c:442
@@ -7668,8 +7978,8 @@ msgstr "屬性不合規定"
 #: ../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:211
-#: ../libnm-core/nm-setting-ip6-config.c:222
+#: ../libnm-core/nm-setting-ip6-config.c:188
+#: ../libnm-core/nm-setting-ip6-config.c:199
 #: ../libnm-core/nm-setting-olpc-mesh.c:149
 #: ../libnm-core/nm-setting-wimax.c:144 ../libnm-core/nm-setting-wired.c:665
 #: ../libnm-core/nm-setting-wired.c:675
@@ -7707,12 +8017,14 @@ msgstr "屬性不合規定"
 #: ../libnm-core/nm-setting-8021x.c:2783 ../libnm-core/nm-setting-8021x.c:2793
 #: ../libnm-core/nm-setting-8021x.c:2803 ../libnm-core/nm-setting-8021x.c:2813
 #: ../libnm-core/nm-setting-8021x.c:2823 ../libnm-core/nm-setting-adsl.c:208
-#: ../libnm-core/nm-setting-adsl.c:220 ../libnm-core/nm-setting-bluetooth.c:146
+#: ../libnm-core/nm-setting-adsl.c:220
+#: ../libnm-core/nm-setting-bluetooth.c:146
 #: ../libnm-core/nm-setting-wireless-security.c:870
 #: ../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-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"
@@ -7805,13 +8117,13 @@ msgid "'%d' is not a valid value for the property (should be <= %d)"
 msgstr "'%d' 不是屬性合於規定的值（應該 <= %d）"
 
 #: ../libnm-core/nm-setting-bridge-port.c:154
-#: ../libnm-core/nm-setting-team-port.c:109
+#: ../libnm-core/nm-setting-team-port.c:97
 #, fuzzy, c-format
 msgid "missing setting"
 msgstr "遺失選項"
 
 #: ../libnm-core/nm-setting-bridge-port.c:165
-#: ../libnm-core/nm-setting-team-port.c:120
+#: ../libnm-core/nm-setting-team-port.c:108
 #, c-format
 msgid ""
 "A connection with a '%s' setting must have the slave-type set to '%s'. "
@@ -7997,52 +8309,47 @@ msgstr "無效的 IPv6 位址「%s」"
 msgid "Invalid routing metric '%s'"
 msgstr "無效的單位「%s」"
 
-#: ../libnm-core/nm-setting-ip-config.c:2206
+#: ../libnm-core/nm-setting-ip-config.c:2187
 #, fuzzy, c-format
 msgid "%d. DNS server address is invalid"
 msgstr "%d。IPv4 位址不合規定"
 
-#: ../libnm-core/nm-setting-ip-config.c:2222
+#: ../libnm-core/nm-setting-ip-config.c:2203
 #, fuzzy, c-format
 msgid "%d. IP address is invalid"
 msgstr "%d。IPv4 位址不合規定"
 
-#: ../libnm-core/nm-setting-ip-config.c:2234
+#: ../libnm-core/nm-setting-ip-config.c:2215
 #, fuzzy, c-format
 msgid "%d. IP address has 'label' property with invalid type"
 msgstr "%d。IPv4 位址的前綴不合規定"
 
-#: ../libnm-core/nm-setting-ip-config.c:2243
+#: ../libnm-core/nm-setting-ip-config.c:2224
 #, fuzzy, c-format
 msgid "%d. IP address has invalid label '%s'"
 msgstr "%d。IPv4 位址的前綴不合規定"
 
-#: ../libnm-core/nm-setting-ip-config.c:2257
+#: ../libnm-core/nm-setting-ip-config.c:2238
 msgid "gateway cannot be set if there are no addresses configured"
 msgstr ""
 
-#: ../libnm-core/nm-setting-ip-config.c:2266
+#: ../libnm-core/nm-setting-ip-config.c:2247
 #, fuzzy
 msgid "gateway is invalid"
 msgstr "屬性不合規定"
 
-#: ../libnm-core/nm-setting-ip-config.c:2280
+#: ../libnm-core/nm-setting-ip-config.c:2261
 #, c-format
 msgid "%d. route is invalid"
 msgstr "%d。路徑不合規定"
 
-#: ../libnm-core/nm-setting-ip-config.c:2289
+#: ../libnm-core/nm-setting-ip-config.c:2270
 #, c-format
 msgid "%d. route cannot be a default route"
 msgstr ""
 
-#: ../libnm-core/nm-setting-ip-config.c:2300
-#, fuzzy, c-format
-msgid "a gateway is incompatible with '%s'"
-msgstr "'%s=%s' 與 '%s > 0' 不相容"
-
 #: ../libnm-core/nm-setting-ip4-config.c:143
-#: ../libnm-core/nm-setting-ip6-config.c:167
+#: ../libnm-core/nm-setting-ip6-config.c:144
 #: ../libnm-util/nm-setting-ip4-config.c:879
 #: ../libnm-util/nm-setting-ip6-config.c:843
 #, fuzzy, c-format
@@ -8052,9 +8359,9 @@ msgstr "此屬性不能用於 '%s=%s'"
 #: ../libnm-core/nm-setting-ip4-config.c:155
 #: ../libnm-core/nm-setting-ip4-config.c:165
 #: ../libnm-core/nm-setting-ip4-config.c:177
-#: ../libnm-core/nm-setting-ip6-config.c:179
-#: ../libnm-core/nm-setting-ip6-config.c:189
-#: ../libnm-core/nm-setting-ip6-config.c:199
+#: ../libnm-core/nm-setting-ip6-config.c:156
+#: ../libnm-core/nm-setting-ip6-config.c:166
+#: ../libnm-core/nm-setting-ip6-config.c:176
 #: ../libnm-util/nm-setting-ip4-config.c:891
 #: ../libnm-util/nm-setting-ip4-config.c:901
 #: ../libnm-util/nm-setting-ip4-config.c:913
@@ -8074,19 +8381,6 @@ msgstr "「%s」不是個有效的 UUID"
 msgid "property cannot be set when dhcp-hostname is also set"
 msgstr ""
 
-#: ../libnm-core/nm-setting-ip6-config.c:237
-#, fuzzy
-msgid "value is not a valid token"
-msgstr "「%s」不是個有效的 UUID"
-
-#: ../libnm-core/nm-setting-ip6-config.c:248
-msgid "only makes sense with EUI64 address generation mode"
-msgstr ""
-
-#: ../libnm-core/nm-setting-ip6-config.c:260
-msgid "token is not in canonical form"
-msgstr ""
-
 #: ../libnm-core/nm-setting-ip-tunnel.c:318
 #, fuzzy, c-format
 msgid "'%d' is not a valid tunnel mode"
@@ -8332,184 +8626,164 @@ msgstr ""
 msgid "secret is not set"
 msgstr ""
 
-#: ../libnm-core/nm-utils.c:2445
+#: ../libnm-core/nm-utils.c:2447
 #, fuzzy, c-format
 msgid "failed stat file %s: %s"
 msgstr "無法設置訊號遮罩：%d"
 
-#: ../libnm-core/nm-utils.c:2454
+#: ../libnm-core/nm-utils.c:2456
 #, fuzzy, c-format
 msgid "not a file (%s)"
 msgstr "無法載入檔案「%s」\n"
 
-#: ../libnm-core/nm-utils.c:2465
+#: ../libnm-core/nm-utils.c:2467
 #, fuzzy, c-format
 msgid "invalid file owner %d for %s"
 msgstr "無效的欄位「%s」; 允許的欄位：%s"
 
-#: ../libnm-core/nm-utils.c:2476
+#: ../libnm-core/nm-utils.c:2478
 #, c-format
 msgid "file permissions for %s"
 msgstr ""
 
-#: ../libnm-core/nm-utils.c:2486
+#: ../libnm-core/nm-utils.c:2488
 #, c-format
 msgid "reject %s"
 msgstr ""
 
-#: ../libnm-core/nm-utils.c:2506
+#: ../libnm-core/nm-utils.c:2508
 #, c-format
 msgid "path is not absolute (%s)"
 msgstr ""
 
-#: ../libnm-core/nm-utils.c:2520
+#: ../libnm-core/nm-utils.c:2522
 #, c-format
 msgid "Plugin file does not exist (%s)"
 msgstr ""
 
-#: ../libnm-core/nm-utils.c:2528
+#: ../libnm-core/nm-utils.c:2530
 #, fuzzy, c-format
 msgid "Plugin is not a valid file (%s)"
 msgstr "'%s' 不是合於 '%s' 規定的值"
 
-#: ../libnm-core/nm-utils.c:2538
+#: ../libnm-core/nm-utils.c:2540
 #, c-format
 msgid "libtool archives are not supported (%s)"
 msgstr ""
 
-#: ../libnm-core/nm-utils.c:2620 ../libnm-util/nm-utils.c:1803
+#: ../libnm-core/nm-utils.c:2622 ../libnm-util/nm-utils.c:1815
 #, c-format
 msgid "Could not find \"%s\" binary"
 msgstr ""
 
-#: ../libnm-core/nm-vpn-editor-plugin.c:296
+#: ../libnm-core/nm-vpn-editor-plugin.c:124
 #, c-format
-msgid "cannot load plugin \"%s\": %s"
+msgid "cannot load plugin %s"
 msgstr ""
 
-#: ../libnm-core/nm-vpn-editor-plugin.c:307
+#: ../libnm-core/nm-vpn-editor-plugin.c:150
 #, c-format
-msgid "failed to load nm_vpn_editor_plugin_factory() from %s (%s)"
+msgid "cannot load VPN plugin in '%s': missing plugin name"
 msgstr ""
 
-#: ../libnm-core/nm-vpn-editor-plugin.c:332
+#: ../libnm-core/nm-vpn-editor-plugin.c:157
 #, c-format
-msgid "unknown error initializing plugin %s"
+msgid "cannot load VPN plugin in '%s': invalid service name"
 msgstr ""
 
-#: ../libnm-core/nm-vpn-editor-plugin.c:349
+#: ../libnm-core/nm-vpn-editor-plugin.c:173
 #, c-format
-msgid "cannot load VPN plugin in '%s': missing plugin name"
+msgid "unknown error initializing plugin %s"
 msgstr ""
 
-#: ../libnm-core/nm-vpn-editor-plugin.c:358
+#: ../libnm-core/nm-vpn-editor-plugin.c:185
 #, c-format
-msgid "cannot load VPN plugin in '%s': invalid service name"
+msgid "failed to load nm_vpn_editor_plugin_factory() from %s (%s)"
 msgstr ""
 
-#: ../libnm-core/nm-vpn-editor-plugin.c:501
+#: ../libnm-core/nm-vpn-editor-plugin.c:292
 #, c-format
 msgid "the plugin does not support import capability"
 msgstr ""
 
-#: ../libnm-core/nm-vpn-editor-plugin.c:521
+#: ../libnm-core/nm-vpn-editor-plugin.c:312
 #, c-format
 msgid "the plugin does not support export capability"
 msgstr ""
 
-#: ../libnm-core/nm-vpn-plugin-info.c:110
+#: ../libnm-core/nm-vpn-plugin-info.c:109
 #, fuzzy, c-format
 msgid "missing filename"
 msgstr "遺失選項"
 
-#: ../libnm-core/nm-vpn-plugin-info.c:118
+#: ../libnm-core/nm-vpn-plugin-info.c:117
 #, c-format
 msgid "filename must be an absolute path (%s)"
 msgstr ""
 
-#: ../libnm-core/nm-vpn-plugin-info.c:127
+#: ../libnm-core/nm-vpn-plugin-info.c:126
 #, c-format
 msgid "filename has invalid format (%s)"
 msgstr ""
 
-#: ../libnm-core/nm-vpn-plugin-info.c:450
+#: ../libnm-core/nm-vpn-plugin-info.c:383
 #, c-format
 msgid "there exists a conflicting plugin (%s) that has the same %s.%s value"
 msgstr ""
 
-#: ../libnm-core/nm-vpn-plugin-info.c:488
+#: ../libnm-core/nm-vpn-plugin-info.c:421
 #, c-format
 msgid "there exists a conflicting plugin with the same name (%s)"
 msgstr ""
 
-#: ../libnm-core/nm-vpn-plugin-info.c:1071
+#: ../libnm-core/nm-vpn-plugin-info.c:740
 #, fuzzy, c-format
 msgid "missing \"plugin\" setting"
 msgstr "遺失選項"
 
-#: ../libnm-core/nm-vpn-plugin-info.c:1081
+#: ../libnm-core/nm-vpn-plugin-info.c:750
 #, c-format
 msgid "%s: don't retry loading plugin which already failed previously"
 msgstr ""
 
-#: ../libnm-core/nm-vpn-plugin-info.c:1175
+#: ../libnm-core/nm-vpn-plugin-info.c:842
 msgid "missing filename to load VPN plugin info"
 msgstr ""
 
-#: ../libnm-core/nm-vpn-plugin-info.c:1187
+#: ../libnm-core/nm-vpn-plugin-info.c:854
 msgid "missing name for VPN plugin info"
 msgstr ""
 
-#: ../libnm-core/nm-vpn-plugin-info.c:1196
+#: ../libnm-core/nm-vpn-plugin-info.c:863
 msgid "missing service for VPN plugin info"
 msgstr ""
 
-#: ../libnm-glib/nm-device.c:1863 ../libnm/nm-device.c:1814
+#: ../libnm-glib/nm-device.c:1853 ../libnm/nm-device.c:1804
 msgid "Bluetooth"
 msgstr "藍牙"
 
-#: ../libnm-glib/nm-device.c:1865 ../libnm/nm-device.c:1816
-msgid "OLPC Mesh"
-msgstr "OLPC Mesh"
-
-#: ../libnm-glib/nm-device.c:1867 ../libnm/nm-device.c:1818
-msgid "WiMAX"
-msgstr "WiMAX"
-
-#: ../libnm-glib/nm-device.c:1881 ../libnm/nm-device.c:1832
-msgid "ADSL"
-msgstr "ADSL"
-
-#: ../libnm-glib/nm-device.c:1883 ../libnm/nm-device.c:1834
+#: ../libnm-glib/nm-device.c:1873 ../libnm/nm-device.c:1824
 #, fuzzy
 msgid "MACVLAN"
 msgstr "VLAN"
 
-#: ../libnm-glib/nm-device.c:1885 ../libnm/nm-device.c:1836
-msgid "VXLAN"
-msgstr ""
-
-#: ../libnm-glib/nm-device.c:1887 ../libnm/nm-device.c:1838
+#: ../libnm-glib/nm-device.c:1877 ../libnm/nm-device.c:1828
 msgid "IPTunnel"
 msgstr ""
 
-#: ../libnm-glib/nm-device.c:1889 ../libnm/nm-device.c:1840
-msgid "Tun"
-msgstr ""
-
-#: ../libnm-glib/nm-device.c:1891 ../libnm/nm-device.c:1842
+#: ../libnm-glib/nm-device.c:1881 ../libnm/nm-device.c:1832
 msgid "Veth"
 msgstr ""
 
-#: ../libnm-glib/nm-device.c:1923 ../libnm/nm-device.c:1874
+#: ../libnm-glib/nm-device.c:1913 ../libnm/nm-device.c:1864
 msgid "Wired"
 msgstr "有線網路"
 
-#: ../libnm-glib/nm-device.c:1954 ../libnm/nm-device.c:1905
+#: ../libnm-glib/nm-device.c:1944 ../libnm/nm-device.c:1895
 msgid "PCI"
 msgstr "PCI"
 
-#: ../libnm-glib/nm-device.c:1956 ../libnm/nm-device.c:1907
+#: ../libnm-glib/nm-device.c:1946 ../libnm/nm-device.c:1897
 msgid "USB"
 msgstr "USB"
 
@@ -8518,9 +8792,9 @@ msgstr "USB"
 #. * "Ethernet"). You can change this to something like
 #. * "%2$s (%1$s)" if there's no grammatical way to combine
 #. * the strings otherwise.
-#.
-#: ../libnm-glib/nm-device.c:2052 ../libnm-glib/nm-device.c:2071
-#: ../libnm/nm-device.c:2001 ../libnm/nm-device.c:2020
+#. 
+#: ../libnm-glib/nm-device.c:2042 ../libnm-glib/nm-device.c:2061
+#: ../libnm/nm-device.c:1991 ../libnm/nm-device.c:2010
 #, c-format
 msgctxt "long device name"
 msgid "%s %s"
@@ -8722,7 +8996,7 @@ msgstr ""
 msgid "The connection was not an OLPC Mesh connection."
 msgstr "「OLPC Mesh」連線類型有兩個選用性引數。\n"
 
-#: ../libnm/nm-device-team.c:139
+#: ../libnm/nm-device-team.c:118
 #, fuzzy
 msgid "The connection was not a team connection."
 msgstr "連線已移除"
@@ -8758,7 +9032,8 @@ msgid "The device is lacking WPA capabilities required by the connection."
 msgstr ""
 
 #: ../libnm/nm-device-wifi.c:638
-msgid "The device is lacking WPA2/RSN capabilities required by the connection."
+msgid ""
+"The device is lacking WPA2/RSN capabilities required by the connection."
 msgstr ""
 
 #: ../libnm/nm-device-wimax.c:317
@@ -8766,22 +9041,22 @@ msgstr ""
 msgid "The connection was not a WiMAX connection."
 msgstr "「WiMax」連線類型有一項選用性引數。\n"
 
-#: ../libnm/nm-device.c:2739
+#: ../libnm/nm-device.c:2729
 #, fuzzy, c-format
 msgid "The connection was not valid: %s"
 msgstr "錯誤：連線無效：%s\n"
 
-#: ../libnm/nm-device.c:2748
+#: ../libnm/nm-device.c:2738
 #, c-format
 msgid "The interface names of the device and the connection didn't match."
 msgstr ""
 
-#: ../libnm/nm-manager.c:867
+#: ../libnm/nm-manager.c:874
 #, fuzzy
 msgid "Active connection could not be attached to the device"
 msgstr "沒有使用中的連線或裝置"
 
-#: ../libnm/nm-manager.c:1091
+#: ../libnm/nm-manager.c:1098
 #, fuzzy
 msgid "Active connection removed before it was initialized"
 msgstr "有效連線的詳細資訊"
@@ -8808,136 +9083,127 @@ msgid "System policy prevents enabling or disabling system networking"
 msgstr "系統政策防止啟用或停用系統網路作業"
 
 #: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:3
-#, fuzzy
-msgid "Reload NetworkManager configuration"
-msgstr "印出 NetworkManager 的版本並退出"
-
-#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:4
-#, fuzzy
-msgid "System policy prevents reloading NetworkManager"
-msgstr "系統政策防止啟用或停用系統網路作業"
-
-#: ../policy/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 "將 NetworkManager 導入睡眠模式或將它啟用（只應被系統電源管理所使用）"
 
-#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:6
+#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:4
 msgid "System policy prevents putting NetworkManager to sleep or waking it up"
 msgstr "系統政策防止將 NetworkManager 導入睡眠模式或將其啟用"
 
-#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:7
+#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:5
 msgid "Enable or disable WiFi devices"
 msgstr "啟用或停用 WiFi 裝置"
 
-#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:8
+#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:6
 msgid "System policy prevents enabling or disabling WiFi devices"
 msgstr "系統政策防止啟用或停用 WiFi 裝置"
 
-#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:9
+#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:7
 msgid "Enable or disable mobile broadband devices"
 msgstr "啟用或停用行動寬頻裝置"
 
-#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:10
+#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:8
 msgid "System policy prevents enabling or disabling mobile broadband devices"
 msgstr "系統政策防止啟用或停用行動寬頻裝置"
 
-#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:11
+#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:9
 msgid "Enable or disable WiMAX mobile broadband devices"
 msgstr "啟用或停用 WiMAX 行動寬頻裝置"
 
-#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:12
+#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:10
 msgid ""
 "System policy prevents enabling or disabling WiMAX mobile broadband devices"
 msgstr "系統政策防止啟用或停用 WiMAX 行動寬頻裝置"
 
-#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:13
+#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:11
 msgid "Allow control of network connections"
 msgstr "允許控制網路連線"
 
-#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:14
+#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:12
 msgid "System policy prevents control of network connections"
 msgstr "系統政策防止網路連線的控制"
 
-#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:15
+#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:13
 msgid "Connection sharing via a protected WiFi network"
 msgstr "透過受保護的 WiFi 網路共享連線"
 
-#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:16
-msgid "System policy prevents sharing connections via a protected WiFi network"
+#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:14
+msgid ""
+"System policy prevents sharing connections via a protected WiFi network"
 msgstr "系統政策讓您無法透過受保護的 WiFi 網路共享連結"
 
-#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:17
+#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:15
 msgid "Connection sharing via an open WiFi network"
 msgstr "透過開放的 WiFi 網路共享連線"
 
-#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:18
+#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:16
 msgid "System policy prevents sharing connections via an open WiFi network"
 msgstr "系統政策讓您無法透過開放的 WiFi 網路共享連線"
 
-#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:19
+#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:17
 msgid "Modify personal network connections"
 msgstr "修改個人網路連線"
 
-#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:20
+#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:18
 msgid "System policy prevents modification of personal network settings"
 msgstr "系統政策防止修改個人網路設定"
 
-#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:21
+#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:19
 msgid "Modify network connections for all users"
 msgstr "修改所有使用者的網路連線"
 
-#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:22
+#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:20
 msgid "System policy prevents modification of network settings for all users"
 msgstr "系統政策防止修改所有使用者的網路設定"
 
-#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:23
+#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:21
 msgid "Modify persistent system hostname"
 msgstr "修改永久系統的主機名稱"
 
-#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:24
+#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:22
 msgid "System policy prevents modification of the persistent system hostname"
 msgstr "系統政策讓您無法修改永久的系統主機名稱"
 
-#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:25
+#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:23
 msgid "Modify persistent global DNS configuration"
 msgstr ""
 
-#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:26
+#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:24
 #, fuzzy
 msgid ""
 "System policy prevents modification of the persistent global DNS "
 "configuration"
 msgstr "系統政策讓您無法修改永久的系統主機名稱"
 
-#: ../shared/nm-utils/nm-shared-utils.c:185
+#: ../shared/nm-shared-utils.c:208
 #, c-format
 msgid "object class '%s' has no property named '%s'"
 msgstr ""
 
-#: ../shared/nm-utils/nm-shared-utils.c:192
+#: ../shared/nm-shared-utils.c:215
 #, c-format
 msgid "property '%s' of object class '%s' is not writable"
 msgstr ""
 
-#: ../shared/nm-utils/nm-shared-utils.c:199
+#: ../shared/nm-shared-utils.c:222
 #, c-format
 msgid ""
 "construct property \"%s\" for object '%s' can't be set after construction"
 msgstr ""
 
-#: ../shared/nm-utils/nm-shared-utils.c:207
+#: ../shared/nm-shared-utils.c:230
 #, c-format
 msgid "'%s::%s' is not a valid property name; '%s' is not a GObject subtype"
 msgstr ""
 
-#: ../shared/nm-utils/nm-shared-utils.c:216
+#: ../shared/nm-shared-utils.c:239
 #, c-format
 msgid "unable to set property '%s' of type '%s' from value of type '%s'"
 msgstr ""
 
-#: ../shared/nm-utils/nm-shared-utils.c:227
+#: ../shared/nm-shared-utils.c:250
 #, c-format
 msgid ""
 "value \"%s\" of type '%s' is invalid or out of range for property '%s' of "
@@ -8948,130 +9214,136 @@ 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:112
+#: ../src/NetworkManagerUtils.c:111
 #, fuzzy, c-format
 msgctxt "connection id fallback"
 msgid "%s %d"
 msgstr "%s %s"
 
-#: ../src/main.c:165 ../src/main.c:300
+#: ../src/main.c:220 ../src/main.c:358
 #, fuzzy, c-format
 msgid "Failed to read configuration: %s\n"
 msgstr "無法讀取配置：（%d）%s\n"
 
 #. Logging/debugging
-#: ../src/main.c:179 ../src/nm-iface-helper.c:298
+#: ../src/main.c:234 ../src/nm-iface-helper.c:298
 msgid "Print NetworkManager version and exit"
 msgstr "印出 NetworkManager 的版本並退出"
 
-#: ../src/main.c:180 ../src/nm-iface-helper.c:299
+#: ../src/main.c:235 ../src/nm-iface-helper.c:299
 msgid "Don't become a daemon"
 msgstr "不要成為 daemon"
 
-#: ../src/main.c:181 ../src/nm-iface-helper.c:301
+#: ../src/main.c:236 ../src/nm-iface-helper.c:301
 #, c-format
 msgid "Log level: one of [%s]"
 msgstr "日誌等級：[%s] 之一"
 
-#: ../src/main.c:183 ../src/nm-iface-helper.c:303
+#: ../src/main.c:238 ../src/nm-iface-helper.c:303
 #, c-format
 msgid "Log domains separated by ',': any combination of [%s]"
 msgstr "以「,」區隔開來的日誌區域：任何 [%s] 的組合"
 
-#: ../src/main.c:185 ../src/nm-iface-helper.c:305
+#: ../src/main.c:240 ../src/nm-iface-helper.c:305
 msgid "Make all warnings fatal"
 msgstr "使所有警告表示嚴重錯誤"
 
-#: ../src/main.c:186
+#: ../src/main.c:241
 msgid "Specify the location of a PID file"
 msgstr "指定 PID 檔案的位置"
 
-#: ../src/main.c:188
+#: ../src/main.c:242
+msgid "State file location"
+msgstr "指定檔案位置"
+
+#: ../src/main.c:244
 #, fuzzy
 msgid "Print NetworkManager configuration and exit"
 msgstr "印出 NetworkManager 的版本並退出"
 
-#: ../src/main.c:198
+#: ../src/main.c:254
 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"
+msgstr "NetworkManager 會監控所有網路連線並自動\n"
 "選擇最佳的連線。它也能允許使用者指定\n"
 "電腦中的無線網路卡應與哪個\n"
 "無線存取點相聯。"
 
-#: ../src/main.c:285 ../src/main-utils.c:270 ../src/nm-iface-helper.c:393
+#: ../src/main.c:343 ../src/main-utils.c:269 ../src/nm-iface-helper.c:393
 #, c-format
 msgid "%s.  Please use --help to see a list of valid options.\n"
 msgstr "%s。請使用 --help 來查看有效選項的清單。\n"
 
-#: ../src/main.c:290 ../src/nm-iface-helper.c:398
+#: ../src/main.c:348 ../src/nm-iface-helper.c:398
 #, c-format
 msgid "Ignoring unrecognized log domain(s) '%s' passed on command line.\n"
 msgstr "即將忽略傳送至指令列上的日誌區域「%s」。\n"
 
-#: ../src/main.c:315
+#: ../src/main.c:373
 #, c-format
 msgid "Error in configuration file: %s.\n"
 msgstr "配置檔案錯誤：%s。\n"
 
-#: ../src/main.c:320
+#: ../src/main.c:378
 #, c-format
 msgid "Ignoring unrecognized log domain(s) '%s' from config files.\n"
 msgstr "正在忽略來自於配置檔案中無法辨識的日誌區域「%s」。\n"
 
-#: ../src/main.c:331 ../src/nm-iface-helper.c:408
+#: ../src/main.c:389 ../src/nm-iface-helper.c:408
 #, c-format
 msgid "Could not daemonize: %s [error %u]\n"
 msgstr "無法成為 daemon：%s [error %u]\n"
 
-#: ../src/main-utils.c:98
+#: ../src/main-utils.c:99
 #, c-format
 msgid "Opening %s failed: %s\n"
 msgstr "開啟 %s 失敗：%s\n"
 
-#: ../src/main-utils.c:104
+#: ../src/main-utils.c:105
 #, c-format
 msgid "Writing to %s failed: %s\n"
 msgstr "寫入 %s 失敗：%s\n"
 
-#: ../src/main-utils.c:109
+#: ../src/main-utils.c:110
 #, c-format
 msgid "Closing %s failed: %s\n"
 msgstr "關閉 %s 失敗：%s\n"
 
-#: ../src/main-utils.c:144
+#: ../src/main-utils.c:145
 #, c-format
 msgid "Cannot create '%s': %s"
 msgstr ""
 
-#: ../src/main-utils.c:196
+#: ../src/main-utils.c:197
 #, fuzzy, c-format
 msgid "%s is already running (pid %ld)\n"
 msgstr "NetworkManager 已在執行（pid %ld）\n"
 
-#: ../src/main-utils.c:206
+#: ../src/main-utils.c:207
 #, fuzzy, c-format
 msgid "You must be root to run %s!\n"
 msgstr "您必須成為 root 才能執行 NetworkManager！\n"
 
-#: ../src/dhcp-manager/nm-dhcp-dhclient-utils.c:214
+#: ../src/dhcp-manager/nm-dhcp-dhclient-utils.c:213
 msgid "# Created by NetworkManager\n"
 msgstr "# Created by NetworkManager\n"
 
-#: ../src/dhcp-manager/nm-dhcp-dhclient-utils.c:222
+#: ../src/dhcp-manager/nm-dhcp-dhclient-utils.c:220
 #, c-format
-msgid ""
-"# Merged from %s\n"
+msgid "# Merged from %s\n"
 "\n"
-msgstr ""
-"# Merged from %s\n"
+msgstr "# Merged from %s\n"
 "\n"
 
-#: ../src/devices/bluetooth/nm-bluez-device.c:200
+#: ../src/devices/adsl/nm-device-adsl.c:133
+#, fuzzy
+msgid "ADSL connection"
+msgstr "ADSL 連線 %d"
+
+#: ../src/devices/bluetooth/nm-bluez-device.c:197
 #, c-format
 msgid "%s Network"
 msgstr "%s 網路"
@@ -9098,13 +9370,13 @@ msgid "DUN connection must include a GSM or CDMA setting"
 msgstr ""
 
 #: ../src/devices/bluetooth/nm-device-bt.c:303
-#: ../src/devices/wwan/nm-modem-broadband.c:687
+#: ../src/devices/wwan/nm-modem-broadband.c:655
 #, fuzzy
 msgid "GSM connection"
 msgstr "GSM 連線 %d"
 
 #: ../src/devices/bluetooth/nm-device-bt.c:307
-#: ../src/devices/wwan/nm-modem-broadband.c:711
+#: ../src/devices/wwan/nm-modem-broadband.c:679
 #, fuzzy
 msgid "CDMA connection"
 msgstr "CDMA 連線 %d"
@@ -9114,9 +9386,9 @@ msgid "Unknown/unhandled Bluetooth connection type"
 msgstr ""
 
 #: ../src/devices/bluetooth/nm-device-bt.c:336
-#: ../src/devices/nm-device-ethernet.c:1421
+#: ../src/devices/nm-device-ethernet.c:1415
 #: ../src/devices/nm-device-infiniband.c:193
-#: ../src/devices/wifi/nm-device-wifi.c:875
+#: ../src/devices/wifi/nm-device-wifi.c:872
 #, fuzzy
 msgid "connection does not match device"
 msgstr "沒有使用中的連線或裝置"
@@ -9131,27 +9403,32 @@ msgstr "Bond 連線 %d"
 msgid "Bridge connection"
 msgstr "橋接連線 %d"
 
-#: ../src/devices/nm-device-ethernet.c:1402
+#: ../src/devices/nm-device-ethernet.c:1396
 #, fuzzy
 msgid "PPPoE connection"
 msgstr "PPPoE 連線 %d"
 
-#: ../src/devices/nm-device-ethernet.c:1402
+#: ../src/devices/nm-device-ethernet.c:1396
 #, fuzzy
 msgid "Wired connection"
 msgstr "有線連線 %d"
 
-#: ../src/devices/nm-device-ethernet-utils.c:36
+#: ../src/devices/nm-device-ethernet-utils.c:39
 #, c-format
 msgid "Wired connection %d"
 msgstr "有線連線 %d"
 
-#: ../src/devices/nm-device-ip-tunnel.c:347
+#: ../src/devices/nm-device-infiniband.c:175
+#, fuzzy
+msgid "InfiniBand connection"
+msgstr "InfiniBand 連線 %d"
+
+#: ../src/devices/nm-device-ip-tunnel.c:346
 #, fuzzy
 msgid "IP tunnel connection"
 msgstr "編輯連線"
 
-#: ../src/devices/nm-device-macvlan.c:436
+#: ../src/devices/nm-device-macvlan.c:435
 #, fuzzy
 msgid "MACVLAN connection"
 msgstr "VLAN 連線 %d"
@@ -9161,7 +9438,17 @@ msgstr "VLAN 連線 %d"
 msgid "TUN connection"
 msgstr "DUN 連線 %d"
 
-#: ../src/devices/team/nm-device-team.c:121
+#: ../src/devices/nm-device-vlan.c:457
+#, fuzzy
+msgid "VLAN connection"
+msgstr "VLAN 連線 %d"
+
+#: ../src/devices/nm-device-vxlan.c:373
+#, fuzzy
+msgid "VXLAN connection"
+msgstr "VLAN 連線 %d"
+
+#: ../src/devices/team/nm-device-team.c:115
 #, fuzzy
 msgid "Team connection"
 msgstr "Team 連線 %d"
@@ -9171,7 +9458,7 @@ msgstr "Team 連線 %d"
 msgid "Mesh"
 msgstr "Mesh 連線 %d"
 
-#: ../src/devices/wifi/nm-device-wifi.c:842
+#: ../src/devices/wifi/nm-device-wifi.c:839
 msgid "WPA Ad-Hoc disabled due to kernel bugs"
 msgstr ""
 
@@ -9330,60 +9617,56 @@ msgstr ""
 msgid "Failed to determine AP security information"
 msgstr "設定解密用的對稱式金鑰失敗。"
 
-#: ../src/devices/wwan/nm-modem-broadband.c:673
+#: ../src/devices/wwan/nm-modem-broadband.c:641
 #, fuzzy
 msgid "GSM mobile broadband connection requires a 'gsm' setting"
 msgstr "行動寬頻連線 %d"
 
-#: ../src/nm-config.c:500
+#: ../src/nm-config.c:465
 msgid "Config file location"
 msgstr "配置檔案位置"
 
-#: ../src/nm-config.c:501
+#: ../src/nm-config.c:466
 msgid "Config directory location"
 msgstr "配置目錄位置"
 
-#: ../src/nm-config.c:502
+#: ../src/nm-config.c:467
 #, fuzzy
 msgid "System config directory location"
 msgstr "配置目錄位置"
 
-#: ../src/nm-config.c:503
+#: ../src/nm-config.c:468
 #, fuzzy
 msgid "Internal config file location"
 msgstr "配置檔案位置"
 
-#: ../src/nm-config.c:504
-msgid "State file location"
-msgstr "指定檔案位置"
-
-#: ../src/nm-config.c:505
+#: ../src/nm-config.c:469
 msgid "State file for no-auto-default devices"
 msgstr ""
 
-#: ../src/nm-config.c:506
+#: ../src/nm-config.c:470
 msgid "List of plugins separated by ','"
 msgstr "外掛程式清單，以「,」區隔開。"
 
-#: ../src/nm-config.c:507
+#: ../src/nm-config.c:471
 #, fuzzy
 msgid "Quit after initial configuration"
 msgstr "目前的 nmcli 配置：\n"
 
-#: ../src/nm-config.c:508 ../src/nm-iface-helper.c:300
+#: ../src/nm-config.c:472 ../src/nm-iface-helper.c:300
 msgid "Don't become a daemon, and log to stderr"
 msgstr "不要成為 daemon，並記錄至 stderr"
 
 #. These three are hidden for now, and should eventually just go away.
-#: ../src/nm-config.c:511
+#: ../src/nm-config.c:475
 msgid "An http(s) address for checking internet connectivity"
 msgstr "檢查網際網路連線的 http 位址"
 
-#: ../src/nm-config.c:512
+#: ../src/nm-config.c:476
 msgid "The interval between connectivity checks (in seconds)"
 msgstr "連線檢查之間的間隔（秒）"
 
-#: ../src/nm-config.c:513
+#: ../src/nm-config.c:477
 msgid "The expected start of the response"
 msgstr "預期的反應起始"
 
@@ -9395,7 +9678,7 @@ msgstr "父介面卡 [none]："
 
 #: ../src/nm-iface-helper.c:281
 msgid "eth0"
-msgstr ""
+msgstr "eth0"
 
 #: ../src/nm-iface-helper.c:282
 #, fuzzy
@@ -9455,7 +9738,7 @@ msgstr "沒有可移除的優先順序"
 
 #: ../src/nm-iface-helper.c:291
 msgid "0"
-msgstr ""
+msgstr "0"
 
 #: ../src/nm-iface-helper.c:292
 #, fuzzy
@@ -9501,16 +9784,25 @@ msgstr ""
 msgid "(%s): Invalid IID %s\n"
 msgstr ""
 
-#: ../src/nm-logging.c:223
+#: ../src/nm-logging.c:216
 #, c-format
 msgid "Unknown log level '%s'"
 msgstr "不明日誌層級「%s」"
 
-#: ../src/nm-logging.c:318
+#: ../src/nm-logging.c:309
 #, c-format
 msgid "Unknown log domain '%s'"
 msgstr "不明日誌網域「%s」"
 
-#: ../src/settings/plugins/ifcfg-rh/reader.c:106
+#: ../src/nm-manager.c:3635
+#, fuzzy
+msgid "VPN connection"
+msgstr "VPN 連線"
+
+#: ../src/nm-sleep-monitor-systemd.c:131
+msgid "NetworkManager needs to turn off networks"
+msgstr "NetworkManager 需要關閉網路"
+
+#: ../src/settings/plugins/ifcfg-rh/reader.c:108
 msgid "System"
 msgstr "系統"