Imported Upstream version 0.8.998 upstream/0.8.998

author: Michael Biebl <biebl@debian.org> 2011-04-08 07:30:59 +0200
committer: Michael Biebl <biebl@debian.org> 2011-04-08 07:30:59 +0200
commit: f75dd6fd1975146623052b843b182dc32c3fbe46 (patch)
tree: 05ba60b772670f038c9a1fbff940ec5d3e28d870 /po
parent: c980bdf58dc973dd5617aaa6f9466f9e44fcbf58 (diff)
34 files changed, 4951 insertions, 3114 deletions
diff --git a/po/POTFILES.in b/po/POTFILES.in
index d4988c43..f021275e 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -11,16 +11,21 @@ libnm-util/crypto.c
 libnm-util/crypto_gnutls.c
 libnm-util/crypto_nss.c
 libnm-util/nm-utils.c
-policy/org.freedesktop.network-manager-settings.system.policy.in
 policy/org.freedesktop.NetworkManager.policy.in
-src/nm-netlink-monitor.c
 src/main.c
 src/dhcp-manager/nm-dhcp-dhclient.c
 src/dhcp-manager/nm-dhcp-dhclient-utils.c
 src/dhcp-manager/nm-dhcp-manager.c
-src/logging/nm-logging.c
 src/dns-manager/nm-dns-manager.c
-src/system-settings/nm-default-wired-connection.c
-system-settings/plugins/ifcfg-rh/reader.c
-system-settings/plugins/ifnet/connection_parser.c
+src/logging/nm-logging.c
+src/modem-manager/nm-modem-cdma.c
+src/modem-manager/nm-modem-gsm.c
+src/nm-device-bt.c
+src/nm-device-ethernet.c
+src/nm-device-olpc-mesh.c
+src/nm-manager.c
+src/nm-netlink-monitor.c
+src/settings/plugins/ifcfg-rh/reader.c
+src/settings/plugins/ifnet/connection_parser.c
+src/settings/nm-settings-utils.c
 
diff --git a/po/as.po b/po/as.po
index 46e41809..78a2cd3a 100644
--- a/po/as.po
+++ b/po/as.po
@@ -1598,7 +1598,7 @@ msgstr "মন কৰিব: libc resolver ৰ দ্বাৰা ৩ তকৈ
 msgid "The nameservers listed below may not be recognized."
 msgstr "নিম্নলিখিত নাম-সেৱকসমূহ চিনাক্ত ন'হ'বও পাৰে  ।"
 
-#: ../src/system-settings/nm-default-wired-connection.c:157
+#: ../src/settings/nm-default-wired-connection.c:157
 #, c-format
 msgid "Auto %s"
 msgstr "স্বয়ংক্ৰিয় %s"
diff --git a/po/bg.po b/po/bg.po
index b9169060..cda45f19 100644
--- a/po/bg.po
+++ b/po/bg.po
@@ -1932,7 +1932,7 @@ msgstr "ЗАБЕЛЕЖКА: libc може да не поддържа повеч�
 msgid "The nameservers listed below may not be recognized."
 msgstr "Следните сървъри за имена може да не бъдат разпознати."
 
-#: ../src/system-settings/nm-default-wired-connection.c:157
+#: ../src/settings/nm-default-wired-connection.c:157
 #, c-format
 msgid "Auto %s"
 msgstr "Автоматично %s"
diff --git a/po/bn_IN.po b/po/bn_IN.po
index cf275dad..372d7bb2 100644
--- a/po/bn_IN.po
+++ b/po/bn_IN.po
@@ -1597,7 +1597,7 @@ msgstr ""
 msgid "The nameservers listed below may not be recognized."
 msgstr "নিম্নলিখিত নেম-সার্ভারগুলি সনাক্ত না হওয়ার সম্ভাবনা রয়েছে।"
 
-#: ../src/system-settings/nm-default-wired-connection.c:157
+#: ../src/settings/nm-default-wired-connection.c:157
 #, c-format
 msgid "Auto %s"
 msgstr "স্বয়ংক্রিয় %s"
diff --git a/po/cs.po b/po/cs.po
index ccea6bdb..6c0d8630 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -1748,7 +1748,7 @@ msgstr ""
 msgid "The nameservers listed below may not be recognized."
 msgstr "Jmenné servery uvedené v následujícím seznamu nelze rozpoznat."
 
-#: ../src/system-settings/nm-default-wired-connection.c:157
+#: ../src/settings/nm-default-wired-connection.c:157
 #, c-format
 msgid "Auto %s"
 msgstr "Automaticky %s"
diff --git a/po/de.po b/po/de.po
index 07a6a3b2..eb02b0f8 100644
--- a/po/de.po
+++ b/po/de.po
@@ -7,100 +7,105 @@
 # Thomas Gier <info@thomasgier.de>, 2007.
 # Andre Klapper <ak-47@gmx.net>, 2007.
 # Hauke Mehrtens <hauke@hauke-m.de>, 2008.
-# Christian Kirbach <Christian.Kirbach@googlemail.com>, 2009, 2010.
 # Daniel Schury <Daniel.Schury@physik.uni-giessen.de>, 2010.
+# Christian Kirbach <Christian.Kirbach@googlemail.com>, 2009, 2010, 2011.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: NetworkManager HEAD\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
-"product=NetworkManager&component=general\n"
-"POT-Creation-Date: 2010-09-18 15:24+0000\n"
-"PO-Revision-Date: 2010-09-18 23:56+0200\n"
-"Last-Translator: Daniel Schury <Daniel.Schury@physik.uni-giessen.de>\n"
-"Language-Team: Deutsch <translators-de@lists.ubuntu-eu.org>\n"
+"product=NetworkManager&keywords=I18N+L10N&component=general\n"
+"POT-Creation-Date: 2011-03-31 15:25+0000\n"
+"PO-Revision-Date: 2011-03-31 21:08+0200\n"
+"Last-Translator: Christian Kirbach <Christian.Kirbach@googlemail.com>\n"
+"Language-Team: Deutsch <gnome-de@gnome.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8-bit\n"
-"Plural-Forms:  nplurals=2; plural=(n != 1)\n"
-
-#: ../cli/src/connections.c:60 ../cli/src/connections.c:75
-#: ../cli/src/devices.c:88 ../cli/src/devices.c:101 ../cli/src/devices.c:111
-#: ../cli/src/devices.c:121 ../cli/src/devices.c:134 ../cli/src/devices.c:145
-#: ../cli/src/devices.c:156 ../cli/src/devices.c:165 ../cli/src/devices.c:174
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: ../cli/src/connections.c:64 ../cli/src/connections.c:78
+#: ../cli/src/devices.c:101 ../cli/src/devices.c:114 ../cli/src/devices.c:124
+#: ../cli/src/devices.c:134 ../cli/src/devices.c:148 ../cli/src/devices.c:162
+#: ../cli/src/devices.c:173 ../cli/src/devices.c:184 ../cli/src/devices.c:193
+#: ../cli/src/devices.c:202 ../cli/src/devices.c:224
 msgid "NAME"
 msgstr "NAME"
 
 #. 0
-#: ../cli/src/connections.c:61 ../cli/src/connections.c:76
+#: ../cli/src/connections.c:65 ../cli/src/connections.c:79
 msgid "UUID"
 msgstr "UUID"
 
 #. 1
-#: ../cli/src/connections.c:62
+#: ../cli/src/connections.c:66
 msgid "DEVICES"
 msgstr "GERÄTE"
 
 #. 2
-#: ../cli/src/connections.c:63 ../cli/src/connections.c:78
-msgid "SCOPE"
-msgstr "BANDBREITE"
-
-#. 3
-#: ../cli/src/connections.c:64
+#: ../cli/src/connections.c:67
 msgid "DEFAULT"
 msgstr "VORGABE"
 
-#. 4
-#: ../cli/src/connections.c:65
-msgid "DBUS-SERVICE"
-msgstr "DBUS-SERVICE"
-
-#. 5
-#: ../cli/src/connections.c:66
+#. 3
+#: ../cli/src/connections.c:68
 msgid "SPEC-OBJECT"
 msgstr "SPEC-OBJECT"
 
-#. 6
-#: ../cli/src/connections.c:67
+#. 4
+#: ../cli/src/connections.c:69
 msgid "VPN"
 msgstr "VPN"
 
+#. 5
+#. 6
+#. 2
+#. 11
+#. 5
+#: ../cli/src/connections.c:70 ../cli/src/connections.c:85
+#: ../cli/src/devices.c:69 ../cli/src/devices.c:214 ../cli/src/devices.c:230
+msgid "DBUS-PATH"
+msgstr "DBUS-PFAD"
+
 #. 1
 #. 0
 #. 1
-#: ../cli/src/connections.c:77 ../cli/src/devices.c:62 ../cli/src/devices.c:90
+#. 2
+#: ../cli/src/connections.c:80 ../cli/src/devices.c:67
+#: ../cli/src/devices.c:103 ../cli/src/devices.c:227
 msgid "TYPE"
 msgstr "TYP"
 
-#. 3
-#: ../cli/src/connections.c:79
+#. 2
+#: ../cli/src/connections.c:81
 msgid "TIMESTAMP"
 msgstr "ZEITSTEMPEL"
 
-#. 4
-#: ../cli/src/connections.c:80
+#. 3
+#: ../cli/src/connections.c:82
 msgid "TIMESTAMP-REAL"
 msgstr "ZEITSTEMPEL-ECHT"
 
-#. 5
-#: ../cli/src/connections.c:81
+#. 4
+#: ../cli/src/connections.c:83
 msgid "AUTOCONNECT"
 msgstr "AUTO-VERBINDEN"
 
-#. 6
-#: ../cli/src/connections.c:82
+#. 5
+#: ../cli/src/connections.c:84
 msgid "READONLY"
 msgstr "NUR-LESEN"
 
-#: ../cli/src/connections.c:158
+#: ../cli/src/connections.c:167
 #, c-format
 msgid ""
 "Usage: nmcli con { COMMAND | help }\n"
 "  COMMAND := { list | status | up | down }\n"
 "\n"
-"  list [id <id> | uuid <id> | system | user]\n"
+"  list [id <id> | uuid <id>]\n"
 "  status\n"
+"  up id <id> | uuid <id> [iface <iface>] [ap <hwaddr>] [nsp <name>] [--"
+"nowait] [--timeout <timeout>]\n"
 "  up id <id> | uuid <id> [iface <iface>] [ap <hwaddr>] [--nowait] [--timeout "
 "<timeout>]\n"
 "  down id <id> | uuid <id>\n"
@@ -108,793 +113,914 @@ msgstr ""
 "Aufruf: nmcli con { BEFEHL | help }\n"
 "  BEFEHL := { list | status | up | down }\n"
 "\n"
-"  list [id <id> | uuid <id> | system | user]\n"
+"  list [id <Kennung> | uuid <Kennung>]\n"
 "  status\n"
-"  up id <id> | uuid <id> [iface <iface>] [ap <hwaddr>] [--nowait] [--timeout "
-"<timeout>]\n"
-"  down id <id> | uuid <id>\n"
+"  up id <Kennung> | uuid <Kennung> [iface <Schnittstelle>] [ap <hwaddr>] "
+"[nsp <Name>] [--nowait] [--timeout <timeout>]\n"
+"  up id <Kennung> | uuid <Kennung> [iface <Schnittstelle>] [ap <hwaddr>] [--"
+"nowait] [--timeout <timeout>]\n"
+"  down id <Kennung> | uuid <Kennung>\n"
 
-#: ../cli/src/connections.c:198 ../cli/src/connections.c:537
+#: ../cli/src/connections.c:220 ../cli/src/connections.c:542
 #, c-format
 msgid "Error: 'con list': %s"
 msgstr "Fehler: »Verb. Liste«: %s"
 
-#: ../cli/src/connections.c:200 ../cli/src/connections.c:539
+#: ../cli/src/connections.c:222 ../cli/src/connections.c:544
 #, c-format
 msgid "Error: 'con list': %s; allowed fields: %s"
 msgstr "Fehler: »Verb. Liste«: %s; erlaubte Felder: %s"
 
-#: ../cli/src/connections.c:208
+#: ../cli/src/connections.c:230
 msgid "Connection details"
 msgstr "Verbindungsinformationen"
 
-#: ../cli/src/connections.c:382 ../cli/src/connections.c:602
-msgid "system"
-msgstr "System"
-
-#: ../cli/src/connections.c:382 ../cli/src/connections.c:602
-msgid "user"
-msgstr "Benutzer"
-
-#: ../cli/src/connections.c:384
+#: ../cli/src/connections.c:417
 msgid "never"
 msgstr "nie"
 
 #. "CAPABILITIES"
 #. Print header
 #. "WIFI-PROPERTIES"
-#: ../cli/src/connections.c:385 ../cli/src/connections.c:386
-#: ../cli/src/connections.c:603 ../cli/src/connections.c:606
-#: ../cli/src/devices.c:432 ../cli/src/devices.c:557 ../cli/src/devices.c:583
-#: ../cli/src/devices.c:584 ../cli/src/devices.c:585 ../cli/src/devices.c:586
-#: ../cli/src/devices.c:587 ../cli/src/settings.c:508
-#: ../cli/src/settings.c:551 ../cli/src/settings.c:652
-#: ../cli/src/settings.c:926 ../cli/src/settings.c:927
-#: ../cli/src/settings.c:929 ../cli/src/settings.c:931
-#: ../cli/src/settings.c:1056 ../cli/src/settings.c:1057
-#: ../cli/src/settings.c:1058 ../cli/src/settings.c:1137
-#: ../cli/src/settings.c:1138 ../cli/src/settings.c:1139
-#: ../cli/src/settings.c:1140 ../cli/src/settings.c:1141
-#: ../cli/src/settings.c:1142 ../cli/src/settings.c:1143
-#: ../cli/src/settings.c:1144 ../cli/src/settings.c:1145
-#: ../cli/src/settings.c:1146 ../cli/src/settings.c:1147
-#: ../cli/src/settings.c:1148 ../cli/src/settings.c:1149
-#: ../cli/src/settings.c:1224
+#: ../cli/src/connections.c:418 ../cli/src/connections.c:419
+#: ../cli/src/connections.c:597 ../cli/src/connections.c:599
+#: ../cli/src/devices.c:509 ../cli/src/devices.c:562 ../cli/src/devices.c:687
+#: ../cli/src/devices.c:713 ../cli/src/devices.c:714 ../cli/src/devices.c:715
+#: ../cli/src/devices.c:716 ../cli/src/devices.c:717 ../cli/src/settings.c:520
+#: ../cli/src/settings.c:563 ../cli/src/settings.c:663
+#: ../cli/src/settings.c:937 ../cli/src/settings.c:938
+#: ../cli/src/settings.c:940 ../cli/src/settings.c:942
+#: ../cli/src/settings.c:1067 ../cli/src/settings.c:1068
+#: ../cli/src/settings.c:1069 ../cli/src/settings.c:1148
+#: ../cli/src/settings.c:1149 ../cli/src/settings.c:1150
+#: ../cli/src/settings.c:1151 ../cli/src/settings.c:1152
+#: ../cli/src/settings.c:1153 ../cli/src/settings.c:1154
+#: ../cli/src/settings.c:1155 ../cli/src/settings.c:1156
+#: ../cli/src/settings.c:1157 ../cli/src/settings.c:1158
+#: ../cli/src/settings.c:1159 ../cli/src/settings.c:1160
+#: ../cli/src/settings.c:1235
 msgid "yes"
 msgstr "ja"
 
-#: ../cli/src/connections.c:385 ../cli/src/connections.c:386
-#: ../cli/src/connections.c:603 ../cli/src/connections.c:606
-#: ../cli/src/devices.c:432 ../cli/src/devices.c:557 ../cli/src/devices.c:583
-#: ../cli/src/devices.c:584 ../cli/src/devices.c:585 ../cli/src/devices.c:586
-#: ../cli/src/devices.c:587 ../cli/src/settings.c:508
-#: ../cli/src/settings.c:510 ../cli/src/settings.c:551
-#: ../cli/src/settings.c:652 ../cli/src/settings.c:926
-#: ../cli/src/settings.c:927 ../cli/src/settings.c:929
-#: ../cli/src/settings.c:931 ../cli/src/settings.c:1056
-#: ../cli/src/settings.c:1057 ../cli/src/settings.c:1058
-#: ../cli/src/settings.c:1137 ../cli/src/settings.c:1138
-#: ../cli/src/settings.c:1139 ../cli/src/settings.c:1140
-#: ../cli/src/settings.c:1141 ../cli/src/settings.c:1142
-#: ../cli/src/settings.c:1143 ../cli/src/settings.c:1144
-#: ../cli/src/settings.c:1145 ../cli/src/settings.c:1146
-#: ../cli/src/settings.c:1147 ../cli/src/settings.c:1148
-#: ../cli/src/settings.c:1149 ../cli/src/settings.c:1224
+#: ../cli/src/connections.c:418 ../cli/src/connections.c:419
+#: ../cli/src/connections.c:597 ../cli/src/connections.c:599
+#: ../cli/src/devices.c:509 ../cli/src/devices.c:562 ../cli/src/devices.c:687
+#: ../cli/src/devices.c:713 ../cli/src/devices.c:714 ../cli/src/devices.c:715
+#: ../cli/src/devices.c:716 ../cli/src/devices.c:717 ../cli/src/settings.c:520
+#: ../cli/src/settings.c:522 ../cli/src/settings.c:563
+#: ../cli/src/settings.c:663 ../cli/src/settings.c:937
+#: ../cli/src/settings.c:938 ../cli/src/settings.c:940
+#: ../cli/src/settings.c:942 ../cli/src/settings.c:1067
+#: ../cli/src/settings.c:1068 ../cli/src/settings.c:1069
+#: ../cli/src/settings.c:1148 ../cli/src/settings.c:1149
+#: ../cli/src/settings.c:1150 ../cli/src/settings.c:1151
+#: ../cli/src/settings.c:1152 ../cli/src/settings.c:1153
+#: ../cli/src/settings.c:1154 ../cli/src/settings.c:1155
+#: ../cli/src/settings.c:1156 ../cli/src/settings.c:1157
+#: ../cli/src/settings.c:1158 ../cli/src/settings.c:1159
+#: ../cli/src/settings.c:1160 ../cli/src/settings.c:1235
 msgid "no"
 msgstr "nein"
 
-#: ../cli/src/connections.c:458 ../cli/src/connections.c:501
-msgid "System connections"
-msgstr "Systemverbindungen"
+#: ../cli/src/connections.c:493
+msgid "Connection list"
+msgstr "Verbindungsliste"
 
-#: ../cli/src/connections.c:463 ../cli/src/connections.c:514
-msgid "User connections"
-msgstr "Benutzerverbindungen"
-
-#: ../cli/src/connections.c:475 ../cli/src/connections.c:1335
-#: ../cli/src/connections.c:1351 ../cli/src/connections.c:1360
-#: ../cli/src/connections.c:1371 ../cli/src/connections.c:1456
-#: ../cli/src/devices.c:962 ../cli/src/devices.c:972 ../cli/src/devices.c:1074
-#: ../cli/src/devices.c:1081
+#: ../cli/src/connections.c:506 ../cli/src/connections.c:1378
+#: ../cli/src/connections.c:1393 ../cli/src/connections.c:1402
+#: ../cli/src/connections.c:1412 ../cli/src/connections.c:1424
+#: ../cli/src/connections.c:1519 ../cli/src/devices.c:1190
+#: ../cli/src/devices.c:1200 ../cli/src/devices.c:1314
+#: ../cli/src/devices.c:1321 ../cli/src/devices.c:1534
+#: ../cli/src/devices.c:1541
 #, c-format
 msgid "Error: %s argument is missing."
 msgstr "Fehler: Argument %s fehlt."
 
-#: ../cli/src/connections.c:488
+#: ../cli/src/connections.c:519
 #, c-format
 msgid "Error: %s - no such connection."
 msgstr "Fehler: Verbindung %s existiert nicht."
 
-#: ../cli/src/connections.c:520 ../cli/src/connections.c:1384
-#: ../cli/src/connections.c:1474 ../cli/src/devices.c:785
-#: ../cli/src/devices.c:852 ../cli/src/devices.c:986 ../cli/src/devices.c:1087
+#: ../cli/src/connections.c:525 ../cli/src/connections.c:1437
+#: ../cli/src/connections.c:1536 ../cli/src/devices.c:987
+#: ../cli/src/devices.c:1067 ../cli/src/devices.c:1214
+#: ../cli/src/devices.c:1327 ../cli/src/devices.c:1547
 #, c-format
 msgid "Unknown parameter: %s\n"
 msgstr "Unbekannter Parameter: %s\n"
 
-#: ../cli/src/connections.c:529
+#: ../cli/src/connections.c:534
 #, c-format
 msgid "Error: no valid parameter specified."
 msgstr "Fehler: Es wurde kein gültiger Parameter angegeben."
 
-#: ../cli/src/connections.c:544 ../cli/src/connections.c:1577
-#: ../cli/src/devices.c:1293 ../cli/src/network-manager.c:359
+#: ../cli/src/connections.c:549 ../cli/src/connections.c:1627
+#: ../cli/src/devices.c:1755 ../cli/src/network-manager.c:463
 #, c-format
 msgid "Error: %s."
 msgstr "Fehler: %s."
 
-#: ../cli/src/connections.c:650
+#: ../cli/src/connections.c:637
 #, c-format
 msgid "Error: 'con status': %s"
 msgstr "Fehler: »Verb. Status«: %s"
 
-#: ../cli/src/connections.c:652
+#: ../cli/src/connections.c:639
 #, c-format
 msgid "Error: 'con status': %s; allowed fields: %s"
 msgstr "Fehler: »Verb. Status«: %s; erlaubte Felder: %s"
 
+#: ../cli/src/connections.c:647 ../cli/src/connections.c:1452
+#: ../cli/src/connections.c:1551 ../cli/src/devices.c:1014
+#: ../cli/src/devices.c:1076 ../cli/src/devices.c:1229
+#: ../cli/src/devices.c:1357 ../cli/src/devices.c:1576
+#, c-format
+msgid "Error: Can't find out if NetworkManager is running: %s."
+msgstr ""
+"Fehler: Es kann nicht erkannt werden, ob NetworkManager ausgeführt wird: %s."
+
+#: ../cli/src/connections.c:651 ../cli/src/connections.c:1456
+#: ../cli/src/connections.c:1555 ../cli/src/devices.c:1018
+#: ../cli/src/devices.c:1080 ../cli/src/devices.c:1233
+#: ../cli/src/devices.c:1361 ../cli/src/devices.c:1580
+#, c-format
+msgid "Error: NetworkManager is not running."
+msgstr "Fehler: NetworkManager wird nicht ausgeführt"
+
 #: ../cli/src/connections.c:659
 msgid "Active connections"
 msgstr "Aktive Verbindungen"
 
-#: ../cli/src/connections.c:1027
+#: ../cli/src/connections.c:1095
 #, c-format
 msgid "no active connection on device '%s'"
 msgstr "Keine aktive Verbindung auf Gerät »%s«"
 
-#: ../cli/src/connections.c:1035
+#: ../cli/src/connections.c:1103
 #, c-format
 msgid "no active connection or device"
 msgstr "Keine aktive Verbindung oder Gerät"
 
-#: ../cli/src/connections.c:1085
+#: ../cli/src/connections.c:1174
 #, c-format
 msgid "device '%s' not compatible with connection '%s'"
 msgstr "Gerät »%s« ist nicht mit der Verbindung »%s« kompatibel"
 
-#: ../cli/src/connections.c:1087
+#: ../cli/src/connections.c:1176
 #, c-format
 msgid "no device found for connection '%s'"
 msgstr "Für die Verbindung »%s« wurde kein Gerät gefunden"
 
-#: ../cli/src/connections.c:1098
+#: ../cli/src/connections.c:1187
 msgid "activating"
 msgstr "wird aktiviert"
 
-#: ../cli/src/connections.c:1100
+#: ../cli/src/connections.c:1189
 msgid "activated"
 msgstr "aktiviert"
 
-#: ../cli/src/connections.c:1103 ../cli/src/connections.c:1126
-#: ../cli/src/connections.c:1159 ../cli/src/devices.c:246
-#: ../cli/src/devices.c:558 ../cli/src/network-manager.c:94
-#: ../cli/src/network-manager.c:149 ../cli/src/settings.c:473
+#: ../cli/src/connections.c:1191 ../cli/src/devices.c:304
+msgid "deactivating"
+msgstr "wird deaktiviert"
+
+#: ../cli/src/connections.c:1194 ../cli/src/connections.c:1217
+#: ../cli/src/connections.c:1250 ../cli/src/devices.c:308
+#: ../cli/src/devices.c:688 ../cli/src/network-manager.c:118
+#: ../cli/src/network-manager.c:180 ../cli/src/network-manager.c:183
+#: ../cli/src/network-manager.c:298 ../cli/src/network-manager.c:353
+#: ../cli/src/network-manager.c:391 ../cli/src/network-manager.c:430
+#: ../cli/src/settings.c:485 ../cli/src/utils.c:396
 msgid "unknown"
 msgstr "unbekannt"
 
-#: ../cli/src/connections.c:1112
+#: ../cli/src/connections.c:1203
 msgid "VPN connecting (prepare)"
 msgstr "VPN wird verbunden (wird vorbereitet)"
 
-#: ../cli/src/connections.c:1114
+#: ../cli/src/connections.c:1205
 msgid "VPN connecting (need authentication)"
 msgstr "VPN wird verbunden (Legitimierung wird benötigt)"
 
-#: ../cli/src/connections.c:1116
+#: ../cli/src/connections.c:1207
 msgid "VPN connecting"
 msgstr "VPN wird verbunden"
 
-#: ../cli/src/connections.c:1118
+#: ../cli/src/connections.c:1209
 msgid "VPN connecting (getting IP configuration)"
 msgstr "VPN wird verbunden (IP-Einstellungen werden ermittelt)"
 
-#: ../cli/src/connections.c:1120
+#: ../cli/src/connections.c:1211
 msgid "VPN connected"
 msgstr "VPN verbunden"
 
-#: ../cli/src/connections.c:1122
+#: ../cli/src/connections.c:1213
 msgid "VPN connection failed"
 msgstr "VPN-Verbindung gescheitert"
 
-#: ../cli/src/connections.c:1124
+#: ../cli/src/connections.c:1215
 msgid "VPN disconnected"
 msgstr "VPN getrennt"
 
-#: ../cli/src/connections.c:1135
+#: ../cli/src/connections.c:1226
 msgid "unknown reason"
 msgstr "unbekannter Grund"
 
-#: ../cli/src/connections.c:1137
+#: ../cli/src/connections.c:1228
 msgid "none"
 msgstr "kein"
 
-#: ../cli/src/connections.c:1139
+#: ../cli/src/connections.c:1230
 msgid "the user was disconnected"
 msgstr "Der Benutzer wurde getrennt"
 
-#: ../cli/src/connections.c:1141
+#: ../cli/src/connections.c:1232
 msgid "the base network connection was interrupted"
 msgstr "Die Basisverbindung wurde unterbrochen"
 
-#: ../cli/src/connections.c:1143
+#: ../cli/src/connections.c:1234
 msgid "the VPN service stopped unexpectedly"
 msgstr "Der VPN-Dienst wurde unerwartet gestoppt"
 
-#: ../cli/src/connections.c:1145
+#: ../cli/src/connections.c:1236
 msgid "the VPN service returned invalid configuration"
 msgstr "Der VPN-Dienst gab ungültige Einstellungen zurück"
 
-#: ../cli/src/connections.c:1147
+#: ../cli/src/connections.c:1238
 msgid "the connection attempt timed out"
 msgstr "Der Verbindungsversuch benötigte zu viel Zeit"
 
-#: ../cli/src/connections.c:1149
+#: ../cli/src/connections.c:1240
 msgid "the VPN service did not start in time"
 msgstr "Der VPN-Dienst wurde nicht rechtzeitig gestartet"
 
-#: ../cli/src/connections.c:1151
+#: ../cli/src/connections.c:1242
 msgid "the VPN service failed to start"
 msgstr "Der VPN-Dienst konnte nicht gestartet werden"
 
-#: ../cli/src/connections.c:1153
+#: ../cli/src/connections.c:1244
 msgid "no valid VPN secrets"
 msgstr "Keine gültigen VPN-Schlüssel"
 
-#: ../cli/src/connections.c:1155
+#: ../cli/src/connections.c:1246
 msgid "invalid VPN secrets"
 msgstr "Ungültige VPN-Schlüssel"
 
-#: ../cli/src/connections.c:1157
+#: ../cli/src/connections.c:1248
 msgid "the connection was removed"
 msgstr "Die Verbindung wurde entfernt"
 
-#: ../cli/src/connections.c:1171
+#: ../cli/src/connections.c:1262
 #, c-format
 msgid "state: %s\n"
 msgstr "Status: %s\n"
 
-#: ../cli/src/connections.c:1174 ../cli/src/connections.c:1200
+#: ../cli/src/connections.c:1265 ../cli/src/connections.c:1291
 #, c-format
 msgid "Connection activated\n"
 msgstr "Verbindung aktiviert\n"
 
-#: ../cli/src/connections.c:1177
+#: ../cli/src/connections.c:1268
 #, c-format
 msgid "Error: Connection activation failed."
 msgstr "Fehler: Aktivierung der Verbindung ist gescheitert."
 
-#: ../cli/src/connections.c:1196
+#: ../cli/src/connections.c:1287
 #, c-format
 msgid "state: %s (%d)\n"
 msgstr "Status: %s (%d)\n"
 
-#: ../cli/src/connections.c:1206
+#: ../cli/src/connections.c:1297
 #, c-format
 msgid "Error: Connection activation failed: %s."
 msgstr "Fehler: Aktivierung der Verbindung ist gescheitert: %s."
 
-#: ../cli/src/connections.c:1223 ../cli/src/devices.c:909
+#: ../cli/src/connections.c:1314 ../cli/src/devices.c:1136
 #, c-format
 msgid "Error: Timeout %d sec expired."
 msgstr "Fehler: Zeitbeschränkung von %d Sekunden ist abgelaufen."
 
-#: ../cli/src/connections.c:1266
+#: ../cli/src/connections.c:1327
 #, c-format
 msgid "Error: Connection activation failed: %s"
 msgstr "Fehler: Aktivierung der Verbindung ist gescheitert: %s"
 
-#: ../cli/src/connections.c:1280
-#, c-format
-msgid "Error: Obtaining active connection for '%s' failed."
-msgstr "Fehler: Ermittlung der aktiven Verbindung für »%s« ist gescheitert."
-
-#: ../cli/src/connections.c:1289
+#: ../cli/src/connections.c:1333
 #, c-format
 msgid "Active connection state: %s\n"
 msgstr "Status der aktiven Verbindung: %s\n"
 
-#: ../cli/src/connections.c:1290
+#: ../cli/src/connections.c:1334
 #, c-format
 msgid "Active connection path: %s\n"
 msgstr "Pfad der aktiven Verbindung: %s\n"
 
-#: ../cli/src/connections.c:1344 ../cli/src/connections.c:1465
+#: ../cli/src/connections.c:1386 ../cli/src/connections.c:1527
 #, c-format
 msgid "Error: Unknown connection: %s."
 msgstr "Fehler: Unbekannte Verbindung: %s."
 
-#: ../cli/src/connections.c:1379 ../cli/src/devices.c:980
+#: ../cli/src/connections.c:1432 ../cli/src/devices.c:1208
 #, c-format
 msgid "Error: timeout value '%s' is not valid."
 msgstr "Fehler: Der Wert »%s« ist keine gültige Zeitangabe."
 
-#: ../cli/src/connections.c:1392 ../cli/src/connections.c:1482
+#: ../cli/src/connections.c:1445 ../cli/src/connections.c:1544
 #, c-format
 msgid "Error: id or uuid has to be specified."
 msgstr "Fehler: id oder uuid müssen angegeben werden."
 
-#: ../cli/src/connections.c:1412
+#: ../cli/src/connections.c:1473
 #, c-format
 msgid "Error: No suitable device found: %s."
 msgstr "Fehler: Es wurde kein passendes Gerät gefunden: %s."
 
-#: ../cli/src/connections.c:1414
+#: ../cli/src/connections.c:1475
 #, c-format
 msgid "Error: No suitable device found."
 msgstr "Fehler: Es wurde kein passendes Gerät gefunden."
 
-#: ../cli/src/connections.c:1509
+#: ../cli/src/connections.c:1580
 #, c-format
 msgid "Warning: Connection not active\n"
 msgstr "Warnung: Verbindung ist nicht aktiv\n"
 
-#: ../cli/src/connections.c:1566
+#: ../cli/src/connections.c:1618
 #, c-format
 msgid "Error: 'con' command '%s' is not valid."
 msgstr "Fehler: Der »con«-Befehl »%s« ist ungültig."
 
-#: ../cli/src/connections.c:1602
+#: ../cli/src/connections.c:1683
 #, c-format
 msgid "Error: could not connect to D-Bus."
 msgstr "Fehler: Verbindung zu D-Bus konnte nicht hergestellt werden."
 
-#: ../cli/src/connections.c:1609
+#: ../cli/src/connections.c:1690
 #, c-format
 msgid "Error: Could not get system settings."
 msgstr "Fehler: Systemeinstellungen konnten nicht ermittelt werden."
 
-#: ../cli/src/connections.c:1617
-#, c-format
-msgid "Error: Could not get user settings."
-msgstr "Fehler: Benutzereinstellungen konnten nicht ermittelt werden."
-
-#: ../cli/src/connections.c:1627
+#: ../cli/src/connections.c:1700
 #, c-format
-msgid "Error: Can't obtain connections: settings services are not running."
+msgid "Error: Can't obtain connections: settings service is not running."
 msgstr ""
-"Fehler: Verbindungen konnten nicht ermittelt werden: Die Einstellungsdienste "
-"werden nicht ausgeführt."
+"Fehler: Verbindungen können nicht ermittelt werden: Der Einstellungsdienst "
+"wird nicht ausgeführt."
 
 #. 0
 #. 9
-#: ../cli/src/devices.c:61 ../cli/src/devices.c:89 ../cli/src/devices.c:184
+#. 3
+#: ../cli/src/devices.c:66 ../cli/src/devices.c:102 ../cli/src/devices.c:212
+#: ../cli/src/devices.c:228
 msgid "DEVICE"
 msgstr "GERÄT"
 
 #. 1
 #. 4
-#. 0
-#: ../cli/src/devices.c:63 ../cli/src/devices.c:93
-#: ../cli/src/network-manager.c:36
+#. 1
+#: ../cli/src/devices.c:68 ../cli/src/devices.c:106
+#: ../cli/src/network-manager.c:39
 msgid "STATE"
 msgstr "STATUS"
 
-#: ../cli/src/devices.c:72
+#: ../cli/src/devices.c:78
 msgid "GENERAL"
 msgstr "ALLGEMEIN"
 
 #. 0
-#: ../cli/src/devices.c:73
+#: ../cli/src/devices.c:79
 msgid "CAPABILITIES"
 msgstr "RESSOURCEN"
 
 #. 1
-#: ../cli/src/devices.c:74
+#: ../cli/src/devices.c:80
 msgid "WIFI-PROPERTIES"
 msgstr "WLAN-EIGENSCHAFTEN"
 
 #. 2
-#: ../cli/src/devices.c:75
+#: ../cli/src/devices.c:81
 msgid "AP"
 msgstr "AP"
 
 #. 3
-#: ../cli/src/devices.c:76
+#: ../cli/src/devices.c:82
 msgid "WIRED-PROPERTIES"
 msgstr "KABEL-EIGENSCHAFTEN"
 
 #. 4
-#: ../cli/src/devices.c:77
+#: ../cli/src/devices.c:83
+msgid "WIMAX-PROPERTIES"
+msgstr "WIMAX-EIGENSCHAFTEN"
+
+#. 5
+#. 0
+#: ../cli/src/devices.c:84 ../cli/src/devices.c:225
+msgid "NSP"
+msgstr "NSP"
+
+#. 6
+#: ../cli/src/devices.c:85
 msgid "IP4-SETTINGS"
 msgstr "IP4-EINSTELLUNGEN"
 
-#. 5
-#: ../cli/src/devices.c:78
+#. 7
+#: ../cli/src/devices.c:86
 msgid "IP4-DNS"
 msgstr "IP4-DNS"
 
-#. 6
-#: ../cli/src/devices.c:79
+#. 8
+#: ../cli/src/devices.c:87
 msgid "IP6-SETTINGS"
 msgstr "IP6-EINSTELLUNGEN"
 
-#. 7
-#: ../cli/src/devices.c:80
+#. 9
+#: ../cli/src/devices.c:88
 msgid "IP6-DNS"
 msgstr "IP6-DNS"
 
 #. 2
-#: ../cli/src/devices.c:91
+#: ../cli/src/devices.c:104
 msgid "DRIVER"
 msgstr "TREIBER"
 
 #. 3
-#: ../cli/src/devices.c:92
+#: ../cli/src/devices.c:105
 msgid "HWADDR"
 msgstr "HWADDR"
 
 #. 0
-#: ../cli/src/devices.c:102
+#: ../cli/src/devices.c:115
 msgid "CARRIER-DETECT"
 msgstr "TRÄGERFREQUENZERKENNUNG"
 
 #. 1
-#: ../cli/src/devices.c:103
+#: ../cli/src/devices.c:116
 msgid "SPEED"
 msgstr "GESCHWINDIGKEIT"
 
 #. 0
-#: ../cli/src/devices.c:112
+#: ../cli/src/devices.c:125
 msgid "CARRIER"
 msgstr "TRÄGERFREQUENZ"
 
 #. 0
-#: ../cli/src/devices.c:122
+#: ../cli/src/devices.c:135
 msgid "WEP"
 msgstr "WEP"
 
 #. 1
-#: ../cli/src/devices.c:123
+#: ../cli/src/devices.c:136
 msgid "WPA"
 msgstr "WPA"
 
 #. 2
-#: ../cli/src/devices.c:124
+#: ../cli/src/devices.c:137
 msgid "WPA2"
 msgstr "WPA2"
 
 #. 3
-#: ../cli/src/devices.c:125
+#: ../cli/src/devices.c:138
 msgid "TKIP"
 msgstr "TKIP"
 
 #. 4
-#: ../cli/src/devices.c:126
+#: ../cli/src/devices.c:139
 msgid "CCMP"
 msgstr "CCMP"
 
 #. 0
-#: ../cli/src/devices.c:135 ../cli/src/devices.c:146
+#: ../cli/src/devices.c:149
+msgid "CTR-FREQ"
+msgstr "CTR-FREQUENZ"
+
+#. 1
+#: ../cli/src/devices.c:150
+msgid "RSSI"
+msgstr "RSSI"
+
+#. 2
+#: ../cli/src/devices.c:151
+msgid "CINR"
+msgstr "CINR"
+
+#. 3
+#: ../cli/src/devices.c:152
+msgid "TX-POW"
+msgstr "TX-POW"
+
+#. 4
+#: ../cli/src/devices.c:153
+msgid "BSID"
+msgstr "BSID"
+
+#. 0
+#: ../cli/src/devices.c:163 ../cli/src/devices.c:174
 msgid "ADDRESS"
 msgstr "ADRESSE"
 
 #. 1
-#: ../cli/src/devices.c:136 ../cli/src/devices.c:147
+#: ../cli/src/devices.c:164 ../cli/src/devices.c:175
 msgid "PREFIX"
 msgstr "PRÄFIX"
 
 #. 2
-#: ../cli/src/devices.c:137 ../cli/src/devices.c:148
+#: ../cli/src/devices.c:165 ../cli/src/devices.c:176
 msgid "GATEWAY"
 msgstr "GATEWAY"
 
 #. 0
-#: ../cli/src/devices.c:157 ../cli/src/devices.c:166
+#: ../cli/src/devices.c:185 ../cli/src/devices.c:194
 msgid "DNS"
 msgstr "DNS"
 
 #. 0
-#: ../cli/src/devices.c:175
+#: ../cli/src/devices.c:203
 msgid "SSID"
 msgstr "SSID"
 
 #. 1
-#: ../cli/src/devices.c:176
+#: ../cli/src/devices.c:204
 msgid "BSSID"
 msgstr "BSSID"
 
 #. 2
-#: ../cli/src/devices.c:177
+#: ../cli/src/devices.c:205
 msgid "MODE"
 msgstr "MODUS"
 
 #. 3
-#: ../cli/src/devices.c:178
+#: ../cli/src/devices.c:206
 msgid "FREQ"
 msgstr "FREQUENZ"
 
 #. 4
-#: ../cli/src/devices.c:179
+#: ../cli/src/devices.c:207
 msgid "RATE"
 msgstr "RATE"
 
 #. 5
-#: ../cli/src/devices.c:180
+#. 1
+#: ../cli/src/devices.c:208 ../cli/src/devices.c:226
 msgid "SIGNAL"
 msgstr "SIGNAL"
 
 #. 6
-#: ../cli/src/devices.c:181
+#: ../cli/src/devices.c:209
 msgid "SECURITY"
 msgstr "SICHERHEIT"
 
 #. 7
-#: ../cli/src/devices.c:182
+#: ../cli/src/devices.c:210
 msgid "WPA-FLAGS"
 msgstr "WPA-SCHALTER"
 
 #. 8
-#: ../cli/src/devices.c:183
+#: ../cli/src/devices.c:211
 msgid "RSN-FLAGS"
 msgstr "RSN-SCHALTER"
 
 #. 10
-#: ../cli/src/devices.c:185
+#. 4
+#: ../cli/src/devices.c:213 ../cli/src/devices.c:229
 msgid "ACTIVE"
 msgstr "AKTIV"
 
-#: ../cli/src/devices.c:208
+#: ../cli/src/devices.c:256
 #, c-format
 msgid ""
 "Usage: nmcli dev { COMMAND | help }\n"
 "\n"
+"  COMMAND := { status | list | disconnect | wifi | wimax }\n"
+"\n"
 "  COMMAND := { status | list | disconnect | wifi }\n"
 "\n"
 "  status\n"
 "  list [iface <iface>]\n"
 "  disconnect iface <iface> [--nowait] [--timeout <timeout>]\n"
 "  wifi [list [iface <iface>] [hwaddr <hwaddr>]]\n"
+"  wimax [list [iface <iface>] [nsp <name>]]\n"
 "\n"
 msgstr ""
 "Aufruf: nmcli dev { BEFEHL | help }\n"
 "\n"
+"  BEFEHL := { status | list | disconnect | wifi | wimax }\n"
+"\n"
 "  BEFEHL := { status | list | disconnect | wifi }\n"
 "\n"
 "  status\n"
-"  list [iface <iface>]\n"
-"  disconnect iface <iface> [--nowait] [--timeout <timeout>]\n"
-"  wifi [list [iface <iface>] [hwaddr <hwaddr>]]\n"
+"  list [iface <Schnittstelle>]\n"
+"  disconnect iface <Schnittstelle> [--nowait] [--timeout <timeout>]\n"
+"  wifi [list [iface <Schnittstelle>] [hwaddr <hwaddr>]]\n"
+"  wimax [list [iface <Schnittstelle>] [nsp <Name>]]\n"
 "\n"
 
-#: ../cli/src/devices.c:228
+#: ../cli/src/devices.c:284
 msgid "unmanaged"
 msgstr "nicht verwaltet"
 
-#: ../cli/src/devices.c:230
+#: ../cli/src/devices.c:286
 msgid "unavailable"
 msgstr "nicht verfügbar"
 
-#: ../cli/src/devices.c:232 ../cli/src/network-manager.c:91
+#: ../cli/src/devices.c:288 ../cli/src/network-manager.c:115
 msgid "disconnected"
 msgstr "nicht verbunden"
 
-#: ../cli/src/devices.c:234
+#: ../cli/src/devices.c:290
 msgid "connecting (prepare)"
 msgstr "wird verbunden (wird vorbereitet)"
 
-#: ../cli/src/devices.c:236
+#: ../cli/src/devices.c:292
 msgid "connecting (configuring)"
 msgstr "wird verbunden (wird eingerichtet)"
 
-#: ../cli/src/devices.c:238
+#: ../cli/src/devices.c:294
 msgid "connecting (need authentication)"
 msgstr "wird verbunden (Legitimierung wird benötigt)"
 
-#: ../cli/src/devices.c:240
+#: ../cli/src/devices.c:296
 msgid "connecting (getting IP configuration)"
 msgstr "wird verbunden (IP-Einstellungen werden ermittelt)"
 
-#: ../cli/src/devices.c:242 ../cli/src/network-manager.c:89
+#: ../cli/src/devices.c:298
+msgid "connecting (checking IP connectivity)"
+msgstr "wird verbunden (IP-Funktionalität wird geprüft)"
+
+#: ../cli/src/devices.c:300
+msgid "connecting (starting secondary connections)"
+msgstr "wird verbunden (Zweitverbindungen werden gestartet)"
+
+#: ../cli/src/devices.c:302 ../cli/src/network-manager.c:111
 msgid "connected"
 msgstr "verbunden"
 
-#: ../cli/src/devices.c:244
+#: ../cli/src/devices.c:306
 msgid "connection failed"
 msgstr "Verbindung gescheitert"
 
-#: ../cli/src/devices.c:267 ../cli/src/devices.c:424
+#: ../cli/src/devices.c:331 ../cli/src/devices.c:341 ../cli/src/devices.c:501
+#: ../cli/src/devices.c:545
 msgid "Unknown"
 msgstr "Unbekannt"
 
-#: ../cli/src/devices.c:299
+#: ../cli/src/devices.c:374
 msgid "(none)"
 msgstr "(keine)"
 
-#: ../cli/src/devices.c:324
+#: ../cli/src/devices.c:399
 #, c-format
 msgid "%s: error converting IP4 address 0x%X"
 msgstr "%s: Fehler bei Umwandlung der IPv4-Addresse 0x%X"
 
-#: ../cli/src/devices.c:393
+#: ../cli/src/devices.c:470
 #, c-format
 msgid "%u MHz"
 msgstr "%u MHz"
 
-#: ../cli/src/devices.c:394
+#: ../cli/src/devices.c:471
 #, c-format
 msgid "%u MB/s"
 msgstr "%u MB/s"
 
-#: ../cli/src/devices.c:403
+#: ../cli/src/devices.c:480
 msgid "Encrypted: "
 msgstr "Verschlüsselt: "
 
-#: ../cli/src/devices.c:408
+#: ../cli/src/devices.c:485
 msgid "WEP "
 msgstr "WEP"
 
-#: ../cli/src/devices.c:410
+#: ../cli/src/devices.c:487
 msgid "WPA "
 msgstr "WPA"
 
-#: ../cli/src/devices.c:412
+#: ../cli/src/devices.c:489
 msgid "WPA2 "
 msgstr "WPA2"
 
 # Das ergibt z.B. WPA-Enterprise, klingt komisch mit »Unternehmen«
-#: ../cli/src/devices.c:415
+#: ../cli/src/devices.c:492
 msgid "Enterprise "
 msgstr "Enterprise"
 
-#: ../cli/src/devices.c:424
+#: ../cli/src/devices.c:501
 msgid "Ad-Hoc"
 msgstr "Ad-Hoc"
 
-#: ../cli/src/devices.c:424
+#: ../cli/src/devices.c:501
 msgid "Infrastructure"
 msgstr "Infrastuktur"
 
-#: ../cli/src/devices.c:486
+#: ../cli/src/devices.c:536
+msgid "Home"
+msgstr "Zu Hause"
+
+#: ../cli/src/devices.c:539
+msgid "Partner"
+msgstr "Partner"
+
+#: ../cli/src/devices.c:542
+msgid "Roaming"
+msgstr "Bereiche wechselnd"
+
+#: ../cli/src/devices.c:612
 #, c-format
 msgid "Error: 'dev list': %s"
 msgstr "Fehler: »Geräteliste«: %s"
 
-#: ../cli/src/devices.c:488
+#: ../cli/src/devices.c:614
 #, c-format
 msgid "Error: 'dev list': %s; allowed fields: %s"
 msgstr "Fehler: »Geräteliste«: %s; erlaubte Felder: %s"
 
-#: ../cli/src/devices.c:497
+#: ../cli/src/devices.c:623
 msgid "Device details"
 msgstr "Geräteinformationen"
 
-#: ../cli/src/devices.c:527 ../cli/src/devices.c:925
+#: ../cli/src/devices.c:657 ../cli/src/devices.c:1152 ../cli/src/utils.c:342
 msgid "(unknown)"
 msgstr "(unbekannt)"
 
-#: ../cli/src/devices.c:528
+#: ../cli/src/devices.c:658
 msgid "unknown)"
 msgstr "unbekannt)"
 
-#: ../cli/src/devices.c:554
+#: ../cli/src/devices.c:684
 #, c-format
 msgid "%u Mb/s"
 msgstr "%u Mb/s"
 
 #. Print header
 #. "WIRED-PROPERTIES"
-#: ../cli/src/devices.c:627
+#: ../cli/src/devices.c:757
 msgid "on"
 msgstr "an"
 
-#: ../cli/src/devices.c:627
+#: ../cli/src/devices.c:757
 msgid "off"
 msgstr "aus"
 
-#: ../cli/src/devices.c:808
+#: ../cli/src/devices.c:1004
 #, c-format
 msgid "Error: 'dev status': %s"
 msgstr "Fehler: »Gerätestatus«: %s"
 
-#: ../cli/src/devices.c:810
+#: ../cli/src/devices.c:1006
 #, c-format
 msgid "Error: 'dev status': %s; allowed fields: %s"
 msgstr "Fehler: »Gerätestatus«: %s; erlaubte Felder: %s"
 
-#: ../cli/src/devices.c:817
+#: ../cli/src/devices.c:1029
 msgid "Status of devices"
 msgstr "Status der Geräte"
 
-#: ../cli/src/devices.c:845
+#: ../cli/src/devices.c:1060
 #, c-format
 msgid "Error: '%s' argument is missing."
 msgstr "Fehler: Argument »%s« fehlt."
 
-#: ../cli/src/devices.c:874 ../cli/src/devices.c:1013
-#: ../cli/src/devices.c:1136
+#: ../cli/src/devices.c:1101 ../cli/src/devices.c:1253
+#: ../cli/src/devices.c:1389 ../cli/src/devices.c:1608
 #, c-format
 msgid "Error: Device '%s' not found."
 msgstr "Fehler: Gerät »%s« wurde nicht gefunden."
 
-#: ../cli/src/devices.c:897
+#: ../cli/src/devices.c:1124
 #, c-format
 msgid "Success: Device '%s' successfully disconnected."
 msgstr "Erfolg: Gerät »%s« wurde erfolgreich getrennt."
 
-#: ../cli/src/devices.c:922
+#: ../cli/src/devices.c:1149
 #, c-format
 msgid "Error: Device '%s' (%s) disconnecting failed: %s"
 msgstr "Fehler: Trennung des Gerätes »%s« (%s) ist gescheitert: %s"
 
-#: ../cli/src/devices.c:930
+#: ../cli/src/devices.c:1157
 #, c-format
 msgid "Device state: %d (%s)\n"
 msgstr "Gerätezustand: %d (%s)\n"
 
-#: ../cli/src/devices.c:994
+#: ../cli/src/devices.c:1222
 #, c-format
 msgid "Error: iface has to be specified."
 msgstr "Fehler: Es muss eine Schnittstelle angegeben werden."
 
-#: ../cli/src/devices.c:1112
+#: ../cli/src/devices.c:1347
 #, c-format
 msgid "Error: 'dev wifi': %s"
 msgstr "Fehler: »Geräte-WLAN«: %s"
 
-#: ../cli/src/devices.c:1114
+#: ../cli/src/devices.c:1349
 #, c-format
 msgid "Error: 'dev wifi': %s; allowed fields: %s"
 msgstr "Fehler: »Geräte-WLAN«: %s; erlaubte Felder: %s"
 
-#: ../cli/src/devices.c:1121
+#: ../cli/src/devices.c:1372
 msgid "WiFi scan list"
 msgstr "Suchliste des WLAN"
 
-#: ../cli/src/devices.c:1156 ../cli/src/devices.c:1210
+#: ../cli/src/devices.c:1409 ../cli/src/devices.c:1463
+#: ../cli/src/devices.c:1670
 #, c-format
 msgid "Error: Access point with hwaddr '%s' not found."
 msgstr ""
 "Fehler: Der Zugangspunkt mit der Hardware-Adresse »%s« wurde nicht gefunden."
 
-#: ../cli/src/devices.c:1173
+#: ../cli/src/devices.c:1426
 #, c-format
 msgid "Error: Device '%s' is not a WiFi device."
 msgstr "Fehler: Gerät »%s« ist kein WLAN-Gerät."
 
-#: ../cli/src/devices.c:1237
+#: ../cli/src/devices.c:1490
 #, c-format
 msgid "Error: 'dev wifi' command '%s' is not valid."
 msgstr "Fehler: Der Befehl »%s« für »dev wifi« ist ungültig."
 
-#: ../cli/src/devices.c:1284
+#: ../cli/src/devices.c:1566
+#, c-format
+msgid "Error: 'dev wimax': %s"
+msgstr "Fehler: »Gerät Wimax«: %s"
+
+#: ../cli/src/devices.c:1568
+#, c-format
+msgid "Error: 'dev wimax': %s; allowed fields: %s"
+msgstr "Fehler: »Gerät Wimax«: %s; erlaubte Felder: %s"
+
+#: ../cli/src/devices.c:1591
+msgid "WiMAX NSP list"
+msgstr "WiMAX NSP-Liste"
+
+#: ../cli/src/devices.c:1628
+#, c-format
+msgid "Error: NSP with name '%s' not found."
+msgstr "Fehler: NSP namens »%s« wurde nicht gefunden."
+
+#: ../cli/src/devices.c:1639
+#, c-format
+msgid "Error: Device '%s' is not a WiMAX device."
+msgstr "Fehler: Gerät »%s« ist kein WiMAX-Gerät."
+
+#: ../cli/src/devices.c:1697
+#, c-format
+msgid "Error: 'dev wimax' command '%s' is not valid."
+msgstr "Fehler: Der Befehl »%s« für »dev wimax« ist ungültig."
+
+#: ../cli/src/devices.c:1747
 #, c-format
 msgid "Error: 'dev' command '%s' is not valid."
 msgstr "Fehler: Der Befehl »%s« für »dev« ist ungültig."
 
-#: ../cli/src/network-manager.c:35
+#: ../cli/src/network-manager.c:37
 msgid "RUNNING"
 msgstr "LAUFEND"
 
-#. 1
-#: ../cli/src/network-manager.c:37
+#. 0
+#: ../cli/src/network-manager.c:38
+msgid "VERSION"
+msgstr "VERSION"
+
+#. 2
+#: ../cli/src/network-manager.c:40
 msgid "NET-ENABLED"
 msgstr "NETZ-AKTIVIERT"
 
-#. 2
-#: ../cli/src/network-manager.c:38
+#. 3
+#: ../cli/src/network-manager.c:41
 msgid "WIFI-HARDWARE"
 msgstr "WLAN-HARDWARE"
 
-#. 3
-#: ../cli/src/network-manager.c:39
+#. 4
+#: ../cli/src/network-manager.c:42
 msgid "WIFI"
 msgstr "WLAN"
 
-#. 4
-#: ../cli/src/network-manager.c:40
+#. 5
+#: ../cli/src/network-manager.c:43
 msgid "WWAN-HARDWARE"
 msgstr "WWAN-HARDWARE"
 
-#. 5
-#: ../cli/src/network-manager.c:41
+#. 6
+#: ../cli/src/network-manager.c:44
 msgid "WWAN"
 msgstr "WWAN"
 
-#: ../cli/src/network-manager.c:64
+#. 7
+#: ../cli/src/network-manager.c:45
+msgid "WIMAX-HARDWARE"
+msgstr "WIMAX-HARDWARE"
+
+#. 8
+#: ../cli/src/network-manager.c:46
+msgid "WIMAX"
+msgstr "WIMAX"
+
+#: ../cli/src/network-manager.c:74
 #, c-format
 msgid ""
 "Usage: nmcli nm { COMMAND | help }\n"
 "\n"
+"  COMMAND := { status | enable | sleep | wifi | wwan | wimax }\n"
+"\n"
 "  COMMAND := { status | enable | sleep | wifi | wwan }\n"
 "\n"
 "  status\n"
@@ -902,10 +1028,13 @@ msgid ""
 "  sleep [true|false]\n"
 "  wifi [on|off]\n"
 "  wwan [on|off]\n"
+"  wimax [on|off]\n"
 "\n"
 msgstr ""
 "Aufruf: nmcli nm { BEFEHL | help }\n"
 "\n"
+"  BEFEHL := { status | enable | sleep | wifi | wwan | wimax }\n"
+"\n"
 "  BEFEHL := { status | enable | sleep | wifi | wwan }\n"
 "\n"
 "  status\n"
@@ -913,123 +1042,150 @@ msgstr ""
 "  sleep [true|false]\n"
 "  wifi [on|off]\n"
 "  wwan [on|off]\n"
+"  wimax [on|off]\n"
 "\n"
 
-#: ../cli/src/network-manager.c:85
+#: ../cli/src/network-manager.c:103
 msgid "asleep"
 msgstr "schlafend"
 
-#: ../cli/src/network-manager.c:87
+#: ../cli/src/network-manager.c:105
 msgid "connecting"
 msgstr "wird verbunden"
 
-#: ../cli/src/network-manager.c:128
+#: ../cli/src/network-manager.c:107
+msgid "connected (local only)"
+msgstr "verbunden (nur lokal)"
+
+#: ../cli/src/network-manager.c:109
+msgid "connected (site only)"
+msgstr "verbunden (nur Gelände)"
+
+#: ../cli/src/network-manager.c:113
+msgid "disconnecting"
+msgstr "wird getrennt"
+
+#: ../cli/src/network-manager.c:153
 #, c-format
 msgid "Error: 'nm status': %s"
 msgstr "Fehler: »NM-Status«: %s"
 
-#: ../cli/src/network-manager.c:130
+#: ../cli/src/network-manager.c:155
 #, c-format
 msgid "Error: 'nm status': %s; allowed fields: %s"
 msgstr "Fehler: »NM-Status«: %s; erlaubte Felder: %s"
 
-#: ../cli/src/network-manager.c:137
-msgid "NetworkManager status"
-msgstr "Status von NetworkManager"
-
-#. Print header
-#: ../cli/src/network-manager.c:144 ../cli/src/network-manager.c:145
-#: ../cli/src/network-manager.c:146 ../cli/src/network-manager.c:147
-#: ../cli/src/network-manager.c:154 ../cli/src/network-manager.c:247
-#: ../cli/src/network-manager.c:296 ../cli/src/network-manager.c:328
+#. create NMClient
+#: ../cli/src/network-manager.c:168 ../cli/src/network-manager.c:169
+#: ../cli/src/network-manager.c:170 ../cli/src/network-manager.c:171
+#: ../cli/src/network-manager.c:172 ../cli/src/network-manager.c:174
+#: ../cli/src/network-manager.c:175 ../cli/src/network-manager.c:296
+#: ../cli/src/network-manager.c:351 ../cli/src/network-manager.c:389
+#: ../cli/src/network-manager.c:428
 msgid "enabled"
 msgstr "aktiviert"
 
-#: ../cli/src/network-manager.c:144 ../cli/src/network-manager.c:145
-#: ../cli/src/network-manager.c:146 ../cli/src/network-manager.c:147
-#: ../cli/src/network-manager.c:154 ../cli/src/network-manager.c:247
-#: ../cli/src/network-manager.c:296 ../cli/src/network-manager.c:328
+#: ../cli/src/network-manager.c:168 ../cli/src/network-manager.c:169
+#: ../cli/src/network-manager.c:170 ../cli/src/network-manager.c:171
+#: ../cli/src/network-manager.c:172 ../cli/src/network-manager.c:174
+#: ../cli/src/network-manager.c:175 ../cli/src/network-manager.c:296
+#: ../cli/src/network-manager.c:351 ../cli/src/network-manager.c:389
+#: ../cli/src/network-manager.c:428
 msgid "disabled"
 msgstr "deaktiviert"
 
-#: ../cli/src/network-manager.c:152
+#: ../cli/src/network-manager.c:188
+msgid "NetworkManager status"
+msgstr "Status von NetworkManager"
+
+#. Print header
+#: ../cli/src/network-manager.c:191
 msgid "running"
 msgstr "wird ausgeführt"
 
-#: ../cli/src/network-manager.c:152
+#: ../cli/src/network-manager.c:191
 msgid "not running"
 msgstr "wird nicht ausgeführt"
 
-#: ../cli/src/network-manager.c:175
+#: ../cli/src/network-manager.c:222 ../cli/src/utils.c:322
 #, c-format
 msgid "Error: Couldn't connect to system bus: %s"
 msgstr "Fehler: Verbindung zum Systembus konnte nicht hergestellt werden: %s"
 
-#: ../cli/src/network-manager.c:186
+#: ../cli/src/network-manager.c:233
 #, c-format
 msgid "Error: Couldn't create D-Bus object proxy."
 msgstr "Fehler: D-Bus-Objektproxy konnte nicht erstellt werden."
 
-#: ../cli/src/network-manager.c:192
+#: ../cli/src/network-manager.c:239
 #, c-format
 msgid "Error in sleep: %s"
 msgstr "Fehler beim schlafen gehen: %s"
 
-#: ../cli/src/network-manager.c:237 ../cli/src/network-manager.c:286
-#: ../cli/src/network-manager.c:318
+#: ../cli/src/network-manager.c:283 ../cli/src/network-manager.c:338
+#: ../cli/src/network-manager.c:376 ../cli/src/network-manager.c:415
 #, c-format
 msgid "Error: '--fields' value '%s' is not valid here; allowed fields: %s"
 msgstr ""
 "Fehler: Der Wert »%s« für »--fields« ist hier nicht gültig; erlaubte Felder: %s"
 
-#: ../cli/src/network-manager.c:245
+#: ../cli/src/network-manager.c:291
 msgid "Networking enabled"
 msgstr "Netzwerk aktiviert"
 
-#: ../cli/src/network-manager.c:256
+#: ../cli/src/network-manager.c:307
 #, c-format
 msgid "Error: invalid 'enable' parameter: '%s'; use 'true' or 'false'."
 msgstr ""
 "Fehler: Ungültiger »aktiviert«-Parameter: »%s«; Verwenden Sie »true« oder "
 "»false«."
 
-#: ../cli/src/network-manager.c:265
+#: ../cli/src/network-manager.c:317
 #, c-format
 msgid "Error: Sleeping status is not exported by NetworkManager."
 msgstr ""
 "Fehler: Der Schlafzustand-Status wurde von NetworkManager nicht exportiert."
 
-#: ../cli/src/network-manager.c:273
+#: ../cli/src/network-manager.c:325
 #, c-format
 msgid "Error: invalid 'sleep' parameter: '%s'; use 'true' or 'false'."
 msgstr ""
 "Fehler: Ungültiger »schlafend«-Parameter: »%s«; Verwenden Sie »true« oder "
 "»false«."
 
-#: ../cli/src/network-manager.c:294
+#: ../cli/src/network-manager.c:346
 msgid "WiFi enabled"
 msgstr "WLAN aktiviert"
 
-#: ../cli/src/network-manager.c:305
+#: ../cli/src/network-manager.c:362
 #, c-format
 msgid "Error: invalid 'wifi' parameter: '%s'."
 msgstr "Fehler: Ungültiger »wifi«-Parameter: »%s«."
 
-#: ../cli/src/network-manager.c:326
+#: ../cli/src/network-manager.c:384
 msgid "WWAN enabled"
 msgstr "WWAN aktiviert"
 
-#: ../cli/src/network-manager.c:337
+#: ../cli/src/network-manager.c:400
 #, c-format
 msgid "Error: invalid 'wwan' parameter: '%s'."
 msgstr "Fehler: Ungültiger »wwan«-Parameter: »%s«."
 
-#: ../cli/src/network-manager.c:348
+#: ../cli/src/network-manager.c:423
+msgid "WiMAX enabled"
+msgstr "WiMAX aktiviert"
+
+#: ../cli/src/network-manager.c:439
+#, c-format
+msgid "Error: invalid 'wimax' parameter: '%s'."
+msgstr "Fehler: Ungültiger »wimax«-Parameter: »%s«."
+
+#: ../cli/src/network-manager.c:452
 #, c-format
 msgid "Error: 'nm' command '%s' is not valid."
 msgstr "Fehler: Der Befehl »%s« für »nm« ist ungültig."
 
-#: ../cli/src/nmcli.c:69
+#: ../cli/src/nmcli.c:64
 #, c-format
 msgid ""
 "Usage: %s [OPTIONS] OBJECT { COMMAND | help }\n"
@@ -1041,6 +1197,8 @@ msgid ""
 "  -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"
 "  -v[ersion]                                 show program version\n"
 "  -h[elp]                                    print this help\n"
 "\n"
@@ -1053,397 +1211,429 @@ msgstr ""
 "Aufruf: %s [OPTIONEN] OBJEKT { BEFEHL | help }\n"
 "\n"
 "OPTIONEN\n"
-"  -t[erse]    kurze Ausgabe\n"
-"  -p[retty]   hübsche Ausgabe\n"
-"  -m[ode] tabular|multiline                  Ausgabemodue\n"
-"  -f[ields] <field1,field2,…>|all|common    gibt Ausgabefelder an\n"
+"  -t[erse]                                   Kurze Ausgabe\n"
+"  -p[retty]                                  Hübsche Ausgabe\n"
+"  -m[ode] tabular|multiline                  Ausgabemodus\n"
+"  -f[ields] <Feld1,Feld2,…>|all|common       Ausgabefelder angeben\n"
 "  -e[scape] yes|no                           Escape-Spaltenseparator in "
 "Werten\n"
-"  -v[ersion]  Programmversion anzeigen\n"
-"  -h[elp]     diese Hilfe ausgeben\n"
+"  -n[ocheck]                                 Nicht die Versionen von nmcli "
+"und NetworkManager prüfen\n"
+"  -v[ersion]                                 Programmversion anzeigen\n"
+"  -h[elp]                                    Diese Hilfe ausgeben\n"
 "\n"
 "OBJEKT\n"
 "  nm          Status von NetworkManager\n"
 "  con         Verbindungen von NetworkManager\n"
-"  dev         von NetworkManager verwaltete Verbindungen\n"
+"  dev         Von NetworkManager verwaltete Verbindungen\n"
 "\n"
 
-#: ../cli/src/nmcli.c:113
+#: ../cli/src/nmcli.c:109
 #, c-format
 msgid "Error: Object '%s' is unknown, try 'nmcli help'."
 msgstr "Fehler: Objekt »%s« ist unbekannt, versuchen Sie »nmcli help«."
 
-#: ../cli/src/nmcli.c:143
+#: ../cli/src/nmcli.c:139
 #, c-format
 msgid "Error: Option '--terse' is specified the second time."
 msgstr "Fehler: Option »---terse« wurde zweimal gesetzt."
 
-#: ../cli/src/nmcli.c:148
+#: ../cli/src/nmcli.c:144
 #, c-format
 msgid "Error: Option '--terse' is mutually exclusive with '--pretty'."
 msgstr "Fehler: Option »--terse« schließt »--pretty« aus."
 
-#: ../cli/src/nmcli.c:156
+#: ../cli/src/nmcli.c:152
 #, c-format
 msgid "Error: Option '--pretty' is specified the second time."
 msgstr "Fehler: Option »--pretty« wurde zweimal gesetzt."
 
-#: ../cli/src/nmcli.c:161
+#: ../cli/src/nmcli.c:157
 #, c-format
 msgid "Error: Option '--pretty' is mutually exclusive with '--terse'."
 msgstr "Fehler: Option »--pretty« schließt »--terse« aus."
 
-#: ../cli/src/nmcli.c:171 ../cli/src/nmcli.c:187
+#: ../cli/src/nmcli.c:167 ../cli/src/nmcli.c:183
 #, c-format
 msgid "Error: missing argument for '%s' option."
 msgstr "Fehler: Fehlendes Argument für die Option »%s«."
 
-#: ../cli/src/nmcli.c:180 ../cli/src/nmcli.c:196
+#: ../cli/src/nmcli.c:176 ../cli/src/nmcli.c:192
 #, c-format
 msgid "Error: '%s' is not valid argument for '%s' option."
 msgstr "Fehler: »%s« ist kein gültiges Argument für die Option »%s«."
 
-#: ../cli/src/nmcli.c:203
+#: ../cli/src/nmcli.c:199
 #, c-format
 msgid "Error: fields for '%s' options are missing."
 msgstr "Fehler: Felder für die Option »%s« fehlen."
 
-#: ../cli/src/nmcli.c:209
+#: ../cli/src/nmcli.c:207
 #, c-format
 msgid "nmcli tool, version %s\n"
 msgstr "nmcli-Werkzeug, Version %s\n"
 
-#: ../cli/src/nmcli.c:215
+#: ../cli/src/nmcli.c:213
 #, c-format
 msgid "Error: Option '%s' is unknown, try 'nmcli -help'."
 msgstr "Fehler: Option »%s« ist unbekannt, versuchen Sie »nmcli -help«."
 
-#: ../cli/src/nmcli.c:234
+#: ../cli/src/nmcli.c:232
 #, c-format
 msgid "Caught signal %d, shutting down..."
 msgstr "Signal %d wurde empfangen, wird beendet …"
 
-#: ../cli/src/nmcli.c:259
-#, c-format
-msgid "Error: Could not connect to NetworkManager."
-msgstr "Fehler: Verbindung mit NetworkManager konnte nicht hergestellt werden."
+#: ../cli/src/nmcli.c:257
+msgid "Error: Could not create NMClient object."
+msgstr "Fehler: NMClient-Objekt konnte nicht erstellt werden."
 
-#: ../cli/src/nmcli.c:275
+#: ../cli/src/nmcli.c:273
 msgid "Success"
 msgstr "Erfolg"
 
-#: ../cli/src/settings.c:411
+#: ../cli/src/settings.c:423
 #, c-format
 msgid "%d (hex-ascii-key)"
 msgstr "%d (HEX-ASCII-Schlüssel)"
 
-#: ../cli/src/settings.c:413
+#: ../cli/src/settings.c:425
 #, c-format
 msgid "%d (104/128-bit passphrase)"
 msgstr "%d (104/128-bit-Passphrase)"
 
-#: ../cli/src/settings.c:416
+#: ../cli/src/settings.c:428
 #, c-format
 msgid "%d (unknown)"
 msgstr "%d (unbekannt)"
 
-#: ../cli/src/settings.c:442
+#: ../cli/src/settings.c:454
 msgid "0 (unknown)"
 msgstr "0 (unbekannt)"
 
-#: ../cli/src/settings.c:448
+#: ../cli/src/settings.c:460
 msgid "any, "
 msgstr "jede,"
 
-#: ../cli/src/settings.c:450
+#: ../cli/src/settings.c:462
 msgid "900 MHz, "
 msgstr "900 MHz,"
 
-#: ../cli/src/settings.c:452
+#: ../cli/src/settings.c:464
 msgid "1800 MHz, "
 msgstr "1800 MHz,"
 
-#: ../cli/src/settings.c:454
+#: ../cli/src/settings.c:466
 msgid "1900 MHz, "
 msgstr "1900 MHz,"
 
-#: ../cli/src/settings.c:456
+#: ../cli/src/settings.c:468
 msgid "850 MHz, "
 msgstr "850 MHz,"
 
-#: ../cli/src/settings.c:458
+#: ../cli/src/settings.c:470
 msgid "WCDMA 3GPP UMTS 2100 MHz, "
 msgstr "WCDMA 3GPP UMTS 2100 MHz, "
 
-#: ../cli/src/settings.c:460
+#: ../cli/src/settings.c:472
 msgid "WCDMA 3GPP UMTS 1800 MHz, "
 msgstr "WCDMA 3GPP UMTS 1800 MHz, "
 
-#: ../cli/src/settings.c:462
+#: ../cli/src/settings.c:474
 msgid "WCDMA 3GPP UMTS 1700/2100 MHz, "
 msgstr "WCDMA 3GPP UMTS 1700/2100 MHz, "
 
-#: ../cli/src/settings.c:464
+#: ../cli/src/settings.c:476
 msgid "WCDMA 3GPP UMTS 800 MHz, "
 msgstr "WCDMA 3GPP UMTS 800 MHz, "
 
-#: ../cli/src/settings.c:466
+#: ../cli/src/settings.c:478
 msgid "WCDMA 3GPP UMTS 850 MHz, "
 msgstr "WCDMA 3GPP UMTS 850 MHz, "
 
-#: ../cli/src/settings.c:468
+#: ../cli/src/settings.c:480
 msgid "WCDMA 3GPP UMTS 900 MHz, "
 msgstr "WCDMA 3GPP UMTS 900 MHz, "
 
-#: ../cli/src/settings.c:470
+#: ../cli/src/settings.c:482
 msgid "WCDMA 3GPP UMTS 1700 MHz, "
 msgstr "WCDMA 3GPP UMTS 1700 MHz, "
 
-#: ../cli/src/settings.c:554 ../cli/src/settings.c:721
+#: ../cli/src/settings.c:566 ../cli/src/settings.c:732
 msgid "auto"
 msgstr "auto"
 
-#: ../cli/src/settings.c:716 ../cli/src/settings.c:719
-#: ../cli/src/settings.c:720 ../cli/src/utils.c:172
+#: ../cli/src/settings.c:727 ../cli/src/settings.c:730
+#: ../cli/src/settings.c:731 ../cli/src/utils.c:176
 msgid "not set"
 msgstr "nicht gesetzt"
 
-#: ../cli/src/utils.c:124
+#: ../cli/src/utils.c:128
 #, c-format
 msgid "field '%s' has to be alone"
 msgstr "Feld »%s« muss allein stehen"
 
-#: ../cli/src/utils.c:127
+#: ../cli/src/utils.c:131
 #, c-format
 msgid "invalid field '%s'"
 msgstr "ungültiges Feld »%s«"
 
-#: ../cli/src/utils.c:146
+#: ../cli/src/utils.c:150
 #, c-format
 msgid "Option '--terse' requires specifying '--fields'"
 msgstr "Optione »--terse« benötigt die Angabe von »--fields«"
 
-#: ../cli/src/utils.c:150
+#: ../cli/src/utils.c:154
 #, c-format
 msgid "Option '--terse' requires specific '--fields' option values , not '%s'"
 msgstr "Option »--terse« benötigt bestimmte »--fields«-Werte, nicht »%s«"
 
-#: ../libnm-util/crypto.c:120
+#: ../cli/src/utils.c:333
+#, c-format
+msgid "Error: Couldn't create D-Bus object proxy for org.freedesktop.DBus"
+msgstr ""
+"Fehler: D-Bus-Objektproxy konnte nicht für org.freedesktop.DBus erstellt "
+"werden."
+
+#: ../cli/src/utils.c:341
+#, c-format
+msgid "Error: NameHasOwner request failed: %s"
+msgstr "Fehler: Anfrage NameHasOwner ist gescheitert: %s"
+
+#: ../cli/src/utils.c:386
+#, 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"
+
+#: ../cli/src/utils.c:395
+#, 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."
+
+#: ../libnm-util/crypto.c:127
 #, c-format
 msgid "PEM key file had no end tag '%s'."
 msgstr "PEM-Schlüsseldatei hat kein abschließendes Tag »%s«."
 
-#: ../libnm-util/crypto.c:130
+#: ../libnm-util/crypto.c:140
 #, c-format
 msgid "Doesn't look like a PEM private key file."
 msgstr "Das sieht nicht nach einer privaten PEM-Schlüsseldatei aus."
 
-#: ../libnm-util/crypto.c:138
+#: ../libnm-util/crypto.c:148
 #, c-format
 msgid "Not enough memory to store PEM file data."
 msgstr "Nicht genügend freier Speicher zum Speichern der PEM-Datendatei."
 
-#: ../libnm-util/crypto.c:154
+#: ../libnm-util/crypto.c:164
 #, c-format
 msgid "Malformed PEM file: Proc-Type was not first tag."
 msgstr "Fehlerhafte PEM-Datei: Proc-Type ist nicht das erste Tag."
 
-#: ../libnm-util/crypto.c:162
+#: ../libnm-util/crypto.c:172
 #, c-format
 msgid "Malformed PEM file: unknown Proc-Type tag '%s'."
 msgstr "Fehlerhafte PEM-Datei: unbekannter Proc-Type-Tag »%s«."
 
-#: ../libnm-util/crypto.c:172
+#: ../libnm-util/crypto.c:182
 #, c-format
 msgid "Malformed PEM file: DEK-Info was not the second tag."
 msgstr "Fehlerhafte PEM-Datei: DEK-Info ist nicht das zweite Tag."
 
-#: ../libnm-util/crypto.c:183
+#: ../libnm-util/crypto.c:193
 #, c-format
 msgid "Malformed PEM file: no IV found in DEK-Info tag."
 msgstr "Fehlerhafte PEM-Datei: kein IV im DEK-Info-Tag gefunden."
 
-#: ../libnm-util/crypto.c:190
+#: ../libnm-util/crypto.c:200
 #, c-format
 msgid "Malformed PEM file: invalid format of IV in DEK-Info tag."
 msgstr "Fehlerhafte PEM-Datei: falsches Format des IV im DEK-Info-Tag."
 
-#: ../libnm-util/crypto.c:203
+#: ../libnm-util/crypto.c:213
 #, c-format
 msgid "Malformed PEM file: unknown private key cipher '%s'."
 msgstr "Fehlerhafte PEM-Datei: Unbekannter privater Schlüsselstrom »%s«."
 
-#: ../libnm-util/crypto.c:222
+#: ../libnm-util/crypto.c:232
 #, c-format
 msgid "Could not decode private key."
 msgstr "Der private Schlüssel konnte nicht entschlüsselt werden."
 
-#: ../libnm-util/crypto.c:267
-#, c-format
-msgid "PEM certificate '%s' had no end tag '%s'."
-msgstr "PEM-Zertifikat »%s« hat kein abschließendes Tag »%s«."
-
-#: ../libnm-util/crypto.c:277
-#, c-format
-msgid "Failed to decode certificate."
-msgstr "Die Entschlüsselung des Zertifikats scheiterte."
-
-#: ../libnm-util/crypto.c:286
+#: ../libnm-util/crypto.c:268 ../libnm-util/crypto.c:554
 #, c-format
 msgid "Not enough memory to store certificate data."
 msgstr "Nicht genug freier Speicher zum Speichern des Zertifikats."
 
 #: ../libnm-util/crypto.c:294
 #, c-format
-msgid "Not enough memory to store file data."
-msgstr "Nicht genug freier Speicher zum Speichern der Datei."
-
-#: ../libnm-util/crypto.c:324
-#, c-format
 msgid "IV must be an even number of bytes in length."
 msgstr "IV muss eine gerade Anzahl an Byte lang sein."
 
-#: ../libnm-util/crypto.c:333
+#: ../libnm-util/crypto.c:303
 #, c-format
 msgid "Not enough memory to store the IV."
 msgstr "Nicht genug freier Speicher zum Speichern des IV."
 
-#: ../libnm-util/crypto.c:344
+#: ../libnm-util/crypto.c:314
 #, c-format
 msgid "IV contains non-hexadecimal digits."
 msgstr "IV enthält nicht-hexadezimale Zeichen."
 
-#: ../libnm-util/crypto.c:382 ../libnm-util/crypto_gnutls.c:148
-#: ../libnm-util/crypto_gnutls.c:266 ../libnm-util/crypto_nss.c:171
+#: ../libnm-util/crypto.c:352 ../libnm-util/crypto_gnutls.c:149
+#: ../libnm-util/crypto_gnutls.c:267 ../libnm-util/crypto_nss.c:171
 #: ../libnm-util/crypto_nss.c:336
 #, c-format
 msgid "Private key cipher '%s' was unknown."
 msgstr "Privater Schlüsselstrom »%s« ist unbekannt."
 
-#: ../libnm-util/crypto.c:391
+#: ../libnm-util/crypto.c:361
 #, c-format
 msgid "Not enough memory to decrypt private key."
 msgstr "Nicht genug freier Speicher zum Entschlüsseln des privaten Schlüssels."
 
-#: ../libnm-util/crypto.c:511
-#, c-format
-msgid "Unable to determine private key type."
-msgstr "Der Typ des privaten Schlüssels konnte nicht bestimmt werden."
-
-#: ../libnm-util/crypto.c:530
+#: ../libnm-util/crypto.c:426
 #, c-format
 msgid "Not enough memory to store decrypted private key."
 msgstr ""
 "Nicht genug freier Speicher zum Speichern des entschlüsselten privaten "
 "Schlüssels."
 
-#: ../libnm-util/crypto_gnutls.c:49
+#: ../libnm-util/crypto.c:471
+#, c-format
+msgid "Unable to determine private key type."
+msgstr "Der Typ des privaten Schlüssels konnte nicht bestimmt werden."
+
+#: ../libnm-util/crypto.c:526
+#, c-format
+msgid "PEM certificate had no start tag '%s'."
+msgstr "PEM-Zertifikat hatte kein Start-Tag »%s«."
+
+#: ../libnm-util/crypto.c:535
+#, c-format
+msgid "PEM certificate had no end tag '%s'."
+msgstr "PEM-Zertifikat hatte kein abschließendes Tag »%s«."
+
+#: ../libnm-util/crypto.c:559
+#, c-format
+msgid "Failed to decode certificate."
+msgstr "Die Entschlüsselung des Zertifikats scheiterte."
+
+#: ../libnm-util/crypto_gnutls.c:50
 msgid "Failed to initialize the crypto engine."
 msgstr "Die Initialisierung der crypto-engine scheiterte."
 
-#: ../libnm-util/crypto_gnutls.c:93
+#: ../libnm-util/crypto_gnutls.c:94
 #, c-format
 msgid "Failed to initialize the MD5 engine: %s / %s."
 msgstr "Die Initialisierung der MD5-engine %s / %s scheiterte."
 
-#: ../libnm-util/crypto_gnutls.c:156
+#: ../libnm-util/crypto_gnutls.c:157
 #, c-format
 msgid "Invalid IV length (must be at least %zd)."
 msgstr "Ungültige IV-Länge (muss mindestens %zd betragen)."
 
-#: ../libnm-util/crypto_gnutls.c:165 ../libnm-util/crypto_nss.c:188
+#: ../libnm-util/crypto_gnutls.c:166 ../libnm-util/crypto_nss.c:188
 #, c-format
 msgid "Not enough memory for decrypted key buffer."
 msgstr ""
 "Nicht genug freier Speicher zum Zwischenspeichern des entschlüsselten "
 "Schlüssels."
 
-#: ../libnm-util/crypto_gnutls.c:173
+#: ../libnm-util/crypto_gnutls.c:174
 #, c-format
 msgid "Failed to initialize the decryption cipher context: %s / %s."
 msgstr ""
 "Die Initialisierung des Entschlüsselung-Chiffrekontextes scheiterte: %s / %s."
 
-#: ../libnm-util/crypto_gnutls.c:182
+#: ../libnm-util/crypto_gnutls.c:183
 #, c-format
 msgid "Failed to set symmetric key for decryption: %s / %s."
 msgstr ""
 "Das Anlegen der symmetrischen Schlüssel zum Entschlüsseln scheiterte: %s / %"
 "s."
 
-#: ../libnm-util/crypto_gnutls.c:191
+#: ../libnm-util/crypto_gnutls.c:192
 #, c-format
 msgid "Failed to set IV for decryption: %s / %s."
 msgstr "Das Anlegen des IV zum Entschlüsseln scheiterte: %s / %s."
 
-#: ../libnm-util/crypto_gnutls.c:200
+#: ../libnm-util/crypto_gnutls.c:201
 #, c-format
 msgid "Failed to decrypt the private key: %s / %s."
 msgstr "Die Entschlüsselung des privaten Schlüssels scheiterte: %s / %s."
 
-#: ../libnm-util/crypto_gnutls.c:210 ../libnm-util/crypto_nss.c:267
+#: ../libnm-util/crypto_gnutls.c:211 ../libnm-util/crypto_nss.c:267
 #, c-format
 msgid "Failed to decrypt the private key: unexpected padding length."
 msgstr ""
 "Die Entschlüsselung des privaten Schlüssels scheiterte: Unerwartete "
 "Zeilenlänge."
 
-#: ../libnm-util/crypto_gnutls.c:221 ../libnm-util/crypto_nss.c:278
+#: ../libnm-util/crypto_gnutls.c:222 ../libnm-util/crypto_nss.c:278
 #, c-format
 msgid "Failed to decrypt the private key."
 msgstr "Die Entschlüsselung des privaten Schlüssels scheiterte."
 
-#: ../libnm-util/crypto_gnutls.c:286 ../libnm-util/crypto_nss.c:356
+#: ../libnm-util/crypto_gnutls.c:287 ../libnm-util/crypto_nss.c:356
 #, c-format
 msgid "Could not allocate memory for encrypting."
 msgstr ""
 "Es konnte nicht genügend freier Speicher zum Verschlüsseln angefordert "
 "werden."
 
-#: ../libnm-util/crypto_gnutls.c:294
+#: ../libnm-util/crypto_gnutls.c:295
 #, c-format
 msgid "Failed to initialize the encryption cipher context: %s / %s."
 msgstr ""
 "Die Initialisierung des Verschlüsselung-Chiffrekontextes scheiterte: %s / %s."
 
-#: ../libnm-util/crypto_gnutls.c:303
+#: ../libnm-util/crypto_gnutls.c:304
 #, c-format
 msgid "Failed to set symmetric key for encryption: %s / %s."
 msgstr ""
 "Das Anlegen des symmetrischen Schlüssels zum Verschlüsseln scheiterte: %s / %"
 "s."
 
-#: ../libnm-util/crypto_gnutls.c:313
+#: ../libnm-util/crypto_gnutls.c:314
 #, c-format
 msgid "Failed to set IV for encryption: %s / %s."
 msgstr "Das Anlegen des IV zur Verschlüsselung scheiterte: %s / %s."
 
-#: ../libnm-util/crypto_gnutls.c:322
+#: ../libnm-util/crypto_gnutls.c:323
 #, c-format
 msgid "Failed to encrypt the data: %s / %s."
 msgstr "Die Verschlüsselung der Daten scheiterte: %s / %s."
 
-#: ../libnm-util/crypto_gnutls.c:362
+#: ../libnm-util/crypto_gnutls.c:363
 #, c-format
 msgid "Error initializing certificate data: %s"
 msgstr "Die Initialisierung der Zertifikatsdaten schlug fehl: %s"
 
-#: ../libnm-util/crypto_gnutls.c:384
+#: ../libnm-util/crypto_gnutls.c:385
 #, c-format
 msgid "Couldn't decode certificate: %s"
 msgstr "Zertifikat konnte nicht entschlüsselt werden: %s"
 
-#: ../libnm-util/crypto_gnutls.c:408
+#: ../libnm-util/crypto_gnutls.c:409
 #, c-format
 msgid "Couldn't initialize PKCS#12 decoder: %s"
 msgstr "PKCS#12-Decoder konnte nicht initialisiert werden: %s"
 
-#: ../libnm-util/crypto_gnutls.c:421
+#: ../libnm-util/crypto_gnutls.c:422
 #, c-format
 msgid "Couldn't decode PKCS#12 file: %s"
 msgstr "PKCS#12 konnte nicht entschlüsselt werden: %s"
 
-#: ../libnm-util/crypto_gnutls.c:433
+#: ../libnm-util/crypto_gnutls.c:434
 #, c-format
 msgid "Couldn't verify PKCS#12 file: %s"
 msgstr "PKCS#12-Datei konnte nicht überprüft werden: %s"
@@ -1562,99 +1752,80 @@ msgstr "PKCS#12-Datei konnte nicht überprüft werden: %d"
 msgid "Could not generate random data."
 msgstr "Es konnten keine Zufallsdaten generiert werden."
 
-#: ../libnm-util/nm-utils.c:1975
+#: ../libnm-util/nm-utils.c:1989
 #, c-format
 msgid "Not enough memory to make encryption key."
 msgstr ""
 "Nicht genügend freier Speicher zur Erstellung des Verschlüsselungsschlüssels."
 
-#: ../libnm-util/nm-utils.c:2085
+#: ../libnm-util/nm-utils.c:2099
 msgid "Could not allocate memory for PEM file creation."
 msgstr ""
 "Es konnte nicht genügend freier Speicher zur Erstellung der PEM-Datei "
 "angefordert werden."
 
-#: ../libnm-util/nm-utils.c:2097
+#: ../libnm-util/nm-utils.c:2111
 #, c-format
 msgid "Could not allocate memory for writing IV to PEM file."
 msgstr ""
 "Es konnte nicht genügend freier Speicher zum Schreiben des IV in die PEM-"
 "Datei angefordert werden."
 
-#: ../libnm-util/nm-utils.c:2109
+#: ../libnm-util/nm-utils.c:2123
 #, c-format
 msgid "Could not allocate memory for writing encrypted key to PEM file."
 msgstr ""
 "Es konnte nicht genügend freier Speicher zum Schreiben des verschlüsselten "
 "Schlüssels in die PEM-Datei angefordert werden."
 
-#: ../libnm-util/nm-utils.c:2128
+#: ../libnm-util/nm-utils.c:2142
 #, c-format
 msgid "Could not allocate memory for PEM file data."
 msgstr ""
 "Es konnte nicht genügend freier Speicher für die PEM-Datei angefordert "
 "werden."
 
-#: ../policy/org.freedesktop.network-manager-settings.system.policy.in.h:1
-msgid "Connection sharing via a protected WiFi network"
-msgstr "Verbindungsfreigabe über ein geschütztes WLAN-Netzwerk"
-
-#: ../policy/org.freedesktop.network-manager-settings.system.policy.in.h:2
-msgid "Connection sharing via an open WiFi network"
-msgstr "Verbindungsfreigabe über ein offenes WLAN-Netzwerk"
-
-#: ../policy/org.freedesktop.network-manager-settings.system.policy.in.h:3
-msgid "Modify persistent system hostname"
-msgstr "Den ständigen Rechnernamen des Systems bearbeiten"
-
-#: ../policy/org.freedesktop.network-manager-settings.system.policy.in.h:4
-msgid "Modify system connections"
-msgstr "Systemverbindungen bearbeiten"
-
-#: ../policy/org.freedesktop.network-manager-settings.system.policy.in.h:5
-msgid "System policy prevents modification of system settings"
-msgstr ""
-"Die Systemrichtlinien verhindern das Bearbeiten von Systemeinstellungen"
-
-#: ../policy/org.freedesktop.network-manager-settings.system.policy.in.h:6
-msgid "System policy prevents modification of the persistent system hostname"
-msgstr ""
-"Die Systemrichtlinien verhindern das Bearbeiten des ständigen Rechnernamens "
-"des Systems"
-
-#: ../policy/org.freedesktop.network-manager-settings.system.policy.in.h:7
-msgid "System policy prevents sharing connections via a protected WiFi network"
-msgstr ""
-"Die Systemrichtlinien verhindern Verbindungsfreigaben über ein geschütztes "
-"WLAN-Netzwerk"
-
-#: ../policy/org.freedesktop.network-manager-settings.system.policy.in.h:8
-msgid "System policy prevents sharing connections via an open WiFi network"
-msgstr ""
-"Die Systemrichtlinien verhindern Verbindungsfreigaben über ein offenes WLAN-"
-"Netzwerk"
-
 #: ../policy/org.freedesktop.NetworkManager.policy.in.h:1
 msgid "Allow control of network connections"
 msgstr "Die Kontrolle von Netzwerkverbindungen erlauben"
 
 #: ../policy/org.freedesktop.NetworkManager.policy.in.h:2
-msgid "Allow use of user-specific connections"
-msgstr "Die Verwendung von benutzerspezifischen Verbindungen erlauben"
+msgid "Connection sharing via a protected WiFi network"
+msgstr "Verbindungsfreigabe über ein geschütztes WLAN-Netzwerk"
 
 #: ../policy/org.freedesktop.NetworkManager.policy.in.h:3
+msgid "Connection sharing via an open WiFi network"
+msgstr "Verbindungsfreigabe über ein offenes WLAN-Netzwerk"
+
+#: ../policy/org.freedesktop.NetworkManager.policy.in.h:4
 msgid "Enable or disable WiFi devices"
 msgstr "WLAN-Geräte aktivieren oder deaktivieren"
 
-#: ../policy/org.freedesktop.NetworkManager.policy.in.h:4
+#: ../policy/org.freedesktop.NetworkManager.policy.in.h:5
+msgid "Enable or disable WiMAX mobile broadband devices"
+msgstr "Mobile WiMAX-Breitbandgeräte aktivieren oder deaktivieren"
+
+#: ../policy/org.freedesktop.NetworkManager.policy.in.h:6
 msgid "Enable or disable mobile broadband devices"
 msgstr "Mobile Breitbandgeräte aktivieren oder deaktivieren"
 
-#: ../policy/org.freedesktop.NetworkManager.policy.in.h:5
+#: ../policy/org.freedesktop.NetworkManager.policy.in.h:7
 msgid "Enable or disable system networking"
 msgstr "System-Netzwerke aktivieren oder deaktivieren"
 
-#: ../policy/org.freedesktop.NetworkManager.policy.in.h:6
+#: ../policy/org.freedesktop.NetworkManager.policy.in.h:8
+msgid "Modify network connections for all users"
+msgstr "Netzwerkverbindungen für alle Benutzer bearbeiten"
+
+#: ../policy/org.freedesktop.NetworkManager.policy.in.h:9
+msgid "Modify persistent system hostname"
+msgstr "Den ständigen Rechnernamen des Systems bearbeiten"
+
+#: ../policy/org.freedesktop.NetworkManager.policy.in.h:10
+msgid "Modify personal network connections"
+msgstr "Eigene Netzwerkverbindungen bearbeiten"
+
+#: ../policy/org.freedesktop.NetworkManager.policy.in.h:11
 msgid ""
 "Put NetworkManager to sleep or wake it up (should only be used by system "
 "power management)"
@@ -1662,108 +1833,91 @@ msgstr ""
 "NetworkManager in den Schlafzustand versetzen oder daraus aufwecken (Sollte "
 "nur von der System-Energieverwaltung verwendet werden)"
 
-#: ../policy/org.freedesktop.NetworkManager.policy.in.h:7
+#: ../policy/org.freedesktop.NetworkManager.policy.in.h:12
 msgid "System policy prevents control of network connections"
 msgstr ""
 "Die Systemrichtlinien verhindern die Kontrolle von Netzwerkverbindungen"
 
-#: ../policy/org.freedesktop.NetworkManager.policy.in.h:8
+#: ../policy/org.freedesktop.NetworkManager.policy.in.h:13
 msgid "System policy prevents enabling or disabling WiFi devices"
 msgstr ""
 "Die Systemrichtlinien verhindern die Aktivierung oder Deaktivierung von WLAN-"
 "Geräten"
 
-#: ../policy/org.freedesktop.NetworkManager.policy.in.h:9
+#: ../policy/org.freedesktop.NetworkManager.policy.in.h:14
+msgid ""
+"System policy prevents enabling or disabling WiMAX mobile broadband devices"
+msgstr ""
+"Die Systemrichtlinien verhindern die Aktivierung oder Deaktivierung mobiler "
+"WiMAX-Breitbandgeräte"
+
+#: ../policy/org.freedesktop.NetworkManager.policy.in.h:15
 msgid "System policy prevents enabling or disabling mobile broadband devices"
 msgstr ""
 "Die Systemrichtlinien verhindern die Aktivierung oder Deaktivierung mobiler "
 "Breitbandgeräte"
 
-#: ../policy/org.freedesktop.NetworkManager.policy.in.h:10
+#: ../policy/org.freedesktop.NetworkManager.policy.in.h:16
 msgid "System policy prevents enabling or disabling system networking"
 msgstr ""
 "Die Systemrichtlinien verhindern die Aktivierung oder Deaktivierung von "
 "System-Netzwerken"
 
-#: ../policy/org.freedesktop.NetworkManager.policy.in.h:11
-msgid "System policy prevents putting NetworkManager to sleep or waking it up"
+#: ../policy/org.freedesktop.NetworkManager.policy.in.h:17
+msgid "System policy prevents modification of network settings for all users"
 msgstr ""
-"Die Systemrichtlinien verhindern das in den Schlaf versetzen oder Aufwecken "
-"von NetworkManager"
+"Die Systemrichtlinien verhindern das Bearbeiten von Netzwerkeinstellungen "
+"für alle Benutzer"
 
-#: ../policy/org.freedesktop.NetworkManager.policy.in.h:12
-msgid "System policy prevents use of user-specific connections"
+#: ../policy/org.freedesktop.NetworkManager.policy.in.h:18
+msgid "System policy prevents modification of personal network settings"
 msgstr ""
-"Die Systemrichtlinien verhindern die Verwendung von benutzerspezifischen "
-"Verbindungen"
-
-#: ../src/nm-netlink-monitor.c:100 ../src/nm-netlink-monitor.c:231
-#: ../src/nm-netlink-monitor.c:653
-#, c-format
-msgid "error processing netlink message: %s"
-msgstr "Fehler beim Verarbeiten der netlink-Nachricht: %s"
+"Die Systemrichtlinien verhindern das Bearbeiten von eigenen "
+"Netzwerkeinstellungen"
 
-#: ../src/nm-netlink-monitor.c:214
-msgid "error occurred while waiting for data on socket"
-msgstr "Während des Wartens auf Daten am Socket ist ein Fehler aufgetreten"
-
-#: ../src/nm-netlink-monitor.c:254
-#, c-format
-msgid "unable to connect to netlink for monitoring link status: %s"
+#: ../policy/org.freedesktop.NetworkManager.policy.in.h:19
+msgid "System policy prevents modification of the persistent system hostname"
 msgstr ""
-"Die Verbindung zu netlink zur Überwachung der Netzwerkverbindung konnte "
-"nicht hergestellt werden: %s"
+"Die Systemrichtlinien verhindern das Bearbeiten des ständigen Rechnernamens "
+"des Systems"
 
-#: ../src/nm-netlink-monitor.c:265
-#, c-format
-msgid "unable to enable netlink handle credential passing: %s"
+#: ../policy/org.freedesktop.NetworkManager.policy.in.h:20
+msgid "System policy prevents putting NetworkManager to sleep or waking it up"
 msgstr ""
-"Die netlink-Handle-Berechtigungsnachweisfreigabe konnte nicht aktiviert "
-"werden: %s"
+"Die Systemrichtlinien verhindern das in den Schlaf versetzen oder Aufwecken "
+"von NetworkManager"
 
-#: ../src/nm-netlink-monitor.c:291 ../src/nm-netlink-monitor.c:353
-#, c-format
-msgid "unable to allocate netlink handle for monitoring link status: %s"
+#: ../policy/org.freedesktop.NetworkManager.policy.in.h:21
+msgid "System policy prevents sharing connections via a protected WiFi network"
 msgstr ""
-"Es konnte kein netlink-Handle zur Überwachung der Netzwerkverbindung "
-"angefordert werden: %s"
+"Die Systemrichtlinien verhindern Verbindungsfreigaben über ein geschütztes "
+"WLAN-Netzwerk"
 
-#: ../src/nm-netlink-monitor.c:376
-#, c-format
-msgid "unable to allocate netlink link cache for monitoring link status: %s"
+#: ../policy/org.freedesktop.NetworkManager.policy.in.h:22
+msgid "System policy prevents sharing connections via an open WiFi network"
 msgstr ""
-"Es konnte kein netlink-Verbindungszwischenspeicher zur Überwachung der "
-"Netzwerkverbindung angefordert werden: %s"
-
-#: ../src/nm-netlink-monitor.c:502
-#, c-format
-msgid "unable to join netlink group: %s"
-msgstr "Der netlink-Gruppe konnte nicht beigetreten werden: %s"
-
-#: ../src/nm-netlink-monitor.c:629 ../src/nm-netlink-monitor.c:642
-#, c-format
-msgid "error updating link cache: %s"
-msgstr "Die Aktualisierung des Verbindungszwischenspeichers schlug fehl: %s"
+"Die Systemrichtlinien verhindern Verbindungsfreigaben über ein offenes WLAN-"
+"Netzwerk"
 
-#: ../src/main.c:499
+#: ../src/main.c:519
 #, c-format
 msgid "Invalid option.  Please use --help to see a list of valid options.\n"
 msgstr ""
 "Ungültige Option.  Verwenden Sie --help um eine Liste der verfügbaren "
 "Optionen zu erhalten.\n"
 
-#: ../src/main.c:570
+#: ../src/main.c:590
 #, 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/dhcp-manager/nm-dhcp-dhclient.c:328
+#: ../src/dhcp-manager/nm-dhcp-dhclient-utils.c:62
 msgid "# Created by NetworkManager\n"
 msgstr "# Erstellt von NetworkManager\n"
 
-#: ../src/dhcp-manager/nm-dhcp-dhclient.c:344
+#: ../src/dhcp-manager/nm-dhcp-dhclient-utils.c:69
 #, c-format
 msgid ""
 "# Merged from %s\n"
@@ -1789,36 +1943,157 @@ msgstr "»dhcpcd« konnte nicht gefunden werden."
 msgid "unsupported DHCP client '%s'"
 msgstr "Nicht unterstützter DHCP-Client »%s«"
 
-#: ../src/logging/nm-logging.c:146
+#: ../src/dns-manager/nm-dns-manager.c:367
+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."
+
+#: ../src/dns-manager/nm-dns-manager.c:369
+msgid "The nameservers listed below may not be recognized."
+msgstr "Die nachfolgend gelisteten Nameserver werden eventuell nicht erkannt."
+
+#: ../src/logging/nm-logging.c:149
 #, c-format
 msgid "Unknown log level '%s'"
 msgstr "Unbekannte Protokollstufe »%s«"
 
-#: ../src/logging/nm-logging.c:171
+#: ../src/logging/nm-logging.c:174
 #, c-format
 msgid "Unknown log domain '%s'"
 msgstr "Unbekannte Protokolldomäne »%s«"
 
-#: ../src/dns-manager/nm-dns-manager.c:384
-msgid "NOTE: the libc resolver may not support more than 3 nameservers."
+#: ../src/modem-manager/nm-modem-cdma.c:296 ../src/nm-device-bt.c:355
+#, c-format
+msgid "CDMA connection %d"
+msgstr "CDMA-Verbindung %d"
+
+#: ../src/modem-manager/nm-modem-gsm.c:499 ../src/nm-device-bt.c:351
+#, c-format
+msgid "GSM connection %d"
+msgstr "GSM-Verbindung %d"
+
+#: ../src/nm-device-bt.c:326
+#, c-format
+msgid "PAN connection %d"
+msgstr "PAN-Verbindung %d"
+
+#: ../src/nm-device-bt.c:359
+#, c-format
+msgid "DUN connection %d"
+msgstr "DUN-Verbindung %d"
+
+#: ../src/nm-device-ethernet.c:1681
+#, c-format
+msgid "PPPoE connection %d"
+msgstr "PPPoE-Verbindung %d"
+
+#: ../src/nm-device-ethernet.c:1681 ../src/settings/nm-settings-utils.c:50
+#, c-format
+msgid "Wired connection %d"
+msgstr "Kabelgebundene Verbindung %d"
+
+#: ../src/nm-device-olpc-mesh.c:423
+#, c-format
+msgid "Mesh %d"
+msgstr "Maschennetz %d‬"
+
+#: ../src/nm-manager.c:660
+#, c-format
+msgid "VPN connection %d"
+msgstr "VPN-Verbindung %d"
+
+#: ../src/nm-netlink-monitor.c:100 ../src/nm-netlink-monitor.c:231
+#: ../src/nm-netlink-monitor.c:653
+#, c-format
+msgid "error processing netlink message: %s"
+msgstr "Fehler beim Verarbeiten der netlink-Nachricht: %s"
+
+#: ../src/nm-netlink-monitor.c:214
+msgid "error occurred while waiting for data on socket"
+msgstr "Während des Wartens auf Daten am Socket ist ein Fehler aufgetreten"
+
+#: ../src/nm-netlink-monitor.c:254
+#, c-format
+msgid "unable to connect to netlink for monitoring link status: %s"
 msgstr ""
-"HINWEIS: Der libc-resolver unterstützt eventuell nicht mehr als drei "
-"Nameserver."
+"Die Verbindung zu netlink zur Überwachung der Netzwerkverbindung konnte "
+"nicht hergestellt werden: %s"
 
-#: ../src/dns-manager/nm-dns-manager.c:386
-msgid "The nameservers listed below may not be recognized."
-msgstr "Die nachfolgend gelisteten Nameserver werden eventuell nicht erkannt."
+#: ../src/nm-netlink-monitor.c:265
+#, c-format
+msgid "unable to enable netlink handle credential passing: %s"
+msgstr ""
+"Die netlink-Handle-Berechtigungsnachweisfreigabe konnte nicht aktiviert "
+"werden: %s"
+
+#: ../src/nm-netlink-monitor.c:291 ../src/nm-netlink-monitor.c:353
+#, c-format
+msgid "unable to allocate netlink handle for monitoring link status: %s"
+msgstr ""
+"Es konnte kein netlink-Handle zur Überwachung der Netzwerkverbindung "
+"angefordert werden: %s"
+
+#: ../src/nm-netlink-monitor.c:376
+#, c-format
+msgid "unable to allocate netlink link cache for monitoring link status: %s"
+msgstr ""
+"Es konnte kein netlink-Verbindungszwischenspeicher zur Überwachung der "
+"Netzwerkverbindung angefordert werden: %s"
 
-#: ../src/system-settings/nm-default-wired-connection.c:157
+#: ../src/nm-netlink-monitor.c:502
 #, c-format
-msgid "Auto %s"
-msgstr "Auto %s"
+msgid "unable to join netlink group: %s"
+msgstr "Der netlink-Gruppe konnte nicht beigetreten werden: %s"
 
-#: ../system-settings/plugins/ifcfg-rh/reader.c:3412
-#: ../system-settings/plugins/ifnet/connection_parser.c:49
+#: ../src/nm-netlink-monitor.c:629 ../src/nm-netlink-monitor.c:642
+#, c-format
+msgid "error updating link cache: %s"
+msgstr "Die Aktualisierung des Verbindungszwischenspeichers schlug fehl: %s"
+
+#: ../src/settings/plugins/ifcfg-rh/reader.c:3464
+#: ../src/settings/plugins/ifnet/connection_parser.c:51
 msgid "System"
 msgstr "System"
 
+#~ msgid "SCOPE"
+#~ msgstr "BANDBREITE"
+
+#~ msgid "DBUS-SERVICE"
+#~ msgstr "DBUS-SERVICE"
+
+#~ msgid "system"
+#~ msgstr "System"
+
+#~ msgid "user"
+#~ msgstr "Benutzer"
+
+#~ msgid "System connections"
+#~ msgstr "Systemverbindungen"
+
+#~ msgid "User connections"
+#~ msgstr "Benutzerverbindungen"
+
+#~ msgid "Error: Obtaining active connection for '%s' failed."
+#~ msgstr "Fehler: Ermittlung der aktiven Verbindung für »%s« ist gescheitert."
+
+#~ msgid "Error: Could not get user settings."
+#~ msgstr "Fehler: Benutzereinstellungen konnten nicht ermittelt werden."
+
+#~ msgid "Not enough memory to store file data."
+#~ msgstr "Nicht genug freier Speicher zum Speichern der Datei."
+
+#~ msgid "Allow use of user-specific connections"
+#~ msgstr "Die Verwendung von benutzerspezifischen Verbindungen erlauben"
+
+#~ msgid "System policy prevents use of user-specific connections"
+#~ msgstr ""
+#~ "Die Systemrichtlinien verhindern die Verwendung von benutzerspezifischen "
+#~ "Verbindungen"
+
+#~ msgid "Auto %s"
+#~ msgstr "Auto %s"
+
 #~ msgid "Type"
 #~ msgstr "Typ"
 
@@ -1929,9 +2204,6 @@ msgstr "System"
 #~ msgid "Error: hwaddr has to be specified."
 #~ msgstr "Fehler: Es muss eine Hardwareadresse angegeben werden."
 
-#~ msgid "AP parameters"
-#~ msgstr "Parameter des Zugangspunkts"
-
 #~ msgid "Frequency:"
 #~ msgstr "Frequenz:"
 
diff --git a/po/el.po b/po/el.po
index cb9fa186..c6db6f79 100644
--- a/po/el.po
+++ b/po/el.po
@@ -1773,7 +1773,7 @@ msgstr ""
 msgid "The nameservers listed below may not be recognized."
 msgstr "Οι κάτωθι εξυπηρετητές ονομάτων ίσως να μην αναγνωρίζονται."
 
-#: ../src/system-settings/nm-default-wired-connection.c:157
+#: ../src/settings/nm-default-wired-connection.c:157
 #, c-format
 msgid "Auto %s"
 msgstr "Αυτόματο %s"
diff --git a/po/en_GB.po b/po/en_GB.po
index ef279f8f..528f915c 100644
--- a/po/en_GB.po
+++ b/po/en_GB.po
@@ -326,7 +326,7 @@ msgstr "NOTE: the libc resolver may not support more than 3 nameservers."
 msgid "The nameservers listed below may not be recognized."
 msgstr "The nameservers listed below may not be recognised."
 
-#: ../src/system-settings/nm-default-wired-connection.c:194
+#: ../src/settings/nm-default-wired-connection.c:194
 #, c-format
 msgid "Auto %s"
 msgstr "Auto %s"
diff --git a/po/es.po b/po/es.po
index 74746f4a..8ee75316 100644
--- a/po/es.po
+++ b/po/es.po
@@ -8,15 +8,15 @@
 # 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.
+# Jorge González <jorgegonz@svn.gnome.org>, 2007, 2008, 2010, 2011.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: NetworkManager.master\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
 "product=NetworkManager&component=general\n"
-"POT-Creation-Date: 2010-09-21 03:25+0000\n"
-"PO-Revision-Date: 2010-09-25 11:36+0200\n"
+"POT-Creation-Date: 2011-03-03 03:25+0000\n"
+"PO-Revision-Date: 2011-03-13 15:03+0100\n"
 "Last-Translator: Jorge González <jorgegonz@svn.gnome.org>\n"
 "Language-Team: Español <gnome-es-list@gnome.org>\n"
 "MIME-Version: 1.0\n"
@@ -25,842 +25,984 @@ msgstr ""
 "X-Generator: KBabel 1.11.4\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../cli/src/connections.c:60 ../cli/src/connections.c:75
-#: ../cli/src/devices.c:88 ../cli/src/devices.c:101 ../cli/src/devices.c:111
-#: ../cli/src/devices.c:121 ../cli/src/devices.c:134 ../cli/src/devices.c:145
-#: ../cli/src/devices.c:156 ../cli/src/devices.c:165 ../cli/src/devices.c:174
+#: ../cli/src/connections.c:62 ../cli/src/connections.c:76
+#: ../cli/src/devices.c:99 ../cli/src/devices.c:112 ../cli/src/devices.c:122
+#: ../cli/src/devices.c:132 ../cli/src/devices.c:146 ../cli/src/devices.c:160
+#: ../cli/src/devices.c:171 ../cli/src/devices.c:182 ../cli/src/devices.c:191
+#: ../cli/src/devices.c:200 ../cli/src/devices.c:222
 msgid "NAME"
 msgstr "NOMBRE"
 
 #. 0
-#: ../cli/src/connections.c:61 ../cli/src/connections.c:76
+#: ../cli/src/connections.c:63 ../cli/src/connections.c:77
 msgid "UUID"
 msgstr "UUID"
 
 #. 1
-#: ../cli/src/connections.c:62
+#: ../cli/src/connections.c:64
 msgid "DEVICES"
 msgstr "DISPOSITIVOS"
 
 #. 2
-#: ../cli/src/connections.c:63 ../cli/src/connections.c:78
-msgid "SCOPE"
-msgstr "ALCANCE"
-
-#. 3
-#: ../cli/src/connections.c:64
+#: ../cli/src/connections.c:65
 msgid "DEFAULT"
 msgstr "PREDETERMINADO"
 
-#. 4
-#: ../cli/src/connections.c:65
-msgid "DBUS-SERVICE"
-msgstr "SERVICIO DBUS"
-
-#. 5
+#. 3
 #: ../cli/src/connections.c:66
 msgid "SPEC-OBJECT"
 msgstr "OBJETO SPEC"
 
-#. 6
+#. 4
 #: ../cli/src/connections.c:67
 msgid "VPN"
 msgstr "VPN"
 
+#. 5
+#. 6
+#. 2
+#. 11
+#. 5
+#: ../cli/src/connections.c:68 ../cli/src/connections.c:83
+#: ../cli/src/devices.c:67 ../cli/src/devices.c:212 ../cli/src/devices.c:228
+msgid "DBUS-PATH"
+msgstr "RUTA-DBUS"
+
 #. 1
 #. 0
 #. 1
-#: ../cli/src/connections.c:77 ../cli/src/devices.c:62 ../cli/src/devices.c:90
+#. 2
+#: ../cli/src/connections.c:78 ../cli/src/devices.c:65
+#: ../cli/src/devices.c:101 ../cli/src/devices.c:225
 msgid "TYPE"
 msgstr "TIPO"
 
-#. 3
+#. 2
 #: ../cli/src/connections.c:79
 msgid "TIMESTAMP"
 msgstr "MARCA DE TIEMPO"
 
-#. 4
+#. 3
 #: ../cli/src/connections.c:80
 msgid "TIMESTAMP-REAL"
 msgstr "MARCA DE TIEMPO-REAL"
 
-#. 5
+#. 4
 #: ../cli/src/connections.c:81
 msgid "AUTOCONNECT"
 msgstr "AUTOCONECTAR"
 
-#. 6
+#. 5
 #: ../cli/src/connections.c:82
 msgid "READONLY"
 msgstr "SÓLOLECTURA"
 
-#. 7
-#: ../cli/src/connections.c:83
-msgid "DBUS-PATH"
-msgstr "RUTA-DBUS"
-
-#: ../cli/src/connections.c:159
-#, c-format
+#: ../cli/src/connections.c:166
+#, c-format
+#| msgid ""
+#| "Usage: nmcli con { COMMAND | help }\n"
+#| "  COMMAND := { list | status | up | down }\n"
+#| "\n"
+#| "  list [id <id> | uuid <id> | system | user]\n"
+#| "  status\n"
+#| "  up id <id> | uuid <id> [iface <iface>] [ap <hwaddr>] [--nowait] [--"
+#| "timeout <timeout>]\n"
+#| "  down id <id> | uuid <id>\n"
 msgid ""
 "Usage: nmcli con { COMMAND | help }\n"
 "  COMMAND := { list | status | up | down }\n"
 "\n"
-"  list [id <id> | uuid <id> | system | user]\n"
+"  list [id <id> | uuid <id>]\n"
 "  status\n"
+"  up id <id> | uuid <id> [iface <iface>] [ap <hwaddr>] [nsp <name>] [--"
+"nowait] [--timeout <timeout>]\n"
 "  up id <id> | uuid <id> [iface <iface>] [ap <hwaddr>] [--nowait] [--timeout "
 "<timeout>]\n"
 "  down id <id> | uuid <id>\n"
 msgstr ""
-"Uso: nmcli con { COMMAND | help }\n"
-"  COMMAND := { list | status | up | down }\n"
+"Uso: nmcli con { COMANDO | help }\n"
+"  COMANDO := { list | status | up | down }\n"
 "\n"
-"  list [id <id> | uuid <id> | system | user]\n"
+"  list [id <id> | uuid <id>]\n"
 "  status\n"
+"  up id <id> | uuid <id> [iface <iface>] [ap <hwaddr>] [nsp <name>] [--"
+"nowait] [--timeout <timeout>]\n"
 "  up id <id> | uuid <id> [iface <iface>] [ap <hwaddr>] [--nowait] [--timeout "
 "<timeout>]\n"
 "  down id <id> | uuid <id>\n"
 
-#: ../cli/src/connections.c:199 ../cli/src/connections.c:540
+#: ../cli/src/connections.c:219 ../cli/src/connections.c:541
 #, c-format
 msgid "Error: 'con list': %s"
 msgstr "Error: «con list»: %s"
 
-#: ../cli/src/connections.c:201 ../cli/src/connections.c:542
+#: ../cli/src/connections.c:221 ../cli/src/connections.c:543
 #, c-format
 msgid "Error: 'con list': %s; allowed fields: %s"
 msgstr "Error: «con list»: %s; campos permitidos: %s"
 
-#: ../cli/src/connections.c:209
+#: ../cli/src/connections.c:229
 msgid "Connection details"
 msgstr "Detalles de conexiones"
 
-#: ../cli/src/connections.c:384 ../cli/src/connections.c:605
-msgid "system"
-msgstr "sistema"
-
-#: ../cli/src/connections.c:384 ../cli/src/connections.c:605
-msgid "user"
-msgstr "usuario"
-
-#: ../cli/src/connections.c:386
+#: ../cli/src/connections.c:416
 msgid "never"
 msgstr "nunca"
 
 #. "CAPABILITIES"
 #. Print header
 #. "WIFI-PROPERTIES"
-#: ../cli/src/connections.c:387 ../cli/src/connections.c:388
-#: ../cli/src/connections.c:606 ../cli/src/connections.c:609
-#: ../cli/src/devices.c:432 ../cli/src/devices.c:557 ../cli/src/devices.c:583
-#: ../cli/src/devices.c:584 ../cli/src/devices.c:585 ../cli/src/devices.c:586
-#: ../cli/src/devices.c:587 ../cli/src/settings.c:508
-#: ../cli/src/settings.c:551 ../cli/src/settings.c:652
-#: ../cli/src/settings.c:926 ../cli/src/settings.c:927
-#: ../cli/src/settings.c:929 ../cli/src/settings.c:931
-#: ../cli/src/settings.c:1056 ../cli/src/settings.c:1057
-#: ../cli/src/settings.c:1058 ../cli/src/settings.c:1137
-#: ../cli/src/settings.c:1138 ../cli/src/settings.c:1139
-#: ../cli/src/settings.c:1140 ../cli/src/settings.c:1141
-#: ../cli/src/settings.c:1142 ../cli/src/settings.c:1143
-#: ../cli/src/settings.c:1144 ../cli/src/settings.c:1145
-#: ../cli/src/settings.c:1146 ../cli/src/settings.c:1147
-#: ../cli/src/settings.c:1148 ../cli/src/settings.c:1149
-#: ../cli/src/settings.c:1224
+#: ../cli/src/connections.c:417 ../cli/src/connections.c:418
+#: ../cli/src/connections.c:596 ../cli/src/connections.c:598
+#: ../cli/src/devices.c:507 ../cli/src/devices.c:560 ../cli/src/devices.c:685
+#: ../cli/src/devices.c:711 ../cli/src/devices.c:712 ../cli/src/devices.c:713
+#: ../cli/src/devices.c:714 ../cli/src/devices.c:715 ../cli/src/settings.c:518
+#: ../cli/src/settings.c:561 ../cli/src/settings.c:661
+#: ../cli/src/settings.c:935 ../cli/src/settings.c:936
+#: ../cli/src/settings.c:938 ../cli/src/settings.c:940
+#: ../cli/src/settings.c:1065 ../cli/src/settings.c:1066
+#: ../cli/src/settings.c:1067 ../cli/src/settings.c:1146
+#: ../cli/src/settings.c:1147 ../cli/src/settings.c:1148
+#: ../cli/src/settings.c:1149 ../cli/src/settings.c:1150
+#: ../cli/src/settings.c:1151 ../cli/src/settings.c:1152
+#: ../cli/src/settings.c:1153 ../cli/src/settings.c:1154
+#: ../cli/src/settings.c:1155 ../cli/src/settings.c:1156
+#: ../cli/src/settings.c:1157 ../cli/src/settings.c:1158
+#: ../cli/src/settings.c:1233
 msgid "yes"
 msgstr "sí"
 
-#: ../cli/src/connections.c:387 ../cli/src/connections.c:388
-#: ../cli/src/connections.c:606 ../cli/src/connections.c:609
-#: ../cli/src/devices.c:432 ../cli/src/devices.c:557 ../cli/src/devices.c:583
-#: ../cli/src/devices.c:584 ../cli/src/devices.c:585 ../cli/src/devices.c:586
-#: ../cli/src/devices.c:587 ../cli/src/settings.c:508
-#: ../cli/src/settings.c:510 ../cli/src/settings.c:551
-#: ../cli/src/settings.c:652 ../cli/src/settings.c:926
-#: ../cli/src/settings.c:927 ../cli/src/settings.c:929
-#: ../cli/src/settings.c:931 ../cli/src/settings.c:1056
-#: ../cli/src/settings.c:1057 ../cli/src/settings.c:1058
-#: ../cli/src/settings.c:1137 ../cli/src/settings.c:1138
-#: ../cli/src/settings.c:1139 ../cli/src/settings.c:1140
-#: ../cli/src/settings.c:1141 ../cli/src/settings.c:1142
-#: ../cli/src/settings.c:1143 ../cli/src/settings.c:1144
-#: ../cli/src/settings.c:1145 ../cli/src/settings.c:1146
-#: ../cli/src/settings.c:1147 ../cli/src/settings.c:1148
-#: ../cli/src/settings.c:1149 ../cli/src/settings.c:1224
+#: ../cli/src/connections.c:417 ../cli/src/connections.c:418
+#: ../cli/src/connections.c:596 ../cli/src/connections.c:598
+#: ../cli/src/devices.c:507 ../cli/src/devices.c:560 ../cli/src/devices.c:685
+#: ../cli/src/devices.c:711 ../cli/src/devices.c:712 ../cli/src/devices.c:713
+#: ../cli/src/devices.c:714 ../cli/src/devices.c:715 ../cli/src/settings.c:518
+#: ../cli/src/settings.c:520 ../cli/src/settings.c:561
+#: ../cli/src/settings.c:661 ../cli/src/settings.c:935
+#: ../cli/src/settings.c:936 ../cli/src/settings.c:938
+#: ../cli/src/settings.c:940 ../cli/src/settings.c:1065
+#: ../cli/src/settings.c:1066 ../cli/src/settings.c:1067
+#: ../cli/src/settings.c:1146 ../cli/src/settings.c:1147
+#: ../cli/src/settings.c:1148 ../cli/src/settings.c:1149
+#: ../cli/src/settings.c:1150 ../cli/src/settings.c:1151
+#: ../cli/src/settings.c:1152 ../cli/src/settings.c:1153
+#: ../cli/src/settings.c:1154 ../cli/src/settings.c:1155
+#: ../cli/src/settings.c:1156 ../cli/src/settings.c:1157
+#: ../cli/src/settings.c:1158 ../cli/src/settings.c:1233
 msgid "no"
 msgstr "no"
 
-#: ../cli/src/connections.c:461 ../cli/src/connections.c:504
-msgid "System connections"
-msgstr "Conexiones de sistema"
+#: ../cli/src/connections.c:492
+#| msgid "Connection details"
+msgid "Connection list"
+msgstr "Lista de conexiones"
 
-#: ../cli/src/connections.c:466 ../cli/src/connections.c:517
-msgid "User connections"
-msgstr "Conexiones de usuario"
-
-#: ../cli/src/connections.c:478 ../cli/src/connections.c:1338
-#: ../cli/src/connections.c:1354 ../cli/src/connections.c:1363
-#: ../cli/src/connections.c:1374 ../cli/src/connections.c:1459
-#: ../cli/src/devices.c:962 ../cli/src/devices.c:972 ../cli/src/devices.c:1074
-#: ../cli/src/devices.c:1081
+#: ../cli/src/connections.c:505 ../cli/src/connections.c:1457
+#: ../cli/src/connections.c:1472 ../cli/src/connections.c:1481
+#: ../cli/src/connections.c:1491 ../cli/src/connections.c:1503
+#: ../cli/src/connections.c:1598 ../cli/src/devices.c:1188
+#: ../cli/src/devices.c:1198 ../cli/src/devices.c:1312
+#: ../cli/src/devices.c:1319 ../cli/src/devices.c:1532
+#: ../cli/src/devices.c:1539
 #, c-format
 msgid "Error: %s argument is missing."
 msgstr "Error: falta el argumento %s."
 
-#: ../cli/src/connections.c:491
+#: ../cli/src/connections.c:518
 #, c-format
 msgid "Error: %s - no such connection."
 msgstr "Error: %s - no hay tal conexión."
 
-#: ../cli/src/connections.c:523 ../cli/src/connections.c:1387
-#: ../cli/src/connections.c:1477 ../cli/src/devices.c:785
-#: ../cli/src/devices.c:852 ../cli/src/devices.c:986 ../cli/src/devices.c:1087
+#: ../cli/src/connections.c:524 ../cli/src/connections.c:1516
+#: ../cli/src/connections.c:1615 ../cli/src/devices.c:985
+#: ../cli/src/devices.c:1065 ../cli/src/devices.c:1212
+#: ../cli/src/devices.c:1325 ../cli/src/devices.c:1545
 #, c-format
 msgid "Unknown parameter: %s\n"
 msgstr "Parámetro desconocido: %s\n"
 
-#: ../cli/src/connections.c:532
+#: ../cli/src/connections.c:533
 #, c-format
 msgid "Error: no valid parameter specified."
 msgstr "Error: no se especificó un parámetro válido."
 
-#: ../cli/src/connections.c:547 ../cli/src/connections.c:1580
-#: ../cli/src/devices.c:1293 ../cli/src/network-manager.c:359
+#: ../cli/src/connections.c:548 ../cli/src/connections.c:1706
+#: ../cli/src/devices.c:1753 ../cli/src/network-manager.c:461
 #, c-format
 msgid "Error: %s."
 msgstr "Error: %s."
 
-#: ../cli/src/connections.c:653
+#: ../cli/src/connections.c:636
 #, c-format
 msgid "Error: 'con status': %s"
 msgstr "Error: «con status»: %s"
 
-#: ../cli/src/connections.c:655
+#: ../cli/src/connections.c:638
 #, c-format
 msgid "Error: 'con status': %s; allowed fields: %s"
 msgstr "Error: «con status»: %s; campos permitidos: %s"
 
-#: ../cli/src/connections.c:662
+#: ../cli/src/connections.c:646 ../cli/src/connections.c:1531
+#: ../cli/src/connections.c:1630 ../cli/src/devices.c:1012
+#: ../cli/src/devices.c:1074 ../cli/src/devices.c:1227
+#: ../cli/src/devices.c:1355 ../cli/src/devices.c:1574
+#, c-format
+#| msgid "Error: Could not connect to NetworkManager."
+msgid "Error: Can't find out if NetworkManager is running: %s."
+msgstr "Error: no se puede saber si NetworkManager se está ejecutando: %s."
+
+#: ../cli/src/connections.c:650 ../cli/src/connections.c:1535
+#: ../cli/src/connections.c:1634 ../cli/src/devices.c:1016
+#: ../cli/src/devices.c:1078 ../cli/src/devices.c:1231
+#: ../cli/src/devices.c:1359 ../cli/src/devices.c:1578
+#, c-format
+#| msgid "NetworkManager status"
+msgid "Error: NetworkManager is not running."
+msgstr "Error: NetworkManager no se está ejecutando."
+
+#: ../cli/src/connections.c:658
 msgid "Active connections"
 msgstr "Conexiones activas"
 
-#: ../cli/src/connections.c:1030
+#: ../cli/src/connections.c:1128
 #, c-format
 msgid "no active connection on device '%s'"
 msgstr "conexión no activa en el dispositivo «%s»"
 
-#: ../cli/src/connections.c:1038
+#: ../cli/src/connections.c:1136
 #, c-format
 msgid "no active connection or device"
 msgstr "conexión o dispositivo no activo"
 
-#: ../cli/src/connections.c:1088
+#: ../cli/src/connections.c:1207
 #, c-format
 msgid "device '%s' not compatible with connection '%s'"
 msgstr "dispositivo «%s» incompatible con conexión «%s»"
 
-#: ../cli/src/connections.c:1090
+#: ../cli/src/connections.c:1209
 #, c-format
 msgid "no device found for connection '%s'"
 msgstr "no se encontró dispositivo para conexión «%s»"
 
-#: ../cli/src/connections.c:1101
+#: ../cli/src/connections.c:1220
 msgid "activating"
 msgstr "activando"
 
-#: ../cli/src/connections.c:1103
+#: ../cli/src/connections.c:1222
 msgid "activated"
 msgstr "activada"
 
-#: ../cli/src/connections.c:1106 ../cli/src/connections.c:1129
-#: ../cli/src/connections.c:1162 ../cli/src/devices.c:246
-#: ../cli/src/devices.c:558 ../cli/src/network-manager.c:94
-#: ../cli/src/network-manager.c:149 ../cli/src/settings.c:473
+#: ../cli/src/connections.c:1225 ../cli/src/connections.c:1248
+#: ../cli/src/connections.c:1281 ../cli/src/devices.c:306
+#: ../cli/src/devices.c:686 ../cli/src/network-manager.c:116
+#: ../cli/src/network-manager.c:178 ../cli/src/network-manager.c:181
+#: ../cli/src/network-manager.c:296 ../cli/src/network-manager.c:351
+#: ../cli/src/network-manager.c:389 ../cli/src/network-manager.c:428
+#: ../cli/src/settings.c:483 ../cli/src/utils.c:396
 msgid "unknown"
 msgstr "desconocido"
 
-#: ../cli/src/connections.c:1115
+#: ../cli/src/connections.c:1234
 msgid "VPN connecting (prepare)"
 msgstr "Conectando VPN (preparar)"
 
-#: ../cli/src/connections.c:1117
+#: ../cli/src/connections.c:1236
 msgid "VPN connecting (need authentication)"
 msgstr "Conectando VPN (necesita autenticación)"
 
-#: ../cli/src/connections.c:1119
+#: ../cli/src/connections.c:1238
 msgid "VPN connecting"
 msgstr "Conectando VPN"
 
-#: ../cli/src/connections.c:1121
+#: ../cli/src/connections.c:1240
 msgid "VPN connecting (getting IP configuration)"
 msgstr "Conectando VPN (obteniendo configuración IP)"
 
-#: ../cli/src/connections.c:1123
+#: ../cli/src/connections.c:1242
 msgid "VPN connected"
 msgstr "VPN conectada"
 
-#: ../cli/src/connections.c:1125
+#: ../cli/src/connections.c:1244
 msgid "VPN connection failed"
 msgstr "Falló la conexión VPN"
 
-#: ../cli/src/connections.c:1127
+#: ../cli/src/connections.c:1246
 msgid "VPN disconnected"
 msgstr "VPN desconectada"
 
-#: ../cli/src/connections.c:1138
+#: ../cli/src/connections.c:1257
 msgid "unknown reason"
 msgstr "razón desconocida"
 
-#: ../cli/src/connections.c:1140
+#: ../cli/src/connections.c:1259
 msgid "none"
 msgstr "ninguna"
 
-#: ../cli/src/connections.c:1142
+#: ../cli/src/connections.c:1261
 msgid "the user was disconnected"
 msgstr "el usuario estaba desconectado"
 
-#: ../cli/src/connections.c:1144
+#: ../cli/src/connections.c:1263
 msgid "the base network connection was interrupted"
 msgstr "se interrumpió la conexión de red de base"
 
-#: ../cli/src/connections.c:1146
+#: ../cli/src/connections.c:1265
 msgid "the VPN service stopped unexpectedly"
 msgstr "el servicio VPN se detuvo inesperadamente"
 
-#: ../cli/src/connections.c:1148
+#: ../cli/src/connections.c:1267
 msgid "the VPN service returned invalid configuration"
 msgstr "el servicio VPN retornó una configuración no válida"
 
-#: ../cli/src/connections.c:1150
+#: ../cli/src/connections.c:1269
 msgid "the connection attempt timed out"
 msgstr "se agotaron los intentos de conexión"
 
-#: ../cli/src/connections.c:1152
+#: ../cli/src/connections.c:1271
 msgid "the VPN service did not start in time"
 msgstr "el servicio VPN no inició a tiempo"
 
-#: ../cli/src/connections.c:1154
+#: ../cli/src/connections.c:1273
 msgid "the VPN service failed to start"
 msgstr "el servicio VPN falló en el inicio"
 
-#: ../cli/src/connections.c:1156
+#: ../cli/src/connections.c:1275
 msgid "no valid VPN secrets"
 msgstr "secretos VPN inválidos"
 
-#: ../cli/src/connections.c:1158
+#: ../cli/src/connections.c:1277
 msgid "invalid VPN secrets"
 msgstr "secretos VPN válidos"
 
-#: ../cli/src/connections.c:1160
+#: ../cli/src/connections.c:1279
 msgid "the connection was removed"
 msgstr "se eliminó la conexión"
 
-#: ../cli/src/connections.c:1174
+#: ../cli/src/connections.c:1293
 #, c-format
 msgid "state: %s\n"
 msgstr "estado: %s\n"
 
-#: ../cli/src/connections.c:1177 ../cli/src/connections.c:1203
+#: ../cli/src/connections.c:1296 ../cli/src/connections.c:1322
 #, c-format
 msgid "Connection activated\n"
 msgstr "Conexión activada\n"
 
-#: ../cli/src/connections.c:1180
+#: ../cli/src/connections.c:1299
 #, c-format
 msgid "Error: Connection activation failed."
 msgstr "Error: falló la activación de la conexión."
 
-#: ../cli/src/connections.c:1199
+#: ../cli/src/connections.c:1318
 #, c-format
 msgid "state: %s (%d)\n"
 msgstr "estado: %s (%d)\n"
 
-#: ../cli/src/connections.c:1209
+#: ../cli/src/connections.c:1328
 #, c-format
 msgid "Error: Connection activation failed: %s."
 msgstr "Error: falló la activación de la conexión: %s."
 
-#: ../cli/src/connections.c:1226 ../cli/src/devices.c:909
+#: ../cli/src/connections.c:1345 ../cli/src/devices.c:1134
 #, c-format
 msgid "Error: Timeout %d sec expired."
 msgstr "Error: expiró la pausa de %d segundos."
 
-#: ../cli/src/connections.c:1269
+#: ../cli/src/connections.c:1388
 #, c-format
 msgid "Error: Connection activation failed: %s"
 msgstr "Error: falló la activación de la conexión: %s"
 
-#: ../cli/src/connections.c:1283
+#: ../cli/src/connections.c:1402
 #, c-format
 msgid "Error: Obtaining active connection for '%s' failed."
 msgstr "Error: falló la obtención de conexión activa para «%s»."
 
-#: ../cli/src/connections.c:1292
+#: ../cli/src/connections.c:1411
 #, c-format
 msgid "Active connection state: %s\n"
 msgstr "Estado de la conexión activa: %s\n"
 
-#: ../cli/src/connections.c:1293
+#: ../cli/src/connections.c:1412
 #, c-format
 msgid "Active connection path: %s\n"
 msgstr "Ruta de la conexión activa: %s\n"
 
-#: ../cli/src/connections.c:1347 ../cli/src/connections.c:1468
+#: ../cli/src/connections.c:1465 ../cli/src/connections.c:1606
 #, c-format
 msgid "Error: Unknown connection: %s."
 msgstr "Error: conexión desconocida: %s."
 
-#: ../cli/src/connections.c:1382 ../cli/src/devices.c:980
+#: ../cli/src/connections.c:1511 ../cli/src/devices.c:1206
 #, c-format
 msgid "Error: timeout value '%s' is not valid."
 msgstr "Error: valor de pausa «%s» inválido."
 
-#: ../cli/src/connections.c:1395 ../cli/src/connections.c:1485
+#: ../cli/src/connections.c:1524 ../cli/src/connections.c:1623
 #, c-format
 msgid "Error: id or uuid has to be specified."
 msgstr "Error: se debe especificar un id o uuid."
 
-#: ../cli/src/connections.c:1415
+#: ../cli/src/connections.c:1554
 #, c-format
 msgid "Error: No suitable device found: %s."
 msgstr "Error: no se encontró un dispositivo apropiado: %s."
 
-#: ../cli/src/connections.c:1417
+#: ../cli/src/connections.c:1556
 #, c-format
 msgid "Error: No suitable device found."
 msgstr "Error: no se encontró un dispositivo apropiado."
 
-#: ../cli/src/connections.c:1512
+#: ../cli/src/connections.c:1659
 #, c-format
 msgid "Warning: Connection not active\n"
 msgstr "Advertencia: conexión inactiva\n"
 
-#: ../cli/src/connections.c:1569
+#: ../cli/src/connections.c:1697
 #, c-format
 msgid "Error: 'con' command '%s' is not valid."
 msgstr "Error: comando «con» «%s» no es válido."
 
-#: ../cli/src/connections.c:1605
+#: ../cli/src/connections.c:1762
 #, c-format
 msgid "Error: could not connect to D-Bus."
 msgstr "Error: no se pudo conectar con D-Bus."
 
-#: ../cli/src/connections.c:1612
+#: ../cli/src/connections.c:1769
 #, c-format
 msgid "Error: Could not get system settings."
 msgstr "Error: no se pudo obtener configuración de sistema."
 
-#: ../cli/src/connections.c:1620
+#: ../cli/src/connections.c:1779
 #, c-format
-msgid "Error: Could not get user settings."
-msgstr "Error: No se pudo obtener configuración de usuario."
-
-#: ../cli/src/connections.c:1630
-#, c-format
-msgid "Error: Can't obtain connections: settings services are not running."
+#| msgid "Error: Can't obtain connections: settings services are not running."
+msgid "Error: Can't obtain connections: settings service is not running."
 msgstr ""
-"Error: no se pudieron obtener conexiones: servicios de configuración no se "
-"están ejecutando."
+"Error: no se pueden obtener conexiones: el servicio de configuración no se "
+"está ejecutando."
 
 #. 0
 #. 9
-#: ../cli/src/devices.c:61 ../cli/src/devices.c:89 ../cli/src/devices.c:184
+#. 3
+#: ../cli/src/devices.c:64 ../cli/src/devices.c:100 ../cli/src/devices.c:210
+#: ../cli/src/devices.c:226
 msgid "DEVICE"
 msgstr "DISPOSITIVO"
 
 #. 1
 #. 4
-#. 0
-#: ../cli/src/devices.c:63 ../cli/src/devices.c:93
-#: ../cli/src/network-manager.c:36
+#. 1
+#: ../cli/src/devices.c:66 ../cli/src/devices.c:104
+#: ../cli/src/network-manager.c:37
 msgid "STATE"
 msgstr "ESTADO"
 
-#: ../cli/src/devices.c:72
+#: ../cli/src/devices.c:76
 msgid "GENERAL"
 msgstr "GENERAL"
 
 #. 0
-#: ../cli/src/devices.c:73
+#: ../cli/src/devices.c:77
 msgid "CAPABILITIES"
 msgstr "FUNCIONALIDADES"
 
 #. 1
-#: ../cli/src/devices.c:74
+#: ../cli/src/devices.c:78
 msgid "WIFI-PROPERTIES"
 msgstr "PROPIEDADES-WIFI"
 
 #. 2
-#: ../cli/src/devices.c:75
+#: ../cli/src/devices.c:79
 msgid "AP"
 msgstr "AP"
 
 #. 3
-#: ../cli/src/devices.c:76
+#: ../cli/src/devices.c:80
 msgid "WIRED-PROPERTIES"
 msgstr "PROPIEDADES ALÁMBRICAS"
 
 #. 4
-#: ../cli/src/devices.c:77
+#: ../cli/src/devices.c:81
+#| msgid "WIFI-PROPERTIES"
+msgid "WIMAX-PROPERTIES"
+msgstr "PROPIEDADES-WIMAX"
+
+#. 5
+#. 0
+#: ../cli/src/devices.c:82 ../cli/src/devices.c:223
+#| msgid "DNS"
+msgid "NSP"
+msgstr "PSR"
+
+#. 6
+#: ../cli/src/devices.c:83
 msgid "IP4-SETTINGS"
 msgstr "CONFIGURACIONES IP4"
 
-#. 5
-#: ../cli/src/devices.c:78
+#. 7
+#: ../cli/src/devices.c:84
 msgid "IP4-DNS"
 msgstr "DNS IP4"
 
-#. 6
-#: ../cli/src/devices.c:79
+#. 8
+#: ../cli/src/devices.c:85
 msgid "IP6-SETTINGS"
 msgstr "CONFIGURACIONES IP6"
 
-#. 7
-#: ../cli/src/devices.c:80
+#. 9
+#: ../cli/src/devices.c:86
 msgid "IP6-DNS"
 msgstr "DNS IP6"
 
 #. 2
-#: ../cli/src/devices.c:91
+#: ../cli/src/devices.c:102
 msgid "DRIVER"
 msgstr "CONTROLADOR"
 
 #. 3
-#: ../cli/src/devices.c:92
+#: ../cli/src/devices.c:103
 msgid "HWADDR"
 msgstr "HWADDR"
 
 #. 0
-#: ../cli/src/devices.c:102
+#: ../cli/src/devices.c:113
 msgid "CARRIER-DETECT"
 msgstr "DETECTAR-PORTADOR"
 
 #. 1
-#: ../cli/src/devices.c:103
+#: ../cli/src/devices.c:114
 msgid "SPEED"
 msgstr "VELOCIDAD"
 
 #. 0
-#: ../cli/src/devices.c:112
+#: ../cli/src/devices.c:123
 msgid "CARRIER"
 msgstr "PORTADOR"
 
 #. 0
-#: ../cli/src/devices.c:122
+#: ../cli/src/devices.c:133
 msgid "WEP"
 msgstr "WEP"
 
 #. 1
-#: ../cli/src/devices.c:123
+#: ../cli/src/devices.c:134
 msgid "WPA"
 msgstr "WPA"
 
 #. 2
-#: ../cli/src/devices.c:124
+#: ../cli/src/devices.c:135
 msgid "WPA2"
 msgstr "WPA2"
 
 #. 3
-#: ../cli/src/devices.c:125
+#: ../cli/src/devices.c:136
 msgid "TKIP"
 msgstr "TKIP"
 
 #. 4
-#: ../cli/src/devices.c:126
+#: ../cli/src/devices.c:137
 msgid "CCMP"
 msgstr "CCMP"
 
 #. 0
-#: ../cli/src/devices.c:135 ../cli/src/devices.c:146
+#: ../cli/src/devices.c:147
+#| msgid "FREQ"
+msgid "CTR-FREQ"
+msgstr "CTR-FREC"
+
+#. 1
+#: ../cli/src/devices.c:148
+#| msgid "SSID"
+msgid "RSSI"
+msgstr "RSSI"
+
+#. 2
+#: ../cli/src/devices.c:149
+msgid "CINR"
+msgstr "CINR"
+
+#. 3
+#: ../cli/src/devices.c:150
+msgid "TX-POW"
+msgstr "TX-POW"
+
+#. 4
+#: ../cli/src/devices.c:151
+#| msgid "BSSID"
+msgid "BSID"
+msgstr "BSID"
+
+#. 0
+#: ../cli/src/devices.c:161 ../cli/src/devices.c:172
 msgid "ADDRESS"
 msgstr "DIRECCIÓN"
 
 #. 1
-#: ../cli/src/devices.c:136 ../cli/src/devices.c:147
+#: ../cli/src/devices.c:162 ../cli/src/devices.c:173
 msgid "PREFIX"
 msgstr "PREFIJO"
 
 #. 2
-#: ../cli/src/devices.c:137 ../cli/src/devices.c:148
+#: ../cli/src/devices.c:163 ../cli/src/devices.c:174
 msgid "GATEWAY"
 msgstr "PUERTA DE ENLACE"
 
 #. 0
-#: ../cli/src/devices.c:157 ../cli/src/devices.c:166
+#: ../cli/src/devices.c:183 ../cli/src/devices.c:192
 msgid "DNS"
 msgstr "DNS"
 
 #. 0
-#: ../cli/src/devices.c:175
+#: ../cli/src/devices.c:201
 msgid "SSID"
 msgstr "SSID"
 
 #. 1
-#: ../cli/src/devices.c:176
+#: ../cli/src/devices.c:202
 msgid "BSSID"
 msgstr "BSSID"
 
 #. 2
-#: ../cli/src/devices.c:177
+#: ../cli/src/devices.c:203
 msgid "MODE"
 msgstr "MODO"
 
 #. 3
-#: ../cli/src/devices.c:178
+#: ../cli/src/devices.c:204
 msgid "FREQ"
 msgstr "FREC"
 
 #. 4
-#: ../cli/src/devices.c:179
+#: ../cli/src/devices.c:205
 msgid "RATE"
 msgstr "TASA"
 
 #. 5
-#: ../cli/src/devices.c:180
+#. 1
+#: ../cli/src/devices.c:206 ../cli/src/devices.c:224
 msgid "SIGNAL"
 msgstr "SEÑAL"
 
 #. 6
-#: ../cli/src/devices.c:181
+#: ../cli/src/devices.c:207
 msgid "SECURITY"
 msgstr "SEGURIDAD"
 
 #. 7
-#: ../cli/src/devices.c:182
+#: ../cli/src/devices.c:208
 msgid "WPA-FLAGS"
 msgstr "INDICADORES-WPA"
 
 #. 8
-#: ../cli/src/devices.c:183
+#: ../cli/src/devices.c:209
 msgid "RSN-FLAGS"
 msgstr "INDICADORES-RSN"
 
 #. 10
-#: ../cli/src/devices.c:185
+#. 4
+#: ../cli/src/devices.c:211 ../cli/src/devices.c:227
 msgid "ACTIVE"
 msgstr "ACTIVO"
 
-#: ../cli/src/devices.c:208
-#, c-format
+#: ../cli/src/devices.c:254
+#, c-format
+#| msgid ""
+#| "Usage: nmcli dev { COMMAND | help }\n"
+#| "\n"
+#| "  COMMAND := { status | list | disconnect | wifi }\n"
+#| "\n"
+#| "  status\n"
+#| "  list [iface <iface>]\n"
+#| "  disconnect iface <iface> [--nowait] [--timeout <timeout>]\n"
+#| "  wifi [list [iface <iface>] [hwaddr <hwaddr>]]\n"
+#| "\n"
 msgid ""
 "Usage: nmcli dev { COMMAND | help }\n"
 "\n"
+"  COMMAND := { status | list | disconnect | wifi | wimax }\n"
+"\n"
 "  COMMAND := { status | list | disconnect | wifi }\n"
 "\n"
 "  status\n"
 "  list [iface <iface>]\n"
 "  disconnect iface <iface> [--nowait] [--timeout <timeout>]\n"
 "  wifi [list [iface <iface>] [hwaddr <hwaddr>]]\n"
+"  wimax [list [iface <iface>] [nsp <name>]]\n"
 "\n"
 msgstr ""
-"Uso: nmcli dev { COMMAND | help }\n"
+"Uso: nmcli dev { COMANDO | help }\n"
 "\n"
-"  COMMAND := { status | list | disconnect | wifi }\n"
+"  COMANDO := { status | list | disconnect | wifi }\n"
 "\n"
 "  status\n"
 "  list [iface <iface>]\n"
 "  disconnect iface <iface> [--nowait] [--timeout <timeout>]\n"
 "  wifi [list [iface <iface>] [hwaddr <hwaddr>]]\n"
+"  wimax [list [iface <iface>] [nsp <name>]]\n"
 "\n"
 
-#: ../cli/src/devices.c:228
+#: ../cli/src/devices.c:282
 msgid "unmanaged"
 msgstr "sin gestión"
 
-#: ../cli/src/devices.c:230
+#: ../cli/src/devices.c:284
 msgid "unavailable"
 msgstr "no disponible"
 
-#: ../cli/src/devices.c:232 ../cli/src/network-manager.c:91
+#: ../cli/src/devices.c:286 ../cli/src/network-manager.c:113
 msgid "disconnected"
 msgstr "desconectado"
 
-#: ../cli/src/devices.c:234
+#: ../cli/src/devices.c:288
 msgid "connecting (prepare)"
 msgstr "conectando (preparar)"
 
-#: ../cli/src/devices.c:236
+#: ../cli/src/devices.c:290
 msgid "connecting (configuring)"
 msgstr "conectando (configurando)"
 
-#: ../cli/src/devices.c:238
+#: ../cli/src/devices.c:292
 msgid "connecting (need authentication)"
 msgstr "conectando (necesita autenticación)"
 
-#: ../cli/src/devices.c:240
+#: ../cli/src/devices.c:294
 msgid "connecting (getting IP configuration)"
 msgstr "conectando (obteniendo configuración IP)"
 
-#: ../cli/src/devices.c:242 ../cli/src/network-manager.c:89
+#: ../cli/src/devices.c:296
+#| msgid "connecting (getting IP configuration)"
+msgid "connecting (checking IP connectivity)"
+msgstr "conectando (comprobando conectividad IP)"
+
+#: ../cli/src/devices.c:298
+#| msgid "connecting (getting IP configuration)"
+msgid "connecting (starting secondary connections)"
+msgstr "conectando (iniciando conexiones secundarias)"
+
+#: ../cli/src/devices.c:300 ../cli/src/network-manager.c:109
 msgid "connected"
 msgstr "conectado"
 
-#: ../cli/src/devices.c:244
+#: ../cli/src/devices.c:302
+#| msgid "activating"
+msgid "deactivating"
+msgstr "desactivando"
+
+#: ../cli/src/devices.c:304
 msgid "connection failed"
 msgstr "conexión falló"
 
-#: ../cli/src/devices.c:267 ../cli/src/devices.c:424
+#: ../cli/src/devices.c:329 ../cli/src/devices.c:339 ../cli/src/devices.c:499
+#: ../cli/src/devices.c:543
 msgid "Unknown"
 msgstr "desconocido"
 
-#: ../cli/src/devices.c:299
+#: ../cli/src/devices.c:372
 msgid "(none)"
 msgstr "(ninguno)"
 
-#: ../cli/src/devices.c:324
+#: ../cli/src/devices.c:397
 #, c-format
 msgid "%s: error converting IP4 address 0x%X"
 msgstr "%s: error convirtiendo dirección IP4 0x%X"
 
-#: ../cli/src/devices.c:393
+#: ../cli/src/devices.c:468
 #, c-format
 msgid "%u MHz"
 msgstr "%u MHz"
 
-#: ../cli/src/devices.c:394
+#: ../cli/src/devices.c:469
 #, c-format
 msgid "%u MB/s"
 msgstr "%u MB/s"
 
-#: ../cli/src/devices.c:403
+#: ../cli/src/devices.c:478
 msgid "Encrypted: "
 msgstr "Encriptado: "
 
-#: ../cli/src/devices.c:408
+#: ../cli/src/devices.c:483
 msgid "WEP "
 msgstr "WEP"
 
-#: ../cli/src/devices.c:410
+#: ../cli/src/devices.c:485
 msgid "WPA "
 msgstr "WPA"
 
-#: ../cli/src/devices.c:412
+#: ../cli/src/devices.c:487
 msgid "WPA2 "
 msgstr "WPA2"
 
-#: ../cli/src/devices.c:415
+#: ../cli/src/devices.c:490
 msgid "Enterprise "
 msgstr "Empresa"
 
-#: ../cli/src/devices.c:424
+#: ../cli/src/devices.c:499
 msgid "Ad-Hoc"
 msgstr "Ad-Hoc"
 
-#: ../cli/src/devices.c:424
+#: ../cli/src/devices.c:499
 msgid "Infrastructure"
 msgstr "Infraestructura"
 
-#: ../cli/src/devices.c:486
+#: ../cli/src/devices.c:534
+msgid "Home"
+msgstr "Casa"
+
+#: ../cli/src/devices.c:537
+msgid "Partner"
+msgstr "Asociado"
+
+#: ../cli/src/devices.c:540
+msgid "Roaming"
+msgstr "Roaming"
+
+#: ../cli/src/devices.c:610
 #, c-format
 msgid "Error: 'dev list': %s"
 msgstr "Error: «dev list»: %s"
 
-#: ../cli/src/devices.c:488
+#: ../cli/src/devices.c:612
 #, c-format
 msgid "Error: 'dev list': %s; allowed fields: %s"
 msgstr "Error: «dev list»: %s; campos permitidos: %s"
 
-#: ../cli/src/devices.c:497
+#: ../cli/src/devices.c:621
 msgid "Device details"
 msgstr "Detalles de los dispositivos"
 
-#: ../cli/src/devices.c:527 ../cli/src/devices.c:925
+#: ../cli/src/devices.c:655 ../cli/src/devices.c:1150 ../cli/src/utils.c:342
 msgid "(unknown)"
 msgstr "(desconocido)"
 
-#: ../cli/src/devices.c:528
+#: ../cli/src/devices.c:656
 msgid "unknown)"
 msgstr "desconocido"
 
-#: ../cli/src/devices.c:554
+#: ../cli/src/devices.c:682
 #, c-format
 msgid "%u Mb/s"
 msgstr "%u Mb/s"
 
 #. Print header
 #. "WIRED-PROPERTIES"
-#: ../cli/src/devices.c:627
+#: ../cli/src/devices.c:755
 msgid "on"
 msgstr "encendido"
 
-#: ../cli/src/devices.c:627
+#: ../cli/src/devices.c:755
 msgid "off"
 msgstr "apagado"
 
-#: ../cli/src/devices.c:808
+#: ../cli/src/devices.c:1002
 #, c-format
 msgid "Error: 'dev status': %s"
 msgstr "Error: «dev status»: %s"
 
-#: ../cli/src/devices.c:810
+#: ../cli/src/devices.c:1004
 #, c-format
 msgid "Error: 'dev status': %s; allowed fields: %s"
 msgstr "Error: «dev status»: %s; campos permitidos: %s"
 
-#: ../cli/src/devices.c:817
+#: ../cli/src/devices.c:1027
 msgid "Status of devices"
 msgstr "Estado de los dispositivos"
 
-#: ../cli/src/devices.c:845
+#: ../cli/src/devices.c:1058
 #, c-format
 msgid "Error: '%s' argument is missing."
 msgstr "Error: falta el argumento «%s»."
 
-#: ../cli/src/devices.c:874 ../cli/src/devices.c:1013
-#: ../cli/src/devices.c:1136
+#: ../cli/src/devices.c:1099 ../cli/src/devices.c:1251
+#: ../cli/src/devices.c:1387 ../cli/src/devices.c:1606
 #, c-format
 msgid "Error: Device '%s' not found."
 msgstr "Error: no se encontró el dispositivo «%s»."
 
-#: ../cli/src/devices.c:897
+#: ../cli/src/devices.c:1122
 #, c-format
 msgid "Success: Device '%s' successfully disconnected."
 msgstr "Éxito: dispositivo «%s» desconectado correctamente."
 
-#: ../cli/src/devices.c:922
+#: ../cli/src/devices.c:1147
 #, c-format
 msgid "Error: Device '%s' (%s) disconnecting failed: %s"
 msgstr "Error: falló la desconexión del dispositivo «%s» (%s): %s"
 
-#: ../cli/src/devices.c:930
+#: ../cli/src/devices.c:1155
 #, c-format
 msgid "Device state: %d (%s)\n"
 msgstr "Estado del dispositivo: %d (%s)\n"
 
-#: ../cli/src/devices.c:994
+#: ../cli/src/devices.c:1220
 #, c-format
 msgid "Error: iface has to be specified."
 msgstr "Error: se debe especificar iface."
 
-#: ../cli/src/devices.c:1112
+#: ../cli/src/devices.c:1345
 #, c-format
 msgid "Error: 'dev wifi': %s"
 msgstr "Error: «dev wifi» «%s»"
 
-#: ../cli/src/devices.c:1114
+#: ../cli/src/devices.c:1347
 #, c-format
 msgid "Error: 'dev wifi': %s; allowed fields: %s"
 msgstr "Error: «dev wifi»: %s; campos permitidos: %s"
 
-#: ../cli/src/devices.c:1121
+#: ../cli/src/devices.c:1370
 msgid "WiFi scan list"
 msgstr "lista de análisis WiFi"
 
-#: ../cli/src/devices.c:1156 ../cli/src/devices.c:1210
+#: ../cli/src/devices.c:1407 ../cli/src/devices.c:1461
+#: ../cli/src/devices.c:1668
 #, c-format
 msgid "Error: Access point with hwaddr '%s' not found."
 msgstr "Error: no se encontró el punto de acceso con hwaddr «%s»."
 
-#: ../cli/src/devices.c:1173
+#: ../cli/src/devices.c:1424
 #, c-format
 msgid "Error: Device '%s' is not a WiFi device."
 msgstr "Error: el dispositivo «%s» no es un dispositivo WiFi."
 
-#: ../cli/src/devices.c:1237
+#: ../cli/src/devices.c:1488
 #, c-format
 msgid "Error: 'dev wifi' command '%s' is not valid."
 msgstr "Error: comando «dev wifi» «%s» inválido."
 
-#: ../cli/src/devices.c:1284
+#: ../cli/src/devices.c:1564
+#, c-format
+#| msgid "Error: 'dev wifi': %s"
+msgid "Error: 'dev wimax': %s"
+msgstr "Error: «dev wimax» «%s»"
+
+#: ../cli/src/devices.c:1566
+#, c-format
+#| msgid "Error: 'dev wifi': %s; allowed fields: %s"
+msgid "Error: 'dev wimax': %s; allowed fields: %s"
+msgstr "Error: «dev wimax»: %s; campos permitidos: %s"
+
+#: ../cli/src/devices.c:1589
+msgid "WiMAX NSP list"
+msgstr "Lista PSR WiMAX"
+
+#: ../cli/src/devices.c:1626
+#, c-format
+#| msgid "Error: Device '%s' not found."
+msgid "Error: NSP with name '%s' not found."
+msgstr "Error: no se encontró el PSR con el nombre «%s»."
+
+#: ../cli/src/devices.c:1637
+#, c-format
+#| msgid "Error: Device '%s' is not a WiFi device."
+msgid "Error: Device '%s' is not a WiMAX device."
+msgstr "Error: el dispositivo «%s» no es un dispositivo WiMAX."
+
+#: ../cli/src/devices.c:1695
+#, c-format
+#| msgid "Error: 'dev wifi' command '%s' is not valid."
+msgid "Error: 'dev wimax' command '%s' is not valid."
+msgstr "Error: comando «dev wimax» «%s» no válido."
+
+#: ../cli/src/devices.c:1745
 #, c-format
 msgid "Error: 'dev' command '%s' is not valid."
 msgstr "Error: comando «dev» «%s» no válido."
@@ -869,36 +1011,65 @@ msgstr "Error: comando «dev» «%s» no válido."
 msgid "RUNNING"
 msgstr "EJECUTANDO"
 
-#. 1
-#: ../cli/src/network-manager.c:37
-msgid "NET-ENABLED"
-msgstr "RED-ACTIVADA"
+#. 0
+#: ../cli/src/network-manager.c:36
+msgid "VERSION"
+msgstr "VERSIÓN"
 
 #. 2
 #: ../cli/src/network-manager.c:38
-msgid "WIFI-HARDWARE"
-msgstr "HARDWARE-WIFI"
+msgid "NET-ENABLED"
+msgstr "RED-ACTIVADA"
 
 #. 3
 #: ../cli/src/network-manager.c:39
-msgid "WIFI"
-msgstr "WIFI"
+msgid "WIFI-HARDWARE"
+msgstr "HARDWARE-WIFI"
 
 #. 4
 #: ../cli/src/network-manager.c:40
-msgid "WWAN-HARDWARE"
-msgstr "HARDWARE-WWAN"
+msgid "WIFI"
+msgstr "WIFI"
 
 #. 5
 #: ../cli/src/network-manager.c:41
+msgid "WWAN-HARDWARE"
+msgstr "HARDWARE-WWAN"
+
+#. 6
+#: ../cli/src/network-manager.c:42
 msgid "WWAN"
 msgstr "WWAN"
 
-#: ../cli/src/network-manager.c:64
-#, c-format
+#. 7
+#: ../cli/src/network-manager.c:43
+#| msgid "WIFI-HARDWARE"
+msgid "WIMAX-HARDWARE"
+msgstr "HARDWARE-WIMAX"
+
+#. 8
+#: ../cli/src/network-manager.c:44
+msgid "WIMAX"
+msgstr "WIMAX"
+
+#: ../cli/src/network-manager.c:72
+#, c-format
+#| msgid ""
+#| "Usage: nmcli nm { COMMAND | help }\n"
+#| "\n"
+#| "  COMMAND := { status | enable | sleep | wifi | wwan }\n"
+#| "\n"
+#| "  status\n"
+#| "  enable [true|false]\n"
+#| "  sleep [true|false]\n"
+#| "  wifi [on|off]\n"
+#| "  wwan [on|off]\n"
+#| "\n"
 msgid ""
 "Usage: nmcli nm { COMMAND | help }\n"
 "\n"
+"  COMMAND := { status | enable | sleep | wifi | wwan | wimax }\n"
+"\n"
 "  COMMAND := { status | enable | sleep | wifi | wwan }\n"
 "\n"
 "  status\n"
@@ -906,130 +1077,181 @@ msgid ""
 "  sleep [true|false]\n"
 "  wifi [on|off]\n"
 "  wwan [on|off]\n"
+"  wimax [on|off]\n"
 "\n"
 msgstr ""
-"Uso: nmcli nm { COMANDO | ayuda }\n"
+"Uso: nmcli nm { COMANDO | help }\n"
 "\n"
-"  COMANDO := { status | enable | sleep | wakeup | wifi | wwan }\n"
+"  COMANDO := { status | enable | sleep | wifi | wwan | wimax }\n"
 "\n"
-"  estado\n"
-"  activar [cierto|falso]\n"
-"  dormir\n"
-"  despertar\n"
-"  wifi [encendido|apagado]\n"
-"  wwan [encendido|apagado]\n"
+"  COMANDO := { status | enable | sleep | wifi | wwan }\n"
+"\n"
+"  status\n"
+"  enable [true|false]\n"
+"  sleep [true|false]\n"
+"  wifi [on|off]\n"
+"  wwan [on|off]\n"
+"  wimax [on|off]\n"
 "\n"
 
-#: ../cli/src/network-manager.c:85
+#: ../cli/src/network-manager.c:101
 msgid "asleep"
 msgstr "dormido"
 
-#: ../cli/src/network-manager.c:87
+#: ../cli/src/network-manager.c:103
 msgid "connecting"
 msgstr "conectando"
 
-#: ../cli/src/network-manager.c:128
+#: ../cli/src/network-manager.c:105
+msgid "connected (local only)"
+msgstr "conectado (sólo local)"
+
+#: ../cli/src/network-manager.c:107
+#| msgid "connected"
+msgid "connected (site only)"
+msgstr "conectado (sólo el sitio)"
+
+#: ../cli/src/network-manager.c:111
+#| msgid "connecting"
+msgid "disconnecting"
+msgstr "desconectando"
+
+#: ../cli/src/network-manager.c:151
 #, c-format
 msgid "Error: 'nm status': %s"
 msgstr "Error: «nm status»: %s"
 
-#: ../cli/src/network-manager.c:130
+#: ../cli/src/network-manager.c:153
 #, c-format
 msgid "Error: 'nm status': %s; allowed fields: %s"
 msgstr "Error: «nm status»: %s; campos permitidos: %s"
 
-#: ../cli/src/network-manager.c:137
-msgid "NetworkManager status"
-msgstr "Estado de NetworkManager"
-
-#. Print header
-#: ../cli/src/network-manager.c:144 ../cli/src/network-manager.c:145
-#: ../cli/src/network-manager.c:146 ../cli/src/network-manager.c:147
-#: ../cli/src/network-manager.c:154 ../cli/src/network-manager.c:247
-#: ../cli/src/network-manager.c:296 ../cli/src/network-manager.c:328
+#. create NMClient
+#: ../cli/src/network-manager.c:166 ../cli/src/network-manager.c:167
+#: ../cli/src/network-manager.c:168 ../cli/src/network-manager.c:169
+#: ../cli/src/network-manager.c:170 ../cli/src/network-manager.c:172
+#: ../cli/src/network-manager.c:173 ../cli/src/network-manager.c:294
+#: ../cli/src/network-manager.c:349 ../cli/src/network-manager.c:387
+#: ../cli/src/network-manager.c:426
 msgid "enabled"
 msgstr "activado"
 
-#: ../cli/src/network-manager.c:144 ../cli/src/network-manager.c:145
-#: ../cli/src/network-manager.c:146 ../cli/src/network-manager.c:147
-#: ../cli/src/network-manager.c:154 ../cli/src/network-manager.c:247
-#: ../cli/src/network-manager.c:296 ../cli/src/network-manager.c:328
+#: ../cli/src/network-manager.c:166 ../cli/src/network-manager.c:167
+#: ../cli/src/network-manager.c:168 ../cli/src/network-manager.c:169
+#: ../cli/src/network-manager.c:170 ../cli/src/network-manager.c:172
+#: ../cli/src/network-manager.c:173 ../cli/src/network-manager.c:294
+#: ../cli/src/network-manager.c:349 ../cli/src/network-manager.c:387
+#: ../cli/src/network-manager.c:426
 msgid "disabled"
 msgstr "desactivado"
 
-#: ../cli/src/network-manager.c:152
+#: ../cli/src/network-manager.c:186
+msgid "NetworkManager status"
+msgstr "Estado de NetworkManager"
+
+#. Print header
+#: ../cli/src/network-manager.c:189
 msgid "running"
 msgstr "ejecutando"
 
-#: ../cli/src/network-manager.c:152
+#: ../cli/src/network-manager.c:189
 msgid "not running"
 msgstr "no ejecutando"
 
-#: ../cli/src/network-manager.c:175
+#: ../cli/src/network-manager.c:220 ../cli/src/utils.c:322
 #, c-format
 msgid "Error: Couldn't connect to system bus: %s"
 msgstr "Error: no se pudo conectar con el bus del sistema: %s"
 
-#: ../cli/src/network-manager.c:186
+#: ../cli/src/network-manager.c:231
 #, c-format
 msgid "Error: Couldn't create D-Bus object proxy."
 msgstr "Error: no se pudo crear un objeto proxy en D-Bus."
 
-#: ../cli/src/network-manager.c:192
+#: ../cli/src/network-manager.c:237
 #, c-format
 msgid "Error in sleep: %s"
 msgstr "Error al dormir: %s"
 
-#: ../cli/src/network-manager.c:237 ../cli/src/network-manager.c:286
-#: ../cli/src/network-manager.c:318
+#: ../cli/src/network-manager.c:281 ../cli/src/network-manager.c:336
+#: ../cli/src/network-manager.c:374 ../cli/src/network-manager.c:413
 #, c-format
 msgid "Error: '--fields' value '%s' is not valid here; allowed fields: %s"
 msgstr "Error: «--fields» valor «%s» no es válido aquí; campos permitidos: %s"
 
-#: ../cli/src/network-manager.c:245
+#: ../cli/src/network-manager.c:289
 msgid "Networking enabled"
 msgstr "Red activada"
 
-#: ../cli/src/network-manager.c:256
+#: ../cli/src/network-manager.c:305
 #, c-format
 msgid "Error: invalid 'enable' parameter: '%s'; use 'true' or 'false'."
 msgstr "Error: parámetro «enable» inválido: «%s»; use «true» o «false»."
 
-#: ../cli/src/network-manager.c:265
+#: ../cli/src/network-manager.c:315
 #, c-format
 msgid "Error: Sleeping status is not exported by NetworkManager."
 msgstr "Error: NetworkManager no exporta el estado para dormir."
 
-#: ../cli/src/network-manager.c:273
+#: ../cli/src/network-manager.c:323
 #, c-format
 msgid "Error: invalid 'sleep' parameter: '%s'; use 'true' or 'false'."
 msgstr "Error: parámetro «wifi» inválido: «%s»."
 
-#: ../cli/src/network-manager.c:294
+#: ../cli/src/network-manager.c:344
 msgid "WiFi enabled"
 msgstr "WiFi activado"
 
-#: ../cli/src/network-manager.c:305
+#: ../cli/src/network-manager.c:360
 #, c-format
 msgid "Error: invalid 'wifi' parameter: '%s'."
 msgstr "Error: parámetro «wifi» inválido: «%s»."
 
-#: ../cli/src/network-manager.c:326
+#: ../cli/src/network-manager.c:382
 msgid "WWAN enabled"
 msgstr "WWAN activado"
 
-#: ../cli/src/network-manager.c:337
+#: ../cli/src/network-manager.c:398
 #, c-format
 msgid "Error: invalid 'wwan' parameter: '%s'."
 msgstr "Error: parámetro «wwan» inválido: «%s»."
 
-#: ../cli/src/network-manager.c:348
+#: ../cli/src/network-manager.c:421
+#| msgid "WiFi enabled"
+msgid "WiMAX enabled"
+msgstr "WiMAX activado"
+
+#: ../cli/src/network-manager.c:437
+#, c-format
+#| msgid "Error: invalid 'wifi' parameter: '%s'."
+msgid "Error: invalid 'wimax' parameter: '%s'."
+msgstr "Error: parámetro «wimax» inválido: «%s»."
+
+#: ../cli/src/network-manager.c:450
 #, c-format
 msgid "Error: 'nm' command '%s' is not valid."
 msgstr "Error: comando «nm» command «%s» inválido."
 
-#: ../cli/src/nmcli.c:69
-#, c-format
+#: ../cli/src/nmcli.c:64
+#, c-format
+#| msgid ""
+#| "Usage: %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"
+#| "  -v[ersion]                                 show program version\n"
+#| "  -h[elp]                                    print this help\n"
+#| "\n"
+#| "OBJECT\n"
+#| "  nm          NetworkManager status\n"
+#| "  con         NetworkManager connections\n"
+#| "  dev         devices managed by NetworkManager\n"
+#| "\n"
 msgid ""
 "Usage: %s [OPTIONS] OBJECT { COMMAND | help }\n"
 "\n"
@@ -1040,6 +1262,8 @@ msgid ""
 "  -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"
 "  -v[ersion]                                 show program version\n"
 "  -h[elp]                                    print this help\n"
 "\n"
@@ -1049,287 +1273,328 @@ msgid ""
 "  dev         devices managed by NetworkManager\n"
 "\n"
 msgstr ""
-"Uso: %s [OPCIONES] OBJETO { COMANDO | ayuda }\n"
+"Uso: %s [OPCIONES] OBJETO { COMANDO | help }\n"
 "\n"
 "OPCIONES\n"
-"  -t[erse]    salida terse \n"
-"  -p[retty]   salida pretty\n"
-"  -v[ersion]  mostrar versión programa\n"
-"  -h[elp]     imprimir esta ayuda\n"
+"  -t[erse]                                   salida terse \n"
+"  -p[retty]                                  salida pretty\n"
+"  -m[ode] tabular|multiline                  output mode\n"
+"  -f[ields] <campo1,campo2,...>|all|common   especificar los campos que "
+"mostrar\n"
+"  -e[scape] yes|no                           escapar los separadores de "
+"columnas en los valores\n"
+"  -n[ocheck]                                 don't check nmcli and "
+"NetworkManager versions\n"
+"  -v[ersion]                                 mostrar la versión del "
+"programa\n"
+"  -h[elp]                                    mostrar esta ayuda\n"
 "\n"
 "OBJETO\n"
-"  nm          estatus de NetworkManager\n"
+"  nm          estado de NetworkManager\n"
 "  con         conexiones de NetworkManager\n"
-"  dev         dispositivos administrados por NetworkManager\n"
+"  dev         dispositivos gestionados por NetworkManager\n"
 "\n"
 
-#: ../cli/src/nmcli.c:113
+#: ../cli/src/nmcli.c:109
 #, c-format
 msgid "Error: Object '%s' is unknown, try 'nmcli help'."
 msgstr "Error: el objeto «%s» desconocido, intente «nmcli help»."
 
-#: ../cli/src/nmcli.c:143
+#: ../cli/src/nmcli.c:139
 #, c-format
 msgid "Error: Option '--terse' is specified the second time."
 msgstr "Error: la opción «--terse» se especifica la segunda vez."
 
-#: ../cli/src/nmcli.c:148
+#: ../cli/src/nmcli.c:144
 #, c-format
 msgid "Error: Option '--terse' is mutually exclusive with '--pretty'."
 msgstr "Error: la opción «--terse» es mutuamente exclusiva con «--pretty»."
 
-#: ../cli/src/nmcli.c:156
+#: ../cli/src/nmcli.c:152
 #, c-format
 msgid "Error: Option '--pretty' is specified the second time."
 msgstr "Error: la opción «--pretty» se especifica la segunda vez."
 
-#: ../cli/src/nmcli.c:161
+#: ../cli/src/nmcli.c:157
 #, c-format
 msgid "Error: Option '--pretty' is mutually exclusive with '--terse'."
 msgstr "Error: la opción «--pretty» es mutuamente exclusiva con «--terse»."
 
-#: ../cli/src/nmcli.c:171 ../cli/src/nmcli.c:187
+#: ../cli/src/nmcli.c:167 ../cli/src/nmcli.c:183
 #, c-format
 msgid "Error: missing argument for '%s' option."
 msgstr "Error: falta argumento para opción «%s»."
 
-#: ../cli/src/nmcli.c:180 ../cli/src/nmcli.c:196
+#: ../cli/src/nmcli.c:176 ../cli/src/nmcli.c:192
 #, c-format
 msgid "Error: '%s' is not valid argument for '%s' option."
 msgstr "Error: «%s» no es válido argumento para opción «%s»."
 
-#: ../cli/src/nmcli.c:203
+#: ../cli/src/nmcli.c:199
 #, c-format
 msgid "Error: fields for '%s' options are missing."
 msgstr "Error: faltan campos para opciones «%s»."
 
-#: ../cli/src/nmcli.c:209
+#: ../cli/src/nmcli.c:207
 #, c-format
 msgid "nmcli tool, version %s\n"
 msgstr "herramienta nmcli, versión %s\n"
 
-#: ../cli/src/nmcli.c:215
+#: ../cli/src/nmcli.c:213
 #, c-format
 msgid "Error: Option '%s' is unknown, try 'nmcli -help'."
 msgstr "Error: opción «%s» desconocida, intente «nmcli -help»."
 
-#: ../cli/src/nmcli.c:234
+#: ../cli/src/nmcli.c:232
 #, c-format
 msgid "Caught signal %d, shutting down..."
 msgstr "Señal capturada %d, apagando..."
 
-#: ../cli/src/nmcli.c:259
-#, c-format
-msgid "Error: Could not connect to NetworkManager."
-msgstr "Error: no se pudo conectar con NetworkManager."
+#: ../cli/src/nmcli.c:257
+#| msgid "Error: Couldn't create D-Bus object proxy."
+msgid "Error: Could not create NMClient object."
+msgstr "Error: no se pudo crear un objeto NMClient."
 
-#: ../cli/src/nmcli.c:275
+#: ../cli/src/nmcli.c:273
 msgid "Success"
 msgstr "Éxito"
 
-#: ../cli/src/settings.c:411
+#: ../cli/src/settings.c:421
 #, c-format
 msgid "%d (hex-ascii-key)"
 msgstr "%d (clave-hex-ascii)"
 
-#: ../cli/src/settings.c:413
+#: ../cli/src/settings.c:423
 #, c-format
 msgid "%d (104/128-bit passphrase)"
 msgstr "%d (frase de acceso 104/128-bits)"
 
-#: ../cli/src/settings.c:416
+#: ../cli/src/settings.c:426
 #, c-format
 msgid "%d (unknown)"
 msgstr "%d (desconocido)"
 
-#: ../cli/src/settings.c:442
+#: ../cli/src/settings.c:452
 msgid "0 (unknown)"
 msgstr "0 (desconocido)"
 
-#: ../cli/src/settings.c:448
+#: ../cli/src/settings.c:458
 msgid "any, "
 msgstr "cualquiera,"
 
-#: ../cli/src/settings.c:450
+#: ../cli/src/settings.c:460
 msgid "900 MHz, "
 msgstr "900 MHz, "
 
-#: ../cli/src/settings.c:452
+#: ../cli/src/settings.c:462
 msgid "1800 MHz, "
 msgstr "1800 MHz, "
 
-#: ../cli/src/settings.c:454
+#: ../cli/src/settings.c:464
 msgid "1900 MHz, "
 msgstr "1900 MHz, "
 
-#: ../cli/src/settings.c:456
+#: ../cli/src/settings.c:466
 msgid "850 MHz, "
 msgstr "850 MHz, "
 
-#: ../cli/src/settings.c:458
+#: ../cli/src/settings.c:468
 msgid "WCDMA 3GPP UMTS 2100 MHz, "
 msgstr "WCDMA 3GPP UMTS 2100 MHz, "
 
-#: ../cli/src/settings.c:460
+#: ../cli/src/settings.c:470
 msgid "WCDMA 3GPP UMTS 1800 MHz, "
 msgstr "WCDMA 3GPP UMTS 1800 MHz, "
 
-#: ../cli/src/settings.c:462
+#: ../cli/src/settings.c:472
 msgid "WCDMA 3GPP UMTS 1700/2100 MHz, "
 msgstr "WCDMA 3GPP UMTS 1700/2100 MHz, "
 
-#: ../cli/src/settings.c:464
+#: ../cli/src/settings.c:474
 msgid "WCDMA 3GPP UMTS 800 MHz, "
 msgstr "WCDMA 3GPP UMTS 800 MHz, "
 
-#: ../cli/src/settings.c:466
+#: ../cli/src/settings.c:476
 msgid "WCDMA 3GPP UMTS 850 MHz, "
 msgstr "WCDMA 3GPP UMTS 850 MHz, "
 
-#: ../cli/src/settings.c:468
+#: ../cli/src/settings.c:478
 msgid "WCDMA 3GPP UMTS 900 MHz, "
 msgstr "WCDMA 3GPP UMTS 900 MHz, "
 
-#: ../cli/src/settings.c:470
+#: ../cli/src/settings.c:480
 msgid "WCDMA 3GPP UMTS 1700 MHz, "
 msgstr "WCDMA 3GPP UMTS 1700 MHz, "
 
-#: ../cli/src/settings.c:554 ../cli/src/settings.c:721
+#: ../cli/src/settings.c:564 ../cli/src/settings.c:730
 msgid "auto"
 msgstr "auto"
 
-#: ../cli/src/settings.c:716 ../cli/src/settings.c:719
-#: ../cli/src/settings.c:720 ../cli/src/utils.c:172
+#: ../cli/src/settings.c:725 ../cli/src/settings.c:728
+#: ../cli/src/settings.c:729 ../cli/src/utils.c:176
 msgid "not set"
 msgstr "no establecido"
 
-#: ../cli/src/utils.c:124
+#: ../cli/src/utils.c:128
 #, c-format
 msgid "field '%s' has to be alone"
 msgstr "el campo «%s» tiene que estar solo"
 
-#: ../cli/src/utils.c:127
+#: ../cli/src/utils.c:131
 #, c-format
 msgid "invalid field '%s'"
 msgstr "campo inválido «%s»"
 
-#: ../cli/src/utils.c:146
+#: ../cli/src/utils.c:150
 #, c-format
 msgid "Option '--terse' requires specifying '--fields'"
 msgstr "Opción «--terse» requiere especificar «--fields»"
 
-#: ../cli/src/utils.c:150
+#: ../cli/src/utils.c:154
 #, c-format
 msgid "Option '--terse' requires specific '--fields' option values , not '%s'"
 msgstr "Opción «--terse» requiere valores de «--fields» específicos, no «%s»"
 
-#: ../libnm-util/crypto.c:120
+#: ../cli/src/utils.c:333
+#, c-format
+#| msgid "Error: Couldn't create D-Bus object proxy."
+msgid "Error: Couldn't create D-Bus object proxy for org.freedesktop.DBus"
+msgstr ""
+"Error: no se pudo crear un objeto proxy en D-Bus para org.freedesktop.DBus"
+
+#: ../cli/src/utils.c:341
+#, c-format
+msgid "Error: NameHasOwner request failed: %s"
+msgstr "Error: falló la solicitud NameHasOwner: %s"
+
+#: ../cli/src/utils.c:386
+#, 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"
+
+#: ../cli/src/utils.c:395
+#, 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."
+
+#: ../libnm-util/crypto.c:125
 #, c-format
 msgid "PEM key file had no end tag '%s'."
 msgstr "El archivo de clave PEM no tiene la etiqueta de finalización «%s»."
 
-#: ../libnm-util/crypto.c:130
+#: ../libnm-util/crypto.c:138
 #, c-format
 msgid "Doesn't look like a PEM private key file."
 msgstr "No parece ser un archivo de clave privada PEM."
 
-#: ../libnm-util/crypto.c:138
+#: ../libnm-util/crypto.c:146
 #, c-format
 msgid "Not enough memory to store PEM file data."
 msgstr "No hay memoria suficiente para almacenar el archivo de datos PEM."
 
-#: ../libnm-util/crypto.c:154
+#: ../libnm-util/crypto.c:162
 #, c-format
 msgid "Malformed PEM file: Proc-Type was not first tag."
 msgstr "Archivo PEM mal formado: la primera etiqueta no era Proc-Type."
 
-#: ../libnm-util/crypto.c:162
+#: ../libnm-util/crypto.c:170
 #, c-format
 msgid "Malformed PEM file: unknown Proc-Type tag '%s'."
 msgstr "Archivo PEM mal formado: etiqueta Proc-Type «%s» desconocida."
 
-#: ../libnm-util/crypto.c:172
+#: ../libnm-util/crypto.c:180
 #, c-format
 msgid "Malformed PEM file: DEK-Info was not the second tag."
 msgstr "Archivo PEM mal formado: la segunda etiqueta no era DEK-Info."
 
-#: ../libnm-util/crypto.c:183
+#: ../libnm-util/crypto.c:191
 #, c-format
 msgid "Malformed PEM file: no IV found in DEK-Info tag."
 msgstr "Archivo PEM mal formado: no se encontró IV en la etiqueta DEK-Info."
 
-#: ../libnm-util/crypto.c:190
+#: ../libnm-util/crypto.c:198
 #, c-format
 msgid "Malformed PEM file: invalid format of IV in DEK-Info tag."
 msgstr ""
 "Archivo PEM mal formado: formato de IV no válido en la etiqueta DEK-Info."
 
-#: ../libnm-util/crypto.c:203
+#: ../libnm-util/crypto.c:211
 #, c-format
 msgid "Malformed PEM file: unknown private key cipher '%s'."
 msgstr "Archivo PEM malformado: cifrador de clave privada «%s» desconocido."
 
-#: ../libnm-util/crypto.c:222
+#: ../libnm-util/crypto.c:230
 #, c-format
 msgid "Could not decode private key."
 msgstr "No se pudo decodificar la clave privada."
 
-#: ../libnm-util/crypto.c:267
-#, c-format
-msgid "PEM certificate '%s' had no end tag '%s'."
-msgstr "El certificado PEM «%s» no tiene etiqueta de finalización «%s»."
-
-#: ../libnm-util/crypto.c:277
-#, c-format
-msgid "Failed to decode certificate."
-msgstr "No se pudo decodificar el certificado."
-
-#: ../libnm-util/crypto.c:286
+#: ../libnm-util/crypto.c:266 ../libnm-util/crypto.c:552
 #, c-format
 msgid "Not enough memory to store certificate data."
 msgstr "No hay memoria suficiente para almacenar los datos del certificado."
 
-#: ../libnm-util/crypto.c:294
-#, c-format
-msgid "Not enough memory to store file data."
-msgstr "No hay memoria suficiente para almacenar el archivo."
-
-#: ../libnm-util/crypto.c:324
+#: ../libnm-util/crypto.c:292
 #, c-format
 msgid "IV must be an even number of bytes in length."
 msgstr "IV debe ser un número par de bytes de longitud."
 
-#: ../libnm-util/crypto.c:333
+#: ../libnm-util/crypto.c:301
 #, c-format
 msgid "Not enough memory to store the IV."
 msgstr "No hay memoria suficiente para almacenar la IV."
 
-#: ../libnm-util/crypto.c:344
+#: ../libnm-util/crypto.c:312
 #, c-format
 msgid "IV contains non-hexadecimal digits."
 msgstr "IV contiene dígitos no hexadecimales."
 
-#: ../libnm-util/crypto.c:382 ../libnm-util/crypto_gnutls.c:148
+#: ../libnm-util/crypto.c:350 ../libnm-util/crypto_gnutls.c:148
 #: ../libnm-util/crypto_gnutls.c:266 ../libnm-util/crypto_nss.c:171
 #: ../libnm-util/crypto_nss.c:336
 #, c-format
 msgid "Private key cipher '%s' was unknown."
 msgstr "Se desconocía el cifrador de clave privada «%s»."
 
-#: ../libnm-util/crypto.c:391
+#: ../libnm-util/crypto.c:359
 #, c-format
 msgid "Not enough memory to decrypt private key."
 msgstr "No hay memoria suficiente para descifrar la clave privada."
 
-#: ../libnm-util/crypto.c:511
+#: ../libnm-util/crypto.c:424
+#, c-format
+msgid "Not enough memory to store decrypted private key."
+msgstr "No hay memoria suficiente para almacenar la clave privada descifrada."
+
+#: ../libnm-util/crypto.c:469
 #, c-format
 msgid "Unable to determine private key type."
 msgstr "No se pudo determinar el tipo de clave privada."
 
-#: ../libnm-util/crypto.c:530
+#: ../libnm-util/crypto.c:524
 #, c-format
-msgid "Not enough memory to store decrypted private key."
-msgstr "No hay memoria suficiente para almacenar la clave privada descifrada."
+#| msgid "PEM certificate '%s' had no end tag '%s'."
+msgid "PEM certificate had no start tag '%s'."
+msgstr "El certificado PEM no tiene etiqueta de inicio «%s»."
+
+#: ../libnm-util/crypto.c:533
+#, c-format
+#| msgid "PEM certificate '%s' had no end tag '%s'."
+msgid "PEM certificate had no end tag '%s'."
+msgstr "El certificado PEM no tiene etiqueta de finalización «%s»."
+
+#: ../libnm-util/crypto.c:557
+#, c-format
+msgid "Failed to decode certificate."
+msgstr "No se pudo decodificar el certificado."
 
 #: ../libnm-util/crypto_gnutls.c:49
 msgid "Failed to initialize the crypto engine."
@@ -1541,90 +1806,75 @@ msgstr "No se pudo verificar el archivo PKCS#12: %d"
 msgid "Could not generate random data."
 msgstr "No se pudo generar datos aleatorios."
 
-#: ../libnm-util/nm-utils.c:1975
+#: ../libnm-util/nm-utils.c:1988
 #, c-format
 msgid "Not enough memory to make encryption key."
 msgstr "No hay memoria suficiente para crear la clave privada de cifrado."
 
-#: ../libnm-util/nm-utils.c:2085
+#: ../libnm-util/nm-utils.c:2098
 msgid "Could not allocate memory for PEM file creation."
 msgstr "No se pudo reservar memoria para crear el archivo PEM."
 
-#: ../libnm-util/nm-utils.c:2097
+#: ../libnm-util/nm-utils.c:2110
 #, c-format
 msgid "Could not allocate memory for writing IV to PEM file."
 msgstr "No pudo asignar memoria para escribir IV al archivo PEM."
 
-#: ../libnm-util/nm-utils.c:2109
+#: ../libnm-util/nm-utils.c:2122
 #, c-format
 msgid "Could not allocate memory for writing encrypted key to PEM file."
 msgstr ""
 "No se pudo asignar memoria para escribir llave encriptada al archivo PEM."
 
-#: ../libnm-util/nm-utils.c:2128
+#: ../libnm-util/nm-utils.c:2141
 #, c-format
 msgid "Could not allocate memory for PEM file data."
 msgstr "No se pudo reservar memoria para el archivo de datos PEM."
 
-#: ../policy/org.freedesktop.network-manager-settings.system.policy.in.h:1
-msgid "Connection sharing via a protected WiFi network"
-msgstr "Compartir conexión a través de una red WIFI protegida"
-
-#: ../policy/org.freedesktop.network-manager-settings.system.policy.in.h:2
-msgid "Connection sharing via an open WiFi network"
-msgstr "Compartir conexión a través de una red WIFI abierta"
-
-#: ../policy/org.freedesktop.network-manager-settings.system.policy.in.h:3
-msgid "Modify persistent system hostname"
-msgstr "Modificar nombre de host de sistema persistente"
-
-#: ../policy/org.freedesktop.network-manager-settings.system.policy.in.h:4
-msgid "Modify system connections"
-msgstr "Modificar conexiones de sistema"
-
-#: ../policy/org.freedesktop.network-manager-settings.system.policy.in.h:5
-msgid "System policy prevents modification of system settings"
-msgstr "Política de sistema evita modificación de configuración de sistema"
-
-#: ../policy/org.freedesktop.network-manager-settings.system.policy.in.h:6
-msgid "System policy prevents modification of the persistent system hostname"
-msgstr ""
-"Política de sistema evita modificación de nombre de host de sistema "
-"persistente"
-
-#: ../policy/org.freedesktop.network-manager-settings.system.policy.in.h:7
-msgid "System policy prevents sharing connections via a protected WiFi network"
-msgstr ""
-"Política de sistema evita compartir conexiones a través de una red WIFI "
-"protegida"
-
-#: ../policy/org.freedesktop.network-manager-settings.system.policy.in.h:8
-msgid "System policy prevents sharing connections via an open WiFi network"
-msgstr ""
-"Política de sistema evita compartir conexiones a través de una red WIFI "
-"abierta"
-
 #: ../policy/org.freedesktop.NetworkManager.policy.in.h:1
 msgid "Allow control of network connections"
 msgstr "Permitir controlar las conexiones de red"
 
 #: ../policy/org.freedesktop.NetworkManager.policy.in.h:2
-msgid "Allow use of user-specific connections"
-msgstr "Permitir el uso de conexiones específicas de usuario"
+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.h:3
+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.h:4
 msgid "Enable or disable WiFi devices"
 msgstr "Activar o desactivar los dispositivos inalámbricos"
 
-#: ../policy/org.freedesktop.NetworkManager.policy.in.h:4
+#: ../policy/org.freedesktop.NetworkManager.policy.in.h:5
+#| msgid "Enable or disable mobile broadband devices"
+msgid "Enable or disable WiMAX mobile broadband devices"
+msgstr "Activar o desactivar los dispositivos de banda ancha móvil WiMAX"
+
+#: ../policy/org.freedesktop.NetworkManager.policy.in.h:6
 msgid "Enable or disable mobile broadband devices"
 msgstr "Activar o desactivar los dispositivos de banda ancha móvil"
 
-#: ../policy/org.freedesktop.NetworkManager.policy.in.h:5
+#: ../policy/org.freedesktop.NetworkManager.policy.in.h:7
 msgid "Enable or disable system networking"
 msgstr "Activar o desactivar la red del sistema"
 
-#: ../policy/org.freedesktop.NetworkManager.policy.in.h:6
+#: ../policy/org.freedesktop.NetworkManager.policy.in.h:8
+#| msgid "Modify system connections"
+msgid "Modify network connections for all users"
+msgstr "Modificar las conexiones de red para todos los usuarios"
+
+#: ../policy/org.freedesktop.NetworkManager.policy.in.h:9
+msgid "Modify persistent system hostname"
+msgstr "Modificar nombre de host de sistema persistente"
+
+#: ../policy/org.freedesktop.NetworkManager.policy.in.h:10
+#| msgid "Allow control of network connections"
+msgid "Modify personal network connections"
+msgstr "Modificar las conexiones de red personales"
+
+#: ../policy/org.freedesktop.NetworkManager.policy.in.h:11
 msgid ""
 "Put NetworkManager to sleep or wake it up (should only be used by system "
 "power management)"
@@ -1632,97 +1882,88 @@ msgstr ""
 "Poner NetworkManager a dormir o despertarlo (sólo lo debería usar el gestor "
 "de energía del sistema)"
 
-#: ../policy/org.freedesktop.NetworkManager.policy.in.h:7
+#: ../policy/org.freedesktop.NetworkManager.policy.in.h:12
 msgid "System policy prevents control of network connections"
 msgstr "La política de sistema evita el control de las conexiones de red"
 
-#: ../policy/org.freedesktop.NetworkManager.policy.in.h:8
+#: ../policy/org.freedesktop.NetworkManager.policy.in.h:13
 msgid "System policy prevents enabling or disabling WiFi devices"
 msgstr ""
 "La política de sistema evita activar o desactivar los dispositivos "
 "inalámbricos"
 
-#: ../policy/org.freedesktop.NetworkManager.policy.in.h:9
+#: ../policy/org.freedesktop.NetworkManager.policy.in.h:14
+#| msgid ""
+#| "System policy prevents enabling or disabling mobile broadband devices"
+msgid ""
+"System policy prevents enabling or disabling WiMAX mobile broadband devices"
+msgstr ""
+"La política del sistema evita activar o desactivar los dispositivos de banda "
+"ancha móvil WiMAX"
+
+#: ../policy/org.freedesktop.NetworkManager.policy.in.h:15
 msgid "System policy prevents enabling or disabling mobile broadband devices"
 msgstr ""
 "La política del sistema evita activar o desactivar los dispositivos de banda "
 "ancha móvil"
 
-#: ../policy/org.freedesktop.NetworkManager.policy.in.h:10
+#: ../policy/org.freedesktop.NetworkManager.policy.in.h:16
 msgid "System policy prevents enabling or disabling system networking"
-msgstr "La política de sistema evita activar o desactivar la red del sistema"
+msgstr "La política del sistema evita activar o desactivar la red del sistema"
 
-#: ../policy/org.freedesktop.NetworkManager.policy.in.h:11
-msgid "System policy prevents putting NetworkManager to sleep or waking it up"
+#: ../policy/org.freedesktop.NetworkManager.policy.in.h:17
+#| msgid "System policy prevents modification of system settings"
+msgid "System policy prevents modification of network settings for all users"
 msgstr ""
-"La política del sistema evita poner a NetworkManager a dormir o despertarlo"
+"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.h:12
-msgid "System policy prevents use of user-specific connections"
+#: ../policy/org.freedesktop.NetworkManager.policy.in.h:18
+#| msgid "System policy prevents modification of system settings"
+msgid "System policy prevents modification of personal network settings"
 msgstr ""
-"La política del sistema evita el uso de conexiones específicas de usuario"
-
-#: ../src/nm-netlink-monitor.c:100 ../src/nm-netlink-monitor.c:231
-#: ../src/nm-netlink-monitor.c:653
-#, c-format
-msgid "error processing netlink message: %s"
-msgstr "error al procesar el mensaje de netlink: %s"
+"La política del sistema evita la modificación de la configuración personal "
+"de la red"
 
-#: ../src/nm-netlink-monitor.c:214
-msgid "error occurred while waiting for data on socket"
-msgstr "ha ocurrido un error mientras esperaban datos en un socket"
-
-#: ../src/nm-netlink-monitor.c:254
-#, c-format
-msgid "unable to connect to netlink for monitoring link status: %s"
+#: ../policy/org.freedesktop.NetworkManager.policy.in.h:19
+msgid "System policy prevents modification of the persistent system hostname"
 msgstr ""
-"no se puede conectar con netlink para monitorizar el estado del enlace: %s"
+"La política del sistema evita la modificación del nombre persistente del "
+"sistema"
 
-#: ../src/nm-netlink-monitor.c:265
-#, c-format
-msgid "unable to enable netlink handle credential passing: %s"
-msgstr "no se puede activar el manejador netlink para pasar credenciales: %s"
-
-#: ../src/nm-netlink-monitor.c:291 ../src/nm-netlink-monitor.c:353
-#, c-format
-msgid "unable to allocate netlink handle for monitoring link status: %s"
+#: ../policy/org.freedesktop.NetworkManager.policy.in.h:20
+msgid "System policy prevents putting NetworkManager to sleep or waking it up"
 msgstr ""
-"no se puede asignar el manejador netlink para monitorizar el estado del "
-"enlace: %s"
+"La política del sistema evita poner a NetworkManager a dormir o despertarlo"
 
-#: ../src/nm-netlink-monitor.c:376
-#, c-format
-msgid "unable to allocate netlink link cache for monitoring link status: %s"
+#: ../policy/org.freedesktop.NetworkManager.policy.in.h:21
+msgid "System policy prevents sharing connections via a protected WiFi network"
 msgstr ""
-"no se puede asignar el enlace a la cache de netlink para monitorizar el "
-"estado del enlace: %s"
-
-#: ../src/nm-netlink-monitor.c:502
-#, c-format
-msgid "unable to join netlink group: %s"
-msgstr "no pudo unirse al grupo netlink: %s"
+"La política del sistema evita compartir conexiones a través de una red WiFi "
+"protegida"
 
-#: ../src/nm-netlink-monitor.c:629 ../src/nm-netlink-monitor.c:642
-#, c-format
-msgid "error updating link cache: %s"
-msgstr "error al actualizar el enlace caché: %s"
+#: ../policy/org.freedesktop.NetworkManager.policy.in.h:22
+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"
 
-#: ../src/main.c:499
+#: ../src/main.c:519
 #, c-format
 msgid "Invalid option.  Please use --help to see a list of valid options.\n"
 msgstr ""
 "Opción no válida. Use --help para ver una lista de las opciones válidas.\n"
 
-#: ../src/main.c:570
+#: ../src/main.c:590
 #, 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/dhcp-manager/nm-dhcp-dhclient.c:328
+#: ../src/dhcp-manager/nm-dhcp-dhclient-utils.c:62
 msgid "# Created by NetworkManager\n"
 msgstr "# Creado por NetworkManager\n"
 
-#: ../src/dhcp-manager/nm-dhcp-dhclient.c:344
+#: ../src/dhcp-manager/nm-dhcp-dhclient-utils.c:69
 #, c-format
 msgid ""
 "# Merged from %s\n"
@@ -1748,32 +1989,155 @@ msgstr "se pudo encontrar «dhcpcd»."
 msgid "unsupported DHCP client '%s'"
 msgstr "«%s» cliente DHCP sin soporte "
 
-#: ../src/logging/nm-logging.c:146
+#: ../src/dns-manager/nm-dns-manager.c:367
+msgid "NOTE: the libc resolver may not support more than 3 nameservers."
+msgstr ""
+"NOTA: el resolutor de nombres de libc puede que no soporte más de 3 "
+"servidores de nombres."
+
+#: ../src/dns-manager/nm-dns-manager.c:369
+msgid "The nameservers listed below may not be recognized."
+msgstr "Puede que los servidores de nombres listados abajo no se reconozcan."
+
+#: ../src/logging/nm-logging.c:148
 #, c-format
 msgid "Unknown log level '%s'"
 msgstr "Nivel de registro desconocido «%s»"
 
-#: ../src/logging/nm-logging.c:171
+#: ../src/logging/nm-logging.c:173
 #, c-format
 msgid "Unknown log domain '%s'"
 msgstr "Dominio de registro desconocido «%s»"
 
-#: ../src/dns-manager/nm-dns-manager.c:384
-msgid "NOTE: the libc resolver may not support more than 3 nameservers."
+#: ../src/modem-manager/nm-modem-cdma.c:294 ../src/nm-device-bt.c:353
+#, c-format
+#| msgid "connection failed"
+msgid "CDMA connection %d"
+msgstr "Conexión CDMA %d"
+
+#: ../src/modem-manager/nm-modem-gsm.c:497 ../src/nm-device-bt.c:349
+#, c-format
+#| msgid "connection failed"
+msgid "GSM connection %d"
+msgstr "Conexión GSM %d"
+
+#: ../src/nm-device-bt.c:324
+#, c-format
+#| msgid "VPN connection failed"
+msgid "PAN connection %d"
+msgstr "Conexión PAN %d"
+
+#: ../src/nm-device-bt.c:357
+#, c-format
+#| msgid "VPN connection failed"
+msgid "DUN connection %d"
+msgstr "Conexión DUN %d"
+
+#: ../src/nm-device-ethernet.c:1684
+#, c-format
+#| msgid "VPN connection failed"
+msgid "PPPoE connection %d"
+msgstr "Conexión PPPoE %d"
+
+#: ../src/nm-device-ethernet.c:1684
+#, c-format
+#| msgid "Active connections"
+msgid "Wired connection %d"
+msgstr "Conexión cableada %d"
+
+#: ../src/nm-device-olpc-mesh.c:422
+#, c-format
+msgid "Mesh %d"
+msgstr "Malla %d"
+
+#: ../src/nm-manager.c:679
+#, c-format
+#| msgid "VPN connection failed"
+msgid "VPN connection %d"
+msgstr "Conexión VPN %d"
+
+#: ../src/nm-netlink-monitor.c:100 ../src/nm-netlink-monitor.c:231
+#: ../src/nm-netlink-monitor.c:653
+#, c-format
+msgid "error processing netlink message: %s"
+msgstr "error al procesar el mensaje de netlink: %s"
+
+#: ../src/nm-netlink-monitor.c:214
+msgid "error occurred while waiting for data on socket"
+msgstr "ha ocurrido un error mientras esperaban datos en un socket"
+
+#: ../src/nm-netlink-monitor.c:254
+#, c-format
+msgid "unable to connect to netlink for monitoring link status: %s"
 msgstr ""
-"NOTA: el resolutor de nombres de libc puede que no soporte más de 3 "
-"servidores de nombres."
+"no se puede conectar con netlink para monitorizar el estado del enlace: %s"
 
-#: ../src/dns-manager/nm-dns-manager.c:386
-msgid "The nameservers listed below may not be recognized."
-msgstr "Puede que los servidores de nombres listados abajo no se reconozcan."
+#: ../src/nm-netlink-monitor.c:265
+#, c-format
+msgid "unable to enable netlink handle credential passing: %s"
+msgstr "no se puede activar el manejador netlink para pasar credenciales: %s"
 
-#: ../src/system-settings/nm-default-wired-connection.c:157
+#: ../src/nm-netlink-monitor.c:291 ../src/nm-netlink-monitor.c:353
 #, c-format
-msgid "Auto %s"
-msgstr "Auto %s"
+msgid "unable to allocate netlink handle for monitoring link status: %s"
+msgstr ""
+"no se puede asignar el manejador netlink para monitorizar el estado del "
+"enlace: %s"
+
+#: ../src/nm-netlink-monitor.c:376
+#, c-format
+msgid "unable to allocate netlink link cache for monitoring link status: %s"
+msgstr ""
+"no se puede asignar el enlace a la cache de netlink para monitorizar el "
+"estado del enlace: %s"
+
+#: ../src/nm-netlink-monitor.c:502
+#, c-format
+msgid "unable to join netlink group: %s"
+msgstr "no pudo unirse al grupo netlink: %s"
 
-#: ../system-settings/plugins/ifcfg-rh/reader.c:3412
-#: ../system-settings/plugins/ifnet/connection_parser.c:49
+#: ../src/nm-netlink-monitor.c:629 ../src/nm-netlink-monitor.c:642
+#, c-format
+msgid "error updating link cache: %s"
+msgstr "error al actualizar el enlace caché: %s"
+
+#: ../src/settings/plugins/ifcfg-rh/reader.c:3402
+#: ../src/settings/plugins/ifnet/connection_parser.c:49
 msgid "System"
 msgstr "Sistema"
+
+#: ../src/settings/nm-default-wired-connection.c:143
+#, c-format
+msgid "Auto %s"
+msgstr "Auto %s"
+
+#~ msgid "SCOPE"
+#~ msgstr "ALCANCE"
+
+#~ msgid "DBUS-SERVICE"
+#~ msgstr "SERVICIO DBUS"
+
+#~ msgid "system"
+#~ msgstr "sistema"
+
+#~ msgid "user"
+#~ msgstr "usuario"
+
+#~ msgid "System connections"
+#~ msgstr "Conexiones de sistema"
+
+#~ msgid "User connections"
+#~ msgstr "Conexiones de usuario"
+
+#~ msgid "Error: Could not get user settings."
+#~ msgstr "Error: No se pudo obtener configuración de usuario."
+
+#~ msgid "Not enough memory to store file data."
+#~ msgstr "No hay memoria suficiente para almacenar el archivo."
+
+#~ msgid "Allow use of user-specific connections"
+#~ msgstr "Permitir el uso de conexiones específicas de usuario"
+
+#~ msgid "System policy prevents use of user-specific connections"
+#~ msgstr ""
+#~ "La política del sistema evita el uso de conexiones específicas de usuario"
diff --git a/po/eu.po b/po/eu.po
index 5a584ec3..68b8204a 100644
--- a/po/eu.po
+++ b/po/eu.po
@@ -1308,7 +1308,7 @@ msgstr "OHARRA: libc-en ebaztaileak ez du 3 izen-zerbitzari baino gehiago onartz
 msgid "The nameservers listed below may not be recognized."
 msgstr "Azpian zerrendatutako izen-zenbitzariak ez dira ezagutuko."
 
-#: ../src/system-settings/nm-default-wired-connection.c:157
+#: ../src/settings/nm-default-wired-connection.c:157
 #, c-format
 msgid "Auto %s"
 msgstr "Auto %s"
diff --git a/po/fr.po b/po/fr.po
index 67a36db7..374f1b6c 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -1621,7 +1621,7 @@ msgstr ""
 msgid "The nameservers listed below may not be recognized."
 msgstr "Les serveurs de noms listés ci-dessous peuvent ne pas être reconnus."
 
-#: ../src/system-settings/nm-default-wired-connection.c:157
+#: ../src/settings/nm-default-wired-connection.c:157
 #, c-format
 msgid "Auto %s"
 msgstr "Auto %s"
diff --git a/po/gl.po b/po/gl.po
index 4adefda7..62dc71f3 100644
--- a/po/gl.po
+++ b/po/gl.po
@@ -1732,7 +1732,7 @@ msgstr "NOTE: o importador libc non permite máis de 3 nomes de servidores."
 msgid "The nameservers listed below may not be recognized."
 msgstr "Os nomes de servidores listados a seguir poden non ser recoñecidos"
 
-#: ../src/system-settings/nm-default-wired-connection.c:157
+#: ../src/settings/nm-default-wired-connection.c:157
 #, c-format
 msgid "Auto %s"
 msgstr "Auto %s"
diff --git a/po/gu.po b/po/gu.po
index 3fa8cf33..68c97d71 100644
--- a/po/gu.po
+++ b/po/gu.po
@@ -1596,7 +1596,7 @@ msgstr "નોંધ: libc સુધારનાર એ ૩ નામ સર્�
 msgid "The nameservers listed below may not be recognized."
 msgstr "નીચે યાદી થયેલ નામસર્વરો એ ઓળખી શકાતા નથી."
 
-#: ../src/system-settings/nm-default-wired-connection.c:157
+#: ../src/settings/nm-default-wired-connection.c:157
 #, c-format
 msgid "Auto %s"
 msgstr "%s સ્વયં કરો"
diff --git a/po/hi.po b/po/hi.po
index aab5c034..59b00c4a 100644
--- a/po/hi.po
+++ b/po/hi.po
@@ -1691,7 +1691,7 @@ msgstr "नोट: libc समाधानकर्ता 3 नेमसर्�
 msgid "The nameservers listed below may not be recognized."
 msgstr "नीचे सूची में दिया गया नेमसर्वर पहचाना नहीं जा सकता है."
 
-#: ../src/system-settings/nm-default-wired-connection.c:157
+#: ../src/settings/nm-default-wired-connection.c:157
 #, c-format
 msgid "Auto %s"
 msgstr "स्वतः %s"
diff --git a/po/hu.po b/po/hu.po
index 0ca4386f..4c3282f7 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -2,13 +2,14 @@
 # This file is distributed under the same license as the NetworkManager package.
 # Copyright (C) 2005, Free Software Foundation. Inc.
 #
-# Gabor Kelemen <kelemeng at gnome dot hu>, 2005, 2006, 2007, 2008, 2009, 2010.
+# Gabor Kelemen <kelemeng at gnome dot hu>, 2005, 2006, 2007, 2008, 2009, 2010, 2011.
 msgid ""
 msgstr ""
 "Project-Id-Version: NetworkManager master\n"
-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=NetworkManager&component=general\n"
-"POT-Creation-Date: 2010-09-22 03:25+0000\n"
-"PO-Revision-Date: 2010-10-02 20:50+0200\n"
+"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
+"product=NetworkManager&keywords=I18N+L10N&component=general\n"
+"POT-Creation-Date: 2011-03-14 15:25+0000\n"
+"PO-Revision-Date: 2011-03-14 22:36+0100\n"
 "Last-Translator: Gabor Kelemen <kelemeng at gnome dot hu>\n"
 "Language-Team: Hungarian <gnome at fsf dot hu>\n"
 "MIME-Version: 1.0\n"
@@ -18,88 +19,88 @@ msgstr ""
 "X-Launchpad-Export-Date: 2010-10-02 18:28+0000\n"
 "X-Generator: KBabel 1.11.4\n"
 
-#: ../cli/src/connections.c:60 ../cli/src/connections.c:75
-#: ../cli/src/devices.c:88 ../cli/src/devices.c:101 ../cli/src/devices.c:111
-#: ../cli/src/devices.c:121 ../cli/src/devices.c:134 ../cli/src/devices.c:145
-#: ../cli/src/devices.c:156 ../cli/src/devices.c:165 ../cli/src/devices.c:174
+#: ../cli/src/connections.c:64 ../cli/src/connections.c:78
+#: ../cli/src/devices.c:101 ../cli/src/devices.c:114 ../cli/src/devices.c:124
+#: ../cli/src/devices.c:134 ../cli/src/devices.c:148 ../cli/src/devices.c:162
+#: ../cli/src/devices.c:173 ../cli/src/devices.c:184 ../cli/src/devices.c:193
+#: ../cli/src/devices.c:202 ../cli/src/devices.c:224
 msgid "NAME"
 msgstr "NÉV"
 
 #. 0
-#: ../cli/src/connections.c:61 ../cli/src/connections.c:76
+#: ../cli/src/connections.c:65 ../cli/src/connections.c:79
 msgid "UUID"
 msgstr "UUID"
 
 #. 1
-#: ../cli/src/connections.c:62
+#: ../cli/src/connections.c:66
 msgid "DEVICES"
 msgstr "ESZKÖZÖK"
 
 #. 2
-#: ../cli/src/connections.c:63 ../cli/src/connections.c:78
-msgid "SCOPE"
-msgstr "HATÓKÖR"
-
-#. 3
-#: ../cli/src/connections.c:64
+#: ../cli/src/connections.c:67
 msgid "DEFAULT"
 msgstr "ALAPÉRTELMEZETT"
 
-#. 4
-#: ../cli/src/connections.c:65
-msgid "DBUS-SERVICE"
-msgstr "DBUS-SZOLGÁLTATÁS"
-
-#. 5
-#: ../cli/src/connections.c:66
+#. 3
+#: ../cli/src/connections.c:68
 msgid "SPEC-OBJECT"
 msgstr "SPEC-OBJEKTUM"
 
-#. 6
-#: ../cli/src/connections.c:67
+#. 4
+#: ../cli/src/connections.c:69
 msgid "VPN"
 msgstr "VPN"
 
+#. 5
+#. 6
+#. 2
+#. 11
+#. 5
+#: ../cli/src/connections.c:70 ../cli/src/connections.c:85
+#: ../cli/src/devices.c:69 ../cli/src/devices.c:214 ../cli/src/devices.c:230
+msgid "DBUS-PATH"
+msgstr "DBUS-ÚTVONAL"
+
 #. 1
 #. 0
 #. 1
-#: ../cli/src/connections.c:77 ../cli/src/devices.c:62 ../cli/src/devices.c:90
+#. 2
+#: ../cli/src/connections.c:80 ../cli/src/devices.c:67
+#: ../cli/src/devices.c:103 ../cli/src/devices.c:227
 msgid "TYPE"
 msgstr "TÍPUS"
 
-#. 3
-#: ../cli/src/connections.c:79
+#. 2
+#: ../cli/src/connections.c:81
 msgid "TIMESTAMP"
 msgstr "IDŐBÉLYEG"
 
-#. 4
-#: ../cli/src/connections.c:80
+#. 3
+#: ../cli/src/connections.c:82
 msgid "TIMESTAMP-REAL"
 msgstr "IDŐBÉLYEG-VALÓDI"
 
-#. 5
-#: ../cli/src/connections.c:81
+#. 4
+#: ../cli/src/connections.c:83
 msgid "AUTOCONNECT"
 msgstr "AUTO-CSATLAKOZÁS"
 
-#. 6
-#: ../cli/src/connections.c:82
+#. 5
+#: ../cli/src/connections.c:84
 msgid "READONLY"
 msgstr "CSAK OLVASHATÓ"
 
-#. 7
-#: ../cli/src/connections.c:83
-msgid "DBUS-PATH"
-msgstr "DBUS-ÚTVONAL"
-
-#: ../cli/src/connections.c:159
+#: ../cli/src/connections.c:168
 #, c-format
 msgid ""
 "Usage: nmcli con { COMMAND | help }\n"
 "  COMMAND := { list | status | up | down }\n"
 "\n"
-"  list [id <id> | uuid <id> | system | user]\n"
+"  list [id <id> | uuid <id>]\n"
 "  status\n"
+"  up id <id> | uuid <id> [iface <iface>] [ap <hwaddr>] [nsp <name>] [--"
+"nowait] [--timeout <timeout>]\n"
 "  up id <id> | uuid <id> [iface <iface>] [ap <hwaddr>] [--nowait] [--timeout "
 "<timeout>]\n"
 "  down id <id> | uuid <id>\n"
@@ -109,798 +110,912 @@ msgstr ""
 "\n"
 "  list [id <azonosító> | uuid <azonosító> | system | user]\n"
 "  status\n"
+"  up id <azonosító> | uuid <azonosító> [iface <csatoló>] [ap <hwcím>] [nsp "
+"<név>] [--nowait] [--timeout <időkorlát>]\n"
 "  up id <azonosító> | uuid <azonosító> [iface <csatoló>] [ap <hwcím>] [--"
 "nowait] [--timeout <időkorlát>]\n"
 "  down id <azonosító> | uuid <azonosító>\n"
 
-#: ../cli/src/connections.c:199 ../cli/src/connections.c:540
+#: ../cli/src/connections.c:221 ../cli/src/connections.c:543
 #, c-format
 msgid "Error: 'con list': %s"
 msgstr "Hiba: „con list”: %s"
 
-#: ../cli/src/connections.c:201 ../cli/src/connections.c:542
+#: ../cli/src/connections.c:223 ../cli/src/connections.c:545
 #, c-format
 msgid "Error: 'con list': %s; allowed fields: %s"
 msgstr "Hiba: „con list”: %s; engedélyezett mezők: %s"
 
-#: ../cli/src/connections.c:209
+#: ../cli/src/connections.c:231
 msgid "Connection details"
 msgstr "Kapcsolat részletei"
 
-#: ../cli/src/connections.c:384 ../cli/src/connections.c:605
-msgid "system"
-msgstr "rendszer"
-
-#: ../cli/src/connections.c:384 ../cli/src/connections.c:605
-msgid "user"
-msgstr "felhasználó"
-
-#: ../cli/src/connections.c:386
+#: ../cli/src/connections.c:418
 msgid "never"
 msgstr "soha"
 
 #. "CAPABILITIES"
 #. Print header
 #. "WIFI-PROPERTIES"
-#: ../cli/src/connections.c:387 ../cli/src/connections.c:388
-#: ../cli/src/connections.c:606 ../cli/src/connections.c:609
-#: ../cli/src/devices.c:432 ../cli/src/devices.c:557 ../cli/src/devices.c:583
-#: ../cli/src/devices.c:584 ../cli/src/devices.c:585 ../cli/src/devices.c:586
-#: ../cli/src/devices.c:587 ../cli/src/settings.c:508
-#: ../cli/src/settings.c:551 ../cli/src/settings.c:652
-#: ../cli/src/settings.c:926 ../cli/src/settings.c:927
-#: ../cli/src/settings.c:929 ../cli/src/settings.c:931
-#: ../cli/src/settings.c:1056 ../cli/src/settings.c:1057
-#: ../cli/src/settings.c:1058 ../cli/src/settings.c:1137
-#: ../cli/src/settings.c:1138 ../cli/src/settings.c:1139
-#: ../cli/src/settings.c:1140 ../cli/src/settings.c:1141
-#: ../cli/src/settings.c:1142 ../cli/src/settings.c:1143
-#: ../cli/src/settings.c:1144 ../cli/src/settings.c:1145
-#: ../cli/src/settings.c:1146 ../cli/src/settings.c:1147
-#: ../cli/src/settings.c:1148 ../cli/src/settings.c:1149
-#: ../cli/src/settings.c:1224
+#: ../cli/src/connections.c:419 ../cli/src/connections.c:420
+#: ../cli/src/connections.c:598 ../cli/src/connections.c:600
+#: ../cli/src/devices.c:509 ../cli/src/devices.c:562 ../cli/src/devices.c:687
+#: ../cli/src/devices.c:713 ../cli/src/devices.c:714 ../cli/src/devices.c:715
+#: ../cli/src/devices.c:716 ../cli/src/devices.c:717 ../cli/src/settings.c:520
+#: ../cli/src/settings.c:563 ../cli/src/settings.c:663
+#: ../cli/src/settings.c:937 ../cli/src/settings.c:938
+#: ../cli/src/settings.c:940 ../cli/src/settings.c:942
+#: ../cli/src/settings.c:1067 ../cli/src/settings.c:1068
+#: ../cli/src/settings.c:1069 ../cli/src/settings.c:1148
+#: ../cli/src/settings.c:1149 ../cli/src/settings.c:1150
+#: ../cli/src/settings.c:1151 ../cli/src/settings.c:1152
+#: ../cli/src/settings.c:1153 ../cli/src/settings.c:1154
+#: ../cli/src/settings.c:1155 ../cli/src/settings.c:1156
+#: ../cli/src/settings.c:1157 ../cli/src/settings.c:1158
+#: ../cli/src/settings.c:1159 ../cli/src/settings.c:1160
+#: ../cli/src/settings.c:1235
 msgid "yes"
 msgstr "igen"
 
-#: ../cli/src/connections.c:387 ../cli/src/connections.c:388
-#: ../cli/src/connections.c:606 ../cli/src/connections.c:609
-#: ../cli/src/devices.c:432 ../cli/src/devices.c:557 ../cli/src/devices.c:583
-#: ../cli/src/devices.c:584 ../cli/src/devices.c:585 ../cli/src/devices.c:586
-#: ../cli/src/devices.c:587 ../cli/src/settings.c:508
-#: ../cli/src/settings.c:510 ../cli/src/settings.c:551
-#: ../cli/src/settings.c:652 ../cli/src/settings.c:926
-#: ../cli/src/settings.c:927 ../cli/src/settings.c:929
-#: ../cli/src/settings.c:931 ../cli/src/settings.c:1056
-#: ../cli/src/settings.c:1057 ../cli/src/settings.c:1058
-#: ../cli/src/settings.c:1137 ../cli/src/settings.c:1138
-#: ../cli/src/settings.c:1139 ../cli/src/settings.c:1140
-#: ../cli/src/settings.c:1141 ../cli/src/settings.c:1142
-#: ../cli/src/settings.c:1143 ../cli/src/settings.c:1144
-#: ../cli/src/settings.c:1145 ../cli/src/settings.c:1146
-#: ../cli/src/settings.c:1147 ../cli/src/settings.c:1148
-#: ../cli/src/settings.c:1149 ../cli/src/settings.c:1224
+#: ../cli/src/connections.c:419 ../cli/src/connections.c:420
+#: ../cli/src/connections.c:598 ../cli/src/connections.c:600
+#: ../cli/src/devices.c:509 ../cli/src/devices.c:562 ../cli/src/devices.c:687
+#: ../cli/src/devices.c:713 ../cli/src/devices.c:714 ../cli/src/devices.c:715
+#: ../cli/src/devices.c:716 ../cli/src/devices.c:717 ../cli/src/settings.c:520
+#: ../cli/src/settings.c:522 ../cli/src/settings.c:563
+#: ../cli/src/settings.c:663 ../cli/src/settings.c:937
+#: ../cli/src/settings.c:938 ../cli/src/settings.c:940
+#: ../cli/src/settings.c:942 ../cli/src/settings.c:1067
+#: ../cli/src/settings.c:1068 ../cli/src/settings.c:1069
+#: ../cli/src/settings.c:1148 ../cli/src/settings.c:1149
+#: ../cli/src/settings.c:1150 ../cli/src/settings.c:1151
+#: ../cli/src/settings.c:1152 ../cli/src/settings.c:1153
+#: ../cli/src/settings.c:1154 ../cli/src/settings.c:1155
+#: ../cli/src/settings.c:1156 ../cli/src/settings.c:1157
+#: ../cli/src/settings.c:1158 ../cli/src/settings.c:1159
+#: ../cli/src/settings.c:1160 ../cli/src/settings.c:1235
 msgid "no"
 msgstr "nem"
 
-#: ../cli/src/connections.c:461 ../cli/src/connections.c:504
-msgid "System connections"
-msgstr "Rendszerkapcsolatok"
+#: ../cli/src/connections.c:494
+msgid "Connection list"
+msgstr "Kapcsolatlista"
 
-#: ../cli/src/connections.c:466 ../cli/src/connections.c:517
-msgid "User connections"
-msgstr "Felhasználói kapcsolatok"
-
-#: ../cli/src/connections.c:478 ../cli/src/connections.c:1338
-#: ../cli/src/connections.c:1354 ../cli/src/connections.c:1363
-#: ../cli/src/connections.c:1374 ../cli/src/connections.c:1459
-#: ../cli/src/devices.c:962 ../cli/src/devices.c:972 ../cli/src/devices.c:1074
-#: ../cli/src/devices.c:1081
+#: ../cli/src/connections.c:507 ../cli/src/connections.c:1459
+#: ../cli/src/connections.c:1474 ../cli/src/connections.c:1483
+#: ../cli/src/connections.c:1493 ../cli/src/connections.c:1505
+#: ../cli/src/connections.c:1600 ../cli/src/devices.c:1190
+#: ../cli/src/devices.c:1200 ../cli/src/devices.c:1314
+#: ../cli/src/devices.c:1321 ../cli/src/devices.c:1534
+#: ../cli/src/devices.c:1541
 #, c-format
 msgid "Error: %s argument is missing."
 msgstr "Hiba: az argumentum (%s) hiányzik."
 
-#: ../cli/src/connections.c:491
+#: ../cli/src/connections.c:520
 #, c-format
 msgid "Error: %s - no such connection."
-msgstr "Hiba:  nincs ilyen kapcsolat: %s."
+msgstr "Hiba: nincs ilyen kapcsolat: %s."
 
-#: ../cli/src/connections.c:523 ../cli/src/connections.c:1387
-#: ../cli/src/connections.c:1477 ../cli/src/devices.c:785
-#: ../cli/src/devices.c:852 ../cli/src/devices.c:986 ../cli/src/devices.c:1087
+#: ../cli/src/connections.c:526 ../cli/src/connections.c:1518
+#: ../cli/src/connections.c:1617 ../cli/src/devices.c:987
+#: ../cli/src/devices.c:1067 ../cli/src/devices.c:1214
+#: ../cli/src/devices.c:1327 ../cli/src/devices.c:1547
 #, c-format
 msgid "Unknown parameter: %s\n"
 msgstr "Ismeretlen paraméter: %s\n"
 
-#: ../cli/src/connections.c:532
+#: ../cli/src/connections.c:535
 #, c-format
 msgid "Error: no valid parameter specified."
 msgstr "Hiba: nincs megadva érvényes paraméter."
 
-#: ../cli/src/connections.c:547 ../cli/src/connections.c:1580
-#: ../cli/src/devices.c:1293 ../cli/src/network-manager.c:359
+#: ../cli/src/connections.c:550 ../cli/src/connections.c:1708
+#: ../cli/src/devices.c:1755 ../cli/src/network-manager.c:463
 #, c-format
 msgid "Error: %s."
 msgstr "Hiba: %s."
 
-#: ../cli/src/connections.c:653
+#: ../cli/src/connections.c:638
 #, c-format
 msgid "Error: 'con status': %s"
 msgstr "Hiba: „con status”: %s"
 
-#: ../cli/src/connections.c:655
+#: ../cli/src/connections.c:640
 #, c-format
 msgid "Error: 'con status': %s; allowed fields: %s"
 msgstr "Hiba: „con status”: %s; engedélyezett mezők: %s"
 
-#: ../cli/src/connections.c:662
+#: ../cli/src/connections.c:648 ../cli/src/connections.c:1533
+#: ../cli/src/connections.c:1632 ../cli/src/devices.c:1014
+#: ../cli/src/devices.c:1076 ../cli/src/devices.c:1229
+#: ../cli/src/devices.c:1357 ../cli/src/devices.c:1576
+#, c-format
+msgid "Error: Can't find out if NetworkManager is running: %s."
+msgstr "Hiba: nem lehet megállapítani, hogy a Hálózatkezelő fut-e: %s."
+
+#: ../cli/src/connections.c:652 ../cli/src/connections.c:1537
+#: ../cli/src/connections.c:1636 ../cli/src/devices.c:1018
+#: ../cli/src/devices.c:1080 ../cli/src/devices.c:1233
+#: ../cli/src/devices.c:1361 ../cli/src/devices.c:1580
+#, c-format
+msgid "Error: NetworkManager is not running."
+msgstr "Hiba: a Hálózatkezelő nem fut."
+
+#: ../cli/src/connections.c:660
 msgid "Active connections"
 msgstr "Aktív kapcsolatok"
 
-#: ../cli/src/connections.c:1030
+#: ../cli/src/connections.c:1130
 #, c-format
 msgid "no active connection on device '%s'"
 msgstr "nincs aktív kapcsolat a(z) „%s” eszközön"
 
-#: ../cli/src/connections.c:1038
+#: ../cli/src/connections.c:1138
 #, c-format
 msgid "no active connection or device"
 msgstr "nincs aktív kapcsolat vagy eszköz"
 
-#: ../cli/src/connections.c:1088
+#: ../cli/src/connections.c:1209
 #, c-format
 msgid "device '%s' not compatible with connection '%s'"
 msgstr "a(z) „%s” eszköz nem kompatibilis a(z) „%s” kapcsolattal"
 
-#: ../cli/src/connections.c:1090
+#: ../cli/src/connections.c:1211
 #, c-format
 msgid "no device found for connection '%s'"
 msgstr "nem található eszköz a(z) „%s” kapcsolathoz"
 
-#: ../cli/src/connections.c:1101
+#: ../cli/src/connections.c:1222
 msgid "activating"
 msgstr "aktiválás"
 
-#: ../cli/src/connections.c:1103
+#: ../cli/src/connections.c:1224
 msgid "activated"
 msgstr "aktiválva"
 
-#: ../cli/src/connections.c:1106 ../cli/src/connections.c:1129
-#: ../cli/src/connections.c:1162 ../cli/src/devices.c:246
-#: ../cli/src/devices.c:558 ../cli/src/network-manager.c:94
-#: ../cli/src/network-manager.c:149 ../cli/src/settings.c:473
+#: ../cli/src/connections.c:1227 ../cli/src/connections.c:1250
+#: ../cli/src/connections.c:1283 ../cli/src/devices.c:308
+#: ../cli/src/devices.c:688 ../cli/src/network-manager.c:118
+#: ../cli/src/network-manager.c:180 ../cli/src/network-manager.c:183
+#: ../cli/src/network-manager.c:298 ../cli/src/network-manager.c:353
+#: ../cli/src/network-manager.c:391 ../cli/src/network-manager.c:430
+#: ../cli/src/settings.c:485 ../cli/src/utils.c:396
 msgid "unknown"
 msgstr "ismeretlen"
 
-#: ../cli/src/connections.c:1115
+#: ../cli/src/connections.c:1236
 msgid "VPN connecting (prepare)"
 msgstr "VPN kapcsolódás (előkészítés)"
 
-#: ../cli/src/connections.c:1117
+#: ../cli/src/connections.c:1238
 msgid "VPN connecting (need authentication)"
 msgstr "VPN csatlakozás (hitelesítés szükséges)"
 
-#: ../cli/src/connections.c:1119
+#: ../cli/src/connections.c:1240
 msgid "VPN connecting"
 msgstr "VPN csatlakozás"
 
-#: ../cli/src/connections.c:1121
+#: ../cli/src/connections.c:1242
 msgid "VPN connecting (getting IP configuration)"
 msgstr "VPN kapcsolódás (IP-beállítások lekérése)"
 
-#: ../cli/src/connections.c:1123
+#: ../cli/src/connections.c:1244
 msgid "VPN connected"
 msgstr "VPN csatlakozott"
 
-#: ../cli/src/connections.c:1125
+#: ../cli/src/connections.c:1246
 msgid "VPN connection failed"
 msgstr "VPN csatlakozás sikertelen"
 
-#: ../cli/src/connections.c:1127
+#: ../cli/src/connections.c:1248
 msgid "VPN disconnected"
 msgstr "VPN leválasztva"
 
-#: ../cli/src/connections.c:1138
+#: ../cli/src/connections.c:1259
 msgid "unknown reason"
 msgstr "ismeretlen ok"
 
-#: ../cli/src/connections.c:1140
+#: ../cli/src/connections.c:1261
 msgid "none"
 msgstr "nincs"
 
-#: ../cli/src/connections.c:1142
+#: ../cli/src/connections.c:1263
 msgid "the user was disconnected"
 msgstr "felhasználó leválasztva"
 
-#: ../cli/src/connections.c:1144
+#: ../cli/src/connections.c:1265
 msgid "the base network connection was interrupted"
 msgstr "az alap hálózati kapcsolat megszakadt"
 
-#: ../cli/src/connections.c:1146
+#: ../cli/src/connections.c:1267
 msgid "the VPN service stopped unexpectedly"
 msgstr "a VPN szolgáltatás váratlanul leállt"
 
-#: ../cli/src/connections.c:1148
+#: ../cli/src/connections.c:1269
 msgid "the VPN service returned invalid configuration"
 msgstr "a VPN szolgáltatás érvénytelen beállításokat adott"
 
-#: ../cli/src/connections.c:1150
+#: ../cli/src/connections.c:1271
 msgid "the connection attempt timed out"
 msgstr "a csatlakozási kísérlet túllépte az időkorlátot"
 
-#: ../cli/src/connections.c:1152
+#: ../cli/src/connections.c:1273
 msgid "the VPN service did not start in time"
 msgstr "a VPN szolgáltatás nem indult el időben"
 
-#: ../cli/src/connections.c:1154
+#: ../cli/src/connections.c:1275
 msgid "the VPN service failed to start"
 msgstr "a VPN szolgáltatás nem indult el"
 
-#: ../cli/src/connections.c:1156
+#: ../cli/src/connections.c:1277
 msgid "no valid VPN secrets"
 msgstr "nincsenek érvényes VPN titkok"
 
-#: ../cli/src/connections.c:1158
+#: ../cli/src/connections.c:1279
 msgid "invalid VPN secrets"
 msgstr "érvénytelen VPN titkok"
 
-#: ../cli/src/connections.c:1160
+#: ../cli/src/connections.c:1281
 msgid "the connection was removed"
 msgstr "a kapcsolat eltávolításra került"
 
-#: ../cli/src/connections.c:1174
+#: ../cli/src/connections.c:1295
 #, c-format
 msgid "state: %s\n"
 msgstr "állapot: %s\n"
 
-#: ../cli/src/connections.c:1177 ../cli/src/connections.c:1203
+#: ../cli/src/connections.c:1298 ../cli/src/connections.c:1324
 #, c-format
 msgid "Connection activated\n"
 msgstr "Kapcsolat aktiválva\n"
 
-#: ../cli/src/connections.c:1180
+#: ../cli/src/connections.c:1301
 #, c-format
 msgid "Error: Connection activation failed."
 msgstr "Hiba: a kapcsolat aktiválása meghiúsult."
 
-#: ../cli/src/connections.c:1199
+#: ../cli/src/connections.c:1320
 #, c-format
 msgid "state: %s (%d)\n"
 msgstr "állapot: %s (%d)\n"
 
-#: ../cli/src/connections.c:1209
+#: ../cli/src/connections.c:1330
 #, c-format
 msgid "Error: Connection activation failed: %s."
 msgstr "Hiba: a kapcsolat aktiválása meghiúsult: %s."
 
-#: ../cli/src/connections.c:1226 ../cli/src/devices.c:909
+#: ../cli/src/connections.c:1347 ../cli/src/devices.c:1136
 #, c-format
 msgid "Error: Timeout %d sec expired."
 msgstr "Hiba: az időkorlát (%d mp) lejárt."
 
-#: ../cli/src/connections.c:1269
+#: ../cli/src/connections.c:1390
 #, c-format
 msgid "Error: Connection activation failed: %s"
 msgstr "Hiba: a kapcsolat aktiválása meghiúsult: %s"
 
-#: ../cli/src/connections.c:1283
+#: ../cli/src/connections.c:1404
 #, c-format
 msgid "Error: Obtaining active connection for '%s' failed."
 msgstr "Hiba: az aktív kapcsolat létrehozása meghiúsult ehhez: „%s”."
 
-#: ../cli/src/connections.c:1292
+#: ../cli/src/connections.c:1413
 #, c-format
 msgid "Active connection state: %s\n"
 msgstr "Aktív kapcsolat állapota: %s\n"
 
-#: ../cli/src/connections.c:1293
+#: ../cli/src/connections.c:1414
 #, c-format
 msgid "Active connection path: %s\n"
 msgstr "Aktív kapcsolat útvonala: %s\n"
 
-#: ../cli/src/connections.c:1347 ../cli/src/connections.c:1468
+#: ../cli/src/connections.c:1467 ../cli/src/connections.c:1608
 #, c-format
 msgid "Error: Unknown connection: %s."
 msgstr "Hiba: ismeretlen kapcsolat: %s."
 
-#: ../cli/src/connections.c:1382 ../cli/src/devices.c:980
+#: ../cli/src/connections.c:1513 ../cli/src/devices.c:1208
 #, c-format
 msgid "Error: timeout value '%s' is not valid."
 msgstr "Hiba: a(z) „%s” időkorlát érvénytelen."
 
-#: ../cli/src/connections.c:1395 ../cli/src/connections.c:1485
+#: ../cli/src/connections.c:1526 ../cli/src/connections.c:1625
 #, c-format
 msgid "Error: id or uuid has to be specified."
 msgstr "Hiba: meg kell adni az id vagy uuid egyikét."
 
-#: ../cli/src/connections.c:1415
+#: ../cli/src/connections.c:1556
 #, c-format
 msgid "Error: No suitable device found: %s."
 msgstr "Hiba: nem található megfelelő eszköz: %s."
 
-#: ../cli/src/connections.c:1417
+#: ../cli/src/connections.c:1558
 #, c-format
 msgid "Error: No suitable device found."
 msgstr "Hiba: nem található megfelelő eszköz."
 
-#: ../cli/src/connections.c:1512
+#: ../cli/src/connections.c:1661
 #, c-format
 msgid "Warning: Connection not active\n"
 msgstr "Figyelmeztetés: a kapcsolat nem aktív\n"
 
-#: ../cli/src/connections.c:1569
+#: ../cli/src/connections.c:1699
 #, c-format
 msgid "Error: 'con' command '%s' is not valid."
 msgstr "Hiba: a(z) „%s” „con” parancs nem érvényes."
 
-#: ../cli/src/connections.c:1605
+#: ../cli/src/connections.c:1764
 #, c-format
 msgid "Error: could not connect to D-Bus."
 msgstr "Hiba: nem lehet a D-Bushoz kapcsolódni."
 
-#: ../cli/src/connections.c:1612
+#: ../cli/src/connections.c:1771
 #, c-format
 msgid "Error: Could not get system settings."
 msgstr "Hiba: a rendszer beállításai nem kérhetők le."
 
-#: ../cli/src/connections.c:1620
-#, c-format
-msgid "Error: Could not get user settings."
-msgstr "Hiba: a felhasználó beállításai nem kérhetők le."
-
-#: ../cli/src/connections.c:1630
+#: ../cli/src/connections.c:1781
 #, c-format
-msgid "Error: Can't obtain connections: settings services are not running."
-msgstr "Hiba: nem kérhetők le a kapcsolatok: a beállítószolgáltatások nem futnak."
+msgid "Error: Can't obtain connections: settings service is not running."
+msgstr "Hiba: nem kérhetők le a kapcsolatok: a beállító szolgáltatás nem fut."
 
 #. 0
 #. 9
-#: ../cli/src/devices.c:61 ../cli/src/devices.c:89 ../cli/src/devices.c:184
+#. 3
+#: ../cli/src/devices.c:66 ../cli/src/devices.c:102 ../cli/src/devices.c:212
+#: ../cli/src/devices.c:228
 msgid "DEVICE"
 msgstr "ESZKÖZ"
 
 #. 1
 #. 4
-#. 0
-#: ../cli/src/devices.c:63 ../cli/src/devices.c:93
-#: ../cli/src/network-manager.c:36
+#. 1
+#: ../cli/src/devices.c:68 ../cli/src/devices.c:106
+#: ../cli/src/network-manager.c:39
 msgid "STATE"
 msgstr "ÁLLAPOT"
 
-#: ../cli/src/devices.c:72
+#: ../cli/src/devices.c:78
 msgid "GENERAL"
 msgstr "ÁLTALÁNOS"
 
 #. 0
-#: ../cli/src/devices.c:73
+#: ../cli/src/devices.c:79
 msgid "CAPABILITIES"
 msgstr "KÉPESSÉGEK"
 
 #. 1
-#: ../cli/src/devices.c:74
+#: ../cli/src/devices.c:80
 msgid "WIFI-PROPERTIES"
 msgstr "WIFI-KÉPESSÉGEK"
 
 #. 2
-#: ../cli/src/devices.c:75
+#: ../cli/src/devices.c:81
 msgid "AP"
 msgstr "AP"
 
 #. 3
-#: ../cli/src/devices.c:76
+#: ../cli/src/devices.c:82
 msgid "WIRED-PROPERTIES"
 msgstr "VEZETÉKES-TULAJDONSÁGOK"
 
 #. 4
-#: ../cli/src/devices.c:77
+#: ../cli/src/devices.c:83
+msgid "WIMAX-PROPERTIES"
+msgstr "WIMAX-TULAJDONSÁGOK"
+
+#. 5
+#. 0
+#: ../cli/src/devices.c:84 ../cli/src/devices.c:225
+msgid "NSP"
+msgstr "NSP"
+
+#. 6
+#: ../cli/src/devices.c:85
 msgid "IP4-SETTINGS"
 msgstr "IP4-BEÁLLÍTÁSOK"
 
-#. 5
-#: ../cli/src/devices.c:78
+#. 7
+#: ../cli/src/devices.c:86
 msgid "IP4-DNS"
 msgstr "IP4-DNS"
 
-#. 6
-#: ../cli/src/devices.c:79
+#. 8
+#: ../cli/src/devices.c:87
 msgid "IP6-SETTINGS"
 msgstr "IP6-BEÁLLÍTÁSOK"
 
-#. 7
-#: ../cli/src/devices.c:80
+#. 9
+#: ../cli/src/devices.c:88
 msgid "IP6-DNS"
 msgstr "IP6-DNS"
 
 #. 2
-#: ../cli/src/devices.c:91
+#: ../cli/src/devices.c:104
 msgid "DRIVER"
 msgstr "ILLESZTŐPROGRAM"
 
 #. 3
-#: ../cli/src/devices.c:92
+#: ../cli/src/devices.c:105
 msgid "HWADDR"
 msgstr "HWCÍM"
 
 #. 0
-#: ../cli/src/devices.c:102
+#: ../cli/src/devices.c:115
 msgid "CARRIER-DETECT"
 msgstr "HORDOZÓ-FELISMERÉS"
 
 #. 1
-#: ../cli/src/devices.c:103
+#: ../cli/src/devices.c:116
 msgid "SPEED"
 msgstr "SEBESSÉG"
 
 #. 0
-#: ../cli/src/devices.c:112
+#: ../cli/src/devices.c:125
 msgid "CARRIER"
 msgstr "HORDOZÓ"
 
 #. 0
-#: ../cli/src/devices.c:122
+#: ../cli/src/devices.c:135
 msgid "WEP"
 msgstr "WEP"
 
 #. 1
-#: ../cli/src/devices.c:123
+#: ../cli/src/devices.c:136
 msgid "WPA"
 msgstr "WPA"
 
 #. 2
-#: ../cli/src/devices.c:124
+#: ../cli/src/devices.c:137
 msgid "WPA2"
 msgstr "WPA2"
 
 #. 3
-#: ../cli/src/devices.c:125
+#: ../cli/src/devices.c:138
 msgid "TKIP"
 msgstr "TKIP"
 
 #. 4
-#: ../cli/src/devices.c:126
+#: ../cli/src/devices.c:139
 msgid "CCMP"
 msgstr "CCMP"
 
 #. 0
-#: ../cli/src/devices.c:135 ../cli/src/devices.c:146
+#: ../cli/src/devices.c:149
+msgid "CTR-FREQ"
+msgstr "CTR-FREK"
+
+#. 1
+#: ../cli/src/devices.c:150
+msgid "RSSI"
+msgstr "RSSI"
+
+#. 2
+#: ../cli/src/devices.c:151
+msgid "CINR"
+msgstr "CINR"
+
+#. 3
+#: ../cli/src/devices.c:152
+msgid "TX-POW"
+msgstr "TX-POW"
+
+#. 4
+#: ../cli/src/devices.c:153
+msgid "BSID"
+msgstr "BSID"
+
+#. 0
+#: ../cli/src/devices.c:163 ../cli/src/devices.c:174
 msgid "ADDRESS"
 msgstr "CÍM"
 
 #. 1
-#: ../cli/src/devices.c:136 ../cli/src/devices.c:147
+#: ../cli/src/devices.c:164 ../cli/src/devices.c:175
 msgid "PREFIX"
 msgstr "ELŐTAG"
 
 #. 2
-#: ../cli/src/devices.c:137 ../cli/src/devices.c:148
+#: ../cli/src/devices.c:165 ../cli/src/devices.c:176
 msgid "GATEWAY"
 msgstr "ÁTJÁRÓ"
 
 #. 0
-#: ../cli/src/devices.c:157 ../cli/src/devices.c:166
+#: ../cli/src/devices.c:185 ../cli/src/devices.c:194
 msgid "DNS"
 msgstr "DNS"
 
 #. 0
-#: ../cli/src/devices.c:175
+#: ../cli/src/devices.c:203
 msgid "SSID"
 msgstr "SSID"
 
 #. 1
-#: ../cli/src/devices.c:176
+#: ../cli/src/devices.c:204
 msgid "BSSID"
 msgstr "BSSID"
 
 #. 2
-#: ../cli/src/devices.c:177
+#: ../cli/src/devices.c:205
 msgid "MODE"
 msgstr "MÓD"
 
 #. 3
-#: ../cli/src/devices.c:178
+#: ../cli/src/devices.c:206
 msgid "FREQ"
 msgstr "FREK"
 
 #. 4
-#: ../cli/src/devices.c:179
+#: ../cli/src/devices.c:207
 msgid "RATE"
 msgstr "SEBESSÉG"
 
 #. 5
-#: ../cli/src/devices.c:180
+#. 1
+#: ../cli/src/devices.c:208 ../cli/src/devices.c:226
 msgid "SIGNAL"
 msgstr "SZIGNÁL"
 
 #. 6
-#: ../cli/src/devices.c:181
+#: ../cli/src/devices.c:209
 msgid "SECURITY"
 msgstr "BIZTONSÁG"
 
 #. 7
-#: ../cli/src/devices.c:182
+#: ../cli/src/devices.c:210
 msgid "WPA-FLAGS"
 msgstr "WPA-JELZŐK"
 
 #. 8
-#: ../cli/src/devices.c:183
+#: ../cli/src/devices.c:211
 msgid "RSN-FLAGS"
 msgstr "RSN-JELZŐK"
 
 #. 10
-#: ../cli/src/devices.c:185
+#. 4
+#: ../cli/src/devices.c:213 ../cli/src/devices.c:229
 msgid "ACTIVE"
 msgstr "AKTÍV"
 
-#: ../cli/src/devices.c:208
+#: ../cli/src/devices.c:256
 #, c-format
 msgid ""
 "Usage: nmcli dev { COMMAND | help }\n"
 "\n"
+"  COMMAND := { status | list | disconnect | wifi | wimax }\n"
+"\n"
 "  COMMAND := { status | list | disconnect | wifi }\n"
 "\n"
 "  status\n"
 "  list [iface <iface>]\n"
 "  disconnect iface <iface> [--nowait] [--timeout <timeout>]\n"
 "  wifi [list [iface <iface>] [hwaddr <hwaddr>]]\n"
+"  wimax [list [iface <iface>] [nsp <name>]]\n"
 "\n"
 msgstr ""
 "Használat: nmcli dev { PARANCS | help }\n"
 "\n"
+"  PARANCS := { status | list | disconnect | wifi | wimax }\n"
+"\n"
 "  PARANCS := { status | list | disconnect | wifi }\n"
 "\n"
 "  status\n"
 "  list [iface <csatoló>]\n"
 "  disconnect iface <csatoló> [--nowait] [--timeout <időkorlát>]\n"
 "  wifi [list [iface <csatoló>] [hwaddr <hwcím>]]\n"
+"  wimax [list [iface <csatoló>] [nsp <név>]]\n"
 "\n"
 
-#: ../cli/src/devices.c:228
+#: ../cli/src/devices.c:284
 msgid "unmanaged"
 msgstr "kezeletlen"
 
-#: ../cli/src/devices.c:230
+#: ../cli/src/devices.c:286
 msgid "unavailable"
 msgstr "elérhetetlen"
 
-#: ../cli/src/devices.c:232 ../cli/src/network-manager.c:91
+#: ../cli/src/devices.c:288 ../cli/src/network-manager.c:115
 msgid "disconnected"
 msgstr "leválasztva"
 
-#: ../cli/src/devices.c:234
+#: ../cli/src/devices.c:290
 msgid "connecting (prepare)"
 msgstr "kapcsolódás (előkészítés)"
 
-#: ../cli/src/devices.c:236
+#: ../cli/src/devices.c:292
 msgid "connecting (configuring)"
 msgstr "kapcsolódás (konfigurálás)"
 
-#: ../cli/src/devices.c:238
+#: ../cli/src/devices.c:294
 msgid "connecting (need authentication)"
 msgstr "kapcsolódás (hitelesítés szükséges)"
 
-#: ../cli/src/devices.c:240
+#: ../cli/src/devices.c:296
 msgid "connecting (getting IP configuration)"
 msgstr "kapcsolódás (IP-beállítások lekérése)"
 
-#: ../cli/src/devices.c:242 ../cli/src/network-manager.c:89
+#: ../cli/src/devices.c:298
+msgid "connecting (checking IP connectivity)"
+msgstr "kapcsolódás (IP-összekapcsolhatóság ellenőrzése)"
+
+#: ../cli/src/devices.c:300
+msgid "connecting (starting secondary connections)"
+msgstr "kapcsolódás (másodlagos kapcsolatok indítása)"
+
+#: ../cli/src/devices.c:302 ../cli/src/network-manager.c:111
 msgid "connected"
 msgstr "kapcsolódva"
 
-#: ../cli/src/devices.c:244
+#: ../cli/src/devices.c:304
+msgid "deactivating"
+msgstr "kikapcsolás"
+
+#: ../cli/src/devices.c:306
 msgid "connection failed"
 msgstr "kapcsolódás sikertelen"
 
-#: ../cli/src/devices.c:267 ../cli/src/devices.c:424
+#: ../cli/src/devices.c:331 ../cli/src/devices.c:341 ../cli/src/devices.c:501
+#: ../cli/src/devices.c:545
 msgid "Unknown"
 msgstr "Ismeretlen"
 
-#: ../cli/src/devices.c:299
+#: ../cli/src/devices.c:374
 msgid "(none)"
 msgstr "(semmi)"
 
-#: ../cli/src/devices.c:324
+#: ../cli/src/devices.c:399
 #, c-format
 msgid "%s: error converting IP4 address 0x%X"
 msgstr "%s: hiba az IP4 cím (0x%X) konvertálásakor"
 
-#: ../cli/src/devices.c:393
+#: ../cli/src/devices.c:470
 #, c-format
 msgid "%u MHz"
 msgstr "%u MHz"
 
-#: ../cli/src/devices.c:394
+#: ../cli/src/devices.c:471
 #, c-format
 msgid "%u MB/s"
 msgstr "%u MB/s"
 
-#: ../cli/src/devices.c:403
+#: ../cli/src/devices.c:480
 msgid "Encrypted: "
 msgstr "Titkosított: "
 
-#: ../cli/src/devices.c:408
+#: ../cli/src/devices.c:485
 msgid "WEP "
 msgstr "WEP "
 
-#: ../cli/src/devices.c:410
+#: ../cli/src/devices.c:487
 msgid "WPA "
 msgstr "WPA "
 
-#: ../cli/src/devices.c:412
+#: ../cli/src/devices.c:489
 msgid "WPA2 "
 msgstr "WPA2 "
 
-#: ../cli/src/devices.c:415
+#: ../cli/src/devices.c:492
 msgid "Enterprise "
 msgstr "Enterprise "
 
-#: ../cli/src/devices.c:424
+#: ../cli/src/devices.c:501
 msgid "Ad-Hoc"
 msgstr "Eseti"
 
-#: ../cli/src/devices.c:424
+#: ../cli/src/devices.c:501
 msgid "Infrastructure"
 msgstr "Infrastruktúra"
 
-#: ../cli/src/devices.c:486
+#: ../cli/src/devices.c:536
+msgid "Home"
+msgstr "Otthoni"
+
+#: ../cli/src/devices.c:539
+msgid "Partner"
+msgstr "Partner"
+
+#: ../cli/src/devices.c:542
+msgid "Roaming"
+msgstr "Barangoló"
+
+#: ../cli/src/devices.c:612
 #, c-format
 msgid "Error: 'dev list': %s"
 msgstr "Hiba: „dev list”: %s"
 
-#: ../cli/src/devices.c:488
+#: ../cli/src/devices.c:614
 #, c-format
 msgid "Error: 'dev list': %s; allowed fields: %s"
 msgstr "Hiba: „dev list”: %s; engedélyezett mezők: %s"
 
-#: ../cli/src/devices.c:497
+#: ../cli/src/devices.c:623
 msgid "Device details"
 msgstr "Eszköz részletei"
 
-#: ../cli/src/devices.c:527 ../cli/src/devices.c:925
+#: ../cli/src/devices.c:657 ../cli/src/devices.c:1152 ../cli/src/utils.c:342
 msgid "(unknown)"
 msgstr "(ismeretlen)"
 
-#: ../cli/src/devices.c:528
+#: ../cli/src/devices.c:658
 msgid "unknown)"
 msgstr "ismeretlen)"
 
-#: ../cli/src/devices.c:554
+#: ../cli/src/devices.c:684
 #, c-format
 msgid "%u Mb/s"
 msgstr "%u Mb/s"
 
 #. Print header
 #. "WIRED-PROPERTIES"
-#: ../cli/src/devices.c:627
+#: ../cli/src/devices.c:757
 msgid "on"
 msgstr "be"
 
-#: ../cli/src/devices.c:627
+#: ../cli/src/devices.c:757
 msgid "off"
 msgstr "ki"
 
-#: ../cli/src/devices.c:808
+#: ../cli/src/devices.c:1004
 #, c-format
 msgid "Error: 'dev status': %s"
 msgstr "Hiba: „dev status”: %s"
 
-#: ../cli/src/devices.c:810
+#: ../cli/src/devices.c:1006
 #, c-format
 msgid "Error: 'dev status': %s; allowed fields: %s"
 msgstr "Hiba: „dev status”: %s; engedélyezett mezők: %s"
 
-#: ../cli/src/devices.c:817
+#: ../cli/src/devices.c:1029
 msgid "Status of devices"
 msgstr "Eszközök állapota"
 
-#: ../cli/src/devices.c:845
+#: ../cli/src/devices.c:1060
 #, c-format
 msgid "Error: '%s' argument is missing."
 msgstr "Hiba: „%s” argumentum hiányzik."
 
-#: ../cli/src/devices.c:874 ../cli/src/devices.c:1013
-#: ../cli/src/devices.c:1136
+#: ../cli/src/devices.c:1101 ../cli/src/devices.c:1253
+#: ../cli/src/devices.c:1389 ../cli/src/devices.c:1608
 #, c-format
 msgid "Error: Device '%s' not found."
 msgstr "Hiba: a(z) „%s” eszköz nem található."
 
-#: ../cli/src/devices.c:897
+#: ../cli/src/devices.c:1124
 #, c-format
 msgid "Success: Device '%s' successfully disconnected."
 msgstr "Siker: a(z) „%s” eszköz sikeresen leválasztva."
 
-#: ../cli/src/devices.c:922
+#: ../cli/src/devices.c:1149
 #, c-format
 msgid "Error: Device '%s' (%s) disconnecting failed: %s"
 msgstr "Hiba: a(z) „%s” (%s) eszköz leválasztása meghiúsult: %s"
 
-#: ../cli/src/devices.c:930
+#: ../cli/src/devices.c:1157
 #, c-format
 msgid "Device state: %d (%s)\n"
 msgstr "Eszköz állapota: %d (%s)\n"
 
-#: ../cli/src/devices.c:994
+#: ../cli/src/devices.c:1222
 #, c-format
 msgid "Error: iface has to be specified."
 msgstr "Hiba: meg kell adni a csatolót."
 
-#: ../cli/src/devices.c:1112
+#: ../cli/src/devices.c:1347
 #, c-format
 msgid "Error: 'dev wifi': %s"
-msgstr "Hiba:  „dev wifi”: %s"
+msgstr "Hiba: „dev wifi”: %s"
 
-#: ../cli/src/devices.c:1114
+#: ../cli/src/devices.c:1349
 #, c-format
 msgid "Error: 'dev wifi': %s; allowed fields: %s"
-msgstr "Hiba:  „dev wifi”: %s; engedélyezett mezők: %s"
+msgstr "Hiba: „dev wifi”: %s; engedélyezett mezők: %s"
 
-#: ../cli/src/devices.c:1121
+#: ../cli/src/devices.c:1372
 msgid "WiFi scan list"
 msgstr "WiFi-keresési lista"
 
-#: ../cli/src/devices.c:1156 ../cli/src/devices.c:1210
+#: ../cli/src/devices.c:1409 ../cli/src/devices.c:1463
+#: ../cli/src/devices.c:1670
 #, c-format
 msgid "Error: Access point with hwaddr '%s' not found."
 msgstr "Hiba: nem található a(z) „%s” hwcímű hozzáférési pont,"
 
-#: ../cli/src/devices.c:1173
+#: ../cli/src/devices.c:1426
 #, c-format
 msgid "Error: Device '%s' is not a WiFi device."
-msgstr "Hiba:  a(z) „%s” eszköz nem WiFi-eszköz."
+msgstr "Hiba: a(z) „%s” eszköz nem WiFi-eszköz."
 
-#: ../cli/src/devices.c:1237
+#: ../cli/src/devices.c:1490
 #, c-format
 msgid "Error: 'dev wifi' command '%s' is not valid."
 msgstr "Hiba: a „dev wifi” parancs („%s) nem érvényes."
 
-#: ../cli/src/devices.c:1284
+#: ../cli/src/devices.c:1566
+#, c-format
+msgid "Error: 'dev wimax': %s"
+msgstr "Hiba: „dev wimax”: %s"
+
+#: ../cli/src/devices.c:1568
+#, c-format
+msgid "Error: 'dev wimax': %s; allowed fields: %s"
+msgstr "Hiba: „dev wimax”: %s; engedélyezett mezők: %s"
+
+#: ../cli/src/devices.c:1591
+msgid "WiMAX NSP list"
+msgstr "WiMAX NSP-lista"
+
+#: ../cli/src/devices.c:1628
+#, c-format
+msgid "Error: NSP with name '%s' not found."
+msgstr "Hiba: a(z) „%s” nevű NSP nem található."
+
+#: ../cli/src/devices.c:1639
+#, c-format
+msgid "Error: Device '%s' is not a WiMAX device."
+msgstr "Hiba: a(z) „%s” eszköz nem WiMAX-eszköz."
+
+#: ../cli/src/devices.c:1697
+#, c-format
+msgid "Error: 'dev wimax' command '%s' is not valid."
+msgstr "Hiba: a „dev wimax” parancs („%s) nem érvényes."
+
+#: ../cli/src/devices.c:1747
 #, c-format
 msgid "Error: 'dev' command '%s' is not valid."
 msgstr "Hiba: a „dev” parancs („%s) nem érvényes."
 
-#: ../cli/src/network-manager.c:35
+#: ../cli/src/network-manager.c:37
 msgid "RUNNING"
 msgstr "FUT"
 
-#. 1
-#: ../cli/src/network-manager.c:37
+#. 0
+#: ../cli/src/network-manager.c:38
+msgid "VERSION"
+msgstr "VERZIÓ"
+
+#. 2
+#: ../cli/src/network-manager.c:40
 msgid "NET-ENABLED"
 msgstr "NET-KÉPES"
 
-#. 2
-#: ../cli/src/network-manager.c:38
+#. 3
+#: ../cli/src/network-manager.c:41
 msgid "WIFI-HARDWARE"
 msgstr "WIFI-HARDVER"
 
-#. 3
-#: ../cli/src/network-manager.c:39
+#. 4
+#: ../cli/src/network-manager.c:42
 msgid "WIFI"
 msgstr "WIFI"
 
-#. 4
-#: ../cli/src/network-manager.c:40
+#. 5
+#: ../cli/src/network-manager.c:43
 msgid "WWAN-HARDWARE"
 msgstr "WWAN-HARDVER"
 
-#. 5
-#: ../cli/src/network-manager.c:41
+#. 6
+#: ../cli/src/network-manager.c:44
 msgid "WWAN"
 msgstr "WWAN"
 
-#: ../cli/src/network-manager.c:64
-#, c-format
-#| msgid ""
-#| "Usage: nmcli nm { COMMAND | help }\n"
-#| "\n"
-#| "  COMMAND := { status | sleep | wakeup | wifi | wwan }\n"
-#| "\n"
-#| "  status\n"
-#| "  sleep\n"
-#| "  wakeup\n"
-#| "  wifi [on|off]\n"
-#| "  wwan [on|off]\n"
-#| "\n"
+#. 7
+#: ../cli/src/network-manager.c:45
+msgid "WIMAX-HARDWARE"
+msgstr "WIMAX-HARDVER"
+
+#. 8
+#: ../cli/src/network-manager.c:46
+msgid "WIMAX"
+msgstr "WIMAX"
+
+#: ../cli/src/network-manager.c:74
+#, c-format
 msgid ""
 "Usage: nmcli nm { COMMAND | help }\n"
 "\n"
+"  COMMAND := { status | enable | sleep | wifi | wwan | wimax }\n"
+"\n"
 "  COMMAND := { status | enable | sleep | wifi | wwan }\n"
 "\n"
 "  status\n"
@@ -908,10 +1023,13 @@ msgid ""
 "  sleep [true|false]\n"
 "  wifi [on|off]\n"
 "  wwan [on|off]\n"
+"  wimax [on|off]\n"
 "\n"
 msgstr ""
 "Használat: nmcli nm { PARANCS | help }\n"
 "\n"
+"  PARANCS := { status | enable | sleep | wifi | wwan | wimax }\n"
+"\n"
 "  PARANCS := { status | enable | sleep | wifi | wwan }\n"
 "\n"
 "  status\n"
@@ -919,124 +1037,149 @@ msgstr ""
 "  sleep [true|false]\n"
 "  wifi [on|off]\n"
 "  wwan [on|off]\n"
+"  wimax [on|off]\n"
 "\n"
 
-#: ../cli/src/network-manager.c:85
+#: ../cli/src/network-manager.c:103
 msgid "asleep"
 msgstr "alszik"
 
-#: ../cli/src/network-manager.c:87
+#: ../cli/src/network-manager.c:105
 msgid "connecting"
 msgstr "csatlakozás"
 
-#: ../cli/src/network-manager.c:128
+#: ../cli/src/network-manager.c:107
+msgid "connected (local only)"
+msgstr "kapcsolódva (csak helyi)"
+
+#: ../cli/src/network-manager.c:109
+msgid "connected (site only)"
+msgstr "kapcsolódva (csak hely)"
+
+#: ../cli/src/network-manager.c:113
+msgid "disconnecting"
+msgstr "leválasztás"
+
+#: ../cli/src/network-manager.c:153
 #, c-format
 msgid "Error: 'nm status': %s"
 msgstr "Hiba: „nm status”: %s"
 
-#: ../cli/src/network-manager.c:130
+#: ../cli/src/network-manager.c:155
 #, c-format
 msgid "Error: 'nm status': %s; allowed fields: %s"
 msgstr "Hiba: „nm status”: %s; engedélyezett mezők: %s"
 
-#: ../cli/src/network-manager.c:137
-msgid "NetworkManager status"
-msgstr "Hálózatkezelő állapota"
-
-#. Print header
-#: ../cli/src/network-manager.c:144 ../cli/src/network-manager.c:145
-#: ../cli/src/network-manager.c:146 ../cli/src/network-manager.c:147
-#: ../cli/src/network-manager.c:154 ../cli/src/network-manager.c:247
-#: ../cli/src/network-manager.c:296 ../cli/src/network-manager.c:328
+#. create NMClient
+#: ../cli/src/network-manager.c:168 ../cli/src/network-manager.c:169
+#: ../cli/src/network-manager.c:170 ../cli/src/network-manager.c:171
+#: ../cli/src/network-manager.c:172 ../cli/src/network-manager.c:174
+#: ../cli/src/network-manager.c:175 ../cli/src/network-manager.c:296
+#: ../cli/src/network-manager.c:351 ../cli/src/network-manager.c:389
+#: ../cli/src/network-manager.c:428
 msgid "enabled"
 msgstr "engedélyezve"
 
-#: ../cli/src/network-manager.c:144 ../cli/src/network-manager.c:145
-#: ../cli/src/network-manager.c:146 ../cli/src/network-manager.c:147
-#: ../cli/src/network-manager.c:154 ../cli/src/network-manager.c:247
-#: ../cli/src/network-manager.c:296 ../cli/src/network-manager.c:328
+#: ../cli/src/network-manager.c:168 ../cli/src/network-manager.c:169
+#: ../cli/src/network-manager.c:170 ../cli/src/network-manager.c:171
+#: ../cli/src/network-manager.c:172 ../cli/src/network-manager.c:174
+#: ../cli/src/network-manager.c:175 ../cli/src/network-manager.c:296
+#: ../cli/src/network-manager.c:351 ../cli/src/network-manager.c:389
+#: ../cli/src/network-manager.c:428
 msgid "disabled"
 msgstr "letiltva"
 
-#: ../cli/src/network-manager.c:152
+#: ../cli/src/network-manager.c:188
+msgid "NetworkManager status"
+msgstr "Hálózatkezelő állapota"
+
+#. Print header
+#: ../cli/src/network-manager.c:191
 msgid "running"
 msgstr "fut"
 
-#: ../cli/src/network-manager.c:152
+#: ../cli/src/network-manager.c:191
 msgid "not running"
 msgstr "nem fut"
 
-#: ../cli/src/network-manager.c:175
+#: ../cli/src/network-manager.c:222 ../cli/src/utils.c:322
 #, c-format
-#| msgid "Error: could not connect to D-Bus."
 msgid "Error: Couldn't connect to system bus: %s"
 msgstr "Hiba: nem lehet a rendszerbuszhoz kapcsolódni: %s"
 
-#: ../cli/src/network-manager.c:186
+#: ../cli/src/network-manager.c:233
 #, c-format
-#| msgid "Error: could not connect to D-Bus."
 msgid "Error: Couldn't create D-Bus object proxy."
 msgstr "Hiba: nem lehet a D-Bus objektumproxyhoz kapcsolódni."
 
-#: ../cli/src/network-manager.c:192
+#: ../cli/src/network-manager.c:239
 #, c-format
-#| msgid "Error: 'con list': %s"
 msgid "Error in sleep: %s"
 msgstr "Hiba az alváskor: %s"
 
-#: ../cli/src/network-manager.c:237 ../cli/src/network-manager.c:286
-#: ../cli/src/network-manager.c:318
+#: ../cli/src/network-manager.c:283 ../cli/src/network-manager.c:338
+#: ../cli/src/network-manager.c:376 ../cli/src/network-manager.c:415
 #, c-format
 msgid "Error: '--fields' value '%s' is not valid here; allowed fields: %s"
-msgstr "Hiba: a(z) „%s” „--fields” érték itt nem érvényes; engedélyezett mezők: %s"
+msgstr ""
+"Hiba: a(z) „%s” „--fields” érték itt nem érvényes; engedélyezett mezők: %s"
 
-#: ../cli/src/network-manager.c:245
-#| msgid "WiFi enabled"
+#: ../cli/src/network-manager.c:291
 msgid "Networking enabled"
 msgstr "Hálózatkezelés engedélyezve"
 
-#: ../cli/src/network-manager.c:256
+#: ../cli/src/network-manager.c:307
 #, c-format
-#| msgid "Error: invalid 'wwan' parameter: '%s'."
 msgid "Error: invalid 'enable' parameter: '%s'; use 'true' or 'false'."
-msgstr "Hiba: érvénytelen „enable” paraméter: „%s”; használja a  „true” vagy „false” egyikét."
+msgstr ""
+"Hiba: érvénytelen „enable” paraméter: „%s”; használja a  „true” vagy „false” "
+"egyikét."
 
-#: ../cli/src/network-manager.c:265
+#: ../cli/src/network-manager.c:317
 #, c-format
-#| msgid "Error: Could not connect to NetworkManager."
 msgid "Error: Sleeping status is not exported by NetworkManager."
 msgstr "Hiba: a Hálózatkezelő nem exportálta az alvási állapotot."
 
-#: ../cli/src/network-manager.c:273
+#: ../cli/src/network-manager.c:325
 #, c-format
-#| msgid "Error: invalid 'wifi' parameter: '%s'."
 msgid "Error: invalid 'sleep' parameter: '%s'; use 'true' or 'false'."
-msgstr "Hiba: érvénytelen „sleep” paraméter: „%s”; használja a  „true” vagy „false” egyikét."
+msgstr ""
+"Hiba: érvénytelen „sleep” paraméter: „%s”; használja a  „true” vagy „false” "
+"egyikét."
 
-#: ../cli/src/network-manager.c:294
+#: ../cli/src/network-manager.c:346
 msgid "WiFi enabled"
 msgstr "WiFi engedélyezve"
 
-#: ../cli/src/network-manager.c:305
+#: ../cli/src/network-manager.c:362
 #, c-format
 msgid "Error: invalid 'wifi' parameter: '%s'."
 msgstr "Hiba: érvénytelen „wifi” paraméter: „%s”."
 
-#: ../cli/src/network-manager.c:326
+#: ../cli/src/network-manager.c:384
 msgid "WWAN enabled"
 msgstr "WWAN engedélyezve"
 
-#: ../cli/src/network-manager.c:337
+#: ../cli/src/network-manager.c:400
 #, c-format
 msgid "Error: invalid 'wwan' parameter: '%s'."
 msgstr "Hiba: érvénytelen „wwan” paraméter: „%s”."
 
-#: ../cli/src/network-manager.c:348
+#: ../cli/src/network-manager.c:423
+msgid "WiMAX enabled"
+msgstr "WiMAX engedélyezve"
+
+#: ../cli/src/network-manager.c:439
+#, c-format
+msgid "Error: invalid 'wimax' parameter: '%s'."
+msgstr "Hiba: érvénytelen „wimax” paraméter: „%s”."
+
+#: ../cli/src/network-manager.c:452
 #, c-format
 msgid "Error: 'nm' command '%s' is not valid."
 msgstr "Hiba: a(z) „%s” „nm” parancs nem érvényes."
 
-#: ../cli/src/nmcli.c:69
+#: ../cli/src/nmcli.c:64
 #, c-format
 msgid ""
 "Usage: %s [OPTIONS] OBJECT { COMMAND | help }\n"
@@ -1048,6 +1191,8 @@ msgid ""
 "  -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"
 "  -v[ersion]                                 show program version\n"
 "  -h[elp]                                    print this help\n"
 "\n"
@@ -1063,380 +1208,419 @@ msgstr ""
 "  -t[erse]                                   tömör kimenet\n"
 "  -p[retty]                                  szép kimenet\n"
 "  -m[ode] tabular|multiline                  kimeneti mód\n"
-"  -f[ields] <mező1,mező2,…>|all|common   kiírandó mezők megadása\n"
+"  -f[ields] <mező1,mező2,…>|all|common       kiírandó mezők megadása\n"
 "  -e[scape] yes|no                           oszlopelválasztók escape-lése "
-"az értékekben\n"
+"az\n"
+"                                               értékekben\n"
+"  -n[ocheck]                                 ne ellenőrizze az nmcli és a\n"
+"                                               Hálózatkezelő verzióit\n"
 "  -v[ersion]                                 programverzió kiírása\n"
 "  -h[elp]                                    ezen súgó kiírása\n"
 "\n"
 "OBJEKTUM\n"
-"  nm          Hálózatkezelő állapota\n"
-"  con         Hálózatkezelő kapcsolatai\n"
+"  nm          A Hálózatkezelő állapota\n"
+"  con         A Hálózatkezelő kapcsolatai\n"
 "  dev         A Hálózatkezelő által kezelt eszközök\n"
 "\n"
 
-#: ../cli/src/nmcli.c:113
+#: ../cli/src/nmcli.c:109
 #, c-format
 msgid "Error: Object '%s' is unknown, try 'nmcli help'."
-msgstr "Hiba: a(z) „%s” objektum ismeretlen, adja ki az „nmcli help” parancsot."
+msgstr ""
+"Hiba: a(z) „%s” objektum ismeretlen, adja ki az „nmcli help” parancsot."
 
-#: ../cli/src/nmcli.c:143
+#: ../cli/src/nmcli.c:139
 #, c-format
 msgid "Error: Option '--terse' is specified the second time."
 msgstr "Hiba: a „--terse” kapcsoló másodszor lett megadva."
 
-#: ../cli/src/nmcli.c:148
+#: ../cli/src/nmcli.c:144
 #, c-format
 msgid "Error: Option '--terse' is mutually exclusive with '--pretty'."
 msgstr "Hiba: a „--terse” és a „--pretty” kapcsolók kölcsönösen kizáróak."
 
-#: ../cli/src/nmcli.c:156
+#: ../cli/src/nmcli.c:152
 #, c-format
 msgid "Error: Option '--pretty' is specified the second time."
 msgstr "Hiba: a „--pretty” kapcsoló másodszor lett megadva."
 
-#: ../cli/src/nmcli.c:161
+#: ../cli/src/nmcli.c:157
 #, c-format
 msgid "Error: Option '--pretty' is mutually exclusive with '--terse'."
 msgstr "Hiba: a „--pretty” és „--terse” kapcsolók kölcsönösen kizáróak."
 
-#: ../cli/src/nmcli.c:171 ../cli/src/nmcli.c:187
+#: ../cli/src/nmcli.c:167 ../cli/src/nmcli.c:183
 #, c-format
 msgid "Error: missing argument for '%s' option."
 msgstr "Hiba: a(z) „%s” kapcsoló argumentuma hiányzik."
 
-#: ../cli/src/nmcli.c:180 ../cli/src/nmcli.c:196
+#: ../cli/src/nmcli.c:176 ../cli/src/nmcli.c:192
 #, c-format
 msgid "Error: '%s' is not valid argument for '%s' option."
 msgstr "Hiba: „%s” nem érvényes argumentum a(z) „%s” kapcsolóhoz."
 
-#: ../cli/src/nmcli.c:203
+#: ../cli/src/nmcli.c:199
 #, c-format
 msgid "Error: fields for '%s' options are missing."
 msgstr "Hiba: a(z) „%s” kapcsoló mezői hiányoznak."
 
-#: ../cli/src/nmcli.c:209
+#: ../cli/src/nmcli.c:207
 #, c-format
 msgid "nmcli tool, version %s\n"
 msgstr "nmcli eszköz, %s verzió\n"
 
-#: ../cli/src/nmcli.c:215
+#: ../cli/src/nmcli.c:213
 #, c-format
 msgid "Error: Option '%s' is unknown, try 'nmcli -help'."
-msgstr "Hiba: a(z) „%s” kapcsoló ismeretlen, adja ki az „nmcli-help” parancsot."
+msgstr ""
+"Hiba: a(z) „%s” kapcsoló ismeretlen, adja ki az „nmcli-help” parancsot."
 
-#: ../cli/src/nmcli.c:234
+#: ../cli/src/nmcli.c:232
 #, c-format
 msgid "Caught signal %d, shutting down..."
 msgstr "%d szignál érkezett, leállítás…"
 
-#: ../cli/src/nmcli.c:259
-#, c-format
-msgid "Error: Could not connect to NetworkManager."
-msgstr "Hiba: nem lehet kapcsolódni a Hálózatkezelőhöz."
+#: ../cli/src/nmcli.c:257
+msgid "Error: Could not create NMClient object."
+msgstr "Hiba: nem sikerült a NMClient objektumot létrehozni."
 
-#: ../cli/src/nmcli.c:275
+#: ../cli/src/nmcli.c:273
 msgid "Success"
 msgstr "Siker"
 
-#: ../cli/src/settings.c:411
+#: ../cli/src/settings.c:423
 #, c-format
 msgid "%d (hex-ascii-key)"
 msgstr "%d (hex-ascii-kulcs)"
 
-#: ../cli/src/settings.c:413
+#: ../cli/src/settings.c:425
 #, c-format
 msgid "%d (104/128-bit passphrase)"
 msgstr "%d (104/128 bites jelmondat)"
 
-#: ../cli/src/settings.c:416
+#: ../cli/src/settings.c:428
 #, c-format
 msgid "%d (unknown)"
 msgstr "%d (ismeretlen)"
 
-#: ../cli/src/settings.c:442
+#: ../cli/src/settings.c:454
 msgid "0 (unknown)"
 msgstr "0 (ismeretlen)"
 
-#: ../cli/src/settings.c:448
+#: ../cli/src/settings.c:460
 msgid "any, "
 msgstr "bármely, "
 
-#: ../cli/src/settings.c:450
+#: ../cli/src/settings.c:462
 msgid "900 MHz, "
 msgstr "900 MHz, "
 
-#: ../cli/src/settings.c:452
+#: ../cli/src/settings.c:464
 msgid "1800 MHz, "
 msgstr "1800 MHz, "
 
-#: ../cli/src/settings.c:454
+#: ../cli/src/settings.c:466
 msgid "1900 MHz, "
 msgstr "1900 MHz, "
 
-#: ../cli/src/settings.c:456
+#: ../cli/src/settings.c:468
 msgid "850 MHz, "
 msgstr "850 MHz, "
 
-#: ../cli/src/settings.c:458
+#: ../cli/src/settings.c:470
 msgid "WCDMA 3GPP UMTS 2100 MHz, "
 msgstr "WCDMA 3GPP UMTS 2100 MHz, "
 
-#: ../cli/src/settings.c:460
+#: ../cli/src/settings.c:472
 msgid "WCDMA 3GPP UMTS 1800 MHz, "
 msgstr "WCDMA 3GPP UMTS 1800 MHz, "
 
-#: ../cli/src/settings.c:462
+#: ../cli/src/settings.c:474
 msgid "WCDMA 3GPP UMTS 1700/2100 MHz, "
 msgstr "WCDMA 3GPP UMTS 1700/2100 MHz, "
 
-#: ../cli/src/settings.c:464
+#: ../cli/src/settings.c:476
 msgid "WCDMA 3GPP UMTS 800 MHz, "
 msgstr "WCDMA 3GPP UMTS 800 MHz, "
 
-#: ../cli/src/settings.c:466
+#: ../cli/src/settings.c:478
 msgid "WCDMA 3GPP UMTS 850 MHz, "
 msgstr "WCDMA 3GPP UMTS 850 MHz, "
 
-#: ../cli/src/settings.c:468
+#: ../cli/src/settings.c:480
 msgid "WCDMA 3GPP UMTS 900 MHz, "
 msgstr "WCDMA 3GPP UMTS 900 MHz, "
 
-#: ../cli/src/settings.c:470
+#: ../cli/src/settings.c:482
 msgid "WCDMA 3GPP UMTS 1700 MHz, "
 msgstr "WCDMA 3GPP UMTS 1700 MHz, "
 
-#: ../cli/src/settings.c:554 ../cli/src/settings.c:721
+#: ../cli/src/settings.c:566 ../cli/src/settings.c:732
 msgid "auto"
 msgstr "auto"
 
-#: ../cli/src/settings.c:716 ../cli/src/settings.c:719
-#: ../cli/src/settings.c:720 ../cli/src/utils.c:172
+#: ../cli/src/settings.c:727 ../cli/src/settings.c:730
+#: ../cli/src/settings.c:731 ../cli/src/utils.c:176
 msgid "not set"
 msgstr "nincs beállítva"
 
-#: ../cli/src/utils.c:124
+#: ../cli/src/utils.c:128
 #, c-format
 msgid "field '%s' has to be alone"
 msgstr "a(z) „%s” mezőnek önállónak kell lennie"
 
-#: ../cli/src/utils.c:127
+#: ../cli/src/utils.c:131
 #, c-format
 msgid "invalid field '%s'"
 msgstr "érvénytelen mező: „%s”"
 
-#: ../cli/src/utils.c:146
+#: ../cli/src/utils.c:150
 #, c-format
 msgid "Option '--terse' requires specifying '--fields'"
 msgstr "A „--terse” megköveteli a „--fields” megadását."
 
-#: ../cli/src/utils.c:150
+#: ../cli/src/utils.c:154
 #, c-format
 msgid "Option '--terse' requires specific '--fields' option values , not '%s'"
-msgstr "A „--terse” adott „--fields” kapcsolóértékeket követel meg, nem ezt: „%s”."
+msgstr ""
+"A „--terse” adott „--fields” kapcsolóértékeket követel meg, nem ezt: „%s”."
+
+#: ../cli/src/utils.c:333
+#, c-format
+msgid "Error: Couldn't create D-Bus object proxy for org.freedesktop.DBus"
+msgstr ""
+"Hiba: nem sikerült a D-Bus objektumproxyt létrehozni az org.freedesktop.DBus "
+"névtérhez"
+
+#: ../cli/src/utils.c:341
+#, c-format
+msgid "Error: NameHasOwner request failed: %s"
+msgstr "Hiba: a NameHasOwner kérés meghiúsult: %s"
+
+#: ../cli/src/utils.c:386
+#, c-format
+msgid ""
+"Warning: nmcli (%s) and NetworkManager (%s) versions don't match. Use --"
+"nocheck to suppress the warning.\n"
+msgstr ""
+"Figyelmeztetés: az nmcli (%s) és a Hálózatkezelő (%s) verziói nem egyeznek. "
+"A figyelmeztetés kikapcsolásához használja a --nocheck kapcsolót.\n"
 
-#: ../libnm-util/crypto.c:120
+#: ../cli/src/utils.c:395
+#, c-format
+msgid ""
+"Error: nmcli (%s) and NetworkManager (%s) versions don't match. Force "
+"execution using --nocheck, but the results are unpredictable."
+msgstr ""
+"Figyelmeztetés: az nmcli (%s) és a Hálózatkezelő (%s) verziói nem egyeznek. "
+"A végrehajtás kikényszerítve a --nocheck kapcsolóval, de az eredmények "
+"kiszámíthatatlanok."
+
+#: ../libnm-util/crypto.c:127
 #, c-format
 msgid "PEM key file had no end tag '%s'."
 msgstr "A PEM kulcsfájl nem rendelkezik „%s” zárócímkével."
 
-#: ../libnm-util/crypto.c:130
+#: ../libnm-util/crypto.c:140
 #, c-format
 msgid "Doesn't look like a PEM private key file."
 msgstr "Nem tűnik PEM személyes kulcs fájlnak."
 
-#: ../libnm-util/crypto.c:138
+#: ../libnm-util/crypto.c:148
 #, c-format
 msgid "Not enough memory to store PEM file data."
 msgstr "Nincs elég memória a PEM fájl adatainak tárolásához."
 
-#: ../libnm-util/crypto.c:154
+#: ../libnm-util/crypto.c:164
 #, c-format
 msgid "Malformed PEM file: Proc-Type was not first tag."
 msgstr "Rosszul formázott PEM fájl: a Proc-Type nem az első címke."
 
-#: ../libnm-util/crypto.c:162
+#: ../libnm-util/crypto.c:172
 #, c-format
 msgid "Malformed PEM file: unknown Proc-Type tag '%s'."
 msgstr "Rosszul formázott PEM fájl: ismeretlen Proc-Type címke („%s”)."
 
-#: ../libnm-util/crypto.c:172
+#: ../libnm-util/crypto.c:182
 #, c-format
 msgid "Malformed PEM file: DEK-Info was not the second tag."
 msgstr "Rosszul formázott PEM fájl: A DEK-Info nem a második címke."
 
-#: ../libnm-util/crypto.c:183
+#: ../libnm-util/crypto.c:193
 #, c-format
 msgid "Malformed PEM file: no IV found in DEK-Info tag."
 msgstr "Rosszul formázott PEM fájl: nem található IV a DEK-Info címkében."
 
-#: ../libnm-util/crypto.c:190
+#: ../libnm-util/crypto.c:200
 #, c-format
 msgid "Malformed PEM file: invalid format of IV in DEK-Info tag."
-msgstr "Rosszul formázott PEM fájl: az IV formátuma érvénytelen a DEK-Info címkében."
+msgstr ""
+"Rosszul formázott PEM fájl: az IV formátuma érvénytelen a DEK-Info címkében."
 
-#: ../libnm-util/crypto.c:203
+#: ../libnm-util/crypto.c:213
 #, c-format
 msgid "Malformed PEM file: unknown private key cipher '%s'."
-msgstr "Rosszul formázott PEM fájl: ismeretlen személyes kulcs titkosító: „%s”."
+msgstr ""
+"Rosszul formázott PEM fájl: ismeretlen személyes kulcs titkosító: „%s”."
 
-#: ../libnm-util/crypto.c:222
+#: ../libnm-util/crypto.c:232
 #, c-format
 msgid "Could not decode private key."
 msgstr "A személyes kulcs nem fejthető vissza."
 
-#: ../libnm-util/crypto.c:267
-#, c-format
-msgid "PEM certificate '%s' had no end tag '%s'."
-msgstr "A(z) „%s” PEM tanúsítvány nem tartalmaz záró „%s” címkét."
-
-#: ../libnm-util/crypto.c:277
-#, c-format
-msgid "Failed to decode certificate."
-msgstr "A tanúsítvány visszafejtése meghiúsult."
-
-#: ../libnm-util/crypto.c:286
+#: ../libnm-util/crypto.c:268 ../libnm-util/crypto.c:554
 #, c-format
 msgid "Not enough memory to store certificate data."
 msgstr "Nincs elég memória a tanúsítvány adatainak tárolásához."
 
 #: ../libnm-util/crypto.c:294
 #, c-format
-msgid "Not enough memory to store file data."
-msgstr "Nincs elég memória a fájl adatainak tárolásához."
-
-#: ../libnm-util/crypto.c:324
-#, c-format
 msgid "IV must be an even number of bytes in length."
 msgstr "Az IV hosszának páros számú bájtnak kell lennie."
 
-#: ../libnm-util/crypto.c:333
+#: ../libnm-util/crypto.c:303
 #, c-format
 msgid "Not enough memory to store the IV."
 msgstr "Nincs elég memória az IV tárolásához."
 
-#: ../libnm-util/crypto.c:344
+#: ../libnm-util/crypto.c:314
 #, c-format
 msgid "IV contains non-hexadecimal digits."
 msgstr "Az IV nem hexadecimális számjegyeket tartalmaz."
 
-#: ../libnm-util/crypto.c:382 ../libnm-util/crypto_gnutls.c:148
-#: ../libnm-util/crypto_gnutls.c:266 ../libnm-util/crypto_nss.c:171
+#: ../libnm-util/crypto.c:352 ../libnm-util/crypto_gnutls.c:149
+#: ../libnm-util/crypto_gnutls.c:267 ../libnm-util/crypto_nss.c:171
 #: ../libnm-util/crypto_nss.c:336
 #, c-format
 msgid "Private key cipher '%s' was unknown."
 msgstr "A(z) „%s” személyeskulcs-titkosító ismeretlen."
 
-#: ../libnm-util/crypto.c:391
+#: ../libnm-util/crypto.c:361
 #, c-format
 msgid "Not enough memory to decrypt private key."
 msgstr "Nincs elég memória a személyes kulcs visszafejtéséhez."
 
-#: ../libnm-util/crypto.c:511
+#: ../libnm-util/crypto.c:426
+#, c-format
+msgid "Not enough memory to store decrypted private key."
+msgstr "Nincs elég memória a visszafejtett személyes kulcs tárolásához."
+
+#: ../libnm-util/crypto.c:471
 #, c-format
 msgid "Unable to determine private key type."
 msgstr "A személyes kulcs típusa nem határozható meg."
 
-#: ../libnm-util/crypto.c:530
+#: ../libnm-util/crypto.c:526
 #, c-format
-msgid "Not enough memory to store decrypted private key."
-msgstr "Nincs elég memória a visszafejtett személyes kulcs tárolásához."
+msgid "PEM certificate had no start tag '%s'."
+msgstr "A PEM tanúsítvány nem tartalmaz kezdő „%s” címkét."
 
-#: ../libnm-util/crypto_gnutls.c:49
+#: ../libnm-util/crypto.c:535
+#, c-format
+msgid "PEM certificate had no end tag '%s'."
+msgstr "A PEM tanúsítvány nem tartalmaz záró „%s” címkét."
+
+#: ../libnm-util/crypto.c:559
+#, c-format
+msgid "Failed to decode certificate."
+msgstr "A tanúsítvány visszafejtése meghiúsult."
+
+#: ../libnm-util/crypto_gnutls.c:50
 msgid "Failed to initialize the crypto engine."
 msgstr "A titkosító alrendszer előkészítése meghiúsult."
 
-#: ../libnm-util/crypto_gnutls.c:93
+#: ../libnm-util/crypto_gnutls.c:94
 #, c-format
 msgid "Failed to initialize the MD5 engine: %s / %s."
 msgstr "Az MD5 alrendszer előkészítése meghiúsult: %s / %s."
 
-#: ../libnm-util/crypto_gnutls.c:156
+#: ../libnm-util/crypto_gnutls.c:157
 #, c-format
 msgid "Invalid IV length (must be at least %zd)."
 msgstr "Érvénytelen IV hossz (legalább %zd hosszúnak kell lennie)."
 
-#: ../libnm-util/crypto_gnutls.c:165 ../libnm-util/crypto_nss.c:188
+#: ../libnm-util/crypto_gnutls.c:166 ../libnm-util/crypto_nss.c:188
 #, c-format
 msgid "Not enough memory for decrypted key buffer."
 msgstr "Nincs elég memória a visszafejtett kulcspufferhez."
 
-#: ../libnm-util/crypto_gnutls.c:173
+#: ../libnm-util/crypto_gnutls.c:174
 #, c-format
 msgid "Failed to initialize the decryption cipher context: %s / %s."
-msgstr "A visszafejtési titkosító kontextusának előkészítése meghiúsult: %s /%s."
+msgstr ""
+"A visszafejtési titkosító kontextusának előkészítése meghiúsult: %s /%s."
 
-#: ../libnm-util/crypto_gnutls.c:182
+#: ../libnm-util/crypto_gnutls.c:183
 #, c-format
 msgid "Failed to set symmetric key for decryption: %s / %s."
 msgstr "A szimmetrikus kulcs beállítása meghiúsult a visszafejtéshez: %s / %s."
 
-#: ../libnm-util/crypto_gnutls.c:191
+#: ../libnm-util/crypto_gnutls.c:192
 #, c-format
 msgid "Failed to set IV for decryption: %s / %s."
 msgstr "Az IV beállítása meghiúsult a visszafejtéshez: %s / %s."
 
-#: ../libnm-util/crypto_gnutls.c:200
+#: ../libnm-util/crypto_gnutls.c:201
 #, c-format
 msgid "Failed to decrypt the private key: %s / %s."
 msgstr "A személyes kulcs visszafejtése meghiúsult: %s / %s."
 
-#: ../libnm-util/crypto_gnutls.c:210 ../libnm-util/crypto_nss.c:267
+#: ../libnm-util/crypto_gnutls.c:211 ../libnm-util/crypto_nss.c:267
 #, c-format
 msgid "Failed to decrypt the private key: unexpected padding length."
 msgstr "A személyes kulcs visszafejtése meghiúsult: váratlan kitöltéshossz."
 
-#: ../libnm-util/crypto_gnutls.c:221 ../libnm-util/crypto_nss.c:278
+#: ../libnm-util/crypto_gnutls.c:222 ../libnm-util/crypto_nss.c:278
 #, c-format
 msgid "Failed to decrypt the private key."
 msgstr "A személyes kulcs visszafejtése meghiúsult."
 
-#: ../libnm-util/crypto_gnutls.c:286 ../libnm-util/crypto_nss.c:356
+#: ../libnm-util/crypto_gnutls.c:287 ../libnm-util/crypto_nss.c:356
 #, c-format
 msgid "Could not allocate memory for encrypting."
 msgstr "Nem sikerült memóriát foglalni a titkosításhoz."
 
-#: ../libnm-util/crypto_gnutls.c:294
+#: ../libnm-util/crypto_gnutls.c:295
 #, c-format
 msgid "Failed to initialize the encryption cipher context: %s / %s."
 msgstr "A titkosító kontextusának előkészítése meghiúsult: %s / %s."
 
-#: ../libnm-util/crypto_gnutls.c:303
+#: ../libnm-util/crypto_gnutls.c:304
 #, c-format
 msgid "Failed to set symmetric key for encryption: %s / %s."
 msgstr "A szimmetrikus kulcs beállítása meghiúsult a titkosításhoz: %s / %s."
 
-#: ../libnm-util/crypto_gnutls.c:313
+#: ../libnm-util/crypto_gnutls.c:314
 #, c-format
 msgid "Failed to set IV for encryption: %s / %s."
 msgstr "Az IV beállítása meghiúsult a titkosításhoz: %s / %s."
 
-#: ../libnm-util/crypto_gnutls.c:322
+#: ../libnm-util/crypto_gnutls.c:323
 #, c-format
 msgid "Failed to encrypt the data: %s / %s."
 msgstr "Az adatot nem sikerült titkosítani: %s / %s."
 
-#: ../libnm-util/crypto_gnutls.c:362
+#: ../libnm-util/crypto_gnutls.c:363
 #, c-format
 msgid "Error initializing certificate data: %s"
 msgstr "Hiba a tanúsítvány adatainak előkészítésekor: %s"
 
-#: ../libnm-util/crypto_gnutls.c:384
+#: ../libnm-util/crypto_gnutls.c:385
 #, c-format
 msgid "Couldn't decode certificate: %s"
 msgstr "A tanúsítvány nem fejthető vissza: %s"
 
-#: ../libnm-util/crypto_gnutls.c:408
+#: ../libnm-util/crypto_gnutls.c:409
 #, c-format
 msgid "Couldn't initialize PKCS#12 decoder: %s"
 msgstr "A PKCS#12 dekódoló nem készíthető elő: %s"
 
-#: ../libnm-util/crypto_gnutls.c:421
+#: ../libnm-util/crypto_gnutls.c:422
 #, c-format
 msgid "Couldn't decode PKCS#12 file: %s"
 msgstr "A PKCS#12 fájl nem fejthető vissza: %s"
 
-#: ../libnm-util/crypto_gnutls.c:433
+#: ../libnm-util/crypto_gnutls.c:434
 #, c-format
 msgid "Couldn't verify PKCS#12 file: %s"
 msgstr "A PKCS#12 fájl nem ellenőrizhető: %s"
@@ -1552,89 +1736,72 @@ msgstr "A PKCS#12 fájl nem ellenőrizhető: %d"
 msgid "Could not generate random data."
 msgstr "Nem sikerült a véletlen adatok előállítása."
 
-#: ../libnm-util/nm-utils.c:1975
+#: ../libnm-util/nm-utils.c:1989
 #, c-format
 msgid "Not enough memory to make encryption key."
 msgstr "Nincs elég memória titkosítási kulcs készítéséhez."
 
-#: ../libnm-util/nm-utils.c:2085
+#: ../libnm-util/nm-utils.c:2099
 msgid "Could not allocate memory for PEM file creation."
 msgstr "Nem sikerült memóriát foglalni PEM fájl készítéséhez."
 
-#: ../libnm-util/nm-utils.c:2097
+#: ../libnm-util/nm-utils.c:2111
 #, c-format
 msgid "Could not allocate memory for writing IV to PEM file."
 msgstr "Nem sikerült memóriát foglalni az IV írásához PEM fájlba."
 
-#: ../libnm-util/nm-utils.c:2109
+#: ../libnm-util/nm-utils.c:2123
 #, c-format
 msgid "Could not allocate memory for writing encrypted key to PEM file."
-msgstr "Nem sikerült memóriát foglalni a titkosított kulcs PEM fájlba írásához."
+msgstr ""
+"Nem sikerült memóriát foglalni a titkosított kulcs PEM fájlba írásához."
 
-#: ../libnm-util/nm-utils.c:2128
+#: ../libnm-util/nm-utils.c:2142
 #, c-format
 msgid "Could not allocate memory for PEM file data."
 msgstr "Nem sikerült memóriát foglalni a PEM fájl adatainak."
 
-#: ../policy/org.freedesktop.network-manager-settings.system.policy.in.h:1
-msgid "Connection sharing via a protected WiFi network"
-msgstr "Kapcsolatmegosztás védett WiFi hálózaton"
-
-#: ../policy/org.freedesktop.network-manager-settings.system.policy.in.h:2
-msgid "Connection sharing via an open WiFi network"
-msgstr "Kapcsolatmegosztás nyílt WiFi hálózaton"
-
-#: ../policy/org.freedesktop.network-manager-settings.system.policy.in.h:3
-msgid "Modify persistent system hostname"
-msgstr "Állandó rendszergépnév módosítása"
-
-#: ../policy/org.freedesktop.network-manager-settings.system.policy.in.h:4
-msgid "Modify system connections"
-msgstr "Rendszerkapcsolatok módosítása"
-
-#: ../policy/org.freedesktop.network-manager-settings.system.policy.in.h:5
-msgid "System policy prevents modification of system settings"
-msgstr "A rendszer házirendje megakadályozza a rendszerbeállítások módosítását"
-
-#: ../policy/org.freedesktop.network-manager-settings.system.policy.in.h:6
-msgid "System policy prevents modification of the persistent system hostname"
-msgstr ""
-"A rendszer házirendje megakadályozza a rendszer állandó gépnevének "
-"módosítását"
-
-#: ../policy/org.freedesktop.network-manager-settings.system.policy.in.h:7
-msgid "System policy prevents sharing connections via a protected WiFi network"
-msgstr ""
-"A rendszer házirendje megakadályozza a kapcsolatok megosztását védett WiFi "
-"hálózaton"
-
-#: ../policy/org.freedesktop.network-manager-settings.system.policy.in.h:8
-msgid "System policy prevents sharing connections via an open WiFi network"
-msgstr ""
-"A rendszer házirendje megakadályozza a kapcsolatok megosztását nyílt WiFi "
-"hálózaton"
-
 #: ../policy/org.freedesktop.NetworkManager.policy.in.h:1
 msgid "Allow control of network connections"
 msgstr "Hálózati kapcsolatok felügyeletének engedélyezése"
 
 #: ../policy/org.freedesktop.NetworkManager.policy.in.h:2
-msgid "Allow use of user-specific connections"
-msgstr "Felhasználói szintű kapcsolatok engedélyezése"
+msgid "Connection sharing via a protected WiFi network"
+msgstr "Kapcsolatmegosztás védett WiFi hálózaton"
 
 #: ../policy/org.freedesktop.NetworkManager.policy.in.h:3
+msgid "Connection sharing via an open WiFi network"
+msgstr "Kapcsolatmegosztás nyílt WiFi hálózaton"
+
+#: ../policy/org.freedesktop.NetworkManager.policy.in.h:4
 msgid "Enable or disable WiFi devices"
 msgstr "WiFi eszközök be- és kikapcsolása"
 
-#: ../policy/org.freedesktop.NetworkManager.policy.in.h:4
+#: ../policy/org.freedesktop.NetworkManager.policy.in.h:5
+msgid "Enable or disable WiMAX mobile broadband devices"
+msgstr "WiMAX mobil széles sávú eszközök be- és kikapcsolása"
+
+#: ../policy/org.freedesktop.NetworkManager.policy.in.h:6
 msgid "Enable or disable mobile broadband devices"
 msgstr "Mobil széles sávú eszközök be- és kikapcsolása"
 
-#: ../policy/org.freedesktop.NetworkManager.policy.in.h:5
+#: ../policy/org.freedesktop.NetworkManager.policy.in.h:7
 msgid "Enable or disable system networking"
 msgstr "Rendszer hálózatkezelésének be- és kikapcsolása"
 
-#: ../policy/org.freedesktop.NetworkManager.policy.in.h:6
+#: ../policy/org.freedesktop.NetworkManager.policy.in.h:8
+msgid "Modify network connections for all users"
+msgstr "Hálózati kapcsolatok módosítása minden felhasználó számára"
+
+#: ../policy/org.freedesktop.NetworkManager.policy.in.h:9
+msgid "Modify persistent system hostname"
+msgstr "Állandó rendszergépnév módosítása"
+
+#: ../policy/org.freedesktop.NetworkManager.policy.in.h:10
+msgid "Modify personal network connections"
+msgstr "Személyes hálózati kapcsolatok módosítása"
+
+#: ../policy/org.freedesktop.NetworkManager.policy.in.h:11
 msgid ""
 "Put NetworkManager to sleep or wake it up (should only be used by system "
 "power management)"
@@ -1642,101 +1809,88 @@ msgstr ""
 "Hálózatkezelő elaltatása vagy felébresztése (csak a rendszer "
 "energiagazdálkodása által használandó)"
 
-#: ../policy/org.freedesktop.NetworkManager.policy.in.h:7
+#: ../policy/org.freedesktop.NetworkManager.policy.in.h:12
 msgid "System policy prevents control of network connections"
-msgstr "A rendszer házirendje megakadályozza a hálózati kapcsolatok felügyeletét"
+msgstr ""
+"A rendszer házirendje megakadályozza a hálózati kapcsolatok felügyeletét"
 
-#: ../policy/org.freedesktop.NetworkManager.policy.in.h:8
+#: ../policy/org.freedesktop.NetworkManager.policy.in.h:13
 msgid "System policy prevents enabling or disabling WiFi devices"
-msgstr "A rendszer házirendje megakadályozza a WiFi eszközök be- vagy kikapcsolását"
+msgstr ""
+"A rendszer házirendje megakadályozza a WiFi eszközök be- vagy kikapcsolását"
 
-#: ../policy/org.freedesktop.NetworkManager.policy.in.h:9
+#: ../policy/org.freedesktop.NetworkManager.policy.in.h:14
+msgid ""
+"System policy prevents enabling or disabling WiMAX mobile broadband devices"
+msgstr ""
+"A rendszer házirendje megakadályozza a WiMAX mobil széles sávú eszközök be- "
+"vagy kikapcsolását"
+
+#: ../policy/org.freedesktop.NetworkManager.policy.in.h:15
 msgid "System policy prevents enabling or disabling mobile broadband devices"
 msgstr ""
 "A rendszer házirendje megakadályozza a mobil széles sávú eszközök be- vagy "
 "kikapcsolását"
 
-#: ../policy/org.freedesktop.NetworkManager.policy.in.h:10
+#: ../policy/org.freedesktop.NetworkManager.policy.in.h:16
 msgid "System policy prevents enabling or disabling system networking"
 msgstr ""
 "A rendszer házirendje megakadályozza a rendszer hálózatkezelésének be- vagy "
 "kikapcsolását"
 
-#: ../policy/org.freedesktop.NetworkManager.policy.in.h:11
-msgid "System policy prevents putting NetworkManager to sleep or waking it up"
+#: ../policy/org.freedesktop.NetworkManager.policy.in.h:17
+msgid "System policy prevents modification of network settings for all users"
 msgstr ""
-"A rendszer házirendje megakadályozza a Hálózatkezelő elaltatását vagy "
-"felébresztését"
+"A rendszer házirendje megakadályozza a hálózati beállítások módosítását "
+"minden felhasználó számára"
 
-#: ../policy/org.freedesktop.NetworkManager.policy.in.h:12
-msgid "System policy prevents use of user-specific connections"
-msgstr "A rendszer házirendje megakadályozza a felhasználói kapcsolatok használatát"
-
-#: ../src/nm-netlink-monitor.c:100 ../src/nm-netlink-monitor.c:231
-#: ../src/nm-netlink-monitor.c:653
-#, c-format
-msgid "error processing netlink message: %s"
-msgstr "hiba a netlink üzenet feldolgozásakor: %s"
-
-#: ../src/nm-netlink-monitor.c:214
-msgid "error occurred while waiting for data on socket"
-msgstr "hiba lépett fel adatokra várakozás közben a foglalaton"
-
-#: ../src/nm-netlink-monitor.c:254
-#, c-format
-msgid "unable to connect to netlink for monitoring link status: %s"
+#: ../policy/org.freedesktop.NetworkManager.policy.in.h:18
+msgid "System policy prevents modification of personal network settings"
 msgstr ""
-"nem lehet kapcsolódni a netlinkhez a kapcsolat állapotának megfigyelése "
-"érdekében: %s"
+"A rendszer házirendje megakadályozza a személyes hálózati beállítások "
+"módosítását"
 
-#: ../src/nm-netlink-monitor.c:265
-#, c-format
-msgid "unable to enable netlink handle credential passing: %s"
+#: ../policy/org.freedesktop.NetworkManager.policy.in.h:19
+msgid "System policy prevents modification of the persistent system hostname"
 msgstr ""
-"nem engedélyezhető a hálózati kapcsolatkezelő hitelesítési adatainak "
-"átadása: %s"
+"A rendszer házirendje megakadályozza a rendszer állandó gépnevének "
+"módosítását"
 
-#: ../src/nm-netlink-monitor.c:291 ../src/nm-netlink-monitor.c:353
-#, c-format
-msgid "unable to allocate netlink handle for monitoring link status: %s"
+#: ../policy/org.freedesktop.NetworkManager.policy.in.h:20
+msgid "System policy prevents putting NetworkManager to sleep or waking it up"
 msgstr ""
-"nem lehet netlink kezelőt lefoglalni a kapcsolat állapotának megfigyelése "
-"érdekében: %s"
+"A rendszer házirendje megakadályozza a Hálózatkezelő elaltatását vagy "
+"felébresztését"
 
-#: ../src/nm-netlink-monitor.c:376
-#, c-format
-msgid "unable to allocate netlink link cache for monitoring link status: %s"
+#: ../policy/org.freedesktop.NetworkManager.policy.in.h:21
+msgid "System policy prevents sharing connections via a protected WiFi network"
 msgstr ""
-"nem lehet netlink kapcsolat-gyorsítótárat lefoglalni a kapcsolat állapotának "
-"megfigyelése érdekében: %s"
-
-#: ../src/nm-netlink-monitor.c:502
-#, c-format
-msgid "unable to join netlink group: %s"
-msgstr "nem lehet csatlakozni a netlink csoporthoz: %s"
+"A rendszer házirendje megakadályozza a kapcsolatok megosztását védett WiFi "
+"hálózaton"
 
-#: ../src/nm-netlink-monitor.c:629 ../src/nm-netlink-monitor.c:642
-#, c-format
-msgid "error updating link cache: %s"
-msgstr "hiba a kapcsolat gyorsítótárának frissítésekor: %s"
+#: ../policy/org.freedesktop.NetworkManager.policy.in.h:22
+msgid "System policy prevents sharing connections via an open WiFi network"
+msgstr ""
+"A rendszer házirendje megakadályozza a kapcsolatok megosztását nyílt WiFi "
+"hálózaton"
 
-#: ../src/main.c:499
+#: ../src/main.c:519
 #, c-format
 msgid "Invalid option.  Please use --help to see a list of valid options.\n"
 msgstr ""
 "Érvénytelen kapcsoló. Az érvényes kapcsolók listájáért használja a --help "
 "kapcsolót.\n"
 
-#: ../src/main.c:570
+#: ../src/main.c:590
 #, c-format
 msgid "%s.  Please use --help to see a list of valid options.\n"
 msgstr "%s. Használja a --help kapcsolót az érvényes kapcsolókért.\n"
 
-#: ../src/dhcp-manager/nm-dhcp-dhclient.c:328
+#: ../src/dhcp-manager/nm-dhcp-dhclient-utils.c:62
 msgid "# Created by NetworkManager\n"
 msgstr "# Készítette a Hálózatkezelő\n"
 
-#: ../src/dhcp-manager/nm-dhcp-dhclient.c:344
+#: ../src/dhcp-manager/nm-dhcp-dhclient-utils.c:69
 #, c-format
 msgid ""
 "# Merged from %s\n"
@@ -1762,31 +1916,119 @@ msgstr "A „dhcpd” nem használható."
 msgid "unsupported DHCP client '%s'"
 msgstr "nem támogatott DHCP-kliens („%s”)"
 
-#: ../src/logging/nm-logging.c:146
+#: ../src/dns-manager/nm-dns-manager.c:367
+msgid "NOTE: the libc resolver may not support more than 3 nameservers."
+msgstr "MEGJEGYZÉS: a libc feloldó nem támogat háromnál több névkiszolgálót."
+
+#: ../src/dns-manager/nm-dns-manager.c:369
+msgid "The nameservers listed below may not be recognized."
+msgstr ""
+"Az alább felsorolt névkiszolgálók lehet, hogy nem kerülnek felismerésre."
+
+#: ../src/logging/nm-logging.c:149
 #, c-format
 msgid "Unknown log level '%s'"
 msgstr "Ismeretlen naplózási szint: „%s”"
 
-#: ../src/logging/nm-logging.c:171
+#: ../src/logging/nm-logging.c:174
 #, c-format
 msgid "Unknown log domain '%s'"
 msgstr "Ismeretlen naplózási tartomány: „%s”"
 
-#: ../src/dns-manager/nm-dns-manager.c:384
-msgid "NOTE: the libc resolver may not support more than 3 nameservers."
-msgstr "MEGJEGYZÉS: a libc feloldó nem támogat háromnál több névkiszolgálót."
+#: ../src/modem-manager/nm-modem-cdma.c:296 ../src/nm-device-bt.c:355
+#, c-format
+msgid "CDMA connection %d"
+msgstr "%d. CDMA kapcsolat"
 
-#: ../src/dns-manager/nm-dns-manager.c:386
-msgid "The nameservers listed below may not be recognized."
-msgstr "Az alább felsorolt névkiszolgálók lehet, hogy nem kerülnek felismerésre."
+#: ../src/modem-manager/nm-modem-gsm.c:499 ../src/nm-device-bt.c:351
+#, c-format
+msgid "GSM connection %d"
+msgstr "%d. GSM kapcsolat"
 
-#: ../src/system-settings/nm-default-wired-connection.c:157
+#: ../src/nm-device-bt.c:326
 #, c-format
-msgid "Auto %s"
-msgstr "Automatikus %s"
+msgid "PAN connection %d"
+msgstr "%d. PAN kapcsolat"
+
+#: ../src/nm-device-bt.c:359
+#, c-format
+msgid "DUN connection %d"
+msgstr "%d. DUN kapcsolat"
+
+#: ../src/nm-device-ethernet.c:1682
+#, c-format
+msgid "PPPoE connection %d"
+msgstr "%d. PPPoE kapcsolat"
+
+#: ../src/nm-device-ethernet.c:1682
+#, c-format
+msgid "Wired connection %d"
+msgstr "%d. vezetékes kapcsolat"
+
+#: ../src/nm-device-olpc-mesh.c:423
+#, c-format
+msgid "Mesh %d"
+msgstr "%d. háló"
 
-#: ../system-settings/plugins/ifcfg-rh/reader.c:3412
-#: ../system-settings/plugins/ifnet/connection_parser.c:49
+#: ../src/nm-manager.c:656
+#, c-format
+msgid "VPN connection %d"
+msgstr "%d. VPN kapcsolat"
+
+#: ../src/nm-netlink-monitor.c:100 ../src/nm-netlink-monitor.c:231
+#: ../src/nm-netlink-monitor.c:653
+#, c-format
+msgid "error processing netlink message: %s"
+msgstr "hiba a netlink üzenet feldolgozásakor: %s"
+
+#: ../src/nm-netlink-monitor.c:214
+msgid "error occurred while waiting for data on socket"
+msgstr "hiba lépett fel adatokra várakozás közben a foglalaton"
+
+#: ../src/nm-netlink-monitor.c:254
+#, c-format
+msgid "unable to connect to netlink for monitoring link status: %s"
+msgstr ""
+"nem lehet kapcsolódni a netlinkhez a kapcsolat állapotának megfigyelése "
+"érdekében: %s"
+
+#: ../src/nm-netlink-monitor.c:265
+#, c-format
+msgid "unable to enable netlink handle credential passing: %s"
+msgstr ""
+"nem engedélyezhető a hálózati kapcsolatkezelő hitelesítési adatainak "
+"átadása: %s"
+
+#: ../src/nm-netlink-monitor.c:291 ../src/nm-netlink-monitor.c:353
+#, c-format
+msgid "unable to allocate netlink handle for monitoring link status: %s"
+msgstr ""
+"nem lehet netlink kezelőt lefoglalni a kapcsolat állapotának megfigyelése "
+"érdekében: %s"
+
+#: ../src/nm-netlink-monitor.c:376
+#, c-format
+msgid "unable to allocate netlink link cache for monitoring link status: %s"
+msgstr ""
+"nem lehet netlink kapcsolat-gyorsítótárat lefoglalni a kapcsolat állapotának "
+"megfigyelése érdekében: %s"
+
+#: ../src/nm-netlink-monitor.c:502
+#, c-format
+msgid "unable to join netlink group: %s"
+msgstr "nem lehet csatlakozni a netlink csoporthoz: %s"
+
+#: ../src/nm-netlink-monitor.c:629 ../src/nm-netlink-monitor.c:642
+#, c-format
+msgid "error updating link cache: %s"
+msgstr "hiba a kapcsolat gyorsítótárának frissítésekor: %s"
+
+#: ../src/settings/plugins/ifcfg-rh/reader.c:3464
+#: ../src/settings/plugins/ifnet/connection_parser.c:51
 msgid "System"
 msgstr "Rendszer"
 
+#: ../src/settings/nm-default-wired-connection.c:145
+#, c-format
+msgid "Auto %s"
+msgstr "Automatikus %s"
diff --git a/po/id.po b/po/id.po
index b8879290..e8adc151 100644
--- a/po/id.po
+++ b/po/id.po
@@ -1706,7 +1706,7 @@ msgstr "CATATAN: resolver libc mungkin tak mendukung lebih dari 3 nameserver."
 msgid "The nameservers listed below may not be recognized."
 msgstr "Nameserver yang terdaftar di bawah mungkin tak dikenali."
 
-#: ../src/system-settings/nm-default-wired-connection.c:157
+#: ../src/settings/nm-default-wired-connection.c:157
 #, c-format
 msgid "Auto %s"
 msgstr "Otomatis %s"
diff --git a/po/it.po b/po/it.po
index dd24604d..08de0499 100644
--- a/po/it.po
+++ b/po/it.po
@@ -1610,7 +1610,7 @@ msgstr "NOTA: il risolutore libc non supporta più di 3 server di nomi."
 msgid "The nameservers listed below may not be recognized."
 msgstr "I server di nomi elencati sotto non possono essere riconosciuti."
 
-#: ../src/system-settings/nm-default-wired-connection.c:157
+#: ../src/settings/nm-default-wired-connection.c:157
 #, c-format
 msgid "Auto %s"
 msgstr "%s (automatica)"
diff --git a/po/ja.po b/po/ja.po
index 4b49f008..37f0e829 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -1598,7 +1598,7 @@ msgstr "注記: libc リゾルバは ３つ以上のネームサーバーをサ�
 msgid "The nameservers listed below may not be recognized."
 msgstr "以下の一覧にあるネームサーバーは認識されないかも知れません。"
 
-#: ../src/system-settings/nm-default-wired-connection.c:157
+#: ../src/settings/nm-default-wired-connection.c:157
 #, c-format
 msgid "Auto %s"
 msgstr "自動 %s"
diff --git a/po/kn.po b/po/kn.po
index 54769baa..6d172a0d 100644
--- a/po/kn.po
+++ b/po/kn.po
@@ -1700,7 +1700,7 @@ msgstr ""
 msgid "The nameservers listed below may not be recognized."
 msgstr "ಈ ಕೆಳಗೆ ಸೂಚಿಸಲಾದ ನಾಮಪರಿಚಾರಕಗಳನ್ನು ಗುರುತಿಸಲಾಗಿಲ್ಲ."
 
-#: ../src/system-settings/nm-default-wired-connection.c:157
+#: ../src/settings/nm-default-wired-connection.c:157
 #, c-format
 msgid "Auto %s"
 msgstr "ಸ್ವಯಂ %s"
diff --git a/po/ko.po b/po/ko.po
index e2cc426b..d9d6f949 100644
--- a/po/ko.po
+++ b/po/ko.po
@@ -8,963 +8,1177 @@
 # Namhyung Kim <namhyung@gmail.com>, 2007.
 # Hyunsok Oh <enshahar@gmail.com>, 2010.
 # Hyunsok Oh <hoh@redhat.com>, 2010.
+# Changwoo Ryu <cwryu@debian.org>, 2011.
+#
+# 주의:
+# - 이 프로그램의 이름인 "Network Manager"는 "네트워크 관리" 혹은
+#  "네트워크 관리 프로그램"으로 번역.
+#
 msgid ""
 msgstr ""
 "Project-Id-Version: ko\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-05-06 14:31+0530\n"
-"PO-Revision-Date: 2010-05-10 13:48+1000\n"
-"Last-Translator: Hyunsok Oh <hoh@redhat.com>\n"
-"Language-Team: Korean <ko@li.org>\n"
+"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=NetworkManager&component=general\n"
+"POT-Creation-Date: 2011-02-24 03:24+0000\n"
+"PO-Revision-Date: 2011-02-27 16:50+0900\n"
+"Last-Translator: Changwoo Ryu <cwryu@debian.org>\n"
+"Language-Team: GNOME Korea <gnome-kr@googlegroups.com>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms:  nplurals=1; plural=0;\n"
-"X-Generator: KBabel 1.11.4\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
 
-#: ../cli/src/connections.c:59 ../cli/src/connections.c:74
-#: ../cli/src/devices.c:85 ../cli/src/devices.c:98 ../cli/src/devices.c:108
-#: ../cli/src/devices.c:118 ../cli/src/devices.c:131 ../cli/src/devices.c:142
-#: ../cli/src/devices.c:152
+#: ../cli/src/connections.c:63 ../cli/src/connections.c:77
+#: ../cli/src/devices.c:100 ../cli/src/devices.c:113 ../cli/src/devices.c:123
+#: ../cli/src/devices.c:133 ../cli/src/devices.c:147 ../cli/src/devices.c:161
+#: ../cli/src/devices.c:172 ../cli/src/devices.c:183 ../cli/src/devices.c:192
+#: ../cli/src/devices.c:201 ../cli/src/devices.c:223
 msgid "NAME"
 msgstr "이름"
 
 #. 0
-#: ../cli/src/connections.c:60 ../cli/src/connections.c:75
+#: ../cli/src/connections.c:64 ../cli/src/connections.c:78
 msgid "UUID"
 msgstr "UUID"
 
 #. 1
-#: ../cli/src/connections.c:61
+#: ../cli/src/connections.c:65
 msgid "DEVICES"
 msgstr "장치"
 
 #. 2
-#: ../cli/src/connections.c:62 ../cli/src/connections.c:77
-msgid "SCOPE"
-msgstr "범위"
-
-#. 3
-#: ../cli/src/connections.c:63
+#: ../cli/src/connections.c:66
 msgid "DEFAULT"
 msgstr "디폴트"
 
-#. 4
-#: ../cli/src/connections.c:64
-msgid "DBUS-SERVICE"
-msgstr "DBUS-서비스"
-
-#. 5
-#: ../cli/src/connections.c:65
+#. 3
+#: ../cli/src/connections.c:67
 msgid "SPEC-OBJECT"
 msgstr "스펙-객체"
 
-#. 6
-#: ../cli/src/connections.c:66
+#. 4
+#: ../cli/src/connections.c:68
 msgid "VPN"
 msgstr "VPN"
 
+#. 5
+#. 6
+#. 2
+#. 11
+#. 5
+#: ../cli/src/connections.c:69 ../cli/src/connections.c:84
+#: ../cli/src/devices.c:68 ../cli/src/devices.c:213 ../cli/src/devices.c:229
+msgid "DBUS-PATH"
+msgstr "DBUS 경로"
+
 #. 1
 #. 0
 #. 1
-#: ../cli/src/connections.c:76 ../cli/src/devices.c:61 ../cli/src/devices.c:87
+#. 2
+#: ../cli/src/connections.c:79 ../cli/src/devices.c:66
+#: ../cli/src/devices.c:102 ../cli/src/devices.c:226
 msgid "TYPE"
 msgstr "유형"
 
-#. 3
-#: ../cli/src/connections.c:78
+#. 2
+#: ../cli/src/connections.c:80
 msgid "TIMESTAMP"
 msgstr "타임스탬프"
 
-#. 4
-#: ../cli/src/connections.c:79
+#. 3
+#: ../cli/src/connections.c:81
 msgid "TIMESTAMP-REAL"
 msgstr "실제 타임스탬프"
 
-#. 5
-#: ../cli/src/connections.c:80
+#. 4
+#: ../cli/src/connections.c:82
 msgid "AUTOCONNECT"
 msgstr "자동연결"
 
-#. 6
-#: ../cli/src/connections.c:81
+#. 5
+#: ../cli/src/connections.c:83
 msgid "READONLY"
 msgstr "읽기전용"
 
-#: ../cli/src/connections.c:157
+#: ../cli/src/connections.c:167
 #, c-format
 msgid ""
 "Usage: nmcli con { COMMAND | help }\n"
 "  COMMAND := { list | status | up | down }\n"
 "\n"
-"  list [id <id> | uuid <id> | system | user]\n"
+"  list [id <id> | uuid <id>]\n"
 "  status\n"
+"  up id <id> | uuid <id> [iface <iface>] [ap <hwaddr>] [nsp <name>] [--"
+"nowait] [--timeout <timeout>]\n"
 "  up id <id> | uuid <id> [iface <iface>] [ap <hwaddr>] [--nowait] [--timeout "
 "<timeout>]\n"
 "  down id <id> | uuid <id>\n"
 msgstr ""
-"사용법: nmcli con { 명령어 | help }\n"
-"  명령어 := { list | status | up | down }\n"
+"사용법: nmcli con { <명령어> | help }\n"
+"  <명령어> := { list | status | up | down }\n"
 "\n"
-"  list [id <id> | uuid <id> | system | user]\n"
+"  list [id <id> | uuid <id> ]\n"
 "  status\n"
-"  up id <id> | uuid <id> [iface <인터페이스>] [ap <하드웨어주소>] [--nowait] "
-"[--timeout <타임아웃시간>]\n"
+"  up id <id> | uuid <id> [iface <인터페이스>] [ap <하드웨어주소>] [--nowait] [--timeout <타임아웃시간>]\n"
 "  down id <id> | uuid <id>\n"
 
-#: ../cli/src/connections.c:197 ../cli/src/connections.c:536
+#: ../cli/src/connections.c:220 ../cli/src/connections.c:542
 #, c-format
 msgid "Error: 'con list': %s"
 msgstr "오류: 'con list': %s"
 
-#: ../cli/src/connections.c:199 ../cli/src/connections.c:538
+#: ../cli/src/connections.c:222 ../cli/src/connections.c:544
 #, c-format
 msgid "Error: 'con list': %s; allowed fields: %s"
-msgstr "오류: 'con list': %s; 허용된 필드: %s"
+msgstr "오류: 'con list': %s. 허용된 필드: %s"
 
-#: ../cli/src/connections.c:207
+#: ../cli/src/connections.c:230
 msgid "Connection details"
 msgstr "연결 상세 정보"
 
-#: ../cli/src/connections.c:381 ../cli/src/connections.c:601
-msgid "system"
-msgstr "시스템"
-
-#: ../cli/src/connections.c:381 ../cli/src/connections.c:601
-msgid "user"
-msgstr "사용자"
-
-#: ../cli/src/connections.c:383
+#: ../cli/src/connections.c:417
 msgid "never"
 msgstr "하지않음"
 
 #. "CAPABILITIES"
 #. Print header
 #. "WIFI-PROPERTIES"
-#: ../cli/src/connections.c:384 ../cli/src/connections.c:385
-#: ../cli/src/connections.c:602 ../cli/src/connections.c:605
-#: ../cli/src/devices.c:388 ../cli/src/devices.c:513 ../cli/src/devices.c:539
-#: ../cli/src/devices.c:540 ../cli/src/devices.c:541 ../cli/src/devices.c:542
-#: ../cli/src/devices.c:543 ../cli/src/settings.c:504
-#: ../cli/src/settings.c:544 ../cli/src/settings.c:643
-#: ../cli/src/settings.c:912 ../cli/src/settings.c:913
-#: ../cli/src/settings.c:915 ../cli/src/settings.c:917
-#: ../cli/src/settings.c:1042 ../cli/src/settings.c:1043
-#: ../cli/src/settings.c:1044 ../cli/src/settings.c:1123
-#: ../cli/src/settings.c:1124 ../cli/src/settings.c:1125
-#: ../cli/src/settings.c:1126 ../cli/src/settings.c:1127
-#: ../cli/src/settings.c:1128 ../cli/src/settings.c:1129
-#: ../cli/src/settings.c:1130 ../cli/src/settings.c:1131
-#: ../cli/src/settings.c:1132 ../cli/src/settings.c:1133
-#: ../cli/src/settings.c:1134 ../cli/src/settings.c:1135
-#: ../cli/src/settings.c:1210
+#: ../cli/src/connections.c:418 ../cli/src/connections.c:419
+#: ../cli/src/connections.c:597 ../cli/src/connections.c:599
+#: ../cli/src/devices.c:503 ../cli/src/devices.c:556 ../cli/src/devices.c:681
+#: ../cli/src/devices.c:707 ../cli/src/devices.c:708 ../cli/src/devices.c:709
+#: ../cli/src/devices.c:710 ../cli/src/devices.c:711 ../cli/src/settings.c:518
+#: ../cli/src/settings.c:561 ../cli/src/settings.c:661
+#: ../cli/src/settings.c:935 ../cli/src/settings.c:936
+#: ../cli/src/settings.c:938 ../cli/src/settings.c:940
+#: ../cli/src/settings.c:1065 ../cli/src/settings.c:1066
+#: ../cli/src/settings.c:1067 ../cli/src/settings.c:1146
+#: ../cli/src/settings.c:1147 ../cli/src/settings.c:1148
+#: ../cli/src/settings.c:1149 ../cli/src/settings.c:1150
+#: ../cli/src/settings.c:1151 ../cli/src/settings.c:1152
+#: ../cli/src/settings.c:1153 ../cli/src/settings.c:1154
+#: ../cli/src/settings.c:1155 ../cli/src/settings.c:1156
+#: ../cli/src/settings.c:1157 ../cli/src/settings.c:1158
+#: ../cli/src/settings.c:1233
 msgid "yes"
 msgstr "예"
 
-#: ../cli/src/connections.c:384 ../cli/src/connections.c:385
-#: ../cli/src/connections.c:602 ../cli/src/connections.c:605
-#: ../cli/src/devices.c:388 ../cli/src/devices.c:513 ../cli/src/devices.c:539
-#: ../cli/src/devices.c:540 ../cli/src/devices.c:541 ../cli/src/devices.c:542
-#: ../cli/src/devices.c:543 ../cli/src/settings.c:504
-#: ../cli/src/settings.c:506 ../cli/src/settings.c:544
-#: ../cli/src/settings.c:643 ../cli/src/settings.c:912
-#: ../cli/src/settings.c:913 ../cli/src/settings.c:915
-#: ../cli/src/settings.c:917 ../cli/src/settings.c:1042
-#: ../cli/src/settings.c:1043 ../cli/src/settings.c:1044
-#: ../cli/src/settings.c:1123 ../cli/src/settings.c:1124
-#: ../cli/src/settings.c:1125 ../cli/src/settings.c:1126
-#: ../cli/src/settings.c:1127 ../cli/src/settings.c:1128
-#: ../cli/src/settings.c:1129 ../cli/src/settings.c:1130
-#: ../cli/src/settings.c:1131 ../cli/src/settings.c:1132
-#: ../cli/src/settings.c:1133 ../cli/src/settings.c:1134
-#: ../cli/src/settings.c:1135 ../cli/src/settings.c:1210
+#: ../cli/src/connections.c:418 ../cli/src/connections.c:419
+#: ../cli/src/connections.c:597 ../cli/src/connections.c:599
+#: ../cli/src/devices.c:503 ../cli/src/devices.c:556 ../cli/src/devices.c:681
+#: ../cli/src/devices.c:707 ../cli/src/devices.c:708 ../cli/src/devices.c:709
+#: ../cli/src/devices.c:710 ../cli/src/devices.c:711 ../cli/src/settings.c:518
+#: ../cli/src/settings.c:520 ../cli/src/settings.c:561
+#: ../cli/src/settings.c:661 ../cli/src/settings.c:935
+#: ../cli/src/settings.c:936 ../cli/src/settings.c:938
+#: ../cli/src/settings.c:940 ../cli/src/settings.c:1065
+#: ../cli/src/settings.c:1066 ../cli/src/settings.c:1067
+#: ../cli/src/settings.c:1146 ../cli/src/settings.c:1147
+#: ../cli/src/settings.c:1148 ../cli/src/settings.c:1149
+#: ../cli/src/settings.c:1150 ../cli/src/settings.c:1151
+#: ../cli/src/settings.c:1152 ../cli/src/settings.c:1153
+#: ../cli/src/settings.c:1154 ../cli/src/settings.c:1155
+#: ../cli/src/settings.c:1156 ../cli/src/settings.c:1157
+#: ../cli/src/settings.c:1158 ../cli/src/settings.c:1233
 msgid "no"
-msgstr "아니오"
+msgstr "아니요"
 
-#: ../cli/src/connections.c:457 ../cli/src/connections.c:500
-msgid "System connections"
-msgstr "시스템 연결"
+#: ../cli/src/connections.c:493
+msgid "Connection list"
+msgstr "연결 목록"
 
-#: ../cli/src/connections.c:462 ../cli/src/connections.c:513
-msgid "User connections"
-msgstr "사용자의 연결"
-
-#: ../cli/src/connections.c:474 ../cli/src/connections.c:1334
-#: ../cli/src/connections.c:1350 ../cli/src/connections.c:1359
-#: ../cli/src/connections.c:1370 ../cli/src/connections.c:1452
-#: ../cli/src/devices.c:864 ../cli/src/devices.c:874 ../cli/src/devices.c:973
-#: ../cli/src/devices.c:980
+#: ../cli/src/connections.c:506 ../cli/src/connections.c:1468
+#: ../cli/src/connections.c:1483 ../cli/src/connections.c:1492
+#: ../cli/src/connections.c:1502 ../cli/src/connections.c:1514
+#: ../cli/src/connections.c:1609 ../cli/src/devices.c:1184
+#: ../cli/src/devices.c:1194 ../cli/src/devices.c:1308
+#: ../cli/src/devices.c:1315 ../cli/src/devices.c:1528
+#: ../cli/src/devices.c:1535
 #, c-format
 msgid "Error: %s argument is missing."
 msgstr "오류: %s 인자가 없습니다."
 
-#: ../cli/src/connections.c:487
+#: ../cli/src/connections.c:519
 #, c-format
 msgid "Error: %s - no such connection."
 msgstr "오류: %s - 그런 연결이 없습니다."
 
-#: ../cli/src/connections.c:519 ../cli/src/connections.c:1383
-#: ../cli/src/connections.c:1470 ../cli/src/devices.c:687
-#: ../cli/src/devices.c:754 ../cli/src/devices.c:888 ../cli/src/devices.c:986
+#: ../cli/src/connections.c:525 ../cli/src/connections.c:1527
+#: ../cli/src/connections.c:1626 ../cli/src/devices.c:981
+#: ../cli/src/devices.c:1061 ../cli/src/devices.c:1208
+#: ../cli/src/devices.c:1321 ../cli/src/devices.c:1541
 #, c-format
 msgid "Unknown parameter: %s\n"
 msgstr "알려져있지 않은 매개변수입니다: %s\n"
 
-#: ../cli/src/connections.c:528
+#: ../cli/src/connections.c:534
 #, c-format
 msgid "Error: no valid parameter specified."
 msgstr "오류: 옳바른 매개변수가 지정되지 않았습니다."
 
-#: ../cli/src/connections.c:543 ../cli/src/connections.c:1572
-#: ../cli/src/devices.c:1192 ../cli/src/network-manager.c:274
+#: ../cli/src/connections.c:549 ../cli/src/connections.c:1717
+#: ../cli/src/devices.c:1749 ../cli/src/network-manager.c:461
 #, c-format
 msgid "Error: %s."
 msgstr "오류: %s."
 
-#: ../cli/src/connections.c:649
+#: ../cli/src/connections.c:637
 #, c-format
 msgid "Error: 'con status': %s"
 msgstr "오류: 'con status': %s"
 
-#: ../cli/src/connections.c:651
+#: ../cli/src/connections.c:639
 #, c-format
 msgid "Error: 'con status': %s; allowed fields: %s"
-msgstr "오류: 'con status': %s; 허용된 필드: %s"
+msgstr "오류: 'con status': %s. 허용된 필드: %s"
+
+#: ../cli/src/connections.c:647 ../cli/src/connections.c:1542
+#: ../cli/src/connections.c:1641 ../cli/src/devices.c:1008
+#: ../cli/src/devices.c:1070 ../cli/src/devices.c:1223
+#: ../cli/src/devices.c:1351 ../cli/src/devices.c:1570
+#, c-format
+msgid "Error: Can't find out if NetworkManager is running: %s."
+msgstr "오류: 네트워크 관리 프로그램이 실행 중인지 알 수 없습니다: %s."
+
+#: ../cli/src/connections.c:651 ../cli/src/connections.c:1546
+#: ../cli/src/connections.c:1645 ../cli/src/devices.c:1012
+#: ../cli/src/devices.c:1074 ../cli/src/devices.c:1227
+#: ../cli/src/devices.c:1355 ../cli/src/devices.c:1574
+#, c-format
+msgid "Error: NetworkManager is not running."
+msgstr "오류: 네트워크 관리 프로그램이 실행 중이 아닙니다."
 
-#: ../cli/src/connections.c:658
+#: ../cli/src/connections.c:659
 msgid "Active connections"
 msgstr "활성화된 연결"
 
-#: ../cli/src/connections.c:1026
+#: ../cli/src/connections.c:1139
 #, c-format
 msgid "no active connection on device '%s'"
 msgstr "장치 '%s'에 활성화된 연결이 없습니다"
 
-#: ../cli/src/connections.c:1034
+#: ../cli/src/connections.c:1147
 #, c-format
 msgid "no active connection or device"
 msgstr "활성화된 연결이나 장치가 없습니다"
 
-#: ../cli/src/connections.c:1084
+#: ../cli/src/connections.c:1218
 #, c-format
 msgid "device '%s' not compatible with connection '%s'"
-msgstr "장치 '%s'는 연걸 '%s'와 호환되지 않습니다"
+msgstr "'%s' 장치는 '%s' 연결과 호환되지 않습니다"
 
-#: ../cli/src/connections.c:1086
+#: ../cli/src/connections.c:1220
 #, c-format
 msgid "no device found for connection '%s'"
 msgstr "연결 '%s'에 대한 장치를 찾을 수 없습니다"
 
-#: ../cli/src/connections.c:1097
+#: ../cli/src/connections.c:1231
 msgid "activating"
 msgstr "활성화중"
 
-#: ../cli/src/connections.c:1099
+#: ../cli/src/connections.c:1233
 msgid "activated"
 msgstr "활성화됨"
 
-#: ../cli/src/connections.c:1102 ../cli/src/connections.c:1125
-#: ../cli/src/connections.c:1158 ../cli/src/devices.c:224
-#: ../cli/src/devices.c:514 ../cli/src/network-manager.c:92
-#: ../cli/src/network-manager.c:145 ../cli/src/settings.c:469
+#: ../cli/src/connections.c:1236 ../cli/src/connections.c:1259
+#: ../cli/src/connections.c:1292 ../cli/src/devices.c:307
+#: ../cli/src/devices.c:682 ../cli/src/network-manager.c:116
+#: ../cli/src/network-manager.c:178 ../cli/src/network-manager.c:181
+#: ../cli/src/network-manager.c:296 ../cli/src/network-manager.c:351
+#: ../cli/src/network-manager.c:389 ../cli/src/network-manager.c:428
+#: ../cli/src/settings.c:483 ../cli/src/utils.c:396
 msgid "unknown"
 msgstr "알 수 없음"
 
-#: ../cli/src/connections.c:1111
+#: ../cli/src/connections.c:1245
 msgid "VPN connecting (prepare)"
 msgstr "VPN 연결 중 (준비)"
 
-#: ../cli/src/connections.c:1113
+#: ../cli/src/connections.c:1247
 msgid "VPN connecting (need authentication)"
 msgstr "VPN 연결 중 (인증 필요)"
 
-#: ../cli/src/connections.c:1115
+#: ../cli/src/connections.c:1249
 msgid "VPN connecting"
 msgstr "VPN 연결 중"
 
-#: ../cli/src/connections.c:1117
+#: ../cli/src/connections.c:1251
 msgid "VPN connecting (getting IP configuration)"
 msgstr "VPN 연결 중 (IP 설정 얻는 중)"
 
-#: ../cli/src/connections.c:1119
+#: ../cli/src/connections.c:1253
 msgid "VPN connected"
 msgstr "VPN 연결 됨"
 
-#: ../cli/src/connections.c:1121
+#: ../cli/src/connections.c:1255
 msgid "VPN connection failed"
 msgstr "VPN 연결 실패"
 
-#: ../cli/src/connections.c:1123
+#: ../cli/src/connections.c:1257
 msgid "VPN disconnected"
 msgstr "VPN 연결 끊겼음"
 
-#: ../cli/src/connections.c:1134
+#: ../cli/src/connections.c:1268
 msgid "unknown reason"
 msgstr "알 수 없는 이유"
 
-#: ../cli/src/connections.c:1136
+#: ../cli/src/connections.c:1270
 msgid "none"
 msgstr "없음"
 
-#: ../cli/src/connections.c:1138
+#: ../cli/src/connections.c:1272
 msgid "the user was disconnected"
 msgstr "사용자 연결이 끊어졌습니다"
 
-#: ../cli/src/connections.c:1140
+#: ../cli/src/connections.c:1274
 msgid "the base network connection was interrupted"
 msgstr "기반 네트워크 연결이 중지되었습니다"
 
-#: ../cli/src/connections.c:1142
+#: ../cli/src/connections.c:1276
 msgid "the VPN service stopped unexpectedly"
 msgstr "VPN 서비스가 예기치 못하게 중단되었습니다"
 
-#: ../cli/src/connections.c:1144
+#: ../cli/src/connections.c:1278
 msgid "the VPN service returned invalid configuration"
 msgstr "VPN 서비스가 잘못된 설정을 반환했습니다"
 
-#: ../cli/src/connections.c:1146
+#: ../cli/src/connections.c:1280
 msgid "the connection attempt timed out"
 msgstr "연결 시도가 시간을 초과했습니다"
 
-#: ../cli/src/connections.c:1148
+#: ../cli/src/connections.c:1282
 msgid "the VPN service did not start in time"
 msgstr "VPN 서비스가 제 시간에 시작되지 않았습니다"
 
-#: ../cli/src/connections.c:1150
+#: ../cli/src/connections.c:1284
 msgid "the VPN service failed to start"
 msgstr "VPN 서비스를 시작하는 데 실패했습니다"
 
-#: ../cli/src/connections.c:1152
+#: ../cli/src/connections.c:1286
 msgid "no valid VPN secrets"
 msgstr "옳바른 VPN 비밀 정보가 없습니다"
 
-#: ../cli/src/connections.c:1154
+#: ../cli/src/connections.c:1288
 msgid "invalid VPN secrets"
 msgstr "잘못된 VPN 비밀정보"
 
-#: ../cli/src/connections.c:1156
+#: ../cli/src/connections.c:1290
 msgid "the connection was removed"
 msgstr "연결이 제거되었습니다"
 
-#: ../cli/src/connections.c:1170
+#: ../cli/src/connections.c:1304
 #, c-format
 msgid "state: %s\n"
 msgstr "상태: %s\n"
 
-#: ../cli/src/connections.c:1173 ../cli/src/connections.c:1199
+#: ../cli/src/connections.c:1307 ../cli/src/connections.c:1333
 #, c-format
 msgid "Connection activated\n"
 msgstr "연결이 활성화되었습니다\n"
 
-#: ../cli/src/connections.c:1176
+#: ../cli/src/connections.c:1310
 #, c-format
 msgid "Error: Connection activation failed."
 msgstr "오류: 연결 활성화가 실패했습니다."
 
-#: ../cli/src/connections.c:1195
+#: ../cli/src/connections.c:1329
 #, c-format
 msgid "state: %s (%d)\n"
 msgstr "상태: %s (%d)\n"
 
-#: ../cli/src/connections.c:1205
+#: ../cli/src/connections.c:1339
 #, c-format
 msgid "Error: Connection activation failed: %s."
 msgstr "오류: 연결 활성화가 실패했습니다: %s."
 
-#: ../cli/src/connections.c:1222 ../cli/src/devices.c:811
+#: ../cli/src/connections.c:1356 ../cli/src/devices.c:1130
 #, c-format
 msgid "Error: Timeout %d sec expired."
 msgstr "오류: 제한시간 %d초를 초과했습니다."
 
-#: ../cli/src/connections.c:1265
+#: ../cli/src/connections.c:1399
 #, c-format
 msgid "Error: Connection activation failed: %s"
 msgstr "오류: 연결 활성화가 실패했습니다: %s"
 
-#: ../cli/src/connections.c:1279
+#: ../cli/src/connections.c:1413
 #, c-format
 msgid "Error: Obtaining active connection for '%s' failed."
 msgstr "오류: '%s'에 대한 활성화된 연결을 얻는 데 실패했습니다."
 
-#: ../cli/src/connections.c:1288
+#: ../cli/src/connections.c:1422
 #, c-format
 msgid "Active connection state: %s\n"
 msgstr "활성화된 연결 상태: %s\n"
 
-#: ../cli/src/connections.c:1289
+#: ../cli/src/connections.c:1423
 #, c-format
 msgid "Active connection path: %s\n"
 msgstr "활성화된 연결 경로: %s\n"
 
-#: ../cli/src/connections.c:1343 ../cli/src/connections.c:1461
+#: ../cli/src/connections.c:1476 ../cli/src/connections.c:1617
 #, c-format
 msgid "Error: Unknown connection: %s."
 msgstr "오류: 알려지지 않은 연결: %s."
 
-#: ../cli/src/connections.c:1378 ../cli/src/devices.c:882
+#: ../cli/src/connections.c:1522 ../cli/src/devices.c:1202
 #, c-format
 msgid "Error: timeout value '%s' is not valid."
-msgstr "오류: 시간 제한 값 '%s'가 올바르지 않습니다."
+msgstr "오류: 시간 제한 값 '%s'이(가) 올바르지 않습니다."
 
-#: ../cli/src/connections.c:1391 ../cli/src/connections.c:1478
+#: ../cli/src/connections.c:1535 ../cli/src/connections.c:1634
 #, c-format
 msgid "Error: id or uuid has to be specified."
 msgstr "오류: id나 uuid를 지정해야만 합니다."
 
-#: ../cli/src/connections.c:1411
+#: ../cli/src/connections.c:1565
 #, c-format
 msgid "Error: No suitable device found: %s."
 msgstr "오류: 적절한 장치를 찾을 수 없습니다: %s."
 
-#: ../cli/src/connections.c:1413
+#: ../cli/src/connections.c:1567
 #, c-format
 msgid "Error: No suitable device found."
 msgstr "오류: 적절한 장치를 찾을 수 없습니다."
 
-#: ../cli/src/connections.c:1505
+#: ../cli/src/connections.c:1670
 #, c-format
 msgid "Warning: Connection not active\n"
 msgstr "경고: 연결이 활성화되어 있지 않습니다\n"
 
-#: ../cli/src/connections.c:1561
+#: ../cli/src/connections.c:1708
 #, c-format
 msgid "Error: 'con' command '%s' is not valid."
-msgstr "오류: 'con' 명령 '%s'는 바른 명령이 아닙니다."
+msgstr "오류: 'con' 명령 '%s'은(는) 바른 명령이 아닙니다."
 
-#: ../cli/src/connections.c:1597
+#: ../cli/src/connections.c:1773
 #, c-format
 msgid "Error: could not connect to D-Bus."
 msgstr "오류: D-버스에 연결할 수 없습니다."
 
-#: ../cli/src/connections.c:1604
+#: ../cli/src/connections.c:1780
 #, c-format
 msgid "Error: Could not get system settings."
 msgstr "오류: 시스템 설정을 얻을 수 없습니다."
 
-#: ../cli/src/connections.c:1612
+#: ../cli/src/connections.c:1790
 #, c-format
-msgid "Error: Could not get user settings."
-msgstr "오류: 사용자 설정을 얻을 수 없습니다."
-
-#: ../cli/src/connections.c:1622
-#, c-format
-msgid "Error: Can't obtain connections: settings services are not running."
-msgstr "오류: 연결을 얻을 수 없습니다: 설정 서비스가 실행중이지 않습니다."
+msgid "Error: Can't obtain connections: settings service is not running."
+msgstr "오류: 연결을 얻을 수 없습니다: 설정 서비스가 실행 중이 아닙니다."
 
 #. 0
 #. 9
-#: ../cli/src/devices.c:60 ../cli/src/devices.c:86 ../cli/src/devices.c:162
+#. 3
+#: ../cli/src/devices.c:65 ../cli/src/devices.c:101 ../cli/src/devices.c:211
+#: ../cli/src/devices.c:227
 msgid "DEVICE"
 msgstr "장치"
 
 #. 1
 #. 4
-#. 0
-#: ../cli/src/devices.c:62 ../cli/src/devices.c:90
-#: ../cli/src/network-manager.c:36
+#. 1
+#: ../cli/src/devices.c:67 ../cli/src/devices.c:105
+#: ../cli/src/network-manager.c:37
 msgid "STATE"
 msgstr "상태"
 
-#: ../cli/src/devices.c:71
+#: ../cli/src/devices.c:77
 msgid "GENERAL"
 msgstr "일반"
 
 #. 0
-#: ../cli/src/devices.c:72
+#: ../cli/src/devices.c:78
 msgid "CAPABILITIES"
 msgstr "기능"
 
 #. 1
-#: ../cli/src/devices.c:73
+#: ../cli/src/devices.c:79
 msgid "WIFI-PROPERTIES"
-msgstr "WIFI-특성"
+msgstr "WIFI 속성"
 
 #. 2
-#: ../cli/src/devices.c:74
+#: ../cli/src/devices.c:80
 msgid "AP"
 msgstr "AP"
 
 #. 3
-#: ../cli/src/devices.c:75
+#: ../cli/src/devices.c:81
 msgid "WIRED-PROPERTIES"
-msgstr "유선 상태"
+msgstr "유선 속성"
 
 #. 4
-#: ../cli/src/devices.c:76
+#: ../cli/src/devices.c:82
+msgid "WIMAX-PROPERTIES"
+msgstr "WIMAX 속성"
+
+#. 5
+#. 0
+#: ../cli/src/devices.c:83 ../cli/src/devices.c:224
+msgid "NSP"
+msgstr "NSP"
+
+#. 6
+#: ../cli/src/devices.c:84
 msgid "IP4-SETTINGS"
 msgstr "IP4 설정"
 
-#. 5
-#: ../cli/src/devices.c:77
+#. 7
+#: ../cli/src/devices.c:85
 msgid "IP4-DNS"
 msgstr "IP4 DNS"
 
+#. 8
+#: ../cli/src/devices.c:86
+msgid "IP6-SETTINGS"
+msgstr "IP6 설정"
+
+#. 9
+#: ../cli/src/devices.c:87
+msgid "IP6-DNS"
+msgstr "IP6 DNS"
+
 #. 2
-#: ../cli/src/devices.c:88
+#: ../cli/src/devices.c:103
 msgid "DRIVER"
 msgstr "드라이버"
 
 #. 3
-#: ../cli/src/devices.c:89
+#: ../cli/src/devices.c:104
 msgid "HWADDR"
 msgstr "하드웨어주소"
 
 #. 0
-#: ../cli/src/devices.c:99
+#: ../cli/src/devices.c:114
 msgid "CARRIER-DETECT"
 msgstr "캐리어 감지"
 
 #. 1
-#: ../cli/src/devices.c:100
+#: ../cli/src/devices.c:115
 msgid "SPEED"
 msgstr "속도"
 
 #. 0
-#: ../cli/src/devices.c:109
+#: ../cli/src/devices.c:124
 msgid "CARRIER"
 msgstr "캐리어"
 
 #. 0
-#: ../cli/src/devices.c:119
+#: ../cli/src/devices.c:134
 msgid "WEP"
 msgstr "WEP"
 
 #. 1
-#: ../cli/src/devices.c:120
+#: ../cli/src/devices.c:135
 msgid "WPA"
 msgstr "WPA"
 
 #. 2
-#: ../cli/src/devices.c:121
+#: ../cli/src/devices.c:136
 msgid "WPA2"
 msgstr "WPA2"
 
 #. 3
-#: ../cli/src/devices.c:122
+#: ../cli/src/devices.c:137
 msgid "TKIP"
 msgstr "TKIP"
 
 #. 4
-#: ../cli/src/devices.c:123
+#: ../cli/src/devices.c:138
 msgid "CCMP"
 msgstr "CCMP"
 
 #. 0
-#: ../cli/src/devices.c:132
+#: ../cli/src/devices.c:148
+msgid "CTR-FREQ"
+msgstr "CTR 주파수"
+
+#. 1
+#: ../cli/src/devices.c:149
+msgid "RSSI"
+msgstr "RSSI"
+
+#. 2
+#: ../cli/src/devices.c:150
+msgid "CINR"
+msgstr "CINR"
+
+#. 3
+#: ../cli/src/devices.c:151
+msgid "TX-POW"
+msgstr "TX-POW"
+
+#. 4
+#: ../cli/src/devices.c:152
+msgid "BSID"
+msgstr "BSID"
+
+#. 0
+#: ../cli/src/devices.c:162 ../cli/src/devices.c:173
 msgid "ADDRESS"
 msgstr "주소"
 
 #. 1
-#: ../cli/src/devices.c:133
+#: ../cli/src/devices.c:163 ../cli/src/devices.c:174
 msgid "PREFIX"
 msgstr "접두사"
 
 #. 2
-#: ../cli/src/devices.c:134
+#: ../cli/src/devices.c:164 ../cli/src/devices.c:175
 msgid "GATEWAY"
 msgstr "게이트웨이"
 
 #. 0
-#: ../cli/src/devices.c:143
+#: ../cli/src/devices.c:184 ../cli/src/devices.c:193
 msgid "DNS"
 msgstr "DNS"
 
 #. 0
-#: ../cli/src/devices.c:153
+#: ../cli/src/devices.c:202
 msgid "SSID"
 msgstr "SSID"
 
 #. 1
-#: ../cli/src/devices.c:154
+#: ../cli/src/devices.c:203
 msgid "BSSID"
 msgstr "BSSID"
 
 #. 2
-#: ../cli/src/devices.c:155
+#: ../cli/src/devices.c:204
 msgid "MODE"
 msgstr "모드"
 
 #. 3
-#: ../cli/src/devices.c:156
+#: ../cli/src/devices.c:205
 msgid "FREQ"
 msgstr "주파수"
 
 #. 4
-#: ../cli/src/devices.c:157
+#: ../cli/src/devices.c:206
 msgid "RATE"
 msgstr "전송률"
 
 #. 5
-#: ../cli/src/devices.c:158
+#. 1
+#: ../cli/src/devices.c:207 ../cli/src/devices.c:225
 msgid "SIGNAL"
 msgstr "신호"
 
 #. 6
-#: ../cli/src/devices.c:159
+#: ../cli/src/devices.c:208
 msgid "SECURITY"
 msgstr "보안"
 
 #. 7
-#: ../cli/src/devices.c:160
+#: ../cli/src/devices.c:209
 msgid "WPA-FLAGS"
 msgstr "WPA 플래그"
 
 #. 8
-#: ../cli/src/devices.c:161
+#: ../cli/src/devices.c:210
 msgid "RSN-FLAGS"
 msgstr "RSN 플래그"
 
 #. 10
-#: ../cli/src/devices.c:163
+#. 4
+#: ../cli/src/devices.c:212 ../cli/src/devices.c:228
 msgid "ACTIVE"
 msgstr "활성"
 
-#: ../cli/src/devices.c:186
+#: ../cli/src/devices.c:255
 #, c-format
 msgid ""
 "Usage: nmcli dev { COMMAND | help }\n"
 "\n"
+"  COMMAND := { status | list | disconnect | wifi | wimax }\n"
+"\n"
 "  COMMAND := { status | list | disconnect | wifi }\n"
 "\n"
 "  status\n"
 "  list [iface <iface>]\n"
 "  disconnect iface <iface> [--nowait] [--timeout <timeout>]\n"
 "  wifi [list [iface <iface>] [hwaddr <hwaddr>]]\n"
+"  wimax [list [iface <iface>] [nsp <name>]]\n"
 "\n"
 msgstr ""
-"사용법: nmcli dev { 명령어 | help }\n"
+"사용법: nmcli dev { <명령어> | help }\n"
+"\n"
+"  <명령어> := { status | list | disconnect | wifi | wimax }\n"
 "\n"
-"  명령어 := { status | list | disconnect | wifi }\n"
+"  <명령어> := { status | list | disconnect | wifi }\n"
 "\n"
 "  status\n"
 "  list [iface <인터페이스>]\n"
 "  disconnect iface <인터페이스> [--nowait] [--timeout <타임아웃시간>]\n"
 "  wifi [list [iface <인터페이스>] | hwaddr <하드웨어주소>]\n"
+"  wimax [list [iface <인터페이스>] | nsp <이름>]\n"
 "\n"
 
-#: ../cli/src/devices.c:206
+#: ../cli/src/devices.c:283
 msgid "unmanaged"
 msgstr "관리되지 않음"
 
-#: ../cli/src/devices.c:208
+#: ../cli/src/devices.c:285
 msgid "unavailable"
 msgstr "사용할 수 없음"
 
-#: ../cli/src/devices.c:210 ../cli/src/network-manager.c:89
+#: ../cli/src/devices.c:287 ../cli/src/network-manager.c:113
 msgid "disconnected"
 msgstr "연결 끊겼음"
 
-#: ../cli/src/devices.c:212
+#: ../cli/src/devices.c:289
 msgid "connecting (prepare)"
 msgstr "연결 중 (준비)"
 
-#: ../cli/src/devices.c:214
+#: ../cli/src/devices.c:291
 msgid "connecting (configuring)"
 msgstr "연결 중 (설정중)"
 
-#: ../cli/src/devices.c:216
+#: ../cli/src/devices.c:293
 msgid "connecting (need authentication)"
 msgstr "연결 중 (인증 필요)"
 
-#: ../cli/src/devices.c:218
+#: ../cli/src/devices.c:295
 msgid "connecting (getting IP configuration)"
 msgstr "연결 중 (IP 설정 가져오는 중)"
 
-#: ../cli/src/devices.c:220 ../cli/src/network-manager.c:87
+#: ../cli/src/devices.c:297
+msgid "connecting (checking IP connectivity)"
+msgstr "연결 중 (IP 연결 확인하는 중)"
+
+#: ../cli/src/devices.c:299
+msgid "connecting (starting secondary connections)"
+msgstr "연결 중 (보조 연결 시작하는 중)"
+
+#: ../cli/src/devices.c:301 ../cli/src/network-manager.c:109
 msgid "connected"
 msgstr "연결됨"
 
-#: ../cli/src/devices.c:222
+#: ../cli/src/devices.c:303
+msgid "deactivating"
+msgstr "활성화 해제하는 중"
+
+#: ../cli/src/devices.c:305
 msgid "connection failed"
 msgstr "연결 실패함"
 
-#: ../cli/src/devices.c:245 ../cli/src/devices.c:380
+#: ../cli/src/devices.c:335 ../cli/src/devices.c:495 ../cli/src/devices.c:539
 msgid "Unknown"
 msgstr "알 수 없음"
 
-#: ../cli/src/devices.c:277
+#: ../cli/src/devices.c:368
 msgid "(none)"
 msgstr "(없음)"
 
-#: ../cli/src/devices.c:302
+#: ../cli/src/devices.c:393
 #, c-format
 msgid "%s: error converting IP4 address 0x%X"
-msgstr "%s: IP4 주소 0x%X를 변환하는 중 오류가 있습니다"
+msgstr "%s: IP4 주소를 (0x%X) 변환하는 중 오류가 있습니다"
 
-#: ../cli/src/devices.c:349
+#: ../cli/src/devices.c:464
 #, c-format
 msgid "%u MHz"
 msgstr "%u MHz"
 
-#: ../cli/src/devices.c:350
+#: ../cli/src/devices.c:465
 #, c-format
 msgid "%u MB/s"
 msgstr "%u MB/s"
 
-#: ../cli/src/devices.c:359
+#: ../cli/src/devices.c:474
 msgid "Encrypted: "
 msgstr "암호화됨: "
 
-#: ../cli/src/devices.c:364
+#: ../cli/src/devices.c:479
 msgid "WEP "
 msgstr "WEP "
 
-#: ../cli/src/devices.c:366
+#: ../cli/src/devices.c:481
 msgid "WPA "
 msgstr "WPA "
 
-#: ../cli/src/devices.c:368
+#: ../cli/src/devices.c:483
 msgid "WPA2 "
 msgstr "WPA2 "
 
-#: ../cli/src/devices.c:371
+#: ../cli/src/devices.c:486
 msgid "Enterprise "
 msgstr "기업용 WPA "
 
-#: ../cli/src/devices.c:380
+#: ../cli/src/devices.c:495
 msgid "Ad-Hoc"
 msgstr "애드혹"
 
-#: ../cli/src/devices.c:380
+#: ../cli/src/devices.c:495
 msgid "Infrastructure"
 msgstr "인프라스트럭쳐"
 
-#: ../cli/src/devices.c:442
+#: ../cli/src/devices.c:530
+msgid "Home"
+msgstr "홈"
+
+#: ../cli/src/devices.c:533
+msgid "Partner"
+msgstr "파트너"
+
+#: ../cli/src/devices.c:536
+msgid "Roaming"
+msgstr "로밍"
+
+#: ../cli/src/devices.c:606
 #, c-format
 msgid "Error: 'dev list': %s"
 msgstr "오류: 'dev list': %s"
 
-#: ../cli/src/devices.c:444
+#: ../cli/src/devices.c:608
 #, c-format
 msgid "Error: 'dev list': %s; allowed fields: %s"
-msgstr "오류: 'dev list': %s; 허용된 필드: %s"
+msgstr "오류: 'dev list': %s. 허용된 필드: %s"
 
-#: ../cli/src/devices.c:453
+#: ../cli/src/devices.c:617
 msgid "Device details"
 msgstr "장치 상세정보"
 
-#: ../cli/src/devices.c:483 ../cli/src/devices.c:827
+#: ../cli/src/devices.c:651 ../cli/src/devices.c:1146 ../cli/src/utils.c:342
 msgid "(unknown)"
 msgstr "(알 수 없음)"
 
-#: ../cli/src/devices.c:484
+#: ../cli/src/devices.c:652
 msgid "unknown)"
 msgstr "알 수 없음)"
 
-#: ../cli/src/devices.c:510
+#: ../cli/src/devices.c:678
 #, c-format
 msgid "%u Mb/s"
 msgstr "%u Mb/s"
 
 #. Print header
 #. "WIRED-PROPERTIES"
-#: ../cli/src/devices.c:583
+#: ../cli/src/devices.c:751
 msgid "on"
 msgstr "켜짐"
 
-#: ../cli/src/devices.c:583
+#: ../cli/src/devices.c:751
 msgid "off"
 msgstr "꺼짐"
 
-#: ../cli/src/devices.c:710
+#: ../cli/src/devices.c:998
 #, c-format
 msgid "Error: 'dev status': %s"
 msgstr "오류: 'dev status': %s"
 
-#: ../cli/src/devices.c:712
+#: ../cli/src/devices.c:1000
 #, c-format
 msgid "Error: 'dev status': %s; allowed fields: %s"
-msgstr "오류: 'dev status': %s; 허용되는 필드: %s"
+msgstr "오류: 'dev status': %s. 허용되는 필드: %s"
 
-#: ../cli/src/devices.c:719
+#: ../cli/src/devices.c:1023
 msgid "Status of devices"
 msgstr "장치 상태"
 
-#: ../cli/src/devices.c:747
+#: ../cli/src/devices.c:1054
 #, c-format
 msgid "Error: '%s' argument is missing."
 msgstr "오류: '%s' 인자가 없습니다."
 
-#: ../cli/src/devices.c:776 ../cli/src/devices.c:915 ../cli/src/devices.c:1035
+#: ../cli/src/devices.c:1095 ../cli/src/devices.c:1247
+#: ../cli/src/devices.c:1383 ../cli/src/devices.c:1602
 #, c-format
 msgid "Error: Device '%s' not found."
-msgstr "오류: 장치 '%s'를 찾을 수 없습니다."
+msgstr "오류: '%s' 장치를 찾을 수 없습니다."
 
-#: ../cli/src/devices.c:799
+#: ../cli/src/devices.c:1118
 #, c-format
 msgid "Success: Device '%s' successfully disconnected."
-msgstr "성공: 장치 '%s'가 성공적으로 연결 해제되었습니다."
+msgstr "성공: '%s' 장치를 성공적으로 연결 해제했습니다."
 
-#: ../cli/src/devices.c:824
+#: ../cli/src/devices.c:1143
 #, c-format
 msgid "Error: Device '%s' (%s) disconnecting failed: %s"
 msgstr "오류: 장치 '%s' (%s)의 연결 해제가 실패했습니다: %s"
 
-#: ../cli/src/devices.c:832
+#: ../cli/src/devices.c:1151
 #, c-format
 msgid "Device state: %d (%s)\n"
 msgstr "장치 상태: %d (%s)\n"
 
-#: ../cli/src/devices.c:896
+#: ../cli/src/devices.c:1216
 #, c-format
 msgid "Error: iface has to be specified."
 msgstr "오류: iface를 지정해야만 합니다."
 
-#: ../cli/src/devices.c:1011
+#: ../cli/src/devices.c:1341
 #, c-format
 msgid "Error: 'dev wifi': %s"
 msgstr "오류 'dev wifi': '%s'"
 
-#: ../cli/src/devices.c:1013
+#: ../cli/src/devices.c:1343
 #, c-format
 msgid "Error: 'dev wifi': %s; allowed fields: %s"
-msgstr "오류: 'dev wifi': %s; 허용되는 필드: %s"
+msgstr "오류: 'dev wifi': %s. 허용되는 필드: %s"
 
-#: ../cli/src/devices.c:1020
+#: ../cli/src/devices.c:1366
 msgid "WiFi scan list"
 msgstr "검색된 WiFi 목록"
 
-#: ../cli/src/devices.c:1055 ../cli/src/devices.c:1109
+#: ../cli/src/devices.c:1403 ../cli/src/devices.c:1457
+#: ../cli/src/devices.c:1664
 #, c-format
 msgid "Error: Access point with hwaddr '%s' not found."
 msgstr "오류: 하드웨어주소가 '%s'인 억세스 포인트를 찾을 수 없습니다."
 
-#: ../cli/src/devices.c:1072
+#: ../cli/src/devices.c:1420
 #, c-format
 msgid "Error: Device '%s' is not a WiFi device."
-msgstr "오류: 장치 '%s'는 WiFi 장치가 아닙니다."
+msgstr "오류: '%s' 장치는 WiFi 장치가 아닙니다."
 
-#: ../cli/src/devices.c:1136
+#: ../cli/src/devices.c:1484
 #, c-format
 msgid "Error: 'dev wifi' command '%s' is not valid."
-msgstr "오류 'dev wifi' 명령어 '%s'가 바르지 않습니다."
+msgstr "오류 'dev wifi' 명령어 '%s'이(가) 바르지 않습니다."
+
+#: ../cli/src/devices.c:1560
+#, c-format
+msgid "Error: 'dev wimax': %s"
+msgstr "오류: 'dev wimax': '%s'"
+
+#: ../cli/src/devices.c:1562
+#, c-format
+msgid "Error: 'dev wimax': %s; allowed fields: %s"
+msgstr "오류: 'dev wimax': %s. 허용되는 필드: %s"
+
+#: ../cli/src/devices.c:1585
+msgid "WiMAX NSP list"
+msgstr "WiMAX NSP 목록"
+
+#: ../cli/src/devices.c:1622
+#, c-format
+msgid "Error: NSP with name '%s' not found."
+msgstr "오류: 이름이 '%s'인 NSP를 찾을 수 없습니다."
+
+#: ../cli/src/devices.c:1633
+#, c-format
+msgid "Error: Device '%s' is not a WiMAX device."
+msgstr "오류: '%s' 장치는 와이맥스 장치가 아닙니다."
+
+#: ../cli/src/devices.c:1691
+#, c-format
+msgid "Error: 'dev wimax' command '%s' is not valid."
+msgstr "오류 'dev wimax' 명령어 '%s'이(가) 바르지 않습니다."
 
-#: ../cli/src/devices.c:1183
+#: ../cli/src/devices.c:1741
 #, c-format
 msgid "Error: 'dev' command '%s' is not valid."
-msgstr "오류: 'dev' 명령어 '%s'가 바르지 않습니다."
+msgstr "오류: 'dev' 명령어 '%s'이(가) 바르지 않습니다."
 
 #: ../cli/src/network-manager.c:35
 msgid "RUNNING"
 msgstr "실행중"
 
-#. 1
-#: ../cli/src/network-manager.c:37
-msgid "WIFI-HARDWARE"
-msgstr "WIFI 하드웨어"
+#. 0
+#: ../cli/src/network-manager.c:36
+msgid "VERSION"
+msgstr "버전"
 
 #. 2
 #: ../cli/src/network-manager.c:38
-msgid "WIFI"
-msgstr "WIFI"
+msgid "NET-ENABLED"
+msgstr "네트워크 사용"
 
 #. 3
 #: ../cli/src/network-manager.c:39
-msgid "WWAN-HARDWARE"
-msgstr "WWAN 하드웨어"
+msgid "WIFI-HARDWARE"
+msgstr "WIFI 하드웨어"
 
 #. 4
 #: ../cli/src/network-manager.c:40
+msgid "WIFI"
+msgstr "WIFI"
+
+#. 5
+#: ../cli/src/network-manager.c:41
+msgid "WWAN-HARDWARE"
+msgstr "WWAN 하드웨어"
+
+#. 6
+#: ../cli/src/network-manager.c:42
 msgid "WWAN"
 msgstr "WWAN"
 
-#: ../cli/src/network-manager.c:62
+#. 7
+#: ../cli/src/network-manager.c:43
+msgid "WIMAX-HARDWARE"
+msgstr "와이맥스 하드웨어"
+
+#. 8
+#: ../cli/src/network-manager.c:44
+msgid "WIMAX"
+msgstr "와이맥스"
+
+#: ../cli/src/network-manager.c:72
 #, c-format
 msgid ""
 "Usage: nmcli nm { COMMAND | help }\n"
 "\n"
-"  COMMAND := { status | sleep | wakeup | wifi | wwan }\n"
+"  COMMAND := { status | enable | sleep | wifi | wwan | wimax }\n"
+"\n"
+"  COMMAND := { status | enable | sleep | wifi | wwan }\n"
 "\n"
 "  status\n"
-"  sleep\n"
-"  wakeup\n"
+"  enable [true|false]\n"
+"  sleep [true|false]\n"
 "  wifi [on|off]\n"
 "  wwan [on|off]\n"
+"  wimax [on|off]\n"
 "\n"
 msgstr ""
-"사용법: nmcli nm { 명령어 | help }\n"
+"사용법: nmcli nm { <명령어> | help }\n"
+"\n"
+"  <명령어> := { status | sleep | wakeup | wifi | wwan | wimax}\n"
 "\n"
-"  명령어 := { status | sleep | wakeup | wifi | wwan }\n"
+"  <명령어> := { status | sleep | wakeup | wifi | wwan }\n"
 "\n"
 "  status\n"
 "  sleep\n"
 "  wakeup\n"
 "  wifi [on|off]\n"
 "  wwan [on|off]\n"
+"  wimax [on|off]\n"
 "\n"
 
-#: ../cli/src/network-manager.c:83
+#: ../cli/src/network-manager.c:101
 msgid "asleep"
-msgstr "잠듦"
+msgstr "사용 일시 중지"
 
-#: ../cli/src/network-manager.c:85
+#: ../cli/src/network-manager.c:103
 msgid "connecting"
 msgstr "연결"
 
-#: ../cli/src/network-manager.c:125
+#: ../cli/src/network-manager.c:105
+msgid "connected (local only)"
+msgstr "연결됨 (로컬 전용)"
+
+#: ../cli/src/network-manager.c:107
+msgid "connected (site only)"
+msgstr "연결됨 (사이트 전용)"
+
+#: ../cli/src/network-manager.c:111
+msgid "disconnecting"
+msgstr "연결 끊는 중"
+
+#: ../cli/src/network-manager.c:151
 #, c-format
 msgid "Error: 'nm status': %s"
 msgstr "오류: 'nm status': %s"
 
-#: ../cli/src/network-manager.c:127
+#: ../cli/src/network-manager.c:153
 #, c-format
 msgid "Error: 'nm status': %s; allowed fields: %s"
-msgstr "오류: 'nm status': %s; 허용되는 필드: %s"
-
-#: ../cli/src/network-manager.c:134
-msgid "NetworkManager status"
-msgstr "네트워크 관리자 상태"
-
-#. Print header
-#: ../cli/src/network-manager.c:140 ../cli/src/network-manager.c:141
-#: ../cli/src/network-manager.c:142 ../cli/src/network-manager.c:143
-#: ../cli/src/network-manager.c:211 ../cli/src/network-manager.c:243
+msgstr "오류: 'nm status': %s. 허용되는 필드: %s"
+
+#. create NMClient
+#: ../cli/src/network-manager.c:166 ../cli/src/network-manager.c:167
+#: ../cli/src/network-manager.c:168 ../cli/src/network-manager.c:169
+#: ../cli/src/network-manager.c:170 ../cli/src/network-manager.c:172
+#: ../cli/src/network-manager.c:173 ../cli/src/network-manager.c:294
+#: ../cli/src/network-manager.c:349 ../cli/src/network-manager.c:387
+#: ../cli/src/network-manager.c:426
 msgid "enabled"
 msgstr "사용"
 
-#: ../cli/src/network-manager.c:140 ../cli/src/network-manager.c:141
-#: ../cli/src/network-manager.c:142 ../cli/src/network-manager.c:143
-#: ../cli/src/network-manager.c:211 ../cli/src/network-manager.c:243
+#: ../cli/src/network-manager.c:166 ../cli/src/network-manager.c:167
+#: ../cli/src/network-manager.c:168 ../cli/src/network-manager.c:169
+#: ../cli/src/network-manager.c:170 ../cli/src/network-manager.c:172
+#: ../cli/src/network-manager.c:173 ../cli/src/network-manager.c:294
+#: ../cli/src/network-manager.c:349 ../cli/src/network-manager.c:387
+#: ../cli/src/network-manager.c:426
 msgid "disabled"
-msgstr "미사용"
+msgstr "사용 않음"
+
+#: ../cli/src/network-manager.c:186
+msgid "NetworkManager status"
+msgstr "네트워크 관리 상태"
 
-#: ../cli/src/network-manager.c:148
+#. Print header
+#: ../cli/src/network-manager.c:189
 msgid "running"
 msgstr "실행 중"
 
-#: ../cli/src/network-manager.c:148
+#: ../cli/src/network-manager.c:189
 msgid "not running"
 msgstr "실행 중이 아님"
 
-#: ../cli/src/network-manager.c:201 ../cli/src/network-manager.c:233
+#: ../cli/src/network-manager.c:220 ../cli/src/utils.c:322
+#, c-format
+msgid "Error: Couldn't connect to system bus: %s"
+msgstr "오류: 시스템 버스에 연결할 수 없습니다: %s"
+
+#: ../cli/src/network-manager.c:231
+#, c-format
+msgid "Error: Couldn't create D-Bus object proxy."
+msgstr "오류: D-버스 오브젝트 프록시에 연결할 수 없습니다."
+
+#: ../cli/src/network-manager.c:237
+#, c-format
+msgid "Error in sleep: %s"
+msgstr "일시 중지에 오류: %s"
+
+#: ../cli/src/network-manager.c:281 ../cli/src/network-manager.c:336
+#: ../cli/src/network-manager.c:374 ../cli/src/network-manager.c:413
 #, c-format
 msgid "Error: '--fields' value '%s' is not valid here; allowed fields: %s"
-msgstr "오류: '--fields' 값 '%s'은 올바르지 않습니다; 허용되는 필드: %s"
+msgstr "오류: '--fields' 값 '%s'은(는) 올바르지 않습니다. 허용되는 필드: %s"
+
+#: ../cli/src/network-manager.c:289
+msgid "Networking enabled"
+msgstr "네트워크 사용"
+
+#: ../cli/src/network-manager.c:305
+#, c-format
+msgid "Error: invalid 'enable' parameter: '%s'; use 'true' or 'false'."
+msgstr "오류: 잘못된 'enable' 매개변수: '%s'. 'true'나 'false'를 사용하십시오."
+
+#: ../cli/src/network-manager.c:315
+#, c-format
+msgid "Error: Sleeping status is not exported by NetworkManager."
+msgstr "오류: 네트워크 관리 프로그램이 일시 중지 상태를 알려 주지 않습니다."
+
+#: ../cli/src/network-manager.c:323
+#, c-format
+msgid "Error: invalid 'sleep' parameter: '%s'; use 'true' or 'false'."
+msgstr "오류: 잘못된 'sleep' 매개변수: '%s'. 'true'나 'fasle'를 사용하십시오."
 
-#: ../cli/src/network-manager.c:209
+#: ../cli/src/network-manager.c:344
 msgid "WiFi enabled"
-msgstr "WiFi 사용중"
+msgstr "WiFi 사용 중"
 
-#: ../cli/src/network-manager.c:220
+#: ../cli/src/network-manager.c:360
 #, c-format
 msgid "Error: invalid 'wifi' parameter: '%s'."
 msgstr "오류: 잘못된 'wifi' 매개변수: '%s'."
 
-#: ../cli/src/network-manager.c:241
+#: ../cli/src/network-manager.c:382
 msgid "WWAN enabled"
-msgstr "WWAN 사용중"
+msgstr "WWAN 사용 중"
 
-#: ../cli/src/network-manager.c:252
+#: ../cli/src/network-manager.c:398
 #, c-format
 msgid "Error: invalid 'wwan' parameter: '%s'."
 msgstr "오류: 잘못된 'wwan' 매개변수: '%s'."
 
-#: ../cli/src/network-manager.c:263
+#: ../cli/src/network-manager.c:421
+msgid "WiMAX enabled"
+msgstr "와이맥스 사용 중"
+
+#: ../cli/src/network-manager.c:437
+#, c-format
+msgid "Error: invalid 'wimax' parameter: '%s'."
+msgstr "오류: 잘못된 'wimax' 매개변수: '%s'."
+
+#: ../cli/src/network-manager.c:450
 #, c-format
 msgid "Error: 'nm' command '%s' is not valid."
-msgstr "오류: 'mn' 명령어 '%s'가 바르지 않습니다."
+msgstr "오류: 'mn' 명령어 '%s'이(가) 바르지 않습니다."
 
-#: ../cli/src/nmcli.c:69
+#: ../cli/src/nmcli.c:64
 #, c-format
 msgid ""
 "Usage: %s [OPTIONS] OBJECT { COMMAND | help }\n"
@@ -976,6 +1190,8 @@ msgid ""
 "  -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"
 "  -v[ersion]                                 show program version\n"
 "  -h[elp]                                    print this help\n"
 "\n"
@@ -985,285 +1201,310 @@ msgid ""
 "  dev         devices managed by NetworkManager\n"
 "\n"
 msgstr ""
-"사용법: %s [옵션] 대상 { 명령어 | help }\n"
+"사용법: %s [옵션] <대상> { <명령어> | help }\n"
 "\n"
 "옵션\n"
 "  -t[erse]                                 간략한 출력\n"
 "  -p[retty]                                보기좋은 출력\n"
-"  -m[ode] tabular|multiline                출력 모드 "
+"  -m[ode] tabular|multiline                출력 모드\n"
 "  -f[ields] <필드1,필드2,...>|all|common   출력 필드 지정\n"
-"  -e[scape] yes|no                         값에서 컬럼 구분자를 이스케이프\n"
-"  -v[ersion]                               프로그램 버전 정보 보여주기\n"
-"  -h[elp]                                  이 도움말 보여주기\n"
+"  -e[scape] yes|no                         값에서 열 구분 문자를 이스케이프\n"
+"  -n[nocheck]                              nmcli 및 네트워크 관리 버전 검사하지 않기\n"
+"  -v[ersion]                               프로그램 버전 정보 표시\n"
+"  -h[elp]                                  이 도움말 표시\n"
 "\n"
 "대상\n"
-"  nm          네트워크 관리자 상태\n"
-"  con         네트워크 관리자 연결\n"
-"  dev         네트워크 관리자가 관리하는 장치\n"
+"  nm          네트워크 관리 상태\n"
+"  con         네트워크 관리 연결\n"
+"  dev         네트워크 관리에서 관리하는 장치\n"
 "\n"
 
-#: ../cli/src/nmcli.c:113
+#: ../cli/src/nmcli.c:109
 #, c-format
 msgid "Error: Object '%s' is unknown, try 'nmcli help'."
-msgstr "대상 '%s'가 알려져 있지 않습니다. 'nmcli help'를 해 보십시오."
+msgstr "대상 '%s'이(가) 알려져 있지 않습니다. 'nmcli help'를 해 보십시오."
 
-#: ../cli/src/nmcli.c:143
+#: ../cli/src/nmcli.c:139
 #, c-format
 msgid "Error: Option '--terse' is specified the second time."
 msgstr "오류: 옵션 '--terse'가 두번째로 설정되었습니다."
 
-#: ../cli/src/nmcli.c:148
+#: ../cli/src/nmcli.c:144
 #, c-format
 msgid "Error: Option '--terse' is mutually exclusive with '--pretty'."
 msgstr "오류: 옵션 '--terse'를 '--pretty'와 함께 사용할 수 없습니다."
 
-#: ../cli/src/nmcli.c:156
+#: ../cli/src/nmcli.c:152
 #, c-format
 msgid "Error: Option '--pretty' is specified the second time."
 msgstr "오류: 옵션 '--pretty'가 두번째로 설정되었습니다."
 
-#: ../cli/src/nmcli.c:161
+#: ../cli/src/nmcli.c:157
 #, c-format
 msgid "Error: Option '--pretty' is mutually exclusive with '--terse'."
 msgstr "오류: 옵션 '--pretty'를 '--terse'와 함께 사용할 수 없습니다."
 
-#: ../cli/src/nmcli.c:171 ../cli/src/nmcli.c:187
+#: ../cli/src/nmcli.c:167 ../cli/src/nmcli.c:183
 #, c-format
 msgid "Error: missing argument for '%s' option."
 msgstr "오류: '%s' 옵션에 인자가 없습니다."
 
-#: ../cli/src/nmcli.c:180 ../cli/src/nmcli.c:196
+#: ../cli/src/nmcli.c:176 ../cli/src/nmcli.c:192
 #, c-format
 msgid "Error: '%s' is not valid argument for '%s' option."
-msgstr "오류: '%s'는 올바른 인자가 아닙니다('%s' 옵션에 사용됨)."
+msgstr "오류: '%s'은(는) 올바른 인자가 아닙니다 ('%s' 옵션에 사용)."
 
-#: ../cli/src/nmcli.c:203
+#: ../cli/src/nmcli.c:199
 #, c-format
 msgid "Error: fields for '%s' options are missing."
 msgstr "오류: '%s'옵션에 대해 필드가 없습니다."
 
-#: ../cli/src/nmcli.c:209
+#: ../cli/src/nmcli.c:207
 #, c-format
 msgid "nmcli tool, version %s\n"
 msgstr "nmcli 도구, 버전 %s\n"
 
-#: ../cli/src/nmcli.c:215
+#: ../cli/src/nmcli.c:213
 #, c-format
 msgid "Error: Option '%s' is unknown, try 'nmcli -help'."
-msgstr "오류: 옵션 '%s'는 알려져 있지 않습니다. 'nmcli -help'를 해 보십시오."
+msgstr "오류: '%s' 옵션은 알려져 있지 않습니다. 'nmcli -help'를 해 보십시오."
 
-#: ../cli/src/nmcli.c:234
+#: ../cli/src/nmcli.c:232
 #, c-format
 msgid "Caught signal %d, shutting down..."
-msgstr "시그널 %d를 받았습니다. 종료합니다..."
+msgstr "시그널 %d번을 받았습니다. 종료합니다..."
 
-#: ../cli/src/nmcli.c:259
-#, c-format
-msgid "Error: Could not connect to NetworkManager."
-msgstr "오류: NetworkManager에 연결할 수 없습니다."
+#: ../cli/src/nmcli.c:257
+msgid "Error: Could not create NMClient object."
+msgstr "오류: NMClient 오브젝트를 만들 수 없습니다."
 
-#: ../cli/src/nmcli.c:275
+#: ../cli/src/nmcli.c:273
 msgid "Success"
 msgstr "성공"
 
-#: ../cli/src/settings.c:407
+#: ../cli/src/settings.c:421
 #, c-format
 msgid "%d (hex-ascii-key)"
 msgstr "%d (16진 아시키 열쇠글)"
 
-#: ../cli/src/settings.c:409
+#: ../cli/src/settings.c:423
 #, c-format
 msgid "%d (104/128-bit passphrase)"
 msgstr "%d (104/128-비트 열쇠글)"
 
-#: ../cli/src/settings.c:412
+#: ../cli/src/settings.c:426
 #, c-format
 msgid "%d (unknown)"
 msgstr "%d (알 수 없음)"
 
-#: ../cli/src/settings.c:438
+#: ../cli/src/settings.c:452
 msgid "0 (unknown)"
 msgstr "0 (알 수 없음)"
 
-#: ../cli/src/settings.c:444
+#: ../cli/src/settings.c:458
 msgid "any, "
 msgstr "아무, "
 
-#: ../cli/src/settings.c:446
+#: ../cli/src/settings.c:460
 msgid "900 MHz, "
 msgstr "900 MHz, "
 
-#: ../cli/src/settings.c:448
+#: ../cli/src/settings.c:462
 msgid "1800 MHz, "
 msgstr "1800 MHz, "
 
-#: ../cli/src/settings.c:450
+#: ../cli/src/settings.c:464
 msgid "1900 MHz, "
 msgstr "1900 MHz, "
 
-#: ../cli/src/settings.c:452
+#: ../cli/src/settings.c:466
 msgid "850 MHz, "
 msgstr "850 MHz, "
 
-#: ../cli/src/settings.c:454
+#: ../cli/src/settings.c:468
 msgid "WCDMA 3GPP UMTS 2100 MHz, "
 msgstr "WCDMA 3GPP UMTS 2100 MHz, "
 
-#: ../cli/src/settings.c:456
+#: ../cli/src/settings.c:470
 msgid "WCDMA 3GPP UMTS 1800 MHz, "
 msgstr "WCDMA 3GPP UMTS 1800 MHz, "
 
-#: ../cli/src/settings.c:458
+#: ../cli/src/settings.c:472
 msgid "WCDMA 3GPP UMTS 1700/2100 MHz, "
 msgstr "WCDMA 3GPP UMTS 1700/2100 MHz, "
 
-#: ../cli/src/settings.c:460
+#: ../cli/src/settings.c:474
 msgid "WCDMA 3GPP UMTS 800 MHz, "
 msgstr "WCDMA 3GPP UMTS 800 MHz, "
 
-#: ../cli/src/settings.c:462
+#: ../cli/src/settings.c:476
 msgid "WCDMA 3GPP UMTS 850 MHz, "
 msgstr "WCDMA 3GPP UMTS 850 MHz, "
 
-#: ../cli/src/settings.c:464
+#: ../cli/src/settings.c:478
 msgid "WCDMA 3GPP UMTS 900 MHz, "
 msgstr "WCDMA 3GPP UMTS 900 MHz, "
 
-#: ../cli/src/settings.c:466
+#: ../cli/src/settings.c:480
 msgid "WCDMA 3GPP UMTS 1700 MHz, "
 msgstr "WCDMA 3GPP UMTS 1700 MHz, "
 
-#: ../cli/src/settings.c:546 ../cli/src/settings.c:708
+#: ../cli/src/settings.c:564 ../cli/src/settings.c:730
 msgid "auto"
 msgstr "자동"
 
-#: ../cli/src/settings.c:704 ../cli/src/settings.c:707 ../cli/src/utils.c:172
+#: ../cli/src/settings.c:725 ../cli/src/settings.c:728
+#: ../cli/src/settings.c:729 ../cli/src/utils.c:176
 msgid "not set"
 msgstr "설정 안됨"
 
-#: ../cli/src/utils.c:124
+#: ../cli/src/utils.c:128
 #, c-format
 msgid "field '%s' has to be alone"
-msgstr "필드 '%s'는 혼자만 있어야만 합니다"
+msgstr "'%s' 필드는 혼자만 있어야만 합니다"
 
-#: ../cli/src/utils.c:127
+#: ../cli/src/utils.c:131
 #, c-format
 msgid "invalid field '%s'"
 msgstr "잘못된 필드 '%s'"
 
-#: ../cli/src/utils.c:146
+#: ../cli/src/utils.c:150
 #, c-format
 msgid "Option '--terse' requires specifying '--fields'"
 msgstr "옵션 '--terse'는 '--fields' 설정을 요구합니다"
 
-#: ../cli/src/utils.c:150
+#: ../cli/src/utils.c:154
 #, c-format
 msgid "Option '--terse' requires specific '--fields' option values , not '%s'"
-msgstr "옵션 '--terse'는 '%s'가 아닌 구체적인 '--fields' 값을 요구합니다"
+msgstr "옵션 '--terse'는 '%s'이(가) 아닌 구체적인 '--fields' 값을 요구합니다"
+
+#: ../cli/src/utils.c:333
+#, c-format
+msgid "Error: Couldn't create D-Bus object proxy for org.freedesktop.DBus"
+msgstr "오류: org.freedesktop.DBus의 D-버스 오브젝트 프록시를 만들 수 없습니다"
+
+#: ../cli/src/utils.c:341
+#, c-format
+msgid "Error: NameHasOwner request failed: %s"
+msgstr "오류: NameHasOwner 요청 실패: %s"
 
-#: ../libnm-util/crypto.c:120
+#: ../cli/src/utils.c:386
+#, 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"
+
+#: ../cli/src/utils.c:395
+#, 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 옵션을 사용했으므로 계속하지만, 예상치 못한 결과가 나타날 수 있습니다."
+
+#: ../libnm-util/crypto.c:121
 #, c-format
 msgid "PEM key file had no end tag '%s'."
-msgstr "PEM 키 파일에 끝 태그 '%s'가 없습니다."
+msgstr "PEM 키 파일에 끝 태그 '%s'이(가) 없습니다."
 
-#: ../libnm-util/crypto.c:130
+#: ../libnm-util/crypto.c:131
 #, c-format
 msgid "Doesn't look like a PEM private key file."
 msgstr "PEM 비밀 키 파일처럼 보이지 않습니다."
 
-#: ../libnm-util/crypto.c:138
+#: ../libnm-util/crypto.c:139
 #, c-format
 msgid "Not enough memory to store PEM file data."
 msgstr "PEM 파일 정보를 저장할 메모리가 부족합니다."
 
-#: ../libnm-util/crypto.c:154
+#: ../libnm-util/crypto.c:155
 #, c-format
 msgid "Malformed PEM file: Proc-Type was not first tag."
 msgstr "잘못된 형태의 PEM 파일: Proc-Type이 첫번째 태그가 아닙니다."
 
-#: ../libnm-util/crypto.c:162
+#: ../libnm-util/crypto.c:163
 #, c-format
 msgid "Malformed PEM file: unknown Proc-Type tag '%s'."
 msgstr "잘못된 형태의 PEM 파일: 알려져 있지 않은 Proc-Type 태그 '%s'."
 
-#: ../libnm-util/crypto.c:172
+#: ../libnm-util/crypto.c:173
 #, c-format
 msgid "Malformed PEM file: DEK-Info was not the second tag."
 msgstr "잘못된 형태의 PEM 파일: DEK-Info가 두번째 태그가 아님."
 
-#: ../libnm-util/crypto.c:183
+#: ../libnm-util/crypto.c:184
 #, c-format
 msgid "Malformed PEM file: no IV found in DEK-Info tag."
 msgstr "잘못된 형태의 PEM 파일: IV를 DEK-Info 태그에서 찾을 수 없음."
 
-#: ../libnm-util/crypto.c:190
+#: ../libnm-util/crypto.c:191
 #, c-format
 msgid "Malformed PEM file: invalid format of IV in DEK-Info tag."
 msgstr "잘못된 형태의 PEM 파일: DEK-Info 태그안에 잘못된 형태의 IV가 있음."
 
-#: ../libnm-util/crypto.c:203
+#: ../libnm-util/crypto.c:204
 #, c-format
 msgid "Malformed PEM file: unknown private key cipher '%s'."
 msgstr "잘못된 형태의 PEM 파일: 알려져 있지 않은 비밀 키 암호화 방법 '%s'."
 
-#: ../libnm-util/crypto.c:222
+#: ../libnm-util/crypto.c:223
 #, c-format
 msgid "Could not decode private key."
 msgstr "비밀 키를 해독할 수 없습니다."
 
-#: ../libnm-util/crypto.c:267
+#: ../libnm-util/crypto.c:268
 #, c-format
 msgid "PEM certificate '%s' had no end tag '%s'."
-msgstr "PEM 인증서 '%s'에 끝 태그 '%s'가 없습니다."
+msgstr "PEM 인증서 '%s'에 끝 태그 '%s'이(가) 없습니다."
 
-#: ../libnm-util/crypto.c:277
+#: ../libnm-util/crypto.c:278
 #, c-format
 msgid "Failed to decode certificate."
 msgstr "인증서 해독에 실패했습니다."
 
-#: ../libnm-util/crypto.c:286
+#: ../libnm-util/crypto.c:287
 #, c-format
 msgid "Not enough memory to store certificate data."
 msgstr "인증서 정보를 저장할 메모리가 부족합니다."
 
-#: ../libnm-util/crypto.c:294
+#: ../libnm-util/crypto.c:295
 #, c-format
 msgid "Not enough memory to store file data."
 msgstr "파일 정보를 저장할 메모리가 부족합니다."
 
-#: ../libnm-util/crypto.c:324
+#: ../libnm-util/crypto.c:325
 #, c-format
 msgid "IV must be an even number of bytes in length."
 msgstr "IV의 길이는 짝수여야만 합니다."
 
-#: ../libnm-util/crypto.c:333
+#: ../libnm-util/crypto.c:334
 #, c-format
 msgid "Not enough memory to store the IV."
 msgstr "IV를 저장할 메모리가 부족합니다."
 
-#: ../libnm-util/crypto.c:344
+#: ../libnm-util/crypto.c:345
 #, c-format
 msgid "IV contains non-hexadecimal digits."
 msgstr "IV에 16진수 숫자가 아닌 문자가 있습니다."
 
-#: ../libnm-util/crypto.c:382 ../libnm-util/crypto_gnutls.c:148
+#: ../libnm-util/crypto.c:383 ../libnm-util/crypto_gnutls.c:148
 #: ../libnm-util/crypto_gnutls.c:266 ../libnm-util/crypto_nss.c:171
 #: ../libnm-util/crypto_nss.c:336
 #, c-format
 msgid "Private key cipher '%s' was unknown."
-msgstr "비밀 키 암호화 방식 '%s'가 알려져 있지 않습니다."
+msgstr "비밀 키 암호화 방식 '%s'이(가) 알려져 있지 않습니다."
 
-#: ../libnm-util/crypto.c:391
+#: ../libnm-util/crypto.c:392
 #, c-format
 msgid "Not enough memory to decrypt private key."
 msgstr "비밀 키를 해독할 메모리가 부족합니다."
 
-#: ../libnm-util/crypto.c:511
+#: ../libnm-util/crypto.c:512
 #, c-format
 msgid "Unable to determine private key type."
 msgstr "비밀 키 유형을 결정할 수 없습니다."
 
-#: ../libnm-util/crypto.c:530
+#: ../libnm-util/crypto.c:531
 #, c-format
 msgid "Not enough memory to store decrypted private key."
 msgstr "해독된 비밀 키를 저장할 메모리가 부족합니다."
@@ -1290,7 +1531,7 @@ msgstr "해독된 키 버퍼를 저장할 메모리가 부족합니다."
 #: ../libnm-util/crypto_gnutls.c:173
 #, c-format
 msgid "Failed to initialize the decryption cipher context: %s / %s."
-msgstr "암호 해독 문맥을 초기화하는 데 실패했습니다: %s / %s"
+msgstr "암호 해독 문맥을 초기화하는 데 실패했습니다: %s / %s."
 
 #: ../libnm-util/crypto_gnutls.c:182
 #, c-format
@@ -1476,166 +1717,264 @@ msgstr "PKCS#12 파일을 검증할 수 없습니다: %d"
 msgid "Could not generate random data."
 msgstr "랜덤 데이터를 생성할 수 없습니다."
 
-#: ../libnm-util/nm-utils.c:1925
+#: ../libnm-util/nm-utils.c:1988
 #, c-format
 msgid "Not enough memory to make encryption key."
 msgstr "암호화 키를 생성할 메모리가 부족합니다."
 
-#: ../libnm-util/nm-utils.c:2035
+#: ../libnm-util/nm-utils.c:2098
 msgid "Could not allocate memory for PEM file creation."
 msgstr "PEM 파일 생성을 위한 메모리를 할당할 수 없습니다."
 
-#: ../libnm-util/nm-utils.c:2047
+#: ../libnm-util/nm-utils.c:2110
 #, c-format
 msgid "Could not allocate memory for writing IV to PEM file."
 msgstr "IV를 PEM 파일에 쓰기 위한 메모리를 할당할 수 없습니다."
 
-#: ../libnm-util/nm-utils.c:2059
+#: ../libnm-util/nm-utils.c:2122
 #, c-format
 msgid "Could not allocate memory for writing encrypted key to PEM file."
 msgstr "암호화된 키를 PEM 파일에 기록하기 위한 메모리를 할당할 수 없습니다."
 
-#: ../libnm-util/nm-utils.c:2078
+#: ../libnm-util/nm-utils.c:2141
 #, c-format
 msgid "Could not allocate memory for PEM file data."
 msgstr "PEM 파일 데이터를 위한 메모리를 할당할 수 없습니다."
 
-#: ../src/nm-netlink-monitor.c:100 ../src/nm-netlink-monitor.c:231
-#: ../src/nm-netlink-monitor.c:653
-#, c-format
-msgid "error processing netlink message: %s"
-msgstr "넷링크 메시지를 처리하는 중 오류: %s"
+#: ../policy/org.freedesktop.NetworkManager.policy.in.h:1
+msgid "Allow control of network connections"
+msgstr "네트워크 연결 조작 허용"
 
-#: ../src/nm-netlink-monitor.c:214
-msgid "error occurred while waiting for data on socket"
-msgstr "소켓에서 데이터를 기다리는 동안 오류가 발생했습니다"
+#: ../policy/org.freedesktop.NetworkManager.policy.in.h:2
+msgid "Connection sharing via a protected WiFi network"
+msgstr "보호된 WiFi 네트워크를 통한 연결 공유"
 
-#: ../src/nm-netlink-monitor.c:254
-#, c-format
-msgid "unable to connect to netlink for monitoring link status: %s"
-msgstr "회선 상태를 감시하는 넷링크에 연결할 수 없습니다: %s"
+#: ../policy/org.freedesktop.NetworkManager.policy.in.h:3
+msgid "Connection sharing via an open WiFi network"
+msgstr "열린 WiFi 네트워크를 통한 연결 공유"
 
-#: ../src/nm-netlink-monitor.c:265
-#, c-format
-msgid "unable to enable netlink handle credential passing: %s"
-msgstr "넷링크 핸들을 통한 암호정보 전달을 사용 할 수 없습니다: %s"
+#: ../policy/org.freedesktop.NetworkManager.policy.in.h:4
+msgid "Enable or disable WiFi devices"
+msgstr "WiFi 장치 사용 여부"
 
-#: ../src/nm-netlink-monitor.c:291 ../src/nm-netlink-monitor.c:353
-#, c-format
-msgid "unable to allocate netlink handle for monitoring link status: %s"
-msgstr "회선 상태를 감시하는 넷링크 핸들을 할당 할 수 없습니다: %s"
+#: ../policy/org.freedesktop.NetworkManager.policy.in.h:5
+msgid "Enable or disable WiMAX mobile broadband devices"
+msgstr "와이맥스 모바일 광대역 장치 사용 여부"
 
-#: ../src/nm-netlink-monitor.c:376
-#, c-format
-msgid "unable to allocate netlink link cache for monitoring link status: %s"
-msgstr "회선 상태를 감시하는 넷링크 링크 캐시를 만들 수 없습니다: %s"
+#: ../policy/org.freedesktop.NetworkManager.policy.in.h:6
+msgid "Enable or disable mobile broadband devices"
+msgstr "모바일 광대역 장치 사용 여부"
 
-#: ../src/nm-netlink-monitor.c:502
-#, c-format
-msgid "unable to join netlink group: %s"
-msgstr "넷링크 그룹에 합류할 수 없습니다: %s"
+#: ../policy/org.freedesktop.NetworkManager.policy.in.h:7
+msgid "Enable or disable system networking"
+msgstr "시스템 네트워크 사용 여부"
 
-#: ../src/nm-netlink-monitor.c:629 ../src/nm-netlink-monitor.c:642
-#, c-format
-msgid "error updating link cache: %s"
-msgstr "넷링크 캐시를 갱신하는 중 오류가 발생했습니다: %s"
+#: ../policy/org.freedesktop.NetworkManager.policy.in.h:8
+msgid "Modify network connections for all users"
+msgstr "모든 사용자의 네트워크 연결을 수정합니다"
+
+#: ../policy/org.freedesktop.NetworkManager.policy.in.h:9
+msgid "Modify persistent system hostname"
+msgstr "영구적인 시스템 호스트 이름을 수정합니다"
+
+#: ../policy/org.freedesktop.NetworkManager.policy.in.h:10
+msgid "Modify personal network connections"
+msgstr "개인 네트워크 연결을 수정합니다"
+
+#: ../policy/org.freedesktop.NetworkManager.policy.in.h:11
+msgid ""
+"Put NetworkManager to sleep or wake it up (should only be used by system "
+"power management)"
+msgstr "네트워크 관리 프로그램을 일시 중지하거나 다시 시작합니다 (시스템 전원 관리에서만 사용)"
 
-#: ../src/main.c:502
+#: ../policy/org.freedesktop.NetworkManager.policy.in.h:12
+msgid "System policy prevents control of network connections"
+msgstr "시스템 정책이 네트워크 연결 조작을 금지합니다"
+
+#: ../policy/org.freedesktop.NetworkManager.policy.in.h:13
+msgid "System policy prevents enabling or disabling WiFi devices"
+msgstr "시스템 정책이 WiFi 장치 사용 여부 설정을 금지합니다"
+
+#: ../policy/org.freedesktop.NetworkManager.policy.in.h:14
+msgid ""
+"System policy prevents enabling or disabling WiMAX mobile broadband devices"
+msgstr "시스템 정책이 와이맥스 모바일 광대역 장치의 사용 여부 설정을 금지합니다"
+
+#: ../policy/org.freedesktop.NetworkManager.policy.in.h:15
+msgid "System policy prevents enabling or disabling mobile broadband devices"
+msgstr "시스템 정책이 모바일 광대역 장치의 사용 여부 설정을 금지합니다"
+
+#: ../policy/org.freedesktop.NetworkManager.policy.in.h:16
+msgid "System policy prevents enabling or disabling system networking"
+msgstr "시스템 정책이 시스템 네트워크의 사용 여부 설정을 금지합니다"
+
+#: ../policy/org.freedesktop.NetworkManager.policy.in.h:17
+msgid "System policy prevents modification of network settings for all users"
+msgstr "시스템 정책이 모든 사용자의 네트워크 설정의 수정을 금지합니다"
+
+#: ../policy/org.freedesktop.NetworkManager.policy.in.h:18
+msgid "System policy prevents modification of personal network settings"
+msgstr "시스템 정책이 개인 네트워크 설정의 수정을 금지합니다"
+
+#: ../policy/org.freedesktop.NetworkManager.policy.in.h:19
+msgid "System policy prevents modification of the persistent system hostname"
+msgstr "시스템 정책이 호스트 이름의 변경을 금지합니다"
+
+#: ../policy/org.freedesktop.NetworkManager.policy.in.h:20
+msgid "System policy prevents putting NetworkManager to sleep or waking it up"
+msgstr "시스템 정책이 네트워크 관리 프로그램의 일시 중지나 다시 시작을 금지합니다"
+
+#: ../policy/org.freedesktop.NetworkManager.policy.in.h:21
+msgid "System policy prevents sharing connections via a protected WiFi network"
+msgstr "시스템 정책이 보호된 WiFi 네트워크를 통한 연결 공유를 금지합니다"
+
+#: ../policy/org.freedesktop.NetworkManager.policy.in.h:22
+msgid "System policy prevents sharing connections via an open WiFi network"
+msgstr "시스템 정책이 열린 WiFi 네트워크를 통한 연결 공유를 금지합니다"
+
+#: ../src/main.c:519
 #, c-format
 msgid "Invalid option.  Please use --help to see a list of valid options.\n"
 msgstr "잘못된 옵션. 올바른 옵션의 목록을 보려면 --help 옵션을 이용하십시오.\n"
 
-#: ../src/main.c:562
+#: ../src/main.c:590
 #, c-format
 msgid "%s.  Please use --help to see a list of valid options.\n"
 msgstr "%s. 올바른 옵션의 목록을 보려면 --help 옵션을 이용하십시오.\n"
 
-#: ../src/dhcp-manager/nm-dhcp-dhclient.c:325
+#: ../src/dhcp-manager/nm-dhcp-dhclient-utils.c:62
 msgid "# Created by NetworkManager\n"
-msgstr "# NetworkManager가 생성함\n"
+msgstr "# 네트워크 관리에서 만들어 냄\n"
 
-#: ../src/dhcp-manager/nm-dhcp-dhclient.c:341
+#: ../src/dhcp-manager/nm-dhcp-dhclient-utils.c:69
 #, c-format
 msgid ""
 "# Merged from %s\n"
 "\n"
-msgstr ""
-"# %s에서 병합됨\n"
-"\n"
+msgstr "# %s에서 합침\n\n"
 
-#: ../src/dhcp-manager/nm-dhcp-manager.c:279
+#: ../src/dhcp-manager/nm-dhcp-manager.c:284
 msgid "no usable DHCP client could be found."
 msgstr "사용 가능한 DHCP 클라이언트를 찾을 수 없습니다."
 
-#: ../src/dhcp-manager/nm-dhcp-manager.c:288
+#: ../src/dhcp-manager/nm-dhcp-manager.c:293
 msgid "'dhclient' could be found."
 msgstr "'dhclient'를 찾을 수 없습니다."
 
-#: ../src/dhcp-manager/nm-dhcp-manager.c:298
+#: ../src/dhcp-manager/nm-dhcp-manager.c:303
 msgid "'dhcpcd' could be found."
 msgstr "'dhcpcd'를 찾을 수 있습니다."
 
-#: ../src/dhcp-manager/nm-dhcp-manager.c:306
+#: ../src/dhcp-manager/nm-dhcp-manager.c:311
 #, c-format
 msgid "unsupported DHCP client '%s'"
 msgstr "지원하지 않는 DHCP 클라이언트 '%s'"
 
-#: ../src/logging/nm-logging.c:146
+#: ../src/dns-manager/nm-dns-manager.c:367
+msgid "NOTE: the libc resolver may not support more than 3 nameservers."
+msgstr ""
+"주의: libc 주소 검색은 3개를 초과하는 네임서버를 지원하지 않을 수 있습니다."
+
+#: ../src/dns-manager/nm-dns-manager.c:369
+msgid "The nameservers listed below may not be recognized."
+msgstr "아래 열거된 네임서버를 인식하지 못할 수 있습니다."
+
+#: ../src/logging/nm-logging.c:148
 #, c-format
 msgid "Unknown log level '%s'"
 msgstr "알려지지 않은 로그 수준 '%s'"
 
-#: ../src/logging/nm-logging.c:171
+#: ../src/logging/nm-logging.c:173
 #, c-format
 msgid "Unknown log domain '%s'"
 msgstr "알려지지 않은 로그 영역 '%s'"
 
-#: ../src/dns-manager/nm-dns-manager.c:343
-msgid "NOTE: the libc resolver may not support more than 3 nameservers."
-msgstr "주의: libc 주소 검색은 3개를 초과하는 네임서버를 지원하지 않을 수 있습니다."
+#: ../src/modem-manager/nm-modem-cdma.c:311 ../src/nm-device-bt.c:353
+#, c-format
+msgid "CDMA connection %d"
+msgstr "CDMA 연결 %d"
 
-#: ../src/dns-manager/nm-dns-manager.c:345
-msgid "The nameservers listed below may not be recognized."
-msgstr "아래 열거된 네임서버를 인식하지 못할 수 있습니다."
+#: ../src/modem-manager/nm-modem-gsm.c:514 ../src/nm-device-bt.c:349
+#, c-format
+msgid "GSM connection %d"
+msgstr "GSM 연결 %d"
 
-#: ../src/system-settings/nm-default-wired-connection.c:157
+#: ../src/nm-device-bt.c:324
 #, c-format
-msgid "Auto %s"
-msgstr "자동 %s"
+msgid "PAN connection %d"
+msgstr "PAN 연결 %d"
 
-#: ../system-settings/plugins/ifcfg-rh/reader.c:3256
-msgid "System"
-msgstr "시스템"
+#: ../src/nm-device-bt.c:357
+#, c-format
+msgid "DUN connection %d"
+msgstr "DUN 연결 %d"
 
-#: ../policy/org.freedesktop.network-manager-settings.system.policy.in.h:1
-msgid "Connection sharing via a protected WiFi network"
-msgstr "보호된 WiFi 네트워크를 통한 연결 공유"
+#: ../src/nm-device-ethernet.c:1684
+#, c-format
+msgid "PPPoE connection %d"
+msgstr "PPPoE 연결 %d"
 
-#: ../policy/org.freedesktop.network-manager-settings.system.policy.in.h:2
-msgid "Connection sharing via an open WiFi network"
-msgstr "열린 WiFi 네트워크를 통한 연결 공유"
+#: ../src/nm-device-ethernet.c:1684
+#, c-format
+msgid "Wired connection %d"
+msgstr "유선 연결 %d"
 
-#: ../policy/org.freedesktop.network-manager-settings.system.policy.in.h:3
-msgid "Modify persistent system hostname"
-msgstr "영구적인 시스템 호스트명을 변경합니다"
+#: ../src/nm-device-olpc-mesh.c:422
+#, c-format
+msgid "Mesh %d"
+msgstr "메시 %d"
 
-#: ../policy/org.freedesktop.network-manager-settings.system.policy.in.h:4
-msgid "Modify system connections"
-msgstr "시스템 연결을 변경합니다"
+#: ../src/nm-manager.c:686
+#, c-format
+msgid "VPN connection %d"
+msgstr "VPN 연결 %d"
 
-#: ../policy/org.freedesktop.network-manager-settings.system.policy.in.h:5
-msgid "System policy prevents modification of system settings"
-msgstr "시스템 정책이 시스템 설정을 변경하는 것을 금지합니다"
+#: ../src/nm-netlink-monitor.c:100 ../src/nm-netlink-monitor.c:231
+#: ../src/nm-netlink-monitor.c:653
+#, c-format
+msgid "error processing netlink message: %s"
+msgstr "네트링크 메시지를 처리하는 중 오류: %s"
 
-#: ../policy/org.freedesktop.network-manager-settings.system.policy.in.h:6
-msgid "System policy prevents modification of the persistent system hostname"
-msgstr "시스템 정책이 호스트 이름을 영구히 변경하는 것을 금지합니다"
+#: ../src/nm-netlink-monitor.c:214
+msgid "error occurred while waiting for data on socket"
+msgstr "소켓에서 데이터를 기다리는 동안 오류가 발생했습니다"
 
-#: ../policy/org.freedesktop.network-manager-settings.system.policy.in.h:7
-msgid "System policy prevents sharing connections via a protected WiFi network"
-msgstr "시스템 정책이 보호된 WiFi 네트워크를 통한 연결 공유를 금지합니다"
+#: ../src/nm-netlink-monitor.c:254
+#, c-format
+msgid "unable to connect to netlink for monitoring link status: %s"
+msgstr "회선 상태를 감시하는 네트링크에 연결할 수 없습니다: %s"
 
-#: ../policy/org.freedesktop.network-manager-settings.system.policy.in.h:8
-msgid "System policy prevents sharing connections via an open WiFi network"
-msgstr "시스템 정책이 열린 WiFi 네트워크를 통한 연결 공유를 금지합니다"
+#: ../src/nm-netlink-monitor.c:265
+#, c-format
+msgid "unable to enable netlink handle credential passing: %s"
+msgstr "네트링크 핸들을 통한 암호정보 전달을 사용할 수 없습니다: %s"
+
+#: ../src/nm-netlink-monitor.c:291 ../src/nm-netlink-monitor.c:353
+#, c-format
+msgid "unable to allocate netlink handle for monitoring link status: %s"
+msgstr "회선 상태를 감시하는 네트링크 핸들을 할당할 수 없습니다: %s"
 
+#: ../src/nm-netlink-monitor.c:376
+#, c-format
+msgid "unable to allocate netlink link cache for monitoring link status: %s"
+msgstr "회선 상태를 감시하는 네트링크 링크 캐시를 만들 수 없습니다: %s"
+
+#: ../src/nm-netlink-monitor.c:502
+#, c-format
+msgid "unable to join netlink group: %s"
+msgstr "네트링크 그룹에 합류할 수 없습니다: %s"
+
+#: ../src/nm-netlink-monitor.c:629 ../src/nm-netlink-monitor.c:642
+#, c-format
+msgid "error updating link cache: %s"
+msgstr "네트링크 캐시를 갱신하는 중 오류가 발생했습니다: %s"
+
+#: ../src/settings/plugins/ifcfg-rh/reader.c:3439
+#: ../src/settings/plugins/ifnet/connection_parser.c:49
+msgid "System"
+msgstr "시스템"
+
+#: ../src/settings/nm-default-wired-connection.c:143
+#, c-format
+msgid "Auto %s"
+msgstr "자동 %s"
diff --git a/po/lt.po b/po/lt.po
index 2f58078c..1d9eb95e 100644
--- a/po/lt.po
+++ b/po/lt.po
@@ -1780,7 +1780,7 @@ msgstr ""
 msgid "The nameservers listed below may not be recognized."
 msgstr "Žemiau pateikti vardų serveriai gali būti neatpažinti."
 
-#: ../src/system-settings/nm-default-wired-connection.c:157
+#: ../src/settings/nm-default-wired-connection.c:157
 #, c-format
 msgid "Auto %s"
 msgstr "Automatinis %s"
diff --git a/po/ml.po b/po/ml.po
index 0d9796f9..59b0b0f2 100644
--- a/po/ml.po
+++ b/po/ml.po
@@ -1594,7 +1594,7 @@ msgstr "കുറിപ്പു്: libc റിസോള്‍വര്‍ 3 �
 msgid "The nameservers listed below may not be recognized."
 msgstr "താഴെ പറഞ്ഞിരിക്കുന്ന നെയിംസര്‍വറുകള്‍ തിരിച്ചറിയപ്പെടുന്നവയല്ല."
 
-#: ../src/system-settings/nm-default-wired-connection.c:157
+#: ../src/settings/nm-default-wired-connection.c:157
 #, c-format
 msgid "Auto %s"
 msgstr "ഓട്ടോ %s"
diff --git a/po/mr.po b/po/mr.po
index 67335ad2..4065a8d8 100644
--- a/po/mr.po
+++ b/po/mr.po
@@ -1,15 +1,15 @@
-# translation of mr.po to Marathi
+# translation of NetworkManager.master.po to Marathi
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
 #
 # Sandeep Shedmake <sandeep.shedmake@gmail.com>, 2009.
-# Sandeep Shedmake <sshedmak@redhat.com>, 2010.
+# Sandeep Shedmake <sshedmak@redhat.com>, 2010, 2011.
 msgid ""
 msgstr ""
-"Project-Id-Version: mr\n"
-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=NetworkManager&component=general\n"
-"POT-Creation-Date: 2010-06-28 08:52+0000\n"
-"PO-Revision-Date: 2010-07-26 18:24+0530\n"
+"Project-Id-Version: NetworkManager.master\n"
+"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=NetworkManager&keywords=I18N+L10N&component=general\n"
+"POT-Creation-Date: 2011-03-28 03:25+0000\n"
+"PO-Revision-Date: 2011-03-28 15:23+0530\n"
 "Last-Translator: Sandeep Shedmake <sshedmak@redhat.com>\n"
 "Language-Team: Marathi <fedora-trans-mr@redhat.com>\n"
 "MIME-Version: 1.0\n"
@@ -18,83 +18,97 @@ msgstr ""
 "X-Generator: KBabel 1.11.4\n"
 "Plural-Forms: nplurals=2; plural=(n!=1);\n"
 
-#: ../cli/src/connections.c:59 ../cli/src/connections.c:74
-#: ../cli/src/devices.c:85 ../cli/src/devices.c:98 ../cli/src/devices.c:108
-#: ../cli/src/devices.c:118 ../cli/src/devices.c:131 ../cli/src/devices.c:142
-#: ../cli/src/devices.c:152
+#: ../cli/src/connections.c:64 ../cli/src/connections.c:78
+#: ../cli/src/devices.c:101 ../cli/src/devices.c:114 ../cli/src/devices.c:124
+#: ../cli/src/devices.c:134 ../cli/src/devices.c:148 ../cli/src/devices.c:162
+#: ../cli/src/devices.c:173 ../cli/src/devices.c:184 ../cli/src/devices.c:193
+#: ../cli/src/devices.c:202 ../cli/src/devices.c:224
 msgid "NAME"
 msgstr "NAME"
 
 #. 0
-#: ../cli/src/connections.c:60 ../cli/src/connections.c:75
+#: ../cli/src/connections.c:65 ../cli/src/connections.c:79
 msgid "UUID"
 msgstr "UUID"
 
 #. 1
-#: ../cli/src/connections.c:61
+#: ../cli/src/connections.c:66
 msgid "DEVICES"
 msgstr "DEVICES"
 
 #. 2
-#: ../cli/src/connections.c:62 ../cli/src/connections.c:77
-msgid "SCOPE"
-msgstr "SCOPE"
-
-#. 3
-#: ../cli/src/connections.c:63
+#: ../cli/src/connections.c:67
 msgid "DEFAULT"
 msgstr "DEFAULT"
 
-#. 4
-#: ../cli/src/connections.c:64
-msgid "DBUS-SERVICE"
-msgstr "DBUS-SERVICE"
-
-#. 5
-#: ../cli/src/connections.c:65
+#. 3
+#: ../cli/src/connections.c:68
 msgid "SPEC-OBJECT"
 msgstr "SPEC-OBJECT"
 
-#. 6
-#: ../cli/src/connections.c:66
+#. 4
+#: ../cli/src/connections.c:69
 msgid "VPN"
 msgstr "VPN"
 
+#. 5
+#. 6
+#. 2
+#. 11
+#. 5
+#: ../cli/src/connections.c:70 ../cli/src/connections.c:85
+#: ../cli/src/devices.c:69 ../cli/src/devices.c:214 ../cli/src/devices.c:230
+msgid "DBUS-PATH"
+msgstr "DBUS-PATH"
+
 #. 1
 #. 0
 #. 1
-#: ../cli/src/connections.c:76 ../cli/src/devices.c:61 ../cli/src/devices.c:87
+#. 2
+#: ../cli/src/connections.c:80 ../cli/src/devices.c:67
+#: ../cli/src/devices.c:103 ../cli/src/devices.c:227
 msgid "TYPE"
 msgstr "TYPE"
 
-#. 3
-#: ../cli/src/connections.c:78
+#. 2
+#: ../cli/src/connections.c:81
 msgid "TIMESTAMP"
 msgstr "TIMESTAMP"
 
-#. 4
-#: ../cli/src/connections.c:79
+#. 3
+#: ../cli/src/connections.c:82
 msgid "TIMESTAMP-REAL"
 msgstr "TIMESTAMP-REAL"
 
-#. 5
-#: ../cli/src/connections.c:80
+#. 4
+#: ../cli/src/connections.c:83
 msgid "AUTOCONNECT"
 msgstr "AUTOCONNECT"
 
-#. 6
-#: ../cli/src/connections.c:81
+#. 5
+#: ../cli/src/connections.c:84
 msgid "READONLY"
 msgstr "READONLY"
 
-#: ../cli/src/connections.c:157
-#, c-format
+#: ../cli/src/connections.c:167
+#, c-format
+#| msgid ""
+#| "Usage: nmcli con { COMMAND | help }\n"
+#| "  COMMAND := { list | status | up | down }\n"
+#| "\n"
+#| "  list [id <id> | uuid <id> | system | user]\n"
+#| "  status\n"
+#| "  up id <id> | uuid <id> [iface <iface>] [ap <hwaddr>] [--nowait] [--"
+#| "timeout <timeout>]\n"
+#| "  down id <id> | uuid <id>\n"
 msgid ""
 "Usage: nmcli con { COMMAND | help }\n"
 "  COMMAND := { list | status | up | down }\n"
 "\n"
-"  list [id <id> | uuid <id> | system | user]\n"
+"  list [id <id> | uuid <id>]\n"
 "  status\n"
+"  up id <id> | uuid <id> [iface <iface>] [ap <hwaddr>] [nsp <name>] [--"
+"nowait] [--timeout <timeout>]\n"
 "  up id <id> | uuid <id> [iface <iface>] [ap <hwaddr>] [--nowait] [--timeout "
 "<timeout>]\n"
 "  down id <id> | uuid <id>\n"
@@ -102,866 +116,1139 @@ msgstr ""
 "वापर: nmcli con { COMMAND | help }\n"
 "  COMMAND := { list | status | up | down }\n"
 "\n"
-"  list [id <id> | uuid <id> | system | user]\n"
+"  list [id <id> | uuid <id>]\n"
 "  status\n"
+"  up id <id> | uuid <id> [iface <iface>] [ap <hwaddr>] [nsp <name>] [--"
+"nowait] [--timeout <timeout>]\n"
 "  up id <id> | uuid <id> [iface <iface>] [ap <hwaddr>] [--nowait] [--timeout "
 "<timeout>]\n"
 "  down id <id> | uuid <id>\n"
 
-#: ../cli/src/connections.c:197 ../cli/src/connections.c:536
+#: ../cli/src/connections.c:220 ../cli/src/connections.c:542
 #, c-format
 msgid "Error: 'con list': %s"
 msgstr "त्रुटी: 'con list': %s"
 
-#: ../cli/src/connections.c:199 ../cli/src/connections.c:538
+#: ../cli/src/connections.c:222 ../cli/src/connections.c:544
 #, c-format
 msgid "Error: 'con list': %s; allowed fields: %s"
 msgstr "त्रुटी: 'con list': %s; स्वीकार्य क्षेत्र: %s"
 
-#: ../cli/src/connections.c:207
+#: ../cli/src/connections.c:230
 msgid "Connection details"
 msgstr "जोडणीचे तपशील"
 
-#: ../cli/src/connections.c:381 ../cli/src/connections.c:601
-msgid "system"
-msgstr "प्रणाली"
-
-#: ../cli/src/connections.c:381 ../cli/src/connections.c:601
-msgid "user"
-msgstr "वापरकर्ता"
-
-#: ../cli/src/connections.c:383
+#: ../cli/src/connections.c:417
 msgid "never"
 msgstr "कधिच नाही"
 
 #. "CAPABILITIES"
 #. Print header
 #. "WIFI-PROPERTIES"
-#: ../cli/src/connections.c:384 ../cli/src/connections.c:385
-#: ../cli/src/connections.c:602 ../cli/src/connections.c:605
-#: ../cli/src/devices.c:388 ../cli/src/devices.c:513 ../cli/src/devices.c:539
-#: ../cli/src/devices.c:540 ../cli/src/devices.c:541 ../cli/src/devices.c:542
-#: ../cli/src/devices.c:543 ../cli/src/settings.c:508
-#: ../cli/src/settings.c:551 ../cli/src/settings.c:652
-#: ../cli/src/settings.c:926 ../cli/src/settings.c:927
-#: ../cli/src/settings.c:929 ../cli/src/settings.c:931
-#: ../cli/src/settings.c:1056 ../cli/src/settings.c:1057
-#: ../cli/src/settings.c:1058 ../cli/src/settings.c:1137
-#: ../cli/src/settings.c:1138 ../cli/src/settings.c:1139
-#: ../cli/src/settings.c:1140 ../cli/src/settings.c:1141
-#: ../cli/src/settings.c:1142 ../cli/src/settings.c:1143
-#: ../cli/src/settings.c:1144 ../cli/src/settings.c:1145
-#: ../cli/src/settings.c:1146 ../cli/src/settings.c:1147
-#: ../cli/src/settings.c:1148 ../cli/src/settings.c:1149
-#: ../cli/src/settings.c:1224
+#: ../cli/src/connections.c:418 ../cli/src/connections.c:419
+#: ../cli/src/connections.c:597 ../cli/src/connections.c:599
+#: ../cli/src/devices.c:509 ../cli/src/devices.c:562 ../cli/src/devices.c:687
+#: ../cli/src/devices.c:713 ../cli/src/devices.c:714 ../cli/src/devices.c:715
+#: ../cli/src/devices.c:716 ../cli/src/devices.c:717 ../cli/src/settings.c:520
+#: ../cli/src/settings.c:563 ../cli/src/settings.c:663
+#: ../cli/src/settings.c:937 ../cli/src/settings.c:938
+#: ../cli/src/settings.c:940 ../cli/src/settings.c:942
+#: ../cli/src/settings.c:1067 ../cli/src/settings.c:1068
+#: ../cli/src/settings.c:1069 ../cli/src/settings.c:1148
+#: ../cli/src/settings.c:1149 ../cli/src/settings.c:1150
+#: ../cli/src/settings.c:1151 ../cli/src/settings.c:1152
+#: ../cli/src/settings.c:1153 ../cli/src/settings.c:1154
+#: ../cli/src/settings.c:1155 ../cli/src/settings.c:1156
+#: ../cli/src/settings.c:1157 ../cli/src/settings.c:1158
+#: ../cli/src/settings.c:1159 ../cli/src/settings.c:1160
+#: ../cli/src/settings.c:1235
 msgid "yes"
 msgstr "होय"
 
-#: ../cli/src/connections.c:384 ../cli/src/connections.c:385
-#: ../cli/src/connections.c:602 ../cli/src/connections.c:605
-#: ../cli/src/devices.c:388 ../cli/src/devices.c:513 ../cli/src/devices.c:539
-#: ../cli/src/devices.c:540 ../cli/src/devices.c:541 ../cli/src/devices.c:542
-#: ../cli/src/devices.c:543 ../cli/src/settings.c:508
-#: ../cli/src/settings.c:510 ../cli/src/settings.c:551
-#: ../cli/src/settings.c:652 ../cli/src/settings.c:926
-#: ../cli/src/settings.c:927 ../cli/src/settings.c:929
-#: ../cli/src/settings.c:931 ../cli/src/settings.c:1056
-#: ../cli/src/settings.c:1057 ../cli/src/settings.c:1058
-#: ../cli/src/settings.c:1137 ../cli/src/settings.c:1138
-#: ../cli/src/settings.c:1139 ../cli/src/settings.c:1140
-#: ../cli/src/settings.c:1141 ../cli/src/settings.c:1142
-#: ../cli/src/settings.c:1143 ../cli/src/settings.c:1144
-#: ../cli/src/settings.c:1145 ../cli/src/settings.c:1146
-#: ../cli/src/settings.c:1147 ../cli/src/settings.c:1148
-#: ../cli/src/settings.c:1149 ../cli/src/settings.c:1224
+#: ../cli/src/connections.c:418 ../cli/src/connections.c:419
+#: ../cli/src/connections.c:597 ../cli/src/connections.c:599
+#: ../cli/src/devices.c:509 ../cli/src/devices.c:562 ../cli/src/devices.c:687
+#: ../cli/src/devices.c:713 ../cli/src/devices.c:714 ../cli/src/devices.c:715
+#: ../cli/src/devices.c:716 ../cli/src/devices.c:717 ../cli/src/settings.c:520
+#: ../cli/src/settings.c:522 ../cli/src/settings.c:563
+#: ../cli/src/settings.c:663 ../cli/src/settings.c:937
+#: ../cli/src/settings.c:938 ../cli/src/settings.c:940
+#: ../cli/src/settings.c:942 ../cli/src/settings.c:1067
+#: ../cli/src/settings.c:1068 ../cli/src/settings.c:1069
+#: ../cli/src/settings.c:1148 ../cli/src/settings.c:1149
+#: ../cli/src/settings.c:1150 ../cli/src/settings.c:1151
+#: ../cli/src/settings.c:1152 ../cli/src/settings.c:1153
+#: ../cli/src/settings.c:1154 ../cli/src/settings.c:1155
+#: ../cli/src/settings.c:1156 ../cli/src/settings.c:1157
+#: ../cli/src/settings.c:1158 ../cli/src/settings.c:1159
+#: ../cli/src/settings.c:1160 ../cli/src/settings.c:1235
 msgid "no"
 msgstr "नाही"
 
-#: ../cli/src/connections.c:457 ../cli/src/connections.c:500
-msgid "System connections"
-msgstr "प्रणाली जोडणी"
+#: ../cli/src/connections.c:493
+#| msgid "Connection details"
+msgid "Connection list"
+msgstr "जोडणी सूची"
 
-#: ../cli/src/connections.c:462 ../cli/src/connections.c:513
-msgid "User connections"
-msgstr "वापरकर्त्याची जोडणी"
-
-#: ../cli/src/connections.c:474 ../cli/src/connections.c:1334
-#: ../cli/src/connections.c:1350 ../cli/src/connections.c:1359
-#: ../cli/src/connections.c:1370 ../cli/src/connections.c:1452
-#: ../cli/src/devices.c:864 ../cli/src/devices.c:874 ../cli/src/devices.c:973
-#: ../cli/src/devices.c:980
+#: ../cli/src/connections.c:506 ../cli/src/connections.c:1378
+#: ../cli/src/connections.c:1393 ../cli/src/connections.c:1402
+#: ../cli/src/connections.c:1412 ../cli/src/connections.c:1424
+#: ../cli/src/connections.c:1519 ../cli/src/devices.c:1190
+#: ../cli/src/devices.c:1200 ../cli/src/devices.c:1314
+#: ../cli/src/devices.c:1321 ../cli/src/devices.c:1534
+#: ../cli/src/devices.c:1541
 #, c-format
 msgid "Error: %s argument is missing."
 msgstr "त्रुटी: %s घटक आढळले नाही."
 
-#: ../cli/src/connections.c:487
+#: ../cli/src/connections.c:519
 #, c-format
 msgid "Error: %s - no such connection."
 msgstr "त्रुटी: %s - याप्रकारची जोडणी आढळली नाही."
 
-#: ../cli/src/connections.c:519 ../cli/src/connections.c:1383
-#: ../cli/src/connections.c:1470 ../cli/src/devices.c:687
-#: ../cli/src/devices.c:754 ../cli/src/devices.c:888 ../cli/src/devices.c:986
+#: ../cli/src/connections.c:525 ../cli/src/connections.c:1437
+#: ../cli/src/connections.c:1536 ../cli/src/devices.c:987
+#: ../cli/src/devices.c:1067 ../cli/src/devices.c:1214
+#: ../cli/src/devices.c:1327 ../cli/src/devices.c:1547
 #, c-format
 msgid "Unknown parameter: %s\n"
 msgstr "अपरिचीत घटक: %s\n"
 
-#: ../cli/src/connections.c:528
+#: ../cli/src/connections.c:534
 #, c-format
 msgid "Error: no valid parameter specified."
 msgstr "त्रुटी: वैध घटक निर्देशीत नाही."
 
-#: ../cli/src/connections.c:543 ../cli/src/connections.c:1572
-#: ../cli/src/devices.c:1192 ../cli/src/network-manager.c:274
+#: ../cli/src/connections.c:549 ../cli/src/connections.c:1627
+#: ../cli/src/devices.c:1755 ../cli/src/network-manager.c:463
 #, c-format
 msgid "Error: %s."
 msgstr "त्रुटी: %s."
 
-#: ../cli/src/connections.c:649
+#: ../cli/src/connections.c:637
 #, c-format
 msgid "Error: 'con status': %s"
 msgstr "त्रुटी: 'con status': %s"
 
-#: ../cli/src/connections.c:651
+#: ../cli/src/connections.c:639
 #, c-format
 msgid "Error: 'con status': %s; allowed fields: %s"
 msgstr "त्रुटी: 'con status': %s; स्वीकार्य क्षेत्र: %s"
 
-#: ../cli/src/connections.c:658
+#: ../cli/src/connections.c:647 ../cli/src/connections.c:1452
+#: ../cli/src/connections.c:1551 ../cli/src/devices.c:1014
+#: ../cli/src/devices.c:1076 ../cli/src/devices.c:1229
+#: ../cli/src/devices.c:1357 ../cli/src/devices.c:1576
+#, c-format
+#| msgid "Error: Could not connect to NetworkManager."
+msgid "Error: Can't find out if NetworkManager is running: %s."
+msgstr "त्रुटी: NetworkManager कार्यरत आहे, हे शोधणे अशक्य: %s."
+
+#: ../cli/src/connections.c:651 ../cli/src/connections.c:1456
+#: ../cli/src/connections.c:1555 ../cli/src/devices.c:1018
+#: ../cli/src/devices.c:1080 ../cli/src/devices.c:1233
+#: ../cli/src/devices.c:1361 ../cli/src/devices.c:1580
+#, c-format
+#| msgid "NetworkManager status"
+msgid "Error: NetworkManager is not running."
+msgstr "त्रुटी: NetworkManager कार्यरत नाही."
+
+#: ../cli/src/connections.c:659
 msgid "Active connections"
 msgstr "सक्रिय जोडणी"
 
-#: ../cli/src/connections.c:1026
+#: ../cli/src/connections.c:1095
 #, c-format
 msgid "no active connection on device '%s'"
-msgstr "साधण '%s' वरील सक्रिय जोडणी आढळली नाही"
+msgstr "साधन '%s' वरील सक्रिय जोडणी आढळली नाही"
 
-#: ../cli/src/connections.c:1034
+#: ../cli/src/connections.c:1103
 #, c-format
 msgid "no active connection or device"
-msgstr "सक्रिय जोडणी किंवा साधण आढळले नाही"
+msgstr "सक्रिय जोडणी किंवा साधन आढळले नाही"
 
-#: ../cli/src/connections.c:1084
+#: ../cli/src/connections.c:1174
 #, c-format
 msgid "device '%s' not compatible with connection '%s'"
-msgstr "साधण '%s' जोडणी '%s' सह सहत्व नाही"
+msgstr "साधन '%s' जोडणी '%s' सह सहत्व नाही"
 
-#: ../cli/src/connections.c:1086
+#: ../cli/src/connections.c:1176
 #, c-format
 msgid "no device found for connection '%s'"
-msgstr "जोडणी '%s' करीता साधण आढळले नाही"
+msgstr "जोडणी '%s' करीता साधन आढळले नाही"
 
-#: ../cli/src/connections.c:1097
+#: ../cli/src/connections.c:1187
 msgid "activating"
-msgstr "सक्रिय करत आहे"
+msgstr "बंद करत आहे"
 
-#: ../cli/src/connections.c:1099
+#: ../cli/src/connections.c:1189
 msgid "activated"
 msgstr "सक्रिय केले"
 
-#: ../cli/src/connections.c:1102 ../cli/src/connections.c:1125
-#: ../cli/src/connections.c:1158 ../cli/src/devices.c:224
-#: ../cli/src/devices.c:514 ../cli/src/network-manager.c:92
-#: ../cli/src/network-manager.c:145 ../cli/src/settings.c:473
+#: ../cli/src/connections.c:1191 ../cli/src/devices.c:304
+#| msgid "activating"
+msgid "deactivating"
+msgstr "बंद करत आहे"
+
+#: ../cli/src/connections.c:1194 ../cli/src/connections.c:1217
+#: ../cli/src/connections.c:1250 ../cli/src/devices.c:308
+#: ../cli/src/devices.c:688 ../cli/src/network-manager.c:118
+#: ../cli/src/network-manager.c:180 ../cli/src/network-manager.c:183
+#: ../cli/src/network-manager.c:298 ../cli/src/network-manager.c:353
+#: ../cli/src/network-manager.c:391 ../cli/src/network-manager.c:430
+#: ../cli/src/settings.c:485 ../cli/src/utils.c:396
 msgid "unknown"
 msgstr "अपरिचीत"
 
-#: ../cli/src/connections.c:1111
+#: ../cli/src/connections.c:1203
 msgid "VPN connecting (prepare)"
 msgstr "VPN जोडणी (तयार करा)"
 
-#: ../cli/src/connections.c:1113
+#: ../cli/src/connections.c:1205
 msgid "VPN connecting (need authentication)"
 msgstr "VPN जोडणी (ओळख पटवणे आवश्यक आहे)"
 
-#: ../cli/src/connections.c:1115
+#: ../cli/src/connections.c:1207
 msgid "VPN connecting"
 msgstr "VPN जोडणी"
 
-#: ../cli/src/connections.c:1117
+#: ../cli/src/connections.c:1209
 msgid "VPN connecting (getting IP configuration)"
 msgstr "VPN जोडणी (IP संरचना प्राप्त करत आहे)"
 
-#: ../cli/src/connections.c:1119
+#: ../cli/src/connections.c:1211
 msgid "VPN connected"
 msgstr "VPN जोडणी यशस्वी"
 
-#: ../cli/src/connections.c:1121
+#: ../cli/src/connections.c:1213
 msgid "VPN connection failed"
 msgstr "VPN जोडणी अपयशी"
 
-#: ../cli/src/connections.c:1123
+#: ../cli/src/connections.c:1215
 msgid "VPN disconnected"
 msgstr "VPN जोडणी खंडीत झाली"
 
-#: ../cli/src/connections.c:1134
+#: ../cli/src/connections.c:1226
 msgid "unknown reason"
 msgstr "अपरिचीत कारण"
 
-#: ../cli/src/connections.c:1136
+#: ../cli/src/connections.c:1228
 msgid "none"
 msgstr "काहिच नाही"
 
-#: ../cli/src/connections.c:1138
+#: ../cli/src/connections.c:1230
 msgid "the user was disconnected"
 msgstr "वापरकर्ता खंडीत झाले"
 
-#: ../cli/src/connections.c:1140
+#: ../cli/src/connections.c:1232
 msgid "the base network connection was interrupted"
 msgstr "बेस नेटवर्क जोडणी खंडीत झाले"
 
-#: ../cli/src/connections.c:1142
+#: ../cli/src/connections.c:1234
 msgid "the VPN service stopped unexpectedly"
 msgstr "VPN सेवा अनपेक्षीतरित्या थांबली"
 
-#: ../cli/src/connections.c:1144
+#: ../cli/src/connections.c:1236
 msgid "the VPN service returned invalid configuration"
 msgstr "VPN सेवाने अवैध संरचना रिटर्न केली"
 
-#: ../cli/src/connections.c:1146
+#: ../cli/src/connections.c:1238
 msgid "the connection attempt timed out"
 msgstr "जोडणी प्रयत्नाची वेळ समाप्ती आढळली"
 
-#: ../cli/src/connections.c:1148
+#: ../cli/src/connections.c:1240
 msgid "the VPN service did not start in time"
 msgstr "VPN सेवा वेळेवर सुरू झाली नाही"
 
-#: ../cli/src/connections.c:1150
+#: ../cli/src/connections.c:1242
 msgid "the VPN service failed to start"
 msgstr "VPN सेवा सुरू होण्यास अपयशी"
 
-#: ../cli/src/connections.c:1152
+#: ../cli/src/connections.c:1244
 msgid "no valid VPN secrets"
 msgstr "वैध VPN गोपणीयता आढळले नाही"
 
-#: ../cli/src/connections.c:1154
+#: ../cli/src/connections.c:1246
 msgid "invalid VPN secrets"
 msgstr "अवैध VPN गोपणीयता"
 
-#: ../cli/src/connections.c:1156
+#: ../cli/src/connections.c:1248
 msgid "the connection was removed"
 msgstr "जोडणी काढून टाकली"
 
-#: ../cli/src/connections.c:1170
+#: ../cli/src/connections.c:1262
 #, c-format
 msgid "state: %s\n"
 msgstr "स्तर: %s\n"
 
-#: ../cli/src/connections.c:1173 ../cli/src/connections.c:1199
+#: ../cli/src/connections.c:1265 ../cli/src/connections.c:1291
 #, c-format
 msgid "Connection activated\n"
 msgstr "जोडणी सक्रिय केली\n"
 
-#: ../cli/src/connections.c:1176
+#: ../cli/src/connections.c:1268
 #, c-format
 msgid "Error: Connection activation failed."
 msgstr "त्रुटी: जोडणी सक्रिय करण्यास अपयशी."
 
-#: ../cli/src/connections.c:1195
+#: ../cli/src/connections.c:1287
 #, c-format
 msgid "state: %s (%d)\n"
 msgstr "स्तर: %s (%d)\n"
 
-#: ../cli/src/connections.c:1205
+#: ../cli/src/connections.c:1297
 #, c-format
 msgid "Error: Connection activation failed: %s."
 msgstr "त्रुटी: जोडणी सक्रिय करण्यास अपयशी: %s."
 
-#: ../cli/src/connections.c:1222 ../cli/src/devices.c:811
+#: ../cli/src/connections.c:1314 ../cli/src/devices.c:1136
 #, c-format
 msgid "Error: Timeout %d sec expired."
 msgstr "त्रुटी: वेळसमाप्ती %d सेकंद समाप्त."
 
-#: ../cli/src/connections.c:1265
+#: ../cli/src/connections.c:1327
 #, c-format
 msgid "Error: Connection activation failed: %s"
 msgstr "त्रुटी: जोडणी सक्रिय करण्यास अपयशी: %s"
 
-#: ../cli/src/connections.c:1279
-#, c-format
-msgid "Error: Obtaining active connection for '%s' failed."
-msgstr "त्रुटी: '%s' करीता सक्रिय जोडणी प्राप्त करण्यास अपयशी."
-
-#: ../cli/src/connections.c:1288
+#: ../cli/src/connections.c:1333
 #, c-format
 msgid "Active connection state: %s\n"
 msgstr "सक्रिय जोडणीचे स्तर: %s\n"
 
-#: ../cli/src/connections.c:1289
+#: ../cli/src/connections.c:1334
 #, c-format
 msgid "Active connection path: %s\n"
 msgstr "सक्रिय जोडणीचे मार्ग: %s\n"
 
-#: ../cli/src/connections.c:1343 ../cli/src/connections.c:1461
+#: ../cli/src/connections.c:1386 ../cli/src/connections.c:1527
 #, c-format
 msgid "Error: Unknown connection: %s."
 msgstr "त्रुटी: अपरिचीत जोडणी: %s."
 
-#: ../cli/src/connections.c:1378 ../cli/src/devices.c:882
+#: ../cli/src/connections.c:1432 ../cli/src/devices.c:1208
 #, c-format
 msgid "Error: timeout value '%s' is not valid."
 msgstr "त्रुटी: वेळसमाप्तीचे मुल्य '%s' वैध नाही."
 
-#: ../cli/src/connections.c:1391 ../cli/src/connections.c:1478
+#: ../cli/src/connections.c:1445 ../cli/src/connections.c:1544
 #, c-format
 msgid "Error: id or uuid has to be specified."
 msgstr "त्रुटी: id किंवा uuid निर्देशीत करणे आवश्यक आहे."
 
-#: ../cli/src/connections.c:1411
+#: ../cli/src/connections.c:1473
 #, c-format
 msgid "Error: No suitable device found: %s."
-msgstr "त्रुटी: योग्य साधण आढळले नाही: %s."
+msgstr "त्रुटी: योग्य साधन आढळले नाही: %s."
 
-#: ../cli/src/connections.c:1413
+#: ../cli/src/connections.c:1475
 #, c-format
 msgid "Error: No suitable device found."
-msgstr "त्रुटी: योग्य साधण आढळले नाही."
+msgstr "त्रुटी: योग्य साधन आढळले नाही."
 
-#: ../cli/src/connections.c:1505
+#: ../cli/src/connections.c:1580
 #, c-format
 msgid "Warning: Connection not active\n"
 msgstr "सावधान: जोडणी सक्रिय नाही\n"
 
-#: ../cli/src/connections.c:1561
+#: ../cli/src/connections.c:1618
 #, c-format
 msgid "Error: 'con' command '%s' is not valid."
 msgstr "त्रुटी: 'con' आदेश '%s' वैध नाही."
 
-#: ../cli/src/connections.c:1597
+#: ../cli/src/connections.c:1683
 #, c-format
 msgid "Error: could not connect to D-Bus."
 msgstr "त्रुटी: D-Bus सह जोडणी करणे अशक्य."
 
-#: ../cli/src/connections.c:1604
+#: ../cli/src/connections.c:1690
 #, c-format
 msgid "Error: Could not get system settings."
 msgstr "त्रुटी: प्रणालीची संयोजना प्राप्त करणे अशक्य."
 
-#: ../cli/src/connections.c:1612
+#: ../cli/src/connections.c:1700
 #, c-format
-msgid "Error: Could not get user settings."
-msgstr "त्रुटी: वापरकर्ताची संयोजना प्राप्त करणे अशक्य."
-
-#: ../cli/src/connections.c:1622
-#, c-format
-msgid "Error: Can't obtain connections: settings services are not running."
-msgstr "त्रुटी: जोडणी प्राप्त करण्यास अशक्य: सेटिंग्स् सेवा कार्यरत नाही."
+#| msgid "Error: Can't obtain connections: settings services are not running."
+msgid "Error: Can't obtain connections: settings service is not running."
+msgstr "त्रुटी: जोडणी प्राप्त करण्यास अशक्य: सेटिंग्स् सर्व्हिस कार्यरत नाही."
 
 #. 0
 #. 9
-#: ../cli/src/devices.c:60 ../cli/src/devices.c:86 ../cli/src/devices.c:162
+#. 3
+#: ../cli/src/devices.c:66 ../cli/src/devices.c:102 ../cli/src/devices.c:212
+#: ../cli/src/devices.c:228
 msgid "DEVICE"
 msgstr "DEVICE"
 
 #. 1
 #. 4
-#. 0
-#: ../cli/src/devices.c:62 ../cli/src/devices.c:90
-#: ../cli/src/network-manager.c:36
+#. 1
+#: ../cli/src/devices.c:68 ../cli/src/devices.c:106
+#: ../cli/src/network-manager.c:39
 msgid "STATE"
 msgstr "STATE"
 
-#: ../cli/src/devices.c:71
+#: ../cli/src/devices.c:78
 msgid "GENERAL"
 msgstr "GENERAL"
 
 #. 0
-#: ../cli/src/devices.c:72
+#: ../cli/src/devices.c:79
 msgid "CAPABILITIES"
 msgstr "CAPABILITIES"
 
 #. 1
-#: ../cli/src/devices.c:73
+#: ../cli/src/devices.c:80
 msgid "WIFI-PROPERTIES"
 msgstr "WIFI-PROPERTIES"
 
 #. 2
-#: ../cli/src/devices.c:74
+#: ../cli/src/devices.c:81
 msgid "AP"
 msgstr "AP"
 
 #. 3
-#: ../cli/src/devices.c:75
+#: ../cli/src/devices.c:82
 msgid "WIRED-PROPERTIES"
 msgstr "WIRED-PROPERTIES"
 
 #. 4
-#: ../cli/src/devices.c:76
+#: ../cli/src/devices.c:83
+#| msgid "WIFI-PROPERTIES"
+msgid "WIMAX-PROPERTIES"
+msgstr "WIMAX-PROPERTIES"
+
+#. 5
+#. 0
+#: ../cli/src/devices.c:84 ../cli/src/devices.c:225
+#| msgid "DNS"
+msgid "NSP"
+msgstr "NSP"
+
+#. 6
+#: ../cli/src/devices.c:85
 msgid "IP4-SETTINGS"
 msgstr "IP4-SETTINGS"
 
-#. 5
-#: ../cli/src/devices.c:77
+#. 7
+#: ../cli/src/devices.c:86
 msgid "IP4-DNS"
 msgstr "IP4-DNS"
 
-#. 2
+#. 8
+#: ../cli/src/devices.c:87
+#| msgid "IP4-SETTINGS"
+msgid "IP6-SETTINGS"
+msgstr "IP6-SETTINGS"
+
+#. 9
 #: ../cli/src/devices.c:88
+#| msgid "IP4-DNS"
+msgid "IP6-DNS"
+msgstr "IP6-DNS"
+
+#. 2
+#: ../cli/src/devices.c:104
 msgid "DRIVER"
 msgstr "DRIVER"
 
 #. 3
-#: ../cli/src/devices.c:89
+#: ../cli/src/devices.c:105
 msgid "HWADDR"
 msgstr "HWADDR"
 
 #. 0
-#: ../cli/src/devices.c:99
+#: ../cli/src/devices.c:115
 msgid "CARRIER-DETECT"
 msgstr "CARRIER-DETECT"
 
 #. 1
-#: ../cli/src/devices.c:100
+#: ../cli/src/devices.c:116
 msgid "SPEED"
 msgstr "SPEED"
 
 #. 0
-#: ../cli/src/devices.c:109
+#: ../cli/src/devices.c:125
 msgid "CARRIER"
 msgstr "CARRIER"
 
 #. 0
-#: ../cli/src/devices.c:119
+#: ../cli/src/devices.c:135
 msgid "WEP"
 msgstr "WEP"
 
 #. 1
-#: ../cli/src/devices.c:120
+#: ../cli/src/devices.c:136
 msgid "WPA"
 msgstr "WPA"
 
 #. 2
-#: ../cli/src/devices.c:121
+#: ../cli/src/devices.c:137
 msgid "WPA2"
 msgstr "WPA2"
 
 #. 3
-#: ../cli/src/devices.c:122
+#: ../cli/src/devices.c:138
 msgid "TKIP"
 msgstr "TKIP"
 
 #. 4
-#: ../cli/src/devices.c:123
+#: ../cli/src/devices.c:139
 msgid "CCMP"
 msgstr "CCMP"
 
 #. 0
-#: ../cli/src/devices.c:132
+#: ../cli/src/devices.c:149
+#| msgid "FREQ"
+msgid "CTR-FREQ"
+msgstr "CTR-FREQ"
+
+#. 1
+#: ../cli/src/devices.c:150
+#| msgid "SSID"
+msgid "RSSI"
+msgstr "RSSI"
+
+#. 2
+#: ../cli/src/devices.c:151
+msgid "CINR"
+msgstr "CINR"
+
+#. 3
+#: ../cli/src/devices.c:152
+msgid "TX-POW"
+msgstr "TX-POW"
+
+#. 4
+#: ../cli/src/devices.c:153
+#| msgid "BSSID"
+msgid "BSID"
+msgstr "BSID"
+
+#. 0
+#: ../cli/src/devices.c:163 ../cli/src/devices.c:174
 msgid "ADDRESS"
 msgstr "ADDRESS"
 
 #. 1
-#: ../cli/src/devices.c:133
+#: ../cli/src/devices.c:164 ../cli/src/devices.c:175
 msgid "PREFIX"
 msgstr "PREFIX"
 
 #. 2
-#: ../cli/src/devices.c:134
+#: ../cli/src/devices.c:165 ../cli/src/devices.c:176
 msgid "GATEWAY"
 msgstr "GATEWAY"
 
 #. 0
-#: ../cli/src/devices.c:143
+#: ../cli/src/devices.c:185 ../cli/src/devices.c:194
 msgid "DNS"
 msgstr "DNS"
 
 #. 0
-#: ../cli/src/devices.c:153
+#: ../cli/src/devices.c:203
 msgid "SSID"
 msgstr "SSID"
 
 #. 1
-#: ../cli/src/devices.c:154
+#: ../cli/src/devices.c:204
 msgid "BSSID"
 msgstr "BSSID"
 
 #. 2
-#: ../cli/src/devices.c:155
+#: ../cli/src/devices.c:205
 msgid "MODE"
 msgstr "MODE"
 
 #. 3
-#: ../cli/src/devices.c:156
+#: ../cli/src/devices.c:206
 msgid "FREQ"
 msgstr "FREQ"
 
 #. 4
-#: ../cli/src/devices.c:157
+#: ../cli/src/devices.c:207
 msgid "RATE"
 msgstr "RATE"
 
 #. 5
-#: ../cli/src/devices.c:158
+#. 1
+#: ../cli/src/devices.c:208 ../cli/src/devices.c:226
 msgid "SIGNAL"
 msgstr "SIGNAL"
 
 #. 6
-#: ../cli/src/devices.c:159
+#: ../cli/src/devices.c:209
 msgid "SECURITY"
 msgstr "SECURITY"
 
 #. 7
-#: ../cli/src/devices.c:160
+#: ../cli/src/devices.c:210
 msgid "WPA-FLAGS"
 msgstr "WPA-FLAGS"
 
 #. 8
-#: ../cli/src/devices.c:161
+#: ../cli/src/devices.c:211
 msgid "RSN-FLAGS"
 msgstr "RSN-FLAGS"
 
 #. 10
-#: ../cli/src/devices.c:163
+#. 4
+#: ../cli/src/devices.c:213 ../cli/src/devices.c:229
 msgid "ACTIVE"
 msgstr "ACTIVE"
 
-#: ../cli/src/devices.c:186
-#, c-format
+#: ../cli/src/devices.c:256
+#, c-format
+#| msgid ""
+#| "Usage: nmcli dev { COMMAND | help }\n"
+#| "\n"
+#| "  COMMAND := { status | list | disconnect | wifi }\n"
+#| "\n"
+#| "  status\n"
+#| "  list [iface <iface>]\n"
+#| "  disconnect iface <iface> [--nowait] [--timeout <timeout>]\n"
+#| "  wifi [list [iface <iface>] [hwaddr <hwaddr>]]\n"
+#| "\n"
 msgid ""
 "Usage: nmcli dev { COMMAND | help }\n"
 "\n"
+"  COMMAND := { status | list | disconnect | wifi | wimax }\n"
+"\n"
 "  COMMAND := { status | list | disconnect | wifi }\n"
 "\n"
 "  status\n"
 "  list [iface <iface>]\n"
 "  disconnect iface <iface> [--nowait] [--timeout <timeout>]\n"
 "  wifi [list [iface <iface>] [hwaddr <hwaddr>]]\n"
+"  wimax [list [iface <iface>] [nsp <name>]]\n"
 "\n"
 msgstr ""
 "वापर: nmcli dev { COMMAND | help }\n"
 "\n"
+"  COMMAND := { status | list | disconnect | wifi | wimax }\n"
+"\n"
 "  COMMAND := { status | list | disconnect | wifi }\n"
 "\n"
 "  status\n"
 "  list [iface <iface>]\n"
 "  disconnect iface <iface> [--nowait] [--timeout <timeout>]\n"
 "  wifi [list [iface <iface>] [hwaddr <hwaddr>]]\n"
+"  wimax [list [iface <iface>] [nsp <name>]]\n"
 "\n"
 
-#: ../cli/src/devices.c:206
+#: ../cli/src/devices.c:284
 msgid "unmanaged"
 msgstr "अव्यवस्थापीत"
 
-#: ../cli/src/devices.c:208
+#: ../cli/src/devices.c:286
 msgid "unavailable"
 msgstr "अनुपल्बध"
 
-#: ../cli/src/devices.c:210 ../cli/src/network-manager.c:89
+#: ../cli/src/devices.c:288 ../cli/src/network-manager.c:115
 msgid "disconnected"
 msgstr "खंडीत"
 
-#: ../cli/src/devices.c:212
+#: ../cli/src/devices.c:290
 msgid "connecting (prepare)"
 msgstr "जोडणी (तयार करत आहे)"
 
-#: ../cli/src/devices.c:214
+#: ../cli/src/devices.c:292
 msgid "connecting (configuring)"
 msgstr "जोडणी (संरचीत करत आहे)"
 
-#: ../cli/src/devices.c:216
+#: ../cli/src/devices.c:294
 msgid "connecting (need authentication)"
 msgstr "जोडणी (ओळख पटवणे आवश्यक आहे)"
 
-#: ../cli/src/devices.c:218
+#: ../cli/src/devices.c:296
 msgid "connecting (getting IP configuration)"
 msgstr "जोडणी (IP संरचना प्राप्त करत आहे)"
 
-#: ../cli/src/devices.c:220 ../cli/src/network-manager.c:87
+#: ../cli/src/devices.c:298
+#| msgid "connecting (getting IP configuration)"
+msgid "connecting (checking IP connectivity)"
+msgstr "जोडणी करत आहे (IP जोडणी तपासत आहे)"
+
+#: ../cli/src/devices.c:300
+#| msgid "connecting (getting IP configuration)"
+msgid "connecting (starting secondary connections)"
+msgstr "जोडणी (दुसरी जोडणी सुरू करत आहे)"
+
+#: ../cli/src/devices.c:302 ../cli/src/network-manager.c:111
 msgid "connected"
 msgstr "जोडणी यशस्वी"
 
-#: ../cli/src/devices.c:222
+#: ../cli/src/devices.c:306
 msgid "connection failed"
 msgstr "जोडणी अपयशी"
 
-#: ../cli/src/devices.c:245 ../cli/src/devices.c:380
+#: ../cli/src/devices.c:331 ../cli/src/devices.c:341 ../cli/src/devices.c:501
+#: ../cli/src/devices.c:545
 msgid "Unknown"
 msgstr "अपरिचीत"
 
-#: ../cli/src/devices.c:277
+#: ../cli/src/devices.c:374
 msgid "(none)"
 msgstr "(काहिच नाही)"
 
-#: ../cli/src/devices.c:302
+#: ../cli/src/devices.c:399
 #, c-format
 msgid "%s: error converting IP4 address 0x%X"
 msgstr "%s: IP4 पत्ता 0x%X यांस रूपांतरीत करतेवेळी त्रुटी"
 
-#: ../cli/src/devices.c:349
+#: ../cli/src/devices.c:470
 #, c-format
 msgid "%u MHz"
 msgstr "%u MHz"
 
-#: ../cli/src/devices.c:350
+#: ../cli/src/devices.c:471
 #, c-format
 msgid "%u MB/s"
 msgstr "%u MB/s"
 
-#: ../cli/src/devices.c:359
+#: ../cli/src/devices.c:480
 msgid "Encrypted: "
 msgstr "एनक्रिप्टेड: "
 
-#: ../cli/src/devices.c:364
+#: ../cli/src/devices.c:485
 msgid "WEP "
 msgstr "WEP "
 
-#: ../cli/src/devices.c:366
+#: ../cli/src/devices.c:487
 msgid "WPA "
 msgstr "WPA "
 
-#: ../cli/src/devices.c:368
+#: ../cli/src/devices.c:489
 msgid "WPA2 "
 msgstr "WPA2 "
 
-#: ../cli/src/devices.c:371
+#: ../cli/src/devices.c:492
 msgid "Enterprise "
 msgstr "एंटरप्राइज"
 
-#: ../cli/src/devices.c:380
+#: ../cli/src/devices.c:501
 msgid "Ad-Hoc"
 msgstr "ऍड-हॉक"
 
-#: ../cli/src/devices.c:380
+#: ../cli/src/devices.c:501
 msgid "Infrastructure"
 msgstr "इंफ्रास्ट्रक्चर"
 
-#: ../cli/src/devices.c:442
+#: ../cli/src/devices.c:536
+msgid "Home"
+msgstr "होम"
+
+#: ../cli/src/devices.c:539
+msgid "Partner"
+msgstr "पार्टनर"
+
+#: ../cli/src/devices.c:542
+msgid "Roaming"
+msgstr "रोमिंग"
+
+#: ../cli/src/devices.c:612
 #, c-format
 msgid "Error: 'dev list': %s"
 msgstr "त्रुटी: 'dev list': %s"
 
-#: ../cli/src/devices.c:444
+#: ../cli/src/devices.c:614
 #, c-format
 msgid "Error: 'dev list': %s; allowed fields: %s"
 msgstr "त्रुटी: 'dev list': %s; स्वीकार्य क्षेत्र: %s"
 
-#: ../cli/src/devices.c:453
+#: ../cli/src/devices.c:623
 msgid "Device details"
-msgstr "साधणाचे तपशील"
+msgstr "साधनाचे तपशील"
 
-#: ../cli/src/devices.c:483 ../cli/src/devices.c:827
+#: ../cli/src/devices.c:657 ../cli/src/devices.c:1152 ../cli/src/utils.c:342
 msgid "(unknown)"
 msgstr "(अपरिचीत)"
 
-#: ../cli/src/devices.c:484
+#: ../cli/src/devices.c:658
 msgid "unknown)"
 msgstr "अपरिचीत)"
 
-#: ../cli/src/devices.c:510
+#: ../cli/src/devices.c:684
 #, c-format
 msgid "%u Mb/s"
 msgstr "%u Mb/s"
 
 #. Print header
 #. "WIRED-PROPERTIES"
-#: ../cli/src/devices.c:583
+#: ../cli/src/devices.c:757
 msgid "on"
 msgstr "सुरू करा"
 
-#: ../cli/src/devices.c:583
+#: ../cli/src/devices.c:757
 msgid "off"
 msgstr "बंद करा"
 
-#: ../cli/src/devices.c:710
+#: ../cli/src/devices.c:1004
 #, c-format
 msgid "Error: 'dev status': %s"
 msgstr "त्रुटी: 'dev status': %s"
 
-#: ../cli/src/devices.c:712
+#: ../cli/src/devices.c:1006
 #, c-format
 msgid "Error: 'dev status': %s; allowed fields: %s"
 msgstr "त्रुटी: 'dev status': %s; स्वीकार्य क्षेत्र: %s"
 
-#: ../cli/src/devices.c:719
+#: ../cli/src/devices.c:1029
 msgid "Status of devices"
-msgstr "साधणांची स्थिती"
+msgstr "साधनांची स्थिती"
 
-#: ../cli/src/devices.c:747
+#: ../cli/src/devices.c:1060
 #, c-format
 msgid "Error: '%s' argument is missing."
 msgstr "त्रुटी: '%s' घटक आढळले नाही."
 
-#: ../cli/src/devices.c:776 ../cli/src/devices.c:915 ../cli/src/devices.c:1035
+#: ../cli/src/devices.c:1101 ../cli/src/devices.c:1253
+#: ../cli/src/devices.c:1389 ../cli/src/devices.c:1608
 #, c-format
 msgid "Error: Device '%s' not found."
-msgstr "त्रुटी: साधण '%s' आढळले नाही."
+msgstr "त्रुटी: साधन '%s' आढळले नाही."
 
-#: ../cli/src/devices.c:799
+#: ../cli/src/devices.c:1124
 #, c-format
 msgid "Success: Device '%s' successfully disconnected."
-msgstr "यशस्वी: साधण '%s' यशस्वीरित्या खंडीत झाले."
+msgstr "यशस्वी: साधन '%s' यशस्वीरित्या खंडीत झाले."
 
-#: ../cli/src/devices.c:824
+#: ../cli/src/devices.c:1149
 #, c-format
 msgid "Error: Device '%s' (%s) disconnecting failed: %s"
-msgstr "त्रुटी: साधण '%s' (%s) खंडीत होणे अपयशी झाले: %s"
+msgstr "त्रुटी: साधन '%s' (%s) खंडीत होणे अपयशी झाले: %s"
 
-#: ../cli/src/devices.c:832
+#: ../cli/src/devices.c:1157
 #, c-format
 msgid "Device state: %d (%s)\n"
-msgstr "साधणाचे स्तर: %d (%s)\n"
+msgstr "साधनाचे स्तर: %d (%s)\n"
 
-#: ../cli/src/devices.c:896
+#: ../cli/src/devices.c:1222
 #, c-format
 msgid "Error: iface has to be specified."
 msgstr "त्रुटी: iface निर्देशीत करणे आवश्यक आहे."
 
-#: ../cli/src/devices.c:1011
+#: ../cli/src/devices.c:1347
 #, c-format
 msgid "Error: 'dev wifi': %s"
 msgstr "त्रुटी: 'dev wifi': %s"
 
-#: ../cli/src/devices.c:1013
+#: ../cli/src/devices.c:1349
 #, c-format
 msgid "Error: 'dev wifi': %s; allowed fields: %s"
 msgstr "त्रुटी: 'dev wifi': %s; स्वीकार्य क्षेत्र: %s"
 
-#: ../cli/src/devices.c:1020
+#: ../cli/src/devices.c:1372
 msgid "WiFi scan list"
 msgstr "WiFi स्कॅन सूची"
 
-#: ../cli/src/devices.c:1055 ../cli/src/devices.c:1109
+#: ../cli/src/devices.c:1409 ../cli/src/devices.c:1463
+#: ../cli/src/devices.c:1670
 #, c-format
 msgid "Error: Access point with hwaddr '%s' not found."
 msgstr "त्रुटी: ऍक्सेस पॉईंट hwaddr '%s' सह आढळले नाही."
 
-#: ../cli/src/devices.c:1072
+#: ../cli/src/devices.c:1426
 #, c-format
 msgid "Error: Device '%s' is not a WiFi device."
-msgstr "त्रुटी: साधण '%s' WiFi साधण नाही."
+msgstr "त्रुटी: साधन '%s' WiFi साधन नाही."
 
-#: ../cli/src/devices.c:1136
+#: ../cli/src/devices.c:1490
 #, c-format
 msgid "Error: 'dev wifi' command '%s' is not valid."
 msgstr "त्रुटी: 'dev wifi' आदेश '%s' वैध नाही."
 
-#: ../cli/src/devices.c:1183
+#: ../cli/src/devices.c:1566
+#, c-format
+#| msgid "Error: 'dev wifi': %s"
+msgid "Error: 'dev wimax': %s"
+msgstr "त्रुटी: 'dev wimax': %s"
+
+#: ../cli/src/devices.c:1568
+#, c-format
+#| msgid "Error: 'dev wifi': %s; allowed fields: %s"
+msgid "Error: 'dev wimax': %s; allowed fields: %s"
+msgstr "त्रुटी: 'dev wimax': %s; स्वीकार्य क्षेत्र: %s"
+
+#: ../cli/src/devices.c:1591
+msgid "WiMAX NSP list"
+msgstr "WiMAX NSP सूची"
+
+#: ../cli/src/devices.c:1628
+#, c-format
+#| msgid "Error: Device '%s' not found."
+msgid "Error: NSP with name '%s' not found."
+msgstr "त्रुटी: NSP, साधन '%s' सह आढळले नाही."
+
+#: ../cli/src/devices.c:1639
+#, c-format
+#| msgid "Error: Device '%s' is not a WiFi device."
+msgid "Error: Device '%s' is not a WiMAX device."
+msgstr "त्रुटी: साधन '%s' हे WiMAX साधन नाही."
+
+#: ../cli/src/devices.c:1697
+#, c-format
+#| msgid "Error: 'dev wifi' command '%s' is not valid."
+msgid "Error: 'dev wimax' command '%s' is not valid."
+msgstr "त्रुटी: 'dev wimax' आदेश '%s' वैध नाही."
+
+#: ../cli/src/devices.c:1747
 #, c-format
 msgid "Error: 'dev' command '%s' is not valid."
 msgstr "त्रुटी: 'dev' आदेश '%s' वैध नाही."
 
-#: ../cli/src/network-manager.c:35
+#: ../cli/src/network-manager.c:37
 msgid "RUNNING"
 msgstr "RUNNING"
 
-#. 1
-#: ../cli/src/network-manager.c:37
+#. 0
+#: ../cli/src/network-manager.c:38
+msgid "VERSION"
+msgstr "VERSION"
+
+#. 2
+#: ../cli/src/network-manager.c:40
+msgid "NET-ENABLED"
+msgstr "NET-ENABLED"
+
+#. 3
+#: ../cli/src/network-manager.c:41
 msgid "WIFI-HARDWARE"
 msgstr "WIFI-HARDWARE"
 
-#. 2
-#: ../cli/src/network-manager.c:38
+#. 4
+#: ../cli/src/network-manager.c:42
 msgid "WIFI"
 msgstr "WIFI"
 
-#. 3
-#: ../cli/src/network-manager.c:39
+#. 5
+#: ../cli/src/network-manager.c:43
 msgid "WWAN-HARDWARE"
 msgstr "WWAN-HARDWARE"
 
-#. 4
-#: ../cli/src/network-manager.c:40
+#. 6
+#: ../cli/src/network-manager.c:44
 msgid "WWAN"
 msgstr "WWAN"
 
-#: ../cli/src/network-manager.c:62
-#, c-format
+#. 7
+#: ../cli/src/network-manager.c:45
+#| msgid "WIFI-HARDWARE"
+msgid "WIMAX-HARDWARE"
+msgstr "WIMAX-HARDWARE"
+
+#. 8
+#: ../cli/src/network-manager.c:46
+msgid "WIMAX"
+msgstr "WIMAX"
+
+#: ../cli/src/network-manager.c:74
+#, c-format
+#| msgid ""
+#| "Usage: nmcli nm { COMMAND | help }\n"
+#| "\n"
+#| "  COMMAND := { status | sleep | wakeup | wifi | wwan }\n"
+#| "\n"
+#| "  status\n"
+#| "  sleep\n"
+#| "  wakeup\n"
+#| "  wifi [on|off]\n"
+#| "  wwan [on|off]\n"
+#| "\n"
 msgid ""
 "Usage: nmcli nm { COMMAND | help }\n"
 "\n"
-"  COMMAND := { status | sleep | wakeup | wifi | wwan }\n"
+"  COMMAND := { status | enable | sleep | wifi | wwan | wimax }\n"
+"\n"
+"  COMMAND := { status | enable | sleep | wifi | wwan }\n"
 "\n"
 "  status\n"
-"  sleep\n"
-"  wakeup\n"
+"  enable [true|false]\n"
+"  sleep [true|false]\n"
 "  wifi [on|off]\n"
 "  wwan [on|off]\n"
+"  wimax [on|off]\n"
 "\n"
 msgstr ""
 "वापर: nmcli nm { COMMAND | help }\n"
 "\n"
-"  COMMAND := { status | sleep | wakeup | wifi | wwan }\n"
+"  COMMAND := { status | enable | sleep | wifi | wwan | wimax }\n"
+"\n"
+"  COMMAND := { status | enable | sleep | wifi | wwan }\n"
 "\n"
 "  status\n"
-"  sleep\n"
-"  wakeup\n"
+"  enable [true|false]\n"
+"  sleep [true|false]\n"
 "  wifi [on|off]\n"
 "  wwan [on|off]\n"
+"  wimax [on|off]\n"
 "\n"
 
-#: ../cli/src/network-manager.c:83
+#: ../cli/src/network-manager.c:103
 msgid "asleep"
 msgstr "अस्लीप्"
 
-#: ../cli/src/network-manager.c:85
+#: ../cli/src/network-manager.c:105
 msgid "connecting"
 msgstr "जोडणी करत आहे"
 
-#: ../cli/src/network-manager.c:125
+#: ../cli/src/network-manager.c:107
+msgid "connected (local only)"
+msgstr "जोडले (फक्त स्थानीय)"
+
+#: ../cli/src/network-manager.c:109
+#| msgid "connected"
+msgid "connected (site only)"
+msgstr "जोडले (फक्त स्थळ)"
+
+#: ../cli/src/network-manager.c:113
+#| msgid "connecting"
+msgid "disconnecting"
+msgstr "जोडणी अशक्य करत आहे"
+
+#: ../cli/src/network-manager.c:153
 #, c-format
 msgid "Error: 'nm status': %s"
 msgstr "त्रुटी: 'nm status': %s"
 
-#: ../cli/src/network-manager.c:127
+#: ../cli/src/network-manager.c:155
 #, c-format
 msgid "Error: 'nm status': %s; allowed fields: %s"
 msgstr "त्रुटी: 'nm status': %s; स्वीकार्य क्षेत्र: %s"
 
-#: ../cli/src/network-manager.c:134
-msgid "NetworkManager status"
-msgstr "NetworkManager स्थिती"
-
-#. Print header
-#: ../cli/src/network-manager.c:140 ../cli/src/network-manager.c:141
-#: ../cli/src/network-manager.c:142 ../cli/src/network-manager.c:143
-#: ../cli/src/network-manager.c:211 ../cli/src/network-manager.c:243
+#. create NMClient
+#: ../cli/src/network-manager.c:168 ../cli/src/network-manager.c:169
+#: ../cli/src/network-manager.c:170 ../cli/src/network-manager.c:171
+#: ../cli/src/network-manager.c:172 ../cli/src/network-manager.c:174
+#: ../cli/src/network-manager.c:175 ../cli/src/network-manager.c:296
+#: ../cli/src/network-manager.c:351 ../cli/src/network-manager.c:389
+#: ../cli/src/network-manager.c:428
 msgid "enabled"
 msgstr "सुरू केले"
 
-#: ../cli/src/network-manager.c:140 ../cli/src/network-manager.c:141
-#: ../cli/src/network-manager.c:142 ../cli/src/network-manager.c:143
-#: ../cli/src/network-manager.c:211 ../cli/src/network-manager.c:243
+#: ../cli/src/network-manager.c:168 ../cli/src/network-manager.c:169
+#: ../cli/src/network-manager.c:170 ../cli/src/network-manager.c:171
+#: ../cli/src/network-manager.c:172 ../cli/src/network-manager.c:174
+#: ../cli/src/network-manager.c:175 ../cli/src/network-manager.c:296
+#: ../cli/src/network-manager.c:351 ../cli/src/network-manager.c:389
+#: ../cli/src/network-manager.c:428
 msgid "disabled"
 msgstr "बंद केले"
 
-#: ../cli/src/network-manager.c:148
+#: ../cli/src/network-manager.c:188
+msgid "NetworkManager status"
+msgstr "NetworkManager स्थिती"
+
+#. Print header
+#: ../cli/src/network-manager.c:191
 msgid "running"
 msgstr "कार्यरत आहे"
 
-#: ../cli/src/network-manager.c:148
+#: ../cli/src/network-manager.c:191
 msgid "not running"
 msgstr "कार्यरत नाही"
 
-#: ../cli/src/network-manager.c:201 ../cli/src/network-manager.c:233
+#: ../cli/src/network-manager.c:222 ../cli/src/utils.c:322
+#, c-format
+#| msgid "Error: could not connect to D-Bus."
+msgid "Error: Couldn't connect to system bus: %s"
+msgstr "त्रुटी: सिस्टम बससह जोडणी करणे अशक्य: %s"
+
+#: ../cli/src/network-manager.c:233
+#, c-format
+#| msgid "Error: could not connect to D-Bus."
+msgid "Error: Couldn't create D-Bus object proxy."
+msgstr "त्रुटी: D-Bus ऑब्जेक्ट प्रॉक्सी निर्माण करणे अशक्य."
+
+#: ../cli/src/network-manager.c:239
+#, c-format
+#| msgid "Error: 'con list': %s"
+msgid "Error in sleep: %s"
+msgstr "sleep मध्ये त्रुटी आढळली: %s"
+
+#: ../cli/src/network-manager.c:283 ../cli/src/network-manager.c:338
+#: ../cli/src/network-manager.c:376 ../cli/src/network-manager.c:415
 #, c-format
 msgid "Error: '--fields' value '%s' is not valid here; allowed fields: %s"
 msgstr "त्रुटी: येथील '--fields' मूल्य '%s' वैध नाही; स्वीकार्य क्षेत्र: %s"
 
-#: ../cli/src/network-manager.c:209
+#: ../cli/src/network-manager.c:291
+#| msgid "WiFi enabled"
+msgid "Networking enabled"
+msgstr "नेटवर्किंग सुरू केले"
+
+#: ../cli/src/network-manager.c:307
+#, c-format
+#| msgid "Error: invalid 'wwan' parameter: '%s'."
+msgid "Error: invalid 'enable' parameter: '%s'; use 'true' or 'false'."
+msgstr "त्रुटी: अवैध 'enable' घटक: '%s'; 'true' किंवा 'false' चा वापर करा."
+
+#: ../cli/src/network-manager.c:317
+#, c-format
+#| msgid "Error: Could not connect to NetworkManager."
+msgid "Error: Sleeping status is not exported by NetworkManager."
+msgstr "त्रुटी: स्लिपिंग स्तर NetworkManager द्वारे एक्सपोर्ट केले जात नाही."
+
+#: ../cli/src/network-manager.c:325
+#, c-format
+#| msgid "Error: invalid 'wifi' parameter: '%s'."
+msgid "Error: invalid 'sleep' parameter: '%s'; use 'true' or 'false'."
+msgstr "त्रुटी: अवैध 'sleep' घटक: '%s'; 'true' किंवा 'false'चा वापर करा."
+
+#: ../cli/src/network-manager.c:346
 msgid "WiFi enabled"
 msgstr "WiFi समर्थीत"
 
-#: ../cli/src/network-manager.c:220
+#: ../cli/src/network-manager.c:362
 #, c-format
 msgid "Error: invalid 'wifi' parameter: '%s'."
 msgstr "त्रुटी: अवैध 'wifi' घटक: '%s'."
 
-#: ../cli/src/network-manager.c:241
+#: ../cli/src/network-manager.c:384
 msgid "WWAN enabled"
 msgstr "WWAN समर्थीत"
 
-#: ../cli/src/network-manager.c:252
+#: ../cli/src/network-manager.c:400
 #, c-format
 msgid "Error: invalid 'wwan' parameter: '%s'."
 msgstr "त्रुटी: अवैध 'wwan' घटक: '%s'."
 
-#: ../cli/src/network-manager.c:263
+#: ../cli/src/network-manager.c:423
+#| msgid "WiFi enabled"
+msgid "WiMAX enabled"
+msgstr "WiMAX समर्थीत"
+
+#: ../cli/src/network-manager.c:439
+#, c-format
+#| msgid "Error: invalid 'wifi' parameter: '%s'."
+msgid "Error: invalid 'wimax' parameter: '%s'."
+msgstr "त्रुटी: अवैध 'wimax' घटक: '%s'."
+
+#: ../cli/src/network-manager.c:452
 #, c-format
 msgid "Error: 'nm' command '%s' is not valid."
 msgstr "त्रुटी: 'nm' आदेश '%s' वैध नाही."
 
-#: ../cli/src/nmcli.c:69
-#, c-format
+#: ../cli/src/nmcli.c:64
+#, c-format
+#| msgid ""
+#| "Usage: %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"
+#| "  -v[ersion]                                 show program version\n"
+#| "  -h[elp]                                    print this help\n"
+#| "\n"
+#| "OBJECT\n"
+#| "  nm          NetworkManager status\n"
+#| "  con         NetworkManager connections\n"
+#| "  dev         devices managed by NetworkManager\n"
+#| "\n"
 msgid ""
 "Usage: %s [OPTIONS] OBJECT { COMMAND | help }\n"
 "\n"
@@ -972,6 +1259,8 @@ msgid ""
 "  -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"
 "  -v[ersion]                                 show program version\n"
 "  -h[elp]                                    print this help\n"
 "\n"
@@ -984,383 +1273,410 @@ msgstr ""
 "वापर: %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"
-"  -v[ersion]                                 show program version\n"
-"  -h[elp]                                    print this help\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 व "
+"NetworkManager आवृत्ती तपासू नका\n"
+"  -v[ersion]                                 कार्यक्रमाची आवृत्ती दाखवा\n"
+"  -h[elp]                                    या मदतची छपाई करा\n"
 "\n"
 "OBJECT\n"
-"  nm          NetworkManager status\n"
-"  con         NetworkManager connections\n"
-"  dev         devices managed by NetworkManager\n"
+"  nm          NetworkManager स्थिती\n"
+"  con         NetworkManager जोडणी\n"
+"  dev         NetworkManager द्वारे व्यवस्थापीत साधने\n"
 "\n"
 
-#: ../cli/src/nmcli.c:113
+#: ../cli/src/nmcli.c:109
 #, c-format
 msgid "Error: Object '%s' is unknown, try 'nmcli help'."
 msgstr "त्रुटी: घटक '%s' अपरिचीत आहे, 'nmcli help' वापरून पहा."
 
-#: ../cli/src/nmcli.c:143
+#: ../cli/src/nmcli.c:139
 #, c-format
 msgid "Error: Option '--terse' is specified the second time."
 msgstr "त्रुटी: पर्याय '--terse' दुसऱ्यावेळी निर्देशीत केले."
 
-#: ../cli/src/nmcli.c:148
+#: ../cli/src/nmcli.c:144
 #, c-format
 msgid "Error: Option '--terse' is mutually exclusive with '--pretty'."
 msgstr "त्रुटी: '--pretty' च्या तुलनेत पर्याय '--terse' वेगळे आहे."
 
-#: ../cli/src/nmcli.c:156
+#: ../cli/src/nmcli.c:152
 #, c-format
 msgid "Error: Option '--pretty' is specified the second time."
 msgstr "त्रुटी: पर्याय '--pretty' दुसऱ्यावेळी निर्देशीत केले."
 
-#: ../cli/src/nmcli.c:161
+#: ../cli/src/nmcli.c:157
 #, c-format
 msgid "Error: Option '--pretty' is mutually exclusive with '--terse'."
 msgstr "त्रुटी: '--terse' च्या तुलनेत पर्याय '--pretty' वेगळे आहे."
 
-#: ../cli/src/nmcli.c:171 ../cli/src/nmcli.c:187
+#: ../cli/src/nmcli.c:167 ../cli/src/nmcli.c:183
 #, c-format
 msgid "Error: missing argument for '%s' option."
 msgstr "त्रुटी: '%s' पर्यायकरीता न आढळलेले घटक."
 
-#: ../cli/src/nmcli.c:180 ../cli/src/nmcli.c:196
+#: ../cli/src/nmcli.c:176 ../cli/src/nmcli.c:192
 #, c-format
 msgid "Error: '%s' is not valid argument for '%s' option."
 msgstr "त्रुटी: '%s' पर्यायकरीता '%s' वैध घटक नाही."
 
-#: ../cli/src/nmcli.c:203
+#: ../cli/src/nmcli.c:199
 #, c-format
 msgid "Error: fields for '%s' options are missing."
 msgstr "त्रुटी: '%s' पर्यायकरीता क्षेत्र आढळले नाही."
 
-#: ../cli/src/nmcli.c:209
+#: ../cli/src/nmcli.c:207
 #, c-format
 msgid "nmcli tool, version %s\n"
-msgstr "nmcli साधण, आवृत्ती %s\n"
+msgstr "nmcli साधन, आवृत्ती %s\n"
 
-#: ../cli/src/nmcli.c:215
+#: ../cli/src/nmcli.c:213
 #, c-format
 msgid "Error: Option '%s' is unknown, try 'nmcli -help'."
 msgstr "त्रुटी: पर्याय '%s' अपरिचीत आहे, 'nmcli -help' वापरून पहा."
 
-#: ../cli/src/nmcli.c:234
+#: ../cli/src/nmcli.c:232
 #, c-format
 msgid "Caught signal %d, shutting down..."
 msgstr "संकेत %d प्राप्त झाले, बंद करत आहे..."
 
-#: ../cli/src/nmcli.c:259
-#, c-format
-msgid "Error: Could not connect to NetworkManager."
-msgstr "त्रुटी: NetworkManager सह जोडणी करण्यास अशक्य."
+#: ../cli/src/nmcli.c:257
+#| msgid "Error: Could not get user settings."
+msgid "Error: Could not create NMClient object."
+msgstr "त्रुटी: NMClient ऑब्जेक्ट निर्माण करणे अशक्य."
 
-#: ../cli/src/nmcli.c:275
+#: ../cli/src/nmcli.c:273
 msgid "Success"
 msgstr "यश"
 
-#: ../cli/src/settings.c:411
+#: ../cli/src/settings.c:423
 #, c-format
 msgid "%d (hex-ascii-key)"
 msgstr "%d (hex-ascii-key)"
 
-#: ../cli/src/settings.c:413
+#: ../cli/src/settings.c:425
 #, c-format
 msgid "%d (104/128-bit passphrase)"
 msgstr "%d (104/128-बीट पासफ्रेज)"
 
-#: ../cli/src/settings.c:416
+#: ../cli/src/settings.c:428
 #, c-format
 msgid "%d (unknown)"
 msgstr "%d (अपरिचीत)"
 
-#: ../cli/src/settings.c:442
+#: ../cli/src/settings.c:454
 msgid "0 (unknown)"
 msgstr "0 (अपरिचीत)"
 
-#: ../cli/src/settings.c:448
+#: ../cli/src/settings.c:460
 msgid "any, "
 msgstr "कुठलेही, "
 
-#: ../cli/src/settings.c:450
+#: ../cli/src/settings.c:462
 msgid "900 MHz, "
 msgstr "900 MHz, "
 
-#: ../cli/src/settings.c:452
+#: ../cli/src/settings.c:464
 msgid "1800 MHz, "
 msgstr "1800 MHz, "
 
-#: ../cli/src/settings.c:454
+#: ../cli/src/settings.c:466
 msgid "1900 MHz, "
 msgstr "1900 MHz, "
 
-#: ../cli/src/settings.c:456
+#: ../cli/src/settings.c:468
 msgid "850 MHz, "
 msgstr "850 MHz, "
 
-#: ../cli/src/settings.c:458
+#: ../cli/src/settings.c:470
 msgid "WCDMA 3GPP UMTS 2100 MHz, "
 msgstr "WCDMA 3GPP UMTS 2100 MHz, "
 
-#: ../cli/src/settings.c:460
+#: ../cli/src/settings.c:472
 msgid "WCDMA 3GPP UMTS 1800 MHz, "
 msgstr "WCDMA 3GPP UMTS 1800 MHz, "
 
-#: ../cli/src/settings.c:462
+#: ../cli/src/settings.c:474
 msgid "WCDMA 3GPP UMTS 1700/2100 MHz, "
 msgstr "WCDMA 3GPP UMTS 1700/2100 MHz, "
 
-#: ../cli/src/settings.c:464
+#: ../cli/src/settings.c:476
 msgid "WCDMA 3GPP UMTS 800 MHz, "
 msgstr "WCDMA 3GPP UMTS 800 MHz, "
 
-#: ../cli/src/settings.c:466
+#: ../cli/src/settings.c:478
 msgid "WCDMA 3GPP UMTS 850 MHz, "
 msgstr "WCDMA 3GPP UMTS 850 MHz, "
 
-#: ../cli/src/settings.c:468
+#: ../cli/src/settings.c:480
 msgid "WCDMA 3GPP UMTS 900 MHz, "
 msgstr "WCDMA 3GPP UMTS 900 MHz, "
 
-#: ../cli/src/settings.c:470
+#: ../cli/src/settings.c:482
 msgid "WCDMA 3GPP UMTS 1700 MHz, "
 msgstr "WCDMA 3GPP UMTS 1700 MHz, "
 
-#: ../cli/src/settings.c:554 ../cli/src/settings.c:721
+#: ../cli/src/settings.c:566 ../cli/src/settings.c:732
 msgid "auto"
 msgstr "स्वयं"
 
-#: ../cli/src/settings.c:716 ../cli/src/settings.c:719
-#: ../cli/src/settings.c:720 ../cli/src/utils.c:172
+#: ../cli/src/settings.c:727 ../cli/src/settings.c:730
+#: ../cli/src/settings.c:731 ../cli/src/utils.c:176
 msgid "not set"
 msgstr "सेट केले नाही"
 
-#: ../cli/src/utils.c:124
+#: ../cli/src/utils.c:128
 #, c-format
 msgid "field '%s' has to be alone"
 msgstr "क्षेत्र '%s' वेगळे असायला हवे"
 
-#: ../cli/src/utils.c:127
+#: ../cli/src/utils.c:131
 #, c-format
 msgid "invalid field '%s'"
 msgstr "अवैध क्षेत्र '%s'"
 
-#: ../cli/src/utils.c:146
+#: ../cli/src/utils.c:150
 #, c-format
 msgid "Option '--terse' requires specifying '--fields'"
 msgstr "पर्याय '--terse' यांस '--fields' निर्देशीत करणे आवश्यक आहे"
 
-#: ../cli/src/utils.c:150
+#: ../cli/src/utils.c:154
 #, c-format
 msgid "Option '--terse' requires specific '--fields' option values , not '%s'"
 msgstr "पर्याय '--terse' यांस '--fields' पर्याय मूल्ये निर्देशीत करणे आवश्यक आहे , '%s' नाही"
 
-#: ../libnm-util/crypto.c:120
+#: ../cli/src/utils.c:333
+#, c-format
+msgid "Error: Couldn't create D-Bus object proxy for org.freedesktop.DBus"
+msgstr "त्रुटी: org.freedesktop.DBus करीता D-Bus ऑब्जेक्ट प्रॉक्सी निर्माण करणे अशक्य"
+
+#: ../cli/src/utils.c:341
+#, c-format
+msgid "Error: NameHasOwner request failed: %s"
+msgstr "त्रुटी: NameHasOwner विनंती अपयशी: %s"
+
+#: ../cli/src/utils.c:386
+#, 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"
+
+#: ../cli/src/utils.c:395
+#, 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 याचा वापर करा, परंतु परिणाम वर्तवणेजोगी नाही."
+
+#: ../libnm-util/crypto.c:127
 #, c-format
 msgid "PEM key file had no end tag '%s'."
 msgstr "PEM कि फाइल अंतर्गत समाप्त टॅघ '%s' आढळले नाही."
 
-#: ../libnm-util/crypto.c:130
+#: ../libnm-util/crypto.c:140
 #, c-format
 msgid "Doesn't look like a PEM private key file."
 msgstr "PEM वैयक्तिक कि फाइल नुरूप आढळले नाही."
 
-#: ../libnm-util/crypto.c:138
+#: ../libnm-util/crypto.c:148
 #, c-format
 msgid "Not enough memory to store PEM file data."
 msgstr "PEM फाइल माहिती साठवण्याकरीता स्मृती शिल्लक नाही."
 
-#: ../libnm-util/crypto.c:154
+#: ../libnm-util/crypto.c:164
 #, c-format
 msgid "Malformed PEM file: Proc-Type was not first tag."
 msgstr "सदोषीत PEM फाइल: Proc-Type प्रथम टॅग नव्हते."
 
-#: ../libnm-util/crypto.c:162
+#: ../libnm-util/crypto.c:172
 #, c-format
 msgid "Malformed PEM file: unknown Proc-Type tag '%s'."
 msgstr "सदोषीत PEM फाइल: अपरिचीत Proc-Type टॅग '%s'."
 
-#: ../libnm-util/crypto.c:172
+#: ../libnm-util/crypto.c:182
 #, c-format
 msgid "Malformed PEM file: DEK-Info was not the second tag."
 msgstr "सदोषीत PEM फाइल: DEK-Info दूसरे टॅग नव्हते."
 
-#: ../libnm-util/crypto.c:183
+#: ../libnm-util/crypto.c:193
 #, c-format
 msgid "Malformed PEM file: no IV found in DEK-Info tag."
 msgstr "सदोषीत PEM फाइल: DEK-Info टॅग अंतर्गत IV आढळले नाही."
 
-#: ../libnm-util/crypto.c:190
+#: ../libnm-util/crypto.c:200
 #, c-format
 msgid "Malformed PEM file: invalid format of IV in DEK-Info tag."
 msgstr "सदोषीत PEM फाइल:DEK-Info टॅग अंतर्गत IV चे अवैध स्वरूप आढळे."
 
-#: ../libnm-util/crypto.c:203
+#: ../libnm-util/crypto.c:213
 #, c-format
 msgid "Malformed PEM file: unknown private key cipher '%s'."
 msgstr "सदोषीत PEM फाइल: अपरिचीत वैयक्तिक सीफर कि '%s'."
 
-#: ../libnm-util/crypto.c:222
+#: ../libnm-util/crypto.c:232
 #, c-format
 msgid "Could not decode private key."
 msgstr "वैयक्तिक कि डिकोड करू शकले नाही."
 
-#: ../libnm-util/crypto.c:267
-#, c-format
-msgid "PEM certificate '%s' had no end tag '%s'."
-msgstr "PEM प्रमाणपत्र '%s' had no end tag '%s'."
-
-#: ../libnm-util/crypto.c:277
-#, c-format
-msgid "Failed to decode certificate."
-msgstr "प्रमाणपत्र डिकोड करण्यास अपयशी."
-
-#: ../libnm-util/crypto.c:286
+#: ../libnm-util/crypto.c:268 ../libnm-util/crypto.c:554
 #, c-format
 msgid "Not enough memory to store certificate data."
 msgstr "प्रमाणपत्र माहिती साठवण्याकरीता स्मृती शिल्लक नाही."
 
 #: ../libnm-util/crypto.c:294
 #, c-format
-msgid "Not enough memory to store file data."
-msgstr "फाइल माहिती साठवण्याकरीता स्मृती शिल्लक नाही."
-
-#: ../libnm-util/crypto.c:324
-#, c-format
 msgid "IV must be an even number of bytes in length."
 msgstr "IV ची लांबी सम बाईटस् ची संख्या असायला हवी."
 
-#: ../libnm-util/crypto.c:333
+#: ../libnm-util/crypto.c:303
 #, c-format
 msgid "Not enough memory to store the IV."
 msgstr "IV साठवण्याकरीता स्मृती शिल्ल्क नाही."
 
-#: ../libnm-util/crypto.c:344
+#: ../libnm-util/crypto.c:314
 #, c-format
 msgid "IV contains non-hexadecimal digits."
 msgstr "IV अंतर्गत non-hexadecimal अंक."
 
-#: ../libnm-util/crypto.c:382 ../libnm-util/crypto_gnutls.c:148
-#: ../libnm-util/crypto_gnutls.c:266 ../libnm-util/crypto_nss.c:171
+#: ../libnm-util/crypto.c:352 ../libnm-util/crypto_gnutls.c:149
+#: ../libnm-util/crypto_gnutls.c:267 ../libnm-util/crypto_nss.c:171
 #: ../libnm-util/crypto_nss.c:336
 #, c-format
 msgid "Private key cipher '%s' was unknown."
 msgstr "वैयक्तिक कि सिफर '%s' अपरिचीत नुरूप आढळले."
 
-#: ../libnm-util/crypto.c:391
+#: ../libnm-util/crypto.c:361
 #, c-format
 msgid "Not enough memory to decrypt private key."
 msgstr "फाइल माहिती साठवण्याकरीता स्मृती शिल्लक नाही."
 
-#: ../libnm-util/crypto.c:511
+#: ../libnm-util/crypto.c:426
+#, c-format
+msgid "Not enough memory to store decrypted private key."
+msgstr "जुणी वैयक्तिक कि साठवण्याकरीता स्मृती शिल्ल्क नाही."
+
+#: ../libnm-util/crypto.c:471
 #, c-format
 msgid "Unable to determine private key type."
 msgstr "वैयक्तिक कि प्रकार ओळखणे अशक्य."
 
-#: ../libnm-util/crypto.c:530
+#: ../libnm-util/crypto.c:526
 #, c-format
-msgid "Not enough memory to store decrypted private key."
-msgstr "जुणी वैयक्तिक कि साठवण्याकरीता स्मृती शिल्ल्क नाही."
+#| msgid "PEM certificate '%s' had no end tag '%s'."
+msgid "PEM certificate had no start tag '%s'."
+msgstr "PEM प्रमाणपत्रात सुरवात टॅग '%s' आढळले नाही."
 
-#: ../libnm-util/crypto_gnutls.c:49
+#: ../libnm-util/crypto.c:535
+#, c-format
+#| msgid "PEM certificate '%s' had no end tag '%s'."
+msgid "PEM certificate had no end tag '%s'."
+msgstr "PEM प्रमाणपत्रात समाप्त टॅग '%s' आढळले नाही."
+
+#: ../libnm-util/crypto.c:559
+#, c-format
+msgid "Failed to decode certificate."
+msgstr "प्रमाणपत्र डिकोड करण्यास अपयशी."
+
+#: ../libnm-util/crypto_gnutls.c:50
 msgid "Failed to initialize the crypto engine."
 msgstr "क्रिप्टो इंजीन प्रारंभ करण्यास अपयशी."
 
-#: ../libnm-util/crypto_gnutls.c:93
+#: ../libnm-util/crypto_gnutls.c:94
 #, c-format
 msgid "Failed to initialize the MD5 engine: %s / %s."
 msgstr "MD5 इंजीन प्रारंभ करण्यास अपयशी: %s / %s."
 
-#: ../libnm-util/crypto_gnutls.c:156
+#: ../libnm-util/crypto_gnutls.c:157
 #, c-format
 msgid "Invalid IV length (must be at least %zd)."
 msgstr "अवैध IV लांबी (किमान %zd असायला हवे)."
 
-#: ../libnm-util/crypto_gnutls.c:165 ../libnm-util/crypto_nss.c:188
+#: ../libnm-util/crypto_gnutls.c:166 ../libnm-util/crypto_nss.c:188
 #, c-format
 msgid "Not enough memory for decrypted key buffer."
 msgstr "जुणे कि बफर करीता स्मृती शिल्लक नाही."
 
-#: ../libnm-util/crypto_gnutls.c:173
+#: ../libnm-util/crypto_gnutls.c:174
 #, c-format
 msgid "Failed to initialize the decryption cipher context: %s / %s."
 msgstr "डिक्रीपशन सिफर संदर्भ प्रारंभ करण्यास अपयशी: %s / %s."
 
-#: ../libnm-util/crypto_gnutls.c:182
+#: ../libnm-util/crypto_gnutls.c:183
 #, c-format
 msgid "Failed to set symmetric key for decryption: %s / %s."
 msgstr "डिक्रीपशन करीता सम कि निश्चित करण्यास अपयशी: %s / %s."
 
-#: ../libnm-util/crypto_gnutls.c:191
+#: ../libnm-util/crypto_gnutls.c:192
 #, c-format
 msgid "Failed to set IV for decryption: %s / %s."
 msgstr "डिक्रीपशन करीता IV निश्चित करण्यास अपयशी: %s / %s."
 
-#: ../libnm-util/crypto_gnutls.c:200
+#: ../libnm-util/crypto_gnutls.c:201
 #, c-format
 msgid "Failed to decrypt the private key: %s / %s."
 msgstr "वैयक्तिक कि डिक्रीप्ट करण्यास अपयशी: %s / %s."
 
-#: ../libnm-util/crypto_gnutls.c:210 ../libnm-util/crypto_nss.c:267
+#: ../libnm-util/crypto_gnutls.c:211 ../libnm-util/crypto_nss.c:267
 #, c-format
 msgid "Failed to decrypt the private key: unexpected padding length."
 msgstr "प्राइव्हेट कि डिक्रीप्ट करणे अशक्य: अनपेक्षीत पॅडींग लांबी."
 
-#: ../libnm-util/crypto_gnutls.c:221 ../libnm-util/crypto_nss.c:278
+#: ../libnm-util/crypto_gnutls.c:222 ../libnm-util/crypto_nss.c:278
 #, c-format
 msgid "Failed to decrypt the private key."
 msgstr "वैयक्तिक कि डिक्रीप्ट करण्यास अपयशी."
 
-#: ../libnm-util/crypto_gnutls.c:286 ../libnm-util/crypto_nss.c:356
+#: ../libnm-util/crypto_gnutls.c:287 ../libnm-util/crypto_nss.c:356
 #, c-format
 msgid "Could not allocate memory for encrypting."
 msgstr "एनक्रिप्टींग करीता मेमरीचे वाटप करणे अशक्य."
 
-#: ../libnm-util/crypto_gnutls.c:294
+#: ../libnm-util/crypto_gnutls.c:295
 #, c-format
 msgid "Failed to initialize the encryption cipher context: %s / %s."
 msgstr "एनक्रिप्शन सीफर संदर्भ सुरू करण्यास अपयशी: %s / %s."
 
-#: ../libnm-util/crypto_gnutls.c:303
+#: ../libnm-util/crypto_gnutls.c:304
 #, c-format
 msgid "Failed to set symmetric key for encryption: %s / %s."
 msgstr "एनक्रिप्शनकरीता सम कि सेट करण्यास अपयशी: %s / %s."
 
-#: ../libnm-util/crypto_gnutls.c:313
+#: ../libnm-util/crypto_gnutls.c:314
 #, c-format
 msgid "Failed to set IV for encryption: %s / %s."
 msgstr "एनक्रिप्शन करीता IV सेट करण्यास अपयशी: %s / %s."
 
-#: ../libnm-util/crypto_gnutls.c:322
+#: ../libnm-util/crypto_gnutls.c:323
 #, c-format
 msgid "Failed to encrypt the data: %s / %s."
 msgstr "डिक्रीप्ट करण्यास अपयशी: %s / %s."
 
-#: ../libnm-util/crypto_gnutls.c:362
+#: ../libnm-util/crypto_gnutls.c:363
 #, c-format
 msgid "Error initializing certificate data: %s"
 msgstr "प्रमाण माहिती प्रारंभ करण्यास त्रुटी: %s"
 
-#: ../libnm-util/crypto_gnutls.c:384
+#: ../libnm-util/crypto_gnutls.c:385
 #, c-format
 msgid "Couldn't decode certificate: %s"
 msgstr "प्रमाणपत्र डिकोड करण्यास अशक्य: %s"
 
-#: ../libnm-util/crypto_gnutls.c:408
+#: ../libnm-util/crypto_gnutls.c:409
 #, c-format
 msgid "Couldn't initialize PKCS#12 decoder: %s"
 msgstr "PKCS#12 डिकोडर प्रारंभ करण्यास अशक्य: %s"
 
-#: ../libnm-util/crypto_gnutls.c:421
+#: ../libnm-util/crypto_gnutls.c:422
 #, c-format
 msgid "Couldn't decode PKCS#12 file: %s"
 msgstr "PKCS#12 फाइल डिकोड करण्यास अपयशी: %s"
 
-#: ../libnm-util/crypto_gnutls.c:433
+#: ../libnm-util/crypto_gnutls.c:434
 #, c-format
 msgid "Couldn't verify PKCS#12 file: %s"
 msgstr "PKCS#12 फाइल तपासण्यास अशक्य: %s"
@@ -1474,169 +1790,142 @@ msgstr "PKCS#12 फाइल तपास करण्यास अशक्य:
 msgid "Could not generate random data."
 msgstr "विनाक्रम डाटा निर्माण करणे अशक्य."
 
-#: ../libnm-util/nm-utils.c:1925
+#: ../libnm-util/nm-utils.c:1989
 #, c-format
 msgid "Not enough memory to make encryption key."
 msgstr "एनक्रिप्शन कि निर्माण करण्यास अतिरीक्त मेमरी आढळली नाही."
 
-#: ../libnm-util/nm-utils.c:2035
+#: ../libnm-util/nm-utils.c:2099
 msgid "Could not allocate memory for PEM file creation."
 msgstr "PEM फाइल निर्माणकरीता मेमरीचे वाटप करणे अशक्य."
 
-#: ../libnm-util/nm-utils.c:2047
+#: ../libnm-util/nm-utils.c:2111
 #, c-format
 msgid "Could not allocate memory for writing IV to PEM file."
 msgstr "IV ला PEM फाइलवर लिहण्यासाठी मेमरीचे वाटप करणे अशक्य."
 
-#: ../libnm-util/nm-utils.c:2059
+#: ../libnm-util/nm-utils.c:2123
 #, c-format
 msgid "Could not allocate memory for writing encrypted key to PEM file."
 msgstr "एनक्रिप्टेड किला PEM फाइलवर लिहण्यासाठी मेमरीचे वाटप करणे अशक्य."
 
-#: ../libnm-util/nm-utils.c:2078
+#: ../libnm-util/nm-utils.c:2142
 #, c-format
 msgid "Could not allocate memory for PEM file data."
 msgstr "PEM फाइल डाटाकरीता मेमरीचे वाटप करणे अशक्य."
 
-#: ../policy/org.freedesktop.network-manager-settings.system.policy.in.h:1
-msgid "Connection sharing via a protected WiFi network"
-msgstr "सुरक्षीत WiFi नेटवर्क द्वारे जोडणीचे शेअरींग करा"
-
-#: ../policy/org.freedesktop.network-manager-settings.system.policy.in.h:2
-msgid "Connection sharing via an open WiFi network"
-msgstr "ओपन WiFi नेटवर्क द्वारे कनेक्शन शेअरींग करा"
-
-#: ../policy/org.freedesktop.network-manager-settings.system.policy.in.h:3
-msgid "Modify persistent system hostname"
-msgstr "पर्सिस्टंट प्रणाली यजमाननाव संपादीत करा"
-
-#: ../policy/org.freedesktop.network-manager-settings.system.policy.in.h:4
-msgid "Modify system connections"
-msgstr "प्रणाली जुळवणी संपादीत करा"
-
-#: ../policy/org.freedesktop.network-manager-settings.system.policy.in.h:5
-msgid "System policy prevents modification of system settings"
-msgstr "प्रणाली करार, प्रणाली संयोजना संपादीत करण्यापासून रोखतो"
-
-#: ../policy/org.freedesktop.network-manager-settings.system.policy.in.h:6
-msgid "System policy prevents modification of the persistent system hostname"
-msgstr "प्रणाली करार पर्सिस्टंट प्रणाली यजमाननावाचे संपादन रोखत आहे"
-
-#: ../policy/org.freedesktop.network-manager-settings.system.policy.in.h:7
-msgid "System policy prevents sharing connections via a protected WiFi network"
-msgstr "प्रणाली करार सुरक्षीत WiFi नेटवर्क द्वारे जोडणीचे शेअरींग रोखत आहे"
-
-#: ../policy/org.freedesktop.network-manager-settings.system.policy.in.h:8
-msgid "System policy prevents sharing connections via an open WiFi network"
-msgstr "प्रणाली करार ओपन WiFi नेटवर्क द्वारे जोडणीचे शेअरींग रोखत आहे"
-
 #: ../policy/org.freedesktop.NetworkManager.policy.in.h:1
 msgid "Allow control of network connections"
 msgstr "नेटवर्क जोडणींचे नियंत्रण स्वीकारा"
 
 #: ../policy/org.freedesktop.NetworkManager.policy.in.h:2
-msgid "Allow use of user-specific connections"
-msgstr "वापरकर्ता-निर्देशीत जोडणींचा वापर स्वीकारा"
+msgid "Connection sharing via a protected WiFi network"
+msgstr "सुरक्षीत WiFi नेटवर्क द्वारे जोडणीचे शेअरींग करा"
 
 #: ../policy/org.freedesktop.NetworkManager.policy.in.h:3
+msgid "Connection sharing via an open WiFi network"
+msgstr "ओपन WiFi नेटवर्क द्वारे कनेक्शन शेअरींग करा"
+
+#: ../policy/org.freedesktop.NetworkManager.policy.in.h:4
 msgid "Enable or disable WiFi devices"
 msgstr "WiFi साधने सुरू किंवा बंद करा"
 
-#: ../policy/org.freedesktop.NetworkManager.policy.in.h:4
+#: ../policy/org.freedesktop.NetworkManager.policy.in.h:5
+#| msgid "Enable or disable mobile broadband devices"
+msgid "Enable or disable WiMAX mobile broadband devices"
+msgstr "WiMAX मोबाईल ब्रॉडबँड साधने सुरू किंवा बंद करा"
+
+#: ../policy/org.freedesktop.NetworkManager.policy.in.h:6
 msgid "Enable or disable mobile broadband devices"
 msgstr "मोबाईल ब्रॉडबँड साधने सुरू किंवा बंद करा"
 
-#: ../policy/org.freedesktop.NetworkManager.policy.in.h:5
+#: ../policy/org.freedesktop.NetworkManager.policy.in.h:7
 msgid "Enable or disable system networking"
 msgstr "प्रणाली नेटवर्किंग सुरू किंवा बंद करा"
 
-#: ../policy/org.freedesktop.NetworkManager.policy.in.h:6
+#: ../policy/org.freedesktop.NetworkManager.policy.in.h:8
+#| msgid "Modify system connections"
+msgid "Modify network connections for all users"
+msgstr "सर्व वापरकर्त्यांकरीता नेटवर्क जोडणी संपादित करा"
+
+#: ../policy/org.freedesktop.NetworkManager.policy.in.h:9
+msgid "Modify persistent system hostname"
+msgstr "पर्सिस्टंट प्रणाली यजमाननाव संपादीत करा"
+
+#: ../policy/org.freedesktop.NetworkManager.policy.in.h:10
+#| msgid "Allow control of network connections"
+msgid "Modify personal network connections"
+msgstr "वैयक्तिक नेटवर्क जोडणी संपादित करा"
+
+#: ../policy/org.freedesktop.NetworkManager.policy.in.h:11
 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.h:7
+#: ../policy/org.freedesktop.NetworkManager.policy.in.h:12
 msgid "System policy prevents control of network connections"
 msgstr "प्रणाली करार नेटवर्क जोडणीचे नियंत्रण रोखते"
 
-#: ../policy/org.freedesktop.NetworkManager.policy.in.h:8
+#: ../policy/org.freedesktop.NetworkManager.policy.in.h:13
 msgid "System policy prevents enabling or disabling WiFi devices"
-msgstr "प्रणाली करार WiFi साधणांना सुरू किंवा बंद होण्यापासून रोखते"
+msgstr "प्रणाली करार WiFi साधनांना सुरू किंवा बंद होण्यापासून रोखते"
 
-#: ../policy/org.freedesktop.NetworkManager.policy.in.h:9
+#: ../policy/org.freedesktop.NetworkManager.policy.in.h:14
+#| msgid ""
+#| "System policy prevents enabling or disabling mobile broadband devices"
+msgid "System policy prevents enabling or disabling WiMAX mobile broadband devices"
+msgstr "प्रणाली करार WiMAX मोबाईल ब्रॉडबँड साधनांना सुरू किंवा बंद होण्यापासून रोखते"
+
+#: ../policy/org.freedesktop.NetworkManager.policy.in.h:15
 msgid "System policy prevents enabling or disabling mobile broadband devices"
-msgstr "प्रणाली करार मोबाईल ब्रॉडबँड साधणांना सुरू किंवा बंद होण्यापासून रोखते"
+msgstr "प्रणाली करार मोबाईल ब्रॉडबँड साधनांना सुरू किंवा बंद होण्यापासून रोखते"
 
-#: ../policy/org.freedesktop.NetworkManager.policy.in.h:10
+#: ../policy/org.freedesktop.NetworkManager.policy.in.h:16
 msgid "System policy prevents enabling or disabling system networking"
 msgstr "प्रणाली करार प्रणाली नेटवर्किंगसा सुरू किंवा बंद होण्यापासून रोखते"
 
-#: ../policy/org.freedesktop.NetworkManager.policy.in.h:11
-msgid "System policy prevents putting NetworkManager to sleep or waking it up"
-msgstr "प्रणाली करार NetworkManager ला स्लीप किंवा वेकअप मध्ये जाण्यापासून रोखते"
-
-#: ../policy/org.freedesktop.NetworkManager.policy.in.h:12
-msgid "System policy prevents use of user-specific connections"
-msgstr "प्रणाली करार वापरकर्ता-निर्देशीत जोडणींचे वापर रोखते"
-
-#: ../src/nm-netlink-monitor.c:100 ../src/nm-netlink-monitor.c:231
-#: ../src/nm-netlink-monitor.c:653
-#, c-format
-msgid "error processing netlink message: %s"
-msgstr "netlink संदेश विश्लेषीत करतेवेळी त्रुटी: %s"
-
-#: ../src/nm-netlink-monitor.c:214
-msgid "error occurred while waiting for data on socket"
-msgstr "सॉकेट वरील माहिती करीता प्रतिक्षा करतेवेळी त्रुटी आढळली"
-
-#: ../src/nm-netlink-monitor.c:254
-#, c-format
-msgid "unable to connect to netlink for monitoring link status: %s"
-msgstr "दुवा स्थिती नियंत्रीत करण्याकरीता netlink शी जुळवणी स्थापीत करणे अशक्य: %s"
+#: ../policy/org.freedesktop.NetworkManager.policy.in.h:17
+#| msgid "System policy prevents modification of system settings"
+msgid "System policy prevents modification of network settings for all users"
+msgstr "प्रणाली करार सर्व वापरकर्त्यांना नेटवर्क सेटिंग्स् संपादीत करण्यापासून रोखते"
 
-#: ../src/nm-netlink-monitor.c:265
-#, c-format
-msgid "unable to enable netlink handle credential passing: %s"
-msgstr "netlink द्वारे परवानगी स्वीकारणे समर्थीत करण्यास अशक्य: %s"
+#: ../policy/org.freedesktop.NetworkManager.policy.in.h:18
+#| msgid "System policy prevents modification of system settings"
+msgid "System policy prevents modification of personal network settings"
+msgstr "प्रणाली करार, व्यक्तिगत नेटवर्क सेटिंग्स् संपादीत करण्यापासून रोखते"
 
-#: ../src/nm-netlink-monitor.c:291 ../src/nm-netlink-monitor.c:353
-#, c-format
-msgid "unable to allocate netlink handle for monitoring link status: %s"
-msgstr "दुवा स्थिती नियंत्रीत करण्याकरीता netlink handle चे वाटप अशक्य: %s"
+#: ../policy/org.freedesktop.NetworkManager.policy.in.h:19
+msgid "System policy prevents modification of the persistent system hostname"
+msgstr "प्रणाली करार पर्सिस्टंट प्रणाली यजमाननावाचे संपादन रोखत आहे"
 
-#: ../src/nm-netlink-monitor.c:376
-#, c-format
-msgid "unable to allocate netlink link cache for monitoring link status: %s"
-msgstr "दुवा स्थिती नियंत्रीत करण्याकरीता netlink दुवा कॅशे वाटप करणे अशक्य: %s"
+#: ../policy/org.freedesktop.NetworkManager.policy.in.h:20
+msgid "System policy prevents putting NetworkManager to sleep or waking it up"
+msgstr "प्रणाली करार NetworkManager ला स्लीप किंवा वेकअप मध्ये जाण्यापासून रोखते"
 
-#: ../src/nm-netlink-monitor.c:502
-#, c-format
-msgid "unable to join netlink group: %s"
-msgstr "netlink गटसह जोडणी करणे अशक्य: %s"
+#: ../policy/org.freedesktop.NetworkManager.policy.in.h:21
+msgid "System policy prevents sharing connections via a protected WiFi network"
+msgstr "प्रणाली करार सुरक्षीत WiFi नेटवर्क द्वारे जोडणीचे शेअरींग रोखत आहे"
 
-#: ../src/nm-netlink-monitor.c:629 ../src/nm-netlink-monitor.c:642
-#, c-format
-msgid "error updating link cache: %s"
-msgstr "दुवा कॅशे अद्ययावत करतेवेळी त्रुटी: %s"
+#: ../policy/org.freedesktop.NetworkManager.policy.in.h:22
+msgid "System policy prevents sharing connections via an open WiFi network"
+msgstr "प्रणाली करार ओपन WiFi नेटवर्क द्वारे जोडणीचे शेअरींग रोखत आहे"
 
-#: ../src/main.c:502
+#: ../src/main.c:519
 #, c-format
 msgid "Invalid option.  Please use --help to see a list of valid options.\n"
 msgstr "अवैध पर्याय.  वैध पर्यायची यादी पहाण्याकरीता कृपया --help वापरा.\n"
 
-#: ../src/main.c:568
+#: ../src/main.c:590
 #, c-format
 msgid "%s.  Please use --help to see a list of valid options.\n"
 msgstr "%s.  वैध पर्यायची सूची पहाण्याकरीता कृपया --help वापरा.\n"
 
-#: ../src/dhcp-manager/nm-dhcp-dhclient.c:325
+#: ../src/dhcp-manager/nm-dhcp-dhclient-utils.c:62
 msgid "# Created by NetworkManager\n"
 msgstr "# NetworkManager द्वारे निर्मीत\n"
 
-#: ../src/dhcp-manager/nm-dhcp-dhclient.c:341
+#: ../src/dhcp-manager/nm-dhcp-dhclient-utils.c:69
 #, c-format
 msgid ""
 "# Merged from %s\n"
@@ -1645,47 +1934,130 @@ msgstr ""
 "# %s पासून एकत्रीत केले\n"
 "\n"
 
-#: ../src/dhcp-manager/nm-dhcp-manager.c:279
+#: ../src/dhcp-manager/nm-dhcp-manager.c:284
 msgid "no usable DHCP client could be found."
 msgstr "वापरण्याजोगी DHCP क्लाएंट आढळले नाही."
 
-#: ../src/dhcp-manager/nm-dhcp-manager.c:288
+#: ../src/dhcp-manager/nm-dhcp-manager.c:293
 msgid "'dhclient' could be found."
 msgstr "'dhclient' आढळले नाही."
 
-#: ../src/dhcp-manager/nm-dhcp-manager.c:298
+#: ../src/dhcp-manager/nm-dhcp-manager.c:303
 msgid "'dhcpcd' could be found."
 msgstr "'dhcpcd' आढळले नाही."
 
-#: ../src/dhcp-manager/nm-dhcp-manager.c:306
+#: ../src/dhcp-manager/nm-dhcp-manager.c:311
 #, c-format
 msgid "unsupported DHCP client '%s'"
 msgstr "असमर्थीत DHCP क्लाएंट '%s'"
 
-#: ../src/logging/nm-logging.c:146
+#: ../src/dns-manager/nm-dns-manager.c:367
+msgid "NOTE: the libc resolver may not support more than 3 nameservers."
+msgstr "NOTE: libc रिजॉलव्हर 3 पेक्षा जास्त नेमसर्व्हर्स् करीता समर्थन पुरवू शकणार नाही."
+
+#: ../src/dns-manager/nm-dns-manager.c:369
+msgid "The nameservers listed below may not be recognized."
+msgstr "खालिल यादीतील नेमसर्व्हर्स् अनोळखी राहतील."
+
+#: ../src/logging/nm-logging.c:149
 #, c-format
 msgid "Unknown log level '%s'"
 msgstr "अपरिचीत लॉग स्तर '%s'"
 
-#: ../src/logging/nm-logging.c:171
+#: ../src/logging/nm-logging.c:174
 #, c-format
 msgid "Unknown log domain '%s'"
 msgstr "अपरिचीत लॉग डोमेन '%s'"
 
-#: ../src/dns-manager/nm-dns-manager.c:350
-msgid "NOTE: the libc resolver may not support more than 3 nameservers."
-msgstr "NOTE: libc रिजॉलव्हर 3 पेक्षा जास्त नेमसर्व्हर्स् करीता समर्थन पुरवू शकणार नाही."
+#: ../src/modem-manager/nm-modem-cdma.c:296 ../src/nm-device-bt.c:355
+#, c-format
+#| msgid "connection failed"
+msgid "CDMA connection %d"
+msgstr "CDMA जोडणी %d"
 
-#: ../src/dns-manager/nm-dns-manager.c:352
-msgid "The nameservers listed below may not be recognized."
-msgstr "खालिल यादीतील नेमसर्व्हर्स् अनोळखी राहतील."
+#: ../src/modem-manager/nm-modem-gsm.c:499 ../src/nm-device-bt.c:351
+#, c-format
+#| msgid "connection failed"
+msgid "GSM connection %d"
+msgstr "GSM जोडणी %d"
+
+#: ../src/nm-device-bt.c:326
+#, c-format
+#| msgid "VPN connection failed"
+msgid "PAN connection %d"
+msgstr "PAN जोडणी %d"
+
+#: ../src/nm-device-bt.c:359
+#, c-format
+#| msgid "VPN connection failed"
+msgid "DUN connection %d"
+msgstr "DUN जोडणी %d"
 
-#: ../src/system-settings/nm-default-wired-connection.c:157
+#: ../src/nm-device-ethernet.c:1681
 #, c-format
-msgid "Auto %s"
-msgstr "स्वयं %s"
+#| msgid "VPN connection failed"
+msgid "PPPoE connection %d"
+msgstr "PPPoE जोडणी %d"
+
+#: ../src/nm-device-ethernet.c:1681 ../src/settings/nm-settings.c:1354
+#, c-format
+#| msgid "Active connections"
+msgid "Wired connection %d"
+msgstr "वायर्ड् जोडणी %d"
+
+#: ../src/nm-device-olpc-mesh.c:423
+#, c-format
+msgid "Mesh %d"
+msgstr "मेशMesh %d"
+
+#: ../src/nm-manager.c:660
+#, c-format
+#| msgid "VPN connection failed"
+msgid "VPN connection %d"
+msgstr "VPN जोडणी %d"
+
+#: ../src/nm-netlink-monitor.c:100 ../src/nm-netlink-monitor.c:231
+#: ../src/nm-netlink-monitor.c:653
+#, c-format
+msgid "error processing netlink message: %s"
+msgstr "netlink संदेश विश्लेषीत करतेवेळी त्रुटी: %s"
+
+#: ../src/nm-netlink-monitor.c:214
+msgid "error occurred while waiting for data on socket"
+msgstr "सॉकेट वरील माहिती करीता प्रतिक्षा करतेवेळी त्रुटी आढळली"
+
+#: ../src/nm-netlink-monitor.c:254
+#, c-format
+msgid "unable to connect to netlink for monitoring link status: %s"
+msgstr "दुवा स्थिती नियंत्रीत करण्याकरीता netlink शी जुळवणी स्थापीत करणे अशक्य: %s"
+
+#: ../src/nm-netlink-monitor.c:265
+#, c-format
+msgid "unable to enable netlink handle credential passing: %s"
+msgstr "netlink द्वारे परवानगी स्वीकारणे समर्थीत करण्यास अशक्य: %s"
+
+#: ../src/nm-netlink-monitor.c:291 ../src/nm-netlink-monitor.c:353
+#, c-format
+msgid "unable to allocate netlink handle for monitoring link status: %s"
+msgstr "दुवा स्थिती नियंत्रीत करण्याकरीता netlink handle चे वाटप अशक्य: %s"
+
+#: ../src/nm-netlink-monitor.c:376
+#, c-format
+msgid "unable to allocate netlink link cache for monitoring link status: %s"
+msgstr "दुवा स्थिती नियंत्रीत करण्याकरीता netlink दुवा कॅशे वाटप करणे अशक्य: %s"
+
+#: ../src/nm-netlink-monitor.c:502
+#, c-format
+msgid "unable to join netlink group: %s"
+msgstr "netlink गटसह जोडणी करणे अशक्य: %s"
+
+#: ../src/nm-netlink-monitor.c:629 ../src/nm-netlink-monitor.c:642
+#, c-format
+msgid "error updating link cache: %s"
+msgstr "दुवा कॅशे अद्ययावत करतेवेळी त्रुटी: %s"
 
-#: ../system-settings/plugins/ifcfg-rh/reader.c:3275
+#: ../src/settings/plugins/ifcfg-rh/reader.c:3464
+#: ../src/settings/plugins/ifnet/connection_parser.c:51
 msgid "System"
 msgstr "प्रणाली"
 
diff --git a/po/or.po b/po/or.po
index bba0d598..32eb1aa1 100644
--- a/po/or.po
+++ b/po/or.po
@@ -1696,7 +1696,7 @@ msgstr "ଟିପ୍ପଣୀ: libc resolver 3 ରୁ ଅଧିକ nameserverଗ
 msgid "The nameservers listed below may not be recognized."
 msgstr "ନିମ୍ନରେ ତାଲିକାଭୁକ୍ତ nameserverଗୁଡ଼ିକୁ ଚିହ୍ନି ହୋଇନପାରେ."
 
-#: ../src/system-settings/nm-default-wired-connection.c:157
+#: ../src/settings/nm-default-wired-connection.c:157
 #, c-format
 msgid "Auto %s"
 msgstr "ସ୍ୱୟଂ %s"
diff --git a/po/pa.po b/po/pa.po
index cf3777a7..87092b0f 100644
--- a/po/pa.po
+++ b/po/pa.po
@@ -1755,7 +1755,7 @@ msgstr "ਨੋਟ: libc ਰਿਜ਼ੋਲਵਰ ੩ ਤੋਂ ਵੱਧ ਨੇ�
 msgid "The nameservers listed below may not be recognized."
 msgstr "ਹੇਠਾਂ ਦਿੱਤੇ ਨੇਮ-ਸਰਵਰ ਪਛਾਣੇ ਨਹੀਂ ਜਾ ਸਕਦੇ।"
 
-#: ../src/system-settings/nm-default-wired-connection.c:157
+#: ../src/settings/nm-default-wired-connection.c:157
 #, c-format
 msgid "Auto %s"
 msgstr "ਆਟੋ %s"
diff --git a/po/pl.po b/po/pl.po
index f1b0650d..ceb85738 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -9,10 +9,10 @@ msgstr ""
 "Project-Id-Version: NetworkManager\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
 "product=NetworkManager&component=general\n"
-"POT-Creation-Date: 2010-09-22 03:25+0000\n"
-"PO-Revision-Date: 2010-09-22 17:43+0200\n"
+"POT-Creation-Date: 2011-03-10 15:25+0000\n"
+"PO-Revision-Date: 2011-03-10 17:07+0100\n"
 "Last-Translator: Piotr Drąg <piotrdrag@gmail.com>\n"
-"Language-Team: Polish <pl@li.org>\n"
+"Language-Team: Polish <gnomepl@aviary.pl>\n"
 "Language: pl\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -22,88 +22,88 @@ msgstr ""
 "X-Poedit-Language: Polish\n"
 "X-Poedit-Country: Poland\n"
 
-#: ../cli/src/connections.c:60 ../cli/src/connections.c:75
-#: ../cli/src/devices.c:88 ../cli/src/devices.c:101 ../cli/src/devices.c:111
-#: ../cli/src/devices.c:121 ../cli/src/devices.c:134 ../cli/src/devices.c:145
-#: ../cli/src/devices.c:156 ../cli/src/devices.c:165 ../cli/src/devices.c:174
+#: ../cli/src/connections.c:62 ../cli/src/connections.c:76
+#: ../cli/src/devices.c:99 ../cli/src/devices.c:112 ../cli/src/devices.c:122
+#: ../cli/src/devices.c:132 ../cli/src/devices.c:146 ../cli/src/devices.c:160
+#: ../cli/src/devices.c:171 ../cli/src/devices.c:182 ../cli/src/devices.c:191
+#: ../cli/src/devices.c:200 ../cli/src/devices.c:222
 msgid "NAME"
 msgstr "NAZWA"
 
 #. 0
-#: ../cli/src/connections.c:61 ../cli/src/connections.c:76
+#: ../cli/src/connections.c:63 ../cli/src/connections.c:77
 msgid "UUID"
 msgstr "UUID"
 
 #. 1
-#: ../cli/src/connections.c:62
+#: ../cli/src/connections.c:64
 msgid "DEVICES"
 msgstr "URZĄDZENIA"
 
 #. 2
-#: ../cli/src/connections.c:63 ../cli/src/connections.c:78
-msgid "SCOPE"
-msgstr "ZAKRES"
-
-#. 3
-#: ../cli/src/connections.c:64
+#: ../cli/src/connections.c:65
 msgid "DEFAULT"
 msgstr "DOMYŚLNE"
 
-#. 4
-#: ../cli/src/connections.c:65
-msgid "DBUS-SERVICE"
-msgstr "USŁUGA-DBUS"
-
-#. 5
+#. 3
 #: ../cli/src/connections.c:66
 msgid "SPEC-OBJECT"
 msgstr "KONKRETNY-OBIEKT"
 
-#. 6
+#. 4
 #: ../cli/src/connections.c:67
 msgid "VPN"
 msgstr "VPN"
 
+#. 5
+#. 6
+#. 2
+#. 11
+#. 5
+#: ../cli/src/connections.c:68 ../cli/src/connections.c:83
+#: ../cli/src/devices.c:67 ../cli/src/devices.c:212 ../cli/src/devices.c:228
+msgid "DBUS-PATH"
+msgstr "ŚCIEŻKA-DO-DBUS"
+
 #. 1
 #. 0
 #. 1
-#: ../cli/src/connections.c:77 ../cli/src/devices.c:62 ../cli/src/devices.c:90
+#. 2
+#: ../cli/src/connections.c:78 ../cli/src/devices.c:65
+#: ../cli/src/devices.c:101 ../cli/src/devices.c:225
 msgid "TYPE"
 msgstr "TYP"
 
-#. 3
+#. 2
 #: ../cli/src/connections.c:79
 msgid "TIMESTAMP"
 msgstr "OKRES-CZASU"
 
-#. 4
+#. 3
 #: ../cli/src/connections.c:80
 msgid "TIMESTAMP-REAL"
 msgstr "RZECZYWISTY-OKRES-CZASU"
 
-#. 5
+#. 4
 #: ../cli/src/connections.c:81
 msgid "AUTOCONNECT"
 msgstr "ŁĄCZENIE-AUTOMATYCZNE"
 
-#. 6
+#. 5
 #: ../cli/src/connections.c:82
 msgid "READONLY"
 msgstr "TYLKO-DO-ODCZYTU"
 
-#. 7
-#: ../cli/src/connections.c:83
-msgid "DBUS-PATH"
-msgstr "ŚCIEŻKA-DO-DBUS"
-
-#: ../cli/src/connections.c:159
+#: ../cli/src/connections.c:166
 #, c-format
 msgid ""
 "Usage: nmcli con { COMMAND | help }\n"
 "  COMMAND := { list | status | up | down }\n"
 "\n"
-"  list [id <id> | uuid <id> | system | user]\n"
+"  list [id <id> | uuid <id>]\n"
 "  status\n"
+"  up id <id> | uuid <id> [iface <iface>] [ap <hwaddr>] [nsp <name>] [--"
+"nowait] [--timeout <timeout>]\n"
 "  up id <id> | uuid <id> [iface <iface>] [ap <hwaddr>] [--nowait] [--timeout "
 "<timeout>]\n"
 "  down id <id> | uuid <id>\n"
@@ -111,751 +111,860 @@ msgstr ""
 "Użycie: nmcli con { POLECENIE | help }\n"
 "  POLECENIE := { list | status | up | down }\n"
 "\n"
-"  list [id <identyfikator> | uuid <identyfikator> | system | user]\n"
+"  list [id <identyfikator> | uuid <identyfikator>]\n"
 "  status\n"
-"  up id <id> | uuid <id> [iface <interfejs>] [ap <adres_sprzętowy>] [--"
-"nowait] [--timeout <czas>]\n"
+"  up id <identyfikator> | uuid <identyfikator> [iface <interfejs>] [ap "
+"<adres_sprzętowy>] [nsp <nazwa>] [--nowait] [--timeout <czas>]\n"
+"  up id <identyfikator> | uuid <identyfikator> [iface <interfejs>] [ap "
+"<adres_sprzętowy>] [--nowait] [--timeout <timeout>]\n"
 "  down id <identyfikator> | uuid <identyfikator>\n"
 
-#: ../cli/src/connections.c:199 ../cli/src/connections.c:540
+#: ../cli/src/connections.c:219 ../cli/src/connections.c:541
 #, c-format
 msgid "Error: 'con list': %s"
 msgstr "Błąd: \"con list\": %s"
 
-#: ../cli/src/connections.c:201 ../cli/src/connections.c:542
+#: ../cli/src/connections.c:221 ../cli/src/connections.c:543
 #, c-format
 msgid "Error: 'con list': %s; allowed fields: %s"
 msgstr "Błąd: \"con list\": %s; dozwolone pola: %s"
 
-#: ../cli/src/connections.c:209
+#: ../cli/src/connections.c:229
 msgid "Connection details"
 msgstr "Szczegóły połączenia"
 
-#: ../cli/src/connections.c:384 ../cli/src/connections.c:605
-msgid "system"
-msgstr "systemowe"
-
-#: ../cli/src/connections.c:384 ../cli/src/connections.c:605
-msgid "user"
-msgstr "użytkownika"
-
-#: ../cli/src/connections.c:386
+#: ../cli/src/connections.c:416
 msgid "never"
 msgstr "nigdy"
 
 #. "CAPABILITIES"
 #. Print header
 #. "WIFI-PROPERTIES"
-#: ../cli/src/connections.c:387 ../cli/src/connections.c:388
-#: ../cli/src/connections.c:606 ../cli/src/connections.c:609
-#: ../cli/src/devices.c:432 ../cli/src/devices.c:557 ../cli/src/devices.c:583
-#: ../cli/src/devices.c:584 ../cli/src/devices.c:585 ../cli/src/devices.c:586
-#: ../cli/src/devices.c:587 ../cli/src/settings.c:508
-#: ../cli/src/settings.c:551 ../cli/src/settings.c:652
-#: ../cli/src/settings.c:926 ../cli/src/settings.c:927
-#: ../cli/src/settings.c:929 ../cli/src/settings.c:931
-#: ../cli/src/settings.c:1056 ../cli/src/settings.c:1057
-#: ../cli/src/settings.c:1058 ../cli/src/settings.c:1137
-#: ../cli/src/settings.c:1138 ../cli/src/settings.c:1139
-#: ../cli/src/settings.c:1140 ../cli/src/settings.c:1141
-#: ../cli/src/settings.c:1142 ../cli/src/settings.c:1143
-#: ../cli/src/settings.c:1144 ../cli/src/settings.c:1145
-#: ../cli/src/settings.c:1146 ../cli/src/settings.c:1147
-#: ../cli/src/settings.c:1148 ../cli/src/settings.c:1149
-#: ../cli/src/settings.c:1224
+#: ../cli/src/connections.c:417 ../cli/src/connections.c:418
+#: ../cli/src/connections.c:596 ../cli/src/connections.c:598
+#: ../cli/src/devices.c:507 ../cli/src/devices.c:560 ../cli/src/devices.c:685
+#: ../cli/src/devices.c:711 ../cli/src/devices.c:712 ../cli/src/devices.c:713
+#: ../cli/src/devices.c:714 ../cli/src/devices.c:715 ../cli/src/settings.c:518
+#: ../cli/src/settings.c:561 ../cli/src/settings.c:661
+#: ../cli/src/settings.c:935 ../cli/src/settings.c:936
+#: ../cli/src/settings.c:938 ../cli/src/settings.c:940
+#: ../cli/src/settings.c:1065 ../cli/src/settings.c:1066
+#: ../cli/src/settings.c:1067 ../cli/src/settings.c:1146
+#: ../cli/src/settings.c:1147 ../cli/src/settings.c:1148
+#: ../cli/src/settings.c:1149 ../cli/src/settings.c:1150
+#: ../cli/src/settings.c:1151 ../cli/src/settings.c:1152
+#: ../cli/src/settings.c:1153 ../cli/src/settings.c:1154
+#: ../cli/src/settings.c:1155 ../cli/src/settings.c:1156
+#: ../cli/src/settings.c:1157 ../cli/src/settings.c:1158
+#: ../cli/src/settings.c:1233
 msgid "yes"
 msgstr "tak"
 
-#: ../cli/src/connections.c:387 ../cli/src/connections.c:388
-#: ../cli/src/connections.c:606 ../cli/src/connections.c:609
-#: ../cli/src/devices.c:432 ../cli/src/devices.c:557 ../cli/src/devices.c:583
-#: ../cli/src/devices.c:584 ../cli/src/devices.c:585 ../cli/src/devices.c:586
-#: ../cli/src/devices.c:587 ../cli/src/settings.c:508
-#: ../cli/src/settings.c:510 ../cli/src/settings.c:551
-#: ../cli/src/settings.c:652 ../cli/src/settings.c:926
-#: ../cli/src/settings.c:927 ../cli/src/settings.c:929
-#: ../cli/src/settings.c:931 ../cli/src/settings.c:1056
-#: ../cli/src/settings.c:1057 ../cli/src/settings.c:1058
-#: ../cli/src/settings.c:1137 ../cli/src/settings.c:1138
-#: ../cli/src/settings.c:1139 ../cli/src/settings.c:1140
-#: ../cli/src/settings.c:1141 ../cli/src/settings.c:1142
-#: ../cli/src/settings.c:1143 ../cli/src/settings.c:1144
-#: ../cli/src/settings.c:1145 ../cli/src/settings.c:1146
-#: ../cli/src/settings.c:1147 ../cli/src/settings.c:1148
-#: ../cli/src/settings.c:1149 ../cli/src/settings.c:1224
+#: ../cli/src/connections.c:417 ../cli/src/connections.c:418
+#: ../cli/src/connections.c:596 ../cli/src/connections.c:598
+#: ../cli/src/devices.c:507 ../cli/src/devices.c:560 ../cli/src/devices.c:685
+#: ../cli/src/devices.c:711 ../cli/src/devices.c:712 ../cli/src/devices.c:713
+#: ../cli/src/devices.c:714 ../cli/src/devices.c:715 ../cli/src/settings.c:518
+#: ../cli/src/settings.c:520 ../cli/src/settings.c:561
+#: ../cli/src/settings.c:661 ../cli/src/settings.c:935
+#: ../cli/src/settings.c:936 ../cli/src/settings.c:938
+#: ../cli/src/settings.c:940 ../cli/src/settings.c:1065
+#: ../cli/src/settings.c:1066 ../cli/src/settings.c:1067
+#: ../cli/src/settings.c:1146 ../cli/src/settings.c:1147
+#: ../cli/src/settings.c:1148 ../cli/src/settings.c:1149
+#: ../cli/src/settings.c:1150 ../cli/src/settings.c:1151
+#: ../cli/src/settings.c:1152 ../cli/src/settings.c:1153
+#: ../cli/src/settings.c:1154 ../cli/src/settings.c:1155
+#: ../cli/src/settings.c:1156 ../cli/src/settings.c:1157
+#: ../cli/src/settings.c:1158 ../cli/src/settings.c:1233
 msgid "no"
 msgstr "nie"
 
-#: ../cli/src/connections.c:461 ../cli/src/connections.c:504
-msgid "System connections"
-msgstr "Połączenia systemowe"
-
-#: ../cli/src/connections.c:466 ../cli/src/connections.c:517
-msgid "User connections"
-msgstr "Połączenia użytkownika"
+#: ../cli/src/connections.c:492
+msgid "Connection list"
+msgstr "Lista połączeń"
 
-#: ../cli/src/connections.c:478 ../cli/src/connections.c:1338
-#: ../cli/src/connections.c:1354 ../cli/src/connections.c:1363
-#: ../cli/src/connections.c:1374 ../cli/src/connections.c:1459
-#: ../cli/src/devices.c:962 ../cli/src/devices.c:972 ../cli/src/devices.c:1074
-#: ../cli/src/devices.c:1081
+#: ../cli/src/connections.c:505 ../cli/src/connections.c:1457
+#: ../cli/src/connections.c:1472 ../cli/src/connections.c:1481
+#: ../cli/src/connections.c:1491 ../cli/src/connections.c:1503
+#: ../cli/src/connections.c:1598 ../cli/src/devices.c:1188
+#: ../cli/src/devices.c:1198 ../cli/src/devices.c:1312
+#: ../cli/src/devices.c:1319 ../cli/src/devices.c:1532
+#: ../cli/src/devices.c:1539
 #, c-format
 msgid "Error: %s argument is missing."
 msgstr "Błąd: brak parametru %s."
 
-#: ../cli/src/connections.c:491
+#: ../cli/src/connections.c:518
 #, c-format
 msgid "Error: %s - no such connection."
 msgstr "Błąd: %s - nie ma takiego połączenia."
 
-#: ../cli/src/connections.c:523 ../cli/src/connections.c:1387
-#: ../cli/src/connections.c:1477 ../cli/src/devices.c:785
-#: ../cli/src/devices.c:852 ../cli/src/devices.c:986 ../cli/src/devices.c:1087
+#: ../cli/src/connections.c:524 ../cli/src/connections.c:1516
+#: ../cli/src/connections.c:1615 ../cli/src/devices.c:985
+#: ../cli/src/devices.c:1065 ../cli/src/devices.c:1212
+#: ../cli/src/devices.c:1325 ../cli/src/devices.c:1545
 #, c-format
 msgid "Unknown parameter: %s\n"
 msgstr "Nieznany parametr: %s\n"
 
-#: ../cli/src/connections.c:532
+#: ../cli/src/connections.c:533
 #, c-format
 msgid "Error: no valid parameter specified."
 msgstr "Błąd: nie podano prawidłowego parametru."
 
-#: ../cli/src/connections.c:547 ../cli/src/connections.c:1580
-#: ../cli/src/devices.c:1293 ../cli/src/network-manager.c:359
+#: ../cli/src/connections.c:548 ../cli/src/connections.c:1706
+#: ../cli/src/devices.c:1753 ../cli/src/network-manager.c:461
 #, c-format
 msgid "Error: %s."
 msgstr "Błąd: %s."
 
-#: ../cli/src/connections.c:653
+#: ../cli/src/connections.c:636
 #, c-format
 msgid "Error: 'con status': %s"
 msgstr "Błąd: \"con status\": %s"
 
-#: ../cli/src/connections.c:655
+#: ../cli/src/connections.c:638
 #, c-format
 msgid "Error: 'con status': %s; allowed fields: %s"
 msgstr "Błąd: \"con status\": %s; dozwolone pola: %s"
 
-#: ../cli/src/connections.c:662
+#: ../cli/src/connections.c:646 ../cli/src/connections.c:1531
+#: ../cli/src/connections.c:1630 ../cli/src/devices.c:1012
+#: ../cli/src/devices.c:1074 ../cli/src/devices.c:1227
+#: ../cli/src/devices.c:1355 ../cli/src/devices.c:1574
+#, c-format
+msgid "Error: Can't find out if NetworkManager is running: %s."
+msgstr ""
+"Błąd: nie można ustalić, czy usługa NetworkManager jest uruchomiona: %s."
+
+#: ../cli/src/connections.c:650 ../cli/src/connections.c:1535
+#: ../cli/src/connections.c:1634 ../cli/src/devices.c:1016
+#: ../cli/src/devices.c:1078 ../cli/src/devices.c:1231
+#: ../cli/src/devices.c:1359 ../cli/src/devices.c:1578
+#, c-format
+msgid "Error: NetworkManager is not running."
+msgstr "Błąd: usługa NetworkManager nie jest uruchomiona."
+
+#: ../cli/src/connections.c:658
 msgid "Active connections"
 msgstr "Aktywne połączenia"
 
-#: ../cli/src/connections.c:1030
+#: ../cli/src/connections.c:1128
 #, c-format
 msgid "no active connection on device '%s'"
 msgstr "brak aktywnych połączeń na urządzeniu \"%s\""
 
-#: ../cli/src/connections.c:1038
+#: ../cli/src/connections.c:1136
 #, c-format
 msgid "no active connection or device"
 msgstr "brak aktywnych połączeń na urządzeń"
 
-#: ../cli/src/connections.c:1088
+#: ../cli/src/connections.c:1207
 #, c-format
 msgid "device '%s' not compatible with connection '%s'"
 msgstr "urządzenie \"%s\" nie jest zgodne z połączeniem \"%s\""
 
-#: ../cli/src/connections.c:1090
+#: ../cli/src/connections.c:1209
 #, c-format
 msgid "no device found for connection '%s'"
 msgstr "nie odnaleziono urządzenia dla połączenia \"%s\""
 
-#: ../cli/src/connections.c:1101
+#: ../cli/src/connections.c:1220
 msgid "activating"
 msgstr "aktywowanie"
 
-#: ../cli/src/connections.c:1103
+#: ../cli/src/connections.c:1222
 msgid "activated"
 msgstr "aktywowano"
 
-#: ../cli/src/connections.c:1106 ../cli/src/connections.c:1129
-#: ../cli/src/connections.c:1162 ../cli/src/devices.c:246
-#: ../cli/src/devices.c:558 ../cli/src/network-manager.c:94
-#: ../cli/src/network-manager.c:149 ../cli/src/settings.c:473
+#: ../cli/src/connections.c:1225 ../cli/src/connections.c:1248
+#: ../cli/src/connections.c:1281 ../cli/src/devices.c:306
+#: ../cli/src/devices.c:686 ../cli/src/network-manager.c:116
+#: ../cli/src/network-manager.c:178 ../cli/src/network-manager.c:181
+#: ../cli/src/network-manager.c:296 ../cli/src/network-manager.c:351
+#: ../cli/src/network-manager.c:389 ../cli/src/network-manager.c:428
+#: ../cli/src/settings.c:483 ../cli/src/utils.c:396
 msgid "unknown"
 msgstr "nieznane"
 
-#: ../cli/src/connections.c:1115
+#: ../cli/src/connections.c:1234
 msgid "VPN connecting (prepare)"
 msgstr "Łączenie z VPN (przygotowanie)"
 
-#: ../cli/src/connections.c:1117
+#: ../cli/src/connections.c:1236
 msgid "VPN connecting (need authentication)"
 msgstr "Łączenie z VPN (wymaga uwierzytelnienia)"
 
-#: ../cli/src/connections.c:1119
+#: ../cli/src/connections.c:1238
 msgid "VPN connecting"
 msgstr "Łączenie z VPN"
 
-#: ../cli/src/connections.c:1121
+#: ../cli/src/connections.c:1240
 msgid "VPN connecting (getting IP configuration)"
 msgstr "Łączenie z VPN (pobieranie konfiguracji adresu IP)"
 
-#: ../cli/src/connections.c:1123
+#: ../cli/src/connections.c:1242
 msgid "VPN connected"
 msgstr "Połączono z VPN"
 
-#: ../cli/src/connections.c:1125
+#: ../cli/src/connections.c:1244
 msgid "VPN connection failed"
 msgstr "Połączenie z VPN się nie powiodło"
 
-#: ../cli/src/connections.c:1127
+#: ../cli/src/connections.c:1246
 msgid "VPN disconnected"
 msgstr "Rozłączono z VPN"
 
-#: ../cli/src/connections.c:1138
+#: ../cli/src/connections.c:1257
 msgid "unknown reason"
 msgstr "nieznany powód"
 
-#: ../cli/src/connections.c:1140
+#: ../cli/src/connections.c:1259
 msgid "none"
 msgstr "brak"
 
-#: ../cli/src/connections.c:1142
+#: ../cli/src/connections.c:1261
 msgid "the user was disconnected"
 msgstr "użytkownik został rozłączony"
 
-#: ../cli/src/connections.c:1144
+#: ../cli/src/connections.c:1263
 msgid "the base network connection was interrupted"
 msgstr "podstawowe połączenie sieciowe zostało przerwane"
 
-#: ../cli/src/connections.c:1146
+#: ../cli/src/connections.c:1265
 msgid "the VPN service stopped unexpectedly"
 msgstr "usługa VPN została nieoczekiwanie zatrzymana"
 
-#: ../cli/src/connections.c:1148
+#: ../cli/src/connections.c:1267
 msgid "the VPN service returned invalid configuration"
 msgstr "usługa VPN zwróciła nieprawidłową konfigurację"
 
-#: ../cli/src/connections.c:1150
+#: ../cli/src/connections.c:1269
 msgid "the connection attempt timed out"
 msgstr "próba połączenia przekroczyła czas oczekiwania"
 
-#: ../cli/src/connections.c:1152
+#: ../cli/src/connections.c:1271
 msgid "the VPN service did not start in time"
 msgstr "usługa VPN nie została uruchomiona w czasie"
 
-#: ../cli/src/connections.c:1154
+#: ../cli/src/connections.c:1273
 msgid "the VPN service failed to start"
 msgstr "uruchomienie usługi VPN się nie powiodło"
 
-#: ../cli/src/connections.c:1156
+#: ../cli/src/connections.c:1275
 msgid "no valid VPN secrets"
 msgstr "brak prawidłowych haseł VPN"
 
-#: ../cli/src/connections.c:1158
+#: ../cli/src/connections.c:1277
 msgid "invalid VPN secrets"
 msgstr "nieprawidłowe hasła VPN"
 
-#: ../cli/src/connections.c:1160
+#: ../cli/src/connections.c:1279
 msgid "the connection was removed"
 msgstr "połączenie zostało usunięte"
 
-#: ../cli/src/connections.c:1174
+#: ../cli/src/connections.c:1293
 #, c-format
 msgid "state: %s\n"
 msgstr "stan: %s\n"
 
-#: ../cli/src/connections.c:1177 ../cli/src/connections.c:1203
+#: ../cli/src/connections.c:1296 ../cli/src/connections.c:1322
 #, c-format
 msgid "Connection activated\n"
 msgstr "Aktywowano połączenie\n"
 
-#: ../cli/src/connections.c:1180
+#: ../cli/src/connections.c:1299
 #, c-format
 msgid "Error: Connection activation failed."
 msgstr "Błąd: aktywacja połączenia się nie powiodła."
 
-#: ../cli/src/connections.c:1199
+#: ../cli/src/connections.c:1318
 #, c-format
 msgid "state: %s (%d)\n"
 msgstr "stan: %s (%d)\n"
 
-#: ../cli/src/connections.c:1209
+#: ../cli/src/connections.c:1328
 #, c-format
 msgid "Error: Connection activation failed: %s."
 msgstr "Błąd: aktywacja połączenia się nie powiodła: %s."
 
-#: ../cli/src/connections.c:1226 ../cli/src/devices.c:909
+#: ../cli/src/connections.c:1345 ../cli/src/devices.c:1134
 #, c-format
 msgid "Error: Timeout %d sec expired."
 msgstr "Błąd: przekroczono czas oczekiwania o %d sekund."
 
-#: ../cli/src/connections.c:1269
+#: ../cli/src/connections.c:1388
 #, c-format
 msgid "Error: Connection activation failed: %s"
 msgstr "Błąd: aktywacja połączenia się nie powiodła: %s"
 
-#: ../cli/src/connections.c:1283
+#: ../cli/src/connections.c:1402
 #, c-format
 msgid "Error: Obtaining active connection for '%s' failed."
 msgstr "Błąd: uzyskanie aktywnego połączenia dla \"%s\" się nie powiodło."
 
-#: ../cli/src/connections.c:1292
+#: ../cli/src/connections.c:1411
 #, c-format
 msgid "Active connection state: %s\n"
 msgstr "Stan aktywnego połączenia: %s\n"
 
-#: ../cli/src/connections.c:1293
+#: ../cli/src/connections.c:1412
 #, c-format
 msgid "Active connection path: %s\n"
 msgstr "Ścieżka aktywnego połączenia: %s\n"
 
-#: ../cli/src/connections.c:1347 ../cli/src/connections.c:1468
+#: ../cli/src/connections.c:1465 ../cli/src/connections.c:1606
 #, c-format
 msgid "Error: Unknown connection: %s."
 msgstr "Błąd: nieznane połączenie: %s."
 
-#: ../cli/src/connections.c:1382 ../cli/src/devices.c:980
+#: ../cli/src/connections.c:1511 ../cli/src/devices.c:1206
 #, c-format
 msgid "Error: timeout value '%s' is not valid."
 msgstr "Błąd: wartość czasu oczekiwania \"%s\" jest nieprawidłowa."
 
-#: ../cli/src/connections.c:1395 ../cli/src/connections.c:1485
+#: ../cli/src/connections.c:1524 ../cli/src/connections.c:1623
 #, c-format
 msgid "Error: id or uuid has to be specified."
 msgstr "Błąd: należy podać identyfikator lub UUID."
 
-#: ../cli/src/connections.c:1415
+#: ../cli/src/connections.c:1554
 #, c-format
 msgid "Error: No suitable device found: %s."
 msgstr "Błąd: nie odnaleziono odpowiedniego urządzenia: %s"
 
-#: ../cli/src/connections.c:1417
+#: ../cli/src/connections.c:1556
 #, c-format
 msgid "Error: No suitable device found."
 msgstr "Błąd: nie odnaleziono odpowiedniego urządzenia."
 
-#: ../cli/src/connections.c:1512
+#: ../cli/src/connections.c:1659
 #, c-format
 msgid "Warning: Connection not active\n"
 msgstr "Ostrzeżenie: połączenie nie jest aktywne\n"
 
-#: ../cli/src/connections.c:1569
+#: ../cli/src/connections.c:1697
 #, c-format
 msgid "Error: 'con' command '%s' is not valid."
 msgstr "Błąd: polecenie \"con\" \"%s\" jest nieprawidłowe."
 
-#: ../cli/src/connections.c:1605
+#: ../cli/src/connections.c:1762
 #, c-format
 msgid "Error: could not connect to D-Bus."
 msgstr "Błąd: nie można połączyć się z D-Bus."
 
-#: ../cli/src/connections.c:1612
+#: ../cli/src/connections.c:1769
 #, c-format
 msgid "Error: Could not get system settings."
 msgstr "Błąd: nie można uzyskać ustawień systemu."
 
-#: ../cli/src/connections.c:1620
-#, c-format
-msgid "Error: Could not get user settings."
-msgstr "Błąd: nie można uzyskać ustawień użytkownika."
-
-#: ../cli/src/connections.c:1630
+#: ../cli/src/connections.c:1779
 #, c-format
-msgid "Error: Can't obtain connections: settings services are not running."
-msgstr "Błąd: nie można uzyskać połączeń: usługi ustawień nie są uruchomione."
+msgid "Error: Can't obtain connections: settings service is not running."
+msgstr ""
+"Błąd: nie można uzyskać połączeń: usługa ustawień nie jest uruchomiona."
 
 #. 0
 #. 9
-#: ../cli/src/devices.c:61 ../cli/src/devices.c:89 ../cli/src/devices.c:184
+#. 3
+#: ../cli/src/devices.c:64 ../cli/src/devices.c:100 ../cli/src/devices.c:210
+#: ../cli/src/devices.c:226
 msgid "DEVICE"
 msgstr "URZĄDZENIE"
 
 #. 1
 #. 4
-#. 0
-#: ../cli/src/devices.c:63 ../cli/src/devices.c:93
-#: ../cli/src/network-manager.c:36
+#. 1
+#: ../cli/src/devices.c:66 ../cli/src/devices.c:104
+#: ../cli/src/network-manager.c:37
 msgid "STATE"
 msgstr "STAN"
 
-#: ../cli/src/devices.c:72
+#: ../cli/src/devices.c:76
 msgid "GENERAL"
 msgstr "OGÓLNE"
 
 #. 0
-#: ../cli/src/devices.c:73
+#: ../cli/src/devices.c:77
 msgid "CAPABILITIES"
 msgstr "MOŻLIWOŚCI"
 
 #. 1
-#: ../cli/src/devices.c:74
+#: ../cli/src/devices.c:78
 msgid "WIFI-PROPERTIES"
 msgstr "WŁAŚCIWOŚCI-WIFI"
 
 #. 2
-#: ../cli/src/devices.c:75
+#: ../cli/src/devices.c:79
 msgid "AP"
 msgstr "PUNKT-DOSTĘPOWY"
 
 #. 3
-#: ../cli/src/devices.c:76
+#: ../cli/src/devices.c:80
 msgid "WIRED-PROPERTIES"
 msgstr "WŁAŚCIWOŚCI-POŁĄCZENIA-PRZEWODOWEGO"
 
 #. 4
-#: ../cli/src/devices.c:77
+#: ../cli/src/devices.c:81
+msgid "WIMAX-PROPERTIES"
+msgstr "WŁAŚCIWOŚCI-WIMAX"
+
+#. 5
+#. 0
+#: ../cli/src/devices.c:82 ../cli/src/devices.c:223
+msgid "NSP"
+msgstr "NSP"
+
+#. 6
+#: ../cli/src/devices.c:83
 msgid "IP4-SETTINGS"
 msgstr "USTAWIENIA-IP4"
 
-#. 5
-#: ../cli/src/devices.c:78
+#. 7
+#: ../cli/src/devices.c:84
 msgid "IP4-DNS"
 msgstr "IP4-DNS"
 
-#. 6
-#: ../cli/src/devices.c:79
+#. 8
+#: ../cli/src/devices.c:85
 msgid "IP6-SETTINGS"
 msgstr "USTAWIENIA-IP6"
 
-#. 7
-#: ../cli/src/devices.c:80
+#. 9
+#: ../cli/src/devices.c:86
 msgid "IP6-DNS"
 msgstr "IP6-DNS"
 
 #. 2
-#: ../cli/src/devices.c:91
+#: ../cli/src/devices.c:102
 msgid "DRIVER"
 msgstr "STEROWNIK"
 
 #. 3
-#: ../cli/src/devices.c:92
+#: ../cli/src/devices.c:103
 msgid "HWADDR"
 msgstr "ADRES-SPRZĘTOWY"
 
 #. 0
-#: ../cli/src/devices.c:102
+#: ../cli/src/devices.c:113
 msgid "CARRIER-DETECT"
 msgstr "WYKRYWANIE-OPERATORA"
 
 #. 1
-#: ../cli/src/devices.c:103
+#: ../cli/src/devices.c:114
 msgid "SPEED"
 msgstr "PRĘDKOŚĆ"
 
 #. 0
-#: ../cli/src/devices.c:112
+#: ../cli/src/devices.c:123
 msgid "CARRIER"
 msgstr "OPERATOR"
 
 #. 0
-#: ../cli/src/devices.c:122
+#: ../cli/src/devices.c:133
 msgid "WEP"
 msgstr "WEP"
 
 #. 1
-#: ../cli/src/devices.c:123
+#: ../cli/src/devices.c:134
 msgid "WPA"
 msgstr "WPA"
 
 #. 2
-#: ../cli/src/devices.c:124
+#: ../cli/src/devices.c:135
 msgid "WPA2"
 msgstr "WPA2"
 
 #. 3
-#: ../cli/src/devices.c:125
+#: ../cli/src/devices.c:136
 msgid "TKIP"
 msgstr "TKIP"
 
 #. 4
-#: ../cli/src/devices.c:126
+#: ../cli/src/devices.c:137
 msgid "CCMP"
 msgstr "CCMP"
 
 #. 0
-#: ../cli/src/devices.c:135 ../cli/src/devices.c:146
+#: ../cli/src/devices.c:147
+msgid "CTR-FREQ"
+msgstr "CZĘSTOTLIWOŚĆ-CTR"
+
+#. 1
+#: ../cli/src/devices.c:148
+msgid "RSSI"
+msgstr "RSSI"
+
+#. 2
+#: ../cli/src/devices.c:149
+msgid "CINR"
+msgstr "CINR"
+
+#. 3
+#: ../cli/src/devices.c:150
+msgid "TX-POW"
+msgstr "TX-POW"
+
+#. 4
+#: ../cli/src/devices.c:151
+msgid "BSID"
+msgstr "BSID"
+
+#. 0
+#: ../cli/src/devices.c:161 ../cli/src/devices.c:172
 msgid "ADDRESS"
 msgstr "ADRES"
 
 #. 1
-#: ../cli/src/devices.c:136 ../cli/src/devices.c:147
+#: ../cli/src/devices.c:162 ../cli/src/devices.c:173
 msgid "PREFIX"
 msgstr "PRZEDROSTEK"
 
 #. 2
-#: ../cli/src/devices.c:137 ../cli/src/devices.c:148
+#: ../cli/src/devices.c:163 ../cli/src/devices.c:174
 msgid "GATEWAY"
 msgstr "BRAMA"
 
 #. 0
-#: ../cli/src/devices.c:157 ../cli/src/devices.c:166
+#: ../cli/src/devices.c:183 ../cli/src/devices.c:192
 msgid "DNS"
 msgstr "DNS"
 
 #. 0
-#: ../cli/src/devices.c:175
+#: ../cli/src/devices.c:201
 msgid "SSID"
 msgstr "SSID"
 
 #. 1
-#: ../cli/src/devices.c:176
+#: ../cli/src/devices.c:202
 msgid "BSSID"
 msgstr "BSSID"
 
 #. 2
-#: ../cli/src/devices.c:177
+#: ../cli/src/devices.c:203
 msgid "MODE"
 msgstr "TRYB"
 
 #. 3
-#: ../cli/src/devices.c:178
+#: ../cli/src/devices.c:204
 msgid "FREQ"
 msgstr "CZĘSTOTLIWOŚĆ"
 
 #. 4
-#: ../cli/src/devices.c:179
+#: ../cli/src/devices.c:205
 msgid "RATE"
 msgstr "OCENA"
 
 #. 5
-#: ../cli/src/devices.c:180
+#. 1
+#: ../cli/src/devices.c:206 ../cli/src/devices.c:224
 msgid "SIGNAL"
 msgstr "SYGNAŁ"
 
 #. 6
-#: ../cli/src/devices.c:181
+#: ../cli/src/devices.c:207
 msgid "SECURITY"
 msgstr "ZABEZPIECZENIA"
 
 #. 7
-#: ../cli/src/devices.c:182
+#: ../cli/src/devices.c:208
 msgid "WPA-FLAGS"
 msgstr "FLAGI-WPA"
 
 #. 8
-#: ../cli/src/devices.c:183
+#: ../cli/src/devices.c:209
 msgid "RSN-FLAGS"
 msgstr "FLAGI-RSN"
 
 #. 10
-#: ../cli/src/devices.c:185
+#. 4
+#: ../cli/src/devices.c:211 ../cli/src/devices.c:227
 msgid "ACTIVE"
 msgstr "AKTYWNOŚĆ"
 
-#: ../cli/src/devices.c:208
+#: ../cli/src/devices.c:254
 #, c-format
 msgid ""
 "Usage: nmcli dev { COMMAND | help }\n"
 "\n"
+"  COMMAND := { status | list | disconnect | wifi | wimax }\n"
+"\n"
 "  COMMAND := { status | list | disconnect | wifi }\n"
 "\n"
 "  status\n"
 "  list [iface <iface>]\n"
 "  disconnect iface <iface> [--nowait] [--timeout <timeout>]\n"
 "  wifi [list [iface <iface>] [hwaddr <hwaddr>]]\n"
+"  wimax [list [iface <iface>] [nsp <name>]]\n"
 "\n"
 msgstr ""
 "Użycie: nmcli dev { POLECENIE | help }\n"
 "\n"
+"  POLECENIE := { status | list | disconnect | wifi | wimax }\n"
+"\n"
 "  POLECENIE := { status | list | disconnect | wifi }\n"
 "\n"
 "  status\n"
-"  list [iface <interfejs>]\n"
+"  list [iface <interfejs]\n"
 "  disconnect iface <interfejs> [--nowait] [--timeout <czas>]\n"
 "  wifi [list [iface <interfejs>] [hwaddr <adres_sprzętowy>]]\n"
-"\n"
+"  wimax [list [iface <interfejs>] [nsp <nazwa>]]\n"
 
-#: ../cli/src/devices.c:228
+#: ../cli/src/devices.c:282
 msgid "unmanaged"
 msgstr "niezarządzane"
 
-#: ../cli/src/devices.c:230
+#: ../cli/src/devices.c:284
 msgid "unavailable"
 msgstr "niedostępne"
 
-#: ../cli/src/devices.c:232 ../cli/src/network-manager.c:91
+#: ../cli/src/devices.c:286 ../cli/src/network-manager.c:113
 msgid "disconnected"
 msgstr "rozłączono"
 
-#: ../cli/src/devices.c:234
+#: ../cli/src/devices.c:288
 msgid "connecting (prepare)"
 msgstr "łączenie (przygotowanie)"
 
-#: ../cli/src/devices.c:236
+#: ../cli/src/devices.c:290
 msgid "connecting (configuring)"
 msgstr "łączenie (konfigurowanie)"
 
-#: ../cli/src/devices.c:238
+#: ../cli/src/devices.c:292
 msgid "connecting (need authentication)"
 msgstr "łączenie (wymaga uwierzytelnienia)"
 
-#: ../cli/src/devices.c:240
+#: ../cli/src/devices.c:294
 msgid "connecting (getting IP configuration)"
 msgstr "łączenie (pobieranie konfiguracji adresu IP)"
 
-#: ../cli/src/devices.c:242 ../cli/src/network-manager.c:89
+#: ../cli/src/devices.c:296
+msgid "connecting (checking IP connectivity)"
+msgstr "łączenie (sprawdzanie łączności IP)"
+
+#: ../cli/src/devices.c:298
+msgid "connecting (starting secondary connections)"
+msgstr "łączenie (uruchamianie drugorzędnych połączeń)"
+
+#: ../cli/src/devices.c:300 ../cli/src/network-manager.c:109
 msgid "connected"
 msgstr "połączono"
 
-#: ../cli/src/devices.c:244
+#: ../cli/src/devices.c:302
+msgid "deactivating"
+msgstr "deaktywowanie"
+
+#: ../cli/src/devices.c:304
 msgid "connection failed"
 msgstr "połączenie się nie powiodło"
 
-#: ../cli/src/devices.c:267 ../cli/src/devices.c:424
+#: ../cli/src/devices.c:329 ../cli/src/devices.c:339 ../cli/src/devices.c:499
+#: ../cli/src/devices.c:543
 msgid "Unknown"
 msgstr "Nieznane"
 
-#: ../cli/src/devices.c:299
+#: ../cli/src/devices.c:372
 msgid "(none)"
 msgstr "(brak)"
 
-#: ../cli/src/devices.c:324
+#: ../cli/src/devices.c:397
 #, c-format
 msgid "%s: error converting IP4 address 0x%X"
 msgstr "%s: błąd podczas konwertowania adresu IPv4 0x%X"
 
-#: ../cli/src/devices.c:393
+#: ../cli/src/devices.c:468
 #, c-format
 msgid "%u MHz"
 msgstr "%u MHz"
 
-#: ../cli/src/devices.c:394
+#: ../cli/src/devices.c:469
 #, c-format
 msgid "%u MB/s"
 msgstr "%u MB/s"
 
-#: ../cli/src/devices.c:403
+#: ../cli/src/devices.c:478
 msgid "Encrypted: "
 msgstr "Zaszyfrowane: "
 
-#: ../cli/src/devices.c:408
+#: ../cli/src/devices.c:483
 msgid "WEP "
 msgstr "WEP "
 
-#: ../cli/src/devices.c:410
+#: ../cli/src/devices.c:485
 msgid "WPA "
 msgstr "WPA "
 
-#: ../cli/src/devices.c:412
+#: ../cli/src/devices.c:487
 msgid "WPA2 "
 msgstr "WPA2 "
 
-#: ../cli/src/devices.c:415
+#: ../cli/src/devices.c:490
 msgid "Enterprise "
 msgstr "Enterprise "
 
-#: ../cli/src/devices.c:424
+#: ../cli/src/devices.c:499
 msgid "Ad-Hoc"
 msgstr "Ad-hoc"
 
-#: ../cli/src/devices.c:424
+#: ../cli/src/devices.c:499
 msgid "Infrastructure"
 msgstr "Infrastruktura"
 
-#: ../cli/src/devices.c:486
+#: ../cli/src/devices.c:534
+msgid "Home"
+msgstr "Dom"
+
+#: ../cli/src/devices.c:537
+msgid "Partner"
+msgstr "Partner"
+
+#: ../cli/src/devices.c:540
+msgid "Roaming"
+msgstr "Roaming"
+
+#: ../cli/src/devices.c:610
 #, c-format
 msgid "Error: 'dev list': %s"
 msgstr "Błąd: \"dev list\": %s"
 
-#: ../cli/src/devices.c:488
+#: ../cli/src/devices.c:612
 #, c-format
 msgid "Error: 'dev list': %s; allowed fields: %s"
 msgstr "Błąd: \"dev list\": %s; dozwolone pola: %s"
 
-#: ../cli/src/devices.c:497
+#: ../cli/src/devices.c:621
 msgid "Device details"
 msgstr "Informacje o urządzeniu"
 
-#: ../cli/src/devices.c:527 ../cli/src/devices.c:925
+#: ../cli/src/devices.c:655 ../cli/src/devices.c:1150 ../cli/src/utils.c:342
 msgid "(unknown)"
 msgstr "(nieznane)"
 
-#: ../cli/src/devices.c:528
+#: ../cli/src/devices.c:656
 msgid "unknown)"
 msgstr "nieznane)"
 
-#: ../cli/src/devices.c:554
+#: ../cli/src/devices.c:682
 #, c-format
 msgid "%u Mb/s"
 msgstr "%u Mb/s"
 
 #. Print header
 #. "WIRED-PROPERTIES"
-#: ../cli/src/devices.c:627
+#: ../cli/src/devices.c:755
 msgid "on"
 msgstr "włączone"
 
-#: ../cli/src/devices.c:627
+#: ../cli/src/devices.c:755
 msgid "off"
 msgstr "wyłączone"
 
-#: ../cli/src/devices.c:808
+#: ../cli/src/devices.c:1002
 #, c-format
 msgid "Error: 'dev status': %s"
 msgstr "Błąd: \"dev status\": %s"
 
-#: ../cli/src/devices.c:810
+#: ../cli/src/devices.c:1004
 #, c-format
 msgid "Error: 'dev status': %s; allowed fields: %s"
 msgstr "Błąd: \"dev status\": %s; dozwolone pola: %s"
 
-#: ../cli/src/devices.c:817
+#: ../cli/src/devices.c:1027
 msgid "Status of devices"
 msgstr "Stan urządzenia"
 
-#: ../cli/src/devices.c:845
+#: ../cli/src/devices.c:1058
 #, c-format
 msgid "Error: '%s' argument is missing."
 msgstr "Błąd: brak parametru \"%s\"."
 
-#: ../cli/src/devices.c:874 ../cli/src/devices.c:1013
-#: ../cli/src/devices.c:1136
+#: ../cli/src/devices.c:1099 ../cli/src/devices.c:1251
+#: ../cli/src/devices.c:1387 ../cli/src/devices.c:1606
 #, c-format
 msgid "Error: Device '%s' not found."
 msgstr "Błąd: nie odnaleziono urządzenia \"%s\"."
 
-#: ../cli/src/devices.c:897
+#: ../cli/src/devices.c:1122
 #, c-format
 msgid "Success: Device '%s' successfully disconnected."
 msgstr "Powodzenie: urządzenie \"%s\" zostało rozłączone."
 
-#: ../cli/src/devices.c:922
+#: ../cli/src/devices.c:1147
 #, c-format
 msgid "Error: Device '%s' (%s) disconnecting failed: %s"
 msgstr "Błąd: rozłączenie urządzenia \"%s\" (%s) się nie powiodło: %s"
 
-#: ../cli/src/devices.c:930
+#: ../cli/src/devices.c:1155
 #, c-format
 msgid "Device state: %d (%s)\n"
 msgstr "Stan urządzenia: %d (%s)\n"
 
-#: ../cli/src/devices.c:994
+#: ../cli/src/devices.c:1220
 #, c-format
 msgid "Error: iface has to be specified."
 msgstr "Błąd: należy podać interfejs."
 
-#: ../cli/src/devices.c:1112
+#: ../cli/src/devices.c:1345
 #, c-format
 msgid "Error: 'dev wifi': %s"
 msgstr "Błąd: \"dev wifi\": %s"
 
-#: ../cli/src/devices.c:1114
+#: ../cli/src/devices.c:1347
 #, c-format
 msgid "Error: 'dev wifi': %s; allowed fields: %s"
 msgstr "Błąd: \"dev wifi\": %s; dozwolone pola: %s"
 
-#: ../cli/src/devices.c:1121
+#: ../cli/src/devices.c:1370
 msgid "WiFi scan list"
 msgstr "Lista skanowania sieci WiFi"
 
-#: ../cli/src/devices.c:1156 ../cli/src/devices.c:1210
+#: ../cli/src/devices.c:1407 ../cli/src/devices.c:1461
+#: ../cli/src/devices.c:1668
 #, c-format
 msgid "Error: Access point with hwaddr '%s' not found."
 msgstr "Błąd: nie odnaleziono punktu dostępowego z adresem sprzętowym \"%s\"."
 
-#: ../cli/src/devices.c:1173
+#: ../cli/src/devices.c:1424
 #, c-format
 msgid "Error: Device '%s' is not a WiFi device."
 msgstr "Błąd: urządzenie \"%s\" nie jest urządzeniem WiFi."
 
-#: ../cli/src/devices.c:1237
+#: ../cli/src/devices.c:1488
 #, c-format
 msgid "Error: 'dev wifi' command '%s' is not valid."
 msgstr "Błąd: polecenie \"dev wifi\" \"%s\" jest nieprawidłowe."
 
-#: ../cli/src/devices.c:1284
+#: ../cli/src/devices.c:1564
+#, c-format
+msgid "Error: 'dev wimax': %s"
+msgstr "Błąd: \"dev wimax\": %s"
+
+#: ../cli/src/devices.c:1566
+#, c-format
+msgid "Error: 'dev wimax': %s; allowed fields: %s"
+msgstr "Błąd: \"dev wimax\": %s; dozwolone pola: %s"
+
+#: ../cli/src/devices.c:1589
+msgid "WiMAX NSP list"
+msgstr "Lista NSP sieci WiMAX"
+
+#: ../cli/src/devices.c:1626
+#, c-format
+msgid "Error: NSP with name '%s' not found."
+msgstr "Błąd: nie odnaleziono NSP o nazwie \"%s\"."
+
+#: ../cli/src/devices.c:1637
+#, c-format
+msgid "Error: Device '%s' is not a WiMAX device."
+msgstr "Błąd: urządzenie \"%s\" nie jest urządzeniem WiMAX."
+
+#: ../cli/src/devices.c:1695
+#, c-format
+msgid "Error: 'dev wimax' command '%s' is not valid."
+msgstr "Błąd: polecenie \"dev wimax\" \"%s\" jest nieprawidłowe."
+
+#: ../cli/src/devices.c:1745
 #, c-format
 msgid "Error: 'dev' command '%s' is not valid."
 msgstr "Błąd: polecenie \"dev\" \"%s\" jest nieprawidłowe."
@@ -864,36 +973,53 @@ msgstr "Błąd: polecenie \"dev\" \"%s\" jest nieprawidłowe."
 msgid "RUNNING"
 msgstr "URUCHOMIONE"
 
-#. 1
-#: ../cli/src/network-manager.c:37
-msgid "NET-ENABLED"
-msgstr "SIEĆ-WŁĄCZONA"
+#. 0
+#: ../cli/src/network-manager.c:36
+msgid "VERSION"
+msgstr "WERSJA"
 
 #. 2
 #: ../cli/src/network-manager.c:38
-msgid "WIFI-HARDWARE"
-msgstr "SPRZĘT-WIFI"
+msgid "NET-ENABLED"
+msgstr "SIEĆ-WŁĄCZONA"
 
 #. 3
 #: ../cli/src/network-manager.c:39
-msgid "WIFI"
-msgstr "WIFI"
+msgid "WIFI-HARDWARE"
+msgstr "SPRZĘT-WIFI"
 
 #. 4
 #: ../cli/src/network-manager.c:40
-msgid "WWAN-HARDWARE"
-msgstr "SPRZĘT-WWAN"
+msgid "WIFI"
+msgstr "WIFI"
 
 #. 5
 #: ../cli/src/network-manager.c:41
+msgid "WWAN-HARDWARE"
+msgstr "SPRZĘT-WWAN"
+
+#. 6
+#: ../cli/src/network-manager.c:42
 msgid "WWAN"
 msgstr "WWAN"
 
-#: ../cli/src/network-manager.c:64
+#. 7
+#: ../cli/src/network-manager.c:43
+msgid "WIMAX-HARDWARE"
+msgstr "SPRZĘT-WIMAX"
+
+#. 8
+#: ../cli/src/network-manager.c:44
+msgid "WIMAX"
+msgstr "WIMAX"
+
+#: ../cli/src/network-manager.c:72
 #, c-format
 msgid ""
 "Usage: nmcli nm { COMMAND | help }\n"
 "\n"
+"  COMMAND := { status | enable | sleep | wifi | wwan | wimax }\n"
+"\n"
 "  COMMAND := { status | enable | sleep | wifi | wwan }\n"
 "\n"
 "  status\n"
@@ -901,10 +1027,13 @@ msgid ""
 "  sleep [true|false]\n"
 "  wifi [on|off]\n"
 "  wwan [on|off]\n"
+"  wimax [on|off]\n"
 "\n"
 msgstr ""
 "Użycie: nmcli nm { POLECENIE | help }\n"
 "\n"
+"  POLECENIE := { status | enable | sleep | wifi | wwan | wimax }\n"
+"\n"
 "  POLECENIE := { status | enable | sleep | wifi | wwan }\n"
 "\n"
 "  status\n"
@@ -912,123 +1041,149 @@ msgstr ""
 "  sleep [true|false]\n"
 "  wifi [on|off]\n"
 "  wwan [on|off]\n"
-"\n"
+"  wimax [on|off]\n"
 
-#: ../cli/src/network-manager.c:85
+#: ../cli/src/network-manager.c:101
 msgid "asleep"
 msgstr "wstrzymane"
 
-#: ../cli/src/network-manager.c:87
+#: ../cli/src/network-manager.c:103
 msgid "connecting"
 msgstr "łączenie"
 
-#: ../cli/src/network-manager.c:128
+#: ../cli/src/network-manager.c:105
+msgid "connected (local only)"
+msgstr "połączono (tylko lokalnie)"
+
+#: ../cli/src/network-manager.c:107
+msgid "connected (site only)"
+msgstr "połączono (tylko witryny)"
+
+#: ../cli/src/network-manager.c:111
+msgid "disconnecting"
+msgstr "rozłączanie"
+
+#: ../cli/src/network-manager.c:151
 #, c-format
 msgid "Error: 'nm status': %s"
 msgstr "Błąd: \"nm status\": %s"
 
-#: ../cli/src/network-manager.c:130
+#: ../cli/src/network-manager.c:153
 #, c-format
 msgid "Error: 'nm status': %s; allowed fields: %s"
 msgstr "Błąd: \"nm status\": %s; dozwolone pola: %s"
 
-#: ../cli/src/network-manager.c:137
-msgid "NetworkManager status"
-msgstr "Stan programu NetworkManager"
-
-#. Print header
-#: ../cli/src/network-manager.c:144 ../cli/src/network-manager.c:145
-#: ../cli/src/network-manager.c:146 ../cli/src/network-manager.c:147
-#: ../cli/src/network-manager.c:154 ../cli/src/network-manager.c:247
-#: ../cli/src/network-manager.c:296 ../cli/src/network-manager.c:328
+#. create NMClient
+#: ../cli/src/network-manager.c:166 ../cli/src/network-manager.c:167
+#: ../cli/src/network-manager.c:168 ../cli/src/network-manager.c:169
+#: ../cli/src/network-manager.c:170 ../cli/src/network-manager.c:172
+#: ../cli/src/network-manager.c:173 ../cli/src/network-manager.c:294
+#: ../cli/src/network-manager.c:349 ../cli/src/network-manager.c:387
+#: ../cli/src/network-manager.c:426
 msgid "enabled"
 msgstr "włączone"
 
-#: ../cli/src/network-manager.c:144 ../cli/src/network-manager.c:145
-#: ../cli/src/network-manager.c:146 ../cli/src/network-manager.c:147
-#: ../cli/src/network-manager.c:154 ../cli/src/network-manager.c:247
-#: ../cli/src/network-manager.c:296 ../cli/src/network-manager.c:328
+#: ../cli/src/network-manager.c:166 ../cli/src/network-manager.c:167
+#: ../cli/src/network-manager.c:168 ../cli/src/network-manager.c:169
+#: ../cli/src/network-manager.c:170 ../cli/src/network-manager.c:172
+#: ../cli/src/network-manager.c:173 ../cli/src/network-manager.c:294
+#: ../cli/src/network-manager.c:349 ../cli/src/network-manager.c:387
+#: ../cli/src/network-manager.c:426
 msgid "disabled"
 msgstr "wyłączone"
 
-#: ../cli/src/network-manager.c:152
+#: ../cli/src/network-manager.c:186
+msgid "NetworkManager status"
+msgstr "Stan usługi NetworkManager"
+
+#. Print header
+#: ../cli/src/network-manager.c:189
 msgid "running"
 msgstr "uruchamiany"
 
-#: ../cli/src/network-manager.c:152
+#: ../cli/src/network-manager.c:189
 msgid "not running"
 msgstr "nieuruchomiony"
 
-#: ../cli/src/network-manager.c:175
+#: ../cli/src/network-manager.c:220 ../cli/src/utils.c:322
 #, c-format
 msgid "Error: Couldn't connect to system bus: %s"
 msgstr "Błąd: nie można połączyć się z magistralą systemową: %s"
 
-#: ../cli/src/network-manager.c:186
+#: ../cli/src/network-manager.c:231
 #, c-format
 msgid "Error: Couldn't create D-Bus object proxy."
 msgstr "Błąd: nie można utworzyć pośrednika obiektu usługi D-Bus."
 
-#: ../cli/src/network-manager.c:192
+#: ../cli/src/network-manager.c:237
 #, c-format
 msgid "Error in sleep: %s"
 msgstr "Błąd w poleceniu sleep: %s"
 
-#: ../cli/src/network-manager.c:237 ../cli/src/network-manager.c:286
-#: ../cli/src/network-manager.c:318
+#: ../cli/src/network-manager.c:281 ../cli/src/network-manager.c:336
+#: ../cli/src/network-manager.c:374 ../cli/src/network-manager.c:413
 #, c-format
 msgid "Error: '--fields' value '%s' is not valid here; allowed fields: %s"
 msgstr ""
 "Błąd: wartość \"%s\" opcji \"--fields\" jest nieprawidłowa; dozwolone pola: "
 "%s."
 
-#: ../cli/src/network-manager.c:245
+#: ../cli/src/network-manager.c:289
 msgid "Networking enabled"
 msgstr "Sieć jest włączona"
 
-#: ../cli/src/network-manager.c:256
+#: ../cli/src/network-manager.c:305
 #, c-format
 msgid "Error: invalid 'enable' parameter: '%s'; use 'true' or 'false'."
 msgstr ""
 "Błąd: nieprawidłowy parametr \"enable\": \"%s\"; należy użyć \"true\" lub "
 "\"false\"."
 
-#: ../cli/src/network-manager.c:265
+#: ../cli/src/network-manager.c:315
 #, c-format
 msgid "Error: Sleeping status is not exported by NetworkManager."
-msgstr "Błąd: stan snu nie jest eksportowany przez program NetworkManager."
+msgstr "Błąd: stan snu nie jest eksportowany przez usługę NetworkManager."
 
-#: ../cli/src/network-manager.c:273
+#: ../cli/src/network-manager.c:323
 #, c-format
 msgid "Error: invalid 'sleep' parameter: '%s'; use 'true' or 'false'."
 msgstr ""
 "Błąd: nieprawidłowy parametr \"sleep\": \"%s\"; należy użyć \"true\" lub "
 "\"false\"."
 
-#: ../cli/src/network-manager.c:294
+#: ../cli/src/network-manager.c:344
 msgid "WiFi enabled"
 msgstr "WiFi jest włączone"
 
-#: ../cli/src/network-manager.c:305
+#: ../cli/src/network-manager.c:360
 #, c-format
 msgid "Error: invalid 'wifi' parameter: '%s'."
 msgstr "Błąd: nieprawidłowy parametr \"wifi\": \"%s\"."
 
-#: ../cli/src/network-manager.c:326
+#: ../cli/src/network-manager.c:382
 msgid "WWAN enabled"
 msgstr "WWAN jest włączone"
 
-#: ../cli/src/network-manager.c:337
+#: ../cli/src/network-manager.c:398
 #, c-format
 msgid "Error: invalid 'wwan' parameter: '%s'."
 msgstr "Błąd: nieprawidłowy parametr \"wwan\": \"%s\"."
 
-#: ../cli/src/network-manager.c:348
+#: ../cli/src/network-manager.c:421
+msgid "WiMAX enabled"
+msgstr "WiMAX jest włączone"
+
+#: ../cli/src/network-manager.c:437
+#, c-format
+msgid "Error: invalid 'wimax' parameter: '%s'."
+msgstr "Błąd: nieprawidłowy parametr \"wimax\": \"%s\"."
+
+#: ../cli/src/network-manager.c:450
 #, c-format
 msgid "Error: 'nm' command '%s' is not valid."
 msgstr "Błąd: parametr \"nm\" \"%s\" jest nieprawidłowy."
 
-#: ../cli/src/nmcli.c:69
+#: ../cli/src/nmcli.c:64
 #, c-format
 msgid ""
 "Usage: %s [OPTIONS] OBJECT { COMMAND | help }\n"
@@ -1040,6 +1195,8 @@ msgid ""
 "  -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"
 "  -v[ersion]                                 show program version\n"
 "  -h[elp]                                    print this help\n"
 "\n"
@@ -1058,289 +1215,321 @@ msgstr ""
 "  -f[ields] <pole1,pole2,...>|all|common     określa pola do wyjścia\n"
 "  -e[scape] yes|no                           modyfikuje separatory kolumn w "
 "wartościach\n"
-"  -v[ersion]                                 wyświetla wersję programu\n"
+"  -n[ocheck]                                 bez sprawdzania wersji nmcli i "
+"NetworkManager\n"
+"  -v[ersion]                                 wyświetla wersję usługi\n"
 "  -h[elp]                                    wyświetla tę opcję\n"
 "\n"
 "OBIEKT\n"
-"  nm          stan programu NetworkManager\n"
-"  con         połączenia programu NetworkManager\n"
-"  dev         urządzenia zarządzane przez program NetworkManager\n"
+"  nm          stan usługi NetworkManager\n"
+"  con         połączenia usługi NetworkManager\n"
+"  dev         urządzenia zarządzane przez usługę NetworkManager\n"
 "\n"
 
-#: ../cli/src/nmcli.c:113
+#: ../cli/src/nmcli.c:109
 #, c-format
 msgid "Error: Object '%s' is unknown, try 'nmcli help'."
 msgstr ""
 "Błąd: obiekt \"%s\" jest nieznany, można spróbować polecenie \"nmcli help\"."
 
-#: ../cli/src/nmcli.c:143
+#: ../cli/src/nmcli.c:139
 #, c-format
 msgid "Error: Option '--terse' is specified the second time."
 msgstr "Błąd: opcja \"--terse\" został podana po raz drugi."
 
-#: ../cli/src/nmcli.c:148
+#: ../cli/src/nmcli.c:144
 #, c-format
 msgid "Error: Option '--terse' is mutually exclusive with '--pretty'."
 msgstr ""
 "Błąd: opcja \"--terse\" jest wzajemnie wykluczająca z opcją \"--pretty\"."
 
-#: ../cli/src/nmcli.c:156
+#: ../cli/src/nmcli.c:152
 #, c-format
 msgid "Error: Option '--pretty' is specified the second time."
 msgstr "Błąd: opcja \"--pretty\" został podana po raz drugi."
 
-#: ../cli/src/nmcli.c:161
+#: ../cli/src/nmcli.c:157
 #, c-format
 msgid "Error: Option '--pretty' is mutually exclusive with '--terse'."
 msgstr ""
 "Błąd: opcja \"--pretty\" jest wzajemnie wykluczająca z opcją \"--terse\"."
 
-#: ../cli/src/nmcli.c:171 ../cli/src/nmcli.c:187
+#: ../cli/src/nmcli.c:167 ../cli/src/nmcli.c:183
 #, c-format
 msgid "Error: missing argument for '%s' option."
 msgstr "Błąd: brak parametru dla opcji \"%s\"."
 
-#: ../cli/src/nmcli.c:180 ../cli/src/nmcli.c:196
+#: ../cli/src/nmcli.c:176 ../cli/src/nmcli.c:192
 #, c-format
 msgid "Error: '%s' is not valid argument for '%s' option."
 msgstr "Błąd: \"%s\" nie jest prawidłowym parametrem dla opcji \"%s\"."
 
-#: ../cli/src/nmcli.c:203
+#: ../cli/src/nmcli.c:199
 #, c-format
 msgid "Error: fields for '%s' options are missing."
 msgstr "Błąd: brak pól dla opcji \"%s\"."
 
-#: ../cli/src/nmcli.c:209
+#: ../cli/src/nmcli.c:207
 #, c-format
 msgid "nmcli tool, version %s\n"
 msgstr "narzędzie nmcli, wersja %s\n"
 
-#: ../cli/src/nmcli.c:215
+#: ../cli/src/nmcli.c:213
 #, c-format
 msgid "Error: Option '%s' is unknown, try 'nmcli -help'."
 msgstr ""
 "Błąd: opcja \"%s\" jest nieznana. Można spróbować polecenie \"nmcli help\"."
 
-#: ../cli/src/nmcli.c:234
+#: ../cli/src/nmcli.c:232
 #, c-format
 msgid "Caught signal %d, shutting down..."
 msgstr "Przechwycono sygnał %d, wyłączanie..."
 
-#: ../cli/src/nmcli.c:259
-#, c-format
-msgid "Error: Could not connect to NetworkManager."
-msgstr "Błąd: nie można połączyć się z programem NetworkManager."
+#: ../cli/src/nmcli.c:257
+msgid "Error: Could not create NMClient object."
+msgstr "Błąd: nie można utworzyć obiektu NMClient."
 
-#: ../cli/src/nmcli.c:275
+#: ../cli/src/nmcli.c:273
 msgid "Success"
 msgstr "Powodzenie"
 
-#: ../cli/src/settings.c:411
+#: ../cli/src/settings.c:421
 #, c-format
 msgid "%d (hex-ascii-key)"
 msgstr "%d (klucz-szesnastkowy-acsii))"
 
-#: ../cli/src/settings.c:413
+#: ../cli/src/settings.c:423
 #, c-format
 msgid "%d (104/128-bit passphrase)"
 msgstr "%d (104/128-bitowe hasło)"
 
-#: ../cli/src/settings.c:416
+#: ../cli/src/settings.c:426
 #, c-format
 msgid "%d (unknown)"
 msgstr "%d (nieznane)"
 
-#: ../cli/src/settings.c:442
+#: ../cli/src/settings.c:452
 msgid "0 (unknown)"
 msgstr "0 (nieznane)"
 
-#: ../cli/src/settings.c:448
+#: ../cli/src/settings.c:458
 msgid "any, "
 msgstr "dowolne, "
 
-#: ../cli/src/settings.c:450
+#: ../cli/src/settings.c:460
 msgid "900 MHz, "
 msgstr "900 MHz, "
 
-#: ../cli/src/settings.c:452
+#: ../cli/src/settings.c:462
 msgid "1800 MHz, "
 msgstr "1800 MHz, "
 
-#: ../cli/src/settings.c:454
+#: ../cli/src/settings.c:464
 msgid "1900 MHz, "
 msgstr "1900 MHz, "
 
-#: ../cli/src/settings.c:456
+#: ../cli/src/settings.c:466
 msgid "850 MHz, "
 msgstr "850 MHz, "
 
-#: ../cli/src/settings.c:458
+#: ../cli/src/settings.c:468
 msgid "WCDMA 3GPP UMTS 2100 MHz, "
 msgstr "WCDMA 3GPP UMTS 2100 MHz, "
 
-#: ../cli/src/settings.c:460
+#: ../cli/src/settings.c:470
 msgid "WCDMA 3GPP UMTS 1800 MHz, "
 msgstr "WCDMA 3GPP UMTS 1800 MHz, "
 
-#: ../cli/src/settings.c:462
+#: ../cli/src/settings.c:472
 msgid "WCDMA 3GPP UMTS 1700/2100 MHz, "
 msgstr "WCDMA 3GPP UMTS 1700/2100 MHz, "
 
-#: ../cli/src/settings.c:464
+#: ../cli/src/settings.c:474
 msgid "WCDMA 3GPP UMTS 800 MHz, "
 msgstr "WCDMA 3GPP UMTS 800 MHz, "
 
-#: ../cli/src/settings.c:466
+#: ../cli/src/settings.c:476
 msgid "WCDMA 3GPP UMTS 850 MHz, "
 msgstr "WCDMA 3GPP UMTS 850 MHz, "
 
-#: ../cli/src/settings.c:468
+#: ../cli/src/settings.c:478
 msgid "WCDMA 3GPP UMTS 900 MHz, "
 msgstr "WCDMA 3GPP UMTS 900 MHz, "
 
-#: ../cli/src/settings.c:470
+#: ../cli/src/settings.c:480
 msgid "WCDMA 3GPP UMTS 1700 MHz, "
 msgstr "WCDMA 3GPP UMTS 1700 MHz, "
 
-#: ../cli/src/settings.c:554 ../cli/src/settings.c:721
+#: ../cli/src/settings.c:564 ../cli/src/settings.c:730
 msgid "auto"
 msgstr "automatyczne"
 
-#: ../cli/src/settings.c:716 ../cli/src/settings.c:719
-#: ../cli/src/settings.c:720 ../cli/src/utils.c:172
+#: ../cli/src/settings.c:725 ../cli/src/settings.c:728
+#: ../cli/src/settings.c:729 ../cli/src/utils.c:176
 msgid "not set"
 msgstr "nieustawione"
 
-#: ../cli/src/utils.c:124
+#: ../cli/src/utils.c:128
 #, c-format
 msgid "field '%s' has to be alone"
 msgstr "pole \"%s\" musi być same"
 
-#: ../cli/src/utils.c:127
+#: ../cli/src/utils.c:131
 #, c-format
 msgid "invalid field '%s'"
 msgstr "nieprawidłowe pole \"%s\""
 
-#: ../cli/src/utils.c:146
+#: ../cli/src/utils.c:150
 #, c-format
 msgid "Option '--terse' requires specifying '--fields'"
 msgstr "Opcja \"--terse\" wymaga podania opcji \"--fields\""
 
-#: ../cli/src/utils.c:150
+#: ../cli/src/utils.c:154
 #, c-format
 msgid "Option '--terse' requires specific '--fields' option values , not '%s'"
 msgstr ""
 "Opcja \"--terse\" wymaga konkretnej wartości opcji \"--fields\", nie \"%s\""
 
-#: ../libnm-util/crypto.c:120
+#: ../cli/src/utils.c:333
+#, c-format
+msgid "Error: Couldn't create D-Bus object proxy for org.freedesktop.DBus"
+msgstr ""
+"Błąd: nie można utworzyć pośrednika obiektu usługi D-Bus dla org.freedesktop."
+"DBus"
+
+#: ../cli/src/utils.c:341
+#, c-format
+msgid "Error: NameHasOwner request failed: %s"
+msgstr "Błąd: żądanie NameHasOwner się nie powiodło: %s"
+
+#: ../cli/src/utils.c:386
+#, c-format
+msgid ""
+"Warning: nmcli (%s) and NetworkManager (%s) versions don't match. Use --"
+"nocheck to suppress the warning.\n"
+msgstr ""
+"Ostrzeżenie: wersje programu nmcli (%s) i usługi NetworkManager (%s) się nie "
+"zgadzają. Użycie opcji --nocheck ukrywa ostrzeżenie.\n"
+
+#: ../cli/src/utils.c:395
+#, c-format
+msgid ""
+"Error: nmcli (%s) and NetworkManager (%s) versions don't match. Force "
+"execution using --nocheck, but the results are unpredictable."
+msgstr ""
+"Błąd: wersje programu nmcli (%s) i usługi NetworkManager (%s) się nie "
+"zgadzają. Wymuszono wykonanie używając opcji --nocheck, ale wynik może być "
+"nieprzewidywalny."
+
+#: ../libnm-util/crypto.c:125
 #, c-format
 msgid "PEM key file had no end tag '%s'."
 msgstr "Plik klucza PEM nie zawiera znacznika końcowego \"%s\"."
 
-#: ../libnm-util/crypto.c:130
+#: ../libnm-util/crypto.c:138
 #, c-format
 msgid "Doesn't look like a PEM private key file."
 msgstr "Nie wygląda na plik klucza prywatnego PEM."
 
-#: ../libnm-util/crypto.c:138
+#: ../libnm-util/crypto.c:146
 #, c-format
 msgid "Not enough memory to store PEM file data."
 msgstr "Brak wystarczającej ilości pamięci do przechowania danych pliku PEM."
 
-#: ../libnm-util/crypto.c:154
+#: ../libnm-util/crypto.c:162
 #, c-format
 msgid "Malformed PEM file: Proc-Type was not first tag."
 msgstr "Uszkodzony plik PEM: Proc-Type nie był pierwszym znacznikiem."
 
-#: ../libnm-util/crypto.c:162
+#: ../libnm-util/crypto.c:170
 #, c-format
 msgid "Malformed PEM file: unknown Proc-Type tag '%s'."
 msgstr "Uszkodzony plik PEM: nieznany znacznik Proc-Type \"%s\"."
 
-#: ../libnm-util/crypto.c:172
+#: ../libnm-util/crypto.c:180
 #, c-format
 msgid "Malformed PEM file: DEK-Info was not the second tag."
 msgstr "Uszkodzony plik PEM: DEK-Info nie był drugim znacznikiem."
 
-#: ../libnm-util/crypto.c:183
+#: ../libnm-util/crypto.c:191
 #, c-format
 msgid "Malformed PEM file: no IV found in DEK-Info tag."
 msgstr "Uszkodzony plik PEM: brak IV w znaczniku DEK-Info."
 
-#: ../libnm-util/crypto.c:190
+#: ../libnm-util/crypto.c:198
 #, c-format
 msgid "Malformed PEM file: invalid format of IV in DEK-Info tag."
 msgstr "Uszkodzony plik PEM: nieprawidłowy format IV w znaczniku DEK-Info."
 
-#: ../libnm-util/crypto.c:203
+#: ../libnm-util/crypto.c:211
 #, c-format
 msgid "Malformed PEM file: unknown private key cipher '%s'."
 msgstr "Uszkodzony plik PEM: nieznany szyfr klucza prywatnego: \"%s\"."
 
-#: ../libnm-util/crypto.c:222
+#: ../libnm-util/crypto.c:230
 #, c-format
 msgid "Could not decode private key."
 msgstr "Nie można zdekodować klucza prywatnego."
 
-#: ../libnm-util/crypto.c:267
-#, c-format
-msgid "PEM certificate '%s' had no end tag '%s'."
-msgstr "Certyfikat PEM \"%s\" nie zawiera kończącego znacznika \"%s\"."
-
-#: ../libnm-util/crypto.c:277
-#, c-format
-msgid "Failed to decode certificate."
-msgstr "Zdekodowanie certyfikatu się nie powiodło."
-
-#: ../libnm-util/crypto.c:286
+#: ../libnm-util/crypto.c:266 ../libnm-util/crypto.c:552
 #, c-format
 msgid "Not enough memory to store certificate data."
 msgstr "Brak wystarczającej ilości pamięci do przechowania danych certyfikatu."
 
-#: ../libnm-util/crypto.c:294
-#, c-format
-msgid "Not enough memory to store file data."
-msgstr "Brak wystarczającej ilości pamięci do przechowania danych pliku."
-
-#: ../libnm-util/crypto.c:324
+#: ../libnm-util/crypto.c:292
 #, c-format
 msgid "IV must be an even number of bytes in length."
 msgstr "Liczba bajtów w IV musi być liczbą parzystą."
 
-#: ../libnm-util/crypto.c:333
+#: ../libnm-util/crypto.c:301
 #, c-format
 msgid "Not enough memory to store the IV."
 msgstr "Brak wystarczającej ilości pamięci do przechowania IV."
 
-#: ../libnm-util/crypto.c:344
+#: ../libnm-util/crypto.c:312
 #, c-format
 msgid "IV contains non-hexadecimal digits."
 msgstr "IV zawiera nieszesnastkowe cyfry."
 
-#: ../libnm-util/crypto.c:382 ../libnm-util/crypto_gnutls.c:148
+#: ../libnm-util/crypto.c:350 ../libnm-util/crypto_gnutls.c:148
 #: ../libnm-util/crypto_gnutls.c:266 ../libnm-util/crypto_nss.c:171
 #: ../libnm-util/crypto_nss.c:336
 #, c-format
 msgid "Private key cipher '%s' was unknown."
 msgstr "Nieznany szyfr klucza prywatnego \"%s\"."
 
-#: ../libnm-util/crypto.c:391
+#: ../libnm-util/crypto.c:359
 #, c-format
 msgid "Not enough memory to decrypt private key."
 msgstr "Brak wystarczającej ilości pamięci do odszyfrowania klucza prywatnego."
 
-#: ../libnm-util/crypto.c:511
-#, c-format
-msgid "Unable to determine private key type."
-msgstr "Nie można określić typu klucza prywatnego."
-
-#: ../libnm-util/crypto.c:530
+#: ../libnm-util/crypto.c:424
 #, c-format
 msgid "Not enough memory to store decrypted private key."
 msgstr ""
 "Brak wystarczającej ilości pamięci do przechowania odszyfrowanego klucza "
 "prywatnego."
 
+#: ../libnm-util/crypto.c:469
+#, c-format
+msgid "Unable to determine private key type."
+msgstr "Nie można określić typu klucza prywatnego."
+
+#: ../libnm-util/crypto.c:524
+#, c-format
+msgid "PEM certificate had no start tag '%s'."
+msgstr "Certyfikat PEM nie zawiera początkowego znacznika \"%s\"."
+
+#: ../libnm-util/crypto.c:533
+#, c-format
+msgid "PEM certificate had no end tag '%s'."
+msgstr "Certyfikat PEM nie zawiera kończącego znacznika \"%s\"."
+
+#: ../libnm-util/crypto.c:557
+#, c-format
+msgid "Failed to decode certificate."
+msgstr "Zdekodowanie certyfikatu się nie powiodło."
+
 #: ../libnm-util/crypto_gnutls.c:49
 msgid "Failed to initialize the crypto engine."
 msgstr "Zainicjowanie modułu szyfrowania się nie powiodło."
@@ -1557,186 +1746,154 @@ msgstr "Nie można zweryfikować pliku PKCS#12: %d"
 msgid "Could not generate random data."
 msgstr "Nie można utworzyć losowych danych."
 
-#: ../libnm-util/nm-utils.c:1975
+#: ../libnm-util/nm-utils.c:1988
 #, c-format
 msgid "Not enough memory to make encryption key."
 msgstr "Brak wystarczającej ilości pamięci, aby utworzyć klucz szyfrowania."
 
-#: ../libnm-util/nm-utils.c:2085
+#: ../libnm-util/nm-utils.c:2098
 msgid "Could not allocate memory for PEM file creation."
 msgstr "Nie można przydzielić pamięci do utworzenia pliku PEM."
 
-#: ../libnm-util/nm-utils.c:2097
+#: ../libnm-util/nm-utils.c:2110
 #, c-format
 msgid "Could not allocate memory for writing IV to PEM file."
 msgstr "Nie można przydzielić pamięci do zapisywania IV do pliku PEM."
 
-#: ../libnm-util/nm-utils.c:2109
+#: ../libnm-util/nm-utils.c:2122
 #, c-format
 msgid "Could not allocate memory for writing encrypted key to PEM file."
 msgstr ""
 "Nie można przydzielić pamięci do zapisywania zaszyfrowanego klucza do pliku "
 "PEM."
 
-#: ../libnm-util/nm-utils.c:2128
+#: ../libnm-util/nm-utils.c:2141
 #, c-format
 msgid "Could not allocate memory for PEM file data."
 msgstr "Nie można przydzielić pamięci dla danych pliku PEM."
 
-#: ../policy/org.freedesktop.network-manager-settings.system.policy.in.h:1
-msgid "Connection sharing via a protected WiFi network"
-msgstr "Współdzielenie połączenia przez chronioną sieć WiFi"
-
-#: ../policy/org.freedesktop.network-manager-settings.system.policy.in.h:2
-msgid "Connection sharing via an open WiFi network"
-msgstr "Współdzielenie połączenia przez otwartą sieć WiFi"
-
-#: ../policy/org.freedesktop.network-manager-settings.system.policy.in.h:3
-msgid "Modify persistent system hostname"
-msgstr "Modyfikacja trwałej systemowej nazwy komputera"
-
-#: ../policy/org.freedesktop.network-manager-settings.system.policy.in.h:4
-msgid "Modify system connections"
-msgstr "Modyfikacja połączeń systemowych"
-
-#: ../policy/org.freedesktop.network-manager-settings.system.policy.in.h:5
-msgid "System policy prevents modification of system settings"
-msgstr "Polityka systemu powstrzymuje modyfikację ustawień systemowych"
-
-#: ../policy/org.freedesktop.network-manager-settings.system.policy.in.h:6
-msgid "System policy prevents modification of the persistent system hostname"
-msgstr ""
-"Polityka systemu powstrzymuje modyfikację trwałej systemowej nazwy komputera"
-
-#: ../policy/org.freedesktop.network-manager-settings.system.policy.in.h:7
-msgid "System policy prevents sharing connections via a protected WiFi network"
-msgstr ""
-"Polityka systemu powstrzymuje współdzielenie połączeń przez chronioną sieć "
-"WiFi"
-
-#: ../policy/org.freedesktop.network-manager-settings.system.policy.in.h:8
-msgid "System policy prevents sharing connections via an open WiFi network"
-msgstr ""
-"Polityka systemu powstrzymuje współdzielenie połączeń przez otwartą sieć WiFi"
-
 #: ../policy/org.freedesktop.NetworkManager.policy.in.h:1
 msgid "Allow control of network connections"
 msgstr "Umożliwienie kontroli połączeń sieciowych"
 
 #: ../policy/org.freedesktop.NetworkManager.policy.in.h:2
-msgid "Allow use of user-specific connections"
-msgstr "Umożliwienie użycia połączeń użytkowników"
+msgid "Connection sharing via a protected WiFi network"
+msgstr "Współdzielenie połączenia przez chronioną sieć WiFi"
 
 #: ../policy/org.freedesktop.NetworkManager.policy.in.h:3
+msgid "Connection sharing via an open WiFi network"
+msgstr "Współdzielenie połączenia przez otwartą sieć WiFi"
+
+#: ../policy/org.freedesktop.NetworkManager.policy.in.h:4
 msgid "Enable or disable WiFi devices"
 msgstr "Włączenie lub wyłączenie urządzeń WiFi"
 
-#: ../policy/org.freedesktop.NetworkManager.policy.in.h:4
+#: ../policy/org.freedesktop.NetworkManager.policy.in.h:5
+msgid "Enable or disable WiMAX mobile broadband devices"
+msgstr "Włączenie lub wyłączenie urządzeń komórkowych WiMAX"
+
+#: ../policy/org.freedesktop.NetworkManager.policy.in.h:6
 msgid "Enable or disable mobile broadband devices"
 msgstr "Włączenie lub wyłączenie urządzeń komórkowych"
 
-#: ../policy/org.freedesktop.NetworkManager.policy.in.h:5
+#: ../policy/org.freedesktop.NetworkManager.policy.in.h:7
 msgid "Enable or disable system networking"
 msgstr "Włączenie lub wyłączenie sieci systemowej"
 
-#: ../policy/org.freedesktop.NetworkManager.policy.in.h:6
+#: ../policy/org.freedesktop.NetworkManager.policy.in.h:8
+msgid "Modify network connections for all users"
+msgstr "Modyfikacja połączeń sieciowych dla wszystkich użytkowników"
+
+#: ../policy/org.freedesktop.NetworkManager.policy.in.h:9
+msgid "Modify persistent system hostname"
+msgstr "Modyfikacja trwałej systemowej nazwy komputera"
+
+#: ../policy/org.freedesktop.NetworkManager.policy.in.h:10
+msgid "Modify personal network connections"
+msgstr "Modyfikacja osobistych połączeń sieciowych"
+
+#: ../policy/org.freedesktop.NetworkManager.policy.in.h:11
 msgid ""
 "Put NetworkManager to sleep or wake it up (should only be used by system "
 "power management)"
 msgstr ""
-"Umieszczenie programu NetworkManager w stanie uśpienia lub przebudzenie go "
+"Umieszczenie usługi NetworkManager w stanie uśpienia lub przebudzenie go "
 "(powinno być używane tylko przez systemowe zarządzanie zasilaniem)"
 
-#: ../policy/org.freedesktop.NetworkManager.policy.in.h:7
+#: ../policy/org.freedesktop.NetworkManager.policy.in.h:12
 msgid "System policy prevents control of network connections"
 msgstr "Polityka systemu powstrzymuje kontrolę połączeń sieciowych"
 
-#: ../policy/org.freedesktop.NetworkManager.policy.in.h:8
+#: ../policy/org.freedesktop.NetworkManager.policy.in.h:13
 msgid "System policy prevents enabling or disabling WiFi devices"
 msgstr "Polityka systemu powstrzymuje włączanie lub wyłączanie urządzeń WiFi"
 
-#: ../policy/org.freedesktop.NetworkManager.policy.in.h:9
+#: ../policy/org.freedesktop.NetworkManager.policy.in.h:14
+msgid ""
+"System policy prevents enabling or disabling WiMAX mobile broadband devices"
+msgstr ""
+"Polityka systemu powstrzymuje włączenie lub wyłączenie urządzeń komórkowych "
+"WiMAX"
+
+#: ../policy/org.freedesktop.NetworkManager.policy.in.h:15
 msgid "System policy prevents enabling or disabling mobile broadband devices"
 msgstr ""
 "Polityka systemu powstrzymuje włączenie lub wyłączenie urządzeń komórkowych"
 
-#: ../policy/org.freedesktop.NetworkManager.policy.in.h:10
+#: ../policy/org.freedesktop.NetworkManager.policy.in.h:16
 msgid "System policy prevents enabling or disabling system networking"
 msgstr ""
 "Polityka systemu powstrzymuje włączanie lub wyłączanie sieci systemowej"
 
-#: ../policy/org.freedesktop.NetworkManager.policy.in.h:11
-msgid "System policy prevents putting NetworkManager to sleep or waking it up"
+#: ../policy/org.freedesktop.NetworkManager.policy.in.h:17
+msgid "System policy prevents modification of network settings for all users"
 msgstr ""
-"Polityka systemu powstrzymuje umieszczenie programu NetworkManager w stanie "
-"uśpienia lub przebudzenie go"
+"Polityka systemu powstrzymuje modyfikację ustawień sieciowych dla wszystkich "
+"użytkowników"
 
-#: ../policy/org.freedesktop.NetworkManager.policy.in.h:12
-msgid "System policy prevents use of user-specific connections"
-msgstr "Polityka systemu powstrzymuje użycie połączeń użytkownika"
-
-#: ../src/nm-netlink-monitor.c:100 ../src/nm-netlink-monitor.c:231
-#: ../src/nm-netlink-monitor.c:653
-#, c-format
-msgid "error processing netlink message: %s"
-msgstr "błąd podczas przetwarzania komunikatu netlink: %s"
-
-#: ../src/nm-netlink-monitor.c:214
-msgid "error occurred while waiting for data on socket"
-msgstr "wystąpił błąd podczas oczekiwania na dane na gnieździe"
-
-#: ../src/nm-netlink-monitor.c:254
-#, c-format
-msgid "unable to connect to netlink for monitoring link status: %s"
+#: ../policy/org.freedesktop.NetworkManager.policy.in.h:18
+msgid "System policy prevents modification of personal network settings"
 msgstr ""
-"nie można połączyć się z netlink dla monitorowania stanu połączenia: %s"
+"Polityka systemu powstrzymuje modyfikację osobistych ustawień systemowych"
 
-#: ../src/nm-netlink-monitor.c:265
-#, c-format
-msgid "unable to enable netlink handle credential passing: %s"
+#: ../policy/org.freedesktop.NetworkManager.policy.in.h:19
+msgid "System policy prevents modification of the persistent system hostname"
 msgstr ""
-"nie można włączyć przekazywania danych uwierzytelniających uchwytu netlink: "
-"%s"
+"Polityka systemu powstrzymuje modyfikację trwałej systemowej nazwy komputera"
 
-#: ../src/nm-netlink-monitor.c:291 ../src/nm-netlink-monitor.c:353
-#, c-format
-msgid "unable to allocate netlink handle for monitoring link status: %s"
+#: ../policy/org.freedesktop.NetworkManager.policy.in.h:20
+msgid "System policy prevents putting NetworkManager to sleep or waking it up"
 msgstr ""
-"nie można przydzielić uchwytu netlink dla monitorowania stanu połączenia: %s"
+"Polityka systemu powstrzymuje umieszczenie usługi NetworkManager w stanie "
+"uśpienia lub przebudzenie go"
 
-#: ../src/nm-netlink-monitor.c:376
-#, c-format
-msgid "unable to allocate netlink link cache for monitoring link status: %s"
+#: ../policy/org.freedesktop.NetworkManager.policy.in.h:21
+msgid "System policy prevents sharing connections via a protected WiFi network"
 msgstr ""
-"nie można przydzielić pamięci podręcznej połączenia netlink dla "
-"monitorowania stanu połączenia: %s"
-
-#: ../src/nm-netlink-monitor.c:502
-#, c-format
-msgid "unable to join netlink group: %s"
-msgstr "nie można dołączyć do grupy netlink: %s"
+"Polityka systemu powstrzymuje współdzielenie połączeń przez chronioną sieć "
+"WiFi"
 
-#: ../src/nm-netlink-monitor.c:629 ../src/nm-netlink-monitor.c:642
-#, c-format
-msgid "error updating link cache: %s"
-msgstr "błąd podczas aktualizowania pamięci podręcznej połączenia: %s"
+#: ../policy/org.freedesktop.NetworkManager.policy.in.h:22
+msgid "System policy prevents sharing connections via an open WiFi network"
+msgstr ""
+"Polityka systemu powstrzymuje współdzielenie połączeń przez otwartą sieć WiFi"
 
-#: ../src/main.c:499
+#: ../src/main.c:519
 #, c-format
 msgid "Invalid option.  Please use --help to see a list of valid options.\n"
 msgstr ""
 "Nieprawidłowa opcja. Parametr --help wyświetli listę prawidłowych opcji.\n"
 
-#: ../src/main.c:570
+#: ../src/main.c:590
 #, c-format
 msgid "%s.  Please use --help to see a list of valid options.\n"
 msgstr "%s. Parametr --help wyświetli listę prawidłowych opcji.\n"
 
-#: ../src/dhcp-manager/nm-dhcp-dhclient.c:328
+#: ../src/dhcp-manager/nm-dhcp-dhclient-utils.c:62
 msgid "# Created by NetworkManager\n"
-msgstr "# Utworzony przez program NetworkManager\n"
+msgstr "# Utworzony przez usługę NetworkManager\n"
 
-#: ../src/dhcp-manager/nm-dhcp-dhclient.c:344
+#: ../src/dhcp-manager/nm-dhcp-dhclient-utils.c:69
 #, c-format
 msgid ""
 "# Merged from %s\n"
@@ -1762,30 +1919,116 @@ msgstr "nie można odnaleźć usługi \"dhcpcd\"."
 msgid "unsupported DHCP client '%s'"
 msgstr "nieobsługiwany klient DHCP \"%s\""
 
-#: ../src/logging/nm-logging.c:146
+#: ../src/dns-manager/nm-dns-manager.c:367
+msgid "NOTE: the libc resolver may not support more than 3 nameservers."
+msgstr "UWAGA: obsługa nazw libc nie obsługuje więcej niż 3 serwery nazw."
+
+#: ../src/dns-manager/nm-dns-manager.c:369
+msgid "The nameservers listed below may not be recognized."
+msgstr "Poniższe serwery nazw nie mogą nie zostać rozpoznane."
+
+#: ../src/logging/nm-logging.c:148
 #, c-format
 msgid "Unknown log level '%s'"
 msgstr "Nieznany poziom dziennika \"%s\""
 
-#: ../src/logging/nm-logging.c:171
+#: ../src/logging/nm-logging.c:173
 #, c-format
 msgid "Unknown log domain '%s'"
 msgstr "Nieznana domena dziennika \"%s\""
 
-#: ../src/dns-manager/nm-dns-manager.c:384
-msgid "NOTE: the libc resolver may not support more than 3 nameservers."
-msgstr "UWAGA: obsługa nazw libc nie obsługuje więcej niż 3 serwery nazw."
+#: ../src/modem-manager/nm-modem-cdma.c:294 ../src/nm-device-bt.c:353
+#, c-format
+msgid "CDMA connection %d"
+msgstr "Połączenie CDMA %d"
 
-#: ../src/dns-manager/nm-dns-manager.c:386
-msgid "The nameservers listed below may not be recognized."
-msgstr "Poniższe serwery nazw nie mogą nie zostać rozpoznane."
+#: ../src/modem-manager/nm-modem-gsm.c:497 ../src/nm-device-bt.c:349
+#, c-format
+msgid "GSM connection %d"
+msgstr "Połączenie GSM %d"
 
-#: ../src/system-settings/nm-default-wired-connection.c:157
+#: ../src/nm-device-bt.c:324
 #, c-format
-msgid "Auto %s"
-msgstr "Automatyczne %s"
+msgid "PAN connection %d"
+msgstr "Połączenie PAN %d"
+
+#: ../src/nm-device-bt.c:357
+#, c-format
+msgid "DUN connection %d"
+msgstr "Połączenie DUN %d"
+
+#: ../src/nm-device-ethernet.c:1681
+#, c-format
+msgid "PPPoE connection %d"
+msgstr "Połączenie PPPoE %d"
+
+#: ../src/nm-device-ethernet.c:1681
+#, c-format
+msgid "Wired connection %d"
+msgstr "Połączenie przewodowe %d"
+
+#: ../src/nm-device-olpc-mesh.c:422
+#, c-format
+msgid "Mesh %d"
+msgstr "Sieć kratowa %d"
+
+#: ../src/nm-manager.c:656
+#, c-format
+msgid "VPN connection %d"
+msgstr "Połączenie VPN %d"
 
-#: ../system-settings/plugins/ifcfg-rh/reader.c:3412
-#: ../system-settings/plugins/ifnet/connection_parser.c:49
+#: ../src/nm-netlink-monitor.c:100 ../src/nm-netlink-monitor.c:231
+#: ../src/nm-netlink-monitor.c:653
+#, c-format
+msgid "error processing netlink message: %s"
+msgstr "błąd podczas przetwarzania komunikatu netlink: %s"
+
+#: ../src/nm-netlink-monitor.c:214
+msgid "error occurred while waiting for data on socket"
+msgstr "wystąpił błąd podczas oczekiwania na dane na gnieździe"
+
+#: ../src/nm-netlink-monitor.c:254
+#, c-format
+msgid "unable to connect to netlink for monitoring link status: %s"
+msgstr ""
+"nie można połączyć się z netlink dla monitorowania stanu połączenia: %s"
+
+#: ../src/nm-netlink-monitor.c:265
+#, c-format
+msgid "unable to enable netlink handle credential passing: %s"
+msgstr ""
+"nie można włączyć przekazywania danych uwierzytelniających uchwytu netlink: "
+"%s"
+
+#: ../src/nm-netlink-monitor.c:291 ../src/nm-netlink-monitor.c:353
+#, c-format
+msgid "unable to allocate netlink handle for monitoring link status: %s"
+msgstr ""
+"nie można przydzielić uchwytu netlink dla monitorowania stanu połączenia: %s"
+
+#: ../src/nm-netlink-monitor.c:376
+#, c-format
+msgid "unable to allocate netlink link cache for monitoring link status: %s"
+msgstr ""
+"nie można przydzielić pamięci podręcznej połączenia netlink dla "
+"monitorowania stanu połączenia: %s"
+
+#: ../src/nm-netlink-monitor.c:502
+#, c-format
+msgid "unable to join netlink group: %s"
+msgstr "nie można dołączyć do grupy netlink: %s"
+
+#: ../src/nm-netlink-monitor.c:629 ../src/nm-netlink-monitor.c:642
+#, c-format
+msgid "error updating link cache: %s"
+msgstr "błąd podczas aktualizowania pamięci podręcznej połączenia: %s"
+
+#: ../src/settings/plugins/ifcfg-rh/reader.c:3458
+#: ../src/settings/plugins/ifnet/connection_parser.c:49
 msgid "System"
 msgstr "Systemowe"
+
+#: ../src/settings/nm-default-wired-connection.c:143
+#, c-format
+msgid "Auto %s"
+msgstr "Automatyczne %s"
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 40919e8a..3b364b50 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -1321,7 +1321,7 @@ msgstr ""
 msgid "The nameservers listed below may not be recognized."
 msgstr "Os servidores de nomes listados abaixo podem não ser reconhecidos."
 
-#: ../src/system-settings/nm-default-wired-connection.c:157
+#: ../src/settings/nm-default-wired-connection.c:157
 #, c-format
 msgid "Auto %s"
 msgstr "Auto %s"
diff --git a/po/ru.po b/po/ru.po
index 2595ab3c..5dc18f38 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -1604,7 +1604,7 @@ msgstr ""
 msgid "The nameservers listed below may not be recognized."
 msgstr "Нижеперечисленные сервера могут быть пропущены."
 
-#: ../src/system-settings/nm-default-wired-connection.c:157
+#: ../src/settings/nm-default-wired-connection.c:157
 #, c-format
 msgid "Auto %s"
 msgstr "Авто %s"
diff --git a/po/sl.po b/po/sl.po
index cb37ee82..33af9c1e 100644
--- a/po/sl.po
+++ b/po/sl.po
@@ -1839,7 +1839,7 @@ msgstr "OPOMBA: razreševalnik libc morda ne podpira več kot 3 imenskih strežn
 msgid "The nameservers listed below may not be recognized."
 msgstr "Navedeni imenski strežniki morda ne bodo prepoznani."
 
-#: ../src/system-settings/nm-default-wired-connection.c:157
+#: ../src/settings/nm-default-wired-connection.c:157
 #, c-format
 msgid "Auto %s"
 msgstr "Samodejno %s"
diff --git a/po/sv.po b/po/sv.po
index 56b73dc1..eb8da2ea 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -1858,7 +1858,7 @@ msgstr "OBSERVERA: uppslag via glibc kanske inte har stöd för fler än 3 namns
 msgid "The nameservers listed below may not be recognized."
 msgstr "Namnservrarna listade nedan kanske inte kommer att kännas igen."
 
-#: ../src/system-settings/nm-default-wired-connection.c:157
+#: ../src/settings/nm-default-wired-connection.c:157
 #, c-format
 msgid "Auto %s"
 msgstr "Automatisk %s"
diff --git a/po/ta.po b/po/ta.po
index 8ab5caeb..44125c38 100644
--- a/po/ta.po
+++ b/po/ta.po
@@ -1602,7 +1602,7 @@ msgstr "குறிப்பு: இந்த libc மறுதீர்வா�
 msgid "The nameservers listed below may not be recognized."
 msgstr "கீழே பட்டியலிட்டப்படுள்ள பெயர்சேவையகங்கள் கண்டுபிடிக்கப்படவில்லை."
 
-#: ../src/system-settings/nm-default-wired-connection.c:157
+#: ../src/settings/nm-default-wired-connection.c:157
 #, c-format
 msgid "Auto %s"
 msgstr "தானியக்கி %s"
diff --git a/po/te.po b/po/te.po
index cf055614..a8d55575 100644
--- a/po/te.po
+++ b/po/te.po
@@ -1689,7 +1689,7 @@ msgstr "గమనిక: libc రిజాల్వర్ 3 నామపు స�
 msgid "The nameservers listed below may not be recognized."
 msgstr "క్రిందన జాబితాచేసివున్న నామపుసేవికలు గుర్తించబడక పోవచ్చును."
 
-#: ../src/system-settings/nm-default-wired-connection.c:157
+#: ../src/settings/nm-default-wired-connection.c:157
 #, c-format
 msgid "Auto %s"
 msgstr "స్వయంచాలక %s"
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 81e2e6b6..5f4b64f4 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -1690,7 +1690,7 @@ msgstr "注意：libc 解析器可能不支持超过三个名字服务器。"
 msgid "The nameservers listed below may not be recognized."
 msgstr "以下列出的名字服务器可能无法被识别。"
 
-#: ../src/system-settings/nm-default-wired-connection.c:157
+#: ../src/settings/nm-default-wired-connection.c:157
 #, c-format
 msgid "Auto %s"
 msgstr "自动 %s"
diff --git a/po/zh_TW.po b/po/zh_TW.po
index 25e81bbe..d6e530fd 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -1599,7 +1599,7 @@ msgstr "注意：libc 解析器不支援 3 個以上的名稱伺服器。"
 msgid "The nameservers listed below may not be recognized."
 msgstr "下面列出的名稱伺服器可能不會被辨識。"
 
-#: ../src/system-settings/nm-default-wired-connection.c:157
+#: ../src/settings/nm-default-wired-connection.c:157
 #, c-format
 msgid "Auto %s"
 msgstr "自動 %s"
author	Michael Biebl <biebl@debian.org>	2011-04-08 07:30:59 +0200
committer	Michael Biebl <biebl@debian.org>	2011-04-08 07:30:59 +0200
commit	f75dd6fd1975146623052b843b182dc32c3fbe46 (patch)
tree	05ba60b772670f038c9a1fbff940ec5d3e28d870 /po
parent	c980bdf58dc973dd5617aaa6f9466f9e44fcbf58 (diff)