From 9c202e3e860b3be9e1f8882630b69affbb130102 Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Sun, 3 Feb 2013 14:49:22 +0100 Subject: Imported Upstream version 0.9.7.995 --- Makefile.am | 8 +- Makefile.in | 99 +- NEWS | 47 +- TODO | 32 - aclocal.m4 | 1 + callouts/Makefile.am | 8 +- callouts/Makefile.in | 82 +- callouts/nm-dispatcher-action.c | 675 +-- callouts/nm-dispatcher-action.h | 16 +- callouts/nm-dispatcher.xml | 12 + callouts/tests/Makefile.am | 7 +- callouts/tests/Makefile.in | 140 +- callouts/tests/test-dispatcher-envp.c | 1 - cli/Makefile.in | 57 +- cli/src/Makefile.am | 3 +- cli/src/Makefile.in | 79 +- cli/src/common.c | 11 +- cli/src/connections.c | 61 +- cli/src/devices.c | 49 +- cli/src/network-manager.c | 5 +- cli/src/nmcli.c | 19 +- cli/src/settings.c | 125 +- cli/src/settings.h | 4 + cli/src/utils.c | 10 +- config.h.in | 60 +- configure | 3110 ++++++------- configure.ac | 680 ++- data/Makefile.in | 57 +- data/NetworkManager.service.in | 4 + docs/Makefile.am | 3 +- docs/Makefile.in | 59 +- docs/api/Makefile.am | 12 +- docs/api/Makefile.in | 639 +-- docs/api/generate-settings-spec.c | 8 +- docs/api/html/NetworkManager.devhelp2 | 28 +- docs/api/html/index.html | 32 +- docs/api/html/ix01.html | 2 +- docs/api/html/ref-migrating.html | 58 +- docs/api/html/ref-settings.html | 247 +- docs/api/html/spec.html | 81 +- docs/api/settings-spec.xml | 187 +- docs/api/spec.html | 81 +- docs/api/version.xml | 2 +- docs/libnm-glib/Makefile.am | 6 +- docs/libnm-glib/Makefile.in | 65 +- docs/libnm-glib/html/NMAccessPoint.html | 4 +- docs/libnm-glib/html/NMClient.html | 10 +- docs/libnm-glib/html/NMDevice.html | 1 + docs/libnm-glib/html/NMDeviceBond.html | 4 +- docs/libnm-glib/html/NMDeviceBridge.html | 331 ++ docs/libnm-glib/html/NMDeviceInfiniband.html | 4 +- docs/libnm-glib/html/NMDeviceWifi.html | 2 +- docs/libnm-glib/html/NMSecretAgent.html | 20 +- docs/libnm-glib/html/api-index-full.html | 60 + docs/libnm-glib/html/ch02.html | 5 +- docs/libnm-glib/html/index.html | 7 +- docs/libnm-glib/html/index.sgml | 27 + docs/libnm-glib/html/libnm-glib.devhelp2 | 20 + docs/libnm-glib/html/object-tree.html | 1 + docs/libnm-glib/libnm-glib-docs.xml | 1 + docs/libnm-glib/libnm-glib-sections.txt | 27 + docs/libnm-glib/libnm-glib.types | 2 + docs/libnm-glib/tmpl/libnm_glib.sgml | 2 - docs/libnm-glib/tmpl/nm-access-point.sgml | 2 - docs/libnm-glib/tmpl/nm-active-connection.sgml | 2 - docs/libnm-glib/tmpl/nm-client.sgml | 2 - docs/libnm-glib/tmpl/nm-device-adsl.sgml | 2 - docs/libnm-glib/tmpl/nm-device-bond.sgml | 2 - docs/libnm-glib/tmpl/nm-device-bridge.sgml | 140 + docs/libnm-glib/tmpl/nm-device-bt.sgml | 2 - docs/libnm-glib/tmpl/nm-device-ethernet.sgml | 2 - docs/libnm-glib/tmpl/nm-device-infiniband.sgml | 2 - docs/libnm-glib/tmpl/nm-device-modem.sgml | 2 - docs/libnm-glib/tmpl/nm-device-olpc-mesh.sgml | 2 - docs/libnm-glib/tmpl/nm-device-vlan.sgml | 2 - docs/libnm-glib/tmpl/nm-device-wifi.sgml | 2 - docs/libnm-glib/tmpl/nm-device-wimax.sgml | 2 - docs/libnm-glib/tmpl/nm-device.sgml | 2 - docs/libnm-glib/tmpl/nm-dhcp4-config.sgml | 2 - docs/libnm-glib/tmpl/nm-dhcp6-config.sgml | 2 - docs/libnm-glib/tmpl/nm-glib-enum-types.sgml | 2 - docs/libnm-glib/tmpl/nm-glib-marshal.sgml | 2 - docs/libnm-glib/tmpl/nm-ip4-config.sgml | 2 - docs/libnm-glib/tmpl/nm-ip6-config.sgml | 2 - docs/libnm-glib/tmpl/nm-object.sgml | 2 - docs/libnm-glib/tmpl/nm-remote-connection.sgml | 2 - docs/libnm-glib/tmpl/nm-remote-settings.sgml | 2 - docs/libnm-glib/tmpl/nm-secret-agent.sgml | 2 - docs/libnm-glib/tmpl/nm-types.sgml | 2 - docs/libnm-glib/tmpl/nm-vpn-connection.sgml | 2 - docs/libnm-glib/tmpl/nm-vpn-enum-types.sgml | 2 - .../tmpl/nm-vpn-plugin-ui-interface.sgml | 2 - docs/libnm-glib/tmpl/nm-vpn-plugin-utils.sgml | 2 - docs/libnm-glib/tmpl/nm-vpn-plugin.sgml | 2 - docs/libnm-glib/tmpl/nm-wimax-nsp.sgml | 2 - docs/libnm-glib/version.xml | 2 +- docs/libnm-util/Makefile.am | 3 +- docs/libnm-util/Makefile.in | 62 +- docs/libnm-util/html/NMConnection.html | 50 + docs/libnm-util/html/NMSetting.html | 12 +- docs/libnm-util/html/NMSettingBond.html | 4 +- docs/libnm-util/html/NMSettingBridge.html | 472 ++ docs/libnm-util/html/NMSettingBridgePort.html | 314 ++ docs/libnm-util/html/NMSettingConnection.html | 126 + docs/libnm-util/html/NMSettingGsm.html | 18 +- docs/libnm-util/html/NMSettingIP4Config.html | 4 +- docs/libnm-util/html/NMSettingIP6Config.html | 45 + docs/libnm-util/html/NMSettingInfiniband.html | 4 +- docs/libnm-util/html/NMSettingVlan.html | 11 +- docs/libnm-util/html/NMSettingWireless.html | 27 +- docs/libnm-util/html/api-index-full.html | 240 + docs/libnm-util/html/ch01.html | 8 +- docs/libnm-util/html/index.html | 10 +- docs/libnm-util/html/index.sgml | 84 + docs/libnm-util/html/libnm-util-nm-utils.html | 86 + docs/libnm-util/html/libnm-util.devhelp2 | 70 + docs/libnm-util/html/object-tree.html | 16 +- docs/libnm-util/libnm-util-docs.sgml | 2 + docs/libnm-util/libnm-util-sections.txt | 83 +- docs/libnm-util/libnm-util.types | 4 + docs/libnm-util/tmpl/nm-connection-private.sgml | 24 - docs/libnm-util/tmpl/nm-connection.sgml | 20 +- docs/libnm-util/tmpl/nm-setting-8021x.sgml | 2 - docs/libnm-util/tmpl/nm-setting-adsl.sgml | 2 - docs/libnm-util/tmpl/nm-setting-bluetooth.sgml | 2 - docs/libnm-util/tmpl/nm-setting-bond.sgml | 2 - docs/libnm-util/tmpl/nm-setting-bridge-port.sgml | 143 + docs/libnm-util/tmpl/nm-setting-bridge.sgml | 227 + docs/libnm-util/tmpl/nm-setting-cdma.sgml | 2 - docs/libnm-util/tmpl/nm-setting-connection.sgml | 52 +- docs/libnm-util/tmpl/nm-setting-gsm.sgml | 4 +- docs/libnm-util/tmpl/nm-setting-infiniband.sgml | 2 - docs/libnm-util/tmpl/nm-setting-ip4-config.sgml | 2 - docs/libnm-util/tmpl/nm-setting-ip6-config.sgml | 23 +- docs/libnm-util/tmpl/nm-setting-olpc-mesh.sgml | 2 - docs/libnm-util/tmpl/nm-setting-ppp.sgml | 2 - docs/libnm-util/tmpl/nm-setting-pppoe.sgml | 2 - docs/libnm-util/tmpl/nm-setting-private.sgml | 10 +- docs/libnm-util/tmpl/nm-setting-serial.sgml | 2 - docs/libnm-util/tmpl/nm-setting-vlan.sgml | 3 +- docs/libnm-util/tmpl/nm-setting-vpn.sgml | 2 - docs/libnm-util/tmpl/nm-setting-wimax.sgml | 2 - docs/libnm-util/tmpl/nm-setting-wired.sgml | 2 - .../tmpl/nm-setting-wireless-security.sgml | 2 - docs/libnm-util/tmpl/nm-setting-wireless.sgml | 9 +- docs/libnm-util/tmpl/nm-setting.sgml | 2 - docs/libnm-util/tmpl/nm-utils-enum-types.sgml | 2 - docs/libnm-util/tmpl/nm-utils.sgml | 30 +- docs/libnm-util/version.xml | 2 +- examples/C/Makefile.in | 57 +- examples/C/glib/Makefile.am | 4 +- examples/C/glib/Makefile.in | 80 +- examples/C/glib/get-ap-info-libnm-glib.c | 4 +- examples/C/qt/Makefile.in | 72 +- examples/Makefile.am | 3 +- examples/Makefile.in | 60 +- examples/dispatcher/70-wifi-wired-exclusive.sh | 26 + examples/dispatcher/Makefile.am | 3 + examples/dispatcher/Makefile.in | 527 +++ examples/python/Makefile.am | 5 +- examples/python/Makefile.in | 62 +- examples/python/add-connection.py | 63 + examples/python/add-system-connection.py | 48 - examples/python/nm-state.py | 21 +- examples/ruby/Makefile.in | 57 +- examples/ruby/list-devices.rb | 10 +- examples/shell/Makefile.am | 5 +- examples/shell/Makefile.in | 62 +- examples/shell/active-wifi.sh | 88 + examples/shell/disconnect-device.sh | 77 + examples/shell/list-devices.sh | 105 + include/Makefile.in | 57 +- include/NetworkManager.h | 30 +- include/nm-glib-compat.h | 9 + include/nm-version.h | 2 +- initscript/Arch/Makefile.am | 2 - initscript/Arch/Makefile.in | 587 --- initscript/Debian/Makefile.am | 2 - initscript/Debian/Makefile.in | 587 --- initscript/Gentoo/Makefile.am | 2 - initscript/Gentoo/Makefile.in | 587 --- initscript/Gentoo/NetworkManager.in | 23 - initscript/Makefile.am | 28 - initscript/Makefile.in | 725 --- initscript/Mandriva/Makefile.am | 3 - initscript/Mandriva/Makefile.in | 587 --- initscript/RedHat/Makefile.am | 6 - initscript/RedHat/Makefile.in | 587 --- initscript/SUSE/Makefile.am | 5 - initscript/SUSE/Makefile.in | 522 --- initscript/Slackware/Makefile.am | 3 - initscript/Slackware/Makefile.in | 587 --- initscript/linexa/Makefile.am | 3 - initscript/linexa/Makefile.in | 587 --- initscript/paldo/Makefile.am | 3 - initscript/paldo/Makefile.in | 587 --- introspection/Makefile.am | 1 + introspection/Makefile.in | 58 +- introspection/all.xml.in | 1 + introspection/generic-types.xml | 19 +- introspection/nm-active-connection.xml | 5 + introspection/nm-device-bridge.xml | 34 + introspection/nm-device.xml | 25 + introspection/nm-manager.xml | 29 +- libnm-glib/Makefile.am | 22 +- libnm-glib/Makefile.in | 118 +- libnm-glib/libnm-glib.ver | 10 + libnm-glib/nm-access-point.c | 7 +- libnm-glib/nm-client.c | 86 +- libnm-glib/nm-client.h | 5 +- libnm-glib/nm-device-bridge.c | 346 ++ libnm-glib/nm-device-bridge.h | 84 + libnm-glib/nm-device-wifi.c | 90 +- libnm-glib/nm-device-wifi.h | 7 + libnm-glib/nm-device.c | 23 + libnm-glib/nm-glib-enum-types.c | 22 + libnm-glib/nm-glib-enum-types.h | 2 + libnm-glib/nm-remote-settings.c | 101 +- libnm-glib/nm-secret-agent.c | 79 +- libnm-glib/nm-secret-agent.h | 21 +- libnm-glib/tests/Makefile.am | 5 +- libnm-glib/tests/Makefile.in | 135 +- libnm-util/Makefile.am | 11 +- libnm-util/Makefile.in | 107 +- libnm-util/libnm-util.ver | 28 + libnm-util/nm-connection.c | 366 +- libnm-util/nm-connection.h | 4 + libnm-util/nm-setting-8021x.c | 8 +- libnm-util/nm-setting-adsl.c | 7 +- libnm-util/nm-setting-bluetooth.c | 9 +- libnm-util/nm-setting-bond.c | 36 +- libnm-util/nm-setting-bridge-port.c | 281 ++ libnm-util/nm-setting-bridge-port.h | 86 + libnm-util/nm-setting-bridge.c | 498 +++ libnm-util/nm-setting-bridge.h | 98 + libnm-util/nm-setting-cdma.c | 7 +- libnm-util/nm-setting-connection.c | 133 +- libnm-util/nm-setting-connection.h | 7 +- libnm-util/nm-setting-gsm.c | 18 +- libnm-util/nm-setting-gsm.h | 8 +- libnm-util/nm-setting-infiniband.c | 8 +- libnm-util/nm-setting-ip4-config.c | 17 +- libnm-util/nm-setting-ip6-config.c | 56 +- libnm-util/nm-setting-ip6-config.h | 3 + libnm-util/nm-setting-olpc-mesh.c | 8 +- libnm-util/nm-setting-ppp.c | 8 +- libnm-util/nm-setting-pppoe.c | 7 +- libnm-util/nm-setting-private.h | 12 + libnm-util/nm-setting-serial.c | 8 +- libnm-util/nm-setting-vlan.c | 80 +- libnm-util/nm-setting-vlan.h | 7 +- libnm-util/nm-setting-vpn.c | 7 +- libnm-util/nm-setting-wimax.c | 8 +- libnm-util/nm-setting-wired.c | 9 +- libnm-util/nm-setting-wireless-security.c | 14 +- libnm-util/nm-setting-wireless.c | 68 +- libnm-util/nm-setting-wireless.h | 8 + libnm-util/nm-utils-enum-types.c | 45 + libnm-util/nm-utils-enum-types.h | 4 + libnm-util/nm-utils.c | 101 +- libnm-util/nm-utils.h | 7 + libnm-util/tests/Makefile.am | 5 +- libnm-util/tests/Makefile.in | 331 +- libnm-util/tests/certs/Makefile.in | 57 +- libnm-util/tests/test-general.c | 1 + m4/gnome-code-coverage.m4 | 162 + man/Makefile.in | 57 +- man/NetworkManager.conf.5 | 35 +- man/NetworkManager.conf.5.in | 35 +- po/POTFILES.in | 4 +- po/POTFILES.skip | 1 + po/as.po | 4686 ++++++++++++++++---- po/bn_IN.po | 2465 +++++++--- po/de.po | 962 ++-- po/el.po | 2432 +++++++--- po/en_GB.po | 2763 +++++++++++- po/gl.po | 2086 +++++---- po/gu.po | 2443 +++++++--- po/hi.po | 2522 ++++++++--- po/id.po | 1927 ++++---- po/it.po | 2129 ++++++--- po/kn.po | 2682 ++++++++--- po/lt.po | 2101 +++++---- po/ml.po | 2116 +++++---- po/mr.po | 2301 ++++++---- po/or.po | 2635 ++++++++--- po/pa.po | 2525 ++++++++--- po/ru.po | 2082 ++++++--- po/sl.po | 791 ++-- po/ta.po | 2419 +++++++--- po/te.po | 2627 ++++++++--- po/uk.po | 1927 ++++---- policy/Makefile.am | 8 +- policy/Makefile.in | 102 +- policy/org.freedesktop.NetworkManager.policy | 802 ---- policy/org.freedesktop.NetworkManager.policy.in | 112 - policy/org.freedesktop.NetworkManager.policy.in.in | 112 + src/Makefile.am | 46 +- src/Makefile.in | 269 +- src/NetworkManagerUtils.c | 284 +- src/NetworkManagerUtils.h | 10 - src/backends/Makefile.am | 85 - src/backends/Makefile.in | 832 ---- src/backends/NetworkManagerArch.c | 60 - src/backends/NetworkManagerDebian.c | 57 - src/backends/NetworkManagerExherbo.c | 54 - src/backends/NetworkManagerFrugalware.c | 43 - src/backends/NetworkManagerGeneric.c | 177 - src/backends/NetworkManagerGeneric.h | 33 - src/backends/NetworkManagerGentoo.c | 82 - src/backends/NetworkManagerLFS.c | 50 - src/backends/NetworkManagerLinexa.c | 53 - src/backends/NetworkManagerMandriva.c | 49 - src/backends/NetworkManagerPaldo.c | 51 - src/backends/NetworkManagerPardus.c | 42 - src/backends/NetworkManagerRedHat.c | 51 - src/backends/NetworkManagerSlackware.c | 42 - src/backends/NetworkManagerSuSE.c | 52 - src/backends/nm-backend.h | 30 - src/bluez-manager/Makefile.am | 1 - src/bluez-manager/Makefile.in | 77 +- src/dhcp-manager/Makefile.am | 10 +- src/dhcp-manager/Makefile.in | 84 +- src/dhcp-manager/nm-dhcp-client.c | 7 +- src/dhcp-manager/nm-dhcp-dhclient-utils.c | 167 +- src/dhcp-manager/nm-dhcp-dhclient-utils.h | 3 + src/dhcp-manager/nm-dhcp-dhclient.c | 190 +- src/dhcp-manager/nm-dhcp-dhclient.h | 2 +- src/dhcp-manager/nm-dhcp-dhcpcd.c | 30 +- src/dhcp-manager/nm-dhcp-dhcpcd.h | 2 +- src/dhcp-manager/nm-dhcp-manager.c | 55 +- src/dhcp-manager/nm-dhcp-manager.h | 3 +- src/dhcp-manager/tests/Makefile.am | 5 +- src/dhcp-manager/tests/Makefile.in | 126 +- src/dhcp-manager/tests/test-dhcp-dhclient.c | 23 +- src/dns-manager/Makefile.am | 6 +- src/dns-manager/Makefile.in | 91 +- src/dns-manager/nm-dns-bind.c | 529 --- src/dns-manager/nm-dns-bind.h | 47 - src/dns-manager/nm-dns-dnsmasq.c | 38 +- src/dns-manager/nm-dns-manager.c | 20 +- src/dnsmasq-manager/Makefile.in | 76 +- src/dnsmasq-manager/nm-dnsmasq-manager.c | 25 +- src/firewall-manager/Makefile.in | 76 +- src/generated/Makefile.am | 23 +- src/generated/Makefile.in | 97 +- src/generated/nm-enum-types.c | 283 +- src/generated/nm-enum-types.h | 44 +- src/generated/nm-marshal.c | 150 +- src/generated/nm-marshal.h | 44 +- src/ip6-manager/Makefile.am | 3 +- src/ip6-manager/Makefile.in | 79 +- src/ip6-manager/nm-ip6-manager.c | 10 +- src/logging/Makefile.am | 3 +- src/logging/Makefile.in | 79 +- src/logging/nm-logging.c | 43 +- src/logging/nm-logging.h | 5 +- src/main.c | 57 +- src/modem-manager/Makefile.am | 10 + src/modem-manager/Makefile.in | 146 +- src/modem-manager/README | 45 + src/modem-manager/nm-modem-broadband.c | 1033 +++++ src/modem-manager/nm-modem-broadband.h | 69 + src/modem-manager/nm-modem-cdma.c | 77 +- src/modem-manager/nm-modem-cdma.h | 21 +- src/modem-manager/nm-modem-generic.c | 445 ++ src/modem-manager/nm-modem-generic.h | 69 + src/modem-manager/nm-modem-gsm.c | 99 +- src/modem-manager/nm-modem-gsm.h | 23 +- src/modem-manager/nm-modem-manager.c | 451 +- src/modem-manager/nm-modem-manager.h | 13 +- src/modem-manager/nm-modem-types.h | 39 +- src/modem-manager/nm-modem.c | 629 +-- src/modem-manager/nm-modem.h | 59 +- src/nm-activation-request.c | 311 +- src/nm-activation-request.h | 37 +- src/nm-active-connection.c | 200 +- src/nm-active-connection.h | 29 +- src/nm-config.c | 4 +- src/nm-crash-logger.c | 4 +- src/nm-device-adsl.c | 56 +- src/nm-device-bond.c | 301 +- src/nm-device-bridge.c | 683 +++ src/nm-device-bridge.h | 66 + src/nm-device-bt.c | 317 +- src/nm-device-ethernet.c | 93 +- src/nm-device-infiniband.c | 50 +- src/nm-device-modem.c | 168 +- src/nm-device-olpc-mesh.c | 96 +- src/nm-device-private.h | 13 +- src/nm-device-vlan.c | 76 +- src/nm-device-wifi.c | 631 ++- src/nm-device-wifi.h | 1 + src/nm-device-wired.c | 27 +- src/nm-device.c | 1010 +++-- src/nm-device.h | 34 +- src/nm-dispatcher.c | 396 ++ src/nm-dispatcher.h | 64 + src/nm-manager.c | 551 ++- src/nm-manager.h | 10 +- src/nm-netlink-compat.c | 4 +- src/nm-netlink-compat.h | 16 +- src/nm-policy-hostname.c | 8 +- src/nm-policy.c | 505 ++- src/nm-policy.h | 5 +- src/nm-session-monitor-ck.c | 2 - src/nm-sleep-monitor-systemd.c | 364 ++ src/nm-sleep-monitor-upower.c | 151 + src/nm-sleep-monitor.h | 46 + src/nm-system.c | 332 +- src/nm-system.h | 25 +- src/nm-types.h | 26 + src/nm-udev-manager.c | 17 +- src/nm-wifi-ap-utils.c | 3 +- src/nm-wifi-ap.c | 16 +- src/nm-wifi-ap.h | 2 + src/posix-signals/Makefile.am | 3 +- src/posix-signals/Makefile.in | 79 +- src/ppp-manager/Makefile.am | 1 - src/ppp-manager/Makefile.in | 77 +- src/settings/Makefile.am | 7 +- src/settings/Makefile.in | 83 +- src/settings/nm-agent-manager.c | 3 +- src/settings/nm-inotify-helper.c | 4 + src/settings/nm-inotify-helper.h | 4 + src/settings/nm-secret-agent.c | 30 +- src/settings/nm-settings-connection.c | 74 +- src/settings/nm-settings-connection.h | 5 +- src/settings/nm-settings.c | 28 +- src/settings/plugins/Makefile.am | 12 +- src/settings/plugins/Makefile.in | 68 +- src/settings/plugins/example/Makefile.am | 8 +- src/settings/plugins/example/Makefile.in | 87 +- src/settings/plugins/example/common.h | 2 +- src/settings/plugins/ifcfg-rh/Makefile.am | 12 +- src/settings/plugins/ifcfg-rh/Makefile.in | 87 +- src/settings/plugins/ifcfg-rh/plugin.c | 130 +- src/settings/plugins/ifcfg-rh/reader.c | 373 +- src/settings/plugins/ifcfg-rh/tests/Makefile.am | 8 +- src/settings/plugins/ifcfg-rh/tests/Makefile.in | 200 +- .../ifcfg-rh/tests/network-scripts/Makefile.am | 3 +- .../ifcfg-rh/tests/network-scripts/Makefile.in | 60 +- .../tests/network-scripts/ifcfg-test-bond-slave-ib | 7 + .../network-scripts/ifcfg-test-bridge-component | 2 +- .../tests/network-scripts/ifcfg-test-bridge-main | 2 +- .../plugins/ifcfg-rh/tests/test-ifcfg-rh.c | 555 ++- src/settings/plugins/ifcfg-rh/utils.c | 3 +- src/settings/plugins/ifcfg-rh/writer.c | 233 +- src/settings/plugins/ifcfg-suse/Makefile.am | 7 +- src/settings/plugins/ifcfg-suse/Makefile.in | 86 +- src/settings/plugins/ifnet/Makefile.am | 15 +- src/settings/plugins/ifnet/Makefile.in | 94 +- src/settings/plugins/ifnet/connection_parser.c | 95 +- src/settings/plugins/ifnet/connection_parser.h | 6 +- src/settings/plugins/ifnet/net_parser.c | 12 +- src/settings/plugins/ifnet/net_parser.h | 3 +- src/settings/plugins/ifnet/net_utils.c | 18 +- src/settings/plugins/ifnet/net_utils.h | 4 +- src/settings/plugins/ifnet/nm-ifnet-connection.c | 6 +- src/settings/plugins/ifnet/plugin.c | 4 +- src/settings/plugins/ifnet/tests/Makefile.am | 34 +- src/settings/plugins/ifnet/tests/Makefile.in | 253 +- src/settings/plugins/ifnet/tests/test_all.c | 187 +- src/settings/plugins/ifnet/tests/test_ca_cert.pem | 27 + .../plugins/ifnet/tests/wpa_supplicant.conf | 806 +--- src/settings/plugins/ifnet/wpa_parser.c | 2 +- src/settings/plugins/ifupdown/Makefile.am | 13 +- src/settings/plugins/ifupdown/Makefile.in | 93 +- src/settings/plugins/ifupdown/parser.c | 7 +- src/settings/plugins/ifupdown/tests/Makefile.am | 10 +- src/settings/plugins/ifupdown/tests/Makefile.in | 148 +- src/settings/plugins/keyfile/Makefile.am | 13 +- src/settings/plugins/keyfile/Makefile.in | 88 +- src/settings/plugins/keyfile/common.h | 2 +- .../plugins/keyfile/nm-keyfile-connection.c | 15 +- .../plugins/keyfile/nm-keyfile-connection.h | 3 +- src/settings/plugins/keyfile/plugin.c | 6 +- src/settings/plugins/keyfile/reader.c | 770 ++-- src/settings/plugins/keyfile/tests/Makefile.am | 5 +- src/settings/plugins/keyfile/tests/Makefile.in | 146 +- .../plugins/keyfile/tests/keyfiles/Makefile.am | 4 +- .../plugins/keyfile/tests/keyfiles/Makefile.in | 61 +- .../keyfile/tests/keyfiles/Test_Bridge_Component | 15 + .../keyfile/tests/keyfiles/Test_Bridge_Main | 17 + .../keyfile/tests/keyfiles/Test_Wired_Connection | 8 + src/settings/plugins/keyfile/tests/test-keyfile.c | 584 ++- src/settings/plugins/keyfile/writer.c | 71 +- src/settings/tests/Makefile.am | 5 +- src/settings/tests/Makefile.in | 128 +- src/supplicant-manager/Makefile.am | 2 +- src/supplicant-manager/Makefile.in | 76 +- src/supplicant-manager/nm-supplicant-config.c | 58 +- src/supplicant-manager/nm-supplicant-interface.c | 109 +- src/supplicant-manager/nm-supplicant-interface.h | 15 +- src/supplicant-manager/nm-supplicant-manager.c | 101 +- .../nm-supplicant-settings-verify.c | 2 +- src/supplicant-manager/tests/Makefile.am | 5 +- src/supplicant-manager/tests/Makefile.in | 136 +- src/tests/Makefile.am | 5 +- src/tests/Makefile.in | 211 +- src/vpn-manager/Makefile.am | 3 +- src/vpn-manager/Makefile.in | 79 +- src/vpn-manager/nm-vpn-connection.c | 144 +- src/vpn-manager/nm-vpn-connection.h | 1 - src/vpn-manager/nm-vpn-manager.c | 176 +- src/vpn-manager/nm-vpn-manager.h | 24 +- src/vpn-manager/nm-vpn-service.c | 6 +- src/vpn-manager/nm-vpn-service.h | 2 +- src/wifi/Makefile.in | 76 +- src/wifi/wifi-utils-nl80211.c | 39 +- src/wifi/wifi-utils-wext.c | 5 + src/wifi/wifi-utils.c | 4 +- src/wimax/Makefile.in | 76 +- src/wimax/nm-device-wimax.c | 102 +- test/Makefile.am | 1 - test/Makefile.in | 77 +- test/nm-online.c | 1 - test/nm-tool.c | 4 +- tools/Makefile.in | 57 +- vapi/Makefile.am | 4 +- vapi/Makefile.in | 61 +- 521 files changed, 58924 insertions(+), 35479 deletions(-) create mode 100644 docs/libnm-glib/html/NMDeviceBridge.html create mode 100644 docs/libnm-glib/tmpl/nm-device-bridge.sgml create mode 100644 docs/libnm-util/html/NMSettingBridge.html create mode 100644 docs/libnm-util/html/NMSettingBridgePort.html delete mode 100644 docs/libnm-util/tmpl/nm-connection-private.sgml create mode 100644 docs/libnm-util/tmpl/nm-setting-bridge-port.sgml create mode 100644 docs/libnm-util/tmpl/nm-setting-bridge.sgml create mode 100755 examples/dispatcher/70-wifi-wired-exclusive.sh create mode 100644 examples/dispatcher/Makefile.am create mode 100644 examples/dispatcher/Makefile.in create mode 100755 examples/python/add-connection.py delete mode 100755 examples/python/add-system-connection.py create mode 100755 examples/shell/active-wifi.sh create mode 100755 examples/shell/disconnect-device.sh create mode 100755 examples/shell/list-devices.sh delete mode 100644 initscript/Arch/Makefile.am delete mode 100644 initscript/Arch/Makefile.in delete mode 100644 initscript/Debian/Makefile.am delete mode 100644 initscript/Debian/Makefile.in delete mode 100644 initscript/Gentoo/Makefile.am delete mode 100644 initscript/Gentoo/Makefile.in delete mode 100755 initscript/Gentoo/NetworkManager.in delete mode 100644 initscript/Makefile.am delete mode 100644 initscript/Makefile.in delete mode 100644 initscript/Mandriva/Makefile.am delete mode 100644 initscript/Mandriva/Makefile.in delete mode 100644 initscript/RedHat/Makefile.am delete mode 100644 initscript/RedHat/Makefile.in delete mode 100644 initscript/SUSE/Makefile.am delete mode 100644 initscript/SUSE/Makefile.in delete mode 100644 initscript/Slackware/Makefile.am delete mode 100644 initscript/Slackware/Makefile.in delete mode 100644 initscript/linexa/Makefile.am delete mode 100644 initscript/linexa/Makefile.in delete mode 100644 initscript/paldo/Makefile.am delete mode 100644 initscript/paldo/Makefile.in create mode 100644 introspection/nm-device-bridge.xml create mode 100644 libnm-glib/nm-device-bridge.c create mode 100644 libnm-glib/nm-device-bridge.h create mode 100644 libnm-util/nm-setting-bridge-port.c create mode 100644 libnm-util/nm-setting-bridge-port.h create mode 100644 libnm-util/nm-setting-bridge.c create mode 100644 libnm-util/nm-setting-bridge.h create mode 100644 m4/gnome-code-coverage.m4 delete mode 100644 policy/org.freedesktop.NetworkManager.policy delete mode 100644 policy/org.freedesktop.NetworkManager.policy.in create mode 100644 policy/org.freedesktop.NetworkManager.policy.in.in delete mode 100644 src/backends/Makefile.am delete mode 100644 src/backends/Makefile.in delete mode 100644 src/backends/NetworkManagerArch.c delete mode 100644 src/backends/NetworkManagerDebian.c delete mode 100644 src/backends/NetworkManagerExherbo.c delete mode 100644 src/backends/NetworkManagerFrugalware.c delete mode 100644 src/backends/NetworkManagerGeneric.c delete mode 100644 src/backends/NetworkManagerGeneric.h delete mode 100644 src/backends/NetworkManagerGentoo.c delete mode 100644 src/backends/NetworkManagerLFS.c delete mode 100644 src/backends/NetworkManagerLinexa.c delete mode 100644 src/backends/NetworkManagerMandriva.c delete mode 100644 src/backends/NetworkManagerPaldo.c delete mode 100644 src/backends/NetworkManagerPardus.c delete mode 100644 src/backends/NetworkManagerRedHat.c delete mode 100644 src/backends/NetworkManagerSlackware.c delete mode 100644 src/backends/NetworkManagerSuSE.c delete mode 100644 src/backends/nm-backend.h delete mode 100644 src/dns-manager/nm-dns-bind.c delete mode 100644 src/dns-manager/nm-dns-bind.h create mode 100644 src/modem-manager/README create mode 100644 src/modem-manager/nm-modem-broadband.c create mode 100644 src/modem-manager/nm-modem-broadband.h create mode 100644 src/modem-manager/nm-modem-generic.c create mode 100644 src/modem-manager/nm-modem-generic.h create mode 100644 src/nm-device-bridge.c create mode 100644 src/nm-device-bridge.h create mode 100644 src/nm-dispatcher.c create mode 100644 src/nm-dispatcher.h create mode 100644 src/nm-sleep-monitor-systemd.c create mode 100644 src/nm-sleep-monitor-upower.c create mode 100644 src/nm-sleep-monitor.h create mode 100644 src/nm-types.h create mode 100644 src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-bond-slave-ib create mode 100644 src/settings/plugins/ifnet/tests/test_ca_cert.pem create mode 100644 src/settings/plugins/keyfile/tests/keyfiles/Test_Bridge_Component create mode 100644 src/settings/plugins/keyfile/tests/keyfiles/Test_Bridge_Main diff --git a/Makefile.am b/Makefile.am index 9515dc80..d9a5896b 100644 --- a/Makefile.am +++ b/Makefile.am @@ -11,7 +11,6 @@ SUBDIRS = \ tools \ policy \ data \ - initscript \ test \ po \ man \ @@ -32,8 +31,11 @@ DISTCHECK_CONFIGURE_FLAGS = \ --with-docs=yes \ --enable-more-warnings=yes \ --with-udev-dir=$$dc_install_base/lib/udev \ - --with-systemdsystemunitdir=$$dc_install_base/$(systemdsystemunitdir) \ - --with-wext=no + --with-wext=no \ + --enable-ifcfg-rh \ + --enable-ifcfg-suse \ + --enable-ifupdown \ + --enable-ifnet DISTCLEANFILES = intltool-extract intltool-merge intltool-update diff --git a/Makefile.in b/Makefile.in index 5223ab85..28cc9205 100644 --- a/Makefile.in +++ b/Makefile.in @@ -54,7 +54,15 @@ host_triplet = @host@ subdir = . DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \ $(srcdir)/Makefile.in $(srcdir)/NetworkManager.pc.in \ - $(srcdir)/config.h.in $(top_srcdir)/configure ABOUT-NLS \ + $(srcdir)/config.h.in $(top_srcdir)/configure \ + $(top_srcdir)/initscript/Arch/networkmanager.in \ + $(top_srcdir)/initscript/Debian/NetworkManager.in \ + $(top_srcdir)/initscript/Mandriva/networkmanager.in \ + $(top_srcdir)/initscript/RedHat/NetworkManager.in \ + $(top_srcdir)/initscript/SUSE/networkmanager.in \ + $(top_srcdir)/initscript/Slackware/rc.networkmanager.in \ + $(top_srcdir)/initscript/linexa/networkmanager.in \ + $(top_srcdir)/initscript/paldo/NetworkManager.in ABOUT-NLS \ AUTHORS COPYING ChangeLog INSTALL NEWS TODO build-aux/compile \ build-aux/config.guess build-aux/config.rpath \ build-aux/config.sub build-aux/depcomp build-aux/install-sh \ @@ -62,23 +70,31 @@ DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \ config.sub depcomp install-sh ltmain.sh missing ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/compiler_warnings.m4 \ - $(top_srcdir)/m4/gettext.m4 $(top_srcdir)/m4/gtk-doc.m4 \ - $(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/intlmacosx.m4 \ - $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/introspection.m4 \ - $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \ - $(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/libnl-check.m4 \ - $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ - $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ - $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/nls.m4 \ - $(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/progtest.m4 \ - $(top_srcdir)/m4/vapigen.m4 $(top_srcdir)/configure.ac + $(top_srcdir)/m4/gettext.m4 \ + $(top_srcdir)/m4/gnome-code-coverage.m4 \ + $(top_srcdir)/m4/gtk-doc.m4 $(top_srcdir)/m4/iconv.m4 \ + $(top_srcdir)/m4/intlmacosx.m4 $(top_srcdir)/m4/intltool.m4 \ + $(top_srcdir)/m4/introspection.m4 $(top_srcdir)/m4/lib-ld.m4 \ + $(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \ + $(top_srcdir)/m4/libnl-check.m4 $(top_srcdir)/m4/libtool.m4 \ + $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ + $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ + $(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/po.m4 \ + $(top_srcdir)/m4/progtest.m4 $(top_srcdir)/m4/vapigen.m4 \ + $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \ configure.lineno config.status.lineno mkinstalldirs = $(install_sh) -d CONFIG_HEADER = config.h -CONFIG_CLEAN_FILES = NetworkManager.pc +CONFIG_CLEAN_FILES = initscript/RedHat/NetworkManager \ + initscript/Debian/NetworkManager \ + initscript/Slackware/rc.networkmanager \ + initscript/SUSE/networkmanager initscript/Arch/networkmanager \ + initscript/paldo/NetworkManager \ + initscript/Mandriva/networkmanager \ + initscript/linexa/networkmanager NetworkManager.pc CONFIG_CLEAN_VPATH_FILES = AM_V_GEN = $(am__v_GEN_@AM_V@) am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) @@ -189,6 +205,10 @@ AWK = @AWK@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ +CKDB_PATH = @CKDB_PATH@ +CODE_COVERAGE_CFLAGS = @CODE_COVERAGE_CFLAGS@ +CODE_COVERAGE_ENABLED = @CODE_COVERAGE_ENABLED@ +CODE_COVERAGE_LDFLAGS = @CODE_COVERAGE_LDFLAGS@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CXX = @CXX@ @@ -203,9 +223,7 @@ DBUS_SYS_DIR = @DBUS_SYS_DIR@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DHCLIENT_PATH = @DHCLIENT_PATH@ -DHCLIENT_VERSION = @DHCLIENT_VERSION@ DHCPCD_PATH = @DHCPCD_PATH@ -DISABLE_DEPRECATED = @DISABLE_DEPRECATED@ DLLTOOL = @DLLTOOL@ DSYMUTIL = @DSYMUTIL@ DUMPBIN = @DUMPBIN@ @@ -215,17 +233,14 @@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ +GENHTML = @GENHTML@ GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ -GIO_CFLAGS = @GIO_CFLAGS@ -GIO_LIBS = @GIO_LIBS@ GLIB_CFLAGS = @GLIB_CFLAGS@ GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ GLIB_LIBS = @GLIB_LIBS@ GLIB_MAKEFILE = @GLIB_MAKEFILE@ GLIB_MKENUMS = @GLIB_MKENUMS@ -GMODULE_CFLAGS = @GMODULE_CFLAGS@ -GMODULE_LIBS = @GMODULE_LIBS@ GMSGFMT = @GMSGFMT@ GMSGFMT_015 = @GMSGFMT_015@ GNUTLS_CFLAGS = @GNUTLS_CFLAGS@ @@ -266,6 +281,7 @@ IPTABLES_PATH = @IPTABLES_PATH@ IWMX_SDK_CFLAGS = @IWMX_SDK_CFLAGS@ IWMX_SDK_LIBS = @IWMX_SDK_LIBS@ KERNEL_FIRMWARE_DIR = @KERNEL_FIRMWARE_DIR@ +LCOV = @LCOV@ LD = @LD@ LDFLAGS = @LDFLAGS@ LIBDL = @LIBDL@ @@ -282,11 +298,7 @@ LIBNL2_LIBS = @LIBNL2_LIBS@ LIBNL3_CFLAGS = @LIBNL3_CFLAGS@ LIBNL3_LIBS = @LIBNL3_LIBS@ LIBNL_CFLAGS = @LIBNL_CFLAGS@ -LIBNL_GENL3_CFLAGS = @LIBNL_GENL3_CFLAGS@ -LIBNL_GENL3_LIBS = @LIBNL_GENL3_LIBS@ LIBNL_LIBS = @LIBNL_LIBS@ -LIBNL_ROUTE3_CFLAGS = @LIBNL_ROUTE3_CFLAGS@ -LIBNL_ROUTE3_LIBS = @LIBNL_ROUTE3_LIBS@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ LIBSOUP_CFLAGS = @LIBSOUP_CFLAGS@ @@ -301,6 +313,8 @@ MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MANIFEST_TOOL = @MANIFEST_TOOL@ MKDIR_P = @MKDIR_P@ +MM_GLIB_CFLAGS = @MM_GLIB_CFLAGS@ +MM_GLIB_LIBS = @MM_GLIB_LIBS@ MOC = @MOC@ MSGFMT = @MSGFMT@ MSGFMT_015 = @MSGFMT_015@ @@ -310,6 +324,7 @@ NMEDIT = @NMEDIT@ NM_MAJOR_VERSION = @NM_MAJOR_VERSION@ NM_MICRO_VERSION = @NM_MICRO_VERSION@ NM_MINOR_VERSION = @NM_MINOR_VERSION@ +NM_MODIFY_SYSTEM_POLICY = @NM_MODIFY_SYSTEM_POLICY@ NM_VERSION = @NM_VERSION@ NSS_CFLAGS = @NSS_CFLAGS@ NSS_LIBS = @NSS_LIBS@ @@ -336,13 +351,14 @@ PPPD_PLUGIN_DIR = @PPPD_PLUGIN_DIR@ QT_CFLAGS = @QT_CFLAGS@ QT_LIBS = @QT_LIBS@ RANLIB = @RANLIB@ -RESOLVCONF_PATH = @RESOLVCONF_PATH@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ -SYSTEMD_CFLAGS = @SYSTEMD_CFLAGS@ -SYSTEMD_LIBS = @SYSTEMD_LIBS@ +SYSTEMD_INHIBIT_CFLAGS = @SYSTEMD_INHIBIT_CFLAGS@ +SYSTEMD_INHIBIT_LIBS = @SYSTEMD_INHIBIT_LIBS@ +SYSTEMD_LOGIN_CFLAGS = @SYSTEMD_LOGIN_CFLAGS@ +SYSTEMD_LOGIN_LIBS = @SYSTEMD_LOGIN_LIBS@ SYSTEM_CA_PATH = @SYSTEM_CA_PATH@ UDEV_BASE_DIR = @UDEV_BASE_DIR@ USE_NLS = @USE_NLS@ @@ -397,6 +413,11 @@ localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ +nmbinary = @nmbinary@ +nmconfdir = @nmconfdir@ +nmdatadir = @nmdatadir@ +nmrundir = @nmrundir@ +nmstatedir = @nmstatedir@ oldincludedir = @oldincludedir@ pdfdir = @pdfdir@ prefix = @prefix@ @@ -411,6 +432,10 @@ target_alias = @target_alias@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ +with_dhclient = @with_dhclient@ +with_dhcpcd = @with_dhcpcd@ +with_netconfig = @with_netconfig@ +with_resolvconf = @with_resolvconf@ SUBDIRS = \ include \ libnm-util \ @@ -422,7 +447,6 @@ SUBDIRS = \ tools \ policy \ data \ - initscript \ test \ po \ man \ @@ -443,8 +467,11 @@ DISTCHECK_CONFIGURE_FLAGS = \ --with-docs=yes \ --enable-more-warnings=yes \ --with-udev-dir=$$dc_install_base/lib/udev \ - --with-systemdsystemunitdir=$$dc_install_base/$(systemdsystemunitdir) \ - --with-wext=no + --with-wext=no \ + --enable-ifcfg-rh \ + --enable-ifcfg-suse \ + --enable-ifupdown \ + --enable-ifnet DISTCLEANFILES = intltool-extract intltool-merge intltool-update pkgconfigdir = $(libdir)/pkgconfig @@ -504,6 +531,22 @@ $(srcdir)/config.h.in: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) distclean-hdr: -rm -f config.h stamp-h1 +initscript/RedHat/NetworkManager: $(top_builddir)/config.status $(top_srcdir)/initscript/RedHat/NetworkManager.in + cd $(top_builddir) && $(SHELL) ./config.status $@ +initscript/Debian/NetworkManager: $(top_builddir)/config.status $(top_srcdir)/initscript/Debian/NetworkManager.in + cd $(top_builddir) && $(SHELL) ./config.status $@ +initscript/Slackware/rc.networkmanager: $(top_builddir)/config.status $(top_srcdir)/initscript/Slackware/rc.networkmanager.in + cd $(top_builddir) && $(SHELL) ./config.status $@ +initscript/SUSE/networkmanager: $(top_builddir)/config.status $(top_srcdir)/initscript/SUSE/networkmanager.in + cd $(top_builddir) && $(SHELL) ./config.status $@ +initscript/Arch/networkmanager: $(top_builddir)/config.status $(top_srcdir)/initscript/Arch/networkmanager.in + cd $(top_builddir) && $(SHELL) ./config.status $@ +initscript/paldo/NetworkManager: $(top_builddir)/config.status $(top_srcdir)/initscript/paldo/NetworkManager.in + cd $(top_builddir) && $(SHELL) ./config.status $@ +initscript/Mandriva/networkmanager: $(top_builddir)/config.status $(top_srcdir)/initscript/Mandriva/networkmanager.in + cd $(top_builddir) && $(SHELL) ./config.status $@ +initscript/linexa/networkmanager: $(top_builddir)/config.status $(top_srcdir)/initscript/linexa/networkmanager.in + cd $(top_builddir) && $(SHELL) ./config.status $@ NetworkManager.pc: $(top_builddir)/config.status $(srcdir)/NetworkManager.pc.in cd $(top_builddir) && $(SHELL) ./config.status $@ diff --git a/NEWS b/NEWS index ed2dff63..987d2940 100644 --- a/NEWS +++ b/NEWS @@ -1,26 +1,37 @@ ============================================== -NetworkManager-0.9.6.4 -Overview of changes since NetworkManager-0.9.6.0 +NetworkManager-0.9.8 +Overview of changes since NetworkManager-0.9.6 ============================================== This is a new stable release of NetworkManager. Notable changes include: -* Add libnm-glib API to get bond interface slaves -* Fix detection of some ACPI-based laptop airplane-mode/rfkill switches -* Fix a crash when a VLAN interface is removed -* Fix a regression setting the Device 'driver' and 'firmware' properties -* Fix a stale-properties issue with libnm-glib when device state changes -* Ignore cached/cloned route notifications from the kernel -* Work around buggy kernel driver carrier notifications -* Fix a crash with dnsmasq local caching nameserver functionality when no nameservers - are present -* Add "Speedport W 501V" to list of manufacturer default SSIDs -* Various documentation fixes -* Fix routing setup if gateway is not given with the first IP address -* Enhance nmcli for additional VLAN and bonding functionality -* Fix possible crash when removing OLPC Mesh devices - -(note: no NetworkManager 0.9.6.2 was released) +* New AvailableConnections property for Device objects +* Better handling of various rfkill/Airplane Mode switches +* Fixed handling of DNS servers for some mobile broadband devices +* Don't duplicate various IPv6 routes added by the kernel +* Ensure buggy ethernet driver carrier indications are handled correctly +* Fix crash in dnsmasq plugin when no nameservers were present +* Add support for 4G LTE network modes +* Fix signal handling when daemonizing at startup +* Don't autoconnect to WiFi networks that have never successfully connected +* Only request new WiFi secrets during the initial association or when the + secrets are known to be wrong, not every time the connection randomly fails +* Add capability to autoconnect VPN connections when a parent connection succeeds +* Add configure-time option for "permissive" system connection editing policy +* Various libnm-glib fixes for asynchronous usage +* Fix gateway handling when given with secondary IP addresses +* Optionally listen to systemd for suspend/resume events instead of UPower +* Fix 'seen-bssids' property when retrieving WiFi connections via D-Bus +* Add support for AP-mode WiFi hotspots (instead of just Ad-Hoc) +* Add a "slaves" property to Bond devices +* Add support for ModemManager 0.7/0.8 +* Allow more human-readable formatting of IP address in keyfile connections +* Drop support for dhclient v3 +* Add support for DHCPv6 server-side Dynamic DNS +* Add support for bridge master devices and bridge ports +* Fix canceling secrets requests in GUI agents +* Always enable Proactive Key Caching (PKC, also called OKC) for WPA Enterprise + WiFi configurations ============================================== diff --git a/TODO b/TODO index a2f7ee99..cdea070d 100644 --- a/TODO +++ b/TODO @@ -53,38 +53,6 @@ provide Ad-Hoc connection sharing support for those devices and switch between Ad-Hoc and AP mode depending on device capabilities. -* Reconnect to WiFi Networks Only If They Succeeded Once - -Currently, NetworkManager will attempt to connect to a previously attempted -WiFi network even if that network was never successfully connected to. This -causes confusion because sometimes users will randomly try various WiFi networks -hoping to find an open AP, and then wonder why NM tries to reconnect to any of -those APs later when none of them worked originally due to AP-side MAC filtering -or other failures. What should happen is that NetworkManager should set a flag -on a connection when that connection is successfully connected at least once, -and only autoconnect the wifi network if that flag is present *and* the -NMSettingConnection's 'autoconnect' property is TRUE. - -This is a bit tricky because we want to consider all connections that don't have -this flag as having succeeded so that we don't break users' existing connections, -while holding all newly created connections to this policy. This flag should -be determined and set for all connections, even if we only use it to determine -WiFi behavior for now. - -This flag should be a new gboolean property on the NMSettingConnection object -called "connect-success", with a default value of TRUE. It should default to -TRUE to ensure that existing connections are assumed to have connected -successfully in the past. New connections created via the AddConnection and -AddAndActivateConnection D-Bus method calls should have the 'connect-success' -property explicitly set to FALSE. Then, in nm-device.c's device_state_changed() -function where the NM_DEVICE_STATE_ACTIVATED state is handled, the -'connect-success' property should be set to TRUE. - -For WiFi then, in nm-device-wifi.c's get_best_auto_connection() method, the -'connect-success' property should be checked and if it is FALSE, the connection -is not considered for auto-activation. - - * Implement NM_DEVICE_STATE_DISCONNECTING To allow for "pre-down" scenarios, this state should be implemented before a diff --git a/aclocal.m4 b/aclocal.m4 index acfe6e8a..2310ccfe 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -1280,6 +1280,7 @@ AC_SUBST([am__untar]) m4_include([m4/compiler_warnings.m4]) m4_include([m4/gettext.m4]) +m4_include([m4/gnome-code-coverage.m4]) m4_include([m4/gtk-doc.m4]) m4_include([m4/iconv.m4]) m4_include([m4/intlmacosx.m4]) diff --git a/callouts/Makefile.am b/callouts/Makefile.am index 45d38b61..b27fdd79 100644 --- a/callouts/Makefile.am +++ b/callouts/Makefile.am @@ -1,4 +1,4 @@ -SUBDIRS=. tests +SUBDIRS = . tests ########################################### # Test libraries @@ -24,7 +24,7 @@ nm_dhcp_client_action_SOURCES = \ nm_dhcp_client_action_CPPFLAGS = \ $(DBUS_CFLAGS) \ - -DSYSCONFDIR=\"$(sysconfdir)\" \ + -DNMCONFDIR=\"$(nmconfdir)\" \ -DLIBEXECDIR=\"$(libexecdir)\" nm_dhcp_client_action_LDADD = $(DBUS_LIBS) @@ -36,7 +36,6 @@ nm_avahi_autoipd_action_SOURCES = \ nm_avahi_autoipd_action_CPPFLAGS = \ $(DBUS_CFLAGS) \ $(GLIB_CFLAGS) \ - -DG_DISABLE_DEPRECATED \ -DSYSCONFDIR=\"$(sysconfdir)\" \ -DLIBEXECDIR=\"$(libexecdir)\" @@ -59,8 +58,7 @@ nm_dispatcher_action_CPPFLAGS = \ -I${top_builddir}/libnm-util \ $(DBUS_CFLAGS) \ $(GLIB_CFLAGS) \ - -DG_DISABLE_DEPRECATED \ - -DSYSCONFDIR=\"$(sysconfdir)\" \ + -DNMCONFDIR=\"$(nmconfdir)\" \ -DLIBEXECDIR=\"$(libexecdir)\" nm_dispatcher_action_LDADD = \ diff --git a/callouts/Makefile.in b/callouts/Makefile.in index f6650cec..c4ff5aa8 100644 --- a/callouts/Makefile.in +++ b/callouts/Makefile.in @@ -59,16 +59,18 @@ subdir = callouts DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/compiler_warnings.m4 \ - $(top_srcdir)/m4/gettext.m4 $(top_srcdir)/m4/gtk-doc.m4 \ - $(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/intlmacosx.m4 \ - $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/introspection.m4 \ - $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \ - $(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/libnl-check.m4 \ - $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ - $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ - $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/nls.m4 \ - $(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/progtest.m4 \ - $(top_srcdir)/m4/vapigen.m4 $(top_srcdir)/configure.ac + $(top_srcdir)/m4/gettext.m4 \ + $(top_srcdir)/m4/gnome-code-coverage.m4 \ + $(top_srcdir)/m4/gtk-doc.m4 $(top_srcdir)/m4/iconv.m4 \ + $(top_srcdir)/m4/intlmacosx.m4 $(top_srcdir)/m4/intltool.m4 \ + $(top_srcdir)/m4/introspection.m4 $(top_srcdir)/m4/lib-ld.m4 \ + $(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \ + $(top_srcdir)/m4/libnl-check.m4 $(top_srcdir)/m4/libtool.m4 \ + $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ + $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ + $(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/po.m4 \ + $(top_srcdir)/m4/progtest.m4 $(top_srcdir)/m4/vapigen.m4 \ + $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(install_sh) -d @@ -228,6 +230,10 @@ AWK = @AWK@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ +CKDB_PATH = @CKDB_PATH@ +CODE_COVERAGE_CFLAGS = @CODE_COVERAGE_CFLAGS@ +CODE_COVERAGE_ENABLED = @CODE_COVERAGE_ENABLED@ +CODE_COVERAGE_LDFLAGS = @CODE_COVERAGE_LDFLAGS@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CXX = @CXX@ @@ -242,9 +248,7 @@ DBUS_SYS_DIR = @DBUS_SYS_DIR@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DHCLIENT_PATH = @DHCLIENT_PATH@ -DHCLIENT_VERSION = @DHCLIENT_VERSION@ DHCPCD_PATH = @DHCPCD_PATH@ -DISABLE_DEPRECATED = @DISABLE_DEPRECATED@ DLLTOOL = @DLLTOOL@ DSYMUTIL = @DSYMUTIL@ DUMPBIN = @DUMPBIN@ @@ -254,17 +258,14 @@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ +GENHTML = @GENHTML@ GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ -GIO_CFLAGS = @GIO_CFLAGS@ -GIO_LIBS = @GIO_LIBS@ GLIB_CFLAGS = @GLIB_CFLAGS@ GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ GLIB_LIBS = @GLIB_LIBS@ GLIB_MAKEFILE = @GLIB_MAKEFILE@ GLIB_MKENUMS = @GLIB_MKENUMS@ -GMODULE_CFLAGS = @GMODULE_CFLAGS@ -GMODULE_LIBS = @GMODULE_LIBS@ GMSGFMT = @GMSGFMT@ GMSGFMT_015 = @GMSGFMT_015@ GNUTLS_CFLAGS = @GNUTLS_CFLAGS@ @@ -305,6 +306,7 @@ IPTABLES_PATH = @IPTABLES_PATH@ IWMX_SDK_CFLAGS = @IWMX_SDK_CFLAGS@ IWMX_SDK_LIBS = @IWMX_SDK_LIBS@ KERNEL_FIRMWARE_DIR = @KERNEL_FIRMWARE_DIR@ +LCOV = @LCOV@ LD = @LD@ LDFLAGS = @LDFLAGS@ LIBDL = @LIBDL@ @@ -321,11 +323,7 @@ LIBNL2_LIBS = @LIBNL2_LIBS@ LIBNL3_CFLAGS = @LIBNL3_CFLAGS@ LIBNL3_LIBS = @LIBNL3_LIBS@ LIBNL_CFLAGS = @LIBNL_CFLAGS@ -LIBNL_GENL3_CFLAGS = @LIBNL_GENL3_CFLAGS@ -LIBNL_GENL3_LIBS = @LIBNL_GENL3_LIBS@ LIBNL_LIBS = @LIBNL_LIBS@ -LIBNL_ROUTE3_CFLAGS = @LIBNL_ROUTE3_CFLAGS@ -LIBNL_ROUTE3_LIBS = @LIBNL_ROUTE3_LIBS@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ LIBSOUP_CFLAGS = @LIBSOUP_CFLAGS@ @@ -340,6 +338,8 @@ MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MANIFEST_TOOL = @MANIFEST_TOOL@ MKDIR_P = @MKDIR_P@ +MM_GLIB_CFLAGS = @MM_GLIB_CFLAGS@ +MM_GLIB_LIBS = @MM_GLIB_LIBS@ MOC = @MOC@ MSGFMT = @MSGFMT@ MSGFMT_015 = @MSGFMT_015@ @@ -349,6 +349,7 @@ NMEDIT = @NMEDIT@ NM_MAJOR_VERSION = @NM_MAJOR_VERSION@ NM_MICRO_VERSION = @NM_MICRO_VERSION@ NM_MINOR_VERSION = @NM_MINOR_VERSION@ +NM_MODIFY_SYSTEM_POLICY = @NM_MODIFY_SYSTEM_POLICY@ NM_VERSION = @NM_VERSION@ NSS_CFLAGS = @NSS_CFLAGS@ NSS_LIBS = @NSS_LIBS@ @@ -375,13 +376,14 @@ PPPD_PLUGIN_DIR = @PPPD_PLUGIN_DIR@ QT_CFLAGS = @QT_CFLAGS@ QT_LIBS = @QT_LIBS@ RANLIB = @RANLIB@ -RESOLVCONF_PATH = @RESOLVCONF_PATH@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ -SYSTEMD_CFLAGS = @SYSTEMD_CFLAGS@ -SYSTEMD_LIBS = @SYSTEMD_LIBS@ +SYSTEMD_INHIBIT_CFLAGS = @SYSTEMD_INHIBIT_CFLAGS@ +SYSTEMD_INHIBIT_LIBS = @SYSTEMD_INHIBIT_LIBS@ +SYSTEMD_LOGIN_CFLAGS = @SYSTEMD_LOGIN_CFLAGS@ +SYSTEMD_LOGIN_LIBS = @SYSTEMD_LOGIN_LIBS@ SYSTEM_CA_PATH = @SYSTEM_CA_PATH@ UDEV_BASE_DIR = @UDEV_BASE_DIR@ USE_NLS = @USE_NLS@ @@ -436,6 +438,11 @@ localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ +nmbinary = @nmbinary@ +nmconfdir = @nmconfdir@ +nmdatadir = @nmdatadir@ +nmrundir = @nmrundir@ +nmstatedir = @nmstatedir@ oldincludedir = @oldincludedir@ pdfdir = @pdfdir@ prefix = @prefix@ @@ -450,6 +457,10 @@ target_alias = @target_alias@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ +with_dhclient = @with_dhclient@ +with_dhcpcd = @with_dhcpcd@ +with_netconfig = @with_netconfig@ +with_resolvconf = @with_resolvconf@ SUBDIRS = . tests ########################################### @@ -469,7 +480,7 @@ nm_dhcp_client_action_SOURCES = \ nm_dhcp_client_action_CPPFLAGS = \ $(DBUS_CFLAGS) \ - -DSYSCONFDIR=\"$(sysconfdir)\" \ + -DNMCONFDIR=\"$(nmconfdir)\" \ -DLIBEXECDIR=\"$(libexecdir)\" nm_dhcp_client_action_LDADD = $(DBUS_LIBS) @@ -479,7 +490,6 @@ nm_avahi_autoipd_action_SOURCES = \ nm_avahi_autoipd_action_CPPFLAGS = \ $(DBUS_CFLAGS) \ $(GLIB_CFLAGS) \ - -DG_DISABLE_DEPRECATED \ -DSYSCONFDIR=\"$(sysconfdir)\" \ -DLIBEXECDIR=\"$(libexecdir)\" @@ -501,8 +511,7 @@ nm_dispatcher_action_CPPFLAGS = \ -I${top_builddir}/libnm-util \ $(DBUS_CFLAGS) \ $(GLIB_CFLAGS) \ - -DG_DISABLE_DEPRECATED \ - -DSYSCONFDIR=\"$(sysconfdir)\" \ + -DNMCONFDIR=\"$(nmconfdir)\" \ -DLIBEXECDIR=\"$(libexecdir)\" nm_dispatcher_action_LDADD = \ @@ -666,25 +675,22 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/nm_dispatcher_action-nm-dispatcher-utils.Po@am__quote@ .c.o: -@am__fastdepCC_TRUE@ $(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\ -@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\ -@am__fastdepCC_TRUE@ $(am__mv) $$depbase.Tpo $$depbase.Po +@am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $< +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c $< .c.obj: -@am__fastdepCC_TRUE@ $(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.obj$$||'`;\ -@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ `$(CYGPATH_W) '$<'` &&\ -@am__fastdepCC_TRUE@ $(am__mv) $$depbase.Tpo $$depbase.Po +@am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c `$(CYGPATH_W) '$<'` .c.lo: -@am__fastdepCC_TRUE@ $(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.lo$$||'`;\ -@am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\ -@am__fastdepCC_TRUE@ $(am__mv) $$depbase.Tpo $$depbase.Plo +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $< diff --git a/callouts/nm-dispatcher-action.c b/callouts/nm-dispatcher-action.c index a4ccde10..0e4b11a7 100644 --- a/callouts/nm-dispatcher-action.c +++ b/callouts/nm-dispatcher-action.c @@ -15,7 +15,7 @@ * with this program; if not, write to the Free Software Foundation, Inc., * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. * - * Copyright (C) 2008 - 2011 Red Hat, Inc. + * Copyright (C) 2008 - 2012 Red Hat, Inc. */ #include @@ -39,95 +39,237 @@ #include "nm-dispatcher-action.h" #include "nm-dispatcher-utils.h" -#define NMD_SCRIPT_DIR SYSCONFDIR "/NetworkManager/dispatcher.d" +#define NMD_SCRIPT_DIR NMCONFDIR "/dispatcher.d" static GMainLoop *loop = NULL; static gboolean debug = FALSE; -static gboolean quit_timeout_cb (gpointer user_data); +typedef struct { + GObject parent; -typedef struct Handler Handler; -typedef struct HandlerClass HandlerClass; + /* Private data */ + guint quit_id; + gboolean persist; +} Handler; + +typedef struct { + GObjectClass parent; +} HandlerClass; GType handler_get_type (void); -struct Handler { - GObject parent; -}; +#define HANDLER_TYPE (handler_get_type ()) +#define HANDLER(object) (G_TYPE_CHECK_INSTANCE_CAST ((object), HANDLER_TYPE, Handler)) +#define HANDLER_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), HANDLER_TYPE, HandlerClass)) -struct HandlerClass { - GObjectClass parent; -}; +G_DEFINE_TYPE(Handler, handler, G_TYPE_OBJECT) -#define HANDLER_TYPE (handler_get_type ()) -#define HANDLER(object) (G_TYPE_CHECK_INSTANCE_CAST ((object), HANDLER_TYPE, Handler)) -#define HANDLER_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), HANDLER_TYPE, HandlerClass)) -#define IS_HANDLER(object) (G_TYPE_CHECK_INSTANCE_TYPE ((object), HANDLER_TYPE)) -#define IS_HANDLER_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), HANDLER_TYPE)) -#define HANDLER_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), HANDLER_TYPE, HandlerClass)) +static void +impl_dispatch (Handler *h, + const char *action, + GHashTable *connection_hash, + GHashTable *connection_props, + GHashTable *device_props, + GHashTable *device_ip4_props, + GHashTable *device_ip6_props, + GHashTable *device_dhcp4_props, + GHashTable *device_dhcp6_props, + const char *vpn_ip_iface, + GHashTable *vpn_ip4_props, + GHashTable *vpn_ip6_props, + DBusGMethodInvocation *context); -G_DEFINE_TYPE(Handler, handler, G_TYPE_OBJECT) +#include "nm-dispatcher-glue.h" + + +static void +handler_init (Handler *h) +{ +} + +static void +handler_class_init (HandlerClass *h_class) +{ +} + +typedef struct Request Request; + +static void dispatch_one_script (Request *request); typedef struct { - DBusGConnection *g_connection; - DBusGProxy *bus_proxy; - guint quit_timeout; - gboolean persist; + Request *request; + + char *script; + GPid pid; + DispatchResult result; + char *error; +} ScriptInfo; +struct Request { Handler *handler; -} Dispatcher; -static gboolean -nm_dispatcher_action (Handler *h, - const char *action, - GHashTable *connection_hash, - GHashTable *connection_props, - GHashTable *device_props, - GHashTable *device_ip4_props, - GHashTable *device_ip6_props, - GHashTable *device_dhcp4_props, - GHashTable *device_dhcp6_props, - const char *vpn_ip_iface, - GHashTable *vpn_ip4_props, - GHashTable *vpn_ip6_props, - GError **error); + DBusGMethodInvocation *context; + char *action; + char *iface; + char **envp; + GPtrArray *scripts; /* list of ScriptInfo */ + guint idx; -#include "nm-dispatcher-glue.h" + guint script_watch_id; + guint script_timeout_id; +}; +static void +script_info_free (ScriptInfo *info) +{ + g_free (info->script); + g_free (info->error); + g_free (info); +} static void -handler_init (Handler *h) +request_free (Request *request) { + g_free (request->action); + g_free (request->iface); + g_strfreev (request->envp); + if (request->scripts) + g_ptr_array_foreach (request->scripts, (GFunc) script_info_free, NULL); + g_ptr_array_free (request->scripts, TRUE); +} + +static gboolean +quit_timeout_cb (gpointer user_data) +{ + g_main_loop_quit (loop); + return FALSE; } static void -handler_finalize (GObject *object) +quit_timeout_reschedule (Handler *h) { - G_OBJECT_CLASS (handler_parent_class)->finalize (object); + if (h->quit_id) + g_source_remove (h->quit_id); + if (!h->persist) + h->quit_id = g_timeout_add_seconds (10, quit_timeout_cb, NULL); +} + +static gboolean +next_script (gpointer user_data) +{ + Request *request = user_data; + GPtrArray *results; + GValueArray *item; + guint i; + + quit_timeout_reschedule (request->handler); + + request->idx++; + if (request->idx < request->scripts->len) { + dispatch_one_script (request); + return FALSE; + } + + /* All done */ + results = g_ptr_array_sized_new (request->scripts->len); + for (i = 0; i < request->scripts->len; i++) { + ScriptInfo *script = g_ptr_array_index (request->scripts, i); + GValue elt = {0, }; + + item = g_value_array_new (3); + + /* Script path */ + g_value_init (&elt, G_TYPE_STRING); + g_value_set_string (&elt, script->script); + g_value_array_append (item, &elt); + g_value_unset (&elt); + + /* Result */ + g_value_init (&elt, G_TYPE_UINT); + g_value_set_uint (&elt, script->result); + g_value_array_append (item, &elt); + g_value_unset (&elt); + + /* Error */ + g_value_init (&elt, G_TYPE_STRING); + g_value_set_string (&elt, script->error ? script->error : ""); + g_value_array_append (item, &elt); + g_value_unset (&elt); + + g_ptr_array_add (results, item); + } + + dbus_g_method_return (request->context, results); + + request_free (request); + return FALSE; } static void -handler_class_init (HandlerClass *h_class) +script_watch_cb (GPid pid, gint status, gpointer user_data) { - GObjectClass *gobject_class = G_OBJECT_CLASS (h_class); + ScriptInfo *script = user_data; + guint err; + + g_assert (pid == script->pid); + + script->request->script_watch_id = 0; + g_source_remove (script->request->script_timeout_id); + script->request->script_timeout_id = 0; + + if (WIFEXITED (status)) { + err = WEXITSTATUS (status); + if (err == 0) + script->result = DISPATCH_RESULT_SUCCESS; + else { + script->error = g_strdup_printf ("Script '%s' exited with error status %d.", + script->script, err); + } + } else if (WIFSTOPPED (status)) { + script->error = g_strdup_printf ("Script '%s' stopped unexpectedly with signal %d.", + script->script, WSTOPSIG (status)); + } else if (WIFSIGNALED (status)) { + script->error = g_strdup_printf ("Script '%s' died with signal %d", + script->script, WTERMSIG (status)); + } else { + script->error = g_strdup_printf ("Script '%s' died from an unknown cause", + script->script); + } - gobject_class->finalize = handler_finalize; + if (script->result != DISPATCH_RESULT_SUCCESS) { + script->result = DISPATCH_RESULT_FAILED; + g_warning ("%s", script->error); + } + + g_spawn_close_pid (script->pid); + next_script (script->request); +} + +static gboolean +script_timeout_cb (gpointer user_data) +{ + ScriptInfo *script = user_data; + + g_source_remove (script->request->script_watch_id); + script->request->script_watch_id = 0; + script->request->script_timeout_id = 0; + + g_warning ("Script '%s' took too long; killing it.", script->script); + + if (kill (script->pid, 0) == 0) + kill (script->pid, SIGKILL); + waitpid (script->pid, NULL, 0); + + script->error = g_strdup_printf ("Script '%s' timed out.", script->script); + script->result = DISPATCH_RESULT_TIMEOUT; + + g_spawn_close_pid (script->pid); + g_idle_add (next_script, script->request); + return FALSE; } -/* - * nmd_permission_check - * - * Verify that the given script has the permissions we want. Specifically, - * ensure that the file is - * - A regular file. - * - Owned by root. - * - Not writable by the group or by other. - * - Not setuid. - * - Executable by the owner. - * - */ static inline gboolean -nmd_permission_check (struct stat *s, GError **error) +check_permissions (struct stat *s, GError **error) { g_return_val_if_fail (s != NULL, FALSE); g_return_val_if_fail (error != NULL, FALSE); @@ -160,223 +302,176 @@ nmd_permission_check (struct stat *s, GError **error) return TRUE; } - -/* - * nmd_is_valid_filename - * - * Verify that the given script is a valid file name. Specifically, - * ensure that the file: - * - is not a editor backup file - * - is not a package management file - * - does not start with '.' - */ -static inline gboolean -nmd_is_valid_filename (const char *file_name) +static gboolean +check_filename (const char *file_name) { char *bad_suffixes[] = { "~", ".rpmsave", ".rpmorig", ".rpmnew", NULL }; char *tmp; - int i; + guint i; + + /* File must not be a backup file, package management file, or start with '.' */ if (file_name[0] == '.') return FALSE; for (i = 0; bad_suffixes[i]; i++) { - if (g_str_has_suffix(file_name, bad_suffixes[i])) + if (g_str_has_suffix (file_name, bad_suffixes[i])) return FALSE; } - tmp = g_strrstr(file_name, ".dpkg-"); - if (tmp && (tmp == strrchr(file_name,'.'))) + tmp = g_strrstr (file_name, ".dpkg-"); + if (tmp && (tmp == strrchr (file_name, '.'))) return FALSE; return TRUE; } -static gint -sort_files (gconstpointer a, gconstpointer b) +static void +child_setup (gpointer user_data G_GNUC_UNUSED) { - char *a_base = NULL, *b_base = NULL; - int ret = 0; - - if (a && !b) - return 1; - if (!a && !b) - return 0; - if (!a && b) - return -1; - - a_base = g_path_get_basename (a); - b_base = g_path_get_basename (b); - - ret = strcmp (a_base, b_base); - - g_free (a_base); - g_free (b_base); - return ret; + /* We are in the child process at this point */ + /* Give child a different process group to ensure signal separation. */ + pid_t pid = getpid (); + setpgid (pid, pid); } static void -child_setup (gpointer user_data G_GNUC_UNUSED) +dispatch_one_script (Request *request) { - /* We are in the child process at this point */ - /* Give child a different process group to ensure signal separation. */ - pid_t pid = getpid (); - setpgid (pid, pid); + GError *error = NULL; + gchar *argv[4]; + ScriptInfo *script = g_ptr_array_index (request->scripts, request->idx); + + argv[0] = script->script; + argv[1] = request->iface ? request->iface : "none"; + argv[2] = request->action; + argv[3] = NULL; + + if (debug) + g_message ("Script: %s %s %s", script->script, request->iface ? request->iface : "(none)", request->action); + + if (g_spawn_async ("/", argv, request->envp, G_SPAWN_DO_NOT_REAP_CHILD, child_setup, request, &script->pid, &error)) { + request->script_watch_id = g_child_watch_add (script->pid, (GChildWatchFunc) script_watch_cb, script); + request->script_timeout_id = g_timeout_add_seconds (3, script_timeout_cb, script); + } else { + g_warning ("Failed to execute script '%s': (%d) %s", + script->script, error->code, error->message); + script->result = DISPATCH_RESULT_EXEC_FAILED; + script->error = g_strdup (error->message); + g_clear_error (&error); + + /* Try the next script */ + g_idle_add (next_script, request); + } } -static void -dispatch_scripts (const char *action, const char *iface, char **envp) +static GSList * +find_scripts (void) { GDir *dir; const char *filename; - GSList *scripts = NULL, *iter; + GSList *sorted = NULL; GError *error = NULL; if (!(dir = g_dir_open (NMD_SCRIPT_DIR, 0, &error))) { - g_warning ("g_dir_open() could not open '" NMD_SCRIPT_DIR "'. '%s'", - error->message); + g_warning ("Failed to open dispatcher directory '%s': (%d) %s", + NMD_SCRIPT_DIR, error->code, error->message); g_error_free (error); - return; + return NULL; } while ((filename = g_dir_read_name (dir))) { - char *file_path; - struct stat s; - GError *pc_error = NULL; + char *path; + struct stat st; int err; - if (!nmd_is_valid_filename (filename)) + if (!check_filename (filename)) continue; - file_path = g_build_filename (NMD_SCRIPT_DIR, filename, NULL); + path = g_build_filename (NMD_SCRIPT_DIR, filename, NULL); - err = stat (file_path, &s); - if (err) { - g_warning ("Script '%s' could not be stated: %d", file_path, err); - g_free (file_path); - continue; - } - - if (!nmd_permission_check (&s, &pc_error)) { - g_warning ("Script '%s' could not be executed: %s", file_path, pc_error->message); - g_error_free (pc_error); - g_free (file_path); + err = stat (path, &st); + if (err) + g_warning ("Failed to stat '%s': %d", path, err); + else if (!check_permissions (&st, &error)) { + g_warning ("Cannot execute '%s': %s", path, error->message); + g_clear_error (&error); } else { /* success */ - scripts = g_slist_insert_sorted (scripts, file_path, sort_files); + sorted = g_slist_insert_sorted (sorted, path, (GCompareFunc) g_strcmp0); } } g_dir_close (dir); - for (iter = scripts; iter; iter = g_slist_next (iter)) { - gchar *argv[4]; - gint status = -1; - - argv[0] = (char *) iter->data; - argv[1] = iface ? (char *) iface : "none"; - argv[2] = (char *) action; - argv[3] = NULL; - - if (debug) - g_message ("Script: %s %s %s", (char *) iter->data, iface ? (char *) iface : "(none)", (char *) action); - - error = NULL; - if (g_spawn_sync ("/", argv, envp, 0, child_setup, NULL, NULL, NULL, &status, &error)) { - if (WIFEXITED (status)) { - if (WEXITSTATUS (status) != 0) - g_warning ("Script '%s' exited with error status %d.", - (char *) iter->data, WEXITSTATUS (status)); - } else - g_warning ("Script '%s' exited abnormally.", (char *) iter->data); - } else { - g_warning ("Could not run script '%s': (%d) %s", - (char *) iter->data, error->code, error->message); - g_error_free (error); - } - } - - g_slist_foreach (scripts, (GFunc) g_free, NULL); - g_slist_free (scripts); + return sorted; } -static gboolean -nm_dispatcher_action (Handler *h, - const char *action, - GHashTable *connection_hash, - GHashTable *connection_props, - GHashTable *device_props, - GHashTable *device_ip4_props, - GHashTable *device_ip6_props, - GHashTable *device_dhcp4_props, - GHashTable *device_dhcp6_props, - const char *vpn_ip_iface, - GHashTable *vpn_ip4_props, - GHashTable *vpn_ip6_props, - GError **error) +static void +impl_dispatch (Handler *h, + const char *str_action, + GHashTable *connection_hash, + GHashTable *connection_props, + GHashTable *device_props, + GHashTable *device_ip4_props, + GHashTable *device_ip6_props, + GHashTable *device_dhcp4_props, + GHashTable *device_dhcp6_props, + const char *vpn_ip_iface, + GHashTable *vpn_ip4_props, + GHashTable *vpn_ip6_props, + DBusGMethodInvocation *context) { - Dispatcher *d = g_object_get_data (G_OBJECT (h), "dispatcher"); - char **envp, **p; + GSList *sorted_scripts = NULL; + GSList *iter; + Request *request; + char **p; char *iface = NULL; - /* Back off the quit timeout */ - if (d->quit_timeout) - g_source_remove (d->quit_timeout); - if (!d->persist) - d->quit_timeout = g_timeout_add_seconds (10, quit_timeout_cb, NULL); - - envp = nm_dispatcher_utils_construct_envp (action, - connection_hash, - connection_props, - device_props, - device_ip4_props, - device_ip6_props, - device_dhcp4_props, - device_dhcp6_props, - vpn_ip_iface, - vpn_ip4_props, - vpn_ip6_props, - &iface); + sorted_scripts = find_scripts (); + + if (!sorted_scripts) { + dbus_g_method_return (context, g_ptr_array_new ()); + return; + } + + quit_timeout_reschedule (h); + + request = g_malloc0 (sizeof (*request)); + request->handler = h; + request->context = context; + request->action = g_strdup (str_action); + + request->envp = nm_dispatcher_utils_construct_envp (str_action, + connection_hash, + connection_props, + device_props, + device_ip4_props, + device_ip6_props, + device_dhcp4_props, + device_dhcp6_props, + vpn_ip_iface, + vpn_ip4_props, + vpn_ip6_props, + &iface); if (debug) { - g_message ("------------ Script Environment ------------"); - for (p = envp; *p; p++) + g_message ("------------ Action ID %p '%s' Interface %s Environment ------------", + context, str_action, iface ? iface : "(none)"); + for (p = request->envp; *p; p++) g_message (" %s", *p); g_message ("\n"); } - dispatch_scripts (action, iface, envp); - g_strfreev (envp); - g_free (iface); + request->iface = g_strdup (iface); - return TRUE; -} - -static gboolean -start_dbus_service (Dispatcher *d) -{ - int request_name_result; - GError *err = NULL; - gboolean success = FALSE; - - if (!dbus_g_proxy_call (d->bus_proxy, "RequestName", &err, - G_TYPE_STRING, NM_DISPATCHER_DBUS_SERVICE, - G_TYPE_UINT, DBUS_NAME_FLAG_DO_NOT_QUEUE, - G_TYPE_INVALID, - G_TYPE_UINT, &request_name_result, - G_TYPE_INVALID)) { - g_warning ("Could not acquire the " NM_DISPATCHER_DBUS_SERVICE " service.\n" - " Message: '%s'", err->message); - g_error_free (err); - goto out; - } - - if (request_name_result != DBUS_REQUEST_NAME_REPLY_PRIMARY_OWNER) { - g_warning ("Could not acquire the " NM_DISPATCHER_DBUS_SERVICE " service " - "as it is already taken. Return: %d", - request_name_result); - goto out; + request->scripts = g_ptr_array_sized_new (5); + for (iter = sorted_scripts; iter; iter = g_slist_next (iter)) { + ScriptInfo *s = g_malloc0 (sizeof (*s)); + s->request = request; + s->script = iter->data; + g_ptr_array_add (request->scripts, s); } - success = TRUE; + g_slist_free (sorted_scripts); -out: - return success; + /* start dispatching scripts */ + dispatch_one_script (request); } static void @@ -386,42 +481,67 @@ destroy_cb (DBusGProxy *proxy, gpointer user_data) g_main_loop_quit (loop); } -static gboolean -dbus_init (Dispatcher *d) +static DBusGConnection * +dbus_init (void) { - GError *err = NULL; + GError *error = NULL; + DBusGConnection *bus; DBusConnection *connection; - + DBusGProxy *proxy; + int result; + dbus_connection_set_change_sigpipe (TRUE); - d->g_connection = dbus_g_bus_get (DBUS_BUS_SYSTEM, &err); - if (!d->g_connection) { + bus = dbus_g_bus_get (DBUS_BUS_SYSTEM, &error); + if (!bus) { g_warning ("Could not get the system bus. Make sure " "the message bus daemon is running! Message: %s", - err->message); - g_error_free (err); - return FALSE; + error->message); + g_error_free (error); + return NULL; } /* Clean up nicely if we get kicked off the bus */ - connection = dbus_g_connection_get_connection (d->g_connection); + connection = dbus_g_connection_get_connection (bus); dbus_connection_set_exit_on_disconnect (connection, FALSE); - d->bus_proxy = dbus_g_proxy_new_for_name (d->g_connection, - "org.freedesktop.DBus", - "/org/freedesktop/DBus", - "org.freedesktop.DBus"); - if (!d->bus_proxy) { - g_warning ("Could not get the DBus object!"); + proxy = dbus_g_proxy_new_for_name (bus, + "org.freedesktop.DBus", + "/org/freedesktop/DBus", + "org.freedesktop.DBus"); + if (!proxy) { + g_warning ("Could not create the DBus proxy!"); goto error; } - g_signal_connect (d->bus_proxy, "destroy", G_CALLBACK (destroy_cb), NULL); + g_signal_connect (proxy, "destroy", G_CALLBACK (destroy_cb), NULL); - return TRUE; + if (!dbus_g_proxy_call (proxy, "RequestName", &error, + G_TYPE_STRING, NM_DISPATCHER_DBUS_SERVICE, + G_TYPE_UINT, DBUS_NAME_FLAG_DO_NOT_QUEUE, + G_TYPE_INVALID, + G_TYPE_UINT, &result, + G_TYPE_INVALID)) { + g_warning ("Could not acquire the " NM_DISPATCHER_DBUS_SERVICE " service.\n" + " Message: '%s'", error->message); + g_error_free (error); + goto error; + } -error: - return FALSE; + if (result != DBUS_REQUEST_NAME_REPLY_PRIMARY_OWNER) { + g_warning ("Could not acquire the " NM_DISPATCHER_DBUS_SERVICE " service " + "as it is already taken. Result: %d", + result); + goto error; + } + + return bus; + +error: + if (proxy) + g_object_unref (proxy); + dbus_g_connection_unref (bus); + return NULL; } static void @@ -433,30 +553,25 @@ log_handler (const gchar *log_domain, int syslog_priority; switch (log_level) { - case G_LOG_LEVEL_ERROR: - syslog_priority = LOG_CRIT; - break; - - case G_LOG_LEVEL_CRITICAL: - syslog_priority = LOG_ERR; - break; - - case G_LOG_LEVEL_WARNING: - syslog_priority = LOG_WARNING; - break; - - case G_LOG_LEVEL_MESSAGE: - syslog_priority = LOG_NOTICE; - break; - - case G_LOG_LEVEL_DEBUG: - syslog_priority = LOG_DEBUG; - break; - - case G_LOG_LEVEL_INFO: - default: - syslog_priority = LOG_INFO; - break; + case G_LOG_LEVEL_ERROR: + syslog_priority = LOG_CRIT; + break; + case G_LOG_LEVEL_CRITICAL: + syslog_priority = LOG_ERR; + break; + case G_LOG_LEVEL_WARNING: + syslog_priority = LOG_WARNING; + break; + case G_LOG_LEVEL_MESSAGE: + syslog_priority = LOG_NOTICE; + break; + case G_LOG_LEVEL_DEBUG: + syslog_priority = LOG_DEBUG; + break; + case G_LOG_LEVEL_INFO: + default: + syslog_priority = LOG_INFO; + break; } syslog (syslog_priority, "%s", message); @@ -502,20 +617,14 @@ setup_signals (void) sigaction (SIGINT, &action, NULL); } -static gboolean -quit_timeout_cb (gpointer user_data) -{ - g_main_loop_quit (loop); - return FALSE; -} - int main (int argc, char **argv) { - Dispatcher *d = g_malloc0 (sizeof (Dispatcher)); GOptionContext *opt_ctx; GError *error = NULL; gboolean persist = FALSE; + DBusGConnection *bus; + Handler *handler; GOptionEntry entries[] = { { "debug", 0, 0, G_OPTION_ARG_NONE, &debug, "Output to console rather than syslog", NULL }, @@ -530,7 +639,6 @@ main (int argc, char **argv) if (!g_option_context_parse (opt_ctx, &argc, &argv, &error)) { g_warning ("%s\n", error->message); g_error_free (error); - g_free (d); return 1; } @@ -544,30 +652,27 @@ main (int argc, char **argv) loop = g_main_loop_new (NULL, FALSE); - if (!dbus_init (d)) - return 1; - if (!start_dbus_service (d)) + bus = dbus_init (); + if (!bus) return 1; - d->persist = persist; - d->handler = g_object_new (HANDLER_TYPE, NULL); - if (!d->handler) + handler = g_object_new (HANDLER_TYPE, NULL); + if (!handler) return 1; - g_object_set_data (G_OBJECT (d->handler), "dispatcher", d); + handler->persist = persist; dbus_g_object_type_install_info (HANDLER_TYPE, &dbus_glib_nm_dispatcher_object_info); - dbus_g_connection_register_g_object (d->g_connection, + dbus_g_connection_register_g_object (bus, NM_DISPATCHER_DBUS_PATH, - G_OBJECT (d->handler)); + G_OBJECT (handler)); if (!persist) - d->quit_timeout = g_timeout_add_seconds (10, quit_timeout_cb, NULL); + handler->quit_id = g_timeout_add_seconds (10, quit_timeout_cb, NULL); g_main_loop_run (loop); - g_object_unref (d->handler); - dbus_g_connection_unref (d->g_connection); - g_free (d); + g_object_unref (handler); + dbus_g_connection_unref (bus); if (!debug) logging_shutdown (); diff --git a/callouts/nm-dispatcher-action.h b/callouts/nm-dispatcher-action.h index e4f2fab2..9fea487a 100644 --- a/callouts/nm-dispatcher-action.h +++ b/callouts/nm-dispatcher-action.h @@ -15,9 +15,15 @@ * with this program; if not, write to the Free Software Foundation, Inc., * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. * - * Copyright (C) 2008 Red Hat, Inc. + * Copyright (C) 2008 - 2012 Red Hat, Inc. */ +#include + +/* dbus-glib types for dispatcher call return value */ +#define DISPATCHER_TYPE_RESULT (dbus_g_type_get_struct ("GValueArray", G_TYPE_STRING, G_TYPE_UINT, G_TYPE_STRING, G_TYPE_INVALID)) +#define DISPATCHER_TYPE_RESULT_ARRAY (dbus_g_type_get_collection ("GPtrArray", DISPATCHER_TYPE_RESULT)) + #define NM_DISPATCHER_DBUS_SERVICE "org.freedesktop.nm_dispatcher" #define NM_DISPATCHER_DBUS_IFACE "org.freedesktop.nm_dispatcher" #define NM_DISPATCHER_DBUS_PATH "/org/freedesktop/nm_dispatcher" @@ -30,3 +36,11 @@ #define NMD_DEVICE_PROPS_STATE "state" #define NMD_DEVICE_PROPS_PATH "path" +typedef enum { + DISPATCH_RESULT_UNKNOWN = 0, + DISPATCH_RESULT_SUCCESS = 1, + DISPATCH_RESULT_EXEC_FAILED = 2, + DISPATCH_RESULT_FAILED = 3, + DISPATCH_RESULT_TIMEOUT = 4, +} DispatchResult; + diff --git a/callouts/nm-dispatcher.xml b/callouts/nm-dispatcher.xml index 92780b17..cba61508 100644 --- a/callouts/nm-dispatcher.xml +++ b/callouts/nm-dispatcher.xml @@ -8,6 +8,9 @@ INTERNAL; not public API. Perform an action. + + + The action being performed. @@ -72,6 +75,15 @@ + + + Results of dispatching operations. Each element of the returned + array is a struct containing the path of an executed script (s), + the result of running that script (u), and a description of the + result (s). + + + diff --git a/callouts/tests/Makefile.am b/callouts/tests/Makefile.am index 93d3fae7..e8a13fc6 100644 --- a/callouts/tests/Makefile.am +++ b/callouts/tests/Makefile.am @@ -1,3 +1,5 @@ +if ENABLE_TESTS + INCLUDES = \ -I$(top_srcdir)/include \ -I${top_builddir}/include \ @@ -25,16 +27,13 @@ test_dispatcher_envp_LDADD = \ ########################################### -if WITH_TESTS - check-local: test-dispatcher-envp $(abs_builddir)/test-dispatcher-envp $(abs_srcdir) -endif - EXTRA_DIST= \ dispatcher-old-down \ dispatcher-old-up \ dispatcher-old-vpn-down \ dispatcher-old-vpn-up +endif diff --git a/callouts/tests/Makefile.in b/callouts/tests/Makefile.in index b00728aa..ca39f716 100644 --- a/callouts/tests/Makefile.in +++ b/callouts/tests/Makefile.in @@ -51,21 +51,23 @@ PRE_UNINSTALL = : POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ -noinst_PROGRAMS = test-dispatcher-envp$(EXEEXT) +@ENABLE_TESTS_TRUE@noinst_PROGRAMS = test-dispatcher-envp$(EXEEXT) subdir = callouts/tests DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/compiler_warnings.m4 \ - $(top_srcdir)/m4/gettext.m4 $(top_srcdir)/m4/gtk-doc.m4 \ - $(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/intlmacosx.m4 \ - $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/introspection.m4 \ - $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \ - $(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/libnl-check.m4 \ - $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ - $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ - $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/nls.m4 \ - $(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/progtest.m4 \ - $(top_srcdir)/m4/vapigen.m4 $(top_srcdir)/configure.ac + $(top_srcdir)/m4/gettext.m4 \ + $(top_srcdir)/m4/gnome-code-coverage.m4 \ + $(top_srcdir)/m4/gtk-doc.m4 $(top_srcdir)/m4/iconv.m4 \ + $(top_srcdir)/m4/intlmacosx.m4 $(top_srcdir)/m4/intltool.m4 \ + $(top_srcdir)/m4/introspection.m4 $(top_srcdir)/m4/lib-ld.m4 \ + $(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \ + $(top_srcdir)/m4/libnl-check.m4 $(top_srcdir)/m4/libtool.m4 \ + $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ + $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ + $(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/po.m4 \ + $(top_srcdir)/m4/progtest.m4 $(top_srcdir)/m4/vapigen.m4 \ + $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(install_sh) -d @@ -73,14 +75,14 @@ CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = PROGRAMS = $(noinst_PROGRAMS) -am_test_dispatcher_envp_OBJECTS = \ - test_dispatcher_envp-test-dispatcher-envp.$(OBJEXT) +am__test_dispatcher_envp_SOURCES_DIST = test-dispatcher-envp.c +@ENABLE_TESTS_TRUE@am_test_dispatcher_envp_OBJECTS = test_dispatcher_envp-test-dispatcher-envp.$(OBJEXT) test_dispatcher_envp_OBJECTS = $(am_test_dispatcher_envp_OBJECTS) am__DEPENDENCIES_1 = -test_dispatcher_envp_DEPENDENCIES = \ - $(top_builddir)/libnm-util/libnm-util.la \ - $(top_builddir)/callouts/libtest-dispatcher-envp.la \ - $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) +@ENABLE_TESTS_TRUE@test_dispatcher_envp_DEPENDENCIES = \ +@ENABLE_TESTS_TRUE@ $(top_builddir)/libnm-util/libnm-util.la \ +@ENABLE_TESTS_TRUE@ $(top_builddir)/callouts/libtest-dispatcher-envp.la \ +@ENABLE_TESTS_TRUE@ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) AM_V_lt = $(am__v_lt_@AM_V@) am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) am__v_lt_0 = --silent @@ -111,7 +113,7 @@ AM_V_GEN = $(am__v_GEN_@AM_V@) am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) am__v_GEN_0 = @echo " GEN " $@; SOURCES = $(test_dispatcher_envp_SOURCES) -DIST_SOURCES = $(test_dispatcher_envp_SOURCES) +DIST_SOURCES = $(am__test_dispatcher_envp_SOURCES_DIST) am__can_run_installinfo = \ case $$AM_UPDATE_INFO_DIR in \ n|no|NO) false;; \ @@ -132,6 +134,10 @@ AWK = @AWK@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ +CKDB_PATH = @CKDB_PATH@ +CODE_COVERAGE_CFLAGS = @CODE_COVERAGE_CFLAGS@ +CODE_COVERAGE_ENABLED = @CODE_COVERAGE_ENABLED@ +CODE_COVERAGE_LDFLAGS = @CODE_COVERAGE_LDFLAGS@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CXX = @CXX@ @@ -146,9 +152,7 @@ DBUS_SYS_DIR = @DBUS_SYS_DIR@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DHCLIENT_PATH = @DHCLIENT_PATH@ -DHCLIENT_VERSION = @DHCLIENT_VERSION@ DHCPCD_PATH = @DHCPCD_PATH@ -DISABLE_DEPRECATED = @DISABLE_DEPRECATED@ DLLTOOL = @DLLTOOL@ DSYMUTIL = @DSYMUTIL@ DUMPBIN = @DUMPBIN@ @@ -158,17 +162,14 @@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ +GENHTML = @GENHTML@ GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ -GIO_CFLAGS = @GIO_CFLAGS@ -GIO_LIBS = @GIO_LIBS@ GLIB_CFLAGS = @GLIB_CFLAGS@ GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ GLIB_LIBS = @GLIB_LIBS@ GLIB_MAKEFILE = @GLIB_MAKEFILE@ GLIB_MKENUMS = @GLIB_MKENUMS@ -GMODULE_CFLAGS = @GMODULE_CFLAGS@ -GMODULE_LIBS = @GMODULE_LIBS@ GMSGFMT = @GMSGFMT@ GMSGFMT_015 = @GMSGFMT_015@ GNUTLS_CFLAGS = @GNUTLS_CFLAGS@ @@ -209,6 +210,7 @@ IPTABLES_PATH = @IPTABLES_PATH@ IWMX_SDK_CFLAGS = @IWMX_SDK_CFLAGS@ IWMX_SDK_LIBS = @IWMX_SDK_LIBS@ KERNEL_FIRMWARE_DIR = @KERNEL_FIRMWARE_DIR@ +LCOV = @LCOV@ LD = @LD@ LDFLAGS = @LDFLAGS@ LIBDL = @LIBDL@ @@ -225,11 +227,7 @@ LIBNL2_LIBS = @LIBNL2_LIBS@ LIBNL3_CFLAGS = @LIBNL3_CFLAGS@ LIBNL3_LIBS = @LIBNL3_LIBS@ LIBNL_CFLAGS = @LIBNL_CFLAGS@ -LIBNL_GENL3_CFLAGS = @LIBNL_GENL3_CFLAGS@ -LIBNL_GENL3_LIBS = @LIBNL_GENL3_LIBS@ LIBNL_LIBS = @LIBNL_LIBS@ -LIBNL_ROUTE3_CFLAGS = @LIBNL_ROUTE3_CFLAGS@ -LIBNL_ROUTE3_LIBS = @LIBNL_ROUTE3_LIBS@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ LIBSOUP_CFLAGS = @LIBSOUP_CFLAGS@ @@ -244,6 +242,8 @@ MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MANIFEST_TOOL = @MANIFEST_TOOL@ MKDIR_P = @MKDIR_P@ +MM_GLIB_CFLAGS = @MM_GLIB_CFLAGS@ +MM_GLIB_LIBS = @MM_GLIB_LIBS@ MOC = @MOC@ MSGFMT = @MSGFMT@ MSGFMT_015 = @MSGFMT_015@ @@ -253,6 +253,7 @@ NMEDIT = @NMEDIT@ NM_MAJOR_VERSION = @NM_MAJOR_VERSION@ NM_MICRO_VERSION = @NM_MICRO_VERSION@ NM_MINOR_VERSION = @NM_MINOR_VERSION@ +NM_MODIFY_SYSTEM_POLICY = @NM_MODIFY_SYSTEM_POLICY@ NM_VERSION = @NM_VERSION@ NSS_CFLAGS = @NSS_CFLAGS@ NSS_LIBS = @NSS_LIBS@ @@ -279,13 +280,14 @@ PPPD_PLUGIN_DIR = @PPPD_PLUGIN_DIR@ QT_CFLAGS = @QT_CFLAGS@ QT_LIBS = @QT_LIBS@ RANLIB = @RANLIB@ -RESOLVCONF_PATH = @RESOLVCONF_PATH@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ -SYSTEMD_CFLAGS = @SYSTEMD_CFLAGS@ -SYSTEMD_LIBS = @SYSTEMD_LIBS@ +SYSTEMD_INHIBIT_CFLAGS = @SYSTEMD_INHIBIT_CFLAGS@ +SYSTEMD_INHIBIT_LIBS = @SYSTEMD_INHIBIT_LIBS@ +SYSTEMD_LOGIN_CFLAGS = @SYSTEMD_LOGIN_CFLAGS@ +SYSTEMD_LOGIN_LIBS = @SYSTEMD_LOGIN_LIBS@ SYSTEM_CA_PATH = @SYSTEM_CA_PATH@ UDEV_BASE_DIR = @UDEV_BASE_DIR@ USE_NLS = @USE_NLS@ @@ -340,6 +342,11 @@ localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ +nmbinary = @nmbinary@ +nmconfdir = @nmconfdir@ +nmdatadir = @nmdatadir@ +nmrundir = @nmrundir@ +nmstatedir = @nmstatedir@ oldincludedir = @oldincludedir@ pdfdir = @pdfdir@ prefix = @prefix@ @@ -354,33 +361,37 @@ target_alias = @target_alias@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ -INCLUDES = \ - -I$(top_srcdir)/include \ - -I${top_builddir}/include \ - -I$(top_srcdir)/libnm-util \ - -I$(top_builddir)/libnm-util \ - -I$(top_srcdir)/callouts +with_dhclient = @with_dhclient@ +with_dhcpcd = @with_dhcpcd@ +with_netconfig = @with_netconfig@ +with_resolvconf = @with_resolvconf@ +@ENABLE_TESTS_TRUE@INCLUDES = \ +@ENABLE_TESTS_TRUE@ -I$(top_srcdir)/include \ +@ENABLE_TESTS_TRUE@ -I${top_builddir}/include \ +@ENABLE_TESTS_TRUE@ -I$(top_srcdir)/libnm-util \ +@ENABLE_TESTS_TRUE@ -I$(top_builddir)/libnm-util \ +@ENABLE_TESTS_TRUE@ -I$(top_srcdir)/callouts ####### dispatcher envp ####### -test_dispatcher_envp_SOURCES = \ - test-dispatcher-envp.c +@ENABLE_TESTS_TRUE@test_dispatcher_envp_SOURCES = \ +@ENABLE_TESTS_TRUE@ test-dispatcher-envp.c -test_dispatcher_envp_CPPFLAGS = \ - $(GLIB_CFLAGS) \ - $(DBUS_CFLAGS) +@ENABLE_TESTS_TRUE@test_dispatcher_envp_CPPFLAGS = \ +@ENABLE_TESTS_TRUE@ $(GLIB_CFLAGS) \ +@ENABLE_TESTS_TRUE@ $(DBUS_CFLAGS) -test_dispatcher_envp_LDADD = \ - $(top_builddir)/libnm-util/libnm-util.la \ - $(top_builddir)/callouts/libtest-dispatcher-envp.la \ - $(GLIB_LIBS) \ - $(DBUS_LIBS) +@ENABLE_TESTS_TRUE@test_dispatcher_envp_LDADD = \ +@ENABLE_TESTS_TRUE@ $(top_builddir)/libnm-util/libnm-util.la \ +@ENABLE_TESTS_TRUE@ $(top_builddir)/callouts/libtest-dispatcher-envp.la \ +@ENABLE_TESTS_TRUE@ $(GLIB_LIBS) \ +@ENABLE_TESTS_TRUE@ $(DBUS_LIBS) -EXTRA_DIST = \ - dispatcher-old-down \ - dispatcher-old-up \ - dispatcher-old-vpn-down \ - dispatcher-old-vpn-up +@ENABLE_TESTS_TRUE@EXTRA_DIST = \ +@ENABLE_TESTS_TRUE@ dispatcher-old-down \ +@ENABLE_TESTS_TRUE@ dispatcher-old-up \ +@ENABLE_TESTS_TRUE@ dispatcher-old-vpn-down \ +@ENABLE_TESTS_TRUE@ dispatcher-old-vpn-up all: all-am @@ -438,25 +449,22 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_dispatcher_envp-test-dispatcher-envp.Po@am__quote@ .c.o: -@am__fastdepCC_TRUE@ $(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\ -@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\ -@am__fastdepCC_TRUE@ $(am__mv) $$depbase.Tpo $$depbase.Po +@am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $< +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c $< .c.obj: -@am__fastdepCC_TRUE@ $(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.obj$$||'`;\ -@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ `$(CYGPATH_W) '$<'` &&\ -@am__fastdepCC_TRUE@ $(am__mv) $$depbase.Tpo $$depbase.Po +@am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c `$(CYGPATH_W) '$<'` .c.lo: -@am__fastdepCC_TRUE@ $(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.lo$$||'`;\ -@am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\ -@am__fastdepCC_TRUE@ $(am__mv) $$depbase.Tpo $$depbase.Plo +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $< @@ -563,7 +571,7 @@ distdir: $(DISTFILES) || exit 1; \ fi; \ done -@WITH_TESTS_FALSE@check-local: +@ENABLE_TESTS_FALSE@check-local: check-am: all-am $(MAKE) $(AM_MAKEFLAGS) check-local check: check-am @@ -689,8 +697,8 @@ uninstall-am: ########################################### -@WITH_TESTS_TRUE@check-local: test-dispatcher-envp -@WITH_TESTS_TRUE@ $(abs_builddir)/test-dispatcher-envp $(abs_srcdir) +@ENABLE_TESTS_TRUE@check-local: test-dispatcher-envp +@ENABLE_TESTS_TRUE@ $(abs_builddir)/test-dispatcher-envp $(abs_srcdir) # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. diff --git a/callouts/tests/test-dispatcher-envp.c b/callouts/tests/test-dispatcher-envp.c index 34b9dbf5..67737690 100644 --- a/callouts/tests/test-dispatcher-envp.c +++ b/callouts/tests/test-dispatcher-envp.c @@ -22,7 +22,6 @@ #include #include #include -#include #include #include diff --git a/cli/Makefile.in b/cli/Makefile.in index be1b0e76..ef08ebca 100644 --- a/cli/Makefile.in +++ b/cli/Makefile.in @@ -54,16 +54,18 @@ subdir = cli DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/compiler_warnings.m4 \ - $(top_srcdir)/m4/gettext.m4 $(top_srcdir)/m4/gtk-doc.m4 \ - $(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/intlmacosx.m4 \ - $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/introspection.m4 \ - $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \ - $(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/libnl-check.m4 \ - $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ - $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ - $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/nls.m4 \ - $(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/progtest.m4 \ - $(top_srcdir)/m4/vapigen.m4 $(top_srcdir)/configure.ac + $(top_srcdir)/m4/gettext.m4 \ + $(top_srcdir)/m4/gnome-code-coverage.m4 \ + $(top_srcdir)/m4/gtk-doc.m4 $(top_srcdir)/m4/iconv.m4 \ + $(top_srcdir)/m4/intlmacosx.m4 $(top_srcdir)/m4/intltool.m4 \ + $(top_srcdir)/m4/introspection.m4 $(top_srcdir)/m4/lib-ld.m4 \ + $(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \ + $(top_srcdir)/m4/libnl-check.m4 $(top_srcdir)/m4/libtool.m4 \ + $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ + $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ + $(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/po.m4 \ + $(top_srcdir)/m4/progtest.m4 $(top_srcdir)/m4/vapigen.m4 \ + $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(install_sh) -d @@ -136,6 +138,10 @@ AWK = @AWK@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ +CKDB_PATH = @CKDB_PATH@ +CODE_COVERAGE_CFLAGS = @CODE_COVERAGE_CFLAGS@ +CODE_COVERAGE_ENABLED = @CODE_COVERAGE_ENABLED@ +CODE_COVERAGE_LDFLAGS = @CODE_COVERAGE_LDFLAGS@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CXX = @CXX@ @@ -150,9 +156,7 @@ DBUS_SYS_DIR = @DBUS_SYS_DIR@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DHCLIENT_PATH = @DHCLIENT_PATH@ -DHCLIENT_VERSION = @DHCLIENT_VERSION@ DHCPCD_PATH = @DHCPCD_PATH@ -DISABLE_DEPRECATED = @DISABLE_DEPRECATED@ DLLTOOL = @DLLTOOL@ DSYMUTIL = @DSYMUTIL@ DUMPBIN = @DUMPBIN@ @@ -162,17 +166,14 @@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ +GENHTML = @GENHTML@ GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ -GIO_CFLAGS = @GIO_CFLAGS@ -GIO_LIBS = @GIO_LIBS@ GLIB_CFLAGS = @GLIB_CFLAGS@ GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ GLIB_LIBS = @GLIB_LIBS@ GLIB_MAKEFILE = @GLIB_MAKEFILE@ GLIB_MKENUMS = @GLIB_MKENUMS@ -GMODULE_CFLAGS = @GMODULE_CFLAGS@ -GMODULE_LIBS = @GMODULE_LIBS@ GMSGFMT = @GMSGFMT@ GMSGFMT_015 = @GMSGFMT_015@ GNUTLS_CFLAGS = @GNUTLS_CFLAGS@ @@ -213,6 +214,7 @@ IPTABLES_PATH = @IPTABLES_PATH@ IWMX_SDK_CFLAGS = @IWMX_SDK_CFLAGS@ IWMX_SDK_LIBS = @IWMX_SDK_LIBS@ KERNEL_FIRMWARE_DIR = @KERNEL_FIRMWARE_DIR@ +LCOV = @LCOV@ LD = @LD@ LDFLAGS = @LDFLAGS@ LIBDL = @LIBDL@ @@ -229,11 +231,7 @@ LIBNL2_LIBS = @LIBNL2_LIBS@ LIBNL3_CFLAGS = @LIBNL3_CFLAGS@ LIBNL3_LIBS = @LIBNL3_LIBS@ LIBNL_CFLAGS = @LIBNL_CFLAGS@ -LIBNL_GENL3_CFLAGS = @LIBNL_GENL3_CFLAGS@ -LIBNL_GENL3_LIBS = @LIBNL_GENL3_LIBS@ LIBNL_LIBS = @LIBNL_LIBS@ -LIBNL_ROUTE3_CFLAGS = @LIBNL_ROUTE3_CFLAGS@ -LIBNL_ROUTE3_LIBS = @LIBNL_ROUTE3_LIBS@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ LIBSOUP_CFLAGS = @LIBSOUP_CFLAGS@ @@ -248,6 +246,8 @@ MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MANIFEST_TOOL = @MANIFEST_TOOL@ MKDIR_P = @MKDIR_P@ +MM_GLIB_CFLAGS = @MM_GLIB_CFLAGS@ +MM_GLIB_LIBS = @MM_GLIB_LIBS@ MOC = @MOC@ MSGFMT = @MSGFMT@ MSGFMT_015 = @MSGFMT_015@ @@ -257,6 +257,7 @@ NMEDIT = @NMEDIT@ NM_MAJOR_VERSION = @NM_MAJOR_VERSION@ NM_MICRO_VERSION = @NM_MICRO_VERSION@ NM_MINOR_VERSION = @NM_MINOR_VERSION@ +NM_MODIFY_SYSTEM_POLICY = @NM_MODIFY_SYSTEM_POLICY@ NM_VERSION = @NM_VERSION@ NSS_CFLAGS = @NSS_CFLAGS@ NSS_LIBS = @NSS_LIBS@ @@ -283,13 +284,14 @@ PPPD_PLUGIN_DIR = @PPPD_PLUGIN_DIR@ QT_CFLAGS = @QT_CFLAGS@ QT_LIBS = @QT_LIBS@ RANLIB = @RANLIB@ -RESOLVCONF_PATH = @RESOLVCONF_PATH@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ -SYSTEMD_CFLAGS = @SYSTEMD_CFLAGS@ -SYSTEMD_LIBS = @SYSTEMD_LIBS@ +SYSTEMD_INHIBIT_CFLAGS = @SYSTEMD_INHIBIT_CFLAGS@ +SYSTEMD_INHIBIT_LIBS = @SYSTEMD_INHIBIT_LIBS@ +SYSTEMD_LOGIN_CFLAGS = @SYSTEMD_LOGIN_CFLAGS@ +SYSTEMD_LOGIN_LIBS = @SYSTEMD_LOGIN_LIBS@ SYSTEM_CA_PATH = @SYSTEM_CA_PATH@ UDEV_BASE_DIR = @UDEV_BASE_DIR@ USE_NLS = @USE_NLS@ @@ -344,6 +346,11 @@ localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ +nmbinary = @nmbinary@ +nmconfdir = @nmconfdir@ +nmdatadir = @nmdatadir@ +nmrundir = @nmrundir@ +nmstatedir = @nmstatedir@ oldincludedir = @oldincludedir@ pdfdir = @pdfdir@ prefix = @prefix@ @@ -358,6 +365,10 @@ target_alias = @target_alias@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ +with_dhclient = @with_dhclient@ +with_dhcpcd = @with_dhcpcd@ +with_netconfig = @with_netconfig@ +with_resolvconf = @with_resolvconf@ SUBDIRS = src all: all-recursive diff --git a/cli/src/Makefile.am b/cli/src/Makefile.am index ec62bfea..0f379c10 100644 --- a/cli/src/Makefile.am +++ b/cli/src/Makefile.am @@ -28,8 +28,7 @@ nmcli_SOURCES = \ nmcli_CPPFLAGS = \ $(DBUS_CFLAGS) \ $(GLIB_CFLAGS) \ - -DNMCLI_LOCALEDIR=\"$(datadir)/locale\" \ - -DG_DISABLE_DEPRECATED + -DNMCLI_LOCALEDIR=\"$(datadir)/locale\" nmcli_LDADD = \ $(DBUS_LIBS) \ diff --git a/cli/src/Makefile.in b/cli/src/Makefile.in index 427e22a4..27f3b23a 100644 --- a/cli/src/Makefile.in +++ b/cli/src/Makefile.in @@ -56,16 +56,18 @@ subdir = cli/src DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/compiler_warnings.m4 \ - $(top_srcdir)/m4/gettext.m4 $(top_srcdir)/m4/gtk-doc.m4 \ - $(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/intlmacosx.m4 \ - $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/introspection.m4 \ - $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \ - $(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/libnl-check.m4 \ - $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ - $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ - $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/nls.m4 \ - $(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/progtest.m4 \ - $(top_srcdir)/m4/vapigen.m4 $(top_srcdir)/configure.ac + $(top_srcdir)/m4/gettext.m4 \ + $(top_srcdir)/m4/gnome-code-coverage.m4 \ + $(top_srcdir)/m4/gtk-doc.m4 $(top_srcdir)/m4/iconv.m4 \ + $(top_srcdir)/m4/intlmacosx.m4 $(top_srcdir)/m4/intltool.m4 \ + $(top_srcdir)/m4/introspection.m4 $(top_srcdir)/m4/lib-ld.m4 \ + $(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \ + $(top_srcdir)/m4/libnl-check.m4 $(top_srcdir)/m4/libtool.m4 \ + $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ + $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ + $(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/po.m4 \ + $(top_srcdir)/m4/progtest.m4 $(top_srcdir)/m4/vapigen.m4 \ + $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(install_sh) -d @@ -134,6 +136,10 @@ AWK = @AWK@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ +CKDB_PATH = @CKDB_PATH@ +CODE_COVERAGE_CFLAGS = @CODE_COVERAGE_CFLAGS@ +CODE_COVERAGE_ENABLED = @CODE_COVERAGE_ENABLED@ +CODE_COVERAGE_LDFLAGS = @CODE_COVERAGE_LDFLAGS@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CXX = @CXX@ @@ -148,9 +154,7 @@ DBUS_SYS_DIR = @DBUS_SYS_DIR@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DHCLIENT_PATH = @DHCLIENT_PATH@ -DHCLIENT_VERSION = @DHCLIENT_VERSION@ DHCPCD_PATH = @DHCPCD_PATH@ -DISABLE_DEPRECATED = @DISABLE_DEPRECATED@ DLLTOOL = @DLLTOOL@ DSYMUTIL = @DSYMUTIL@ DUMPBIN = @DUMPBIN@ @@ -160,17 +164,14 @@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ +GENHTML = @GENHTML@ GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ -GIO_CFLAGS = @GIO_CFLAGS@ -GIO_LIBS = @GIO_LIBS@ GLIB_CFLAGS = @GLIB_CFLAGS@ GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ GLIB_LIBS = @GLIB_LIBS@ GLIB_MAKEFILE = @GLIB_MAKEFILE@ GLIB_MKENUMS = @GLIB_MKENUMS@ -GMODULE_CFLAGS = @GMODULE_CFLAGS@ -GMODULE_LIBS = @GMODULE_LIBS@ GMSGFMT = @GMSGFMT@ GMSGFMT_015 = @GMSGFMT_015@ GNUTLS_CFLAGS = @GNUTLS_CFLAGS@ @@ -211,6 +212,7 @@ IPTABLES_PATH = @IPTABLES_PATH@ IWMX_SDK_CFLAGS = @IWMX_SDK_CFLAGS@ IWMX_SDK_LIBS = @IWMX_SDK_LIBS@ KERNEL_FIRMWARE_DIR = @KERNEL_FIRMWARE_DIR@ +LCOV = @LCOV@ LD = @LD@ LDFLAGS = @LDFLAGS@ LIBDL = @LIBDL@ @@ -227,11 +229,7 @@ LIBNL2_LIBS = @LIBNL2_LIBS@ LIBNL3_CFLAGS = @LIBNL3_CFLAGS@ LIBNL3_LIBS = @LIBNL3_LIBS@ LIBNL_CFLAGS = @LIBNL_CFLAGS@ -LIBNL_GENL3_CFLAGS = @LIBNL_GENL3_CFLAGS@ -LIBNL_GENL3_LIBS = @LIBNL_GENL3_LIBS@ LIBNL_LIBS = @LIBNL_LIBS@ -LIBNL_ROUTE3_CFLAGS = @LIBNL_ROUTE3_CFLAGS@ -LIBNL_ROUTE3_LIBS = @LIBNL_ROUTE3_LIBS@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ LIBSOUP_CFLAGS = @LIBSOUP_CFLAGS@ @@ -246,6 +244,8 @@ MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MANIFEST_TOOL = @MANIFEST_TOOL@ MKDIR_P = @MKDIR_P@ +MM_GLIB_CFLAGS = @MM_GLIB_CFLAGS@ +MM_GLIB_LIBS = @MM_GLIB_LIBS@ MOC = @MOC@ MSGFMT = @MSGFMT@ MSGFMT_015 = @MSGFMT_015@ @@ -255,6 +255,7 @@ NMEDIT = @NMEDIT@ NM_MAJOR_VERSION = @NM_MAJOR_VERSION@ NM_MICRO_VERSION = @NM_MICRO_VERSION@ NM_MINOR_VERSION = @NM_MINOR_VERSION@ +NM_MODIFY_SYSTEM_POLICY = @NM_MODIFY_SYSTEM_POLICY@ NM_VERSION = @NM_VERSION@ NSS_CFLAGS = @NSS_CFLAGS@ NSS_LIBS = @NSS_LIBS@ @@ -281,13 +282,14 @@ PPPD_PLUGIN_DIR = @PPPD_PLUGIN_DIR@ QT_CFLAGS = @QT_CFLAGS@ QT_LIBS = @QT_LIBS@ RANLIB = @RANLIB@ -RESOLVCONF_PATH = @RESOLVCONF_PATH@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ -SYSTEMD_CFLAGS = @SYSTEMD_CFLAGS@ -SYSTEMD_LIBS = @SYSTEMD_LIBS@ +SYSTEMD_INHIBIT_CFLAGS = @SYSTEMD_INHIBIT_CFLAGS@ +SYSTEMD_INHIBIT_LIBS = @SYSTEMD_INHIBIT_LIBS@ +SYSTEMD_LOGIN_CFLAGS = @SYSTEMD_LOGIN_CFLAGS@ +SYSTEMD_LOGIN_LIBS = @SYSTEMD_LOGIN_LIBS@ SYSTEM_CA_PATH = @SYSTEM_CA_PATH@ UDEV_BASE_DIR = @UDEV_BASE_DIR@ USE_NLS = @USE_NLS@ @@ -342,6 +344,11 @@ localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ +nmbinary = @nmbinary@ +nmconfdir = @nmconfdir@ +nmdatadir = @nmdatadir@ +nmrundir = @nmrundir@ +nmstatedir = @nmstatedir@ oldincludedir = @oldincludedir@ pdfdir = @pdfdir@ prefix = @prefix@ @@ -356,6 +363,10 @@ target_alias = @target_alias@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ +with_dhclient = @with_dhclient@ +with_dhcpcd = @with_dhcpcd@ +with_netconfig = @with_netconfig@ +with_resolvconf = @with_resolvconf@ INCLUDES = \ -I${top_srcdir} \ -I${top_srcdir}/include \ @@ -383,8 +394,7 @@ nmcli_SOURCES = \ nmcli_CPPFLAGS = \ $(DBUS_CFLAGS) \ $(GLIB_CFLAGS) \ - -DNMCLI_LOCALEDIR=\"$(datadir)/locale\" \ - -DG_DISABLE_DEPRECATED + -DNMCLI_LOCALEDIR=\"$(datadir)/locale\" nmcli_LDADD = \ $(DBUS_LIBS) \ @@ -491,25 +501,22 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/nmcli-utils.Po@am__quote@ .c.o: -@am__fastdepCC_TRUE@ $(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\ -@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\ -@am__fastdepCC_TRUE@ $(am__mv) $$depbase.Tpo $$depbase.Po +@am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $< +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c $< .c.obj: -@am__fastdepCC_TRUE@ $(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.obj$$||'`;\ -@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ `$(CYGPATH_W) '$<'` &&\ -@am__fastdepCC_TRUE@ $(am__mv) $$depbase.Tpo $$depbase.Po +@am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c `$(CYGPATH_W) '$<'` .c.lo: -@am__fastdepCC_TRUE@ $(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.lo$$||'`;\ -@am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\ -@am__fastdepCC_TRUE@ $(am__mv) $$depbase.Tpo $$depbase.Plo +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $< diff --git a/cli/src/common.c b/cli/src/common.c index 193ea33f..15ddcada 100644 --- a/cli/src/common.c +++ b/cli/src/common.c @@ -411,7 +411,7 @@ nmc_device_reason_to_string (NMDeviceStateReason reason) return _("The device could not be readied for configuration"); case NM_DEVICE_STATE_REASON_IP_CONFIG_UNAVAILABLE: - return _("IP configuration could not be reserved (no available address, timeout, etc)"); + return _("IP configuration could not be reserved (no available address, timeout, etc.)"); case NM_DEVICE_STATE_REASON_IP_CONFIG_EXPIRED: return _("The IP configuration is no longer valid"); @@ -551,6 +551,15 @@ nmc_device_reason_to_string (NMDeviceStateReason reason) case NM_DEVICE_STATE_REASON_BR2684_FAILED: return _("A problem with the RFC 2684 Ethernet over ADSL bridge"); + case NM_DEVICE_STATE_REASON_MODEM_MANAGER_UNAVAILABLE: + return _("ModemManager is unavailable"); + + case NM_DEVICE_STATE_REASON_SSID_NOT_FOUND: + return _("The Wi-Fi network could not be found"); + + case NM_DEVICE_STATE_REASON_SECONDARY_CONNECTION_FAILED: + return _("A secondary connection of the base connection failed"); + default: return _("Unknown"); } diff --git a/cli/src/connections.c b/cli/src/connections.c index 4776e1a6..e7926f1a 100644 --- a/cli/src/connections.c +++ b/cli/src/connections.c @@ -43,6 +43,7 @@ #include #include #include +#include #include #include #include @@ -94,6 +95,8 @@ static NmcOutputField nmc_fields_settings_names[] = { SETTING_FIELD (NM_SETTING_BOND_SETTING_NAME, 0), /* 17 */ SETTING_FIELD (NM_SETTING_VLAN_SETTING_NAME, 0), /* 18 */ SETTING_FIELD (NM_SETTING_ADSL_SETTING_NAME, 0), /* 19 */ + SETTING_FIELD (NM_SETTING_BRIDGE_SETTING_NAME, 0), /* 20 */ + SETTING_FIELD (NM_SETTING_BRIDGE_PORT_SETTING_NAME, 0), /* 21 */ {NULL, NULL, 0, NULL, 0} }; #define NMC_FIELDS_SETTINGS_NAMES_ALL_X NM_SETTING_CONNECTION_SETTING_NAME","\ @@ -114,7 +117,9 @@ static NmcOutputField nmc_fields_settings_names[] = { NM_SETTING_VPN_SETTING_NAME","\ NM_SETTING_INFINIBAND_SETTING_NAME","\ NM_SETTING_BOND_SETTING_NAME","\ - NM_SETTING_VLAN_SETTING_NAME + NM_SETTING_VLAN_SETTING_NAME","\ + NM_SETTING_BRIDGE_SETTING_NAME","\ + NM_SETTING_BRIDGE_PORT_SETTING_NAME #if WITH_WIMAX #define NMC_FIELDS_SETTINGS_NAMES_ALL NMC_FIELDS_SETTINGS_NAMES_ALL_X","\ NM_SETTING_WIMAX_SETTING_NAME @@ -187,7 +192,7 @@ static void usage (void) { fprintf (stderr, - _("Usage: nmcli con { COMMAND | help }\n" + _("Usage: nmcli connection { COMMAND | help }\n" " COMMAND := { list | status | up | down | delete }\n\n" " list [id | uuid ]\n" " status [id | uuid | path ]\n" @@ -197,7 +202,9 @@ usage (void) " up id | uuid [iface ] [ap ] [--nowait] [--timeout ]\n" #endif " down id | uuid \n" - " delete id | uuid \n")); + " delete id | uuid \n" + "\n" + )); } /* The real commands that do something - i.e. not 'help', etc. */ @@ -450,6 +457,24 @@ nmc_connection_detail (NMConnection *connection, NmCli *nmc) continue; } } + + if (!strcasecmp (nmc_fields_settings_names[section_idx].name, nmc_fields_settings_names[20].name)) { + NMSettingBridge *s_bridge = nm_connection_get_setting_bridge (connection); + if (s_bridge) { + setting_bridge_details (s_bridge, nmc); + was_output = TRUE; + continue; + } + } + + if (!strcasecmp (nmc_fields_settings_names[section_idx].name, nmc_fields_settings_names[21].name)) { + NMSettingBridgePort *s_bridge_port = nm_connection_get_setting_bridge_port (connection); + if (s_bridge_port) { + setting_bridge_port_details (s_bridge_port, nmc); + was_output = TRUE; + continue; + } + } } if (print_settings_array) @@ -570,7 +595,7 @@ do_connections_list (NmCli *nmc, int argc, char **argv) NMConnection *con; if (next_arg (&argc, &argv) != 0) { - g_string_printf (nmc->return_text, _("Error: %s argument is missing."), *argv); + g_string_printf (nmc->return_text, _("Error: %s argument is missing."), *(argv-1)); nmc->return_value = NMC_RESULT_ERROR_USER_INPUT; return nmc->return_value; } @@ -1107,7 +1132,7 @@ do_connections_status (NmCli *nmc, int argc, char **argv) NMActiveConnection *acon; if (next_arg (&argc, &argv) != 0) { - g_string_printf (nmc->return_text, _("Error: %s argument is missing."), *argv); + g_string_printf (nmc->return_text, _("Error: %s argument is missing."), *(argv-1)); nmc->return_value = NMC_RESULT_ERROR_USER_INPUT; return nmc->return_value; } @@ -1645,7 +1670,7 @@ do_connection_up (NmCli *nmc, int argc, char **argv) id_specified = TRUE; if (next_arg (&argc, &argv) != 0) { - g_string_printf (nmc->return_text, _("Error: %s argument is missing."), *argv); + g_string_printf (nmc->return_text, _("Error: %s argument is missing."), *(argv-1)); nmc->return_value = NMC_RESULT_ERROR_USER_INPUT; goto error; } @@ -1660,7 +1685,7 @@ do_connection_up (NmCli *nmc, int argc, char **argv) } else if (strcmp (*argv, "iface") == 0) { if (next_arg (&argc, &argv) != 0) { - g_string_printf (nmc->return_text, _("Error: %s argument is missing."), *argv); + g_string_printf (nmc->return_text, _("Error: %s argument is missing."), *(argv-1)); nmc->return_value = NMC_RESULT_ERROR_USER_INPUT; goto error; } @@ -1669,7 +1694,7 @@ do_connection_up (NmCli *nmc, int argc, char **argv) } else if (strcmp (*argv, "ap") == 0) { if (next_arg (&argc, &argv) != 0) { - g_string_printf (nmc->return_text, _("Error: %s argument is missing."), *argv); + g_string_printf (nmc->return_text, _("Error: %s argument is missing."), *(argv-1)); nmc->return_value = NMC_RESULT_ERROR_USER_INPUT; goto error; } @@ -1679,7 +1704,7 @@ do_connection_up (NmCli *nmc, int argc, char **argv) #if WITH_WIMAX else if (strcmp (*argv, "nsp") == 0) { if (next_arg (&argc, &argv) != 0) { - g_string_printf (nmc->return_text, _("Error: %s argument is missing."), *argv); + g_string_printf (nmc->return_text, _("Error: %s argument is missing."), *(argv-1)); nmc->return_value = NMC_RESULT_ERROR_USER_INPUT; goto error; } @@ -1691,7 +1716,7 @@ do_connection_up (NmCli *nmc, int argc, char **argv) wait = FALSE; } else if (strcmp (*argv, "--timeout") == 0) { if (next_arg (&argc, &argv) != 0) { - g_string_printf (nmc->return_text, _("Error: %s argument is missing."), *argv); + g_string_printf (nmc->return_text, _("Error: %s argument is missing."), *(argv-1)); nmc->return_value = NMC_RESULT_ERROR_USER_INPUT; goto error; } @@ -1737,7 +1762,8 @@ do_connection_up (NmCli *nmc, int argc, char **argv) con_type = nm_setting_connection_get_connection_type (s_con); if ( nm_connection_is_type (connection, NM_SETTING_BOND_SETTING_NAME) - || nm_connection_is_type (connection, NM_SETTING_VLAN_SETTING_NAME)) + || nm_connection_is_type (connection, NM_SETTING_VLAN_SETTING_NAME) + || nm_connection_is_type (connection, NM_SETTING_BRIDGE_SETTING_NAME)) is_virtual = TRUE; device_found = find_device_for_connection (nmc, connection, iface, ap, nsp, &device, &spec_object, &error); @@ -1799,7 +1825,7 @@ do_connection_down (NmCli *nmc, int argc, char **argv) id_specified = TRUE; if (next_arg (&argc, &argv) != 0) { - g_string_printf (nmc->return_text, _("Error: %s argument is missing."), *argv); + g_string_printf (nmc->return_text, _("Error: %s argument is missing."), *(argv-1)); nmc->return_value = NMC_RESULT_ERROR_USER_INPUT; goto error; } @@ -1901,7 +1927,7 @@ do_connection_delete (NmCli *nmc, int argc, char **argv) if (strcmp (*argv, "id") == 0 || strcmp (*argv, "uuid") == 0) { selector = *argv; if (next_arg (&argc, &argv) != 0) { - g_string_printf (nmc->return_text, _("Error: %s argument is missing."), *argv); + g_string_printf (nmc->return_text, _("Error: %s argument is missing."), *(argv-1)); nmc->return_value = NMC_RESULT_ERROR_USER_INPUT; goto error; } @@ -1987,10 +2013,13 @@ parse_cmd (NmCli *nmc, int argc, char **argv) else if (matches(*argv, "delete") == 0) { nmc->return_value = do_connection_delete (nmc, argc-1, argv+1); } - else if (matches (*argv, "help") == 0) { + else if ( matches (*argv, "help") == 0 + || (g_str_has_prefix (*argv, "-") && matches ((*argv)+1, "help") == 0) + || (g_str_has_prefix (*argv, "--") && matches ((*argv)+2, "help") == 0)) { usage (); nmc->should_wait = FALSE; - } else { + } + else { usage (); g_string_printf (nmc->return_text, _("Error: 'con' command '%s' is not valid."), *argv); nmc->return_value = NMC_RESULT_ERROR_USER_INPUT; @@ -2023,7 +2052,7 @@ get_connections_cb (NMRemoteSettings *settings, gpointer user_data) quit (); } -/* Entry point function for connections-related commands: 'nmcli con' */ +/* Entry point function for connections-related commands: 'nmcli connection' */ NMCResultCode do_connections (NmCli *nmc, int argc, char **argv) { diff --git a/cli/src/devices.c b/cli/src/devices.c index 420fd403..caaf7102 100644 --- a/cli/src/devices.c +++ b/cli/src/devices.c @@ -41,6 +41,7 @@ #endif #include #include +#include #include #include #include @@ -240,7 +241,7 @@ static void usage (void) { fprintf (stderr, - _("Usage: nmcli dev { COMMAND | help }\n\n" + _("Usage: nmcli device { COMMAND | help }\n\n" #if WITH_WIMAX " COMMAND := { status | list | disconnect | wifi | wimax }\n\n" #else @@ -253,8 +254,9 @@ usage (void) " wifi connect <(B)SSID> [password ] [wep-key-type key|phrase] [iface ] [bssid ] [name ]\n" " [--private] [--nowait] [--timeout ]\n" #if WITH_WIMAX - " wimax [list [iface ] [nsp ]]\n\n" + " wimax [list [iface ] [nsp ]]\n" #endif + "\n" )); } @@ -306,6 +308,8 @@ device_type_to_string (NMDevice *device) return NM_SETTING_BOND_SETTING_NAME; case NM_DEVICE_TYPE_VLAN: return NM_SETTING_VLAN_SETTING_NAME; + case NM_DEVICE_TYPE_BRIDGE: + return NM_SETTING_BRIDGE_SETTING_NAME; default: return _("Unknown"); } @@ -423,11 +427,13 @@ detail_access_point (gpointer data, gpointer user_data) if (security_str->len > 0) g_string_truncate (security_str, security_str->len-1); /* Chop off last space */ - ap_name = g_strdup_printf ("AP%d", info->index++); /* AP */ + ap_name = g_strdup_printf ("AP[%d]", info->index++); /* AP */ info->nmc->allowed_fields[0].value = ap_name; info->nmc->allowed_fields[1].value = ssid_str; info->nmc->allowed_fields[2].value = bssid; - info->nmc->allowed_fields[3].value = mode == NM_802_11_MODE_ADHOC ? _("Ad-Hoc") : mode == NM_802_11_MODE_INFRA ? _("Infrastructure") : _("Unknown"); + info->nmc->allowed_fields[3].value = mode == NM_802_11_MODE_ADHOC ? _("Ad-Hoc") + : mode == NM_802_11_MODE_INFRA ? _("Infrastructure") + : _("Unknown"); info->nmc->allowed_fields[4].value = freq_str; info->nmc->allowed_fields[5].value = bitrate_str; info->nmc->allowed_fields[6].value = strength_str; @@ -481,7 +487,7 @@ detail_wimax_nsp (NMWimaxNsp *nsp, NmCli *nmc, NMDevice *dev, int idx) } quality_str = g_strdup_printf ("%u", nm_wimax_nsp_get_signal_quality (nsp)); - nsp_name = g_strdup_printf ("NSP%d", idx); /* NSP */ + nsp_name = g_strdup_printf ("NSP[%d]", idx); /* NSP */ nmc->allowed_fields[0].value = nsp_name; nmc->allowed_fields[1].value = nm_wimax_nsp_get_name (nsp); @@ -587,6 +593,8 @@ show_device_info (gpointer data, gpointer user_data) hwaddr = nm_device_bond_get_hw_address (NM_DEVICE_BOND (device)); else if (NM_IS_DEVICE_VLAN (device)) hwaddr = nm_device_vlan_get_hw_address (NM_DEVICE_VLAN (device)); + else if (NM_IS_DEVICE_BRIDGE (device)) + hwaddr = nm_device_bridge_get_hw_address (NM_DEVICE_BRIDGE (device)); state_str = g_strdup_printf ("%d (%s)", state, nmc_device_state_to_string (state)); reason_str = g_strdup_printf ("%d (%s)", reason, nmc_device_reason_to_string (reason)); @@ -973,7 +981,7 @@ do_devices_list (NmCli *nmc, int argc, char **argv) iface_specified = TRUE; if (next_arg (&argc, &argv) != 0) { - g_string_printf (nmc->return_text, _("Error: '%s' argument is missing."), *argv); + g_string_printf (nmc->return_text, _("Error: '%s' argument is missing."), *(argv-1)); nmc->return_value = NMC_RESULT_ERROR_USER_INPUT; goto error; } @@ -1116,7 +1124,7 @@ do_device_disconnect (NmCli *nmc, int argc, char **argv) iface_specified = TRUE; if (next_arg (&argc, &argv) != 0) { - g_string_printf (nmc->return_text, _("Error: %s argument is missing."), *argv); + g_string_printf (nmc->return_text, _("Error: %s argument is missing."), *(argv-1)); nmc->return_value = NMC_RESULT_ERROR_USER_INPUT; goto error; } @@ -1126,7 +1134,7 @@ do_device_disconnect (NmCli *nmc, int argc, char **argv) wait = FALSE; } else if (strcmp (*argv, "--timeout") == 0) { if (next_arg (&argc, &argv) != 0) { - g_string_printf (nmc->return_text, _("Error: %s argument is missing."), *argv); + g_string_printf (nmc->return_text, _("Error: %s argument is missing."), *(argv-1)); nmc->return_value = NMC_RESULT_ERROR_USER_INPUT; goto error; } @@ -1244,7 +1252,7 @@ do_device_wifi_list (NmCli *nmc, int argc, char **argv) while (argc > 0) { if (strcmp (*argv, "iface") == 0) { if (next_arg (&argc, &argv) != 0) { - g_string_printf (nmc->return_text, _("Error: %s argument is missing."), *argv); + g_string_printf (nmc->return_text, _("Error: %s argument is missing."), *(argv-1)); nmc->return_value = NMC_RESULT_ERROR_USER_INPUT; goto error; } @@ -1252,7 +1260,7 @@ do_device_wifi_list (NmCli *nmc, int argc, char **argv) } else if (strcmp (*argv, "bssid") == 0 || strcmp (*argv, "hwaddr") == 0) { /* hwaddr is deprecated and will be removed later */ if (next_arg (&argc, &argv) != 0) { - g_string_printf (nmc->return_text, _("Error: %s argument is missing."), *argv); + g_string_printf (nmc->return_text, _("Error: %s argument is missing."), *(argv-1)); nmc->return_value = NMC_RESULT_ERROR_USER_INPUT; goto error; } @@ -1616,14 +1624,14 @@ do_device_wifi_connect_network (NmCli *nmc, int argc, char **argv) while (argc > 0) { if (strcmp (*argv, "iface") == 0) { if (next_arg (&argc, &argv) != 0) { - g_string_printf (nmc->return_text, _("Error: %s argument is missing."), *argv); + g_string_printf (nmc->return_text, _("Error: %s argument is missing."), *(argv-1)); nmc->return_value = NMC_RESULT_ERROR_USER_INPUT; goto error; } iface = *argv; } else if (strcmp (*argv, "bssid") == 0) { if (next_arg (&argc, &argv) != 0) { - g_string_printf (nmc->return_text, _("Error: %s argument is missing."), *argv); + g_string_printf (nmc->return_text, _("Error: %s argument is missing."), *(argv-1)); nmc->return_value = NMC_RESULT_ERROR_USER_INPUT; goto error; } @@ -1637,14 +1645,14 @@ do_device_wifi_connect_network (NmCli *nmc, int argc, char **argv) } } else if (strcmp (*argv, "password") == 0) { if (next_arg (&argc, &argv) != 0) { - g_string_printf (nmc->return_text, _("Error: %s argument is missing."), *argv); + g_string_printf (nmc->return_text, _("Error: %s argument is missing."), *(argv-1)); nmc->return_value = NMC_RESULT_ERROR_USER_INPUT; goto error; } password = *argv; } else if (strcmp (*argv, "wep-key-type") == 0) { if (next_arg (&argc, &argv) != 0) { - g_string_printf (nmc->return_text, _("Error: %s argument is missing."), *argv); + g_string_printf (nmc->return_text, _("Error: %s argument is missing."), *(argv-1)); nmc->return_value = NMC_RESULT_ERROR_USER_INPUT; goto error; } @@ -1661,7 +1669,7 @@ do_device_wifi_connect_network (NmCli *nmc, int argc, char **argv) } } else if (strcmp (*argv, "name") == 0) { if (next_arg (&argc, &argv) != 0) { - g_string_printf (nmc->return_text, _("Error: %s argument is missing."), *argv); + g_string_printf (nmc->return_text, _("Error: %s argument is missing."), *(argv-1)); nmc->return_value = NMC_RESULT_ERROR_USER_INPUT; goto error; } @@ -1672,7 +1680,7 @@ do_device_wifi_connect_network (NmCli *nmc, int argc, char **argv) wait = FALSE; } else if (strcmp (*argv, "--timeout") == 0) { if (next_arg (&argc, &argv) != 0) { - g_string_printf (nmc->return_text, _("Error: %s argument is missing."), *argv); + g_string_printf (nmc->return_text, _("Error: %s argument is missing."), *(argv-1)); nmc->return_value = NMC_RESULT_ERROR_USER_INPUT; goto error; } @@ -1893,14 +1901,14 @@ do_device_wimax_list (NmCli *nmc, int argc, char **argv) while (argc > 0) { if (strcmp (*argv, "iface") == 0) { if (next_arg (&argc, &argv) != 0) { - g_string_printf (nmc->return_text, _("Error: %s argument is missing."), *argv); + g_string_printf (nmc->return_text, _("Error: %s argument is missing."), *(argv-1)); nmc->return_value = NMC_RESULT_ERROR_USER_INPUT; goto error; } iface = *argv; } else if (strcmp (*argv, "nsp") == 0) { if (next_arg (&argc, &argv) != 0) { - g_string_printf (nmc->return_text, _("Error: %s argument is missing."), *argv); + g_string_printf (nmc->return_text, _("Error: %s argument is missing."), *(argv-1)); nmc->return_value = NMC_RESULT_ERROR_USER_INPUT; goto error; } @@ -2102,10 +2110,13 @@ do_devices (NmCli *nmc, int argc, char **argv) nmc->return_value = do_device_wimax (nmc, argc-1, argv+1); } #endif - else if (strcmp (*argv, "help") == 0) { + else if ( matches (*argv, "help") == 0 + || (g_str_has_prefix (*argv, "-") && matches ((*argv)+1, "help") == 0) + || (g_str_has_prefix (*argv, "--") && matches ((*argv)+2, "help") == 0)) { usage (); } else { + usage (); g_string_printf (nmc->return_text, _("Error: 'dev' command '%s' is not valid."), *argv); nmc->return_value = NMC_RESULT_ERROR_USER_INPUT; } diff --git a/cli/src/network-manager.c b/cli/src/network-manager.c index 927eadd1..8fb5f6cf 100644 --- a/cli/src/network-manager.c +++ b/cli/src/network-manager.c @@ -578,10 +578,13 @@ do_network_manager (NmCli *nmc, int argc, char **argv) } } #endif - else if (strcmp (*argv, "help") == 0) { + else if ( matches (*argv, "help") == 0 + || (g_str_has_prefix (*argv, "-") && matches ((*argv)+1, "help") == 0) + || (g_str_has_prefix (*argv, "--") && matches ((*argv)+2, "help") == 0)) { usage (); } else { + usage (); g_string_printf (nmc->return_text, _("Error: 'nm' command '%s' is not valid."), *argv); nmc->return_value = NMC_RESULT_ERROR_USER_INPUT; } diff --git a/cli/src/nmcli.c b/cli/src/nmcli.c index a7888aaa..757ff92b 100644 --- a/cli/src/nmcli.c +++ b/cli/src/nmcli.c @@ -16,7 +16,7 @@ * with this program; if not, write to the Free Software Foundation, Inc., * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. * - * (C) Copyright 2010 - 2011 Red Hat, Inc. + * (C) Copyright 2010 - 2012 Red Hat, Inc. */ /* Generated configuration file */ @@ -73,7 +73,8 @@ static void usage (const char *prog_name) { fprintf (stderr, - _("Usage: %s [OPTIONS] OBJECT { COMMAND | help }\n\n" + _("Usage: %s [OPTIONS] OBJECT { COMMAND | help }\n" + "\n" "OPTIONS\n" " -t[erse] terse output\n" " -p[retty] pretty output\n" @@ -82,11 +83,13 @@ usage (const char *prog_name) " -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" + " -h[elp] print this help\n" + "\n" "OBJECT\n" - " nm NetworkManager status\n" - " con NetworkManager connections\n" - " dev devices managed by NetworkManager\n\n"), + " nm NetworkManager's status\n" + " c[onnection] NetworkManager's connections\n" + " d[evice] devices managed by NetworkManager\n" + "\n"), prog_name); } @@ -102,8 +105,8 @@ static const struct cmd { NMCResultCode (*func) (NmCli *nmc, int argc, char **argv); } nmcli_cmds[] = { { "nm", do_network_manager }, - { "con", do_connections }, - { "dev", do_devices }, + { "connection", do_connections }, + { "device", do_devices }, { "help", do_help }, { 0 } }; diff --git a/cli/src/settings.c b/cli/src/settings.c index 7b7077ee..407ca8ad 100644 --- a/cli/src/settings.c +++ b/cli/src/settings.c @@ -42,6 +42,10 @@ static NmcOutputField nmc_fields_setting_connection[] = { SETTING_FIELD (NM_SETTING_CONNECTION_TIMESTAMP, 10), /* 5 */ SETTING_FIELD (NM_SETTING_CONNECTION_READ_ONLY, 10), /* 6 */ SETTING_FIELD (NM_SETTING_CONNECTION_PERMISSIONS, 30), /* 7 */ + SETTING_FIELD (NM_SETTING_CONNECTION_ZONE, 10), /* 8 */ + SETTING_FIELD (NM_SETTING_CONNECTION_MASTER, 20), /* 9 */ + SETTING_FIELD (NM_SETTING_CONNECTION_SLAVE_TYPE, 20), /* 10 */ + SETTING_FIELD (NM_SETTING_CONNECTION_SECONDARIES, 40), /* 11 */ {NULL, NULL, 0, NULL, 0} }; #define NMC_FIELDS_SETTING_CONNECTION_ALL "name"","\ @@ -51,7 +55,11 @@ static NmcOutputField nmc_fields_setting_connection[] = { NM_SETTING_CONNECTION_AUTOCONNECT","\ NM_SETTING_CONNECTION_TIMESTAMP","\ NM_SETTING_CONNECTION_READ_ONLY","\ - NM_SETTING_CONNECTION_PERMISSIONS + NM_SETTING_CONNECTION_PERMISSIONS","\ + NM_SETTING_CONNECTION_ZONE","\ + NM_SETTING_CONNECTION_MASTER","\ + NM_SETTING_CONNECTION_SLAVE_TYPE","\ + NM_SETTING_CONNECTION_SECONDARIES #define NMC_FIELDS_SETTING_CONNECTION_COMMON NMC_FIELDS_SETTING_CONNECTION_ALL /* Available fields for NM_SETTING_WIRED_SETTING_NAME */ @@ -510,6 +518,42 @@ static NmcOutputField nmc_fields_setting_vlan[] = { NM_SETTING_VLAN_EGRESS_PRIORITY_MAP #define NMC_FIELDS_SETTING_VLAN_COMMON NMC_FIELDS_SETTING_VLAN_ALL +/* Available fields for NM_SETTING_BRIDGE_SETTING_NAME */ +static NmcOutputField nmc_fields_setting_bridge[] = { + SETTING_FIELD ("name", 8), /* 0 */ + SETTING_FIELD (NM_SETTING_BRIDGE_INTERFACE_NAME, 15), /* 1 */ + SETTING_FIELD (NM_SETTING_BRIDGE_STP, 5), /* 2 */ + SETTING_FIELD (NM_SETTING_BRIDGE_PRIORITY, 6), /* 3 */ + SETTING_FIELD (NM_SETTING_BRIDGE_FORWARD_DELAY, 6), /* 4 */ + SETTING_FIELD (NM_SETTING_BRIDGE_HELLO_TIME, 6), /* 5 */ + SETTING_FIELD (NM_SETTING_BRIDGE_MAX_AGE, 6), /* 6 */ + SETTING_FIELD (NM_SETTING_BRIDGE_AGEING_TIME, 6), /* 7 */ + {NULL, NULL, 0, NULL, 0} +}; +#define NMC_FIELDS_SETTING_BRIDGE_ALL "name"","\ + NM_SETTING_BRIDGE_INTERFACE_NAME","\ + NM_SETTING_BRIDGE_STP","\ + NM_SETTING_BRIDGE_PRIORITY","\ + NM_SETTING_BRIDGE_FORWARD_DELAY","\ + NM_SETTING_BRIDGE_HELLO_TIME","\ + NM_SETTING_BRIDGE_MAX_AGE","\ + NM_SETTING_BRIDGE_AGEING_TIME +#define NMC_FIELDS_SETTING_BRIDGE_COMMON NMC_FIELDS_SETTING_BRIDGE_ALL + +/* Available fields for NM_SETTING_BRIDGE_PORT_SETTING_NAME */ +static NmcOutputField nmc_fields_setting_bridge_port[] = { + SETTING_FIELD ("name", 8), /* 0 */ + SETTING_FIELD (NM_SETTING_BRIDGE_PORT_PRIORITY, 10), /* 1 */ + SETTING_FIELD (NM_SETTING_BRIDGE_PORT_PATH_COST, 12), /* 2 */ + SETTING_FIELD (NM_SETTING_BRIDGE_PORT_HAIRPIN_MODE, 15), /* 3 */ + {NULL, NULL, 0, NULL, 0} +}; +#define NMC_FIELDS_SETTING_BRIDGE_PORT_ALL "name"","\ + NM_SETTING_BRIDGE_PORT_PRIORITY","\ + NM_SETTING_BRIDGE_PORT_PATH_COST","\ + NM_SETTING_BRIDGE_PORT_HAIRPIN_MODE +#define NMC_FIELDS_SETTING_BRIDGE_PORT_COMMON NMC_FIELDS_SETTING_BRIDGE_PORT_ALL + static char * wep_key_type_to_string (NMWepKeyType type) @@ -663,6 +707,7 @@ setting_connection_details (NMSettingConnection *s_con, NmCli *nmc) const char *perm_item; const char *perm_type; GString *perm = NULL; + GString *secondaries = NULL; int i; guint32 mode_flag = (nmc->print_output == NMC_PRINT_PRETTY) ? NMC_PF_FLAG_PRETTY : (nmc->print_output == NMC_PRINT_TERSE) ? NMC_PF_FLAG_TERSE : 0; guint32 multiline_flag = nmc->multiline_output ? NMC_PF_FLAG_MULTILINE : 0; @@ -687,6 +732,15 @@ setting_connection_details (NMSettingConnection *s_con, NmCli *nmc) if (perm->len > 0) g_string_truncate (perm, perm->len-1); /* remove trailing , */ + /* get secondaries */ + secondaries = g_string_new (NULL); + for (i = 0; i < nm_setting_connection_get_num_secondaries (s_con); i++) { + const char *sec_uuid = nm_setting_connection_get_secondary (s_con, i); + g_string_append_printf (secondaries, "%s,", sec_uuid); + } + if (secondaries->len > 0) + g_string_truncate (secondaries, secondaries->len-1); /* remove trailing , */ + nmc->allowed_fields[0].value = NM_SETTING_CONNECTION_SETTING_NAME; nmc->allowed_fields[1].value = nm_setting_connection_get_id (s_con); nmc->allowed_fields[2].value = nm_setting_connection_get_uuid (s_con); @@ -695,12 +749,17 @@ setting_connection_details (NMSettingConnection *s_con, NmCli *nmc) nmc->allowed_fields[5].value = timestamp_str; nmc->allowed_fields[6].value = nm_setting_connection_get_read_only (s_con) ? ("yes") : _("no"); nmc->allowed_fields[7].value = perm->str; + nmc->allowed_fields[8].value = nm_setting_connection_get_zone (s_con); + nmc->allowed_fields[9].value = nm_setting_connection_get_master (s_con); + nmc->allowed_fields[10].value = nm_setting_connection_get_slave_type (s_con); + nmc->allowed_fields[11].value = secondaries->str; nmc->print_fields.flags = multiline_flag | mode_flag | escape_flag | NMC_PF_FLAG_SECTION_PREFIX; print_fields (nmc->print_fields, nmc->allowed_fields); /* Print values */ g_free (timestamp_str); g_string_free (perm, TRUE); + g_string_free (secondaries, TRUE); return TRUE; } @@ -1789,3 +1848,67 @@ setting_adsl_details (NMSettingAdsl *s_adsl, NmCli *nmc) return TRUE; } +gboolean +setting_bridge_details (NMSettingBridge *s_bridge, NmCli *nmc) +{ + guint32 mode_flag = (nmc->print_output == NMC_PRINT_PRETTY) ? NMC_PF_FLAG_PRETTY : (nmc->print_output == NMC_PRINT_TERSE) ? NMC_PF_FLAG_TERSE : 0; + guint32 multiline_flag = nmc->multiline_output ? NMC_PF_FLAG_MULTILINE : 0; + guint32 escape_flag = nmc->escape_values ? NMC_PF_FLAG_ESCAPE : 0; + + g_return_val_if_fail (NM_IS_SETTING_BRIDGE (s_bridge), FALSE); + + nmc->allowed_fields = nmc_fields_setting_bridge; + nmc->print_fields.indices = parse_output_fields (NMC_FIELDS_SETTING_BRIDGE_ALL, nmc->allowed_fields, NULL); + nmc->print_fields.flags = multiline_flag | mode_flag | escape_flag | NMC_PF_FLAG_FIELD_NAMES; + print_fields (nmc->print_fields, nmc->allowed_fields); /* Print field names */ + + nmc->allowed_fields[0].value = NM_SETTING_BRIDGE_SETTING_NAME; + nmc->allowed_fields[1].value = nm_setting_bridge_get_interface_name (s_bridge); + nmc->allowed_fields[2].value = nm_setting_bridge_get_stp (s_bridge) ? _("yes") : _("no"); + nmc->allowed_fields[3].value = g_strdup_printf ("%u", nm_setting_bridge_get_priority (s_bridge)); + nmc->allowed_fields[4].value = g_strdup_printf ("%u", nm_setting_bridge_get_forward_delay (s_bridge)); + nmc->allowed_fields[5].value = g_strdup_printf ("%u", nm_setting_bridge_get_hello_time (s_bridge)); + nmc->allowed_fields[6].value = g_strdup_printf ("%u", nm_setting_bridge_get_max_age (s_bridge)); + nmc->allowed_fields[7].value = g_strdup_printf ("%u", nm_setting_bridge_get_ageing_time (s_bridge)); + + nmc->print_fields.flags = multiline_flag | mode_flag | escape_flag | NMC_PF_FLAG_SECTION_PREFIX; + print_fields (nmc->print_fields, nmc->allowed_fields); /* Print values */ + + /* free values */ + g_free ((char*) nmc->allowed_fields[3].value); + g_free ((char*) nmc->allowed_fields[4].value); + g_free ((char*) nmc->allowed_fields[5].value); + g_free ((char*) nmc->allowed_fields[6].value); + g_free ((char*) nmc->allowed_fields[7].value); + + return TRUE; +} + +gboolean +setting_bridge_port_details (NMSettingBridgePort *s_bridge_port, NmCli *nmc) +{ + guint32 mode_flag = (nmc->print_output == NMC_PRINT_PRETTY) ? NMC_PF_FLAG_PRETTY : (nmc->print_output == NMC_PRINT_TERSE) ? NMC_PF_FLAG_TERSE : 0; + guint32 multiline_flag = nmc->multiline_output ? NMC_PF_FLAG_MULTILINE : 0; + guint32 escape_flag = nmc->escape_values ? NMC_PF_FLAG_ESCAPE : 0; + + g_return_val_if_fail (NM_IS_SETTING_BRIDGE_PORT (s_bridge_port), FALSE); + + nmc->allowed_fields = nmc_fields_setting_bridge_port; + nmc->print_fields.indices = parse_output_fields (NMC_FIELDS_SETTING_BRIDGE_PORT_ALL, nmc->allowed_fields, NULL); + nmc->print_fields.flags = multiline_flag | mode_flag | escape_flag | NMC_PF_FLAG_FIELD_NAMES; + print_fields (nmc->print_fields, nmc->allowed_fields); /* Print field names */ + + nmc->allowed_fields[0].value = NM_SETTING_BRIDGE_PORT_SETTING_NAME; + nmc->allowed_fields[1].value = g_strdup_printf ("%u", nm_setting_bridge_port_get_priority (s_bridge_port)); + nmc->allowed_fields[2].value = g_strdup_printf ("%u", nm_setting_bridge_port_get_path_cost (s_bridge_port)); + nmc->allowed_fields[3].value = nm_setting_bridge_port_get_hairpin_mode (s_bridge_port) ? _("yes") : _("no"); + + nmc->print_fields.flags = multiline_flag | mode_flag | escape_flag | NMC_PF_FLAG_SECTION_PREFIX; + print_fields (nmc->print_fields, nmc->allowed_fields); /* Print values */ + + g_free ((char*) nmc->allowed_fields[1].value); + g_free ((char*) nmc->allowed_fields[2].value); + + return TRUE; +} + diff --git a/cli/src/settings.h b/cli/src/settings.h index 3309bd0a..2a64052a 100644 --- a/cli/src/settings.h +++ b/cli/src/settings.h @@ -39,6 +39,8 @@ #include #include #include +#include +#include #include #include "nmcli.h" @@ -65,5 +67,7 @@ gboolean setting_infiniband_details (NMSettingInfiniband *s_infiniband, NmCli *n gboolean setting_bond_details (NMSettingBond *s_bond, NmCli *nmc); gboolean setting_vlan_details (NMSettingVlan *s_vlan, NmCli *nmc); gboolean setting_adsl_details (NMSettingAdsl *s_adsl, NmCli *nmc); +gboolean setting_bridge_details (NMSettingBridge *s_bridge, NmCli *nmc); +gboolean setting_bridge_port_details (NMSettingBridgePort *s_bridge_port, NmCli *nmc); #endif /* NMC_SETTINGS_H */ diff --git a/cli/src/utils.c b/cli/src/utils.c index 4054fe13..ab0a5dba 100644 --- a/cli/src/utils.c +++ b/cli/src/utils.c @@ -45,13 +45,15 @@ matches (const char *cmd, const char *pattern) int next_arg (int *argc, char ***argv) { - if (*argc <= 1) { - return -1; - } - else { + int arg_num = *argc; + + if (arg_num > 0) { (*argc)--; (*argv)++; } + if (arg_num <= 1) + return -1; + return 0; } diff --git a/config.h.in b/config.h.in index 3d6d1a97..9837c987 100644 --- a/config.h.in +++ b/config.h.in @@ -47,14 +47,8 @@ /* Define to 1 if you have the header file. */ #undef HAVE_INTTYPES_H -/* Define if you require libnl-1 legacy support */ -#undef HAVE_LIBNL1 - -/* Define if you require specific libnl-2 support */ -#undef HAVE_LIBNL2 - -/* Define if you require specific libnl-3 support */ -#undef HAVE_LIBNL3 +/* libnl version */ +#undef HAVE_LIBNL /* Define to 1 if you have the header file. */ #undef HAVE_MEMORY_H @@ -126,6 +120,9 @@ */ #undef LT_OBJDIR +/* Path to netconfig (if enabled) */ +#undef NETCONFIG_PATH + /* Define the distribution version string */ #undef NM_DIST_VERSION @@ -153,7 +150,7 @@ /* Define to the version of this package. */ #undef PACKAGE_VERSION -/* Define if you have a resolvconf implementation */ +/* Path to resolvconf (if enabled) */ #undef RESOLVCONF_PATH /* Define to 1 if you have the ANSI C header files. */ @@ -162,48 +159,6 @@ /* Define to path to system CA certificates */ #undef SYSTEM_CA_PATH -/* Define if you have Arch */ -#undef TARGET_ARCH - -/* Define if you have Debian */ -#undef TARGET_DEBIAN - -/* Define if you have Exherbo */ -#undef TARGET_EXHERBO - -/* Define if you have Frugalware */ -#undef TARGET_FRUGALWARE - -/* Define for a general unknown Linux system */ -#undef TARGET_GENERIC - -/* Define if you have Gentoo */ -#undef TARGET_GENTOO - -/* Define if you have Linux From Scratch */ -#undef TARGET_LFS - -/* Define if you have linexa */ -#undef TARGET_LINEXA - -/* Define if you have Mandriva */ -#undef TARGET_MANDRIVA - -/* Define if you have Paldo */ -#undef TARGET_PALDO - -/* Define if you have Pardus */ -#undef TARGET_PARDUS - -/* Define if you have Fedora or RHEL */ -#undef TARGET_REDHAT - -/* Define if you have Slackware */ -#undef TARGET_SLACKWARE - -/* Define if you have OpenSUSE or SLES */ -#undef TARGET_SUSE - /* Define to 1 if you can safely include both and . */ #undef TIME_WITH_SYS_TIME @@ -235,6 +190,9 @@ /* Define if you want connectivity checking support */ #undef WITH_CONCHECK +/* Define if you have ModemManager1 support */ +#undef WITH_MODEM_MANAGER_1 + /* Define if you have PolicyKit support */ #undef WITH_POLKIT diff --git a/configure b/configure index 5c7016b4..923fa923 100755 --- a/configure +++ b/configure @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.68 for NetworkManager 0.9.6.4. +# Generated by GNU Autoconf 2.68 for NetworkManager 0.9.7.995. # # Report bugs to . # @@ -571,8 +571,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='NetworkManager' PACKAGE_TARNAME='NetworkManager' -PACKAGE_VERSION='0.9.6.4' -PACKAGE_STRING='NetworkManager 0.9.6.4' +PACKAGE_VERSION='0.9.7.995' +PACKAGE_STRING='NetworkManager 0.9.7.995' PACKAGE_BUGREPORT='http://bugzilla.gnome.org/enter_bug.cgi?product=NetworkManager' PACKAGE_URL='' @@ -616,13 +616,6 @@ gt_needs= ac_subst_vars='am__EXEEXT_FALSE am__EXEEXT_TRUE LTLIBOBJS -WITH_TESTS_FALSE -WITH_TESTS_TRUE -ENABLE_VAPIGEN_FALSE -ENABLE_VAPIGEN_TRUE -VAPIGEN_MAKEFILE -VAPIGEN_VAPIDIR -VAPIGEN GTK_DOC_USE_REBASE_FALSE GTK_DOC_USE_REBASE_TRUE GTK_DOC_USE_LIBTOOL_FALSE @@ -639,6 +632,17 @@ HTML_DIR GTKDOC_MKPDF GTKDOC_REBASE GTKDOC_CHECK +ENABLE_DOC_FALSE +ENABLE_DOC_TRUE +RUN_ROOT_TESTS_FALSE +RUN_ROOT_TESTS_TRUE +ENABLE_TESTS_FALSE +ENABLE_TESTS_TRUE +ENABLE_VAPIGEN_FALSE +ENABLE_VAPIGEN_TRUE +VAPIGEN_MAKEFILE +VAPIGEN_VAPIDIR +VAPIGEN WITH_CONCHECK_FALSE WITH_CONCHECK_TRUE LIBSOUP_LIBS @@ -646,10 +650,16 @@ LIBSOUP_CFLAGS KERNEL_FIRMWARE_DIR SYSTEM_CA_PATH IPTABLES_PATH -RESOLVCONF_PATH +with_netconfig +with_resolvconf DHCPCD_PATH -DHCLIENT_VERSION DHCLIENT_PATH +with_dhcpcd +with_dhclient +WITH_MODEM_MANAGER_1_FALSE +WITH_MODEM_MANAGER_1_TRUE +MM_GLIB_LIBS +MM_GLIB_CFLAGS PPPD_PLUGIN_DIR WITH_PPP_FALSE WITH_PPP_TRUE @@ -669,6 +679,7 @@ GNUTLS_CFLAGS PKGCONFIG_PATH NSS_LIBS NSS_CFLAGS +NM_MODIFY_SYSTEM_POLICY WITH_POLKIT_FALSE WITH_POLKIT_TRUE POLKIT_LIBS @@ -685,21 +696,24 @@ LIBNL1_LIBS LIBNL1_CFLAGS LIBNL2_LIBS LIBNL2_CFLAGS -LIBNL_GENL3_LIBS -LIBNL_GENL3_CFLAGS -LIBNL_ROUTE3_LIBS -LIBNL_ROUTE3_CFLAGS LIBNL3_LIBS LIBNL3_CFLAGS +SUSPEND_RESUME_SYSTEMD_FALSE +SUSPEND_RESUME_SYSTEMD_TRUE +SUSPEND_RESUME_UPOWER_FALSE +SUSPEND_RESUME_UPOWER_TRUE +SYSTEMD_INHIBIT_LIBS +SYSTEMD_INHIBIT_CFLAGS +CKDB_PATH +SYSTEMD_LOGIN_LIBS +SYSTEMD_LOGIN_CFLAGS SESSION_TRACKING_SYSTEMD_FALSE SESSION_TRACKING_SYSTEMD_TRUE SESSION_TRACKING_CK_FALSE SESSION_TRACKING_CK_TRUE -SYSTEMD_LIBS -SYSTEMD_CFLAGS +systemdsystemunitdir HAVE_SYSTEMD_FALSE HAVE_SYSTEMD_TRUE -systemdsystemunitdir UDEV_BASE_DIR WITH_QT_FALSE WITH_QT_TRUE @@ -716,12 +730,8 @@ INTROSPECTION_GIRDIR INTROSPECTION_GENERATE INTROSPECTION_COMPILER INTROSPECTION_SCANNER -GIO_LIBS -GIO_CFLAGS GUDEV_LIBS GUDEV_CFLAGS -GMODULE_LIBS -GMODULE_CFLAGS GLIB_LIBS GLIB_CFLAGS DBUS_LIBS @@ -733,36 +743,27 @@ LIBDL LIBM WITH_WEXT_FALSE WITH_WEXT_TRUE -TARGET_LFS_FALSE -TARGET_LFS_TRUE -TARGET_EXHERBO_FALSE -TARGET_EXHERBO_TRUE -TARGET_LINEXA_FALSE -TARGET_LINEXA_TRUE -TARGET_PARDUS_FALSE -TARGET_PARDUS_TRUE -TARGET_MANDRIVA_FALSE -TARGET_MANDRIVA_TRUE -TARGET_FRUGALWARE_FALSE -TARGET_FRUGALWARE_TRUE -TARGET_PALDO_FALSE -TARGET_PALDO_TRUE -TARGET_ARCH_FALSE -TARGET_ARCH_TRUE -TARGET_SLACKWARE_FALSE -TARGET_SLACKWARE_TRUE -TARGET_DEBIAN_FALSE -TARGET_DEBIAN_TRUE -TARGET_GENTOO_FALSE -TARGET_GENTOO_TRUE -TARGET_SUSE_FALSE -TARGET_SUSE_TRUE -TARGET_REDHAT_FALSE -TARGET_REDHAT_TRUE -TARGET_GENERIC_FALSE -TARGET_GENERIC_TRUE -WITH_DOCS_FALSE -WITH_DOCS_TRUE +GNOME_CODE_COVERAGE_RULES +CODE_COVERAGE_LDFLAGS +CODE_COVERAGE_CFLAGS +GENHTML +LCOV +CODE_COVERAGE_ENABLED +CODE_COVERAGE_ENABLED_FALSE +CODE_COVERAGE_ENABLED_TRUE +CONFIG_PLUGIN_IFNET_FALSE +CONFIG_PLUGIN_IFNET_TRUE +CONFIG_PLUGIN_IFUPDOWN_FALSE +CONFIG_PLUGIN_IFUPDOWN_TRUE +CONFIG_PLUGIN_IFCFG_SUSE_FALSE +CONFIG_PLUGIN_IFCFG_SUSE_TRUE +CONFIG_PLUGIN_IFCFG_RH_FALSE +CONFIG_PLUGIN_IFCFG_RH_TRUE +nmrundir +nmstatedir +nmdatadir +nmconfdir +nmbinary GETTEXT_PACKAGE POSUB LTLIBINTL @@ -817,7 +818,6 @@ NM_VERSION NM_MICRO_VERSION NM_MINOR_VERSION NM_MAJOR_VERSION -DISABLE_DEPRECATED CXXCPP OTOOL64 OTOOL @@ -957,8 +957,11 @@ enable_nls enable_rpath with_libiconv_prefix with_libintl_prefix -with_docs -with_distro +enable_ifcfg_rh +enable_ifcfg_suse +enable_ifupdown +enable_ifnet +enable_code_coverage with_dist_version with_wext enable_introspection @@ -966,27 +969,35 @@ enable_qt with_udev_dir with_systemdsystemunitdir with_session_tracking +with_suspend_resume +with_libnl enable_wimax enable_polkit +enable_modify_system with_crypto with_dbus_sys_dir enable_ppp with_pppd_plugin_dir +with_modem_manager_1 with_dhclient with_dhcpcd with_resolvconf +with_netconfig with_iptables with_system_ca_path with_kernel_firmware_dir enable_crashtrace enable_concheck enable_more_warnings +enable_vala +enable_tests +enable_doc +with_tests +with_docs with_html_dir enable_gtk_doc enable_gtk_doc_html enable_gtk_doc_pdf -enable_vala -with_tests ' ac_precious_vars='build_alias host_alias @@ -1008,22 +1019,16 @@ DBUS_CFLAGS DBUS_LIBS GLIB_CFLAGS GLIB_LIBS -GMODULE_CFLAGS -GMODULE_LIBS GUDEV_CFLAGS GUDEV_LIBS -GIO_CFLAGS -GIO_LIBS QT_CFLAGS QT_LIBS -SYSTEMD_CFLAGS -SYSTEMD_LIBS +SYSTEMD_LOGIN_CFLAGS +SYSTEMD_LOGIN_LIBS +SYSTEMD_INHIBIT_CFLAGS +SYSTEMD_INHIBIT_LIBS LIBNL3_CFLAGS LIBNL3_LIBS -LIBNL_ROUTE3_CFLAGS -LIBNL_ROUTE3_LIBS -LIBNL_GENL3_CFLAGS -LIBNL_GENL3_LIBS LIBNL2_CFLAGS LIBNL2_LIBS LIBNL1_CFLAGS @@ -1038,6 +1043,8 @@ NSS_CFLAGS NSS_LIBS GNUTLS_CFLAGS GNUTLS_LIBS +MM_GLIB_CFLAGS +MM_GLIB_LIBS LIBSOUP_CFLAGS LIBSOUP_LIBS GTKDOC_DEPS_CFLAGS @@ -1584,7 +1591,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures NetworkManager 0.9.6.4 to adapt to many kinds of systems. +\`configure' configures NetworkManager 0.9.7.995 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1654,7 +1661,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of NetworkManager 0.9.6.4:";; + short | recursive ) echo "Configuration of NetworkManager 0.9.7.995:";; esac cat <<\_ACEOF @@ -1675,20 +1682,29 @@ Optional Features: --disable-libtool-lock avoid locking (might break parallel builds) --disable-nls do not use Native Language Support --disable-rpath do not hardcode runtime library paths + --enable-ifcfg-rh enable ifcfg-rh configuration plugin (Fedora/RHEL) + --enable-ifcfg-suse enable ifcfg-suse configuration plugin (SUSE) + --enable-ifupdown enable ifupdown configuration plugin (Debian/Ubuntu) + --enable-ifnet enable ifnet configuration plugin (Gentoo) + --enable-code-coverage Whether to enable code coverage support --enable-introspection=[no/auto/yes] Enable introspection for this build --enable-qt enable Qt examples --enable-wimax enable WiMAX support --enable-polkit enable PolicyKit support + --enable-modify-system Allow users to modify system connections --enable-ppp enable PPP/PPPoE support --disable-crashtrace Disable GNU backtrace extensions --enable-concheck enable connectivity checking support --enable-more-warnings Possible values: no/yes/error + --enable-vala=[no/auto/yes] + build Vala bindings [[default=auto]] + --enable-tests=root|yes|no + Build NetworkManager tests (default: yes) + --enable-doc Build NetworkManager documentation (default: no) --enable-gtk-doc use gtk-doc to build documentation [[default=no]] --enable-gtk-doc-html build documentation in html format [[default=yes]] --enable-gtk-doc-pdf build documentation in pdf format [[default=no]] - --enable-vala=[no/auto/yes] - build Vala bindings [[default=auto]] Optional Packages: --with-PACKAGE[=ARG] use PACKAGE [ARG=yes] @@ -1703,31 +1719,33 @@ Optional Packages: --without-libiconv-prefix don't search for libiconv in includedir and libdir --with-libintl-prefix[=DIR] search for libintl in DIR/include and DIR/lib --without-libintl-prefix don't search for libintl in includedir and libdir - --with-docs Build NetworkManager documentation - --with-distro=DISTRO Specify the Linux distribution to target: One of - redhat, suse, gentoo, debian, arch, slackware, - paldo, mandriva, pardus, linexa, exherbo or lfs --with-dist-version= - Define the NM's distribution version string + Define the NM''s distribution version string --with-wext=yes Enable or disable Linux Wireless Extensions --with-udev-dir=DIR where the udev base directory is --with-systemdsystemunitdir=DIR Directory for systemd service files - --with-session-tracking=systemd|ck|none - Build NetworkManager with specific session tracking + --with-session-tracking=systemd|consolekit|no + Select session tracking support (default: + consolekit) + --with-suspend-resume=upower|systemd + Build NetworkManager with specific suspend/resume support + --with-libnl=1|2|3 Select libnl version (default: latest available) --with-crypto=nss|gnutls Cryptography library to use for certificate and key operations --with-dbus-sys-dir=DIR where D-BUS system.d directory is --with-pppd-plugin-dir=DIR path to the pppd plugins directory + --with-modem-manager-1 Enable new ModemManager1 interface support --with-dhclient=yes|no|path Enable dhclient 4.x support --with-dhcpcd=yes|no|path Enable dhcpcd 4.x support --with-resolvconf=yes|no|path Enable resolvconf support + --with-netconfig=yes|no Enable SUSE netconfig support --with-iptables=/path/to/iptables path to iptables --with-system-ca-path=/path/to/ssl/certs @@ -1735,8 +1753,9 @@ Optional Packages: --with-kernel-firmware-dir=DIR where kernel firmware directory is (default is /lib/firmware) + --with-tests Build NetworkManager tests (deprecated) + --with-docs Build NetworkManager documentation (deprecated) --with-html-dir=PATH path to installed docs - --with-tests Build NetworkManager tests Some influential environment variables: CC C compiler command @@ -1759,32 +1778,22 @@ Some influential environment variables: DBUS_LIBS linker flags for DBUS, overriding pkg-config GLIB_CFLAGS C compiler flags for GLIB, overriding pkg-config GLIB_LIBS linker flags for GLIB, overriding pkg-config - GMODULE_CFLAGS - C compiler flags for GMODULE, overriding pkg-config - GMODULE_LIBS - linker flags for GMODULE, overriding pkg-config GUDEV_CFLAGS C compiler flags for GUDEV, overriding pkg-config GUDEV_LIBS linker flags for GUDEV, overriding pkg-config - GIO_CFLAGS C compiler flags for GIO, overriding pkg-config - GIO_LIBS linker flags for GIO, overriding pkg-config QT_CFLAGS C compiler flags for QT, overriding pkg-config QT_LIBS linker flags for QT, overriding pkg-config - SYSTEMD_CFLAGS - C compiler flags for SYSTEMD, overriding pkg-config - SYSTEMD_LIBS - linker flags for SYSTEMD, overriding pkg-config + SYSTEMD_LOGIN_CFLAGS + C compiler flags for SYSTEMD_LOGIN, overriding pkg-config + SYSTEMD_LOGIN_LIBS + linker flags for SYSTEMD_LOGIN, overriding pkg-config + SYSTEMD_INHIBIT_CFLAGS + C compiler flags for SYSTEMD_INHIBIT, overriding pkg-config + SYSTEMD_INHIBIT_LIBS + linker flags for SYSTEMD_INHIBIT, overriding pkg-config LIBNL3_CFLAGS C compiler flags for LIBNL3, overriding pkg-config LIBNL3_LIBS linker flags for LIBNL3, overriding pkg-config - LIBNL_ROUTE3_CFLAGS - C compiler flags for LIBNL_ROUTE3, overriding pkg-config - LIBNL_ROUTE3_LIBS - linker flags for LIBNL_ROUTE3, overriding pkg-config - LIBNL_GENL3_CFLAGS - C compiler flags for LIBNL_GENL3, overriding pkg-config - LIBNL_GENL3_LIBS - linker flags for LIBNL_GENL3, overriding pkg-config LIBNL2_CFLAGS C compiler flags for LIBNL2, overriding pkg-config LIBNL2_LIBS linker flags for LIBNL2, overriding pkg-config @@ -1805,6 +1814,10 @@ Some influential environment variables: GNUTLS_CFLAGS C compiler flags for GNUTLS, overriding pkg-config GNUTLS_LIBS linker flags for GNUTLS, overriding pkg-config + MM_GLIB_CFLAGS + C compiler flags for MM_GLIB, overriding pkg-config + MM_GLIB_LIBS + linker flags for MM_GLIB, overriding pkg-config LIBSOUP_CFLAGS C compiler flags for LIBSOUP, overriding pkg-config LIBSOUP_LIBS @@ -1880,7 +1893,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -NetworkManager configure 0.9.6.4 +NetworkManager configure 0.9.7.995 generated by GNU Autoconf 2.68 Copyright (C) 2010 Free Software Foundation, Inc. @@ -2424,7 +2437,7 @@ cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by NetworkManager $as_me 0.9.6.4, which was +It was created by NetworkManager $as_me 0.9.7.995, which was generated by GNU Autoconf 2.68. Invocation command line was $ $0 $@ @@ -3245,7 +3258,7 @@ fi # Define the identity of the package. PACKAGE='NetworkManager' - VERSION='0.9.6.4' + VERSION='0.9.7.995' cat >>confdefs.h <<_ACEOF @@ -3389,7 +3402,6 @@ fi MAINT=$MAINTAINER_MODE_TRUE - # Check whether --enable-silent-rules was given. if test "${enable_silent_rules+set}" = set; then : enableval=$enable_silent_rules; @@ -3398,7 +3410,7 @@ fi case $enable_silent_rules in yes) AM_DEFAULT_VERBOSITY=0;; no) AM_DEFAULT_VERBOSITY=1;; -*) AM_DEFAULT_VERBOSITY=1;; +*) AM_DEFAULT_VERBOSITY=0;; esac am_make=${MAKE-make} { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $am_make supports nested variables" >&5 @@ -16446,17 +16458,10 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu -if test $USE_MAINTAINER_MODE = yes; then - DISABLE_DEPRECATED="-DG_DISABLE_DEPRECATED" -else - DISABLE_DEPRECATED="" -fi - - NM_MAJOR_VERSION=0 NM_MINOR_VERSION=9 -NM_MICRO_VERSION=6 -NM_VERSION=0.9.6.4 +NM_MICRO_VERSION=7 +NM_VERSION=0.9.7.995 @@ -19242,29 +19247,6 @@ cat >>confdefs.h <<_ACEOF _ACEOF - -# Check whether --with-docs was given. -if test "${with_docs+set}" = set; then : - withval=$with_docs; -fi - - if test "x$with_docs" = "xyes"; then - WITH_DOCS_TRUE= - WITH_DOCS_FALSE='#' -else - WITH_DOCS_TRUE='#' - WITH_DOCS_FALSE= -fi - -case $with_docs in - yes) - enable_gtk_doc=yes - ;; - *) - with_docs=no - ;; -esac - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether byte ordering is bigendian" >&5 $as_echo_n "checking whether byte ordering is bigendian... " >&6; } if ${ac_cv_c_bigendian+:} false; then : @@ -19490,14 +19472,42 @@ $as_echo "#define AC_APPLE_UNIVERSAL_BUILD 1" >>confdefs.h esac +# NetworkManager paths +nmbinary="$sbindir/$PACKAGE" + +nmconfdir="$sysconfdir/$PACKAGE" + +nmdatadir="$datadir/$PACKAGE" + +nmstatedir="$localstatedir/lib/$PACKAGE" + +nmrundir="$localstatedir/run/$PACKAGE" -# Check whether --with-distro was given. -if test "${with_distro+set}" = set; then : - withval=$with_distro; + +# Alternative configuration plugins +# Check whether --enable-ifcfg-rh was given. +if test "${enable_ifcfg_rh+set}" = set; then : + enableval=$enable_ifcfg_rh; +fi + +# Check whether --enable-ifcfg-suse was given. +if test "${enable_ifcfg_suse+set}" = set; then : + enableval=$enable_ifcfg_suse; +fi + +# Check whether --enable-ifupdown was given. +if test "${enable_ifupdown+set}" = set; then : + enableval=$enable_ifupdown; +fi + +# Check whether --enable-ifnet was given. +if test "${enable_ifnet+set}" = set; then : + enableval=$enable_ifnet; fi -if test "z$with_distro" = "z"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for /etc/redhat-release" >&5 +# Default alternative plugins by distribution +if test -z "$enable_ifcfg_rh"; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for /etc/redhat-release" >&5 $as_echo_n "checking for /etc/redhat-release... " >&6; } if ${ac_cv_file__etc_redhat_release+:} false; then : $as_echo_n "(cached) " >&6 @@ -19513,29 +19523,12 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_file__etc_redhat_release" >&5 $as_echo "$ac_cv_file__etc_redhat_release" >&6; } if test "x$ac_cv_file__etc_redhat_release" = xyes; then : - with_distro="redhat" + enable_ifcfg_rh=yes fi - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for /etc/SuSE-release" >&5 -$as_echo_n "checking for /etc/SuSE-release... " >&6; } -if ${ac_cv_file__etc_SuSE_release+:} false; then : - $as_echo_n "(cached) " >&6 -else - test "$cross_compiling" = yes && - as_fn_error $? "cannot check for file existence when cross compiling" "$LINENO" 5 -if test -r "/etc/SuSE-release"; then - ac_cv_file__etc_SuSE_release=yes -else - ac_cv_file__etc_SuSE_release=no -fi -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_file__etc_SuSE_release" >&5 -$as_echo "$ac_cv_file__etc_SuSE_release" >&6; } -if test "x$ac_cv_file__etc_SuSE_release" = xyes; then : - with_distro="suse" fi - - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for /etc/fedora-release" >&5 +if test -z "$enable_ifcfg_rh"; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for /etc/fedora-release" >&5 $as_echo_n "checking for /etc/fedora-release... " >&6; } if ${ac_cv_file__etc_fedora_release+:} false; then : $as_echo_n "(cached) " >&6 @@ -19551,105 +19544,12 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_file__etc_fedora_release" >&5 $as_echo "$ac_cv_file__etc_fedora_release" >&6; } if test "x$ac_cv_file__etc_fedora_release" = xyes; then : - with_distro="redhat" -fi - - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for /etc/gentoo-release" >&5 -$as_echo_n "checking for /etc/gentoo-release... " >&6; } -if ${ac_cv_file__etc_gentoo_release+:} false; then : - $as_echo_n "(cached) " >&6 -else - test "$cross_compiling" = yes && - as_fn_error $? "cannot check for file existence when cross compiling" "$LINENO" 5 -if test -r "/etc/gentoo-release"; then - ac_cv_file__etc_gentoo_release=yes -else - ac_cv_file__etc_gentoo_release=no -fi -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_file__etc_gentoo_release" >&5 -$as_echo "$ac_cv_file__etc_gentoo_release" >&6; } -if test "x$ac_cv_file__etc_gentoo_release" = xyes; then : - with_distro="gentoo" -fi - - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for /etc/debian_version" >&5 -$as_echo_n "checking for /etc/debian_version... " >&6; } -if ${ac_cv_file__etc_debian_version+:} false; then : - $as_echo_n "(cached) " >&6 -else - test "$cross_compiling" = yes && - as_fn_error $? "cannot check for file existence when cross compiling" "$LINENO" 5 -if test -r "/etc/debian_version"; then - ac_cv_file__etc_debian_version=yes -else - ac_cv_file__etc_debian_version=no -fi -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_file__etc_debian_version" >&5 -$as_echo "$ac_cv_file__etc_debian_version" >&6; } -if test "x$ac_cv_file__etc_debian_version" = xyes; then : - with_distro="debian" -fi - - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for /etc/arch-release" >&5 -$as_echo_n "checking for /etc/arch-release... " >&6; } -if ${ac_cv_file__etc_arch_release+:} false; then : - $as_echo_n "(cached) " >&6 -else - test "$cross_compiling" = yes && - as_fn_error $? "cannot check for file existence when cross compiling" "$LINENO" 5 -if test -r "/etc/arch-release"; then - ac_cv_file__etc_arch_release=yes -else - ac_cv_file__etc_arch_release=no -fi -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_file__etc_arch_release" >&5 -$as_echo "$ac_cv_file__etc_arch_release" >&6; } -if test "x$ac_cv_file__etc_arch_release" = xyes; then : - with_distro="arch" -fi - - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for /etc/slackware-version" >&5 -$as_echo_n "checking for /etc/slackware-version... " >&6; } -if ${ac_cv_file__etc_slackware_version+:} false; then : - $as_echo_n "(cached) " >&6 -else - test "$cross_compiling" = yes && - as_fn_error $? "cannot check for file existence when cross compiling" "$LINENO" 5 -if test -r "/etc/slackware-version"; then - ac_cv_file__etc_slackware_version=yes -else - ac_cv_file__etc_slackware_version=no -fi -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_file__etc_slackware_version" >&5 -$as_echo "$ac_cv_file__etc_slackware_version" >&6; } -if test "x$ac_cv_file__etc_slackware_version" = xyes; then : - with_distro="slackware" + enable_ifcfg_rh=yes fi - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for /etc/frugalware-release" >&5 -$as_echo_n "checking for /etc/frugalware-release... " >&6; } -if ${ac_cv_file__etc_frugalware_release+:} false; then : - $as_echo_n "(cached) " >&6 -else - test "$cross_compiling" = yes && - as_fn_error $? "cannot check for file existence when cross compiling" "$LINENO" 5 -if test -r "/etc/frugalware-release"; then - ac_cv_file__etc_frugalware_release=yes -else - ac_cv_file__etc_frugalware_release=no fi -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_file__etc_frugalware_release" >&5 -$as_echo "$ac_cv_file__etc_frugalware_release" >&6; } -if test "x$ac_cv_file__etc_frugalware_release" = xyes; then : - with_distro="frugalware" -fi - - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for /etc/mandriva-release" >&5 +if test -z "$enable_ifcfg_rh"; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for /etc/mandriva-release" >&5 $as_echo_n "checking for /etc/mandriva-release... " >&6; } if ${ac_cv_file__etc_mandriva_release+:} false; then : $as_echo_n "(cached) " >&6 @@ -19665,299 +19565,354 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_file__etc_mandriva_release" >&5 $as_echo "$ac_cv_file__etc_mandriva_release" >&6; } if test "x$ac_cv_file__etc_mandriva_release" = xyes; then : - with_distro="mandriva" + enable_ifcfg_rh=yes fi - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for /etc/pardus-release" >&5 -$as_echo_n "checking for /etc/pardus-release... " >&6; } -if ${ac_cv_file__etc_pardus_release+:} false; then : +fi +if test -z "$enable_ifcfg_suse"; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for /etc/SuSE-release" >&5 +$as_echo_n "checking for /etc/SuSE-release... " >&6; } +if ${ac_cv_file__etc_SuSE_release+:} false; then : $as_echo_n "(cached) " >&6 else test "$cross_compiling" = yes && as_fn_error $? "cannot check for file existence when cross compiling" "$LINENO" 5 -if test -r "/etc/pardus-release"; then - ac_cv_file__etc_pardus_release=yes +if test -r "/etc/SuSE-release"; then + ac_cv_file__etc_SuSE_release=yes else - ac_cv_file__etc_pardus_release=no + ac_cv_file__etc_SuSE_release=no fi fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_file__etc_pardus_release" >&5 -$as_echo "$ac_cv_file__etc_pardus_release" >&6; } -if test "x$ac_cv_file__etc_pardus_release" = xyes; then : - with_distro="pardus" +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_file__etc_SuSE_release" >&5 +$as_echo "$ac_cv_file__etc_SuSE_release" >&6; } +if test "x$ac_cv_file__etc_SuSE_release" = xyes; then : + enable_ifcfg_suse=yes fi - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for /etc/linexa-release" >&5 -$as_echo_n "checking for /etc/linexa-release... " >&6; } -if ${ac_cv_file__etc_linexa_release+:} false; then : +fi +if test -z "$enable_ifupdown"; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for /etc/debian_version" >&5 +$as_echo_n "checking for /etc/debian_version... " >&6; } +if ${ac_cv_file__etc_debian_version+:} false; then : $as_echo_n "(cached) " >&6 else test "$cross_compiling" = yes && as_fn_error $? "cannot check for file existence when cross compiling" "$LINENO" 5 -if test -r "/etc/linexa-release"; then - ac_cv_file__etc_linexa_release=yes +if test -r "/etc/debian_version"; then + ac_cv_file__etc_debian_version=yes else - ac_cv_file__etc_linexa_release=no + ac_cv_file__etc_debian_version=no fi fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_file__etc_linexa_release" >&5 -$as_echo "$ac_cv_file__etc_linexa_release" >&6; } -if test "x$ac_cv_file__etc_linexa_release" = xyes; then : - with_distro="linexa" +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_file__etc_debian_version" >&5 +$as_echo "$ac_cv_file__etc_debian_version" >&6; } +if test "x$ac_cv_file__etc_debian_version" = xyes; then : + enable_ifupdown=yes fi - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for /etc/exherbo-release" >&5 -$as_echo_n "checking for /etc/exherbo-release... " >&6; } -if ${ac_cv_file__etc_exherbo_release+:} false; then : +fi +if test -z "$enable_ifnet"; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for /etc/gentoo-release" >&5 +$as_echo_n "checking for /etc/gentoo-release... " >&6; } +if ${ac_cv_file__etc_gentoo_release+:} false; then : $as_echo_n "(cached) " >&6 else test "$cross_compiling" = yes && as_fn_error $? "cannot check for file existence when cross compiling" "$LINENO" 5 -if test -r "/etc/exherbo-release"; then - ac_cv_file__etc_exherbo_release=yes +if test -r "/etc/gentoo-release"; then + ac_cv_file__etc_gentoo_release=yes else - ac_cv_file__etc_exherbo_release=no + ac_cv_file__etc_gentoo_release=no fi fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_file__etc_exherbo_release" >&5 -$as_echo "$ac_cv_file__etc_exherbo_release" >&6; } -if test "x$ac_cv_file__etc_exherbo_release" = xyes; then : - with_distro="exherbo" +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_file__etc_gentoo_release" >&5 +$as_echo "$ac_cv_file__etc_gentoo_release" >&6; } +if test "x$ac_cv_file__etc_gentoo_release" = xyes; then : + enable_ifnet=yes fi - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for /etc/lfs-release" >&5 -$as_echo_n "checking for /etc/lfs-release... " >&6; } -if ${ac_cv_file__etc_lfs_release+:} false; then : - $as_echo_n "(cached) " >&6 -else - test "$cross_compiling" = yes && - as_fn_error $? "cannot check for file existence when cross compiling" "$LINENO" 5 -if test -r "/etc/lfs-release"; then - ac_cv_file__etc_lfs_release=yes -else - ac_cv_file__etc_lfs_release=no fi +# Otherwise plugins default to "no" +if test -z "$enable_ifcfg_rh"; then : + enable_ifcfg_rh=no fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_file__etc_lfs_release" >&5 -$as_echo "$ac_cv_file__etc_lfs_release" >&6; } -if test "x$ac_cv_file__etc_lfs_release" = xyes; then : - with_distro="lfs" +if test -z "$enable_ifcfg_suse"; then : + enable_ifcfg_suse=no fi - - if test "z$with_distro" = "z"; then - with_distro=`lsb_release -is` - fi +if test -z "$enable_ifupdown"; then : + enable_ifupdown=no fi -with_distro=`echo ${with_distro} | tr '[:upper:]' '[:lower:]' ` - -if test "z$with_distro" = "z"; then - echo "Linux distribution autodetection failed, you must specify the distribution to target using --with-distro=DISTRO" - exit 1 -else - case $with_distro in - redhat|suse|gentoo|debian|slackware|arch|paldo|frugalware|mandriva|pardus|linexa|exherbo|lfs|generic) ;; - *) - echo "Your distribution (${with_distro}) is not yet supported! (patches welcome)" - exit 1 - ;; - esac +if test -z "$enable_ifnet"; then : + enable_ifnet=no fi - - if test x"$with_distro" = xgeneric; then - TARGET_GENERIC_TRUE= - TARGET_GENERIC_FALSE='#' +# Create automake conditionals + if test "$enable_ifcfg_rh" = "yes"; then + CONFIG_PLUGIN_IFCFG_RH_TRUE= + CONFIG_PLUGIN_IFCFG_RH_FALSE='#' else - TARGET_GENERIC_TRUE='#' - TARGET_GENERIC_FALSE= -fi - -if test x"$with_distro" = xgeneric; then - -$as_echo "#define TARGET_GENERIC 1" >>confdefs.h - + CONFIG_PLUGIN_IFCFG_RH_TRUE='#' + CONFIG_PLUGIN_IFCFG_RH_FALSE= fi - if test x"$with_distro" = xredhat; then - TARGET_REDHAT_TRUE= - TARGET_REDHAT_FALSE='#' + if test "$enable_ifcfg_suse" = "yes"; then + CONFIG_PLUGIN_IFCFG_SUSE_TRUE= + CONFIG_PLUGIN_IFCFG_SUSE_FALSE='#' else - TARGET_REDHAT_TRUE='#' - TARGET_REDHAT_FALSE= + CONFIG_PLUGIN_IFCFG_SUSE_TRUE='#' + CONFIG_PLUGIN_IFCFG_SUSE_FALSE= fi -if test x"$with_distro" = xredhat; then - -$as_echo "#define TARGET_REDHAT 1" >>confdefs.h - + if test "$enable_ifupdown" = "yes"; then + CONFIG_PLUGIN_IFUPDOWN_TRUE= + CONFIG_PLUGIN_IFUPDOWN_FALSE='#' +else + CONFIG_PLUGIN_IFUPDOWN_TRUE='#' + CONFIG_PLUGIN_IFUPDOWN_FALSE= fi - if test x"$with_distro" = xsuse; then - TARGET_SUSE_TRUE= - TARGET_SUSE_FALSE='#' + if test "$enable_ifnet" = "yes"; then + CONFIG_PLUGIN_IFNET_TRUE= + CONFIG_PLUGIN_IFNET_FALSE='#' else - TARGET_SUSE_TRUE='#' - TARGET_SUSE_FALSE= + CONFIG_PLUGIN_IFNET_TRUE='#' + CONFIG_PLUGIN_IFNET_FALSE= fi -if test x"$with_distro" = xsuse; then - -$as_echo "#define TARGET_SUSE 1" >>confdefs.h +# Code coverage + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build with code coverage support" >&5 +$as_echo_n "checking whether to build with code coverage support... " >&6; } + # Check whether --enable-code-coverage was given. +if test "${enable_code_coverage+set}" = set; then : + enableval=$enable_code_coverage; +else + enable_code_coverage=no fi - if test x"$with_distro" = xgentoo; then - TARGET_GENTOO_TRUE= - TARGET_GENTOO_FALSE='#' + if test x$enable_code_coverage = xyes; then + CODE_COVERAGE_ENABLED_TRUE= + CODE_COVERAGE_ENABLED_FALSE='#' else - TARGET_GENTOO_TRUE='#' - TARGET_GENTOO_FALSE= + CODE_COVERAGE_ENABLED_TRUE='#' + CODE_COVERAGE_ENABLED_FALSE= fi -if test x"$with_distro" = xgentoo; then + CODE_COVERAGE_ENABLED=$enable_code_coverage -$as_echo "#define TARGET_GENTOO 1" >>confdefs.h - -fi - - if test x"$with_distro" = xdebian; then - TARGET_DEBIAN_TRUE= - TARGET_DEBIAN_FALSE='#' -else - TARGET_DEBIAN_TRUE='#' - TARGET_DEBIAN_FALSE= -fi + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_code_coverage" >&5 +$as_echo "$enable_code_coverage" >&6; } -if test x"$with_distro" = xdebian; then + if test "$enable_code_coverage" = "yes" ; then : -$as_echo "#define TARGET_DEBIAN 1" >>confdefs.h + if test "$GCC" = "no" ; then : -fi + as_fn_error $? "not compiling with gcc, which is required for gcov code coverage" "$LINENO" 5 - if test x"$with_distro" = xslackware; then - TARGET_SLACKWARE_TRUE= - TARGET_SLACKWARE_FALSE='#' -else - TARGET_SLACKWARE_TRUE='#' - TARGET_SLACKWARE_FALSE= fi -if test x"$with_distro" = xslackware; then + # List of supported lcov versions. + lcov_version_list="1.6 1.7 1.8 1.9" -$as_echo "#define TARGET_SLACKWARE 1" >>confdefs.h + # Extract the first word of "lcov", so it can be a program name with args. +set dummy lcov; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_LCOV+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$LCOV"; then + ac_cv_prog_LCOV="$LCOV" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_LCOV="lcov" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS fi - - if test x"$with_distro" = xarch; then - TARGET_ARCH_TRUE= - TARGET_ARCH_FALSE='#' +fi +LCOV=$ac_cv_prog_LCOV +if test -n "$LCOV"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LCOV" >&5 +$as_echo "$LCOV" >&6; } else - TARGET_ARCH_TRUE='#' - TARGET_ARCH_FALSE= + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi -if test x"$with_distro" = xarch; then -$as_echo "#define TARGET_ARCH 1" >>confdefs.h + # Extract the first word of "genhtml", so it can be a program name with args. +set dummy genhtml; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_GENHTML+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$GENHTML"; then + ac_cv_prog_GENHTML="$GENHTML" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_GENHTML="genhtml" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS fi - - if test x"$with_distro" = xpaldo; then - TARGET_PALDO_TRUE= - TARGET_PALDO_FALSE='#' +fi +GENHTML=$ac_cv_prog_GENHTML +if test -n "$GENHTML"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GENHTML" >&5 +$as_echo "$GENHTML" >&6; } else - TARGET_PALDO_TRUE='#' - TARGET_PALDO_FALSE= + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi -if test x"$with_distro" = xpaldo; then -$as_echo "#define TARGET_PALDO 1" >>confdefs.h -fi + if test "$LCOV" ; then : - if test x"$with_distro" = xfrugalware; then - TARGET_FRUGALWARE_TRUE= - TARGET_FRUGALWARE_FALSE='#' + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for lcov version" >&5 +$as_echo_n "checking for lcov version... " >&6; } +if ${gnome_cv_lcov_version+:} false; then : + $as_echo_n "(cached) " >&6 else - TARGET_FRUGALWARE_TRUE='#' - TARGET_FRUGALWARE_FALSE= -fi -if test x"$with_distro" = xfrugalware; then - -$as_echo "#define TARGET_FRUGALWARE 1" >>confdefs.h + gnome_cv_lcov_version=invalid + lcov_version=`$LCOV -v 2>/dev/null | $SED -e 's/^.* //'` + for lcov_check_version in $lcov_version_list; do + if test "$lcov_version" = "$lcov_check_version"; then + gnome_cv_lcov_version="$lcov_check_version (ok)" + fi + done fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gnome_cv_lcov_version" >&5 +$as_echo "$gnome_cv_lcov_version" >&6; } - if test x"$with_distro" = xmandriva; then - TARGET_MANDRIVA_TRUE= - TARGET_MANDRIVA_FALSE='#' else - TARGET_MANDRIVA_TRUE='#' - TARGET_MANDRIVA_FALSE= -fi -if test x"$with_distro" = xmandriva; then - -$as_echo "#define TARGET_MANDRIVA 1" >>confdefs.h + lcov_msg="To enable code coverage reporting you must have one of the following lcov versions installed: $lcov_version_list" + as_fn_error $? "$lcov_msg" "$LINENO" 5 fi - if test x"$with_distro" = xpardus; then - TARGET_PARDUS_TRUE= - TARGET_PARDUS_FALSE='#' -else - TARGET_PARDUS_TRUE='#' - TARGET_PARDUS_FALSE= -fi + case $gnome_cv_lcov_version in + ""|invalid) + lcov_msg="You must have one of the following versions of lcov: $lcov_version_list (found: $lcov_version)." + as_fn_error $? "$lcov_msg" "$LINENO" 5 + LCOV="exit 0;" + ;; + esac -if test x"$with_distro" = xpardus; then + if test -z "$GENHTML" ; then : -$as_echo "#define TARGET_PARDUS 1" >>confdefs.h + as_fn_error $? "Could not find genhtml from the lcov package" "$LINENO" 5 fi - if test x"$with_distro" = xlinexa; then - TARGET_LINEXA_TRUE= - TARGET_LINEXA_FALSE='#' -else - TARGET_LINEXA_TRUE='#' - TARGET_LINEXA_FALSE= -fi + CODE_COVERAGE_CFLAGS="-O0 -g -fprofile-arcs -ftest-coverage" + CODE_COVERAGE_LDFLAGS="-lgcov" -if test x"$with_distro" = xlinexa; then -$as_echo "#define TARGET_LINEXA 1" >>confdefs.h -fi - if test x"$with_distro" = xexherbo; then - TARGET_EXHERBO_TRUE= - TARGET_EXHERBO_FALSE='#' -else - TARGET_EXHERBO_TRUE='#' - TARGET_EXHERBO_FALSE= fi -if test x"$with_distro" = xexherbo; then - -$as_echo "#define TARGET_EXHERBO 1" >>confdefs.h - -fi +GNOME_CODE_COVERAGE_RULES=' +# Code coverage +# +# Optional: +# - CODE_COVERAGE_DIRECTORY: Top-level directory for code coverage reporting. +# (Default: $(top_builddir)) +# - CODE_COVERAGE_OUTPUT_FILE: Filename and path for the .info file generated +# by lcov for code coverage. (Default: +# $(PACKAGE_NAME)-$(PACKAGE_VERSION)-coverage.info) +# - CODE_COVERAGE_OUTPUT_DIRECTORY: Directory for generated code coverage +# reports to be created. (Default: +# $(PACKAGE_NAME)-$(PACKAGE_VERSION)-coverage) +# - CODE_COVERAGE_LCOV_OPTIONS: Extra options to pass to the lcov instance. +# (Default: empty) +# - CODE_COVERAGE_GENHTML_OPTIONS: Extra options to pass to the genhtml +# instance. (Default: empty) +# - CODE_COVERAGE_IGNORE_PATTERN: Extra glob pattern of files to ignore +# +# The generated report will be titled using the $(PACKAGE_NAME) and +# $(PACKAGE_VERSION). In order to add the current git hash to the title, +# use the git-version-gen script, available online. + +# Optional variables +CODE_COVERAGE_DIRECTORY ?= $(top_builddir) +CODE_COVERAGE_OUTPUT_FILE ?= $(PACKAGE_NAME)-$(PACKAGE_VERSION)-coverage.info +CODE_COVERAGE_OUTPUT_DIRECTORY ?= $(PACKAGE_NAME)-$(PACKAGE_VERSION)-coverage +CODE_COVERAGE_LCOV_OPTIONS ?= +CODE_COVERAGE_GENHTML_OPTIONS ?= +CODE_COVERAGE_IGNORE_PATTERN ?= + +code_coverage_quiet = $(code_coverage_quiet_$(V)) +code_coverage_quiet_ = $(code_coverage_quiet_$(AM_DEFAULT_VERBOSITY)) +code_coverage_quiet_0 = --quiet + +# Use recursive makes in order to ignore errors during check +check-code-coverage: +ifdef CODE_COVERAGE_ENABLED + -$(MAKE) $(AM_MAKEFLAGS) -k check + $(MAKE) $(AM_MAKEFLAGS) code-coverage-capture +else + @echo "Need to reconfigure with --enable-code-coverage" +endif + +# Capture code coverage data +code-coverage-capture: code-coverage-capture-hook +ifdef CODE_COVERAGE_ENABLED + $(LCOV) $(code_coverage_quiet) --directory $(CODE_COVERAGE_DIRECTORY) --capture --output-file "$(CODE_COVERAGE_OUTPUT_FILE).tmp" --test-name "$(PACKAGE_NAME)-$(PACKAGE_VERSION)" --no-checksum --compat-libtool $(CODE_COVERAGE_LCOV_OPTIONS) + $(LCOV) $(code_coverage_quiet) --directory $(CODE_COVERAGE_DIRECTORY) --remove "$(CODE_COVERAGE_OUTPUT_FILE).tmp" "/tmp/*" $(CODE_COVERAGE_IGNORE_PATTERN) --output-file "$(CODE_COVERAGE_OUTPUT_FILE)" + -@rm -f $(CODE_COVERAGE_OUTPUT_FILE).tmp + LANG=C $(GENHTML) $(code_coverage_quiet) --prefix $(CODE_COVERAGE_DIRECTORY) --output-directory "$(CODE_COVERAGE_OUTPUT_DIRECTORY)" --title "$(PACKAGE_NAME)-$(PACKAGE_VERSION) Code Coverage" --legend --show-details "$(CODE_COVERAGE_OUTPUT_FILE)" $(CODE_COVERAGE_GENHTML_OPTIONS) + @echo "file://$(abs_builddir)/$(CODE_COVERAGE_OUTPUT_DIRECTORY)/index.html" +else + @echo "Need to reconfigure with --enable-code-coverage" +endif + +# Hook rule executed before code-coverage-capture, overridable by the user +code-coverage-capture-hook: + +clean: code-coverage-clean +code-coverage-clean: + -$(LCOV) --directory $(top_builddir) -z + -rm -rf $(CODE_COVERAGE_OUTPUT_FILE) $(CODE_COVERAGE_OUTPUT_FILE).tmp $(CODE_COVERAGE_OUTPUT_DIRECTORY) + -find . -name "*.gcda" -o -name "*.gcov" -delete + +GITIGNOREFILES ?= +GITIGNOREFILES += $(CODE_COVERAGE_OUTPUT_FILE) $(CODE_COVERAGE_OUTPUT_DIRECTORY) + +DISTCHECK_CONFIGURE_FLAGS ?= +DISTCHECK_CONFIGURE_FLAGS += --disable-code-coverage + +.PHONY: check-code-coverage code-coverage-capture code-coverage-capture-hook code-coverage-clean +' - if test x"$with_distro" = xlfs; then - TARGET_LFS_TRUE= - TARGET_LFS_FALSE='#' -else - TARGET_LFS_TRUE='#' - TARGET_LFS_FALSE= -fi -if test x"$with_distro" = xlfs; then -$as_echo "#define TARGET_LFS 1" >>confdefs.h -fi # Check whether --with-dist-version was given. @@ -20047,7 +20002,7 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext int main () { -int a = NL80211_RATE_INFO_BITRATE; +int a = NL80211_RATE_INFO_BITRATE; a++; ; return 0; } @@ -20538,10 +20493,12 @@ fi +GLIB_VERSION_DEFINES="-DGLIB_VERSION_MIN_REQUIRED=GLIB_VERSION_2_26 '-DGLIB_VERSION_MAX_ALLOWED=G_ENCODE_VERSION(2,34)'" + # dbus-glib uses GValueArray, which is deprecated as of GLib 2.32. # Set GLIB_VERSION_MIN_REQUIRED to something less than that to avoid # getting warnings. (GLIB_VERSION_2_26 is the oldest defined version.) -DBUS_CFLAGS="$DBUS_CFLAGS -DGLIB_VERSION_MIN_REQUIRED=GLIB_VERSION_2_26" +DBUS_CFLAGS="$DBUS_CFLAGS $GLIB_VERSION_DEFINES" pkg_failed=no @@ -20552,12 +20509,12 @@ if test -n "$GLIB_CFLAGS"; then pkg_cv_GLIB_CFLAGS="$GLIB_CFLAGS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gthread-2.0 glib-2.0 >= 2.22 gobject-2.0\""; } >&5 - ($PKG_CONFIG --exists --print-errors "gthread-2.0 glib-2.0 >= 2.22 gobject-2.0") 2>&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gio-unix-2.0 >= 2.22 gmodule-2.0\""; } >&5 + ($PKG_CONFIG --exists --print-errors "gio-unix-2.0 >= 2.22 gmodule-2.0") 2>&5 ac_status=$? $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then - pkg_cv_GLIB_CFLAGS=`$PKG_CONFIG --cflags "gthread-2.0 glib-2.0 >= 2.22 gobject-2.0" 2>/dev/null` + pkg_cv_GLIB_CFLAGS=`$PKG_CONFIG --cflags "gio-unix-2.0 >= 2.22 gmodule-2.0" 2>/dev/null` else pkg_failed=yes fi @@ -20568,12 +20525,12 @@ if test -n "$GLIB_LIBS"; then pkg_cv_GLIB_LIBS="$GLIB_LIBS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gthread-2.0 glib-2.0 >= 2.22 gobject-2.0\""; } >&5 - ($PKG_CONFIG --exists --print-errors "gthread-2.0 glib-2.0 >= 2.22 gobject-2.0") 2>&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gio-unix-2.0 >= 2.22 gmodule-2.0\""; } >&5 + ($PKG_CONFIG --exists --print-errors "gio-unix-2.0 >= 2.22 gmodule-2.0") 2>&5 ac_status=$? $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then - pkg_cv_GLIB_LIBS=`$PKG_CONFIG --libs "gthread-2.0 glib-2.0 >= 2.22 gobject-2.0" 2>/dev/null` + pkg_cv_GLIB_LIBS=`$PKG_CONFIG --libs "gio-unix-2.0 >= 2.22 gmodule-2.0" 2>/dev/null` else pkg_failed=yes fi @@ -20593,14 +20550,14 @@ else _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - GLIB_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "gthread-2.0 glib-2.0 >= 2.22 gobject-2.0" 2>&1` + GLIB_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "gio-unix-2.0 >= 2.22 gmodule-2.0" 2>&1` else - GLIB_PKG_ERRORS=`$PKG_CONFIG --print-errors "gthread-2.0 glib-2.0 >= 2.22 gobject-2.0" 2>&1` + GLIB_PKG_ERRORS=`$PKG_CONFIG --print-errors "gio-unix-2.0 >= 2.22 gmodule-2.0" 2>&1` fi # Put the nasty error message in config.log where it belongs echo "$GLIB_PKG_ERRORS" >&5 - as_fn_error $? "Package requirements (gthread-2.0 glib-2.0 >= 2.22 gobject-2.0) were not met: + as_fn_error $? "Package requirements (gio-unix-2.0 >= 2.22 gmodule-2.0) were not met: $GLIB_PKG_ERRORS @@ -20634,100 +20591,7 @@ else $as_echo "yes" >&6; } fi - - - - -pkg_failed=no -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GMODULE" >&5 -$as_echo_n "checking for GMODULE... " >&6; } - -if test -n "$GMODULE_CFLAGS"; then - pkg_cv_GMODULE_CFLAGS="$GMODULE_CFLAGS" - elif test -n "$PKG_CONFIG"; then - if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gmodule-2.0\""; } >&5 - ($PKG_CONFIG --exists --print-errors "gmodule-2.0") 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; }; then - pkg_cv_GMODULE_CFLAGS=`$PKG_CONFIG --cflags "gmodule-2.0" 2>/dev/null` -else - pkg_failed=yes -fi - else - pkg_failed=untried -fi -if test -n "$GMODULE_LIBS"; then - pkg_cv_GMODULE_LIBS="$GMODULE_LIBS" - elif test -n "$PKG_CONFIG"; then - if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gmodule-2.0\""; } >&5 - ($PKG_CONFIG --exists --print-errors "gmodule-2.0") 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; }; then - pkg_cv_GMODULE_LIBS=`$PKG_CONFIG --libs "gmodule-2.0" 2>/dev/null` -else - pkg_failed=yes -fi - else - pkg_failed=untried -fi - - - -if test $pkg_failed = yes; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } - -if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then - _pkg_short_errors_supported=yes -else - _pkg_short_errors_supported=no -fi - if test $_pkg_short_errors_supported = yes; then - GMODULE_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "gmodule-2.0" 2>&1` - else - GMODULE_PKG_ERRORS=`$PKG_CONFIG --print-errors "gmodule-2.0" 2>&1` - fi - # Put the nasty error message in config.log where it belongs - echo "$GMODULE_PKG_ERRORS" >&5 - - as_fn_error $? "Package requirements (gmodule-2.0) were not met: - -$GMODULE_PKG_ERRORS - -Consider adjusting the PKG_CONFIG_PATH environment variable if you -installed software in a non-standard prefix. - -Alternatively, you may set the environment variables GMODULE_CFLAGS -and GMODULE_LIBS to avoid the need to call pkg-config. -See the pkg-config man page for more details." "$LINENO" 5 - -elif test $pkg_failed = untried; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } - { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -as_fn_error $? "The pkg-config script could not be found or is too old. Make sure it -is in your PATH or set the PKG_CONFIG environment variable to the full -path to pkg-config. - -Alternatively, you may set the environment variables GMODULE_CFLAGS -and GMODULE_LIBS to avoid the need to call pkg-config. -See the pkg-config man page for more details. - -To get pkg-config, see . -See \`config.log' for more details" "$LINENO" 5; } - -else - GMODULE_CFLAGS=$pkg_cv_GMODULE_CFLAGS - GMODULE_LIBS=$pkg_cv_GMODULE_LIBS - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } - -fi +GLIB_CFLAGS="$GLIB_CFLAGS $GLIB_VERSION_DEFINES" @@ -20740,12 +20604,12 @@ if test -n "$GUDEV_CFLAGS"; then pkg_cv_GUDEV_CFLAGS="$GUDEV_CFLAGS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gudev-1.0 >= 147\""; } >&5 - ($PKG_CONFIG --exists --print-errors "gudev-1.0 >= 147") 2>&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gudev-1.0 >= 165\""; } >&5 + ($PKG_CONFIG --exists --print-errors "gudev-1.0 >= 165") 2>&5 ac_status=$? $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then - pkg_cv_GUDEV_CFLAGS=`$PKG_CONFIG --cflags "gudev-1.0 >= 147" 2>/dev/null` + pkg_cv_GUDEV_CFLAGS=`$PKG_CONFIG --cflags "gudev-1.0 >= 165" 2>/dev/null` else pkg_failed=yes fi @@ -20756,12 +20620,12 @@ if test -n "$GUDEV_LIBS"; then pkg_cv_GUDEV_LIBS="$GUDEV_LIBS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gudev-1.0 >= 147\""; } >&5 - ($PKG_CONFIG --exists --print-errors "gudev-1.0 >= 147") 2>&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gudev-1.0 >= 165\""; } >&5 + ($PKG_CONFIG --exists --print-errors "gudev-1.0 >= 165") 2>&5 ac_status=$? $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then - pkg_cv_GUDEV_LIBS=`$PKG_CONFIG --libs "gudev-1.0 >= 147" 2>/dev/null` + pkg_cv_GUDEV_LIBS=`$PKG_CONFIG --libs "gudev-1.0 >= 165" 2>/dev/null` else pkg_failed=yes fi @@ -20781,14 +20645,14 @@ else _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - GUDEV_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "gudev-1.0 >= 147" 2>&1` + GUDEV_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "gudev-1.0 >= 165" 2>&1` else - GUDEV_PKG_ERRORS=`$PKG_CONFIG --print-errors "gudev-1.0 >= 147" 2>&1` + GUDEV_PKG_ERRORS=`$PKG_CONFIG --print-errors "gudev-1.0 >= 165" 2>&1` fi # Put the nasty error message in config.log where it belongs echo "$GUDEV_PKG_ERRORS" >&5 - as_fn_error $? "Package requirements (gudev-1.0 >= 147) were not met: + as_fn_error $? "Package requirements (gudev-1.0 >= 165) were not met: $GUDEV_PKG_ERRORS @@ -20826,100 +20690,6 @@ fi -pkg_failed=no -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GIO" >&5 -$as_echo_n "checking for GIO... " >&6; } - -if test -n "$GIO_CFLAGS"; then - pkg_cv_GIO_CFLAGS="$GIO_CFLAGS" - elif test -n "$PKG_CONFIG"; then - if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gio-2.0\""; } >&5 - ($PKG_CONFIG --exists --print-errors "gio-2.0") 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; }; then - pkg_cv_GIO_CFLAGS=`$PKG_CONFIG --cflags "gio-2.0" 2>/dev/null` -else - pkg_failed=yes -fi - else - pkg_failed=untried -fi -if test -n "$GIO_LIBS"; then - pkg_cv_GIO_LIBS="$GIO_LIBS" - elif test -n "$PKG_CONFIG"; then - if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gio-2.0\""; } >&5 - ($PKG_CONFIG --exists --print-errors "gio-2.0") 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; }; then - pkg_cv_GIO_LIBS=`$PKG_CONFIG --libs "gio-2.0" 2>/dev/null` -else - pkg_failed=yes -fi - else - pkg_failed=untried -fi - - - -if test $pkg_failed = yes; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } - -if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then - _pkg_short_errors_supported=yes -else - _pkg_short_errors_supported=no -fi - if test $_pkg_short_errors_supported = yes; then - GIO_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "gio-2.0" 2>&1` - else - GIO_PKG_ERRORS=`$PKG_CONFIG --print-errors "gio-2.0" 2>&1` - fi - # Put the nasty error message in config.log where it belongs - echo "$GIO_PKG_ERRORS" >&5 - - as_fn_error $? "Package requirements (gio-2.0) were not met: - -$GIO_PKG_ERRORS - -Consider adjusting the PKG_CONFIG_PATH environment variable if you -installed software in a non-standard prefix. - -Alternatively, you may set the environment variables GIO_CFLAGS -and GIO_LIBS to avoid the need to call pkg-config. -See the pkg-config man page for more details." "$LINENO" 5 - -elif test $pkg_failed = untried; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } - { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -as_fn_error $? "The pkg-config script could not be found or is too old. Make sure it -is in your PATH or set the PKG_CONFIG environment variable to the full -path to pkg-config. - -Alternatively, you may set the environment variables GIO_CFLAGS -and GIO_LIBS to avoid the need to call pkg-config. -See the pkg-config man page for more details. - -To get pkg-config, see . -See \`config.log' for more details" "$LINENO" 5; } - -else - GIO_CFLAGS=$pkg_cv_GIO_CFLAGS - GIO_LIBS=$pkg_cv_GIO_LIBS - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } - -fi - - - - # Check whether --enable-introspection was given. @@ -21170,15 +20940,17 @@ fi # Check whether --with-systemdsystemunitdir was given. if test "${with_systemdsystemunitdir+set}" = set; then : withval=$with_systemdsystemunitdir; -else - with_systemdsystemunitdir=$($PKG_CONFIG --variable=systemdsystemunitdir systemd) fi -if test "x$with_systemdsystemunitdir" != xno; then - systemdsystemunitdir=$with_systemdsystemunitdir - +# default location +if test -z "$with_systemdsystemunitdir" && $PKG_CONFIG systemd; then : + with_systemdsystemunitdir="\$(prefix)/lib/systemd/system" fi - if test -n "$with_systemdsystemunitdir" -a "x$with_systemdsystemunitdir" != xno ; then +if test -z "$with_systemdsystemunitdir"; then : + with_systemdsystemunitdir=no +fi +# add conditional and subst + if test "$with_systemdsystemunitdir" != no; then HAVE_SYSTEMD_TRUE= HAVE_SYSTEMD_FALSE='#' else @@ -21186,28 +20958,61 @@ else HAVE_SYSTEMD_FALSE= fi +if test "$with_systemdsystemunitdir" != no; then + systemdsystemunitdir=$with_systemdsystemunitdir + +fi +# session tracking support +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking Session tracking support" >&5 +$as_echo_n "checking Session tracking support... " >&6; } # Check whether --with-session-tracking was given. if test "${with_session_tracking+set}" = set; then : withval=$with_session_tracking; fi -if test "z$with_session_tracking" = "z"; then - # Default to ConsoleKit session tracking like we used before - with_session_tracking=ck +# default to consolekit +if test -z "$with_session_tracking"; then : + with_session_tracking=consolekit +fi +if test "$with_session_tracking" = "ck"; then : + with_session_tracking=consolekit +fi +if test "$with_session_tracking" = "none"; then : + with_session_tracking=no +fi +# check value +if ! (echo "$with_session_tracking" | grep -q -E "^(systemd|consolekit|no)$"); then : + as_fn_error $? "--with-session-tracking must be systemd/consolekit/no +else + not $with_session_tracking" "$LINENO" 5 +fi +# add conditionals and subtitutions + if test "$with_session_tracking" = "consolekit"; then + SESSION_TRACKING_CK_TRUE= + SESSION_TRACKING_CK_FALSE='#' +else + SESSION_TRACKING_CK_TRUE='#' + SESSION_TRACKING_CK_FALSE= fi -case $with_session_tracking in - ck|none|no) ;; - systemd) + if test "xwith_session_tracking" = "systemd"; then + SESSION_TRACKING_SYSTEMD_TRUE= + SESSION_TRACKING_SYSTEMD_FALSE='#' +else + SESSION_TRACKING_SYSTEMD_TRUE='#' + SESSION_TRACKING_SYSTEMD_FALSE= +fi + +if test "$with_session_tracking" = "systemd"; then pkg_failed=no -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for SYSTEMD" >&5 -$as_echo_n "checking for SYSTEMD... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for SYSTEMD_LOGIN" >&5 +$as_echo_n "checking for SYSTEMD_LOGIN... " >&6; } -if test -n "$SYSTEMD_CFLAGS"; then - pkg_cv_SYSTEMD_CFLAGS="$SYSTEMD_CFLAGS" +if test -n "$SYSTEMD_LOGIN_CFLAGS"; then + pkg_cv_SYSTEMD_LOGIN_CFLAGS="$SYSTEMD_LOGIN_CFLAGS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libsystemd-login\""; } >&5 @@ -21215,15 +21020,15 @@ if test -n "$SYSTEMD_CFLAGS"; then ac_status=$? $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then - pkg_cv_SYSTEMD_CFLAGS=`$PKG_CONFIG --cflags "libsystemd-login" 2>/dev/null` + pkg_cv_SYSTEMD_LOGIN_CFLAGS=`$PKG_CONFIG --cflags "libsystemd-login" 2>/dev/null` else pkg_failed=yes fi else pkg_failed=untried fi -if test -n "$SYSTEMD_LIBS"; then - pkg_cv_SYSTEMD_LIBS="$SYSTEMD_LIBS" +if test -n "$SYSTEMD_LOGIN_LIBS"; then + pkg_cv_SYSTEMD_LOGIN_LIBS="$SYSTEMD_LOGIN_LIBS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libsystemd-login\""; } >&5 @@ -21231,7 +21036,7 @@ if test -n "$SYSTEMD_LIBS"; then ac_status=$? $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then - pkg_cv_SYSTEMD_LIBS=`$PKG_CONFIG --libs "libsystemd-login" 2>/dev/null` + pkg_cv_SYSTEMD_LOGIN_LIBS=`$PKG_CONFIG --libs "libsystemd-login" 2>/dev/null` else pkg_failed=yes fi @@ -21251,22 +21056,22 @@ else _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - SYSTEMD_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "libsystemd-login" 2>&1` + SYSTEMD_LOGIN_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "libsystemd-login" 2>&1` else - SYSTEMD_PKG_ERRORS=`$PKG_CONFIG --print-errors "libsystemd-login" 2>&1` + SYSTEMD_LOGIN_PKG_ERRORS=`$PKG_CONFIG --print-errors "libsystemd-login" 2>&1` fi # Put the nasty error message in config.log where it belongs - echo "$SYSTEMD_PKG_ERRORS" >&5 + echo "$SYSTEMD_LOGIN_PKG_ERRORS" >&5 as_fn_error $? "Package requirements (libsystemd-login) were not met: -$SYSTEMD_PKG_ERRORS +$SYSTEMD_LOGIN_PKG_ERRORS Consider adjusting the PKG_CONFIG_PATH environment variable if you installed software in a non-standard prefix. -Alternatively, you may set the environment variables SYSTEMD_CFLAGS -and SYSTEMD_LIBS to avoid the need to call pkg-config. +Alternatively, you may set the environment variables SYSTEMD_LOGIN_CFLAGS +and SYSTEMD_LOGIN_LIBS to avoid the need to call pkg-config. See the pkg-config man page for more details." "$LINENO" 5 elif test $pkg_failed = untried; then @@ -21278,77 +21083,90 @@ as_fn_error $? "The pkg-config script could not be found or is too old. Make su is in your PATH or set the PKG_CONFIG environment variable to the full path to pkg-config. -Alternatively, you may set the environment variables SYSTEMD_CFLAGS -and SYSTEMD_LIBS to avoid the need to call pkg-config. +Alternatively, you may set the environment variables SYSTEMD_LOGIN_CFLAGS +and SYSTEMD_LOGIN_LIBS to avoid the need to call pkg-config. See the pkg-config man page for more details. To get pkg-config, see . See \`config.log' for more details" "$LINENO" 5; } else - SYSTEMD_CFLAGS=$pkg_cv_SYSTEMD_CFLAGS - SYSTEMD_LIBS=$pkg_cv_SYSTEMD_LIBS + SYSTEMD_LOGIN_CFLAGS=$pkg_cv_SYSTEMD_LOGIN_CFLAGS + SYSTEMD_LOGIN_LIBS=$pkg_cv_SYSTEMD_LOGIN_LIBS { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } fi - ;; - *) - as_fn_error $? "--with-session-tracking must be one of none, ck, systemd" "$LINENO" 5 - ;; -esac - if test "x$with_session_tracking" = "xck"; then - SESSION_TRACKING_CK_TRUE= - SESSION_TRACKING_CK_FALSE='#' -else - SESSION_TRACKING_CK_TRUE='#' - SESSION_TRACKING_CK_FALSE= fi +if test "$with_session_tracking" = "consolekit"; then + CKDB_PATH=/var/run/ConsoleKit/database - if test "x$with_session_tracking" = "xsystemd"; then - SESSION_TRACKING_SYSTEMD_TRUE= - SESSION_TRACKING_SYSTEMD_FALSE='#' -else - SESSION_TRACKING_SYSTEMD_TRUE='#' - SESSION_TRACKING_SYSTEMD_FALSE= fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $with_session_tracking" >&5 +$as_echo "$with_session_tracking" >&6; } +# Check whether --with-suspend-resume was given. +if test "${with_suspend_resume+set}" = set; then : + withval=$with_suspend_resume; +fi + +if test "z$with_suspend_resume" = "z"; then + if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"systemd >= 183\""; } >&5 + ($PKG_CONFIG --exists --print-errors "systemd >= 183") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + have_systemd_inhibit=yes +else + have_systemd_inhibit=no +fi + if test "z${have_systemd_inhibit}" = "zyes"; then + # Use systemd if it's new enough + with_suspend_resume="systemd" + else + # Fall back to upower + with_suspend_resume="upower" + fi +fi -have_libnl="no" +case $with_suspend_resume in + upower) ;; + systemd) pkg_failed=no -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for LIBNL3" >&5 -$as_echo_n "checking for LIBNL3... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for SYSTEMD_INHIBIT" >&5 +$as_echo_n "checking for SYSTEMD_INHIBIT... " >&6; } -if test -n "$LIBNL3_CFLAGS"; then - pkg_cv_LIBNL3_CFLAGS="$LIBNL3_CFLAGS" +if test -n "$SYSTEMD_INHIBIT_CFLAGS"; then + pkg_cv_SYSTEMD_INHIBIT_CFLAGS="$SYSTEMD_INHIBIT_CFLAGS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libnl-3.0\""; } >&5 - ($PKG_CONFIG --exists --print-errors "libnl-3.0") 2>&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"systemd >= 183\""; } >&5 + ($PKG_CONFIG --exists --print-errors "systemd >= 183") 2>&5 ac_status=$? $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then - pkg_cv_LIBNL3_CFLAGS=`$PKG_CONFIG --cflags "libnl-3.0" 2>/dev/null` + pkg_cv_SYSTEMD_INHIBIT_CFLAGS=`$PKG_CONFIG --cflags "systemd >= 183" 2>/dev/null` else pkg_failed=yes fi else pkg_failed=untried fi -if test -n "$LIBNL3_LIBS"; then - pkg_cv_LIBNL3_LIBS="$LIBNL3_LIBS" +if test -n "$SYSTEMD_INHIBIT_LIBS"; then + pkg_cv_SYSTEMD_INHIBIT_LIBS="$SYSTEMD_INHIBIT_LIBS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libnl-3.0\""; } >&5 - ($PKG_CONFIG --exists --print-errors "libnl-3.0") 2>&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"systemd >= 183\""; } >&5 + ($PKG_CONFIG --exists --print-errors "systemd >= 183") 2>&5 ac_status=$? $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then - pkg_cv_LIBNL3_LIBS=`$PKG_CONFIG --libs "libnl-3.0" 2>/dev/null` + pkg_cv_SYSTEMD_INHIBIT_LIBS=`$PKG_CONFIG --libs "systemd >= 183" 2>/dev/null` else pkg_failed=yes fi @@ -21368,56 +21186,113 @@ else _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - LIBNL3_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "libnl-3.0" 2>&1` + SYSTEMD_INHIBIT_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "systemd >= 183" 2>&1` else - LIBNL3_PKG_ERRORS=`$PKG_CONFIG --print-errors "libnl-3.0" 2>&1` + SYSTEMD_INHIBIT_PKG_ERRORS=`$PKG_CONFIG --print-errors "systemd >= 183" 2>&1` fi # Put the nasty error message in config.log where it belongs - echo "$LIBNL3_PKG_ERRORS" >&5 + echo "$SYSTEMD_INHIBIT_PKG_ERRORS" >&5 + + as_fn_error $? "Package requirements (systemd >= 183) were not met: + +$SYSTEMD_INHIBIT_PKG_ERRORS + +Consider adjusting the PKG_CONFIG_PATH environment variable if you +installed software in a non-standard prefix. + +Alternatively, you may set the environment variables SYSTEMD_INHIBIT_CFLAGS +and SYSTEMD_INHIBIT_LIBS to avoid the need to call pkg-config. +See the pkg-config man page for more details." "$LINENO" 5 - have_libnl3=no elif test $pkg_failed = untried; then { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } - have_libnl3=no + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +as_fn_error $? "The pkg-config script could not be found or is too old. Make sure it +is in your PATH or set the PKG_CONFIG environment variable to the full +path to pkg-config. + +Alternatively, you may set the environment variables SYSTEMD_INHIBIT_CFLAGS +and SYSTEMD_INHIBIT_LIBS to avoid the need to call pkg-config. +See the pkg-config man page for more details. + +To get pkg-config, see . +See \`config.log' for more details" "$LINENO" 5; } + else - LIBNL3_CFLAGS=$pkg_cv_LIBNL3_CFLAGS - LIBNL3_LIBS=$pkg_cv_LIBNL3_LIBS + SYSTEMD_INHIBIT_CFLAGS=$pkg_cv_SYSTEMD_INHIBIT_CFLAGS + SYSTEMD_INHIBIT_LIBS=$pkg_cv_SYSTEMD_INHIBIT_LIBS { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } - have_libnl3=yes + +fi + ;; + *) + as_fn_error $? "--with-suspend-resume must be one of upower, systemd" "$LINENO" 5 + ;; +esac + if test "x$with_suspend_resume" = "xupower"; then + SUSPEND_RESUME_UPOWER_TRUE= + SUSPEND_RESUME_UPOWER_FALSE='#' +else + SUSPEND_RESUME_UPOWER_TRUE='#' + SUSPEND_RESUME_UPOWER_FALSE= +fi + + if test "x$with_suspend_resume" = "xsystemd"; then + SUSPEND_RESUME_SYSTEMD_TRUE= + SUSPEND_RESUME_SYSTEMD_FALSE='#' +else + SUSPEND_RESUME_SYSTEMD_TRUE='#' + SUSPEND_RESUME_SYSTEMD_FALSE= +fi + + +# libnl support for the linux platform + +# Check whether --with-libnl was given. +if test "${with_libnl+set}" = set; then : + withval=$with_libnl; +fi + +# default to "yes" +if test -z "$with_libnl"; then : + with_libnl=yes fi +# test for various libnl versions +if test "$with_libnl" = "yes" -o "$with_libnl" = "3"; then pkg_failed=no -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for LIBNL_ROUTE3" >&5 -$as_echo_n "checking for LIBNL_ROUTE3... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for LIBNL3" >&5 +$as_echo_n "checking for LIBNL3... " >&6; } -if test -n "$LIBNL_ROUTE3_CFLAGS"; then - pkg_cv_LIBNL_ROUTE3_CFLAGS="$LIBNL_ROUTE3_CFLAGS" +if test -n "$LIBNL3_CFLAGS"; then + pkg_cv_LIBNL3_CFLAGS="$LIBNL3_CFLAGS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libnl-route-3.0\""; } >&5 - ($PKG_CONFIG --exists --print-errors "libnl-route-3.0") 2>&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libnl-3.0 libnl-route-3.0 libnl-genl-3.0\""; } >&5 + ($PKG_CONFIG --exists --print-errors "libnl-3.0 libnl-route-3.0 libnl-genl-3.0") 2>&5 ac_status=$? $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then - pkg_cv_LIBNL_ROUTE3_CFLAGS=`$PKG_CONFIG --cflags "libnl-route-3.0" 2>/dev/null` + pkg_cv_LIBNL3_CFLAGS=`$PKG_CONFIG --cflags "libnl-3.0 libnl-route-3.0 libnl-genl-3.0" 2>/dev/null` else pkg_failed=yes fi else pkg_failed=untried fi -if test -n "$LIBNL_ROUTE3_LIBS"; then - pkg_cv_LIBNL_ROUTE3_LIBS="$LIBNL_ROUTE3_LIBS" +if test -n "$LIBNL3_LIBS"; then + pkg_cv_LIBNL3_LIBS="$LIBNL3_LIBS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libnl-route-3.0\""; } >&5 - ($PKG_CONFIG --exists --print-errors "libnl-route-3.0") 2>&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libnl-3.0 libnl-route-3.0 libnl-genl-3.0\""; } >&5 + ($PKG_CONFIG --exists --print-errors "libnl-3.0 libnl-route-3.0 libnl-genl-3.0") 2>&5 ac_status=$? $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then - pkg_cv_LIBNL_ROUTE3_LIBS=`$PKG_CONFIG --libs "libnl-route-3.0" 2>/dev/null` + pkg_cv_LIBNL3_LIBS=`$PKG_CONFIG --libs "libnl-3.0 libnl-route-3.0 libnl-genl-3.0" 2>/dev/null` else pkg_failed=yes fi @@ -21437,126 +21312,53 @@ else _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - LIBNL_ROUTE3_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "libnl-route-3.0" 2>&1` + LIBNL3_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "libnl-3.0 libnl-route-3.0 libnl-genl-3.0" 2>&1` else - LIBNL_ROUTE3_PKG_ERRORS=`$PKG_CONFIG --print-errors "libnl-route-3.0" 2>&1` + LIBNL3_PKG_ERRORS=`$PKG_CONFIG --print-errors "libnl-3.0 libnl-route-3.0 libnl-genl-3.0" 2>&1` fi # Put the nasty error message in config.log where it belongs - echo "$LIBNL_ROUTE3_PKG_ERRORS" >&5 + echo "$LIBNL3_PKG_ERRORS" >&5 - have_libnl_route3=no + test "$with_libnl" = "3" && with_libnl=no elif test $pkg_failed = untried; then { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } - have_libnl_route3=no + test "$with_libnl" = "3" && with_libnl=no else - LIBNL_ROUTE3_CFLAGS=$pkg_cv_LIBNL_ROUTE3_CFLAGS - LIBNL_ROUTE3_LIBS=$pkg_cv_LIBNL_ROUTE3_LIBS + LIBNL3_CFLAGS=$pkg_cv_LIBNL3_CFLAGS + LIBNL3_LIBS=$pkg_cv_LIBNL3_LIBS { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } - have_libnl_route3=yes + with_libnl=3 fi + if test "$with_libnl" = "no"; then : + as_fn_error $? "libnl 3.x could not be found" "$LINENO" 5 +fi +fi +if test "$with_libnl" = "yes" -o "$with_libnl" = "2"; then pkg_failed=no -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for LIBNL_GENL3" >&5 -$as_echo_n "checking for LIBNL_GENL3... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for LIBNL2" >&5 +$as_echo_n "checking for LIBNL2... " >&6; } -if test -n "$LIBNL_GENL3_CFLAGS"; then - pkg_cv_LIBNL_GENL3_CFLAGS="$LIBNL_GENL3_CFLAGS" +if test -n "$LIBNL2_CFLAGS"; then + pkg_cv_LIBNL2_CFLAGS="$LIBNL2_CFLAGS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libnl-genl-3.0\""; } >&5 - ($PKG_CONFIG --exists --print-errors "libnl-genl-3.0") 2>&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libnl-2.0\""; } >&5 + ($PKG_CONFIG --exists --print-errors "libnl-2.0") 2>&5 ac_status=$? $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then - pkg_cv_LIBNL_GENL3_CFLAGS=`$PKG_CONFIG --cflags "libnl-genl-3.0" 2>/dev/null` + pkg_cv_LIBNL2_CFLAGS=`$PKG_CONFIG --cflags "libnl-2.0" 2>/dev/null` else pkg_failed=yes fi else pkg_failed=untried fi -if test -n "$LIBNL_GENL3_LIBS"; then - pkg_cv_LIBNL_GENL3_LIBS="$LIBNL_GENL3_LIBS" - elif test -n "$PKG_CONFIG"; then - if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libnl-genl-3.0\""; } >&5 - ($PKG_CONFIG --exists --print-errors "libnl-genl-3.0") 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; }; then - pkg_cv_LIBNL_GENL3_LIBS=`$PKG_CONFIG --libs "libnl-genl-3.0" 2>/dev/null` -else - pkg_failed=yes -fi - else - pkg_failed=untried -fi - - - -if test $pkg_failed = yes; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } - -if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then - _pkg_short_errors_supported=yes -else - _pkg_short_errors_supported=no -fi - if test $_pkg_short_errors_supported = yes; then - LIBNL_GENL3_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "libnl-genl-3.0" 2>&1` - else - LIBNL_GENL3_PKG_ERRORS=`$PKG_CONFIG --print-errors "libnl-genl-3.0" 2>&1` - fi - # Put the nasty error message in config.log where it belongs - echo "$LIBNL_GENL3_PKG_ERRORS" >&5 - - have_libnl_genl3=no -elif test $pkg_failed = untried; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } - have_libnl_genl3=no -else - LIBNL_GENL3_CFLAGS=$pkg_cv_LIBNL_GENL3_CFLAGS - LIBNL_GENL3_LIBS=$pkg_cv_LIBNL_GENL3_LIBS - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } - have_libnl_genl3=yes -fi -if (test "${have_libnl3}" = "yes" -a "${have_libnl_route3}" = "yes" -a "${have_libnl_genl3}" = "yes"); then - -$as_echo "#define HAVE_LIBNL3 1" >>confdefs.h - - LIBNL_CFLAGS="$LIBNL3_CFLAGS $LIBNL_ROUTE3_CFLAGS $LIBNL_GENL3_CFLAGS" - LIBNL_LIBS="$LIBNL3_LIBS $LIBNL_ROUTE3_LIBS $LIBNL_GENL3_LIBS" - libnl_version="3" - have_libnl="yes" -else - -pkg_failed=no -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for LIBNL2" >&5 -$as_echo_n "checking for LIBNL2... " >&6; } - -if test -n "$LIBNL2_CFLAGS"; then - pkg_cv_LIBNL2_CFLAGS="$LIBNL2_CFLAGS" - elif test -n "$PKG_CONFIG"; then - if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libnl-2.0\""; } >&5 - ($PKG_CONFIG --exists --print-errors "libnl-2.0") 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; }; then - pkg_cv_LIBNL2_CFLAGS=`$PKG_CONFIG --cflags "libnl-2.0" 2>/dev/null` -else - pkg_failed=yes -fi - else - pkg_failed=untried -fi -if test -n "$LIBNL2_LIBS"; then - pkg_cv_LIBNL2_LIBS="$LIBNL2_LIBS" +if test -n "$LIBNL2_LIBS"; then + pkg_cv_LIBNL2_LIBS="$LIBNL2_LIBS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libnl-2.0\""; } >&5 @@ -21591,27 +21393,23 @@ fi # Put the nasty error message in config.log where it belongs echo "$LIBNL2_PKG_ERRORS" >&5 - have_libnl2=no + test "$with_libnl" = "2" && with_libnl=no elif test $pkg_failed = untried; then { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } - have_libnl2=no + test "$with_libnl" = "2" && with_libnl=no else LIBNL2_CFLAGS=$pkg_cv_LIBNL2_CFLAGS LIBNL2_LIBS=$pkg_cv_LIBNL2_LIBS { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } - have_libnl2=yes + with_libnl=2 fi - if (test "${have_libnl2}" = "yes"); then - -$as_echo "#define HAVE_LIBNL2 1" >>confdefs.h - - LIBNL_CFLAGS="$LIBNL2_CFLAGS" - LIBNL_LIBS="$LIBNL2_LIBS" - libnl_version="2" - have_libnl="yes" - else + if test "$with_libnl" = "no"; then : + as_fn_error $? "libnl 2.x could not be found" "$LINENO" 5 +fi +fi +if test "$with_libnl" = "yes" -o "$with_libnl" = "1"; then pkg_failed=no { $as_echo "$as_me:${as_lineno-$LINENO}: checking for LIBNL1" >&5 @@ -21669,37 +21467,43 @@ fi # Put the nasty error message in config.log where it belongs echo "$LIBNL1_PKG_ERRORS" >&5 - have_libnl1=no + test "$with_libnl" = "1" && with_libnl=no elif test $pkg_failed = untried; then { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } - have_libnl1=no + test "$with_libnl" = "1" && with_libnl=no else LIBNL1_CFLAGS=$pkg_cv_LIBNL1_CFLAGS LIBNL1_LIBS=$pkg_cv_LIBNL1_LIBS { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } - have_libnl1=yes + with_libnl=1 fi - if (test "${have_libnl1}" = "yes"); then - -$as_echo "#define HAVE_LIBNL1 1" >>confdefs.h - - LIBNL_CFLAGS="$LIBNL1_CFLAGS" - LIBNL_LIBS="$LIBNL1_LIBS" - libnl_version="1" - have_libnl="yes" - fi - fi + if test "$with_libnl" = "no"; then : + as_fn_error $? "libnl 1.x could not be found" "$LINENO" 5 fi - -if (test "${have_libnl}" = "no"); then - as_fn_error $? "libnl development header are required" "$LINENO" 5 fi +if test "$with_libnl" = "yes"; then + as_fn_error $? "libnl library could not be found" "$LINENO" 5 + with_libnl=no +fi +if ! echo "$with_libnl" | grep -q "^[1-3]$"; then + as_fn_error $? "unsupported libnl version: $with_libnl" "$LINENO" 5 +fi +# add variables, conditionals and defines +if test "$with_libnl" != "no"; then +cat >>confdefs.h <<_ACEOF +#define HAVE_LIBNL $with_libnl +_ACEOF + LIBNL_CFLAGS="$LIBNL3_CFLAGS$LIBNL2_CFLAGS$LIBNL1_CFLAGS" -if (test "${libnl_version}" = "1"); then + LIBNL_LIBS="$LIBNL3_LIBS$LIBNL2_LIBS$LIBNL1_LIBS" + +fi +# additional tests +if test "with_libnl" = "1"; then { $as_echo "$as_me:${as_lineno-$LINENO}: checking for libnl address caching bug" >&5 $as_echo_n "checking for libnl address caching bug... " >&6; } @@ -22086,6 +21890,21 @@ else fi +# Check whether --enable-modify-system was given. +if test "${enable_modify_system+set}" = set; then : + enableval=$enable_modify_system; +fi + +if test "${enable_modify_system}" = "yes"; then + if ! test "${enable_polkit}" = "yes"; then + as_fn_error $? "--enable-modify-system requires --enable-polkit" "$LINENO" 5 + fi + NM_MODIFY_SYSTEM_POLICY="yes" +else + NM_MODIFY_SYSTEM_POLICY="auth_admin_keep" +fi + + # Check whether --with-crypto was given. if test "${with_crypto+set}" = set; then : @@ -22456,7 +22275,7 @@ if test "x$ac_cv_header_pppd_pppd_h" = xyes; then : _ACEOF else - as_fn_error $? "couldn't find pppd.h. pppd development headers are required." "$LINENO" 5 + as_fn_error $? "\"couldn't find pppd.h. pppd development headers are required.\"" "$LINENO" 5 fi done @@ -22493,182 +22312,160 @@ else fi +# ModemManager1 with libmm-glib -# dhclient support +# Check whether --with-modem-manager-1 was given. +if test "${with_modem_manager_1+set}" = set; then : + withval=$with_modem_manager_1; +else + with_modem_manager_1=auto +fi -# Check whether --with-dhclient was given. -if test "${with_dhclient+set}" = set; then : - withval=$with_dhclient; +if (test "${with_modem_manager_1}" != "no"); then + +pkg_failed=no +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for MM_GLIB" >&5 +$as_echo_n "checking for MM_GLIB... " >&6; } + +if test -n "$MM_GLIB_CFLAGS"; then + pkg_cv_MM_GLIB_CFLAGS="$MM_GLIB_CFLAGS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"mm-glib\""; } >&5 + ($PKG_CONFIG --exists --print-errors "mm-glib") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + pkg_cv_MM_GLIB_CFLAGS=`$PKG_CONFIG --cflags "mm-glib" 2>/dev/null` +else + pkg_failed=yes +fi + else + pkg_failed=untried +fi +if test -n "$MM_GLIB_LIBS"; then + pkg_cv_MM_GLIB_LIBS="$MM_GLIB_LIBS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"mm-glib\""; } >&5 + ($PKG_CONFIG --exists --print-errors "mm-glib") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + pkg_cv_MM_GLIB_LIBS=`$PKG_CONFIG --libs "mm-glib" 2>/dev/null` +else + pkg_failed=yes +fi + else + pkg_failed=untried fi -# If a full path is given, use that and do not test if it works or not. -case "${with_dhclient}" in - # NM only works with ISC dhclient - other derivatives don't have - # the same userland. dhclient 4.x is required for IPv6 support; - # with older versions NM won't be able to use DHCPv6. - - /*) - DHCLIENT_PATH="${with_dhclient}" - DHCLIENT_VERSION=4 - if test -x "${with_dhclient}"; then - case `"${with_dhclient}" --version 2>&1` in - "isc-dhclient-4"*) DHCLIENT_VERSION=4; break;; - "isc-dhclient-V3"*) DHCLIENT_VERSION=3; break;; - esac - fi - { $as_echo "$as_me:${as_lineno-$LINENO}: using dhclient at ${DHCLIENT_PATH}" >&5 -$as_echo "$as_me: using dhclient at ${DHCLIENT_PATH}" >&6;} - ;; - no) { $as_echo "$as_me:${as_lineno-$LINENO}: dhclient support disabled" >&5 -$as_echo "$as_me: dhclient support disabled" >&6;} - ;; - *) - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dhclient" >&5 -$as_echo_n "checking for dhclient... " >&6; } - for path in /sbin /usr/sbin /usr/pkg/sbin /usr/local/sbin; do - test -x "${path}/dhclient" || continue - case `"$path/dhclient" --version 2>&1` in - "isc-dhclient-4"*) DHCLIENT_PATH="$path/dhclient"; DHCLIENT_VERSION=4; break;; - "isc-dhclient-V3"*) DHCLIENT_PATH="$path/dhclient"; DHCLIENT_VERSION=3; break;; - esac - done - if test -n "${DHCLIENT_PATH}"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DHCLIENT_PATH" >&5 -$as_echo "$DHCLIENT_PATH" >&6; } - else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } - fi - ;; -esac -# dhcpcd support -# Check whether --with-dhcpcd was given. -if test "${with_dhcpcd+set}" = set; then : - withval=$with_dhcpcd; +if test $pkg_failed = yes; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + +if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then + _pkg_short_errors_supported=yes +else + _pkg_short_errors_supported=no fi + if test $_pkg_short_errors_supported = yes; then + MM_GLIB_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "mm-glib" 2>&1` + else + MM_GLIB_PKG_ERRORS=`$PKG_CONFIG --print-errors "mm-glib" 2>&1` + fi + # Put the nasty error message in config.log where it belongs + echo "$MM_GLIB_PKG_ERRORS" >&5 -# If a full path is given, use that and do not test if it works or not. -case "${with_dhcpcd}" in - /*) - DHCPCD_PATH="${with_dhcpcd}" - { $as_echo "$as_me:${as_lineno-$LINENO}: using dhcpcd at ${DHCPCD_PATH}" >&5 -$as_echo "$as_me: using dhcpcd at ${DHCPCD_PATH}" >&6;} - ;; - no) { $as_echo "$as_me:${as_lineno-$LINENO}: dhcpcd support disabled" >&5 -$as_echo "$as_me: dhcpcd support disabled" >&6;} - ;; - *) - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dhcpcd" >&5 -$as_echo_n "checking for dhcpcd... " >&6; } - # We fully work with upstream dhcpcd-4 - for path in /sbin /usr/sbin /usr/pkg/sbin /usr/local/sbin; do - test -x "${path}/dhcpcd" || continue - case `"$path/dhcpcd" --version 2>/dev/null` in - "dhcpcd "123*);; - "dhcpcd "*) DHCPCD_PATH="$path/dhcpcd"; break;; - esac - done - if test -n "${DHCPCD_PATH}"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DHCPCD_PATH" >&5 -$as_echo "$DHCPCD_PATH" >&6; } - else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + have_libmm_glib=no +elif test $pkg_failed = untried; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } - fi - ;; -esac + have_libmm_glib=no +else + MM_GLIB_CFLAGS=$pkg_cv_MM_GLIB_CFLAGS + MM_GLIB_LIBS=$pkg_cv_MM_GLIB_LIBS + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + have_libmm_glib=yes +fi + -if test -z "$DHCPCD_PATH" -a -z "$DHCLIENT_PATH"; then - # DHCP clients are not a build time dependency, only runtime. - # dhclient has been the longtime default for NM and it's in /sbin - # in most distros, so use it. - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Could not find a suitable DHCP client" >&5 -$as_echo "$as_me: WARNING: Could not find a suitable DHCP client" >&2;} - DHCLIENT_PATH=/sbin/dhclient - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Falling back to ISC dhclient, ${DHCLIENT_PATH}" >&5 -$as_echo "$as_me: WARNING: Falling back to ISC dhclient, ${DHCLIENT_PATH}" >&2;} + + if (test "${have_libmm_glib}" = "no"); then + if (test "${with_modem_manager_1}" = "yes"); then + as_fn_error $? "Couldn't find libmm-glib" "$LINENO" 5 + fi + else + with_modem_manager_1="yes" + fi fi +if (test "${with_modem_manager_1}" = "yes"); then +$as_echo "#define WITH_MODEM_MANAGER_1 1" >>confdefs.h +else -# resolvconf support +$as_echo "#define WITH_MODEM_MANAGER_1 0" >>confdefs.h -# Check whether --with-resolvconf was given. -if test "${with_resolvconf+set}" = set; then : - withval=$with_resolvconf; with_resolvconf="$withval" +fi + if test "${with_modem_manager_1}" = "yes"; then + WITH_MODEM_MANAGER_1_TRUE= + WITH_MODEM_MANAGER_1_FALSE='#' else - with_resolvconf=no + WITH_MODEM_MANAGER_1_TRUE='#' + WITH_MODEM_MANAGER_1_FALSE= fi -# If a full path is given, use that and do not test if it works or not. -case "${with_resolvconf}" in - /*) - RESOLVCONF_PATH="${with_resolvconf}" - { $as_echo "$as_me:${as_lineno-$LINENO}: setting resolvconf path to ${RESOLVCONF_PATH}" >&5 -$as_echo "$as_me: setting resolvconf path to ${RESOLVCONF_PATH}" >&6;} - ;; - no) { $as_echo "$as_me:${as_lineno-$LINENO}: resolvconf support disabled" >&5 -$as_echo "$as_me: resolvconf support disabled" >&6;} - ;; - *) - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for resolvconf" >&5 -$as_echo_n "checking for resolvconf... " >&6; } - for path in /sbin /usr/sbin /usr/pkg/sbin /usr/local/sbin; do - if test -x "${path}/resolvconf"; then - RESOLVCONF_PATH="${path}/resolvconf" - break - fi - done - if test -n "${RESOLVCONF_PATH}"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $RESOLVCONF_PATH" >&5 -$as_echo "$RESOLVCONF_PATH" >&6; } - else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } - fi - ;; -esac - -if test -n "${RESOLVCONF_PATH}"; then -cat >>confdefs.h <<_ACEOF -#define RESOLVCONF_PATH "$RESOLVCONF_PATH" -_ACEOF +# DHCP client support +# Check whether --with-dhclient was given. +if test "${with_dhclient+set}" = set; then : + withval=$with_dhclient; fi -# iptables path -# Check whether --with-iptables was given. -if test "${with_iptables+set}" = set; then : - withval=$with_iptables; +# Check whether --with-dhcpcd was given. +if test "${with_dhcpcd+set}" = set; then : + withval=$with_dhcpcd; fi -if test "x${with_iptables}" = x; then - # Extract the first word of "iptables", so it can be a program name with args. -set dummy iptables; ac_word=$2 +# Default to "yes" +if test -z "$with_dhclient"; then : + with_dhclient=yes +fi +if test -z "$with_dhcpcd"; then : + with_dhcpcd=yes +fi +# Search and check the executables +if test "$with_dhclient" = "yes"; then + for ac_prog in dhclient +do + # Extract the first word of "$ac_prog", so it can be a program name with args. +set dummy $ac_prog; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_path_IPTABLES_PATH+:} false; then : +if ${ac_cv_path_with_dhclient+:} false; then : $as_echo_n "(cached) " >&6 else - case $IPTABLES_PATH in + case $with_dhclient in [\\/]* | ?:[\\/]*) - ac_cv_path_IPTABLES_PATH="$IPTABLES_PATH" # Let the user override the test with a path. + ac_cv_path_with_dhclient="$with_dhclient" # Let the user override the test with a path. ;; *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -as_dummy="$PATH:/sbin:/usr/sbin" +as_dummy="/sbin:/usr/sbin:/usr/local/sbin" for as_dir in $as_dummy do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_path_IPTABLES_PATH="$as_dir/$ac_word$ac_exec_ext" + ac_cv_path_with_dhclient="$as_dir/$ac_word$ac_exec_ext" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi @@ -22679,51 +22476,341 @@ IFS=$as_save_IFS ;; esac fi -IPTABLES_PATH=$ac_cv_path_IPTABLES_PATH -if test -n "$IPTABLES_PATH"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $IPTABLES_PATH" >&5 -$as_echo "$IPTABLES_PATH" >&6; } +with_dhclient=$ac_cv_path_with_dhclient +if test -n "$with_dhclient"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $with_dhclient" >&5 +$as_echo "$with_dhclient" >&6; } else { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi - if ! test -x "$IPTABLES_PATH"; then - as_fn_error $? "iptables was not installed." "$LINENO" 5 + test -n "$with_dhclient" && break +done +test -n "$with_dhclient" || with_dhclient="no" + + if test "$with_dhclient" != "no"; then + if ! $with_dhclient --version 2>&1 | grep -q "^isc-dhclient-4\."; then + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Cannot use dhclient, version 4.x is required" >&5 +$as_echo "$as_me: WARNING: Cannot use dhclient, version 4.x is required" >&2;} + with_dhclient=no + fi + fi +fi +if test "$with_dhcpcd" = "yes"; then + for ac_prog in dhcpcd +do + # Extract the first word of "$ac_prog", so it can be a program name with args. +set dummy $ac_prog; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_path_with_dhcpcd+:} false; then : + $as_echo_n "(cached) " >&6 +else + case $with_dhcpcd in + [\\/]* | ?:[\\/]*) + ac_cv_path_with_dhcpcd="$with_dhcpcd" # Let the user override the test with a path. + ;; + *) + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +as_dummy="/sbin:/usr/sbin:/usr/local/sbin" +for as_dir in $as_dummy +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_path_with_dhcpcd="$as_dir/$ac_word$ac_exec_ext" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 fi +done + done +IFS=$as_save_IFS + + ;; +esac +fi +with_dhcpcd=$ac_cv_path_with_dhcpcd +if test -n "$with_dhcpcd"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $with_dhcpcd" >&5 +$as_echo "$with_dhcpcd" >&6; } else - IPTABLES_PATH="$with_iptables" + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi -cat >>confdefs.h <<_ACEOF -#define IPTABLES_PATH "$IPTABLES_PATH" -_ACEOF - + test -n "$with_dhcpcd" && break +done +test -n "$with_dhcpcd" || with_dhcpcd="no" -# system CA certificates path + if test "$with_dhcpcd" != "no"; then + if ! $with_dhcpcd --version 2>&1 | grep -q "^dhcpcd [45]\."; then + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Cannot use dhcpcd, version 4.x or 5.x is required" >&5 +$as_echo "$as_me: WARNING: Cannot use dhcpcd, version 4.x or 5.x is required" >&2;} + with_dhcpcd=no + fi + fi +fi +# Fallback +if test "$with_dhclient" = "no" -a "$with_dhcpcd" = "no"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Could not find a suitable DHCP client, falling back to dhclient" >&5 +$as_echo "$as_me: WARNING: Could not find a suitable DHCP client, falling back to dhclient" >&2;} + with_dhclient=/sbin/dhclient +fi +# Add substitutions +if test "$with_dhclient" != "no"; then + DHCLIENT_PATH=$with_dhclient -# Check whether --with-system-ca-path was given. -if test "${with_system_ca_path+set}" = set; then : - withval=$with_system_ca_path; fi +if test "$with_dhcpcd" != "no"; then + DHCPCD_PATH=$with_dhcpcd -if test "x${with_system_ca_path}" = x; then - SYSTEM_CA_PATH=/etc/ssl/certs -else - SYSTEM_CA_PATH="$with_system_ca_path" fi -cat >>confdefs.h <<_ACEOF -#define SYSTEM_CA_PATH "$SYSTEM_CA_PATH" -_ACEOF +# resolvconf and netconfig support +# Check whether --with-resolvconf was given. +if test "${with_resolvconf+set}" = set; then : + withval=$with_resolvconf; +fi +# Check whether --with-netconfig was given. +if test "${with_netconfig+set}" = set; then : + withval=$with_netconfig; +fi -# Check whether --with-kernel-firmware-dir was given. -if test "${with_kernel_firmware_dir+set}" = set; then : +# Use netconfig by default on SUSE +if test -z "$with_netconfig"; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for /etc/SuSE-release" >&5 +$as_echo_n "checking for /etc/SuSE-release... " >&6; } +if ${ac_cv_file__etc_SuSE_release+:} false; then : + $as_echo_n "(cached) " >&6 +else + test "$cross_compiling" = yes && + as_fn_error $? "cannot check for file existence when cross compiling" "$LINENO" 5 +if test -r "/etc/SuSE-release"; then + ac_cv_file__etc_SuSE_release=yes +else + ac_cv_file__etc_SuSE_release=no +fi +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_file__etc_SuSE_release" >&5 +$as_echo "$ac_cv_file__etc_SuSE_release" >&6; } +if test "x$ac_cv_file__etc_SuSE_release" = xyes; then : + with_netconfig=yes +fi + +fi +# Otherwise default to "no" +if test -z "$with_resolvconf"; then : + with_resolvconf=no +fi +if test -z "$with_netconfig"; then : + with_netconfig=no +fi +# Find resolvconf and netconfig +if test "$with_resolvconf" = "yes"; then + for ac_prog in resolvconf +do + # Extract the first word of "$ac_prog", so it can be a program name with args. +set dummy $ac_prog; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_path_with_resolvconf+:} false; then : + $as_echo_n "(cached) " >&6 +else + case $with_resolvconf in + [\\/]* | ?:[\\/]*) + ac_cv_path_with_resolvconf="$with_resolvconf" # Let the user override the test with a path. + ;; + *) + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +as_dummy="/sbin:/usr/sbin:/usr/local/sbin" +for as_dir in $as_dummy +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_path_with_resolvconf="$as_dir/$ac_word$ac_exec_ext" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + + ;; +esac +fi +with_resolvconf=$ac_cv_path_with_resolvconf +if test -n "$with_resolvconf"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $with_resolvconf" >&5 +$as_echo "$with_resolvconf" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + + test -n "$with_resolvconf" && break +done +test -n "$with_resolvconf" || with_resolvconf="no" + +fi +if test "$with_netconfig" = "yes"; then + for ac_prog in netconfig +do + # Extract the first word of "$ac_prog", so it can be a program name with args. +set dummy $ac_prog; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_path_with_netconfig+:} false; then : + $as_echo_n "(cached) " >&6 +else + case $with_netconfig in + [\\/]* | ?:[\\/]*) + ac_cv_path_with_netconfig="$with_netconfig" # Let the user override the test with a path. + ;; + *) + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +as_dummy="/sbin:/usr/sbin:/usr/local/sbin" +for as_dir in $as_dummy +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_path_with_netconfig="$as_dir/$ac_word$ac_exec_ext" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + + ;; +esac +fi +with_netconfig=$ac_cv_path_with_netconfig +if test -n "$with_netconfig"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $with_netconfig" >&5 +$as_echo "$with_netconfig" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + + test -n "$with_netconfig" && break +done +test -n "$with_netconfig" || with_netconfig="no" + +fi +# Define resolvconf and netconfig paths +if test "$with_resolvconf" != "no"; then + +cat >>confdefs.h <<_ACEOF +#define RESOLVCONF_PATH "$with_resolvconf" +_ACEOF + +fi +if test "$with_netconfig" != "no"; then + +cat >>confdefs.h <<_ACEOF +#define NETCONFIG_PATH "$with_netconfig" +_ACEOF + +fi + +# iptables path + +# Check whether --with-iptables was given. +if test "${with_iptables+set}" = set; then : + withval=$with_iptables; +fi + +if test "x${with_iptables}" = x; then + # Extract the first word of "iptables", so it can be a program name with args. +set dummy iptables; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_path_IPTABLES_PATH+:} false; then : + $as_echo_n "(cached) " >&6 +else + case $IPTABLES_PATH in + [\\/]* | ?:[\\/]*) + ac_cv_path_IPTABLES_PATH="$IPTABLES_PATH" # Let the user override the test with a path. + ;; + *) + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +as_dummy="$PATH:/sbin:/usr/sbin" +for as_dir in $as_dummy +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_path_IPTABLES_PATH="$as_dir/$ac_word$ac_exec_ext" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + + ;; +esac +fi +IPTABLES_PATH=$ac_cv_path_IPTABLES_PATH +if test -n "$IPTABLES_PATH"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $IPTABLES_PATH" >&5 +$as_echo "$IPTABLES_PATH" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + + if ! test -x "$IPTABLES_PATH"; then + as_fn_error $? "iptables was not installed." "$LINENO" 5 + fi +else + IPTABLES_PATH="$with_iptables" +fi + +cat >>confdefs.h <<_ACEOF +#define IPTABLES_PATH "$IPTABLES_PATH" +_ACEOF + + + +# system CA certificates path + +# Check whether --with-system-ca-path was given. +if test "${with_system_ca_path+set}" = set; then : + withval=$with_system_ca_path; +fi + +if test "x${with_system_ca_path}" = x; then + SYSTEM_CA_PATH=/etc/ssl/certs +else + SYSTEM_CA_PATH="$with_system_ca_path" +fi + +cat >>confdefs.h <<_ACEOF +#define SYSTEM_CA_PATH "$SYSTEM_CA_PATH" +_ACEOF + + + + +# Check whether --with-kernel-firmware-dir was given. +if test "${with_kernel_firmware_dir+set}" = set; then : withval=$with_kernel_firmware_dir; fi @@ -22915,58 +23002,78 @@ fi - # Extract the first word of "gtkdoc-check", so it can be a program name with args. -set dummy gtkdoc-check; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_path_GTKDOC_CHECK+:} false; then : - $as_echo_n "(cached) " >&6 + + + # Check whether --enable-vala was given. +if test "${enable_vala+set}" = set; then : + enableval=$enable_vala; else - case $GTKDOC_CHECK in - [\\/]* | ?:[\\/]*) - ac_cv_path_GTKDOC_CHECK="$GTKDOC_CHECK" # Let the user override the test with a path. - ;; - *) - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_path_GTKDOC_CHECK="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done - done -IFS=$as_save_IFS + enable_vala=auto +fi + + + case $enable_vala in #( + no) : + ;; #( + yes) : + + if test "x" != "xyes" -a "x$found_introspection" != "xyes"; then : + + as_fn_error $? "Vala bindings require GObject Introspection" "$LINENO" 5 - ;; -esac fi -GTKDOC_CHECK=$ac_cv_path_GTKDOC_CHECK -if test -n "$GTKDOC_CHECK"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GTKDOC_CHECK" >&5 -$as_echo "$GTKDOC_CHECK" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + ;; #( + auto) : + + if test "x" != "xyes" -a "x$found_introspection" != "xyes"; then : + + enable_vala=no + fi + ;; #( + *) : + as_fn_error $? "Invalid argument passed to --enable-vala, should be one of [no/auto/yes]" "$LINENO" 5 + ;; +esac - for ac_prog in gtkdoc-rebase -do - # Extract the first word of "$ac_prog", so it can be a program name with args. -set dummy $ac_prog; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 + if test "x" = "x"; then : + + vapigen_pkg_name=vapigen + +else + + vapigen_pkg_name=vapigen- + +fi + if test "x0.17.1.24" = "x"; then : + + vapigen_pkg="$vapigen_pkg_name" + +else + + vapigen_pkg="$vapigen_pkg_name >= 0.17.1.24" + +fi + + + + + + + +if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then + if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args. +set dummy ${ac_tool_prefix}pkg-config; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_path_GTKDOC_REBASE+:} false; then : +if ${ac_cv_path_PKG_CONFIG+:} false; then : $as_echo_n "(cached) " >&6 else - case $GTKDOC_REBASE in + case $PKG_CONFIG in [\\/]* | ?:[\\/]*) - ac_cv_path_GTKDOC_REBASE="$GTKDOC_REBASE" # Let the user override the test with a path. + ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path. ;; *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR @@ -22976,7 +23083,7 @@ do test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_path_GTKDOC_REBASE="$as_dir/$ac_word$ac_exec_ext" + ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi @@ -22987,30 +23094,29 @@ IFS=$as_save_IFS ;; esac fi -GTKDOC_REBASE=$ac_cv_path_GTKDOC_REBASE -if test -n "$GTKDOC_REBASE"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GTKDOC_REBASE" >&5 -$as_echo "$GTKDOC_REBASE" >&6; } +PKG_CONFIG=$ac_cv_path_PKG_CONFIG +if test -n "$PKG_CONFIG"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5 +$as_echo "$PKG_CONFIG" >&6; } else { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi - test -n "$GTKDOC_REBASE" && break -done -test -n "$GTKDOC_REBASE" || GTKDOC_REBASE="true" - - # Extract the first word of "gtkdoc-mkpdf", so it can be a program name with args. -set dummy gtkdoc-mkpdf; ac_word=$2 +fi +if test -z "$ac_cv_path_PKG_CONFIG"; then + ac_pt_PKG_CONFIG=$PKG_CONFIG + # Extract the first word of "pkg-config", so it can be a program name with args. +set dummy pkg-config; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_path_GTKDOC_MKPDF+:} false; then : +if ${ac_cv_path_ac_pt_PKG_CONFIG+:} false; then : $as_echo_n "(cached) " >&6 else - case $GTKDOC_MKPDF in + case $ac_pt_PKG_CONFIG in [\\/]* | ?:[\\/]*) - ac_cv_path_GTKDOC_MKPDF="$GTKDOC_MKPDF" # Let the user override the test with a path. + ac_cv_path_ac_pt_PKG_CONFIG="$ac_pt_PKG_CONFIG" # Let the user override the test with a path. ;; *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR @@ -23020,7 +23126,7 @@ do test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_path_GTKDOC_MKPDF="$as_dir/$ac_word$ac_exec_ext" + ac_cv_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi @@ -23031,285 +23137,234 @@ IFS=$as_save_IFS ;; esac fi -GTKDOC_MKPDF=$ac_cv_path_GTKDOC_MKPDF -if test -n "$GTKDOC_MKPDF"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GTKDOC_MKPDF" >&5 -$as_echo "$GTKDOC_MKPDF" >&6; } +ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG +if test -n "$ac_pt_PKG_CONFIG"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_pt_PKG_CONFIG" >&5 +$as_echo "$ac_pt_PKG_CONFIG" >&6; } else { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi - - - -# Check whether --with-html-dir was given. -if test "${with_html_dir+set}" = set; then : - withval=$with_html_dir; + if test "x$ac_pt_PKG_CONFIG" = x; then + PKG_CONFIG="" + else + case $cross_compiling:$ac_tool_warned in +yes:) +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +ac_tool_warned=yes ;; +esac + PKG_CONFIG=$ac_pt_PKG_CONFIG + fi else - with_html_dir='${datadir}/gtk-doc/html' + PKG_CONFIG="$ac_cv_path_PKG_CONFIG" fi - HTML_DIR="$with_html_dir" - - - # Check whether --enable-gtk-doc was given. -if test "${enable_gtk_doc+set}" = set; then : - enableval=$enable_gtk_doc; -else - enable_gtk_doc=no fi - - - if test x$enable_gtk_doc = xyes; then - if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gtk-doc >= 1.0\""; } >&5 - ($PKG_CONFIG --exists --print-errors "gtk-doc >= 1.0") 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; }; then - : -else - as_fn_error $? "You need to have gtk-doc >= 1.0 installed to build $PACKAGE_NAME" "$LINENO" 5 +if test -n "$PKG_CONFIG"; then + _pkg_min_version=0.9.0 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking pkg-config is at least version $_pkg_min_version" >&5 +$as_echo_n "checking pkg-config is at least version $_pkg_min_version... " >&6; } + if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + PKG_CONFIG="" + fi fi - if test "x$PACKAGE_NAME" != "xglib"; then -pkg_failed=no -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GTKDOC_DEPS" >&5 -$as_echo_n "checking for GTKDOC_DEPS... " >&6; } - -if test -n "$GTKDOC_DEPS_CFLAGS"; then - pkg_cv_GTKDOC_DEPS_CFLAGS="$GTKDOC_DEPS_CFLAGS" - elif test -n "$PKG_CONFIG"; then - if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"glib-2.0 >= 2.10.0 gobject-2.0 >= 2.10.0\""; } >&5 - ($PKG_CONFIG --exists --print-errors "glib-2.0 >= 2.10.0 gobject-2.0 >= 2.10.0") 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; }; then - pkg_cv_GTKDOC_DEPS_CFLAGS=`$PKG_CONFIG --cflags "glib-2.0 >= 2.10.0 gobject-2.0 >= 2.10.0" 2>/dev/null` -else - pkg_failed=yes -fi - else - pkg_failed=untried -fi -if test -n "$GTKDOC_DEPS_LIBS"; then - pkg_cv_GTKDOC_DEPS_LIBS="$GTKDOC_DEPS_LIBS" - elif test -n "$PKG_CONFIG"; then - if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"glib-2.0 >= 2.10.0 gobject-2.0 >= 2.10.0\""; } >&5 - ($PKG_CONFIG --exists --print-errors "glib-2.0 >= 2.10.0 gobject-2.0 >= 2.10.0") 2>&5 + if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$vapigen_pkg\""; } >&5 + ($PKG_CONFIG --exists --print-errors "$vapigen_pkg") 2>&5 ac_status=$? $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then - pkg_cv_GTKDOC_DEPS_LIBS=`$PKG_CONFIG --libs "glib-2.0 >= 2.10.0 gobject-2.0 >= 2.10.0" 2>/dev/null` -else - pkg_failed=yes -fi - else - pkg_failed=untried -fi + if test "$enable_vala" = "auto"; then : + enable_vala=yes -if test $pkg_failed = yes; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } +fi -if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then - _pkg_short_errors_supported=yes else - _pkg_short_errors_supported=no -fi - if test $_pkg_short_errors_supported = yes; then - GTKDOC_DEPS_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "glib-2.0 >= 2.10.0 gobject-2.0 >= 2.10.0" 2>&1` - else - GTKDOC_DEPS_PKG_ERRORS=`$PKG_CONFIG --print-errors "glib-2.0 >= 2.10.0 gobject-2.0 >= 2.10.0" 2>&1` - fi - # Put the nasty error message in config.log where it belongs - echo "$GTKDOC_DEPS_PKG_ERRORS" >&5 - as_fn_error $? "Package requirements (glib-2.0 >= 2.10.0 gobject-2.0 >= 2.10.0) were not met: + case $enable_vala in #( + yes) : -$GTKDOC_DEPS_PKG_ERRORS + as_fn_error $? "$vapigen_pkg not found" "$LINENO" 5 + ;; #( + auto) : -Consider adjusting the PKG_CONFIG_PATH environment variable if you -installed software in a non-standard prefix. + enable_vala=no + ;; #( + *) : + ;; +esac -Alternatively, you may set the environment variables GTKDOC_DEPS_CFLAGS -and GTKDOC_DEPS_LIBS to avoid the need to call pkg-config. -See the pkg-config man page for more details." "$LINENO" 5 +fi -elif test $pkg_failed = untried; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } - { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -as_fn_error $? "The pkg-config script could not be found or is too old. Make sure it -is in your PATH or set the PKG_CONFIG environment variable to the full -path to pkg-config. + case $enable_vala in #( + yes) : -Alternatively, you may set the environment variables GTKDOC_DEPS_CFLAGS -and GTKDOC_DEPS_LIBS to avoid the need to call pkg-config. -See the pkg-config man page for more details. + VAPIGEN=`$PKG_CONFIG --variable=vapigen vapigen` + VAPIGEN_MAKEFILE=`$PKG_CONFIG --variable=datadir vapigen`/vala/Makefile.vapigen + if test "x" = "x"; then : -To get pkg-config, see . -See \`config.log' for more details" "$LINENO" 5; } + VAPIGEN_VAPIDIR=`$PKG_CONFIG --variable=vapidir vapigen` else - GTKDOC_DEPS_CFLAGS=$pkg_cv_GTKDOC_DEPS_CFLAGS - GTKDOC_DEPS_LIBS=$pkg_cv_GTKDOC_DEPS_LIBS - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } - -fi - fi - fi - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build gtk-doc documentation" >&5 -$as_echo_n "checking whether to build gtk-doc documentation... " >&6; } - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_gtk_doc" >&5 -$as_echo "$enable_gtk_doc" >&6; } + VAPIGEN_VAPIDIR=`$PKG_CONFIG --variable=vapidir_versioned vapigen` - # Check whether --enable-gtk-doc-html was given. -if test "${enable_gtk_doc_html+set}" = set; then : - enableval=$enable_gtk_doc_html; -else - enable_gtk_doc_html=yes fi + ;; #( + *) : + ;; +esac - # Check whether --enable-gtk-doc-pdf was given. -if test "${enable_gtk_doc_pdf+set}" = set; then : - enableval=$enable_gtk_doc_pdf; -else - enable_gtk_doc_pdf=no -fi - if test -z "$GTKDOC_MKPDF"; then - enable_gtk_doc_pdf=no - fi - if test x$enable_gtk_doc = xyes; then - ENABLE_GTK_DOC_TRUE= - ENABLE_GTK_DOC_FALSE='#' + if test "x$enable_vala" = "xyes"; then + ENABLE_VAPIGEN_TRUE= + ENABLE_VAPIGEN_FALSE='#' else - ENABLE_GTK_DOC_TRUE='#' - ENABLE_GTK_DOC_FALSE= + ENABLE_VAPIGEN_TRUE='#' + ENABLE_VAPIGEN_FALSE= fi - if test x$enable_gtk_doc_html = xyes; then - GTK_DOC_BUILD_HTML_TRUE= - GTK_DOC_BUILD_HTML_FALSE='#' -else - GTK_DOC_BUILD_HTML_TRUE='#' - GTK_DOC_BUILD_HTML_FALSE= -fi - if test x$enable_gtk_doc_pdf = xyes; then - GTK_DOC_BUILD_PDF_TRUE= - GTK_DOC_BUILD_PDF_FALSE='#' -else - GTK_DOC_BUILD_PDF_TRUE='#' - GTK_DOC_BUILD_PDF_FALSE= -fi - if test -n "$LIBTOOL"; then - GTK_DOC_USE_LIBTOOL_TRUE= - GTK_DOC_USE_LIBTOOL_FALSE='#' -else - GTK_DOC_USE_LIBTOOL_TRUE='#' - GTK_DOC_USE_LIBTOOL_FALSE= +# Tests, utilities and documentation +# Check whether --enable-tests was given. +if test "${enable_tests+set}" = set; then : + enableval=$enable_tests; fi - if test -n "$GTKDOC_REBASE"; then - GTK_DOC_USE_REBASE_TRUE= - GTK_DOC_USE_REBASE_FALSE='#' -else - GTK_DOC_USE_REBASE_TRUE='#' - GTK_DOC_USE_REBASE_FALSE= +# Check whether --enable-doc was given. +if test "${enable_doc+set}" = set; then : + enableval=$enable_doc; fi +# Fallback to --with-tests and with-docs +# Check whether --with-tests was given. +if test "${with_tests+set}" = set; then : + withval=$with_tests; +fi +# Check whether --with-docs was given. +if test "${with_docs+set}" = set; then : + withval=$with_docs; +fi - - - - - # Check whether --enable-vala was given. -if test "${enable_vala+set}" = set; then : - enableval=$enable_vala; +if test -n "$with_tests"; then : + enable_tests="$with_tests" +fi +if test -n "$with_docs"; then : + enable_doc="$with_docs" +fi +# Default to --enable-tests and --disable-docs +if test -z "$enable_tests"; then : + enable_tests="yes" +fi +if test -z "$enable_doc"; then : + enable_doc="no" +fi +# Normalize values +if test "$enable_tests" != "yes" -a "$enable_tests" != "root"; then : + enable_tests="no" +fi +if test "$enable_doc" != "yes"; then : + enable_doc="no" +fi +# Add conditionals + if test "$enable_tests" != "no"; then + ENABLE_TESTS_TRUE= + ENABLE_TESTS_FALSE='#' else - enable_vala=auto + ENABLE_TESTS_TRUE='#' + ENABLE_TESTS_FALSE= fi - - case $enable_vala in #( - no) : - ;; #( - yes) : - - if test "x" != "xyes" -a "x$found_introspection" != "xyes"; then : - - as_fn_error $? "Vala bindings require GObject Introspection" "$LINENO" 5 - + if test "$enable_tests" == "root"; then + RUN_ROOT_TESTS_TRUE= + RUN_ROOT_TESTS_FALSE='#' +else + RUN_ROOT_TESTS_TRUE='#' + RUN_ROOT_TESTS_FALSE= fi - ;; #( - auto) : - - if test "x" != "xyes" -a "x$found_introspection" != "xyes"; then : - - enable_vala=no + if test "$enable_doc" = "yes"; then + ENABLE_DOC_TRUE= + ENABLE_DOC_FALSE='#' +else + ENABLE_DOC_TRUE='#' + ENABLE_DOC_FALSE= fi - ;; #( - *) : - as_fn_error $? "Invalid argument passed to --enable-vala, should be one of [no/auto/yes]" "$LINENO" 5 - ;; -esac +# Add gtk-doc conditionals +enable_gtk_doc="$enable_doc" - if test "x" = "x"; then : - vapigen_pkg_name=vapigen + # Extract the first word of "gtkdoc-check", so it can be a program name with args. +set dummy gtkdoc-check; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_path_GTKDOC_CHECK+:} false; then : + $as_echo_n "(cached) " >&6 else + case $GTKDOC_CHECK in + [\\/]* | ?:[\\/]*) + ac_cv_path_GTKDOC_CHECK="$GTKDOC_CHECK" # Let the user override the test with a path. + ;; + *) + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_path_GTKDOC_CHECK="$as_dir/$ac_word$ac_exec_ext" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS - vapigen_pkg_name=vapigen- - + ;; +esac fi - if test "x0.17.1.24" = "x"; then : - - vapigen_pkg="$vapigen_pkg_name" - +GTKDOC_CHECK=$ac_cv_path_GTKDOC_CHECK +if test -n "$GTKDOC_CHECK"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GTKDOC_CHECK" >&5 +$as_echo "$GTKDOC_CHECK" >&6; } else - - vapigen_pkg="$vapigen_pkg_name >= 0.17.1.24" - + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi - - - - - -if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then - if test -n "$ac_tool_prefix"; then - # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args. -set dummy ${ac_tool_prefix}pkg-config; ac_word=$2 + for ac_prog in gtkdoc-rebase +do + # Extract the first word of "$ac_prog", so it can be a program name with args. +set dummy $ac_prog; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_path_PKG_CONFIG+:} false; then : +if ${ac_cv_path_GTKDOC_REBASE+:} false; then : $as_echo_n "(cached) " >&6 else - case $PKG_CONFIG in + case $GTKDOC_REBASE in [\\/]* | ?:[\\/]*) - ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path. + ac_cv_path_GTKDOC_REBASE="$GTKDOC_REBASE" # Let the user override the test with a path. ;; *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR @@ -23319,7 +23374,7 @@ do test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" + ac_cv_path_GTKDOC_REBASE="$as_dir/$ac_word$ac_exec_ext" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi @@ -23330,29 +23385,30 @@ IFS=$as_save_IFS ;; esac fi -PKG_CONFIG=$ac_cv_path_PKG_CONFIG -if test -n "$PKG_CONFIG"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5 -$as_echo "$PKG_CONFIG" >&6; } +GTKDOC_REBASE=$ac_cv_path_GTKDOC_REBASE +if test -n "$GTKDOC_REBASE"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GTKDOC_REBASE" >&5 +$as_echo "$GTKDOC_REBASE" >&6; } else { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi -fi -if test -z "$ac_cv_path_PKG_CONFIG"; then - ac_pt_PKG_CONFIG=$PKG_CONFIG - # Extract the first word of "pkg-config", so it can be a program name with args. -set dummy pkg-config; ac_word=$2 + test -n "$GTKDOC_REBASE" && break +done +test -n "$GTKDOC_REBASE" || GTKDOC_REBASE="true" + + # Extract the first word of "gtkdoc-mkpdf", so it can be a program name with args. +set dummy gtkdoc-mkpdf; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_path_ac_pt_PKG_CONFIG+:} false; then : +if ${ac_cv_path_GTKDOC_MKPDF+:} false; then : $as_echo_n "(cached) " >&6 else - case $ac_pt_PKG_CONFIG in + case $GTKDOC_MKPDF in [\\/]* | ?:[\\/]*) - ac_cv_path_ac_pt_PKG_CONFIG="$ac_pt_PKG_CONFIG" # Let the user override the test with a path. + ac_cv_path_GTKDOC_MKPDF="$GTKDOC_MKPDF" # Let the user override the test with a path. ;; *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR @@ -23362,7 +23418,7 @@ do test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" + ac_cv_path_GTKDOC_MKPDF="$as_dir/$ac_word$ac_exec_ext" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi @@ -23373,133 +23429,210 @@ IFS=$as_save_IFS ;; esac fi -ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG -if test -n "$ac_pt_PKG_CONFIG"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_pt_PKG_CONFIG" >&5 -$as_echo "$ac_pt_PKG_CONFIG" >&6; } +GTKDOC_MKPDF=$ac_cv_path_GTKDOC_MKPDF +if test -n "$GTKDOC_MKPDF"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GTKDOC_MKPDF" >&5 +$as_echo "$GTKDOC_MKPDF" >&6; } else { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi - if test "x$ac_pt_PKG_CONFIG" = x; then - PKG_CONFIG="" - else - case $cross_compiling:$ac_tool_warned in -yes:) -{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 -$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} -ac_tool_warned=yes ;; -esac - PKG_CONFIG=$ac_pt_PKG_CONFIG - fi + + + +# Check whether --with-html-dir was given. +if test "${with_html_dir+set}" = set; then : + withval=$with_html_dir; +else + with_html_dir='${datadir}/gtk-doc/html' +fi + + HTML_DIR="$with_html_dir" + + + # Check whether --enable-gtk-doc was given. +if test "${enable_gtk_doc+set}" = set; then : + enableval=$enable_gtk_doc; +else + enable_gtk_doc=no +fi + + + if test x$enable_gtk_doc = xyes; then + if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gtk-doc >= 1.0\""; } >&5 + ($PKG_CONFIG --exists --print-errors "gtk-doc >= 1.0") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + : else - PKG_CONFIG="$ac_cv_path_PKG_CONFIG" + as_fn_error $? "You need to have gtk-doc >= 1.0 installed to build $PACKAGE_NAME" "$LINENO" 5 fi + if test "x$PACKAGE_NAME" != "xglib"; then + +pkg_failed=no +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GTKDOC_DEPS" >&5 +$as_echo_n "checking for GTKDOC_DEPS... " >&6; } +if test -n "$GTKDOC_DEPS_CFLAGS"; then + pkg_cv_GTKDOC_DEPS_CFLAGS="$GTKDOC_DEPS_CFLAGS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"glib-2.0 >= 2.10.0 gobject-2.0 >= 2.10.0\""; } >&5 + ($PKG_CONFIG --exists --print-errors "glib-2.0 >= 2.10.0 gobject-2.0 >= 2.10.0") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + pkg_cv_GTKDOC_DEPS_CFLAGS=`$PKG_CONFIG --cflags "glib-2.0 >= 2.10.0 gobject-2.0 >= 2.10.0" 2>/dev/null` +else + pkg_failed=yes fi -if test -n "$PKG_CONFIG"; then - _pkg_min_version=0.9.0 - { $as_echo "$as_me:${as_lineno-$LINENO}: checking pkg-config is at least version $_pkg_min_version" >&5 -$as_echo_n "checking pkg-config is at least version $_pkg_min_version... " >&6; } - if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } - else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } - PKG_CONFIG="" - fi + else + pkg_failed=untried fi - - if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$vapigen_pkg\""; } >&5 - ($PKG_CONFIG --exists --print-errors "$vapigen_pkg") 2>&5 +if test -n "$GTKDOC_DEPS_LIBS"; then + pkg_cv_GTKDOC_DEPS_LIBS="$GTKDOC_DEPS_LIBS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"glib-2.0 >= 2.10.0 gobject-2.0 >= 2.10.0\""; } >&5 + ($PKG_CONFIG --exists --print-errors "glib-2.0 >= 2.10.0 gobject-2.0 >= 2.10.0") 2>&5 ac_status=$? $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then + pkg_cv_GTKDOC_DEPS_LIBS=`$PKG_CONFIG --libs "glib-2.0 >= 2.10.0 gobject-2.0 >= 2.10.0" 2>/dev/null` +else + pkg_failed=yes +fi + else + pkg_failed=untried +fi - if test "$enable_vala" = "auto"; then : - enable_vala=yes -fi +if test $pkg_failed = yes; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then + _pkg_short_errors_supported=yes else + _pkg_short_errors_supported=no +fi + if test $_pkg_short_errors_supported = yes; then + GTKDOC_DEPS_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "glib-2.0 >= 2.10.0 gobject-2.0 >= 2.10.0" 2>&1` + else + GTKDOC_DEPS_PKG_ERRORS=`$PKG_CONFIG --print-errors "glib-2.0 >= 2.10.0 gobject-2.0 >= 2.10.0" 2>&1` + fi + # Put the nasty error message in config.log where it belongs + echo "$GTKDOC_DEPS_PKG_ERRORS" >&5 - case $enable_vala in #( - yes) : + as_fn_error $? "Package requirements (glib-2.0 >= 2.10.0 gobject-2.0 >= 2.10.0) were not met: - as_fn_error $? "$vapigen_pkg not found" "$LINENO" 5 - ;; #( - auto) : +$GTKDOC_DEPS_PKG_ERRORS - enable_vala=no - ;; #( - *) : - ;; -esac +Consider adjusting the PKG_CONFIG_PATH environment variable if you +installed software in a non-standard prefix. -fi +Alternatively, you may set the environment variables GTKDOC_DEPS_CFLAGS +and GTKDOC_DEPS_LIBS to avoid the need to call pkg-config. +See the pkg-config man page for more details." "$LINENO" 5 - case $enable_vala in #( - yes) : +elif test $pkg_failed = untried; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +as_fn_error $? "The pkg-config script could not be found or is too old. Make sure it +is in your PATH or set the PKG_CONFIG environment variable to the full +path to pkg-config. - VAPIGEN=`$PKG_CONFIG --variable=vapigen vapigen` - VAPIGEN_MAKEFILE=`$PKG_CONFIG --variable=datadir vapigen`/vala/Makefile.vapigen - if test "x" = "x"; then : +Alternatively, you may set the environment variables GTKDOC_DEPS_CFLAGS +and GTKDOC_DEPS_LIBS to avoid the need to call pkg-config. +See the pkg-config man page for more details. - VAPIGEN_VAPIDIR=`$PKG_CONFIG --variable=vapidir vapigen` +To get pkg-config, see . +See \`config.log' for more details" "$LINENO" 5; } else + GTKDOC_DEPS_CFLAGS=$pkg_cv_GTKDOC_DEPS_CFLAGS + GTKDOC_DEPS_LIBS=$pkg_cv_GTKDOC_DEPS_LIBS + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } - VAPIGEN_VAPIDIR=`$PKG_CONFIG --variable=vapidir_versioned vapigen` +fi + fi + fi + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build gtk-doc documentation" >&5 +$as_echo_n "checking whether to build gtk-doc documentation... " >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_gtk_doc" >&5 +$as_echo "$enable_gtk_doc" >&6; } + + # Check whether --enable-gtk-doc-html was given. +if test "${enable_gtk_doc_html+set}" = set; then : + enableval=$enable_gtk_doc_html; +else + enable_gtk_doc_html=yes fi - ;; #( - *) : - ;; -esac + # Check whether --enable-gtk-doc-pdf was given. +if test "${enable_gtk_doc_pdf+set}" = set; then : + enableval=$enable_gtk_doc_pdf; +else + enable_gtk_doc_pdf=no +fi + if test -z "$GTKDOC_MKPDF"; then + enable_gtk_doc_pdf=no + fi - if test "x$enable_vala" = "xyes"; then - ENABLE_VAPIGEN_TRUE= - ENABLE_VAPIGEN_FALSE='#' + if test x$enable_gtk_doc = xyes; then + ENABLE_GTK_DOC_TRUE= + ENABLE_GTK_DOC_FALSE='#' else - ENABLE_VAPIGEN_TRUE='#' - ENABLE_VAPIGEN_FALSE= + ENABLE_GTK_DOC_TRUE='#' + ENABLE_GTK_DOC_FALSE= fi + if test x$enable_gtk_doc_html = xyes; then + GTK_DOC_BUILD_HTML_TRUE= + GTK_DOC_BUILD_HTML_FALSE='#' +else + GTK_DOC_BUILD_HTML_TRUE='#' + GTK_DOC_BUILD_HTML_FALSE= +fi + if test x$enable_gtk_doc_pdf = xyes; then + GTK_DOC_BUILD_PDF_TRUE= + GTK_DOC_BUILD_PDF_FALSE='#' +else + GTK_DOC_BUILD_PDF_TRUE='#' + GTK_DOC_BUILD_PDF_FALSE= +fi - -# Check whether --with-tests was given. -if test "${with_tests+set}" = set; then : - withval=$with_tests; + if test -n "$LIBTOOL"; then + GTK_DOC_USE_LIBTOOL_TRUE= + GTK_DOC_USE_LIBTOOL_FALSE='#' +else + GTK_DOC_USE_LIBTOOL_TRUE='#' + GTK_DOC_USE_LIBTOOL_FALSE= fi - if test "x$with_tests" = "xyes"; then - WITH_TESTS_TRUE= - WITH_TESTS_FALSE='#' + if test -n "$GTKDOC_REBASE"; then + GTK_DOC_USE_REBASE_TRUE= + GTK_DOC_USE_REBASE_FALSE='#' else - WITH_TESTS_TRUE='#' - WITH_TESTS_FALSE= + GTK_DOC_USE_REBASE_TRUE='#' + GTK_DOC_USE_REBASE_FALSE= fi -case $with_tests in - yes) - with_tests=yes - ;; - *) - with_tests=no - ;; -esac -ac_config_files="$ac_config_files Makefile include/Makefile include/nm-version.h src/Makefile src/tests/Makefile src/generated/Makefile src/logging/Makefile src/posix-signals/Makefile src/dns-manager/Makefile src/vpn-manager/Makefile src/dhcp-manager/Makefile src/dhcp-manager/tests/Makefile src/ip6-manager/Makefile src/supplicant-manager/Makefile src/supplicant-manager/tests/Makefile src/ppp-manager/Makefile src/dnsmasq-manager/Makefile src/modem-manager/Makefile src/bluez-manager/Makefile src/wifi/Makefile src/firewall-manager/Makefile src/settings/Makefile src/settings/plugins/Makefile src/settings/plugins/ifupdown/Makefile src/settings/plugins/ifupdown/tests/Makefile src/settings/plugins/ifnet/Makefile src/settings/plugins/ifnet/tests/Makefile src/settings/plugins/ifcfg-rh/Makefile src/settings/plugins/ifcfg-rh/tests/Makefile src/settings/plugins/ifcfg-rh/tests/network-scripts/Makefile src/settings/plugins/ifcfg-suse/Makefile src/settings/plugins/keyfile/Makefile src/settings/plugins/keyfile/tests/Makefile src/settings/plugins/keyfile/tests/keyfiles/Makefile src/settings/plugins/example/Makefile src/settings/tests/Makefile src/wimax/Makefile src/backends/Makefile libnm-util/libnm-util.pc libnm-util/Makefile libnm-util/tests/Makefile libnm-util/tests/certs/Makefile libnm-glib/libnm-glib.pc libnm-glib/libnm-glib-vpn.pc libnm-glib/Makefile libnm-glib/tests/Makefile callouts/Makefile callouts/tests/Makefile tools/Makefile cli/Makefile cli/src/Makefile test/Makefile initscript/Makefile initscript/RedHat/Makefile initscript/RedHat/NetworkManager initscript/Gentoo/Makefile initscript/Gentoo/NetworkManager initscript/Debian/Makefile initscript/Debian/NetworkManager initscript/Slackware/Makefile initscript/Slackware/rc.networkmanager initscript/SUSE/Makefile initscript/SUSE/networkmanager initscript/Arch/Makefile initscript/Arch/networkmanager initscript/paldo/Makefile initscript/paldo/NetworkManager initscript/Mandriva/Makefile initscript/Mandriva/networkmanager initscript/linexa/Makefile initscript/linexa/networkmanager introspection/Makefile introspection/all.xml man/Makefile man/NetworkManager.8 man/NetworkManager.conf.5 man/nm-system-settings.conf.5 man/nm-tool.1 man/nm-online.1 man/nmcli.1 po/Makefile.in policy/Makefile data/Makefile docs/Makefile docs/api/Makefile docs/api/version.xml docs/libnm-glib/Makefile docs/libnm-glib/version.xml docs/libnm-util/Makefile docs/libnm-util/version.xml NetworkManager.pc examples/Makefile examples/shell/Makefile examples/python/Makefile examples/ruby/Makefile examples/C/Makefile examples/C/glib/Makefile examples/C/qt/Makefile vapi/Makefile" +ac_config_files="$ac_config_files Makefile include/Makefile include/nm-version.h src/Makefile src/tests/Makefile src/generated/Makefile src/logging/Makefile src/posix-signals/Makefile src/dns-manager/Makefile src/vpn-manager/Makefile src/dhcp-manager/Makefile src/dhcp-manager/tests/Makefile src/ip6-manager/Makefile src/supplicant-manager/Makefile src/supplicant-manager/tests/Makefile src/ppp-manager/Makefile src/dnsmasq-manager/Makefile src/modem-manager/Makefile src/bluez-manager/Makefile src/wifi/Makefile src/firewall-manager/Makefile src/settings/Makefile src/settings/plugins/Makefile src/settings/plugins/ifupdown/Makefile src/settings/plugins/ifupdown/tests/Makefile src/settings/plugins/ifnet/Makefile src/settings/plugins/ifnet/tests/Makefile src/settings/plugins/ifcfg-rh/Makefile src/settings/plugins/ifcfg-rh/tests/Makefile src/settings/plugins/ifcfg-rh/tests/network-scripts/Makefile src/settings/plugins/ifcfg-suse/Makefile src/settings/plugins/keyfile/Makefile src/settings/plugins/keyfile/tests/Makefile src/settings/plugins/keyfile/tests/keyfiles/Makefile src/settings/plugins/example/Makefile src/settings/tests/Makefile src/wimax/Makefile libnm-util/libnm-util.pc libnm-util/Makefile libnm-util/tests/Makefile libnm-util/tests/certs/Makefile libnm-glib/libnm-glib.pc libnm-glib/libnm-glib-vpn.pc libnm-glib/Makefile libnm-glib/tests/Makefile callouts/Makefile callouts/tests/Makefile tools/Makefile cli/Makefile cli/src/Makefile test/Makefile initscript/RedHat/NetworkManager initscript/Debian/NetworkManager initscript/Slackware/rc.networkmanager initscript/SUSE/networkmanager initscript/Arch/networkmanager initscript/paldo/NetworkManager initscript/Mandriva/networkmanager initscript/linexa/networkmanager introspection/Makefile introspection/all.xml man/Makefile man/NetworkManager.8 man/NetworkManager.conf.5 man/nm-system-settings.conf.5 man/nm-tool.1 man/nm-online.1 man/nmcli.1 po/Makefile.in policy/Makefile policy/org.freedesktop.NetworkManager.policy.in data/Makefile docs/Makefile docs/api/Makefile docs/api/version.xml docs/libnm-glib/Makefile docs/libnm-glib/version.xml docs/libnm-util/Makefile docs/libnm-util/version.xml NetworkManager.pc examples/Makefile examples/shell/Makefile examples/python/Makefile examples/ruby/Makefile examples/C/Makefile examples/C/glib/Makefile examples/C/qt/Makefile examples/dispatcher/Makefile vapi/Makefile" cat >confcache <<\_ACEOF # This file is a shell script that caches the results of configure @@ -23642,65 +23775,25 @@ fi ac_config_commands="$ac_config_commands po/stamp-it" -if test -z "${WITH_DOCS_TRUE}" && test -z "${WITH_DOCS_FALSE}"; then - as_fn_error $? "conditional \"WITH_DOCS\" was never defined. -Usually this means the macro was only invoked conditionally." "$LINENO" 5 -fi -if test -z "${TARGET_GENERIC_TRUE}" && test -z "${TARGET_GENERIC_FALSE}"; then - as_fn_error $? "conditional \"TARGET_GENERIC\" was never defined. -Usually this means the macro was only invoked conditionally." "$LINENO" 5 -fi -if test -z "${TARGET_REDHAT_TRUE}" && test -z "${TARGET_REDHAT_FALSE}"; then - as_fn_error $? "conditional \"TARGET_REDHAT\" was never defined. -Usually this means the macro was only invoked conditionally." "$LINENO" 5 -fi -if test -z "${TARGET_SUSE_TRUE}" && test -z "${TARGET_SUSE_FALSE}"; then - as_fn_error $? "conditional \"TARGET_SUSE\" was never defined. +if test -z "${CONFIG_PLUGIN_IFCFG_RH_TRUE}" && test -z "${CONFIG_PLUGIN_IFCFG_RH_FALSE}"; then + as_fn_error $? "conditional \"CONFIG_PLUGIN_IFCFG_RH\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi -if test -z "${TARGET_GENTOO_TRUE}" && test -z "${TARGET_GENTOO_FALSE}"; then - as_fn_error $? "conditional \"TARGET_GENTOO\" was never defined. +if test -z "${CONFIG_PLUGIN_IFCFG_SUSE_TRUE}" && test -z "${CONFIG_PLUGIN_IFCFG_SUSE_FALSE}"; then + as_fn_error $? "conditional \"CONFIG_PLUGIN_IFCFG_SUSE\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi -if test -z "${TARGET_DEBIAN_TRUE}" && test -z "${TARGET_DEBIAN_FALSE}"; then - as_fn_error $? "conditional \"TARGET_DEBIAN\" was never defined. +if test -z "${CONFIG_PLUGIN_IFUPDOWN_TRUE}" && test -z "${CONFIG_PLUGIN_IFUPDOWN_FALSE}"; then + as_fn_error $? "conditional \"CONFIG_PLUGIN_IFUPDOWN\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi -if test -z "${TARGET_SLACKWARE_TRUE}" && test -z "${TARGET_SLACKWARE_FALSE}"; then - as_fn_error $? "conditional \"TARGET_SLACKWARE\" was never defined. +if test -z "${CONFIG_PLUGIN_IFNET_TRUE}" && test -z "${CONFIG_PLUGIN_IFNET_FALSE}"; then + as_fn_error $? "conditional \"CONFIG_PLUGIN_IFNET\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi -if test -z "${TARGET_ARCH_TRUE}" && test -z "${TARGET_ARCH_FALSE}"; then - as_fn_error $? "conditional \"TARGET_ARCH\" was never defined. -Usually this means the macro was only invoked conditionally." "$LINENO" 5 -fi -if test -z "${TARGET_PALDO_TRUE}" && test -z "${TARGET_PALDO_FALSE}"; then - as_fn_error $? "conditional \"TARGET_PALDO\" was never defined. -Usually this means the macro was only invoked conditionally." "$LINENO" 5 -fi -if test -z "${TARGET_FRUGALWARE_TRUE}" && test -z "${TARGET_FRUGALWARE_FALSE}"; then - as_fn_error $? "conditional \"TARGET_FRUGALWARE\" was never defined. -Usually this means the macro was only invoked conditionally." "$LINENO" 5 -fi -if test -z "${TARGET_MANDRIVA_TRUE}" && test -z "${TARGET_MANDRIVA_FALSE}"; then - as_fn_error $? "conditional \"TARGET_MANDRIVA\" was never defined. -Usually this means the macro was only invoked conditionally." "$LINENO" 5 -fi -if test -z "${TARGET_PARDUS_TRUE}" && test -z "${TARGET_PARDUS_FALSE}"; then - as_fn_error $? "conditional \"TARGET_PARDUS\" was never defined. -Usually this means the macro was only invoked conditionally." "$LINENO" 5 -fi -if test -z "${TARGET_LINEXA_TRUE}" && test -z "${TARGET_LINEXA_FALSE}"; then - as_fn_error $? "conditional \"TARGET_LINEXA\" was never defined. -Usually this means the macro was only invoked conditionally." "$LINENO" 5 -fi -if test -z "${TARGET_EXHERBO_TRUE}" && test -z "${TARGET_EXHERBO_FALSE}"; then - as_fn_error $? "conditional \"TARGET_EXHERBO\" was never defined. -Usually this means the macro was only invoked conditionally." "$LINENO" 5 -fi -if test -z "${TARGET_LFS_TRUE}" && test -z "${TARGET_LFS_FALSE}"; then - as_fn_error $? "conditional \"TARGET_LFS\" was never defined. +if test -z "${CODE_COVERAGE_ENABLED_TRUE}" && test -z "${CODE_COVERAGE_ENABLED_FALSE}"; then + as_fn_error $? "conditional \"CODE_COVERAGE_ENABLED\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi if test -z "${WITH_WEXT_TRUE}" && test -z "${WITH_WEXT_FALSE}"; then @@ -23727,6 +23820,14 @@ if test -z "${SESSION_TRACKING_SYSTEMD_TRUE}" && test -z "${SESSION_TRACKING_SYS as_fn_error $? "conditional \"SESSION_TRACKING_SYSTEMD\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi +if test -z "${SUSPEND_RESUME_UPOWER_TRUE}" && test -z "${SUSPEND_RESUME_UPOWER_FALSE}"; then + as_fn_error $? "conditional \"SUSPEND_RESUME_UPOWER\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 +fi +if test -z "${SUSPEND_RESUME_SYSTEMD_TRUE}" && test -z "${SUSPEND_RESUME_SYSTEMD_FALSE}"; then + as_fn_error $? "conditional \"SUSPEND_RESUME_SYSTEMD\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 +fi if test -z "${WITH_WIMAX_TRUE}" && test -z "${WITH_WIMAX_FALSE}"; then as_fn_error $? "conditional \"WITH_WIMAX\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 @@ -23747,10 +23848,30 @@ if test -z "${WITH_PPP_TRUE}" && test -z "${WITH_PPP_FALSE}"; then as_fn_error $? "conditional \"WITH_PPP\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi +if test -z "${WITH_MODEM_MANAGER_1_TRUE}" && test -z "${WITH_MODEM_MANAGER_1_FALSE}"; then + as_fn_error $? "conditional \"WITH_MODEM_MANAGER_1\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 +fi if test -z "${WITH_CONCHECK_TRUE}" && test -z "${WITH_CONCHECK_FALSE}"; then as_fn_error $? "conditional \"WITH_CONCHECK\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi +if test -z "${ENABLE_VAPIGEN_TRUE}" && test -z "${ENABLE_VAPIGEN_FALSE}"; then + as_fn_error $? "conditional \"ENABLE_VAPIGEN\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 +fi +if test -z "${ENABLE_TESTS_TRUE}" && test -z "${ENABLE_TESTS_FALSE}"; then + as_fn_error $? "conditional \"ENABLE_TESTS\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 +fi +if test -z "${RUN_ROOT_TESTS_TRUE}" && test -z "${RUN_ROOT_TESTS_FALSE}"; then + as_fn_error $? "conditional \"RUN_ROOT_TESTS\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 +fi +if test -z "${ENABLE_DOC_TRUE}" && test -z "${ENABLE_DOC_FALSE}"; then + as_fn_error $? "conditional \"ENABLE_DOC\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 +fi if test -z "${ENABLE_GTK_DOC_TRUE}" && test -z "${ENABLE_GTK_DOC_FALSE}"; then as_fn_error $? "conditional \"ENABLE_GTK_DOC\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 @@ -23771,14 +23892,6 @@ if test -z "${GTK_DOC_USE_REBASE_TRUE}" && test -z "${GTK_DOC_USE_REBASE_FALSE}" as_fn_error $? "conditional \"GTK_DOC_USE_REBASE\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi -if test -z "${ENABLE_VAPIGEN_TRUE}" && test -z "${ENABLE_VAPIGEN_FALSE}"; then - as_fn_error $? "conditional \"ENABLE_VAPIGEN\" was never defined. -Usually this means the macro was only invoked conditionally." "$LINENO" 5 -fi -if test -z "${WITH_TESTS_TRUE}" && test -z "${WITH_TESTS_FALSE}"; then - as_fn_error $? "conditional \"WITH_TESTS\" was never defined. -Usually this means the macro was only invoked conditionally." "$LINENO" 5 -fi : "${CONFIG_STATUS=./config.status}" ac_write_fail=0 @@ -24188,7 +24301,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by NetworkManager $as_me 0.9.6.4, which was +This file was extended by NetworkManager $as_me 0.9.7.995, which was generated by GNU Autoconf 2.68. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -24254,7 +24367,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -NetworkManager config.status 0.9.6.4 +NetworkManager config.status 0.9.7.995 configured by $0, generated by GNU Autoconf 2.68, with options \\"\$ac_cs_config\\" @@ -24806,7 +24919,6 @@ do "src/settings/plugins/example/Makefile") CONFIG_FILES="$CONFIG_FILES src/settings/plugins/example/Makefile" ;; "src/settings/tests/Makefile") CONFIG_FILES="$CONFIG_FILES src/settings/tests/Makefile" ;; "src/wimax/Makefile") CONFIG_FILES="$CONFIG_FILES src/wimax/Makefile" ;; - "src/backends/Makefile") CONFIG_FILES="$CONFIG_FILES src/backends/Makefile" ;; "libnm-util/libnm-util.pc") CONFIG_FILES="$CONFIG_FILES libnm-util/libnm-util.pc" ;; "libnm-util/Makefile") CONFIG_FILES="$CONFIG_FILES libnm-util/Makefile" ;; "libnm-util/tests/Makefile") CONFIG_FILES="$CONFIG_FILES libnm-util/tests/Makefile" ;; @@ -24821,24 +24933,13 @@ do "cli/Makefile") CONFIG_FILES="$CONFIG_FILES cli/Makefile" ;; "cli/src/Makefile") CONFIG_FILES="$CONFIG_FILES cli/src/Makefile" ;; "test/Makefile") CONFIG_FILES="$CONFIG_FILES test/Makefile" ;; - "initscript/Makefile") CONFIG_FILES="$CONFIG_FILES initscript/Makefile" ;; - "initscript/RedHat/Makefile") CONFIG_FILES="$CONFIG_FILES initscript/RedHat/Makefile" ;; "initscript/RedHat/NetworkManager") CONFIG_FILES="$CONFIG_FILES initscript/RedHat/NetworkManager" ;; - "initscript/Gentoo/Makefile") CONFIG_FILES="$CONFIG_FILES initscript/Gentoo/Makefile" ;; - "initscript/Gentoo/NetworkManager") CONFIG_FILES="$CONFIG_FILES initscript/Gentoo/NetworkManager" ;; - "initscript/Debian/Makefile") CONFIG_FILES="$CONFIG_FILES initscript/Debian/Makefile" ;; "initscript/Debian/NetworkManager") CONFIG_FILES="$CONFIG_FILES initscript/Debian/NetworkManager" ;; - "initscript/Slackware/Makefile") CONFIG_FILES="$CONFIG_FILES initscript/Slackware/Makefile" ;; "initscript/Slackware/rc.networkmanager") CONFIG_FILES="$CONFIG_FILES initscript/Slackware/rc.networkmanager" ;; - "initscript/SUSE/Makefile") CONFIG_FILES="$CONFIG_FILES initscript/SUSE/Makefile" ;; "initscript/SUSE/networkmanager") CONFIG_FILES="$CONFIG_FILES initscript/SUSE/networkmanager" ;; - "initscript/Arch/Makefile") CONFIG_FILES="$CONFIG_FILES initscript/Arch/Makefile" ;; "initscript/Arch/networkmanager") CONFIG_FILES="$CONFIG_FILES initscript/Arch/networkmanager" ;; - "initscript/paldo/Makefile") CONFIG_FILES="$CONFIG_FILES initscript/paldo/Makefile" ;; "initscript/paldo/NetworkManager") CONFIG_FILES="$CONFIG_FILES initscript/paldo/NetworkManager" ;; - "initscript/Mandriva/Makefile") CONFIG_FILES="$CONFIG_FILES initscript/Mandriva/Makefile" ;; "initscript/Mandriva/networkmanager") CONFIG_FILES="$CONFIG_FILES initscript/Mandriva/networkmanager" ;; - "initscript/linexa/Makefile") CONFIG_FILES="$CONFIG_FILES initscript/linexa/Makefile" ;; "initscript/linexa/networkmanager") CONFIG_FILES="$CONFIG_FILES initscript/linexa/networkmanager" ;; "introspection/Makefile") CONFIG_FILES="$CONFIG_FILES introspection/Makefile" ;; "introspection/all.xml") CONFIG_FILES="$CONFIG_FILES introspection/all.xml" ;; @@ -24851,6 +24952,7 @@ do "man/nmcli.1") CONFIG_FILES="$CONFIG_FILES man/nmcli.1" ;; "po/Makefile.in") CONFIG_FILES="$CONFIG_FILES po/Makefile.in" ;; "policy/Makefile") CONFIG_FILES="$CONFIG_FILES policy/Makefile" ;; + "policy/org.freedesktop.NetworkManager.policy.in") CONFIG_FILES="$CONFIG_FILES policy/org.freedesktop.NetworkManager.policy.in" ;; "data/Makefile") CONFIG_FILES="$CONFIG_FILES data/Makefile" ;; "docs/Makefile") CONFIG_FILES="$CONFIG_FILES docs/Makefile" ;; "docs/api/Makefile") CONFIG_FILES="$CONFIG_FILES docs/api/Makefile" ;; @@ -24867,6 +24969,7 @@ do "examples/C/Makefile") CONFIG_FILES="$CONFIG_FILES examples/C/Makefile" ;; "examples/C/glib/Makefile") CONFIG_FILES="$CONFIG_FILES examples/C/glib/Makefile" ;; "examples/C/qt/Makefile") CONFIG_FILES="$CONFIG_FILES examples/C/qt/Makefile" ;; + "examples/dispatcher/Makefile") CONFIG_FILES="$CONFIG_FILES examples/dispatcher/Makefile" ;; "vapi/Makefile") CONFIG_FILES="$CONFIG_FILES vapi/Makefile" ;; "po/stamp-it") CONFIG_COMMANDS="$CONFIG_COMMANDS po/stamp-it" ;; @@ -26528,67 +26631,62 @@ $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;} fi +# Print build configuration echo -echo Distribution target: ${with_distro} -echo 'if this is not correct, please specifiy your distro with --with-distro=DISTRO' - +echo "System paths:" +echo " prefix: $prefix" +echo " exec_prefix: $exec_prefix" +echo " systemdunitdir: $with_systemdsystemunitdir" +echo " nmbinary: $nmbinary" +echo " nmconfdir: $nmconfdir" +echo " nmdatadir: $nmdatadir" +echo " nmstatedir: $nmstatedir" +echo " nmrundir: $nmrundir" echo -if test -n "${DHCLIENT_PATH}"; then - echo ISC dhclient support: ${DHCLIENT_PATH} - echo ISC dhclient version: ${DHCLIENT_VERSION} -else - echo ISC dhclient support: no -fi - -if test -n "${DHCPCD_PATH}"; then - echo dhcpcd support: ${DHCPCD_PATH} -else - echo dhcpcd support: no -fi - -if test -n "${with_systemdsystemunitdir}"; then - echo systemd unit support: ${with_systemdsystemunitdir} -else - echo systemd unit support: no -fi - +echo "Platform:" +echo " libnl: $with_libnl" +echo " session tracking: $with_session_tracking" +echo " suspend/resume: $with_suspend_resume" if test "${enable_polkit}" = "yes"; then - echo PolicyKit support: yes -else - echo PolicyKit support: no -fi - - echo Session tracking: ${with_session_tracking} - -if test "${enable_wimax}" = "yes"; then - echo WiMAX support: yes -else - echo WiMAX support: no -fi - -if test "${enable_ppp}" = "yes"; then - echo PPP support: yes + if test "${enable_modify_system}"; then + echo " policykit: yes (permissive modify.system)" + else + echo " policykit: yes (restrictive modify.system)" + fi else - echo PPP support: no + echo " policykit: no" fi +echo -if test "${enable_concheck}" = "yes"; then - echo Connectivity checking support: yes -else - echo Connectivity checking support: no -fi +echo "Features:" +echo " wext: $ac_with_wext" +echo " wimax: $enable_wimax" +echo " ppp: $enable_ppp" +echo " modemmanager-1: $with_modem_manager_1" +echo " concheck: $enable_concheck" +echo -echo libnl version: ${libnl_version} +echo "Configuration plugins" +echo " ifcfg-rh: ${enable_ifcfg_rh}" +echo " ifcfg-suse: ${enable_ifcfg_suse}" +echo " ifupdown: ${enable_ifupdown}" +echo " ifnet: ${enable_ifnet}" +echo -if test "${ac_with_wext}" = "yes"; then - echo WEXT support: yes -else - echo WEXT support: no -fi +echo "Handlers for /etc/resolv.conf:" +echo " resolvconf: ${with_resolvconf}" +echo " netconfig: ${with_netconfig}" +echo +echo "DHCP clients:" +echo " dhclient: $with_dhclient" +echo " dhcpcd: $with_dhcpcd" echo -echo Building documentation: ${with_docs} -echo Building tests: ${with_tests} + +echo "Miscellaneous:" +echo " documentation: $enable_doc" +echo " tests: $enable_tests" +echo " code coverage: $enable_code_coverage" echo diff --git a/configure.ac b/configure.ac index 91afabeb..dbbc1fdc 100644 --- a/configure.ac +++ b/configure.ac @@ -3,8 +3,8 @@ AC_PREREQ([2.63]) dnl The NM version number m4_define([nm_major_version], [0]) m4_define([nm_minor_version], [9]) -m4_define([nm_micro_version], [6]) -m4_define([nm_nano_version], [4]) +m4_define([nm_micro_version], [7]) +m4_define([nm_nano_version], [995]) m4_define([nm_version], [nm_major_version.nm_minor_version.nm_micro_version.nm_nano_version]) @@ -16,10 +16,9 @@ AC_CONFIG_HEADERS([config.h]) AC_CONFIG_MACRO_DIR([m4]) AC_CONFIG_AUX_DIR([build-aux]) -AM_INIT_AUTOMAKE([1.10 subdir-objects tar-ustar no-dist-gzip dist-bzip2 -Wno-portability]) +AM_INIT_AUTOMAKE([1.11 tar-ustar no-dist-gzip dist-bzip2 -Wno-portability]) AM_MAINTAINER_MODE([enable]) - -m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([no])]) +m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])]) dnl Define _SYSTEM_EXTENSIONS for various things like strcasestr() AC_USE_SYSTEM_EXTENSIONS @@ -38,14 +37,6 @@ dnl Initialize libtool LT_PREREQ([2.2]) LT_INIT([disable-static]) -dnl maintainer mode stuff -if test $USE_MAINTAINER_MODE = yes; then - DISABLE_DEPRECATED="-DG_DISABLE_DEPRECATED" -else - DISABLE_DEPRECATED="" -fi -AC_SUBST(DISABLE_DEPRECATED) - dnl Version stuff NM_MAJOR_VERSION=nm_major_version NM_MINOR_VERSION=nm_minor_version @@ -88,133 +79,47 @@ GETTEXT_PACKAGE=NetworkManager AC_SUBST(GETTEXT_PACKAGE) AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE,"$GETTEXT_PACKAGE", [Gettext package]) -dnl -dnl Documentation -dnl -AC_ARG_WITH(docs, AS_HELP_STRING([--with-docs], [Build NetworkManager documentation])) -AM_CONDITIONAL(WITH_DOCS, test "x$with_docs" = "xyes") -case $with_docs in - yes) - enable_gtk_doc=yes - ;; - *) - with_docs=no - ;; -esac - dnl dnl Make sha1.c happy on big endian systems dnl AC_C_BIGENDIAN -AC_ARG_WITH(distro, AS_HELP_STRING([--with-distro=DISTRO], [Specify the Linux distribution to target: One of redhat, suse, gentoo, debian, arch, slackware, paldo, mandriva, pardus, linexa, exherbo or lfs])) -if test "z$with_distro" = "z"; then - AC_CHECK_FILE(/etc/redhat-release,with_distro="redhat") - AC_CHECK_FILE(/etc/SuSE-release,with_distro="suse") - AC_CHECK_FILE(/etc/fedora-release,with_distro="redhat") - AC_CHECK_FILE(/etc/gentoo-release,with_distro="gentoo") - AC_CHECK_FILE(/etc/debian_version,with_distro="debian") - AC_CHECK_FILE(/etc/arch-release,with_distro="arch") - AC_CHECK_FILE(/etc/slackware-version,with_distro="slackware") - AC_CHECK_FILE(/etc/frugalware-release,with_distro="frugalware") - AC_CHECK_FILE(/etc/mandriva-release,with_distro="mandriva") - AC_CHECK_FILE(/etc/pardus-release,with_distro="pardus") - AC_CHECK_FILE(/etc/linexa-release,with_distro="linexa") - AC_CHECK_FILE(/etc/exherbo-release,with_distro="exherbo") - AC_CHECK_FILE(/etc/lfs-release,with_distro="lfs") - if test "z$with_distro" = "z"; then - with_distro=`lsb_release -is` - fi -fi -with_distro=`echo ${with_distro} | tr '[[:upper:]]' '[[:lower:]]' ` - -if test "z$with_distro" = "z"; then - echo "Linux distribution autodetection failed, you must specify the distribution to target using --with-distro=DISTRO" - exit 1 -else - case $with_distro in - redhat|suse|gentoo|debian|slackware|arch|paldo|frugalware|mandriva|pardus|linexa|exherbo|lfs|generic) ;; - *) - echo "Your distribution (${with_distro}) is not yet supported! (patches welcome)" - exit 1 - ;; - esac -fi - -AM_CONDITIONAL(TARGET_GENERIC, test x"$with_distro" = xgeneric) -if test x"$with_distro" = xgeneric; then - AC_DEFINE(TARGET_GENERIC, 1, [Define for a general unknown Linux system]) -fi - -AM_CONDITIONAL(TARGET_REDHAT, test x"$with_distro" = xredhat) -if test x"$with_distro" = xredhat; then - AC_DEFINE(TARGET_REDHAT, 1, [Define if you have Fedora or RHEL]) -fi - -AM_CONDITIONAL(TARGET_SUSE, test x"$with_distro" = xsuse) -if test x"$with_distro" = xsuse; then - AC_DEFINE(TARGET_SUSE, 1, [Define if you have OpenSUSE or SLES]) -fi - -AM_CONDITIONAL(TARGET_GENTOO, test x"$with_distro" = xgentoo) -if test x"$with_distro" = xgentoo; then - AC_DEFINE(TARGET_GENTOO, 1, [Define if you have Gentoo]) -fi - -AM_CONDITIONAL(TARGET_DEBIAN, test x"$with_distro" = xdebian) -if test x"$with_distro" = xdebian; then - AC_DEFINE(TARGET_DEBIAN, 1, [Define if you have Debian]) -fi - -AM_CONDITIONAL(TARGET_SLACKWARE, test x"$with_distro" = xslackware) -if test x"$with_distro" = xslackware; then - AC_DEFINE(TARGET_SLACKWARE, 1, [Define if you have Slackware]) -fi - -AM_CONDITIONAL(TARGET_ARCH, test x"$with_distro" = xarch) -if test x"$with_distro" = xarch; then - AC_DEFINE(TARGET_ARCH, 1, [Define if you have Arch]) -fi - -AM_CONDITIONAL(TARGET_PALDO, test x"$with_distro" = xpaldo) -if test x"$with_distro" = xpaldo; then - AC_DEFINE(TARGET_PALDO, 1, [Define if you have Paldo]) -fi - -AM_CONDITIONAL(TARGET_FRUGALWARE, test x"$with_distro" = xfrugalware) -if test x"$with_distro" = xfrugalware; then - AC_DEFINE(TARGET_FRUGALWARE, 1, [Define if you have Frugalware]) -fi - -AM_CONDITIONAL(TARGET_MANDRIVA, test x"$with_distro" = xmandriva) -if test x"$with_distro" = xmandriva; then - AC_DEFINE(TARGET_MANDRIVA, 1, [Define if you have Mandriva]) -fi - -AM_CONDITIONAL(TARGET_PARDUS, test x"$with_distro" = xpardus) -if test x"$with_distro" = xpardus; then - AC_DEFINE(TARGET_PARDUS, 1, [Define if you have Pardus]) -fi - -AM_CONDITIONAL(TARGET_LINEXA, test x"$with_distro" = xlinexa) -if test x"$with_distro" = xlinexa; then - AC_DEFINE(TARGET_LINEXA, 1, [Define if you have linexa]) -fi - -AM_CONDITIONAL(TARGET_EXHERBO, test x"$with_distro" = xexherbo) -if test x"$with_distro" = xexherbo; then - AC_DEFINE(TARGET_EXHERBO, 1, [Define if you have Exherbo]) -fi - -AM_CONDITIONAL(TARGET_LFS, test x"$with_distro" = xlfs) -if test x"$with_distro" = xlfs; then - AC_DEFINE(TARGET_LFS, 1, [Define if you have Linux From Scratch]) -fi +# NetworkManager paths +AC_SUBST(nmbinary, "$sbindir/$PACKAGE", [NetworkManager binary executable]) +AC_SUBST(nmconfdir, "$sysconfdir/$PACKAGE", [NetworkManager configuration directory]) +AC_SUBST(nmdatadir, "$datadir/$PACKAGE", [NetworkManager shared data directory]) +AC_SUBST(nmstatedir, "$localstatedir/lib/$PACKAGE", [NetworkManager persistent state directory]) +AC_SUBST(nmrundir, "$localstatedir/run/$PACKAGE", [NetworkManager runtime state directory]) + +# Alternative configuration plugins +AC_ARG_ENABLE(ifcfg-rh, AS_HELP_STRING([--enable-ifcfg-rh], [enable ifcfg-rh configuration plugin (Fedora/RHEL)])) +AC_ARG_ENABLE(ifcfg-suse, AS_HELP_STRING([--enable-ifcfg-suse], [enable ifcfg-suse configuration plugin (SUSE)])) +AC_ARG_ENABLE(ifupdown, AS_HELP_STRING([--enable-ifupdown], [enable ifupdown configuration plugin (Debian/Ubuntu)])) +AC_ARG_ENABLE(ifnet, AS_HELP_STRING([--enable-ifnet], [enable ifnet configuration plugin (Gentoo)])) +# Default alternative plugins by distribution +AS_IF([test -z "$enable_ifcfg_rh"], AC_CHECK_FILE(/etc/redhat-release, enable_ifcfg_rh=yes)) +AS_IF([test -z "$enable_ifcfg_rh"], AC_CHECK_FILE(/etc/fedora-release, enable_ifcfg_rh=yes)) +AS_IF([test -z "$enable_ifcfg_rh"], AC_CHECK_FILE(/etc/mandriva-release, enable_ifcfg_rh=yes)) +AS_IF([test -z "$enable_ifcfg_suse"], AC_CHECK_FILE(/etc/SuSE-release, enable_ifcfg_suse=yes)) +AS_IF([test -z "$enable_ifupdown"], AC_CHECK_FILE(/etc/debian_version, enable_ifupdown=yes)) +AS_IF([test -z "$enable_ifnet"], AC_CHECK_FILE(/etc/gentoo-release, enable_ifnet=yes)) +# Otherwise plugins default to "no" +AS_IF([test -z "$enable_ifcfg_rh"], enable_ifcfg_rh=no) +AS_IF([test -z "$enable_ifcfg_suse"], enable_ifcfg_suse=no) +AS_IF([test -z "$enable_ifupdown"], enable_ifupdown=no) +AS_IF([test -z "$enable_ifnet"], enable_ifnet=no) +# Create automake conditionals +AM_CONDITIONAL(CONFIG_PLUGIN_IFCFG_RH, test "$enable_ifcfg_rh" = "yes") +AM_CONDITIONAL(CONFIG_PLUGIN_IFCFG_SUSE, test "$enable_ifcfg_suse" = "yes") +AM_CONDITIONAL(CONFIG_PLUGIN_IFUPDOWN, test "$enable_ifupdown" = "yes") +AM_CONDITIONAL(CONFIG_PLUGIN_IFNET, test "$enable_ifnet" = "yes") +# Code coverage +GNOME_CODE_COVERAGE dnl dnl Distribution version string dnl -AC_ARG_WITH(dist-version, AS_HELP_STRING([--with-dist-version=], [Define the NM's distribution version string]), ac_distver=$withval, ac_distver="") +AC_ARG_WITH(dist-version, AS_HELP_STRING([--with-dist-version=], [Define the NM''s distribution version string]), ac_distver=$withval, ac_distver="") if ! test x"$ac_distver" = x""; then AC_DEFINE_UNQUOTED(NM_DIST_VERSION, "$ac_distver", [Define the distribution version string]) fi @@ -259,7 +164,7 @@ AC_COMPILE_IFELSE( #include #include #include ]], - [[int a = NL80211_RATE_INFO_BITRATE;]])], + [[int a = NL80211_RATE_INFO_BITRATE; a++;]])], [ac_have_nl80211=yes], [ac_have_nl80211=no]) AC_MSG_RESULT($ac_have_nl80211) @@ -310,27 +215,22 @@ PKG_CHECK_MODULES(DBUS, dbus-1 >= 1.1 dbus-glib-1 >= 0.94) AC_SUBST(DBUS_CFLAGS) AC_SUBST(DBUS_LIBS) +GLIB_VERSION_DEFINES="-DGLIB_VERSION_MIN_REQUIRED=GLIB_VERSION_2_26 '-DGLIB_VERSION_MAX_ALLOWED=G_ENCODE_VERSION(2,34)'" + # dbus-glib uses GValueArray, which is deprecated as of GLib 2.32. # Set GLIB_VERSION_MIN_REQUIRED to something less than that to avoid # getting warnings. (GLIB_VERSION_2_26 is the oldest defined version.) -DBUS_CFLAGS="$DBUS_CFLAGS -DGLIB_VERSION_MIN_REQUIRED=GLIB_VERSION_2_26" +DBUS_CFLAGS="$DBUS_CFLAGS $GLIB_VERSION_DEFINES" -PKG_CHECK_MODULES(GLIB, gthread-2.0 glib-2.0 >= 2.22 gobject-2.0) +PKG_CHECK_MODULES(GLIB, gio-unix-2.0 >= 2.22 gmodule-2.0) +GLIB_CFLAGS="$GLIB_CFLAGS $GLIB_VERSION_DEFINES" AC_SUBST(GLIB_CFLAGS) AC_SUBST(GLIB_LIBS) -PKG_CHECK_MODULES(GMODULE, gmodule-2.0) -AC_SUBST(GMODULE_CFLAGS) -AC_SUBST(GMODULE_LIBS) - -PKG_CHECK_MODULES(GUDEV, gudev-1.0 >= 147) +PKG_CHECK_MODULES(GUDEV, gudev-1.0 >= 165) AC_SUBST(GUDEV_CFLAGS) AC_SUBST(GUDEV_LIBS) -PKG_CHECK_MODULES(GIO, gio-2.0) -AC_SUBST(GIO_CFLAGS) -AC_SUBST(GIO_LIBS) - GOBJECT_INTROSPECTION_CHECK([0.9.6]) # Qt4 @@ -359,73 +259,104 @@ fi AC_SUBST(UDEV_BASE_DIR) # systemd unit support -AC_ARG_WITH([systemdsystemunitdir], - AS_HELP_STRING([--with-systemdsystemunitdir=DIR], [Directory for systemd service files]), - [], - [with_systemdsystemunitdir=$($PKG_CONFIG --variable=systemdsystemunitdir systemd)]) -if test "x$with_systemdsystemunitdir" != xno; then +AC_ARG_WITH([systemdsystemunitdir], AS_HELP_STRING([--with-systemdsystemunitdir=DIR], + [Directory for systemd service files])) +# default location +AS_IF([test -z "$with_systemdsystemunitdir" && $PKG_CONFIG systemd], + with_systemdsystemunitdir="\$(prefix)/lib/systemd/system") +AS_IF([test -z "$with_systemdsystemunitdir"], with_systemdsystemunitdir=no) +# add conditional and subst +AM_CONDITIONAL(HAVE_SYSTEMD, [test "$with_systemdsystemunitdir" != no]) +if test "$with_systemdsystemunitdir" != no; then AC_SUBST([systemdsystemunitdir], [$with_systemdsystemunitdir]) fi -AM_CONDITIONAL(HAVE_SYSTEMD, [test -n "$with_systemdsystemunitdir" -a "x$with_systemdsystemunitdir" != xno ]) -AC_ARG_WITH(session-tracking, AS_HELP_STRING([--with-session-tracking=systemd|ck|none], [Build NetworkManager with specific session tracking support])) -if test "z$with_session_tracking" = "z"; then - # Default to ConsoleKit session tracking like we used before - with_session_tracking=ck +# session tracking support +AC_MSG_CHECKING([Session tracking support]) +AC_ARG_WITH(session-tracking, AS_HELP_STRING([--with-session-tracking=systemd|consolekit|no], + [Select session tracking support (default: consolekit)])) +# default to consolekit +AS_IF([test -z "$with_session_tracking"], with_session_tracking=consolekit) +AS_IF([test "$with_session_tracking" = "ck"], with_session_tracking=consolekit) +AS_IF([test "$with_session_tracking" = "none"], with_session_tracking=no) +# check value +AS_IF([! (echo "$with_session_tracking" | grep -q -E "^(systemd|consolekit|no)$")], + AC_MSG_ERROR([--with-session-tracking must be systemd/consolekit/no, not $with_session_tracking])) +# add conditionals and subtitutions +AM_CONDITIONAL(SESSION_TRACKING_CK, test "$with_session_tracking" = "consolekit") +AM_CONDITIONAL(SESSION_TRACKING_SYSTEMD, test "xwith_session_tracking" = "systemd") +if test "$with_session_tracking" = "systemd"; then + PKG_CHECK_MODULES(SYSTEMD_LOGIN, [libsystemd-login]) + AC_SUBST(SYSTEMD_LOGIN_CFLAGS) + AC_SUBST(SYSTEMD_LOGIN_LIBS) +fi +if test "$with_session_tracking" = "consolekit"; then + AC_SUBST(CKDB_PATH, /var/run/ConsoleKit/database) +fi +AC_MSG_RESULT($with_session_tracking) + +AC_ARG_WITH(suspend-resume, AS_HELP_STRING([--with-suspend-resume=upower|systemd], [Build NetworkManager with specific suspend/resume support])) +if test "z$with_suspend_resume" = "z"; then + PKG_CHECK_EXISTS([systemd >= 183], [have_systemd_inhibit=yes], [have_systemd_inhibit=no]) + if test "z${have_systemd_inhibit}" = "zyes"; then + # Use systemd if it's new enough + with_suspend_resume="systemd" + else + # Fall back to upower + with_suspend_resume="upower" + fi fi -case $with_session_tracking in - ck|none|no) ;; +case $with_suspend_resume in + upower) ;; systemd) - PKG_CHECK_MODULES(SYSTEMD, [libsystemd-login]) + PKG_CHECK_MODULES(SYSTEMD_INHIBIT, [systemd >= 183]) ;; *) - AC_MSG_ERROR(--with-session-tracking must be one of [none, ck, systemd]) + AC_MSG_ERROR(--with-suspend-resume must be one of [upower, systemd]) ;; esac -AC_SUBST(SYSTEMD_CFLAGS) -AC_SUBST(SYSTEMD_LIBS) -AM_CONDITIONAL(SESSION_TRACKING_CK, test "x$with_session_tracking" = "xck") -AM_CONDITIONAL(SESSION_TRACKING_SYSTEMD, test "x$with_session_tracking" = "xsystemd") - - -have_libnl="no" -PKG_CHECK_MODULES(LIBNL3, libnl-3.0, [have_libnl3=yes], [have_libnl3=no]) -PKG_CHECK_MODULES(LIBNL_ROUTE3, libnl-route-3.0, [have_libnl_route3=yes], [have_libnl_route3=no]) -PKG_CHECK_MODULES(LIBNL_GENL3, libnl-genl-3.0, [have_libnl_genl3=yes], [have_libnl_genl3=no]) -if (test "${have_libnl3}" = "yes" -a "${have_libnl_route3}" = "yes" -a "${have_libnl_genl3}" = "yes"); then - AC_DEFINE(HAVE_LIBNL3, 1, [Define if you require specific libnl-3 support]) - LIBNL_CFLAGS="$LIBNL3_CFLAGS $LIBNL_ROUTE3_CFLAGS $LIBNL_GENL3_CFLAGS" - LIBNL_LIBS="$LIBNL3_LIBS $LIBNL_ROUTE3_LIBS $LIBNL_GENL3_LIBS" - libnl_version="3" - have_libnl="yes" -else - PKG_CHECK_MODULES(LIBNL2, libnl-2.0, [have_libnl2=yes], [have_libnl2=no]) - if (test "${have_libnl2}" = "yes"); then - AC_DEFINE(HAVE_LIBNL2, 1, [Define if you require specific libnl-2 support]) - LIBNL_CFLAGS="$LIBNL2_CFLAGS" - LIBNL_LIBS="$LIBNL2_LIBS" - libnl_version="2" - have_libnl="yes" - else - PKG_CHECK_MODULES(LIBNL1, libnl-1 >= 1.0-pre8, [have_libnl1=yes], [have_libnl1=no]) - if (test "${have_libnl1}" = "yes"); then - AC_DEFINE(HAVE_LIBNL1, 1, [Define if you require libnl-1 legacy support]) - LIBNL_CFLAGS="$LIBNL1_CFLAGS" - LIBNL_LIBS="$LIBNL1_LIBS" - libnl_version="1" - have_libnl="yes" - fi - fi -fi - -if (test "${have_libnl}" = "no"); then - AC_MSG_ERROR([libnl development header are required]) -fi -AC_SUBST(LIBNL_CFLAGS) -AC_SUBST(LIBNL_LIBS) - -if (test "${libnl_version}" = "1"); then +AM_CONDITIONAL(SUSPEND_RESUME_UPOWER, test "x$with_suspend_resume" = "xupower") +AM_CONDITIONAL(SUSPEND_RESUME_SYSTEMD, test "x$with_suspend_resume" = "xsystemd") + +# libnl support for the linux platform +AC_ARG_WITH(libnl, AS_HELP_STRING([--with-libnl=1|2|3], [Select libnl version (default: latest available)])) +# default to "yes" +AS_IF([test -z "$with_libnl"], with_libnl=yes) +# test for various libnl versions +if test "$with_libnl" = "yes" -o "$with_libnl" = "3"; then + PKG_CHECK_MODULES(LIBNL3, libnl-3.0 libnl-route-3.0 libnl-genl-3.0, + [with_libnl=3], [test "$with_libnl" = "3" && with_libnl=no]) + AS_IF([test "$with_libnl" = "no"], + AC_MSG_ERROR([libnl 3.x could not be found])) +fi +if test "$with_libnl" = "yes" -o "$with_libnl" = "2"; then + PKG_CHECK_MODULES(LIBNL2, libnl-2.0, + [with_libnl=2], [test "$with_libnl" = "2" && with_libnl=no]) + AS_IF([test "$with_libnl" = "no"], + AC_MSG_ERROR([libnl 2.x could not be found])) +fi +if test "$with_libnl" = "yes" -o "$with_libnl" = "1"; then + PKG_CHECK_MODULES(LIBNL1, libnl-1 >= 1.0-pre8, + [with_libnl=1], [test "$with_libnl" = "1" && with_libnl=no]) + AS_IF([test "$with_libnl" = "no"], + AC_MSG_ERROR([libnl 1.x could not be found])) +fi +if test "$with_libnl" = "yes"; then + AC_MSG_ERROR([libnl library could not be found]) + with_libnl=no +fi +if ! echo "$with_libnl" | grep -q "^[[1-3]]$"; then + AC_MSG_ERROR([unsupported libnl version: $with_libnl]) +fi +# add variables, conditionals and defines +if test "$with_libnl" != "no"; then + AC_DEFINE_UNQUOTED(HAVE_LIBNL, $with_libnl, [libnl version]) + AC_SUBST(LIBNL_CFLAGS, "$LIBNL3_CFLAGS$LIBNL2_CFLAGS$LIBNL1_CFLAGS") + AC_SUBST(LIBNL_LIBS, "$LIBNL3_LIBS$LIBNL2_LIBS$LIBNL1_LIBS") +fi +# additional tests +if test "with_libnl" = "1"; then NM_LIBNL_CHECK fi @@ -464,6 +395,18 @@ else fi AM_CONDITIONAL(WITH_POLKIT, test "${enable_polkit}" = "yes") +AC_ARG_ENABLE(modify-system, + AS_HELP_STRING([--enable-modify-system], [Allow users to modify system connections])) +if test "${enable_modify_system}" = "yes"; then + if ! test "${enable_polkit}" = "yes"; then + AC_MSG_ERROR([--enable-modify-system requires --enable-polkit]) + fi + NM_MODIFY_SYSTEM_POLICY="yes" +else + NM_MODIFY_SYSTEM_POLICY="auth_admin_keep" +fi +AC_SUBST(NM_MODIFY_SYSTEM_POLICY) + AC_ARG_WITH(crypto, AS_HELP_STRING([--with-crypto=nss|gnutls], [Cryptography library to use for certificate and key operations]),ac_crypto=$withval, ac_crypto=nss) with_nss=no @@ -531,7 +474,7 @@ AC_ARG_ENABLE(ppp, AS_HELP_STRING([--enable-ppp], [enable PPP/PPPoE support]), [enable_ppp=${enableval}], [enable_ppp=yes]) if (test "${enable_ppp}" = "yes"); then AC_CHECK_HEADERS(pppd/pppd.h,, - AC_MSG_ERROR(couldn't find pppd.h. pppd development headers are required.)) + AC_MSG_ERROR("couldn't find pppd.h. pppd development headers are required.")) AC_DEFINE(WITH_PPP, 1, [Define if you have PPP support]) else @@ -548,115 +491,91 @@ else fi AC_SUBST(PPPD_PLUGIN_DIR) +# ModemManager1 with libmm-glib +AC_ARG_WITH(modem-manager-1, AS_HELP_STRING([--with-modem-manager-1], [Enable new ModemManager1 interface support]),,[with_modem_manager_1=auto]) +if (test "${with_modem_manager_1}" != "no"); then + PKG_CHECK_MODULES(MM_GLIB, + [mm-glib], + [have_libmm_glib=yes], + [have_libmm_glib=no]) + AC_SUBST(MM_GLIB_CFLAGS) + AC_SUBST(MM_GLIB_LIBS) + + if (test "${have_libmm_glib}" = "no"); then + if (test "${with_modem_manager_1}" = "yes"); then + AC_MSG_ERROR([Couldn't find libmm-glib]) + fi + else + with_modem_manager_1="yes" + fi +fi -# dhclient support -AC_ARG_WITH([dhclient], AS_HELP_STRING([--with-dhclient=yes|no|path], [Enable dhclient 4.x support])) -# If a full path is given, use that and do not test if it works or not. -case "${with_dhclient}" in - # NM only works with ISC dhclient - other derivatives don't have - # the same userland. dhclient 4.x is required for IPv6 support; - # with older versions NM won't be able to use DHCPv6. - - /*) - DHCLIENT_PATH="${with_dhclient}" - DHCLIENT_VERSION=4 - if test -x "${with_dhclient}"; then - case `"${with_dhclient}" --version 2>&1` in - "isc-dhclient-4"*) DHCLIENT_VERSION=4; break;; - "isc-dhclient-V3"*) DHCLIENT_VERSION=3; break;; - esac - fi - AC_MSG_NOTICE(using dhclient at ${DHCLIENT_PATH}) - ;; - no) AC_MSG_NOTICE(dhclient support disabled) - ;; - *) - AC_MSG_CHECKING(for dhclient) - for path in /sbin /usr/sbin /usr/pkg/sbin /usr/local/sbin; do - test -x "${path}/dhclient" || continue - case `"$path/dhclient" --version 2>&1` in - "isc-dhclient-4"*) DHCLIENT_PATH="$path/dhclient"; DHCLIENT_VERSION=4; break;; - "isc-dhclient-V3"*) DHCLIENT_PATH="$path/dhclient"; DHCLIENT_VERSION=3; break;; - esac - done - if test -n "${DHCLIENT_PATH}"; then - AC_MSG_RESULT($DHCLIENT_PATH) - else - AC_MSG_RESULT(no) - fi - ;; -esac +if (test "${with_modem_manager_1}" = "yes"); then + AC_DEFINE(WITH_MODEM_MANAGER_1, 1, [Define if you have ModemManager1 support]) +else + AC_DEFINE(WITH_MODEM_MANAGER_1, 0, [Define if you have ModemManager1 support]) +fi +AM_CONDITIONAL(WITH_MODEM_MANAGER_1, test "${with_modem_manager_1}" = "yes") -# dhcpcd support +# DHCP client support +AC_ARG_WITH([dhclient], AS_HELP_STRING([--with-dhclient=yes|no|path], [Enable dhclient 4.x support])) AC_ARG_WITH([dhcpcd], AS_HELP_STRING([--with-dhcpcd=yes|no|path], [Enable dhcpcd 4.x support])) -# If a full path is given, use that and do not test if it works or not. -case "${with_dhcpcd}" in - /*) - DHCPCD_PATH="${with_dhcpcd}" - AC_MSG_NOTICE(using dhcpcd at ${DHCPCD_PATH}) - ;; - no) AC_MSG_NOTICE(dhcpcd support disabled) - ;; - *) - AC_MSG_CHECKING(for dhcpcd) - # We fully work with upstream dhcpcd-4 - for path in /sbin /usr/sbin /usr/pkg/sbin /usr/local/sbin; do - test -x "${path}/dhcpcd" || continue - case `"$path/dhcpcd" --version 2>/dev/null` in - "dhcpcd "[123]*);; - "dhcpcd "*) DHCPCD_PATH="$path/dhcpcd"; break;; - esac - done - if test -n "${DHCPCD_PATH}"; then - AC_MSG_RESULT($DHCPCD_PATH) - else - AC_MSG_RESULT(no) +# Default to "yes" +AS_IF([test -z "$with_dhclient"], with_dhclient=yes) +AS_IF([test -z "$with_dhcpcd"], with_dhcpcd=yes) +# Search and check the executables +if test "$with_dhclient" = "yes"; then + AC_PATH_PROGS(with_dhclient, dhclient, no, /sbin:/usr/sbin:/usr/local/sbin) + if test "$with_dhclient" != "no"; then + if ! $with_dhclient --version 2>&1 | grep -q "^isc-dhclient-4\."; then + AC_MSG_WARN([Cannot use dhclient, version 4.x is required]) + with_dhclient=no fi - ;; -esac - -if test -z "$DHCPCD_PATH" -a -z "$DHCLIENT_PATH"; then - # DHCP clients are not a build time dependency, only runtime. - # dhclient has been the longtime default for NM and it's in /sbin - # in most distros, so use it. - AC_MSG_WARN([Could not find a suitable DHCP client]) - DHCLIENT_PATH=/sbin/dhclient - AC_MSG_WARN([Falling back to ISC dhclient, ${DHCLIENT_PATH}]) -fi -AC_SUBST(DHCLIENT_PATH) -AC_SUBST(DHCLIENT_VERSION) -AC_SUBST(DHCPCD_PATH) - -# resolvconf support -AC_ARG_WITH([resolvconf], - AS_HELP_STRING([--with-resolvconf=yes|no|path], [Enable resolvconf support]), - with_resolvconf="$withval",with_resolvconf=no) -# If a full path is given, use that and do not test if it works or not. -case "${with_resolvconf}" in - /*) - RESOLVCONF_PATH="${with_resolvconf}" - AC_MSG_NOTICE(setting resolvconf path to ${RESOLVCONF_PATH}) - ;; - no) AC_MSG_NOTICE(resolvconf support disabled) - ;; - *) - AC_MSG_CHECKING(for resolvconf) - for path in /sbin /usr/sbin /usr/pkg/sbin /usr/local/sbin; do - if test -x "${path}/resolvconf"; then - RESOLVCONF_PATH="${path}/resolvconf" - break - fi - done - if test -n "${RESOLVCONF_PATH}"; then - AC_MSG_RESULT($RESOLVCONF_PATH) - else - AC_MSG_RESULT(no) + fi +fi +if test "$with_dhcpcd" = "yes"; then + AC_PATH_PROGS(with_dhcpcd, dhcpcd, no, /sbin:/usr/sbin:/usr/local/sbin) + if test "$with_dhcpcd" != "no"; then + if ! $with_dhcpcd --version 2>&1 | grep -q "^dhcpcd [[45]]\."; then + AC_MSG_WARN([Cannot use dhcpcd, version 4.x or 5.x is required]) + with_dhcpcd=no fi - ;; -esac -AC_SUBST(RESOLVCONF_PATH) -if test -n "${RESOLVCONF_PATH}"; then - AC_DEFINE_UNQUOTED(RESOLVCONF_PATH, "$RESOLVCONF_PATH", [Define if you have a resolvconf implementation]) + fi +fi +# Fallback +if test "$with_dhclient" = "no" -a "$with_dhcpcd" = "no"; then + AC_MSG_WARN([Could not find a suitable DHCP client, falling back to dhclient]) + with_dhclient=/sbin/dhclient +fi +# Add substitutions +if test "$with_dhclient" != "no"; then + AC_SUBST(DHCLIENT_PATH, $with_dhclient) +fi +if test "$with_dhcpcd" != "no"; then + AC_SUBST(DHCPCD_PATH, $with_dhcpcd) +fi + +# resolvconf and netconfig support +AC_ARG_WITH(resolvconf, AS_HELP_STRING([--with-resolvconf=yes|no|path], [Enable resolvconf support])) +AC_ARG_WITH(netconfig, AS_HELP_STRING([--with-netconfig=yes|no], [Enable SUSE netconfig support])) +# Use netconfig by default on SUSE +AS_IF([test -z "$with_netconfig"], AC_CHECK_FILE(/etc/SuSE-release, with_netconfig=yes)) +# Otherwise default to "no" +AS_IF([test -z "$with_resolvconf"], with_resolvconf=no) +AS_IF([test -z "$with_netconfig"], with_netconfig=no) +# Find resolvconf and netconfig +if test "$with_resolvconf" = "yes"; then + AC_PATH_PROGS(with_resolvconf, resolvconf, no, /sbin:/usr/sbin:/usr/local/sbin) +fi +if test "$with_netconfig" = "yes"; then + AC_PATH_PROGS(with_netconfig, netconfig, no, /sbin:/usr/sbin:/usr/local/sbin) +fi +# Define resolvconf and netconfig paths +if test "$with_resolvconf" != "no"; then + AC_DEFINE_UNQUOTED(RESOLVCONF_PATH, "$with_resolvconf", [Path to resolvconf (if enabled)]) +fi +if test "$with_netconfig" != "no"; then + AC_DEFINE_UNQUOTED(NETCONFIG_PATH, "$with_netconfig", [Path to netconfig (if enabled)]) fi # iptables path @@ -716,29 +635,33 @@ AM_CONDITIONAL(WITH_CONCHECK, test "${enable_concheck}" = "yes") NM_COMPILER_WARNINGS -GTK_DOC_CHECK(1.0) - - dnl ------------------------- dnl Vala bindings dnl ------------------------- VAPIGEN_CHECK(0.17.1.24) -dnl -dnl Tests -dnl -AC_ARG_WITH(tests, AS_HELP_STRING([--with-tests], [Build NetworkManager tests])) -AM_CONDITIONAL(WITH_TESTS, test "x$with_tests" = "xyes") -case $with_tests in - yes) - with_tests=yes - ;; - *) - with_tests=no - ;; -esac - +# Tests, utilities and documentation +AC_ARG_ENABLE(tests, AS_HELP_STRING([--enable-tests=root|yes|no], [Build NetworkManager tests (default: yes)])) +AC_ARG_ENABLE(doc, AS_HELP_STRING([--enable-doc], [Build NetworkManager documentation (default: no)])) +# Fallback to --with-tests and with-docs +AC_ARG_WITH(tests, AS_HELP_STRING([--with-tests], [Build NetworkManager tests (deprecated)])) +AC_ARG_WITH(docs, AS_HELP_STRING([--with-docs], [Build NetworkManager documentation (deprecated)])) +AS_IF([test -n "$with_tests"], enable_tests="$with_tests") +AS_IF([test -n "$with_docs"], enable_doc="$with_docs") +# Default to --enable-tests and --disable-docs +AS_IF([test -z "$enable_tests"], enable_tests="yes") +AS_IF([test -z "$enable_doc"], enable_doc="no") +# Normalize values +AS_IF([test "$enable_tests" != "yes" -a "$enable_tests" != "root"], enable_tests="no") +AS_IF([test "$enable_doc" != "yes"], enable_doc="no") +# Add conditionals +AM_CONDITIONAL(ENABLE_TESTS, test "$enable_tests" != "no") +AM_CONDITIONAL(RUN_ROOT_TESTS, test "$enable_tests" == "root") +AM_CONDITIONAL(ENABLE_DOC, test "$enable_doc" = "yes") +# Add gtk-doc conditionals +enable_gtk_doc="$enable_doc" +GTK_DOC_CHECK(1.0) AC_CONFIG_FILES([ Makefile @@ -778,7 +701,6 @@ src/settings/plugins/keyfile/tests/keyfiles/Makefile src/settings/plugins/example/Makefile src/settings/tests/Makefile src/wimax/Makefile -src/backends/Makefile libnm-util/libnm-util.pc libnm-util/Makefile libnm-util/tests/Makefile @@ -793,24 +715,13 @@ tools/Makefile cli/Makefile cli/src/Makefile test/Makefile -initscript/Makefile -initscript/RedHat/Makefile initscript/RedHat/NetworkManager -initscript/Gentoo/Makefile -initscript/Gentoo/NetworkManager -initscript/Debian/Makefile initscript/Debian/NetworkManager -initscript/Slackware/Makefile initscript/Slackware/rc.networkmanager -initscript/SUSE/Makefile initscript/SUSE/networkmanager -initscript/Arch/Makefile initscript/Arch/networkmanager -initscript/paldo/Makefile initscript/paldo/NetworkManager -initscript/Mandriva/Makefile initscript/Mandriva/networkmanager -initscript/linexa/Makefile initscript/linexa/networkmanager introspection/Makefile introspection/all.xml @@ -823,6 +734,7 @@ man/nm-online.1 man/nmcli.1 po/Makefile.in policy/Makefile +policy/org.freedesktop.NetworkManager.policy.in data/Makefile docs/Makefile docs/api/Makefile @@ -839,71 +751,67 @@ examples/ruby/Makefile examples/C/Makefile examples/C/glib/Makefile examples/C/qt/Makefile +examples/dispatcher/Makefile vapi/Makefile ]) AC_OUTPUT +# Print build configuration +echo +echo "System paths:" +echo " prefix: $prefix" +echo " exec_prefix: $exec_prefix" +echo " systemdunitdir: $with_systemdsystemunitdir" +echo " nmbinary: $nmbinary" +echo " nmconfdir: $nmconfdir" +echo " nmdatadir: $nmdatadir" +echo " nmstatedir: $nmstatedir" +echo " nmrundir: $nmrundir" echo -echo Distribution target: ${with_distro} -echo 'if this is not correct, please specifiy your distro with --with-distro=DISTRO' - -echo - -if test -n "${DHCLIENT_PATH}"; then - echo ISC dhclient support: ${DHCLIENT_PATH} - echo ISC dhclient version: ${DHCLIENT_VERSION} -else - echo ISC dhclient support: no -fi - -if test -n "${DHCPCD_PATH}"; then - echo dhcpcd support: ${DHCPCD_PATH} -else - echo dhcpcd support: no -fi - -if test -n "${with_systemdsystemunitdir}"; then - echo systemd unit support: ${with_systemdsystemunitdir} -else - echo systemd unit support: no -fi +echo "Platform:" +echo " libnl: $with_libnl" +echo " session tracking: $with_session_tracking" +echo " suspend/resume: $with_suspend_resume" if test "${enable_polkit}" = "yes"; then - echo PolicyKit support: yes -else - echo PolicyKit support: no -fi - - echo Session tracking: ${with_session_tracking} - -if test "${enable_wimax}" = "yes"; then - echo WiMAX support: yes -else - echo WiMAX support: no -fi - -if test "${enable_ppp}" = "yes"; then - echo PPP support: yes + if test "${enable_modify_system}"; then + echo " policykit: yes (permissive modify.system)" + else + echo " policykit: yes (restrictive modify.system)" + fi else - echo PPP support: no + echo " policykit: no" fi +echo -if test "${enable_concheck}" = "yes"; then - echo Connectivity checking support: yes -else - echo Connectivity checking support: no -fi +echo "Features:" +echo " wext: $ac_with_wext" +echo " wimax: $enable_wimax" +echo " ppp: $enable_ppp" +echo " modemmanager-1: $with_modem_manager_1" +echo " concheck: $enable_concheck" +echo -echo libnl version: ${libnl_version} +echo "Configuration plugins" +echo " ifcfg-rh: ${enable_ifcfg_rh}" +echo " ifcfg-suse: ${enable_ifcfg_suse}" +echo " ifupdown: ${enable_ifupdown}" +echo " ifnet: ${enable_ifnet}" +echo -if test "${ac_with_wext}" = "yes"; then - echo WEXT support: yes -else - echo WEXT support: no -fi +echo "Handlers for /etc/resolv.conf:" +echo " resolvconf: ${with_resolvconf}" +echo " netconfig: ${with_netconfig}" +echo +echo "DHCP clients:" +echo " dhclient: $with_dhclient" +echo " dhcpcd: $with_dhcpcd" echo -echo Building documentation: ${with_docs} -echo Building tests: ${with_tests} + +echo "Miscellaneous:" +echo " documentation: $enable_doc" +echo " tests: $enable_tests" +echo " code coverage: $enable_code_coverage" echo diff --git a/data/Makefile.in b/data/Makefile.in index 91a51b3e..9cfda94d 100644 --- a/data/Makefile.in +++ b/data/Makefile.in @@ -55,16 +55,18 @@ subdir = data DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/compiler_warnings.m4 \ - $(top_srcdir)/m4/gettext.m4 $(top_srcdir)/m4/gtk-doc.m4 \ - $(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/intlmacosx.m4 \ - $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/introspection.m4 \ - $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \ - $(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/libnl-check.m4 \ - $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ - $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ - $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/nls.m4 \ - $(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/progtest.m4 \ - $(top_srcdir)/m4/vapigen.m4 $(top_srcdir)/configure.ac + $(top_srcdir)/m4/gettext.m4 \ + $(top_srcdir)/m4/gnome-code-coverage.m4 \ + $(top_srcdir)/m4/gtk-doc.m4 $(top_srcdir)/m4/iconv.m4 \ + $(top_srcdir)/m4/intlmacosx.m4 $(top_srcdir)/m4/intltool.m4 \ + $(top_srcdir)/m4/introspection.m4 $(top_srcdir)/m4/lib-ld.m4 \ + $(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \ + $(top_srcdir)/m4/libnl-check.m4 $(top_srcdir)/m4/libtool.m4 \ + $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ + $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ + $(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/po.m4 \ + $(top_srcdir)/m4/progtest.m4 $(top_srcdir)/m4/vapigen.m4 \ + $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(install_sh) -d @@ -127,6 +129,10 @@ AWK = @AWK@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ +CKDB_PATH = @CKDB_PATH@ +CODE_COVERAGE_CFLAGS = @CODE_COVERAGE_CFLAGS@ +CODE_COVERAGE_ENABLED = @CODE_COVERAGE_ENABLED@ +CODE_COVERAGE_LDFLAGS = @CODE_COVERAGE_LDFLAGS@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CXX = @CXX@ @@ -141,9 +147,7 @@ DBUS_SYS_DIR = @DBUS_SYS_DIR@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DHCLIENT_PATH = @DHCLIENT_PATH@ -DHCLIENT_VERSION = @DHCLIENT_VERSION@ DHCPCD_PATH = @DHCPCD_PATH@ -DISABLE_DEPRECATED = @DISABLE_DEPRECATED@ DLLTOOL = @DLLTOOL@ DSYMUTIL = @DSYMUTIL@ DUMPBIN = @DUMPBIN@ @@ -153,17 +157,14 @@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ +GENHTML = @GENHTML@ GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ -GIO_CFLAGS = @GIO_CFLAGS@ -GIO_LIBS = @GIO_LIBS@ GLIB_CFLAGS = @GLIB_CFLAGS@ GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ GLIB_LIBS = @GLIB_LIBS@ GLIB_MAKEFILE = @GLIB_MAKEFILE@ GLIB_MKENUMS = @GLIB_MKENUMS@ -GMODULE_CFLAGS = @GMODULE_CFLAGS@ -GMODULE_LIBS = @GMODULE_LIBS@ GMSGFMT = @GMSGFMT@ GMSGFMT_015 = @GMSGFMT_015@ GNUTLS_CFLAGS = @GNUTLS_CFLAGS@ @@ -204,6 +205,7 @@ IPTABLES_PATH = @IPTABLES_PATH@ IWMX_SDK_CFLAGS = @IWMX_SDK_CFLAGS@ IWMX_SDK_LIBS = @IWMX_SDK_LIBS@ KERNEL_FIRMWARE_DIR = @KERNEL_FIRMWARE_DIR@ +LCOV = @LCOV@ LD = @LD@ LDFLAGS = @LDFLAGS@ LIBDL = @LIBDL@ @@ -220,11 +222,7 @@ LIBNL2_LIBS = @LIBNL2_LIBS@ LIBNL3_CFLAGS = @LIBNL3_CFLAGS@ LIBNL3_LIBS = @LIBNL3_LIBS@ LIBNL_CFLAGS = @LIBNL_CFLAGS@ -LIBNL_GENL3_CFLAGS = @LIBNL_GENL3_CFLAGS@ -LIBNL_GENL3_LIBS = @LIBNL_GENL3_LIBS@ LIBNL_LIBS = @LIBNL_LIBS@ -LIBNL_ROUTE3_CFLAGS = @LIBNL_ROUTE3_CFLAGS@ -LIBNL_ROUTE3_LIBS = @LIBNL_ROUTE3_LIBS@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ LIBSOUP_CFLAGS = @LIBSOUP_CFLAGS@ @@ -239,6 +237,8 @@ MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MANIFEST_TOOL = @MANIFEST_TOOL@ MKDIR_P = @MKDIR_P@ +MM_GLIB_CFLAGS = @MM_GLIB_CFLAGS@ +MM_GLIB_LIBS = @MM_GLIB_LIBS@ MOC = @MOC@ MSGFMT = @MSGFMT@ MSGFMT_015 = @MSGFMT_015@ @@ -248,6 +248,7 @@ NMEDIT = @NMEDIT@ NM_MAJOR_VERSION = @NM_MAJOR_VERSION@ NM_MICRO_VERSION = @NM_MICRO_VERSION@ NM_MINOR_VERSION = @NM_MINOR_VERSION@ +NM_MODIFY_SYSTEM_POLICY = @NM_MODIFY_SYSTEM_POLICY@ NM_VERSION = @NM_VERSION@ NSS_CFLAGS = @NSS_CFLAGS@ NSS_LIBS = @NSS_LIBS@ @@ -274,13 +275,14 @@ PPPD_PLUGIN_DIR = @PPPD_PLUGIN_DIR@ QT_CFLAGS = @QT_CFLAGS@ QT_LIBS = @QT_LIBS@ RANLIB = @RANLIB@ -RESOLVCONF_PATH = @RESOLVCONF_PATH@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ -SYSTEMD_CFLAGS = @SYSTEMD_CFLAGS@ -SYSTEMD_LIBS = @SYSTEMD_LIBS@ +SYSTEMD_INHIBIT_CFLAGS = @SYSTEMD_INHIBIT_CFLAGS@ +SYSTEMD_INHIBIT_LIBS = @SYSTEMD_INHIBIT_LIBS@ +SYSTEMD_LOGIN_CFLAGS = @SYSTEMD_LOGIN_CFLAGS@ +SYSTEMD_LOGIN_LIBS = @SYSTEMD_LOGIN_LIBS@ SYSTEM_CA_PATH = @SYSTEM_CA_PATH@ UDEV_BASE_DIR = @UDEV_BASE_DIR@ USE_NLS = @USE_NLS@ @@ -335,6 +337,11 @@ localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ +nmbinary = @nmbinary@ +nmconfdir = @nmconfdir@ +nmdatadir = @nmdatadir@ +nmrundir = @nmrundir@ +nmstatedir = @nmstatedir@ oldincludedir = @oldincludedir@ pdfdir = @pdfdir@ prefix = @prefix@ @@ -349,6 +356,10 @@ target_alias = @target_alias@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ +with_dhclient = @with_dhclient@ +with_dhcpcd = @with_dhcpcd@ +with_netconfig = @with_netconfig@ +with_resolvconf = @with_resolvconf@ @HAVE_SYSTEMD_TRUE@systemdsystemunit_DATA = \ @HAVE_SYSTEMD_TRUE@ NetworkManager.service \ @HAVE_SYSTEMD_TRUE@ NetworkManager-wait-online.service diff --git a/data/NetworkManager.service.in b/data/NetworkManager.service.in index 1198c1ba..16b53b68 100644 --- a/data/NetworkManager.service.in +++ b/data/NetworkManager.service.in @@ -12,7 +12,11 @@ ExecStart=@sbindir@/NetworkManager --no-daemon # with LOG_PERROR when run in foreground. But systemd redirects stderr to # syslog by default, which results in logging each message twice. StandardError=null +# NM doesn't want systemd to kill its children for it +KillMode=process [Install] WantedBy=multi-user.target Alias=dbus-org.freedesktop.NetworkManager.service +Also=NetworkManager-wait-online.service + diff --git a/docs/Makefile.am b/docs/Makefile.am index a1d1b9b3..ee889220 100644 --- a/docs/Makefile.am +++ b/docs/Makefile.am @@ -1,6 +1,5 @@ -if WITH_DOCS +if ENABLE_DOC SUBDIRS = api libnm-glib libnm-util endif - diff --git a/docs/Makefile.in b/docs/Makefile.in index 05b6fe7d..1f11c8ed 100644 --- a/docs/Makefile.in +++ b/docs/Makefile.in @@ -54,16 +54,18 @@ subdir = docs DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/compiler_warnings.m4 \ - $(top_srcdir)/m4/gettext.m4 $(top_srcdir)/m4/gtk-doc.m4 \ - $(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/intlmacosx.m4 \ - $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/introspection.m4 \ - $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \ - $(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/libnl-check.m4 \ - $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ - $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ - $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/nls.m4 \ - $(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/progtest.m4 \ - $(top_srcdir)/m4/vapigen.m4 $(top_srcdir)/configure.ac + $(top_srcdir)/m4/gettext.m4 \ + $(top_srcdir)/m4/gnome-code-coverage.m4 \ + $(top_srcdir)/m4/gtk-doc.m4 $(top_srcdir)/m4/iconv.m4 \ + $(top_srcdir)/m4/intlmacosx.m4 $(top_srcdir)/m4/intltool.m4 \ + $(top_srcdir)/m4/introspection.m4 $(top_srcdir)/m4/lib-ld.m4 \ + $(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \ + $(top_srcdir)/m4/libnl-check.m4 $(top_srcdir)/m4/libtool.m4 \ + $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ + $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ + $(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/po.m4 \ + $(top_srcdir)/m4/progtest.m4 $(top_srcdir)/m4/vapigen.m4 \ + $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(install_sh) -d @@ -136,6 +138,10 @@ AWK = @AWK@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ +CKDB_PATH = @CKDB_PATH@ +CODE_COVERAGE_CFLAGS = @CODE_COVERAGE_CFLAGS@ +CODE_COVERAGE_ENABLED = @CODE_COVERAGE_ENABLED@ +CODE_COVERAGE_LDFLAGS = @CODE_COVERAGE_LDFLAGS@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CXX = @CXX@ @@ -150,9 +156,7 @@ DBUS_SYS_DIR = @DBUS_SYS_DIR@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DHCLIENT_PATH = @DHCLIENT_PATH@ -DHCLIENT_VERSION = @DHCLIENT_VERSION@ DHCPCD_PATH = @DHCPCD_PATH@ -DISABLE_DEPRECATED = @DISABLE_DEPRECATED@ DLLTOOL = @DLLTOOL@ DSYMUTIL = @DSYMUTIL@ DUMPBIN = @DUMPBIN@ @@ -162,17 +166,14 @@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ +GENHTML = @GENHTML@ GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ -GIO_CFLAGS = @GIO_CFLAGS@ -GIO_LIBS = @GIO_LIBS@ GLIB_CFLAGS = @GLIB_CFLAGS@ GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ GLIB_LIBS = @GLIB_LIBS@ GLIB_MAKEFILE = @GLIB_MAKEFILE@ GLIB_MKENUMS = @GLIB_MKENUMS@ -GMODULE_CFLAGS = @GMODULE_CFLAGS@ -GMODULE_LIBS = @GMODULE_LIBS@ GMSGFMT = @GMSGFMT@ GMSGFMT_015 = @GMSGFMT_015@ GNUTLS_CFLAGS = @GNUTLS_CFLAGS@ @@ -213,6 +214,7 @@ IPTABLES_PATH = @IPTABLES_PATH@ IWMX_SDK_CFLAGS = @IWMX_SDK_CFLAGS@ IWMX_SDK_LIBS = @IWMX_SDK_LIBS@ KERNEL_FIRMWARE_DIR = @KERNEL_FIRMWARE_DIR@ +LCOV = @LCOV@ LD = @LD@ LDFLAGS = @LDFLAGS@ LIBDL = @LIBDL@ @@ -229,11 +231,7 @@ LIBNL2_LIBS = @LIBNL2_LIBS@ LIBNL3_CFLAGS = @LIBNL3_CFLAGS@ LIBNL3_LIBS = @LIBNL3_LIBS@ LIBNL_CFLAGS = @LIBNL_CFLAGS@ -LIBNL_GENL3_CFLAGS = @LIBNL_GENL3_CFLAGS@ -LIBNL_GENL3_LIBS = @LIBNL_GENL3_LIBS@ LIBNL_LIBS = @LIBNL_LIBS@ -LIBNL_ROUTE3_CFLAGS = @LIBNL_ROUTE3_CFLAGS@ -LIBNL_ROUTE3_LIBS = @LIBNL_ROUTE3_LIBS@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ LIBSOUP_CFLAGS = @LIBSOUP_CFLAGS@ @@ -248,6 +246,8 @@ MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MANIFEST_TOOL = @MANIFEST_TOOL@ MKDIR_P = @MKDIR_P@ +MM_GLIB_CFLAGS = @MM_GLIB_CFLAGS@ +MM_GLIB_LIBS = @MM_GLIB_LIBS@ MOC = @MOC@ MSGFMT = @MSGFMT@ MSGFMT_015 = @MSGFMT_015@ @@ -257,6 +257,7 @@ NMEDIT = @NMEDIT@ NM_MAJOR_VERSION = @NM_MAJOR_VERSION@ NM_MICRO_VERSION = @NM_MICRO_VERSION@ NM_MINOR_VERSION = @NM_MINOR_VERSION@ +NM_MODIFY_SYSTEM_POLICY = @NM_MODIFY_SYSTEM_POLICY@ NM_VERSION = @NM_VERSION@ NSS_CFLAGS = @NSS_CFLAGS@ NSS_LIBS = @NSS_LIBS@ @@ -283,13 +284,14 @@ PPPD_PLUGIN_DIR = @PPPD_PLUGIN_DIR@ QT_CFLAGS = @QT_CFLAGS@ QT_LIBS = @QT_LIBS@ RANLIB = @RANLIB@ -RESOLVCONF_PATH = @RESOLVCONF_PATH@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ -SYSTEMD_CFLAGS = @SYSTEMD_CFLAGS@ -SYSTEMD_LIBS = @SYSTEMD_LIBS@ +SYSTEMD_INHIBIT_CFLAGS = @SYSTEMD_INHIBIT_CFLAGS@ +SYSTEMD_INHIBIT_LIBS = @SYSTEMD_INHIBIT_LIBS@ +SYSTEMD_LOGIN_CFLAGS = @SYSTEMD_LOGIN_CFLAGS@ +SYSTEMD_LOGIN_LIBS = @SYSTEMD_LOGIN_LIBS@ SYSTEM_CA_PATH = @SYSTEM_CA_PATH@ UDEV_BASE_DIR = @UDEV_BASE_DIR@ USE_NLS = @USE_NLS@ @@ -344,6 +346,11 @@ localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ +nmbinary = @nmbinary@ +nmconfdir = @nmconfdir@ +nmdatadir = @nmdatadir@ +nmrundir = @nmrundir@ +nmstatedir = @nmstatedir@ oldincludedir = @oldincludedir@ pdfdir = @pdfdir@ prefix = @prefix@ @@ -358,7 +365,11 @@ target_alias = @target_alias@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ -@WITH_DOCS_TRUE@SUBDIRS = api libnm-glib libnm-util +with_dhclient = @with_dhclient@ +with_dhcpcd = @with_dhcpcd@ +with_netconfig = @with_netconfig@ +with_resolvconf = @with_resolvconf@ +@ENABLE_DOC_TRUE@SUBDIRS = api libnm-glib libnm-util all: all-recursive .SUFFIXES: diff --git a/docs/api/Makefile.am b/docs/api/Makefile.am index 571926f5..ba98f168 100644 --- a/docs/api/Makefile.am +++ b/docs/api/Makefile.am @@ -2,11 +2,13 @@ GENERATE_SETTINGS_SPEC_SOURCE = generate-settings-spec.c AUTOMAKE_OPTIONS = 1.7 -if WITH_DOCS +if ENABLE_DOC INCLUDES = \ -I$(top_srcdir)/include \ - -I$(top_srcdir)/libnm-util + -I$(top_builddir)/include \ + -I$(top_srcdir)/libnm-util \ + -I$(top_builddir)/libnm-util noinst_PROGRAMS = \ generate-settings-spec @@ -85,6 +87,6 @@ CLEANFILES = endif EXTRA_DIST += version.xml.in - -CLEANFILES += html/* tmpl/* xml/* - +CLEANFILES += html/* tmpl/* xml/* \ + NetworkManager-sections.txt \ + NetworkManager-overrides.txt diff --git a/docs/api/Makefile.in b/docs/api/Makefile.in index d1553258..8266f3a5 100644 --- a/docs/api/Makefile.in +++ b/docs/api/Makefile.in @@ -57,22 +57,24 @@ PRE_UNINSTALL = : POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ -@WITH_DOCS_TRUE@noinst_PROGRAMS = generate-settings-spec$(EXEEXT) +@ENABLE_DOC_TRUE@noinst_PROGRAMS = generate-settings-spec$(EXEEXT) DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ $(srcdir)/version.xml.in $(top_srcdir)/gtk-doc.make subdir = docs/api ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/compiler_warnings.m4 \ - $(top_srcdir)/m4/gettext.m4 $(top_srcdir)/m4/gtk-doc.m4 \ - $(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/intlmacosx.m4 \ - $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/introspection.m4 \ - $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \ - $(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/libnl-check.m4 \ - $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ - $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ - $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/nls.m4 \ - $(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/progtest.m4 \ - $(top_srcdir)/m4/vapigen.m4 $(top_srcdir)/configure.ac + $(top_srcdir)/m4/gettext.m4 \ + $(top_srcdir)/m4/gnome-code-coverage.m4 \ + $(top_srcdir)/m4/gtk-doc.m4 $(top_srcdir)/m4/iconv.m4 \ + $(top_srcdir)/m4/intlmacosx.m4 $(top_srcdir)/m4/intltool.m4 \ + $(top_srcdir)/m4/introspection.m4 $(top_srcdir)/m4/lib-ld.m4 \ + $(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \ + $(top_srcdir)/m4/libnl-check.m4 $(top_srcdir)/m4/libtool.m4 \ + $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ + $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ + $(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/po.m4 \ + $(top_srcdir)/m4/progtest.m4 $(top_srcdir)/m4/vapigen.m4 \ + $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(install_sh) -d @@ -83,12 +85,12 @@ PROGRAMS = $(noinst_PROGRAMS) am__generate_settings_spec_SOURCES_DIST = generate-settings-spec.c am__objects_1 = \ generate_settings_spec-generate-settings-spec.$(OBJEXT) -@WITH_DOCS_TRUE@am_generate_settings_spec_OBJECTS = $(am__objects_1) +@ENABLE_DOC_TRUE@am_generate_settings_spec_OBJECTS = $(am__objects_1) generate_settings_spec_OBJECTS = $(am_generate_settings_spec_OBJECTS) am__DEPENDENCIES_1 = -@WITH_DOCS_TRUE@generate_settings_spec_DEPENDENCIES = \ -@WITH_DOCS_TRUE@ $(top_builddir)/libnm-util/libnm-util.la \ -@WITH_DOCS_TRUE@ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) +@ENABLE_DOC_TRUE@generate_settings_spec_DEPENDENCIES = \ +@ENABLE_DOC_TRUE@ $(top_builddir)/libnm-util/libnm-util.la \ +@ENABLE_DOC_TRUE@ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) AM_V_lt = $(am__v_lt_@AM_V@) am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) am__v_lt_0 = --silent @@ -140,6 +142,10 @@ AWK = @AWK@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ +CKDB_PATH = @CKDB_PATH@ +CODE_COVERAGE_CFLAGS = @CODE_COVERAGE_CFLAGS@ +CODE_COVERAGE_ENABLED = @CODE_COVERAGE_ENABLED@ +CODE_COVERAGE_LDFLAGS = @CODE_COVERAGE_LDFLAGS@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CXX = @CXX@ @@ -154,9 +160,7 @@ DBUS_SYS_DIR = @DBUS_SYS_DIR@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DHCLIENT_PATH = @DHCLIENT_PATH@ -DHCLIENT_VERSION = @DHCLIENT_VERSION@ DHCPCD_PATH = @DHCPCD_PATH@ -DISABLE_DEPRECATED = @DISABLE_DEPRECATED@ DLLTOOL = @DLLTOOL@ DSYMUTIL = @DSYMUTIL@ DUMPBIN = @DUMPBIN@ @@ -166,17 +170,14 @@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ +GENHTML = @GENHTML@ GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ -GIO_CFLAGS = @GIO_CFLAGS@ -GIO_LIBS = @GIO_LIBS@ GLIB_CFLAGS = @GLIB_CFLAGS@ GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ GLIB_LIBS = @GLIB_LIBS@ GLIB_MAKEFILE = @GLIB_MAKEFILE@ GLIB_MKENUMS = @GLIB_MKENUMS@ -GMODULE_CFLAGS = @GMODULE_CFLAGS@ -GMODULE_LIBS = @GMODULE_LIBS@ GMSGFMT = @GMSGFMT@ GMSGFMT_015 = @GMSGFMT_015@ GNUTLS_CFLAGS = @GNUTLS_CFLAGS@ @@ -217,6 +218,7 @@ IPTABLES_PATH = @IPTABLES_PATH@ IWMX_SDK_CFLAGS = @IWMX_SDK_CFLAGS@ IWMX_SDK_LIBS = @IWMX_SDK_LIBS@ KERNEL_FIRMWARE_DIR = @KERNEL_FIRMWARE_DIR@ +LCOV = @LCOV@ LD = @LD@ LDFLAGS = @LDFLAGS@ LIBDL = @LIBDL@ @@ -233,11 +235,7 @@ LIBNL2_LIBS = @LIBNL2_LIBS@ LIBNL3_CFLAGS = @LIBNL3_CFLAGS@ LIBNL3_LIBS = @LIBNL3_LIBS@ LIBNL_CFLAGS = @LIBNL_CFLAGS@ -LIBNL_GENL3_CFLAGS = @LIBNL_GENL3_CFLAGS@ -LIBNL_GENL3_LIBS = @LIBNL_GENL3_LIBS@ LIBNL_LIBS = @LIBNL_LIBS@ -LIBNL_ROUTE3_CFLAGS = @LIBNL_ROUTE3_CFLAGS@ -LIBNL_ROUTE3_LIBS = @LIBNL_ROUTE3_LIBS@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ LIBSOUP_CFLAGS = @LIBSOUP_CFLAGS@ @@ -252,6 +250,8 @@ MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MANIFEST_TOOL = @MANIFEST_TOOL@ MKDIR_P = @MKDIR_P@ +MM_GLIB_CFLAGS = @MM_GLIB_CFLAGS@ +MM_GLIB_LIBS = @MM_GLIB_LIBS@ MOC = @MOC@ MSGFMT = @MSGFMT@ MSGFMT_015 = @MSGFMT_015@ @@ -261,6 +261,7 @@ NMEDIT = @NMEDIT@ NM_MAJOR_VERSION = @NM_MAJOR_VERSION@ NM_MICRO_VERSION = @NM_MICRO_VERSION@ NM_MINOR_VERSION = @NM_MINOR_VERSION@ +NM_MODIFY_SYSTEM_POLICY = @NM_MODIFY_SYSTEM_POLICY@ NM_VERSION = @NM_VERSION@ NSS_CFLAGS = @NSS_CFLAGS@ NSS_LIBS = @NSS_LIBS@ @@ -287,13 +288,14 @@ PPPD_PLUGIN_DIR = @PPPD_PLUGIN_DIR@ QT_CFLAGS = @QT_CFLAGS@ QT_LIBS = @QT_LIBS@ RANLIB = @RANLIB@ -RESOLVCONF_PATH = @RESOLVCONF_PATH@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ -SYSTEMD_CFLAGS = @SYSTEMD_CFLAGS@ -SYSTEMD_LIBS = @SYSTEMD_LIBS@ +SYSTEMD_INHIBIT_CFLAGS = @SYSTEMD_INHIBIT_CFLAGS@ +SYSTEMD_INHIBIT_LIBS = @SYSTEMD_INHIBIT_LIBS@ +SYSTEMD_LOGIN_CFLAGS = @SYSTEMD_LOGIN_CFLAGS@ +SYSTEMD_LOGIN_LIBS = @SYSTEMD_LOGIN_LIBS@ SYSTEM_CA_PATH = @SYSTEM_CA_PATH@ UDEV_BASE_DIR = @UDEV_BASE_DIR@ USE_NLS = @USE_NLS@ @@ -348,6 +350,11 @@ localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ +nmbinary = @nmbinary@ +nmconfdir = @nmconfdir@ +nmdatadir = @nmdatadir@ +nmrundir = @nmrundir@ +nmstatedir = @nmstatedir@ oldincludedir = @oldincludedir@ pdfdir = @pdfdir@ prefix = @prefix@ @@ -362,108 +369,117 @@ target_alias = @target_alias@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ +with_dhclient = @with_dhclient@ +with_dhcpcd = @with_dhcpcd@ +with_netconfig = @with_netconfig@ +with_resolvconf = @with_resolvconf@ GENERATE_SETTINGS_SPEC_SOURCE = generate-settings-spec.c AUTOMAKE_OPTIONS = 1.7 -@WITH_DOCS_TRUE@INCLUDES = \ -@WITH_DOCS_TRUE@ -I$(top_srcdir)/include \ -@WITH_DOCS_TRUE@ -I$(top_srcdir)/libnm-util - -@WITH_DOCS_TRUE@generate_settings_spec_SOURCES = \ -@WITH_DOCS_TRUE@ $(GENERATE_SETTINGS_SPEC_SOURCE) - -@WITH_DOCS_TRUE@generate_settings_spec_CPPFLAGS = \ -@WITH_DOCS_TRUE@ $(GLIB_CFLAGS) \ -@WITH_DOCS_TRUE@ $(DBUS_CFLAGS) - -@WITH_DOCS_TRUE@generate_settings_spec_LDADD = \ -@WITH_DOCS_TRUE@ $(top_builddir)/libnm-util/libnm-util.la \ -@WITH_DOCS_TRUE@ $(GLIB_LIBS) \ -@WITH_DOCS_TRUE@ $(DBUS_LIBS) - -@WITH_DOCS_TRUE@XSLTPROC = xsltproc --xinclude --nonet -@WITH_DOCS_TRUE@XMLS = $(wildcard $(top_srcdir)/introspection/nm-*.xml) -@WITH_DOCS_TRUE@OTHER_FILES = \ -@WITH_DOCS_TRUE@ $(top_builddir)/introspection/all.xml \ -@WITH_DOCS_TRUE@ $(top_srcdir)/introspection/generic-types.xml \ -@WITH_DOCS_TRUE@ $(top_srcdir)/introspection/errors.xml \ -@WITH_DOCS_TRUE@ $(top_srcdir)/introspection/vpn-errors.xml \ -@WITH_DOCS_TRUE@ $(top_srcdir)/tools/doc-generator.xsl \ -@WITH_DOCS_TRUE@ $(top_srcdir)/introspection/generic-types.xml - -@WITH_DOCS_TRUE@GENERATED_FILES = spec.html settings-spec.xml +@ENABLE_DOC_TRUE@INCLUDES = \ +@ENABLE_DOC_TRUE@ -I$(top_srcdir)/include \ +@ENABLE_DOC_TRUE@ -I$(top_builddir)/include \ +@ENABLE_DOC_TRUE@ -I$(top_srcdir)/libnm-util \ +@ENABLE_DOC_TRUE@ -I$(top_builddir)/libnm-util + +@ENABLE_DOC_TRUE@generate_settings_spec_SOURCES = \ +@ENABLE_DOC_TRUE@ $(GENERATE_SETTINGS_SPEC_SOURCE) + +@ENABLE_DOC_TRUE@generate_settings_spec_CPPFLAGS = \ +@ENABLE_DOC_TRUE@ $(GLIB_CFLAGS) \ +@ENABLE_DOC_TRUE@ $(DBUS_CFLAGS) + +@ENABLE_DOC_TRUE@generate_settings_spec_LDADD = \ +@ENABLE_DOC_TRUE@ $(top_builddir)/libnm-util/libnm-util.la \ +@ENABLE_DOC_TRUE@ $(GLIB_LIBS) \ +@ENABLE_DOC_TRUE@ $(DBUS_LIBS) + +@ENABLE_DOC_TRUE@XSLTPROC = xsltproc --xinclude --nonet +@ENABLE_DOC_TRUE@XMLS = $(wildcard $(top_srcdir)/introspection/nm-*.xml) +@ENABLE_DOC_TRUE@OTHER_FILES = \ +@ENABLE_DOC_TRUE@ $(top_builddir)/introspection/all.xml \ +@ENABLE_DOC_TRUE@ $(top_srcdir)/introspection/generic-types.xml \ +@ENABLE_DOC_TRUE@ $(top_srcdir)/introspection/errors.xml \ +@ENABLE_DOC_TRUE@ $(top_srcdir)/introspection/vpn-errors.xml \ +@ENABLE_DOC_TRUE@ $(top_srcdir)/tools/doc-generator.xsl \ +@ENABLE_DOC_TRUE@ $(top_srcdir)/introspection/generic-types.xml + +@ENABLE_DOC_TRUE@GENERATED_FILES = spec.html settings-spec.xml #################################### # The name of the module. -@WITH_DOCS_TRUE@DOC_MODULE = NetworkManager +@ENABLE_DOC_TRUE@DOC_MODULE = NetworkManager # The top-level SGML file. -@WITH_DOCS_TRUE@DOC_MAIN_SGML_FILE = network-manager-docs.xml -@WITH_DOCS_TRUE@DOC_SOURCE_DIR = $(srcdir) +@ENABLE_DOC_TRUE@DOC_MAIN_SGML_FILE = network-manager-docs.xml +@ENABLE_DOC_TRUE@DOC_SOURCE_DIR = $(srcdir) # Extra options to supply to gtkdoc-mkdb -@WITH_DOCS_TRUE@MKDB_OPTIONS = --sgml-mode --output-format=xml +@ENABLE_DOC_TRUE@MKDB_OPTIONS = --sgml-mode --output-format=xml # Extra options to supply to gtkdoc-mktmpl -@WITH_DOCS_TRUE@MKTMPL_OPTIONS = +@ENABLE_DOC_TRUE@MKTMPL_OPTIONS = # Non-autogenerated SGML files to be included in $(DOC_MAIN_SGML_FILE) -@WITH_DOCS_TRUE@content_files = \ -@WITH_DOCS_TRUE@ version.xml \ -@WITH_DOCS_TRUE@ settings-spec.xml \ -@WITH_DOCS_TRUE@ migrating-to-09.xml \ -@WITH_DOCS_TRUE@ $(NULL) - -@GTK_DOC_USE_LIBTOOL_FALSE@@WITH_DOCS_TRUE@GTKDOC_CC = $(CC) $(INCLUDES) $(GTKDOC_DEPS_CFLAGS) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -@GTK_DOC_USE_LIBTOOL_TRUE@@WITH_DOCS_TRUE@GTKDOC_CC = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(INCLUDES) $(GTKDOC_DEPS_CFLAGS) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -@GTK_DOC_USE_LIBTOOL_FALSE@@WITH_DOCS_TRUE@GTKDOC_LD = $(CC) $(GTKDOC_DEPS_LIBS) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -@GTK_DOC_USE_LIBTOOL_TRUE@@WITH_DOCS_TRUE@GTKDOC_LD = $(LIBTOOL) --tag=CC --mode=link $(CC) $(GTKDOC_DEPS_LIBS) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -@GTK_DOC_USE_LIBTOOL_FALSE@@WITH_DOCS_TRUE@GTKDOC_RUN = -@GTK_DOC_USE_LIBTOOL_TRUE@@WITH_DOCS_TRUE@GTKDOC_RUN = $(LIBTOOL) --mode=execute +@ENABLE_DOC_TRUE@content_files = \ +@ENABLE_DOC_TRUE@ version.xml \ +@ENABLE_DOC_TRUE@ settings-spec.xml \ +@ENABLE_DOC_TRUE@ migrating-to-09.xml \ +@ENABLE_DOC_TRUE@ $(NULL) + +@ENABLE_DOC_TRUE@@GTK_DOC_USE_LIBTOOL_FALSE@GTKDOC_CC = $(CC) $(INCLUDES) $(GTKDOC_DEPS_CFLAGS) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +@ENABLE_DOC_TRUE@@GTK_DOC_USE_LIBTOOL_TRUE@GTKDOC_CC = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(INCLUDES) $(GTKDOC_DEPS_CFLAGS) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +@ENABLE_DOC_TRUE@@GTK_DOC_USE_LIBTOOL_FALSE@GTKDOC_LD = $(CC) $(GTKDOC_DEPS_LIBS) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) +@ENABLE_DOC_TRUE@@GTK_DOC_USE_LIBTOOL_TRUE@GTKDOC_LD = $(LIBTOOL) --tag=CC --mode=link $(CC) $(GTKDOC_DEPS_LIBS) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) +@ENABLE_DOC_TRUE@@GTK_DOC_USE_LIBTOOL_FALSE@GTKDOC_RUN = +@ENABLE_DOC_TRUE@@GTK_DOC_USE_LIBTOOL_TRUE@GTKDOC_RUN = $(LIBTOOL) --mode=execute # We set GPATH here; this gives us semantics for GNU make # which are more like other make's VPATH, when it comes to # whether a source that is a target of one rule is then # searched for in VPATH/GPATH. # -@WITH_DOCS_TRUE@GPATH = $(srcdir) -@WITH_DOCS_TRUE@TARGET_DIR = $(HTML_DIR)/$(DOC_MODULE) -@WITH_DOCS_TRUE@SETUP_FILES = \ -@WITH_DOCS_TRUE@ $(content_files) \ -@WITH_DOCS_TRUE@ $(DOC_MAIN_SGML_FILE) \ -@WITH_DOCS_TRUE@ $(DOC_MODULE)-sections.txt \ -@WITH_DOCS_TRUE@ $(DOC_MODULE)-overrides.txt +@ENABLE_DOC_TRUE@GPATH = $(srcdir) +@ENABLE_DOC_TRUE@TARGET_DIR = $(HTML_DIR)/$(DOC_MODULE) +@ENABLE_DOC_TRUE@SETUP_FILES = \ +@ENABLE_DOC_TRUE@ $(content_files) \ +@ENABLE_DOC_TRUE@ $(DOC_MAIN_SGML_FILE) \ +@ENABLE_DOC_TRUE@ $(DOC_MODULE)-sections.txt \ +@ENABLE_DOC_TRUE@ $(DOC_MODULE)-overrides.txt -@WITH_DOCS_FALSE@EXTRA_DIST = $(GENERATE_SETTINGS_SPEC_SOURCE) \ -@WITH_DOCS_FALSE@ version.xml.in +@ENABLE_DOC_FALSE@EXTRA_DIST = $(GENERATE_SETTINGS_SPEC_SOURCE) \ +@ENABLE_DOC_FALSE@ version.xml.in #################################### -@WITH_DOCS_TRUE@EXTRA_DIST = $(HTML_IMAGES) $(SETUP_FILES) \ -@WITH_DOCS_TRUE@ $(GENERATED_FILES) version.xml.in -@WITH_DOCS_TRUE@DOC_STAMPS = setup-build.stamp scan-build.stamp tmpl-build.stamp sgml-build.stamp \ -@WITH_DOCS_TRUE@ html-build.stamp pdf-build.stamp \ -@WITH_DOCS_TRUE@ tmpl.stamp sgml.stamp html.stamp pdf.stamp - -@WITH_DOCS_TRUE@SCANOBJ_FILES = \ -@WITH_DOCS_TRUE@ $(DOC_MODULE).args \ -@WITH_DOCS_TRUE@ $(DOC_MODULE).hierarchy \ -@WITH_DOCS_TRUE@ $(DOC_MODULE).interfaces \ -@WITH_DOCS_TRUE@ $(DOC_MODULE).prerequisites \ -@WITH_DOCS_TRUE@ $(DOC_MODULE).signals - -@WITH_DOCS_TRUE@REPORT_FILES = \ -@WITH_DOCS_TRUE@ $(DOC_MODULE)-undocumented.txt \ -@WITH_DOCS_TRUE@ $(DOC_MODULE)-undeclared.txt \ -@WITH_DOCS_TRUE@ $(DOC_MODULE)-unused.txt - -@WITH_DOCS_FALSE@CLEANFILES = html/* tmpl/* xml/* -@WITH_DOCS_TRUE@CLEANFILES = $(SCANOBJ_FILES) $(REPORT_FILES) \ -@WITH_DOCS_TRUE@ $(DOC_STAMPS) $(GENERATED_FILES) html/* tmpl/* \ -@WITH_DOCS_TRUE@ xml/* -@ENABLE_GTK_DOC_TRUE@@GTK_DOC_BUILD_HTML_FALSE@@WITH_DOCS_TRUE@HTML_BUILD_STAMP = -@ENABLE_GTK_DOC_TRUE@@GTK_DOC_BUILD_HTML_TRUE@@WITH_DOCS_TRUE@HTML_BUILD_STAMP = html-build.stamp -@ENABLE_GTK_DOC_TRUE@@GTK_DOC_BUILD_PDF_FALSE@@WITH_DOCS_TRUE@PDF_BUILD_STAMP = -@ENABLE_GTK_DOC_TRUE@@GTK_DOC_BUILD_PDF_TRUE@@WITH_DOCS_TRUE@PDF_BUILD_STAMP = pdf-build.stamp +@ENABLE_DOC_TRUE@EXTRA_DIST = $(HTML_IMAGES) $(SETUP_FILES) \ +@ENABLE_DOC_TRUE@ $(GENERATED_FILES) version.xml.in +@ENABLE_DOC_TRUE@DOC_STAMPS = setup-build.stamp scan-build.stamp tmpl-build.stamp sgml-build.stamp \ +@ENABLE_DOC_TRUE@ html-build.stamp pdf-build.stamp \ +@ENABLE_DOC_TRUE@ tmpl.stamp sgml.stamp html.stamp pdf.stamp + +@ENABLE_DOC_TRUE@SCANOBJ_FILES = \ +@ENABLE_DOC_TRUE@ $(DOC_MODULE).args \ +@ENABLE_DOC_TRUE@ $(DOC_MODULE).hierarchy \ +@ENABLE_DOC_TRUE@ $(DOC_MODULE).interfaces \ +@ENABLE_DOC_TRUE@ $(DOC_MODULE).prerequisites \ +@ENABLE_DOC_TRUE@ $(DOC_MODULE).signals + +@ENABLE_DOC_TRUE@REPORT_FILES = \ +@ENABLE_DOC_TRUE@ $(DOC_MODULE)-undocumented.txt \ +@ENABLE_DOC_TRUE@ $(DOC_MODULE)-undeclared.txt \ +@ENABLE_DOC_TRUE@ $(DOC_MODULE)-unused.txt + +@ENABLE_DOC_FALSE@CLEANFILES = html/* tmpl/* xml/* \ +@ENABLE_DOC_FALSE@ NetworkManager-sections.txt \ +@ENABLE_DOC_FALSE@ NetworkManager-overrides.txt +@ENABLE_DOC_TRUE@CLEANFILES = $(SCANOBJ_FILES) $(REPORT_FILES) \ +@ENABLE_DOC_TRUE@ $(DOC_STAMPS) $(GENERATED_FILES) html/* \ +@ENABLE_DOC_TRUE@ tmpl/* xml/* NetworkManager-sections.txt \ +@ENABLE_DOC_TRUE@ NetworkManager-overrides.txt +@ENABLE_DOC_TRUE@@ENABLE_GTK_DOC_TRUE@@GTK_DOC_BUILD_HTML_FALSE@HTML_BUILD_STAMP = +@ENABLE_DOC_TRUE@@ENABLE_GTK_DOC_TRUE@@GTK_DOC_BUILD_HTML_TRUE@HTML_BUILD_STAMP = html-build.stamp +@ENABLE_DOC_TRUE@@ENABLE_GTK_DOC_TRUE@@GTK_DOC_BUILD_PDF_FALSE@PDF_BUILD_STAMP = +@ENABLE_DOC_TRUE@@ENABLE_GTK_DOC_TRUE@@GTK_DOC_BUILD_PDF_TRUE@PDF_BUILD_STAMP = pdf-build.stamp all: all-am .SUFFIXES: @@ -523,25 +539,22 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/generate_settings_spec-generate-settings-spec.Po@am__quote@ .c.o: -@am__fastdepCC_TRUE@ $(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\ -@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\ -@am__fastdepCC_TRUE@ $(am__mv) $$depbase.Tpo $$depbase.Po +@am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $< +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c $< .c.obj: -@am__fastdepCC_TRUE@ $(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.obj$$||'`;\ -@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ `$(CYGPATH_W) '$<'` &&\ -@am__fastdepCC_TRUE@ $(am__mv) $$depbase.Tpo $$depbase.Po +@am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c `$(CYGPATH_W) '$<'` .c.lo: -@am__fastdepCC_TRUE@ $(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.lo$$||'`;\ -@am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\ -@am__fastdepCC_TRUE@ $(am__mv) $$depbase.Tpo $$depbase.Plo +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $< @@ -617,7 +630,7 @@ GTAGS: distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags -@WITH_DOCS_FALSE@dist-hook: +@ENABLE_DOC_FALSE@dist-hook: distdir: $(DISTFILES) @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ @@ -654,7 +667,7 @@ distdir: $(DISTFILES) dist-hook check-am: all-am check: check-am -@WITH_DOCS_FALSE@all-local: +@ENABLE_DOC_FALSE@all-local: all-am: Makefile $(PROGRAMS) all-local installdirs: install: install-am @@ -688,11 +701,11 @@ distclean-generic: maintainer-clean-generic: @echo "This command is intended for maintainers to use" @echo "it deletes files that may require special tools to rebuild." -@WITH_DOCS_FALSE@uninstall-local: -@WITH_DOCS_FALSE@distclean-local: -@WITH_DOCS_FALSE@install-data-local: -@WITH_DOCS_FALSE@maintainer-clean-local: -@WITH_DOCS_FALSE@clean-local: +@ENABLE_DOC_FALSE@uninstall-local: +@ENABLE_DOC_FALSE@distclean-local: +@ENABLE_DOC_FALSE@install-data-local: +@ENABLE_DOC_FALSE@maintainer-clean-local: +@ENABLE_DOC_FALSE@clean-local: clean: clean-am clean-am: clean-generic clean-libtool clean-local clean-noinstPROGRAMS \ @@ -783,227 +796,227 @@ uninstall-am: uninstall-local tags uninstall uninstall-am uninstall-local -@WITH_DOCS_TRUE@spec.html: $(XMLS) $(OTHER_FILES) html-build.stamp -@WITH_DOCS_TRUE@ $(XSLTPROC) --path "$(top_builddir)/introspection:$(top_srcdir)/introspection" $(top_srcdir)/tools/doc-generator.xsl $(top_builddir)/introspection/all.xml > $@ -@WITH_DOCS_TRUE@ mkdir -p $(builddir)/html/ -@WITH_DOCS_TRUE@ cp $@ $(builddir)/html/ +@ENABLE_DOC_TRUE@spec.html: $(XMLS) $(OTHER_FILES) html-build.stamp +@ENABLE_DOC_TRUE@ $(XSLTPROC) --path "$(top_builddir)/introspection:$(top_srcdir)/introspection" $(top_srcdir)/tools/doc-generator.xsl $(top_builddir)/introspection/all.xml > $@ +@ENABLE_DOC_TRUE@ mkdir -p $(builddir)/html/ +@ENABLE_DOC_TRUE@ cp $@ $(builddir)/html/ -@WITH_DOCS_TRUE@settings-spec.xml: generate-settings-spec $(top_builddir)/libnm-util/libnm-util.la -@WITH_DOCS_TRUE@ rm -f $(builddir)/$@ -@WITH_DOCS_TRUE@ $(builddir)/generate-settings-spec $(builddir)/$@ +@ENABLE_DOC_TRUE@settings-spec.xml: generate-settings-spec $(top_builddir)/libnm-util/libnm-util.la +@ENABLE_DOC_TRUE@ rm -f $(builddir)/$@ +@ENABLE_DOC_TRUE@ $(builddir)/generate-settings-spec $(builddir)/$@ -@WITH_DOCS_TRUE@all: $(GENERATED_FILES) +@ENABLE_DOC_TRUE@all: $(GENERATED_FILES) -@ENABLE_GTK_DOC_TRUE@@WITH_DOCS_TRUE@all-local: $(HTML_BUILD_STAMP) $(PDF_BUILD_STAMP) -@ENABLE_GTK_DOC_FALSE@@WITH_DOCS_TRUE@all-local: +@ENABLE_DOC_TRUE@@ENABLE_GTK_DOC_TRUE@all-local: $(HTML_BUILD_STAMP) $(PDF_BUILD_STAMP) +@ENABLE_DOC_TRUE@@ENABLE_GTK_DOC_FALSE@all-local: -@WITH_DOCS_TRUE@docs: $(HTML_BUILD_STAMP) $(PDF_BUILD_STAMP) +@ENABLE_DOC_TRUE@docs: $(HTML_BUILD_STAMP) $(PDF_BUILD_STAMP) -@WITH_DOCS_TRUE@$(REPORT_FILES): sgml-build.stamp +@ENABLE_DOC_TRUE@$(REPORT_FILES): sgml-build.stamp #### setup #### -@WITH_DOCS_TRUE@setup-build.stamp: -@WITH_DOCS_TRUE@ -@if test "$(abs_srcdir)" != "$(abs_builddir)" ; then \ -@WITH_DOCS_TRUE@ echo ' DOC Preparing build'; \ -@WITH_DOCS_TRUE@ files=`echo $(SETUP_FILES) $(expand_content_files) $(DOC_MODULE).types`; \ -@WITH_DOCS_TRUE@ if test "x$$files" != "x" ; then \ -@WITH_DOCS_TRUE@ for file in $$files ; do \ -@WITH_DOCS_TRUE@ test -f $(abs_srcdir)/$$file && \ -@WITH_DOCS_TRUE@ cp -pu $(abs_srcdir)/$$file $(abs_builddir)/ || true; \ -@WITH_DOCS_TRUE@ done; \ -@WITH_DOCS_TRUE@ fi; \ -@WITH_DOCS_TRUE@ test -d $(abs_srcdir)/tmpl && \ -@WITH_DOCS_TRUE@ { cp -rp $(abs_srcdir)/tmpl $(abs_builddir)/; \ -@WITH_DOCS_TRUE@ chmod -R u+w $(abs_builddir)/tmpl; } \ -@WITH_DOCS_TRUE@ fi -@WITH_DOCS_TRUE@ @touch setup-build.stamp +@ENABLE_DOC_TRUE@setup-build.stamp: +@ENABLE_DOC_TRUE@ -@if test "$(abs_srcdir)" != "$(abs_builddir)" ; then \ +@ENABLE_DOC_TRUE@ echo ' DOC Preparing build'; \ +@ENABLE_DOC_TRUE@ files=`echo $(SETUP_FILES) $(expand_content_files) $(DOC_MODULE).types`; \ +@ENABLE_DOC_TRUE@ if test "x$$files" != "x" ; then \ +@ENABLE_DOC_TRUE@ for file in $$files ; do \ +@ENABLE_DOC_TRUE@ test -f $(abs_srcdir)/$$file && \ +@ENABLE_DOC_TRUE@ cp -pu $(abs_srcdir)/$$file $(abs_builddir)/ || true; \ +@ENABLE_DOC_TRUE@ done; \ +@ENABLE_DOC_TRUE@ fi; \ +@ENABLE_DOC_TRUE@ test -d $(abs_srcdir)/tmpl && \ +@ENABLE_DOC_TRUE@ { cp -rp $(abs_srcdir)/tmpl $(abs_builddir)/; \ +@ENABLE_DOC_TRUE@ chmod -R u+w $(abs_builddir)/tmpl; } \ +@ENABLE_DOC_TRUE@ fi +@ENABLE_DOC_TRUE@ @touch setup-build.stamp #### scan #### -@WITH_DOCS_TRUE@scan-build.stamp: $(HFILE_GLOB) $(CFILE_GLOB) -@WITH_DOCS_TRUE@ @echo ' DOC Scanning header files' -@WITH_DOCS_TRUE@ @_source_dir='' ; \ -@WITH_DOCS_TRUE@ for i in $(DOC_SOURCE_DIR) ; do \ -@WITH_DOCS_TRUE@ _source_dir="$${_source_dir} --source-dir=$$i" ; \ -@WITH_DOCS_TRUE@ done ; \ -@WITH_DOCS_TRUE@ gtkdoc-scan --module=$(DOC_MODULE) --ignore-headers="$(IGNORE_HFILES)" $${_source_dir} $(SCAN_OPTIONS) $(EXTRA_HFILES) -@WITH_DOCS_TRUE@ @if grep -l '^..*$$' $(DOC_MODULE).types > /dev/null 2>&1 ; then \ -@WITH_DOCS_TRUE@ echo " DOC Introspecting gobjects"; \ -@WITH_DOCS_TRUE@ scanobj_options=""; \ -@WITH_DOCS_TRUE@ gtkdoc-scangobj 2>&1 --help | grep >/dev/null "\-\-verbose"; \ -@WITH_DOCS_TRUE@ if test "$(?)" = "0"; then \ -@WITH_DOCS_TRUE@ if test "x$(V)" = "x1"; then \ -@WITH_DOCS_TRUE@ scanobj_options="--verbose"; \ -@WITH_DOCS_TRUE@ fi; \ -@WITH_DOCS_TRUE@ fi; \ -@WITH_DOCS_TRUE@ CC="$(GTKDOC_CC)" LD="$(GTKDOC_LD)" RUN="$(GTKDOC_RUN)" CFLAGS="$(GTKDOC_CFLAGS) $(CFLAGS)" LDFLAGS="$(GTKDOC_LIBS) $(LDFLAGS)" \ -@WITH_DOCS_TRUE@ gtkdoc-scangobj $(SCANGOBJ_OPTIONS) $$scanobj_options --module=$(DOC_MODULE); \ -@WITH_DOCS_TRUE@ else \ -@WITH_DOCS_TRUE@ for i in $(SCANOBJ_FILES) ; do \ -@WITH_DOCS_TRUE@ test -f $$i || touch $$i ; \ -@WITH_DOCS_TRUE@ done \ -@WITH_DOCS_TRUE@ fi -@WITH_DOCS_TRUE@ @touch scan-build.stamp - -@WITH_DOCS_TRUE@$(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(DOC_MODULE)-sections.txt $(DOC_MODULE)-overrides.txt: scan-build.stamp -@WITH_DOCS_TRUE@ @true +@ENABLE_DOC_TRUE@scan-build.stamp: $(HFILE_GLOB) $(CFILE_GLOB) +@ENABLE_DOC_TRUE@ @echo ' DOC Scanning header files' +@ENABLE_DOC_TRUE@ @_source_dir='' ; \ +@ENABLE_DOC_TRUE@ for i in $(DOC_SOURCE_DIR) ; do \ +@ENABLE_DOC_TRUE@ _source_dir="$${_source_dir} --source-dir=$$i" ; \ +@ENABLE_DOC_TRUE@ done ; \ +@ENABLE_DOC_TRUE@ gtkdoc-scan --module=$(DOC_MODULE) --ignore-headers="$(IGNORE_HFILES)" $${_source_dir} $(SCAN_OPTIONS) $(EXTRA_HFILES) +@ENABLE_DOC_TRUE@ @if grep -l '^..*$$' $(DOC_MODULE).types > /dev/null 2>&1 ; then \ +@ENABLE_DOC_TRUE@ echo " DOC Introspecting gobjects"; \ +@ENABLE_DOC_TRUE@ scanobj_options=""; \ +@ENABLE_DOC_TRUE@ gtkdoc-scangobj 2>&1 --help | grep >/dev/null "\-\-verbose"; \ +@ENABLE_DOC_TRUE@ if test "$(?)" = "0"; then \ +@ENABLE_DOC_TRUE@ if test "x$(V)" = "x1"; then \ +@ENABLE_DOC_TRUE@ scanobj_options="--verbose"; \ +@ENABLE_DOC_TRUE@ fi; \ +@ENABLE_DOC_TRUE@ fi; \ +@ENABLE_DOC_TRUE@ CC="$(GTKDOC_CC)" LD="$(GTKDOC_LD)" RUN="$(GTKDOC_RUN)" CFLAGS="$(GTKDOC_CFLAGS) $(CFLAGS)" LDFLAGS="$(GTKDOC_LIBS) $(LDFLAGS)" \ +@ENABLE_DOC_TRUE@ gtkdoc-scangobj $(SCANGOBJ_OPTIONS) $$scanobj_options --module=$(DOC_MODULE); \ +@ENABLE_DOC_TRUE@ else \ +@ENABLE_DOC_TRUE@ for i in $(SCANOBJ_FILES) ; do \ +@ENABLE_DOC_TRUE@ test -f $$i || touch $$i ; \ +@ENABLE_DOC_TRUE@ done \ +@ENABLE_DOC_TRUE@ fi +@ENABLE_DOC_TRUE@ @touch scan-build.stamp + +@ENABLE_DOC_TRUE@$(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(DOC_MODULE)-sections.txt $(DOC_MODULE)-overrides.txt: scan-build.stamp +@ENABLE_DOC_TRUE@ @true #### templates #### -@WITH_DOCS_TRUE@tmpl-build.stamp: setup-build.stamp $(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(DOC_MODULE)-sections.txt $(DOC_MODULE)-overrides.txt -@WITH_DOCS_TRUE@ @echo ' DOC Rebuilding template files' -@WITH_DOCS_TRUE@ @gtkdoc-mktmpl --module=$(DOC_MODULE) $(MKTMPL_OPTIONS) -@WITH_DOCS_TRUE@ @if test "$(abs_srcdir)" != "$(abs_builddir)" ; then \ -@WITH_DOCS_TRUE@ if test -w $(abs_srcdir) ; then \ -@WITH_DOCS_TRUE@ cp -rp $(abs_builddir)/tmpl $(abs_srcdir)/; \ -@WITH_DOCS_TRUE@ fi \ -@WITH_DOCS_TRUE@ fi -@WITH_DOCS_TRUE@ @touch tmpl-build.stamp +@ENABLE_DOC_TRUE@tmpl-build.stamp: setup-build.stamp $(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(DOC_MODULE)-sections.txt $(DOC_MODULE)-overrides.txt +@ENABLE_DOC_TRUE@ @echo ' DOC Rebuilding template files' +@ENABLE_DOC_TRUE@ @gtkdoc-mktmpl --module=$(DOC_MODULE) $(MKTMPL_OPTIONS) +@ENABLE_DOC_TRUE@ @if test "$(abs_srcdir)" != "$(abs_builddir)" ; then \ +@ENABLE_DOC_TRUE@ if test -w $(abs_srcdir) ; then \ +@ENABLE_DOC_TRUE@ cp -rp $(abs_builddir)/tmpl $(abs_srcdir)/; \ +@ENABLE_DOC_TRUE@ fi \ +@ENABLE_DOC_TRUE@ fi +@ENABLE_DOC_TRUE@ @touch tmpl-build.stamp -@WITH_DOCS_TRUE@tmpl.stamp: tmpl-build.stamp -@WITH_DOCS_TRUE@ @true +@ENABLE_DOC_TRUE@tmpl.stamp: tmpl-build.stamp +@ENABLE_DOC_TRUE@ @true -@WITH_DOCS_TRUE@$(srcdir)/tmpl/*.sgml: -@WITH_DOCS_TRUE@ @true +@ENABLE_DOC_TRUE@$(srcdir)/tmpl/*.sgml: +@ENABLE_DOC_TRUE@ @true #### xml #### -@WITH_DOCS_TRUE@sgml-build.stamp: tmpl.stamp $(DOC_MODULE)-sections.txt $(srcdir)/tmpl/*.sgml $(expand_content_files) -@WITH_DOCS_TRUE@ @echo ' DOC Building XML' -@WITH_DOCS_TRUE@ @-chmod -R u+w $(srcdir) -@WITH_DOCS_TRUE@ @_source_dir='' ; \ -@WITH_DOCS_TRUE@ for i in $(DOC_SOURCE_DIR) ; do \ -@WITH_DOCS_TRUE@ _source_dir="$${_source_dir} --source-dir=$$i" ; \ -@WITH_DOCS_TRUE@ done ; \ -@WITH_DOCS_TRUE@ gtkdoc-mkdb --module=$(DOC_MODULE) --output-format=xml --expand-content-files="$(expand_content_files)" --main-sgml-file=$(DOC_MAIN_SGML_FILE) $${_source_dir} $(MKDB_OPTIONS) -@WITH_DOCS_TRUE@ @touch sgml-build.stamp +@ENABLE_DOC_TRUE@sgml-build.stamp: tmpl.stamp $(DOC_MODULE)-sections.txt $(srcdir)/tmpl/*.sgml $(expand_content_files) +@ENABLE_DOC_TRUE@ @echo ' DOC Building XML' +@ENABLE_DOC_TRUE@ @-chmod -R u+w $(srcdir) +@ENABLE_DOC_TRUE@ @_source_dir='' ; \ +@ENABLE_DOC_TRUE@ for i in $(DOC_SOURCE_DIR) ; do \ +@ENABLE_DOC_TRUE@ _source_dir="$${_source_dir} --source-dir=$$i" ; \ +@ENABLE_DOC_TRUE@ done ; \ +@ENABLE_DOC_TRUE@ gtkdoc-mkdb --module=$(DOC_MODULE) --output-format=xml --expand-content-files="$(expand_content_files)" --main-sgml-file=$(DOC_MAIN_SGML_FILE) $${_source_dir} $(MKDB_OPTIONS) +@ENABLE_DOC_TRUE@ @touch sgml-build.stamp -@WITH_DOCS_TRUE@sgml.stamp: sgml-build.stamp -@WITH_DOCS_TRUE@ @true +@ENABLE_DOC_TRUE@sgml.stamp: sgml-build.stamp +@ENABLE_DOC_TRUE@ @true #### html #### -@WITH_DOCS_TRUE@html-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files) -@WITH_DOCS_TRUE@ @echo ' DOC Building HTML' -@WITH_DOCS_TRUE@ @rm -rf html -@WITH_DOCS_TRUE@ @mkdir html -@WITH_DOCS_TRUE@ @mkhtml_options=""; \ -@WITH_DOCS_TRUE@ gtkdoc-mkhtml 2>&1 --help | grep >/dev/null "\-\-verbose"; \ -@WITH_DOCS_TRUE@ if test "$(?)" = "0"; then \ -@WITH_DOCS_TRUE@ if test "x$(V)" = "x1"; then \ -@WITH_DOCS_TRUE@ mkhtml_options="$$mkhtml_options --verbose"; \ -@WITH_DOCS_TRUE@ fi; \ -@WITH_DOCS_TRUE@ fi; \ -@WITH_DOCS_TRUE@ gtkdoc-mkhtml 2>&1 --help | grep >/dev/null "\-\-path"; \ -@WITH_DOCS_TRUE@ if test "$(?)" = "0"; then \ -@WITH_DOCS_TRUE@ mkhtml_options="$$mkhtml_options --path=\"$(abs_srcdir)\""; \ -@WITH_DOCS_TRUE@ fi; \ -@WITH_DOCS_TRUE@ cd html && gtkdoc-mkhtml $$mkhtml_options $(MKHTML_OPTIONS) $(DOC_MODULE) ../$(DOC_MAIN_SGML_FILE) -@WITH_DOCS_TRUE@ -@test "x$(HTML_IMAGES)" = "x" || \ -@WITH_DOCS_TRUE@ for file in $(HTML_IMAGES) ; do \ -@WITH_DOCS_TRUE@ if test -f $(abs_srcdir)/$$file ; then \ -@WITH_DOCS_TRUE@ cp $(abs_srcdir)/$$file $(abs_builddir)/html; \ -@WITH_DOCS_TRUE@ fi; \ -@WITH_DOCS_TRUE@ if test -f $(abs_builddir)/$$file ; then \ -@WITH_DOCS_TRUE@ cp $(abs_builddir)/$$file $(abs_builddir)/html; \ -@WITH_DOCS_TRUE@ fi; \ -@WITH_DOCS_TRUE@ done; -@WITH_DOCS_TRUE@ @echo ' DOC Fixing cross-references' -@WITH_DOCS_TRUE@ @gtkdoc-fixxref --module=$(DOC_MODULE) --module-dir=html --html-dir=$(HTML_DIR) $(FIXXREF_OPTIONS) -@WITH_DOCS_TRUE@ @touch html-build.stamp +@ENABLE_DOC_TRUE@html-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files) +@ENABLE_DOC_TRUE@ @echo ' DOC Building HTML' +@ENABLE_DOC_TRUE@ @rm -rf html +@ENABLE_DOC_TRUE@ @mkdir html +@ENABLE_DOC_TRUE@ @mkhtml_options=""; \ +@ENABLE_DOC_TRUE@ gtkdoc-mkhtml 2>&1 --help | grep >/dev/null "\-\-verbose"; \ +@ENABLE_DOC_TRUE@ if test "$(?)" = "0"; then \ +@ENABLE_DOC_TRUE@ if test "x$(V)" = "x1"; then \ +@ENABLE_DOC_TRUE@ mkhtml_options="$$mkhtml_options --verbose"; \ +@ENABLE_DOC_TRUE@ fi; \ +@ENABLE_DOC_TRUE@ fi; \ +@ENABLE_DOC_TRUE@ gtkdoc-mkhtml 2>&1 --help | grep >/dev/null "\-\-path"; \ +@ENABLE_DOC_TRUE@ if test "$(?)" = "0"; then \ +@ENABLE_DOC_TRUE@ mkhtml_options="$$mkhtml_options --path=\"$(abs_srcdir)\""; \ +@ENABLE_DOC_TRUE@ fi; \ +@ENABLE_DOC_TRUE@ cd html && gtkdoc-mkhtml $$mkhtml_options $(MKHTML_OPTIONS) $(DOC_MODULE) ../$(DOC_MAIN_SGML_FILE) +@ENABLE_DOC_TRUE@ -@test "x$(HTML_IMAGES)" = "x" || \ +@ENABLE_DOC_TRUE@ for file in $(HTML_IMAGES) ; do \ +@ENABLE_DOC_TRUE@ if test -f $(abs_srcdir)/$$file ; then \ +@ENABLE_DOC_TRUE@ cp $(abs_srcdir)/$$file $(abs_builddir)/html; \ +@ENABLE_DOC_TRUE@ fi; \ +@ENABLE_DOC_TRUE@ if test -f $(abs_builddir)/$$file ; then \ +@ENABLE_DOC_TRUE@ cp $(abs_builddir)/$$file $(abs_builddir)/html; \ +@ENABLE_DOC_TRUE@ fi; \ +@ENABLE_DOC_TRUE@ done; +@ENABLE_DOC_TRUE@ @echo ' DOC Fixing cross-references' +@ENABLE_DOC_TRUE@ @gtkdoc-fixxref --module=$(DOC_MODULE) --module-dir=html --html-dir=$(HTML_DIR) $(FIXXREF_OPTIONS) +@ENABLE_DOC_TRUE@ @touch html-build.stamp #### pdf #### -@WITH_DOCS_TRUE@pdf-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files) -@WITH_DOCS_TRUE@ @echo ' DOC Building PDF' -@WITH_DOCS_TRUE@ @rm -f $(DOC_MODULE).pdf -@WITH_DOCS_TRUE@ @mkpdf_options=""; \ -@WITH_DOCS_TRUE@ gtkdoc-mkpdf 2>&1 --help | grep >/dev/null "\-\-verbose"; \ -@WITH_DOCS_TRUE@ if test "$(?)" = "0"; then \ -@WITH_DOCS_TRUE@ if test "x$(V)" = "x1"; then \ -@WITH_DOCS_TRUE@ mkpdf_options="$$mkpdf_options --verbose"; \ -@WITH_DOCS_TRUE@ fi; \ -@WITH_DOCS_TRUE@ fi; \ -@WITH_DOCS_TRUE@ if test "x$(HTML_IMAGES)" != "x"; then \ -@WITH_DOCS_TRUE@ for img in $(HTML_IMAGES); do \ -@WITH_DOCS_TRUE@ part=`dirname $$img`; \ -@WITH_DOCS_TRUE@ echo $$mkpdf_options | grep >/dev/null "\-\-imgdir=$$part "; \ -@WITH_DOCS_TRUE@ if test $$? != 0; then \ -@WITH_DOCS_TRUE@ mkpdf_options="$$mkpdf_options --imgdir=$$part"; \ -@WITH_DOCS_TRUE@ fi; \ -@WITH_DOCS_TRUE@ done; \ -@WITH_DOCS_TRUE@ fi; \ -@WITH_DOCS_TRUE@ gtkdoc-mkpdf --path="$(abs_srcdir)" $$mkpdf_options $(DOC_MODULE) $(DOC_MAIN_SGML_FILE) $(MKPDF_OPTIONS) -@WITH_DOCS_TRUE@ @touch pdf-build.stamp +@ENABLE_DOC_TRUE@pdf-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files) +@ENABLE_DOC_TRUE@ @echo ' DOC Building PDF' +@ENABLE_DOC_TRUE@ @rm -f $(DOC_MODULE).pdf +@ENABLE_DOC_TRUE@ @mkpdf_options=""; \ +@ENABLE_DOC_TRUE@ gtkdoc-mkpdf 2>&1 --help | grep >/dev/null "\-\-verbose"; \ +@ENABLE_DOC_TRUE@ if test "$(?)" = "0"; then \ +@ENABLE_DOC_TRUE@ if test "x$(V)" = "x1"; then \ +@ENABLE_DOC_TRUE@ mkpdf_options="$$mkpdf_options --verbose"; \ +@ENABLE_DOC_TRUE@ fi; \ +@ENABLE_DOC_TRUE@ fi; \ +@ENABLE_DOC_TRUE@ if test "x$(HTML_IMAGES)" != "x"; then \ +@ENABLE_DOC_TRUE@ for img in $(HTML_IMAGES); do \ +@ENABLE_DOC_TRUE@ part=`dirname $$img`; \ +@ENABLE_DOC_TRUE@ echo $$mkpdf_options | grep >/dev/null "\-\-imgdir=$$part "; \ +@ENABLE_DOC_TRUE@ if test $$? != 0; then \ +@ENABLE_DOC_TRUE@ mkpdf_options="$$mkpdf_options --imgdir=$$part"; \ +@ENABLE_DOC_TRUE@ fi; \ +@ENABLE_DOC_TRUE@ done; \ +@ENABLE_DOC_TRUE@ fi; \ +@ENABLE_DOC_TRUE@ gtkdoc-mkpdf --path="$(abs_srcdir)" $$mkpdf_options $(DOC_MODULE) $(DOC_MAIN_SGML_FILE) $(MKPDF_OPTIONS) +@ENABLE_DOC_TRUE@ @touch pdf-build.stamp ############## -@WITH_DOCS_TRUE@clean-local: -@WITH_DOCS_TRUE@ @rm -f *~ *.bak -@WITH_DOCS_TRUE@ @rm -rf .libs - -@WITH_DOCS_TRUE@distclean-local: -@WITH_DOCS_TRUE@ @rm -rf xml html $(REPORT_FILES) $(DOC_MODULE).pdf \ -@WITH_DOCS_TRUE@ $(DOC_MODULE)-decl-list.txt $(DOC_MODULE)-decl.txt -@WITH_DOCS_TRUE@ @if test "$(abs_srcdir)" != "$(abs_builddir)" ; then \ -@WITH_DOCS_TRUE@ rm -f $(SETUP_FILES) $(expand_content_files) $(DOC_MODULE).types; \ -@WITH_DOCS_TRUE@ rm -rf tmpl; \ -@WITH_DOCS_TRUE@ fi - -@WITH_DOCS_TRUE@maintainer-clean-local: clean -@WITH_DOCS_TRUE@ @rm -rf xml html - -@WITH_DOCS_TRUE@install-data-local: -@WITH_DOCS_TRUE@ @installfiles=`echo $(builddir)/html/*`; \ -@WITH_DOCS_TRUE@ if test "$$installfiles" = '$(builddir)/html/*'; \ -@WITH_DOCS_TRUE@ then echo 1>&2 'Nothing to install' ; \ -@WITH_DOCS_TRUE@ else \ -@WITH_DOCS_TRUE@ if test -n "$(DOC_MODULE_VERSION)"; then \ -@WITH_DOCS_TRUE@ installdir="$(DESTDIR)$(TARGET_DIR)-$(DOC_MODULE_VERSION)"; \ -@WITH_DOCS_TRUE@ else \ -@WITH_DOCS_TRUE@ installdir="$(DESTDIR)$(TARGET_DIR)"; \ -@WITH_DOCS_TRUE@ fi; \ -@WITH_DOCS_TRUE@ $(mkinstalldirs) $${installdir} ; \ -@WITH_DOCS_TRUE@ for i in $$installfiles; do \ -@WITH_DOCS_TRUE@ echo ' $(INSTALL_DATA) '$$i ; \ -@WITH_DOCS_TRUE@ $(INSTALL_DATA) $$i $${installdir}; \ -@WITH_DOCS_TRUE@ done; \ -@WITH_DOCS_TRUE@ if test -n "$(DOC_MODULE_VERSION)"; then \ -@WITH_DOCS_TRUE@ mv -f $${installdir}/$(DOC_MODULE).devhelp2 \ -@WITH_DOCS_TRUE@ $${installdir}/$(DOC_MODULE)-$(DOC_MODULE_VERSION).devhelp2; \ -@WITH_DOCS_TRUE@ fi; \ -@WITH_DOCS_TRUE@ $(GTKDOC_REBASE) --relative --dest-dir=$(DESTDIR) --html-dir=$${installdir}; \ -@WITH_DOCS_TRUE@ fi - -@WITH_DOCS_TRUE@uninstall-local: -@WITH_DOCS_TRUE@ @if test -n "$(DOC_MODULE_VERSION)"; then \ -@WITH_DOCS_TRUE@ installdir="$(DESTDIR)$(TARGET_DIR)-$(DOC_MODULE_VERSION)"; \ -@WITH_DOCS_TRUE@ else \ -@WITH_DOCS_TRUE@ installdir="$(DESTDIR)$(TARGET_DIR)"; \ -@WITH_DOCS_TRUE@ fi; \ -@WITH_DOCS_TRUE@ rm -rf $${installdir} +@ENABLE_DOC_TRUE@clean-local: +@ENABLE_DOC_TRUE@ @rm -f *~ *.bak +@ENABLE_DOC_TRUE@ @rm -rf .libs + +@ENABLE_DOC_TRUE@distclean-local: +@ENABLE_DOC_TRUE@ @rm -rf xml html $(REPORT_FILES) $(DOC_MODULE).pdf \ +@ENABLE_DOC_TRUE@ $(DOC_MODULE)-decl-list.txt $(DOC_MODULE)-decl.txt +@ENABLE_DOC_TRUE@ @if test "$(abs_srcdir)" != "$(abs_builddir)" ; then \ +@ENABLE_DOC_TRUE@ rm -f $(SETUP_FILES) $(expand_content_files) $(DOC_MODULE).types; \ +@ENABLE_DOC_TRUE@ rm -rf tmpl; \ +@ENABLE_DOC_TRUE@ fi + +@ENABLE_DOC_TRUE@maintainer-clean-local: clean +@ENABLE_DOC_TRUE@ @rm -rf xml html + +@ENABLE_DOC_TRUE@install-data-local: +@ENABLE_DOC_TRUE@ @installfiles=`echo $(builddir)/html/*`; \ +@ENABLE_DOC_TRUE@ if test "$$installfiles" = '$(builddir)/html/*'; \ +@ENABLE_DOC_TRUE@ then echo 1>&2 'Nothing to install' ; \ +@ENABLE_DOC_TRUE@ else \ +@ENABLE_DOC_TRUE@ if test -n "$(DOC_MODULE_VERSION)"; then \ +@ENABLE_DOC_TRUE@ installdir="$(DESTDIR)$(TARGET_DIR)-$(DOC_MODULE_VERSION)"; \ +@ENABLE_DOC_TRUE@ else \ +@ENABLE_DOC_TRUE@ installdir="$(DESTDIR)$(TARGET_DIR)"; \ +@ENABLE_DOC_TRUE@ fi; \ +@ENABLE_DOC_TRUE@ $(mkinstalldirs) $${installdir} ; \ +@ENABLE_DOC_TRUE@ for i in $$installfiles; do \ +@ENABLE_DOC_TRUE@ echo ' $(INSTALL_DATA) '$$i ; \ +@ENABLE_DOC_TRUE@ $(INSTALL_DATA) $$i $${installdir}; \ +@ENABLE_DOC_TRUE@ done; \ +@ENABLE_DOC_TRUE@ if test -n "$(DOC_MODULE_VERSION)"; then \ +@ENABLE_DOC_TRUE@ mv -f $${installdir}/$(DOC_MODULE).devhelp2 \ +@ENABLE_DOC_TRUE@ $${installdir}/$(DOC_MODULE)-$(DOC_MODULE_VERSION).devhelp2; \ +@ENABLE_DOC_TRUE@ fi; \ +@ENABLE_DOC_TRUE@ $(GTKDOC_REBASE) --relative --dest-dir=$(DESTDIR) --html-dir=$${installdir}; \ +@ENABLE_DOC_TRUE@ fi + +@ENABLE_DOC_TRUE@uninstall-local: +@ENABLE_DOC_TRUE@ @if test -n "$(DOC_MODULE_VERSION)"; then \ +@ENABLE_DOC_TRUE@ installdir="$(DESTDIR)$(TARGET_DIR)-$(DOC_MODULE_VERSION)"; \ +@ENABLE_DOC_TRUE@ else \ +@ENABLE_DOC_TRUE@ installdir="$(DESTDIR)$(TARGET_DIR)"; \ +@ENABLE_DOC_TRUE@ fi; \ +@ENABLE_DOC_TRUE@ rm -rf $${installdir} # # Require gtk-doc when making dist # -@ENABLE_GTK_DOC_TRUE@@WITH_DOCS_TRUE@dist-check-gtkdoc: -@ENABLE_GTK_DOC_FALSE@@WITH_DOCS_TRUE@dist-check-gtkdoc: -@ENABLE_GTK_DOC_FALSE@@WITH_DOCS_TRUE@ @echo "*** gtk-doc must be installed and enabled in order to make dist" -@ENABLE_GTK_DOC_FALSE@@WITH_DOCS_TRUE@ @false - -@WITH_DOCS_TRUE@dist-hook: dist-check-gtkdoc dist-hook-local -@WITH_DOCS_TRUE@ @mkdir $(distdir)/tmpl -@WITH_DOCS_TRUE@ @mkdir $(distdir)/html -@WITH_DOCS_TRUE@ @-cp ./tmpl/*.sgml $(distdir)/tmpl -@WITH_DOCS_TRUE@ @cp ./html/* $(distdir)/html -@WITH_DOCS_TRUE@ @-cp ./$(DOC_MODULE).pdf $(distdir)/ -@WITH_DOCS_TRUE@ @-cp ./$(DOC_MODULE).types $(distdir)/ -@WITH_DOCS_TRUE@ @-cp ./$(DOC_MODULE)-sections.txt $(distdir)/ -@WITH_DOCS_TRUE@ @cd $(distdir) && rm -f $(DISTCLEANFILES) -@WITH_DOCS_TRUE@ @$(GTKDOC_REBASE) --online --relative --html-dir=$(distdir)/html - -@WITH_DOCS_TRUE@.PHONY : dist-hook-local docs +@ENABLE_DOC_TRUE@@ENABLE_GTK_DOC_TRUE@dist-check-gtkdoc: +@ENABLE_DOC_TRUE@@ENABLE_GTK_DOC_FALSE@dist-check-gtkdoc: +@ENABLE_DOC_TRUE@@ENABLE_GTK_DOC_FALSE@ @echo "*** gtk-doc must be installed and enabled in order to make dist" +@ENABLE_DOC_TRUE@@ENABLE_GTK_DOC_FALSE@ @false + +@ENABLE_DOC_TRUE@dist-hook: dist-check-gtkdoc dist-hook-local +@ENABLE_DOC_TRUE@ @mkdir $(distdir)/tmpl +@ENABLE_DOC_TRUE@ @mkdir $(distdir)/html +@ENABLE_DOC_TRUE@ @-cp ./tmpl/*.sgml $(distdir)/tmpl +@ENABLE_DOC_TRUE@ @cp ./html/* $(distdir)/html +@ENABLE_DOC_TRUE@ @-cp ./$(DOC_MODULE).pdf $(distdir)/ +@ENABLE_DOC_TRUE@ @-cp ./$(DOC_MODULE).types $(distdir)/ +@ENABLE_DOC_TRUE@ @-cp ./$(DOC_MODULE)-sections.txt $(distdir)/ +@ENABLE_DOC_TRUE@ @cd $(distdir) && rm -f $(DISTCLEANFILES) +@ENABLE_DOC_TRUE@ @$(GTKDOC_REBASE) --online --relative --html-dir=$(distdir)/html + +@ENABLE_DOC_TRUE@.PHONY : dist-hook-local docs # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. diff --git a/docs/api/generate-settings-spec.c b/docs/api/generate-settings-spec.c index 7a540e3b..b07bd345 100644 --- a/docs/api/generate-settings-spec.c +++ b/docs/api/generate-settings-spec.c @@ -17,7 +17,7 @@ * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, * Boston, MA 02110-1301 USA. * - * (C) Copyright 2009 - 2010 Red Hat, Inc. + * (C) Copyright 2009 - 2012 Red Hat, Inc. */ #include @@ -30,6 +30,7 @@ #include "config.h" #include +#include #include #include #include @@ -48,6 +49,8 @@ #include #include #include +#include +#include #include #include @@ -56,8 +59,11 @@ typedef NMSetting* (*SettingNewFunc) (void); static SettingNewFunc funcs[] = { nm_setting_802_1x_new, + nm_setting_adsl_new, nm_setting_bluetooth_new, nm_setting_bond_new, + nm_setting_bridge_new, + nm_setting_bridge_port_new, nm_setting_cdma_new, nm_setting_connection_new, nm_setting_gsm_new, diff --git a/docs/api/html/NetworkManager.devhelp2 b/docs/api/html/NetworkManager.devhelp2 index 09582676..22bace81 100644 --- a/docs/api/html/NetworkManager.devhelp2 +++ b/docs/api/html/NetworkManager.devhelp2 @@ -4,23 +4,23 @@ - + - - - - - - - - - - - - - + + + + + + + + + + + + + diff --git a/docs/api/html/index.html b/docs/api/html/index.html index 78f850c7..4ad09274 100644 --- a/docs/api/html/index.html +++ b/docs/api/html/index.html @@ -14,11 +14,11 @@
-

Version 0.9.6.4 +

Version 0.9.7.995

Copyright © 2012 The NetworkManager Authors

-

+

Permission is granted to copy, distribute and/or modify this document under the terms of the GNU Free Documentation License, Version 1.1 or any later @@ -46,25 +46,25 @@

D-Bus API Reference
Network Configuration Setting Specification
-
Configuration Settings
+
Configuration Settings
Secret flag types
Migrating from NetworkManager 0.8 to NetworkManager 0.9
-
Architecture and D-Bus API Changes in 0.9
+
Architecture and D-Bus API Changes in 0.9
-
Elimination of the User Settings Service
-
User Secret Agents
-
Settings Service Interface Changes
-
Connection Object Interface Changes
-
Permissions Methods Consolidation
-
AddConnection Returns Object Path of New Connection
-
Support for WiMAX Devices
-
New Device States
-
New Active Connection State
-
Consolidated Modem Devices
-
Secret Property Flags
-
Deprecated Methods Removed
+
Elimination of the User Settings Service
+
User Secret Agents
+
Settings Service Interface Changes
+
Connection Object Interface Changes
+
Permissions Methods Consolidation
+
AddConnection Returns Object Path of New Connection
+
Support for WiMAX Devices
+
New Device States
+
New Active Connection State
+
Consolidated Modem Devices
+
Secret Property Flags
+
Deprecated Methods Removed
Index
diff --git a/docs/api/html/ix01.html b/docs/api/html/ix01.html index 72dc9c03..ce62fb55 100644 --- a/docs/api/html/ix01.html +++ b/docs/api/html/ix01.html @@ -21,7 +21,7 @@

-Index

+Index
diff --git a/docs/api/html/ref-migrating.html b/docs/api/html/ref-migrating.html index 0b2b16d0..665f9bfb 100644 --- a/docs/api/html/ref-migrating.html +++ b/docs/api/html/ref-migrating.html @@ -23,20 +23,20 @@

Migrating from NetworkManager 0.8 to NetworkManager 0.9

-
Architecture and D-Bus API Changes in 0.9
+
Architecture and D-Bus API Changes in 0.9
-
Elimination of the User Settings Service
-
User Secret Agents
-
Settings Service Interface Changes
-
Connection Object Interface Changes
-
Permissions Methods Consolidation
-
AddConnection Returns Object Path of New Connection
-
Support for WiMAX Devices
-
New Device States
-
New Active Connection State
-
Consolidated Modem Devices
-
Secret Property Flags
-
Deprecated Methods Removed
+
Elimination of the User Settings Service
+
User Secret Agents
+
Settings Service Interface Changes
+
Connection Object Interface Changes
+
Permissions Methods Consolidation
+
AddConnection Returns Object Path of New Connection
+
Support for WiMAX Devices
+
New Device States
+
New Active Connection State
+
Consolidated Modem Devices
+
Secret Property Flags
+
Deprecated Methods Removed

@@ -50,14 +50,14 @@

-Architecture and D-Bus API Changes in 0.9

+Architecture and D-Bus API Changes in 0.9

This section details the architectural and D-Bus API changes in NetworkManager 0.9.

-Elimination of the User Settings Service

+Elimination of the User Settings Service

Previously there were two "settings services", or D-Bus services that provided and saved network configuration information. NetworkManager @@ -103,7 +103,7 @@

-User Secret Agents

+User Secret Agents

Even with the elimination of the user settings service, in some cases it is still desirable to store secrets in the user's session and not in @@ -152,7 +152,7 @@

-Settings Service Interface Changes

+Settings Service Interface Changes

With the elimination of the user settings service, the old org.freedesktop.NetworkManagerUserSettings and @@ -190,7 +190,7 @@

-Connection Object Interface Changes

+Connection Object Interface Changes

Consistent with the interface changes to the Settings object, the Connection object's D-Bus interface has changed to @@ -224,7 +224,7 @@

-Permissions Methods Consolidation

+Permissions Methods Consolidation

Previously there were two D-Bus method calls to retrieve the list of operations that a user client could perform, and two signals notifying @@ -256,7 +256,7 @@ are now string-based permissions. The mapping is as follows:

-

Table 20. 

+

Table 23. 

@@ -307,7 +307,7 @@

-AddConnection Returns Object Path of New Connection

+AddConnection Returns Object Path of New Connection

The org.freedesktop.NetworkManager.Settings.AddConnection @@ -325,7 +325,7 @@

-Support for WiMAX Devices

+Support for WiMAX Devices

NetworkManager now supports Intel WiMAX mobile broadband devices. A corresponding device type (NM_DEVICE_TYPE_WIMAX) and @@ -348,7 +348,7 @@

-New Device States

+New Device States

A few new device states have been added, and all device states have been renumbered for flexibility. @@ -363,7 +363,7 @@

-New Active Connection State

+New Active Connection State

Along with the new device states, an additional @@ -379,7 +379,7 @@

-Consolidated Modem Devices

+Consolidated Modem Devices

Many new mobile broadband devices support multiple access families, like Qualcomm Gobi cards (CDMA/EVDO and GSM/UMTS), or multi-mode EVDO/LTE @@ -415,7 +415,7 @@

-Secret Property Flags

+Secret Property Flags

In the Connection object's configuration properties, each setting's secret properties (like WiFi passphrases, or public key passwords, etc) now has @@ -424,7 +424,7 @@ following values:

-

Table 21. 

+

Table 24. 

@@ -486,7 +486,7 @@

-Deprecated Methods Removed

+Deprecated Methods Removed

A few methods and signals of the org.freedesktop.NetworkManager interface deprecated in version 0.7 have been removed. All the @@ -496,7 +496,7 @@ their replacements:

-

Table 22. 

+

Table 25. 

diff --git a/docs/api/html/ref-settings.html b/docs/api/html/ref-settings.html index d87ab35c..8373c83b 100644 --- a/docs/api/html/ref-settings.html +++ b/docs/api/html/ref-settings.html @@ -23,7 +23,7 @@

Network Configuration Setting Specification

-
Configuration Settings
+
Configuration Settings
Secret flag types

@@ -35,11 +35,11 @@

-Configuration Settings

+Configuration Settings

-

Table 1. 802-1x setting

+

Table 1. 802-1x setting

@@ -246,7 +246,76 @@


-

Table 2. bluetooth setting

+

Table 2. adsl setting

+
++++++ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
Key NameValue TypeDefault ValueValue Description
name
string
adsl
The setting's name; these names are defined by the specification and cannot be changed after the object has been created. Each setting class has a name, and all objects of that class share the same name.
username
string
Username used to authenticate with the pppoa service.
password
string
Password used to authenticate with the pppoa service.
password-flags
uint32
0
Flags indicating how to handle the ADSL password. (see the section called “Secret flag types” for flag values)
protocol
string
ADSL connection protocol.
encapsulation
string
Encapsulation of ADSL connection
vpi
uint32
0
VPI of ADSL connection
vci
uint32
0
VCI of ADSL connection

+

+


+

+

+
Table 3. bluetooth setting

 
@@ -285,7 +354,7 @@
 


 

-
Table 3. bond setting

+
Table 4. bond setting

 

 
 

 
@@ -324,7 +393,121 @@
 


 

-
Table 4. cdma setting

+
Table 5. bridge setting

+

 
 

 

++++++
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+






Key NameValue TypeDefault ValueValue Description
name
string
bridge
The setting's name; these names are defined by the specification and cannot be changed after the object has been created.  Each setting class has a name, and all objects of that class share the same name.
interface-name
string
The name of the virtual in-kernel bridging network interface
stp
boolean
TRUE
Controls whether Spanning Tree Protocol (STP) is enabled for this bridge.
priority
uint32
128
Sets the Spanning Tree Protocol (STP) priority for this bridge.  Lower values are 'better'; the lowest priority bridge will be elected the root bridge.
forward-delay
uint32
15
The Spanning Tree Protocol (STP) forwarding delay, in seconds.
hello-time
uint32
2
The Spanning Tree Protocol (STP) hello time, in seconds.
max-age
uint32
20
The Spanning Tree Protocol (STP) maximum message age, in seconds.
ageing-time
uint32
300
The ethernet MAC address aging time, in seconds.

+

+


+

+

+
Table 6. bridge-port setting

+

++++++
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+






Key NameValue TypeDefault ValueValue Description
name
string
bridge-port
The setting's name; these names are defined by the specification and cannot be changed after the object has been created.  Each setting class has a name, and all objects of that class share the same name.
priority
uint32
32
The Spanning Tree Protocol (STP) priority of this bridge port
path-cost
uint32
100
The Spanning Tree Protocol (STP) port cost for destinations via this port.
hairpin-mode
boolean
FALSE
Enables or disabled 'hairpin mode' for the port, which allows frames to be sent back out through the port the frame was received on.

+

+


+

+

+
Table 7. cdma setting

 
@@ -375,7 +558,7 @@
 


 

-
Table 5. connection setting

+
Table 8. connection setting

 

 
 

 
@@ -456,13 +639,19 @@
 
+
+
+
+
+
+

 
 


 Setting name describing the type of slave this connection is (ie, 'bond') or NULL if this connection is not a slave.
 
secondaries
array of string
[]
List of connection UUIDs that should be activated when the base connection itself is activated.

 
 

 

 


 

 

-
Table 6. gsm setting

+
Table 9. gsm setting

 
@@ -523,7 +712,7 @@
 
-
+
@@ -555,7 +744,7 @@
 


 

-
Table 7. infiniband setting

+
Table 10. infiniband setting

 

 
 

network-type

 
int32

 
-1
Network preference to force the device to only use specific network technologies.  The permitted values are: -1: any, 0: 3G only, 1: GPRS/EDGE only, 2: prefer 3G, and 3: prefer 2G.  Note that not all devices allow network preference control.Network preference to force the device to only use specific network technologies.  The permitted values are: -1: any, 0: 3G only, 1: GPRS/EDGE only, 2: prefer 3G, 3: prefer 2G, 4: prefer 4G/LTE, 5: 4G/LTE only. Note that not all devices allow network preference control.
 

 

 
pin

 
@@ -600,7 +789,7 @@
 


 

-
Table 8. ipv4 setting

+
Table 11. ipv4 setting

 

 
 

 
@@ -631,7 +820,7 @@
 
-
+
@@ -667,7 +856,7 @@
 
-
+
@@ -699,7 +888,7 @@
 


 

-
Table 9. ipv6 setting

+
Table 12. ipv6 setting

 

 
 

dns

 
array of uint32

 
[]
List of DNS servers (network byte order). For the 'auto' method, these DNS servers are appended to those (if any) returned by automatic configuration.  DNS servers cannot be used with the 'shared', 'link-local', or 'disabled' methods as there is no usptream network.  In all other methods, these DNS servers are used as the only DNS servers for this connection.List of DNS servers (network byte order). For the 'auto' method, these DNS servers are appended to those (if any) returned by automatic configuration.  DNS servers cannot be used with the 'shared', 'link-local', or 'disabled' methods as there is no upstream network.  In all other methods, these DNS servers are used as the only DNS servers for this connection.
 

 

 
dns-search
dhcp-client-id

 
string

 
A string sent to the DHCP server to identify the local machine which the DHCP server may use to cusomize the DHCP lease and options.A string sent to the DHCP server to identify the local machine which the DHCP server may use to customize the DHCP lease and options.
 

 

 
dhcp-send-hostname

 
@@ -727,6 +916,12 @@
 
+
+
+
+
+
+
@@ -786,7 +981,7 @@
 


 

-
Table 10. 802-11-olpc-mesh setting

+
Table 13. 802-11-olpc-mesh setting

 

 
 

IPv6 configuration method.  If 'auto' is specified then the appropriate automatic method (PPP, router advertisement, etc) is used for the device and most other properties can be left unset.  To force the use of DHCP only, specify 'dhcp'; this method is only valid for ethernet-based hardware.  If 'link-local' is specified, then an IPv6 link-local address will be assigned to the interface.  If 'manual' is specified, static IP addressing is used and at least one IP address must be given in  the 'addresses' property.  If 'ignored' is specified, IPv6 configuration is not done. This property must be set.  NOTE: the 'shared' methodis not yet supported.
 

 
dhcp-hostname
string
The specified name will be sent to the DHCP server when acquiring a lease.

 
dns

 
array of byte array

 
[]

 
@@ -831,7 +1026,7 @@
 


 

-
Table 11. ppp setting

+
Table 14. ppp setting

 

 
 

 
@@ -966,7 +1161,7 @@
 


 

-
Table 12. pppoe setting

+
Table 15. pppoe setting

 

 
 

 
@@ -1017,7 +1212,7 @@
 


 

-
Table 13. serial setting

+
Table 16. serial setting

 

 
 

 
@@ -1074,7 +1269,7 @@
 


 

-
Table 14. vlan setting

+
Table 17. vlan setting

 

 
 

 
@@ -1137,7 +1332,7 @@
 


 

-
Table 15. vpn setting

+
Table 18. vpn setting

 

 
 

 
@@ -1188,7 +1383,7 @@
 


 

-
Table 16. wimax setting

+
Table 19. wimax setting

 

 
 

 
@@ -1227,7 +1422,7 @@
 


 

-
Table 17. 802-3-ethernet setting

+
Table 20. 802-3-ethernet setting

 

 
 

 
@@ -1320,7 +1515,7 @@
 


 

-
Table 18. 802-11-wireless setting

+
Table 21. 802-11-wireless setting

 

 
 

 
@@ -1351,7 +1546,7 @@
 
-
+
@@ -1411,7 +1606,7 @@
 
-
+
@@ -1431,7 +1626,7 @@
 


 

-
Table 19. 802-11-wireless-security setting

+
Table 22. 802-11-wireless-security setting

 

 
 

mode

 
string

 
WiFi network mode; one of 'infrastructure' or 'adhoc'.  If blank, infrastructure is assumed.WiFi network mode; one of 'infrastructure', 'adhoc' or 'ap'.  If blank, infrastructure is assumed.
 

 

 
band
seen-bssids

 
array of string

 
[]
A list of BSSIDs (each BSSID formatted as a MAC address like 00:11:22:33:44:55') that have been detected as part of the WiFI network. NetworkManager internally tracks previously seen BSSIDs so this property is no longer of much use.A list of BSSIDs (each BSSID formatted as a MAC address like 00:11:22:33:44:55') that have been detected as part of the WiFI network. NetworkManager internally tracks previously seen BSSIDs. The property is only meant for reading and reflects the BBSID list of NetworkManager. The changes you make to this property will not be preserved.
 

 

 
security

 
diff --git a/docs/api/html/spec.html b/docs/api/html/spec.html
index 119b02a5..1ff031f6 100644
--- a/docs/api/html/spec.html
+++ b/docs/api/html/spec.html
@@ -1,5 +1,5 @@
 
-NetworkManager D-Bus Interface Specification version 0.9.6.4
NetworkManager D-Bus Interface Specification
Version 0.9.6.4
Copyright (C) 2008 - 2011 Red Hat, Inc.
Copyright (C) 2008 - 2009 Novell, Inc.

+        
NetworkManager D-Bus Interface Specification
Version 0.9.7.995
Copyright (C) 2008 - 2011 Red Hat, Inc.
Copyright (C) 2008 - 2009 Novell, Inc.

 
This program is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
 the Free Software Foundation; either version 2 of the License, or
@@ -112,7 +112,7 @@ General Public License for more details.

 
You should have received a copy of the GNU Lesser General Public
 License along with this library; if not, write to the Free Software
 Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.

-
Interfaces

+
Interfaces
org.freedesktop.NetworkManager
Methods:
GetDevices (
         
         ) →
@@ -255,11 +255,24 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.s

           A combination of logging domains separated by commas (','), or "NONE"
           to disable logging.  Each domain enables logging for operations
-          related to that domain.  Available domains are: [NONE, HW, RFKILL,
-          ETHER, WIFI, BT, MB, DHCP4, DHCP6, PPP, WIFI_SCAN, IP4, IP6, AUTOIP4,
-          DNS, VPN, SHARING, SUPPLICANT, USER_SET, SYS_SET, SUSPEND, CORE,
-          DEVICE, OLPC].  If an empty string is given, the log level is changed
-          but the current set of log domains remains unchanged.
+          related to that domain.  Available domains are: [HW, RFKILL, ETHER,
+          WIFI, BT, MB, DHCP4, DHCP6, PPP, WIFI_SCAN, IP4, IP6, AUTOIP4, DNS,
+          VPN, SHARING, SUPPLICANT, AGENTS, SETTINGS, SUSPEND, CORE, DEVICE,
+          OLPC, WIMAX, INFINIBAND, FIREWALL, ADSL, BOND, VLAN].  In addition to
+          these domains, the following special domains can be used: [NONE, ALL,
+          DEFAULT, DHCP, IP].  If an empty string is given, the log level is
+          changed but the current set of log domains remains unchanged.
+        
GetLogging (
+        
+        ) →
+        s, s

+        Get current logging verbosity level and operations domains.
+      
Returns
level -
+      s

+          One of [ERR, WARN, INFO, DEBUG].
+        
domains -
+      s

+          For available domains see SetLogging() call.
         
state (
         
         ) →
@@ -538,6 +551,10 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.NM_DEVICE_TYPE)
     

         The general type of the network device; ie Ethernet, WiFi, etc.
+      
AvailableConnections -
+      ao -
+      (read)

+        An array of object paths of every configured connection that is currently 'available' through this device.
       
Enumerated types:
NM_DEVICE_STATE
NM_DEVICE_STATE_UNKNOWN = 0

           The device is in an unknown state.
         
NM_DEVICE_STATE_UNMANAGED = 10

@@ -588,6 +605,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
NM_DEVICE_TYPE_ADSL = 12

           The device is an ADSL device supporting PPPoE and PPPoATM protocols.
+        
NM_DEVICE_TYPE_BRIDGE = 13

+          The device is a bridge interface.
         
NM_DEVICE_STATE_REASON
NM_DEVICE_STATE_REASON_UNKNOWN = 0

           The reason for the device state change is unknown.
         
NM_DEVICE_STATE_REASON_NONE = 1

@@ -692,6 +711,12 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
NM_DEVICE_STATE_REASON_BR2684_FAILED = 51

           Problem with the RFC 2684 Ethernet over ADSL bridge.
+        
NM_DEVICE_STATE_REASON_MODEM_MANAGER_UNAVAILABLE = 52

+          ModemManager was not running or quit unexpectedly.
+        
NM_DEVICE_STATE_REASON_SSID_NOT_FOUND = 53

+          The 802.11 Wi-Fi network could not be found.
+        
NM_DEVICE_STATE_REASON_SECONDARY_CONNECTION_FAILED = 54

+          A secondary connection of the base connection failed.
         
Sets of flags:
NM_DEVICE_CAP
NM_DEVICE_CAP_NONE = 0x0
Null capability.
NM_DEVICE_CAP_NM_SUPPORTED = 0x1
The device is supported by NetworkManager.
NM_DEVICE_CAP_CARRIER_DETECT = 0x2
The device supports carrier detection.
Structure types:
NM_DEVICE_STATE_REASON_STRUCT - (
         u: state, u: reason
         )
@@ -1001,6 +1026,28 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
+  
org.freedesktop.NetworkManager.Device.Bridge
Interface has no methods.
Signals:
PropertiesChanged (
+        a{sv}: properties
+        )
Parameters
properties -
+      a{sv}
+      (String_Variant_Map)
+    

+                A dictionary mapping property names to variant boxed values
+            
Properties:
HwAddress -
+      s -
+      (read)

+        Hardware address of the device.
+      
Carrier -
+      b -
+      (read)

+        Indicates whether the physical carrier is found (e.g. whether a cable is plugged in or not).
+      
Slaves -
+      ao -
+      (read)

+        Array of object paths representing devices which are currently
+	slaved to this device.
+      

+
   
org.freedesktop.NetworkManager.Device.Vlan
Interface has no methods.
Signals:
PropertiesChanged (
         a{sv}: properties
         )
Parameters
properties -
@@ -1283,6 +1330,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
NM_ACTIVE_CONNECTION_STATE_DEACTIVATING = 3

           The connection is being torn down and cleaned up.
+        
NM_ACTIVE_CONNECTION_STATE_DEACTIVATED = 4

+          The connection is no longer active.
         

 
   
org.freedesktop.NetworkManager.AgentManager
Methods:
Register (
@@ -1643,7 +1692,19 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
NM_VPN_PLUGIN_FAILURE_BAD_IP_CONFIG = 2

           Invalid IP configuration returned from the VPN plugin.
         

-
Generic types:
Enumerated types:
NM_802_11_MODE
NM_802_11_MODE_UNKNOWN = 0
Mode is unknown.
NM_802_11_MODE_ADHOC = 1
Uncoordinated network without central infrastructure.
NM_802_11_MODE_INFRA = 2
Coordinated network with one or more central controllers.
Mapping types:
String_Variant_Map - a{
+
Generic types:
Enumerated types:
NM_802_11_MODE
NM_802_11_MODE_UNKNOWN = 0
Mode is unknown.
NM_802_11_MODE_ADHOC = 1

+        For both devices and access point objects, indicates the object is
+        part of an Ad-Hoc 802.11 network without a central coordinating access
+        point.
+      
NM_802_11_MODE_INFRA = 2

+        The wireless device or access point is in infrastructure mode.  For
+        devices, this indicates the device is an 802.11 client/station.  For
+        access point objects, this indicates the object is an access point that
+        provides connectivity to clients.
+      
NM_802_11_MODE_AP = 3

+        The device is an access point/hotspot.  Not valid for access point
+        objects themselves.
+      
Mapping types:
String_Variant_Map - a{
         s: Key → v: Value
         }
       
A mapping from strings to variants representing extra
@@ -1687,7 +1748,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.org.freedesktop.NetworkManager.VPN.Error.BadArgumentsInvalid arguments were passed with the request.  FIXME: too general.
   
org.freedesktop.NetworkManager.VPN.Error.LaunchFailed
A binary providing the service failed to launch.
   
org.freedesktop.NetworkManager.VPN.Error.ConnectionInvalid
The request could not be processed because the VPN connection settings were invalid.
-
Index
Index of interfaces
Index of types

 
 

   

+
+  adsl setting
+  
+    
+      
+        Key Name
+        Value Type
+        Default Value
+        Value Description
+      
+    
+    
+      
+        name
+        string
+        adsl
+        The setting's name; these names are defined by the specification and cannot be changed after the object has been created.  Each setting class has a name, and all objects of that class share the same name.
+      
+      
+        username
+        string
+        
+        Username used to authenticate with the pppoa service.
+      
+      
+        password
+        string
+        
+        Password used to authenticate with the pppoa service.
+      
+      
+        password-flags
+        uint32
+        0
+        Flags indicating how to handle the ADSL password. (see  for flag values)
+      
+      
+        protocol
+        string
+        
+        ADSL connection protocol.
+      
+      
+        encapsulation
+        string
+        
+        Encapsulation of ADSL connection
+      
+      
+        vpi
+        uint32
+        0
+        VPI of ADSL connection
+      
+      
+        vci
+        uint32
+        0
+        VCI of ADSL connection
+      
+    
+  
+

 bluetooth setting
@@ -271,6 +334,108 @@
     
   

   
   
 

+
+  bridge setting
+  
+    
+      
+        Key Name
+        Value Type
+        Default Value
+        Value Description
+      
+    
+    
+      
+        name
+        string
+        bridge
+        The setting's name; these names are defined by the specification and cannot be changed after the object has been created.  Each setting class has a name, and all objects of that class share the same name.
+      
+      
+        interface-name
+        string
+        
+        The name of the virtual in-kernel bridging network interface
+      
+      
+        stp
+        boolean
+        TRUE
+        Controls whether Spanning Tree Protocol (STP) is enabled for this bridge.
+      
+      
+        priority
+        uint32
+        128
+        Sets the Spanning Tree Protocol (STP) priority for this bridge.  Lower values are 'better'; the lowest priority bridge will be elected the root bridge.
+      
+      
+        forward-delay
+        uint32
+        15
+        The Spanning Tree Protocol (STP) forwarding delay, in seconds.
+      
+      
+        hello-time
+        uint32
+        2
+        The Spanning Tree Protocol (STP) hello time, in seconds.
+      
+      
+        max-age
+        uint32
+        20
+        The Spanning Tree Protocol (STP) maximum message age, in seconds.
+      
+      
+        ageing-time
+        uint32
+        300
+        The ethernet MAC address aging time, in seconds.
+      
+    
+  
+

+
+  bridge-port setting
+  
+    
+      
+        Key Name
+        Value Type
+        Default Value
+        Value Description
+      
+    
+    
+      
+        name
+        string
+        bridge-port
+        The setting's name; these names are defined by the specification and cannot be changed after the object has been created.  Each setting class has a name, and all objects of that class share the same name.
+      
+      
+        priority
+        uint32
+        32
+        The Spanning Tree Protocol (STP) priority of this bridge port
+      
+      
+        path-cost
+        uint32
+        100
+        The Spanning Tree Protocol (STP) port cost for destinations via this port.
+      
+      
+        hairpin-mode
+        boolean
+        FALSE
+        Enables or disabled 'hairpin mode' for the port, which allows frames to be sent back out through the port the frame was received on.
+      
+    
+  
+

 cdma setting
@@ -394,6 +559,12 @@
         
         Setting name describing the type of slave this connection is (ie, 'bond') or NULL if this connection is not a slave.
       
+      
+        secondaries
+        array of string
+        []
+        List of connection UUIDs that should be activated when the base connection itself is activated.
+      
     
   

   
   
 

@@ -455,7 +626,7 @@
         network-type
         int32
         -1
-        Network preference to force the device to only use specific network technologies.  The permitted values are: -1: any, 0: 3G only, 1: GPRS/EDGE only, 2: prefer 3G, and 3: prefer 2G.  Note that not all devices allow network preference control.
+        Network preference to force the device to only use specific network technologies.  The permitted values are: -1: any, 0: 3G only, 1: GPRS/EDGE only, 2: prefer 3G, 3: prefer 2G, 4: prefer 4G/LTE, 5: 4G/LTE only. Note that not all devices allow network preference control.
       
       
         pin
@@ -551,7 +722,7 @@
         dns
         array of uint32
         []
-        List of DNS servers (network byte order). For the 'auto' method, these DNS servers are appended to those (if any) returned by automatic configuration.  DNS servers cannot be used with the 'shared', 'link-local', or 'disabled' methods as there is no usptream network.  In all other methods, these DNS servers are used as the only DNS servers for this connection.
+        List of DNS servers (network byte order). For the 'auto' method, these DNS servers are appended to those (if any) returned by automatic configuration.  DNS servers cannot be used with the 'shared', 'link-local', or 'disabled' methods as there is no upstream network.  In all other methods, these DNS servers are used as the only DNS servers for this connection.
       
       
         dns-search
@@ -587,7 +758,7 @@
         dhcp-client-id
         string
         
-        A string sent to the DHCP server to identify the local machine which the DHCP server may use to cusomize the DHCP lease and options.
+        A string sent to the DHCP server to identify the local machine which the DHCP server may use to customize the DHCP lease and options.
       
       
         dhcp-send-hostname
@@ -640,6 +811,12 @@
         
         IPv6 configuration method.  If 'auto' is specified then the appropriate automatic method (PPP, router advertisement, etc) is used for the device and most other properties can be left unset.  To force the use of DHCP only, specify 'dhcp'; this method is only valid for ethernet-based hardware.  If 'link-local' is specified, then an IPv6 link-local address will be assigned to the interface.  If 'manual' is specified, static IP addressing is used and at least one IP address must be given in  the 'addresses' property.  If 'ignored' is specified, IPv6 configuration is not done. This property must be set.  NOTE: the 'shared' methodis not yet supported.
       
+      
+        dhcp-hostname
+        string
+        
+        The specified name will be sent to the DHCP server when acquiring a lease.
+      
       
         dns
         array of byte array
@@ -1211,7 +1388,7 @@
         mode
         string
         
-        WiFi network mode; one of 'infrastructure' or 'adhoc'.  If blank, infrastructure is assumed.
+        WiFi network mode; one of 'infrastructure', 'adhoc' or 'ap'.  If blank, infrastructure is assumed.
       
       
         band
@@ -1271,7 +1448,7 @@
         seen-bssids
         array of string
         []
-        A list of BSSIDs (each BSSID formatted as a MAC address like 00:11:22:33:44:55') that have been detected as part of the WiFI network. NetworkManager internally tracks previously seen BSSIDs so this property is no longer of much use.
+        A list of BSSIDs (each BSSID formatted as a MAC address like 00:11:22:33:44:55') that have been detected as part of the WiFI network. NetworkManager internally tracks previously seen BSSIDs. The property is only meant for reading and reflects the BBSID list of NetworkManager. The changes you make to this property will not be preserved.
       
       
         security
diff --git a/docs/api/spec.html b/docs/api/spec.html
index 119b02a5..1ff031f6 100644
--- a/docs/api/spec.html
+++ b/docs/api/spec.html
@@ -1,5 +1,5 @@
 
-NetworkManager D-Bus Interface Specification version 0.9.6.4
NetworkManager D-Bus Interface Specification
Version 0.9.6.4
Copyright (C) 2008 - 2011 Red Hat, Inc.
Copyright (C) 2008 - 2009 Novell, Inc.

+        
NetworkManager D-Bus Interface Specification
Version 0.9.7.995
Copyright (C) 2008 - 2011 Red Hat, Inc.
Copyright (C) 2008 - 2009 Novell, Inc.

 
This program is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
 the Free Software Foundation; either version 2 of the License, or
@@ -112,7 +112,7 @@ General Public License for more details.

 
You should have received a copy of the GNU Lesser General Public
 License along with this library; if not, write to the Free Software
 Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.

-
Interfaces

+
Interfaces

   
org.freedesktop.NetworkManager
Methods:
GetDevices (
         
         ) →
@@ -255,11 +255,24 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.s

           A combination of logging domains separated by commas (','), or "NONE"
           to disable logging.  Each domain enables logging for operations
-          related to that domain.  Available domains are: [NONE, HW, RFKILL,
-          ETHER, WIFI, BT, MB, DHCP4, DHCP6, PPP, WIFI_SCAN, IP4, IP6, AUTOIP4,
-          DNS, VPN, SHARING, SUPPLICANT, USER_SET, SYS_SET, SUSPEND, CORE,
-          DEVICE, OLPC].  If an empty string is given, the log level is changed
-          but the current set of log domains remains unchanged.
+          related to that domain.  Available domains are: [HW, RFKILL, ETHER,
+          WIFI, BT, MB, DHCP4, DHCP6, PPP, WIFI_SCAN, IP4, IP6, AUTOIP4, DNS,
+          VPN, SHARING, SUPPLICANT, AGENTS, SETTINGS, SUSPEND, CORE, DEVICE,
+          OLPC, WIMAX, INFINIBAND, FIREWALL, ADSL, BOND, VLAN].  In addition to
+          these domains, the following special domains can be used: [NONE, ALL,
+          DEFAULT, DHCP, IP].  If an empty string is given, the log level is
+          changed but the current set of log domains remains unchanged.
+        
GetLogging (
+        
+        ) →
+        s, s

+        Get current logging verbosity level and operations domains.
+      
Returns
level -
+      s

+          One of [ERR, WARN, INFO, DEBUG].
+        
domains -
+      s

+          For available domains see SetLogging() call.
         
state (
         
         ) →
@@ -538,6 +551,10 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.NM_DEVICE_TYPE)
     

         The general type of the network device; ie Ethernet, WiFi, etc.
+      
AvailableConnections -
+      ao -
+      (read)

+        An array of object paths of every configured connection that is currently 'available' through this device.
       
Enumerated types:
NM_DEVICE_STATE
NM_DEVICE_STATE_UNKNOWN = 0

           The device is in an unknown state.
         
NM_DEVICE_STATE_UNMANAGED = 10

@@ -588,6 +605,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
NM_DEVICE_TYPE_ADSL = 12

           The device is an ADSL device supporting PPPoE and PPPoATM protocols.
+        
NM_DEVICE_TYPE_BRIDGE = 13

+          The device is a bridge interface.
         
NM_DEVICE_STATE_REASON
NM_DEVICE_STATE_REASON_UNKNOWN = 0

           The reason for the device state change is unknown.
         
NM_DEVICE_STATE_REASON_NONE = 1

@@ -692,6 +711,12 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
NM_DEVICE_STATE_REASON_BR2684_FAILED = 51

           Problem with the RFC 2684 Ethernet over ADSL bridge.
+        
NM_DEVICE_STATE_REASON_MODEM_MANAGER_UNAVAILABLE = 52

+          ModemManager was not running or quit unexpectedly.
+        
NM_DEVICE_STATE_REASON_SSID_NOT_FOUND = 53

+          The 802.11 Wi-Fi network could not be found.
+        
NM_DEVICE_STATE_REASON_SECONDARY_CONNECTION_FAILED = 54

+          A secondary connection of the base connection failed.
         
Sets of flags:
NM_DEVICE_CAP
NM_DEVICE_CAP_NONE = 0x0
Null capability.
NM_DEVICE_CAP_NM_SUPPORTED = 0x1
The device is supported by NetworkManager.
NM_DEVICE_CAP_CARRIER_DETECT = 0x2
The device supports carrier detection.
Structure types:
NM_DEVICE_STATE_REASON_STRUCT - (
         u: state, u: reason
         )
@@ -1001,6 +1026,28 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
+  
org.freedesktop.NetworkManager.Device.Bridge
Interface has no methods.
Signals:
PropertiesChanged (
+        a{sv}: properties
+        )
Parameters
properties -
+      a{sv}
+      (String_Variant_Map)
+    

+                A dictionary mapping property names to variant boxed values
+            
Properties:
HwAddress -
+      s -
+      (read)

+        Hardware address of the device.
+      
Carrier -
+      b -
+      (read)

+        Indicates whether the physical carrier is found (e.g. whether a cable is plugged in or not).
+      
Slaves -
+      ao -
+      (read)

+        Array of object paths representing devices which are currently
+	slaved to this device.
+      

+
   
org.freedesktop.NetworkManager.Device.Vlan
Interface has no methods.
Signals:
PropertiesChanged (
         a{sv}: properties
         )
Parameters
properties -
@@ -1283,6 +1330,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
NM_ACTIVE_CONNECTION_STATE_DEACTIVATING = 3

           The connection is being torn down and cleaned up.
+        
NM_ACTIVE_CONNECTION_STATE_DEACTIVATED = 4

+          The connection is no longer active.
         

 
   
org.freedesktop.NetworkManager.AgentManager
Methods:
Register (
@@ -1643,7 +1692,19 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
NM_VPN_PLUGIN_FAILURE_BAD_IP_CONFIG = 2

           Invalid IP configuration returned from the VPN plugin.
         

-
Generic types:
Enumerated types:
NM_802_11_MODE
NM_802_11_MODE_UNKNOWN = 0
Mode is unknown.
NM_802_11_MODE_ADHOC = 1
Uncoordinated network without central infrastructure.
NM_802_11_MODE_INFRA = 2
Coordinated network with one or more central controllers.
Mapping types:
String_Variant_Map - a{
+
Generic types:
Enumerated types:
NM_802_11_MODE
NM_802_11_MODE_UNKNOWN = 0
Mode is unknown.
NM_802_11_MODE_ADHOC = 1

+        For both devices and access point objects, indicates the object is
+        part of an Ad-Hoc 802.11 network without a central coordinating access
+        point.
+      
NM_802_11_MODE_INFRA = 2

+        The wireless device or access point is in infrastructure mode.  For
+        devices, this indicates the device is an 802.11 client/station.  For
+        access point objects, this indicates the object is an access point that
+        provides connectivity to clients.
+      
NM_802_11_MODE_AP = 3

+        The device is an access point/hotspot.  Not valid for access point
+        objects themselves.
+      
Mapping types:
String_Variant_Map - a{
         s: Key → v: Value
         }
       
A mapping from strings to variants representing extra
@@ -1687,7 +1748,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.org.freedesktop.NetworkManager.VPN.Error.BadArgumentsInvalid arguments were passed with the request.  FIXME: too general.
   
org.freedesktop.NetworkManager.VPN.Error.LaunchFailed
A binary providing the service failed to launch.
   
org.freedesktop.NetworkManager.VPN.Error.ConnectionInvalid
The request could not be processed because the VPN connection settings were invalid.
-
Index
Index of interfaces
Index of types
  • NM_802_11_AP_FLAGS
+
    Index
    Index of interfaces
    Index of types
    • NM_802_11_AP_FLAGS
     - u
    • NM_802_11_AP_SEC
     - u
    • NM_802_11_DEVICE_CAP
     - u
    • NM_802_11_MODE
diff --git a/docs/api/version.xml b/docs/api/version.xml
index f6c687fe..fa572dcf 100644
--- a/docs/api/version.xml
+++ b/docs/api/version.xml
@@ -1 +1 @@
-0.9.6.4
+0.9.7.995
diff --git a/docs/libnm-glib/Makefile.am b/docs/libnm-glib/Makefile.am
index a2a7d776..84807e25 100644
--- a/docs/libnm-glib/Makefile.am
+++ b/docs/libnm-glib/Makefile.am
@@ -10,7 +10,7 @@ DOC_MAIN_SGML_FILE=$(DOC_MODULE)-docs.xml
 # The directory containing the source code. Relative to $(srcdir).
 # gtk-doc will search all .c & .h files beneath here for inline comments
 # documenting functions and macros.
-DOC_SOURCE_DIR=../../libnm-glib
+DOC_SOURCE_DIR=$(top_srcdir)/libnm-glib
 
 # Extra options to supply to gtkdoc-scan.
 SCAN_OPTIONS=
@@ -71,8 +71,11 @@ extra_files = libnm-glib.png
 # if $(DOC_MODULE).types is non-empty.
 GTKDOC_CFLAGS =				\
 	-I$(top_srcdir)/include		\
+	-I$(top_builddir)/include	\
 	-I$(top_srcdir)/libnm-util	\
+	-I$(top_builddir)/libnm-util	\
 	-I$(top_srcdir)/libnm-glib	\
+	-I$(top_builddir)/libnm-glib	\
 	$(GLIB_CFLAGS)			\
 	$(DBUS_CFLAGS)
 
@@ -88,6 +91,7 @@ EXTRA_DIST += version.xml.in
 
 CLEANFILES += \
 	libnm-glib-sections.txt \
+	libnm-glib-overrides.txt \
 	html/* \
 	tmpl/* \
 	xml/*
diff --git a/docs/libnm-glib/Makefile.in b/docs/libnm-glib/Makefile.in
index 717cfbf0..d41fbdc9 100644
--- a/docs/libnm-glib/Makefile.in
+++ b/docs/libnm-glib/Makefile.in
@@ -61,16 +61,18 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
 subdir = docs/libnm-glib
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/compiler_warnings.m4 \
-	$(top_srcdir)/m4/gettext.m4 $(top_srcdir)/m4/gtk-doc.m4 \
-	$(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/intlmacosx.m4 \
-	$(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/introspection.m4 \
-	$(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \
-	$(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/libnl-check.m4 \
-	$(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \
-	$(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
-	$(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/nls.m4 \
-	$(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/progtest.m4 \
-	$(top_srcdir)/m4/vapigen.m4 $(top_srcdir)/configure.ac
+	$(top_srcdir)/m4/gettext.m4 \
+	$(top_srcdir)/m4/gnome-code-coverage.m4 \
+	$(top_srcdir)/m4/gtk-doc.m4 $(top_srcdir)/m4/iconv.m4 \
+	$(top_srcdir)/m4/intlmacosx.m4 $(top_srcdir)/m4/intltool.m4 \
+	$(top_srcdir)/m4/introspection.m4 $(top_srcdir)/m4/lib-ld.m4 \
+	$(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \
+	$(top_srcdir)/m4/libnl-check.m4 $(top_srcdir)/m4/libtool.m4 \
+	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
+	$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
+	$(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/po.m4 \
+	$(top_srcdir)/m4/progtest.m4 $(top_srcdir)/m4/vapigen.m4 \
+	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(install_sh) -d
@@ -103,6 +105,10 @@ AWK = @AWK@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
+CKDB_PATH = @CKDB_PATH@
+CODE_COVERAGE_CFLAGS = @CODE_COVERAGE_CFLAGS@
+CODE_COVERAGE_ENABLED = @CODE_COVERAGE_ENABLED@
+CODE_COVERAGE_LDFLAGS = @CODE_COVERAGE_LDFLAGS@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CXX = @CXX@
@@ -117,9 +123,7 @@ DBUS_SYS_DIR = @DBUS_SYS_DIR@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
 DHCLIENT_PATH = @DHCLIENT_PATH@
-DHCLIENT_VERSION = @DHCLIENT_VERSION@
 DHCPCD_PATH = @DHCPCD_PATH@
-DISABLE_DEPRECATED = @DISABLE_DEPRECATED@
 DLLTOOL = @DLLTOOL@
 DSYMUTIL = @DSYMUTIL@
 DUMPBIN = @DUMPBIN@
@@ -129,17 +133,14 @@ ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
 FGREP = @FGREP@
+GENHTML = @GENHTML@
 GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
 GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
-GIO_CFLAGS = @GIO_CFLAGS@
-GIO_LIBS = @GIO_LIBS@
 GLIB_CFLAGS = @GLIB_CFLAGS@
 GLIB_GENMARSHAL = @GLIB_GENMARSHAL@
 GLIB_LIBS = @GLIB_LIBS@
 GLIB_MAKEFILE = @GLIB_MAKEFILE@
 GLIB_MKENUMS = @GLIB_MKENUMS@
-GMODULE_CFLAGS = @GMODULE_CFLAGS@
-GMODULE_LIBS = @GMODULE_LIBS@
 GMSGFMT = @GMSGFMT@
 GMSGFMT_015 = @GMSGFMT_015@
 GNUTLS_CFLAGS = @GNUTLS_CFLAGS@
@@ -180,6 +181,7 @@ IPTABLES_PATH = @IPTABLES_PATH@
 IWMX_SDK_CFLAGS = @IWMX_SDK_CFLAGS@
 IWMX_SDK_LIBS = @IWMX_SDK_LIBS@
 KERNEL_FIRMWARE_DIR = @KERNEL_FIRMWARE_DIR@
+LCOV = @LCOV@
 LD = @LD@
 LDFLAGS = @LDFLAGS@
 LIBDL = @LIBDL@
@@ -196,11 +198,7 @@ LIBNL2_LIBS = @LIBNL2_LIBS@
 LIBNL3_CFLAGS = @LIBNL3_CFLAGS@
 LIBNL3_LIBS = @LIBNL3_LIBS@
 LIBNL_CFLAGS = @LIBNL_CFLAGS@
-LIBNL_GENL3_CFLAGS = @LIBNL_GENL3_CFLAGS@
-LIBNL_GENL3_LIBS = @LIBNL_GENL3_LIBS@
 LIBNL_LIBS = @LIBNL_LIBS@
-LIBNL_ROUTE3_CFLAGS = @LIBNL_ROUTE3_CFLAGS@
-LIBNL_ROUTE3_LIBS = @LIBNL_ROUTE3_LIBS@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
 LIBSOUP_CFLAGS = @LIBSOUP_CFLAGS@
@@ -215,6 +213,8 @@ MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MANIFEST_TOOL = @MANIFEST_TOOL@
 MKDIR_P = @MKDIR_P@
+MM_GLIB_CFLAGS = @MM_GLIB_CFLAGS@
+MM_GLIB_LIBS = @MM_GLIB_LIBS@
 MOC = @MOC@
 MSGFMT = @MSGFMT@
 MSGFMT_015 = @MSGFMT_015@
@@ -224,6 +224,7 @@ NMEDIT = @NMEDIT@
 NM_MAJOR_VERSION = @NM_MAJOR_VERSION@
 NM_MICRO_VERSION = @NM_MICRO_VERSION@
 NM_MINOR_VERSION = @NM_MINOR_VERSION@
+NM_MODIFY_SYSTEM_POLICY = @NM_MODIFY_SYSTEM_POLICY@
 NM_VERSION = @NM_VERSION@
 NSS_CFLAGS = @NSS_CFLAGS@
 NSS_LIBS = @NSS_LIBS@
@@ -250,13 +251,14 @@ PPPD_PLUGIN_DIR = @PPPD_PLUGIN_DIR@
 QT_CFLAGS = @QT_CFLAGS@
 QT_LIBS = @QT_LIBS@
 RANLIB = @RANLIB@
-RESOLVCONF_PATH = @RESOLVCONF_PATH@
 SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
-SYSTEMD_CFLAGS = @SYSTEMD_CFLAGS@
-SYSTEMD_LIBS = @SYSTEMD_LIBS@
+SYSTEMD_INHIBIT_CFLAGS = @SYSTEMD_INHIBIT_CFLAGS@
+SYSTEMD_INHIBIT_LIBS = @SYSTEMD_INHIBIT_LIBS@
+SYSTEMD_LOGIN_CFLAGS = @SYSTEMD_LOGIN_CFLAGS@
+SYSTEMD_LOGIN_LIBS = @SYSTEMD_LOGIN_LIBS@
 SYSTEM_CA_PATH = @SYSTEM_CA_PATH@
 UDEV_BASE_DIR = @UDEV_BASE_DIR@
 USE_NLS = @USE_NLS@
@@ -311,6 +313,11 @@ localedir = @localedir@
 localstatedir = @localstatedir@
 mandir = @mandir@
 mkdir_p = @mkdir_p@
+nmbinary = @nmbinary@
+nmconfdir = @nmconfdir@
+nmdatadir = @nmdatadir@
+nmrundir = @nmrundir@
+nmstatedir = @nmstatedir@
 oldincludedir = @oldincludedir@
 pdfdir = @pdfdir@
 prefix = @prefix@
@@ -325,6 +332,10 @@ target_alias = @target_alias@
 top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
+with_dhclient = @with_dhclient@
+with_dhcpcd = @with_dhcpcd@
+with_netconfig = @with_netconfig@
+with_resolvconf = @with_resolvconf@
 AUTOMAKE_OPTIONS = 1.6
 
 # The name of the module
@@ -336,7 +347,7 @@ DOC_MAIN_SGML_FILE = $(DOC_MODULE)-docs.xml
 # The directory containing the source code. Relative to $(srcdir).
 # gtk-doc will search all .c & .h files beneath here for inline comments
 # documenting functions and macros.
-DOC_SOURCE_DIR = ../../libnm-glib
+DOC_SOURCE_DIR = $(top_srcdir)/libnm-glib
 
 # Extra options to supply to gtkdoc-scan.
 SCAN_OPTIONS = 
@@ -397,8 +408,11 @@ extra_files = libnm-glib.png
 # if $(DOC_MODULE).types is non-empty.
 GTKDOC_CFLAGS = \
 	-I$(top_srcdir)/include		\
+	-I$(top_builddir)/include	\
 	-I$(top_srcdir)/libnm-util	\
+	-I$(top_builddir)/libnm-util	\
 	-I$(top_srcdir)/libnm-glib	\
+	-I$(top_builddir)/libnm-glib	\
 	$(GLIB_CFLAGS)			\
 	$(DBUS_CFLAGS)
 
@@ -446,7 +460,8 @@ REPORT_FILES = \
 	$(DOC_MODULE)-unused.txt
 
 CLEANFILES = $(SCANOBJ_FILES) $(REPORT_FILES) $(DOC_STAMPS) \
-	libnm-glib-sections.txt html/* tmpl/* xml/*
+	libnm-glib-sections.txt libnm-glib-overrides.txt html/* tmpl/* \
+	xml/*
 @ENABLE_GTK_DOC_TRUE@@GTK_DOC_BUILD_HTML_FALSE@HTML_BUILD_STAMP = 
 @ENABLE_GTK_DOC_TRUE@@GTK_DOC_BUILD_HTML_TRUE@HTML_BUILD_STAMP = html-build.stamp
 @ENABLE_GTK_DOC_TRUE@@GTK_DOC_BUILD_PDF_FALSE@PDF_BUILD_STAMP = 
diff --git a/docs/libnm-glib/html/NMAccessPoint.html b/docs/libnm-glib/html/NMAccessPoint.html
index 4b43358c..a205b980 100644
--- a/docs/libnm-glib/html/NMAccessPoint.html
+++ b/docs/libnm-glib/html/NMAccessPoint.html
@@ -597,7 +597,9 @@ The maximum bit rate of the access point.
 
      The "mode" property
      
 
        "mode"                     guint                 : Read
      
 
      
-The mode of the access point.
+The mode of the access point; either "infrastructure" (a central
+coordinator of the wireless network allowing clients to connect) or
+"ad-hoc" (a network with no central controller).
 
      
 
      Allowed values: [1,2]
      
 
      Default value: 2
      
diff --git a/docs/libnm-glib/html/NMClient.html b/docs/libnm-glib/html/NMClient.html
index 3e02012b..cb771ba8 100644
--- a/docs/libnm-glib/html/NMClient.html
+++ b/docs/libnm-glib/html/NMClient.html
@@ -685,7 +685,10 @@ Gets a 
 
      nm_client_get_devices ()
      
 
      const GPtrArray *   nm_client_get_devices               (NMClient *client);
      
 
      
-Gets all the detected devices.
+Gets all the known network devices.  Use nm_device_get_type() or the
+NM_IS_DEVICE_XXXX() functions to determine what kind of device member of the
+returned array is, and then you may use device-specific methods such as
+nm_device_ethernet_get_hw_address().
 
      
 
      @@ -697,8 +700,9 @@ Gets all the detected devices.
 
-
diff --git a/docs/libnm-glib/html/NMDevice.html b/docs/libnm-glib/html/NMDevice.html
index fd8061ce..86536c2c 100644
--- a/docs/libnm-glib/html/NMDevice.html
+++ b/docs/libnm-glib/html/NMDevice.html
@@ -122,6 +122,7 @@ const char *        NMDeviceAdsl
                +----NMDeviceInfiniband
                +----NMDeviceBond
+               +----NMDeviceBridge
                +----NMDeviceVlan
diff --git a/docs/libnm-glib/html/NMDeviceBond.html b/docs/libnm-glib/html/NMDeviceBond.html
index 9cb2c551..9f08c415 100644
--- a/docs/libnm-glib/html/NMDeviceBond.html
+++ b/docs/libnm-glib/html/NMDeviceBond.html
@@ -7,7 +7,7 @@
 
-
+
@@ -18,7 +18,7 @@
 
-
+
-
+
      
+
      nm_setting_connection_add_secondary ()
      
+
      gboolean            nm_setting_connection_add_secondary (NMSettingConnection *setting,
+                                                         const char *sec_uuid);
      
+
      
+Adds a new secondary connetion UUID to the setting.
+
      
+
      
 

 
      
 
      Returns :
      		a GPtrArray containing all the NMDevices.
-The returned array is owned by the client and should not be modified. [transfer none][element-type NMClient.Device]
+a GPtrArray
+containing all the NMDevices.  The returned array is owned by the
+NMClient object and should not be modified. [transfer none][element-type NMClient.Device]
 
 
      
       
 
 
 
 
 
 
 
      Up
 Home
 libnm-glib Reference ManualNextNext
 
      
 
      
 Top
diff --git a/docs/libnm-glib/html/NMDeviceBridge.html b/docs/libnm-glib/html/NMDeviceBridge.html
new file mode 100644
index 00000000..4a9b431f
--- /dev/null
+++ b/docs/libnm-glib/html/NMDeviceBridge.html
@@ -0,0 +1,331 @@
+
+
+
+
+NMDeviceBridge
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
      
+
      
+
      
+
+
+
      
+
      NMDeviceBridge
      
+
      NMDeviceBridge
      
+
      
+
      
+
      Synopsis
      
+
                          NMDeviceBridge;
+                    NMDeviceBridgeClass;
+enum                NMDeviceBridgeError;
+#define             NM_DEVICE_BRIDGE_CARRIER
+#define             NM_DEVICE_BRIDGE_ERROR
+#define             NM_DEVICE_BRIDGE_HW_ADDRESS
+#define             NM_DEVICE_BRIDGE_SLAVES
+GQuark              nm_device_bridge_error_quark        (void);
+gboolean            nm_device_bridge_get_carrier        (NMDeviceBridge *device);
+const char *        nm_device_bridge_get_hw_address     (NMDeviceBridge *device);
+const GPtrArray *   nm_device_bridge_get_slaves         (NMDeviceBridge *device);
+GObject *           nm_device_bridge_new                (DBusGConnection *connection,
+                                                         const char *path);
+
      
+
      
+
      
+
      Object Hierarchy
      
+
      +  GObject
+   +----NMObject
+         +----NMDevice
+               +----NMDeviceBridge
+
      
+
      
+
      
+
      Implemented Interfaces
      
+
      
+NMDeviceBridge implements
+ GInitable and  GAsyncInitable.
      
+
      
+
      
+
      Properties
      
+
      +  "carrier"                  gboolean              : Read
+  "hw-address"               gchar*                : Read
+  "slaves"                   NMObjectArray*        : Read
+
      
+
      
+
      
+
      Description
      
+
      
+
      
+
      
+
      
+
      Details
      
+
      
+
      NMDeviceBridge
      
+
      typedef struct _NMDeviceBridge NMDeviceBridge;
      
+
      
+
      
+
      
+
      
+
      
+
      NMDeviceBridgeClass
      
+
      typedef struct {
+	NMDeviceClass parent;
+
+	/* Padding for future expansion */
+	void (*_reserved1) (void);
+	void (*_reserved2) (void);
+	void (*_reserved3) (void);
+	void (*_reserved4) (void);
+	void (*_reserved5) (void);
+	void (*_reserved6) (void);
+} NMDeviceBridgeClass;
+
      
+
      
+
      
+
      
+
      
+
      
+
      enum NMDeviceBridgeError
      
+
      typedef enum {
+	NM_DEVICE_BRIDGE_ERROR_UNKNOWN = 0,               /*< nick=UnknownError >*/
+	NM_DEVICE_BRIDGE_ERROR_NOT_BRIDGE_CONNECTION,     /*< nick=NotBridgeConnection >*/
+	NM_DEVICE_BRIDGE_ERROR_INVALID_BRIDGE_CONNECTION, /*< nick=InvalidBridgeConnection >*/
+	NM_DEVICE_BRIDGE_ERROR_INTERFACE_MISMATCH,        /*< nick=InterfaceMismatch >*/
+} NMDeviceBridgeError;
+
      
+
      
++
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
      

      NM_DEVICE_BRIDGE_ERROR_UNKNOWN
      		unknown or unclassified error
+
      NM_DEVICE_BRIDGE_ERROR_NOT_BRIDGE_CONNECTION
      		the connection was not of bridge type
+
      NM_DEVICE_BRIDGE_ERROR_INVALID_BRIDGE_CONNECTION
      		the bridge connection was invalid
+
      NM_DEVICE_BRIDGE_ERROR_INTERFACE_MISMATCH
      		the interfaces of the connection and the device mismatched
+
      
+
      
+
      
+
      
+
      NM_DEVICE_BRIDGE_CARRIER
      
+
      #define NM_DEVICE_BRIDGE_CARRIER     "carrier"
+
      
+
      
+
      
+
      
+
      
+
      
+
      NM_DEVICE_BRIDGE_ERROR
      
+
      #define NM_DEVICE_BRIDGE_ERROR nm_device_bridge_error_quark ()
+
      
+
      
+
      
+
      
+
      
+
      
+
      NM_DEVICE_BRIDGE_HW_ADDRESS
      
+
      #define NM_DEVICE_BRIDGE_HW_ADDRESS  "hw-address"
+
      
+
      
+
      
+
      
+
      
+
      
+
      NM_DEVICE_BRIDGE_SLAVES
      
+
      #define NM_DEVICE_BRIDGE_SLAVES      "slaves"
+
      
+
      
+
      
+
      
+
      
+
      
+
      nm_device_bridge_error_quark ()
      
+
      GQuark              nm_device_bridge_error_quark        (void);
      
+
      
+Registers an error quark for NMDeviceBridge if necessary.
+
      
+
      
++
+
+
+
+
      

      Returns :
      		the error quark used for NMDeviceBridge errors.
      
+
      
+
      
+
      
+
      nm_device_bridge_get_carrier ()
      
+
      gboolean            nm_device_bridge_get_carrier        (NMDeviceBridge *device);
      
+
      
+Whether the device has carrier.
+
      
+
      
++
+
+
+
+
+
+
+
+
+
+
      

      device :
      		a NMDeviceBridge
+
      Returns :
      		
+TRUE if the device has carrier
      
+
      
+
      
+
      
+
      nm_device_bridge_get_hw_address ()
      
+
      const char *        nm_device_bridge_get_hw_address     (NMDeviceBridge *device);
      
+
      
+Gets the hardware (MAC) address of the NMDeviceBridge
+
      
+
      
++
+
+
+
+
+
+
+
+
+
+
      

      device :
      		a NMDeviceBridge
+
      Returns :
      		the hardware address. This is the internal string used by the
+device, and must not be modified.
      
+
      
+
      
+
      
+
      nm_device_bridge_get_slaves ()
      
+
      const GPtrArray *   nm_device_bridge_get_slaves         (NMDeviceBridge *device);
      
+
      
+Gets the devices currently slaved to device.
+
      
+
      
++
+
+
+
+
+
+
+
+
+
+
      

      device :
      		a NMDeviceBridge
+
      Returns :
      		the GPtrArray containing
+NMDevices that are slaves of device. This is the internal
+copy used by the device, and must not be modified. [element-type NMClient.Device]
+
      
+
      
+
      
+
      
+
      nm_device_bridge_new ()
      
+
      GObject *           nm_device_bridge_new                (DBusGConnection *connection,
+                                                         const char *path);
      
+
      
+Creates a new NMDeviceBridge.
+
      
+
      
++
+
+
+
+
+
+
+
+
+
+
+
+
+
+
      

      connection :
      		the DBusGConnection
+
      path :
      		the DBus object path of the device
      Returns :
      		a new device. [transfer full]
+
      
+
      
+
      
+
      
+
      Property Details
      
+
      
+
      The "carrier" property
      
+
        "carrier"                  gboolean              : Read
      
+
      
+Whether the device has carrier.
+
      
+
      Default value: FALSE
      
+
      
+
      
+
      
+
      The "hw-address" property
      
+
        "hw-address"               gchar*                : Read
      
+
      
+The hardware (MAC) address of the device.
+
      
+
      Default value: NULL
      
+
      
+
      
+
      
+
      The "slaves" property
      
+
        "slaves"                   NMObjectArray*        : Read
      
+
      
+The devices (NMDevice) slaved to the bridge device.
+
      
+
      
+
      
+
      
+
      
+
      
+          Generated by GTK-Doc V1.18
      
+
+
\ No newline at end of file
diff --git a/docs/libnm-glib/html/NMDeviceInfiniband.html b/docs/libnm-glib/html/NMDeviceInfiniband.html
index c4253e5d..4b0b5791 100644
--- a/docs/libnm-glib/html/NMDeviceInfiniband.html
+++ b/docs/libnm-glib/html/NMDeviceInfiniband.html
@@ -6,7 +6,7 @@
 
 
 
-
+
 
 
 
@@ -14,7 +14,7 @@
 
 
-
+
diff --git a/docs/libnm-glib/html/NMDeviceWifi.html b/docs/libnm-glib/html/NMDeviceWifi.html
index e41712f3..d4976feb 100644
--- a/docs/libnm-glib/html/NMDeviceWifi.html
+++ b/docs/libnm-glib/html/NMDeviceWifi.html
@@ -523,7 +523,7 @@ The hardware (MAC) address of the device.
 
      
 The mode of the device.
 
      
-
      Allowed values: <= 2
      
+
      Allowed values: <= 3
      Default value: 2
      
diff --git a/docs/libnm-glib/html/NMSecretAgent.html b/docs/libnm-glib/html/NMSecretAgent.html
index 61a4048a..e18588c4 100644
--- a/docs/libnm-glib/html/NMSecretAgent.html
+++ b/docs/libnm-glib/html/NMSecretAgent.html
@@ -214,7 +214,11 @@ should be called.
 
-
+
@@ -352,7 +356,7 @@ To easily create the hash table to return the WiFi PSK, you could do
 something like this:
 
      
-
      Example 1. Creating a secrets hash
      
+
      Example 1. Creating a secrets hash
      
 
      
   
      
@@ -406,7 +410,11 @@ something like this:
 
-
+
@@ -451,7 +459,11 @@ should be called.
 
-
+
diff --git a/docs/libnm-glib/html/api-index-full.html b/docs/libnm-glib/html/api-index-full.html
index 93e2532e..d344affc 100644
--- a/docs/libnm-glib/html/api-index-full.html
+++ b/docs/libnm-glib/html/api-index-full.html
@@ -651,6 +651,30 @@
 
      
+NMDeviceBridge, struct in NMDeviceBridge
+
      
+
      
+
      
+NMDeviceBridge:carrier, object property in NMDeviceBridge
+
      
+
      
+
      
+NMDeviceBridge:hw-address, object property in NMDeviceBridge
+
      
+
      
+
      
+NMDeviceBridge:slaves, object property in NMDeviceBridge
+
      
+
      
+
      
+NMDeviceBridgeClass, struct in NMDeviceBridge
+
      
+
      
+
      
+NMDeviceBridgeError, enum in NMDeviceBridge
+
      
+
      
+
      
 NMDeviceBt, struct in NMDeviceBt
 
      
@@ -955,6 +979,42 @@
 
      
+NM_DEVICE_BRIDGE_CARRIER, macro in NMDeviceBridge
+
      
+
      
+
      
+NM_DEVICE_BRIDGE_ERROR, macro in NMDeviceBridge
+
      
+
      
+
      
+nm_device_bridge_error_quark, function in NMDeviceBridge
+
      
+
      
+
      
+nm_device_bridge_get_carrier, function in NMDeviceBridge
+
      
+
      
+
      
+nm_device_bridge_get_hw_address, function in NMDeviceBridge
+
      
+
      
+
      
+nm_device_bridge_get_slaves, function in NMDeviceBridge
+
      
+
      
+
      
+NM_DEVICE_BRIDGE_HW_ADDRESS, macro in NMDeviceBridge
+
      
+
      
+
      
+nm_device_bridge_new, function in NMDeviceBridge
+
      
+
      
+
      
+NM_DEVICE_BRIDGE_SLAVES, macro in NMDeviceBridge
+
      
+
      
+
      
 NM_DEVICE_BT_CAPABILITIES, macro in NMDeviceBt
 
      
diff --git a/docs/libnm-glib/html/ch02.html b/docs/libnm-glib/html/ch02.html
index fa143784..2a334ea9 100644
--- a/docs/libnm-glib/html/ch02.html
+++ b/docs/libnm-glib/html/ch02.html
@@ -21,7 +21,7 @@
 
      
     
 
      
 
      connection :
      		the connection for which secrets were requestedthe connection for which secrets were requested,
+note that this object will be unrefed after the callback has returned, use
+g_object_ref()/g_object_unref() if you want to use this object after the callback
+has returned. [transfer none]
+
 
      
 
      
 
      secrets :
      
 
      
 
      connection :
      		the connection for which secrets were to be savedthe connection for which secrets were to be saved,
+note that this object will be unrefed after the callback has returned, use
+g_object_ref()/g_object_unref() if you want to use this object after the callback
+has returned. [transfer none]
+
 
      
 
      
 
      error :
      		
 
 
 
 
 
 
      
 
      
 
      
-libnm-glib API Reference
      
+libnm-glib API Reference
      
 
      
 
      
 NMClient
@@ -54,6 +54,9 @@
 NMDeviceBond
 
      
 
      
+NMDeviceBridge
+
      
+
      
 NMDeviceInfiniband
 
      
 
      
diff --git a/docs/libnm-glib/html/index.html b/docs/libnm-glib/html/index.html
index a0375d4e..339a581c 100644
--- a/docs/libnm-glib/html/index.html
+++ b/docs/libnm-glib/html/index.html
@@ -15,14 +15,14 @@
 
      
 
      
 
      
-      for libnm-glib 0.9.6.4
+      for libnm-glib 0.9.7.995
 
       The latest version of this documentation can be found on-line at
       http://projects.gnome.org/NetworkManager/developers/libnm-glib/09/.
     
      
 
      Copyright © 2012 The NetworkManager Authors
      
 
      
-
      
+
      
 	Permission is granted to copy, distribute and/or modify this
 	document under the terms of the GNU Free
 	Documentation License, Version 1.1 or any later
@@ -81,6 +81,9 @@
 NMDeviceBond
 
      
 
      
+NMDeviceBridge
+
      
+
      
 NMDeviceInfiniband
 
      
 
      
diff --git a/docs/libnm-glib/html/index.sgml b/docs/libnm-glib/html/index.sgml
index cc8e3b43..92276d7d 100644
--- a/docs/libnm-glib/html/index.sgml
+++ b/docs/libnm-glib/html/index.sgml
@@ -419,6 +419,33 @@
 
 
 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 
 
 
diff --git a/docs/libnm-glib/html/libnm-glib.devhelp2 b/docs/libnm-glib/html/libnm-glib.devhelp2
index 7f2a66e7..3cf09621 100644
--- a/docs/libnm-glib/html/libnm-glib.devhelp2
+++ b/docs/libnm-glib/html/libnm-glib.devhelp2
@@ -14,6 +14,7 @@
       
       
       
+      
       
       
       
@@ -319,6 +320,21 @@
     
     
     
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
     
     
     
@@ -631,6 +647,10 @@
     
     
     
+    
+    
+    
+    
     
     
     
diff --git a/docs/libnm-glib/html/object-tree.html b/docs/libnm-glib/html/object-tree.html
index ae88a436..0488f18b 100644
--- a/docs/libnm-glib/html/object-tree.html
+++ b/docs/libnm-glib/html/object-tree.html
@@ -36,6 +36,7 @@
                 NMDeviceAdsl
                 NMDeviceInfiniband
                 NMDeviceBond
+                NMDeviceBridge
                 NMDeviceVlan
             NMWimaxNsp
             NMAccessPoint
diff --git a/docs/libnm-glib/libnm-glib-docs.xml b/docs/libnm-glib/libnm-glib-docs.xml
index 1b989cb6..aa3c6332 100644
--- a/docs/libnm-glib/libnm-glib-docs.xml
+++ b/docs/libnm-glib/libnm-glib-docs.xml
@@ -74,6 +74,7 @@
     
     
     
+    
     
     
     
diff --git a/docs/libnm-glib/libnm-glib-sections.txt b/docs/libnm-glib/libnm-glib-sections.txt
index a150d0c0..84f897c4 100644
--- a/docs/libnm-glib/libnm-glib-sections.txt
+++ b/docs/libnm-glib/libnm-glib-sections.txt
@@ -237,6 +237,31 @@ NM_TYPE_DEVICE_BOND
 nm_device_bond_get_type
 
 
+
      
+nm-device-bridge
+NMDeviceBridge
+NMDeviceBridge
+NMDeviceBridgeClass
+NMDeviceBridgeError
+NM_DEVICE_BRIDGE_CARRIER
+NM_DEVICE_BRIDGE_ERROR
+NM_DEVICE_BRIDGE_HW_ADDRESS
+NM_DEVICE_BRIDGE_SLAVES
+nm_device_bridge_error_quark
+nm_device_bridge_get_carrier
+nm_device_bridge_get_hw_address
+nm_device_bridge_get_slaves
+nm_device_bridge_new
+
+NM_DEVICE_BRIDGE
+NM_DEVICE_BRIDGE_CLASS
+NM_DEVICE_BRIDGE_GET_CLASS
+NM_IS_DEVICE_BRIDGE
+NM_IS_DEVICE_BRIDGE_CLASS
+NM_TYPE_DEVICE_BRIDGE
+nm_device_bridge_get_type
+
      
+
 
      
 nm-device-bt
 NMDeviceBt
@@ -495,6 +520,7 @@ NM_TYPE_CLIENT_PERMISSION
 NM_TYPE_CLIENT_PERMISSION_RESULT
 NM_TYPE_DEVICE_ADSL_ERROR
 NM_TYPE_DEVICE_BOND_ERROR
+NM_TYPE_DEVICE_BRIDGE_ERROR
 NM_TYPE_DEVICE_BT_ERROR
 NM_TYPE_DEVICE_ETHERNET_ERROR
 NM_TYPE_DEVICE_INFINIBAND_ERROR
@@ -512,6 +538,7 @@ nm_client_permission_get_type
 nm_client_permission_result_get_type
 nm_device_adsl_error_get_type
 nm_device_bond_error_get_type
+nm_device_bridge_error_get_type
 nm_device_bt_error_get_type
 nm_device_ethernet_error_get_type
 nm_device_infiniband_error_get_type
diff --git a/docs/libnm-glib/libnm-glib.types b/docs/libnm-glib/libnm-glib.types
index e3750af9..d8486f47 100644
--- a/docs/libnm-glib/libnm-glib.types
+++ b/docs/libnm-glib/libnm-glib.types
@@ -10,6 +10,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -34,6 +35,7 @@ nm_device_olpc_mesh_get_type
 nm_device_adsl_get_type
 nm_device_infiniband_get_type
 nm_device_bond_get_type
+nm_device_bridge_get_type
 nm_device_vlan_get_type
 nm_wimax_nsp_get_type
 nm_access_point_get_type
diff --git a/docs/libnm-glib/tmpl/libnm_glib.sgml b/docs/libnm-glib/tmpl/libnm_glib.sgml
index ed0710b9..325e10cb 100644
--- a/docs/libnm-glib/tmpl/libnm_glib.sgml
+++ b/docs/libnm-glib/tmpl/libnm_glib.sgml
@@ -9,13 +9,11 @@ libnm_glib
 
 
 
-
 
 
 
 
 
-
 
 
 
diff --git a/docs/libnm-glib/tmpl/nm-access-point.sgml b/docs/libnm-glib/tmpl/nm-access-point.sgml
index 41cade52..f869ab7c 100644
--- a/docs/libnm-glib/tmpl/nm-access-point.sgml
+++ b/docs/libnm-glib/tmpl/nm-access-point.sgml
@@ -9,13 +9,11 @@ NMAccessPoint
 
 
 
-
 
 
 
 
 
-
 
 
 
diff --git a/docs/libnm-glib/tmpl/nm-active-connection.sgml b/docs/libnm-glib/tmpl/nm-active-connection.sgml
index 40528ae9..5bbb6b3b 100644
--- a/docs/libnm-glib/tmpl/nm-active-connection.sgml
+++ b/docs/libnm-glib/tmpl/nm-active-connection.sgml
@@ -9,13 +9,11 @@ NMActiveConnection
 
 
 
-
 
 
 
 
 
-
 
 
 
diff --git a/docs/libnm-glib/tmpl/nm-client.sgml b/docs/libnm-glib/tmpl/nm-client.sgml
index b2d11e38..773592de 100644
--- a/docs/libnm-glib/tmpl/nm-client.sgml
+++ b/docs/libnm-glib/tmpl/nm-client.sgml
@@ -9,13 +9,11 @@ NMClient
 
 
 
-
 
 
 
 
 
-
 
 
 
diff --git a/docs/libnm-glib/tmpl/nm-device-adsl.sgml b/docs/libnm-glib/tmpl/nm-device-adsl.sgml
index 286f2f41..286483f0 100644
--- a/docs/libnm-glib/tmpl/nm-device-adsl.sgml
+++ b/docs/libnm-glib/tmpl/nm-device-adsl.sgml
@@ -9,13 +9,11 @@ NMDeviceAdsl
 
 
 
-
 
 
 
 
 
-
 
 
 
diff --git a/docs/libnm-glib/tmpl/nm-device-bond.sgml b/docs/libnm-glib/tmpl/nm-device-bond.sgml
index 29c46c9a..16da4778 100644
--- a/docs/libnm-glib/tmpl/nm-device-bond.sgml
+++ b/docs/libnm-glib/tmpl/nm-device-bond.sgml
@@ -9,13 +9,11 @@ NMDeviceBond
 
 
 
-
 
 
 
 
 
-
 
 
 
diff --git a/docs/libnm-glib/tmpl/nm-device-bridge.sgml b/docs/libnm-glib/tmpl/nm-device-bridge.sgml
new file mode 100644
index 00000000..e82e2bcb
--- /dev/null
+++ b/docs/libnm-glib/tmpl/nm-device-bridge.sgml
@@ -0,0 +1,140 @@
+
+NMDeviceBridge
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+@parent: 
+@_reserved1: 
+@_reserved2: 
+@_reserved3: 
+@_reserved4: 
+@_reserved5: 
+@_reserved6: 
+
+
+
+
+
+
+@NM_DEVICE_BRIDGE_ERROR_UNKNOWN: 
+@NM_DEVICE_BRIDGE_ERROR_NOT_BRIDGE_CONNECTION: 
+@NM_DEVICE_BRIDGE_ERROR_INVALID_BRIDGE_CONNECTION: 
+@NM_DEVICE_BRIDGE_ERROR_INTERFACE_MISMATCH: 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+@void: 
+@Returns: 
+
+
+
+
+
+
+
+@device: 
+@Returns: 
+
+
+
+
+
+
+
+@device: 
+@Returns: 
+
+
+
+
+
+
+
+@device: 
+@Returns: 
+
+
+
+
+
+
+
+@connection: 
+@path: 
+@Returns: 
+
+
diff --git a/docs/libnm-glib/tmpl/nm-device-bt.sgml b/docs/libnm-glib/tmpl/nm-device-bt.sgml
index e0b17425..26582065 100644
--- a/docs/libnm-glib/tmpl/nm-device-bt.sgml
+++ b/docs/libnm-glib/tmpl/nm-device-bt.sgml
@@ -9,13 +9,11 @@ NMDeviceBt
 
 
 
-
 
 
 
 
 
-
 
 
 
diff --git a/docs/libnm-glib/tmpl/nm-device-ethernet.sgml b/docs/libnm-glib/tmpl/nm-device-ethernet.sgml
index 3f5735b5..ea04914e 100644
--- a/docs/libnm-glib/tmpl/nm-device-ethernet.sgml
+++ b/docs/libnm-glib/tmpl/nm-device-ethernet.sgml
@@ -9,13 +9,11 @@ NMDeviceEthernet
 
 
 
-
 
 
 
 
 
-
 
 
 
diff --git a/docs/libnm-glib/tmpl/nm-device-infiniband.sgml b/docs/libnm-glib/tmpl/nm-device-infiniband.sgml
index 94ad7b90..e94c6bae 100644
--- a/docs/libnm-glib/tmpl/nm-device-infiniband.sgml
+++ b/docs/libnm-glib/tmpl/nm-device-infiniband.sgml
@@ -9,13 +9,11 @@ NMDeviceInfiniband
 
 
 
-
 
 
 
 
 
-
 
 
 
diff --git a/docs/libnm-glib/tmpl/nm-device-modem.sgml b/docs/libnm-glib/tmpl/nm-device-modem.sgml
index e41c07ec..259db939 100644
--- a/docs/libnm-glib/tmpl/nm-device-modem.sgml
+++ b/docs/libnm-glib/tmpl/nm-device-modem.sgml
@@ -9,13 +9,11 @@ NMDeviceModem
 
 
 
-
 
 
 
 
 
-
 
 
 
diff --git a/docs/libnm-glib/tmpl/nm-device-olpc-mesh.sgml b/docs/libnm-glib/tmpl/nm-device-olpc-mesh.sgml
index 20c63328..a604a43a 100644
--- a/docs/libnm-glib/tmpl/nm-device-olpc-mesh.sgml
+++ b/docs/libnm-glib/tmpl/nm-device-olpc-mesh.sgml
@@ -9,13 +9,11 @@ NMDeviceOlpcMesh
 
 
 
-
 
 
 
 
 
-
 
 
 
diff --git a/docs/libnm-glib/tmpl/nm-device-vlan.sgml b/docs/libnm-glib/tmpl/nm-device-vlan.sgml
index 30d839e0..5a58b7b2 100644
--- a/docs/libnm-glib/tmpl/nm-device-vlan.sgml
+++ b/docs/libnm-glib/tmpl/nm-device-vlan.sgml
@@ -9,13 +9,11 @@ NMDeviceVlan
 
 
 
-
 
 
 
 
 
-
 
 
 
diff --git a/docs/libnm-glib/tmpl/nm-device-wifi.sgml b/docs/libnm-glib/tmpl/nm-device-wifi.sgml
index f5d42c19..89ead82a 100644
--- a/docs/libnm-glib/tmpl/nm-device-wifi.sgml
+++ b/docs/libnm-glib/tmpl/nm-device-wifi.sgml
@@ -9,13 +9,11 @@ NMDeviceWifi
 
 
 
-
 
 
 
 
 
-
 
 
 
diff --git a/docs/libnm-glib/tmpl/nm-device-wimax.sgml b/docs/libnm-glib/tmpl/nm-device-wimax.sgml
index d23d0231..8d23e4da 100644
--- a/docs/libnm-glib/tmpl/nm-device-wimax.sgml
+++ b/docs/libnm-glib/tmpl/nm-device-wimax.sgml
@@ -9,13 +9,11 @@ NMDeviceWimax
 
 
 
-
 
 
 
 
 
-
 
 
 
diff --git a/docs/libnm-glib/tmpl/nm-device.sgml b/docs/libnm-glib/tmpl/nm-device.sgml
index 90be4054..68df46f9 100644
--- a/docs/libnm-glib/tmpl/nm-device.sgml
+++ b/docs/libnm-glib/tmpl/nm-device.sgml
@@ -9,13 +9,11 @@ NMDevice
 
 
 
-
 
 
 
 
 
-
 
 
 
diff --git a/docs/libnm-glib/tmpl/nm-dhcp4-config.sgml b/docs/libnm-glib/tmpl/nm-dhcp4-config.sgml
index cef5854d..752a8b2c 100644
--- a/docs/libnm-glib/tmpl/nm-dhcp4-config.sgml
+++ b/docs/libnm-glib/tmpl/nm-dhcp4-config.sgml
@@ -9,13 +9,11 @@ NMDHCP4Config
 
 
 
-
 
 
 
 
 
-
 
 
 
diff --git a/docs/libnm-glib/tmpl/nm-dhcp6-config.sgml b/docs/libnm-glib/tmpl/nm-dhcp6-config.sgml
index 2c113261..d01ac192 100644
--- a/docs/libnm-glib/tmpl/nm-dhcp6-config.sgml
+++ b/docs/libnm-glib/tmpl/nm-dhcp6-config.sgml
@@ -9,13 +9,11 @@ NMDHCP6Config
 
 
 
-
 
 
 
 
 
-
 
 
 
diff --git a/docs/libnm-glib/tmpl/nm-glib-enum-types.sgml b/docs/libnm-glib/tmpl/nm-glib-enum-types.sgml
index b81a00af..a60db68e 100644
--- a/docs/libnm-glib/tmpl/nm-glib-enum-types.sgml
+++ b/docs/libnm-glib/tmpl/nm-glib-enum-types.sgml
@@ -9,13 +9,11 @@ nm-glib-enum-types
 
 
 
-
 
 
 
 
 
-
 
 
 
diff --git a/docs/libnm-glib/tmpl/nm-glib-marshal.sgml b/docs/libnm-glib/tmpl/nm-glib-marshal.sgml
index 2f3b0280..dbe72434 100644
--- a/docs/libnm-glib/tmpl/nm-glib-marshal.sgml
+++ b/docs/libnm-glib/tmpl/nm-glib-marshal.sgml
@@ -9,13 +9,11 @@ nm-glib-marshal
 
 
 
-
 
 
 
 
 
-
 
 
 
diff --git a/docs/libnm-glib/tmpl/nm-ip4-config.sgml b/docs/libnm-glib/tmpl/nm-ip4-config.sgml
index e015c2af..0e33ca0b 100644
--- a/docs/libnm-glib/tmpl/nm-ip4-config.sgml
+++ b/docs/libnm-glib/tmpl/nm-ip4-config.sgml
@@ -9,13 +9,11 @@ NMIP4Config
 
 
 
-
 
 
 
 
 
-
 
 
 
diff --git a/docs/libnm-glib/tmpl/nm-ip6-config.sgml b/docs/libnm-glib/tmpl/nm-ip6-config.sgml
index f098e022..f2e66b71 100644
--- a/docs/libnm-glib/tmpl/nm-ip6-config.sgml
+++ b/docs/libnm-glib/tmpl/nm-ip6-config.sgml
@@ -9,13 +9,11 @@ NMIP6Config
 
 
 
-
 
 
 
 
 
-
 
 
 
diff --git a/docs/libnm-glib/tmpl/nm-object.sgml b/docs/libnm-glib/tmpl/nm-object.sgml
index 93b2441e..aaf91b49 100644
--- a/docs/libnm-glib/tmpl/nm-object.sgml
+++ b/docs/libnm-glib/tmpl/nm-object.sgml
@@ -9,13 +9,11 @@ NMObject
 
 
 
-
 
 
 
 
 
-
 
 
 
diff --git a/docs/libnm-glib/tmpl/nm-remote-connection.sgml b/docs/libnm-glib/tmpl/nm-remote-connection.sgml
index 628000c8..594371fd 100644
--- a/docs/libnm-glib/tmpl/nm-remote-connection.sgml
+++ b/docs/libnm-glib/tmpl/nm-remote-connection.sgml
@@ -9,13 +9,11 @@ NMRemoteConnection
 
 
 
-
 
 
 
 
 
-
 
 
 
diff --git a/docs/libnm-glib/tmpl/nm-remote-settings.sgml b/docs/libnm-glib/tmpl/nm-remote-settings.sgml
index 44b4d4fb..3f24a06c 100644
--- a/docs/libnm-glib/tmpl/nm-remote-settings.sgml
+++ b/docs/libnm-glib/tmpl/nm-remote-settings.sgml
@@ -9,13 +9,11 @@ NMRemoteSettings
 
 
 
-
 
 
 
 
 
-
 
 
 
diff --git a/docs/libnm-glib/tmpl/nm-secret-agent.sgml b/docs/libnm-glib/tmpl/nm-secret-agent.sgml
index 9d23cbc5..428b7afd 100644
--- a/docs/libnm-glib/tmpl/nm-secret-agent.sgml
+++ b/docs/libnm-glib/tmpl/nm-secret-agent.sgml
@@ -9,13 +9,11 @@ NMSecretAgent
 
 
 
-
 
 
 
 
 
-
 
 
 
diff --git a/docs/libnm-glib/tmpl/nm-types.sgml b/docs/libnm-glib/tmpl/nm-types.sgml
index 18babb0f..1469192e 100644
--- a/docs/libnm-glib/tmpl/nm-types.sgml
+++ b/docs/libnm-glib/tmpl/nm-types.sgml
@@ -9,13 +9,11 @@ nm-types
 
 
 
-
 
 
 
 
 
-
 
 
 
diff --git a/docs/libnm-glib/tmpl/nm-vpn-connection.sgml b/docs/libnm-glib/tmpl/nm-vpn-connection.sgml
index 3086909a..fe3dcbe0 100644
--- a/docs/libnm-glib/tmpl/nm-vpn-connection.sgml
+++ b/docs/libnm-glib/tmpl/nm-vpn-connection.sgml
@@ -9,13 +9,11 @@ NMVPNConnection
 
 
 
-
 
 
 
 
 
-
 
 
 
diff --git a/docs/libnm-glib/tmpl/nm-vpn-enum-types.sgml b/docs/libnm-glib/tmpl/nm-vpn-enum-types.sgml
index 0f800cac..83b976cd 100644
--- a/docs/libnm-glib/tmpl/nm-vpn-enum-types.sgml
+++ b/docs/libnm-glib/tmpl/nm-vpn-enum-types.sgml
@@ -9,13 +9,11 @@ nm-vpn-enum-types
 
 
 
-
 
 
 
 
 
-
 
 
 
diff --git a/docs/libnm-glib/tmpl/nm-vpn-plugin-ui-interface.sgml b/docs/libnm-glib/tmpl/nm-vpn-plugin-ui-interface.sgml
index f4c724a8..faa7a8cb 100644
--- a/docs/libnm-glib/tmpl/nm-vpn-plugin-ui-interface.sgml
+++ b/docs/libnm-glib/tmpl/nm-vpn-plugin-ui-interface.sgml
@@ -9,13 +9,11 @@ NMVpnPluginUiWidget
 
 
 
-
 
 
 
 
 
-
 
 
 
diff --git a/docs/libnm-glib/tmpl/nm-vpn-plugin-utils.sgml b/docs/libnm-glib/tmpl/nm-vpn-plugin-utils.sgml
index ed0ab40b..a35e6a9a 100644
--- a/docs/libnm-glib/tmpl/nm-vpn-plugin-utils.sgml
+++ b/docs/libnm-glib/tmpl/nm-vpn-plugin-utils.sgml
@@ -9,13 +9,11 @@ nm-vpn-plugin-utils
 
 
 
-
 
 
 
 
 
-
 
 
 
diff --git a/docs/libnm-glib/tmpl/nm-vpn-plugin.sgml b/docs/libnm-glib/tmpl/nm-vpn-plugin.sgml
index 7ece0f79..c04eb296 100644
--- a/docs/libnm-glib/tmpl/nm-vpn-plugin.sgml
+++ b/docs/libnm-glib/tmpl/nm-vpn-plugin.sgml
@@ -9,13 +9,11 @@ NMVPNPlugin
 
 
 
-
 
 
 
 
 
-
 
 
 
diff --git a/docs/libnm-glib/tmpl/nm-wimax-nsp.sgml b/docs/libnm-glib/tmpl/nm-wimax-nsp.sgml
index f5dca7a3..4dd298b7 100644
--- a/docs/libnm-glib/tmpl/nm-wimax-nsp.sgml
+++ b/docs/libnm-glib/tmpl/nm-wimax-nsp.sgml
@@ -9,13 +9,11 @@ NMWimaxNsp
 
 
 
-
 
 
 
 
 
-
 
 
 
diff --git a/docs/libnm-glib/version.xml b/docs/libnm-glib/version.xml
index f6c687fe..fa572dcf 100644
--- a/docs/libnm-glib/version.xml
+++ b/docs/libnm-glib/version.xml
@@ -1 +1 @@
-0.9.6.4
+0.9.7.995
diff --git a/docs/libnm-util/Makefile.am b/docs/libnm-util/Makefile.am
index be1bdeeb..8b8b5aa1 100644
--- a/docs/libnm-util/Makefile.am
+++ b/docs/libnm-util/Makefile.am
@@ -10,7 +10,7 @@ DOC_MAIN_SGML_FILE=$(DOC_MODULE)-docs.sgml
 # The directory containing the source code. Relative to $(srcdir).
 # gtk-doc will search all .c & .h files beneath here for inline comments
 # documenting functions and macros.
-DOC_SOURCE_DIR=../../libnm-util
+DOC_SOURCE_DIR=$(top_srcdir)/libnm-util
 
 # Extra options to supply to gtkdoc-scan.
 SCAN_OPTIONS=--rebuild-types --rebuild-sections
@@ -66,6 +66,7 @@ EXTRA_DIST += version.xml.in
 
 CLEANFILES += \
 	libnm-util-sections.txt \
+	libnm-util-overrides.txt \
 	html/* \
 	tmpl/* \
 	xml/*
diff --git a/docs/libnm-util/Makefile.in b/docs/libnm-util/Makefile.in
index a8edfffc..59d4179b 100644
--- a/docs/libnm-util/Makefile.in
+++ b/docs/libnm-util/Makefile.in
@@ -61,16 +61,18 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
 subdir = docs/libnm-util
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/compiler_warnings.m4 \
-	$(top_srcdir)/m4/gettext.m4 $(top_srcdir)/m4/gtk-doc.m4 \
-	$(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/intlmacosx.m4 \
-	$(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/introspection.m4 \
-	$(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \
-	$(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/libnl-check.m4 \
-	$(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \
-	$(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
-	$(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/nls.m4 \
-	$(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/progtest.m4 \
-	$(top_srcdir)/m4/vapigen.m4 $(top_srcdir)/configure.ac
+	$(top_srcdir)/m4/gettext.m4 \
+	$(top_srcdir)/m4/gnome-code-coverage.m4 \
+	$(top_srcdir)/m4/gtk-doc.m4 $(top_srcdir)/m4/iconv.m4 \
+	$(top_srcdir)/m4/intlmacosx.m4 $(top_srcdir)/m4/intltool.m4 \
+	$(top_srcdir)/m4/introspection.m4 $(top_srcdir)/m4/lib-ld.m4 \
+	$(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \
+	$(top_srcdir)/m4/libnl-check.m4 $(top_srcdir)/m4/libtool.m4 \
+	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
+	$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
+	$(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/po.m4 \
+	$(top_srcdir)/m4/progtest.m4 $(top_srcdir)/m4/vapigen.m4 \
+	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(install_sh) -d
@@ -103,6 +105,10 @@ AWK = @AWK@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
+CKDB_PATH = @CKDB_PATH@
+CODE_COVERAGE_CFLAGS = @CODE_COVERAGE_CFLAGS@
+CODE_COVERAGE_ENABLED = @CODE_COVERAGE_ENABLED@
+CODE_COVERAGE_LDFLAGS = @CODE_COVERAGE_LDFLAGS@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CXX = @CXX@
@@ -117,9 +123,7 @@ DBUS_SYS_DIR = @DBUS_SYS_DIR@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
 DHCLIENT_PATH = @DHCLIENT_PATH@
-DHCLIENT_VERSION = @DHCLIENT_VERSION@
 DHCPCD_PATH = @DHCPCD_PATH@
-DISABLE_DEPRECATED = @DISABLE_DEPRECATED@
 DLLTOOL = @DLLTOOL@
 DSYMUTIL = @DSYMUTIL@
 DUMPBIN = @DUMPBIN@
@@ -129,17 +133,14 @@ ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
 FGREP = @FGREP@
+GENHTML = @GENHTML@
 GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
 GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
-GIO_CFLAGS = @GIO_CFLAGS@
-GIO_LIBS = @GIO_LIBS@
 GLIB_CFLAGS = @GLIB_CFLAGS@
 GLIB_GENMARSHAL = @GLIB_GENMARSHAL@
 GLIB_LIBS = @GLIB_LIBS@
 GLIB_MAKEFILE = @GLIB_MAKEFILE@
 GLIB_MKENUMS = @GLIB_MKENUMS@
-GMODULE_CFLAGS = @GMODULE_CFLAGS@
-GMODULE_LIBS = @GMODULE_LIBS@
 GMSGFMT = @GMSGFMT@
 GMSGFMT_015 = @GMSGFMT_015@
 GNUTLS_CFLAGS = @GNUTLS_CFLAGS@
@@ -180,6 +181,7 @@ IPTABLES_PATH = @IPTABLES_PATH@
 IWMX_SDK_CFLAGS = @IWMX_SDK_CFLAGS@
 IWMX_SDK_LIBS = @IWMX_SDK_LIBS@
 KERNEL_FIRMWARE_DIR = @KERNEL_FIRMWARE_DIR@
+LCOV = @LCOV@
 LD = @LD@
 LDFLAGS = @LDFLAGS@
 LIBDL = @LIBDL@
@@ -196,11 +198,7 @@ LIBNL2_LIBS = @LIBNL2_LIBS@
 LIBNL3_CFLAGS = @LIBNL3_CFLAGS@
 LIBNL3_LIBS = @LIBNL3_LIBS@
 LIBNL_CFLAGS = @LIBNL_CFLAGS@
-LIBNL_GENL3_CFLAGS = @LIBNL_GENL3_CFLAGS@
-LIBNL_GENL3_LIBS = @LIBNL_GENL3_LIBS@
 LIBNL_LIBS = @LIBNL_LIBS@
-LIBNL_ROUTE3_CFLAGS = @LIBNL_ROUTE3_CFLAGS@
-LIBNL_ROUTE3_LIBS = @LIBNL_ROUTE3_LIBS@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
 LIBSOUP_CFLAGS = @LIBSOUP_CFLAGS@
@@ -215,6 +213,8 @@ MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MANIFEST_TOOL = @MANIFEST_TOOL@
 MKDIR_P = @MKDIR_P@
+MM_GLIB_CFLAGS = @MM_GLIB_CFLAGS@
+MM_GLIB_LIBS = @MM_GLIB_LIBS@
 MOC = @MOC@
 MSGFMT = @MSGFMT@
 MSGFMT_015 = @MSGFMT_015@
@@ -224,6 +224,7 @@ NMEDIT = @NMEDIT@
 NM_MAJOR_VERSION = @NM_MAJOR_VERSION@
 NM_MICRO_VERSION = @NM_MICRO_VERSION@
 NM_MINOR_VERSION = @NM_MINOR_VERSION@
+NM_MODIFY_SYSTEM_POLICY = @NM_MODIFY_SYSTEM_POLICY@
 NM_VERSION = @NM_VERSION@
 NSS_CFLAGS = @NSS_CFLAGS@
 NSS_LIBS = @NSS_LIBS@
@@ -250,13 +251,14 @@ PPPD_PLUGIN_DIR = @PPPD_PLUGIN_DIR@
 QT_CFLAGS = @QT_CFLAGS@
 QT_LIBS = @QT_LIBS@
 RANLIB = @RANLIB@
-RESOLVCONF_PATH = @RESOLVCONF_PATH@
 SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
-SYSTEMD_CFLAGS = @SYSTEMD_CFLAGS@
-SYSTEMD_LIBS = @SYSTEMD_LIBS@
+SYSTEMD_INHIBIT_CFLAGS = @SYSTEMD_INHIBIT_CFLAGS@
+SYSTEMD_INHIBIT_LIBS = @SYSTEMD_INHIBIT_LIBS@
+SYSTEMD_LOGIN_CFLAGS = @SYSTEMD_LOGIN_CFLAGS@
+SYSTEMD_LOGIN_LIBS = @SYSTEMD_LOGIN_LIBS@
 SYSTEM_CA_PATH = @SYSTEM_CA_PATH@
 UDEV_BASE_DIR = @UDEV_BASE_DIR@
 USE_NLS = @USE_NLS@
@@ -311,6 +313,11 @@ localedir = @localedir@
 localstatedir = @localstatedir@
 mandir = @mandir@
 mkdir_p = @mkdir_p@
+nmbinary = @nmbinary@
+nmconfdir = @nmconfdir@
+nmdatadir = @nmdatadir@
+nmrundir = @nmrundir@
+nmstatedir = @nmstatedir@
 oldincludedir = @oldincludedir@
 pdfdir = @pdfdir@
 prefix = @prefix@
@@ -325,6 +332,10 @@ target_alias = @target_alias@
 top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
+with_dhclient = @with_dhclient@
+with_dhcpcd = @with_dhcpcd@
+with_netconfig = @with_netconfig@
+with_resolvconf = @with_resolvconf@
 AUTOMAKE_OPTIONS = 1.6
 
 # The name of the module
@@ -336,7 +347,7 @@ DOC_MAIN_SGML_FILE = $(DOC_MODULE)-docs.sgml
 # The directory containing the source code. Relative to $(srcdir).
 # gtk-doc will search all .c & .h files beneath here for inline comments
 # documenting functions and macros.
-DOC_SOURCE_DIR = ../../libnm-util
+DOC_SOURCE_DIR = $(top_srcdir)/libnm-util
 
 # Extra options to supply to gtkdoc-scan.
 SCAN_OPTIONS = --rebuild-types --rebuild-sections
@@ -423,7 +434,8 @@ REPORT_FILES = \
 	$(DOC_MODULE)-unused.txt
 
 CLEANFILES = $(SCANOBJ_FILES) $(REPORT_FILES) $(DOC_STAMPS) \
-	libnm-util-sections.txt html/* tmpl/* xml/*
+	libnm-util-sections.txt libnm-util-overrides.txt html/* tmpl/* \
+	xml/*
 @ENABLE_GTK_DOC_TRUE@@GTK_DOC_BUILD_HTML_FALSE@HTML_BUILD_STAMP = 
 @ENABLE_GTK_DOC_TRUE@@GTK_DOC_BUILD_HTML_TRUE@HTML_BUILD_STAMP = html-build.stamp
 @ENABLE_GTK_DOC_TRUE@@GTK_DOC_BUILD_PDF_FALSE@PDF_BUILD_STAMP = 
diff --git a/docs/libnm-util/html/NMConnection.html b/docs/libnm-util/html/NMConnection.html
index 9e62ec8a..3f55caf8 100644
--- a/docs/libnm-util/html/NMConnection.html
+++ b/docs/libnm-util/html/NMConnection.html
@@ -82,6 +82,9 @@ const char *        NMSettingBluetooth * nm_connection_get_setting_bluetooth
                                                         (NMConnection *connection);
 NMSettingBond *     nm_connection_get_setting_bond      (NMConnection *connection);
+NMSettingBridge *   nm_connection_get_setting_bridge    (NMConnection *connection);
+NMSettingBridgePort * nm_connection_get_setting_bridge_port
+                                                        (NMConnection *connection);
 NMSetting *         nm_connection_get_setting_by_name   (NMConnection *connection,
                                                          const char *name);
 NMSettingCdma *     nm_connection_get_setting_cdma      (NMConnection *connection);
@@ -700,6 +703,53 @@ A shortcut to return any 
+
      nm_connection_get_setting_bridge ()
      
+
      NMSettingBridge *   nm_connection_get_setting_bridge    (NMConnection *connection);
      
+
      
+A shortcut to return any NMSettingBridge the connection might contain.
+
      
+
      
++
+
+
+
+
+
+
+
+
+
+
      

      connection :
      		the NMConnection
+
      Returns :
      		an NMSettingBridge if the connection contains one, otherwise NULL. [transfer none]
+
      
+
      
+
      
+
      
+
      nm_connection_get_setting_bridge_port ()
      
+
      NMSettingBridgePort * nm_connection_get_setting_bridge_port
+                                                        (NMConnection *connection);
      
+
      
+A shortcut to return any NMSettingBridgePort the connection might contain.
+
      
+
      
++
+
+
+
+
+
+
+
+
+
+
      

      connection :
      		the NMConnection
+
      Returns :
      		an NMSettingBridgePort if the connection contains one, otherwise NULL. [transfer none]
+
      
+
      
+
      
+
      
 
      nm_connection_get_setting_by_name ()
      
 
      NMSetting *         nm_connection_get_setting_by_name   (NMConnection *connection,
                                                          const char *name);
      
diff --git a/docs/libnm-util/html/NMSetting.html b/docs/libnm-util/html/NMSetting.html
index 8a8b2b8c..12b826b1 100644
--- a/docs/libnm-util/html/NMSetting.html
+++ b/docs/libnm-util/html/NMSetting.html
@@ -116,22 +116,24 @@ const char *        NMSettingAdsl
          +----NMSettingBluetooth
          +----NMSettingBond
-         +----NMSettingCdma
+         +----NMSettingBridge
+         +----NMSettingBridgePort
          +----NMSettingConnection
-         +----NMSettingGsm
          +----NMSettingInfiniband
          +----NMSettingIP4Config
+         +----NMSettingVlan
          +----NMSettingIP6Config
-         +----NMSettingOlpcMesh
          +----NMSettingPPP
          +----NMSettingPPPOE
          +----NMSettingSerial
-         +----NMSettingVlan
-         +----NMSettingVPN
+         +----NMSettingGsm
+         +----NMSettingCdma
+         +----NMSettingOlpcMesh
          +----NMSettingWimax
          +----NMSettingWired
          +----NMSettingWireless
          +----NMSettingWirelessSecurity
+         +----NMSettingVPN
 
 
         GEnum
diff --git a/docs/libnm-util/html/NMSettingBond.html b/docs/libnm-util/html/NMSettingBond.html
index e29bca05..ff77e102 100644
--- a/docs/libnm-util/html/NMSettingBond.html
+++ b/docs/libnm-util/html/NMSettingBond.html
@@ -7,7 +7,7 @@
 
 
 
-
+
 
 
 
@@ -18,7 +18,7 @@
 
      		Up
 Home
 libnm-util Reference ManualNextNext
 
      
 
      
 Top
diff --git a/docs/libnm-util/html/NMSettingBridge.html b/docs/libnm-util/html/NMSettingBridge.html
new file mode 100644
index 00000000..4e52f8ed
--- /dev/null
+++ b/docs/libnm-util/html/NMSettingBridge.html
@@ -0,0 +1,472 @@
+
+
+
+
+NMSettingBridge
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
      
+
      
+
      
+
+
+
      
+
      NMSettingBridge
      
+
      NMSettingBridge — Describes connection properties for bridges
      
+
      
+
      
+
      Synopsis
      
+
      +#include <nm-setting-bridge.h>
+
+                    NMSettingBridge;
+                    NMSettingBridgeClass;
+enum                NMSettingBridgeError;
+#define             NM_SETTING_BRIDGE_AGEING_TIME
+#define             NM_SETTING_BRIDGE_ERROR
+#define             NM_SETTING_BRIDGE_FORWARD_DELAY
+#define             NM_SETTING_BRIDGE_HELLO_TIME
+#define             NM_SETTING_BRIDGE_INTERFACE_NAME
+#define             NM_SETTING_BRIDGE_MAX_AGE
+#define             NM_SETTING_BRIDGE_PRIORITY
+#define             NM_SETTING_BRIDGE_SETTING_NAME
+#define             NM_SETTING_BRIDGE_STP
+GQuark              nm_setting_bridge_error_quark       (void);
+guint32             nm_setting_bridge_get_ageing_time   (NMSettingBridge *setting);
+guint16             nm_setting_bridge_get_forward_delay (NMSettingBridge *setting);
+guint16             nm_setting_bridge_get_hello_time    (NMSettingBridge *setting);
+const char *        nm_setting_bridge_get_interface_name
+                                                        (NMSettingBridge *setting);
+guint16             nm_setting_bridge_get_max_age       (NMSettingBridge *setting);
+guint16             nm_setting_bridge_get_priority      (NMSettingBridge *setting);
+gboolean            nm_setting_bridge_get_stp           (NMSettingBridge *setting);
+NMSetting *         nm_setting_bridge_new               (void);
+
      
+
      
+
      
+
      Object Hierarchy
      
+
      +  GObject
+   +----NMSetting
+         +----NMSettingBridge
+
      
+
      +  GEnum
+   +----NMSettingBridgeError
+
      
+
      
+
      
+
      Properties
      
+
      +  "ageing-time"              guint                 : Read / Write / Construct
+  "forward-delay"            guint                 : Read / Write / Construct
+  "hello-time"               guint                 : Read / Write / Construct
+  "interface-name"           gchar*                : Read / Write
+  "max-age"                  guint                 : Read / Write / Construct
+  "priority"                 guint                 : Read / Write / Construct
+  "stp"                      gboolean              : Read / Write / Construct
+
      
+
      
+
      
+
      Description
      
+
      
+The NMSettingBridge object is a NMSetting subclass that describes properties
+necessary for bridging connections.
+
      
+
      
+
      
+
      Details
      
+
      
+
      NMSettingBridge
      
+
      typedef struct _NMSettingBridge NMSettingBridge;
      
+
      
+
      
+
      
+
      
+
      
+
      NMSettingBridgeClass
      
+
      typedef struct {
+	NMSettingClass parent;
+
+	/* Padding for future expansion */
+	void (*_reserved1) (void);
+	void (*_reserved2) (void);
+	void (*_reserved3) (void);
+	void (*_reserved4) (void);
+} NMSettingBridgeClass;
+
      
+
      
+
      
+
      
+
      
+
      
+
      enum NMSettingBridgeError
      
+
      typedef enum {
+	NM_SETTING_BRIDGE_ERROR_UNKNOWN = 0,      /*< nick=UnknownError >*/
+	NM_SETTING_BRIDGE_ERROR_INVALID_PROPERTY, /*< nick=InvalidProperty >*/
+	NM_SETTING_BRIDGE_ERROR_MISSING_PROPERTY, /*< nick=MissingProperty >*/
+} NMSettingBridgeError;
+
      
+
      
++
+
+
+
+
+
+
+
+
+
+
+
+
+
+
      

      NM_SETTING_BRIDGE_ERROR_UNKNOWN
      		unknown or unclassified error
+
      NM_SETTING_BRIDGE_ERROR_INVALID_PROPERTY
      		the property was invalid
+
      NM_SETTING_BRIDGE_ERROR_MISSING_PROPERTY
      		the property was missing and is
+required
+
      
+
      
+
      
+
      
+
      NM_SETTING_BRIDGE_AGEING_TIME
      
+
      #define NM_SETTING_BRIDGE_AGEING_TIME    "ageing-time"
+
      
+
      
+
      
+
      
+
      
+
      
+
      NM_SETTING_BRIDGE_ERROR
      
+
      #define NM_SETTING_BRIDGE_ERROR nm_setting_bridge_error_quark ()
+
      
+
      
+
      
+
      
+
      
+
      
+
      NM_SETTING_BRIDGE_FORWARD_DELAY
      
+
      #define NM_SETTING_BRIDGE_FORWARD_DELAY  "forward-delay"
+
      
+
      
+
      
+
      
+
      
+
      
+
      NM_SETTING_BRIDGE_HELLO_TIME
      
+
      #define NM_SETTING_BRIDGE_HELLO_TIME     "hello-time"
+
      
+
      
+
      
+
      
+
      
+
      
+
      NM_SETTING_BRIDGE_INTERFACE_NAME
      
+
      #define NM_SETTING_BRIDGE_INTERFACE_NAME "interface-name"
+
      
+
      
+
      
+
      
+
      
+
      
+
      NM_SETTING_BRIDGE_MAX_AGE
      
+
      #define NM_SETTING_BRIDGE_MAX_AGE        "max-age"
+
      
+
      
+
      
+
      
+
      
+
      
+
      NM_SETTING_BRIDGE_PRIORITY
      
+
      #define NM_SETTING_BRIDGE_PRIORITY       "priority"
+
      
+
      
+
      
+
      
+
      
+
      
+
      NM_SETTING_BRIDGE_SETTING_NAME
      
+
      #define NM_SETTING_BRIDGE_SETTING_NAME "bridge"
+
      
+
      
+
      
+
      
+
      
+
      
+
      NM_SETTING_BRIDGE_STP
      
+
      #define NM_SETTING_BRIDGE_STP            "stp"
+
      
+
      
+
      
+
      
+
      
+
      
+
      nm_setting_bridge_error_quark ()
      
+
      GQuark              nm_setting_bridge_error_quark       (void);
      
+
      
+Registers an error quark for NMSettingBridge if necessary.
+
      
+
      
++
+
+
+
+
      

      Returns :
      		the error quark used for NMSettingBridge errors.
      
+
      
+
      
+
      
+
      nm_setting_bridge_get_ageing_time ()
      
+
      guint32             nm_setting_bridge_get_ageing_time   (NMSettingBridge *setting);
      
+
      
++
+
+
+
+
+
+
+
+
+
+
      

      setting :
      		the NMSettingBridge
+
      Returns :
      		the "ageing-time" property of the setting
      
+
      
+
      
+
      
+
      nm_setting_bridge_get_forward_delay ()
      
+
      guint16             nm_setting_bridge_get_forward_delay (NMSettingBridge *setting);
      
+
      
++
+
+
+
+
+
+
+
+
+
+
      

      setting :
      		the NMSettingBridge
+
      Returns :
      		the "forward-delay" property of the setting
      
+
      
+
      
+
      
+
      nm_setting_bridge_get_hello_time ()
      
+
      guint16             nm_setting_bridge_get_hello_time    (NMSettingBridge *setting);
      
+
      
++
+
+
+
+
+
+
+
+
+
+
      

      setting :
      		the NMSettingBridge
+
      Returns :
      		the "hello-time" property of the setting
      
+
      
+
      
+
      
+
      nm_setting_bridge_get_interface_name ()
      
+
      const char *        nm_setting_bridge_get_interface_name
+                                                        (NMSettingBridge *setting);
      
+
      
++
+
+
+
+
+
+
+
+
+
+
      

      setting :
      		the NMSettingBridge
+
      Returns :
      		the "interface-name" property of the setting
      
+
      
+
      
+
      
+
      nm_setting_bridge_get_max_age ()
      
+
      guint16             nm_setting_bridge_get_max_age       (NMSettingBridge *setting);
      
+
      
++
+
+
+
+
+
+
+
+
+
+
      

      setting :
      		the NMSettingBridge
+
      Returns :
      		the "max-age" property of the setting
      
+
      
+
      
+
      
+
      nm_setting_bridge_get_priority ()
      
+
      guint16             nm_setting_bridge_get_priority      (NMSettingBridge *setting);
      
+
      
++
+
+
+
+
+
+
+
+
+
+
      

      setting :
      		the NMSettingBridge
+
      Returns :
      		the "priority" property of the setting
      
+
      
+
      
+
      
+
      nm_setting_bridge_get_stp ()
      
+
      gboolean            nm_setting_bridge_get_stp           (NMSettingBridge *setting);
      
+
      
++
+
+
+
+
+
+
+
+
+
+
      

      setting :
      		the NMSettingBridge
+
      Returns :
      		the "stp" property of the setting
      
+
      
+
      
+
      
+
      nm_setting_bridge_new ()
      
+
      NMSetting *         nm_setting_bridge_new               (void);
      
+
      
+Creates a new NMSettingBridge object with default values.
+
      
+
      
++
+
+
+
+
      

      Returns :
      		the new empty NMSettingBridge object. [transfer full]
+
      
+
      
+
      
+
      
+
      Property Details
      
+
      
+
      The "ageing-time" property
      
+
        "ageing-time"              guint                 : Read / Write / Construct
      
+
      
+The ethernet MAC address aging time, in seconds.
+
      
+
      Allowed values: <= 1000000
      
+
      Default value: 300
      
+
      
+
      
+
      
+
      The "forward-delay" property
      
+
        "forward-delay"            guint                 : Read / Write / Construct
      
+
      
+The Spanning Tree Protocol (STP) forwarding delay, in seconds.
+
      
+
      Allowed values: <= 30
      
+
      Default value: 15
      
+
      
+
      
+
      
+
      The "hello-time" property
      
+
        "hello-time"               guint                 : Read / Write / Construct
      
+
      
+The Spanning Tree Protocol (STP) hello time, in seconds.
+
      
+
      Allowed values: <= 10
      
+
      Default value: 2
      
+
      
+
      
+
      
+
      The "interface-name" property
      
+
        "interface-name"           gchar*                : Read / Write
      
+
      
+The name of the virtual in-kernel briding network interface
+
      
+
      Default value: NULL
      
+
      
+
      
+
      
+
      The "max-age" property
      
+
        "max-age"                  guint                 : Read / Write / Construct
      
+
      
+The Spanning Tree Protocol (STP) maximum message age, in seconds.
+
      
+
      Allowed values: <= 40
      
+
      Default value: 20
      
+
      
+
      
+
      
+
      The "priority" property
      
+
        "priority"                 guint                 : Read / Write / Construct
      
+
      
+Sets the Spanning Tree Protocol (STP) priority for this bridge.  Lower
+values are "better"; the lowest priority bridge will be elected the root
+bridge.
+
      
+
      Allowed values: <= 65535
      
+
      Default value: 128
      
+
      
+
      
+
      
+
      The "stp" property
      
+
        "stp"                      gboolean              : Read / Write / Construct
      
+
      
+Controls whether Spanning Tree Protocol (STP) is enabled for this bridge.
+
      
+
      Default value: TRUE
      
+
      
+
      
+
      
+
      
+
      
+          Generated by GTK-Doc V1.18
      
+
+
\ No newline at end of file
diff --git a/docs/libnm-util/html/NMSettingBridgePort.html b/docs/libnm-util/html/NMSettingBridgePort.html
new file mode 100644
index 00000000..e5ce3b47
--- /dev/null
+++ b/docs/libnm-util/html/NMSettingBridgePort.html
@@ -0,0 +1,314 @@
+
+
+
+
+NMSettingBridgePort
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
      
+
      
+
      
+
+
+
      
+
      NMSettingBridgePort
      
+
      NMSettingBridgePort — Describes connection properties for bridge ports
      
+
      
+
      
+
      Synopsis
      
+
      +#include <nm-setting-bridge-port.h>
+
+                    NMSettingBridgePort;
+                    NMSettingBridgePortClass;
+enum                NMSettingBridgePortError;
+#define             NM_SETTING_BRIDGE_PORT_ERROR
+#define             NM_SETTING_BRIDGE_PORT_HAIRPIN_MODE
+#define             NM_SETTING_BRIDGE_PORT_PATH_COST
+#define             NM_SETTING_BRIDGE_PORT_PRIORITY
+#define             NM_SETTING_BRIDGE_PORT_SETTING_NAME
+GQuark              nm_setting_bridge_port_error_quark  (void);
+gboolean            nm_setting_bridge_port_get_hairpin_mode
+                                                        (NMSettingBridgePort *setting);
+guint16             nm_setting_bridge_port_get_path_cost
+                                                        (NMSettingBridgePort *setting);
+guint16             nm_setting_bridge_port_get_priority (NMSettingBridgePort *setting);
+NMSetting *         nm_setting_bridge_port_new          (void);
+
      
+
      
+
      
+
      Object Hierarchy
      
+
      +  GObject
+   +----NMSetting
+         +----NMSettingBridgePort
+
      
+
      +  GEnum
+   +----NMSettingBridgePortError
+
      
+
      
+
      
+
      Properties
      
+
      +  "hairpin-mode"             gboolean              : Read / Write
+  "path-cost"                guint                 : Read / Write / Construct
+  "priority"                 guint                 : Read / Write / Construct
+
      
+
      
+
      
+
      Description
      
+
      
+The NMSettingBridgePort object is a NMSetting subclass that describes
+optional properties that apply to bridge ports.
+
      
+
      
+
      
+
      Details
      
+
      
+
      NMSettingBridgePort
      
+
      typedef struct _NMSettingBridgePort NMSettingBridgePort;
      
+
      
+
      
+
      
+
      
+
      
+
      NMSettingBridgePortClass
      
+
      typedef struct {
+	NMSettingClass parent;
+
+	/* Padding for future expansion */
+	void (*_reserved1) (void);
+	void (*_reserved2) (void);
+	void (*_reserved3) (void);
+	void (*_reserved4) (void);
+} NMSettingBridgePortClass;
+
      
+
      
+
      
+
      
+
      
+
      
+
      enum NMSettingBridgePortError
      
+
      typedef enum {
+	NM_SETTING_BRIDGE_PORT_ERROR_UNKNOWN = 0,      /*< nick=UnknownError >*/
+	NM_SETTING_BRIDGE_PORT_ERROR_INVALID_PROPERTY, /*< nick=InvalidProperty >*/
+	NM_SETTING_BRIDGE_PORT_ERROR_MISSING_PROPERTY, /*< nick=MissingProperty >*/
+} NMSettingBridgePortError;
+
      
+
      
++
+
+
+
+
+
+
+
+
+
+
+
+
+
+
      

      NM_SETTING_BRIDGE_PORT_ERROR_UNKNOWN
      		unknown or unclassified error
+
      NM_SETTING_BRIDGE_PORT_ERROR_INVALID_PROPERTY
      		the property was invalid
+
      NM_SETTING_BRIDGE_PORT_ERROR_MISSING_PROPERTY
      		the property was missing and
+is required
+
      
+
      
+
      
+
      
+
      NM_SETTING_BRIDGE_PORT_ERROR
      
+
      #define NM_SETTING_BRIDGE_PORT_ERROR nm_setting_bridge_port_error_quark ()
+
      
+
      
+
      
+
      
+
      
+
      
+
      NM_SETTING_BRIDGE_PORT_HAIRPIN_MODE
      
+
      #define NM_SETTING_BRIDGE_PORT_HAIRPIN_MODE "hairpin-mode"
+
      
+
      
+
      
+
      
+
      
+
      
+
      NM_SETTING_BRIDGE_PORT_PATH_COST
      
+
      #define NM_SETTING_BRIDGE_PORT_PATH_COST    "path-cost"
+
      
+
      
+
      
+
      
+
      
+
      
+
      NM_SETTING_BRIDGE_PORT_PRIORITY
      
+
      #define NM_SETTING_BRIDGE_PORT_PRIORITY     "priority"
+
      
+
      
+
      
+
      
+
      
+
      
+
      NM_SETTING_BRIDGE_PORT_SETTING_NAME
      
+
      #define NM_SETTING_BRIDGE_PORT_SETTING_NAME "bridge-port"
+
      
+
      
+
      
+
      
+
      
+
      
+
      nm_setting_bridge_port_error_quark ()
      
+
      GQuark              nm_setting_bridge_port_error_quark  (void);
      
+
      
+Registers an error quark for NMSettingBridgePort if necessary.
+
      
+
      
++
+
+
+
+
      

      Returns :
      		the error quark used for NMSettingBridgePort errors.
      
+
      
+
      
+
      
+
      nm_setting_bridge_port_get_hairpin_mode ()
      
+
      gboolean            nm_setting_bridge_port_get_hairpin_mode
+                                                        (NMSettingBridgePort *setting);
      
+
      
++
+
+
+
+
+
+
+
+
+
+
      

      setting :
      		the NMSettingBridgePort
+
      Returns :
      		the "hairpin-mode" property of the setting
      
+
      
+
      
+
      
+
      nm_setting_bridge_port_get_path_cost ()
      
+
      guint16             nm_setting_bridge_port_get_path_cost
+                                                        (NMSettingBridgePort *setting);
      
+
      
++
+
+
+
+
+
+
+
+
+
+
      

      setting :
      		the NMSettingBridgePort
+
      Returns :
      		the "path-cost" property of the setting
      
+
      
+
      
+
      
+
      nm_setting_bridge_port_get_priority ()
      
+
      guint16             nm_setting_bridge_port_get_priority (NMSettingBridgePort *setting);
      
+
      
++
+
+
+
+
+
+
+
+
+
+
      

      setting :
      		the NMSettingBridgePort
+
      Returns :
      		the "priority" property of the setting
      
+
      
+
      
+
      
+
      nm_setting_bridge_port_new ()
      
+
      NMSetting *         nm_setting_bridge_port_new          (void);
      
+
      
+Creates a new NMSettingBridgePort object with default values.
+
      
+
      
++
+
+
+
+
      

      Returns :
      		the new empty NMSettingBridgePort object. [transfer full]
+
      
+
      
+
      
+
      
+
      Property Details
      
+
      
+
      The "hairpin-mode" property
      
+
        "hairpin-mode"             gboolean              : Read / Write
      
+
      
+Enables or disabled 'hairpin mode' for the port, which allows frames to
+be sent back out through the port the frame was received on.
+
      
+
      Default value: FALSE
      
+
      
+
      
+
      
+
      The "path-cost" property
      
+
        "path-cost"                guint                 : Read / Write / Construct
      
+
      
+The Spanning Tree Protocol (STP) port cost for destinations via this port.
+
      
+
      Allowed values: <= 65535
      
+
      Default value: 100
      
+
      
+
      
+
      
+
      The "priority" property
      
+
        "priority"                 guint                 : Read / Write / Construct
      
+
      
+The Spanning Tree Protocol (STP) priority of this bridge port.
+
      
+
      Allowed values: <= 63
      
+
      Default value: 32
      
+
      
+
      
+
      
+
      
+
      
+          Generated by GTK-Doc V1.18
      
+
+
\ No newline at end of file
diff --git a/docs/libnm-util/html/NMSettingConnection.html b/docs/libnm-util/html/NMSettingConnection.html
index f83cfc86..bb1014e5 100644
--- a/docs/libnm-util/html/NMSettingConnection.html
+++ b/docs/libnm-util/html/NMSettingConnection.html
@@ -53,6 +53,7 @@ enum                NM_SETTING_CONNECTION_MASTER
 #define             NM_SETTING_CONNECTION_PERMISSIONS
 #define             NM_SETTING_CONNECTION_READ_ONLY
+#define             NM_SETTING_CONNECTION_SECONDARIES
 #define             NM_SETTING_CONNECTION_SETTING_NAME
 #define             NM_SETTING_CONNECTION_SLAVE_TYPE
 #define             NM_SETTING_CONNECTION_TIMESTAMP
@@ -64,6 +65,8 @@ enum                const char *ptype,
                                                          const char *pitem,
                                                          const char *detail);
+gboolean            nm_setting_connection_add_secondary (NMSettingConnection *setting,
+                                                         const char *sec_uuid);
 GQuark              nm_setting_connection_error_quark   (void);
 gboolean            nm_setting_connection_get_autoconnect
                                                         (NMSettingConnection *setting);
@@ -73,6 +76,8 @@ const char *        char *        nm_setting_connection_get_master    (NMSettingConnection *setting);
 guint32             nm_setting_connection_get_num_permissions
                                                         (NMSettingConnection *setting);
+guint32             nm_setting_connection_get_num_secondaries
+                                                        (NMSettingConnection *setting);
 gboolean            nm_setting_connection_get_permission
                                                         (NMSettingConnection *setting,
                                                          guint32 idx,
@@ -80,6 +85,8 @@ const char *        const char **out_pitem,
                                                          const char **out_detail);
 gboolean            nm_setting_connection_get_read_only (NMSettingConnection *setting);
+const char *        nm_setting_connection_get_secondary (NMSettingConnection *setting,
+                                                         guint32 idx);
 const char *        nm_setting_connection_get_slave_type
                                                         (NMSettingConnection *setting);
 guint64             nm_setting_connection_get_timestamp (NMSettingConnection *setting);
@@ -94,6 +101,9 @@ const char *        void                nm_setting_connection_remove_permission
                                                         (NMSettingConnection *setting,
                                                          guint32 idx);
+void                nm_setting_connection_remove_secondary
+                                                        (NMSettingConnection *setting,
+                                                         guint32 idx);
 
 
 
      
@@ -116,6 +126,7 @@ const char *        master"                   gchar*                : Read / Write
   "permissions"              GSList_gchararray_*   : Read / Write
   "read-only"                gboolean              : Read / Write / Construct
+  "secondaries"              GSList_gchararray_*   : Read / Write
   "slave-type"               gchar*                : Read / Write
   "timestamp"                guint64               : Read / Write / Construct
   "type"                     gchar*                : Read / Write
@@ -259,6 +270,14 @@ Describes errors that may result from operations involving a
 
      
 
      
 
      
+
      NM_SETTING_CONNECTION_SECONDARIES
      
+
      #define NM_SETTING_CONNECTION_SECONDARIES "secondaries"
+
      
+
      
+
      
+
      
+
      
+
      
 
      NM_SETTING_CONNECTION_SETTING_NAME
      
 
      #define NM_SETTING_CONNECTION_SETTING_NAME "connection"
 
      
@@ -351,6 +370,35 @@ present in the list
      		
 
 
 
      
++
+
+
+
+
+
+
+
+
+
+
+
+
+
+
      

      setting :
      		the NMSettingConnection
+
      sec_uuid :
      		the secondary connection UUID to add
      Returns :
      		
+TRUE if the secondary connection UUID was added; FALSE if the UUID
+was already present
      
+

+

+

 
nm_setting_connection_error_quark ()

 
GQuark              nm_setting_connection_error_quark   (void);

 

@@ -481,6 +529,26 @@ property of this setting.
 

 

 

+
nm_setting_connection_get_num_secondaries ()

+
guint32             nm_setting_connection_get_num_secondaries
+                                                        (NMSettingConnection *setting);

+

++
+
+
+
+
+
+
+
+
+
+


setting :
the NMSettingConnection
+
Returns :
the number of configured secondary connection UUIDs

+

+

+

 
nm_setting_connection_get_permission ()

 
gboolean            nm_setting_connection_get_permission
                                                         (NMSettingConnection *setting,
@@ -550,6 +618,31 @@ Returns the 
+
nm_setting_connection_get_secondary ()

+
const char *        nm_setting_connection_get_secondary (NMSettingConnection *setting,
+                                                         guint32 idx);

+

++
+
+
+
+
+
+
+
+
+
+
+
+
+
+


setting :
the NMSettingConnection
+
idx :
the zero-based index of the secondary connection UUID entry
Returns :
the secondary connection UUID at index idx
+

+

+

+

 
nm_setting_connection_get_slave_type ()

 
const char *        nm_setting_connection_get_slave_type
                                                         (NMSettingConnection *setting);

@@ -732,6 +825,30 @@ Removes the permission at index idx from
 
 

 

+

+

+
nm_setting_connection_remove_secondary ()

+
void                nm_setting_connection_remove_secondary
+                                                        (NMSettingConnection *setting,
+                                                         guint32 idx);

+

+Removes the secondary coonnection UUID at index idx.
+

+

++
+
+
+
+
+
+
+
+
+
+


setting :
the NMSettingConnection
+
idx :
index number of the secondary connection UUID

+

 

 

 
Property Details

@@ -800,6 +917,15 @@ if the connection is read-only and cannot be modified.
 

 

 

+
The "secondaries" property

+
  "secondaries"              GSList_gchararray_*   : Read / Write

+

+List of connection UUIDs that should be activated when the base connection
+itself is activated.
+

+

+

+

 
The "slave-type" property

 
  "slave-type"               gchar*                : Read / Write

 

diff --git a/docs/libnm-util/html/NMSettingGsm.html b/docs/libnm-util/html/NMSettingGsm.html
index f2522cdc..d10521ac 100644
--- a/docs/libnm-util/html/NMSettingGsm.html
+++ b/docs/libnm-util/html/NMSettingGsm.html
@@ -297,7 +297,9 @@ the device may use when connecting to this network.
 	NM_SETTING_GSM_NETWORK_TYPE_UMTS_HSPA = 0,
 	NM_SETTING_GSM_NETWORK_TYPE_GPRS_EDGE = 1,
 	NM_SETTING_GSM_NETWORK_TYPE_PREFER_UMTS_HSPA = 2,
-	NM_SETTING_GSM_NETWORK_TYPE_PREFER_GPRS_EDGE = 3
+	NM_SETTING_GSM_NETWORK_TYPE_PREFER_GPRS_EDGE = 3,
+	NM_SETTING_GSM_NETWORK_TYPE_PREFER_4G = 4,
+	NM_SETTING_GSM_NETWORK_TYPE_4G = 5
 } NMSettingGsmNetworkType;
 
 

@@ -336,6 +338,18 @@ preferred but 2G-type technologies may be used as a fallback
 preferred but 3G-type technologies may be used as a fallback
 
 
+
+
NM_SETTING_GSM_NETWORK_TYPE_PREFER_4G

+4G/LTE-type technologies are
+preferred but 3G/2/-type technologies may be used as a fallback
+
+
+
+
NM_SETTING_GSM_NETWORK_TYPE_4G

+only 4G/LTE type
+technologies may be used
+
+
 
 

 

@@ -746,7 +760,7 @@ technologies.  Permitted values are those specified by
 NMSettingGsmNetworkType.  Note that not all devices allow network
 preference control.
 

-
Allowed values: [G_MAXULONG,3]

+
Allowed values: [G_MAXULONG,5]

 
Default value: -1

 

 

diff --git a/docs/libnm-util/html/NMSettingIP4Config.html b/docs/libnm-util/html/NMSettingIP4Config.html
index 1f9e666b..df6762af 100644
--- a/docs/libnm-util/html/NMSettingIP4Config.html
+++ b/docs/libnm-util/html/NMSettingIP4Config.html
@@ -1675,7 +1675,7 @@ either automatic or disabled with these methods.
 
  "dhcp-client-id"           gchar*                : Read / Write

 

 A string sent to the DHCP server to identify the local machine which the
-DHCP server may use to cusomize the DHCP lease and options.
+DHCP server may use to customize the DHCP lease and options.
 

 
Default value: NULL

 

@@ -1710,7 +1710,7 @@ the current persistent hostname of the computer is sent.
 List of DNS servers (network byte order).  For the 'auto' method, these
 DNS servers are appended to those (if any) returned by automatic
 configuration.  DNS servers cannot be used with the 'shared', 'link-local',
-or 'disabled' methods as there is no usptream network.  In all other
+or 'disabled' methods as there is no upstream network.  In all other
 methods, these DNS servers are used as the only DNS servers for this
 connection.
 

diff --git a/docs/libnm-util/html/NMSettingIP6Config.html b/docs/libnm-util/html/NMSettingIP6Config.html
index b053bd27..b467336f 100644
--- a/docs/libnm-util/html/NMSettingIP6Config.html
+++ b/docs/libnm-util/html/NMSettingIP6Config.html
@@ -51,6 +51,7 @@ typedef             NM
 enum                NMSettingIP6ConfigError;
 enum                NMSettingIP6ConfigPrivacy;
 #define             NM_SETTING_IP6_CONFIG_ADDRESSES
+#define             NM_SETTING_IP6_CONFIG_DHCP_HOSTNAME
 #define             NM_SETTING_IP6_CONFIG_DNS
 #define             NM_SETTING_IP6_CONFIG_DNS_SEARCH
 #define             NM_SETTING_IP6_CONFIG_ERROR
@@ -119,6 +120,8 @@ const struct in6_addr * GQuark              nm_setting_ip6_config_error_quark   (void);
 NMIP6Address *      nm_setting_ip6_config_get_address   (NMSettingIP6Config *setting,
                                                          guint32 i);
+const char *        nm_setting_ip6_config_get_dhcp_hostname
+                                                        (NMSettingIP6Config *setting);
 const struct in6_addr * nm_setting_ip6_config_get_dns   (NMSettingIP6Config *setting,
                                                          guint32 i);
 const char *        nm_setting_ip6_config_get_dns_search
@@ -184,6 +187,7 @@ const char *        
Properties

 
   "addresses"                GPtrArray_GValueArray_GArray_guchar_+guint+GArray_guchar___*  : Read / Write
+  "dhcp-hostname"            gchar*                : Read / Write
   "dns"                      GPtrArray_GArray_guchar__*  : Read / Write
   "dns-search"               GSList_gchararray_*   : Read / Write
   "ignore-auto-dns"          gboolean              : Read / Write / Construct
@@ -332,6 +336,14 @@ are enabled and temporary addresses are preferred over public addresses
 

 

 

+
NM_SETTING_IP6_CONFIG_DHCP_HOSTNAME

+
#define NM_SETTING_IP6_CONFIG_DHCP_HOSTNAME      "dhcp-hostname"
+

+

+

+

+

+

 
NM_SETTING_IP6_CONFIG_DNS

 
#define NM_SETTING_IP6_CONFIG_DNS                "dns"
 

@@ -1227,6 +1239,30 @@ Registers an error quark for 
 

 

+
nm_setting_ip6_config_get_dhcp_hostname ()

+
const char *        nm_setting_ip6_config_get_dhcp_hostname
+                                                        (NMSettingIP6Config *setting);

+

+Returns the value contained in the "dhcp-hostname"
+property.
+

+

++
+
+
+
+
+
+
+
+
+
+


setting :
the NMSettingIP6Config
+
Returns :
the configured hostname to send to the DHCP server

+

+

+

 
nm_setting_ip6_config_get_dns ()

 
const struct in6_addr * nm_setting_ip6_config_get_dns   (NMSettingIP6Config *setting,
                                                          guint32 i);

@@ -1657,6 +1693,15 @@ assigned an address with these methods.
 

 

 

+
The "dhcp-hostname" property

+
  "dhcp-hostname"            gchar*                : Read / Write

+

+The specified name will be sent to the DHCP server when acquiring a lease.
+

+
Default value: NULL

+

+

+

 
The "dns" property

 
  "dns"                      GPtrArray_GArray_guchar__*  : Read / Write

 

diff --git a/docs/libnm-util/html/NMSettingInfiniband.html b/docs/libnm-util/html/NMSettingInfiniband.html
index a208bff1..03755208 100644
--- a/docs/libnm-util/html/NMSettingInfiniband.html
+++ b/docs/libnm-util/html/NMSettingInfiniband.html
@@ -6,7 +6,7 @@
 
 
 
-
+
 
 
 
@@ -14,7 +14,7 @@
 
 
-
+
diff --git a/docs/libnm-util/html/NMSettingVlan.html b/docs/libnm-util/html/NMSettingVlan.html
index 013c31f1..b1edb3ad 100644
--- a/docs/libnm-util/html/NMSettingVlan.html
+++ b/docs/libnm-util/html/NMSettingVlan.html
@@ -152,7 +152,8 @@ necessary for connection to VLAN interfaces.
 
typedef enum {
 	NM_SETTING_VLAN_ERROR_UNKNOWN = 0,      /*< nick=Unknown >*/
 	NM_SETTING_VLAN_ERROR_INVALID_PROPERTY, /*< nick=InvalidProperty >*/
-	NM_SETTING_VLAN_ERROR_MISSING_PROPERTY  /*< nick=MissingProperty >*/
+	NM_SETTING_VLAN_ERROR_MISSING_PROPERTY, /*< nick=MissingProperty >*/
+	NM_SETTING_VLAN_ERROR_INVALID_PARENT    /*< nick=InvalidParent >*/
 } NMSettingVlanError;
 

@@ -171,7 +172,13 @@ necessary for connection to VLAN interfaces.
 
+
+
+
+
diff --git a/docs/libnm-util/html/NMSettingWireless.html b/docs/libnm-util/html/NMSettingWireless.html
index 85e17c1d..e3d964a4 100644
--- a/docs/libnm-util/html/NMSettingWireless.html
+++ b/docs/libnm-util/html/NMSettingWireless.html
@@ -57,6 +57,7 @@ enum                NM_SETTING_WIRELESS_MAC_ADDRESS_BLACKLIST
 #define             NM_SETTING_WIRELESS_MODE
 #define             NM_SETTING_WIRELESS_MODE_ADHOC
+#define             NM_SETTING_WIRELESS_MODE_AP
 #define             NM_SETTING_WIRELESS_MODE_INFRA
 #define             NM_SETTING_WIRELESS_MTU
 #define             NM_SETTING_WIRELESS_RATE
@@ -287,6 +288,16 @@ Indicates Ad-Hoc mode where no access point is expected to be present.
 

+
NM_SETTING_WIRELESS_MODE_AP

+
#define NM_SETTING_WIRELESS_MODE_AP     "ap"
+

+

+Indicates AP/master mode where the wireless device is started as an access
+point/hotspot.
+

+

+

+

 
NM_SETTING_WIRELESS_MODE_INFRA

 
#define NM_SETTING_WIRELESS_MODE_INFRA  "infrastructure"
 

@@ -357,9 +368,10 @@ for this connection.
 
gboolean            nm_setting_wireless_add_seen_bssid  (NMSettingWireless *setting,
                                                          const char *bssid);

 

-Adds a new WiFi AP's BSSID to the previously seen BSSID list of the setting.
-NetworkManager tracks previously seen BSSIDs internally so this function
-no longer has much use.
+Adds a new Wi-Fi AP's BSSID to the previously seen BSSID list of the setting.
+NetworkManager now tracks previously seen BSSIDs internally so this function
+no longer has much use. Actually, changes you make using this function will
+not be preserved.
 

 

 
NM_SETTING_VLAN_ERROR_MISSING_PROPERTY

 the property was missing and is
-required
+  required
+
NM_SETTING_VLAN_ERROR_INVALID_PARENT
the VLAN parent was specified
+  inconsistently
 
 

 
 
 
@@ -853,7 +865,7 @@ MAC address is in the standard hex-digits-and-colons notation.
 
The "mode" property
  "mode"                     gchar*                : Read / Write

-WiFi network mode; one of 'infrastructure' or 'adhoc'.  If blank,
+WiFi network mode; one of 'infrastructure', 'adhoc' or 'ap'.  If blank,
 infrastructure is assumed.
 
Default value: NULL

@@ -897,9 +909,10 @@ the connection contains a valid 802-11-wireless-security setting.
 
  "seen-bssids"              GSList_gchararray_*   : Read / Write

 A list of BSSIDs (each BSSID formatted as a MAC address like
-'00:11:22:33:44:55') that have been detected as part of the WiFI network.
-NetworkManager internally tracks previously seen BSSIDs so this property
-is no longer of much use.
+'00:11:22:33:44:55') that have been detected as part of the Wi-FI network.
+NetworkManager internally tracks previously seen BSSIDs. The property is only
+meant for reading and reflects the BBSID list of NetworkManager. The changes you
+make to this property will not be preserved.
 

diff --git a/docs/libnm-util/html/api-index-full.html b/docs/libnm-util/html/api-index-full.html
index 2e5d124d..807aea99 100644
--- a/docs/libnm-util/html/api-index-full.html
+++ b/docs/libnm-util/html/api-index-full.html
@@ -135,6 +135,14 @@
 

+nm_connection_get_setting_bridge, function in NMConnection
+

+

+

+nm_connection_get_setting_bridge_port, function in NMConnection
+

+

+

 nm_connection_get_setting_by_name, function in NMConnection
 

@@ -701,6 +709,70 @@
 

+NMSettingBridge, struct in NMSettingBridge
+

+

+

+NMSettingBridge:ageing-time, object property in NMSettingBridge
+

+

+

+NMSettingBridge:forward-delay, object property in NMSettingBridge
+

+

+

+NMSettingBridge:hello-time, object property in NMSettingBridge
+

+

+

+NMSettingBridge:interface-name, object property in NMSettingBridge
+

+

+

+NMSettingBridge:max-age, object property in NMSettingBridge
+

+

+

+NMSettingBridge:priority, object property in NMSettingBridge
+

+

+

+NMSettingBridge:stp, object property in NMSettingBridge
+

+

+

+NMSettingBridgeClass, struct in NMSettingBridge
+

+

+

+NMSettingBridgeError, enum in NMSettingBridge
+

+

+

+NMSettingBridgePort, struct in NMSettingBridgePort
+

+

+

+NMSettingBridgePort:hairpin-mode, object property in NMSettingBridgePort
+

+

+

+NMSettingBridgePort:path-cost, object property in NMSettingBridgePort
+

+

+

+NMSettingBridgePort:priority, object property in NMSettingBridgePort
+

+

+

+NMSettingBridgePortClass, struct in NMSettingBridgePort
+

+

+

+NMSettingBridgePortError, enum in NMSettingBridgePort
+

+

+

 NMSettingCdma, struct in NMSettingCdma
 

@@ -765,6 +837,10 @@
 

+NMSettingConnection:secondaries, object property in NMSettingConnection
+

+

+

 NMSettingConnection:slave-type, object property in NMSettingConnection
 

@@ -961,6 +1037,10 @@
 

+NMSettingIP6Config:dhcp-hostname, object property in NMSettingIP6Config
+

+

+

 NMSettingIP6Config:dns, object property in NMSettingIP6Config
 

@@ -2085,6 +2165,118 @@
 

+NM_SETTING_BRIDGE_AGEING_TIME, macro in NMSettingBridge
+

+

+

+NM_SETTING_BRIDGE_ERROR, macro in NMSettingBridge
+

+

+

+nm_setting_bridge_error_quark, function in NMSettingBridge
+

+

+

+NM_SETTING_BRIDGE_FORWARD_DELAY, macro in NMSettingBridge
+

+

+

+nm_setting_bridge_get_ageing_time, function in NMSettingBridge
+

+

+

+nm_setting_bridge_get_forward_delay, function in NMSettingBridge
+

+

+

+nm_setting_bridge_get_hello_time, function in NMSettingBridge
+

+

+

+nm_setting_bridge_get_interface_name, function in NMSettingBridge
+

+

+

+nm_setting_bridge_get_max_age, function in NMSettingBridge
+

+

+

+nm_setting_bridge_get_priority, function in NMSettingBridge
+

+

+

+nm_setting_bridge_get_stp, function in NMSettingBridge
+

+

+

+NM_SETTING_BRIDGE_HELLO_TIME, macro in NMSettingBridge
+

+

+

+NM_SETTING_BRIDGE_INTERFACE_NAME, macro in NMSettingBridge
+

+

+

+NM_SETTING_BRIDGE_MAX_AGE, macro in NMSettingBridge
+

+

+

+nm_setting_bridge_new, function in NMSettingBridge
+

+

+

+NM_SETTING_BRIDGE_PORT_ERROR, macro in NMSettingBridgePort
+

+

+

+nm_setting_bridge_port_error_quark, function in NMSettingBridgePort
+

+

+

+nm_setting_bridge_port_get_hairpin_mode, function in NMSettingBridgePort
+

+

+

+nm_setting_bridge_port_get_path_cost, function in NMSettingBridgePort
+

+

+

+nm_setting_bridge_port_get_priority, function in NMSettingBridgePort
+

+

+

+NM_SETTING_BRIDGE_PORT_HAIRPIN_MODE, macro in NMSettingBridgePort
+

+

+

+nm_setting_bridge_port_new, function in NMSettingBridgePort
+

+

+

+NM_SETTING_BRIDGE_PORT_PATH_COST, macro in NMSettingBridgePort
+

+

+

+NM_SETTING_BRIDGE_PORT_PRIORITY, macro in NMSettingBridgePort
+

+

+

+NM_SETTING_BRIDGE_PORT_SETTING_NAME, macro in NMSettingBridgePort
+

+

+

+NM_SETTING_BRIDGE_PRIORITY, macro in NMSettingBridge
+

+

+

+NM_SETTING_BRIDGE_SETTING_NAME, macro in NMSettingBridge
+

+

+

+NM_SETTING_BRIDGE_STP, macro in NMSettingBridge
+

+

+

 NM_SETTING_CDMA_ERROR, macro in NMSettingCdma
 

@@ -2149,6 +2341,10 @@
 

+nm_setting_connection_add_secondary, function in NMSettingConnection
+

+

+

 NM_SETTING_CONNECTION_AUTOCONNECT, macro in NMSettingConnection
 

@@ -2181,6 +2377,10 @@
 

+nm_setting_connection_get_num_secondaries, function in NMSettingConnection
+

+

+

 nm_setting_connection_get_permission, function in NMSettingConnection
 

@@ -2189,6 +2389,10 @@
 

+nm_setting_connection_get_secondary, function in NMSettingConnection
+

+

+

 nm_setting_connection_get_slave_type, function in NMSettingConnection
 

@@ -2237,6 +2441,14 @@
 

+nm_setting_connection_remove_secondary, function in NMSettingConnection
+

+

+

+NM_SETTING_CONNECTION_SECONDARIES, macro in NMSettingConnection
+

+

+

 NM_SETTING_CONNECTION_SETTING_NAME, macro in NMSettingConnection
 

@@ -2669,6 +2881,10 @@
 

+NM_SETTING_IP6_CONFIG_DHCP_HOSTNAME, macro in NMSettingIP6Config
+

+

+

 NM_SETTING_IP6_CONFIG_DNS, macro in NMSettingIP6Config
 

@@ -2689,6 +2905,10 @@
 

+nm_setting_ip6_config_get_dhcp_hostname, function in NMSettingIP6Config
+

+

+

 nm_setting_ip6_config_get_dns, function in NMSettingIP6Config
 

@@ -3093,6 +3313,10 @@
 

+NM_SETTING_REGISTER_TYPE, macro in nm-setting-private
+

+

+

 NM_SETTING_SECRET_FLAGS_ALL, macro in nm-setting-private
 

@@ -3597,6 +3821,10 @@ NM_SETTING_SECRET_FLAGS_ALL, macro in nm-setting-private
 

+NM_SETTING_WIRELESS_MODE_AP, macro in NMSettingWireless
+

+

+

 NM_SETTING_WIRELESS_MODE_INFRA, macro in NMSettingWireless
 

@@ -3830,6 +4058,10 @@ NM_SETTING_SECRET_FLAGS_ALL, macro in nm-setting-private
 

+nm_utils_ap_mode_security_valid, function in nm-utils
+

+

+

 nm_utils_deinit, function in nm-utils
 

@@ -3870,6 +4102,10 @@ NM_SETTING_SECRET_FLAGS_ALL, macro in nm-setting-private
 

+nm_utils_iface_valid_name, function in nm-utils
+

+

+

 nm_utils_init, function in nm-utils
 

@@ -3930,6 +4166,10 @@ NM_SETTING_SECRET_FLAGS_ALL, macro in nm-setting-private
 

+nm_utils_is_uuid, function in nm-utils
+

+

+

 nm_utils_rsa_key_encrypt, function in nm-utils
 

diff --git a/docs/libnm-util/html/ch01.html b/docs/libnm-util/html/ch01.html
index c3f6cd8e..cba034e1 100644
--- a/docs/libnm-util/html/ch01.html
+++ b/docs/libnm-util/html/ch01.html
@@ -21,7 +21,7 @@
 

 

 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 

 

 

-libnm-util API Reference

+libnm-util API Reference

 

 

 NMConnection — Describes a connection to specific network or provider
@@ -62,6 +62,12 @@ serial communications
 NMSettingBond — Describes connection properties for bonds
 

 

+NMSettingBridge — Describes connection properties for bridges
+

+

+NMSettingBridgePort — Describes connection properties for bridge ports
+

+

 NMSettingInfiniband — Describes connection properties for IP-over-InfiniBand networks
 

 

diff --git a/docs/libnm-util/html/index.html b/docs/libnm-util/html/index.html
index 9273a726..1da1ad01 100644
--- a/docs/libnm-util/html/index.html
+++ b/docs/libnm-util/html/index.html
@@ -15,14 +15,14 @@
 

 

 

-      for libnm-util 0.9.6.4
+      for libnm-util 0.9.7.995
 
       The latest version of this documentation can be found on-line at
       http://projects.gnome.org/NetworkManager/developers/libnm-util/09/.
     

 
Copyright © 2012 The NetworkManager Authors

 

-

+

 	Permission is granted to copy, distribute and/or modify this
 	document under the terms of the GNU Free
 	Documentation License, Version 1.1 or any later
@@ -88,6 +88,12 @@ serial communications
 NMSettingBond — Describes connection properties for bonds
 

 

+NMSettingBridge — Describes connection properties for bridges
+

+

+NMSettingBridgePort — Describes connection properties for bridge ports
+

+

 NMSettingInfiniband — Describes connection properties for IP-over-InfiniBand networks
 

 

diff --git a/docs/libnm-util/html/index.sgml b/docs/libnm-util/html/index.sgml
index 2fa04eaf..330e08a9 100644
--- a/docs/libnm-util/html/index.sgml
+++ b/docs/libnm-util/html/index.sgml
@@ -33,6 +33,8 @@
 
 
 
+
+
 
 
 
@@ -155,6 +157,7 @@
 
 
 
+
 
 
 
@@ -162,14 +165,17 @@
 
 
 
+
 
 
 
 
 
 
+
 
 
+
 
 
 
@@ -178,12 +184,14 @@
 
 
 
+
 
 
 
 
 
 
+
 
 
 
@@ -269,6 +277,7 @@
 
 
 
+
 
 
 
@@ -530,6 +539,8 @@
 
 
 
+
+
 
 
 
@@ -630,6 +641,72 @@
 
 
 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 
 
 
@@ -672,6 +749,7 @@
 
 
 
+
 
 
 
@@ -1061,6 +1139,7 @@
 
 
 
+
 
 
 
@@ -1112,6 +1191,7 @@
 
 
 
+
 
 
 
@@ -1132,6 +1212,7 @@
 
 
 
+
 
 
 
@@ -1301,6 +1382,7 @@
 
 
 
+
 
 
 
@@ -1310,6 +1392,7 @@
 
 
 
+
 
 
 
@@ -1325,6 +1408,7 @@
 
 
 
+
 
 
 
diff --git a/docs/libnm-util/html/libnm-util-nm-utils.html b/docs/libnm-util/html/libnm-util-nm-utils.html
index 694287db..eaa3def1 100644
--- a/docs/libnm-util/html/libnm-util-nm-utils.html
+++ b/docs/libnm-util/html/libnm-util-nm-utils.html
@@ -44,6 +44,8 @@
 
 enum                NMUtilsSecurityType;
 #define             NM_UTILS_HWADDR_LEN_MAX
+gboolean            nm_utils_ap_mode_security_valid     (NMUtilsSecurityType type,
+                                                         NMDeviceWifiCapabilities wifi_caps);
 void                nm_utils_deinit                     (void);
 const char *        nm_utils_escape_ssid                (const guint8 *ssid,
                                                          guint32 len);
@@ -58,6 +60,7 @@ const char *        char *              nm_utils_hwaddr_ntoa                (gconstpointer addr,
                                                          int type);
 int                 nm_utils_hwaddr_type                (int len);
+gboolean            nm_utils_iface_valid_name           (const char *name);
 gboolean            nm_utils_init                       (GError **error);
 GSList *            nm_utils_ip4_addresses_from_gvalue  (const GValue *value);
 void                nm_utils_ip4_addresses_to_gvalue    (GSList *list,
@@ -79,6 +82,7 @@ const char *        GValue *value);
 gboolean            nm_utils_is_empty_ssid              (const guint8 *ssid,
                                                          int len);
+gboolean            nm_utils_is_uuid                    (const char *str);
 GByteArray *        nm_utils_rsa_key_encrypt            (const GByteArray *data,
                                                          const char *in_password,
                                                          char **out_password,
@@ -209,6 +213,39 @@ as the size of the buffer passed to 
+
nm_utils_ap_mode_security_valid ()

+
gboolean            nm_utils_ap_mode_security_valid     (NMUtilsSecurityType type,
+                                                         NMDeviceWifiCapabilities wifi_caps);

+

+Given a set of device capabilities, and a desired security type to check
+against, determines whether the combination of device capabilities and
+desired security type are valid for AP/Hotspot connections.
+

+

++
+
+
+
+
+
+
+
+
+
+
+
+
+
+


type :
the security type to check device capabilties against,
+e.g. NMU_SEC_STATIC_WEP
+
wifi_caps :
bitfield of the capabilities of the specific WiFi device, e.g.
+NM_WIFI_DEVICE_CAP_CIPHER_WEP40
+
Returns :
TRUE if the device capabilities are compatible with the desired
+type, FALSE if they are not.

+

+

+

 
nm_utils_deinit ()

 
void                nm_utils_deinit                     (void);

 

@@ -433,6 +470,29 @@ the address length was not recognized
 

 

 

+
nm_utils_iface_valid_name ()

+
gboolean            nm_utils_iface_valid_name           (const char *name);

+

+This function is a 1:1 copy of the kernel's interface validation
+function in net/core/dev.c.
+

+

++
+
+
+
+
+
+
+
+
+
+


name :
Name of interface
Returns :

+TRUE if interface name is valid, otherwise FALSE is returned.

+

+

+

 
nm_utils_init ()

 
gboolean            nm_utils_init                       (GError **error);

 

@@ -820,6 +880,28 @@ number of known SSID-cloaking methods.
 

 

 

+
nm_utils_is_uuid ()

+
gboolean            nm_utils_is_uuid                    (const char *str);

+

+Checks if str is a UUID
+

+

++
+
+
+
+
+
+
+
+
+
+


str :
a string that might be a UUID
Returns :

+TRUE if str is a UUID, FALSE if not

+

+

+

 
nm_utils_rsa_key_encrypt ()

 
GByteArray *        nm_utils_rsa_key_encrypt            (const GByteArray *data,
                                                          const char *in_password,
@@ -912,6 +994,10 @@ Given a set of device capabilities, and a desired security type to check
 against, determines whether the combination of device, desired security
 type, and AP capabilities intersect.
 

+

+NOTE: this function cannot handle checking security for AP/Hotspot mode;
+use nm_utils_ap_mode_security_valid() instead.
+

 

diff --git a/docs/libnm-util/html/libnm-util.devhelp2 b/docs/libnm-util/html/libnm-util.devhelp2
index 5b50abff..468cd5ea 100644
--- a/docs/libnm-util/html/libnm-util.devhelp2
+++ b/docs/libnm-util/html/libnm-util.devhelp2
@@ -15,6 +15,8 @@
       
       
       
+      
+      
       
       
       
@@ -54,6 +56,8 @@
     
     
     
+    
+    
     
     
     
@@ -130,6 +134,7 @@
     
     
     
+    
     
     
     
@@ -137,14 +142,17 @@
     
     
     
+    
     
     
     
     
     
     
+    
     
     
+    
     
     
     
@@ -153,11 +161,13 @@
     
     
     
+    
     
     
     
     
     
+    
     
     
     
@@ -220,6 +230,7 @@
     
     
     
+    
     
     
     
@@ -466,6 +477,50 @@
     
     
     
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
     
     
     
@@ -794,6 +849,7 @@
     
     
     
+    
     
     
     
@@ -845,6 +901,7 @@
     
     
     
+    
     
     
     
@@ -864,6 +921,7 @@
     
     
     
+    
     
     
     
@@ -983,6 +1041,7 @@
     
     
     
+    
     
     
     
@@ -992,6 +1051,7 @@
     
     
     
+    
     
     
     
@@ -1007,6 +1067,7 @@
     
     
     
+    
     
     
     
@@ -1102,6 +1163,8 @@
     
     
     
+    
+    
     
     
     
@@ -1110,12 +1173,19 @@
     
     
     
+    
+    
+    
+    
+    
+    
     
     
     
     
     
     
+    
     
     
     
diff --git a/docs/libnm-util/html/object-tree.html b/docs/libnm-util/html/object-tree.html
index ea1caff3..e6ea328c 100644
--- a/docs/libnm-util/html/object-tree.html
+++ b/docs/libnm-util/html/object-tree.html
@@ -24,28 +24,30 @@
 Object Hierarchy
 
     GObject
-        NMConnection
         NMSetting
             NMSetting8021x
             NMSettingAdsl
             NMSettingBluetooth
             NMSettingBond
-            NMSettingCdma
+            NMSettingBridge
+            NMSettingBridgePort
             NMSettingConnection
-            NMSettingGsm
             NMSettingInfiniband
             NMSettingIP4Config
+            NMSettingVlan
             NMSettingIP6Config
-            NMSettingOlpcMesh
             NMSettingPPP
             NMSettingPPPOE
             NMSettingSerial
-            NMSettingVlan
-            NMSettingVPN
+            NMSettingGsm
+            NMSettingCdma
+            NMSettingOlpcMesh
             NMSettingWimax
             NMSettingWired
             NMSettingWireless
             NMSettingWirelessSecurity
+            NMSettingVPN
+        NMConnection
     GEnum
         NMConnectionError
         NMSetting8021xCKFormat
@@ -54,6 +56,8 @@
         NMSettingAdslError
         NMSettingBluetoothError
         NMSettingBondError
+        NMSettingBridgeError
+        NMSettingBridgePortError
         NMSettingCdmaError
         NMSettingCompareFlags
         NMSettingConnectionError
diff --git a/docs/libnm-util/libnm-util-docs.sgml b/docs/libnm-util/libnm-util-docs.sgml
index 66b402c3..eaef2623 100644
--- a/docs/libnm-util/libnm-util-docs.sgml
+++ b/docs/libnm-util/libnm-util-docs.sgml
@@ -56,6 +56,8 @@
     
     
     
+    
+    
     
     
     
diff --git a/docs/libnm-util/libnm-util-sections.txt b/docs/libnm-util/libnm-util-sections.txt
index 1218f8d3..7515e23a 100644
--- a/docs/libnm-util/libnm-util-sections.txt
+++ b/docs/libnm-util/libnm-util-sections.txt
@@ -23,6 +23,8 @@ nm_connection_get_setting_802_1x
 nm_connection_get_setting_adsl
 nm_connection_get_setting_bluetooth
 nm_connection_get_setting_bond
+nm_connection_get_setting_bridge
+nm_connection_get_setting_bridge_port
 nm_connection_get_setting_by_name
 nm_connection_get_setting_cdma
 nm_connection_get_setting_connection
@@ -64,11 +66,6 @@ NM_TYPE_CONNECTION
 nm_connection_get_type
 
 
-

-nm-connection-private
-
-

-
 

 nm-setting
 NMSetting
@@ -333,6 +330,66 @@ NM_TYPE_SETTING_BOND
 nm_setting_bond_get_type
 

 
+

+nm-setting-bridge
+NMSettingBridge
+NMSettingBridge
+NMSettingBridgeClass
+NMSettingBridgeError
+NM_SETTING_BRIDGE_AGEING_TIME
+NM_SETTING_BRIDGE_ERROR
+NM_SETTING_BRIDGE_FORWARD_DELAY
+NM_SETTING_BRIDGE_HELLO_TIME
+NM_SETTING_BRIDGE_INTERFACE_NAME
+NM_SETTING_BRIDGE_MAX_AGE
+NM_SETTING_BRIDGE_PRIORITY
+NM_SETTING_BRIDGE_SETTING_NAME
+NM_SETTING_BRIDGE_STP
+nm_setting_bridge_error_quark
+nm_setting_bridge_get_ageing_time
+nm_setting_bridge_get_forward_delay
+nm_setting_bridge_get_hello_time
+nm_setting_bridge_get_interface_name
+nm_setting_bridge_get_max_age
+nm_setting_bridge_get_priority
+nm_setting_bridge_get_stp
+nm_setting_bridge_new
+
+NM_IS_SETTING_BRIDGE
+NM_IS_SETTING_BRIDGE_CLASS
+NM_SETTING_BRIDGE
+NM_SETTING_BRIDGE_CLASS
+NM_SETTING_BRIDGE_GET_CLASS
+NM_TYPE_SETTING_BRIDGE
+nm_setting_bridge_get_type
+

+
+

+nm-setting-bridge-port
+NMSettingBridgePort
+NMSettingBridgePort
+NMSettingBridgePortClass
+NMSettingBridgePortError
+NM_SETTING_BRIDGE_PORT_ERROR
+NM_SETTING_BRIDGE_PORT_HAIRPIN_MODE
+NM_SETTING_BRIDGE_PORT_PATH_COST
+NM_SETTING_BRIDGE_PORT_PRIORITY
+NM_SETTING_BRIDGE_PORT_SETTING_NAME
+nm_setting_bridge_port_error_quark
+nm_setting_bridge_port_get_hairpin_mode
+nm_setting_bridge_port_get_path_cost
+nm_setting_bridge_port_get_priority
+nm_setting_bridge_port_new
+
+NM_IS_SETTING_BRIDGE_PORT
+NM_IS_SETTING_BRIDGE_PORT_CLASS
+NM_SETTING_BRIDGE_PORT
+NM_SETTING_BRIDGE_PORT_CLASS
+NM_SETTING_BRIDGE_PORT_GET_CLASS
+NM_TYPE_SETTING_BRIDGE_PORT
+nm_setting_bridge_port_get_type
+

+
 

 nm-setting-cdma
 NMSettingCdma
@@ -373,6 +430,7 @@ NM_SETTING_CONNECTION_ID
 NM_SETTING_CONNECTION_MASTER
 NM_SETTING_CONNECTION_PERMISSIONS
 NM_SETTING_CONNECTION_READ_ONLY
+NM_SETTING_CONNECTION_SECONDARIES
 NM_SETTING_CONNECTION_SETTING_NAME
 NM_SETTING_CONNECTION_SLAVE_TYPE
 NM_SETTING_CONNECTION_TIMESTAMP
@@ -380,14 +438,17 @@ NM_SETTING_CONNECTION_TYPE
 NM_SETTING_CONNECTION_UUID
 NM_SETTING_CONNECTION_ZONE
 nm_setting_connection_add_permission
+nm_setting_connection_add_secondary
 nm_setting_connection_error_quark
 nm_setting_connection_get_autoconnect
 nm_setting_connection_get_connection_type
 nm_setting_connection_get_id
 nm_setting_connection_get_master
 nm_setting_connection_get_num_permissions
+nm_setting_connection_get_num_secondaries
 nm_setting_connection_get_permission
 nm_setting_connection_get_read_only
+nm_setting_connection_get_secondary
 nm_setting_connection_get_slave_type
 nm_setting_connection_get_timestamp
 nm_setting_connection_get_uuid
@@ -396,6 +457,7 @@ nm_setting_connection_is_slave_type
 nm_setting_connection_new
 nm_setting_connection_permissions_user_allowed
 nm_setting_connection_remove_permission
+nm_setting_connection_remove_secondary
 
 NM_IS_SETTING_CONNECTION
 NM_IS_SETTING_CONNECTION_CLASS
@@ -579,6 +641,7 @@ NMSettingIP6ConfigClass
 NMSettingIP6ConfigError
 NMSettingIP6ConfigPrivacy
 NM_SETTING_IP6_CONFIG_ADDRESSES
+NM_SETTING_IP6_CONFIG_DHCP_HOSTNAME
 NM_SETTING_IP6_CONFIG_DNS
 NM_SETTING_IP6_CONFIG_DNS_SEARCH
 NM_SETTING_IP6_CONFIG_ERROR
@@ -630,6 +693,7 @@ nm_setting_ip6_config_clear_dns_searches
 nm_setting_ip6_config_clear_routes
 nm_setting_ip6_config_error_quark
 nm_setting_ip6_config_get_address
+nm_setting_ip6_config_get_dhcp_hostname
 nm_setting_ip6_config_get_dns
 nm_setting_ip6_config_get_dns_search
 nm_setting_ip6_config_get_ignore_auto_dns
@@ -772,6 +836,7 @@ nm_setting_pppoe_get_type
 
 

 nm-setting-private
+NM_SETTING_REGISTER_TYPE
 NM_SETTING_SECRET_FLAGS_ALL
 

 
@@ -966,6 +1031,7 @@ NM_SETTING_WIRELESS_MAC_ADDRESS
 NM_SETTING_WIRELESS_MAC_ADDRESS_BLACKLIST
 NM_SETTING_WIRELESS_MODE
 NM_SETTING_WIRELESS_MODE_ADHOC
+NM_SETTING_WIRELESS_MODE_AP
 NM_SETTING_WIRELESS_MODE_INFRA
 NM_SETTING_WIRELESS_MTU
 NM_SETTING_WIRELESS_RATE
@@ -1072,6 +1138,7 @@ nm_setting_wireless_security_get_type
 nm-utils
 NMUtilsSecurityType
 NM_UTILS_HWADDR_LEN_MAX
+nm_utils_ap_mode_security_valid
 nm_utils_deinit
 nm_utils_escape_ssid
 nm_utils_file_is_pkcs12
@@ -1081,6 +1148,7 @@ nm_utils_hwaddr_aton
 nm_utils_hwaddr_len
 nm_utils_hwaddr_ntoa
 nm_utils_hwaddr_type
+nm_utils_iface_valid_name
 nm_utils_init
 nm_utils_ip4_addresses_from_gvalue
 nm_utils_ip4_addresses_to_gvalue
@@ -1096,6 +1164,7 @@ nm_utils_ip6_dns_to_gvalue
 nm_utils_ip6_routes_from_gvalue
 nm_utils_ip6_routes_to_gvalue
 nm_utils_is_empty_ssid
+nm_utils_is_uuid
 nm_utils_rsa_key_encrypt
 nm_utils_same_ssid
 nm_utils_security_valid
@@ -1119,6 +1188,8 @@ NM_TYPE_SETTING_802_1X_ERROR
 NM_TYPE_SETTING_ADSL_ERROR
 NM_TYPE_SETTING_BLUETOOTH_ERROR
 NM_TYPE_SETTING_BOND_ERROR
+NM_TYPE_SETTING_BRIDGE_ERROR
+NM_TYPE_SETTING_BRIDGE_PORT_ERROR
 NM_TYPE_SETTING_CDMA_ERROR
 NM_TYPE_SETTING_COMPARE_FLAGS
 NM_TYPE_SETTING_CONNECTION_ERROR
@@ -1154,6 +1225,8 @@ nm_setting_802_1x_error_get_type
 nm_setting_adsl_error_get_type
 nm_setting_bluetooth_error_get_type
 nm_setting_bond_error_get_type
+nm_setting_bridge_error_get_type
+nm_setting_bridge_port_error_get_type
 nm_setting_cdma_error_get_type
 nm_setting_compare_flags_get_type
 nm_setting_connection_error_get_type
diff --git a/docs/libnm-util/libnm-util.types b/docs/libnm-util/libnm-util.types
index 511e539d..ae007747 100644
--- a/docs/libnm-util/libnm-util.types
+++ b/docs/libnm-util/libnm-util.types
@@ -14,6 +14,10 @@ nm_setting_bluetooth_error_get_type
 nm_setting_bluetooth_get_type
 nm_setting_bond_error_get_type
 nm_setting_bond_get_type
+nm_setting_bridge_error_get_type
+nm_setting_bridge_get_type
+nm_setting_bridge_port_error_get_type
+nm_setting_bridge_port_get_type
 nm_setting_cdma_error_get_type
 nm_setting_cdma_get_type
 nm_setting_compare_flags_get_type
diff --git a/docs/libnm-util/tmpl/nm-connection-private.sgml b/docs/libnm-util/tmpl/nm-connection-private.sgml
deleted file mode 100644
index 0ceaa403..00000000
--- a/docs/libnm-util/tmpl/nm-connection-private.sgml
+++ /dev/null
@@ -1,24 +0,0 @@
-
-nm-connection-private
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/docs/libnm-util/tmpl/nm-connection.sgml b/docs/libnm-util/tmpl/nm-connection.sgml
index fa0b5d8b..89fd38c4 100644
--- a/docs/libnm-util/tmpl/nm-connection.sgml
+++ b/docs/libnm-util/tmpl/nm-connection.sgml
@@ -9,13 +9,11 @@ NMConnection
 
 
 
-
 
 
 
 
 
-
 
 
 
@@ -239,6 +237,24 @@ NMConnection
 @Returns: 
 
 
+
+
+
+
+
+@connection: 
+@Returns: 
+
+
+
+
+
+
+
+@connection: 
+@Returns: 
+
+
 
 
 
diff --git a/docs/libnm-util/tmpl/nm-setting-8021x.sgml b/docs/libnm-util/tmpl/nm-setting-8021x.sgml
index f8ab2c77..10775224 100644
--- a/docs/libnm-util/tmpl/nm-setting-8021x.sgml
+++ b/docs/libnm-util/tmpl/nm-setting-8021x.sgml
@@ -9,13 +9,11 @@ NMSetting8021x
 
 
 
-
 
 
 
 
 
-
 
 
 
diff --git a/docs/libnm-util/tmpl/nm-setting-adsl.sgml b/docs/libnm-util/tmpl/nm-setting-adsl.sgml
index 0e209bc2..d81ae07f 100644
--- a/docs/libnm-util/tmpl/nm-setting-adsl.sgml
+++ b/docs/libnm-util/tmpl/nm-setting-adsl.sgml
@@ -9,13 +9,11 @@ NMSettingAdsl
 
 
 
-
 
 
 
 
 
-
 
 
 
diff --git a/docs/libnm-util/tmpl/nm-setting-bluetooth.sgml b/docs/libnm-util/tmpl/nm-setting-bluetooth.sgml
index cc64b574..9ab1b4b2 100644
--- a/docs/libnm-util/tmpl/nm-setting-bluetooth.sgml
+++ b/docs/libnm-util/tmpl/nm-setting-bluetooth.sgml
@@ -9,13 +9,11 @@ NMSettingBluetooth
 
 
 
-
 
 
 
 
 
-
 
 
 
diff --git a/docs/libnm-util/tmpl/nm-setting-bond.sgml b/docs/libnm-util/tmpl/nm-setting-bond.sgml
index caa8b37a..8f7dbfc1 100644
--- a/docs/libnm-util/tmpl/nm-setting-bond.sgml
+++ b/docs/libnm-util/tmpl/nm-setting-bond.sgml
@@ -9,13 +9,11 @@ NMSettingBond
 
 
 
-
 
 
 
 
 
-
 
 
 
diff --git a/docs/libnm-util/tmpl/nm-setting-bridge-port.sgml b/docs/libnm-util/tmpl/nm-setting-bridge-port.sgml
new file mode 100644
index 00000000..c86142ee
--- /dev/null
+++ b/docs/libnm-util/tmpl/nm-setting-bridge-port.sgml
@@ -0,0 +1,143 @@
+
+NMSettingBridgePort
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+@parent: 
+@_reserved1: 
+@_reserved2: 
+@_reserved3: 
+@_reserved4: 
+
+
+
+
+
+
+@NM_SETTING_BRIDGE_PORT_ERROR_UNKNOWN: 
+@NM_SETTING_BRIDGE_PORT_ERROR_INVALID_PROPERTY: 
+@NM_SETTING_BRIDGE_PORT_ERROR_MISSING_PROPERTY: 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+@void: 
+@Returns: 
+
+
+
+
+
+
+
+@setting: 
+@Returns: 
+
+
+
+
+
+
+
+@setting: 
+@Returns: 
+
+
+
+
+
+
+
+@setting: 
+@Returns: 
+
+
+
+
+
+
+
+@void: 
+@Returns: 
+
+
diff --git a/docs/libnm-util/tmpl/nm-setting-bridge.sgml b/docs/libnm-util/tmpl/nm-setting-bridge.sgml
new file mode 100644
index 00000000..69020537
--- /dev/null
+++ b/docs/libnm-util/tmpl/nm-setting-bridge.sgml
@@ -0,0 +1,227 @@
+
+NMSettingBridge
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+@parent: 
+@_reserved1: 
+@_reserved2: 
+@_reserved3: 
+@_reserved4: 
+
+
+
+
+
+
+@NM_SETTING_BRIDGE_ERROR_UNKNOWN: 
+@NM_SETTING_BRIDGE_ERROR_INVALID_PROPERTY: 
+@NM_SETTING_BRIDGE_ERROR_MISSING_PROPERTY: 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+@void: 
+@Returns: 
+
+
+
+
+
+
+
+@setting: 
+@Returns: 
+
+
+
+
+
+
+
+@setting: 
+@Returns: 
+
+
+
+
+
+
+
+@setting: 
+@Returns: 
+
+
+
+
+
+
+
+@setting: 
+@Returns: 
+
+
+
+
+
+
+
+@setting: 
+@Returns: 
+
+
+
+
+
+
+
+@setting: 
+@Returns: 
+
+
+
+
+
+
+
+@setting: 
+@Returns: 
+
+
+
+
+
+
+
+@void: 
+@Returns: 
+
+
diff --git a/docs/libnm-util/tmpl/nm-setting-cdma.sgml b/docs/libnm-util/tmpl/nm-setting-cdma.sgml
index 5d065170..7837016d 100644
--- a/docs/libnm-util/tmpl/nm-setting-cdma.sgml
+++ b/docs/libnm-util/tmpl/nm-setting-cdma.sgml
@@ -9,13 +9,11 @@ NMSettingCdma
 
 
 
-
 
 
 
 
 
-
 
 
 
diff --git a/docs/libnm-util/tmpl/nm-setting-connection.sgml b/docs/libnm-util/tmpl/nm-setting-connection.sgml
index d4f56800..13cd7055 100644
--- a/docs/libnm-util/tmpl/nm-setting-connection.sgml
+++ b/docs/libnm-util/tmpl/nm-setting-connection.sgml
@@ -9,13 +9,11 @@ NMSettingConnection
 
 
 
-
 
 
 
 
 
-
 
 
 
@@ -53,6 +51,11 @@ NMSettingConnection
 
 
 
+
+
+
+
+
 
 
 
@@ -142,6 +145,13 @@ NMSettingConnection
 
 
 
+
+
+
+
+
+
+
 
 
 
@@ -196,6 +206,16 @@ NMSettingConnection
 @Returns: 
 
 
+
+
+
+
+
+@setting: 
+@sec_uuid: 
+@Returns: 
+
+
 
 
 
@@ -250,6 +270,15 @@ NMSettingConnection
 @Returns: 
 
 
+
+
+
+
+
+@setting: 
+@Returns: 
+
+
 
 
 
@@ -272,6 +301,16 @@ NMSettingConnection
 @Returns: 
 
 
+
+
+
+
+
+@setting: 
+@idx: 
+@Returns: 
+
+
 
 
 
@@ -346,3 +385,12 @@ NMSettingConnection
 @idx: 
 
 
+
+
+
+
+
+@setting: 
+@idx: 
+
+
diff --git a/docs/libnm-util/tmpl/nm-setting-gsm.sgml b/docs/libnm-util/tmpl/nm-setting-gsm.sgml
index 0c9bdeb0..96327a4a 100644
--- a/docs/libnm-util/tmpl/nm-setting-gsm.sgml
+++ b/docs/libnm-util/tmpl/nm-setting-gsm.sgml
@@ -9,13 +9,11 @@ NMSettingGsm
 
 
 
-
 
 
 
 
 
-
 
 
 
@@ -135,6 +133,8 @@ NMSettingGsm
 @NM_SETTING_GSM_NETWORK_TYPE_GPRS_EDGE: 
 @NM_SETTING_GSM_NETWORK_TYPE_PREFER_UMTS_HSPA: 
 @NM_SETTING_GSM_NETWORK_TYPE_PREFER_GPRS_EDGE: 
+@NM_SETTING_GSM_NETWORK_TYPE_PREFER_4G: 
+@NM_SETTING_GSM_NETWORK_TYPE_4G: 
 
 
 
diff --git a/docs/libnm-util/tmpl/nm-setting-infiniband.sgml b/docs/libnm-util/tmpl/nm-setting-infiniband.sgml
index 02a59881..ba7117c0 100644
--- a/docs/libnm-util/tmpl/nm-setting-infiniband.sgml
+++ b/docs/libnm-util/tmpl/nm-setting-infiniband.sgml
@@ -9,13 +9,11 @@ NMSettingInfiniband
 
 
 
-
 
 
 
 
 
-
 
 
 
diff --git a/docs/libnm-util/tmpl/nm-setting-ip4-config.sgml b/docs/libnm-util/tmpl/nm-setting-ip4-config.sgml
index 4b915f2b..fbc1b4cc 100644
--- a/docs/libnm-util/tmpl/nm-setting-ip4-config.sgml
+++ b/docs/libnm-util/tmpl/nm-setting-ip4-config.sgml
@@ -9,13 +9,11 @@ NMSettingIP4Config
 
 
 
-
 
 
 
 
 
-
 
 
 
diff --git a/docs/libnm-util/tmpl/nm-setting-ip6-config.sgml b/docs/libnm-util/tmpl/nm-setting-ip6-config.sgml
index ad9c1b63..275827a7 100644
--- a/docs/libnm-util/tmpl/nm-setting-ip6-config.sgml
+++ b/docs/libnm-util/tmpl/nm-setting-ip6-config.sgml
@@ -9,13 +9,11 @@ NMSettingIP6Config
 
 
 
-
 
 
 
 
 
-
 
 
 
@@ -45,6 +43,11 @@ NMSettingIP6Config
 
 
 
+
+
+
+
+
 
 
 
@@ -128,6 +131,13 @@ NMSettingIP6Config
 
 
 
+
+
+
+
+
+
+
 
 
 
@@ -552,6 +562,15 @@ NMSettingIP6Config
 @Returns: 
 
 
+
+
+
+
+
+@setting: 
+@Returns: 
+
+
 
 
 
diff --git a/docs/libnm-util/tmpl/nm-setting-olpc-mesh.sgml b/docs/libnm-util/tmpl/nm-setting-olpc-mesh.sgml
index 9a1e720e..744c87e3 100644
--- a/docs/libnm-util/tmpl/nm-setting-olpc-mesh.sgml
+++ b/docs/libnm-util/tmpl/nm-setting-olpc-mesh.sgml
@@ -9,13 +9,11 @@ NMSettingOlpcMesh
 
 
 
-
 
 
 
 
 
-
 
 
 
diff --git a/docs/libnm-util/tmpl/nm-setting-ppp.sgml b/docs/libnm-util/tmpl/nm-setting-ppp.sgml
index 90815380..f26d56fa 100644
--- a/docs/libnm-util/tmpl/nm-setting-ppp.sgml
+++ b/docs/libnm-util/tmpl/nm-setting-ppp.sgml
@@ -9,13 +9,11 @@ NMSettingPPP
 
 
 
-
 
 
 
 
 
-
 
 
 
diff --git a/docs/libnm-util/tmpl/nm-setting-pppoe.sgml b/docs/libnm-util/tmpl/nm-setting-pppoe.sgml
index 3c022169..942b5a04 100644
--- a/docs/libnm-util/tmpl/nm-setting-pppoe.sgml
+++ b/docs/libnm-util/tmpl/nm-setting-pppoe.sgml
@@ -9,13 +9,11 @@ NMSettingPPPOE
 
 
 
-
 
 
 
 
 
-
 
 
 
diff --git a/docs/libnm-util/tmpl/nm-setting-private.sgml b/docs/libnm-util/tmpl/nm-setting-private.sgml
index b9740165..fdafc21b 100644
--- a/docs/libnm-util/tmpl/nm-setting-private.sgml
+++ b/docs/libnm-util/tmpl/nm-setting-private.sgml
@@ -9,19 +9,25 @@ nm-setting-private
 
 
 
-
 
 
 
 
 
-
 
 
 
 
 
 
+
+
+
+
+
+@x: 
+
+
 
 
 
diff --git a/docs/libnm-util/tmpl/nm-setting-serial.sgml b/docs/libnm-util/tmpl/nm-setting-serial.sgml
index f0313441..542b9fbc 100644
--- a/docs/libnm-util/tmpl/nm-setting-serial.sgml
+++ b/docs/libnm-util/tmpl/nm-setting-serial.sgml
@@ -9,13 +9,11 @@ NMSettingSerial
 
 
 
-
 
 
 
 
 
-
 
 
 
diff --git a/docs/libnm-util/tmpl/nm-setting-vlan.sgml b/docs/libnm-util/tmpl/nm-setting-vlan.sgml
index 49f40d1d..ff8bea01 100644
--- a/docs/libnm-util/tmpl/nm-setting-vlan.sgml
+++ b/docs/libnm-util/tmpl/nm-setting-vlan.sgml
@@ -9,13 +9,11 @@ NMSettingVlan
 
 
 
-
 
 
 
 
 
-
 
 
 
@@ -77,6 +75,7 @@ NMSettingVlan
 @NM_SETTING_VLAN_ERROR_UNKNOWN: 
 @NM_SETTING_VLAN_ERROR_INVALID_PROPERTY: 
 @NM_SETTING_VLAN_ERROR_MISSING_PROPERTY: 
+@NM_SETTING_VLAN_ERROR_INVALID_PARENT: 
 
 
 
diff --git a/docs/libnm-util/tmpl/nm-setting-vpn.sgml b/docs/libnm-util/tmpl/nm-setting-vpn.sgml
index 567776c1..e29dfff9 100644
--- a/docs/libnm-util/tmpl/nm-setting-vpn.sgml
+++ b/docs/libnm-util/tmpl/nm-setting-vpn.sgml
@@ -9,13 +9,11 @@ NMSettingVPN
 
 
 
-
 
 
 
 
 
-
 
 
 
diff --git a/docs/libnm-util/tmpl/nm-setting-wimax.sgml b/docs/libnm-util/tmpl/nm-setting-wimax.sgml
index 0b96fa9f..9225504a 100644
--- a/docs/libnm-util/tmpl/nm-setting-wimax.sgml
+++ b/docs/libnm-util/tmpl/nm-setting-wimax.sgml
@@ -9,13 +9,11 @@ NMSettingWimax
 
 
 
-
 
 
 
 
 
-
 
 
 
diff --git a/docs/libnm-util/tmpl/nm-setting-wired.sgml b/docs/libnm-util/tmpl/nm-setting-wired.sgml
index 09fb963a..cff79594 100644
--- a/docs/libnm-util/tmpl/nm-setting-wired.sgml
+++ b/docs/libnm-util/tmpl/nm-setting-wired.sgml
@@ -9,13 +9,11 @@ NMSettingWired
 
 
 
-
 
 
 
 
 
-
 
 
 
diff --git a/docs/libnm-util/tmpl/nm-setting-wireless-security.sgml b/docs/libnm-util/tmpl/nm-setting-wireless-security.sgml
index 01b16ce9..d653c682 100644
--- a/docs/libnm-util/tmpl/nm-setting-wireless-security.sgml
+++ b/docs/libnm-util/tmpl/nm-setting-wireless-security.sgml
@@ -9,13 +9,11 @@ NMSettingWirelessSecurity
 
 
 
-
 
 
 
 
 
-
 
 
 
diff --git a/docs/libnm-util/tmpl/nm-setting-wireless.sgml b/docs/libnm-util/tmpl/nm-setting-wireless.sgml
index fdadf8b9..039f5787 100644
--- a/docs/libnm-util/tmpl/nm-setting-wireless.sgml
+++ b/docs/libnm-util/tmpl/nm-setting-wireless.sgml
@@ -9,13 +9,11 @@ NMSettingWireless
 
 
 
-
 
 
 
 
 
-
 
 
 
@@ -190,6 +188,13 @@ NMSettingWireless
 
 
 
+
+
+
+
+
+
+
 
 
 
diff --git a/docs/libnm-util/tmpl/nm-setting.sgml b/docs/libnm-util/tmpl/nm-setting.sgml
index 2067408a..a5198c10 100644
--- a/docs/libnm-util/tmpl/nm-setting.sgml
+++ b/docs/libnm-util/tmpl/nm-setting.sgml
@@ -9,13 +9,11 @@ NMSetting
 
 
 
-
 
 
 
 
 
-
 
 
 
diff --git a/docs/libnm-util/tmpl/nm-utils-enum-types.sgml b/docs/libnm-util/tmpl/nm-utils-enum-types.sgml
index 82025822..5171db34 100644
--- a/docs/libnm-util/tmpl/nm-utils-enum-types.sgml
+++ b/docs/libnm-util/tmpl/nm-utils-enum-types.sgml
@@ -9,13 +9,11 @@ nm-utils-enum-types
 
 
 
-
 
 
 
 
 
-
 
 
 
diff --git a/docs/libnm-util/tmpl/nm-utils.sgml b/docs/libnm-util/tmpl/nm-utils.sgml
index 8a822fcf..d148c444 100644
--- a/docs/libnm-util/tmpl/nm-utils.sgml
+++ b/docs/libnm-util/tmpl/nm-utils.sgml
@@ -9,13 +9,11 @@ nm-utils
 
 
 
-
 
 
 
 
 
-
 
 
 
@@ -44,6 +42,16 @@ nm-utils
 
 
 
+
+
+
+
+
+@type: 
+@wifi_caps: 
+@Returns: 
+
+
 
 
 
@@ -129,6 +137,15 @@ nm-utils
 @Returns: 
 
 
+
+
+
+
+
+@name: 
+@Returns: 
+
+
 
 
 
@@ -265,6 +282,15 @@ nm-utils
 @Returns: 
 
 
+
+
+
+
+
+@str: 
+@Returns: 
+
+
 
 
 
diff --git a/docs/libnm-util/version.xml b/docs/libnm-util/version.xml
index f6c687fe..fa572dcf 100644
--- a/docs/libnm-util/version.xml
+++ b/docs/libnm-util/version.xml
@@ -1 +1 @@
-0.9.6.4
+0.9.7.995
diff --git a/examples/C/Makefile.in b/examples/C/Makefile.in
index 39065593..fac2ace6 100644
--- a/examples/C/Makefile.in
+++ b/examples/C/Makefile.in
@@ -55,16 +55,18 @@ subdir = examples/C
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/compiler_warnings.m4 \
-	$(top_srcdir)/m4/gettext.m4 $(top_srcdir)/m4/gtk-doc.m4 \
-	$(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/intlmacosx.m4 \
-	$(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/introspection.m4 \
-	$(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \
-	$(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/libnl-check.m4 \
-	$(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \
-	$(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
-	$(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/nls.m4 \
-	$(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/progtest.m4 \
-	$(top_srcdir)/m4/vapigen.m4 $(top_srcdir)/configure.ac
+	$(top_srcdir)/m4/gettext.m4 \
+	$(top_srcdir)/m4/gnome-code-coverage.m4 \
+	$(top_srcdir)/m4/gtk-doc.m4 $(top_srcdir)/m4/iconv.m4 \
+	$(top_srcdir)/m4/intlmacosx.m4 $(top_srcdir)/m4/intltool.m4 \
+	$(top_srcdir)/m4/introspection.m4 $(top_srcdir)/m4/lib-ld.m4 \
+	$(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \
+	$(top_srcdir)/m4/libnl-check.m4 $(top_srcdir)/m4/libtool.m4 \
+	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
+	$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
+	$(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/po.m4 \
+	$(top_srcdir)/m4/progtest.m4 $(top_srcdir)/m4/vapigen.m4 \
+	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(install_sh) -d
@@ -137,6 +139,10 @@ AWK = @AWK@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
+CKDB_PATH = @CKDB_PATH@
+CODE_COVERAGE_CFLAGS = @CODE_COVERAGE_CFLAGS@
+CODE_COVERAGE_ENABLED = @CODE_COVERAGE_ENABLED@
+CODE_COVERAGE_LDFLAGS = @CODE_COVERAGE_LDFLAGS@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CXX = @CXX@
@@ -151,9 +157,7 @@ DBUS_SYS_DIR = @DBUS_SYS_DIR@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
 DHCLIENT_PATH = @DHCLIENT_PATH@
-DHCLIENT_VERSION = @DHCLIENT_VERSION@
 DHCPCD_PATH = @DHCPCD_PATH@
-DISABLE_DEPRECATED = @DISABLE_DEPRECATED@
 DLLTOOL = @DLLTOOL@
 DSYMUTIL = @DSYMUTIL@
 DUMPBIN = @DUMPBIN@
@@ -163,17 +167,14 @@ ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
 FGREP = @FGREP@
+GENHTML = @GENHTML@
 GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
 GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
-GIO_CFLAGS = @GIO_CFLAGS@
-GIO_LIBS = @GIO_LIBS@
 GLIB_CFLAGS = @GLIB_CFLAGS@
 GLIB_GENMARSHAL = @GLIB_GENMARSHAL@
 GLIB_LIBS = @GLIB_LIBS@
 GLIB_MAKEFILE = @GLIB_MAKEFILE@
 GLIB_MKENUMS = @GLIB_MKENUMS@
-GMODULE_CFLAGS = @GMODULE_CFLAGS@
-GMODULE_LIBS = @GMODULE_LIBS@
 GMSGFMT = @GMSGFMT@
 GMSGFMT_015 = @GMSGFMT_015@
 GNUTLS_CFLAGS = @GNUTLS_CFLAGS@
@@ -214,6 +215,7 @@ IPTABLES_PATH = @IPTABLES_PATH@
 IWMX_SDK_CFLAGS = @IWMX_SDK_CFLAGS@
 IWMX_SDK_LIBS = @IWMX_SDK_LIBS@
 KERNEL_FIRMWARE_DIR = @KERNEL_FIRMWARE_DIR@
+LCOV = @LCOV@
 LD = @LD@
 LDFLAGS = @LDFLAGS@
 LIBDL = @LIBDL@
@@ -230,11 +232,7 @@ LIBNL2_LIBS = @LIBNL2_LIBS@
 LIBNL3_CFLAGS = @LIBNL3_CFLAGS@
 LIBNL3_LIBS = @LIBNL3_LIBS@
 LIBNL_CFLAGS = @LIBNL_CFLAGS@
-LIBNL_GENL3_CFLAGS = @LIBNL_GENL3_CFLAGS@
-LIBNL_GENL3_LIBS = @LIBNL_GENL3_LIBS@
 LIBNL_LIBS = @LIBNL_LIBS@
-LIBNL_ROUTE3_CFLAGS = @LIBNL_ROUTE3_CFLAGS@
-LIBNL_ROUTE3_LIBS = @LIBNL_ROUTE3_LIBS@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
 LIBSOUP_CFLAGS = @LIBSOUP_CFLAGS@
@@ -249,6 +247,8 @@ MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MANIFEST_TOOL = @MANIFEST_TOOL@
 MKDIR_P = @MKDIR_P@
+MM_GLIB_CFLAGS = @MM_GLIB_CFLAGS@
+MM_GLIB_LIBS = @MM_GLIB_LIBS@
 MOC = @MOC@
 MSGFMT = @MSGFMT@
 MSGFMT_015 = @MSGFMT_015@
@@ -258,6 +258,7 @@ NMEDIT = @NMEDIT@
 NM_MAJOR_VERSION = @NM_MAJOR_VERSION@
 NM_MICRO_VERSION = @NM_MICRO_VERSION@
 NM_MINOR_VERSION = @NM_MINOR_VERSION@
+NM_MODIFY_SYSTEM_POLICY = @NM_MODIFY_SYSTEM_POLICY@
 NM_VERSION = @NM_VERSION@
 NSS_CFLAGS = @NSS_CFLAGS@
 NSS_LIBS = @NSS_LIBS@
@@ -284,13 +285,14 @@ PPPD_PLUGIN_DIR = @PPPD_PLUGIN_DIR@
 QT_CFLAGS = @QT_CFLAGS@
 QT_LIBS = @QT_LIBS@
 RANLIB = @RANLIB@
-RESOLVCONF_PATH = @RESOLVCONF_PATH@
 SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
-SYSTEMD_CFLAGS = @SYSTEMD_CFLAGS@
-SYSTEMD_LIBS = @SYSTEMD_LIBS@
+SYSTEMD_INHIBIT_CFLAGS = @SYSTEMD_INHIBIT_CFLAGS@
+SYSTEMD_INHIBIT_LIBS = @SYSTEMD_INHIBIT_LIBS@
+SYSTEMD_LOGIN_CFLAGS = @SYSTEMD_LOGIN_CFLAGS@
+SYSTEMD_LOGIN_LIBS = @SYSTEMD_LOGIN_LIBS@
 SYSTEM_CA_PATH = @SYSTEM_CA_PATH@
 UDEV_BASE_DIR = @UDEV_BASE_DIR@
 USE_NLS = @USE_NLS@
@@ -345,6 +347,11 @@ localedir = @localedir@
 localstatedir = @localstatedir@
 mandir = @mandir@
 mkdir_p = @mkdir_p@
+nmbinary = @nmbinary@
+nmconfdir = @nmconfdir@
+nmdatadir = @nmdatadir@
+nmrundir = @nmrundir@
+nmstatedir = @nmstatedir@
 oldincludedir = @oldincludedir@
 pdfdir = @pdfdir@
 prefix = @prefix@
@@ -359,6 +366,10 @@ target_alias = @target_alias@
 top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
+with_dhclient = @with_dhclient@
+with_dhcpcd = @with_dhcpcd@
+with_netconfig = @with_netconfig@
+with_resolvconf = @with_resolvconf@
 SUBDIRS = glib $(am__append_1)
 all: all-recursive
 
diff --git a/examples/C/glib/Makefile.am b/examples/C/glib/Makefile.am
index 428f6adc..1511f607 100644
--- a/examples/C/glib/Makefile.am
+++ b/examples/C/glib/Makefile.am
@@ -65,11 +65,11 @@ monitor_nm_running_dbus_glib_LDADD = \
 
 monitor_nm_running_GDBus_SOURCES = monitor-nm-running-GDBus.c
 monitor_nm_running_GDBus_LDADD = \
-	$(GIO_LIBS)
+	$(GLIB_LIBS)
 
 monitor_nm_state_GDBus_SOURCES = monitor-nm-state-GDBus.c
 monitor_nm_state_GDBus_LDADD = \
-	$(GIO_LIBS)
+	$(GLIB_LIBS)
 
 EXTRA_DIST = \
 	add-connection-dbus-glib.c \
diff --git a/examples/C/glib/Makefile.in b/examples/C/glib/Makefile.in
index 6709a27f..c5d4b6bb 100644
--- a/examples/C/glib/Makefile.in
+++ b/examples/C/glib/Makefile.in
@@ -64,16 +64,18 @@ subdir = examples/C/glib
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/compiler_warnings.m4 \
-	$(top_srcdir)/m4/gettext.m4 $(top_srcdir)/m4/gtk-doc.m4 \
-	$(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/intlmacosx.m4 \
-	$(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/introspection.m4 \
-	$(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \
-	$(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/libnl-check.m4 \
-	$(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \
-	$(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
-	$(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/nls.m4 \
-	$(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/progtest.m4 \
-	$(top_srcdir)/m4/vapigen.m4 $(top_srcdir)/configure.ac
+	$(top_srcdir)/m4/gettext.m4 \
+	$(top_srcdir)/m4/gnome-code-coverage.m4 \
+	$(top_srcdir)/m4/gtk-doc.m4 $(top_srcdir)/m4/iconv.m4 \
+	$(top_srcdir)/m4/intlmacosx.m4 $(top_srcdir)/m4/intltool.m4 \
+	$(top_srcdir)/m4/introspection.m4 $(top_srcdir)/m4/lib-ld.m4 \
+	$(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \
+	$(top_srcdir)/m4/libnl-check.m4 $(top_srcdir)/m4/libtool.m4 \
+	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
+	$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
+	$(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/po.m4 \
+	$(top_srcdir)/m4/progtest.m4 $(top_srcdir)/m4/vapigen.m4 \
+	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(install_sh) -d
@@ -206,6 +208,10 @@ AWK = @AWK@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
+CKDB_PATH = @CKDB_PATH@
+CODE_COVERAGE_CFLAGS = @CODE_COVERAGE_CFLAGS@
+CODE_COVERAGE_ENABLED = @CODE_COVERAGE_ENABLED@
+CODE_COVERAGE_LDFLAGS = @CODE_COVERAGE_LDFLAGS@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CXX = @CXX@
@@ -220,9 +226,7 @@ DBUS_SYS_DIR = @DBUS_SYS_DIR@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
 DHCLIENT_PATH = @DHCLIENT_PATH@
-DHCLIENT_VERSION = @DHCLIENT_VERSION@
 DHCPCD_PATH = @DHCPCD_PATH@
-DISABLE_DEPRECATED = @DISABLE_DEPRECATED@
 DLLTOOL = @DLLTOOL@
 DSYMUTIL = @DSYMUTIL@
 DUMPBIN = @DUMPBIN@
@@ -232,17 +236,14 @@ ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
 FGREP = @FGREP@
+GENHTML = @GENHTML@
 GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
 GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
-GIO_CFLAGS = @GIO_CFLAGS@
-GIO_LIBS = @GIO_LIBS@
 GLIB_CFLAGS = @GLIB_CFLAGS@
 GLIB_GENMARSHAL = @GLIB_GENMARSHAL@
 GLIB_LIBS = @GLIB_LIBS@
 GLIB_MAKEFILE = @GLIB_MAKEFILE@
 GLIB_MKENUMS = @GLIB_MKENUMS@
-GMODULE_CFLAGS = @GMODULE_CFLAGS@
-GMODULE_LIBS = @GMODULE_LIBS@
 GMSGFMT = @GMSGFMT@
 GMSGFMT_015 = @GMSGFMT_015@
 GNUTLS_CFLAGS = @GNUTLS_CFLAGS@
@@ -283,6 +284,7 @@ IPTABLES_PATH = @IPTABLES_PATH@
 IWMX_SDK_CFLAGS = @IWMX_SDK_CFLAGS@
 IWMX_SDK_LIBS = @IWMX_SDK_LIBS@
 KERNEL_FIRMWARE_DIR = @KERNEL_FIRMWARE_DIR@
+LCOV = @LCOV@
 LD = @LD@
 LDFLAGS = @LDFLAGS@
 LIBDL = @LIBDL@
@@ -299,11 +301,7 @@ LIBNL2_LIBS = @LIBNL2_LIBS@
 LIBNL3_CFLAGS = @LIBNL3_CFLAGS@
 LIBNL3_LIBS = @LIBNL3_LIBS@
 LIBNL_CFLAGS = @LIBNL_CFLAGS@
-LIBNL_GENL3_CFLAGS = @LIBNL_GENL3_CFLAGS@
-LIBNL_GENL3_LIBS = @LIBNL_GENL3_LIBS@
 LIBNL_LIBS = @LIBNL_LIBS@
-LIBNL_ROUTE3_CFLAGS = @LIBNL_ROUTE3_CFLAGS@
-LIBNL_ROUTE3_LIBS = @LIBNL_ROUTE3_LIBS@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
 LIBSOUP_CFLAGS = @LIBSOUP_CFLAGS@
@@ -318,6 +316,8 @@ MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MANIFEST_TOOL = @MANIFEST_TOOL@
 MKDIR_P = @MKDIR_P@
+MM_GLIB_CFLAGS = @MM_GLIB_CFLAGS@
+MM_GLIB_LIBS = @MM_GLIB_LIBS@
 MOC = @MOC@
 MSGFMT = @MSGFMT@
 MSGFMT_015 = @MSGFMT_015@
@@ -327,6 +327,7 @@ NMEDIT = @NMEDIT@
 NM_MAJOR_VERSION = @NM_MAJOR_VERSION@
 NM_MICRO_VERSION = @NM_MICRO_VERSION@
 NM_MINOR_VERSION = @NM_MINOR_VERSION@
+NM_MODIFY_SYSTEM_POLICY = @NM_MODIFY_SYSTEM_POLICY@
 NM_VERSION = @NM_VERSION@
 NSS_CFLAGS = @NSS_CFLAGS@
 NSS_LIBS = @NSS_LIBS@
@@ -353,13 +354,14 @@ PPPD_PLUGIN_DIR = @PPPD_PLUGIN_DIR@
 QT_CFLAGS = @QT_CFLAGS@
 QT_LIBS = @QT_LIBS@
 RANLIB = @RANLIB@
-RESOLVCONF_PATH = @RESOLVCONF_PATH@
 SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
-SYSTEMD_CFLAGS = @SYSTEMD_CFLAGS@
-SYSTEMD_LIBS = @SYSTEMD_LIBS@
+SYSTEMD_INHIBIT_CFLAGS = @SYSTEMD_INHIBIT_CFLAGS@
+SYSTEMD_INHIBIT_LIBS = @SYSTEMD_INHIBIT_LIBS@
+SYSTEMD_LOGIN_CFLAGS = @SYSTEMD_LOGIN_CFLAGS@
+SYSTEMD_LOGIN_LIBS = @SYSTEMD_LOGIN_LIBS@
 SYSTEM_CA_PATH = @SYSTEM_CA_PATH@
 UDEV_BASE_DIR = @UDEV_BASE_DIR@
 USE_NLS = @USE_NLS@
@@ -414,6 +416,11 @@ localedir = @localedir@
 localstatedir = @localstatedir@
 mandir = @mandir@
 mkdir_p = @mkdir_p@
+nmbinary = @nmbinary@
+nmconfdir = @nmconfdir@
+nmdatadir = @nmdatadir@
+nmrundir = @nmrundir@
+nmstatedir = @nmstatedir@
 oldincludedir = @oldincludedir@
 pdfdir = @pdfdir@
 prefix = @prefix@
@@ -428,6 +435,10 @@ target_alias = @target_alias@
 top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
+with_dhclient = @with_dhclient@
+with_dhcpcd = @with_dhcpcd@
+with_netconfig = @with_netconfig@
+with_resolvconf = @with_resolvconf@
 INCLUDES = -I${top_srcdir}/libnm-util         \
 	   -I${top_builddir}/libnm-util         \
            -I${top_srcdir}/libnm-glib         \
@@ -484,11 +495,11 @@ monitor_nm_running_dbus_glib_LDADD = \
 
 monitor_nm_running_GDBus_SOURCES = monitor-nm-running-GDBus.c
 monitor_nm_running_GDBus_LDADD = \
-	$(GIO_LIBS)
+	$(GLIB_LIBS)
 
 monitor_nm_state_GDBus_SOURCES = monitor-nm-state-GDBus.c
 monitor_nm_state_GDBus_LDADD = \
-	$(GIO_LIBS)
+	$(GLIB_LIBS)
 
 EXTRA_DIST = \
 	add-connection-dbus-glib.c \
@@ -589,25 +600,22 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/monitor-nm-state-GDBus.Po@am__quote@
 
 .c.o:
-@am__fastdepCC_TRUE@	$(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\
-@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
-@am__fastdepCC_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.Po
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $<
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c $<
 
 .c.obj:
-@am__fastdepCC_TRUE@	$(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.obj$$||'`;\
-@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ `$(CYGPATH_W) '$<'` &&\
-@am__fastdepCC_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.Po
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c `$(CYGPATH_W) '$<'`
 
 .c.lo:
-@am__fastdepCC_TRUE@	$(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.lo$$||'`;\
-@am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
-@am__fastdepCC_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.Plo
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $<
diff --git a/examples/C/glib/get-ap-info-libnm-glib.c b/examples/C/glib/get-ap-info-libnm-glib.c
index 316bce0e..e72ce54f 100644
--- a/examples/C/glib/get-ap-info-libnm-glib.c
+++ b/examples/C/glib/get-ap-info-libnm-glib.c
@@ -133,7 +133,9 @@ show_access_point_info (NMAccessPoint *ap)
 
 	printf ("SSID:       %s\n", ssid_str);
 	printf ("BSSID:      %s\n", hwaddr);
-	printf ("Mode:       %s\n", mode == NM_802_11_MODE_ADHOC ? "Ad-Hoc" : mode == NM_802_11_MODE_INFRA ? "Infrastructure" : "Unknown");
+	printf ("Mode:       %s\n", mode == NM_802_11_MODE_ADHOC ? "Ad-Hoc"
+	                          : mode == NM_802_11_MODE_INFRA ? "Infrastructure"
+	                          : "Unknown");
 	printf ("Freq:       %s\n", freq_str);
 	printf ("Bitrate:    %s\n", bitrate_str);
 	printf ("Strength:   %s\n", strength_str);
diff --git a/examples/C/qt/Makefile.in b/examples/C/qt/Makefile.in
index 666f0801..6de43309 100644
--- a/examples/C/qt/Makefile.in
+++ b/examples/C/qt/Makefile.in
@@ -58,16 +58,18 @@ subdir = examples/C/qt
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/compiler_warnings.m4 \
-	$(top_srcdir)/m4/gettext.m4 $(top_srcdir)/m4/gtk-doc.m4 \
-	$(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/intlmacosx.m4 \
-	$(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/introspection.m4 \
-	$(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \
-	$(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/libnl-check.m4 \
-	$(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \
-	$(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
-	$(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/nls.m4 \
-	$(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/progtest.m4 \
-	$(top_srcdir)/m4/vapigen.m4 $(top_srcdir)/configure.ac
+	$(top_srcdir)/m4/gettext.m4 \
+	$(top_srcdir)/m4/gnome-code-coverage.m4 \
+	$(top_srcdir)/m4/gtk-doc.m4 $(top_srcdir)/m4/iconv.m4 \
+	$(top_srcdir)/m4/intlmacosx.m4 $(top_srcdir)/m4/intltool.m4 \
+	$(top_srcdir)/m4/introspection.m4 $(top_srcdir)/m4/lib-ld.m4 \
+	$(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \
+	$(top_srcdir)/m4/libnl-check.m4 $(top_srcdir)/m4/libtool.m4 \
+	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
+	$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
+	$(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/po.m4 \
+	$(top_srcdir)/m4/progtest.m4 $(top_srcdir)/m4/vapigen.m4 \
+	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(install_sh) -d
@@ -147,6 +149,10 @@ AWK = @AWK@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
+CKDB_PATH = @CKDB_PATH@
+CODE_COVERAGE_CFLAGS = @CODE_COVERAGE_CFLAGS@
+CODE_COVERAGE_ENABLED = @CODE_COVERAGE_ENABLED@
+CODE_COVERAGE_LDFLAGS = @CODE_COVERAGE_LDFLAGS@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CXX = @CXX@
@@ -161,9 +167,7 @@ DBUS_SYS_DIR = @DBUS_SYS_DIR@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
 DHCLIENT_PATH = @DHCLIENT_PATH@
-DHCLIENT_VERSION = @DHCLIENT_VERSION@
 DHCPCD_PATH = @DHCPCD_PATH@
-DISABLE_DEPRECATED = @DISABLE_DEPRECATED@
 DLLTOOL = @DLLTOOL@
 DSYMUTIL = @DSYMUTIL@
 DUMPBIN = @DUMPBIN@
@@ -173,17 +177,14 @@ ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
 FGREP = @FGREP@
+GENHTML = @GENHTML@
 GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
 GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
-GIO_CFLAGS = @GIO_CFLAGS@
-GIO_LIBS = @GIO_LIBS@
 GLIB_CFLAGS = @GLIB_CFLAGS@
 GLIB_GENMARSHAL = @GLIB_GENMARSHAL@
 GLIB_LIBS = @GLIB_LIBS@
 GLIB_MAKEFILE = @GLIB_MAKEFILE@
 GLIB_MKENUMS = @GLIB_MKENUMS@
-GMODULE_CFLAGS = @GMODULE_CFLAGS@
-GMODULE_LIBS = @GMODULE_LIBS@
 GMSGFMT = @GMSGFMT@
 GMSGFMT_015 = @GMSGFMT_015@
 GNUTLS_CFLAGS = @GNUTLS_CFLAGS@
@@ -224,6 +225,7 @@ IPTABLES_PATH = @IPTABLES_PATH@
 IWMX_SDK_CFLAGS = @IWMX_SDK_CFLAGS@
 IWMX_SDK_LIBS = @IWMX_SDK_LIBS@
 KERNEL_FIRMWARE_DIR = @KERNEL_FIRMWARE_DIR@
+LCOV = @LCOV@
 LD = @LD@
 LDFLAGS = @LDFLAGS@
 LIBDL = @LIBDL@
@@ -240,11 +242,7 @@ LIBNL2_LIBS = @LIBNL2_LIBS@
 LIBNL3_CFLAGS = @LIBNL3_CFLAGS@
 LIBNL3_LIBS = @LIBNL3_LIBS@
 LIBNL_CFLAGS = @LIBNL_CFLAGS@
-LIBNL_GENL3_CFLAGS = @LIBNL_GENL3_CFLAGS@
-LIBNL_GENL3_LIBS = @LIBNL_GENL3_LIBS@
 LIBNL_LIBS = @LIBNL_LIBS@
-LIBNL_ROUTE3_CFLAGS = @LIBNL_ROUTE3_CFLAGS@
-LIBNL_ROUTE3_LIBS = @LIBNL_ROUTE3_LIBS@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
 LIBSOUP_CFLAGS = @LIBSOUP_CFLAGS@
@@ -259,6 +257,8 @@ MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MANIFEST_TOOL = @MANIFEST_TOOL@
 MKDIR_P = @MKDIR_P@
+MM_GLIB_CFLAGS = @MM_GLIB_CFLAGS@
+MM_GLIB_LIBS = @MM_GLIB_LIBS@
 MOC = @MOC@
 MSGFMT = @MSGFMT@
 MSGFMT_015 = @MSGFMT_015@
@@ -268,6 +268,7 @@ NMEDIT = @NMEDIT@
 NM_MAJOR_VERSION = @NM_MAJOR_VERSION@
 NM_MICRO_VERSION = @NM_MICRO_VERSION@
 NM_MINOR_VERSION = @NM_MINOR_VERSION@
+NM_MODIFY_SYSTEM_POLICY = @NM_MODIFY_SYSTEM_POLICY@
 NM_VERSION = @NM_VERSION@
 NSS_CFLAGS = @NSS_CFLAGS@
 NSS_LIBS = @NSS_LIBS@
@@ -294,13 +295,14 @@ PPPD_PLUGIN_DIR = @PPPD_PLUGIN_DIR@
 QT_CFLAGS = @QT_CFLAGS@
 QT_LIBS = @QT_LIBS@
 RANLIB = @RANLIB@
-RESOLVCONF_PATH = @RESOLVCONF_PATH@
 SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
-SYSTEMD_CFLAGS = @SYSTEMD_CFLAGS@
-SYSTEMD_LIBS = @SYSTEMD_LIBS@
+SYSTEMD_INHIBIT_CFLAGS = @SYSTEMD_INHIBIT_CFLAGS@
+SYSTEMD_INHIBIT_LIBS = @SYSTEMD_INHIBIT_LIBS@
+SYSTEMD_LOGIN_CFLAGS = @SYSTEMD_LOGIN_CFLAGS@
+SYSTEMD_LOGIN_LIBS = @SYSTEMD_LOGIN_LIBS@
 SYSTEM_CA_PATH = @SYSTEM_CA_PATH@
 UDEV_BASE_DIR = @UDEV_BASE_DIR@
 USE_NLS = @USE_NLS@
@@ -355,6 +357,11 @@ localedir = @localedir@
 localstatedir = @localstatedir@
 mandir = @mandir@
 mkdir_p = @mkdir_p@
+nmbinary = @nmbinary@
+nmconfdir = @nmconfdir@
+nmdatadir = @nmdatadir@
+nmrundir = @nmrundir@
+nmstatedir = @nmstatedir@
 oldincludedir = @oldincludedir@
 pdfdir = @pdfdir@
 prefix = @prefix@
@@ -369,6 +376,10 @@ target_alias = @target_alias@
 top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
+with_dhclient = @with_dhclient@
+with_dhcpcd = @with_dhcpcd@
+with_netconfig = @with_netconfig@
+with_resolvconf = @with_resolvconf@
 INCLUDES = -I${top_srcdir}/include \
 	   -I${top_builddir}/include
 
@@ -475,25 +486,22 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/monitor-nm-running.Po@am__quote@
 
 .cpp.o:
-@am__fastdepCXX_TRUE@	$(AM_V_CXX)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\
-@am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
-@am__fastdepCXX_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.Po
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ $<
 
 .cpp.obj:
-@am__fastdepCXX_TRUE@	$(AM_V_CXX)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.obj$$||'`;\
-@am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ `$(CYGPATH_W) '$<'` &&\
-@am__fastdepCXX_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.Po
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
 
 .cpp.lo:
-@am__fastdepCXX_TRUE@	$(AM_V_CXX)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.lo$$||'`;\
-@am__fastdepCXX_TRUE@	$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
-@am__fastdepCXX_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.Plo
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(LTCXXCOMPILE) -c -o $@ $<
diff --git a/examples/Makefile.am b/examples/Makefile.am
index eeea8771..a227f0ea 100644
--- a/examples/Makefile.am
+++ b/examples/Makefile.am
@@ -2,4 +2,5 @@ SUBDIRS= \
 	shell \
 	python \
 	ruby \
-	C
+	C \
+	dispatcher
diff --git a/examples/Makefile.in b/examples/Makefile.in
index d330bc83..ceb61561 100644
--- a/examples/Makefile.in
+++ b/examples/Makefile.in
@@ -54,16 +54,18 @@ subdir = examples
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/compiler_warnings.m4 \
-	$(top_srcdir)/m4/gettext.m4 $(top_srcdir)/m4/gtk-doc.m4 \
-	$(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/intlmacosx.m4 \
-	$(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/introspection.m4 \
-	$(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \
-	$(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/libnl-check.m4 \
-	$(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \
-	$(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
-	$(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/nls.m4 \
-	$(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/progtest.m4 \
-	$(top_srcdir)/m4/vapigen.m4 $(top_srcdir)/configure.ac
+	$(top_srcdir)/m4/gettext.m4 \
+	$(top_srcdir)/m4/gnome-code-coverage.m4 \
+	$(top_srcdir)/m4/gtk-doc.m4 $(top_srcdir)/m4/iconv.m4 \
+	$(top_srcdir)/m4/intlmacosx.m4 $(top_srcdir)/m4/intltool.m4 \
+	$(top_srcdir)/m4/introspection.m4 $(top_srcdir)/m4/lib-ld.m4 \
+	$(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \
+	$(top_srcdir)/m4/libnl-check.m4 $(top_srcdir)/m4/libtool.m4 \
+	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
+	$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
+	$(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/po.m4 \
+	$(top_srcdir)/m4/progtest.m4 $(top_srcdir)/m4/vapigen.m4 \
+	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(install_sh) -d
@@ -136,6 +138,10 @@ AWK = @AWK@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
+CKDB_PATH = @CKDB_PATH@
+CODE_COVERAGE_CFLAGS = @CODE_COVERAGE_CFLAGS@
+CODE_COVERAGE_ENABLED = @CODE_COVERAGE_ENABLED@
+CODE_COVERAGE_LDFLAGS = @CODE_COVERAGE_LDFLAGS@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CXX = @CXX@
@@ -150,9 +156,7 @@ DBUS_SYS_DIR = @DBUS_SYS_DIR@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
 DHCLIENT_PATH = @DHCLIENT_PATH@
-DHCLIENT_VERSION = @DHCLIENT_VERSION@
 DHCPCD_PATH = @DHCPCD_PATH@
-DISABLE_DEPRECATED = @DISABLE_DEPRECATED@
 DLLTOOL = @DLLTOOL@
 DSYMUTIL = @DSYMUTIL@
 DUMPBIN = @DUMPBIN@
@@ -162,17 +166,14 @@ ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
 FGREP = @FGREP@
+GENHTML = @GENHTML@
 GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
 GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
-GIO_CFLAGS = @GIO_CFLAGS@
-GIO_LIBS = @GIO_LIBS@
 GLIB_CFLAGS = @GLIB_CFLAGS@
 GLIB_GENMARSHAL = @GLIB_GENMARSHAL@
 GLIB_LIBS = @GLIB_LIBS@
 GLIB_MAKEFILE = @GLIB_MAKEFILE@
 GLIB_MKENUMS = @GLIB_MKENUMS@
-GMODULE_CFLAGS = @GMODULE_CFLAGS@
-GMODULE_LIBS = @GMODULE_LIBS@
 GMSGFMT = @GMSGFMT@
 GMSGFMT_015 = @GMSGFMT_015@
 GNUTLS_CFLAGS = @GNUTLS_CFLAGS@
@@ -213,6 +214,7 @@ IPTABLES_PATH = @IPTABLES_PATH@
 IWMX_SDK_CFLAGS = @IWMX_SDK_CFLAGS@
 IWMX_SDK_LIBS = @IWMX_SDK_LIBS@
 KERNEL_FIRMWARE_DIR = @KERNEL_FIRMWARE_DIR@
+LCOV = @LCOV@
 LD = @LD@
 LDFLAGS = @LDFLAGS@
 LIBDL = @LIBDL@
@@ -229,11 +231,7 @@ LIBNL2_LIBS = @LIBNL2_LIBS@
 LIBNL3_CFLAGS = @LIBNL3_CFLAGS@
 LIBNL3_LIBS = @LIBNL3_LIBS@
 LIBNL_CFLAGS = @LIBNL_CFLAGS@
-LIBNL_GENL3_CFLAGS = @LIBNL_GENL3_CFLAGS@
-LIBNL_GENL3_LIBS = @LIBNL_GENL3_LIBS@
 LIBNL_LIBS = @LIBNL_LIBS@
-LIBNL_ROUTE3_CFLAGS = @LIBNL_ROUTE3_CFLAGS@
-LIBNL_ROUTE3_LIBS = @LIBNL_ROUTE3_LIBS@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
 LIBSOUP_CFLAGS = @LIBSOUP_CFLAGS@
@@ -248,6 +246,8 @@ MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MANIFEST_TOOL = @MANIFEST_TOOL@
 MKDIR_P = @MKDIR_P@
+MM_GLIB_CFLAGS = @MM_GLIB_CFLAGS@
+MM_GLIB_LIBS = @MM_GLIB_LIBS@
 MOC = @MOC@
 MSGFMT = @MSGFMT@
 MSGFMT_015 = @MSGFMT_015@
@@ -257,6 +257,7 @@ NMEDIT = @NMEDIT@
 NM_MAJOR_VERSION = @NM_MAJOR_VERSION@
 NM_MICRO_VERSION = @NM_MICRO_VERSION@
 NM_MINOR_VERSION = @NM_MINOR_VERSION@
+NM_MODIFY_SYSTEM_POLICY = @NM_MODIFY_SYSTEM_POLICY@
 NM_VERSION = @NM_VERSION@
 NSS_CFLAGS = @NSS_CFLAGS@
 NSS_LIBS = @NSS_LIBS@
@@ -283,13 +284,14 @@ PPPD_PLUGIN_DIR = @PPPD_PLUGIN_DIR@
 QT_CFLAGS = @QT_CFLAGS@
 QT_LIBS = @QT_LIBS@
 RANLIB = @RANLIB@
-RESOLVCONF_PATH = @RESOLVCONF_PATH@
 SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
-SYSTEMD_CFLAGS = @SYSTEMD_CFLAGS@
-SYSTEMD_LIBS = @SYSTEMD_LIBS@
+SYSTEMD_INHIBIT_CFLAGS = @SYSTEMD_INHIBIT_CFLAGS@
+SYSTEMD_INHIBIT_LIBS = @SYSTEMD_INHIBIT_LIBS@
+SYSTEMD_LOGIN_CFLAGS = @SYSTEMD_LOGIN_CFLAGS@
+SYSTEMD_LOGIN_LIBS = @SYSTEMD_LOGIN_LIBS@
 SYSTEM_CA_PATH = @SYSTEM_CA_PATH@
 UDEV_BASE_DIR = @UDEV_BASE_DIR@
 USE_NLS = @USE_NLS@
@@ -344,6 +346,11 @@ localedir = @localedir@
 localstatedir = @localstatedir@
 mandir = @mandir@
 mkdir_p = @mkdir_p@
+nmbinary = @nmbinary@
+nmconfdir = @nmconfdir@
+nmdatadir = @nmdatadir@
+nmrundir = @nmrundir@
+nmstatedir = @nmstatedir@
 oldincludedir = @oldincludedir@
 pdfdir = @pdfdir@
 prefix = @prefix@
@@ -358,11 +365,16 @@ target_alias = @target_alias@
 top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
+with_dhclient = @with_dhclient@
+with_dhcpcd = @with_dhcpcd@
+with_netconfig = @with_netconfig@
+with_resolvconf = @with_resolvconf@
 SUBDIRS = \
 	shell \
 	python \
 	ruby \
-	C
+	C \
+	dispatcher
 
 all: all-recursive
 
diff --git a/examples/dispatcher/70-wifi-wired-exclusive.sh b/examples/dispatcher/70-wifi-wired-exclusive.sh
new file mode 100755
index 00000000..501f159e
--- /dev/null
+++ b/examples/dispatcher/70-wifi-wired-exclusive.sh
@@ -0,0 +1,26 @@
+#!/bin/bash
+export LC_ALL=C
+
+# This dispatcher script makes WiFi mutually exclusive with
+# wired networking.  When a wired interface is connected,
+# WiFi will be set to airplane mode (rfkilled).  When the wired
+# interface is disconnected, WiFi will be turned back on.
+
+enable_disable_wifi ()
+{
+	result=$(nmcli dev | grep "802-3-ethernet" | grep -w "connected")
+	if [ -n "$result" ]; then
+		nmcli nm wifi off
+	else
+		nmcli nm wifi on
+	fi
+}
+
+if [ "$2" = "up" ]; then
+	enable_disable_wifi
+fi
+
+if [ "$2" = "down" ]; then
+	enable_disable_wifi
+fi
+
diff --git a/examples/dispatcher/Makefile.am b/examples/dispatcher/Makefile.am
new file mode 100644
index 00000000..0db71a0d
--- /dev/null
+++ b/examples/dispatcher/Makefile.am
@@ -0,0 +1,3 @@
+EXTRA_DIST = \
+	70-wifi-wired-exclusive.sh
+
diff --git a/examples/dispatcher/Makefile.in b/examples/dispatcher/Makefile.in
new file mode 100644
index 00000000..362410e9
--- /dev/null
+++ b/examples/dispatcher/Makefile.in
@@ -0,0 +1,527 @@
+# Makefile.in generated by automake 1.11.6 from Makefile.am.
+# @configure_input@
+
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
+# Foundation, Inc.
+# This Makefile.in is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+@SET_MAKE@
+VPATH = @srcdir@
+am__make_dryrun = \
+  { \
+    am__dry=no; \
+    case $$MAKEFLAGS in \
+      *\\[\ \	]*) \
+        echo 'am--echo: ; @echo "AM"  OK' | $(MAKE) -f - 2>/dev/null \
+          | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
+      *) \
+        for am__flg in $$MAKEFLAGS; do \
+          case $$am__flg in \
+            *=*|--*) ;; \
+            *n*) am__dry=yes; break;; \
+          esac; \
+        done;; \
+    esac; \
+    test $$am__dry = yes; \
+  }
+pkgdatadir = $(datadir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+build_triplet = @build@
+host_triplet = @host@
+subdir = examples/dispatcher
+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/m4/compiler_warnings.m4 \
+	$(top_srcdir)/m4/gettext.m4 \
+	$(top_srcdir)/m4/gnome-code-coverage.m4 \
+	$(top_srcdir)/m4/gtk-doc.m4 $(top_srcdir)/m4/iconv.m4 \
+	$(top_srcdir)/m4/intlmacosx.m4 $(top_srcdir)/m4/intltool.m4 \
+	$(top_srcdir)/m4/introspection.m4 $(top_srcdir)/m4/lib-ld.m4 \
+	$(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \
+	$(top_srcdir)/m4/libnl-check.m4 $(top_srcdir)/m4/libtool.m4 \
+	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
+	$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
+	$(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/po.m4 \
+	$(top_srcdir)/m4/progtest.m4 $(top_srcdir)/m4/vapigen.m4 \
+	$(top_srcdir)/configure.ac
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+	$(ACLOCAL_M4)
+mkinstalldirs = $(install_sh) -d
+CONFIG_HEADER = $(top_builddir)/config.h
+CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
+AM_V_GEN = $(am__v_GEN_@AM_V@)
+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
+am__v_GEN_0 = @echo "  GEN   " $@;
+AM_V_at = $(am__v_at_@AM_V@)
+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
+am__v_at_0 = @
+SOURCES =
+DIST_SOURCES =
+am__can_run_installinfo = \
+  case $$AM_UPDATE_INFO_DIR in \
+    n|no|NO) false;; \
+    *) (install-info --version) >/dev/null 2>&1;; \
+  esac
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ACLOCAL = @ACLOCAL@
+ALL_LINGUAS = @ALL_LINGUAS@
+AMTAR = @AMTAR@
+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
+AR = @AR@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
+AWK = @AWK@
+CC = @CC@
+CCDEPMODE = @CCDEPMODE@
+CFLAGS = @CFLAGS@
+CKDB_PATH = @CKDB_PATH@
+CODE_COVERAGE_CFLAGS = @CODE_COVERAGE_CFLAGS@
+CODE_COVERAGE_ENABLED = @CODE_COVERAGE_ENABLED@
+CODE_COVERAGE_LDFLAGS = @CODE_COVERAGE_LDFLAGS@
+CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
+CXX = @CXX@
+CXXCPP = @CXXCPP@
+CXXDEPMODE = @CXXDEPMODE@
+CXXFLAGS = @CXXFLAGS@
+CYGPATH_W = @CYGPATH_W@
+DATADIRNAME = @DATADIRNAME@
+DBUS_CFLAGS = @DBUS_CFLAGS@
+DBUS_LIBS = @DBUS_LIBS@
+DBUS_SYS_DIR = @DBUS_SYS_DIR@
+DEFS = @DEFS@
+DEPDIR = @DEPDIR@
+DHCLIENT_PATH = @DHCLIENT_PATH@
+DHCPCD_PATH = @DHCPCD_PATH@
+DLLTOOL = @DLLTOOL@
+DSYMUTIL = @DSYMUTIL@
+DUMPBIN = @DUMPBIN@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EGREP = @EGREP@
+EXEEXT = @EXEEXT@
+FGREP = @FGREP@
+GENHTML = @GENHTML@
+GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
+GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
+GLIB_CFLAGS = @GLIB_CFLAGS@
+GLIB_GENMARSHAL = @GLIB_GENMARSHAL@
+GLIB_LIBS = @GLIB_LIBS@
+GLIB_MAKEFILE = @GLIB_MAKEFILE@
+GLIB_MKENUMS = @GLIB_MKENUMS@
+GMSGFMT = @GMSGFMT@
+GMSGFMT_015 = @GMSGFMT_015@
+GNUTLS_CFLAGS = @GNUTLS_CFLAGS@
+GNUTLS_LIBS = @GNUTLS_LIBS@
+GREP = @GREP@
+GTKDOC_CHECK = @GTKDOC_CHECK@
+GTKDOC_DEPS_CFLAGS = @GTKDOC_DEPS_CFLAGS@
+GTKDOC_DEPS_LIBS = @GTKDOC_DEPS_LIBS@
+GTKDOC_MKPDF = @GTKDOC_MKPDF@
+GTKDOC_REBASE = @GTKDOC_REBASE@
+GUDEV_CFLAGS = @GUDEV_CFLAGS@
+GUDEV_LIBS = @GUDEV_LIBS@
+HTML_DIR = @HTML_DIR@
+INSTALL = @INSTALL@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+INTLLIBS = @INTLLIBS@
+INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
+INTLTOOL_MERGE = @INTLTOOL_MERGE@
+INTLTOOL_PERL = @INTLTOOL_PERL@
+INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
+INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@
+INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@
+INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@
+INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@
+INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
+INTROSPECTION_CFLAGS = @INTROSPECTION_CFLAGS@
+INTROSPECTION_COMPILER = @INTROSPECTION_COMPILER@
+INTROSPECTION_GENERATE = @INTROSPECTION_GENERATE@
+INTROSPECTION_GIRDIR = @INTROSPECTION_GIRDIR@
+INTROSPECTION_LIBS = @INTROSPECTION_LIBS@
+INTROSPECTION_MAKEFILE = @INTROSPECTION_MAKEFILE@
+INTROSPECTION_SCANNER = @INTROSPECTION_SCANNER@
+INTROSPECTION_TYPELIBDIR = @INTROSPECTION_TYPELIBDIR@
+IPTABLES_PATH = @IPTABLES_PATH@
+IWMX_SDK_CFLAGS = @IWMX_SDK_CFLAGS@
+IWMX_SDK_LIBS = @IWMX_SDK_LIBS@
+KERNEL_FIRMWARE_DIR = @KERNEL_FIRMWARE_DIR@
+LCOV = @LCOV@
+LD = @LD@
+LDFLAGS = @LDFLAGS@
+LIBDL = @LIBDL@
+LIBGCRYPT_CFLAGS = @LIBGCRYPT_CFLAGS@
+LIBGCRYPT_CONFIG = @LIBGCRYPT_CONFIG@
+LIBGCRYPT_LIBS = @LIBGCRYPT_LIBS@
+LIBICONV = @LIBICONV@
+LIBINTL = @LIBINTL@
+LIBM = @LIBM@
+LIBNL1_CFLAGS = @LIBNL1_CFLAGS@
+LIBNL1_LIBS = @LIBNL1_LIBS@
+LIBNL2_CFLAGS = @LIBNL2_CFLAGS@
+LIBNL2_LIBS = @LIBNL2_LIBS@
+LIBNL3_CFLAGS = @LIBNL3_CFLAGS@
+LIBNL3_LIBS = @LIBNL3_LIBS@
+LIBNL_CFLAGS = @LIBNL_CFLAGS@
+LIBNL_LIBS = @LIBNL_LIBS@
+LIBOBJS = @LIBOBJS@
+LIBS = @LIBS@
+LIBSOUP_CFLAGS = @LIBSOUP_CFLAGS@
+LIBSOUP_LIBS = @LIBSOUP_LIBS@
+LIBTOOL = @LIBTOOL@
+LIPO = @LIPO@
+LN_S = @LN_S@
+LTLIBICONV = @LTLIBICONV@
+LTLIBINTL = @LTLIBINTL@
+LTLIBOBJS = @LTLIBOBJS@
+MAINT = @MAINT@
+MAKEINFO = @MAKEINFO@
+MANIFEST_TOOL = @MANIFEST_TOOL@
+MKDIR_P = @MKDIR_P@
+MM_GLIB_CFLAGS = @MM_GLIB_CFLAGS@
+MM_GLIB_LIBS = @MM_GLIB_LIBS@
+MOC = @MOC@
+MSGFMT = @MSGFMT@
+MSGFMT_015 = @MSGFMT_015@
+MSGMERGE = @MSGMERGE@
+NM = @NM@
+NMEDIT = @NMEDIT@
+NM_MAJOR_VERSION = @NM_MAJOR_VERSION@
+NM_MICRO_VERSION = @NM_MICRO_VERSION@
+NM_MINOR_VERSION = @NM_MINOR_VERSION@
+NM_MODIFY_SYSTEM_POLICY = @NM_MODIFY_SYSTEM_POLICY@
+NM_VERSION = @NM_VERSION@
+NSS_CFLAGS = @NSS_CFLAGS@
+NSS_LIBS = @NSS_LIBS@
+OBJDUMP = @OBJDUMP@
+OBJEXT = @OBJEXT@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
+PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PATH_SEPARATOR = @PATH_SEPARATOR@
+PKGCONFIG_PATH = @PKGCONFIG_PATH@
+PKG_CONFIG = @PKG_CONFIG@
+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
+POLKIT_CFLAGS = @POLKIT_CFLAGS@
+POLKIT_LIBS = @POLKIT_LIBS@
+POSUB = @POSUB@
+PPPD_PLUGIN_DIR = @PPPD_PLUGIN_DIR@
+QT_CFLAGS = @QT_CFLAGS@
+QT_LIBS = @QT_LIBS@
+RANLIB = @RANLIB@
+SED = @SED@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
+STRIP = @STRIP@
+SYSTEMD_INHIBIT_CFLAGS = @SYSTEMD_INHIBIT_CFLAGS@
+SYSTEMD_INHIBIT_LIBS = @SYSTEMD_INHIBIT_LIBS@
+SYSTEMD_LOGIN_CFLAGS = @SYSTEMD_LOGIN_CFLAGS@
+SYSTEMD_LOGIN_LIBS = @SYSTEMD_LOGIN_LIBS@
+SYSTEM_CA_PATH = @SYSTEM_CA_PATH@
+UDEV_BASE_DIR = @UDEV_BASE_DIR@
+USE_NLS = @USE_NLS@
+UUID_CFLAGS = @UUID_CFLAGS@
+UUID_LIBS = @UUID_LIBS@
+VAPIGEN = @VAPIGEN@
+VAPIGEN_MAKEFILE = @VAPIGEN_MAKEFILE@
+VAPIGEN_VAPIDIR = @VAPIGEN_VAPIDIR@
+VERSION = @VERSION@
+XGETTEXT = @XGETTEXT@
+XGETTEXT_015 = @XGETTEXT_015@
+XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
+ac_ct_AR = @ac_ct_AR@
+ac_ct_CC = @ac_ct_CC@
+ac_ct_CXX = @ac_ct_CXX@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
+am__include = @am__include@
+am__leading_dot = @am__leading_dot@
+am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
+bindir = @bindir@
+build = @build@
+build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
+builddir = @builddir@
+datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
+exec_prefix = @exec_prefix@
+host = @host@
+host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
+htmldir = @htmldir@
+includedir = @includedir@
+infodir = @infodir@
+install_sh = @install_sh@
+intltool__v_merge_options_ = @intltool__v_merge_options_@
+intltool__v_merge_options_0 = @intltool__v_merge_options_0@
+libdir = @libdir@
+libexecdir = @libexecdir@
+localedir = @localedir@
+localstatedir = @localstatedir@
+mandir = @mandir@
+mkdir_p = @mkdir_p@
+nmbinary = @nmbinary@
+nmconfdir = @nmconfdir@
+nmdatadir = @nmdatadir@
+nmrundir = @nmrundir@
+nmstatedir = @nmstatedir@
+oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+psdir = @psdir@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
+sysconfdir = @sysconfdir@
+systemdsystemunitdir = @systemdsystemunitdir@
+target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
+with_dhclient = @with_dhclient@
+with_dhcpcd = @with_dhcpcd@
+with_netconfig = @with_netconfig@
+with_resolvconf = @with_resolvconf@
+EXTRA_DIST = \
+	70-wifi-wired-exclusive.sh
+
+all: all-am
+
+.SUFFIXES:
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
+	@for dep in $?; do \
+	  case '$(am__configure_deps)' in \
+	    *$$dep*) \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
+	      exit 1;; \
+	  esac; \
+	done; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu examples/dispatcher/Makefile'; \
+	$(am__cd) $(top_srcdir) && \
+	  $(AUTOMAKE) --gnu examples/dispatcher/Makefile
+.PRECIOUS: Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+	@case '$?' in \
+	  *config.status*) \
+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+	  *) \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+	esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
+
+mostlyclean-libtool:
+	-rm -f *.lo
+
+clean-libtool:
+	-rm -rf .libs _libs
+tags: TAGS
+TAGS:
+
+ctags: CTAGS
+CTAGS:
+
+
+distdir: $(DISTFILES)
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
+	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+	    if test -d "$(distdir)/$$file"; then \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
+	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
+	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
+	  else \
+	    test -f "$(distdir)/$$file" \
+	    || cp -p $$d/$$file "$(distdir)/$$file" \
+	    || exit 1; \
+	  fi; \
+	done
+check-am: all-am
+check: check-am
+all-am: Makefile
+installdirs:
+install: install-am
+install-exec: install-exec-am
+install-data: install-data-am
+uninstall: uninstall-am
+
+install-am: all-am
+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-am
+install-strip:
+	if test -z '$(STRIP)'; then \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	      install; \
+	else \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+	fi
+mostlyclean-generic:
+
+clean-generic:
+
+distclean-generic:
+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
+
+maintainer-clean-generic:
+	@echo "This command is intended for maintainers to use"
+	@echo "it deletes files that may require special tools to rebuild."
+clean: clean-am
+
+clean-am: clean-generic clean-libtool mostlyclean-am
+
+distclean: distclean-am
+	-rm -f Makefile
+distclean-am: clean-am distclean-generic
+
+dvi: dvi-am
+
+dvi-am:
+
+html: html-am
+
+html-am:
+
+info: info-am
+
+info-am:
+
+install-data-am:
+
+install-dvi: install-dvi-am
+
+install-dvi-am:
+
+install-exec-am:
+
+install-html: install-html-am
+
+install-html-am:
+
+install-info: install-info-am
+
+install-info-am:
+
+install-man:
+
+install-pdf: install-pdf-am
+
+install-pdf-am:
+
+install-ps: install-ps-am
+
+install-ps-am:
+
+installcheck-am:
+
+maintainer-clean: maintainer-clean-am
+	-rm -f Makefile
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-am
+
+mostlyclean-am: mostlyclean-generic mostlyclean-libtool
+
+pdf: pdf-am
+
+pdf-am:
+
+ps: ps-am
+
+ps-am:
+
+uninstall-am:
+
+.MAKE: install-am install-strip
+
+.PHONY: all all-am check check-am clean clean-generic clean-libtool \
+	distclean distclean-generic distclean-libtool distdir dvi \
+	dvi-am html html-am info info-am install install-am \
+	install-data install-data-am install-dvi install-dvi-am \
+	install-exec install-exec-am install-html install-html-am \
+	install-info install-info-am install-man install-pdf \
+	install-pdf-am install-ps install-ps-am install-strip \
+	installcheck installcheck-am installdirs maintainer-clean \
+	maintainer-clean-generic mostlyclean mostlyclean-generic \
+	mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am
+
+
+# Tell versions [3.59,3.63) of GNU make to not export all variables.
+# Otherwise a system limit (for SysV at least) may be exceeded.
+.NOEXPORT:
diff --git a/examples/python/Makefile.am b/examples/python/Makefile.am
index 2706c0f4..4c0f9c74 100644
--- a/examples/python/Makefile.am
+++ b/examples/python/Makefile.am
@@ -1,12 +1,13 @@
 EXTRA_DIST = \
 	nm-state.py \
-	add-system-connection.py \
+	add-connection.py \
 	add-system-wifi-connection.py
 	vpn.py \
+	update-secrets.py \
 	list-connections.py \
 	show-bssids.py \
 	disconnect-device.py \
-	get-active-connections.py \
+	get-active-connection-uuids.py \
 	list-devices.py \
 	goi-list-connections.py \
 	goi-device-state-ip4config.py
diff --git a/examples/python/Makefile.in b/examples/python/Makefile.in
index 9ce36bf8..0df7878f 100644
--- a/examples/python/Makefile.in
+++ b/examples/python/Makefile.in
@@ -54,16 +54,18 @@ subdir = examples/python
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/compiler_warnings.m4 \
-	$(top_srcdir)/m4/gettext.m4 $(top_srcdir)/m4/gtk-doc.m4 \
-	$(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/intlmacosx.m4 \
-	$(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/introspection.m4 \
-	$(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \
-	$(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/libnl-check.m4 \
-	$(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \
-	$(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
-	$(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/nls.m4 \
-	$(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/progtest.m4 \
-	$(top_srcdir)/m4/vapigen.m4 $(top_srcdir)/configure.ac
+	$(top_srcdir)/m4/gettext.m4 \
+	$(top_srcdir)/m4/gnome-code-coverage.m4 \
+	$(top_srcdir)/m4/gtk-doc.m4 $(top_srcdir)/m4/iconv.m4 \
+	$(top_srcdir)/m4/intlmacosx.m4 $(top_srcdir)/m4/intltool.m4 \
+	$(top_srcdir)/m4/introspection.m4 $(top_srcdir)/m4/lib-ld.m4 \
+	$(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \
+	$(top_srcdir)/m4/libnl-check.m4 $(top_srcdir)/m4/libtool.m4 \
+	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
+	$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
+	$(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/po.m4 \
+	$(top_srcdir)/m4/progtest.m4 $(top_srcdir)/m4/vapigen.m4 \
+	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(install_sh) -d
@@ -96,6 +98,10 @@ AWK = @AWK@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
+CKDB_PATH = @CKDB_PATH@
+CODE_COVERAGE_CFLAGS = @CODE_COVERAGE_CFLAGS@
+CODE_COVERAGE_ENABLED = @CODE_COVERAGE_ENABLED@
+CODE_COVERAGE_LDFLAGS = @CODE_COVERAGE_LDFLAGS@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CXX = @CXX@
@@ -110,9 +116,7 @@ DBUS_SYS_DIR = @DBUS_SYS_DIR@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
 DHCLIENT_PATH = @DHCLIENT_PATH@
-DHCLIENT_VERSION = @DHCLIENT_VERSION@
 DHCPCD_PATH = @DHCPCD_PATH@
-DISABLE_DEPRECATED = @DISABLE_DEPRECATED@
 DLLTOOL = @DLLTOOL@
 DSYMUTIL = @DSYMUTIL@
 DUMPBIN = @DUMPBIN@
@@ -122,17 +126,14 @@ ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
 FGREP = @FGREP@
+GENHTML = @GENHTML@
 GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
 GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
-GIO_CFLAGS = @GIO_CFLAGS@
-GIO_LIBS = @GIO_LIBS@
 GLIB_CFLAGS = @GLIB_CFLAGS@
 GLIB_GENMARSHAL = @GLIB_GENMARSHAL@
 GLIB_LIBS = @GLIB_LIBS@
 GLIB_MAKEFILE = @GLIB_MAKEFILE@
 GLIB_MKENUMS = @GLIB_MKENUMS@
-GMODULE_CFLAGS = @GMODULE_CFLAGS@
-GMODULE_LIBS = @GMODULE_LIBS@
 GMSGFMT = @GMSGFMT@
 GMSGFMT_015 = @GMSGFMT_015@
 GNUTLS_CFLAGS = @GNUTLS_CFLAGS@
@@ -173,6 +174,7 @@ IPTABLES_PATH = @IPTABLES_PATH@
 IWMX_SDK_CFLAGS = @IWMX_SDK_CFLAGS@
 IWMX_SDK_LIBS = @IWMX_SDK_LIBS@
 KERNEL_FIRMWARE_DIR = @KERNEL_FIRMWARE_DIR@
+LCOV = @LCOV@
 LD = @LD@
 LDFLAGS = @LDFLAGS@
 LIBDL = @LIBDL@
@@ -189,11 +191,7 @@ LIBNL2_LIBS = @LIBNL2_LIBS@
 LIBNL3_CFLAGS = @LIBNL3_CFLAGS@
 LIBNL3_LIBS = @LIBNL3_LIBS@
 LIBNL_CFLAGS = @LIBNL_CFLAGS@
-LIBNL_GENL3_CFLAGS = @LIBNL_GENL3_CFLAGS@
-LIBNL_GENL3_LIBS = @LIBNL_GENL3_LIBS@
 LIBNL_LIBS = @LIBNL_LIBS@
-LIBNL_ROUTE3_CFLAGS = @LIBNL_ROUTE3_CFLAGS@
-LIBNL_ROUTE3_LIBS = @LIBNL_ROUTE3_LIBS@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
 LIBSOUP_CFLAGS = @LIBSOUP_CFLAGS@
@@ -208,6 +206,8 @@ MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MANIFEST_TOOL = @MANIFEST_TOOL@
 MKDIR_P = @MKDIR_P@
+MM_GLIB_CFLAGS = @MM_GLIB_CFLAGS@
+MM_GLIB_LIBS = @MM_GLIB_LIBS@
 MOC = @MOC@
 MSGFMT = @MSGFMT@
 MSGFMT_015 = @MSGFMT_015@
@@ -217,6 +217,7 @@ NMEDIT = @NMEDIT@
 NM_MAJOR_VERSION = @NM_MAJOR_VERSION@
 NM_MICRO_VERSION = @NM_MICRO_VERSION@
 NM_MINOR_VERSION = @NM_MINOR_VERSION@
+NM_MODIFY_SYSTEM_POLICY = @NM_MODIFY_SYSTEM_POLICY@
 NM_VERSION = @NM_VERSION@
 NSS_CFLAGS = @NSS_CFLAGS@
 NSS_LIBS = @NSS_LIBS@
@@ -243,13 +244,14 @@ PPPD_PLUGIN_DIR = @PPPD_PLUGIN_DIR@
 QT_CFLAGS = @QT_CFLAGS@
 QT_LIBS = @QT_LIBS@
 RANLIB = @RANLIB@
-RESOLVCONF_PATH = @RESOLVCONF_PATH@
 SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
-SYSTEMD_CFLAGS = @SYSTEMD_CFLAGS@
-SYSTEMD_LIBS = @SYSTEMD_LIBS@
+SYSTEMD_INHIBIT_CFLAGS = @SYSTEMD_INHIBIT_CFLAGS@
+SYSTEMD_INHIBIT_LIBS = @SYSTEMD_INHIBIT_LIBS@
+SYSTEMD_LOGIN_CFLAGS = @SYSTEMD_LOGIN_CFLAGS@
+SYSTEMD_LOGIN_LIBS = @SYSTEMD_LOGIN_LIBS@
 SYSTEM_CA_PATH = @SYSTEM_CA_PATH@
 UDEV_BASE_DIR = @UDEV_BASE_DIR@
 USE_NLS = @USE_NLS@
@@ -304,6 +306,11 @@ localedir = @localedir@
 localstatedir = @localstatedir@
 mandir = @mandir@
 mkdir_p = @mkdir_p@
+nmbinary = @nmbinary@
+nmconfdir = @nmconfdir@
+nmdatadir = @nmdatadir@
+nmrundir = @nmrundir@
+nmstatedir = @nmstatedir@
 oldincludedir = @oldincludedir@
 pdfdir = @pdfdir@
 prefix = @prefix@
@@ -318,9 +325,13 @@ target_alias = @target_alias@
 top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
+with_dhclient = @with_dhclient@
+with_dhcpcd = @with_dhcpcd@
+with_netconfig = @with_netconfig@
+with_resolvconf = @with_resolvconf@
 EXTRA_DIST = \
 	nm-state.py \
-	add-system-connection.py \
+	add-connection.py \
 	add-system-wifi-connection.py
 
 all: all-am
@@ -513,10 +524,11 @@ uninstall-am:
 	mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am
 
 	vpn.py \
+	update-secrets.py \
 	list-connections.py \
 	show-bssids.py \
 	disconnect-device.py \
-	get-active-connections.py \
+	get-active-connection-uuids.py \
 	list-devices.py \
 	goi-list-connections.py \
 	goi-device-state-ip4config.py
diff --git a/examples/python/add-connection.py b/examples/python/add-connection.py
new file mode 100755
index 00000000..24b3f600
--- /dev/null
+++ b/examples/python/add-connection.py
@@ -0,0 +1,63 @@
+#!/usr/bin/env python
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License along
+# with this program; if not, write to the Free Software Foundation, Inc.,
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+#
+# Copyright (C) 2010 - 2012 Red Hat, Inc.
+#
+
+#
+# This example adds a new ethernet connection via AddConnection() D-Bus call.
+#
+# Configuration settings are described at
+# http://projects.gnome.org/NetworkManager/developers/api/09/ref-settings.html
+#
+
+import socket, struct, dbus, uuid
+
+# Helper functions
+def ip_to_int(ip_string):
+    return struct.unpack("=I", socket.inet_aton(ip_string))[0]
+
+def int_to_ip(ip_int):
+    return socket.inet_ntoa(struct.pack("=I", ip_int))
+
+s_wired = dbus.Dictionary({'duplex': 'full'})
+s_con = dbus.Dictionary({
+            'type': '802-3-ethernet',
+            'uuid': str(uuid.uuid4()),
+            'id': 'MyConnectionExample'})
+
+addr1 = dbus.Array([ip_to_int("10.1.2.3"), dbus.UInt32(8L), ip_to_int("10.1.2.1")], signature=dbus.Signature('u'))
+s_ip4 = dbus.Dictionary({
+            'addresses': dbus.Array([addr1], signature=dbus.Signature('au')),
+            'method': 'manual'})
+
+s_ip6 = dbus.Dictionary({'method': 'ignore'})
+
+con = dbus.Dictionary({
+    '802-3-ethernet': s_wired,
+    'connection': s_con,
+    'ipv4': s_ip4,
+    'ipv6': s_ip6})
+
+
+print "Creating connection:", s_con['id'], "-", s_con['uuid']
+
+bus = dbus.SystemBus()
+proxy = bus.get_object("org.freedesktop.NetworkManager", "/org/freedesktop/NetworkManager/Settings")
+settings = dbus.Interface(proxy, "org.freedesktop.NetworkManager.Settings")
+
+settings.AddConnection(con)
+
diff --git a/examples/python/add-system-connection.py b/examples/python/add-system-connection.py
deleted file mode 100755
index f55d0df0..00000000
--- a/examples/python/add-system-connection.py
+++ /dev/null
@@ -1,48 +0,0 @@
-#!/usr/bin/env python
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License along
-# with this program; if not, write to the Free Software Foundation, Inc.,
-# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Copyright (C) 2010 Red Hat, Inc.
-#
-
-import dbus
-
-s_wired = dbus.Dictionary({'duplex': 'full'})
-s_con = dbus.Dictionary({
-            'type': '802-3-ethernet',
-            'uuid': '7371bb78-c1f7-42a3-a9db-5b9566e8ca07',
-            'id': 'MyConnection'})
-
-addr1 = dbus.Array([dbus.UInt32(50462986L), dbus.UInt32(8L), dbus.UInt32(16908554L)], signature=dbus.Signature('u'))
-s_ip4 = dbus.Dictionary({
-            'addresses': dbus.Array([addr1], signature=dbus.Signature('au')),
-            'method': 'manual'})
-
-s_ip6 = dbus.Dictionary({'method': 'ignore'})
-
-con = dbus.Dictionary({
-    '802-3-ethernet': s_wired,
-    'connection': s_con,
-    'ipv4': s_ip4,
-    'ipv6': s_ip6})
-
-
-bus = dbus.SystemBus()
-
-proxy = bus.get_object("org.freedesktop.NetworkManager", "/org/freedesktop/NetworkManager/Settings")
-settings = dbus.Interface(proxy, "org.freedesktop.NetworkManager.Settings")
-
-settings.AddConnection(con)
-
diff --git a/examples/python/nm-state.py b/examples/python/nm-state.py
index a79b3405..94fa6309 100644
--- a/examples/python/nm-state.py
+++ b/examples/python/nm-state.py
@@ -14,11 +14,26 @@
 # with this program; if not, write to the Free Software Foundation, Inc.,
 # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 #
-# Copyright (C) 2010 Red Hat, Inc.
+# Copyright (C) 2010 - 2012 Red Hat, Inc.
 #
 
 import dbus
 
+# Device states from include/NetworkManager.h
+device_states = { 0: "Unknown",
+                 10: "Unmanaged",
+                 20: "Unavailable",
+                 30: "Disconnected",
+                 40: "Prepare",
+                 50: "Config",
+                 60: "Need Auth",
+                 70: "IP Config",
+                 80: "IP Check",
+                 90: "Secondaries",
+                 100: "Activated",
+                 110: "Deactivating",
+                 120: "Failed" }
+
 bus = dbus.SystemBus()
 
 proxy = bus.get_object("org.freedesktop.NetworkManager", "/org/freedesktop/NetworkManager")
@@ -35,10 +50,10 @@ for d in devices:
     name = prop_iface.Get("org.freedesktop.NetworkManager.Device", "Interface")
 
     # and print them out
-    if state == 8:   # activated
+    if state == 100 :   # activated
         print "Device %s is activated" % name
     else:
-        print "Device %s is not activated" % name
+        print "Device %s is not activated (state=%s)" % (name, device_states[state])
 
 
 # Get active connection state
diff --git a/examples/ruby/Makefile.in b/examples/ruby/Makefile.in
index 419af959..87fe2b3a 100644
--- a/examples/ruby/Makefile.in
+++ b/examples/ruby/Makefile.in
@@ -54,16 +54,18 @@ subdir = examples/ruby
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/compiler_warnings.m4 \
-	$(top_srcdir)/m4/gettext.m4 $(top_srcdir)/m4/gtk-doc.m4 \
-	$(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/intlmacosx.m4 \
-	$(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/introspection.m4 \
-	$(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \
-	$(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/libnl-check.m4 \
-	$(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \
-	$(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
-	$(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/nls.m4 \
-	$(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/progtest.m4 \
-	$(top_srcdir)/m4/vapigen.m4 $(top_srcdir)/configure.ac
+	$(top_srcdir)/m4/gettext.m4 \
+	$(top_srcdir)/m4/gnome-code-coverage.m4 \
+	$(top_srcdir)/m4/gtk-doc.m4 $(top_srcdir)/m4/iconv.m4 \
+	$(top_srcdir)/m4/intlmacosx.m4 $(top_srcdir)/m4/intltool.m4 \
+	$(top_srcdir)/m4/introspection.m4 $(top_srcdir)/m4/lib-ld.m4 \
+	$(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \
+	$(top_srcdir)/m4/libnl-check.m4 $(top_srcdir)/m4/libtool.m4 \
+	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
+	$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
+	$(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/po.m4 \
+	$(top_srcdir)/m4/progtest.m4 $(top_srcdir)/m4/vapigen.m4 \
+	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(install_sh) -d
@@ -96,6 +98,10 @@ AWK = @AWK@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
+CKDB_PATH = @CKDB_PATH@
+CODE_COVERAGE_CFLAGS = @CODE_COVERAGE_CFLAGS@
+CODE_COVERAGE_ENABLED = @CODE_COVERAGE_ENABLED@
+CODE_COVERAGE_LDFLAGS = @CODE_COVERAGE_LDFLAGS@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CXX = @CXX@
@@ -110,9 +116,7 @@ DBUS_SYS_DIR = @DBUS_SYS_DIR@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
 DHCLIENT_PATH = @DHCLIENT_PATH@
-DHCLIENT_VERSION = @DHCLIENT_VERSION@
 DHCPCD_PATH = @DHCPCD_PATH@
-DISABLE_DEPRECATED = @DISABLE_DEPRECATED@
 DLLTOOL = @DLLTOOL@
 DSYMUTIL = @DSYMUTIL@
 DUMPBIN = @DUMPBIN@
@@ -122,17 +126,14 @@ ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
 FGREP = @FGREP@
+GENHTML = @GENHTML@
 GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
 GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
-GIO_CFLAGS = @GIO_CFLAGS@
-GIO_LIBS = @GIO_LIBS@
 GLIB_CFLAGS = @GLIB_CFLAGS@
 GLIB_GENMARSHAL = @GLIB_GENMARSHAL@
 GLIB_LIBS = @GLIB_LIBS@
 GLIB_MAKEFILE = @GLIB_MAKEFILE@
 GLIB_MKENUMS = @GLIB_MKENUMS@
-GMODULE_CFLAGS = @GMODULE_CFLAGS@
-GMODULE_LIBS = @GMODULE_LIBS@
 GMSGFMT = @GMSGFMT@
 GMSGFMT_015 = @GMSGFMT_015@
 GNUTLS_CFLAGS = @GNUTLS_CFLAGS@
@@ -173,6 +174,7 @@ IPTABLES_PATH = @IPTABLES_PATH@
 IWMX_SDK_CFLAGS = @IWMX_SDK_CFLAGS@
 IWMX_SDK_LIBS = @IWMX_SDK_LIBS@
 KERNEL_FIRMWARE_DIR = @KERNEL_FIRMWARE_DIR@
+LCOV = @LCOV@
 LD = @LD@
 LDFLAGS = @LDFLAGS@
 LIBDL = @LIBDL@
@@ -189,11 +191,7 @@ LIBNL2_LIBS = @LIBNL2_LIBS@
 LIBNL3_CFLAGS = @LIBNL3_CFLAGS@
 LIBNL3_LIBS = @LIBNL3_LIBS@
 LIBNL_CFLAGS = @LIBNL_CFLAGS@
-LIBNL_GENL3_CFLAGS = @LIBNL_GENL3_CFLAGS@
-LIBNL_GENL3_LIBS = @LIBNL_GENL3_LIBS@
 LIBNL_LIBS = @LIBNL_LIBS@
-LIBNL_ROUTE3_CFLAGS = @LIBNL_ROUTE3_CFLAGS@
-LIBNL_ROUTE3_LIBS = @LIBNL_ROUTE3_LIBS@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
 LIBSOUP_CFLAGS = @LIBSOUP_CFLAGS@
@@ -208,6 +206,8 @@ MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MANIFEST_TOOL = @MANIFEST_TOOL@
 MKDIR_P = @MKDIR_P@
+MM_GLIB_CFLAGS = @MM_GLIB_CFLAGS@
+MM_GLIB_LIBS = @MM_GLIB_LIBS@
 MOC = @MOC@
 MSGFMT = @MSGFMT@
 MSGFMT_015 = @MSGFMT_015@
@@ -217,6 +217,7 @@ NMEDIT = @NMEDIT@
 NM_MAJOR_VERSION = @NM_MAJOR_VERSION@
 NM_MICRO_VERSION = @NM_MICRO_VERSION@
 NM_MINOR_VERSION = @NM_MINOR_VERSION@
+NM_MODIFY_SYSTEM_POLICY = @NM_MODIFY_SYSTEM_POLICY@
 NM_VERSION = @NM_VERSION@
 NSS_CFLAGS = @NSS_CFLAGS@
 NSS_LIBS = @NSS_LIBS@
@@ -243,13 +244,14 @@ PPPD_PLUGIN_DIR = @PPPD_PLUGIN_DIR@
 QT_CFLAGS = @QT_CFLAGS@
 QT_LIBS = @QT_LIBS@
 RANLIB = @RANLIB@
-RESOLVCONF_PATH = @RESOLVCONF_PATH@
 SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
-SYSTEMD_CFLAGS = @SYSTEMD_CFLAGS@
-SYSTEMD_LIBS = @SYSTEMD_LIBS@
+SYSTEMD_INHIBIT_CFLAGS = @SYSTEMD_INHIBIT_CFLAGS@
+SYSTEMD_INHIBIT_LIBS = @SYSTEMD_INHIBIT_LIBS@
+SYSTEMD_LOGIN_CFLAGS = @SYSTEMD_LOGIN_CFLAGS@
+SYSTEMD_LOGIN_LIBS = @SYSTEMD_LOGIN_LIBS@
 SYSTEM_CA_PATH = @SYSTEM_CA_PATH@
 UDEV_BASE_DIR = @UDEV_BASE_DIR@
 USE_NLS = @USE_NLS@
@@ -304,6 +306,11 @@ localedir = @localedir@
 localstatedir = @localstatedir@
 mandir = @mandir@
 mkdir_p = @mkdir_p@
+nmbinary = @nmbinary@
+nmconfdir = @nmconfdir@
+nmdatadir = @nmdatadir@
+nmrundir = @nmrundir@
+nmstatedir = @nmstatedir@
 oldincludedir = @oldincludedir@
 pdfdir = @pdfdir@
 prefix = @prefix@
@@ -318,6 +325,10 @@ target_alias = @target_alias@
 top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
+with_dhclient = @with_dhclient@
+with_dhcpcd = @with_dhcpcd@
+with_netconfig = @with_netconfig@
+with_resolvconf = @with_resolvconf@
 EXTRA_DIST = \
 	add-connection.rb \
 	get-basic-nm-info.rb \
diff --git a/examples/ruby/list-devices.rb b/examples/ruby/list-devices.rb
index 5831a126..a3bf90f5 100755
--- a/examples/ruby/list-devices.rb
+++ b/examples/ruby/list-devices.rb
@@ -16,7 +16,7 @@
 # with this program; if not, write to the Free Software Foundation, Inc.,
 # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 #
-# Copyright (C) 2011 Red Hat, Inc.
+# Copyright (C) 2011 - 2012 Red Hat, Inc.
 #
 
 require 'dbus'
@@ -26,11 +26,15 @@ require 'dbus'
 #
 
 devtypes = { 1 => "Ethernet",
-             2 => "WiFi",
+             2 => "Wi-Fi",
              5 => "Bluetooth",
              6 => "OLPC",
              7 => "WiMAX",
-             8 => "Modem" }
+             8 => "Modem",
+             9 => "InfiniBand",
+             10 => "Bond",
+             11 => "VLAN",
+             12 => "ADSL" }
 
 states = { 0   => "Unknown",
            10  => "Unmanaged",
diff --git a/examples/shell/Makefile.am b/examples/shell/Makefile.am
index e4083d9a..e4b6f6c7 100644
--- a/examples/shell/Makefile.am
+++ b/examples/shell/Makefile.am
@@ -1,3 +1,6 @@
 EXTRA_DIST = \
 	nm-logging.sh \
-	get-hostname.sh
+	get-hostname.sh \
+	list-devices.sh \
+	disconnect-device.sh \
+	active-wifi.sh
diff --git a/examples/shell/Makefile.in b/examples/shell/Makefile.in
index 03a59ea6..2f566949 100644
--- a/examples/shell/Makefile.in
+++ b/examples/shell/Makefile.in
@@ -54,16 +54,18 @@ subdir = examples/shell
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/compiler_warnings.m4 \
-	$(top_srcdir)/m4/gettext.m4 $(top_srcdir)/m4/gtk-doc.m4 \
-	$(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/intlmacosx.m4 \
-	$(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/introspection.m4 \
-	$(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \
-	$(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/libnl-check.m4 \
-	$(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \
-	$(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
-	$(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/nls.m4 \
-	$(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/progtest.m4 \
-	$(top_srcdir)/m4/vapigen.m4 $(top_srcdir)/configure.ac
+	$(top_srcdir)/m4/gettext.m4 \
+	$(top_srcdir)/m4/gnome-code-coverage.m4 \
+	$(top_srcdir)/m4/gtk-doc.m4 $(top_srcdir)/m4/iconv.m4 \
+	$(top_srcdir)/m4/intlmacosx.m4 $(top_srcdir)/m4/intltool.m4 \
+	$(top_srcdir)/m4/introspection.m4 $(top_srcdir)/m4/lib-ld.m4 \
+	$(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \
+	$(top_srcdir)/m4/libnl-check.m4 $(top_srcdir)/m4/libtool.m4 \
+	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
+	$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
+	$(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/po.m4 \
+	$(top_srcdir)/m4/progtest.m4 $(top_srcdir)/m4/vapigen.m4 \
+	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(install_sh) -d
@@ -96,6 +98,10 @@ AWK = @AWK@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
+CKDB_PATH = @CKDB_PATH@
+CODE_COVERAGE_CFLAGS = @CODE_COVERAGE_CFLAGS@
+CODE_COVERAGE_ENABLED = @CODE_COVERAGE_ENABLED@
+CODE_COVERAGE_LDFLAGS = @CODE_COVERAGE_LDFLAGS@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CXX = @CXX@
@@ -110,9 +116,7 @@ DBUS_SYS_DIR = @DBUS_SYS_DIR@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
 DHCLIENT_PATH = @DHCLIENT_PATH@
-DHCLIENT_VERSION = @DHCLIENT_VERSION@
 DHCPCD_PATH = @DHCPCD_PATH@
-DISABLE_DEPRECATED = @DISABLE_DEPRECATED@
 DLLTOOL = @DLLTOOL@
 DSYMUTIL = @DSYMUTIL@
 DUMPBIN = @DUMPBIN@
@@ -122,17 +126,14 @@ ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
 FGREP = @FGREP@
+GENHTML = @GENHTML@
 GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
 GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
-GIO_CFLAGS = @GIO_CFLAGS@
-GIO_LIBS = @GIO_LIBS@
 GLIB_CFLAGS = @GLIB_CFLAGS@
 GLIB_GENMARSHAL = @GLIB_GENMARSHAL@
 GLIB_LIBS = @GLIB_LIBS@
 GLIB_MAKEFILE = @GLIB_MAKEFILE@
 GLIB_MKENUMS = @GLIB_MKENUMS@
-GMODULE_CFLAGS = @GMODULE_CFLAGS@
-GMODULE_LIBS = @GMODULE_LIBS@
 GMSGFMT = @GMSGFMT@
 GMSGFMT_015 = @GMSGFMT_015@
 GNUTLS_CFLAGS = @GNUTLS_CFLAGS@
@@ -173,6 +174,7 @@ IPTABLES_PATH = @IPTABLES_PATH@
 IWMX_SDK_CFLAGS = @IWMX_SDK_CFLAGS@
 IWMX_SDK_LIBS = @IWMX_SDK_LIBS@
 KERNEL_FIRMWARE_DIR = @KERNEL_FIRMWARE_DIR@
+LCOV = @LCOV@
 LD = @LD@
 LDFLAGS = @LDFLAGS@
 LIBDL = @LIBDL@
@@ -189,11 +191,7 @@ LIBNL2_LIBS = @LIBNL2_LIBS@
 LIBNL3_CFLAGS = @LIBNL3_CFLAGS@
 LIBNL3_LIBS = @LIBNL3_LIBS@
 LIBNL_CFLAGS = @LIBNL_CFLAGS@
-LIBNL_GENL3_CFLAGS = @LIBNL_GENL3_CFLAGS@
-LIBNL_GENL3_LIBS = @LIBNL_GENL3_LIBS@
 LIBNL_LIBS = @LIBNL_LIBS@
-LIBNL_ROUTE3_CFLAGS = @LIBNL_ROUTE3_CFLAGS@
-LIBNL_ROUTE3_LIBS = @LIBNL_ROUTE3_LIBS@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
 LIBSOUP_CFLAGS = @LIBSOUP_CFLAGS@
@@ -208,6 +206,8 @@ MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MANIFEST_TOOL = @MANIFEST_TOOL@
 MKDIR_P = @MKDIR_P@
+MM_GLIB_CFLAGS = @MM_GLIB_CFLAGS@
+MM_GLIB_LIBS = @MM_GLIB_LIBS@
 MOC = @MOC@
 MSGFMT = @MSGFMT@
 MSGFMT_015 = @MSGFMT_015@
@@ -217,6 +217,7 @@ NMEDIT = @NMEDIT@
 NM_MAJOR_VERSION = @NM_MAJOR_VERSION@
 NM_MICRO_VERSION = @NM_MICRO_VERSION@
 NM_MINOR_VERSION = @NM_MINOR_VERSION@
+NM_MODIFY_SYSTEM_POLICY = @NM_MODIFY_SYSTEM_POLICY@
 NM_VERSION = @NM_VERSION@
 NSS_CFLAGS = @NSS_CFLAGS@
 NSS_LIBS = @NSS_LIBS@
@@ -243,13 +244,14 @@ PPPD_PLUGIN_DIR = @PPPD_PLUGIN_DIR@
 QT_CFLAGS = @QT_CFLAGS@
 QT_LIBS = @QT_LIBS@
 RANLIB = @RANLIB@
-RESOLVCONF_PATH = @RESOLVCONF_PATH@
 SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
-SYSTEMD_CFLAGS = @SYSTEMD_CFLAGS@
-SYSTEMD_LIBS = @SYSTEMD_LIBS@
+SYSTEMD_INHIBIT_CFLAGS = @SYSTEMD_INHIBIT_CFLAGS@
+SYSTEMD_INHIBIT_LIBS = @SYSTEMD_INHIBIT_LIBS@
+SYSTEMD_LOGIN_CFLAGS = @SYSTEMD_LOGIN_CFLAGS@
+SYSTEMD_LOGIN_LIBS = @SYSTEMD_LOGIN_LIBS@
 SYSTEM_CA_PATH = @SYSTEM_CA_PATH@
 UDEV_BASE_DIR = @UDEV_BASE_DIR@
 USE_NLS = @USE_NLS@
@@ -304,6 +306,11 @@ localedir = @localedir@
 localstatedir = @localstatedir@
 mandir = @mandir@
 mkdir_p = @mkdir_p@
+nmbinary = @nmbinary@
+nmconfdir = @nmconfdir@
+nmdatadir = @nmdatadir@
+nmrundir = @nmrundir@
+nmstatedir = @nmstatedir@
 oldincludedir = @oldincludedir@
 pdfdir = @pdfdir@
 prefix = @prefix@
@@ -318,9 +325,16 @@ target_alias = @target_alias@
 top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
+with_dhclient = @with_dhclient@
+with_dhcpcd = @with_dhcpcd@
+with_netconfig = @with_netconfig@
+with_resolvconf = @with_resolvconf@
 EXTRA_DIST = \
 	nm-logging.sh \
-	get-hostname.sh
+	get-hostname.sh \
+	list-devices.sh \
+	disconnect-device.sh \
+	active-wifi.sh
 
 all: all-am
 
diff --git a/examples/shell/active-wifi.sh b/examples/shell/active-wifi.sh
new file mode 100755
index 00000000..1c9466b7
--- /dev/null
+++ b/examples/shell/active-wifi.sh
@@ -0,0 +1,88 @@
+#!/bin/sh
+# vim: ft=sh ts=2 sts=2 sw=2 et ai
+# -*- Mode: sh; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License along
+# with this program; if not, write to the Free Software Foundation, Inc.,
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+#
+# Copyright (C) 2012 Red Hat, Inc.
+#
+
+#
+# This example prints SSIDs of connected Wi-Fi networks.
+# GetDevices() D-Bus call returns all devices. We go through them, find Wi-Fi
+# ones and ask for ActiveAccessPoint property. If the access point path is not
+# empty ("/"), we can read its properties, like SSID.
+#
+
+NM_SERVICE_NAME="org.freedesktop.NetworkManager"
+NM_OBJECT_PATH="/org/freedesktop/NetworkManager"
+DEVICE_IFACE="org.freedesktop.NetworkManager.Device"
+DEVICE_WIFI_IFACE="org.freedesktop.NetworkManager.Device.Wireless"
+ACCESS_POINT_IFACE="org.freedesktop.NetworkManager.AccessPoint"
+NM_GET_DEVICES="org.freedesktop.NetworkManager.GetDevices"
+DBUS_PROPERTIES_GET="org.freedesktop.DBus.Properties.Get"
+
+
+get_devices()
+{
+  dbus-send --system --print-reply --dest=$NM_SERVICE_NAME $NM_OBJECT_PATH $NM_GET_DEVICES | \
+    grep "object path" | cut -d '"' -f2
+}
+
+get_property()
+{
+  # first arg:  object path
+  # second arg: interface
+  # third arg:  property name
+  # returns:    property value
+
+  dbus-send --system --print-reply --dest=$NM_SERVICE_NAME "$1" $DBUS_PROPERTIES_GET string:"$2" string:"$3" | \
+    grep "variant" | awk -F '"' '{ if (NF == 1) {FS=" "; n=split($0,a); print a[n];} else print $(NF-1); }'
+}
+
+is_wifi_device()
+{
+  DEV_TYPE=`get_property $device $DEVICE_IFACE "DeviceType"`
+
+  if [ $DEV_TYPE -eq 2 ]; then
+    return 0
+  else
+    return 1
+  fi
+}
+
+show_active_ssids()
+{
+  for device in `get_devices`
+  do
+    INTERFACE=`get_property $device $DEVICE_IFACE "Interface"`
+
+    if `is_wifi_device`; then
+      ACTIVE_AP=`get_property $device $DEVICE_WIFI_IFACE "ActiveAccessPoint"`
+      if [ "$ACTIVE_AP" != "/" ]; then
+        SSID=`get_property $ACTIVE_AP $ACCESS_POINT_IFACE "Ssid"`
+        BSSID=`get_property $ACTIVE_AP $ACCESS_POINT_IFACE "HwAddress"`
+        echo "Device '$INTERFACE' is connected to '$SSID' (BSSID=$BSSID)"
+      else
+        echo "No active AP on device '$INTERFACE'"
+      fi
+    fi
+  done
+}
+
+# --- main program ---
+# print currently connected SSID on all Wi-Fi devices
+show_active_ssids
+
diff --git a/examples/shell/disconnect-device.sh b/examples/shell/disconnect-device.sh
new file mode 100755
index 00000000..045d64d7
--- /dev/null
+++ b/examples/shell/disconnect-device.sh
@@ -0,0 +1,77 @@
+#!/bin/sh
+# vim: ft=sh ts=2 sts=2 sw=2 et ai
+# -*- Mode: sh; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License along
+# with this program; if not, write to the Free Software Foundation, Inc.,
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+#
+# Copyright (C) 2012 Red Hat, Inc.
+#
+
+# This example takes a device interface name as a parameter and tells
+# NetworkManager to disconnect that device (using Disconnect()), closing
+# down any network connection it may have
+
+NM_SERVICE_NAME="org.freedesktop.NetworkManager"
+NM_OBJECT_PATH="/org/freedesktop/NetworkManager"
+DEVICE_IFACE="org.freedesktop.NetworkManager.Device"
+DEVICE_DISCONNECT=${DEVICE_IFACE}".Disconnect"
+NM_GET_DEVICES="org.freedesktop.NetworkManager.GetDevices"
+DBUS_PROPERTIES_GET="org.freedesktop.DBus.Properties.Get"
+
+get_devices()
+{
+  dbus-send --system --print-reply --dest=$NM_SERVICE_NAME $NM_OBJECT_PATH $NM_GET_DEVICES | \
+    grep "object path" | cut -d '"' -f2
+}
+
+get_device_property()
+{
+  # first arg:  device object path
+  # second arg: property name
+  # returns:    property value
+
+  dbus-send --system --print-reply --dest=$NM_SERVICE_NAME "$1" $DBUS_PROPERTIES_GET string:$DEVICE_IFACE string:"$2" | \
+    grep "variant" | awk '{print $3}' | sed 's/"//g'
+}
+
+disconnect_device ()
+{
+  # first arg: device interface name
+
+  for device in `get_devices`
+  do
+    DEV_INTERFACE=`get_device_property "$device" "Interface"`
+
+    if [ "$DEV_INTERFACE" = "$1" ]; then
+      echo "Device with interface '$1' found -> disconnecting."
+      dbus-send --system --print-reply --dest=$NM_SERVICE_NAME $device $DEVICE_DISCONNECT
+      return 0
+    fi
+  done
+
+  echo "Device with interface '$1' not found."
+  return 1
+}
+
+
+# --- main program ---
+if [ ! -n "$1" ]; then
+  echo "Usage: `basename $0` "
+  exit 2
+fi 
+
+# disconnect device
+disconnect_device $1
+
diff --git a/examples/shell/list-devices.sh b/examples/shell/list-devices.sh
new file mode 100755
index 00000000..4cf9c599
--- /dev/null
+++ b/examples/shell/list-devices.sh
@@ -0,0 +1,105 @@
+#!/bin/sh
+# vim: ft=sh ts=2 sts=2 sw=2 et ai
+# -*- Mode: sh; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License along
+# with this program; if not, write to the Free Software Foundation, Inc.,
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+#
+# Copyright (C) 2011 - 2012 Red Hat, Inc.
+#
+
+#
+# This example lists basic information about network interfaces known to NM.
+# It finds the devices via GetDevices() D-Bus call and then gets properties of
+# each device.
+#
+
+NM_SERVICE_NAME="org.freedesktop.NetworkManager"
+NM_OBJECT_PATH="/org/freedesktop/NetworkManager"
+DEVICE_IFACE="org.freedesktop.NetworkManager.Device"
+NM_GET_DEVICES="org.freedesktop.NetworkManager.GetDevices"
+DBUS_PROPERTIES_GET="org.freedesktop.DBus.Properties.Get"
+
+devtype_to_name()
+{
+  case $1 in
+    1) echo "Ethernet" ;;
+    2) echo "Wi-Fi" ;;
+    5) echo "Bluetooth" ;;
+    6) echo "OLPC" ;;
+    7) echo "WiMAX" ;;
+    8) echo "Modem" ;;
+    9) echo "InfiniBand" ;;
+   10) echo "Bond" ;;
+   11) echo "VLAN" ;;
+   12) echo "ADSL" ;;
+    *) echo "Unknown" ;;
+  esac
+}
+
+state_to_name()
+{
+  case $1 in
+    10)  echo "Unmanaged" ;;
+    20)  echo "Unavailable" ;;
+    30)  echo "Disconnected" ;;
+    40)  echo "Prepare" ;;
+    50)  echo "Config" ;;
+    60)  echo "Need Auth" ;;
+    70)  echo "IP Config" ;;
+    80)  echo "IP Check" ;;
+    90)  echo "Secondaries" ;;
+    100) echo "Activated" ;;
+    110) echo "Deactivating" ;;
+    120) echo "Failed" ;;
+    *)   echo "Unknown" ;;
+  esac
+}
+
+get_devices()
+{
+  dbus-send --system --print-reply --dest=$NM_SERVICE_NAME $NM_OBJECT_PATH $NM_GET_DEVICES | \
+    grep "object path" | cut -d '"' -f2
+}
+
+get_device_property()
+{
+  # first arg:  device object path
+  # second arg: property name
+  # returns:    property value
+
+  dbus-send --system --print-reply --dest=$NM_SERVICE_NAME "$1" $DBUS_PROPERTIES_GET string:$DEVICE_IFACE string:"$2" | \
+    grep "variant" | awk '{print $3}' | sed 's/"//g'
+}
+
+list_devices_details()
+{
+  for device in `get_devices`
+  do
+    DEV_INTERFACE=`get_device_property "$device" "Interface"`
+    DEV_TYPE=`get_device_property "$device" "DeviceType"`
+    DEV_DRIVER=`get_device_property "$device" "Driver"`
+    DEV_STATE=`get_device_property "$device" "State"`
+
+    echo "============================"
+    echo "Interface: $DEV_INTERFACE"
+    echo "Type: `devtype_to_name $DEV_TYPE`"
+    echo "Driver: $DEV_DRIVER"
+    echo "State: `state_to_name $DEV_STATE`"
+  done
+}
+
+# print devices details
+list_devices_details
+
diff --git a/include/Makefile.in b/include/Makefile.in
index 18b86a67..d0315f4c 100644
--- a/include/Makefile.in
+++ b/include/Makefile.in
@@ -56,16 +56,18 @@ DIST_COMMON = $(NetworkManagerinclude_HEADERS) $(srcdir)/Makefile.am \
 	$(srcdir)/Makefile.in $(srcdir)/nm-version.h.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/compiler_warnings.m4 \
-	$(top_srcdir)/m4/gettext.m4 $(top_srcdir)/m4/gtk-doc.m4 \
-	$(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/intlmacosx.m4 \
-	$(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/introspection.m4 \
-	$(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \
-	$(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/libnl-check.m4 \
-	$(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \
-	$(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
-	$(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/nls.m4 \
-	$(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/progtest.m4 \
-	$(top_srcdir)/m4/vapigen.m4 $(top_srcdir)/configure.ac
+	$(top_srcdir)/m4/gettext.m4 \
+	$(top_srcdir)/m4/gnome-code-coverage.m4 \
+	$(top_srcdir)/m4/gtk-doc.m4 $(top_srcdir)/m4/iconv.m4 \
+	$(top_srcdir)/m4/intlmacosx.m4 $(top_srcdir)/m4/intltool.m4 \
+	$(top_srcdir)/m4/introspection.m4 $(top_srcdir)/m4/lib-ld.m4 \
+	$(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \
+	$(top_srcdir)/m4/libnl-check.m4 $(top_srcdir)/m4/libtool.m4 \
+	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
+	$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
+	$(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/po.m4 \
+	$(top_srcdir)/m4/progtest.m4 $(top_srcdir)/m4/vapigen.m4 \
+	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(install_sh) -d
@@ -129,6 +131,10 @@ AWK = @AWK@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
+CKDB_PATH = @CKDB_PATH@
+CODE_COVERAGE_CFLAGS = @CODE_COVERAGE_CFLAGS@
+CODE_COVERAGE_ENABLED = @CODE_COVERAGE_ENABLED@
+CODE_COVERAGE_LDFLAGS = @CODE_COVERAGE_LDFLAGS@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CXX = @CXX@
@@ -143,9 +149,7 @@ DBUS_SYS_DIR = @DBUS_SYS_DIR@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
 DHCLIENT_PATH = @DHCLIENT_PATH@
-DHCLIENT_VERSION = @DHCLIENT_VERSION@
 DHCPCD_PATH = @DHCPCD_PATH@
-DISABLE_DEPRECATED = @DISABLE_DEPRECATED@
 DLLTOOL = @DLLTOOL@
 DSYMUTIL = @DSYMUTIL@
 DUMPBIN = @DUMPBIN@
@@ -155,17 +159,14 @@ ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
 FGREP = @FGREP@
+GENHTML = @GENHTML@
 GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
 GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
-GIO_CFLAGS = @GIO_CFLAGS@
-GIO_LIBS = @GIO_LIBS@
 GLIB_CFLAGS = @GLIB_CFLAGS@
 GLIB_GENMARSHAL = @GLIB_GENMARSHAL@
 GLIB_LIBS = @GLIB_LIBS@
 GLIB_MAKEFILE = @GLIB_MAKEFILE@
 GLIB_MKENUMS = @GLIB_MKENUMS@
-GMODULE_CFLAGS = @GMODULE_CFLAGS@
-GMODULE_LIBS = @GMODULE_LIBS@
 GMSGFMT = @GMSGFMT@
 GMSGFMT_015 = @GMSGFMT_015@
 GNUTLS_CFLAGS = @GNUTLS_CFLAGS@
@@ -206,6 +207,7 @@ IPTABLES_PATH = @IPTABLES_PATH@
 IWMX_SDK_CFLAGS = @IWMX_SDK_CFLAGS@
 IWMX_SDK_LIBS = @IWMX_SDK_LIBS@
 KERNEL_FIRMWARE_DIR = @KERNEL_FIRMWARE_DIR@
+LCOV = @LCOV@
 LD = @LD@
 LDFLAGS = @LDFLAGS@
 LIBDL = @LIBDL@
@@ -222,11 +224,7 @@ LIBNL2_LIBS = @LIBNL2_LIBS@
 LIBNL3_CFLAGS = @LIBNL3_CFLAGS@
 LIBNL3_LIBS = @LIBNL3_LIBS@
 LIBNL_CFLAGS = @LIBNL_CFLAGS@
-LIBNL_GENL3_CFLAGS = @LIBNL_GENL3_CFLAGS@
-LIBNL_GENL3_LIBS = @LIBNL_GENL3_LIBS@
 LIBNL_LIBS = @LIBNL_LIBS@
-LIBNL_ROUTE3_CFLAGS = @LIBNL_ROUTE3_CFLAGS@
-LIBNL_ROUTE3_LIBS = @LIBNL_ROUTE3_LIBS@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
 LIBSOUP_CFLAGS = @LIBSOUP_CFLAGS@
@@ -241,6 +239,8 @@ MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MANIFEST_TOOL = @MANIFEST_TOOL@
 MKDIR_P = @MKDIR_P@
+MM_GLIB_CFLAGS = @MM_GLIB_CFLAGS@
+MM_GLIB_LIBS = @MM_GLIB_LIBS@
 MOC = @MOC@
 MSGFMT = @MSGFMT@
 MSGFMT_015 = @MSGFMT_015@
@@ -250,6 +250,7 @@ NMEDIT = @NMEDIT@
 NM_MAJOR_VERSION = @NM_MAJOR_VERSION@
 NM_MICRO_VERSION = @NM_MICRO_VERSION@
 NM_MINOR_VERSION = @NM_MINOR_VERSION@
+NM_MODIFY_SYSTEM_POLICY = @NM_MODIFY_SYSTEM_POLICY@
 NM_VERSION = @NM_VERSION@
 NSS_CFLAGS = @NSS_CFLAGS@
 NSS_LIBS = @NSS_LIBS@
@@ -276,13 +277,14 @@ PPPD_PLUGIN_DIR = @PPPD_PLUGIN_DIR@
 QT_CFLAGS = @QT_CFLAGS@
 QT_LIBS = @QT_LIBS@
 RANLIB = @RANLIB@
-RESOLVCONF_PATH = @RESOLVCONF_PATH@
 SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
-SYSTEMD_CFLAGS = @SYSTEMD_CFLAGS@
-SYSTEMD_LIBS = @SYSTEMD_LIBS@
+SYSTEMD_INHIBIT_CFLAGS = @SYSTEMD_INHIBIT_CFLAGS@
+SYSTEMD_INHIBIT_LIBS = @SYSTEMD_INHIBIT_LIBS@
+SYSTEMD_LOGIN_CFLAGS = @SYSTEMD_LOGIN_CFLAGS@
+SYSTEMD_LOGIN_LIBS = @SYSTEMD_LOGIN_LIBS@
 SYSTEM_CA_PATH = @SYSTEM_CA_PATH@
 UDEV_BASE_DIR = @UDEV_BASE_DIR@
 USE_NLS = @USE_NLS@
@@ -337,6 +339,11 @@ localedir = @localedir@
 localstatedir = @localstatedir@
 mandir = @mandir@
 mkdir_p = @mkdir_p@
+nmbinary = @nmbinary@
+nmconfdir = @nmconfdir@
+nmdatadir = @nmdatadir@
+nmrundir = @nmrundir@
+nmstatedir = @nmstatedir@
 oldincludedir = @oldincludedir@
 pdfdir = @pdfdir@
 prefix = @prefix@
@@ -351,6 +358,10 @@ target_alias = @target_alias@
 top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
+with_dhclient = @with_dhclient@
+with_dhcpcd = @with_dhcpcd@
+with_netconfig = @with_netconfig@
+with_resolvconf = @with_resolvconf@
 EXTRA_DIST = \
      NetworkManager.h \
      NetworkManagerVPN.h \
diff --git a/include/NetworkManager.h b/include/NetworkManager.h
index bb67b8f7..74b2d87f 100644
--- a/include/NetworkManager.h
+++ b/include/NetworkManager.h
@@ -52,6 +52,7 @@
 #define NM_DBUS_INTERFACE_DEVICE_INFINIBAND NM_DBUS_INTERFACE_DEVICE ".Infiniband"
 #define NM_DBUS_INTERFACE_DEVICE_BOND       NM_DBUS_INTERFACE_DEVICE ".Bond"
 #define NM_DBUS_INTERFACE_DEVICE_VLAN       NM_DBUS_INTERFACE_DEVICE ".Vlan"
+#define NM_DBUS_INTERFACE_DEVICE_BRIDGE     NM_DBUS_INTERFACE_DEVICE ".Bridge"
 
 
 #define NM_DBUS_IFACE_SETTINGS            "org.freedesktop.NetworkManager.Settings"
@@ -128,6 +129,7 @@ typedef enum {
 	NM_DEVICE_TYPE_BOND       = 10,
 	NM_DEVICE_TYPE_VLAN       = 11,
 	NM_DEVICE_TYPE_ADSL       = 12,
+	NM_DEVICE_TYPE_BRIDGE     = 13,
 } NMDeviceType;
 
 /**
@@ -225,15 +227,23 @@ typedef enum {
 /**
  * NM80211Mode:
  * @NM_802_11_MODE_UNKNOWN: the device or access point mode is unknown
- * @NM_802_11_MODE_ADHOC: the device or access point is in Ad-Hoc mode
- * @NM_802_11_MODE_INFRA: the device or access point is in infrastructure mode
+ * @NM_802_11_MODE_ADHOC: for both devices and access point objects, indicates
+ *   the object is part of an Ad-Hoc 802.11 network without a central
+ *   coordinating access point.
+ * @NM_802_11_MODE_INFRA: the device or access point is in infrastructure mode.
+ *   For devices, this indicates the device is an 802.11 client/station.  For
+ *   access point objects, this indicates the object is an access point that
+ *   provides connectivity to clients.
+ * @NM_802_11_MODE_AP: the device is an access point/hotspot.  Not valid for
+ *   access point objects; used only for hotspot mode on the local machine.
  *
  * Indicates the 802.11 mode an access point or device is currently in.
  **/
 typedef enum {
 	NM_802_11_MODE_UNKNOWN = 0,
 	NM_802_11_MODE_ADHOC,
-	NM_802_11_MODE_INFRA
+	NM_802_11_MODE_INFRA,
+	NM_802_11_MODE_AP
 } NM80211Mode;
 
 /**
@@ -492,6 +502,15 @@ typedef enum {
 	/* Problem with the RFC 2684 Ethernet over ADSL bridge */
 	NM_DEVICE_STATE_REASON_BR2684_FAILED = 51,
 
+	/* ModemManager not running */
+	NM_DEVICE_STATE_REASON_MODEM_MANAGER_UNAVAILABLE = 52,
+
+	/* The WiFi network could not be found */
+	NM_DEVICE_STATE_REASON_SSID_NOT_FOUND = 53,
+
+	/* A secondary connection of the base connection failed */
+	NM_DEVICE_STATE_REASON_SECONDARY_CONNECTION_FAILED = 54,
+
 	/* Unused */
 	NM_DEVICE_STATE_REASON_LAST = 0xFFFF
 } NMDeviceStateReason;
@@ -504,6 +523,8 @@ typedef enum {
  * @NM_ACTIVE_CONNECTION_STATE_ACTIVATED: there is a connection to the network
  * @NM_ACTIVE_CONNECTION_STATE_DEACTIVATING: the network connection is being
  *   torn down and cleaned up
+ * @NM_ACTIVE_CONNECTION_STATE_DEACTIVATED: the network connection is disconnected
+ *   and will be removed
  *
  * #NMActiveConnectionState values indicate the state of a connection to a
  * specific network while it is starting, connected, or disconnecting from that
@@ -513,7 +534,8 @@ typedef enum {
 	NM_ACTIVE_CONNECTION_STATE_UNKNOWN = 0,
 	NM_ACTIVE_CONNECTION_STATE_ACTIVATING,
 	NM_ACTIVE_CONNECTION_STATE_ACTIVATED,
-	NM_ACTIVE_CONNECTION_STATE_DEACTIVATING
+	NM_ACTIVE_CONNECTION_STATE_DEACTIVATING,
+	NM_ACTIVE_CONNECTION_STATE_DEACTIVATED
 } NMActiveConnectionState;
 
 #endif /* NETWORK_MANAGER_H */
diff --git a/include/nm-glib-compat.h b/include/nm-glib-compat.h
index f9c1ae49..63d9598d 100644
--- a/include/nm-glib-compat.h
+++ b/include/nm-glib-compat.h
@@ -74,4 +74,13 @@ p##_get_type (void) \
 }
 #endif
 
+#if !GLIB_CHECK_VERSION(2,34,0)
+static inline void
+g_type_ensure (GType type)
+{
+  if (G_UNLIKELY (type == (GType)-1))
+    g_error ("can't happen");
+}
+#endif
+
 #endif  /* NM_GLIB_COMPAT_H */
diff --git a/include/nm-version.h b/include/nm-version.h
index 13256abd..0e5bfbcb 100644
--- a/include/nm-version.h
+++ b/include/nm-version.h
@@ -43,7 +43,7 @@
  * Evaluates to the micro version number of NetworkManager which this source
  * compiled against.
  */
-#define NM_MICRO_VERSION (6)
+#define NM_MICRO_VERSION (7)
 
 /**
  * NM_CHECK_VERSION:
diff --git a/initscript/Arch/Makefile.am b/initscript/Arch/Makefile.am
deleted file mode 100644
index 98d43432..00000000
--- a/initscript/Arch/Makefile.am
+++ /dev/null
@@ -1,2 +0,0 @@
-initddir = $(sysconfdir)/rc.d
-initd_SCRIPTS = networkmanager
diff --git a/initscript/Arch/Makefile.in b/initscript/Arch/Makefile.in
deleted file mode 100644
index b5c27262..00000000
--- a/initscript/Arch/Makefile.in
+++ /dev/null
@@ -1,587 +0,0 @@
-# Makefile.in generated by automake 1.11.6 from Makefile.am.
-# @configure_input@
-
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
-# Foundation, Inc.
-# This Makefile.in is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-@SET_MAKE@
-
-VPATH = @srcdir@
-am__make_dryrun = \
-  { \
-    am__dry=no; \
-    case $$MAKEFLAGS in \
-      *\\[\ \	]*) \
-        echo 'am--echo: ; @echo "AM"  OK' | $(MAKE) -f - 2>/dev/null \
-          | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
-      *) \
-        for am__flg in $$MAKEFLAGS; do \
-          case $$am__flg in \
-            *=*|--*) ;; \
-            *n*) am__dry=yes; break;; \
-          esac; \
-        done;; \
-    esac; \
-    test $$am__dry = yes; \
-  }
-pkgdatadir = $(datadir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
-pkglibexecdir = $(libexecdir)/@PACKAGE@
-am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-install_sh_DATA = $(install_sh) -c -m 644
-install_sh_PROGRAM = $(install_sh) -c
-install_sh_SCRIPT = $(install_sh) -c
-INSTALL_HEADER = $(INSTALL_DATA)
-transform = $(program_transform_name)
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-build_triplet = @build@
-host_triplet = @host@
-subdir = initscript/Arch
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
-	$(srcdir)/networkmanager.in
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/compiler_warnings.m4 \
-	$(top_srcdir)/m4/gettext.m4 $(top_srcdir)/m4/gtk-doc.m4 \
-	$(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/intlmacosx.m4 \
-	$(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/introspection.m4 \
-	$(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \
-	$(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/libnl-check.m4 \
-	$(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \
-	$(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
-	$(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/nls.m4 \
-	$(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/progtest.m4 \
-	$(top_srcdir)/m4/vapigen.m4 $(top_srcdir)/configure.ac
-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
-	$(ACLOCAL_M4)
-mkinstalldirs = $(install_sh) -d
-CONFIG_HEADER = $(top_builddir)/config.h
-CONFIG_CLEAN_FILES = networkmanager
-CONFIG_CLEAN_VPATH_FILES =
-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
-am__vpath_adj = case $$p in \
-    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
-    *) f=$$p;; \
-  esac;
-am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
-am__install_max = 40
-am__nobase_strip_setup = \
-  srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
-am__nobase_strip = \
-  for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
-am__nobase_list = $(am__nobase_strip_setup); \
-  for p in $$list; do echo "$$p $$p"; done | \
-  sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
-  $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
-    if (++n[$$2] == $(am__install_max)) \
-      { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
-    END { for (dir in files) print dir, files[dir] }'
-am__base_list = \
-  sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
-  sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
-am__uninstall_files_from_dir = { \
-  test -z "$$files" \
-    || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
-    || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
-         $(am__cd) "$$dir" && rm -f $$files; }; \
-  }
-am__installdirs = "$(DESTDIR)$(initddir)"
-SCRIPTS = $(initd_SCRIPTS)
-AM_V_GEN = $(am__v_GEN_@AM_V@)
-am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
-am__v_GEN_0 = @echo "  GEN   " $@;
-AM_V_at = $(am__v_at_@AM_V@)
-am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
-am__v_at_0 = @
-SOURCES =
-DIST_SOURCES =
-am__can_run_installinfo = \
-  case $$AM_UPDATE_INFO_DIR in \
-    n|no|NO) false;; \
-    *) (install-info --version) >/dev/null 2>&1;; \
-  esac
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-ACLOCAL = @ACLOCAL@
-ALL_LINGUAS = @ALL_LINGUAS@
-AMTAR = @AMTAR@
-AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
-AR = @AR@
-AUTOCONF = @AUTOCONF@
-AUTOHEADER = @AUTOHEADER@
-AUTOMAKE = @AUTOMAKE@
-AWK = @AWK@
-CC = @CC@
-CCDEPMODE = @CCDEPMODE@
-CFLAGS = @CFLAGS@
-CPP = @CPP@
-CPPFLAGS = @CPPFLAGS@
-CXX = @CXX@
-CXXCPP = @CXXCPP@
-CXXDEPMODE = @CXXDEPMODE@
-CXXFLAGS = @CXXFLAGS@
-CYGPATH_W = @CYGPATH_W@
-DATADIRNAME = @DATADIRNAME@
-DBUS_CFLAGS = @DBUS_CFLAGS@
-DBUS_LIBS = @DBUS_LIBS@
-DBUS_SYS_DIR = @DBUS_SYS_DIR@
-DEFS = @DEFS@
-DEPDIR = @DEPDIR@
-DHCLIENT_PATH = @DHCLIENT_PATH@
-DHCLIENT_VERSION = @DHCLIENT_VERSION@
-DHCPCD_PATH = @DHCPCD_PATH@
-DISABLE_DEPRECATED = @DISABLE_DEPRECATED@
-DLLTOOL = @DLLTOOL@
-DSYMUTIL = @DSYMUTIL@
-DUMPBIN = @DUMPBIN@
-ECHO_C = @ECHO_C@
-ECHO_N = @ECHO_N@
-ECHO_T = @ECHO_T@
-EGREP = @EGREP@
-EXEEXT = @EXEEXT@
-FGREP = @FGREP@
-GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
-GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
-GIO_CFLAGS = @GIO_CFLAGS@
-GIO_LIBS = @GIO_LIBS@
-GLIB_CFLAGS = @GLIB_CFLAGS@
-GLIB_GENMARSHAL = @GLIB_GENMARSHAL@
-GLIB_LIBS = @GLIB_LIBS@
-GLIB_MAKEFILE = @GLIB_MAKEFILE@
-GLIB_MKENUMS = @GLIB_MKENUMS@
-GMODULE_CFLAGS = @GMODULE_CFLAGS@
-GMODULE_LIBS = @GMODULE_LIBS@
-GMSGFMT = @GMSGFMT@
-GMSGFMT_015 = @GMSGFMT_015@
-GNUTLS_CFLAGS = @GNUTLS_CFLAGS@
-GNUTLS_LIBS = @GNUTLS_LIBS@
-GREP = @GREP@
-GTKDOC_CHECK = @GTKDOC_CHECK@
-GTKDOC_DEPS_CFLAGS = @GTKDOC_DEPS_CFLAGS@
-GTKDOC_DEPS_LIBS = @GTKDOC_DEPS_LIBS@
-GTKDOC_MKPDF = @GTKDOC_MKPDF@
-GTKDOC_REBASE = @GTKDOC_REBASE@
-GUDEV_CFLAGS = @GUDEV_CFLAGS@
-GUDEV_LIBS = @GUDEV_LIBS@
-HTML_DIR = @HTML_DIR@
-INSTALL = @INSTALL@
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-INTLLIBS = @INTLLIBS@
-INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
-INTLTOOL_MERGE = @INTLTOOL_MERGE@
-INTLTOOL_PERL = @INTLTOOL_PERL@
-INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
-INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@
-INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@
-INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@
-INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@
-INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
-INTROSPECTION_CFLAGS = @INTROSPECTION_CFLAGS@
-INTROSPECTION_COMPILER = @INTROSPECTION_COMPILER@
-INTROSPECTION_GENERATE = @INTROSPECTION_GENERATE@
-INTROSPECTION_GIRDIR = @INTROSPECTION_GIRDIR@
-INTROSPECTION_LIBS = @INTROSPECTION_LIBS@
-INTROSPECTION_MAKEFILE = @INTROSPECTION_MAKEFILE@
-INTROSPECTION_SCANNER = @INTROSPECTION_SCANNER@
-INTROSPECTION_TYPELIBDIR = @INTROSPECTION_TYPELIBDIR@
-IPTABLES_PATH = @IPTABLES_PATH@
-IWMX_SDK_CFLAGS = @IWMX_SDK_CFLAGS@
-IWMX_SDK_LIBS = @IWMX_SDK_LIBS@
-KERNEL_FIRMWARE_DIR = @KERNEL_FIRMWARE_DIR@
-LD = @LD@
-LDFLAGS = @LDFLAGS@
-LIBDL = @LIBDL@
-LIBGCRYPT_CFLAGS = @LIBGCRYPT_CFLAGS@
-LIBGCRYPT_CONFIG = @LIBGCRYPT_CONFIG@
-LIBGCRYPT_LIBS = @LIBGCRYPT_LIBS@
-LIBICONV = @LIBICONV@
-LIBINTL = @LIBINTL@
-LIBM = @LIBM@
-LIBNL1_CFLAGS = @LIBNL1_CFLAGS@
-LIBNL1_LIBS = @LIBNL1_LIBS@
-LIBNL2_CFLAGS = @LIBNL2_CFLAGS@
-LIBNL2_LIBS = @LIBNL2_LIBS@
-LIBNL3_CFLAGS = @LIBNL3_CFLAGS@
-LIBNL3_LIBS = @LIBNL3_LIBS@
-LIBNL_CFLAGS = @LIBNL_CFLAGS@
-LIBNL_GENL3_CFLAGS = @LIBNL_GENL3_CFLAGS@
-LIBNL_GENL3_LIBS = @LIBNL_GENL3_LIBS@
-LIBNL_LIBS = @LIBNL_LIBS@
-LIBNL_ROUTE3_CFLAGS = @LIBNL_ROUTE3_CFLAGS@
-LIBNL_ROUTE3_LIBS = @LIBNL_ROUTE3_LIBS@
-LIBOBJS = @LIBOBJS@
-LIBS = @LIBS@
-LIBSOUP_CFLAGS = @LIBSOUP_CFLAGS@
-LIBSOUP_LIBS = @LIBSOUP_LIBS@
-LIBTOOL = @LIBTOOL@
-LIPO = @LIPO@
-LN_S = @LN_S@
-LTLIBICONV = @LTLIBICONV@
-LTLIBINTL = @LTLIBINTL@
-LTLIBOBJS = @LTLIBOBJS@
-MAINT = @MAINT@
-MAKEINFO = @MAKEINFO@
-MANIFEST_TOOL = @MANIFEST_TOOL@
-MKDIR_P = @MKDIR_P@
-MOC = @MOC@
-MSGFMT = @MSGFMT@
-MSGFMT_015 = @MSGFMT_015@
-MSGMERGE = @MSGMERGE@
-NM = @NM@
-NMEDIT = @NMEDIT@
-NM_MAJOR_VERSION = @NM_MAJOR_VERSION@
-NM_MICRO_VERSION = @NM_MICRO_VERSION@
-NM_MINOR_VERSION = @NM_MINOR_VERSION@
-NM_VERSION = @NM_VERSION@
-NSS_CFLAGS = @NSS_CFLAGS@
-NSS_LIBS = @NSS_LIBS@
-OBJDUMP = @OBJDUMP@
-OBJEXT = @OBJEXT@
-OTOOL = @OTOOL@
-OTOOL64 = @OTOOL64@
-PACKAGE = @PACKAGE@
-PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-PACKAGE_NAME = @PACKAGE_NAME@
-PACKAGE_STRING = @PACKAGE_STRING@
-PACKAGE_TARNAME = @PACKAGE_TARNAME@
-PACKAGE_URL = @PACKAGE_URL@
-PACKAGE_VERSION = @PACKAGE_VERSION@
-PATH_SEPARATOR = @PATH_SEPARATOR@
-PKGCONFIG_PATH = @PKGCONFIG_PATH@
-PKG_CONFIG = @PKG_CONFIG@
-PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
-PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
-POLKIT_CFLAGS = @POLKIT_CFLAGS@
-POLKIT_LIBS = @POLKIT_LIBS@
-POSUB = @POSUB@
-PPPD_PLUGIN_DIR = @PPPD_PLUGIN_DIR@
-QT_CFLAGS = @QT_CFLAGS@
-QT_LIBS = @QT_LIBS@
-RANLIB = @RANLIB@
-RESOLVCONF_PATH = @RESOLVCONF_PATH@
-SED = @SED@
-SET_MAKE = @SET_MAKE@
-SHELL = @SHELL@
-STRIP = @STRIP@
-SYSTEMD_CFLAGS = @SYSTEMD_CFLAGS@
-SYSTEMD_LIBS = @SYSTEMD_LIBS@
-SYSTEM_CA_PATH = @SYSTEM_CA_PATH@
-UDEV_BASE_DIR = @UDEV_BASE_DIR@
-USE_NLS = @USE_NLS@
-UUID_CFLAGS = @UUID_CFLAGS@
-UUID_LIBS = @UUID_LIBS@
-VAPIGEN = @VAPIGEN@
-VAPIGEN_MAKEFILE = @VAPIGEN_MAKEFILE@
-VAPIGEN_VAPIDIR = @VAPIGEN_VAPIDIR@
-VERSION = @VERSION@
-XGETTEXT = @XGETTEXT@
-XGETTEXT_015 = @XGETTEXT_015@
-XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
-abs_builddir = @abs_builddir@
-abs_srcdir = @abs_srcdir@
-abs_top_builddir = @abs_top_builddir@
-abs_top_srcdir = @abs_top_srcdir@
-ac_ct_AR = @ac_ct_AR@
-ac_ct_CC = @ac_ct_CC@
-ac_ct_CXX = @ac_ct_CXX@
-ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-am__include = @am__include@
-am__leading_dot = @am__leading_dot@
-am__quote = @am__quote@
-am__tar = @am__tar@
-am__untar = @am__untar@
-bindir = @bindir@
-build = @build@
-build_alias = @build_alias@
-build_cpu = @build_cpu@
-build_os = @build_os@
-build_vendor = @build_vendor@
-builddir = @builddir@
-datadir = @datadir@
-datarootdir = @datarootdir@
-docdir = @docdir@
-dvidir = @dvidir@
-exec_prefix = @exec_prefix@
-host = @host@
-host_alias = @host_alias@
-host_cpu = @host_cpu@
-host_os = @host_os@
-host_vendor = @host_vendor@
-htmldir = @htmldir@
-includedir = @includedir@
-infodir = @infodir@
-install_sh = @install_sh@
-intltool__v_merge_options_ = @intltool__v_merge_options_@
-intltool__v_merge_options_0 = @intltool__v_merge_options_0@
-libdir = @libdir@
-libexecdir = @libexecdir@
-localedir = @localedir@
-localstatedir = @localstatedir@
-mandir = @mandir@
-mkdir_p = @mkdir_p@
-oldincludedir = @oldincludedir@
-pdfdir = @pdfdir@
-prefix = @prefix@
-program_transform_name = @program_transform_name@
-psdir = @psdir@
-sbindir = @sbindir@
-sharedstatedir = @sharedstatedir@
-srcdir = @srcdir@
-sysconfdir = @sysconfdir@
-systemdsystemunitdir = @systemdsystemunitdir@
-target_alias = @target_alias@
-top_build_prefix = @top_build_prefix@
-top_builddir = @top_builddir@
-top_srcdir = @top_srcdir@
-initddir = $(sysconfdir)/rc.d
-initd_SCRIPTS = networkmanager
-all: all-am
-
-.SUFFIXES:
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
-	@for dep in $?; do \
-	  case '$(am__configure_deps)' in \
-	    *$$dep*) \
-	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
-	        && { if test -f $@; then exit 0; else break; fi; }; \
-	      exit 1;; \
-	  esac; \
-	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu initscript/Arch/Makefile'; \
-	$(am__cd) $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu initscript/Arch/Makefile
-.PRECIOUS: Makefile
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-	@case '$?' in \
-	  *config.status*) \
-	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
-	  *) \
-	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
-	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
-	esac;
-
-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-
-$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(am__aclocal_m4_deps):
-networkmanager: $(top_builddir)/config.status $(srcdir)/networkmanager.in
-	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
-install-initdSCRIPTS: $(initd_SCRIPTS)
-	@$(NORMAL_INSTALL)
-	@list='$(initd_SCRIPTS)'; test -n "$(initddir)" || list=; \
-	if test -n "$$list"; then \
-	  echo " $(MKDIR_P) '$(DESTDIR)$(initddir)'"; \
-	  $(MKDIR_P) "$(DESTDIR)$(initddir)" || exit 1; \
-	fi; \
-	for p in $$list; do \
-	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-	  if test -f "$$d$$p"; then echo "$$d$$p"; echo "$$p"; else :; fi; \
-	done | \
-	sed -e 'p;s,.*/,,;n' \
-	    -e 'h;s|.*|.|' \
-	    -e 'p;x;s,.*/,,;$(transform)' | sed 'N;N;N;s,\n, ,g' | \
-	$(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1; } \
-	  { d=$$3; if (dirs[d] != 1) { print "d", d; dirs[d] = 1 } \
-	    if ($$2 == $$4) { files[d] = files[d] " " $$1; \
-	      if (++n[d] == $(am__install_max)) { \
-		print "f", d, files[d]; n[d] = 0; files[d] = "" } } \
-	    else { print "f", d "/" $$4, $$1 } } \
-	  END { for (d in files) print "f", d, files[d] }' | \
-	while read type dir files; do \
-	     if test "$$dir" = .; then dir=; else dir=/$$dir; fi; \
-	     test -z "$$files" || { \
-	       echo " $(INSTALL_SCRIPT) $$files '$(DESTDIR)$(initddir)$$dir'"; \
-	       $(INSTALL_SCRIPT) $$files "$(DESTDIR)$(initddir)$$dir" || exit $$?; \
-	     } \
-	; done
-
-uninstall-initdSCRIPTS:
-	@$(NORMAL_UNINSTALL)
-	@list='$(initd_SCRIPTS)'; test -n "$(initddir)" || exit 0; \
-	files=`for p in $$list; do echo "$$p"; done | \
-	       sed -e 's,.*/,,;$(transform)'`; \
-	dir='$(DESTDIR)$(initddir)'; $(am__uninstall_files_from_dir)
-
-mostlyclean-libtool:
-	-rm -f *.lo
-
-clean-libtool:
-	-rm -rf .libs _libs
-tags: TAGS
-TAGS:
-
-ctags: CTAGS
-CTAGS:
-
-
-distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-	list='$(DISTFILES)'; \
-	  dist_files=`for file in $$list; do echo $$file; done | \
-	  sed -e "s|^$$srcdirstrip/||;t" \
-	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
-	case $$dist_files in \
-	  */*) $(MKDIR_P) `echo "$$dist_files" | \
-			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
-			   sort -u` ;; \
-	esac; \
-	for file in $$dist_files; do \
-	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  if test -d $$d/$$file; then \
-	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
-	    if test -d "$(distdir)/$$file"; then \
-	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-	    fi; \
-	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
-	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-	    fi; \
-	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
-	  else \
-	    test -f "$(distdir)/$$file" \
-	    || cp -p $$d/$$file "$(distdir)/$$file" \
-	    || exit 1; \
-	  fi; \
-	done
-check-am: all-am
-check: check-am
-all-am: Makefile $(SCRIPTS)
-installdirs:
-	for dir in "$(DESTDIR)$(initddir)"; do \
-	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
-	done
-install: install-am
-install-exec: install-exec-am
-install-data: install-data-am
-uninstall: uninstall-am
-
-install-am: all-am
-	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-
-installcheck: installcheck-am
-install-strip:
-	if test -z '$(STRIP)'; then \
-	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	      install; \
-	else \
-	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
-	fi
-mostlyclean-generic:
-
-clean-generic:
-
-distclean-generic:
-	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
-
-maintainer-clean-generic:
-	@echo "This command is intended for maintainers to use"
-	@echo "it deletes files that may require special tools to rebuild."
-clean: clean-am
-
-clean-am: clean-generic clean-libtool mostlyclean-am
-
-distclean: distclean-am
-	-rm -f Makefile
-distclean-am: clean-am distclean-generic
-
-dvi: dvi-am
-
-dvi-am:
-
-html: html-am
-
-html-am:
-
-info: info-am
-
-info-am:
-
-install-data-am: install-initdSCRIPTS
-
-install-dvi: install-dvi-am
-
-install-dvi-am:
-
-install-exec-am:
-
-install-html: install-html-am
-
-install-html-am:
-
-install-info: install-info-am
-
-install-info-am:
-
-install-man:
-
-install-pdf: install-pdf-am
-
-install-pdf-am:
-
-install-ps: install-ps-am
-
-install-ps-am:
-
-installcheck-am:
-
-maintainer-clean: maintainer-clean-am
-	-rm -f Makefile
-maintainer-clean-am: distclean-am maintainer-clean-generic
-
-mostlyclean: mostlyclean-am
-
-mostlyclean-am: mostlyclean-generic mostlyclean-libtool
-
-pdf: pdf-am
-
-pdf-am:
-
-ps: ps-am
-
-ps-am:
-
-uninstall-am: uninstall-initdSCRIPTS
-
-.MAKE: install-am install-strip
-
-.PHONY: all all-am check check-am clean clean-generic clean-libtool \
-	distclean distclean-generic distclean-libtool distdir dvi \
-	dvi-am html html-am info info-am install install-am \
-	install-data install-data-am install-dvi install-dvi-am \
-	install-exec install-exec-am install-html install-html-am \
-	install-info install-info-am install-initdSCRIPTS install-man \
-	install-pdf install-pdf-am install-ps install-ps-am \
-	install-strip installcheck installcheck-am installdirs \
-	maintainer-clean maintainer-clean-generic mostlyclean \
-	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
-	uninstall uninstall-am uninstall-initdSCRIPTS
-
-
-# Tell versions [3.59,3.63) of GNU make to not export all variables.
-# Otherwise a system limit (for SysV at least) may be exceeded.
-.NOEXPORT:
diff --git a/initscript/Debian/Makefile.am b/initscript/Debian/Makefile.am
deleted file mode 100644
index a7356452..00000000
--- a/initscript/Debian/Makefile.am
+++ /dev/null
@@ -1,2 +0,0 @@
-initddir = $(sysconfdir)/init.d
-initd_SCRIPTS = NetworkManager
diff --git a/initscript/Debian/Makefile.in b/initscript/Debian/Makefile.in
deleted file mode 100644
index 9c0e2b0c..00000000
--- a/initscript/Debian/Makefile.in
+++ /dev/null
@@ -1,587 +0,0 @@
-# Makefile.in generated by automake 1.11.6 from Makefile.am.
-# @configure_input@
-
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
-# Foundation, Inc.
-# This Makefile.in is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-@SET_MAKE@
-
-VPATH = @srcdir@
-am__make_dryrun = \
-  { \
-    am__dry=no; \
-    case $$MAKEFLAGS in \
-      *\\[\ \	]*) \
-        echo 'am--echo: ; @echo "AM"  OK' | $(MAKE) -f - 2>/dev/null \
-          | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
-      *) \
-        for am__flg in $$MAKEFLAGS; do \
-          case $$am__flg in \
-            *=*|--*) ;; \
-            *n*) am__dry=yes; break;; \
-          esac; \
-        done;; \
-    esac; \
-    test $$am__dry = yes; \
-  }
-pkgdatadir = $(datadir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
-pkglibexecdir = $(libexecdir)/@PACKAGE@
-am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-install_sh_DATA = $(install_sh) -c -m 644
-install_sh_PROGRAM = $(install_sh) -c
-install_sh_SCRIPT = $(install_sh) -c
-INSTALL_HEADER = $(INSTALL_DATA)
-transform = $(program_transform_name)
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-build_triplet = @build@
-host_triplet = @host@
-subdir = initscript/Debian
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
-	$(srcdir)/NetworkManager.in
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/compiler_warnings.m4 \
-	$(top_srcdir)/m4/gettext.m4 $(top_srcdir)/m4/gtk-doc.m4 \
-	$(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/intlmacosx.m4 \
-	$(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/introspection.m4 \
-	$(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \
-	$(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/libnl-check.m4 \
-	$(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \
-	$(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
-	$(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/nls.m4 \
-	$(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/progtest.m4 \
-	$(top_srcdir)/m4/vapigen.m4 $(top_srcdir)/configure.ac
-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
-	$(ACLOCAL_M4)
-mkinstalldirs = $(install_sh) -d
-CONFIG_HEADER = $(top_builddir)/config.h
-CONFIG_CLEAN_FILES = NetworkManager
-CONFIG_CLEAN_VPATH_FILES =
-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
-am__vpath_adj = case $$p in \
-    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
-    *) f=$$p;; \
-  esac;
-am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
-am__install_max = 40
-am__nobase_strip_setup = \
-  srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
-am__nobase_strip = \
-  for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
-am__nobase_list = $(am__nobase_strip_setup); \
-  for p in $$list; do echo "$$p $$p"; done | \
-  sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
-  $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
-    if (++n[$$2] == $(am__install_max)) \
-      { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
-    END { for (dir in files) print dir, files[dir] }'
-am__base_list = \
-  sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
-  sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
-am__uninstall_files_from_dir = { \
-  test -z "$$files" \
-    || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
-    || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
-         $(am__cd) "$$dir" && rm -f $$files; }; \
-  }
-am__installdirs = "$(DESTDIR)$(initddir)"
-SCRIPTS = $(initd_SCRIPTS)
-AM_V_GEN = $(am__v_GEN_@AM_V@)
-am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
-am__v_GEN_0 = @echo "  GEN   " $@;
-AM_V_at = $(am__v_at_@AM_V@)
-am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
-am__v_at_0 = @
-SOURCES =
-DIST_SOURCES =
-am__can_run_installinfo = \
-  case $$AM_UPDATE_INFO_DIR in \
-    n|no|NO) false;; \
-    *) (install-info --version) >/dev/null 2>&1;; \
-  esac
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-ACLOCAL = @ACLOCAL@
-ALL_LINGUAS = @ALL_LINGUAS@
-AMTAR = @AMTAR@
-AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
-AR = @AR@
-AUTOCONF = @AUTOCONF@
-AUTOHEADER = @AUTOHEADER@
-AUTOMAKE = @AUTOMAKE@
-AWK = @AWK@
-CC = @CC@
-CCDEPMODE = @CCDEPMODE@
-CFLAGS = @CFLAGS@
-CPP = @CPP@
-CPPFLAGS = @CPPFLAGS@
-CXX = @CXX@
-CXXCPP = @CXXCPP@
-CXXDEPMODE = @CXXDEPMODE@
-CXXFLAGS = @CXXFLAGS@
-CYGPATH_W = @CYGPATH_W@
-DATADIRNAME = @DATADIRNAME@
-DBUS_CFLAGS = @DBUS_CFLAGS@
-DBUS_LIBS = @DBUS_LIBS@
-DBUS_SYS_DIR = @DBUS_SYS_DIR@
-DEFS = @DEFS@
-DEPDIR = @DEPDIR@
-DHCLIENT_PATH = @DHCLIENT_PATH@
-DHCLIENT_VERSION = @DHCLIENT_VERSION@
-DHCPCD_PATH = @DHCPCD_PATH@
-DISABLE_DEPRECATED = @DISABLE_DEPRECATED@
-DLLTOOL = @DLLTOOL@
-DSYMUTIL = @DSYMUTIL@
-DUMPBIN = @DUMPBIN@
-ECHO_C = @ECHO_C@
-ECHO_N = @ECHO_N@
-ECHO_T = @ECHO_T@
-EGREP = @EGREP@
-EXEEXT = @EXEEXT@
-FGREP = @FGREP@
-GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
-GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
-GIO_CFLAGS = @GIO_CFLAGS@
-GIO_LIBS = @GIO_LIBS@
-GLIB_CFLAGS = @GLIB_CFLAGS@
-GLIB_GENMARSHAL = @GLIB_GENMARSHAL@
-GLIB_LIBS = @GLIB_LIBS@
-GLIB_MAKEFILE = @GLIB_MAKEFILE@
-GLIB_MKENUMS = @GLIB_MKENUMS@
-GMODULE_CFLAGS = @GMODULE_CFLAGS@
-GMODULE_LIBS = @GMODULE_LIBS@
-GMSGFMT = @GMSGFMT@
-GMSGFMT_015 = @GMSGFMT_015@
-GNUTLS_CFLAGS = @GNUTLS_CFLAGS@
-GNUTLS_LIBS = @GNUTLS_LIBS@
-GREP = @GREP@
-GTKDOC_CHECK = @GTKDOC_CHECK@
-GTKDOC_DEPS_CFLAGS = @GTKDOC_DEPS_CFLAGS@
-GTKDOC_DEPS_LIBS = @GTKDOC_DEPS_LIBS@
-GTKDOC_MKPDF = @GTKDOC_MKPDF@
-GTKDOC_REBASE = @GTKDOC_REBASE@
-GUDEV_CFLAGS = @GUDEV_CFLAGS@
-GUDEV_LIBS = @GUDEV_LIBS@
-HTML_DIR = @HTML_DIR@
-INSTALL = @INSTALL@
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-INTLLIBS = @INTLLIBS@
-INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
-INTLTOOL_MERGE = @INTLTOOL_MERGE@
-INTLTOOL_PERL = @INTLTOOL_PERL@
-INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
-INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@
-INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@
-INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@
-INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@
-INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
-INTROSPECTION_CFLAGS = @INTROSPECTION_CFLAGS@
-INTROSPECTION_COMPILER = @INTROSPECTION_COMPILER@
-INTROSPECTION_GENERATE = @INTROSPECTION_GENERATE@
-INTROSPECTION_GIRDIR = @INTROSPECTION_GIRDIR@
-INTROSPECTION_LIBS = @INTROSPECTION_LIBS@
-INTROSPECTION_MAKEFILE = @INTROSPECTION_MAKEFILE@
-INTROSPECTION_SCANNER = @INTROSPECTION_SCANNER@
-INTROSPECTION_TYPELIBDIR = @INTROSPECTION_TYPELIBDIR@
-IPTABLES_PATH = @IPTABLES_PATH@
-IWMX_SDK_CFLAGS = @IWMX_SDK_CFLAGS@
-IWMX_SDK_LIBS = @IWMX_SDK_LIBS@
-KERNEL_FIRMWARE_DIR = @KERNEL_FIRMWARE_DIR@
-LD = @LD@
-LDFLAGS = @LDFLAGS@
-LIBDL = @LIBDL@
-LIBGCRYPT_CFLAGS = @LIBGCRYPT_CFLAGS@
-LIBGCRYPT_CONFIG = @LIBGCRYPT_CONFIG@
-LIBGCRYPT_LIBS = @LIBGCRYPT_LIBS@
-LIBICONV = @LIBICONV@
-LIBINTL = @LIBINTL@
-LIBM = @LIBM@
-LIBNL1_CFLAGS = @LIBNL1_CFLAGS@
-LIBNL1_LIBS = @LIBNL1_LIBS@
-LIBNL2_CFLAGS = @LIBNL2_CFLAGS@
-LIBNL2_LIBS = @LIBNL2_LIBS@
-LIBNL3_CFLAGS = @LIBNL3_CFLAGS@
-LIBNL3_LIBS = @LIBNL3_LIBS@
-LIBNL_CFLAGS = @LIBNL_CFLAGS@
-LIBNL_GENL3_CFLAGS = @LIBNL_GENL3_CFLAGS@
-LIBNL_GENL3_LIBS = @LIBNL_GENL3_LIBS@
-LIBNL_LIBS = @LIBNL_LIBS@
-LIBNL_ROUTE3_CFLAGS = @LIBNL_ROUTE3_CFLAGS@
-LIBNL_ROUTE3_LIBS = @LIBNL_ROUTE3_LIBS@
-LIBOBJS = @LIBOBJS@
-LIBS = @LIBS@
-LIBSOUP_CFLAGS = @LIBSOUP_CFLAGS@
-LIBSOUP_LIBS = @LIBSOUP_LIBS@
-LIBTOOL = @LIBTOOL@
-LIPO = @LIPO@
-LN_S = @LN_S@
-LTLIBICONV = @LTLIBICONV@
-LTLIBINTL = @LTLIBINTL@
-LTLIBOBJS = @LTLIBOBJS@
-MAINT = @MAINT@
-MAKEINFO = @MAKEINFO@
-MANIFEST_TOOL = @MANIFEST_TOOL@
-MKDIR_P = @MKDIR_P@
-MOC = @MOC@
-MSGFMT = @MSGFMT@
-MSGFMT_015 = @MSGFMT_015@
-MSGMERGE = @MSGMERGE@
-NM = @NM@
-NMEDIT = @NMEDIT@
-NM_MAJOR_VERSION = @NM_MAJOR_VERSION@
-NM_MICRO_VERSION = @NM_MICRO_VERSION@
-NM_MINOR_VERSION = @NM_MINOR_VERSION@
-NM_VERSION = @NM_VERSION@
-NSS_CFLAGS = @NSS_CFLAGS@
-NSS_LIBS = @NSS_LIBS@
-OBJDUMP = @OBJDUMP@
-OBJEXT = @OBJEXT@
-OTOOL = @OTOOL@
-OTOOL64 = @OTOOL64@
-PACKAGE = @PACKAGE@
-PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-PACKAGE_NAME = @PACKAGE_NAME@
-PACKAGE_STRING = @PACKAGE_STRING@
-PACKAGE_TARNAME = @PACKAGE_TARNAME@
-PACKAGE_URL = @PACKAGE_URL@
-PACKAGE_VERSION = @PACKAGE_VERSION@
-PATH_SEPARATOR = @PATH_SEPARATOR@
-PKGCONFIG_PATH = @PKGCONFIG_PATH@
-PKG_CONFIG = @PKG_CONFIG@
-PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
-PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
-POLKIT_CFLAGS = @POLKIT_CFLAGS@
-POLKIT_LIBS = @POLKIT_LIBS@
-POSUB = @POSUB@
-PPPD_PLUGIN_DIR = @PPPD_PLUGIN_DIR@
-QT_CFLAGS = @QT_CFLAGS@
-QT_LIBS = @QT_LIBS@
-RANLIB = @RANLIB@
-RESOLVCONF_PATH = @RESOLVCONF_PATH@
-SED = @SED@
-SET_MAKE = @SET_MAKE@
-SHELL = @SHELL@
-STRIP = @STRIP@
-SYSTEMD_CFLAGS = @SYSTEMD_CFLAGS@
-SYSTEMD_LIBS = @SYSTEMD_LIBS@
-SYSTEM_CA_PATH = @SYSTEM_CA_PATH@
-UDEV_BASE_DIR = @UDEV_BASE_DIR@
-USE_NLS = @USE_NLS@
-UUID_CFLAGS = @UUID_CFLAGS@
-UUID_LIBS = @UUID_LIBS@
-VAPIGEN = @VAPIGEN@
-VAPIGEN_MAKEFILE = @VAPIGEN_MAKEFILE@
-VAPIGEN_VAPIDIR = @VAPIGEN_VAPIDIR@
-VERSION = @VERSION@
-XGETTEXT = @XGETTEXT@
-XGETTEXT_015 = @XGETTEXT_015@
-XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
-abs_builddir = @abs_builddir@
-abs_srcdir = @abs_srcdir@
-abs_top_builddir = @abs_top_builddir@
-abs_top_srcdir = @abs_top_srcdir@
-ac_ct_AR = @ac_ct_AR@
-ac_ct_CC = @ac_ct_CC@
-ac_ct_CXX = @ac_ct_CXX@
-ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-am__include = @am__include@
-am__leading_dot = @am__leading_dot@
-am__quote = @am__quote@
-am__tar = @am__tar@
-am__untar = @am__untar@
-bindir = @bindir@
-build = @build@
-build_alias = @build_alias@
-build_cpu = @build_cpu@
-build_os = @build_os@
-build_vendor = @build_vendor@
-builddir = @builddir@
-datadir = @datadir@
-datarootdir = @datarootdir@
-docdir = @docdir@
-dvidir = @dvidir@
-exec_prefix = @exec_prefix@
-host = @host@
-host_alias = @host_alias@
-host_cpu = @host_cpu@
-host_os = @host_os@
-host_vendor = @host_vendor@
-htmldir = @htmldir@
-includedir = @includedir@
-infodir = @infodir@
-install_sh = @install_sh@
-intltool__v_merge_options_ = @intltool__v_merge_options_@
-intltool__v_merge_options_0 = @intltool__v_merge_options_0@
-libdir = @libdir@
-libexecdir = @libexecdir@
-localedir = @localedir@
-localstatedir = @localstatedir@
-mandir = @mandir@
-mkdir_p = @mkdir_p@
-oldincludedir = @oldincludedir@
-pdfdir = @pdfdir@
-prefix = @prefix@
-program_transform_name = @program_transform_name@
-psdir = @psdir@
-sbindir = @sbindir@
-sharedstatedir = @sharedstatedir@
-srcdir = @srcdir@
-sysconfdir = @sysconfdir@
-systemdsystemunitdir = @systemdsystemunitdir@
-target_alias = @target_alias@
-top_build_prefix = @top_build_prefix@
-top_builddir = @top_builddir@
-top_srcdir = @top_srcdir@
-initddir = $(sysconfdir)/init.d
-initd_SCRIPTS = NetworkManager
-all: all-am
-
-.SUFFIXES:
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
-	@for dep in $?; do \
-	  case '$(am__configure_deps)' in \
-	    *$$dep*) \
-	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
-	        && { if test -f $@; then exit 0; else break; fi; }; \
-	      exit 1;; \
-	  esac; \
-	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu initscript/Debian/Makefile'; \
-	$(am__cd) $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu initscript/Debian/Makefile
-.PRECIOUS: Makefile
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-	@case '$?' in \
-	  *config.status*) \
-	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
-	  *) \
-	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
-	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
-	esac;
-
-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-
-$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(am__aclocal_m4_deps):
-NetworkManager: $(top_builddir)/config.status $(srcdir)/NetworkManager.in
-	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
-install-initdSCRIPTS: $(initd_SCRIPTS)
-	@$(NORMAL_INSTALL)
-	@list='$(initd_SCRIPTS)'; test -n "$(initddir)" || list=; \
-	if test -n "$$list"; then \
-	  echo " $(MKDIR_P) '$(DESTDIR)$(initddir)'"; \
-	  $(MKDIR_P) "$(DESTDIR)$(initddir)" || exit 1; \
-	fi; \
-	for p in $$list; do \
-	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-	  if test -f "$$d$$p"; then echo "$$d$$p"; echo "$$p"; else :; fi; \
-	done | \
-	sed -e 'p;s,.*/,,;n' \
-	    -e 'h;s|.*|.|' \
-	    -e 'p;x;s,.*/,,;$(transform)' | sed 'N;N;N;s,\n, ,g' | \
-	$(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1; } \
-	  { d=$$3; if (dirs[d] != 1) { print "d", d; dirs[d] = 1 } \
-	    if ($$2 == $$4) { files[d] = files[d] " " $$1; \
-	      if (++n[d] == $(am__install_max)) { \
-		print "f", d, files[d]; n[d] = 0; files[d] = "" } } \
-	    else { print "f", d "/" $$4, $$1 } } \
-	  END { for (d in files) print "f", d, files[d] }' | \
-	while read type dir files; do \
-	     if test "$$dir" = .; then dir=; else dir=/$$dir; fi; \
-	     test -z "$$files" || { \
-	       echo " $(INSTALL_SCRIPT) $$files '$(DESTDIR)$(initddir)$$dir'"; \
-	       $(INSTALL_SCRIPT) $$files "$(DESTDIR)$(initddir)$$dir" || exit $$?; \
-	     } \
-	; done
-
-uninstall-initdSCRIPTS:
-	@$(NORMAL_UNINSTALL)
-	@list='$(initd_SCRIPTS)'; test -n "$(initddir)" || exit 0; \
-	files=`for p in $$list; do echo "$$p"; done | \
-	       sed -e 's,.*/,,;$(transform)'`; \
-	dir='$(DESTDIR)$(initddir)'; $(am__uninstall_files_from_dir)
-
-mostlyclean-libtool:
-	-rm -f *.lo
-
-clean-libtool:
-	-rm -rf .libs _libs
-tags: TAGS
-TAGS:
-
-ctags: CTAGS
-CTAGS:
-
-
-distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-	list='$(DISTFILES)'; \
-	  dist_files=`for file in $$list; do echo $$file; done | \
-	  sed -e "s|^$$srcdirstrip/||;t" \
-	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
-	case $$dist_files in \
-	  */*) $(MKDIR_P) `echo "$$dist_files" | \
-			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
-			   sort -u` ;; \
-	esac; \
-	for file in $$dist_files; do \
-	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  if test -d $$d/$$file; then \
-	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
-	    if test -d "$(distdir)/$$file"; then \
-	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-	    fi; \
-	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
-	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-	    fi; \
-	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
-	  else \
-	    test -f "$(distdir)/$$file" \
-	    || cp -p $$d/$$file "$(distdir)/$$file" \
-	    || exit 1; \
-	  fi; \
-	done
-check-am: all-am
-check: check-am
-all-am: Makefile $(SCRIPTS)
-installdirs:
-	for dir in "$(DESTDIR)$(initddir)"; do \
-	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
-	done
-install: install-am
-install-exec: install-exec-am
-install-data: install-data-am
-uninstall: uninstall-am
-
-install-am: all-am
-	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-
-installcheck: installcheck-am
-install-strip:
-	if test -z '$(STRIP)'; then \
-	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	      install; \
-	else \
-	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
-	fi
-mostlyclean-generic:
-
-clean-generic:
-
-distclean-generic:
-	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
-
-maintainer-clean-generic:
-	@echo "This command is intended for maintainers to use"
-	@echo "it deletes files that may require special tools to rebuild."
-clean: clean-am
-
-clean-am: clean-generic clean-libtool mostlyclean-am
-
-distclean: distclean-am
-	-rm -f Makefile
-distclean-am: clean-am distclean-generic
-
-dvi: dvi-am
-
-dvi-am:
-
-html: html-am
-
-html-am:
-
-info: info-am
-
-info-am:
-
-install-data-am: install-initdSCRIPTS
-
-install-dvi: install-dvi-am
-
-install-dvi-am:
-
-install-exec-am:
-
-install-html: install-html-am
-
-install-html-am:
-
-install-info: install-info-am
-
-install-info-am:
-
-install-man:
-
-install-pdf: install-pdf-am
-
-install-pdf-am:
-
-install-ps: install-ps-am
-
-install-ps-am:
-
-installcheck-am:
-
-maintainer-clean: maintainer-clean-am
-	-rm -f Makefile
-maintainer-clean-am: distclean-am maintainer-clean-generic
-
-mostlyclean: mostlyclean-am
-
-mostlyclean-am: mostlyclean-generic mostlyclean-libtool
-
-pdf: pdf-am
-
-pdf-am:
-
-ps: ps-am
-
-ps-am:
-
-uninstall-am: uninstall-initdSCRIPTS
-
-.MAKE: install-am install-strip
-
-.PHONY: all all-am check check-am clean clean-generic clean-libtool \
-	distclean distclean-generic distclean-libtool distdir dvi \
-	dvi-am html html-am info info-am install install-am \
-	install-data install-data-am install-dvi install-dvi-am \
-	install-exec install-exec-am install-html install-html-am \
-	install-info install-info-am install-initdSCRIPTS install-man \
-	install-pdf install-pdf-am install-ps install-ps-am \
-	install-strip installcheck installcheck-am installdirs \
-	maintainer-clean maintainer-clean-generic mostlyclean \
-	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
-	uninstall uninstall-am uninstall-initdSCRIPTS
-
-
-# Tell versions [3.59,3.63) of GNU make to not export all variables.
-# Otherwise a system limit (for SysV at least) may be exceeded.
-.NOEXPORT:
diff --git a/initscript/Gentoo/Makefile.am b/initscript/Gentoo/Makefile.am
deleted file mode 100644
index a7356452..00000000
--- a/initscript/Gentoo/Makefile.am
+++ /dev/null
@@ -1,2 +0,0 @@
-initddir = $(sysconfdir)/init.d
-initd_SCRIPTS = NetworkManager
diff --git a/initscript/Gentoo/Makefile.in b/initscript/Gentoo/Makefile.in
deleted file mode 100644
index 5d92f541..00000000
--- a/initscript/Gentoo/Makefile.in
+++ /dev/null
@@ -1,587 +0,0 @@
-# Makefile.in generated by automake 1.11.6 from Makefile.am.
-# @configure_input@
-
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
-# Foundation, Inc.
-# This Makefile.in is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-@SET_MAKE@
-
-VPATH = @srcdir@
-am__make_dryrun = \
-  { \
-    am__dry=no; \
-    case $$MAKEFLAGS in \
-      *\\[\ \	]*) \
-        echo 'am--echo: ; @echo "AM"  OK' | $(MAKE) -f - 2>/dev/null \
-          | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
-      *) \
-        for am__flg in $$MAKEFLAGS; do \
-          case $$am__flg in \
-            *=*|--*) ;; \
-            *n*) am__dry=yes; break;; \
-          esac; \
-        done;; \
-    esac; \
-    test $$am__dry = yes; \
-  }
-pkgdatadir = $(datadir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
-pkglibexecdir = $(libexecdir)/@PACKAGE@
-am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-install_sh_DATA = $(install_sh) -c -m 644
-install_sh_PROGRAM = $(install_sh) -c
-install_sh_SCRIPT = $(install_sh) -c
-INSTALL_HEADER = $(INSTALL_DATA)
-transform = $(program_transform_name)
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-build_triplet = @build@
-host_triplet = @host@
-subdir = initscript/Gentoo
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
-	$(srcdir)/NetworkManager.in
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/compiler_warnings.m4 \
-	$(top_srcdir)/m4/gettext.m4 $(top_srcdir)/m4/gtk-doc.m4 \
-	$(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/intlmacosx.m4 \
-	$(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/introspection.m4 \
-	$(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \
-	$(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/libnl-check.m4 \
-	$(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \
-	$(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
-	$(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/nls.m4 \
-	$(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/progtest.m4 \
-	$(top_srcdir)/m4/vapigen.m4 $(top_srcdir)/configure.ac
-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
-	$(ACLOCAL_M4)
-mkinstalldirs = $(install_sh) -d
-CONFIG_HEADER = $(top_builddir)/config.h
-CONFIG_CLEAN_FILES = NetworkManager
-CONFIG_CLEAN_VPATH_FILES =
-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
-am__vpath_adj = case $$p in \
-    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
-    *) f=$$p;; \
-  esac;
-am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
-am__install_max = 40
-am__nobase_strip_setup = \
-  srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
-am__nobase_strip = \
-  for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
-am__nobase_list = $(am__nobase_strip_setup); \
-  for p in $$list; do echo "$$p $$p"; done | \
-  sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
-  $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
-    if (++n[$$2] == $(am__install_max)) \
-      { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
-    END { for (dir in files) print dir, files[dir] }'
-am__base_list = \
-  sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
-  sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
-am__uninstall_files_from_dir = { \
-  test -z "$$files" \
-    || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
-    || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
-         $(am__cd) "$$dir" && rm -f $$files; }; \
-  }
-am__installdirs = "$(DESTDIR)$(initddir)"
-SCRIPTS = $(initd_SCRIPTS)
-AM_V_GEN = $(am__v_GEN_@AM_V@)
-am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
-am__v_GEN_0 = @echo "  GEN   " $@;
-AM_V_at = $(am__v_at_@AM_V@)
-am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
-am__v_at_0 = @
-SOURCES =
-DIST_SOURCES =
-am__can_run_installinfo = \
-  case $$AM_UPDATE_INFO_DIR in \
-    n|no|NO) false;; \
-    *) (install-info --version) >/dev/null 2>&1;; \
-  esac
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-ACLOCAL = @ACLOCAL@
-ALL_LINGUAS = @ALL_LINGUAS@
-AMTAR = @AMTAR@
-AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
-AR = @AR@
-AUTOCONF = @AUTOCONF@
-AUTOHEADER = @AUTOHEADER@
-AUTOMAKE = @AUTOMAKE@
-AWK = @AWK@
-CC = @CC@
-CCDEPMODE = @CCDEPMODE@
-CFLAGS = @CFLAGS@
-CPP = @CPP@
-CPPFLAGS = @CPPFLAGS@
-CXX = @CXX@
-CXXCPP = @CXXCPP@
-CXXDEPMODE = @CXXDEPMODE@
-CXXFLAGS = @CXXFLAGS@
-CYGPATH_W = @CYGPATH_W@
-DATADIRNAME = @DATADIRNAME@
-DBUS_CFLAGS = @DBUS_CFLAGS@
-DBUS_LIBS = @DBUS_LIBS@
-DBUS_SYS_DIR = @DBUS_SYS_DIR@
-DEFS = @DEFS@
-DEPDIR = @DEPDIR@
-DHCLIENT_PATH = @DHCLIENT_PATH@
-DHCLIENT_VERSION = @DHCLIENT_VERSION@
-DHCPCD_PATH = @DHCPCD_PATH@
-DISABLE_DEPRECATED = @DISABLE_DEPRECATED@
-DLLTOOL = @DLLTOOL@
-DSYMUTIL = @DSYMUTIL@
-DUMPBIN = @DUMPBIN@
-ECHO_C = @ECHO_C@
-ECHO_N = @ECHO_N@
-ECHO_T = @ECHO_T@
-EGREP = @EGREP@
-EXEEXT = @EXEEXT@
-FGREP = @FGREP@
-GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
-GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
-GIO_CFLAGS = @GIO_CFLAGS@
-GIO_LIBS = @GIO_LIBS@
-GLIB_CFLAGS = @GLIB_CFLAGS@
-GLIB_GENMARSHAL = @GLIB_GENMARSHAL@
-GLIB_LIBS = @GLIB_LIBS@
-GLIB_MAKEFILE = @GLIB_MAKEFILE@
-GLIB_MKENUMS = @GLIB_MKENUMS@
-GMODULE_CFLAGS = @GMODULE_CFLAGS@
-GMODULE_LIBS = @GMODULE_LIBS@
-GMSGFMT = @GMSGFMT@
-GMSGFMT_015 = @GMSGFMT_015@
-GNUTLS_CFLAGS = @GNUTLS_CFLAGS@
-GNUTLS_LIBS = @GNUTLS_LIBS@
-GREP = @GREP@
-GTKDOC_CHECK = @GTKDOC_CHECK@
-GTKDOC_DEPS_CFLAGS = @GTKDOC_DEPS_CFLAGS@
-GTKDOC_DEPS_LIBS = @GTKDOC_DEPS_LIBS@
-GTKDOC_MKPDF = @GTKDOC_MKPDF@
-GTKDOC_REBASE = @GTKDOC_REBASE@
-GUDEV_CFLAGS = @GUDEV_CFLAGS@
-GUDEV_LIBS = @GUDEV_LIBS@
-HTML_DIR = @HTML_DIR@
-INSTALL = @INSTALL@
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-INTLLIBS = @INTLLIBS@
-INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
-INTLTOOL_MERGE = @INTLTOOL_MERGE@
-INTLTOOL_PERL = @INTLTOOL_PERL@
-INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
-INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@
-INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@
-INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@
-INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@
-INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
-INTROSPECTION_CFLAGS = @INTROSPECTION_CFLAGS@
-INTROSPECTION_COMPILER = @INTROSPECTION_COMPILER@
-INTROSPECTION_GENERATE = @INTROSPECTION_GENERATE@
-INTROSPECTION_GIRDIR = @INTROSPECTION_GIRDIR@
-INTROSPECTION_LIBS = @INTROSPECTION_LIBS@
-INTROSPECTION_MAKEFILE = @INTROSPECTION_MAKEFILE@
-INTROSPECTION_SCANNER = @INTROSPECTION_SCANNER@
-INTROSPECTION_TYPELIBDIR = @INTROSPECTION_TYPELIBDIR@
-IPTABLES_PATH = @IPTABLES_PATH@
-IWMX_SDK_CFLAGS = @IWMX_SDK_CFLAGS@
-IWMX_SDK_LIBS = @IWMX_SDK_LIBS@
-KERNEL_FIRMWARE_DIR = @KERNEL_FIRMWARE_DIR@
-LD = @LD@
-LDFLAGS = @LDFLAGS@
-LIBDL = @LIBDL@
-LIBGCRYPT_CFLAGS = @LIBGCRYPT_CFLAGS@
-LIBGCRYPT_CONFIG = @LIBGCRYPT_CONFIG@
-LIBGCRYPT_LIBS = @LIBGCRYPT_LIBS@
-LIBICONV = @LIBICONV@
-LIBINTL = @LIBINTL@
-LIBM = @LIBM@
-LIBNL1_CFLAGS = @LIBNL1_CFLAGS@
-LIBNL1_LIBS = @LIBNL1_LIBS@
-LIBNL2_CFLAGS = @LIBNL2_CFLAGS@
-LIBNL2_LIBS = @LIBNL2_LIBS@
-LIBNL3_CFLAGS = @LIBNL3_CFLAGS@
-LIBNL3_LIBS = @LIBNL3_LIBS@
-LIBNL_CFLAGS = @LIBNL_CFLAGS@
-LIBNL_GENL3_CFLAGS = @LIBNL_GENL3_CFLAGS@
-LIBNL_GENL3_LIBS = @LIBNL_GENL3_LIBS@
-LIBNL_LIBS = @LIBNL_LIBS@
-LIBNL_ROUTE3_CFLAGS = @LIBNL_ROUTE3_CFLAGS@
-LIBNL_ROUTE3_LIBS = @LIBNL_ROUTE3_LIBS@
-LIBOBJS = @LIBOBJS@
-LIBS = @LIBS@
-LIBSOUP_CFLAGS = @LIBSOUP_CFLAGS@
-LIBSOUP_LIBS = @LIBSOUP_LIBS@
-LIBTOOL = @LIBTOOL@
-LIPO = @LIPO@
-LN_S = @LN_S@
-LTLIBICONV = @LTLIBICONV@
-LTLIBINTL = @LTLIBINTL@
-LTLIBOBJS = @LTLIBOBJS@
-MAINT = @MAINT@
-MAKEINFO = @MAKEINFO@
-MANIFEST_TOOL = @MANIFEST_TOOL@
-MKDIR_P = @MKDIR_P@
-MOC = @MOC@
-MSGFMT = @MSGFMT@
-MSGFMT_015 = @MSGFMT_015@
-MSGMERGE = @MSGMERGE@
-NM = @NM@
-NMEDIT = @NMEDIT@
-NM_MAJOR_VERSION = @NM_MAJOR_VERSION@
-NM_MICRO_VERSION = @NM_MICRO_VERSION@
-NM_MINOR_VERSION = @NM_MINOR_VERSION@
-NM_VERSION = @NM_VERSION@
-NSS_CFLAGS = @NSS_CFLAGS@
-NSS_LIBS = @NSS_LIBS@
-OBJDUMP = @OBJDUMP@
-OBJEXT = @OBJEXT@
-OTOOL = @OTOOL@
-OTOOL64 = @OTOOL64@
-PACKAGE = @PACKAGE@
-PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-PACKAGE_NAME = @PACKAGE_NAME@
-PACKAGE_STRING = @PACKAGE_STRING@
-PACKAGE_TARNAME = @PACKAGE_TARNAME@
-PACKAGE_URL = @PACKAGE_URL@
-PACKAGE_VERSION = @PACKAGE_VERSION@
-PATH_SEPARATOR = @PATH_SEPARATOR@
-PKGCONFIG_PATH = @PKGCONFIG_PATH@
-PKG_CONFIG = @PKG_CONFIG@
-PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
-PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
-POLKIT_CFLAGS = @POLKIT_CFLAGS@
-POLKIT_LIBS = @POLKIT_LIBS@
-POSUB = @POSUB@
-PPPD_PLUGIN_DIR = @PPPD_PLUGIN_DIR@
-QT_CFLAGS = @QT_CFLAGS@
-QT_LIBS = @QT_LIBS@
-RANLIB = @RANLIB@
-RESOLVCONF_PATH = @RESOLVCONF_PATH@
-SED = @SED@
-SET_MAKE = @SET_MAKE@
-SHELL = @SHELL@
-STRIP = @STRIP@
-SYSTEMD_CFLAGS = @SYSTEMD_CFLAGS@
-SYSTEMD_LIBS = @SYSTEMD_LIBS@
-SYSTEM_CA_PATH = @SYSTEM_CA_PATH@
-UDEV_BASE_DIR = @UDEV_BASE_DIR@
-USE_NLS = @USE_NLS@
-UUID_CFLAGS = @UUID_CFLAGS@
-UUID_LIBS = @UUID_LIBS@
-VAPIGEN = @VAPIGEN@
-VAPIGEN_MAKEFILE = @VAPIGEN_MAKEFILE@
-VAPIGEN_VAPIDIR = @VAPIGEN_VAPIDIR@
-VERSION = @VERSION@
-XGETTEXT = @XGETTEXT@
-XGETTEXT_015 = @XGETTEXT_015@
-XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
-abs_builddir = @abs_builddir@
-abs_srcdir = @abs_srcdir@
-abs_top_builddir = @abs_top_builddir@
-abs_top_srcdir = @abs_top_srcdir@
-ac_ct_AR = @ac_ct_AR@
-ac_ct_CC = @ac_ct_CC@
-ac_ct_CXX = @ac_ct_CXX@
-ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-am__include = @am__include@
-am__leading_dot = @am__leading_dot@
-am__quote = @am__quote@
-am__tar = @am__tar@
-am__untar = @am__untar@
-bindir = @bindir@
-build = @build@
-build_alias = @build_alias@
-build_cpu = @build_cpu@
-build_os = @build_os@
-build_vendor = @build_vendor@
-builddir = @builddir@
-datadir = @datadir@
-datarootdir = @datarootdir@
-docdir = @docdir@
-dvidir = @dvidir@
-exec_prefix = @exec_prefix@
-host = @host@
-host_alias = @host_alias@
-host_cpu = @host_cpu@
-host_os = @host_os@
-host_vendor = @host_vendor@
-htmldir = @htmldir@
-includedir = @includedir@
-infodir = @infodir@
-install_sh = @install_sh@
-intltool__v_merge_options_ = @intltool__v_merge_options_@
-intltool__v_merge_options_0 = @intltool__v_merge_options_0@
-libdir = @libdir@
-libexecdir = @libexecdir@
-localedir = @localedir@
-localstatedir = @localstatedir@
-mandir = @mandir@
-mkdir_p = @mkdir_p@
-oldincludedir = @oldincludedir@
-pdfdir = @pdfdir@
-prefix = @prefix@
-program_transform_name = @program_transform_name@
-psdir = @psdir@
-sbindir = @sbindir@
-sharedstatedir = @sharedstatedir@
-srcdir = @srcdir@
-sysconfdir = @sysconfdir@
-systemdsystemunitdir = @systemdsystemunitdir@
-target_alias = @target_alias@
-top_build_prefix = @top_build_prefix@
-top_builddir = @top_builddir@
-top_srcdir = @top_srcdir@
-initddir = $(sysconfdir)/init.d
-initd_SCRIPTS = NetworkManager
-all: all-am
-
-.SUFFIXES:
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
-	@for dep in $?; do \
-	  case '$(am__configure_deps)' in \
-	    *$$dep*) \
-	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
-	        && { if test -f $@; then exit 0; else break; fi; }; \
-	      exit 1;; \
-	  esac; \
-	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu initscript/Gentoo/Makefile'; \
-	$(am__cd) $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu initscript/Gentoo/Makefile
-.PRECIOUS: Makefile
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-	@case '$?' in \
-	  *config.status*) \
-	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
-	  *) \
-	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
-	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
-	esac;
-
-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-
-$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(am__aclocal_m4_deps):
-NetworkManager: $(top_builddir)/config.status $(srcdir)/NetworkManager.in
-	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
-install-initdSCRIPTS: $(initd_SCRIPTS)
-	@$(NORMAL_INSTALL)
-	@list='$(initd_SCRIPTS)'; test -n "$(initddir)" || list=; \
-	if test -n "$$list"; then \
-	  echo " $(MKDIR_P) '$(DESTDIR)$(initddir)'"; \
-	  $(MKDIR_P) "$(DESTDIR)$(initddir)" || exit 1; \
-	fi; \
-	for p in $$list; do \
-	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-	  if test -f "$$d$$p"; then echo "$$d$$p"; echo "$$p"; else :; fi; \
-	done | \
-	sed -e 'p;s,.*/,,;n' \
-	    -e 'h;s|.*|.|' \
-	    -e 'p;x;s,.*/,,;$(transform)' | sed 'N;N;N;s,\n, ,g' | \
-	$(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1; } \
-	  { d=$$3; if (dirs[d] != 1) { print "d", d; dirs[d] = 1 } \
-	    if ($$2 == $$4) { files[d] = files[d] " " $$1; \
-	      if (++n[d] == $(am__install_max)) { \
-		print "f", d, files[d]; n[d] = 0; files[d] = "" } } \
-	    else { print "f", d "/" $$4, $$1 } } \
-	  END { for (d in files) print "f", d, files[d] }' | \
-	while read type dir files; do \
-	     if test "$$dir" = .; then dir=; else dir=/$$dir; fi; \
-	     test -z "$$files" || { \
-	       echo " $(INSTALL_SCRIPT) $$files '$(DESTDIR)$(initddir)$$dir'"; \
-	       $(INSTALL_SCRIPT) $$files "$(DESTDIR)$(initddir)$$dir" || exit $$?; \
-	     } \
-	; done
-
-uninstall-initdSCRIPTS:
-	@$(NORMAL_UNINSTALL)
-	@list='$(initd_SCRIPTS)'; test -n "$(initddir)" || exit 0; \
-	files=`for p in $$list; do echo "$$p"; done | \
-	       sed -e 's,.*/,,;$(transform)'`; \
-	dir='$(DESTDIR)$(initddir)'; $(am__uninstall_files_from_dir)
-
-mostlyclean-libtool:
-	-rm -f *.lo
-
-clean-libtool:
-	-rm -rf .libs _libs
-tags: TAGS
-TAGS:
-
-ctags: CTAGS
-CTAGS:
-
-
-distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-	list='$(DISTFILES)'; \
-	  dist_files=`for file in $$list; do echo $$file; done | \
-	  sed -e "s|^$$srcdirstrip/||;t" \
-	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
-	case $$dist_files in \
-	  */*) $(MKDIR_P) `echo "$$dist_files" | \
-			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
-			   sort -u` ;; \
-	esac; \
-	for file in $$dist_files; do \
-	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  if test -d $$d/$$file; then \
-	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
-	    if test -d "$(distdir)/$$file"; then \
-	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-	    fi; \
-	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
-	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-	    fi; \
-	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
-	  else \
-	    test -f "$(distdir)/$$file" \
-	    || cp -p $$d/$$file "$(distdir)/$$file" \
-	    || exit 1; \
-	  fi; \
-	done
-check-am: all-am
-check: check-am
-all-am: Makefile $(SCRIPTS)
-installdirs:
-	for dir in "$(DESTDIR)$(initddir)"; do \
-	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
-	done
-install: install-am
-install-exec: install-exec-am
-install-data: install-data-am
-uninstall: uninstall-am
-
-install-am: all-am
-	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-
-installcheck: installcheck-am
-install-strip:
-	if test -z '$(STRIP)'; then \
-	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	      install; \
-	else \
-	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
-	fi
-mostlyclean-generic:
-
-clean-generic:
-
-distclean-generic:
-	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
-
-maintainer-clean-generic:
-	@echo "This command is intended for maintainers to use"
-	@echo "it deletes files that may require special tools to rebuild."
-clean: clean-am
-
-clean-am: clean-generic clean-libtool mostlyclean-am
-
-distclean: distclean-am
-	-rm -f Makefile
-distclean-am: clean-am distclean-generic
-
-dvi: dvi-am
-
-dvi-am:
-
-html: html-am
-
-html-am:
-
-info: info-am
-
-info-am:
-
-install-data-am: install-initdSCRIPTS
-
-install-dvi: install-dvi-am
-
-install-dvi-am:
-
-install-exec-am:
-
-install-html: install-html-am
-
-install-html-am:
-
-install-info: install-info-am
-
-install-info-am:
-
-install-man:
-
-install-pdf: install-pdf-am
-
-install-pdf-am:
-
-install-ps: install-ps-am
-
-install-ps-am:
-
-installcheck-am:
-
-maintainer-clean: maintainer-clean-am
-	-rm -f Makefile
-maintainer-clean-am: distclean-am maintainer-clean-generic
-
-mostlyclean: mostlyclean-am
-
-mostlyclean-am: mostlyclean-generic mostlyclean-libtool
-
-pdf: pdf-am
-
-pdf-am:
-
-ps: ps-am
-
-ps-am:
-
-uninstall-am: uninstall-initdSCRIPTS
-
-.MAKE: install-am install-strip
-
-.PHONY: all all-am check check-am clean clean-generic clean-libtool \
-	distclean distclean-generic distclean-libtool distdir dvi \
-	dvi-am html html-am info info-am install install-am \
-	install-data install-data-am install-dvi install-dvi-am \
-	install-exec install-exec-am install-html install-html-am \
-	install-info install-info-am install-initdSCRIPTS install-man \
-	install-pdf install-pdf-am install-ps install-ps-am \
-	install-strip installcheck installcheck-am installdirs \
-	maintainer-clean maintainer-clean-generic mostlyclean \
-	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
-	uninstall uninstall-am uninstall-initdSCRIPTS
-
-
-# Tell versions [3.59,3.63) of GNU make to not export all variables.
-# Otherwise a system limit (for SysV at least) may be exceeded.
-.NOEXPORT:
diff --git a/initscript/Gentoo/NetworkManager.in b/initscript/Gentoo/NetworkManager.in
deleted file mode 100755
index 7db410be..00000000
--- a/initscript/Gentoo/NetworkManager.in
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/sbin/runscript
-# Copyright (c) 2008 Saleem Abdulrasool 
-# Distributed under the terms of the GNU General Purpose License v2
-# $Header: $
-
-depend() {
-   need dbus
-}
-
-start() {
-   ebegin "Starting NetworkManager"
-   start-stop-daemon --start --quiet --pidfile /var/run/NetworkManager.pid \
-      --exec /usr/sbin/NetworkManager -- --pid-file /var/run/NetworkManager.pid
-   eend $?
-}
-
-stop() {
-   ebegin "Stopping NetworkManager"
-   start-stop-daemon --stop --quiet --pidfile /var/run/NetworkManager.pid
-   eend $?
-}
-
-# vim: set ft=gentoo-init-d ts=3 sw=3 et:
diff --git a/initscript/Makefile.am b/initscript/Makefile.am
deleted file mode 100644
index 65555e3e..00000000
--- a/initscript/Makefile.am
+++ /dev/null
@@ -1,28 +0,0 @@
-SUBDIRS = 
-if TARGET_REDHAT
-SUBDIRS += RedHat
-endif
-if TARGET_GENTOO
-SUBDIRS += Gentoo
-endif
-if TARGET_DEBIAN
-SUBDIRS += Debian
-endif
-if TARGET_SLACKWARE
-SUBDIRS += Slackware
-endif
-if TARGET_SUSE
-SUBDIRS += SUSE
-endif
-if TARGET_ARCH
-SUBDIRS += Arch
-endif
-if TARGET_PALDO
-SUBDIRS += paldo
-endif
-if TARGET_MANDRIVA
-SUBDIRS += Mandriva
-endif
-if TARGET_LINEXA
-SUBDIRS += linexa
-endif
diff --git a/initscript/Makefile.in b/initscript/Makefile.in
deleted file mode 100644
index a3e18523..00000000
--- a/initscript/Makefile.in
+++ /dev/null
@@ -1,725 +0,0 @@
-# Makefile.in generated by automake 1.11.6 from Makefile.am.
-# @configure_input@
-
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
-# Foundation, Inc.
-# This Makefile.in is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-@SET_MAKE@
-VPATH = @srcdir@
-am__make_dryrun = \
-  { \
-    am__dry=no; \
-    case $$MAKEFLAGS in \
-      *\\[\ \	]*) \
-        echo 'am--echo: ; @echo "AM"  OK' | $(MAKE) -f - 2>/dev/null \
-          | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
-      *) \
-        for am__flg in $$MAKEFLAGS; do \
-          case $$am__flg in \
-            *=*|--*) ;; \
-            *n*) am__dry=yes; break;; \
-          esac; \
-        done;; \
-    esac; \
-    test $$am__dry = yes; \
-  }
-pkgdatadir = $(datadir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
-pkglibexecdir = $(libexecdir)/@PACKAGE@
-am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-install_sh_DATA = $(install_sh) -c -m 644
-install_sh_PROGRAM = $(install_sh) -c
-install_sh_SCRIPT = $(install_sh) -c
-INSTALL_HEADER = $(INSTALL_DATA)
-transform = $(program_transform_name)
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-build_triplet = @build@
-host_triplet = @host@
-@TARGET_REDHAT_TRUE@am__append_1 = RedHat
-@TARGET_GENTOO_TRUE@am__append_2 = Gentoo
-@TARGET_DEBIAN_TRUE@am__append_3 = Debian
-@TARGET_SLACKWARE_TRUE@am__append_4 = Slackware
-@TARGET_SUSE_TRUE@am__append_5 = SUSE
-@TARGET_ARCH_TRUE@am__append_6 = Arch
-@TARGET_PALDO_TRUE@am__append_7 = paldo
-@TARGET_MANDRIVA_TRUE@am__append_8 = Mandriva
-@TARGET_LINEXA_TRUE@am__append_9 = linexa
-subdir = initscript
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/compiler_warnings.m4 \
-	$(top_srcdir)/m4/gettext.m4 $(top_srcdir)/m4/gtk-doc.m4 \
-	$(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/intlmacosx.m4 \
-	$(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/introspection.m4 \
-	$(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \
-	$(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/libnl-check.m4 \
-	$(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \
-	$(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
-	$(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/nls.m4 \
-	$(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/progtest.m4 \
-	$(top_srcdir)/m4/vapigen.m4 $(top_srcdir)/configure.ac
-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
-	$(ACLOCAL_M4)
-mkinstalldirs = $(install_sh) -d
-CONFIG_HEADER = $(top_builddir)/config.h
-CONFIG_CLEAN_FILES =
-CONFIG_CLEAN_VPATH_FILES =
-AM_V_GEN = $(am__v_GEN_@AM_V@)
-am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
-am__v_GEN_0 = @echo "  GEN   " $@;
-AM_V_at = $(am__v_at_@AM_V@)
-am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
-am__v_at_0 = @
-SOURCES =
-DIST_SOURCES =
-RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
-	html-recursive info-recursive install-data-recursive \
-	install-dvi-recursive install-exec-recursive \
-	install-html-recursive install-info-recursive \
-	install-pdf-recursive install-ps-recursive install-recursive \
-	installcheck-recursive installdirs-recursive pdf-recursive \
-	ps-recursive uninstall-recursive
-am__can_run_installinfo = \
-  case $$AM_UPDATE_INFO_DIR in \
-    n|no|NO) false;; \
-    *) (install-info --version) >/dev/null 2>&1;; \
-  esac
-RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive	\
-  distclean-recursive maintainer-clean-recursive
-AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \
-	$(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \
-	distdir
-ETAGS = etags
-CTAGS = ctags
-DIST_SUBDIRS = RedHat Gentoo Debian Slackware SUSE Arch paldo Mandriva \
-	linexa
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-am__relativize = \
-  dir0=`pwd`; \
-  sed_first='s,^\([^/]*\)/.*$$,\1,'; \
-  sed_rest='s,^[^/]*/*,,'; \
-  sed_last='s,^.*/\([^/]*\)$$,\1,'; \
-  sed_butlast='s,/*[^/]*$$,,'; \
-  while test -n "$$dir1"; do \
-    first=`echo "$$dir1" | sed -e "$$sed_first"`; \
-    if test "$$first" != "."; then \
-      if test "$$first" = ".."; then \
-        dir2=`echo "$$dir0" | sed -e "$$sed_last"`/"$$dir2"; \
-        dir0=`echo "$$dir0" | sed -e "$$sed_butlast"`; \
-      else \
-        first2=`echo "$$dir2" | sed -e "$$sed_first"`; \
-        if test "$$first2" = "$$first"; then \
-          dir2=`echo "$$dir2" | sed -e "$$sed_rest"`; \
-        else \
-          dir2="../$$dir2"; \
-        fi; \
-        dir0="$$dir0"/"$$first"; \
-      fi; \
-    fi; \
-    dir1=`echo "$$dir1" | sed -e "$$sed_rest"`; \
-  done; \
-  reldir="$$dir2"
-ACLOCAL = @ACLOCAL@
-ALL_LINGUAS = @ALL_LINGUAS@
-AMTAR = @AMTAR@
-AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
-AR = @AR@
-AUTOCONF = @AUTOCONF@
-AUTOHEADER = @AUTOHEADER@
-AUTOMAKE = @AUTOMAKE@
-AWK = @AWK@
-CC = @CC@
-CCDEPMODE = @CCDEPMODE@
-CFLAGS = @CFLAGS@
-CPP = @CPP@
-CPPFLAGS = @CPPFLAGS@
-CXX = @CXX@
-CXXCPP = @CXXCPP@
-CXXDEPMODE = @CXXDEPMODE@
-CXXFLAGS = @CXXFLAGS@
-CYGPATH_W = @CYGPATH_W@
-DATADIRNAME = @DATADIRNAME@
-DBUS_CFLAGS = @DBUS_CFLAGS@
-DBUS_LIBS = @DBUS_LIBS@
-DBUS_SYS_DIR = @DBUS_SYS_DIR@
-DEFS = @DEFS@
-DEPDIR = @DEPDIR@
-DHCLIENT_PATH = @DHCLIENT_PATH@
-DHCLIENT_VERSION = @DHCLIENT_VERSION@
-DHCPCD_PATH = @DHCPCD_PATH@
-DISABLE_DEPRECATED = @DISABLE_DEPRECATED@
-DLLTOOL = @DLLTOOL@
-DSYMUTIL = @DSYMUTIL@
-DUMPBIN = @DUMPBIN@
-ECHO_C = @ECHO_C@
-ECHO_N = @ECHO_N@
-ECHO_T = @ECHO_T@
-EGREP = @EGREP@
-EXEEXT = @EXEEXT@
-FGREP = @FGREP@
-GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
-GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
-GIO_CFLAGS = @GIO_CFLAGS@
-GIO_LIBS = @GIO_LIBS@
-GLIB_CFLAGS = @GLIB_CFLAGS@
-GLIB_GENMARSHAL = @GLIB_GENMARSHAL@
-GLIB_LIBS = @GLIB_LIBS@
-GLIB_MAKEFILE = @GLIB_MAKEFILE@
-GLIB_MKENUMS = @GLIB_MKENUMS@
-GMODULE_CFLAGS = @GMODULE_CFLAGS@
-GMODULE_LIBS = @GMODULE_LIBS@
-GMSGFMT = @GMSGFMT@
-GMSGFMT_015 = @GMSGFMT_015@
-GNUTLS_CFLAGS = @GNUTLS_CFLAGS@
-GNUTLS_LIBS = @GNUTLS_LIBS@
-GREP = @GREP@
-GTKDOC_CHECK = @GTKDOC_CHECK@
-GTKDOC_DEPS_CFLAGS = @GTKDOC_DEPS_CFLAGS@
-GTKDOC_DEPS_LIBS = @GTKDOC_DEPS_LIBS@
-GTKDOC_MKPDF = @GTKDOC_MKPDF@
-GTKDOC_REBASE = @GTKDOC_REBASE@
-GUDEV_CFLAGS = @GUDEV_CFLAGS@
-GUDEV_LIBS = @GUDEV_LIBS@
-HTML_DIR = @HTML_DIR@
-INSTALL = @INSTALL@
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-INTLLIBS = @INTLLIBS@
-INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
-INTLTOOL_MERGE = @INTLTOOL_MERGE@
-INTLTOOL_PERL = @INTLTOOL_PERL@
-INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
-INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@
-INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@
-INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@
-INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@
-INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
-INTROSPECTION_CFLAGS = @INTROSPECTION_CFLAGS@
-INTROSPECTION_COMPILER = @INTROSPECTION_COMPILER@
-INTROSPECTION_GENERATE = @INTROSPECTION_GENERATE@
-INTROSPECTION_GIRDIR = @INTROSPECTION_GIRDIR@
-INTROSPECTION_LIBS = @INTROSPECTION_LIBS@
-INTROSPECTION_MAKEFILE = @INTROSPECTION_MAKEFILE@
-INTROSPECTION_SCANNER = @INTROSPECTION_SCANNER@
-INTROSPECTION_TYPELIBDIR = @INTROSPECTION_TYPELIBDIR@
-IPTABLES_PATH = @IPTABLES_PATH@
-IWMX_SDK_CFLAGS = @IWMX_SDK_CFLAGS@
-IWMX_SDK_LIBS = @IWMX_SDK_LIBS@
-KERNEL_FIRMWARE_DIR = @KERNEL_FIRMWARE_DIR@
-LD = @LD@
-LDFLAGS = @LDFLAGS@
-LIBDL = @LIBDL@
-LIBGCRYPT_CFLAGS = @LIBGCRYPT_CFLAGS@
-LIBGCRYPT_CONFIG = @LIBGCRYPT_CONFIG@
-LIBGCRYPT_LIBS = @LIBGCRYPT_LIBS@
-LIBICONV = @LIBICONV@
-LIBINTL = @LIBINTL@
-LIBM = @LIBM@
-LIBNL1_CFLAGS = @LIBNL1_CFLAGS@
-LIBNL1_LIBS = @LIBNL1_LIBS@
-LIBNL2_CFLAGS = @LIBNL2_CFLAGS@
-LIBNL2_LIBS = @LIBNL2_LIBS@
-LIBNL3_CFLAGS = @LIBNL3_CFLAGS@
-LIBNL3_LIBS = @LIBNL3_LIBS@
-LIBNL_CFLAGS = @LIBNL_CFLAGS@
-LIBNL_GENL3_CFLAGS = @LIBNL_GENL3_CFLAGS@
-LIBNL_GENL3_LIBS = @LIBNL_GENL3_LIBS@
-LIBNL_LIBS = @LIBNL_LIBS@
-LIBNL_ROUTE3_CFLAGS = @LIBNL_ROUTE3_CFLAGS@
-LIBNL_ROUTE3_LIBS = @LIBNL_ROUTE3_LIBS@
-LIBOBJS = @LIBOBJS@
-LIBS = @LIBS@
-LIBSOUP_CFLAGS = @LIBSOUP_CFLAGS@
-LIBSOUP_LIBS = @LIBSOUP_LIBS@
-LIBTOOL = @LIBTOOL@
-LIPO = @LIPO@
-LN_S = @LN_S@
-LTLIBICONV = @LTLIBICONV@
-LTLIBINTL = @LTLIBINTL@
-LTLIBOBJS = @LTLIBOBJS@
-MAINT = @MAINT@
-MAKEINFO = @MAKEINFO@
-MANIFEST_TOOL = @MANIFEST_TOOL@
-MKDIR_P = @MKDIR_P@
-MOC = @MOC@
-MSGFMT = @MSGFMT@
-MSGFMT_015 = @MSGFMT_015@
-MSGMERGE = @MSGMERGE@
-NM = @NM@
-NMEDIT = @NMEDIT@
-NM_MAJOR_VERSION = @NM_MAJOR_VERSION@
-NM_MICRO_VERSION = @NM_MICRO_VERSION@
-NM_MINOR_VERSION = @NM_MINOR_VERSION@
-NM_VERSION = @NM_VERSION@
-NSS_CFLAGS = @NSS_CFLAGS@
-NSS_LIBS = @NSS_LIBS@
-OBJDUMP = @OBJDUMP@
-OBJEXT = @OBJEXT@
-OTOOL = @OTOOL@
-OTOOL64 = @OTOOL64@
-PACKAGE = @PACKAGE@
-PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-PACKAGE_NAME = @PACKAGE_NAME@
-PACKAGE_STRING = @PACKAGE_STRING@
-PACKAGE_TARNAME = @PACKAGE_TARNAME@
-PACKAGE_URL = @PACKAGE_URL@
-PACKAGE_VERSION = @PACKAGE_VERSION@
-PATH_SEPARATOR = @PATH_SEPARATOR@
-PKGCONFIG_PATH = @PKGCONFIG_PATH@
-PKG_CONFIG = @PKG_CONFIG@
-PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
-PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
-POLKIT_CFLAGS = @POLKIT_CFLAGS@
-POLKIT_LIBS = @POLKIT_LIBS@
-POSUB = @POSUB@
-PPPD_PLUGIN_DIR = @PPPD_PLUGIN_DIR@
-QT_CFLAGS = @QT_CFLAGS@
-QT_LIBS = @QT_LIBS@
-RANLIB = @RANLIB@
-RESOLVCONF_PATH = @RESOLVCONF_PATH@
-SED = @SED@
-SET_MAKE = @SET_MAKE@
-SHELL = @SHELL@
-STRIP = @STRIP@
-SYSTEMD_CFLAGS = @SYSTEMD_CFLAGS@
-SYSTEMD_LIBS = @SYSTEMD_LIBS@
-SYSTEM_CA_PATH = @SYSTEM_CA_PATH@
-UDEV_BASE_DIR = @UDEV_BASE_DIR@
-USE_NLS = @USE_NLS@
-UUID_CFLAGS = @UUID_CFLAGS@
-UUID_LIBS = @UUID_LIBS@
-VAPIGEN = @VAPIGEN@
-VAPIGEN_MAKEFILE = @VAPIGEN_MAKEFILE@
-VAPIGEN_VAPIDIR = @VAPIGEN_VAPIDIR@
-VERSION = @VERSION@
-XGETTEXT = @XGETTEXT@
-XGETTEXT_015 = @XGETTEXT_015@
-XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
-abs_builddir = @abs_builddir@
-abs_srcdir = @abs_srcdir@
-abs_top_builddir = @abs_top_builddir@
-abs_top_srcdir = @abs_top_srcdir@
-ac_ct_AR = @ac_ct_AR@
-ac_ct_CC = @ac_ct_CC@
-ac_ct_CXX = @ac_ct_CXX@
-ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-am__include = @am__include@
-am__leading_dot = @am__leading_dot@
-am__quote = @am__quote@
-am__tar = @am__tar@
-am__untar = @am__untar@
-bindir = @bindir@
-build = @build@
-build_alias = @build_alias@
-build_cpu = @build_cpu@
-build_os = @build_os@
-build_vendor = @build_vendor@
-builddir = @builddir@
-datadir = @datadir@
-datarootdir = @datarootdir@
-docdir = @docdir@
-dvidir = @dvidir@
-exec_prefix = @exec_prefix@
-host = @host@
-host_alias = @host_alias@
-host_cpu = @host_cpu@
-host_os = @host_os@
-host_vendor = @host_vendor@
-htmldir = @htmldir@
-includedir = @includedir@
-infodir = @infodir@
-install_sh = @install_sh@
-intltool__v_merge_options_ = @intltool__v_merge_options_@
-intltool__v_merge_options_0 = @intltool__v_merge_options_0@
-libdir = @libdir@
-libexecdir = @libexecdir@
-localedir = @localedir@
-localstatedir = @localstatedir@
-mandir = @mandir@
-mkdir_p = @mkdir_p@
-oldincludedir = @oldincludedir@
-pdfdir = @pdfdir@
-prefix = @prefix@
-program_transform_name = @program_transform_name@
-psdir = @psdir@
-sbindir = @sbindir@
-sharedstatedir = @sharedstatedir@
-srcdir = @srcdir@
-sysconfdir = @sysconfdir@
-systemdsystemunitdir = @systemdsystemunitdir@
-target_alias = @target_alias@
-top_build_prefix = @top_build_prefix@
-top_builddir = @top_builddir@
-top_srcdir = @top_srcdir@
-SUBDIRS = $(am__append_1) $(am__append_2) $(am__append_3) \
-	$(am__append_4) $(am__append_5) $(am__append_6) \
-	$(am__append_7) $(am__append_8) $(am__append_9)
-all: all-recursive
-
-.SUFFIXES:
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
-	@for dep in $?; do \
-	  case '$(am__configure_deps)' in \
-	    *$$dep*) \
-	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
-	        && { if test -f $@; then exit 0; else break; fi; }; \
-	      exit 1;; \
-	  esac; \
-	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu initscript/Makefile'; \
-	$(am__cd) $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu initscript/Makefile
-.PRECIOUS: Makefile
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-	@case '$?' in \
-	  *config.status*) \
-	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
-	  *) \
-	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
-	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
-	esac;
-
-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-
-$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(am__aclocal_m4_deps):
-
-mostlyclean-libtool:
-	-rm -f *.lo
-
-clean-libtool:
-	-rm -rf .libs _libs
-
-# This directory's subdirectories are mostly independent; you can cd
-# into them and run `make' without going through this Makefile.
-# To change the values of `make' variables: instead of editing Makefiles,
-# (1) if the variable is set in `config.status', edit `config.status'
-#     (which will cause the Makefiles to be regenerated when you run `make');
-# (2) otherwise, pass the desired values on the `make' command line.
-$(RECURSIVE_TARGETS):
-	@fail= failcom='exit 1'; \
-	for f in x $$MAKEFLAGS; do \
-	  case $$f in \
-	    *=* | --[!k]*);; \
-	    *k*) failcom='fail=yes';; \
-	  esac; \
-	done; \
-	dot_seen=no; \
-	target=`echo $@ | sed s/-recursive//`; \
-	list='$(SUBDIRS)'; for subdir in $$list; do \
-	  echo "Making $$target in $$subdir"; \
-	  if test "$$subdir" = "."; then \
-	    dot_seen=yes; \
-	    local_target="$$target-am"; \
-	  else \
-	    local_target="$$target"; \
-	  fi; \
-	  ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-	  || eval $$failcom; \
-	done; \
-	if test "$$dot_seen" = "no"; then \
-	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-	fi; test -z "$$fail"
-
-$(RECURSIVE_CLEAN_TARGETS):
-	@fail= failcom='exit 1'; \
-	for f in x $$MAKEFLAGS; do \
-	  case $$f in \
-	    *=* | --[!k]*);; \
-	    *k*) failcom='fail=yes';; \
-	  esac; \
-	done; \
-	dot_seen=no; \
-	case "$@" in \
-	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-	  *) list='$(SUBDIRS)' ;; \
-	esac; \
-	rev=''; for subdir in $$list; do \
-	  if test "$$subdir" = "."; then :; else \
-	    rev="$$subdir $$rev"; \
-	  fi; \
-	done; \
-	rev="$$rev ."; \
-	target=`echo $@ | sed s/-recursive//`; \
-	for subdir in $$rev; do \
-	  echo "Making $$target in $$subdir"; \
-	  if test "$$subdir" = "."; then \
-	    local_target="$$target-am"; \
-	  else \
-	    local_target="$$target"; \
-	  fi; \
-	  ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-	  || eval $$failcom; \
-	done && test -z "$$fail"
-tags-recursive:
-	list='$(SUBDIRS)'; for subdir in $$list; do \
-	  test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
-	done
-ctags-recursive:
-	list='$(SUBDIRS)'; for subdir in $$list; do \
-	  test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
-	done
-
-ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
-	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	mkid -fID $$unique
-tags: TAGS
-
-TAGS: tags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
-	set x; \
-	here=`pwd`; \
-	if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
-	  include_option=--etags-include; \
-	  empty_fix=.; \
-	else \
-	  include_option=--include; \
-	  empty_fix=; \
-	fi; \
-	list='$(SUBDIRS)'; for subdir in $$list; do \
-	  if test "$$subdir" = .; then :; else \
-	    test ! -f $$subdir/TAGS || \
-	      set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \
-	  fi; \
-	done; \
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	shift; \
-	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
-	  test -n "$$unique" || unique=$$empty_fix; \
-	  if test $$# -gt 0; then \
-	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	      "$$@" $$unique; \
-	  else \
-	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	      $$unique; \
-	  fi; \
-	fi
-ctags: CTAGS
-CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	test -z "$(CTAGS_ARGS)$$unique" \
-	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
-	     $$unique
-
-GTAGS:
-	here=`$(am__cd) $(top_builddir) && pwd` \
-	  && $(am__cd) $(top_srcdir) \
-	  && gtags -i $(GTAGS_ARGS) "$$here"
-
-distclean-tags:
-	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-
-distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-	list='$(DISTFILES)'; \
-	  dist_files=`for file in $$list; do echo $$file; done | \
-	  sed -e "s|^$$srcdirstrip/||;t" \
-	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
-	case $$dist_files in \
-	  */*) $(MKDIR_P) `echo "$$dist_files" | \
-			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
-			   sort -u` ;; \
-	esac; \
-	for file in $$dist_files; do \
-	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  if test -d $$d/$$file; then \
-	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
-	    if test -d "$(distdir)/$$file"; then \
-	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-	    fi; \
-	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
-	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-	    fi; \
-	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
-	  else \
-	    test -f "$(distdir)/$$file" \
-	    || cp -p $$d/$$file "$(distdir)/$$file" \
-	    || exit 1; \
-	  fi; \
-	done
-	@list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
-	  if test "$$subdir" = .; then :; else \
-	    $(am__make_dryrun) \
-	      || test -d "$(distdir)/$$subdir" \
-	      || $(MKDIR_P) "$(distdir)/$$subdir" \
-	      || exit 1; \
-	    dir1=$$subdir; dir2="$(distdir)/$$subdir"; \
-	    $(am__relativize); \
-	    new_distdir=$$reldir; \
-	    dir1=$$subdir; dir2="$(top_distdir)"; \
-	    $(am__relativize); \
-	    new_top_distdir=$$reldir; \
-	    echo " (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir="$$new_top_distdir" distdir="$$new_distdir" \\"; \
-	    echo "     am__remove_distdir=: am__skip_length_check=: am__skip_mode_fix=: distdir)"; \
-	    ($(am__cd) $$subdir && \
-	      $(MAKE) $(AM_MAKEFLAGS) \
-	        top_distdir="$$new_top_distdir" \
-	        distdir="$$new_distdir" \
-		am__remove_distdir=: \
-		am__skip_length_check=: \
-		am__skip_mode_fix=: \
-	        distdir) \
-	      || exit 1; \
-	  fi; \
-	done
-check-am: all-am
-check: check-recursive
-all-am: Makefile
-installdirs: installdirs-recursive
-installdirs-am:
-install: install-recursive
-install-exec: install-exec-recursive
-install-data: install-data-recursive
-uninstall: uninstall-recursive
-
-install-am: all-am
-	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-
-installcheck: installcheck-recursive
-install-strip:
-	if test -z '$(STRIP)'; then \
-	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	      install; \
-	else \
-	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
-	fi
-mostlyclean-generic:
-
-clean-generic:
-
-distclean-generic:
-	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
-
-maintainer-clean-generic:
-	@echo "This command is intended for maintainers to use"
-	@echo "it deletes files that may require special tools to rebuild."
-clean: clean-recursive
-
-clean-am: clean-generic clean-libtool mostlyclean-am
-
-distclean: distclean-recursive
-	-rm -f Makefile
-distclean-am: clean-am distclean-generic distclean-tags
-
-dvi: dvi-recursive
-
-dvi-am:
-
-html: html-recursive
-
-html-am:
-
-info: info-recursive
-
-info-am:
-
-install-data-am:
-
-install-dvi: install-dvi-recursive
-
-install-dvi-am:
-
-install-exec-am:
-
-install-html: install-html-recursive
-
-install-html-am:
-
-install-info: install-info-recursive
-
-install-info-am:
-
-install-man:
-
-install-pdf: install-pdf-recursive
-
-install-pdf-am:
-
-install-ps: install-ps-recursive
-
-install-ps-am:
-
-installcheck-am:
-
-maintainer-clean: maintainer-clean-recursive
-	-rm -f Makefile
-maintainer-clean-am: distclean-am maintainer-clean-generic
-
-mostlyclean: mostlyclean-recursive
-
-mostlyclean-am: mostlyclean-generic mostlyclean-libtool
-
-pdf: pdf-recursive
-
-pdf-am:
-
-ps: ps-recursive
-
-ps-am:
-
-uninstall-am:
-
-.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) ctags-recursive \
-	install-am install-strip tags-recursive
-
-.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
-	all all-am check check-am clean clean-generic clean-libtool \
-	ctags ctags-recursive distclean distclean-generic \
-	distclean-libtool distclean-tags distdir dvi dvi-am html \
-	html-am info info-am install install-am install-data \
-	install-data-am install-dvi install-dvi-am install-exec \
-	install-exec-am install-html install-html-am install-info \
-	install-info-am install-man install-pdf install-pdf-am \
-	install-ps install-ps-am install-strip installcheck \
-	installcheck-am installdirs installdirs-am maintainer-clean \
-	maintainer-clean-generic mostlyclean mostlyclean-generic \
-	mostlyclean-libtool pdf pdf-am ps ps-am tags tags-recursive \
-	uninstall uninstall-am
-
-
-# Tell versions [3.59,3.63) of GNU make to not export all variables.
-# Otherwise a system limit (for SysV at least) may be exceeded.
-.NOEXPORT:
diff --git a/initscript/Mandriva/Makefile.am b/initscript/Mandriva/Makefile.am
deleted file mode 100644
index bdc99085..00000000
--- a/initscript/Mandriva/Makefile.am
+++ /dev/null
@@ -1,3 +0,0 @@
-initddir = $(sysconfdir)/rc.d/init.d
-initd_SCRIPTS = networkmanager
-
diff --git a/initscript/Mandriva/Makefile.in b/initscript/Mandriva/Makefile.in
deleted file mode 100644
index cdadbbd9..00000000
--- a/initscript/Mandriva/Makefile.in
+++ /dev/null
@@ -1,587 +0,0 @@
-# Makefile.in generated by automake 1.11.6 from Makefile.am.
-# @configure_input@
-
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
-# Foundation, Inc.
-# This Makefile.in is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-@SET_MAKE@
-
-VPATH = @srcdir@
-am__make_dryrun = \
-  { \
-    am__dry=no; \
-    case $$MAKEFLAGS in \
-      *\\[\ \	]*) \
-        echo 'am--echo: ; @echo "AM"  OK' | $(MAKE) -f - 2>/dev/null \
-          | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
-      *) \
-        for am__flg in $$MAKEFLAGS; do \
-          case $$am__flg in \
-            *=*|--*) ;; \
-            *n*) am__dry=yes; break;; \
-          esac; \
-        done;; \
-    esac; \
-    test $$am__dry = yes; \
-  }
-pkgdatadir = $(datadir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
-pkglibexecdir = $(libexecdir)/@PACKAGE@
-am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-install_sh_DATA = $(install_sh) -c -m 644
-install_sh_PROGRAM = $(install_sh) -c
-install_sh_SCRIPT = $(install_sh) -c
-INSTALL_HEADER = $(INSTALL_DATA)
-transform = $(program_transform_name)
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-build_triplet = @build@
-host_triplet = @host@
-subdir = initscript/Mandriva
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
-	$(srcdir)/networkmanager.in
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/compiler_warnings.m4 \
-	$(top_srcdir)/m4/gettext.m4 $(top_srcdir)/m4/gtk-doc.m4 \
-	$(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/intlmacosx.m4 \
-	$(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/introspection.m4 \
-	$(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \
-	$(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/libnl-check.m4 \
-	$(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \
-	$(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
-	$(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/nls.m4 \
-	$(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/progtest.m4 \
-	$(top_srcdir)/m4/vapigen.m4 $(top_srcdir)/configure.ac
-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
-	$(ACLOCAL_M4)
-mkinstalldirs = $(install_sh) -d
-CONFIG_HEADER = $(top_builddir)/config.h
-CONFIG_CLEAN_FILES = networkmanager
-CONFIG_CLEAN_VPATH_FILES =
-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
-am__vpath_adj = case $$p in \
-    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
-    *) f=$$p;; \
-  esac;
-am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
-am__install_max = 40
-am__nobase_strip_setup = \
-  srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
-am__nobase_strip = \
-  for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
-am__nobase_list = $(am__nobase_strip_setup); \
-  for p in $$list; do echo "$$p $$p"; done | \
-  sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
-  $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
-    if (++n[$$2] == $(am__install_max)) \
-      { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
-    END { for (dir in files) print dir, files[dir] }'
-am__base_list = \
-  sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
-  sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
-am__uninstall_files_from_dir = { \
-  test -z "$$files" \
-    || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
-    || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
-         $(am__cd) "$$dir" && rm -f $$files; }; \
-  }
-am__installdirs = "$(DESTDIR)$(initddir)"
-SCRIPTS = $(initd_SCRIPTS)
-AM_V_GEN = $(am__v_GEN_@AM_V@)
-am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
-am__v_GEN_0 = @echo "  GEN   " $@;
-AM_V_at = $(am__v_at_@AM_V@)
-am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
-am__v_at_0 = @
-SOURCES =
-DIST_SOURCES =
-am__can_run_installinfo = \
-  case $$AM_UPDATE_INFO_DIR in \
-    n|no|NO) false;; \
-    *) (install-info --version) >/dev/null 2>&1;; \
-  esac
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-ACLOCAL = @ACLOCAL@
-ALL_LINGUAS = @ALL_LINGUAS@
-AMTAR = @AMTAR@
-AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
-AR = @AR@
-AUTOCONF = @AUTOCONF@
-AUTOHEADER = @AUTOHEADER@
-AUTOMAKE = @AUTOMAKE@
-AWK = @AWK@
-CC = @CC@
-CCDEPMODE = @CCDEPMODE@
-CFLAGS = @CFLAGS@
-CPP = @CPP@
-CPPFLAGS = @CPPFLAGS@
-CXX = @CXX@
-CXXCPP = @CXXCPP@
-CXXDEPMODE = @CXXDEPMODE@
-CXXFLAGS = @CXXFLAGS@
-CYGPATH_W = @CYGPATH_W@
-DATADIRNAME = @DATADIRNAME@
-DBUS_CFLAGS = @DBUS_CFLAGS@
-DBUS_LIBS = @DBUS_LIBS@
-DBUS_SYS_DIR = @DBUS_SYS_DIR@
-DEFS = @DEFS@
-DEPDIR = @DEPDIR@
-DHCLIENT_PATH = @DHCLIENT_PATH@
-DHCLIENT_VERSION = @DHCLIENT_VERSION@
-DHCPCD_PATH = @DHCPCD_PATH@
-DISABLE_DEPRECATED = @DISABLE_DEPRECATED@
-DLLTOOL = @DLLTOOL@
-DSYMUTIL = @DSYMUTIL@
-DUMPBIN = @DUMPBIN@
-ECHO_C = @ECHO_C@
-ECHO_N = @ECHO_N@
-ECHO_T = @ECHO_T@
-EGREP = @EGREP@
-EXEEXT = @EXEEXT@
-FGREP = @FGREP@
-GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
-GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
-GIO_CFLAGS = @GIO_CFLAGS@
-GIO_LIBS = @GIO_LIBS@
-GLIB_CFLAGS = @GLIB_CFLAGS@
-GLIB_GENMARSHAL = @GLIB_GENMARSHAL@
-GLIB_LIBS = @GLIB_LIBS@
-GLIB_MAKEFILE = @GLIB_MAKEFILE@
-GLIB_MKENUMS = @GLIB_MKENUMS@
-GMODULE_CFLAGS = @GMODULE_CFLAGS@
-GMODULE_LIBS = @GMODULE_LIBS@
-GMSGFMT = @GMSGFMT@
-GMSGFMT_015 = @GMSGFMT_015@
-GNUTLS_CFLAGS = @GNUTLS_CFLAGS@
-GNUTLS_LIBS = @GNUTLS_LIBS@
-GREP = @GREP@
-GTKDOC_CHECK = @GTKDOC_CHECK@
-GTKDOC_DEPS_CFLAGS = @GTKDOC_DEPS_CFLAGS@
-GTKDOC_DEPS_LIBS = @GTKDOC_DEPS_LIBS@
-GTKDOC_MKPDF = @GTKDOC_MKPDF@
-GTKDOC_REBASE = @GTKDOC_REBASE@
-GUDEV_CFLAGS = @GUDEV_CFLAGS@
-GUDEV_LIBS = @GUDEV_LIBS@
-HTML_DIR = @HTML_DIR@
-INSTALL = @INSTALL@
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-INTLLIBS = @INTLLIBS@
-INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
-INTLTOOL_MERGE = @INTLTOOL_MERGE@
-INTLTOOL_PERL = @INTLTOOL_PERL@
-INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
-INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@
-INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@
-INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@
-INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@
-INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
-INTROSPECTION_CFLAGS = @INTROSPECTION_CFLAGS@
-INTROSPECTION_COMPILER = @INTROSPECTION_COMPILER@
-INTROSPECTION_GENERATE = @INTROSPECTION_GENERATE@
-INTROSPECTION_GIRDIR = @INTROSPECTION_GIRDIR@
-INTROSPECTION_LIBS = @INTROSPECTION_LIBS@
-INTROSPECTION_MAKEFILE = @INTROSPECTION_MAKEFILE@
-INTROSPECTION_SCANNER = @INTROSPECTION_SCANNER@
-INTROSPECTION_TYPELIBDIR = @INTROSPECTION_TYPELIBDIR@
-IPTABLES_PATH = @IPTABLES_PATH@
-IWMX_SDK_CFLAGS = @IWMX_SDK_CFLAGS@
-IWMX_SDK_LIBS = @IWMX_SDK_LIBS@
-KERNEL_FIRMWARE_DIR = @KERNEL_FIRMWARE_DIR@
-LD = @LD@
-LDFLAGS = @LDFLAGS@
-LIBDL = @LIBDL@
-LIBGCRYPT_CFLAGS = @LIBGCRYPT_CFLAGS@
-LIBGCRYPT_CONFIG = @LIBGCRYPT_CONFIG@
-LIBGCRYPT_LIBS = @LIBGCRYPT_LIBS@
-LIBICONV = @LIBICONV@
-LIBINTL = @LIBINTL@
-LIBM = @LIBM@
-LIBNL1_CFLAGS = @LIBNL1_CFLAGS@
-LIBNL1_LIBS = @LIBNL1_LIBS@
-LIBNL2_CFLAGS = @LIBNL2_CFLAGS@
-LIBNL2_LIBS = @LIBNL2_LIBS@
-LIBNL3_CFLAGS = @LIBNL3_CFLAGS@
-LIBNL3_LIBS = @LIBNL3_LIBS@
-LIBNL_CFLAGS = @LIBNL_CFLAGS@
-LIBNL_GENL3_CFLAGS = @LIBNL_GENL3_CFLAGS@
-LIBNL_GENL3_LIBS = @LIBNL_GENL3_LIBS@
-LIBNL_LIBS = @LIBNL_LIBS@
-LIBNL_ROUTE3_CFLAGS = @LIBNL_ROUTE3_CFLAGS@
-LIBNL_ROUTE3_LIBS = @LIBNL_ROUTE3_LIBS@
-LIBOBJS = @LIBOBJS@
-LIBS = @LIBS@
-LIBSOUP_CFLAGS = @LIBSOUP_CFLAGS@
-LIBSOUP_LIBS = @LIBSOUP_LIBS@
-LIBTOOL = @LIBTOOL@
-LIPO = @LIPO@
-LN_S = @LN_S@
-LTLIBICONV = @LTLIBICONV@
-LTLIBINTL = @LTLIBINTL@
-LTLIBOBJS = @LTLIBOBJS@
-MAINT = @MAINT@
-MAKEINFO = @MAKEINFO@
-MANIFEST_TOOL = @MANIFEST_TOOL@
-MKDIR_P = @MKDIR_P@
-MOC = @MOC@
-MSGFMT = @MSGFMT@
-MSGFMT_015 = @MSGFMT_015@
-MSGMERGE = @MSGMERGE@
-NM = @NM@
-NMEDIT = @NMEDIT@
-NM_MAJOR_VERSION = @NM_MAJOR_VERSION@
-NM_MICRO_VERSION = @NM_MICRO_VERSION@
-NM_MINOR_VERSION = @NM_MINOR_VERSION@
-NM_VERSION = @NM_VERSION@
-NSS_CFLAGS = @NSS_CFLAGS@
-NSS_LIBS = @NSS_LIBS@
-OBJDUMP = @OBJDUMP@
-OBJEXT = @OBJEXT@
-OTOOL = @OTOOL@
-OTOOL64 = @OTOOL64@
-PACKAGE = @PACKAGE@
-PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-PACKAGE_NAME = @PACKAGE_NAME@
-PACKAGE_STRING = @PACKAGE_STRING@
-PACKAGE_TARNAME = @PACKAGE_TARNAME@
-PACKAGE_URL = @PACKAGE_URL@
-PACKAGE_VERSION = @PACKAGE_VERSION@
-PATH_SEPARATOR = @PATH_SEPARATOR@
-PKGCONFIG_PATH = @PKGCONFIG_PATH@
-PKG_CONFIG = @PKG_CONFIG@
-PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
-PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
-POLKIT_CFLAGS = @POLKIT_CFLAGS@
-POLKIT_LIBS = @POLKIT_LIBS@
-POSUB = @POSUB@
-PPPD_PLUGIN_DIR = @PPPD_PLUGIN_DIR@
-QT_CFLAGS = @QT_CFLAGS@
-QT_LIBS = @QT_LIBS@
-RANLIB = @RANLIB@
-RESOLVCONF_PATH = @RESOLVCONF_PATH@
-SED = @SED@
-SET_MAKE = @SET_MAKE@
-SHELL = @SHELL@
-STRIP = @STRIP@
-SYSTEMD_CFLAGS = @SYSTEMD_CFLAGS@
-SYSTEMD_LIBS = @SYSTEMD_LIBS@
-SYSTEM_CA_PATH = @SYSTEM_CA_PATH@
-UDEV_BASE_DIR = @UDEV_BASE_DIR@
-USE_NLS = @USE_NLS@
-UUID_CFLAGS = @UUID_CFLAGS@
-UUID_LIBS = @UUID_LIBS@
-VAPIGEN = @VAPIGEN@
-VAPIGEN_MAKEFILE = @VAPIGEN_MAKEFILE@
-VAPIGEN_VAPIDIR = @VAPIGEN_VAPIDIR@
-VERSION = @VERSION@
-XGETTEXT = @XGETTEXT@
-XGETTEXT_015 = @XGETTEXT_015@
-XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
-abs_builddir = @abs_builddir@
-abs_srcdir = @abs_srcdir@
-abs_top_builddir = @abs_top_builddir@
-abs_top_srcdir = @abs_top_srcdir@
-ac_ct_AR = @ac_ct_AR@
-ac_ct_CC = @ac_ct_CC@
-ac_ct_CXX = @ac_ct_CXX@
-ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-am__include = @am__include@
-am__leading_dot = @am__leading_dot@
-am__quote = @am__quote@
-am__tar = @am__tar@
-am__untar = @am__untar@
-bindir = @bindir@
-build = @build@
-build_alias = @build_alias@
-build_cpu = @build_cpu@
-build_os = @build_os@
-build_vendor = @build_vendor@
-builddir = @builddir@
-datadir = @datadir@
-datarootdir = @datarootdir@
-docdir = @docdir@
-dvidir = @dvidir@
-exec_prefix = @exec_prefix@
-host = @host@
-host_alias = @host_alias@
-host_cpu = @host_cpu@
-host_os = @host_os@
-host_vendor = @host_vendor@
-htmldir = @htmldir@
-includedir = @includedir@
-infodir = @infodir@
-install_sh = @install_sh@
-intltool__v_merge_options_ = @intltool__v_merge_options_@
-intltool__v_merge_options_0 = @intltool__v_merge_options_0@
-libdir = @libdir@
-libexecdir = @libexecdir@
-localedir = @localedir@
-localstatedir = @localstatedir@
-mandir = @mandir@
-mkdir_p = @mkdir_p@
-oldincludedir = @oldincludedir@
-pdfdir = @pdfdir@
-prefix = @prefix@
-program_transform_name = @program_transform_name@
-psdir = @psdir@
-sbindir = @sbindir@
-sharedstatedir = @sharedstatedir@
-srcdir = @srcdir@
-sysconfdir = @sysconfdir@
-systemdsystemunitdir = @systemdsystemunitdir@
-target_alias = @target_alias@
-top_build_prefix = @top_build_prefix@
-top_builddir = @top_builddir@
-top_srcdir = @top_srcdir@
-initddir = $(sysconfdir)/rc.d/init.d
-initd_SCRIPTS = networkmanager
-all: all-am
-
-.SUFFIXES:
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
-	@for dep in $?; do \
-	  case '$(am__configure_deps)' in \
-	    *$$dep*) \
-	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
-	        && { if test -f $@; then exit 0; else break; fi; }; \
-	      exit 1;; \
-	  esac; \
-	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu initscript/Mandriva/Makefile'; \
-	$(am__cd) $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu initscript/Mandriva/Makefile
-.PRECIOUS: Makefile
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-	@case '$?' in \
-	  *config.status*) \
-	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
-	  *) \
-	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
-	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
-	esac;
-
-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-
-$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(am__aclocal_m4_deps):
-networkmanager: $(top_builddir)/config.status $(srcdir)/networkmanager.in
-	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
-install-initdSCRIPTS: $(initd_SCRIPTS)
-	@$(NORMAL_INSTALL)
-	@list='$(initd_SCRIPTS)'; test -n "$(initddir)" || list=; \
-	if test -n "$$list"; then \
-	  echo " $(MKDIR_P) '$(DESTDIR)$(initddir)'"; \
-	  $(MKDIR_P) "$(DESTDIR)$(initddir)" || exit 1; \
-	fi; \
-	for p in $$list; do \
-	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-	  if test -f "$$d$$p"; then echo "$$d$$p"; echo "$$p"; else :; fi; \
-	done | \
-	sed -e 'p;s,.*/,,;n' \
-	    -e 'h;s|.*|.|' \
-	    -e 'p;x;s,.*/,,;$(transform)' | sed 'N;N;N;s,\n, ,g' | \
-	$(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1; } \
-	  { d=$$3; if (dirs[d] != 1) { print "d", d; dirs[d] = 1 } \
-	    if ($$2 == $$4) { files[d] = files[d] " " $$1; \
-	      if (++n[d] == $(am__install_max)) { \
-		print "f", d, files[d]; n[d] = 0; files[d] = "" } } \
-	    else { print "f", d "/" $$4, $$1 } } \
-	  END { for (d in files) print "f", d, files[d] }' | \
-	while read type dir files; do \
-	     if test "$$dir" = .; then dir=; else dir=/$$dir; fi; \
-	     test -z "$$files" || { \
-	       echo " $(INSTALL_SCRIPT) $$files '$(DESTDIR)$(initddir)$$dir'"; \
-	       $(INSTALL_SCRIPT) $$files "$(DESTDIR)$(initddir)$$dir" || exit $$?; \
-	     } \
-	; done
-
-uninstall-initdSCRIPTS:
-	@$(NORMAL_UNINSTALL)
-	@list='$(initd_SCRIPTS)'; test -n "$(initddir)" || exit 0; \
-	files=`for p in $$list; do echo "$$p"; done | \
-	       sed -e 's,.*/,,;$(transform)'`; \
-	dir='$(DESTDIR)$(initddir)'; $(am__uninstall_files_from_dir)
-
-mostlyclean-libtool:
-	-rm -f *.lo
-
-clean-libtool:
-	-rm -rf .libs _libs
-tags: TAGS
-TAGS:
-
-ctags: CTAGS
-CTAGS:
-
-
-distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-	list='$(DISTFILES)'; \
-	  dist_files=`for file in $$list; do echo $$file; done | \
-	  sed -e "s|^$$srcdirstrip/||;t" \
-	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
-	case $$dist_files in \
-	  */*) $(MKDIR_P) `echo "$$dist_files" | \
-			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
-			   sort -u` ;; \
-	esac; \
-	for file in $$dist_files; do \
-	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  if test -d $$d/$$file; then \
-	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
-	    if test -d "$(distdir)/$$file"; then \
-	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-	    fi; \
-	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
-	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-	    fi; \
-	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
-	  else \
-	    test -f "$(distdir)/$$file" \
-	    || cp -p $$d/$$file "$(distdir)/$$file" \
-	    || exit 1; \
-	  fi; \
-	done
-check-am: all-am
-check: check-am
-all-am: Makefile $(SCRIPTS)
-installdirs:
-	for dir in "$(DESTDIR)$(initddir)"; do \
-	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
-	done
-install: install-am
-install-exec: install-exec-am
-install-data: install-data-am
-uninstall: uninstall-am
-
-install-am: all-am
-	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-
-installcheck: installcheck-am
-install-strip:
-	if test -z '$(STRIP)'; then \
-	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	      install; \
-	else \
-	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
-	fi
-mostlyclean-generic:
-
-clean-generic:
-
-distclean-generic:
-	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
-
-maintainer-clean-generic:
-	@echo "This command is intended for maintainers to use"
-	@echo "it deletes files that may require special tools to rebuild."
-clean: clean-am
-
-clean-am: clean-generic clean-libtool mostlyclean-am
-
-distclean: distclean-am
-	-rm -f Makefile
-distclean-am: clean-am distclean-generic
-
-dvi: dvi-am
-
-dvi-am:
-
-html: html-am
-
-html-am:
-
-info: info-am
-
-info-am:
-
-install-data-am: install-initdSCRIPTS
-
-install-dvi: install-dvi-am
-
-install-dvi-am:
-
-install-exec-am:
-
-install-html: install-html-am
-
-install-html-am:
-
-install-info: install-info-am
-
-install-info-am:
-
-install-man:
-
-install-pdf: install-pdf-am
-
-install-pdf-am:
-
-install-ps: install-ps-am
-
-install-ps-am:
-
-installcheck-am:
-
-maintainer-clean: maintainer-clean-am
-	-rm -f Makefile
-maintainer-clean-am: distclean-am maintainer-clean-generic
-
-mostlyclean: mostlyclean-am
-
-mostlyclean-am: mostlyclean-generic mostlyclean-libtool
-
-pdf: pdf-am
-
-pdf-am:
-
-ps: ps-am
-
-ps-am:
-
-uninstall-am: uninstall-initdSCRIPTS
-
-.MAKE: install-am install-strip
-
-.PHONY: all all-am check check-am clean clean-generic clean-libtool \
-	distclean distclean-generic distclean-libtool distdir dvi \
-	dvi-am html html-am info info-am install install-am \
-	install-data install-data-am install-dvi install-dvi-am \
-	install-exec install-exec-am install-html install-html-am \
-	install-info install-info-am install-initdSCRIPTS install-man \
-	install-pdf install-pdf-am install-ps install-ps-am \
-	install-strip installcheck installcheck-am installdirs \
-	maintainer-clean maintainer-clean-generic mostlyclean \
-	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
-	uninstall uninstall-am uninstall-initdSCRIPTS
-
-
-# Tell versions [3.59,3.63) of GNU make to not export all variables.
-# Otherwise a system limit (for SysV at least) may be exceeded.
-.NOEXPORT:
diff --git a/initscript/RedHat/Makefile.am b/initscript/RedHat/Makefile.am
deleted file mode 100644
index 62f5cf33..00000000
--- a/initscript/RedHat/Makefile.am
+++ /dev/null
@@ -1,6 +0,0 @@
-if !HAVE_SYSTEMD
-
-initddir = $(sysconfdir)/rc.d/init.d
-initd_SCRIPTS = NetworkManager
-
-endif
diff --git a/initscript/RedHat/Makefile.in b/initscript/RedHat/Makefile.in
deleted file mode 100644
index dd43c47d..00000000
--- a/initscript/RedHat/Makefile.in
+++ /dev/null
@@ -1,587 +0,0 @@
-# Makefile.in generated by automake 1.11.6 from Makefile.am.
-# @configure_input@
-
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
-# Foundation, Inc.
-# This Makefile.in is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-@SET_MAKE@
-
-VPATH = @srcdir@
-am__make_dryrun = \
-  { \
-    am__dry=no; \
-    case $$MAKEFLAGS in \
-      *\\[\ \	]*) \
-        echo 'am--echo: ; @echo "AM"  OK' | $(MAKE) -f - 2>/dev/null \
-          | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
-      *) \
-        for am__flg in $$MAKEFLAGS; do \
-          case $$am__flg in \
-            *=*|--*) ;; \
-            *n*) am__dry=yes; break;; \
-          esac; \
-        done;; \
-    esac; \
-    test $$am__dry = yes; \
-  }
-pkgdatadir = $(datadir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
-pkglibexecdir = $(libexecdir)/@PACKAGE@
-am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-install_sh_DATA = $(install_sh) -c -m 644
-install_sh_PROGRAM = $(install_sh) -c
-install_sh_SCRIPT = $(install_sh) -c
-INSTALL_HEADER = $(INSTALL_DATA)
-transform = $(program_transform_name)
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-build_triplet = @build@
-host_triplet = @host@
-subdir = initscript/RedHat
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
-	$(srcdir)/NetworkManager.in
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/compiler_warnings.m4 \
-	$(top_srcdir)/m4/gettext.m4 $(top_srcdir)/m4/gtk-doc.m4 \
-	$(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/intlmacosx.m4 \
-	$(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/introspection.m4 \
-	$(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \
-	$(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/libnl-check.m4 \
-	$(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \
-	$(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
-	$(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/nls.m4 \
-	$(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/progtest.m4 \
-	$(top_srcdir)/m4/vapigen.m4 $(top_srcdir)/configure.ac
-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
-	$(ACLOCAL_M4)
-mkinstalldirs = $(install_sh) -d
-CONFIG_HEADER = $(top_builddir)/config.h
-CONFIG_CLEAN_FILES = NetworkManager
-CONFIG_CLEAN_VPATH_FILES =
-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
-am__vpath_adj = case $$p in \
-    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
-    *) f=$$p;; \
-  esac;
-am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
-am__install_max = 40
-am__nobase_strip_setup = \
-  srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
-am__nobase_strip = \
-  for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
-am__nobase_list = $(am__nobase_strip_setup); \
-  for p in $$list; do echo "$$p $$p"; done | \
-  sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
-  $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
-    if (++n[$$2] == $(am__install_max)) \
-      { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
-    END { for (dir in files) print dir, files[dir] }'
-am__base_list = \
-  sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
-  sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
-am__uninstall_files_from_dir = { \
-  test -z "$$files" \
-    || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
-    || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
-         $(am__cd) "$$dir" && rm -f $$files; }; \
-  }
-am__installdirs = "$(DESTDIR)$(initddir)"
-SCRIPTS = $(initd_SCRIPTS)
-AM_V_GEN = $(am__v_GEN_@AM_V@)
-am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
-am__v_GEN_0 = @echo "  GEN   " $@;
-AM_V_at = $(am__v_at_@AM_V@)
-am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
-am__v_at_0 = @
-SOURCES =
-DIST_SOURCES =
-am__can_run_installinfo = \
-  case $$AM_UPDATE_INFO_DIR in \
-    n|no|NO) false;; \
-    *) (install-info --version) >/dev/null 2>&1;; \
-  esac
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-ACLOCAL = @ACLOCAL@
-ALL_LINGUAS = @ALL_LINGUAS@
-AMTAR = @AMTAR@
-AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
-AR = @AR@
-AUTOCONF = @AUTOCONF@
-AUTOHEADER = @AUTOHEADER@
-AUTOMAKE = @AUTOMAKE@
-AWK = @AWK@
-CC = @CC@
-CCDEPMODE = @CCDEPMODE@
-CFLAGS = @CFLAGS@
-CPP = @CPP@
-CPPFLAGS = @CPPFLAGS@
-CXX = @CXX@
-CXXCPP = @CXXCPP@
-CXXDEPMODE = @CXXDEPMODE@
-CXXFLAGS = @CXXFLAGS@
-CYGPATH_W = @CYGPATH_W@
-DATADIRNAME = @DATADIRNAME@
-DBUS_CFLAGS = @DBUS_CFLAGS@
-DBUS_LIBS = @DBUS_LIBS@
-DBUS_SYS_DIR = @DBUS_SYS_DIR@
-DEFS = @DEFS@
-DEPDIR = @DEPDIR@
-DHCLIENT_PATH = @DHCLIENT_PATH@
-DHCLIENT_VERSION = @DHCLIENT_VERSION@
-DHCPCD_PATH = @DHCPCD_PATH@
-DISABLE_DEPRECATED = @DISABLE_DEPRECATED@
-DLLTOOL = @DLLTOOL@
-DSYMUTIL = @DSYMUTIL@
-DUMPBIN = @DUMPBIN@
-ECHO_C = @ECHO_C@
-ECHO_N = @ECHO_N@
-ECHO_T = @ECHO_T@
-EGREP = @EGREP@
-EXEEXT = @EXEEXT@
-FGREP = @FGREP@
-GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
-GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
-GIO_CFLAGS = @GIO_CFLAGS@
-GIO_LIBS = @GIO_LIBS@
-GLIB_CFLAGS = @GLIB_CFLAGS@
-GLIB_GENMARSHAL = @GLIB_GENMARSHAL@
-GLIB_LIBS = @GLIB_LIBS@
-GLIB_MAKEFILE = @GLIB_MAKEFILE@
-GLIB_MKENUMS = @GLIB_MKENUMS@
-GMODULE_CFLAGS = @GMODULE_CFLAGS@
-GMODULE_LIBS = @GMODULE_LIBS@
-GMSGFMT = @GMSGFMT@
-GMSGFMT_015 = @GMSGFMT_015@
-GNUTLS_CFLAGS = @GNUTLS_CFLAGS@
-GNUTLS_LIBS = @GNUTLS_LIBS@
-GREP = @GREP@
-GTKDOC_CHECK = @GTKDOC_CHECK@
-GTKDOC_DEPS_CFLAGS = @GTKDOC_DEPS_CFLAGS@
-GTKDOC_DEPS_LIBS = @GTKDOC_DEPS_LIBS@
-GTKDOC_MKPDF = @GTKDOC_MKPDF@
-GTKDOC_REBASE = @GTKDOC_REBASE@
-GUDEV_CFLAGS = @GUDEV_CFLAGS@
-GUDEV_LIBS = @GUDEV_LIBS@
-HTML_DIR = @HTML_DIR@
-INSTALL = @INSTALL@
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-INTLLIBS = @INTLLIBS@
-INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
-INTLTOOL_MERGE = @INTLTOOL_MERGE@
-INTLTOOL_PERL = @INTLTOOL_PERL@
-INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
-INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@
-INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@
-INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@
-INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@
-INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
-INTROSPECTION_CFLAGS = @INTROSPECTION_CFLAGS@
-INTROSPECTION_COMPILER = @INTROSPECTION_COMPILER@
-INTROSPECTION_GENERATE = @INTROSPECTION_GENERATE@
-INTROSPECTION_GIRDIR = @INTROSPECTION_GIRDIR@
-INTROSPECTION_LIBS = @INTROSPECTION_LIBS@
-INTROSPECTION_MAKEFILE = @INTROSPECTION_MAKEFILE@
-INTROSPECTION_SCANNER = @INTROSPECTION_SCANNER@
-INTROSPECTION_TYPELIBDIR = @INTROSPECTION_TYPELIBDIR@
-IPTABLES_PATH = @IPTABLES_PATH@
-IWMX_SDK_CFLAGS = @IWMX_SDK_CFLAGS@
-IWMX_SDK_LIBS = @IWMX_SDK_LIBS@
-KERNEL_FIRMWARE_DIR = @KERNEL_FIRMWARE_DIR@
-LD = @LD@
-LDFLAGS = @LDFLAGS@
-LIBDL = @LIBDL@
-LIBGCRYPT_CFLAGS = @LIBGCRYPT_CFLAGS@
-LIBGCRYPT_CONFIG = @LIBGCRYPT_CONFIG@
-LIBGCRYPT_LIBS = @LIBGCRYPT_LIBS@
-LIBICONV = @LIBICONV@
-LIBINTL = @LIBINTL@
-LIBM = @LIBM@
-LIBNL1_CFLAGS = @LIBNL1_CFLAGS@
-LIBNL1_LIBS = @LIBNL1_LIBS@
-LIBNL2_CFLAGS = @LIBNL2_CFLAGS@
-LIBNL2_LIBS = @LIBNL2_LIBS@
-LIBNL3_CFLAGS = @LIBNL3_CFLAGS@
-LIBNL3_LIBS = @LIBNL3_LIBS@
-LIBNL_CFLAGS = @LIBNL_CFLAGS@
-LIBNL_GENL3_CFLAGS = @LIBNL_GENL3_CFLAGS@
-LIBNL_GENL3_LIBS = @LIBNL_GENL3_LIBS@
-LIBNL_LIBS = @LIBNL_LIBS@
-LIBNL_ROUTE3_CFLAGS = @LIBNL_ROUTE3_CFLAGS@
-LIBNL_ROUTE3_LIBS = @LIBNL_ROUTE3_LIBS@
-LIBOBJS = @LIBOBJS@
-LIBS = @LIBS@
-LIBSOUP_CFLAGS = @LIBSOUP_CFLAGS@
-LIBSOUP_LIBS = @LIBSOUP_LIBS@
-LIBTOOL = @LIBTOOL@
-LIPO = @LIPO@
-LN_S = @LN_S@
-LTLIBICONV = @LTLIBICONV@
-LTLIBINTL = @LTLIBINTL@
-LTLIBOBJS = @LTLIBOBJS@
-MAINT = @MAINT@
-MAKEINFO = @MAKEINFO@
-MANIFEST_TOOL = @MANIFEST_TOOL@
-MKDIR_P = @MKDIR_P@
-MOC = @MOC@
-MSGFMT = @MSGFMT@
-MSGFMT_015 = @MSGFMT_015@
-MSGMERGE = @MSGMERGE@
-NM = @NM@
-NMEDIT = @NMEDIT@
-NM_MAJOR_VERSION = @NM_MAJOR_VERSION@
-NM_MICRO_VERSION = @NM_MICRO_VERSION@
-NM_MINOR_VERSION = @NM_MINOR_VERSION@
-NM_VERSION = @NM_VERSION@
-NSS_CFLAGS = @NSS_CFLAGS@
-NSS_LIBS = @NSS_LIBS@
-OBJDUMP = @OBJDUMP@
-OBJEXT = @OBJEXT@
-OTOOL = @OTOOL@
-OTOOL64 = @OTOOL64@
-PACKAGE = @PACKAGE@
-PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-PACKAGE_NAME = @PACKAGE_NAME@
-PACKAGE_STRING = @PACKAGE_STRING@
-PACKAGE_TARNAME = @PACKAGE_TARNAME@
-PACKAGE_URL = @PACKAGE_URL@
-PACKAGE_VERSION = @PACKAGE_VERSION@
-PATH_SEPARATOR = @PATH_SEPARATOR@
-PKGCONFIG_PATH = @PKGCONFIG_PATH@
-PKG_CONFIG = @PKG_CONFIG@
-PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
-PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
-POLKIT_CFLAGS = @POLKIT_CFLAGS@
-POLKIT_LIBS = @POLKIT_LIBS@
-POSUB = @POSUB@
-PPPD_PLUGIN_DIR = @PPPD_PLUGIN_DIR@
-QT_CFLAGS = @QT_CFLAGS@
-QT_LIBS = @QT_LIBS@
-RANLIB = @RANLIB@
-RESOLVCONF_PATH = @RESOLVCONF_PATH@
-SED = @SED@
-SET_MAKE = @SET_MAKE@
-SHELL = @SHELL@
-STRIP = @STRIP@
-SYSTEMD_CFLAGS = @SYSTEMD_CFLAGS@
-SYSTEMD_LIBS = @SYSTEMD_LIBS@
-SYSTEM_CA_PATH = @SYSTEM_CA_PATH@
-UDEV_BASE_DIR = @UDEV_BASE_DIR@
-USE_NLS = @USE_NLS@
-UUID_CFLAGS = @UUID_CFLAGS@
-UUID_LIBS = @UUID_LIBS@
-VAPIGEN = @VAPIGEN@
-VAPIGEN_MAKEFILE = @VAPIGEN_MAKEFILE@
-VAPIGEN_VAPIDIR = @VAPIGEN_VAPIDIR@
-VERSION = @VERSION@
-XGETTEXT = @XGETTEXT@
-XGETTEXT_015 = @XGETTEXT_015@
-XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
-abs_builddir = @abs_builddir@
-abs_srcdir = @abs_srcdir@
-abs_top_builddir = @abs_top_builddir@
-abs_top_srcdir = @abs_top_srcdir@
-ac_ct_AR = @ac_ct_AR@
-ac_ct_CC = @ac_ct_CC@
-ac_ct_CXX = @ac_ct_CXX@
-ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-am__include = @am__include@
-am__leading_dot = @am__leading_dot@
-am__quote = @am__quote@
-am__tar = @am__tar@
-am__untar = @am__untar@
-bindir = @bindir@
-build = @build@
-build_alias = @build_alias@
-build_cpu = @build_cpu@
-build_os = @build_os@
-build_vendor = @build_vendor@
-builddir = @builddir@
-datadir = @datadir@
-datarootdir = @datarootdir@
-docdir = @docdir@
-dvidir = @dvidir@
-exec_prefix = @exec_prefix@
-host = @host@
-host_alias = @host_alias@
-host_cpu = @host_cpu@
-host_os = @host_os@
-host_vendor = @host_vendor@
-htmldir = @htmldir@
-includedir = @includedir@
-infodir = @infodir@
-install_sh = @install_sh@
-intltool__v_merge_options_ = @intltool__v_merge_options_@
-intltool__v_merge_options_0 = @intltool__v_merge_options_0@
-libdir = @libdir@
-libexecdir = @libexecdir@
-localedir = @localedir@
-localstatedir = @localstatedir@
-mandir = @mandir@
-mkdir_p = @mkdir_p@
-oldincludedir = @oldincludedir@
-pdfdir = @pdfdir@
-prefix = @prefix@
-program_transform_name = @program_transform_name@
-psdir = @psdir@
-sbindir = @sbindir@
-sharedstatedir = @sharedstatedir@
-srcdir = @srcdir@
-sysconfdir = @sysconfdir@
-systemdsystemunitdir = @systemdsystemunitdir@
-target_alias = @target_alias@
-top_build_prefix = @top_build_prefix@
-top_builddir = @top_builddir@
-top_srcdir = @top_srcdir@
-@HAVE_SYSTEMD_FALSE@initddir = $(sysconfdir)/rc.d/init.d
-@HAVE_SYSTEMD_FALSE@initd_SCRIPTS = NetworkManager
-all: all-am
-
-.SUFFIXES:
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
-	@for dep in $?; do \
-	  case '$(am__configure_deps)' in \
-	    *$$dep*) \
-	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
-	        && { if test -f $@; then exit 0; else break; fi; }; \
-	      exit 1;; \
-	  esac; \
-	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu initscript/RedHat/Makefile'; \
-	$(am__cd) $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu initscript/RedHat/Makefile
-.PRECIOUS: Makefile
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-	@case '$?' in \
-	  *config.status*) \
-	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
-	  *) \
-	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
-	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
-	esac;
-
-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-
-$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(am__aclocal_m4_deps):
-NetworkManager: $(top_builddir)/config.status $(srcdir)/NetworkManager.in
-	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
-install-initdSCRIPTS: $(initd_SCRIPTS)
-	@$(NORMAL_INSTALL)
-	@list='$(initd_SCRIPTS)'; test -n "$(initddir)" || list=; \
-	if test -n "$$list"; then \
-	  echo " $(MKDIR_P) '$(DESTDIR)$(initddir)'"; \
-	  $(MKDIR_P) "$(DESTDIR)$(initddir)" || exit 1; \
-	fi; \
-	for p in $$list; do \
-	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-	  if test -f "$$d$$p"; then echo "$$d$$p"; echo "$$p"; else :; fi; \
-	done | \
-	sed -e 'p;s,.*/,,;n' \
-	    -e 'h;s|.*|.|' \
-	    -e 'p;x;s,.*/,,;$(transform)' | sed 'N;N;N;s,\n, ,g' | \
-	$(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1; } \
-	  { d=$$3; if (dirs[d] != 1) { print "d", d; dirs[d] = 1 } \
-	    if ($$2 == $$4) { files[d] = files[d] " " $$1; \
-	      if (++n[d] == $(am__install_max)) { \
-		print "f", d, files[d]; n[d] = 0; files[d] = "" } } \
-	    else { print "f", d "/" $$4, $$1 } } \
-	  END { for (d in files) print "f", d, files[d] }' | \
-	while read type dir files; do \
-	     if test "$$dir" = .; then dir=; else dir=/$$dir; fi; \
-	     test -z "$$files" || { \
-	       echo " $(INSTALL_SCRIPT) $$files '$(DESTDIR)$(initddir)$$dir'"; \
-	       $(INSTALL_SCRIPT) $$files "$(DESTDIR)$(initddir)$$dir" || exit $$?; \
-	     } \
-	; done
-
-uninstall-initdSCRIPTS:
-	@$(NORMAL_UNINSTALL)
-	@list='$(initd_SCRIPTS)'; test -n "$(initddir)" || exit 0; \
-	files=`for p in $$list; do echo "$$p"; done | \
-	       sed -e 's,.*/,,;$(transform)'`; \
-	dir='$(DESTDIR)$(initddir)'; $(am__uninstall_files_from_dir)
-
-mostlyclean-libtool:
-	-rm -f *.lo
-
-clean-libtool:
-	-rm -rf .libs _libs
-tags: TAGS
-TAGS:
-
-ctags: CTAGS
-CTAGS:
-
-
-distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-	list='$(DISTFILES)'; \
-	  dist_files=`for file in $$list; do echo $$file; done | \
-	  sed -e "s|^$$srcdirstrip/||;t" \
-	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
-	case $$dist_files in \
-	  */*) $(MKDIR_P) `echo "$$dist_files" | \
-			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
-			   sort -u` ;; \
-	esac; \
-	for file in $$dist_files; do \
-	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  if test -d $$d/$$file; then \
-	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
-	    if test -d "$(distdir)/$$file"; then \
-	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-	    fi; \
-	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
-	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-	    fi; \
-	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
-	  else \
-	    test -f "$(distdir)/$$file" \
-	    || cp -p $$d/$$file "$(distdir)/$$file" \
-	    || exit 1; \
-	  fi; \
-	done
-check-am: all-am
-check: check-am
-all-am: Makefile $(SCRIPTS)
-installdirs:
-	for dir in "$(DESTDIR)$(initddir)"; do \
-	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
-	done
-install: install-am
-install-exec: install-exec-am
-install-data: install-data-am
-uninstall: uninstall-am
-
-install-am: all-am
-	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-
-installcheck: installcheck-am
-install-strip:
-	if test -z '$(STRIP)'; then \
-	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	      install; \
-	else \
-	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
-	fi
-mostlyclean-generic:
-
-clean-generic:
-
-distclean-generic:
-	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
-
-maintainer-clean-generic:
-	@echo "This command is intended for maintainers to use"
-	@echo "it deletes files that may require special tools to rebuild."
-clean: clean-am
-
-clean-am: clean-generic clean-libtool mostlyclean-am
-
-distclean: distclean-am
-	-rm -f Makefile
-distclean-am: clean-am distclean-generic
-
-dvi: dvi-am
-
-dvi-am:
-
-html: html-am
-
-html-am:
-
-info: info-am
-
-info-am:
-
-install-data-am: install-initdSCRIPTS
-
-install-dvi: install-dvi-am
-
-install-dvi-am:
-
-install-exec-am:
-
-install-html: install-html-am
-
-install-html-am:
-
-install-info: install-info-am
-
-install-info-am:
-
-install-man:
-
-install-pdf: install-pdf-am
-
-install-pdf-am:
-
-install-ps: install-ps-am
-
-install-ps-am:
-
-installcheck-am:
-
-maintainer-clean: maintainer-clean-am
-	-rm -f Makefile
-maintainer-clean-am: distclean-am maintainer-clean-generic
-
-mostlyclean: mostlyclean-am
-
-mostlyclean-am: mostlyclean-generic mostlyclean-libtool
-
-pdf: pdf-am
-
-pdf-am:
-
-ps: ps-am
-
-ps-am:
-
-uninstall-am: uninstall-initdSCRIPTS
-
-.MAKE: install-am install-strip
-
-.PHONY: all all-am check check-am clean clean-generic clean-libtool \
-	distclean distclean-generic distclean-libtool distdir dvi \
-	dvi-am html html-am info info-am install install-am \
-	install-data install-data-am install-dvi install-dvi-am \
-	install-exec install-exec-am install-html install-html-am \
-	install-info install-info-am install-initdSCRIPTS install-man \
-	install-pdf install-pdf-am install-ps install-ps-am \
-	install-strip installcheck installcheck-am installdirs \
-	maintainer-clean maintainer-clean-generic mostlyclean \
-	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
-	uninstall uninstall-am uninstall-initdSCRIPTS
-
-
-# Tell versions [3.59,3.63) of GNU make to not export all variables.
-# Otherwise a system limit (for SysV at least) may be exceeded.
-.NOEXPORT:
diff --git a/initscript/SUSE/Makefile.am b/initscript/SUSE/Makefile.am
deleted file mode 100644
index 4938e3e1..00000000
--- a/initscript/SUSE/Makefile.am
+++ /dev/null
@@ -1,5 +0,0 @@
-# Nowadays, NetworkManager support is built-in to the SUSE networking
-# subsystem, therefore a SUSE machine does not want these scripts.  Uncomment
-# this if you actually want external initscripts, such as SUSE 10.0 or earlier.
-#initddir = $(sysconfdir)/init.d
-#initd_SCRIPTS = networkmanager
diff --git a/initscript/SUSE/Makefile.in b/initscript/SUSE/Makefile.in
deleted file mode 100644
index e14f9304..00000000
--- a/initscript/SUSE/Makefile.in
+++ /dev/null
@@ -1,522 +0,0 @@
-# Makefile.in generated by automake 1.11.6 from Makefile.am.
-# @configure_input@
-
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
-# Foundation, Inc.
-# This Makefile.in is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-@SET_MAKE@
-VPATH = @srcdir@
-am__make_dryrun = \
-  { \
-    am__dry=no; \
-    case $$MAKEFLAGS in \
-      *\\[\ \	]*) \
-        echo 'am--echo: ; @echo "AM"  OK' | $(MAKE) -f - 2>/dev/null \
-          | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
-      *) \
-        for am__flg in $$MAKEFLAGS; do \
-          case $$am__flg in \
-            *=*|--*) ;; \
-            *n*) am__dry=yes; break;; \
-          esac; \
-        done;; \
-    esac; \
-    test $$am__dry = yes; \
-  }
-pkgdatadir = $(datadir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
-pkglibexecdir = $(libexecdir)/@PACKAGE@
-am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-install_sh_DATA = $(install_sh) -c -m 644
-install_sh_PROGRAM = $(install_sh) -c
-install_sh_SCRIPT = $(install_sh) -c
-INSTALL_HEADER = $(INSTALL_DATA)
-transform = $(program_transform_name)
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-build_triplet = @build@
-host_triplet = @host@
-subdir = initscript/SUSE
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
-	$(srcdir)/networkmanager.in
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/compiler_warnings.m4 \
-	$(top_srcdir)/m4/gettext.m4 $(top_srcdir)/m4/gtk-doc.m4 \
-	$(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/intlmacosx.m4 \
-	$(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/introspection.m4 \
-	$(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \
-	$(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/libnl-check.m4 \
-	$(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \
-	$(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
-	$(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/nls.m4 \
-	$(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/progtest.m4 \
-	$(top_srcdir)/m4/vapigen.m4 $(top_srcdir)/configure.ac
-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
-	$(ACLOCAL_M4)
-mkinstalldirs = $(install_sh) -d
-CONFIG_HEADER = $(top_builddir)/config.h
-CONFIG_CLEAN_FILES = networkmanager
-CONFIG_CLEAN_VPATH_FILES =
-AM_V_GEN = $(am__v_GEN_@AM_V@)
-am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
-am__v_GEN_0 = @echo "  GEN   " $@;
-AM_V_at = $(am__v_at_@AM_V@)
-am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
-am__v_at_0 = @
-SOURCES =
-DIST_SOURCES =
-am__can_run_installinfo = \
-  case $$AM_UPDATE_INFO_DIR in \
-    n|no|NO) false;; \
-    *) (install-info --version) >/dev/null 2>&1;; \
-  esac
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-ACLOCAL = @ACLOCAL@
-ALL_LINGUAS = @ALL_LINGUAS@
-AMTAR = @AMTAR@
-AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
-AR = @AR@
-AUTOCONF = @AUTOCONF@
-AUTOHEADER = @AUTOHEADER@
-AUTOMAKE = @AUTOMAKE@
-AWK = @AWK@
-CC = @CC@
-CCDEPMODE = @CCDEPMODE@
-CFLAGS = @CFLAGS@
-CPP = @CPP@
-CPPFLAGS = @CPPFLAGS@
-CXX = @CXX@
-CXXCPP = @CXXCPP@
-CXXDEPMODE = @CXXDEPMODE@
-CXXFLAGS = @CXXFLAGS@
-CYGPATH_W = @CYGPATH_W@
-DATADIRNAME = @DATADIRNAME@
-DBUS_CFLAGS = @DBUS_CFLAGS@
-DBUS_LIBS = @DBUS_LIBS@
-DBUS_SYS_DIR = @DBUS_SYS_DIR@
-DEFS = @DEFS@
-DEPDIR = @DEPDIR@
-DHCLIENT_PATH = @DHCLIENT_PATH@
-DHCLIENT_VERSION = @DHCLIENT_VERSION@
-DHCPCD_PATH = @DHCPCD_PATH@
-DISABLE_DEPRECATED = @DISABLE_DEPRECATED@
-DLLTOOL = @DLLTOOL@
-DSYMUTIL = @DSYMUTIL@
-DUMPBIN = @DUMPBIN@
-ECHO_C = @ECHO_C@
-ECHO_N = @ECHO_N@
-ECHO_T = @ECHO_T@
-EGREP = @EGREP@
-EXEEXT = @EXEEXT@
-FGREP = @FGREP@
-GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
-GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
-GIO_CFLAGS = @GIO_CFLAGS@
-GIO_LIBS = @GIO_LIBS@
-GLIB_CFLAGS = @GLIB_CFLAGS@
-GLIB_GENMARSHAL = @GLIB_GENMARSHAL@
-GLIB_LIBS = @GLIB_LIBS@
-GLIB_MAKEFILE = @GLIB_MAKEFILE@
-GLIB_MKENUMS = @GLIB_MKENUMS@
-GMODULE_CFLAGS = @GMODULE_CFLAGS@
-GMODULE_LIBS = @GMODULE_LIBS@
-GMSGFMT = @GMSGFMT@
-GMSGFMT_015 = @GMSGFMT_015@
-GNUTLS_CFLAGS = @GNUTLS_CFLAGS@
-GNUTLS_LIBS = @GNUTLS_LIBS@
-GREP = @GREP@
-GTKDOC_CHECK = @GTKDOC_CHECK@
-GTKDOC_DEPS_CFLAGS = @GTKDOC_DEPS_CFLAGS@
-GTKDOC_DEPS_LIBS = @GTKDOC_DEPS_LIBS@
-GTKDOC_MKPDF = @GTKDOC_MKPDF@
-GTKDOC_REBASE = @GTKDOC_REBASE@
-GUDEV_CFLAGS = @GUDEV_CFLAGS@
-GUDEV_LIBS = @GUDEV_LIBS@
-HTML_DIR = @HTML_DIR@
-INSTALL = @INSTALL@
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-INTLLIBS = @INTLLIBS@
-INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
-INTLTOOL_MERGE = @INTLTOOL_MERGE@
-INTLTOOL_PERL = @INTLTOOL_PERL@
-INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
-INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@
-INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@
-INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@
-INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@
-INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
-INTROSPECTION_CFLAGS = @INTROSPECTION_CFLAGS@
-INTROSPECTION_COMPILER = @INTROSPECTION_COMPILER@
-INTROSPECTION_GENERATE = @INTROSPECTION_GENERATE@
-INTROSPECTION_GIRDIR = @INTROSPECTION_GIRDIR@
-INTROSPECTION_LIBS = @INTROSPECTION_LIBS@
-INTROSPECTION_MAKEFILE = @INTROSPECTION_MAKEFILE@
-INTROSPECTION_SCANNER = @INTROSPECTION_SCANNER@
-INTROSPECTION_TYPELIBDIR = @INTROSPECTION_TYPELIBDIR@
-IPTABLES_PATH = @IPTABLES_PATH@
-IWMX_SDK_CFLAGS = @IWMX_SDK_CFLAGS@
-IWMX_SDK_LIBS = @IWMX_SDK_LIBS@
-KERNEL_FIRMWARE_DIR = @KERNEL_FIRMWARE_DIR@
-LD = @LD@
-LDFLAGS = @LDFLAGS@
-LIBDL = @LIBDL@
-LIBGCRYPT_CFLAGS = @LIBGCRYPT_CFLAGS@
-LIBGCRYPT_CONFIG = @LIBGCRYPT_CONFIG@
-LIBGCRYPT_LIBS = @LIBGCRYPT_LIBS@
-LIBICONV = @LIBICONV@
-LIBINTL = @LIBINTL@
-LIBM = @LIBM@
-LIBNL1_CFLAGS = @LIBNL1_CFLAGS@
-LIBNL1_LIBS = @LIBNL1_LIBS@
-LIBNL2_CFLAGS = @LIBNL2_CFLAGS@
-LIBNL2_LIBS = @LIBNL2_LIBS@
-LIBNL3_CFLAGS = @LIBNL3_CFLAGS@
-LIBNL3_LIBS = @LIBNL3_LIBS@
-LIBNL_CFLAGS = @LIBNL_CFLAGS@
-LIBNL_GENL3_CFLAGS = @LIBNL_GENL3_CFLAGS@
-LIBNL_GENL3_LIBS = @LIBNL_GENL3_LIBS@
-LIBNL_LIBS = @LIBNL_LIBS@
-LIBNL_ROUTE3_CFLAGS = @LIBNL_ROUTE3_CFLAGS@
-LIBNL_ROUTE3_LIBS = @LIBNL_ROUTE3_LIBS@
-LIBOBJS = @LIBOBJS@
-LIBS = @LIBS@
-LIBSOUP_CFLAGS = @LIBSOUP_CFLAGS@
-LIBSOUP_LIBS = @LIBSOUP_LIBS@
-LIBTOOL = @LIBTOOL@
-LIPO = @LIPO@
-LN_S = @LN_S@
-LTLIBICONV = @LTLIBICONV@
-LTLIBINTL = @LTLIBINTL@
-LTLIBOBJS = @LTLIBOBJS@
-MAINT = @MAINT@
-MAKEINFO = @MAKEINFO@
-MANIFEST_TOOL = @MANIFEST_TOOL@
-MKDIR_P = @MKDIR_P@
-MOC = @MOC@
-MSGFMT = @MSGFMT@
-MSGFMT_015 = @MSGFMT_015@
-MSGMERGE = @MSGMERGE@
-NM = @NM@
-NMEDIT = @NMEDIT@
-NM_MAJOR_VERSION = @NM_MAJOR_VERSION@
-NM_MICRO_VERSION = @NM_MICRO_VERSION@
-NM_MINOR_VERSION = @NM_MINOR_VERSION@
-NM_VERSION = @NM_VERSION@
-NSS_CFLAGS = @NSS_CFLAGS@
-NSS_LIBS = @NSS_LIBS@
-OBJDUMP = @OBJDUMP@
-OBJEXT = @OBJEXT@
-OTOOL = @OTOOL@
-OTOOL64 = @OTOOL64@
-PACKAGE = @PACKAGE@
-PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-PACKAGE_NAME = @PACKAGE_NAME@
-PACKAGE_STRING = @PACKAGE_STRING@
-PACKAGE_TARNAME = @PACKAGE_TARNAME@
-PACKAGE_URL = @PACKAGE_URL@
-PACKAGE_VERSION = @PACKAGE_VERSION@
-PATH_SEPARATOR = @PATH_SEPARATOR@
-PKGCONFIG_PATH = @PKGCONFIG_PATH@
-PKG_CONFIG = @PKG_CONFIG@
-PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
-PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
-POLKIT_CFLAGS = @POLKIT_CFLAGS@
-POLKIT_LIBS = @POLKIT_LIBS@
-POSUB = @POSUB@
-PPPD_PLUGIN_DIR = @PPPD_PLUGIN_DIR@
-QT_CFLAGS = @QT_CFLAGS@
-QT_LIBS = @QT_LIBS@
-RANLIB = @RANLIB@
-RESOLVCONF_PATH = @RESOLVCONF_PATH@
-SED = @SED@
-SET_MAKE = @SET_MAKE@
-SHELL = @SHELL@
-STRIP = @STRIP@
-SYSTEMD_CFLAGS = @SYSTEMD_CFLAGS@
-SYSTEMD_LIBS = @SYSTEMD_LIBS@
-SYSTEM_CA_PATH = @SYSTEM_CA_PATH@
-UDEV_BASE_DIR = @UDEV_BASE_DIR@
-USE_NLS = @USE_NLS@
-UUID_CFLAGS = @UUID_CFLAGS@
-UUID_LIBS = @UUID_LIBS@
-VAPIGEN = @VAPIGEN@
-VAPIGEN_MAKEFILE = @VAPIGEN_MAKEFILE@
-VAPIGEN_VAPIDIR = @VAPIGEN_VAPIDIR@
-VERSION = @VERSION@
-XGETTEXT = @XGETTEXT@
-XGETTEXT_015 = @XGETTEXT_015@
-XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
-abs_builddir = @abs_builddir@
-abs_srcdir = @abs_srcdir@
-abs_top_builddir = @abs_top_builddir@
-abs_top_srcdir = @abs_top_srcdir@
-ac_ct_AR = @ac_ct_AR@
-ac_ct_CC = @ac_ct_CC@
-ac_ct_CXX = @ac_ct_CXX@
-ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-am__include = @am__include@
-am__leading_dot = @am__leading_dot@
-am__quote = @am__quote@
-am__tar = @am__tar@
-am__untar = @am__untar@
-bindir = @bindir@
-build = @build@
-build_alias = @build_alias@
-build_cpu = @build_cpu@
-build_os = @build_os@
-build_vendor = @build_vendor@
-builddir = @builddir@
-datadir = @datadir@
-datarootdir = @datarootdir@
-docdir = @docdir@
-dvidir = @dvidir@
-exec_prefix = @exec_prefix@
-host = @host@
-host_alias = @host_alias@
-host_cpu = @host_cpu@
-host_os = @host_os@
-host_vendor = @host_vendor@
-htmldir = @htmldir@
-includedir = @includedir@
-infodir = @infodir@
-install_sh = @install_sh@
-intltool__v_merge_options_ = @intltool__v_merge_options_@
-intltool__v_merge_options_0 = @intltool__v_merge_options_0@
-libdir = @libdir@
-libexecdir = @libexecdir@
-localedir = @localedir@
-localstatedir = @localstatedir@
-mandir = @mandir@
-mkdir_p = @mkdir_p@
-oldincludedir = @oldincludedir@
-pdfdir = @pdfdir@
-prefix = @prefix@
-program_transform_name = @program_transform_name@
-psdir = @psdir@
-sbindir = @sbindir@
-sharedstatedir = @sharedstatedir@
-srcdir = @srcdir@
-sysconfdir = @sysconfdir@
-systemdsystemunitdir = @systemdsystemunitdir@
-target_alias = @target_alias@
-top_build_prefix = @top_build_prefix@
-top_builddir = @top_builddir@
-top_srcdir = @top_srcdir@
-all: all-am
-
-.SUFFIXES:
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
-	@for dep in $?; do \
-	  case '$(am__configure_deps)' in \
-	    *$$dep*) \
-	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
-	        && { if test -f $@; then exit 0; else break; fi; }; \
-	      exit 1;; \
-	  esac; \
-	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu initscript/SUSE/Makefile'; \
-	$(am__cd) $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu initscript/SUSE/Makefile
-.PRECIOUS: Makefile
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-	@case '$?' in \
-	  *config.status*) \
-	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
-	  *) \
-	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
-	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
-	esac;
-
-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-
-$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(am__aclocal_m4_deps):
-networkmanager: $(top_builddir)/config.status $(srcdir)/networkmanager.in
-	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
-
-mostlyclean-libtool:
-	-rm -f *.lo
-
-clean-libtool:
-	-rm -rf .libs _libs
-tags: TAGS
-TAGS:
-
-ctags: CTAGS
-CTAGS:
-
-
-distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-	list='$(DISTFILES)'; \
-	  dist_files=`for file in $$list; do echo $$file; done | \
-	  sed -e "s|^$$srcdirstrip/||;t" \
-	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
-	case $$dist_files in \
-	  */*) $(MKDIR_P) `echo "$$dist_files" | \
-			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
-			   sort -u` ;; \
-	esac; \
-	for file in $$dist_files; do \
-	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  if test -d $$d/$$file; then \
-	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
-	    if test -d "$(distdir)/$$file"; then \
-	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-	    fi; \
-	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
-	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-	    fi; \
-	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
-	  else \
-	    test -f "$(distdir)/$$file" \
-	    || cp -p $$d/$$file "$(distdir)/$$file" \
-	    || exit 1; \
-	  fi; \
-	done
-check-am: all-am
-check: check-am
-all-am: Makefile
-installdirs:
-install: install-am
-install-exec: install-exec-am
-install-data: install-data-am
-uninstall: uninstall-am
-
-install-am: all-am
-	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-
-installcheck: installcheck-am
-install-strip:
-	if test -z '$(STRIP)'; then \
-	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	      install; \
-	else \
-	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
-	fi
-mostlyclean-generic:
-
-clean-generic:
-
-distclean-generic:
-	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
-
-maintainer-clean-generic:
-	@echo "This command is intended for maintainers to use"
-	@echo "it deletes files that may require special tools to rebuild."
-clean: clean-am
-
-clean-am: clean-generic clean-libtool mostlyclean-am
-
-distclean: distclean-am
-	-rm -f Makefile
-distclean-am: clean-am distclean-generic
-
-dvi: dvi-am
-
-dvi-am:
-
-html: html-am
-
-html-am:
-
-info: info-am
-
-info-am:
-
-install-data-am:
-
-install-dvi: install-dvi-am
-
-install-dvi-am:
-
-install-exec-am:
-
-install-html: install-html-am
-
-install-html-am:
-
-install-info: install-info-am
-
-install-info-am:
-
-install-man:
-
-install-pdf: install-pdf-am
-
-install-pdf-am:
-
-install-ps: install-ps-am
-
-install-ps-am:
-
-installcheck-am:
-
-maintainer-clean: maintainer-clean-am
-	-rm -f Makefile
-maintainer-clean-am: distclean-am maintainer-clean-generic
-
-mostlyclean: mostlyclean-am
-
-mostlyclean-am: mostlyclean-generic mostlyclean-libtool
-
-pdf: pdf-am
-
-pdf-am:
-
-ps: ps-am
-
-ps-am:
-
-uninstall-am:
-
-.MAKE: install-am install-strip
-
-.PHONY: all all-am check check-am clean clean-generic clean-libtool \
-	distclean distclean-generic distclean-libtool distdir dvi \
-	dvi-am html html-am info info-am install install-am \
-	install-data install-data-am install-dvi install-dvi-am \
-	install-exec install-exec-am install-html install-html-am \
-	install-info install-info-am install-man install-pdf \
-	install-pdf-am install-ps install-ps-am install-strip \
-	installcheck installcheck-am installdirs maintainer-clean \
-	maintainer-clean-generic mostlyclean mostlyclean-generic \
-	mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am
-
-
-# Nowadays, NetworkManager support is built-in to the SUSE networking
-# subsystem, therefore a SUSE machine does not want these scripts.  Uncomment
-# this if you actually want external initscripts, such as SUSE 10.0 or earlier.
-#initddir = $(sysconfdir)/init.d
-#initd_SCRIPTS = networkmanager
-
-# Tell versions [3.59,3.63) of GNU make to not export all variables.
-# Otherwise a system limit (for SysV at least) may be exceeded.
-.NOEXPORT:
diff --git a/initscript/Slackware/Makefile.am b/initscript/Slackware/Makefile.am
deleted file mode 100644
index 254bb7ad..00000000
--- a/initscript/Slackware/Makefile.am
+++ /dev/null
@@ -1,3 +0,0 @@
-initddir = $(sysconfdir)/rc.d
-initd_SCRIPTS = rc.networkmanager
-
diff --git a/initscript/Slackware/Makefile.in b/initscript/Slackware/Makefile.in
deleted file mode 100644
index 46ee1d8e..00000000
--- a/initscript/Slackware/Makefile.in
+++ /dev/null
@@ -1,587 +0,0 @@
-# Makefile.in generated by automake 1.11.6 from Makefile.am.
-# @configure_input@
-
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
-# Foundation, Inc.
-# This Makefile.in is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-@SET_MAKE@
-
-VPATH = @srcdir@
-am__make_dryrun = \
-  { \
-    am__dry=no; \
-    case $$MAKEFLAGS in \
-      *\\[\ \	]*) \
-        echo 'am--echo: ; @echo "AM"  OK' | $(MAKE) -f - 2>/dev/null \
-          | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
-      *) \
-        for am__flg in $$MAKEFLAGS; do \
-          case $$am__flg in \
-            *=*|--*) ;; \
-            *n*) am__dry=yes; break;; \
-          esac; \
-        done;; \
-    esac; \
-    test $$am__dry = yes; \
-  }
-pkgdatadir = $(datadir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
-pkglibexecdir = $(libexecdir)/@PACKAGE@
-am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-install_sh_DATA = $(install_sh) -c -m 644
-install_sh_PROGRAM = $(install_sh) -c
-install_sh_SCRIPT = $(install_sh) -c
-INSTALL_HEADER = $(INSTALL_DATA)
-transform = $(program_transform_name)
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-build_triplet = @build@
-host_triplet = @host@
-subdir = initscript/Slackware
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
-	$(srcdir)/rc.networkmanager.in
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/compiler_warnings.m4 \
-	$(top_srcdir)/m4/gettext.m4 $(top_srcdir)/m4/gtk-doc.m4 \
-	$(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/intlmacosx.m4 \
-	$(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/introspection.m4 \
-	$(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \
-	$(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/libnl-check.m4 \
-	$(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \
-	$(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
-	$(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/nls.m4 \
-	$(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/progtest.m4 \
-	$(top_srcdir)/m4/vapigen.m4 $(top_srcdir)/configure.ac
-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
-	$(ACLOCAL_M4)
-mkinstalldirs = $(install_sh) -d
-CONFIG_HEADER = $(top_builddir)/config.h
-CONFIG_CLEAN_FILES = rc.networkmanager
-CONFIG_CLEAN_VPATH_FILES =
-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
-am__vpath_adj = case $$p in \
-    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
-    *) f=$$p;; \
-  esac;
-am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
-am__install_max = 40
-am__nobase_strip_setup = \
-  srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
-am__nobase_strip = \
-  for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
-am__nobase_list = $(am__nobase_strip_setup); \
-  for p in $$list; do echo "$$p $$p"; done | \
-  sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
-  $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
-    if (++n[$$2] == $(am__install_max)) \
-      { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
-    END { for (dir in files) print dir, files[dir] }'
-am__base_list = \
-  sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
-  sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
-am__uninstall_files_from_dir = { \
-  test -z "$$files" \
-    || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
-    || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
-         $(am__cd) "$$dir" && rm -f $$files; }; \
-  }
-am__installdirs = "$(DESTDIR)$(initddir)"
-SCRIPTS = $(initd_SCRIPTS)
-AM_V_GEN = $(am__v_GEN_@AM_V@)
-am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
-am__v_GEN_0 = @echo "  GEN   " $@;
-AM_V_at = $(am__v_at_@AM_V@)
-am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
-am__v_at_0 = @
-SOURCES =
-DIST_SOURCES =
-am__can_run_installinfo = \
-  case $$AM_UPDATE_INFO_DIR in \
-    n|no|NO) false;; \
-    *) (install-info --version) >/dev/null 2>&1;; \
-  esac
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-ACLOCAL = @ACLOCAL@
-ALL_LINGUAS = @ALL_LINGUAS@
-AMTAR = @AMTAR@
-AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
-AR = @AR@
-AUTOCONF = @AUTOCONF@
-AUTOHEADER = @AUTOHEADER@
-AUTOMAKE = @AUTOMAKE@
-AWK = @AWK@
-CC = @CC@
-CCDEPMODE = @CCDEPMODE@
-CFLAGS = @CFLAGS@
-CPP = @CPP@
-CPPFLAGS = @CPPFLAGS@
-CXX = @CXX@
-CXXCPP = @CXXCPP@
-CXXDEPMODE = @CXXDEPMODE@
-CXXFLAGS = @CXXFLAGS@
-CYGPATH_W = @CYGPATH_W@
-DATADIRNAME = @DATADIRNAME@
-DBUS_CFLAGS = @DBUS_CFLAGS@
-DBUS_LIBS = @DBUS_LIBS@
-DBUS_SYS_DIR = @DBUS_SYS_DIR@
-DEFS = @DEFS@
-DEPDIR = @DEPDIR@
-DHCLIENT_PATH = @DHCLIENT_PATH@
-DHCLIENT_VERSION = @DHCLIENT_VERSION@
-DHCPCD_PATH = @DHCPCD_PATH@
-DISABLE_DEPRECATED = @DISABLE_DEPRECATED@
-DLLTOOL = @DLLTOOL@
-DSYMUTIL = @DSYMUTIL@
-DUMPBIN = @DUMPBIN@
-ECHO_C = @ECHO_C@
-ECHO_N = @ECHO_N@
-ECHO_T = @ECHO_T@
-EGREP = @EGREP@
-EXEEXT = @EXEEXT@
-FGREP = @FGREP@
-GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
-GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
-GIO_CFLAGS = @GIO_CFLAGS@
-GIO_LIBS = @GIO_LIBS@
-GLIB_CFLAGS = @GLIB_CFLAGS@
-GLIB_GENMARSHAL = @GLIB_GENMARSHAL@
-GLIB_LIBS = @GLIB_LIBS@
-GLIB_MAKEFILE = @GLIB_MAKEFILE@
-GLIB_MKENUMS = @GLIB_MKENUMS@
-GMODULE_CFLAGS = @GMODULE_CFLAGS@
-GMODULE_LIBS = @GMODULE_LIBS@
-GMSGFMT = @GMSGFMT@
-GMSGFMT_015 = @GMSGFMT_015@
-GNUTLS_CFLAGS = @GNUTLS_CFLAGS@
-GNUTLS_LIBS = @GNUTLS_LIBS@
-GREP = @GREP@
-GTKDOC_CHECK = @GTKDOC_CHECK@
-GTKDOC_DEPS_CFLAGS = @GTKDOC_DEPS_CFLAGS@
-GTKDOC_DEPS_LIBS = @GTKDOC_DEPS_LIBS@
-GTKDOC_MKPDF = @GTKDOC_MKPDF@
-GTKDOC_REBASE = @GTKDOC_REBASE@
-GUDEV_CFLAGS = @GUDEV_CFLAGS@
-GUDEV_LIBS = @GUDEV_LIBS@
-HTML_DIR = @HTML_DIR@
-INSTALL = @INSTALL@
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-INTLLIBS = @INTLLIBS@
-INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
-INTLTOOL_MERGE = @INTLTOOL_MERGE@
-INTLTOOL_PERL = @INTLTOOL_PERL@
-INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
-INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@
-INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@
-INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@
-INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@
-INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
-INTROSPECTION_CFLAGS = @INTROSPECTION_CFLAGS@
-INTROSPECTION_COMPILER = @INTROSPECTION_COMPILER@
-INTROSPECTION_GENERATE = @INTROSPECTION_GENERATE@
-INTROSPECTION_GIRDIR = @INTROSPECTION_GIRDIR@
-INTROSPECTION_LIBS = @INTROSPECTION_LIBS@
-INTROSPECTION_MAKEFILE = @INTROSPECTION_MAKEFILE@
-INTROSPECTION_SCANNER = @INTROSPECTION_SCANNER@
-INTROSPECTION_TYPELIBDIR = @INTROSPECTION_TYPELIBDIR@
-IPTABLES_PATH = @IPTABLES_PATH@
-IWMX_SDK_CFLAGS = @IWMX_SDK_CFLAGS@
-IWMX_SDK_LIBS = @IWMX_SDK_LIBS@
-KERNEL_FIRMWARE_DIR = @KERNEL_FIRMWARE_DIR@
-LD = @LD@
-LDFLAGS = @LDFLAGS@
-LIBDL = @LIBDL@
-LIBGCRYPT_CFLAGS = @LIBGCRYPT_CFLAGS@
-LIBGCRYPT_CONFIG = @LIBGCRYPT_CONFIG@
-LIBGCRYPT_LIBS = @LIBGCRYPT_LIBS@
-LIBICONV = @LIBICONV@
-LIBINTL = @LIBINTL@
-LIBM = @LIBM@
-LIBNL1_CFLAGS = @LIBNL1_CFLAGS@
-LIBNL1_LIBS = @LIBNL1_LIBS@
-LIBNL2_CFLAGS = @LIBNL2_CFLAGS@
-LIBNL2_LIBS = @LIBNL2_LIBS@
-LIBNL3_CFLAGS = @LIBNL3_CFLAGS@
-LIBNL3_LIBS = @LIBNL3_LIBS@
-LIBNL_CFLAGS = @LIBNL_CFLAGS@
-LIBNL_GENL3_CFLAGS = @LIBNL_GENL3_CFLAGS@
-LIBNL_GENL3_LIBS = @LIBNL_GENL3_LIBS@
-LIBNL_LIBS = @LIBNL_LIBS@
-LIBNL_ROUTE3_CFLAGS = @LIBNL_ROUTE3_CFLAGS@
-LIBNL_ROUTE3_LIBS = @LIBNL_ROUTE3_LIBS@
-LIBOBJS = @LIBOBJS@
-LIBS = @LIBS@
-LIBSOUP_CFLAGS = @LIBSOUP_CFLAGS@
-LIBSOUP_LIBS = @LIBSOUP_LIBS@
-LIBTOOL = @LIBTOOL@
-LIPO = @LIPO@
-LN_S = @LN_S@
-LTLIBICONV = @LTLIBICONV@
-LTLIBINTL = @LTLIBINTL@
-LTLIBOBJS = @LTLIBOBJS@
-MAINT = @MAINT@
-MAKEINFO = @MAKEINFO@
-MANIFEST_TOOL = @MANIFEST_TOOL@
-MKDIR_P = @MKDIR_P@
-MOC = @MOC@
-MSGFMT = @MSGFMT@
-MSGFMT_015 = @MSGFMT_015@
-MSGMERGE = @MSGMERGE@
-NM = @NM@
-NMEDIT = @NMEDIT@
-NM_MAJOR_VERSION = @NM_MAJOR_VERSION@
-NM_MICRO_VERSION = @NM_MICRO_VERSION@
-NM_MINOR_VERSION = @NM_MINOR_VERSION@
-NM_VERSION = @NM_VERSION@
-NSS_CFLAGS = @NSS_CFLAGS@
-NSS_LIBS = @NSS_LIBS@
-OBJDUMP = @OBJDUMP@
-OBJEXT = @OBJEXT@
-OTOOL = @OTOOL@
-OTOOL64 = @OTOOL64@
-PACKAGE = @PACKAGE@
-PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-PACKAGE_NAME = @PACKAGE_NAME@
-PACKAGE_STRING = @PACKAGE_STRING@
-PACKAGE_TARNAME = @PACKAGE_TARNAME@
-PACKAGE_URL = @PACKAGE_URL@
-PACKAGE_VERSION = @PACKAGE_VERSION@
-PATH_SEPARATOR = @PATH_SEPARATOR@
-PKGCONFIG_PATH = @PKGCONFIG_PATH@
-PKG_CONFIG = @PKG_CONFIG@
-PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
-PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
-POLKIT_CFLAGS = @POLKIT_CFLAGS@
-POLKIT_LIBS = @POLKIT_LIBS@
-POSUB = @POSUB@
-PPPD_PLUGIN_DIR = @PPPD_PLUGIN_DIR@
-QT_CFLAGS = @QT_CFLAGS@
-QT_LIBS = @QT_LIBS@
-RANLIB = @RANLIB@
-RESOLVCONF_PATH = @RESOLVCONF_PATH@
-SED = @SED@
-SET_MAKE = @SET_MAKE@
-SHELL = @SHELL@
-STRIP = @STRIP@
-SYSTEMD_CFLAGS = @SYSTEMD_CFLAGS@
-SYSTEMD_LIBS = @SYSTEMD_LIBS@
-SYSTEM_CA_PATH = @SYSTEM_CA_PATH@
-UDEV_BASE_DIR = @UDEV_BASE_DIR@
-USE_NLS = @USE_NLS@
-UUID_CFLAGS = @UUID_CFLAGS@
-UUID_LIBS = @UUID_LIBS@
-VAPIGEN = @VAPIGEN@
-VAPIGEN_MAKEFILE = @VAPIGEN_MAKEFILE@
-VAPIGEN_VAPIDIR = @VAPIGEN_VAPIDIR@
-VERSION = @VERSION@
-XGETTEXT = @XGETTEXT@
-XGETTEXT_015 = @XGETTEXT_015@
-XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
-abs_builddir = @abs_builddir@
-abs_srcdir = @abs_srcdir@
-abs_top_builddir = @abs_top_builddir@
-abs_top_srcdir = @abs_top_srcdir@
-ac_ct_AR = @ac_ct_AR@
-ac_ct_CC = @ac_ct_CC@
-ac_ct_CXX = @ac_ct_CXX@
-ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-am__include = @am__include@
-am__leading_dot = @am__leading_dot@
-am__quote = @am__quote@
-am__tar = @am__tar@
-am__untar = @am__untar@
-bindir = @bindir@
-build = @build@
-build_alias = @build_alias@
-build_cpu = @build_cpu@
-build_os = @build_os@
-build_vendor = @build_vendor@
-builddir = @builddir@
-datadir = @datadir@
-datarootdir = @datarootdir@
-docdir = @docdir@
-dvidir = @dvidir@
-exec_prefix = @exec_prefix@
-host = @host@
-host_alias = @host_alias@
-host_cpu = @host_cpu@
-host_os = @host_os@
-host_vendor = @host_vendor@
-htmldir = @htmldir@
-includedir = @includedir@
-infodir = @infodir@
-install_sh = @install_sh@
-intltool__v_merge_options_ = @intltool__v_merge_options_@
-intltool__v_merge_options_0 = @intltool__v_merge_options_0@
-libdir = @libdir@
-libexecdir = @libexecdir@
-localedir = @localedir@
-localstatedir = @localstatedir@
-mandir = @mandir@
-mkdir_p = @mkdir_p@
-oldincludedir = @oldincludedir@
-pdfdir = @pdfdir@
-prefix = @prefix@
-program_transform_name = @program_transform_name@
-psdir = @psdir@
-sbindir = @sbindir@
-sharedstatedir = @sharedstatedir@
-srcdir = @srcdir@
-sysconfdir = @sysconfdir@
-systemdsystemunitdir = @systemdsystemunitdir@
-target_alias = @target_alias@
-top_build_prefix = @top_build_prefix@
-top_builddir = @top_builddir@
-top_srcdir = @top_srcdir@
-initddir = $(sysconfdir)/rc.d
-initd_SCRIPTS = rc.networkmanager
-all: all-am
-
-.SUFFIXES:
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
-	@for dep in $?; do \
-	  case '$(am__configure_deps)' in \
-	    *$$dep*) \
-	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
-	        && { if test -f $@; then exit 0; else break; fi; }; \
-	      exit 1;; \
-	  esac; \
-	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu initscript/Slackware/Makefile'; \
-	$(am__cd) $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu initscript/Slackware/Makefile
-.PRECIOUS: Makefile
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-	@case '$?' in \
-	  *config.status*) \
-	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
-	  *) \
-	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
-	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
-	esac;
-
-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-
-$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(am__aclocal_m4_deps):
-rc.networkmanager: $(top_builddir)/config.status $(srcdir)/rc.networkmanager.in
-	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
-install-initdSCRIPTS: $(initd_SCRIPTS)
-	@$(NORMAL_INSTALL)
-	@list='$(initd_SCRIPTS)'; test -n "$(initddir)" || list=; \
-	if test -n "$$list"; then \
-	  echo " $(MKDIR_P) '$(DESTDIR)$(initddir)'"; \
-	  $(MKDIR_P) "$(DESTDIR)$(initddir)" || exit 1; \
-	fi; \
-	for p in $$list; do \
-	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-	  if test -f "$$d$$p"; then echo "$$d$$p"; echo "$$p"; else :; fi; \
-	done | \
-	sed -e 'p;s,.*/,,;n' \
-	    -e 'h;s|.*|.|' \
-	    -e 'p;x;s,.*/,,;$(transform)' | sed 'N;N;N;s,\n, ,g' | \
-	$(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1; } \
-	  { d=$$3; if (dirs[d] != 1) { print "d", d; dirs[d] = 1 } \
-	    if ($$2 == $$4) { files[d] = files[d] " " $$1; \
-	      if (++n[d] == $(am__install_max)) { \
-		print "f", d, files[d]; n[d] = 0; files[d] = "" } } \
-	    else { print "f", d "/" $$4, $$1 } } \
-	  END { for (d in files) print "f", d, files[d] }' | \
-	while read type dir files; do \
-	     if test "$$dir" = .; then dir=; else dir=/$$dir; fi; \
-	     test -z "$$files" || { \
-	       echo " $(INSTALL_SCRIPT) $$files '$(DESTDIR)$(initddir)$$dir'"; \
-	       $(INSTALL_SCRIPT) $$files "$(DESTDIR)$(initddir)$$dir" || exit $$?; \
-	     } \
-	; done
-
-uninstall-initdSCRIPTS:
-	@$(NORMAL_UNINSTALL)
-	@list='$(initd_SCRIPTS)'; test -n "$(initddir)" || exit 0; \
-	files=`for p in $$list; do echo "$$p"; done | \
-	       sed -e 's,.*/,,;$(transform)'`; \
-	dir='$(DESTDIR)$(initddir)'; $(am__uninstall_files_from_dir)
-
-mostlyclean-libtool:
-	-rm -f *.lo
-
-clean-libtool:
-	-rm -rf .libs _libs
-tags: TAGS
-TAGS:
-
-ctags: CTAGS
-CTAGS:
-
-
-distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-	list='$(DISTFILES)'; \
-	  dist_files=`for file in $$list; do echo $$file; done | \
-	  sed -e "s|^$$srcdirstrip/||;t" \
-	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
-	case $$dist_files in \
-	  */*) $(MKDIR_P) `echo "$$dist_files" | \
-			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
-			   sort -u` ;; \
-	esac; \
-	for file in $$dist_files; do \
-	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  if test -d $$d/$$file; then \
-	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
-	    if test -d "$(distdir)/$$file"; then \
-	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-	    fi; \
-	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
-	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-	    fi; \
-	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
-	  else \
-	    test -f "$(distdir)/$$file" \
-	    || cp -p $$d/$$file "$(distdir)/$$file" \
-	    || exit 1; \
-	  fi; \
-	done
-check-am: all-am
-check: check-am
-all-am: Makefile $(SCRIPTS)
-installdirs:
-	for dir in "$(DESTDIR)$(initddir)"; do \
-	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
-	done
-install: install-am
-install-exec: install-exec-am
-install-data: install-data-am
-uninstall: uninstall-am
-
-install-am: all-am
-	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-
-installcheck: installcheck-am
-install-strip:
-	if test -z '$(STRIP)'; then \
-	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	      install; \
-	else \
-	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
-	fi
-mostlyclean-generic:
-
-clean-generic:
-
-distclean-generic:
-	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
-
-maintainer-clean-generic:
-	@echo "This command is intended for maintainers to use"
-	@echo "it deletes files that may require special tools to rebuild."
-clean: clean-am
-
-clean-am: clean-generic clean-libtool mostlyclean-am
-
-distclean: distclean-am
-	-rm -f Makefile
-distclean-am: clean-am distclean-generic
-
-dvi: dvi-am
-
-dvi-am:
-
-html: html-am
-
-html-am:
-
-info: info-am
-
-info-am:
-
-install-data-am: install-initdSCRIPTS
-
-install-dvi: install-dvi-am
-
-install-dvi-am:
-
-install-exec-am:
-
-install-html: install-html-am
-
-install-html-am:
-
-install-info: install-info-am
-
-install-info-am:
-
-install-man:
-
-install-pdf: install-pdf-am
-
-install-pdf-am:
-
-install-ps: install-ps-am
-
-install-ps-am:
-
-installcheck-am:
-
-maintainer-clean: maintainer-clean-am
-	-rm -f Makefile
-maintainer-clean-am: distclean-am maintainer-clean-generic
-
-mostlyclean: mostlyclean-am
-
-mostlyclean-am: mostlyclean-generic mostlyclean-libtool
-
-pdf: pdf-am
-
-pdf-am:
-
-ps: ps-am
-
-ps-am:
-
-uninstall-am: uninstall-initdSCRIPTS
-
-.MAKE: install-am install-strip
-
-.PHONY: all all-am check check-am clean clean-generic clean-libtool \
-	distclean distclean-generic distclean-libtool distdir dvi \
-	dvi-am html html-am info info-am install install-am \
-	install-data install-data-am install-dvi install-dvi-am \
-	install-exec install-exec-am install-html install-html-am \
-	install-info install-info-am install-initdSCRIPTS install-man \
-	install-pdf install-pdf-am install-ps install-ps-am \
-	install-strip installcheck installcheck-am installdirs \
-	maintainer-clean maintainer-clean-generic mostlyclean \
-	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
-	uninstall uninstall-am uninstall-initdSCRIPTS
-
-
-# Tell versions [3.59,3.63) of GNU make to not export all variables.
-# Otherwise a system limit (for SysV at least) may be exceeded.
-.NOEXPORT:
diff --git a/initscript/linexa/Makefile.am b/initscript/linexa/Makefile.am
deleted file mode 100644
index bdc99085..00000000
--- a/initscript/linexa/Makefile.am
+++ /dev/null
@@ -1,3 +0,0 @@
-initddir = $(sysconfdir)/rc.d/init.d
-initd_SCRIPTS = networkmanager
-
diff --git a/initscript/linexa/Makefile.in b/initscript/linexa/Makefile.in
deleted file mode 100644
index a2f54045..00000000
--- a/initscript/linexa/Makefile.in
+++ /dev/null
@@ -1,587 +0,0 @@
-# Makefile.in generated by automake 1.11.6 from Makefile.am.
-# @configure_input@
-
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
-# Foundation, Inc.
-# This Makefile.in is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-@SET_MAKE@
-
-VPATH = @srcdir@
-am__make_dryrun = \
-  { \
-    am__dry=no; \
-    case $$MAKEFLAGS in \
-      *\\[\ \	]*) \
-        echo 'am--echo: ; @echo "AM"  OK' | $(MAKE) -f - 2>/dev/null \
-          | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
-      *) \
-        for am__flg in $$MAKEFLAGS; do \
-          case $$am__flg in \
-            *=*|--*) ;; \
-            *n*) am__dry=yes; break;; \
-          esac; \
-        done;; \
-    esac; \
-    test $$am__dry = yes; \
-  }
-pkgdatadir = $(datadir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
-pkglibexecdir = $(libexecdir)/@PACKAGE@
-am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-install_sh_DATA = $(install_sh) -c -m 644
-install_sh_PROGRAM = $(install_sh) -c
-install_sh_SCRIPT = $(install_sh) -c
-INSTALL_HEADER = $(INSTALL_DATA)
-transform = $(program_transform_name)
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-build_triplet = @build@
-host_triplet = @host@
-subdir = initscript/linexa
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
-	$(srcdir)/networkmanager.in
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/compiler_warnings.m4 \
-	$(top_srcdir)/m4/gettext.m4 $(top_srcdir)/m4/gtk-doc.m4 \
-	$(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/intlmacosx.m4 \
-	$(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/introspection.m4 \
-	$(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \
-	$(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/libnl-check.m4 \
-	$(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \
-	$(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
-	$(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/nls.m4 \
-	$(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/progtest.m4 \
-	$(top_srcdir)/m4/vapigen.m4 $(top_srcdir)/configure.ac
-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
-	$(ACLOCAL_M4)
-mkinstalldirs = $(install_sh) -d
-CONFIG_HEADER = $(top_builddir)/config.h
-CONFIG_CLEAN_FILES = networkmanager
-CONFIG_CLEAN_VPATH_FILES =
-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
-am__vpath_adj = case $$p in \
-    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
-    *) f=$$p;; \
-  esac;
-am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
-am__install_max = 40
-am__nobase_strip_setup = \
-  srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
-am__nobase_strip = \
-  for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
-am__nobase_list = $(am__nobase_strip_setup); \
-  for p in $$list; do echo "$$p $$p"; done | \
-  sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
-  $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
-    if (++n[$$2] == $(am__install_max)) \
-      { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
-    END { for (dir in files) print dir, files[dir] }'
-am__base_list = \
-  sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
-  sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
-am__uninstall_files_from_dir = { \
-  test -z "$$files" \
-    || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
-    || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
-         $(am__cd) "$$dir" && rm -f $$files; }; \
-  }
-am__installdirs = "$(DESTDIR)$(initddir)"
-SCRIPTS = $(initd_SCRIPTS)
-AM_V_GEN = $(am__v_GEN_@AM_V@)
-am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
-am__v_GEN_0 = @echo "  GEN   " $@;
-AM_V_at = $(am__v_at_@AM_V@)
-am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
-am__v_at_0 = @
-SOURCES =
-DIST_SOURCES =
-am__can_run_installinfo = \
-  case $$AM_UPDATE_INFO_DIR in \
-    n|no|NO) false;; \
-    *) (install-info --version) >/dev/null 2>&1;; \
-  esac
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-ACLOCAL = @ACLOCAL@
-ALL_LINGUAS = @ALL_LINGUAS@
-AMTAR = @AMTAR@
-AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
-AR = @AR@
-AUTOCONF = @AUTOCONF@
-AUTOHEADER = @AUTOHEADER@
-AUTOMAKE = @AUTOMAKE@
-AWK = @AWK@
-CC = @CC@
-CCDEPMODE = @CCDEPMODE@
-CFLAGS = @CFLAGS@
-CPP = @CPP@
-CPPFLAGS = @CPPFLAGS@
-CXX = @CXX@
-CXXCPP = @CXXCPP@
-CXXDEPMODE = @CXXDEPMODE@
-CXXFLAGS = @CXXFLAGS@
-CYGPATH_W = @CYGPATH_W@
-DATADIRNAME = @DATADIRNAME@
-DBUS_CFLAGS = @DBUS_CFLAGS@
-DBUS_LIBS = @DBUS_LIBS@
-DBUS_SYS_DIR = @DBUS_SYS_DIR@
-DEFS = @DEFS@
-DEPDIR = @DEPDIR@
-DHCLIENT_PATH = @DHCLIENT_PATH@
-DHCLIENT_VERSION = @DHCLIENT_VERSION@
-DHCPCD_PATH = @DHCPCD_PATH@
-DISABLE_DEPRECATED = @DISABLE_DEPRECATED@
-DLLTOOL = @DLLTOOL@
-DSYMUTIL = @DSYMUTIL@
-DUMPBIN = @DUMPBIN@
-ECHO_C = @ECHO_C@
-ECHO_N = @ECHO_N@
-ECHO_T = @ECHO_T@
-EGREP = @EGREP@
-EXEEXT = @EXEEXT@
-FGREP = @FGREP@
-GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
-GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
-GIO_CFLAGS = @GIO_CFLAGS@
-GIO_LIBS = @GIO_LIBS@
-GLIB_CFLAGS = @GLIB_CFLAGS@
-GLIB_GENMARSHAL = @GLIB_GENMARSHAL@
-GLIB_LIBS = @GLIB_LIBS@
-GLIB_MAKEFILE = @GLIB_MAKEFILE@
-GLIB_MKENUMS = @GLIB_MKENUMS@
-GMODULE_CFLAGS = @GMODULE_CFLAGS@
-GMODULE_LIBS = @GMODULE_LIBS@
-GMSGFMT = @GMSGFMT@
-GMSGFMT_015 = @GMSGFMT_015@
-GNUTLS_CFLAGS = @GNUTLS_CFLAGS@
-GNUTLS_LIBS = @GNUTLS_LIBS@
-GREP = @GREP@
-GTKDOC_CHECK = @GTKDOC_CHECK@
-GTKDOC_DEPS_CFLAGS = @GTKDOC_DEPS_CFLAGS@
-GTKDOC_DEPS_LIBS = @GTKDOC_DEPS_LIBS@
-GTKDOC_MKPDF = @GTKDOC_MKPDF@
-GTKDOC_REBASE = @GTKDOC_REBASE@
-GUDEV_CFLAGS = @GUDEV_CFLAGS@
-GUDEV_LIBS = @GUDEV_LIBS@
-HTML_DIR = @HTML_DIR@
-INSTALL = @INSTALL@
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-INTLLIBS = @INTLLIBS@
-INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
-INTLTOOL_MERGE = @INTLTOOL_MERGE@
-INTLTOOL_PERL = @INTLTOOL_PERL@
-INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
-INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@
-INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@
-INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@
-INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@
-INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
-INTROSPECTION_CFLAGS = @INTROSPECTION_CFLAGS@
-INTROSPECTION_COMPILER = @INTROSPECTION_COMPILER@
-INTROSPECTION_GENERATE = @INTROSPECTION_GENERATE@
-INTROSPECTION_GIRDIR = @INTROSPECTION_GIRDIR@
-INTROSPECTION_LIBS = @INTROSPECTION_LIBS@
-INTROSPECTION_MAKEFILE = @INTROSPECTION_MAKEFILE@
-INTROSPECTION_SCANNER = @INTROSPECTION_SCANNER@
-INTROSPECTION_TYPELIBDIR = @INTROSPECTION_TYPELIBDIR@
-IPTABLES_PATH = @IPTABLES_PATH@
-IWMX_SDK_CFLAGS = @IWMX_SDK_CFLAGS@
-IWMX_SDK_LIBS = @IWMX_SDK_LIBS@
-KERNEL_FIRMWARE_DIR = @KERNEL_FIRMWARE_DIR@
-LD = @LD@
-LDFLAGS = @LDFLAGS@
-LIBDL = @LIBDL@
-LIBGCRYPT_CFLAGS = @LIBGCRYPT_CFLAGS@
-LIBGCRYPT_CONFIG = @LIBGCRYPT_CONFIG@
-LIBGCRYPT_LIBS = @LIBGCRYPT_LIBS@
-LIBICONV = @LIBICONV@
-LIBINTL = @LIBINTL@
-LIBM = @LIBM@
-LIBNL1_CFLAGS = @LIBNL1_CFLAGS@
-LIBNL1_LIBS = @LIBNL1_LIBS@
-LIBNL2_CFLAGS = @LIBNL2_CFLAGS@
-LIBNL2_LIBS = @LIBNL2_LIBS@
-LIBNL3_CFLAGS = @LIBNL3_CFLAGS@
-LIBNL3_LIBS = @LIBNL3_LIBS@
-LIBNL_CFLAGS = @LIBNL_CFLAGS@
-LIBNL_GENL3_CFLAGS = @LIBNL_GENL3_CFLAGS@
-LIBNL_GENL3_LIBS = @LIBNL_GENL3_LIBS@
-LIBNL_LIBS = @LIBNL_LIBS@
-LIBNL_ROUTE3_CFLAGS = @LIBNL_ROUTE3_CFLAGS@
-LIBNL_ROUTE3_LIBS = @LIBNL_ROUTE3_LIBS@
-LIBOBJS = @LIBOBJS@
-LIBS = @LIBS@
-LIBSOUP_CFLAGS = @LIBSOUP_CFLAGS@
-LIBSOUP_LIBS = @LIBSOUP_LIBS@
-LIBTOOL = @LIBTOOL@
-LIPO = @LIPO@
-LN_S = @LN_S@
-LTLIBICONV = @LTLIBICONV@
-LTLIBINTL = @LTLIBINTL@
-LTLIBOBJS = @LTLIBOBJS@
-MAINT = @MAINT@
-MAKEINFO = @MAKEINFO@
-MANIFEST_TOOL = @MANIFEST_TOOL@
-MKDIR_P = @MKDIR_P@
-MOC = @MOC@
-MSGFMT = @MSGFMT@
-MSGFMT_015 = @MSGFMT_015@
-MSGMERGE = @MSGMERGE@
-NM = @NM@
-NMEDIT = @NMEDIT@
-NM_MAJOR_VERSION = @NM_MAJOR_VERSION@
-NM_MICRO_VERSION = @NM_MICRO_VERSION@
-NM_MINOR_VERSION = @NM_MINOR_VERSION@
-NM_VERSION = @NM_VERSION@
-NSS_CFLAGS = @NSS_CFLAGS@
-NSS_LIBS = @NSS_LIBS@
-OBJDUMP = @OBJDUMP@
-OBJEXT = @OBJEXT@
-OTOOL = @OTOOL@
-OTOOL64 = @OTOOL64@
-PACKAGE = @PACKAGE@
-PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-PACKAGE_NAME = @PACKAGE_NAME@
-PACKAGE_STRING = @PACKAGE_STRING@
-PACKAGE_TARNAME = @PACKAGE_TARNAME@
-PACKAGE_URL = @PACKAGE_URL@
-PACKAGE_VERSION = @PACKAGE_VERSION@
-PATH_SEPARATOR = @PATH_SEPARATOR@
-PKGCONFIG_PATH = @PKGCONFIG_PATH@
-PKG_CONFIG = @PKG_CONFIG@
-PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
-PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
-POLKIT_CFLAGS = @POLKIT_CFLAGS@
-POLKIT_LIBS = @POLKIT_LIBS@
-POSUB = @POSUB@
-PPPD_PLUGIN_DIR = @PPPD_PLUGIN_DIR@
-QT_CFLAGS = @QT_CFLAGS@
-QT_LIBS = @QT_LIBS@
-RANLIB = @RANLIB@
-RESOLVCONF_PATH = @RESOLVCONF_PATH@
-SED = @SED@
-SET_MAKE = @SET_MAKE@
-SHELL = @SHELL@
-STRIP = @STRIP@
-SYSTEMD_CFLAGS = @SYSTEMD_CFLAGS@
-SYSTEMD_LIBS = @SYSTEMD_LIBS@
-SYSTEM_CA_PATH = @SYSTEM_CA_PATH@
-UDEV_BASE_DIR = @UDEV_BASE_DIR@
-USE_NLS = @USE_NLS@
-UUID_CFLAGS = @UUID_CFLAGS@
-UUID_LIBS = @UUID_LIBS@
-VAPIGEN = @VAPIGEN@
-VAPIGEN_MAKEFILE = @VAPIGEN_MAKEFILE@
-VAPIGEN_VAPIDIR = @VAPIGEN_VAPIDIR@
-VERSION = @VERSION@
-XGETTEXT = @XGETTEXT@
-XGETTEXT_015 = @XGETTEXT_015@
-XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
-abs_builddir = @abs_builddir@
-abs_srcdir = @abs_srcdir@
-abs_top_builddir = @abs_top_builddir@
-abs_top_srcdir = @abs_top_srcdir@
-ac_ct_AR = @ac_ct_AR@
-ac_ct_CC = @ac_ct_CC@
-ac_ct_CXX = @ac_ct_CXX@
-ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-am__include = @am__include@
-am__leading_dot = @am__leading_dot@
-am__quote = @am__quote@
-am__tar = @am__tar@
-am__untar = @am__untar@
-bindir = @bindir@
-build = @build@
-build_alias = @build_alias@
-build_cpu = @build_cpu@
-build_os = @build_os@
-build_vendor = @build_vendor@
-builddir = @builddir@
-datadir = @datadir@
-datarootdir = @datarootdir@
-docdir = @docdir@
-dvidir = @dvidir@
-exec_prefix = @exec_prefix@
-host = @host@
-host_alias = @host_alias@
-host_cpu = @host_cpu@
-host_os = @host_os@
-host_vendor = @host_vendor@
-htmldir = @htmldir@
-includedir = @includedir@
-infodir = @infodir@
-install_sh = @install_sh@
-intltool__v_merge_options_ = @intltool__v_merge_options_@
-intltool__v_merge_options_0 = @intltool__v_merge_options_0@
-libdir = @libdir@
-libexecdir = @libexecdir@
-localedir = @localedir@
-localstatedir = @localstatedir@
-mandir = @mandir@
-mkdir_p = @mkdir_p@
-oldincludedir = @oldincludedir@
-pdfdir = @pdfdir@
-prefix = @prefix@
-program_transform_name = @program_transform_name@
-psdir = @psdir@
-sbindir = @sbindir@
-sharedstatedir = @sharedstatedir@
-srcdir = @srcdir@
-sysconfdir = @sysconfdir@
-systemdsystemunitdir = @systemdsystemunitdir@
-target_alias = @target_alias@
-top_build_prefix = @top_build_prefix@
-top_builddir = @top_builddir@
-top_srcdir = @top_srcdir@
-initddir = $(sysconfdir)/rc.d/init.d
-initd_SCRIPTS = networkmanager
-all: all-am
-
-.SUFFIXES:
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
-	@for dep in $?; do \
-	  case '$(am__configure_deps)' in \
-	    *$$dep*) \
-	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
-	        && { if test -f $@; then exit 0; else break; fi; }; \
-	      exit 1;; \
-	  esac; \
-	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu initscript/linexa/Makefile'; \
-	$(am__cd) $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu initscript/linexa/Makefile
-.PRECIOUS: Makefile
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-	@case '$?' in \
-	  *config.status*) \
-	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
-	  *) \
-	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
-	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
-	esac;
-
-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-
-$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(am__aclocal_m4_deps):
-networkmanager: $(top_builddir)/config.status $(srcdir)/networkmanager.in
-	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
-install-initdSCRIPTS: $(initd_SCRIPTS)
-	@$(NORMAL_INSTALL)
-	@list='$(initd_SCRIPTS)'; test -n "$(initddir)" || list=; \
-	if test -n "$$list"; then \
-	  echo " $(MKDIR_P) '$(DESTDIR)$(initddir)'"; \
-	  $(MKDIR_P) "$(DESTDIR)$(initddir)" || exit 1; \
-	fi; \
-	for p in $$list; do \
-	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-	  if test -f "$$d$$p"; then echo "$$d$$p"; echo "$$p"; else :; fi; \
-	done | \
-	sed -e 'p;s,.*/,,;n' \
-	    -e 'h;s|.*|.|' \
-	    -e 'p;x;s,.*/,,;$(transform)' | sed 'N;N;N;s,\n, ,g' | \
-	$(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1; } \
-	  { d=$$3; if (dirs[d] != 1) { print "d", d; dirs[d] = 1 } \
-	    if ($$2 == $$4) { files[d] = files[d] " " $$1; \
-	      if (++n[d] == $(am__install_max)) { \
-		print "f", d, files[d]; n[d] = 0; files[d] = "" } } \
-	    else { print "f", d "/" $$4, $$1 } } \
-	  END { for (d in files) print "f", d, files[d] }' | \
-	while read type dir files; do \
-	     if test "$$dir" = .; then dir=; else dir=/$$dir; fi; \
-	     test -z "$$files" || { \
-	       echo " $(INSTALL_SCRIPT) $$files '$(DESTDIR)$(initddir)$$dir'"; \
-	       $(INSTALL_SCRIPT) $$files "$(DESTDIR)$(initddir)$$dir" || exit $$?; \
-	     } \
-	; done
-
-uninstall-initdSCRIPTS:
-	@$(NORMAL_UNINSTALL)
-	@list='$(initd_SCRIPTS)'; test -n "$(initddir)" || exit 0; \
-	files=`for p in $$list; do echo "$$p"; done | \
-	       sed -e 's,.*/,,;$(transform)'`; \
-	dir='$(DESTDIR)$(initddir)'; $(am__uninstall_files_from_dir)
-
-mostlyclean-libtool:
-	-rm -f *.lo
-
-clean-libtool:
-	-rm -rf .libs _libs
-tags: TAGS
-TAGS:
-
-ctags: CTAGS
-CTAGS:
-
-
-distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-	list='$(DISTFILES)'; \
-	  dist_files=`for file in $$list; do echo $$file; done | \
-	  sed -e "s|^$$srcdirstrip/||;t" \
-	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
-	case $$dist_files in \
-	  */*) $(MKDIR_P) `echo "$$dist_files" | \
-			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
-			   sort -u` ;; \
-	esac; \
-	for file in $$dist_files; do \
-	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  if test -d $$d/$$file; then \
-	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
-	    if test -d "$(distdir)/$$file"; then \
-	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-	    fi; \
-	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
-	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-	    fi; \
-	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
-	  else \
-	    test -f "$(distdir)/$$file" \
-	    || cp -p $$d/$$file "$(distdir)/$$file" \
-	    || exit 1; \
-	  fi; \
-	done
-check-am: all-am
-check: check-am
-all-am: Makefile $(SCRIPTS)
-installdirs:
-	for dir in "$(DESTDIR)$(initddir)"; do \
-	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
-	done
-install: install-am
-install-exec: install-exec-am
-install-data: install-data-am
-uninstall: uninstall-am
-
-install-am: all-am
-	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-
-installcheck: installcheck-am
-install-strip:
-	if test -z '$(STRIP)'; then \
-	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	      install; \
-	else \
-	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
-	fi
-mostlyclean-generic:
-
-clean-generic:
-
-distclean-generic:
-	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
-
-maintainer-clean-generic:
-	@echo "This command is intended for maintainers to use"
-	@echo "it deletes files that may require special tools to rebuild."
-clean: clean-am
-
-clean-am: clean-generic clean-libtool mostlyclean-am
-
-distclean: distclean-am
-	-rm -f Makefile
-distclean-am: clean-am distclean-generic
-
-dvi: dvi-am
-
-dvi-am:
-
-html: html-am
-
-html-am:
-
-info: info-am
-
-info-am:
-
-install-data-am: install-initdSCRIPTS
-
-install-dvi: install-dvi-am
-
-install-dvi-am:
-
-install-exec-am:
-
-install-html: install-html-am
-
-install-html-am:
-
-install-info: install-info-am
-
-install-info-am:
-
-install-man:
-
-install-pdf: install-pdf-am
-
-install-pdf-am:
-
-install-ps: install-ps-am
-
-install-ps-am:
-
-installcheck-am:
-
-maintainer-clean: maintainer-clean-am
-	-rm -f Makefile
-maintainer-clean-am: distclean-am maintainer-clean-generic
-
-mostlyclean: mostlyclean-am
-
-mostlyclean-am: mostlyclean-generic mostlyclean-libtool
-
-pdf: pdf-am
-
-pdf-am:
-
-ps: ps-am
-
-ps-am:
-
-uninstall-am: uninstall-initdSCRIPTS
-
-.MAKE: install-am install-strip
-
-.PHONY: all all-am check check-am clean clean-generic clean-libtool \
-	distclean distclean-generic distclean-libtool distdir dvi \
-	dvi-am html html-am info info-am install install-am \
-	install-data install-data-am install-dvi install-dvi-am \
-	install-exec install-exec-am install-html install-html-am \
-	install-info install-info-am install-initdSCRIPTS install-man \
-	install-pdf install-pdf-am install-ps install-ps-am \
-	install-strip installcheck installcheck-am installdirs \
-	maintainer-clean maintainer-clean-generic mostlyclean \
-	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
-	uninstall uninstall-am uninstall-initdSCRIPTS
-
-
-# Tell versions [3.59,3.63) of GNU make to not export all variables.
-# Otherwise a system limit (for SysV at least) may be exceeded.
-.NOEXPORT:
diff --git a/initscript/paldo/Makefile.am b/initscript/paldo/Makefile.am
deleted file mode 100644
index 2c1b1964..00000000
--- a/initscript/paldo/Makefile.am
+++ /dev/null
@@ -1,3 +0,0 @@
-initddir = $(sysconfdir)/init.d
-initd_SCRIPTS = NetworkManager
-
diff --git a/initscript/paldo/Makefile.in b/initscript/paldo/Makefile.in
deleted file mode 100644
index ada17d28..00000000
--- a/initscript/paldo/Makefile.in
+++ /dev/null
@@ -1,587 +0,0 @@
-# Makefile.in generated by automake 1.11.6 from Makefile.am.
-# @configure_input@
-
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
-# Foundation, Inc.
-# This Makefile.in is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-@SET_MAKE@
-
-VPATH = @srcdir@
-am__make_dryrun = \
-  { \
-    am__dry=no; \
-    case $$MAKEFLAGS in \
-      *\\[\ \	]*) \
-        echo 'am--echo: ; @echo "AM"  OK' | $(MAKE) -f - 2>/dev/null \
-          | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
-      *) \
-        for am__flg in $$MAKEFLAGS; do \
-          case $$am__flg in \
-            *=*|--*) ;; \
-            *n*) am__dry=yes; break;; \
-          esac; \
-        done;; \
-    esac; \
-    test $$am__dry = yes; \
-  }
-pkgdatadir = $(datadir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
-pkglibexecdir = $(libexecdir)/@PACKAGE@
-am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-install_sh_DATA = $(install_sh) -c -m 644
-install_sh_PROGRAM = $(install_sh) -c
-install_sh_SCRIPT = $(install_sh) -c
-INSTALL_HEADER = $(INSTALL_DATA)
-transform = $(program_transform_name)
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-build_triplet = @build@
-host_triplet = @host@
-subdir = initscript/paldo
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
-	$(srcdir)/NetworkManager.in
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/compiler_warnings.m4 \
-	$(top_srcdir)/m4/gettext.m4 $(top_srcdir)/m4/gtk-doc.m4 \
-	$(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/intlmacosx.m4 \
-	$(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/introspection.m4 \
-	$(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \
-	$(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/libnl-check.m4 \
-	$(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \
-	$(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
-	$(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/nls.m4 \
-	$(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/progtest.m4 \
-	$(top_srcdir)/m4/vapigen.m4 $(top_srcdir)/configure.ac
-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
-	$(ACLOCAL_M4)
-mkinstalldirs = $(install_sh) -d
-CONFIG_HEADER = $(top_builddir)/config.h
-CONFIG_CLEAN_FILES = NetworkManager
-CONFIG_CLEAN_VPATH_FILES =
-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
-am__vpath_adj = case $$p in \
-    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
-    *) f=$$p;; \
-  esac;
-am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
-am__install_max = 40
-am__nobase_strip_setup = \
-  srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
-am__nobase_strip = \
-  for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
-am__nobase_list = $(am__nobase_strip_setup); \
-  for p in $$list; do echo "$$p $$p"; done | \
-  sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
-  $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
-    if (++n[$$2] == $(am__install_max)) \
-      { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
-    END { for (dir in files) print dir, files[dir] }'
-am__base_list = \
-  sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
-  sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
-am__uninstall_files_from_dir = { \
-  test -z "$$files" \
-    || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
-    || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
-         $(am__cd) "$$dir" && rm -f $$files; }; \
-  }
-am__installdirs = "$(DESTDIR)$(initddir)"
-SCRIPTS = $(initd_SCRIPTS)
-AM_V_GEN = $(am__v_GEN_@AM_V@)
-am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
-am__v_GEN_0 = @echo "  GEN   " $@;
-AM_V_at = $(am__v_at_@AM_V@)
-am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
-am__v_at_0 = @
-SOURCES =
-DIST_SOURCES =
-am__can_run_installinfo = \
-  case $$AM_UPDATE_INFO_DIR in \
-    n|no|NO) false;; \
-    *) (install-info --version) >/dev/null 2>&1;; \
-  esac
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-ACLOCAL = @ACLOCAL@
-ALL_LINGUAS = @ALL_LINGUAS@
-AMTAR = @AMTAR@
-AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
-AR = @AR@
-AUTOCONF = @AUTOCONF@
-AUTOHEADER = @AUTOHEADER@
-AUTOMAKE = @AUTOMAKE@
-AWK = @AWK@
-CC = @CC@
-CCDEPMODE = @CCDEPMODE@
-CFLAGS = @CFLAGS@
-CPP = @CPP@
-CPPFLAGS = @CPPFLAGS@
-CXX = @CXX@
-CXXCPP = @CXXCPP@
-CXXDEPMODE = @CXXDEPMODE@
-CXXFLAGS = @CXXFLAGS@
-CYGPATH_W = @CYGPATH_W@
-DATADIRNAME = @DATADIRNAME@
-DBUS_CFLAGS = @DBUS_CFLAGS@
-DBUS_LIBS = @DBUS_LIBS@
-DBUS_SYS_DIR = @DBUS_SYS_DIR@
-DEFS = @DEFS@
-DEPDIR = @DEPDIR@
-DHCLIENT_PATH = @DHCLIENT_PATH@
-DHCLIENT_VERSION = @DHCLIENT_VERSION@
-DHCPCD_PATH = @DHCPCD_PATH@
-DISABLE_DEPRECATED = @DISABLE_DEPRECATED@
-DLLTOOL = @DLLTOOL@
-DSYMUTIL = @DSYMUTIL@
-DUMPBIN = @DUMPBIN@
-ECHO_C = @ECHO_C@
-ECHO_N = @ECHO_N@
-ECHO_T = @ECHO_T@
-EGREP = @EGREP@
-EXEEXT = @EXEEXT@
-FGREP = @FGREP@
-GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
-GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
-GIO_CFLAGS = @GIO_CFLAGS@
-GIO_LIBS = @GIO_LIBS@
-GLIB_CFLAGS = @GLIB_CFLAGS@
-GLIB_GENMARSHAL = @GLIB_GENMARSHAL@
-GLIB_LIBS = @GLIB_LIBS@
-GLIB_MAKEFILE = @GLIB_MAKEFILE@
-GLIB_MKENUMS = @GLIB_MKENUMS@
-GMODULE_CFLAGS = @GMODULE_CFLAGS@
-GMODULE_LIBS = @GMODULE_LIBS@
-GMSGFMT = @GMSGFMT@
-GMSGFMT_015 = @GMSGFMT_015@
-GNUTLS_CFLAGS = @GNUTLS_CFLAGS@
-GNUTLS_LIBS = @GNUTLS_LIBS@
-GREP = @GREP@
-GTKDOC_CHECK = @GTKDOC_CHECK@
-GTKDOC_DEPS_CFLAGS = @GTKDOC_DEPS_CFLAGS@
-GTKDOC_DEPS_LIBS = @GTKDOC_DEPS_LIBS@
-GTKDOC_MKPDF = @GTKDOC_MKPDF@
-GTKDOC_REBASE = @GTKDOC_REBASE@
-GUDEV_CFLAGS = @GUDEV_CFLAGS@
-GUDEV_LIBS = @GUDEV_LIBS@
-HTML_DIR = @HTML_DIR@
-INSTALL = @INSTALL@
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-INTLLIBS = @INTLLIBS@
-INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
-INTLTOOL_MERGE = @INTLTOOL_MERGE@
-INTLTOOL_PERL = @INTLTOOL_PERL@
-INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
-INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@
-INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@
-INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@
-INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@
-INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
-INTROSPECTION_CFLAGS = @INTROSPECTION_CFLAGS@
-INTROSPECTION_COMPILER = @INTROSPECTION_COMPILER@
-INTROSPECTION_GENERATE = @INTROSPECTION_GENERATE@
-INTROSPECTION_GIRDIR = @INTROSPECTION_GIRDIR@
-INTROSPECTION_LIBS = @INTROSPECTION_LIBS@
-INTROSPECTION_MAKEFILE = @INTROSPECTION_MAKEFILE@
-INTROSPECTION_SCANNER = @INTROSPECTION_SCANNER@
-INTROSPECTION_TYPELIBDIR = @INTROSPECTION_TYPELIBDIR@
-IPTABLES_PATH = @IPTABLES_PATH@
-IWMX_SDK_CFLAGS = @IWMX_SDK_CFLAGS@
-IWMX_SDK_LIBS = @IWMX_SDK_LIBS@
-KERNEL_FIRMWARE_DIR = @KERNEL_FIRMWARE_DIR@
-LD = @LD@
-LDFLAGS = @LDFLAGS@
-LIBDL = @LIBDL@
-LIBGCRYPT_CFLAGS = @LIBGCRYPT_CFLAGS@
-LIBGCRYPT_CONFIG = @LIBGCRYPT_CONFIG@
-LIBGCRYPT_LIBS = @LIBGCRYPT_LIBS@
-LIBICONV = @LIBICONV@
-LIBINTL = @LIBINTL@
-LIBM = @LIBM@
-LIBNL1_CFLAGS = @LIBNL1_CFLAGS@
-LIBNL1_LIBS = @LIBNL1_LIBS@
-LIBNL2_CFLAGS = @LIBNL2_CFLAGS@
-LIBNL2_LIBS = @LIBNL2_LIBS@
-LIBNL3_CFLAGS = @LIBNL3_CFLAGS@
-LIBNL3_LIBS = @LIBNL3_LIBS@
-LIBNL_CFLAGS = @LIBNL_CFLAGS@
-LIBNL_GENL3_CFLAGS = @LIBNL_GENL3_CFLAGS@
-LIBNL_GENL3_LIBS = @LIBNL_GENL3_LIBS@
-LIBNL_LIBS = @LIBNL_LIBS@
-LIBNL_ROUTE3_CFLAGS = @LIBNL_ROUTE3_CFLAGS@
-LIBNL_ROUTE3_LIBS = @LIBNL_ROUTE3_LIBS@
-LIBOBJS = @LIBOBJS@
-LIBS = @LIBS@
-LIBSOUP_CFLAGS = @LIBSOUP_CFLAGS@
-LIBSOUP_LIBS = @LIBSOUP_LIBS@
-LIBTOOL = @LIBTOOL@
-LIPO = @LIPO@
-LN_S = @LN_S@
-LTLIBICONV = @LTLIBICONV@
-LTLIBINTL = @LTLIBINTL@
-LTLIBOBJS = @LTLIBOBJS@
-MAINT = @MAINT@
-MAKEINFO = @MAKEINFO@
-MANIFEST_TOOL = @MANIFEST_TOOL@
-MKDIR_P = @MKDIR_P@
-MOC = @MOC@
-MSGFMT = @MSGFMT@
-MSGFMT_015 = @MSGFMT_015@
-MSGMERGE = @MSGMERGE@
-NM = @NM@
-NMEDIT = @NMEDIT@
-NM_MAJOR_VERSION = @NM_MAJOR_VERSION@
-NM_MICRO_VERSION = @NM_MICRO_VERSION@
-NM_MINOR_VERSION = @NM_MINOR_VERSION@
-NM_VERSION = @NM_VERSION@
-NSS_CFLAGS = @NSS_CFLAGS@
-NSS_LIBS = @NSS_LIBS@
-OBJDUMP = @OBJDUMP@
-OBJEXT = @OBJEXT@
-OTOOL = @OTOOL@
-OTOOL64 = @OTOOL64@
-PACKAGE = @PACKAGE@
-PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-PACKAGE_NAME = @PACKAGE_NAME@
-PACKAGE_STRING = @PACKAGE_STRING@
-PACKAGE_TARNAME = @PACKAGE_TARNAME@
-PACKAGE_URL = @PACKAGE_URL@
-PACKAGE_VERSION = @PACKAGE_VERSION@
-PATH_SEPARATOR = @PATH_SEPARATOR@
-PKGCONFIG_PATH = @PKGCONFIG_PATH@
-PKG_CONFIG = @PKG_CONFIG@
-PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
-PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
-POLKIT_CFLAGS = @POLKIT_CFLAGS@
-POLKIT_LIBS = @POLKIT_LIBS@
-POSUB = @POSUB@
-PPPD_PLUGIN_DIR = @PPPD_PLUGIN_DIR@
-QT_CFLAGS = @QT_CFLAGS@
-QT_LIBS = @QT_LIBS@
-RANLIB = @RANLIB@
-RESOLVCONF_PATH = @RESOLVCONF_PATH@
-SED = @SED@
-SET_MAKE = @SET_MAKE@
-SHELL = @SHELL@
-STRIP = @STRIP@
-SYSTEMD_CFLAGS = @SYSTEMD_CFLAGS@
-SYSTEMD_LIBS = @SYSTEMD_LIBS@
-SYSTEM_CA_PATH = @SYSTEM_CA_PATH@
-UDEV_BASE_DIR = @UDEV_BASE_DIR@
-USE_NLS = @USE_NLS@
-UUID_CFLAGS = @UUID_CFLAGS@
-UUID_LIBS = @UUID_LIBS@
-VAPIGEN = @VAPIGEN@
-VAPIGEN_MAKEFILE = @VAPIGEN_MAKEFILE@
-VAPIGEN_VAPIDIR = @VAPIGEN_VAPIDIR@
-VERSION = @VERSION@
-XGETTEXT = @XGETTEXT@
-XGETTEXT_015 = @XGETTEXT_015@
-XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
-abs_builddir = @abs_builddir@
-abs_srcdir = @abs_srcdir@
-abs_top_builddir = @abs_top_builddir@
-abs_top_srcdir = @abs_top_srcdir@
-ac_ct_AR = @ac_ct_AR@
-ac_ct_CC = @ac_ct_CC@
-ac_ct_CXX = @ac_ct_CXX@
-ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-am__include = @am__include@
-am__leading_dot = @am__leading_dot@
-am__quote = @am__quote@
-am__tar = @am__tar@
-am__untar = @am__untar@
-bindir = @bindir@
-build = @build@
-build_alias = @build_alias@
-build_cpu = @build_cpu@
-build_os = @build_os@
-build_vendor = @build_vendor@
-builddir = @builddir@
-datadir = @datadir@
-datarootdir = @datarootdir@
-docdir = @docdir@
-dvidir = @dvidir@
-exec_prefix = @exec_prefix@
-host = @host@
-host_alias = @host_alias@
-host_cpu = @host_cpu@
-host_os = @host_os@
-host_vendor = @host_vendor@
-htmldir = @htmldir@
-includedir = @includedir@
-infodir = @infodir@
-install_sh = @install_sh@
-intltool__v_merge_options_ = @intltool__v_merge_options_@
-intltool__v_merge_options_0 = @intltool__v_merge_options_0@
-libdir = @libdir@
-libexecdir = @libexecdir@
-localedir = @localedir@
-localstatedir = @localstatedir@
-mandir = @mandir@
-mkdir_p = @mkdir_p@
-oldincludedir = @oldincludedir@
-pdfdir = @pdfdir@
-prefix = @prefix@
-program_transform_name = @program_transform_name@
-psdir = @psdir@
-sbindir = @sbindir@
-sharedstatedir = @sharedstatedir@
-srcdir = @srcdir@
-sysconfdir = @sysconfdir@
-systemdsystemunitdir = @systemdsystemunitdir@
-target_alias = @target_alias@
-top_build_prefix = @top_build_prefix@
-top_builddir = @top_builddir@
-top_srcdir = @top_srcdir@
-initddir = $(sysconfdir)/init.d
-initd_SCRIPTS = NetworkManager
-all: all-am
-
-.SUFFIXES:
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
-	@for dep in $?; do \
-	  case '$(am__configure_deps)' in \
-	    *$$dep*) \
-	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
-	        && { if test -f $@; then exit 0; else break; fi; }; \
-	      exit 1;; \
-	  esac; \
-	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu initscript/paldo/Makefile'; \
-	$(am__cd) $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu initscript/paldo/Makefile
-.PRECIOUS: Makefile
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-	@case '$?' in \
-	  *config.status*) \
-	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
-	  *) \
-	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
-	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
-	esac;
-
-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-
-$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(am__aclocal_m4_deps):
-NetworkManager: $(top_builddir)/config.status $(srcdir)/NetworkManager.in
-	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
-install-initdSCRIPTS: $(initd_SCRIPTS)
-	@$(NORMAL_INSTALL)
-	@list='$(initd_SCRIPTS)'; test -n "$(initddir)" || list=; \
-	if test -n "$$list"; then \
-	  echo " $(MKDIR_P) '$(DESTDIR)$(initddir)'"; \
-	  $(MKDIR_P) "$(DESTDIR)$(initddir)" || exit 1; \
-	fi; \
-	for p in $$list; do \
-	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-	  if test -f "$$d$$p"; then echo "$$d$$p"; echo "$$p"; else :; fi; \
-	done | \
-	sed -e 'p;s,.*/,,;n' \
-	    -e 'h;s|.*|.|' \
-	    -e 'p;x;s,.*/,,;$(transform)' | sed 'N;N;N;s,\n, ,g' | \
-	$(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1; } \
-	  { d=$$3; if (dirs[d] != 1) { print "d", d; dirs[d] = 1 } \
-	    if ($$2 == $$4) { files[d] = files[d] " " $$1; \
-	      if (++n[d] == $(am__install_max)) { \
-		print "f", d, files[d]; n[d] = 0; files[d] = "" } } \
-	    else { print "f", d "/" $$4, $$1 } } \
-	  END { for (d in files) print "f", d, files[d] }' | \
-	while read type dir files; do \
-	     if test "$$dir" = .; then dir=; else dir=/$$dir; fi; \
-	     test -z "$$files" || { \
-	       echo " $(INSTALL_SCRIPT) $$files '$(DESTDIR)$(initddir)$$dir'"; \
-	       $(INSTALL_SCRIPT) $$files "$(DESTDIR)$(initddir)$$dir" || exit $$?; \
-	     } \
-	; done
-
-uninstall-initdSCRIPTS:
-	@$(NORMAL_UNINSTALL)
-	@list='$(initd_SCRIPTS)'; test -n "$(initddir)" || exit 0; \
-	files=`for p in $$list; do echo "$$p"; done | \
-	       sed -e 's,.*/,,;$(transform)'`; \
-	dir='$(DESTDIR)$(initddir)'; $(am__uninstall_files_from_dir)
-
-mostlyclean-libtool:
-	-rm -f *.lo
-
-clean-libtool:
-	-rm -rf .libs _libs
-tags: TAGS
-TAGS:
-
-ctags: CTAGS
-CTAGS:
-
-
-distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-	list='$(DISTFILES)'; \
-	  dist_files=`for file in $$list; do echo $$file; done | \
-	  sed -e "s|^$$srcdirstrip/||;t" \
-	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
-	case $$dist_files in \
-	  */*) $(MKDIR_P) `echo "$$dist_files" | \
-			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
-			   sort -u` ;; \
-	esac; \
-	for file in $$dist_files; do \
-	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  if test -d $$d/$$file; then \
-	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
-	    if test -d "$(distdir)/$$file"; then \
-	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-	    fi; \
-	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
-	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-	    fi; \
-	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
-	  else \
-	    test -f "$(distdir)/$$file" \
-	    || cp -p $$d/$$file "$(distdir)/$$file" \
-	    || exit 1; \
-	  fi; \
-	done
-check-am: all-am
-check: check-am
-all-am: Makefile $(SCRIPTS)
-installdirs:
-	for dir in "$(DESTDIR)$(initddir)"; do \
-	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
-	done
-install: install-am
-install-exec: install-exec-am
-install-data: install-data-am
-uninstall: uninstall-am
-
-install-am: all-am
-	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-
-installcheck: installcheck-am
-install-strip:
-	if test -z '$(STRIP)'; then \
-	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	      install; \
-	else \
-	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
-	fi
-mostlyclean-generic:
-
-clean-generic:
-
-distclean-generic:
-	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
-
-maintainer-clean-generic:
-	@echo "This command is intended for maintainers to use"
-	@echo "it deletes files that may require special tools to rebuild."
-clean: clean-am
-
-clean-am: clean-generic clean-libtool mostlyclean-am
-
-distclean: distclean-am
-	-rm -f Makefile
-distclean-am: clean-am distclean-generic
-
-dvi: dvi-am
-
-dvi-am:
-
-html: html-am
-
-html-am:
-
-info: info-am
-
-info-am:
-
-install-data-am: install-initdSCRIPTS
-
-install-dvi: install-dvi-am
-
-install-dvi-am:
-
-install-exec-am:
-
-install-html: install-html-am
-
-install-html-am:
-
-install-info: install-info-am
-
-install-info-am:
-
-install-man:
-
-install-pdf: install-pdf-am
-
-install-pdf-am:
-
-install-ps: install-ps-am
-
-install-ps-am:
-
-installcheck-am:
-
-maintainer-clean: maintainer-clean-am
-	-rm -f Makefile
-maintainer-clean-am: distclean-am maintainer-clean-generic
-
-mostlyclean: mostlyclean-am
-
-mostlyclean-am: mostlyclean-generic mostlyclean-libtool
-
-pdf: pdf-am
-
-pdf-am:
-
-ps: ps-am
-
-ps-am:
-
-uninstall-am: uninstall-initdSCRIPTS
-
-.MAKE: install-am install-strip
-
-.PHONY: all all-am check check-am clean clean-generic clean-libtool \
-	distclean distclean-generic distclean-libtool distdir dvi \
-	dvi-am html html-am info info-am install install-am \
-	install-data install-data-am install-dvi install-dvi-am \
-	install-exec install-exec-am install-html install-html-am \
-	install-info install-info-am install-initdSCRIPTS install-man \
-	install-pdf install-pdf-am install-ps install-ps-am \
-	install-strip installcheck installcheck-am installdirs \
-	maintainer-clean maintainer-clean-generic mostlyclean \
-	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
-	uninstall uninstall-am uninstall-initdSCRIPTS
-
-
-# Tell versions [3.59,3.63) of GNU make to not export all variables.
-# Otherwise a system limit (for SysV at least) may be exceeded.
-.NOEXPORT:
diff --git a/introspection/Makefile.am b/introspection/Makefile.am
index a267b51a..3850a234 100644
--- a/introspection/Makefile.am
+++ b/introspection/Makefile.am
@@ -13,6 +13,7 @@ EXTRA_DIST = \
 	nm-device-wimax.xml \
 	nm-device-infiniband.xml \
 	nm-device-bond.xml \
+	nm-device-bridge.xml \
 	nm-device-vlan.xml \
 	nm-device.xml \
 	nm-ip4-config.xml \
diff --git a/introspection/Makefile.in b/introspection/Makefile.in
index 158e7b4c..268ffd4e 100644
--- a/introspection/Makefile.in
+++ b/introspection/Makefile.in
@@ -55,16 +55,18 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
 	$(srcdir)/all.xml.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/compiler_warnings.m4 \
-	$(top_srcdir)/m4/gettext.m4 $(top_srcdir)/m4/gtk-doc.m4 \
-	$(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/intlmacosx.m4 \
-	$(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/introspection.m4 \
-	$(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \
-	$(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/libnl-check.m4 \
-	$(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \
-	$(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
-	$(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/nls.m4 \
-	$(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/progtest.m4 \
-	$(top_srcdir)/m4/vapigen.m4 $(top_srcdir)/configure.ac
+	$(top_srcdir)/m4/gettext.m4 \
+	$(top_srcdir)/m4/gnome-code-coverage.m4 \
+	$(top_srcdir)/m4/gtk-doc.m4 $(top_srcdir)/m4/iconv.m4 \
+	$(top_srcdir)/m4/intlmacosx.m4 $(top_srcdir)/m4/intltool.m4 \
+	$(top_srcdir)/m4/introspection.m4 $(top_srcdir)/m4/lib-ld.m4 \
+	$(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \
+	$(top_srcdir)/m4/libnl-check.m4 $(top_srcdir)/m4/libtool.m4 \
+	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
+	$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
+	$(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/po.m4 \
+	$(top_srcdir)/m4/progtest.m4 $(top_srcdir)/m4/vapigen.m4 \
+	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(install_sh) -d
@@ -97,6 +99,10 @@ AWK = @AWK@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
+CKDB_PATH = @CKDB_PATH@
+CODE_COVERAGE_CFLAGS = @CODE_COVERAGE_CFLAGS@
+CODE_COVERAGE_ENABLED = @CODE_COVERAGE_ENABLED@
+CODE_COVERAGE_LDFLAGS = @CODE_COVERAGE_LDFLAGS@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CXX = @CXX@
@@ -111,9 +117,7 @@ DBUS_SYS_DIR = @DBUS_SYS_DIR@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
 DHCLIENT_PATH = @DHCLIENT_PATH@
-DHCLIENT_VERSION = @DHCLIENT_VERSION@
 DHCPCD_PATH = @DHCPCD_PATH@
-DISABLE_DEPRECATED = @DISABLE_DEPRECATED@
 DLLTOOL = @DLLTOOL@
 DSYMUTIL = @DSYMUTIL@
 DUMPBIN = @DUMPBIN@
@@ -123,17 +127,14 @@ ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
 FGREP = @FGREP@
+GENHTML = @GENHTML@
 GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
 GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
-GIO_CFLAGS = @GIO_CFLAGS@
-GIO_LIBS = @GIO_LIBS@
 GLIB_CFLAGS = @GLIB_CFLAGS@
 GLIB_GENMARSHAL = @GLIB_GENMARSHAL@
 GLIB_LIBS = @GLIB_LIBS@
 GLIB_MAKEFILE = @GLIB_MAKEFILE@
 GLIB_MKENUMS = @GLIB_MKENUMS@
-GMODULE_CFLAGS = @GMODULE_CFLAGS@
-GMODULE_LIBS = @GMODULE_LIBS@
 GMSGFMT = @GMSGFMT@
 GMSGFMT_015 = @GMSGFMT_015@
 GNUTLS_CFLAGS = @GNUTLS_CFLAGS@
@@ -174,6 +175,7 @@ IPTABLES_PATH = @IPTABLES_PATH@
 IWMX_SDK_CFLAGS = @IWMX_SDK_CFLAGS@
 IWMX_SDK_LIBS = @IWMX_SDK_LIBS@
 KERNEL_FIRMWARE_DIR = @KERNEL_FIRMWARE_DIR@
+LCOV = @LCOV@
 LD = @LD@
 LDFLAGS = @LDFLAGS@
 LIBDL = @LIBDL@
@@ -190,11 +192,7 @@ LIBNL2_LIBS = @LIBNL2_LIBS@
 LIBNL3_CFLAGS = @LIBNL3_CFLAGS@
 LIBNL3_LIBS = @LIBNL3_LIBS@
 LIBNL_CFLAGS = @LIBNL_CFLAGS@
-LIBNL_GENL3_CFLAGS = @LIBNL_GENL3_CFLAGS@
-LIBNL_GENL3_LIBS = @LIBNL_GENL3_LIBS@
 LIBNL_LIBS = @LIBNL_LIBS@
-LIBNL_ROUTE3_CFLAGS = @LIBNL_ROUTE3_CFLAGS@
-LIBNL_ROUTE3_LIBS = @LIBNL_ROUTE3_LIBS@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
 LIBSOUP_CFLAGS = @LIBSOUP_CFLAGS@
@@ -209,6 +207,8 @@ MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MANIFEST_TOOL = @MANIFEST_TOOL@
 MKDIR_P = @MKDIR_P@
+MM_GLIB_CFLAGS = @MM_GLIB_CFLAGS@
+MM_GLIB_LIBS = @MM_GLIB_LIBS@
 MOC = @MOC@
 MSGFMT = @MSGFMT@
 MSGFMT_015 = @MSGFMT_015@
@@ -218,6 +218,7 @@ NMEDIT = @NMEDIT@
 NM_MAJOR_VERSION = @NM_MAJOR_VERSION@
 NM_MICRO_VERSION = @NM_MICRO_VERSION@
 NM_MINOR_VERSION = @NM_MINOR_VERSION@
+NM_MODIFY_SYSTEM_POLICY = @NM_MODIFY_SYSTEM_POLICY@
 NM_VERSION = @NM_VERSION@
 NSS_CFLAGS = @NSS_CFLAGS@
 NSS_LIBS = @NSS_LIBS@
@@ -244,13 +245,14 @@ PPPD_PLUGIN_DIR = @PPPD_PLUGIN_DIR@
 QT_CFLAGS = @QT_CFLAGS@
 QT_LIBS = @QT_LIBS@
 RANLIB = @RANLIB@
-RESOLVCONF_PATH = @RESOLVCONF_PATH@
 SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
-SYSTEMD_CFLAGS = @SYSTEMD_CFLAGS@
-SYSTEMD_LIBS = @SYSTEMD_LIBS@
+SYSTEMD_INHIBIT_CFLAGS = @SYSTEMD_INHIBIT_CFLAGS@
+SYSTEMD_INHIBIT_LIBS = @SYSTEMD_INHIBIT_LIBS@
+SYSTEMD_LOGIN_CFLAGS = @SYSTEMD_LOGIN_CFLAGS@
+SYSTEMD_LOGIN_LIBS = @SYSTEMD_LOGIN_LIBS@
 SYSTEM_CA_PATH = @SYSTEM_CA_PATH@
 UDEV_BASE_DIR = @UDEV_BASE_DIR@
 USE_NLS = @USE_NLS@
@@ -305,6 +307,11 @@ localedir = @localedir@
 localstatedir = @localstatedir@
 mandir = @mandir@
 mkdir_p = @mkdir_p@
+nmbinary = @nmbinary@
+nmconfdir = @nmconfdir@
+nmdatadir = @nmdatadir@
+nmrundir = @nmrundir@
+nmstatedir = @nmstatedir@
 oldincludedir = @oldincludedir@
 pdfdir = @pdfdir@
 prefix = @prefix@
@@ -319,6 +326,10 @@ target_alias = @target_alias@
 top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
+with_dhclient = @with_dhclient@
+with_dhcpcd = @with_dhcpcd@
+with_netconfig = @with_netconfig@
+with_resolvconf = @with_resolvconf@
 EXTRA_DIST = \
 	all.xml.in \
 	generic-types.xml \
@@ -334,6 +345,7 @@ EXTRA_DIST = \
 	nm-device-wimax.xml \
 	nm-device-infiniband.xml \
 	nm-device-bond.xml \
+	nm-device-bridge.xml \
 	nm-device-vlan.xml \
 	nm-device.xml \
 	nm-ip4-config.xml \
diff --git a/introspection/all.xml.in b/introspection/all.xml.in
index e9e7b0e0..a8cea613 100644
--- a/introspection/all.xml.in
+++ b/introspection/all.xml.in
@@ -36,6 +36,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
 
+
 
 
 
diff --git a/introspection/generic-types.xml b/introspection/generic-types.xml
index 1a9e3169..681b6662 100644
--- a/introspection/generic-types.xml
+++ b/introspection/generic-types.xml
@@ -26,10 +26,25 @@
       Mode is unknown.
     
     
-      Uncoordinated network without central infrastructure.
+      
+        For both devices and access point objects, indicates the object is
+        part of an Ad-Hoc 802.11 network without a central coordinating access
+        point.
+      
     
     
-      Coordinated network with one or more central controllers.
+      
+        The wireless device or access point is in infrastructure mode.  For
+        devices, this indicates the device is an 802.11 client/station.  For
+        access point objects, this indicates the object is an access point that
+        provides connectivity to clients.
+      
+    
+    
+      
+        The device is an access point/hotspot.  Not valid for access point
+        objects themselves.
+      
     
   
 
diff --git a/introspection/nm-active-connection.xml b/introspection/nm-active-connection.xml
index ef01ab16..d90565ae 100644
--- a/introspection/nm-active-connection.xml
+++ b/introspection/nm-active-connection.xml
@@ -70,6 +70,11 @@
           The connection is being torn down and cleaned up.
         
       
+      
+        
+          The connection is no longer active.
+        
+      
     
   
 
diff --git a/introspection/nm-device-bridge.xml b/introspection/nm-device-bridge.xml
new file mode 100644
index 00000000..f3b25602
--- /dev/null
+++ b/introspection/nm-device-bridge.xml
@@ -0,0 +1,34 @@
+
+
+
+  
+
+    
+      
+        Hardware address of the device.
+      
+    
+
+    
+      
+        Indicates whether the physical carrier is found (e.g. whether a cable is plugged in or not).
+      
+    
+
+    
+      
+        Array of object paths representing devices which are currently
+	slaved to this device.
+      
+    
+
+    
+        
+            
+                A dictionary mapping property names to variant boxed values
+            
+        
+    
+
+  
+
diff --git a/introspection/nm-device.xml b/introspection/nm-device.xml
index 20bbb917..b03b1b84 100644
--- a/introspection/nm-device.xml
+++ b/introspection/nm-device.xml
@@ -120,6 +120,11 @@
         The general type of the network device; ie Ethernet, WiFi, etc.
       
     
+    
+      
+        An array of object paths of every configured connection that is currently 'available' through this device.
+      
+    
 
     
       
@@ -279,6 +284,11 @@
           The device is an ADSL device supporting PPPoE and PPPoATM protocols.
         
       
+      
+        
+          The device is a bridge interface.
+        
+      
     
 
     
@@ -554,6 +564,21 @@
           Problem with the RFC 2684 Ethernet over ADSL bridge.
         
       
+      
+        
+          ModemManager was not running or quit unexpectedly.
+        
+      
+      
+        
+          The 802.11 Wi-Fi network could not be found.
+        
+      
+      
+        
+          A secondary connection of the base connection failed.
+        
+      
     
 
     
diff --git a/introspection/nm-manager.xml b/introspection/nm-manager.xml
index f5fd7abc..6f3c8cac 100644
--- a/introspection/nm-manager.xml
+++ b/introspection/nm-manager.xml
@@ -216,11 +216,30 @@
         
           A combination of logging domains separated by commas (','), or "NONE"
           to disable logging.  Each domain enables logging for operations
-          related to that domain.  Available domains are: [NONE, HW, RFKILL,
-          ETHER, WIFI, BT, MB, DHCP4, DHCP6, PPP, WIFI_SCAN, IP4, IP6, AUTOIP4,
-          DNS, VPN, SHARING, SUPPLICANT, USER_SET, SYS_SET, SUSPEND, CORE,
-          DEVICE, OLPC].  If an empty string is given, the log level is changed
-          but the current set of log domains remains unchanged.
+          related to that domain.  Available domains are: [HW, RFKILL, ETHER,
+          WIFI, BT, MB, DHCP4, DHCP6, PPP, WIFI_SCAN, IP4, IP6, AUTOIP4, DNS,
+          VPN, SHARING, SUPPLICANT, AGENTS, SETTINGS, SUSPEND, CORE, DEVICE,
+          OLPC, WIMAX, INFINIBAND, FIREWALL, ADSL, BOND, VLAN].  In addition to
+          these domains, the following special domains can be used: [NONE, ALL,
+          DEFAULT, DHCP, IP].  If an empty string is given, the log level is
+          changed but the current set of log domains remains unchanged.
+        
+      
+    
+
+    
+      
+      
+        Get current logging verbosity level and operations domains.
+      
+      
+        
+          One of [ERR, WARN, INFO, DEBUG].
+        
+      
+      
+        
+          For available domains see SetLogging() call.
         
       
     
diff --git a/libnm-glib/Makefile.am b/libnm-glib/Makefile.am
index 600b0405..372f0311 100644
--- a/libnm-glib/Makefile.am
+++ b/libnm-glib/Makefile.am
@@ -1,6 +1,6 @@
 include $(GLIB_MAKEFILE)
 
-SUBDIRS=. tests
+SUBDIRS = . tests
 
 INCLUDES = \
 	-I$(top_srcdir)/include \
@@ -45,7 +45,7 @@ libdeprecated_HEADERS = libnm_glib.h
 lib_LTLIBRARIES = libnm-glib.la libnm-glib-vpn.la
 
 libnm_glib_la_CFLAGS = \
-	$(GIO_CFLAGS) \
+	$(GLIB_CFLAGS) \
 	$(DBUS_CFLAGS) \
 	$(GUDEV_CFLAGS)
 
@@ -63,6 +63,7 @@ libnminclude_HEADERS = \
 	nm-device-bt.h \
 	nm-device-olpc-mesh.h \
 	nm-device-bond.h \
+	nm-device-bridge.h \
 	nm-device-vlan.h \
 	nm-access-point.h \
 	nm-ip4-config.h \
@@ -97,6 +98,7 @@ libnm_glib_la_csources = \
 	nm-device-bt.c \
 	nm-device-olpc-mesh.c \
 	nm-device-bond.c \
+	nm-device-bridge.c \
 	nm-device-vlan.c \
 	nm-access-point.c \
 	nm-ip4-config.c \
@@ -139,7 +141,7 @@ nm_glib_marshal_sources = $(libnm_glib_la_SOURCES)
 libnm_glib_la_LIBADD = \
 	$(top_builddir)/libnm-util/libnm-util.la \
 	$(builddir)/libdeprecated-nm-glib.la \
-	$(GIO_LIBS) \
+	$(GLIB_LIBS) \
 	$(DBUS_LIBS) \
 	$(GUDEV_LIBS)
 
@@ -151,8 +153,8 @@ libnm_glib_la_LDFLAGS = -Wl,--version-script=$(SYMBOL_VIS_FILE) \
 noinst_PROGRAMS = libnm-glib-test
 
 libnm_glib_test_SOURCES = libnm-glib-test.c
-libnm_glib_test_CFLAGS = $(GIO_CFLAGS) $(DBUS_CFLAGS)
-libnm_glib_test_LDADD = libnm-glib.la $(top_builddir)/libnm-util/libnm-util.la $(GIO_LIBS) $(DBUS_LIBS)
+libnm_glib_test_CFLAGS = $(GLIB_CFLAGS) $(DBUS_CFLAGS)
+libnm_glib_test_LDADD = libnm-glib.la $(top_builddir)/libnm-util/libnm-util.la $(GLIB_LIBS) $(DBUS_LIBS)
 
 
 libnm_glib_vpn_la_SOURCES = \
@@ -162,8 +164,8 @@ libnm_glib_vpn_la_SOURCES = \
 	nm-vpn-enum-types.c
 GLIB_GENERATED += nm-vpn-enum-types.h nm-vpn-enum-types.c
 nm_vpn_enum_types_sources = $(libnmvpn_HEADERS)
-libnm_glib_vpn_la_CFLAGS = $(GIO_CFLAGS) $(DBUS_CFLAGS)
-libnm_glib_vpn_la_LIBADD = $(top_builddir)/libnm-util/libnm-util.la $(GIO_LIBS) $(DBUS_LIBS)
+libnm_glib_vpn_la_CFLAGS = $(GLIB_CFLAGS) $(DBUS_CFLAGS)
+libnm_glib_vpn_la_LIBADD = $(top_builddir)/libnm-util/libnm-util.la $(GLIB_LIBS) $(DBUS_LIBS)
 libnm_glib_vpn_la_LDFLAGS = -Wl,--version-script=$(srcdir)/libnm-glib-vpn.ver \
 	-version-info "2:0:1"
 
@@ -174,7 +176,7 @@ BUILT_SOURCES += $(GLIB_GENERATED)
 #####################################################
 
 libnm_glib_test_la_CFLAGS = \
-	$(GIO_CFLAGS) \
+	$(GLIB_CFLAGS) \
 	$(DBUS_CFLAGS) \
 	$(GUDEV_CFLAGS) \
 	-DLIBNM_GLIB_TEST
@@ -185,7 +187,7 @@ libnm_glib_test_la_SOURCES = \
 
 libnm_glib_test_la_LIBADD = \
 	$(top_builddir)/libnm-util/libnm-util.la \
-	$(GIO_LIBS) \
+	$(GLIB_LIBS) \
 	$(DBUS_LIBS) \
 	$(GUDEV_LIBS)
 
@@ -232,7 +234,7 @@ typelib_DATA = $(INTROSPECTION_GIRS:.gir=.typelib)
 CLEANFILES += $(gir_DATA) $(typelib_DATA)
 endif
 
-if WITH_TESTS
+if ENABLE_TESTS
 
 check-local:
 	$(top_srcdir)/tools/check-exports.sh $(builddir)/.libs/libnm-glib.so $(SYMBOL_VIS_FILE)
diff --git a/libnm-glib/Makefile.in b/libnm-glib/Makefile.in
index c2a76652..c506402b 100644
--- a/libnm-glib/Makefile.in
+++ b/libnm-glib/Makefile.in
@@ -64,16 +64,18 @@ DIST_COMMON = $(libdeprecated_HEADERS) $(libnminclude_HEADERS) \
 	$(srcdir)/libnm-glib.pc.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/compiler_warnings.m4 \
-	$(top_srcdir)/m4/gettext.m4 $(top_srcdir)/m4/gtk-doc.m4 \
-	$(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/intlmacosx.m4 \
-	$(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/introspection.m4 \
-	$(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \
-	$(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/libnl-check.m4 \
-	$(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \
-	$(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
-	$(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/nls.m4 \
-	$(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/progtest.m4 \
-	$(top_srcdir)/m4/vapigen.m4 $(top_srcdir)/configure.ac
+	$(top_srcdir)/m4/gettext.m4 \
+	$(top_srcdir)/m4/gnome-code-coverage.m4 \
+	$(top_srcdir)/m4/gtk-doc.m4 $(top_srcdir)/m4/iconv.m4 \
+	$(top_srcdir)/m4/intlmacosx.m4 $(top_srcdir)/m4/intltool.m4 \
+	$(top_srcdir)/m4/introspection.m4 $(top_srcdir)/m4/lib-ld.m4 \
+	$(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \
+	$(top_srcdir)/m4/libnl-check.m4 $(top_srcdir)/m4/libtool.m4 \
+	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
+	$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
+	$(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/po.m4 \
+	$(top_srcdir)/m4/progtest.m4 $(top_srcdir)/m4/vapigen.m4 \
+	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(install_sh) -d
@@ -136,6 +138,7 @@ am__objects_2 = libnm_glib_test_la-nm-object.lo \
 	libnm_glib_test_la-nm-device-bt.lo \
 	libnm_glib_test_la-nm-device-olpc-mesh.lo \
 	libnm_glib_test_la-nm-device-bond.lo \
+	libnm_glib_test_la-nm-device-bridge.lo \
 	libnm_glib_test_la-nm-device-vlan.lo \
 	libnm_glib_test_la-nm-access-point.lo \
 	libnm_glib_test_la-nm-ip4-config.lo \
@@ -183,6 +186,7 @@ am__objects_4 = libnm_glib_la-nm-object.lo libnm_glib_la-nm-client.lo \
 	libnm_glib_la-nm-device-wifi.lo libnm_glib_la-nm-device-bt.lo \
 	libnm_glib_la-nm-device-olpc-mesh.lo \
 	libnm_glib_la-nm-device-bond.lo \
+	libnm_glib_la-nm-device-bridge.lo \
 	libnm_glib_la-nm-device-vlan.lo \
 	libnm_glib_la-nm-access-point.lo \
 	libnm_glib_la-nm-ip4-config.lo \
@@ -308,6 +312,10 @@ AWK = @AWK@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
+CKDB_PATH = @CKDB_PATH@
+CODE_COVERAGE_CFLAGS = @CODE_COVERAGE_CFLAGS@
+CODE_COVERAGE_ENABLED = @CODE_COVERAGE_ENABLED@
+CODE_COVERAGE_LDFLAGS = @CODE_COVERAGE_LDFLAGS@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CXX = @CXX@
@@ -322,9 +330,7 @@ DBUS_SYS_DIR = @DBUS_SYS_DIR@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
 DHCLIENT_PATH = @DHCLIENT_PATH@
-DHCLIENT_VERSION = @DHCLIENT_VERSION@
 DHCPCD_PATH = @DHCPCD_PATH@
-DISABLE_DEPRECATED = @DISABLE_DEPRECATED@
 DLLTOOL = @DLLTOOL@
 DSYMUTIL = @DSYMUTIL@
 DUMPBIN = @DUMPBIN@
@@ -334,17 +340,14 @@ ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
 FGREP = @FGREP@
+GENHTML = @GENHTML@
 GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
 GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
-GIO_CFLAGS = @GIO_CFLAGS@
-GIO_LIBS = @GIO_LIBS@
 GLIB_CFLAGS = @GLIB_CFLAGS@
 GLIB_GENMARSHAL = @GLIB_GENMARSHAL@
 GLIB_LIBS = @GLIB_LIBS@
 GLIB_MAKEFILE = @GLIB_MAKEFILE@
 GLIB_MKENUMS = @GLIB_MKENUMS@
-GMODULE_CFLAGS = @GMODULE_CFLAGS@
-GMODULE_LIBS = @GMODULE_LIBS@
 GMSGFMT = @GMSGFMT@
 GMSGFMT_015 = @GMSGFMT_015@
 GNUTLS_CFLAGS = @GNUTLS_CFLAGS@
@@ -385,6 +388,7 @@ IPTABLES_PATH = @IPTABLES_PATH@
 IWMX_SDK_CFLAGS = @IWMX_SDK_CFLAGS@
 IWMX_SDK_LIBS = @IWMX_SDK_LIBS@
 KERNEL_FIRMWARE_DIR = @KERNEL_FIRMWARE_DIR@
+LCOV = @LCOV@
 LD = @LD@
 LDFLAGS = @LDFLAGS@
 LIBDL = @LIBDL@
@@ -401,11 +405,7 @@ LIBNL2_LIBS = @LIBNL2_LIBS@
 LIBNL3_CFLAGS = @LIBNL3_CFLAGS@
 LIBNL3_LIBS = @LIBNL3_LIBS@
 LIBNL_CFLAGS = @LIBNL_CFLAGS@
-LIBNL_GENL3_CFLAGS = @LIBNL_GENL3_CFLAGS@
-LIBNL_GENL3_LIBS = @LIBNL_GENL3_LIBS@
 LIBNL_LIBS = @LIBNL_LIBS@
-LIBNL_ROUTE3_CFLAGS = @LIBNL_ROUTE3_CFLAGS@
-LIBNL_ROUTE3_LIBS = @LIBNL_ROUTE3_LIBS@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
 LIBSOUP_CFLAGS = @LIBSOUP_CFLAGS@
@@ -420,6 +420,8 @@ MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MANIFEST_TOOL = @MANIFEST_TOOL@
 MKDIR_P = @MKDIR_P@
+MM_GLIB_CFLAGS = @MM_GLIB_CFLAGS@
+MM_GLIB_LIBS = @MM_GLIB_LIBS@
 MOC = @MOC@
 MSGFMT = @MSGFMT@
 MSGFMT_015 = @MSGFMT_015@
@@ -429,6 +431,7 @@ NMEDIT = @NMEDIT@
 NM_MAJOR_VERSION = @NM_MAJOR_VERSION@
 NM_MICRO_VERSION = @NM_MICRO_VERSION@
 NM_MINOR_VERSION = @NM_MINOR_VERSION@
+NM_MODIFY_SYSTEM_POLICY = @NM_MODIFY_SYSTEM_POLICY@
 NM_VERSION = @NM_VERSION@
 NSS_CFLAGS = @NSS_CFLAGS@
 NSS_LIBS = @NSS_LIBS@
@@ -455,13 +458,14 @@ PPPD_PLUGIN_DIR = @PPPD_PLUGIN_DIR@
 QT_CFLAGS = @QT_CFLAGS@
 QT_LIBS = @QT_LIBS@
 RANLIB = @RANLIB@
-RESOLVCONF_PATH = @RESOLVCONF_PATH@
 SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
-SYSTEMD_CFLAGS = @SYSTEMD_CFLAGS@
-SYSTEMD_LIBS = @SYSTEMD_LIBS@
+SYSTEMD_INHIBIT_CFLAGS = @SYSTEMD_INHIBIT_CFLAGS@
+SYSTEMD_INHIBIT_LIBS = @SYSTEMD_INHIBIT_LIBS@
+SYSTEMD_LOGIN_CFLAGS = @SYSTEMD_LOGIN_CFLAGS@
+SYSTEMD_LOGIN_LIBS = @SYSTEMD_LOGIN_LIBS@
 SYSTEM_CA_PATH = @SYSTEM_CA_PATH@
 UDEV_BASE_DIR = @UDEV_BASE_DIR@
 USE_NLS = @USE_NLS@
@@ -516,6 +520,11 @@ localedir = @localedir@
 localstatedir = @localstatedir@
 mandir = @mandir@
 mkdir_p = @mkdir_p@
+nmbinary = @nmbinary@
+nmconfdir = @nmconfdir@
+nmdatadir = @nmdatadir@
+nmrundir = @nmrundir@
+nmstatedir = @nmstatedir@
 oldincludedir = @oldincludedir@
 pdfdir = @pdfdir@
 prefix = @prefix@
@@ -530,6 +539,10 @@ target_alias = @target_alias@
 top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
+with_dhclient = @with_dhclient@
+with_dhcpcd = @with_dhcpcd@
+with_netconfig = @with_netconfig@
+with_resolvconf = @with_resolvconf@
 SUBDIRS = . tests
 INCLUDES = \
 	-I$(top_srcdir)/include \
@@ -569,7 +582,7 @@ libdeprecated_HEADERS = libnm_glib.h
 #####################################################
 lib_LTLIBRARIES = libnm-glib.la libnm-glib-vpn.la
 libnm_glib_la_CFLAGS = \
-	$(GIO_CFLAGS) \
+	$(GLIB_CFLAGS) \
 	$(DBUS_CFLAGS) \
 	$(GUDEV_CFLAGS)
 
@@ -586,6 +599,7 @@ libnminclude_HEADERS = \
 	nm-device-bt.h \
 	nm-device-olpc-mesh.h \
 	nm-device-bond.h \
+	nm-device-bridge.h \
 	nm-device-vlan.h \
 	nm-access-point.h \
 	nm-ip4-config.h \
@@ -620,6 +634,7 @@ libnm_glib_la_csources = \
 	nm-device-bt.c \
 	nm-device-olpc-mesh.c \
 	nm-device-bond.c \
+	nm-device-bridge.c \
 	nm-device-vlan.c \
 	nm-access-point.c \
 	nm-ip4-config.c \
@@ -661,7 +676,7 @@ nm_glib_marshal_sources = $(libnm_glib_la_SOURCES)
 libnm_glib_la_LIBADD = \
 	$(top_builddir)/libnm-util/libnm-util.la \
 	$(builddir)/libdeprecated-nm-glib.la \
-	$(GIO_LIBS) \
+	$(GLIB_LIBS) \
 	$(DBUS_LIBS) \
 	$(GUDEV_LIBS)
 
@@ -670,8 +685,8 @@ libnm_glib_la_LDFLAGS = -Wl,--version-script=$(SYMBOL_VIS_FILE) \
 	-version-info "8:0:4"
 
 libnm_glib_test_SOURCES = libnm-glib-test.c
-libnm_glib_test_CFLAGS = $(GIO_CFLAGS) $(DBUS_CFLAGS)
-libnm_glib_test_LDADD = libnm-glib.la $(top_builddir)/libnm-util/libnm-util.la $(GIO_LIBS) $(DBUS_LIBS)
+libnm_glib_test_CFLAGS = $(GLIB_CFLAGS) $(DBUS_CFLAGS)
+libnm_glib_test_LDADD = libnm-glib.la $(top_builddir)/libnm-util/libnm-util.la $(GLIB_LIBS) $(DBUS_LIBS)
 libnm_glib_vpn_la_SOURCES = \
 	nm-vpn-plugin.c \
 	nm-vpn-plugin-ui-interface.c \
@@ -679,8 +694,8 @@ libnm_glib_vpn_la_SOURCES = \
 	nm-vpn-enum-types.c
 
 nm_vpn_enum_types_sources = $(libnmvpn_HEADERS)
-libnm_glib_vpn_la_CFLAGS = $(GIO_CFLAGS) $(DBUS_CFLAGS)
-libnm_glib_vpn_la_LIBADD = $(top_builddir)/libnm-util/libnm-util.la $(GIO_LIBS) $(DBUS_LIBS)
+libnm_glib_vpn_la_CFLAGS = $(GLIB_CFLAGS) $(DBUS_CFLAGS)
+libnm_glib_vpn_la_LIBADD = $(top_builddir)/libnm-util/libnm-util.la $(GLIB_LIBS) $(DBUS_LIBS)
 libnm_glib_vpn_la_LDFLAGS = -Wl,--version-script=$(srcdir)/libnm-glib-vpn.ver \
 	-version-info "2:0:1"
 
@@ -689,7 +704,7 @@ libnm_glib_vpn_la_LDFLAGS = -Wl,--version-script=$(srcdir)/libnm-glib-vpn.ver \
 # Test libnm-glib stuff
 #####################################################
 libnm_glib_test_la_CFLAGS = \
-	$(GIO_CFLAGS) \
+	$(GLIB_CFLAGS) \
 	$(DBUS_CFLAGS) \
 	$(GUDEV_CFLAGS) \
 	-DLIBNM_GLIB_TEST
@@ -700,7 +715,7 @@ libnm_glib_test_la_SOURCES = \
 
 libnm_glib_test_la_LIBADD = \
 	$(top_builddir)/libnm-util/libnm-util.la \
-	$(GIO_LIBS) \
+	$(GLIB_LIBS) \
 	$(DBUS_LIBS) \
 	$(GUDEV_LIBS)
 
@@ -836,6 +851,7 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libnm_glib_la-nm-client.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libnm_glib_la-nm-device-adsl.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libnm_glib_la-nm-device-bond.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libnm_glib_la-nm-device-bridge.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libnm_glib_la-nm-device-bt.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libnm_glib_la-nm-device-ethernet.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libnm_glib_la-nm-device-infiniband.Plo@am__quote@
@@ -865,6 +881,7 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libnm_glib_test_la-nm-client.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libnm_glib_test_la-nm-device-adsl.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libnm_glib_test_la-nm-device-bond.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libnm_glib_test_la-nm-device-bridge.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libnm_glib_test_la-nm-device-bt.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libnm_glib_test_la-nm-device-ethernet.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libnm_glib_test_la-nm-device-infiniband.Plo@am__quote@
@@ -894,25 +911,22 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libnm_glib_vpn_la-nm-vpn-plugin.Plo@am__quote@
 
 .c.o:
-@am__fastdepCC_TRUE@	$(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\
-@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
-@am__fastdepCC_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.Po
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $<
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c $<
 
 .c.obj:
-@am__fastdepCC_TRUE@	$(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.obj$$||'`;\
-@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ `$(CYGPATH_W) '$<'` &&\
-@am__fastdepCC_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.Po
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c `$(CYGPATH_W) '$<'`
 
 .c.lo:
-@am__fastdepCC_TRUE@	$(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.lo$$||'`;\
-@am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
-@am__fastdepCC_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.Plo
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $<
@@ -994,6 +1008,13 @@ libnm_glib_test_la-nm-device-bond.lo: nm-device-bond.c
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libnm_glib_test_la_CFLAGS) $(CFLAGS) -c -o libnm_glib_test_la-nm-device-bond.lo `test -f 'nm-device-bond.c' || echo '$(srcdir)/'`nm-device-bond.c
 
+libnm_glib_test_la-nm-device-bridge.lo: nm-device-bridge.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libnm_glib_test_la_CFLAGS) $(CFLAGS) -MT libnm_glib_test_la-nm-device-bridge.lo -MD -MP -MF $(DEPDIR)/libnm_glib_test_la-nm-device-bridge.Tpo -c -o libnm_glib_test_la-nm-device-bridge.lo `test -f 'nm-device-bridge.c' || echo '$(srcdir)/'`nm-device-bridge.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libnm_glib_test_la-nm-device-bridge.Tpo $(DEPDIR)/libnm_glib_test_la-nm-device-bridge.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='nm-device-bridge.c' object='libnm_glib_test_la-nm-device-bridge.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libnm_glib_test_la_CFLAGS) $(CFLAGS) -c -o libnm_glib_test_la-nm-device-bridge.lo `test -f 'nm-device-bridge.c' || echo '$(srcdir)/'`nm-device-bridge.c
+
 libnm_glib_test_la-nm-device-vlan.lo: nm-device-vlan.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libnm_glib_test_la_CFLAGS) $(CFLAGS) -MT libnm_glib_test_la-nm-device-vlan.lo -MD -MP -MF $(DEPDIR)/libnm_glib_test_la-nm-device-vlan.Tpo -c -o libnm_glib_test_la-nm-device-vlan.lo `test -f 'nm-device-vlan.c' || echo '$(srcdir)/'`nm-device-vlan.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libnm_glib_test_la-nm-device-vlan.Tpo $(DEPDIR)/libnm_glib_test_la-nm-device-vlan.Plo
@@ -1218,6 +1239,13 @@ libnm_glib_la-nm-device-bond.lo: nm-device-bond.c
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libnm_glib_la_CFLAGS) $(CFLAGS) -c -o libnm_glib_la-nm-device-bond.lo `test -f 'nm-device-bond.c' || echo '$(srcdir)/'`nm-device-bond.c
 
+libnm_glib_la-nm-device-bridge.lo: nm-device-bridge.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libnm_glib_la_CFLAGS) $(CFLAGS) -MT libnm_glib_la-nm-device-bridge.lo -MD -MP -MF $(DEPDIR)/libnm_glib_la-nm-device-bridge.Tpo -c -o libnm_glib_la-nm-device-bridge.lo `test -f 'nm-device-bridge.c' || echo '$(srcdir)/'`nm-device-bridge.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libnm_glib_la-nm-device-bridge.Tpo $(DEPDIR)/libnm_glib_la-nm-device-bridge.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='nm-device-bridge.c' object='libnm_glib_la-nm-device-bridge.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libnm_glib_la_CFLAGS) $(CFLAGS) -c -o libnm_glib_la-nm-device-bridge.lo `test -f 'nm-device-bridge.c' || echo '$(srcdir)/'`nm-device-bridge.c
+
 libnm_glib_la-nm-device-vlan.lo: nm-device-vlan.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libnm_glib_la_CFLAGS) $(CFLAGS) -MT libnm_glib_la-nm-device-vlan.lo -MD -MP -MF $(DEPDIR)/libnm_glib_la-nm-device-vlan.Tpo -c -o libnm_glib_la-nm-device-vlan.lo `test -f 'nm-device-vlan.c' || echo '$(srcdir)/'`nm-device-vlan.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libnm_glib_la-nm-device-vlan.Tpo $(DEPDIR)/libnm_glib_la-nm-device-vlan.Plo
@@ -1680,7 +1708,7 @@ distdir: $(DISTFILES)
 	      || exit 1; \
 	  fi; \
 	done
-@WITH_TESTS_FALSE@check-local:
+@ENABLE_TESTS_FALSE@check-local:
 check-am: all-am
 	$(MAKE) $(AM_MAKEFLAGS) check-local
 check: $(BUILT_SOURCES)
@@ -1841,8 +1869,8 @@ nm-secret-agent-glue.h: $(top_srcdir)/introspection/nm-secret-agent.xml
 
 @HAVE_INTROSPECTION_TRUE@NMClient-1.0.gir: libnm-glib.la
 
-@WITH_TESTS_TRUE@check-local:
-@WITH_TESTS_TRUE@	$(top_srcdir)/tools/check-exports.sh $(builddir)/.libs/libnm-glib.so $(SYMBOL_VIS_FILE)
+@ENABLE_TESTS_TRUE@check-local:
+@ENABLE_TESTS_TRUE@	$(top_srcdir)/tools/check-exports.sh $(builddir)/.libs/libnm-glib.so $(SYMBOL_VIS_FILE)
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
diff --git a/libnm-glib/libnm-glib.ver b/libnm-glib/libnm-glib.ver
index b063ffac..9fb956af 100644
--- a/libnm-glib/libnm-glib.ver
+++ b/libnm-glib/libnm-glib.ver
@@ -36,6 +36,7 @@ global:
 	nm_client_get_device_by_iface;
 	nm_client_get_device_by_path;
 	nm_client_get_devices;
+	nm_client_get_logging;
 	nm_client_get_manager_running;
 	nm_client_get_permission_result;
 	nm_client_get_state;
@@ -48,6 +49,7 @@ global:
 	nm_client_new_finish;
 	nm_client_permission_get_type;
 	nm_client_permission_result_get_type;
+	nm_client_set_logging;
 	nm_client_sleep;
 	nm_client_wimax_get_enabled;
 	nm_client_wimax_hardware_get_enabled;
@@ -70,6 +72,13 @@ global:
 	nm_device_bond_get_slaves;
 	nm_device_bond_get_type;
 	nm_device_bond_new;
+	nm_device_bridge_error_get_type;
+	nm_device_bridge_error_quark;
+	nm_device_bridge_get_carrier;
+	nm_device_bridge_get_hw_address;
+	nm_device_bridge_get_slaves;
+	nm_device_bridge_get_type;
+	nm_device_bridge_new;
 	nm_device_bt_error_get_type;
 	nm_device_bt_error_quark;
 	nm_device_bt_get_capabilities;
@@ -149,6 +158,7 @@ global:
 	nm_device_wifi_get_permanent_hw_address;
 	nm_device_wifi_get_type;
 	nm_device_wifi_new;
+	nm_device_wifi_request_scan_simple;
 	nm_device_wimax_error_get_type;
 	nm_device_wimax_error_quark;
 	nm_device_wimax_get_active_nsp;
diff --git a/libnm-glib/nm-access-point.c b/libnm-glib/nm-access-point.c
index fef65575..9326d3ab 100644
--- a/libnm-glib/nm-access-point.c
+++ b/libnm-glib/nm-access-point.c
@@ -347,6 +347,9 @@ nm_access_point_connection_valid (NMAccessPoint *ap, NMConnection *connection)
 			return FALSE;
 		if (!strcmp (setting_mode, "adhoc") && (ap_mode != NM_802_11_MODE_ADHOC))
 			return FALSE;
+		/* Hotspot never matches against APs as it's a device-specific mode. */
+		if (!strcmp (setting_mode, "ap"))
+			return FALSE;
 	}
 
 	/* Band and Channel/Frequency */
@@ -658,7 +661,9 @@ nm_access_point_class_init (NMAccessPointClass *ap_class)
 	/**
 	 * NMAccessPoint:mode:
 	 *
-	 * The mode of the access point.
+	 * The mode of the access point; either "infrastructure" (a central
+	 * coordinator of the wireless network allowing clients to connect) or
+	 * "ad-hoc" (a network with no central controller).
 	 **/
 	g_object_class_install_property
 		(object_class, PROP_MODE,
diff --git a/libnm-glib/nm-client.c b/libnm-glib/nm-client.c
index 178a5fdd..62e5f835 100644
--- a/libnm-glib/nm-client.c
+++ b/libnm-glib/nm-client.c
@@ -334,10 +334,14 @@ client_recheck_permissions (DBusGProxy *proxy, gpointer user_data)
  * nm_client_get_devices:
  * @client: a #NMClient
  *
- * Gets all the detected devices.
+ * Gets all the known network devices.  Use nm_device_get_type() or the
+ * NM_IS_DEVICE_XXXX() functions to determine what kind of device member of the
+ * returned array is, and then you may use device-specific methods such as
+ * nm_device_ethernet_get_hw_address().
  *
- * Returns: (transfer none) (element-type NMClient.Device): a #GPtrArray containing all the #NMDevices.
- * The returned array is owned by the client and should not be modified.
+ * Returns: (transfer none) (element-type NMClient.Device): a #GPtrArray
+ * containing all the #NMDevices.  The returned array is owned by the
+ * #NMClient object and should not be modified.
  **/
 const GPtrArray *
 nm_client_get_devices (NMClient *client)
@@ -1041,6 +1045,82 @@ nm_client_get_permission_result (NMClient *client, NMClientPermission permission
 	return GPOINTER_TO_UINT (result);
 }
 
+/**
+ * nm_client_get_logging:
+ * @client: a #NMClient
+ * @level: (allow-none): return location for logging level string
+ * @domains: (allow-none): return location for log domains string. The string is
+ *   a list of domains separated by ","
+ * @error: (allow-none): return location for a #GError, or %NULL
+ *
+ * Gets NetworkManager current logging level and domains.
+ *
+ * Returns: %TRUE on success, %FALSE otherwise
+ **/
+gboolean
+nm_client_get_logging (NMClient *client, char **level, char **domains, GError **error)
+{
+	GError *err = NULL;
+
+	g_return_val_if_fail (NM_IS_CLIENT (client), FALSE);
+	g_return_val_if_fail (level == NULL || *level == NULL, FALSE);
+	g_return_val_if_fail (domains == NULL || *domains == NULL, FALSE);
+	g_return_val_if_fail (error == NULL || *error == NULL, FALSE);
+
+	if (!level && !domains)
+		return TRUE;
+
+	if (!dbus_g_proxy_call (NM_CLIENT_GET_PRIVATE (client)->client_proxy, "GetLogging", &err,
+	                        G_TYPE_INVALID,
+	                        G_TYPE_STRING, level,
+	                        G_TYPE_STRING, domains,
+	                        G_TYPE_INVALID)) {
+		if (error)
+			*error = g_error_copy (err);
+		g_error_free (err);
+		return FALSE;
+	}
+
+	return TRUE;
+}
+
+/**
+ * nm_client_set_logging:
+ * @client: a #NMClient
+ * @level: (allow-none): logging level to set (%NULL or an empty string for no change)
+ * @domains: (allow-none): logging domains to set. The string should be a list of log
+ *   domains separated by ",". (%NULL or an empty string for no change)
+ * @error: (allow-none): return location for a #GError, or %NULL
+ *
+ * Sets NetworkManager logging level and/or domains.
+ *
+ * Returns: %TRUE on success, %FALSE otherwise
+ **/
+gboolean
+nm_client_set_logging (NMClient *client, const char *level, const char *domains, GError **error)
+{
+	GError *err = NULL;
+
+	g_return_val_if_fail (NM_IS_CLIENT (client), FALSE);
+	g_return_val_if_fail (error == NULL || *error == NULL, FALSE);
+
+	if (!level && !domains)
+		return TRUE;
+
+	if (!dbus_g_proxy_call (NM_CLIENT_GET_PRIVATE (client)->client_proxy, "SetLogging", &err,
+	                        G_TYPE_STRING, level ? level : "",
+	                        G_TYPE_STRING, domains ? domains : "",
+	                        G_TYPE_INVALID,
+	                        G_TYPE_INVALID)) {
+		if (error)
+			*error = g_error_copy (err);
+		g_error_free (err);
+		return FALSE;
+	}
+
+	return TRUE;
+}
+
 /****************************************************************/
 
 static void
diff --git a/libnm-glib/nm-client.h b/libnm-glib/nm-client.h
index 64cbce21..6c83e4ce 100644
--- a/libnm-glib/nm-client.h
+++ b/libnm-glib/nm-client.h
@@ -18,7 +18,7 @@
  * Boston, MA 02110-1301 USA.
  *
  * Copyright (C) 2007 - 2008 Novell, Inc.
- * Copyright (C) 2007 - 2011 Red Hat, Inc.
+ * Copyright (C) 2007 - 2012 Red Hat, Inc.
  */
 
 #ifndef NM_CLIENT_H
@@ -209,6 +209,9 @@ void      nm_client_sleep                (NMClient *client, gboolean sleep_);
 NMClientPermissionResult nm_client_get_permission_result (NMClient *client,
                                                           NMClientPermission permission);
 
+gboolean nm_client_get_logging (NMClient *client, char **level, char **domains, GError **error);
+gboolean nm_client_set_logging (NMClient *client, const char *level, const char *domains, GError **error);
+
 G_END_DECLS
 
 #endif /* NM_CLIENT_H */
diff --git a/libnm-glib/nm-device-bridge.c b/libnm-glib/nm-device-bridge.c
new file mode 100644
index 00000000..34e02d6d
--- /dev/null
+++ b/libnm-glib/nm-device-bridge.c
@@ -0,0 +1,346 @@
+/* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */
+/*
+ * libnm_glib -- Access network status & information from glib applications
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the
+ * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA 02110-1301 USA.
+ *
+ * Copyright (C) 2012 Red Hat, Inc.
+ */
+
+#include 
+#include 
+#include 
+
+#include "nm-glib-compat.h"
+
+#include 
+#include 
+#include 
+
+#include "nm-device-bridge.h"
+#include "nm-device-private.h"
+#include "nm-object-private.h"
+#include "nm-types.h"
+
+G_DEFINE_TYPE (NMDeviceBridge, nm_device_bridge, NM_TYPE_DEVICE)
+
+#define NM_DEVICE_BRIDGE_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), NM_TYPE_DEVICE_BRIDGE, NMDeviceBridgePrivate))
+
+typedef struct {
+	DBusGProxy *proxy;
+
+	char *hw_address;
+	gboolean carrier;
+	GPtrArray *slaves;
+} NMDeviceBridgePrivate;
+
+enum {
+	PROP_0,
+	PROP_HW_ADDRESS,
+	PROP_CARRIER,
+	PROP_SLAVES,
+
+	LAST_PROP
+};
+
+#define DBUS_PROP_HW_ADDRESS "HwAddress"
+#define DBUS_PROP_CARRIER "Carrier"
+#define DBUS_PROP_SLAVES "Slaves"
+
+/**
+ * nm_device_bridge_error_quark:
+ *
+ * Registers an error quark for #NMDeviceBridge if necessary.
+ *
+ * Returns: the error quark used for #NMDeviceBridge errors.
+ **/
+GQuark
+nm_device_bridge_error_quark (void)
+{
+	static GQuark quark = 0;
+
+	if (G_UNLIKELY (quark == 0))
+		quark = g_quark_from_static_string ("nm-device-bridge-error-quark");
+	return quark;
+}
+
+/**
+ * nm_device_bridge_new:
+ * @connection: the #DBusGConnection
+ * @path: the DBus object path of the device
+ *
+ * Creates a new #NMDeviceBridge.
+ *
+ * Returns: (transfer full): a new device
+ **/
+GObject *
+nm_device_bridge_new (DBusGConnection *connection, const char *path)
+{
+	GObject *device;
+
+	g_return_val_if_fail (connection != NULL, NULL);
+	g_return_val_if_fail (path != NULL, NULL);
+
+	device = g_object_new (NM_TYPE_DEVICE_BRIDGE,
+	                       NM_OBJECT_DBUS_CONNECTION, connection,
+	                       NM_OBJECT_DBUS_PATH, path,
+	                       NULL);
+	_nm_object_ensure_inited (NM_OBJECT (device));
+	return device;
+}
+
+/**
+ * nm_device_bridge_get_hw_address:
+ * @device: a #NMDeviceBridge
+ *
+ * Gets the hardware (MAC) address of the #NMDeviceBridge
+ *
+ * Returns: the hardware address. This is the internal string used by the
+ * device, and must not be modified.
+ **/
+const char *
+nm_device_bridge_get_hw_address (NMDeviceBridge *device)
+{
+	g_return_val_if_fail (NM_IS_DEVICE_BRIDGE (device), NULL);
+
+	_nm_object_ensure_inited (NM_OBJECT (device));
+	return NM_DEVICE_BRIDGE_GET_PRIVATE (device)->hw_address;
+}
+
+/**
+ * nm_device_bridge_get_carrier:
+ * @device: a #NMDeviceBridge
+ *
+ * Whether the device has carrier.
+ *
+ * Returns: %TRUE if the device has carrier
+ **/
+gboolean
+nm_device_bridge_get_carrier (NMDeviceBridge *device)
+{
+	g_return_val_if_fail (NM_IS_DEVICE_BRIDGE (device), FALSE);
+
+	_nm_object_ensure_inited (NM_OBJECT (device));
+	return NM_DEVICE_BRIDGE_GET_PRIVATE (device)->carrier;
+}
+
+/**
+ * nm_device_bridge_get_slaves:
+ * @device: a #NMDeviceBridge
+ *
+ * Gets the devices currently slaved to @device.
+ *
+ * Returns: (element-type NMClient.Device): the #GPtrArray containing
+ * #NMDevices that are slaves of @device. This is the internal
+ * copy used by the device, and must not be modified.
+ **/
+const GPtrArray *
+nm_device_bridge_get_slaves (NMDeviceBridge *device)
+{
+	g_return_val_if_fail (NM_IS_DEVICE_BRIDGE (device), FALSE);
+
+	_nm_object_ensure_inited (NM_OBJECT (device));
+	return handle_ptr_array_return (NM_DEVICE_BRIDGE_GET_PRIVATE (device)->slaves);
+}
+
+static gboolean
+connection_compatible (NMDevice *device, NMConnection *connection, GError **error)
+{
+	NMSettingConnection *s_con;
+	NMSettingBridge *s_bridge;
+	const char *ctype, *dev_iface_name, *bridge_iface_name;
+
+	g_return_val_if_fail (error == NULL || *error == NULL, FALSE);
+
+	s_con = nm_connection_get_setting_connection (connection);
+	g_assert (s_con);
+
+	ctype = nm_setting_connection_get_connection_type (s_con);
+	if (strcmp (ctype, NM_SETTING_BRIDGE_SETTING_NAME) != 0) {
+		g_set_error (error, NM_DEVICE_BRIDGE_ERROR, NM_DEVICE_BRIDGE_ERROR_NOT_BRIDGE_CONNECTION,
+		             "The connection was not a bridge connection.");
+		return FALSE;
+	}
+
+	s_bridge = nm_connection_get_setting_bridge (connection);
+	if (!s_bridge) {
+		g_set_error (error, NM_DEVICE_BRIDGE_ERROR, NM_DEVICE_BRIDGE_ERROR_INVALID_BRIDGE_CONNECTION,
+		             "The connection was not a valid bridge connection.");
+		return FALSE;
+	}
+
+	dev_iface_name = nm_device_get_iface (device);
+	bridge_iface_name = nm_setting_bridge_get_interface_name (s_bridge);
+	if (g_strcmp0 (dev_iface_name, bridge_iface_name) != 0) {
+		g_set_error (error, NM_DEVICE_BRIDGE_ERROR, NM_DEVICE_BRIDGE_ERROR_INTERFACE_MISMATCH,
+		             "The interfaces of the device and the connection didn't match.");
+		return FALSE;
+	}
+
+	/* FIXME: check ports? */
+
+	return TRUE;
+}
+
+/***********************************************************/
+
+static void
+nm_device_bridge_init (NMDeviceBridge *device)
+{
+	_nm_device_set_device_type (NM_DEVICE (device), NM_DEVICE_TYPE_BRIDGE);
+}
+
+static void
+register_properties (NMDeviceBridge *device)
+{
+	NMDeviceBridgePrivate *priv = NM_DEVICE_BRIDGE_GET_PRIVATE (device);
+	const NMPropertiesInfo property_info[] = {
+		{ NM_DEVICE_BRIDGE_HW_ADDRESS, &priv->hw_address },
+		{ NM_DEVICE_BRIDGE_CARRIER,    &priv->carrier },
+		{ NM_DEVICE_BRIDGE_SLAVES,     &priv->slaves, NULL, NM_TYPE_DEVICE },
+		{ NULL },
+	};
+
+	_nm_object_register_properties (NM_OBJECT (device),
+	                                priv->proxy,
+	                                property_info);
+}
+
+static void
+constructed (GObject *object)
+{
+	NMDeviceBridgePrivate *priv;
+
+	G_OBJECT_CLASS (nm_device_bridge_parent_class)->constructed (object);
+
+	priv = NM_DEVICE_BRIDGE_GET_PRIVATE (object);
+
+	priv->proxy = dbus_g_proxy_new_for_name (nm_object_get_connection (NM_OBJECT (object)),
+	                                         NM_DBUS_SERVICE,
+	                                         nm_object_get_path (NM_OBJECT (object)),
+	                                         NM_DBUS_INTERFACE_DEVICE_BRIDGE);
+
+	register_properties (NM_DEVICE_BRIDGE (object));
+}
+
+static void
+dispose (GObject *object)
+{
+	NMDeviceBridgePrivate *priv = NM_DEVICE_BRIDGE_GET_PRIVATE (object);
+
+	g_clear_object (&priv->proxy);
+
+	if (priv->slaves) {
+		g_ptr_array_foreach (priv->slaves, (GFunc) g_object_unref, NULL);
+		g_ptr_array_free (priv->slaves, TRUE);
+		priv->slaves = NULL;
+	}
+
+	G_OBJECT_CLASS (nm_device_bridge_parent_class)->dispose (object);
+}
+
+static void
+finalize (GObject *object)
+{
+	NMDeviceBridgePrivate *priv = NM_DEVICE_BRIDGE_GET_PRIVATE (object);
+
+	g_free (priv->hw_address);
+
+	G_OBJECT_CLASS (nm_device_bridge_parent_class)->finalize (object);
+}
+
+static void
+get_property (GObject *object,
+              guint prop_id,
+              GValue *value,
+              GParamSpec *pspec)
+{
+	NMDeviceBridge *device = NM_DEVICE_BRIDGE (object);
+
+	_nm_object_ensure_inited (NM_OBJECT (object));
+
+	switch (prop_id) {
+	case PROP_HW_ADDRESS:
+		g_value_set_string (value, nm_device_bridge_get_hw_address (device));
+		break;
+	case PROP_CARRIER:
+		g_value_set_boolean (value, nm_device_bridge_get_carrier (device));
+		break;
+	case PROP_SLAVES:
+		g_value_set_boxed (value, nm_device_bridge_get_slaves (device));
+		break;
+	default:
+		G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
+		break;
+	}
+}
+
+static void
+nm_device_bridge_class_init (NMDeviceBridgeClass *bridge_class)
+{
+	GObjectClass *object_class = G_OBJECT_CLASS (bridge_class);
+	NMDeviceClass *device_class = NM_DEVICE_CLASS (bridge_class);
+
+	g_type_class_add_private (bridge_class, sizeof (NMDeviceBridgePrivate));
+
+	/* virtual methods */
+	object_class->constructed = constructed;
+	object_class->dispose = dispose;
+	object_class->finalize = finalize;
+	object_class->get_property = get_property;
+	device_class->connection_compatible = connection_compatible;
+
+	/* properties */
+
+	/**
+	 * NMDeviceBridge:hw-address:
+	 *
+	 * The hardware (MAC) address of the device.
+	 **/
+	g_object_class_install_property
+		(object_class, PROP_HW_ADDRESS,
+		 g_param_spec_string (NM_DEVICE_BRIDGE_HW_ADDRESS,
+		                      "Active MAC Address",
+		                      "Currently set hardware MAC address",
+		                      NULL,
+		                      G_PARAM_READABLE));
+
+	/**
+	 * NMDeviceBridge:carrier:
+	 *
+	 * Whether the device has carrier.
+	 **/
+	g_object_class_install_property
+		(object_class, PROP_CARRIER,
+		 g_param_spec_boolean (NM_DEVICE_BRIDGE_CARRIER,
+		                       "Carrier",
+		                       "Carrier",
+		                       FALSE,
+		                       G_PARAM_READABLE));
+
+	/**
+	 * NMDeviceBridge:slaves:
+	 *
+	 * The devices (#NMDevice) slaved to the bridge device.
+	 **/
+	g_object_class_install_property
+		(object_class, PROP_SLAVES,
+		 g_param_spec_boxed (NM_DEVICE_BRIDGE_SLAVES,
+		                     "Slaves",
+		                     "Slaves",
+		                     NM_TYPE_OBJECT_ARRAY,
+		                     G_PARAM_READABLE));
+}
diff --git a/libnm-glib/nm-device-bridge.h b/libnm-glib/nm-device-bridge.h
new file mode 100644
index 00000000..3462063d
--- /dev/null
+++ b/libnm-glib/nm-device-bridge.h
@@ -0,0 +1,84 @@
+/* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */
+/*
+ * libnm_glib -- Access network status & information from glib applications
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the
+ * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA 02110-1301 USA.
+ *
+ * Copyright (C) 2012 Red Hat, Inc.
+ */
+
+#ifndef NM_DEVICE_BRIDGE_H
+#define NM_DEVICE_BRIDGE_H
+
+#include "nm-device.h"
+
+G_BEGIN_DECLS
+
+#define NM_TYPE_DEVICE_BRIDGE            (nm_device_bridge_get_type ())
+#define NM_DEVICE_BRIDGE(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), NM_TYPE_DEVICE_BRIDGE, NMDeviceBridge))
+#define NM_DEVICE_BRIDGE_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), NM_TYPE_DEVICE_BRIDGE, NMDeviceBridgeClass))
+#define NM_IS_DEVICE_BRIDGE(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), NM_TYPE_DEVICE_BRIDGE))
+#define NM_IS_DEVICE_BRIDGE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), NM_TYPE_DEVICE_BRIDGE))
+#define NM_DEVICE_BRIDGE_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), NM_TYPE_DEVICE_BRIDGE, NMDeviceBridgeClass))
+
+/**
+ * NMDeviceBridgeError:
+ * @NM_DEVICE_BRIDGE_ERROR_UNKNOWN: unknown or unclassified error
+ * @NM_DEVICE_BRIDGE_ERROR_NOT_BRIDGE_CONNECTION: the connection was not of bridge type
+ * @NM_DEVICE_BRIDGE_ERROR_INVALID_BRIDGE_CONNECTION: the bridge connection was invalid
+ * @NM_DEVICE_BRIDGE_ERROR_INTERFACE_MISMATCH: the interfaces of the connection and the device mismatched
+ */
+typedef enum {
+	NM_DEVICE_BRIDGE_ERROR_UNKNOWN = 0,               /*< nick=UnknownError >*/
+	NM_DEVICE_BRIDGE_ERROR_NOT_BRIDGE_CONNECTION,     /*< nick=NotBridgeConnection >*/
+	NM_DEVICE_BRIDGE_ERROR_INVALID_BRIDGE_CONNECTION, /*< nick=InvalidBridgeConnection >*/
+	NM_DEVICE_BRIDGE_ERROR_INTERFACE_MISMATCH,        /*< nick=InterfaceMismatch >*/
+} NMDeviceBridgeError;
+
+#define NM_DEVICE_BRIDGE_ERROR nm_device_bridge_error_quark ()
+GQuark nm_device_bridge_error_quark (void);
+
+#define NM_DEVICE_BRIDGE_HW_ADDRESS  "hw-address"
+#define NM_DEVICE_BRIDGE_CARRIER     "carrier"
+#define NM_DEVICE_BRIDGE_SLAVES      "slaves"
+
+typedef struct {
+	NMDevice parent;
+} NMDeviceBridge;
+
+typedef struct {
+	NMDeviceClass parent;
+
+	/* Padding for future expansion */
+	void (*_reserved1) (void);
+	void (*_reserved2) (void);
+	void (*_reserved3) (void);
+	void (*_reserved4) (void);
+	void (*_reserved5) (void);
+	void (*_reserved6) (void);
+} NMDeviceBridgeClass;
+
+GType        nm_device_bridge_get_type (void);
+
+GObject *    nm_device_bridge_new (DBusGConnection *connection, const char *path);
+
+const char      *nm_device_bridge_get_hw_address (NMDeviceBridge *device);
+gboolean         nm_device_bridge_get_carrier    (NMDeviceBridge *device);
+const GPtrArray *nm_device_bridge_get_slaves     (NMDeviceBridge *device);
+
+G_END_DECLS
+
+#endif /* NM_DEVICE_BRIDGE_H */
diff --git a/libnm-glib/nm-device-wifi.c b/libnm-glib/nm-device-wifi.c
index 0058fd10..e61554df 100644
--- a/libnm-glib/nm-device-wifi.c
+++ b/libnm-glib/nm-device-wifi.c
@@ -44,6 +44,12 @@ G_DEFINE_TYPE (NMDeviceWifi, nm_device_wifi, NM_TYPE_DEVICE)
 
 void _nm_device_wifi_set_wireless_enabled (NMDeviceWifi *device, gboolean enabled);
 
+typedef struct {
+	NMDeviceWifi *device;
+	NMDeviceWifiRequestScanFn callback;
+	gpointer user_data;
+} RequestScanInfo;
+
 typedef struct {
 	DBusGProxy *proxy;
 
@@ -55,7 +61,8 @@ typedef struct {
 	NMDeviceWifiCapabilities wireless_caps;
 	GPtrArray *aps;
 
-	gboolean wireless_enabled;
+	DBusGProxyCall *scan_call;
+	RequestScanInfo *scan_info;
 } NMDeviceWifiPrivate;
 
 enum {
@@ -318,6 +325,69 @@ nm_device_wifi_get_access_point_by_path (NMDeviceWifi *device,
 	return ap;
 }
 
+static void
+request_scan_cb (DBusGProxy *proxy,
+                 DBusGProxyCall *call,
+                 gpointer user_data)
+{
+	RequestScanInfo *info = user_data;
+	NMDeviceWifiPrivate *priv = NM_DEVICE_WIFI_GET_PRIVATE (info->device);
+	GError *error = NULL;
+
+	dbus_g_proxy_end_call (proxy, call, &error, G_TYPE_INVALID);
+
+	if (info->callback)
+		info->callback (info->device, error, info->user_data);
+
+	g_clear_error (&error);
+	g_slice_free (RequestScanInfo, info);
+
+	priv->scan_call = NULL;
+	priv->scan_info = NULL;
+}
+
+/**
+ * nm_device_wifi_request_scan_simple:
+ * @device: a #NMDeviceWifi
+ * @callback: (scope async) (allow-none): the function to call when the call is done
+ * @user_data: (closure): user data to pass to the callback function
+ *
+ * Request NM to scan for access points on the #NMDeviceWifi. This function only
+ * instructs NM to perform scanning. Use nm_device_wifi_get_access_points()
+ * to get available access points.
+ *
+ **/
+void
+nm_device_wifi_request_scan_simple (NMDeviceWifi *device,
+                                    NMDeviceWifiRequestScanFn callback,
+                                    gpointer user_data)
+{
+	RequestScanInfo *info;
+	GHashTable *options;
+	NMDeviceWifiPrivate *priv = NM_DEVICE_WIFI_GET_PRIVATE (device);
+
+	g_return_if_fail (NM_IS_DEVICE_WIFI (device));
+
+	/* If a scan is in progress, just return */
+	if (priv->scan_call)
+		return;
+
+	options = g_hash_table_new (g_str_hash, g_str_equal);
+
+	info = g_slice_new0 (RequestScanInfo);
+	info->device = device;
+	info->callback = callback;
+	info->user_data = user_data;
+
+	priv->scan_info = info;
+	priv->scan_call = dbus_g_proxy_begin_call (NM_DEVICE_WIFI_GET_PRIVATE (device)->proxy, "RequestScan",
+	                                           request_scan_cb, info, NULL,
+	                                           DBUS_TYPE_G_MAP_OF_VARIANT, options,
+	                                           G_TYPE_INVALID);
+
+	g_hash_table_unref (options);
+}
+
 static void
 access_point_added (NMObject *self, NMObject *ap)
 {
@@ -608,6 +678,22 @@ static void
 dispose (GObject *object)
 {
 	NMDeviceWifiPrivate *priv = NM_DEVICE_WIFI_GET_PRIVATE (object);
+	GError *error = NULL;
+
+	if (priv->scan_call) {
+		g_set_error_literal (&error, NM_DEVICE_WIFI_ERROR, NM_DEVICE_WIFI_ERROR_UNKNOWN,
+		                     "Wi-Fi device was destroyed");
+		if (priv->scan_info) {
+			if (priv->scan_info->callback)
+				priv->scan_info->callback (NULL, error, priv->scan_info->user_data);
+			g_slice_free (RequestScanInfo, priv->scan_info);
+			priv->scan_info = NULL;
+		}
+		g_clear_error (&error);
+
+		dbus_g_proxy_cancel_call (priv->proxy, priv->scan_call);
+		priv->scan_call = NULL;
+	}
 
 	clean_up_aps (NM_DEVICE_WIFI (object), FALSE);
 	g_clear_object (&priv->proxy);
@@ -679,7 +765,7 @@ nm_device_wifi_class_init (NMDeviceWifiClass *wifi_class)
 		 g_param_spec_uint (NM_DEVICE_WIFI_MODE,
 					    "Mode",
 					    "Mode",
-					    NM_802_11_MODE_UNKNOWN, NM_802_11_MODE_INFRA, NM_802_11_MODE_INFRA,
+					    NM_802_11_MODE_UNKNOWN, NM_802_11_MODE_AP, NM_802_11_MODE_INFRA,
 					    G_PARAM_READABLE));
 
 	/**
diff --git a/libnm-glib/nm-device-wifi.h b/libnm-glib/nm-device-wifi.h
index d909c65c..76d76b4d 100644
--- a/libnm-glib/nm-device-wifi.h
+++ b/libnm-glib/nm-device-wifi.h
@@ -104,6 +104,13 @@ NMAccessPoint *          nm_device_wifi_get_access_point_by_path (NMDeviceWifi *
 
 const GPtrArray *        nm_device_wifi_get_access_points        (NMDeviceWifi *device);
 
+typedef void             (*NMDeviceWifiRequestScanFn)            (NMDeviceWifi *device,
+                                                                  GError *error,
+                                                                  gpointer user_data);
+void                     nm_device_wifi_request_scan_simple      (NMDeviceWifi *device,
+                                                                  NMDeviceWifiRequestScanFn callback,
+                                                                  gpointer user_data);
+
 G_END_DECLS
 
 #endif /* NM_DEVICE_WIFI_H */
diff --git a/libnm-glib/nm-device.c b/libnm-glib/nm-device.c
index 865fc088..22e2844c 100644
--- a/libnm-glib/nm-device.c
+++ b/libnm-glib/nm-device.c
@@ -35,6 +35,7 @@
 #include "nm-device-wimax.h"
 #include "nm-device-infiniband.h"
 #include "nm-device-bond.h"
+#include "nm-device-bridge.h"
 #include "nm-device-vlan.h"
 #include "nm-device.h"
 #include "nm-device-private.h"
@@ -79,6 +80,7 @@ typedef struct {
 	NMIP6Config *ip6_config;
 	NMDHCP6Config *dhcp6_config;
 	NMDeviceState state;
+	NMDeviceState last_seen_state;
 	NMDeviceStateReason reason;
 
 	NMActiveConnection *active_connection;
@@ -196,10 +198,24 @@ device_state_change_reloaded (GObject *object,
                               gpointer user_data)
 {
 	NMDevice *self = NM_DEVICE (object);
+	NMDevicePrivate *priv = NM_DEVICE_GET_PRIVATE (self);
 	StateChangeData *data = user_data;
 
 	_nm_object_reload_properties_finish (NM_OBJECT (object), result, NULL);
 
+	/* If the device changes state several times in rapid succession, then we'll
+	 * queue several reload_properties() calls, and there's no guarantee that
+	 * they'll finish in the right order. In that case, only emit the signal
+	 * for the last one.
+	 */
+	if (priv->last_seen_state != data->new_state)
+		return;
+
+	/* Ensure that nm_device_get_state() will return the right value even if
+	 * we haven't processed the corresponding PropertiesChanged yet.
+	 */
+	priv->state = data->new_state;
+
 	g_signal_emit (self, signals[STATE_CHANGED], 0,
 	               data->new_state, data->old_state, data->reason);
 	g_slice_free (StateChangeData, data);
@@ -212,6 +228,9 @@ device_state_changed (DBusGProxy *proxy,
                       NMDeviceStateReason reason,
                       gpointer user_data)
 {
+	NMDevice *self = NM_DEVICE (user_data);
+	NMDevicePrivate *priv = NM_DEVICE_GET_PRIVATE (self);
+
 	if (old_state != new_state) {
 		StateChangeData *data;
 
@@ -220,6 +239,8 @@ device_state_changed (DBusGProxy *proxy,
 		 * in the process of asynchronously reading the new values.
 		 * Wait for that to finish before emitting the signal.
 		 */
+		priv->last_seen_state = new_state;
+
 		data = g_slice_new (StateChangeData);
 		data->old_state = old_state;
 		data->new_state = new_state;
@@ -252,6 +273,8 @@ _nm_device_gtype_from_dtype (NMDeviceType dtype)
 		return NM_TYPE_DEVICE_INFINIBAND;
 	case NM_DEVICE_TYPE_BOND:
 		return NM_TYPE_DEVICE_BOND;
+	case NM_DEVICE_TYPE_BRIDGE:
+		return NM_TYPE_DEVICE_BRIDGE;
 	case NM_DEVICE_TYPE_VLAN:
 		return NM_TYPE_DEVICE_VLAN;
 	default:
diff --git a/libnm-glib/nm-glib-enum-types.c b/libnm-glib/nm-glib-enum-types.c
index 7486ff96..c2e92bee 100644
--- a/libnm-glib/nm-glib-enum-types.c
+++ b/libnm-glib/nm-glib-enum-types.c
@@ -15,6 +15,7 @@
 #include "nm-device-bt.h" 
 #include "nm-device-olpc-mesh.h" 
 #include "nm-device-bond.h" 
+#include "nm-device-bridge.h" 
 #include "nm-device-vlan.h" 
 #include "nm-access-point.h" 
 #include "nm-ip4-config.h" 
@@ -254,6 +255,27 @@ nm_device_bond_error_get_type (void)
   return g_define_type_id__volatile;
 }
 GType
+nm_device_bridge_error_get_type (void)
+{
+  static volatile gsize g_define_type_id__volatile = 0;
+
+  if (g_once_init_enter (&g_define_type_id__volatile))
+    {
+      static const GEnumValue values[] = {
+        { NM_DEVICE_BRIDGE_ERROR_UNKNOWN, "NM_DEVICE_BRIDGE_ERROR_UNKNOWN", "UnknownError" },
+        { NM_DEVICE_BRIDGE_ERROR_NOT_BRIDGE_CONNECTION, "NM_DEVICE_BRIDGE_ERROR_NOT_BRIDGE_CONNECTION", "NotBridgeConnection" },
+        { NM_DEVICE_BRIDGE_ERROR_INVALID_BRIDGE_CONNECTION, "NM_DEVICE_BRIDGE_ERROR_INVALID_BRIDGE_CONNECTION", "InvalidBridgeConnection" },
+        { NM_DEVICE_BRIDGE_ERROR_INTERFACE_MISMATCH, "NM_DEVICE_BRIDGE_ERROR_INTERFACE_MISMATCH", "InterfaceMismatch" },
+        { 0, NULL, NULL }
+      };
+      GType g_define_type_id =
+        g_enum_register_static (g_intern_static_string ("NMDeviceBridgeError"), values);
+      g_once_init_leave (&g_define_type_id__volatile, g_define_type_id);
+    }
+
+  return g_define_type_id__volatile;
+}
+GType
 nm_device_vlan_error_get_type (void)
 {
   static volatile gsize g_define_type_id__volatile = 0;
diff --git a/libnm-glib/nm-glib-enum-types.h b/libnm-glib/nm-glib-enum-types.h
index 6493ab19..f33db002 100644
--- a/libnm-glib/nm-glib-enum-types.h
+++ b/libnm-glib/nm-glib-enum-types.h
@@ -29,6 +29,8 @@ GType nm_device_olpc_mesh_error_get_type (void) G_GNUC_CONST;
 #define NM_TYPE_DEVICE_OLPC_MESH_ERROR (nm_device_olpc_mesh_error_get_type ())
 GType nm_device_bond_error_get_type (void) G_GNUC_CONST;
 #define NM_TYPE_DEVICE_BOND_ERROR (nm_device_bond_error_get_type ())
+GType nm_device_bridge_error_get_type (void) G_GNUC_CONST;
+#define NM_TYPE_DEVICE_BRIDGE_ERROR (nm_device_bridge_error_get_type ())
 GType nm_device_vlan_error_get_type (void) G_GNUC_CONST;
 #define NM_TYPE_DEVICE_VLAN_ERROR (nm_device_vlan_error_get_type ())
 GType nm_device_modem_error_get_type (void) G_GNUC_CONST;
diff --git a/libnm-glib/nm-remote-settings.c b/libnm-glib/nm-remote-settings.c
index 7748f4f0..0e95ef0a 100644
--- a/libnm-glib/nm-remote-settings.c
+++ b/libnm-glib/nm-remote-settings.c
@@ -61,6 +61,7 @@ typedef struct {
 	DBusGProxy *dbus_proxy;
 
 	guint fetch_id;
+	gboolean fetching;
 } NMRemoteSettingsPrivate;
 
 enum {
@@ -381,8 +382,10 @@ connection_inited (GObject *source, GAsyncResult *result, gpointer user_data)
 
 	/* Let listeners know that all connections have been found */
 	priv->init_left--;
-	if (priv->init_left == 0)
+	if (priv->init_left == 0) {
+		priv->fetching = FALSE;
 		g_signal_emit (self, signals[CONNECTIONS_READ], 0);
+	}
 }
 
 static NMRemoteConnection *
@@ -442,14 +445,16 @@ fetch_connections_done (DBusGProxy *proxy,
 		g_clear_error (&error);
 
 		/* We tried to read connections and failed */
+		priv->fetching = FALSE;
 		g_signal_emit (self, signals[CONNECTIONS_READ], 0);
 		return;
 	}
 
 	/* Let listeners know we are done getting connections */
-	if (connections->len == 0)
+	if (connections->len == 0) {
+		priv->fetching = FALSE;
 		g_signal_emit (self, signals[CONNECTIONS_READ], 0);
-	else {
+	} else {
 		priv->init_left = connections->len;
 		for (i = 0; i < connections->len; i++) {
 			char *path = g_ptr_array_index (connections, i);
@@ -681,6 +686,48 @@ nm_remote_settings_save_hostname (NMRemoteSettings *settings,
 	return TRUE;
 }
 
+static void
+properties_changed_cb (DBusGProxy *proxy,
+                       GHashTable *properties,
+                       gpointer user_data)
+{
+	NMRemoteSettings *self = NM_REMOTE_SETTINGS (user_data);
+	NMRemoteSettingsPrivate *priv = NM_REMOTE_SETTINGS_GET_PRIVATE (self);
+	GHashTableIter iter;
+	gpointer key, tmp;
+
+	g_hash_table_iter_init (&iter, properties);
+	while (g_hash_table_iter_next (&iter, &key, &tmp)) {
+		GValue *value = tmp;
+
+		if (!strcmp ((const char *) key, "Hostname")) {
+			g_free (priv->hostname);
+			priv->hostname = g_value_dup_string (value);
+			g_object_notify (G_OBJECT (self), NM_REMOTE_SETTINGS_HOSTNAME);
+		}
+
+		if (!strcmp ((const char *) key, "CanModify")) {
+			priv->can_modify = g_value_get_boolean (value);
+			g_object_notify (G_OBJECT (self), NM_REMOTE_SETTINGS_CAN_MODIFY);
+		}
+	}
+}
+
+static void
+nm_appeared_got_properties (DBusGProxy *proxy, DBusGProxyCall *call, gpointer user_data)
+{
+	NMRemoteSettings *self = NM_REMOTE_SETTINGS (user_data);
+	NMRemoteSettingsPrivate *priv = NM_REMOTE_SETTINGS_GET_PRIVATE (self);
+	GHashTable *props = NULL;
+
+	if (dbus_g_proxy_end_call (proxy, call, NULL,
+	                           DBUS_TYPE_G_MAP_OF_VARIANT, &props,
+	                           G_TYPE_INVALID)) {
+		properties_changed_cb (priv->props_proxy, props, self);
+		g_hash_table_destroy (props);
+	}
+}
+
 static void
 name_owner_changed (DBusGProxy *proxy,
                     const char *name,
@@ -699,38 +746,24 @@ name_owner_changed (DBusGProxy *proxy,
 		if (new_owner && strlen (new_owner) > 0) {
 			priv->fetch_id = g_idle_add (fetch_connections, self);
 			priv->service_running = TRUE;
+
+			dbus_g_proxy_begin_call (priv->props_proxy, "GetAll",
+			                         nm_appeared_got_properties, self, NULL,
+			                         G_TYPE_STRING, NM_DBUS_IFACE_SETTINGS,
+			                         G_TYPE_INVALID);
 		} else {
 			priv->fetch_id = g_idle_add (remove_connections, self);
 			priv->service_running = FALSE;
-		}
-		g_object_notify (G_OBJECT (self), NM_REMOTE_SETTINGS_SERVICE_RUNNING);
-	}
-}
-
-static void
-properties_changed_cb (DBusGProxy *proxy,
-                       GHashTable *properties,
-                       gpointer user_data)
-{
-	NMRemoteSettings *self = NM_REMOTE_SETTINGS (user_data);
-	NMRemoteSettingsPrivate *priv = NM_REMOTE_SETTINGS_GET_PRIVATE (self);
-	GHashTableIter iter;
-	gpointer key, tmp;
 
-	g_hash_table_iter_init (&iter, properties);
-	while (g_hash_table_iter_next (&iter, &key, &tmp)) {
-		GValue *value = tmp;
-
-		if (!strcmp ((const char *) key, "Hostname")) {
+			/* Clear properties */
 			g_free (priv->hostname);
-			priv->hostname = g_value_dup_string (value);
+			priv->hostname = NULL;
 			g_object_notify (G_OBJECT (self), NM_REMOTE_SETTINGS_HOSTNAME);
-		}
 
-		if (!strcmp ((const char *) key, "CanModify")) {
-			priv->can_modify = g_value_get_boolean (value);
+			priv->can_modify = FALSE;
 			g_object_notify (G_OBJECT (self), NM_REMOTE_SETTINGS_CAN_MODIFY);
 		}
+		g_object_notify (G_OBJECT (self), NM_REMOTE_SETTINGS_SERVICE_RUNNING);
 	}
 }
 
@@ -881,6 +914,7 @@ constructed (GObject *object)
 	                             object,
 	                             NULL);
 
+	priv->fetching = TRUE;
 	priv->fetch_id = g_idle_add (fetch_connections, object);
 
 
@@ -921,6 +955,12 @@ init_sync (GInitable *initable, GCancellable *cancellable, GError **error)
 		return FALSE;
 	}
 
+	/* If NM isn't running we'll grab properties from name_owner_changed()
+	 * when it starts.
+	 */
+	if (!priv->service_running)
+		return TRUE;
+
 	/* Get properties */
 	if (!dbus_g_proxy_call (priv->props_proxy, "GetAll", error,
 	                        G_TYPE_STRING, NM_DBUS_IFACE_SETTINGS,
@@ -931,8 +971,6 @@ init_sync (GInitable *initable, GCancellable *cancellable, GError **error)
 	properties_changed_cb (priv->props_proxy, props, settings);
 	g_hash_table_destroy (props);
 
-	/* FIXME: need a synchronous fetch_connections too */
-
 	return TRUE;
 }
 
@@ -944,6 +982,10 @@ typedef struct {
 static void
 init_async_complete (NMRemoteSettingsInitData *init_data)
 {
+	NMRemoteSettingsPrivate *priv = NM_REMOTE_SETTINGS_GET_PRIVATE (init_data->settings);
+
+	priv->inited = TRUE;
+
 	g_simple_async_result_complete (init_data->result);
 	g_object_unref (init_data->result);
 	g_slice_free (NMRemoteSettingsInitData, init_data);
@@ -955,6 +997,7 @@ init_read_connections (NMRemoteSettings *settings, gpointer user_data)
 	NMRemoteSettingsInitData *init_data = user_data;
 
 	g_signal_handlers_disconnect_by_func (settings, G_CALLBACK (init_read_connections), user_data);
+
 	init_async_complete (init_data);
 }
 
@@ -976,7 +1019,7 @@ init_async_got_properties (DBusGProxy *proxy, DBusGProxyCall *call,
 	} else
 		g_simple_async_result_take_error (init_data->result, error);
 
-	if (priv->init_left) {
+	if (priv->fetching) {
 		/* Still creating initial connections; wait for that to complete */
 		g_signal_connect (init_data->settings, "connections-read",
 		                  G_CALLBACK (init_read_connections), init_data);
diff --git a/libnm-glib/nm-secret-agent.c b/libnm-glib/nm-secret-agent.c
index ae048d80..bfa4fcfc 100644
--- a/libnm-glib/nm-secret-agent.c
+++ b/libnm-glib/nm-secret-agent.c
@@ -19,7 +19,6 @@
  */
 
 #include 
-#include 
 #include 
 #include 
 
@@ -215,21 +214,17 @@ name_owner_changed (DBusGProxy *proxy,
 }
 
 static gboolean
-verify_request (NMSecretAgent *self,
-                DBusGMethodInvocation *context,
-                GHashTable *connection_hash,
-                const char *connection_path,
-                NMConnection **out_connection,
-                GError **error)
+verify_sender (NMSecretAgent *self,
+               DBusGMethodInvocation *context,
+               GError **error)
 {
 	NMSecretAgentPrivate *priv = NM_SECRET_AGENT_GET_PRIVATE (self);
-	NMConnection *connection = NULL;
 	DBusConnection *bus;
 	char *sender;
 	const char *nm_owner;
 	DBusError dbus_error;
 	uid_t sender_uid = G_MAXUINT;
-	GError *local = NULL;
+	gboolean allowed = FALSE;
 
 	g_return_val_if_fail (context != NULL, FALSE);
 
@@ -285,6 +280,7 @@ verify_request (NMSecretAgent *self,
 		goto out;
 	}
 
+	/* We only accept requests from NM, which always runs as root */
 	if (0 != sender_uid) {
 		g_set_error_literal (error,
 		                     NM_SECRET_AGENT_ERROR,
@@ -293,26 +289,55 @@ verify_request (NMSecretAgent *self,
 		goto out;
 	}
 
-	/* And make sure the connection is actually valid */
-	if (connection_hash) {
-		connection = nm_connection_new_from_hash (connection_hash, &local);
-		if (connection && connection_path) {
-			nm_connection_set_path (connection, connection_path);
-		} else {
-			g_set_error (error,
-				         NM_SECRET_AGENT_ERROR,
-				         NM_SECRET_AGENT_ERROR_INVALID_CONNECTION,
-				         "Invalid connection: (%d) %s",
-				         local ? local->code : -1,
-				         (local && local->message) ? local->message : "(unknown)");
-			g_clear_error (&local);
-		}
-	}
+	allowed = TRUE;
 
 out:
-	if (out_connection)
-		*out_connection = connection;
 	g_free (sender);
+	return allowed;
+}
+
+static gboolean
+verify_request (NMSecretAgent *self,
+                DBusGMethodInvocation *context,
+                GHashTable *connection_hash,
+                const char *connection_path,
+                NMConnection **out_connection,
+                GError **error)
+{
+	NMConnection *connection = NULL;
+	GError *local = NULL;
+
+	if (!verify_sender (self, context, error))
+		return FALSE;
+
+	/* No connection?  If the sender verified, then we allow the request */
+	if (connection_hash == NULL)
+		return TRUE;
+
+	/* If we have a connection hash, we require a path too */
+	if (connection_path == NULL) {
+		g_set_error_literal (error,
+		                     NM_SECRET_AGENT_ERROR,
+		                     NM_SECRET_AGENT_ERROR_INVALID_CONNECTION,
+		                     "Invalid connection: no connection path given.");
+		return FALSE;
+	}
+
+	/* Make sure the given connection is valid */
+	g_assert (out_connection);
+	connection = nm_connection_new_from_hash (connection_hash, &local);
+	if (connection) {
+		nm_connection_set_path (connection, connection_path);
+		*out_connection = connection;
+	} else {
+		g_set_error (error,
+		             NM_SECRET_AGENT_ERROR,
+		             NM_SECRET_AGENT_ERROR_INVALID_CONNECTION,
+		             "Invalid connection: (%d) %s",
+		             local ? local->code : -1,
+		             (local && local->message) ? local->message : "(unknown)");
+		g_clear_error (&local);
+	}
 
 	return !!connection;
 }
@@ -766,7 +791,7 @@ validate_identifier (const char *identifier)
 
 	/* FIXME: do complete validation here */
 	while (p && *p) {
-		if (!isalnum (*p) && (*p != '_') && (*p != '-') && (*p != '.'))
+		if (!g_ascii_isalnum (*p) && (*p != '_') && (*p != '-') && (*p != '.'))
 			return FALSE;
 		if ((*p == '.') && (*(p + 1) == '.'))
 			return FALSE;
diff --git a/libnm-glib/nm-secret-agent.h b/libnm-glib/nm-secret-agent.h
index 6aa72438..dbc027c7 100644
--- a/libnm-glib/nm-secret-agent.h
+++ b/libnm-glib/nm-secret-agent.h
@@ -101,7 +101,10 @@ typedef struct {
 /**
  * NMSecretAgentGetSecretsFunc:
  * @agent: the secret agent object
- * @connection: the connection for which secrets were requested
+ * @connection: (transfer none): the connection for which secrets were requested,
+ * note that this object will be unrefed after the callback has returned, use
+ * g_object_ref()/g_object_unref() if you want to use this object after the callback
+ * has returned
  * @secrets: (element-type utf8 GLib.HashTable): the #GHashTable containing
  * the requested secrets in the same format as an #NMConnection hash (as
  * created by nm_connection_to_hash() for example).  Each key in @secrets
@@ -109,7 +112,7 @@ typedef struct {
  * and each value should be a #GHashTable.  The sub-hashes map string:#GValue
  * where the string is the setting property name (like "psk") and the value
  * is the secret
- * @error: if the secrets request failed, give a descriptive error here 
+ * @error: if the secrets request failed, give a descriptive error here
  * @user_data: caller-specific data to be passed to the function
  *
  * Called as a result of a request by NM to retrieve secrets.  When the
@@ -150,8 +153,11 @@ typedef void (*NMSecretAgentGetSecretsFunc) (NMSecretAgent *agent,
 /**
  * NMSecretAgentSaveSecretsFunc:
  * @agent: the secret agent object
- * @connection: the connection for which secrets were to be saved
- * @error: if the saving secrets failed, give a descriptive error here 
+ * @connection: (transfer none): the connection for which secrets were to be saved,
+ * note that this object will be unrefed after the callback has returned, use
+ * g_object_ref()/g_object_unref() if you want to use this object after the callback
+ * has returned
+ * @error: if the saving secrets failed, give a descriptive error here
  * @user_data: caller-specific data to be passed to the function
  *
  * Called as a result of a request by NM to save secrets.  When the
@@ -166,8 +172,11 @@ typedef void (*NMSecretAgentSaveSecretsFunc) (NMSecretAgent *agent,
 /**
  * NMSecretAgentDeleteSecretsFunc:
  * @agent: the secret agent object
- * @connection: the connection for which secrets were to be deleted
- * @error: if the deleting secrets failed, give a descriptive error here 
+ * @connection: (transfer none): the connection for which secrets were to be deleted,
+ * note that this object will be unrefed after the callback has returned, use
+ * g_object_ref()/g_object_unref() if you want to use this object after the callback
+ * has returned
+ * @error: if the deleting secrets failed, give a descriptive error here
  * @user_data: caller-specific data to be passed to the function
  *
  * Called as a result of a request by NM to delete secrets.  When the
diff --git a/libnm-glib/tests/Makefile.am b/libnm-glib/tests/Makefile.am
index 0dba0793..5fda5bd2 100644
--- a/libnm-glib/tests/Makefile.am
+++ b/libnm-glib/tests/Makefile.am
@@ -1,3 +1,5 @@
+if ENABLE_TESTS
+
 INCLUDES = \
 	-I$(top_srcdir)/include \
 	-I$(top_builddir)/include \
@@ -28,10 +30,7 @@ TEST_RSS_BIN = test-remote-settings-service.py
 
 EXTRA_DIST = $(TEST_RSS_BIN)
 
-if WITH_TESTS
-
 check-local: test-remote-settings-client
 	$(abs_builddir)/test-remote-settings-client $(abs_srcdir) $(TEST_RSS_BIN)
 
 endif
-
diff --git a/libnm-glib/tests/Makefile.in b/libnm-glib/tests/Makefile.in
index d44c3db1..6884817c 100644
--- a/libnm-glib/tests/Makefile.in
+++ b/libnm-glib/tests/Makefile.in
@@ -51,21 +51,24 @@ PRE_UNINSTALL = :
 POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
-noinst_PROGRAMS = test-remote-settings-client$(EXEEXT)
+@ENABLE_TESTS_TRUE@noinst_PROGRAMS =  \
+@ENABLE_TESTS_TRUE@	test-remote-settings-client$(EXEEXT)
 subdir = libnm-glib/tests
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/compiler_warnings.m4 \
-	$(top_srcdir)/m4/gettext.m4 $(top_srcdir)/m4/gtk-doc.m4 \
-	$(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/intlmacosx.m4 \
-	$(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/introspection.m4 \
-	$(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \
-	$(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/libnl-check.m4 \
-	$(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \
-	$(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
-	$(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/nls.m4 \
-	$(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/progtest.m4 \
-	$(top_srcdir)/m4/vapigen.m4 $(top_srcdir)/configure.ac
+	$(top_srcdir)/m4/gettext.m4 \
+	$(top_srcdir)/m4/gnome-code-coverage.m4 \
+	$(top_srcdir)/m4/gtk-doc.m4 $(top_srcdir)/m4/iconv.m4 \
+	$(top_srcdir)/m4/intlmacosx.m4 $(top_srcdir)/m4/intltool.m4 \
+	$(top_srcdir)/m4/introspection.m4 $(top_srcdir)/m4/lib-ld.m4 \
+	$(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \
+	$(top_srcdir)/m4/libnl-check.m4 $(top_srcdir)/m4/libtool.m4 \
+	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
+	$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
+	$(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/po.m4 \
+	$(top_srcdir)/m4/progtest.m4 $(top_srcdir)/m4/vapigen.m4 \
+	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(install_sh) -d
@@ -73,14 +76,16 @@ CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
 CONFIG_CLEAN_VPATH_FILES =
 PROGRAMS = $(noinst_PROGRAMS)
-am_test_remote_settings_client_OBJECTS = test_remote_settings_client-test-remote-settings-client.$(OBJEXT)
+am__test_remote_settings_client_SOURCES_DIST =  \
+	test-remote-settings-client.c
+@ENABLE_TESTS_TRUE@am_test_remote_settings_client_OBJECTS = test_remote_settings_client-test-remote-settings-client.$(OBJEXT)
 test_remote_settings_client_OBJECTS =  \
 	$(am_test_remote_settings_client_OBJECTS)
 am__DEPENDENCIES_1 =
-test_remote_settings_client_DEPENDENCIES =  \
-	$(top_builddir)/libnm-util/libnm-util.la \
-	$(top_builddir)/libnm-glib/libnm-glib-test.la \
-	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
+@ENABLE_TESTS_TRUE@test_remote_settings_client_DEPENDENCIES =  \
+@ENABLE_TESTS_TRUE@	$(top_builddir)/libnm-util/libnm-util.la \
+@ENABLE_TESTS_TRUE@	$(top_builddir)/libnm-glib/libnm-glib-test.la \
+@ENABLE_TESTS_TRUE@	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
 AM_V_lt = $(am__v_lt_@AM_V@)
 am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
 am__v_lt_0 = --silent
@@ -111,7 +116,7 @@ AM_V_GEN = $(am__v_GEN_@AM_V@)
 am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
 am__v_GEN_0 = @echo "  GEN   " $@;
 SOURCES = $(test_remote_settings_client_SOURCES)
-DIST_SOURCES = $(test_remote_settings_client_SOURCES)
+DIST_SOURCES = $(am__test_remote_settings_client_SOURCES_DIST)
 am__can_run_installinfo = \
   case $$AM_UPDATE_INFO_DIR in \
     n|no|NO) false;; \
@@ -132,6 +137,10 @@ AWK = @AWK@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
+CKDB_PATH = @CKDB_PATH@
+CODE_COVERAGE_CFLAGS = @CODE_COVERAGE_CFLAGS@
+CODE_COVERAGE_ENABLED = @CODE_COVERAGE_ENABLED@
+CODE_COVERAGE_LDFLAGS = @CODE_COVERAGE_LDFLAGS@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CXX = @CXX@
@@ -146,9 +155,7 @@ DBUS_SYS_DIR = @DBUS_SYS_DIR@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
 DHCLIENT_PATH = @DHCLIENT_PATH@
-DHCLIENT_VERSION = @DHCLIENT_VERSION@
 DHCPCD_PATH = @DHCPCD_PATH@
-DISABLE_DEPRECATED = @DISABLE_DEPRECATED@
 DLLTOOL = @DLLTOOL@
 DSYMUTIL = @DSYMUTIL@
 DUMPBIN = @DUMPBIN@
@@ -158,17 +165,14 @@ ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
 FGREP = @FGREP@
+GENHTML = @GENHTML@
 GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
 GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
-GIO_CFLAGS = @GIO_CFLAGS@
-GIO_LIBS = @GIO_LIBS@
 GLIB_CFLAGS = @GLIB_CFLAGS@
 GLIB_GENMARSHAL = @GLIB_GENMARSHAL@
 GLIB_LIBS = @GLIB_LIBS@
 GLIB_MAKEFILE = @GLIB_MAKEFILE@
 GLIB_MKENUMS = @GLIB_MKENUMS@
-GMODULE_CFLAGS = @GMODULE_CFLAGS@
-GMODULE_LIBS = @GMODULE_LIBS@
 GMSGFMT = @GMSGFMT@
 GMSGFMT_015 = @GMSGFMT_015@
 GNUTLS_CFLAGS = @GNUTLS_CFLAGS@
@@ -209,6 +213,7 @@ IPTABLES_PATH = @IPTABLES_PATH@
 IWMX_SDK_CFLAGS = @IWMX_SDK_CFLAGS@
 IWMX_SDK_LIBS = @IWMX_SDK_LIBS@
 KERNEL_FIRMWARE_DIR = @KERNEL_FIRMWARE_DIR@
+LCOV = @LCOV@
 LD = @LD@
 LDFLAGS = @LDFLAGS@
 LIBDL = @LIBDL@
@@ -225,11 +230,7 @@ LIBNL2_LIBS = @LIBNL2_LIBS@
 LIBNL3_CFLAGS = @LIBNL3_CFLAGS@
 LIBNL3_LIBS = @LIBNL3_LIBS@
 LIBNL_CFLAGS = @LIBNL_CFLAGS@
-LIBNL_GENL3_CFLAGS = @LIBNL_GENL3_CFLAGS@
-LIBNL_GENL3_LIBS = @LIBNL_GENL3_LIBS@
 LIBNL_LIBS = @LIBNL_LIBS@
-LIBNL_ROUTE3_CFLAGS = @LIBNL_ROUTE3_CFLAGS@
-LIBNL_ROUTE3_LIBS = @LIBNL_ROUTE3_LIBS@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
 LIBSOUP_CFLAGS = @LIBSOUP_CFLAGS@
@@ -244,6 +245,8 @@ MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MANIFEST_TOOL = @MANIFEST_TOOL@
 MKDIR_P = @MKDIR_P@
+MM_GLIB_CFLAGS = @MM_GLIB_CFLAGS@
+MM_GLIB_LIBS = @MM_GLIB_LIBS@
 MOC = @MOC@
 MSGFMT = @MSGFMT@
 MSGFMT_015 = @MSGFMT_015@
@@ -253,6 +256,7 @@ NMEDIT = @NMEDIT@
 NM_MAJOR_VERSION = @NM_MAJOR_VERSION@
 NM_MICRO_VERSION = @NM_MICRO_VERSION@
 NM_MINOR_VERSION = @NM_MINOR_VERSION@
+NM_MODIFY_SYSTEM_POLICY = @NM_MODIFY_SYSTEM_POLICY@
 NM_VERSION = @NM_VERSION@
 NSS_CFLAGS = @NSS_CFLAGS@
 NSS_LIBS = @NSS_LIBS@
@@ -279,13 +283,14 @@ PPPD_PLUGIN_DIR = @PPPD_PLUGIN_DIR@
 QT_CFLAGS = @QT_CFLAGS@
 QT_LIBS = @QT_LIBS@
 RANLIB = @RANLIB@
-RESOLVCONF_PATH = @RESOLVCONF_PATH@
 SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
-SYSTEMD_CFLAGS = @SYSTEMD_CFLAGS@
-SYSTEMD_LIBS = @SYSTEMD_LIBS@
+SYSTEMD_INHIBIT_CFLAGS = @SYSTEMD_INHIBIT_CFLAGS@
+SYSTEMD_INHIBIT_LIBS = @SYSTEMD_INHIBIT_LIBS@
+SYSTEMD_LOGIN_CFLAGS = @SYSTEMD_LOGIN_CFLAGS@
+SYSTEMD_LOGIN_LIBS = @SYSTEMD_LOGIN_LIBS@
 SYSTEM_CA_PATH = @SYSTEM_CA_PATH@
 UDEV_BASE_DIR = @UDEV_BASE_DIR@
 USE_NLS = @USE_NLS@
@@ -340,6 +345,11 @@ localedir = @localedir@
 localstatedir = @localstatedir@
 mandir = @mandir@
 mkdir_p = @mkdir_p@
+nmbinary = @nmbinary@
+nmconfdir = @nmconfdir@
+nmdatadir = @nmdatadir@
+nmrundir = @nmrundir@
+nmstatedir = @nmstatedir@
 oldincludedir = @oldincludedir@
 pdfdir = @pdfdir@
 prefix = @prefix@
@@ -354,32 +364,36 @@ target_alias = @target_alias@
 top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
-INCLUDES = \
-	-I$(top_srcdir)/include \
-	-I$(top_builddir)/include \
-	-I$(top_srcdir)/libnm-util \
-	-I$(top_builddir)/libnm-util \
-	-I$(top_srcdir)/libnm-glib
+with_dhclient = @with_dhclient@
+with_dhcpcd = @with_dhcpcd@
+with_netconfig = @with_netconfig@
+with_resolvconf = @with_resolvconf@
+@ENABLE_TESTS_TRUE@INCLUDES = \
+@ENABLE_TESTS_TRUE@	-I$(top_srcdir)/include \
+@ENABLE_TESTS_TRUE@	-I$(top_builddir)/include \
+@ENABLE_TESTS_TRUE@	-I$(top_srcdir)/libnm-util \
+@ENABLE_TESTS_TRUE@	-I$(top_builddir)/libnm-util \
+@ENABLE_TESTS_TRUE@	-I$(top_srcdir)/libnm-glib
 
 
 ####### remote settings client test #######
-test_remote_settings_client_SOURCES = \
-	test-remote-settings-client.c
+@ENABLE_TESTS_TRUE@test_remote_settings_client_SOURCES = \
+@ENABLE_TESTS_TRUE@	test-remote-settings-client.c
 
-test_remote_settings_client_CPPFLAGS = \
-	$(GLIB_CFLAGS) \
-	$(DBUS_CFLAGS)
+@ENABLE_TESTS_TRUE@test_remote_settings_client_CPPFLAGS = \
+@ENABLE_TESTS_TRUE@	$(GLIB_CFLAGS) \
+@ENABLE_TESTS_TRUE@	$(DBUS_CFLAGS)
 
-test_remote_settings_client_LDADD = \
-	$(top_builddir)/libnm-util/libnm-util.la \
-	$(top_builddir)/libnm-glib/libnm-glib-test.la \
-	$(GLIB_LIBS) \
-	$(DBUS_LIBS)
+@ENABLE_TESTS_TRUE@test_remote_settings_client_LDADD = \
+@ENABLE_TESTS_TRUE@	$(top_builddir)/libnm-util/libnm-util.la \
+@ENABLE_TESTS_TRUE@	$(top_builddir)/libnm-glib/libnm-glib-test.la \
+@ENABLE_TESTS_TRUE@	$(GLIB_LIBS) \
+@ENABLE_TESTS_TRUE@	$(DBUS_LIBS)
 
 
 ###########################################
-TEST_RSS_BIN = test-remote-settings-service.py
-EXTRA_DIST = $(TEST_RSS_BIN)
+@ENABLE_TESTS_TRUE@TEST_RSS_BIN = test-remote-settings-service.py
+@ENABLE_TESTS_TRUE@EXTRA_DIST = $(TEST_RSS_BIN)
 all: all-am
 
 .SUFFIXES:
@@ -436,25 +450,22 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_remote_settings_client-test-remote-settings-client.Po@am__quote@
 
 .c.o:
-@am__fastdepCC_TRUE@	$(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\
-@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
-@am__fastdepCC_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.Po
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $<
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c $<
 
 .c.obj:
-@am__fastdepCC_TRUE@	$(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.obj$$||'`;\
-@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ `$(CYGPATH_W) '$<'` &&\
-@am__fastdepCC_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.Po
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c `$(CYGPATH_W) '$<'`
 
 .c.lo:
-@am__fastdepCC_TRUE@	$(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.lo$$||'`;\
-@am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
-@am__fastdepCC_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.Plo
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $<
@@ -561,7 +572,7 @@ distdir: $(DISTFILES)
 	    || exit 1; \
 	  fi; \
 	done
-@WITH_TESTS_FALSE@check-local:
+@ENABLE_TESTS_FALSE@check-local:
 check-am: all-am
 	$(MAKE) $(AM_MAKEFLAGS) check-local
 check: check-am
@@ -685,8 +696,8 @@ uninstall-am:
 	tags uninstall uninstall-am
 
 
-@WITH_TESTS_TRUE@check-local: test-remote-settings-client
-@WITH_TESTS_TRUE@	$(abs_builddir)/test-remote-settings-client $(abs_srcdir) $(TEST_RSS_BIN)
+@ENABLE_TESTS_TRUE@check-local: test-remote-settings-client
+@ENABLE_TESTS_TRUE@	$(abs_builddir)/test-remote-settings-client $(abs_srcdir) $(TEST_RSS_BIN)
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
diff --git a/libnm-util/Makefile.am b/libnm-util/Makefile.am
index 76acd99f..bd1b3fc0 100644
--- a/libnm-util/Makefile.am
+++ b/libnm-util/Makefile.am
@@ -1,6 +1,6 @@
 include $(GLIB_MAKEFILE)
 
-SUBDIRS=. tests
+SUBDIRS = . tests
 
 INCLUDES = -I${top_srcdir} -I${top_srcdir}/include -I${top_builddir}/include
 
@@ -9,8 +9,7 @@ lib_LTLIBRARIES=libnm-util.la
 libnm_util_la_CPPFLAGS = \
 	$(GLIB_CFLAGS) \
 	$(DBUS_CFLAGS) \
-	$(UUID_CFLAGS) \
-	-DG_DISABLE_DEPRECATED
+	$(UUID_CFLAGS)
 
 libnm_util_include_HEADERS = 		\
 	nm-connection.h			\
@@ -19,6 +18,8 @@ libnm_util_include_HEADERS = 		\
 	nm-setting-adsl.h		\
 	nm-setting-bluetooth.h		\
 	nm-setting-bond.h		\
+	nm-setting-bridge.h		\
+	nm-setting-bridge-port.h	\
 	nm-setting-connection.h		\
 	nm-setting-infiniband.h		\
 	nm-setting-ip4-config.h		\
@@ -53,6 +54,8 @@ libnm_util_la_csources = \
 	nm-setting-adsl.c		\
 	nm-setting-bluetooth.c		\
 	nm-setting-bond.c		\
+	nm-setting-bridge.c		\
+	nm-setting-bridge-port.c	\
 	nm-setting-connection.c		\
 	nm-setting-infiniband.c		\
 	nm-setting-ip4-config.c		\
@@ -165,7 +168,7 @@ typelib_DATA = $(INTROSPECTION_GIRS:.gir=.typelib)
 CLEANFILES += $(gir_DATA) $(typelib_DATA)
 endif
 
-if WITH_TESTS
+if ENABLE_TESTS
 
 check-local:
 	$(top_srcdir)/tools/check-exports.sh $(builddir)/.libs/libnm-util.so $(SYMBOL_VIS_FILE)
diff --git a/libnm-util/Makefile.in b/libnm-util/Makefile.in
index ec767a82..0e8d8891 100644
--- a/libnm-util/Makefile.in
+++ b/libnm-util/Makefile.in
@@ -72,16 +72,18 @@ DIST_COMMON = $(libnm_util_include_HEADERS) $(srcdir)/Makefile.am \
 	$(srcdir)/Makefile.in $(srcdir)/libnm-util.pc.in COPYING
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/compiler_warnings.m4 \
-	$(top_srcdir)/m4/gettext.m4 $(top_srcdir)/m4/gtk-doc.m4 \
-	$(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/intlmacosx.m4 \
-	$(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/introspection.m4 \
-	$(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \
-	$(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/libnl-check.m4 \
-	$(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \
-	$(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
-	$(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/nls.m4 \
-	$(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/progtest.m4 \
-	$(top_srcdir)/m4/vapigen.m4 $(top_srcdir)/configure.ac
+	$(top_srcdir)/m4/gettext.m4 \
+	$(top_srcdir)/m4/gnome-code-coverage.m4 \
+	$(top_srcdir)/m4/gtk-doc.m4 $(top_srcdir)/m4/iconv.m4 \
+	$(top_srcdir)/m4/intlmacosx.m4 $(top_srcdir)/m4/intltool.m4 \
+	$(top_srcdir)/m4/introspection.m4 $(top_srcdir)/m4/lib-ld.m4 \
+	$(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \
+	$(top_srcdir)/m4/libnl-check.m4 $(top_srcdir)/m4/libtool.m4 \
+	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
+	$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
+	$(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/po.m4 \
+	$(top_srcdir)/m4/progtest.m4 $(top_srcdir)/m4/vapigen.m4 \
+	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(install_sh) -d
@@ -129,6 +131,7 @@ libnm_util_la_DEPENDENCIES = $(am__DEPENDENCIES_1) \
 am__libnm_util_la_SOURCES_DIST = crypto.c nm-connection.c \
 	nm-param-spec-specialized.c nm-setting.c nm-setting-8021x.c \
 	nm-setting-adsl.c nm-setting-bluetooth.c nm-setting-bond.c \
+	nm-setting-bridge.c nm-setting-bridge-port.c \
 	nm-setting-connection.c nm-setting-infiniband.c \
 	nm-setting-ip4-config.c nm-setting-vlan.c \
 	nm-setting-ip6-config.c nm-setting-ppp.c nm-setting-pppoe.c \
@@ -144,6 +147,8 @@ am__objects_1 = libnm_util_la-crypto.lo libnm_util_la-nm-connection.lo \
 	libnm_util_la-nm-setting-adsl.lo \
 	libnm_util_la-nm-setting-bluetooth.lo \
 	libnm_util_la-nm-setting-bond.lo \
+	libnm_util_la-nm-setting-bridge.lo \
+	libnm_util_la-nm-setting-bridge-port.lo \
 	libnm_util_la-nm-setting-connection.lo \
 	libnm_util_la-nm-setting-infiniband.lo \
 	libnm_util_la-nm-setting-ip4-config.lo \
@@ -271,6 +276,10 @@ AWK = @AWK@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
+CKDB_PATH = @CKDB_PATH@
+CODE_COVERAGE_CFLAGS = @CODE_COVERAGE_CFLAGS@
+CODE_COVERAGE_ENABLED = @CODE_COVERAGE_ENABLED@
+CODE_COVERAGE_LDFLAGS = @CODE_COVERAGE_LDFLAGS@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CXX = @CXX@
@@ -285,9 +294,7 @@ DBUS_SYS_DIR = @DBUS_SYS_DIR@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
 DHCLIENT_PATH = @DHCLIENT_PATH@
-DHCLIENT_VERSION = @DHCLIENT_VERSION@
 DHCPCD_PATH = @DHCPCD_PATH@
-DISABLE_DEPRECATED = @DISABLE_DEPRECATED@
 DLLTOOL = @DLLTOOL@
 DSYMUTIL = @DSYMUTIL@
 DUMPBIN = @DUMPBIN@
@@ -297,17 +304,14 @@ ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
 FGREP = @FGREP@
+GENHTML = @GENHTML@
 GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
 GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
-GIO_CFLAGS = @GIO_CFLAGS@
-GIO_LIBS = @GIO_LIBS@
 GLIB_CFLAGS = @GLIB_CFLAGS@
 GLIB_GENMARSHAL = @GLIB_GENMARSHAL@
 GLIB_LIBS = @GLIB_LIBS@
 GLIB_MAKEFILE = @GLIB_MAKEFILE@
 GLIB_MKENUMS = @GLIB_MKENUMS@
-GMODULE_CFLAGS = @GMODULE_CFLAGS@
-GMODULE_LIBS = @GMODULE_LIBS@
 GMSGFMT = @GMSGFMT@
 GMSGFMT_015 = @GMSGFMT_015@
 GNUTLS_CFLAGS = @GNUTLS_CFLAGS@
@@ -348,6 +352,7 @@ IPTABLES_PATH = @IPTABLES_PATH@
 IWMX_SDK_CFLAGS = @IWMX_SDK_CFLAGS@
 IWMX_SDK_LIBS = @IWMX_SDK_LIBS@
 KERNEL_FIRMWARE_DIR = @KERNEL_FIRMWARE_DIR@
+LCOV = @LCOV@
 LD = @LD@
 LDFLAGS = @LDFLAGS@
 LIBDL = @LIBDL@
@@ -364,11 +369,7 @@ LIBNL2_LIBS = @LIBNL2_LIBS@
 LIBNL3_CFLAGS = @LIBNL3_CFLAGS@
 LIBNL3_LIBS = @LIBNL3_LIBS@
 LIBNL_CFLAGS = @LIBNL_CFLAGS@
-LIBNL_GENL3_CFLAGS = @LIBNL_GENL3_CFLAGS@
-LIBNL_GENL3_LIBS = @LIBNL_GENL3_LIBS@
 LIBNL_LIBS = @LIBNL_LIBS@
-LIBNL_ROUTE3_CFLAGS = @LIBNL_ROUTE3_CFLAGS@
-LIBNL_ROUTE3_LIBS = @LIBNL_ROUTE3_LIBS@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
 LIBSOUP_CFLAGS = @LIBSOUP_CFLAGS@
@@ -383,6 +384,8 @@ MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MANIFEST_TOOL = @MANIFEST_TOOL@
 MKDIR_P = @MKDIR_P@
+MM_GLIB_CFLAGS = @MM_GLIB_CFLAGS@
+MM_GLIB_LIBS = @MM_GLIB_LIBS@
 MOC = @MOC@
 MSGFMT = @MSGFMT@
 MSGFMT_015 = @MSGFMT_015@
@@ -392,6 +395,7 @@ NMEDIT = @NMEDIT@
 NM_MAJOR_VERSION = @NM_MAJOR_VERSION@
 NM_MICRO_VERSION = @NM_MICRO_VERSION@
 NM_MINOR_VERSION = @NM_MINOR_VERSION@
+NM_MODIFY_SYSTEM_POLICY = @NM_MODIFY_SYSTEM_POLICY@
 NM_VERSION = @NM_VERSION@
 NSS_CFLAGS = @NSS_CFLAGS@
 NSS_LIBS = @NSS_LIBS@
@@ -418,13 +422,14 @@ PPPD_PLUGIN_DIR = @PPPD_PLUGIN_DIR@
 QT_CFLAGS = @QT_CFLAGS@
 QT_LIBS = @QT_LIBS@
 RANLIB = @RANLIB@
-RESOLVCONF_PATH = @RESOLVCONF_PATH@
 SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
-SYSTEMD_CFLAGS = @SYSTEMD_CFLAGS@
-SYSTEMD_LIBS = @SYSTEMD_LIBS@
+SYSTEMD_INHIBIT_CFLAGS = @SYSTEMD_INHIBIT_CFLAGS@
+SYSTEMD_INHIBIT_LIBS = @SYSTEMD_INHIBIT_LIBS@
+SYSTEMD_LOGIN_CFLAGS = @SYSTEMD_LOGIN_CFLAGS@
+SYSTEMD_LOGIN_LIBS = @SYSTEMD_LOGIN_LIBS@
 SYSTEM_CA_PATH = @SYSTEM_CA_PATH@
 UDEV_BASE_DIR = @UDEV_BASE_DIR@
 USE_NLS = @USE_NLS@
@@ -479,6 +484,11 @@ localedir = @localedir@
 localstatedir = @localstatedir@
 mandir = @mandir@
 mkdir_p = @mkdir_p@
+nmbinary = @nmbinary@
+nmconfdir = @nmconfdir@
+nmdatadir = @nmdatadir@
+nmrundir = @nmrundir@
+nmstatedir = @nmstatedir@
 oldincludedir = @oldincludedir@
 pdfdir = @pdfdir@
 prefix = @prefix@
@@ -493,11 +503,15 @@ target_alias = @target_alias@
 top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
+with_dhclient = @with_dhclient@
+with_dhcpcd = @with_dhcpcd@
+with_netconfig = @with_netconfig@
+with_resolvconf = @with_resolvconf@
 SUBDIRS = . tests
 INCLUDES = -I${top_srcdir} -I${top_srcdir}/include -I${top_builddir}/include
 lib_LTLIBRARIES = libnm-util.la
 libnm_util_la_CPPFLAGS = $(GLIB_CFLAGS) $(DBUS_CFLAGS) $(UUID_CFLAGS) \
-	-DG_DISABLE_DEPRECATED $(am__append_2) $(am__append_5)
+	$(am__append_2) $(am__append_5)
 libnm_util_include_HEADERS = \
 	nm-connection.h			\
 	nm-setting.h			\
@@ -505,6 +519,8 @@ libnm_util_include_HEADERS = \
 	nm-setting-adsl.h		\
 	nm-setting-bluetooth.h		\
 	nm-setting-bond.h		\
+	nm-setting-bridge.h		\
+	nm-setting-bridge-port.h	\
 	nm-setting-connection.h		\
 	nm-setting-infiniband.h		\
 	nm-setting-ip4-config.h		\
@@ -539,6 +555,8 @@ libnm_util_la_csources = \
 	nm-setting-adsl.c		\
 	nm-setting-bluetooth.c		\
 	nm-setting-bond.c		\
+	nm-setting-bridge.c		\
+	nm-setting-bridge-port.c	\
 	nm-setting-connection.c		\
 	nm-setting-infiniband.c		\
 	nm-setting-ip4-config.c		\
@@ -701,6 +719,8 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libnm_util_la-nm-setting-adsl.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libnm_util_la-nm-setting-bluetooth.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libnm_util_la-nm-setting-bond.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libnm_util_la-nm-setting-bridge-port.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libnm_util_la-nm-setting-bridge.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libnm_util_la-nm-setting-cdma.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libnm_util_la-nm-setting-connection.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libnm_util_la-nm-setting-gsm.Plo@am__quote@
@@ -725,25 +745,22 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libtest_crypto_la-crypto_nss.Plo@am__quote@
 
 .c.o:
-@am__fastdepCC_TRUE@	$(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\
-@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
-@am__fastdepCC_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.Po
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $<
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c $<
 
 .c.obj:
-@am__fastdepCC_TRUE@	$(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.obj$$||'`;\
-@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ `$(CYGPATH_W) '$<'` &&\
-@am__fastdepCC_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.Po
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c `$(CYGPATH_W) '$<'`
 
 .c.lo:
-@am__fastdepCC_TRUE@	$(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.lo$$||'`;\
-@am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
-@am__fastdepCC_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.Plo
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $<
@@ -804,6 +821,20 @@ libnm_util_la-nm-setting-bond.lo: nm-setting-bond.c
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_util_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libnm_util_la-nm-setting-bond.lo `test -f 'nm-setting-bond.c' || echo '$(srcdir)/'`nm-setting-bond.c
 
+libnm_util_la-nm-setting-bridge.lo: nm-setting-bridge.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_util_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libnm_util_la-nm-setting-bridge.lo -MD -MP -MF $(DEPDIR)/libnm_util_la-nm-setting-bridge.Tpo -c -o libnm_util_la-nm-setting-bridge.lo `test -f 'nm-setting-bridge.c' || echo '$(srcdir)/'`nm-setting-bridge.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libnm_util_la-nm-setting-bridge.Tpo $(DEPDIR)/libnm_util_la-nm-setting-bridge.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='nm-setting-bridge.c' object='libnm_util_la-nm-setting-bridge.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_util_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libnm_util_la-nm-setting-bridge.lo `test -f 'nm-setting-bridge.c' || echo '$(srcdir)/'`nm-setting-bridge.c
+
+libnm_util_la-nm-setting-bridge-port.lo: nm-setting-bridge-port.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_util_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libnm_util_la-nm-setting-bridge-port.lo -MD -MP -MF $(DEPDIR)/libnm_util_la-nm-setting-bridge-port.Tpo -c -o libnm_util_la-nm-setting-bridge-port.lo `test -f 'nm-setting-bridge-port.c' || echo '$(srcdir)/'`nm-setting-bridge-port.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libnm_util_la-nm-setting-bridge-port.Tpo $(DEPDIR)/libnm_util_la-nm-setting-bridge-port.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='nm-setting-bridge-port.c' object='libnm_util_la-nm-setting-bridge-port.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_util_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libnm_util_la-nm-setting-bridge-port.lo `test -f 'nm-setting-bridge-port.c' || echo '$(srcdir)/'`nm-setting-bridge-port.c
+
 libnm_util_la-nm-setting-connection.lo: nm-setting-connection.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_util_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libnm_util_la-nm-setting-connection.lo -MD -MP -MF $(DEPDIR)/libnm_util_la-nm-setting-connection.Tpo -c -o libnm_util_la-nm-setting-connection.lo `test -f 'nm-setting-connection.c' || echo '$(srcdir)/'`nm-setting-connection.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libnm_util_la-nm-setting-connection.Tpo $(DEPDIR)/libnm_util_la-nm-setting-connection.Plo
@@ -1245,7 +1276,7 @@ distdir: $(DISTFILES)
 	      || exit 1; \
 	  fi; \
 	done
-@WITH_TESTS_FALSE@check-local:
+@ENABLE_TESTS_FALSE@check-local:
 check-am: all-am
 	$(MAKE) $(AM_MAKEFLAGS) check-local
 check: $(BUILT_SOURCES)
@@ -1394,8 +1425,8 @@ include $(GLIB_MAKEFILE)
 
 @HAVE_INTROSPECTION_TRUE@NetworkManager-1.0.gir: libnm-util.la
 
-@WITH_TESTS_TRUE@check-local:
-@WITH_TESTS_TRUE@	$(top_srcdir)/tools/check-exports.sh $(builddir)/.libs/libnm-util.so $(SYMBOL_VIS_FILE)
+@ENABLE_TESTS_TRUE@check-local:
+@ENABLE_TESTS_TRUE@	$(top_srcdir)/tools/check-exports.sh $(builddir)/.libs/libnm-util.so $(SYMBOL_VIS_FILE)
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
diff --git a/libnm-util/libnm-util.ver b/libnm-util/libnm-util.ver
index 4f0c27c5..e40531ea 100644
--- a/libnm-util/libnm-util.ver
+++ b/libnm-util/libnm-util.ver
@@ -18,6 +18,8 @@ global:
 	nm_connection_get_setting_adsl;
 	nm_connection_get_setting_bluetooth;
 	nm_connection_get_setting_bond;
+	nm_connection_get_setting_bridge;
+	nm_connection_get_setting_bridge_port;
 	nm_connection_get_setting_by_name;
 	nm_connection_get_setting_cdma;
 	nm_connection_get_setting_connection;
@@ -201,6 +203,24 @@ global:
 	nm_setting_bond_get_valid_options;
 	nm_setting_bond_new;
 	nm_setting_bond_remove_option;
+	nm_setting_bridge_error_get_type;
+	nm_setting_bridge_error_quark;
+	nm_setting_bridge_get_ageing_time;
+	nm_setting_bridge_get_forward_delay;
+	nm_setting_bridge_get_hello_time;
+	nm_setting_bridge_get_interface_name;
+	nm_setting_bridge_get_max_age;
+	nm_setting_bridge_get_priority;
+	nm_setting_bridge_get_stp;
+	nm_setting_bridge_get_type;
+	nm_setting_bridge_new;
+	nm_setting_bridge_port_error_get_type;
+	nm_setting_bridge_port_error_quark;
+	nm_setting_bridge_port_get_hairpin_mode;
+	nm_setting_bridge_port_get_path_cost;
+	nm_setting_bridge_port_get_priority;
+	nm_setting_bridge_port_get_type;
+	nm_setting_bridge_port_new;
 	nm_setting_cdma_error_get_type;
 	nm_setting_cdma_error_quark;
 	nm_setting_cdma_get_number;
@@ -214,6 +234,7 @@ global:
 	nm_setting_compare;
 	nm_setting_compare_flags_get_type;
 	nm_setting_connection_add_permission;
+	nm_setting_connection_add_secondary;
 	nm_setting_connection_error_get_type;
 	nm_setting_connection_error_quark;
 	nm_setting_connection_get_autoconnect;
@@ -221,8 +242,10 @@ global:
 	nm_setting_connection_get_id;
 	nm_setting_connection_get_master;
 	nm_setting_connection_get_num_permissions;
+	nm_setting_connection_get_num_secondaries;
 	nm_setting_connection_get_permission;
 	nm_setting_connection_get_read_only;
+	nm_setting_connection_get_secondary;
 	nm_setting_connection_get_slave_type;
 	nm_setting_connection_get_timestamp;
 	nm_setting_connection_get_type;
@@ -232,6 +255,7 @@ global:
 	nm_setting_connection_new;
 	nm_setting_connection_permissions_user_allowed;
 	nm_setting_connection_remove_permission;
+	nm_setting_connection_remove_secondary;
 	nm_setting_diff;
 	nm_setting_diff_result_get_type;
 	nm_setting_duplicate;
@@ -310,6 +334,7 @@ global:
 	nm_setting_ip6_config_error_get_type;
 	nm_setting_ip6_config_error_quark;
 	nm_setting_ip6_config_get_address;
+	nm_setting_ip6_config_get_dhcp_hostname;
 	nm_setting_ip6_config_get_dns;
 	nm_setting_ip6_config_get_dns_search;
 	nm_setting_ip6_config_get_ignore_auto_dns;
@@ -491,6 +516,7 @@ global:
 	nm_setting_wireless_security_remove_pairwise;
 	nm_setting_wireless_security_remove_proto;
 	nm_setting_wireless_security_set_wep_key;
+	nm_utils_ap_mode_security_valid;
 	nm_utils_deinit;
 	nm_utils_escape_ssid;
 	nm_utils_file_is_pkcs12;
@@ -500,6 +526,7 @@ global:
 	nm_utils_hwaddr_len;
 	nm_utils_hwaddr_ntoa;
 	nm_utils_hwaddr_type;
+	nm_utils_iface_valid_name;
 	nm_utils_init;
 	nm_utils_ip4_addresses_from_gvalue;
 	nm_utils_ip4_addresses_to_gvalue;
@@ -515,6 +542,7 @@ global:
 	nm_utils_ip6_routes_from_gvalue;
 	nm_utils_ip6_routes_to_gvalue;
 	nm_utils_is_empty_ssid;
+	nm_utils_is_uuid;
 	nm_utils_rsa_key_encrypt;
 	nm_utils_same_ssid;
 	nm_utils_security_type_get_type;
diff --git a/libnm-util/nm-connection.c b/libnm-util/nm-connection.c
index 66df511f..47a9ec09 100644
--- a/libnm-util/nm-connection.c
+++ b/libnm-util/nm-connection.c
@@ -30,6 +30,7 @@
 #include "nm-utils.h"
 #include "nm-utils-private.h"
 #include "nm-dbus-glib-types.h"
+#include "nm-setting-private.h"
 
 #include "nm-setting-8021x.h"
 #include "nm-setting-bluetooth.h"
@@ -48,6 +49,8 @@
 #include "nm-setting-vpn.h"
 #include "nm-setting-olpc-mesh.h"
 #include "nm-setting-bond.h"
+#include "nm-setting-bridge.h"
+#include "nm-setting-bridge-port.h"
 #include "nm-setting-vlan.h"
 #include "nm-setting-serial.h"
 #include "nm-setting-gsm.h"
@@ -116,203 +119,116 @@ enum {
 
 static guint signals[LAST_SIGNAL] = { 0 };
 
+/*************************************************************/
+
 static GHashTable *registered_settings = NULL;
 
-#define DEFAULT_MAP_SIZE 20
+static void __attribute__((constructor))
+_ensure_registered (void)
+{
+	g_type_init ();
+	_nm_utils_register_value_transformations ();
+	if (G_UNLIKELY (registered_settings == NULL))
+		registered_settings = g_hash_table_new (g_str_hash, g_str_equal);
+}
 
-static struct SettingInfo {
-	const char *name;
+typedef struct {
 	GType type;
 	guint32 priority;
-	gboolean base_type;
 	GQuark error_quark;
-} default_map[DEFAULT_MAP_SIZE] = { { NULL } };
-
-static void
-setting_register (const char *name, GType type)
-{
-	g_return_if_fail (name != NULL);
-	g_return_if_fail (G_TYPE_IS_INSTANTIATABLE (type));
-
-	if (G_UNLIKELY (!registered_settings)) {
-		registered_settings = g_hash_table_new_full (g_str_hash, g_str_equal, 
-		                                             (GDestroyNotify) g_free,
-		                                             (GDestroyNotify) g_free);
-	}
-
-	if (g_hash_table_lookup (registered_settings, name))
-		g_warning ("Already have a creator function for '%s', overriding", name);
-
-	g_hash_table_insert (registered_settings, g_strdup (name), g_strdup (g_type_name (type)));
-}
+} SettingInfo;
 
-#if 0
-static void
-setting_unregister (const char *name)
-{
-	if (registered_settings)
-		g_hash_table_remove (registered_settings, name);
-}
-#endif
-
-static void
-register_one_setting (const char *name,
-                      GType type,
-                      GQuark error_quark,
-                      guint32 priority,
-                      gboolean base_type)
+/*
+ * _nm_register_setting:
+ * @name: the name of the #NMSetting object to register
+ * @type: the #GType of the #NMSetting
+ * @priority: the sort priority of the setting, see below
+ * @error_quark: the setting's error quark
+ *
+ * INTERNAL ONLY: registers a setting's internal properties, like its priority
+ * and its error quark type, with libnm-util.
+ *
+ * A setting's priority should roughly follow the OSI layer model, but it also
+ * controls which settings get asked for secrets first.  Thus settings which
+ * relate to things that must be working first, like hardware, should get a
+ * higher priority than things which layer on top of the hardware.  For example,
+ * the GSM/CDMA settings should provide secrets before the PPP setting does,
+ * because a PIN is required to unlock the device before PPP can even start.
+ * Even settings without secrets should be assigned the right priority.
+ *
+ * 0: reserved for the Connection setting
+ *
+ * 1: hardware-related settings like Ethernet, WiFi, Infiniband, Bridge, etc.
+ * These priority 1 settings are also "base types", which means that at least
+ * one of them is required for the connection to be valid, and their name is
+ * valid in the 'type' property of the Connection setting.
+ *
+ * 2: hardware-related auxiliary settings that require a base setting to be
+ * successful first, like WiFi security, 802.1x, etc.
+ *
+ * 3: hardware-independent settings that are required before IP connectivity
+ * can be established, like PPP, PPPoE, etc.
+ *
+ * 4: IP-level stuff
+ */
+void
+_nm_register_setting (const char *name,
+                      const GType type,
+                      const guint32 priority,
+                      const GQuark error_quark)
 {
-	static guint32 i = 0;
-
-	g_return_if_fail (i < DEFAULT_MAP_SIZE);
-	g_return_if_fail (default_map[i].name == NULL);
+	SettingInfo *info;
 
-	default_map[i].name = name;
-	default_map[i].type = type;
-	default_map[i].error_quark = error_quark;
-	default_map[i].priority = priority;
-	default_map[i].base_type = base_type;
-	i++;
-
-	setting_register (name, type);
-}
+	g_return_if_fail (name != NULL);
+	g_return_if_fail (type != G_TYPE_INVALID);
+	g_return_if_fail (type != G_TYPE_NONE);
+	g_return_if_fail (error_quark != 0);
+	g_return_if_fail (priority <= 4);
 
-static void
-register_default_settings (void)
-{
-	_nm_utils_register_value_transformations ();
+	_ensure_registered ();
 
-	if (G_LIKELY (default_map[0].name))
+	if (G_LIKELY (g_hash_table_lookup (registered_settings, name)))
 		return;
 
-	register_one_setting (NM_SETTING_CONNECTION_SETTING_NAME,
-	                      NM_TYPE_SETTING_CONNECTION,
-	                      NM_SETTING_CONNECTION_ERROR,
-	                      0, FALSE);
-
-	register_one_setting (NM_SETTING_WIRED_SETTING_NAME,
-	                      NM_TYPE_SETTING_WIRED,
-	                      NM_SETTING_WIRED_ERROR,
-	                      1, TRUE);
-
-	register_one_setting (NM_SETTING_WIRELESS_SETTING_NAME,
-	                      NM_TYPE_SETTING_WIRELESS,
-	                      NM_SETTING_WIRELESS_ERROR,
-	                      1, TRUE);
-
-	register_one_setting (NM_SETTING_OLPC_MESH_SETTING_NAME,
-	                      NM_TYPE_SETTING_OLPC_MESH,
-	                      NM_SETTING_OLPC_MESH_ERROR,
-	                      1, TRUE);
-
-	register_one_setting (NM_SETTING_GSM_SETTING_NAME,
-	                      NM_TYPE_SETTING_GSM,
-	                      NM_SETTING_GSM_ERROR,
-	                      1, TRUE);
-
-	register_one_setting (NM_SETTING_CDMA_SETTING_NAME,
-	                      NM_TYPE_SETTING_CDMA,
-	                      NM_SETTING_CDMA_ERROR,
-	                      1, TRUE);
-
-	register_one_setting (NM_SETTING_BLUETOOTH_SETTING_NAME,
-	                      NM_TYPE_SETTING_BLUETOOTH,
-	                      NM_SETTING_BLUETOOTH_ERROR,
-	                      1, TRUE);
-
-	register_one_setting (NM_SETTING_WIMAX_SETTING_NAME,
-	                      NM_TYPE_SETTING_WIMAX,
-	                      NM_SETTING_WIMAX_ERROR,
-	                      1, TRUE);
-
-	register_one_setting (NM_SETTING_BOND_SETTING_NAME,
-	                      NM_TYPE_SETTING_BOND,
-	                      NM_SETTING_BOND_ERROR,
-	                      1, TRUE);
-
-	register_one_setting (NM_SETTING_INFINIBAND_SETTING_NAME,
-	                      NM_TYPE_SETTING_INFINIBAND,
-	                      NM_SETTING_INFINIBAND_ERROR,
-	                      1, TRUE);
-
-	register_one_setting (NM_SETTING_VLAN_SETTING_NAME,
-	                      NM_TYPE_SETTING_VLAN,
-	                      NM_SETTING_VLAN_ERROR,
-	                      1, TRUE);
-
-	register_one_setting (NM_SETTING_WIRELESS_SECURITY_SETTING_NAME,
-	                      NM_TYPE_SETTING_WIRELESS_SECURITY,
-	                      NM_SETTING_WIRELESS_SECURITY_ERROR,
-	                      2, FALSE);
-
-	register_one_setting (NM_SETTING_SERIAL_SETTING_NAME,
-	                      NM_TYPE_SETTING_SERIAL,
-	                      NM_SETTING_SERIAL_ERROR,
-	                      2, FALSE);
-
-	register_one_setting (NM_SETTING_PPP_SETTING_NAME,
-	                      NM_TYPE_SETTING_PPP,
-	                      NM_SETTING_PPP_ERROR,
-	                      3, FALSE);
-
-	register_one_setting (NM_SETTING_PPPOE_SETTING_NAME,
-	                      NM_TYPE_SETTING_PPPOE,
-	                      NM_SETTING_PPPOE_ERROR,
-	                      3, TRUE);
-
-	register_one_setting (NM_SETTING_ADSL_SETTING_NAME,
-	                      NM_TYPE_SETTING_ADSL,
-	                      NM_SETTING_ADSL_ERROR,
-	                      3, TRUE);
-
-	register_one_setting (NM_SETTING_802_1X_SETTING_NAME,
-	                      NM_TYPE_SETTING_802_1X,
-	                      NM_SETTING_802_1X_ERROR,
-	                      3, FALSE);
-
-	register_one_setting (NM_SETTING_VPN_SETTING_NAME,
-	                      NM_TYPE_SETTING_VPN,
-	                      NM_SETTING_VPN_ERROR,
-	                      4, TRUE);
-
-	register_one_setting (NM_SETTING_IP4_CONFIG_SETTING_NAME,
-	                      NM_TYPE_SETTING_IP4_CONFIG,
-	                      NM_SETTING_IP4_CONFIG_ERROR,
-	                      6, FALSE);
-
-	register_one_setting (NM_SETTING_IP6_CONFIG_SETTING_NAME,
-	                      NM_TYPE_SETTING_IP6_CONFIG,
-	                      NM_SETTING_IP6_CONFIG_ERROR,
-	                      6, FALSE);
-
-	/* Be sure to update DEFAULT_MAP_SIZE if you add another setting!! */
+	if (priority == 0)
+		g_assert_cmpstr (name, ==, NM_SETTING_CONNECTION_SETTING_NAME);
+
+	info = g_slice_new0 (SettingInfo);
+	info->type = type;
+	info->priority = priority;
+	info->error_quark = error_quark;
+	g_hash_table_insert (registered_settings, (gpointer) name, info);
 }
 
 static guint32
-get_priority_for_setting_type (GType type)
+_get_setting_priority (NMSetting *setting)
 {
-	int i;
+	GHashTableIter iter;
+	SettingInfo *info;
 
-	for (i = 0; default_map[i].name; i++) {
-		if (default_map[i].type == type)
-			return default_map[i].priority;
-	}
+	_ensure_registered ();
 
+	g_hash_table_iter_init (&iter, registered_settings);
+	while (g_hash_table_iter_next (&iter, NULL, (gpointer) &info)) {
+		if (G_OBJECT_TYPE (setting) == info->type)
+			return info->priority;
+	}
 	return G_MAXUINT32;
 }
 
 static gboolean
-get_base_type_for_setting_type (GType type)
+_is_setting_base_type (NMSetting *setting)
 {
-	int i;
-
-	for (i = 0; default_map[i].name; i++) {
-		if (default_map[i].type == type)
-			return default_map[i].base_type;
-	}
-	return FALSE;
+	/* Historical oddity: PPPoE is a base-type even though it's not
+	 * priority 1.  It needs to be sorted *after* lower-level stuff like
+	 * WiFi security or 802.1x for secrets, but it's still allowed as a
+	 * base type.
+	 */
+	return _get_setting_priority (setting) == 1 || NM_IS_SETTING_PPPOE (setting);
 }
 
+/*************************************************************/
+
 /**
  * nm_connection_lookup_setting_type:
  * @name: a setting name
@@ -324,25 +240,18 @@ get_base_type_for_setting_type (GType type)
 GType
 nm_connection_lookup_setting_type (const char *name)
 {
-	char *type_name;
-	GType type;
+	SettingInfo *info;
 
 	g_return_val_if_fail (name != NULL, G_TYPE_NONE);
 
-	if (!registered_settings)
-		register_default_settings ();
+	_ensure_registered ();
 
-	type_name = (char *) g_hash_table_lookup (registered_settings, name);
-	if (type_name) {
-		type = g_type_from_name (type_name);
-		if (!type)
-			g_warning ("Can not get type for '%s'.", type_name);
-	} else {
-		type = 0;
-		g_warning ("Unknown setting '%s'", name);
-	}
+	info = g_hash_table_lookup (registered_settings, name);
+	if (info)
+		return info->type;
 
-	return type;
+	g_warning ("Unknown setting '%s'", name);
+	return G_TYPE_INVALID;
 }
 
 /**
@@ -357,13 +266,16 @@ nm_connection_lookup_setting_type (const char *name)
 GType
 nm_connection_lookup_setting_type_by_quark (GQuark error_quark)
 {
-	int i;
+	SettingInfo *info;
+	GHashTableIter iter;
 
-	for (i = 0; default_map[i].name; i++) {
-		if (default_map[i].error_quark == error_quark)
-			return default_map[i].type;
-	}
+	_ensure_registered ();
 
+	g_hash_table_iter_init (&iter, registered_settings);
+	while (g_hash_table_iter_next (&iter, NULL, (gpointer) &info)) {
+		if (info->error_quark == error_quark)
+			return info->type;
+	}
 	return G_TYPE_INVALID;
 }
 
@@ -739,8 +651,8 @@ nm_connection_verify (NMConnection *connection, GError **error)
 	gpointer value;
 	GSList *all_settings = NULL;
 	gboolean success = TRUE;
+	NMSetting *base;
 	const char *ctype;
-	GType base_type;
 
 	if (error)
 		g_return_val_if_fail (*error == NULL, FALSE);
@@ -791,8 +703,8 @@ nm_connection_verify (NMConnection *connection, GError **error)
 		return FALSE;
 	}
 
-	base_type = nm_connection_lookup_setting_type (ctype);
-	if (base_type == 0) {
+	base = nm_connection_get_setting_by_name (connection, ctype);
+	if (!base) {
 		g_set_error_literal (error,
 		                     NM_CONNECTION_ERROR,
 		                     NM_CONNECTION_ERROR_CONNECTION_TYPE_INVALID,
@@ -800,7 +712,7 @@ nm_connection_verify (NMConnection *connection, GError **error)
 		return FALSE;
 	}
 
-	if (!get_base_type_for_setting_type (base_type)) {
+	if (!_is_setting_base_type (base)) {
 		g_set_error (error,
 			         NM_CONNECTION_ERROR,
 			         NM_CONNECTION_ERROR_CONNECTION_TYPE_INVALID,
@@ -896,8 +808,8 @@ setting_priority_compare (gconstpointer a, gconstpointer b)
 {
 	guint32 prio_a, prio_b;
 
-	prio_a = get_priority_for_setting_type (G_OBJECT_TYPE (NM_SETTING (a)));
-	prio_b = get_priority_for_setting_type (G_OBJECT_TYPE (NM_SETTING (b)));
+	prio_a = _get_setting_priority (NM_SETTING (a));
+	prio_b = _get_setting_priority (NM_SETTING (b));
 
 	if (prio_a < prio_b)
 		return -1;
@@ -906,14 +818,6 @@ setting_priority_compare (gconstpointer a, gconstpointer b)
 	return 1;
 }
 
-static void
-add_setting_to_list (gpointer key, gpointer data, gpointer user_data)
-{
-	GSList **list = (GSList **) user_data;
-
-	*list = g_slist_insert_sorted (*list, NM_SETTING (data), setting_priority_compare);
-}
-
 /**
  * nm_connection_need_secrets:
  * @connection: the #NMConnection
@@ -938,9 +842,11 @@ nm_connection_need_secrets (NMConnection *connection,
                             GPtrArray **hints)
 {
 	NMConnectionPrivate *priv;
+	GHashTableIter hiter;
 	GSList *settings = NULL;
 	GSList *iter;
 	const char *name = NULL;
+	NMSetting *setting;
 
 	g_return_val_if_fail (connection != NULL, NULL);
 	g_return_val_if_fail (NM_IS_CONNECTION (connection), NULL);
@@ -950,15 +856,14 @@ nm_connection_need_secrets (NMConnection *connection,
 	priv = NM_CONNECTION_GET_PRIVATE (connection);
 
 	/* Get list of settings in priority order */
-	g_hash_table_foreach (priv->settings, add_setting_to_list, &settings);
+	g_hash_table_iter_init (&hiter, priv->settings);
+	while (g_hash_table_iter_next (&hiter, NULL, (gpointer) &setting))
+		settings = g_slist_insert_sorted (settings, setting, setting_priority_compare);
 
 	for (iter = settings; iter; iter = g_slist_next (iter)) {
-		NMSetting *setting = NM_SETTING (iter->data);
 		GPtrArray *secrets;
 
-		// FIXME: do something with requested secrets rather than asking for
-		// all of them.  Maybe make secrets a hash table mapping
-		// settings name :: [list of secrets key names].
+		setting = NM_SETTING (iter->data);
 		secrets = nm_setting_need_secrets (setting);
 		if (secrets) {
 			if (hints)
@@ -1234,14 +1139,7 @@ nm_connection_get_virtual_iface_name (NMConnection *connection)
 NMConnection *
 nm_connection_new (void)
 {
-	GObject *object;
-
-	if (!registered_settings)
-		register_default_settings ();
-
-	object = g_object_new (NM_TYPE_CONNECTION, NULL);
-
-	return NM_CONNECTION (object);
+	return (NMConnection *) g_object_new (NM_TYPE_CONNECTION, NULL);
 }
 
 /**
@@ -1404,6 +1302,23 @@ nm_connection_get_setting_bond (NMConnection *connection)
 	return (NMSettingBond *) nm_connection_get_setting (connection, NM_TYPE_SETTING_BOND);
 }
 
+/**
+ * nm_connection_get_setting_bridge:
+ * @connection: the #NMConnection
+ *
+ * A shortcut to return any #NMSettingBridge the connection might contain.
+ *
+ * Returns: (transfer none): an #NMSettingBridge if the connection contains one, otherwise NULL
+ **/
+NMSettingBridge *
+nm_connection_get_setting_bridge (NMConnection *connection)
+{
+	g_return_val_if_fail (connection != NULL, NULL);
+	g_return_val_if_fail (NM_IS_CONNECTION (connection), NULL);
+
+	return (NMSettingBridge *) nm_connection_get_setting (connection, NM_TYPE_SETTING_BRIDGE);
+}
+
 /**
  * nm_connection_get_setting_cdma:
  * @connection: the #NMConnection
@@ -1676,6 +1591,23 @@ nm_connection_get_setting_wireless_security (NMConnection *connection)
 	return (NMSettingWirelessSecurity *) nm_connection_get_setting (connection, NM_TYPE_SETTING_WIRELESS_SECURITY);
 }
 
+/**
+ * nm_connection_get_setting_bridge_port:
+ * @connection: the #NMConnection
+ *
+ * A shortcut to return any #NMSettingBridgePort the connection might contain.
+ *
+ * Returns: (transfer none): an #NMSettingBridgePort if the connection contains one, otherwise NULL
+ **/
+NMSettingBridgePort *
+nm_connection_get_setting_bridge_port (NMConnection *connection)
+{
+	g_return_val_if_fail (connection != NULL, NULL);
+	g_return_val_if_fail (NM_IS_CONNECTION (connection), NULL);
+
+	return (NMSettingBridgePort *) nm_connection_get_setting (connection, NM_TYPE_SETTING_BRIDGE_PORT);
+}
+
 /**
  * nm_connection_get_setting_vlan:
  * @connection: the #NMConnection
diff --git a/libnm-util/nm-connection.h b/libnm-util/nm-connection.h
index 0fd878c3..4d060cc9 100644
--- a/libnm-util/nm-connection.h
+++ b/libnm-util/nm-connection.h
@@ -33,6 +33,8 @@
 #include 
 #include 
 #include 
+#include 
+#include 
 #include 
 #include 
 #include 
@@ -188,6 +190,8 @@ const char *  nm_connection_get_id        (NMConnection *connection);
 NMSetting8021x *           nm_connection_get_setting_802_1x            (NMConnection *connection);
 NMSettingBluetooth *       nm_connection_get_setting_bluetooth         (NMConnection *connection);
 NMSettingBond *            nm_connection_get_setting_bond              (NMConnection *connection);
+NMSettingBridge *          nm_connection_get_setting_bridge            (NMConnection *connection);
+NMSettingBridgePort *      nm_connection_get_setting_bridge_port       (NMConnection *connection);
 NMSettingCdma *            nm_connection_get_setting_cdma              (NMConnection *connection);
 NMSettingConnection *      nm_connection_get_setting_connection        (NMConnection *connection);
 NMSettingGsm *             nm_connection_get_setting_gsm               (NMConnection *connection);
diff --git a/libnm-util/nm-setting-8021x.c b/libnm-util/nm-setting-8021x.c
index 28c0d3f9..32eda889 100644
--- a/libnm-util/nm-setting-8021x.c
+++ b/libnm-util/nm-setting-8021x.c
@@ -24,7 +24,6 @@
  */
 
 #include 
-#include 
 #include 
 #include "nm-setting-8021x.h"
 #include "nm-param-spec-specialized.h"
@@ -82,7 +81,12 @@ nm_setting_802_1x_error_quark (void)
 	return quark;
 }
 
-G_DEFINE_TYPE (NMSetting8021x, nm_setting_802_1x, NM_TYPE_SETTING)
+G_DEFINE_TYPE_WITH_CODE (NMSetting8021x, nm_setting_802_1x, NM_TYPE_SETTING,
+                         _nm_register_setting (NM_SETTING_802_1X_SETTING_NAME,
+                                               g_define_type_id,
+                                               2,
+                                               NM_SETTING_802_1X_ERROR))
+NM_SETTING_REGISTER_TYPE (NM_TYPE_SETTING_802_1X)
 
 #define NM_SETTING_802_1X_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), NM_TYPE_SETTING_802_1X, NMSetting8021xPrivate))
 
diff --git a/libnm-util/nm-setting-adsl.c b/libnm-util/nm-setting-adsl.c
index 6103c715..de0850e6 100644
--- a/libnm-util/nm-setting-adsl.c
+++ b/libnm-util/nm-setting-adsl.c
@@ -55,7 +55,12 @@ nm_setting_adsl_error_quark (void)
 	return quark;
 }
 
-G_DEFINE_TYPE (NMSettingAdsl, nm_setting_adsl, NM_TYPE_SETTING)
+G_DEFINE_TYPE_WITH_CODE (NMSettingAdsl, nm_setting_adsl, NM_TYPE_SETTING,
+                         _nm_register_setting (NM_SETTING_ADSL_SETTING_NAME,
+                                               g_define_type_id,
+                                               1,
+                                               NM_SETTING_ADSL_ERROR))
+NM_SETTING_REGISTER_TYPE (NM_TYPE_SETTING_ADSL)
 
 #define NM_SETTING_ADSL_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), NM_TYPE_SETTING_ADSL, NMSettingAdslPrivate))
 
diff --git a/libnm-util/nm-setting-bluetooth.c b/libnm-util/nm-setting-bluetooth.c
index 52f0b81e..161b3715 100644
--- a/libnm-util/nm-setting-bluetooth.c
+++ b/libnm-util/nm-setting-bluetooth.c
@@ -25,7 +25,6 @@
  */
 
 #include 
-#include 
 #include 
 
 #include "nm-param-spec-specialized.h"
@@ -33,6 +32,7 @@
 #include "nm-setting-bluetooth.h"
 #include "nm-setting-cdma.h"
 #include "nm-setting-gsm.h"
+#include "nm-setting-private.h"
 
 /**
  * SECTION:nm-setting-bluetooth
@@ -63,7 +63,12 @@ nm_setting_bluetooth_error_quark (void)
 }
 
 
-G_DEFINE_TYPE (NMSettingBluetooth, nm_setting_bluetooth, NM_TYPE_SETTING)
+G_DEFINE_TYPE_WITH_CODE (NMSettingBluetooth, nm_setting_bluetooth, NM_TYPE_SETTING,
+                         _nm_register_setting (NM_SETTING_BLUETOOTH_SETTING_NAME,
+                                               g_define_type_id,
+                                               1,
+                                               NM_SETTING_BLUETOOTH_ERROR))
+NM_SETTING_REGISTER_TYPE (NM_TYPE_SETTING_BLUETOOTH)
 
 #define NM_SETTING_BLUETOOTH_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), NM_TYPE_SETTING_BLUETOOTH, NMSettingBluetoothPrivate))
 
diff --git a/libnm-util/nm-setting-bond.c b/libnm-util/nm-setting-bond.c
index b7994f4a..a3dbd766 100644
--- a/libnm-util/nm-setting-bond.c
+++ b/libnm-util/nm-setting-bond.c
@@ -22,7 +22,6 @@
  */
 
 #include 
-#include 
 #include 
 #include 
 
@@ -31,6 +30,7 @@
 #include "nm-utils.h"
 #include "nm-utils-private.h"
 #include "nm-dbus-glib-types.h"
+#include "nm-setting-private.h"
 
 /**
  * SECTION:nm-setting-bond
@@ -59,7 +59,12 @@ nm_setting_bond_error_quark (void)
 }
 
 
-G_DEFINE_TYPE (NMSettingBond, nm_setting_bond, NM_TYPE_SETTING)
+G_DEFINE_TYPE_WITH_CODE (NMSettingBond, nm_setting_bond, NM_TYPE_SETTING,
+                         _nm_register_setting (NM_SETTING_BOND_SETTING_NAME,
+                                               g_define_type_id,
+                                               1,
+                                               NM_SETTING_BOND_ERROR))
+NM_SETTING_REGISTER_TYPE (NM_TYPE_SETTING_BOND)
 
 #define NM_SETTING_BOND_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), NM_TYPE_SETTING_BOND, NMSettingBondPrivate))
 
@@ -329,31 +334,6 @@ nm_setting_bond_get_option_default (NMSettingBond *setting, const char *name)
 	g_assert_not_reached ();
 }
 
-/*
- * This function is a 1:1 copy of the kernel's
- * dev_valid_name() in net/core/dev.c
- */
-static gboolean
-dev_valid_name(const char *name)
-{
-	if (*name == '\0')
-		return FALSE;
-
-	if (strlen (name) >= 16)
-		return FALSE;
-
-	if (!strcmp (name, ".") || !strcmp (name, ".."))
-		return FALSE;
-
-	while (*name) {
-		if (*name == '/' || isspace (*name))
-			return FALSE;
-		name++;
-	}
-
-	return TRUE;
-}
-
 static gint
 find_setting_by_name (gconstpointer a, gconstpointer b)
 {
@@ -388,7 +368,7 @@ verify (NMSetting *setting, GSList *all_settings, GError **error)
 		return FALSE;
 	}
 
-	if (!dev_valid_name (priv->interface_name)) {
+	if (!nm_utils_iface_valid_name (priv->interface_name)) {
 		g_set_error (error,
 		             NM_SETTING_BOND_ERROR,
 		             NM_SETTING_BOND_ERROR_INVALID_PROPERTY,
diff --git a/libnm-util/nm-setting-bridge-port.c b/libnm-util/nm-setting-bridge-port.c
new file mode 100644
index 00000000..d7f3dd59
--- /dev/null
+++ b/libnm-util/nm-setting-bridge-port.c
@@ -0,0 +1,281 @@
+/* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */
+
+/*
+ * Dan Williams 
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the
+ * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA 02110-1301 USA.
+ *
+ * (C) Copyright 2012 Red Hat, Inc.
+ */
+
+#include 
+#include 
+#include 
+#include 
+
+#include "nm-setting-bridge-port.h"
+#include "nm-utils.h"
+#include "nm-utils-private.h"
+#include "nm-setting-private.h"
+
+/**
+ * SECTION:nm-setting-bridge-port
+ * @short_description: Describes connection properties for bridge ports
+ * @include: nm-setting-bridge-port.h
+ *
+ * The #NMSettingBridgePort object is a #NMSetting subclass that describes
+ * optional properties that apply to bridge ports.
+ **/
+
+/**
+ * nm_setting_bridge_port_error_quark:
+ *
+ * Registers an error quark for #NMSettingBridgePort if necessary.
+ *
+ * Returns: the error quark used for #NMSettingBridgePort errors.
+ **/
+GQuark
+nm_setting_bridge_port_error_quark (void)
+{
+	static GQuark quark;
+
+	if (G_UNLIKELY (!quark))
+		quark = g_quark_from_static_string ("nm-setting-bridge-port-error-quark");
+	return quark;
+}
+
+G_DEFINE_TYPE_WITH_CODE (NMSettingBridgePort, nm_setting_bridge_port, NM_TYPE_SETTING,
+                         _nm_register_setting (NM_SETTING_BRIDGE_PORT_SETTING_NAME,
+                                               g_define_type_id,
+                                               3,
+                                               NM_SETTING_BRIDGE_PORT_ERROR))
+NM_SETTING_REGISTER_TYPE (NM_TYPE_SETTING_BRIDGE_PORT)
+
+#define NM_SETTING_BRIDGE_PORT_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), NM_TYPE_SETTING_BRIDGE_PORT, NMSettingBridgePortPrivate))
+
+typedef struct {
+	guint16 priority;
+	guint16 path_cost;
+	gboolean hairpin_mode;
+} NMSettingBridgePortPrivate;
+
+enum {
+	PROP_0,
+	PROP_PRIORITY,
+	PROP_PATH_COST,
+	PROP_HAIRPIN_MODE,
+	LAST_PROP
+};
+
+/**************************************************************************/
+
+/**
+ * nm_setting_bridge_port_get_priority:
+ * @setting: the #NMSettingBridgePort
+ *
+ * Returns: the #NMSettingBridgePort:priority property of the setting
+ **/
+guint16
+nm_setting_bridge_port_get_priority (NMSettingBridgePort *setting)
+{
+	g_return_val_if_fail (NM_IS_SETTING_BRIDGE_PORT (setting), 0);
+
+	return NM_SETTING_BRIDGE_PORT_GET_PRIVATE (setting)->priority;
+}
+
+/**
+ * nm_setting_bridge_port_get_path_cost:
+ * @setting: the #NMSettingBridgePort
+ *
+ * Returns: the #NMSettingBridgePort:path-cost property of the setting
+ **/
+guint16
+nm_setting_bridge_port_get_path_cost (NMSettingBridgePort *setting)
+{
+	g_return_val_if_fail (NM_IS_SETTING_BRIDGE_PORT (setting), 0);
+
+	return NM_SETTING_BRIDGE_PORT_GET_PRIVATE (setting)->path_cost;
+}
+
+/**
+ * nm_setting_bridge_port_get_hairpin_mode:
+ * @setting: the #NMSettingBridgePort
+ *
+ * Returns: the #NMSettingBridgePort:hairpin-mode property of the setting
+ **/
+gboolean
+nm_setting_bridge_port_get_hairpin_mode (NMSettingBridgePort *setting)
+{
+	g_return_val_if_fail (NM_IS_SETTING_BRIDGE_PORT (setting), FALSE);
+
+	return NM_SETTING_BRIDGE_PORT_GET_PRIVATE (setting)->hairpin_mode;
+}
+
+/**************************************************************************/
+
+#define BR_MAX_PORT_PRIORITY 63
+#define BR_DEF_PRIORITY      32
+
+#define BR_MIN_PATH_COST     1
+#define BR_MAX_PATH_COST     65535
+
+static gboolean
+verify (NMSetting *setting, GSList *all_settings, GError **error)
+{
+	NMSettingBridgePortPrivate *priv = NM_SETTING_BRIDGE_PORT_GET_PRIVATE (setting);
+
+	if (priv->priority > BR_MAX_PORT_PRIORITY) {
+		g_set_error (error,
+		             NM_SETTING_BRIDGE_PORT_ERROR,
+		             NM_SETTING_BRIDGE_PORT_ERROR_INVALID_PROPERTY,
+		             NM_SETTING_BRIDGE_PORT_PRIORITY);
+		return FALSE;
+	}
+
+	if (priv->path_cost > BR_MAX_PATH_COST) {
+		g_set_error (error,
+		             NM_SETTING_BRIDGE_PORT_ERROR,
+		             NM_SETTING_BRIDGE_PORT_ERROR_INVALID_PROPERTY,
+		             NM_SETTING_BRIDGE_PORT_PATH_COST);
+		return FALSE;
+	}
+
+	return TRUE;
+}
+
+/**************************************************************************/
+
+/**
+ * nm_setting_bridge_port_new:
+ *
+ * Creates a new #NMSettingBridgePort object with default values.
+ *
+ * Returns: (transfer full): the new empty #NMSettingBridgePort object
+ **/
+NMSetting *
+nm_setting_bridge_port_new (void)
+{
+	return (NMSetting *) g_object_new (NM_TYPE_SETTING_BRIDGE_PORT, NULL);
+}
+
+static void
+nm_setting_bridge_port_init (NMSettingBridgePort *setting)
+{
+	g_object_set (setting, NM_SETTING_NAME, NM_SETTING_BRIDGE_PORT_SETTING_NAME, NULL);
+}
+
+static void
+set_property (GObject *object, guint prop_id,
+              const GValue *value, GParamSpec *pspec)
+{
+	NMSettingBridgePortPrivate *priv = NM_SETTING_BRIDGE_PORT_GET_PRIVATE (object);
+
+	switch (prop_id) {
+	case PROP_PRIORITY:
+		priv->priority = (guint16) (g_value_get_uint (value) & 0xFFFF);
+		break;
+	case PROP_PATH_COST:
+		priv->path_cost = (guint16) (g_value_get_uint (value) & 0xFFFF);
+		break;
+	case PROP_HAIRPIN_MODE:
+		priv->hairpin_mode = g_value_get_boolean (value);
+		break;
+	default:
+		G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
+		break;
+	}
+}
+
+static void
+get_property (GObject *object, guint prop_id,
+              GValue *value, GParamSpec *pspec)
+{
+	NMSettingBridgePortPrivate *priv = NM_SETTING_BRIDGE_PORT_GET_PRIVATE (object);
+
+	switch (prop_id) {
+	case PROP_PRIORITY:
+		g_value_set_uint (value, priv->priority);
+		break;
+	case PROP_PATH_COST:
+		g_value_set_uint (value, priv->path_cost);
+		break;
+	case PROP_HAIRPIN_MODE:
+		g_value_set_boolean (value, priv->hairpin_mode);
+		break;
+	default:
+		G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
+		break;
+	}
+}
+
+static void
+nm_setting_bridge_port_class_init (NMSettingBridgePortClass *setting_class)
+{
+	GObjectClass *object_class = G_OBJECT_CLASS (setting_class);
+	NMSettingClass *parent_class = NM_SETTING_CLASS (setting_class);
+
+	g_type_class_add_private (setting_class, sizeof (NMSettingBridgePortPrivate));
+
+	/* virtual methods */
+	object_class->set_property = set_property;
+	object_class->get_property = get_property;
+	parent_class->verify       = verify;
+
+	/* Properties */
+	/**
+	 * NMSettingBridgePort:priority:
+	 *
+	 * The Spanning Tree Protocol (STP) priority of this bridge port.
+	 **/
+	g_object_class_install_property
+		(object_class, PROP_PRIORITY,
+		 g_param_spec_uint (NM_SETTING_BRIDGE_PORT_PRIORITY,
+		                    "Priority",
+		                    "The Spanning Tree Protocol (STP) priority of this bridge port",
+		                    0, BR_MAX_PORT_PRIORITY, BR_DEF_PRIORITY,
+		                    G_PARAM_READWRITE | G_PARAM_CONSTRUCT | NM_SETTING_PARAM_SERIALIZE));
+
+	/**
+	 * NMSettingBridgePort:path-cost:
+	 *
+	 * The Spanning Tree Protocol (STP) port cost for destinations via this port.
+	 **/
+	 g_object_class_install_property
+		 (object_class, PROP_PATH_COST,
+		 g_param_spec_uint (NM_SETTING_BRIDGE_PORT_PATH_COST,
+		                    "Path Cost",
+		                    "The Spanning Tree Protocol (STP) port cost for "
+		                    "destinations via this port.",
+		                    0, BR_MAX_PATH_COST, 100,
+		                    G_PARAM_READWRITE | G_PARAM_CONSTRUCT | NM_SETTING_PARAM_SERIALIZE));
+
+	/**
+	 * NMSettingBridgePort:hairpin-mode:
+	 *
+	 * Enables or disabled 'hairpin mode' for the port, which allows frames to
+	 * be sent back out through the port the frame was received on.
+	 **/
+	 g_object_class_install_property
+		 (object_class, PROP_HAIRPIN_MODE,
+		 g_param_spec_boolean (NM_SETTING_BRIDGE_PORT_HAIRPIN_MODE,
+		                       "Hairpin Mode",
+		                       "Enables or disabled 'hairpin mode' for the "
+		                       "port, which allows frames to be sent back out "
+		                       "through the port the frame was received on.",
+		                       FALSE,
+		                       G_PARAM_READWRITE | NM_SETTING_PARAM_SERIALIZE));
+
+}
diff --git a/libnm-util/nm-setting-bridge-port.h b/libnm-util/nm-setting-bridge-port.h
new file mode 100644
index 00000000..5123f0a7
--- /dev/null
+++ b/libnm-util/nm-setting-bridge-port.h
@@ -0,0 +1,86 @@
+/* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */
+
+/*
+ * Dan Williams 
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the
+ * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA 02110-1301 USA.
+ *
+ * (C) Copyright 2012 Red Hat, Inc.
+ */
+
+#ifndef NM_SETTING_BRIDGE_PORT_H
+#define NM_SETTING_BRIDGE_PORT_H
+
+#include 
+
+G_BEGIN_DECLS
+
+#define NM_TYPE_SETTING_BRIDGE_PORT            (nm_setting_bridge_port_get_type ())
+#define NM_SETTING_BRIDGE_PORT(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), NM_TYPE_SETTING_BRIDGE_PORT, NMSettingBridgePort))
+#define NM_SETTING_BRIDGE_PORT_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), NM_TYPE_SETTING_BRIDGE_PORT, NMSettingBridgePortClass))
+#define NM_IS_SETTING_BRIDGE_PORT(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), NM_TYPE_SETTING_BRIDGE_PORT))
+#define NM_IS_SETTING_BRIDGE_PORT_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), NM_TYPE_SETTING_BRIDGE_PORT))
+#define NM_SETTING_BRIDGE_PORT_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), NM_TYPE_SETTING_BRIDGE_PORT, NMSettingBridgePortClass))
+
+#define NM_SETTING_BRIDGE_PORT_SETTING_NAME "bridge-port"
+
+/**
+ * NMSettingBridgePortError:
+ * @NM_SETTING_BRIDGE_PORT_ERROR_UNKNOWN: unknown or unclassified error
+ * @NM_SETTING_BRIDGE_PORT_ERROR_INVALID_PROPERTY: the property was invalid
+ * @NM_SETTING_BRIDGE_PORT_ERROR_MISSING_PROPERTY: the property was missing and
+ * is required
+ */
+typedef enum {
+	NM_SETTING_BRIDGE_PORT_ERROR_UNKNOWN = 0,      /*< nick=UnknownError >*/
+	NM_SETTING_BRIDGE_PORT_ERROR_INVALID_PROPERTY, /*< nick=InvalidProperty >*/
+	NM_SETTING_BRIDGE_PORT_ERROR_MISSING_PROPERTY, /*< nick=MissingProperty >*/
+} NMSettingBridgePortError;
+
+#define NM_SETTING_BRIDGE_PORT_ERROR nm_setting_bridge_port_error_quark ()
+GQuark nm_setting_bridge_port_error_quark (void);
+
+#define NM_SETTING_BRIDGE_PORT_PRIORITY     "priority"
+#define NM_SETTING_BRIDGE_PORT_PATH_COST    "path-cost"
+#define NM_SETTING_BRIDGE_PORT_HAIRPIN_MODE "hairpin-mode"
+
+typedef struct {
+	NMSetting parent;
+} NMSettingBridgePort;
+
+typedef struct {
+	NMSettingClass parent;
+
+	/* Padding for future expansion */
+	void (*_reserved1) (void);
+	void (*_reserved2) (void);
+	void (*_reserved3) (void);
+	void (*_reserved4) (void);
+} NMSettingBridgePortClass;
+
+GType nm_setting_bridge_port_get_type (void);
+
+NMSetting * nm_setting_bridge_port_new              (void);
+
+guint16     nm_setting_bridge_port_get_priority     (NMSettingBridgePort *setting);
+
+guint16     nm_setting_bridge_port_get_path_cost    (NMSettingBridgePort *setting);
+
+gboolean    nm_setting_bridge_port_get_hairpin_mode (NMSettingBridgePort *setting);
+
+G_END_DECLS
+
+#endif /* NM_SETTING_BRIDGE_PORT_H */
diff --git a/libnm-util/nm-setting-bridge.c b/libnm-util/nm-setting-bridge.c
new file mode 100644
index 00000000..3363ffd4
--- /dev/null
+++ b/libnm-util/nm-setting-bridge.c
@@ -0,0 +1,498 @@
+/* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */
+
+/*
+ * Thomas Graf 
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the
+ * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA 02110-1301 USA.
+ *
+ * (C) Copyright 2011 - 2012 Red Hat, Inc.
+ */
+
+#include 
+#include 
+#include 
+#include 
+
+#include "nm-setting-bridge.h"
+#include "nm-param-spec-specialized.h"
+#include "nm-setting-private.h"
+#include "nm-utils.h"
+#include "nm-utils-private.h"
+#include "nm-dbus-glib-types.h"
+
+/**
+ * SECTION:nm-setting-bridge
+ * @short_description: Describes connection properties for bridges
+ * @include: nm-setting-bridge.h
+ *
+ * The #NMSettingBridge object is a #NMSetting subclass that describes properties
+ * necessary for bridging connections.
+ **/
+
+/**
+ * nm_setting_bridge_error_quark:
+ *
+ * Registers an error quark for #NMSettingBridge if necessary.
+ *
+ * Returns: the error quark used for #NMSettingBridge errors.
+ **/
+GQuark
+nm_setting_bridge_error_quark (void)
+{
+	static GQuark quark;
+
+	if (G_UNLIKELY (!quark))
+		quark = g_quark_from_static_string ("nm-setting-bridge-error-quark");
+	return quark;
+}
+
+
+G_DEFINE_TYPE_WITH_CODE (NMSettingBridge, nm_setting_bridge, NM_TYPE_SETTING,
+                         _nm_register_setting (NM_SETTING_BRIDGE_SETTING_NAME,
+                                               g_define_type_id,
+                                               1,
+                                               NM_SETTING_BRIDGE_ERROR))
+NM_SETTING_REGISTER_TYPE (NM_TYPE_SETTING_BRIDGE)
+
+#define NM_SETTING_BRIDGE_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), NM_TYPE_SETTING_BRIDGE, NMSettingBridgePrivate))
+
+typedef struct {
+	char *   interface_name;
+	gboolean stp;
+	guint16  priority;
+	guint16  forward_delay;
+	guint16  hello_time;
+	guint16  max_age;
+	guint32  ageing_time;
+} NMSettingBridgePrivate;
+
+enum {
+	PROP_0,
+	PROP_INTERFACE_NAME,
+	PROP_STP,
+	PROP_PRIORITY,
+	PROP_FORWARD_DELAY,
+	PROP_HELLO_TIME,
+	PROP_MAX_AGE,
+	PROP_AGEING_TIME,
+	LAST_PROP
+};
+
+/**
+ * nm_setting_bridge_new:
+ *
+ * Creates a new #NMSettingBridge object with default values.
+ *
+ * Returns: (transfer full): the new empty #NMSettingBridge object
+ **/
+NMSetting *
+nm_setting_bridge_new (void)
+{
+	return (NMSetting *) g_object_new (NM_TYPE_SETTING_BRIDGE, NULL);
+}
+
+/**
+ * nm_setting_bridge_get_interface_name:
+ * @setting: the #NMSettingBridge
+ *
+ * Returns: the #NMSettingBridge:interface-name property of the setting
+ **/
+const char *
+nm_setting_bridge_get_interface_name (NMSettingBridge *setting)
+{
+	g_return_val_if_fail (NM_IS_SETTING_BRIDGE (setting), 0);
+
+	return NM_SETTING_BRIDGE_GET_PRIVATE (setting)->interface_name;
+}
+
+/**
+ * nm_setting_bridge_get_stp:
+ * @setting: the #NMSettingBridge
+ *
+ * Returns: the #NMSettingBridge:stp property of the setting
+ **/
+gboolean
+nm_setting_bridge_get_stp (NMSettingBridge *setting)
+{
+	g_return_val_if_fail (NM_IS_SETTING_BRIDGE (setting), FALSE);
+
+	return NM_SETTING_BRIDGE_GET_PRIVATE (setting)->stp;
+}
+
+/**
+ * nm_setting_bridge_get_priority:
+ * @setting: the #NMSettingBridge
+ *
+ * Returns: the #NMSettingBridge:priority property of the setting
+ **/
+guint16
+nm_setting_bridge_get_priority (NMSettingBridge *setting)
+{
+	g_return_val_if_fail (NM_IS_SETTING_BRIDGE (setting), 0);
+
+	return NM_SETTING_BRIDGE_GET_PRIVATE (setting)->priority;
+}
+
+/**
+ * nm_setting_bridge_get_forward_delay:
+ * @setting: the #NMSettingBridge
+ *
+ * Returns: the #NMSettingBridge:forward-delay property of the setting
+ **/
+guint16
+nm_setting_bridge_get_forward_delay (NMSettingBridge *setting)
+{
+	g_return_val_if_fail (NM_IS_SETTING_BRIDGE (setting), 0);
+
+	return NM_SETTING_BRIDGE_GET_PRIVATE (setting)->forward_delay;
+}
+
+/**
+ * nm_setting_bridge_get_hello_time:
+ * @setting: the #NMSettingBridge
+ *
+ * Returns: the #NMSettingBridge:hello-time property of the setting
+ **/
+guint16
+nm_setting_bridge_get_hello_time (NMSettingBridge *setting)
+{
+	g_return_val_if_fail (NM_IS_SETTING_BRIDGE (setting), 0);
+
+	return NM_SETTING_BRIDGE_GET_PRIVATE (setting)->hello_time;
+}
+
+/**
+ * nm_setting_bridge_get_max_age:
+ * @setting: the #NMSettingBridge
+ *
+ * Returns: the #NMSettingBridge:max-age property of the setting
+ **/
+guint16
+nm_setting_bridge_get_max_age (NMSettingBridge *setting)
+{
+	g_return_val_if_fail (NM_IS_SETTING_BRIDGE (setting), 0);
+
+	return NM_SETTING_BRIDGE_GET_PRIVATE (setting)->max_age;
+}
+
+/**
+ * nm_setting_bridge_get_ageing_time:
+ * @setting: the #NMSettingBridge
+ *
+ * Returns: the #NMSettingBridge:ageing-time property of the setting
+ **/
+guint
+nm_setting_bridge_get_ageing_time (NMSettingBridge *setting)
+{
+	g_return_val_if_fail (NM_IS_SETTING_BRIDGE (setting), 0);
+
+	return NM_SETTING_BRIDGE_GET_PRIVATE (setting)->ageing_time;
+}
+
+/* IEEE 802.1D-1998 timer values */
+#define BR_MIN_HELLO_TIME    1
+#define BR_MAX_HELLO_TIME    10
+
+#define BR_MIN_FORWARD_DELAY 2
+#define BR_MAX_FORWARD_DELAY 30
+
+#define BR_MIN_MAX_AGE       6
+#define BR_MAX_MAX_AGE       40
+
+/* IEEE 802.1D-1998 Table 7.4 */
+#define BR_MIN_AGEING_TIME   0
+#define BR_MAX_AGEING_TIME   1000000
+
+static inline gboolean
+check_range (guint32 val,
+             guint32 min,
+             guint32 max,
+             const char *prop,
+             GError **error)
+{
+	if ((val != 0) && (val < min || val > max)) {
+		g_set_error_literal (error,
+		                     NM_SETTING_BRIDGE_ERROR,
+		                     NM_SETTING_BRIDGE_ERROR_INVALID_PROPERTY,
+		                     prop);
+		return FALSE;
+	}
+	return TRUE;
+}
+
+static gboolean
+verify (NMSetting *setting, GSList *all_settings, GError **error)
+{
+	NMSettingBridgePrivate *priv = NM_SETTING_BRIDGE_GET_PRIVATE (setting);
+
+	if (!priv->interface_name || !strlen(priv->interface_name)) {
+		g_set_error (error,
+		             NM_SETTING_BRIDGE_ERROR,
+		             NM_SETTING_BRIDGE_ERROR_MISSING_PROPERTY,
+		             NM_SETTING_BRIDGE_INTERFACE_NAME);
+		return FALSE;
+	}
+
+	if (!nm_utils_iface_valid_name (priv->interface_name)) {
+		g_set_error (error,
+		             NM_SETTING_BRIDGE_ERROR,
+		             NM_SETTING_BRIDGE_ERROR_INVALID_PROPERTY,
+		             NM_SETTING_BRIDGE_INTERFACE_NAME);
+		return FALSE;
+	}
+
+	if (!check_range (priv->forward_delay,
+	                  BR_MIN_FORWARD_DELAY,
+	                  BR_MAX_FORWARD_DELAY,
+	                  NM_SETTING_BRIDGE_FORWARD_DELAY,
+	                  error))
+		return FALSE;
+
+	if (!check_range (priv->hello_time,
+	                  BR_MIN_HELLO_TIME,
+	                  BR_MAX_HELLO_TIME,
+	                  NM_SETTING_BRIDGE_HELLO_TIME,
+	                  error))
+		return FALSE;
+
+	if (!check_range (priv->max_age,
+	                  BR_MIN_MAX_AGE,
+	                  BR_MAX_MAX_AGE,
+	                  NM_SETTING_BRIDGE_MAX_AGE,
+	                  error))
+		return FALSE;
+
+	if (!check_range (priv->ageing_time,
+	                  BR_MIN_AGEING_TIME,
+	                  BR_MAX_AGEING_TIME,
+	                  NM_SETTING_BRIDGE_AGEING_TIME,
+	                  error))
+		return FALSE;
+
+	return TRUE;
+}
+
+static const char *
+get_virtual_iface_name (NMSetting *setting)
+{
+	NMSettingBridge *self = NM_SETTING_BRIDGE (setting);
+
+	return nm_setting_bridge_get_interface_name (self);
+}
+
+static void
+nm_setting_bridge_init (NMSettingBridge *setting)
+{
+	g_object_set (setting, NM_SETTING_NAME, NM_SETTING_BRIDGE_SETTING_NAME, NULL);
+}
+
+static void
+finalize (GObject *object)
+{
+	NMSettingBridgePrivate *priv = NM_SETTING_BRIDGE_GET_PRIVATE (object);
+
+	g_free (priv->interface_name);
+
+	G_OBJECT_CLASS (nm_setting_bridge_parent_class)->finalize (object);
+}
+
+static void
+set_property (GObject *object, guint prop_id,
+              const GValue *value, GParamSpec *pspec)
+{
+	NMSettingBridgePrivate *priv = NM_SETTING_BRIDGE_GET_PRIVATE (object);
+
+	switch (prop_id) {
+	case PROP_INTERFACE_NAME:
+		g_free (priv->interface_name);
+		priv->interface_name = g_value_dup_string (value);
+		break;
+	case PROP_STP:
+		priv->stp = g_value_get_boolean (value);
+		break;
+	case PROP_PRIORITY:
+		priv->priority = (guint16) g_value_get_uint (value);
+		break;
+	case PROP_FORWARD_DELAY:
+		priv->forward_delay = (guint16) g_value_get_uint (value);
+		break;
+	case PROP_HELLO_TIME:
+		priv->hello_time = (guint16) g_value_get_uint (value);
+		break;
+	case PROP_MAX_AGE:
+		priv->max_age = (guint16) g_value_get_uint (value);
+		break;
+	case PROP_AGEING_TIME:
+		priv->ageing_time = g_value_get_uint (value);
+		break;
+	default:
+		G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
+		break;
+	}
+}
+
+static void
+get_property (GObject *object, guint prop_id,
+              GValue *value, GParamSpec *pspec)
+{
+	NMSettingBridgePrivate *priv = NM_SETTING_BRIDGE_GET_PRIVATE (object);
+	NMSettingBridge *setting = NM_SETTING_BRIDGE (object);
+
+	switch (prop_id) {
+	case PROP_INTERFACE_NAME:
+		g_value_set_string (value, nm_setting_bridge_get_interface_name (setting));
+		break;
+	case PROP_STP:
+		g_value_set_boolean (value, priv->stp);
+		break;
+	case PROP_PRIORITY:
+		g_value_set_uint (value, priv->priority);
+		break;
+	case PROP_FORWARD_DELAY:
+		g_value_set_uint (value, priv->forward_delay);
+		break;
+	case PROP_HELLO_TIME:
+		g_value_set_uint (value, priv->hello_time);
+		break;
+	case PROP_MAX_AGE:
+		g_value_set_uint (value, priv->max_age);
+		break;
+	case PROP_AGEING_TIME:
+		g_value_set_uint (value, priv->ageing_time);
+		break;
+	default:
+		G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
+		break;
+	}
+}
+
+static void
+nm_setting_bridge_class_init (NMSettingBridgeClass *setting_class)
+{
+	GObjectClass *object_class = G_OBJECT_CLASS (setting_class);
+	NMSettingClass *parent_class = NM_SETTING_CLASS (setting_class);
+
+	g_type_class_add_private (setting_class, sizeof (NMSettingBridgePrivate));
+
+	/* virtual methods */
+	object_class->set_property = set_property;
+	object_class->get_property = get_property;
+	object_class->finalize     = finalize;
+	parent_class->verify       = verify;
+	parent_class->get_virtual_iface_name = get_virtual_iface_name;
+
+	/* Properties */
+	/**
+	 * NMSettingBridge:interface-name:
+	 *
+	 * The name of the virtual in-kernel briding network interface
+	 **/
+	g_object_class_install_property
+		(object_class, PROP_INTERFACE_NAME,
+		 g_param_spec_string (NM_SETTING_BRIDGE_INTERFACE_NAME,
+		                      "InterfaceName",
+		                      "The name of the virtual in-kernel bridging network interface",
+		                      NULL,
+		                      G_PARAM_READWRITE | NM_SETTING_PARAM_SERIALIZE));
+
+	/**
+	 * NMSettingBridge:stp:
+	 *
+	 * Controls whether Spanning Tree Protocol (STP) is enabled for this bridge.
+	 **/
+	 g_object_class_install_property
+		 (object_class, PROP_STP,
+		  g_param_spec_boolean (NM_SETTING_BRIDGE_STP,
+		                        "STP",
+		                        "Controls whether Spanning Tree Protocol (STP) "
+		                        "is enabled for this bridge.",
+		                        TRUE,
+		                        G_PARAM_READWRITE | G_PARAM_CONSTRUCT | NM_SETTING_PARAM_SERIALIZE));
+
+	/**
+	 * NMSettingBridge:priority:
+	 *
+	 * Sets the Spanning Tree Protocol (STP) priority for this bridge.  Lower
+	 * values are "better"; the lowest priority bridge will be elected the root
+	 * bridge.
+	 **/
+	 g_object_class_install_property
+		 (object_class, PROP_PRIORITY,
+		  g_param_spec_uint (NM_SETTING_BRIDGE_PRIORITY,
+		                     "Priority",
+		                     "Sets the Spanning Tree Protocol (STP) priority "
+		                     "for this bridge.  Lower values are 'better'; the "
+		                     "lowest priority bridge will be elected the root "
+		                     "bridge.",
+		                     0, G_MAXUINT16, 0x80,
+		                     G_PARAM_READWRITE | G_PARAM_CONSTRUCT | NM_SETTING_PARAM_SERIALIZE));
+
+	/**
+	 * NMSettingBridge:forward-delay:
+	 *
+	 * The Spanning Tree Protocol (STP) forwarding delay, in seconds.
+	 **/
+	 g_object_class_install_property
+		 (object_class, PROP_FORWARD_DELAY,
+		  g_param_spec_uint (NM_SETTING_BRIDGE_FORWARD_DELAY,
+		                     "ForwardDelay",
+		                     "The Spanning Tree Protocol (STP) forwarding "
+		                     "delay, in seconds.",
+		                     0, BR_MAX_FORWARD_DELAY, 15,
+		                     G_PARAM_READWRITE | G_PARAM_CONSTRUCT | NM_SETTING_PARAM_SERIALIZE));
+
+	/**
+	 * NMSettingBridge:hello-time:
+	 *
+	 * The Spanning Tree Protocol (STP) hello time, in seconds.
+	 **/
+	 g_object_class_install_property
+		 (object_class, PROP_HELLO_TIME,
+		  g_param_spec_uint (NM_SETTING_BRIDGE_HELLO_TIME,
+		                     "HelloTime",
+		                     "The Spanning Tree Protocol (STP) hello time, in "
+		                     "seconds.",
+		                     0, BR_MAX_HELLO_TIME, 2,
+		                     G_PARAM_READWRITE | G_PARAM_CONSTRUCT | NM_SETTING_PARAM_SERIALIZE));
+
+	/**
+	 * NMSettingBridge:max-age:
+	 *
+	 * The Spanning Tree Protocol (STP) maximum message age, in seconds.
+	 **/
+	 g_object_class_install_property
+		 (object_class, PROP_MAX_AGE,
+		  g_param_spec_uint (NM_SETTING_BRIDGE_MAX_AGE,
+		                     "MaxAge",
+		                     "The Spanning Tree Protocol (STP) maximum message "
+		                     "age, in seconds.",
+		                     0, BR_MAX_MAX_AGE, 20,
+		                     G_PARAM_READWRITE | G_PARAM_CONSTRUCT | NM_SETTING_PARAM_SERIALIZE));
+
+	/**
+	 * NMSettingBridge:ageing-time:
+	 *
+	 * The ethernet MAC address aging time, in seconds.
+	 **/
+	 g_object_class_install_property
+		 (object_class, PROP_AGEING_TIME,
+		  g_param_spec_uint (NM_SETTING_BRIDGE_AGEING_TIME,
+		                     "AgeingTime",
+		                     "The ethernet MAC address aging time, in seconds.",
+		                     0, BR_MAX_AGEING_TIME, 300,
+		                     G_PARAM_READWRITE | G_PARAM_CONSTRUCT | NM_SETTING_PARAM_SERIALIZE));
+}
+
diff --git a/libnm-util/nm-setting-bridge.h b/libnm-util/nm-setting-bridge.h
new file mode 100644
index 00000000..7b9f92be
--- /dev/null
+++ b/libnm-util/nm-setting-bridge.h
@@ -0,0 +1,98 @@
+/* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */
+
+/*
+ * Thomas Graf 
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the
+ * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA 02110-1301 USA.
+ *
+ * (C) Copyright 2011 - 2012 Red Hat, Inc.
+ */
+
+#ifndef NM_SETTING_BRIDGE_H
+#define NM_SETTING_BRIDGE_H
+
+#include 
+
+G_BEGIN_DECLS
+
+#define NM_TYPE_SETTING_BRIDGE            (nm_setting_bridge_get_type ())
+#define NM_SETTING_BRIDGE(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), NM_TYPE_SETTING_BRIDGE, NMSettingBridge))
+#define NM_SETTING_BRIDGE_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), NM_TYPE_SETTING_BRIDGE, NMSettingBridgeClass))
+#define NM_IS_SETTING_BRIDGE(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), NM_TYPE_SETTING_BRIDGE))
+#define NM_IS_SETTING_BRIDGE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), NM_TYPE_SETTING_BRIDGE))
+#define NM_SETTING_BRIDGE_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), NM_TYPE_SETTING_BRIDGE, NMSettingBridgeClass))
+
+#define NM_SETTING_BRIDGE_SETTING_NAME "bridge"
+
+/**
+ * NMSettingBridgeError:
+ * @NM_SETTING_BRIDGE_ERROR_UNKNOWN: unknown or unclassified error
+ * @NM_SETTING_BRIDGE_ERROR_INVALID_PROPERTY: the property was invalid
+ * @NM_SETTING_BRIDGE_ERROR_MISSING_PROPERTY: the property was missing and is
+ * required
+ */
+typedef enum {
+	NM_SETTING_BRIDGE_ERROR_UNKNOWN = 0,      /*< nick=UnknownError >*/
+	NM_SETTING_BRIDGE_ERROR_INVALID_PROPERTY, /*< nick=InvalidProperty >*/
+	NM_SETTING_BRIDGE_ERROR_MISSING_PROPERTY, /*< nick=MissingProperty >*/
+} NMSettingBridgeError;
+
+#define NM_SETTING_BRIDGE_ERROR nm_setting_bridge_error_quark ()
+GQuark nm_setting_bridge_error_quark (void);
+
+#define NM_SETTING_BRIDGE_INTERFACE_NAME "interface-name"
+#define NM_SETTING_BRIDGE_STP            "stp"
+#define NM_SETTING_BRIDGE_PRIORITY       "priority"
+#define NM_SETTING_BRIDGE_FORWARD_DELAY  "forward-delay"
+#define NM_SETTING_BRIDGE_HELLO_TIME     "hello-time"
+#define NM_SETTING_BRIDGE_MAX_AGE        "max-age"
+#define NM_SETTING_BRIDGE_AGEING_TIME    "ageing-time"
+
+typedef struct {
+	NMSetting parent;
+} NMSettingBridge;
+
+typedef struct {
+	NMSettingClass parent;
+
+	/* Padding for future expansion */
+	void (*_reserved1) (void);
+	void (*_reserved2) (void);
+	void (*_reserved3) (void);
+	void (*_reserved4) (void);
+} NMSettingBridgeClass;
+
+GType nm_setting_bridge_get_type (void);
+
+NMSetting *  nm_setting_bridge_new                (void);
+
+const char * nm_setting_bridge_get_interface_name (NMSettingBridge *setting);
+
+gboolean     nm_setting_bridge_get_stp            (NMSettingBridge *setting);
+
+guint16      nm_setting_bridge_get_priority       (NMSettingBridge *setting);
+
+guint16      nm_setting_bridge_get_forward_delay  (NMSettingBridge *setting);
+
+guint16      nm_setting_bridge_get_hello_time     (NMSettingBridge *setting);
+
+guint16      nm_setting_bridge_get_max_age        (NMSettingBridge *setting);
+
+guint32      nm_setting_bridge_get_ageing_time    (NMSettingBridge *setting);
+
+G_END_DECLS
+
+#endif /* NM_SETTING_BRIDGE_H */
diff --git a/libnm-util/nm-setting-cdma.c b/libnm-util/nm-setting-cdma.c
index 43bf93b1..d68531a6 100644
--- a/libnm-util/nm-setting-cdma.c
+++ b/libnm-util/nm-setting-cdma.c
@@ -54,7 +54,12 @@ nm_setting_cdma_error_quark (void)
 }
 
 
-G_DEFINE_TYPE (NMSettingCdma, nm_setting_cdma, NM_TYPE_SETTING)
+G_DEFINE_TYPE_WITH_CODE (NMSettingCdma, nm_setting_cdma, NM_TYPE_SETTING,
+                         _nm_register_setting (NM_SETTING_CDMA_SETTING_NAME,
+                                               g_define_type_id,
+                                               1,
+                                               NM_SETTING_CDMA_ERROR))
+NM_SETTING_REGISTER_TYPE (NM_TYPE_SETTING_CDMA)
 
 #define NM_SETTING_CDMA_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), NM_TYPE_SETTING_CDMA, NMSettingCdmaPrivate))
 
diff --git a/libnm-util/nm-setting-connection.c b/libnm-util/nm-setting-connection.c
index 80380f3c..1222f976 100644
--- a/libnm-util/nm-setting-connection.c
+++ b/libnm-util/nm-setting-connection.c
@@ -19,16 +19,16 @@
  * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
  * Boston, MA 02110-1301 USA.
  *
- * (C) Copyright 2007 - 2011 Red Hat, Inc.
+ * (C) Copyright 2007 - 2012 Red Hat, Inc.
  * (C) Copyright 2007 - 2008 Novell, Inc.
  */
 
 #include 
-#include 
 #include "nm-utils.h"
 #include "nm-dbus-glib-types.h"
 #include "nm-param-spec-specialized.h"
 #include "nm-setting-connection.h"
+#include "nm-setting-private.h"
 
 /**
  * SECTION:nm-setting-connection
@@ -59,7 +59,12 @@ nm_setting_connection_error_quark (void)
 }
 
 
-G_DEFINE_TYPE (NMSettingConnection, nm_setting_connection, NM_TYPE_SETTING)
+G_DEFINE_TYPE_WITH_CODE (NMSettingConnection, nm_setting_connection, NM_TYPE_SETTING,
+                         _nm_register_setting (NM_SETTING_CONNECTION_SETTING_NAME,
+                                               g_define_type_id,
+                                               0,
+                                               NM_SETTING_CONNECTION_ERROR))
+NM_SETTING_REGISTER_TYPE (NM_TYPE_SETTING_CONNECTION)
 
 #define NM_SETTING_CONNECTION_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), NM_TYPE_SETTING_CONNECTION, NMSettingConnectionPrivate))
 
@@ -83,6 +88,7 @@ typedef struct {
 	guint64 timestamp;
 	gboolean read_only;
 	char *zone;
+	GSList *secondaries; /* secondary connections to activate with the base connection */
 } NMSettingConnectionPrivate;
 
 enum {
@@ -97,6 +103,7 @@ enum {
 	PROP_ZONE,
 	PROP_MASTER,
 	PROP_SLAVE_TYPE,
+	PROP_SECONDARIES,
 
 	LAST_PROP
 };
@@ -529,31 +536,103 @@ nm_setting_connection_is_slave_type (NMSettingConnection *setting,
 	return !g_strcmp0 (NM_SETTING_CONNECTION_GET_PRIVATE (setting)->slave_type, type);
 }
 
-static gint
-find_setting_by_name (gconstpointer a, gconstpointer b)
+/**
+ * nm_setting_connection_get_num_secondaries:
+ * @setting: the #NMSettingConnection
+ *
+ * Returns: the number of configured secondary connection UUIDs
+ **/
+guint32
+nm_setting_connection_get_num_secondaries (NMSettingConnection *setting)
 {
-	NMSetting *setting = NM_SETTING (a);
-	const char *str = (const char *) b;
+	g_return_val_if_fail (NM_IS_SETTING_CONNECTION (setting), 0);
 
-	return strcmp (nm_setting_get_name (setting), str);
+	return g_slist_length (NM_SETTING_CONNECTION_GET_PRIVATE (setting)->secondaries);
 }
 
-static gboolean
-validate_uuid (const char *uuid)
+/**
+ * nm_setting_connection_get_secondary:
+ * @setting: the #NMSettingConnection
+ * @idx: the zero-based index of the secondary connection UUID entry
+ *
+ * Returns: the secondary connection UUID at index @idx
+ **/
+const char *
+nm_setting_connection_get_secondary (NMSettingConnection *setting, guint32 idx)
 {
-	int i;
+	NMSettingConnectionPrivate *priv;
 
-	if (!uuid || !strlen (uuid))
-		return FALSE;
+	g_return_val_if_fail (NM_IS_SETTING_CONNECTION (setting), NULL);
+
+	priv = NM_SETTING_CONNECTION_GET_PRIVATE (setting);
+	g_return_val_if_fail (idx <= g_slist_length (priv->secondaries), NULL);
+
+	return (const char *) g_slist_nth_data (priv->secondaries, idx);
+}
+
+/**
+ * nm_setting_connection_add_secondary:
+ * @setting: the #NMSettingConnection
+ * @sec_uuid: the secondary connection UUID to add
+ *
+ * Adds a new secondary connetion UUID to the setting.
+ *
+ * Returns: %TRUE if the secondary connection UUID was added; %FALSE if the UUID
+ * was already present
+ **/
+gboolean
+nm_setting_connection_add_secondary (NMSettingConnection *setting,
+                                     const char *sec_uuid)
+{
+	NMSettingConnectionPrivate *priv;
+	GSList *iter;
 
-	for (i = 0; i < strlen (uuid); i++) {
-		if (!isxdigit (uuid[i]) && (uuid[i] != '-'))
+	g_return_val_if_fail (NM_IS_SETTING_CONNECTION (setting), FALSE);
+	g_return_val_if_fail (sec_uuid != NULL, FALSE);
+	g_return_val_if_fail (sec_uuid[0] != '\0', FALSE);
+
+	priv = NM_SETTING_CONNECTION_GET_PRIVATE (setting);
+	for (iter = priv->secondaries; iter; iter = g_slist_next (iter)) {
+		if (!strcmp (sec_uuid, (char *) iter->data))
 			return FALSE;
 	}
 
+	priv->secondaries = g_slist_append (priv->secondaries, g_strdup (sec_uuid));
 	return TRUE;
 }
 
+/**
+ * nm_setting_connection_remove_secondary:
+ * @setting: the #NMSettingConnection
+ * @idx: index number of the secondary connection UUID
+ *
+ * Removes the secondary coonnection UUID at index @idx.
+ **/
+void
+nm_setting_connection_remove_secondary (NMSettingConnection *setting, guint32 idx)
+{
+	NMSettingConnectionPrivate *priv;
+	GSList *elt;
+
+	g_return_if_fail (NM_IS_SETTING_CONNECTION (setting));
+
+	priv = NM_SETTING_CONNECTION_GET_PRIVATE (setting);
+	elt = g_slist_nth (priv->secondaries, idx);
+	g_return_if_fail (elt != NULL);
+
+	g_free (elt->data);
+	priv->secondaries = g_slist_delete_link (priv->secondaries, elt);
+}
+
+static gint
+find_setting_by_name (gconstpointer a, gconstpointer b)
+{
+	NMSetting *setting = NM_SETTING (a);
+	const char *str = (const char *) b;
+
+	return strcmp (nm_setting_get_name (setting), str);
+}
+
 static gboolean
 verify (NMSetting *setting, GSList *all_settings, GError **error)
 {
@@ -579,7 +658,7 @@ verify (NMSetting *setting, GSList *all_settings, GError **error)
 		             NM_SETTING_CONNECTION_ERROR_MISSING_PROPERTY,
 		             NM_SETTING_CONNECTION_UUID);
 		return FALSE;
-	} else if (!validate_uuid (priv->uuid)) {
+	} else if (!nm_utils_is_uuid (priv->uuid)) {
 		g_set_error (error,
 		             NM_SETTING_CONNECTION_ERROR,
 		             NM_SETTING_CONNECTION_ERROR_INVALID_PROPERTY,
@@ -750,6 +829,10 @@ set_property (GObject *object, guint prop_id,
 		g_free (priv->slave_type);
 		priv->slave_type = g_value_dup_string (value);
 		break;
+	case PROP_SECONDARIES:
+		nm_utils_slist_free (priv->secondaries, g_free);
+		priv->secondaries = g_value_dup_boxed (value);
+		break;
 	default:
 		G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
 		break;
@@ -804,6 +887,9 @@ get_property (GObject *object, guint prop_id,
 	case PROP_SLAVE_TYPE:
 		g_value_set_string (value, nm_setting_connection_get_slave_type (setting));
 		break;
+	case PROP_SECONDARIES:
+		g_value_set_boxed (value, priv->secondaries);
+		break;
 	default:
 		G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
 		break;
@@ -1042,4 +1128,19 @@ nm_setting_connection_class_init (NMSettingConnectionClass *setting_class)
 		                      "connection is not a slave.",
 		                      NULL,
 		                      G_PARAM_READWRITE | NM_SETTING_PARAM_SERIALIZE | NM_SETTING_PARAM_FUZZY_IGNORE));
+
+	/**
+	 * NMSettingConnection:secondaries:
+	 *
+	 * List of connection UUIDs that should be activated when the base connection
+	 * itself is activated.
+	 **/
+	g_object_class_install_property
+		(object_class, PROP_SECONDARIES,
+		 _nm_param_spec_specialized (NM_SETTING_CONNECTION_SECONDARIES,
+		                             "Secondaries",
+		                             "List of connection UUIDs that should be activated "
+		                             "when the base connection itself is activated.",
+		                             DBUS_TYPE_G_LIST_OF_STRING,
+		                             G_PARAM_READWRITE | NM_SETTING_PARAM_SERIALIZE | NM_SETTING_PARAM_FUZZY_IGNORE));
 }
diff --git a/libnm-util/nm-setting-connection.h b/libnm-util/nm-setting-connection.h
index 44b0f845..73c598cb 100644
--- a/libnm-util/nm-setting-connection.h
+++ b/libnm-util/nm-setting-connection.h
@@ -19,7 +19,7 @@
  * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
  * Boston, MA 02110-1301 USA.
  *
- * (C) Copyright 2007 - 2010 Red Hat, Inc.
+ * (C) Copyright 2007 - 2012 Red Hat, Inc.
  * (C) Copyright 2007 - 2008 Novell, Inc.
  */
 
@@ -78,6 +78,7 @@ GQuark nm_setting_connection_error_quark (void);
 #define NM_SETTING_CONNECTION_ZONE        "zone"
 #define NM_SETTING_CONNECTION_MASTER      "master"
 #define NM_SETTING_CONNECTION_SLAVE_TYPE  "slave-type"
+#define NM_SETTING_CONNECTION_SECONDARIES "secondaries"
 
 /**
  * NMSettingConnection:
@@ -127,6 +128,10 @@ const char *nm_setting_connection_get_master           (NMSettingConnection *set
 gboolean    nm_setting_connection_is_slave_type        (NMSettingConnection *setting,
 							const char *type);
 const char *nm_setting_connection_get_slave_type       (NMSettingConnection *setting);
+guint32     nm_setting_connection_get_num_secondaries  (NMSettingConnection *setting);
+const char *nm_setting_connection_get_secondary        (NMSettingConnection *setting, guint32 idx);
+gboolean    nm_setting_connection_add_secondary        (NMSettingConnection *setting, const char *sec_uuid);
+void        nm_setting_connection_remove_secondary     (NMSettingConnection *setting, guint32 idx);
 
 G_END_DECLS
 
diff --git a/libnm-util/nm-setting-gsm.c b/libnm-util/nm-setting-gsm.c
index 2264d008..ea83c73c 100644
--- a/libnm-util/nm-setting-gsm.c
+++ b/libnm-util/nm-setting-gsm.c
@@ -24,7 +24,6 @@
  */
 
 #include 
-#include 
 #include "nm-setting-gsm.h"
 #include "nm-utils.h"
 #include "nm-setting-private.h"
@@ -57,7 +56,12 @@ nm_setting_gsm_error_quark (void)
 }
 
 
-G_DEFINE_TYPE (NMSettingGsm, nm_setting_gsm, NM_TYPE_SETTING)
+G_DEFINE_TYPE_WITH_CODE (NMSettingGsm, nm_setting_gsm, NM_TYPE_SETTING,
+                         _nm_register_setting (NM_SETTING_GSM_SETTING_NAME,
+                                               g_define_type_id,
+                                               1,
+                                               NM_SETTING_GSM_ERROR))
+NM_SETTING_REGISTER_TYPE (NM_TYPE_SETTING_GSM)
 
 #define NM_SETTING_GSM_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), NM_TYPE_SETTING_GSM, NMSettingGsmPrivate))
 
@@ -306,7 +310,7 @@ verify (NMSetting *setting, GSList *all_settings, GError **error)
 		 * like space ( ) and such.
 		 */
 		for (i = 0; i < apn_len; i++) {
-			if (   !isalnum (priv->apn[i])
+			if (   !g_ascii_isalnum (priv->apn[i])
 			    && (priv->apn[i] != '.')
 			    && (priv->apn[i] != '_')
 			    && (priv->apn[i] != '-')) {
@@ -349,7 +353,7 @@ verify (NMSetting *setting, GSList *all_settings, GError **error)
 		}
 
 		for (i = 0; i < nid_len; i++) {
-			if (!isdigit (priv->network_id[i])) {
+			if (!g_ascii_isdigit (priv->network_id[i])) {
 				g_set_error (error,
 				             NM_SETTING_GSM_ERROR,
 				             NM_SETTING_GSM_ERROR_INVALID_PROPERTY,
@@ -658,10 +662,10 @@ nm_setting_gsm_class_init (NMSettingGsmClass *setting_class)
 					    "Network preference to force the device to only use "
 					    "specific network technologies.  The permitted values "
 					    "are: -1: any, 0: 3G only, 1: GPRS/EDGE only, "
-					    "2: prefer 3G, and 3: prefer 2G.  Note that not all "
-					    "devices allow network preference control.",
+					    "2: prefer 3G, 3: prefer 2G, 4: prefer 4G/LTE, 5: 4G/LTE only. "
+					    "Note that not all devices allow network preference control.",
 					    NM_SETTING_GSM_NETWORK_TYPE_ANY,
-					    NM_SETTING_GSM_NETWORK_TYPE_PREFER_GPRS_EDGE,
+					    NM_SETTING_GSM_NETWORK_TYPE_4G,
 					    NM_SETTING_GSM_NETWORK_TYPE_ANY,
 					    G_PARAM_READWRITE | G_PARAM_CONSTRUCT | NM_SETTING_PARAM_SERIALIZE));
 
diff --git a/libnm-util/nm-setting-gsm.h b/libnm-util/nm-setting-gsm.h
index 12114e32..2303f762 100644
--- a/libnm-util/nm-setting-gsm.h
+++ b/libnm-util/nm-setting-gsm.h
@@ -81,6 +81,10 @@ GQuark nm_setting_gsm_error_quark (void);
  * preferred but 2G-type technologies may be used as a fallback
  * @NM_SETTING_GSM_NETWORK_TYPE_PREFER_GPRS_EDGE: 2G-type technologies are
  * preferred but 3G-type technologies may be used as a fallback
+ * @NM_SETTING_GSM_NETWORK_TYPE_PREFER_4G: 4G/LTE-type technologies are
+ * preferred but 3G/2/-type technologies may be used as a fallback
+ * @NM_SETTING_GSM_NETWORK_TYPE_4G: only 4G/LTE type
+ * technologies may be used
  *
  * #NMSettingGsmNetworkType values indicate the allowed access technologies
  * the device may use when connecting to this network.
@@ -90,7 +94,9 @@ typedef enum {
 	NM_SETTING_GSM_NETWORK_TYPE_UMTS_HSPA = 0,
 	NM_SETTING_GSM_NETWORK_TYPE_GPRS_EDGE = 1,
 	NM_SETTING_GSM_NETWORK_TYPE_PREFER_UMTS_HSPA = 2,
-	NM_SETTING_GSM_NETWORK_TYPE_PREFER_GPRS_EDGE = 3
+	NM_SETTING_GSM_NETWORK_TYPE_PREFER_GPRS_EDGE = 3,
+	NM_SETTING_GSM_NETWORK_TYPE_PREFER_4G = 4,
+	NM_SETTING_GSM_NETWORK_TYPE_4G = 5
 } NMSettingGsmNetworkType;
 
 /**
diff --git a/libnm-util/nm-setting-infiniband.c b/libnm-util/nm-setting-infiniband.c
index dbef5b8a..ee40aa0e 100644
--- a/libnm-util/nm-setting-infiniband.c
+++ b/libnm-util/nm-setting-infiniband.c
@@ -25,6 +25,7 @@
 #include "nm-setting-infiniband.h"
 #include "nm-param-spec-specialized.h"
 #include "nm-utils-private.h"
+#include "nm-setting-private.h"
 
 /**
  * SECTION:nm-setting-infiniband
@@ -52,7 +53,12 @@ nm_setting_infiniband_error_quark (void)
 	return quark;
 }
 
-G_DEFINE_TYPE (NMSettingInfiniband, nm_setting_infiniband, NM_TYPE_SETTING)
+G_DEFINE_TYPE_WITH_CODE (NMSettingInfiniband, nm_setting_infiniband, NM_TYPE_SETTING,
+                         _nm_register_setting (NM_SETTING_INFINIBAND_SETTING_NAME,
+                                               g_define_type_id,
+                                               1,
+                                               NM_SETTING_INFINIBAND_ERROR))
+NM_SETTING_REGISTER_TYPE (NM_TYPE_SETTING_INFINIBAND)
 
 #define NM_SETTING_INFINIBAND_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), NM_TYPE_SETTING_INFINIBAND, NMSettingInfinibandPrivate))
 
diff --git a/libnm-util/nm-setting-ip4-config.c b/libnm-util/nm-setting-ip4-config.c
index 5dc9199b..c6becefb 100644
--- a/libnm-util/nm-setting-ip4-config.c
+++ b/libnm-util/nm-setting-ip4-config.c
@@ -31,7 +31,7 @@
 #include "nm-utils.h"
 #include "nm-dbus-glib-types.h"
 #include "nm-glib-compat.h"
-
+#include "nm-setting-private.h"
 
 
 /**
@@ -63,7 +63,12 @@ nm_setting_ip4_config_error_quark (void)
 G_DEFINE_BOXED_TYPE (NMIP4Address, nm_ip4_address, nm_ip4_address_dup, nm_ip4_address_unref)
 G_DEFINE_BOXED_TYPE (NMIP4Route, nm_ip4_route, nm_ip4_route_dup, nm_ip4_route_unref)
 
-G_DEFINE_TYPE (NMSettingIP4Config, nm_setting_ip4_config, NM_TYPE_SETTING)
+G_DEFINE_TYPE_WITH_CODE (NMSettingIP4Config, nm_setting_ip4_config, NM_TYPE_SETTING,
+                         _nm_register_setting (NM_SETTING_IP4_CONFIG_SETTING_NAME,
+                                               g_define_type_id,
+                                               4,
+                                               NM_SETTING_IP4_CONFIG_ERROR))
+NM_SETTING_REGISTER_TYPE (NM_TYPE_SETTING_IP4_CONFIG)
 
 #define NM_SETTING_IP4_CONFIG_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), NM_TYPE_SETTING_IP4_CONFIG, NMSettingIP4ConfigPrivate))
 
@@ -996,7 +1001,7 @@ nm_setting_ip4_config_class_init (NMSettingIP4ConfigClass *setting_class)
 	 * List of DNS servers (network byte order).  For the 'auto' method, these
 	 * DNS servers are appended to those (if any) returned by automatic
 	 * configuration.  DNS servers cannot be used with the 'shared', 'link-local',
-	 * or 'disabled' methods as there is no usptream network.  In all other
+	 * or 'disabled' methods as there is no upstream network.  In all other
 	 * methods, these DNS servers are used as the only DNS servers for this
 	 * connection.
 	 **/
@@ -1009,7 +1014,7 @@ nm_setting_ip4_config_class_init (NMSettingIP4ConfigClass *setting_class)
 							   "appended to those (if any) returned by automatic "
 							   "configuration.  DNS servers cannot be used with "
 							   "the 'shared', 'link-local', or 'disabled' "
-							   "methods as there is no usptream network.  In all "
+							   "methods as there is no upstream network.  In all "
 							   "other methods, these DNS servers are used as the "
 							   "only DNS servers for this connection.",
 							   DBUS_TYPE_G_UINT_ARRAY,
@@ -1143,7 +1148,7 @@ nm_setting_ip4_config_class_init (NMSettingIP4ConfigClass *setting_class)
 	 * NMSettingIP4Config:dhcp-client-id:
 	 *
 	 * A string sent to the DHCP server to identify the local machine which the
-	 * DHCP server may use to cusomize the DHCP lease and options.
+	 * DHCP server may use to customize the DHCP lease and options.
 	 **/
 	g_object_class_install_property
 		(object_class, PROP_DHCP_CLIENT_ID,
@@ -1151,7 +1156,7 @@ nm_setting_ip4_config_class_init (NMSettingIP4ConfigClass *setting_class)
 						   "DHCP Client ID",
 						   "A string sent to the DHCP server to identify the "
 						   "local machine which the DHCP server may use to "
-						   "cusomize the DHCP lease and options.",
+						   "customize the DHCP lease and options.",
 						   NULL,
 						   G_PARAM_READWRITE | NM_SETTING_PARAM_SERIALIZE));
 
diff --git a/libnm-util/nm-setting-ip6-config.c b/libnm-util/nm-setting-ip6-config.c
index c6a84f8e..00e27aea 100644
--- a/libnm-util/nm-setting-ip6-config.c
+++ b/libnm-util/nm-setting-ip6-config.c
@@ -30,6 +30,7 @@
 #include "nm-utils.h"
 #include "nm-dbus-glib-types.h"
 #include "nm-glib-compat.h"
+#include "nm-setting-private.h"
 
 /**
  * SECTION:nm-setting-ip6-config
@@ -60,12 +61,18 @@ nm_setting_ip6_config_error_quark (void)
 G_DEFINE_BOXED_TYPE (NMIP6Address, nm_ip6_address, nm_ip6_address_dup, nm_ip6_address_unref)
 G_DEFINE_BOXED_TYPE (NMIP6Route, nm_ip6_route, nm_ip6_route_dup, nm_ip6_route_unref)
 
-G_DEFINE_TYPE (NMSettingIP6Config, nm_setting_ip6_config, NM_TYPE_SETTING)
+G_DEFINE_TYPE_WITH_CODE (NMSettingIP6Config, nm_setting_ip6_config, NM_TYPE_SETTING,
+                         _nm_register_setting (NM_SETTING_IP6_CONFIG_SETTING_NAME,
+                                               g_define_type_id,
+                                               4,
+                                               NM_SETTING_IP6_CONFIG_ERROR))
+NM_SETTING_REGISTER_TYPE (NM_TYPE_SETTING_IP6_CONFIG)
 
 #define NM_SETTING_IP6_CONFIG_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), NM_TYPE_SETTING_IP6_CONFIG, NMSettingIP6ConfigPrivate))
 
 typedef struct {
 	char *method;
+	char *dhcp_hostname;
 	GSList *dns;        /* array of struct in6_addr */
 	GSList *dns_search; /* list of strings */
 	GSList *addresses;  /* array of NMIP6Address */
@@ -81,6 +88,7 @@ typedef struct {
 enum {
 	PROP_0,
 	PROP_METHOD,
+	PROP_DHCP_HOSTNAME,
 	PROP_DNS,
 	PROP_DNS_SEARCH,
 	PROP_ADDRESSES,
@@ -121,6 +129,23 @@ nm_setting_ip6_config_get_method (NMSettingIP6Config *setting)
 	return NM_SETTING_IP6_CONFIG_GET_PRIVATE (setting)->method;
 }
 
+/**
+ * nm_setting_ip6_config_get_dhcp_hostname:
+ * @setting: the #NMSettingIP6Config
+ *
+ * Returns the value contained in the #NMSettingIP6Config:dhcp-hostname
+ * property.
+ *
+ * Returns: the configured hostname to send to the DHCP server
+ **/
+const char *
+nm_setting_ip6_config_get_dhcp_hostname (NMSettingIP6Config *setting)
+{
+	g_return_val_if_fail (NM_IS_SETTING_IP6_CONFIG (setting), NULL);
+
+	return NM_SETTING_IP6_CONFIG_GET_PRIVATE (setting)->dhcp_hostname;
+}
+
 /**
  * nm_setting_ip6_config_get_num_dns:
  * @setting: the #NMSettingIP6Config
@@ -693,6 +718,14 @@ verify (NMSetting *setting, GSList *all_settings, GError **error)
 		return FALSE;
 	}
 
+	if (priv->dhcp_hostname && !strlen (priv->dhcp_hostname)) {
+		g_set_error (error,
+		             NM_SETTING_IP6_CONFIG_ERROR,
+		             NM_SETTING_IP6_CONFIG_ERROR_INVALID_PROPERTY,
+		             NM_SETTING_IP6_CONFIG_DHCP_HOSTNAME);
+		return FALSE;
+	}
+
 	return TRUE;
 }
 
@@ -751,6 +784,10 @@ set_property (GObject *object, guint prop_id,
 	case PROP_IGNORE_AUTO_DNS:
 		priv->ignore_auto_dns = g_value_get_boolean (value);
 		break;
+	case PROP_DHCP_HOSTNAME:
+		g_free (priv->dhcp_hostname);
+		priv->dhcp_hostname = g_value_dup_string (value);
+		break;
 	case PROP_NEVER_DEFAULT:
 		priv->never_default = g_value_get_boolean (value);
 		break;
@@ -794,6 +831,9 @@ get_property (GObject *object, guint prop_id,
 	case PROP_IGNORE_AUTO_DNS:
 		g_value_set_boolean (value, priv->ignore_auto_dns);
 		break;
+	case PROP_DHCP_HOSTNAME:
+		g_value_set_string (value, priv->dhcp_hostname);
+		break;
 	case PROP_NEVER_DEFAULT:
 		g_value_set_boolean (value, priv->never_default);
 		break;
@@ -859,6 +899,20 @@ nm_setting_ip6_config_class_init (NMSettingIP6ConfigClass *setting_class)
 						      NULL,
 						      G_PARAM_READWRITE | NM_SETTING_PARAM_SERIALIZE));
 
+	/**
+	 * NMSettingIP6Config:dhcp-hostname:
+	 *
+	 * The specified name will be sent to the DHCP server when acquiring a lease.
+	 **/
+	g_object_class_install_property
+		(object_class, PROP_DHCP_HOSTNAME,
+		 g_param_spec_string (NM_SETTING_IP6_CONFIG_DHCP_HOSTNAME,
+		                      "DHCP Hostname",
+		                      "The specified name will be sent to the DHCP server "
+		                      "when acquiring a lease.",
+		                      NULL,
+		                      G_PARAM_READWRITE | NM_SETTING_PARAM_SERIALIZE));
+
 	/**
 	 * NMSettingIP6Config:dns:
 	 *
diff --git a/libnm-util/nm-setting-ip6-config.h b/libnm-util/nm-setting-ip6-config.h
index 05c16668..29650486 100644
--- a/libnm-util/nm-setting-ip6-config.h
+++ b/libnm-util/nm-setting-ip6-config.h
@@ -69,6 +69,8 @@ GQuark nm_setting_ip6_config_error_quark (void);
 #define NM_SETTING_IP6_CONFIG_NEVER_DEFAULT      "never-default"
 #define NM_SETTING_IP6_CONFIG_MAY_FAIL           "may-fail"
 #define NM_SETTING_IP6_CONFIG_IP6_PRIVACY        "ip6-privacy"
+#define NM_SETTING_IP6_CONFIG_DHCP_HOSTNAME      "dhcp-hostname"
+
 
 /**
  * NM_SETTING_IP6_CONFIG_METHOD_IGNORE:
@@ -239,6 +241,7 @@ void                   nm_setting_ip6_config_clear_routes           (NMSettingIP
 gboolean               nm_setting_ip6_config_get_ignore_auto_routes (NMSettingIP6Config *setting);
 
 gboolean               nm_setting_ip6_config_get_ignore_auto_dns    (NMSettingIP6Config *setting);
+const char *           nm_setting_ip6_config_get_dhcp_hostname      (NMSettingIP6Config *setting);
 gboolean               nm_setting_ip6_config_get_never_default      (NMSettingIP6Config *setting);
 gboolean               nm_setting_ip6_config_get_may_fail           (NMSettingIP6Config *setting);
 NMSettingIP6ConfigPrivacy nm_setting_ip6_config_get_ip6_privacy (NMSettingIP6Config *setting);
diff --git a/libnm-util/nm-setting-olpc-mesh.c b/libnm-util/nm-setting-olpc-mesh.c
index 96770e4f..bf87aa57 100644
--- a/libnm-util/nm-setting-olpc-mesh.c
+++ b/libnm-util/nm-setting-olpc-mesh.c
@@ -35,6 +35,7 @@
 #include "nm-utils.h"
 #include "nm-dbus-glib-types.h"
 #include "nm-utils-private.h"
+#include "nm-setting-private.h"
 
 GQuark
 nm_setting_olpc_mesh_error_quark (void)
@@ -48,7 +49,12 @@ nm_setting_olpc_mesh_error_quark (void)
 
 static void nm_setting_olpc_mesh_init (NMSettingOlpcMesh *setting);
 
-G_DEFINE_TYPE (NMSettingOlpcMesh, nm_setting_olpc_mesh, NM_TYPE_SETTING)
+G_DEFINE_TYPE_WITH_CODE (NMSettingOlpcMesh, nm_setting_olpc_mesh, NM_TYPE_SETTING,
+                         _nm_register_setting (NM_SETTING_OLPC_MESH_SETTING_NAME,
+                                               g_define_type_id,
+                                               1,
+                                               NM_SETTING_OLPC_MESH_ERROR))
+NM_SETTING_REGISTER_TYPE (NM_TYPE_SETTING_OLPC_MESH)
 
 #define NM_SETTING_OLPC_MESH_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), NM_TYPE_SETTING_OLPC_MESH, NMSettingOlpcMeshPrivate))
 
diff --git a/libnm-util/nm-setting-ppp.c b/libnm-util/nm-setting-ppp.c
index ee9b5f59..09cf3de6 100644
--- a/libnm-util/nm-setting-ppp.c
+++ b/libnm-util/nm-setting-ppp.c
@@ -24,6 +24,7 @@
  */
 
 #include "nm-setting-ppp.h"
+#include "nm-setting-private.h"
 
 /**
  * SECTION:nm-setting-ppp
@@ -54,7 +55,12 @@ nm_setting_ppp_error_quark (void)
 }
 
 
-G_DEFINE_TYPE (NMSettingPPP, nm_setting_ppp, NM_TYPE_SETTING)
+G_DEFINE_TYPE_WITH_CODE (NMSettingPPP, nm_setting_ppp, NM_TYPE_SETTING,
+                         _nm_register_setting (NM_SETTING_PPP_SETTING_NAME,
+                                               g_define_type_id,
+                                               3,
+                                               NM_SETTING_PPP_ERROR))
+NM_SETTING_REGISTER_TYPE (NM_TYPE_SETTING_PPP)
 
 #define NM_SETTING_PPP_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), NM_TYPE_SETTING_PPP, NMSettingPPPPrivate))
 
diff --git a/libnm-util/nm-setting-pppoe.c b/libnm-util/nm-setting-pppoe.c
index 62c42f01..2785dfa9 100644
--- a/libnm-util/nm-setting-pppoe.c
+++ b/libnm-util/nm-setting-pppoe.c
@@ -56,7 +56,12 @@ nm_setting_pppoe_error_quark (void)
 }
 
 
-G_DEFINE_TYPE (NMSettingPPPOE, nm_setting_pppoe, NM_TYPE_SETTING)
+G_DEFINE_TYPE_WITH_CODE (NMSettingPPPOE, nm_setting_pppoe, NM_TYPE_SETTING,
+                         _nm_register_setting (NM_SETTING_PPPOE_SETTING_NAME,
+                                               g_define_type_id,
+                                               3,
+                                               NM_SETTING_PPPOE_ERROR))
+NM_SETTING_REGISTER_TYPE (NM_TYPE_SETTING_PPPOE)
 
 #define NM_SETTING_PPPOE_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), NM_TYPE_SETTING_PPPOE, NMSettingPPPOEPrivate))
 
diff --git a/libnm-util/nm-setting-private.h b/libnm-util/nm-setting-private.h
index 5c4e0a5e..1460841c 100644
--- a/libnm-util/nm-setting-private.h
+++ b/libnm-util/nm-setting-private.h
@@ -21,11 +21,23 @@
 #ifndef NM_SETTING_PRIVATE_H
 #define NM_SETTING_PRIVATE_H
 
+#include "nm-glib-compat.h"
+
 #define NM_SETTING_SECRET_FLAGS_ALL \
 	(NM_SETTING_SECRET_FLAG_NONE | \
 	 NM_SETTING_SECRET_FLAG_AGENT_OWNED | \
 	 NM_SETTING_SECRET_FLAG_NOT_SAVED | \
 	 NM_SETTING_SECRET_FLAG_NOT_REQUIRED)
 
+void _nm_register_setting (const char *name,
+                           const GType type,
+                           const guint32 priority,
+                           const GQuark error_quark);
+
+/* Ensure the setting's GType is registered at library load time */
+#define NM_SETTING_REGISTER_TYPE(x) \
+static void __attribute__((constructor)) register_setting (void) \
+{ g_type_init (); g_type_ensure (x); }
+
 #endif  /* NM_SETTING_PRIVATE_H */
 
diff --git a/libnm-util/nm-setting-serial.c b/libnm-util/nm-setting-serial.c
index 44f14986..203f5748 100644
--- a/libnm-util/nm-setting-serial.c
+++ b/libnm-util/nm-setting-serial.c
@@ -27,6 +27,7 @@
 
 #include "nm-setting-serial.h"
 #include "nm-glib-compat.h"
+#include "nm-setting-private.h"
 
 /**
  * SECTION:nm-setting-serial
@@ -57,7 +58,12 @@ nm_setting_serial_error_quark (void)
 }
 
 
-G_DEFINE_TYPE (NMSettingSerial, nm_setting_serial, NM_TYPE_SETTING)
+G_DEFINE_TYPE_WITH_CODE (NMSettingSerial, nm_setting_serial, NM_TYPE_SETTING,
+                         _nm_register_setting (NM_SETTING_SERIAL_SETTING_NAME,
+                                               g_define_type_id,
+                                               2,
+                                               NM_SETTING_SERIAL_ERROR))
+NM_SETTING_REGISTER_TYPE (NM_TYPE_SETTING_SERIAL)
 
 #define NM_SETTING_SERIAL_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), NM_TYPE_SETTING_SERIAL, NMSettingSerialPrivate))
 
diff --git a/libnm-util/nm-setting-vlan.c b/libnm-util/nm-setting-vlan.c
index f69e0d85..df7f0702 100644
--- a/libnm-util/nm-setting-vlan.c
+++ b/libnm-util/nm-setting-vlan.c
@@ -21,12 +21,16 @@
  * (C) Copyright 2011 - 2012 Red Hat, Inc.
  */
 
+#include 
+#include 
 #include 
+
 #include "nm-setting-vlan.h"
 #include "nm-param-spec-specialized.h"
 #include "nm-utils.h"
 #include "nm-dbus-glib-types.h"
 #include "nm-setting-connection.h"
+#include "nm-setting-private.h"
 
 /**
  * SECTION:nm-setting-vlan
@@ -54,7 +58,12 @@ nm_setting_vlan_error_quark (void)
 	return quark;
 }
 
-G_DEFINE_TYPE (NMSettingVlan, nm_setting_vlan, NM_TYPE_SETTING)
+G_DEFINE_TYPE_WITH_CODE (NMSettingVlan, nm_setting_vlan, NM_TYPE_SETTING,
+                         _nm_register_setting (NM_SETTING_VLAN_SETTING_NAME,
+                                               g_define_type_id,
+                                               1,
+                                               NM_SETTING_VLAN_ERROR))
+NM_SETTING_REGISTER_TYPE (NM_TYPE_SETTING_VLAN)
 
 #define NM_SETTING_VLAN_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), NM_TYPE_SETTING_VLAN, NMSettingVlanPrivate))
 
@@ -436,29 +445,68 @@ static gboolean
 verify (NMSetting *setting, GSList *all_settings, GError **error)
 {
 	NMSettingVlanPrivate *priv = NM_SETTING_VLAN_GET_PRIVATE (setting);
-
-	if (priv->iface_name && !priv->iface_name[0]) {
-		g_set_error (error,
-		             NM_SETTING_VLAN_ERROR,
-		             NM_SETTING_VLAN_ERROR_INVALID_PROPERTY,
-		             NM_SETTING_VLAN_INTERFACE_NAME);
-		return FALSE;
+	NMSettingConnection *s_con = NULL;
+	NMSettingWired *s_wired = NULL;
+	GSList *iter;
+
+	for (iter = all_settings; iter; iter = iter->next) {
+		if (NM_IS_SETTING_CONNECTION (iter->data))
+			s_con = iter->data;
+		else if (NM_IS_SETTING_WIRED (iter->data))
+			s_wired = iter->data;
 	}
 
-	if (priv->parent && !priv->parent[0]) {
+	/* If iface_name is specified, it must be a valid interface name. We
+	 * don't check that it matches parent and/or id, because we allowing
+	 * renaming vlans to arbitrary names.
+	 */
+	if (priv->iface_name && !nm_utils_iface_valid_name (priv->iface_name)) {
 		g_set_error (error,
 		             NM_SETTING_VLAN_ERROR,
 		             NM_SETTING_VLAN_ERROR_INVALID_PROPERTY,
-		             NM_SETTING_VLAN_PARENT);
+		             NM_SETTING_VLAN_INTERFACE_NAME);
 		return FALSE;
 	}
 
-	if (priv->id > 4095) {
-		g_set_error (error,
-		             NM_SETTING_VLAN_ERROR,
-		             NM_SETTING_VLAN_ERROR_INVALID_PROPERTY,
-		             NM_SETTING_VLAN_ID);
-		return FALSE;
+	if (priv->parent) {
+		if (nm_utils_is_uuid (priv->parent)) {
+			/* If we have an NMSettingConnection:master with slave-type="vlan",
+			 * then it must be the same UUID.
+			 */
+			if (s_con) {
+				const char *master = NULL, *slave_type = NULL;
+
+				slave_type = nm_setting_connection_get_slave_type (s_con);
+				if (!g_strcmp0 (slave_type, NM_SETTING_VLAN_SETTING_NAME))
+					master = nm_setting_connection_get_master (s_con);
+
+				if (master && g_strcmp0 (priv->parent, master) != 0) {
+					g_set_error (error,
+					             NM_SETTING_VLAN_ERROR,
+					             NM_SETTING_VLAN_ERROR_INVALID_PARENT,
+					             NM_SETTING_CONNECTION_MASTER);
+					return FALSE;
+				}
+			}
+		} else if (!nm_utils_iface_valid_name (priv->parent)) {
+			/* parent must be either a UUID or an interface name */
+			g_set_error (error,
+			             NM_SETTING_VLAN_ERROR,
+			             NM_SETTING_VLAN_ERROR_INVALID_PROPERTY,
+			             NM_SETTING_VLAN_PARENT);
+			return FALSE;
+		} 
+	} else {
+		/* If parent is NULL, the parent must be specified via
+		 * NMSettingWired:mac-address.
+		 */
+		if (!s_wired || !nm_setting_wired_get_mac_address (s_wired)) {
+			g_set_error (error,
+			             NM_SETTING_VLAN_ERROR,
+			             NM_SETTING_VLAN_ERROR_MISSING_PROPERTY,
+			             NM_SETTING_VLAN_PARENT);
+			return FALSE;
+		}
 	}
 
 	if (priv->flags & ~(NM_VLAN_FLAG_REORDER_HEADERS |
diff --git a/libnm-util/nm-setting-vlan.h b/libnm-util/nm-setting-vlan.h
index 9d2d728b..019c6da0 100644
--- a/libnm-util/nm-setting-vlan.h
+++ b/libnm-util/nm-setting-vlan.h
@@ -43,12 +43,15 @@ G_BEGIN_DECLS
  * @NM_SETTING_VLAN_ERROR_UNKNOWN: unknown or unclassified error
  * @NM_SETTING_VLAN_ERROR_INVALID_PROPERTY: the property was invalid
  * @NM_SETTING_VLAN_ERROR_MISSING_PROPERTY: the property was missing and is
- * required
+ *   required
+ * @NM_SETTING_VLAN_ERROR_INVALID_PARENT: the VLAN parent was specified
+ *   inconsistently
  */
 typedef enum {
 	NM_SETTING_VLAN_ERROR_UNKNOWN = 0,      /*< nick=Unknown >*/
 	NM_SETTING_VLAN_ERROR_INVALID_PROPERTY, /*< nick=InvalidProperty >*/
-	NM_SETTING_VLAN_ERROR_MISSING_PROPERTY  /*< nick=MissingProperty >*/
+	NM_SETTING_VLAN_ERROR_MISSING_PROPERTY, /*< nick=MissingProperty >*/
+	NM_SETTING_VLAN_ERROR_INVALID_PARENT    /*< nick=InvalidParent >*/
 } NMSettingVlanError;
 
 #define NM_SETTING_VLAN_ERROR nm_setting_vlan_error_quark ()
diff --git a/libnm-util/nm-setting-vpn.c b/libnm-util/nm-setting-vpn.c
index d1fc8b76..0acd9a52 100644
--- a/libnm-util/nm-setting-vpn.c
+++ b/libnm-util/nm-setting-vpn.c
@@ -64,7 +64,12 @@ nm_setting_vpn_error_quark (void)
 }
 
 
-G_DEFINE_TYPE (NMSettingVPN, nm_setting_vpn, NM_TYPE_SETTING)
+G_DEFINE_TYPE_WITH_CODE (NMSettingVPN, nm_setting_vpn, NM_TYPE_SETTING,
+                         _nm_register_setting (NM_SETTING_VPN_SETTING_NAME,
+                                               g_define_type_id,
+                                               1,
+                                               NM_SETTING_VPN_ERROR))
+NM_SETTING_REGISTER_TYPE (NM_TYPE_SETTING_VPN)
 
 #define NM_SETTING_VPN_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), NM_TYPE_SETTING_VPN, NMSettingVPNPrivate))
 
diff --git a/libnm-util/nm-setting-wimax.c b/libnm-util/nm-setting-wimax.c
index a099cad2..b4a0d418 100644
--- a/libnm-util/nm-setting-wimax.c
+++ b/libnm-util/nm-setting-wimax.c
@@ -26,6 +26,7 @@
 
 #include "nm-setting-wimax.h"
 #include "nm-param-spec-specialized.h"
+#include "nm-setting-private.h"
 
 /**
  * SECTION:nm-setting-wimax
@@ -54,7 +55,12 @@ nm_setting_wimax_error_quark (void)
 }
 
 
-G_DEFINE_TYPE (NMSettingWimax, nm_setting_wimax, NM_TYPE_SETTING)
+G_DEFINE_TYPE_WITH_CODE (NMSettingWimax, nm_setting_wimax, NM_TYPE_SETTING,
+                         _nm_register_setting (NM_SETTING_WIMAX_SETTING_NAME,
+                                               g_define_type_id,
+                                               1,
+                                               NM_SETTING_WIMAX_ERROR))
+NM_SETTING_REGISTER_TYPE (NM_TYPE_SETTING_WIMAX)
 
 #define NM_SETTING_WIMAX_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), NM_TYPE_SETTING_WIMAX, NMSettingWimaxPrivate))
 
diff --git a/libnm-util/nm-setting-wired.c b/libnm-util/nm-setting-wired.c
index fb21711d..f44d6df6 100644
--- a/libnm-util/nm-setting-wired.c
+++ b/libnm-util/nm-setting-wired.c
@@ -24,7 +24,6 @@
  */
 
 #include 
-#include 
 #include 
 #include 
 #include 
@@ -34,6 +33,7 @@
 #include "nm-utils.h"
 #include "nm-utils-private.h"
 #include "nm-dbus-glib-types.h"
+#include "nm-setting-private.h"
 
 /**
  * SECTION:nm-setting-wired
@@ -62,7 +62,12 @@ nm_setting_wired_error_quark (void)
 }
 
 
-G_DEFINE_TYPE (NMSettingWired, nm_setting_wired, NM_TYPE_SETTING)
+G_DEFINE_TYPE_WITH_CODE (NMSettingWired, nm_setting_wired, NM_TYPE_SETTING,
+                         _nm_register_setting (NM_SETTING_WIRED_SETTING_NAME,
+                                               g_define_type_id,
+                                               1,
+                                               NM_SETTING_WIRED_ERROR))
+NM_SETTING_REGISTER_TYPE (NM_TYPE_SETTING_WIRED)
 
 #define NM_SETTING_WIRED_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), NM_TYPE_SETTING_WIRED, NMSettingWiredPrivate))
 
diff --git a/libnm-util/nm-setting-wireless-security.c b/libnm-util/nm-setting-wireless-security.c
index 336773c8..404a38ad 100644
--- a/libnm-util/nm-setting-wireless-security.c
+++ b/libnm-util/nm-setting-wireless-security.c
@@ -25,7 +25,6 @@
 
 #include 
 #include 
-#include 
 #include 
 #include "nm-setting-wireless-security.h"
 #include "nm-setting-8021x.h"
@@ -76,7 +75,12 @@ nm_setting_wireless_security_error_quark (void)
 }
 
 
-G_DEFINE_TYPE (NMSettingWirelessSecurity, nm_setting_wireless_security, NM_TYPE_SETTING)
+G_DEFINE_TYPE_WITH_CODE (NMSettingWirelessSecurity, nm_setting_wireless_security, NM_TYPE_SETTING,
+                         _nm_register_setting (NM_SETTING_WIRELESS_SECURITY_SETTING_NAME,
+                                               g_define_type_id,
+                                               2,
+                                               NM_SETTING_WIRELESS_SECURITY_ERROR))
+NM_SETTING_REGISTER_TYPE (NM_TYPE_SETTING_WIRELESS_SECURITY)
 
 #define NM_SETTING_WIRELESS_SECURITY_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), NM_TYPE_SETTING_WIRELESS_SECURITY, NMSettingWirelessSecurityPrivate))
 
@@ -704,13 +708,13 @@ verify_wep_key (const char *key, NMWepKeyType wep_type)
 		if (keylen == 10 || keylen == 26) {
 			/* Hex key */
 			for (i = 0; i < keylen; i++) {
-				if (!isxdigit (key[i]))
+				if (!g_ascii_isxdigit (key[i]))
 					return FALSE;
 			}
 		} else if (keylen == 5 || keylen == 13) {
 			/* ASCII key */
 			for (i = 0; i < keylen; i++) {
-				if (!isascii (key[i]))
+				if (!g_ascii_isprint (key[i]))
 					return FALSE;
 			}
 		} else
@@ -739,7 +743,7 @@ verify_wpa_psk (const char *psk)
 	if (psklen == 64) {
 		/* Hex PSK */
 		for (i = 0; i < psklen; i++) {
-			if (!isxdigit (psk[i]))
+			if (!g_ascii_isxdigit (psk[i]))
 				return FALSE;
 		}
 	}
diff --git a/libnm-util/nm-setting-wireless.c b/libnm-util/nm-setting-wireless.c
index f9ed3108..ace22cbc 100644
--- a/libnm-util/nm-setting-wireless.c
+++ b/libnm-util/nm-setting-wireless.c
@@ -34,6 +34,7 @@
 #include "nm-utils.h"
 #include "nm-dbus-glib-types.h"
 #include "nm-utils-private.h"
+#include "nm-setting-private.h"
 
 /**
  * SECTION:nm-setting-wireless
@@ -62,7 +63,12 @@ nm_setting_wireless_error_quark (void)
 }
 
 
-G_DEFINE_TYPE (NMSettingWireless, nm_setting_wireless, NM_TYPE_SETTING)
+G_DEFINE_TYPE_WITH_CODE (NMSettingWireless, nm_setting_wireless, NM_TYPE_SETTING,
+                         _nm_register_setting (NM_SETTING_WIRELESS_SETTING_NAME,
+                                               g_define_type_id,
+                                               1,
+                                               NM_SETTING_WIRELESS_ERROR))
+NM_SETTING_REGISTER_TYPE (NM_TYPE_SETTING_WIRELESS)
 
 #define NM_SETTING_WIRELESS_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), NM_TYPE_SETTING_WIRELESS, NMSettingWirelessPrivate))
 
@@ -187,14 +193,21 @@ nm_setting_wireless_ap_security_compatible (NMSettingWireless *s_wireless,
 	if (!strcmp (key_mgmt, "wpa-none")) {
 		if (ap_mode != NM_802_11_MODE_ADHOC)
 			return FALSE;
-		// FIXME: validate ciphers if the BSSID actually puts WPA/RSN IE in
-		// it's beacon
+		/* FIXME: validate ciphers if they're in the beacon */
 		return TRUE;
 	}
 
-	/* Stuff after this point requires infrastructure */
-	if (ap_mode != NM_802_11_MODE_INFRA)
-		return FALSE;
+	/* Adhoc WPA2 (ie, RSN IBSS) */
+	if (ap_mode == NM_802_11_MODE_ADHOC) {
+		if (strcmp (key_mgmt, "wpa-psk"))
+			return FALSE;
+
+		/* Ensure the AP has RSN PSK capability */
+		if (!(ap_rsn & NM_802_11_AP_SEC_KEY_MGMT_PSK))
+			return FALSE;
+
+		/* Fall through and check ciphers in generic WPA-PSK code */
+	}
 
 	/* Dynamic WEP or LEAP */
 	if (!strcmp (key_mgmt, "ieee8021x")) {
@@ -502,15 +515,16 @@ nm_setting_wireless_get_hidden (NMSettingWireless *setting)
  * @setting: the #NMSettingWireless
  * @bssid: the new BSSID to add to the list
  *
- * Adds a new WiFi AP's BSSID to the previously seen BSSID list of the setting.
- * NetworkManager tracks previously seen BSSIDs internally so this function
- * no longer has much use.
+ * Adds a new Wi-Fi AP's BSSID to the previously seen BSSID list of the setting.
+ * NetworkManager now tracks previously seen BSSIDs internally so this function
+ * no longer has much use. Actually, changes you make using this function will
+ * not be preserved.
  *
  * Returns: %TRUE if @bssid was already known, %FALSE if not
  **/
 gboolean
 nm_setting_wireless_add_seen_bssid (NMSettingWireless *setting,
-									const char *bssid)
+                                    const char *bssid)
 {
 	NMSettingWirelessPrivate *priv;
 	char *lower_bssid;
@@ -584,7 +598,7 @@ static gboolean
 verify (NMSetting *setting, GSList *all_settings, GError **error)
 {
 	NMSettingWirelessPrivate *priv = NM_SETTING_WIRELESS_GET_PRIVATE (setting);
-	const char *valid_modes[] = { NM_SETTING_WIRELESS_MODE_INFRA, NM_SETTING_WIRELESS_MODE_ADHOC, NULL };
+	const char *valid_modes[] = { NM_SETTING_WIRELESS_MODE_INFRA, NM_SETTING_WIRELESS_MODE_ADHOC, NM_SETTING_WIRELESS_MODE_AP, NULL };
 	const char *valid_bands[] = { "a", "bg", NULL };
 	GSList *iter;
 
@@ -881,15 +895,15 @@ nm_setting_wireless_class_init (NMSettingWirelessClass *setting_class)
 	/**
 	 * NMSettingWireless:mode:
 	 *
-	 * WiFi network mode; one of 'infrastructure' or 'adhoc'.  If blank,
+	 * WiFi network mode; one of 'infrastructure', 'adhoc' or 'ap'.  If blank,
 	 * infrastructure is assumed.
 	 **/
 	g_object_class_install_property
 		(object_class, PROP_MODE,
 		 g_param_spec_string (NM_SETTING_WIRELESS_MODE,
 						  "Mode",
-						  "WiFi network mode; one of 'infrastructure' or "
-						  "'adhoc'.  If blank, infrastructure is assumed.",
+						  "WiFi network mode; one of 'infrastructure', "
+						  "'adhoc' or 'ap'.  If blank, infrastructure is assumed.",
 						  NULL,
 						  G_PARAM_READWRITE | NM_SETTING_PARAM_SERIALIZE));
 
@@ -1054,21 +1068,25 @@ nm_setting_wireless_class_init (NMSettingWirelessClass *setting_class)
 	 * NMSettingWireless:seen-bssids:
 	 *
 	 * A list of BSSIDs (each BSSID formatted as a MAC address like
-	 * '00:11:22:33:44:55') that have been detected as part of the WiFI network.
-	 * NetworkManager internally tracks previously seen BSSIDs so this property
-	 * is no longer of much use.
+	 * '00:11:22:33:44:55') that have been detected as part of the Wi-FI network.
+	 * NetworkManager internally tracks previously seen BSSIDs. The property is only
+	 * meant for reading and reflects the BBSID list of NetworkManager. The changes you
+	 * make to this property will not be preserved.
 	 **/
 	g_object_class_install_property
 		(object_class, PROP_SEEN_BSSIDS,
 		 _nm_param_spec_specialized (NM_SETTING_WIRELESS_SEEN_BSSIDS,
-							   "Seen BSSIDS",
-							   "A list of BSSIDs (each BSSID formatted as a MAC "
-							   "address like 00:11:22:33:44:55') that have been "
-							   "detected as part of the WiFI network. "
-							   "NetworkManager internally tracks previously seen "
-							   "BSSIDs so this property is no longer of much use.",
-							   DBUS_TYPE_G_LIST_OF_STRING,
-							   G_PARAM_READWRITE | NM_SETTING_PARAM_SERIALIZE | NM_SETTING_PARAM_FUZZY_IGNORE));
+		                             "Seen BSSIDS",
+		                             "A list of BSSIDs (each BSSID formatted as a MAC "
+		                             "address like 00:11:22:33:44:55') that have been "
+		                             "detected as part of the WiFI network. "
+		                             "NetworkManager internally tracks previously seen "
+		                             "BSSIDs. The property is only meant for reading "
+		                             "and reflects the BBSID list of NetworkManager. "
+		                             "The changes you make to this property will not be "
+		                             "preserved.",
+		                             DBUS_TYPE_G_LIST_OF_STRING,
+		                             G_PARAM_READWRITE | NM_SETTING_PARAM_SERIALIZE | NM_SETTING_PARAM_FUZZY_IGNORE));
 
 	/**
 	 * NMSettingWireless:mtu:
diff --git a/libnm-util/nm-setting-wireless.h b/libnm-util/nm-setting-wireless.h
index e54e8353..6e9c4d68 100644
--- a/libnm-util/nm-setting-wireless.h
+++ b/libnm-util/nm-setting-wireless.h
@@ -85,6 +85,14 @@ GQuark nm_setting_wireless_error_quark (void);
  */
 #define NM_SETTING_WIRELESS_MODE_ADHOC  "adhoc"
 
+/**
+ * NM_SETTING_WIRELESS_MODE_AP:
+ *
+ * Indicates AP/master mode where the wireless device is started as an access
+ * point/hotspot.
+ */
+#define NM_SETTING_WIRELESS_MODE_AP     "ap"
+
 /**
  * NM_SETTING_WIRELESS_MODE_INFRA:
  *
diff --git a/libnm-util/nm-utils-enum-types.c b/libnm-util/nm-utils-enum-types.c
index 332eb98b..7df362be 100644
--- a/libnm-util/nm-utils-enum-types.c
+++ b/libnm-util/nm-utils-enum-types.c
@@ -11,6 +11,8 @@
 #include "nm-setting-adsl.h" 
 #include "nm-setting-bluetooth.h" 
 #include "nm-setting-bond.h" 
+#include "nm-setting-bridge.h" 
+#include "nm-setting-bridge-port.h" 
 #include "nm-setting-connection.h" 
 #include "nm-setting-infiniband.h" 
 #include "nm-setting-ip4-config.h" 
@@ -280,6 +282,46 @@ nm_setting_bond_error_get_type (void)
   return g_define_type_id__volatile;
 }
 GType
+nm_setting_bridge_error_get_type (void)
+{
+  static volatile gsize g_define_type_id__volatile = 0;
+
+  if (g_once_init_enter (&g_define_type_id__volatile))
+    {
+      static const GEnumValue values[] = {
+        { NM_SETTING_BRIDGE_ERROR_UNKNOWN, "NM_SETTING_BRIDGE_ERROR_UNKNOWN", "UnknownError" },
+        { NM_SETTING_BRIDGE_ERROR_INVALID_PROPERTY, "NM_SETTING_BRIDGE_ERROR_INVALID_PROPERTY", "InvalidProperty" },
+        { NM_SETTING_BRIDGE_ERROR_MISSING_PROPERTY, "NM_SETTING_BRIDGE_ERROR_MISSING_PROPERTY", "MissingProperty" },
+        { 0, NULL, NULL }
+      };
+      GType g_define_type_id =
+        g_enum_register_static (g_intern_static_string ("NMSettingBridgeError"), values);
+      g_once_init_leave (&g_define_type_id__volatile, g_define_type_id);
+    }
+
+  return g_define_type_id__volatile;
+}
+GType
+nm_setting_bridge_port_error_get_type (void)
+{
+  static volatile gsize g_define_type_id__volatile = 0;
+
+  if (g_once_init_enter (&g_define_type_id__volatile))
+    {
+      static const GEnumValue values[] = {
+        { NM_SETTING_BRIDGE_PORT_ERROR_UNKNOWN, "NM_SETTING_BRIDGE_PORT_ERROR_UNKNOWN", "UnknownError" },
+        { NM_SETTING_BRIDGE_PORT_ERROR_INVALID_PROPERTY, "NM_SETTING_BRIDGE_PORT_ERROR_INVALID_PROPERTY", "InvalidProperty" },
+        { NM_SETTING_BRIDGE_PORT_ERROR_MISSING_PROPERTY, "NM_SETTING_BRIDGE_PORT_ERROR_MISSING_PROPERTY", "MissingProperty" },
+        { 0, NULL, NULL }
+      };
+      GType g_define_type_id =
+        g_enum_register_static (g_intern_static_string ("NMSettingBridgePortError"), values);
+      g_once_init_leave (&g_define_type_id__volatile, g_define_type_id);
+    }
+
+  return g_define_type_id__volatile;
+}
+GType
 nm_setting_connection_error_get_type (void)
 {
   static volatile gsize g_define_type_id__volatile = 0;
@@ -353,6 +395,7 @@ nm_setting_vlan_error_get_type (void)
         { NM_SETTING_VLAN_ERROR_UNKNOWN, "NM_SETTING_VLAN_ERROR_UNKNOWN", "Unknown" },
         { NM_SETTING_VLAN_ERROR_INVALID_PROPERTY, "NM_SETTING_VLAN_ERROR_INVALID_PROPERTY", "InvalidProperty" },
         { NM_SETTING_VLAN_ERROR_MISSING_PROPERTY, "NM_SETTING_VLAN_ERROR_MISSING_PROPERTY", "MissingProperty" },
+        { NM_SETTING_VLAN_ERROR_INVALID_PARENT, "NM_SETTING_VLAN_ERROR_INVALID_PARENT", "InvalidParent" },
         { 0, NULL, NULL }
       };
       GType g_define_type_id =
@@ -540,6 +583,8 @@ nm_setting_gsm_network_type_get_type (void)
         { NM_SETTING_GSM_NETWORK_TYPE_GPRS_EDGE, "NM_SETTING_GSM_NETWORK_TYPE_GPRS_EDGE", "gprs-edge" },
         { NM_SETTING_GSM_NETWORK_TYPE_PREFER_UMTS_HSPA, "NM_SETTING_GSM_NETWORK_TYPE_PREFER_UMTS_HSPA", "prefer-umts-hspa" },
         { NM_SETTING_GSM_NETWORK_TYPE_PREFER_GPRS_EDGE, "NM_SETTING_GSM_NETWORK_TYPE_PREFER_GPRS_EDGE", "prefer-gprs-edge" },
+        { NM_SETTING_GSM_NETWORK_TYPE_PREFER_4G, "NM_SETTING_GSM_NETWORK_TYPE_PREFER_4G", "prefer-4g" },
+        { NM_SETTING_GSM_NETWORK_TYPE_4G, "NM_SETTING_GSM_NETWORK_TYPE_4G", "4g" },
         { 0, NULL, NULL }
       };
       GType g_define_type_id =
diff --git a/libnm-util/nm-utils-enum-types.h b/libnm-util/nm-utils-enum-types.h
index d88fda24..44737b92 100644
--- a/libnm-util/nm-utils-enum-types.h
+++ b/libnm-util/nm-utils-enum-types.h
@@ -33,6 +33,10 @@ GType nm_setting_bluetooth_error_get_type (void) G_GNUC_CONST;
 #define NM_TYPE_SETTING_BLUETOOTH_ERROR (nm_setting_bluetooth_error_get_type ())
 GType nm_setting_bond_error_get_type (void) G_GNUC_CONST;
 #define NM_TYPE_SETTING_BOND_ERROR (nm_setting_bond_error_get_type ())
+GType nm_setting_bridge_error_get_type (void) G_GNUC_CONST;
+#define NM_TYPE_SETTING_BRIDGE_ERROR (nm_setting_bridge_error_get_type ())
+GType nm_setting_bridge_port_error_get_type (void) G_GNUC_CONST;
+#define NM_TYPE_SETTING_BRIDGE_PORT_ERROR (nm_setting_bridge_port_error_get_type ())
 GType nm_setting_connection_error_get_type (void) G_GNUC_CONST;
 #define NM_TYPE_SETTING_CONNECTION_ERROR (nm_setting_connection_error_get_type ())
 GType nm_setting_infiniband_error_get_type (void) G_GNUC_CONST;
diff --git a/libnm-util/nm-utils.c b/libnm-util/nm-utils.c
index ad966c25..51ddfeb8 100644
--- a/libnm-util/nm-utils.c
+++ b/libnm-util/nm-utils.c
@@ -25,7 +25,6 @@
  */
 
 #include "config.h"
-#include 
 #include 
 #include 
 #include 
@@ -1203,6 +1202,42 @@ device_supports_ap_ciphers (guint32 dev_caps,
 	return (have_pair && have_group);
 }
 
+/**
+ * nm_utils_ap_mode_security_valid:
+ * @type: the security type to check device capabilties against,
+ * e.g. #NMU_SEC_STATIC_WEP
+ * @wifi_caps: bitfield of the capabilities of the specific WiFi device, e.g.
+ * #NM_WIFI_DEVICE_CAP_CIPHER_WEP40
+ *
+ * Given a set of device capabilities, and a desired security type to check
+ * against, determines whether the combination of device capabilities and
+ * desired security type are valid for AP/Hotspot connections.
+ *
+ * Returns: TRUE if the device capabilities are compatible with the desired
+ * @type, FALSE if they are not.
+ **/
+gboolean
+nm_utils_ap_mode_security_valid (NMUtilsSecurityType type,
+                                 NMDeviceWifiCapabilities wifi_caps)
+{
+	if (!(wifi_caps & NM_WIFI_DEVICE_CAP_AP))
+		return FALSE;
+
+	/* Return TRUE for any security that wpa_supplicant's lightweight AP
+	 * mode can handle: which is open, WEP, and WPA/WPA2 PSK.
+	 */
+	switch (type) {
+	case NMU_SEC_NONE:
+	case NMU_SEC_STATIC_WEP:
+	case NMU_SEC_WPA_PSK:
+	case NMU_SEC_WPA2_PSK:
+		return TRUE;
+	default:
+		break;
+	}
+	return FALSE;
+}
+
 /**
  * nm_utils_security_valid:
  * @type: the security type to check AP flags and device capabilties against,
@@ -1221,6 +1256,9 @@ device_supports_ap_ciphers (guint32 dev_caps,
  * against, determines whether the combination of device, desired security
  * type, and AP capabilities intersect.
  *
+ * NOTE: this function cannot handle checking security for AP/Hotspot mode;
+ * use nm_utils_ap_mode_security_valid() instead.
+ *
  * Returns: TRUE if the device capabilities and AP capabilties intersect and are
  * compatible with the desired @type, FALSE if they are not
  **/
@@ -2504,11 +2542,11 @@ nm_utils_hwaddr_aton (const char *asc, int type, gpointer buffer)
 	while (left && *in) {
 		guint8 d1 = in[0], d2 = in[1];
 
-		if (!isxdigit (d1))
+		if (!g_ascii_isxdigit (d1))
 			return NULL;
 
 		/* If there's no leading zero (ie "aa:b:cc") then fake it */
-		if (d2 && isxdigit (d2)) {
+		if (d2 && g_ascii_isxdigit (d2)) {
 			*out++ = (HEXVAL (d1) << 4) + HEXVAL (d2);
 			in += 2;
 		} else {
@@ -2582,3 +2620,60 @@ nm_utils_hwaddr_ntoa (gconstpointer addr, int type)
 
 	return g_string_free (out, FALSE);
 }
+
+/**
+ * nm_utils_iface_valid_name:
+ * @name: Name of interface
+ *
+ * This function is a 1:1 copy of the kernel's interface validation
+ * function in net/core/dev.c.
+ *
+ * Returns: %TRUE if interface name is valid, otherwise %FALSE is returned.
+ */
+gboolean
+nm_utils_iface_valid_name (const char *name)
+{
+	g_return_val_if_fail (name != NULL, FALSE);
+
+	if (*name == '\0')
+		return FALSE;
+
+	if (strlen (name) >= 16)
+		return FALSE;
+
+	if (!strcmp (name, ".") || !strcmp (name, ".."))
+		return FALSE;
+
+	while (*name) {
+		if (*name == '/' || g_ascii_isspace (*name))
+			return FALSE;
+		name++;
+	}
+
+	return TRUE;
+}
+
+/**
+ * nm_utils_is_uuid:
+ * @str: a string that might be a UUID
+ *
+ * Checks if @str is a UUID
+ *
+ * Returns: %TRUE if @str is a UUID, %FALSE if not
+ */
+gboolean
+nm_utils_is_uuid (const char *str)
+{
+	const char *p = str;
+	int num_dashes = 0;
+
+	while (*p) {
+		if (*p == '-')
+			num_dashes++;
+		else if (!g_ascii_isxdigit (*p))
+			return FALSE;
+		p++;
+	}
+
+	return (num_dashes == 4) && (p - str == 36);
+}
diff --git a/libnm-util/nm-utils.h b/libnm-util/nm-utils.h
index dd29230b..203d83b5 100644
--- a/libnm-util/nm-utils.h
+++ b/libnm-util/nm-utils.h
@@ -87,6 +87,9 @@ gboolean nm_utils_security_valid (NMUtilsSecurityType type,
                                   NM80211ApSecurityFlags ap_wpa,
                                   NM80211ApSecurityFlags ap_rsn);
 
+gboolean nm_utils_ap_mode_security_valid (NMUtilsSecurityType type,
+                                          NMDeviceWifiCapabilities wifi_caps);
+
 GSList *nm_utils_ip4_addresses_from_gvalue (const GValue *value);
 void nm_utils_ip4_addresses_to_gvalue (GSList *list, GValue *value);
 
@@ -135,6 +138,10 @@ char       *nm_utils_hwaddr_ntoa  (gconstpointer addr, int type);
 GByteArray *nm_utils_hwaddr_atoba (const char *asc, int type);
 guint8     *nm_utils_hwaddr_aton  (const char *asc, int type, gpointer buffer);
 
+gboolean    nm_utils_iface_valid_name(const char *name);
+
+gboolean nm_utils_is_uuid (const char *str);
+
 G_END_DECLS
 
 #endif /* NM_UTILS_H */
diff --git a/libnm-util/tests/Makefile.am b/libnm-util/tests/Makefile.am
index 46a4d142..98f8aad8 100644
--- a/libnm-util/tests/Makefile.am
+++ b/libnm-util/tests/Makefile.am
@@ -1,3 +1,5 @@
+if ENABLE_TESTS
+
 SUBDIRS=certs
 
 INCLUDES = \
@@ -73,8 +75,6 @@ test_setting_8021x_LDADD = \
 	$(GLIB_LIBS) \
 	$(DBUS_LIBS)
 
-if WITH_TESTS
-
 check-local: test-settings-defaults test-crypto test-secrets
 	$(abs_builddir)/test-settings-defaults
 	$(abs_builddir)/test-secrets
@@ -137,4 +137,3 @@ check-local: test-settings-defaults test-crypto test-secrets
 		"1234567890"
 
 endif
-
diff --git a/libnm-util/tests/Makefile.in b/libnm-util/tests/Makefile.in
index 4d7b082e..4a1731f9 100644
--- a/libnm-util/tests/Makefile.in
+++ b/libnm-util/tests/Makefile.in
@@ -51,23 +51,26 @@ PRE_UNINSTALL = :
 POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
-noinst_PROGRAMS = test-settings-defaults$(EXEEXT) test-crypto$(EXEEXT) \
-	test-secrets$(EXEEXT) test-general$(EXEEXT) \
-	test-setting-8021x$(EXEEXT)
+@ENABLE_TESTS_TRUE@noinst_PROGRAMS = test-settings-defaults$(EXEEXT) \
+@ENABLE_TESTS_TRUE@	test-crypto$(EXEEXT) test-secrets$(EXEEXT) \
+@ENABLE_TESTS_TRUE@	test-general$(EXEEXT) \
+@ENABLE_TESTS_TRUE@	test-setting-8021x$(EXEEXT)
 subdir = libnm-util/tests
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/compiler_warnings.m4 \
-	$(top_srcdir)/m4/gettext.m4 $(top_srcdir)/m4/gtk-doc.m4 \
-	$(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/intlmacosx.m4 \
-	$(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/introspection.m4 \
-	$(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \
-	$(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/libnl-check.m4 \
-	$(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \
-	$(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
-	$(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/nls.m4 \
-	$(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/progtest.m4 \
-	$(top_srcdir)/m4/vapigen.m4 $(top_srcdir)/configure.ac
+	$(top_srcdir)/m4/gettext.m4 \
+	$(top_srcdir)/m4/gnome-code-coverage.m4 \
+	$(top_srcdir)/m4/gtk-doc.m4 $(top_srcdir)/m4/iconv.m4 \
+	$(top_srcdir)/m4/intlmacosx.m4 $(top_srcdir)/m4/intltool.m4 \
+	$(top_srcdir)/m4/introspection.m4 $(top_srcdir)/m4/lib-ld.m4 \
+	$(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \
+	$(top_srcdir)/m4/libnl-check.m4 $(top_srcdir)/m4/libtool.m4 \
+	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
+	$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
+	$(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/po.m4 \
+	$(top_srcdir)/m4/progtest.m4 $(top_srcdir)/m4/vapigen.m4 \
+	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(install_sh) -d
@@ -75,35 +78,43 @@ CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
 CONFIG_CLEAN_VPATH_FILES =
 PROGRAMS = $(noinst_PROGRAMS)
-am_test_crypto_OBJECTS = test_crypto-test-crypto.$(OBJEXT)
+am__test_crypto_SOURCES_DIST = test-crypto.c
+@ENABLE_TESTS_TRUE@am_test_crypto_OBJECTS =  \
+@ENABLE_TESTS_TRUE@	test_crypto-test-crypto.$(OBJEXT)
 test_crypto_OBJECTS = $(am_test_crypto_OBJECTS)
 am__DEPENDENCIES_1 =
-test_crypto_DEPENDENCIES =  \
-	$(top_builddir)/libnm-util/libtest-crypto.la \
-	$(top_builddir)/libnm-util/libnm-util.la $(am__DEPENDENCIES_1)
+@ENABLE_TESTS_TRUE@test_crypto_DEPENDENCIES = $(top_builddir)/libnm-util/libtest-crypto.la \
+@ENABLE_TESTS_TRUE@	$(top_builddir)/libnm-util/libnm-util.la \
+@ENABLE_TESTS_TRUE@	$(am__DEPENDENCIES_1)
 AM_V_lt = $(am__v_lt_@AM_V@)
 am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
 am__v_lt_0 = --silent
-am_test_general_OBJECTS = test_general-test-general.$(OBJEXT)
+am__test_general_SOURCES_DIST = test-general.c
+@ENABLE_TESTS_TRUE@am_test_general_OBJECTS =  \
+@ENABLE_TESTS_TRUE@	test_general-test-general.$(OBJEXT)
 test_general_OBJECTS = $(am_test_general_OBJECTS)
-test_general_DEPENDENCIES = $(top_builddir)/libnm-util/libnm-util.la \
-	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
-am_test_secrets_OBJECTS = test_secrets-test-secrets.$(OBJEXT)
+@ENABLE_TESTS_TRUE@test_general_DEPENDENCIES =  \
+@ENABLE_TESTS_TRUE@	$(top_builddir)/libnm-util/libnm-util.la \
+@ENABLE_TESTS_TRUE@	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
+am__test_secrets_SOURCES_DIST = test-secrets.c
+@ENABLE_TESTS_TRUE@am_test_secrets_OBJECTS =  \
+@ENABLE_TESTS_TRUE@	test_secrets-test-secrets.$(OBJEXT)
 test_secrets_OBJECTS = $(am_test_secrets_OBJECTS)
-test_secrets_DEPENDENCIES = $(top_builddir)/libnm-util/libnm-util.la \
-	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
-am_test_setting_8021x_OBJECTS =  \
-	test_setting_8021x-test-setting-8021x.$(OBJEXT)
+@ENABLE_TESTS_TRUE@test_secrets_DEPENDENCIES =  \
+@ENABLE_TESTS_TRUE@	$(top_builddir)/libnm-util/libnm-util.la \
+@ENABLE_TESTS_TRUE@	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
+am__test_setting_8021x_SOURCES_DIST = test-setting-8021x.c
+@ENABLE_TESTS_TRUE@am_test_setting_8021x_OBJECTS = test_setting_8021x-test-setting-8021x.$(OBJEXT)
 test_setting_8021x_OBJECTS = $(am_test_setting_8021x_OBJECTS)
-test_setting_8021x_DEPENDENCIES =  \
-	$(top_builddir)/libnm-util/libnm-util.la $(am__DEPENDENCIES_1) \
-	$(am__DEPENDENCIES_1)
-am_test_settings_defaults_OBJECTS =  \
-	test_settings_defaults-test-settings-defaults.$(OBJEXT)
+@ENABLE_TESTS_TRUE@test_setting_8021x_DEPENDENCIES =  \
+@ENABLE_TESTS_TRUE@	$(top_builddir)/libnm-util/libnm-util.la \
+@ENABLE_TESTS_TRUE@	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
+am__test_settings_defaults_SOURCES_DIST = test-settings-defaults.c
+@ENABLE_TESTS_TRUE@am_test_settings_defaults_OBJECTS = test_settings_defaults-test-settings-defaults.$(OBJEXT)
 test_settings_defaults_OBJECTS = $(am_test_settings_defaults_OBJECTS)
-test_settings_defaults_DEPENDENCIES =  \
-	$(top_builddir)/libnm-util/libnm-util.la $(am__DEPENDENCIES_1) \
-	$(am__DEPENDENCIES_1)
+@ENABLE_TESTS_TRUE@test_settings_defaults_DEPENDENCIES =  \
+@ENABLE_TESTS_TRUE@	$(top_builddir)/libnm-util/libnm-util.la \
+@ENABLE_TESTS_TRUE@	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
 DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
 depcomp = $(SHELL) $(top_srcdir)/build-aux/depcomp
 am__depfiles_maybe = depfiles
@@ -133,9 +144,11 @@ am__v_GEN_0 = @echo "  GEN   " $@;
 SOURCES = $(test_crypto_SOURCES) $(test_general_SOURCES) \
 	$(test_secrets_SOURCES) $(test_setting_8021x_SOURCES) \
 	$(test_settings_defaults_SOURCES)
-DIST_SOURCES = $(test_crypto_SOURCES) $(test_general_SOURCES) \
-	$(test_secrets_SOURCES) $(test_setting_8021x_SOURCES) \
-	$(test_settings_defaults_SOURCES)
+DIST_SOURCES = $(am__test_crypto_SOURCES_DIST) \
+	$(am__test_general_SOURCES_DIST) \
+	$(am__test_secrets_SOURCES_DIST) \
+	$(am__test_setting_8021x_SOURCES_DIST) \
+	$(am__test_settings_defaults_SOURCES_DIST)
 RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
 	html-recursive info-recursive install-data-recursive \
 	install-dvi-recursive install-exec-recursive \
@@ -155,7 +168,7 @@ AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \
 	distdir
 ETAGS = etags
 CTAGS = ctags
-DIST_SUBDIRS = $(SUBDIRS)
+DIST_SUBDIRS = certs
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 am__relativize = \
   dir0=`pwd`; \
@@ -194,6 +207,10 @@ AWK = @AWK@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
+CKDB_PATH = @CKDB_PATH@
+CODE_COVERAGE_CFLAGS = @CODE_COVERAGE_CFLAGS@
+CODE_COVERAGE_ENABLED = @CODE_COVERAGE_ENABLED@
+CODE_COVERAGE_LDFLAGS = @CODE_COVERAGE_LDFLAGS@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CXX = @CXX@
@@ -208,9 +225,7 @@ DBUS_SYS_DIR = @DBUS_SYS_DIR@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
 DHCLIENT_PATH = @DHCLIENT_PATH@
-DHCLIENT_VERSION = @DHCLIENT_VERSION@
 DHCPCD_PATH = @DHCPCD_PATH@
-DISABLE_DEPRECATED = @DISABLE_DEPRECATED@
 DLLTOOL = @DLLTOOL@
 DSYMUTIL = @DSYMUTIL@
 DUMPBIN = @DUMPBIN@
@@ -220,17 +235,14 @@ ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
 FGREP = @FGREP@
+GENHTML = @GENHTML@
 GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
 GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
-GIO_CFLAGS = @GIO_CFLAGS@
-GIO_LIBS = @GIO_LIBS@
 GLIB_CFLAGS = @GLIB_CFLAGS@
 GLIB_GENMARSHAL = @GLIB_GENMARSHAL@
 GLIB_LIBS = @GLIB_LIBS@
 GLIB_MAKEFILE = @GLIB_MAKEFILE@
 GLIB_MKENUMS = @GLIB_MKENUMS@
-GMODULE_CFLAGS = @GMODULE_CFLAGS@
-GMODULE_LIBS = @GMODULE_LIBS@
 GMSGFMT = @GMSGFMT@
 GMSGFMT_015 = @GMSGFMT_015@
 GNUTLS_CFLAGS = @GNUTLS_CFLAGS@
@@ -271,6 +283,7 @@ IPTABLES_PATH = @IPTABLES_PATH@
 IWMX_SDK_CFLAGS = @IWMX_SDK_CFLAGS@
 IWMX_SDK_LIBS = @IWMX_SDK_LIBS@
 KERNEL_FIRMWARE_DIR = @KERNEL_FIRMWARE_DIR@
+LCOV = @LCOV@
 LD = @LD@
 LDFLAGS = @LDFLAGS@
 LIBDL = @LIBDL@
@@ -287,11 +300,7 @@ LIBNL2_LIBS = @LIBNL2_LIBS@
 LIBNL3_CFLAGS = @LIBNL3_CFLAGS@
 LIBNL3_LIBS = @LIBNL3_LIBS@
 LIBNL_CFLAGS = @LIBNL_CFLAGS@
-LIBNL_GENL3_CFLAGS = @LIBNL_GENL3_CFLAGS@
-LIBNL_GENL3_LIBS = @LIBNL_GENL3_LIBS@
 LIBNL_LIBS = @LIBNL_LIBS@
-LIBNL_ROUTE3_CFLAGS = @LIBNL_ROUTE3_CFLAGS@
-LIBNL_ROUTE3_LIBS = @LIBNL_ROUTE3_LIBS@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
 LIBSOUP_CFLAGS = @LIBSOUP_CFLAGS@
@@ -306,6 +315,8 @@ MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MANIFEST_TOOL = @MANIFEST_TOOL@
 MKDIR_P = @MKDIR_P@
+MM_GLIB_CFLAGS = @MM_GLIB_CFLAGS@
+MM_GLIB_LIBS = @MM_GLIB_LIBS@
 MOC = @MOC@
 MSGFMT = @MSGFMT@
 MSGFMT_015 = @MSGFMT_015@
@@ -315,6 +326,7 @@ NMEDIT = @NMEDIT@
 NM_MAJOR_VERSION = @NM_MAJOR_VERSION@
 NM_MICRO_VERSION = @NM_MICRO_VERSION@
 NM_MINOR_VERSION = @NM_MINOR_VERSION@
+NM_MODIFY_SYSTEM_POLICY = @NM_MODIFY_SYSTEM_POLICY@
 NM_VERSION = @NM_VERSION@
 NSS_CFLAGS = @NSS_CFLAGS@
 NSS_LIBS = @NSS_LIBS@
@@ -341,13 +353,14 @@ PPPD_PLUGIN_DIR = @PPPD_PLUGIN_DIR@
 QT_CFLAGS = @QT_CFLAGS@
 QT_LIBS = @QT_LIBS@
 RANLIB = @RANLIB@
-RESOLVCONF_PATH = @RESOLVCONF_PATH@
 SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
-SYSTEMD_CFLAGS = @SYSTEMD_CFLAGS@
-SYSTEMD_LIBS = @SYSTEMD_LIBS@
+SYSTEMD_INHIBIT_CFLAGS = @SYSTEMD_INHIBIT_CFLAGS@
+SYSTEMD_INHIBIT_LIBS = @SYSTEMD_INHIBIT_LIBS@
+SYSTEMD_LOGIN_CFLAGS = @SYSTEMD_LOGIN_CFLAGS@
+SYSTEMD_LOGIN_LIBS = @SYSTEMD_LOGIN_LIBS@
 SYSTEM_CA_PATH = @SYSTEM_CA_PATH@
 UDEV_BASE_DIR = @UDEV_BASE_DIR@
 USE_NLS = @USE_NLS@
@@ -402,6 +415,11 @@ localedir = @localedir@
 localstatedir = @localstatedir@
 mandir = @mandir@
 mkdir_p = @mkdir_p@
+nmbinary = @nmbinary@
+nmconfdir = @nmconfdir@
+nmdatadir = @nmdatadir@
+nmrundir = @nmrundir@
+nmstatedir = @nmstatedir@
 oldincludedir = @oldincludedir@
 pdfdir = @pdfdir@
 prefix = @prefix@
@@ -416,72 +434,76 @@ target_alias = @target_alias@
 top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
-SUBDIRS = certs
-INCLUDES = \
-	-I$(top_srcdir)/include \
-	-I$(top_builddir)/include \
-	-I$(top_srcdir)/libnm-util \
-	-I$(top_builddir)/libnm-util
-
-test_settings_defaults_SOURCES = \
-	test-settings-defaults.c
-
-test_settings_defaults_CPPFLAGS = \
-	$(GLIB_CFLAGS) \
-	$(DBUS_CFLAGS)
-
-test_settings_defaults_LDADD = \
-	$(top_builddir)/libnm-util/libnm-util.la \
-	$(GLIB_LIBS) \
-	$(DBUS_LIBS)
-
-test_crypto_SOURCES = \
-	test-crypto.c
-
-test_crypto_CPPFLAGS = \
-	$(GLIB_CFLAGS)
-
-test_crypto_LDADD = \
-	$(top_builddir)/libnm-util/libtest-crypto.la \
-	$(top_builddir)/libnm-util/libnm-util.la \
-	$(GLIB_LIBS)
-
-test_secrets_SOURCES = \
-	test-secrets.c
-
-test_secrets_CPPFLAGS = \
-	-DTEST_CERT_DIR=\"$(top_srcdir)/libnm-util/tests/certs/\" \
-	$(GLIB_CFLAGS) \
-	$(DBUS_CFLAGS)
-
-test_secrets_LDADD = \
-	$(top_builddir)/libnm-util/libnm-util.la \
-	$(GLIB_LIBS) \
-	$(DBUS_LIBS)
-
-test_general_SOURCES = \
-	test-general.c
-
-test_general_CPPFLAGS = \
-	$(GLIB_CFLAGS) \
-	$(DBUS_CFLAGS)
-
-test_general_LDADD = \
-	$(top_builddir)/libnm-util/libnm-util.la \
-	$(GLIB_LIBS) \
-	$(DBUS_LIBS)
-
-test_setting_8021x_SOURCES = \
-	test-setting-8021x.c
-
-test_setting_8021x_CPPFLAGS = \
-	$(GLIB_CFLAGS) \
-	$(DBUS_CFLAGS)
-
-test_setting_8021x_LDADD = \
-	$(top_builddir)/libnm-util/libnm-util.la \
-	$(GLIB_LIBS) \
-	$(DBUS_LIBS)
+with_dhclient = @with_dhclient@
+with_dhcpcd = @with_dhcpcd@
+with_netconfig = @with_netconfig@
+with_resolvconf = @with_resolvconf@
+@ENABLE_TESTS_TRUE@SUBDIRS = certs
+@ENABLE_TESTS_TRUE@INCLUDES = \
+@ENABLE_TESTS_TRUE@	-I$(top_srcdir)/include \
+@ENABLE_TESTS_TRUE@	-I$(top_builddir)/include \
+@ENABLE_TESTS_TRUE@	-I$(top_srcdir)/libnm-util \
+@ENABLE_TESTS_TRUE@	-I$(top_builddir)/libnm-util
+
+@ENABLE_TESTS_TRUE@test_settings_defaults_SOURCES = \
+@ENABLE_TESTS_TRUE@	test-settings-defaults.c
+
+@ENABLE_TESTS_TRUE@test_settings_defaults_CPPFLAGS = \
+@ENABLE_TESTS_TRUE@	$(GLIB_CFLAGS) \
+@ENABLE_TESTS_TRUE@	$(DBUS_CFLAGS)
+
+@ENABLE_TESTS_TRUE@test_settings_defaults_LDADD = \
+@ENABLE_TESTS_TRUE@	$(top_builddir)/libnm-util/libnm-util.la \
+@ENABLE_TESTS_TRUE@	$(GLIB_LIBS) \
+@ENABLE_TESTS_TRUE@	$(DBUS_LIBS)
+
+@ENABLE_TESTS_TRUE@test_crypto_SOURCES = \
+@ENABLE_TESTS_TRUE@	test-crypto.c
+
+@ENABLE_TESTS_TRUE@test_crypto_CPPFLAGS = \
+@ENABLE_TESTS_TRUE@	$(GLIB_CFLAGS)
+
+@ENABLE_TESTS_TRUE@test_crypto_LDADD = \
+@ENABLE_TESTS_TRUE@	$(top_builddir)/libnm-util/libtest-crypto.la \
+@ENABLE_TESTS_TRUE@	$(top_builddir)/libnm-util/libnm-util.la \
+@ENABLE_TESTS_TRUE@	$(GLIB_LIBS)
+
+@ENABLE_TESTS_TRUE@test_secrets_SOURCES = \
+@ENABLE_TESTS_TRUE@	test-secrets.c
+
+@ENABLE_TESTS_TRUE@test_secrets_CPPFLAGS = \
+@ENABLE_TESTS_TRUE@	-DTEST_CERT_DIR=\"$(top_srcdir)/libnm-util/tests/certs/\" \
+@ENABLE_TESTS_TRUE@	$(GLIB_CFLAGS) \
+@ENABLE_TESTS_TRUE@	$(DBUS_CFLAGS)
+
+@ENABLE_TESTS_TRUE@test_secrets_LDADD = \
+@ENABLE_TESTS_TRUE@	$(top_builddir)/libnm-util/libnm-util.la \
+@ENABLE_TESTS_TRUE@	$(GLIB_LIBS) \
+@ENABLE_TESTS_TRUE@	$(DBUS_LIBS)
+
+@ENABLE_TESTS_TRUE@test_general_SOURCES = \
+@ENABLE_TESTS_TRUE@	test-general.c
+
+@ENABLE_TESTS_TRUE@test_general_CPPFLAGS = \
+@ENABLE_TESTS_TRUE@	$(GLIB_CFLAGS) \
+@ENABLE_TESTS_TRUE@	$(DBUS_CFLAGS)
+
+@ENABLE_TESTS_TRUE@test_general_LDADD = \
+@ENABLE_TESTS_TRUE@	$(top_builddir)/libnm-util/libnm-util.la \
+@ENABLE_TESTS_TRUE@	$(GLIB_LIBS) \
+@ENABLE_TESTS_TRUE@	$(DBUS_LIBS)
+
+@ENABLE_TESTS_TRUE@test_setting_8021x_SOURCES = \
+@ENABLE_TESTS_TRUE@	test-setting-8021x.c
+
+@ENABLE_TESTS_TRUE@test_setting_8021x_CPPFLAGS = \
+@ENABLE_TESTS_TRUE@	$(GLIB_CFLAGS) \
+@ENABLE_TESTS_TRUE@	$(DBUS_CFLAGS)
+
+@ENABLE_TESTS_TRUE@test_setting_8021x_LDADD = \
+@ENABLE_TESTS_TRUE@	$(top_builddir)/libnm-util/libnm-util.la \
+@ENABLE_TESTS_TRUE@	$(GLIB_LIBS) \
+@ENABLE_TESTS_TRUE@	$(DBUS_LIBS)
 
 all: all-recursive
 
@@ -555,25 +577,22 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_settings_defaults-test-settings-defaults.Po@am__quote@
 
 .c.o:
-@am__fastdepCC_TRUE@	$(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\
-@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
-@am__fastdepCC_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.Po
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $<
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c $<
 
 .c.obj:
-@am__fastdepCC_TRUE@	$(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.obj$$||'`;\
-@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ `$(CYGPATH_W) '$<'` &&\
-@am__fastdepCC_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.Po
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c `$(CYGPATH_W) '$<'`
 
 .c.lo:
-@am__fastdepCC_TRUE@	$(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.lo$$||'`;\
-@am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
-@am__fastdepCC_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.Plo
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $<
@@ -844,7 +863,7 @@ distdir: $(DISTFILES)
 	      || exit 1; \
 	  fi; \
 	done
-@WITH_TESTS_FALSE@check-local:
+@ENABLE_TESTS_FALSE@check-local:
 check-am: all-am
 	$(MAKE) $(AM_MAKEFLAGS) check-local
 check: check-recursive
@@ -971,66 +990,66 @@ uninstall-am:
 	tags tags-recursive uninstall uninstall-am
 
 
-@WITH_TESTS_TRUE@check-local: test-settings-defaults test-crypto test-secrets
-@WITH_TESTS_TRUE@	$(abs_builddir)/test-settings-defaults
-@WITH_TESTS_TRUE@	$(abs_builddir)/test-secrets
-@WITH_TESTS_TRUE@	$(abs_builddir)/test-general
+@ENABLE_TESTS_TRUE@check-local: test-settings-defaults test-crypto test-secrets
+@ENABLE_TESTS_TRUE@	$(abs_builddir)/test-settings-defaults
+@ENABLE_TESTS_TRUE@	$(abs_builddir)/test-secrets
+@ENABLE_TESTS_TRUE@	$(abs_builddir)/test-general
 
 # Private key and CA certificate in the same file (PEM)
-@WITH_TESTS_TRUE@	$(abs_builddir)/test-setting-8021x $(srcdir)/certs/test_key_and_cert.pem "test"
+@ENABLE_TESTS_TRUE@	$(abs_builddir)/test-setting-8021x $(srcdir)/certs/test_key_and_cert.pem "test"
 
 # Private key by itself (PEM)
-@WITH_TESTS_TRUE@	$(abs_builddir)/test-setting-8021x $(srcdir)/certs/test-key-only.pem "test"
+@ENABLE_TESTS_TRUE@	$(abs_builddir)/test-setting-8021x $(srcdir)/certs/test-key-only.pem "test"
 
 # PKCS#8 private key by itself (PEM)
-@WITH_TESTS_TRUE@	$(abs_builddir)/test-setting-8021x $(srcdir)/certs/pkcs8-enc-key.pem "1234567890"
+@ENABLE_TESTS_TRUE@	$(abs_builddir)/test-setting-8021x $(srcdir)/certs/pkcs8-enc-key.pem "1234567890"
 
 # Private key and CA certificate in the same file (pkcs12)
-@WITH_TESTS_TRUE@	$(abs_builddir)/test-setting-8021x $(srcdir)/certs/test-cert.p12 "test"
+@ENABLE_TESTS_TRUE@	$(abs_builddir)/test-setting-8021x $(srcdir)/certs/test-cert.p12 "test"
 
 # Normal CA certificate
-@WITH_TESTS_TRUE@	$(abs_builddir)/test-crypto --cert $(srcdir)/certs/test_ca_cert.pem
+@ENABLE_TESTS_TRUE@	$(abs_builddir)/test-crypto --cert $(srcdir)/certs/test_ca_cert.pem
 
 # Another CA certificate
-@WITH_TESTS_TRUE@	$(abs_builddir)/test-crypto --cert $(srcdir)/certs/test2_ca_cert.pem
+@ENABLE_TESTS_TRUE@	$(abs_builddir)/test-crypto --cert $(srcdir)/certs/test2_ca_cert.pem
 
 # Normal CA certificate (DER format)
-@WITH_TESTS_TRUE@	$(abs_builddir)/test-crypto --cert $(srcdir)/certs/test_ca_cert.der
+@ENABLE_TESTS_TRUE@	$(abs_builddir)/test-crypto --cert $(srcdir)/certs/test_ca_cert.der
 
 # CA certificate without an ending newline
-@WITH_TESTS_TRUE@	$(abs_builddir)/test-crypto --cert $(srcdir)/certs/ca-no-ending-newline.pem
+@ENABLE_TESTS_TRUE@	$(abs_builddir)/test-crypto --cert $(srcdir)/certs/ca-no-ending-newline.pem
 
 # Combined user cert and private key
-@WITH_TESTS_TRUE@	$(abs_builddir)/test-crypto --cert $(srcdir)/certs/test_key_and_cert.pem
+@ENABLE_TESTS_TRUE@	$(abs_builddir)/test-crypto --cert $(srcdir)/certs/test_key_and_cert.pem
 
 # Another combined user cert and private key
-@WITH_TESTS_TRUE@	$(abs_builddir)/test-crypto --cert $(srcdir)/certs/test2_key_and_cert.pem
+@ENABLE_TESTS_TRUE@	$(abs_builddir)/test-crypto --cert $(srcdir)/certs/test2_key_and_cert.pem
 
 # Private key with 8 bytes of tail padding
-@WITH_TESTS_TRUE@	$(abs_builddir)/test-crypto --key \
-@WITH_TESTS_TRUE@		$(srcdir)/certs/test_key_and_cert.pem \
-@WITH_TESTS_TRUE@		"test" \
-@WITH_TESTS_TRUE@		$(srcdir)/certs/test-key-only-decrypted.der
+@ENABLE_TESTS_TRUE@	$(abs_builddir)/test-crypto --key \
+@ENABLE_TESTS_TRUE@		$(srcdir)/certs/test_key_and_cert.pem \
+@ENABLE_TESTS_TRUE@		"test" \
+@ENABLE_TESTS_TRUE@		$(srcdir)/certs/test-key-only-decrypted.der
 
 # Private key only (not combined with a cert)
-@WITH_TESTS_TRUE@	$(abs_builddir)/test-crypto --key \
-@WITH_TESTS_TRUE@		$(srcdir)/certs/test-key-only.pem \
-@WITH_TESTS_TRUE@		"test" \
-@WITH_TESTS_TRUE@		$(srcdir)/certs/test-key-only-decrypted.der
+@ENABLE_TESTS_TRUE@	$(abs_builddir)/test-crypto --key \
+@ENABLE_TESTS_TRUE@		$(srcdir)/certs/test-key-only.pem \
+@ENABLE_TESTS_TRUE@		"test" \
+@ENABLE_TESTS_TRUE@		$(srcdir)/certs/test-key-only-decrypted.der
 
 # Private key with 6 bytes of tail padding
-@WITH_TESTS_TRUE@	$(abs_builddir)/test-crypto --key $(srcdir)/certs/test2_key_and_cert.pem "12345testing"
+@ENABLE_TESTS_TRUE@	$(abs_builddir)/test-crypto --key $(srcdir)/certs/test2_key_and_cert.pem "12345testing"
 
 # PKCS#12 file
-@WITH_TESTS_TRUE@	$(abs_builddir)/test-crypto --p12 $(srcdir)/certs/test-cert.p12 "test"
+@ENABLE_TESTS_TRUE@	$(abs_builddir)/test-crypto --p12 $(srcdir)/certs/test-cert.p12 "test"
 
 # Another PKCS#12 file
-@WITH_TESTS_TRUE@	$(abs_builddir)/test-crypto --p12 $(srcdir)/certs/test2-cert.p12 "12345testing"
+@ENABLE_TESTS_TRUE@	$(abs_builddir)/test-crypto --p12 $(srcdir)/certs/test2-cert.p12 "12345testing"
 
 # PKCS#8 encrypted private key
-@WITH_TESTS_TRUE@	$(abs_builddir)/test-crypto --pkcs8 \
-@WITH_TESTS_TRUE@		$(srcdir)/certs/pkcs8-enc-key.pem \
-@WITH_TESTS_TRUE@		"1234567890"
+@ENABLE_TESTS_TRUE@	$(abs_builddir)/test-crypto --pkcs8 \
+@ENABLE_TESTS_TRUE@		$(srcdir)/certs/pkcs8-enc-key.pem \
+@ENABLE_TESTS_TRUE@		"1234567890"
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
diff --git a/libnm-util/tests/certs/Makefile.in b/libnm-util/tests/certs/Makefile.in
index 400042f9..0e60e300 100644
--- a/libnm-util/tests/certs/Makefile.in
+++ b/libnm-util/tests/certs/Makefile.in
@@ -63,16 +63,18 @@ subdir = libnm-util/tests/certs
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/compiler_warnings.m4 \
-	$(top_srcdir)/m4/gettext.m4 $(top_srcdir)/m4/gtk-doc.m4 \
-	$(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/intlmacosx.m4 \
-	$(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/introspection.m4 \
-	$(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \
-	$(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/libnl-check.m4 \
-	$(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \
-	$(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
-	$(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/nls.m4 \
-	$(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/progtest.m4 \
-	$(top_srcdir)/m4/vapigen.m4 $(top_srcdir)/configure.ac
+	$(top_srcdir)/m4/gettext.m4 \
+	$(top_srcdir)/m4/gnome-code-coverage.m4 \
+	$(top_srcdir)/m4/gtk-doc.m4 $(top_srcdir)/m4/iconv.m4 \
+	$(top_srcdir)/m4/intlmacosx.m4 $(top_srcdir)/m4/intltool.m4 \
+	$(top_srcdir)/m4/introspection.m4 $(top_srcdir)/m4/lib-ld.m4 \
+	$(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \
+	$(top_srcdir)/m4/libnl-check.m4 $(top_srcdir)/m4/libtool.m4 \
+	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
+	$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
+	$(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/po.m4 \
+	$(top_srcdir)/m4/progtest.m4 $(top_srcdir)/m4/vapigen.m4 \
+	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(install_sh) -d
@@ -105,6 +107,10 @@ AWK = @AWK@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
+CKDB_PATH = @CKDB_PATH@
+CODE_COVERAGE_CFLAGS = @CODE_COVERAGE_CFLAGS@
+CODE_COVERAGE_ENABLED = @CODE_COVERAGE_ENABLED@
+CODE_COVERAGE_LDFLAGS = @CODE_COVERAGE_LDFLAGS@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CXX = @CXX@
@@ -119,9 +125,7 @@ DBUS_SYS_DIR = @DBUS_SYS_DIR@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
 DHCLIENT_PATH = @DHCLIENT_PATH@
-DHCLIENT_VERSION = @DHCLIENT_VERSION@
 DHCPCD_PATH = @DHCPCD_PATH@
-DISABLE_DEPRECATED = @DISABLE_DEPRECATED@
 DLLTOOL = @DLLTOOL@
 DSYMUTIL = @DSYMUTIL@
 DUMPBIN = @DUMPBIN@
@@ -131,17 +135,14 @@ ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
 FGREP = @FGREP@
+GENHTML = @GENHTML@
 GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
 GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
-GIO_CFLAGS = @GIO_CFLAGS@
-GIO_LIBS = @GIO_LIBS@
 GLIB_CFLAGS = @GLIB_CFLAGS@
 GLIB_GENMARSHAL = @GLIB_GENMARSHAL@
 GLIB_LIBS = @GLIB_LIBS@
 GLIB_MAKEFILE = @GLIB_MAKEFILE@
 GLIB_MKENUMS = @GLIB_MKENUMS@
-GMODULE_CFLAGS = @GMODULE_CFLAGS@
-GMODULE_LIBS = @GMODULE_LIBS@
 GMSGFMT = @GMSGFMT@
 GMSGFMT_015 = @GMSGFMT_015@
 GNUTLS_CFLAGS = @GNUTLS_CFLAGS@
@@ -182,6 +183,7 @@ IPTABLES_PATH = @IPTABLES_PATH@
 IWMX_SDK_CFLAGS = @IWMX_SDK_CFLAGS@
 IWMX_SDK_LIBS = @IWMX_SDK_LIBS@
 KERNEL_FIRMWARE_DIR = @KERNEL_FIRMWARE_DIR@
+LCOV = @LCOV@
 LD = @LD@
 LDFLAGS = @LDFLAGS@
 LIBDL = @LIBDL@
@@ -198,11 +200,7 @@ LIBNL2_LIBS = @LIBNL2_LIBS@
 LIBNL3_CFLAGS = @LIBNL3_CFLAGS@
 LIBNL3_LIBS = @LIBNL3_LIBS@
 LIBNL_CFLAGS = @LIBNL_CFLAGS@
-LIBNL_GENL3_CFLAGS = @LIBNL_GENL3_CFLAGS@
-LIBNL_GENL3_LIBS = @LIBNL_GENL3_LIBS@
 LIBNL_LIBS = @LIBNL_LIBS@
-LIBNL_ROUTE3_CFLAGS = @LIBNL_ROUTE3_CFLAGS@
-LIBNL_ROUTE3_LIBS = @LIBNL_ROUTE3_LIBS@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
 LIBSOUP_CFLAGS = @LIBSOUP_CFLAGS@
@@ -217,6 +215,8 @@ MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MANIFEST_TOOL = @MANIFEST_TOOL@
 MKDIR_P = @MKDIR_P@
+MM_GLIB_CFLAGS = @MM_GLIB_CFLAGS@
+MM_GLIB_LIBS = @MM_GLIB_LIBS@
 MOC = @MOC@
 MSGFMT = @MSGFMT@
 MSGFMT_015 = @MSGFMT_015@
@@ -226,6 +226,7 @@ NMEDIT = @NMEDIT@
 NM_MAJOR_VERSION = @NM_MAJOR_VERSION@
 NM_MICRO_VERSION = @NM_MICRO_VERSION@
 NM_MINOR_VERSION = @NM_MINOR_VERSION@
+NM_MODIFY_SYSTEM_POLICY = @NM_MODIFY_SYSTEM_POLICY@
 NM_VERSION = @NM_VERSION@
 NSS_CFLAGS = @NSS_CFLAGS@
 NSS_LIBS = @NSS_LIBS@
@@ -252,13 +253,14 @@ PPPD_PLUGIN_DIR = @PPPD_PLUGIN_DIR@
 QT_CFLAGS = @QT_CFLAGS@
 QT_LIBS = @QT_LIBS@
 RANLIB = @RANLIB@
-RESOLVCONF_PATH = @RESOLVCONF_PATH@
 SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
-SYSTEMD_CFLAGS = @SYSTEMD_CFLAGS@
-SYSTEMD_LIBS = @SYSTEMD_LIBS@
+SYSTEMD_INHIBIT_CFLAGS = @SYSTEMD_INHIBIT_CFLAGS@
+SYSTEMD_INHIBIT_LIBS = @SYSTEMD_INHIBIT_LIBS@
+SYSTEMD_LOGIN_CFLAGS = @SYSTEMD_LOGIN_CFLAGS@
+SYSTEMD_LOGIN_LIBS = @SYSTEMD_LOGIN_LIBS@
 SYSTEM_CA_PATH = @SYSTEM_CA_PATH@
 UDEV_BASE_DIR = @UDEV_BASE_DIR@
 USE_NLS = @USE_NLS@
@@ -313,6 +315,11 @@ localedir = @localedir@
 localstatedir = @localstatedir@
 mandir = @mandir@
 mkdir_p = @mkdir_p@
+nmbinary = @nmbinary@
+nmconfdir = @nmconfdir@
+nmdatadir = @nmdatadir@
+nmrundir = @nmrundir@
+nmstatedir = @nmstatedir@
 oldincludedir = @oldincludedir@
 pdfdir = @pdfdir@
 prefix = @prefix@
@@ -327,6 +334,10 @@ target_alias = @target_alias@
 top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
+with_dhclient = @with_dhclient@
+with_dhcpcd = @with_dhcpcd@
+with_netconfig = @with_netconfig@
+with_resolvconf = @with_resolvconf@
 EXTRA_DIST = \
 	test_ca_cert.pem \
 	test_ca_cert.der \
diff --git a/libnm-util/tests/test-general.c b/libnm-util/tests/test-general.c
index 2acb31b3..7c5399df 100644
--- a/libnm-util/tests/test-general.c
+++ b/libnm-util/tests/test-general.c
@@ -874,6 +874,7 @@ test_connection_diff_a_only (void)
 			{ NM_SETTING_CONNECTION_ZONE,        NM_SETTING_DIFF_RESULT_IN_A },
 			{ NM_SETTING_CONNECTION_MASTER,      NM_SETTING_DIFF_RESULT_IN_A },
 			{ NM_SETTING_CONNECTION_SLAVE_TYPE,  NM_SETTING_DIFF_RESULT_IN_A },
+			{ NM_SETTING_CONNECTION_SECONDARIES, NM_SETTING_DIFF_RESULT_IN_A },
 			{ NULL, NM_SETTING_DIFF_RESULT_UNKNOWN }
 		} },
 		{ NM_SETTING_WIRED_SETTING_NAME, {
diff --git a/m4/gnome-code-coverage.m4 b/m4/gnome-code-coverage.m4
new file mode 100644
index 00000000..618ccbec
--- /dev/null
+++ b/m4/gnome-code-coverage.m4
@@ -0,0 +1,162 @@
+dnl GNOME_CODE_COVERAGE
+dnl
+dnl Defines CODE_COVERAGE_CFLAGS and CODE_COVERAGE_LDFLAGS which should be
+dnl included in the CFLAGS and LIBS/LDFLAGS variables of every build target
+dnl (program or library) which should be built with code coverage support.
+dnl Also defines GNOME_CODE_COVERAGE_RULES which should be substituted in your
+dnl Makefile; and $enable_code_coverage which can be used in subsequent
+dnl configure output.
+dnl
+dnl Note that all optimisation flags in CFLAGS must be disabled when code
+dnl coverage is enabled.
+dnl
+dnl Derived from Makefile.decl in GLib, originally licenced under LGPLv2.1+.
+dnl This file is licenced under LGPLv2.1+.
+dnl
+dnl Usage example:
+dnl configure.ac:
+dnl    GNOME_CODE_COVERAGE
+dnl
+dnl Makefile.am:
+dnl    @GNOME_CODE_COVERAGE_RULES@
+dnl    my_program_LIBS = … $(CODE_COVERAGE_LDFLAGS) …
+dnl    my_program_CFLAGS = … $(CODE_COVERAGE_CFLAGS) …
+dnl
+dnl This results in a “check-code-coverage” rule being added to any Makefile.am
+dnl which includes “@GNOME_CODE_COVERAGE_RULES@” (assuming the module has been
+dnl configured with --enable-code-coverage). Running `make check-code-coverage`
+dnl in that directory will run the module’s test suite (`make check`) and build
+dnl a code coverage report detailing the code which was touched, then print the
+dnl URI for the report.
+
+AC_DEFUN([GNOME_CODE_COVERAGE],[
+	dnl Check for --enable-code-coverage
+	AC_MSG_CHECKING([whether to build with code coverage support])
+	AC_ARG_ENABLE([code-coverage], AS_HELP_STRING([--enable-code-coverage], [Whether to enable code coverage support]),, enable_code_coverage=no)
+	AM_CONDITIONAL([CODE_COVERAGE_ENABLED], [test x$enable_code_coverage = xyes])
+	AC_SUBST([CODE_COVERAGE_ENABLED], [$enable_code_coverage])
+	AC_MSG_RESULT($enable_code_coverage)
+
+	AS_IF([ test "$enable_code_coverage" = "yes" ], [
+		dnl Check if gcc is being used
+		AS_IF([ test "$GCC" = "no" ], [
+			AC_MSG_ERROR([not compiling with gcc, which is required for gcov code coverage])
+		])
+
+		# List of supported lcov versions.
+		lcov_version_list="1.6 1.7 1.8 1.9"
+
+		AC_CHECK_PROG([LCOV], [lcov], [lcov])
+		AC_CHECK_PROG([GENHTML], [genhtml], [genhtml])
+
+		AS_IF([ test "$LCOV" ], [
+			AC_CACHE_CHECK([for lcov version], gnome_cv_lcov_version, [
+				gnome_cv_lcov_version=invalid
+				lcov_version=`$LCOV -v 2>/dev/null | $SED -e 's/^.* //'`
+				for lcov_check_version in $lcov_version_list; do
+					if test "$lcov_version" = "$lcov_check_version"; then
+						gnome_cv_lcov_version="$lcov_check_version (ok)"
+					fi
+				done
+			])
+		], [
+			lcov_msg="To enable code coverage reporting you must have one of the following lcov versions installed: $lcov_version_list"
+			AC_MSG_ERROR([$lcov_msg])
+		])
+
+		case $gnome_cv_lcov_version in
+			""|invalid[)]
+				lcov_msg="You must have one of the following versions of lcov: $lcov_version_list (found: $lcov_version)."
+				AC_MSG_ERROR([$lcov_msg])
+				LCOV="exit 0;"
+			;;
+		esac
+
+		AS_IF([ test -z "$GENHTML" ], [
+			AC_MSG_ERROR([Could not find genhtml from the lcov package])
+		])
+
+		dnl Build the code coverage flags
+		CODE_COVERAGE_CFLAGS="-O0 -g -fprofile-arcs -ftest-coverage"
+		CODE_COVERAGE_LDFLAGS="-lgcov"
+
+		AC_SUBST([CODE_COVERAGE_CFLAGS])
+		AC_SUBST([CODE_COVERAGE_LDFLAGS])
+	])
+
+GNOME_CODE_COVERAGE_RULES='
+# Code coverage
+#
+# Optional:
+#  - CODE_COVERAGE_DIRECTORY: Top-level directory for code coverage reporting.
+#    (Default: $(top_builddir))
+#  - CODE_COVERAGE_OUTPUT_FILE: Filename and path for the .info file generated
+#    by lcov for code coverage. (Default:
+#    $(PACKAGE_NAME)-$(PACKAGE_VERSION)-coverage.info)
+#  - CODE_COVERAGE_OUTPUT_DIRECTORY: Directory for generated code coverage
+#    reports to be created. (Default:
+#    $(PACKAGE_NAME)-$(PACKAGE_VERSION)-coverage)
+#  - CODE_COVERAGE_LCOV_OPTIONS: Extra options to pass to the lcov instance.
+#    (Default: empty)
+#  - CODE_COVERAGE_GENHTML_OPTIONS: Extra options to pass to the genhtml
+#    instance. (Default: empty)
+#  - CODE_COVERAGE_IGNORE_PATTERN: Extra glob pattern of files to ignore
+#
+# The generated report will be titled using the $(PACKAGE_NAME) and
+# $(PACKAGE_VERSION). In order to add the current git hash to the title,
+# use the git-version-gen script, available online.
+
+# Optional variables
+CODE_COVERAGE_DIRECTORY ?= $(top_builddir)
+CODE_COVERAGE_OUTPUT_FILE ?= $(PACKAGE_NAME)-$(PACKAGE_VERSION)-coverage.info
+CODE_COVERAGE_OUTPUT_DIRECTORY ?= $(PACKAGE_NAME)-$(PACKAGE_VERSION)-coverage
+CODE_COVERAGE_LCOV_OPTIONS ?=
+CODE_COVERAGE_GENHTML_OPTIONS ?=
+CODE_COVERAGE_IGNORE_PATTERN ?=
+
+code_coverage_quiet = $(code_coverage_quiet_$(V))
+code_coverage_quiet_ = $(code_coverage_quiet_$(AM_DEFAULT_VERBOSITY))
+code_coverage_quiet_0 = --quiet
+
+# Use recursive makes in order to ignore errors during check
+check-code-coverage:
+ifdef CODE_COVERAGE_ENABLED
+	-$(MAKE) $(AM_MAKEFLAGS) -k check
+	$(MAKE) $(AM_MAKEFLAGS) code-coverage-capture
+else
+	@echo "Need to reconfigure with --enable-code-coverage"
+endif
+
+# Capture code coverage data
+code-coverage-capture: code-coverage-capture-hook
+ifdef CODE_COVERAGE_ENABLED
+	$(LCOV) $(code_coverage_quiet) --directory $(CODE_COVERAGE_DIRECTORY) --capture --output-file "$(CODE_COVERAGE_OUTPUT_FILE).tmp" --test-name "$(PACKAGE_NAME)-$(PACKAGE_VERSION)" --no-checksum --compat-libtool $(CODE_COVERAGE_LCOV_OPTIONS)
+	$(LCOV) $(code_coverage_quiet) --directory $(CODE_COVERAGE_DIRECTORY) --remove "$(CODE_COVERAGE_OUTPUT_FILE).tmp" "/tmp/*" $(CODE_COVERAGE_IGNORE_PATTERN) --output-file "$(CODE_COVERAGE_OUTPUT_FILE)"
+	-@rm -f $(CODE_COVERAGE_OUTPUT_FILE).tmp
+	LANG=C $(GENHTML) $(code_coverage_quiet) --prefix $(CODE_COVERAGE_DIRECTORY) --output-directory "$(CODE_COVERAGE_OUTPUT_DIRECTORY)" --title "$(PACKAGE_NAME)-$(PACKAGE_VERSION) Code Coverage" --legend --show-details "$(CODE_COVERAGE_OUTPUT_FILE)" $(CODE_COVERAGE_GENHTML_OPTIONS)
+	@echo "file://$(abs_builddir)/$(CODE_COVERAGE_OUTPUT_DIRECTORY)/index.html"
+else
+	@echo "Need to reconfigure with --enable-code-coverage"
+endif
+
+# Hook rule executed before code-coverage-capture, overridable by the user
+code-coverage-capture-hook:
+
+clean: code-coverage-clean
+code-coverage-clean:
+	-$(LCOV) --directory $(top_builddir) -z
+	-rm -rf $(CODE_COVERAGE_OUTPUT_FILE) $(CODE_COVERAGE_OUTPUT_FILE).tmp $(CODE_COVERAGE_OUTPUT_DIRECTORY)
+	-find . -name "*.gcda" -o -name "*.gcov" -delete
+
+GITIGNOREFILES ?=
+GITIGNOREFILES += $(CODE_COVERAGE_OUTPUT_FILE) $(CODE_COVERAGE_OUTPUT_DIRECTORY)
+
+DISTCHECK_CONFIGURE_FLAGS ?=
+DISTCHECK_CONFIGURE_FLAGS += --disable-code-coverage
+
+.PHONY: check-code-coverage code-coverage-capture code-coverage-capture-hook code-coverage-clean
+'
+
+	AC_SUBST([GNOME_CODE_COVERAGE_RULES])
+	m4_ifdef([_AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE([GNOME_CODE_COVERAGE_RULES])])
+])
diff --git a/man/Makefile.in b/man/Makefile.in
index 9341c456..03bd709e 100644
--- a/man/Makefile.in
+++ b/man/Makefile.in
@@ -58,16 +58,18 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
 	$(srcdir)/nmcli.1.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/compiler_warnings.m4 \
-	$(top_srcdir)/m4/gettext.m4 $(top_srcdir)/m4/gtk-doc.m4 \
-	$(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/intlmacosx.m4 \
-	$(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/introspection.m4 \
-	$(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \
-	$(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/libnl-check.m4 \
-	$(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \
-	$(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
-	$(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/nls.m4 \
-	$(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/progtest.m4 \
-	$(top_srcdir)/m4/vapigen.m4 $(top_srcdir)/configure.ac
+	$(top_srcdir)/m4/gettext.m4 \
+	$(top_srcdir)/m4/gnome-code-coverage.m4 \
+	$(top_srcdir)/m4/gtk-doc.m4 $(top_srcdir)/m4/iconv.m4 \
+	$(top_srcdir)/m4/intlmacosx.m4 $(top_srcdir)/m4/intltool.m4 \
+	$(top_srcdir)/m4/introspection.m4 $(top_srcdir)/m4/lib-ld.m4 \
+	$(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \
+	$(top_srcdir)/m4/libnl-check.m4 $(top_srcdir)/m4/libtool.m4 \
+	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
+	$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
+	$(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/po.m4 \
+	$(top_srcdir)/m4/progtest.m4 $(top_srcdir)/m4/vapigen.m4 \
+	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(install_sh) -d
@@ -135,6 +137,10 @@ AWK = @AWK@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
+CKDB_PATH = @CKDB_PATH@
+CODE_COVERAGE_CFLAGS = @CODE_COVERAGE_CFLAGS@
+CODE_COVERAGE_ENABLED = @CODE_COVERAGE_ENABLED@
+CODE_COVERAGE_LDFLAGS = @CODE_COVERAGE_LDFLAGS@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CXX = @CXX@
@@ -149,9 +155,7 @@ DBUS_SYS_DIR = @DBUS_SYS_DIR@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
 DHCLIENT_PATH = @DHCLIENT_PATH@
-DHCLIENT_VERSION = @DHCLIENT_VERSION@
 DHCPCD_PATH = @DHCPCD_PATH@
-DISABLE_DEPRECATED = @DISABLE_DEPRECATED@
 DLLTOOL = @DLLTOOL@
 DSYMUTIL = @DSYMUTIL@
 DUMPBIN = @DUMPBIN@
@@ -161,17 +165,14 @@ ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
 FGREP = @FGREP@
+GENHTML = @GENHTML@
 GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
 GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
-GIO_CFLAGS = @GIO_CFLAGS@
-GIO_LIBS = @GIO_LIBS@
 GLIB_CFLAGS = @GLIB_CFLAGS@
 GLIB_GENMARSHAL = @GLIB_GENMARSHAL@
 GLIB_LIBS = @GLIB_LIBS@
 GLIB_MAKEFILE = @GLIB_MAKEFILE@
 GLIB_MKENUMS = @GLIB_MKENUMS@
-GMODULE_CFLAGS = @GMODULE_CFLAGS@
-GMODULE_LIBS = @GMODULE_LIBS@
 GMSGFMT = @GMSGFMT@
 GMSGFMT_015 = @GMSGFMT_015@
 GNUTLS_CFLAGS = @GNUTLS_CFLAGS@
@@ -212,6 +213,7 @@ IPTABLES_PATH = @IPTABLES_PATH@
 IWMX_SDK_CFLAGS = @IWMX_SDK_CFLAGS@
 IWMX_SDK_LIBS = @IWMX_SDK_LIBS@
 KERNEL_FIRMWARE_DIR = @KERNEL_FIRMWARE_DIR@
+LCOV = @LCOV@
 LD = @LD@
 LDFLAGS = @LDFLAGS@
 LIBDL = @LIBDL@
@@ -228,11 +230,7 @@ LIBNL2_LIBS = @LIBNL2_LIBS@
 LIBNL3_CFLAGS = @LIBNL3_CFLAGS@
 LIBNL3_LIBS = @LIBNL3_LIBS@
 LIBNL_CFLAGS = @LIBNL_CFLAGS@
-LIBNL_GENL3_CFLAGS = @LIBNL_GENL3_CFLAGS@
-LIBNL_GENL3_LIBS = @LIBNL_GENL3_LIBS@
 LIBNL_LIBS = @LIBNL_LIBS@
-LIBNL_ROUTE3_CFLAGS = @LIBNL_ROUTE3_CFLAGS@
-LIBNL_ROUTE3_LIBS = @LIBNL_ROUTE3_LIBS@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
 LIBSOUP_CFLAGS = @LIBSOUP_CFLAGS@
@@ -247,6 +245,8 @@ MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MANIFEST_TOOL = @MANIFEST_TOOL@
 MKDIR_P = @MKDIR_P@
+MM_GLIB_CFLAGS = @MM_GLIB_CFLAGS@
+MM_GLIB_LIBS = @MM_GLIB_LIBS@
 MOC = @MOC@
 MSGFMT = @MSGFMT@
 MSGFMT_015 = @MSGFMT_015@
@@ -256,6 +256,7 @@ NMEDIT = @NMEDIT@
 NM_MAJOR_VERSION = @NM_MAJOR_VERSION@
 NM_MICRO_VERSION = @NM_MICRO_VERSION@
 NM_MINOR_VERSION = @NM_MINOR_VERSION@
+NM_MODIFY_SYSTEM_POLICY = @NM_MODIFY_SYSTEM_POLICY@
 NM_VERSION = @NM_VERSION@
 NSS_CFLAGS = @NSS_CFLAGS@
 NSS_LIBS = @NSS_LIBS@
@@ -282,13 +283,14 @@ PPPD_PLUGIN_DIR = @PPPD_PLUGIN_DIR@
 QT_CFLAGS = @QT_CFLAGS@
 QT_LIBS = @QT_LIBS@
 RANLIB = @RANLIB@
-RESOLVCONF_PATH = @RESOLVCONF_PATH@
 SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
-SYSTEMD_CFLAGS = @SYSTEMD_CFLAGS@
-SYSTEMD_LIBS = @SYSTEMD_LIBS@
+SYSTEMD_INHIBIT_CFLAGS = @SYSTEMD_INHIBIT_CFLAGS@
+SYSTEMD_INHIBIT_LIBS = @SYSTEMD_INHIBIT_LIBS@
+SYSTEMD_LOGIN_CFLAGS = @SYSTEMD_LOGIN_CFLAGS@
+SYSTEMD_LOGIN_LIBS = @SYSTEMD_LOGIN_LIBS@
 SYSTEM_CA_PATH = @SYSTEM_CA_PATH@
 UDEV_BASE_DIR = @UDEV_BASE_DIR@
 USE_NLS = @USE_NLS@
@@ -343,6 +345,11 @@ localedir = @localedir@
 localstatedir = @localstatedir@
 mandir = @mandir@
 mkdir_p = @mkdir_p@
+nmbinary = @nmbinary@
+nmconfdir = @nmconfdir@
+nmdatadir = @nmdatadir@
+nmrundir = @nmrundir@
+nmstatedir = @nmstatedir@
 oldincludedir = @oldincludedir@
 pdfdir = @pdfdir@
 prefix = @prefix@
@@ -357,6 +364,10 @@ target_alias = @target_alias@
 top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
+with_dhclient = @with_dhclient@
+with_dhcpcd = @with_dhcpcd@
+with_netconfig = @with_netconfig@
+with_resolvconf = @with_resolvconf@
 man_MANS = \
 	NetworkManager.8		\
 	NetworkManager.conf.5		\
diff --git a/man/NetworkManager.conf.5 b/man/NetworkManager.conf.5
index 84b4d751..f9588080 100644
--- a/man/NetworkManager.conf.5
+++ b/man/NetworkManager.conf.5
@@ -1,8 +1,8 @@
 .\" NetworkManager.conf(5) manual page
 .\"
-.\" Copyright (C) 2010 - 2011 Red Hat, Inc.
+.\" Copyright (C) 2010 - 2012 Red Hat, Inc.
 .\"
-.TH "NetworkManager.conf" "5" "2 August 2011" ""
+.TH "NetworkManager.conf" "5" "18 December 2012" ""
 .SH NAME
 NetworkManager.conf \- NetworkManager configuration file
 .SH SYNOPSIS
@@ -157,12 +157,25 @@ from earlier levels; thus setting the log level to INFO also logs error and
 warning messages.
 .TP
 .B domains=\fI,, ...\fP
-The following log domains are available: [NONE, HW, RFKILL, ETHER, WIFI, BT, MB,
-DHCP4, DHCP6, PPP, WIFI_SCAN, IP4, IP6, AUTOIP4, DNS, VPN, SHARING, SUPPLICANT,
-AGENTS, SETTINGS, SUSPEND, CORE, DEVICE, OLPC, WIMAX].  When "NONE" is given by
-itself, logging is disabled.
+The following log domains are available: [HW, RFKILL, ETHER, WIFI, BT, MB, DHCP4,
+DHCP6, PPP, WIFI_SCAN, IP4, IP6, AUTOIP4, DNS, VPN, SHARING, SUPPLICANT, AGENTS,
+SETTINGS, SUSPEND, CORE, DEVICE, OLPC, WIMAX, INFINIBAND, FIREWALL, ADSL, BOND,
+VLAN].
+.br
+In addition to them, these special domains can be used: [NONE, ALL, DEFAULT, DHCP, IP].
 .PP
 .RS
+NONE = when given by itself, logging is disabled
+.br
+ALL = all log domains will be switched on
+.br
+DEFAULT = default log domains
+.br
+DHCP = a shortcut for "DHCP4, DHCP6"
+.br
+IP = a shortcut for "IP4, IP6"
+.br
+.PP
 HW = Hardware related operations
 .br
 RFKILL = RFKill subsystem operations
@@ -211,6 +224,16 @@ OLPC = OLPC Mesh device operations
 .br
 WIMAX = Wimax device operations
 .br
+INFINIBAND = InfiniBand device operations
+.br
+FIREWALL = FirewallD related operations
+.br
+ADSL = ADSL device operations
+.br
+BOND = Bonding device operations
+.br
+VLAN = VLAN device operations
+.br
 .SS [connectivity]
 This section controls NetworkManager's optional connectivity checking
 functionality.  This allows NetworkManager to detect whether or not the system
diff --git a/man/NetworkManager.conf.5.in b/man/NetworkManager.conf.5.in
index 84b4d751..f9588080 100644
--- a/man/NetworkManager.conf.5.in
+++ b/man/NetworkManager.conf.5.in
@@ -1,8 +1,8 @@
 .\" NetworkManager.conf(5) manual page
 .\"
-.\" Copyright (C) 2010 - 2011 Red Hat, Inc.
+.\" Copyright (C) 2010 - 2012 Red Hat, Inc.
 .\"
-.TH "NetworkManager.conf" "5" "2 August 2011" ""
+.TH "NetworkManager.conf" "5" "18 December 2012" ""
 .SH NAME
 NetworkManager.conf \- NetworkManager configuration file
 .SH SYNOPSIS
@@ -157,12 +157,25 @@ from earlier levels; thus setting the log level to INFO also logs error and
 warning messages.
 .TP
 .B domains=\fI,, ...\fP
-The following log domains are available: [NONE, HW, RFKILL, ETHER, WIFI, BT, MB,
-DHCP4, DHCP6, PPP, WIFI_SCAN, IP4, IP6, AUTOIP4, DNS, VPN, SHARING, SUPPLICANT,
-AGENTS, SETTINGS, SUSPEND, CORE, DEVICE, OLPC, WIMAX].  When "NONE" is given by
-itself, logging is disabled.
+The following log domains are available: [HW, RFKILL, ETHER, WIFI, BT, MB, DHCP4,
+DHCP6, PPP, WIFI_SCAN, IP4, IP6, AUTOIP4, DNS, VPN, SHARING, SUPPLICANT, AGENTS,
+SETTINGS, SUSPEND, CORE, DEVICE, OLPC, WIMAX, INFINIBAND, FIREWALL, ADSL, BOND,
+VLAN].
+.br
+In addition to them, these special domains can be used: [NONE, ALL, DEFAULT, DHCP, IP].
 .PP
 .RS
+NONE = when given by itself, logging is disabled
+.br
+ALL = all log domains will be switched on
+.br
+DEFAULT = default log domains
+.br
+DHCP = a shortcut for "DHCP4, DHCP6"
+.br
+IP = a shortcut for "IP4, IP6"
+.br
+.PP
 HW = Hardware related operations
 .br
 RFKILL = RFKill subsystem operations
@@ -211,6 +224,16 @@ OLPC = OLPC Mesh device operations
 .br
 WIMAX = Wimax device operations
 .br
+INFINIBAND = InfiniBand device operations
+.br
+FIREWALL = FirewallD related operations
+.br
+ADSL = ADSL device operations
+.br
+BOND = Bonding device operations
+.br
+VLAN = VLAN device operations
+.br
 .SS [connectivity]
 This section controls NetworkManager's optional connectivity checking
 functionality.  This allows NetworkManager to detect whether or not the system
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 71a07aa6..9f261d0b 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -12,7 +12,7 @@ libnm-util/crypto.c
 libnm-util/crypto_gnutls.c
 libnm-util/crypto_nss.c
 libnm-util/nm-utils.c
-policy/org.freedesktop.NetworkManager.policy.in
+policy/org.freedesktop.NetworkManager.policy.in.in
 src/main.c
 src/dhcp-manager/nm-dhcp-dhclient.c
 src/dhcp-manager/nm-dhcp-dhclient-utils.c
@@ -21,8 +21,10 @@ src/dns-manager/nm-dns-manager.c
 src/logging/nm-logging.c
 src/modem-manager/nm-modem-cdma.c
 src/modem-manager/nm-modem-gsm.c
+src/modem-manager/nm-modem-broadband.c
 src/nm-device-bond.c
 src/nm-device-adsl.c
+src/nm-device-bridge.c
 src/nm-device-bt.c
 src/nm-device-ethernet.c
 src/nm-device-infiniband.c
diff --git a/po/POTFILES.skip b/po/POTFILES.skip
index e57048b3..94a9c862 100644
--- a/po/POTFILES.skip
+++ b/po/POTFILES.skip
@@ -1,5 +1,6 @@
 examples/python/NetworkManager.py
 examples/python/systray/eggtrayicon.c
+policy/org.freedesktop.NetworkManager.policy.in
 vpn-daemons/openvpn
 vpn-daemons/pptp
 vpn-daemons/vpnc
diff --git a/po/as.po b/po/as.po
index 78a2cd3a..66cf5842 100644
--- a/po/as.po
+++ b/po/as.po
@@ -1,967 +1,1642 @@
-# translation of NetworkManager.po.master.as.po to Assamese
-# Assamese translation of NetworkManager.
-# Copyright (C) 2009 NetworkManager's COPYRIGHT HOLDER
-# This file is distributed under the same license as the NetworkManager package.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
 #
-# Amitakhya Phukan , 2009, 2010.
-# Amitakhya Phukan , 2010.
+# Nilamdyuti Goswami , 2012.
 msgid ""
 msgstr ""
-"Project-Id-Version: NetworkManager.po.master.as\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-05-06 14:31+0530\n"
-"PO-Revision-Date: 2010-05-07 16:47+0530\n"
-"Last-Translator: Amitakhya Phukan \n"
-"Language-Team: American English \n"
+"Project-Id-Version: \n"
+"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug."
+"cgi?product=NetworkManager&keywords=I18N+L10N&component=general\n"
+"POT-Creation-Date: 2012-09-14 03:26+0000\n"
+"PO-Revision-Date: 2012-09-14 17:35+0530\n"
+"Last-Translator: Nilamdyuti Goswami \n"
+"Language-Team: as_IN \n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: Lokalize 1.0\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/common.c:32 ../cli/src/common.c:44 ../cli/src/common.c:52
+#: ../cli/src/common.c:63 ../cli/src/connections.c:128
+#: ../cli/src/connections.c:162
+msgid "GROUP"
+msgstr "GROUP"
+
+#. 0
+#: ../cli/src/common.c:33 ../cli/src/common.c:53
+msgid "ADDRESS"
+msgstr "ADDRESS"
+
+#. 1
+#: ../cli/src/common.c:34 ../cli/src/common.c:54
+msgid "ROUTE"
+msgstr "ROUTE"
+
+#. 2
+#: ../cli/src/common.c:35 ../cli/src/common.c:55
+msgid "DNS"
+msgstr "DNS"
+
+#. 3
+#: ../cli/src/common.c:36 ../cli/src/common.c:56
+msgid "DOMAIN"
+msgstr "DOMAIN"
+
+#. 4
+#: ../cli/src/common.c:37
+msgid "WINS"
+msgstr "WINS"
+
+#. 0
+#: ../cli/src/common.c:45 ../cli/src/common.c:64
+msgid "OPTION"
+msgstr "OPTION"
+
+#: ../cli/src/common.c:366
+msgid "unmanaged"
+msgstr "অব্যৱস্থাপিত"
+
+#: ../cli/src/common.c:368
+msgid "unavailable"
+msgstr "উপলব্ধ নাই"
+
+#: ../cli/src/common.c:370 ../cli/src/network-manager.c:120
+msgid "disconnected"
+msgstr "বিচ্ছিন্নিত"
+
+#: ../cli/src/common.c:372
+msgid "connecting (prepare)"
+msgstr "সংযোগ কৰা হৈছে (প্ৰস্তুত হওক)"
+
+#: ../cli/src/common.c:374
+msgid "connecting (configuring)"
+msgstr "সংযোগ কৰা (সংৰূপণ কৰা)"
+
+#: ../cli/src/common.c:376
+msgid "connecting (need authentication)"
+msgstr "সংযোগ কৰা (প্ৰমাণীকৰণৰ প্ৰয়োজন)"
+
+#: ../cli/src/common.c:378
+msgid "connecting (getting IP configuration)"
+msgstr "সংযোগ কৰা (IP সংৰূপ প্ৰাপ্ত কৰা)"
+
+#: ../cli/src/common.c:380
+msgid "connecting (checking IP connectivity)"
+msgstr "সংযোগ কৰা (IP সংযোগ নীৰিক্ষণ কৰা)"
+
+#: ../cli/src/common.c:382
+msgid "connecting (starting secondary connections)"
+msgstr "সংযোগ কৰা (দ্বিতীয় সংযোগসমূহ আৰম্ভ কৰা)"
+
+#: ../cli/src/common.c:384 ../cli/src/network-manager.c:116
+msgid "connected"
+msgstr "সংযুক্ত"
+
+#: ../cli/src/common.c:386 ../cli/src/connections.c:633
+msgid "deactivating"
+msgstr "নিষ্ক্ৰিয় কৰা হৈছে"
+
+#: ../cli/src/common.c:388
+msgid "connection failed"
+msgstr "সংযোগ ব্যৰ্থ"
+
+#: ../cli/src/common.c:390 ../cli/src/connections.c:636
+#: ../cli/src/connections.c:659 ../cli/src/connections.c:1351
+#: ../cli/src/devices.c:622 ../cli/src/network-manager.c:123
+#: ../cli/src/network-manager.c:185 ../cli/src/network-manager.c:188
+#: ../cli/src/network-manager.c:197 ../cli/src/network-manager.c:257
+#: ../cli/src/network-manager.c:273 ../cli/src/network-manager.c:431
+#: ../cli/src/network-manager.c:486 ../cli/src/network-manager.c:524
+#: ../cli/src/network-manager.c:563 ../cli/src/settings.c:591
+#: ../cli/src/settings.c:619 ../cli/src/utils.c:531 ../src/main.c:462
+#: ../src/main.c:481
+msgid "unknown"
+msgstr "অজ্ঞাত"
+
+#: ../cli/src/common.c:399
+msgid "No reason given"
+msgstr "কোনো কাৰণ দিয়া হোৱা নাই"
+
+#: ../cli/src/common.c:402
+msgid "Unknown error"
+msgstr "অজ্ঞাত ত্ৰুটি"
+
+#: ../cli/src/common.c:405
+msgid "Device is now managed"
+msgstr "ডিভাইচ এতিয়া ব্যৱস্থাপিত"
+
+#: ../cli/src/common.c:408
+msgid "Device is now unmanaged"
+msgstr "ডিভাইচ এতিয়া ব্যৱস্থাপিত নহয়"
+
+#: ../cli/src/common.c:411
+msgid "The device could not be readied for configuration"
+msgstr "ডিভাইচক সংৰূপণৰ বাবে পঢ়িব নোৱাৰি"
+
+#: ../cli/src/common.c:414
+msgid ""
+"IP configuration could not be reserved (no available address, timeout, etc.)"
+msgstr "IP সংৰূপ সংৰক্ষণ কৰিব নোৱাৰি (কোনো ঠিকনা, সময়অন্ত, ইত্যাদী উপলব্ধ নাই)"
+
+#: ../cli/src/common.c:417
+msgid "The IP configuration is no longer valid"
+msgstr "IP সংৰূপ আৰু বৈধ নহয়"
+
+#: ../cli/src/common.c:420
+msgid "Secrets were required, but not provided"
+msgstr "গোপনসমূহৰ প্ৰয়োজন আছিল, কিন্তু প্ৰদান কৰা হোৱা নাছিল"
+
+#: ../cli/src/common.c:423
+msgid "802.1X supplicant disconnected"
+msgstr "802.1X চাপ্লিকেণ্ট বিচ্ছিন্নিত"
+
+#: ../cli/src/common.c:426
+msgid "802.1X supplicant configuration failed"
+msgstr "802.1X চাপ্লিকেণ্ট সংৰূপ ব্যৰ্থ হল"
+
+#: ../cli/src/common.c:429
+msgid "802.1X supplicant failed"
+msgstr "802.1X চাপ্লিকেণ্ট ব্যৰ্থ হল"
+
+#: ../cli/src/common.c:432
+msgid "802.1X supplicant took too long to authenticate"
+msgstr "802.1X চাপ্লিকেণ্ট প্ৰমাণীত হবলে বহু সময় ললে"
+
+#: ../cli/src/common.c:435
+msgid "PPP service failed to start"
+msgstr "PPP সেৱা আৰম্ভ হবলে ব্যৰ্থ হল"
+
+#: ../cli/src/common.c:438
+msgid "PPP service disconnected"
+msgstr "PPP সেৱা বিচ্ছিন্নিত হল"
+
+#: ../cli/src/common.c:441
+msgid "PPP failed"
+msgstr "PPP ব্যৰ্থ হল"
+
+#: ../cli/src/common.c:444
+msgid "DHCP client failed to start"
+msgstr "DHCP ক্লাএন্ট আৰম্ভ হবলে ব্যৰ্থ হল"
+
+#: ../cli/src/common.c:447
+msgid "DHCP client error"
+msgstr "DHCP ক্লাএন্ট ত্ৰুটি"
+
+#: ../cli/src/common.c:450
+msgid "DHCP client failed"
+msgstr "DHCP ক্লাএন্ট ব্যৰ্থ হল"
+
+#: ../cli/src/common.c:453
+msgid "Shared connection service failed to start"
+msgstr "অংশীদাৰী সংযোগ সেৱা আৰম্ভ হবলে ব্যৰ্থ হল"
+
+#: ../cli/src/common.c:456
+msgid "Shared connection service failed"
+msgstr "অংশীদাৰী সংযোগ সেৱা ব্যৰ্থ হল"
+
+#: ../cli/src/common.c:459
+msgid "AutoIP service failed to start"
+msgstr "AutoIP সেৱা আৰম্ভ হবলে ব্যৰ্থ হল"
+
+#: ../cli/src/common.c:462
+msgid "AutoIP service error"
+msgstr "AutoIP সেৱা ত্ৰুটি"
+
+#: ../cli/src/common.c:465
+msgid "AutoIP service failed"
+msgstr "AutoIP সেৱা ব্যৰ্থ হল"
+
+#: ../cli/src/common.c:468
+msgid "The line is busy"
+msgstr "শাৰী ব্যস্থ"
+
+#: ../cli/src/common.c:471
+msgid "No dial tone"
+msgstr "কোনো ডায়েল শব্দ নাই"
+
+#: ../cli/src/common.c:474
+msgid "No carrier could be established"
+msgstr "কোনো বাহক স্থাপন কৰিব পৰা নগল"
+
+#: ../cli/src/common.c:477
+msgid "The dialing request timed out"
+msgstr "ডায়লিং অনুৰোধৰ সময় অন্ত হল"
+
+#: ../cli/src/common.c:480
+msgid "The dialing attempt failed"
+msgstr "ডায়লিং চেষ্টা ব্যৰ্থ হল"
+
+#: ../cli/src/common.c:483
+msgid "Modem initialization failed"
+msgstr "মডেম আৰম্ভকৰণ ব্যৰ্থ হল"
+
+#: ../cli/src/common.c:486
+msgid "Failed to select the specified APN"
+msgstr "ধাৰ্য্যত APN নিৰ্বাচন কৰিবলে ব্যৰ্থ"
+
+#: ../cli/src/common.c:489
+msgid "Not searching for networks"
+msgstr "নেটৱাৰ্কসমূহ সন্ধান কৰা হোৱা নাই"
+
+#: ../cli/src/common.c:492
+msgid "Network registration denied"
+msgstr "নেটৱাৰ্ক ৰেজিষ্ট্ৰেষণ নাকচ কৰা হৈছে"
+
+#: ../cli/src/common.c:495
+msgid "Network registration timed out"
+msgstr "নেটৱাৰ্ক ৰেজিষ্ট্ৰেষণৰ সময় অন্ত হল"
+
+#: ../cli/src/common.c:498
+msgid "Failed to register with the requested network"
+msgstr "অনুৰোধ কৰা নেটৱাৰ্কৰ সৈতে ৰেজিস্টাৰ কৰিবলে ব্যৰ্থ হল"
+
+#: ../cli/src/common.c:501
+msgid "PIN check failed"
+msgstr "PIN নীৰিক্ষণ ব্যৰ্থ হল"
+
+#: ../cli/src/common.c:504
+msgid "Necessary firmware for the device may be missing"
+msgstr "ডিভাইচৰ বাবে প্ৰয়োজনীয় ফাৰ্মৱেৰ সন্ধানহিন হব পাৰে"
+
+#: ../cli/src/common.c:507
+msgid "The device was removed"
+msgstr "ডিভাইচ আতৰোৱা হৈছিল"
+
+#: ../cli/src/common.c:510
+msgid "NetworkManager went to sleep"
+msgstr "NetworkManager টোপনি গল"
+
+#: ../cli/src/common.c:513
+msgid "The device's active connection disappeared"
+msgstr "ডিভাইচৰ সক্ৰিয় সংযোগ অদৃশ্য হল"
+
+#: ../cli/src/common.c:516
+msgid "Device disconnected by user or client"
+msgstr "ডিভাইচ ব্যৱহাৰকাৰী অথবা ক্লাএন্ট দ্বাৰা বিচ্ছিন্ন কৰা হল"
+
+#: ../cli/src/common.c:519
+msgid "Carrier/link changed"
+msgstr "বাহক/সংযোগ পৰিৱৰ্তন হল"
+
+#: ../cli/src/common.c:522
+msgid "The device's existing connection was assumed"
+msgstr "ডিভাইচৰ স্থায়ী সংযোগ ধাৰণা কৰা হৈছিল"
+
+#: ../cli/src/common.c:525
+msgid "The supplicant is now available"
+msgstr "চাপ্লিকেন্ট এতিয়া উপলব্ধ"
+
+#: ../cli/src/common.c:528
+msgid "The modem could not be found"
+msgstr "মডেম পোৱা নগল"
+
+#: ../cli/src/common.c:531
+msgid "The Bluetooth connection failed or timed out"
+msgstr "ব্লুটুথ সংযোগ ব্যৰ্থ হল অথবা সময়অন্ত হল"
+
+#: ../cli/src/common.c:534
+msgid "GSM Modem's SIM card not inserted"
+msgstr "GSM মডেমৰ SIM কাৰ্ড সুমুৱা হোৱা নাই"
+
+#: ../cli/src/common.c:537
+msgid "GSM Modem's SIM PIN required"
+msgstr "GSM মডেমৰ SIM PIN ৰ প্ৰয়োজন"
+
+#: ../cli/src/common.c:540
+msgid "GSM Modem's SIM PUK required"
+msgstr "GSM মডেমৰ SIM PUK ৰ প্ৰয়োজন"
+
+#: ../cli/src/common.c:543
+msgid "GSM Modem's SIM wrong"
+msgstr "GSM মডেমৰ SIM ভূল"
+
+#: ../cli/src/common.c:546
+msgid "InfiniBand device does not support connected mode"
+msgstr "InfiniBand ডিভাইচে সংযুক্ত অৱস্থা সমৰ্থন নকৰে"
+
+#: ../cli/src/common.c:549
+msgid "A dependency of the connection failed"
+msgstr "সংযোগৰ এটা নিৰ্ভৰতা ব্যৰ্থ হল"
+
+#: ../cli/src/common.c:552
+msgid "A problem with the RFC 2684 Ethernet over ADSL bridge"
+msgstr "ADSL ব্ৰিজৰে RFC 2684 ইথাৰনেটৰ সৈতে এটা সমস্যা"
+
+#: ../cli/src/common.c:555
+msgid "ModemManager is unavailable"
+msgstr "ModemManager উপলব্ধ নাই"
+
+#: ../cli/src/common.c:558 ../cli/src/devices.c:274 ../cli/src/devices.c:290
+#: ../cli/src/devices.c:410 ../cli/src/devices.c:454
+msgid "Unknown"
+msgstr "অজ্ঞাত"
+
+#. 0
+#. used only for 'GENERAL' group listing
+#: ../cli/src/connections.c:59 ../cli/src/connections.c:129
+#: ../cli/src/devices.c:105 ../cli/src/devices.c:129 ../cli/src/devices.c:139
+#: ../cli/src/devices.c:149 ../cli/src/devices.c:163 ../cli/src/devices.c:177
+#: ../cli/src/devices.c:199
 msgid "NAME"
-msgstr "নাম"
+msgstr "NAME"
 
 #. 0
-#: ../cli/src/connections.c:60 ../cli/src/connections.c:75
+#. 1
+#: ../cli/src/connections.c:60 ../cli/src/connections.c:130
 msgid "UUID"
 msgstr "UUID"
 
 #. 1
-#: ../cli/src/connections.c:61
-msgid "DEVICES"
-msgstr "যন্ত্ৰ"
+#. 0
+#. 1
+#. 2
+#: ../cli/src/connections.c:61 ../cli/src/connections.c:163
+#: ../cli/src/devices.c:71 ../cli/src/devices.c:107 ../cli/src/devices.c:202
+msgid "TYPE"
+msgstr "TYPE"
 
 #. 2
-#: ../cli/src/connections.c:62 ../cli/src/connections.c:77
-msgid "SCOPE"
-msgstr "স্ক'প"
+#: ../cli/src/connections.c:62
+msgid "TIMESTAMP"
+msgstr "TIMESTAMP"
 
 #. 3
 #: ../cli/src/connections.c:63
-msgid "DEFAULT"
-msgstr "অবিকল্পিত"
+msgid "TIMESTAMP-REAL"
+msgstr "TIMESTAMP-REAL"
 
 #. 4
-#: ../cli/src/connections.c:64
-msgid "DBUS-SERVICE"
-msgstr "DBUS সেৱা"
+#. 13
+#: ../cli/src/connections.c:64 ../cli/src/devices.c:119
+msgid "AUTOCONNECT"
+msgstr "AUTOCONNECT"
 
 #. 5
 #: ../cli/src/connections.c:65
+msgid "READONLY"
+msgstr "READONLY"
+
+#. 6
+#. 8
+#. 2
+#. 11
+#. 5
+#: ../cli/src/connections.c:66 ../cli/src/connections.c:137
+#: ../cli/src/devices.c:73 ../cli/src/devices.c:189 ../cli/src/devices.c:205
+msgid "DBUS-PATH"
+msgstr "DBUS-PATH"
+
+#. 2
+#: ../cli/src/connections.c:131
+msgid "DEVICES"
+msgstr "DEVICES"
+
+#. 3
+#. 1
+#. 8
+#. 1
+#: ../cli/src/connections.c:132 ../cli/src/devices.c:72
+#: ../cli/src/devices.c:114 ../cli/src/network-manager.c:39
+msgid "STATE"
+msgstr "STATE"
+
+#. 4
+#: ../cli/src/connections.c:133
+msgid "DEFAULT"
+msgstr "DEFAULT"
+
+#. 5
+#: ../cli/src/connections.c:134
+msgid "DEFAULT6"
+msgstr "DEFAULT6"
+
+#. 6
+#: ../cli/src/connections.c:135
 msgid "SPEC-OBJECT"
 msgstr "SPEC-OBJECT"
 
-#. 6
-#: ../cli/src/connections.c:66
+#. 7
+#. 1
+#: ../cli/src/connections.c:136 ../cli/src/connections.c:150
 msgid "VPN"
 msgstr "VPN"
 
-#. 1
+#. 9
+#: ../cli/src/connections.c:138
+msgid "CON-PATH"
+msgstr "CON-PATH"
+
+#. 10
+#: ../cli/src/connections.c:139
+msgid "ZONE"
+msgstr "ZONE"
+
+#. 11
+#: ../cli/src/connections.c:140
+msgid "MASTER-PATH"
+msgstr "MASTER-PATH"
+
+#: ../cli/src/connections.c:148 ../cli/src/devices.c:82
+msgid "GENERAL"
+msgstr "GENERAL"
+
 #. 0
+#: ../cli/src/connections.c:149
+msgid "IP"
+msgstr "IP"
+
 #. 1
-#: ../cli/src/connections.c:76 ../cli/src/devices.c:61 ../cli/src/devices.c:87
-msgid "TYPE"
-msgstr "ধৰণ"
+#: ../cli/src/connections.c:164
+msgid "USERNAME"
+msgstr "USERNAME"
+
+#. 2
+#: ../cli/src/connections.c:165
+msgid "GATEWAY"
+msgstr "GATEWAY"
 
 #. 3
-#: ../cli/src/connections.c:78
-msgid "TIMESTAMP"
-msgstr "সময়ৰ চাপ"
+#: ../cli/src/connections.c:166
+msgid "BANNER"
+msgstr "BANNER"
 
 #. 4
-#: ../cli/src/connections.c:79
-msgid "TIMESTAMP-REAL"
-msgstr "সময়ৰ চাপ - ৰিয়েল"
+#: ../cli/src/connections.c:167
+msgid "VPN-STATE"
+msgstr "VPN-STATE"
 
 #. 5
-#: ../cli/src/connections.c:80
-msgid "AUTOCONNECT"
-msgstr "স্বয়ংক্ৰিয় সংযোগ"
-
-#. 6
-#: ../cli/src/connections.c:81
-msgid "READONLY"
-msgstr "অকল পঢ়িব পৰা"
+#: ../cli/src/connections.c:168
+msgid "CFG"
+msgstr "CFG"
 
-#: ../cli/src/connections.c:157
+#: ../cli/src/connections.c:190
 #, c-format
 msgid ""
 "Usage: nmcli con { COMMAND | help }\n"
-"  COMMAND := { list | status | up | down }\n"
+"  COMMAND := { list | status | up | down | delete }\n"
 "\n"
-"  list [id  | uuid  | system | user]\n"
-"  status\n"
-"  up id  | uuid  [iface ] [ap ] [--nowait] [--timeout "
+"  list [id  | uuid ]\n"
+"  status [id  | uuid  | path ]\n"
+"  up id  | uuid  [iface ] [ap ] [nsp ] [--"
+"nowait] [--timeout ]\n"
+"  up id  | uuid  [iface ] [ap ] [--nowait] [--timeout "
 "]\n"
 "  down id  | uuid \n"
+"  delete id  | uuid \n"
 msgstr ""
-"ব্যৱহাৰপ্ৰণালী: nmcli con { COMMAND | help }\n"
-"  COMMAND := { list | status | up | down }\n"
+"ব্যৱহাৰ: nmcli con { COMMAND | help }\n"
+"  COMMAND := { list | status | up | down | delete }\n"
 "\n"
-"  list [id  | uuid  | system | user]\n"
-"  status\n"
-"  up id  | uuid  [iface ] [ap ] [--nowait] [--timeout "
+"  list [id  | uuid ]\n"
+"  status [id  | uuid  | path ]\n"
+"  up id  | uuid  [iface ] [ap ] [nsp ] [--"
+"nowait] [--timeout ]\n"
+"  up id  | uuid  [iface ] [ap ] [--nowait] [--timeout "
 "]\n"
 "  down id  | uuid \n"
+"  delete id  | uuid \n"
 
-#: ../cli/src/connections.c:197 ../cli/src/connections.c:536
+#: ../cli/src/connections.c:249 ../cli/src/connections.c:609
 #, c-format
 msgid "Error: 'con list': %s"
-msgstr "ভুল: 'con list': %s"
+msgstr "ত্ৰুটি: 'con list': %s"
 
-#: ../cli/src/connections.c:199 ../cli/src/connections.c:538
+#: ../cli/src/connections.c:251 ../cli/src/connections.c:611
 #, 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:259
 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 "ব্যৱহাৰকৰ্তা"
+msgstr "সংযোগৰ বিৱৰণসমূহ"
 
-#: ../cli/src/connections.c:383
+#: ../cli/src/connections.c:484
 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:485 ../cli/src/connections.c:486
+#: ../cli/src/connections.c:714 ../cli/src/connections.c:715
+#: ../cli/src/connections.c:717 ../cli/src/devices.c:418
+#: ../cli/src/devices.c:471 ../cli/src/devices.c:587 ../cli/src/devices.c:588
+#: ../cli/src/devices.c:589 ../cli/src/devices.c:621 ../cli/src/devices.c:647
+#: ../cli/src/devices.c:648 ../cli/src/devices.c:649 ../cli/src/devices.c:650
+#: ../cli/src/devices.c:651 ../cli/src/network-manager.c:267
+#: ../cli/src/settings.c:700 ../cli/src/settings.c:773
+#: ../cli/src/settings.c:893 ../cli/src/settings.c:1175
+#: ../cli/src/settings.c:1176 ../cli/src/settings.c:1178
+#: ../cli/src/settings.c:1180 ../cli/src/settings.c:1181
+#: ../cli/src/settings.c:1312 ../cli/src/settings.c:1313
+#: ../cli/src/settings.c:1314 ../cli/src/settings.c:1315
+#: ../cli/src/settings.c:1392 ../cli/src/settings.c:1393
+#: ../cli/src/settings.c:1394 ../cli/src/settings.c:1395
+#: ../cli/src/settings.c:1396 ../cli/src/settings.c:1397
+#: ../cli/src/settings.c:1398 ../cli/src/settings.c:1399
+#: ../cli/src/settings.c:1400 ../cli/src/settings.c:1401
+#: ../cli/src/settings.c:1402 ../cli/src/settings.c:1403
+#: ../cli/src/settings.c:1404 ../cli/src/settings.c:1475
 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:485 ../cli/src/connections.c:486
+#: ../cli/src/connections.c:714 ../cli/src/connections.c:715
+#: ../cli/src/connections.c:717 ../cli/src/devices.c:418
+#: ../cli/src/devices.c:471 ../cli/src/devices.c:587 ../cli/src/devices.c:588
+#: ../cli/src/devices.c:589 ../cli/src/devices.c:621 ../cli/src/devices.c:647
+#: ../cli/src/devices.c:648 ../cli/src/devices.c:649 ../cli/src/devices.c:650
+#: ../cli/src/devices.c:651 ../cli/src/network-manager.c:269
+#: ../cli/src/settings.c:700 ../cli/src/settings.c:702
+#: ../cli/src/settings.c:773 ../cli/src/settings.c:893
+#: ../cli/src/settings.c:1175 ../cli/src/settings.c:1176
+#: ../cli/src/settings.c:1178 ../cli/src/settings.c:1180
+#: ../cli/src/settings.c:1181 ../cli/src/settings.c:1312
+#: ../cli/src/settings.c:1313 ../cli/src/settings.c:1314
+#: ../cli/src/settings.c:1315 ../cli/src/settings.c:1392
+#: ../cli/src/settings.c:1393 ../cli/src/settings.c:1394
+#: ../cli/src/settings.c:1395 ../cli/src/settings.c:1396
+#: ../cli/src/settings.c:1397 ../cli/src/settings.c:1398
+#: ../cli/src/settings.c:1399 ../cli/src/settings.c:1400
+#: ../cli/src/settings.c:1401 ../cli/src/settings.c:1402
+#: ../cli/src/settings.c:1403 ../cli/src/settings.c:1404
+#: ../cli/src/settings.c:1475
 msgid "no"
 msgstr "নহয়"
 
-#: ../cli/src/connections.c:457 ../cli/src/connections.c:500
-msgid "System connections"
-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:560
+msgid "Connection list"
+msgstr "সংযোগ তালিকা"
+
+#: ../cli/src/connections.c:573 ../cli/src/connections.c:1110
+#: ../cli/src/connections.c:1648 ../cli/src/connections.c:1663
+#: ../cli/src/connections.c:1672 ../cli/src/connections.c:1682
+#: ../cli/src/connections.c:1694 ../cli/src/connections.c:1802
+#: ../cli/src/connections.c:1904 ../cli/src/devices.c:1041
+#: ../cli/src/devices.c:1051 ../cli/src/devices.c:1169
+#: ../cli/src/devices.c:1177 ../cli/src/devices.c:1541
+#: ../cli/src/devices.c:1548 ../cli/src/devices.c:1562
+#: ../cli/src/devices.c:1569 ../cli/src/devices.c:1586
+#: ../cli/src/devices.c:1597 ../cli/src/devices.c:1818
+#: ../cli/src/devices.c:1825
 #, c-format
 msgid "Error: %s argument is missing."
-msgstr "ত্ৰুটি: %s তৰ্ক অনুপস্থিত ।"
+msgstr "ত্ৰুটি: %s তৰ্ক সন্ধানহিন।"
 
-#: ../cli/src/connections.c:487
+#: ../cli/src/connections.c:586
 #, c-format
 msgid "Error: %s - no such connection."
-msgstr "ত্ৰুটি: %s - এই ধৰণৰ কোনো সংযোগ নাই ।"
+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:592 ../cli/src/connections.c:1707
+#: ../cli/src/connections.c:1819 ../cli/src/connections.c:1911
+#: ../cli/src/devices.c:825 ../cli/src/devices.c:905 ../cli/src/devices.c:1065
+#: ../cli/src/devices.c:1183 ../cli/src/devices.c:1610
+#: ../cli/src/devices.c:1831
 #, c-format
 msgid "Unknown parameter: %s\n"
-msgstr "অজ্ঞাত স্থিতিমাপ: %s\n"
+msgstr "অজ্ঞাত প্ৰাচল: %s\n"
 
-#: ../cli/src/connections.c:528
+#: ../cli/src/connections.c:601
 #, c-format
 msgid "Error: no valid parameter specified."
-msgstr "ত্ৰুটি: বৈধ স্থিতিমাপ উল্লেখ কৰা নাযায় ।"
+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:616 ../cli/src/connections.c:2004
+#: ../cli/src/devices.c:2039 ../cli/src/network-manager.c:596
 #, c-format
 msgid "Error: %s."
-msgstr "ভুল: %s ।"
+msgstr "ত্ৰুটি: %s।"
+
+#: ../cli/src/connections.c:629
+msgid "activating"
+msgstr "সক্ৰিয় কৰা হৈছে"
+
+#: ../cli/src/connections.c:631
+msgid "activated"
+msgstr "সক্ৰিয়"
+
+#: ../cli/src/connections.c:645
+msgid "VPN connecting (prepare)"
+msgstr "VPN সংযোগ কৰা হৈছে (প্ৰস্তুত হওক)"
+
+#: ../cli/src/connections.c:647
+msgid "VPN connecting (need authentication)"
+msgstr "VPN সংযোগ কৰা হৈছে (প্ৰমাণীকৰণৰ প্ৰয়োজন)"
 
 #: ../cli/src/connections.c:649
-#, c-format
-msgid "Error: 'con status': %s"
-msgstr "ভুল: 'con status': %s"
+msgid "VPN connecting"
+msgstr "VPN সংযোগ কৰা হৈছে"
 
 #: ../cli/src/connections.c:651
-#, c-format
-msgid "Error: 'con status': %s; allowed fields: %s"
-msgstr "ভুল: 'con status': %s; অনুমতি থকা ক্ষেত্ৰ: %s"
+msgid "VPN connecting (getting IP configuration)"
+msgstr "VPN সংযোগ কৰা (IP সংৰূপ প্ৰাপ্ত কৰা)"
 
-#: ../cli/src/connections.c:658
-msgid "Active connections"
-msgstr "সক্ৰিয় সংযোগ"
+#: ../cli/src/connections.c:653
+msgid "VPN connected"
+msgstr "VPN সংযুক্ত"
 
-#: ../cli/src/connections.c:1026
-#, c-format
-msgid "no active connection on device '%s'"
-msgstr "'%s' যন্ত্ৰত কোনো সক্ৰিয় সংযোগ নাই"
+#: ../cli/src/connections.c:655
+msgid "VPN connection failed"
+msgstr "VPN সংযোগ ব্যৰ্থ হল"
 
-#: ../cli/src/connections.c:1034
-#, c-format
-msgid "no active connection or device"
-msgstr "কোনো সক্ৰিয় সংযোগ বা যন্ত্ৰ নাই"
+#: ../cli/src/connections.c:657
+msgid "VPN disconnected"
+msgstr "VPN বিচ্ছিন্নিত"
 
-#: ../cli/src/connections.c:1084
+#: ../cli/src/connections.c:710 ../cli/src/connections.c:720
+msgid "N/A"
+msgstr "অপ্ৰযোজ্য"
+
+#: ../cli/src/connections.c:914 ../cli/src/connections.c:1138
 #, c-format
-msgid "device '%s' not compatible with connection '%s'"
-msgstr "যন্ত্ৰ '%s' সংযোগ '%s' ৰ সৈতে সুসঙ্গত নহয়"
+msgid "Error: 'con status': %s"
+msgstr "ত্ৰুটি: 'con status': %s"
 
-#: ../cli/src/connections.c:1086
+#: ../cli/src/connections.c:916 ../cli/src/connections.c:1140
 #, c-format
-msgid "no device found for connection '%s'"
-msgstr "'%s' সংযোগৰ কাৰণে কোনো যন্ত্ৰ নাই"
+msgid "Error: 'con status': %s; allowed fields: %s"
+msgstr "ত্ৰুটি: 'con status': %s; অনুমোদিত ক্ষেত্ৰসমূহ: %s"
 
-#: ../cli/src/connections.c:1097
-msgid "activating"
-msgstr "সক্ৰিয় কৰা হৈছে"
+#: ../cli/src/connections.c:924
+msgid "Active connection details"
+msgstr "সক্ৰিয় সংযোগৰ বিৱৰণ"
 
-#: ../cli/src/connections.c:1099
-msgid "activated"
-msgstr "সক্ৰিয় কৰা হৈছে"
+#: ../cli/src/connections.c:1060 ../cli/src/connections.c:1722
+#: ../cli/src/connections.c:1834 ../cli/src/connections.c:1925
+#: ../cli/src/devices.c:852 ../cli/src/devices.c:914 ../cli/src/devices.c:1080
+#: ../cli/src/devices.c:1213 ../cli/src/devices.c:1632
+#: ../cli/src/devices.c:1860 ../cli/src/network-manager.c:311
+#, c-format
+msgid "Error: Can't find out if NetworkManager is running: %s."
+msgstr "ত্ৰুটি: NetworkManager চলি আছে নে নিৰ্ধাৰণ কৰিব নোৱাৰি: %s।"
 
-#: ../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
-msgid "unknown"
-msgstr "অজ্ঞাত"
+#: ../cli/src/connections.c:1064 ../cli/src/connections.c:1726
+#: ../cli/src/connections.c:1838 ../cli/src/connections.c:1929
+#: ../cli/src/devices.c:856 ../cli/src/devices.c:918 ../cli/src/devices.c:1084
+#: ../cli/src/devices.c:1217 ../cli/src/devices.c:1636
+#: ../cli/src/devices.c:1864 ../cli/src/network-manager.c:315
+#, c-format
+msgid "Error: NetworkManager is not running."
+msgstr "ত্ৰুটি: NetworkManager চলি থকা নাই।"
 
-#: ../cli/src/connections.c:1111
-msgid "VPN connecting (prepare)"
-msgstr "VPN সংযোগ স্থাপন কৰা হৈছে (প্ৰস্তুতি)"
+#: ../cli/src/connections.c:1096
+msgid "Active connections"
+msgstr "সক্ৰিয় সংযোগসমূহ"
 
-#: ../cli/src/connections.c:1113
-msgid "VPN connecting (need authentication)"
-msgstr "VPN সংযোগ স্থাপন কৰা হৈছে (অনুমোদন প্ৰয়োজন)"
+#: ../cli/src/connections.c:1121
+#, c-format
+msgid "Error: '%s' is not an active connection."
+msgstr "ত্ৰুটি: '%s' এটা সক্ৰিয় সংযোগ নহয়।"
 
-#: ../cli/src/connections.c:1115
-msgid "VPN connecting"
-msgstr "VPN সংযোগ স্থাপন কৰা হৈছে"
+#: ../cli/src/connections.c:1126
+#, c-format
+msgid "Error: unknown parameter: %s"
+msgstr "ত্ৰুটি: অজ্ঞাত প্ৰাচল: %s"
 
-#: ../cli/src/connections.c:1117
-msgid "VPN connecting (getting IP configuration)"
-msgstr "VPN সংযোগ স্থাপন কৰা হৈছে (IP বিন্যাস প্ৰাপ্ত কৰা হৈছে)"
+#: ../cli/src/connections.c:1233
+#, c-format
+msgid "no active connection on device '%s'"
+msgstr "ডিভাইচ '%s' ত কোনো সক্ৰিয় সংযোগ নাই"
 
-#: ../cli/src/connections.c:1119
-msgid "VPN connected"
-msgstr "VPN সংযোগ স্থাপন কৰা হৈছে"
+#: ../cli/src/connections.c:1241
+msgid "no active connection or device"
+msgstr "কোনো সক্ৰিয় সংযোগ অথবা ডিভাইচ নাই"
 
-#: ../cli/src/connections.c:1121
-msgid "VPN connection failed"
-msgstr "VPN সংযোগ বিফল হৈছে"
+#: ../cli/src/connections.c:1312
+#, c-format
+msgid "device '%s' not compatible with connection '%s'"
+msgstr "ডিভাইচ '%s' সংযোগ '%s' ৰ সৈতে সংগত নহয়"
 
-#: ../cli/src/connections.c:1123
-msgid "VPN disconnected"
-msgstr "VPN সংযোগ বিচ্ছিন্ন কৰা হৈছে"
+#: ../cli/src/connections.c:1315
+#, c-format
+msgid "no device found for connection '%s'"
+msgstr "সংযোগ '%s' ৰ বাবে কোনো ডিভাইচ পোৱা নগল"
 
-#: ../cli/src/connections.c:1134
+#: ../cli/src/connections.c:1327
 msgid "unknown reason"
 msgstr "অজ্ঞাত কাৰণ"
 
-#: ../cli/src/connections.c:1136
+#: ../cli/src/connections.c:1329
 msgid "none"
-msgstr "শূণ্য"
+msgstr "কোনো নহয়"
 
-#: ../cli/src/connections.c:1138
+#: ../cli/src/connections.c:1331
 msgid "the user was disconnected"
-msgstr "ব্যৱহাৰকৰ্তাৰ সৈতে সংযোগ বিচ্ছিন্ন কৰা হৈছে"
+msgstr "ব্যৱহাৰকাৰীজনক বিচ্ছিন্ন কৰা হৈছিল"
 
-#: ../cli/src/connections.c:1140
+#: ../cli/src/connections.c:1333
 msgid "the base network connection was interrupted"
-msgstr "মূল নে'টৱৰ্ক সংযোগ বিঘ্নিত হৈছে"
+msgstr "ভিত্তি নেটৱাৰ্ক সংযোগ বাধাগ্ৰস্থ হৈছিল"
 
-#: ../cli/src/connections.c:1142
+#: ../cli/src/connections.c:1335
 msgid "the VPN service stopped unexpectedly"
-msgstr "অপ্ৰত্যাশিতভাবে VPN সেৱা বন্ধ কৰা হৈছে"
+msgstr "VPN সেৱা অপ্ৰত্যাশিতভাৱে বন্ধ হল"
 
-#: ../cli/src/connections.c:1144
+#: ../cli/src/connections.c:1337
 msgid "the VPN service returned invalid configuration"
-msgstr "VPN সেৱাৰ পৰা অবৈধ বিন্যাস পোৱা গৈছে"
+msgstr "VPN সেৱায় অবৈধ সংৰূপ ঘুৰাই দিলে"
 
-#: ../cli/src/connections.c:1146
+#: ../cli/src/connections.c:1339
 msgid "the connection attempt timed out"
-msgstr "সংযোগৰ প্ৰয়াসত সময়সীমা উত্তীৰ্ণ হৈছে"
+msgstr "সংযোগৰ চেষ্টাৰ সময় অন্ত হল"
 
-#: ../cli/src/connections.c:1148
+#: ../cli/src/connections.c:1341
 msgid "the VPN service did not start in time"
-msgstr "যথাযত সময়ত VPN সেৱা আৰম্ভ কৰা নহয়"
+msgstr "VPN সেৱা সময়ত আৰম্ভ নহল"
 
-#: ../cli/src/connections.c:1150
+#: ../cli/src/connections.c:1343
 msgid "the VPN service failed to start"
-msgstr "VPN সেৱা আৰম্ভ কৰা নাযায়"
+msgstr "VPN সেৱা আৰম্ভ হবলে ব্যৰ্থ হল"
 
-#: ../cli/src/connections.c:1152
+#: ../cli/src/connections.c:1345
 msgid "no valid VPN secrets"
-msgstr "VPN ৰ বৈধ গোপন তথ্য নাই"
+msgstr "কোনো বৈধ VPN গোপন তথ্য নাই"
 
-#: ../cli/src/connections.c:1154
+#: ../cli/src/connections.c:1347
 msgid "invalid VPN secrets"
-msgstr "VPN ৰ অবৈধ গোপন তথ্য"
+msgstr "অবৈধ VPN গোপন তথ্য"
 
-#: ../cli/src/connections.c:1156
+#: ../cli/src/connections.c:1349
 msgid "the connection was removed"
-msgstr "সংযোগ আঁতৰুৱা হৈছে"
-
-#: ../cli/src/connections.c:1170
-#, c-format
-msgid "state: %s\n"
-msgstr "অৱস্থা: %s\n"
+msgstr "সংযোগ আতৰোৱা হৈছিল"
 
-#: ../cli/src/connections.c:1173 ../cli/src/connections.c:1199
+#: ../cli/src/connections.c:1366 ../cli/src/connections.c:1571
 #, c-format
-msgid "Connection activated\n"
-msgstr "সংযোগ সক্ৰিয় কৰা হৈছে\n"
+msgid "Connection successfully activated (D-Bus active path: %s)\n"
+msgstr "সংযোগ সফলভাৱে সক্ৰিয় কৰা হৈছিল (D-Bus সক্ৰিয় পথ: %s)\n"
 
-#: ../cli/src/connections.c:1176
+#. Active connection failed and dissapeared, quit.
+#: ../cli/src/connections.c:1371 ../cli/src/connections.c:1472
 #, c-format
 msgid "Error: Connection activation failed."
-msgstr "ত্ৰুটি: সংযোগ সক্ৰিয় কৰিবলৈ ব্যৰ্থ ।"
+msgstr "ত্ৰুটি: সংযোগৰ সক্ৰিয়কৰণ ব্যৰ্থ হল।"
 
-#: ../cli/src/connections.c:1195
+#: ../cli/src/connections.c:1396
 #, c-format
-msgid "state: %s (%d)\n"
-msgstr "অৱস্থা: %s (%d)\n"
+msgid "VPN connection successfully activated (D-Bus active path: %s)\n"
+msgstr "VPN সংযোগ সফলভাৱে সক্ৰিয় কৰা হল (D-Bus সক্ৰিয় পথ: %s)\n"
 
-#: ../cli/src/connections.c:1205
+#: ../cli/src/connections.c:1404
 #, c-format
 msgid "Error: Connection activation failed: %s."
-msgstr "ত্ৰুটি: সংযোগ সক্ৰিয় কৰিবলৈ ব্যৰ্থ: %s ।"
+msgstr "ত্ৰুটি: সংযোগৰ সক্ৰিয়কৰণ ব্যৰ্থ হল: %s।"
 
-#: ../cli/src/connections.c:1222 ../cli/src/devices.c:811
+#: ../cli/src/connections.c:1501 ../cli/src/devices.c:974
 #, c-format
 msgid "Error: Timeout %d sec expired."
-msgstr "ত্ৰুটি: %d চেকেন্ডৰ সময়সীমা উত্তীৰ্ণ হৈছে ।"
+msgstr "ত্ৰুটি: সময়অন্ত %d sec ৰ অৱসান ঘটিল"
 
-#: ../cli/src/connections.c:1265
+#: ../cli/src/connections.c:1562
 #, c-format
 msgid "Error: Connection activation failed: %s"
-msgstr "ত্ৰুটি: সংযোগ সক্ৰিয় কৰিবলৈ ব্যৰ্থ: %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
-#, c-format
-msgid "Active connection state: %s\n"
-msgstr "সক্ৰিয় সংযোগৰ অৱস্থা: %s\n"
-
-#: ../cli/src/connections.c:1289
-#, 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:1656 ../cli/src/connections.c:1810
+#: ../cli/src/connections.c:1938
 #, c-format
 msgid "Error: Unknown connection: %s."
-msgstr "ত্ৰুটি: অজ্ঞাত সংযোগ: %s."
+msgstr "ত্ৰুটি: অজ্ঞাত সংযোগ: %s।"
 
-#: ../cli/src/connections.c:1378 ../cli/src/devices.c:882
+#: ../cli/src/connections.c:1702 ../cli/src/devices.c:1059
+#: ../cli/src/devices.c:1605
 #, 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:1715 ../cli/src/connections.c:1827
+#: ../cli/src/connections.c:1918
 #, c-format
 msgid "Error: id or uuid has to be specified."
-msgstr "ত্ৰুটি: id বা uuid নিৰ্ধাৰণ কৰা আৱশ্যক ।"
+msgstr "ত্ৰুটি: id অথবা uuid ধাৰ্য্য কৰিব লাগিব।"
 
-#: ../cli/src/connections.c:1411
+#: ../cli/src/connections.c:1747
 #, c-format
 msgid "Error: No suitable device found: %s."
-msgstr "ত্ৰুটি: প্ৰযোজ্য কোনো যন্ত্ৰ পোৱা নাযায়: %s."
+msgstr "ত্ৰুটি: কোনো উপযুক্ত ডিভাইচ পোৱা নগল: %s।"
 
-#: ../cli/src/connections.c:1413
+#: ../cli/src/connections.c:1749
 #, c-format
 msgid "Error: No suitable device found."
-msgstr "ত্ৰুটি: কোনো প্ৰযোজ্য যন্ত্ৰ পোৱা নাযায় ।"
+msgstr "ত্ৰুটি: কোনো উপযুক্ত ডিভাইচ পোৱা নগল।"
 
-#: ../cli/src/connections.c:1505
+#: ../cli/src/connections.c:1863
 #, c-format
 msgid "Warning: Connection not active\n"
 msgstr "সতৰ্কবাৰ্তা: সংযোগ সক্ৰিয় নহয়\n"
 
-#: ../cli/src/connections.c:1561
+#: ../cli/src/connections.c:1877
+#, c-format
+msgid "Error: Connection deletion failed: %s"
+msgstr "ত্ৰুটি: সংযোগ মচি পেলোৱা ব্যৰ্থ হল: %s"
+
+#: ../cli/src/connections.c:1995
 #, 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:2063
 #, c-format
 msgid "Error: could not connect to D-Bus."
-msgstr "ত্ৰুটি: D-Bus ৰ সৈতে সংযোগ কৰিবলৈ ব্যৰ্থ ।"
+msgstr "ত্ৰুটি: D-Bus লে সংযোগ কৰিব নোৱাৰি।"
 
-#: ../cli/src/connections.c:1604
+#: ../cli/src/connections.c:2071
 #, c-format
 msgid "Error: Could not get system settings."
-msgstr "ত্ৰুটি: প্ৰণালীৰ বৈশিষ্ট্য প্ৰাপ্ত কৰিবলৈ ব্যৰ্থ ।"
+msgstr "ত্ৰুটি: চিস্টেম সংহতিসমূহ প্ৰাপ্ত কৰিব নোৱাৰি।"
 
-#: ../cli/src/connections.c:1612
+#: ../cli/src/connections.c:2081
 #, 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:70 ../cli/src/devices.c:106 ../cli/src/devices.c:187
+#: ../cli/src/devices.c:203
 msgid "DEVICE"
-msgstr "যন্ত্ৰ"
-
-#. 1
-#. 4
-#. 0
-#: ../cli/src/devices.c:62 ../cli/src/devices.c:90
-#: ../cli/src/network-manager.c:36
-msgid "STATE"
-msgstr "অৱস্থা"
-
-#: ../cli/src/devices.c:71
-msgid "GENERAL"
-msgstr "সাধাৰণ"
+msgstr "DEVICE"
 
 #. 0
-#: ../cli/src/devices.c:72
+#: ../cli/src/devices.c:83
 msgid "CAPABILITIES"
-msgstr "কৰ্মক্ষমতা"
+msgstr "CAPABILITIES"
 
 #. 1
-#: ../cli/src/devices.c:73
+#: ../cli/src/devices.c:84
 msgid "WIFI-PROPERTIES"
-msgstr "ৱাইফাই গুণ"
+msgstr "WIFI-PROPERTIES"
 
 #. 2
-#: ../cli/src/devices.c:74
+#: ../cli/src/devices.c:85
 msgid "AP"
 msgstr "AP"
 
 #. 3
-#: ../cli/src/devices.c:75
+#: ../cli/src/devices.c:86
 msgid "WIRED-PROPERTIES"
-msgstr "তাঁৰযুক্ত সংযোগৰ বৈশিষ্ট্য"
+msgstr "WIRED-PROPERTIES"
 
 #. 4
-#: ../cli/src/devices.c:76
-msgid "IP4-SETTINGS"
-msgstr "IP4 পছন্দসমূহ"
+#: ../cli/src/devices.c:87
+msgid "WIMAX-PROPERTIES"
+msgstr "WIMAX-PROPERTIES"
 
 #. 5
-#: ../cli/src/devices.c:77
-msgid "IP4-DNS"
-msgstr "IP4-DNS"
-
-#. 2
-#: ../cli/src/devices.c:88
-msgid "DRIVER"
-msgstr "চালক"
+#. 0
+#: ../cli/src/devices.c:88 ../cli/src/devices.c:200
+msgid "NSP"
+msgstr "NSP"
 
-#. 3
+#. 6
 #: ../cli/src/devices.c:89
-msgid "HWADDR"
-msgstr "HWADDR"
+msgid "IP4"
+msgstr "IP4"
 
-#. 0
-#: ../cli/src/devices.c:99
-msgid "CARRIER-DETECT"
-msgstr "পৰিবহণকৰ্তা চিনাক্তকৰণ"
+#. 7
+#: ../cli/src/devices.c:90
+msgid "DHCP4"
+msgstr "DHCP4"
 
-#. 1
-#: ../cli/src/devices.c:100
-msgid "SPEED"
-msgstr "গতি"
+#. 8
+#: ../cli/src/devices.c:91
+msgid "IP6"
+msgstr "IP6"
 
-#. 0
-#: ../cli/src/devices.c:109
-msgid "CARRIER"
-msgstr "পৰিবহণকৰ্তা"
+#. 9
+#: ../cli/src/devices.c:92
+msgid "DHCP6"
+msgstr "DHCP6"
 
-#. 0
-#: ../cli/src/devices.c:119
-msgid "WEP"
-msgstr "WEP"
+#. 2
+#: ../cli/src/devices.c:108
+msgid "VENDOR"
+msgstr "VENDOR"
 
-#. 1
+#. 3
+#: ../cli/src/devices.c:109
+msgid "PRODUCT"
+msgstr "PRODUCT"
+
+#. 4
+#: ../cli/src/devices.c:110
+msgid "DRIVER"
+msgstr "DRIVER"
+
+#. 5
+#: ../cli/src/devices.c:111
+msgid "DRIVER-VERSION"
+msgstr "DRIVER-VERSION"
+
+#. 6
+#: ../cli/src/devices.c:112
+msgid "FIRMWARE-VERSION"
+msgstr "FIRMWARE-VERSION"
+
+#. 7
+#: ../cli/src/devices.c:113
+msgid "HWADDR"
+msgstr "HWADDR"
+
+#. 9
+#: ../cli/src/devices.c:115
+msgid "REASON"
+msgstr "REASON"
+
+#. 10
+#: ../cli/src/devices.c:116
+msgid "UDI"
+msgstr "UDI"
+
+#. 11
+#: ../cli/src/devices.c:117
+msgid "IP-IFACE"
+msgstr "IP-IFACE"
+
+#. 12
+#: ../cli/src/devices.c:118
+msgid "NM-MANAGED"
+msgstr "NM-MANAGED"
+
+#. 14
 #: ../cli/src/devices.c:120
+msgid "FIRMWARE-MISSING"
+msgstr "FIRMWARE-MISSING"
+
+#. 15
+#: ../cli/src/devices.c:121
+msgid "CONNECTION"
+msgstr "CONNECTION"
+
+#. 0
+#: ../cli/src/devices.c:130
+msgid "CARRIER-DETECT"
+msgstr "CARRIER-DETECT"
+
+#. 1
+#: ../cli/src/devices.c:131
+msgid "SPEED"
+msgstr "SPEED"
+
+#. 0
+#: ../cli/src/devices.c:140
+msgid "CARRIER"
+msgstr "CARRIER"
+
+#. 0
+#: ../cli/src/devices.c:150
+msgid "WEP"
+msgstr "WEP"
+
+#. 1
+#: ../cli/src/devices.c:151
 msgid "WPA"
 msgstr "WPA"
 
 #. 2
-#: ../cli/src/devices.c:121
+#: ../cli/src/devices.c:152
 msgid "WPA2"
 msgstr "WPA2"
 
 #. 3
-#: ../cli/src/devices.c:122
+#: ../cli/src/devices.c:153
 msgid "TKIP"
 msgstr "TKIP"
 
 #. 4
-#: ../cli/src/devices.c:123
+#: ../cli/src/devices.c:154
 msgid "CCMP"
 msgstr "CCMP"
 
 #. 0
-#: ../cli/src/devices.c:132
-msgid "ADDRESS"
-msgstr "ঠিকনা"
+#: ../cli/src/devices.c:164
+msgid "CTR-FREQ"
+msgstr "CTR-FREQ"
 
 #. 1
-#: ../cli/src/devices.c:133
-msgid "PREFIX"
-msgstr "উপসৰ্গ"
+#: ../cli/src/devices.c:165
+msgid "RSSI"
+msgstr "RSSI"
 
 #. 2
-#: ../cli/src/devices.c:134
-msgid "GATEWAY"
-msgstr "গে'টৱে"
+#: ../cli/src/devices.c:166
+msgid "CINR"
+msgstr "CINR"
 
-#. 0
-#: ../cli/src/devices.c:143
-msgid "DNS"
-msgstr "DNS"
+#. 3
+#: ../cli/src/devices.c:167
+msgid "TX-POW"
+msgstr "TX-POW"
+
+#. 4
+#: ../cli/src/devices.c:168
+msgid "BSID"
+msgstr "BSID"
 
 #. 0
-#: ../cli/src/devices.c:153
+#: ../cli/src/devices.c:178
 msgid "SSID"
 msgstr "SSID"
 
 #. 1
-#: ../cli/src/devices.c:154
+#: ../cli/src/devices.c:179
 msgid "BSSID"
 msgstr "BSSID"
 
 #. 2
-#: ../cli/src/devices.c:155
+#: ../cli/src/devices.c:180
 msgid "MODE"
-msgstr "মোড"
+msgstr "MODE"
 
 #. 3
-#: ../cli/src/devices.c:156
+#: ../cli/src/devices.c:181
 msgid "FREQ"
 msgstr "FREQ"
 
 #. 4
-#: ../cli/src/devices.c:157
+#: ../cli/src/devices.c:182
 msgid "RATE"
-msgstr "হাৰ"
+msgstr "RATE"
 
 #. 5
-#: ../cli/src/devices.c:158
+#. 1
+#: ../cli/src/devices.c:183 ../cli/src/devices.c:201
 msgid "SIGNAL"
-msgstr "চিগ্নেল"
+msgstr "SIGNAL"
 
 #. 6
-#: ../cli/src/devices.c:159
+#: ../cli/src/devices.c:184
 msgid "SECURITY"
-msgstr "সুৰক্ষা"
+msgstr "SECURITY"
 
 #. 7
-#: ../cli/src/devices.c:160
+#: ../cli/src/devices.c:185
 msgid "WPA-FLAGS"
 msgstr "WPA-FLAGS"
 
 #. 8
-#: ../cli/src/devices.c:161
+#: ../cli/src/devices.c:186
 msgid "RSN-FLAGS"
 msgstr "RSN-FLAGS"
 
 #. 10
-#: ../cli/src/devices.c:163
+#. 4
+#: ../cli/src/devices.c:188 ../cli/src/devices.c:204
 msgid "ACTIVE"
-msgstr "সক্ৰিয়"
+msgstr "ACTIVE"
 
-#: ../cli/src/devices.c:186
+#: ../cli/src/devices.c:223
 #, 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 ]\n"
 "  disconnect iface  [--nowait] [--timeout ]\n"
-"  wifi [list [iface ] [hwaddr ]]\n"
+"  wifi [list [iface ] [bssid ]]\n"
+"  wifi connect <(B)SSID> [password ] [wep-key-type key|phrase] "
+"[iface ] [bssid ] [name ]\n"
+"               [--private] [--nowait] [--timeout ]\n"
+"  wimax [list [iface ] [nsp ]]\n"
 "\n"
 msgstr ""
-"ব্যৱহাৰপ্ৰণালী: nmcli dev { COMMAND | help }\n"
+"ব্যৱহাৰ: 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 ]\n"
 "  disconnect iface  [--nowait] [--timeout ]\n"
-"  wifi [list [iface ] [hwaddr ]]\n"
+"  wifi [list [iface ] [bssid ]]\n"
+"  wifi connect <(B)SSID> [password ] [wep-key-type key|phrase] "
+"[iface ] [bssid ] [name ]\n"
+"               [--private] [--nowait] [--timeout ]\n"
+"  wimax [list [iface ] [nsp ]]\n"
 "\n"
 
-#: ../cli/src/devices.c:206
-msgid "unmanaged"
-msgstr "পৰিচালিত নহয়"
-
-#: ../cli/src/devices.c:208
-msgid "unavailable"
-msgstr "উপলব্ধ নহয়"
-
-#: ../cli/src/devices.c:210 ../cli/src/network-manager.c:89
-msgid "disconnected"
-msgstr "বিচ্ছিন্ন"
-
-#: ../cli/src/devices.c:212
-msgid "connecting (prepare)"
-msgstr "সংযোগ কৰা হৈছে (প্ৰস্তুতি)"
-
-#: ../cli/src/devices.c:214
-msgid "connecting (configuring)"
-msgstr "সংযোগ কৰা হৈছে (বিন্যাস কৰা হৈছে)"
-
-#: ../cli/src/devices.c:216
-msgid "connecting (need authentication)"
-msgstr "সংযোগ কৰা হৈছে (অনুমোদন প্ৰয়োজন)"
-
-#: ../cli/src/devices.c:218
-msgid "connecting (getting IP configuration)"
-msgstr "সংযোগ কৰা হৈছে (IP বিন্যাস প্ৰাপ্ত কৰা হৈছে)"
-
-#: ../cli/src/devices.c:220 ../cli/src/network-manager.c:87
-msgid "connected"
-msgstr "সংযোগ স্থাপিত"
-
-#: ../cli/src/devices.c:222
-msgid "connection failed"
-msgstr "সংযোগ বিফল"
-
-#: ../cli/src/devices.c:245 ../cli/src/devices.c:380
-msgid "Unknown"
-msgstr "অজ্ঞাত"
-
-#: ../cli/src/devices.c:277
+#: ../cli/src/devices.c:323
 msgid "(none)"
 msgstr "(শূণ্য)"
 
-#: ../cli/src/devices.c:302
-#, c-format
-msgid "%s: error converting IP4 address 0x%X"
-msgstr "%s: IP4 ঠিকনা 0x%X ৰূপান্তৰ কৰিবলৈ ত্ৰুটি"
-
-#: ../cli/src/devices.c:349
+#: ../cli/src/devices.c:379
 #, c-format
 msgid "%u MHz"
 msgstr "%u MHz"
 
-#: ../cli/src/devices.c:350
+#: ../cli/src/devices.c:380
 #, c-format
 msgid "%u MB/s"
 msgstr "%u MB/s"
 
-#: ../cli/src/devices.c:359
+#: ../cli/src/devices.c:389
 msgid "Encrypted: "
-msgstr "এনক্ৰিপ্ট কৰা:"
+msgstr "এনক্ৰিপ্টেড: "
 
-#: ../cli/src/devices.c:364
+#: ../cli/src/devices.c:394
 msgid "WEP "
 msgstr "WEP "
 
-#: ../cli/src/devices.c:366
+#: ../cli/src/devices.c:396
 msgid "WPA "
 msgstr "WPA "
 
-#: ../cli/src/devices.c:368
+#: ../cli/src/devices.c:398
 msgid "WPA2 "
 msgstr "WPA2 "
 
-#: ../cli/src/devices.c:371
+#: ../cli/src/devices.c:401
 msgid "Enterprise "
-msgstr "এন্টাৰপ্ৰাইজ"
+msgstr "এন্টাৰপ্ৰাইজ "
 
-#: ../cli/src/devices.c:380
+#: ../cli/src/devices.c:410
 msgid "Ad-Hoc"
-msgstr "এড-হক"
+msgstr "Ad-Hoc"
 
-#: ../cli/src/devices.c:380
+#: ../cli/src/devices.c:410
 msgid "Infrastructure"
-msgstr "অৱগাঁথনি"
+msgstr "আন্তঃগাথনী"
+
+#: ../cli/src/devices.c:445
+msgid "Home"
+msgstr "ঘৰ"
+
+#: ../cli/src/devices.c:448
+msgid "Partner"
+msgstr "অংশীদাৰ"
+
+#: ../cli/src/devices.c:451
+msgid "Roaming"
+msgstr "ৰ'মিং"
 
-#: ../cli/src/devices.c:442
+#: ../cli/src/devices.c:523
 #, c-format
 msgid "Error: 'dev list': %s"
-msgstr "ভুল: 'dev list': %s"
+msgstr "ত্ৰুটি: 'dev list': %s"
 
-#: ../cli/src/devices.c:444
+#: ../cli/src/devices.c:525
 #, 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:534
 msgid "Device details"
-msgstr "যন্ত্ৰৰ বিৱৰণ"
+msgstr "ডিভাইচৰ বিৱৰণ"
 
-#: ../cli/src/devices.c:483 ../cli/src/devices.c:827
+#: ../cli/src/devices.c:579 ../cli/src/devices.c:582 ../cli/src/devices.c:1000
+#: ../cli/src/utils.c:477
 msgid "(unknown)"
 msgstr "(অজ্ঞাত)"
 
-#: ../cli/src/devices.c:484
-msgid "unknown)"
-msgstr "অজ্ঞাত)"
+#: ../cli/src/devices.c:591
+msgid "not connected"
+msgstr "সংযুক্ত নহয়"
 
-#: ../cli/src/devices.c:510
+#: ../cli/src/devices.c:618
 #, c-format
 msgid "%u Mb/s"
 msgstr "%u Mb/s"
 
 #. Print header
 #. "WIRED-PROPERTIES"
-#: ../cli/src/devices.c:583
+#: ../cli/src/devices.c:691
 msgid "on"
-msgstr "চলি আছে"
+msgstr "অন"
 
-#: ../cli/src/devices.c:583
+#: ../cli/src/devices.c:691
 msgid "off"
-msgstr "বন্ধ"
+msgstr "অফ"
 
-#: ../cli/src/devices.c:710
+#: ../cli/src/devices.c:842
 #, c-format
 msgid "Error: 'dev status': %s"
-msgstr "ভুল: 'dev status': %s"
+msgstr "ত্ৰুটি: 'dev status': %s"
 
-#: ../cli/src/devices.c:712
+#: ../cli/src/devices.c:844
 #, 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:867
 msgid "Status of devices"
-msgstr "যন্ত্ৰৰ অৱস্থা"
+msgstr "ডিভাইচসমূহৰ অৱস্থা"
 
-#: ../cli/src/devices.c:747
+#: ../cli/src/devices.c:898
 #, c-format
 msgid "Error: '%s' argument is missing."
-msgstr "ত্ৰুটি: '%s' তৰ্ক অনুপস্থিত ।"
+msgstr "ত্ৰুটি: '%s' তৰ্ক সন্ধানহিন।"
 
-#: ../cli/src/devices.c:776 ../cli/src/devices.c:915 ../cli/src/devices.c:1035
+#: ../cli/src/devices.c:939 ../cli/src/devices.c:1104
+#: ../cli/src/devices.c:1245 ../cli/src/devices.c:1892
 #, c-format
 msgid "Error: Device '%s' not found."
-msgstr "ত্ৰুটি: '%s' যন্ত্ৰ পোৱা নাযায় ।"
+msgstr "ত্ৰুটি: ডিভাইচ '%s' পোৱা নগল।"
 
-#: ../cli/src/devices.c:799
+#: ../cli/src/devices.c:962
 #, c-format
 msgid "Success: Device '%s' successfully disconnected."
-msgstr "সফলতা: '%s' যন্ত্ৰ সফলতাৰে সংযোগ বিচ্ছিন্ন কৰা হৈছে ।"
+msgstr "সফলতা: ডিভাইচ '%s' সফলভাৱে বিচ্ছিন্ন কৰা হল।"
 
-#: ../cli/src/devices.c:824
+#: ../cli/src/devices.c:997
 #, 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:1010
 #, c-format
-msgid "Device state: %d (%s)\n"
-msgstr "যন্ত্ৰৰ অৱস্থা: %d (%s)\n"
+msgid "Device '%s' has been disconnected.\n"
+msgstr "ডিভাইচ '%s' বিচ্ছিন্ন কৰা হৈছে।\n"
 
-#: ../cli/src/devices.c:896
+#: ../cli/src/devices.c:1073
 #, c-format
 msgid "Error: iface has to be specified."
-msgstr "ত্ৰুটি: iface নিৰ্ধাৰণ কৰা আৱশ্যক ।"
+msgstr "ত্ৰুটি: iface ধাৰ্য্য কৰিব লাগিব।"
 
-#: ../cli/src/devices.c:1011
+#: ../cli/src/devices.c:1203
 #, c-format
 msgid "Error: 'dev wifi': %s"
-msgstr "ভুল: 'dev wifi': %s"
+msgstr "ত্ৰুটি: 'dev wifi': %s"
 
-#: ../cli/src/devices.c:1013
+#: ../cli/src/devices.c:1205
 #, 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:1228
 msgid "WiFi scan list"
-msgstr "ৱাই-ফাই স্কেনৰ তালিকা"
+msgstr "WiFi স্কেন তালিকা"
 
-#: ../cli/src/devices.c:1055 ../cli/src/devices.c:1109
+#: ../cli/src/devices.c:1265 ../cli/src/devices.c:1319
 #, c-format
-msgid "Error: Access point with hwaddr '%s' not found."
-msgstr "ত্ৰুটি: hwaddr '%s' সহ এক্সেচ পইন্ট পোৱা নাযায় ।"
+msgid "Error: Access point with bssid '%s' not found."
+msgstr "ত্ৰুটি: bssid '%s' ৰ সৈতে অভিগম বিন্দু পোৱা নগল।"
 
-#: ../cli/src/devices.c:1072
+#: ../cli/src/devices.c:1282
 #, c-format
 msgid "Error: Device '%s' is not a WiFi device."
-msgstr "ত্ৰুটি: '%s' যন্ত্ৰ ৱাই-ফাই যন্ত্ৰ নহয় ।"
+msgstr "ত্ৰুটি: ডিভাইচ '%s' এটা WiFi ডিভাইচ নহয়।"
+
+#: ../cli/src/devices.c:1350 ../cli/src/devices.c:1396
+#, c-format
+msgid "Connection with UUID '%s' created and activated on device '%s'\n"
+msgstr "UUID '%s' ৰ সৈতে সংযোগ সৃষ্টি কৰা হল আৰু ডিভাইচ '%s' ড সক্ৰিয় কৰা হল\n"
+
+#: ../cli/src/devices.c:1355
+#, c-format
+msgid "Error: Connection activation failed: (%d) %s."
+msgstr "ত্ৰুটি: সংযোগৰ সক্ৰিয়কৰণ ব্যৰ্থ হল: (%d) %s।"
+
+#: ../cli/src/devices.c:1380
+#, c-format
+msgid "Error: Failed to add/activate new connection: (%d) %s"
+msgstr "ত্ৰুটি: নতুন সংযোগ যোগ/সক্ৰিয় কৰিবলে ব্যৰ্থ: (%d) %s"
+
+#: ../cli/src/devices.c:1388
+#, c-format
+msgid "Error: Failed to add/activate new connection: Unknown error"
+msgstr "ত্ৰুটি: নতুন সংযোগ যোগ/সক্ৰিয় কৰিবলে ব্যৰ্থ: অজ্ঞাত ত্ৰুটি"
+
+#: ../cli/src/devices.c:1532
+#, c-format
+msgid "Error: SSID or BSSID are missing."
+msgstr "ত্ৰুটি: SSID অথবা BSSID সন্ধানহিন।"
+
+#: ../cli/src/devices.c:1555
+#, c-format
+msgid "Error: bssid argument value '%s' is not a valid BSSID."
+msgstr "ত্ৰুটি: bssid তৰ্ক মান '%s' এটা বৈধ BSSID নহয়।"
+
+#: ../cli/src/devices.c:1579
+#, c-format
+msgid ""
+"Error: wep-key-type argument value '%s' is invalid, use 'key' or 'phrase'."
+msgstr ""
+"ত্ৰুটি: wep-key-type তৰ্ক মান '%s' অবৈধ, 'key' অথবা 'phrase' ব্যৱহাৰ কৰক।"
+
+#: ../cli/src/devices.c:1619
+#, c-format
+msgid "Error: BSSID to connect to (%s) differs from bssid argument (%s)."
+msgstr "ত্ৰুটি: (%s) লে সংযোগ কৰিব লগিয়া BSSID bssid তৰ্ক (%s) পৰা পৃথক।"
+
+#: ../cli/src/devices.c:1625
+#, c-format
+msgid "Error: Parameter '%s' is neither SSID nor BSSID."
+msgstr "ত্ৰুটি: প্ৰাচল '%s' SSID অথবা BSSID নহয়।"
+
+#: ../cli/src/devices.c:1654
+#, c-format
+msgid "Error: Device '%s' is not a Wi-Fi device."
+msgstr "ত্ৰুটি: ডিভাইচ '%s' এটা Wi-Fi ডিভাইচ নহয়।"
+
+#: ../cli/src/devices.c:1656
+#, c-format
+msgid "Error: No Wi-Fi device found."
+msgstr "ত্ৰুটি: কোনো Wi-Fi ডিভাইচ পোৱা নগল।"
+
+#: ../cli/src/devices.c:1674
+#, c-format
+msgid "Error: No network with SSID '%s' found."
+msgstr "ত্ৰুটি: SSID '%s' ৰ সৈতে কোনো নেটৱাৰ্ক পোৱা নগল।"
+
+#: ../cli/src/devices.c:1676
+#, c-format
+msgid "Error: No access point with BSSID '%s' found."
+msgstr "ত্ৰুটি: BSSID '%s' ৰ সৈতে কোনো অভিগম বিন্দু পোৱা নগল।"
 
-#: ../cli/src/devices.c:1136
+#: ../cli/src/devices.c:1774
 #, c-format
 msgid "Error: 'dev wifi' command '%s' is not valid."
-msgstr "ত্ৰুটি: 'dev wifi' আদেশ '%s' বৈধ নহয় ।"
+msgstr "ত্ৰুটি: 'dev wifi' কমান্ড '%s' বৈধ নহয়।"
+
+#: ../cli/src/devices.c:1850
+#, c-format
+msgid "Error: 'dev wimax': %s"
+msgstr "ত্ৰুটি: 'dev wimax': %s"
+
+#: ../cli/src/devices.c:1852
+#, c-format
+msgid "Error: 'dev wimax': %s; allowed fields: %s"
+msgstr "ত্ৰুটি: 'dev wimax': %s; অনুমোদিত ক্ষেত্ৰসমূহ: %s"
+
+#: ../cli/src/devices.c:1875
+msgid "WiMAX NSP list"
+msgstr "WiMAX NSP তালিকা"
+
+#: ../cli/src/devices.c:1912
+#, c-format
+msgid "Error: NSP with name '%s' not found."
+msgstr "ত্ৰুটি: নাম '%s' ৰ সৈতে NSP পোৱা নগল।"
+
+#: ../cli/src/devices.c:1923
+#, c-format
+msgid "Error: Device '%s' is not a WiMAX device."
+msgstr "ত্ৰুটি: ডিভাইচ '%s' এটা WiMAX ডিভাইচ নহয়।"
+
+#: ../cli/src/devices.c:1954
+#, c-format
+msgid "Error: Access point with nsp '%s' not found."
+msgstr "ত্ৰুটি: nsp '%s' ৰ সৈতে অভিগম বিন্দু পোৱা নগল।"
 
-#: ../cli/src/devices.c:1183
+#: ../cli/src/devices.c:1981
+#, c-format
+msgid "Error: 'dev wimax' command '%s' is not valid."
+msgstr "ত্ৰুটি: 'dev wimax' কমান্ড '%s' বৈধ নহয়।"
+
+#: ../cli/src/devices.c:2031
 #, c-format
 msgid "Error: 'dev' command '%s' is not valid."
-msgstr "ত্ৰুটি: 'dev' আদেশ '%s' বৈধ নহয় ।"
+msgstr "ত্ৰুটি: 'dev' কমান্ড '%s' বৈধ নহয়।"
 
-#: ../cli/src/network-manager.c:35
+#: ../cli/src/network-manager.c:37
 msgid "RUNNING"
-msgstr "চলমান"
+msgstr "RUNNING"
 
-#. 1
-#: ../cli/src/network-manager.c:37
-msgid "WIFI-HARDWARE"
-msgstr "ৱাইফাই যান্ত্ৰিক সামগ্ৰী"
+#. 0
+#: ../cli/src/network-manager.c:38
+msgid "VERSION"
+msgstr "VERSION"
 
 #. 2
-#: ../cli/src/network-manager.c:38
-msgid "WIFI"
-msgstr "ৱাইফাই"
+#: ../cli/src/network-manager.c:40
+msgid "NET-ENABLED"
+msgstr "NET-ENABLED"
 
 #. 3
-#: ../cli/src/network-manager.c:39
-msgid "WWAN-HARDWARE"
-msgstr "WWAN যান্ত্ৰিক সামগ্ৰী"
+#: ../cli/src/network-manager.c:41
+msgid "WIFI-HARDWARE"
+msgstr "WIFI-HARDWARE"
 
 #. 4
-#: ../cli/src/network-manager.c:40
+#: ../cli/src/network-manager.c:42
+msgid "WIFI"
+msgstr "WIFI"
+
+#. 5
+#: ../cli/src/network-manager.c:43
+msgid "WWAN-HARDWARE"
+msgstr "WWAN-HARDWARE"
+
+#. 6
+#: ../cli/src/network-manager.c:44
 msgid "WWAN"
 msgstr "WWAN"
 
+#. 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:62
+msgid "PERMISSION"
+msgstr "PERMISSION"
+
+#. 0
+#: ../cli/src/network-manager.c:63
+msgid "VALUE"
+msgstr "VALUE"
+
+#: ../cli/src/network-manager.c:77
 #, c-format
 msgid ""
 "Usage: nmcli nm { COMMAND | help }\n"
 "\n"
-"  COMMAND := { status | sleep | wakeup | wifi | wwan }\n"
+"  COMMAND := { status | permissions | enable | sleep | wifi | wwan | "
+"wimax }\n"
+"\n"
+"  COMMAND := { status | permissions | enable | sleep | wifi | wwan }\n"
 "\n"
 "  status\n"
-"  sleep\n"
-"  wakeup\n"
+"  permissions\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"
+"ব্যৱহাৰ: nmcli nm { COMMAND | help }\n"
 "\n"
-"  COMMAND := { status | sleep | wakeup | wifi | wwan }\n"
+"  COMMAND := { status | permissions | enable | sleep | wifi | wwan | "
+"wimax }\n"
+"\n"
+"  COMMAND := { status | permissions | enable | sleep | wifi | wwan }\n"
 "\n"
 "  status\n"
-"  sleep\n"
-"  wakeup\n"
+"  permissions\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:108
 msgid "asleep"
 msgstr "নিদ্ৰিত"
 
-#: ../cli/src/network-manager.c:85
+#: ../cli/src/network-manager.c:110
 msgid "connecting"
 msgstr "সংযোগ কৰা হৈছে"
 
-#: ../cli/src/network-manager.c:125
+#: ../cli/src/network-manager.c:112
+msgid "connected (local only)"
+msgstr "সংযুক্ত (কেৱল স্থানীয়)"
+
+#: ../cli/src/network-manager.c:114
+msgid "connected (site only)"
+msgstr "সংযুক্ত (কেৱল ছাইট)"
+
+#: ../cli/src/network-manager.c:118
+msgid "disconnecting"
+msgstr "বিচ্ছিন্ন কৰা হৈছে"
+
+#: ../cli/src/network-manager.c:158
 #, c-format
 msgid "Error: 'nm status': %s"
-msgstr "ভুল: 'nm status': %s"
+msgstr "ত্ৰুটি: 'nm status': %s"
 
-#: ../cli/src/network-manager.c:127
+#: ../cli/src/network-manager.c:160
 #, c-format
 msgid "Error: 'nm status': %s; allowed fields: %s"
-msgstr "ভুল: 'nm status': %s; অনুমতি থকা ক্ষেত্ৰ: %s"
+msgstr "ত্ৰুটি: 'nm status': %s; অনুমোদিত ক্ষেত্ৰসমূহ: %s"
+
+#. create NMClient
+#: ../cli/src/network-manager.c:173 ../cli/src/network-manager.c:174
+#: ../cli/src/network-manager.c:175 ../cli/src/network-manager.c:176
+#: ../cli/src/network-manager.c:177 ../cli/src/network-manager.c:179
+#: ../cli/src/network-manager.c:180 ../cli/src/network-manager.c:429
+#: ../cli/src/network-manager.c:484 ../cli/src/network-manager.c:522
+#: ../cli/src/network-manager.c:561
+msgid "enabled"
+msgstr "সামৰ্থবান"
+
+#: ../cli/src/network-manager.c:173 ../cli/src/network-manager.c:174
+#: ../cli/src/network-manager.c:175 ../cli/src/network-manager.c:176
+#: ../cli/src/network-manager.c:177 ../cli/src/network-manager.c:179
+#: ../cli/src/network-manager.c:180 ../cli/src/network-manager.c:429
+#: ../cli/src/network-manager.c:484 ../cli/src/network-manager.c:522
+#: ../cli/src/network-manager.c:561
+msgid "disabled"
+msgstr "অসামৰ্থবান"
 
-#: ../cli/src/network-manager.c:134
+#: ../cli/src/network-manager.c:193
 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
-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
-msgid "disabled"
-msgstr "নিষ্ক্ৰিয়"
-
-#: ../cli/src/network-manager.c:148
+#: ../cli/src/network-manager.c:196
 msgid "running"
 msgstr "চলি আছে"
 
-#: ../cli/src/network-manager.c:148
+#: ../cli/src/network-manager.c:196
 msgid "not running"
-msgstr "চলা নাই"
+msgstr "চলি থকা নাই"
+
+#: ../cli/src/network-manager.c:271
+msgid "auth"
+msgstr "auth"
+
+#: ../cli/src/network-manager.c:301
+#, c-format
+msgid "Error: 'nm permissions': %s"
+msgstr "ত্ৰুটি: 'nm permissions': %s"
+
+#: ../cli/src/network-manager.c:303
+#, c-format
+msgid "Error: 'nm permissions': %s; allowed fields: %s"
+msgstr "ত্ৰুটি: 'nm permissions': %s; অনুমোদিত ক্ষেত্ৰসমূহ: %s"
+
+#: ../cli/src/network-manager.c:324
+msgid "NetworkManager permissions"
+msgstr "NetworkManager অনুমতিসমূহ"
+
+#: ../cli/src/network-manager.c:350 ../cli/src/utils.c:457
+#, c-format
+msgid "Error: Couldn't connect to system bus: %s"
+msgstr "ত্ৰুটি: চিস্টেম বাচৰ সৈতে সংযোগ কৰিব পৰা নগল: %s"
+
+#: ../cli/src/network-manager.c:361
+#, c-format
+msgid "Error: Couldn't create D-Bus object proxy."
+msgstr "ত্ৰুটি: D-Bus অবজেক্ট প্ৰক্সি সৃষ্টি কৰিব পৰা নগল।"
+
+#: ../cli/src/network-manager.c:367
+#, c-format
+msgid "Error in sleep: %s"
+msgstr "নিদ্ৰাত ত্ৰুটি: %s"
 
-#: ../cli/src/network-manager.c:201 ../cli/src/network-manager.c:233
+#: ../cli/src/network-manager.c:416 ../cli/src/network-manager.c:471
+#: ../cli/src/network-manager.c:509 ../cli/src/network-manager.c:548
 #, 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:424
+msgid "Networking enabled"
+msgstr "নেটৱাৰ্কিং সামৰ্থবান"
+
+#: ../cli/src/network-manager.c:440
+#, c-format
+msgid "Error: invalid 'enable' parameter: '%s'; use 'true' or 'false'."
+msgstr "ত্ৰুটি: অবৈধ 'enable' প্ৰাচল: '%s'; 'true' অথবা 'false' ব্যৱহাৰ কৰক।"
+
+#: ../cli/src/network-manager.c:450
+#, c-format
+msgid "Error: Sleeping status is not exported by NetworkManager."
+msgstr "ত্ৰুটি: নিদ্ৰা অৱস্থা NetworkManager দ্বাৰা এক্সপোৰ্ট কৰা নহয়।"
 
-#: ../cli/src/network-manager.c:209
+#: ../cli/src/network-manager.c:458
+#, c-format
+msgid "Error: invalid 'sleep' parameter: '%s'; use 'true' or 'false'."
+msgstr "ত্ৰুটি: অবৈধ 'sleep' প্ৰাচল: '%s'; 'true' অথবা 'false' ব্যৱহাৰ কৰক।"
+
+#: ../cli/src/network-manager.c:479
 msgid "WiFi enabled"
-msgstr "ৱাইফাই সক্ৰিয়"
+msgstr "WiFi সামৰ্থবান"
 
-#: ../cli/src/network-manager.c:220
+#: ../cli/src/network-manager.c:495
 #, c-format
 msgid "Error: invalid 'wifi' parameter: '%s'."
-msgstr "ত্ৰুটিৰ: অবৈধ 'wifi' স্থিতিমাপ: '%s' ।"
+msgstr "ত্ৰুটি: অবৈধ 'wifi' প্ৰাচল: '%s'।"
 
-#: ../cli/src/network-manager.c:241
+#: ../cli/src/network-manager.c:517
 msgid "WWAN enabled"
-msgstr "WWAN সক্ৰিয়"
+msgstr "WWAN সামৰ্থবান"
 
-#: ../cli/src/network-manager.c:252
+#: ../cli/src/network-manager.c:533
 #, c-format
 msgid "Error: invalid 'wwan' parameter: '%s'."
-msgstr "ত্ৰুটি: অবৈধ 'wwan' স্থিতিমাপ: '%s' ।"
+msgstr "ত্ৰুটি: অবৈধ 'wwan' প্ৰাচল: '%s'।"
+
+#: ../cli/src/network-manager.c:556
+msgid "WiMAX enabled"
+msgstr "WiMAX সামৰ্থবান"
+
+#: ../cli/src/network-manager.c:572
+#, c-format
+msgid "Error: invalid 'wimax' parameter: '%s'."
+msgstr "ত্ৰুটি: অবৈধ 'wimax' প্ৰাচল: '%s'।"
 
-#: ../cli/src/network-manager.c:263
+#: ../cli/src/network-manager.c:585
 #, c-format
 msgid "Error: 'nm' command '%s' is not valid."
-msgstr "ত্ৰুটি: 'nm' আদেশ '%s' বৈধ নহয় ।"
+msgstr "ত্ৰুটি: 'nm' কমান্ড '%s' বৈধ নহয়।"
 
-#: ../cli/src/nmcli.c:69
+#: ../cli/src/nmcli.c:76
 #, c-format
 msgid ""
 "Usage: %s [OPTIONS] OBJECT { COMMAND | help }\n"
@@ -973,6 +1648,8 @@ msgid ""
 "  -f[ields] |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"
@@ -982,7 +1659,7 @@ msgid ""
 "  dev         devices managed by NetworkManager\n"
 "\n"
 msgstr ""
-"ব্যৱহাৰপদ্ধতি: %s [OPTIONS] OBJECT { COMMAND | help }\n"
+"ব্যৱহাৰ: %s [OPTIONS] OBJECT { COMMAND | help }\n"
 "\n"
 "OPTIONS\n"
 "  -t[erse]                                   terse output\n"
@@ -991,6 +1668,8 @@ msgstr ""
 "  -f[ields] |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"
@@ -1000,810 +1679,2975 @@ msgstr ""
 "  dev         devices managed by NetworkManager\n"
 "\n"
 
-#: ../cli/src/nmcli.c:113
+#: ../cli/src/nmcli.c:121
 #, 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:151
 #, c-format
 msgid "Error: Option '--terse' is specified the second time."
-msgstr "ভুল: '--terse' বিকল্পক দ্বিতীয় বাৰৰ বাবে নিৰ্ধাৰিত কৰা হৈছে ।"
+msgstr "ত্ৰুটি: বিকল্প '--terse' দ্বিতীয়বাৰ ধাৰ্য্য কৰা হৈছে।"
 
-#: ../cli/src/nmcli.c:148
+#: ../cli/src/nmcli.c:156
 #, c-format
 msgid "Error: Option '--terse' is mutually exclusive with '--pretty'."
-msgstr "ভুল: '--terse' বিকল্প '--pretty' ৰ সৈতে আছুতীয়া ।"
+msgstr "ত্ৰুটি: বিকল্প '--terse' '--pretty' ৰ সৈতে পাৰস্পৰিকভাৱে সুকীয়া।"
 
-#: ../cli/src/nmcli.c:156
+#: ../cli/src/nmcli.c:164
 #, c-format
 msgid "Error: Option '--pretty' is specified the second time."
-msgstr "ভুল: '--pretty' বিকল্পক দ্বিতীয় বাৰৰ বাবে নিৰ্ধাৰিত কৰা হৈছে ।"
+msgstr "ত্ৰুটি: বিকল্প '--pretty' দ্বিতীয় বাৰত ধাৰ্য্য কৰা হয়।"
 
-#: ../cli/src/nmcli.c:161
+#: ../cli/src/nmcli.c:169
 #, c-format
 msgid "Error: Option '--pretty' is mutually exclusive with '--terse'."
-msgstr "ভুল: '--pretty' বিকল্প '--terse' ৰ সৈতে আছুতীয়া ।"
+msgstr "ত্ৰুটি: বিকল্পn '--pretty' '--terse' ৰ সৈতে পাৰস্পৰিকভাৱে সূকীয়া।"
 
-#: ../cli/src/nmcli.c:171 ../cli/src/nmcli.c:187
+#: ../cli/src/nmcli.c:179 ../cli/src/nmcli.c:195
 #, c-format
 msgid "Error: missing argument for '%s' option."
-msgstr "ত্ৰুটি: '%s' বিকল্পৰ বাবে তৰ্ক নাই ।"
+msgstr "ত্ৰুটি: '%s' বিকল্পৰ বাবে তৰ্ক সন্ধানহিন।"
 
-#: ../cli/src/nmcli.c:180 ../cli/src/nmcli.c:196
+#: ../cli/src/nmcli.c:188 ../cli/src/nmcli.c:204
 #, 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:211
 #, c-format
 msgid "Error: fields for '%s' options are missing."
-msgstr "ত্ৰুটি: '%s' বিকল্পমূহৰ কাৰণে ক্ষেত্ৰ নাই ।"
+msgstr "ত্ৰুটি: '%s' বিকল্পসমূহৰ বাবে ক্ষেত্ৰসমূহ সন্ধানহিন।"
 
-#: ../cli/src/nmcli.c:209
+#: ../cli/src/nmcli.c:219
 #, 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:225
 #, 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:244
 #, 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:269
+msgid "Error: Could not create NMClient object."
+msgstr "ত্ৰুটি: NMClient অবজেক্ট সৃষ্টি কৰিব পৰা নগল।"
 
-#: ../cli/src/nmcli.c:275
+#: ../cli/src/nmcli.c:285
 msgid "Success"
-msgstr "সফল"
+msgstr "সফলতা"
 
-#: ../cli/src/settings.c:407
+#: ../cli/src/settings.c:525
 #, c-format
 msgid "%d (hex-ascii-key)"
 msgstr "%d (hex-ascii-key)"
 
-#: ../cli/src/settings.c:409
+#: ../cli/src/settings.c:527
 #, c-format
 msgid "%d (104/128-bit passphrase)"
-msgstr "%d (১০৪/১২৮-বিট গুপ্তশব্দ)"
+msgstr "%d (104/128-bit পাচফ্ৰেইছ)"
 
-#: ../cli/src/settings.c:412
+#: ../cli/src/settings.c:530 ../cli/src/settings.c:658
 #, c-format
 msgid "%d (unknown)"
 msgstr "%d (অজ্ঞাত)"
 
-#: ../cli/src/settings.c:438
+#: ../cli/src/settings.c:556
 msgid "0 (unknown)"
 msgstr "0 (অজ্ঞাত)"
 
-#: ../cli/src/settings.c:444
+#: ../cli/src/settings.c:562
 msgid "any, "
-msgstr "যি কোনো, "
+msgstr "যিকোনো, "
 
-#: ../cli/src/settings.c:446
+#: ../cli/src/settings.c:564
 msgid "900 MHz, "
 msgstr "900 MHz, "
 
-#: ../cli/src/settings.c:448
+#: ../cli/src/settings.c:566
 msgid "1800 MHz, "
 msgstr "1800 MHz, "
 
-#: ../cli/src/settings.c:450
+#: ../cli/src/settings.c:568
 msgid "1900 MHz, "
 msgstr "1900 MHz, "
 
-#: ../cli/src/settings.c:452
+#: ../cli/src/settings.c:570
 msgid "850 MHz, "
 msgstr "850 MHz, "
 
-#: ../cli/src/settings.c:454
+#: ../cli/src/settings.c:572
 msgid "WCDMA 3GPP UMTS 2100 MHz, "
 msgstr "WCDMA 3GPP UMTS 2100 MHz, "
 
-#: ../cli/src/settings.c:456
+#: ../cli/src/settings.c:574
 msgid "WCDMA 3GPP UMTS 1800 MHz, "
 msgstr "WCDMA 3GPP UMTS 1800 MHz, "
 
-#: ../cli/src/settings.c:458
+#: ../cli/src/settings.c:576
 msgid "WCDMA 3GPP UMTS 1700/2100 MHz, "
 msgstr "WCDMA 3GPP UMTS 1700/2100 MHz, "
 
-#: ../cli/src/settings.c:460
+#: ../cli/src/settings.c:578
 msgid "WCDMA 3GPP UMTS 800 MHz, "
 msgstr "WCDMA 3GPP UMTS 800 MHz, "
 
-#: ../cli/src/settings.c:462
+#: ../cli/src/settings.c:580
 msgid "WCDMA 3GPP UMTS 850 MHz, "
 msgstr "WCDMA 3GPP UMTS 850 MHz, "
 
-#: ../cli/src/settings.c:464
+#: ../cli/src/settings.c:582
 msgid "WCDMA 3GPP UMTS 900 MHz, "
 msgstr "WCDMA 3GPP UMTS 900 MHz, "
 
-#: ../cli/src/settings.c:466
+#: ../cli/src/settings.c:584
 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:586
+msgid "WCDMA 3GPP UMTS 1900 MHz, "
+msgstr "WCDMA 3GPP UMTS 1900 MHz, "
+
+#: ../cli/src/settings.c:588
+msgid "WCDMA 3GPP UMTS 2600 MHz, "
+msgstr "WCDMA 3GPP UMTS 2600 MHz, "
+
+#: ../cli/src/settings.c:606
+msgid "0 (NONE)"
+msgstr "0 (NONE)"
+
+#: ../cli/src/settings.c:612
+msgid "REORDER_HEADERS, "
+msgstr "REORDER_HEADERS, "
+
+#: ../cli/src/settings.c:614
+msgid "GVRP, "
+msgstr "GVRP, "
+
+#: ../cli/src/settings.c:616
+msgid "LOOSE_BINDING, "
+msgstr "LOOSE_BINDING, "
+
+#: ../cli/src/settings.c:652
+#, c-format
+msgid "%d (disabled)"
+msgstr "%d (অসামৰ্থবান)"
+
+#: ../cli/src/settings.c:654
+#, c-format
+msgid "%d (enabled, prefer public IP)"
+msgstr "%d (সামৰ্থবান, ৰাজহুৱা IP পছন্দ)"
+
+#: ../cli/src/settings.c:656
+#, c-format
+msgid "%d (enabled, prefer temporary IP)"
+msgstr "%d (সামৰ্থবান, অস্থায়ী IP পছন্দ)"
+
+#: ../cli/src/settings.c:777 ../cli/src/settings.c:973
+#: ../cli/src/settings.c:1682
 msgid "auto"
-msgstr "স্বয়ংক্ৰিয়"
+msgstr "স্বচালিত"
 
-#: ../cli/src/settings.c:704 ../cli/src/settings.c:707 ../cli/src/utils.c:172
-msgid "not set"
-msgstr "নিৰ্ধাৰত কৰা হোৱা নাই"
+#: ../cli/src/utils.c:103
+#, c-format
+msgid "Error converting IP4 address '0x%X' to text form"
+msgstr "IP4 ঠিকনা '0x%X' ক লিখনী বিন্যাসলে পৰিবৰ্তন কৰোতে ত্ৰুটি"
+
+#: ../cli/src/utils.c:131
+#, c-format
+msgid "Error converting IP6 address '%s' to text form"
+msgstr "IP6 ঠিকনা '%s' ক লিখনী বিন্যাসত পৰিবৰ্তন কৰোতে ত্ৰুটি"
 
-#: ../cli/src/utils.c:124
+#: ../cli/src/utils.c:232
 #, c-format
 msgid "field '%s' has to be alone"
-msgstr "'%s' ক্ষেত্ৰ অকলে থাকিব লাগিব"
+msgstr "ক্ষেত্ৰ '%s' অকলে থাকিব লাগিব"
 
-#: ../cli/src/utils.c:127
+#: ../cli/src/utils.c:235
 #, c-format
 msgid "invalid field '%s'"
 msgstr "অবৈধ ক্ষেত্ৰ '%s'"
 
-#: ../cli/src/utils.c:146
-#, c-format
+#: ../cli/src/utils.c:254
 msgid "Option '--terse' requires specifying '--fields'"
-msgstr "'--terse' বিকল্পক '--fields' নিৰ্ধাৰণ কৰাৰ প্ৰয়োজন"
+msgstr "বিকল্পৰ '--terse' ৰ '--fields' ধাৰ্য্য কৰাৰ প্ৰয়োজন"
 
-#: ../cli/src/utils.c:150
+#: ../cli/src/utils.c:258
 #, c-format
 msgid "Option '--terse' requires specific '--fields' option values , not '%s'"
-msgstr "'--terse' বিকল্পক নিৰ্দিষ্ট '--fields' বিকল্পৰ মানৰ প্ৰয়োজন, '%s' নহয়"
+msgstr ""
+"বিকল্প '--terse' ৰ বিশেষ '--fields' বিকল্প মানসমূহ ধাৰ্য্য কৰাৰ প্ৰয়োজন, "
+"'%s' নহয়"
+
+#: ../cli/src/utils.c:468
+#, 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:476
+#, c-format
+msgid "Error: NameHasOwner request failed: %s"
+msgstr "ত্ৰুটি: NameHasOwner অনুৰোধ ব্যৰ্থ হল: %s"
+
+#: ../cli/src/utils.c:521
+#, 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:530
+#, 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:120
+#: ../libnm-util/crypto.c:133
 #, 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:146
 #, c-format
 msgid "Doesn't look like a PEM private key file."
-msgstr "এটা PEM গোপনীয় চাবি নথিপত্ৰ নহয়  ।"
+msgstr "দেখাত এটা PEM ব্যক্তিগত কি' ফাইল যেন নালাগে।"
 
-#: ../libnm-util/crypto.c:138
+#: ../libnm-util/crypto.c:154
 #, c-format
 msgid "Not enough memory to store PEM file data."
-msgstr "PEM নথিপত্ৰৰ তথ্যে সংৰক্ষণৰ বাবে পৰ্যাপ্ত স্মৃতিশক্তি অনুপস্থিত  ।"
+msgstr "PEM ফাইল তথ্য সংৰক্ষণ কৰিবলে পৰ্যাপ্ত মেমৰি নাই।"
 
-#: ../libnm-util/crypto.c:154
+#: ../libnm-util/crypto.c:170
 #, c-format
 msgid "Malformed PEM file: Proc-Type was not first tag."
-msgstr "ভুল PEM নথিপত্ৰ: প্ৰথম টেগ ৰূপে Proc-Type ব্যৱহাৰ কৰা নহয়  ।"
+msgstr "ক্ষতিগ্ৰস্থ PEM ফাইল: Proc-Type প্ৰথম টেগ নাছিল।"
 
-#: ../libnm-util/crypto.c:162
+#: ../libnm-util/crypto.c:178
 #, c-format
 msgid "Malformed PEM file: unknown Proc-Type tag '%s'."
-msgstr "ভুল PEM নথিপত্ৰ: অজ্ঞাত Proc-Type টেগ '%s'  ।"
+msgstr "ক্ষতিগ্ৰস্থ PEM ফাইল: অজ্ঞাত Proc-Type tag '%s'"
 
-#: ../libnm-util/crypto.c:172
+#: ../libnm-util/crypto.c:188
 #, c-format
 msgid "Malformed PEM file: DEK-Info was not the second tag."
-msgstr "ভুল PEM নথিপত্ৰ: দ্বিতীয় টেগ ৰূপে DEK-Info ধাৰ্য কৰা নহয়  ।"
+msgstr "ক্ষতিগ্ৰস্থ PEM ফাইল: DEK-Info দ্বিতীয় টেগ নাছিল।"
 
-#: ../libnm-util/crypto.c:183
+#: ../libnm-util/crypto.c:199
 #, c-format
 msgid "Malformed PEM file: no IV found in DEK-Info tag."
-msgstr "ভুল PEM নথিপত্ৰ: DEK-Info টেগত কোনো IV পোৱা নাযায়  ।"
+msgstr "ক্ষতিগ্ৰস্থ PEM ফাইল: DEK-Info টেগত কোনো IV পোৱা নগল।"
 
-#: ../libnm-util/crypto.c:190
+#: ../libnm-util/crypto.c:206
 #, c-format
 msgid "Malformed PEM file: invalid format of IV in DEK-Info tag."
-msgstr "ভুল PEM নথিপত্ৰ: DEK-Info টেগত IV ৰ বিন্যাস বৈধ নহয়  ।"
+msgstr "ক্ষতিগ্ৰস্থ PEM ফাইল: DEK-Info টেগত IV ৰ অবৈধ বিন্যাস।"
 
-#: ../libnm-util/crypto.c:203
+#: ../libnm-util/crypto.c:219
 #, c-format
 msgid "Malformed PEM file: unknown private key cipher '%s'."
-msgstr "ভুল PEM নথিপত্ৰ: ব্যক্তিগত-চাবিৰ অজ্ঞাত ছাইফাৰ '%s'  ।"
+msgstr "ক্ষতিগ্ৰস্থ PEM ফাইল: অজ্ঞাত ব্যক্তিগত কি' চিফাৰ '%s'।"
 
-#: ../libnm-util/crypto.c:222
+#: ../libnm-util/crypto.c:238
 #, c-format
 msgid "Could not decode private key."
-msgstr "ব্যক্তিগত চাবি ডিকোড কৰিবলৈ ব্যৰ্থ  ।"
+msgstr "ব্যক্তিগত কি' ডিক'ড কৰিব পৰা নগল।"
 
-#: ../libnm-util/crypto.c:267
-#, c-format
-msgid "PEM certificate '%s' had no end tag '%s'."
-msgstr "'%s' PEM প্ৰমাণপত্ৰত সমাপ্তিৰ টেগ '%s' নাই  ।"
+#: ../libnm-util/crypto.c:284
+msgid "Failed to find expected PKCS#8 start tag."
+msgstr "প্ৰত্যাশিত PKCS#8 আৰম্ভণি  টেগ সন্ধান কৰিবলে ব্যৰ্থ।"
 
-#: ../libnm-util/crypto.c:277
+#: ../libnm-util/crypto.c:292
 #, c-format
-msgid "Failed to decode certificate."
-msgstr "প্ৰমাণপত্ৰ ডিকোড কৰিবলৈ ব্যৰ্থ  ।"
+msgid "Failed to find expected PKCS#8 end tag '%s'."
+msgstr "প্ৰত্যাশিত PKCS#8 অন্ত টেগ '%s' সন্ধান কৰিবলে ব্যৰ্থ।"
 
-#: ../libnm-util/crypto.c:286
-#, c-format
-msgid "Not enough memory to store certificate data."
-msgstr "প্ৰমাণপত্ৰৰ তথ্য সংৰক্ষণৰ উদ্দেশ্যে পৰ্যাপ্ত স্মৃতিশক্তি অনুপস্থিত  ।"
+#: ../libnm-util/crypto.c:312
+msgid "Not enough memory to store private key data."
+msgstr "ব্যক্তিগত কি' তথ্য সংৰক্ষণ কৰিবলে পৰ্যাপ্ত মেমৰি নাই।"
 
-#: ../libnm-util/crypto.c:294
+#: ../libnm-util/crypto.c:317
+msgid "Failed to decode PKCS#8 private key."
+msgstr "PKCS#8 ব্যক্তিগত কি' ডি'কড কৰিবলে ব্যৰ্থ।"
+
+#: ../libnm-util/crypto.c:339 ../libnm-util/crypto.c:625
 #, c-format
-msgid "Not enough memory to store file data."
-msgstr "নথিপত্ৰৰ তথ্য সংৰক্ষণৰ উদ্দেশ্যে পৰ্যাপ্ত স্মৃতিশক্তি অনুপস্থিত  ।"
+msgid "Not enough memory to store certificate data."
+msgstr "প্ৰমাণপত্ৰ তথ্য সংৰক্ষণ কৰিবলে পৰ্যাপ্ত মেমৰি নাই।"
 
-#: ../libnm-util/crypto.c:324
+#: ../libnm-util/crypto.c:365
 #, c-format
 msgid "IV must be an even number of bytes in length."
-msgstr "IV ৰ দৈৰ্ঘ্যৰ পৰিমাণ যুগ্ম সংখ্যক বাইটৰ হোৱা আৱশ্যক  ।"
+msgstr "IV দৈৰ্ঘ্যত বাইটসমূহৰ এটা ধনাত্মক সংখ্যা হব লাগিব।"
 
-#: ../libnm-util/crypto.c:333
+#: ../libnm-util/crypto.c:374
 #, c-format
 msgid "Not enough memory to store the IV."
-msgstr "IV সংৰক্ষণৰ বাবে পৰ্যাপ্ত স্মৃতিশক্তি অনুপস্থিত  ।"
+msgstr "IV সংৰক্ষণ কৰিবলে পৰ্যাপ্ত মেমৰি নাই।"
 
-#: ../libnm-util/crypto.c:344
+#: ../libnm-util/crypto.c:385
 #, c-format
 msgid "IV contains non-hexadecimal digits."
-msgstr "IV-ত hexadecimal-নোহোৱা অন্য সংখ্যা উপস্থিত  ।"
+msgstr "IV এ নন-হেক্সাডেচিমেল ডিজিটসমূহ অন্তৰ্ভুক্ত কৰে।"
 
-#: ../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_nss.c:336
+#: ../libnm-util/crypto.c:423 ../libnm-util/crypto_gnutls.c:147
+#: ../libnm-util/crypto_gnutls.c:265 ../libnm-util/crypto_nss.c:167
+#: ../libnm-util/crypto_nss.c:332
 #, c-format
 msgid "Private key cipher '%s' was unknown."
-msgstr "ব্যক্তিগত চাবিৰ ছাইফাৰ '%s' অজ্ঞাত  ।"
+msgstr "ব্যক্তিগত কি' চিফাৰ '%s' অজ্ঞাত আছিল।"
 
-#: ../libnm-util/crypto.c:391
+#: ../libnm-util/crypto.c:432
 #, c-format
 msgid "Not enough memory to decrypt private key."
-msgstr "ব্যক্তিগত চাবি ডিক্ৰিপ্ট কৰাৰ বাবে পৰ্যাপ্ত স্মৃতিশক্তি অনুপস্থিত  ।"
+msgstr "ব্যক্তিগত কি' ডিক্ৰিপ্ট কৰিবলে পৰ্যাপ্ত মেমৰি নাই।"
+
+#: ../libnm-util/crypto.c:497
+#, c-format
+msgid "Not enough memory to store decrypted private key."
+msgstr "ডিক্ৰিপ্টেড ব্যক্তিগত কি' সংৰক্ষণ কৰিবলে পৰ্যাপ্ত মেমৰি নাই।"
 
-#: ../libnm-util/crypto.c:511
+#: ../libnm-util/crypto.c:542
 #, c-format
 msgid "Unable to determine private key type."
-msgstr "ব্যক্তিগত চাবিৰ ধৰণ নিৰ্ধাৰণ কৰিবলৈ ব্যৰ্থ  ।"
+msgstr "ব্যক্তিগত কি ধৰণ নিৰ্ধাৰণ কৰিবলে অক্ষম।"
 
-#: ../libnm-util/crypto.c:530
+#: ../libnm-util/crypto.c:597
 #, c-format
-msgid "Not enough memory to store decrypted private key."
-msgstr "ডিক্ৰিপ্ট কৰা ব্যক্তিগত চাবি সংৰক্ষণৰ বাবে পৰ্যাপ্ত স্মৃতিশক্তি অনুপস্থিত  ।"
+msgid "PEM certificate had no start tag '%s'."
+msgstr "PEM প্ৰমাণপত্ৰৰ কোনো আৰম্ভণি টেগ '%s' নাই।"
+
+#: ../libnm-util/crypto.c:606
+#, c-format
+msgid "PEM certificate had no end tag '%s'."
+msgstr "PEM প্ৰমাণপত্ৰৰ কোনো অন্ত টেগ '%s' নাই।"
 
-#: ../libnm-util/crypto_gnutls.c:49
+#: ../libnm-util/crypto.c:630
+#, c-format
+msgid "Failed to decode certificate."
+msgstr "প্ৰমাণপত্ৰ ডিক'ড কৰিবলে ব্যৰ্থ।"
+
+#: ../libnm-util/crypto_gnutls.c:50
 msgid "Failed to initialize the crypto engine."
-msgstr "ক্ৰিপ্টো কলঘৰ আৰম্ভ কৰিবলৈ ব্যৰ্থ  ।"
+msgstr "ক্ৰিপ্টো ইঞ্জিন আৰম্ভ কৰিবলে ব্যৰ্থ।"
 
-#: ../libnm-util/crypto_gnutls.c:93
+#: ../libnm-util/crypto_gnutls.c:92
 #, c-format
 msgid "Failed to initialize the MD5 engine: %s / %s."
-msgstr "MD5 কলঘৰ আৰম্ভ কৰিবলৈ ব্যৰ্থ: %s / %s  ।"
+msgstr "MD5 ইঞ্জিন আৰম্ভ কৰিবলে ব্যৰ্থ: %s / %s।"
 
-#: ../libnm-util/crypto_gnutls.c:156
+#: ../libnm-util/crypto_gnutls.c:155
 #, c-format
 msgid "Invalid IV length (must be at least %zd)."
-msgstr "IV ৰ অবৈধ দৈৰ্ঘ্য (অন্তত %zd হোৱা আৱশ্যক) ।"
+msgstr "অবৈধ IV দৈৰ্ঘ্য (অন্তত %zd হব লাগিব)।"
 
-#: ../libnm-util/crypto_gnutls.c:165 ../libnm-util/crypto_nss.c:188
+#: ../libnm-util/crypto_gnutls.c:164 ../libnm-util/crypto_nss.c:184
 #, c-format
 msgid "Not enough memory for decrypted key buffer."
-msgstr "ডিক্ৰিপ্ট কৰা চাবিৰ বাফাৰ বাবে পৰ্যাপ্ত স্মৃতিশক্তি অনুপস্থিত  ।"
+msgstr "ডিক্ৰিপ্টেড কি' বাফাৰৰ বাবে পৰ্যাপ্ত মেমৰি নাই।"
 
-#: ../libnm-util/crypto_gnutls.c:173
+#: ../libnm-util/crypto_gnutls.c:172
 #, c-format
 msgid "Failed to initialize the decryption cipher context: %s / %s."
-msgstr "ডিক্ৰিপছন ছাইফাৰৰ সন্দৰ্ভ আৰম্ভ কৰিবলৈ ব্যৰ্থ: %s / %s  ।"
+msgstr "ডিক্ৰিপষণ চিফাৰ পৰিপ্ৰেক্ষতিত আৰম্ভ কৰিবলে ব্যৰ্থ: %s / %s।"
 
-#: ../libnm-util/crypto_gnutls.c:182
+#: ../libnm-util/crypto_gnutls.c:181
 #, c-format
 msgid "Failed to set symmetric key for decryption: %s / %s."
-msgstr "ডিক্ৰিপছনৰ বাবে চিমেট্ৰিক চাবি নিৰ্ধাৰণ কৰিবলৈ ব্যৰ্থ: %s / %s  ।"
+msgstr "ডিক্ৰিপষণৰ বাবে সমমিতি কি' সংহতি কৰিবলে ব্যৰ্থ: %s / %s।"
 
-#: ../libnm-util/crypto_gnutls.c:191
+#: ../libnm-util/crypto_gnutls.c:190
 #, c-format
 msgid "Failed to set IV for decryption: %s / %s."
-msgstr "ডিক্ৰিপছনৰ উদ্দেশ্যে IV নিৰ্ধাৰণ কৰিবলৈ ব্যৰ্থ: %s / %s  ।"
+msgstr "ডিক্ৰিপষণৰ বাবে IV সংহতি কৰিবলে ব্যৰ্থ: %s / %s।"
 
-#: ../libnm-util/crypto_gnutls.c:200
+#: ../libnm-util/crypto_gnutls.c:199
 #, c-format
 msgid "Failed to decrypt the private key: %s / %s."
-msgstr "ব্যক্তিগত চাবি ডিক্ৰিপ্ট কৰিবলৈ ব্যৰ্থ: %s / %s  ।"
+msgstr "ব্যক্তিগত কি' ডিক্ৰিপ্ট কৰিবলে ব্যৰ্থ: %s / %s।"
 
-#: ../libnm-util/crypto_gnutls.c:210 ../libnm-util/crypto_nss.c:267
+#: ../libnm-util/crypto_gnutls.c:209 ../libnm-util/crypto_nss.c:263
 #, c-format
 msgid "Failed to decrypt the private key: unexpected padding length."
-msgstr "ব্যক্তিগত চাবি ডিক্ৰিপ্ট কৰিবলৈ ব্যৰ্থ: পেডিংৰ দৈৰ্ঘ্য বৈধ নহয় ।"
+msgstr "ব্যক্তিগত কি' ডিক্ৰিপ্ট কৰিবলে ব্যৰ্থ: অপ্ৰত্যাশিত পেডিং দৈৰ্ঘ্য।"
 
-#: ../libnm-util/crypto_gnutls.c:221 ../libnm-util/crypto_nss.c:278
+#: ../libnm-util/crypto_gnutls.c:220 ../libnm-util/crypto_nss.c:274
 #, c-format
 msgid "Failed to decrypt the private key."
-msgstr "ব্যক্তিগত চাবি ডিক্ৰিপ্ট কৰিবলৈ ব্যৰ্থ  ।"
+msgstr "ব্যক্তিগত কি' ডিক্ৰিপ্ট কৰিবলে ব্যৰ্থ।"
 
-#: ../libnm-util/crypto_gnutls.c:286 ../libnm-util/crypto_nss.c:356
+#: ../libnm-util/crypto_gnutls.c:285 ../libnm-util/crypto_nss.c:352
 #, c-format
 msgid "Could not allocate memory for encrypting."
-msgstr "এনক্ৰিপ্ট কৰাৰ বাবে স্মৃতিশক্তি বিতৰণ কৰিবলৈ ব্যৰ্থ ।"
+msgstr "ইনক্ৰিপ্ট কৰিবলে মেমৰি আবন্টন কৰিব পৰা নগল।"
 
-#: ../libnm-util/crypto_gnutls.c:294
+#: ../libnm-util/crypto_gnutls.c:293
 #, c-format
 msgid "Failed to initialize the encryption cipher context: %s / %s."
-msgstr "এনক্ৰিপশন চাইফাৰৰ সন্দৰ্ভ আৰম্ভ কৰিবলৈ ব্যৰ্থ: %s / %s ।"
+msgstr "ইনক্ৰিপষণ চিফাৰ পৰিপ্ৰেক্ষতিত আৰম্ভ কৰিবলে ব্যৰ্থ: %s / %s।"
 
-#: ../libnm-util/crypto_gnutls.c:303
+#: ../libnm-util/crypto_gnutls.c:302
 #, c-format
 msgid "Failed to set symmetric key for encryption: %s / %s."
-msgstr "এনক্ৰিপশনৰ বাবে চিমেট্ৰিক-কি নিৰ্ধাৰণ কৰিবলৈ ব্যৰ্থ: %s / %s ।"
+msgstr "ইনক্ৰিপষণৰ বাবে সমমিতি কি' সংহতি কৰিবলে ব্যৰ্থ: %s / %s।"
 
-#: ../libnm-util/crypto_gnutls.c:313
+#: ../libnm-util/crypto_gnutls.c:312
 #, c-format
 msgid "Failed to set IV for encryption: %s / %s."
-msgstr "এনক্ৰিপশনৰ উদ্দেশ্যে IV নিৰ্ধাৰণ কৰিবলৈ ব্যৰ্থ: %s / %s ।"
+msgstr "ইনক্ৰিপষণৰ বাবে IV সংহতি কৰিবলে ব্যৰ্থ: %s / %s।"
 
-#: ../libnm-util/crypto_gnutls.c:322
+#: ../libnm-util/crypto_gnutls.c:321
 #, c-format
 msgid "Failed to encrypt the data: %s / %s."
-msgstr "তথ্য এনক্ৰিপ্ট কৰিবলৈ ব্যৰ্থ: %s / %s ।"
+msgstr "তথ্য ইনক্ৰিপ্ট কৰিবলে ব্যৰ্থ: %s / %s।"
 
-#: ../libnm-util/crypto_gnutls.c:362
+#: ../libnm-util/crypto_gnutls.c:361
 #, c-format
 msgid "Error initializing certificate data: %s"
-msgstr "প্ৰমাণপত্ৰৰ তথ্য আৰম্ভ কৰিবলৈ সমস্যা: %s"
+msgstr "প্ৰমাণপত্ৰ তথ্য আৰম্ভ কৰিবলে ত্ৰুটি: %s"
 
-#: ../libnm-util/crypto_gnutls.c:384
+#: ../libnm-util/crypto_gnutls.c:383
 #, c-format
 msgid "Couldn't decode certificate: %s"
-msgstr "প্ৰমাণপত্ৰ ডি-কোড কৰিবলৈ ব্যৰ্থ: %s"
+msgstr "প্ৰমাণপত্ৰ ডি'কড কৰিব পৰা নগল: %s"
 
-#: ../libnm-util/crypto_gnutls.c:408
+#: ../libnm-util/crypto_gnutls.c:407
 #, c-format
 msgid "Couldn't initialize PKCS#12 decoder: %s"
-msgstr "PKCS#12 ডিকোডাৰ আৰম্ভ কৰিবলৈ ব্যৰ্থ: %s"
+msgstr "PKCS#12 ডি'কডাৰ আৰম্ভ কৰিব পৰা নগল: %s"
 
-#: ../libnm-util/crypto_gnutls.c:421
+#: ../libnm-util/crypto_gnutls.c:420
 #, c-format
 msgid "Couldn't decode PKCS#12 file: %s"
-msgstr "PKCS#12 নথিপত্ৰ ডিকোড কৰিবলৈ ব্যৰ্থ: %s"
+msgstr "PKCS#12 ফাইল ডি'কড কৰিব পৰা নগল: %s"
 
-#: ../libnm-util/crypto_gnutls.c:433
+#: ../libnm-util/crypto_gnutls.c:432
 #, c-format
 msgid "Couldn't verify PKCS#12 file: %s"
-msgstr "PKCS#12 নথিপত্ৰ প্ৰমাণিত কৰিবলৈ ব্যৰ্থ: %s"
+msgstr "PKCS#12 ফাইল সতা সত্য নিৰূপণ কৰিব পৰা নগল: %s"
+
+#: ../libnm-util/crypto_gnutls.c:460
+#, c-format
+msgid "Couldn't initialize PKCS#8 decoder: %s"
+msgstr "PKCS#8 ডি'কডাৰ আৰম্ভ কৰিব পৰা নগল: %s"
+
+#: ../libnm-util/crypto_gnutls.c:483
+#, c-format
+msgid "Couldn't decode PKCS#8 file: %s"
+msgstr "PKCS#8 ফাইল ডি'কড কৰিব পৰা নগল: %s"
 
 #: ../libnm-util/crypto_nss.c:56
 #, c-format
 msgid "Failed to initialize the crypto engine: %d."
-msgstr "ক্ৰিপ্টো কলঘৰ আৰম্ভ কৰিবলৈ ব্যৰ্থ: %d  ।"
+msgstr "ক্ৰিপ্টো ইঞ্জিন আৰম্ভ কৰিবলে ব্যৰ্থ: %d।"
 
-#: ../libnm-util/crypto_nss.c:111
+#: ../libnm-util/crypto_nss.c:107
 #, c-format
 msgid "Failed to initialize the MD5 context: %d."
-msgstr "MD5 সন্দৰ্ভ আৰম্ভ কৰিবলৈ ব্যৰ্থ: %d  ।"
+msgstr "MD5 পৰিপ্ৰেক্ষতিত আৰম্ভ কৰিবলে ব্যৰ্থ: %d।"
 
-#: ../libnm-util/crypto_nss.c:179
+#: ../libnm-util/crypto_nss.c:175
 #, c-format
 msgid "Invalid IV length (must be at least %d)."
-msgstr "IV ৰ অবৈধ দৈৰ্ঘ্য (অন্তত %d হোৱা আৱশ্যক) ।"
+msgstr "অবৈধ IV দৈৰ্ঘ্য (অন্তত %d হব লাগিব)।"
 
-#: ../libnm-util/crypto_nss.c:196
+#: ../libnm-util/crypto_nss.c:192
 #, c-format
 msgid "Failed to initialize the decryption cipher slot."
-msgstr "ডিক্ৰিপছন ছাইফাৰ স্লট আৰম্ভ কৰিবলৈ ব্যৰ্থ  ।"
+msgstr "ডিক্ৰিপষণ চিফাৰ স্লট আৰম্ভ কৰিবলে ব্যৰ্থ।"
 
-#: ../libnm-util/crypto_nss.c:206
+#: ../libnm-util/crypto_nss.c:202
 #, c-format
 msgid "Failed to set symmetric key for decryption."
-msgstr "ডিক্ৰিপছনৰ উদ্দেশ্যে চিমেট্ৰিক চাবি নিৰ্ধাৰণ কৰিবলৈ ব্যৰ্থ  ।"
+msgstr "ডিক্ৰিপষণৰ বাবে সমমিতি কি' সংহতি কৰিবলে ব্যৰ্থ।"
 
-#: ../libnm-util/crypto_nss.c:216
+#: ../libnm-util/crypto_nss.c:212
 #, c-format
 msgid "Failed to set IV for decryption."
-msgstr "ডিক্ৰিপছনৰ উদ্দেশ্যে IV নিৰ্ধাৰণ কৰিবলৈ ব্যৰ্থ  ।"
+msgstr "ডিক্ৰিপষণৰ বাবে IV সংহতি কৰিবলে ব্যৰ্থ।"
 
-#: ../libnm-util/crypto_nss.c:224
+#: ../libnm-util/crypto_nss.c:220
 #, c-format
 msgid "Failed to initialize the decryption context."
-msgstr "ডিক্ৰিপছন সন্দৰ্ভ আৰম্ভ কৰিবলৈ ব্যৰ্থ  ।"
+msgstr "ডিক্ৰিপষণ পৰিপ্ৰেক্ষতিত আৰম্ভ কৰিবলে ব্যৰ্থ।"
 
-#: ../libnm-util/crypto_nss.c:237
+#: ../libnm-util/crypto_nss.c:233
 #, c-format
 msgid "Failed to decrypt the private key: %d."
-msgstr "ব্যক্তিগত চাবি ডিক্ৰিপ্ট কৰিবলৈ ব্যৰ্থ: %d  ।"
+msgstr "ব্যক্তিগত কি' ডিক্ৰিপ্ট কৰিবলে ব্যৰ্থ: %d।"
 
-#: ../libnm-util/crypto_nss.c:245
+#: ../libnm-util/crypto_nss.c:241
 #, c-format
 msgid "Failed to decrypt the private key: decrypted data too large."
-msgstr "ব্যক্তিগত চাবি ডিক্ৰিপ্ট কৰিবলৈ ব্যৰ্থ: ডিক্ৰিপ্ট কৰা তথ্য অত্যাধিক ডাঙৰ ।"
+msgstr "ব্যক্তিগত কি' ডিক্ৰিপ্ট কৰিবলে ব্যৰ্থ: ডিক্ৰিপ্ট কৰা তথ্য অতি ডাঙৰ।"
 
-#: ../libnm-util/crypto_nss.c:256
+#: ../libnm-util/crypto_nss.c:252
 #, c-format
 msgid "Failed to finalize decryption of the private key: %d."
-msgstr "ব্যক্তিগত চাবিৰ ডিক্ৰিপছন সমাপ্ত কৰিবলৈ ব্যৰ্থ: %d  ।"
+msgstr "ব্যক্তিগত কি'ৰ ডিক্ৰিপষণ সম্পূৰ্ণ কৰিবলে ব্যৰ্থ: %d।"
 
-#: ../libnm-util/crypto_nss.c:364
+#: ../libnm-util/crypto_nss.c:360
 #, c-format
 msgid "Failed to initialize the encryption cipher slot."
-msgstr "এনক্ৰিপশন চাইফাৰ স্লট আৰম্ভ কৰিবলৈ ব্যৰ্থ ।"
+msgstr "ইনক্ৰিপষণ চিফাৰ স্লট আৰম্ভ কৰিবলে ব্যৰ্থ।"
 
-#: ../libnm-util/crypto_nss.c:372
+#: ../libnm-util/crypto_nss.c:368
 #, c-format
 msgid "Failed to set symmetric key for encryption."
-msgstr "এনক্ৰিপশনৰ উদ্দেশ্যে চিমেট্ৰিক-কি নিৰ্ধাৰণ কৰিবলৈ ব্যৰ্থ ।"
+msgstr "ইনক্ৰিপষণৰ বাবে সমমিতি কি' সংহতি কৰিবলে ব্যৰ্থ।"
 
-#: ../libnm-util/crypto_nss.c:380
+#: ../libnm-util/crypto_nss.c:376
 #, c-format
 msgid "Failed to set IV for encryption."
-msgstr "এনক্ৰিপশনৰ উদ্দেশ্যে IV নিৰ্ধাৰণ কৰিবলৈ ব্যৰ্থ ।"
+msgstr "ইনক্ৰিপষণৰ বাবে IV সংহতি কৰিবলে ব্যৰ্থ।"
 
-#: ../libnm-util/crypto_nss.c:388
+#: ../libnm-util/crypto_nss.c:384
 #, c-format
 msgid "Failed to initialize the encryption context."
-msgstr "এনক্ৰিপশন সন্দৰ্ভ আৰম্ভ কৰিবলৈ ব্যৰ্থ ।"
+msgstr "ইনক্ৰিপষণ পৰিপ্ৰেক্ষতিত আৰম্ভ কৰিবলে ব্যৰ্থ।"
 
-#: ../libnm-util/crypto_nss.c:396
+#: ../libnm-util/crypto_nss.c:392
 #, c-format
 msgid "Failed to encrypt: %d."
-msgstr "এনক্ৰিপ্ট কৰিবলৈ ব্যৰ্থ: %d ।"
+msgstr "ইনক্ৰিপ্ট কৰিবলে ব্যৰ্থ: %d।"
 
-#: ../libnm-util/crypto_nss.c:404
+#: ../libnm-util/crypto_nss.c:400
 #, c-format
 msgid "Unexpected amount of data after encrypting."
-msgstr "এনক্ৰিপ্ট কৰাৰ পিছত অপ্ৰত্যাশিত পৰিমাণ তথ্য উপলব্ধ হৈছে ।"
+msgstr "ইনক্ৰিপ্ট কৰাৰ পিছত তথ্যৰ অপ্ৰত্যাশিত পৰিমাণ।"
 
-#: ../libnm-util/crypto_nss.c:447
+#: ../libnm-util/crypto_nss.c:443
 #, c-format
 msgid "Couldn't decode certificate: %d"
-msgstr "প্ৰমাণপত্ৰ ডিকোড কৰিবলৈ ব্যৰ্থ: %d"
+msgstr "প্ৰমাণপত্ৰ ডিক'ড কৰিব পৰা নগল: %d"
 
-#: ../libnm-util/crypto_nss.c:482
+#: ../libnm-util/crypto_nss.c:478
 #, c-format
 msgid "Couldn't convert password to UCS2: %d"
-msgstr "গুপ্তশব্দক UCS2 লৈ ৰূপান্তৰ কৰিবলৈ ব্যৰ্থ: %d"
+msgstr "পাছৱাৰ্ডক UCS2 লে পৰিবৰ্তন কৰিব পৰা নগল: %d"
 
-#: ../libnm-util/crypto_nss.c:510
+#: ../libnm-util/crypto_nss.c:506
 #, c-format
 msgid "Couldn't initialize PKCS#12 decoder: %d"
-msgstr "PKCS#12 ডিকোডাৰ আৰম্ভ কৰিবলৈ ব্যৰ্থ: %d"
+msgstr "PKCS#12 ডি'কডাৰ আৰম্ভ কৰিব পৰা নগল: %d"
 
-#: ../libnm-util/crypto_nss.c:519
+#: ../libnm-util/crypto_nss.c:515
 #, c-format
 msgid "Couldn't decode PKCS#12 file: %d"
-msgstr "PKCS#12 নথিপত্ৰ ডিকোড কৰিবলৈ ব্যৰ্থ: %d"
+msgstr "PKCS#12 ফাইল ডি'কড কৰিব পৰা নগল: %d"
 
-#: ../libnm-util/crypto_nss.c:528
+#: ../libnm-util/crypto_nss.c:524
 #, c-format
 msgid "Couldn't verify PKCS#12 file: %d"
-msgstr "PKCS#12 নথিপত্ৰ প্ৰমাণিত কৰিবলৈ ব্যৰ্থ: %d"
+msgstr "PKCS#12 ফাইল সতা সত্য নিৰূপণ কৰিব পৰা নগল: %d"
 
-#: ../libnm-util/crypto_nss.c:557
+#: ../libnm-util/crypto_nss.c:568
 msgid "Could not generate random data."
-msgstr "বিশৃঙ্খল তথ্য নিৰ্মাণ কৰিবলৈ ব্যৰ্থ ।"
+msgstr "যাদৃচ্ছিক তথ্য সৃজন কৰিব পৰা নগল।"
 
-#: ../libnm-util/nm-utils.c:1925
+#: ../libnm-util/nm-utils.c:2040
 #, c-format
 msgid "Not enough memory to make encryption key."
-msgstr "এনক্ৰিপশন-কি নিৰ্মাণৰ বাবে পৰ্যাপ্ত স্মৃতিশক্তি অনুপস্থিত ।"
+msgstr "ইনক্ৰিপষণ কি' নিৰ্মাণ কৰিবলে পৰ্যাপ্ত মেমৰি নাই।"
 
-#: ../libnm-util/nm-utils.c:2035
+#: ../libnm-util/nm-utils.c:2150
 msgid "Could not allocate memory for PEM file creation."
-msgstr "PEM নথিপত্ৰ নিৰ্মাণৰ বাবে স্মৃতিশক্তি বিতৰণ কৰিবলৈ ব্যৰ্থ ।"
+msgstr "PEM ফাইল সৃষ্টিৰ বাবে মেমৰি আবন্টন কৰিব পৰা নগল।"
 
-#: ../libnm-util/nm-utils.c:2047
+#: ../libnm-util/nm-utils.c:2162
 #, c-format
 msgid "Could not allocate memory for writing IV to PEM file."
-msgstr "PEM নথিপত্ৰত IV লিখাৰ বাবে স্মৃতিশক্তি বিতৰণ কৰিবলৈ ব্যৰ্থ ।"
+msgstr "IV ক PEM ফাইললে লিখিবলে মেমৰি আবন্টন কৰিব পৰা নগল।"
 
-#: ../libnm-util/nm-utils.c:2059
+#: ../libnm-util/nm-utils.c:2174
 #, c-format
 msgid "Could not allocate memory for writing encrypted key to PEM file."
-msgstr "PEM নথিপত্ৰত এনক্ৰিপ্ট কৰা চাবি লিখাৰ বাবে স্মৃতিশক্তি বিতৰণ কৰা নাযায় ।"
+msgstr "ইনক্ৰিপ্টেড কি'ক PEM ফাইললে লিখিবলে মেমৰি আবন্টন কৰিব পৰা নগল।"
 
-#: ../libnm-util/nm-utils.c:2078
+#: ../libnm-util/nm-utils.c:2193
 #, c-format
 msgid "Could not allocate memory for PEM file data."
-msgstr "PEM নথিপত্ৰৰ তথ্যে সংৰক্ষণৰ বাবে স্মৃতিশক্তি বিতৰণ কৰিবলৈ ব্যৰ্থ ।"
+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 "netlink বাৰ্তা প্ৰক্ৰিয়াকৰণত ভুল: %s"
+#: ../policy/org.freedesktop.NetworkManager.policy.in.h:1
+msgid "Enable or disable system networking"
+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 "System policy prevents enabling or disabling system networking"
+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:3
+msgid ""
+"Put NetworkManager to sleep or wake it up (should only be used by system "
+"power management)"
+msgstr ""
+"NetworkManager ক নিদ্ৰা দিয়ক অথবা ইয়াক সাৰ পোৱাওক (কেৱল চিস্টেম শক্তি "
+"ব্যৱস্থাপনা দ্বাৰা "
+"ব্যৱহাৰ হব লাগিব)"
 
-#: ../src/nm-netlink-monitor.c:265
-#, c-format
-msgid "unable to enable netlink handle credential passing: %s"
-msgstr "netlink handle credential passing সক্ৰিয় কৰিবলৈ ব্যৰ্থ: %s"
+#: ../policy/org.freedesktop.NetworkManager.policy.in.h:4
+msgid "System policy prevents putting NetworkManager to sleep or waking it up"
+msgstr ""
+"চিস্টেম নীতিয়ে 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"
-msgstr "লিংকৰ অৱস্থা নিৰীক্ষণৰ উদ্দেশ্যে netlink হেন্ডেল বিতৰণ কৰিবলৈ ব্যৰ্থ: %s"
+#: ../policy/org.freedesktop.NetworkManager.policy.in.h:5
+msgid "Enable or disable WiFi devices"
+msgstr "WiFi ডিভাইচসমূহ সামৰ্থবান অথবা অসামৰ্থবান কৰক"
 
-#: ../src/nm-netlink-monitor.c:376
+#: ../policy/org.freedesktop.NetworkManager.policy.in.h:6
+msgid "System policy prevents enabling or disabling WiFi devices"
+msgstr ""
+"চিস্টেম নীতিয়ে WiFi ডিভাইচসমূহ সামৰ্থবান অথবা অসামৰ্থবান কৰাটো প্ৰতিৰোধ কৰে"
+
+#: ../policy/org.freedesktop.NetworkManager.policy.in.h:7
+msgid "Enable or disable mobile broadband devices"
+msgstr "ম'বাইল ব্ৰডবেণ্ড ডিভাইচসমূহ সামৰ্থবান অথবা অসামৰ্থবান কৰক"
+
+#: ../policy/org.freedesktop.NetworkManager.policy.in.h:8
+msgid "System policy prevents enabling or disabling mobile broadband devices"
+msgstr ""
+"চিস্টেম নীতিয়ে ম'বাইল বৰ্ডবেণ্ড ডিভাইচসমূহ সামৰ্থবান অথবা অসামৰ্থবান কৰাটো "
+"প্ৰতিৰোধ কৰে"
+
+#: ../policy/org.freedesktop.NetworkManager.policy.in.h:9
+msgid "Enable or disable WiMAX mobile broadband devices"
+msgstr "WiMAX ম'বাইল ব্ৰডবেণ্ড ডিভাইচসমূহ সামৰ্থবান অথবা অসামৰ্থবান কৰক"
+
+#: ../policy/org.freedesktop.NetworkManager.policy.in.h:10
+msgid ""
+"System policy prevents enabling or disabling WiMAX mobile broadband devices"
+msgstr ""
+"চিস্টেম নীতিয়ে WiMAX ম'বাইল বৰ্ডবেণ্ড ডিভাইচসমূহ সামৰ্থবান অথবা অসামৰ্থবান "
+"কৰাটো প্ৰতিৰোধ কৰে"
+
+#: ../policy/org.freedesktop.NetworkManager.policy.in.h:11
+msgid "Allow control of network connections"
+msgstr "নেটৱাৰ্ক সংযোগসমূহৰ নিয়ন্ত্ৰণৰ অনুমতি দিয়ক"
+
+#: ../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 "Connection sharing via a protected WiFi network"
+msgstr "এটা সুৰক্ষিত WiFi নেটৱাৰ্কৰে সংযোগ অংশীদাৰী"
+
+#: ../policy/org.freedesktop.NetworkManager.policy.in.h:14
+msgid "System policy prevents sharing connections via a protected WiFi network"
+msgstr ""
+"চিস্টেম নীতিয়ে এটা সুৰক্ষিত WiFi নেটৱাৰ্কৰে সংযোগসমূহৰ অংশীদাৰী প্ৰতিৰোধ কৰে"
+
+#: ../policy/org.freedesktop.NetworkManager.policy.in.h:15
+msgid "Connection sharing via an open WiFi network"
+msgstr "এটা মুক্ত WiFi নেটৱাৰ্কৰে সংযোগৰ অংশীদাৰী"
+
+#: ../policy/org.freedesktop.NetworkManager.policy.in.h:16
+msgid "System policy prevents sharing connections via an open WiFi network"
+msgstr ""
+"চিস্টেম নীতিয়ে এটা মুক্ত WiFi নেটৱাৰ্কৰে সংযোগসমূহৰ অংশীদাৰী প্ৰতিৰোধ কৰে"
+
+#: ../policy/org.freedesktop.NetworkManager.policy.in.h:17
+msgid "Modify personal network connections"
+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 "Modify network connections for all users"
+msgstr "সকলো ব্যৱহাৰকাৰীৰ বাবে নেটৱাৰ্ক সংযোগসমূহ পৰিবৰ্তন কৰক"
+
+#: ../policy/org.freedesktop.NetworkManager.policy.in.h:20
+msgid "System policy prevents modification of network settings for all users"
+msgstr ""
+"চিস্টেম নীতিয়ে সকলো ব্যৱহাৰকাৰীৰ বাবে নেটৱাৰ্ক সংহতিসমূহৰ পৰিবৰ্তন প্ৰতিৰোধ "
+"কৰে"
+
+#: ../policy/org.freedesktop.NetworkManager.policy.in.h:21
+msgid "Modify persistent system hostname"
+msgstr "স্থায়ী চিস্টেম হস্টনাম পৰিবৰ্তন কৰক"
+
+#: ../policy/org.freedesktop.NetworkManager.policy.in.h:22
+msgid "System policy prevents modification of the persistent system hostname"
+msgstr "চিস্টেম নীতিয়ে স্থায়ী চিস্টেম হস্টনামৰ পৰিবৰ্তন প্ৰতিৰোধ কৰে"
+
+#: ../src/main.c:158
 #, c-format
-msgid "unable to allocate netlink link cache for monitoring link status: %s"
-msgstr "লিংকৰ অৱস্থা নিৰীক্ষণৰ উদ্দেশ্যে netlink লিংক কেশ্বে বিতৰণ কৰিবলৈ ব্যৰ্থ: %s"
+msgid "Failed to set signal mask: %d"
+msgstr "সংকেত মাস্ক সংহতি কৰিবলে ব্যৰ্থ: %d"
 
-#: ../src/nm-netlink-monitor.c:502
+#: ../src/main.c:167
 #, c-format
-msgid "unable to join netlink group: %s"
-msgstr "netlink দলে যোগ কৰিবলৈ ব্যৰ্থ: %s"
+msgid "Failed to create signal handling thread: %d"
+msgstr "সংকেত নিয়ন্ত্ৰণ থ্ৰেড সৃষ্টি কৰিবলে ব্যৰ্থ: %d"
 
-#: ../src/nm-netlink-monitor.c:629 ../src/nm-netlink-monitor.c:642
+#: ../src/main.c:182
 #, c-format
-msgid "error updating link cache: %s"
-msgstr "লিংক কোশ্বে উন্নত কৰিবলৈ সমস্যা: %s"
+msgid "Opening %s failed: %s\n"
+msgstr "%s খোলিবলে ব্যৰ্থ: %s\n"
+
+#: ../src/main.c:188
+#, c-format
+msgid "Writing to %s failed: %s\n"
+msgstr "%s লে লিখা ব্যৰ্থ হল: %s\n"
+
+#: ../src/main.c:193
+#, c-format
+msgid "Closing %s failed: %s\n"
+msgstr "%s বন্ধ কৰা ব্যৰ্থ হল: %s\n"
+
+#: ../src/main.c:236
+#, c-format
+msgid "NetworkManager is already running (pid %ld)\n"
+msgstr "NetworkManager ইতিমধ্যে চলি আছে (pid %ld)\n"
+
+#: ../src/main.c:376
+msgid "Print NetworkManager version and exit"
+msgstr "NetworkManager সংস্কৰণ প্ৰিন্ট কৰি প্ৰস্থান কৰক"
+
+#: ../src/main.c:377
+msgid "Don't become a daemon"
+msgstr "এটা ডিমন নহব"
+
+#: ../src/main.c:378
+msgid "Make all warnings fatal"
+msgstr "সকলো সতৰ্কবাৰ্তা মাৰাত্মক কৰক"
+
+#: ../src/main.c:379
+msgid "Specify the location of a PID file"
+msgstr "এটা PID ফাইলৰ অৱস্থান ধাৰ্য্য কৰক"
+
+#: ../src/main.c:379
+msgid "filename"
+msgstr "ফাইলনাম"
+
+#: ../src/main.c:380
+msgid "State file location"
+msgstr "ফাইলৰ অৱস্থান দেখুৱাওক"
+
+#: ../src/main.c:380
+msgid "/path/to/state.file"
+msgstr "/path/to/state.file"
+
+#: ../src/main.c:381
+msgid "Config file location"
+msgstr "Config ফাইলৰ অৱস্থান"
+
+#: ../src/main.c:381
+msgid "/path/to/config.file"
+msgstr "/path/to/config.file"
 
-#: ../src/main.c:502
+#: ../src/main.c:382
+msgid "List of plugins separated by ','"
+msgstr "',' দ্বাৰা পৃথকিত প্লাগিনসমূহৰ তালিকা"
+
+#: ../src/main.c:382
+msgid "plugin1,plugin2"
+msgstr "plugin1,plugin2"
+
+#. Translators: Do not translate the values in the square brackets
+#: ../src/main.c:384
+msgid "Log level: one of [ERR, WARN, INFO, DEBUG]"
+msgstr "লগ স্তৰ: [ERR, WARN, INFO, DEBUG] ৰ এটা"
+
+#. Translators: Do not translate the values in the square brackets
+#: ../src/main.c:387
+msgid ""
+"Log domains separated by ',': any combination of\n"
+"                                                [NONE,HW,RFKILL,ETHER,WIFI,"
+"BT,MB,DHCP4,DHCP6,PPP,\n"
+"                                                 WIFI_SCAN,IP4,IP6,AUTOIP4,"
+"DNS,VPN,SHARING,SUPPLICANT,\n"
+"                                                 AGENTS,SETTINGS,SUSPEND,"
+"CORE,DEVICE,OLPC,WIMAX,\n"
+"                                                 INFINIBAND,FIREWALL,ADSL]"
+msgstr ""
+"লগ ডমেইনসমূহ ',' দ্বাৰা পৃথকিত: \n"
+"                                                [NONE,HW,RFKILL,ETHER,WIFI,"
+"BT,MB,DHCP4,DHCP6,PPP,\n"
+"                                                 WIFI_SCAN,IP4,IP6,AUTOIP4,"
+"DNS,VPN,SHARING,SUPPLICANT,\n"
+"                                                 AGENTS,SETTINGS,SUSPEND,"
+"CORE,DEVICE,OLPC,WIMAX,\n"
+"                                                 INFINIBAND,FIREWALL,ADSL] "
+"ৰ যিকোনো সংযুক্তি"
+
+#: ../src/main.c:393
+msgid "An http(s) address for checking internet connectivity"
+msgstr "ইন্টাৰনেট সংযোগ নীৰিক্ষণ কৰিবলে এটা http(s) ঠিকনা"
+
+#: ../src/main.c:394
+msgid "The interval between connectivity checks (in seconds)"
+msgstr "সংযোগ নীৰিক্ষণৰ মাজৰ অন্তৰাল (ছেকেণ্ডত)"
+
+#: ../src/main.c:395
+msgid "The expected start of the response"
+msgstr "প্ৰতিক্ৰিয়াৰ প্ৰত্যাশিত আৰম্ভণি"
+
+#: ../src/main.c:395
+msgid "Bingo!"
+msgstr "Bingo!"
+
+#: ../src/main.c:400
+#, c-format
+msgid "GModules are not supported on your platform!\n"
+msgstr "GModules আপোনাৰ প্লেটফৰ্মত সমৰ্থিত নহয়!\n"
+
+#: ../src/main.c:423
+msgid ""
+"NetworkManager monitors all network connections and automatically\n"
+"chooses the best connection to use.  It also allows the user to\n"
+"specify wireless access points which wireless cards in the computer\n"
+"should associate with."
+msgstr ""
+"NetworkManager এ সকলো নেটৱাৰ্ক সংযোগ পৰ্যবেক্ষণ কৰে আৰু স্বচালিতভাৱে\n"
+"ব্যৱহাৰ কৰিবলে সৰ্বোত্তম সংযোগ নিৰ্বাচন কৰে।  ই লগতে ব্যৱহাৰকাৰীজনক\n"
+"কমপিউটাৰত থকা বেতাঁৰ কাৰ্ডসমূহ সংযুক্ত হব লগিয়া বেতাঁৰ অভিগম বিন্দু ধাৰ্য্য "
+"কৰাৰ অনুমতি দিয়ে।"
+
+#: ../src/main.c:429
 #, c-format
 msgid "Invalid option.  Please use --help to see a list of valid options.\n"
 msgstr ""
-"অবৈধ বিকল্প  ।  বৈধ বিকল্পসমূহৰ তালিকা চোৱাৰ বাবে অনুগ্ৰহ কৰি --help প্ৰয়োগ কৰক  "
-"।\n"
+"অবৈধ বিকল্প।  বৈধ বিকল্পসমূহৰ এটা তালিকা চাবলে অনুগ্ৰহ কৰি --help ব্যৱহাৰ "
+"কৰক।\n"
 
-#: ../src/main.c:562
+#: ../src/main.c:439
+#, c-format
+msgid "You must be root to run NetworkManager!\n"
+msgstr "NetworkManager চলাবলে আপুনি ৰুট হব লাগিব!\n"
+
+#: ../src/main.c:460
+#, c-format
+msgid "Failed to read configuration: (%d) %s\n"
+msgstr "সংৰূপ পঢ়িবলে ব্যৰ্থ: (%d) %s\n"
+
+#: ../src/main.c:471
 #, c-format
 msgid "%s.  Please use --help to see a list of valid options.\n"
-msgstr "%s ।  বৈধ বিকল্পসমূহৰ তালিকা চোৱাৰ বাবে অনুগ্ৰহ কৰি --help প্ৰয়োগ কৰক  ।\n"
+msgstr ""
+"%s।  বৈধ বিকল্পসমূহৰ এটা তালিকা চাবলে অনুগ্ৰহ কৰি --help ব্যৱহাৰ কৰক।\n"
+
+#: ../src/main.c:478
+#, c-format
+msgid "State file %s parsing failed: (%d) %s\n"
+msgstr "অৱস্থা ফাইল %s বিশ্লেষণ কৰাটো ব্যৰ্থ হল: (%d) %s\n"
+
+#: ../src/main.c:495
+#, c-format
+msgid "Could not daemonize: %s [error %u]\n"
+msgstr "ডিমনাইজ কৰিব পৰা নগল: %s [error %u]\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 "# 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"
 "\n"
 msgstr ""
-"# %s ৰ পৰা একত্ৰিত কৰা হৈছে\n"
+"# %s ৰ পৰা একত্ৰিত কৰা\n"
 "\n"
 
-#: ../src/dhcp-manager/nm-dhcp-manager.c:279
+#: ../src/dhcp-manager/nm-dhcp-manager.c:266
 msgid "no usable DHCP client could be found."
-msgstr "ব্যৱহাৰযোগ্য DHCP ক্লায়েন্ট পোৱা নাযায় ।"
+msgstr "কোনো ব্যৱহাৰযোগ্য DHCP ক্লাএন্ট পোৱা নগল।"
 
-#: ../src/dhcp-manager/nm-dhcp-manager.c:288
+#: ../src/dhcp-manager/nm-dhcp-manager.c:275
 msgid "'dhclient' could be found."
-msgstr "'dhclient' পোৱা নাযায় ।"
+msgstr "'dhclient' পোৱা গল।"
 
-#: ../src/dhcp-manager/nm-dhcp-manager.c:298
+#: ../src/dhcp-manager/nm-dhcp-manager.c:285
 msgid "'dhcpcd' could be found."
-msgstr "'dhcpcd' পোৱা নাযায় ।"
+msgstr "'dhcpcd' পোৱা গল।"
 
-#: ../src/dhcp-manager/nm-dhcp-manager.c:306
+#: ../src/dhcp-manager/nm-dhcp-manager.c:293
 #, c-format
 msgid "unsupported DHCP client '%s'"
-msgstr "অসমৰ্থিত DHCP ক্লায়েন্ট '%s'"
+msgstr "অসমৰ্থিত DHCP ক্লাএন্ট '%s'"
+
+#: ../src/dns-manager/nm-dns-manager.c:380
+msgid "NOTE: the libc resolver may not support more than 3 nameservers."
+msgstr "NOTE: libc ৰিচ'লভাৰে ৩ টাৰ অধিক নামচাৰ্ভাৰ সমৰ্থন নকৰিবও পাৰে।"
+
+#: ../src/dns-manager/nm-dns-manager.c:382
+msgid "The nameservers listed below may not be recognized."
+msgstr "তলত তালিকাভুক্ত নামচাৰ্ভাৰসমূহ পৰিচিত নহবও পাৰে।"
 
-#: ../src/logging/nm-logging.c:146
+#: ../src/logging/nm-logging.c:131
 #, c-format
 msgid "Unknown log level '%s'"
 msgstr "অজ্ঞাত লগ স্তৰ '%s'"
 
-#: ../src/logging/nm-logging.c:171
+#: ../src/logging/nm-logging.c:156
 #, c-format
 msgid "Unknown log domain '%s'"
-msgstr "অজ্ঞাত লগ ডোমেইন '%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 resolver ৰ দ্বাৰা ৩ তকৈ অধিক নামৰ সেৱক সমৰ্থিত ন'হ'বও পাৰে  ।"
+#: ../src/modem-manager/nm-modem-cdma.c:281 ../src/nm-device-bt.c:351
+#, 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:559 ../src/nm-device-bt.c:347
+#, c-format
+msgid "GSM connection %d"
+msgstr "GSM সংযোগ %d"
 
-#: ../src/settings/nm-default-wired-connection.c:157
+#: ../src/nm-device-bond.c:191
 #, c-format
-msgid "Auto %s"
-msgstr "স্বয়ংক্ৰিয় %s"
+msgid "Bond connection %d"
+msgstr "বান্ধনী সংযোগ %d"
 
-#: ../system-settings/plugins/ifcfg-rh/reader.c:3256
-msgid "System"
-msgstr "প্ৰণালী"
+#: ../src/nm-device-adsl.c:193
+#, c-format
+msgid "ADSL connection %d"
+msgstr "ADSL সংযোগ %d"
 
-#: ../policy/org.freedesktop.network-manager-settings.system.policy.in.h:1
-msgid "Connection sharing via a protected WiFi network"
-msgstr "নিৰাপদ ৱাই-ফাইলৈ নে'টৱৰ্কৰ মাধ্যমে সংযোগৰ যৌথ ব্যৱহাৰ"
+#: ../src/nm-device-bt.c:322
+#, c-format
+msgid "PAN connection %d"
+msgstr "PAN সংযোগ %d"
 
-#: ../policy/org.freedesktop.network-manager-settings.system.policy.in.h:2
-msgid "Connection sharing via an open WiFi network"
-msgstr "উন্মুক্ত ৱাই-ফাই নে'টৱৰ্কৰ মাধ্যমে সংযোগৰ যৌথ ব্যৱহাৰ"
+#: ../src/nm-device-bt.c:355
+#, c-format
+msgid "DUN connection %d"
+msgstr "DUN সংযোগ %d"
 
-#: ../policy/org.freedesktop.network-manager-settings.system.policy.in.h:3
-msgid "Modify persistent system hostname"
-msgstr "প্ৰণালীৰ স্থায়ী গৃহস্থৰ নাম পৰিবৰ্তন কৰক"
+#: ../src/nm-device-ethernet.c:1327
+#, c-format
+msgid "PPPoE connection %d"
+msgstr "PPPoE সংযোগ %d"
 
-#: ../policy/org.freedesktop.network-manager-settings.system.policy.in.h:4
-msgid "Modify system connections"
-msgstr "প্ৰণালীৰ সংযোগ পৰিবৰ্তন কৰক"
+#: ../src/nm-device-ethernet.c:1327 ../src/settings/nm-settings-utils.c:50
+#, c-format
+msgid "Wired connection %d"
+msgstr "তাঁৰযুক্ত সংযোগ %d"
 
-#: ../policy/org.freedesktop.network-manager-settings.system.policy.in.h:5
-msgid "System policy prevents modification of system settings"
-msgstr ""
-"প্ৰণালীত ব্যৱহৃত নিয়ম-নীতিৰ বিধিনিষেধৰ কাৰণে প্ৰণালীৰ বৈশিষ্ট্য পৰিবৰ্তন কৰা সম্ভৱ "
-"নহয়"
+#: ../src/nm-device-infiniband.c:303
+#, c-format
+msgid "InfiniBand connection %d"
+msgstr "InfiniBand সংযোগ %d"
 
-#: ../policy/org.freedesktop.network-manager-settings.system.policy.in.h:6
-msgid "System policy prevents modification of the persistent system hostname"
-msgstr ""
-"প্ৰণালীত ব্যৱহৃত নিয়ম-নীতিৰ বিধি নিষেধৰ কাৰণে প্ৰণালীৰ স্থায়ী গৃহস্থৰ নাম পৰিবৰ্তন "
-"কৰা সম্ভৱ নহয়"
+#: ../src/nm-device-olpc-mesh.c:303
+#, c-format
+msgid "Mesh %d"
+msgstr "মেশ %d"
 
-#: ../policy/org.freedesktop.network-manager-settings.system.policy.in.h:7
-msgid "System policy prevents sharing connections via a protected WiFi network"
-msgstr ""
-"প্ৰণালীৰ নিয়মনীতিয়ে নিৰাপদ ৱাই-ফাই নে'টৱৰ্কৰ মাধ্যমে সংযোগৰ যৌথ ব্যৱহাৰ প্ৰতিৰোধ "
-"কৰিছে"
+#: ../src/nm-device-vlan.c:362
+#, c-format
+msgid "VLAN connection %d"
+msgstr "VLAN সংযোগ %d"
 
-#: ../policy/org.freedesktop.network-manager-settings.system.policy.in.h:8
-msgid "System policy prevents sharing connections via an open WiFi network"
+#: ../src/nm-manager.c:661
+#, c-format
+msgid "VPN connection %d"
+msgstr "VPN সংযোগ %d"
+
+#: ../src/nm-netlink-monitor.c:148 ../src/nm-netlink-monitor.c:272
+#: ../src/nm-netlink-monitor.c:695
+#, c-format
+msgid "error processing netlink message: %s"
+msgstr "netlink বাৰ্তা প্ৰক্ৰিয়া কৰোতে ত্ৰুটি: %s"
+
+#: ../src/nm-netlink-monitor.c:251
+msgid "error occurred while waiting for data on socket"
+msgstr "চকেটত তথ্যৰ বাবে অপেক্ষা কৰোতে ত্ৰুটি দেখা দিলে"
+
+#: ../src/nm-netlink-monitor.c:296
+#, c-format
+msgid "unable to connect to netlink for monitoring link status: %s"
+msgstr "লিংক অৱস্থা পৰ্যবেক্ষণ কৰিবলে netlink লে সংযোগ কৰিবলে অক্ষম: %s"
+
+#: ../src/nm-netlink-monitor.c:307
+#, c-format
+msgid "unable to enable netlink handle credential passing: %s"
+msgstr "netlink হেন্ডেল তথ্য প্ৰেৰণ সামৰ্থবান কৰিবলে অক্ষম: %s"
+
+#: ../src/nm-netlink-monitor.c:330 ../src/nm-netlink-monitor.c:390
+#, c-format
+msgid "unable to allocate netlink handle for monitoring link status: %s"
+msgstr "লিংক অৱস্থা পৰ্যবেক্ষণ কৰিবলে netlink হপন্ডেল আবন্টন কৰিবলে অক্ষম: %s"
+
+#: ../src/nm-netlink-monitor.c:415
+#, c-format
+msgid "unable to allocate netlink link cache for monitoring link status: %s"
 msgstr ""
-"প্ৰণালীৰ নিয়মনীতিয়ে উন্মুক্ত ৱাই-ফাই নে'টৱৰ্কৰ মাধ্যমে সংযোগৰ যৌথ ব্যৱহাৰ প্ৰতিৰোধ "
-"কৰিছে"
+"লিংক অৱস্থা পৰ্যবেক্ষণ কৰিবলে netlink লিংক ক্যাশ আবন্টন কৰিবলে অক্ষম: %s"
 
-#~ msgid "Type"
-#~ msgstr "ধৰণ"
+#: ../src/nm-netlink-monitor.c:542
+#, c-format
+msgid "unable to join netlink group: %s"
+msgstr "netlink দলত অংশগ্ৰহণ কৰিবলে অক্ষম: %s"
 
-#~ msgid "Name"
-#~ msgstr "নাম"
+#: ../src/nm-netlink-monitor.c:671 ../src/nm-netlink-monitor.c:684
+#, c-format
+msgid "error updating link cache: %s"
+msgstr "লিংক ক্যাশ আপডেইট কৰোতে ত্ৰুটি: %s"
+
+#: ../src/settings/plugins/ifcfg-rh/reader.c:94
+msgid "System"
+msgstr "চিস্টেম"
 
-#~ msgid "User connections:\n"
-#~ msgstr "ব্যৱহাৰকৰ্তাৰ সংযোগ:\n"
+#: ../src/settings/plugins/ifcfg-rh/reader.c:3641
+msgid "Bond"
+msgstr "বান্ধনী"
 
-#~ msgid "System-wide connections"
-#~ msgstr "প্ৰণালী ব্যাপী সংযোগ"
+#: ../test/nm-online.c:112
+#, c-format
+msgid "\rConnecting"
+msgstr "\rসংযোগ কৰা হৈছে"
 
-#~ msgid "Default"
-#~ msgstr "অবিকল্পিত"
+#: ../test/nm-online.c:143
+msgid "Time to wait for a connection, in seconds (default is 30)"
+msgstr "এটা সংযোগৰ বাবে অপেক্ষা কৰিবলে সময়, ছেকেণ্ডত (অবিকল্পিত হল ৩০)"
 
-#~ msgid "Service"
-#~ msgstr "সেৱা"
+#: ../test/nm-online.c:144
+msgid "Exit immediately if NetworkManager is not running or connecting"
+msgstr ""
+"যদি NetworkManager চলি থকা নাই অথবা সংযোগ কৰা নাই তৎক্ষনাত প্ৰস্থান কৰিব"
+
+#: ../test/nm-online.c:145
+msgid "Don't print anything"
+msgstr "একো প্ৰিন্ট নকৰিব"
+
+#: ../test/nm-online.c:163
+msgid "Waits for a successful connection in NetworkManager."
+msgstr "NetworkManager ত এটা সফল সংযোগৰ বাবে অপেক্ষা কৰে।"
+
+#: ../test/nm-online.c:169 ../test/nm-online.c:178
+msgid "Invalid option.  Please use --help to see a list of valid options."
+msgstr ""
+"অবৈধ বিকল্প।  বৈধ বিকল্পসমূহৰ এটা তালিকা চাবলে অনুগ্ৰহ কৰি --help ব্যৱহাৰ "
+"কৰক।"
 
-#~ msgid "%s, %s, Freq %d MHz, Rate %d Mb/s, Strength %d"
-#~ msgstr "%s, %s, ফ্ৰিকোৱেন্সি %d MHz, হাৰ %d Mb/s, ক্ষমতা %d"
+#~ msgid "Network"
+#~ msgstr "নেটৱাৰ্ক"
 
-#~ msgid "Device"
-#~ msgstr "যন্ত্ৰ"
+#~ msgid "Manage your network connections"
+#~ msgstr "আপোনাৰ নেটৱাৰ্ক সংযোগসমূহ ব্যৱস্থাপনা কৰক"
 
-#~ msgid "Driver"
-#~ msgstr "চালক"
+#~ msgid "Network Connections"
+#~ msgstr "নেটৱাৰ্ক সংযোগসমূহ"
 
-#~ msgid "State"
-#~ msgstr "অৱস্থা"
+#~ msgid "Manage and change your network connection settings"
+#~ msgstr "আপোনাৰ নেটৱাৰ্ক সংযোগক ব্যৱস্থাপনা আৰু সলনি কৰক"
 
-#~ msgid "HW Address"
-#~ msgstr "HW ঠিকনা"
+#~ msgid "Disable connected notifications"
+#~ msgstr "সংযুক্ত অধিসূচনাসমূহ অসামৰ্থবান কৰক"
 
 #~ msgid ""
-#~ "\n"
-#~ "  Capabilities:\n"
+#~ "Set this to true to disable notifications when connecting to a network."
 #~ msgstr ""
-#~ "\n"
-#~ "  কৰ্মক্ষমতা:\n"
+#~ "এটা নেটৱাৰ্কলে সংযোগ কৰোতে অধিসূচনাসমূহ অসামৰ্থবান কৰিবলে ইয়াক সত্যলে সংহতি "
+#~ "কৰক।"
+
+#~ msgid "Disable disconnected notifications"
+#~ msgstr "বিচ্ছিন্ন হোৱাৰ অধিসূচনা অসামৰ্থবান কৰা হ'ব"
 
-#~ msgid "Carrier Detect"
-#~ msgstr "পৰিবহণকৰ্তা চিনাক্তকৰণ"
+#~ msgid ""
+#~ "Set this to true to disable notifications when disconnecting from a "
+#~ "network."
+#~ msgstr ""
+#~ "এটা নেটৱাৰ্কৰ পৰা বিচ্ছিন্ন হওতে অধিসূচনাসমূহ অসামৰ্থবান কৰিবলে ইয়াক সত্যলে "
+#~ "সংহতি কৰক।"
 
-#~ msgid "Speed"
-#~ msgstr "গতি"
+#~ msgid "Disable VPN notifications"
+#~ msgstr "VPN অধিসূচনাসমূহ অসামৰ্থবান কৰক"
 
 #~ msgid ""
-#~ "\n"
-#~ "  Wireless Properties\n"
+#~ "Set this to true to disable notifications when connecting to or "
+#~ "disconnecting from a VPN."
 #~ msgstr ""
-#~ "\n"
-#~ "  বেতাঁৰ সংযোগৰ বৈশিষ্ট্য\n"
+#~ "এটা VPN লে সংযোগ কৰোতে অথবা তাৰ পৰা বিচ্ছিন্ন হওতে অধিসূচনাসমূহ অসামৰ্থবান "
+#~ "কৰিবলে ইয়াক সত্যলে সংহতি কৰক।"
 
-#~ msgid "WEP Encryption"
-#~ msgstr "WEP এনক্ৰিপশন"
+#~ msgid "Suppress networks available notifications"
+#~ msgstr "উপলব্ধ নেটৱাৰ্কৰ অধিসূচনা প্ৰদৰ্শন লুকুৱা হ'ব"
 
-#~ msgid "WPA Encryption"
-#~ msgstr "WPA এনক্ৰিপশন"
+#~ msgid ""
+#~ "Set this to true to disable notifications when wireless networks are "
+#~ "available."
+#~ msgstr ""
+#~ "যেতিয়া বেতাঁৰ নেটৱাৰ্কসমূহ উপলব্ধ থাকে অধিসূচনাসমূহ অসামৰ্থবান কৰিবলে ইয়াক সত্যলে "
+#~ "সংহতি কৰক।"
 
-#~ msgid "WPA2 Encryption"
-#~ msgstr "WPA2 এনক্ৰিপশন"
+#~ msgid "Stamp"
+#~ msgstr "স্টেম্প"
 
-#~ msgid "TKIP cipher"
-#~ msgstr "TKIP চাইফাৰ"
+#~ msgid ""
+#~ "Used to determine whether settings should be migrated to a new version."
+#~ msgstr ""
+#~ "নতুন সংস্কৰণত সংহতিসমূহ প্ৰব্ৰজন কৰা হ'ব নে নহয় নিৰ্ধাৰণ কৰিবলৈ ইয়াক ব্যৱহাৰ কৰা "
+#~ "হয়।"
 
-#~ msgid "CCMP cipher"
-#~ msgstr "CCMP চাইফাৰ"
+#~ msgid "Disable WiFi Create"
+#~ msgstr "WiFi সৃষ্টি অসামৰ্থবান কৰক"
 
 #~ msgid ""
-#~ "\n"
-#~ "  Wireless Access Points %s\n"
+#~ "Set to true to disable creation of adhoc networks when using the applet."
 #~ msgstr ""
-#~ "\n"
-#~ "  বেতাঁৰ এক্সেচ পইন্ট %s\n"
+#~ "এপ্লেট ব্যৱহাৰ কৰি থাকোতে adhoc নেটৱাৰ্কসমূহৰ সৃষ্টি অসামৰ্থবান কৰিবলে সত্যলে "
+#~ "সংহতি কৰক।"
 
-#~ msgid "(* = current AP)"
-#~ msgstr "(* = বৰ্তমান AP)"
+#~ msgid "Ignore CA certificate"
+#~ msgstr "CA প্ৰমাণপত্ৰ উপেক্ষা কৰক"
 
 #~ msgid ""
-#~ "\n"
-#~ "  Wired Properties\n"
+#~ "Set this to true to disable warnings about CA certificates in EAP "
+#~ "authentication."
 #~ msgstr ""
-#~ "\n"
-#~ "  তাঁৰযুক্ত সংযোগৰ বৈশিষ্ট্য\n"
+#~ "EAP প্ৰমাণীকৰণত CA প্ৰমাণপত্ৰসমূহৰ বিষয়ে সতৰ্কবাৰ্তা অসামৰ্থবান কৰিবলে ইয়াক "
+#~ "সত্যলে সংহতি কৰক।"
+
+#~ msgid ""
+#~ "Set this to true to disable warnings about CA certificates in phase 2 of "
+#~ "EAP authentication."
+#~ msgstr ""
+#~ "EAP প্ৰমাণীকৰণৰ স্তৰ ২ ত CA প্ৰমাণপত্ৰসমূহৰ বিষয়ে সতৰ্কবাৰ্তাসমূহ অসামৰ্থবান "
+#~ "কৰিবলে ইয়াক সত্যলে সংহতি কৰক।"
+
+#~ msgid "You are now connected to '%s'."
+#~ msgstr "আপুনি এতিয়া '%s' লৈ সংযুক্ত।"
+
+#~ msgid "You are now connected to the mobile broadband network."
+#~ msgstr "আপুনি এতিয়া ম'বাইল ব্ৰডবেণ্ড নেটৱাৰ্কৰ সৈতে সংযুক্ত।"
+
+#~ msgid "Preparing mobile broadband connection '%s'..."
+#~ msgstr "ম'বাইল ব্ৰ'ডবেণ্ড সংযোগ '%s' সৃষ্টি কৰা হৈছে..."
+
+#~ msgid "Configuring mobile broadband connection '%s'..."
+#~ msgstr "ম'বাইল ব্ৰ'ডবেণ্ড সংযোগ '%s' সংৰূপণ কৰা হৈছে..."
+
+#~ msgid "User authentication required for mobile broadband connection '%s'..."
+#~ msgstr "ম'বাইল ব্ৰ'ডবেণ্ড সংযোগ '%s' ৰ বাবে ব্যৱহাৰকাৰীৰ প্ৰমাণীকৰণৰ প্ৰয়োজন..."
+
+#~ msgid "Requesting a network address for '%s'..."
+#~ msgstr "'%s' ৰ কাৰণে নেটৱাৰ্ক ঠিকনা অনুৰোধ কৰা হৈছে..."
+
+#~ msgid "Mobile broadband connection '%s' active"
+#~ msgstr "ম'বাইল ব্ৰ'ডবেণ্ড সংযোগ '%s' সক্ৰিয়"
+
+#~ msgid "Mobile Broadband (%s)"
+#~ msgstr "ম'বাইল ব্ৰ'ডবেণ্ড (%s)"
+
+#~ msgid "Mobile Broadband"
+#~ msgstr "ম'বাইল ব্ৰ'ডবেণ্ড"
+
+#~ msgid "New Mobile Broadband (CDMA) connection..."
+#~ msgstr "নতুন ম'বাইল ব্ৰ'ডবেণ্ড (CDMA) সংযোগ..."
+
+#~ msgid "You are now connected to the CDMA network."
+#~ msgstr "আপুনি এতিয়া CDMA নেটৱাৰ্কলৈ সংযুক্ত।"
+
+#~ msgid "Mobile broadband connection '%s' active: (%d%%%s%s)"
+#~ msgstr "'%s' ম'বাইল ব্ৰডবেণ্ড সংযোগ বৰ্তমানে সক্ৰিয়: (%d%%%s%s)"
+
+#~ msgid "CDMA network."
+#~ msgstr "CDMA নেটৱাৰ্ক।"
+
+#~ msgid "You are now registered on a roaming network."
+#~ msgstr "আপুনি এতিয়া এটা ৰ'মিং নেটৱাৰ্কত ৰেজিস্টাৰ্ড।"
+
+#~ msgid "GSM"
+#~ msgstr "GSM"
+
+#~ msgid "New Mobile Broadband (GSM) connection..."
+#~ msgstr "নতুন ম'বাইল ব্ৰ'ডবেণ্ড (GSM) সংযোগ..."
+
+#~ msgid "You are now connected to the GSM network."
+#~ msgstr "আপুনি এতিয়া GSM নেটৱাৰ্কলৈ সংযুক্ত।"
 
-#~ msgid "Carrier"
-#~ msgstr "পৰিবহণকৰ্তা"
+#~ msgid "PIN code for SIM card '%s' on '%s'"
+#~ msgstr "'%s' ত SIM কাৰ্ড '%s' ৰ বাবে PIN ক'ড"
+
+#~ msgid "Wrong PIN code; please contact your provider."
+#~ msgstr "ভুল PIN ক'ড; অনুগ্ৰহ কৰি সেৱা উপলব্ধকৰ্তাৰ সৈতে যোগাযোগ কৰক।"
+
+#~ msgid "Wrong PUK code; please contact your provider."
+#~ msgstr "ভুল PUK ক'ড; অনুগ্ৰহ কৰি সেৱা উপলব্ধকৰ্তাৰ সৈতে যোগাযোগ কৰক।"
+
+#~ msgid "Sending unlock code..."
+#~ msgstr "আনলক কৰাৰ ক'ড পঠিওৱা হৈছে..."
+
+#~ msgid "SIM PIN Unlock Required"
+#~ msgstr "SIM PIN আনলক কৰা প্ৰয়োজন"
 
 #~ msgid ""
-#~ "\n"
-#~ "  IPv4 Settings:\n"
+#~ "The mobile broadband device '%s' requires a SIM PIN code before it can be "
+#~ "used."
 #~ msgstr ""
-#~ "\n"
-#~ "  IPv4 ৰ বৈশিষ্ট্য:\n"
+#~ "'%s' ম'বাইল ব্ৰডবেণ্ড ডিভাইচ ব্যৱহাৰ কৰাৰ আগতে এটা SIM PIN ক'ড উপলব্ধ থকা "
+#~ "আৱশ্যক।"
 
-#~ msgid "Address"
-#~ msgstr "ঠিকনা"
+#~ msgid "PIN code:"
+#~ msgstr "PIN ক'ড:"
 
-#~ msgid "Prefix"
-#~ msgstr "উপসৰ্গ"
+#~ msgid "Show PIN code"
+#~ msgstr "PIN ক'ড দেখুৱাওক"
 
-#~ msgid "Gateway"
-#~ msgstr "গে'টৱে"
+#~ msgid "SIM PUK Unlock Required"
+#~ msgstr "SIM PUK আনলক কৰা প্ৰয়োজন"
+
+#~ msgid ""
+#~ "The mobile broadband device '%s' requires a SIM PUK code before it can be "
+#~ "used."
+#~ msgstr ""
+#~ "'%s' ম'বাইল ব্ৰডবেণ্ড ডিভাইচ ব্যৱহাৰ কৰাৰ আগতে এটা SIM PUK ক'ড উপলব্ধ থকা "
+#~ "আৱশ্যক।"
+
+#~ msgid "PUK code:"
+#~ msgstr "PUK ক'ড:"
+
+#~ msgid "New PIN code:"
+#~ msgstr "নতুন PIN ক'ড:"
+
+#~ msgid "Re-enter new PIN code:"
+#~ msgstr "নতুন PIN ক'ড পুনঃ লিখক:"
+
+#~ msgid "Show PIN/PUK codes"
+#~ msgstr "PIN/PUK ক'ডসমূহ দেখুৱাওক"
+
+#~ msgid "GSM network."
+#~ msgstr "GSM নেটৱাৰ্ক।"
+
+#~ msgid "Auto Ethernet"
+#~ msgstr "স্বচালিত ইথাৰনেট"
+
+#~ msgid "Wired Networks (%s)"
+#~ msgstr "তাঁৰযুক্ত নেটৱাৰ্ক (%s)"
+
+#~ msgid "Wired Network (%s)"
+#~ msgstr "তাঁৰযুক্ত নেটৱাৰ্ক (%s)"
+
+#~ msgid "Wired Networks"
+#~ msgstr "তাঁৰযুক্ত নেটৱাৰ্কসমূহ"
+
+#~ msgid "Wired Network"
+#~ msgstr "তাঁৰযুক্ত নেটৱাৰ্ক"
+
+#~ msgid "You are now connected to the wired network."
+#~ msgstr "আপুনি এতিয়া তাঁৰযুক্ত নেটৱাৰ্কলৈ সংযুক্ত।"
+
+#~ msgid "Configuring wired network connection '%s'..."
+#~ msgstr "তাঁৰযুক্ত নেটৱাৰ্ক সংযোগ '%s' সংৰূপণ কৰা হৈছে..."
+
+#~ msgid "User authentication required for wired network connection '%s'..."
+#~ msgstr "তাঁৰযুক্ত নেটৱাৰ্ক সংযোগ '%s' ৰ কাৰণে ব্যৱহাৰকাৰীৰ প্ৰমাণীকৰণৰ প্ৰয়োজন..."
+
+#~ msgid "Requesting a wired network address for '%s'..."
+#~ msgstr "'%s' ৰ কাৰণে তাঁৰযুক্ত নেটৱাৰ্ক ঠিকনা অনুৰোধ কৰা হৈছে..."
+
+#~ msgid "Wired network connection '%s' active"
+#~ msgstr "তাঁৰযুক্ত নেটৱাৰ্ক সংযোগ '%s' সক্ৰিয়"
+
+#~ msgid "DSL authentication"
+#~ msgstr "DSL প্ৰমাণীকৰণ"
+
+#~ msgid "_Connect to Hidden Wireless Network..."
+#~ msgstr "লুকুৱা বেতাঁৰ নেটৱাৰ্কলৈ সংযুক্ত কৰক (_C)..."
+
+#~ msgid "Create _New Wireless Network..."
+#~ msgstr "নতুন বেতাঁৰ নেটৱাৰ্ক সৃষ্টি কৰক (_N)..."
 
-#~ msgid "Device:"
-#~ msgstr "যন্ত্ৰ:"
+#~ msgid "Wireless Networks (%s)"
+#~ msgstr "বেতাঁৰ নেটৱাৰ্কসমূহ (%s)"
 
-#~ msgid "Error: hwaddr has to be specified."
-#~ msgstr "ত্ৰুটি: hwaddr উল্লেখ কৰা আৱশ্যক ।"
+#~ msgid "Wireless Network (%s)"
+#~ msgstr "বেতাঁৰ নেটৱাৰ্ক (%s)"
 
-#~ msgid "AP parameters"
-#~ msgstr "AP ৰ স্থিতিমাপ"
+#~ msgid "Wireless Network"
+#~ msgid_plural "Wireless Networks"
+#~ msgstr[0] "বেতাঁৰ নেটৱাৰ্ক"
+#~ msgstr[1] "বেতাঁৰ নেটৱাৰ্কসমূহ"
 
-#~ msgid "Frequency:"
-#~ msgstr "ফ্ৰিকোৱেন্সি:"
+#~ msgid "wireless is disabled"
+#~ msgstr "বেতাঁৰ অসামৰ্থবান"
 
-#~ msgid "Mode:"
-#~ msgstr "মোড:"
+#~ msgid "wireless is disabled by hardware switch"
+#~ msgstr "বেতাঁৰ হাৰ্ডৱেৰ চুইচ দ্বাৰা অসামৰ্থবান কৰা আছে"
 
-#~ msgid "Ad-hoc"
-#~ msgstr "এড-হক"
+#~ msgid "More networks"
+#~ msgstr "অতিৰিক্ত নেটৱাৰ্ক"
 
-#~ msgid "Maximal bitrate:"
-#~ msgstr "সৰ্বাধিক বিট ৰেট:"
+#~ msgid "Wireless Networks Available"
+#~ msgstr "বেতাঁৰ নেটৱাৰ্ক উপস্থিত"
 
-#~ msgid "Strength:"
-#~ msgstr "ক্ষমতা:"
+#~ msgid "Use the network menu to connect to a wireless network"
+#~ msgstr "এটা বেতাঁৰ নেটৱাৰ্কলে সংযোগ কৰিবলে নেটৱাৰ্ক মেনু ব্যৱহাৰ কৰক"
 
-#~ msgid "Flags:"
-#~ msgstr "ফ্লেগ:"
+#~ msgid "Don't show this message again"
+#~ msgstr "এই বাৰ্তা আকৌ নেদেখুৱাব"
 
-#~ msgid "privacy"
-#~ msgstr "গোপনীয়"
+#~ msgid "You are now connected to the wireless network '%s'."
+#~ msgstr "আপুনি এতিয়া বেতাঁৰ নেটৱাৰ্ক '%s' লৈ সংযুক্ত।"
 
-#~ msgid "WPA flags:"
-#~ msgstr "WPA ফ্লেগ:"
+#~ msgid "Preparing wireless network connection '%s'..."
+#~ msgstr "বেতাঁৰ নেটৱাৰ্ক সংযোগ '%s' সৃষ্টি কৰা হৈছে..."
 
-#~ msgid "RSN flags:"
-#~ msgstr "RSN ফ্লেগ:"
+#~ msgid "Configuring wireless network connection '%s'..."
+#~ msgstr "বেতাঁৰ নেটৱাৰ্ক '%s' সংৰূপণ কৰা হৈছে..."
 
-#~ msgid "NM running:"
-#~ msgstr "NM চলি আছে:"
+#~ msgid "User authentication required for wireless network '%s'..."
+#~ msgstr "বেতাঁৰ নেটৱাৰ্ক সংযোগ '%s' ৰ কাৰণে ব্যৱহাৰকাৰীৰ প্ৰমাণীকৰণৰ প্ৰয়োজন..."
 
-#~ msgid "NM state:"
-#~ msgstr "NM ৰ অৱস্থা:"
+#~ msgid "Requesting a wireless network address for '%s'..."
+#~ msgstr "'%s' ৰ কাৰণে বেতাঁৰ নেটৱাৰ্ক ঠিকনা অনুৰোধ কৰা হৈছে..."
 
-#~ msgid "NM wireless hardware:"
-#~ msgstr "NM বেতাঁৰ যান্ত্ৰিক সামগ্ৰী:"
+#~ msgid "Wireless network connection '%s' active: %s (%d%%)"
+#~ msgstr "বেতাঁৰ নেটৱাৰ্ক সংযোগ '%s' সক্ৰিয়: %s (%d%%)"
 
-#~ msgid "NM wireless:"
-#~ msgstr "NM বেতাঁৰ:"
+#~ msgid "Wireless network connection '%s' active"
+#~ msgstr "বেতাঁৰ নেটৱাৰ্ক সংযোগ '%s' সক্ৰিয়"
+
+#~ msgid "WiMAX Mobile Broadband (%s)"
+#~ msgstr "WiMAX ম'বাইল ব্ৰডবেণ্ড (%s)"
+
+#~ msgid "WiMAX Mobile Broadband"
+#~ msgstr "WiMAX ম'বাইল ব্ৰডবেণ্ড"
+
+#~ msgid "WiMAX is disabled by hardware switch"
+#~ msgstr "WiMAX হাৰ্ডৱেৰ চুইচ দ্বাৰা অসামৰ্থবান"
+
+#~ msgid "You are now connected to the WiMAX network."
+#~ msgstr "আপুনি এতিয়া WiMAX নেটৱাৰ্কলে সংযুক্ত।"
+
+#~ msgid "Error displaying connection information:"
+#~ msgstr "সঠিক তথ্য দেখুৱাওঁতে ত্ৰুটি:"
+
+#~ msgid "LEAP"
+#~ msgstr "LEAP"
+
+#~ msgid "Dynamic WEP"
+#~ msgstr "ডাইনামিক WEP"
+
+#~ msgctxt "Wifi/wired security"
+#~ msgid "None"
+#~ msgstr "কোনো নহয়"
+
+#~ msgid "%s (default)"
+#~ msgstr "%s (অবিকল্পিত)"
+
+#~ msgctxt "Speed"
+#~ msgid "Unknown"
+#~ msgstr "অজ্ঞাত"
+
+#~ msgid "%d dB"
+#~ msgstr "%d dB"
+
+#~ msgctxt "WiMAX Base Station ID"
+#~ msgid "unknown"
+#~ msgstr "অজ্ঞাত"
+
+#~ msgid "Ethernet (%s)"
+#~ msgstr "ইথাৰনেট (%s)"
+
+#~ msgid "802.11 WiFi (%s)"
+#~ msgstr "802.11 WiFi (%s)"
+
+#~ msgid "GSM (%s)"
+#~ msgstr "GSM (%s)"
+
+#~ msgid "CDMA (%s)"
+#~ msgstr "CDMA (%s)"
+
+#~ msgid "WiMAX (%s)"
+#~ msgstr "WiMAX (%s)"
+
+#~ msgid "General"
+#~ msgstr "সাধাৰণ"
+
+#~ msgid "Interface:"
+#~ msgstr "আন্তঃপৃষ্ঠ:"
+
+#~ msgid "Hardware Address:"
+#~ msgstr "হাৰ্ডৱেৰ ঠিকনা:"
+
+#~ msgid "Driver:"
+#~ msgstr "ড্ৰাইভাৰ:"
+
+#~ msgid "Speed:"
+#~ msgstr "গতি:"
+
+#~ msgid "Security:"
+#~ msgstr "সুৰক্ষা:"
+
+#~ msgid "IP Address:"
+#~ msgstr "IP ঠিকনা:"
+
+#~ msgctxt "Address"
+#~ msgid "Unknown"
+#~ msgstr "অজ্ঞাত"
+
+#~ msgid "Broadcast Address:"
+#~ msgstr "প্ৰচাৰ ঠিকনা:"
+
+#~ msgid "Subnet Mask:"
+#~ msgstr "চাবনেট মাস্ক:"
+
+#~ msgctxt "Subnet Mask"
+#~ msgid "Unknown"
+#~ msgstr "অজ্ঞাত"
+
+#~ msgid "Default Route:"
+#~ msgstr "অবিকল্পিত পথ:"
+
+#~ msgid "Primary DNS:"
+#~ msgstr "মূখ্য DNS:"
+
+#~ msgid "Secondary DNS:"
+#~ msgstr "দ্বিতীয় DNS:"
+
+#~ msgid "Ternary DNS:"
+#~ msgstr "ত্ৰয়াত্মক DNS:"
+
+#~ msgid "Ignored"
+#~ msgstr "উপেক্ষা কৰা হৈছে"
+
+#~ msgid "VPN Type:"
+#~ msgstr "VPN ধৰণ:"
+
+#~ msgid "VPN Gateway:"
+#~ msgstr "VPN গেইটৱে:"
+
+#~ msgid "VPN Username:"
+#~ msgstr "VPN ব্যৱহাৰকাৰীনাম:"
+
+#~ msgid "VPN Banner:"
+#~ msgstr "VPN বেনাৰ:"
+
+#~ msgid "Base Connection:"
+#~ msgstr "ভিত্তি সংযোগ:"
+
+#~ msgid ""
+#~ "Copyright © 2004-2011 Red Hat, Inc.\n"
+#~ "Copyright © 2005-2008 Novell, Inc.\n"
+#~ "and many other community contributors and translators"
+#~ msgstr ""
+#~ "স্বত্বাধিকাৰ © ২০০৪-২০১১ Red Hat, Inc.\n"
+#~ "স্বত্বাধিকাৰ © ২০০৫-২০০৮ Novell, Inc.\n"
+#~ "আৰু অন্য বহুতো সম্প্ৰদায়ৰ অৱদানকাৰী আৰু অনুবাদকসকল"
+
+#~ msgid ""
+#~ "Notification area applet for managing your network devices and "
+#~ "connections."
+#~ msgstr ""
+#~ "আপোনাৰ নেটৱাৰ্ক ডিভাইচ আৰু সংযোগসমূহ ব্যৱস্থাপনাৰ বাবে অধিসূচনা স্থানৰ এপ্লেট।"
+
+#~ msgid "Missing resources"
+#~ msgstr "অনুপস্থিত সম্পদ"
+
+#~ msgid "Mobile broadband network password"
+#~ msgstr "ম'বাইল ব্ৰ'ডবেণ্ড নেটৱাৰ্কৰ পাছৱাৰ্ড"
+
+#~ msgid "A password is required to connect to '%s'."
+#~ msgstr "'%s' লৈ সংযোগ কৰিবলৈ এটা পাছৱাৰ্ডৰ প্ৰয়োজন।"
+
+#~ msgid "Password:"
+#~ msgstr "পাছৱাৰ্ড:"
+
+#~ msgid "Disconnect failure"
+#~ msgstr "বিচ্ছিন্ন কৰা ব্যৰ্থ হল"
+
+#~ msgid ""
+#~ "\n"
+#~ "The VPN connection '%s' failed because the network connection was "
+#~ "interrupted."
+#~ msgstr ""
+#~ "\n"
+#~ "নেটৱাৰ্ক সংযোগ বিঘ্নিত হোৱাৰ ফলত VPN সংযোগ '%s' বিফল হৈছে।"
+
+#~ msgid ""
+#~ "\n"
+#~ "The VPN connection '%s' failed because the VPN service failed to start."
+#~ msgstr ""
+#~ "\n"
+#~ "VPN সেৱা আৰম্ভ হবলে ব্যৰ্থ হোৱা বাবে VPN সংযোগ '%s' ব্যৰ্থ হল।"
+
+#~ msgid ""
+#~ "\n"
+#~ "The VPN connection '%s' failed because there were no valid VPN secrets."
+#~ msgstr ""
+#~ "\n"
+#~ "কোনো বৈধ VPN গোপন তথ্য নথকা বাবে VPN সংযোগ '%s' ব্যৰ্থ হল।"
+
+#~ msgid ""
+#~ "\n"
+#~ "The VPN connection '%s' failed because of invalid VPN secrets."
+#~ msgstr ""
+#~ "\n"
+#~ "অবৈধ VPN গোপন তথ্যৰ বাবে VPN সংযোগ '%s' ব্যৰ্থ হল।"
+
+#~ msgid ""
+#~ "\n"
+#~ "The VPN connection '%s' disconnected because the network connection was "
+#~ "interrupted."
+#~ msgstr ""
+#~ "\n"
+#~ "নেটৱাৰ্ক সংযোগ বাধাগ্ৰস্থ হোৱা বাবে VPN সংযোগ '%s' বিচ্ছিন্ন হল।"
+
+#~ msgid ""
+#~ "\n"
+#~ "The VPN connection '%s' disconnected because the VPN service stopped."
+#~ msgstr ""
+#~ "\n"
+#~ "VPN সেৱা বন্ধ হোৱা বাবে VPN সংযোগ '%s' বিচ্ছিন্ন হল।"
+
+#~ msgid ""
+#~ "\n"
+#~ "The VPN connection '%s' disconnected."
+#~ msgstr ""
+#~ "\n"
+#~ "VPN সংযোগ '%s' বিচ্ছিন্ন হল।"
+
+#~ msgid "VPN connection has been successfully established.\n"
+#~ msgstr "VPN সংযোগ সফলভাৱে স্থাপন কৰা হৈছে।\n"
+
+#~ msgid "VPN Login Message"
+#~ msgstr "VPN লগিন বাৰ্তা"
+
+#~ msgid ""
+#~ "\n"
+#~ "The VPN connection '%s' failed because the VPN service failed to start.\n"
+#~ "\n"
+#~ "%s"
+#~ msgstr ""
+#~ "\n"
+#~ "VPN সেৱা আৰম্ভ হবলে ব্যৰ্থ হোৱা বাবে VPN সংযোগ '%s' ব্যৰ্থ হল।\n"
+#~ "\n"
+#~ "%s"
+
+#~ msgid "device not ready (firmware missing)"
+#~ msgstr "ডিভাইচ প্ৰস্তুত নহয় (ফাৰ্মৱেৰ সন্ধানহিন)"
+
+#~ msgid "device not ready"
+#~ msgstr "ডিভাইচ প্ৰস্তুত নহয়"
+
+#~ msgid "Disconnect"
+#~ msgstr "বিচ্ছিন্ন কৰক"
+
+#~ msgid "_VPN Connections"
+#~ msgstr "VPN সংযোগসমূহ (_V)"
+
+#~ msgid "_Configure VPN..."
+#~ msgstr "VPN সংৰূপণ কৰক (_C)..."
+
+#~ msgid "_Disconnect VPN"
+#~ msgstr "VPN ৰ সৈতে সংযোগ বিচ্ছিন্ন কৰক (_D)..."
+
+#~ msgid "Enable _Wireless"
+#~ msgstr "বেতাঁৰ সামৰ্থবান কৰক (_W)"
+
+#~ msgid "Enable _Mobile Broadband"
+#~ msgstr "ম'বাইল ব্ৰডবেণ্ড সক্ৰিয় কৰক (_M)"
+
+#~ msgid "Enable N_otifications"
+#~ msgstr "অধিসূচনাসমূহ সামৰ্থবান কৰক (_o)"
+
+#~ msgid "Connection _Information"
+#~ msgstr "সংযোগ তথ্য (_I)"
+
+#~ msgid "Edit Connections..."
+#~ msgstr "সংযোগসমূহ সম্পাদন কৰক..."
+
+#~ msgid "_Help"
+#~ msgstr "সহায় (_H)"
+
+#~ msgid "_About"
+#~ msgstr "বিষয়ে (_A)"
+
+#~ msgid "Disconnected"
+#~ msgstr "বিচ্ছিন্নিত"
+
+#~ msgid "Preparing network connection '%s'..."
+#~ msgstr "নেটৱাৰ্ক সংযোগ '%s' প্ৰস্তুত কৰা হৈছে..."
+
+#~ msgid "User authentication required for network connection '%s'..."
+#~ msgstr "নেটৱাৰ্ক সংযোগ '%s' ৰ বাবে ব্যৱহাৰকাৰী প্ৰমাণীকৰণৰ প্ৰয়োজন..."
+
+#~ msgid "Network connection '%s' active"
+#~ msgstr "নেটৱাৰ্ক সংযোগ '%s' সক্ৰিয়"
+
+#~ msgid "Starting VPN connection '%s'..."
+#~ msgstr "VPN সংযোগ '%s' আৰম্ভ কৰা হৈছে..."
+
+#~ msgid "User authentication required for VPN connection '%s'..."
+#~ msgstr "VPN সংযোগ '%s' ৰ বাবে ব্যৱহাৰকাৰী প্ৰমাণীকৰণৰ প্ৰয়োজন..."
+
+#~ msgid "Requesting a VPN address for '%s'..."
+#~ msgstr "'%s' ৰ বাবে এটা VPN ঠিকনা অনুৰোধ কৰা হৈছে..."
+
+#~ msgid "NetworkManager Applet"
+#~ msgstr "NetworkManager এপ্লেট"
+
+#~ msgid "Automatically unlock this device"
+#~ msgstr "এই ডিভাইচ স্বচালিতভাৱে আনলক কৰক"
+
+#~ msgid "_Unlock"
+#~ msgstr "আনলক কৰক (_U)"
+
+#~ msgid "Connection Information"
+#~ msgstr "সংযোগ তথ্য"
+
+#~ msgid "Wired 802.1X authentication"
+#~ msgstr "তাঁৰযুক্ত 802.1X প্ৰমাণীকৰণ"
+
+#~ msgid "_Network name:"
+#~ msgstr "নেটৱাৰ্কৰ নাম (_N):"
+
+#~ msgid "Failed to update connection secrets due to an unknown error."
+#~ msgstr "এটা অজ্ঞাত ত্ৰুটিৰ বাবে সংযোগ গোপনসমূহ আপডেইট কৰিবলে ব্যৰ্থ।"
+
+#~ msgid ""
+#~ "IP addresses identify your computer on the network.  Click the \"Add\" "
+#~ "button to add an IP address."
+#~ msgstr ""
+#~ "IP ঠিকনাসমূহে আপোনাৰ কমপিউটাৰক নেটৱাৰ্কত চিনাক্ত কৰে। এটা IP ঠিকনা যোগ "
+#~ "কৰিবলে \"যোগ কৰক\" বুটাম ক্লিক কৰক।"
+
+#~ msgid "Ig_nore automatically obtained routes"
+#~ msgstr "স্বচালিতভাৱে প্ৰাপ্ত পথসমূহ উপেক্ষা কৰক (_n)"
+
+#~ msgid "_Use this connection only for resources on its network"
+#~ msgstr "এই সংযোগক কেৱল ইয়াৰ নেটৱাৰ্কৰ সম্পসমূহৰ বাবে ব্যৱহাৰ কৰক (_U)"
+
+#~ msgid ""
+#~ "If enabled, this connection will never be used as the default network "
+#~ "connection."
+#~ msgstr ""
+#~ "যদি সামৰ্থবান, এই সংযোগক কেতিয়াও অবিকল্পিত নেটৱাৰ্ক সংযোগ হিচাপে ব্যৱহাৰ কৰা "
+#~ "নহব।"
+
+#~ msgid "_Username:"
+#~ msgstr "ব্যৱহাৰকাৰীৰ নাম (_U):"
+
+#~ msgid "_Service:"
+#~ msgstr "সেৱা (_S):"
+
+#~ msgid "Sho_w password"
+#~ msgstr "পাছৱাৰ্ড দেখুৱাওক (_w)"
+
+#~ msgid "_Password:"
+#~ msgstr "পাছৱাৰ্ড (_P):"
+
+#~ msgid "Automatic"
+#~ msgstr "স্বচালিত"
+
+#~ msgid "Automatic with manual DNS settings"
+#~ msgstr "হস্তচালিত DNS সংহতিসমূহৰ সৈতে স্বচালিত"
+
+#~ msgid "Manual"
+#~ msgstr "হস্তচালিত"
+
+#~ msgid "Link-Local"
+#~ msgstr "সংযোগ-স্থানীয়"
+
+#~ msgid "Shared to other computers"
+#~ msgstr "অন্য কমপিউটাৰৰ সৈতে অংশীদাৰী কৰা আছে"
+
+#~ msgid "_Method:"
+#~ msgstr "পদ্ধতি (_M):"
+
+#~ msgid "Addresses"
+#~ msgstr "ঠিকনাসমূহ"
+
+#~ msgid ""
+#~ "The DHCP client identifier allows the network administrator to customize "
+#~ "your computer's configuration.  If you wish to use a DHCP client "
+#~ "identifier, enter it here."
+#~ msgstr ""
+#~ "DHCP ক্লাএন্ট পৰিচয়কৰ সহায়ত নেটৱাৰ্ক প্ৰশাসকে আপোনাৰ কমপিউটাৰৰ সংৰূপ নিৰ্ধাৰণ "
+#~ "কৰিবলৈ পাৰিব।  DHCP ক্লাএন্ট পৰিচয়কৰ ব্যৱহাৰ কৰিবলৈ ইচ্ছুক হ'লে সেইটো ইয়াত "
+#~ "লিখক।"
+
+#~ msgid ""
+#~ "Domains used when resolving host names. Use commas to separate multiple "
+#~ "domains."
+#~ msgstr ""
+#~ "হস্ট নাম বিশ্লেষণ কৰাৰ বাবে ব্যৱহৃত ডোমেইন। একাধিক ডোমেইন চিহ্নিত কৰাৰ সময়ত "
+#~ "কমা চিহ্ন প্ৰয়োগ কৰা হ'ব।"
+
+#~ msgid "S_earch domains:"
+#~ msgstr "ডমেইনসমূহ সন্ধান কৰক (_e):"
+
+#~ msgid "_DNS servers:"
+#~ msgstr "DNS চাৰ্ভাৰসমূহ (_D):"
+
+#~ msgid ""
+#~ "IP addresses of domain name servers used to resolve host names. Use "
+#~ "commas to separate multiple domain name server addresses."
+#~ msgstr ""
+#~ "হস্ট নাম বিশ্লেষণ কৰাৰ বাবে ব্যৱহৃত ডোমেইন নাম চাৰ্ভাৰৰ IP ঠিকনা। একাধিক "
+#~ "ডোমেইন নাম চাৰ্ভাৰৰ ঠিকনা চিহ্নিত কৰাৰ সময় কমা চিহ্ন প্ৰয়োগ কৰা হ'ব।"
+
+#~ msgid "Require IPv_4 addressing for this connection to complete"
+#~ msgstr "এই সংযোগ সম্পূৰ্ণ হবলে IPv4 ঠিকনাৰ প্ৰয়োজন (_4)"
+
+#~ msgid ""
+#~ "When connecting to IPv6-capable networks, allows the connection to "
+#~ "complete if IPv4 configuration fails but IPv6 configuration succeeds."
+#~ msgstr ""
+#~ "IPv6 ৰ সৈতে সুসঙ্গত নেটৱাৰ্কৰ সৈতে সংযোগ কৰোঁতে, সংযোগক সম্পূৰ্ণ হ'বলৈ দিয়ে যদি "
+#~ "IPv4 সংৰূপ বিফল হয় কিন্তু IPv6 সংৰূপ সফল হয়।"
+
+#~ msgid "_Routes…"
+#~ msgstr "পথসমূহ (_R)…"
+
+#~ msgid "Require IPv_6 addressing for this connection to complete"
+#~ msgstr "এই সংযোগ সম্পূৰ্ণ হবলে IPv6 ঠিকনাৰ প্ৰয়োজন (_6)"
+
+#~ msgid ""
+#~ "When connecting to IPv4-capable networks, allows the connection to "
+#~ "complete if IPv6 configuration fails but IPv4 configuration succeeds."
+#~ msgstr ""
+#~ "IPv4 ৰ সৈতে সুসঙ্গত নেটৱাৰ্কৰ সৈতে সংযোগ কৰোঁতে, সংযোগক সম্পূৰ্ণ হ'বলৈ দিয়ে যদি "
+#~ "IPv4 সংৰূপ বিফল হয় কিন্তু IPv4 সংৰূপ সফল হয়।"
+
+#~ msgid "Any"
+#~ msgstr "যিকোনো"
+
+#~ msgid "3G (UMTS/HSPA)"
+#~ msgstr "3G (UMTS/HSPA)"
+
+#~ msgid "2G (GPRS/EDGE)"
+#~ msgstr "2G (GPRS/EDGE)"
+
+#~ msgid "Prefer 3G (UMTS/HSPA)"
+#~ msgstr "পছন্দ 3G (UMTS/HSPA)"
+
+#~ msgid "Prefer 2G (GPRS/EDGE)"
+#~ msgstr "পছন্দ 2G (GPRS/EDGE)"
+
+#~ msgid "Basic"
+#~ msgstr "মৌলিক"
+
+#~ msgid "Nu_mber:"
+#~ msgstr "সংখ্যা (_m):"
+
+#~ msgid "Advanced"
+#~ msgstr "উন্নত"
+
+#~ msgid "_APN:"
+#~ msgstr "APN (_A):"
+
+#~ msgid "N_etwork ID:"
+#~ msgstr "নেটৱাৰ্কৰ ID (_e):"
+
+#~ msgid "_Type:"
+#~ msgstr "ধৰণ (_T):"
+
+#~ msgid "Change..."
+#~ msgstr "পৰিবৰ্তন কৰক..."
+
+#~ msgid "P_IN:"
+#~ msgstr "PIN (_I):"
+
+#~ msgid "Allow _roaming if home network is not available"
+#~ msgstr "ঘৰ নেটৱাৰ্ক উপস্থিত নাথাকিলে ৰ'মিংৰ অনুমতি দিয়ক (_r)"
+
+#~ msgid "Sho_w passwords"
+#~ msgstr "পাছৱাৰ্ডসমূহ দেখুৱাওক (_w)"
+
+#~ msgid "Authentication"
+#~ msgstr "প্ৰমাণীকৰণ"
+
+#~ msgid "Allowed methods:"
+#~ msgstr "অনুমোদিত পদ্ধতিসমূহ:"
+
+#~ msgid "Configure _Methods…"
+#~ msgstr "পদ্ধতিসমূহ সংৰূপণ কৰক (_M)…"
+
+#~ msgid "Compression"
+#~ msgstr "সংকোচন"
+
+#~ msgid "_Use point-to-point encryption (MPPE)"
+#~ msgstr "বিন্দুৰ-পৰা-বিন্দু ইনক্ৰিপষণ ব্যৱহাৰ কৰক (MPPE) (_U)"
+
+#~ msgid "_Require 128-bit encryption"
+#~ msgstr "128-bit ইনক্ৰিপষণৰ প্ৰয়োজন (_R)"
+
+#~ msgid "Use _stateful MPPE"
+#~ msgstr "অৱস্থাপূৰ্ণ MPPE ব্যৱহাৰ কৰক (_s)"
+
+#~ msgid "Allow _BSD data compression"
+#~ msgstr "BSD তথ্য সংকোচনৰ অনুমতি দিয়ক (_B)"
+
+#~ msgid "Allow _Deflate data compression"
+#~ msgstr "ডিফ্লেইট তথ্য সংকোচনৰ অনুমতি দিয়ক (_D)"
+
+#~ msgid "Use TCP _header compression"
+#~ msgstr "TCP হেডাৰ সংকোচন ব্যৱহাৰ কৰক (_h)"
+
+#~ msgid "Echo"
+#~ msgstr "Echo"
+
+#~ msgid "Send PPP _echo packets"
+#~ msgstr "PPP echo পেকেটসমূহ পঠাওক (_e)"
+
+#~ msgid "Twisted Pair (TP)"
+#~ msgstr "টুইস্টেড পেয়াৰ (TP)"
+
+#~ msgid "Attachment Unit Interface (AUI)"
+#~ msgstr "এটাচমেন্ট একক আন্তঃপৃষ্ঠ (AUI)"
+
+#~ msgid "BNC"
+#~ msgstr "BNC"
+
+#~ msgid "Media Independent Interface (MII)"
+#~ msgstr "মাধ্যম মুক্ত আন্তঃপৃষ্ঠ (MII)"
+
+#~ msgid "10 Mb/s"
+#~ msgstr "10 Mb/s"
+
+#~ msgid "100 Mb/s"
+#~ msgstr "100 Mb/s"
+
+#~ msgid "1 Gb/s"
+#~ msgstr "1 Gb/s"
+
+#~ msgid "10 Gb/s"
+#~ msgstr "10 Gb/s"
+
+#~ msgid "_Port:"
+#~ msgstr "পৰ্ট (_P):"
+
+#~ msgid "_Speed:"
+#~ msgstr "গতি (_S):"
+
+#~ msgid "Full duple_x"
+#~ msgstr "সম্পূৰ্ণ ডুপ্লেক্স (_x)"
+
+#~ msgid "Aut_onegotiate"
+#~ msgstr "স্বআপোচ (_o)"
+
+#~ msgid "_Device MAC address:"
+#~ msgstr "ডিভাইচ MAC ঠিকনা (_D):"
+
+#~ msgid "C_loned MAC address:"
+#~ msgstr "ক্লৌন্ড MAC ঠিকনা (_l):"
+
+#~ msgid ""
+#~ "The MAC address entered here will be used as hardware address for the "
+#~ "network device this connection is activated on.  This feature is known as "
+#~ "MAC cloning or spoofing.  Example: 00:11:22:33:44:55"
+#~ msgstr ""
+#~ "ইয়াত সুমুৱা MAC ঠিকনাক এই সংযোগ সক্ৰিয় কৰা নেটৱাৰ্ক ডিভাইচৰ বাবে হাৰ্ডৱেৰ "
+#~ "ঠিকনা হিচাপে ব্যৱহাৰ কৰা হব। এই বৈশিষ্টক MAC ক্লৌনিং অথবা স্পুফিং হিচাপে জনা "
+#~ "যায়। উদাহৰণ: 00:11:22:33:44:55"
+
+#~ msgid "_MTU:"
+#~ msgstr "MTU (_M):"
+
+#~ msgid "A (5 GHz)"
+#~ msgstr "A (5 GHz)"
+
+#~ msgid "B/G (2.4 GHz)"
+#~ msgstr "B/G (2.4 GHz)"
+
+#~ msgid "mW"
+#~ msgstr "mW"
+
+#~ msgid "Transmission po_wer:"
+#~ msgstr "পৰিবহন শক্তি (_w):"
+
+#~ msgid "Mb/s"
+#~ msgstr "Mb/s"
+
+#~ msgid "_Rate:"
+#~ msgstr "হাৰ (_R):"
+
+#~ msgid ""
+#~ "This option locks this connection to the wireless access point (AP) "
+#~ "specified by the BSSID entered here.  Example: 00:11:22:33:44:55"
+#~ msgstr ""
+#~ "এই বিকল্পই ইয়াত দিয়া BSSID য়ে নিৰ্ধাৰিত কৰাৰ মতে বেতাঁৰ অভিগম পইন্ট (AP) ত "
+#~ "সংযোগক লক কৰে। যেনে: 00:11:22:33:44:55"
+
+#~ msgid "C_hannel:"
+#~ msgstr "চেনেল (_h):"
+
+#~ msgid "M_ode:"
+#~ msgstr "অৱস্থা (_o):"
+
+#~ msgid "S_ecurity:"
+#~ msgstr "সুৰক্ষা (_e):"
+
+#~ msgid "Allowed Authentication Methods"
+#~ msgstr "অনুমোদিত প্ৰমাণীকৰণ পদ্ধতিসমূহ"
+
+#~ msgid "_EAP"
+#~ msgstr "EAP (_E)"
+
+#~ msgid "Extensible Authentication Protocol"
+#~ msgstr "প্ৰসাৰনযোগ্য প্ৰমাণীকৰণ প্ৰটোকল"
+
+#~ msgid "_PAP"
+#~ msgstr "PAP (_P)"
+
+#~ msgid "Password Authentication Protocol"
+#~ msgstr "পাছৱাৰ্ড প্ৰমাণীকৰণ প্ৰটোকল"
+
+#~ msgid "C_HAP"
+#~ msgstr "CHAP (_H)"
+
+#~ msgid "Challenge Handshake Authentication Protocol"
+#~ msgstr "হেণ্ডশেইক প্ৰমাণীকৰণ প্ৰটোকলক প্ৰত্যাহ্বান জনাওক"
+
+#~ msgid "_MSCHAP"
+#~ msgstr "MSCHAP (_M)"
+
+#~ msgid "Microsoft Challenge Handshake Authentication Protocol"
+#~ msgstr "Microsoft প্ৰত্যাহ্বান হেণ্ডছেইক প্ৰমাণীকৰণ প্ৰটোকল"
+
+#~ msgid "MSCHAP v_2"
+#~ msgstr "MSCHAP v_2"
+
+#~ msgid "Microsoft Challenge Handshake Authentication Protocol version 2"
+#~ msgstr "Microsoft প্ৰত্যাহ্বান হেণ্ডশেইক প্ৰমাণীকৰণ প্ৰটোকলক সংস্কৰণ ২"
+
+#~ msgid ""
+#~ "In most cases, the provider's PPP servers will support all authentication "
+#~ "methods.  If connections fail, try disabling support for some methods."
+#~ msgstr ""
+#~ "বেছিৰভাগ ক্ষেত্ৰত, প্ৰদানকাৰীৰ PPP চাৰ্ভাৰসমূহে সকলো প্ৰমাণীকৰণ পদ্ধতি সমৰ্থন "
+#~ "কৰিব। যদি সংযোগসমূহ ব্যৰ্থ হব, কিছুমান পদ্ধতিৰ বাবে সমৰ্থন অসামৰ্থবান কৰি চাওক।"
+
+#~ msgid " "
+#~ msgstr " "
+
+#~ msgid "Choose a VPN Connection Type"
+#~ msgstr "এটা VPN সংযোগ ধৰণ বাছক"
+
+#~ msgid ""
+#~ "Select the type of VPN you wish to use for the new connection.  If the "
+#~ "type of VPN connection you wish to create does not appear in the list, "
+#~ "you may not have the correct VPN plugin installed."
+#~ msgstr ""
+#~ "নতুন সংযোগৰ বাবে ব্যৱহাৰ কৰিব বিচৰা VPN ৰ ধৰণ বাছক। যদি আপুনি সৃষ্টি কৰিব "
+#~ "বিচৰা VPN সংযোগ তালিকাত নাথাকে, আপোনাৰ হয়তো সঠিক VPN প্লাগিন ইনস্টল নাই।"
+
+#~ msgid "Create…"
+#~ msgstr "সৃষ্টি কৰক..."
+
+#~ msgid "Address"
+#~ msgstr "ঠিকনা"
+
+#~ msgid "Netmask"
+#~ msgstr "নেটমাস্ক"
+
+#~ msgid "Gateway"
+#~ msgstr "গেইটৱে"
+
+#~ msgid "Metric"
+#~ msgstr "মেট্ৰিক"
+
+#~ msgid "Prefix"
+#~ msgstr "উপসৰ্গ"
+
+#~ msgid "Could not load DSL user interface."
+#~ msgstr "DSL ব্যৱহাৰকাৰী আন্তঃপৃষ্ঠ ল'ড কৰিব পৰা নাযায়।"
+
+#~ msgid "Automatic (VPN)"
+#~ msgstr "স্বচালিত (VPN)"
+
+#~ msgid "Automatic (VPN) addresses only"
+#~ msgstr "কেৱল স্বচালিত (VPN) ঠিকনাসমূহ"
+
+#~ msgid "Automatic (PPP)"
+#~ msgstr "স্বচালিত (PPP)"
+
+#~ msgid "Automatic (PPP) addresses only"
+#~ msgstr "কেৱল স্বচালিত (PPP) ঠিকনাসমূহ"
+
+#~ msgid "Automatic (PPPoE)"
+#~ msgstr "স্বচালিত (PPPoE)"
+
+#~ msgid "Automatic (PPPoE) addresses only"
+#~ msgstr "কেৱল স্বচালিত (PPPoE) ঠিকনাসমূহ"
+
+#~ msgid "Automatic (DHCP)"
+#~ msgstr "স্বচালিত (DHCP)"
+
+#~ msgid "Automatic (DHCP) addresses only"
+#~ msgstr "কেৱল স্বচালিত (DHCP) ঠিকনাসমূহ"
+
+#~ msgid "Link-Local Only"
+#~ msgstr "কেৱল সংযোগ-স্থানীয়"
+
+#~ msgid "Additional _DNS servers:"
+#~ msgstr "অতিৰিক্ত DNS চাৰ্ভাৰসমূহ (_D):"
+
+#~ msgid "Additional s_earch domains:"
+#~ msgstr "অতিৰিক্ত সন্ধান ডমেইনসমূহ (_e):"
+
+#~ msgid "Editing IPv4 routes for %s"
+#~ msgstr "%s ৰ বাবে IPv4 পথবোৰ সম্পাদন কৰা"
+
+#~ msgid "IPv4 Settings"
+#~ msgstr "IPv4 সংহতিসমূহ"
+
+#~ msgid "Could not load IPv4 user interface."
+#~ msgstr "IPv4 ব্যৱহাৰকাৰী আন্তঃপৃষ্ঠ ল'ড কৰিব পৰা নগল।"
+
+#~ msgid "Automatic, addresses only"
+#~ msgstr "স্বচালিত, কেৱল ঠিকনা"
+
+#~ msgid "Ignore"
+#~ msgstr "উপেক্ষা কৰক"
+
+#~ msgid "Automatic, DHCP only"
+#~ msgstr "স্বচালিত, কেৱল DHCP"
+
+#~ msgid "Editing IPv6 routes for %s"
+#~ msgstr "%s ৰ বাবে IPv6 পথ সম্পাদন"
+
+#~ msgid "IPv6 Settings"
+#~ msgstr "IPv6 ৰ সংহতিসমূহ"
+
+#~ msgid "Could not load IPv6 user interface."
+#~ msgstr "IPv6 ব্যৱহাৰকাৰী আন্তঃপৃষ্ঠ ল'ড কৰিবলৈ ব্যৰ্থ।"
+
+#~ msgid "Could not load mobile broadband user interface."
+#~ msgstr "ম'বাইল ব্ৰডবেণ্ড ব্যৱহাৰকাৰী আন্তঃপৃষ্ঠ ল'ড কৰিবলৈ ব্যৰ্থ।"
+
+#~ msgid "Unsupported mobile broadband connection type."
+#~ msgstr "ম'বাইল ব্ৰডবেণ্ড সংযোগৰ ধৰণ সমৰ্থিত নহয়।"
+
+#~ msgid "Select Mobile Broadband Provider Type"
+#~ msgstr "ম'বাইল ব্ৰডবেণ্ড উপলব্ধকৰ্তাৰ ধৰণ বাছক"
+
+#~ msgid ""
+#~ "Select the technology your mobile broadband provider uses.  If you are "
+#~ "unsure, ask your provider."
+#~ msgstr ""
+#~ "ম'বাইল ব্ৰডবেণ্ড সেৱা উপলব্ধকৰ্তাৰ দ্বাৰা ব্যৱহৃত সেৱা বাছক। এই তথ্য অজ্ঞাত "
+#~ "থাকিলে, সেৱা উপলব্ধকৰ্তাৰ সৈতে যোগাযোগ কৰক।"
+
+#~ msgid ""
+#~ "My provider uses _GSM-based technology (i.e. GPRS, EDGE, UMTS, HSDPA)"
+#~ msgstr ""
+#~ "মোৰ সেৱা উপলব্ধকৰ্তাৰ দ্বাৰা GSM-ভিত্তিক প্ৰযুক্তি ব্যৱহাৰ কৰা হয় (অৰ্থাৎ GPRS, "
+#~ "EDGE, UMTS, HSDPA) (_G)"
+
+#~ msgid "My provider uses C_DMA-based technology (i.e. 1xRTT, EVDO)"
+#~ msgstr ""
+#~ "মোৰ সেৱা উপলব্ধকৰ্তা দ্বাৰা CDMA-ভিত্তিক প্ৰযুক্তি ব্যৱহাৰ কৰা হয় (অৰ্থাৎ 1xRTT, "
+#~ "EVDO) (_D)"
+
+#~ msgid "PAP"
+#~ msgstr "PAP"
+
+#~ msgid "CHAP"
+#~ msgstr "CHAP"
+
+#~ msgid "MSCHAPv2"
+#~ msgstr "MSCHAPv2"
+
+#~ msgid "MSCHAP"
+#~ msgstr "MSCHAP"
+
+#~ msgid "Editing PPP authentication methods for %s"
+#~ msgstr "%s ৰ বাবে PPP প্ৰমাণীকৰণ পদ্ধতি সম্পাদন"
+
+#~ msgid "PPP Settings"
+#~ msgstr "PPP ৰ সংহতিসমূহ"
+
+#~ msgid "Could not load PPP user interface."
+#~ msgstr "PPP ব্যৱহাৰকাৰী আন্তঃপৃষ্ঠ ল'ড কৰিবলৈ ব্যৰ্থ।"
+
+#~ msgid "Could not load VPN user interface."
+#~ msgstr "VPN ব্যৱহাৰকাৰী আন্তঃপৃষ্ঠ ল'ড কৰিব পৰা নগল।"
+
+#~ msgid "Could not find VPN plugin service for '%s'."
+#~ msgstr "'%s' ৰ বাবে VPN প্লাগ-ইন সেৱা পোৱা নাযায়।"
+
+#~ msgid ""
+#~ "This option locks this connection to the network device specified by its "
+#~ "permanent MAC address entered here.  Example: 00:11:22:33:44:55"
+#~ msgstr ""
+#~ "এই বিকল্পয় নেটৱাৰ্ক ডিভাইচ যাক ইয়াত সুমুৱা তাৰ স্থায়ী MAC ঠিকনাৰে ধাৰ্য্য কৰা "
+#~ "হৈছে তালৈ এই সংযোগক লক কৰে। উদাহৰণস্বৰূপ: 00:11:22:33:44:55"
+
+#~ msgid "Wired"
+#~ msgstr "তাঁৰযুক্ত"
+
+#~ msgid "Could not load wired user interface."
+#~ msgstr "তাঁৰযুক্ত ব্যৱহাৰকাৰীৰ আন্তঃপৃষ্ঠ ল'ড কৰিবলৈ ব্যৰ্থ।"
+
+#~ msgid "802.1x Security"
+#~ msgstr "802.1x সুৰক্ষা"
+
+#~ msgid "Could not load Wired Security security user interface."
+#~ msgstr "তাঁৰযুক্ত সুৰক্ষা সুৰক্ষা ব্যৱহাৰকাৰী আন্তঃপৃষ্ঠ ল'ড কৰিব নোৱাৰি।"
+
+#~ msgid "default"
+#~ msgstr "অবিকল্পিত"
+
+#~ msgid "Wireless"
+#~ msgstr "বেতাঁৰ"
+
+#~ msgid "Could not load WiFi user interface."
+#~ msgstr "WiFi ব্যৱহাৰকাৰী আন্তঃপৃষ্ঠ ল'ড কৰিব পৰা নাযায়।"
+
+#~ msgid "Wireless connection %d"
+#~ msgstr "বেতাঁৰ সংযোগ %d"
+
+#~ msgid "WEP 40/128-bit Key (Hex or ASCII)"
+#~ msgstr "WEP 40/128-bit কি (Hex অথবা ASCII)"
+
+#~ msgid "Dynamic WEP (802.1x)"
+#~ msgstr "ডাইনামিক WEP (802.1x)"
+
+#~ msgid "WPA & WPA2 Personal"
+#~ msgstr "WPA আৰু WPA2 ব্যক্তিগত"
+
+#~ msgid "Could not load WiFi security user interface; missing WiFi setting."
+#~ msgstr ""
+#~ "WiFi সুৰক্ষাৰ ব্যৱহাৰকাৰী আন্তঃপৃষ্ঠ ল'ড কৰিবলৈ ব্যৰ্থ; WiFi সংহতিসমূহ অনুপস্থিত।"
+
+#~ msgid "Wireless Security"
+#~ msgstr "বেতাঁৰ সুৰক্ষা"
+
+#~ msgid "Could not load WiFi security user interface."
+#~ msgstr "WiFi সুৰক্ষাৰ ব্যৱহাৰকাৰী আন্তঃপৃষ্ঠ ল'ড কৰিবলৈ ব্যৰ্থ।"
+
+#~ msgid "Editing %s"
+#~ msgstr "%s সম্পাদন"
+
+#~ msgid "Editing un-named connection"
+#~ msgstr "নামবিহীন সংযোগ সম্পাদন"
+
+#~ msgid ""
+#~ "The connection editor could not find some required resources (the .ui "
+#~ "file was not found)."
+#~ msgstr ""
+#~ "সংযোগ সম্পাদকে কিছুমান প্ৰয়োজনীয় সম্পদ বিচাৰি নাপায় (.ui ফাইল পোৱা নগল)।"
+
+#~ msgid "Error creating connection editor dialog."
+#~ msgstr "সংযোগ সম্পাদনৰ বাৰ্তা প্ৰস্তুত কৰিবলৈ ত্ৰুটি।"
+
+#~ msgid "_Save"
+#~ msgstr "সংৰক্ষণ কৰক (_S)"
+
+#~ msgid "Save any changes made to this connection."
+#~ msgstr "এই সংযোগলে কৰা যিকোনো পৰিবৰ্তন সংৰক্ষণ কৰক।"
+
+#~ msgid "_Save..."
+#~ msgstr "সংৰক্ষণ কৰক (_S)..."
+
+#~ msgid "Authenticate to save this connection for all users of this machine."
+#~ msgstr ""
+#~ "এই ডিভাইচৰ সকলো ব্যৱহাৰকাৰীৰ বাবে এই সংযোগ সংৰক্ষণ কৰাৰ বাবে প্ৰমাণীত কৰক।"
+
+#~ msgid "_Import"
+#~ msgstr "ইমপোৰ্ট কৰক (_I)"
+
+#~ msgid "E_xport"
+#~ msgstr "এক্সপোৰ্ট কৰক (_x)"
+
+#~ msgid "Connection _name:"
+#~ msgstr "সংযোগৰ নাম (_n):"
+
+#~ msgid "Connect _automatically"
+#~ msgstr "স্বচালিতভাবে সংযোগ কৰা হ'ব (_a)"
+
+#~ msgid "A_vailable to all users"
+#~ msgstr "সকলো ব্যৱহাৰকাৰীৰ বাবে উপস্থিত"
+
+#~ msgid "%d minute ago"
+#~ msgid_plural "%d minutes ago"
+#~ msgstr[0] "%d মিনিট আগতে"
+#~ msgstr[1] "%d মিনিট আগতে"
+
+#~ msgid "%d hour ago"
+#~ msgid_plural "%d hours ago"
+#~ msgstr[0] "%d ঘন্টা আগতে"
+#~ msgstr[1] "%d ঘন্টা আগতে"
+
+#~ msgid "%d day ago"
+#~ msgid_plural "%d days ago"
+#~ msgstr[0] "%d দিন আগতে"
+#~ msgstr[1] "%d দিন আগতে"
+
+#~ msgid "%d month ago"
+#~ msgid_plural "%d months ago"
+#~ msgstr[0] "%d মাহ আগতে"
+#~ msgstr[1] "%d মাহ আগতে"
+
+#~ msgid "%d year ago"
+#~ msgid_plural "%d years ago"
+#~ msgstr[0] "%d বছৰ আগতে"
+#~ msgstr[1] "%d বছৰ আগতে"
+
+#~ msgid "Connection add failed"
+#~ msgstr "সংযোগ যোগ কৰিবলৈ ব্যৰ্থ"
+
+#~ msgid "The property '%s' / '%s' is invalid: %d"
+#~ msgstr "বৈশিষ্ট '%s' / '%s' অবৈধ: %d"
+
+#~ msgid "An unknown error occurred."
+#~ msgstr "এটা অজ্ঞাত ত্ৰুটি হৈছে।"
+
+#~ msgid ""
+#~ "The connection editor dialog could not be initialized due to an unknown "
+#~ "error."
+#~ msgstr "অজ্ঞাত কাৰণে সংযোগ সম্পাদন ব্যৱস্থাৰ বাৰ্তা আৰম্ভ কৰা নাযায়।"
+
+#~ msgid "Could not edit new connection"
+#~ msgstr "নতুন সংযোগ সম্পাদন কৰা সম্ভৱ নহয়"
+
+#~ msgid "Could not edit connection"
+#~ msgstr "সংযোগ সম্পাদন কৰা সম্ভৱ নহয়"
+
+#~ msgid "Are you sure you wish to delete the connection %s?"
+#~ msgstr "আপুনি নিশ্চিতৰূপে %s সংযোগ মচিবলে ইচ্ছুক নে?"
+
+#~ msgid "Cannot import VPN connection"
+#~ msgstr "VPN সংযোগ ইমপোৰ্ট কৰিবলৈ ব্যৰ্থ"
+
+#~ msgid ""
+#~ "The VPN plugin failed to import the VPN connection correctly\n"
+#~ "\n"
+#~ "Error: no VPN service type."
+#~ msgstr ""
+#~ "VPN প্লাগ-ইন দ্বাৰা সঠিকভাবে VPN সংযোগ ইমপোৰ্ট কৰা সম্ভৱ নহয়\n"
+#~ "\n"
+#~ "ত্ৰুটি: কোনো VPN সেৱাৰ ধৰণ উপলব্ধ নহয়।"
+
+#~ msgid "Could not edit imported connection"
+#~ msgstr "ইমপোৰ্ট কৰা সংযোগ সম্পাদন কৰা সম্ভৱ নহয়"
+
+#~ msgid "Name"
+#~ msgstr "নাম"
+
+#~ msgid "Last Used"
+#~ msgstr "সৰ্বশেষ ব্যৱহৃত"
+
+#~ msgid "No VPN plugin available. Please install one to enable this button."
+#~ msgstr ""
+#~ "কোনো VPN প্লাগিন উপলব্ধ নাই। এই বুটাম সামৰ্থবান কৰিবলে অনুগ্ৰহ কৰি এটা ইনস্টল "
+#~ "কৰক।"
+
+#~ msgid "_Edit"
+#~ msgstr "সম্পাদনা কৰক (_E)"
+
+#~ msgid "Edit the selected connection"
+#~ msgstr "নিৰ্বাচিত সংযোগ সম্পাদন কৰক"
+
+#~ msgid "_Edit..."
+#~ msgstr "সম্পাদনা কৰক (_E)..."
+
+#~ msgid "Authenticate to edit the selected connection"
+#~ msgstr "নিৰ্বাচিত সংযোগ সম্পাদন কৰাৰ আগতে প্ৰমাণীত হোৱা প্ৰয়োজন"
+
+#~ msgid "_Delete"
+#~ msgstr "মচি পেলাওক (_D)"
+
+#~ msgid "Delete the selected connection"
+#~ msgstr "নিৰ্বাচিত সংযোগ মচি পেলাওক"
+
+#~ msgid "_Delete..."
+#~ msgstr "মচি পেলাওক (_D)..."
+
+#~ msgid "Authenticate to delete the selected connection"
+#~ msgstr "নিৰ্বাচিত সংযোগ মচি পেলোৱাৰ আগতে প্ৰমাণীত হোৱা প্ৰয়োজন"
+
+#~ msgid "Error creating connection"
+#~ msgstr "সংযোগ সৃষ্টি কৰোতে ত্ৰুটি"
+
+#~ msgid "Don't know how to create '%s' connections"
+#~ msgstr "'%s' সংযোগসমূহ কিদৰে সৃষ্টি কৰা হব জ্ঞাত নহয়"
+
+#~ msgid "Error editing connection"
+#~ msgstr "সংযোগ সম্পাদন কৰোতে ত্ৰুটি"
+
+#~ msgid "Don't know how to edit '%s' connections"
+#~ msgstr "'%s' সংযোগসমূহ কিদৰে সম্পাদন কৰা হব জ্ঞাত নহয়"
+
+#~ msgid "Did not find a connection with UUID '%s'"
+#~ msgstr "UUID '%s' ৰ সৈতে এটা সংযোগ পোৱা নগল"
+
+#~ msgid ""
+#~ "The file '%s' could not be read or does not contain recognized VPN "
+#~ "connection information\n"
+#~ "\n"
+#~ "Error: %s."
+#~ msgstr ""
+#~ "'%s' ফাইল পঢ়া নাযায় বা ফাইলত কোনো পৰিচিত VPN সংযোগৰ তথ্য উপস্থিত নাই\n"
+#~ "\n"
+#~ "ত্ৰুটি: %s।"
+
+#~ msgid "Select file to import"
+#~ msgstr "ইমপোৰ্ট কৰিবলৈ ফাইল বাছক"
+
+#~ msgid "A file named \"%s\" already exists."
+#~ msgstr "\"%s\" নামৰ ফাইল ইতিমধ্যে আছে।"
+
+#~ msgid "_Replace"
+#~ msgstr "প্ৰতিস্থাপন কৰক (_R)"
+
+#~ msgid "Do you want to replace %s with the VPN connection you are saving?"
+#~ msgstr "সংৰক্ষণৰ বাবে চিহ্নিত VPN সংযোগ সহায়ত %s ৰ প্ৰতিস্থাপন কৰা হ'ব নেকি?"
+
+#~ msgid "Cannot export VPN connection"
+#~ msgstr "VPN সংযোগ এক্সপোৰ্ট কৰা নাযায়"
+
+#~ msgid ""
+#~ "The VPN connection '%s' could not be exported to %s.\n"
+#~ "\n"
+#~ "Error: %s."
+#~ msgstr ""
+#~ "'%s' VPN সংযোগ %s লৈ এক্সপোৰ্ট কৰা নাযায়।\n"
+#~ "\n"
+#~ "ত্ৰুটি: %s।"
+
+#~ msgid "Export VPN connection..."
+#~ msgstr "VPN সংযোগ এক্সপোৰ্ট কৰক..."
+
+#~| msgid ""
+#~| "Bluetooth configuration not possible (failed to connect to D-Bus: %s)."
+#~ msgid ""
+#~ "Bluetooth configuration not possible (failed to connect to D-Bus: (%s) %"
+#~ "s)."
+#~ msgstr "ব্লুটুথ সংৰূপ সম্ভৱ নহয় (D-Bus লৈ সংযোগ কৰিবলৈ বিফল: (%s) %s)।"
+
+#~| msgid ""
+#~| "Bluetooth configuration not possible (error finding NetworkManager: %s)."
+#~ msgid ""
+#~ "Bluetooth configuration not possible (error finding NetworkManager: (%s) %"
+#~ "s)."
+#~ msgstr "ব্লুটুথ সংৰূপ সম্ভব নহয় (NetworkManager বিচাৰি পাওতে ত্ৰুটি: (%s) %s)।"
+
+#~ msgid "Use your mobile phone as a network device (PAN/NAP)"
+#~ msgstr "নেটৱাৰ্ক ডিভাইচ ৰূপে ম'বাইল ফোন ব্যৱহাৰ কৰা হ'ব (PAN/NAP)"
+
+#~ msgid "Access the Internet using your mobile phone (DUN)"
+#~ msgstr "ম'বাইল ফোনৰ মাধ্যমে ইন্টাৰনেট ব্যৱহাৰ কৰক (DUN)"
+
+#~ msgid "Your phone is now ready to use!"
+#~ msgstr "ব্যৱহাৰৰ বাবে আপোনাৰ ফোন এতিয়া প্ৰস্তুত!"
+
+#~ msgid "Mobile wizard was canceled"
+#~ msgstr "ম'বাইল উইজাৰ্ড বাতিল কৰা হৈছে"
+
+#~ msgid "Unknown phone device type (not GSM or CDMA)"
+#~ msgstr "অজ্ঞাত ধৰণৰ ফোন ডিভাইচ (GSM বা CDMA নহয়)"
+
+#~ msgid "unknown modem type."
+#~ msgstr "অজ্ঞাত মডেম ধৰণ।"
+
+#~ msgid "unexpectedly disconnected from the phone."
+#~ msgstr "ফোনৰ সৈতে অপ্ৰত্যাশিতৰূপে সংযোগ বিচ্ছিন্ন হৈছে।"
+
+#~ msgid "timed out detecting phone details."
+#~ msgstr "ফোনৰ বিৱৰণ নিৰ্ধাৰণৰ সময়সীমা উত্তীৰ্ণ হৈছে।"
+
+#~ msgid ""
+#~ "The default Bluetooth adapter must be enabled before setting up a Dial-Up-"
+#~ "Networking connection."
+#~ msgstr ""
+#~ "ডায়েল-আপ নেটৱাৰ্ক সংযোগ প্ৰস্তুত কৰাৰ আগতে অবিকল্পিত ব্লুটুথ এডাপ্টাৰ সক্ৰিয় কৰা "
+#~ "আৱশ্যক।"
+
+#~ msgid "Failed to create PAN connection: %s"
+#~ msgstr "PAN সংযোগ সৃষ্টি কৰিবলে ব্যৰ্থ: %s"
+
+#~ msgid "%s Network"
+#~ msgstr "%s নেটৱাৰ্ক"
+
+#~ msgid ""
+#~ "Your mobile broadband connection is configured with the following "
+#~ "settings:"
+#~ msgstr "নিম্নলিখিত সংহতিসমূহৰ সৈতে ম'বাইল ব্ৰডবেণ্ড সংযোগ সংৰূপণ কৰা হৈছে:"
+
+#~ msgid "Your Device:"
+#~ msgstr "আপোনাৰ ডিভাইচ:"
+
+#~ msgid "Your Provider:"
+#~ msgstr "আপোনাৰ সেৱা উপলব্ধকৰ্তা:"
+
+#~ msgid "Your Plan:"
+#~ msgstr "আপোনাৰ পৰিকল্পনা:"
+
+#~ msgid ""
+#~ "A connection will now be made to your mobile broadband provider using the "
+#~ "settings you selected.  If the connection fails or you cannot access "
+#~ "network resources, double-check your settings.  To modify your mobile "
+#~ "broadband connection settings, choose \"Network Connections\" from the "
+#~ "System >> Preferences menu."
+#~ msgstr ""
+#~ "আপোনাৰ নিৰ্বাচিত সংহতিসমূহসমূহ প্ৰয়োগ কৰি এতিয়া আপোনাৰ ম'বাইল ব্ৰডবেণ্ড সেৱা "
+#~ "উপলব্ধকৰ্তাৰ সৈতে সংযোগ স্থাপন কৰা হ'ব।  সংযোগ বিফল হ'লে বা নেটৱাৰ্ক সম্পদ "
+#~ "ব্যৱহাৰ কৰা সম্ভৱ ন'হ'লে, নিৰ্ধাৰিত সংহতিসমূহসমূহ পৰীক্ষা কৰক।  ম'বাইল ব্ৰডবেণ্ড "
+#~ "সংযোগৰ সংহতিসমূহ পৰিবৰ্তন কৰাৰ বাবে প্ৰণালী >> পছন্দ তালিকাৰ পৰা \"নেটৱাৰ্ক "
+#~ "সংযোগ\" বাছক।"
+
+#~ msgid "Confirm Mobile Broadband Settings"
+#~ msgstr "ম'বাইল ব্ৰডবেণ্ডৰ সংহতিসমূহ নিশ্চিত কৰক"
+
+#~ msgid "Unlisted"
+#~ msgstr "তালিকা বহিৰ্ভূত"
+
+#~ msgid "_Select your plan:"
+#~ msgstr "আপোনাৰ পৰিকল্পনা বাছক (_S):"
+
+#~ msgid "Selected plan _APN (Access Point Name):"
+#~ msgstr "নিৰ্বাচিত পৰিকল্পনাৰ APN (এক্সেচ পইন্ট নেম) (_A):"
+
+#~ msgid ""
+#~ "Warning: Selecting an incorrect plan may result in billing issues for "
+#~ "your broadband account or may prevent connectivity.\n"
+#~ "\n"
+#~ "If you are unsure of your plan please ask your provider for your plan's "
+#~ "APN."
+#~ msgstr ""
+#~ "সতৰ্কবাৰ্তা: ভুল পৰিকল্পনা নিৰ্বাচন কৰিলে আপোনাৰ ব্ৰডবেণ্ড সংযোগৰ বিল আৰু সংযোগ "
+#~ "স্থাপনত সমস্যা হ'ব।\n"
+#~ "\n"
+#~ "পৰিকল্পনা সম্পৰ্কে নিশ্চিত ন'হ'লে অনুগ্ৰহ কৰি সেৱা উপলব্ধকৰ্তা সৈতে যোগাযোগ কৰি "
+#~ "আপোনাৰ ব্যৱহৃত পৰিকল্পনাৰ APN জানক।"
+
+#~ msgid "Choose your Billing Plan"
+#~ msgstr "ব্যৱহৃত বিল পৰিকল্পনা বাছক"
+
+#~ msgid "My plan is not listed..."
+#~ msgstr "মোৰ পৰিকল্পনা তালিকাভুক্ত নহয়..."
+
+#~ msgid "Select your provider from a _list:"
+#~ msgstr "তালিকাৰ পৰা সেৱা উপলব্ধকৰ্তাৰ নাম বাছক (_l):"
+
+#~ msgid "Provider"
+#~ msgstr "সেৱা উপলব্ধকৰ্তা"
+
+#~ msgid "I can't find my provider and I wish to enter it _manually:"
+#~ msgstr "সেৱা উপলব্ধকৰ্তাৰ নাম অনুপস্থিত আৰু মই স্বয়ং সেইটো লিখিবলৈ ইচ্ছুক (_m):"
+
+#~ msgid "Provider:"
+#~ msgstr "সেৱা উপলব্ধকৰ্তা:"
+
+#~ msgid "My provider uses GSM technology (GPRS, EDGE, UMTS, HSPA)"
+#~ msgstr ""
+#~ "মোৰ সেৱা উপলব্ধকৰ্তা দ্বাৰা GSM প্ৰযুক্তি ব্যৱহাৰ কৰা হয় (GPRS, EDGE, UMTS, HSPA)"
+
+#~ msgid "My provider uses CDMA technology (1xRTT, EVDO)"
+#~ msgstr "মোৰ সেৱা উপলব্ধকৰ্তা দ্বাৰা CDMA প্ৰযুক্তি ব্যৱহাৰ কৰা হয় (1xRTT, EVDO)"
+
+#~ msgid "Choose your Provider"
+#~ msgstr "সেৱা উপলব্ধকৰ্তা বাছক"
+
+#~ msgid "Country or Region List:"
+#~ msgstr "দেশ অথবা অঞ্চল তালিকা:"
+
+#~ msgid "Country or region"
+#~ msgstr "দেশ অথবা অঞ্চল"
+
+#~ msgid "My country is not listed"
+#~ msgstr "মোৰ দেশ তালিকাত নাই"
+
+#~ msgid "Choose your Provider's Country or Region"
+#~ msgstr "আপোনাৰ প্ৰদানকাৰীৰ দেশ অথবা অঞ্চল বাছক"
+
+#~ msgid "Installed GSM device"
+#~ msgstr "ইনস্টল কৰা GSM ডিভাইচ"
+
+#~ msgid "Installed CDMA device"
+#~ msgstr "ইনস্টল কৰা CDMA ডিভাইচ"
+
+#~ msgid ""
+#~ "This assistant helps you easily set up a mobile broadband connection to a "
+#~ "cellular (3G) network."
+#~ msgstr ""
+#~ "এই সহায়ক ব্যৱস্থাৰ সহায়ত এটা চেলুলাৰ (3G) নেটৱাৰ্কৰ সৈতে ম'বাইল ব্ৰডবেণ্ড সংযোগ "
+#~ "স্থাপন কৰা যাব।"
+
+#~ msgid "You will need the following information:"
+#~ msgstr "নিম্নলিখিত তথ্যৰ প্ৰয়োজন:"
+
+#~ msgid "Your broadband provider's name"
+#~ msgstr "ব্ৰডবেণ্ড সেৱা উপলব্ধকৰ্তাৰ নাম"
+
+#~ msgid "Your broadband billing plan name"
+#~ msgstr "ব্ৰডবেণ্ড বিলিং পৰিকল্পনাৰ নাম"
+
+#~ msgid "(in some cases) Your broadband billing plan APN (Access Point Name)"
+#~ msgstr ""
+#~ "(কিছু ক্ষেত্ৰত) আপোনাৰ ব্যৱহৃত ব্ৰডবেণ্ড বিলিং পৰিকল্পনা APN (এক্সেচ পইন্ট নেম)"
+
+#~ msgid "Any device"
+#~ msgstr "যিকোনো ডিভাইচ"
+
+#~ msgid "Set up a Mobile Broadband Connection"
+#~ msgstr "ম'বাইল ব্ৰডবেণ্ড সংযোগ প্ৰস্তুত কৰক"
+
+#~ msgid "New Mobile Broadband Connection"
+#~ msgstr "নতুন ম'বাইল ব্ৰডবেণ্ড সংযোগ"
+
+#~ msgid "New..."
+#~ msgstr "নতুন..."
+
+#~ msgid "C_reate"
+#~ msgstr "সৃষ্টি কৰক (_r)"
+
+#~ msgid ""
+#~ "Passwords or encryption keys are required to access the wireless network "
+#~ "'%s'."
+#~ msgstr ""
+#~ "'%s' বেতাঁৰ নেটৱাৰ্ক ব্যৱহাৰ কৰাৰ বাবে পাছৱাৰ্ড বা এনক্ৰিপশন কি'ৰ প্ৰয়োজন।"
+
+#~ msgid "Wireless Network Authentication Required"
+#~ msgstr "বেতাঁৰ নেটৱাৰ্ক প্ৰমাণীকৰণ প্ৰয়োজন"
+
+#~ msgid "Authentication required by wireless network"
+#~ msgstr "বেতাঁৰ নেটৱাৰ্কৰ দ্বাৰা প্ৰমাণীকৰণৰ প্ৰয়োজন"
+
+#~ msgid "Create New Wireless Network"
+#~ msgstr "নতুন বেতাঁৰ নেটৱাৰ্ক সৃষ্টি কৰক"
+
+#~ msgid "New wireless network"
+#~ msgstr "নতুন বেতাঁৰ নেটৱাৰ্ক"
+
+#~ msgid "Enter a name for the wireless network you wish to create."
+#~ msgstr "সৃষ্টি কৰাৰ বাবে চিহ্নিত বেতাঁৰ নেটৱাৰ্কৰ নাম নিৰ্ধাৰণ কৰক।"
+
+#~ msgid "Connect to Hidden Wireless Network"
+#~ msgstr "গোপন বেতাঁৰ নেটৱাৰ্কৰ সৈতে সংযোগ স্থাপন কৰক"
+
+#~ msgid "Hidden wireless network"
+#~ msgstr "গোপন বেতাঁৰ নেটৱাৰ্ক"
+
+#~ msgid ""
+#~ "Enter the name and security details of the hidden wireless network you "
+#~ "wish to connect to."
+#~ msgstr ""
+#~ "সংযোগ কৰাৰ বাবে চিহ্নিত গোপন বেতাঁৰ নেটৱাৰ্কৰ নাম আৰু সুৰক্ষা বিষয়ক তথ্য লিখক।"
+
+#~ msgid "Wireless _security:"
+#~ msgstr "বেতাঁৰ সুৰক্ষা (_s):"
+
+#~ msgid "Wireless _adapter:"
+#~ msgstr "বেতাঁৰ এডাপ্টাৰ (_a):"
+
+#~ msgid "Usage:"
+#~ msgstr "ব্যৱহাৰপদ্ধতি (_U):"
+
+#~ msgid ""
+#~ "This program is a component of NetworkManager (http://projects.gnome.org/"
+#~ "NetworkManager)."
+#~ msgstr ""
+#~ "এই প্ৰগ্ৰাম NetworkManager ৰ এটা উপাদান (http://projects.gnome.org/"
+#~ "NetworkManager)।"
+
+#~ msgid ""
+#~ "It is not intended for command-line interaction but instead runs in the "
+#~ "GNOME desktop environment."
+#~ msgstr ""
+#~ "ইয়াক কমান্ড-শাৰীৰ মাধ্যমে ব্যৱহাৰৰ বাবে নিৰ্মিত নহয় আৰু GNOME ডেস্কটপ পৰিবেশত "
+#~ "সঞ্চালিত হয়।"
+
+#~ msgid "GPRS"
+#~ msgstr "GPRS"
+
+#~ msgid "EDGE"
+#~ msgstr "EDGE"
+
+#~ msgid "UMTS"
+#~ msgstr "UMTS"
+
+#~ msgid "HSDPA"
+#~ msgstr "HSDPA"
+
+#~ msgid "HSUPA"
+#~ msgstr "HSUPA"
+
+#~ msgid "HSPA"
+#~ msgstr "HSPA"
+
+#~ msgid "not registered"
+#~ msgstr "ৰেজিস্টাৰ্ড নহয়"
+
+#~ msgid "Home network (%s)"
+#~ msgstr "ঘৰৰ নেটৱাৰ্ক (%s)"
+
+#~ msgid "Home network"
+#~ msgstr "ঘৰৰ নেটৱাৰ্ক"
+
+#~ msgid "searching"
+#~ msgstr "অনুসন্ধান কৰা হৈছে"
+
+#~ msgid "%s (%s roaming)"
+#~ msgstr "%s (%s ৰ'মিং)"
+
+#~ msgid "%s (roaming)"
+#~ msgstr "%s (ৰ'মিং)"
+
+#~ msgid "Roaming network (%s)"
+#~ msgstr "ৰ'মিং নেটৱাৰ্ক (%s)"
+
+#~ msgid "Default"
+#~ msgstr "অবিকল্পিত"
+
+#~ msgid ""
+#~ "The NetworkManager Applet could not find some required resources (the .ui "
+#~ "file was not found)."
+#~ msgstr ""
+#~ "NetworkManager এপ্লেটে কিছুমান প্ৰয়োজনীয় সম্পদ বিচাৰি নাপায় (.ui ফাইল পোৱা "
+#~ "নগল)।"
+
+#~ msgid "No Certificate Authority certificate chosen"
+#~ msgstr "কোনো প্ৰমাণপত্ৰ কতৃপক্ষৰ প্ৰমাণপত্ৰ নিৰ্বাচন কৰা নহয়"
+
+#~ msgid ""
+#~ "Not using a Certificate Authority (CA) certificate can result in "
+#~ "connections to insecure, rogue wireless networks.  Would you like to "
+#~ "choose a Certificate Authority certificate?"
+#~ msgstr ""
+#~ "প্ৰমাণপত্ৰ কতৃপক্ষ (CA) প্ৰমাণপত্ৰ ব্যৱহাৰ নকৰিলে সুৰক্ষাবিহীন আৰু বিপজ্জনক নেটৱাৰ্কৰ "
+#~ "সৈতে সংযোগ স্থাপন কৰা হ'ব পাৰে। আপুনি এটা প্ৰমাণপত্ৰ কতৃপক্ষ প্ৰমাণপত্ৰ নিৰ্বাচন "
+#~ "কৰিব বিচাৰে নেকি?"
+
+#~ msgid "Choose CA Certificate"
+#~ msgstr "এটা CA প্ৰমাণপত্ৰ বাছক"
+
+#~ msgid "DER, PEM, or PKCS#12 private keys (*.der, *.pem, *.p12)"
+#~ msgstr "DER, PEM, বা PKCS#12 ব্যক্তিগত কি'সমূহ (*.der, *.pem, *.p12)"
+
+#~ msgid "DER or PEM certificates (*.der, *.pem, *.crt, *.cer)"
+#~ msgstr "DER বা PEM প্ৰমাণপত্ৰসমূহ (*.der, *.pem, *.crt, *.cer)"
+
+#~ msgid "Anonymous"
+#~ msgstr "বেনামী"
+
+#~ msgid "Authenticated"
+#~ msgstr "প্ৰমাণীত"
+
+#~ msgid "Both"
+#~ msgstr "দুয়ো"
+
+#~ msgid "Anony_mous identity:"
+#~ msgstr "বেনামী পৰিচয় (_m):"
+
+#~ msgid "Allow automatic PAC pro_visioning"
+#~ msgstr "স্বচালিত PAC যোগানৰ অনুমতি দিয়ক (_v)"
+
+#~ msgid "GTC"
+#~ msgstr "GTC"
+
+#~ msgid "Choose a PAC file..."
+#~ msgstr "এটা PAC ফাইল বাছক..."
+
+#~ msgid "PAC files (*.pac)"
+#~ msgstr "PAC ফাইলসমূহ (*.pac)"
+
+#~ msgid "All files"
+#~ msgstr "সকলো ফাইল"
+
+#~ msgid "MD5"
+#~ msgstr "MD5"
+
+#~ msgid "Choose a Certificate Authority certificate..."
+#~ msgstr "প্ৰমাণপত্ৰ কতৃপক্ষৰ প্ৰমাণপত্ৰ বাছক..."
+
+#~ msgid "Version 0"
+#~ msgstr "সংস্কৰণ 0"
+
+#~ msgid "Version 1"
+#~ msgstr "সংস্কৰণ 1"
+
+#~ msgid "C_A certificate:"
+#~ msgstr "CA প্ৰমাণপত্ৰ (_A):"
+
+#~ msgid "PEAP _version:"
+#~ msgstr "PEAP সংস্কৰণ (_v):"
+
+#~ msgid "As_k for this password every time"
+#~ msgstr "প্ৰতিবাৰ এই পাছৱাৰ্ড লিখাৰ অনুৰোধ কৰা হ'ব (_k)"
+
+#~ msgid "Unencrypted private keys are insecure"
+#~ msgstr "এনক্ৰিপশন বিহীন ব্যক্তিগত কি' নিৰাপদ নহয়"
+
+#~ msgid ""
+#~ "The selected private key does not appear to be protected by a password.  "
+#~ "This could allow your security credentials to be compromised.  Please "
+#~ "select a password-protected private key.\n"
+#~ "\n"
+#~ "(You can password-protect your private key with openssl)"
+#~ msgstr ""
+#~ "নিৰ্বাচিত ব্যক্তিগত কি' সম্ভৱত পাছৱাৰ্ড সহায়ত সুৰক্ষিত নহয়। ইয়াৰ ফলত সুৰক্ষা বিষয়ক "
+#~ "পৰিচয়ৰ সুৰক্ষা হানী হোৱাৰ সম্ভাৱনা আছে।  অনুগ্ৰহ কৰি, পাছৱাৰ্ড সহায়ত সুৰক্ষিত এটা "
+#~ "ব্যক্তিগত কি' বাছক।\n"
+#~ "\n"
+#~ "(openssl ৰ মাধ্যমে পাছৱাৰ্ড সহায়ত ব্যক্তিগত কি' সুৰক্ষিত কৰা যাব)"
+
+#~ msgid "Choose your personal certificate..."
+#~ msgstr "ব্যক্তিগত প্ৰমাণপত্ৰ বাছক..."
+
+#~ msgid "I_dentity:"
+#~ msgstr "পৰিচয় (_d):"
+
+#~ msgid "_User certificate:"
+#~ msgstr "ব্যৱহাৰকাৰী প্ৰমাণপত্ৰ (_U):"
+
+#~ msgid "Private _key:"
+#~ msgstr "ব্যক্তিগত কি' (_k):"
+
+#~ msgid "_Private key password:"
+#~ msgstr "ব্যক্তিগত কি' পাছৱাৰ্ড (_P):"
+
+#~ msgid "No"
+#~ msgstr "নহয়"
+
+#~ msgid "Yes"
+#~ msgstr "হয়"
+
+#~ msgid "TLS"
+#~ msgstr "TLS"
+
+#~ msgid "FAST"
+#~ msgstr "FAST"
+
+#~ msgid "Tunneled TLS"
+#~ msgstr "টানেল কৰা TLS"
+
+#~ msgid "Protected EAP (PEAP)"
+#~ msgstr "সুৰক্ষিত EAP (PEAP)"
+
+#~ msgid "Au_thentication:"
+#~ msgstr "প্ৰমাণীকৰণ (_t):"
+
+#~ msgid "Shared Key"
+#~ msgstr "অংশীদাৰী কৰা কি'"
+
+#~ msgid "1 (Default)"
+#~ msgstr "1 (অবিকল্পিত)"
+
+#~ msgid "2"
+#~ msgstr "2"
+
+#~ msgid "3"
+#~ msgstr "3"
+
+#~ msgid "4"
+#~ msgstr "4"
+
+#~ msgid "_Key:"
+#~ msgstr "কি' (_K):"
+
+#~ msgid "Sho_w key"
+#~ msgstr "কি' দেখুৱাওক (_w)"
+
+#~ msgid "WEP inde_x:"
+#~ msgstr "WEP সূচী (_x):"
+
+#~ msgid "could not find the Bluetooth device."
+#~ msgstr "ব্লুটুথ ডিভাইচ পোৱা নাযায়।"
+
+#~ msgid "Bluetooth configuration not possible (failed to create D-Bus proxy)."
+#~ msgstr "ব্লুটুথ সংৰূপ সম্ভৱ নহয় (D-Bus প্ৰক্সি সৃষ্টি কৰিবলৈ বিফল)।"
+
+#~ msgid "An instance of nm-applet is already running.\n"
+#~ msgstr "nm-applet ৰ এটা চানেকি বৰ্তমানে চলি আছে।\n"
+
+#~ msgid "Could not acquire the %s service. (%d)\n"
+#~ msgstr "%s সেৱা গ্ৰহণ কৰিবলৈ ব্যৰ্থ। (%d)\n"
+
+#~ msgid "PUK code required"
+#~ msgstr "PUK ক'ড প্ৰয়োজনীয়"
+
+#~ msgid "PUK code is needed for the mobile broadband device"
+#~ msgstr "ম'বাইল ব্ৰ'ডবেণ্ড ডিভাইচৰ কাৰণে PUK ক'ড প্ৰয়োজনীয়"
+
+#~ msgctxt "No wired security used"
+#~ msgid "None"
+#~ msgstr "একো নাই"
+
+#~ msgctxt "Unknown/unrecognized wired or wifi security"
+#~ msgid "Unknown"
+#~ msgstr "অজ্ঞাত"
+
+#~ msgid "translator-credits"
+#~ msgstr "অমিতাক্ষ ফুকন (aphukan@fedoraproject.org)"
+
+#~ msgid ""
+#~ "Active Network Connections"
+#~ msgstr ""
+#~ "Active Network Connections"
+
+#~ msgid ""
+#~ "Automatic\n"
+#~ "Version 0\n"
+#~ "Version 1"
+#~ msgstr ""
+#~ "Automatic\n"
+#~ "Version 0\n"
+#~ "Version 1"
+
+#~ msgid "C_onnect"
+#~ msgstr "C_onnect"
+
+#~ msgid "Other Wireless Network..."
+#~ msgstr "বেতাঁৰ নেটৱাৰ্ক"
+
+#~ msgid "label"
+#~ msgstr "লেবেল"
+
+#~ msgid "Addresses"
+#~ msgstr "Addresses"
+
+#~ msgid ""
+#~ "Automatic\n"
+#~ "Automatic with manual DNS settings\n"
+#~ "Manual\n"
+#~ "Link-Local\n"
+#~ "Shared to other computers"
+#~ msgstr ""
+#~ "Automatic\n"
+#~ "Automatic with manual DNS settings\n"
+#~ "Manual\n"
+#~ "Link-Local\n"
+#~ "Shared to other computers"
+
+#~ msgid "_Routes…"
+#~ msgstr "ৰুট… (_R)"
+
+#~ msgid "Basic"
+#~ msgstr "Basic"
+
+#~ msgid ""
+#~ "Any\n"
+#~ "3G (UMTS/HSPA)\n"
+#~ "2G (GPRS/EDGE)\n"
+#~ "Prefer 3G (UMTS/HSPA)\n"
+#~ "Prefer 2G (GPRS/EDGE)"
+#~ msgstr ""
+#~ "Any\n"
+#~ "3G (UMTS/HSPA)\n"
+#~ "2G (GPRS/EDGE)\n"
+#~ "Prefer 3G (UMTS/HSPA)\n"
+#~ "Prefer 2G (GPRS/EDGE)"
+
+#~ msgid "Authentication"
+#~ msgstr "DSL প্ৰমাণীকৰণ"
+
+#~ msgid "Echo"
+#~ msgstr "Echo"
+
+#~ msgid ""
+#~ "Automatic\n"
+#~ "10 Mb/s\n"
+#~ "100 Mb/s\n"
+#~ "1 Gb/s\n"
+#~ "10 Gb/s"
+#~ msgstr ""
+#~ "Automatic\n"
+#~ "10 Mb/s\n"
+#~ "100 Mb/s\n"
+#~ "1 Gb/s\n"
+#~ "10 Gb/s"
+
+#~ msgid ""
+#~ "Automatic\n"
+#~ "Twisted Pair (TP)\n"
+#~ "Attachment Unit Interface (AUI)\n"
+#~ "BNC\n"
+#~ "Media Independent Interface (MII)"
+#~ msgstr ""
+#~ "Automatic\n"
+#~ "Twisted Pair (TP)\n"
+#~ "Attachment Unit Interface (AUI)\n"
+#~ "BNC\n"
+#~ "Media Independent Interface (MII)"
+
+#~ msgid ""
+#~ "Automatic\n"
+#~ "A (5 GHz)\n"
+#~ "B/G (2.4 GHz)"
+#~ msgstr ""
+#~ "Automatic\n"
+#~ "A (5 GHz)\n"
+#~ "B/G (2.4 GHz)"
+
+#~ msgid "_Security:"
+#~ msgstr "_Security:"
+
+#~ msgid ""
+#~ "The connection editor could not find some required resources (the "
+#~ "NetworkManager applet glade file was not found)."
+#~ msgstr ""
+#~ "সংযোগ সম্পাদন ব্যৱস্থা দ্বাৰা কিছু আৱশ্যক সম্পদ সন্ধান কৰা সম্ভৱ নহয় "
+#~ "(NetworkManager এপ্লেট glade ফাইল পোৱা নাযায়)।"
+
+#~ msgid "Apply"
+#~ msgstr "প্ৰয়োগ কৰক"
+
+#~ msgid "Save this connection for all users of this machine."
+#~ msgstr "এই ডিভাইচৰ সকলো ব্যৱহাৰকাৰীৰ বাবে এই সংযোগ সংৰক্ষণ কৰক।"
+
+#~ msgid "Apply..."
+#~ msgstr "প্ৰয়োগ কৰক..."
+
+#~ msgid "Country"
+#~ msgstr "দেশ"
+
+#~ msgid "United Kingdom"
+#~ msgstr "যুক্তৰাজ্য"
+
+#~ msgid "Cannot start VPN connection '%s'"
+#~ msgstr "VPN সংযোগ '%s' আৰম্ভ কৰিবলৈ ব্যৰ্থ"
+
+#~ msgid ""
+#~ "Could not find the authentication dialog for VPN connection type '%s'. "
+#~ "Contact your system administrator."
+#~ msgstr ""
+#~ "'%s' ধৰণৰ VPN সংযোগৰ ক্ষেত্ৰত অনুমোদনৰ বাৰ্তা পোৱা নাযায়। প্ৰণালী প্ৰশাসকৰ সৈতে "
+#~ "যোগাযোগ কৰক।"
+
+#~ msgid ""
+#~ "There was a problem launching the authentication dialog for VPN "
+#~ "connection type '%s'. Contact your system administrator."
+#~ msgstr ""
+#~ "'%s' ধৰণৰ VPN সংযোগৰ অনুমোদনৰ বাৰ্তা আৰম্ভ কৰিবলৈ সমস্যা দেখা দিছে। প্ৰণালী "
+#~ "প্ৰশাসকৰ সৈতে যোগাযোগ কৰক।"
+
+#~ msgid ""
+#~ "The NetworkManager applet could not find some required resources.  It "
+#~ "cannot continue.\n"
+#~ msgstr ""
+#~ "The NetworkManager applet could not find some required resources.  It "
+#~ "cannot continue.\n"
+
+#~ msgid "Select A File"
+#~ msgstr "এটা পঞ্জিকা নিৰ্বাচন কৰক"
+
+#~ msgid ""
+#~ "Insufficient privileges or unknown error retrieving system connection "
+#~ "secrets."
+#~ msgstr ""
+#~ "Insufficient privileges or unknown error retrieving system connection "
+#~ "secrets."
 
-#~ msgid "NM WWAN hardware:"
-#~ msgstr "NM WWAN যান্ত্ৰিক সামগ্ৰী:"
+#~ msgid "Could not connect to D-Bus to request connection secrets."
+#~ msgstr "Could not connect to D-Bus to request connection secrets."
 
-#~ msgid "unable to join netlink group for monitoring link status: %s"
-#~ msgstr "লিংকৰ অৱস্থা নিৰীক্ষণৰ উদ্দেশ্যে netlink দলত  যোগ কৰিবলৈ ব্যৰ্থ: %s"
+#~ msgid "PU_K:"
+#~ msgstr "PU_K:"
 
-#~ msgid "unable to connect to netlink: %s"
-#~ msgstr "netlink ৰ সৈতে সংযোগ কৰিবলৈ ব্যৰ্থ: %s"
+#~ msgid "_Band:"
+#~ msgstr "_Band:"
diff --git a/po/bn_IN.po b/po/bn_IN.po
index 372d7bb2..6d3f8307 100644
--- a/po/bn_IN.po
+++ b/po/bn_IN.po
@@ -3,964 +3,1678 @@
 # Copyright (C) 2009 NetworkManager's COPYRIGHT HOLDER
 # This file is distributed under the same license as the NetworkManager package.
 #
-# Runa Bhattacharjee , 2009, 2010.
+# Runa Bhattacharjee , 2009, 2010, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: bn_IN\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-05-06 14:31+0530\n"
-"PO-Revision-Date: 2010-05-07 10:43+0530\n"
+"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
+"product=NetworkManager&keywords=I18N+L10N&component=general\n"
+"POT-Creation-Date: 2012-11-26 03:25+0000\n"
+"PO-Revision-Date: 2012-11-26 23:38+0530\n"
 "Last-Translator: Runa Bhattacharjee \n"
-"Language-Team: Bengali INDIA \n"
+"Language-Team: Bengali (India) \n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: KBabel 1.11.4\n"
+"X-Generator: Lokalize 1.2\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/common.c:32 ../cli/src/common.c:44 ../cli/src/common.c:52
+#: ../cli/src/common.c:63 ../cli/src/connections.c:128
+#: ../cli/src/connections.c:162
+msgid "GROUP"
+msgstr "GROUP"
+
+#. 0
+#: ../cli/src/common.c:33 ../cli/src/common.c:53
+msgid "ADDRESS"
+msgstr "ADDRESS"
+
+#. 1
+#: ../cli/src/common.c:34 ../cli/src/common.c:54
+msgid "ROUTE"
+msgstr "ROUTE"
+
+#. 2
+#: ../cli/src/common.c:35 ../cli/src/common.c:55
+msgid "DNS"
+msgstr "DNS"
+
+#. 3
+#: ../cli/src/common.c:36 ../cli/src/common.c:56
+msgid "DOMAIN"
+msgstr "DOMAIN"
+
+#. 4
+#: ../cli/src/common.c:37
+msgid "WINS"
+msgstr "WINS"
+
+#. 0
+#: ../cli/src/common.c:45 ../cli/src/common.c:64
+msgid "OPTION"
+msgstr "OPTION"
+
+#: ../cli/src/common.c:366
+msgid "unmanaged"
+msgstr "পরিচালিত নয়"
+
+#: ../cli/src/common.c:368
+msgid "unavailable"
+msgstr "উপলব্ধ নয়"
+
+#: ../cli/src/common.c:370 ../cli/src/network-manager.c:120
+msgid "disconnected"
+msgstr "বিচ্ছিন্ন"
+
+#: ../cli/src/common.c:372
+msgid "connecting (prepare)"
+msgstr "সংযোগ করা হচ্ছে (প্রস্তুতি)"
+
+#: ../cli/src/common.c:374
+msgid "connecting (configuring)"
+msgstr "সংযোগ করা হচ্ছে (কনফিগার করা হচ্ছে)"
+
+#: ../cli/src/common.c:376
+msgid "connecting (need authentication)"
+msgstr "সংযোগ করা হচ্ছে (অনুমোদন প্রয়োজন)"
+
+#: ../cli/src/common.c:378
+msgid "connecting (getting IP configuration)"
+msgstr "সংযোগ করা হচ্ছে (IP কনফিগারেশন প্রাপ্ত করা হচ্ছে)"
+
+#: ../cli/src/common.c:380
+msgid "connecting (checking IP connectivity)"
+msgstr "সংযোগ করা হচ্ছে (IP সংযোগ প্রাপ্ত করা হচ্ছে)"
+
+#: ../cli/src/common.c:382
+msgid "connecting (starting secondary connections)"
+msgstr "সংযোগ করা হচ্ছে (দ্বিতীয় সংযোগ আরম্ভ করা হচ্ছে)"
+
+#: ../cli/src/common.c:384 ../cli/src/network-manager.c:116
+msgid "connected"
+msgstr "সংযোগ স্থাপিত"
+
+#: ../cli/src/common.c:386 ../cli/src/connections.c:635
+msgid "deactivating"
+msgstr "নিষ্ক্রিয় করা হচ্ছে"
+
+#: ../cli/src/common.c:388
+msgid "connection failed"
+msgstr "সংযোগ বিফল"
+
+#: ../cli/src/common.c:390 ../cli/src/connections.c:638
+#: ../cli/src/connections.c:661 ../cli/src/connections.c:1353
+#: ../cli/src/devices.c:645 ../cli/src/network-manager.c:123
+#: ../cli/src/network-manager.c:185 ../cli/src/network-manager.c:188
+#: ../cli/src/network-manager.c:197 ../cli/src/network-manager.c:257
+#: ../cli/src/network-manager.c:273 ../cli/src/network-manager.c:431
+#: ../cli/src/network-manager.c:486 ../cli/src/network-manager.c:524
+#: ../cli/src/network-manager.c:563 ../cli/src/settings.c:593
+#: ../cli/src/settings.c:621 ../cli/src/utils.c:533 ../src/main.c:451
+#: ../src/main.c:470
+msgid "unknown"
+msgstr "অজানা"
+
+#: ../cli/src/common.c:399
+msgid "No reason given"
+msgstr "কোনো কারণ পেশ করা হয়নি"
+
+#: ../cli/src/common.c:402
+msgid "Unknown error"
+msgstr "অজানা ত্রুটি"
+
+#: ../cli/src/common.c:405
+msgid "Device is now managed"
+msgstr "ডিভাইস বর্তমানে পরিচালিত হবে"
+
+#: ../cli/src/common.c:408
+msgid "Device is now unmanaged"
+msgstr "ডিভাইস বর্তমানে পরিচালিত নয়"
+
+#: ../cli/src/common.c:411
+msgid "The device could not be readied for configuration"
+msgstr "কনফিগারেশনের কারণে ডিভাইসটি প্রস্তুত করা যায়নি"
+
+#: ../cli/src/common.c:414
+msgid ""
+"IP configuration could not be reserved (no available address, timeout, etc.)"
+msgstr ""
+"IP কনফিগারেশন সংরক্ষণ করা যায়নি (ঠিকানা উপলব্ধ নেই, সময়সীমা উত্তীর্ণ, ইত্যাদি "
+")"
+
+#: ../cli/src/common.c:417
+msgid "The IP configuration is no longer valid"
+msgstr "এই IP কনফিগারেশন এখন বৈধ নয়"
+
+#: ../cli/src/common.c:420
+msgid "Secrets were required, but not provided"
+msgstr "গোপনীয় তথ্য আবশ্যক, কিন্তু উপলব্ধ নয়"
+
+#: ../cli/src/common.c:423
+msgid "802.1X supplicant disconnected"
+msgstr "802.1X সাপ্লিক্যান্টের সংযোগ বিচ্ছিন্ন করা হয়েছে"
+
+#: ../cli/src/common.c:426
+msgid "802.1X supplicant configuration failed"
+msgstr "802.1X সাপ্লিক্যান্টের কনফিগারেশন বিফল হয়েছে"
+
+#: ../cli/src/common.c:429
+msgid "802.1X supplicant failed"
+msgstr "802.1X সাপ্লিক্যান্ট বিফল হয়েছে"
+
+#: ../cli/src/common.c:432
+msgid "802.1X supplicant took too long to authenticate"
+msgstr "802.1X সাপ্লিক্যান্ট অনুমোদন করতে অত্যাধিক সময় ব্যয় হয়েছে"
+
+#: ../cli/src/common.c:435
+msgid "PPP service failed to start"
+msgstr "PPP পরিসেবা আরম্ভ করতে ব্যর্থ"
+
+#: ../cli/src/common.c:438
+msgid "PPP service disconnected"
+msgstr "PPP পরিসেবার সাথে সংযোগ বিচ্ছিন্ন হয়েছে"
+
+#: ../cli/src/common.c:441
+msgid "PPP failed"
+msgstr "PPP বিফল"
+
+#: ../cli/src/common.c:444
+msgid "DHCP client failed to start"
+msgstr "DHCP ক্লায়েন্ট আরম্ভ করতে ব্যর্থ"
+
+#: ../cli/src/common.c:447
+msgid "DHCP client error"
+msgstr "DHCP ক্লায়েন্ট সংক্রান্ত ত্রুটি"
+
+#: ../cli/src/common.c:450
+msgid "DHCP client failed"
+msgstr "DHCP ক্লায়েন্ট বিফল হয়েছে"
+
+#: ../cli/src/common.c:453
+msgid "Shared connection service failed to start"
+msgstr "যৌথরূপে ব্যবহৃত সংযোগ পরিসেবা আরম্ভ হতে ব্যর্থ"
+
+#: ../cli/src/common.c:456
+msgid "Shared connection service failed"
+msgstr "যৌথরূপে ব্যবহৃত পরিসেবা বিফল হয়েছে"
+
+#: ../cli/src/common.c:459
+msgid "AutoIP service failed to start"
+msgstr "AutoIP পরিসেবা আরম্ভ করতে ব্যর্থ"
+
+#: ../cli/src/common.c:462
+msgid "AutoIP service error"
+msgstr "AutoIP পরিসেবায় ত্রুটি"
+
+#: ../cli/src/common.c:465
+msgid "AutoIP service failed"
+msgstr "AutoIP পরিসেবা বিফল"
+
+#: ../cli/src/common.c:468
+msgid "The line is busy"
+msgstr "লাইন বর্তমানে ব্যস্ত"
+
+#: ../cli/src/common.c:471
+msgid "No dial tone"
+msgstr "ডায়েল টোন অনুপস্থিত"
+
+#: ../cli/src/common.c:474
+msgid "No carrier could be established"
+msgstr "কোনো কেরিয়ার নির্ধারণ করা যায়নি"
+
+#: ../cli/src/common.c:477
+msgid "The dialing request timed out"
+msgstr "ডায়াল করার অনুরোধের সময়সীমা উত্তীর্ণ হয়েছে"
+
+#: ../cli/src/common.c:480
+msgid "The dialing attempt failed"
+msgstr "ডায়েল করার প্রচেষ্টা ব্যর্থ হয়েছে"
+
+#: ../cli/src/common.c:483
+msgid "Modem initialization failed"
+msgstr "মোডেম আরম্ভ করতে ব্যর্থ"
+
+#: ../cli/src/common.c:486
+msgid "Failed to select the specified APN"
+msgstr "চিহ্নিত APN নির্বাচন করতে ব্যর্থ"
+
+#: ../cli/src/common.c:489
+msgid "Not searching for networks"
+msgstr "নেটওয়ার্ক সন্ধান করা হচ্ছে না"
+
+#: ../cli/src/common.c:492
+msgid "Network registration denied"
+msgstr "নেটওয়ার্ক নিবন্ধন প্রত্যাখ্যান করা হয়েছে"
+
+#: ../cli/src/common.c:495
+msgid "Network registration timed out"
+msgstr "নেটওয়ার্ক নিবন্ধন করতে সময়সীমা উত্তীর্ণ হয়েছে"
+
+#: ../cli/src/common.c:498
+msgid "Failed to register with the requested network"
+msgstr "অনুরোধ করা নেটওয়ার্কে নিবন্ধন করতে ব্যর্থ"
+
+#: ../cli/src/common.c:501
+msgid "PIN check failed"
+msgstr "PIN পরীক্ষা করতে ব্যর্থ"
+
+#: ../cli/src/common.c:504
+msgid "Necessary firmware for the device may be missing"
+msgstr "ডিভাইসের জন্য আবশ্যক ফার্মওয়্যার অনুপস্থিত থাকতে পারে"
+
+#: ../cli/src/common.c:507
+msgid "The device was removed"
+msgstr "ডিভাইসটি মুছে ফেলা হয়েছে"
+
+#: ../cli/src/common.c:510
+msgid "NetworkManager went to sleep"
+msgstr "NetworkManager নিদ্রিত অবস্থায় রয়েছে"
+
+#: ../cli/src/common.c:513
+msgid "The device's active connection disappeared"
+msgstr "ডিভাইসের সক্রিয় সংযোগটি আড়াল হয়ে গেছে"
+
+#: ../cli/src/common.c:516
+msgid "Device disconnected by user or client"
+msgstr "ব্যবহারকারী অথবা ক্লায়েন্ট দ্বারা ডিভাইস বিচ্ছিন্ন করা হয়েছে"
+
+#: ../cli/src/common.c:519
+msgid "Carrier/link changed"
+msgstr "ক্যারিয়ার/লিংক পরিবর্তিত হয়েছে"
+
+#: ../cli/src/common.c:522
+msgid "The device's existing connection was assumed"
+msgstr "ডিভাইসের উপস্থিত সংযোগটি অনুমান করা হয়েছে"
+
+#: ../cli/src/common.c:525
+msgid "The supplicant is now available"
+msgstr "সাপ্লিক্যান্ট বর্তমানে উপলব্ধ রয়েছে"
+
+#: ../cli/src/common.c:528
+msgid "The modem could not be found"
+msgstr "মোডেম পাওয়া যায়নি"
+
+#: ../cli/src/common.c:531
+msgid "The Bluetooth connection failed or timed out"
+msgstr "ব্লু-টুথ সংযোগ বিফল হয়েছে অথবা এর মেয়াদ উত্তীর্ণ হয়েছে"
+
+#: ../cli/src/common.c:534
+msgid "GSM Modem's SIM card not inserted"
+msgstr "GSM মোডেমের SIM কার্ড স্থাপন করা হয়নি"
+
+#: ../cli/src/common.c:537
+msgid "GSM Modem's SIM PIN required"
+msgstr "GSM মোডেমের SIM PIN প্রয়োজন"
+
+#: ../cli/src/common.c:540
+msgid "GSM Modem's SIM PUK required"
+msgstr "GSM মোডেমের SIM PUK প্রয়োজন"
+
+#: ../cli/src/common.c:543
+msgid "GSM Modem's SIM wrong"
+msgstr "GSM মোডেমের SIM সঠিক নয়"
+
+#: ../cli/src/common.c:546
+msgid "InfiniBand device does not support connected mode"
+msgstr "InfiniBand ডিভাইস দ্বারা সংযুক্ত মোড সমর্থিত হয় না"
+
+#: ../cli/src/common.c:549
+msgid "A dependency of the connection failed"
+msgstr "সংযোগের নির্ভরতা বিফল হয়েছে"
+
+#: ../cli/src/common.c:552
+msgid "A problem with the RFC 2684 Ethernet over ADSL bridge"
+msgstr "ADSL ব্রিজের সাথে ব্যবহারযোগ্য RFC 2684 ইথারনেট সম্পর্কিত সমস্যা"
+
+#: ../cli/src/common.c:555
+msgid "ModemManager is unavailable"
+msgstr "ModemManager উপলব্ধ নেই"
+
+#: ../cli/src/common.c:558
+msgid "The Wi-Fi network could not be found"
+msgstr "ওয়াই-ফাই নেটওয়ার্ক পাওয়া যায়নি"
+
+#: ../cli/src/common.c:561
+msgid "A secondary connection of the base connection failed"
+msgstr "মূল সংযোগের সাথে যুক্ত দ্বিতীয় সংযোগ বিফল হয়েছে"
+
+#: ../cli/src/common.c:564 ../cli/src/devices.c:295 ../cli/src/devices.c:311
+#: ../cli/src/devices.c:433 ../cli/src/devices.c:477
+msgid "Unknown"
+msgstr "অজানা"
+
+#. 0
+#. used only for 'GENERAL' group listing
+#: ../cli/src/connections.c:59 ../cli/src/connections.c:129
+#: ../cli/src/devices.c:107 ../cli/src/devices.c:131 ../cli/src/devices.c:141
+#: ../cli/src/devices.c:151 ../cli/src/devices.c:165 ../cli/src/devices.c:179
+#: ../cli/src/devices.c:201 ../cli/src/devices.c:217 ../cli/src/devices.c:226
 msgid "NAME"
 msgstr "NAME"
 
 #. 0
-#: ../cli/src/connections.c:60 ../cli/src/connections.c:75
+#. 1
+#: ../cli/src/connections.c:60 ../cli/src/connections.c:130
 msgid "UUID"
 msgstr "UUID"
 
 #. 1
-#: ../cli/src/connections.c:61
-msgid "DEVICES"
-msgstr "DEVICES"
+#. 0
+#. 1
+#. 2
+#: ../cli/src/connections.c:61 ../cli/src/connections.c:163
+#: ../cli/src/devices.c:71 ../cli/src/devices.c:109 ../cli/src/devices.c:204
+msgid "TYPE"
+msgstr "TYPE"
 
 #. 2
-#: ../cli/src/connections.c:62 ../cli/src/connections.c:77
-msgid "SCOPE"
-msgstr "SCOPE"
+#: ../cli/src/connections.c:62
+msgid "TIMESTAMP"
+msgstr "TIMESTAMP"
 
 #. 3
 #: ../cli/src/connections.c:63
-msgid "DEFAULT"
-msgstr "DEFAULT"
+msgid "TIMESTAMP-REAL"
+msgstr "TIMESTAMP-REAL"
 
 #. 4
-#: ../cli/src/connections.c:64
-msgid "DBUS-SERVICE"
-msgstr "DBUS-SERVICE"
+#. 13
+#: ../cli/src/connections.c:64 ../cli/src/devices.c:121
+msgid "AUTOCONNECT"
+msgstr "AUTOCONNECT"
 
 #. 5
 #: ../cli/src/connections.c:65
+msgid "READONLY"
+msgstr "READONLY"
+
+#. 6
+#. 8
+#. 2
+#. 11
+#. 5
+#: ../cli/src/connections.c:66 ../cli/src/connections.c:137
+#: ../cli/src/devices.c:73 ../cli/src/devices.c:191 ../cli/src/devices.c:207
+msgid "DBUS-PATH"
+msgstr "DBUS-PATH"
+
+#. 2
+#: ../cli/src/connections.c:131
+msgid "DEVICES"
+msgstr "DEVICES"
+
+#. 3
+#. 1
+#. 8
+#. 1
+#: ../cli/src/connections.c:132 ../cli/src/devices.c:72
+#: ../cli/src/devices.c:116 ../cli/src/network-manager.c:39
+msgid "STATE"
+msgstr "STATE"
+
+#. 4
+#: ../cli/src/connections.c:133
+msgid "DEFAULT"
+msgstr "DEFAULT"
+
+#. 5
+#: ../cli/src/connections.c:134
+msgid "DEFAULT6"
+msgstr "DEFAULT6"
+
+#. 6
+#: ../cli/src/connections.c:135
 msgid "SPEC-OBJECT"
 msgstr "SPEC-OBJECT"
 
-#. 6
-#: ../cli/src/connections.c:66
+#. 7
+#. 1
+#: ../cli/src/connections.c:136 ../cli/src/connections.c:150
 msgid "VPN"
 msgstr "VPN"
 
-#. 1
+#. 9
+#: ../cli/src/connections.c:138
+msgid "CON-PATH"
+msgstr "CON-PATH"
+
+#. 10
+#: ../cli/src/connections.c:139
+msgid "ZONE"
+msgstr "ZONE"
+
+#. 11
+#: ../cli/src/connections.c:140
+msgid "MASTER-PATH"
+msgstr "MASTER-PATH"
+
+#: ../cli/src/connections.c:148 ../cli/src/devices.c:82
+msgid "GENERAL"
+msgstr "GENERAL"
+
 #. 0
+#: ../cli/src/connections.c:149
+msgid "IP"
+msgstr "IP"
+
 #. 1
-#: ../cli/src/connections.c:76 ../cli/src/devices.c:61 ../cli/src/devices.c:87
-msgid "TYPE"
-msgstr "TYPE"
+#: ../cli/src/connections.c:164
+msgid "USERNAME"
+msgstr "USERNAME"
+
+#. 2
+#: ../cli/src/connections.c:165
+msgid "GATEWAY"
+msgstr "GATEWAY"
 
 #. 3
-#: ../cli/src/connections.c:78
-msgid "TIMESTAMP"
-msgstr "TIMESTAMP"
+#: ../cli/src/connections.c:166
+msgid "BANNER"
+msgstr "BANNER"
 
 #. 4
-#: ../cli/src/connections.c:79
-msgid "TIMESTAMP-REAL"
-msgstr "TIMESTAMP-REAL"
+#: ../cli/src/connections.c:167
+msgid "VPN-STATE"
+msgstr "VPN-STATE"
 
 #. 5
-#: ../cli/src/connections.c:80
-msgid "AUTOCONNECT"
-msgstr "AUTOCONNECT"
+#: ../cli/src/connections.c:168
+msgid "CFG"
+msgstr "CFG"
 
-#. 6
-#: ../cli/src/connections.c:81
-msgid "READONLY"
-msgstr "READONLY"
-
-#: ../cli/src/connections.c:157
+#: ../cli/src/connections.c:190
 #, c-format
 msgid ""
-"Usage: nmcli con { COMMAND | help }\n"
-"  COMMAND := { list | status | up | down }\n"
+"Usage: nmcli connection { COMMAND | help }\n"
+"  COMMAND := { list | status | up | down | delete }\n"
 "\n"
-"  list [id  | uuid  | system | user]\n"
-"  status\n"
-"  up id  | uuid  [iface ] [ap ] [--nowait] [--timeout "
+"  list [id  | uuid ]\n"
+"  status [id  | uuid  | path ]\n"
+"  up id  | uuid  [iface ] [ap ] [nsp ] [--"
+"nowait] [--timeout ]\n"
+"  up id  | uuid  [iface ] [ap ] [--nowait] [--timeout "
 "]\n"
 "  down id  | uuid \n"
+"  delete id  | uuid \n"
+"\n"
 msgstr ""
-"ব্যবহারপ্রণালী: nmcli con { COMMAND | help }\n"
-"  COMMAND := { list | status | up | down }\n"
+"ব্যবহারপ্রণালী: nmcli connection { COMMAND | help }\n"
+"  COMMAND := { list | status | up | down | delete }\n"
 "\n"
-"  list [id  | uuid  | system | user]\n"
-"  status\n"
-"  up id  | uuid  [iface ] [ap ] [--nowait] [--timeout "
+"  list [id  | uuid ]\n"
+"  status [id  | uuid  | path ]\n"
+"  up id  | uuid  [iface ] [ap ] [nsp ] [--"
+"nowait] [--timeout ]\n"
+"  up id  | uuid  [iface ] [ap ] [--nowait] [--timeout "
 "]\n"
 "  down id  | uuid \n"
+"  delete id  | uuid \n"
+"\n"
 
-#: ../cli/src/connections.c:197 ../cli/src/connections.c:536
+#: ../cli/src/connections.c:251 ../cli/src/connections.c:611
 #, 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:253 ../cli/src/connections.c:613
 #, c-format
 msgid "Error: 'con list': %s; allowed fields: %s"
 msgstr "ত্রুটি: 'con list': %s; অনুমোদিত ক্ষেত্র: %s"
 
-#: ../cli/src/connections.c:207
+#: ../cli/src/connections.c:261
 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:486
 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:487 ../cli/src/connections.c:488
+#: ../cli/src/connections.c:716 ../cli/src/connections.c:717
+#: ../cli/src/connections.c:719 ../cli/src/devices.c:441
+#: ../cli/src/devices.c:494 ../cli/src/devices.c:610 ../cli/src/devices.c:611
+#: ../cli/src/devices.c:612 ../cli/src/devices.c:644 ../cli/src/devices.c:671
+#: ../cli/src/devices.c:672 ../cli/src/devices.c:673 ../cli/src/devices.c:674
+#: ../cli/src/devices.c:675 ../cli/src/network-manager.c:267
+#: ../cli/src/settings.c:712 ../cli/src/settings.c:787
+#: ../cli/src/settings.c:907 ../cli/src/settings.c:1189
+#: ../cli/src/settings.c:1190 ../cli/src/settings.c:1192
+#: ../cli/src/settings.c:1194 ../cli/src/settings.c:1195
+#: ../cli/src/settings.c:1326 ../cli/src/settings.c:1327
+#: ../cli/src/settings.c:1328 ../cli/src/settings.c:1329
+#: ../cli/src/settings.c:1406 ../cli/src/settings.c:1407
+#: ../cli/src/settings.c:1408 ../cli/src/settings.c:1409
+#: ../cli/src/settings.c:1410 ../cli/src/settings.c:1411
+#: ../cli/src/settings.c:1412 ../cli/src/settings.c:1413
+#: ../cli/src/settings.c:1414 ../cli/src/settings.c:1415
+#: ../cli/src/settings.c:1416 ../cli/src/settings.c:1417
+#: ../cli/src/settings.c:1418 ../cli/src/settings.c:1489
 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:487 ../cli/src/connections.c:488
+#: ../cli/src/connections.c:716 ../cli/src/connections.c:717
+#: ../cli/src/connections.c:719 ../cli/src/devices.c:441
+#: ../cli/src/devices.c:494 ../cli/src/devices.c:610 ../cli/src/devices.c:611
+#: ../cli/src/devices.c:612 ../cli/src/devices.c:644 ../cli/src/devices.c:671
+#: ../cli/src/devices.c:672 ../cli/src/devices.c:673 ../cli/src/devices.c:674
+#: ../cli/src/devices.c:675 ../cli/src/network-manager.c:269
+#: ../cli/src/settings.c:712 ../cli/src/settings.c:714
+#: ../cli/src/settings.c:787 ../cli/src/settings.c:907
+#: ../cli/src/settings.c:1189 ../cli/src/settings.c:1190
+#: ../cli/src/settings.c:1192 ../cli/src/settings.c:1194
+#: ../cli/src/settings.c:1195 ../cli/src/settings.c:1326
+#: ../cli/src/settings.c:1327 ../cli/src/settings.c:1328
+#: ../cli/src/settings.c:1329 ../cli/src/settings.c:1406
+#: ../cli/src/settings.c:1407 ../cli/src/settings.c:1408
+#: ../cli/src/settings.c:1409 ../cli/src/settings.c:1410
+#: ../cli/src/settings.c:1411 ../cli/src/settings.c:1412
+#: ../cli/src/settings.c:1413 ../cli/src/settings.c:1414
+#: ../cli/src/settings.c:1415 ../cli/src/settings.c:1416
+#: ../cli/src/settings.c:1417 ../cli/src/settings.c:1418
+#: ../cli/src/settings.c:1489
 msgid "no"
 msgstr "না"
 
-#: ../cli/src/connections.c:457 ../cli/src/connections.c:500
-msgid "System connections"
-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:562
+msgid "Connection list"
+msgstr "সংযোগের তালিকা"
+
+#: ../cli/src/connections.c:575 ../cli/src/connections.c:1112
+#: ../cli/src/connections.c:1650 ../cli/src/connections.c:1665
+#: ../cli/src/connections.c:1674 ../cli/src/connections.c:1684
+#: ../cli/src/connections.c:1696 ../cli/src/connections.c:1804
+#: ../cli/src/connections.c:1906 ../cli/src/devices.c:1122
+#: ../cli/src/devices.c:1132 ../cli/src/devices.c:1250
+#: ../cli/src/devices.c:1258 ../cli/src/devices.c:1622
+#: ../cli/src/devices.c:1629 ../cli/src/devices.c:1643
+#: ../cli/src/devices.c:1650 ../cli/src/devices.c:1667
+#: ../cli/src/devices.c:1678 ../cli/src/devices.c:1899
+#: ../cli/src/devices.c:1906
 #, c-format
 msgid "Error: %s argument is missing."
 msgstr "ত্রুটি: %s আর্গুমেন্ট অনুপস্থিত।"
 
-#: ../cli/src/connections.c:487
+#: ../cli/src/connections.c:588
 #, 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:594 ../cli/src/connections.c:1709
+#: ../cli/src/connections.c:1821 ../cli/src/connections.c:1913
+#: ../cli/src/devices.c:906 ../cli/src/devices.c:986 ../cli/src/devices.c:1146
+#: ../cli/src/devices.c:1264 ../cli/src/devices.c:1691
+#: ../cli/src/devices.c:1912
 #, c-format
 msgid "Unknown parameter: %s\n"
 msgstr "অজানা পরামিতি: %s\n"
 
-#: ../cli/src/connections.c:528
+#: ../cli/src/connections.c:603
 #, 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:618 ../cli/src/connections.c:2009
+#: ../cli/src/devices.c:2123 ../cli/src/network-manager.c:599
 #, c-format
 msgid "Error: %s."
 msgstr "ত্রুটি: %s।"
 
-#: ../cli/src/connections.c:649
-#, c-format
-msgid "Error: 'con status': %s"
-msgstr "ত্রুটি: 'con status': %s"
-
-#: ../cli/src/connections.c:651
-#, c-format
-msgid "Error: 'con status': %s; allowed fields: %s"
-msgstr "ত্রুটি: 'con status': %s; অনুমোদিত ক্ষেত্র: %s"
-
-#: ../cli/src/connections.c:658
-msgid "Active connections"
-msgstr "সক্রিয় সংযোগ"
-
-#: ../cli/src/connections.c:1026
-#, c-format
-msgid "no active connection on device '%s'"
-msgstr "'%s' ডিভাইসের মধ্যে কোনো সক্রিয় সংযোগ উপস্থিত নেই"
-
-#: ../cli/src/connections.c:1034
-#, c-format
-msgid "no active connection or device"
-msgstr "কোনো সক্রিয় সংযোগ অথবা ডিভাইস উপস্থিত নেই"
-
-#: ../cli/src/connections.c:1084
-#, c-format
-msgid "device '%s' not compatible with connection '%s'"
-msgstr "'%s' ডিভাইসের সাথে '%s' সংযোগটি সুসংগত নয়"
-
-#: ../cli/src/connections.c:1086
-#, c-format
-msgid "no device found for connection '%s'"
-msgstr "'%s' সংযোগের জন্য কোনো ডিভাইস পাওয়া যায়নি"
-
-#: ../cli/src/connections.c:1097
+#: ../cli/src/connections.c:631
 msgid "activating"
 msgstr "সক্রিয় করা হচ্ছে"
 
-#: ../cli/src/connections.c:1099
+#: ../cli/src/connections.c:633
 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
-msgid "unknown"
-msgstr "অজানা"
-
-#: ../cli/src/connections.c:1111
+#: ../cli/src/connections.c:647
 msgid "VPN connecting (prepare)"
 msgstr "VPN সংযোগ স্থাপন করা হচ্ছে (প্রস্তুতি)"
 
-#: ../cli/src/connections.c:1113
+#: ../cli/src/connections.c:649
 msgid "VPN connecting (need authentication)"
 msgstr "VPN সংযোগ স্থাপন করা হচ্ছে (অনুমোদন প্রয়োজন)"
 
-#: ../cli/src/connections.c:1115
+#: ../cli/src/connections.c:651
 msgid "VPN connecting"
 msgstr "VPN সংযোগ স্থাপন করা হচ্ছে"
 
-#: ../cli/src/connections.c:1117
+#: ../cli/src/connections.c:653
 msgid "VPN connecting (getting IP configuration)"
 msgstr "VPN সংযোগ স্থাপন করা হচ্ছে (IP কনফিগারেশন প্রাপ্ত করা হচ্ছে)"
 
-#: ../cli/src/connections.c:1119
+#: ../cli/src/connections.c:655
 msgid "VPN connected"
 msgstr "VPN সংযোগ স্থাপন করা হয়েছে"
 
-#: ../cli/src/connections.c:1121
+#: ../cli/src/connections.c:657
 msgid "VPN connection failed"
 msgstr "VPN সংযোগ বিফল হয়েছে"
 
-#: ../cli/src/connections.c:1123
+#: ../cli/src/connections.c:659
 msgid "VPN disconnected"
 msgstr "VPN সংযোগ বিচ্ছিন্ন করা হয়েছে"
 
-#: ../cli/src/connections.c:1134
+#: ../cli/src/connections.c:712 ../cli/src/connections.c:722
+msgid "N/A"
+msgstr "প্রযোজ্য নয়"
+
+#: ../cli/src/connections.c:916 ../cli/src/connections.c:1140
+#, c-format
+msgid "Error: 'con status': %s"
+msgstr "ত্রুটি: 'con status': %s"
+
+#: ../cli/src/connections.c:918 ../cli/src/connections.c:1142
+#, c-format
+msgid "Error: 'con status': %s; allowed fields: %s"
+msgstr "ত্রুটি: 'con status': %s; অনুমোদিত ক্ষেত্র: %s"
+
+#: ../cli/src/connections.c:926
+msgid "Active connection details"
+msgstr "সক্রিয় সংযোগের বিবরণ"
+
+#: ../cli/src/connections.c:1062 ../cli/src/connections.c:1724
+#: ../cli/src/connections.c:1836 ../cli/src/connections.c:1927
+#: ../cli/src/devices.c:933 ../cli/src/devices.c:995 ../cli/src/devices.c:1161
+#: ../cli/src/devices.c:1294 ../cli/src/devices.c:1713
+#: ../cli/src/devices.c:1941 ../cli/src/network-manager.c:311
+#, c-format
+msgid "Error: Can't find out if NetworkManager is running: %s."
+msgstr "ত্রুটি: NetworkManager চলছে কিনা জানা সম্ভব নয়: %s"
+
+#: ../cli/src/connections.c:1066 ../cli/src/connections.c:1728
+#: ../cli/src/connections.c:1840 ../cli/src/connections.c:1931
+#: ../cli/src/devices.c:937 ../cli/src/devices.c:999 ../cli/src/devices.c:1165
+#: ../cli/src/devices.c:1298 ../cli/src/devices.c:1717
+#: ../cli/src/devices.c:1945 ../cli/src/network-manager.c:315
+#, c-format
+msgid "Error: NetworkManager is not running."
+msgstr "ত্রুটি: NetworkManager চলছে না।"
+
+#: ../cli/src/connections.c:1098
+msgid "Active connections"
+msgstr "সক্রিয় সংযোগ"
+
+#: ../cli/src/connections.c:1123
+#, c-format
+msgid "Error: '%s' is not an active connection."
+msgstr "ত্রুটি: '%s' সক্রিয় সংযোগ নয়।"
+
+#: ../cli/src/connections.c:1128
+#, c-format
+msgid "Error: unknown parameter: %s"
+msgstr "ত্রুটি: অজানা পরামিতি: %s"
+
+#: ../cli/src/connections.c:1235
+#, c-format
+msgid "no active connection on device '%s'"
+msgstr "'%s' ডিভাইসের মধ্যে কোনো সক্রিয় সংযোগ উপস্থিত নেই"
+
+#: ../cli/src/connections.c:1243
+msgid "no active connection or device"
+msgstr "কোনো সক্রিয় সংযোগ অথবা ডিভাইস উপস্থিত নেই"
+
+#: ../cli/src/connections.c:1314
+#, c-format
+msgid "device '%s' not compatible with connection '%s'"
+msgstr "'%s' ডিভাইসের সাথে '%s' সংযোগটি সুসংগত নয়"
+
+#: ../cli/src/connections.c:1317
+#, c-format
+msgid "no device found for connection '%s'"
+msgstr "'%s' সংযোগের জন্য কোনো ডিভাইস পাওয়া যায়নি"
+
+#: ../cli/src/connections.c:1329
 msgid "unknown reason"
 msgstr "অজানা কারণ"
 
-#: ../cli/src/connections.c:1136
+#: ../cli/src/connections.c:1331
 msgid "none"
 msgstr "শূণ্য"
 
-#: ../cli/src/connections.c:1138
+#: ../cli/src/connections.c:1333
 msgid "the user was disconnected"
 msgstr "ব্যবহারকারীর সাথে সংযোগ বিচ্ছিন্ন করা হয়েছে"
 
-#: ../cli/src/connections.c:1140
+#: ../cli/src/connections.c:1335
 msgid "the base network connection was interrupted"
 msgstr "মূল নেটওয়ার্ক সংযোগ  বিঘ্নিত হয়েছে"
 
-#: ../cli/src/connections.c:1142
+#: ../cli/src/connections.c:1337
 msgid "the VPN service stopped unexpectedly"
 msgstr "অপ্রত্যাশিতভাবে VPN পরিসেবা বন্ধ করা হয়েছে"
 
-#: ../cli/src/connections.c:1144
+#: ../cli/src/connections.c:1339
 msgid "the VPN service returned invalid configuration"
 msgstr "VPN পরিসেবা থেকে অবৈধ কনফিগারেশন পাওয়া গিয়েছে"
 
-#: ../cli/src/connections.c:1146
+#: ../cli/src/connections.c:1341
 msgid "the connection attempt timed out"
 msgstr "সংযোগের প্রয়াসকালে সময়সীমা উত্তীর্ণ হয়েছে"
 
-#: ../cli/src/connections.c:1148
+#: ../cli/src/connections.c:1343
 msgid "the VPN service did not start in time"
 msgstr "যথাযত সময়ে VPN পরিসেবা আরম্ভ করা হয়নি"
 
-#: ../cli/src/connections.c:1150
+#: ../cli/src/connections.c:1345
 msgid "the VPN service failed to start"
 msgstr "VPN পরিসেবা আরম্ভ করা যায়নি"
 
-#: ../cli/src/connections.c:1152
+#: ../cli/src/connections.c:1347
 msgid "no valid VPN secrets"
 msgstr "VPN-র বৈধ গোপন তথ্য উপস্থিত নেই"
 
-#: ../cli/src/connections.c:1154
+#: ../cli/src/connections.c:1349
 msgid "invalid VPN secrets"
 msgstr "VPN-র অবৈধ গোপন তথ্য"
 
-#: ../cli/src/connections.c:1156
+#: ../cli/src/connections.c:1351
 msgid "the connection was removed"
 msgstr "সংযোগ মুছে ফেলা হয়েছে"
 
-#: ../cli/src/connections.c:1170
-#, c-format
-msgid "state: %s\n"
-msgstr "অবস্থা: %s\n"
-
-#: ../cli/src/connections.c:1173 ../cli/src/connections.c:1199
+#: ../cli/src/connections.c:1368 ../cli/src/connections.c:1573
 #, c-format
-msgid "Connection activated\n"
-msgstr "সংযোগ সক্রিয় করা হয়েছে\n"
+msgid "Connection successfully activated (D-Bus active path: %s)\n"
+msgstr "সাফল্যের সাথে সংযোগ সক্রিয় করা হয়েছে (D-Bus-র সক্রিয় পাথ: %s)\n"
 
-#: ../cli/src/connections.c:1176
+#. Active connection failed and dissapeared, quit.
+#: ../cli/src/connections.c:1373 ../cli/src/connections.c:1474
 #, c-format
 msgid "Error: Connection activation failed."
 msgstr "ত্রুটি: সংযোগ সক্রিয় করতে ব্যর্থ।"
 
-#: ../cli/src/connections.c:1195
+#: ../cli/src/connections.c:1398
 #, c-format
-msgid "state: %s (%d)\n"
-msgstr "অবস্থা: %s (%d)\n"
+msgid "VPN connection successfully activated (D-Bus active path: %s)\n"
+msgstr "সাফল্যের সাথে VPN সংযোগ সক্রিয় করা হয়েছে (D-Bus-র সক্রিয় পাথ: %s)\n"
 
-#: ../cli/src/connections.c:1205
+#: ../cli/src/connections.c:1406
 #, c-format
 msgid "Error: Connection activation failed: %s."
 msgstr "ত্রুটি: সংযোগ সক্রিয় করতে ব্যর্থ: %s।"
 
-#: ../cli/src/connections.c:1222 ../cli/src/devices.c:811
+#: ../cli/src/connections.c:1503 ../cli/src/devices.c:1055
 #, c-format
 msgid "Error: Timeout %d sec expired."
 msgstr "ত্রুটি: %d সেকেন্ডের সময়সীমা উত্তীর্ণ হয়েছে।"
 
-#: ../cli/src/connections.c:1265
+#: ../cli/src/connections.c:1564
 #, 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
-#, c-format
-msgid "Active connection state: %s\n"
-msgstr "সক্রিয় সংযোগের অবস্থা: %s\n"
-
-#: ../cli/src/connections.c:1289
-#, 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:1658 ../cli/src/connections.c:1812
+#: ../cli/src/connections.c:1940
 #, c-format
 msgid "Error: Unknown connection: %s."
 msgstr "ত্রুটি: অজানা সংযোগ: %s."
 
-#: ../cli/src/connections.c:1378 ../cli/src/devices.c:882
+#: ../cli/src/connections.c:1704 ../cli/src/devices.c:1140
+#: ../cli/src/devices.c:1686
 #, 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:1717 ../cli/src/connections.c:1829
+#: ../cli/src/connections.c:1920
 #, c-format
 msgid "Error: id or uuid has to be specified."
 msgstr "ত্রুটি: id অথবা uuid নির্ধারণ করা আবশ্যক।"
 
-#: ../cli/src/connections.c:1411
+#: ../cli/src/connections.c:1749
 #, c-format
 msgid "Error: No suitable device found: %s."
 msgstr "ত্রুটি: প্রযোজ্য কোনো ডিভাইস পাওয়া যায়নি: %s."
 
-#: ../cli/src/connections.c:1413
+#: ../cli/src/connections.c:1751
 #, c-format
 msgid "Error: No suitable device found."
 msgstr "ত্রুটি: কোনো প্রযোজ্য ডিভাইস পাওয়া যায়নি।"
 
-#: ../cli/src/connections.c:1505
+#: ../cli/src/connections.c:1865
 #, c-format
 msgid "Warning: Connection not active\n"
 msgstr "সতর্কবার্তা: সংযোগ সক্রিয় নয়\n"
 
-#: ../cli/src/connections.c:1561
+#: ../cli/src/connections.c:1879
+#, c-format
+msgid "Error: Connection deletion failed: %s"
+msgstr "ত্রুটি: সংযোগ মুছে ফেলতে ব্যর্থ: %s"
+
+#: ../cli/src/connections.c:2000
 #, c-format
 msgid "Error: 'con' command '%s' is not valid."
 msgstr "ত্রুটি: 'con' কমান্ড '%s', বৈধ নয়।"
 
-#: ../cli/src/connections.c:1597
+#: ../cli/src/connections.c:2068
 #, c-format
 msgid "Error: could not connect to D-Bus."
 msgstr "ত্রুটি: D-Bus-র সাথে সংযোগ করতে ব্যর্থ।"
 
-#: ../cli/src/connections.c:1604
+#: ../cli/src/connections.c:2076
 #, c-format
 msgid "Error: Could not get system settings."
 msgstr "ত্রুটি: সিস্টেমের বৈশিষ্ট্য প্রাপ্ত করতে ব্যর্থ।"
 
-#: ../cli/src/connections.c:1612
-#, c-format
-msgid "Error: Could not get user settings."
-msgstr "ত্রুটি: ব্যবহারকারীর বৈশিষ্ট্য প্রাপ্ত করতে ব্যর্থ"
-
-#: ../cli/src/connections.c:1622
+#: ../cli/src/connections.c:2086
 #, 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:70 ../cli/src/devices.c:108 ../cli/src/devices.c:189
+#: ../cli/src/devices.c:205
 msgid "DEVICE"
 msgstr "DEVICE"
 
-#. 1
-#. 4
 #. 0
-#: ../cli/src/devices.c:62 ../cli/src/devices.c:90
-#: ../cli/src/network-manager.c:36
-msgid "STATE"
-msgstr "STATE"
-
-#: ../cli/src/devices.c:71
-msgid "GENERAL"
-msgstr "GENERAL"
-
-#. 0
-#: ../cli/src/devices.c:72
+#: ../cli/src/devices.c:83
 msgid "CAPABILITIES"
 msgstr "CAPABILITIES"
 
 #. 1
-#: ../cli/src/devices.c:73
+#: ../cli/src/devices.c:84
 msgid "WIFI-PROPERTIES"
 msgstr "WIFI-PROPERTIES"
 
 #. 2
-#: ../cli/src/devices.c:74
+#: ../cli/src/devices.c:85
 msgid "AP"
 msgstr "AP"
 
 #. 3
-#: ../cli/src/devices.c:75
+#: ../cli/src/devices.c:86
 msgid "WIRED-PROPERTIES"
 msgstr "WIRED-PROPERTIES"
 
 #. 4
-#: ../cli/src/devices.c:76
-msgid "IP4-SETTINGS"
-msgstr "IP4-SETTINGS"
+#: ../cli/src/devices.c:87
+msgid "WIMAX-PROPERTIES"
+msgstr "WIMAX-PROPERTIES"
 
 #. 5
-#: ../cli/src/devices.c:77
-msgid "IP4-DNS"
-msgstr "IP4-DNS"
+#. 0
+#: ../cli/src/devices.c:88 ../cli/src/devices.c:202
+msgid "NSP"
+msgstr "NSP"
+
+#. 6
+#: ../cli/src/devices.c:89
+msgid "IP4"
+msgstr "IP4"
+
+#. 7
+#: ../cli/src/devices.c:90
+msgid "DHCP4"
+msgstr "DHCP4"
+
+#. 8
+#: ../cli/src/devices.c:91
+msgid "IP6"
+msgstr "IP6"
+
+#. 9
+#: ../cli/src/devices.c:92
+msgid "DHCP6"
+msgstr "DHCP6"
+
+#. 10
+#: ../cli/src/devices.c:93
+msgid "BOND"
+msgstr "BOND"
+
+#. 11
+#: ../cli/src/devices.c:94
+msgid "VLAN"
+msgstr "VLAN"
 
 #. 2
-#: ../cli/src/devices.c:88
+#: ../cli/src/devices.c:110
+msgid "VENDOR"
+msgstr "VENDOR"
+
+#. 3
+#: ../cli/src/devices.c:111
+msgid "PRODUCT"
+msgstr "PRODUCT"
+
+#. 4
+#: ../cli/src/devices.c:112
 msgid "DRIVER"
 msgstr "DRIVER"
 
-#. 3
-#: ../cli/src/devices.c:89
+#. 5
+#: ../cli/src/devices.c:113
+msgid "DRIVER-VERSION"
+msgstr "DRIVER-VERSION"
+
+#. 6
+#: ../cli/src/devices.c:114
+msgid "FIRMWARE-VERSION"
+msgstr "FIRMWARE-VERSION"
+
+#. 7
+#: ../cli/src/devices.c:115
 msgid "HWADDR"
 msgstr "HWADDR"
 
+#. 9
+#: ../cli/src/devices.c:117
+msgid "REASON"
+msgstr "REASON"
+
+#. 10
+#: ../cli/src/devices.c:118
+msgid "UDI"
+msgstr "UDI"
+
+#. 11
+#: ../cli/src/devices.c:119
+msgid "IP-IFACE"
+msgstr "IP-IFACE"
+
+#. 12
+#: ../cli/src/devices.c:120
+msgid "NM-MANAGED"
+msgstr "NM-MANAGED"
+
+#. 14
+#: ../cli/src/devices.c:122
+msgid "FIRMWARE-MISSING"
+msgstr "FIRMWARE-MISSING"
+
+#. 15
+#: ../cli/src/devices.c:123
+msgid "CONNECTION"
+msgstr "CONNECTION"
+
 #. 0
-#: ../cli/src/devices.c:99
+#: ../cli/src/devices.c:132
 msgid "CARRIER-DETECT"
 msgstr "CARRIER-DETECT"
 
 #. 1
-#: ../cli/src/devices.c:100
+#: ../cli/src/devices.c:133
 msgid "SPEED"
 msgstr "SPEED"
 
 #. 0
-#: ../cli/src/devices.c:109
+#: ../cli/src/devices.c:142
 msgid "CARRIER"
 msgstr "CARRIER"
 
 #. 0
-#: ../cli/src/devices.c:119
+#: ../cli/src/devices.c:152
 msgid "WEP"
 msgstr "WEP"
 
 #. 1
-#: ../cli/src/devices.c:120
+#: ../cli/src/devices.c:153
 msgid "WPA"
 msgstr "WPA"
 
 #. 2
-#: ../cli/src/devices.c:121
+#: ../cli/src/devices.c:154
 msgid "WPA2"
 msgstr "WPA2"
 
 #. 3
-#: ../cli/src/devices.c:122
+#: ../cli/src/devices.c:155
 msgid "TKIP"
 msgstr "TKIP"
 
 #. 4
-#: ../cli/src/devices.c:123
+#: ../cli/src/devices.c:156
 msgid "CCMP"
 msgstr "CCMP"
 
 #. 0
-#: ../cli/src/devices.c:132
-msgid "ADDRESS"
-msgstr "ADDRESS"
+#: ../cli/src/devices.c:166
+msgid "CTR-FREQ"
+msgstr "CTR-FREQ"
 
 #. 1
-#: ../cli/src/devices.c:133
-msgid "PREFIX"
-msgstr "PREFIX"
+#: ../cli/src/devices.c:167
+msgid "RSSI"
+msgstr "RSSI"
 
 #. 2
-#: ../cli/src/devices.c:134
-msgid "GATEWAY"
-msgstr "GATEWAY"
+#: ../cli/src/devices.c:168
+msgid "CINR"
+msgstr "CINR"
 
-#. 0
-#: ../cli/src/devices.c:143
-msgid "DNS"
-msgstr "DNS"
+#. 3
+#: ../cli/src/devices.c:169
+msgid "TX-POW"
+msgstr "TX-POW"
+
+#. 4
+#: ../cli/src/devices.c:170
+msgid "BSID"
+msgstr "BSID"
 
 #. 0
-#: ../cli/src/devices.c:153
+#: ../cli/src/devices.c:180
 msgid "SSID"
 msgstr "SSID"
 
 #. 1
-#: ../cli/src/devices.c:154
+#: ../cli/src/devices.c:181
 msgid "BSSID"
 msgstr "BSSID"
 
 #. 2
-#: ../cli/src/devices.c:155
+#: ../cli/src/devices.c:182
 msgid "MODE"
 msgstr "MODE"
 
 #. 3
-#: ../cli/src/devices.c:156
+#: ../cli/src/devices.c:183
 msgid "FREQ"
 msgstr "FREQ"
 
 #. 4
-#: ../cli/src/devices.c:157
+#: ../cli/src/devices.c:184
 msgid "RATE"
 msgstr "RATE"
 
 #. 5
-#: ../cli/src/devices.c:158
+#. 1
+#: ../cli/src/devices.c:185 ../cli/src/devices.c:203
 msgid "SIGNAL"
 msgstr "SIGNAL"
 
 #. 6
-#: ../cli/src/devices.c:159
+#: ../cli/src/devices.c:186
 msgid "SECURITY"
 msgstr "SECURITY"
 
 #. 7
-#: ../cli/src/devices.c:160
+#: ../cli/src/devices.c:187
 msgid "WPA-FLAGS"
 msgstr "WPA-FLAGS"
 
 #. 8
-#: ../cli/src/devices.c:161
+#: ../cli/src/devices.c:188
 msgid "RSN-FLAGS"
 msgstr "RSN-FLAGS"
 
 #. 10
-#: ../cli/src/devices.c:163
+#. 4
+#: ../cli/src/devices.c:190 ../cli/src/devices.c:206
 msgid "ACTIVE"
 msgstr "ACTIVE"
 
-#: ../cli/src/devices.c:186
+#. 0
+#: ../cli/src/devices.c:218
+msgid "SLAVES"
+msgstr "SLAVES"
+
+#. 0
+#: ../cli/src/devices.c:227
+msgid "ID"
+msgstr "ID"
+
+#: ../cli/src/devices.c:243
 #, c-format
 msgid ""
-"Usage: nmcli dev { COMMAND | help }\n"
+"Usage: nmcli device { COMMAND | help }\n"
+"\n"
+"  COMMAND := { status | list | disconnect | wifi | wimax }\n"
 "\n"
 "  COMMAND := { status | list | disconnect | wifi }\n"
 "\n"
 "  status\n"
 "  list [iface ]\n"
 "  disconnect iface  [--nowait] [--timeout ]\n"
-"  wifi [list [iface ] [hwaddr ]]\n"
+"  wifi [list [iface ] [bssid ]]\n"
+"  wifi connect <(B)SSID> [password ] [wep-key-type key|phrase] "
+"[iface ] [bssid ] [name ]\n"
+"               [--private] [--nowait] [--timeout ]\n"
+"  wimax [list [iface ] [nsp ]]\n"
 "\n"
 msgstr ""
-"ব্যবহারপ্রণালী: nmcli dev { COMMAND | help }\n"
+"ব্যবহারপ্রণালী: nmcli device { COMMAND | help }\n"
+"\n"
+"  COMMAND := { status | list | disconnect | wifi | wimax }\n"
 "\n"
 "  COMMAND := { status | list | disconnect | wifi }\n"
 "\n"
 "  status\n"
 "  list [iface ]\n"
 "  disconnect iface  [--nowait] [--timeout ]\n"
-"  wifi [list [iface ] [hwaddr ]]\n"
+"  wifi [list [iface ] [bssid ]]\n"
+"  wifi connect <(B)SSID> [password ] [wep-key-type key|phrase] "
+"[iface ] [bssid ] [name ]\n"
+"               [--private] [--nowait] [--timeout ]\n"
+"  wimax [list [iface ] [nsp ]]\n"
 "\n"
 
-#: ../cli/src/devices.c:206
-msgid "unmanaged"
-msgstr "পরিচালিত নয়"
-
-#: ../cli/src/devices.c:208
-msgid "unavailable"
-msgstr "উপলব্ধ নয়"
-
-#: ../cli/src/devices.c:210 ../cli/src/network-manager.c:89
-msgid "disconnected"
-msgstr "বিচ্ছিন্ন"
-
-#: ../cli/src/devices.c:212
-msgid "connecting (prepare)"
-msgstr "সংযোগ করা হচ্ছে (প্রস্তুতি)"
-
-#: ../cli/src/devices.c:214
-msgid "connecting (configuring)"
-msgstr "সংযোগ করা হচ্ছে (কনফিগার করা হচ্ছে)"
-
-#: ../cli/src/devices.c:216
-msgid "connecting (need authentication)"
-msgstr "সংযোগ করা হচ্ছে (অনুমোদন প্রয়োজন)"
-
-#: ../cli/src/devices.c:218
-msgid "connecting (getting IP configuration)"
-msgstr "সংযোগ করা হচ্ছে (IP কনফিগারেশন প্রাপ্ত করা হচ্ছে)"
-
-#: ../cli/src/devices.c:220 ../cli/src/network-manager.c:87
-msgid "connected"
-msgstr "সংযোগ স্থাপিত"
-
-#: ../cli/src/devices.c:222
-msgid "connection failed"
-msgstr "সংযোগ বিফল"
-
-#: ../cli/src/devices.c:245 ../cli/src/devices.c:380
-msgid "Unknown"
-msgstr "অজানা"
-
-#: ../cli/src/devices.c:277
+#: ../cli/src/devices.c:344
 msgid "(none)"
 msgstr "(শূণ্য)"
 
-#: ../cli/src/devices.c:302
-#, c-format
-msgid "%s: error converting IP4 address 0x%X"
-msgstr "%s: IP4 ঠিকানা 0x%X রূপান্তর করতে ত্রুটি"
-
-#: ../cli/src/devices.c:349
+#: ../cli/src/devices.c:400
 #, c-format
 msgid "%u MHz"
 msgstr "%u MHz"
 
-#: ../cli/src/devices.c:350
+#: ../cli/src/devices.c:401
 #, c-format
 msgid "%u MB/s"
 msgstr "%u মেগাবাইট/সেকেন্ড"
 
-#: ../cli/src/devices.c:359
+#: ../cli/src/devices.c:410
 msgid "Encrypted: "
 msgstr "এনক্রিপশন সহ: "
 
-#: ../cli/src/devices.c:364
+#: ../cli/src/devices.c:415
 msgid "WEP "
 msgstr "WEP "
 
-#: ../cli/src/devices.c:366
+#: ../cli/src/devices.c:417
 msgid "WPA "
 msgstr "WPA "
 
-#: ../cli/src/devices.c:368
+#: ../cli/src/devices.c:419
 msgid "WPA2 "
 msgstr "WPA2 "
 
-#: ../cli/src/devices.c:371
+#: ../cli/src/devices.c:422
 msgid "Enterprise "
 msgstr "এন্টারপ্রাইজ "
 
-#: ../cli/src/devices.c:380
+#: ../cli/src/devices.c:431
 msgid "Ad-Hoc"
 msgstr "অ্যাড-হক"
 
-#: ../cli/src/devices.c:380
+#: ../cli/src/devices.c:432
 msgid "Infrastructure"
 msgstr "পরিকাঠামো"
 
-#: ../cli/src/devices.c:442
+#: ../cli/src/devices.c:468
+msgid "Home"
+msgstr "প্রধান"
+
+#: ../cli/src/devices.c:471
+msgid "Partner"
+msgstr "সহযোগী"
+
+#: ../cli/src/devices.c:474
+msgid "Roaming"
+msgstr "রোমিং"
+
+#: ../cli/src/devices.c:546
 #, c-format
 msgid "Error: 'dev list': %s"
 msgstr "ত্রুটি: 'dev list': %s"
 
-#: ../cli/src/devices.c:444
+#: ../cli/src/devices.c:548
 #, c-format
 msgid "Error: 'dev list': %s; allowed fields: %s"
 msgstr "ত্রুটি: 'dev list': %s; অনুমোদিত ক্ষেত্র: %s"
 
-#: ../cli/src/devices.c:453
+#: ../cli/src/devices.c:557
 msgid "Device details"
 msgstr "ডিভাইসের বিবরণ"
 
-#: ../cli/src/devices.c:483 ../cli/src/devices.c:827
+#: ../cli/src/devices.c:602 ../cli/src/devices.c:605 ../cli/src/devices.c:1081
+#: ../cli/src/utils.c:479
 msgid "(unknown)"
 msgstr "(অজানা)"
 
-#: ../cli/src/devices.c:484
-msgid "unknown)"
-msgstr "অজানা)"
+#: ../cli/src/devices.c:614
+msgid "not connected"
+msgstr "সংযোগ বিহীন"
 
-#: ../cli/src/devices.c:510
+#: ../cli/src/devices.c:641
 #, c-format
 msgid "%u Mb/s"
 msgstr "%u মেগাবাইট/সেকেন্ড"
 
 #. Print header
 #. "WIRED-PROPERTIES"
-#: ../cli/src/devices.c:583
+#: ../cli/src/devices.c:715
 msgid "on"
 msgstr "চালু"
 
-#: ../cli/src/devices.c:583
+#: ../cli/src/devices.c:715
 msgid "off"
 msgstr "বন্ধ"
 
-#: ../cli/src/devices.c:710
+#: ../cli/src/devices.c:923
 #, c-format
 msgid "Error: 'dev status': %s"
 msgstr "ত্রুটি: 'dev status': %s"
 
-#: ../cli/src/devices.c:712
+#: ../cli/src/devices.c:925
 #, c-format
 msgid "Error: 'dev status': %s; allowed fields: %s"
 msgstr "ত্রুটি: 'dev status': %s; অনুমোদিত ক্ষেত্র: %s"
 
-#: ../cli/src/devices.c:719
+#: ../cli/src/devices.c:948
 msgid "Status of devices"
 msgstr "ডিভাইসের অবস্থা"
 
-#: ../cli/src/devices.c:747
+#: ../cli/src/devices.c:979
 #, 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:1020 ../cli/src/devices.c:1185
+#: ../cli/src/devices.c:1326 ../cli/src/devices.c:1973
 #, c-format
 msgid "Error: Device '%s' not found."
 msgstr "ত্রুটি: '%s' ডিভাইস পাওয়া যায়নি।"
 
-#: ../cli/src/devices.c:799
+#: ../cli/src/devices.c:1043
 #, c-format
 msgid "Success: Device '%s' successfully disconnected."
 msgstr "সাফল্য: '%s' ডিভাইস সাফল্যের সাথে সংযোগ বিচ্ছিন্ন করা হয়েছে।"
 
-#: ../cli/src/devices.c:824
+#: ../cli/src/devices.c:1078
 #, c-format
 msgid "Error: Device '%s' (%s) disconnecting failed: %s"
 msgstr "ত্রুটি: '%s' (%s) ডিভাইসের সাথে সংযোগ বিচ্ছিন্ন করতে ব্যর্থ: %s"
 
-#: ../cli/src/devices.c:832
+#: ../cli/src/devices.c:1091
 #, c-format
-msgid "Device state: %d (%s)\n"
-msgstr "ডিভাইসের অবস্থা: %d (%s)\n"
+msgid "Device '%s' has been disconnected.\n"
+msgstr "'%s' ডিভাইস সংযোগ বিচ্ছিন্ন করা হয়েছে।\n"
 
-#: ../cli/src/devices.c:896
+#: ../cli/src/devices.c:1154
 #, c-format
 msgid "Error: iface has to be specified."
 msgstr "ত্রুটি: iface নির্ধারণ করা আবশ্যক।"
 
-#: ../cli/src/devices.c:1011
+#: ../cli/src/devices.c:1284
 #, c-format
 msgid "Error: 'dev wifi': %s"
 msgstr "ত্রুটি: 'dev wifi': %s"
 
-#: ../cli/src/devices.c:1013
+#: ../cli/src/devices.c:1286
 #, c-format
 msgid "Error: 'dev wifi': %s; allowed fields: %s"
 msgstr "ত্রুটি: 'dev wifi': %s; অনুমোদিত ক্ষেত্র: %s"
 
-#: ../cli/src/devices.c:1020
+#: ../cli/src/devices.c:1309
 msgid "WiFi scan list"
 msgstr "ওয়াই-ফাই স্ক্যানের তালিকা"
 
-#: ../cli/src/devices.c:1055 ../cli/src/devices.c:1109
+#: ../cli/src/devices.c:1346 ../cli/src/devices.c:1400
 #, c-format
-msgid "Error: Access point with hwaddr '%s' not found."
-msgstr "ত্রুটি: hwaddr '%s' সহ অ্যাকসেস পয়েন্ট পাওয়া যায়নি।"
+msgid "Error: Access point with bssid '%s' not found."
+msgstr "ত্রুটি: bssid '%s' সহ অ্যাকসেস পয়েন্ট পাওয়া যায়নি।"
 
-#: ../cli/src/devices.c:1072
+#: ../cli/src/devices.c:1363
 #, c-format
 msgid "Error: Device '%s' is not a WiFi device."
 msgstr "ত্রুটি: '%s' ডিভাইসটি ওয়াই-ফাই ডিভাইস নয়।"
 
-#: ../cli/src/devices.c:1136
+#: ../cli/src/devices.c:1431 ../cli/src/devices.c:1477
+#, c-format
+msgid "Connection with UUID '%s' created and activated on device '%s'\n"
+msgstr "UUID '%s'-র সাথে '%s' ডিভাইসের উপর সংযোগ তৈরি ও সক্রিয় করা হয়েছে\n"
+
+#: ../cli/src/devices.c:1436
+#, c-format
+msgid "Error: Connection activation failed: (%d) %s."
+msgstr "ত্রুটি: সংযোগ সক্রিয় করতে ব্যর্থ: (%d) %s।"
+
+#: ../cli/src/devices.c:1461
+#, c-format
+msgid "Error: Failed to add/activate new connection: (%d) %s"
+msgstr "ত্রুটি: নতুন সংযোগ যোগ/সক্রিয় করতে ব্যর্থ: (%d) %s"
+
+#: ../cli/src/devices.c:1469
+#, c-format
+msgid "Error: Failed to add/activate new connection: Unknown error"
+msgstr "ত্রুটি: নতুন সংযোগ যোগ/সক্রিয় করতে ব্যর্থ: অজানা ত্রুটি"
+
+#: ../cli/src/devices.c:1613
+#, c-format
+msgid "Error: SSID or BSSID are missing."
+msgstr "ত্রুটি: SSID অথবা BSSID অনুপস্থিত।"
+
+#: ../cli/src/devices.c:1636
+#, c-format
+msgid "Error: bssid argument value '%s' is not a valid BSSID."
+msgstr "ত্রুটি: bssid আর্গুমেন্টের মান '%s' বৈধ BSSID নয়।"
+
+#: ../cli/src/devices.c:1660
+#, c-format
+msgid ""
+"Error: wep-key-type argument value '%s' is invalid, use 'key' or 'phrase'."
+msgstr ""
+"ত্রুটি: wep-key-type আর্গুমেন্টের মান '%s' বৈধ নয়, 'key' অথবা 'phrase' "
+"ব্যবহার করুন।"
+
+#: ../cli/src/devices.c:1700
+#, c-format
+msgid "Error: BSSID to connect to (%s) differs from bssid argument (%s)."
+msgstr ""
+"ত্রুটি: (%s)-র সাথে সংযোগ করার জন্য BSSID-র মান bssid আর্গুমেন্ট (%s) থেকে "
+"পৃথক।"
+
+#: ../cli/src/devices.c:1706
+#, c-format
+msgid "Error: Parameter '%s' is neither SSID nor BSSID."
+msgstr "ত্রুটি: '%s' পরমিতি SSID অথবা BSSID-র মধ্যে একটিও নয়।"
+
+#: ../cli/src/devices.c:1735
+#, c-format
+msgid "Error: Device '%s' is not a Wi-Fi device."
+msgstr "ত্রুটি: '%s' ডিভাইসটি ওয়াই-ফাই ডিভাইস নয়।"
+
+#: ../cli/src/devices.c:1737
+#, c-format
+msgid "Error: No Wi-Fi device found."
+msgstr "ত্রুটি: কোনো ওয়াই-ফাই ডিভাইস পাওয়া যায়নি।"
+
+#: ../cli/src/devices.c:1755
+#, c-format
+msgid "Error: No network with SSID '%s' found."
+msgstr "ত্রুটি: SSID '%s' সহ কোনো নেটওয়ার্ক পাওয়া যায়নি।"
+
+#: ../cli/src/devices.c:1757
+#, c-format
+msgid "Error: No access point with BSSID '%s' found."
+msgstr "ত্রুটি: BSSID '%s' সহ অ্যাকসেস পয়েন্ট পাওয়া যায়নি।"
+
+#: ../cli/src/devices.c:1855
 #, c-format
 msgid "Error: 'dev wifi' command '%s' is not valid."
 msgstr "ত্রুটি: 'dev wifi' কমান্ড '%s' বৈধ নয়।"
 
-#: ../cli/src/devices.c:1183
+#: ../cli/src/devices.c:1931
+#, c-format
+msgid "Error: 'dev wimax': %s"
+msgstr "ত্রুটি: 'dev wimax': %s"
+
+#: ../cli/src/devices.c:1933
+#, c-format
+msgid "Error: 'dev wimax': %s; allowed fields: %s"
+msgstr "ত্রুটি: 'dev wimax': %s; অনুমোদিত ক্ষেত্র: %s"
+
+#: ../cli/src/devices.c:1956
+msgid "WiMAX NSP list"
+msgstr "WiMAX NSP তালিকা"
+
+#: ../cli/src/devices.c:1993
+#, c-format
+msgid "Error: NSP with name '%s' not found."
+msgstr "ত্রুটি: '%s'  নাম বিশিষ্ট NSP পাওয়া যায়নি।"
+
+#: ../cli/src/devices.c:2004
+#, c-format
+msgid "Error: Device '%s' is not a WiMAX device."
+msgstr "ত্রুটি: '%s' ডিভাইসটি WiMAX ডিভাইস নয়।"
+
+#: ../cli/src/devices.c:2035
+#, c-format
+msgid "Error: Access point with nsp '%s' not found."
+msgstr "ত্রুটি: nsp '%s' সহ অ্যাকসেস পয়েন্ট পাওয়া যায়নি।"
+
+#: ../cli/src/devices.c:2062
+#, c-format
+msgid "Error: 'dev wimax' command '%s' is not valid."
+msgstr "ত্রুটি: 'dev wimax' কমান্ড '%s' বৈধ নয়।"
+
+#: ../cli/src/devices.c:2115
 #, 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"
 
+#. 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:62
+msgid "PERMISSION"
+msgstr "PERMISSION"
+
+#. 0
+#: ../cli/src/network-manager.c:63
+msgid "VALUE"
+msgstr "VALUE"
+
+#: ../cli/src/network-manager.c:77
 #, c-format
 msgid ""
 "Usage: nmcli nm { COMMAND | help }\n"
 "\n"
-"  COMMAND := { status | sleep | wakeup | wifi | wwan }\n"
+"  COMMAND := { status | permissions | enable | sleep | wifi | wwan | "
+"wimax }\n"
+"\n"
+"  COMMAND := { status | permissions | enable | sleep | wifi | wwan }\n"
 "\n"
 "  status\n"
-"  sleep\n"
-"  wakeup\n"
+"  permissions\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 | permissions | enable | sleep | wifi | wwan | "
+"wimax }\n"
+"\n"
+"  COMMAND := { status | permissions | enable | sleep | wifi | wwan }\n"
 "\n"
 "  status\n"
-"  sleep\n"
-"  wakeup\n"
+"  permissions\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:108
 msgid "asleep"
 msgstr "নিদ্রিত"
 
-#: ../cli/src/network-manager.c:85
+#: ../cli/src/network-manager.c:110
 msgid "connecting"
 msgstr "সংযোগ করা হচ্ছে"
 
-#: ../cli/src/network-manager.c:125
+#: ../cli/src/network-manager.c:112
+msgid "connected (local only)"
+msgstr "সংযুক্ত (শুধুমাত্র স্থানীয়)"
+
+#: ../cli/src/network-manager.c:114
+msgid "connected (site only)"
+msgstr "সংযুক্ত (শুধুমাত্র সাইট)"
+
+#: ../cli/src/network-manager.c:118
+msgid "disconnecting"
+msgstr "সংযোগ বিচ্ছিন্ন করা হচ্ছে"
+
+#: ../cli/src/network-manager.c:158
 #, c-format
 msgid "Error: 'nm status': %s"
 msgstr "ত্রুটি: 'nm status': %s"
 
-#: ../cli/src/network-manager.c:127
+#: ../cli/src/network-manager.c:160
 #, 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:173 ../cli/src/network-manager.c:174
+#: ../cli/src/network-manager.c:175 ../cli/src/network-manager.c:176
+#: ../cli/src/network-manager.c:177 ../cli/src/network-manager.c:179
+#: ../cli/src/network-manager.c:180 ../cli/src/network-manager.c:429
+#: ../cli/src/network-manager.c:484 ../cli/src/network-manager.c:522
+#: ../cli/src/network-manager.c:561
 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:173 ../cli/src/network-manager.c:174
+#: ../cli/src/network-manager.c:175 ../cli/src/network-manager.c:176
+#: ../cli/src/network-manager.c:177 ../cli/src/network-manager.c:179
+#: ../cli/src/network-manager.c:180 ../cli/src/network-manager.c:429
+#: ../cli/src/network-manager.c:484 ../cli/src/network-manager.c:522
+#: ../cli/src/network-manager.c:561
 msgid "disabled"
 msgstr "নিষ্ক্রিয়"
 
-#: ../cli/src/network-manager.c:148
+#: ../cli/src/network-manager.c:193
+msgid "NetworkManager status"
+msgstr "NetworkManager-র অবস্থা"
+
+#. Print header
+#: ../cli/src/network-manager.c:196
 msgid "running"
 msgstr "চলমান"
 
-#: ../cli/src/network-manager.c:148
+#: ../cli/src/network-manager.c:196
 msgid "not running"
 msgstr "চলমান নয়"
 
-#: ../cli/src/network-manager.c:201 ../cli/src/network-manager.c:233
+#: ../cli/src/network-manager.c:271
+msgid "auth"
+msgstr "auth"
+
+#: ../cli/src/network-manager.c:301
+#, c-format
+msgid "Error: 'nm permissions': %s"
+msgstr "ত্রুটি: 'nm permissions': %s"
+
+#: ../cli/src/network-manager.c:303
+#, c-format
+msgid "Error: 'nm permissions': %s; allowed fields: %s"
+msgstr "ত্রুটি: 'nm permissions': %s; অনুমোদিত ক্ষেত্র: %s"
+
+#: ../cli/src/network-manager.c:324
+msgid "NetworkManager permissions"
+msgstr "NetworkManager-র অনুমতি"
+
+#: ../cli/src/network-manager.c:350 ../cli/src/utils.c:459
+#, c-format
+msgid "Error: Couldn't connect to system bus: %s"
+msgstr "ত্রুটি: সিস্টেম বাসের সাথে সংযোগ করতে ব্যর্থ: %s"
+
+#: ../cli/src/network-manager.c:361
+#, c-format
+msgid "Error: Couldn't create D-Bus object proxy."
+msgstr "ত্রুটি: D-Bus অবজেক্ট প্রক্সি তৈরি করতে ব্যর্থ।"
+
+#: ../cli/src/network-manager.c:367
+#, c-format
+msgid "Error in sleep: %s"
+msgstr "নিদ্রিত অবস্থায় স্থাপন করতে ত্রুটি: %s"
+
+#: ../cli/src/network-manager.c:416 ../cli/src/network-manager.c:471
+#: ../cli/src/network-manager.c:509 ../cli/src/network-manager.c:548
 #, 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:424
+msgid "Networking enabled"
+msgstr "নেটওয়ার্ক ব্যবস্থা সক্রিয়"
+
+#: ../cli/src/network-manager.c:440
+#, c-format
+msgid "Error: invalid 'enable' parameter: '%s'; use 'true' or 'false'."
+msgstr "ত্রুটি: অবৈধ 'enable' পরামিতি: '%s'; 'true' অথবা 'false' ব্যবহার করুন।"
+
+#: ../cli/src/network-manager.c:450
+#, c-format
+msgid "Error: Sleeping status is not exported by NetworkManager."
+msgstr "ত্রুটি: নিদ্রিত অবস্থার তথ্য NetworkManager দ্বারা এক্সপোর্ট করা হয়নি।"
+
+#: ../cli/src/network-manager.c:458
+#, c-format
+msgid "Error: invalid 'sleep' parameter: '%s'; use 'true' or 'false'."
+msgstr "ত্রুটি: অবৈধ 'sleep' পরামিতি: '%s'; 'true' অথবা 'false' ব্যবহার করুন।"
+
+#: ../cli/src/network-manager.c:479
 msgid "WiFi enabled"
 msgstr "WiFi সক্রিয়"
 
-#: ../cli/src/network-manager.c:220
+#: ../cli/src/network-manager.c:495
 #, c-format
 msgid "Error: invalid 'wifi' parameter: '%s'."
 msgstr "ত্রুটর: অবৈধ 'wifi' পরামিতি: '%s'।"
 
-#: ../cli/src/network-manager.c:241
+#: ../cli/src/network-manager.c:517
 msgid "WWAN enabled"
 msgstr "WWAN সক্রিয়"
 
-#: ../cli/src/network-manager.c:252
+#: ../cli/src/network-manager.c:533
 #, c-format
 msgid "Error: invalid 'wwan' parameter: '%s'."
 msgstr "ত্রুটি: অবৈধ 'wwan' পরামিতি: '%s'।"
 
-#: ../cli/src/network-manager.c:263
+#: ../cli/src/network-manager.c:556
+msgid "WiMAX enabled"
+msgstr "WiMAX সক্রিয়"
+
+#: ../cli/src/network-manager.c:572
+#, c-format
+msgid "Error: invalid 'wimax' parameter: '%s'."
+msgstr "ত্রুটি: অবৈধ 'wimax' পরামিতি: '%s'."
+
+#: ../cli/src/network-manager.c:588
 #, c-format
 msgid "Error: 'nm' command '%s' is not valid."
 msgstr "ত্রুটি: 'nm' কমান্ড '%s' বৈধ নয়।"
 
-#: ../cli/src/nmcli.c:69
+#: ../cli/src/nmcli.c:76
 #, c-format
 msgid ""
 "Usage: %s [OPTIONS] OBJECT { COMMAND | help }\n"
@@ -972,13 +1686,15 @@ msgid ""
 "  -f[ields] |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"
 "OBJECT\n"
-"  nm          NetworkManager status\n"
-"  con         NetworkManager connections\n"
-"  dev         devices managed by NetworkManager\n"
+"  nm              NetworkManager's status\n"
+"  c[onnection]    NetworkManager's connections\n"
+"  d[evice]        devices managed by NetworkManager\n"
 "\n"
 msgstr ""
 "ব্যবহারপ্রণালী: %s [OPTIONS] OBJECT { COMMAND | help }\n"
@@ -990,568 +1706,912 @@ msgstr ""
 "  -f[ields] |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"
 "OBJECT\n"
-"  nm          NetworkManager status\n"
-"  con         NetworkManager connections\n"
-"  dev         devices managed by NetworkManager\n"
+"  nm              NetworkManager's status\n"
+"  c[onnection]    NetworkManager's connections\n"
+"  d[evice]        devices managed by NetworkManager\n"
 "\n"
 
-#: ../cli/src/nmcli.c:113
+#: ../cli/src/nmcli.c:124
 #, c-format
 msgid "Error: Object '%s' is unknown, try 'nmcli help'."
 msgstr "ত্রুটি: '%s' অবজেক্ট অজানা, 'nmcli help' ব্যবহারের প্রচেষ্টা করুন।"
 
-#: ../cli/src/nmcli.c:143
+#: ../cli/src/nmcli.c:154
 #, c-format
 msgid "Error: Option '--terse' is specified the second time."
 msgstr "ত্রুটি: '--terse' বিকল্পটি দুইবার উল্লিখিত হয়েছে।"
 
-#: ../cli/src/nmcli.c:148
+#: ../cli/src/nmcli.c:159
 #, c-format
 msgid "Error: Option '--terse' is mutually exclusive with '--pretty'."
 msgstr "ত্রুটি: '--terse' ও '--pretty' বিকল্প দুটি এক অপরের উপর নির্ভরশীল নয়।"
 
-#: ../cli/src/nmcli.c:156
+#: ../cli/src/nmcli.c:167
 #, c-format
 msgid "Error: Option '--pretty' is specified the second time."
 msgstr "ত্রুটি: '--pretty' বিকল্পটি দুইবার উল্লিখিত হয়েছে।"
 
-#: ../cli/src/nmcli.c:161
+#: ../cli/src/nmcli.c:172
 #, 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:182 ../cli/src/nmcli.c:198
 #, 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:191 ../cli/src/nmcli.c:207
 #, c-format
 msgid "Error: '%s' is not valid argument for '%s' option."
 msgstr "ত্রুটি: '%s' আর্গুমেন্টটি '%s' বিকল্পের জন্য বৈধ নয়।"
 
-#: ../cli/src/nmcli.c:203
+#: ../cli/src/nmcli.c:214
 #, c-format
 msgid "Error: fields for '%s' options are missing."
 msgstr "ত্রুটি: '%s' বিকল্পের ক্ষেত্র অনুপস্থিত।"
 
-#: ../cli/src/nmcli.c:209
+#: ../cli/src/nmcli.c:222
 #, c-format
 msgid "nmcli tool, version %s\n"
 msgstr "nmcli সরঞ্জাম, সংস্করণ %s\n"
 
-#: ../cli/src/nmcli.c:215
+#: ../cli/src/nmcli.c:228
 #, c-format
 msgid "Error: Option '%s' is unknown, try 'nmcli -help'."
 msgstr "ত্রুটি: '%s' বিকল্পটি অজানা, 'nmcli -help' ব্যবহারের প্রয়োগ করুন।"
 
-#: ../cli/src/nmcli.c:234
+#: ../cli/src/nmcli.c:247
 #, 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:272
+msgid "Error: Could not create NMClient object."
+msgstr "ত্রুটি: NMClient অবজেক্ট প্রস্তুত করতে ব্যর্থ।"
 
-#: ../cli/src/nmcli.c:275
+#: ../cli/src/nmcli.c:288
 msgid "Success"
 msgstr "সফল"
 
-#: ../cli/src/settings.c:407
+#: ../cli/src/settings.c:527
 #, c-format
 msgid "%d (hex-ascii-key)"
 msgstr "%d (hex-ascii-key)"
 
-#: ../cli/src/settings.c:409
+#: ../cli/src/settings.c:529
 #, c-format
 msgid "%d (104/128-bit passphrase)"
 msgstr "%d (১০৪/১২৮-বিট পরিচয়পংক্তি)"
 
-#: ../cli/src/settings.c:412
+#: ../cli/src/settings.c:532 ../cli/src/settings.c:660
 #, c-format
 msgid "%d (unknown)"
 msgstr "%d (অজানা)"
 
-#: ../cli/src/settings.c:438
+#: ../cli/src/settings.c:558
 msgid "0 (unknown)"
 msgstr "০ (অজানা)"
 
-#: ../cli/src/settings.c:444
+#: ../cli/src/settings.c:564
 msgid "any, "
 msgstr "যে কোনো, "
 
-#: ../cli/src/settings.c:446
+#: ../cli/src/settings.c:566
 msgid "900 MHz, "
 msgstr "৯০০ MHz, "
 
-#: ../cli/src/settings.c:448
+#: ../cli/src/settings.c:568
 msgid "1800 MHz, "
 msgstr "১৮০০ MHz, "
 
-#: ../cli/src/settings.c:450
+#: ../cli/src/settings.c:570
 msgid "1900 MHz, "
 msgstr "১৯০০ MHz, "
 
-#: ../cli/src/settings.c:452
+#: ../cli/src/settings.c:572
 msgid "850 MHz, "
 msgstr "৮৫০ MHz, "
 
-#: ../cli/src/settings.c:454
+#: ../cli/src/settings.c:574
 msgid "WCDMA 3GPP UMTS 2100 MHz, "
 msgstr "WCDMA 3GPP UMTS ২১০০ MHz, "
 
-#: ../cli/src/settings.c:456
+#: ../cli/src/settings.c:576
 msgid "WCDMA 3GPP UMTS 1800 MHz, "
 msgstr "WCDMA 3GPP UMTS ১৮০০ MHz, "
 
-#: ../cli/src/settings.c:458
+#: ../cli/src/settings.c:578
 msgid "WCDMA 3GPP UMTS 1700/2100 MHz, "
 msgstr "WCDMA 3GPP UMTS ১৭০০/২১০০ MHz, "
 
-#: ../cli/src/settings.c:460
+#: ../cli/src/settings.c:580
 msgid "WCDMA 3GPP UMTS 800 MHz, "
 msgstr "WCDMA 3GPP UMTS ৮০০ MHz, "
 
-#: ../cli/src/settings.c:462
+#: ../cli/src/settings.c:582
 msgid "WCDMA 3GPP UMTS 850 MHz, "
 msgstr "WCDMA 3GPP UMTS ৮৫০ MHz, "
 
-#: ../cli/src/settings.c:464
+#: ../cli/src/settings.c:584
 msgid "WCDMA 3GPP UMTS 900 MHz, "
 msgstr "WCDMA 3GPP UMTS ৯০০ MHz, "
 
-#: ../cli/src/settings.c:466
+#: ../cli/src/settings.c:586
 msgid "WCDMA 3GPP UMTS 1700 MHz, "
 msgstr "WCDMA 3GPP UMTS ১৭০০ MHz, "
 
-#: ../cli/src/settings.c:546 ../cli/src/settings.c:708
+#: ../cli/src/settings.c:588
+msgid "WCDMA 3GPP UMTS 1900 MHz, "
+msgstr "WCDMA 3GPP UMTS ১৯০০ MHz, "
+
+#: ../cli/src/settings.c:590
+msgid "WCDMA 3GPP UMTS 2600 MHz, "
+msgstr "WCDMA 3GPP UMTS ২৬০০ MHz, "
+
+#: ../cli/src/settings.c:608
+msgid "0 (NONE)"
+msgstr "0 (NONE)"
+
+#: ../cli/src/settings.c:614
+msgid "REORDER_HEADERS, "
+msgstr "REORDER_HEADERS, "
+
+#: ../cli/src/settings.c:616
+msgid "GVRP, "
+msgstr "GVRP, "
+
+#: ../cli/src/settings.c:618
+msgid "LOOSE_BINDING, "
+msgstr "LOOSE_BINDING, "
+
+#: ../cli/src/settings.c:654
+#, c-format
+msgid "%d (disabled)"
+msgstr "%d (নিষ্ক্রিয়)"
+
+#: ../cli/src/settings.c:656
+#, c-format
+msgid "%d (enabled, prefer public IP)"
+msgstr "%d (সক্রিয়, সার্বজনীন IP পছন্দসই)"
+
+#: ../cli/src/settings.c:658
+#, c-format
+msgid "%d (enabled, prefer temporary IP)"
+msgstr "%d (সক্রিয়, সাময়িক IP পছন্দসই)"
+
+#: ../cli/src/settings.c:791 ../cli/src/settings.c:987
+#: ../cli/src/settings.c:1696
 msgid "auto"
 msgstr "স্বয়ংক্রিয়"
 
-#: ../cli/src/settings.c:704 ../cli/src/settings.c:707 ../cli/src/utils.c:172
-msgid "not set"
-msgstr "নির্ধারিত হয়নি"
+#: ../cli/src/utils.c:105
+#, c-format
+msgid "Error converting IP4 address '0x%X' to text form"
+msgstr "IP4 ঠিকানা 0x%X-কে টেক্সটে রূপান্তর করতে ত্রুটি"
+
+#: ../cli/src/utils.c:133
+#, c-format
+msgid "Error converting IP6 address '%s' to text form"
+msgstr "IP6 ঠিকানা '%s'-কে টেক্সটে রূপান্তর করতে ত্রুটি"
 
-#: ../cli/src/utils.c:124
+#: ../cli/src/utils.c:234
 #, c-format
 msgid "field '%s' has to be alone"
 msgstr "'%s' ক্ষেত্রটি পৃথক থাকা আবশ্যক"
 
-#: ../cli/src/utils.c:127
+#: ../cli/src/utils.c:237
 #, c-format
 msgid "invalid field '%s'"
 msgstr "অবৈধ ক্ষেত্র '%s'"
 
-#: ../cli/src/utils.c:146
-#, c-format
+#: ../cli/src/utils.c:256
 msgid "Option '--terse' requires specifying '--fields'"
 msgstr "'--terse' বিকল্পের ক্ষেত্রে '--fields' নির্ধারণ করা আবশ্যক"
 
-#: ../cli/src/utils.c:150
+#: ../cli/src/utils.c:260
 #, c-format
 msgid "Option '--terse' requires specific '--fields' option values , not '%s'"
-msgstr "'--terse' বিকল্পের ক্ষেত্রে '--fields' বিকল্পের সুনির্দিষ্ট মান উল্লেখ করা আবশ্যক, '%s' ব্যবহার করা যাবে না"
+msgstr ""
+"'--terse' বিকল্পের ক্ষেত্রে '--fields' বিকল্পের সুনির্দিষ্ট মান উল্লেখ করা "
+"আবশ্যক, "
+"'%s' ব্যবহার করা যাবে না"
+
+#: ../cli/src/utils.c:470
+#, 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:478
+#, c-format
+msgid "Error: NameHasOwner request failed: %s"
+msgstr "ত্রুটি: NameHasOwner-র অনুরোধ ব্যর্থ: %s"
+
+#: ../cli/src/utils.c:523
+#, 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:532
+#, 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:120
+#: ../libnm-util/crypto.c:133
 #, c-format
 msgid "PEM key file had no end tag '%s'."
 msgstr "PEM কি ফাইলের কোনো সমাপ্তির ট্যাগ উপস্থিত নেই '%s'।"
 
-#: ../libnm-util/crypto.c:130
+#: ../libnm-util/crypto.c:146
 #, c-format
 msgid "Doesn't look like a PEM private key file."
 msgstr "সম্ভব PEM-র গোপনীয় কি ফাইল নয়।"
 
-#: ../libnm-util/crypto.c:138
+#: ../libnm-util/crypto.c:154
 #, c-format
 msgid "Not enough memory to store PEM file data."
 msgstr "PEM ফাইলের তথ্যে সংরক্ষণের জন্য পর্যাপ্ত মেমরি অনুপস্থিত।"
 
-#: ../libnm-util/crypto.c:154
+#: ../libnm-util/crypto.c:170
 #, 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:178
 #, 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:188
 #, 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:199
 #, 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:206
 #, 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:219
 #, c-format
 msgid "Malformed PEM file: unknown private key cipher '%s'."
 msgstr "ত্রুটিপূর্ণ PEM ফাইল: ব্যক্তিগত-কি'র অজানা সাইফার '%s'।"
 
-#: ../libnm-util/crypto.c:222
+#: ../libnm-util/crypto.c:238
 #, 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 "'%s' PEM সার্টিফিকেটের মধ্যে সমাপ্তির ট্যাগ '%s' উপস্থিত নেই।"
+#: ../libnm-util/crypto.c:284
+msgid "Failed to find expected PKCS#8 start tag."
+msgstr "প্রত্যাশিত PKCS#8 প্রারম্ভের ট্যাগ প্রাপ্ত করতে ব্যর্থ।"
 
-#: ../libnm-util/crypto.c:277
+#: ../libnm-util/crypto.c:292
 #, c-format
-msgid "Failed to decode certificate."
-msgstr "সার্টিফিকেট ডি-কোড করতে ব্যর্থ।"
+msgid "Failed to find expected PKCS#8 end tag '%s'."
+msgstr "প্রত্যাশিত PKCS#8 সমাপ্তির ট্যাগ '%s' প্রাপ্ত করতে ব্যর্থ।"
+
+#: ../libnm-util/crypto.c:312
+msgid "Not enough memory to store private key data."
+msgstr "ব্যক্তিগত কি-র তথ্য সংরক্ষণের উদ্দেশ্যে পর্যাপ্ত মেমরি অনুপস্থিত।"
 
-#: ../libnm-util/crypto.c:286
+#: ../libnm-util/crypto.c:317
+msgid "Failed to decode PKCS#8 private key."
+msgstr "PKCS#8 ব্যক্তিগত-কি ডিক্রিপ্ট করতে ব্যর্থ।"
+
+#: ../libnm-util/crypto.c:339 ../libnm-util/crypto.c:625
 #, 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
+#: ../libnm-util/crypto.c:365
 #, c-format
 msgid "IV must be an even number of bytes in length."
 msgstr "IV-র দৈঘ্যের পরিমাণ জোড় সংখ্যক বাইটের হওয়া আবশ্যক।"
 
-#: ../libnm-util/crypto.c:333
+#: ../libnm-util/crypto.c:374
 #, c-format
 msgid "Not enough memory to store the IV."
 msgstr "IV সংরক্ষণের জন্য পর্যাপ্ত মেমরি অনুপস্থিত।"
 
-#: ../libnm-util/crypto.c:344
+#: ../libnm-util/crypto.c:385
 #, c-format
 msgid "IV contains non-hexadecimal digits."
 msgstr "IV-র মধ্যে হেক্সাডেসিম্যাল-ভিন্ন অন্যান্য সংখ্যা উপস্থিত রয়েছে।"
 
-#: ../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_nss.c:336
+#: ../libnm-util/crypto.c:423 ../libnm-util/crypto_gnutls.c:147
+#: ../libnm-util/crypto_gnutls.c:265 ../libnm-util/crypto_nss.c:167
+#: ../libnm-util/crypto_nss.c:332
 #, c-format
 msgid "Private key cipher '%s' was unknown."
 msgstr "ব্যক্তিগত-কি'র সাইফার '%s' অজানা।"
 
-#: ../libnm-util/crypto.c:391
+#: ../libnm-util/crypto.c:432
 #, c-format
 msgid "Not enough memory to decrypt private key."
 msgstr "ব্যক্তিগত-কি ডিক্রিপ্ট করার জন্য পর্যাপ্ত মেমরি অনুপস্থিত।"
 
-#: ../libnm-util/crypto.c:511
+#: ../libnm-util/crypto.c:497
+#, c-format
+msgid "Not enough memory to store decrypted private key."
+msgstr "ডিক্রিপ্ট করা ব্যক্তিগত-কি সংরক্ষণের জন্য পর্যাপ্ত মেমরি অনুপস্থিত।"
+
+#: ../libnm-util/crypto.c:542
 #, c-format
 msgid "Unable to determine private key type."
 msgstr "ব্যক্তিগত-কি'র ধরন নির্ধারণ করতে ব্যর্থ।"
 
-#: ../libnm-util/crypto.c:530
+#: ../libnm-util/crypto.c:597
 #, c-format
-msgid "Not enough memory to store decrypted private key."
-msgstr "ডিক্রিপ্ট করা ব্যক্তিগত-কি সংরক্ষণের জন্য পর্যাপ্ত মেমরি অনুপস্থিত।"
+msgid "PEM certificate had no start tag '%s'."
+msgstr "PEM সার্টিফিকেটের মধ্যে প্রারম্ভিক ট্যাগ '%s' উপস্থিত নেই।"
+
+#: ../libnm-util/crypto.c:606
+#, c-format
+msgid "PEM certificate had no end tag '%s'."
+msgstr "PEM সার্টিফিকেটের মধ্যে সমাপ্তির ট্যাগ '%s' উপস্থিত নেই।"
+
+#: ../libnm-util/crypto.c:630
+#, c-format
+msgid "Failed to decode certificate."
+msgstr "সার্টিফিকেট ডি-কোড করতে ব্যর্থ।"
 
-#: ../libnm-util/crypto_gnutls.c:49
+#: ../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:92
 #, 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:155
 #, 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:164 ../libnm-util/crypto_nss.c:184
 #, c-format
 msgid "Not enough memory for decrypted key buffer."
 msgstr "ডিক্রিপ্ট করা কি-বাফারের জন্য পর্যাপ্ত মেমরি অনুপস্থিত।"
 
-#: ../libnm-util/crypto_gnutls.c:173
+#: ../libnm-util/crypto_gnutls.c:172
 #, 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:181
 #, 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:190
 #, 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:199
 #, 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:209 ../libnm-util/crypto_nss.c:263
 #, 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:220 ../libnm-util/crypto_nss.c:274
 #, 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:285 ../libnm-util/crypto_nss.c:352
 #, c-format
 msgid "Could not allocate memory for encrypting."
 msgstr "এনক্রিপ্ট করার জন্য মেমরি বরাদ্দ করতে ব্যর্থ।"
 
-#: ../libnm-util/crypto_gnutls.c:294
+#: ../libnm-util/crypto_gnutls.c:293
 #, 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:302
 #, 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:312
 #, 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:321
 #, c-format
 msgid "Failed to encrypt the data: %s / %s."
 msgstr "তথ্য এনক্রিপ্ট করতে ব্যর্থ: %s / %s।"
 
-#: ../libnm-util/crypto_gnutls.c:362
+#: ../libnm-util/crypto_gnutls.c:361
 #, c-format
 msgid "Error initializing certificate data: %s"
 msgstr "সার্টিফিকেটের তথ্য আরম্ভ করতে সমস্যা: %s"
 
-#: ../libnm-util/crypto_gnutls.c:384
+#: ../libnm-util/crypto_gnutls.c:383
 #, c-format
 msgid "Couldn't decode certificate: %s"
 msgstr "সার্টিফিকেট ডি-কোড করতে ব্যর্থ: %s"
 
-#: ../libnm-util/crypto_gnutls.c:408
+#: ../libnm-util/crypto_gnutls.c:407
 #, 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:420
 #, 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:432
 #, c-format
 msgid "Couldn't verify PKCS#12 file: %s"
 msgstr "PKCS#12 ফাইল যাচাই করতে ব্যর্থ: %s"
 
+#: ../libnm-util/crypto_gnutls.c:460
+#, c-format
+msgid "Couldn't initialize PKCS#8 decoder: %s"
+msgstr "PKCS#8 ডিকোডার আরম্ভ করতে ব্যর্থ: %s"
+
+#: ../libnm-util/crypto_gnutls.c:483
+#, c-format
+msgid "Couldn't decode PKCS#8 file: %s"
+msgstr "PKCS#8 ফাইল ডিকোড করতে ব্যর্থ: %s"
+
 #: ../libnm-util/crypto_nss.c:56
 #, c-format
 msgid "Failed to initialize the crypto engine: %d."
 msgstr "ক্রিপ্টো ইঞ্জিন আরম্ভ করতে ব্যর্থ: %d।"
 
-#: ../libnm-util/crypto_nss.c:111
+#: ../libnm-util/crypto_nss.c:107
 #, c-format
 msgid "Failed to initialize the MD5 context: %d."
 msgstr "MD5 কনটেক্সট আরম্ভ করতে ব্যর্থ: %d।"
 
-#: ../libnm-util/crypto_nss.c:179
+#: ../libnm-util/crypto_nss.c:175
 #, c-format
 msgid "Invalid IV length (must be at least %d)."
 msgstr "IV-র অবৈধ দৈর্ঘ্য (অন্তত %d হওয়া আবশ্যক)।"
 
-#: ../libnm-util/crypto_nss.c:196
+#: ../libnm-util/crypto_nss.c:192
 #, c-format
 msgid "Failed to initialize the decryption cipher slot."
 msgstr "ডিক্রিপশন সাইফার স্লট আরম্ভ করতে ব্যর্থ।"
 
-#: ../libnm-util/crypto_nss.c:206
+#: ../libnm-util/crypto_nss.c:202
 #, c-format
 msgid "Failed to set symmetric key for decryption."
 msgstr "ডিক্রিপশনের উদ্দেশ্যে সিমেট্রিক-কি নির্ধারণ করতে ব্যর্থ।"
 
-#: ../libnm-util/crypto_nss.c:216
+#: ../libnm-util/crypto_nss.c:212
 #, c-format
 msgid "Failed to set IV for decryption."
 msgstr "ডিক্রিপশনের উদ্দেশ্যে IV নির্ধারণ করতে ব্যর্থ।"
 
-#: ../libnm-util/crypto_nss.c:224
+#: ../libnm-util/crypto_nss.c:220
 #, c-format
 msgid "Failed to initialize the decryption context."
 msgstr "ডিক্রিপশন কনটেক্সট আরম্ভ করতে ব্যর্থ।"
 
-#: ../libnm-util/crypto_nss.c:237
+#: ../libnm-util/crypto_nss.c:233
 #, c-format
 msgid "Failed to decrypt the private key: %d."
 msgstr "ব্যক্তিগত-কি ডিক্রিপ্ট করতে ব্যর্থ: %d।"
 
-#: ../libnm-util/crypto_nss.c:245
+#: ../libnm-util/crypto_nss.c:241
 #, c-format
 msgid "Failed to decrypt the private key: decrypted data too large."
 msgstr "ব্যক্তিগত-কি ডিক্রিপ্ট করতে ব্যর্থ: ডিক্রিপ্ট করা তথ্য অত্যাধিক বড়।"
 
-#: ../libnm-util/crypto_nss.c:256
+#: ../libnm-util/crypto_nss.c:252
 #, c-format
 msgid "Failed to finalize decryption of the private key: %d."
 msgstr "ব্যক্তিগত-কি'র ডিক্রিপশন সমাপ্ত করতে ব্যর্থ: %d।"
 
-#: ../libnm-util/crypto_nss.c:364
+#: ../libnm-util/crypto_nss.c:360
 #, c-format
 msgid "Failed to initialize the encryption cipher slot."
 msgstr "এনক্রিপশন সাইফার স্লট আরম্ভ করতে ব্যর্থ।"
 
-#: ../libnm-util/crypto_nss.c:372
+#: ../libnm-util/crypto_nss.c:368
 #, c-format
 msgid "Failed to set symmetric key for encryption."
 msgstr "এনক্রিপশনের উদ্দেশ্যে সিমেট্রিক-কি নির্ধারণ করতে ব্যর্থ।"
 
-#: ../libnm-util/crypto_nss.c:380
+#: ../libnm-util/crypto_nss.c:376
 #, c-format
 msgid "Failed to set IV for encryption."
 msgstr "এনক্রিপশনের উদ্দেশ্যে IV নির্ধারণ করতে ব্যর্থ।"
 
-#: ../libnm-util/crypto_nss.c:388
+#: ../libnm-util/crypto_nss.c:384
 #, c-format
 msgid "Failed to initialize the encryption context."
 msgstr "এনক্রিপশন কনটেক্সট আরম্ভ করতে ব্যর্থ।"
 
-#: ../libnm-util/crypto_nss.c:396
+#: ../libnm-util/crypto_nss.c:392
 #, c-format
 msgid "Failed to encrypt: %d."
 msgstr "এনক্রিপ্ট করতে ব্যর্থ: %d।"
 
-#: ../libnm-util/crypto_nss.c:404
+#: ../libnm-util/crypto_nss.c:400
 #, c-format
 msgid "Unexpected amount of data after encrypting."
 msgstr "এনক্রিপ্ট করার পরে অপ্রত্যাশিত পরিমাণ তথ্য উপলব্ধ হয়েছে।"
 
-#: ../libnm-util/crypto_nss.c:447
+#: ../libnm-util/crypto_nss.c:443
 #, c-format
 msgid "Couldn't decode certificate: %d"
 msgstr "সার্টিফিকেট ডিকোড করতে ব্যর্থ: %d"
 
-#: ../libnm-util/crypto_nss.c:482
+#: ../libnm-util/crypto_nss.c:478
 #, c-format
 msgid "Couldn't convert password to UCS2: %d"
 msgstr "পাসওয়ার্ডকে UCS2-তে রূপান্তর করতে ব্যর্থ: %d"
 
-#: ../libnm-util/crypto_nss.c:510
+#: ../libnm-util/crypto_nss.c:506
 #, c-format
 msgid "Couldn't initialize PKCS#12 decoder: %d"
 msgstr "PKCS#12 ডিকোডার আরম্ভ করতে ব্যর্থ: %d"
 
-#: ../libnm-util/crypto_nss.c:519
+#: ../libnm-util/crypto_nss.c:515
 #, c-format
 msgid "Couldn't decode PKCS#12 file: %d"
 msgstr "PKCS#12 ফাইল ডিকোড করতে ব্যর্থ: %d"
 
-#: ../libnm-util/crypto_nss.c:528
+#: ../libnm-util/crypto_nss.c:524
 #, c-format
 msgid "Couldn't verify PKCS#12 file: %d"
 msgstr "PKCS#12 ফাইল যাচাই করতে ব্যর্থ: %d"
 
-#: ../libnm-util/crypto_nss.c:557
+#: ../libnm-util/crypto_nss.c:568
 msgid "Could not generate random data."
 msgstr "র‍্যান্ড তথ্য নির্মাণ করতে ব্যর্থ।"
 
-#: ../libnm-util/nm-utils.c:1925
+#: ../libnm-util/nm-utils.c:2078
 #, c-format
 msgid "Not enough memory to make encryption key."
 msgstr "এনক্রিপশন-কি নির্মাণের জন্য পর্যাপ্ত মেমরি অনুপস্থিত।"
 
-#: ../libnm-util/nm-utils.c:2035
+#: ../libnm-util/nm-utils.c:2188
 msgid "Could not allocate memory for PEM file creation."
 msgstr "PEM ফাইল নির্মাণের জন্য মেমরি বরাদ্দ করতে ব্যর্থ।"
 
-#: ../libnm-util/nm-utils.c:2047
+#: ../libnm-util/nm-utils.c:2200
 #, c-format
 msgid "Could not allocate memory for writing IV to PEM file."
 msgstr "PEM ফাইলের মধ্যে IV লেখার জন্য মেমরি বরাদ্দ করতে ব্যর্থ।"
 
-#: ../libnm-util/nm-utils.c:2059
+#: ../libnm-util/nm-utils.c:2212
 #, 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:2231
 #, 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 "netlink বার্তা প্রক্রিয়াকরণে ত্রুটি: %s"
+#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:1
+msgid "Enable or disable system networking"
+msgstr "সিস্টেমের নেটওয়ার্ক ব্যবস্থা সক্রিয় অথবা নিষ্ক্রিয় করা যাবে"
 
-#: ../src/nm-netlink-monitor.c:214
-msgid "error occurred while waiting for data on socket"
-msgstr "তথ্যের জন্য সকেটে অপেক্ষাকালে সমস্যা"
+#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:2
+msgid "System policy prevents enabling or disabling system networking"
+msgstr ""
+"সিস্টেমে ব্যবহৃত নিয়ম-নীতির বিধিনিষেধের কারণে সিস্টেমের নেটওয়ার্ক ব্যবস্থা "
+"সক্রিয় "
+"অথবা নিষ্ক্রিয় করা সম্ভব নয়"
+
+#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:3
+msgid ""
+"Put NetworkManager to sleep or wake it up (should only be used by system "
+"power management)"
+msgstr ""
+"NetworkManager-কে নিদ্রিত অথবা জাগ্রত অবস্থায় স্থাপন করা যাবে (শুধুমাত্র "
+"সিস্টেমের "
+"বিদ্যুৎ পরিচালন ব্যবস্থায় ব্যবহার করা উচিত)"
+
+#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:4
+msgid "System policy prevents putting NetworkManager to sleep or waking it up"
+msgstr ""
+"সিস্টেমের নিয়মনীতির কারণে NetworkManager-কে নিদ্রিত অথবা জাগ্রত অবস্থায় "
+"স্থাপন "
+"করা সম্ভব নয়"
+
+#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:5
+msgid "Enable or disable WiFi devices"
+msgstr "ওয়াই-ফাই ডিভাইস সক্রিয় অথবা নিষ্ক্রিয় করা যাবে"
+
+#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:6
+msgid "System policy prevents enabling or disabling WiFi devices"
+msgstr ""
+"সিস্টেমের নিয়মনীতির কারণে, ওয়াই-ফাই ডিভাইস সক্রিয় অথবা নিষ্ক্রিয় করা সম্ভব নয়"
+
+#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:7
+msgid "Enable or disable mobile broadband devices"
+msgstr "মোবাইল ব্রড-ব্যান্ড ডিভাইস সক্রিয় অথবা নিষ্ক্রিয় করা যাবে"
+
+#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:8
+msgid "System policy prevents enabling or disabling mobile broadband devices"
+msgstr ""
+"সিস্টেমের নিয়মনীতির কারণে, মোবাইল ব্রড-ব্যান্ড ডিভাইস সক্রিয় অথবা নিষ্ক্রিয় "
+"করা "
+"সম্ভব নয়"
+
+#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:9
+msgid "Enable or disable WiMAX mobile broadband devices"
+msgstr "WiMax মোবাইল ব্রড-ব্যান্ড ডিভাইস সক্রিয় অথবা নিষ্ক্রিয় করুন"
+
+#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:10
+msgid ""
+"System policy prevents enabling or disabling WiMAX mobile broadband devices"
+msgstr ""
+"সিস্টেমের নিয়মনীতির কারণে, WiMAX ব্রড-ব্যান্ড ডিভাইস সক্রিয় অথবা নিষ্ক্রিয় "
+"করা সম্ভব নয়"
+
+#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:11
+msgid "Allow control of network connections"
+msgstr "নেটওয়ার্ক সংযোগ নিয়ন্ত্রণের অনুমতি প্রদান করা হবে"
+
+#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:12
+msgid "System policy prevents control of network connections"
+msgstr ""
+"সিস্টেমে ব্যবহৃত নিয়ম-নীতির বিধিনিষেধের কারণে নেটওয়ার্ক সংযোগ নিয়ন্ত্রণ করা "
+"সম্ভব নয়"
+
+#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:13
+msgid "Connection sharing via a protected WiFi network"
+msgstr "নিরাপদ ওয়াই-ফাইল নেটওয়ার্কের মাধ্যমে সংযোগের যৌথ ব্যবহার"
+
+#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:14
+msgid "System policy prevents sharing connections via a protected WiFi network"
+msgstr ""
+"সিস্টেমের নিয়মনীতির কারণে, নিরাপদ ওয়াই-ফাই নেটওয়ার্কের মাধ্যমে সংযোগের যৌথ "
+"ব্যবহার প্রতিরোধ করা হয়েছে"
+
+#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:15
+msgid "Connection sharing via an open WiFi network"
+msgstr "উন্মুক্ত ওয়াই-ফাইল নেটওয়ার্কের মাধ্যমে সংযোগের যৌথ ব্যবহার"
+
+#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:16
+msgid "System policy prevents sharing connections via an open WiFi network"
+msgstr ""
+"সিস্টেমের নিয়মনীতির কারণে, উন্মুক্ত ওয়াই-ফাই নেটওয়ার্কের মাধ্যমে সংযোগের যৌথ "
+"ব্যবহার প্রতিরোধ করা হয়েছে"
+
+#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:17
+msgid "Modify personal network connections"
+msgstr "ব্যক্তিগত নেটওয়ার্ক সংযোগ পরিবর্তন করা হবে"
+
+#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:18
+msgid "System policy prevents modification of personal network settings"
+msgstr ""
+"সিস্টেমে ব্যবহৃত নিয়ম-নীতির বিধিনিষেধের কারণে ব্যক্তিগত নেটওয়ার্কের বৈশিষ্ট্য "
+"পরিবর্তন করা সম্ভব নয়"
+
+#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:19
+msgid "Modify network connections for all users"
+msgstr "সকল ব্যবহারকারীর জন্য নেটওয়ার্ক সংযোগ পরিবর্তন করা হবে"
+
+#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:20
+msgid "System policy prevents modification of network settings for all users"
+msgstr ""
+"সিস্টেমে ব্যবহৃত নিয়ম-নীতির বিধিনিষেধের কারণে সকল ব্যবহারকারীর জন্য "
+"নেটওয়ার্কের বৈশিষ্ট্য পরিবর্তন করা সম্ভব "
+"নয়"
+
+#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:21
+msgid "Modify persistent system hostname"
+msgstr "সিস্টেমের স্থায়ী হোস্ট-নেম পরিবর্তন করুন"
+
+#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:22
+msgid "System policy prevents modification of the persistent system hostname"
+msgstr ""
+"সিস্টেমে ব্যবহৃত নিয়ম-নীতির বিধিনিষেধের কারণে সিস্টেমের স্থায়ী হোস্ট-নেম "
+"পরিবর্তন "
+"করা সম্ভব নয়"
 
-#: ../src/nm-netlink-monitor.c:254
+#: ../src/main.c:158
 #, c-format
-msgid "unable to connect to netlink for monitoring link status: %s"
-msgstr "লিংকের অবস্থা নিরীক্ষণের উদ্দেশ্যে netlink-র সাথে সংযোগ করতে ব্যর্থ: %s"
+msgid "Failed to set signal mask: %d"
+msgstr "সিগন্যাল মাস্ক নির্ধারণ করতে ব্যর্থ: %d"
 
-#: ../src/nm-netlink-monitor.c:265
+#: ../src/main.c:167
 #, c-format
-msgid "unable to enable netlink handle credential passing: %s"
-msgstr "netlink হ্যান্ডেলের পরিচয়ের তথ্য পরিবহণের ব্যবস্থা সক্রিয় করতে ব্যর্থ: %s"
+msgid "Failed to create signal handling thread: %d"
+msgstr "সিগন্যাল পরিচালনার থ্রেড প্রস্তুত করতে ব্যর্থ: %d"
 
-#: ../src/nm-netlink-monitor.c:291 ../src/nm-netlink-monitor.c:353
+#: ../src/main.c:182
 #, c-format
-msgid "unable to allocate netlink handle for monitoring link status: %s"
-msgstr "লিংকের অবস্থা নিরীক্ষণের উদ্দেশ্যে netlink হ্যান্ডেল বরাদ্দ করতে ব্যর্থ: %s"
+msgid "Opening %s failed: %s\n"
+msgstr "%s খুলতে ব্যর্থ: %s\n"
 
-#: ../src/nm-netlink-monitor.c:376
+#: ../src/main.c:188
 #, c-format
-msgid "unable to allocate netlink link cache for monitoring link status: %s"
-msgstr "লিংকের অবস্থা নিরীক্ষণের উদ্দেশ্যে netlink লিংক ক্যাশে বরাদ্দ করতে ব্যর্থ: %s"
+msgid "Writing to %s failed: %s\n"
+msgstr "%s-এ লিখতে ব্যর্থ: %s\n"
 
-#: ../src/nm-netlink-monitor.c:502
+#: ../src/main.c:193
 #, c-format
-msgid "unable to join netlink group: %s"
-msgstr "netlink দলে যোগ করতে ব্যর্থ: %s"
+msgid "Closing %s failed: %s\n"
+msgstr "%s বন্ধ করতে ব্যর্থ: %s\n"
 
-#: ../src/nm-netlink-monitor.c:629 ../src/nm-netlink-monitor.c:642
+#: ../src/main.c:236
 #, c-format
-msgid "error updating link cache: %s"
-msgstr "লিংক ক্যাশে আপডেট করতে সমস্যা: %s"
+msgid "NetworkManager is already running (pid %ld)\n"
+msgstr "NetworkManager বর্তমানে চলছে (pid %ld)\n"
+
+#: ../src/main.c:363
+msgid "Print NetworkManager version and exit"
+msgstr "NetworkManager-র সংস্করণ প্রদর্শন করে প্রস্থান করা হবে"
+
+#: ../src/main.c:364
+msgid "Don't become a daemon"
+msgstr "ডেমন রূপে প্রস্তুত করা হবে না"
+
+#: ../src/main.c:365
+msgid "Make all warnings fatal"
+msgstr "সকল সর্তকবার্তাগুলি গুরুত্বপূর্ণ হিসাবে ধার্য করা হবে"
+
+#: ../src/main.c:366
+msgid "Specify the location of a PID file"
+msgstr "একটি PID ফাইলের অবস্থান নির্ধারণ করুন"
+
+#: ../src/main.c:366
+msgid "filename"
+msgstr "filename"
+
+#: ../src/main.c:367
+msgid "State file location"
+msgstr "ফাইলের অবস্থান নির্ধারণ করা হবে"
+
+#: ../src/main.c:367
+msgid "/path/to/state.file"
+msgstr "/path/to/state.file"
 
-#: ../src/main.c:502
+#: ../src/main.c:368
+msgid "Config file location"
+msgstr "কনফিগ ফাইলের অবস্থান"
+
+#: ../src/main.c:368
+msgid "/path/to/config.file"
+msgstr "/path/to/config.file"
+
+#: ../src/main.c:369
+msgid "List of plugins separated by ','"
+msgstr "',' চিহ্ন সহযোগে বিভাজন করে প্লাগ-ইনের তালিকা প্রদর্শন করা হবে"
+
+#: ../src/main.c:369
+msgid "plugin1,plugin2"
+msgstr "plugin1,plugin2"
+
+#. Translators: Do not translate the values in the square brackets
+#: ../src/main.c:371
+msgid "Log level: one of [ERR, WARN, INFO, DEBUG]"
+msgstr "লগের স্তর: সম্ভাব্য মান [ERR, WARN, INFO, DEBUG]"
+
+#. Translators: Do not translate the values in the square brackets
+#: ../src/main.c:374
+msgid ""
+"Log domains separated by ',': any combination of\n"
+"                                                [NONE,HW,RFKILL,ETHER,WIFI,"
+"BT,MB,DHCP4,DHCP6,PPP,\n"
+"                                                 WIFI_SCAN,IP4,IP6,AUTOIP4,"
+"DNS,VPN,SHARING,SUPPLICANT,\n"
+"                                                 AGENTS,SETTINGS,SUSPEND,"
+"CORE,DEVICE,OLPC,WIMAX,\n"
+"                                                 INFINIBAND,FIREWALL,ADSL]"
+msgstr ""
+"Log domains separated by ',': any combination of\n"
+"                                                [NONE,HW,RFKILL,ETHER,WIFI,"
+"BT,MB,DHCP4,DHCP6,PPP,\n"
+"                                                 WIFI_SCAN,IP4,IP6,AUTOIP4,"
+"DNS,VPN,SHARING,SUPPLICANT,\n"
+"                                                 AGENTS,SETTINGS,SUSPEND,"
+"CORE,DEVICE,OLPC,WIMAX,\n"
+"                                                 INFINIBAND,FIREWALL,ADSL]"
+
+#: ../src/main.c:380
+msgid "An http(s) address for checking internet connectivity"
+msgstr "ইন্টারনেটের সংযোগ পরীক্ষা করার জন্য একটি http(s) ঠিকানা"
+
+#: ../src/main.c:381
+msgid "The interval between connectivity checks (in seconds)"
+msgstr "সংযোগের উপস্থিত পরীক্ষা করার মধ্যে বিরতি (সেকেন্ডে)"
+
+#: ../src/main.c:382
+msgid "The expected start of the response"
+msgstr "প্রত্যুত্তরের প্রত্যাশিত আরম্ভ"
+
+#: ../src/main.c:382
+msgid "Bingo!"
+msgstr "বিংগো!"
+
+#: ../src/main.c:387
+#, c-format
+msgid "GModules are not supported on your platform!\n"
+msgstr "ব্যবহৃত প্ল্যাটফর্মের মধ্যে GModules সমর্থিত নয়!\n"
+
+#: ../src/main.c:406
+msgid ""
+"NetworkManager monitors all network connections and automatically\n"
+"chooses the best connection to use.  It also allows the user to\n"
+"specify wireless access points which wireless cards in the computer\n"
+"should associate with."
+msgstr ""
+"NetworkManager দ্বারা সকল নেটওয়ার্ক সংযোগ নিরীক্ষণ করা হয় ও\n"
+"সর্বোত্তম সংযোগটি স্বয়ংক্রিয়ভাবে নির্বাচন করা হয়। এছাড়াও, কম্পিউটারের মধ্যে "
+"উপস্থিত\n"
+"কোন বেতার কার্ডগুলি দ্বারা কোন বেতার অ্যাকসেস পয়েন্টগুলি ব্যবহার করা হবে\n"
+"তা ব্যবহারকারী দ্বারা নির্ধারণের সুবিধাও উপলব্ধ করা হয়।"
+
+#: ../src/main.c:412
 #, c-format
 msgid "Invalid option.  Please use --help to see a list of valid options.\n"
-msgstr "অবৈধ বিকল্প।  বৈধ বিকল্পগুলির তালিকা দেখার জন্য অনুগ্রহ করে --help প্রয়োগ করুন।\n"
+msgstr ""
+"অবৈধ বিকল্প।  বৈধ বিকল্পগুলির তালিকা দেখার জন্য অনুগ্রহ করে --help প্রয়োগ "
+"করুন।\n"
+
+#: ../src/main.c:422
+#, c-format
+msgid "You must be root to run NetworkManager!\n"
+msgstr "NetworkManager সঞ্চালনের জন্য root পরিচয় ধারণ করা আবশ্যক!\n"
 
-#: ../src/main.c:562
+#: ../src/main.c:449
+#, c-format
+msgid "Failed to read configuration: (%d) %s\n"
+msgstr "কনফিগারেশন পড়তে ব্যর্থ: (%d) %s\n"
+
+#: ../src/main.c:460
 #, c-format
 msgid "%s.  Please use --help to see a list of valid options.\n"
-msgstr "%s।  বৈধ বিকল্পগুলির তালিকা দেখার জন্য অনুগ্রহ করে --help প্রয়োগ করুন।\n"
+msgstr ""
+"%s।  বৈধ বিকল্পগুলির তালিকা দেখার জন্য অনুগ্রহ করে --help প্রয়োগ করুন।\n"
+
+#: ../src/main.c:467
+#, c-format
+msgid "State file %s parsing failed: (%d) %s\n"
+msgstr "অবস্থাসূচক ফাইল %s পার্সক করতে ব্যর্থ: (%d) %s\n"
+
+#: ../src/main.c:484
+#, c-format
+msgid "Could not daemonize: %s [error %u]\n"
+msgstr "ডেমন তৈরি করতে ব্যর্থ: %s [error %u]\n"
 
-#: ../src/dhcp-manager/nm-dhcp-dhclient.c:325
+#: ../src/dhcp-manager/nm-dhcp-dhclient-utils.c:138
 msgid "# Created by NetworkManager\n"
 msgstr "# NetworkManager দ্বারা নির্মিত\n"
 
-#: ../src/dhcp-manager/nm-dhcp-dhclient.c:341
+#: ../src/dhcp-manager/nm-dhcp-dhclient-utils.c:145
 #, c-format
 msgid ""
 "# Merged from %s\n"
@@ -1560,89 +2620,250 @@ msgstr ""
 "# %s থেকে মার্জ করা হয়েছে\n"
 "\n"
 
-#: ../src/dhcp-manager/nm-dhcp-manager.c:279
+#: ../src/dhcp-manager/nm-dhcp-manager.c:266
 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:275
 msgid "'dhclient' could be found."
 msgstr "'dhclient' পাওয়া যায়নি।"
 
-#: ../src/dhcp-manager/nm-dhcp-manager.c:298
+#: ../src/dhcp-manager/nm-dhcp-manager.c:285
 msgid "'dhcpcd' could be found."
 msgstr "'dhcpcd' পাওয়া যায়নি।"
 
-#: ../src/dhcp-manager/nm-dhcp-manager.c:306
+#: ../src/dhcp-manager/nm-dhcp-manager.c:293
 #, c-format
 msgid "unsupported DHCP client '%s'"
 msgstr "অসমর্থিত DHCP ক্লায়েন্ট '%s'"
 
-#: ../src/logging/nm-logging.c:146
+#: ../src/dns-manager/nm-dns-manager.c:375
+msgid "NOTE: the libc resolver may not support more than 3 nameservers."
+msgstr ""
+"উল্লেখ্য: libc resolver দ্বারা ৩-টির বেশি নেম-সার্ভার সমর্থিত না হওয়ার "
+"সম্ভাবনা "
+"রয়েছে।"
+
+#: ../src/dns-manager/nm-dns-manager.c:377
+msgid "The nameservers listed below may not be recognized."
+msgstr "নিম্নলিখিত নেম-সার্ভারগুলি সনাক্ত না হওয়ার সম্ভাবনা রয়েছে।"
+
+#: ../src/logging/nm-logging.c:142
 #, c-format
 msgid "Unknown log level '%s'"
 msgstr "লগের অজানা স্তর '%s'"
 
-#: ../src/logging/nm-logging.c:171
+#: ../src/logging/nm-logging.c:181
 #, 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 resolver দ্বারা ৩-টির বেশি নেম-সার্ভার সমর্থিত না হওয়ার সম্ভাবনা "
-"রয়েছে।"
+#: ../src/modem-manager/nm-modem-cdma.c:280
+#: ../src/modem-manager/nm-modem-broadband.c:546 ../src/nm-device-bt.c:352
+#, 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:558
+#: ../src/modem-manager/nm-modem-broadband.c:524 ../src/nm-device-bt.c:348
+#, c-format
+msgid "GSM connection %d"
+msgstr "GSM সংযোগ %d"
 
-#: ../src/settings/nm-default-wired-connection.c:157
+#: ../src/nm-device-bond.c:192
 #, c-format
-msgid "Auto %s"
-msgstr "স্বয়ংক্রিয় %s"
+msgid "Bond connection %d"
+msgstr "Bond সংযোগ %d"
 
-#: ../system-settings/plugins/ifcfg-rh/reader.c:3256
-msgid "System"
-msgstr "সিস্টেম"
+#: ../src/nm-device-adsl.c:193
+#, c-format
+msgid "ADSL connection %d"
+msgstr "ADSL সংযোগ %d"
 
-#: ../policy/org.freedesktop.network-manager-settings.system.policy.in.h:1
-msgid "Connection sharing via a protected WiFi network"
-msgstr "নিরাপদ ওয়াই-ফাইল নেটওয়ার্কের মাধ্যমে সংযোগের যৌথ ব্যবহার"
+#: ../src/nm-device-bt.c:323
+#, c-format
+msgid "PAN connection %d"
+msgstr "PAN সংযোগ %d"
 
-#: ../policy/org.freedesktop.network-manager-settings.system.policy.in.h:2
-msgid "Connection sharing via an open WiFi network"
-msgstr "উন্মুক্ত ওয়াই-ফাইল নেটওয়ার্কের মাধ্যমে সংযোগের যৌথ ব্যবহার"
+#: ../src/nm-device-bt.c:356
+#, c-format
+msgid "DUN connection %d"
+msgstr "DUN সংযোগ %d"
 
-#: ../policy/org.freedesktop.network-manager-settings.system.policy.in.h:3
-msgid "Modify persistent system hostname"
-msgstr "সিস্টেমের স্থায়ী হোস্ট-নেম পরিবর্তন করুন"
+#: ../src/nm-device-ethernet.c:1326
+#, c-format
+msgid "PPPoE connection %d"
+msgstr "PPPoE সংযোগ %d"
+
+#: ../src/nm-device-ethernet.c:1326 ../src/settings/nm-settings-utils.c:50
+#, c-format
+msgid "Wired connection %d"
+msgstr "তারবিশিষ্ট সংযোগ %d"
+
+#: ../src/nm-device-infiniband.c:303
+#, c-format
+msgid "InfiniBand connection %d"
+msgstr "InfiniBand সংযোগ %d"
+
+#: ../src/nm-device-olpc-mesh.c:311
+#, c-format
+msgid "Mesh %d"
+msgstr "Mesh %d"
+
+#: ../src/nm-device-vlan.c:362
+#, c-format
+msgid "VLAN connection %d"
+msgstr "VLAN সংযোগ %d"
+
+#: ../src/nm-manager.c:665
+#, c-format
+msgid "VPN connection %d"
+msgstr "VPN সংযোগ %d"
+
+#: ../src/nm-netlink-monitor.c:148 ../src/nm-netlink-monitor.c:272
+#: ../src/nm-netlink-monitor.c:695
+#, c-format
+msgid "error processing netlink message: %s"
+msgstr "netlink বার্তা প্রক্রিয়াকরণে ত্রুটি: %s"
 
-#: ../policy/org.freedesktop.network-manager-settings.system.policy.in.h:4
-msgid "Modify system connections"
-msgstr "সিস্টেমের সংযোগ পরিবর্তন করুন"
+#: ../src/nm-netlink-monitor.c:251
+msgid "error occurred while waiting for data on socket"
+msgstr "তথ্যের জন্য সকেটে অপেক্ষাকালে সমস্যা"
 
-#: ../policy/org.freedesktop.network-manager-settings.system.policy.in.h:5
-msgid "System policy prevents modification of system settings"
+#: ../src/nm-netlink-monitor.c:296
+#, c-format
+msgid "unable to connect to netlink for monitoring link status: %s"
 msgstr ""
-"সিস্টেমে ব্যবহৃত নিয়ম-নীতির বিধিনিষেধের কারণে সিস্টেমের বৈশিষ্ট্য পরিবর্তন করা সম্ভব "
-"নয়"
+"লিংকের অবস্থা নিরীক্ষণের উদ্দেশ্যে netlink-র সাথে সংযোগ করতে ব্যর্থ: %s"
 
-#: ../policy/org.freedesktop.network-manager-settings.system.policy.in.h:6
-msgid "System policy prevents modification of the persistent system hostname"
+#: ../src/nm-netlink-monitor.c:307
+#, c-format
+msgid "unable to enable netlink handle credential passing: %s"
 msgstr ""
-"সিস্টেমে ব্যবহৃত নিয়ম-নীতির বিধিনিষেধের কারণে সিস্টেমের স্থায়ী হোস্ট-নেম পরিবর্তন "
-"করা সম্ভব নয়"
+"netlink হ্যান্ডেলের পরিচয়ের তথ্য পরিবহণের ব্যবস্থা সক্রিয় করতে ব্যর্থ: %s"
 
-#: ../policy/org.freedesktop.network-manager-settings.system.policy.in.h:7
-msgid "System policy prevents sharing connections via a protected WiFi network"
+#: ../src/nm-netlink-monitor.c:330 ../src/nm-netlink-monitor.c:390
+#, c-format
+msgid "unable to allocate netlink handle for monitoring link status: %s"
 msgstr ""
-"সিস্টেমের নিয়মনীতির কারণে, নিরাপদ ওয়াই-ফাই নেটওয়ার্কের মাধ্যমে সংযোগের যৌথ "
-"ব্যবহার প্রতিরোধ করা হয়েছে"
+"লিংকের অবস্থা নিরীক্ষণের উদ্দেশ্যে netlink হ্যান্ডেল বরাদ্দ করতে ব্যর্থ: %s"
 
-#: ../policy/org.freedesktop.network-manager-settings.system.policy.in.h:8
-msgid "System policy prevents sharing connections via an open WiFi network"
+#: ../src/nm-netlink-monitor.c:415
+#, c-format
+msgid "unable to allocate netlink link cache for monitoring link status: %s"
 msgstr ""
-"সিস্টেমের নিয়মনীতির কারণে, উন্মুক্ত ওয়াই-ফাই নেটওয়ার্কের মাধ্যমে সংযোগের যৌথ "
-"ব্যবহার প্রতিরোধ করা হয়েছে"
+"লিংকের অবস্থা নিরীক্ষণের উদ্দেশ্যে netlink লিংক ক্যাশে বরাদ্দ করতে ব্যর্থ: %s"
+
+#: ../src/nm-netlink-monitor.c:542
+#, c-format
+msgid "unable to join netlink group: %s"
+msgstr "netlink দলে যোগ করতে ব্যর্থ: %s"
+
+#: ../src/nm-netlink-monitor.c:671 ../src/nm-netlink-monitor.c:684
+#, c-format
+msgid "error updating link cache: %s"
+msgstr "লিংক ক্যাশে আপডেট করতে সমস্যা: %s"
+
+#: ../src/settings/plugins/ifcfg-rh/reader.c:93
+msgid "System"
+msgstr "সিস্টেম"
+
+#: ../src/settings/plugins/ifcfg-rh/reader.c:3668
+msgid "Bond"
+msgstr "Bond"
+
+#: ../test/nm-online.c:111
+#, c-format
+msgid "\rConnecting"
+msgstr "\rসংযোগ করা হচ্ছে"
+
+#: ../test/nm-online.c:142
+msgid "Time to wait for a connection, in seconds (default is 30)"
+msgstr ""
+"সংযোগ স্থাপনের জন্য অপেক্ষা করার সময়সীময়, সেকেন্ড অনুযায়ী ধার্য (ডিফল্ট মান "
+"৩০ সেকেন্ড)"
+
+#: ../test/nm-online.c:143
+msgid "Exit immediately if NetworkManager is not running or connecting"
+msgstr ""
+"NetworkManager চলমান না হলে অথবা সংযোগ স্থাপন করতে সক্ষম না হলে অবিলম্বে "
+"প্রস্থান করা হবে"
+
+#: ../test/nm-online.c:144
+msgid "Don't print anything"
+msgstr "কিছু প্রদর্শন করা হবে না"
+
+#: ../test/nm-online.c:162
+msgid "Waits for a successful connection in NetworkManager."
+msgstr "NetworkManager-র মধ্যে সফল সংযোগের অপেক্ষা করা হয়।"
+
+#: ../test/nm-online.c:168 ../test/nm-online.c:177
+msgid "Invalid option.  Please use --help to see a list of valid options."
+msgstr ""
+"অবৈধ বিকল্প।  বৈধ বিকল্পগুলির তালিকা দেখার জন্য অনুগ্রহ করে --help প্রয়োগ "
+"করুন।"
+
+#~ msgid "SCOPE"
+#~ msgstr "SCOPE"
+
+#~ msgid "DBUS-SERVICE"
+#~ msgstr "DBUS-SERVICE"
+
+#~ msgid "system"
+#~ msgstr "সিস্টেম"
+
+#~ msgid "user"
+#~ msgstr "ব্যবহারকারী"
+
+#~ msgid "System connections"
+#~ msgstr "সিস্টেমের সংযোগ"
+
+#~ msgid "User connections"
+#~ msgstr "ব্যবহারকারীর সংযোগ"
+
+#~ msgid "state: %s\n"
+#~ msgstr "অবস্থা: %s\n"
+
+#~ msgid "Connection activated\n"
+#~ msgstr "সংযোগ সক্রিয় করা হয়েছে\n"
+
+#~ msgid "state: %s (%d)\n"
+#~ msgstr "অবস্থা: %s (%d)\n"
+
+#~ msgid "Error: Obtaining active connection for '%s' failed."
+#~ msgstr "ত্রুটি: '%s'-র জন্য সক্রিয় সংযোগ প্রাপ্ত করতে ব্যর্থ।"
+
+#~ msgid "Active connection state: %s\n"
+#~ msgstr "সক্রিয় সংযোগের অবস্থা: %s\n"
+
+#~ msgid "Active connection path: %s\n"
+#~ msgstr "সক্রিয় সংযোগের পাথ: %s\n"
+
+#~ msgid "IP4-SETTINGS"
+#~ msgstr "IP4-SETTINGS"
+
+#~ msgid "IP6-SETTINGS"
+#~ msgstr "IP6-SETTINGS"
+
+#~ msgid "PREFIX"
+#~ msgstr "PREFIX"
+
+#~ msgid "unknown)"
+#~ msgstr "অজানা)"
+
+#~ msgid "Device state: %d (%s)\n"
+#~ msgstr "ডিভাইসের অবস্থা: %d (%s)\n"
+
+#~ msgid "not set"
+#~ msgstr "নির্ধারিত হয়নি"
+
+#~ msgid "Allow use of user-specific connections"
+#~ msgstr "ব্যবহারকারীর সুনির্দিষ্ট সংযোগ প্রয়োগের অনুমতি প্রদান করা হবে"
+
+#~ msgid "System policy prevents use of user-specific connections"
+#~ msgstr ""
+#~ "সিস্টেমে ব্যবহৃত নিয়ম-নীতির বিধিনিষেধের কারণে ব্যবহারকারীর সুনির্দিষ্ট সংযোগের "
+#~ "প্রয়োগ করা সম্ভব নয়"
 
+#~ msgid "Auto %s"
+#~ msgstr "স্বয়ংক্রিয় %s"
diff --git a/po/de.po b/po/de.po
index 18248740..b86de96f 100644
--- a/po/de.po
+++ b/po/de.po
@@ -8,27 +8,30 @@
 # Andre Klapper , 2007.
 # Hauke Mehrtens , 2008.
 # Daniel Schury , 2010.
-# Christian Kirbach , 2009, 2010, 2011, 2012.
+# Christian Kirbach , 2009-2012.
 # Daniel Winzen , 2012.
 # Mario Blättermann , 2012.
+# Wolfgang Stöggl , 2012.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: NetworkManager HEAD\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
 "product=NetworkManager&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2012-05-17 03:25+0000\n"
-"PO-Revision-Date: 2012-05-12 20:02+0100\n"
-"Last-Translator: Mario Blättermann \n"
+"POT-Creation-Date: 2012-11-05 03:24+0000\n"
+"PO-Revision-Date: 2012-11-03 08:24+0100\n"
+"Last-Translator: Christian Kirbach \n"
 "Language-Team: Deutsch \n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Gtranslator 2.91.5\n"
 
 #: ../cli/src/common.c:32 ../cli/src/common.c:44 ../cli/src/common.c:52
-#: ../cli/src/common.c:63 ../cli/src/connections.c:125
-#: ../cli/src/connections.c:159
+#: ../cli/src/common.c:63 ../cli/src/connections.c:128
+#: ../cli/src/connections.c:162
 msgid "GROUP"
 msgstr "GRUPPE"
 
@@ -102,7 +105,7 @@ msgstr "wird verbunden (Zweitverbindungen werden gestartet)"
 msgid "connected"
 msgstr "verbunden"
 
-#: ../cli/src/common.c:386 ../cli/src/connections.c:621
+#: ../cli/src/common.c:386 ../cli/src/connections.c:633
 msgid "deactivating"
 msgstr "wird deaktiviert"
 
@@ -110,15 +113,15 @@ msgstr "wird deaktiviert"
 msgid "connection failed"
 msgstr "Verbindung gescheitert"
 
-#: ../cli/src/common.c:390 ../cli/src/connections.c:624
-#: ../cli/src/connections.c:647 ../cli/src/connections.c:1333
-#: ../cli/src/devices.c:612 ../cli/src/network-manager.c:123
+#: ../cli/src/common.c:390 ../cli/src/connections.c:636
+#: ../cli/src/connections.c:659 ../cli/src/connections.c:1351
+#: ../cli/src/devices.c:644 ../cli/src/network-manager.c:123
 #: ../cli/src/network-manager.c:185 ../cli/src/network-manager.c:188
 #: ../cli/src/network-manager.c:197 ../cli/src/network-manager.c:257
 #: ../cli/src/network-manager.c:273 ../cli/src/network-manager.c:431
 #: ../cli/src/network-manager.c:486 ../cli/src/network-manager.c:524
-#: ../cli/src/network-manager.c:563 ../cli/src/settings.c:563
-#: ../cli/src/settings.c:591 ../cli/src/utils.c:531 ../src/main.c:458
+#: ../cli/src/network-manager.c:563 ../cli/src/settings.c:593
+#: ../cli/src/settings.c:621 ../cli/src/utils.c:531 ../src/main.c:458
 #: ../src/main.c:477
 msgid "unknown"
 msgstr "unbekannt"
@@ -145,9 +148,9 @@ msgstr "Das Gerät konnte nicht für die Konfiguration vorbereitet werden"
 
 #: ../cli/src/common.c:414
 msgid ""
-"IP configuration could not be reserved (no available address, timeout, etc)"
+"IP configuration could not be reserved (no available address, timeout, etc.)"
 msgstr ""
-"IP-Konfiguration konnte nicht bezogen werden (Adresse nicht verfügbar, "
+"IP-Konfiguration konnte nicht reserviert werden (keine verfügbare Adresse, "
 "Zeitüberschreitung usw.)"
 
 #: ../cli/src/common.c:417
@@ -332,23 +335,41 @@ msgstr "Das InfiniBand-Gerät unterstützt keinen »Connected«-Modus"
 msgid "A dependency of the connection failed"
 msgstr "Eine Abhängigkeit der Verbindung ist gescheitert"
 
-#: ../cli/src/common.c:551 ../cli/src/devices.c:267 ../cli/src/devices.c:283
-#: ../cli/src/devices.c:403 ../cli/src/devices.c:447
+#: ../cli/src/common.c:552
+msgid "A problem with the RFC 2684 Ethernet over ADSL bridge"
+msgstr "Ein Problem mit RFC 2684-Überbrückung (Ethernet über ADSL)"
+
+#: ../cli/src/common.c:555
+msgid "ModemManager is unavailable"
+msgstr "ModemManager ist nicht verfügbar"
+
+#: ../cli/src/common.c:558
+msgid "The Wi-Fi network could not be found"
+msgstr "Das WLAN konnte nicht gefunden werden"
+
+#: ../cli/src/common.c:561
+#, fuzzy
+#| msgid "A seconadary connection of the base connection failed"
+msgid "A secondary connection of the base connection failed"
+msgstr "Eine Zweitverbindung der Basisverbindung schlug fehl"
+
+#: ../cli/src/common.c:564 ../cli/src/devices.c:294 ../cli/src/devices.c:310
+#: ../cli/src/devices.c:432 ../cli/src/devices.c:476
 msgid "Unknown"
 msgstr "Unbekannt"
 
 #. 0
 #. used only for 'GENERAL' group listing
-#: ../cli/src/connections.c:58 ../cli/src/connections.c:126
-#: ../cli/src/devices.c:103 ../cli/src/devices.c:124 ../cli/src/devices.c:134
-#: ../cli/src/devices.c:144 ../cli/src/devices.c:158 ../cli/src/devices.c:172
-#: ../cli/src/devices.c:194
+#: ../cli/src/connections.c:59 ../cli/src/connections.c:129
+#: ../cli/src/devices.c:107 ../cli/src/devices.c:131 ../cli/src/devices.c:141
+#: ../cli/src/devices.c:151 ../cli/src/devices.c:165 ../cli/src/devices.c:179
+#: ../cli/src/devices.c:201 ../cli/src/devices.c:217 ../cli/src/devices.c:226
 msgid "NAME"
 msgstr "NAME"
 
 #. 0
 #. 1
-#: ../cli/src/connections.c:59 ../cli/src/connections.c:127
+#: ../cli/src/connections.c:60 ../cli/src/connections.c:130
 msgid "UUID"
 msgstr "UUID"
 
@@ -356,28 +377,29 @@ msgstr "UUID"
 #. 0
 #. 1
 #. 2
-#: ../cli/src/connections.c:60 ../cli/src/connections.c:160
-#: ../cli/src/devices.c:69 ../cli/src/devices.c:105 ../cli/src/devices.c:197
+#: ../cli/src/connections.c:61 ../cli/src/connections.c:163
+#: ../cli/src/devices.c:71 ../cli/src/devices.c:109 ../cli/src/devices.c:204
 msgid "TYPE"
 msgstr "TYP"
 
 #. 2
-#: ../cli/src/connections.c:61
+#: ../cli/src/connections.c:62
 msgid "TIMESTAMP"
 msgstr "ZEITSTEMPEL"
 
 #. 3
-#: ../cli/src/connections.c:62
+#: ../cli/src/connections.c:63
 msgid "TIMESTAMP-REAL"
 msgstr "ZEITSTEMPEL-ECHT"
 
 #. 4
-#: ../cli/src/connections.c:63
+#. 13
+#: ../cli/src/connections.c:64 ../cli/src/devices.c:121
 msgid "AUTOCONNECT"
 msgstr "AUTO-VERBINDEN"
 
 #. 5
-#: ../cli/src/connections.c:64
+#: ../cli/src/connections.c:65
 msgid "READONLY"
 msgstr "NUR-LESEN"
 
@@ -386,96 +408,96 @@ msgstr "NUR-LESEN"
 #. 2
 #. 11
 #. 5
-#: ../cli/src/connections.c:65 ../cli/src/connections.c:134
-#: ../cli/src/devices.c:71 ../cli/src/devices.c:184 ../cli/src/devices.c:200
+#: ../cli/src/connections.c:66 ../cli/src/connections.c:137
+#: ../cli/src/devices.c:73 ../cli/src/devices.c:191 ../cli/src/devices.c:207
 msgid "DBUS-PATH"
 msgstr "DBUS-PFAD"
 
 #. 2
-#: ../cli/src/connections.c:128
+#: ../cli/src/connections.c:131
 msgid "DEVICES"
 msgstr "GERÄTE"
 
 #. 3
 #. 1
-#. 6
+#. 8
 #. 1
-#: ../cli/src/connections.c:129 ../cli/src/devices.c:70
-#: ../cli/src/devices.c:110 ../cli/src/network-manager.c:39
+#: ../cli/src/connections.c:132 ../cli/src/devices.c:72
+#: ../cli/src/devices.c:116 ../cli/src/network-manager.c:39
 msgid "STATE"
 msgstr "STATUS"
 
 #. 4
-#: ../cli/src/connections.c:130
+#: ../cli/src/connections.c:133
 msgid "DEFAULT"
 msgstr "VORGABE"
 
 #. 5
-#: ../cli/src/connections.c:131
+#: ../cli/src/connections.c:134
 msgid "DEFAULT6"
 msgstr "STANDARD6"
 
 #. 6
-#: ../cli/src/connections.c:132
+#: ../cli/src/connections.c:135
 msgid "SPEC-OBJECT"
 msgstr "SPEC-OBJECT"
 
 #. 7
 #. 1
-#: ../cli/src/connections.c:133 ../cli/src/connections.c:147
+#: ../cli/src/connections.c:136 ../cli/src/connections.c:150
 msgid "VPN"
 msgstr "VPN"
 
 #. 9
-#: ../cli/src/connections.c:135
+#: ../cli/src/connections.c:138
 msgid "CON-PATH"
 msgstr "CON-PFAD"
 
 #. 10
-#: ../cli/src/connections.c:136
+#: ../cli/src/connections.c:139
 msgid "ZONE"
 msgstr "ZONE"
 
 #. 11
-#: ../cli/src/connections.c:137
+#: ../cli/src/connections.c:140
 msgid "MASTER-PATH"
 msgstr "MASTER-PFAD"
 
-#: ../cli/src/connections.c:145 ../cli/src/devices.c:80
+#: ../cli/src/connections.c:148 ../cli/src/devices.c:82
 msgid "GENERAL"
 msgstr "ALLGEMEIN"
 
 #. 0
-#: ../cli/src/connections.c:146
+#: ../cli/src/connections.c:149
 msgid "IP"
 msgstr "IP"
 
 #. 1
-#: ../cli/src/connections.c:161
+#: ../cli/src/connections.c:164
 msgid "USERNAME"
 msgstr "BENUTZERNAME"
 
 #. 2
-#: ../cli/src/connections.c:162
+#: ../cli/src/connections.c:165
 msgid "GATEWAY"
 msgstr "GATEWAY"
 
 #. 3
-#: ../cli/src/connections.c:163
+#: ../cli/src/connections.c:166
 msgid "BANNER"
 msgstr "BANNER"
 
 #. 4
-#: ../cli/src/connections.c:164
+#: ../cli/src/connections.c:167
 msgid "VPN-STATE"
 msgstr "VPN-STATUS"
 
 #. 5
-#: ../cli/src/connections.c:165
+#: ../cli/src/connections.c:168
 msgid "CFG"
 msgstr "CFG"
 
-#: ../cli/src/connections.c:187
+#: ../cli/src/connections.c:190
 #, c-format
 msgid ""
 "Usage: nmcli con { COMMAND | help }\n"
@@ -502,353 +524,357 @@ msgstr ""
 "  down id  | uuid \n"
 "  delete id  | uuid \n"
 
-#: ../cli/src/connections.c:246 ../cli/src/connections.c:597
+#: ../cli/src/connections.c:249 ../cli/src/connections.c:609
 #, c-format
 msgid "Error: 'con list': %s"
 msgstr "Fehler: »Verb. Liste«: %s"
 
-#: ../cli/src/connections.c:248 ../cli/src/connections.c:599
+#: ../cli/src/connections.c:251 ../cli/src/connections.c:611
 #, c-format
 msgid "Error: 'con list': %s; allowed fields: %s"
 msgstr "Fehler: »Verb. Liste«: %s; erlaubte Felder: %s"
 
-#: ../cli/src/connections.c:256
+#: ../cli/src/connections.c:259
 msgid "Connection details"
 msgstr "Verbindungsinformationen"
 
-#: ../cli/src/connections.c:472
+#: ../cli/src/connections.c:484
 msgid "never"
 msgstr "nie"
 
 #. "CAPABILITIES"
 #. Print header
 #. "WIFI-PROPERTIES"
-#: ../cli/src/connections.c:473 ../cli/src/connections.c:474
-#: ../cli/src/connections.c:711 ../cli/src/connections.c:712
-#: ../cli/src/connections.c:714 ../cli/src/devices.c:411
-#: ../cli/src/devices.c:464 ../cli/src/devices.c:578 ../cli/src/devices.c:579
-#: ../cli/src/devices.c:611 ../cli/src/devices.c:637 ../cli/src/devices.c:638
-#: ../cli/src/devices.c:639 ../cli/src/devices.c:640 ../cli/src/devices.c:641
-#: ../cli/src/network-manager.c:267 ../cli/src/settings.c:657
-#: ../cli/src/settings.c:727 ../cli/src/settings.c:847
-#: ../cli/src/settings.c:1129 ../cli/src/settings.c:1130
-#: ../cli/src/settings.c:1132 ../cli/src/settings.c:1134
-#: ../cli/src/settings.c:1135 ../cli/src/settings.c:1263
-#: ../cli/src/settings.c:1264 ../cli/src/settings.c:1265
-#: ../cli/src/settings.c:1266 ../cli/src/settings.c:1341
-#: ../cli/src/settings.c:1342 ../cli/src/settings.c:1343
-#: ../cli/src/settings.c:1344 ../cli/src/settings.c:1345
-#: ../cli/src/settings.c:1346 ../cli/src/settings.c:1347
-#: ../cli/src/settings.c:1348 ../cli/src/settings.c:1349
-#: ../cli/src/settings.c:1350 ../cli/src/settings.c:1351
-#: ../cli/src/settings.c:1352 ../cli/src/settings.c:1353
-#: ../cli/src/settings.c:1424
+#: ../cli/src/connections.c:485 ../cli/src/connections.c:486
+#: ../cli/src/connections.c:714 ../cli/src/connections.c:715
+#: ../cli/src/connections.c:717 ../cli/src/devices.c:440
+#: ../cli/src/devices.c:493 ../cli/src/devices.c:609 ../cli/src/devices.c:610
+#: ../cli/src/devices.c:611 ../cli/src/devices.c:643 ../cli/src/devices.c:670
+#: ../cli/src/devices.c:671 ../cli/src/devices.c:672 ../cli/src/devices.c:673
+#: ../cli/src/devices.c:674 ../cli/src/network-manager.c:267
+#: ../cli/src/settings.c:712 ../cli/src/settings.c:787
+#: ../cli/src/settings.c:907 ../cli/src/settings.c:1189
+#: ../cli/src/settings.c:1190 ../cli/src/settings.c:1192
+#: ../cli/src/settings.c:1194 ../cli/src/settings.c:1195
+#: ../cli/src/settings.c:1326 ../cli/src/settings.c:1327
+#: ../cli/src/settings.c:1328 ../cli/src/settings.c:1329
+#: ../cli/src/settings.c:1406 ../cli/src/settings.c:1407
+#: ../cli/src/settings.c:1408 ../cli/src/settings.c:1409
+#: ../cli/src/settings.c:1410 ../cli/src/settings.c:1411
+#: ../cli/src/settings.c:1412 ../cli/src/settings.c:1413
+#: ../cli/src/settings.c:1414 ../cli/src/settings.c:1415
+#: ../cli/src/settings.c:1416 ../cli/src/settings.c:1417
+#: ../cli/src/settings.c:1418 ../cli/src/settings.c:1489
 msgid "yes"
 msgstr "ja"
 
-#: ../cli/src/connections.c:473 ../cli/src/connections.c:474
-#: ../cli/src/connections.c:711 ../cli/src/connections.c:712
-#: ../cli/src/connections.c:714 ../cli/src/devices.c:411
-#: ../cli/src/devices.c:464 ../cli/src/devices.c:578 ../cli/src/devices.c:579
-#: ../cli/src/devices.c:611 ../cli/src/devices.c:637 ../cli/src/devices.c:638
-#: ../cli/src/devices.c:639 ../cli/src/devices.c:640 ../cli/src/devices.c:641
-#: ../cli/src/network-manager.c:269 ../cli/src/settings.c:657
-#: ../cli/src/settings.c:659 ../cli/src/settings.c:727
-#: ../cli/src/settings.c:847 ../cli/src/settings.c:1129
-#: ../cli/src/settings.c:1130 ../cli/src/settings.c:1132
-#: ../cli/src/settings.c:1134 ../cli/src/settings.c:1135
-#: ../cli/src/settings.c:1263 ../cli/src/settings.c:1264
-#: ../cli/src/settings.c:1265 ../cli/src/settings.c:1266
-#: ../cli/src/settings.c:1341 ../cli/src/settings.c:1342
-#: ../cli/src/settings.c:1343 ../cli/src/settings.c:1344
-#: ../cli/src/settings.c:1345 ../cli/src/settings.c:1346
-#: ../cli/src/settings.c:1347 ../cli/src/settings.c:1348
-#: ../cli/src/settings.c:1349 ../cli/src/settings.c:1350
-#: ../cli/src/settings.c:1351 ../cli/src/settings.c:1352
-#: ../cli/src/settings.c:1353 ../cli/src/settings.c:1424
+#: ../cli/src/connections.c:485 ../cli/src/connections.c:486
+#: ../cli/src/connections.c:714 ../cli/src/connections.c:715
+#: ../cli/src/connections.c:717 ../cli/src/devices.c:440
+#: ../cli/src/devices.c:493 ../cli/src/devices.c:609 ../cli/src/devices.c:610
+#: ../cli/src/devices.c:611 ../cli/src/devices.c:643 ../cli/src/devices.c:670
+#: ../cli/src/devices.c:671 ../cli/src/devices.c:672 ../cli/src/devices.c:673
+#: ../cli/src/devices.c:674 ../cli/src/network-manager.c:269
+#: ../cli/src/settings.c:712 ../cli/src/settings.c:714
+#: ../cli/src/settings.c:787 ../cli/src/settings.c:907
+#: ../cli/src/settings.c:1189 ../cli/src/settings.c:1190
+#: ../cli/src/settings.c:1192 ../cli/src/settings.c:1194
+#: ../cli/src/settings.c:1195 ../cli/src/settings.c:1326
+#: ../cli/src/settings.c:1327 ../cli/src/settings.c:1328
+#: ../cli/src/settings.c:1329 ../cli/src/settings.c:1406
+#: ../cli/src/settings.c:1407 ../cli/src/settings.c:1408
+#: ../cli/src/settings.c:1409 ../cli/src/settings.c:1410
+#: ../cli/src/settings.c:1411 ../cli/src/settings.c:1412
+#: ../cli/src/settings.c:1413 ../cli/src/settings.c:1414
+#: ../cli/src/settings.c:1415 ../cli/src/settings.c:1416
+#: ../cli/src/settings.c:1417 ../cli/src/settings.c:1418
+#: ../cli/src/settings.c:1489
 msgid "no"
 msgstr "nein"
 
-#: ../cli/src/connections.c:548
+#: ../cli/src/connections.c:560
 msgid "Connection list"
 msgstr "Verbindungsliste"
 
-#: ../cli/src/connections.c:561 ../cli/src/connections.c:1094
-#: ../cli/src/connections.c:1630 ../cli/src/connections.c:1645
-#: ../cli/src/connections.c:1654 ../cli/src/connections.c:1664
-#: ../cli/src/connections.c:1676 ../cli/src/connections.c:1784
-#: ../cli/src/connections.c:1886 ../cli/src/devices.c:1031
-#: ../cli/src/devices.c:1041 ../cli/src/devices.c:1159
-#: ../cli/src/devices.c:1167 ../cli/src/devices.c:1531
-#: ../cli/src/devices.c:1538 ../cli/src/devices.c:1552
-#: ../cli/src/devices.c:1559 ../cli/src/devices.c:1576
-#: ../cli/src/devices.c:1587 ../cli/src/devices.c:1808
-#: ../cli/src/devices.c:1815
+#: ../cli/src/connections.c:573 ../cli/src/connections.c:1110
+#: ../cli/src/connections.c:1648 ../cli/src/connections.c:1663
+#: ../cli/src/connections.c:1672 ../cli/src/connections.c:1682
+#: ../cli/src/connections.c:1694 ../cli/src/connections.c:1802
+#: ../cli/src/connections.c:1904 ../cli/src/devices.c:1121
+#: ../cli/src/devices.c:1131 ../cli/src/devices.c:1249
+#: ../cli/src/devices.c:1257 ../cli/src/devices.c:1621
+#: ../cli/src/devices.c:1628 ../cli/src/devices.c:1642
+#: ../cli/src/devices.c:1649 ../cli/src/devices.c:1666
+#: ../cli/src/devices.c:1677 ../cli/src/devices.c:1898
+#: ../cli/src/devices.c:1905
 #, c-format
 msgid "Error: %s argument is missing."
 msgstr "Fehler: Argument %s fehlt."
 
-#: ../cli/src/connections.c:574
+#: ../cli/src/connections.c:586
 #, c-format
 msgid "Error: %s - no such connection."
 msgstr "Fehler: Verbindung %s existiert nicht."
 
-#: ../cli/src/connections.c:580 ../cli/src/connections.c:1689
-#: ../cli/src/connections.c:1801 ../cli/src/connections.c:1893
-#: ../cli/src/devices.c:815 ../cli/src/devices.c:895 ../cli/src/devices.c:1055
-#: ../cli/src/devices.c:1173 ../cli/src/devices.c:1600
-#: ../cli/src/devices.c:1821
+#: ../cli/src/connections.c:592 ../cli/src/connections.c:1707
+#: ../cli/src/connections.c:1819 ../cli/src/connections.c:1911
+#: ../cli/src/devices.c:905 ../cli/src/devices.c:985 ../cli/src/devices.c:1145
+#: ../cli/src/devices.c:1263 ../cli/src/devices.c:1690
+#: ../cli/src/devices.c:1911
 #, c-format
 msgid "Unknown parameter: %s\n"
 msgstr "Unbekannter Parameter: %s\n"
 
-#: ../cli/src/connections.c:589
+#: ../cli/src/connections.c:601
 #, c-format
 msgid "Error: no valid parameter specified."
 msgstr "Fehler: Es wurde kein gültiger Parameter angegeben."
 
-#: ../cli/src/connections.c:604 ../cli/src/connections.c:1986
-#: ../cli/src/devices.c:2029 ../cli/src/network-manager.c:596
+#: ../cli/src/connections.c:616 ../cli/src/connections.c:2004
+#: ../cli/src/devices.c:2119 ../cli/src/network-manager.c:596
 #, c-format
 msgid "Error: %s."
 msgstr "Fehler: %s."
 
-#: ../cli/src/connections.c:617
+#: ../cli/src/connections.c:629
 msgid "activating"
 msgstr "wird aktiviert"
 
-#: ../cli/src/connections.c:619
+#: ../cli/src/connections.c:631
 msgid "activated"
 msgstr "aktiviert"
 
-#: ../cli/src/connections.c:633
+#: ../cli/src/connections.c:645
 msgid "VPN connecting (prepare)"
 msgstr "VPN wird verbunden (wird vorbereitet)"
 
-#: ../cli/src/connections.c:635
+#: ../cli/src/connections.c:647
 msgid "VPN connecting (need authentication)"
 msgstr "VPN wird verbunden (Legitimierung wird benötigt)"
 
-#: ../cli/src/connections.c:637
+#: ../cli/src/connections.c:649
 msgid "VPN connecting"
 msgstr "VPN wird verbunden"
 
-#: ../cli/src/connections.c:639
+#: ../cli/src/connections.c:651
 msgid "VPN connecting (getting IP configuration)"
 msgstr "VPN wird verbunden (IP-Einstellungen werden ermittelt)"
 
-#: ../cli/src/connections.c:641
+#: ../cli/src/connections.c:653
 msgid "VPN connected"
 msgstr "VPN verbunden"
 
-#: ../cli/src/connections.c:643
+#: ../cli/src/connections.c:655
 msgid "VPN connection failed"
 msgstr "VPN-Verbindung gescheitert"
 
-#: ../cli/src/connections.c:645
+#: ../cli/src/connections.c:657
 msgid "VPN disconnected"
 msgstr "VPN getrennt"
 
-#: ../cli/src/connections.c:898 ../cli/src/connections.c:1122
+#: ../cli/src/connections.c:710 ../cli/src/connections.c:720
+msgid "N/A"
+msgstr "N.V."
+
+#: ../cli/src/connections.c:914 ../cli/src/connections.c:1138
 #, c-format
 msgid "Error: 'con status': %s"
 msgstr "Fehler: »Verb. Status«: %s"
 
-#: ../cli/src/connections.c:900 ../cli/src/connections.c:1124
+#: ../cli/src/connections.c:916 ../cli/src/connections.c:1140
 #, c-format
 msgid "Error: 'con status': %s; allowed fields: %s"
 msgstr "Fehler: »Verb. Status«: %s; erlaubte Felder: %s"
 
-#: ../cli/src/connections.c:908
+#: ../cli/src/connections.c:924
 msgid "Active connection details"
 msgstr "Einzelheiten zur aktiven Verbindung"
 
-#: ../cli/src/connections.c:1044 ../cli/src/connections.c:1704
-#: ../cli/src/connections.c:1816 ../cli/src/connections.c:1907
-#: ../cli/src/devices.c:842 ../cli/src/devices.c:904 ../cli/src/devices.c:1070
-#: ../cli/src/devices.c:1203 ../cli/src/devices.c:1622
-#: ../cli/src/devices.c:1850 ../cli/src/network-manager.c:311
+#: ../cli/src/connections.c:1060 ../cli/src/connections.c:1722
+#: ../cli/src/connections.c:1834 ../cli/src/connections.c:1925
+#: ../cli/src/devices.c:932 ../cli/src/devices.c:994 ../cli/src/devices.c:1160
+#: ../cli/src/devices.c:1293 ../cli/src/devices.c:1712
+#: ../cli/src/devices.c:1940 ../cli/src/network-manager.c:311
 #, 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:1048 ../cli/src/connections.c:1708
-#: ../cli/src/connections.c:1820 ../cli/src/connections.c:1911
-#: ../cli/src/devices.c:846 ../cli/src/devices.c:908 ../cli/src/devices.c:1074
-#: ../cli/src/devices.c:1207 ../cli/src/devices.c:1626
-#: ../cli/src/devices.c:1854 ../cli/src/network-manager.c:315
+#: ../cli/src/connections.c:1064 ../cli/src/connections.c:1726
+#: ../cli/src/connections.c:1838 ../cli/src/connections.c:1929
+#: ../cli/src/devices.c:936 ../cli/src/devices.c:998 ../cli/src/devices.c:1164
+#: ../cli/src/devices.c:1297 ../cli/src/devices.c:1716
+#: ../cli/src/devices.c:1944 ../cli/src/network-manager.c:315
 #, c-format
 msgid "Error: NetworkManager is not running."
 msgstr "Fehler: NetworkManager wird nicht ausgeführt"
 
-#: ../cli/src/connections.c:1080
+#: ../cli/src/connections.c:1096
 msgid "Active connections"
 msgstr "Aktive Verbindungen"
 
-#: ../cli/src/connections.c:1105
+#: ../cli/src/connections.c:1121
 #, c-format
 msgid "Error: '%s' is not an active connection."
 msgstr "Fehler: »%s« ist keine aktive Verbindung."
 
-#: ../cli/src/connections.c:1110
+#: ../cli/src/connections.c:1126
 #, c-format
 msgid "Error: unknown parameter: %s"
 msgstr "Fehler: unbekannter Parameter: %s"
 
-#: ../cli/src/connections.c:1217
+#: ../cli/src/connections.c:1233
 #, c-format
 msgid "no active connection on device '%s'"
 msgstr "Keine aktive Verbindung auf Gerät »%s«"
 
-#: ../cli/src/connections.c:1225
-#, c-format
+#: ../cli/src/connections.c:1241
 msgid "no active connection or device"
 msgstr "Keine aktive Verbindung oder Gerät"
 
-#: ../cli/src/connections.c:1296
+#: ../cli/src/connections.c:1312
 #, c-format
 msgid "device '%s' not compatible with connection '%s'"
 msgstr "Gerät »%s« ist nicht mit der Verbindung »%s« kompatibel"
 
-#: ../cli/src/connections.c:1298
+#: ../cli/src/connections.c:1315
 #, c-format
 msgid "no device found for connection '%s'"
 msgstr "Für die Verbindung »%s« wurde kein Gerät gefunden"
 
-#: ../cli/src/connections.c:1309
+#: ../cli/src/connections.c:1327
 msgid "unknown reason"
 msgstr "unbekannter Grund"
 
-#: ../cli/src/connections.c:1311
+#: ../cli/src/connections.c:1329
 msgid "none"
 msgstr "kein"
 
-#: ../cli/src/connections.c:1313
+#: ../cli/src/connections.c:1331
 msgid "the user was disconnected"
 msgstr "Der Benutzer wurde getrennt"
 
-#: ../cli/src/connections.c:1315
+#: ../cli/src/connections.c:1333
 msgid "the base network connection was interrupted"
 msgstr "Die Basisverbindung wurde unterbrochen"
 
-#: ../cli/src/connections.c:1317
+#: ../cli/src/connections.c:1335
 msgid "the VPN service stopped unexpectedly"
 msgstr "Der VPN-Dienst wurde unerwartet gestoppt"
 
-#: ../cli/src/connections.c:1319
+#: ../cli/src/connections.c:1337
 msgid "the VPN service returned invalid configuration"
 msgstr "Der VPN-Dienst gab ungültige Einstellungen zurück"
 
-#: ../cli/src/connections.c:1321
+#: ../cli/src/connections.c:1339
 msgid "the connection attempt timed out"
 msgstr "Der Verbindungsversuch benötigte zu viel Zeit"
 
-#: ../cli/src/connections.c:1323
+#: ../cli/src/connections.c:1341
 msgid "the VPN service did not start in time"
 msgstr "Der VPN-Dienst wurde nicht rechtzeitig gestartet"
 
-#: ../cli/src/connections.c:1325
+#: ../cli/src/connections.c:1343
 msgid "the VPN service failed to start"
 msgstr "Der VPN-Dienst konnte nicht gestartet werden"
 
-#: ../cli/src/connections.c:1327
+#: ../cli/src/connections.c:1345
 msgid "no valid VPN secrets"
 msgstr "Keine gültigen VPN-Schlüssel"
 
-#: ../cli/src/connections.c:1329
+#: ../cli/src/connections.c:1347
 msgid "invalid VPN secrets"
 msgstr "Ungültige VPN-Schlüssel"
 
-#: ../cli/src/connections.c:1331
+#: ../cli/src/connections.c:1349
 msgid "the connection was removed"
 msgstr "Die Verbindung wurde entfernt"
 
-#: ../cli/src/connections.c:1348 ../cli/src/connections.c:1553
+#: ../cli/src/connections.c:1366 ../cli/src/connections.c:1571
 #, c-format
 msgid "Connection successfully activated (D-Bus active path: %s)\n"
 msgstr "Verbindung wurde erfolgreich aktiviert (aktiver D-Bus-Pfad: %s)\n"
 
 #. Active connection failed and dissapeared, quit.
-#: ../cli/src/connections.c:1353 ../cli/src/connections.c:1454
+#: ../cli/src/connections.c:1371 ../cli/src/connections.c:1472
 #, c-format
 msgid "Error: Connection activation failed."
 msgstr "Fehler: Aktivierung der Verbindung ist gescheitert."
 
-#: ../cli/src/connections.c:1378
+#: ../cli/src/connections.c:1396
 #, c-format
 msgid "VPN connection successfully activated (D-Bus active path: %s)\n"
 msgstr "VPN-Verbindung wurde erfolgreich aktiviert (aktiver D-Bus-Pfad: %s)\n"
 
-#: ../cli/src/connections.c:1386
+#: ../cli/src/connections.c:1404
 #, c-format
 msgid "Error: Connection activation failed: %s."
 msgstr "Fehler: Aktivierung der Verbindung ist gescheitert: %s."
 
-#: ../cli/src/connections.c:1483 ../cli/src/devices.c:964
+#: ../cli/src/connections.c:1501 ../cli/src/devices.c:1054
 #, c-format
 msgid "Error: Timeout %d sec expired."
 msgstr "Fehler: Zeitbeschränkung von %d Sekunden ist abgelaufen."
 
-#: ../cli/src/connections.c:1544
+#: ../cli/src/connections.c:1562
 #, c-format
 msgid "Error: Connection activation failed: %s"
 msgstr "Fehler: Aktivierung der Verbindung ist gescheitert: %s"
 
-#: ../cli/src/connections.c:1638 ../cli/src/connections.c:1792
-#: ../cli/src/connections.c:1920
+#: ../cli/src/connections.c:1656 ../cli/src/connections.c:1810
+#: ../cli/src/connections.c:1938
 #, c-format
 msgid "Error: Unknown connection: %s."
 msgstr "Fehler: Unbekannte Verbindung: %s."
 
-#: ../cli/src/connections.c:1684 ../cli/src/devices.c:1049
-#: ../cli/src/devices.c:1595
+#: ../cli/src/connections.c:1702 ../cli/src/devices.c:1139
+#: ../cli/src/devices.c:1685
 #, c-format
 msgid "Error: timeout value '%s' is not valid."
 msgstr "Fehler: Der Wert »%s« ist keine gültige Zeitangabe."
 
-#: ../cli/src/connections.c:1697 ../cli/src/connections.c:1809
-#: ../cli/src/connections.c:1900
+#: ../cli/src/connections.c:1715 ../cli/src/connections.c:1827
+#: ../cli/src/connections.c:1918
 #, c-format
 msgid "Error: id or uuid has to be specified."
 msgstr "Fehler: id oder uuid müssen angegeben werden."
 
-#: ../cli/src/connections.c:1729
+#: ../cli/src/connections.c:1747
 #, c-format
 msgid "Error: No suitable device found: %s."
 msgstr "Fehler: Es wurde kein passendes Gerät gefunden: %s."
 
-#: ../cli/src/connections.c:1731
+#: ../cli/src/connections.c:1749
 #, c-format
 msgid "Error: No suitable device found."
 msgstr "Fehler: Es wurde kein passendes Gerät gefunden."
 
-#: ../cli/src/connections.c:1845
+#: ../cli/src/connections.c:1863
 #, c-format
 msgid "Warning: Connection not active\n"
 msgstr "Warnung: Verbindung ist nicht aktiv\n"
 
-#: ../cli/src/connections.c:1859
+#: ../cli/src/connections.c:1877
 #, c-format
 msgid "Error: Connection deletion failed: %s"
 msgstr "Fehler: Löschen der Verbindung fehlgeschlagen: %s"
 
-#: ../cli/src/connections.c:1977
+#: ../cli/src/connections.c:1995
 #, c-format
 msgid "Error: 'con' command '%s' is not valid."
 msgstr "Fehler: Der »con«-Befehl »%s« ist ungültig."
 
-#: ../cli/src/connections.c:2045
+#: ../cli/src/connections.c:2063
 #, c-format
 msgid "Error: could not connect to D-Bus."
 msgstr "Fehler: Verbindung zu D-Bus konnte nicht hergestellt werden."
 
-#: ../cli/src/connections.c:2053
+#: ../cli/src/connections.c:2071
 #, c-format
 msgid "Error: Could not get system settings."
 msgstr "Fehler: Systemeinstellungen konnten nicht ermittelt werden."
 
-#: ../cli/src/connections.c:2063
+#: ../cli/src/connections.c:2081
 #, c-format
 msgid "Error: Can't obtain connections: settings service is not running."
 msgstr ""
@@ -858,230 +884,260 @@ msgstr ""
 #. 0
 #. 9
 #. 3
-#: ../cli/src/devices.c:68 ../cli/src/devices.c:104 ../cli/src/devices.c:182
-#: ../cli/src/devices.c:198
+#: ../cli/src/devices.c:70 ../cli/src/devices.c:108 ../cli/src/devices.c:189
+#: ../cli/src/devices.c:205
 msgid "DEVICE"
 msgstr "GERÄT"
 
 #. 0
-#: ../cli/src/devices.c:81
+#: ../cli/src/devices.c:83
 msgid "CAPABILITIES"
 msgstr "RESSOURCEN"
 
 #. 1
-#: ../cli/src/devices.c:82
+#: ../cli/src/devices.c:84
 msgid "WIFI-PROPERTIES"
 msgstr "WLAN-EIGENSCHAFTEN"
 
 #. 2
-#: ../cli/src/devices.c:83
+#: ../cli/src/devices.c:85
 msgid "AP"
 msgstr "AP"
 
 #. 3
-#: ../cli/src/devices.c:84
+#: ../cli/src/devices.c:86
 msgid "WIRED-PROPERTIES"
 msgstr "KABEL-EIGENSCHAFTEN"
 
 #. 4
-#: ../cli/src/devices.c:85
+#: ../cli/src/devices.c:87
 msgid "WIMAX-PROPERTIES"
 msgstr "WIMAX-EIGENSCHAFTEN"
 
 #. 5
 #. 0
-#: ../cli/src/devices.c:86 ../cli/src/devices.c:195
+#: ../cli/src/devices.c:88 ../cli/src/devices.c:202
 msgid "NSP"
 msgstr "NSP"
 
 #. 6
-#: ../cli/src/devices.c:87
+#: ../cli/src/devices.c:89
 msgid "IP4"
 msgstr "IP4"
 
 #. 7
-#: ../cli/src/devices.c:88
+#: ../cli/src/devices.c:90
 msgid "DHCP4"
 msgstr "DHCP4"
 
 #. 8
-#: ../cli/src/devices.c:89
+#: ../cli/src/devices.c:91
 msgid "IP6"
 msgstr "IP6"
 
 #. 9
-#: ../cli/src/devices.c:90
+#: ../cli/src/devices.c:92
 msgid "DHCP6"
 msgstr "DHCP6"
 
+#. 10
+#: ../cli/src/devices.c:93
+msgid "BOND"
+msgstr "GEBÜNDELT"
+
+#. 11
+#: ../cli/src/devices.c:94
+msgid "VLAN"
+msgstr "VLAN"
+
 #. 2
-#: ../cli/src/devices.c:106
+#: ../cli/src/devices.c:110
 msgid "VENDOR"
 msgstr "HERSTELLER"
 
 #. 3
-#: ../cli/src/devices.c:107
+#: ../cli/src/devices.c:111
 msgid "PRODUCT"
 msgstr "PRODUKT"
 
 #. 4
-#: ../cli/src/devices.c:108
+#: ../cli/src/devices.c:112
 msgid "DRIVER"
 msgstr "TREIBER"
 
 #. 5
-#: ../cli/src/devices.c:109
+#: ../cli/src/devices.c:113
+msgid "DRIVER-VERSION"
+msgstr "TREIBER-VERSION"
+
+#. 6
+#: ../cli/src/devices.c:114
+msgid "FIRMWARE-VERSION"
+msgstr "FIRMWARE-VERSION"
+
+#. 7
+#: ../cli/src/devices.c:115
 msgid "HWADDR"
 msgstr "HWADDR"
 
-#. 7
-#: ../cli/src/devices.c:111
+#. 9
+#: ../cli/src/devices.c:117
 msgid "REASON"
 msgstr "GRUND"
 
-#. 8
-#: ../cli/src/devices.c:112
+#. 10
+#: ../cli/src/devices.c:118
 msgid "UDI"
 msgstr "UDI"
 
-#. 9
-#: ../cli/src/devices.c:113
+#. 11
+#: ../cli/src/devices.c:119
 msgid "IP-IFACE"
 msgstr "IP-IFACE"
 
-#. 10
-#: ../cli/src/devices.c:114
+#. 12
+#: ../cli/src/devices.c:120
 msgid "NM-MANAGED"
 msgstr "NM-VERWALTET"
 
-#. 11
-#: ../cli/src/devices.c:115
+#. 14
+#: ../cli/src/devices.c:122
 msgid "FIRMWARE-MISSING"
 msgstr "FIRMWARE-FEHLT"
 
-#. 12
-#: ../cli/src/devices.c:116
+#. 15
+#: ../cli/src/devices.c:123
 msgid "CONNECTION"
 msgstr "VERBINDUNG"
 
 #. 0
-#: ../cli/src/devices.c:125
+#: ../cli/src/devices.c:132
 msgid "CARRIER-DETECT"
 msgstr "TRÄGERFREQUENZERKENNUNG"
 
 #. 1
-#: ../cli/src/devices.c:126
+#: ../cli/src/devices.c:133
 msgid "SPEED"
 msgstr "GESCHWINDIGKEIT"
 
 #. 0
-#: ../cli/src/devices.c:135
+#: ../cli/src/devices.c:142
 msgid "CARRIER"
 msgstr "TRÄGERFREQUENZ"
 
 #. 0
-#: ../cli/src/devices.c:145
+#: ../cli/src/devices.c:152
 msgid "WEP"
 msgstr "WEP"
 
 #. 1
-#: ../cli/src/devices.c:146
+#: ../cli/src/devices.c:153
 msgid "WPA"
 msgstr "WPA"
 
 #. 2
-#: ../cli/src/devices.c:147
+#: ../cli/src/devices.c:154
 msgid "WPA2"
 msgstr "WPA2"
 
 #. 3
-#: ../cli/src/devices.c:148
+#: ../cli/src/devices.c:155
 msgid "TKIP"
 msgstr "TKIP"
 
 #. 4
-#: ../cli/src/devices.c:149
+#: ../cli/src/devices.c:156
 msgid "CCMP"
 msgstr "CCMP"
 
 #. 0
-#: ../cli/src/devices.c:159
+#: ../cli/src/devices.c:166
 msgid "CTR-FREQ"
 msgstr "CTR-FREQUENZ"
 
 #. 1
-#: ../cli/src/devices.c:160
+#: ../cli/src/devices.c:167
 msgid "RSSI"
 msgstr "RSSI"
 
 #. 2
-#: ../cli/src/devices.c:161
+#: ../cli/src/devices.c:168
 msgid "CINR"
 msgstr "CINR"
 
 #. 3
-#: ../cli/src/devices.c:162
+#: ../cli/src/devices.c:169
 msgid "TX-POW"
 msgstr "TX-POW"
 
 #. 4
-#: ../cli/src/devices.c:163
+#: ../cli/src/devices.c:170
 msgid "BSID"
 msgstr "BSID"
 
 #. 0
-#: ../cli/src/devices.c:173
+#: ../cli/src/devices.c:180
 msgid "SSID"
 msgstr "SSID"
 
 #. 1
-#: ../cli/src/devices.c:174
+#: ../cli/src/devices.c:181
 msgid "BSSID"
 msgstr "BSSID"
 
 #. 2
-#: ../cli/src/devices.c:175
+#: ../cli/src/devices.c:182
 msgid "MODE"
 msgstr "MODUS"
 
 #. 3
-#: ../cli/src/devices.c:176
+#: ../cli/src/devices.c:183
 msgid "FREQ"
 msgstr "FREQUENZ"
 
 #. 4
-#: ../cli/src/devices.c:177
+#: ../cli/src/devices.c:184
 msgid "RATE"
 msgstr "RATE"
 
 #. 5
 #. 1
-#: ../cli/src/devices.c:178 ../cli/src/devices.c:196
+#: ../cli/src/devices.c:185 ../cli/src/devices.c:203
 msgid "SIGNAL"
 msgstr "SIGNAL"
 
 #. 6
-#: ../cli/src/devices.c:179
+#: ../cli/src/devices.c:186
 msgid "SECURITY"
 msgstr "SICHERHEIT"
 
 #. 7
-#: ../cli/src/devices.c:180
+#: ../cli/src/devices.c:187
 msgid "WPA-FLAGS"
 msgstr "WPA-SCHALTER"
 
 #. 8
-#: ../cli/src/devices.c:181
+#: ../cli/src/devices.c:188
 msgid "RSN-FLAGS"
 msgstr "RSN-SCHALTER"
 
 #. 10
 #. 4
-#: ../cli/src/devices.c:183 ../cli/src/devices.c:199
+#: ../cli/src/devices.c:190 ../cli/src/devices.c:206
 msgid "ACTIVE"
 msgstr "AKTIV"
 
+#. 0
 #: ../cli/src/devices.c:218
+msgid "SLAVES"
+msgstr "SLAVES"
+
+#. 0
+#: ../cli/src/devices.c:227
+msgid "ID"
+msgstr "Kennung"
+
+#: ../cli/src/devices.c:243
 #, c-format
 msgid ""
 "Usage: nmcli dev { COMMAND | help }\n"
@@ -1116,204 +1172,206 @@ msgstr ""
 "  wimax [list [iface ] [nsp ]]\n"
 "\n"
 
-#: ../cli/src/devices.c:316
+#: ../cli/src/devices.c:343
 msgid "(none)"
 msgstr "(keine)"
 
-#: ../cli/src/devices.c:372
+#: ../cli/src/devices.c:399
 #, c-format
 msgid "%u MHz"
 msgstr "%u MHz"
 
-#: ../cli/src/devices.c:373
+#: ../cli/src/devices.c:400
 #, c-format
 msgid "%u MB/s"
 msgstr "%u MB/s"
 
-#: ../cli/src/devices.c:382
+#: ../cli/src/devices.c:409
 msgid "Encrypted: "
 msgstr "Verschlüsselt: "
 
-#: ../cli/src/devices.c:387
+#: ../cli/src/devices.c:414
 msgid "WEP "
 msgstr "WEP"
 
-#: ../cli/src/devices.c:389
+#: ../cli/src/devices.c:416
 msgid "WPA "
 msgstr "WPA"
 
-#: ../cli/src/devices.c:391
+#: ../cli/src/devices.c:418
 msgid "WPA2 "
 msgstr "WPA2"
 
 # Das ergibt z.B. WPA-Enterprise, klingt komisch mit »Unternehmen«
-#: ../cli/src/devices.c:394
+#: ../cli/src/devices.c:421
 msgid "Enterprise "
 msgstr "Enterprise"
 
-#: ../cli/src/devices.c:403
+#: ../cli/src/devices.c:430
 msgid "Ad-Hoc"
 msgstr "Ad-Hoc"
 
-#: ../cli/src/devices.c:403
+#: ../cli/src/devices.c:431
 msgid "Infrastructure"
 msgstr "Infrastuktur"
 
-#: ../cli/src/devices.c:438
+#: ../cli/src/devices.c:467
 msgid "Home"
 msgstr "Zu Hause"
 
-#: ../cli/src/devices.c:441
+#: ../cli/src/devices.c:470
 msgid "Partner"
 msgstr "Partner"
 
-#: ../cli/src/devices.c:444
+# CHECK
+#: ../cli/src/devices.c:473
 msgid "Roaming"
-msgstr "Bereiche wechselnd"
+msgstr "Roaming"
 
-#: ../cli/src/devices.c:516
+#: ../cli/src/devices.c:545
 #, c-format
 msgid "Error: 'dev list': %s"
 msgstr "Fehler: »Geräteliste«: %s"
 
-#: ../cli/src/devices.c:518
+#: ../cli/src/devices.c:547
 #, c-format
 msgid "Error: 'dev list': %s; allowed fields: %s"
 msgstr "Fehler: »Geräteliste«: %s; erlaubte Felder: %s"
 
-#: ../cli/src/devices.c:527
+#: ../cli/src/devices.c:556
 msgid "Device details"
 msgstr "Geräteinformationen"
 
-#: ../cli/src/devices.c:572 ../cli/src/devices.c:573 ../cli/src/devices.c:990
+#: ../cli/src/devices.c:601 ../cli/src/devices.c:604 ../cli/src/devices.c:1080
 #: ../cli/src/utils.c:477
 msgid "(unknown)"
 msgstr "(unbekannt)"
 
-#: ../cli/src/devices.c:581
+#: ../cli/src/devices.c:613
 msgid "not connected"
 msgstr "nicht verbunden"
 
-#: ../cli/src/devices.c:608
+#: ../cli/src/devices.c:640
 #, c-format
 msgid "%u Mb/s"
 msgstr "%u Mb/s"
 
 #. Print header
 #. "WIRED-PROPERTIES"
-#: ../cli/src/devices.c:681
+#: ../cli/src/devices.c:714
 msgid "on"
 msgstr "an"
 
-#: ../cli/src/devices.c:681
+#: ../cli/src/devices.c:714
 msgid "off"
 msgstr "aus"
 
-#: ../cli/src/devices.c:832
+#: ../cli/src/devices.c:922
 #, c-format
 msgid "Error: 'dev status': %s"
 msgstr "Fehler: »Gerätestatus«: %s"
 
-#: ../cli/src/devices.c:834
+#: ../cli/src/devices.c:924
 #, c-format
 msgid "Error: 'dev status': %s; allowed fields: %s"
 msgstr "Fehler: »Gerätestatus«: %s; erlaubte Felder: %s"
 
-#: ../cli/src/devices.c:857
+#: ../cli/src/devices.c:947
 msgid "Status of devices"
 msgstr "Status der Geräte"
 
-#: ../cli/src/devices.c:888
+#: ../cli/src/devices.c:978
 #, c-format
 msgid "Error: '%s' argument is missing."
 msgstr "Fehler: Argument »%s« fehlt."
 
-#: ../cli/src/devices.c:929 ../cli/src/devices.c:1094
-#: ../cli/src/devices.c:1235 ../cli/src/devices.c:1882
+#: ../cli/src/devices.c:1019 ../cli/src/devices.c:1184
+#: ../cli/src/devices.c:1325 ../cli/src/devices.c:1972
 #, c-format
 msgid "Error: Device '%s' not found."
 msgstr "Fehler: Gerät »%s« wurde nicht gefunden."
 
-#: ../cli/src/devices.c:952
+#: ../cli/src/devices.c:1042
 #, c-format
 msgid "Success: Device '%s' successfully disconnected."
 msgstr "Erfolg: Gerät »%s« wurde erfolgreich getrennt."
 
-#: ../cli/src/devices.c:987
+#: ../cli/src/devices.c:1077
 #, 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:1000
+#: ../cli/src/devices.c:1090
 #, c-format
 msgid "Device '%s' has been disconnected.\n"
 msgstr "Gerät »%s« wurde getrennt.\n"
 
-#: ../cli/src/devices.c:1063
+#: ../cli/src/devices.c:1153
 #, c-format
 msgid "Error: iface has to be specified."
 msgstr "Fehler: Es muss eine Schnittstelle angegeben werden."
 
-#: ../cli/src/devices.c:1193
+#: ../cli/src/devices.c:1283
 #, c-format
 msgid "Error: 'dev wifi': %s"
 msgstr "Fehler: »Geräte-WLAN«: %s"
 
-#: ../cli/src/devices.c:1195
+#: ../cli/src/devices.c:1285
 #, c-format
 msgid "Error: 'dev wifi': %s; allowed fields: %s"
 msgstr "Fehler: »Geräte-WLAN«: %s; erlaubte Felder: %s"
 
-#: ../cli/src/devices.c:1218
+#: ../cli/src/devices.c:1308
 msgid "WiFi scan list"
 msgstr "Suchliste des WLAN"
 
-#: ../cli/src/devices.c:1255 ../cli/src/devices.c:1309
+#: ../cli/src/devices.c:1345 ../cli/src/devices.c:1399
 #, c-format
 msgid "Error: Access point with bssid '%s' not found."
 msgstr "Fehler: Zugangspunkt mit der BSSID »%s« nicht gefunden."
 
-#: ../cli/src/devices.c:1272
+#: ../cli/src/devices.c:1362
 #, 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:1340 ../cli/src/devices.c:1386
+#: ../cli/src/devices.c:1430 ../cli/src/devices.c:1476
 #, c-format
 msgid "Connection with UUID '%s' created and activated on device '%s'\n"
 msgstr ""
-"Verbindung mit der UUID »%s« wurde erstellt und auf dem Gerät »%s« aktiviert\n"
+"Verbindung mit der UUID »%s« wurde erstellt und auf dem Gerät »%s« "
+"aktiviert\n"
 
-#: ../cli/src/devices.c:1345
+#: ../cli/src/devices.c:1435
 #, c-format
 msgid "Error: Connection activation failed: (%d) %s."
 msgstr "Fehler: Aktivierung der Verbindung ist gescheitert: (%d) %s."
 
-#: ../cli/src/devices.c:1370
+#: ../cli/src/devices.c:1460
 #, c-format
 msgid "Error: Failed to add/activate new connection: (%d) %s"
 msgstr ""
-"Fehler: Neue Verbindung konnte nicht hinzugefügt und aktiviert werden: (%d) %"
-"s"
+"Fehler: Neue Verbindung konnte nicht hinzugefügt und aktiviert werden: (%d) "
+"%s"
 
-#: ../cli/src/devices.c:1378
+#: ../cli/src/devices.c:1468
 #, c-format
 msgid "Error: Failed to add/activate new connection: Unknown error"
 msgstr ""
 "Fehler: Neue Verbindung konnte nicht hinzugefügt und aktiviert werden: "
 "Unbekannter Fehler"
 
-#: ../cli/src/devices.c:1522
+#: ../cli/src/devices.c:1612
 #, c-format
 msgid "Error: SSID or BSSID are missing."
 msgstr "Fehler: SSID oder BSSID fehlt."
 
-#: ../cli/src/devices.c:1545
+#: ../cli/src/devices.c:1635
 #, c-format
 msgid "Error: bssid argument value '%s' is not a valid BSSID."
 msgstr "Fehler: Der Wert »%s« des BSSID-Arguments ist keine gültige BSSID."
 
-#: ../cli/src/devices.c:1569
+#: ../cli/src/devices.c:1659
 #, c-format
 msgid ""
 "Error: wep-key-type argument value '%s' is invalid, use 'key' or 'phrase'."
@@ -1321,78 +1379,78 @@ msgstr ""
 "Fehler: Wert des Arguments wep-key-type »%s« ist ungültig, verwenden Sie "
 "stattdessen »key« oder »phrase«"
 
-#: ../cli/src/devices.c:1609
+#: ../cli/src/devices.c:1699
 #, c-format
 msgid "Error: BSSID to connect to (%s) differs from bssid argument (%s)."
 msgstr ""
-"Fehler: BSSID für die Verbindung (%s) entspricht nicht dem bssid-Argument (%"
-"s)."
+"Fehler: BSSID für die Verbindung (%s) entspricht nicht dem bssid-Argument "
+"(%s)."
 
-#: ../cli/src/devices.c:1615
+#: ../cli/src/devices.c:1705
 #, c-format
 msgid "Error: Parameter '%s' is neither SSID nor BSSID."
 msgstr "Fehler: Parameter »%s« ist weder SSID noch BSSID."
 
-#: ../cli/src/devices.c:1644
+#: ../cli/src/devices.c:1734
 #, c-format
 msgid "Error: Device '%s' is not a Wi-Fi device."
 msgstr "Fehler: Gerät »%s« ist kein WLAN-Gerät."
 
-#: ../cli/src/devices.c:1646
+#: ../cli/src/devices.c:1736
 #, c-format
 msgid "Error: No Wi-Fi device found."
 msgstr "Fehler: Es wurde kein WLAN-Gerät gefunden."
 
-#: ../cli/src/devices.c:1664
+#: ../cli/src/devices.c:1754
 #, c-format
 msgid "Error: No network with SSID '%s' found."
 msgstr "Fehler: Es wurde kein Netzwerk mit SSID »%s« gefunden."
 
-#: ../cli/src/devices.c:1666
+#: ../cli/src/devices.c:1756
 #, c-format
 msgid "Error: No access point with BSSID '%s' found."
 msgstr "Fehler: Es wurde kein Zugangspunkt mit BSSID »%s« gefunden."
 
-#: ../cli/src/devices.c:1764
+#: ../cli/src/devices.c:1854
 #, 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:1840
+#: ../cli/src/devices.c:1930
 #, c-format
 msgid "Error: 'dev wimax': %s"
 msgstr "Fehler: »Gerät Wimax«: %s"
 
-#: ../cli/src/devices.c:1842
+#: ../cli/src/devices.c:1932
 #, c-format
 msgid "Error: 'dev wimax': %s; allowed fields: %s"
 msgstr "Fehler: »Gerät Wimax«: %s; erlaubte Felder: %s"
 
-#: ../cli/src/devices.c:1865
+#: ../cli/src/devices.c:1955
 msgid "WiMAX NSP list"
 msgstr "WiMAX NSP-Liste"
 
-#: ../cli/src/devices.c:1902
+#: ../cli/src/devices.c:1992
 #, c-format
 msgid "Error: NSP with name '%s' not found."
 msgstr "Fehler: NSP namens »%s« wurde nicht gefunden."
 
-#: ../cli/src/devices.c:1913
+#: ../cli/src/devices.c:2003
 #, 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:1944
+#: ../cli/src/devices.c:2034
 #, c-format
 msgid "Error: Access point with nsp '%s' not found."
 msgstr "Fehler: Zugangspunkt mit NSP »%s« nicht gefunden."
 
-#: ../cli/src/devices.c:1971
+#: ../cli/src/devices.c:2061
 #, 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:2021
+#: ../cli/src/devices.c:2111
 #, c-format
 msgid "Error: 'dev' command '%s' is not valid."
 msgstr "Fehler: Der Befehl »%s« für »dev« ist ungültig."
@@ -1547,7 +1605,7 @@ msgid "not running"
 msgstr "wird nicht ausgeführt"
 
 # Könnte auch Legitimierung sein. Der kontext entscheidet. -ck
-# Sieht entweder nach lausigen Englischkenntnissen oder nach einem irrtümlicherweise als übersetzbar markierten String aus. 
+# Sieht entweder nach lausigen Englischkenntnissen oder nach einem irrtümlicherweise als übersetzbar markierten String aus.
 #: ../cli/src/network-manager.c:271
 #, fuzzy
 #| msgid "auto"
@@ -1588,7 +1646,8 @@ msgstr "Fehler beim schlafen gehen: %s"
 #, c-format
 msgid "Error: '--fields' value '%s' is not valid here; allowed fields: %s"
 msgstr ""
-"Fehler: Der Wert »%s« für »--fields« ist hier nicht gültig; erlaubte Felder: %s"
+"Fehler: Der Wert »%s« für »--fields« ist hier nicht gültig; erlaubte Felder: "
+"%s"
 
 #: ../cli/src/network-manager.c:424
 msgid "Networking enabled"
@@ -1646,7 +1705,7 @@ msgstr "Fehler: Ungültiger »wimax«-Parameter: »%s«."
 msgid "Error: 'nm' command '%s' is not valid."
 msgstr "Fehler: Der Befehl »%s« für »nm« ist ungültig."
 
-#: ../cli/src/nmcli.c:64
+#: ../cli/src/nmcli.c:76
 #, c-format
 msgid ""
 "Usage: %s [OPTIONS] OBJECT { COMMAND | help }\n"
@@ -1689,170 +1748,180 @@ msgstr ""
 "  dev         Von NetworkManager verwaltete Verbindungen\n"
 "\n"
 
-#: ../cli/src/nmcli.c:109
+#: ../cli/src/nmcli.c:121
 #, 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:139
+#: ../cli/src/nmcli.c:151
 #, c-format
 msgid "Error: Option '--terse' is specified the second time."
 msgstr "Fehler: Option »---terse« wurde zweimal gesetzt."
 
-#: ../cli/src/nmcli.c:144
+#: ../cli/src/nmcli.c:156
 #, c-format
 msgid "Error: Option '--terse' is mutually exclusive with '--pretty'."
 msgstr "Fehler: Option »--terse« schließt »--pretty« aus."
 
-#: ../cli/src/nmcli.c:152
+#: ../cli/src/nmcli.c:164
 #, c-format
 msgid "Error: Option '--pretty' is specified the second time."
 msgstr "Fehler: Option »--pretty« wurde zweimal gesetzt."
 
-#: ../cli/src/nmcli.c:157
+#: ../cli/src/nmcli.c:169
 #, c-format
 msgid "Error: Option '--pretty' is mutually exclusive with '--terse'."
 msgstr "Fehler: Option »--pretty« schließt »--terse« aus."
 
-#: ../cli/src/nmcli.c:167 ../cli/src/nmcli.c:183
+#: ../cli/src/nmcli.c:179 ../cli/src/nmcli.c:195
 #, c-format
 msgid "Error: missing argument for '%s' option."
 msgstr "Fehler: Fehlendes Argument für die Option »%s«."
 
-#: ../cli/src/nmcli.c:176 ../cli/src/nmcli.c:192
+#: ../cli/src/nmcli.c:188 ../cli/src/nmcli.c:204
 #, c-format
 msgid "Error: '%s' is not valid argument for '%s' option."
 msgstr "Fehler: »%s« ist kein gültiges Argument für die Option »%s«."
 
-#: ../cli/src/nmcli.c:199
+#: ../cli/src/nmcli.c:211
 #, c-format
 msgid "Error: fields for '%s' options are missing."
 msgstr "Fehler: Felder für die Option »%s« fehlen."
 
-#: ../cli/src/nmcli.c:207
+#: ../cli/src/nmcli.c:219
 #, c-format
 msgid "nmcli tool, version %s\n"
 msgstr "nmcli-Werkzeug, Version %s\n"
 
-#: ../cli/src/nmcli.c:213
+#: ../cli/src/nmcli.c:225
 #, 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:232
+#: ../cli/src/nmcli.c:244
 #, c-format
 msgid "Caught signal %d, shutting down..."
 msgstr "Signal %d wurde empfangen, wird beendet …"
 
-#: ../cli/src/nmcli.c:257
+#: ../cli/src/nmcli.c:269
 msgid "Error: Could not create NMClient object."
 msgstr "Fehler: NMClient-Objekt konnte nicht erstellt werden."
 
-#: ../cli/src/nmcli.c:273
+#: ../cli/src/nmcli.c:285
 msgid "Success"
 msgstr "Erfolg"
 
-#: ../cli/src/settings.c:497
+#: ../cli/src/settings.c:527
 #, c-format
 msgid "%d (hex-ascii-key)"
 msgstr "%d (HEX-ASCII-Schlüssel)"
 
-#: ../cli/src/settings.c:499
+#: ../cli/src/settings.c:529
 #, c-format
 msgid "%d (104/128-bit passphrase)"
 msgstr "%d (104/128-bit-Passphrase)"
 
-#: ../cli/src/settings.c:502
+#: ../cli/src/settings.c:532 ../cli/src/settings.c:660
 #, c-format
 msgid "%d (unknown)"
 msgstr "%d (unbekannt)"
 
-#: ../cli/src/settings.c:528
+#: ../cli/src/settings.c:558
 msgid "0 (unknown)"
 msgstr "0 (unbekannt)"
 
-#: ../cli/src/settings.c:534
+#: ../cli/src/settings.c:564
 msgid "any, "
 msgstr "jede,"
 
-#: ../cli/src/settings.c:536
+#: ../cli/src/settings.c:566
 msgid "900 MHz, "
 msgstr "900 MHz,"
 
-#: ../cli/src/settings.c:538
+#: ../cli/src/settings.c:568
 msgid "1800 MHz, "
 msgstr "1800 MHz,"
 
-#: ../cli/src/settings.c:540
+#: ../cli/src/settings.c:570
 msgid "1900 MHz, "
 msgstr "1900 MHz,"
 
-#: ../cli/src/settings.c:542
+#: ../cli/src/settings.c:572
 msgid "850 MHz, "
 msgstr "850 MHz,"
 
-#: ../cli/src/settings.c:544
+#: ../cli/src/settings.c:574
 msgid "WCDMA 3GPP UMTS 2100 MHz, "
 msgstr "WCDMA 3GPP UMTS 2100 MHz, "
 
-#: ../cli/src/settings.c:546
+#: ../cli/src/settings.c:576
 msgid "WCDMA 3GPP UMTS 1800 MHz, "
 msgstr "WCDMA 3GPP UMTS 1800 MHz, "
 
-#: ../cli/src/settings.c:548
+#: ../cli/src/settings.c:578
 msgid "WCDMA 3GPP UMTS 1700/2100 MHz, "
 msgstr "WCDMA 3GPP UMTS 1700/2100 MHz, "
 
-#: ../cli/src/settings.c:550
+#: ../cli/src/settings.c:580
 msgid "WCDMA 3GPP UMTS 800 MHz, "
 msgstr "WCDMA 3GPP UMTS 800 MHz, "
 
-#: ../cli/src/settings.c:552
+#: ../cli/src/settings.c:582
 msgid "WCDMA 3GPP UMTS 850 MHz, "
 msgstr "WCDMA 3GPP UMTS 850 MHz, "
 
-#: ../cli/src/settings.c:554
+#: ../cli/src/settings.c:584
 msgid "WCDMA 3GPP UMTS 900 MHz, "
 msgstr "WCDMA 3GPP UMTS 900 MHz, "
 
-#: ../cli/src/settings.c:556
+#: ../cli/src/settings.c:586
 msgid "WCDMA 3GPP UMTS 1700 MHz, "
 msgstr "WCDMA 3GPP UMTS 1700 MHz, "
 
-#: ../cli/src/settings.c:558
+#: ../cli/src/settings.c:588
 msgid "WCDMA 3GPP UMTS 1900 MHz, "
 msgstr "WCDMA 3GPP UMTS 1900 MHz, "
 
-#: ../cli/src/settings.c:560
+#: ../cli/src/settings.c:590
 msgid "WCDMA 3GPP UMTS 2600 MHz, "
 msgstr "WCDMA 3GPP UMTS 2600 MHz, "
 
-#: ../cli/src/settings.c:578
+#: ../cli/src/settings.c:608
 msgid "0 (NONE)"
 msgstr "0 (KEINES)"
 
-#: ../cli/src/settings.c:584
+#: ../cli/src/settings.c:614
 msgid "REORDER_HEADERS, "
 msgstr "REORDER_HEADERS, "
 
-#: ../cli/src/settings.c:586
+#: ../cli/src/settings.c:616
 msgid "GVRP, "
 msgstr "GVRP, "
 
-#: ../cli/src/settings.c:588
+#: ../cli/src/settings.c:618
 msgid "LOOSE_BINDING, "
 msgstr "LOOSE_BINDING, "
 
-#: ../cli/src/settings.c:731 ../cli/src/settings.c:927
-#: ../cli/src/settings.c:1631
+#: ../cli/src/settings.c:654
+#, c-format
+msgid "%d (disabled)"
+msgstr "%d (deaktiviert)"
+
+#: ../cli/src/settings.c:656
+#, c-format
+msgid "%d (enabled, prefer public IP)"
+msgstr "%d (aktiviert, öffentliche IP bevorzugen)"
+
+#: ../cli/src/settings.c:658
+#, c-format
+msgid "%d (enabled, prefer temporary IP)"
+msgstr "%d (aktiviert, temporäre IP bevorzugen)"
+
+#: ../cli/src/settings.c:791 ../cli/src/settings.c:987
+#: ../cli/src/settings.c:1696
 msgid "auto"
 msgstr "auto"
 
-#: ../cli/src/settings.c:921 ../cli/src/settings.c:924
-#: ../cli/src/settings.c:925 ../cli/src/utils.c:279
-msgid "not set"
-msgstr "nicht gesetzt"
-
 #: ../cli/src/utils.c:103
 #, c-format
 msgid "Error converting IP4 address '0x%X' to text form"
@@ -1874,9 +1943,8 @@ msgid "invalid field '%s'"
 msgstr "ungültiges Feld »%s«"
 
 #: ../cli/src/utils.c:254
-#, c-format
 msgid "Option '--terse' requires specifying '--fields'"
-msgstr "Optione »--terse« benötigt die Angabe von »--fields«"
+msgstr "Option »--terse« benötigt die Angabe von »--fields«"
 
 #: ../cli/src/utils.c:258
 #, c-format
@@ -1980,7 +2048,7 @@ msgstr ""
 
 #: ../libnm-util/crypto.c:317
 msgid "Failed to decode PKCS#8 private key."
-msgstr "Die Entschlüsselung des privaten  PKCS#8-Schlüssels scheiterte."
+msgstr "Die Entschlüsselung des privaten PKCS#8-Schlüssels scheiterte."
 
 #: ../libnm-util/crypto.c:339 ../libnm-util/crypto.c:625
 #, c-format
@@ -2072,8 +2140,8 @@ msgstr ""
 #, 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."
+"Das Anlegen der symmetrischen Schlüssel zum Entschlüsseln scheiterte: %s / "
+"%s."
 
 #: ../libnm-util/crypto_gnutls.c:190
 #, c-format
@@ -2114,8 +2182,8 @@ msgstr ""
 #, 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."
+"Das Anlegen des symmetrischen Schlüssels zum Verschlüsseln scheiterte: %s / "
+"%s."
 
 #: ../libnm-util/crypto_gnutls.c:312
 #, c-format
@@ -2276,50 +2344,50 @@ 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:2040
+#: ../libnm-util/nm-utils.c:2078
 #, 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:2150
+#: ../libnm-util/nm-utils.c:2188
 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:2162
+#: ../libnm-util/nm-utils.c:2200
 #, 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:2174
+#: ../libnm-util/nm-utils.c:2212
 #, 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:2193
+#: ../libnm-util/nm-utils.c:2231
 #, 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.NetworkManager.policy.in.h:1
+#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:1
 msgid "Enable or disable system networking"
 msgstr "System-Netzwerke aktivieren oder deaktivieren"
 
-#: ../policy/org.freedesktop.NetworkManager.policy.in.h:2
+#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:2
 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:3
+#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:3
 msgid ""
 "Put NetworkManager to sleep or wake it up (should only be used by system "
 "power management)"
@@ -2327,203 +2395,219 @@ msgstr ""
 "NetworkManager in den Schlafzustand versetzen oder daraus aufwecken (Sollte "
 "nur von der System-Energieverwaltung verwendet werden)"
 
-#: ../policy/org.freedesktop.NetworkManager.policy.in.h:4
+#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:4
 msgid "System policy prevents putting NetworkManager to sleep or waking it up"
 msgstr ""
 "Die Systemrichtlinien verhindern das in den Schlaf versetzen oder Aufwecken "
 "von NetworkManager"
 
-#: ../policy/org.freedesktop.NetworkManager.policy.in.h:5
+#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:5
 msgid "Enable or disable WiFi devices"
 msgstr "WLAN-Geräte aktivieren oder deaktivieren"
 
-#: ../policy/org.freedesktop.NetworkManager.policy.in.h:6
+#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:6
 msgid "System policy prevents enabling or disabling WiFi devices"
 msgstr ""
 "Die Systemrichtlinien verhindern die Aktivierung oder Deaktivierung von WLAN-"
 "Geräten"
 
-#: ../policy/org.freedesktop.NetworkManager.policy.in.h:7
+#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:7
 msgid "Enable or disable mobile broadband devices"
 msgstr "Mobile Breitbandgeräte aktivieren oder deaktivieren"
 
-#: ../policy/org.freedesktop.NetworkManager.policy.in.h:8
+#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:8
 msgid "System policy prevents enabling or disabling mobile broadband devices"
 msgstr ""
 "Die Systemrichtlinien verhindern die Aktivierung oder Deaktivierung mobiler "
 "Breitbandgeräte"
 
-#: ../policy/org.freedesktop.NetworkManager.policy.in.h:9
+#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:9
 msgid "Enable or disable WiMAX mobile broadband devices"
 msgstr "Mobile WiMAX-Breitbandgeräte aktivieren oder deaktivieren"
 
-#: ../policy/org.freedesktop.NetworkManager.policy.in.h:10
+#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:10
 msgid ""
 "System policy prevents enabling or disabling WiMAX mobile broadband devices"
 msgstr ""
 "Die Systemrichtlinien verhindern die Aktivierung oder Deaktivierung mobiler "
 "WiMAX-Breitbandgeräte"
 
-#: ../policy/org.freedesktop.NetworkManager.policy.in.h:11
+#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:11
 msgid "Allow control of network connections"
 msgstr "Die Kontrolle von Netzwerkverbindungen erlauben"
 
-#: ../policy/org.freedesktop.NetworkManager.policy.in.h:12
+#: ../policy/org.freedesktop.NetworkManager.policy.in.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:13
+#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:13
 msgid "Connection sharing via a protected WiFi network"
 msgstr "Verbindungsfreigabe über ein geschütztes WLAN-Netzwerk"
 
-#: ../policy/org.freedesktop.NetworkManager.policy.in.h:14
+#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:14
 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.NetworkManager.policy.in.h:15
+#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:15
 msgid "Connection sharing via an open WiFi network"
 msgstr "Verbindungsfreigabe über ein offenes WLAN-Netzwerk"
 
-#: ../policy/org.freedesktop.NetworkManager.policy.in.h:16
+#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:16
 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:17
+#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:17
 msgid "Modify personal network connections"
 msgstr "Eigene Netzwerkverbindungen bearbeiten"
 
-#: ../policy/org.freedesktop.NetworkManager.policy.in.h:18
+#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:18
 msgid "System policy prevents modification of personal network settings"
 msgstr ""
 "Die Systemrichtlinien verhindern das Bearbeiten von eigenen "
 "Netzwerkeinstellungen"
 
-#: ../policy/org.freedesktop.NetworkManager.policy.in.h:19
+#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:19
 msgid "Modify network connections for all users"
 msgstr "Netzwerkverbindungen für alle Benutzer bearbeiten"
 
-#: ../policy/org.freedesktop.NetworkManager.policy.in.h:20
+#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:20
 msgid "System policy prevents modification of network settings for all users"
 msgstr ""
 "Die Systemrichtlinien verhindern das Bearbeiten von Netzwerkeinstellungen "
 "für alle Benutzer"
 
-#: ../policy/org.freedesktop.NetworkManager.policy.in.h:21
+#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:21
 msgid "Modify persistent system hostname"
 msgstr "Den ständigen Rechnernamen des Systems bearbeiten"
 
-#: ../policy/org.freedesktop.NetworkManager.policy.in.h:22
+#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:22
 msgid "System policy prevents modification of the persistent system hostname"
 msgstr ""
 "Die Systemrichtlinien verhindern das Bearbeiten des ständigen Rechnernamens "
 "des Systems"
 
-#: ../src/main.c:156
+#: ../src/main.c:158
 #, c-format
 msgid "Failed to set signal mask: %d"
 msgstr "Fehler beim Festlegen der Signalmaske: %d"
 
-#: ../src/main.c:163
+#: ../src/main.c:167
 #, c-format
 msgid "Failed to create signal handling thread: %d"
 msgstr "Erstellen des Threads für die Signalbehandlung schlug fehl: %d"
 
-#: ../src/main.c:178
+#: ../src/main.c:182
 #, c-format
 msgid "Opening %s failed: %s\n"
 msgstr "Öffnen von %s fehlgeschlagen: %s\n"
 
-#: ../src/main.c:184
+#: ../src/main.c:188
 #, c-format
 msgid "Writing to %s failed: %s\n"
 msgstr "Schreiben nach %s gescheitert: %s\n"
 
-#: ../src/main.c:189
+#: ../src/main.c:193
 #, c-format
 msgid "Closing %s failed: %s\n"
 msgstr "Schließen von %s fehlgeschlagen: %s\n"
 
-#: ../src/main.c:232
+#: ../src/main.c:236
 #, c-format
 msgid "NetworkManager is already running (pid %ld)\n"
 msgstr "NetworkManager läuft bereits (pid %ld)\n"
 
-#: ../src/main.c:372
+#: ../src/main.c:376
 msgid "Print NetworkManager version and exit"
 msgstr "NetworkManager-Version anzeigen und beenden"
 
-#: ../src/main.c:373
+#: ../src/main.c:377
 msgid "Don't become a daemon"
 msgstr "Nicht zum Hintergrunddienst werden"
 
-#: ../src/main.c:374
+#: ../src/main.c:378
 msgid "Make all warnings fatal"
 msgstr "Alle Warnungen als fatal betrachten"
 
-#: ../src/main.c:375
+#: ../src/main.c:379
 msgid "Specify the location of a PID file"
 msgstr "Geben Sie den Ort der PID-Datei an"
 
-#: ../src/main.c:375
+#: ../src/main.c:379
 msgid "filename"
 msgstr "Dateiname"
 
-#: ../src/main.c:376
+#: ../src/main.c:380
 msgid "State file location"
 msgstr "Speicherort der Statusdatei"
 
-#: ../src/main.c:376
+#: ../src/main.c:380
 msgid "/path/to/state.file"
 msgstr "/pfad/zur/status.datei"
 
-#: ../src/main.c:377
+#: ../src/main.c:381
 msgid "Config file location"
 msgstr "Speicherort der Konfigurationsdatei"
 
-#: ../src/main.c:377
+#: ../src/main.c:381
 msgid "/path/to/config.file"
 msgstr "/pfad/zur/config.datei"
 
-#: ../src/main.c:378
+#: ../src/main.c:382
 msgid "List of plugins separated by ','"
 msgstr "Mit »,« getrennte Liste von Erweiterungen"
 
-#: ../src/main.c:378
+#: ../src/main.c:382
 msgid "plugin1,plugin2"
 msgstr "erweiterung1,erweiterung2"
 
 #. Translators: Do not translate the values in the square brackets
-#: ../src/main.c:380
+#: ../src/main.c:384
 msgid "Log level: one of [ERR, WARN, INFO, DEBUG]"
 msgstr "Protokollierungsstufe: Möglich sind [ERR, WARN, INFO, DEBUG]"
 
 #. Translators: Do not translate the values in the square brackets
-#: ../src/main.c:383
+#: ../src/main.c:387
 msgid ""
 "Log domains separated by ',': any combination of\n"
-"                                          [NONE,HW,RFKILL,ETHER,WIFI,BT,MB,"
-"DHCP4,DHCP6,PPP,\n"
-"                                           WIFI_SCAN,IP4,IP6,AUTOIP4,DNS,VPN,"
-"SHARING,SUPPLICANT,\n"
-"                                           AGENTS,SETTINGS,SUSPEND,CORE,"
-"DEVICE,OLPC,WIMAX,\n"
-"                                           INFINIBAND,FIREWALL]"
-msgstr ""
-"Protokolldomänen, getrennt durch »,«: jede Kombination von\n"
-"                                          [NONE,HW,RFKILL,ETHER,WIFI,BT,MB,"
-"DHCP4,DHCP6,PPP,\n"
-"                                           WIFI_SCAN,IP4,IP6,AUTOIP4,DNS,VPN,"
-"SHARING,SUPPLICANT,\n"
-"                                           AGENTS,SETTINGS,SUSPEND,CORE,"
-"DEVICE,OLPC,WIMAX,\n"
-"                                           INFINIBAND,FIREWALL]"
-
-#: ../src/main.c:396
+"                                                [NONE,HW,RFKILL,ETHER,WIFI,"
+"BT,MB,DHCP4,DHCP6,PPP,\n"
+"                                                 WIFI_SCAN,IP4,IP6,AUTOIP4,"
+"DNS,VPN,SHARING,SUPPLICANT,\n"
+"                                                 AGENTS,SETTINGS,SUSPEND,"
+"CORE,DEVICE,OLPC,WIMAX,\n"
+"                                                 INFINIBAND,FIREWALL,ADSL]"
+msgstr ""
+"Protokolldomänen, getrennt durch »,«: beliebige Kombination von\n"
+"                                                [NONE,HW,RFKILL,ETHER,WIFI,"
+"BT,MB,DHCP4,DHCP6,PPP,\n"
+"                                                 WIFI_SCAN,IP4,IP6,AUTOIP4,"
+"DNS,VPN,SHARING,SUPPLICANT,\n"
+"                                                 AGENTS,SETTINGS,SUSPEND,"
+"CORE,DEVICE,OLPC,WIMAX,\n"
+"                                                 INFINIBAND,FIREWALL,ADSL]"
+
+#: ../src/main.c:393
+msgid "An http(s) address for checking internet connectivity"
+msgstr "Eine http(s)-Adresse zum Prüfen der Internetverbindung"
+
+#: ../src/main.c:394
+msgid "The interval between connectivity checks (in seconds)"
+msgstr "Das Intervall zwischen Verbindungsprüfungen (in Sekunden)"
+
+#: ../src/main.c:395
+msgid "The expected start of the response"
+msgstr "Der erwartete Start einer Antwort"
+
+#: ../src/main.c:395
+msgid "Bingo!"
+msgstr "Bingo!"
+
+#: ../src/main.c:400
 #, c-format
 msgid "GModules are not supported on your platform!\n"
 msgstr "GModules werden von Ihrer Plattform nicht unterstützt!\n"
@@ -2576,11 +2660,11 @@ msgstr "Statusdatei %s konnte nicht verarbeitet werden: (%d) %s\n"
 msgid "Could not daemonize: %s [error %u]\n"
 msgstr "Hintergrunddienst nicht möglich: %s [error %u]\n"
 
-#: ../src/dhcp-manager/nm-dhcp-dhclient-utils.c:62
+#: ../src/dhcp-manager/nm-dhcp-dhclient-utils.c:61
 msgid "# Created by NetworkManager\n"
 msgstr "# Erstellt von NetworkManager\n"
 
-#: ../src/dhcp-manager/nm-dhcp-dhclient-utils.c:69
+#: ../src/dhcp-manager/nm-dhcp-dhclient-utils.c:68
 #, c-format
 msgid ""
 "# Merged from %s\n"
@@ -2606,47 +2690,52 @@ msgstr "»dhcpcd« konnte nicht gefunden werden."
 msgid "unsupported DHCP client '%s'"
 msgstr "Nicht unterstützter DHCP-Client »%s«"
 
-#: ../src/dns-manager/nm-dns-manager.c:376
+#: ../src/dns-manager/nm-dns-manager.c:375
 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:378
+#: ../src/dns-manager/nm-dns-manager.c:377
 msgid "The nameservers listed below may not be recognized."
 msgstr "Die nachfolgend gelisteten Nameserver werden eventuell nicht erkannt."
 
-#: ../src/logging/nm-logging.c:130
+#: ../src/logging/nm-logging.c:131
 #, c-format
 msgid "Unknown log level '%s'"
 msgstr "Unbekannte Protokollstufe »%s«"
 
-#: ../src/logging/nm-logging.c:155
+#: ../src/logging/nm-logging.c:156
 #, c-format
 msgid "Unknown log domain '%s'"
 msgstr "Unbekannte Protokolldomäne »%s«"
 
-#: ../src/modem-manager/nm-modem-cdma.c:279 ../src/nm-device-bt.c:325
+#: ../src/modem-manager/nm-modem-cdma.c:280 ../src/nm-device-bt.c:351
 #, c-format
 msgid "CDMA connection %d"
 msgstr "CDMA-Verbindung %d"
 
-#: ../src/modem-manager/nm-modem-gsm.c:547 ../src/nm-device-bt.c:321
+#: ../src/modem-manager/nm-modem-gsm.c:558 ../src/nm-device-bt.c:347
 #, c-format
 msgid "GSM connection %d"
 msgstr "GSM-Verbindung %d"
 
-#: ../src/nm-device-bond.c:191
+#: ../src/nm-device-bond.c:192
 #, c-format
 msgid "Bond connection %d"
 msgstr "Gebündelte Verbindung %d"
 
-#: ../src/nm-device-bt.c:296
+#: ../src/nm-device-adsl.c:193
+#, c-format
+msgid "ADSL connection %d"
+msgstr "ADSL-Verbindung %d"
+
+#: ../src/nm-device-bt.c:322
 #, c-format
 msgid "PAN connection %d"
 msgstr "PAN-Verbindung %d"
 
-#: ../src/nm-device-bt.c:329
+#: ../src/nm-device-bt.c:355
 #, c-format
 msgid "DUN connection %d"
 msgstr "DUN-Verbindung %d"
@@ -2666,7 +2755,7 @@ msgstr "Kabelgebundene Verbindung %d"
 msgid "InfiniBand connection %d"
 msgstr "InfiniBand-Verbindung %d"
 
-#: ../src/nm-device-olpc-mesh.c:303
+#: ../src/nm-device-olpc-mesh.c:311
 #, c-format
 msgid "Mesh %d"
 msgstr "Maschennetz %d‬"
@@ -2676,7 +2765,7 @@ msgstr "Maschennetz %d‬"
 msgid "VLAN connection %d"
 msgstr "VLAN-Verbindung %d"
 
-#: ../src/nm-manager.c:661
+#: ../src/nm-manager.c:662
 #, c-format
 msgid "VPN connection %d"
 msgstr "VPN-Verbindung %d"
@@ -2733,10 +2822,43 @@ msgstr "Die Aktualisierung des Verbindungszwischenspeichers schlug fehl: %s"
 msgid "System"
 msgstr "System"
 
-#: ../src/settings/plugins/ifcfg-rh/reader.c:3634
+#: ../src/settings/plugins/ifcfg-rh/reader.c:3663
 msgid "Bond"
 msgstr "Gebündelt"
 
+#: ../test/nm-online.c:111
+#, c-format
+msgid "\rConnecting"
+msgstr "\rWird verbunden"
+
+#: ../test/nm-online.c:142
+msgid "Time to wait for a connection, in seconds (default is 30)"
+msgstr ""
+"Zeit zum Warten auf eine Verbindung, in Sekunden (Voreinstellung ist 30)"
+
+#: ../test/nm-online.c:143
+msgid "Exit immediately if NetworkManager is not running or connecting"
+msgstr ""
+"Sofort beenden, falls NetworkManager nicht ausgeführt wird oder sich nicht "
+"verbindet"
+
+#: ../test/nm-online.c:144
+msgid "Don't print anything"
+msgstr "Nichts ausgeben"
+
+#: ../test/nm-online.c:162
+msgid "Waits for a successful connection in NetworkManager."
+msgstr "Warten auf eine erfolgreiche Verbindung in NetworkManager."
+
+#: ../test/nm-online.c:168 ../test/nm-online.c:177
+msgid "Invalid option.  Please use --help to see a list of valid options."
+msgstr ""
+"Ungültige Option.  Verwenden Sie »--help«, um eine Liste gültiger Optionen "
+"zu erhalten."
+
+#~ msgid "not set"
+#~ msgstr "nicht gesetzt"
+
 #~ msgid "state: %s\n"
 #~ msgstr "Status: %s\n"
 
diff --git a/po/el.po b/po/el.po
index c6db6f79..355249d4 100644
--- a/po/el.po
+++ b/po/el.po
@@ -12,978 +12,1672 @@ 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-08-10 03:25+0000\n"
-"PO-Revision-Date: 2010-09-01 22:08+0300\n"
-"Last-Translator: Simos Xenitellis \n"
+"product=NetworkManager&keywords=I18N+L10N&component=general\n"
+"POT-Creation-Date: 2012-07-25 16:03+0000\n"
+"PO-Revision-Date: 2012-07-26 01:07+0200\n"
+"Last-Translator: Tom Tryfonidis \n"
 "Language-Team: Greek \n"
+"Language: el\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n>1;\n"
 "X-Generator: Lokalize 0.3\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/common.c:32 ../cli/src/common.c:44 ../cli/src/common.c:52
+#: ../cli/src/common.c:63 ../cli/src/connections.c:128
+#: ../cli/src/connections.c:162
+msgid "GROUP"
+msgstr "ΟΜΑΔΑ"
+
+#. 0
+#: ../cli/src/common.c:33 ../cli/src/common.c:53
+msgid "ADDRESS"
+msgstr "ΔΙΕΥΘΥΝΣΗ"
+
+#. 1
+#: ../cli/src/common.c:34 ../cli/src/common.c:54
+msgid "ROUTE"
+msgstr "ROUTE"
+
+#. 2
+#: ../cli/src/common.c:35 ../cli/src/common.c:55
+msgid "DNS"
+msgstr "DNS"
+
+#. 3
+#: ../cli/src/common.c:36 ../cli/src/common.c:56
+msgid "DOMAIN"
+msgstr "ΤΟΜΕΑΣ"
+
+#. 4
+#: ../cli/src/common.c:37
+msgid "WINS"
+msgstr "WINS"
+
+#. 0
+#: ../cli/src/common.c:45 ../cli/src/common.c:64
+msgid "OPTION"
+msgstr "ΕΠΙΛΟΓΗ"
+
+#: ../cli/src/common.c:366
+msgid "unmanaged"
+msgstr "χωρίς διαχείριση"
+
+#: ../cli/src/common.c:368
+msgid "unavailable"
+msgstr "μη διαθέσιμη"
+
+#: ../cli/src/common.c:370 ../cli/src/network-manager.c:120
+msgid "disconnected"
+msgstr "αποσυνδέθηκε"
+
+#: ../cli/src/common.c:372
+msgid "connecting (prepare)"
+msgstr "σύνδεση (προετοιμασία)"
+
+#: ../cli/src/common.c:374
+msgid "connecting (configuring)"
+msgstr "σύνδεση (διαμόρφωση)"
+
+#: ../cli/src/common.c:376
+msgid "connecting (need authentication)"
+msgstr "σύνδεση (απαιτείται πιστοποίηση)"
+
+#: ../cli/src/common.c:378
+msgid "connecting (getting IP configuration)"
+msgstr "σύνδεση (γίνεται λήψη ρυθμίσεων IP)"
+
+#: ../cli/src/common.c:380
+msgid "connecting (checking IP connectivity)"
+msgstr "σύνδεση (γίνεται έλεγχος συνδεσιμότητας της IP)"
+
+#: ../cli/src/common.c:382
+msgid "connecting (starting secondary connections)"
+msgstr "σύνδεση (γίνεται εκκίνηση των δευτερευουσών συνδέσεων)"
+
+#: ../cli/src/common.c:384 ../cli/src/network-manager.c:116
+msgid "connected"
+msgstr "συνδέθηκε"
+
+#: ../cli/src/common.c:386 ../cli/src/connections.c:633
+msgid "deactivating"
+msgstr "απενεργοποίηση"
+
+#: ../cli/src/common.c:388
+msgid "connection failed"
+msgstr "αποτυχία σύνδεσης"
+
+#: ../cli/src/common.c:390 ../cli/src/connections.c:636
+#: ../cli/src/connections.c:659 ../cli/src/connections.c:1351
+#: ../cli/src/devices.c:622 ../cli/src/network-manager.c:123
+#: ../cli/src/network-manager.c:185 ../cli/src/network-manager.c:188
+#: ../cli/src/network-manager.c:197 ../cli/src/network-manager.c:257
+#: ../cli/src/network-manager.c:273 ../cli/src/network-manager.c:431
+#: ../cli/src/network-manager.c:486 ../cli/src/network-manager.c:524
+#: ../cli/src/network-manager.c:563 ../cli/src/settings.c:585
+#: ../cli/src/settings.c:613 ../cli/src/utils.c:531 ../src/main.c:462
+#: ../src/main.c:481
+msgid "unknown"
+msgstr "άγνωστη"
+
+#: ../cli/src/common.c:399
+msgid "No reason given"
+msgstr "Δε δόθηκε αιτία"
+
+#: ../cli/src/common.c:402
+msgid "Unknown error"
+msgstr "Άγνωστο σφάλμα"
+
+#: ../cli/src/common.c:405
+#, fuzzy
+msgid "Device is now managed"
+msgstr "Η συσκευή είναι τώρα με διαχείριση"
+
+#: ../cli/src/common.c:408
+#, fuzzy
+msgid "Device is now unmanaged"
+msgstr "Η συσκευή είναι τώρα χωρίς διαχείριση"
+
+#: ../cli/src/common.c:411
+#, fuzzy
+#| msgid "the VPN service returned invalid configuration"
+msgid "The device could not be readied for configuration"
+msgstr "Αδυναμία εφαρμογής των επιλεγμένων ρυθμίσεων στις οθόνες"
+
+#: ../cli/src/common.c:414
+msgid ""
+"IP configuration could not be reserved (no available address, timeout, etc)"
+msgstr ""
+"Οι ρυθμίσεις IP δε μπόρεσαν να εξασφαλιστούν (δεν υπάρχει διαθέσιμη "
+"διεύθυνση, χρονικό όριο, κ.λπ)"
+
+#: ../cli/src/common.c:417
+msgid "The IP configuration is no longer valid"
+msgstr "Δεν είναι πλέον έγκυρες οι ρυθμίσεις IP"
+
+#: ../cli/src/common.c:420
+msgid "Secrets were required, but not provided"
+msgstr "Τα μυστικά απαιτήθηκαν, αλλά δεν παρήχθησαν"
+
+#: ../cli/src/common.c:423
+msgid "802.1X supplicant disconnected"
+msgstr "Αποσυνδέθηκε το 802.1x supplicant"
+
+#: ../cli/src/common.c:426
+msgid "802.1X supplicant configuration failed"
+msgstr "Απέtυχε η ρύθμιση του 802.1x supplicant"
+
+#: ../cli/src/common.c:429
+msgid "802.1X supplicant failed"
+msgstr "Αποτυχία του 802.1x supplicant"
+
+#: ../cli/src/common.c:432
+msgid "802.1X supplicant took too long to authenticate"
+msgstr "Το 802.1x supplicant πήρε αρκετή ώρα για να πιστοποιηθεί"
+
+#: ../cli/src/common.c:435
+msgid "PPP service failed to start"
+msgstr "Αποτυχία εκκίνησης της υπηρεσίας PPP"
+
+#: ../cli/src/common.c:438
+msgid "PPP service disconnected"
+msgstr "Αποσυνδέθηκε η υπηρεσία PPP"
+
+#: ../cli/src/common.c:441
+msgid "PPP failed"
+msgstr "Το PPP απέτυχε"
+
+#: ../cli/src/common.c:444
+msgid "DHCP client failed to start"
+msgstr "Αποτυχία εκκίνησης του πελάτη DHCP"
+
+#: ../cli/src/common.c:447
+msgid "DHCP client error"
+msgstr "Σφάλμα πελάτη DHCP"
+
+#: ../cli/src/common.c:450
+msgid "DHCP client failed"
+msgstr "Αποτυχία του πελάτη DHCP"
+
+#: ../cli/src/common.c:453
+msgid "Shared connection service failed to start"
+msgstr "Αποτυχία εκκίνησης υπηρεσίας της κοινόχρηστης σύνδεσης"
+
+#: ../cli/src/common.c:456
+msgid "Shared connection service failed"
+msgstr "Αποτυχία υπηρεσίας της κοινόχρηστης σύνδεσης"
+
+#: ../cli/src/common.c:459
+msgid "AutoIP service failed to start"
+msgstr "Αποτυχία εκκίνησης της υπηρεσίας AutoIP"
+
+#: ../cli/src/common.c:462
+msgid "AutoIP service error"
+msgstr "Σφάλμα υπηρεσίας AutoIP"
+
+#: ../cli/src/common.c:465
+msgid "AutoIP service failed"
+msgstr "Αποτυχία υπηρεσίας AutoIP"
+
+#: ../cli/src/common.c:468
+msgid "The line is busy"
+msgstr "Η γραμμή είναι απασχολημένη"
+
+#: ../cli/src/common.c:471
+#, fuzzy
+msgid "No dial tone"
+msgstr "Καθόλου ήχος κλήσης"
+
+#: ../cli/src/common.c:474
+#, fuzzy
+msgid "No carrier could be established"
+msgstr "Δεν ήταν δυνατή η ανάκτηση σιωπής"
+
+#: ../cli/src/common.c:477
+msgid "The dialing request timed out"
+msgstr "Έληξε το αίτημα κλήσης"
+
+#: ../cli/src/common.c:480
+msgid "The dialing attempt failed"
+msgstr "Απέτυχε η προσπάθεια κλήσης"
+
+#: ../cli/src/common.c:483
+msgid "Modem initialization failed"
+msgstr "Απέτυχε η προετοιμασία του μόντεμ"
+
+#: ../cli/src/common.c:486
+msgid "Failed to select the specified APN"
+msgstr "Αποτυχία επιλογής του συγκεκριμένου APN"
+
+#: ../cli/src/common.c:489
+msgid "Not searching for networks"
+msgstr "Δεν ψάχνει για δίκτυα"
+
+#: ../cli/src/common.c:492
+msgid "Network registration denied"
+msgstr "Αρνήθηκε η εγγραφή του δικτύου"
+
+#: ../cli/src/common.c:495
+msgid "Network registration timed out"
+msgstr "Έληξε η εγγραφή του δικτύου"
+
+#: ../cli/src/common.c:498
+msgid "Failed to register with the requested network"
+msgstr "Αποτυχία εγγραφής με το ζητούμενο δίκτυο"
+
+#: ../cli/src/common.c:501
+msgid "PIN check failed"
+msgstr "Απέτυχε ο έλεγχος του PIN"
+
+#: ../cli/src/common.c:504
+msgid "Necessary firmware for the device may be missing"
+msgstr "Μπορεί να λείπει το απαραίτητο υλισμικό (firmware) για τη συσκευή"
+
+#: ../cli/src/common.c:507
+msgid "The device was removed"
+msgstr "Αφαιρέθηκε η συσκευή"
+
+#: ../cli/src/common.c:510
+#, fuzzy
+#| msgid "NetworkManager status"
+msgid "NetworkManager went to sleep"
+msgstr "Ο NetworkManager πήγε για ύπνο/Ο NetworkManager τερματίστηκε"
+
+#: ../cli/src/common.c:513
+#, fuzzy
+#| msgid "no active connection or device"
+msgid "The device's active connection disappeared"
+msgstr "δεν υπάρχει ενεργή σύνδεση στη συσκευή '%s'"
+
+#: ../cli/src/common.c:516
+msgid "Device disconnected by user or client"
+msgstr "Η συσκευή αποσυνδέθηκε από τον χρήστη ή τον πελάτη"
+
+#: ../cli/src/common.c:519
+#, fuzzy
+msgid "Carrier/link changed"
+msgstr "Αν ο κειμενογράφος έχει τροποποιηθεί"
+
+#: ../cli/src/common.c:522
+#, fuzzy
+#| msgid "the connection was removed"
+msgid "The device's existing connection was assumed"
+msgstr "η σύνδεση αφαιρέθηκε"
+
+#: ../cli/src/common.c:525
+msgid "The supplicant is now available"
+msgstr "Ο supplicant είναι τώρα διαθέσιμος"
+
+#: ../cli/src/common.c:528
+msgid "The modem could not be found"
+msgstr "Το μόντεμ δεν μπόρεσε να βρεθεί"
+
+#: ../cli/src/common.c:531
+msgid "The Bluetooth connection failed or timed out"
+msgstr "Απέτυχε ή έληξε η σύνδεση Bluetooth"
+
+#: ../cli/src/common.c:534
+msgid "GSM Modem's SIM card not inserted"
+msgstr "Δεν εισήχθησε η κάρτα SIM του GSM μόντεμ"
+
+#: ../cli/src/common.c:537
+#, fuzzy
+msgid "GSM Modem's SIM PIN required"
+msgstr "Απαιτείται το PIN του GSM μόντεμ"
+
+#: ../cli/src/common.c:540
+#, fuzzy
+msgid "GSM Modem's SIM PUK required"
+msgstr "Απαιτείται το PUK του GSM μόντεμ"
+
+#: ../cli/src/common.c:543
+#, fuzzy
+msgid "GSM Modem's SIM wrong"
+msgstr "Λάθος SIM του GSM Modem"
+
+#: ../cli/src/common.c:546
+#, fuzzy
+msgid "InfiniBand device does not support connected mode"
+msgstr ""
+"Η συσκευή InfiniBand δεν υποστηρίζει συνδεδεμένη λειτουργία (connected mode)"
+
+#: ../cli/src/common.c:549
+#, fuzzy
+#| msgid "connection failed"
+msgid "A dependency of the connection failed"
+msgstr "Η σύνδεση στο %s απέτυχε"
+
+#: ../cli/src/common.c:552
+msgid "A problem with the RFC 2684 Ethernet over ADSL bridge"
+msgstr "Πρόβλημα με το RFC 2684 Ethernet μέσω γέφυρας ADSL"
+
+#: ../cli/src/common.c:555 ../cli/src/devices.c:274 ../cli/src/devices.c:290
+#: ../cli/src/devices.c:410 ../cli/src/devices.c:454
+msgid "Unknown"
+msgstr "Άγνωστο"
+
+#. 0
+#. used only for 'GENERAL' group listing
+#: ../cli/src/connections.c:59 ../cli/src/connections.c:129
+#: ../cli/src/devices.c:105 ../cli/src/devices.c:129 ../cli/src/devices.c:139
+#: ../cli/src/devices.c:149 ../cli/src/devices.c:163 ../cli/src/devices.c:177
+#: ../cli/src/devices.c:199
 msgid "NAME"
 msgstr "ΟΝΟΜΑ"
 
 #. 0
-#: ../cli/src/connections.c:61 ../cli/src/connections.c:76
+#. 1
+#: ../cli/src/connections.c:60 ../cli/src/connections.c:130
 msgid "UUID"
 msgstr "UUID"
 
 #. 1
-#: ../cli/src/connections.c:62
-msgid "DEVICES"
-msgstr "ΣΥΣΚΕΥΕΣ"
+#. 0
+#. 1
+#. 2
+#: ../cli/src/connections.c:61 ../cli/src/connections.c:163
+#: ../cli/src/devices.c:71 ../cli/src/devices.c:107 ../cli/src/devices.c:202
+msgid "TYPE"
+msgstr "ΤΥΠΟΣ"
 
 #. 2
-#: ../cli/src/connections.c:63 ../cli/src/connections.c:78
-msgid "SCOPE"
-msgstr "ΕΥΡΟΣ"
+#: ../cli/src/connections.c:62
+msgid "TIMESTAMP"
+msgstr "TIMESTAMP"
 
 #. 3
-#: ../cli/src/connections.c:64
-msgid "DEFAULT"
-msgstr "ΠΡΟΕΠΙΛΟΓΗ"
+#: ../cli/src/connections.c:63
+msgid "TIMESTAMP-REAL"
+msgstr "TIMESTAMP-ΠΡΑΓΜΑΤΙΚΟ"
 
 #. 4
+#. 13
+#: ../cli/src/connections.c:64 ../cli/src/devices.c:119
+msgid "AUTOCONNECT"
+msgstr "ΑΥΤΟΜΑΤΗ-ΣΥΝΔΕΣΗ"
+
+#. 5
 #: ../cli/src/connections.c:65
-msgid "DBUS-SERVICE"
-msgstr "ΥΠΗΡΕΣΙΑ DBUS"
+msgid "READONLY"
+msgstr "ΜΟΝΟ-ΓΙΑ-ΑΝΑΓΝΩΣΗ"
+
+#. 6
+#. 8
+#. 2
+#. 11
+#. 5
+#: ../cli/src/connections.c:66 ../cli/src/connections.c:137
+#: ../cli/src/devices.c:73 ../cli/src/devices.c:189 ../cli/src/devices.c:205
+msgid "DBUS-PATH"
+msgstr "ΔΙΑΔΡΟΜΗ-DBUS"
+
+#. 2
+#: ../cli/src/connections.c:131
+msgid "DEVICES"
+msgstr "ΣΥΣΚΕΥΕΣ"
+
+#. 3
+#. 1
+#. 8
+#. 1
+#: ../cli/src/connections.c:132 ../cli/src/devices.c:72
+#: ../cli/src/devices.c:114 ../cli/src/network-manager.c:39
+msgid "STATE"
+msgstr "ΚΑΤΑΣΤΑΣΗ"
+
+#. 4
+#: ../cli/src/connections.c:133
+msgid "DEFAULT"
+msgstr "ΠΡΟΕΠΙΛΟΓΗ"
 
 #. 5
-#: ../cli/src/connections.c:66
+#: ../cli/src/connections.c:134
+msgid "DEFAULT6"
+msgstr "ΠΡΟΕΠΙΛΟΓΗ6"
+
+#. 6
+#: ../cli/src/connections.c:135
 msgid "SPEC-OBJECT"
 msgstr "SPEC-OBJECT"
 
-#. 6
-#: ../cli/src/connections.c:67
+#. 7
+#. 1
+#: ../cli/src/connections.c:136 ../cli/src/connections.c:150
 msgid "VPN"
 msgstr "VPN"
 
-#. 1
+#. 9
+#: ../cli/src/connections.c:138
+msgid "CON-PATH"
+msgstr "ΔΙΑΔΡΟΜΗ-CON"
+
+#. 10
+#: ../cli/src/connections.c:139
+msgid "ZONE"
+msgstr "ΖΩΝΗ"
+
+#. 11
+#: ../cli/src/connections.c:140
+msgid "MASTER-PATH"
+msgstr "MASTER-PATH"
+
+#: ../cli/src/connections.c:148 ../cli/src/devices.c:82
+msgid "GENERAL"
+msgstr "ΓΕΝΙΚΑ"
+
 #. 0
+#: ../cli/src/connections.c:149
+msgid "IP"
+msgstr "IP"
+
 #. 1
-#: ../cli/src/connections.c:77 ../cli/src/devices.c:62 ../cli/src/devices.c:90
-msgid "TYPE"
-msgstr "ΤΥΠΟΣ"
+#: ../cli/src/connections.c:164
+msgid "USERNAME"
+msgstr "ΟΝΟΜΑ ΧΡΗΣΤΗ"
+
+#. 2
+#: ../cli/src/connections.c:165
+msgid "GATEWAY"
+msgstr "ΠΥΛΗ"
 
 #. 3
-#: ../cli/src/connections.c:79
-msgid "TIMESTAMP"
-msgstr "TIMESTAMP"
+#: ../cli/src/connections.c:166
+msgid "BANNER"
+msgstr "BANNER"
 
 #. 4
-#: ../cli/src/connections.c:80
-msgid "TIMESTAMP-REAL"
-msgstr "TIMESTAMP-ΠΡΑΓΜΑΤΙΚΟ"
+#: ../cli/src/connections.c:167
+msgid "VPN-STATE"
+msgstr "ΚΑΤΑΣΤΑΣΗ-VPN"
 
 #. 5
-#: ../cli/src/connections.c:81
-msgid "AUTOCONNECT"
-msgstr "ΑΥΤΟΜΑΤΗ-ΣΥΝΔΕΣΗ"
-
-#. 6
-#: ../cli/src/connections.c:82
-msgid "READONLY"
-msgstr "ΜΟΝΟ-ΓΙΑ-ΑΝΑΓΝΩΣΗ"
+#: ../cli/src/connections.c:168
+msgid "CFG"
+msgstr "CFG"
 
-#: ../cli/src/connections.c:158
+#: ../cli/src/connections.c:190
 #, c-format
 msgid ""
 "Usage: nmcli con { COMMAND | help }\n"
-"  COMMAND := { list | status | up | down }\n"
+"  COMMAND := { list | status | up | down | delete }\n"
 "\n"
-"  list [id  | uuid  | system | user]\n"
-"  status\n"
-"  up id  | uuid  [iface ] [ap ] [--nowait] [--timeout "
+"  list [id  | uuid ]\n"
+"  status [id  | uuid  | path ]\n"
+"  up id  | uuid  [iface ] [ap ] [nsp ] [--"
+"nowait] [--timeout ]\n"
+"  up id  | uuid  [iface ] [ap ] [--nowait] [--timeout "
 "]\n"
 "  down id  | uuid \n"
+"  delete id  | uuid \n"
 msgstr ""
-"Χρήση: nmcli con { COMMAND | help }\n"
-"  COMMAND := { list | status | up | down }\n"
+"Χρήση: nmcli con { ΕΝΤΟΛΗ | help }\n"
+"  ΕΝΤΟΛΗ := { list | status | up | down | delete }\n"
 "\n"
-"  list [id  | uuid  | system | user]\n"
-"  status\n"
-"  up id  | uuid  [iface ] [ap ] [--nowait] [--timeout "
+"  list [id  | uuid ]\n"
+"  status [id  | uuid  | path ]\n"
+"  up id  | uuid  [iface ] [ap ] [nsp ] [--"
+"nowait] [--timeout ]\n"
+"  up id  | uuid  [iface ] [ap ] [--nowait] [--timeout "
 "]\n"
 "  down id  | uuid \n"
+"  delete id  | uuid \n"
 
-#: ../cli/src/connections.c:198 ../cli/src/connections.c:537
+#: ../cli/src/connections.c:249 ../cli/src/connections.c:609
 #, c-format
 msgid "Error: 'con list': %s"
 msgstr "Σφάλμα: 'con list': %s"
 
-#: ../cli/src/connections.c:200 ../cli/src/connections.c:539
+#: ../cli/src/connections.c:251 ../cli/src/connections.c:611
 #, c-format
 msgid "Error: 'con list': %s; allowed fields: %s"
 msgstr "Σφάλμα: 'con list': %s; επιτρεπόμενα πεδία: %s"
 
-#: ../cli/src/connections.c:208
+#: ../cli/src/connections.c:259
 msgid "Connection details"
 msgstr "Λεπτομέρειες σύνδεσης"
 
-#: ../cli/src/connections.c:382 ../cli/src/connections.c:602
-#| msgid "System"
-msgid "system"
-msgstr "σύστημα"
-
-#: ../cli/src/connections.c:382 ../cli/src/connections.c:602
-msgid "user"
-msgstr "χρήστης"
-
-#: ../cli/src/connections.c:384
+#: ../cli/src/connections.c:484
 msgid "never"
 msgstr "ποτέ"
 
 #. "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:485 ../cli/src/connections.c:486
+#: ../cli/src/connections.c:714 ../cli/src/connections.c:715
+#: ../cli/src/connections.c:717 ../cli/src/devices.c:418
+#: ../cli/src/devices.c:471 ../cli/src/devices.c:587 ../cli/src/devices.c:588
+#: ../cli/src/devices.c:589 ../cli/src/devices.c:621 ../cli/src/devices.c:647
+#: ../cli/src/devices.c:648 ../cli/src/devices.c:649 ../cli/src/devices.c:650
+#: ../cli/src/devices.c:651 ../cli/src/network-manager.c:267
+#: ../cli/src/settings.c:694 ../cli/src/settings.c:764
+#: ../cli/src/settings.c:884 ../cli/src/settings.c:1166
+#: ../cli/src/settings.c:1167 ../cli/src/settings.c:1169
+#: ../cli/src/settings.c:1171 ../cli/src/settings.c:1172
+#: ../cli/src/settings.c:1303 ../cli/src/settings.c:1304
+#: ../cli/src/settings.c:1305 ../cli/src/settings.c:1306
+#: ../cli/src/settings.c:1383 ../cli/src/settings.c:1384
+#: ../cli/src/settings.c:1385 ../cli/src/settings.c:1386
+#: ../cli/src/settings.c:1387 ../cli/src/settings.c:1388
+#: ../cli/src/settings.c:1389 ../cli/src/settings.c:1390
+#: ../cli/src/settings.c:1391 ../cli/src/settings.c:1392
+#: ../cli/src/settings.c:1393 ../cli/src/settings.c:1394
+#: ../cli/src/settings.c:1395 ../cli/src/settings.c:1466
 msgid "yes"
 msgstr "ναι"
 
-#: ../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:485 ../cli/src/connections.c:486
+#: ../cli/src/connections.c:714 ../cli/src/connections.c:715
+#: ../cli/src/connections.c:717 ../cli/src/devices.c:418
+#: ../cli/src/devices.c:471 ../cli/src/devices.c:587 ../cli/src/devices.c:588
+#: ../cli/src/devices.c:589 ../cli/src/devices.c:621 ../cli/src/devices.c:647
+#: ../cli/src/devices.c:648 ../cli/src/devices.c:649 ../cli/src/devices.c:650
+#: ../cli/src/devices.c:651 ../cli/src/network-manager.c:269
+#: ../cli/src/settings.c:694 ../cli/src/settings.c:696
+#: ../cli/src/settings.c:764 ../cli/src/settings.c:884
+#: ../cli/src/settings.c:1166 ../cli/src/settings.c:1167
+#: ../cli/src/settings.c:1169 ../cli/src/settings.c:1171
+#: ../cli/src/settings.c:1172 ../cli/src/settings.c:1303
+#: ../cli/src/settings.c:1304 ../cli/src/settings.c:1305
+#: ../cli/src/settings.c:1306 ../cli/src/settings.c:1383
+#: ../cli/src/settings.c:1384 ../cli/src/settings.c:1385
+#: ../cli/src/settings.c:1386 ../cli/src/settings.c:1387
+#: ../cli/src/settings.c:1388 ../cli/src/settings.c:1389
+#: ../cli/src/settings.c:1390 ../cli/src/settings.c:1391
+#: ../cli/src/settings.c:1392 ../cli/src/settings.c:1393
+#: ../cli/src/settings.c:1394 ../cli/src/settings.c:1395
+#: ../cli/src/settings.c:1466
 msgid "no"
 msgstr "όχι"
 
-#: ../cli/src/connections.c:458 ../cli/src/connections.c:501
-#| msgid "Modify system connections"
-msgid "System connections"
-msgstr "Συνδέσεις συστήματος"
-
-#: ../cli/src/connections.c:463 ../cli/src/connections.c:514
-#| msgid "Modify system connections"
-msgid "User connections"
-msgstr "Συνδέσεις χρήστη"
-
-#: ../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:560
+msgid "Connection list"
+msgstr "Λίστα σύνδεσης"
+
+#: ../cli/src/connections.c:573 ../cli/src/connections.c:1110
+#: ../cli/src/connections.c:1648 ../cli/src/connections.c:1663
+#: ../cli/src/connections.c:1672 ../cli/src/connections.c:1682
+#: ../cli/src/connections.c:1694 ../cli/src/connections.c:1802
+#: ../cli/src/connections.c:1904 ../cli/src/devices.c:1041
+#: ../cli/src/devices.c:1051 ../cli/src/devices.c:1169
+#: ../cli/src/devices.c:1177 ../cli/src/devices.c:1541
+#: ../cli/src/devices.c:1548 ../cli/src/devices.c:1562
+#: ../cli/src/devices.c:1569 ../cli/src/devices.c:1586
+#: ../cli/src/devices.c:1597 ../cli/src/devices.c:1818
+#: ../cli/src/devices.c:1825
 #, c-format
 msgid "Error: %s argument is missing."
 msgstr "Σφάλμα: λείπει το όρισμα %s."
 
-#: ../cli/src/connections.c:488
+#: ../cli/src/connections.c:586
 #, c-format
 msgid "Error: %s - no such connection."
 msgstr "Σφάλμα: %s - δεν υπάρχει τέτοια σύνδεση."
 
-#: ../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:592 ../cli/src/connections.c:1707
+#: ../cli/src/connections.c:1819 ../cli/src/connections.c:1911
+#: ../cli/src/devices.c:825 ../cli/src/devices.c:905 ../cli/src/devices.c:1065
+#: ../cli/src/devices.c:1183 ../cli/src/devices.c:1610
+#: ../cli/src/devices.c:1831
 #, c-format
 msgid "Unknown parameter: %s\n"
 msgstr "Άγνωστη παράμετρος: %s\n"
 
-#: ../cli/src/connections.c:529
+#: ../cli/src/connections.c:601
 #, c-format
 msgid "Error: no valid parameter specified."
 msgstr "Σφάλμα: δεν ορίσθηκε έγκυρη παράμετρος."
 
-#: ../cli/src/connections.c:544 ../cli/src/connections.c:1577
-#: ../cli/src/devices.c:1293 ../cli/src/network-manager.c:274
+#: ../cli/src/connections.c:616 ../cli/src/connections.c:2004
+#: ../cli/src/devices.c:2039 ../cli/src/network-manager.c:596
 #, c-format
 msgid "Error: %s."
 msgstr "Σφάλμα: %s."
 
-#: ../cli/src/connections.c:650
-#, c-format
-msgid "Error: 'con status': %s"
-msgstr "Σφάλμα: 'con status': %s"
-
-#: ../cli/src/connections.c:652
-#, c-format
-msgid "Error: 'con status': %s; allowed fields: %s"
-msgstr "Σφάλμα: 'con status': %s; επιτρεπόμενα πεδία: %s"
-
-#: ../cli/src/connections.c:659
-#| msgid "Modify system connections"
-msgid "Active connections"
-msgstr "Ενεργές συνδέσεις"
-
-#: ../cli/src/connections.c:1027
-#, c-format
-msgid "no active connection on device '%s'"
-msgstr "δεν υπάρχει ενεργή σύνδεση στη συσκευή '%s'"
-
-#: ../cli/src/connections.c:1035
-#, c-format
-msgid "no active connection or device"
-msgstr "δεν πυάρχει ενεργή σύνδεση ή συσκευή"
-
-#: ../cli/src/connections.c:1085
-#, c-format
-msgid "device '%s' not compatible with connection '%s'"
-msgstr "η συσκευή '%s' δεν είναι συμβατή με τη σύνδεση '%s'"
-
-#: ../cli/src/connections.c:1087
-#, c-format
-msgid "no device found for connection '%s'"
-msgstr "δεν βρέθηκε συσκευή για τη σύνδεση '%s'"
-
-#: ../cli/src/connections.c:1098
+#: ../cli/src/connections.c:629
 msgid "activating"
 msgstr "ενεργοποίηση"
 
-#: ../cli/src/connections.c:1100
+#: ../cli/src/connections.c:631
 msgid "activated"
 msgstr "ενεργοποιήθηκε"
 
-#: ../cli/src/connections.c:1103 ../cli/src/connections.c:1126
-#: ../cli/src/connections.c:1159 ../cli/src/devices.c:246
-#: ../cli/src/devices.c:558 ../cli/src/network-manager.c:92
-#: ../cli/src/network-manager.c:145 ../cli/src/settings.c:473
-msgid "unknown"
-msgstr "άγνωστη"
-
-#: ../cli/src/connections.c:1112
+#: ../cli/src/connections.c:645
 msgid "VPN connecting (prepare)"
 msgstr "Σύνδεση VPN (προετοιμασία)"
 
-#: ../cli/src/connections.c:1114
+#: ../cli/src/connections.c:647
 msgid "VPN connecting (need authentication)"
 msgstr "Σύνδεση VPN (απαιτείται πιστοποίηση)"
 
-#: ../cli/src/connections.c:1116
+#: ../cli/src/connections.c:649
 msgid "VPN connecting"
 msgstr "Σύνδεση VPN"
 
-#: ../cli/src/connections.c:1118
+#: ../cli/src/connections.c:651
 msgid "VPN connecting (getting IP configuration)"
 msgstr "Σύνδεση VPN (γίνεται λήψη ρυθμίσεων IP)"
 
-#: ../cli/src/connections.c:1120
+#: ../cli/src/connections.c:653
 msgid "VPN connected"
 msgstr "VPN συνδέθηκε"
 
-#: ../cli/src/connections.c:1122
+#: ../cli/src/connections.c:655
 msgid "VPN connection failed"
 msgstr "Σύνδεση VPN απέτυχε"
 
-#: ../cli/src/connections.c:1124
+#: ../cli/src/connections.c:657
 msgid "VPN disconnected"
 msgstr "VPN αποσυνδέθηκε"
 
-#: ../cli/src/connections.c:1135
+#: ../cli/src/connections.c:710 ../cli/src/connections.c:720
+msgid "N/A"
+msgstr "N/A"
+
+#: ../cli/src/connections.c:914 ../cli/src/connections.c:1138
+#, c-format
+msgid "Error: 'con status': %s"
+msgstr "Σφάλμα: 'con status': %s"
+
+#: ../cli/src/connections.c:916 ../cli/src/connections.c:1140
+#, c-format
+msgid "Error: 'con status': %s; allowed fields: %s"
+msgstr "Σφάλμα: 'con status': %s; επιτρεπόμενα πεδία: %s"
+
+#: ../cli/src/connections.c:924
+msgid "Active connection details"
+msgstr "Λεπτομέρειες ενεργής σύνδεσης"
+
+#: ../cli/src/connections.c:1060 ../cli/src/connections.c:1722
+#: ../cli/src/connections.c:1834 ../cli/src/connections.c:1925
+#: ../cli/src/devices.c:852 ../cli/src/devices.c:914 ../cli/src/devices.c:1080
+#: ../cli/src/devices.c:1213 ../cli/src/devices.c:1632
+#: ../cli/src/devices.c:1860 ../cli/src/network-manager.c:311
+#, c-format
+msgid "Error: Can't find out if NetworkManager is running: %s."
+msgstr "Σφάλμα: Δεν μπόρεσε να μάθει αν τρέχει ο NetworkManager: %s."
+
+#: ../cli/src/connections.c:1064 ../cli/src/connections.c:1726
+#: ../cli/src/connections.c:1838 ../cli/src/connections.c:1929
+#: ../cli/src/devices.c:856 ../cli/src/devices.c:918 ../cli/src/devices.c:1084
+#: ../cli/src/devices.c:1217 ../cli/src/devices.c:1636
+#: ../cli/src/devices.c:1864 ../cli/src/network-manager.c:315
+#, c-format
+msgid "Error: NetworkManager is not running."
+msgstr "Σφάλμα: Δεν εκτελείτε ο NetworkManager."
+
+#: ../cli/src/connections.c:1096
+msgid "Active connections"
+msgstr "Ενεργές συνδέσεις"
+
+#: ../cli/src/connections.c:1121
+#, c-format
+msgid "Error: '%s' is not an active connection."
+msgstr "Σφάλμα: η '%s' δεν είναι μια ενεργή σύνδεση."
+
+#: ../cli/src/connections.c:1126
+#, c-format
+msgid "Error: unknown parameter: %s"
+msgstr "Σφάλμα: άγνωστη παράμετρος: %s"
+
+#: ../cli/src/connections.c:1233
+#, c-format
+msgid "no active connection on device '%s'"
+msgstr "δεν υπάρχει ενεργή σύνδεση στη συσκευή '%s'"
+
+#: ../cli/src/connections.c:1241
+msgid "no active connection or device"
+msgstr "δεν πυάρχει ενεργή σύνδεση ή συσκευή"
+
+#: ../cli/src/connections.c:1312
+#, c-format
+msgid "device '%s' not compatible with connection '%s'"
+msgstr "η συσκευή '%s' δεν είναι συμβατή με τη σύνδεση '%s'"
+
+#: ../cli/src/connections.c:1315
+#, c-format
+msgid "no device found for connection '%s'"
+msgstr "δεν βρέθηκε συσκευή για τη σύνδεση '%s'"
+
+#: ../cli/src/connections.c:1327
 msgid "unknown reason"
 msgstr "άγνωστη αιτία"
 
-#: ../cli/src/connections.c:1137
+#: ../cli/src/connections.c:1329
 msgid "none"
 msgstr "κανένα"
 
-#: ../cli/src/connections.c:1139
+#: ../cli/src/connections.c:1331
 msgid "the user was disconnected"
 msgstr "ο χρήστης αποσυνδέθηκε"
 
-#: ../cli/src/connections.c:1141
+#: ../cli/src/connections.c:1333
 msgid "the base network connection was interrupted"
 msgstr "η βασική σύνδεση δικτύου διακόπηκε"
 
-#: ../cli/src/connections.c:1143
+#: ../cli/src/connections.c:1335
 msgid "the VPN service stopped unexpectedly"
 msgstr "η υπηρεσία VPN σταμάτησε απρόσμενα"
 
-#: ../cli/src/connections.c:1145
+#: ../cli/src/connections.c:1337
 msgid "the VPN service returned invalid configuration"
 msgstr "η υπηρεσία VPN επέστρεψε μη έγκυρη διαμόρφωση"
 
-#: ../cli/src/connections.c:1147
+#: ../cli/src/connections.c:1339
 msgid "the connection attempt timed out"
 msgstr "έληξε το χρονικό όριο απόπειρας σύνδεσης"
 
-#: ../cli/src/connections.c:1149
+#: ../cli/src/connections.c:1341
 msgid "the VPN service did not start in time"
 msgstr "η υπηρεσία VPN δεν ξεκίνησε εγκαίρως"
 
-#: ../cli/src/connections.c:1151
+#: ../cli/src/connections.c:1343
 msgid "the VPN service failed to start"
 msgstr "η υπηρεσία VPN απέτυχε να εκκινήσει"
 
-#: ../cli/src/connections.c:1153
+#: ../cli/src/connections.c:1345
 msgid "no valid VPN secrets"
 msgstr "δεν υπάρχουν έγκυρα μυστικά VPN"
 
-#: ../cli/src/connections.c:1155
+#: ../cli/src/connections.c:1347
 msgid "invalid VPN secrets"
 msgstr "μη έγκυρα μυστικά VPN"
 
-#: ../cli/src/connections.c:1157
+#: ../cli/src/connections.c:1349
 msgid "the connection was removed"
 msgstr "η σύνδεση αφαιρέθηκε"
 
-#: ../cli/src/connections.c:1171
-#, c-format
-msgid "state: %s\n"
-msgstr "κατάσταση: %s\n"
-
-#: ../cli/src/connections.c:1174 ../cli/src/connections.c:1200
-#, c-format
-msgid "Connection activated\n"
-msgstr "Ενεργοποιήθηκε η σύνδεση\n"
+#: ../cli/src/connections.c:1366 ../cli/src/connections.c:1571
+#, fuzzy, c-format
+msgid "Connection successfully activated (D-Bus active path: %s)\n"
+msgstr "Ενεργοποιήθηκε επιτυχώς η σύνδεση (D-Bus active path: %s)\n"
 
-#: ../cli/src/connections.c:1177
+#. Active connection failed and dissapeared, quit.
+#: ../cli/src/connections.c:1371 ../cli/src/connections.c:1472
 #, c-format
 msgid "Error: Connection activation failed."
 msgstr "Σφάλμα: Αποτυχία ενεργοποίησης σύνδεσης."
 
-#: ../cli/src/connections.c:1196
-#, c-format
-msgid "state: %s (%d)\n"
-msgstr "κατάσταση: %s (%d)\n"
+#: ../cli/src/connections.c:1396
+#, fuzzy, c-format
+msgid "VPN connection successfully activated (D-Bus active path: %s)\n"
+msgstr "Ενεργοποιήθηκε επιτυχώς η σύνδεση VPN (D-Bus active path: %s)\n"
 
-#: ../cli/src/connections.c:1206
+#: ../cli/src/connections.c:1404
 #, c-format
 msgid "Error: Connection activation failed: %s."
 msgstr "Σφάλμα: Αποτυχία ενεργοποίησης σύνδεσης: %s."
 
-#: ../cli/src/connections.c:1223 ../cli/src/devices.c:909
+#: ../cli/src/connections.c:1501 ../cli/src/devices.c:974
 #, c-format
 msgid "Error: Timeout %d sec expired."
 msgstr "Σφάλμα: Έληξε το χρονικό όριο %d sec"
 
-#: ../cli/src/connections.c:1266
+#: ../cli/src/connections.c:1562
 #, c-format
 msgid "Error: Connection activation failed: %s"
 msgstr "Σφάλμα: Αποτυχία ενεργοποίησης σύνδεσης: %s"
 
-#: ../cli/src/connections.c:1280
-#, c-format
-msgid "Error: Obtaining active connection for '%s' failed."
-msgstr "Σφάλμα: Αποτυχία απόκτησης ενεργής σύνδεσης για '%s'."
-
-#: ../cli/src/connections.c:1289
-#, c-format
-msgid "Active connection state: %s\n"
-msgstr "Κατάσταση ενεργής σύνδεσης: %s\n"
-
-#: ../cli/src/connections.c:1290
-#, c-format
-msgid "Active connection path: %s\n"
-msgstr "Διαδρομή ενεργής σύνδεσης: %s\n"
-
-#: ../cli/src/connections.c:1344 ../cli/src/connections.c:1465
+#: ../cli/src/connections.c:1656 ../cli/src/connections.c:1810
+#: ../cli/src/connections.c:1938
 #, c-format
 msgid "Error: Unknown connection: %s."
 msgstr "Σφάλμα: Άγνωστη σύνδεση: %s."
 
-#: ../cli/src/connections.c:1379 ../cli/src/devices.c:980
+#: ../cli/src/connections.c:1702 ../cli/src/devices.c:1059
+#: ../cli/src/devices.c:1605
 #, c-format
 msgid "Error: timeout value '%s' is not valid."
 msgstr "Σφάλμα: η τιμή του χορνικού ορίου '%s' δεν είναι έγκυρη."
 
-#: ../cli/src/connections.c:1392 ../cli/src/connections.c:1482
+#: ../cli/src/connections.c:1715 ../cli/src/connections.c:1827
+#: ../cli/src/connections.c:1918
 #, c-format
 msgid "Error: id or uuid has to be specified."
 msgstr "Σφάλμα: πρέπει να καθορισθεί id ή uuid "
 
-#: ../cli/src/connections.c:1412
+#: ../cli/src/connections.c:1747
 #, c-format
 msgid "Error: No suitable device found: %s."
 msgstr "Σφάλμα: Δεν βρέθηκε κατάλληλη συσκευή: %s."
 
-#: ../cli/src/connections.c:1414
+#: ../cli/src/connections.c:1749
 #, c-format
 msgid "Error: No suitable device found."
 msgstr "Σφάλμα: Δεν βρέθηκε κατάλληλη συσκευή."
 
-#: ../cli/src/connections.c:1509
+#: ../cli/src/connections.c:1863
 #, c-format
 msgid "Warning: Connection not active\n"
 msgstr "Προειδοποίηση: Η σύνδεση δεν είναι ενεργή\n"
 
-#: ../cli/src/connections.c:1566
+#: ../cli/src/connections.c:1877
+#, c-format
+msgid "Error: Connection deletion failed: %s"
+msgstr "Σφάλμα: Αποτυχία διαγραφής της σύνδεσης: %s"
+
+#: ../cli/src/connections.c:1995
 #, c-format
 msgid "Error: 'con' command '%s' is not valid."
 msgstr "Σφάλμα: η εντολή 'con' '%s' δεν είναι έγκυρη."
 
-#: ../cli/src/connections.c:1602
+#: ../cli/src/connections.c:2063
 #, c-format
 msgid "Error: could not connect to D-Bus."
 msgstr "Σφάλμα: αδυναμία σύνδεσης στο D-Bus."
 
-#: ../cli/src/connections.c:1609
+#: ../cli/src/connections.c:2071
 #, c-format
 msgid "Error: Could not get system settings."
 msgstr "Σφάλμα: Αδυναμία λήψης ρυθμίσεων συστήματος."
 
-#: ../cli/src/connections.c:1617
-#, c-format
-msgid "Error: Could not get user settings."
-msgstr "Σφάλμα: Αδυναμία λήψης ρυθμίσεων χρήστη."
-
-#: ../cli/src/connections.c:1627
+#: ../cli/src/connections.c:2081
 #, 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 ""
-"Σφάλμα: Αδυναμία απόκτησης συνδέσεων: οι υπηρεσίες ρυθμίσεων δεν εκτελούνται."
+"Σφάλμα: Αδυναμία απόκτησης συνδέσεων: οι υπηρεσία ρυθμίσεων δεν εκτελείτε."
 
 #. 0
 #. 9
-#: ../cli/src/devices.c:61 ../cli/src/devices.c:89 ../cli/src/devices.c:184
+#. 3
+#: ../cli/src/devices.c:70 ../cli/src/devices.c:106 ../cli/src/devices.c:187
+#: ../cli/src/devices.c:203
 msgid "DEVICE"
 msgstr "ΣΥΣΚΕΥΗ"
 
-#. 1
-#. 4
-#. 0
-#: ../cli/src/devices.c:63 ../cli/src/devices.c:93
-#: ../cli/src/network-manager.c:36
-msgid "STATE"
-msgstr "ΚΑΤΑΣΤΑΣΗ"
-
-#: ../cli/src/devices.c:72
-msgid "GENERAL"
-msgstr "ΓΕΝΙΚΑ"
-
 #. 0
-#: ../cli/src/devices.c:73
+#: ../cli/src/devices.c:83
 msgid "CAPABILITIES"
 msgstr "ΔΥΝΑΤΟΤΗΤΕΣ"
 
 #. 1
-#: ../cli/src/devices.c:74
+#: ../cli/src/devices.c:84
 msgid "WIFI-PROPERTIES"
 msgstr "ΙΔΙΟΤΗΤΕΣ-WIFI"
 
 #. 2
-#: ../cli/src/devices.c:75
+#: ../cli/src/devices.c:85
 msgid "AP"
 msgstr "AP"
 
 #. 3
-#: ../cli/src/devices.c:76
+#: ../cli/src/devices.c:86
 msgid "WIRED-PROPERTIES"
 msgstr "ΙΔΙΟΤΗΤΕΣ-ΕΝΣΥΡΜΑΤΗΣ"
 
 #. 4
-#: ../cli/src/devices.c:77
-msgid "IP4-SETTINGS"
-msgstr "ΡΥΘΜΙΣΕΙΣ-IP4"
+#: ../cli/src/devices.c:87
+msgid "WIMAX-PROPERTIES"
+msgstr "ΙΔΙΟΤΗΤΕΣ-WIMAX"
 
 #. 5
-#: ../cli/src/devices.c:78
-msgid "IP4-DNS"
-msgstr "IP4-DNS"
+#. 0
+#: ../cli/src/devices.c:88 ../cli/src/devices.c:200
+msgid "NSP"
+msgstr "NSP"
 
 #. 6
-#: ../cli/src/devices.c:79
-msgid "IP6-SETTINGS"
-msgstr "ΡΥΘΜΙΣΕΙΣ-IP6"
+#: ../cli/src/devices.c:89
+msgid "IP4"
+msgstr "IP4"
 
 #. 7
-#: ../cli/src/devices.c:80
-msgid "IP6-DNS"
-msgstr "IP6-DNS"
+#: ../cli/src/devices.c:90
+msgid "DHCP4"
+msgstr "DHCP4"
 
-#. 2
+#. 8
 #: ../cli/src/devices.c:91
+msgid "IP6"
+msgstr "IP6"
+
+#. 9
+#: ../cli/src/devices.c:92
+msgid "DHCP6"
+msgstr "DHCP6"
+
+#. 2
+#: ../cli/src/devices.c:108
+msgid "VENDOR"
+msgstr "ΚΑΤΑΣΚΕΥΑΣΤΗΣ"
+
+#. 3
+#: ../cli/src/devices.c:109
+msgid "PRODUCT"
+msgstr "ΠΡΟΙΟΝ"
+
+#. 4
+#: ../cli/src/devices.c:110
 msgid "DRIVER"
 msgstr "ΟΔΗΓΟΣ"
 
-#. 3
-#: ../cli/src/devices.c:92
+#. 5
+#: ../cli/src/devices.c:111
+msgid "DRIVER-VERSION"
+msgstr "ΕΚΔΟΣΗ-ΟΔΗΓΟΥ"
+
+#. 6
+#: ../cli/src/devices.c:112
+msgid "FIRMWARE-VERSION"
+msgstr "ΕΚΔΟΣΗ-FIRMWARE"
+
+#. 7
+#: ../cli/src/devices.c:113
 msgid "HWADDR"
 msgstr "ΔΙΕΥΘΥΝΣΗ-ΥΛΙΚΟΥ"
 
+#. 9
+#: ../cli/src/devices.c:115
+msgid "REASON"
+msgstr "ΑΙΤΙΑ"
+
+#. 10
+#: ../cli/src/devices.c:116
+msgid "UDI"
+msgstr "UDI"
+
+#. 11
+#: ../cli/src/devices.c:117
+msgid "IP-IFACE"
+msgstr "IP-IFACE"
+
+#. 12
+#: ../cli/src/devices.c:118
+msgid "NM-MANAGED"
+msgstr "NM-MANAGED"
+
+#. 14
+#: ../cli/src/devices.c:120
+msgid "FIRMWARE-MISSING"
+msgstr "FIRMWARE-MISSING"
+
+#. 15
+#: ../cli/src/devices.c:121
+msgid "CONNECTION"
+msgstr "ΣΥΝΔΕΣΗ"
+
 #. 0
-#: ../cli/src/devices.c:102
+#: ../cli/src/devices.c:130
 msgid "CARRIER-DETECT"
 msgstr "ΑΝΙΧΝΕΥΣΗ-ΣΗΜΑΤΟΣ-ΓΡΑΜΜΗΣ"
 
 #. 1
-#: ../cli/src/devices.c:103
+#: ../cli/src/devices.c:131
 msgid "SPEED"
 msgstr "ΤΑΧΥΤΗΤΑ"
 
 #. 0
-#: ../cli/src/devices.c:112
+#: ../cli/src/devices.c:140
 msgid "CARRIER"
-msgstr "CARRIER"
+msgstr "ΦΕΡΟΝ"
 
 #. 0
-#: ../cli/src/devices.c:122
+#: ../cli/src/devices.c:150
 msgid "WEP"
 msgstr "WEP"
 
 #. 1
-#: ../cli/src/devices.c:123
+#: ../cli/src/devices.c:151
 msgid "WPA"
 msgstr "WPA"
 
 #. 2
-#: ../cli/src/devices.c:124
+#: ../cli/src/devices.c:152
 msgid "WPA2"
 msgstr "WPA2"
 
 #. 3
-#: ../cli/src/devices.c:125
+#: ../cli/src/devices.c:153
 msgid "TKIP"
 msgstr "TKIP"
 
 #. 4
-#: ../cli/src/devices.c:126
+#: ../cli/src/devices.c:154
 msgid "CCMP"
 msgstr "CCMP"
 
 #. 0
-#: ../cli/src/devices.c:135 ../cli/src/devices.c:146
-msgid "ADDRESS"
-msgstr "ΔΙΕΥΘΥΝΣΗ"
+#: ../cli/src/devices.c:164
+msgid "CTR-FREQ"
+msgstr "CTR-FREQ"
 
 #. 1
-#: ../cli/src/devices.c:136 ../cli/src/devices.c:147
-msgid "PREFIX"
-msgstr "ΠΡΟΘΕΜΑ"
+#: ../cli/src/devices.c:165
+msgid "RSSI"
+msgstr "RSSI"
 
 #. 2
-#: ../cli/src/devices.c:137 ../cli/src/devices.c:148
-msgid "GATEWAY"
-msgstr "ΠΥΛΗ"
+#: ../cli/src/devices.c:166
+msgid "CINR"
+msgstr "CINR"
 
-#. 0
-#: ../cli/src/devices.c:157 ../cli/src/devices.c:166
-msgid "DNS"
-msgstr "DNS"
+#. 3
+#: ../cli/src/devices.c:167
+msgid "TX-POW"
+msgstr "TX-POW"
+
+#. 4
+#: ../cli/src/devices.c:168
+msgid "BSID"
+msgstr "BSID"
 
 #. 0
-#: ../cli/src/devices.c:175
+#: ../cli/src/devices.c:178
 msgid "SSID"
 msgstr "SSID"
 
 #. 1
-#: ../cli/src/devices.c:176
+#: ../cli/src/devices.c:179
 msgid "BSSID"
 msgstr "BSSID"
 
 #. 2
-#: ../cli/src/devices.c:177
+#: ../cli/src/devices.c:180
 msgid "MODE"
 msgstr "ΛΕΙΤΟΥΡΓΙΑ"
 
 #. 3
-#: ../cli/src/devices.c:178
+#: ../cli/src/devices.c:181
 msgid "FREQ"
 msgstr "ΣΥΧΝΟΤΗΤΑ"
 
 #. 4
-#: ../cli/src/devices.c:179
+#: ../cli/src/devices.c:182
 msgid "RATE"
 msgstr "ΡΥΘΜΟΣ"
 
 #. 5
-#: ../cli/src/devices.c:180
+#. 1
+#: ../cli/src/devices.c:183 ../cli/src/devices.c:201
 msgid "SIGNAL"
 msgstr "ΣΗΜΑ"
 
 #. 6
-#: ../cli/src/devices.c:181
+#: ../cli/src/devices.c:184
 msgid "SECURITY"
 msgstr "ΑΣΦΑΛΕΙΑ"
 
 #. 7
-#: ../cli/src/devices.c:182
+#: ../cli/src/devices.c:185
 msgid "WPA-FLAGS"
 msgstr "ΕΠΙΛΟΓΕΣ-WPA"
 
 #. 8
-#: ../cli/src/devices.c:183
+#: ../cli/src/devices.c:186
 msgid "RSN-FLAGS"
 msgstr "ΕΠΙΛΟΓΕΣ-RSN"
 
 #. 10
-#: ../cli/src/devices.c:185
+#. 4
+#: ../cli/src/devices.c:188 ../cli/src/devices.c:204
 msgid "ACTIVE"
 msgstr "ΕΝΕΡΓΗ"
 
-#: ../cli/src/devices.c:208
+#: ../cli/src/devices.c:223
 #, 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 ]\n"
 "  disconnect iface  [--nowait] [--timeout ]\n"
-"  wifi [list [iface ] [hwaddr ]]\n"
+"  wifi [list [iface ] [bssid ]]\n"
+"  wifi connect <(B)SSID> [password ] [wep-key-type key|phrase] "
+"[iface ] [bssid ] [name ]\n"
+"               [--private] [--nowait] [--timeout ]\n"
+"  wimax [list [iface ] [nsp ]]\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 ]\n"
 "  disconnect iface  [--nowait] [--timeout ]\n"
-"  wifi [list [iface ] [hwaddr ]]\n"
+"  wifi [list [iface ] [bssid ]]\n"
+"  wifi connect <(B)SSID> [password ] [wep-key-type key|phrase] "
+"[iface ] [bssid ] [name ]\n"
+"               [--private] [--nowait] [--timeout ]\n"
+"  wimax [list [iface ] [nsp ]]\n"
 "\n"
 
-#: ../cli/src/devices.c:228
-msgid "unmanaged"
-msgstr "χωρίς διαχείριση"
-
-#: ../cli/src/devices.c:230
-msgid "unavailable"
-msgstr "μη διαθέσιμη"
-
-#: ../cli/src/devices.c:232 ../cli/src/network-manager.c:89
-msgid "disconnected"
-msgstr "αποσυνδέθηκε"
-
-#: ../cli/src/devices.c:234
-msgid "connecting (prepare)"
-msgstr "σύνδεση (προετοιμασία)"
-
-#: ../cli/src/devices.c:236
-msgid "connecting (configuring)"
-msgstr "σύνδεση (διαμόρφωση)"
-
-#: ../cli/src/devices.c:238
-msgid "connecting (need authentication)"
-msgstr "σύνδεση (απαιτείται πιστοποίηση)"
-
-#: ../cli/src/devices.c:240
-msgid "connecting (getting IP configuration)"
-msgstr "σύνδεση (γίνεται λήψη ρυθμίσεων IP)"
-
-#: ../cli/src/devices.c:242 ../cli/src/network-manager.c:87
-msgid "connected"
-msgstr "συνδέθηκε"
-
-#: ../cli/src/devices.c:244
-msgid "connection failed"
-msgstr "αποτυχία σύνδεσης"
-
-#: ../cli/src/devices.c:267 ../cli/src/devices.c:424
-msgid "Unknown"
-msgstr "Άγνωστο"
-
-#: ../cli/src/devices.c:299
+#: ../cli/src/devices.c:323
 msgid "(none)"
 msgstr "(κανένα)"
 
-#: ../cli/src/devices.c:324
-#, c-format
-msgid "%s: error converting IP4 address 0x%X"
-msgstr "%s: σφάλμα κατά τη μετατροπή της διεύθυνσης IP4 0x%X"
-
-#: ../cli/src/devices.c:393
+#: ../cli/src/devices.c:379
 #, c-format
 msgid "%u MHz"
 msgstr "%u MHz"
 
-#: ../cli/src/devices.c:394
+#: ../cli/src/devices.c:380
 #, c-format
 msgid "%u MB/s"
 msgstr "%u MB/s"
 
-#: ../cli/src/devices.c:403
+#: ../cli/src/devices.c:389
 msgid "Encrypted: "
 msgstr "Κρυπτογραφημένη:"
 
-#: ../cli/src/devices.c:408
+#: ../cli/src/devices.c:394
 msgid "WEP "
 msgstr "WEP "
 
-#: ../cli/src/devices.c:410
+#: ../cli/src/devices.c:396
 msgid "WPA "
 msgstr "WPA "
 
-#: ../cli/src/devices.c:412
+#: ../cli/src/devices.c:398
 msgid "WPA2 "
 msgstr "WPA2 "
 
-#: ../cli/src/devices.c:415
+#: ../cli/src/devices.c:401
 msgid "Enterprise "
 msgstr "Επιχείρηση "
 
-#: ../cli/src/devices.c:424
+#: ../cli/src/devices.c:410
 msgid "Ad-Hoc"
 msgstr "Ad-Hoc"
 
-#: ../cli/src/devices.c:424
+#: ../cli/src/devices.c:410
 msgid "Infrastructure"
 msgstr "Υποδομή"
 
-#: ../cli/src/devices.c:486
+#: ../cli/src/devices.c:445
+msgid "Home"
+msgstr "Οικία"
+
+#: ../cli/src/devices.c:448
+msgid "Partner"
+msgstr "Συνέταιρος"
+
+#: ../cli/src/devices.c:451
+msgid "Roaming"
+msgstr "Περιαγωγή"
+
+#: ../cli/src/devices.c:523
 #, c-format
 msgid "Error: 'dev list': %s"
 msgstr "Σφάλμα: 'dev list': %s"
 
-#: ../cli/src/devices.c:488
+#: ../cli/src/devices.c:525
 #, c-format
 msgid "Error: 'dev list': %s; allowed fields: %s"
 msgstr "Σφάλμα:  'dev list': %s, επιτρεπόμενα πεδία: %s"
 
-#: ../cli/src/devices.c:497
+#: ../cli/src/devices.c:534
 msgid "Device details"
 msgstr "Λεπτομέρειες συσκευής"
 
-#: ../cli/src/devices.c:527 ../cli/src/devices.c:925
+#: ../cli/src/devices.c:579 ../cli/src/devices.c:582 ../cli/src/devices.c:1000
+#: ../cli/src/utils.c:477
 msgid "(unknown)"
 msgstr "(άγνωστο)"
 
-#: ../cli/src/devices.c:528
-msgid "unknown)"
-msgstr "άγνωστο)"
+#: ../cli/src/devices.c:591
+msgid "not connected"
+msgstr "δε συνδέθηκε"
 
-#: ../cli/src/devices.c:554
+#: ../cli/src/devices.c:618
 #, c-format
 msgid "%u Mb/s"
 msgstr "%u Mb/s"
 
 #. Print header
 #. "WIRED-PROPERTIES"
-#: ../cli/src/devices.c:627
+#: ../cli/src/devices.c:691
 msgid "on"
 msgstr "on"
 
-#: ../cli/src/devices.c:627
+#: ../cli/src/devices.c:691
 msgid "off"
 msgstr "off"
 
-#: ../cli/src/devices.c:808
+#: ../cli/src/devices.c:842
 #, c-format
 msgid "Error: 'dev status': %s"
 msgstr "Σφάλμα: 'dev status': %s"
 
-#: ../cli/src/devices.c:810
+#: ../cli/src/devices.c:844
 #, c-format
 msgid "Error: 'dev status': %s; allowed fields: %s"
 msgstr "Σφάλμα: 'dev status': %s, επιτρεπόμενα πεδία: %s"
 
-#: ../cli/src/devices.c:817
+#: ../cli/src/devices.c:867
 msgid "Status of devices"
 msgstr "Κατάσταση συσκευών"
 
-#: ../cli/src/devices.c:845
+#: ../cli/src/devices.c:898
 #, c-format
 msgid "Error: '%s' argument is missing."
-msgstr "Σφάλμα: Λείπει το όρισμα '%s' ."
+msgstr "Σφάλμα: λείπει το όρισμα '%s' ."
 
-#: ../cli/src/devices.c:874 ../cli/src/devices.c:1013
-#: ../cli/src/devices.c:1136
+#: ../cli/src/devices.c:939 ../cli/src/devices.c:1104
+#: ../cli/src/devices.c:1245 ../cli/src/devices.c:1892
 #, c-format
 msgid "Error: Device '%s' not found."
 msgstr "Σφάλμα: Δεν βρέθηκε η συσκευή '%s'."
 
-#: ../cli/src/devices.c:897
+#: ../cli/src/devices.c:962
 #, c-format
 msgid "Success: Device '%s' successfully disconnected."
 msgstr "Επιτυχία: Η συσκευή '%s' αποσυνδέθηκε επιτυχώς."
 
-#: ../cli/src/devices.c:922
+#: ../cli/src/devices.c:997
 #, c-format
 msgid "Error: Device '%s' (%s) disconnecting failed: %s"
 msgstr "Σφάλμα: Αποτυχία αποσύνδεσης συσκευής '%s' (%s): %s"
 
-#: ../cli/src/devices.c:930
+#: ../cli/src/devices.c:1010
 #, c-format
-msgid "Device state: %d (%s)\n"
-msgstr "Κατάσταση συσκευής: %d (%s)\n"
+msgid "Device '%s' has been disconnected.\n"
+msgstr "Αποσυνδέθηκε η συσκευή '%s'.\n"
 
-#: ../cli/src/devices.c:994
+#: ../cli/src/devices.c:1073
 #, c-format
 msgid "Error: iface has to be specified."
 msgstr "Σφάλμα: πρέπει να καθορισθεί το iface."
 
-#: ../cli/src/devices.c:1112
+#: ../cli/src/devices.c:1203
 #, c-format
 msgid "Error: 'dev wifi': %s"
 msgstr "Σφάλμα: 'dev wifi': %s"
 
-#: ../cli/src/devices.c:1114
+#: ../cli/src/devices.c:1205
 #, c-format
 msgid "Error: 'dev wifi': %s; allowed fields: %s"
 msgstr "Σφάλμα: 'dev wifi': %s, επιτρεπόμενα πεδία: %s"
 
-#: ../cli/src/devices.c:1121
+#: ../cli/src/devices.c:1228
 msgid "WiFi scan list"
 msgstr "Λίστα σάρωσης WiFi"
 
-#: ../cli/src/devices.c:1156 ../cli/src/devices.c:1210
+#: ../cli/src/devices.c:1265 ../cli/src/devices.c:1319
 #, c-format
-msgid "Error: Access point with hwaddr '%s' not found."
-msgstr "Σφάλμα: δεν βρέθηκε σημείο πρόσβασης με hwaddr '%s'."
+msgid "Error: Access point with bssid '%s' not found."
+msgstr "Σφάλμα: Δεν βρέθηκε σημείο πρόσβασης με bssid '%s'."
 
-#: ../cli/src/devices.c:1173
+#: ../cli/src/devices.c:1282
 #, c-format
 msgid "Error: Device '%s' is not a WiFi device."
 msgstr "Σφάλμα: Η συσκευή '%s' δεν είναι συσκευή WiFi."
 
-#: ../cli/src/devices.c:1237
+#: ../cli/src/devices.c:1350 ../cli/src/devices.c:1396
+#, c-format
+msgid "Connection with UUID '%s' created and activated on device '%s'\n"
+msgstr ""
+"Δημιουργήθηκε και ενεργοποιήθηκε η σύνδεση με UUID '%s'  στη συσκευή '%s'\n"
+
+#: ../cli/src/devices.c:1355
+#, c-format
+msgid "Error: Connection activation failed: (%d) %s."
+msgstr "Σφάλμα: Αποτυχία ενεργοποίησης σύνδεσης: (%d) %s."
+
+#: ../cli/src/devices.c:1380
+#, c-format
+msgid "Error: Failed to add/activate new connection: (%d) %s"
+msgstr "Σφάλμα: Αποτυχία προσθήκης/ενεργοποίησης της νέας σύνδεσης: (%d) %s"
+
+#: ../cli/src/devices.c:1388
+#, c-format
+msgid "Error: Failed to add/activate new connection: Unknown error"
+msgstr ""
+"Σφάλμα: Αποτυχία προσθήκης/ενεργοποίησης της νέας σύνδεσης: Άγνωστο σφάλμα"
+
+#: ../cli/src/devices.c:1532
+#, c-format
+msgid "Error: SSID or BSSID are missing."
+msgstr "Σφάλμα: λείπουν τα SSID ή BSSID"
+
+#: ../cli/src/devices.c:1555
+#, c-format
+msgid "Error: bssid argument value '%s' is not a valid BSSID."
+msgstr "Σφάλμα: η τιμή του bssid ορίσματος '%s' δεν είναι ένα έγκυρο BSSID."
+
+#: ../cli/src/devices.c:1579
+#, c-format
+msgid ""
+"Error: wep-key-type argument value '%s' is invalid, use 'key' or 'phrase'."
+msgstr ""
+"Σφάλμα: η τιμή του ορίσματος wep-key-type '%s' δεν είναι έγκυρη, "
+"χρησιμοποιήστε 'key' ή 'phrase'."
+
+#: ../cli/src/devices.c:1619
+#, c-format
+msgid "Error: BSSID to connect to (%s) differs from bssid argument (%s)."
+msgstr ""
+"Σφάλμα: Το BSSID για τη σύνδεση στο (%s) διαφέρει από τη παράμετρο bssid "
+"(%s)."
+
+#: ../cli/src/devices.c:1625
+#, c-format
+msgid "Error: Parameter '%s' is neither SSID nor BSSID."
+msgstr "Σφάλμα: Η παράμετρος '%s' δεν είναι ούτε SSID ούτε BSSID."
+
+#: ../cli/src/devices.c:1654
+#, c-format
+msgid "Error: Device '%s' is not a Wi-Fi device."
+msgstr "Σφάλμα: Η συσκευή '%s' δεν είναι συσκευή Wi-Fi."
+
+#: ../cli/src/devices.c:1656
+#, c-format
+msgid "Error: No Wi-Fi device found."
+msgstr "Σφάλμα: Δε βρέθηκε συσκευή Wi-Fi."
+
+#: ../cli/src/devices.c:1674
+#, c-format
+msgid "Error: No network with SSID '%s' found."
+msgstr "Σφάλμα: Δεν βρέθηκε δίκτυο με SSID '%s'."
+
+#: ../cli/src/devices.c:1676
+#, c-format
+msgid "Error: No access point with BSSID '%s' found."
+msgstr "Σφάλμα: Δεν βρέθηκε σημείο πρόσβασης με BSSID '%s'."
+
+#: ../cli/src/devices.c:1774
 #, c-format
 msgid "Error: 'dev wifi' command '%s' is not valid."
 msgstr "Σφάλμα: η εντολή 'dev wifi' '%s' δεν είναι έγκυρη."
 
-#: ../cli/src/devices.c:1284
+#: ../cli/src/devices.c:1850
+#, c-format
+msgid "Error: 'dev wimax': %s"
+msgstr "Σφάλμα: 'dev wimax': %s"
+
+#: ../cli/src/devices.c:1852
+#, c-format
+msgid "Error: 'dev wimax': %s; allowed fields: %s"
+msgstr "Σφάλμα: 'dev wimax': %s, επιτρεπόμενα πεδία: %s"
+
+#: ../cli/src/devices.c:1875
+msgid "WiMAX NSP list"
+msgstr "λίστα WiMAX NSP"
+
+#: ../cli/src/devices.c:1912
+#, c-format
+msgid "Error: NSP with name '%s' not found."
+msgstr "Σφάλμα: Δεν βρέθηκε NSP με όνομα '%s'."
+
+#: ../cli/src/devices.c:1923
+#, c-format
+msgid "Error: Device '%s' is not a WiMAX device."
+msgstr "Σφάλμα: Η συσκευή '%s' δεν είναι συσκευή WiMAX."
+
+#: ../cli/src/devices.c:1954
+#, c-format
+msgid "Error: Access point with nsp '%s' not found."
+msgstr "Σφάλμα: Δεν βρέθηκε σημείο πρόσβασης με nsp '%s'."
+
+#: ../cli/src/devices.c:1981
+#, c-format
+msgid "Error: 'dev wimax' command '%s' is not valid."
+msgstr "Σφάλμα: η εντολή 'dev wimax' '%s' δεν είναι έγκυρη."
+
+#: ../cli/src/devices.c:2031
 #, 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 "ΕΚΤΕΛΕΙΤΑΙ"
 
-#. 1
-#: ../cli/src/network-manager.c:37
+#. 0
+#: ../cli/src/network-manager.c:38
+msgid "VERSION"
+msgstr "ΕΚΔΟΣΗ"
+
+#. 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"
 
-#. 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"
 
-#. 4
-#: ../cli/src/network-manager.c:40
+#. 6
+#: ../cli/src/network-manager.c:44
 msgid "WWAN"
 msgstr "WWAN"
 
+#. 7
+#: ../cli/src/network-manager.c:45
+msgid "WIMAX-HARDWARE"
+msgstr "ΥΛΙΚΟ-WIMAX"
+
+#. 8
+#: ../cli/src/network-manager.c:46
+msgid "WIMAX"
+msgstr "WIMAX"
+
 #: ../cli/src/network-manager.c:62
+msgid "PERMISSION"
+msgstr "ΑΔΕΙΑ"
+
+#. 0
+#: ../cli/src/network-manager.c:63
+msgid "VALUE"
+msgstr "ΤΙΜΗ"
+
+#: ../cli/src/network-manager.c:77
 #, c-format
 msgid ""
 "Usage: nmcli nm { COMMAND | help }\n"
 "\n"
-"  COMMAND := { status | sleep | wakeup | wifi | wwan }\n"
+"  COMMAND := { status | permissions | enable | sleep | wifi | wwan | "
+"wimax }\n"
+"\n"
+"  COMMAND := { status | permissions | enable | sleep | wifi | wwan }\n"
 "\n"
 "  status\n"
-"  sleep\n"
-"  wakeup\n"
+"  permissions\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 | permissions | enable | sleep | wifi | wwan | "
+"wimax }\n"
+"\n"
+"  COMMAND := { status | permissions | enable | sleep | wifi | wwan }\n"
 "\n"
 "  status\n"
-"  sleep\n"
-"  wakeup\n"
+"  permissions\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:108
 msgid "asleep"
 msgstr "ύπνωση"
 
-#: ../cli/src/network-manager.c:85
+#: ../cli/src/network-manager.c:110
 msgid "connecting"
 msgstr "σύνδεση"
 
-#: ../cli/src/network-manager.c:125
+#: ../cli/src/network-manager.c:112
+#, fuzzy
+msgid "connected (local only)"
+msgstr "Μόνο τοπικά αρχεία"
+
+#: ../cli/src/network-manager.c:114
+#, fuzzy
+#| msgid "connected"
+msgid "connected (site only)"
+msgstr "_Μόνο αν κάποιος είναι συνδεδεμένος"
+
+#: ../cli/src/network-manager.c:118
+msgid "disconnecting"
+msgstr "γίνεται αποσύνδεση"
+
+#: ../cli/src/network-manager.c:158
 #, c-format
 msgid "Error: 'nm status': %s"
 msgstr "Σφάλμα:  'nm status': %s"
 
-#: ../cli/src/network-manager.c:127
+#: ../cli/src/network-manager.c:160
 #, 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
+#. create NMClient
+#: ../cli/src/network-manager.c:173 ../cli/src/network-manager.c:174
+#: ../cli/src/network-manager.c:175 ../cli/src/network-manager.c:176
+#: ../cli/src/network-manager.c:177 ../cli/src/network-manager.c:179
+#: ../cli/src/network-manager.c:180 ../cli/src/network-manager.c:429
+#: ../cli/src/network-manager.c:484 ../cli/src/network-manager.c:522
+#: ../cli/src/network-manager.c:561
 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:173 ../cli/src/network-manager.c:174
+#: ../cli/src/network-manager.c:175 ../cli/src/network-manager.c:176
+#: ../cli/src/network-manager.c:177 ../cli/src/network-manager.c:179
+#: ../cli/src/network-manager.c:180 ../cli/src/network-manager.c:429
+#: ../cli/src/network-manager.c:484 ../cli/src/network-manager.c:522
+#: ../cli/src/network-manager.c:561
 msgid "disabled"
 msgstr "απενεργοποιημένη"
 
-#: ../cli/src/network-manager.c:148
+#: ../cli/src/network-manager.c:193
+msgid "NetworkManager status"
+msgstr "Κατάσταση της Διαχείρισης Δικτύου"
+
+#. Print header
+#: ../cli/src/network-manager.c:196
 msgid "running"
 msgstr "εκτελείται"
 
-#: ../cli/src/network-manager.c:148
+#: ../cli/src/network-manager.c:196
 msgid "not running"
 msgstr "δεν εκτελείται"
 
-#: ../cli/src/network-manager.c:201 ../cli/src/network-manager.c:233
+#: ../cli/src/network-manager.c:271
+msgid "auth"
+msgstr "auth"
+
+#: ../cli/src/network-manager.c:301
+#, c-format
+msgid "Error: 'nm permissions': %s"
+msgstr "Σφάλμα: 'nm permissions': %s"
+
+#: ../cli/src/network-manager.c:303
+#, c-format
+msgid "Error: 'nm permissions': %s; allowed fields: %s"
+msgstr "Σφάλμα: 'nm permissions': %s; επιτρεπόμενα πεδία: %s"
+
+#: ../cli/src/network-manager.c:324
+msgid "NetworkManager permissions"
+msgstr "Δικαιώματα NetworkManager"
+
+#: ../cli/src/network-manager.c:350 ../cli/src/utils.c:457
+#, c-format
+msgid "Error: Couldn't connect to system bus: %s"
+msgstr "Σφάλμα: Αδυναμία σύνδεσης στο δίαυλο συστήματος: %s"
+
+#: ../cli/src/network-manager.c:361
+#, c-format
+msgid "Error: Couldn't create D-Bus object proxy."
+msgstr "Σφάλμα: Αδυναμία δημιουργίας αντικειμένου διαμεσολαβητή του D-Bus."
+
+#: ../cli/src/network-manager.c:367
+#, fuzzy, c-format
+#| msgid "Error: 'con list': %s"
+msgid "Error in sleep: %s"
+msgstr ""
+"Ανάλυση σφάλματος σε '%s':\n"
+"%s"
+
+#: ../cli/src/network-manager.c:416 ../cli/src/network-manager.c:471
+#: ../cli/src/network-manager.c:509 ../cli/src/network-manager.c:548
 #, c-format
 msgid "Error: '--fields' value '%s' is not valid here; allowed fields: %s"
 msgstr ""
 "Σφάλμα: η τιμή '%s' του ορίσματος '--fields' δεν είναι έγκυρη εδώ. "
 "Επιτρεπόμενα πεδία: %s"
 
-#: ../cli/src/network-manager.c:209
+#: ../cli/src/network-manager.c:424
+msgid "Networking enabled"
+msgstr "Ενεργοποιήθηκε η δικτύωση"
+
+#: ../cli/src/network-manager.c:440
+#, c-format
+msgid "Error: invalid 'enable' parameter: '%s'; use 'true' or 'false'."
+msgstr ""
+"Σφάλμα: μη έγκυρη παράμετρος 'enable': '%s'; χρησιμοποιήστε 'true' ή 'false'."
+
+#: ../cli/src/network-manager.c:450
+#, fuzzy, c-format
+#| msgid "Error: Could not connect to NetworkManager."
+msgid "Error: Sleeping status is not exported by NetworkManager."
+msgstr "Σφάλμα: Αδυναμία σύνδεσης στη Διαχείριση Δικτύου."
+
+#: ../cli/src/network-manager.c:458
+#, c-format
+msgid "Error: invalid 'sleep' parameter: '%s'; use 'true' or 'false'."
+msgstr ""
+"Σφάλμα: μη έγκυρη παράμετρος 'sleep': '%s'; χρησιμοποιήστε 'true' ή 'false'."
+
+#: ../cli/src/network-manager.c:479
 msgid "WiFi enabled"
 msgstr "Ασύρματο (WiFi) ενεργοποιημένο"
 
-#: ../cli/src/network-manager.c:220
+#: ../cli/src/network-manager.c:495
 #, c-format
 msgid "Error: invalid 'wifi' parameter: '%s'."
 msgstr "Σφάλμα: μη έγκυρη παράμετρος 'wifi': '%s'."
 
-#: ../cli/src/network-manager.c:241
+#: ../cli/src/network-manager.c:517
 msgid "WWAN enabled"
 msgstr "WWAN ενεργοποιημένο"
 
-#: ../cli/src/network-manager.c:252
+#: ../cli/src/network-manager.c:533
 #, c-format
 msgid "Error: invalid 'wwan' parameter: '%s'."
 msgstr "Σφάλμα: μη έγκυρη παράμετρος 'wwan': '%s'."
 
-#: ../cli/src/network-manager.c:263
+#: ../cli/src/network-manager.c:556
+msgid "WiMAX enabled"
+msgstr "Ενεργοποιήθηκε το WiMAX"
+
+#: ../cli/src/network-manager.c:572
+#, c-format
+msgid "Error: invalid 'wimax' parameter: '%s'."
+msgstr "Σφάλμα: μη έγκυρη παράμετρος 'wimax': '%s'."
+
+#: ../cli/src/network-manager.c:585
 #, c-format
 msgid "Error: 'nm' command '%s' is not valid."
 msgstr "Σφάλμα: η 'nm' εντολή '%s' δεν είναι έγκυρη."
 
-#: ../cli/src/nmcli.c:69
+#: ../cli/src/nmcli.c:76
 #, c-format
 msgid ""
 "Usage: %s [OPTIONS] OBJECT { COMMAND | help }\n"
@@ -995,6 +1689,8 @@ msgid ""
 "  -f[ields] |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"
@@ -1013,6 +1709,8 @@ msgstr ""
 "  -f[ields] |all|common   καθορισμός πεδίων για έξοδο\n"
 "  -e[scape] yes|no                           escape διαχωριστικά στηλών στις "
 "τιμές\n"
+"  -n[ocheck]                                 μην ελέγξεις της εκδόσεις των "
+"nmcli και NetworkManager\n"
 "  -v[ersion]                                 εμφάνιση έκδοσης ποργράμματος\n"
 "  -h[elp]                                    εκτύπωση βοήθειας\n"
 "\n"
@@ -1022,599 +1720,638 @@ msgstr ""
 "  dev         συσκευές που διαχειρίζεται ο NetworkManager\n"
 "\n"
 
-#: ../cli/src/nmcli.c:113
+#: ../cli/src/nmcli.c:121
 #, c-format
 msgid "Error: Object '%s' is unknown, try 'nmcli help'."
 msgstr "Σφάλμα: το αντικείμενο '%s' είναι άγνωστο, δοκιμάστε την 'nmcli help'."
 
-#: ../cli/src/nmcli.c:143
+#: ../cli/src/nmcli.c:151
 #, c-format
 msgid "Error: Option '--terse' is specified the second time."
 msgstr "Σφάλμα: η επιλογή '--terse' καθορίζεται τη δεύτερη φορά."
 
-#: ../cli/src/nmcli.c:148
+#: ../cli/src/nmcli.c:156
 #, c-format
 msgid "Error: Option '--terse' is mutually exclusive with '--pretty'."
 msgstr ""
 "Σφάλμα: η επιλογή '--terse' είναι αμοιβαία αποκλειόμενη με την '--pretty'."
 
-#: ../cli/src/nmcli.c:156
+#: ../cli/src/nmcli.c:164
 #, c-format
 msgid "Error: Option '--pretty' is specified the second time."
 msgstr "Σφάλμα: η επιλογή '--pretty' καθορίζεται τη δεύτερη φορά."
 
-#: ../cli/src/nmcli.c:161
+#: ../cli/src/nmcli.c:169
 #, 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:179 ../cli/src/nmcli.c:195
 #, 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:188 ../cli/src/nmcli.c:204
 #, c-format
 msgid "Error: '%s' is not valid argument for '%s' option."
 msgstr "Σφάλμα: το '%s' δεν είναι έγκυρο όρισμα για την επιλογή '%s'."
 
-#: ../cli/src/nmcli.c:203
+#: ../cli/src/nmcli.c:211
 #, c-format
 msgid "Error: fields for '%s' options are missing."
 msgstr "Σφάλμα: λείπουν πεδία για τις επιλογές '%s'."
 
-#: ../cli/src/nmcli.c:209
+#: ../cli/src/nmcli.c:219
 #, c-format
 msgid "nmcli tool, version %s\n"
 msgstr "Εργαλείο nmcli, έκδοση %s\n"
 
-#: ../cli/src/nmcli.c:215
+#: ../cli/src/nmcli.c:225
 #, c-format
 msgid "Error: Option '%s' is unknown, try 'nmcli -help'."
 msgstr "Σφάλμα: Η επιλογή '%s' είναι άγνωστη, δοκιμάστε 'nmcli -help'."
 
-#: ../cli/src/nmcli.c:234
+#: ../cli/src/nmcli.c:244
 #, 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 "Σφάλμα: Αδυναμία σύνδεσης στη Διαχείριση Δικτύου."
+#: ../cli/src/nmcli.c:269
+msgid "Error: Could not create NMClient object."
+msgstr "Σφάλμα: Αδυναμία δημιουργίας αντικειμένου NMClient."
 
-#: ../cli/src/nmcli.c:275
+#: ../cli/src/nmcli.c:285
 msgid "Success"
 msgstr "Επιτυχία"
 
-#: ../cli/src/settings.c:411
+#: ../cli/src/settings.c:519
 #, c-format
 msgid "%d (hex-ascii-key)"
 msgstr "%d (hex-ascii-key)"
 
-#: ../cli/src/settings.c:413
+#: ../cli/src/settings.c:521
 #, c-format
 msgid "%d (104/128-bit passphrase)"
 msgstr "%d (104/128-bit φράση κλειδί)"
 
-#: ../cli/src/settings.c:416
+#: ../cli/src/settings.c:524 ../cli/src/settings.c:652
 #, c-format
 msgid "%d (unknown)"
 msgstr "%d (άγνωστο)"
 
-#: ../cli/src/settings.c:442
+#: ../cli/src/settings.c:550
 msgid "0 (unknown)"
 msgstr "0 (άγνωστο)"
 
-#: ../cli/src/settings.c:448
+#: ../cli/src/settings.c:556
 msgid "any, "
 msgstr "οποιοδήποτε,"
 
-#: ../cli/src/settings.c:450
+#: ../cli/src/settings.c:558
 msgid "900 MHz, "
 msgstr "900 MHz, "
 
-#: ../cli/src/settings.c:452
+#: ../cli/src/settings.c:560
 msgid "1800 MHz, "
 msgstr "1800 MHz, "
 
-#: ../cli/src/settings.c:454
+#: ../cli/src/settings.c:562
 msgid "1900 MHz, "
 msgstr "1900 MHz, "
 
-#: ../cli/src/settings.c:456
+#: ../cli/src/settings.c:564
 msgid "850 MHz, "
 msgstr "850 MHz, "
 
-#: ../cli/src/settings.c:458
+#: ../cli/src/settings.c:566
 msgid "WCDMA 3GPP UMTS 2100 MHz, "
 msgstr "WCDMA 3GPP UMTS 2100 MHz, "
 
-#: ../cli/src/settings.c:460
+#: ../cli/src/settings.c:568
 msgid "WCDMA 3GPP UMTS 1800 MHz, "
 msgstr "WCDMA 3GPP UMTS 1800 MHz, "
 
-#: ../cli/src/settings.c:462
+#: ../cli/src/settings.c:570
 msgid "WCDMA 3GPP UMTS 1700/2100 MHz, "
 msgstr "WCDMA 3GPP UMTS 1700/2100 MHz, "
 
-#: ../cli/src/settings.c:464
+#: ../cli/src/settings.c:572
 msgid "WCDMA 3GPP UMTS 800 MHz, "
 msgstr "WCDMA 3GPP UMTS 800 MHz, "
 
-#: ../cli/src/settings.c:466
+#: ../cli/src/settings.c:574
 msgid "WCDMA 3GPP UMTS 850 MHz, "
 msgstr "WCDMA 3GPP UMTS 850 MHz, "
 
-#: ../cli/src/settings.c:468
+#: ../cli/src/settings.c:576
 msgid "WCDMA 3GPP UMTS 900 MHz, "
 msgstr "WCDMA 3GPP UMTS 900 MHz, "
 
-#: ../cli/src/settings.c:470
+#: ../cli/src/settings.c:578
 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:580
+msgid "WCDMA 3GPP UMTS 1900 MHz, "
+msgstr "WCDMA 3GPP UMTS 1900 MHz, "
+
+#: ../cli/src/settings.c:582
+msgid "WCDMA 3GPP UMTS 2600 MHz, "
+msgstr "WCDMA 3GPP UMTS 2600 MHz, "
+
+#: ../cli/src/settings.c:600
+msgid "0 (NONE)"
+msgstr "0 (ΚΑΝΕΝΑ)"
+
+#: ../cli/src/settings.c:606
+msgid "REORDER_HEADERS, "
+msgstr "REORDER_HEADERS, "
+
+#: ../cli/src/settings.c:608
+msgid "GVRP, "
+msgstr "GVRP, "
+
+#: ../cli/src/settings.c:610
+msgid "LOOSE_BINDING, "
+msgstr "LOOSE_BINDING, "
+
+#: ../cli/src/settings.c:646
+#, c-format
+msgid "%d (disabled)"
+msgstr "%d (απενεργοποιημένο)"
+
+#: ../cli/src/settings.c:648
+#, c-format
+msgid "%d (enabled, prefer public IP)"
+msgstr "%d (ενεργοποιημένο, προτιμήστε δημόσια διεύθυνση IP)"
+
+#: ../cli/src/settings.c:650
+#, c-format
+msgid "%d (enabled, prefer temporary IP)"
+msgstr "%d (ενεργοποιημένο, προτιμήστε προσωρινή διεύθυνση IP)"
+
+#: ../cli/src/settings.c:768 ../cli/src/settings.c:964
+#: ../cli/src/settings.c:1673
 msgid "auto"
 msgstr "αυτόματα"
 
-#: ../cli/src/settings.c:716 ../cli/src/settings.c:719
-#: ../cli/src/settings.c:720 ../cli/src/utils.c:172
-msgid "not set"
-msgstr "δεν ορίσθηκε"
+#: ../cli/src/utils.c:103
+#, c-format
+msgid "Error converting IP4 address '0x%X' to text form"
+msgstr "Σφάλμα κατά τη μετατροπή της διεύθυνσης IP4 '0x%X' σε κείμενο"
+
+#: ../cli/src/utils.c:131
+#, c-format
+msgid "Error converting IP6 address '%s' to text form"
+msgstr "Σφάλμα κατά τη μετατροπή της διεύθυνσης IP6 '%s' σε κείμενο"
 
-#: ../cli/src/utils.c:124
+#: ../cli/src/utils.c:232
 #, c-format
 msgid "field '%s' has to be alone"
 msgstr "το πεδίο '%s' πρέπει να είναι μόνο του"
 
-#: ../cli/src/utils.c:127
+#: ../cli/src/utils.c:235
 #, c-format
 msgid "invalid field '%s'"
 msgstr "μη έγκυρο πεδίο '%s'"
 
-#: ../cli/src/utils.c:146
-#, c-format
+#: ../cli/src/utils.c:254
 msgid "Option '--terse' requires specifying '--fields'"
 msgstr "Η επιλογή '--terse' απαιτεί να καθορισθούν '--fields'"
 
-#: ../cli/src/utils.c:150
+#: ../cli/src/utils.c:258
 #, 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:468
+#, c-format
+msgid "Error: Couldn't create D-Bus object proxy for org.freedesktop.DBus"
+msgstr ""
+"Σφάλμα: Αδυναμία δημιουργίας αντικειμένου διαμεσολαβητή D-Bus για το org."
+"freedesktop.DBus"
+
+#: ../cli/src/utils.c:476
+#, c-format
+msgid "Error: NameHasOwner request failed: %s"
+msgstr "Σφάλμα: Απέτυχε η αίτηση NameHasOwner: %s"
+
+#: ../cli/src/utils.c:521
+#, 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:530
+#, 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:133
 #, c-format
 msgid "PEM key file had no end tag '%s'."
 msgstr "Το αρχείο κλειδιού PEM δεν είχε ετικέτα τέλους '%s'."
 
-#: ../libnm-util/crypto.c:130
+#: ../libnm-util/crypto.c:146
 #, c-format
 msgid "Doesn't look like a PEM private key file."
 msgstr "Δε μοιάζει με αρχείο ιδιωτικού κλειδιού PEM."
 
-#: ../libnm-util/crypto.c:138
+#: ../libnm-util/crypto.c:154
 #, c-format
 msgid "Not enough memory to store PEM file data."
 msgstr "Δεν επαρκεί η μνήμη για την αποθήκευση των δεδομένων του αρχείου PEM."
 
-#: ../libnm-util/crypto.c:154
+#: ../libnm-util/crypto.c:170
 #, 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:178
 #, 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:188
 #, 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:199
 #, 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:206
 #, c-format
 msgid "Malformed PEM file: invalid format of IV in DEK-Info tag."
 msgstr "Κακοσχηματισμένο αρχείο PEM: Άκυρη μορφή του IV στην ετικέτα DEK-Info."
 
-#: ../libnm-util/crypto.c:203
+#: ../libnm-util/crypto.c:219
 #, c-format
 msgid "Malformed PEM file: unknown private key cipher '%s'."
 msgstr ""
 "Κακοσχηματισμένο αρχείο PEM: Άγνωστος ο κρυπτογραφικός αλγόριθμος '%s' του "
 "ιδιωτικού κλειδιού."
 
-#: ../libnm-util/crypto.c:222
+#: ../libnm-util/crypto.c:238
 #, 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' δε διέθετε ετικέτα τέλους '%s'."
+#: ../libnm-util/crypto.c:284
+#, fuzzy
+msgid "Failed to find expected PKCS#8 start tag."
+msgstr "Αποτυχία εύρεσης της αναμενόμενης ετικέτας αρχής PKCS#8."
 
-#: ../libnm-util/crypto.c:277
-#, c-format
-msgid "Failed to decode certificate."
-msgstr "Απέτυχε η αποκωδικοποίηση του πιστοποιητικού."
+#: ../libnm-util/crypto.c:292
+#, fuzzy, c-format
+msgid "Failed to find expected PKCS#8 end tag '%s'."
+msgstr "Αποτυχία εύρεσης της αναμενόμενης ετικέτας τέλους PKCS#8 '%s'."
 
-#: ../libnm-util/crypto.c:286
+#: ../libnm-util/crypto.c:312
+msgid "Not enough memory to store private key data."
+msgstr ""
+"Δεν επαρκεί η μνήμη για την αποθήκευση των δεδομένων του ιδιωτικού κλειδιού."
+
+#: ../libnm-util/crypto.c:317
+msgid "Failed to decode PKCS#8 private key."
+msgstr "Αδύνατη η αποκωδικοποίηση του προσωπικού κλειδιού PKCS#8."
+
+#: ../libnm-util/crypto.c:339 ../libnm-util/crypto.c:625
 #, 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
+#: ../libnm-util/crypto.c:365
 #, c-format
 msgid "IV must be an even number of bytes in length."
 msgstr "Το μήκος του IV πρέπει να αντιστοιχεί σε άρτιο αριθμό byte."
 
-#: ../libnm-util/crypto.c:333
+#: ../libnm-util/crypto.c:374
 #, c-format
 msgid "Not enough memory to store the IV."
 msgstr "Δεν επαρκεί η μνήμη για την αποθήκευση του IV."
 
-#: ../libnm-util/crypto.c:344
+#: ../libnm-util/crypto.c:385
 #, c-format
 msgid "IV contains non-hexadecimal digits."
 msgstr "Το IV περιέχει μη δεκαεξαδικά ψηφία."
 
-#: ../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_nss.c:336
+#: ../libnm-util/crypto.c:423 ../libnm-util/crypto_gnutls.c:147
+#: ../libnm-util/crypto_gnutls.c:265 ../libnm-util/crypto_nss.c:167
+#: ../libnm-util/crypto_nss.c:332
 #, c-format
 msgid "Private key cipher '%s' was unknown."
 msgstr "Άγνωστος ο κρυπτογραφικός αλγόριθμος '%s' του ιδιωτικού κλειδιού."
 
-#: ../libnm-util/crypto.c:391
+#: ../libnm-util/crypto.c:432
 #, c-format
 msgid "Not enough memory to decrypt private key."
 msgstr "Δεν επαρκεί η μνήμη για την αποκρυπτογράφηση του ιδιωτικού κλειδιού."
 
-#: ../libnm-util/crypto.c:511
-#, c-format
-msgid "Unable to determine private key type."
-msgstr "Αδύνατος ο προσδιορισμός του τύπου του ιδιωτικού κλειδιού."
-
-#: ../libnm-util/crypto.c:530
+#: ../libnm-util/crypto.c:497
 #, c-format
 msgid "Not enough memory to store decrypted private key."
 msgstr ""
 "Δεν επαρκεί η μνήμη για την αποθήκευση του αποκρυπτογραφημένου ιδιωτικού "
 "κλειδιού."
 
-#: ../libnm-util/crypto_gnutls.c:49
+#: ../libnm-util/crypto.c:542
+#, c-format
+msgid "Unable to determine private key type."
+msgstr "Αδύνατος ο προσδιορισμός του τύπου του ιδιωτικού κλειδιού."
+
+#: ../libnm-util/crypto.c:597
+#, c-format
+msgid "PEM certificate had no start tag '%s'."
+msgstr "Η πιστοποίηση PEM δεν είχε ετικέτα αρχής '%s'."
+
+#: ../libnm-util/crypto.c:606
+#, c-format
+msgid "PEM certificate had no end tag '%s'."
+msgstr "Η πιστοποίηση PEM δεν είχε ετικέτα τέλους '%s'."
+
+#: ../libnm-util/crypto.c:630
+#, 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:92
 #, 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:155
 #, 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:164 ../libnm-util/crypto_nss.c:184
 #, c-format
 msgid "Not enough memory for decrypted key buffer."
 msgstr ""
 "Η μνήμη δεν επαρκεί για τις ανάγκες της ενδιάμεσης μνήμης του "
 "αποκρυπτογραφημένου κλειδιού."
 
-#: ../libnm-util/crypto_gnutls.c:173
+#: ../libnm-util/crypto_gnutls.c:172
 #, 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:181
 #, 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:190
 #, 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:199
 #, 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:209 ../libnm-util/crypto_nss.c:263
 #, c-format
-#| msgid "Failed to decrypt the private key: %d."
 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:220 ../libnm-util/crypto_nss.c:274
 #, 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:285 ../libnm-util/crypto_nss.c:352
 #, c-format
 msgid "Could not allocate memory for encrypting."
 msgstr "Αδυναμία διάθεσης μνήμης για κρυπτογράφηση."
 
-#: ../libnm-util/crypto_gnutls.c:294
+#: ../libnm-util/crypto_gnutls.c:293
 #, c-format
-#| msgid "Failed to initialize the decryption cipher context: %s / %s."
 msgid "Failed to initialize the encryption cipher context: %s / %s."
 msgstr "Απέτυχε η αρχικοποίηση του αλγορίθμου κρυπτογράφησης: %s / %s."
 
-#: ../libnm-util/crypto_gnutls.c:303
+#: ../libnm-util/crypto_gnutls.c:302
 #, c-format
-#| msgid "Failed to set symmetric key for decryption: %s / %s."
 msgid "Failed to set symmetric key for encryption: %s / %s."
 msgstr "Απέτυχε ο ορισμός συμμετρικού κλειδιού για την κρυπτογράφηση: %s / %s."
 
-#: ../libnm-util/crypto_gnutls.c:313
+#: ../libnm-util/crypto_gnutls.c:312
 #, c-format
-#| msgid "Failed to set IV for decryption: %s / %s."
 msgid "Failed to set IV for encryption: %s / %s."
 msgstr "Απέτυχε να ορισθεί το IV για την κρυπτογράφηση: %s / %s."
 
-#: ../libnm-util/crypto_gnutls.c:322
+#: ../libnm-util/crypto_gnutls.c:321
 #, c-format
-#| msgid "Failed to decrypt the private key: %s / %s."
 msgid "Failed to encrypt the data: %s / %s."
 msgstr "Απέτυχε η κρυπτογράφηση των δεδομένων: %s / %s."
 
-#: ../libnm-util/crypto_gnutls.c:362
+#: ../libnm-util/crypto_gnutls.c:361
 #, c-format
 msgid "Error initializing certificate data: %s"
 msgstr "Σφάλμα κατά την αρχικοποίηση των δεδομένων του πιστοποιητικού: %s"
 
-#: ../libnm-util/crypto_gnutls.c:384
+#: ../libnm-util/crypto_gnutls.c:383
 #, c-format
 msgid "Couldn't decode certificate: %s"
 msgstr "Αδύνατη η αποκωδικοποίηση του πιστοποιητικού: %s"
 
-#: ../libnm-util/crypto_gnutls.c:408
+#: ../libnm-util/crypto_gnutls.c:407
 #, 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:420
 #, 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:432
 #, c-format
 msgid "Couldn't verify PKCS#12 file: %s"
 msgstr "Αδύνατη η διαπίστωση του αρχείου PKCS#12: %s"
 
+#: ../libnm-util/crypto_gnutls.c:460
+#, c-format
+msgid "Couldn't initialize PKCS#8 decoder: %s"
+msgstr "Αδύνατη η αρχικοποίηση του αποκωδικοποιητή PKCS#8: %s"
+
+#: ../libnm-util/crypto_gnutls.c:483
+#, c-format
+msgid "Couldn't decode PKCS#8 file: %s"
+msgstr "Αδύνατη η αποκωδικοποίηση του αρχείου PKCS#8: %s"
+
 #: ../libnm-util/crypto_nss.c:56
 #, c-format
 msgid "Failed to initialize the crypto engine: %d."
 msgstr "Απέτυχε η αρχικοποίηση της μηχανής κρυπτογραφίας: %d."
 
-#: ../libnm-util/crypto_nss.c:111
+#: ../libnm-util/crypto_nss.c:107
 #, c-format
 msgid "Failed to initialize the MD5 context: %d."
 msgstr "Απέτυχε η αρχικοποίηση του MD5 : %d."
 
-#: ../libnm-util/crypto_nss.c:179
+#: ../libnm-util/crypto_nss.c:175
 #, c-format
 msgid "Invalid IV length (must be at least %d)."
 msgstr "Μη έγκυρο μήκος IV (πρέπει να είναι τουλάχιστον %d)"
 
-#: ../libnm-util/crypto_nss.c:196
+#: ../libnm-util/crypto_nss.c:192
 #, c-format
 msgid "Failed to initialize the decryption cipher slot."
 msgstr "Απέτυχε η αρχικοποίηση του αλγορίθμου αποκρυπτογράφησης."
 
-#: ../libnm-util/crypto_nss.c:206
+#: ../libnm-util/crypto_nss.c:202
 #, c-format
 msgid "Failed to set symmetric key for decryption."
 msgstr "Απέτυχε ο ορισμός συμμετρικού κλειδιού για την αποκρυπτογράφηση."
 
-#: ../libnm-util/crypto_nss.c:216
+#: ../libnm-util/crypto_nss.c:212
 #, c-format
 msgid "Failed to set IV for decryption."
 msgstr "Απέτυχε ο ορισμός IV για την αποκρυπτογράφηση."
 
-#: ../libnm-util/crypto_nss.c:224
+#: ../libnm-util/crypto_nss.c:220
 #, c-format
 msgid "Failed to initialize the decryption context."
 msgstr "Απέτυχε η αρχικοποίηση της αποκρυπτογράφησης."
 
-#: ../libnm-util/crypto_nss.c:237
+#: ../libnm-util/crypto_nss.c:233
 #, c-format
 msgid "Failed to decrypt the private key: %d."
 msgstr "Απέτυχε η αποκρυπτογράφηση του ιδιωτικού κλειδιού: %d."
 
-#: ../libnm-util/crypto_nss.c:245
+#: ../libnm-util/crypto_nss.c:241
 #, c-format
-#| msgid "Failed to decrypt the private key: %d."
 msgid "Failed to decrypt the private key: decrypted data too large."
 msgstr ""
 "Απέτυχε η αποκρυπτογράφηση του ιδιωτικού κλειδιού: τα αποκρυπτογραφημένα "
 "δεδομένα είναι πάρα πολλά."
 
-#: ../libnm-util/crypto_nss.c:256
+#: ../libnm-util/crypto_nss.c:252
 #, c-format
 msgid "Failed to finalize decryption of the private key: %d."
 msgstr "Απέτυχε η ολοκλήρωση της αποκρυπτογράφησης του ιδιωτικού κλειδιού: %d."
 
-#: ../libnm-util/crypto_nss.c:364
+#: ../libnm-util/crypto_nss.c:360
 #, c-format
-#| msgid "Failed to initialize the decryption cipher slot."
 msgid "Failed to initialize the encryption cipher slot."
 msgstr "Απέτυχε η αρχικοποίηση του αλγορίθμου κρυπτογράφησης."
 
-#: ../libnm-util/crypto_nss.c:372
+#: ../libnm-util/crypto_nss.c:368
 #, c-format
-#| msgid "Failed to set symmetric key for decryption."
 msgid "Failed to set symmetric key for encryption."
 msgstr "Απέτυχε ο ορισμός συμμετρικού κλειδιού για την κρυπτογράφηση."
 
-#: ../libnm-util/crypto_nss.c:380
+#: ../libnm-util/crypto_nss.c:376
 #, c-format
-#| msgid "Failed to set IV for decryption."
 msgid "Failed to set IV for encryption."
 msgstr "Απέτυχε ο ορισμός IV για την κρυπτογράφηση."
 
-#: ../libnm-util/crypto_nss.c:388
+#: ../libnm-util/crypto_nss.c:384
 #, c-format
-#| msgid "Failed to initialize the decryption context."
 msgid "Failed to initialize the encryption context."
 msgstr "Απέτυχε η αρχικοποίηση του πλαισίου της κρυπτογράφησης."
 
-#: ../libnm-util/crypto_nss.c:396
+#: ../libnm-util/crypto_nss.c:392
 #, c-format
-#| msgid "Failed to decrypt the private key: %d."
 msgid "Failed to encrypt: %d."
 msgstr "Αποτυχία κρυπτογράφησης: %d."
 
-#: ../libnm-util/crypto_nss.c:404
+#: ../libnm-util/crypto_nss.c:400
 #, c-format
 msgid "Unexpected amount of data after encrypting."
 msgstr "Μη αναμενόμενη ποσότητα δεδομένων μετά την κρυπτογράφηση."
 
-#: ../libnm-util/crypto_nss.c:447
+#: ../libnm-util/crypto_nss.c:443
 #, c-format
 msgid "Couldn't decode certificate: %d"
 msgstr "Αδύνατη η αποκωδικοποίηση του πιστοποιητικού: %d"
 
-#: ../libnm-util/crypto_nss.c:482
+#: ../libnm-util/crypto_nss.c:478
 #, c-format
 msgid "Couldn't convert password to UCS2: %d"
 msgstr "Αδύνατη η μετατροπή του συνθηματικού σε UCS2: %d"
 
-#: ../libnm-util/crypto_nss.c:510
+#: ../libnm-util/crypto_nss.c:506
 #, c-format
 msgid "Couldn't initialize PKCS#12 decoder: %d"
 msgstr "Αδύνατη η αρχικοποίηση του αποκωδικοποιητή PKCS#12: %d"
 
-#: ../libnm-util/crypto_nss.c:519
+#: ../libnm-util/crypto_nss.c:515
 #, c-format
 msgid "Couldn't decode PKCS#12 file: %d"
 msgstr "Αδύνατη η αποκωδικοποίηση του αρχείου PKCS#12: %d"
 
-#: ../libnm-util/crypto_nss.c:528
+#: ../libnm-util/crypto_nss.c:524
 #, c-format
 msgid "Couldn't verify PKCS#12 file: %d"
 msgstr "Αδύνατη η διαπίστωση του αρχείου PKCS#12: %d"
 
-#: ../libnm-util/crypto_nss.c:557
-#| msgid "Could not decode private key."
+#: ../libnm-util/crypto_nss.c:568
 msgid "Could not generate random data."
 msgstr "Αδύνατη η δημιουργία τυχαίων δεδομένων."
 
-#: ../libnm-util/nm-utils.c:1975
+#: ../libnm-util/nm-utils.c:2040
 #, c-format
-#| msgid "Not enough memory to decrypt private key."
 msgid "Not enough memory to make encryption key."
 msgstr "Δεν επαρκεί η μνήμη για την δημιουργία κλειδιού κρυπτογράφησης."
 
-#: ../libnm-util/nm-utils.c:2085
-#| msgid "Not enough memory to store PEM file data."
+#: ../libnm-util/nm-utils.c:2150
 msgid "Could not allocate memory for PEM file creation."
 msgstr "Δεν επαρκεί η μνήμη για την δημιουργία αρχείου PEM."
 
-#: ../libnm-util/nm-utils.c:2097
+#: ../libnm-util/nm-utils.c:2162
 #, c-format
 msgid "Could not allocate memory for writing IV to PEM file."
 msgstr "Αδυναμία διάθεσης μνήμης για εγγραφή του IV στο αρχείο PEM."
 
-#: ../libnm-util/nm-utils.c:2109
+#: ../libnm-util/nm-utils.c:2174
 #, c-format
 msgid "Could not allocate memory for writing encrypted key to PEM file."
 msgstr ""
 "Αδυναμία διάθεσης μνήμης για εγγραφή του κρυπτογραφημένου κλειδού στο αρχείο "
 "PEM."
 
-#: ../libnm-util/nm-utils.c:2128
+#: ../libnm-util/nm-utils.c:2193
 #, c-format
-#| msgid "Not enough memory to store PEM file data."
 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 "Κοινή χρήση σύνδεσης μέσω προστατευμένου ασύρματου δικτύου"
-
-#: ../policy/org.freedesktop.network-manager-settings.system.policy.in.h:2
-msgid "Connection sharing via an open WiFi network"
-msgstr "Κοινή χρήση σύνδεσης μέσω ανοιχτού ασύρματου δικτύου"
-
-#: ../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 ""
-"Η πολιτική συστήματος δεν επιτρέπει κοινή χρήση συνδέσεων μέσω "
-"προστατευμένου ασύρματου δικτύου"
-
-#: ../policy/org.freedesktop.network-manager-settings.system.policy.in.h:8
-msgid "System policy prevents sharing connections via an open WiFi network"
-msgstr ""
-"Η πολιτική συστήματος δεν επιτρέπει κοινή χρήση συνδέσεων μέσω ανοιχτού "
-"ασύρματου δικτύου"
-
 #: ../policy/org.freedesktop.NetworkManager.policy.in.h:1
-msgid "Allow control of network connections"
-msgstr "Να επιτρέπεται ο έλεγχος των συνδέσεων δικτύου"
+msgid "Enable or disable system networking"
+msgstr "Ενεργοποίηση ή απενεργοποίηση δικτύωσης συστήματος"
 
 #: ../policy/org.freedesktop.NetworkManager.policy.in.h:2
-msgid "Allow use of user-specific connections"
-msgstr "Να επιτρέπεται η χρήση συνδέσεων συγκεκριμένων για το χρήστη"
-
-#: ../policy/org.freedesktop.NetworkManager.policy.in.h:3
-msgid "Enable or disable WiFi devices"
-msgstr "Ενεργοποίηση ή απενεργοποίηση συσκευών ασύρματης δικτύωσης (WiFi)"
-
-#: ../policy/org.freedesktop.NetworkManager.policy.in.h:4
-msgid "Enable or disable mobile broadband devices"
+msgid "System policy prevents enabling or disabling system networking"
 msgstr ""
-"Ενεργοποίηση ή απενεργοποίηση συσκευών ευρυζωνικότητας κινητής τηλεφωνίας"
-
-#: ../policy/org.freedesktop.NetworkManager.policy.in.h:5
-msgid "Enable or disable system networking"
-msgstr "Ενεργοποίηση ή απενεργοποίηση δικτύωσης συστήματος"
+"Η πολιτική συστήματος δεν επιτρέπει ενεργοποίηση ή απενεργοποίηση της "
+"δικτύωσης του συστήματος"
 
-#: ../policy/org.freedesktop.NetworkManager.policy.in.h:6
+#: ../policy/org.freedesktop.NetworkManager.policy.in.h:3
 msgid ""
 "Put NetworkManager to sleep or wake it up (should only be used by system "
 "power management)"
@@ -1622,112 +2359,277 @@ msgstr ""
 "Θέση της Διαχείρισης δικτύου σε αδράνεια ή ενεργοποίησή της (πρέπει να "
 "χρησιμοποιείται μόνο από τη διαχείριση ενέργειας του συστήματος)"
 
-#: ../policy/org.freedesktop.NetworkManager.policy.in.h:7
-#| msgid "System policy prevents modification of system settings"
-msgid "System policy prevents control of network connections"
-msgstr "Η πολιτική συστήματος δεν επιτρέπει τον έλεγχο των συνδέσεων δικτύου"
+#: ../policy/org.freedesktop.NetworkManager.policy.in.h:4
+msgid "System policy prevents putting NetworkManager to sleep or waking it up"
+msgstr ""
+"Η πολιτική του συστήματος δεν επιτρέπει να τίθεται η διαχείριση δικτύου σε "
+"αδράνεια ή να ενεργοποιείται."
 
-#: ../policy/org.freedesktop.NetworkManager.policy.in.h:8
-#| msgid "System policy prevents sharing connections via an open WiFi network"
+#: ../policy/org.freedesktop.NetworkManager.policy.in.h:5
+msgid "Enable or disable WiFi devices"
+msgstr "Ενεργοποίηση ή απενεργοποίηση συσκευών ασύρματης δικτύωσης (WiFi)"
+
+#: ../policy/org.freedesktop.NetworkManager.policy.in.h:6
 msgid "System policy prevents enabling or disabling WiFi devices"
 msgstr ""
 "Η πολιτική συστήματος δεν επιτρέπει ενεργοποίηση ή απενεργοποίηση συσκευών "
 "ανοιχτού ασύρματου δικτύου (WiFi)"
 
-#: ../policy/org.freedesktop.NetworkManager.policy.in.h:9
+#: ../policy/org.freedesktop.NetworkManager.policy.in.h:7
+msgid "Enable or disable mobile broadband devices"
+msgstr ""
+"Ενεργοποίηση ή απενεργοποίηση συσκευών ευρυζωνικότητας κινητής τηλεφωνίας"
+
+#: ../policy/org.freedesktop.NetworkManager.policy.in.h:8
 msgid "System policy prevents enabling or disabling mobile broadband devices"
 msgstr ""
 "Η πολιτική του συστήματος δεν επιτρέπει την ενεργοποίηση ή απενεργοποίηση "
 "συσκευών ευρυζωνικότητας κινητής τηλεφωνίας"
 
+#: ../policy/org.freedesktop.NetworkManager.policy.in.h:9
+msgid "Enable or disable WiMAX mobile broadband devices"
+msgstr ""
+"Ενεργοποίηση ή απενεργοποίηση WiMAX συσκευών ευρυζωνικότητας κινητής "
+"τηλεφωνίας"
+
 #: ../policy/org.freedesktop.NetworkManager.policy.in.h:10
-#| msgid "System policy prevents modification of system settings"
-msgid "System policy prevents enabling or disabling system networking"
+msgid ""
+"System policy prevents enabling or disabling WiMAX mobile broadband devices"
 msgstr ""
-"Η πολιτική συστήματος δεν επιτρέπει ενεργοποίηση ή απενεργοποίηση της "
-"δικτύωσης του συστήματος"
+"Η πολιτική του συστήματος δεν επιτρέπει την ενεργοποίηση ή απενεργοποίηση "
+"WiMAX συσκευών ευρυζωνικότητας κινητής τηλεφωνίας"
 
 #: ../policy/org.freedesktop.NetworkManager.policy.in.h:11
-msgid "System policy prevents putting NetworkManager to sleep or waking it up"
-msgstr ""
-"Η πολιτική του συστήματος δεν επιτρέπει να τίθεται η διαχείριση δικτύου σε "
-"αδράνεια ή να ενεργοποιείται."
+msgid "Allow control of network connections"
+msgstr "Να επιτρέπεται ο έλεγχος των συνδέσεων δικτύου"
 
 #: ../policy/org.freedesktop.NetworkManager.policy.in.h:12
-#| msgid "System policy prevents modification of system settings"
-msgid "System policy prevents use of user-specific connections"
+msgid "System policy prevents control of network connections"
+msgstr "Η πολιτική συστήματος δεν επιτρέπει τον έλεγχο των συνδέσεων δικτύου"
+
+#: ../policy/org.freedesktop.NetworkManager.policy.in.h:13
+msgid "Connection sharing via a protected WiFi network"
+msgstr "Κοινή χρήση σύνδεσης μέσω προστατευμένου ασύρματου δικτύου"
+
+#: ../policy/org.freedesktop.NetworkManager.policy.in.h:14
+msgid "System policy prevents sharing connections via a protected WiFi network"
 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"
+#: ../policy/org.freedesktop.NetworkManager.policy.in.h:15
+msgid "Connection sharing via an open WiFi network"
+msgstr "Κοινή χρήση σύνδεσης μέσω ανοιχτού ασύρματου δικτύου"
 
-#: ../src/nm-netlink-monitor.c:214
-msgid "error occurred while waiting for data on socket"
-msgstr "σφάλμα κατά την αναμονή για δεδομένα στην υποδοχή"
+#: ../policy/org.freedesktop.NetworkManager.policy.in.h:16
+msgid "System policy prevents sharing connections via an open WiFi network"
+msgstr ""
+"Η πολιτική συστήματος δεν επιτρέπει κοινή χρήση συνδέσεων μέσω ανοιχτού "
+"ασύρματου δικτύου"
 
-#: ../src/nm-netlink-monitor.c:254
+#: ../policy/org.freedesktop.NetworkManager.policy.in.h:17
+msgid "Modify personal network connections"
+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 "Modify network connections for all users"
+msgstr "Τροποποίηση συνδέσεων δικτύου για όλους τους χρήστες"
+
+#: ../policy/org.freedesktop.NetworkManager.policy.in.h:20
+msgid "System policy prevents modification of network settings for all users"
+msgstr ""
+"Η πολιτική συστήματος δεν επιτρέπει τροποποίηση των ρυθμίσεων δικτύου για "
+"όλους τους χρήστες"
+
+#: ../policy/org.freedesktop.NetworkManager.policy.in.h:21
+msgid "Modify persistent system hostname"
+msgstr "Αλλαγή πάγιου ονόματος συστήματος"
+
+#: ../policy/org.freedesktop.NetworkManager.policy.in.h:22
+msgid "System policy prevents modification of the persistent system hostname"
+msgstr ""
+"Η πολιτική συστήματος δεν επιτρέπει τροποποίηση του πάγιου ονόματος "
+"συστήματος"
+
+#: ../src/main.c:158
+#, fuzzy, c-format
+#| msgid "Failed to encrypt: %d."
+msgid "Failed to set signal mask: %d"
+msgstr "Αποτυχία ορισμού μάσκας σήματος: %d"
+
+#: ../src/main.c:167
 #, c-format
-msgid "unable to connect to netlink for monitoring link status: %s"
+msgid "Failed to create signal handling thread: %d"
 msgstr ""
-"αδύνατη η σύνδεση με το netlink για την παρακολούθηση της κατάστασης της "
-"σύνδεσης: %s"
 
-#: ../src/nm-netlink-monitor.c:265
+#: ../src/main.c:182
 #, c-format
-#| msgid "unable to allocate netlink handle for monitoring link status: %s"
-msgid "unable to enable netlink handle credential passing: %s"
-msgstr "unable to enable netlink handle credential passing: %s"
+msgid "Opening %s failed: %s\n"
+msgstr "Το άνοιγμα του %s απέτυχε:%s\n"
 
-#: ../src/nm-netlink-monitor.c:291 ../src/nm-netlink-monitor.c:353
+#: ../src/main.c:188
 #, c-format
-msgid "unable to allocate netlink handle for monitoring link status: %s"
-msgstr ""
-"αδύνατη η δέσμευση χειριστή netlink για την παρακολούθηση της κατάστασης της "
-"σύνδεσης: %s"
+msgid "Writing to %s failed: %s\n"
+msgstr "Η εγγραφή στο %s απέτυχε: %s\n"
 
-#: ../src/nm-netlink-monitor.c:376
+#: ../src/main.c:193
 #, c-format
-msgid "unable to allocate netlink link cache for monitoring link status: %s"
-msgstr ""
-"αδύνατη η εκχώρηση λανθάνουσας μνήμης στη σύνδεση netlink για την "
-"παρακολούθηση της κατάστασης της σύνδεσης δικτύου: %s"
+msgid "Closing %s failed: %s\n"
+msgstr "Το κλείσιμο του %s απέτυχε: %s\n"
 
-#: ../src/nm-netlink-monitor.c:502
+#: ../src/main.c:236
 #, c-format
-#| msgid "unable to join netlink group for monitoring link status: %s"
-msgid "unable to join netlink group: %s"
-msgstr "αδύνατη η σύνδεση στην ομάδα του netlink: %s"
+msgid "NetworkManager is already running (pid %ld)\n"
+msgstr "Ο NetworkManager εκτελείται ήδη (pid %ld)\n"
+
+#: ../src/main.c:376
+msgid "Print NetworkManager version and exit"
+msgstr "Προβολή έκδοσης του NetworkManager και έξοδος"
+
+#: ../src/main.c:377
+msgid "Don't become a daemon"
+msgstr "Να μη γίνει δαίμονας (daemon)"
+
+#: ../src/main.c:378
+msgid "Make all warnings fatal"
+msgstr "Να γίνουν όλες οι προειδοποιήσεις μοιραίες"
+
+#: ../src/main.c:379
+msgid "Specify the location of a PID file"
+msgstr "Καθορίστε τη τοποθεσία για το αρχείο PID"
+
+#: ../src/main.c:379
+msgid "filename"
+msgstr "όνομα αρχείου"
+
+#: ../src/main.c:380
+msgid "State file location"
+msgstr "Τοποθεσία αρχείου κατάστασης"
+
+#: ../src/main.c:380
+msgid "/path/to/state.file"
+msgstr "/path/to/state.file"
+
+#: ../src/main.c:381
+msgid "Config file location"
+msgstr "Τοποθεσία αρχείου ρυθμίσεων"
+
+#: ../src/main.c:381
+msgid "/path/to/config.file"
+msgstr "/path/to/config.file"
+
+#: ../src/main.c:382
+msgid "List of plugins separated by ','"
+msgstr "Κατάλογος πρόσθετων χωρισμένων με ','"
+
+#: ../src/main.c:382
+msgid "plugin1,plugin2"
+msgstr "plugin1,plugin2"
+
+#. Translators: Do not translate the values in the square brackets
+#: ../src/main.c:384
+msgid "Log level: one of [ERR, WARN, INFO, DEBUG]"
+msgstr "Επίπεδο καταγραφής: ένα από τα [ERR, WARN, INFO, DEBUG]"
+
+#. Translators: Do not translate the values in the square brackets
+#: ../src/main.c:387
+msgid ""
+"Log domains separated by ',': any combination of\n"
+"                                                [NONE,HW,RFKILL,ETHER,WIFI,"
+"BT,MB,DHCP4,DHCP6,PPP,\n"
+"                                                 WIFI_SCAN,IP4,IP6,AUTOIP4,"
+"DNS,VPN,SHARING,SUPPLICANT,\n"
+"                                                 AGENTS,SETTINGS,SUSPEND,"
+"CORE,DEVICE,OLPC,WIMAX,\n"
+"                                                 INFINIBAND,FIREWALL,ADSL]"
+msgstr ""
+"Καταγραφή τομέων χωρισμένων με ',': ή οποιοσδήποτε συνδιασμός των\n"
+"                                                [NONE,HW,RFKILL,ETHER,WIFI,"
+"BT,MB,DHCP4,DHCP6,PPP,\n"
+"                                                 WIFI_SCAN,IP4,IP6,AUTOIP4,"
+"DNS,VPN,SHARING,SUPPLICANT,\n"
+"                                                 AGENTS,SETTINGS,SUSPEND,"
+"CORE,DEVICE,OLPC,WIMAX,\n"
+"                                                 INFINIBAND,FIREWALL,ADSL]"
+
+#: ../src/main.c:393
+msgid "An http(s) address for checking internet connectivity"
+msgstr "Μια διεύθυνση http(s) για τον έλεγχο της συνδεσιμότητας στο διαδίκτυο"
+
+#: ../src/main.c:394
+msgid "The interval between connectivity checks (in seconds)"
+msgstr "Το διάστημα μεταξύ των ελέγχων συνδεσιμότητας (σε δευτερόλεπτα)"
+
+#: ../src/main.c:395
+msgid "The expected start of the response"
+msgstr "Η αναμενόμενη έναρξη της απάντησης"
+
+#: ../src/main.c:395
+msgid "Bingo!"
+msgstr "Bingo!"
 
-#: ../src/nm-netlink-monitor.c:629 ../src/nm-netlink-monitor.c:642
+#: ../src/main.c:400
 #, c-format
-msgid "error updating link cache: %s"
-msgstr "σφάλμα κατά την ενημέρωση της λανθάνουσας μνήμης της σύνδεσης: %s"
+msgid "GModules are not supported on your platform!\n"
+msgstr "Τα GModules δεν υποστηρίζονται στην πλατφόρμα σας!\n"
+
+#: ../src/main.c:423
+msgid ""
+"NetworkManager monitors all network connections and automatically\n"
+"chooses the best connection to use.  It also allows the user to\n"
+"specify wireless access points which wireless cards in the computer\n"
+"should associate with."
+msgstr ""
+"Ο NetworkManager παρακολουθεί όλες τις συνδέσεις δικτύου και αυτόματα\n"
+"επιλέγει τη καλύτερη σύνδεση για να χρησιμοποιήσει. Επίσης επιτρέπει τον "
+"χρήστη να \n"
+"καθορίσει τα ασύρματα σημεία πρόσβασης με τα οποία οι ασύρματες κάρτες στον "
+"υπολογιστή\n"
+"πρέπει να συνδεθούν."
 
-#: ../src/main.c:502
+#: ../src/main.c:429
 #, c-format
 msgid "Invalid option.  Please use --help to see a list of valid options.\n"
 msgstr ""
 "Άκυρη επιλογή. Παρακαλώ χρησιμοποιήστε --help για να δείτε τη λίστα των "
 "έγκυρων επιλογών.\n"
 
-#: ../src/main.c:573
+#: ../src/main.c:439
+#, c-format
+msgid "You must be root to run NetworkManager!\n"
+msgstr "Πρέπει να είστε υπερχρήστης για να εκτελέσετε το  NetworkManager!\n"
+
+#: ../src/main.c:460
+#, c-format
+msgid "Failed to read configuration: (%d) %s\n"
+msgstr "Αποτυχία ανάγνωσης των ρυθμίσεων: (%d) %s\n"
+
+#: ../src/main.c:471
 #, c-format
-#| msgid "Invalid option.  Please use --help to see a list of valid options.\n"
 msgid "%s.  Please use --help to see a list of valid options.\n"
 msgstr ""
 "%s. Παρακαλώ χρησιμοποιήστε την επιλογή --help για να δείτε τη λίστα των "
 "έγκυρων επιλογών.\n"
 
-#: ../src/dhcp-manager/nm-dhcp-dhclient.c:324
+#: ../src/main.c:478
+#, c-format
+msgid "State file %s parsing failed: (%d) %s\n"
+msgstr "Απέτυχε η ανάλυση του αρχείου κατάστασης %s: (%d) %s\n"
+
+#: ../src/main.c:495
+#, fuzzy, c-format
+msgid "Could not daemonize: %s [error %u]\n"
+msgstr "Αδυναμία ανοίγματος %s: Άγνωστο σφάλμα"
+
+#: ../src/dhcp-manager/nm-dhcp-dhclient-utils.c:62
 msgid "# Created by NetworkManager\n"
 msgstr "# Δημιουργήθηκε από το NetworkManager\n"
 
-#: ../src/dhcp-manager/nm-dhcp-dhclient.c:340
+#: ../src/dhcp-manager/nm-dhcp-dhclient-utils.c:69
 #, c-format
 msgid ""
 "# Merged from %s\n"
@@ -1736,48 +2638,188 @@ msgstr ""
 "# Συγχωνεύθηκαν από το %s\n"
 "\n"
 
-#: ../src/dhcp-manager/nm-dhcp-manager.c:284
+#: ../src/dhcp-manager/nm-dhcp-manager.c:266
 msgid "no usable DHCP client could be found."
 msgstr "αδυναμία εύρεσης πελάτη DHCP που να μπορεί να χρησιμοποιηθεί."
 
-#: ../src/dhcp-manager/nm-dhcp-manager.c:293
+#: ../src/dhcp-manager/nm-dhcp-manager.c:275
 msgid "'dhclient' could be found."
 msgstr "Εύρεση 'dhclient'."
 
-#: ../src/dhcp-manager/nm-dhcp-manager.c:303
+#: ../src/dhcp-manager/nm-dhcp-manager.c:285
 msgid "'dhcpcd' could be found."
 msgstr "Εύρεση 'dhcpcd'."
 
-#: ../src/dhcp-manager/nm-dhcp-manager.c:311
+#: ../src/dhcp-manager/nm-dhcp-manager.c:293
 #, c-format
 msgid "unsupported DHCP client '%s'"
 msgstr "μη υποστηριζόμενος πελάτης DHCP '%s'"
 
-#: ../src/logging/nm-logging.c:146
+#: ../src/dns-manager/nm-dns-manager.c:381
+msgid "NOTE: the libc resolver may not support more than 3 nameservers."
+msgstr ""
+"ΣΗΜΕΙΩΣΗ: Ο libc resolver μπορεί να μην υποστηρίζει περισσότερους από 3 "
+"εξυπηρετητές ονομάτων."
+
+#: ../src/dns-manager/nm-dns-manager.c:383
+msgid "The nameservers listed below may not be recognized."
+msgstr "Οι κάτωθι εξυπηρετητές ονομάτων ίσως να μην αναγνωρίζονται."
+
+#: ../src/logging/nm-logging.c:131
 #, c-format
 msgid "Unknown log level '%s'"
 msgstr "Άγνωστο επίπεδο καταγραφής '%s'"
 
-#: ../src/logging/nm-logging.c:171
+#: ../src/logging/nm-logging.c:156
 #, c-format
 msgid "Unknown log domain '%s'"
 msgstr "Άγνωστος τομέας καταγραφής '%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:279 ../src/nm-device-bt.c:325
+#, c-format
+msgid "CDMA connection %d"
+msgstr "Σύνδεση CDMA %d"
+
+#: ../src/modem-manager/nm-modem-gsm.c:547 ../src/nm-device-bt.c:321
+#, c-format
+msgid "GSM connection %d"
+msgstr "Σύνδεση GSM %d"
+
+#: ../src/nm-device-bond.c:191
+#, c-format
+msgid "Bond connection %d"
+msgstr "Σύνδεση Bond %d"
+
+#: ../src/nm-device-adsl.c:193
+#, c-format
+msgid "ADSL connection %d"
+msgstr "Σύνδεση ADSL %d"
+
+#: ../src/nm-device-bt.c:296
+#, c-format
+msgid "PAN connection %d"
+msgstr "Σύνδεση PAN %d"
+
+#: ../src/nm-device-bt.c:329
+#, c-format
+msgid "DUN connection %d"
+msgstr "Σύνδεση DUN %d"
+
+#: ../src/nm-device-ethernet.c:1327
+#, c-format
+msgid "PPPoE connection %d"
+msgstr "Σύνδεση PPPoE %d"
+
+#: ../src/nm-device-ethernet.c:1327 ../src/settings/nm-settings-utils.c:50
+#, c-format
+msgid "Wired connection %d"
+msgstr "Ενσύρματη σύνδεση %d"
+
+#: ../src/nm-device-infiniband.c:303
+#, c-format
+msgid "InfiniBand connection %d"
+msgstr "Σύνδεση InfiniBand %d"
+
+#: ../src/nm-device-olpc-mesh.c:303
+#, c-format
+msgid "Mesh %d"
+msgstr "Πλέγμα %d"
+
+#: ../src/nm-device-vlan.c:362
+#, c-format
+msgid "VLAN connection %d"
+msgstr "Σύνδεση VLAN %d"
+
+#: ../src/nm-manager.c:661
+#, c-format
+msgid "VPN connection %d"
+msgstr "Σύνδεση VPN %d"
+
+#: ../src/nm-netlink-monitor.c:148 ../src/nm-netlink-monitor.c:272
+#: ../src/nm-netlink-monitor.c:695
+#, c-format
+msgid "error processing netlink message: %s"
+msgstr "σφάλμα κατά την επεξεργασία μηνύματος netlink: %s"
+
+#: ../src/nm-netlink-monitor.c:251
+msgid "error occurred while waiting for data on socket"
+msgstr "σφάλμα κατά την αναμονή για δεδομένα στην υποδοχή"
+
+#: ../src/nm-netlink-monitor.c:296
+#, c-format
+msgid "unable to connect to netlink for monitoring link status: %s"
 msgstr ""
-"ΣΗΜΕΙΩΣΗ: Ο libc resolver μπορεί να μην υποστηρίζει περισσότερους από 3 "
-"εξυπηρετητές ονομάτων."
+"αδύνατη η σύνδεση με το netlink για την παρακολούθηση της κατάστασης της "
+"σύνδεσης: %s"
 
-#: ../src/dns-manager/nm-dns-manager.c:386
-msgid "The nameservers listed below may not be recognized."
-msgstr "Οι κάτωθι εξυπηρετητές ονομάτων ίσως να μην αναγνωρίζονται."
+#: ../src/nm-netlink-monitor.c:307
+#, c-format
+msgid "unable to enable netlink handle credential passing: %s"
+msgstr "unable to enable netlink handle credential passing: %s"
+
+#: ../src/nm-netlink-monitor.c:330 ../src/nm-netlink-monitor.c:390
+#, c-format
+msgid "unable to allocate netlink handle for monitoring link status: %s"
+msgstr ""
+"αδύνατη η δέσμευση χειριστή netlink για την παρακολούθηση της κατάστασης της "
+"σύνδεσης: %s"
+
+#: ../src/nm-netlink-monitor.c:415
+#, c-format
+msgid "unable to allocate netlink link cache for monitoring link status: %s"
+msgstr ""
+"αδύνατη η εκχώρηση λανθάνουσας μνήμης στη σύνδεση netlink για την "
+"παρακολούθηση της κατάστασης της σύνδεσης δικτύου: %s"
+
+#: ../src/nm-netlink-monitor.c:542
+#, c-format
+msgid "unable to join netlink group: %s"
+msgstr "αδύνατη η σύνδεση στην ομάδα του netlink: %s"
 
-#: ../src/settings/nm-default-wired-connection.c:157
+#: ../src/nm-netlink-monitor.c:671 ../src/nm-netlink-monitor.c:684
 #, c-format
-msgid "Auto %s"
-msgstr "Αυτόματο %s"
+msgid "error updating link cache: %s"
+msgstr "σφάλμα κατά την ενημέρωση της λανθάνουσας μνήμης της σύνδεσης: %s"
 
-#: ../system-settings/plugins/ifcfg-rh/reader.c:3412
+#: ../src/settings/plugins/ifcfg-rh/reader.c:94
 msgid "System"
 msgstr "Σύστημα"
+
+#: ../src/settings/plugins/ifcfg-rh/reader.c:3641
+msgid "Bond"
+msgstr "Bond"
+
+#: ../test/nm-online.c:112
+#, c-format
+msgid "\rConnecting"
+msgstr "\rΓίνεται σύνδεση"
+
+#: ../test/nm-online.c:143
+msgid "Time to wait for a connection, in seconds (default is 30)"
+msgstr ""
+"Χρόνος που περιμένει για μια σύνδεση, σε δευτερόλεπτα (το προεπιλεγμένο "
+"είναι 30)"
+
+#: ../test/nm-online.c:144
+msgid "Exit immediately if NetworkManager is not running or connecting"
+msgstr "Άμεση έξοδος αν ο NetworkManager δεν εκτελείτε ή δεν συνδέετε"
+
+#: ../test/nm-online.c:145
+msgid "Don't print anything"
+msgstr "Μην εκτυπώσεις τίποτα"
+
+#: ../test/nm-online.c:163
+msgid "Waits for a successful connection in NetworkManager."
+msgstr "Περιμένει για μια επιτυχής σύνδεση στο NetworkManager."
+
+#: ../test/nm-online.c:169 ../test/nm-online.c:178
+msgid "Invalid option.  Please use --help to see a list of valid options."
+msgstr ""
+"Άκυρη επιλογή. Παρακαλώ χρησιμοποιήστε --help για να δείτε τη λίστα των "
+"έγκυρων επιλογών."
+
+#~ msgid "SCOPE"
+#~ msgstr "ΕΥΡΟΣ"
+
+#~ msgid "DBUS-SERVICE"
+#~ msgstr "ΥΠΗΡΕΣΙΑ DBUS"
diff --git a/po/en_GB.po b/po/en_GB.po
index 528f915c..32235ced 100644
--- a/po/en_GB.po
+++ b/po/en_GB.po
@@ -3,298 +3,2564 @@
 # This file is distributed under the same license as the NetworkManager package.
 # David Lodge , 2004.
 # Philip Withnall , 2009.
-#
+# Chris Leonard , 2012.
+msgid ""
+msgstr ""
+"Project-Id-Version: NetworkManager\n"
+"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
+"product=NetworkManager&keywords=I18N+L10N&component=general\n"
+"POT-Creation-Date: 2012-09-24 15:26+0000\n"
+"PO-Revision-Date: 2012-08-03 21:30-0400\n"
+"Last-Translator: Chris Leonard \n"
+"Language-Team: Sugar Labs\n"
+"Language: en_GB\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Virtaal 0.7.0\n"
+"X-Project-Style: gnome\n"
+
+#: ../cli/src/common.c:32 ../cli/src/common.c:44 ../cli/src/common.c:52
+#: ../cli/src/common.c:63 ../cli/src/connections.c:128
+#: ../cli/src/connections.c:162
+msgid "GROUP"
+msgstr "GROUP"
+
+#. 0
+#: ../cli/src/common.c:33 ../cli/src/common.c:53
+msgid "ADDRESS"
+msgstr "ADDRESS"
+
+#. 1
+#: ../cli/src/common.c:34 ../cli/src/common.c:54
+msgid "ROUTE"
+msgstr "ROUTE"
+
+#. 2
+#: ../cli/src/common.c:35 ../cli/src/common.c:55
+msgid "DNS"
+msgstr "DNS"
+
+#. 3
+#: ../cli/src/common.c:36 ../cli/src/common.c:56
+msgid "DOMAIN"
+msgstr "DOMAIN"
+
+#. 4
+#: ../cli/src/common.c:37
+msgid "WINS"
+msgstr "WINS"
+
+#. 0
+#: ../cli/src/common.c:45 ../cli/src/common.c:64
+msgid "OPTION"
+msgstr "OPTION"
+
+#: ../cli/src/common.c:366
+msgid "unmanaged"
+msgstr "unmanaged"
+
+#: ../cli/src/common.c:368
+msgid "unavailable"
+msgstr "unavailable"
+
+#: ../cli/src/common.c:370 ../cli/src/network-manager.c:120
+msgid "disconnected"
+msgstr "disconnected"
+
+#: ../cli/src/common.c:372
+msgid "connecting (prepare)"
+msgstr "connecting (prepare)"
+
+#: ../cli/src/common.c:374
+msgid "connecting (configuring)"
+msgstr "connecting (configuring)"
+
+#: ../cli/src/common.c:376
+msgid "connecting (need authentication)"
+msgstr "connecting (need authentication)"
+
+#: ../cli/src/common.c:378
+msgid "connecting (getting IP configuration)"
+msgstr "connecting (getting IP configuration)"
+
+#: ../cli/src/common.c:380
+msgid "connecting (checking IP connectivity)"
+msgstr "connecting (checking IP connectivity)"
+
+#: ../cli/src/common.c:382
+msgid "connecting (starting secondary connections)"
+msgstr "connecting (starting secondary connections)"
+
+#: ../cli/src/common.c:384 ../cli/src/network-manager.c:116
+msgid "connected"
+msgstr "connected"
+
+#: ../cli/src/common.c:386 ../cli/src/connections.c:633
+msgid "deactivating"
+msgstr "deactivating"
+
+#: ../cli/src/common.c:388
+msgid "connection failed"
+msgstr "connection failed"
+
+#: ../cli/src/common.c:390 ../cli/src/connections.c:636
+#: ../cli/src/connections.c:659 ../cli/src/connections.c:1351
+#: ../cli/src/devices.c:622 ../cli/src/network-manager.c:123
+#: ../cli/src/network-manager.c:185 ../cli/src/network-manager.c:188
+#: ../cli/src/network-manager.c:197 ../cli/src/network-manager.c:257
+#: ../cli/src/network-manager.c:273 ../cli/src/network-manager.c:431
+#: ../cli/src/network-manager.c:486 ../cli/src/network-manager.c:524
+#: ../cli/src/network-manager.c:563 ../cli/src/settings.c:593
+#: ../cli/src/settings.c:621 ../cli/src/utils.c:531 ../src/main.c:458
+#: ../src/main.c:477
+msgid "unknown"
+msgstr "unknown"
+
+#: ../cli/src/common.c:399
+msgid "No reason given"
+msgstr "No reason given"
+
+#: ../cli/src/common.c:402
+msgid "Unknown error"
+msgstr "Unknown error"
+
+#: ../cli/src/common.c:405
+msgid "Device is now managed"
+msgstr "Device is now managed"
+
+#: ../cli/src/common.c:408
+msgid "Device is now unmanaged"
+msgstr "Device is now unmanaged"
+
+#: ../cli/src/common.c:411
+msgid "The device could not be readied for configuration"
+msgstr "The device could not be readied for configuration"
+
+#: ../cli/src/common.c:414
+#, fuzzy
+#| msgid ""
+#| "IP configuration could not be reserved (no available address, timeout, "
+#| "etc)"
+msgid ""
+"IP configuration could not be reserved (no available address, timeout, etc.)"
+msgstr ""
+"IP configuration could not be reserved (no available address, timeout, etc.)"
+
+#: ../cli/src/common.c:417
+msgid "The IP configuration is no longer valid"
+msgstr "The IP configuration is no longer valid"
+
+#: ../cli/src/common.c:420
+msgid "Secrets were required, but not provided"
+msgstr "Secrets were required, but not provided"
+
+#: ../cli/src/common.c:423
+msgid "802.1X supplicant disconnected"
+msgstr "802.1X supplicant disconnected"
+
+#: ../cli/src/common.c:426
+msgid "802.1X supplicant configuration failed"
+msgstr "802.1X supplicant configuration failed"
+
+#: ../cli/src/common.c:429
+msgid "802.1X supplicant failed"
+msgstr "802.1X supplicant failed"
+
+#: ../cli/src/common.c:432
+msgid "802.1X supplicant took too long to authenticate"
+msgstr "802.1X supplicant took too long to authenticate"
+
+#: ../cli/src/common.c:435
+msgid "PPP service failed to start"
+msgstr "PPP service failed to start"
+
+#: ../cli/src/common.c:438
+msgid "PPP service disconnected"
+msgstr "PPP service disconnected"
+
+#: ../cli/src/common.c:441
+msgid "PPP failed"
+msgstr "PPP failed"
+
+#: ../cli/src/common.c:444
+msgid "DHCP client failed to start"
+msgstr "DHCP client failed to start"
+
+#: ../cli/src/common.c:447
+msgid "DHCP client error"
+msgstr "DHCP client error"
+
+#: ../cli/src/common.c:450
+msgid "DHCP client failed"
+msgstr "DHCP client failed"
+
+#: ../cli/src/common.c:453
+msgid "Shared connection service failed to start"
+msgstr "Shared connection service failed to start"
+
+#: ../cli/src/common.c:456
+msgid "Shared connection service failed"
+msgstr "Shared connection service failed"
+
+#: ../cli/src/common.c:459
+msgid "AutoIP service failed to start"
+msgstr "AutoIP service failed to start"
+
+#: ../cli/src/common.c:462
+msgid "AutoIP service error"
+msgstr "AutoIP service error"
+
+#: ../cli/src/common.c:465
+msgid "AutoIP service failed"
+msgstr "AutoIP service failed"
+
+#: ../cli/src/common.c:468
+#, fuzzy
+msgid "The line is busy"
+msgstr "The line is busy"
+
+#: ../cli/src/common.c:471
+#, fuzzy
+msgid "No dial tone"
+msgstr "No dial tone"
+
+#: ../cli/src/common.c:474
+msgid "No carrier could be established"
+msgstr "No carrier could be established"
+
+#: ../cli/src/common.c:477
+msgid "The dialing request timed out"
+msgstr "The dialing request timed out"
+
+#: ../cli/src/common.c:480
+msgid "The dialing attempt failed"
+msgstr "The dialing attempt failed"
+
+#: ../cli/src/common.c:483
+msgid "Modem initialization failed"
+msgstr "Modem initialisation failed"
+
+#: ../cli/src/common.c:486
+msgid "Failed to select the specified APN"
+msgstr "Failed to select the specified APN"
+
+#: ../cli/src/common.c:489
+msgid "Not searching for networks"
+msgstr "Not searching for networks"
+
+#: ../cli/src/common.c:492
+msgid "Network registration denied"
+msgstr "Network registration denied"
+
+#: ../cli/src/common.c:495
+msgid "Network registration timed out"
+msgstr "Network registration timed out"
+
+#: ../cli/src/common.c:498
+msgid "Failed to register with the requested network"
+msgstr "Failed to register with the requested network"
+
+#: ../cli/src/common.c:501
+msgid "PIN check failed"
+msgstr "PIN check failed"
+
+#: ../cli/src/common.c:504
+msgid "Necessary firmware for the device may be missing"
+msgstr "Necessary firmware for the device may be missing"
+
+#: ../cli/src/common.c:507
+msgid "The device was removed"
+msgstr "The device was removed"
+
+#: ../cli/src/common.c:510
+msgid "NetworkManager went to sleep"
+msgstr "NetworkManager went to sleep"
+
+#: ../cli/src/common.c:513
+msgid "The device's active connection disappeared"
+msgstr "The device's active connection disappeared"
+
+#: ../cli/src/common.c:516
+msgid "Device disconnected by user or client"
+msgstr "Device disconnected by user or client"
+
+#: ../cli/src/common.c:519
+msgid "Carrier/link changed"
+msgstr "Carrier/link changed"
+
+#: ../cli/src/common.c:522
+msgid "The device's existing connection was assumed"
+msgstr "The device's existing connection was assumed"
+
+#: ../cli/src/common.c:525
+msgid "The supplicant is now available"
+msgstr "The supplicant is now available"
+
+#: ../cli/src/common.c:528
+msgid "The modem could not be found"
+msgstr "The modem could not be found"
+
+#: ../cli/src/common.c:531
+msgid "The Bluetooth connection failed or timed out"
+msgstr "The Bluetooth connection failed or timed out"
+
+#: ../cli/src/common.c:534
+msgid "GSM Modem's SIM card not inserted"
+msgstr "GSM Modem's SIM card not inserted"
+
+#: ../cli/src/common.c:537
+msgid "GSM Modem's SIM PIN required"
+msgstr "GSM Modem's SIM PIN required"
+
+#: ../cli/src/common.c:540
+msgid "GSM Modem's SIM PUK required"
+msgstr "GSM Modem's SIM PUK required"
+
+#: ../cli/src/common.c:543
+msgid "GSM Modem's SIM wrong"
+msgstr "GSM Modem's SIM wrong"
+
+#: ../cli/src/common.c:546
+msgid "InfiniBand device does not support connected mode"
+msgstr "InfiniBand device does not support connected mode"
+
+#: ../cli/src/common.c:549
+msgid "A dependency of the connection failed"
+msgstr "A dependency of the connection failed"
+
+#: ../cli/src/common.c:552
+msgid "A problem with the RFC 2684 Ethernet over ADSL bridge"
+msgstr "A problem with the RFC 2684 Ethernet over ADSL bridge"
+
+#: ../cli/src/common.c:555
+msgid "ModemManager is unavailable"
+msgstr ""
+
+#: ../cli/src/common.c:558
+#, fuzzy
+#| msgid "The modem could not be found"
+msgid "The Wi-Fi network could not be found"
+msgstr "The modem could not be found"
+
+#: ../cli/src/common.c:561
+#, fuzzy
+#| msgid "A dependency of the connection failed"
+msgid "A secondary connection of the base connection failed"
+msgstr "A dependency of the connection failed"
+
+#: ../cli/src/common.c:564 ../cli/src/devices.c:274 ../cli/src/devices.c:290
+#: ../cli/src/devices.c:410 ../cli/src/devices.c:454
+msgid "Unknown"
+msgstr "Unknown"
+
+#. 0
+#. used only for 'GENERAL' group listing
+#: ../cli/src/connections.c:59 ../cli/src/connections.c:129
+#: ../cli/src/devices.c:105 ../cli/src/devices.c:129 ../cli/src/devices.c:139
+#: ../cli/src/devices.c:149 ../cli/src/devices.c:163 ../cli/src/devices.c:177
+#: ../cli/src/devices.c:199
+msgid "NAME"
+msgstr "NAME"
+
+#. 0
+#. 1
+#: ../cli/src/connections.c:60 ../cli/src/connections.c:130
+msgid "UUID"
+msgstr "UUID"
+
+#. 1
+#. 0
+#. 1
+#. 2
+#: ../cli/src/connections.c:61 ../cli/src/connections.c:163
+#: ../cli/src/devices.c:71 ../cli/src/devices.c:107 ../cli/src/devices.c:202
+msgid "TYPE"
+msgstr "TYPE"
+
+#. 2
+#: ../cli/src/connections.c:62
+msgid "TIMESTAMP"
+msgstr "TIMESTAMP"
+
+#. 3
+#: ../cli/src/connections.c:63
+msgid "TIMESTAMP-REAL"
+msgstr "TIMESTAMP-REAL"
+
+#. 4
+#. 13
+#: ../cli/src/connections.c:64 ../cli/src/devices.c:119
+msgid "AUTOCONNECT"
+msgstr "AUTOCONNECT"
+
+#. 5
+#: ../cli/src/connections.c:65
+msgid "READONLY"
+msgstr "READONLY"
+
+#. 6
+#. 8
+#. 2
+#. 11
+#. 5
+#: ../cli/src/connections.c:66 ../cli/src/connections.c:137
+#: ../cli/src/devices.c:73 ../cli/src/devices.c:189 ../cli/src/devices.c:205
+msgid "DBUS-PATH"
+msgstr "DBUS-PATH"
+
+#. 2
+#: ../cli/src/connections.c:131
+msgid "DEVICES"
+msgstr "DEVICES"
+
+#. 3
+#. 1
+#. 8
+#. 1
+#: ../cli/src/connections.c:132 ../cli/src/devices.c:72
+#: ../cli/src/devices.c:114 ../cli/src/network-manager.c:39
+msgid "STATE"
+msgstr "STATE"
+
+#. 4
+#: ../cli/src/connections.c:133
+msgid "DEFAULT"
+msgstr "DEFAULT"
+
+#. 5
+#: ../cli/src/connections.c:134
+msgid "DEFAULT6"
+msgstr "DEFAULT6"
+
+#. 6
+#: ../cli/src/connections.c:135
+msgid "SPEC-OBJECT"
+msgstr "SPEC-OBJECT"
+
+#. 7
+#. 1
+#: ../cli/src/connections.c:136 ../cli/src/connections.c:150
+msgid "VPN"
+msgstr "VPN"
+
+#. 9
+#: ../cli/src/connections.c:138
+msgid "CON-PATH"
+msgstr "CON-PATH"
+
+#. 10
+#: ../cli/src/connections.c:139
+msgid "ZONE"
+msgstr "ZONE"
+
+#. 11
+#: ../cli/src/connections.c:140
+msgid "MASTER-PATH"
+msgstr "MASTER-PATH"
+
+#: ../cli/src/connections.c:148 ../cli/src/devices.c:82
+msgid "GENERAL"
+msgstr "GENERAL"
+
+#. 0
+#: ../cli/src/connections.c:149
+msgid "IP"
+msgstr "IP"
+
+#. 1
+#: ../cli/src/connections.c:164
+msgid "USERNAME"
+msgstr "USERNAME"
+
+#. 2
+#: ../cli/src/connections.c:165
+msgid "GATEWAY"
+msgstr "GATEWAY"
+
+#. 3
+#: ../cli/src/connections.c:166
+msgid "BANNER"
+msgstr "BANNER"
+
+#. 4
+#: ../cli/src/connections.c:167
+msgid "VPN-STATE"
+msgstr "VPN-STATE"
+
+#. 5
+#: ../cli/src/connections.c:168
+msgid "CFG"
+msgstr "CFG"
+
+#: ../cli/src/connections.c:190
+#, c-format
+msgid ""
+"Usage: nmcli con { COMMAND | help }\n"
+"  COMMAND := { list | status | up | down | delete }\n"
+"\n"
+"  list [id  | uuid ]\n"
+"  status [id  | uuid  | path ]\n"
+"  up id  | uuid  [iface ] [ap ] [nsp ] [--"
+"nowait] [--timeout ]\n"
+"  up id  | uuid  [iface ] [ap ] [--nowait] [--timeout "
+"]\n"
+"  down id  | uuid \n"
+"  delete id  | uuid \n"
+msgstr ""
+"Usage: nmcli con { COMMAND | help }\n"
+"  COMMAND := { list | status | up | down | delete }\n"
+"\n"
+"  list [id  | uuid ]\n"
+"  status [id  | uuid  | path ]\n"
+"  up id  | uuid  [iface ] [ap ] [nsp ] [--"
+"nowait] [--timeout ]\n"
+"  up id  | uuid  [iface ] [ap ] [--nowait] [--timeout "
+"]\n"
+"  down id  | uuid \n"
+"  delete id  | uuid \n"
+
+#: ../cli/src/connections.c:249 ../cli/src/connections.c:609
+#, c-format
+msgid "Error: 'con list': %s"
+msgstr "Error: 'con list': %s"
+
+#: ../cli/src/connections.c:251 ../cli/src/connections.c:611
+#, c-format
+msgid "Error: 'con list': %s; allowed fields: %s"
+msgstr "Error: 'con list': %s; allowed fields: %s"
+
+#: ../cli/src/connections.c:259
+msgid "Connection details"
+msgstr "Connection details"
+
+#: ../cli/src/connections.c:484
+msgid "never"
+msgstr "never"
+
+#. "CAPABILITIES"
+#. Print header
+#. "WIFI-PROPERTIES"
+#: ../cli/src/connections.c:485 ../cli/src/connections.c:486
+#: ../cli/src/connections.c:714 ../cli/src/connections.c:715
+#: ../cli/src/connections.c:717 ../cli/src/devices.c:418
+#: ../cli/src/devices.c:471 ../cli/src/devices.c:587 ../cli/src/devices.c:588
+#: ../cli/src/devices.c:589 ../cli/src/devices.c:621 ../cli/src/devices.c:647
+#: ../cli/src/devices.c:648 ../cli/src/devices.c:649 ../cli/src/devices.c:650
+#: ../cli/src/devices.c:651 ../cli/src/network-manager.c:267
+#: ../cli/src/settings.c:712 ../cli/src/settings.c:787
+#: ../cli/src/settings.c:907 ../cli/src/settings.c:1189
+#: ../cli/src/settings.c:1190 ../cli/src/settings.c:1192
+#: ../cli/src/settings.c:1194 ../cli/src/settings.c:1195
+#: ../cli/src/settings.c:1326 ../cli/src/settings.c:1327
+#: ../cli/src/settings.c:1328 ../cli/src/settings.c:1329
+#: ../cli/src/settings.c:1406 ../cli/src/settings.c:1407
+#: ../cli/src/settings.c:1408 ../cli/src/settings.c:1409
+#: ../cli/src/settings.c:1410 ../cli/src/settings.c:1411
+#: ../cli/src/settings.c:1412 ../cli/src/settings.c:1413
+#: ../cli/src/settings.c:1414 ../cli/src/settings.c:1415
+#: ../cli/src/settings.c:1416 ../cli/src/settings.c:1417
+#: ../cli/src/settings.c:1418 ../cli/src/settings.c:1489
+msgid "yes"
+msgstr "yes"
+
+#: ../cli/src/connections.c:485 ../cli/src/connections.c:486
+#: ../cli/src/connections.c:714 ../cli/src/connections.c:715
+#: ../cli/src/connections.c:717 ../cli/src/devices.c:418
+#: ../cli/src/devices.c:471 ../cli/src/devices.c:587 ../cli/src/devices.c:588
+#: ../cli/src/devices.c:589 ../cli/src/devices.c:621 ../cli/src/devices.c:647
+#: ../cli/src/devices.c:648 ../cli/src/devices.c:649 ../cli/src/devices.c:650
+#: ../cli/src/devices.c:651 ../cli/src/network-manager.c:269
+#: ../cli/src/settings.c:712 ../cli/src/settings.c:714
+#: ../cli/src/settings.c:787 ../cli/src/settings.c:907
+#: ../cli/src/settings.c:1189 ../cli/src/settings.c:1190
+#: ../cli/src/settings.c:1192 ../cli/src/settings.c:1194
+#: ../cli/src/settings.c:1195 ../cli/src/settings.c:1326
+#: ../cli/src/settings.c:1327 ../cli/src/settings.c:1328
+#: ../cli/src/settings.c:1329 ../cli/src/settings.c:1406
+#: ../cli/src/settings.c:1407 ../cli/src/settings.c:1408
+#: ../cli/src/settings.c:1409 ../cli/src/settings.c:1410
+#: ../cli/src/settings.c:1411 ../cli/src/settings.c:1412
+#: ../cli/src/settings.c:1413 ../cli/src/settings.c:1414
+#: ../cli/src/settings.c:1415 ../cli/src/settings.c:1416
+#: ../cli/src/settings.c:1417 ../cli/src/settings.c:1418
+#: ../cli/src/settings.c:1489
+msgid "no"
+msgstr "no"
+
+#: ../cli/src/connections.c:560
+msgid "Connection list"
+msgstr "Connection list"
+
+#: ../cli/src/connections.c:573 ../cli/src/connections.c:1110
+#: ../cli/src/connections.c:1648 ../cli/src/connections.c:1663
+#: ../cli/src/connections.c:1672 ../cli/src/connections.c:1682
+#: ../cli/src/connections.c:1694 ../cli/src/connections.c:1802
+#: ../cli/src/connections.c:1904 ../cli/src/devices.c:1041
+#: ../cli/src/devices.c:1051 ../cli/src/devices.c:1169
+#: ../cli/src/devices.c:1177 ../cli/src/devices.c:1541
+#: ../cli/src/devices.c:1548 ../cli/src/devices.c:1562
+#: ../cli/src/devices.c:1569 ../cli/src/devices.c:1586
+#: ../cli/src/devices.c:1597 ../cli/src/devices.c:1818
+#: ../cli/src/devices.c:1825
+#, c-format
+msgid "Error: %s argument is missing."
+msgstr "Error: %s argument is missing."
+
+#: ../cli/src/connections.c:586
+#, c-format
+msgid "Error: %s - no such connection."
+msgstr "Error: %s - no such connection."
+
+#: ../cli/src/connections.c:592 ../cli/src/connections.c:1707
+#: ../cli/src/connections.c:1819 ../cli/src/connections.c:1911
+#: ../cli/src/devices.c:825 ../cli/src/devices.c:905 ../cli/src/devices.c:1065
+#: ../cli/src/devices.c:1183 ../cli/src/devices.c:1610
+#: ../cli/src/devices.c:1831
+#, c-format
+msgid "Unknown parameter: %s\n"
+msgstr "Unknown parameter: %s\n"
+
+#: ../cli/src/connections.c:601
+#, c-format
+msgid "Error: no valid parameter specified."
+msgstr "Error: no valid parameter specified."
+
+#: ../cli/src/connections.c:616 ../cli/src/connections.c:2004
+#: ../cli/src/devices.c:2039 ../cli/src/network-manager.c:596
+#, c-format
+msgid "Error: %s."
+msgstr "Error: %s."
+
+#: ../cli/src/connections.c:629
+msgid "activating"
+msgstr "activating"
+
+#: ../cli/src/connections.c:631
+msgid "activated"
+msgstr "activated"
+
+#: ../cli/src/connections.c:645
+msgid "VPN connecting (prepare)"
+msgstr "VPN connecting (prepare)"
+
+#: ../cli/src/connections.c:647
+msgid "VPN connecting (need authentication)"
+msgstr "VPN connecting (need authentication)"
+
+#: ../cli/src/connections.c:649
+msgid "VPN connecting"
+msgstr "VPN connecting"
+
+#: ../cli/src/connections.c:651
+msgid "VPN connecting (getting IP configuration)"
+msgstr "VPN connecting (getting IP configuration)"
+
+#: ../cli/src/connections.c:653
+msgid "VPN connected"
+msgstr "VPN connected"
+
+#: ../cli/src/connections.c:655
+msgid "VPN connection failed"
+msgstr "VPN connection failed"
+
+#: ../cli/src/connections.c:657
+msgid "VPN disconnected"
+msgstr "Disconnected"
+
+#: ../cli/src/connections.c:710 ../cli/src/connections.c:720
+msgid "N/A"
+msgstr "N/A"
+
+#: ../cli/src/connections.c:914 ../cli/src/connections.c:1138
+#, c-format
+msgid "Error: 'con status': %s"
+msgstr "Error: 'con status': %s"
+
+#: ../cli/src/connections.c:916 ../cli/src/connections.c:1140
+#, c-format
+msgid "Error: 'con status': %s; allowed fields: %s"
+msgstr "Error: 'con status': %s; allowed fields: %s"
+
+#: ../cli/src/connections.c:924
+msgid "Active connection details"
+msgstr "Active connection details"
+
+#: ../cli/src/connections.c:1060 ../cli/src/connections.c:1722
+#: ../cli/src/connections.c:1834 ../cli/src/connections.c:1925
+#: ../cli/src/devices.c:852 ../cli/src/devices.c:914 ../cli/src/devices.c:1080
+#: ../cli/src/devices.c:1213 ../cli/src/devices.c:1632
+#: ../cli/src/devices.c:1860 ../cli/src/network-manager.c:311
+#, c-format
+msgid "Error: Can't find out if NetworkManager is running: %s."
+msgstr "Error: Can't find out if NetworkManager is running: %s."
+
+#: ../cli/src/connections.c:1064 ../cli/src/connections.c:1726
+#: ../cli/src/connections.c:1838 ../cli/src/connections.c:1929
+#: ../cli/src/devices.c:856 ../cli/src/devices.c:918 ../cli/src/devices.c:1084
+#: ../cli/src/devices.c:1217 ../cli/src/devices.c:1636
+#: ../cli/src/devices.c:1864 ../cli/src/network-manager.c:315
+#, c-format
+msgid "Error: NetworkManager is not running."
+msgstr "Error: NetworkManager is not running."
+
+#: ../cli/src/connections.c:1096
+msgid "Active connections"
+msgstr "Active connections"
+
+#: ../cli/src/connections.c:1121
+#, c-format
+msgid "Error: '%s' is not an active connection."
+msgstr "Error: '%s' is not an active connection."
+
+#: ../cli/src/connections.c:1126
+#, c-format
+msgid "Error: unknown parameter: %s"
+msgstr "Error: unknown parameter: %s"
+
+#: ../cli/src/connections.c:1233
+#, c-format
+msgid "no active connection on device '%s'"
+msgstr "no active connection on device '%s'"
+
+#: ../cli/src/connections.c:1241
+msgid "no active connection or device"
+msgstr "no active connection or device"
+
+#: ../cli/src/connections.c:1312
+#, c-format
+msgid "device '%s' not compatible with connection '%s'"
+msgstr "device '%s' not compatible with connection '%s'"
+
+#: ../cli/src/connections.c:1315
+#, c-format
+msgid "no device found for connection '%s'"
+msgstr "no device found for connection '%s'"
+
+#: ../cli/src/connections.c:1327
+msgid "unknown reason"
+msgstr "unknown reason"
+
+#: ../cli/src/connections.c:1329
+msgid "none"
+msgstr "none"
+
+#: ../cli/src/connections.c:1331
+msgid "the user was disconnected"
+msgstr "the user was disconnected"
+
+#: ../cli/src/connections.c:1333
+msgid "the base network connection was interrupted"
+msgstr "the base network connection was interrupted"
+
+#: ../cli/src/connections.c:1335
+msgid "the VPN service stopped unexpectedly"
+msgstr "the VPN service stopped unexpectedly"
+
+#: ../cli/src/connections.c:1337
+msgid "the VPN service returned invalid configuration"
+msgstr "the VPN service returned invalid configuration"
+
+#: ../cli/src/connections.c:1339
+msgid "the connection attempt timed out"
+msgstr "the connection attempt timed out"
+
+#: ../cli/src/connections.c:1341
+msgid "the VPN service did not start in time"
+msgstr "the VPN service did not start in time"
+
+#: ../cli/src/connections.c:1343
+msgid "the VPN service failed to start"
+msgstr "the VPN service failed to start"
+
+#: ../cli/src/connections.c:1345
+msgid "no valid VPN secrets"
+msgstr "no valid VPN secrets"
+
+#: ../cli/src/connections.c:1347
+msgid "invalid VPN secrets"
+msgstr "invalid VPN secrets"
+
+#: ../cli/src/connections.c:1349
+msgid "the connection was removed"
+msgstr "the connection was removed"
+
+#: ../cli/src/connections.c:1366 ../cli/src/connections.c:1571
+#, c-format
+msgid "Connection successfully activated (D-Bus active path: %s)\n"
+msgstr "Connection successfully activated (D-Bus active path: %s)\n"
+
+#. Active connection failed and dissapeared, quit.
+#: ../cli/src/connections.c:1371 ../cli/src/connections.c:1472
+#, c-format
+msgid "Error: Connection activation failed."
+msgstr "Error: Connection activation failed."
+
+#: ../cli/src/connections.c:1396
+#, c-format
+msgid "VPN connection successfully activated (D-Bus active path: %s)\n"
+msgstr "VPN connection successfully activated (D-Bus active path: %s)\n"
+
+#: ../cli/src/connections.c:1404
+#, c-format
+msgid "Error: Connection activation failed: %s."
+msgstr "Error: Connection activation failed: %s."
+
+#: ../cli/src/connections.c:1501 ../cli/src/devices.c:974
+#, c-format
+msgid "Error: Timeout %d sec expired."
+msgstr "Error: Timeout %d sec expired."
+
+#: ../cli/src/connections.c:1562
+#, c-format
+msgid "Error: Connection activation failed: %s"
+msgstr "Error: Connection activation failed: %s"
+
+#: ../cli/src/connections.c:1656 ../cli/src/connections.c:1810
+#: ../cli/src/connections.c:1938
+#, c-format
+msgid "Error: Unknown connection: %s."
+msgstr "Error: Unknown connection: %s."
+
+#: ../cli/src/connections.c:1702 ../cli/src/devices.c:1059
+#: ../cli/src/devices.c:1605
+#, c-format
+msgid "Error: timeout value '%s' is not valid."
+msgstr "Error: timeout value '%s' is not valid."
+
+#: ../cli/src/connections.c:1715 ../cli/src/connections.c:1827
+#: ../cli/src/connections.c:1918
+#, c-format
+msgid "Error: id or uuid has to be specified."
+msgstr "Error: id or uuid has to be specified."
+
+#: ../cli/src/connections.c:1747
+#, c-format
+msgid "Error: No suitable device found: %s."
+msgstr "Error: No suitable device found: %s."
+
+#: ../cli/src/connections.c:1749
+#, c-format
+msgid "Error: No suitable device found."
+msgstr "Error: No suitable device found."
+
+#: ../cli/src/connections.c:1863
+#, c-format
+msgid "Warning: Connection not active\n"
+msgstr "Warning: Connection not active\n"
+
+#: ../cli/src/connections.c:1877
+#, c-format
+msgid "Error: Connection deletion failed: %s"
+msgstr "Error: Connection deletion failed: %s"
+
+#: ../cli/src/connections.c:1995
+#, c-format
+msgid "Error: 'con' command '%s' is not valid."
+msgstr "Error: 'con' command '%s' is not valid."
+
+#: ../cli/src/connections.c:2063
+#, c-format
+msgid "Error: could not connect to D-Bus."
+msgstr "Error: could not connect to D-Bus."
+
+#: ../cli/src/connections.c:2071
+#, c-format
+msgid "Error: Could not get system settings."
+msgstr "Error: Could not get system settings."
+
+#: ../cli/src/connections.c:2081
+#, c-format
+msgid "Error: Can't obtain connections: settings service is not running."
+msgstr "Error: Can't obtain connections: settings service is not running."
+
+#. 0
+#. 9
+#. 3
+#: ../cli/src/devices.c:70 ../cli/src/devices.c:106 ../cli/src/devices.c:187
+#: ../cli/src/devices.c:203
+msgid "DEVICE"
+msgstr "DEVICE"
+
+#. 0
+#: ../cli/src/devices.c:83
+msgid "CAPABILITIES"
+msgstr "CAPABILITIES"
+
+#. 1
+#: ../cli/src/devices.c:84
+msgid "WIFI-PROPERTIES"
+msgstr "WIFI-PROPERTIES"
+
+#. 2
+#: ../cli/src/devices.c:85
+msgid "AP"
+msgstr "AP"
+
+#. 3
+#: ../cli/src/devices.c:86
+msgid "WIRED-PROPERTIES"
+msgstr "WIRED-PROPERTIES"
+
+#. 4
+#: ../cli/src/devices.c:87
+msgid "WIMAX-PROPERTIES"
+msgstr "WIMAX-PROPERTIES"
+
+#. 5
+#. 0
+#: ../cli/src/devices.c:88 ../cli/src/devices.c:200
+msgid "NSP"
+msgstr "NSP"
+
+#. 6
+#: ../cli/src/devices.c:89
+msgid "IP4"
+msgstr "IP4"
+
+#. 7
+#: ../cli/src/devices.c:90
+msgid "DHCP4"
+msgstr "DHCP4"
+
+#. 8
+#: ../cli/src/devices.c:91
+msgid "IP6"
+msgstr "IP6"
+
+#. 9
+#: ../cli/src/devices.c:92
+msgid "DHCP6"
+msgstr "DHCP6"
+
+#. 2
+#: ../cli/src/devices.c:108
+msgid "VENDOR"
+msgstr "VENDOR"
+
+#. 3
+#: ../cli/src/devices.c:109
+msgid "PRODUCT"
+msgstr "PRODUCT"
+
+#. 4
+#: ../cli/src/devices.c:110
+msgid "DRIVER"
+msgstr "DRIVER"
+
+#. 5
+#: ../cli/src/devices.c:111
+msgid "DRIVER-VERSION"
+msgstr "DRIVER-VERSION"
+
+#. 6
+#: ../cli/src/devices.c:112
+msgid "FIRMWARE-VERSION"
+msgstr "FIRMWARE-VERSION"
+
+#. 7
+#: ../cli/src/devices.c:113
+msgid "HWADDR"
+msgstr "HWADDR"
+
+#. 9
+#: ../cli/src/devices.c:115
+msgid "REASON"
+msgstr "REASON"
+
+#. 10
+#: ../cli/src/devices.c:116
+msgid "UDI"
+msgstr "UDI"
+
+#. 11
+#: ../cli/src/devices.c:117
+msgid "IP-IFACE"
+msgstr "IP-IFACE"
+
+#. 12
+#: ../cli/src/devices.c:118
+msgid "NM-MANAGED"
+msgstr "NM-MANAGED"
+
+#. 14
+#: ../cli/src/devices.c:120
+msgid "FIRMWARE-MISSING"
+msgstr "FIRMWARE-MISSING"
+
+#. 15
+#: ../cli/src/devices.c:121
+msgid "CONNECTION"
+msgstr "CONNECTION"
+
+#. 0
+#: ../cli/src/devices.c:130
+msgid "CARRIER-DETECT"
+msgstr "CARRIER-DETECT"
+
+#. 1
+#: ../cli/src/devices.c:131
+msgid "SPEED"
+msgstr "SPEED"
+
+#. 0
+#: ../cli/src/devices.c:140
+msgid "CARRIER"
+msgstr "CARRIER"
+
+#. 0
+#: ../cli/src/devices.c:150
+msgid "WEP"
+msgstr "WEP"
+
+#. 1
+#: ../cli/src/devices.c:151
+msgid "WPA"
+msgstr "WPA"
+
+#. 2
+#: ../cli/src/devices.c:152
+msgid "WPA2"
+msgstr "WPA2"
+
+#. 3
+#: ../cli/src/devices.c:153
+msgid "TKIP"
+msgstr "TKIP"
+
+#. 4
+#: ../cli/src/devices.c:154
+msgid "CCMP"
+msgstr "CCMP"
+
+#. 0
+#: ../cli/src/devices.c:164
+msgid "CTR-FREQ"
+msgstr "CTR-FREQ"
+
+#. 1
+#: ../cli/src/devices.c:165
+msgid "RSSI"
+msgstr "RSSI"
+
+#. 2
+#: ../cli/src/devices.c:166
+msgid "CINR"
+msgstr "CINR"
+
+#. 3
+#: ../cli/src/devices.c:167
+msgid "TX-POW"
+msgstr "TX-POW"
+
+#. 4
+#: ../cli/src/devices.c:168
+msgid "BSID"
+msgstr "BSID"
+
+#. 0
+#: ../cli/src/devices.c:178
+msgid "SSID"
+msgstr "SSID"
+
+#. 1
+#: ../cli/src/devices.c:179
+msgid "BSSID"
+msgstr "BSSID"
+
+#. 2
+#: ../cli/src/devices.c:180
+msgid "MODE"
+msgstr "MODE"
+
+#. 3
+#: ../cli/src/devices.c:181
+msgid "FREQ"
+msgstr "FREQ"
+
+#. 4
+#: ../cli/src/devices.c:182
+msgid "RATE"
+msgstr "RATE"
+
+#. 5
+#. 1
+#: ../cli/src/devices.c:183 ../cli/src/devices.c:201
+msgid "SIGNAL"
+msgstr "SIGNAL"
+
+#. 6
+#: ../cli/src/devices.c:184
+msgid "SECURITY"
+msgstr "SECURITY"
+
+#. 7
+#: ../cli/src/devices.c:185
+msgid "WPA-FLAGS"
+msgstr "WPA-FLAGS"
+
+#. 8
+#: ../cli/src/devices.c:186
+msgid "RSN-FLAGS"
+msgstr "RSN-FLAGS"
+
+#. 10
+#. 4
+#: ../cli/src/devices.c:188 ../cli/src/devices.c:204
+msgid "ACTIVE"
+msgstr "ACTIVE"
+
+#: ../cli/src/devices.c:223
+#, 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 ]\n"
+"  disconnect iface  [--nowait] [--timeout ]\n"
+"  wifi [list [iface ] [bssid ]]\n"
+"  wifi connect <(B)SSID> [password ] [wep-key-type key|phrase] "
+"[iface ] [bssid ] [name ]\n"
+"               [--private] [--nowait] [--timeout ]\n"
+"  wimax [list [iface ] [nsp ]]\n"
+"\n"
+msgstr ""
+"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 ]\n"
+"  disconnect iface  [--nowait] [--timeout ]\n"
+"  wifi [list [iface ] [bssid ]]\n"
+"  wifi connect <(B)SSID> [password ] [wep-key-type key|phrase] "
+"[iface ] [bssid ] [name ]\n"
+"               [--private] [--nowait] [--timeout ]\n"
+"  wimax [list [iface ] [nsp ]]\n"
+"\n"
+
+#: ../cli/src/devices.c:323
+msgid "(none)"
+msgstr "(none)"
+
+#: ../cli/src/devices.c:379
+#, c-format
+msgid "%u MHz"
+msgstr "%u MHz"
+
+#: ../cli/src/devices.c:380
+#, c-format
+msgid "%u MB/s"
+msgstr "%u MB/s"
+
+#: ../cli/src/devices.c:389
+msgid "Encrypted: "
+msgstr "Encrypted: "
+
+#: ../cli/src/devices.c:394
+msgid "WEP "
+msgstr "WEP "
+
+#: ../cli/src/devices.c:396
+msgid "WPA "
+msgstr "WPA "
+
+#: ../cli/src/devices.c:398
+msgid "WPA2 "
+msgstr "WPA2 "
+
+#: ../cli/src/devices.c:401
+msgid "Enterprise "
+msgstr "Enterprise "
+
+#: ../cli/src/devices.c:410
+msgid "Ad-Hoc"
+msgstr "Ad-Hoc"
+
+#: ../cli/src/devices.c:410
+msgid "Infrastructure"
+msgstr "Infrastructure"
+
+#: ../cli/src/devices.c:445
+msgid "Home"
+msgstr "Home"
+
+#: ../cli/src/devices.c:448
+msgid "Partner"
+msgstr "Partner"
+
+#: ../cli/src/devices.c:451
+msgid "Roaming"
+msgstr "Roaming"
+
+#: ../cli/src/devices.c:523
+#, c-format
+msgid "Error: 'dev list': %s"
+msgstr "Error: 'dev list': %s"
+
+#: ../cli/src/devices.c:525
+#, c-format
+msgid "Error: 'dev list': %s; allowed fields: %s"
+msgstr "Error: 'dev list': %s; allowed fields: %s"
+
+#: ../cli/src/devices.c:534
+msgid "Device details"
+msgstr "Device details"
+
+#: ../cli/src/devices.c:579 ../cli/src/devices.c:582 ../cli/src/devices.c:1000
+#: ../cli/src/utils.c:477
+msgid "(unknown)"
+msgstr "(unknown)"
+
+#: ../cli/src/devices.c:591
+msgid "not connected"
+msgstr "not connected"
+
+#: ../cli/src/devices.c:618
+#, c-format
+msgid "%u Mb/s"
+msgstr "%u Mb/s"
+
+#. Print header
+#. "WIRED-PROPERTIES"
+#: ../cli/src/devices.c:691
+msgid "on"
+msgstr "on"
+
+#: ../cli/src/devices.c:691
+msgid "off"
+msgstr "off"
+
+#: ../cli/src/devices.c:842
+#, c-format
+msgid "Error: 'dev status': %s"
+msgstr "Error: 'dev status': %s"
+
+#: ../cli/src/devices.c:844
+#, c-format
+msgid "Error: 'dev status': %s; allowed fields: %s"
+msgstr "Error: 'dev status': %s; allowed fields: %s"
+
+#: ../cli/src/devices.c:867
+msgid "Status of devices"
+msgstr "Status of devices"
+
+#: ../cli/src/devices.c:898
+#, c-format
+msgid "Error: '%s' argument is missing."
+msgstr "Error: '%s' argument is missing."
+
+#: ../cli/src/devices.c:939 ../cli/src/devices.c:1104
+#: ../cli/src/devices.c:1245 ../cli/src/devices.c:1892
+#, c-format
+msgid "Error: Device '%s' not found."
+msgstr "Error: Device '%s' not found."
+
+#: ../cli/src/devices.c:962
+#, c-format
+msgid "Success: Device '%s' successfully disconnected."
+msgstr "Success: Device '%s' successfully disconnected."
+
+#: ../cli/src/devices.c:997
+#, c-format
+msgid "Error: Device '%s' (%s) disconnecting failed: %s"
+msgstr "Error: Device '%s' (%s) disconnecting failed: %s"
+
+#: ../cli/src/devices.c:1010
+#, c-format
+msgid "Device '%s' has been disconnected.\n"
+msgstr "Device '%s' has been disconnected.\n"
+
+#: ../cli/src/devices.c:1073
+#, c-format
+msgid "Error: iface has to be specified."
+msgstr "Error: iface has to be specified."
+
+#: ../cli/src/devices.c:1203
+#, c-format
+msgid "Error: 'dev wifi': %s"
+msgstr "Error: 'dev wifi': %s"
+
+#: ../cli/src/devices.c:1205
+#, c-format
+msgid "Error: 'dev wifi': %s; allowed fields: %s"
+msgstr "Error: 'dev wifi': %s; allowed fields: %s"
+
+#: ../cli/src/devices.c:1228
+msgid "WiFi scan list"
+msgstr "WiFi scan list"
+
+#: ../cli/src/devices.c:1265 ../cli/src/devices.c:1319
+#, c-format
+msgid "Error: Access point with bssid '%s' not found."
+msgstr "Error: Access point with bssid '%s' not found."
+
+#: ../cli/src/devices.c:1282
+#, c-format
+msgid "Error: Device '%s' is not a WiFi device."
+msgstr "Error: Device '%s' is not a WiFi device."
+
+#: ../cli/src/devices.c:1350 ../cli/src/devices.c:1396
+#, c-format
+msgid "Connection with UUID '%s' created and activated on device '%s'\n"
+msgstr "Connection with UUID '%s' created and activated on device '%s'\n"
+
+#: ../cli/src/devices.c:1355
+#, c-format
+msgid "Error: Connection activation failed: (%d) %s."
+msgstr "Error: Connection activation failed: (%d) %s."
+
+#: ../cli/src/devices.c:1380
+#, c-format
+msgid "Error: Failed to add/activate new connection: (%d) %s"
+msgstr "Error: Failed to add/activate new connection: (%d) %s"
+
+#: ../cli/src/devices.c:1388
+#, c-format
+msgid "Error: Failed to add/activate new connection: Unknown error"
+msgstr "Error: Failed to add/activate new connection: Unknown error"
+
+#: ../cli/src/devices.c:1532
+#, c-format
+msgid "Error: SSID or BSSID are missing."
+msgstr "Error: SSID or BSSID are missing."
+
+#: ../cli/src/devices.c:1555
+#, c-format
+msgid "Error: bssid argument value '%s' is not a valid BSSID."
+msgstr "Error: bssid argument value '%s' is not a valid BSSID."
+
+#: ../cli/src/devices.c:1579
+#, c-format
+msgid ""
+"Error: wep-key-type argument value '%s' is invalid, use 'key' or 'phrase'."
+msgstr ""
+"Error: wep-key-type argument value '%s' is invalid, use 'key' or 'phrase'."
+
+#: ../cli/src/devices.c:1619
+#, c-format
+msgid "Error: BSSID to connect to (%s) differs from bssid argument (%s)."
+msgstr "Error: BSSID to connect to (%s) differs from bssid argument (%s)."
+
+#: ../cli/src/devices.c:1625
+#, c-format
+msgid "Error: Parameter '%s' is neither SSID nor BSSID."
+msgstr "Error: Parameter '%s' is neither SSID nor BSSID."
+
+#: ../cli/src/devices.c:1654
+#, c-format
+msgid "Error: Device '%s' is not a Wi-Fi device."
+msgstr "Error: Device '%s' is not a Wi-Fi device."
+
+#: ../cli/src/devices.c:1656
+#, c-format
+msgid "Error: No Wi-Fi device found."
+msgstr "Error: No Wi-Fi device found."
+
+#: ../cli/src/devices.c:1674
+#, c-format
+msgid "Error: No network with SSID '%s' found."
+msgstr "Error: No network with SSID '%s' found."
+
+#: ../cli/src/devices.c:1676
+#, c-format
+msgid "Error: No access point with BSSID '%s' found."
+msgstr "Error: No access point with BSSID '%s' found."
+
+#: ../cli/src/devices.c:1774
+#, c-format
+msgid "Error: 'dev wifi' command '%s' is not valid."
+msgstr "Error: 'dev wifi' command '%s' is not valid."
+
+#: ../cli/src/devices.c:1850
+#, c-format
+msgid "Error: 'dev wimax': %s"
+msgstr "Error: 'dev wimax': %s"
+
+#: ../cli/src/devices.c:1852
+#, c-format
+msgid "Error: 'dev wimax': %s; allowed fields: %s"
+msgstr "Error: 'dev wimax': %s; allowed fields: %s"
+
+#: ../cli/src/devices.c:1875
+msgid "WiMAX NSP list"
+msgstr "WiMAX NSP list"
+
+#: ../cli/src/devices.c:1912
+#, c-format
+msgid "Error: NSP with name '%s' not found."
+msgstr "Error: NSP with name '%s' not found."
+
+#: ../cli/src/devices.c:1923
+#, c-format
+msgid "Error: Device '%s' is not a WiMAX device."
+msgstr "Error: Device '%s' is not a WiMAX device."
+
+#: ../cli/src/devices.c:1954
+#, c-format
+msgid "Error: Access point with nsp '%s' not found."
+msgstr "Error: Access point with nsp '%s' not found."
+
+#: ../cli/src/devices.c:1981
+#, c-format
+msgid "Error: 'dev wimax' command '%s' is not valid."
+msgstr "Error: 'dev wimax' command '%s' is not valid."
+
+#: ../cli/src/devices.c:2031
+#, c-format
+msgid "Error: 'dev' command '%s' is not valid."
+msgstr "Error: 'dev' command '%s' is not valid."
+
+#: ../cli/src/network-manager.c:37
+msgid "RUNNING"
+msgstr "RUNNING"
+
+#. 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"
+
+#. 4
+#: ../cli/src/network-manager.c:42
+msgid "WIFI"
+msgstr "WIFI"
+
+#. 5
+#: ../cli/src/network-manager.c:43
+msgid "WWAN-HARDWARE"
+msgstr "WWAN-HARDWARE"
+
+#. 6
+#: ../cli/src/network-manager.c:44
+msgid "WWAN"
+msgstr "WWAN"
+
+#. 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:62
+msgid "PERMISSION"
+msgstr "PERMISSION"
+
+#. 0
+#: ../cli/src/network-manager.c:63
+msgid "VALUE"
+msgstr "VALUE"
+
+#: ../cli/src/network-manager.c:77
+#, c-format
+msgid ""
+"Usage: nmcli nm { COMMAND | help }\n"
+"\n"
+"  COMMAND := { status | permissions | enable | sleep | wifi | wwan | "
+"wimax }\n"
+"\n"
+"  COMMAND := { status | permissions | enable | sleep | wifi | wwan }\n"
+"\n"
+"  status\n"
+"  permissions\n"
+"  enable [true|false]\n"
+"  sleep [true|false]\n"
+"  wifi [on|off]\n"
+"  wwan [on|off]\n"
+"  wimax [on|off]\n"
+"\n"
+msgstr ""
+"Usage: nmcli nm { COMMAND | help }\n"
+"\n"
+"  COMMAND := { status | permissions | enable | sleep | wifi | wwan | "
+"wimax }\n"
+"\n"
+"  COMMAND := { status | permissions | enable | sleep | wifi | wwan }\n"
+"\n"
+"  status\n"
+"  permissions\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:108
+msgid "asleep"
+msgstr "asleep"
+
+#: ../cli/src/network-manager.c:110
+msgid "connecting"
+msgstr "connecting"
+
+#: ../cli/src/network-manager.c:112
+msgid "connected (local only)"
+msgstr "connected (local only)"
+
+#: ../cli/src/network-manager.c:114
+msgid "connected (site only)"
+msgstr "connected (site only)"
+
+#: ../cli/src/network-manager.c:118
+msgid "disconnecting"
+msgstr "disconnecting"
+
+#: ../cli/src/network-manager.c:158
+#, c-format
+msgid "Error: 'nm status': %s"
+msgstr "Error: 'nm status': %s"
+
+#: ../cli/src/network-manager.c:160
+#, c-format
+msgid "Error: 'nm status': %s; allowed fields: %s"
+msgstr "Error: 'nm status': %s; allowed fields: %s"
+
+#. create NMClient
+#: ../cli/src/network-manager.c:173 ../cli/src/network-manager.c:174
+#: ../cli/src/network-manager.c:175 ../cli/src/network-manager.c:176
+#: ../cli/src/network-manager.c:177 ../cli/src/network-manager.c:179
+#: ../cli/src/network-manager.c:180 ../cli/src/network-manager.c:429
+#: ../cli/src/network-manager.c:484 ../cli/src/network-manager.c:522
+#: ../cli/src/network-manager.c:561
+msgid "enabled"
+msgstr "enabled"
+
+#: ../cli/src/network-manager.c:173 ../cli/src/network-manager.c:174
+#: ../cli/src/network-manager.c:175 ../cli/src/network-manager.c:176
+#: ../cli/src/network-manager.c:177 ../cli/src/network-manager.c:179
+#: ../cli/src/network-manager.c:180 ../cli/src/network-manager.c:429
+#: ../cli/src/network-manager.c:484 ../cli/src/network-manager.c:522
+#: ../cli/src/network-manager.c:561
+msgid "disabled"
+msgstr "disabled"
+
+#: ../cli/src/network-manager.c:193
+msgid "NetworkManager status"
+msgstr "NetworkManager status"
+
+#. Print header
+#: ../cli/src/network-manager.c:196
+msgid "running"
+msgstr "running"
+
+#: ../cli/src/network-manager.c:196
+msgid "not running"
+msgstr "not running"
+
+#: ../cli/src/network-manager.c:271
+msgid "auth"
+msgstr "auth"
+
+#: ../cli/src/network-manager.c:301
+#, c-format
+msgid "Error: 'nm permissions': %s"
+msgstr "Error: 'nm permissions': %s"
+
+#: ../cli/src/network-manager.c:303
+#, c-format
+msgid "Error: 'nm permissions': %s; allowed fields: %s"
+msgstr "Error: 'nm permissions': %s; allowed fields: %s"
+
+#: ../cli/src/network-manager.c:324
+msgid "NetworkManager permissions"
+msgstr "NetworkManager permissions"
+
+#: ../cli/src/network-manager.c:350 ../cli/src/utils.c:457
+#, c-format
+msgid "Error: Couldn't connect to system bus: %s"
+msgstr "Error: Couldn't connect to system bus: %s"
+
+#: ../cli/src/network-manager.c:361
+#, c-format
+msgid "Error: Couldn't create D-Bus object proxy."
+msgstr "Error: Couldn't create D-Bus object proxy."
+
+#: ../cli/src/network-manager.c:367
+#, c-format
+msgid "Error in sleep: %s"
+msgstr "Error in sleep: %s"
+
+#: ../cli/src/network-manager.c:416 ../cli/src/network-manager.c:471
+#: ../cli/src/network-manager.c:509 ../cli/src/network-manager.c:548
+#, c-format
+msgid "Error: '--fields' value '%s' is not valid here; allowed fields: %s"
+msgstr "Error: '--fields' value '%s' is not valid here; allowed fields: %s"
+
+#: ../cli/src/network-manager.c:424
+msgid "Networking enabled"
+msgstr "Networking enabled"
+
+#: ../cli/src/network-manager.c:440
+#, c-format
+msgid "Error: invalid 'enable' parameter: '%s'; use 'true' or 'false'."
+msgstr "Error: invalid 'enable' parameter: '%s'; use 'true' or 'false'."
+
+#: ../cli/src/network-manager.c:450
+#, c-format
+msgid "Error: Sleeping status is not exported by NetworkManager."
+msgstr "Error: Sleeping status is not exported by NetworkManager."
+
+#: ../cli/src/network-manager.c:458
+#, c-format
+msgid "Error: invalid 'sleep' parameter: '%s'; use 'true' or 'false'."
+msgstr "Error: invalid 'sleep' parameter: '%s'; use 'true' or 'false'."
+
+#: ../cli/src/network-manager.c:479
+msgid "WiFi enabled"
+msgstr "WiFi enabled"
+
+#: ../cli/src/network-manager.c:495
+#, c-format
+msgid "Error: invalid 'wifi' parameter: '%s'."
+msgstr "Error: invalid 'wifi' parameter: '%s'."
+
+#: ../cli/src/network-manager.c:517
+msgid "WWAN enabled"
+msgstr "WWAN enabled"
+
+#: ../cli/src/network-manager.c:533
+#, c-format
+msgid "Error: invalid 'wwan' parameter: '%s'."
+msgstr "Error: invalid 'wwan' parameter: '%s'."
+
+#: ../cli/src/network-manager.c:556
+msgid "WiMAX enabled"
+msgstr "WiMAX enabled"
+
+#: ../cli/src/network-manager.c:572
+#, c-format
+msgid "Error: invalid 'wimax' parameter: '%s'."
+msgstr "Error: invalid 'wimax' parameter: '%s'."
+
+#: ../cli/src/network-manager.c:585
+#, c-format
+msgid "Error: 'nm' command '%s' is not valid."
+msgstr "Error: 'nm' command '%s' is not valid."
+
+#: ../cli/src/nmcli.c:76
+#, 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] |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"
+"OBJECT\n"
+"  nm          NetworkManager status\n"
+"  con         NetworkManager connections\n"
+"  dev         devices managed by NetworkManager\n"
+"\n"
+msgstr ""
+"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] |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"
+"OBJECT\n"
+"  nm          NetworkManager status\n"
+"  con         NetworkManager connections\n"
+"  dev         devices managed by NetworkManager\n"
+"\n"
+
+#: ../cli/src/nmcli.c:121
+#, c-format
+msgid "Error: Object '%s' is unknown, try 'nmcli help'."
+msgstr "Error: Object '%s' is unknown, try 'nmcli help'."
+
+#: ../cli/src/nmcli.c:151
+#, c-format
+msgid "Error: Option '--terse' is specified the second time."
+msgstr "Error: Option '--terse' is specified the second time."
+
+#: ../cli/src/nmcli.c:156
+#, c-format
+msgid "Error: Option '--terse' is mutually exclusive with '--pretty'."
+msgstr "Error: Option '--terse' is mutually exclusive with '--pretty'."
+
+#: ../cli/src/nmcli.c:164
+#, c-format
+msgid "Error: Option '--pretty' is specified the second time."
+msgstr "Error: Option '--pretty' is specified the second time."
+
+#: ../cli/src/nmcli.c:169
+#, c-format
+msgid "Error: Option '--pretty' is mutually exclusive with '--terse'."
+msgstr "Error: Option '--pretty' is mutually exclusive with '--terse'."
+
+#: ../cli/src/nmcli.c:179 ../cli/src/nmcli.c:195
+#, c-format
+msgid "Error: missing argument for '%s' option."
+msgstr "Error: missing argument for '%s' option."
+
+#: ../cli/src/nmcli.c:188 ../cli/src/nmcli.c:204
+#, c-format
+msgid "Error: '%s' is not valid argument for '%s' option."
+msgstr "Error: '%s' is not valid argument for '%s' option."
+
+#: ../cli/src/nmcli.c:211
+#, c-format
+msgid "Error: fields for '%s' options are missing."
+msgstr "Error: fields for '%s' options are missing."
+
+#: ../cli/src/nmcli.c:219
+#, c-format
+msgid "nmcli tool, version %s\n"
+msgstr "nmcli tool, version %s\n"
+
+#: ../cli/src/nmcli.c:225
+#, c-format
+msgid "Error: Option '%s' is unknown, try 'nmcli -help'."
+msgstr "Error: Option '%s' is unknown, try 'nmcli -help'."
+
+#: ../cli/src/nmcli.c:244
+#, c-format
+msgid "Caught signal %d, shutting down..."
+msgstr "Caught signal %d, shutting down..."
+
+#: ../cli/src/nmcli.c:269
+msgid "Error: Could not create NMClient object."
+msgstr "Error: Could not create NMClient object."
+
+#: ../cli/src/nmcli.c:285
+msgid "Success"
+msgstr "Success"
+
+#: ../cli/src/settings.c:527
+#, c-format
+msgid "%d (hex-ascii-key)"
+msgstr "%d (hex-ascii-key)"
+
+#: ../cli/src/settings.c:529
+#, c-format
+msgid "%d (104/128-bit passphrase)"
+msgstr "%d (104/128-bit passphrase)"
+
+#: ../cli/src/settings.c:532 ../cli/src/settings.c:660
+#, c-format
+msgid "%d (unknown)"
+msgstr "%d (unknown)"
+
+#: ../cli/src/settings.c:558
+msgid "0 (unknown)"
+msgstr "0 (unknown)"
+
+#: ../cli/src/settings.c:564
+msgid "any, "
+msgstr "any, "
+
+#: ../cli/src/settings.c:566
+msgid "900 MHz, "
+msgstr "900 MHz, "
+
+#: ../cli/src/settings.c:568
+msgid "1800 MHz, "
+msgstr "1800 MHz, "
+
+#: ../cli/src/settings.c:570
+msgid "1900 MHz, "
+msgstr "1900 MHz, "
+
+#: ../cli/src/settings.c:572
+msgid "850 MHz, "
+msgstr "850 MHz, "
+
+#: ../cli/src/settings.c:574
+msgid "WCDMA 3GPP UMTS 2100 MHz, "
+msgstr "WCDMA 3GPP UMTS 2100 MHz, "
+
+#: ../cli/src/settings.c:576
+msgid "WCDMA 3GPP UMTS 1800 MHz, "
+msgstr "WCDMA 3GPP UMTS 1800 MHz, "
+
+#: ../cli/src/settings.c:578
+msgid "WCDMA 3GPP UMTS 1700/2100 MHz, "
+msgstr "WCDMA 3GPP UMTS 1700/2100 MHz, "
+
+#: ../cli/src/settings.c:580
+msgid "WCDMA 3GPP UMTS 800 MHz, "
+msgstr "WCDMA 3GPP UMTS 800 MHz, "
+
+#: ../cli/src/settings.c:582
+msgid "WCDMA 3GPP UMTS 850 MHz, "
+msgstr "WCDMA 3GPP UMTS 850 MHz, "
+
+#: ../cli/src/settings.c:584
+msgid "WCDMA 3GPP UMTS 900 MHz, "
+msgstr "WCDMA 3GPP UMTS 900 MHz, "
+
+#: ../cli/src/settings.c:586
+msgid "WCDMA 3GPP UMTS 1700 MHz, "
+msgstr "WCDMA 3GPP UMTS 1700 MHz, "
+
+#: ../cli/src/settings.c:588
+msgid "WCDMA 3GPP UMTS 1900 MHz, "
+msgstr "WCDMA 3GPP UMTS 1900 MHz, "
+
+#: ../cli/src/settings.c:590
+msgid "WCDMA 3GPP UMTS 2600 MHz, "
+msgstr "WCDMA 3GPP UMTS 2600 MHz, "
+
+#: ../cli/src/settings.c:608
+msgid "0 (NONE)"
+msgstr "0 (NONE)"
+
+#: ../cli/src/settings.c:614
+msgid "REORDER_HEADERS, "
+msgstr "REORDER_HEADERS, "
+
+#: ../cli/src/settings.c:616
+msgid "GVRP, "
+msgstr "GVRP, "
+
+#: ../cli/src/settings.c:618
+msgid "LOOSE_BINDING, "
+msgstr "LOOSE_BINDING, "
+
+#: ../cli/src/settings.c:654
+#, c-format
+msgid "%d (disabled)"
+msgstr "%d (disabled)"
+
+#: ../cli/src/settings.c:656
+#, c-format
+msgid "%d (enabled, prefer public IP)"
+msgstr "%d (enabled, prefer public IP)"
+
+#: ../cli/src/settings.c:658
+#, c-format
+msgid "%d (enabled, prefer temporary IP)"
+msgstr "%d (enabled, prefer temporary IP)"
+
+#: ../cli/src/settings.c:791 ../cli/src/settings.c:987
+#: ../cli/src/settings.c:1696
+msgid "auto"
+msgstr "auto"
+
+#: ../cli/src/utils.c:103
+#, c-format
+msgid "Error converting IP4 address '0x%X' to text form"
+msgstr "Error converting IP4 address '0x%X' to text form"
+
+#: ../cli/src/utils.c:131
+#, c-format
+msgid "Error converting IP6 address '%s' to text form"
+msgstr "Error converting IP6 address '%s' to text form"
+
+#: ../cli/src/utils.c:232
+#, c-format
+msgid "field '%s' has to be alone"
+msgstr "field '%s' has to be alone"
+
+#: ../cli/src/utils.c:235
+#, c-format
+msgid "invalid field '%s'"
+msgstr "invalid field '%s'"
+
+#: ../cli/src/utils.c:254
+msgid "Option '--terse' requires specifying '--fields'"
+msgstr "Option '--terse' requires specifying '--fields'"
+
+#: ../cli/src/utils.c:258
+#, c-format
+msgid "Option '--terse' requires specific '--fields' option values , not '%s'"
+msgstr "Option '--terse' requires specific '--fields' option values , not '%s'"
+
+#: ../cli/src/utils.c:468
+#, c-format
+msgid "Error: Couldn't create D-Bus object proxy for org.freedesktop.DBus"
+msgstr "Error: Couldn't create D-Bus object proxy for org.freedesktop.DBus"
+
+#: ../cli/src/utils.c:476
+#, c-format
+msgid "Error: NameHasOwner request failed: %s"
+msgstr "Error: NameHasOwner request failed: %s"
+
+#: ../cli/src/utils.c:521
+#, c-format
+msgid ""
+"Warning: nmcli (%s) and NetworkManager (%s) versions don't match. Use --"
+"nocheck to suppress the warning.\n"
+msgstr ""
+"Warning: nmcli (%s) and NetworkManager (%s) versions don't match. Use --"
+"nocheck to suppress the warning.\n"
+
+#: ../cli/src/utils.c:530
+#, c-format
 msgid ""
+"Error: nmcli (%s) and NetworkManager (%s) versions don't match. Force "
+"execution using --nocheck, but the results are unpredictable."
 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: 2009-09-11 15:24+0000\n"
-"PO-Revision-Date: 2006-12-28 18:52-0000\n"
-"Last-Translator: Philip Withnall \n"
-"Language-Team: British English \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"Error: nmcli (%s) and NetworkManager (%s) versions don't match. Force "
+"execution using --nocheck, but the results are unpredictable."
 
-#: ../libnm-util/crypto.c:120
+#: ../libnm-util/crypto.c:133
 #, c-format
 msgid "PEM key file had no end tag '%s'."
 msgstr "PEM key file had no end tag '%s'."
 
-#: ../libnm-util/crypto.c:130
+#: ../libnm-util/crypto.c:146
 #, c-format
 msgid "Doesn't look like a PEM private key file."
 msgstr "Doesn't look like a PEM private key file."
 
-#: ../libnm-util/crypto.c:138
+#: ../libnm-util/crypto.c:154
 #, c-format
 msgid "Not enough memory to store PEM file data."
 msgstr "Not enough memory to store PEM file data."
 
-#: ../libnm-util/crypto.c:154
+#: ../libnm-util/crypto.c:170
 #, c-format
 msgid "Malformed PEM file: Proc-Type was not first tag."
 msgstr "Malformed PEM file: Proc-Type was not first tag."
 
-#: ../libnm-util/crypto.c:162
+#: ../libnm-util/crypto.c:178
 #, c-format
 msgid "Malformed PEM file: unknown Proc-Type tag '%s'."
 msgstr "Malformed PEM file: unknown Proc-Type tag '%s'."
 
-#: ../libnm-util/crypto.c:172
+#: ../libnm-util/crypto.c:188
 #, c-format
 msgid "Malformed PEM file: DEK-Info was not the second tag."
 msgstr "Malformed PEM file: DEK-Info was not the second tag."
 
-#: ../libnm-util/crypto.c:183
+#: ../libnm-util/crypto.c:199
 #, c-format
 msgid "Malformed PEM file: no IV found in DEK-Info tag."
 msgstr "Malformed PEM file: no IV found in DEK-Info tag."
 
-#: ../libnm-util/crypto.c:190
+#: ../libnm-util/crypto.c:206
 #, c-format
 msgid "Malformed PEM file: invalid format of IV in DEK-Info tag."
 msgstr "Malformed PEM file: invalid format of IV in DEK-Info tag."
 
-#: ../libnm-util/crypto.c:203
+#: ../libnm-util/crypto.c:219
 #, c-format
 msgid "Malformed PEM file: unknown private key cipher '%s'."
 msgstr "Malformed PEM file: unknown private key cipher '%s'."
 
-#: ../libnm-util/crypto.c:222
+#: ../libnm-util/crypto.c:238
 #, c-format
 msgid "Could not decode private key."
 msgstr "Could not decode private key."
 
-#: ../libnm-util/crypto.c:267
-#, c-format
-msgid "PEM certificate '%s' had no end tag '%s'."
-msgstr "PEM certificate '%s' had no end tag '%s'."
+#: ../libnm-util/crypto.c:284
+msgid "Failed to find expected PKCS#8 start tag."
+msgstr "Failed to find expected PKCS#8 start tag."
 
-#: ../libnm-util/crypto.c:277
+#: ../libnm-util/crypto.c:292
 #, c-format
-msgid "Failed to decode certificate."
-msgstr "Failed to decode certificate."
+msgid "Failed to find expected PKCS#8 end tag '%s'."
+msgstr "Failed to find expected PKCS#8 end tag '%s'."
+
+#: ../libnm-util/crypto.c:312
+msgid "Not enough memory to store private key data."
+msgstr "Not enough memory to store private key data."
 
-#: ../libnm-util/crypto.c:286
+#: ../libnm-util/crypto.c:317
+msgid "Failed to decode PKCS#8 private key."
+msgstr "Failed to decode PKCS#8 private key."
+
+#: ../libnm-util/crypto.c:339 ../libnm-util/crypto.c:625
 #, c-format
 msgid "Not enough memory to store certificate data."
 msgstr "Not enough memory to store certificate data."
 
-#: ../libnm-util/crypto.c:294
-#, c-format
-msgid "Not enough memory to store file data."
-msgstr "Not enough memory to store file data."
-
-#: ../libnm-util/crypto.c:324
+#: ../libnm-util/crypto.c:365
 #, c-format
 msgid "IV must be an even number of bytes in length."
 msgstr "IV must be an even number of bytes in length."
 
-#: ../libnm-util/crypto.c:333
+#: ../libnm-util/crypto.c:374
 #, c-format
 msgid "Not enough memory to store the IV."
 msgstr "Not enough memory to store the IV."
 
-#: ../libnm-util/crypto.c:344
+#: ../libnm-util/crypto.c:385
 #, c-format
 msgid "IV contains non-hexadecimal digits."
 msgstr "IV contains non-hexadecimal digits."
 
-#: ../libnm-util/crypto.c:382 ../libnm-util/crypto_gnutls.c:143
-#: ../libnm-util/crypto_nss.c:169
+#: ../libnm-util/crypto.c:423 ../libnm-util/crypto_gnutls.c:147
+#: ../libnm-util/crypto_gnutls.c:265 ../libnm-util/crypto_nss.c:167
+#: ../libnm-util/crypto_nss.c:332
 #, c-format
 msgid "Private key cipher '%s' was unknown."
 msgstr "Private key cipher '%s' was unknown."
 
-#: ../libnm-util/crypto.c:391
+#: ../libnm-util/crypto.c:432
 #, c-format
 msgid "Not enough memory to decrypt private key."
 msgstr "Not enough memory to decrypt private key."
 
-#: ../libnm-util/crypto.c:511
+#: ../libnm-util/crypto.c:497
+#, c-format
+msgid "Not enough memory to store decrypted private key."
+msgstr "Not enough memory to store decrypted private key."
+
+#: ../libnm-util/crypto.c:542
 #, c-format
 msgid "Unable to determine private key type."
 msgstr "Unable to determine private key type."
 
-#: ../libnm-util/crypto.c:530
+#: ../libnm-util/crypto.c:597
 #, c-format
-msgid "Not enough memory to store decrypted private key."
-msgstr "Not enough memory to store decrypted private key."
+msgid "PEM certificate had no start tag '%s'."
+msgstr "PEM certificate had no start tag '%s'."
+
+#: ../libnm-util/crypto.c:606
+#, c-format
+msgid "PEM certificate had no end tag '%s'."
+msgstr "PEM certificate had no end tag '%s'."
+
+#: ../libnm-util/crypto.c:630
+#, c-format
+msgid "Failed to decode certificate."
+msgstr "Failed to decode certificate."
 
-#: ../libnm-util/crypto_gnutls.c:46
+#: ../libnm-util/crypto_gnutls.c:50
 msgid "Failed to initialize the crypto engine."
 msgstr "Failed to initialise the crypto engine."
 
-#: ../libnm-util/crypto_gnutls.c:90
+#: ../libnm-util/crypto_gnutls.c:92
 #, c-format
 msgid "Failed to initialize the MD5 engine: %s / %s."
 msgstr "Failed to initialise the MD5 engine: %s / %s."
 
-#: ../libnm-util/crypto_gnutls.c:152 ../libnm-util/crypto_nss.c:178
+#: ../libnm-util/crypto_gnutls.c:155
+#, c-format
+msgid "Invalid IV length (must be at least %zd)."
+msgstr "Invalid IV length (must be at least %zd)."
+
+#: ../libnm-util/crypto_gnutls.c:164 ../libnm-util/crypto_nss.c:184
 #, c-format
 msgid "Not enough memory for decrypted key buffer."
 msgstr "Not enough memory for decrypted key buffer."
 
-#: ../libnm-util/crypto_gnutls.c:160
+#: ../libnm-util/crypto_gnutls.c:172
 #, c-format
 msgid "Failed to initialize the decryption cipher context: %s / %s."
 msgstr "Failed to initialise the decryption cipher context: %s / %s."
 
-#: ../libnm-util/crypto_gnutls.c:169
+#: ../libnm-util/crypto_gnutls.c:181
 #, c-format
 msgid "Failed to set symmetric key for decryption: %s / %s."
 msgstr "Failed to set symmetric key for decryption: %s / %s."
 
-#: ../libnm-util/crypto_gnutls.c:178
+#: ../libnm-util/crypto_gnutls.c:190
 #, c-format
 msgid "Failed to set IV for decryption: %s / %s."
 msgstr "Failed to set IV for decryption: %s / %s."
 
-#: ../libnm-util/crypto_gnutls.c:187
+#: ../libnm-util/crypto_gnutls.c:199
 #, c-format
 msgid "Failed to decrypt the private key: %s / %s."
 msgstr "Failed to decrypt the private key: %s / %s."
 
-#: ../libnm-util/crypto_gnutls.c:200
+#: ../libnm-util/crypto_gnutls.c:209 ../libnm-util/crypto_nss.c:263
+#, c-format
+msgid "Failed to decrypt the private key: unexpected padding length."
+msgstr "Failed to decrypt the private key: unexpected padding length."
+
+#: ../libnm-util/crypto_gnutls.c:220 ../libnm-util/crypto_nss.c:274
 #, c-format
 msgid "Failed to decrypt the private key."
 msgstr "Failed to decrypt the private key."
 
-#: ../libnm-util/crypto_gnutls.c:235
+#: ../libnm-util/crypto_gnutls.c:285 ../libnm-util/crypto_nss.c:352
+#, c-format
+msgid "Could not allocate memory for encrypting."
+msgstr "Could not allocate memory for encrypting."
+
+#: ../libnm-util/crypto_gnutls.c:293
+#, c-format
+msgid "Failed to initialize the encryption cipher context: %s / %s."
+msgstr "Failed to initialise the decryption cipher context: %s / %s."
+
+#: ../libnm-util/crypto_gnutls.c:302
+#, c-format
+msgid "Failed to set symmetric key for encryption: %s / %s."
+msgstr "Failed to set symmetric key for encryption: %s / %s."
+
+#: ../libnm-util/crypto_gnutls.c:312
+#, c-format
+msgid "Failed to set IV for encryption: %s / %s."
+msgstr "Failed to set IV for encryption: %s / %s."
+
+#: ../libnm-util/crypto_gnutls.c:321
+#, c-format
+msgid "Failed to encrypt the data: %s / %s."
+msgstr "Failed to encrypt the data: %s / %s."
+
+#: ../libnm-util/crypto_gnutls.c:361
 #, c-format
 msgid "Error initializing certificate data: %s"
 msgstr "Error initialising certificate data: %s"
 
-#: ../libnm-util/crypto_gnutls.c:257
+#: ../libnm-util/crypto_gnutls.c:383
 #, c-format
 msgid "Couldn't decode certificate: %s"
 msgstr "Couldn't decode certificate: %s"
 
-#: ../libnm-util/crypto_gnutls.c:281
+#: ../libnm-util/crypto_gnutls.c:407
 #, c-format
 msgid "Couldn't initialize PKCS#12 decoder: %s"
 msgstr "Couldn't initialise PKCS#12 decoder: %s"
 
-#: ../libnm-util/crypto_gnutls.c:294
+#: ../libnm-util/crypto_gnutls.c:420
 #, c-format
 msgid "Couldn't decode PKCS#12 file: %s"
 msgstr "Couldn't decode PKCS#12 file: %s"
 
-#: ../libnm-util/crypto_gnutls.c:306
+#: ../libnm-util/crypto_gnutls.c:432
 #, c-format
 msgid "Couldn't verify PKCS#12 file: %s"
 msgstr "Couldn't verify PKCS#12 file: %s"
 
-#: ../libnm-util/crypto_nss.c:57
-#: ../system-settings/plugins/ifcfg-rh/crypto.c:52
+#: ../libnm-util/crypto_gnutls.c:460
+#, c-format
+msgid "Couldn't initialize PKCS#8 decoder: %s"
+msgstr "Couldn't initialise PKCS#8 decoder: %s"
+
+#: ../libnm-util/crypto_gnutls.c:483
+#, c-format
+msgid "Couldn't decode PKCS#8 file: %s"
+msgstr "Couldn't decode PKCS#8 file: %s"
+
+#: ../libnm-util/crypto_nss.c:56
 #, c-format
 msgid "Failed to initialize the crypto engine: %d."
 msgstr "Failed to initialise the crypto engine: %d."
 
-#: ../libnm-util/crypto_nss.c:111
+#: ../libnm-util/crypto_nss.c:107
 #, c-format
 msgid "Failed to initialize the MD5 context: %d."
 msgstr "Failed to initialise the MD5 context: %d."
 
-#: ../libnm-util/crypto_nss.c:186
+#: ../libnm-util/crypto_nss.c:175
+#, c-format
+msgid "Invalid IV length (must be at least %d)."
+msgstr "Invalid IV length (must be at least %d)."
+
+#: ../libnm-util/crypto_nss.c:192
 #, c-format
 msgid "Failed to initialize the decryption cipher slot."
 msgstr "Failed to initialise the decryption cipher slot."
 
-#: ../libnm-util/crypto_nss.c:196
+#: ../libnm-util/crypto_nss.c:202
 #, c-format
 msgid "Failed to set symmetric key for decryption."
 msgstr "Failed to set symmetric key for decryption."
 
-#: ../libnm-util/crypto_nss.c:206
+#: ../libnm-util/crypto_nss.c:212
 #, c-format
 msgid "Failed to set IV for decryption."
 msgstr "Failed to set IV for decryption."
 
-#: ../libnm-util/crypto_nss.c:214
+#: ../libnm-util/crypto_nss.c:220
 #, c-format
 msgid "Failed to initialize the decryption context."
 msgstr "Failed to initialise the decryption context."
 
-#: ../libnm-util/crypto_nss.c:227
+#: ../libnm-util/crypto_nss.c:233
 #, c-format
 msgid "Failed to decrypt the private key: %d."
 msgstr "Failed to decrypt the private key: %d."
 
-#: ../libnm-util/crypto_nss.c:239
+#: ../libnm-util/crypto_nss.c:241
+#, c-format
+msgid "Failed to decrypt the private key: decrypted data too large."
+msgstr "Failed to decrypt the private key: decrypted data too large."
+
+#: ../libnm-util/crypto_nss.c:252
 #, c-format
 msgid "Failed to finalize decryption of the private key: %d."
 msgstr "Failed to finalise decryption of the private key: %d."
 
-#: ../libnm-util/crypto_nss.c:284
+#: ../libnm-util/crypto_nss.c:360
+#, c-format
+msgid "Failed to initialize the encryption cipher slot."
+msgstr "Failed to initialise the encryption cipher slot."
+
+#: ../libnm-util/crypto_nss.c:368
+#, c-format
+msgid "Failed to set symmetric key for encryption."
+msgstr "Failed to set symmetric key for encryption."
+
+#: ../libnm-util/crypto_nss.c:376
+#, c-format
+msgid "Failed to set IV for encryption."
+msgstr "Failed to set IV for encryption."
+
+#: ../libnm-util/crypto_nss.c:384
+#, c-format
+msgid "Failed to initialize the encryption context."
+msgstr "Failed to initialise the encryption context."
+
+#: ../libnm-util/crypto_nss.c:392
+#, c-format
+msgid "Failed to encrypt: %d."
+msgstr "Failed to encrypt: %d."
+
+#: ../libnm-util/crypto_nss.c:400
+#, c-format
+msgid "Unexpected amount of data after encrypting."
+msgstr "Unexpected amount of data after encrypting."
+
+#: ../libnm-util/crypto_nss.c:443
 #, c-format
 msgid "Couldn't decode certificate: %d"
 msgstr "Couldn't decode certificate: %d"
 
-#: ../libnm-util/crypto_nss.c:319
+#: ../libnm-util/crypto_nss.c:478
 #, c-format
 msgid "Couldn't convert password to UCS2: %d"
 msgstr "Couldn't convert password to UCS2: %d"
 
-#: ../libnm-util/crypto_nss.c:347
+#: ../libnm-util/crypto_nss.c:506
 #, c-format
 msgid "Couldn't initialize PKCS#12 decoder: %d"
 msgstr "Couldn't initialise PKCS#12 decoder: %d"
 
-#: ../libnm-util/crypto_nss.c:356
+#: ../libnm-util/crypto_nss.c:515
 #, c-format
 msgid "Couldn't decode PKCS#12 file: %d"
 msgstr "Couldn't decode PKCS#12 file: %d"
 
-#: ../libnm-util/crypto_nss.c:365
+#: ../libnm-util/crypto_nss.c:524
 #, c-format
 msgid "Couldn't verify PKCS#12 file: %d"
 msgstr "Couldn't verify PKCS#12 file: %d"
 
-#: ../src/nm-netlink-monitor.c:194 ../src/nm-netlink-monitor.c:464
-#: ../src/ip6-manager/nm-netlink-listener.c:352
+#: ../libnm-util/crypto_nss.c:568
+msgid "Could not generate random data."
+msgstr "Could not generate random data."
+
+#: ../libnm-util/nm-utils.c:2040
 #, c-format
-msgid "error processing netlink message: %s"
-msgstr "error processing netlink message: %s"
+msgid "Not enough memory to make encryption key."
+msgstr "Not enough memory to make encryption key."
+
+#: ../libnm-util/nm-utils.c:2150
+msgid "Could not allocate memory for PEM file creation."
+msgstr "Could not allocate memory for PEM file creation."
 
-#: ../src/nm-netlink-monitor.c:260
+#: ../libnm-util/nm-utils.c:2162
 #, c-format
-msgid "unable to allocate netlink handle for monitoring link status: %s"
-msgstr "unable to allocate netlink handle for monitoring link status: %s"
+msgid "Could not allocate memory for writing IV to PEM file."
+msgstr "Could not allocate memory for writing IV to PEM file."
 
-#: ../src/nm-netlink-monitor.c:270
+#: ../libnm-util/nm-utils.c:2174
 #, c-format
-msgid "unable to connect to netlink for monitoring link status: %s"
-msgstr "unable to connect to netlink for monitoring link status: %s"
+msgid "Could not allocate memory for writing encrypted key to PEM file."
+msgstr "Could not allocate memory for writing encrypted key to PEM file."
+
+#: ../libnm-util/nm-utils.c:2193
+#, c-format
+msgid "Could not allocate memory for PEM file data."
+msgstr "Could not allocate memory for PEM file data."
+
+#: ../policy/org.freedesktop.NetworkManager.policy.in.h:1
+msgid "Enable or disable system networking"
+msgstr "Enable or disable system networking"
+
+#: ../policy/org.freedesktop.NetworkManager.policy.in.h:2
+msgid "System policy prevents enabling or disabling system networking"
+msgstr "System policy prevents enabling or disabling system networking"
+
+#: ../policy/org.freedesktop.NetworkManager.policy.in.h:3
+msgid ""
+"Put NetworkManager to sleep or wake it up (should only be used by system "
+"power management)"
+msgstr ""
+"Put NetworkManager to sleep or wake it up (should only be used by system "
+"power management)"
+
+#: ../policy/org.freedesktop.NetworkManager.policy.in.h:4
+msgid "System policy prevents putting NetworkManager to sleep or waking it up"
+msgstr "System policy prevents putting NetworkManager to sleep or waking it up"
+
+#: ../policy/org.freedesktop.NetworkManager.policy.in.h:5
+msgid "Enable or disable WiFi devices"
+msgstr "Enable or disable WiFi devices"
+
+#: ../policy/org.freedesktop.NetworkManager.policy.in.h:6
+msgid "System policy prevents enabling or disabling WiFi devices"
+msgstr "System policy prevents enabling or disabling WiFi devices"
+
+#: ../policy/org.freedesktop.NetworkManager.policy.in.h:7
+msgid "Enable or disable mobile broadband devices"
+msgstr "Enable or disable mobile broadband devices"
+
+#: ../policy/org.freedesktop.NetworkManager.policy.in.h:8
+msgid "System policy prevents enabling or disabling mobile broadband devices"
+msgstr "System policy prevents enabling or disabling mobile broadband devices"
+
+#: ../policy/org.freedesktop.NetworkManager.policy.in.h:9
+msgid "Enable or disable WiMAX mobile broadband devices"
+msgstr "Enable or disable WiMAX mobile broadband devices"
+
+#: ../policy/org.freedesktop.NetworkManager.policy.in.h:10
+msgid ""
+"System policy prevents enabling or disabling WiMAX mobile broadband devices"
+msgstr ""
+"System policy prevents enabling or disabling WiMAX mobile broadband devices"
+
+#: ../policy/org.freedesktop.NetworkManager.policy.in.h:11
+msgid "Allow control of network connections"
+msgstr "Allow control of network connections"
+
+#: ../policy/org.freedesktop.NetworkManager.policy.in.h:12
+msgid "System policy prevents control of network connections"
+msgstr "System policy prevents control of network connections"
+
+#: ../policy/org.freedesktop.NetworkManager.policy.in.h:13
+msgid "Connection sharing via a protected WiFi network"
+msgstr "Connection sharing via a protected Wi-Fi network"
+
+#: ../policy/org.freedesktop.NetworkManager.policy.in.h:14
+msgid "System policy prevents sharing connections via a protected WiFi network"
+msgstr ""
+"System policy prevents sharing connections via a protected Wi-Fi network"
+
+#: ../policy/org.freedesktop.NetworkManager.policy.in.h:15
+msgid "Connection sharing via an open WiFi network"
+msgstr "Connection sharing via an open Wi-Fi network"
+
+#: ../policy/org.freedesktop.NetworkManager.policy.in.h:16
+msgid "System policy prevents sharing connections via an open WiFi network"
+msgstr "System policy prevents sharing connections via an open Wi-Fi network"
+
+#: ../policy/org.freedesktop.NetworkManager.policy.in.h:17
+msgid "Modify personal network connections"
+msgstr "Modify personal network connections"
+
+#: ../policy/org.freedesktop.NetworkManager.policy.in.h:18
+msgid "System policy prevents modification of personal network settings"
+msgstr "System policy prevents modification of personal network settings"
+
+#: ../policy/org.freedesktop.NetworkManager.policy.in.h:19
+msgid "Modify network connections for all users"
+msgstr "Modify network connections for all users"
+
+#: ../policy/org.freedesktop.NetworkManager.policy.in.h:20
+msgid "System policy prevents modification of network settings for all users"
+msgstr "System policy prevents modification of network settings for all users"
 
-#: ../src/nm-netlink-monitor.c:278
+#: ../policy/org.freedesktop.NetworkManager.policy.in.h:21
+msgid "Modify persistent system hostname"
+msgstr "Modify persistent system hostname"
+
+#: ../policy/org.freedesktop.NetworkManager.policy.in.h:22
+msgid "System policy prevents modification of the persistent system hostname"
+msgstr "System policy prevents modification of the persistent system hostname"
+
+#: ../src/main.c:158
 #, c-format
-msgid "unable to join netlink group for monitoring link status: %s"
-msgstr "unable to join netlink group for monitoring link status: %s"
+msgid "Failed to set signal mask: %d"
+msgstr "Failed to set signal mask: %d"
 
-#: ../src/nm-netlink-monitor.c:286
+#: ../src/main.c:167
 #, c-format
-msgid "unable to allocate netlink link cache for monitoring link status: %s"
-msgstr "unable to allocate netlink link cache for monitoring link status: %s"
+msgid "Failed to create signal handling thread: %d"
+msgstr "Failed to create signal handling thread: %d"
 
-#: ../src/nm-netlink-monitor.c:494
-#: ../src/ip6-manager/nm-netlink-listener.c:382
-msgid "error occurred while waiting for data on socket"
-msgstr "error occurred while waiting for data on socket"
+#: ../src/main.c:182
+#, c-format
+msgid "Opening %s failed: %s\n"
+msgstr "Opening %s failed: %s\n"
+
+#: ../src/main.c:188
+#, c-format
+msgid "Writing to %s failed: %s\n"
+msgstr "Writing to %s failed: %s\n"
+
+#: ../src/main.c:193
+#, c-format
+msgid "Closing %s failed: %s\n"
+msgstr "Closing %s failed: %s\n"
+
+#: ../src/main.c:236
+#, c-format
+msgid "NetworkManager is already running (pid %ld)\n"
+msgstr "NetworkManager is already running (pid %ld)\n"
+
+#: ../src/main.c:376
+msgid "Print NetworkManager version and exit"
+msgstr "Print NetworkManager version and exit"
+
+#: ../src/main.c:377
+msgid "Don't become a daemon"
+msgstr "Don't become a daemon"
+
+#: ../src/main.c:378
+msgid "Make all warnings fatal"
+msgstr "Make all warnings fatal"
+
+#: ../src/main.c:379
+msgid "Specify the location of a PID file"
+msgstr "Specify the location of a PID file"
+
+#: ../src/main.c:379
+msgid "filename"
+msgstr "filename"
+
+#: ../src/main.c:380
+msgid "State file location"
+msgstr "State file location"
+
+#: ../src/main.c:380
+msgid "/path/to/state.file"
+msgstr "/path/to/state.file"
 
-#: ../src/NetworkManager.c:330
+#: ../src/main.c:381
+msgid "Config file location"
+msgstr "Config file location"
+
+#: ../src/main.c:381
+msgid "/path/to/config.file"
+msgstr "/path/to/config.file"
+
+#: ../src/main.c:382
+msgid "List of plugins separated by ','"
+msgstr "List of plugins separated by ','"
+
+#: ../src/main.c:382
+msgid "plugin1,plugin2"
+msgstr "plugin1,plugin2"
+
+#. Translators: Do not translate the values in the square brackets
+#: ../src/main.c:384
+msgid "Log level: one of [ERR, WARN, INFO, DEBUG]"
+msgstr "Log level: one of [ERR, WARN, INFO, DEBUG]"
+
+#. Translators: Do not translate the values in the square brackets
+#: ../src/main.c:387
+msgid ""
+"Log domains separated by ',': any combination of\n"
+"                                                [NONE,HW,RFKILL,ETHER,WIFI,"
+"BT,MB,DHCP4,DHCP6,PPP,\n"
+"                                                 WIFI_SCAN,IP4,IP6,AUTOIP4,"
+"DNS,VPN,SHARING,SUPPLICANT,\n"
+"                                                 AGENTS,SETTINGS,SUSPEND,"
+"CORE,DEVICE,OLPC,WIMAX,\n"
+"                                                 INFINIBAND,FIREWALL,ADSL]"
+msgstr ""
+"Log domains separated by ',': any combination of\n"
+"                                                [NONE,HW,RFKILL,ETHER,WIFI,"
+"BT,MB,DHCP4,DHCP6,PPP,\n"
+"                                                 WIFI_SCAN,IP4,IP6,AUTOIP4,"
+"DNS,VPN,SHARING,SUPPLICANT,\n"
+"                                                 AGENTS,SETTINGS,SUSPEND,"
+"CORE,DEVICE,OLPC,WIMAX,\n"
+"                                                 INFINIBAND,FIREWALL,ADSL]"
+
+#: ../src/main.c:393
+msgid "An http(s) address for checking internet connectivity"
+msgstr "An http(s) address for checking internet connectivity"
+
+#: ../src/main.c:394
+msgid "The interval between connectivity checks (in seconds)"
+msgstr "The interval between connectivity checks (in seconds)"
+
+#: ../src/main.c:395
+msgid "The expected start of the response"
+msgstr "The expected start of the response"
+
+#: ../src/main.c:395
+msgid "Bingo!"
+msgstr "Bingo!"
+
+#: ../src/main.c:400
+#, c-format
+msgid "GModules are not supported on your platform!\n"
+msgstr "GModules are not supported on your platform!\n"
+
+#: ../src/main.c:419
+msgid ""
+"NetworkManager monitors all network connections and automatically\n"
+"chooses the best connection to use.  It also allows the user to\n"
+"specify wireless access points which wireless cards in the computer\n"
+"should associate with."
+msgstr ""
+"NetworkManager monitors all network connections and automatically\n"
+"chooses the best connection to use.  It also allows the user to\n"
+"specify wireless access points which wireless cards in the computer\n"
+"should associate with."
+
+#: ../src/main.c:425
 #, c-format
 msgid "Invalid option.  Please use --help to see a list of valid options.\n"
-msgstr "Invalid option. Please use --help to see a list of valid options.\n"
+msgstr "Invalid option.  Please use --help to see a list of valid options.\n"
+
+#: ../src/main.c:435
+#, c-format
+msgid "You must be root to run NetworkManager!\n"
+msgstr "You must be root to run NetworkManager!\n"
+
+#: ../src/main.c:456
+#, c-format
+msgid "Failed to read configuration: (%d) %s\n"
+msgstr "Failed to read configuration: (%d) %s\n"
 
-#: ../src/dhcp-manager/nm-dhcp-dhclient.c:304
+#: ../src/main.c:467
+#, c-format
+msgid "%s.  Please use --help to see a list of valid options.\n"
+msgstr "%s.  Please use --help to see a list of valid options.\n"
+
+#: ../src/main.c:474
+#, c-format
+msgid "State file %s parsing failed: (%d) %s\n"
+msgstr "State file %s parsing failed: (%d) %s\n"
+
+#: ../src/main.c:491
+#, c-format
+msgid "Could not daemonize: %s [error %u]\n"
+msgstr "Could not daemonise: %s [error %u]\n"
+
+#: ../src/dhcp-manager/nm-dhcp-dhclient-utils.c:62
 msgid "# Created by NetworkManager\n"
 msgstr "# Created by NetworkManager\n"
 
-#: ../src/dhcp-manager/nm-dhcp-dhclient.c:310
+#: ../src/dhcp-manager/nm-dhcp-dhclient-utils.c:69
 #, c-format
 msgid ""
 "# Merged from %s\n"
@@ -303,69 +2569,185 @@ msgstr ""
 "# Merged from %s\n"
 "\n"
 
-#: ../src/ip6-manager/nm-netlink-listener.c:200
-#, c-format
-msgid "unable to allocate netlink handle: %s"
-msgstr "unable to allocate netlink handle: %s"
+#: ../src/dhcp-manager/nm-dhcp-manager.c:266
+msgid "no usable DHCP client could be found."
+msgstr "no usable DHCP client could be found."
 
-#: ../src/ip6-manager/nm-netlink-listener.c:210
-#, c-format
-msgid "unable to connect to netlink: %s"
-msgstr "unable to connect to netlink: %s"
+#: ../src/dhcp-manager/nm-dhcp-manager.c:275
+msgid "'dhclient' could be found."
+msgstr "'dhclient' could be found."
 
-#: ../src/ip6-manager/nm-netlink-listener.c:307
+#: ../src/dhcp-manager/nm-dhcp-manager.c:285
+msgid "'dhcpcd' could be found."
+msgstr "'dhcpcd' could be found."
+
+#: ../src/dhcp-manager/nm-dhcp-manager.c:293
 #, c-format
-msgid "unable to join netlink group: %s"
-msgstr "unable to join netlink group: %s"
+msgid "unsupported DHCP client '%s'"
+msgstr "unsupported DHCP client '%s'"
 
-#: ../src/dns-manager/nm-dns-manager.c:315
+#: ../src/dns-manager/nm-dns-manager.c:380
 msgid "NOTE: the libc resolver may not support more than 3 nameservers."
 msgstr "NOTE: the libc resolver may not support more than 3 nameservers."
 
-#: ../src/dns-manager/nm-dns-manager.c:317
+#: ../src/dns-manager/nm-dns-manager.c:382
 msgid "The nameservers listed below may not be recognized."
 msgstr "The nameservers listed below may not be recognised."
 
-#: ../src/settings/nm-default-wired-connection.c:194
+#: ../src/logging/nm-logging.c:131
+#, c-format
+msgid "Unknown log level '%s'"
+msgstr "Unknown log level '%s'"
+
+#: ../src/logging/nm-logging.c:156
+#, c-format
+msgid "Unknown log domain '%s'"
+msgstr "Unknown log domain '%s'"
+
+#: ../src/modem-manager/nm-modem-cdma.c:281 ../src/nm-device-bt.c:351
+#, c-format
+msgid "CDMA connection %d"
+msgstr "CDMA connection %d"
+
+#: ../src/modem-manager/nm-modem-gsm.c:559 ../src/nm-device-bt.c:347
+#, c-format
+msgid "GSM connection %d"
+msgstr "GSM connection %d"
+
+#: ../src/nm-device-bond.c:191
+#, c-format
+msgid "Bond connection %d"
+msgstr "Bond connection %d"
+
+#: ../src/nm-device-adsl.c:193
+#, c-format
+msgid "ADSL connection %d"
+msgstr "ADSL connection %d"
+
+#: ../src/nm-device-bt.c:322
+#, c-format
+msgid "PAN connection %d"
+msgstr "PAN connection %d"
+
+#: ../src/nm-device-bt.c:355
+#, c-format
+msgid "DUN connection %d"
+msgstr "DUN connection %d"
+
+#: ../src/nm-device-ethernet.c:1328
+#, c-format
+msgid "PPPoE connection %d"
+msgstr "PPPoE connection %d"
+
+#: ../src/nm-device-ethernet.c:1328 ../src/settings/nm-settings-utils.c:50
+#, c-format
+msgid "Wired connection %d"
+msgstr "Wired connection %d"
+
+#: ../src/nm-device-infiniband.c:303
+#, c-format
+msgid "InfiniBand connection %d"
+msgstr "InfiniBand connection %d"
+
+#: ../src/nm-device-olpc-mesh.c:303
+#, c-format
+msgid "Mesh %d"
+msgstr "Mesh %d"
+
+#: ../src/nm-device-vlan.c:362
+#, c-format
+msgid "VLAN connection %d"
+msgstr "VLAN connection %d"
+
+#: ../src/nm-manager.c:662
+#, c-format
+msgid "VPN connection %d"
+msgstr "VPN connection %d"
+
+#: ../src/nm-netlink-monitor.c:148 ../src/nm-netlink-monitor.c:272
+#: ../src/nm-netlink-monitor.c:695
+#, c-format
+msgid "error processing netlink message: %s"
+msgstr "error processing netlink message: %s"
+
+#: ../src/nm-netlink-monitor.c:251
+msgid "error occurred while waiting for data on socket"
+msgstr "error occurred while waiting for data on socket"
+
+#: ../src/nm-netlink-monitor.c:296
+#, c-format
+msgid "unable to connect to netlink for monitoring link status: %s"
+msgstr "unable to connect to netlink for monitoring link status: %s"
+
+#: ../src/nm-netlink-monitor.c:307
+#, c-format
+msgid "unable to enable netlink handle credential passing: %s"
+msgstr "unable to enable netlink handle credential passing: %s"
+
+#: ../src/nm-netlink-monitor.c:330 ../src/nm-netlink-monitor.c:390
+#, c-format
+msgid "unable to allocate netlink handle for monitoring link status: %s"
+msgstr "unable to allocate netlink handle for monitoring link status: %s"
+
+#: ../src/nm-netlink-monitor.c:415
+#, c-format
+msgid "unable to allocate netlink link cache for monitoring link status: %s"
+msgstr "unable to allocate netlink link cache for monitoring link status: %s"
+
+#: ../src/nm-netlink-monitor.c:542
+#, c-format
+msgid "unable to join netlink group: %s"
+msgstr "unable to join netlink group: %s"
+
+#: ../src/nm-netlink-monitor.c:671 ../src/nm-netlink-monitor.c:684
 #, c-format
-msgid "Auto %s"
-msgstr "Auto %s"
+msgid "error updating link cache: %s"
+msgstr "error updating link cache: %s"
 
-#: ../system-settings/plugins/ifcfg-rh/reader.c:2446
+#: ../src/settings/plugins/ifcfg-rh/reader.c:94
 msgid "System"
 msgstr "System"
 
-#: ../policy/org.freedesktop.network-manager-settings.system.policy.in.h:1
-msgid "Connection sharing via a protected WiFi network"
-msgstr "Connection sharing via a protected Wi-Fi network"
+#: ../src/settings/plugins/ifcfg-rh/reader.c:3657
+msgid "Bond"
+msgstr "Bond"
 
-#: ../policy/org.freedesktop.network-manager-settings.system.policy.in.h:2
-msgid "Connection sharing via an open WiFi network"
-msgstr "Connection sharing via an open Wi-Fi network"
+#: ../test/nm-online.c:112
+#, c-format
+msgid "\rConnecting"
+msgstr "\rConnecting"
 
-#: ../policy/org.freedesktop.network-manager-settings.system.policy.in.h:3
-msgid "Modify persistent system hostname"
-msgstr "Modify persistent system hostname"
+#: ../test/nm-online.c:143
+msgid "Time to wait for a connection, in seconds (default is 30)"
+msgstr "Time to wait for a connection, in seconds (default is 30)"
 
-#: ../policy/org.freedesktop.network-manager-settings.system.policy.in.h:4
-msgid "Modify system connections"
-msgstr "Modify system connections"
+#: ../test/nm-online.c:144
+msgid "Exit immediately if NetworkManager is not running or connecting"
+msgstr "Exit immediately if NetworkManager is not running or connecting"
 
-#: ../policy/org.freedesktop.network-manager-settings.system.policy.in.h:5
-msgid "System policy prevents modification of system settings"
-msgstr "System policy prevents modification of system settings"
+#: ../test/nm-online.c:145
+msgid "Don't print anything"
+msgstr "Don't print anything"
 
-#: ../policy/org.freedesktop.network-manager-settings.system.policy.in.h:6
-msgid "System policy prevents modification of the persistent system hostname"
-msgstr "System policy prevents modification of the persistent system hostname"
+#: ../test/nm-online.c:163
+msgid "Waits for a successful connection in NetworkManager."
+msgstr "Waits for a successful connection in NetworkManager."
 
-#: ../policy/org.freedesktop.network-manager-settings.system.policy.in.h:7
-msgid "System policy prevents sharing connections via a protected WiFi network"
-msgstr "System policy prevents sharing connections via a protected Wi-Fi network"
+#: ../test/nm-online.c:169 ../test/nm-online.c:178
+msgid "Invalid option.  Please use --help to see a list of valid options."
+msgstr "Invalid option.  Please use --help to see a list of valid options."
 
-#: ../policy/org.freedesktop.network-manager-settings.system.policy.in.h:8
-msgid "System policy prevents sharing connections via an open WiFi network"
-msgstr "System policy prevents sharing connections via an open Wi-Fi network"
+#~ msgid "unable to join netlink group for monitoring link status: %s"
+#~ msgstr "unable to join netlink group for monitoring link status: %s"
+
+#~ msgid "unable to connect to netlink: %s"
+#~ msgstr "unable to connect to netlink: %s"
+
+#~ msgid "Auto %s"
+#~ msgstr "Auto %s"
+
+#~ msgid "Modify system connections"
+#~ msgstr "Modify system connections"
 
 #
 #~ msgid "Passphrase for wireless network %s"
@@ -375,30 +2757,18 @@ msgstr "System policy prevents sharing connections via an open Wi-Fi network"
 #~ msgid "Connection to the wireless network '%s' failed."
 #~ msgstr "Connection to the wireless network '%s' failed."
 
-#~ msgid "Connection to the wired network failed."
-#~ msgstr "Connection to the wired network failed."
-
 #~ msgid "Error displaying connection information:"
 #~ msgstr "Error displaying connection information:"
 
 #~ msgid "Could not find some required resources (the glade file)!"
 #~ msgstr "Could not find some required resources (the glade file)!"
 
-#~ msgid "%d Mb/s"
-#~ msgstr "%d Mb/s"
-
 #~ msgid "Wired Ethernet (%s)"
 #~ msgstr "Wired Ethernet (%s)"
 
 #~ msgid "Wireless Ethernet (%s)"
 #~ msgstr "Wireless Ethernet (%s)"
 
-#~ msgid "Unknown"
-#~ msgstr "Unknown"
-
-#~ msgid "NetworkManager Applet"
-#~ msgstr "NetworkManager Applet"
-
 #~ msgid ""
 #~ "Copyright © 2004-2006 Red Hat, Inc.\n"
 #~ "Copyright © 2005-2006 Novell, Inc."
@@ -474,9 +2844,6 @@ msgstr "System policy prevents sharing connections via an open Wi-Fi network"
 #~ msgid "The network device \"%s (%s)\" does not support link detection."
 #~ msgstr "The network device \"%s (%s)\" does not support link detection."
 
-#~ msgid "(unknown)"
-#~ msgstr "(unknown)"
-
 #~ msgid "Preparing device %s for the wired network..."
 #~ msgstr "Preparing device %s for the wired network..."
 
@@ -509,18 +2876,6 @@ msgstr "System policy prevents sharing connections via an open Wi-Fi network"
 #~ msgid "Finishing connection to the wireless network '%s'..."
 #~ msgstr "Finishing connection to the wireless network '%s'..."
 
-#~ msgid "NetworkManager is not running"
-#~ msgstr "NetworkManager is not running"
-
-#~ msgid "Networking disabled"
-#~ msgstr "Networking disabled"
-
-#~ msgid "No network connection"
-#~ msgstr "No network connection"
-
-#~ msgid "Wired network connection"
-#~ msgstr "Wired network connection"
-
 #
 #~ msgid "Connected to an Ad-Hoc wireless network"
 #~ msgstr "Connected to an Ad-Hoc wireless network"
@@ -528,12 +2883,6 @@ msgstr "System policy prevents sharing connections via an open Wi-Fi network"
 #~ msgid "Wireless network connection to '%s' (%d%%)"
 #~ msgstr "Wireless network connection to '%s' (%d%%)"
 
-#~ msgid "VPN connection to '%s'"
-#~ msgstr "VPN connection to '%s'"
-
-#~ msgid "VPN connecting to '%s'"
-#~ msgstr "VPN connecting to '%s'"
-
 #~ msgid "_Connect to Other Wireless Network..."
 #~ msgstr "_Connect to Other Wireless Network..."
 
@@ -564,9 +2913,6 @@ msgstr "System policy prevents sharing connections via an open Wi-Fi network"
 #~ msgid "NetworkManager is not running..."
 #~ msgstr "NetworkManager is not running..."
 
-#~ msgid "Enable _Networking"
-#~ msgstr "Enable _Networking"
-
 #~ msgid "Enable _Wireless"
 #~ msgstr "Enable _Wireless"
 
@@ -592,30 +2938,15 @@ msgstr "System policy prevents sharing connections via an open Wi-Fi network"
 #~ msgid "Automatic (Default)"
 #~ msgstr "Automatic (Default)"
 
-#~ msgid "AES-CCMP"
-#~ msgstr "AES-CCMP"
-
-#~ msgid "TKIP"
-#~ msgstr "TKIP"
-
 #~ msgid "Dynamic WEP"
 #~ msgstr "Dynamic WEP"
 
-#~ msgid "None"
-#~ msgstr "None"
-
 #~ msgid "WEP 64/128-bit ASCII"
 #~ msgstr "WEP 64/128-bit ASCII"
 
 #~ msgid "WEP 64/128-bit Hex"
 #~ msgstr "WEP 64/128-bit Hex"
 
-#~ msgid "WEP 128-bit Passphrase"
-#~ msgstr "WEP 128-bit Passphrase"
-
-#~ msgid "PEAP"
-#~ msgstr "PEAP"
-
 #~ msgid "TLS"
 #~ msgstr "TLS"
 
@@ -625,9 +2956,6 @@ msgstr "System policy prevents sharing connections via an open Wi-Fi network"
 #~ msgid "WPA2 Enterprise"
 #~ msgstr "WPA2 Enterprise"
 
-#~ msgid "WPA Enterprise"
-#~ msgstr "WPA Enterprise"
-
 #~ msgid "WPA2 Personal"
 #~ msgstr "WPA2 Personal"
 
@@ -661,11 +2989,11 @@ msgstr "System policy prevents sharing connections via an open Wi-Fi network"
 #~ msgstr " (invalid Unicode)"
 
 #~ msgid ""
-#~ "By default, the wireless network's name is set to your computer's name, %"
-#~ "s, with no encryption enabled"
+#~ "By default, the wireless network's name is set to your computer's name, "
+#~ "%s, with no encryption enabled"
 #~ msgstr ""
-#~ "By default, the wireless network's name is set to your computer's name, %"
-#~ "s, with no encryption enabled"
+#~ "By default, the wireless network's name is set to your computer's name, "
+#~ "%s, with no encryption enabled"
 
 #
 #~ msgid "Create new wireless network"
@@ -692,9 +3020,6 @@ msgstr "System policy prevents sharing connections via an open Wi-Fi network"
 #~ msgid "Connect to Other Wireless Network"
 #~ msgstr "Connect to Other Wireless Network"
 
-#~ msgid "Error connecting to wireless network"
-#~ msgstr "Error connecting to wireless network"
-
 #~ msgid ""
 #~ "The requested wireless network requires security capabilities unsupported "
 #~ "by your hardware."
@@ -778,15 +3103,9 @@ msgstr "System policy prevents sharing connections via an open Wi-Fi network"
 #~ msgid "CA Certificate File:"
 #~ msgstr "CA Certificate File:"
 
-#~ msgid "C_onnect"
-#~ msgstr "C_onnect"
-
 #~ msgid "Client Certificate File:"
 #~ msgstr "Client Certificate File:"
 
-#~ msgid "Connection Information"
-#~ msgstr "Connection Information"
-
 #~ msgid "Default Route:"
 #~ msgstr "Default Route:"
 
@@ -903,9 +3222,6 @@ msgstr "System policy prevents sharing connections via an open Wi-Fi network"
 #~ msgid "_Always Trust this Wireless Network"
 #~ msgstr "_Always Trust this Wireless Network"
 
-#~ msgid "_Don't remind me again"
-#~ msgstr "_Don't remind me again"
-
 #~ msgid "_Fallback on this Network"
 #~ msgstr "_Fallback on this Network"
 
@@ -919,9 +3235,6 @@ msgstr "System policy prevents sharing connections via an open Wi-Fi network"
 #~ msgid "_Wireless Security:"
 #~ msgstr "_Wireless Security:"
 
-#~ msgid "Cannot add VPN connection"
-#~ msgstr "Cannot add VPN connection"
-
 #~ msgid ""
 #~ "No suitable VPN software was found on your system. Contact your system "
 #~ "administrator."
@@ -939,9 +3252,6 @@ msgstr "System policy prevents sharing connections via an open Wi-Fi network"
 #~ "Cannot find suitable software for VPN connection type '%s' to import the "
 #~ "file '%s'. Contact your system administrator."
 
-#~ msgid "Error retrieving VPN connection '%s'"
-#~ msgstr "Error retrieving VPN connection '%s'"
-
 #~ msgid ""
 #~ "Could not find the UI files for VPN connection type '%s'. Contact your "
 #~ "system administrator."
@@ -995,36 +3305,24 @@ msgstr "System policy prevents sharing connections via an open Wi-Fi network"
 #~ msgid "Manage Virtual Private Network Connections"
 #~ msgstr "Manage Virtual Private Network Connections"
 
-#~ msgid "VPN Connections"
-#~ msgstr "VPN Connections"
-
 #~ msgid "40-bit WEP"
 #~ msgstr "40-bit WEP"
 
 #~ msgid "104-bit WEP"
 #~ msgstr "104-bit WEP"
 
-#~ msgid "WPA TKIP"
-#~ msgstr "WPA TKIP"
-
 #~ msgid "WPA CCMP"
 #~ msgstr "WPA CCMP"
 
 #~ msgid "WPA Automatic"
 #~ msgstr "WPA Automatic"
 
-#~ msgid "WPA2 TKIP"
-#~ msgstr "WPA2 TKIP"
-
 #~ msgid "WPA2 CCMP"
 #~ msgstr "WPA2 CCMP"
 
 #~ msgid "WPA2 Automatic"
 #~ msgstr "WPA2 Automatic"
 
-#~ msgid "none"
-#~ msgstr "none"
-
 #~ msgid "operation took too long"
 #~ msgstr "operation took too long"
 
@@ -1048,15 +3346,6 @@ msgstr "System policy prevents sharing connections via an open Wi-Fi network"
 #~ msgid "You are now connected to the wired network."
 #~ msgstr "You are now connected to the wired network."
 
-#~ msgid "Connection Established"
-#~ msgstr "Connection Established"
-
-#~ msgid "Disconnected"
-#~ msgstr "Disconnected"
-
-#~ msgid "The network connection has been disconnected."
-#~ msgstr "The network connection has been disconnected."
-
 #~ msgid "LEAP"
 #~ msgstr "LEAP"
 
@@ -1069,9 +3358,3 @@ msgstr "System policy prevents sharing connections via an open Wi-Fi network"
 
 #~ msgid "VPN Error"
 #~ msgstr "VPN Error"
-
-#~ msgid "The VPN service said: \"%s\""
-#~ msgstr "The VPN service said: \"%s\""
-
-#~ msgid "VPN connection '%s' said:"
-#~ msgstr "VPN connection '%s' said:"
diff --git a/po/gl.po b/po/gl.po
index a0bb3fce..f9a9e31d 100644
--- a/po/gl.po
+++ b/po/gl.po
@@ -1,29 +1,30 @@
 # translation of gl.po to Galego
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
-#
 # Ignacio Casal Quinteiro , 2007, 2008.
 # Miguel Anxo Bouzada , 2010.
 # Fran Diéguez , 2011.
 # Fran Dieguez , 2012.
-#
 msgid ""
 msgstr ""
 "Project-Id-Version: gl\n"
-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
-"product=NetworkManager&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2012-03-10 03:25+0000\n"
-"PO-Revision-Date: 2012-03-22 01:48+0100\n"
+"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=Networ"
+"kManager&keywords=I18N+L10N&component=general\n"
+"POT-Creation-Date: 2012-12-01 03:25+0000\n"
+"PO-Revision-Date: 2012-12-15 01:06+0200\n"
 "Last-Translator: Fran Dieguez \n"
-"Language-Team: Galician \n"
+"Language-Team: gnome-l10n-gl@gnome.org\n"
+"Language: gl\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n!=1);\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Virtaal 0.7.1\n"
+"X-Project-Style: gnome\n"
 
 #: ../cli/src/common.c:32 ../cli/src/common.c:44 ../cli/src/common.c:52
-#: ../cli/src/common.c:63 ../cli/src/connections.c:125
-#: ../cli/src/connections.c:159
+#: ../cli/src/common.c:63 ../cli/src/connections.c:133
+#: ../cli/src/connections.c:167
 msgid "GROUP"
 msgstr "GRUPO"
 
@@ -34,7 +35,6 @@ msgstr "ENDEREZO"
 
 #. 1
 #: ../cli/src/common.c:34 ../cli/src/common.c:54
-#| msgid "RATE"
 msgid "ROUTE"
 msgstr "RUTA"
 
@@ -58,18 +58,312 @@ msgstr "WINS"
 msgid "OPTION"
 msgstr "OPCIÓN"
 
+#: ../cli/src/common.c:366
+msgid "unmanaged"
+msgstr "non xestionada"
+
+#: ../cli/src/common.c:368
+msgid "unavailable"
+msgstr "non dispoñíbel"
+
+#: ../cli/src/common.c:370 ../cli/src/network-manager.c:120
+msgid "disconnected"
+msgstr "desconectado"
+
+#: ../cli/src/common.c:372
+msgid "connecting (prepare)"
+msgstr "conectando (preparando)"
+
+#: ../cli/src/common.c:374
+msgid "connecting (configuring)"
+msgstr "conectando (configurando)"
+
+#: ../cli/src/common.c:376
+msgid "connecting (need authentication)"
+msgstr "conectando (precisa autenticación)"
+
+#: ../cli/src/common.c:378
+msgid "connecting (getting IP configuration)"
+msgstr "conectando (obtendo a configuración IP)"
+
+#: ../cli/src/common.c:380
+msgid "connecting (checking IP connectivity)"
+msgstr "conectando (comprobando conectividade IP)"
+
+#: ../cli/src/common.c:382
+msgid "connecting (starting secondary connections)"
+msgstr "conectando (iniciando conexións secundarias)"
+
+#: ../cli/src/common.c:384 ../cli/src/network-manager.c:116
+msgid "connected"
+msgstr "conectado"
+
+#: ../cli/src/common.c:386 ../cli/src/connections.c:658
+msgid "deactivating"
+msgstr "desactivando"
+
+#: ../cli/src/common.c:388
+msgid "connection failed"
+msgstr "produciuse un fallo na conexión"
+
+#: ../cli/src/common.c:390 ../cli/src/connections.c:661
+#: ../cli/src/connections.c:684 ../cli/src/connections.c:1376
+#: ../cli/src/devices.c:650 ../cli/src/network-manager.c:123
+#: ../cli/src/network-manager.c:185 ../cli/src/network-manager.c:188
+#: ../cli/src/network-manager.c:197 ../cli/src/network-manager.c:257
+#: ../cli/src/network-manager.c:273 ../cli/src/network-manager.c:431
+#: ../cli/src/network-manager.c:486 ../cli/src/network-manager.c:524
+#: ../cli/src/network-manager.c:563 ../cli/src/settings.c:629
+#: ../cli/src/settings.c:657 ../cli/src/utils.c:533 ../src/main.c:451
+#: ../src/main.c:470
+msgid "unknown"
+msgstr "descoñecido"
+
+#: ../cli/src/common.c:399
+msgid "No reason given"
+msgstr "Non se dou unha razón"
+
+#: ../cli/src/common.c:402
+msgid "Unknown error"
+msgstr "Erro descoñecido"
+
+#: ../cli/src/common.c:405
+msgid "Device is now managed"
+msgstr "O dispositivo agora está xestionado"
+
+#: ../cli/src/common.c:408
+msgid "Device is now unmanaged"
+msgstr "O dispositivo está agora non xestionado"
+
+#: ../cli/src/common.c:411
+msgid "The device could not be readied for configuration"
+msgstr "O dispositivo non puido lerse para a súa configuración"
+
+#: ../cli/src/common.c:414
+#| msgid ""
+#| "IP configuration could not be reserved (no available address, timeout, "
+#| "etc)"
+msgid ""
+"IP configuration could not be reserved (no available address, timeout, etc.)"
+msgstr ""
+"Non foi posíbel reservar a configuración de IP (enderezo non dispoñíbel, "
+"tempo de espera esgotado, etc)"
+
+#: ../cli/src/common.c:417
+msgid "The IP configuration is no longer valid"
+msgstr "A configuración IP xa non é válida"
+
+#: ../cli/src/common.c:420
+msgid "Secrets were required, but not provided"
+msgstr "Requírense os segredos, pero non se forneceron"
+
+#: ../cli/src/common.c:423
+msgid "802.1X supplicant disconnected"
+msgstr "802.1X supplicant desconectado"
+
+#: ../cli/src/common.c:426
+msgid "802.1X supplicant configuration failed"
+msgstr "Fallou a configuación do 802.1X supplicant"
+
+#: ../cli/src/common.c:429
+msgid "802.1X supplicant failed"
+msgstr "Fallou o 802.1X supplicant"
+
+#: ../cli/src/common.c:432
+msgid "802.1X supplicant took too long to authenticate"
+msgstr "O 802.1X supplicant votou demasiado tempo para autenticarse"
+
+#: ../cli/src/common.c:435
+msgid "PPP service failed to start"
+msgstr "O servizo PPP fallou ao iniciar"
+
+#: ../cli/src/common.c:438
+msgid "PPP service disconnected"
+msgstr "O servizo PPP está desconectado"
+
+#: ../cli/src/common.c:441
+msgid "PPP failed"
+msgstr "PPP fallou"
+
+#: ../cli/src/common.c:444
+msgid "DHCP client failed to start"
+msgstr "O cliente DHCP fallou ao iniciar"
+
+#: ../cli/src/common.c:447
+msgid "DHCP client error"
+msgstr "Erro no cliente DHCP"
+
+#: ../cli/src/common.c:450
+msgid "DHCP client failed"
+msgstr "O cliente DHCP fallou"
+
+#: ../cli/src/common.c:453
+msgid "Shared connection service failed to start"
+msgstr "O servizo de conexión compartida fallou ao iniciar"
+
+#: ../cli/src/common.c:456
+msgid "Shared connection service failed"
+msgstr "O servizo de conexión compartida fallou"
+
+#: ../cli/src/common.c:459
+msgid "AutoIP service failed to start"
+msgstr "O servizo AutoIP fallou ao iniciar"
+
+#: ../cli/src/common.c:462
+msgid "AutoIP service error"
+msgstr "Erro no servizo AutoIP"
+
+#: ../cli/src/common.c:465
+msgid "AutoIP service failed"
+msgstr "O servizo AutoIP fallou"
+
+#: ../cli/src/common.c:468
+msgid "The line is busy"
+msgstr "A liña está ocupada"
+
+#: ../cli/src/common.c:471
+msgid "No dial tone"
+msgstr "Non hai ton de chamada"
+
+#: ../cli/src/common.c:474
+msgid "No carrier could be established"
+msgstr "Non foi posíbel estabelecer o «carrier»"
+
+#: ../cli/src/common.c:477
+msgid "The dialing request timed out"
+msgstr "Tempo de espera superado na solicitude de marcado"
+
+#: ../cli/src/common.c:480
+msgid "The dialing attempt failed"
+msgstr "Fallou o intento de marcado"
+
+#: ../cli/src/common.c:483
+msgid "Modem initialization failed"
+msgstr "Fallou a inicialización do módem"
+
+#: ../cli/src/common.c:486
+msgid "Failed to select the specified APN"
+msgstr "Produciuse un fallo ao seleccionar o APN especificado"
+
+#: ../cli/src/common.c:489
+msgid "Not searching for networks"
+msgstr "Non está buscando por redes"
+
+#: ../cli/src/common.c:492
+msgid "Network registration denied"
+msgstr "Rexistro na rede rexeitado"
+
+#: ../cli/src/common.c:495
+msgid "Network registration timed out"
+msgstr "O rexistro na rede superou o tempo de espera"
+
+#: ../cli/src/common.c:498
+msgid "Failed to register with the requested network"
+msgstr "Produciuse un fallo ao rexistrarse na rede solicitada"
+
+#: ../cli/src/common.c:501
+msgid "PIN check failed"
+msgstr "Produciuse un fallo na comprobación do PIN"
+
+#: ../cli/src/common.c:504
+msgid "Necessary firmware for the device may be missing"
+msgstr "É preciso o firmware que poida que falte para o dispositivo"
+
+#: ../cli/src/common.c:507
+msgid "The device was removed"
+msgstr "O dispositivo eliminouse"
+
+#: ../cli/src/common.c:510
+msgid "NetworkManager went to sleep"
+msgstr "NetworkManager púxose a durmir"
+
+#: ../cli/src/common.c:513
+msgid "The device's active connection disappeared"
+msgstr "A conexión de rede activa do dispositivo desapareceu"
+
+#: ../cli/src/common.c:516
+msgid "Device disconnected by user or client"
+msgstr "Dispositivo desconectado polo usuario ou cliente"
+
+#: ../cli/src/common.c:519
+msgid "Carrier/link changed"
+msgstr "Cambiou o «carrier»/ligazón"
+
+#: ../cli/src/common.c:522
+msgid "The device's existing connection was assumed"
+msgstr "A conexión existente do dispositivo foi asumida"
+
+#: ../cli/src/common.c:525
+msgid "The supplicant is now available"
+msgstr "O «supplicant» está agora activado"
+
+#: ../cli/src/common.c:528
+msgid "The modem could not be found"
+msgstr "Non foi posíbel atopar o módem"
+
+#: ../cli/src/common.c:531
+msgid "The Bluetooth connection failed or timed out"
+msgstr "Fallou a conexión de Bluetooth ou superouse o tempo máximo de espera"
+
+#: ../cli/src/common.c:534
+msgid "GSM Modem's SIM card not inserted"
+msgstr "A tarxeta SIM do módem GSM non está insertada"
+
+#: ../cli/src/common.c:537
+msgid "GSM Modem's SIM PIN required"
+msgstr "Requírese o PIN do SIM do módem GSM"
+
+#: ../cli/src/common.c:540
+msgid "GSM Modem's SIM PUK required"
+msgstr "Requírese o PUK do SIM do módem GSM"
+
+#: ../cli/src/common.c:543
+msgid "GSM Modem's SIM wrong"
+msgstr "SIM do modem GSM incorrecta"
+
+#: ../cli/src/common.c:546
+msgid "InfiniBand device does not support connected mode"
+msgstr "O dispositivo InfiniBand non admite o modo conectado"
+
+#: ../cli/src/common.c:549
+msgid "A dependency of the connection failed"
+msgstr "Fallou unha dependencia da conexión"
+
+#: ../cli/src/common.c:552
+msgid "A problem with the RFC 2684 Ethernet over ADSL bridge"
+msgstr "Produciuse un problema coa Ethernet RFC 2684 sobre bridge ADSL"
+
+#: ../cli/src/common.c:555
+msgid "ModemManager is unavailable"
+msgstr "ModemManager non está dispoñíbel"
+
+#: ../cli/src/common.c:558
+#| msgid "The modem could not be found"
+msgid "The Wi-Fi network could not be found"
+msgstr "Non foi posíbel atopar a rede Wi-Fi"
+
+#: ../cli/src/common.c:561
+#| msgid "A dependency of the connection failed"
+msgid "A secondary connection of the base connection failed"
+msgstr "Fallou a conexión secundaria da conexión base"
+
+#: ../cli/src/common.c:564 ../cli/src/devices.c:296 ../cli/src/devices.c:314
+#: ../cli/src/devices.c:436 ../cli/src/devices.c:480
+msgid "Unknown"
+msgstr "Descoñecido"
+
 #. 0
 #. used only for 'GENERAL' group listing
-#: ../cli/src/connections.c:58 ../cli/src/connections.c:126
-#: ../cli/src/devices.c:102 ../cli/src/devices.c:123 ../cli/src/devices.c:133
-#: ../cli/src/devices.c:143 ../cli/src/devices.c:157 ../cli/src/devices.c:171
-#: ../cli/src/devices.c:193
+#: ../cli/src/connections.c:60 ../cli/src/connections.c:134
+#: ../cli/src/devices.c:108 ../cli/src/devices.c:132 ../cli/src/devices.c:142
+#: ../cli/src/devices.c:152 ../cli/src/devices.c:166 ../cli/src/devices.c:180
+#: ../cli/src/devices.c:202 ../cli/src/devices.c:218 ../cli/src/devices.c:227
 msgid "NAME"
 msgstr "NOME"
 
 #. 0
 #. 1
-#: ../cli/src/connections.c:59 ../cli/src/connections.c:127
+#: ../cli/src/connections.c:61 ../cli/src/connections.c:135
 msgid "UUID"
 msgstr "UUID"
 
@@ -77,28 +371,29 @@ msgstr "UUID"
 #. 0
 #. 1
 #. 2
-#: ../cli/src/connections.c:60 ../cli/src/connections.c:160
-#: ../cli/src/devices.c:68 ../cli/src/devices.c:104 ../cli/src/devices.c:196
+#: ../cli/src/connections.c:62 ../cli/src/connections.c:168
+#: ../cli/src/devices.c:72 ../cli/src/devices.c:110 ../cli/src/devices.c:205
 msgid "TYPE"
 msgstr "TIPO"
 
 #. 2
-#: ../cli/src/connections.c:61
+#: ../cli/src/connections.c:63
 msgid "TIMESTAMP"
 msgstr "MARCADETEMPO"
 
 #. 3
-#: ../cli/src/connections.c:62
+#: ../cli/src/connections.c:64
 msgid "TIMESTAMP-REAL"
 msgstr "TIMESTAMP-REAL"
 
 #. 4
-#: ../cli/src/connections.c:63
+#. 13
+#: ../cli/src/connections.c:65 ../cli/src/devices.c:122
 msgid "AUTOCONNECT"
 msgstr "AUTOCONECTAR"
 
 #. 5
-#: ../cli/src/connections.c:64
+#: ../cli/src/connections.c:66
 msgid "READONLY"
 msgstr "SO-LECTURA"
 
@@ -107,115 +402,111 @@ msgstr "SO-LECTURA"
 #. 2
 #. 11
 #. 5
-#: ../cli/src/connections.c:65 ../cli/src/connections.c:134
-#: ../cli/src/devices.c:70 ../cli/src/devices.c:183 ../cli/src/devices.c:199
+#: ../cli/src/connections.c:67 ../cli/src/connections.c:142
+#: ../cli/src/devices.c:74 ../cli/src/devices.c:192 ../cli/src/devices.c:208
 msgid "DBUS-PATH"
 msgstr "DBUS-RUTA"
 
 #. 2
-#: ../cli/src/connections.c:128
+#: ../cli/src/connections.c:136
 msgid "DEVICES"
 msgstr "DISPOSITIVOS"
 
 #. 3
 #. 1
-#. 6
+#. 8
 #. 1
-#: ../cli/src/connections.c:129 ../cli/src/devices.c:69
-#: ../cli/src/devices.c:109 ../cli/src/network-manager.c:39
+#: ../cli/src/connections.c:137 ../cli/src/devices.c:73
+#: ../cli/src/devices.c:117 ../cli/src/network-manager.c:39
 msgid "STATE"
 msgstr "ESTADO"
 
 #. 4
-#: ../cli/src/connections.c:130
+#: ../cli/src/connections.c:138
 msgid "DEFAULT"
 msgstr "PREDEFINIDO"
 
 #. 5
-#: ../cli/src/connections.c:131
-#| msgid "DEFAULT"
+#: ../cli/src/connections.c:139
 msgid "DEFAULT6"
 msgstr "PREDEFINIDO6"
 
 #. 6
-#: ../cli/src/connections.c:132
+#: ../cli/src/connections.c:140
 msgid "SPEC-OBJECT"
 msgstr "SPEC-OBXECTO"
 
 #. 7
 #. 1
-#: ../cli/src/connections.c:133 ../cli/src/connections.c:147
+#: ../cli/src/connections.c:141 ../cli/src/connections.c:155
 msgid "VPN"
 msgstr "VPN"
 
 #. 9
-#: ../cli/src/connections.c:135
+#: ../cli/src/connections.c:143
 msgid "CON-PATH"
 msgstr "RUTA-CON"
 
 #. 10
-#: ../cli/src/connections.c:136
+#: ../cli/src/connections.c:144
 msgid "ZONE"
 msgstr "ZONA"
 
 #. 11
-#: ../cli/src/connections.c:137
-#| msgid "DBUS-PATH"
+#: ../cli/src/connections.c:145
 msgid "MASTER-PATH"
 msgstr "RUTA-MASTER"
 
-#: ../cli/src/connections.c:145 ../cli/src/devices.c:79
+#: ../cli/src/connections.c:153 ../cli/src/devices.c:83
 msgid "GENERAL"
 msgstr "XERAL"
 
 #. 0
-#: ../cli/src/connections.c:146
-#| msgid "TKIP"
+#: ../cli/src/connections.c:154
 msgid "IP"
 msgstr "IP"
 
 #. 1
-#: ../cli/src/connections.c:161
-#| msgid "NAME"
+#: ../cli/src/connections.c:169
 msgid "USERNAME"
 msgstr "NOME-USUARIO"
 
 #. 2
-#: ../cli/src/connections.c:162
+#: ../cli/src/connections.c:170
 msgid "GATEWAY"
 msgstr "PASARELA"
 
 #. 3
-#: ../cli/src/connections.c:163
+#: ../cli/src/connections.c:171
 msgid "BANNER"
 msgstr "BANNER"
 
 #. 4
-#: ../cli/src/connections.c:164
-#| msgid "STATE"
+#: ../cli/src/connections.c:172
 msgid "VPN-STATE"
 msgstr "ESTADO-VPN"
 
 #. 5
-#: ../cli/src/connections.c:165
+#: ../cli/src/connections.c:173
 msgid "CFG"
 msgstr "CFG"
 
-#: ../cli/src/connections.c:186
+#: ../cli/src/connections.c:195
 #, c-format
 #| msgid ""
 #| "Usage: nmcli con { COMMAND | help }\n"
-#| "  COMMAND := { list | status | up | down }\n"
+#| "  COMMAND := { list | status | up | down | delete }\n"
 #| "\n"
 #| "  list [id  | uuid ]\n"
-#| "  status\n"
-#| "  up id  | uuid  [iface ] [ap ] [nsp ] [--"
+#| "  status [id  | uuid  | path ]\n"
+#| "  up id  | uuid  [iface ] [ap ] [nsp ] [--"
 #| "nowait] [--timeout ]\n"
-#| "  up id  | uuid  [iface ] [ap ] [--nowait] [--"
+#| "  up id  | uuid  [iface ] [ap ] [--nowait] [--"
 #| "timeout ]\n"
 #| "  down id  | uuid \n"
+#| "  delete id  | uuid \n"
 msgid ""
-"Usage: nmcli con { COMMAND | help }\n"
+"Usage: nmcli connection { COMMAND | help }\n"
 "  COMMAND := { list | status | up | down | delete }\n"
 "\n"
 "  list [id  | uuid ]\n"
@@ -226,394 +517,375 @@ msgid ""
 "]\n"
 "  down id  | uuid \n"
 "  delete id  | uuid \n"
+"\n"
 msgstr ""
-"Uso: nmcli con { ORDE | help }\n"
-"  COMMAND := { list | status | up | down | delete }\n"
+"Uso: nmcli connection { ORDE | help }\n"
+"  ORDE := { list | status | up | down | delete }\n"
 "\n"
 "  list [id  | uuid ]\n"
 "  status [id  | uuid  | path ]\n"
-"  up id  | uuid  [iface ] [ap ] [nsp ] [--"
-"nowait] [--timeout ]\n"
+"  up id  | uuid  [iface ] [ap ] [nsp ] "
+"[--nowait] [--timeout ]\n"
 "  up id  | uuid  [iface ] [ap ] [--nowait] [--timeout "
 "]\n"
 "  down id  | uuid \n"
 "  delete id  | uuid \n"
+"\n"
 
-#: ../cli/src/connections.c:240 ../cli/src/connections.c:591
+#: ../cli/src/connections.c:256 ../cli/src/connections.c:634
 #, c-format
 msgid "Error: 'con list': %s"
 msgstr "Erro: 'con list': %s"
 
-#: ../cli/src/connections.c:242 ../cli/src/connections.c:593
+#: ../cli/src/connections.c:258 ../cli/src/connections.c:636
 #, c-format
 msgid "Error: 'con list': %s; allowed fields: %s"
 msgstr "Erro: 'con list': %s; campos permitidos: %s"
 
-#: ../cli/src/connections.c:250
+#: ../cli/src/connections.c:266
 msgid "Connection details"
 msgstr "Detalles da conexión"
 
-#: ../cli/src/connections.c:466
+#: ../cli/src/connections.c:509
 msgid "never"
 msgstr "nunca"
 
 #. "CAPABILITIES"
 #. Print header
 #. "WIFI-PROPERTIES"
-#: ../cli/src/connections.c:467 ../cli/src/connections.c:468
-#: ../cli/src/connections.c:705 ../cli/src/connections.c:706
-#: ../cli/src/connections.c:708 ../cli/src/devices.c:595
-#: ../cli/src/devices.c:648 ../cli/src/devices.c:762 ../cli/src/devices.c:763
-#: ../cli/src/devices.c:795 ../cli/src/devices.c:821 ../cli/src/devices.c:822
-#: ../cli/src/devices.c:823 ../cli/src/devices.c:824 ../cli/src/devices.c:825
-#: ../cli/src/settings.c:656 ../cli/src/settings.c:726
-#: ../cli/src/settings.c:846 ../cli/src/settings.c:1128
-#: ../cli/src/settings.c:1129 ../cli/src/settings.c:1131
-#: ../cli/src/settings.c:1133 ../cli/src/settings.c:1134
-#: ../cli/src/settings.c:1262 ../cli/src/settings.c:1263
-#: ../cli/src/settings.c:1264 ../cli/src/settings.c:1265
-#: ../cli/src/settings.c:1340 ../cli/src/settings.c:1341
-#: ../cli/src/settings.c:1342 ../cli/src/settings.c:1343
-#: ../cli/src/settings.c:1344 ../cli/src/settings.c:1345
-#: ../cli/src/settings.c:1346 ../cli/src/settings.c:1347
-#: ../cli/src/settings.c:1348 ../cli/src/settings.c:1349
-#: ../cli/src/settings.c:1350 ../cli/src/settings.c:1351
-#: ../cli/src/settings.c:1352 ../cli/src/settings.c:1423
+#: ../cli/src/connections.c:510 ../cli/src/connections.c:511
+#: ../cli/src/connections.c:739 ../cli/src/connections.c:740
+#: ../cli/src/connections.c:742 ../cli/src/devices.c:444
+#: ../cli/src/devices.c:497 ../cli/src/devices.c:615 ../cli/src/devices.c:616
+#: ../cli/src/devices.c:617 ../cli/src/devices.c:649 ../cli/src/devices.c:676
+#: ../cli/src/devices.c:677 ../cli/src/devices.c:678 ../cli/src/devices.c:679
+#: ../cli/src/devices.c:680 ../cli/src/network-manager.c:267
+#: ../cli/src/settings.c:748 ../cli/src/settings.c:823
+#: ../cli/src/settings.c:943 ../cli/src/settings.c:1225
+#: ../cli/src/settings.c:1226 ../cli/src/settings.c:1228
+#: ../cli/src/settings.c:1230 ../cli/src/settings.c:1231
+#: ../cli/src/settings.c:1362 ../cli/src/settings.c:1363
+#: ../cli/src/settings.c:1364 ../cli/src/settings.c:1365
+#: ../cli/src/settings.c:1442 ../cli/src/settings.c:1443
+#: ../cli/src/settings.c:1444 ../cli/src/settings.c:1445
+#: ../cli/src/settings.c:1446 ../cli/src/settings.c:1447
+#: ../cli/src/settings.c:1448 ../cli/src/settings.c:1449
+#: ../cli/src/settings.c:1450 ../cli/src/settings.c:1451
+#: ../cli/src/settings.c:1452 ../cli/src/settings.c:1453
+#: ../cli/src/settings.c:1454 ../cli/src/settings.c:1525
+#: ../cli/src/settings.c:1867 ../cli/src/settings.c:1904
 msgid "yes"
 msgstr "si"
 
-#: ../cli/src/connections.c:467 ../cli/src/connections.c:468
-#: ../cli/src/connections.c:705 ../cli/src/connections.c:706
-#: ../cli/src/connections.c:708 ../cli/src/devices.c:595
-#: ../cli/src/devices.c:648 ../cli/src/devices.c:762 ../cli/src/devices.c:763
-#: ../cli/src/devices.c:795 ../cli/src/devices.c:821 ../cli/src/devices.c:822
-#: ../cli/src/devices.c:823 ../cli/src/devices.c:824 ../cli/src/devices.c:825
-#: ../cli/src/settings.c:656 ../cli/src/settings.c:658
-#: ../cli/src/settings.c:726 ../cli/src/settings.c:846
-#: ../cli/src/settings.c:1128 ../cli/src/settings.c:1129
-#: ../cli/src/settings.c:1131 ../cli/src/settings.c:1133
-#: ../cli/src/settings.c:1134 ../cli/src/settings.c:1262
-#: ../cli/src/settings.c:1263 ../cli/src/settings.c:1264
-#: ../cli/src/settings.c:1265 ../cli/src/settings.c:1340
-#: ../cli/src/settings.c:1341 ../cli/src/settings.c:1342
-#: ../cli/src/settings.c:1343 ../cli/src/settings.c:1344
-#: ../cli/src/settings.c:1345 ../cli/src/settings.c:1346
-#: ../cli/src/settings.c:1347 ../cli/src/settings.c:1348
-#: ../cli/src/settings.c:1349 ../cli/src/settings.c:1350
-#: ../cli/src/settings.c:1351 ../cli/src/settings.c:1352
-#: ../cli/src/settings.c:1423
+#: ../cli/src/connections.c:510 ../cli/src/connections.c:511
+#: ../cli/src/connections.c:739 ../cli/src/connections.c:740
+#: ../cli/src/connections.c:742 ../cli/src/devices.c:444
+#: ../cli/src/devices.c:497 ../cli/src/devices.c:615 ../cli/src/devices.c:616
+#: ../cli/src/devices.c:617 ../cli/src/devices.c:649 ../cli/src/devices.c:676
+#: ../cli/src/devices.c:677 ../cli/src/devices.c:678 ../cli/src/devices.c:679
+#: ../cli/src/devices.c:680 ../cli/src/network-manager.c:269
+#: ../cli/src/settings.c:748 ../cli/src/settings.c:750
+#: ../cli/src/settings.c:823 ../cli/src/settings.c:943
+#: ../cli/src/settings.c:1225 ../cli/src/settings.c:1226
+#: ../cli/src/settings.c:1228 ../cli/src/settings.c:1230
+#: ../cli/src/settings.c:1231 ../cli/src/settings.c:1362
+#: ../cli/src/settings.c:1363 ../cli/src/settings.c:1364
+#: ../cli/src/settings.c:1365 ../cli/src/settings.c:1442
+#: ../cli/src/settings.c:1443 ../cli/src/settings.c:1444
+#: ../cli/src/settings.c:1445 ../cli/src/settings.c:1446
+#: ../cli/src/settings.c:1447 ../cli/src/settings.c:1448
+#: ../cli/src/settings.c:1449 ../cli/src/settings.c:1450
+#: ../cli/src/settings.c:1451 ../cli/src/settings.c:1452
+#: ../cli/src/settings.c:1453 ../cli/src/settings.c:1454
+#: ../cli/src/settings.c:1525 ../cli/src/settings.c:1867
+#: ../cli/src/settings.c:1904
 msgid "no"
 msgstr "non"
 
-#: ../cli/src/connections.c:542
+#: ../cli/src/connections.c:585
 msgid "Connection list"
 msgstr "Lista de conexións"
 
-#: ../cli/src/connections.c:555 ../cli/src/connections.c:1088
-#: ../cli/src/connections.c:1914 ../cli/src/connections.c:1929
-#: ../cli/src/connections.c:1938 ../cli/src/connections.c:1948
-#: ../cli/src/connections.c:1960 ../cli/src/connections.c:2059
-#: ../cli/src/connections.c:2161 ../cli/src/devices.c:1202
-#: ../cli/src/devices.c:1212 ../cli/src/devices.c:1326
-#: ../cli/src/devices.c:1334 ../cli/src/devices.c:1547
-#: ../cli/src/devices.c:1554
+#: ../cli/src/connections.c:598 ../cli/src/connections.c:1135
+#: ../cli/src/connections.c:1673 ../cli/src/connections.c:1688
+#: ../cli/src/connections.c:1697 ../cli/src/connections.c:1707
+#: ../cli/src/connections.c:1719 ../cli/src/connections.c:1828
+#: ../cli/src/connections.c:1930 ../cli/src/devices.c:1127
+#: ../cli/src/devices.c:1137 ../cli/src/devices.c:1255
+#: ../cli/src/devices.c:1263 ../cli/src/devices.c:1627
+#: ../cli/src/devices.c:1634 ../cli/src/devices.c:1648
+#: ../cli/src/devices.c:1655 ../cli/src/devices.c:1672
+#: ../cli/src/devices.c:1683 ../cli/src/devices.c:1904
+#: ../cli/src/devices.c:1911
 #, c-format
 msgid "Error: %s argument is missing."
 msgstr "Erro: falta o argumento %s"
 
-#: ../cli/src/connections.c:568
+#: ../cli/src/connections.c:611
 #, c-format
 msgid "Error: %s - no such connection."
 msgstr "Erro: %s - non existe dita conexión."
 
-#: ../cli/src/connections.c:574 ../cli/src/connections.c:1973
-#: ../cli/src/connections.c:2076 ../cli/src/connections.c:2168
-#: ../cli/src/devices.c:999 ../cli/src/devices.c:1079
-#: ../cli/src/devices.c:1226 ../cli/src/devices.c:1340
-#: ../cli/src/devices.c:1560
+#: ../cli/src/connections.c:617 ../cli/src/connections.c:1732
+#: ../cli/src/connections.c:1845 ../cli/src/connections.c:1937
+#: ../cli/src/devices.c:911 ../cli/src/devices.c:991 ../cli/src/devices.c:1151
+#: ../cli/src/devices.c:1269 ../cli/src/devices.c:1696
+#: ../cli/src/devices.c:1917
 #, c-format
 msgid "Unknown parameter: %s\n"
 msgstr "Parámetros descoñecidos: %s\n"
 
-#: ../cli/src/connections.c:583
+#: ../cli/src/connections.c:626
 #, c-format
 msgid "Error: no valid parameter specified."
 msgstr "Erro: non se especificou un parámetro válido"
 
-#: ../cli/src/connections.c:598 ../cli/src/connections.c:2261
-#: ../cli/src/devices.c:1768 ../cli/src/network-manager.c:456
+#: ../cli/src/connections.c:641 ../cli/src/connections.c:2033
+#: ../cli/src/devices.c:2128 ../cli/src/network-manager.c:599
 #, c-format
 msgid "Error: %s."
 msgstr "Erro: %s."
 
-#: ../cli/src/connections.c:611
+#: ../cli/src/connections.c:654
 msgid "activating"
 msgstr "activando"
 
-#: ../cli/src/connections.c:613
+#: ../cli/src/connections.c:656
 msgid "activated"
 msgstr "activada"
 
-#: ../cli/src/connections.c:615 ../cli/src/devices.c:263
-msgid "deactivating"
-msgstr "desactivando"
-
-#: ../cli/src/connections.c:618 ../cli/src/connections.c:641
-#: ../cli/src/connections.c:1785 ../cli/src/devices.c:267
-#: ../cli/src/devices.c:796 ../cli/src/network-manager.c:111
-#: ../cli/src/network-manager.c:173 ../cli/src/network-manager.c:176
-#: ../cli/src/network-manager.c:185 ../cli/src/network-manager.c:291
-#: ../cli/src/network-manager.c:346 ../cli/src/network-manager.c:384
-#: ../cli/src/network-manager.c:423 ../cli/src/settings.c:563
-#: ../cli/src/settings.c:591 ../cli/src/utils.c:499 ../src/main.c:450
-#: ../src/main.c:469
-msgid "unknown"
-msgstr "descoñecido"
-
-#: ../cli/src/connections.c:627
+#: ../cli/src/connections.c:670
 msgid "VPN connecting (prepare)"
 msgstr "Conectándose á VPN (preparando)"
 
-#: ../cli/src/connections.c:629
+#: ../cli/src/connections.c:672
 msgid "VPN connecting (need authentication)"
 msgstr "Conexión VPN (requírese autenticación)"
 
-#: ../cli/src/connections.c:631
+#: ../cli/src/connections.c:674
 msgid "VPN connecting"
 msgstr "Conexión VPN"
 
-#: ../cli/src/connections.c:633
+#: ../cli/src/connections.c:676
 msgid "VPN connecting (getting IP configuration)"
 msgstr "Conectándose á VPN (obtendo a configuración de IP)"
 
-#: ../cli/src/connections.c:635
+#: ../cli/src/connections.c:678
 msgid "VPN connected"
 msgstr "Conectado á VPN"
 
-#: ../cli/src/connections.c:637
+#: ../cli/src/connections.c:680
 msgid "VPN connection failed"
 msgstr "Produciuse un fallo ao conectarse á VPN"
 
-#: ../cli/src/connections.c:639
+#: ../cli/src/connections.c:682
 msgid "VPN disconnected"
 msgstr "Desconectado á VPN"
 
-#: ../cli/src/connections.c:892 ../cli/src/connections.c:1116
+#: ../cli/src/connections.c:735 ../cli/src/connections.c:745
+msgid "N/A"
+msgstr "N/D"
+
+#: ../cli/src/connections.c:939 ../cli/src/connections.c:1163
 #, c-format
 msgid "Error: 'con status': %s"
 msgstr "Erro: «con status»: %s"
 
-#: ../cli/src/connections.c:894 ../cli/src/connections.c:1118
+#: ../cli/src/connections.c:941 ../cli/src/connections.c:1165
 #, c-format
 msgid "Error: 'con status': %s; allowed fields: %s"
 msgstr "Erro: «con status»: %s; campos permitidos: %s"
 
-#: ../cli/src/connections.c:902
-#| msgid "Active connections"
+#: ../cli/src/connections.c:949
 msgid "Active connection details"
 msgstr "Detalles da conexión activa"
 
-#: ../cli/src/connections.c:1038 ../cli/src/connections.c:1988
-#: ../cli/src/connections.c:2091 ../cli/src/connections.c:2182
-#: ../cli/src/devices.c:1026 ../cli/src/devices.c:1088
-#: ../cli/src/devices.c:1241 ../cli/src/devices.c:1370
-#: ../cli/src/devices.c:1589
+#: ../cli/src/connections.c:1085 ../cli/src/connections.c:1747
+#: ../cli/src/connections.c:1860 ../cli/src/connections.c:1951
+#: ../cli/src/devices.c:938 ../cli/src/devices.c:1000
+#: ../cli/src/devices.c:1166 ../cli/src/devices.c:1299
+#: ../cli/src/devices.c:1718 ../cli/src/devices.c:1946
+#: ../cli/src/network-manager.c:311
 #, c-format
 msgid "Error: Can't find out if NetworkManager is running: %s."
 msgstr "Erro: non é posíbel determinar se NetworkManager está a funcionar: %s."
 
-#: ../cli/src/connections.c:1042 ../cli/src/connections.c:1992
-#: ../cli/src/connections.c:2095 ../cli/src/connections.c:2186
-#: ../cli/src/devices.c:1030 ../cli/src/devices.c:1092
-#: ../cli/src/devices.c:1245 ../cli/src/devices.c:1374
-#: ../cli/src/devices.c:1593
+#: ../cli/src/connections.c:1089 ../cli/src/connections.c:1751
+#: ../cli/src/connections.c:1864 ../cli/src/connections.c:1955
+#: ../cli/src/devices.c:942 ../cli/src/devices.c:1004
+#: ../cli/src/devices.c:1170 ../cli/src/devices.c:1303
+#: ../cli/src/devices.c:1722 ../cli/src/devices.c:1950
+#: ../cli/src/network-manager.c:315
 #, c-format
 msgid "Error: NetworkManager is not running."
 msgstr "Erro: NetworkManager non está a funcionar."
 
-#: ../cli/src/connections.c:1074
+#: ../cli/src/connections.c:1121
 msgid "Active connections"
 msgstr "Conexións activas"
 
-#: ../cli/src/connections.c:1099
+#: ../cli/src/connections.c:1146
 #, c-format
-#| msgid "Error: %s - no such connection."
 msgid "Error: '%s' is not an active connection."
 msgstr "Erro: «%s» non é unha conexión activa."
 
-#: ../cli/src/connections.c:1104
+#: ../cli/src/connections.c:1151
 #, c-format
-#| msgid "Unknown parameter: %s\n"
 msgid "Error: unknown parameter: %s"
 msgstr "Erro: parámetro descoñecido: %s"
 
-#: ../cli/src/connections.c:1669
+#: ../cli/src/connections.c:1258
 #, c-format
 msgid "no active connection on device '%s'"
 msgstr "non hai conexións activas no dispositivo «%s»"
 
-#: ../cli/src/connections.c:1677
-#, c-format
+#: ../cli/src/connections.c:1266
 msgid "no active connection or device"
 msgstr "non hai conexións activas ou dispositivo"
 
-#: ../cli/src/connections.c:1748
+#: ../cli/src/connections.c:1337
 #, c-format
 msgid "device '%s' not compatible with connection '%s'"
 msgstr "o dispositivo «%s» non é compatíbel coa conexión «%s»"
 
-#: ../cli/src/connections.c:1750
+#: ../cli/src/connections.c:1340
 #, c-format
 msgid "no device found for connection '%s'"
 msgstr "non foi posíbel encontrar un dispositivo para a conexión «%s»"
 
-#: ../cli/src/connections.c:1761
+#: ../cli/src/connections.c:1352
 msgid "unknown reason"
 msgstr "razón descoñecida"
 
-#: ../cli/src/connections.c:1763
+#: ../cli/src/connections.c:1354
 msgid "none"
 msgstr "ninguna"
 
-#: ../cli/src/connections.c:1765
+#: ../cli/src/connections.c:1356
 msgid "the user was disconnected"
 msgstr "o usuario desconectouse"
 
-#: ../cli/src/connections.c:1767
+#: ../cli/src/connections.c:1358
 msgid "the base network connection was interrupted"
 msgstr "a conexión de rede base foi interrompida"
 
-#: ../cli/src/connections.c:1769
+#: ../cli/src/connections.c:1360
 msgid "the VPN service stopped unexpectedly"
 msgstr "o servizo de VPN deteuse de forma inesperada"
 
-#: ../cli/src/connections.c:1771
+#: ../cli/src/connections.c:1362
 msgid "the VPN service returned invalid configuration"
 msgstr "o servizo de VPN devolveu unha configuración non válida"
 
-#: ../cli/src/connections.c:1773
+#: ../cli/src/connections.c:1364
 msgid "the connection attempt timed out"
 msgstr "o intento de conexión superou o tempo de espera máximo"
 
-#: ../cli/src/connections.c:1775
+#: ../cli/src/connections.c:1366
 msgid "the VPN service did not start in time"
 msgstr "o servizo de VPN non se iniciou a tempo"
 
-#: ../cli/src/connections.c:1777
+#: ../cli/src/connections.c:1368
 msgid "the VPN service failed to start"
 msgstr "o servizo de VPN fallou ao iniciarse"
 
-#: ../cli/src/connections.c:1779
+#: ../cli/src/connections.c:1370
 msgid "no valid VPN secrets"
 msgstr "non hai segredos VPN válidos"
 
-#: ../cli/src/connections.c:1781
+#: ../cli/src/connections.c:1372
 msgid "invalid VPN secrets"
 msgstr "segredos VPN non válidos"
 
-#: ../cli/src/connections.c:1783
+#: ../cli/src/connections.c:1374
 msgid "the connection was removed"
 msgstr "eliminouse a conexión"
 
-#: ../cli/src/connections.c:1797
-#, c-format
-msgid "state: %s\n"
-msgstr "estado: %s\n"
-
-#: ../cli/src/connections.c:1800 ../cli/src/connections.c:1826
+#: ../cli/src/connections.c:1391 ../cli/src/connections.c:1596
 #, c-format
-msgid "Connection activated\n"
-msgstr "Conexión activada\n"
+msgid "Connection successfully activated (D-Bus active path: %s)\n"
+msgstr "Conexión activada con éxito (ruta activa de D-Bus: %s)\n"
 
-#: ../cli/src/connections.c:1803
+#. Active connection failed and dissapeared, quit.
+#: ../cli/src/connections.c:1396 ../cli/src/connections.c:1497
 #, c-format
 msgid "Error: Connection activation failed."
 msgstr "Erro: A activación da conexión fallou."
 
-#: ../cli/src/connections.c:1822
+#: ../cli/src/connections.c:1421
 #, c-format
-msgid "state: %s (%d)\n"
-msgstr "estado: %s (%d)\n"
+msgid "VPN connection successfully activated (D-Bus active path: %s)\n"
+msgstr "Conexión VPN activada con éxito (ruta activa de D-Bus: %s)\n"
 
-#: ../cli/src/connections.c:1832
+#: ../cli/src/connections.c:1429
 #, c-format
 msgid "Error: Connection activation failed: %s."
 msgstr "Erro: A activación da conexión fallou: %s."
 
-#: ../cli/src/connections.c:1849 ../cli/src/devices.c:1148
+#: ../cli/src/connections.c:1526 ../cli/src/devices.c:1060
 #, c-format
 msgid "Error: Timeout %d sec expired."
 msgstr "Erro: Alcanzouse o tempo de espera de %d segundos."
 
-#: ../cli/src/connections.c:1862
+#: ../cli/src/connections.c:1587
 #, c-format
 msgid "Error: Connection activation failed: %s"
 msgstr "Erro: Produciuse un fallo ao activar a conexión: %s"
 
-#: ../cli/src/connections.c:1868
-#, c-format
-msgid "Active connection state: %s\n"
-msgstr "Estado da conexión activa: %s\n"
-
-#: ../cli/src/connections.c:1869
-#, c-format
-msgid "Active connection path: %s\n"
-msgstr "Camiño da conexión activa: %s\n"
-
-#: ../cli/src/connections.c:1922 ../cli/src/connections.c:2067
-#: ../cli/src/connections.c:2195
+#: ../cli/src/connections.c:1681 ../cli/src/connections.c:1836
+#: ../cli/src/connections.c:1964
 #, c-format
 msgid "Error: Unknown connection: %s."
 msgstr "Erro: Conexión descoñecida: %s."
 
-#: ../cli/src/connections.c:1968 ../cli/src/devices.c:1220
+#: ../cli/src/connections.c:1727 ../cli/src/devices.c:1145
+#: ../cli/src/devices.c:1691
 #, c-format
 msgid "Error: timeout value '%s' is not valid."
 msgstr "Erro: O valor do tempo de espera máximo «%s» non é válido."
 
-#: ../cli/src/connections.c:1981 ../cli/src/connections.c:2084
-#: ../cli/src/connections.c:2175
+#: ../cli/src/connections.c:1740 ../cli/src/connections.c:1853
+#: ../cli/src/connections.c:1944
 #, c-format
 msgid "Error: id or uuid has to be specified."
 msgstr "Erro: debe especificar o id ou o uuid."
 
-#: ../cli/src/connections.c:2013
+#: ../cli/src/connections.c:1773
 #, c-format
 msgid "Error: No suitable device found: %s."
 msgstr "Erro: Non se encontrou un dispositivo axeitado: %s."
 
-#: ../cli/src/connections.c:2015
+#: ../cli/src/connections.c:1775
 #, c-format
 msgid "Error: No suitable device found."
 msgstr "Erro: Non se encontrou o dispositivo axeitado."
 
-#: ../cli/src/connections.c:2120
+#: ../cli/src/connections.c:1889
 #, c-format
 msgid "Warning: Connection not active\n"
 msgstr "Aviso: A conexión non está activa.\n"
 
-#: ../cli/src/connections.c:2134
+#: ../cli/src/connections.c:1903
 #, c-format
-#| msgid "Error: Connection activation failed: %s"
 msgid "Error: Connection deletion failed: %s"
 msgstr "Erro: Produciuse un erro na eliminación: %s"
 
-#: ../cli/src/connections.c:2252
+#: ../cli/src/connections.c:2024
 #, c-format
 msgid "Error: 'con' command '%s' is not valid."
 msgstr "Erro: «con» a orde «%s» non é válida"
 
-#: ../cli/src/connections.c:2317
+#: ../cli/src/connections.c:2092
 #, c-format
 msgid "Error: could not connect to D-Bus."
 msgstr "Erro: non é posíbel conectarse a D-Bus."
 
-#: ../cli/src/connections.c:2325
+#: ../cli/src/connections.c:2100
 #, c-format
 msgid "Error: Could not get system settings."
 msgstr "Erro: Non é posíbel obter as opcións do sistema."
 
-#: ../cli/src/connections.c:2335
+#: ../cli/src/connections.c:2110
 #, c-format
 msgid "Error: Can't obtain connections: settings service is not running."
 msgstr ""
@@ -623,756 +895,590 @@ msgstr ""
 #. 0
 #. 9
 #. 3
-#: ../cli/src/devices.c:67 ../cli/src/devices.c:103 ../cli/src/devices.c:181
-#: ../cli/src/devices.c:197
+#: ../cli/src/devices.c:71 ../cli/src/devices.c:109 ../cli/src/devices.c:190
+#: ../cli/src/devices.c:206
 msgid "DEVICE"
 msgstr "DISPOSITIVO"
 
 #. 0
-#: ../cli/src/devices.c:80
+#: ../cli/src/devices.c:84
 msgid "CAPABILITIES"
 msgstr "CAPACIDADES"
 
 #. 1
-#: ../cli/src/devices.c:81
+#: ../cli/src/devices.c:85
 msgid "WIFI-PROPERTIES"
 msgstr "PROPIEDADES-WIFI"
 
 #. 2
-#: ../cli/src/devices.c:82
+#: ../cli/src/devices.c:86
 msgid "AP"
 msgstr "AP"
 
 #. 3
-#: ../cli/src/devices.c:83
+#: ../cli/src/devices.c:87
 msgid "WIRED-PROPERTIES"
 msgstr "PROPIEDADES-CONCABLES"
 
 #. 4
-#: ../cli/src/devices.c:84
+#: ../cli/src/devices.c:88
 msgid "WIMAX-PROPERTIES"
 msgstr "PROPIEDADES-WIMAX"
 
 #. 5
 #. 0
-#: ../cli/src/devices.c:85 ../cli/src/devices.c:194
+#: ../cli/src/devices.c:89 ../cli/src/devices.c:203
 msgid "NSP"
 msgstr "PSR"
 
 #. 6
-#: ../cli/src/devices.c:86
-#| msgid "IP4-DNS"
+#: ../cli/src/devices.c:90
 msgid "IP4"
 msgstr "IP4"
 
 #. 7
-#: ../cli/src/devices.c:87
+#: ../cli/src/devices.c:91
 msgid "DHCP4"
 msgstr "DHCP4"
 
 #. 8
-#: ../cli/src/devices.c:88
-#| msgid "IP6-DNS"
+#: ../cli/src/devices.c:92
 msgid "IP6"
 msgstr "IP6"
 
 #. 9
-#: ../cli/src/devices.c:89
+#: ../cli/src/devices.c:93
 msgid "DHCP6"
 msgstr "DHCP6"
 
+#. 10
+#: ../cli/src/devices.c:94
+msgid "BOND"
+msgstr "BOND"
+
+#. 11
+#: ../cli/src/devices.c:95
+msgid "VLAN"
+msgstr "VLAN"
+
 #. 2
-#: ../cli/src/devices.c:105
+#: ../cli/src/devices.c:111
 msgid "VENDOR"
 msgstr "FABRICANTE"
 
 #. 3
-#: ../cli/src/devices.c:106
+#: ../cli/src/devices.c:112
 msgid "PRODUCT"
 msgstr "PRODUTO"
 
 #. 4
-#: ../cli/src/devices.c:107
+#: ../cli/src/devices.c:113
 msgid "DRIVER"
 msgstr "CONTROLADOR"
 
 #. 5
-#: ../cli/src/devices.c:108
+#: ../cli/src/devices.c:114
+#| msgid "VERSION"
+msgid "DRIVER-VERSION"
+msgstr "VERSIÓN-DO-DRIVER"
+
+#. 6
+#: ../cli/src/devices.c:115
+#| msgid "FIRMWARE-MISSING"
+msgid "FIRMWARE-VERSION"
+msgstr "VERSIÓN-DO-FIRMWARE"
+
+#. 7
+#: ../cli/src/devices.c:116
 msgid "HWADDR"
 msgstr "ENDEREZO-HARDWARE"
 
-#. 7
-#: ../cli/src/devices.c:110
-#| msgid "READONLY"
+#. 9
+#: ../cli/src/devices.c:118
 msgid "REASON"
 msgstr "SO-LECTURARAZÓN"
 
-#. 8
-#: ../cli/src/devices.c:111
+#. 10
+#: ../cli/src/devices.c:119
 msgid "UDI"
 msgstr "UDI"
 
-#. 9
-#: ../cli/src/devices.c:112
+#. 11
+#: ../cli/src/devices.c:120
 msgid "IP-IFACE"
 msgstr "IP-IFACE"
 
-#. 10
-#: ../cli/src/devices.c:113
+#. 12
+#: ../cli/src/devices.c:121
 msgid "NM-MANAGED"
 msgstr "NM-MANAGED"
 
-#. 11
-#: ../cli/src/devices.c:114
+#. 14
+#: ../cli/src/devices.c:123
 msgid "FIRMWARE-MISSING"
 msgstr "FALTA-FIRMWARE"
 
-#. 12
-#: ../cli/src/devices.c:115
-#| msgid "AUTOCONNECT"
+#. 15
+#: ../cli/src/devices.c:124
 msgid "CONNECTION"
 msgstr "CONEXIÓN"
 
 #. 0
-#: ../cli/src/devices.c:124
+#: ../cli/src/devices.c:133
 msgid "CARRIER-DETECT"
 msgstr "DETECTAR-CARRIERV"
 
 #. 1
-#: ../cli/src/devices.c:125
+#: ../cli/src/devices.c:134
 msgid "SPEED"
 msgstr "VELOCIDADE"
 
-#. 0
-#: ../cli/src/devices.c:134
-msgid "CARRIER"
-msgstr "CARRIER"
-
-#. 0
-#: ../cli/src/devices.c:144
-msgid "WEP"
-msgstr "WEP"
-
-#. 1
-#: ../cli/src/devices.c:145
-msgid "WPA"
-msgstr "WPA"
-
-#. 2
-#: ../cli/src/devices.c:146
-msgid "WPA2"
-msgstr "WPA2"
-
-#. 3
-#: ../cli/src/devices.c:147
-msgid "TKIP"
-msgstr "TKIP"
-
-#. 4
-#: ../cli/src/devices.c:148
-msgid "CCMP"
-msgstr "CCMP"
-
-#. 0
-#: ../cli/src/devices.c:158
-msgid "CTR-FREQ"
-msgstr "CTR-FREC"
-
-#. 1
-#: ../cli/src/devices.c:159
-msgid "RSSI"
-msgstr "RSSI"
-
-#. 2
-#: ../cli/src/devices.c:160
-msgid "CINR"
-msgstr "CINR"
-
-#. 3
-#: ../cli/src/devices.c:161
-msgid "TX-POW"
-msgstr "TX-POW"
-
-#. 4
-#: ../cli/src/devices.c:162
-msgid "BSID"
-msgstr "BSID"
-
-#. 0
-#: ../cli/src/devices.c:172
-msgid "SSID"
-msgstr "SSID"
-
-#. 1
-#: ../cli/src/devices.c:173
-msgid "BSSID"
-msgstr "BSSID"
-
-#. 2
-#: ../cli/src/devices.c:174
-msgid "MODE"
-msgstr "MODO"
-
-#. 3
-#: ../cli/src/devices.c:175
-msgid "FREQ"
-msgstr "FREQ"
-
-#. 4
-#: ../cli/src/devices.c:176
-msgid "RATE"
-msgstr "TAXA"
-
-#. 5
-#. 1
-#: ../cli/src/devices.c:177 ../cli/src/devices.c:195
-msgid "SIGNAL"
-msgstr "SINAL"
-
-#. 6
-#: ../cli/src/devices.c:178
-msgid "SECURITY"
-msgstr "SEGURIDADE"
-
-#. 7
-#: ../cli/src/devices.c:179
-msgid "WPA-FLAGS"
-msgstr "OPCIONS-WPA"
-
-#. 8
-#: ../cli/src/devices.c:180
-msgid "RSN-FLAGS"
-msgstr "OPCIONS-RSN"
-
-#. 10
-#. 4
-#: ../cli/src/devices.c:182 ../cli/src/devices.c:198
-msgid "ACTIVE"
-msgstr "ACTIVA"
-
-#: ../cli/src/devices.c:215
-#, 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 ]\n"
-#| "  disconnect iface  [--nowait] [--timeout ]\n"
-#| "  wifi [list [iface ] [hwaddr ]]\n"
-#| "  wimax [list [iface ] [nsp ]]\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 ]\n"
-"  disconnect iface  [--nowait] [--timeout ]\n"
-"  wifi [list [iface ] [bssid ]]\n"
-"  wimax [list [iface ] [nsp ]]\n"
-"\n"
-msgstr ""
-"Uso: nmcli dev { ORDE | help }\n"
-"\n"
-"  ORDE := { status | list | disconnect | wifi | wimax }\n"
-"\n"
-"  ORDE := { status | list | disconnect | wifi }\n"
-"\n"
-"  status\n"
-"  list [iface ]\n"
-"  disconnect iface  [--nowait] [--timeout ]\n"
-"  wifi [list [iface ] [bssid ]]\n"
-"  wimax [list [iface ] [nsp ]]\n"
-"\n"
-
-#: ../cli/src/devices.c:243
-msgid "unmanaged"
-msgstr "non xestionada"
-
-#: ../cli/src/devices.c:245
-msgid "unavailable"
-msgstr "non dispoñíbel"
-
-#: ../cli/src/devices.c:247 ../cli/src/network-manager.c:108
-msgid "disconnected"
-msgstr "desconectado"
-
-#: ../cli/src/devices.c:249
-msgid "connecting (prepare)"
-msgstr "conectando (preparando)"
-
-#: ../cli/src/devices.c:251
-msgid "connecting (configuring)"
-msgstr "conectando (configurando)"
-
-#: ../cli/src/devices.c:253
-msgid "connecting (need authentication)"
-msgstr "conectando (precisa autenticación)"
-
-#: ../cli/src/devices.c:255
-msgid "connecting (getting IP configuration)"
-msgstr "conectando (obtendo a configuración IP)"
-
-#: ../cli/src/devices.c:257
-msgid "connecting (checking IP connectivity)"
-msgstr "conectando (comprobando conectividade IP)"
-
-#: ../cli/src/devices.c:259
-msgid "connecting (starting secondary connections)"
-msgstr "conectando (iniciando conexións secundarias)"
-
-#: ../cli/src/devices.c:261 ../cli/src/network-manager.c:104
-msgid "connected"
-msgstr "conectado"
-
-#: ../cli/src/devices.c:265
-msgid "connection failed"
-msgstr "produciuse un fallo na conexión"
-
-#: ../cli/src/devices.c:276
-msgid "No reason given"
-msgstr "Non se dou unha razón"
-
-#: ../cli/src/devices.c:279
-#| msgid "Unknown"
-msgid "Unknown error"
-msgstr "Erro descoñecido"
-
-#: ../cli/src/devices.c:282
-msgid "Device is now managed"
-msgstr "O dispositivo agora está xestionado"
-
-#: ../cli/src/devices.c:285
-msgid "Device is now unmanaged"
-msgstr "O dispositivo está agora non xestionado"
-
-#: ../cli/src/devices.c:288
-#| msgid "the VPN service returned invalid configuration"
-msgid "The device could not be readied for configuration"
-msgstr "O dispositivo non puido lerse para a súa configuración"
-
-#: ../cli/src/devices.c:291
-msgid ""
-"IP configuration could not be reserved (no available address, timeout, etc)"
-msgstr ""
-"Non foi posíbel reservar a configuración de IP (enderezo non dispoñíbel, "
-"tempo de espera, etc)"
-
-#: ../cli/src/devices.c:294
-msgid "The IP configuration is no longer valid"
-msgstr "A configuración IP xa non é válida"
-
-#: ../cli/src/devices.c:297
-msgid "Secrets were required, but not provided"
-msgstr "Requírense os segredos, pero non se forneceron"
-
-#: ../cli/src/devices.c:300
-msgid "802.1X supplicant disconnected"
-msgstr "802.1X supplicant desconectado"
-
-#: ../cli/src/devices.c:303
-msgid "802.1X supplicant configuration failed"
-msgstr "Fallou a configuación do 802.1X supplicant"
-
-#: ../cli/src/devices.c:306
-msgid "802.1X supplicant failed"
-msgstr "Fallou o 802.1X supplicant"
-
-#: ../cli/src/devices.c:309
-msgid "802.1X supplicant took too long to authenticate"
-msgstr "O 802.1X supplicant votou demasiado tempo para autenticarse"
-
-#: ../cli/src/devices.c:312
-#| msgid "the VPN service failed to start"
-msgid "PPP service failed to start"
-msgstr "O servizo PPP fallou ao iniciar"
-
-#: ../cli/src/devices.c:315
-#| msgid "VPN disconnected"
-msgid "PPP service disconnected"
-msgstr "O servizo PPP está desconectado"
-
-#: ../cli/src/devices.c:318
-msgid "PPP failed"
-msgstr "PPP fallou"
-
-#: ../cli/src/devices.c:321
-#| msgid "the VPN service failed to start"
-msgid "DHCP client failed to start"
-msgstr "O cliente DHCP fallou ao iniciar"
-
-#: ../cli/src/devices.c:324
-msgid "DHCP client error"
-msgstr "Erro no cliente DHCP"
-
-#: ../cli/src/devices.c:327
-#| msgid "VPN connection failed"
-msgid "DHCP client failed"
-msgstr "O cliente DHCP fallou"
-
-#: ../cli/src/devices.c:330
-#| msgid "the VPN service failed to start"
-msgid "Shared connection service failed to start"
-msgstr "O servizo de conexión compartida fallou ao iniciar"
-
-#: ../cli/src/devices.c:333
-#| msgid "connection failed"
-msgid "Shared connection service failed"
-msgstr "O servizo de conexión compartida fallou"
-
-#: ../cli/src/devices.c:336
-#| msgid "the VPN service failed to start"
-msgid "AutoIP service failed to start"
-msgstr "O servizo AutoIP fallou ao iniciar"
-
-#: ../cli/src/devices.c:339
-msgid "AutoIP service error"
-msgstr "Erro no servizo AutoIP"
-
-#: ../cli/src/devices.c:342
-#| msgid "the VPN service failed to start"
-msgid "AutoIP service failed"
-msgstr "O servizo AutoIP fallou"
-
-#: ../cli/src/devices.c:345
-msgid "The line is busy"
-msgstr "A liña está ocupada"
-
-#: ../cli/src/devices.c:348
-msgid "No dial tone"
-msgstr "Non hai ton de chamada"
-
-#: ../cli/src/devices.c:351
-msgid "No carrier could be established"
-msgstr "Non foi posíbel estabelecer o «carrier»"
-
-#: ../cli/src/devices.c:354
-msgid "The dialing request timed out"
-msgstr "Tempo de espera superado na solicitude de marcado"
-
-#: ../cli/src/devices.c:357
-msgid "The dialing attempt failed"
-msgstr "Fallou o intento de marcado"
-
-#: ../cli/src/devices.c:360
-#| msgid "Error: Connection activation failed."
-msgid "Modem initialization failed"
-msgstr "Fallou a inicialización do módem"
-
-#: ../cli/src/devices.c:363
-#| msgid "Failed to decrypt the private key."
-msgid "Failed to select the specified APN"
-msgstr "Produciuse un fallo ao seleccionar o APN especificado"
+#. 0
+#: ../cli/src/devices.c:143
+msgid "CARRIER"
+msgstr "CARRIER"
 
-#: ../cli/src/devices.c:366
-msgid "Not searching for networks"
-msgstr "Non está buscando por redes"
+#. 0
+#: ../cli/src/devices.c:153
+msgid "WEP"
+msgstr "WEP"
 
-#: ../cli/src/devices.c:369
-#| msgid "Networking enabled"
-msgid "Network registration denied"
-msgstr "Rexistro na rede rexeitado"
+#. 1
+#: ../cli/src/devices.c:154
+msgid "WPA"
+msgstr "WPA"
 
-#: ../cli/src/devices.c:372
-msgid "Network registration timed out"
-msgstr "O rexistro na rede superou o tempo de espera"
+#. 2
+#: ../cli/src/devices.c:155
+msgid "WPA2"
+msgstr "WPA2"
 
-#: ../cli/src/devices.c:375
-msgid "Failed to register with the requested network"
-msgstr "Produciuse un fallo ao rexistrarse na rede solicitada"
+#. 3
+#: ../cli/src/devices.c:156
+msgid "TKIP"
+msgstr "TKIP"
 
-#: ../cli/src/devices.c:378
-#| msgid "VPN connection failed"
-msgid "PIN check failed"
-msgstr "Produciuse un fallo na comprobación do PIN"
+#. 4
+#: ../cli/src/devices.c:157
+msgid "CCMP"
+msgstr "CCMP"
 
-#: ../cli/src/devices.c:381
-msgid "Necessary firmware for the device may be missing"
-msgstr "É preciso o firmware que poida que falte para o dispositivo"
+#. 0
+#: ../cli/src/devices.c:167
+msgid "CTR-FREQ"
+msgstr "CTR-FREC"
 
-#: ../cli/src/devices.c:384
-#| msgid "the connection was removed"
-msgid "The device was removed"
-msgstr "O dispositivo eliminouse"
+#. 1
+#: ../cli/src/devices.c:168
+msgid "RSSI"
+msgstr "RSSI"
 
-#: ../cli/src/devices.c:387
-#| msgid "NetworkManager status"
-msgid "NetworkManager went to sleep"
-msgstr "NetworkManager púxose a durmir"
+#. 2
+#: ../cli/src/devices.c:169
+msgid "CINR"
+msgstr "CINR"
 
-#: ../cli/src/devices.c:390
-#| msgid "no active connection or device"
-msgid "The device's active connection disappeared"
-msgstr "A conexión de rede activa do dispositivo desapareceu"
+#. 3
+#: ../cli/src/devices.c:170
+msgid "TX-POW"
+msgstr "TX-POW"
 
-#: ../cli/src/devices.c:393
-msgid "Device disconnected by user or client"
-msgstr "Dispositivo desconectado polo usuario ou cliente"
+#. 4
+#: ../cli/src/devices.c:171
+msgid "BSID"
+msgstr "BSID"
 
-#: ../cli/src/devices.c:396
-msgid "Carrier/link changed"
-msgstr "Cambiou o «carrier»/ligazón"
+#. 0
+#: ../cli/src/devices.c:181
+msgid "SSID"
+msgstr "SSID"
 
-#: ../cli/src/devices.c:399
-#| msgid "the connection was removed"
-msgid "The device's existing connection was assumed"
-msgstr "A conexión existente do dispositivo foi asumida"
+#. 1
+#: ../cli/src/devices.c:182
+msgid "BSSID"
+msgstr "BSSID"
 
-#: ../cli/src/devices.c:402
-msgid "The supplicant is now available"
-msgstr "O «supplicant» está agora activado"
+#. 2
+#: ../cli/src/devices.c:183
+msgid "MODE"
+msgstr "MODO"
 
-#: ../cli/src/devices.c:405
-#| msgid "'dhcpcd' could be found."
-msgid "The modem could not be found"
-msgstr "Non foi posíbel atopar o módem"
+#. 3
+#: ../cli/src/devices.c:184
+msgid "FREQ"
+msgstr "FREQ"
 
-#: ../cli/src/devices.c:408
-#| msgid "the connection attempt timed out"
-msgid "The Bluetooth connection failed or timed out"
-msgstr "Fallou a conexión de Bluetooth ou superouse o tempo máximo de espera"
+#. 4
+#: ../cli/src/devices.c:185
+msgid "RATE"
+msgstr "TAXA"
 
-#: ../cli/src/devices.c:411
-msgid "GSM Modem's SIM card not inserted"
-msgstr "A tarxeta SIM do módem GSM non está insertada"
+#. 5
+#. 1
+#: ../cli/src/devices.c:186 ../cli/src/devices.c:204
+msgid "SIGNAL"
+msgstr "SINAL"
 
-#: ../cli/src/devices.c:414
-msgid "GSM Modem's SIM PIN required"
-msgstr "Requírese o PIN do SIM do módem GSM"
+#. 6
+#: ../cli/src/devices.c:187
+msgid "SECURITY"
+msgstr "SEGURIDADE"
 
-#: ../cli/src/devices.c:417
-msgid "GSM Modem's SIM PUK required"
-msgstr "Requírese o PUK do SIM do módem GSM"
+#. 7
+#: ../cli/src/devices.c:188
+msgid "WPA-FLAGS"
+msgstr "OPCIONS-WPA"
 
-#: ../cli/src/devices.c:420
-msgid "GSM Modem's SIM wrong"
-msgstr "SIM do modem GSM incorrecta"
+#. 8
+#: ../cli/src/devices.c:189
+msgid "RSN-FLAGS"
+msgstr "OPCIONS-RSN"
 
-#: ../cli/src/devices.c:423
-msgid "InfiniBand device does not support connected mode"
-msgstr "O dispositivo InfiniBand non admite o modo conectado"
+#. 10
+#. 4
+#: ../cli/src/devices.c:191 ../cli/src/devices.c:207
+msgid "ACTIVE"
+msgstr "ACTIVA"
 
-#: ../cli/src/devices.c:426
-#| msgid "connection failed"
-msgid "A dependency of the connection failed"
-msgstr "Fallou unha dependencia da conexión"
+#. 0
+#: ../cli/src/devices.c:219
+msgid "SLAVES"
+msgstr "ESCLAVOS"
 
-#: ../cli/src/devices.c:428 ../cli/src/devices.c:451 ../cli/src/devices.c:467
-#: ../cli/src/devices.c:587 ../cli/src/devices.c:631
-msgid "Unknown"
-msgstr "Descoñecido"
+#. 0
+#: ../cli/src/devices.c:228
+#| msgid "UUID"
+msgid "ID"
+msgstr "UUID"
+
+#: ../cli/src/devices.c:244
+#, 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 ]\n"
+#| "  disconnect iface  [--nowait] [--timeout ]\n"
+#| "  wifi [list [iface ] [bssid ]]\n"
+#| "  wimax [list [iface ] [nsp ]]\n"
+#| "\n"
+msgid ""
+"Usage: nmcli device { COMMAND | help }\n"
+"\n"
+"  COMMAND := { status | list | disconnect | wifi | wimax }\n"
+"\n"
+"  COMMAND := { status | list | disconnect | wifi }\n"
+"\n"
+"  status\n"
+"  list [iface ]\n"
+"  disconnect iface  [--nowait] [--timeout ]\n"
+"  wifi [list [iface ] [bssid ]]\n"
+"  wifi connect <(B)SSID> [password ] [wep-key-type key|phrase] "
+"[iface ] [bssid ] [name ]\n"
+"               [--private] [--nowait] [--timeout ]\n"
+"  wimax [list [iface ] [nsp ]]\n"
+"\n"
+msgstr ""
+"Uso: nmcli device { ORDE | help }\n"
+"\n"
+"  ORDE := { status | list | disconnect | wifi | wimax }\n"
+"\n"
+"  ORDE := { status | list | disconnect | wifi }\n"
+"\n"
+"  status\n"
+"  list [iface ]\n"
+"  disconnect iface  [--nowait] [--timeout ]\n"
+"  wifi [list [iface ] [bssid ]]\n"
+"  wifi connect <(B)SSID> [password ] [wep-key-type chave|frase] "
+"[iface ] [bssid ] [name ]\n"
+"               [--private] [--nowait] [--timeout ]\n"
+"  wimax [list [iface ] [nsp ]]\n"
+"\n"
 
-#: ../cli/src/devices.c:500
+#: ../cli/src/devices.c:347
 msgid "(none)"
 msgstr "(ningún)"
 
-#: ../cli/src/devices.c:556
+#: ../cli/src/devices.c:403
 #, c-format
 msgid "%u MHz"
 msgstr "%u MHz"
 
-#: ../cli/src/devices.c:557
+#: ../cli/src/devices.c:404
 #, c-format
 msgid "%u MB/s"
 msgstr "%u MB/s"
 
-#: ../cli/src/devices.c:566
+#: ../cli/src/devices.c:413
 msgid "Encrypted: "
 msgstr "Cifrado: "
 
-#: ../cli/src/devices.c:571
+#: ../cli/src/devices.c:418
 msgid "WEP "
 msgstr "WEP "
 
-#: ../cli/src/devices.c:573
+#: ../cli/src/devices.c:420
 msgid "WPA "
 msgstr "WPA "
 
-#: ../cli/src/devices.c:575
+#: ../cli/src/devices.c:422
 msgid "WPA2 "
 msgstr "WPA2 "
 
-#: ../cli/src/devices.c:578
+#: ../cli/src/devices.c:425
 msgid "Enterprise "
 msgstr "Empresa "
 
-#: ../cli/src/devices.c:587
+#: ../cli/src/devices.c:434
 msgid "Ad-Hoc"
 msgstr "Ad-Hoc"
 
-#: ../cli/src/devices.c:587
+#: ../cli/src/devices.c:435
 msgid "Infrastructure"
 msgstr "Infraestrutura"
 
-#: ../cli/src/devices.c:622
+#: ../cli/src/devices.c:471
 msgid "Home"
 msgstr "Casa"
 
-#: ../cli/src/devices.c:625
+#: ../cli/src/devices.c:474
 msgid "Partner"
 msgstr "Asociado"
 
-#: ../cli/src/devices.c:628
+#: ../cli/src/devices.c:477
 msgid "Roaming"
 msgstr "Roaming"
 
-#: ../cli/src/devices.c:700
+#: ../cli/src/devices.c:549
 #, c-format
 msgid "Error: 'dev list': %s"
 msgstr "Erro: «dev list»: %s"
 
-#: ../cli/src/devices.c:702
+#: ../cli/src/devices.c:551
 #, c-format
 msgid "Error: 'dev list': %s; allowed fields: %s"
 msgstr "Erro: «dev list»: %s campos permitidos: %s"
 
-#: ../cli/src/devices.c:711
+#: ../cli/src/devices.c:560
 msgid "Device details"
 msgstr "Detalles do dispositivo"
 
-#: ../cli/src/devices.c:756 ../cli/src/devices.c:757 ../cli/src/devices.c:1164
-#: ../cli/src/utils.c:445
+#: ../cli/src/devices.c:607 ../cli/src/devices.c:610 ../cli/src/devices.c:1086
+#: ../cli/src/utils.c:479
 msgid "(unknown)"
 msgstr "(descoñecido)"
 
-#: ../cli/src/devices.c:765
-#| msgid "connected"
+#: ../cli/src/devices.c:619
 msgid "not connected"
 msgstr "non conectado"
 
-#: ../cli/src/devices.c:792
+#: ../cli/src/devices.c:646
 #, c-format
 msgid "%u Mb/s"
 msgstr "%u Mb/s"
 
 #. Print header
 #. "WIRED-PROPERTIES"
-#: ../cli/src/devices.c:865
+#: ../cli/src/devices.c:720
 msgid "on"
 msgstr "activado"
 
-#: ../cli/src/devices.c:865
+#: ../cli/src/devices.c:720
 msgid "off"
 msgstr "desactivado"
 
-#: ../cli/src/devices.c:1016
+#: ../cli/src/devices.c:928
 #, c-format
 msgid "Error: 'dev status': %s"
 msgstr "Erro: «dev status»: %s"
 
-#: ../cli/src/devices.c:1018
+#: ../cli/src/devices.c:930
 #, c-format
 msgid "Error: 'dev status': %s; allowed fields: %s"
 msgstr "Erro: «dev status»: %s campos permitidos: %s"
 
-#: ../cli/src/devices.c:1041
+#: ../cli/src/devices.c:953
 msgid "Status of devices"
 msgstr "Estado dos dispositivos"
 
-#: ../cli/src/devices.c:1072
+#: ../cli/src/devices.c:984
 #, c-format
 msgid "Error: '%s' argument is missing."
 msgstr "Erro: falta o argumento «%s»."
 
-#: ../cli/src/devices.c:1113 ../cli/src/devices.c:1265
-#: ../cli/src/devices.c:1402 ../cli/src/devices.c:1621
+#: ../cli/src/devices.c:1025 ../cli/src/devices.c:1190
+#: ../cli/src/devices.c:1331 ../cli/src/devices.c:1978
 #, c-format
 msgid "Error: Device '%s' not found."
 msgstr "Erro: Non é posíbel encontrar o dispositivo %s."
 
-#: ../cli/src/devices.c:1136
+#: ../cli/src/devices.c:1048
 #, c-format
 msgid "Success: Device '%s' successfully disconnected."
 msgstr "Éxito: O dispositivo «%s» desconectouse correctamente."
 
-#: ../cli/src/devices.c:1161
+#: ../cli/src/devices.c:1083
 #, c-format
 msgid "Error: Device '%s' (%s) disconnecting failed: %s"
 msgstr "Erro: Fallou a desconexión do dispositivo «%s» (%s): %s"
 
-#: ../cli/src/devices.c:1169
+#: ../cli/src/devices.c:1096
 #, c-format
-msgid "Device state: %d (%s)\n"
-msgstr "Estado do dispositivo: %d (%s)\n"
+#| msgid "Success: Device '%s' successfully disconnected."
+msgid "Device '%s' has been disconnected.\n"
+msgstr "Dispositivo «%s» desconectouse.\n"
 
-#: ../cli/src/devices.c:1234
+#: ../cli/src/devices.c:1159
 #, c-format
 msgid "Error: iface has to be specified."
 msgstr "Erro: non se especificou a interface."
 
-#: ../cli/src/devices.c:1360
+#: ../cli/src/devices.c:1289
 #, c-format
 msgid "Error: 'dev wifi': %s"
 msgstr "Erro: «dev wifi»: %s"
 
-#: ../cli/src/devices.c:1362
+#: ../cli/src/devices.c:1291
 #, c-format
 msgid "Error: 'dev wifi': %s; allowed fields: %s"
 msgstr "Erro: «dev wiki»: %s; campos permitidos: %s"
 
-#: ../cli/src/devices.c:1385
+#: ../cli/src/devices.c:1314
 msgid "WiFi scan list"
 msgstr "Lista de escaneo WiFi"
 
-#: ../cli/src/devices.c:1422 ../cli/src/devices.c:1476
+#: ../cli/src/devices.c:1351 ../cli/src/devices.c:1405
 #, c-format
-#| msgid "Error: Access point with hwaddr '%s' not found."
 msgid "Error: Access point with bssid '%s' not found."
 msgstr "Erro: non foi posíbel atopar o punto de acceso con bssid «%s»."
 
-#: ../cli/src/devices.c:1439
+#: ../cli/src/devices.c:1368
 #, c-format
 msgid "Error: Device '%s' is not a WiFi device."
 msgstr "Erro: O dispositivo «%s» non é un dispositivo WiFi."
 
-#: ../cli/src/devices.c:1503
+#: ../cli/src/devices.c:1436 ../cli/src/devices.c:1482
+#, c-format
+msgid "Connection with UUID '%s' created and activated on device '%s'\n"
+msgstr "Conexión co UUID «%s» creada e activa no dispositivo «%s»\n"
+
+#: ../cli/src/devices.c:1441
+#, c-format
+#| msgid "Error: Connection activation failed: %s."
+msgid "Error: Connection activation failed: (%d) %s."
+msgstr "Erro: A activación da conexión fallou: (%d) %s."
+
+#: ../cli/src/devices.c:1466
+#, c-format
+#| msgid "Failed to read configuration: (%d) %s\n"
+msgid "Error: Failed to add/activate new connection: (%d) %s"
+msgstr "Erro: Produciuse un fallo ao engadir/activar a nova conexión: (%d) %s"
+
+#: ../cli/src/devices.c:1474
+#, c-format
+msgid "Error: Failed to add/activate new connection: Unknown error"
+msgstr ""
+"Erro: Produciuse un fallo ao engadir/activar a nova conexión: Erro "
+"descoñecido"
+
+#: ../cli/src/devices.c:1618
+#, c-format
+#| msgid "Error: %s argument is missing."
+msgid "Error: SSID or BSSID are missing."
+msgstr "Erro: falta o SSID ou o BSSID"
+
+#: ../cli/src/devices.c:1641
+#, c-format
+#| msgid "Error: timeout value '%s' is not valid."
+msgid "Error: bssid argument value '%s' is not a valid BSSID."
+msgstr "Erro: O valor do argumento bssid «%s» non é un BSSID válido."
+
+#: ../cli/src/devices.c:1665
+#, c-format
+msgid ""
+"Error: wep-key-type argument value '%s' is invalid, use 'key' or 'phrase'."
+msgstr ""
+"Erro: o valor do argumento wep-key-type «%s» non é válido, use «key» ou "
+"«phrase»"
+
+#: ../cli/src/devices.c:1705
+#, c-format
+msgid "Error: BSSID to connect to (%s) differs from bssid argument (%s)."
+msgstr "Erro: BSSID ao que conectar (%s) difire do argumento bssid (%s)."
+
+#: ../cli/src/devices.c:1711
+#, c-format
+msgid "Error: Parameter '%s' is neither SSID nor BSSID."
+msgstr "Erro: o parámetro «%s» non é SSID ou BSSID."
+
+#: ../cli/src/devices.c:1740
+#, c-format
+#| msgid "Error: Device '%s' is not a WiFi device."
+msgid "Error: Device '%s' is not a Wi-Fi device."
+msgstr "Erro: O dispositivo «%s» non é un dispositivo WiFi."
+
+#: ../cli/src/devices.c:1742
+#, c-format
+#| msgid "Error: No suitable device found."
+msgid "Error: No Wi-Fi device found."
+msgstr "Erro: Non se atopou o dispositivo Wi-Fi."
+
+#: ../cli/src/devices.c:1760
+#, c-format
+#| msgid "Error: NSP with name '%s' not found."
+msgid "Error: No network with SSID '%s' found."
+msgstr "Error: no se atopou a rede co SSID «%s»."
+
+#: ../cli/src/devices.c:1762
+#, c-format
+#| msgid "Error: Access point with nsp '%s' not found."
+msgid "Error: No access point with BSSID '%s' found."
+msgstr "Erro: Non foi posíbel atopar o punto de acceso con BSSID «%s»."
+
+#: ../cli/src/devices.c:1860
 #, c-format
 msgid "Error: 'dev wifi' command '%s' is not valid."
 msgstr "Erro: «dev wifi» a orde «%s» non é válida."
 
-#: ../cli/src/devices.c:1579
+#: ../cli/src/devices.c:1936
 #, c-format
 msgid "Error: 'dev wimax': %s"
 msgstr "Erro: «dev wimax» «%s»"
 
-#: ../cli/src/devices.c:1581
+#: ../cli/src/devices.c:1938
 #, c-format
 msgid "Error: 'dev wimax': %s; allowed fields: %s"
 msgstr "Erro: «dev wimax»: %s; campos permitidos: %s"
 
-#: ../cli/src/devices.c:1604
+#: ../cli/src/devices.c:1961
 msgid "WiMAX NSP list"
 msgstr "Lista PSR WiMAX"
 
-#: ../cli/src/devices.c:1641
+#: ../cli/src/devices.c:1998
 #, c-format
 msgid "Error: NSP with name '%s' not found."
 msgstr "Error: no se encontrou o PSR co nome «%s»."
 
-#: ../cli/src/devices.c:1652
+#: ../cli/src/devices.c:2009
 #, c-format
 msgid "Error: Device '%s' is not a WiMAX device."
 msgstr "Error: o dispositivo «%s» non é un dispositivo WiMAX."
 
-#: ../cli/src/devices.c:1683
+#: ../cli/src/devices.c:2040
 #, c-format
-#| msgid "Error: Access point with hwaddr '%s' not found."
 msgid "Error: Access point with nsp '%s' not found."
 msgstr "Erro: Non foi posíbel atopar o punto de acceso con sp «%s»."
 
-#: ../cli/src/devices.c:1710
+#: ../cli/src/devices.c:2067
 #, c-format
 msgid "Error: 'dev wimax' command '%s' is not valid."
 msgstr "Error: orde «dev wimax» «%s» non válida."
 
-#: ../cli/src/devices.c:1760
+#: ../cli/src/devices.c:2120
 #, c-format
 msgid "Error: 'dev' command '%s' is not valid."
 msgstr "Erro: «dev» a orde «%s» non é válida."
@@ -1421,16 +1527,42 @@ msgstr "HARDWARE-WIMAX"
 msgid "WIMAX"
 msgstr "WIMAX"
 
-#: ../cli/src/network-manager.c:67
+#: ../cli/src/network-manager.c:62
+#| msgid "VERSION"
+msgid "PERMISSION"
+msgstr "PERMISO"
+
+#. 0
+#: ../cli/src/network-manager.c:63
+msgid "VALUE"
+msgstr "VALOR"
+
+#: ../cli/src/network-manager.c:77
 #, 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"
+#| "  enable [true|false]\n"
+#| "  sleep [true|false]\n"
+#| "  wifi [on|off]\n"
+#| "  wwan [on|off]\n"
+#| "  wimax [on|off]\n"
+#| "\n"
 msgid ""
 "Usage: nmcli nm { COMMAND | help }\n"
 "\n"
-"  COMMAND := { status | enable | sleep | wifi | wwan | wimax }\n"
+"  COMMAND := { status | permissions | enable | sleep | wifi | wwan | "
+"wimax }\n"
 "\n"
-"  COMMAND := { status | enable | sleep | wifi | wwan }\n"
+"  COMMAND := { status | permissions | enable | sleep | wifi | wwan }\n"
 "\n"
 "  status\n"
+"  permissions\n"
 "  enable [true|false]\n"
 "  sleep [true|false]\n"
 "  wifi [on|off]\n"
@@ -1440,11 +1572,12 @@ msgid ""
 msgstr ""
 "Uso: nmcli nm { ORDE | help }\n"
 "\n"
-"  ORDE := { status | enable | sleep | wifi | wwan | wimax }\n"
+"  ORDE := { status | permissions | enable | sleep | wifi | wwan | wimax }\n"
 "\n"
-"  ORDE := { status | enable | sleep | wifi | wwan }\n"
+"  ORDE := { status | permissions | enable | sleep | wifi | wwan }\n"
 "\n"
 "  status\n"
+"  permissions\n"
 "  enable [true|false]\n"
 "  sleep [true|false]\n"
 "  wifi [on|off]\n"
@@ -1452,144 +1585,185 @@ msgstr ""
 "  wimax [on|off]\n"
 "\n"
 
-#: ../cli/src/network-manager.c:96
+#: ../cli/src/network-manager.c:108
 msgid "asleep"
 msgstr "dormido"
 
-#: ../cli/src/network-manager.c:98
+#: ../cli/src/network-manager.c:110
 msgid "connecting"
 msgstr "conectando"
 
-#: ../cli/src/network-manager.c:100
+#: ../cli/src/network-manager.c:112
 msgid "connected (local only)"
 msgstr "conectado (só local)"
 
-#: ../cli/src/network-manager.c:102
+#: ../cli/src/network-manager.c:114
 msgid "connected (site only)"
 msgstr "conectado (só o sitio)"
 
-#: ../cli/src/network-manager.c:106
+#: ../cli/src/network-manager.c:118
 msgid "disconnecting"
 msgstr "desconectando"
 
-#: ../cli/src/network-manager.c:146
+#: ../cli/src/network-manager.c:158
 #, c-format
 msgid "Error: 'nm status': %s"
 msgstr "Erro:«'nm status»: %s"
 
-#: ../cli/src/network-manager.c:148
+#: ../cli/src/network-manager.c:160
 #, c-format
 msgid "Error: 'nm status': %s; allowed fields: %s"
 msgstr "Erro: 'nm status': %s; campos permitidos: %s"
 
 #. create NMClient
-#: ../cli/src/network-manager.c:161 ../cli/src/network-manager.c:162
-#: ../cli/src/network-manager.c:163 ../cli/src/network-manager.c:164
-#: ../cli/src/network-manager.c:165 ../cli/src/network-manager.c:167
-#: ../cli/src/network-manager.c:168 ../cli/src/network-manager.c:289
-#: ../cli/src/network-manager.c:344 ../cli/src/network-manager.c:382
-#: ../cli/src/network-manager.c:421
+#: ../cli/src/network-manager.c:173 ../cli/src/network-manager.c:174
+#: ../cli/src/network-manager.c:175 ../cli/src/network-manager.c:176
+#: ../cli/src/network-manager.c:177 ../cli/src/network-manager.c:179
+#: ../cli/src/network-manager.c:180 ../cli/src/network-manager.c:429
+#: ../cli/src/network-manager.c:484 ../cli/src/network-manager.c:522
+#: ../cli/src/network-manager.c:561
 msgid "enabled"
 msgstr "activado"
 
-#: ../cli/src/network-manager.c:161 ../cli/src/network-manager.c:162
-#: ../cli/src/network-manager.c:163 ../cli/src/network-manager.c:164
-#: ../cli/src/network-manager.c:165 ../cli/src/network-manager.c:167
-#: ../cli/src/network-manager.c:168 ../cli/src/network-manager.c:289
-#: ../cli/src/network-manager.c:344 ../cli/src/network-manager.c:382
-#: ../cli/src/network-manager.c:421
+#: ../cli/src/network-manager.c:173 ../cli/src/network-manager.c:174
+#: ../cli/src/network-manager.c:175 ../cli/src/network-manager.c:176
+#: ../cli/src/network-manager.c:177 ../cli/src/network-manager.c:179
+#: ../cli/src/network-manager.c:180 ../cli/src/network-manager.c:429
+#: ../cli/src/network-manager.c:484 ../cli/src/network-manager.c:522
+#: ../cli/src/network-manager.c:561
 msgid "disabled"
 msgstr "desactivado"
 
-#: ../cli/src/network-manager.c:181
+#: ../cli/src/network-manager.c:193
 msgid "NetworkManager status"
 msgstr "Estado de NetworkManager"
 
 #. Print header
-#: ../cli/src/network-manager.c:184
+#: ../cli/src/network-manager.c:196
 msgid "running"
 msgstr "en execución"
 
-#: ../cli/src/network-manager.c:184
+#: ../cli/src/network-manager.c:196
 msgid "not running"
 msgstr "non está a executarse"
 
-#: ../cli/src/network-manager.c:215 ../cli/src/utils.c:425
+#: ../cli/src/network-manager.c:271
+msgid "auth"
+msgstr "auth"
+
+#: ../cli/src/network-manager.c:301
+#, c-format
+#| msgid "Error: 'nm status': %s"
+msgid "Error: 'nm permissions': %s"
+msgstr "Erro: «'nm permission»: %s"
+
+#: ../cli/src/network-manager.c:303
+#, c-format
+#| msgid "Error: 'nm status': %s; allowed fields: %s"
+msgid "Error: 'nm permissions': %s; allowed fields: %s"
+msgstr "Erro: 'nm permissions': %s; campos permitidos: %s"
+
+#: ../cli/src/network-manager.c:324
+#| msgid "NetworkManager status"
+msgid "NetworkManager permissions"
+msgstr "Permisos de NetworkManager"
+
+#: ../cli/src/network-manager.c:350 ../cli/src/utils.c:459
 #, c-format
 msgid "Error: Couldn't connect to system bus: %s"
 msgstr "Erro: Non se puido conectar ao bus do sistema: %s"
 
-#: ../cli/src/network-manager.c:226
+#: ../cli/src/network-manager.c:361
 #, c-format
 msgid "Error: Couldn't create D-Bus object proxy."
 msgstr "Erro: Non se puido crear o proxy do obxecto D-Bus."
 
-#: ../cli/src/network-manager.c:232
+#: ../cli/src/network-manager.c:367
 #, c-format
 msgid "Error in sleep: %s"
 msgstr "Erro ao durmir: %s"
 
-#: ../cli/src/network-manager.c:276 ../cli/src/network-manager.c:331
-#: ../cli/src/network-manager.c:369 ../cli/src/network-manager.c:408
+#: ../cli/src/network-manager.c:416 ../cli/src/network-manager.c:471
+#: ../cli/src/network-manager.c:509 ../cli/src/network-manager.c:548
 #, c-format
 msgid "Error: '--fields' value '%s' is not valid here; allowed fields: %s"
 msgstr "Erro: '--fields' valor '%s' non é válido aquí; campos permitidos: %s"
 
-#: ../cli/src/network-manager.c:284
+#: ../cli/src/network-manager.c:424
 msgid "Networking enabled"
 msgstr "Rede activada"
 
-#: ../cli/src/network-manager.c:300
+#: ../cli/src/network-manager.c:440
 #, c-format
 msgid "Error: invalid 'enable' parameter: '%s'; use 'true' or 'false'."
 msgstr ""
 "Erro: o parámetro 'activar' é incorrecto: '%s'; use 'verdadeiro' ou 'falso'."
 
-#: ../cli/src/network-manager.c:310
+#: ../cli/src/network-manager.c:450
 #, c-format
 msgid "Error: Sleeping status is not exported by NetworkManager."
 msgstr "Erro: O status dormente non foi exportado polo NetworkManager."
 
-#: ../cli/src/network-manager.c:318
+#: ../cli/src/network-manager.c:458
 #, c-format
 msgid "Error: invalid 'sleep' parameter: '%s'; use 'true' or 'false'."
 msgstr ""
 "Erro: O parámetro 'durmir' é incorrecto: '%s'; use 'verdadeiro' ou 'falso'."
 
-#: ../cli/src/network-manager.c:339
+#: ../cli/src/network-manager.c:479
 msgid "WiFi enabled"
 msgstr "WiFi activada"
 
-#: ../cli/src/network-manager.c:355
+#: ../cli/src/network-manager.c:495
 #, c-format
 msgid "Error: invalid 'wifi' parameter: '%s'."
 msgstr "Erro: parámetro «wifi» non válido: «%s»."
 
-#: ../cli/src/network-manager.c:377
+#: ../cli/src/network-manager.c:517
 msgid "WWAN enabled"
 msgstr "WWAN activada"
 
-#: ../cli/src/network-manager.c:393
+#: ../cli/src/network-manager.c:533
 #, c-format
 msgid "Error: invalid 'wwan' parameter: '%s'."
 msgstr "Erro: parámetro «wwan» non válido: «%s»."
 
-#: ../cli/src/network-manager.c:416
+#: ../cli/src/network-manager.c:556
 msgid "WiMAX enabled"
 msgstr "WiMAX activado"
 
-#: ../cli/src/network-manager.c:432
+#: ../cli/src/network-manager.c:572
 #, c-format
 msgid "Error: invalid 'wimax' parameter: '%s'."
 msgstr "Erro: parámetro «wimax» non válido: «%s»."
 
-#: ../cli/src/network-manager.c:445
+#: ../cli/src/network-manager.c:588
 #, c-format
 msgid "Error: 'nm' command '%s' is not valid."
 msgstr "Erro: «nm» a orde «%s» non é válida."
 
-#: ../cli/src/nmcli.c:64
+#: ../cli/src/nmcli.c:76
 #, 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] |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"
+#| "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"
@@ -1606,9 +1780,9 @@ msgid ""
 "  -h[elp]                                    print this help\n"
 "\n"
 "OBJECT\n"
-"  nm          NetworkManager status\n"
-"  con         NetworkManager connections\n"
-"  dev         devices managed by NetworkManager\n"
+"  nm              NetworkManager's status\n"
+"  c[onnection]    NetworkManager's connections\n"
+"  d[evice]        devices managed by NetworkManager\n"
 "\n"
 msgstr ""
 "Uso: %s [OPCIÓNS] OBXECTO { ORDE | help }\n"
@@ -1627,224 +1801,230 @@ msgstr ""
 "  -h[elp]                                    mostrar esta axuda\n"
 "\n"
 "OBXECTO\n"
-"  nm          estado de NetworkManager\n"
-"  con         conexións de NetworkManager\n"
-"  dev         dispositivos xestionados por NetworkManager\n"
+"  nm               estado de NetworkManager\n"
+"  c[onnection]     conexións de NetworkManager\n"
+"  d[evice]         dispositivos xestionados por NetworkManager\n"
 "\n"
 
-#: ../cli/src/nmcli.c:109
+#: ../cli/src/nmcli.c:124
 #, c-format
 msgid "Error: Object '%s' is unknown, try 'nmcli help'."
 msgstr "Erro: O obxecto «%s» é descoñecido, tente a executar «nmcli help»."
 
-#: ../cli/src/nmcli.c:139
+#: ../cli/src/nmcli.c:154
 #, c-format
 msgid "Error: Option '--terse' is specified the second time."
 msgstr "Erro: A opción «--terse» especifícase en segundo lugar."
 
-#: ../cli/src/nmcli.c:144
+#: ../cli/src/nmcli.c:159
 #, c-format
 msgid "Error: Option '--terse' is mutually exclusive with '--pretty'."
 msgstr "Erro: A opción «--terse» é mutuamente exclusiva con «--pretty»."
 
-#: ../cli/src/nmcli.c:152
+#: ../cli/src/nmcli.c:167
 #, c-format
 msgid "Error: Option '--pretty' is specified the second time."
 msgstr "Erro: A opción «--pretty» especifícase en segundo lugar."
 
-#: ../cli/src/nmcli.c:157
+#: ../cli/src/nmcli.c:172
 #, c-format
 msgid "Error: Option '--pretty' is mutually exclusive with '--terse'."
 msgstr "Erro: A opción «--pretty» é mutuamente exclusiva con «--terse»."
 
-#: ../cli/src/nmcli.c:167 ../cli/src/nmcli.c:183
+#: ../cli/src/nmcli.c:182 ../cli/src/nmcli.c:198
 #, c-format
 msgid "Error: missing argument for '%s' option."
 msgstr "Erro: falta o argumento para a opción «%s»."
 
-#: ../cli/src/nmcli.c:176 ../cli/src/nmcli.c:192
+#: ../cli/src/nmcli.c:191 ../cli/src/nmcli.c:207
 #, c-format
 msgid "Error: '%s' is not valid argument for '%s' option."
 msgstr "Erro: «%s» non é un argumento válido para a opción «%s»."
 
-#: ../cli/src/nmcli.c:199
+#: ../cli/src/nmcli.c:214
 #, c-format
 msgid "Error: fields for '%s' options are missing."
 msgstr "Erro: faltan os campos para «%s»."
 
-#: ../cli/src/nmcli.c:207
+#: ../cli/src/nmcli.c:222
 #, c-format
 msgid "nmcli tool, version %s\n"
 msgstr "ferramenta nmcli, versión %s\n"
 
-#: ../cli/src/nmcli.c:213
+#: ../cli/src/nmcli.c:228
 #, c-format
 msgid "Error: Option '%s' is unknown, try 'nmcli -help'."
 msgstr "Erro: A opción «%s» é descoñecida, tente «nmcli --help»"
 
-#: ../cli/src/nmcli.c:232
+#: ../cli/src/nmcli.c:247
 #, c-format
 msgid "Caught signal %d, shutting down..."
 msgstr "Sinal %d capturada, apagando..."
 
-#: ../cli/src/nmcli.c:257
+#: ../cli/src/nmcli.c:272
 msgid "Error: Could not create NMClient object."
 msgstr "Erro: non é posíbel crear o obxecto NMClient."
 
-#: ../cli/src/nmcli.c:273
+#: ../cli/src/nmcli.c:288
 msgid "Success"
 msgstr "Éxito"
 
-#: ../cli/src/settings.c:497
+#: ../cli/src/settings.c:563
 #, c-format
 msgid "%d (hex-ascii-key)"
 msgstr "%d (hex-ascii-key)"
 
-#: ../cli/src/settings.c:499
+#: ../cli/src/settings.c:565
 #, c-format
 msgid "%d (104/128-bit passphrase)"
 msgstr "%d (frase de paso 104/128-bit)"
 
-#: ../cli/src/settings.c:502
+#: ../cli/src/settings.c:568 ../cli/src/settings.c:696
 #, c-format
 msgid "%d (unknown)"
 msgstr "%d (descoñecido)"
 
-#: ../cli/src/settings.c:528
+#: ../cli/src/settings.c:594
 msgid "0 (unknown)"
 msgstr "0 (descoñecido)"
 
-#: ../cli/src/settings.c:534
+#: ../cli/src/settings.c:600
 msgid "any, "
 msgstr "calquera, "
 
-#: ../cli/src/settings.c:536
+#: ../cli/src/settings.c:602
 msgid "900 MHz, "
 msgstr "900 MHz, "
 
-#: ../cli/src/settings.c:538
+#: ../cli/src/settings.c:604
 msgid "1800 MHz, "
 msgstr "1800 MHz, "
 
-#: ../cli/src/settings.c:540
+#: ../cli/src/settings.c:606
 msgid "1900 MHz, "
 msgstr "1900 MHz, "
 
-#: ../cli/src/settings.c:542
+#: ../cli/src/settings.c:608
 msgid "850 MHz, "
 msgstr "850 MHz, "
 
-#: ../cli/src/settings.c:544
+#: ../cli/src/settings.c:610
 msgid "WCDMA 3GPP UMTS 2100 MHz, "
 msgstr "WCDMA 3GPP UMTS 2100 MHz, "
 
-#: ../cli/src/settings.c:546
+#: ../cli/src/settings.c:612
 msgid "WCDMA 3GPP UMTS 1800 MHz, "
 msgstr "WCDMA 3GPP UMTS 1800 MHz, "
 
-#: ../cli/src/settings.c:548
+#: ../cli/src/settings.c:614
 msgid "WCDMA 3GPP UMTS 1700/2100 MHz, "
 msgstr "WCDMA 3GPP UMTS 1700/2100 MHz, "
 
-#: ../cli/src/settings.c:550
+#: ../cli/src/settings.c:616
 msgid "WCDMA 3GPP UMTS 800 MHz, "
 msgstr "WCDMA 3GPP UMTS 800 MHz, "
 
-#: ../cli/src/settings.c:552
+#: ../cli/src/settings.c:618
 msgid "WCDMA 3GPP UMTS 850 MHz, "
 msgstr "WCDMA 3GPP UMTS 850 MHz, "
 
-#: ../cli/src/settings.c:554
+#: ../cli/src/settings.c:620
 msgid "WCDMA 3GPP UMTS 900 MHz, "
 msgstr "WCDMA 3GPP UMTS 900 MHz, "
 
-#: ../cli/src/settings.c:556
+#: ../cli/src/settings.c:622
 msgid "WCDMA 3GPP UMTS 1700 MHz, "
 msgstr "WCDMA 3GPP UMTS 1700 MHz, "
 
-#: ../cli/src/settings.c:558
-#| msgid "WCDMA 3GPP UMTS 900 MHz, "
+#: ../cli/src/settings.c:624
 msgid "WCDMA 3GPP UMTS 1900 MHz, "
 msgstr "WCDMA 3GPP UMTS 1900 MHz, "
 
-#: ../cli/src/settings.c:560
-#| msgid "WCDMA 3GPP UMTS 2100 MHz, "
+#: ../cli/src/settings.c:626
 msgid "WCDMA 3GPP UMTS 2600 MHz, "
 msgstr "WCDMA 3GPP UMTS 2600 MHz, "
 
-#: ../cli/src/settings.c:578
+#: ../cli/src/settings.c:644
 msgid "0 (NONE)"
 msgstr "0 (NINGÚN)"
 
-#: ../cli/src/settings.c:584
+#: ../cli/src/settings.c:650
 msgid "REORDER_HEADERS, "
 msgstr "REORDER_HEADERS, "
 
-#: ../cli/src/settings.c:586
+#: ../cli/src/settings.c:652
 msgid "GVRP, "
 msgstr "GVRP, "
 
-#: ../cli/src/settings.c:588
+#: ../cli/src/settings.c:654
 msgid "LOOSE_BINDING, "
 msgstr "LOOSE_BINDING, "
 
-#: ../cli/src/settings.c:730 ../cli/src/settings.c:926
-#: ../cli/src/settings.c:1630
+#: ../cli/src/settings.c:690
+#, c-format
+#| msgid "disabled"
+msgid "%d (disabled)"
+msgstr "0 (desactivado)"
+
+#: ../cli/src/settings.c:692
+#, c-format
+msgid "%d (enabled, prefer public IP)"
+msgstr "%d (activado, prefire IP públic)"
+
+#: ../cli/src/settings.c:694
+#, c-format
+msgid "%d (enabled, prefer temporary IP)"
+msgstr "%d (activado, prefire IP temporal)"
+
+#: ../cli/src/settings.c:827 ../cli/src/settings.c:1023
+#: ../cli/src/settings.c:1732
 msgid "auto"
 msgstr "automático"
 
-#: ../cli/src/settings.c:920 ../cli/src/settings.c:923
-#: ../cli/src/settings.c:924 ../cli/src/utils.c:247
-msgid "not set"
-msgstr "non definido"
-
-#: ../cli/src/utils.c:103
+#: ../cli/src/utils.c:105
 #, c-format
-#| msgid "%s: error converting IP4 address 0x%X"
 msgid "Error converting IP4 address '0x%X' to text form"
 msgstr "Produciuse un erro ao converter o enderezo IPv4 «0x%X» á formato texto"
 
-#: ../cli/src/utils.c:131
+#: ../cli/src/utils.c:133
 #, c-format
-#| msgid "%s: error converting IP4 address 0x%X"
 msgid "Error converting IP6 address '%s' to text form"
 msgstr "Produciuse un erro ao converter o enderezo IPv6 «%s» á formato texto"
 
-#: ../cli/src/utils.c:200
+#: ../cli/src/utils.c:234
 #, c-format
 msgid "field '%s' has to be alone"
 msgstr "o campo «%s» ten que estar só"
 
-#: ../cli/src/utils.c:203
+#: ../cli/src/utils.c:237
 #, c-format
 msgid "invalid field '%s'"
 msgstr "campo «%s» non válido"
 
-#: ../cli/src/utils.c:222
-#, c-format
+#: ../cli/src/utils.c:256
 msgid "Option '--terse' requires specifying '--fields'"
 msgstr "A opcións «--terse» require que especifique «--fields»"
 
-#: ../cli/src/utils.c:226
+#: ../cli/src/utils.c:260
 #, c-format
 msgid "Option '--terse' requires specific '--fields' option values , not '%s'"
 msgstr ""
 "A opción «--terse» require que especifique os valores da opción «--fields», "
 "non «%s»"
 
-#: ../cli/src/utils.c:436
+#: ../cli/src/utils.c:470
 #, c-format
 msgid "Error: Couldn't create D-Bus object proxy for org.freedesktop.DBus"
 msgstr ""
 "Erro: non é posíbel crear un proxy de obxecto D-Bus para org.freedesktop."
 "DBus."
 
-#: ../cli/src/utils.c:444
+#: ../cli/src/utils.c:478
 #, c-format
 msgid "Error: NameHasOwner request failed: %s"
 msgstr "Erro: produciuse un fallo na resposta «NameHasOwner»: %s"
 
-#: ../cli/src/utils.c:489
+#: ../cli/src/utils.c:523
 #, c-format
 msgid ""
 "Warning: nmcli (%s) and NetworkManager (%s) versions don't match. Use --"
@@ -1853,7 +2033,7 @@ msgstr ""
 "Advertencia: as versións de nmcli (%s) e de NetworkManager (%s) non "
 "coinciden. Use «--nocheck» para evitar o aviso.\n"
 
-#: ../cli/src/utils.c:498
+#: ../cli/src/utils.c:532
 #, c-format
 msgid ""
 "Error: nmcli (%s) and NetworkManager (%s) versions don't match. Force "
@@ -2215,42 +2395,42 @@ msgstr "Non foi posíbel verficar o ficheiro PKCS#12: %d"
 msgid "Could not generate random data."
 msgstr "Non foi posíbel xerar datos aleatorios."
 
-#: ../libnm-util/nm-utils.c:2034
+#: ../libnm-util/nm-utils.c:2078
 #, c-format
 msgid "Not enough memory to make encryption key."
 msgstr "Sen memoria abondo para crear a chave de cifrado."
 
-#: ../libnm-util/nm-utils.c:2144
+#: ../libnm-util/nm-utils.c:2188
 msgid "Could not allocate memory for PEM file creation."
 msgstr "Non foi posíbel asignar memoria para a creación do ficheiro PEM,"
 
-#: ../libnm-util/nm-utils.c:2156
+#: ../libnm-util/nm-utils.c:2200
 #, c-format
 msgid "Could not allocate memory for writing IV to PEM file."
 msgstr "Non foi posíbel asignar memoria para escribir IV no ficheiro PEM."
 
-#: ../libnm-util/nm-utils.c:2168
+#: ../libnm-util/nm-utils.c:2212
 #, c-format
 msgid "Could not allocate memory for writing encrypted key to PEM file."
 msgstr ""
 "Non foi posíbel asignar memoria para escribir a chave cifrada no ficheiro "
 "PEM."
 
-#: ../libnm-util/nm-utils.c:2187
+#: ../libnm-util/nm-utils.c:2231
 #, c-format
 msgid "Could not allocate memory for PEM file data."
 msgstr "Non foi posíbel asignar memoria para os datos do ficheiro PEM."
 
-#: ../policy/org.freedesktop.NetworkManager.policy.in.h:1
+#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:1
 msgid "Enable or disable system networking"
 msgstr "Activar ou desactivar a rede do sistema"
 
-#: ../policy/org.freedesktop.NetworkManager.policy.in.h:2
+#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:2
 msgid "System policy prevents enabling or disabling system networking"
 msgstr ""
 "A normativa do sistema evita a activación ou desactivación da rede do sistema"
 
-#: ../policy/org.freedesktop.NetworkManager.policy.in.h:3
+#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:3
 msgid ""
 "Put NetworkManager to sleep or wake it up (should only be used by system "
 "power management)"
@@ -2258,203 +2438,231 @@ msgstr ""
 "Poñer o NetworkManager en suspensión e espertalo (só debe ser usado polo "
 "sistema de xestión de rede)"
 
-#: ../policy/org.freedesktop.NetworkManager.policy.in.h:4
+#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:4
 msgid "System policy prevents putting NetworkManager to sleep or waking it up"
 msgstr ""
 "A normativa do sistema evita poñer o NetworkManager en suspensión ou "
 "espertalo"
 
-#: ../policy/org.freedesktop.NetworkManager.policy.in.h:5
+#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:5
 msgid "Enable or disable WiFi devices"
 msgstr "Activar ou desactivar os dispositivos WiFi"
 
-#: ../policy/org.freedesktop.NetworkManager.policy.in.h:6
+#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:6
 msgid "System policy prevents enabling or disabling WiFi devices"
 msgstr ""
 "A normativa do sistema evita a activación e desactivación dos dispositivos "
 "WiFi"
 
-#: ../policy/org.freedesktop.NetworkManager.policy.in.h:7
+#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:7
 msgid "Enable or disable mobile broadband devices"
 msgstr "Activar ou desactivar os dispositivos de banda ancha móbiles"
 
-#: ../policy/org.freedesktop.NetworkManager.policy.in.h:8
+#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:8
 msgid "System policy prevents enabling or disabling mobile broadband devices"
 msgstr ""
 "A normativa do sistema evita a activación ou desactivación dos dispositivos "
 "de banda ancha."
 
-#: ../policy/org.freedesktop.NetworkManager.policy.in.h:9
+#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:9
 msgid "Enable or disable WiMAX mobile broadband devices"
 msgstr "Activar ou desactivar os dispositivos de banda larga móbil WIMAX"
 
-#: ../policy/org.freedesktop.NetworkManager.policy.in.h:10
+#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:10
 msgid ""
 "System policy prevents enabling or disabling WiMAX mobile broadband devices"
 msgstr ""
 "A normativa do sistema evita activar ou desactivar os dispositivos de banda "
 "larga móbil WIMAX."
 
-#: ../policy/org.freedesktop.NetworkManager.policy.in.h:11
+#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:11
 msgid "Allow control of network connections"
 msgstr "Permitir o control das conexións de rede"
 
-#: ../policy/org.freedesktop.NetworkManager.policy.in.h:12
+#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:12
 msgid "System policy prevents control of network connections"
 msgstr "A normativa do sistema evita o control das conexións de rede"
 
-#: ../policy/org.freedesktop.NetworkManager.policy.in.h:13
+#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:13
 msgid "Connection sharing via a protected WiFi network"
 msgstr "Conexión compartida a través dunha rede WiFi protexida"
 
-#: ../policy/org.freedesktop.NetworkManager.policy.in.h:14
+#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:14
 msgid "System policy prevents sharing connections via a protected WiFi network"
 msgstr ""
 "A política do sistema impide compartir conexións a través dunha rede WiFi "
 "protexida"
 
-#: ../policy/org.freedesktop.NetworkManager.policy.in.h:15
+#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:15
 msgid "Connection sharing via an open WiFi network"
 msgstr "Conexión compartida a través dunha rede WiFi aberta"
 
-#: ../policy/org.freedesktop.NetworkManager.policy.in.h:16
+#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:16
 msgid "System policy prevents sharing connections via an open WiFi network"
 msgstr ""
 "A política do sistema impide compartir conexións a través dunha rede WiFi "
 "aberta"
 
-#: ../policy/org.freedesktop.NetworkManager.policy.in.h:17
+#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:17
 msgid "Modify personal network connections"
 msgstr "Modificar as conexións de rede persoais"
 
-#: ../policy/org.freedesktop.NetworkManager.policy.in.h:18
+#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:18
 msgid "System policy prevents modification of personal network settings"
 msgstr ""
 "A política do sistema impide a modificación da configuración persoal da rede"
 
-#: ../policy/org.freedesktop.NetworkManager.policy.in.h:19
+#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:19
 msgid "Modify network connections for all users"
 msgstr "Modificar as conexións de rede para tódolos usuarios"
 
-#: ../policy/org.freedesktop.NetworkManager.policy.in.h:20
+#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:20
 msgid "System policy prevents modification of network settings for all users"
 msgstr ""
 "A política do sistema impide a modificación da configuración da rede para "
 "tódolos usuarios"
 
-#: ../policy/org.freedesktop.NetworkManager.policy.in.h:21
+#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:21
 msgid "Modify persistent system hostname"
 msgstr "Modificar o nome persistente do anfitrión do sistema"
 
-#: ../policy/org.freedesktop.NetworkManager.policy.in.h:22
+#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:22
 msgid "System policy prevents modification of the persistent system hostname"
 msgstr ""
 "A política do sistema impide a modificación do nome do anfitrión do sistema"
 
-#: ../src/main.c:143
+#: ../src/main.c:158
+#, c-format
+#| msgid "Failed to encrypt: %d."
+msgid "Failed to set signal mask: %d"
+msgstr "Produciuse un erro ao estabelecer a máscara do sinal: %d."
+
+#: ../src/main.c:167
 #, c-format
-#| msgid "Failed to initialize the crypto engine: %d."
-msgid "Failed to initialize SIGTERM pipe: %d"
-msgstr "Produciuse un fallo ao inicializar a tubería SIGTERM: %d"
+msgid "Failed to create signal handling thread: %d"
+msgstr "Produciuse un fallo ao crear o fío de xestión de sinal: %d"
 
-#: ../src/main.c:174
+#: ../src/main.c:182
 #, c-format
 msgid "Opening %s failed: %s\n"
 msgstr "A apertura de %s fallou: %s\n"
 
-#: ../src/main.c:180
+#: ../src/main.c:188
 #, c-format
 msgid "Writing to %s failed: %s\n"
 msgstr "A escritura de %s fallou: %s\n"
 
-#: ../src/main.c:185
+#: ../src/main.c:193
 #, c-format
 msgid "Closing %s failed: %s\n"
 msgstr "O peche de %s fallou: %s\n"
 
-#: ../src/main.c:228
+#: ../src/main.c:236
 #, c-format
-#| msgid "Error: NetworkManager is not running."
 msgid "NetworkManager is already running (pid %ld)\n"
 msgstr "NetworkManager xa está executándose (pid %ld)\n"
 
-#: ../src/main.c:368
-#| msgid "NetworkManager status"
+#: ../src/main.c:363
 msgid "Print NetworkManager version and exit"
 msgstr "Imprimir a versión de NetworkManager e saír"
 
-#: ../src/main.c:369
+#: ../src/main.c:364
 msgid "Don't become a daemon"
 msgstr "Non converter en daemon"
 
-#: ../src/main.c:370
+#: ../src/main.c:365
 msgid "Make all warnings fatal"
 msgstr "Facer todos os avisos fatais"
 
-#: ../src/main.c:371
+#: ../src/main.c:366
 msgid "Specify the location of a PID file"
 msgstr "Especifique a localización do ficheiro PID"
 
-#: ../src/main.c:371
+#: ../src/main.c:366
 msgid "filename"
 msgstr "nome-de-ficheiro"
 
-#: ../src/main.c:372
+#: ../src/main.c:367
 msgid "State file location"
 msgstr "Localización do ficheiro de estado"
 
-#: ../src/main.c:372
+#: ../src/main.c:367
 msgid "/path/to/state.file"
 msgstr "/ruta/ao/ficheiro-de.configuración"
 
-#: ../src/main.c:373
+#: ../src/main.c:368
 msgid "Config file location"
 msgstr "Localización do ficheiro de configuración"
 
-#: ../src/main.c:373
+#: ../src/main.c:368
 msgid "/path/to/config.file"
 msgstr "/ruta/ao/ficheiro-de.configuración"
 
-#: ../src/main.c:374
+#: ../src/main.c:369
 msgid "List of plugins separated by ','"
 msgstr "Lista de engadidos separados por «,»"
 
-#: ../src/main.c:374
+#: ../src/main.c:369
 msgid "plugin1,plugin2"
 msgstr "engadido1,engadido2"
 
 #. Translators: Do not translate the values in the square brackets
-#: ../src/main.c:376
+#: ../src/main.c:371
 msgid "Log level: one of [ERR, WARN, INFO, DEBUG]"
 msgstr "Nivel de rexistroÑ un de [ERR, WARN, INFO, DEBUG]"
 
 #. Translators: Do not translate the values in the square brackets
-#: ../src/main.c:379
+#: ../src/main.c:374
+#| msgid ""
+#| "Log domains separated by ',': any combination of\n"
+#| "                                          [NONE,HW,RFKILL,ETHER,WIFI,BT,"
+#| "MB,DHCP4,DHCP6,PPP,\n"
+#| "                                           WIFI_SCAN,IP4,IP6,AUTOIP4,DNS,"
+#| "VPN,SHARING,SUPPLICANT,\n"
+#| "                                           AGENTS,SETTINGS,SUSPEND,CORE,"
+#| "DEVICE,OLPC,WIMAX,\n"
+#| "                                           INFINIBAND,FIREWALL]"
 msgid ""
 "Log domains separated by ',': any combination of\n"
-"                                          [NONE,HW,RFKILL,ETHER,WIFI,BT,MB,"
-"DHCP4,DHCP6,PPP,\n"
-"                                           WIFI_SCAN,IP4,IP6,AUTOIP4,DNS,VPN,"
-"SHARING,SUPPLICANT,\n"
-"                                           AGENTS,SETTINGS,SUSPEND,CORE,"
-"DEVICE,OLPC,WIMAX,\n"
-"                                           INFINIBAND,FIREWALL]"
+"                                                [NONE,HW,RFKILL,ETHER,WIFI,"
+"BT,MB,DHCP4,DHCP6,PPP,\n"
+"                                                 WIFI_SCAN,IP4,IP6,AUTOIP4,"
+"DNS,VPN,SHARING,SUPPLICANT,\n"
+"                                                 AGENTS,SETTINGS,SUSPEND,"
+"CORE,DEVICE,OLPC,WIMAX,\n"
+"                                                 INFINIBAND,FIREWALL,ADSL]"
 msgstr ""
 "Dominios de rexistro separados por ',': calquera combinación de\n"
-"                                          [NONE,HW,RFKILL,ETHER,WIFI,BT,MB,"
-"DHCP4,DHCP6,PPP,\n"
-"                                           WIFI_SCAN,IP4,IP6,AUTOIP4,DNS,VPN,"
-"SHARING,SUPPLICANT,\n"
-"                                           AGENTS,SETTINGS,SUSPEND,CORE,"
-"DEVICE,OLPC,WIMAX,\n"
-"                                           INFINIBAND,FIREWALL]"
+"                                          "
+"[NONE,HW,RFKILL,ETHER,WIFI,BT,MB,DHCP4,DHCP6,PPP,\n"
+"                                                 "
+"WIFI_SCAN,IP4,IP6,AUTOIP4,DNS,VPN,SHARING,SUPPLICANT,\n"
+"                                                 "
+"AGENTS,SETTINGS,SUSPEND,CORE,DEVICE,OLPC,WIMAX,\n"
+"                                                 INFINIBAND,FIREWALL,ADSL]"
+
+#: ../src/main.c:380
+msgid "An http(s) address for checking internet connectivity"
+msgstr "Un enderezo http(s) para comprobar a conectividade a internet"
 
-#: ../src/main.c:392
+#: ../src/main.c:381
+msgid "The interval between connectivity checks (in seconds)"
+msgstr "O intervalo entre as comprobacións de conectividade (en segundos)"
+
+#: ../src/main.c:382
+msgid "The expected start of the response"
+msgstr "O inicio agardado da resposta"
+
+#: ../src/main.c:382
+msgid "Bingo!"
+msgstr "Bingo!"
+
+#: ../src/main.c:387
 #, c-format
 msgid "GModules are not supported on your platform!\n"
 msgstr "GModules non admite a súa plataforma!\n"
 
-#: ../src/main.c:411
+#: ../src/main.c:406
 msgid ""
 "NetworkManager monitors all network connections and automatically\n"
 "chooses the best connection to use.  It also allows the user to\n"
@@ -2466,42 +2674,41 @@ msgstr ""
 "especificar puntos de accceso sen fíos aos que se asociarán as \n"
 "tarxetas sen fíos neste computador."
 
-#: ../src/main.c:417
+#: ../src/main.c:412
 #, c-format
 msgid "Invalid option.  Please use --help to see a list of valid options.\n"
 msgstr "Opción incorrecta. Use --help para ver a lista de opcións válidas.\n"
 
-#: ../src/main.c:427
+#: ../src/main.c:422
 #, c-format
 msgid "You must be root to run NetworkManager!\n"
 msgstr "Debe ser superusuario para executar NetworkManager!\n"
 
-#: ../src/main.c:448
+#: ../src/main.c:449
 #, c-format
-#| msgid "Failed to set IV for encryption: %s / %s."
 msgid "Failed to read configuration: (%d) %s\n"
 msgstr "Produciuse un fallo ao ler a configuración: (%d) %s\n"
 
-#: ../src/main.c:459
+#: ../src/main.c:460
 #, c-format
 msgid "%s.  Please use --help to see a list of valid options.\n"
 msgstr "%s. Use --help para ver a lista das opcións válidas.\n"
 
-#: ../src/main.c:466
+#: ../src/main.c:467
 #, c-format
 msgid "State file %s parsing failed: (%d) %s\n"
 msgstr "Produciuse un fallo ao analizar o ficheiro de estado %s: (%d) %s\n"
 
-#: ../src/main.c:483
+#: ../src/main.c:484
 #, c-format
 msgid "Could not daemonize: %s [error %u]\n"
 msgstr "Non foi posíbel crear o daemon: %s [error %u]\n"
 
-#: ../src/dhcp-manager/nm-dhcp-dhclient-utils.c:62
+#: ../src/dhcp-manager/nm-dhcp-dhclient-utils.c:138
 msgid "# Created by NetworkManager\n"
 msgstr "# Creado por NetworkManager\n"
 
-#: ../src/dhcp-manager/nm-dhcp-dhclient-utils.c:69
+#: ../src/dhcp-manager/nm-dhcp-dhclient-utils.c:145
 #, c-format
 msgid ""
 "# Merged from %s\n"
@@ -2527,46 +2734,59 @@ msgstr "Non foi posíbel encontrar «dhcpcd»."
 msgid "unsupported DHCP client '%s'"
 msgstr "cliente DHCP «%s» non compatíbel"
 
-#: ../src/dns-manager/nm-dns-manager.c:376
+#: ../src/dns-manager/nm-dns-manager.c:375
 msgid "NOTE: the libc resolver may not support more than 3 nameservers."
 msgstr "NOTE: o importador libc non permite máis de 3 nomes de servidores."
 
-#: ../src/dns-manager/nm-dns-manager.c:378
+#: ../src/dns-manager/nm-dns-manager.c:377
 msgid "The nameservers listed below may not be recognized."
 msgstr "Os nomes de servidores listados a seguir poden non ser recoñecidos"
 
-#: ../src/logging/nm-logging.c:130
+#: ../src/logging/nm-logging.c:142
 #, c-format
 msgid "Unknown log level '%s'"
 msgstr "Nivel de rexistro «%s» descoñecido"
 
-#: ../src/logging/nm-logging.c:155
+#: ../src/logging/nm-logging.c:181
 #, c-format
 msgid "Unknown log domain '%s'"
 msgstr "Dominio de rexistro «%s» descoñecido"
 
-#: ../src/modem-manager/nm-modem-cdma.c:279 ../src/nm-device-bt.c:325
+#: ../src/modem-manager/nm-modem-cdma.c:280
+#: ../src/modem-manager/nm-modem-broadband.c:546 ../src/nm-device-bt.c:352
 #, c-format
 msgid "CDMA connection %d"
 msgstr "Conexión CDMA %d"
 
-#: ../src/modem-manager/nm-modem-gsm.c:512 ../src/nm-device-bt.c:321
+#: ../src/modem-manager/nm-modem-gsm.c:558
+#: ../src/modem-manager/nm-modem-broadband.c:524 ../src/nm-device-bt.c:348
 #, c-format
 msgid "GSM connection %d"
 msgstr "Conexión GSM %d"
 
-#: ../src/nm-device-bond.c:192
+#: ../src/nm-device-bond.c:200
 #, c-format
-#| msgid "PPPoE connection %d"
 msgid "Bond connection %d"
 msgstr "Conexión Bond %d"
 
-#: ../src/nm-device-bt.c:296
+#: ../src/nm-device-adsl.c:193
+#, c-format
+#| msgid "GSM connection %d"
+msgid "ADSL connection %d"
+msgstr "Conexión ADSL %d"
+
+#: ../src/nm-device-bridge.c:206
+#, c-format
+#| msgid "Bond connection %d"
+msgid "Bridge connection %d"
+msgstr "Conexión Bridge %d"
+
+#: ../src/nm-device-bt.c:323
 #, c-format
 msgid "PAN connection %d"
 msgstr "Conexión PAN %d"
 
-#: ../src/nm-device-bt.c:329
+#: ../src/nm-device-bt.c:356
 #, c-format
 msgid "DUN connection %d"
 msgstr "Conexión DUN %d"
@@ -2581,24 +2801,22 @@ msgstr "Conexión PPPoE %d"
 msgid "Wired connection %d"
 msgstr "Conexión cableada %d"
 
-#: ../src/nm-device-infiniband.c:303
+#: ../src/nm-device-infiniband.c:301
 #, c-format
-#| msgid "Wired connection %d"
 msgid "InfiniBand connection %d"
 msgstr "Conexión InfiniBand %d"
 
-#: ../src/nm-device-olpc-mesh.c:293
+#: ../src/nm-device-olpc-mesh.c:311
 #, c-format
 msgid "Mesh %d"
 msgstr "Malla %d"
 
 #: ../src/nm-device-vlan.c:362
 #, c-format
-#| msgid "PAN connection %d"
 msgid "VLAN connection %d"
 msgstr "Conexión VLAN %d"
 
-#: ../src/nm-manager.c:661
+#: ../src/nm-manager.c:666
 #, c-format
 msgid "VPN connection %d"
 msgstr "Conexión VPN %d"
@@ -2650,15 +2868,71 @@ msgstr "non é posíbel unir ao grupo da ligazón de rede: %s"
 msgid "error updating link cache: %s"
 msgstr "produciuse un erro ao actualizar a caché de ligazóns: %s"
 
-#: ../src/settings/plugins/ifcfg-rh/reader.c:93
+#: ../src/settings/plugins/ifcfg-rh/reader.c:110
 msgid "System"
 msgstr "Sistema"
 
-#: ../src/settings/plugins/ifcfg-rh/reader.c:3632
-#| msgid "on"
+#: ../src/settings/plugins/ifcfg-rh/reader.c:3702
 msgid "Bond"
 msgstr "Bond"
 
+#: ../src/settings/plugins/ifcfg-rh/reader.c:3887
+msgid "Bridge"
+msgstr "Bridge"
+
+#: ../test/nm-online.c:111
+#, c-format
+#| msgid "connecting"
+msgid "\rConnecting"
+msgstr "\rConectando"
+
+#: ../test/nm-online.c:142
+msgid "Time to wait for a connection, in seconds (default is 30)"
+msgstr "Tempo de espera para a conexión, en segundos (por omisión é 30)"
+
+#: ../test/nm-online.c:143
+#| msgid "Error: NetworkManager is not running."
+msgid "Exit immediately if NetworkManager is not running or connecting"
+msgstr "Saír inmediatamente de NetworkManager se non está a funcionar."
+
+#: ../test/nm-online.c:144
+msgid "Don't print anything"
+msgstr "Non imprimir nada"
+
+#: ../test/nm-online.c:162
+msgid "Waits for a successful connection in NetworkManager."
+msgstr "Agarda por unha conexión con éxito en NetworkManager."
+
+#: ../test/nm-online.c:168 ../test/nm-online.c:177
+#| msgid "Invalid option.  Please use --help to see a list of valid options.\n"
+msgid "Invalid option.  Please use --help to see a list of valid options."
+msgstr "Opción incorrecta.  Use --help para ver a lista de opcións válidas."
+
+#~ msgid "state: %s\n"
+#~ msgstr "estado: %s\n"
+
+#~ msgid "Connection activated\n"
+#~ msgstr "Conexión activada\n"
+
+#~ msgid "state: %s (%d)\n"
+#~ msgstr "estado: %s (%d)\n"
+
+#~ msgid "Active connection state: %s\n"
+#~ msgstr "Estado da conexión activa: %s\n"
+
+#~ msgid "Active connection path: %s\n"
+#~ msgstr "Camiño da conexión activa: %s\n"
+
+#~ msgid "Device state: %d (%s)\n"
+#~ msgstr "Estado do dispositivo: %d (%s)\n"
+
+#~ msgid "not set"
+#~ msgstr "non definido"
+
+#~| msgid "Failed to initialize the crypto engine: %d."
+#~ msgid "Failed to initialize SIGTERM pipe: %d"
+#~ msgstr "Produciuse un fallo ao inicializar a tubería SIGTERM: %d"
+
 #~ msgid "IP4-SETTINGS"
 #~ msgstr "CONFIGURACIONS-IP4"
 
diff --git a/po/gu.po b/po/gu.po
index 68c97d71..73e3627f 100644
--- a/po/gu.po
+++ b/po/gu.po
@@ -3,966 +3,1722 @@
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER.
 #
 # Ankit Patel , 2004.
-# Sweta Kothari , 2009, 2010.
+# Sweta Kothari , 2009, 2010, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: gu\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-05-06 14:31+0530\n"
-"PO-Revision-Date: 2010-05-10 14:38+0530\n"
-"Last-Translator: Sweta Kothari \n"
-"Language-Team: Gujarati\n"
+"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug."
+"cgi?product=NetworkManager&keywords=I18N+L10N&component=general\n"
+"POT-Creation-Date: 2012-11-13 15:25+0000\n"
+"PO-Revision-Date: 2012-11-20 15:41+0530\n"
+"Last-Translator: \n"
+"Language-Team: gu_IN \n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: KBabel 1.11.4\n"
+"X-Generator: Lokalize 1.0\n"
 "Plural-Forms: nplurals=2; plural=(n!=1);\n"
 "\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/common.c:32 ../cli/src/common.c:44 ../cli/src/common.c:52
+#: ../cli/src/common.c:63 ../cli/src/connections.c:128
+#: ../cli/src/connections.c:162
+msgid "GROUP"
+msgstr "GROUP"
+
+#. 0
+#: ../cli/src/common.c:33 ../cli/src/common.c:53
+msgid "ADDRESS"
+msgstr "ADDRESS"
+
+#. 1
+#: ../cli/src/common.c:34 ../cli/src/common.c:54
+msgid "ROUTE"
+msgstr "ROUTE"
+
+#. 2
+#: ../cli/src/common.c:35 ../cli/src/common.c:55
+msgid "DNS"
+msgstr "DNS"
+
+#. 3
+#: ../cli/src/common.c:36 ../cli/src/common.c:56
+msgid "DOMAIN"
+msgstr "DOMAIN"
+
+#. 4
+#: ../cli/src/common.c:37
+msgid "WINS"
+msgstr "WINS"
+
+#. 0
+#: ../cli/src/common.c:45 ../cli/src/common.c:64
+msgid "OPTION"
+msgstr "OPTION"
+
+#: ../cli/src/common.c:366
+msgid "unmanaged"
+msgstr "અસંચાલિત થયેલ"
+
+#: ../cli/src/common.c:368
+msgid "unavailable"
+msgstr "ઉપલબ્ધ નથી"
+
+#: ../cli/src/common.c:370 ../cli/src/network-manager.c:120
+msgid "disconnected"
+msgstr "તૂટેલ જોડાણ"
+
+#: ../cli/src/common.c:372
+msgid "connecting (prepare)"
+msgstr "જોડાઇ રહ્યા છે (તૈયાર કરો)"
+
+#: ../cli/src/common.c:374
+msgid "connecting (configuring)"
+msgstr "જોડાઇ રહ્યા છે (રૂપરેખાંકિત કરી રહ્યા છે)"
+
+#: ../cli/src/common.c:376
+msgid "connecting (need authentication)"
+msgstr "જોડાઇ રહ્યા છે (સત્તાધિકરણની જરૂર છે)"
+
+#: ../cli/src/common.c:378
+msgid "connecting (getting IP configuration)"
+msgstr "જોડાઇ રહ્યા છે (IP રૂપરેખાંકનને મેળવી રહ્યા છે)"
+
+#: ../cli/src/common.c:380
+msgid "connecting (checking IP connectivity)"
+msgstr "જોડાઇ રહ્યા છે (IP જોડાણને ચકાસી રહ્યા છે)"
+
+#: ../cli/src/common.c:382
+msgid "connecting (starting secondary connections)"
+msgstr "જોડાઇ રહ્યા છે (ગૌણ જોડાણો શરૂ કરી રહ્યા છે)"
+
+#: ../cli/src/common.c:384 ../cli/src/network-manager.c:116
+msgid "connected"
+msgstr "જોડાયેલ"
+
+#: ../cli/src/common.c:386 ../cli/src/connections.c:635
+msgid "deactivating"
+msgstr "નિષ્ક્રિય કરી રહ્યા છે"
+
+#: ../cli/src/common.c:388
+msgid "connection failed"
+msgstr "જોડાણ નિષ્ફળ"
+
+#: ../cli/src/common.c:390 ../cli/src/connections.c:638
+#: ../cli/src/connections.c:661 ../cli/src/connections.c:1353
+#: ../cli/src/devices.c:645 ../cli/src/network-manager.c:123
+#: ../cli/src/network-manager.c:185 ../cli/src/network-manager.c:188
+#: ../cli/src/network-manager.c:197 ../cli/src/network-manager.c:257
+#: ../cli/src/network-manager.c:273 ../cli/src/network-manager.c:431
+#: ../cli/src/network-manager.c:486 ../cli/src/network-manager.c:524
+#: ../cli/src/network-manager.c:563 ../cli/src/settings.c:593
+#: ../cli/src/settings.c:621 ../cli/src/utils.c:531 ../src/main.c:451
+#: ../src/main.c:470
+msgid "unknown"
+msgstr "અજ્ઞાત"
+
+#: ../cli/src/common.c:399
+msgid "No reason given"
+msgstr "કારણ આપેલ નથી"
+
+#: ../cli/src/common.c:402
+msgid "Unknown error"
+msgstr "અજ્ઞાત ભૂલ"
+
+#: ../cli/src/common.c:405
+msgid "Device is now managed"
+msgstr "ઉપકરણ હવે સંચાલિત થયેલ છે"
+
+#: ../cli/src/common.c:408
+msgid "Device is now unmanaged"
+msgstr "ઉપકરણ હવે સંચાલિત થયેલ નથી"
+
+#: ../cli/src/common.c:411
+msgid "The device could not be readied for configuration"
+msgstr "ઉપકરણ રૂપરેખાંકન માટે પહેલેથી તૈયાર કરી શક્યુ નહિં"
+
+#: ../cli/src/common.c:414
+msgid "IP configuration could not be reserved (no available address, timeout, etc.)"
+msgstr "IP રૂપરેખાંકનને આરક્ષિત રાખી શક્યા નહિં (ઉપલબ્ધ સરનામું નથી, સમય સમાપ્તિ, વગેરે.)"
+
+#: ../cli/src/common.c:417
+msgid "The IP configuration is no longer valid"
+msgstr "IP રૂપરેખાંકન લાંબા સમય સુધી માન્ય નથી"
+
+#: ../cli/src/common.c:420
+msgid "Secrets were required, but not provided"
+msgstr "ખાનગીની જરૂરિયાત હતી, પરંતુ પૂરુ પાડેલ નથી"
+
+#: ../cli/src/common.c:423
+msgid "802.1X supplicant disconnected"
+msgstr "802.1X સપ્લિકન્ટનું જોડાણ તૂટી ગયુ"
+
+#: ../cli/src/common.c:426
+msgid "802.1X supplicant configuration failed"
+msgstr "802.1X સપ્લિકન્ટ રૂપરેખાંકન નિષ્ફળ"
+
+#: ../cli/src/common.c:429
+msgid "802.1X supplicant failed"
+msgstr "802.1X સપ્લિકન્ટ નિષ્ફળ"
+
+#: ../cli/src/common.c:432
+msgid "802.1X supplicant took too long to authenticate"
+msgstr "802.1X સપ્લિકન્ટ સત્તાધિકરણ કરવા માટે લાંબો સમય લીધો"
+
+#: ../cli/src/common.c:435
+msgid "PPP service failed to start"
+msgstr "શરૂ કરવા માટે PPP સેવા નિષ્ફળ"
+
+#: ../cli/src/common.c:438
+msgid "PPP service disconnected"
+msgstr "તૂટી ગયેલ PPP સેવા જોડાણ"
+
+#: ../cli/src/common.c:441
+msgid "PPP failed"
+msgstr "PPP નિષ્ફળ"
+
+#: ../cli/src/common.c:444
+msgid "DHCP client failed to start"
+msgstr "શરૂ કરવા માટે DHCP ક્લાયન્ટ નિષ્ફળ"
+
+#: ../cli/src/common.c:447
+msgid "DHCP client error"
+msgstr "DHCP ક્લાયન્ટ ભૂલ"
+
+#: ../cli/src/common.c:450
+msgid "DHCP client failed"
+msgstr "DHCP ક્લાયન્ટ નિષ્ફળ"
+
+#: ../cli/src/common.c:453
+msgid "Shared connection service failed to start"
+msgstr "શરૂ કરતી વખતે વહેંચાયેલ જોડાણ સેવા નિષ્ફળ"
+
+#: ../cli/src/common.c:456
+msgid "Shared connection service failed"
+msgstr "વહેંચાયેલ જોડાણ સેવા નિષ્ફળ"
+
+#: ../cli/src/common.c:459
+msgid "AutoIP service failed to start"
+msgstr "શરૂ કરવા માટે AutoIP સેવા નિષ્ફળ"
+
+#: ../cli/src/common.c:462
+msgid "AutoIP service error"
+msgstr "AutoIP સેવા ભૂલ"
+
+#: ../cli/src/common.c:465
+msgid "AutoIP service failed"
+msgstr "AutoIP સેવા નિષ્ફળ"
+
+#: ../cli/src/common.c:468
+msgid "The line is busy"
+msgstr "લાઇન વ્યસ્ત છે"
+
+#: ../cli/src/common.c:471
+msgid "No dial tone"
+msgstr "ડાયલ ટોન નથી"
+
+#: ../cli/src/common.c:474
+msgid "No carrier could be established"
+msgstr "કૅરિઅર સ્થાપિત કરી શક્યા નહિં"
+
+#: ../cli/src/common.c:477
+msgid "The dialing request timed out"
+msgstr "ડાયલ કરવાની માંગણીનો સમય સમાપ્ત"
+
+#: ../cli/src/common.c:480
+msgid "The dialing attempt failed"
+msgstr "ડાયલ કરવાનો પ્રયાસ નિષ્ફળ"
+
+#: ../cli/src/common.c:483
+msgid "Modem initialization failed"
+msgstr "મોડેમની શરૂઆત નિષ્ફળ"
+
+#: ../cli/src/common.c:486
+msgid "Failed to select the specified APN"
+msgstr "ખાસ APN ને પસંદ કરવાનું નિષ્ફળ"
+
+#: ../cli/src/common.c:489
+msgid "Not searching for networks"
+msgstr "નેટવર્કો માટે શોધી રહ્યા નથી"
+
+#: ../cli/src/common.c:492
+msgid "Network registration denied"
+msgstr "નામંજૂર થયેલ નેટવર્ક રજીસ્ટ્રેશન"
+
+#: ../cli/src/common.c:495
+msgid "Network registration timed out"
+msgstr "નેટવર્ક રજીસ્ટ્રેશન કરવાનો સમય સમાપ્ત થઇ ગયો"
+
+#: ../cli/src/common.c:498
+msgid "Failed to register with the requested network"
+msgstr "સૂચિત નેટવર્ક સાથે રજીસ્ટર કરવાનું નિષ્ફળ"
+
+#: ../cli/src/common.c:501
+msgid "PIN check failed"
+msgstr "PIN ચકાસણી નિષ્ફળ"
+
+#: ../cli/src/common.c:504
+msgid "Necessary firmware for the device may be missing"
+msgstr "ઉપકરણ માટે જરૂરી ફર્મવેર ગુમ થઇ શકે છે"
+
+#: ../cli/src/common.c:507
+msgid "The device was removed"
+msgstr "જોડાણને દૂર કરાયેલ હતુ"
+
+#: ../cli/src/common.c:510
+msgid "NetworkManager went to sleep"
+msgstr "NetworkManager નિષ્ક્રિય સ્થિતિમાં જતુ રહ્યુ"
+
+#: ../cli/src/common.c:513
+msgid "The device's active connection disappeared"
+msgstr "ઉપકરણનું સક્રિય જોડાણ અદૃશ્ય"
+
+#: ../cli/src/common.c:516
+msgid "Device disconnected by user or client"
+msgstr "વપરાશકર્તા અથવા ક્લાયન્ટ દ્દારા ઉપકરણનું જોડાણ તૂટી ગયુ"
+
+#: ../cli/src/common.c:519
+msgid "Carrier/link changed"
+msgstr "કૅરિઅર/કડી બદલાયેલ છે"
+
+#: ../cli/src/common.c:522
+msgid "The device's existing connection was assumed"
+msgstr "ઉપકરણનાં હાલનાં જોડાણને ધારેલ હતુ"
+
+#: ../cli/src/common.c:525
+msgid "The supplicant is now available"
+msgstr "સપ્લીકન્ટ હવે ઉપલબ્ધ નથી"
+
+#: ../cli/src/common.c:528
+msgid "The modem could not be found"
+msgstr "મોડેમ મળી શકે તેમ નથી"
+
+#: ../cli/src/common.c:531
+msgid "The Bluetooth connection failed or timed out"
+msgstr "બ્લુટુથ જોડાણ નિષ્ફળ અથવા સમયસમાપ્તિ"
+
+#: ../cli/src/common.c:534
+msgid "GSM Modem's SIM card not inserted"
+msgstr "GSM મોડેમનું SIM કાર્ડ દાખલ થયેલ છે"
+
+#: ../cli/src/common.c:537
+msgid "GSM Modem's SIM PIN required"
+msgstr "GSM મોડેમનું SIM PIN જરૂરી છે"
+
+#: ../cli/src/common.c:540
+msgid "GSM Modem's SIM PUK required"
+msgstr "GSM મોડેમનું SIM PUK જરૂરી છે"
+
+#: ../cli/src/common.c:543
+msgid "GSM Modem's SIM wrong"
+msgstr "GSM મોડેમનું SIM ખોટુ છે"
+
+#: ../cli/src/common.c:546
+msgid "InfiniBand device does not support connected mode"
+msgstr "InfiniBand ઉપકરણ જોડાયેલ સ્થિતિને આધાર આપતુ નથી"
+
+#: ../cli/src/common.c:549
+msgid "A dependency of the connection failed"
+msgstr "જોડાણની નિર્ભરતા નિષ્ફળ"
+
+#: ../cli/src/common.c:552
+msgid "A problem with the RFC 2684 Ethernet over ADSL bridge"
+msgstr "ADSL બ્રિજ પર RFC 2684 ઇથરનેટ સાથે સમસ્યા"
+
+#: ../cli/src/common.c:555
+msgid "ModemManager is unavailable"
+msgstr "ModemManager બિનઉપલબ્ધ છે"
+
+#: ../cli/src/common.c:558
+#| msgid "The modem could not be found"
+msgid "The Wi-Fi network could not be found"
+msgstr "Wi-Fi નેટવર્કને શોધી શક્યા નહિં"
+
+#: ../cli/src/common.c:561
+#| msgid "A dependency of the connection failed"
+msgid "A secondary connection of the base connection failed"
+msgstr "મૂળ જોડાણનું ગૌણ જોડાણ નિષ્ફળ"
+
+#: ../cli/src/common.c:564 ../cli/src/devices.c:295 ../cli/src/devices.c:311
+#: ../cli/src/devices.c:433 ../cli/src/devices.c:477
+msgid "Unknown"
+msgstr "અજ્ઞાત"
+
+#. 0
+#. used only for 'GENERAL' group listing
+#: ../cli/src/connections.c:59 ../cli/src/connections.c:129
+#: ../cli/src/devices.c:107 ../cli/src/devices.c:131 ../cli/src/devices.c:141
+#: ../cli/src/devices.c:151 ../cli/src/devices.c:165 ../cli/src/devices.c:179
+#: ../cli/src/devices.c:201 ../cli/src/devices.c:217 ../cli/src/devices.c:226
 msgid "NAME"
 msgstr "NAME"
 
 #. 0
-#: ../cli/src/connections.c:60 ../cli/src/connections.c:75
+#. 1
+#: ../cli/src/connections.c:60 ../cli/src/connections.c:130
 msgid "UUID"
 msgstr "UUID"
 
 #. 1
-#: ../cli/src/connections.c:61
-msgid "DEVICES"
-msgstr "DEVICES"
+#. 0
+#. 1
+#. 2
+#: ../cli/src/connections.c:61 ../cli/src/connections.c:163
+#: ../cli/src/devices.c:71 ../cli/src/devices.c:109 ../cli/src/devices.c:204
+msgid "TYPE"
+msgstr "TYPE"
 
 #. 2
-#: ../cli/src/connections.c:62 ../cli/src/connections.c:77
-msgid "SCOPE"
-msgstr "SCOPE"
+#: ../cli/src/connections.c:62
+msgid "TIMESTAMP"
+msgstr "TIMESTAMP"
 
 #. 3
 #: ../cli/src/connections.c:63
-msgid "DEFAULT"
-msgstr "DEFAULT"
+msgid "TIMESTAMP-REAL"
+msgstr "TIMESTAMP-REAL"
 
 #. 4
-#: ../cli/src/connections.c:64
-msgid "DBUS-SERVICE"
-msgstr "DBUS-SERVICE"
+#. 13
+#: ../cli/src/connections.c:64 ../cli/src/devices.c:121
+msgid "AUTOCONNECT"
+msgstr "AUTOCONNECT"
 
 #. 5
 #: ../cli/src/connections.c:65
+msgid "READONLY"
+msgstr "READONLY"
+
+#. 6
+#. 8
+#. 2
+#. 11
+#. 5
+#: ../cli/src/connections.c:66 ../cli/src/connections.c:137
+#: ../cli/src/devices.c:73 ../cli/src/devices.c:191 ../cli/src/devices.c:207
+msgid "DBUS-PATH"
+msgstr "DBUS-PATH"
+
+#. 2
+#: ../cli/src/connections.c:131
+msgid "DEVICES"
+msgstr "DEVICES"
+
+#. 3
+#. 1
+#. 8
+#. 1
+#: ../cli/src/connections.c:132 ../cli/src/devices.c:72
+#: ../cli/src/devices.c:116 ../cli/src/network-manager.c:39
+msgid "STATE"
+msgstr "STATE"
+
+#. 4
+#: ../cli/src/connections.c:133
+msgid "DEFAULT"
+msgstr "DEFAULT"
+
+#. 5
+#: ../cli/src/connections.c:134
+msgid "DEFAULT6"
+msgstr "DEFAULT6"
+
+#. 6
+#: ../cli/src/connections.c:135
 msgid "SPEC-OBJECT"
 msgstr "SPEC-OBJECT"
 
-#. 6
-#: ../cli/src/connections.c:66
+#. 7
+#. 1
+#: ../cli/src/connections.c:136 ../cli/src/connections.c:150
 msgid "VPN"
 msgstr "VPN"
 
-#. 1
+#. 9
+#: ../cli/src/connections.c:138
+msgid "CON-PATH"
+msgstr "CON-PATH"
+
+#. 10
+#: ../cli/src/connections.c:139
+msgid "ZONE"
+msgstr "ZONE"
+
+#. 11
+#: ../cli/src/connections.c:140
+msgid "MASTER-PATH"
+msgstr "MASTER-PATH"
+
+#: ../cli/src/connections.c:148 ../cli/src/devices.c:82
+msgid "GENERAL"
+msgstr "GENERAL"
+
 #. 0
+#: ../cli/src/connections.c:149
+msgid "IP"
+msgstr "IP"
+
 #. 1
-#: ../cli/src/connections.c:76 ../cli/src/devices.c:61 ../cli/src/devices.c:87
-msgid "TYPE"
-msgstr "TYPE"
+#: ../cli/src/connections.c:164
+msgid "USERNAME"
+msgstr "USERNAME"
+
+#. 2
+#: ../cli/src/connections.c:165
+msgid "GATEWAY"
+msgstr "GATEWAY"
 
 #. 3
-#: ../cli/src/connections.c:78
-msgid "TIMESTAMP"
-msgstr "TIMESTAMP"
+#: ../cli/src/connections.c:166
+msgid "BANNER"
+msgstr "BANNER"
 
 #. 4
-#: ../cli/src/connections.c:79
-msgid "TIMESTAMP-REAL"
-msgstr "TIMESTAMP-REAL"
+#: ../cli/src/connections.c:167
+msgid "VPN-STATE"
+msgstr "VPN-STATE"
 
 #. 5
-#: ../cli/src/connections.c:80
-msgid "AUTOCONNECT"
-msgstr "AUTOCONNECT"
-
-#. 6
-#: ../cli/src/connections.c:81
-msgid "READONLY"
-msgstr "READONLY"
-
-#: ../cli/src/connections.c:157
-#, c-format
+#: ../cli/src/connections.c:168
+msgid "CFG"
+msgstr "CFG"
+
+#: ../cli/src/connections.c:190
+#, c-format
+#| msgid ""
+#| "Usage: nmcli con { COMMAND | help }\n"
+#| "  COMMAND := { list | status | up | down | delete }\n"
+#| "\n"
+#| "  list [id  | uuid ]\n"
+#| "  status [id  | uuid  | path ]\n"
+#| "  up id  | uuid  [iface ] [ap ] [nsp ] [--"
+#| "nowait] [--timeout ]\n"
+#| "  up id  | uuid  [iface ] [ap ] [--nowait] [--"
+#| "timeout ]\n"
+#| "  down id  | uuid \n"
+#| "  delete id  | uuid \n"
 msgid ""
-"Usage: nmcli con { COMMAND | help }\n"
-"  COMMAND := { list | status | up | down }\n"
+"Usage: nmcli connection { COMMAND | help }\n"
+"  COMMAND := { list | status | up | down | delete }\n"
 "\n"
-"  list [id  | uuid  | system | user]\n"
-"  status\n"
-"  up id  | uuid  [iface ] [ap ] [--nowait] [--timeout "
+"  list [id  | uuid ]\n"
+"  status [id  | uuid  | path ]\n"
+"  up id  | uuid  [iface ] [ap ] [nsp ] [--"
+"nowait] [--timeout ]\n"
+"  up id  | uuid  [iface ] [ap ] [--nowait] [--timeout "
 "]\n"
 "  down id  | uuid \n"
+"  delete id  | uuid \n"
+"\n"
 msgstr ""
-"વપરાશ: nmcli con { COMMAND | help }\n"
-"  COMMAND := { list | status | up | down }\n"
+"વપરાશ: nmcli connection { COMMAND | help }\n"
+"  COMMAND := { list | status | up | down | delete }\n"
 "\n"
-"  list [id  | uuid  | system | user]\n"
-"  status\n"
-"  up id  | uuid  [iface ] [ap ] [--nowait] [--timeout "
+"  list [id  | uuid ]\n"
+"  status [id  | uuid  | path ]\n"
+"  up id  | uuid  [iface ] [ap ] [nsp ] [--"
+"nowait] [--timeout ]\n"
+"  up id  | uuid  [iface ] [ap ] [--nowait] [--timeout "
 "]\n"
 "  down id  | uuid \n"
+"  delete id  | uuid \n"
+"\n"
 
-#: ../cli/src/connections.c:197 ../cli/src/connections.c:536
+#: ../cli/src/connections.c:251 ../cli/src/connections.c:611
 #, 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:253 ../cli/src/connections.c:613
 #, c-format
 msgid "Error: 'con list': %s; allowed fields: %s"
 msgstr "ભૂલ: 'con list': %s; માન્ય થયેલ ક્ષેત્રો: %s"
 
-#: ../cli/src/connections.c:207
+#: ../cli/src/connections.c:261
 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:486
 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:487 ../cli/src/connections.c:488
+#: ../cli/src/connections.c:716 ../cli/src/connections.c:717
+#: ../cli/src/connections.c:719 ../cli/src/devices.c:441
+#: ../cli/src/devices.c:494 ../cli/src/devices.c:610 ../cli/src/devices.c:611
+#: ../cli/src/devices.c:612 ../cli/src/devices.c:644 ../cli/src/devices.c:671
+#: ../cli/src/devices.c:672 ../cli/src/devices.c:673 ../cli/src/devices.c:674
+#: ../cli/src/devices.c:675 ../cli/src/network-manager.c:267
+#: ../cli/src/settings.c:712 ../cli/src/settings.c:787
+#: ../cli/src/settings.c:907 ../cli/src/settings.c:1189
+#: ../cli/src/settings.c:1190 ../cli/src/settings.c:1192
+#: ../cli/src/settings.c:1194 ../cli/src/settings.c:1195
+#: ../cli/src/settings.c:1326 ../cli/src/settings.c:1327
+#: ../cli/src/settings.c:1328 ../cli/src/settings.c:1329
+#: ../cli/src/settings.c:1406 ../cli/src/settings.c:1407
+#: ../cli/src/settings.c:1408 ../cli/src/settings.c:1409
+#: ../cli/src/settings.c:1410 ../cli/src/settings.c:1411
+#: ../cli/src/settings.c:1412 ../cli/src/settings.c:1413
+#: ../cli/src/settings.c:1414 ../cli/src/settings.c:1415
+#: ../cli/src/settings.c:1416 ../cli/src/settings.c:1417
+#: ../cli/src/settings.c:1418 ../cli/src/settings.c:1489
 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:487 ../cli/src/connections.c:488
+#: ../cli/src/connections.c:716 ../cli/src/connections.c:717
+#: ../cli/src/connections.c:719 ../cli/src/devices.c:441
+#: ../cli/src/devices.c:494 ../cli/src/devices.c:610 ../cli/src/devices.c:611
+#: ../cli/src/devices.c:612 ../cli/src/devices.c:644 ../cli/src/devices.c:671
+#: ../cli/src/devices.c:672 ../cli/src/devices.c:673 ../cli/src/devices.c:674
+#: ../cli/src/devices.c:675 ../cli/src/network-manager.c:269
+#: ../cli/src/settings.c:712 ../cli/src/settings.c:714
+#: ../cli/src/settings.c:787 ../cli/src/settings.c:907
+#: ../cli/src/settings.c:1189 ../cli/src/settings.c:1190
+#: ../cli/src/settings.c:1192 ../cli/src/settings.c:1194
+#: ../cli/src/settings.c:1195 ../cli/src/settings.c:1326
+#: ../cli/src/settings.c:1327 ../cli/src/settings.c:1328
+#: ../cli/src/settings.c:1329 ../cli/src/settings.c:1406
+#: ../cli/src/settings.c:1407 ../cli/src/settings.c:1408
+#: ../cli/src/settings.c:1409 ../cli/src/settings.c:1410
+#: ../cli/src/settings.c:1411 ../cli/src/settings.c:1412
+#: ../cli/src/settings.c:1413 ../cli/src/settings.c:1414
+#: ../cli/src/settings.c:1415 ../cli/src/settings.c:1416
+#: ../cli/src/settings.c:1417 ../cli/src/settings.c:1418
+#: ../cli/src/settings.c:1489
 msgid "no"
 msgstr "ના"
 
-#: ../cli/src/connections.c:457 ../cli/src/connections.c:500
-msgid "System connections"
-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:562
+msgid "Connection list"
+msgstr "જોડાણ યાદી"
+
+#: ../cli/src/connections.c:575 ../cli/src/connections.c:1112
+#: ../cli/src/connections.c:1650 ../cli/src/connections.c:1665
+#: ../cli/src/connections.c:1674 ../cli/src/connections.c:1684
+#: ../cli/src/connections.c:1696 ../cli/src/connections.c:1804
+#: ../cli/src/connections.c:1906 ../cli/src/devices.c:1122
+#: ../cli/src/devices.c:1132 ../cli/src/devices.c:1250
+#: ../cli/src/devices.c:1258 ../cli/src/devices.c:1622
+#: ../cli/src/devices.c:1629 ../cli/src/devices.c:1643
+#: ../cli/src/devices.c:1650 ../cli/src/devices.c:1667
+#: ../cli/src/devices.c:1678 ../cli/src/devices.c:1899
+#: ../cli/src/devices.c:1906
 #, c-format
 msgid "Error: %s argument is missing."
 msgstr "ભૂલ: %s દલીલ ગેરહાજર છે."
 
-#: ../cli/src/connections.c:487
+#: ../cli/src/connections.c:588
 #, c-format
 msgid "Error: %s - no such connection."
 msgstr "Error: %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:594 ../cli/src/connections.c:1709
+#: ../cli/src/connections.c:1821 ../cli/src/connections.c:1913
+#: ../cli/src/devices.c:906 ../cli/src/devices.c:986 ../cli/src/devices.c:1146
+#: ../cli/src/devices.c:1264 ../cli/src/devices.c:1691
+#: ../cli/src/devices.c:1912
 #, c-format
 msgid "Unknown parameter: %s\n"
 msgstr "અજ્ઞાત પરિમાણ: %s\n"
 
-#: ../cli/src/connections.c:528
+#: ../cli/src/connections.c:603
 #, 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:618 ../cli/src/connections.c:2009
+#: ../cli/src/devices.c:2123 ../cli/src/network-manager.c:599
 #, c-format
 msgid "Error: %s."
 msgstr "ભૂલ: %s."
 
-#: ../cli/src/connections.c:649
-#, c-format
-msgid "Error: 'con status': %s"
-msgstr "ભૂલ: 'con status': %s"
-
-#: ../cli/src/connections.c:651
-#, c-format
-msgid "Error: 'con status': %s; allowed fields: %s"
-msgstr "ભૂલ: 'con status': %s; માન્ય થયેલ ક્ષેત્રો: %s"
-
-#: ../cli/src/connections.c:658
-msgid "Active connections"
-msgstr "સક્રિય જોડાણો"
-
-#: ../cli/src/connections.c:1026
-#, c-format
-msgid "no active connection on device '%s'"
-msgstr "ઉપકરણ '%s' પર સક્રિય જોડાણ નથી"
-
-#: ../cli/src/connections.c:1034
-#, c-format
-msgid "no active connection or device"
-msgstr "સક્રિય જોડાણ અથવા ઉપકરણ નથી"
-
-#: ../cli/src/connections.c:1084
-#, c-format
-msgid "device '%s' not compatible with connection '%s'"
-msgstr "ઉપકરણ '%s' એ જોડાણ '%s' સાથે સુસંગત નથી"
-
-#: ../cli/src/connections.c:1086
-#, c-format
-msgid "no device found for connection '%s'"
-msgstr "જોડાણ '%s' માટે ઉપકરણ મળ્યુ નથી"
-
-#: ../cli/src/connections.c:1097
+#: ../cli/src/connections.c:631
 msgid "activating"
 msgstr "સક્રિય કરી રહ્યા છે"
 
-#: ../cli/src/connections.c:1099
+#: ../cli/src/connections.c:633
 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
-msgid "unknown"
-msgstr "અજ્ઞાત"
-
-#: ../cli/src/connections.c:1111
+#: ../cli/src/connections.c:647
 msgid "VPN connecting (prepare)"
 msgstr "VPN જોડાઇ રહ્યુ છે (તૈયાર કરો)"
 
-#: ../cli/src/connections.c:1113
+#: ../cli/src/connections.c:649
 msgid "VPN connecting (need authentication)"
 msgstr "VPN જોડાઇ રહ્યુ છે (સત્તાધિકરણની જરૂર છે)"
 
-#: ../cli/src/connections.c:1115
+#: ../cli/src/connections.c:651
 msgid "VPN connecting"
 msgstr "VPN જોડાઇ રહ્યુ છે"
 
-#: ../cli/src/connections.c:1117
+#: ../cli/src/connections.c:653
 msgid "VPN connecting (getting IP configuration)"
 msgstr "VPN જોડાઇ રહ્યુ છે (IP રૂપરેખાંકનને મેળવી રહ્યા છે)"
 
-#: ../cli/src/connections.c:1119
+#: ../cli/src/connections.c:655
 msgid "VPN connected"
 msgstr "VPN જોડાયેલ છે"
 
-#: ../cli/src/connections.c:1121
+#: ../cli/src/connections.c:657
 msgid "VPN connection failed"
 msgstr "VPN જોડાણ નિષ્ફળ"
 
-#: ../cli/src/connections.c:1123
+#: ../cli/src/connections.c:659
 msgid "VPN disconnected"
 msgstr "VPN જોડાણ તૂટી ગયુ"
 
-#: ../cli/src/connections.c:1134
+#: ../cli/src/connections.c:712 ../cli/src/connections.c:722
+msgid "N/A"
+msgstr "N/A"
+
+#: ../cli/src/connections.c:916 ../cli/src/connections.c:1140
+#, c-format
+msgid "Error: 'con status': %s"
+msgstr "ભૂલ: 'con status': %s"
+
+#: ../cli/src/connections.c:918 ../cli/src/connections.c:1142
+#, c-format
+msgid "Error: 'con status': %s; allowed fields: %s"
+msgstr "ભૂલ: 'con status': %s; માન્ય થયેલ ક્ષેત્રો: %s"
+
+#: ../cli/src/connections.c:926
+msgid "Active connection details"
+msgstr "સક્રિય જોડાણ વિગતો"
+
+#: ../cli/src/connections.c:1062 ../cli/src/connections.c:1724
+#: ../cli/src/connections.c:1836 ../cli/src/connections.c:1927
+#: ../cli/src/devices.c:933 ../cli/src/devices.c:995 ../cli/src/devices.c:1161
+#: ../cli/src/devices.c:1294 ../cli/src/devices.c:1713
+#: ../cli/src/devices.c:1941 ../cli/src/network-manager.c:311
+#, c-format
+msgid "Error: Can't find out if NetworkManager is running: %s."
+msgstr "ભૂલ: મળી શકતુ નથી જો NetworkManager ચાલી રહ્યુ હોય: %s."
+
+#: ../cli/src/connections.c:1066 ../cli/src/connections.c:1728
+#: ../cli/src/connections.c:1840 ../cli/src/connections.c:1931
+#: ../cli/src/devices.c:937 ../cli/src/devices.c:999 ../cli/src/devices.c:1165
+#: ../cli/src/devices.c:1298 ../cli/src/devices.c:1717
+#: ../cli/src/devices.c:1945 ../cli/src/network-manager.c:315
+#, c-format
+msgid "Error: NetworkManager is not running."
+msgstr "ભૂલ: NetworkManager ચાલી રહ્યુ નથી."
+
+#: ../cli/src/connections.c:1098
+msgid "Active connections"
+msgstr "સક્રિય જોડાણો"
+
+#: ../cli/src/connections.c:1123
+#, c-format
+msgid "Error: '%s' is not an active connection."
+msgstr "ભૂલ: '%s' સક્રિય જોડાણ નથી."
+
+#: ../cli/src/connections.c:1128
+#, c-format
+msgid "Error: unknown parameter: %s"
+msgstr "ભૂલ: અજ્ઞાત પરિમાણ: %s"
+
+#: ../cli/src/connections.c:1235
+#, c-format
+msgid "no active connection on device '%s'"
+msgstr "ઉપકરણ '%s' પર સક્રિય જોડાણ નથી"
+
+#: ../cli/src/connections.c:1243
+msgid "no active connection or device"
+msgstr "સક્રિય જોડાણ અથવા ઉપકરણ નથી"
+
+#: ../cli/src/connections.c:1314
+#, c-format
+msgid "device '%s' not compatible with connection '%s'"
+msgstr "ઉપકરણ '%s' એ જોડાણ '%s' સાથે સુસંગત નથી"
+
+#: ../cli/src/connections.c:1317
+#, c-format
+msgid "no device found for connection '%s'"
+msgstr "જોડાણ '%s' માટે ઉપકરણ મળ્યુ નથી"
+
+#: ../cli/src/connections.c:1329
 msgid "unknown reason"
 msgstr "અજ્ઞાત કારણ"
 
-#: ../cli/src/connections.c:1136
+#: ../cli/src/connections.c:1331
 msgid "none"
 msgstr "કંઇ નહિં"
 
-#: ../cli/src/connections.c:1138
+#: ../cli/src/connections.c:1333
 msgid "the user was disconnected"
 msgstr "વપરાશકર્તાનું જોડાણ તૂટી ગયુ હતુ"
 
-#: ../cli/src/connections.c:1140
+#: ../cli/src/connections.c:1335
 msgid "the base network connection was interrupted"
 msgstr "આધાર નેટવર્ક જોડાણ અવરોધેલ હતુ"
 
-#: ../cli/src/connections.c:1142
+#: ../cli/src/connections.c:1337
 msgid "the VPN service stopped unexpectedly"
 msgstr "VPN સેવા અનિચ્છનિય રીતે બંધ થયેલ છે"
 
-#: ../cli/src/connections.c:1144
+#: ../cli/src/connections.c:1339
 msgid "the VPN service returned invalid configuration"
 msgstr "VPN સેવા એ અયોગ્ય રૂપરેખાંકનને પાછુ મેળવેલ છે"
 
-#: ../cli/src/connections.c:1146
+#: ../cli/src/connections.c:1341
 msgid "the connection attempt timed out"
 msgstr "જોડાણનો પ્રયત્ન કરવાનો સમય સમાપ્ત થઇ ગયો"
 
-#: ../cli/src/connections.c:1148
+#: ../cli/src/connections.c:1343
 msgid "the VPN service did not start in time"
 msgstr "VPN સેવા એ સમય પર શરૂ થઇ ન હતી"
 
-#: ../cli/src/connections.c:1150
+#: ../cli/src/connections.c:1345
 msgid "the VPN service failed to start"
 msgstr "શરૂ કરતી વખતે VPN સેવા નિષ્ફળ"
 
-#: ../cli/src/connections.c:1152
+#: ../cli/src/connections.c:1347
 msgid "no valid VPN secrets"
 msgstr "યોગ્ય VPN ખાનગીઓ નથી"
 
-#: ../cli/src/connections.c:1154
+#: ../cli/src/connections.c:1349
 msgid "invalid VPN secrets"
 msgstr "અયોગ્ય VPN ખાનગીપણા"
 
-#: ../cli/src/connections.c:1156
+#: ../cli/src/connections.c:1351
 msgid "the connection was removed"
 msgstr "જોડાણને દૂર કરાયેલ હતુ"
 
-#: ../cli/src/connections.c:1170
-#, c-format
-msgid "state: %s\n"
-msgstr "પરિસ્થિતિ: %s\n"
-
-#: ../cli/src/connections.c:1173 ../cli/src/connections.c:1199
+#: ../cli/src/connections.c:1368 ../cli/src/connections.c:1573
 #, c-format
-msgid "Connection activated\n"
-msgstr "સક્રિય થયેલ જોડાણ\n"
+msgid "Connection successfully activated (D-Bus active path: %s)\n"
+msgstr "જોડાણ સફળતાપૂર્વક સક્રિય થયેલ છે (D-Bus સક્રિય પાથ: %s)\n"
 
-#: ../cli/src/connections.c:1176
+#. Active connection failed and dissapeared, quit.
+#: ../cli/src/connections.c:1373 ../cli/src/connections.c:1474
 #, c-format
 msgid "Error: Connection activation failed."
 msgstr "ભૂલ: જોડાણ સક્રિય કરવાનું નિષ્ફળ."
 
-#: ../cli/src/connections.c:1195
+#: ../cli/src/connections.c:1398
 #, c-format
-msgid "state: %s (%d)\n"
-msgstr "પરિસ્થિતિ: %s (%d)\n"
+msgid "VPN connection successfully activated (D-Bus active path: %s)\n"
+msgstr "VPN જોડાણ સફળતાપૂર્વક સક્રિય થયેલ છે (D-Bus સક્રિય પાથ: %s)\n"
 
-#: ../cli/src/connections.c:1205
+#: ../cli/src/connections.c:1406
 #, c-format
 msgid "Error: Connection activation failed: %s."
 msgstr "ભૂલ: જોડાણ સક્રિય કરવાનું નિષ્ફળ: %s."
 
-#: ../cli/src/connections.c:1222 ../cli/src/devices.c:811
+#: ../cli/src/connections.c:1503 ../cli/src/devices.c:1055
 #, c-format
 msgid "Error: Timeout %d sec expired."
 msgstr "ભૂલ: સમયસમાપ્તિ %d સેકંડ નો સમય સમાપ્ત થઇ ગયો."
 
-#: ../cli/src/connections.c:1265
+#: ../cli/src/connections.c:1564
 #, 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
-#, c-format
-msgid "Active connection state: %s\n"
-msgstr "સક્રિય જોડાણ પરિસ્થિતિ: %s\n"
-
-#: ../cli/src/connections.c:1289
-#, 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:1658 ../cli/src/connections.c:1812
+#: ../cli/src/connections.c:1940
 #, c-format
 msgid "Error: Unknown connection: %s."
 msgstr "ભૂલ: અજ્ઞાત જોડાણ: %s."
 
-#: ../cli/src/connections.c:1378 ../cli/src/devices.c:882
+#: ../cli/src/connections.c:1704 ../cli/src/devices.c:1140
+#: ../cli/src/devices.c:1686
 #, 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:1717 ../cli/src/connections.c:1829
+#: ../cli/src/connections.c:1920
 #, c-format
 msgid "Error: id or uuid has to be specified."
 msgstr "ભૂલ: id અથવા uuid ને સ્પષ્ટ કરવુ જ પડશે."
 
-#: ../cli/src/connections.c:1411
+#: ../cli/src/connections.c:1749
 #, c-format
 msgid "Error: No suitable device found: %s."
 msgstr "ભૂલ: સુસંગત ઉપકરણ મળ્યુ નથી: %s."
 
-#: ../cli/src/connections.c:1413
+#: ../cli/src/connections.c:1751
 #, c-format
 msgid "Error: No suitable device found."
 msgstr "ભૂલ: સુસંગત ઉપકરણ મળ્યુ નથી."
 
-#: ../cli/src/connections.c:1505
+#: ../cli/src/connections.c:1865
 #, c-format
 msgid "Warning: Connection not active\n"
 msgstr "ચેતવણી: જોડાણ સક્રિય થયેલ નથી\n"
 
-#: ../cli/src/connections.c:1561
+#: ../cli/src/connections.c:1879
+#, c-format
+msgid "Error: Connection deletion failed: %s"
+msgstr "ભૂલ: જોડાણ નિરાકરણ નિષ્ફળ: %s"
+
+#: ../cli/src/connections.c:2000
 #, c-format
 msgid "Error: 'con' command '%s' is not valid."
 msgstr "ભૂલ: 'con' આદેશ '%s' યોગ્ય નથી."
 
-#: ../cli/src/connections.c:1597
+#: ../cli/src/connections.c:2068
 #, c-format
 msgid "Error: could not connect to D-Bus."
 msgstr "ભૂલ: D-Bus નું જોડાણ કરી શક્યા નહિં."
 
-#: ../cli/src/connections.c:1604
+#: ../cli/src/connections.c:2076
 #, c-format
 msgid "Error: Could not get system settings."
 msgstr "ભૂલ: સિસ્ટમ સુયોજનોને મેળવી શક્યા નથી."
 
-#: ../cli/src/connections.c:1612
+#: ../cli/src/connections.c:2086
 #, 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."
+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:70 ../cli/src/devices.c:108 ../cli/src/devices.c:189
+#: ../cli/src/devices.c:205
 msgid "DEVICE"
 msgstr "DEVICE"
 
-#. 1
-#. 4
 #. 0
-#: ../cli/src/devices.c:62 ../cli/src/devices.c:90
-#: ../cli/src/network-manager.c:36
-msgid "STATE"
-msgstr "STATE"
-
-#: ../cli/src/devices.c:71
-msgid "GENERAL"
-msgstr "GENERAL"
-
-#. 0
-#: ../cli/src/devices.c:72
+#: ../cli/src/devices.c:83
 msgid "CAPABILITIES"
 msgstr "CAPABILITIES"
 
 #. 1
-#: ../cli/src/devices.c:73
+#: ../cli/src/devices.c:84
 msgid "WIFI-PROPERTIES"
 msgstr "WIFI-PROPERTIES"
 
 #. 2
-#: ../cli/src/devices.c:74
+#: ../cli/src/devices.c:85
 msgid "AP"
 msgstr "AP"
 
 #. 3
-#: ../cli/src/devices.c:75
+#: ../cli/src/devices.c:86
 msgid "WIRED-PROPERTIES"
 msgstr "WIRED-PROPERTIES"
 
 #. 4
-#: ../cli/src/devices.c:76
-msgid "IP4-SETTINGS"
-msgstr "IP4-SETTINGS"
+#: ../cli/src/devices.c:87
+msgid "WIMAX-PROPERTIES"
+msgstr "WIMAX-PROPERTIES"
 
 #. 5
-#: ../cli/src/devices.c:77
-msgid "IP4-DNS"
-msgstr "IP4-DNS"
+#. 0
+#: ../cli/src/devices.c:88 ../cli/src/devices.c:202
+msgid "NSP"
+msgstr "NSP"
+
+#. 6
+#: ../cli/src/devices.c:89
+msgid "IP4"
+msgstr "IP4"
+
+#. 7
+#: ../cli/src/devices.c:90
+msgid "DHCP4"
+msgstr "DHCP4"
+
+#. 8
+#: ../cli/src/devices.c:91
+msgid "IP6"
+msgstr "IP6"
+
+#. 9
+#: ../cli/src/devices.c:92
+msgid "DHCP6"
+msgstr "DHCP6"
+
+#. 10
+#: ../cli/src/devices.c:93
+msgid "BOND"
+msgstr "BOND"
+
+#. 11
+#: ../cli/src/devices.c:94
+msgid "VLAN"
+msgstr "VLAN"
 
 #. 2
-#: ../cli/src/devices.c:88
+#: ../cli/src/devices.c:110
+msgid "VENDOR"
+msgstr "VENDOR"
+
+#. 3
+#: ../cli/src/devices.c:111
+msgid "PRODUCT"
+msgstr "PRODUCT"
+
+#. 4
+#: ../cli/src/devices.c:112
 msgid "DRIVER"
 msgstr "DRIVER"
 
-#. 3
-#: ../cli/src/devices.c:89
+#. 5
+#: ../cli/src/devices.c:113
+msgid "DRIVER-VERSION"
+msgstr "DRIVER-VERSION"
+
+#. 6
+#: ../cli/src/devices.c:114
+msgid "FIRMWARE-VERSION"
+msgstr "FIRMWARE-VERSION"
+
+#. 7
+#: ../cli/src/devices.c:115
 msgid "HWADDR"
 msgstr "HWADDR"
 
+#. 9
+#: ../cli/src/devices.c:117
+msgid "REASON"
+msgstr "REASON"
+
+#. 10
+#: ../cli/src/devices.c:118
+msgid "UDI"
+msgstr "UDI"
+
+#. 11
+#: ../cli/src/devices.c:119
+msgid "IP-IFACE"
+msgstr "IP-IFACE"
+
+#. 12
+#: ../cli/src/devices.c:120
+msgid "NM-MANAGED"
+msgstr "NM-MANAGED"
+
+#. 14
+#: ../cli/src/devices.c:122
+msgid "FIRMWARE-MISSING"
+msgstr "FIRMWARE-MISSING"
+
+#. 15
+#: ../cli/src/devices.c:123
+msgid "CONNECTION"
+msgstr "CONNECTION"
+
 #. 0
-#: ../cli/src/devices.c:99
+#: ../cli/src/devices.c:132
 msgid "CARRIER-DETECT"
 msgstr "CARRIER-DETECT"
 
 #. 1
-#: ../cli/src/devices.c:100
+#: ../cli/src/devices.c:133
 msgid "SPEED"
 msgstr "SPEED"
 
 #. 0
-#: ../cli/src/devices.c:109
+#: ../cli/src/devices.c:142
 msgid "CARRIER"
 msgstr "CARRIER"
 
 #. 0
-#: ../cli/src/devices.c:119
+#: ../cli/src/devices.c:152
 msgid "WEP"
 msgstr "WEP"
 
 #. 1
-#: ../cli/src/devices.c:120
+#: ../cli/src/devices.c:153
 msgid "WPA"
 msgstr "WPA"
 
 #. 2
-#: ../cli/src/devices.c:121
+#: ../cli/src/devices.c:154
 msgid "WPA2"
 msgstr "WPA2"
 
 #. 3
-#: ../cli/src/devices.c:122
+#: ../cli/src/devices.c:155
 msgid "TKIP"
 msgstr "TKIP"
 
 #. 4
-#: ../cli/src/devices.c:123
+#: ../cli/src/devices.c:156
 msgid "CCMP"
 msgstr "CCMP"
 
 #. 0
-#: ../cli/src/devices.c:132
-msgid "ADDRESS"
-msgstr "ADDRESS"
+#: ../cli/src/devices.c:166
+msgid "CTR-FREQ"
+msgstr "CTR-FREQ"
 
 #. 1
-#: ../cli/src/devices.c:133
-msgid "PREFIX"
-msgstr "PREFIX"
+#: ../cli/src/devices.c:167
+msgid "RSSI"
+msgstr "RSSI"
 
 #. 2
-#: ../cli/src/devices.c:134
-msgid "GATEWAY"
-msgstr "GATEWAY"
+#: ../cli/src/devices.c:168
+msgid "CINR"
+msgstr "CINR"
 
-#. 0
-#: ../cli/src/devices.c:143
-msgid "DNS"
-msgstr "DNS"
+#. 3
+#: ../cli/src/devices.c:169
+msgid "TX-POW"
+msgstr "TX-POW"
+
+#. 4
+#: ../cli/src/devices.c:170
+msgid "BSID"
+msgstr "BSID"
 
 #. 0
-#: ../cli/src/devices.c:153
+#: ../cli/src/devices.c:180
 msgid "SSID"
 msgstr "SSID"
 
 #. 1
-#: ../cli/src/devices.c:154
+#: ../cli/src/devices.c:181
 msgid "BSSID"
 msgstr "BSSID"
 
 #. 2
-#: ../cli/src/devices.c:155
+#: ../cli/src/devices.c:182
 msgid "MODE"
 msgstr "MODE"
 
 #. 3
-#: ../cli/src/devices.c:156
+#: ../cli/src/devices.c:183
 msgid "FREQ"
 msgstr "FREQ"
 
 #. 4
-#: ../cli/src/devices.c:157
+#: ../cli/src/devices.c:184
 msgid "RATE"
 msgstr "RATE"
 
 #. 5
-#: ../cli/src/devices.c:158
+#. 1
+#: ../cli/src/devices.c:185 ../cli/src/devices.c:203
 msgid "SIGNAL"
 msgstr "SIGNAL"
 
 #. 6
-#: ../cli/src/devices.c:159
+#: ../cli/src/devices.c:186
 msgid "SECURITY"
 msgstr "SECURITY"
 
 #. 7
-#: ../cli/src/devices.c:160
+#: ../cli/src/devices.c:187
 msgid "WPA-FLAGS"
 msgstr "WPA-FLAGS"
 
 #. 8
-#: ../cli/src/devices.c:161
+#: ../cli/src/devices.c:188
 msgid "RSN-FLAGS"
 msgstr "RSN-FLAGS"
 
 #. 10
-#: ../cli/src/devices.c:163
+#. 4
+#: ../cli/src/devices.c:190 ../cli/src/devices.c:206
 msgid "ACTIVE"
 msgstr "ACTIVE"
 
-#: ../cli/src/devices.c:186
-#, c-format
+#. 0
+#: ../cli/src/devices.c:218
+msgid "SLAVES"
+msgstr "SLAVES"
+
+#. 0
+#: ../cli/src/devices.c:227
+#| msgid "UUID"
+msgid "ID"
+msgstr "ID"
+
+#: ../cli/src/devices.c:243
+#, 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 ]\n"
+#| "  disconnect iface  [--nowait] [--timeout ]\n"
+#| "  wifi [list [iface ] [bssid ]]\n"
+#| "  wifi connect <(B)SSID> [password ] [wep-key-type key|phrase] "
+#| "[iface ] [bssid ] [name ]\n"
+#| "               [--private] [--nowait] [--timeout ]\n"
+#| "  wimax [list [iface ] [nsp ]]\n"
+#| "\n"
 msgid ""
-"Usage: nmcli dev { COMMAND | help }\n"
+"Usage: nmcli device { COMMAND | help }\n"
+"\n"
+"  COMMAND := { status | list | disconnect | wifi | wimax }\n"
 "\n"
 "  COMMAND := { status | list | disconnect | wifi }\n"
 "\n"
 "  status\n"
 "  list [iface ]\n"
 "  disconnect iface  [--nowait] [--timeout ]\n"
-"  wifi [list [iface ] [hwaddr ]]\n"
+"  wifi [list [iface ] [bssid ]]\n"
+"  wifi connect <(B)SSID> [password ] [wep-key-type key|phrase] "
+"[iface ] [bssid ] [name ]\n"
+"               [--private] [--nowait] [--timeout ]\n"
+"  wimax [list [iface ] [nsp ]]\n"
 "\n"
 msgstr ""
-"વપરાશ: nmcli dev { COMMAND | help }\n"
+"વપરાશ: nmcli device { COMMAND | help }\n"
+"\n"
+"  COMMAND := { status | list | disconnect | wifi | wimax }\n"
 "\n"
 "  COMMAND := { status | list | disconnect | wifi }\n"
 "\n"
 "  status\n"
 "  list [iface ]\n"
 "  disconnect iface  [--nowait] [--timeout ]\n"
-"  wifi [list [iface ] [hwaddr ]]\n"
+"  wifi [list [iface ] [bssid ]]\n"
+"  wifi connect <(B)SSID> [password ] [wep-key-type key|phrase] "
+"[iface ] [bssid ] [name ]\n"
+"               [--private] [--nowait] [--timeout ]\n"
+"  wimax [list [iface ] [nsp ]]\n"
 "\n"
 
-#: ../cli/src/devices.c:206
-msgid "unmanaged"
-msgstr "અસંચાલિત થયેલ"
-
-#: ../cli/src/devices.c:208
-msgid "unavailable"
-msgstr "ઉપલબ્ધ નથી"
-
-#: ../cli/src/devices.c:210 ../cli/src/network-manager.c:89
-msgid "disconnected"
-msgstr "તૂટેલ જોડાણ"
-
-#: ../cli/src/devices.c:212
-msgid "connecting (prepare)"
-msgstr "જોડાઇ રહ્યા છે (તૈયાર કરો)"
-
-#: ../cli/src/devices.c:214
-msgid "connecting (configuring)"
-msgstr "જોડાઇ રહ્યા છે (રૂપરેખાંકિત કરી રહ્યા છે)"
-
-#: ../cli/src/devices.c:216
-msgid "connecting (need authentication)"
-msgstr "જોડાઇ રહ્યા છે (સત્તાધિકરણની જરૂર છે)"
-
-#: ../cli/src/devices.c:218
-msgid "connecting (getting IP configuration)"
-msgstr "જોડાઇ રહ્યા છે (IP રૂપરેખાંકનને મેળવી રહ્યા છે)"
-
-#: ../cli/src/devices.c:220 ../cli/src/network-manager.c:87
-msgid "connected"
-msgstr "જોડાયેલ"
-
-#: ../cli/src/devices.c:222
-msgid "connection failed"
-msgstr "જોડાણ નિષ્ફળ"
-
-#: ../cli/src/devices.c:245 ../cli/src/devices.c:380
-msgid "Unknown"
-msgstr "અજ્ઞાત"
-
-#: ../cli/src/devices.c:277
+#: ../cli/src/devices.c:344
 msgid "(none)"
 msgstr "(કંઇ નહિં)"
 
-#: ../cli/src/devices.c:302
-#, c-format
-msgid "%s: error converting IP4 address 0x%X"
-msgstr "%s: ભૂલ એ IP4 સરનામા 0x%X માં રૂપાંતર થઇ રહી છે"
-
-#: ../cli/src/devices.c:349
+#: ../cli/src/devices.c:400
 #, c-format
 msgid "%u MHz"
 msgstr "%u MHz"
 
-#: ../cli/src/devices.c:350
+#: ../cli/src/devices.c:401
 #, c-format
 msgid "%u MB/s"
 msgstr "%u MB/s"
 
-#: ../cli/src/devices.c:359
+#: ../cli/src/devices.c:410
 msgid "Encrypted: "
 msgstr "એનક્રિપ્ટ થયેલ: "
 
-#: ../cli/src/devices.c:364
+#: ../cli/src/devices.c:415
 msgid "WEP "
 msgstr "WEP "
 
-#: ../cli/src/devices.c:366
+#: ../cli/src/devices.c:417
 msgid "WPA "
 msgstr "WPA "
 
-#: ../cli/src/devices.c:368
+#: ../cli/src/devices.c:419
 msgid "WPA2 "
 msgstr "WPA2 "
 
-#: ../cli/src/devices.c:371
+#: ../cli/src/devices.c:422
 msgid "Enterprise "
 msgstr "Enterprise "
 
-#: ../cli/src/devices.c:380
+#: ../cli/src/devices.c:431
 msgid "Ad-Hoc"
 msgstr "Ad-Hoc"
 
-#: ../cli/src/devices.c:380
+#: ../cli/src/devices.c:432
 msgid "Infrastructure"
 msgstr "ઇન્ફ્રાસ્ટ્રક્ચર"
 
-#: ../cli/src/devices.c:442
+#: ../cli/src/devices.c:468
+msgid "Home"
+msgstr "ઘર"
+
+#: ../cli/src/devices.c:471
+msgid "Partner"
+msgstr "ભાગીદાર"
+
+#: ../cli/src/devices.c:474
+msgid "Roaming"
+msgstr "ફરવુ"
+
+#: ../cli/src/devices.c:546
 #, c-format
 msgid "Error: 'dev list': %s"
 msgstr "ભૂલ: 'dev list': %s"
 
-#: ../cli/src/devices.c:444
+#: ../cli/src/devices.c:548
 #, c-format
 msgid "Error: 'dev list': %s; allowed fields: %s"
 msgstr "ભૂલ: 'dev list': %s; માન્ય થયેલ ક્ષેત્રો: %s"
 
-#: ../cli/src/devices.c:453
+#: ../cli/src/devices.c:557
 msgid "Device details"
 msgstr "ઉપકરણ વિગતો"
 
-#: ../cli/src/devices.c:483 ../cli/src/devices.c:827
+#: ../cli/src/devices.c:602 ../cli/src/devices.c:605 ../cli/src/devices.c:1081
+#: ../cli/src/utils.c:477
 msgid "(unknown)"
 msgstr "(અજ્ઞાત)"
 
-#: ../cli/src/devices.c:484
-msgid "unknown)"
-msgstr "અજ્ઞાત)"
+#: ../cli/src/devices.c:614
+msgid "not connected"
+msgstr "જોડાયેલ નથી"
 
-#: ../cli/src/devices.c:510
+#: ../cli/src/devices.c:641
 #, c-format
 msgid "%u Mb/s"
 msgstr "%u Mb/s"
 
 #. Print header
 #. "WIRED-PROPERTIES"
-#: ../cli/src/devices.c:583
+#: ../cli/src/devices.c:715
 msgid "on"
 msgstr "ચાલુ"
 
-#: ../cli/src/devices.c:583
+#: ../cli/src/devices.c:715
 msgid "off"
 msgstr "બંધ"
 
-#: ../cli/src/devices.c:710
+#: ../cli/src/devices.c:923
 #, c-format
 msgid "Error: 'dev status': %s"
 msgstr "ભૂલ: 'dev status': %s"
 
-#: ../cli/src/devices.c:712
+#: ../cli/src/devices.c:925
 #, c-format
 msgid "Error: 'dev status': %s; allowed fields: %s"
 msgstr "ભૂલ: 'dev status': %s; માન્ય થયેલ ક્ષેત્રો: %s"
 
-#: ../cli/src/devices.c:719
+#: ../cli/src/devices.c:948
 msgid "Status of devices"
 msgstr "ઉપકરણોની પરિસ્થિતિ"
 
-#: ../cli/src/devices.c:747
+#: ../cli/src/devices.c:979
 #, 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:1020 ../cli/src/devices.c:1185
+#: ../cli/src/devices.c:1326 ../cli/src/devices.c:1973
 #, c-format
 msgid "Error: Device '%s' not found."
 msgstr "ભૂલ: ઉપકરણ '%s' મળ્યુ નથી."
 
-#: ../cli/src/devices.c:799
+#: ../cli/src/devices.c:1043
 #, c-format
 msgid "Success: Device '%s' successfully disconnected."
 msgstr "સફળ: ઉપકરણ '%s' નું સફળતાપૂર્વક જોડાણ તૂટી ગયુ."
 
-#: ../cli/src/devices.c:824
+#: ../cli/src/devices.c:1078
 #, c-format
 msgid "Error: Device '%s' (%s) disconnecting failed: %s"
 msgstr "ભૂલ: ઉપકરણ '%s' (%s) નું જોડાણ તૂટવામાં નિષ્ફળતા: %s"
 
-#: ../cli/src/devices.c:832
+#: ../cli/src/devices.c:1091
 #, c-format
-msgid "Device state: %d (%s)\n"
-msgstr "ઉપકરણ પરિસ્થિતિ: %d (%s)\n"
+msgid "Device '%s' has been disconnected.\n"
+msgstr "ઉપકરણ '%s' નું સફળતાપૂર્વક જોડાણ તૂટી ગયુ.\n"
 
-#: ../cli/src/devices.c:896
+#: ../cli/src/devices.c:1154
 #, c-format
 msgid "Error: iface has to be specified."
 msgstr "ભૂલ: iface ને સ્પષ્ટ કરવુ જ પડશે."
 
-#: ../cli/src/devices.c:1011
+#: ../cli/src/devices.c:1284
 #, c-format
 msgid "Error: 'dev wifi': %s"
 msgstr "ભૂલ: 'dev wifi': %s"
 
-#: ../cli/src/devices.c:1013
+#: ../cli/src/devices.c:1286
 #, c-format
 msgid "Error: 'dev wifi': %s; allowed fields: %s"
 msgstr "ભૂલ: 'dev wifi': %s; માન્ય થયેલ ક્ષેત્રો: %s"
 
-#: ../cli/src/devices.c:1020
+#: ../cli/src/devices.c:1309
 msgid "WiFi scan list"
 msgstr "WiFi સ્કેન યાદી"
 
-#: ../cli/src/devices.c:1055 ../cli/src/devices.c:1109
+#: ../cli/src/devices.c:1346 ../cli/src/devices.c:1400
 #, c-format
-msgid "Error: Access point with hwaddr '%s' not found."
-msgstr "ભૂલ: hwaddr '%s' સાથે પ્રવેશ બિંદુ મળ્યુ નથી."
+msgid "Error: Access point with bssid '%s' not found."
+msgstr "ભૂલ: bssid '%s' સાથે પ્રવેશ બિંદુ મળ્યુ નથી."
 
-#: ../cli/src/devices.c:1072
+#: ../cli/src/devices.c:1363
 #, c-format
 msgid "Error: Device '%s' is not a WiFi device."
 msgstr "ભૂલ: ઉપકરણ '%s' એ WiFi ઉપકરણ નથી."
 
-#: ../cli/src/devices.c:1136
+#: ../cli/src/devices.c:1431 ../cli/src/devices.c:1477
+#, c-format
+msgid "Connection with UUID '%s' created and activated on device '%s'\n"
+msgstr "UUID '%s' સાથે જોડાણ બનાવેલ છે અને ઉપકરણ '%s' પર સક્રિય થયેલ છે\n"
+
+#: ../cli/src/devices.c:1436
+#, c-format
+msgid "Error: Connection activation failed: (%d) %s."
+msgstr "ભૂલ: જોડાણ સક્રિય કરવાનું નિષ્ફળ: (%d) %s."
+
+#: ../cli/src/devices.c:1461
+#, c-format
+msgid "Error: Failed to add/activate new connection: (%d) %s"
+msgstr "ભૂલ: નવાં જોડાણ ઉમેરવા/સક્રિય કરવાનું નિષ્ફળ: (%d) %s"
+
+#: ../cli/src/devices.c:1469
+#, c-format
+msgid "Error: Failed to add/activate new connection: Unknown error"
+msgstr "ભૂલ: નવાં જોડાણને ઉમેરવાનું/સક્રિય કરવામાં નિષ્ફળ: અજ્ઞાત ભૂલ"
+
+#: ../cli/src/devices.c:1613
+#, c-format
+msgid "Error: SSID or BSSID are missing."
+msgstr "ભૂલ: SSID અથવા BSSID ગુમ થયેલ છે."
+
+#: ../cli/src/devices.c:1636
+#, c-format
+msgid "Error: bssid argument value '%s' is not a valid BSSID."
+msgstr "ભૂલ: bssid દલીલ કિંમત '%s' એ માન્ય BSSID નથી."
+
+#: ../cli/src/devices.c:1660
+#, c-format
+msgid "Error: wep-key-type argument value '%s' is invalid, use 'key' or 'phrase'."
+msgstr "ભૂલ: wep-key-type દલીલ કિંમત '%s' અયોગ્ય છે, 'key' અથવા 'phrase' ને વાપરો."
+
+#: ../cli/src/devices.c:1700
+#, c-format
+msgid "Error: BSSID to connect to (%s) differs from bssid argument (%s)."
+msgstr "ભૂલ: (%s) માં BSSID સાથે જોડાવું bssid દલીલમાંથી અલગ પડે છે (%s)."
+
+#: ../cli/src/devices.c:1706
+#, c-format
+msgid "Error: Parameter '%s' is neither SSID nor BSSID."
+msgstr "ભૂલ: પરિમાણ '%s' ક્યાંતો SSID અથવા BSSID નથી."
+
+#: ../cli/src/devices.c:1735
+#, c-format
+msgid "Error: Device '%s' is not a Wi-Fi device."
+msgstr "ભૂલ: ઉપકરણ '%s' એ WiFi ઉપકરણ નથી."
+
+#: ../cli/src/devices.c:1737
+#, c-format
+msgid "Error: No Wi-Fi device found."
+msgstr "ભૂલ: Wi-Fi ઉપકરણ મળ્યુ નથી."
+
+#: ../cli/src/devices.c:1755
+#, c-format
+msgid "Error: No network with SSID '%s' found."
+msgstr "ભૂલ: SSID '%s' સાથે નેટવર્ક મળ્યુ નથી."
+
+#: ../cli/src/devices.c:1757
+#, c-format
+msgid "Error: No access point with BSSID '%s' found."
+msgstr "ભૂલ: BSSID '%s' સાથે પ્રવેશ બિંદુ મળ્યુ નથી."
+
+#: ../cli/src/devices.c:1855
 #, c-format
 msgid "Error: 'dev wifi' command '%s' is not valid."
 msgstr "ભૂલ: 'dev wifi' આદેશ '%s' યોગ્ય નથી."
 
-#: ../cli/src/devices.c:1183
+#: ../cli/src/devices.c:1931
+#, c-format
+msgid "Error: 'dev wimax': %s"
+msgstr "ભૂલ: 'dev wimax': %s"
+
+#: ../cli/src/devices.c:1933
+#, c-format
+msgid "Error: 'dev wimax': %s; allowed fields: %s"
+msgstr "ભૂલ: 'dev wimax': %s; માન્ય થયેલ ક્ષેત્રો: %s"
+
+#: ../cli/src/devices.c:1956
+msgid "WiMAX NSP list"
+msgstr "WiMAX NSP યાદી"
+
+#: ../cli/src/devices.c:1993
+#, c-format
+msgid "Error: NSP with name '%s' not found."
+msgstr "ભૂલ: નામ '%s' સાથે NSP મળ્યુ નથી."
+
+#: ../cli/src/devices.c:2004
+#, c-format
+msgid "Error: Device '%s' is not a WiMAX device."
+msgstr "ભૂલ: ઉપકરણ '%s' WiMAX ઉપકરણ નથી."
+
+#: ../cli/src/devices.c:2035
+#, c-format
+msgid "Error: Access point with nsp '%s' not found."
+msgstr "ભૂલ: nsp '%s' સાથે પ્રવેશ બિંદુ મળ્યુ નથી."
+
+#: ../cli/src/devices.c:2062
+#, c-format
+msgid "Error: 'dev wimax' command '%s' is not valid."
+msgstr "ભૂલ: 'dev wimax' આદેશ '%s' માન્ય નથી."
+
+#: ../cli/src/devices.c:2115
 #, 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"
 
+#. 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:62
+msgid "PERMISSION"
+msgstr "PERMISSION"
+
+#. 0
+#: ../cli/src/network-manager.c:63
+msgid "VALUE"
+msgstr "VALUE"
+
+#: ../cli/src/network-manager.c:77
 #, c-format
 msgid ""
 "Usage: nmcli nm { COMMAND | help }\n"
 "\n"
-"  COMMAND := { status | sleep | wakeup | wifi | wwan }\n"
+"  COMMAND := { status | permissions | enable | sleep | wifi | wwan | "
+"wimax }\n"
+"\n"
+"  COMMAND := { status | permissions | enable | sleep | wifi | wwan }\n"
 "\n"
 "  status\n"
-"  sleep\n"
-"  wakeup\n"
+"  permissions\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 | permissions | enable | sleep | wifi | wwan | "
+"wimax }\n"
+"\n"
+"  COMMAND := { status | permissions | enable | sleep | wifi | wwan }\n"
 "\n"
 "  status\n"
-"  sleep\n"
-"  wakeup\n"
+"  permissions\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:108
 msgid "asleep"
 msgstr "સૂતેલું"
 
-#: ../cli/src/network-manager.c:85
+#: ../cli/src/network-manager.c:110
 msgid "connecting"
 msgstr "જોડાઇ રહ્યા છે"
 
-#: ../cli/src/network-manager.c:125
+#: ../cli/src/network-manager.c:112
+msgid "connected (local only)"
+msgstr "જોડાયેલ (ફક્ત સ્થાનિક)"
+
+#: ../cli/src/network-manager.c:114
+msgid "connected (site only)"
+msgstr "જોડાયેલ (ફક્ત સાઇટ)"
+
+#: ../cli/src/network-manager.c:118
+msgid "disconnecting"
+msgstr "જોડાઇ તૂટી રહ્યુ છે"
+
+#: ../cli/src/network-manager.c:158
 #, c-format
 msgid "Error: 'nm status': %s"
 msgstr "ભૂલ: 'nm status': %s"
 
-#: ../cli/src/network-manager.c:127
+#: ../cli/src/network-manager.c:160
 #, 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:173 ../cli/src/network-manager.c:174
+#: ../cli/src/network-manager.c:175 ../cli/src/network-manager.c:176
+#: ../cli/src/network-manager.c:177 ../cli/src/network-manager.c:179
+#: ../cli/src/network-manager.c:180 ../cli/src/network-manager.c:429
+#: ../cli/src/network-manager.c:484 ../cli/src/network-manager.c:522
+#: ../cli/src/network-manager.c:561
 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:173 ../cli/src/network-manager.c:174
+#: ../cli/src/network-manager.c:175 ../cli/src/network-manager.c:176
+#: ../cli/src/network-manager.c:177 ../cli/src/network-manager.c:179
+#: ../cli/src/network-manager.c:180 ../cli/src/network-manager.c:429
+#: ../cli/src/network-manager.c:484 ../cli/src/network-manager.c:522
+#: ../cli/src/network-manager.c:561
 msgid "disabled"
 msgstr "નિષ્ક્રિય થયેલ"
 
-#: ../cli/src/network-manager.c:148
+#: ../cli/src/network-manager.c:193
+msgid "NetworkManager status"
+msgstr "NetworkManager પરિસ્થિતિ"
+
+#. Print header
+#: ../cli/src/network-manager.c:196
 msgid "running"
 msgstr "ચાલી રહ્યુ છે"
 
-#: ../cli/src/network-manager.c:148
+#: ../cli/src/network-manager.c:196
 msgid "not running"
 msgstr "ચાલી રહ્યુ નથી"
 
-#: ../cli/src/network-manager.c:201 ../cli/src/network-manager.c:233
+#: ../cli/src/network-manager.c:271
+msgid "auth"
+msgstr "સત્તા"
+
+#: ../cli/src/network-manager.c:301
+#, c-format
+msgid "Error: 'nm permissions': %s"
+msgstr "ભૂલ: 'nm permissions': %s"
+
+#: ../cli/src/network-manager.c:303
+#, c-format
+msgid "Error: 'nm permissions': %s; allowed fields: %s"
+msgstr "ભૂલ: 'nm permissions': %s; માન્ય થયેલ ક્ષેત્રો: %s"
+
+#: ../cli/src/network-manager.c:324
+msgid "NetworkManager permissions"
+msgstr "NetworkManager પરવાનગીઓ"
+
+#: ../cli/src/network-manager.c:350 ../cli/src/utils.c:457
+#, c-format
+msgid "Error: Couldn't connect to system bus: %s"
+msgstr "ભૂલ: સિસ્ટમ બસમાં જોડી શક્યા નહિં: %s"
+
+#: ../cli/src/network-manager.c:361
+#, c-format
+msgid "Error: Couldn't create D-Bus object proxy."
+msgstr "ભૂલ: D-Bus ઑબ્જેક્ટ પ્રોક્સીને બનાવી શક્યા નહિં."
+
+#: ../cli/src/network-manager.c:367
+#, c-format
+msgid "Error in sleep: %s"
+msgstr "સ્લીપમાં ભૂલ: %s"
+
+#: ../cli/src/network-manager.c:416 ../cli/src/network-manager.c:471
+#: ../cli/src/network-manager.c:509 ../cli/src/network-manager.c:548
 #, 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:424
+msgid "Networking enabled"
+msgstr "નેટવર્કીંગ સક્રિય"
+
+#: ../cli/src/network-manager.c:440
+#, c-format
+msgid "Error: invalid 'enable' parameter: '%s'; use 'true' or 'false'."
+msgstr "ભૂલ: અયોગ્ય 'enable' પરિમાણ: '%s'; 'true' અથવા 'false' વાપરો."
+
+#: ../cli/src/network-manager.c:450
+#, c-format
+msgid "Error: Sleeping status is not exported by NetworkManager."
+msgstr "ભૂલ: સ્લીપીંગ પરિસ્થિતિ NetworkManager દ્દારા નિકાસ થયેલ નથી."
+
+#: ../cli/src/network-manager.c:458
+#, c-format
+msgid "Error: invalid 'sleep' parameter: '%s'; use 'true' or 'false'."
+msgstr "ભૂલ: અયોગ્ય 'sleep' પરિમાણ: '%s';  'true' અથવા 'false' વાપરો"
+
+#: ../cli/src/network-manager.c:479
 msgid "WiFi enabled"
 msgstr "WiFi સક્રિય થયેલ"
 
-#: ../cli/src/network-manager.c:220
+#: ../cli/src/network-manager.c:495
 #, c-format
 msgid "Error: invalid 'wifi' parameter: '%s'."
 msgstr "ભૂલ: અયોગ્ય 'wifi' પરિમાણ: '%s'."
 
-#: ../cli/src/network-manager.c:241
+#: ../cli/src/network-manager.c:517
 msgid "WWAN enabled"
 msgstr "WWAN સક્રિય થયેલ"
 
-#: ../cli/src/network-manager.c:252
+#: ../cli/src/network-manager.c:533
 #, c-format
 msgid "Error: invalid 'wwan' parameter: '%s'."
 msgstr "ભૂલ: અયોગ્ય 'wwan' પરિમાણ: '%s'."
 
-#: ../cli/src/network-manager.c:263
+#: ../cli/src/network-manager.c:556
+msgid "WiMAX enabled"
+msgstr "WiMAX સક્રિય"
+
+#: ../cli/src/network-manager.c:572
+#, c-format
+msgid "Error: invalid 'wimax' parameter: '%s'."
+msgstr "ભૂલ: અયોગ્ય 'wimax' પરિમાણ: '%s'."
+
+#: ../cli/src/network-manager.c:588
 #, c-format
 msgid "Error: 'nm' command '%s' is not valid."
 msgstr "ભૂલ: 'nm' આદેશ '%s' યોગ્ય નથી."
 
-#: ../cli/src/nmcli.c:69
-#, c-format
+#: ../cli/src/nmcli.c:76
+#, 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] |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"
+#| "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"
@@ -973,13 +1729,15 @@ msgid ""
 "  -f[ields] |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"
 "OBJECT\n"
-"  nm          NetworkManager status\n"
-"  con         NetworkManager connections\n"
-"  dev         devices managed by NetworkManager\n"
+"  nm              NetworkManager's status\n"
+"  c[onnection]    NetworkManager's connections\n"
+"  d[evice]        devices managed by NetworkManager\n"
 "\n"
 msgstr ""
 "વપરાશ: %s [OPTIONS] OBJECT { COMMAND | help }\n"
@@ -991,568 +1749,878 @@ msgstr ""
 "  -f[ields] |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"
 "OBJECT\n"
-"  nm          NetworkManager status\n"
-"  con         NetworkManager connections\n"
-"  dev         devices managed by NetworkManager\n"
+"  nm              NetworkManager's status\n"
+"  c[onnection]    NetworkManager's connections\n"
+"  d[evice]        devices managed by NetworkManager\n"
 "\n"
 
-#: ../cli/src/nmcli.c:113
+#: ../cli/src/nmcli.c:124
 #, c-format
 msgid "Error: Object '%s' is unknown, try 'nmcli help'."
 msgstr "ભૂલ: ઑબ્જેક્ટ '%s' અજ્ઞાત છે, 'nmcli help' નો પ્રયત્ન કરો."
 
-#: ../cli/src/nmcli.c:143
+#: ../cli/src/nmcli.c:154
 #, c-format
 msgid "Error: Option '--terse' is specified the second time."
 msgstr "ભૂલ: વિકલ્પ '--terse' એ બીજી વખત સ્પષ્ટ થયેલ છે."
 
-#: ../cli/src/nmcli.c:148
+#: ../cli/src/nmcli.c:159
 #, c-format
 msgid "Error: Option '--terse' is mutually exclusive with '--pretty'."
 msgstr "ભૂલ: વિકલ્પ '--terse' એ '--pretty' સાથે પરસ્પર અનોખું છે."
 
-#: ../cli/src/nmcli.c:156
+#: ../cli/src/nmcli.c:167
 #, c-format
 msgid "Error: Option '--pretty' is specified the second time."
 msgstr "ભૂલ: વિકલ્પ '--pretty' એ બીજી વખત સ્પષ્ટ થયેલ છે."
 
-#: ../cli/src/nmcli.c:161
+#: ../cli/src/nmcli.c:172
 #, 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:182 ../cli/src/nmcli.c:198
 #, 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:191 ../cli/src/nmcli.c:207
 #, c-format
 msgid "Error: '%s' is not valid argument for '%s' option."
 msgstr "ભૂલ: '%s' એ '%s' વિકલ્પ માટે યોગ્ય દલીલ નથી."
 
-#: ../cli/src/nmcli.c:203
+#: ../cli/src/nmcli.c:214
 #, c-format
 msgid "Error: fields for '%s' options are missing."
 msgstr "ભૂલ: '%s' વિકલ્પો માટે ક્ષેત્રો ગેરહાજર છે."
 
-#: ../cli/src/nmcli.c:209
+#: ../cli/src/nmcli.c:222
 #, c-format
 msgid "nmcli tool, version %s\n"
 msgstr "nmcli સાધન, આવૃત્તિ %s\n"
 
-#: ../cli/src/nmcli.c:215
+#: ../cli/src/nmcli.c:228
 #, c-format
 msgid "Error: Option '%s' is unknown, try 'nmcli -help'."
 msgstr "ભૂલ: વિકલ્પ '%s' એ અજ્ઞાત છે, 'nmcli -help' નો પ્રયત્ન કરો."
 
-#: ../cli/src/nmcli.c:234
+#: ../cli/src/nmcli.c:247
 #, 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:272
+msgid "Error: Could not create NMClient object."
+msgstr "ભૂલ: NMClient ઑબ્જેક્ટને બનાવી શક્યા નહિં."
 
-#: ../cli/src/nmcli.c:275
+#: ../cli/src/nmcli.c:288
 msgid "Success"
 msgstr "સફળ"
 
-#: ../cli/src/settings.c:407
+#: ../cli/src/settings.c:527
 #, c-format
 msgid "%d (hex-ascii-key)"
 msgstr "%d (hex-ascii-key)"
 
-#: ../cli/src/settings.c:409
+#: ../cli/src/settings.c:529
 #, c-format
 msgid "%d (104/128-bit passphrase)"
 msgstr "%d (104/128-bit પાસફ્રેઝ)"
 
-#: ../cli/src/settings.c:412
+#: ../cli/src/settings.c:532 ../cli/src/settings.c:660
 #, c-format
 msgid "%d (unknown)"
 msgstr "%d (અજ્ઞાત)"
 
-#: ../cli/src/settings.c:438
+#: ../cli/src/settings.c:558
 msgid "0 (unknown)"
 msgstr "0 (અજ્ઞાત)"
 
-#: ../cli/src/settings.c:444
+#: ../cli/src/settings.c:564
 msgid "any, "
 msgstr "કોઇપણ, "
 
-#: ../cli/src/settings.c:446
+#: ../cli/src/settings.c:566
 msgid "900 MHz, "
 msgstr "900 MHz, "
 
-#: ../cli/src/settings.c:448
+#: ../cli/src/settings.c:568
 msgid "1800 MHz, "
 msgstr "1800 MHz, "
 
-#: ../cli/src/settings.c:450
+#: ../cli/src/settings.c:570
 msgid "1900 MHz, "
 msgstr "1900 MHz, "
 
-#: ../cli/src/settings.c:452
+#: ../cli/src/settings.c:572
 msgid "850 MHz, "
 msgstr "850 MHz, "
 
-#: ../cli/src/settings.c:454
+#: ../cli/src/settings.c:574
 msgid "WCDMA 3GPP UMTS 2100 MHz, "
 msgstr "WCDMA 3GPP UMTS 2100 MHz, "
 
-#: ../cli/src/settings.c:456
+#: ../cli/src/settings.c:576
 msgid "WCDMA 3GPP UMTS 1800 MHz, "
 msgstr "WCDMA 3GPP UMTS 1800 MHz, "
 
-#: ../cli/src/settings.c:458
+#: ../cli/src/settings.c:578
 msgid "WCDMA 3GPP UMTS 1700/2100 MHz, "
 msgstr "WCDMA 3GPP UMTS 1700/2100 MHz, "
 
-#: ../cli/src/settings.c:460
+#: ../cli/src/settings.c:580
 msgid "WCDMA 3GPP UMTS 800 MHz, "
 msgstr "WCDMA 3GPP UMTS 800 MHz, "
 
-#: ../cli/src/settings.c:462
+#: ../cli/src/settings.c:582
 msgid "WCDMA 3GPP UMTS 850 MHz, "
 msgstr "WCDMA 3GPP UMTS 850 MHz, "
 
-#: ../cli/src/settings.c:464
+#: ../cli/src/settings.c:584
 msgid "WCDMA 3GPP UMTS 900 MHz, "
 msgstr "WCDMA 3GPP UMTS 900 MHz, "
 
-#: ../cli/src/settings.c:466
+#: ../cli/src/settings.c:586
 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:588
+msgid "WCDMA 3GPP UMTS 1900 MHz, "
+msgstr "WCDMA 3GPP UMTS 1900 MHz, "
+
+#: ../cli/src/settings.c:590
+msgid "WCDMA 3GPP UMTS 2600 MHz, "
+msgstr "WCDMA 3GPP UMTS 2600 MHz, "
+
+#: ../cli/src/settings.c:608
+msgid "0 (NONE)"
+msgstr "0 (NONE)"
+
+#: ../cli/src/settings.c:614
+msgid "REORDER_HEADERS, "
+msgstr "REORDER_HEADERS, "
+
+#: ../cli/src/settings.c:616
+msgid "GVRP, "
+msgstr "GVRP, "
+
+#: ../cli/src/settings.c:618
+msgid "LOOSE_BINDING, "
+msgstr "LOOSE_BINDING, "
+
+#: ../cli/src/settings.c:654
+#, c-format
+msgid "%d (disabled)"
+msgstr "%d (નિષ્ક્રિય)"
+
+#: ../cli/src/settings.c:656
+#, c-format
+msgid "%d (enabled, prefer public IP)"
+msgstr "%d (સક્રિય, સાર્વજનિક IP પસંદ કર્યુ છે)"
+
+#: ../cli/src/settings.c:658
+#, c-format
+msgid "%d (enabled, prefer temporary IP)"
+msgstr "%d (સક્રિય, કામચલાઉ IP પસંદ કર્યુ છે)"
+
+#: ../cli/src/settings.c:791 ../cli/src/settings.c:987
+#: ../cli/src/settings.c:1696
 msgid "auto"
 msgstr "સ્વયં"
 
-#: ../cli/src/settings.c:704 ../cli/src/settings.c:707 ../cli/src/utils.c:172
-msgid "not set"
-msgstr "સુયોજિત નથી"
+#: ../cli/src/utils.c:103
+#, c-format
+msgid "Error converting IP4 address '0x%X' to text form"
+msgstr "IP4 સરનામાં '0x%X' ને લખાણ રૂપમાં રૂપાંતર કરવામાં ભૂલ"
+
+#: ../cli/src/utils.c:131
+#, c-format
+msgid "Error converting IP6 address '%s' to text form"
+msgstr "IP6 સરનામું '%s' ને લખાણ રૂપમાં રૂપાંતર કરતી વખતે ભૂલ"
 
-#: ../cli/src/utils.c:124
+#: ../cli/src/utils.c:232
 #, c-format
 msgid "field '%s' has to be alone"
 msgstr "ક્ષેત્ર '%s' એ એકલુ હોવુ જ જોઇએ"
 
-#: ../cli/src/utils.c:127
+#: ../cli/src/utils.c:235
 #, c-format
 msgid "invalid field '%s'"
 msgstr "અયોગ્ય ક્ષેત્ર '%s'"
 
-#: ../cli/src/utils.c:146
-#, c-format
+#: ../cli/src/utils.c:254
 msgid "Option '--terse' requires specifying '--fields'"
 msgstr "વિકલ્પ '--terse' ને '--fields' ની જરૂર છે"
 
-#: ../cli/src/utils.c:150
+#: ../cli/src/utils.c:258
 #, 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:468
+#, 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:476
+#, c-format
+msgid "Error: NameHasOwner request failed: %s"
+msgstr "ભૂલ: NameHasOwner માંગણી નિષ્ફળ: %s"
+
+#: ../cli/src/utils.c:521
+#, 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:530
+#, 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:133
 #, c-format
 msgid "PEM key file had no end tag '%s'."
 msgstr "PEM કી ફાઇલ પાસે છેલ્લો ટેગ '%s' ન હતો."
 
-#: ../libnm-util/crypto.c:130
+#: ../libnm-util/crypto.c:146
 #, c-format
 msgid "Doesn't look like a PEM private key file."
 msgstr "PEM ખાનગી કી ફાઇલ જેવી દેખાતી નથી."
 
-#: ../libnm-util/crypto.c:138
+#: ../libnm-util/crypto.c:154
 #, c-format
 msgid "Not enough memory to store PEM file data."
 msgstr "PEM ફાઇલ માહિતી ને સંગ્રહ કરવા માટે મેમરી પૂરતી નથી."
 
-#: ../libnm-util/crypto.c:154
+#: ../libnm-util/crypto.c:170
 #, 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:178
 #, 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:188
 #, 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:199
 #, 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:206
 #, 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:219
 #, c-format
 msgid "Malformed PEM file: unknown private key cipher '%s'."
 msgstr "મેલફોર્મ થયેલ PEM ફાઇલ: અજ્ઞાત ખાનગી કી સાઇફર '%s'."
 
-#: ../libnm-util/crypto.c:222
+#: ../libnm-util/crypto.c:238
 #, 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' પાસે અંત ટેગ '%s' ન હતો."
+#: ../libnm-util/crypto.c:284
+msgid "Failed to find expected PKCS#8 start tag."
+msgstr "ઇચ્છિત PKCS#8 શરૂઆત ટૅગને શોધવામાં નિષ્ફળ."
 
-#: ../libnm-util/crypto.c:277
+#: ../libnm-util/crypto.c:292
 #, c-format
-msgid "Failed to decode certificate."
-msgstr "પ્રમાણપત્રને ડિકોડ કરવાનું નિષ્ફળ."
+msgid "Failed to find expected PKCS#8 end tag '%s'."
+msgstr "ઇચ્છિત PKCS#8 અંત ટેગ '%s' ને શોધવામાં નિષ્ફળ."
+
+#: ../libnm-util/crypto.c:312
+msgid "Not enough memory to store private key data."
+msgstr "ખાનગી કી માહિતીને સંગ્રહ કરવા પૂરતી મેમરી નથી."
 
-#: ../libnm-util/crypto.c:286
+#: ../libnm-util/crypto.c:317
+msgid "Failed to decode PKCS#8 private key."
+msgstr "PKCS#8 ખાનગી કીને ડિકોડ કરવામાં નિષ્ફળતા."
+
+#: ../libnm-util/crypto.c:339 ../libnm-util/crypto.c:625
 #, 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
+#: ../libnm-util/crypto.c:365
 #, c-format
 msgid "IV must be an even number of bytes in length."
 msgstr "IV એ લંબાઇમાં બાઇટોનું બેકી નંબર જ હોવુ જ જોઇએ."
 
-#: ../libnm-util/crypto.c:333
+#: ../libnm-util/crypto.c:374
 #, c-format
 msgid "Not enough memory to store the IV."
 msgstr "IV ને સંગ્રહ કરવા માટે પૂરતી મેમરી નથી."
 
-#: ../libnm-util/crypto.c:344
+#: ../libnm-util/crypto.c:385
 #, c-format
 msgid "IV contains non-hexadecimal digits."
 msgstr "IV એ બિન-હેક્ઝાડેસિમલ આંકડાઓને સમાવે છે."
 
-#: ../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_nss.c:336
+#: ../libnm-util/crypto.c:423 ../libnm-util/crypto_gnutls.c:147
+#: ../libnm-util/crypto_gnutls.c:265 ../libnm-util/crypto_nss.c:167
+#: ../libnm-util/crypto_nss.c:332
 #, c-format
 msgid "Private key cipher '%s' was unknown."
 msgstr "ખાનગી કી સાઇફર '%s' એ અજ્ઞાત હતુ."
 
-#: ../libnm-util/crypto.c:391
+#: ../libnm-util/crypto.c:432
 #, c-format
 msgid "Not enough memory to decrypt private key."
 msgstr "ખાનગી કીને ડિક્રિપ્ટ કરવા માટે મેમરી પૂરતી નથી."
 
-#: ../libnm-util/crypto.c:511
+#: ../libnm-util/crypto.c:497
+#, c-format
+msgid "Not enough memory to store decrypted private key."
+msgstr "ડિક્રિપ્ટ થયેલ ખાનગી કીને સંગ્રહ કરવા માટે મેમરી પૂરતી નથી."
+
+#: ../libnm-util/crypto.c:542
 #, c-format
 msgid "Unable to determine private key type."
 msgstr "ખાનગી કી પ્રકાર ને નક્કી કરવાનું નિષ્ફળ."
 
-#: ../libnm-util/crypto.c:530
+#: ../libnm-util/crypto.c:597
 #, c-format
-msgid "Not enough memory to store decrypted private key."
-msgstr "ડિક્રિપ્ટ થયેલ ખાનગી કીને સંગ્રહ કરવા માટે મેમરી પૂરતી નથી."
+msgid "PEM certificate had no start tag '%s'."
+msgstr "PEM પ્રમાણપત્ર પાસે અંત ટેગ '%s' ન હતો."
+
+#: ../libnm-util/crypto.c:606
+#, c-format
+msgid "PEM certificate had no end tag '%s'."
+msgstr "PEM પ્રમાણપત્ર પાસે અંત ટેગ '%s' ન હતો."
+
+#: ../libnm-util/crypto.c:630
+#, c-format
+msgid "Failed to decode certificate."
+msgstr "પ્રમાણપત્રને ડિકોડ કરવાનું નિષ્ફળ."
 
-#: ../libnm-util/crypto_gnutls.c:49
+#: ../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:92
 #, 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:155
 #, 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:164 ../libnm-util/crypto_nss.c:184
 #, c-format
 msgid "Not enough memory for decrypted key buffer."
 msgstr "ડિક્રિપ્ટ થયેલ કી બફર માટે પૂરતી મેમરી નથી."
 
-#: ../libnm-util/crypto_gnutls.c:173
+#: ../libnm-util/crypto_gnutls.c:172
 #, 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:181
 #, 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:190
 #, 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:199
 #, 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:209 ../libnm-util/crypto_nss.c:263
 #, 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:220 ../libnm-util/crypto_nss.c:274
 #, 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:285 ../libnm-util/crypto_nss.c:352
 #, c-format
 msgid "Could not allocate memory for encrypting."
 msgstr "એનક્રિપ્ટ કર્યા પછી મેમરીને ફાળવી શક્યા નહિં."
 
-#: ../libnm-util/crypto_gnutls.c:294
+#: ../libnm-util/crypto_gnutls.c:293
 #, 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:302
 #, 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:312
 #, 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:321
 #, c-format
 msgid "Failed to encrypt the data: %s / %s."
 msgstr "માહિતીને એનક્રિપ્ટ કરવાનું નિષ્ફળ: %s / %s."
 
-#: ../libnm-util/crypto_gnutls.c:362
+#: ../libnm-util/crypto_gnutls.c:361
 #, c-format
 msgid "Error initializing certificate data: %s"
 msgstr "પ્રમાણપત્ર માહિતીને પ્રારંભ કરતી વખતે ભૂલ: %s"
 
-#: ../libnm-util/crypto_gnutls.c:384
+#: ../libnm-util/crypto_gnutls.c:383
 #, c-format
 msgid "Couldn't decode certificate: %s"
 msgstr "પ્રમાણપત્રને ડિકોડ કરી શકાયુ નહિં: %s"
 
-#: ../libnm-util/crypto_gnutls.c:408
+#: ../libnm-util/crypto_gnutls.c:407
 #, 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:420
 #, 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:432
 #, c-format
 msgid "Couldn't verify PKCS#12 file: %s"
 msgstr "PKCS#12 ફાઇલને ચકાસી શકાયુ નહિં: %s"
 
+#: ../libnm-util/crypto_gnutls.c:460
+#, c-format
+msgid "Couldn't initialize PKCS#8 decoder: %s"
+msgstr "PKCS#8 ડિકોડરનું પ્રારંભ કરી શક્યા નહિં: %s"
+
+#: ../libnm-util/crypto_gnutls.c:483
+#, c-format
+msgid "Couldn't decode PKCS#8 file: %s"
+msgstr "PKCS#8 ફાઇલને ડિકોડ કરી શક્યા નહિં: %s"
+
 #: ../libnm-util/crypto_nss.c:56
 #, c-format
 msgid "Failed to initialize the crypto engine: %d."
 msgstr "ક્રિપ્ટો એંજિનને પ્રારંભ કરવાનું નિષ્ફળ: %d."
 
-#: ../libnm-util/crypto_nss.c:111
+#: ../libnm-util/crypto_nss.c:107
 #, c-format
 msgid "Failed to initialize the MD5 context: %d."
 msgstr "MD5 સંદર્ભને પ્રારંભ કરવાનું નિષ્ફળ: %d."
 
-#: ../libnm-util/crypto_nss.c:179
+#: ../libnm-util/crypto_nss.c:175
 #, c-format
 msgid "Invalid IV length (must be at least %d)."
 msgstr "અયોગ્ય IV લંબાઇ (ઓછામાં ઓછી %d હોવી જ જોઇએ)."
 
-#: ../libnm-util/crypto_nss.c:196
+#: ../libnm-util/crypto_nss.c:192
 #, c-format
 msgid "Failed to initialize the decryption cipher slot."
 msgstr "ડિક્રિપ્શન સાઇફર સ્લોટને પ્રારંભ કરવાનું નિષ્ફળ."
 
-#: ../libnm-util/crypto_nss.c:206
+#: ../libnm-util/crypto_nss.c:202
 #, c-format
 msgid "Failed to set symmetric key for decryption."
 msgstr "ડિક્રિપ્શન માટે સમપ્રમાણ કીને સુયોજિત કરવામાં નિષ્ફળ."
 
-#: ../libnm-util/crypto_nss.c:216
+#: ../libnm-util/crypto_nss.c:212
 #, c-format
 msgid "Failed to set IV for decryption."
 msgstr "ડિક્રિપ્શન માટે IV ને સુયોજિત કરવામાં નિષ્ફળ."
 
-#: ../libnm-util/crypto_nss.c:224
+#: ../libnm-util/crypto_nss.c:220
 #, c-format
 msgid "Failed to initialize the decryption context."
 msgstr "ડિક્રિપ્શન સંદર્ભને આખરી રૂપ આપવામાં નિષ્ફળ."
 
-#: ../libnm-util/crypto_nss.c:237
+#: ../libnm-util/crypto_nss.c:233
 #, c-format
 msgid "Failed to decrypt the private key: %d."
 msgstr "ખાનગી કી ને ડિક્રિપ્ટ કરવાનું નિષ્ફળ: %d."
 
-#: ../libnm-util/crypto_nss.c:245
+#: ../libnm-util/crypto_nss.c:241
 #, c-format
 msgid "Failed to decrypt the private key: decrypted data too large."
 msgstr "ખાનગી કીને ડિક્રિપ્ટ કરવાનું નિષ્ફળ: ડિક્રિપ્ટ થયેલ માહિતી ઘણી લાંબી છે."
 
-#: ../libnm-util/crypto_nss.c:256
+#: ../libnm-util/crypto_nss.c:252
 #, c-format
 msgid "Failed to finalize decryption of the private key: %d."
 msgstr "ખાનગી કીનાં ડિક્રિપ્શનનને આખરી રૂપ આપવાનું નિષ્ફળ: %d."
 
-#: ../libnm-util/crypto_nss.c:364
+#: ../libnm-util/crypto_nss.c:360
 #, c-format
 msgid "Failed to initialize the encryption cipher slot."
 msgstr "એનક્રિપ્શન સાઇફર સ્લોટને પ્રારંભ કરવાનું નિષ્ફળ."
 
-#: ../libnm-util/crypto_nss.c:372
+#: ../libnm-util/crypto_nss.c:368
 #, c-format
 msgid "Failed to set symmetric key for encryption."
 msgstr "એનક્રિપ્શન માટે સમપ્રમાણ કીને સુયોજિત કરવામાં નિષ્ફળ."
 
-#: ../libnm-util/crypto_nss.c:380
+#: ../libnm-util/crypto_nss.c:376
 #, c-format
 msgid "Failed to set IV for encryption."
 msgstr "એનક્રિપ્શન માટે IV ને સુયોજિત કરવામાં નિષ્ફળ."
 
-#: ../libnm-util/crypto_nss.c:388
+#: ../libnm-util/crypto_nss.c:384
 #, c-format
 msgid "Failed to initialize the encryption context."
 msgstr "એનક્રિપ્શન સંદર્ભને પ્રારંભ કરવામાં નિષ્ફળ."
 
-#: ../libnm-util/crypto_nss.c:396
+#: ../libnm-util/crypto_nss.c:392
 #, c-format
 msgid "Failed to encrypt: %d."
 msgstr "એનક્રિપ્ટ કરવાનું નિષ્ફળ: %d."
 
-#: ../libnm-util/crypto_nss.c:404
+#: ../libnm-util/crypto_nss.c:400
 #, c-format
 msgid "Unexpected amount of data after encrypting."
 msgstr "એનક્રિપ્ટ કર્યા પછી માહિતીની અનિચ્છનિય સંખ્યા."
 
-#: ../libnm-util/crypto_nss.c:447
+#: ../libnm-util/crypto_nss.c:443
 #, c-format
 msgid "Couldn't decode certificate: %d"
 msgstr "પ્રમાણપત્રને ડિકોડ કરી શકાયુ નહિં: %d"
 
-#: ../libnm-util/crypto_nss.c:482
+#: ../libnm-util/crypto_nss.c:478
 #, c-format
 msgid "Couldn't convert password to UCS2: %d"
 msgstr "UCS2 માં પાસવર્ડને રૂપાંતરિત કરી શકાયુ નહિં: %d"
 
-#: ../libnm-util/crypto_nss.c:510
+#: ../libnm-util/crypto_nss.c:506
 #, c-format
 msgid "Couldn't initialize PKCS#12 decoder: %d"
 msgstr "PKCS#12 ડિકોડરને પ્રારંભ કરી શકાયુ નહિં: %d"
 
-#: ../libnm-util/crypto_nss.c:519
+#: ../libnm-util/crypto_nss.c:515
 #, c-format
 msgid "Couldn't decode PKCS#12 file: %d"
 msgstr "PKCS#12 ફાઇલને ડિકોડ કરી શકાયુ નહિં: %d"
 
-#: ../libnm-util/crypto_nss.c:528
+#: ../libnm-util/crypto_nss.c:524
 #, c-format
 msgid "Couldn't verify PKCS#12 file: %d"
 msgstr "PKCS#12 ફાઇલને ચકાસી શકાયુ નહિં: %d"
 
-#: ../libnm-util/crypto_nss.c:557
+#: ../libnm-util/crypto_nss.c:568
 msgid "Could not generate random data."
 msgstr "રેન્ડમ માહિતી ને ઉત્પન્ન કરી શક્યા નહિં."
 
-#: ../libnm-util/nm-utils.c:1925
+#: ../libnm-util/nm-utils.c:2078
 #, c-format
 msgid "Not enough memory to make encryption key."
 msgstr "એનક્રિપ્શન કીને બનાવવા માટે મેમરી પૂરતી નથી."
 
-#: ../libnm-util/nm-utils.c:2035
+#: ../libnm-util/nm-utils.c:2188
 msgid "Could not allocate memory for PEM file creation."
 msgstr "PEM ફાઇલ બનાવવા માટે મેમરી ફાળવી શક્યા નહિંી પૂરતી નથી."
 
-#: ../libnm-util/nm-utils.c:2047
+#: ../libnm-util/nm-utils.c:2200
 #, c-format
 msgid "Could not allocate memory for writing IV to PEM file."
 msgstr "PEM ફાઇલમાં IV ને લખવા માટે મેમરીને ફાળવી શક્યા નહિં."
 
-#: ../libnm-util/nm-utils.c:2059
+#: ../libnm-util/nm-utils.c:2212
 #, 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:2231
 #, 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.in.h:1
+msgid "Enable or disable system networking"
+msgstr "સિસ્ટમ નેટવર્કીંગ ને સક્રિય અથવા નિષ્ક્રિય કરો"
 
-#: ../src/nm-netlink-monitor.c:214
-msgid "error occurred while waiting for data on socket"
-msgstr "ભૂલ ઉદ્ભવી જ્યારે સોકેટ પર માહિતી માટે રાહ જોઇ રહ્યા હોય"
+#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:2
+msgid "System policy prevents enabling or disabling system networking"
+msgstr "સિસ્ટમ પોલિસી એ સિસ્ટમ નેટવર્કીંગને નિષ્ક્રિય અથવા સક્રિય કરવાનું અટકાવે છે"
+
+#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:3
+msgid ""
+"Put NetworkManager to sleep or wake it up (should only be used by system "
+"power management)"
+msgstr ""
+"NetworkManager ને નિષ્ક્રિય સ્થિતિ અથવા સક્રિય સ્થિતિમાં મૂકો (સિસ્ટમ પાવર સંચાલન "
+"દ્દારા ફક્ત વાપરવુ જોઇએ)"
+
+#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:4
+msgid "System policy prevents putting NetworkManager to sleep or waking it up"
+msgstr ""
+"સિસ્ટમ પોલિસી NetworkManager  ને નિષ્ક્રિય સ્થિતિમાં મૂકલાનું અથવા સક્રિય સ્થિતિમાં "
+"રાખવાનું અટકાવે છે"
+
+#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:5
+msgid "Enable or disable WiFi devices"
+msgstr "WiFi  ઉપકરણોને સક્રિય અથવા નિષ્ક્રિય કરો"
+
+#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:6
+msgid "System policy prevents enabling or disabling WiFi devices"
+msgstr "સિસ્ટમ પોલિસી એ WiFi ઉપકરણોને સક્રિય અથવા નિષ્ક્રિય કરવાનું અટકાવે છે"
+
+#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:7
+msgid "Enable or disable mobile broadband devices"
+msgstr "મોબાઇલ બ્રોડબેન્ડ ઉપકરણોને સક્રિય અથવા નિષ્ક્રિય કરો"
+
+#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:8
+msgid "System policy prevents enabling or disabling mobile broadband devices"
+msgstr "સિસ્ટમ પોલિસી એ મોબાઇલ બ્રોડબેન્ડ ઉપકરણોને સક્રિય અથવા નિષ્ક્રિય કરવાનું અટકાવે છે"
+
+#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:9
+msgid "Enable or disable WiMAX mobile broadband devices"
+msgstr "WiMAX મોબાઇલ બ્રોડબેન્ડ ઉપકરણોને સક્રિય અથવા નિષ્ક્રિય કરો"
 
-#: ../src/nm-netlink-monitor.c:254
+#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:10
+msgid "System policy prevents enabling or disabling WiMAX mobile broadband devices"
+msgstr ""
+"સિસ્ટમ પોલિસી એ WiMAX મોબાઇલ બ્રોડબેન્ડ ઉપકરણોને સક્રિય અથવા નિષ્ક્રિય કરવાનું અટકાવે છે"
+
+#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:11
+msgid "Allow control of network connections"
+msgstr "નેટવર્ક જોડાણોનાં નિયંત્રણની પરવાનગી આપો"
+
+#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:12
+msgid "System policy prevents control of network connections"
+msgstr "સિસ્ટમ પોલિસી એ સિસ્ટમ સુયોજનોનાં નિયંત્રણને અટકાવે છે"
+
+#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:13
+msgid "Connection sharing via a protected WiFi network"
+msgstr "સુરક્ષિત થયેલ WiFi નેટવર્ક મારફતે જોડાણ વહેંચણી"
+
+#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:14
+msgid "System policy prevents sharing connections via a protected WiFi network"
+msgstr "સિસ્ટમ પોલિસી એ સુરક્ષિત થયેલ WiFi નેટવર્ક મારફતે વહેંચણી જોડાણોને રોકી રહ્યા છે"
+
+#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:15
+msgid "Connection sharing via an open WiFi network"
+msgstr "ખુલ્લા WiFi નેટવર્ક મારફતે જોડાણ વહેંચણી"
+
+#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:16
+msgid "System policy prevents sharing connections via an open WiFi network"
+msgstr "સિસ્ટમ પોલિસી એ ખુલ્લા WiFi નેટવર્ક મારફતે વહેંચણી જોડાણોને રોકી રહ્યા છે"
+
+#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:17
+msgid "Modify personal network connections"
+msgstr "વ્યક્તિગત નેટવર્ક જોડાણો બદલો"
+
+#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:18
+msgid "System policy prevents modification of personal network settings"
+msgstr "સિસ્ટમ પોલિસી એ વ્યક્તિગત નેટવર્ક સુયોજનોનાં બદલાવને અટકાવે છે"
+
+#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:19
+msgid "Modify network connections for all users"
+msgstr "બધા વપરાશકર્તાઓ માટે નેટવર્ક જોડાણો બદલો"
+
+#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:20
+msgid "System policy prevents modification of network settings for all users"
+msgstr "સિસ્ટમ પોલિસી એ બધા વપરાશકર્તાઓ માટે નેટવર્ક સુયોજનોનાં બદલાવને અટકાવે છે"
+
+#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:21
+msgid "Modify persistent system hostname"
+msgstr "નિરંતર સિસ્ટમ યજમાનનામને બદલો"
+
+#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:22
+msgid "System policy prevents modification of the persistent system hostname"
+msgstr "સિસ્ટમ પોલિસી એ નિરંતર સિસ્ટમ યજમાનનામનાં બદલાવને અટકાવે છે"
+
+#: ../src/main.c:158
 #, c-format
-msgid "unable to connect to netlink for monitoring link status: %s"
-msgstr "કડી સ્થિતિને મોનિટર કરવા માટે નેટલિંકને જોડવામાં અસમર્થ: %s"
+msgid "Failed to set signal mask: %d"
+msgstr "સંકેત માસ્ક ને સુયોજિત કરવાનું નિષ્ફળ: %d"
 
-#: ../src/nm-netlink-monitor.c:265
+#: ../src/main.c:167
 #, c-format
-msgid "unable to enable netlink handle credential passing: %s"
-msgstr "નેટલિંકને સંભાળવાનો શ્રેયને જવાનું સક્રિય કરવા માટે અસમર્થ: %s"
+msgid "Failed to create signal handling thread: %d"
+msgstr "સંકેત સંચાલિત થ્રેડને બનાવવામાં નિષ્ફળતા: %d"
 
-#: ../src/nm-netlink-monitor.c:291 ../src/nm-netlink-monitor.c:353
+#: ../src/main.c:182
 #, c-format
-msgid "unable to allocate netlink handle for monitoring link status: %s"
-msgstr "કડી સ્થિતિને મોનિટર કરવા માટે નેટલિંકને સંભાળવાનું ફાળવવામાં અસમર્થ: %s"
+msgid "Opening %s failed: %s\n"
+msgstr "%s ને ખોલવાનું નિષ્ફળ: %s\n"
 
-#: ../src/nm-netlink-monitor.c:376
+#: ../src/main.c:188
 #, c-format
-msgid "unable to allocate netlink link cache for monitoring link status: %s"
-msgstr "કડી સ્થિતિને મોનિટર કરવા માટે નેટલિંક કડી કેશને ફાળવવામાં અસમર્થ: %s"
+msgid "Writing to %s failed: %s\n"
+msgstr "%s માં લખવાનું નિષ્ફળ: %s\n"
 
-#: ../src/nm-netlink-monitor.c:502
+#: ../src/main.c:193
 #, c-format
-msgid "unable to join netlink group: %s"
-msgstr "નેટલીંક જૂથ ને જોડાવવાનું અસમર્થ: %s"
+msgid "Closing %s failed: %s\n"
+msgstr "%s ને બંધ કરવાનું નિષ્ફળ: %s\n"
 
-#: ../src/nm-netlink-monitor.c:629 ../src/nm-netlink-monitor.c:642
+#: ../src/main.c:236
 #, c-format
-msgid "error updating link cache: %s"
-msgstr "કડી કેશને સુધારો કરતી વખતે ભૂલ: %s"
+msgid "NetworkManager is already running (pid %ld)\n"
+msgstr "NetworkManager પહેલેથી ચાલી રહ્યુ છે (pid %ld)\n"
+
+#: ../src/main.c:363
+msgid "Print NetworkManager version and exit"
+msgstr "NetworkManager આવૃત્તિને છાપો અને બહાર નીકળો"
+
+#: ../src/main.c:364
+msgid "Don't become a daemon"
+msgstr "ડિમન બનો નહિં"
+
+#: ../src/main.c:365
+msgid "Make all warnings fatal"
+msgstr "બધી ચેતવણીઓને ફેટલ બનાવો"
+
+#: ../src/main.c:366
+msgid "Specify the location of a PID file"
+msgstr "PID ફાઇલનું સ્થાન સ્પષ્ટ કરો"
+
+#: ../src/main.c:366
+msgid "filename"
+msgstr "ફાઇલનામ"
+
+#: ../src/main.c:367
+msgid "State file location"
+msgstr "સ્થિતિ ફાઇલ સ્થાન"
+
+#: ../src/main.c:367
+msgid "/path/to/state.file"
+msgstr "/path/to/state.file"
+
+#: ../src/main.c:368
+msgid "Config file location"
+msgstr "રૂપરેખાંકન ફાઇલ સ્થાન"
+
+#: ../src/main.c:368
+msgid "/path/to/config.file"
+msgstr "/path/to/config.file"
+
+#: ../src/main.c:369
+msgid "List of plugins separated by ','"
+msgstr "',' દ્દારા અલગ થયેલ પ્લગઇનોની યાદી"
 
-#: ../src/main.c:502
+#: ../src/main.c:369
+msgid "plugin1,plugin2"
+msgstr "પ્લગઇન1,પ્લગઇન2"
+
+#. Translators: Do not translate the values in the square brackets
+#: ../src/main.c:371
+msgid "Log level: one of [ERR, WARN, INFO, DEBUG]"
+msgstr "લૉગ સ્તર: [ERR, WARN, INFO, DEBUG] માંના એક"
+
+#. Translators: Do not translate the values in the square brackets
+#: ../src/main.c:374
+msgid ""
+"Log domains separated by ',': any combination of\n"
+"                                                [NONE,HW,RFKILL,ETHER,WIFI,"
+"BT,MB,DHCP4,DHCP6,PPP,\n"
+"                                                 WIFI_SCAN,IP4,IP6,AUTOIP4,"
+"DNS,VPN,SHARING,SUPPLICANT,\n"
+"                                                 AGENTS,SETTINGS,SUSPEND,"
+"CORE,DEVICE,OLPC,WIMAX,\n"
+"                                                 INFINIBAND,FIREWALL,ADSL]"
+msgstr ""
+"',' દ્દારા અલગ થયેલ લૉગ ડોમેઇન: આમાંનુ કોઇપણ સંયોજન\n"
+"                                                [NONE,HW,RFKILL,ETHER,WIFI,"
+"BT,MB,DHCP4,DHCP6,PPP,\n"
+"                                                 WIFI_SCAN,IP4,IP6,AUTOIP4,"
+"DNS,VPN,SHARING,SUPPLICANT,\n"
+"                                                 AGENTS,SETTINGS,SUSPEND,"
+"CORE,DEVICE,OLPC,WIMAX,\n"
+"                                                 INFINIBAND,FIREWALL,ADSL]"
+
+#: ../src/main.c:380
+msgid "An http(s) address for checking internet connectivity"
+msgstr "ઇન્ટરનેટ જોડાણને ચકાસવા માટે http(s) સરનામું"
+
+#: ../src/main.c:381
+msgid "The interval between connectivity checks (in seconds)"
+msgstr "જોડાણ ચકાસણી વચ્ચેનો અંતરાલ (સેકંડ માં)"
+
+#: ../src/main.c:382
+msgid "The expected start of the response"
+msgstr "જવાબની ઇચ્છિત શરૂઆત"
+
+#: ../src/main.c:382
+msgid "Bingo!"
+msgstr "બિન્ગો!"
+
+#: ../src/main.c:387
+#, c-format
+msgid "GModules are not supported on your platform!\n"
+msgstr "GModules એ તમારાં પ્લેટફોર્મ પર આધારભૂત નથી!\n"
+
+#: ../src/main.c:406
+msgid ""
+"NetworkManager monitors all network connections and automatically\n"
+"chooses the best connection to use.  It also allows the user to\n"
+"specify wireless access points which wireless cards in the computer\n"
+"should associate with."
+msgstr ""
+"NetworkManager બધા નેટવર્ક જોડાણોને મોનિટર કરે છે અને આપમેળે વાપરવા માટે સારામાં સારા "
+"જોડાણને પસંદ કરે છે.\n"
+"તે પણ વાયરલેસ પ્રવેશ બિંદુને સ્પષ્ટ કરવા માટે વપરાશકર્તાને પરવાનગી આપે છે કે જે કમ્પ્યૂટરમાં "
+"વાયરલેસ કાર્ડ તેની સાથે સંકળાયેલ\n"
+"હોવા જોઇએ."
+
+#: ../src/main.c:412
 #, 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:422
+#, c-format
+msgid "You must be root to run NetworkManager!\n"
+msgstr "તમારે NetworkManager ને ચલાવવા રુટ તમારે રુટ હોલુ જરૂરી જ છે!\n"
+
+#: ../src/main.c:449
+#, c-format
+msgid "Failed to read configuration: (%d) %s\n"
+msgstr "રૂપરેખાંકનને વાંચવાનુ નિષ્ફળ: (%d) %s\n"
+
+#: ../src/main.c:460
 #, 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/main.c:467
+#, c-format
+msgid "State file %s parsing failed: (%d) %s\n"
+msgstr "સ્થિતિ ફાઇલ %s નું પદચ્છેદન કરવામાં નિષ્ફળતા: (%d) %s\n"
+
+#: ../src/main.c:484
+#, c-format
+msgid "Could not daemonize: %s [error %u]\n"
+msgstr "ડિમોનાઇઝ કરી શક્યા નહિં: %s [ભૂલ %u]\n"
+
+#: ../src/dhcp-manager/nm-dhcp-dhclient-utils.c:61
 msgid "# Created by NetworkManager\n"
 msgstr "# ને NetworkManager દ્દારા બનાવેલ છે\n"
 
-#: ../src/dhcp-manager/nm-dhcp-dhclient.c:341
+#: ../src/dhcp-manager/nm-dhcp-dhclient-utils.c:68
 #, c-format
 msgid ""
 "# Merged from %s\n"
@@ -1561,79 +2629,224 @@ msgstr ""
 "# ને %s માંથી ભેગુ કરેલ છે\n"
 "\n"
 
-#: ../src/dhcp-manager/nm-dhcp-manager.c:279
+#: ../src/dhcp-manager/nm-dhcp-manager.c:266
 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:275
 msgid "'dhclient' could be found."
 msgstr "'dhclient' મળી શકે છે."
 
-#: ../src/dhcp-manager/nm-dhcp-manager.c:298
+#: ../src/dhcp-manager/nm-dhcp-manager.c:285
 msgid "'dhcpcd' could be found."
 msgstr "'dhcpcd' મળી શકે છે."
 
-#: ../src/dhcp-manager/nm-dhcp-manager.c:306
+#: ../src/dhcp-manager/nm-dhcp-manager.c:293
 #, c-format
 msgid "unsupported DHCP client '%s'"
 msgstr "બિનઆધારભૂત DHCP ક્લાઇન્ટ '%s'"
 
-#: ../src/logging/nm-logging.c:146
+#: ../src/dns-manager/nm-dns-manager.c:375
+msgid "NOTE: the libc resolver may not support more than 3 nameservers."
+msgstr "નોંધ: libc સુધારનાર એ ૩ નામ સર્વરો કરતા વધારે આધારને સમાવી શકતુ નથી."
+
+#: ../src/dns-manager/nm-dns-manager.c:377
+msgid "The nameservers listed below may not be recognized."
+msgstr "નીચે યાદી થયેલ નામસર્વરો એ ઓળખી શકાતા નથી."
+
+#: ../src/logging/nm-logging.c:142
 #, c-format
 msgid "Unknown log level '%s'"
 msgstr "અજ્ઞાત લોગ સ્તર '%s'"
 
-#: ../src/logging/nm-logging.c:171
+#: ../src/logging/nm-logging.c:181
 #, 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 સુધારનાર એ ૩ નામ સર્વરો કરતા વધારે આધારને સમાવી શકતુ નથી."
+#: ../src/modem-manager/nm-modem-cdma.c:280 ../src/nm-device-bt.c:351
+#, c-format
+msgid "CDMA connection %d"
+msgstr "Connexion 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:558 ../src/nm-device-bt.c:347
+#, c-format
+msgid "GSM connection %d"
+msgstr "Connexion GSM %d"
+
+#: ../src/nm-device-bond.c:192
+#, c-format
+msgid "Bond connection %d"
+msgstr "બોન્ડ જોડાણ %d"
+
+#: ../src/nm-device-adsl.c:193
+#, c-format
+msgid "ADSL connection %d"
+msgstr "ADSL જોડાણ %d"
+
+#: ../src/nm-device-bt.c:322
+#, c-format
+msgid "PAN connection %d"
+msgstr "PAN જોડાણ %d"
+
+#: ../src/nm-device-bt.c:355
+#, c-format
+msgid "DUN connection %d"
+msgstr "DUN જોડાણ %d"
+
+#: ../src/nm-device-ethernet.c:1326
+#, c-format
+msgid "PPPoE connection %d"
+msgstr "PPPoE જોડાણ %d"
+
+#: ../src/nm-device-ethernet.c:1326 ../src/settings/nm-settings-utils.c:50
+#, c-format
+msgid "Wired connection %d"
+msgstr "વાયર થયેલ જોડાણ %d"
+
+#: ../src/nm-device-infiniband.c:303
+#, c-format
+msgid "InfiniBand connection %d"
+msgstr "InfiniBand જોડાણ %d"
 
-#: ../src/settings/nm-default-wired-connection.c:157
+#: ../src/nm-device-olpc-mesh.c:311
 #, c-format
-msgid "Auto %s"
-msgstr "%s સ્વયં કરો"
+msgid "Mesh %d"
+msgstr "મેશ %d"
 
-#: ../system-settings/plugins/ifcfg-rh/reader.c:3256
+#: ../src/nm-device-vlan.c:362
+#, c-format
+msgid "VLAN connection %d"
+msgstr "VLAN જોડાણ %d"
+
+#: ../src/nm-manager.c:662
+#, c-format
+msgid "VPN connection %d"
+msgstr "VPN જોડાણ %d"
+
+#: ../src/nm-netlink-monitor.c:148 ../src/nm-netlink-monitor.c:272
+#: ../src/nm-netlink-monitor.c:695
+#, c-format
+msgid "error processing netlink message: %s"
+msgstr "નેટલિંક સંદેશ ને પ્રક્રિયા કરવામાં ભૂલ: %s"
+
+#: ../src/nm-netlink-monitor.c:251
+msgid "error occurred while waiting for data on socket"
+msgstr "ભૂલ ઉદ્ભવી જ્યારે સોકેટ પર માહિતી માટે રાહ જોઇ રહ્યા હોય"
+
+#: ../src/nm-netlink-monitor.c:296
+#, c-format
+msgid "unable to connect to netlink for monitoring link status: %s"
+msgstr "કડી સ્થિતિને મોનિટર કરવા માટે નેટલિંકને જોડવામાં અસમર્થ: %s"
+
+#: ../src/nm-netlink-monitor.c:307
+#, c-format
+msgid "unable to enable netlink handle credential passing: %s"
+msgstr "નેટલિંકને સંભાળવાનો શ્રેયને જવાનું સક્રિય કરવા માટે અસમર્થ: %s"
+
+#: ../src/nm-netlink-monitor.c:330 ../src/nm-netlink-monitor.c:390
+#, c-format
+msgid "unable to allocate netlink handle for monitoring link status: %s"
+msgstr "કડી સ્થિતિને મોનિટર કરવા માટે નેટલિંકને સંભાળવાનું ફાળવવામાં અસમર્થ: %s"
+
+#: ../src/nm-netlink-monitor.c:415
+#, c-format
+msgid "unable to allocate netlink link cache for monitoring link status: %s"
+msgstr "કડી સ્થિતિને મોનિટર કરવા માટે નેટલિંક કડી કેશને ફાળવવામાં અસમર્થ: %s"
+
+#: ../src/nm-netlink-monitor.c:542
+#, c-format
+msgid "unable to join netlink group: %s"
+msgstr "નેટલીંક જૂથ ને જોડાવવાનું અસમર્થ: %s"
+
+#: ../src/nm-netlink-monitor.c:671 ../src/nm-netlink-monitor.c:684
+#, c-format
+msgid "error updating link cache: %s"
+msgstr "કડી કેશને સુધારો કરતી વખતે ભૂલ: %s"
+
+#: ../src/settings/plugins/ifcfg-rh/reader.c:93
 msgid "System"
 msgstr "સિસ્ટમ"
 
-#: ../policy/org.freedesktop.network-manager-settings.system.policy.in.h:1
-msgid "Connection sharing via a protected WiFi network"
-msgstr "સુરક્ષિત થયેલ WiFi નેટવર્ક મારફતે જોડાણ વહેંચણી"
+#: ../src/settings/plugins/ifcfg-rh/reader.c:3663
+msgid "Bond"
+msgstr "બોન્ડ"
 
-#: ../policy/org.freedesktop.network-manager-settings.system.policy.in.h:2
-msgid "Connection sharing via an open WiFi network"
-msgstr "ખુલ્લા WiFi નેટવર્ક મારફતે જોડાણ વહેંચણી"
+#: ../test/nm-online.c:111
+#, c-format
+msgid "\rConnecting"
+msgstr "\rજોડાઇ રહ્યા છે"
 
-#: ../policy/org.freedesktop.network-manager-settings.system.policy.in.h:3
-msgid "Modify persistent system hostname"
-msgstr "નિરંતર સિસ્ટમ યજમાનનામને બદલો"
+#: ../test/nm-online.c:142
+msgid "Time to wait for a connection, in seconds (default is 30)"
+msgstr "જોડાણ માટે રાહ જોવાનો સમય, સેકંડમાં (મૂળભૂત 30 છે)"
 
-#: ../policy/org.freedesktop.network-manager-settings.system.policy.in.h:4
-msgid "Modify system connections"
-msgstr "સિસ્ટમ જોડાણોને બદલો"
+#: ../test/nm-online.c:143
+msgid "Exit immediately if NetworkManager is not running or connecting"
+msgstr "તરત જ બહાર નીકળો જો NetworkManager ચાલી ન રહ્યુ હોય અથવા જોડાઇ ન રહ્યુ હોય"
 
-#: ../policy/org.freedesktop.network-manager-settings.system.policy.in.h:5
-msgid "System policy prevents modification of system settings"
-msgstr "સિસ્ટમ પોલિસી એ સિસ્ટમ સુયોજનોનાં બદલાવને અટકાવે છે"
+#: ../test/nm-online.c:144
+msgid "Don't print anything"
+msgstr "કંઇપણ છાપો નહિં"
 
-#: ../policy/org.freedesktop.network-manager-settings.system.policy.in.h:6
-msgid "System policy prevents modification of the persistent system hostname"
-msgstr "સિસ્ટમ પોલિસી એ નિરંતર સિસ્ટમ યજમાનનામનાં બદલાવને અટકાવે છે"
+#: ../test/nm-online.c:162
+msgid "Waits for a successful connection in NetworkManager."
+msgstr "NetworkManager માં સફળ જોડાણ માટે રાહ જોવે છે."
 
-#: ../policy/org.freedesktop.network-manager-settings.system.policy.in.h:7
-msgid "System policy prevents sharing connections via a protected WiFi network"
-msgstr "સિસ્ટમ પોલિસી એ સુરક્ષિત થયેલ WiFi નેટવર્ક મારફતે વહેંચણી જોડાણોને રોકી રહ્યા છે"
+#: ../test/nm-online.c:168 ../test/nm-online.c:177
+msgid "Invalid option.  Please use --help to see a list of valid options."
+msgstr "અયોગ્ય વિકલ્પ.  મહેરબાની કરીને યોગ્ય વિકલ્પોની યાદી ને જોવા માટે --help ને વાપરો."
 
-#: ../policy/org.freedesktop.network-manager-settings.system.policy.in.h:8
-msgid "System policy prevents sharing connections via an open WiFi network"
-msgstr "સિસ્ટમ પોલિસી એ ખુલ્લા WiFi નેટવર્ક મારફતે વહેંચણી જોડાણોને રોકી રહ્યા છે"
+#~ msgid "SCOPE"
+#~ msgstr "SCOPE"
+
+#~ msgid "DBUS-SERVICE"
+#~ msgstr "DBUS-SERVICE"
+
+#~ msgid "system"
+#~ msgstr "સિસ્ટમ"
+
+#~ msgid "user"
+#~ msgstr "વપરાશકર્તા"
+
+#~ msgid "System connections"
+#~ msgstr "સિસ્ટમ જોડાણો"
+
+#~ msgid "User connections"
+#~ msgstr "વપરાશકર્તા જોડાણો"
+
+#~ msgid "state: %s\n"
+#~ msgstr "પરિસ્થિતિ: %s\n"
+
+#~ msgid "Connection activated\n"
+#~ msgstr "સક્રિય થયેલ જોડાણ\n"
+
+#~ msgid "state: %s (%d)\n"
+#~ msgstr "પરિસ્થિતિ: %s (%d)\n"
+
+#~ msgid "Error: Obtaining active connection for '%s' failed."
+#~ msgstr "ભૂલ: '%s' માટે સક્રિય જોડાણ પ્રાપ્ત કરવામાં નિષ્ફળતા."
+
+#~ msgid "Active connection state: %s\n"
+#~ msgstr "સક્રિય જોડાણ પરિસ્થિતિ: %s\n"
+
+#~ msgid "Active connection path: %s\n"
+#~ msgstr "સક્રિય જોડાણ પાથ: %s\n"
+
+#~ msgid "IP4-SETTINGS"
+#~ msgstr "IP4-SETTINGS"
+
+#~ msgid "PREFIX"
+#~ msgstr "PREFIX"
+
+#~ msgid "unknown)"
+#~ msgstr "અજ્ઞાત)"
+
+#~ msgid "Device state: %d (%s)\n"
+#~ msgstr "ઉપકરણ પરિસ્થિતિ: %d (%s)\n"
+
+#~ msgid "not set"
+#~ msgstr "સુયોજિત નથી"
 
+#~ msgid "Auto %s"
+#~ msgstr "%s સ્વયં કરો"
diff --git a/po/hi.po b/po/hi.po
index 59b00c4a..542397c2 100644
--- a/po/hi.po
+++ b/po/hi.po
@@ -2,980 +2,1736 @@
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
 #
-# Rajesh Ranjan , 2010.
+# Rajesh Ranjan , 2010, 2012.
+# chandankumar , 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: hi\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-07-20 12:39+0530\n"
-"PO-Revision-Date: 2010-07-26 13:05+0530\n"
-"Last-Translator: Rajesh Ranjan \n"
-"Language-Team: Hindi \n"
+"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
+"product=NetworkManager&keywords=I18N+L10N&component=general\n"
+"POT-Creation-Date: 2012-11-13 15:25+0000\n"
+"PO-Revision-Date: 2012-11-23 14:11+0530\n"
+"Last-Translator: Rajesh Ranjan \n"
+"Language-Team: Hindi \n"
+"Language: hi\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: KBabel 1.11.4\n"
-"Plural-Forms: nplurals=2; plural=(n!=1);\n\n"
+"X-Generator: Lokalize 1.5\n"
+"Plural-Forms: nplurals=2; plural=(n!=1);\n"
+"\n"
 "\n"
 "\n"
 "\n"
 "\n"
 "\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/common.c:32 ../cli/src/common.c:44 ../cli/src/common.c:52
+#: ../cli/src/common.c:63 ../cli/src/connections.c:128
+#: ../cli/src/connections.c:162
+msgid "GROUP"
+msgstr "समूह"
+
+#. 0
+#: ../cli/src/common.c:33 ../cli/src/common.c:53
+msgid "ADDRESS"
+msgstr "पता"
+
+#. 1
+#: ../cli/src/common.c:34 ../cli/src/common.c:54
+msgid "ROUTE"
+msgstr "रूट"
+
+#. 2
+#: ../cli/src/common.c:35 ../cli/src/common.c:55
+msgid "DNS"
+msgstr "DNS"
+
+#. 3
+#: ../cli/src/common.c:36 ../cli/src/common.c:56
+msgid "DOMAIN"
+msgstr "DOMAIN"
+
+#. 4
+#: ../cli/src/common.c:37
+msgid "WINS"
+msgstr "जीता"
+
+#. 0
+#: ../cli/src/common.c:45 ../cli/src/common.c:64
+msgid "OPTION"
+msgstr "विकल्प"
+
+#: ../cli/src/common.c:366
+msgid "unmanaged"
+msgstr "अप्रबंधित"
+
+#: ../cli/src/common.c:368
+msgid "unavailable"
+msgstr "अनुपलब्ध"
+
+#: ../cli/src/common.c:370 ../cli/src/network-manager.c:120
+msgid "disconnected"
+msgstr "डिसकनेक्टेड"
+
+#: ../cli/src/common.c:372
+msgid "connecting (prepare)"
+msgstr "कनेक्टिंग (तैयार)"
+
+#: ../cli/src/common.c:374
+msgid "connecting (configuring)"
+msgstr "कनेक्टिंग (विन्यस्त कर रहा है)"
+
+#: ../cli/src/common.c:376
+msgid "connecting (need authentication)"
+msgstr "कनेक्टिंग (सत्यापन जरूरी)"
+
+#: ../cli/src/common.c:378
+msgid "connecting (getting IP configuration)"
+msgstr "कनेक्टिंग (IP विन्यास पा रहा है)"
+
+#: ../cli/src/common.c:380
+msgid "connecting (checking IP connectivity)"
+msgstr "कनेक्टिंग (IP कनेक्शन जाँच रहा है)"
+
+#: ../cli/src/common.c:382
+msgid "connecting (starting secondary connections)"
+msgstr "जुड़ रहा हैं (माध्यमिक कनेक्शन शुरू करने के लिए)"
+
+#: ../cli/src/common.c:384 ../cli/src/network-manager.c:116
+msgid "connected"
+msgstr "कनेक्टेड"
+
+#: ../cli/src/common.c:386 ../cli/src/connections.c:635
+msgid "deactivating"
+msgstr "अक्रिय कर रहा है"
+
+#: ../cli/src/common.c:388
+msgid "connection failed"
+msgstr "कनेक्शन विफल"
+
+#: ../cli/src/common.c:390 ../cli/src/connections.c:638
+#: ../cli/src/connections.c:661 ../cli/src/connections.c:1353
+#: ../cli/src/devices.c:645 ../cli/src/network-manager.c:123
+#: ../cli/src/network-manager.c:185 ../cli/src/network-manager.c:188
+#: ../cli/src/network-manager.c:197 ../cli/src/network-manager.c:257
+#: ../cli/src/network-manager.c:273 ../cli/src/network-manager.c:431
+#: ../cli/src/network-manager.c:486 ../cli/src/network-manager.c:524
+#: ../cli/src/network-manager.c:563 ../cli/src/settings.c:593
+#: ../cli/src/settings.c:621 ../cli/src/utils.c:531 ../src/main.c:451
+#: ../src/main.c:470
+msgid "unknown"
+msgstr "अज्ञात"
+
+#: ../cli/src/common.c:399
+msgid "No reason given"
+msgstr "कोई कारण नहीं दिया गया"
+
+#: ../cli/src/common.c:402
+msgid "Unknown error"
+msgstr "अज्ञात त्रुटि"
+
+#: ../cli/src/common.c:405
+msgid "Device is now managed"
+msgstr "युक्ति अब प्रबंधित है"
+
+#: ../cli/src/common.c:408
+msgid "Device is now unmanaged"
+msgstr "युक्ति अब प्रबंधित नहीं है"
+
+#: ../cli/src/common.c:411
+msgid "The device could not be readied for configuration"
+msgstr "युक्ति विन्यास के लिए नहीं सज सकता है"
+
+#: ../cli/src/common.c:414
+msgid ""
+"IP configuration could not be reserved (no available address, timeout, etc.)"
+msgstr ""
+"आईपी ​​विन्यास (कोई उपलब्ध पता नहीं, मध्यांतर, आदि) आरक्षित नहीं किया जा सकता "
+"है"
+
+#: ../cli/src/common.c:417
+msgid "The IP configuration is no longer valid"
+msgstr "आईपी ​​विन्यास अब मान्य नहीं है"
+
+#: ../cli/src/common.c:420
+msgid "Secrets were required, but not provided"
+msgstr "गोपनीयता की आवश्यकता है, लेकिन नहीं प्रदान की गई"
+
+#: ../cli/src/common.c:423
+msgid "802.1X supplicant disconnected"
+msgstr "802.1X निवेदक डिस्कनेक्ट हो गया"
+
+#: ../cli/src/common.c:426
+msgid "802.1X supplicant configuration failed"
+msgstr "802.1X निवेदक विन्यास विफल रहा"
+
+#: ../cli/src/common.c:429
+msgid "802.1X supplicant failed"
+msgstr "802.1X निवेदक विफल रहा"
+
+#: ../cli/src/common.c:432
+msgid "802.1X supplicant took too long to authenticate"
+msgstr "802.1X निवेदक को प्रमाणित करने में बहुत ज्यादा समय लग रहा हैं"
+
+#: ../cli/src/common.c:435
+msgid "PPP service failed to start"
+msgstr "PPP सेवा आरंभ होने में विफल रहा"
+
+#: ../cli/src/common.c:438
+msgid "PPP service disconnected"
+msgstr "PPP सेवा डिस्कनेक्ट हो गया"
+
+#: ../cli/src/common.c:441
+msgid "PPP failed"
+msgstr "PPP विफल"
+
+#: ../cli/src/common.c:444
+msgid "DHCP client failed to start"
+msgstr "DHCP क्लाइंट के लिए प्रारंभ करने में विफल"
+
+#: ../cli/src/common.c:447
+msgid "DHCP client error"
+msgstr "DHCP क्लाएंट त्रुटि"
+
+#: ../cli/src/common.c:450
+msgid "DHCP client failed"
+msgstr "DHCP क्लाइंट विफल"
+
+#: ../cli/src/common.c:453
+msgid "Shared connection service failed to start"
+msgstr "साझा कनेक्शन सेवा प्रारंभ करने में विफल"
+
+#: ../cli/src/common.c:456
+msgid "Shared connection service failed"
+msgstr "साझा कनेक्शन सेवा विफल"
+
+#: ../cli/src/common.c:459
+msgid "AutoIP service failed to start"
+msgstr "AutoIP  सेवा आरंभ होने में विफल रहा"
+
+#: ../cli/src/common.c:462
+msgid "AutoIP service error"
+msgstr "AutoIP सेवा त्रुटि"
+
+#: ../cli/src/common.c:465
+msgid "AutoIP service failed"
+msgstr "VPN सेवा विफल"
+
+#: ../cli/src/common.c:468
+msgid "The line is busy"
+msgstr "लाइन व्यस्त है"
+
+#: ../cli/src/common.c:471
+msgid "No dial tone"
+msgstr "डायल टोन नहीं"
+
+#: ../cli/src/common.c:474
+msgid "No carrier could be established"
+msgstr "कोई वाहक स्थापित नहीं किया जा सकता"
+
+#: ../cli/src/common.c:477
+msgid "The dialing request timed out"
+msgstr "डायलन अनुरोध का समय समाप्त"
+
+#: ../cli/src/common.c:480
+msgid "The dialing attempt failed"
+msgstr "डायलन करने का प्रयास विफल"
+
+#: ../cli/src/common.c:483
+msgid "Modem initialization failed"
+msgstr "मोडेम आरम्भीकरण असफ़ल रहा"
+
+#: ../cli/src/common.c:486
+msgid "Failed to select the specified APN"
+msgstr "निर्दिष्ट APN का चयन करने में विफल"
+
+#: ../cli/src/common.c:489
+msgid "Not searching for networks"
+msgstr "संजाल के लिए कोई खोज नहीं"
+
+#: ../cli/src/common.c:492
+msgid "Network registration denied"
+msgstr "नेटवर्क पंजीकरण से इनकार किया"
+
+#: ../cli/src/common.c:495
+msgid "Network registration timed out"
+msgstr "संजाल पंजीयन समयबाह्य हो गई है"
+
+#: ../cli/src/common.c:498
+msgid "Failed to register with the requested network"
+msgstr "अनुरोध नेटवर्क के साथ पंजीकृत करने में विफल"
+
+#: ../cli/src/common.c:501
+msgid "PIN check failed"
+msgstr "PIN चेक करने में विफल रहा"
+
+#: ../cli/src/common.c:504
+msgid "Necessary firmware for the device may be missing"
+msgstr "इस उपकरण के लिए आवश्यक फर्मवेयर लापता हो सकता है"
+
+#: ../cli/src/common.c:507
+msgid "The device was removed"
+msgstr "उपकरण हटाया गया था"
+
+#: ../cli/src/common.c:510
+msgid "NetworkManager went to sleep"
+msgstr "नेटवर्कप्रबंधक सो गया"
+
+#: ../cli/src/common.c:513
+msgid "The device's active connection disappeared"
+msgstr "उपकरण सक्रिय कनेक्शन गायब हो गया"
+
+#: ../cli/src/common.c:516
+msgid "Device disconnected by user or client"
+msgstr "युक्ति उपयोगकर्ता या ग्राहक द्वारा डिस्कनेक्ट कर दिया गया"
+
+#: ../cli/src/common.c:519
+msgid "Carrier/link changed"
+msgstr " कैरियर/लिंक बदल दिया गया"
+
+#: ../cli/src/common.c:522
+msgid "The device's existing connection was assumed"
+msgstr "डिवाइस मौजूदा कनेक्शन मान लिया गया था."
+
+#: ../cli/src/common.c:525
+msgid "The supplicant is now available"
+msgstr "निवेदक अब उपलब्ध है"
+
+#: ../cli/src/common.c:528
+msgid "The modem could not be found"
+msgstr "मॉडेम पाया नहीं जा सका"
+
+#: ../cli/src/common.c:531
+msgid "The Bluetooth connection failed or timed out"
+msgstr "ब्लूटूथ कनेक्शन में विफल रहा है या समयबाह्य हो गई है"
+
+#: ../cli/src/common.c:534
+msgid "GSM Modem's SIM card not inserted"
+msgstr "जीएसएम मोडेम सिम कार्ड नहीं सम्मिलित किया गया हैं"
+
+#: ../cli/src/common.c:537
+msgid "GSM Modem's SIM PIN required"
+msgstr "जीएसएम मोडेम सिम पिन आवश्यक "
+
+#: ../cli/src/common.c:540
+msgid "GSM Modem's SIM PUK required"
+msgstr "जीएसएम मोडेम सिम PUK की आवश्यकता है"
+
+#: ../cli/src/common.c:543
+msgid "GSM Modem's SIM wrong"
+msgstr "जीएसएम मोडेम सिम गलत"
+
+#: ../cli/src/common.c:546
+msgid "InfiniBand device does not support connected mode"
+msgstr "InfiniBand डिवाइस जुड़ा हुआ मोड का समर्थन नहीं करता हैं"
+
+#: ../cli/src/common.c:549
+msgid "A dependency of the connection failed"
+msgstr "कनेक्शन के एक निर्भरता विफल रहा"
+
+#: ../cli/src/common.c:552
+msgid "A problem with the RFC 2684 Ethernet over ADSL bridge"
+msgstr "ADSL ब्रिज पर आरएफसी 2684 ईथरनेट के साथ एक समस्या"
+
+#: ../cli/src/common.c:555
+msgid "ModemManager is unavailable"
+msgstr "ModemManager अनुपलब्ध है"
+
+#: ../cli/src/common.c:558
+#| msgid "The modem could not be found"
+msgid "The Wi-Fi network could not be found"
+msgstr "वाइ-फाइ संजाल पाया नहीं जा सका"
+
+#: ../cli/src/common.c:561
+#| msgid "A dependency of the connection failed"
+msgid "A secondary connection of the base connection failed"
+msgstr "बेस कनेक्शन का दूसरा कनेक्शन विफल रहा"
+
+#: ../cli/src/common.c:564 ../cli/src/devices.c:295 ../cli/src/devices.c:311
+#: ../cli/src/devices.c:433 ../cli/src/devices.c:477
+msgid "Unknown"
+msgstr "अज्ञात"
+
+#. 0
+#. used only for 'GENERAL' group listing
+#: ../cli/src/connections.c:59 ../cli/src/connections.c:129
+#: ../cli/src/devices.c:107 ../cli/src/devices.c:131 ../cli/src/devices.c:141
+#: ../cli/src/devices.c:151 ../cli/src/devices.c:165 ../cli/src/devices.c:179
+#: ../cli/src/devices.c:201 ../cli/src/devices.c:217 ../cli/src/devices.c:226
 msgid "NAME"
-msgstr "NAME"
+msgstr "नाम"
 
 #. 0
-#: ../cli/src/connections.c:60 ../cli/src/connections.c:75
+#. 1
+#: ../cli/src/connections.c:60 ../cli/src/connections.c:130
 msgid "UUID"
 msgstr "UUID"
 
 #. 1
-#: ../cli/src/connections.c:61
-msgid "DEVICES"
-msgstr "DEVICES"
+#. 0
+#. 1
+#. 2
+#: ../cli/src/connections.c:61 ../cli/src/connections.c:163
+#: ../cli/src/devices.c:71 ../cli/src/devices.c:109 ../cli/src/devices.c:204
+msgid "TYPE"
+msgstr "प्रकार"
 
 #. 2
-#: ../cli/src/connections.c:62 ../cli/src/connections.c:77
-msgid "SCOPE"
-msgstr "SCOPE"
+#: ../cli/src/connections.c:62
+msgid "TIMESTAMP"
+msgstr "समय-चिह्न"
 
 #. 3
 #: ../cli/src/connections.c:63
-msgid "DEFAULT"
-msgstr "DEFAULT"
+msgid "TIMESTAMP-REAL"
+msgstr "समय-चिह्न अचल"
 
 #. 4
-#: ../cli/src/connections.c:64
-msgid "DBUS-SERVICE"
-msgstr "DBUS-SERVICE"
+#. 13
+#: ../cli/src/connections.c:64 ../cli/src/devices.c:121
+msgid "AUTOCONNECT"
+msgstr "ऑटो कनेक्ट"
 
 #. 5
 #: ../cli/src/connections.c:65
+msgid "READONLY"
+msgstr "पढ़ने लायक"
+
+#. 6
+#. 8
+#. 2
+#. 11
+#. 5
+#: ../cli/src/connections.c:66 ../cli/src/connections.c:137
+#: ../cli/src/devices.c:73 ../cli/src/devices.c:191 ../cli/src/devices.c:207
+msgid "DBUS-PATH"
+msgstr "DBUS पथ"
+
+#. 2
+#: ../cli/src/connections.c:131
+msgid "DEVICES"
+msgstr "उपकरण"
+
+#. 3
+#. 1
+#. 8
+#. 1
+#: ../cli/src/connections.c:132 ../cli/src/devices.c:72
+#: ../cli/src/devices.c:116 ../cli/src/network-manager.c:39
+msgid "STATE"
+msgstr "स्थिति"
+
+#. 4
+#: ../cli/src/connections.c:133
+msgid "DEFAULT"
+msgstr "डिफ़ॉल्ट"
+
+#. 5
+#: ../cli/src/connections.c:134
+msgid "DEFAULT6"
+msgstr "DEFAULT6"
+
+#. 6
+#: ../cli/src/connections.c:135
 msgid "SPEC-OBJECT"
 msgstr "SPEC-OBJECT"
 
-#. 6
-#: ../cli/src/connections.c:66
+#. 7
+#. 1
+#: ../cli/src/connections.c:136 ../cli/src/connections.c:150
 msgid "VPN"
 msgstr "VPN"
 
-#. 1
+#. 9
+#: ../cli/src/connections.c:138
+msgid "CON-PATH"
+msgstr "CON-PATH"
+
+#. 10
+#: ../cli/src/connections.c:139
+msgid "ZONE"
+msgstr "क्षेत्र"
+
+#. 11
+#: ../cli/src/connections.c:140
+msgid "MASTER-PATH"
+msgstr "MASTER-PATH"
+
+#: ../cli/src/connections.c:148 ../cli/src/devices.c:82
+msgid "GENERAL"
+msgstr "सामान्य"
+
 #. 0
+#: ../cli/src/connections.c:149
+msgid "IP"
+msgstr "आईपी"
+
 #. 1
-#: ../cli/src/connections.c:76 ../cli/src/devices.c:61 ../cli/src/devices.c:87
-msgid "TYPE"
-msgstr "TYPE"
+#: ../cli/src/connections.c:164
+msgid "USERNAME"
+msgstr "उपयोक्तानाम"
+
+#. 2
+#: ../cli/src/connections.c:165
+msgid "GATEWAY"
+msgstr "गेटवे"
 
 #. 3
-#: ../cli/src/connections.c:78
-msgid "TIMESTAMP"
-msgstr "TIMESTAMP"
+#: ../cli/src/connections.c:166
+msgid "BANNER"
+msgstr "ध्वज"
 
 #. 4
-#: ../cli/src/connections.c:79
-msgid "TIMESTAMP-REAL"
-msgstr "TIMESTAMP-REAL"
+#: ../cli/src/connections.c:167
+msgid "VPN-STATE"
+msgstr "VPN-स्थिति"
 
 #. 5
-#: ../cli/src/connections.c:80
-msgid "AUTOCONNECT"
-msgstr "AUTOCONNECT"
-
-#. 6
-#: ../cli/src/connections.c:81
-msgid "READONLY"
-msgstr "READONLY"
-
-#: ../cli/src/connections.c:157
-#, c-format
+#: ../cli/src/connections.c:168
+msgid "CFG"
+msgstr "CFG"
+
+#: ../cli/src/connections.c:190
+#, c-format
+#| msgid ""
+#| "Usage: nmcli con { COMMAND | help }\n"
+#| "  COMMAND := { list | status | up | down | delete }\n"
+#| "\n"
+#| "  list [id  | uuid ]\n"
+#| "  status [id  | uuid  | path ]\n"
+#| "  up id  | uuid  [iface ] [ap ] [nsp ] [--"
+#| "nowait] [--timeout ]\n"
+#| "  up id  | uuid  [iface ] [ap ] [--nowait] [--"
+#| "timeout ]\n"
+#| "  down id  | uuid \n"
+#| "  delete id  | uuid \n"
 msgid ""
-"Usage: nmcli con { COMMAND | help }\n"
-"  COMMAND := { list | status | up | down }\n"
+"Usage: nmcli connection { COMMAND | help }\n"
+"  COMMAND := { list | status | up | down | delete }\n"
 "\n"
-"  list [id  | uuid  | system | user]\n"
-"  status\n"
-"  up id  | uuid  [iface ] [ap ] [--nowait] [--timeout "
+"  list [id  | uuid ]\n"
+"  status [id  | uuid  | path ]\n"
+"  up id  | uuid  [iface ] [ap ] [nsp ] [--"
+"nowait] [--timeout ]\n"
+"  up id  | uuid  [iface ] [ap ] [--nowait] [--timeout "
 "]\n"
 "  down id  | uuid \n"
+"  delete id  | uuid \n"
+"\n"
 msgstr ""
-"प्रयोग: nmcli con { COMMAND | help }\n"
-"  COMMAND := { list | status | up | down }\n"
+"प्रयोग: nmcli connection { COMMAND | help }\n"
+"  COMMAND := { list | status | up | down | delete }\n"
 "\n"
-"  list [id  | uuid  | system | user]\n"
-"  status\n"
-"  up id  | uuid  [iface ] [ap ] [--nowait] [--timeout "
+"  list [id  | uuid ]\n"
+"  status [id  | uuid  | path ]\n"
+"  up id  | uuid  [iface ] [ap ] [nsp ] [--"
+"nowait] [--timeout ]\n"
+"  up id  | uuid  [iface ] [ap ] [--nowait] [--timeout "
 "]\n"
 "  down id  | uuid \n"
+"  delete id  | uuid \n"
+"\n"
 
-#: ../cli/src/connections.c:197 ../cli/src/connections.c:536
+#: ../cli/src/connections.c:251 ../cli/src/connections.c:611
 #, 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:253 ../cli/src/connections.c:613
 #, c-format
 msgid "Error: 'con list': %s; allowed fields: %s"
 msgstr "त्रुटि: 'con list': %s; अनुमतिप्राप्त क्षेत्र: %s"
 
-#: ../cli/src/connections.c:207
+#: ../cli/src/connections.c:261
 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:486
 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:487 ../cli/src/connections.c:488
+#: ../cli/src/connections.c:716 ../cli/src/connections.c:717
+#: ../cli/src/connections.c:719 ../cli/src/devices.c:441
+#: ../cli/src/devices.c:494 ../cli/src/devices.c:610 ../cli/src/devices.c:611
+#: ../cli/src/devices.c:612 ../cli/src/devices.c:644 ../cli/src/devices.c:671
+#: ../cli/src/devices.c:672 ../cli/src/devices.c:673 ../cli/src/devices.c:674
+#: ../cli/src/devices.c:675 ../cli/src/network-manager.c:267
+#: ../cli/src/settings.c:712 ../cli/src/settings.c:787
+#: ../cli/src/settings.c:907 ../cli/src/settings.c:1189
+#: ../cli/src/settings.c:1190 ../cli/src/settings.c:1192
+#: ../cli/src/settings.c:1194 ../cli/src/settings.c:1195
+#: ../cli/src/settings.c:1326 ../cli/src/settings.c:1327
+#: ../cli/src/settings.c:1328 ../cli/src/settings.c:1329
+#: ../cli/src/settings.c:1406 ../cli/src/settings.c:1407
+#: ../cli/src/settings.c:1408 ../cli/src/settings.c:1409
+#: ../cli/src/settings.c:1410 ../cli/src/settings.c:1411
+#: ../cli/src/settings.c:1412 ../cli/src/settings.c:1413
+#: ../cli/src/settings.c:1414 ../cli/src/settings.c:1415
+#: ../cli/src/settings.c:1416 ../cli/src/settings.c:1417
+#: ../cli/src/settings.c:1418 ../cli/src/settings.c:1489
 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:487 ../cli/src/connections.c:488
+#: ../cli/src/connections.c:716 ../cli/src/connections.c:717
+#: ../cli/src/connections.c:719 ../cli/src/devices.c:441
+#: ../cli/src/devices.c:494 ../cli/src/devices.c:610 ../cli/src/devices.c:611
+#: ../cli/src/devices.c:612 ../cli/src/devices.c:644 ../cli/src/devices.c:671
+#: ../cli/src/devices.c:672 ../cli/src/devices.c:673 ../cli/src/devices.c:674
+#: ../cli/src/devices.c:675 ../cli/src/network-manager.c:269
+#: ../cli/src/settings.c:712 ../cli/src/settings.c:714
+#: ../cli/src/settings.c:787 ../cli/src/settings.c:907
+#: ../cli/src/settings.c:1189 ../cli/src/settings.c:1190
+#: ../cli/src/settings.c:1192 ../cli/src/settings.c:1194
+#: ../cli/src/settings.c:1195 ../cli/src/settings.c:1326
+#: ../cli/src/settings.c:1327 ../cli/src/settings.c:1328
+#: ../cli/src/settings.c:1329 ../cli/src/settings.c:1406
+#: ../cli/src/settings.c:1407 ../cli/src/settings.c:1408
+#: ../cli/src/settings.c:1409 ../cli/src/settings.c:1410
+#: ../cli/src/settings.c:1411 ../cli/src/settings.c:1412
+#: ../cli/src/settings.c:1413 ../cli/src/settings.c:1414
+#: ../cli/src/settings.c:1415 ../cli/src/settings.c:1416
+#: ../cli/src/settings.c:1417 ../cli/src/settings.c:1418
+#: ../cli/src/settings.c:1489
 msgid "no"
 msgstr "नहीं"
 
-#: ../cli/src/connections.c:457 ../cli/src/connections.c:500
-msgid "System connections"
-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:562
+msgid "Connection list"
+msgstr "कनेक्शन सूची"
+
+#: ../cli/src/connections.c:575 ../cli/src/connections.c:1112
+#: ../cli/src/connections.c:1650 ../cli/src/connections.c:1665
+#: ../cli/src/connections.c:1674 ../cli/src/connections.c:1684
+#: ../cli/src/connections.c:1696 ../cli/src/connections.c:1804
+#: ../cli/src/connections.c:1906 ../cli/src/devices.c:1122
+#: ../cli/src/devices.c:1132 ../cli/src/devices.c:1250
+#: ../cli/src/devices.c:1258 ../cli/src/devices.c:1622
+#: ../cli/src/devices.c:1629 ../cli/src/devices.c:1643
+#: ../cli/src/devices.c:1650 ../cli/src/devices.c:1667
+#: ../cli/src/devices.c:1678 ../cli/src/devices.c:1899
+#: ../cli/src/devices.c:1906
 #, c-format
 msgid "Error: %s argument is missing."
 msgstr "त्रुटि: %s तर्क अनुपस्थित है."
 
-#: ../cli/src/connections.c:487
+#: ../cli/src/connections.c:588
 #, 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:594 ../cli/src/connections.c:1709
+#: ../cli/src/connections.c:1821 ../cli/src/connections.c:1913
+#: ../cli/src/devices.c:906 ../cli/src/devices.c:986 ../cli/src/devices.c:1146
+#: ../cli/src/devices.c:1264 ../cli/src/devices.c:1691
+#: ../cli/src/devices.c:1912
 #, c-format
 msgid "Unknown parameter: %s\n"
 msgstr "अज्ञात पैरामीटर: %s\n"
 
-#: ../cli/src/connections.c:528
+#: ../cli/src/connections.c:603
 #, 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:618 ../cli/src/connections.c:2009
+#: ../cli/src/devices.c:2123 ../cli/src/network-manager.c:599
 #, c-format
 msgid "Error: %s."
 msgstr "त्रुटि: %s."
 
-#: ../cli/src/connections.c:649
-#, c-format
-msgid "Error: 'con status': %s"
-msgstr "त्रुटि: 'con status': %s"
-
-#: ../cli/src/connections.c:651
-#, c-format
-msgid "Error: 'con status': %s; allowed fields: %s"
-msgstr "त्रुटि: 'con status': %s; अनुमतिप्राप्त क्षेत्र: %s"
-
-#: ../cli/src/connections.c:658
-msgid "Active connections"
-msgstr "सक्रिय कनेक्शन"
-
-#: ../cli/src/connections.c:1026
-#, c-format
-msgid "no active connection on device '%s'"
-msgstr "युक्ति '%s' पर कोई सक्रिय कनेक्शन नहीं"
-
-#: ../cli/src/connections.c:1034
-#, c-format
-msgid "no active connection or device"
-msgstr "कोई सक्रिय कनेक्शन या युक्ति नहीं"
-
-#: ../cli/src/connections.c:1084
-#, c-format
-msgid "device '%s' not compatible with connection '%s'"
-msgstr "युक्ति '%s' '%s' के साथ संगत नहीं है"
-
-#: ../cli/src/connections.c:1086
-#, c-format
-msgid "no device found for connection '%s'"
-msgstr "'%s' कनेक्शन के लिए कोई युक्ति नहीं मिला"
-
-#: ../cli/src/connections.c:1097
+#: ../cli/src/connections.c:631
 msgid "activating"
 msgstr "सक्रिय कर रहा है"
 
-#: ../cli/src/connections.c:1099
+#: ../cli/src/connections.c:633
 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
-msgid "unknown"
-msgstr "अज्ञात"
-
-#: ../cli/src/connections.c:1111
+#: ../cli/src/connections.c:647
 msgid "VPN connecting (prepare)"
 msgstr "VPN कनेक्टिंग (तैयार)"
 
-#: ../cli/src/connections.c:1113
+#: ../cli/src/connections.c:649
 msgid "VPN connecting (need authentication)"
 msgstr "VPN कनेक्टिंग (सत्यापन जरूरी)"
 
-#: ../cli/src/connections.c:1115
+#: ../cli/src/connections.c:651
 msgid "VPN connecting"
 msgstr "VPN कनेक्टिंग"
 
-#: ../cli/src/connections.c:1117
+#: ../cli/src/connections.c:653
 msgid "VPN connecting (getting IP configuration)"
 msgstr "VPN कनेक्टिंग (IP विन्यास पा रहा है)"
 
-#: ../cli/src/connections.c:1119
+#: ../cli/src/connections.c:655
 msgid "VPN connected"
 msgstr "VPN कनेक्टेड"
 
-#: ../cli/src/connections.c:1121
+#: ../cli/src/connections.c:657
 msgid "VPN connection failed"
 msgstr "VPN कनेक्शन विफल"
 
-#: ../cli/src/connections.c:1123
+#: ../cli/src/connections.c:659
 msgid "VPN disconnected"
 msgstr "VPN डिसकनेक्टेंड"
 
-#: ../cli/src/connections.c:1134
+#: ../cli/src/connections.c:712 ../cli/src/connections.c:722
+msgid "N/A"
+msgstr "N/A"
+
+#: ../cli/src/connections.c:916 ../cli/src/connections.c:1140
+#, c-format
+msgid "Error: 'con status': %s"
+msgstr "त्रुटि: 'con status': %s"
+
+#: ../cli/src/connections.c:918 ../cli/src/connections.c:1142
+#, c-format
+msgid "Error: 'con status': %s; allowed fields: %s"
+msgstr "त्रुटि: 'con status': %s; अनुमतिप्राप्त क्षेत्र: %s"
+
+#: ../cli/src/connections.c:926
+msgid "Active connection details"
+msgstr "सक्रिय कनेक्शन विवरण"
+
+#: ../cli/src/connections.c:1062 ../cli/src/connections.c:1724
+#: ../cli/src/connections.c:1836 ../cli/src/connections.c:1927
+#: ../cli/src/devices.c:933 ../cli/src/devices.c:995 ../cli/src/devices.c:1161
+#: ../cli/src/devices.c:1294 ../cli/src/devices.c:1713
+#: ../cli/src/devices.c:1941 ../cli/src/network-manager.c:311
+#, c-format
+msgid "Error: Can't find out if NetworkManager is running: %s."
+msgstr "त्रुटि: यदि नेटवर्कप्रबंधक चल रहा है तो नहीं कर सकते.: %s."
+
+#: ../cli/src/connections.c:1066 ../cli/src/connections.c:1728
+#: ../cli/src/connections.c:1840 ../cli/src/connections.c:1931
+#: ../cli/src/devices.c:937 ../cli/src/devices.c:999 ../cli/src/devices.c:1165
+#: ../cli/src/devices.c:1298 ../cli/src/devices.c:1717
+#: ../cli/src/devices.c:1945 ../cli/src/network-manager.c:315
+#, c-format
+msgid "Error: NetworkManager is not running."
+msgstr "त्रुटि: यदि नेटवर्कप्रबंधक नहीं चल रहा है "
+
+#: ../cli/src/connections.c:1098
+msgid "Active connections"
+msgstr "सक्रिय कनेक्शन"
+
+#: ../cli/src/connections.c:1123
+#, c-format
+msgid "Error: '%s' is not an active connection."
+msgstr "त्रुटि:कोई '%s' सक्रिय कनेक्शन नहीं है."
+
+#: ../cli/src/connections.c:1128
+#, c-format
+msgid "Error: unknown parameter: %s"
+msgstr "त्रुटि: अज्ञात पैरामीटर: %s"
+
+#: ../cli/src/connections.c:1235
+#, c-format
+msgid "no active connection on device '%s'"
+msgstr "युक्ति '%s' पर कोई सक्रिय कनेक्शन नहीं"
+
+#: ../cli/src/connections.c:1243
+msgid "no active connection or device"
+msgstr "कोई सक्रिय कनेक्शन या युक्ति नहीं"
+
+#: ../cli/src/connections.c:1314
+#, c-format
+msgid "device '%s' not compatible with connection '%s'"
+msgstr "युक्ति '%s' '%s' के साथ संगत नहीं है"
+
+#: ../cli/src/connections.c:1317
+#, c-format
+msgid "no device found for connection '%s'"
+msgstr "'%s' कनेक्शन के लिए कोई युक्ति नहीं मिला"
+
+#: ../cli/src/connections.c:1329
 msgid "unknown reason"
 msgstr "अज्ञात कारण"
 
-#: ../cli/src/connections.c:1136
+#: ../cli/src/connections.c:1331
 msgid "none"
 msgstr "कुछ नहीं"
 
-#: ../cli/src/connections.c:1138
+#: ../cli/src/connections.c:1333
 msgid "the user was disconnected"
 msgstr "उपयोक्ता डिसकनेक्ट किया गया था"
 
-#: ../cli/src/connections.c:1140
+#: ../cli/src/connections.c:1335
 msgid "the base network connection was interrupted"
 msgstr "मौलिक संजाल कनेक्शन में बाधा आई थी"
 
-#: ../cli/src/connections.c:1142
+#: ../cli/src/connections.c:1337
 msgid "the VPN service stopped unexpectedly"
 msgstr "VPN सेवा अचानक रुक गई"
 
-#: ../cli/src/connections.c:1144
+#: ../cli/src/connections.c:1339
 msgid "the VPN service returned invalid configuration"
 msgstr "VPN सेवा ने अवैध विन्यास वापस किया"
 
-#: ../cli/src/connections.c:1146
+#: ../cli/src/connections.c:1341
 msgid "the connection attempt timed out"
 msgstr "कनेक्शन प्रयास का समय समाप्त"
 
-#: ../cli/src/connections.c:1148
+#: ../cli/src/connections.c:1343
 msgid "the VPN service did not start in time"
 msgstr "VPN सेवा समय पर आरंभ नहीं हुआ"
 
-#: ../cli/src/connections.c:1150
+#: ../cli/src/connections.c:1345
 msgid "the VPN service failed to start"
 msgstr "VPN सेवा आरंभ होने में विफल रहा"
 
-#: ../cli/src/connections.c:1152
+#: ../cli/src/connections.c:1347
 msgid "no valid VPN secrets"
 msgstr "कोई वैध VPN गुप्त नहीं"
 
-#: ../cli/src/connections.c:1154
+#: ../cli/src/connections.c:1349
 msgid "invalid VPN secrets"
 msgstr "अवैध VPN गुप्त"
 
-#: ../cli/src/connections.c:1156
+#: ../cli/src/connections.c:1351
 msgid "the connection was removed"
 msgstr "कनेक्शन हटाया गया था"
 
-#: ../cli/src/connections.c:1170
-#, c-format
-msgid "state: %s\n"
-msgstr "स्थिति: %s\n"
-
-#: ../cli/src/connections.c:1173 ../cli/src/connections.c:1199
+#: ../cli/src/connections.c:1368 ../cli/src/connections.c:1573
 #, c-format
-msgid "Connection activated\n"
-msgstr "कनेक्शन सक्रिय किया गया\n"
+msgid "Connection successfully activated (D-Bus active path: %s)\n"
+msgstr "कनेक्शन सफलतापूर्वक सक्रिय किया गया (डी बस सक्रिय पथ: %s)\n"
 
-#: ../cli/src/connections.c:1176
+#. Active connection failed and dissapeared, quit.
+#: ../cli/src/connections.c:1373 ../cli/src/connections.c:1474
 #, c-format
 msgid "Error: Connection activation failed."
 msgstr "त्रुटि: कनेक्शन सक्रिय किया जाना विफल."
 
-#: ../cli/src/connections.c:1195
+#: ../cli/src/connections.c:1398
 #, c-format
-msgid "state: %s (%d)\n"
-msgstr "स्थिति: %s (%d)\n"
+msgid "VPN connection successfully activated (D-Bus active path: %s)\n"
+msgstr "VPN कनेक्शन सफलतापूर्वक सक्रिय किया गया (डी बस सक्रिय पथ: %s)\n"
 
-#: ../cli/src/connections.c:1205
+#: ../cli/src/connections.c:1406
 #, c-format
 msgid "Error: Connection activation failed: %s."
 msgstr "त्रुटि: कनेक्शन सक्रियकरण विफल: %s."
 
-#: ../cli/src/connections.c:1222 ../cli/src/devices.c:811
+#: ../cli/src/connections.c:1503 ../cli/src/devices.c:1055
 #, c-format
 msgid "Error: Timeout %d sec expired."
 msgstr "त्रुटि: समय समाप्ति %d सेकेंड में समाप्त."
 
-#: ../cli/src/connections.c:1265
+#: ../cli/src/connections.c:1564
 #, 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
-#, c-format
-msgid "Active connection state: %s\n"
-msgstr "सक्रिय कनेक्शन स्थिति: %s\n"
-
-#: ../cli/src/connections.c:1289
-#, 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:1658 ../cli/src/connections.c:1812
+#: ../cli/src/connections.c:1940
 #, c-format
 msgid "Error: Unknown connection: %s."
 msgstr "त्रुटि: अज्ञात कनेक्शन: %s."
 
-#: ../cli/src/connections.c:1378 ../cli/src/devices.c:882
+#: ../cli/src/connections.c:1704 ../cli/src/devices.c:1140
+#: ../cli/src/devices.c:1686
 #, 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:1717 ../cli/src/connections.c:1829
+#: ../cli/src/connections.c:1920
 #, c-format
 msgid "Error: id or uuid has to be specified."
 msgstr "त्रुटि: id या uuid को निर्दिष्ट किया जाना है."
 
-#: ../cli/src/connections.c:1411
+#: ../cli/src/connections.c:1749
 #, c-format
 msgid "Error: No suitable device found: %s."
 msgstr "त्रुटि: कोई उपयुक्त युक्ति नहीं मिला: %s."
 
-#: ../cli/src/connections.c:1413
+#: ../cli/src/connections.c:1751
 #, c-format
 msgid "Error: No suitable device found."
 msgstr "त्रुटि: कोई उपयुक्त युक्ति नहीं मिला."
 
-#: ../cli/src/connections.c:1505
+#: ../cli/src/connections.c:1865
 #, c-format
 msgid "Warning: Connection not active\n"
 msgstr "चेतावनी: कनेक्शन सक्रिय नहीं\n"
 
-#: ../cli/src/connections.c:1561
+#: ../cli/src/connections.c:1879
+#, c-format
+msgid "Error: Connection deletion failed: %s"
+msgstr "त्रुटि: कनेक्शन विलोपन विफल: %s"
+
+#: ../cli/src/connections.c:2000
 #, c-format
 msgid "Error: 'con' command '%s' is not valid."
 msgstr "त्रुटि: 'con' कमांड '%s' वैध नहीं है."
 
-#: ../cli/src/connections.c:1597
+#: ../cli/src/connections.c:2068
 #, c-format
 msgid "Error: could not connect to D-Bus."
 msgstr "त्रुटि: D-Bus से कनेक्ट नहीं कर पाया."
 
-#: ../cli/src/connections.c:1604
+#: ../cli/src/connections.c:2076
 #, c-format
 msgid "Error: Could not get system settings."
 msgstr "त्रुटि: सिस्टम सेटिंग नहीं पा सका."
 
-#: ../cli/src/connections.c:1612
+#: ../cli/src/connections.c:2086
 #, 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."
+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:70 ../cli/src/devices.c:108 ../cli/src/devices.c:189
+#: ../cli/src/devices.c:205
 msgid "DEVICE"
-msgstr "DEVICE"
+msgstr "उपकरण"
 
-#. 1
-#. 4
 #. 0
-#: ../cli/src/devices.c:62 ../cli/src/devices.c:90
-#: ../cli/src/network-manager.c:36
-msgid "STATE"
-msgstr "STATE"
-
-#: ../cli/src/devices.c:71
-msgid "GENERAL"
-msgstr "GENERAL"
-
-#. 0
-#: ../cli/src/devices.c:72
+#: ../cli/src/devices.c:83
 msgid "CAPABILITIES"
-msgstr "CAPABILITIES"
+msgstr "सामर्थ्य"
 
 #. 1
-#: ../cli/src/devices.c:73
+#: ../cli/src/devices.c:84
 msgid "WIFI-PROPERTIES"
-msgstr "WIFI-PROPERTIES"
+msgstr "वाईफ़ाई गुण"
 
 #. 2
-#: ../cli/src/devices.c:74
+#: ../cli/src/devices.c:85
 msgid "AP"
 msgstr "AP"
 
 #. 3
-#: ../cli/src/devices.c:75
+#: ../cli/src/devices.c:86
 msgid "WIRED-PROPERTIES"
-msgstr "WIRED-PROPERTIES"
+msgstr "तार गुण"
 
 #. 4
-#: ../cli/src/devices.c:76
-msgid "IP4-SETTINGS"
-msgstr "IP4-SETTINGS"
+#: ../cli/src/devices.c:87
+msgid "WIMAX-PROPERTIES"
+msgstr "WIMAX के गुण"
 
 #. 5
-#: ../cli/src/devices.c:77
-msgid "IP4-DNS"
-msgstr "IP4-DNS"
+#. 0
+#: ../cli/src/devices.c:88 ../cli/src/devices.c:202
+msgid "NSP"
+msgstr "NSP"
 
 #. 6
-#: ../cli/src/devices.c:79
-msgid "IP6-SETTINGS"
-msgstr "IP6-SETTINGS"
+#: ../cli/src/devices.c:89
+msgid "IP4"
+msgstr "IP4"
 
 #. 7
-#: ../cli/src/devices.c:80
-msgid "IP6-DNS"
-msgstr "IP6-DNS"
+#: ../cli/src/devices.c:90
+msgid "DHCP4"
+msgstr "DHCP4"
+
+#. 8
+#: ../cli/src/devices.c:91
+msgid "IP6"
+msgstr "IP6"
+
+#. 9
+#: ../cli/src/devices.c:92
+msgid "DHCP6"
+msgstr "DHCP6"
+
+#. 10
+#: ../cli/src/devices.c:93
+msgid "BOND"
+msgstr "बॉन्ड"
+
+#. 11
+#: ../cli/src/devices.c:94
+msgid "VLAN"
+msgstr "VLAN"
 
 #. 2
-#: ../cli/src/devices.c:88
-msgid "DRIVER"
-msgstr "DRIVER"
+#: ../cli/src/devices.c:110
+msgid "VENDOR"
+msgstr "विक्रेता"
 
 #. 3
-#: ../cli/src/devices.c:89
+#: ../cli/src/devices.c:111
+msgid "PRODUCT"
+msgstr "उत्पाद"
+
+#. 4
+#: ../cli/src/devices.c:112
+msgid "DRIVER"
+msgstr "ड्राइवर"
+
+#. 5
+#: ../cli/src/devices.c:113
+msgid "DRIVER-VERSION"
+msgstr "ड्राइवर संस्करण"
+
+#. 6
+#: ../cli/src/devices.c:114
+msgid "FIRMWARE-VERSION"
+msgstr "फर्मवेयर संस्करण"
+
+#. 7
+#: ../cli/src/devices.c:115
 msgid "HWADDR"
 msgstr "HWADDR"
 
+#. 9
+#: ../cli/src/devices.c:117
+msgid "REASON"
+msgstr "कारण"
+
+#. 10
+#: ../cli/src/devices.c:118
+msgid "UDI"
+msgstr "UDI"
+
+#. 11
+#: ../cli/src/devices.c:119
+msgid "IP-IFACE"
+msgstr "IP-IFACE"
+
+#. 12
+#: ../cli/src/devices.c:120
+msgid "NM-MANAGED"
+msgstr "NM-MANAGED"
+
+#. 14
+#: ../cli/src/devices.c:122
+msgid "FIRMWARE-MISSING"
+msgstr "फर्मवेयर अनुपस्थित"
+
+#. 15
+#: ../cli/src/devices.c:123
+msgid "CONNECTION"
+msgstr "कनेक्शन"
+
 #. 0
-#: ../cli/src/devices.c:99
+#: ../cli/src/devices.c:132
 msgid "CARRIER-DETECT"
-msgstr "CARRIER-DETECT"
+msgstr "वाहक पता लगा"
 
 #. 1
-#: ../cli/src/devices.c:100
+#: ../cli/src/devices.c:133
 msgid "SPEED"
-msgstr "SPEED"
+msgstr "गति"
 
 #. 0
-#: ../cli/src/devices.c:109
+#: ../cli/src/devices.c:142
 msgid "CARRIER"
-msgstr "CARRIER"
+msgstr "कैरियर"
 
 #. 0
-#: ../cli/src/devices.c:119
+#: ../cli/src/devices.c:152
 msgid "WEP"
 msgstr "WEP"
 
 #. 1
-#: ../cli/src/devices.c:120
+#: ../cli/src/devices.c:153
 msgid "WPA"
 msgstr "WPA"
 
 #. 2
-#: ../cli/src/devices.c:121
+#: ../cli/src/devices.c:154
 msgid "WPA2"
 msgstr "WPA2"
 
 #. 3
-#: ../cli/src/devices.c:122
+#: ../cli/src/devices.c:155
 msgid "TKIP"
 msgstr "TKIP"
 
 #. 4
-#: ../cli/src/devices.c:123
+#: ../cli/src/devices.c:156
 msgid "CCMP"
 msgstr "CCMP"
 
 #. 0
-#: ../cli/src/devices.c:132
-msgid "ADDRESS"
-msgstr "ADDRESS"
+#: ../cli/src/devices.c:166
+msgid "CTR-FREQ"
+msgstr "CTR-FREQ"
 
 #. 1
-#: ../cli/src/devices.c:133
-msgid "PREFIX"
-msgstr "PREFIX"
+#: ../cli/src/devices.c:167
+msgid "RSSI"
+msgstr "RSSI"
 
 #. 2
-#: ../cli/src/devices.c:134
-msgid "GATEWAY"
-msgstr "GATEWAY"
+#: ../cli/src/devices.c:168
+msgid "CINR"
+msgstr "CINR"
 
-#. 0
-#: ../cli/src/devices.c:143
-msgid "DNS"
-msgstr "DNS"
+#. 3
+#: ../cli/src/devices.c:169
+msgid "TX-POW"
+msgstr "TX-POW"
+
+#. 4
+#: ../cli/src/devices.c:170
+msgid "BSID"
+msgstr "BSID"
 
 #. 0
-#: ../cli/src/devices.c:153
+#: ../cli/src/devices.c:180
 msgid "SSID"
 msgstr "SSID"
 
 #. 1
-#: ../cli/src/devices.c:154
+#: ../cli/src/devices.c:181
 msgid "BSSID"
 msgstr "BSSID"
 
 #. 2
-#: ../cli/src/devices.c:155
+#: ../cli/src/devices.c:182
 msgid "MODE"
-msgstr "MODE"
+msgstr "मोड"
 
 #. 3
-#: ../cli/src/devices.c:156
+#: ../cli/src/devices.c:183
 msgid "FREQ"
 msgstr "FREQ"
 
 #. 4
-#: ../cli/src/devices.c:157
+#: ../cli/src/devices.c:184
 msgid "RATE"
 msgstr "RATE"
 
 #. 5
-#: ../cli/src/devices.c:158
+#. 1
+#: ../cli/src/devices.c:185 ../cli/src/devices.c:203
 msgid "SIGNAL"
 msgstr "SIGNAL"
 
 #. 6
-#: ../cli/src/devices.c:159
+#: ../cli/src/devices.c:186
 msgid "SECURITY"
 msgstr "SECURITY"
 
 #. 7
-#: ../cli/src/devices.c:160
+#: ../cli/src/devices.c:187
 msgid "WPA-FLAGS"
 msgstr "WPA-FLAGS"
 
 #. 8
-#: ../cli/src/devices.c:161
+#: ../cli/src/devices.c:188
 msgid "RSN-FLAGS"
 msgstr "RSN-FLAGS"
 
 #. 10
-#: ../cli/src/devices.c:163
+#. 4
+#: ../cli/src/devices.c:190 ../cli/src/devices.c:206
 msgid "ACTIVE"
 msgstr "ACTIVE"
 
-#: ../cli/src/devices.c:186
-#, c-format
+#. 0
+#: ../cli/src/devices.c:218
+msgid "SLAVES"
+msgstr "स्लेव"
+
+#. 0
+#: ../cli/src/devices.c:227
+#| msgid "UUID"
+msgid "ID"
+msgstr "ID"
+
+#: ../cli/src/devices.c:243
+#, 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 ]\n"
+#| "  disconnect iface  [--nowait] [--timeout ]\n"
+#| "  wifi [list [iface ] [bssid ]]\n"
+#| "  wifi connect <(B)SSID> [password ] [wep-key-type key|phrase] "
+#| "[iface ] [bssid ] [name ]\n"
+#| "               [--private] [--nowait] [--timeout ]\n"
+#| "  wimax [list [iface ] [nsp ]]\n"
+#| "\n"
 msgid ""
-"Usage: nmcli dev { COMMAND | help }\n"
+"Usage: nmcli device { COMMAND | help }\n"
+"\n"
+"  COMMAND := { status | list | disconnect | wifi | wimax }\n"
 "\n"
 "  COMMAND := { status | list | disconnect | wifi }\n"
 "\n"
 "  status\n"
 "  list [iface ]\n"
 "  disconnect iface  [--nowait] [--timeout ]\n"
-"  wifi [list [iface ] [hwaddr ]]\n"
+"  wifi [list [iface ] [bssid ]]\n"
+"  wifi connect <(B)SSID> [password ] [wep-key-type key|phrase] "
+"[iface ] [bssid ] [name ]\n"
+"               [--private] [--nowait] [--timeout ]\n"
+"  wimax [list [iface ] [nsp ]]\n"
 "\n"
 msgstr ""
-"प्रयोग: nmcli dev { COMMAND | help }\n"
+"प्रयोग: nmcli device { COMMAND | help }\n"
+"\n"
+"  COMMAND := { status | list | disconnect | wifi | wimax }\n"
 "\n"
 "  COMMAND := { status | list | disconnect | wifi }\n"
 "\n"
 "  status\n"
 "  list [iface ]\n"
 "  disconnect iface  [--nowait] [--timeout ]\n"
-"  wifi [list [iface ] [hwaddr ]]\n"
+"  wifi [list [iface ] [bssid ]]\n"
+"  wifi connect <(B)SSID> [password ] [wep-key-type key|phrase] "
+"[iface ] [bssid ] [name ]\n"
+"               [--private] [--nowait] [--timeout ]\n"
+"  wimax [list [iface ] [nsp ]]\n"
 "\n"
 
-#: ../cli/src/devices.c:206
-msgid "unmanaged"
-msgstr "अप्रबंधित"
-
-#: ../cli/src/devices.c:208
-msgid "unavailable"
-msgstr "अनुपलब्ध"
-
-#: ../cli/src/devices.c:210 ../cli/src/network-manager.c:89
-msgid "disconnected"
-msgstr "डिसकनेक्टेड"
-
-#: ../cli/src/devices.c:212
-msgid "connecting (prepare)"
-msgstr "कनेक्टिंग (तैयार)"
-
-#: ../cli/src/devices.c:214
-msgid "connecting (configuring)"
-msgstr "कनेक्टिंग (विन्यस्त कर रहा है)"
-
-#: ../cli/src/devices.c:216
-msgid "connecting (need authentication)"
-msgstr "कनेक्टिंग (सत्यापन जरूरी)"
-
-#: ../cli/src/devices.c:218
-msgid "connecting (getting IP configuration)"
-msgstr "कनेक्टिंग (IP विन्यास पा रहा है)"
-
-#: ../cli/src/devices.c:220 ../cli/src/network-manager.c:87
-msgid "connected"
-msgstr "कनेक्टेड"
-
-#: ../cli/src/devices.c:222
-msgid "connection failed"
-msgstr "कनेक्शन विफल"
-
-#: ../cli/src/devices.c:245 ../cli/src/devices.c:380
-msgid "Unknown"
-msgstr "अज्ञात"
-
-#: ../cli/src/devices.c:277
+#: ../cli/src/devices.c:344
 msgid "(none)"
 msgstr "(कोई नहीं)"
 
-#: ../cli/src/devices.c:302
-#, c-format
-msgid "%s: error converting IP4 address 0x%X"
-msgstr "%s: IP4 पता 0x%X को बदलने में त्रुटि"
-
-#: ../cli/src/devices.c:349
+#: ../cli/src/devices.c:400
 #, c-format
 msgid "%u MHz"
 msgstr "%u MHz"
 
-#: ../cli/src/devices.c:350
+#: ../cli/src/devices.c:401
 #, c-format
 msgid "%u MB/s"
 msgstr "%u MB/s"
 
-#: ../cli/src/devices.c:359
+#: ../cli/src/devices.c:410
 msgid "Encrypted: "
 msgstr "गोपित: "
 
-#: ../cli/src/devices.c:364
+#: ../cli/src/devices.c:415
 msgid "WEP "
 msgstr "WEP "
 
-#: ../cli/src/devices.c:366
+#: ../cli/src/devices.c:417
 msgid "WPA "
 msgstr "WPA "
 
-#: ../cli/src/devices.c:368
+#: ../cli/src/devices.c:419
 msgid "WPA2 "
 msgstr "WPA2 "
 
-#: ../cli/src/devices.c:371
+#: ../cli/src/devices.c:422
 msgid "Enterprise "
 msgstr "एंटरप्राइज "
 
-#: ../cli/src/devices.c:380
+#: ../cli/src/devices.c:431
 msgid "Ad-Hoc"
 msgstr "तदर्थ"
 
-#: ../cli/src/devices.c:380
+#: ../cli/src/devices.c:432
 msgid "Infrastructure"
 msgstr "आधारभूत ढाँचा"
 
-#: ../cli/src/devices.c:442
+#: ../cli/src/devices.c:468
+msgid "Home"
+msgstr "घर"
+
+#: ../cli/src/devices.c:471
+msgid "Partner"
+msgstr "संगी"
+
+#: ../cli/src/devices.c:474
+msgid "Roaming"
+msgstr "रोमिंग"
+
+#: ../cli/src/devices.c:546
 #, c-format
 msgid "Error: 'dev list': %s"
 msgstr "त्रुटि: 'dev list': %s"
 
-#: ../cli/src/devices.c:444
+#: ../cli/src/devices.c:548
 #, c-format
 msgid "Error: 'dev list': %s; allowed fields: %s"
 msgstr "त्रुटि: 'dev list': %s; अनुमति प्राप्त क्षेत्र: %s"
 
-#: ../cli/src/devices.c:453
+#: ../cli/src/devices.c:557
 msgid "Device details"
 msgstr "युक्ति विवरण"
 
-#: ../cli/src/devices.c:483 ../cli/src/devices.c:827
+#: ../cli/src/devices.c:602 ../cli/src/devices.c:605 ../cli/src/devices.c:1081
+#: ../cli/src/utils.c:477
 msgid "(unknown)"
 msgstr "(अज्ञात)"
 
-#: ../cli/src/devices.c:484
-msgid "unknown)"
-msgstr "अज्ञात)"
+#: ../cli/src/devices.c:614
+msgid "not connected"
+msgstr "कनेक्टेड नहीं है"
 
-#: ../cli/src/devices.c:510
+#: ../cli/src/devices.c:641
 #, c-format
 msgid "%u Mb/s"
 msgstr "%u Mb/s"
 
 #. Print header
 #. "WIRED-PROPERTIES"
-#: ../cli/src/devices.c:583
+#: ../cli/src/devices.c:715
 msgid "on"
 msgstr "चालू"
 
-#: ../cli/src/devices.c:583
+#: ../cli/src/devices.c:715
 msgid "off"
 msgstr "बंद"
 
-#: ../cli/src/devices.c:710
+#: ../cli/src/devices.c:923
 #, c-format
 msgid "Error: 'dev status': %s"
 msgstr "त्रुटि: 'dev status': %s"
 
-#: ../cli/src/devices.c:712
+#: ../cli/src/devices.c:925
 #, c-format
 msgid "Error: 'dev status': %s; allowed fields: %s"
 msgstr "त्रुटि: 'dev status': %s; अनुमति प्राप्त क्षेत्र: %s"
 
-#: ../cli/src/devices.c:719
+#: ../cli/src/devices.c:948
 msgid "Status of devices"
 msgstr "युक्ति की स्थिति"
 
-#: ../cli/src/devices.c:747
+#: ../cli/src/devices.c:979
 #, 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:1020 ../cli/src/devices.c:1185
+#: ../cli/src/devices.c:1326 ../cli/src/devices.c:1973
 #, c-format
 msgid "Error: Device '%s' not found."
 msgstr "त्रुटि: युक्ति '%s' नहीं मिला."
 
-#: ../cli/src/devices.c:799
+#: ../cli/src/devices.c:1043
 #, c-format
 msgid "Success: Device '%s' successfully disconnected."
 msgstr "सफल: युक्ति '%s' सफलतापूर्वक डिसकनेक्डेड."
 
-#: ../cli/src/devices.c:824
+#: ../cli/src/devices.c:1078
 #, c-format
 msgid "Error: Device '%s' (%s) disconnecting failed: %s"
 msgstr "त्रुटि: युक्ति '%s' (%s) डिसकनेक्टिंग विफल: %s"
 
-#: ../cli/src/devices.c:832
+#: ../cli/src/devices.c:1091
 #, c-format
-msgid "Device state: %d (%s)\n"
-msgstr "युक्ति स्थिति: %d (%s)\n"
+msgid "Device '%s' has been disconnected.\n"
+msgstr " युक्ति '%s'  डिसकनेक्ट हो गया है.\n"
 
-#: ../cli/src/devices.c:896
+#: ../cli/src/devices.c:1154
 #, c-format
 msgid "Error: iface has to be specified."
 msgstr "त्रुटि: iface को निर्दिष्टि करना है."
 
-#: ../cli/src/devices.c:1011
+#: ../cli/src/devices.c:1284
 #, c-format
 msgid "Error: 'dev wifi': %s"
 msgstr "त्रुटि: 'dev wifi': %s"
 
-#: ../cli/src/devices.c:1013
+#: ../cli/src/devices.c:1286
 #, c-format
 msgid "Error: 'dev wifi': %s; allowed fields: %s"
 msgstr "त्रुटि: 'dev wifi': %s; अनुमति प्राप्त क्षेत्र: %s"
 
-#: ../cli/src/devices.c:1020
+#: ../cli/src/devices.c:1309
 msgid "WiFi scan list"
 msgstr "WiFi स्कैन सूची"
 
-#: ../cli/src/devices.c:1055 ../cli/src/devices.c:1109
+#: ../cli/src/devices.c:1346 ../cli/src/devices.c:1400
 #, c-format
-msgid "Error: Access point with hwaddr '%s' not found."
-msgstr "Error: hwaddr '%s' के साथ पहुँच नहीं मिला."
+msgid "Error: Access point with bssid '%s' not found."
+msgstr "त्रुटि: पहुँच बिंदु के साथ bssid '%s' नहीं मिली."
 
-#: ../cli/src/devices.c:1072
+#: ../cli/src/devices.c:1363
 #, c-format
 msgid "Error: Device '%s' is not a WiFi device."
 msgstr "त्रुटि: युक्ति '%s' एक WiFi युक्ति नहीं है."
 
-#: ../cli/src/devices.c:1136
+#: ../cli/src/devices.c:1431 ../cli/src/devices.c:1477
+#, c-format
+msgid "Connection with UUID '%s' created and activated on device '%s'\n"
+msgstr "UUID '%s'  के साथ कनेक्शन बनाया है और युक्ति '%s' पर सक्रिय हैं \n"
+
+#: ../cli/src/devices.c:1436
+#, c-format
+msgid "Error: Connection activation failed: (%d) %s."
+msgstr "त्रुटि: कनेक्शन सक्रियकरण विफल: (%d) %s."
+
+#: ../cli/src/devices.c:1461
+#, c-format
+msgid "Error: Failed to add/activate new connection: (%d) %s"
+msgstr "त्रुटि: नया कनेक्शन को जोड़ने के लिए / सक्रिय करने में विफल : (%d) %s"
+
+#: ../cli/src/devices.c:1469
+#, c-format
+msgid "Error: Failed to add/activate new connection: Unknown error"
+msgstr ""
+"त्रुटि: नया कनेक्शन को जोड़ने के लिए / सक्रिय करने में विफल: अज्ञात त्रुटि"
+
+#: ../cli/src/devices.c:1613
+#, c-format
+msgid "Error: SSID or BSSID are missing."
+msgstr "त्रुटि: SSID या BSSID अनुपस्थित है."
+
+#: ../cli/src/devices.c:1636
+#, c-format
+msgid "Error: bssid argument value '%s' is not a valid BSSID."
+msgstr "त्रुटि: bssid तर्क मान '%s' एक वैध BSSID नहीं है."
+
+#: ../cli/src/devices.c:1660
+#, c-format
+msgid ""
+"Error: wep-key-type argument value '%s' is invalid, use 'key' or 'phrase'."
+msgstr ""
+"त्रुटि: wep कुंजी प्रकार के तर्क मान '%s' अमान्य है, 'कुंजी' या 'पद' का उपयोग "
+"करें."
+
+#: ../cli/src/devices.c:1700
+#, c-format
+msgid "Error: BSSID to connect to (%s) differs from bssid argument (%s)."
+msgstr "त्रुटि: BSSID (%s) से कनेक्ट करने के लिए  bssid तर्क (%s) से अलग है."
+
+#: ../cli/src/devices.c:1706
+#, c-format
+msgid "Error: Parameter '%s' is neither SSID nor BSSID."
+msgstr "त्रुटि: पैरामीटर '%s' न तो SSID और न ही BSSID है."
+
+#: ../cli/src/devices.c:1735
+#, c-format
+msgid "Error: Device '%s' is not a Wi-Fi device."
+msgstr "त्रुटि: युक्ति '%s' एक WiFi युक्ति नहीं है."
+
+#: ../cli/src/devices.c:1737
+#, c-format
+msgid "Error: No Wi-Fi device found."
+msgstr "त्रुटि: कोई Wi-Fi युक्ति नहीं मिला."
+
+#: ../cli/src/devices.c:1755
+#, c-format
+msgid "Error: No network with SSID '%s' found."
+msgstr "त्रुटि: SSID '%s' के साथ कोई संजाल नहीं मिला."
+
+#: ../cli/src/devices.c:1757
+#, c-format
+msgid "Error: No access point with BSSID '%s' found."
+msgstr "त्रुटि: SSID '%s' के साथ कोई पहुँच बिंदु नहीं मिला."
+
+#: ../cli/src/devices.c:1855
 #, c-format
 msgid "Error: 'dev wifi' command '%s' is not valid."
 msgstr "त्रुटि: 'dev wifi' कमांड '%s' वैध नहीं है."
 
-#: ../cli/src/devices.c:1183
+#: ../cli/src/devices.c:1931
+#, c-format
+msgid "Error: 'dev wimax': %s"
+msgstr "त्रुटि:  'dev wimax': %s"
+
+#: ../cli/src/devices.c:1933
+#, c-format
+msgid "Error: 'dev wimax': %s; allowed fields: %s"
+msgstr "त्रुटि:  'dev wimax': %s; अनुमति प्राप्त क्षेत्र: %s"
+
+#: ../cli/src/devices.c:1956
+msgid "WiMAX NSP list"
+msgstr "WiMAX NSP सूची"
+
+#: ../cli/src/devices.c:1993
+#, c-format
+msgid "Error: NSP with name '%s' not found."
+msgstr "त्रुटि: NSP नाम '%s' के साथ नहीं मिला."
+
+#: ../cli/src/devices.c:2004
+#, c-format
+msgid "Error: Device '%s' is not a WiMAX device."
+msgstr "त्रुटि: युक्ति '%s' एक WiMAX युक्ति नहीं है."
+
+#: ../cli/src/devices.c:2035
+#, c-format
+msgid "Error: Access point with nsp '%s' not found."
+msgstr "Error: nsp '%s' के साथ पहुँच बिंदु नहीं मिला."
+
+#: ../cli/src/devices.c:2062
+#, c-format
+msgid "Error: 'dev wimax' command '%s' is not valid."
+msgstr "त्रुटि: 'dev wimax' कमांड '%s' वैध नहीं है."
+
+#: ../cli/src/devices.c:2115
 #, 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"
+msgstr "कार्यशील"
 
-#. 1
-#: ../cli/src/network-manager.c:37
-msgid "WIFI-HARDWARE"
-msgstr "WIFI-HARDWARE"
+#. 0
+#: ../cli/src/network-manager.c:38
+msgid "VERSION"
+msgstr "संस्करण"
 
 #. 2
-#: ../cli/src/network-manager.c:38
-msgid "WIFI"
-msgstr "WIFI"
+#: ../cli/src/network-manager.c:40
+msgid "NET-ENABLED"
+msgstr "नेट सक्षम"
 
 #. 3
-#: ../cli/src/network-manager.c:39
+#: ../cli/src/network-manager.c:41
+msgid "WIFI-HARDWARE"
+msgstr "वाईफ़ाई वाईफ़ाई हार्डवेयर"
+
+#. 4
+#: ../cli/src/network-manager.c:42
+msgid "WIFI"
+msgstr "वाईफ़ाई "
+
+#. 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"
 
+#. 7
+#: ../cli/src/network-manager.c:45
+msgid "WIMAX-HARDWARE"
+msgstr "WIMAX-वाईफ़ाई हार्डवेयर"
+
+#. 8
+#: ../cli/src/network-manager.c:46
+msgid "WIMAX"
+msgstr "WIMAX"
+
 #: ../cli/src/network-manager.c:62
+msgid "PERMISSION"
+msgstr "अनुमति"
+
+#. 0
+#: ../cli/src/network-manager.c:63
+msgid "VALUE"
+msgstr "मान"
+
+#: ../cli/src/network-manager.c:77
 #, c-format
 msgid ""
 "Usage: nmcli nm { COMMAND | help }\n"
 "\n"
-"  COMMAND := { status | sleep | wakeup | wifi | wwan }\n"
+"  COMMAND := { status | permissions | enable | sleep | wifi | wwan | "
+"wimax }\n"
+"\n"
+"  COMMAND := { status | permissions | enable | sleep | wifi | wwan }\n"
 "\n"
 "  status\n"
-"  sleep\n"
-"  wakeup\n"
+"  permissions\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 | permissions | enable | sleep | wifi | wwan | "
+"wimax }\n"
+"\n"
+"  COMMAND := { status | permissions | enable | sleep | wifi | wwan }\n"
 "\n"
 "  status\n"
-"  sleep\n"
-"  wakeup\n"
+"  permissions\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:108
 msgid "asleep"
 msgstr "asleep"
 
-#: ../cli/src/network-manager.c:85
+#: ../cli/src/network-manager.c:110
 msgid "connecting"
 msgstr "जुड़ रहा है"
 
-#: ../cli/src/network-manager.c:125
+#: ../cli/src/network-manager.c:112
+msgid "connected (local only)"
+msgstr " जुड़ा(केवल स्थानीय)"
+
+#: ../cli/src/network-manager.c:114
+msgid "connected (site only)"
+msgstr "जुड़ा (केवल साइट)"
+
+#: ../cli/src/network-manager.c:118
+msgid "disconnecting"
+msgstr "डिसकनेक्ट कर रहा है"
+
+#: ../cli/src/network-manager.c:158
 #, c-format
 msgid "Error: 'nm status': %s"
 msgstr "त्रुटि: 'nm status': %s"
 
-#: ../cli/src/network-manager.c:127
+#: ../cli/src/network-manager.c:160
 #, 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:173 ../cli/src/network-manager.c:174
+#: ../cli/src/network-manager.c:175 ../cli/src/network-manager.c:176
+#: ../cli/src/network-manager.c:177 ../cli/src/network-manager.c:179
+#: ../cli/src/network-manager.c:180 ../cli/src/network-manager.c:429
+#: ../cli/src/network-manager.c:484 ../cli/src/network-manager.c:522
+#: ../cli/src/network-manager.c:561
 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:173 ../cli/src/network-manager.c:174
+#: ../cli/src/network-manager.c:175 ../cli/src/network-manager.c:176
+#: ../cli/src/network-manager.c:177 ../cli/src/network-manager.c:179
+#: ../cli/src/network-manager.c:180 ../cli/src/network-manager.c:429
+#: ../cli/src/network-manager.c:484 ../cli/src/network-manager.c:522
+#: ../cli/src/network-manager.c:561
 msgid "disabled"
 msgstr "अक्षम"
 
-#: ../cli/src/network-manager.c:148
+#: ../cli/src/network-manager.c:193
+msgid "NetworkManager status"
+msgstr "NetworkManager स्थिति"
+
+#. Print header
+#: ../cli/src/network-manager.c:196
 msgid "running"
 msgstr "कार्यशील"
 
-#: ../cli/src/network-manager.c:148
+#: ../cli/src/network-manager.c:196
 msgid "not running"
 msgstr "नहीं चल रहा है"
 
-#: ../cli/src/network-manager.c:201 ../cli/src/network-manager.c:233
+#: ../cli/src/network-manager.c:271
+msgid "auth"
+msgstr "ऑथ"
+
+#: ../cli/src/network-manager.c:301
+#, c-format
+msgid "Error: 'nm permissions': %s"
+msgstr "त्रुटि: 'nm  अनुमति': %s"
+
+#: ../cli/src/network-manager.c:303
+#, c-format
+msgid "Error: 'nm permissions': %s; allowed fields: %s"
+msgstr "त्रुटि: 'nm  अनुमति': %s; अनुमति प्राप्त क्षेत्र: %s"
+
+#: ../cli/src/network-manager.c:324
+msgid "NetworkManager permissions"
+msgstr "नेटवर्कप्रबंधक अनुमति"
+
+#: ../cli/src/network-manager.c:350 ../cli/src/utils.c:457
+#, c-format
+msgid "Error: Couldn't connect to system bus: %s"
+msgstr "त्रुटि:  तंत्र से कनेक्ट नहीं कर पाया.: %s"
+
+#: ../cli/src/network-manager.c:361
+#, c-format
+msgid "Error: Couldn't create D-Bus object proxy."
+msgstr "त्रुटि: डी बस वस्तु प्रॉक्सी नहीं बना सका."
+
+#: ../cli/src/network-manager.c:367
+#, c-format
+msgid "Error in sleep: %s"
+msgstr "नींद में त्रुटि: %s"
+
+#: ../cli/src/network-manager.c:416 ../cli/src/network-manager.c:471
+#: ../cli/src/network-manager.c:509 ../cli/src/network-manager.c:548
 #, 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:424
+msgid "Networking enabled"
+msgstr "नेटवर्किंग सक्षम है"
+
+#: ../cli/src/network-manager.c:440
+#, c-format
+msgid "Error: invalid 'enable' parameter: '%s'; use 'true' or 'false'."
+msgstr "त्रुटि: अमान्य 'सक्षम' पैरामीटर: '%s', 'सही' या 'गलत' का उपयोग करें."
+
+#: ../cli/src/network-manager.c:450
+#, c-format
+msgid "Error: Sleeping status is not exported by NetworkManager."
+msgstr "त्रुटि: स्लीपिंग स्थिति नेटवर्कप्रबंधक द्वारा निर्यात नहीं है."
+
+#: ../cli/src/network-manager.c:458
+#, c-format
+msgid "Error: invalid 'sleep' parameter: '%s'; use 'true' or 'false'."
+msgstr "त्रुटि: अमान्य 'नींद' पैरामीटर: '%s', 'सही' या 'गलत' का उपयोग करें."
 
-#: ../cli/src/network-manager.c:209
+#: ../cli/src/network-manager.c:479
 msgid "WiFi enabled"
 msgstr "WiFi सक्षम"
 
-#: ../cli/src/network-manager.c:220
+#: ../cli/src/network-manager.c:495
 #, c-format
 msgid "Error: invalid 'wifi' parameter: '%s'."
 msgstr "त्रुटि: अवैध 'wifi' पैरामीटर: '%s'."
 
-#: ../cli/src/network-manager.c:241
+#: ../cli/src/network-manager.c:517
 msgid "WWAN enabled"
 msgstr "WWAN सक्रिय"
 
-#: ../cli/src/network-manager.c:252
+#: ../cli/src/network-manager.c:533
 #, c-format
 msgid "Error: invalid 'wwan' parameter: '%s'."
 msgstr "त्रुटि: अवैध 'wwan' पैरामीटर: '%s'."
 
-#: ../cli/src/network-manager.c:263
+#: ../cli/src/network-manager.c:556
+msgid "WiMAX enabled"
+msgstr "WiMAX सक्षम"
+
+#: ../cli/src/network-manager.c:572
+#, c-format
+msgid "Error: invalid 'wimax' parameter: '%s'."
+msgstr "त्रुटि: अवैध 'wimax' पैरामीटर: '%s'."
+
+#: ../cli/src/network-manager.c:588
 #, c-format
 msgid "Error: 'nm' command '%s' is not valid."
 msgstr "त्रुटि: 'nm' कमांड '%s' वैध नहीं है."
 
-#: ../cli/src/nmcli.c:69
-#, c-format
+#: ../cli/src/nmcli.c:76
+#, 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] |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"
+#| "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"
@@ -986,13 +1742,15 @@ msgid ""
 "  -f[ields] |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"
 "OBJECT\n"
-"  nm          NetworkManager status\n"
-"  con         NetworkManager connections\n"
-"  dev         devices managed by NetworkManager\n"
+"  nm              NetworkManager's status\n"
+"  c[onnection]    NetworkManager's connections\n"
+"  d[evice]        devices managed by NetworkManager\n"
 "\n"
 msgstr ""
 "प्रयोग: %s [OPTIONS] OBJECT { COMMAND | help }\n"
@@ -1004,650 +1762,883 @@ msgstr ""
 "  -f[ields] |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"
 "OBJECT\n"
-"  nm          NetworkManager status\n"
-"  con         NetworkManager connections\n"
-"  dev         devices managed by NetworkManager\n"
+"  nm              NetworkManager's status\n"
+"  c[onnection]    NetworkManager's connections\n"
+"  d[evice]        devices managed by NetworkManager\n"
 "\n"
 
-#: ../cli/src/nmcli.c:113
+#: ../cli/src/nmcli.c:124
 #, c-format
 msgid "Error: Object '%s' is unknown, try 'nmcli help'."
 msgstr "त्रुटि: वस्तु '%s' अज्ञात है, 'nmcli help' आजमाएँ."
 
-#: ../cli/src/nmcli.c:143
+#: ../cli/src/nmcli.c:154
 #, c-format
 msgid "Error: Option '--terse' is specified the second time."
 msgstr "त्रुटि: विकल्प '--terse' ने दूसरी बार निर्दिष्ट किया है."
 
-#: ../cli/src/nmcli.c:148
+#: ../cli/src/nmcli.c:159
 #, c-format
 msgid "Error: Option '--terse' is mutually exclusive with '--pretty'."
 msgstr "त्रुटि: विकल्प '--terse' '--pretty' के साथ परस्पर वहिर्वेषी है."
 
-#: ../cli/src/nmcli.c:156
+#: ../cli/src/nmcli.c:167
 #, c-format
 msgid "Error: Option '--pretty' is specified the second time."
 msgstr "त्रुटि: विकल्प '--pretty' दूसरी बार निर्दिष्ट किया है."
 
-#: ../cli/src/nmcli.c:161
+#: ../cli/src/nmcli.c:172
 #, 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:182 ../cli/src/nmcli.c:198
 #, 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:191 ../cli/src/nmcli.c:207
 #, c-format
 msgid "Error: '%s' is not valid argument for '%s' option."
 msgstr "त्रुटि: '%s' '%s' विकल्प के लिए वैध तर्क नहीं है."
 
-#: ../cli/src/nmcli.c:203
+#: ../cli/src/nmcli.c:214
 #, c-format
 msgid "Error: fields for '%s' options are missing."
 msgstr "त्रुटि: '%s' विकल्प के लिए क्षेत्र अनुपस्थित है."
 
-#: ../cli/src/nmcli.c:209
+#: ../cli/src/nmcli.c:222
 #, c-format
 msgid "nmcli tool, version %s\n"
 msgstr "nmcli टूल, संस्करण %s\n"
 
-#: ../cli/src/nmcli.c:215
+#: ../cli/src/nmcli.c:228
 #, c-format
 msgid "Error: Option '%s' is unknown, try 'nmcli -help'."
 msgstr "त्रुटि: विकल्प '%s' अज्ञात है, 'nmcli -help' आजमाएँ."
 
-#: ../cli/src/nmcli.c:234
+#: ../cli/src/nmcli.c:247
 #, 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:272
+msgid "Error: Could not create NMClient object."
+msgstr "त्रुटि: NMClient ऑब्जेक्ट नहीं बना सका."
 
-#: ../cli/src/nmcli.c:275
+#: ../cli/src/nmcli.c:288
 msgid "Success"
 msgstr "सफल"
 
-#: ../cli/src/settings.c:407
+#: ../cli/src/settings.c:527
 #, c-format
 msgid "%d (hex-ascii-key)"
 msgstr "%d (hex-ascii-key)"
 
-#: ../cli/src/settings.c:409
+#: ../cli/src/settings.c:529
 #, c-format
 msgid "%d (104/128-bit passphrase)"
 msgstr "%d (104/128-बिट पासफ्रेज)"
 
-#: ../cli/src/settings.c:412
+#: ../cli/src/settings.c:532 ../cli/src/settings.c:660
 #, c-format
 msgid "%d (unknown)"
 msgstr "%d (अज्ञात)"
 
-#: ../cli/src/settings.c:438
+#: ../cli/src/settings.c:558
 msgid "0 (unknown)"
 msgstr "0 (अज्ञात)"
 
-#: ../cli/src/settings.c:444
+#: ../cli/src/settings.c:564
 msgid "any, "
 msgstr "कोई, "
 
-#: ../cli/src/settings.c:446
+#: ../cli/src/settings.c:566
 msgid "900 MHz, "
 msgstr "900 MHz, "
 
-#: ../cli/src/settings.c:448
+#: ../cli/src/settings.c:568
 msgid "1800 MHz, "
 msgstr "1800 MHz, "
 
-#: ../cli/src/settings.c:450
+#: ../cli/src/settings.c:570
 msgid "1900 MHz, "
 msgstr "1900 MHz, "
 
-#: ../cli/src/settings.c:452
+#: ../cli/src/settings.c:572
 msgid "850 MHz, "
 msgstr "850 MHz, "
 
-#: ../cli/src/settings.c:454
+#: ../cli/src/settings.c:574
 msgid "WCDMA 3GPP UMTS 2100 MHz, "
 msgstr "WCDMA 3GPP UMTS 2100 MHz, "
 
-#: ../cli/src/settings.c:456
+#: ../cli/src/settings.c:576
 msgid "WCDMA 3GPP UMTS 1800 MHz, "
 msgstr "WCDMA 3GPP UMTS 1800 MHz, "
 
-#: ../cli/src/settings.c:458
+#: ../cli/src/settings.c:578
 msgid "WCDMA 3GPP UMTS 1700/2100 MHz, "
 msgstr "WCDMA 3GPP UMTS 1700/2100 MHz, "
 
-#: ../cli/src/settings.c:460
+#: ../cli/src/settings.c:580
 msgid "WCDMA 3GPP UMTS 800 MHz, "
 msgstr "WCDMA 3GPP UMTS 800 MHz, "
 
-#: ../cli/src/settings.c:462
+#: ../cli/src/settings.c:582
 msgid "WCDMA 3GPP UMTS 850 MHz, "
 msgstr "WCDMA 3GPP UMTS 850 MHz, "
 
-#: ../cli/src/settings.c:464
+#: ../cli/src/settings.c:584
 msgid "WCDMA 3GPP UMTS 900 MHz, "
 msgstr "WCDMA 3GPP UMTS 900 MHz, "
 
-#: ../cli/src/settings.c:466
+#: ../cli/src/settings.c:586
 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:588
+msgid "WCDMA 3GPP UMTS 1900 MHz, "
+msgstr "WCDMA 3GPP UMTS 1900 MHz, "
+
+#: ../cli/src/settings.c:590
+msgid "WCDMA 3GPP UMTS 2600 MHz, "
+msgstr "WCDMA 3GPP UMTS 2600 MHz, "
+
+#: ../cli/src/settings.c:608
+msgid "0 (NONE)"
+msgstr "0 (कुछ नहीं)"
+
+#: ../cli/src/settings.c:614
+msgid "REORDER_HEADERS, "
+msgstr "REORDER_HEADERS, "
+
+#: ../cli/src/settings.c:616
+msgid "GVRP, "
+msgstr "GVRP, "
+
+#: ../cli/src/settings.c:618
+msgid "LOOSE_BINDING, "
+msgstr "LOOSE_BINDING, "
+
+#: ../cli/src/settings.c:654
+#, c-format
+msgid "%d (disabled)"
+msgstr "%d (अक्षम)"
+
+#: ../cli/src/settings.c:656
+#, c-format
+msgid "%d (enabled, prefer public IP)"
+msgstr "%d (सक्षम, सार्वजनिक आईपी पसंद करते हैं)"
+
+#: ../cli/src/settings.c:658
+#, c-format
+msgid "%d (enabled, prefer temporary IP)"
+msgstr "%d (सक्षम है, अस्थायी आईपी पसंद करते हैं)"
+
+#: ../cli/src/settings.c:791 ../cli/src/settings.c:987
+#: ../cli/src/settings.c:1696
 msgid "auto"
 msgstr "auto"
 
-#: ../cli/src/settings.c:704 ../cli/src/settings.c:707 ../cli/src/utils.c:172
-msgid "not set"
-msgstr "सेट नहीं"
+#: ../cli/src/utils.c:103
+#, c-format
+msgid "Error converting IP4 address '0x%X' to text form"
+msgstr "पाठ के रूप IP4 पते '0x%X' में परिवर्तित करने में त्रुटि"
+
+#: ../cli/src/utils.c:131
+#, c-format
+msgid "Error converting IP6 address '%s' to text form"
+msgstr "पाठ के रूप IP6 पते '%s' में परिवर्तित करने में त्रुटि"
 
-#: ../cli/src/utils.c:124
+#: ../cli/src/utils.c:232
 #, c-format
 msgid "field '%s' has to be alone"
 msgstr "क्षेत्र '%s' को अलग रहना है"
 
-#: ../cli/src/utils.c:127
+#: ../cli/src/utils.c:235
 #, c-format
 msgid "invalid field '%s'"
 msgstr "अवैध क्षेत्र '%s'"
 
-#: ../cli/src/utils.c:146
-#, c-format
+#: ../cli/src/utils.c:254
 msgid "Option '--terse' requires specifying '--fields'"
 msgstr "विकल्प '--terse' के लिए '--fields' निर्दिष्ट करना है"
 
-#: ../cli/src/utils.c:150
+#: ../cli/src/utils.c:258
 #, 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:468
+#, c-format
+msgid "Error: Couldn't create D-Bus object proxy for org.freedesktop.DBus"
+msgstr "त्रुटि: org.freedesktop.DBus के लिए  D-बस वस्तु प्रॉक्सी नहीं बना सका"
+
+#: ../cli/src/utils.c:476
+#, c-format
+msgid "Error: NameHasOwner request failed: %s"
+msgstr "त्रुटि: NameHasOwner निवेदन असफल: %s"
+
+#: ../cli/src/utils.c:521
+#, 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:530
+#, 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:133
 #, c-format
 msgid "PEM key file had no end tag '%s'."
 msgstr "PEM कुंजी फाइल के पास कोई अंत टैग '%s' नहीं है."
 
-#: ../libnm-util/crypto.c:130
+#: ../libnm-util/crypto.c:146
 #, c-format
 msgid "Doesn't look like a PEM private key file."
 msgstr "एक PEM निजी कुंजी फाइल की तरह का नहीं दिखता है."
 
-#: ../libnm-util/crypto.c:138
+#: ../libnm-util/crypto.c:154
 #, c-format
 msgid "Not enough memory to store PEM file data."
 msgstr "PEM फाइल डेटा जमा करने के लिए पर्याप्त स्मृति नहीं."
 
-#: ../libnm-util/crypto.c:154
+#: ../libnm-util/crypto.c:170
 #, 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:178
 #, 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:188
 #, 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:199
 #, 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:206
 #, c-format
 msgid "Malformed PEM file: invalid format of IV in DEK-Info tag."
 msgstr "विरूपित PEM फाइल: IV का अवैध प्रारूप DEK-Info टैग में."
 
-#: ../libnm-util/crypto.c:203
+#: ../libnm-util/crypto.c:219
 #, c-format
 msgid "Malformed PEM file: unknown private key cipher '%s'."
 msgstr "विरूपित PEM फाइल: अज्ञात निजी कुंजी साइफर '%s'."
 
-#: ../libnm-util/crypto.c:222
+#: ../libnm-util/crypto.c:238
 #, 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' के पास कोई अंत टैग '%s' नहीं है."
+#: ../libnm-util/crypto.c:284
+msgid "Failed to find expected PKCS#8 start tag."
+msgstr "अपेक्षित PKCS#8 आरंभ टैग को खोजने में असफल."
 
-#: ../libnm-util/crypto.c:277
+#: ../libnm-util/crypto.c:292
 #, c-format
-msgid "Failed to decode certificate."
-msgstr "प्रमाणपत्र विगोपित करने में विफल."
+msgid "Failed to find expected PKCS#8 end tag '%s'."
+msgstr "अपेक्षित PKCS#8 अंत टैग '%s' को खोजने में असफल."
+
+#: ../libnm-util/crypto.c:312
+msgid "Not enough memory to store private key data."
+msgstr "निजी कुंजी डेटा स्टोर करने के लिए पर्याप्त स्मृति नहीं है."
+
+#: ../libnm-util/crypto.c:317
+msgid "Failed to decode PKCS#8 private key."
+msgstr "PKCS#8 निजी कुंजी व्याख्या करने में असफल रहा."
 
-#: ../libnm-util/crypto.c:286
+#: ../libnm-util/crypto.c:339 ../libnm-util/crypto.c:625
 #, 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
+#: ../libnm-util/crypto.c:365
 #, c-format
 msgid "IV must be an even number of bytes in length."
 msgstr "IV की लंबाई में बाइट संख्या सम संख्या होनी चाहिए."
 
-#: ../libnm-util/crypto.c:333
+#: ../libnm-util/crypto.c:374
 #, c-format
 msgid "Not enough memory to store the IV."
 msgstr "IV जमा करने के लिए पर्याप्त स्मृति नहीं."
 
-#: ../libnm-util/crypto.c:344
+#: ../libnm-util/crypto.c:385
 #, c-format
 msgid "IV contains non-hexadecimal digits."
 msgstr "IV गैर हेक्साडेसीमेल अंक समाहित करता है."
 
-#: ../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_nss.c:336
+#: ../libnm-util/crypto.c:423 ../libnm-util/crypto_gnutls.c:147
+#: ../libnm-util/crypto_gnutls.c:265 ../libnm-util/crypto_nss.c:167
+#: ../libnm-util/crypto_nss.c:332
 #, c-format
 msgid "Private key cipher '%s' was unknown."
 msgstr "निजी कुंजी साइफर '%s' अज्ञात था."
 
-#: ../libnm-util/crypto.c:391
+#: ../libnm-util/crypto.c:432
 #, c-format
 msgid "Not enough memory to decrypt private key."
 msgstr "निजी कुंजी गोपित करने के लिए पर्याप्त स्मृति नहीं."
 
-#: ../libnm-util/crypto.c:511
+#: ../libnm-util/crypto.c:497
+#, c-format
+msgid "Not enough memory to store decrypted private key."
+msgstr "विगोपित निजी कुंजी जमा करने के लिए पर्याप्त स्मृति नहीं."
+
+#: ../libnm-util/crypto.c:542
 #, c-format
 msgid "Unable to determine private key type."
 msgstr "निजी कुंजी प्रकार निर्धारित करने में असमर्थ."
 
-#: ../libnm-util/crypto.c:530
+#: ../libnm-util/crypto.c:597
 #, c-format
-msgid "Not enough memory to store decrypted private key."
-msgstr "विगोपित निजी कुंजी जमा करने के लिए पर्याप्त स्मृति नहीं."
+msgid "PEM certificate had no start tag '%s'."
+msgstr "PEM प्रमाणपत्र के पास कोई प्रारंभ टैग '%s' नहीं है."
+
+#: ../libnm-util/crypto.c:606
+#, c-format
+msgid "PEM certificate had no end tag '%s'."
+msgstr "PEM प्रमाणपत्र के पास कोई अंत टैग '%s' नहीं है."
+
+#: ../libnm-util/crypto.c:630
+#, c-format
+msgid "Failed to decode certificate."
+msgstr "प्रमाणपत्र विगोपित करने में विफल."
 
-#: ../libnm-util/crypto_gnutls.c:49
+#: ../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:92
 #, 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:155
 #, 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:164 ../libnm-util/crypto_nss.c:184
 #, c-format
 msgid "Not enough memory for decrypted key buffer."
 msgstr "विगोपित कुंजी बफर के लिए पर्याप्त स्मृति नहीं."
 
-#: ../libnm-util/crypto_gnutls.c:173
+#: ../libnm-util/crypto_gnutls.c:172
 #, 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:181
 #, 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:190
 #, 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:199
 #, 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:209 ../libnm-util/crypto_nss.c:263
 #, 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:220 ../libnm-util/crypto_nss.c:274
 #, 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:285 ../libnm-util/crypto_nss.c:352
 #, c-format
 msgid "Could not allocate memory for encrypting."
 msgstr "गोपन के लिए स्मृति आबंटित नहीं कर सका."
 
-#: ../libnm-util/crypto_gnutls.c:294
+#: ../libnm-util/crypto_gnutls.c:293
 #, 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:302
 #, 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:312
 #, 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:321
 #, c-format
 msgid "Failed to encrypt the data: %s / %s."
 msgstr "आँकड़ा गोपित करने में विफल: %s / %s."
 
-#: ../libnm-util/crypto_gnutls.c:362
+#: ../libnm-util/crypto_gnutls.c:361
 #, c-format
 msgid "Error initializing certificate data: %s"
 msgstr "प्रमाणपत्र आँकड़ा आरंभीकृत करने में विफल: %s"
 
-#: ../libnm-util/crypto_gnutls.c:384
+#: ../libnm-util/crypto_gnutls.c:383
 #, c-format
 msgid "Couldn't decode certificate: %s"
 msgstr "प्रमाणपत्र विगोपित नहीं कर सका: %s"
 
-#: ../libnm-util/crypto_gnutls.c:408
+#: ../libnm-util/crypto_gnutls.c:407
 #, 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:420
 #, 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:432
 #, c-format
 msgid "Couldn't verify PKCS#12 file: %s"
 msgstr "PKCS#12 फाइल जाँच नहीं सका: %s"
 
+#: ../libnm-util/crypto_gnutls.c:460
+#, c-format
+msgid "Couldn't initialize PKCS#8 decoder: %s"
+msgstr "PKCS#8 विगोपक आरंभीकृत नहीं कर सका: %s"
+
+#: ../libnm-util/crypto_gnutls.c:483
+#, c-format
+msgid "Couldn't decode PKCS#8 file: %s"
+msgstr "PKCS#8 फाइल विगोपित नहीं कर सका: %s"
+
 #: ../libnm-util/crypto_nss.c:56
 #, c-format
 msgid "Failed to initialize the crypto engine: %d."
 msgstr "क्रिप्टो ईंजन आरंभीकृत करने में विफल: %d."
 
-#: ../libnm-util/crypto_nss.c:111
+#: ../libnm-util/crypto_nss.c:107
 #, c-format
 msgid "Failed to initialize the MD5 context: %d."
 msgstr "MD5 संदर्भ आरंभीकृत करने में विफल: %d."
 
-#: ../libnm-util/crypto_nss.c:179
+#: ../libnm-util/crypto_nss.c:175
 #, c-format
 msgid "Invalid IV length (must be at least %d)."
 msgstr "अवैध IV लंबाई (जरूर कम से कम %d होना चाहिए)."
 
-#: ../libnm-util/crypto_nss.c:196
+#: ../libnm-util/crypto_nss.c:192
 #, c-format
 msgid "Failed to initialize the decryption cipher slot."
 msgstr "विगोपन साइफर स्लॉट को आरंभीकृत करने में विफल."
 
-#: ../libnm-util/crypto_nss.c:206
+#: ../libnm-util/crypto_nss.c:202
 #, c-format
 msgid "Failed to set symmetric key for decryption."
 msgstr "गोपन के लिए सममितीय कुंजी सेट करने में विफल."
 
-#: ../libnm-util/crypto_nss.c:216
+#: ../libnm-util/crypto_nss.c:212
 #, c-format
 msgid "Failed to set IV for decryption."
 msgstr "IV को गोपन के लिए सेट करने में विफल."
 
-#: ../libnm-util/crypto_nss.c:224
+#: ../libnm-util/crypto_nss.c:220
 #, c-format
 msgid "Failed to initialize the decryption context."
 msgstr "गोपन संदर्भ आरंभीकृत करने में विफल."
 
-#: ../libnm-util/crypto_nss.c:237
+#: ../libnm-util/crypto_nss.c:233
 #, c-format
 msgid "Failed to decrypt the private key: %d."
 msgstr "निजी कुंजी गोपित करने में विफल: %d."
 
-#: ../libnm-util/crypto_nss.c:245
+#: ../libnm-util/crypto_nss.c:241
 #, c-format
 msgid "Failed to decrypt the private key: decrypted data too large."
 msgstr "निजी कुंजी गोपित करने में विफल: विगोपित आँकड़ा काफी बड़ा है."
 
-#: ../libnm-util/crypto_nss.c:256
+#: ../libnm-util/crypto_nss.c:252
 #, c-format
 msgid "Failed to finalize decryption of the private key: %d."
 msgstr "निजी कुंजी के विगोपन को अंतिम रूप देने में विफल: %d."
 
-#: ../libnm-util/crypto_nss.c:364
+#: ../libnm-util/crypto_nss.c:360
 #, c-format
 msgid "Failed to initialize the encryption cipher slot."
 msgstr "गोपन साइफर स्लाट आरंभीकृत करने में विफल."
 
-#: ../libnm-util/crypto_nss.c:372
+#: ../libnm-util/crypto_nss.c:368
 #, c-format
 msgid "Failed to set symmetric key for encryption."
 msgstr "गोपन के लिए सममितीय कुंजी सेट करने में विफल."
 
-#: ../libnm-util/crypto_nss.c:380
+#: ../libnm-util/crypto_nss.c:376
 #, c-format
 msgid "Failed to set IV for encryption."
 msgstr "IV को गोपन के लिए सेट करने में विफल."
 
-#: ../libnm-util/crypto_nss.c:388
+#: ../libnm-util/crypto_nss.c:384
 #, c-format
 msgid "Failed to initialize the encryption context."
 msgstr "गोपन संदर्भ आरंभीकृत करने में विफल."
 
-#: ../libnm-util/crypto_nss.c:396
+#: ../libnm-util/crypto_nss.c:392
 #, c-format
 msgid "Failed to encrypt: %d."
 msgstr "गोपित करने में विफल: %d."
 
-#: ../libnm-util/crypto_nss.c:404
+#: ../libnm-util/crypto_nss.c:400
 #, c-format
 msgid "Unexpected amount of data after encrypting."
 msgstr "गोपन के बाद आँकड़ा की अप्रत्याशित मात्रा."
 
-#: ../libnm-util/crypto_nss.c:447
+#: ../libnm-util/crypto_nss.c:443
 #, c-format
 msgid "Couldn't decode certificate: %d"
 msgstr "प्रमाणपत्र डिकोड नहीं कर सका: %d"
 
-#: ../libnm-util/crypto_nss.c:482
+#: ../libnm-util/crypto_nss.c:478
 #, c-format
 msgid "Couldn't convert password to UCS2: %d"
 msgstr "कूटशब्द को UCS2 में बदल नहीं सका: %d"
 
-#: ../libnm-util/crypto_nss.c:510
+#: ../libnm-util/crypto_nss.c:506
 #, c-format
 msgid "Couldn't initialize PKCS#12 decoder: %d"
 msgstr "PKCS#12 डिकोडर को आरंभीकृत नहीं कर सका: %d"
 
-#: ../libnm-util/crypto_nss.c:519
+#: ../libnm-util/crypto_nss.c:515
 #, c-format
 msgid "Couldn't decode PKCS#12 file: %d"
 msgstr "PKCS#12 फाइल विगोपित नहीं कर सका: %d"
 
-#: ../libnm-util/crypto_nss.c:528
+#: ../libnm-util/crypto_nss.c:524
 #, c-format
 msgid "Couldn't verify PKCS#12 file: %d"
 msgstr "PKCS#12 फाइल जाँच नहीं सका: %d"
 
-#: ../libnm-util/crypto_nss.c:557
+#: ../libnm-util/crypto_nss.c:568
 msgid "Could not generate random data."
 msgstr "क्रमहीन आँकड़ा बना नहीं सका."
 
-#: ../libnm-util/nm-utils.c:1925
+#: ../libnm-util/nm-utils.c:2078
 #, c-format
 msgid "Not enough memory to make encryption key."
 msgstr "गोपन कुंजी बनाने के लिए पर्याप्त मात्रा में स्मृति नहीं."
 
-#: ../libnm-util/nm-utils.c:2035
+#: ../libnm-util/nm-utils.c:2188
 msgid "Could not allocate memory for PEM file creation."
 msgstr "PEM फाइल निर्माण के लिए स्मृति नहीं आबंटित कर सका."
 
-#: ../libnm-util/nm-utils.c:2047
+#: ../libnm-util/nm-utils.c:2200
 #, 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:2212
 #, 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:2231
 #, 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.NetworkManager.policy.in.in.h:1
+msgid "Enable or disable system networking"
+msgstr "तंत्र संजालन सक्रिय या निष्क्रिय करें"
 
-#: ../policy/org.freedesktop.network-manager-settings.system.policy.in.h:2
-msgid "Connection sharing via an open WiFi network"
-msgstr "किसी खुले WiFi संजाल के द्वारा कनेक्शन साझा"
+#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:2
+msgid "System policy prevents enabling or disabling system networking"
+msgstr "तंत्र संजालन के युक्ति के सक्रियण या निष्क्रियण को तंत्र नीति रोकता है"
 
-#: ../policy/org.freedesktop.network-manager-settings.system.policy.in.h:3
-msgid "Modify persistent system hostname"
-msgstr "स्थिर सिस्टम होस्टनेम को सुधारें"
+#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:3
+msgid ""
+"Put NetworkManager to sleep or wake it up (should only be used by system "
+"power management)"
+msgstr ""
+" NetworkManager को स्लीप स्थिति या वेकअप स्थिति में रखें (केवल सिस्टम पावर "
+"मैनेजमेंट के "
+"द्वारा प्रयोग किया जाएगा)"
 
-#: ../policy/org.freedesktop.network-manager-settings.system.policy.in.h:4
-msgid "Modify system connections"
-msgstr "सिस्टम कनेक्शन सुधारें"
+#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:4
+msgid "System policy prevents putting NetworkManager to sleep or waking it up"
+msgstr ""
+"NetworkManager को स्लीप या वेकअप स्थिति में लाने के लिए नेटवर्कमैनेजर रोकता है"
 
-#: ../policy/org.freedesktop.network-manager-settings.system.policy.in.h:5
-msgid "System policy prevents modification of system settings"
-msgstr "सिस्टम नीति सिस्टम सेटिंग के रूपांतरण को रोकता है."
+#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:5
+msgid "Enable or disable WiFi devices"
+msgstr "WiFi युक्तियाँ सक्रिय या निष्क्रिय करें"
 
-#: ../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.NetworkManager.policy.in.in.h:6
+msgid "System policy prevents enabling or disabling WiFi devices"
+msgstr "WiFi युक्ति के सक्रियण या निष्क्रियण को तंत्र नीति रोकता है"
 
-#: ../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.NetworkManager.policy.in.in.h:7
+msgid "Enable or disable mobile broadband devices"
+msgstr "मोबाइल ब्राडबैंड युक्तियाँ सक्रिय या निष्क्रिय करें"
 
-#: ../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.in.h:8
+msgid "System policy prevents enabling or disabling mobile broadband devices"
+msgstr ""
+"मोबाइल ब्रॉडबैंड युक्ति के सक्रियण या निष्क्रियण को तंत्र नीति रोकता है"
+
+#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:9
+msgid "Enable or disable WiMAX mobile broadband devices"
+msgstr "WiMAX मोबाइल ब्राडबैंड युक्तियाँ सक्रिय या निष्क्रिय करें"
+
+#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:10
+msgid ""
+"System policy prevents enabling or disabling WiMAX mobile broadband devices"
+msgstr ""
+"WiMAX मोबाइल ब्रॉडबैंड युक्ति के सक्रियण या निष्क्रियण को तंत्र नीति रोकता है"
 
-#: ../policy/org.freedesktop.NetworkManager.policy.in.h:1
+#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:11
 msgid "Allow control of network connections"
 msgstr "संजाल कनेक्शन के नियंत्रण स्वीकार करें"
 
-#: ../policy/org.freedesktop.NetworkManager.policy.in.h:2
-msgid "Allow use of user-specific connections"
-msgstr "उपयोक्ता विशिष्ट कनेक्शन के उपयोग की स्वीकृति दें"
+#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:12
+msgid "System policy prevents control of network connections"
+msgstr "सिस्टम कनेक्शन के नियंत्रण को सिस्टम नीति रोकता है"
 
-#: ../policy/org.freedesktop.NetworkManager.policy.in.h:3
-msgid "Enable or disable WiFi devices"
-msgstr "WiFi युक्तियाँ सक्रिय या निष्क्रिय करें"
+#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:13
+msgid "Connection sharing via a protected WiFi network"
+msgstr "किसी संरक्षित WiFi संजाल के द्वारा कनेक्शन साझा"
 
-#: ../policy/org.freedesktop.NetworkManager.policy.in.h:4
-msgid "Enable or disable mobile broadband devices"
-msgstr "मोबाइल ब्राडबैंड युक्तियाँ सक्रिय या निष्क्रिय करें"
+#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:14
+msgid "System policy prevents sharing connections via a protected WiFi network"
+msgstr ""
+"किसी संरक्षित WiFi संजाल के द्वारा साझा कनेक्शन को सिस्टम नीति रोकता है"
 
-#: ../policy/org.freedesktop.NetworkManager.policy.in.h:5
-msgid "Enable or disable system networking"
-msgstr "तंत्र संजालन सक्रिय या निष्क्रिय करें"
+#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:15
+msgid "Connection sharing via an open WiFi network"
+msgstr "किसी खुले WiFi संजाल के द्वारा कनेक्शन साझा"
 
-#: ../policy/org.freedesktop.NetworkManager.policy.in.h:6
-msgid ""
-"Put NetworkManager to sleep or wake it up (should only be used by system "
-"power management)"
-msgstr " NetworkManager को स्लीप स्थिति या वेकअप स्थिति में रखें (केवल सिस्टम पावर मैनेजमेंट के द्वारा प्रयोग किया जाएगा)"
+#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:16
+msgid "System policy prevents sharing connections via an open WiFi network"
+msgstr "किसी खुले WiFi संजाल के द्वारा साझा कनेक्शन को सिस्टम नीति रोकता है"
 
-#: ../policy/org.freedesktop.NetworkManager.policy.in.h:7
-msgid "System policy prevents control of network connections"
-msgstr "सिस्टम कनेक्शन के नियंत्रण को सिस्टम नीति रोकता है"
+#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:17
+msgid "Modify personal network connections"
+msgstr "निजी संजाल कनेक्शन संशोधित करें"
 
-#: ../policy/org.freedesktop.NetworkManager.policy.in.h:8
-msgid "System policy prevents enabling or disabling WiFi devices"
-msgstr "WiFi युक्ति के सक्रियण या निष्क्रियण को तंत्र नीति रोकता है"
+#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:18
+msgid "System policy prevents modification of personal network settings"
+msgstr "प्रणाली नीति व्यक्तिगत संजाल सेटिंग के संशोधन से बचाता है"
 
-#: ../policy/org.freedesktop.NetworkManager.policy.in.h:9
-msgid "System policy prevents enabling or disabling mobile broadband devices"
-msgstr "मोबाइल ब्रॉडबैंड युक्ति के सक्रियण या निष्क्रियण को तंत्र नीति रोकता है"
+#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:19
+msgid "Modify network connections for all users"
+msgstr "सभी उपयोगकर्ताओं के लिए संजाल  कनेक्शन संशोधित करें"
 
-#: ../policy/org.freedesktop.NetworkManager.policy.in.h:10
-msgid "System policy prevents enabling or disabling system networking"
-msgstr "तंत्र संजालन के युक्ति के सक्रियण या निष्क्रियण को तंत्र नीति रोकता है"
+#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:20
+msgid "System policy prevents modification of network settings for all users"
+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.in.h:21
+msgid "Modify persistent system hostname"
+msgstr "स्थिर सिस्टम होस्टनेम को सुधारें"
 
-#: ../policy/org.freedesktop.NetworkManager.policy.in.h:12
-msgid "System policy prevents use of user-specific connections"
-msgstr "सिस्टम नीति उपयोक्ता विशेष कनेक्शन के उपयोग को रोकता है"
+#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:22
+msgid "System policy prevents modification of the persistent system hostname"
+msgstr "सिस्टम नीति स्थिर सिस्टम होस्टनेम के रूपांतरण को रोकता है."
 
-#: ../src/nm-netlink-monitor.c:100 ../src/nm-netlink-monitor.c:231
-#: ../src/nm-netlink-monitor.c:653
+#: ../src/main.c:158
 #, 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 "सॉकेट पर आँकड़ा के लिए प्रतीक्षा करने के दौरान त्रुटि"
+msgid "Failed to set signal mask: %d"
+msgstr "संकेत मुखौटा सेट करने में विफल: %d"
 
-#: ../src/nm-netlink-monitor.c:254
+#: ../src/main.c:167
 #, c-format
-msgid "unable to connect to netlink for monitoring link status: %s"
-msgstr "नेटलिंक को मॉनिटरिंग लिंक स्थिति के लिए कनेक्ट करने में असमर्थ: %s"
+msgid "Failed to create signal handling thread: %d"
+msgstr "संकेत से निपटने मुद्दा बनाने में विफल: %d"
 
-#: ../src/nm-netlink-monitor.c:265
+#: ../src/main.c:182
 #, c-format
-msgid "unable to enable netlink handle credential passing: %s"
-msgstr "नेटलिंक नियंत्रण श्रेय पासिंग सक्रिय करने में असमर्थ: %s"
+msgid "Opening %s failed: %s\n"
+msgstr " %s को खोलना असफल: %s\n"
 
-#: ../src/nm-netlink-monitor.c:291 ../src/nm-netlink-monitor.c:353
+#: ../src/main.c:188
 #, c-format
-msgid "unable to allocate netlink handle for monitoring link status: %s"
-msgstr "लिंक स्थिति मॉनिटर करने के लिए नेटलिंक नियंत्रण का आबंटित नहीं कर सका: %s"
+msgid "Writing to %s failed: %s\n"
+msgstr " %s पे लिखने में असफल: %s\n"
 
-#: ../src/nm-netlink-monitor.c:376
+#: ../src/main.c:193
 #, c-format
-msgid "unable to allocate netlink link cache for monitoring link status: %s"
-msgstr "नेटलिंक कैश को मॉनिटरिंग लिंक स्थिति के लिए आबंटित करने में असमर्थ: %s"
+msgid "Closing %s failed: %s\n"
+msgstr "समापन %s में विफल रहा है: %s\n"
 
-#: ../src/nm-netlink-monitor.c:502
+#: ../src/main.c:236
 #, c-format
-msgid "unable to join netlink group: %s"
-msgstr "नेटलिंक समूह में शामिल होने में असमर्थ: %s"
+msgid "NetworkManager is already running (pid %ld)\n"
+msgstr "नेटवर्कप्रबंधक पहले से ही चल रहा है (pid %ld)\n"
+
+#: ../src/main.c:363
+msgid "Print NetworkManager version and exit"
+msgstr "छापें नेटवर्कप्रबंधक संस्करण और बाहर निकलें"
+
+#: ../src/main.c:364
+msgid "Don't become a daemon"
+msgstr "डेमॉन न होयें"
+
+#: ../src/main.c:365
+msgid "Make all warnings fatal"
+msgstr "सभी चेतावनी गंभीर बनाएँ"
+
+#: ../src/main.c:366
+msgid "Specify the location of a PID file"
+msgstr "एक पीआईडी ​​फ़ाइल का स्थान निर्दिष्ट करें"
+
+#: ../src/main.c:366
+msgid "filename"
+msgstr "फाइलनाम"
+
+#: ../src/main.c:367
+msgid "State file location"
+msgstr " फ़ाइल स्थान की स्थिति"
+
+#: ../src/main.c:367
+msgid "/path/to/state.file"
+msgstr "/path/to/state.file"
+
+#: ../src/main.c:368
+msgid "Config file location"
+msgstr "Config  फाइल स्थान"
+
+#: ../src/main.c:368
+msgid "/path/to/config.file"
+msgstr "/path/to/config.file"
 
-#: ../src/nm-netlink-monitor.c:629 ../src/nm-netlink-monitor.c:642
+#: ../src/main.c:369
+msgid "List of plugins separated by ','"
+msgstr "',' के द्वारा अलग प्लगिन की सूची "
+
+#: ../src/main.c:369
+msgid "plugin1,plugin2"
+msgstr "प्लगइन 1,प्लगइन2"
+
+#. Translators: Do not translate the values in the square brackets
+#: ../src/main.c:371
+msgid "Log level: one of [ERR, WARN, INFO, DEBUG]"
+msgstr "लॉग स्तरः  [ERR, WARN, INFO, DEBUG] में से एक"
+
+#. Translators: Do not translate the values in the square brackets
+#: ../src/main.c:374
+msgid ""
+"Log domains separated by ',': any combination of\n"
+"                                                [NONE,HW,RFKILL,ETHER,WIFI,"
+"BT,MB,DHCP4,DHCP6,PPP,\n"
+"                                                 WIFI_SCAN,IP4,IP6,AUTOIP4,"
+"DNS,VPN,SHARING,SUPPLICANT,\n"
+"                                                 AGENTS,SETTINGS,SUSPEND,"
+"CORE,DEVICE,OLPC,WIMAX,\n"
+"                                                 INFINIBAND,FIREWALL,ADSL]"
+msgstr ""
+"लॉग डोमेन ',' के द्वारा अलग: किसी भी संयोजन का\n"
+"                                                [NONE,HW,RFKILL,ETHER,WIFI,"
+"BT,MB,DHCP4,DHCP6,PPP,\n"
+"                                                 WIFI_SCAN,IP4,IP6,AUTOIP4,"
+"DNS,VPN,SHARING,SUPPLICANT,\n"
+"                                                 AGENTS,SETTINGS,SUSPEND,"
+"CORE,DEVICE,OLPC,WIMAX,\n"
+"                                                 INFINIBAND,FIREWALL,ADSL]"
+
+#: ../src/main.c:380
+msgid "An http(s) address for checking internet connectivity"
+msgstr "इंटरनेट कनेक्टिविटी की जाँच के लिए एक HTTP पता (ओं)"
+
+#: ../src/main.c:381
+msgid "The interval between connectivity checks (in seconds)"
+msgstr "संयोजकता जांचों के बीच अंतराल (सेकंड में)"
+
+#: ../src/main.c:382
+msgid "The expected start of the response"
+msgstr "प्रतिक्रिया की अपेक्षित शुरुआत"
+
+#: ../src/main.c:382
+msgid "Bingo!"
+msgstr "बिंगो!"
+
+#: ../src/main.c:387
 #, c-format
-msgid "error updating link cache: %s"
-msgstr "लिंक कैश अद्यतन करने में त्रुटि: %s"
+msgid "GModules are not supported on your platform!\n"
+msgstr "GModules आपके प्लेटफ़ार्म पर समर्थित नहीं हैं!\n"
 
-#: ../src/main.c:502
+#: ../src/main.c:406
+msgid ""
+"NetworkManager monitors all network connections and automatically\n"
+"chooses the best connection to use.  It also allows the user to\n"
+"specify wireless access points which wireless cards in the computer\n"
+"should associate with."
+msgstr ""
+"नेटवर्कप्रबंधक सभी नेटवर्क कनेक्शन पर नज़र रखता है और \n"
+"स्वचालित रूप से सबसे अच्छा उपयोग करने के लिए कनेक्शन को \n"
+" चुनता है. यह भी उपयोगकर्ता बेतार पहुँच बिंदु है जो कंप्यूटर में वायरलेस \n"
+" कार्ड के साथ संबद्ध करना चाहिए निर्दिष्ट करने की अनुमति देता है."
+
+#: ../src/main.c:412
 #, 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:422
+#, c-format
+msgid "You must be root to run NetworkManager!\n"
+msgstr " नेटवर्कप्रबंधक! चलाने के लिए आपको रूट होना होगा\n"
+
+#: ../src/main.c:449
+#, c-format
+msgid "Failed to read configuration: (%d) %s\n"
+msgstr "विन्यास को पढ़ने में असफ़ल: (%d) %s\n"
+
+#: ../src/main.c:460
 #, 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/main.c:467
+#, c-format
+msgid "State file %s parsing failed: (%d) %s\n"
+msgstr "स्टेट %s फ़ाइल पार्स करने में विफल: (%d) %s\n"
+
+#: ../src/main.c:484
+#, c-format
+msgid "Could not daemonize: %s [error %u]\n"
+msgstr "daemonize नहीं कर सका: %s [error %u]\n"
+
+#: ../src/dhcp-manager/nm-dhcp-dhclient-utils.c:61
 msgid "# Created by NetworkManager\n"
 msgstr "# संजाल प्रबंधक द्वारा निर्मित\n"
 
-#: ../src/dhcp-manager/nm-dhcp-dhclient.c:341
+#: ../src/dhcp-manager/nm-dhcp-dhclient-utils.c:68
 #, c-format
 msgid ""
 "# Merged from %s\n"
@@ -1656,47 +2647,234 @@ msgstr ""
 "#%s से मिलाया गया\n"
 "\n"
 
-#: ../src/dhcp-manager/nm-dhcp-manager.c:279
+#: ../src/dhcp-manager/nm-dhcp-manager.c:266
 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:275
 msgid "'dhclient' could be found."
 msgstr "'dhclient' नहीं मिल सका."
 
-#: ../src/dhcp-manager/nm-dhcp-manager.c:298
+#: ../src/dhcp-manager/nm-dhcp-manager.c:285
 msgid "'dhcpcd' could be found."
 msgstr "'dhcpcd' नहीं मिल सका."
 
-#: ../src/dhcp-manager/nm-dhcp-manager.c:306
+#: ../src/dhcp-manager/nm-dhcp-manager.c:293
 #, c-format
 msgid "unsupported DHCP client '%s'"
 msgstr "असमर्थित DHCP क्लाइंट '%s'"
 
-#: ../src/logging/nm-logging.c:146
+#: ../src/dns-manager/nm-dns-manager.c:375
+msgid "NOTE: the libc resolver may not support more than 3 nameservers."
+msgstr "नोट: libc समाधानकर्ता 3 नेमसर्वर से अधिक का समर्थन नहीं कर सकता है."
+
+#: ../src/dns-manager/nm-dns-manager.c:377
+msgid "The nameservers listed below may not be recognized."
+msgstr "नीचे सूची में दिया गया नेमसर्वर पहचाना नहीं जा सकता है."
+
+#: ../src/logging/nm-logging.c:142
 #, c-format
 msgid "Unknown log level '%s'"
 msgstr "अज्ञात लॉग स्तर '%s'"
 
-#: ../src/logging/nm-logging.c:171
+#: ../src/logging/nm-logging.c:181
 #, 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:280 ../src/nm-device-bt.c:351
+#, 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:558 ../src/nm-device-bt.c:347
+#, c-format
+msgid "GSM connection %d"
+msgstr "GSM कनेक्शन %d"
+
+#: ../src/nm-device-bond.c:192
+#, c-format
+msgid "Bond connection %d"
+msgstr "बॉण्ड कनेक्शन %d"
+
+#: ../src/nm-device-adsl.c:193
+#, c-format
+msgid "ADSL connection %d"
+msgstr "ADSL कनेक्शन  %d"
+
+#: ../src/nm-device-bt.c:322
+#, c-format
+msgid "PAN connection %d"
+msgstr "PAN कनेक्शन  %d"
+
+#: ../src/nm-device-bt.c:355
+#, c-format
+msgid "DUN connection %d"
+msgstr "DUN कनेक्शन  %d"
+
+#: ../src/nm-device-ethernet.c:1326
+#, c-format
+msgid "PPPoE connection %d"
+msgstr "PPPoE कनेक्शन  %d"
+
+#: ../src/nm-device-ethernet.c:1326 ../src/settings/nm-settings-utils.c:50
+#, c-format
+msgid "Wired connection %d"
+msgstr "तारयुक्त संबंधन %d"
+
+#: ../src/nm-device-infiniband.c:303
+#, c-format
+msgid "InfiniBand connection %d"
+msgstr "InfiniBandकनेक्शन  %d"
+
+#: ../src/nm-device-olpc-mesh.c:311
+#, c-format
+msgid "Mesh %d"
+msgstr "मेश %d"
+
+#: ../src/nm-device-vlan.c:362
+#, c-format
+msgid "VLAN connection %d"
+msgstr "VLAN कनेक्शन  %d"
+
+#: ../src/nm-manager.c:662
+#, c-format
+msgid "VPN connection %d"
+msgstr "VPN संबंधन %d"
+
+#: ../src/nm-netlink-monitor.c:148 ../src/nm-netlink-monitor.c:272
+#: ../src/nm-netlink-monitor.c:695
+#, c-format
+msgid "error processing netlink message: %s"
+msgstr "netlink संदेश की प्रक्रिया में त्रुटि: %s"
+
+#: ../src/nm-netlink-monitor.c:251
+msgid "error occurred while waiting for data on socket"
+msgstr "सॉकेट पर आँकड़ा के लिए प्रतीक्षा करने के दौरान त्रुटि"
+
+#: ../src/nm-netlink-monitor.c:296
+#, c-format
+msgid "unable to connect to netlink for monitoring link status: %s"
+msgstr "नेटलिंक को मॉनिटरिंग लिंक स्थिति के लिए कनेक्ट करने में असमर्थ: %s"
+
+#: ../src/nm-netlink-monitor.c:307
+#, c-format
+msgid "unable to enable netlink handle credential passing: %s"
+msgstr "नेटलिंक नियंत्रण श्रेय पासिंग सक्रिय करने में असमर्थ: %s"
+
+#: ../src/nm-netlink-monitor.c:330 ../src/nm-netlink-monitor.c:390
+#, c-format
+msgid "unable to allocate netlink handle for monitoring link status: %s"
+msgstr ""
+"लिंक स्थिति मॉनिटर करने के लिए नेटलिंक नियंत्रण का आबंटित नहीं कर सका: %s"
+
+#: ../src/nm-netlink-monitor.c:415
+#, c-format
+msgid "unable to allocate netlink link cache for monitoring link status: %s"
+msgstr "नेटलिंक कैश को मॉनिटरिंग लिंक स्थिति के लिए आबंटित करने में असमर्थ: %s"
+
+#: ../src/nm-netlink-monitor.c:542
+#, c-format
+msgid "unable to join netlink group: %s"
+msgstr "नेटलिंक समूह में शामिल होने में असमर्थ: %s"
 
-#: ../src/settings/nm-default-wired-connection.c:157
+#: ../src/nm-netlink-monitor.c:671 ../src/nm-netlink-monitor.c:684
 #, c-format
-msgid "Auto %s"
-msgstr "स्वतः %s"
+msgid "error updating link cache: %s"
+msgstr "लिंक कैश अद्यतन करने में त्रुटि: %s"
 
-#: ../system-settings/plugins/ifcfg-rh/reader.c:3256
+#: ../src/settings/plugins/ifcfg-rh/reader.c:93
 msgid "System"
 msgstr "तंत्र"
 
+#: ../src/settings/plugins/ifcfg-rh/reader.c:3663
+msgid "Bond"
+msgstr "बॉन्ड"
+
+#: ../test/nm-online.c:111
+#, c-format
+msgid "\rConnecting"
+msgstr "\rजुड़ रहा है"
+
+#: ../test/nm-online.c:142
+msgid "Time to wait for a connection, in seconds (default is 30)"
+msgstr "एक कनेक्शन के लिए प्रतीक्षा करें, सेकंड में समय (डिफ़ॉल्ट 30 है)"
+
+#: ../test/nm-online.c:143
+msgid "Exit immediately if NetworkManager is not running or connecting"
+msgstr "तुरंत बाहर निकलें अगर नेटवर्कप्रबंधक चल रहा है या नहीं जोड़ने है"
+
+#: ../test/nm-online.c:144
+msgid "Don't print anything"
+msgstr "कुछ भी मुद्रित नहीं"
+
+#: ../test/nm-online.c:162
+msgid "Waits for a successful connection in NetworkManager."
+msgstr "नेटवर्कप्रबंधक में एक सफल कनेक्शन के लिए इंतजार कर रहा है."
+
+#: ../test/nm-online.c:168 ../test/nm-online.c:177
+msgid "Invalid option.  Please use --help to see a list of valid options."
+msgstr "अवैध विकल्प.  कृपया --help का उपयोग वैध विकल्प देने के लिए करें."
+
+#~ msgid "SCOPE"
+#~ msgstr "SCOPE"
+
+#~ msgid "DBUS-SERVICE"
+#~ msgstr "DBUS-SERVICE"
+
+#~ msgid "system"
+#~ msgstr "तंत्र"
+
+#~ msgid "user"
+#~ msgstr "उपयोक्ता"
+
+#~ msgid "System connections"
+#~ msgstr "सिस्टम कनेक्शन"
+
+#~ msgid "User connections"
+#~ msgstr "उपयोक्ता कनेक्शन"
+
+#~ msgid "state: %s\n"
+#~ msgstr "स्थिति: %s\n"
+
+#~ msgid "Connection activated\n"
+#~ msgstr "कनेक्शन सक्रिय किया गया\n"
+
+#~ msgid "state: %s (%d)\n"
+#~ msgstr "स्थिति: %s (%d)\n"
+
+#~ msgid "Error: Obtaining active connection for '%s' failed."
+#~ msgstr "त्रुटि: '%s' के लिए सक्रिय कनेक्शन पा रहा है."
+
+#~ msgid "Active connection state: %s\n"
+#~ msgstr "सक्रिय कनेक्शन स्थिति: %s\n"
+
+#~ msgid "Active connection path: %s\n"
+#~ msgstr "सक्रिय कनेक्शन पथ: %s\n"
+
+#~ msgid "IP4-SETTINGS"
+#~ msgstr "IP4-SETTINGS"
+
+#~ msgid "IP6-SETTINGS"
+#~ msgstr "IP6-SETTINGS"
+
+#~ msgid "PREFIX"
+#~ msgstr "PREFIX"
+
+#~ msgid "unknown)"
+#~ msgstr "अज्ञात)"
+
+#~ msgid "Device state: %d (%s)\n"
+#~ msgstr "युक्ति स्थिति: %d (%s)\n"
+
+#~ msgid "not set"
+#~ msgstr "सेट नहीं"
+
+#~ msgid "Allow use of user-specific connections"
+#~ msgstr "उपयोक्ता विशिष्ट कनेक्शन के उपयोग की स्वीकृति दें"
+
+#~ msgid "System policy prevents use of user-specific connections"
+#~ msgstr "सिस्टम नीति उपयोक्ता विशेष कनेक्शन के उपयोग को रोकता है"
+
+#~ msgid "Auto %s"
+#~ msgstr "स्वतः %s"
diff --git a/po/id.po b/po/id.po
index 5e70c014..42cc406e 100644
--- a/po/id.po
+++ b/po/id.po
@@ -6,11 +6,13 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: network-manager master\n"
-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=NetworkManager&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2012-05-09 03:24+0000\n"
-"PO-Revision-Date: 2012-05-09 17:12+0700\n"
+"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
+"product=NetworkManager&keywords=I18N+L10N&component=general\n"
+"POT-Creation-Date: 2012-07-18 15:25+0000\n"
+"PO-Revision-Date: 2012-08-16 03:12+0700\n"
 "Last-Translator: Andika Triwidada \n"
 "Language-Team: GNOME Indonesian Translation Team \n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -18,36 +20,29 @@ msgstr ""
 "X-Poedit-Language: Indonesian\n"
 "X-Poedit-Country: Indonesia\n"
 
-#: ../cli/src/common.c:32
-#: ../cli/src/common.c:44
-#: ../cli/src/common.c:52
-#: ../cli/src/common.c:63
-#: ../cli/src/connections.c:125
-#: ../cli/src/connections.c:159
+#: ../cli/src/common.c:32 ../cli/src/common.c:44 ../cli/src/common.c:52
+#: ../cli/src/common.c:63 ../cli/src/connections.c:128
+#: ../cli/src/connections.c:162
 msgid "GROUP"
 msgstr "GROUP"
 
 #. 0
-#: ../cli/src/common.c:33
-#: ../cli/src/common.c:53
+#: ../cli/src/common.c:33 ../cli/src/common.c:53
 msgid "ADDRESS"
 msgstr "ADDRESS"
 
 #. 1
-#: ../cli/src/common.c:34
-#: ../cli/src/common.c:54
+#: ../cli/src/common.c:34 ../cli/src/common.c:54
 msgid "ROUTE"
 msgstr "ROUTE"
 
 #. 2
-#: ../cli/src/common.c:35
-#: ../cli/src/common.c:55
+#: ../cli/src/common.c:35 ../cli/src/common.c:55
 msgid "DNS"
 msgstr "DNS"
 
 #. 3
-#: ../cli/src/common.c:36
-#: ../cli/src/common.c:56
+#: ../cli/src/common.c:36 ../cli/src/common.c:56
 msgid "DOMAIN"
 msgstr "DOMAIN"
 
@@ -57,29 +52,298 @@ msgid "WINS"
 msgstr "WINS"
 
 #. 0
-#: ../cli/src/common.c:45
-#: ../cli/src/common.c:64
+#: ../cli/src/common.c:45 ../cli/src/common.c:64
 msgid "OPTION"
 msgstr "OPTION"
 
+#: ../cli/src/common.c:366
+msgid "unmanaged"
+msgstr "tak dikelola"
+
+#: ../cli/src/common.c:368
+msgid "unavailable"
+msgstr "tak tersedia"
+
+#: ../cli/src/common.c:370 ../cli/src/network-manager.c:120
+msgid "disconnected"
+msgstr "terputus"
+
+#: ../cli/src/common.c:372
+msgid "connecting (prepare)"
+msgstr "sedang menyambung (bersiap)"
+
+#: ../cli/src/common.c:374
+msgid "connecting (configuring)"
+msgstr "sedang menyambung (sedang menata)"
+
+#: ../cli/src/common.c:376
+msgid "connecting (need authentication)"
+msgstr "sedang menyambung (perlu otentikasi)"
+
+#: ../cli/src/common.c:378
+msgid "connecting (getting IP configuration)"
+msgstr "sedang menyambung (sedang mengambil konfigurasi IP)"
+
+#: ../cli/src/common.c:380
+msgid "connecting (checking IP connectivity)"
+msgstr "sedang menyambung (memeriksa konektivitas IP)"
+
+#: ../cli/src/common.c:382
+msgid "connecting (starting secondary connections)"
+msgstr "sedang menyambung (memulai koneksi sekunder)"
+
+#: ../cli/src/common.c:384 ../cli/src/network-manager.c:116
+msgid "connected"
+msgstr "terhubung"
+
+#: ../cli/src/common.c:386 ../cli/src/connections.c:633
+msgid "deactivating"
+msgstr "menonaktifkan"
+
+#: ../cli/src/common.c:388
+msgid "connection failed"
+msgstr "koneksi gagal"
+
+#: ../cli/src/common.c:390 ../cli/src/connections.c:636
+#: ../cli/src/connections.c:659 ../cli/src/connections.c:1349
+#: ../cli/src/devices.c:622 ../cli/src/network-manager.c:123
+#: ../cli/src/network-manager.c:185 ../cli/src/network-manager.c:188
+#: ../cli/src/network-manager.c:197 ../cli/src/network-manager.c:257
+#: ../cli/src/network-manager.c:273 ../cli/src/network-manager.c:431
+#: ../cli/src/network-manager.c:486 ../cli/src/network-manager.c:524
+#: ../cli/src/network-manager.c:563 ../cli/src/settings.c:585
+#: ../cli/src/settings.c:613 ../cli/src/utils.c:531 ../src/main.c:462
+#: ../src/main.c:481
+msgid "unknown"
+msgstr "tak diketahui"
+
+#: ../cli/src/common.c:399
+msgid "No reason given"
+msgstr "Tak ada alasan yang diberikan"
+
+#: ../cli/src/common.c:402
+msgid "Unknown error"
+msgstr "Galat tak dikenal"
+
+#: ../cli/src/common.c:405
+msgid "Device is now managed"
+msgstr "Perangkat kini dikelola"
+
+#: ../cli/src/common.c:408
+msgid "Device is now unmanaged"
+msgstr "Perangkat kini tak dikelola"
+
+#: ../cli/src/common.c:411
+msgid "The device could not be readied for configuration"
+msgstr "Perangkat tak dapat dibuat bersiap untuk ditata"
+
+#: ../cli/src/common.c:414
+msgid ""
+"IP configuration could not be reserved (no available address, timeout, etc)"
+msgstr ""
+"Konfigurasi IP tak dapat dipesan (alamat tak tersedia, habis waktu, dsb)"
+
+#: ../cli/src/common.c:417
+msgid "The IP configuration is no longer valid"
+msgstr "Konfigurasi IP tak valid lagi"
+
+#: ../cli/src/common.c:420
+msgid "Secrets were required, but not provided"
+msgstr "Rahasia diperlukan, tapi tak disediakan"
+
+#: ../cli/src/common.c:423
+msgid "802.1X supplicant disconnected"
+msgstr "802.1X supplicant diputus"
+
+#: ../cli/src/common.c:426
+msgid "802.1X supplicant configuration failed"
+msgstr "Konfigurasi 802.1X supplicant gagal"
+
+#: ../cli/src/common.c:429
+msgid "802.1X supplicant failed"
+msgstr "802.1X supplicant gagal"
+
+#: ../cli/src/common.c:432
+msgid "802.1X supplicant took too long to authenticate"
+msgstr "802.1X supplicant makan waktu terlalu lama untuk mengotentikasi"
+
+#: ../cli/src/common.c:435
+msgid "PPP service failed to start"
+msgstr "Layanan PPP gagal dimulai"
+
+#: ../cli/src/common.c:438
+msgid "PPP service disconnected"
+msgstr "Layanan PPP diputus"
+
+#: ../cli/src/common.c:441
+msgid "PPP failed"
+msgstr "PPP gagal"
+
+#: ../cli/src/common.c:444
+msgid "DHCP client failed to start"
+msgstr "Klien DHCP gagal dimulai"
+
+#: ../cli/src/common.c:447
+msgid "DHCP client error"
+msgstr "Galat klien DHCP"
+
+#: ../cli/src/common.c:450
+msgid "DHCP client failed"
+msgstr "Klien DHCP gagal"
+
+#: ../cli/src/common.c:453
+msgid "Shared connection service failed to start"
+msgstr "Layanan koneksi berbagi gagal dimulai"
+
+#: ../cli/src/common.c:456
+msgid "Shared connection service failed"
+msgstr "Layanan koneksi berbagi gagal"
+
+#: ../cli/src/common.c:459
+msgid "AutoIP service failed to start"
+msgstr "Layanan AutoIP gagal dimulai"
+
+#: ../cli/src/common.c:462
+msgid "AutoIP service error"
+msgstr "Galat layanan AutoIP"
+
+#: ../cli/src/common.c:465
+msgid "AutoIP service failed"
+msgstr "Layanan AutoIP gagal"
+
+#: ../cli/src/common.c:468
+msgid "The line is busy"
+msgstr "Jalur sibuk"
+
+#: ../cli/src/common.c:471
+msgid "No dial tone"
+msgstr "Tak ada nada panggil"
+
+#: ../cli/src/common.c:474
+msgid "No carrier could be established"
+msgstr "Carrier tak dapat dijalin"
+
+#: ../cli/src/common.c:477
+msgid "The dialing request timed out"
+msgstr "Permintaan pemanggilan habis waktu"
+
+#: ../cli/src/common.c:480
+msgid "The dialing attempt failed"
+msgstr "Usaha memanggil gagal"
+
+#: ../cli/src/common.c:483
+msgid "Modem initialization failed"
+msgstr "Inisialisasi modem gagal"
+
+#: ../cli/src/common.c:486
+msgid "Failed to select the specified APN"
+msgstr "Gagal memilih APN yang dinyatakan"
+
+#: ../cli/src/common.c:489
+msgid "Not searching for networks"
+msgstr "Tak mencari jaringan"
+
+#: ../cli/src/common.c:492
+msgid "Network registration denied"
+msgstr "Pendaftaran jaringan ditolak"
+
+#: ../cli/src/common.c:495
+msgid "Network registration timed out"
+msgstr "Pendaftaran jaringan habis waktu"
+
+#: ../cli/src/common.c:498
+msgid "Failed to register with the requested network"
+msgstr "Gagal mendaftar ke jaringan yang diminta"
+
+#: ../cli/src/common.c:501
+msgid "PIN check failed"
+msgstr "Uji PIN gagal"
+
+#: ../cli/src/common.c:504
+msgid "Necessary firmware for the device may be missing"
+msgstr "Firmware yang diperlukan bagi perangkat mungkin hilang"
+
+#: ../cli/src/common.c:507
+msgid "The device was removed"
+msgstr "Perangkat dicabut"
+
+#: ../cli/src/common.c:510
+msgid "NetworkManager went to sleep"
+msgstr "NetworkManager tidur"
+
+#: ../cli/src/common.c:513
+msgid "The device's active connection disappeared"
+msgstr "Koneksi aktif perangkat menghilang"
+
+#: ../cli/src/common.c:516
+msgid "Device disconnected by user or client"
+msgstr "Perangkat diputus oleh pengguna atau klien"
+
+#: ../cli/src/common.c:519
+msgid "Carrier/link changed"
+msgstr "Carrier/link berubah"
+
+#: ../cli/src/common.c:522
+msgid "The device's existing connection was assumed"
+msgstr "Koneksi perangkat kini diasumsikan"
+
+#: ../cli/src/common.c:525
+msgid "The supplicant is now available"
+msgstr "Supplicant kini tersedia"
+
+#: ../cli/src/common.c:528
+msgid "The modem could not be found"
+msgstr "Modem tak dapat ditemukan"
+
+#: ../cli/src/common.c:531
+msgid "The Bluetooth connection failed or timed out"
+msgstr "Koneksi Bluetooth gagal atau kehabisan waktu"
+
+#: ../cli/src/common.c:534
+msgid "GSM Modem's SIM card not inserted"
+msgstr "Kartu SIM Modem GSM tak dipasang"
+
+#: ../cli/src/common.c:537
+msgid "GSM Modem's SIM PIN required"
+msgstr "PIN SIM Modem GSM diperlukan"
+
+#: ../cli/src/common.c:540
+msgid "GSM Modem's SIM PUK required"
+msgstr "PUK SIM Modem GSM diperlukan"
+
+#: ../cli/src/common.c:543
+msgid "GSM Modem's SIM wrong"
+msgstr "SIM Modem GSM salah"
+
+#: ../cli/src/common.c:546
+msgid "InfiniBand device does not support connected mode"
+msgstr "Perangkat InfiniBand tak mendukung mode tersambung"
+
+#: ../cli/src/common.c:549
+msgid "A dependency of the connection failed"
+msgstr "Suatu kebergantungan koneksi gagal"
+
+#: ../cli/src/common.c:552
+msgid "A problem with the RFC 2684 Ethernet over ADSL bridge"
+msgstr "Masalah dengan Ethernet RFC 2684 di atas bridge ADSL"
+
+#: ../cli/src/common.c:555 ../cli/src/devices.c:274 ../cli/src/devices.c:290
+#: ../cli/src/devices.c:410 ../cli/src/devices.c:454
+msgid "Unknown"
+msgstr "Tak dikenal"
+
 #. 0
 #. used only for 'GENERAL' group listing
-#: ../cli/src/connections.c:58
-#: ../cli/src/connections.c:126
-#: ../cli/src/devices.c:103
-#: ../cli/src/devices.c:124
-#: ../cli/src/devices.c:134
-#: ../cli/src/devices.c:144
-#: ../cli/src/devices.c:158
-#: ../cli/src/devices.c:172
-#: ../cli/src/devices.c:194
+#: ../cli/src/connections.c:59 ../cli/src/connections.c:129
+#: ../cli/src/devices.c:105 ../cli/src/devices.c:129 ../cli/src/devices.c:139
+#: ../cli/src/devices.c:149 ../cli/src/devices.c:163 ../cli/src/devices.c:177
+#: ../cli/src/devices.c:199
 msgid "NAME"
 msgstr "NAME"
 
 #. 0
 #. 1
-#: ../cli/src/connections.c:59
-#: ../cli/src/connections.c:127
+#: ../cli/src/connections.c:60 ../cli/src/connections.c:130
 msgid "UUID"
 msgstr "UUID"
 
@@ -87,31 +351,29 @@ msgstr "UUID"
 #. 0
 #. 1
 #. 2
-#: ../cli/src/connections.c:60
-#: ../cli/src/connections.c:160
-#: ../cli/src/devices.c:69
-#: ../cli/src/devices.c:105
-#: ../cli/src/devices.c:197
+#: ../cli/src/connections.c:61 ../cli/src/connections.c:163
+#: ../cli/src/devices.c:71 ../cli/src/devices.c:107 ../cli/src/devices.c:202
 msgid "TYPE"
 msgstr "TYPE"
 
 #. 2
-#: ../cli/src/connections.c:61
+#: ../cli/src/connections.c:62
 msgid "TIMESTAMP"
 msgstr "TIMESTAMP"
 
 #. 3
-#: ../cli/src/connections.c:62
+#: ../cli/src/connections.c:63
 msgid "TIMESTAMP-REAL"
 msgstr "TIMESTAMP-REAL"
 
 #. 4
-#: ../cli/src/connections.c:63
+#. 13
+#: ../cli/src/connections.c:64 ../cli/src/devices.c:119
 msgid "AUTOCONNECT"
 msgstr "AUTOCONNECT"
 
 #. 5
-#: ../cli/src/connections.c:64
+#: ../cli/src/connections.c:65
 msgid "READONLY"
 msgstr "READONLY"
 
@@ -120,103 +382,96 @@ msgstr "READONLY"
 #. 2
 #. 11
 #. 5
-#: ../cli/src/connections.c:65
-#: ../cli/src/connections.c:134
-#: ../cli/src/devices.c:71
-#: ../cli/src/devices.c:184
-#: ../cli/src/devices.c:200
+#: ../cli/src/connections.c:66 ../cli/src/connections.c:137
+#: ../cli/src/devices.c:73 ../cli/src/devices.c:189 ../cli/src/devices.c:205
 msgid "DBUS-PATH"
 msgstr "DBUS-PATH"
 
 #. 2
-#: ../cli/src/connections.c:128
+#: ../cli/src/connections.c:131
 msgid "DEVICES"
 msgstr "DEVICES"
 
 #. 3
 #. 1
-#. 6
+#. 8
 #. 1
-#: ../cli/src/connections.c:129
-#: ../cli/src/devices.c:70
-#: ../cli/src/devices.c:110
-#: ../cli/src/network-manager.c:39
+#: ../cli/src/connections.c:132 ../cli/src/devices.c:72
+#: ../cli/src/devices.c:114 ../cli/src/network-manager.c:39
 msgid "STATE"
 msgstr "STATE"
 
 #. 4
-#: ../cli/src/connections.c:130
+#: ../cli/src/connections.c:133
 msgid "DEFAULT"
 msgstr "DEFAULT"
 
 #. 5
-#: ../cli/src/connections.c:131
+#: ../cli/src/connections.c:134
 msgid "DEFAULT6"
 msgstr "DEFAULT6"
 
 #. 6
-#: ../cli/src/connections.c:132
+#: ../cli/src/connections.c:135
 msgid "SPEC-OBJECT"
 msgstr "SPEC-OBJECT"
 
 #. 7
 #. 1
-#: ../cli/src/connections.c:133
-#: ../cli/src/connections.c:147
+#: ../cli/src/connections.c:136 ../cli/src/connections.c:150
 msgid "VPN"
 msgstr "VPN"
 
 #. 9
-#: ../cli/src/connections.c:135
+#: ../cli/src/connections.c:138
 msgid "CON-PATH"
 msgstr "CON-PATH"
 
 #. 10
-#: ../cli/src/connections.c:136
+#: ../cli/src/connections.c:139
 msgid "ZONE"
 msgstr "ZONE"
 
 #. 11
-#: ../cli/src/connections.c:137
+#: ../cli/src/connections.c:140
 msgid "MASTER-PATH"
 msgstr "MASTER-PATH"
 
-#: ../cli/src/connections.c:145
-#: ../cli/src/devices.c:80
+#: ../cli/src/connections.c:148 ../cli/src/devices.c:82
 msgid "GENERAL"
 msgstr "GENERAL"
 
 #. 0
-#: ../cli/src/connections.c:146
+#: ../cli/src/connections.c:149
 msgid "IP"
 msgstr "IP"
 
 #. 1
-#: ../cli/src/connections.c:161
+#: ../cli/src/connections.c:164
 msgid "USERNAME"
 msgstr "USERNAME"
 
 #. 2
-#: ../cli/src/connections.c:162
+#: ../cli/src/connections.c:165
 msgid "GATEWAY"
 msgstr "GATEWAY"
 
 #. 3
-#: ../cli/src/connections.c:163
+#: ../cli/src/connections.c:166
 msgid "BANNER"
 msgstr "BANNER"
 
 #. 4
-#: ../cli/src/connections.c:164
+#: ../cli/src/connections.c:167
 msgid "VPN-STATE"
 msgstr "VPN-STATE"
 
 #. 5
-#: ../cli/src/connections.c:165
+#: ../cli/src/connections.c:168
 msgid "CFG"
 msgstr "CFG"
 
-#: ../cli/src/connections.c:186
+#: ../cli/src/connections.c:190
 #, c-format
 msgid ""
 "Usage: nmcli con { COMMAND | help }\n"
@@ -224,8 +479,10 @@ msgid ""
 "\n"
 "  list [id  | uuid ]\n"
 "  status [id  | uuid  | path ]\n"
-"  up id  | uuid  [iface ] [ap ] [nsp ] [--nowait] [--timeout ]\n"
-"  up id  | uuid  [iface ] [ap ] [--nowait] [--timeout ]\n"
+"  up id  | uuid  [iface ] [ap ] [nsp ] [--"
+"nowait] [--timeout ]\n"
+"  up id  | uuid  [iface ] [ap ] [--nowait] [--timeout "
+"]\n"
 "  down id  | uuid \n"
 "  delete id  | uuid \n"
 msgstr ""
@@ -234,482 +491,364 @@ msgstr ""
 "\n"
 "  list [id  | uuid ]\n"
 "  status [id  | uuid  | path ]\n"
-"  up id  | uuid  [iface ] [ap ] [nsp ] [--nowait] [--timeout ]\n"
-"  up id  | uuid  [iface ] [ap ] [--nowait] [--timeout ]\n"
+"  up id  | uuid  [iface ] [ap ] [nsp ] [--"
+"nowait] [--timeout ]\n"
+"  up id  | uuid  [iface ] [ap ] [--nowait] [--timeout "
+"]\n"
 "  down id  | uuid \n"
 "  delete id  | uuid \n"
 
-#: ../cli/src/connections.c:240
-#: ../cli/src/connections.c:591
+#: ../cli/src/connections.c:249 ../cli/src/connections.c:609
 #, c-format
 msgid "Error: 'con list': %s"
 msgstr "Galat: 'con list': %s"
 
-#: ../cli/src/connections.c:242
-#: ../cli/src/connections.c:593
+#: ../cli/src/connections.c:251 ../cli/src/connections.c:611
 #, c-format
 msgid "Error: 'con list': %s; allowed fields: %s"
 msgstr "Galat: 'con list': %s; ruas yang diijinkan: %s"
 
-#: ../cli/src/connections.c:250
+#: ../cli/src/connections.c:259
 msgid "Connection details"
 msgstr "Rincian koneksi"
 
-#: ../cli/src/connections.c:466
+#: ../cli/src/connections.c:484
 msgid "never"
 msgstr "never"
 
 #. "CAPABILITIES"
 #. Print header
 #. "WIFI-PROPERTIES"
-#: ../cli/src/connections.c:467
-#: ../cli/src/connections.c:468
-#: ../cli/src/connections.c:705
-#: ../cli/src/connections.c:706
-#: ../cli/src/connections.c:708
-#: ../cli/src/devices.c:605
-#: ../cli/src/devices.c:658
-#: ../cli/src/devices.c:772
-#: ../cli/src/devices.c:773
-#: ../cli/src/devices.c:805
-#: ../cli/src/devices.c:831
-#: ../cli/src/devices.c:832
-#: ../cli/src/devices.c:833
-#: ../cli/src/devices.c:834
-#: ../cli/src/devices.c:835
-#: ../cli/src/network-manager.c:267
-#: ../cli/src/settings.c:657
-#: ../cli/src/settings.c:727
-#: ../cli/src/settings.c:847
-#: ../cli/src/settings.c:1129
-#: ../cli/src/settings.c:1130
-#: ../cli/src/settings.c:1132
-#: ../cli/src/settings.c:1134
-#: ../cli/src/settings.c:1135
-#: ../cli/src/settings.c:1263
-#: ../cli/src/settings.c:1264
-#: ../cli/src/settings.c:1265
-#: ../cli/src/settings.c:1266
-#: ../cli/src/settings.c:1341
-#: ../cli/src/settings.c:1342
-#: ../cli/src/settings.c:1343
-#: ../cli/src/settings.c:1344
-#: ../cli/src/settings.c:1345
-#: ../cli/src/settings.c:1346
-#: ../cli/src/settings.c:1347
-#: ../cli/src/settings.c:1348
-#: ../cli/src/settings.c:1349
-#: ../cli/src/settings.c:1350
-#: ../cli/src/settings.c:1351
-#: ../cli/src/settings.c:1352
-#: ../cli/src/settings.c:1353
-#: ../cli/src/settings.c:1424
+#: ../cli/src/connections.c:485 ../cli/src/connections.c:486
+#: ../cli/src/connections.c:714 ../cli/src/connections.c:715
+#: ../cli/src/connections.c:717 ../cli/src/devices.c:418
+#: ../cli/src/devices.c:471 ../cli/src/devices.c:587 ../cli/src/devices.c:588
+#: ../cli/src/devices.c:589 ../cli/src/devices.c:621 ../cli/src/devices.c:647
+#: ../cli/src/devices.c:648 ../cli/src/devices.c:649 ../cli/src/devices.c:650
+#: ../cli/src/devices.c:651 ../cli/src/network-manager.c:267
+#: ../cli/src/settings.c:694 ../cli/src/settings.c:764
+#: ../cli/src/settings.c:884 ../cli/src/settings.c:1166
+#: ../cli/src/settings.c:1167 ../cli/src/settings.c:1169
+#: ../cli/src/settings.c:1171 ../cli/src/settings.c:1172
+#: ../cli/src/settings.c:1303 ../cli/src/settings.c:1304
+#: ../cli/src/settings.c:1305 ../cli/src/settings.c:1306
+#: ../cli/src/settings.c:1383 ../cli/src/settings.c:1384
+#: ../cli/src/settings.c:1385 ../cli/src/settings.c:1386
+#: ../cli/src/settings.c:1387 ../cli/src/settings.c:1388
+#: ../cli/src/settings.c:1389 ../cli/src/settings.c:1390
+#: ../cli/src/settings.c:1391 ../cli/src/settings.c:1392
+#: ../cli/src/settings.c:1393 ../cli/src/settings.c:1394
+#: ../cli/src/settings.c:1395 ../cli/src/settings.c:1466
 msgid "yes"
 msgstr "ya"
 
-#: ../cli/src/connections.c:467
-#: ../cli/src/connections.c:468
-#: ../cli/src/connections.c:705
-#: ../cli/src/connections.c:706
-#: ../cli/src/connections.c:708
-#: ../cli/src/devices.c:605
-#: ../cli/src/devices.c:658
-#: ../cli/src/devices.c:772
-#: ../cli/src/devices.c:773
-#: ../cli/src/devices.c:805
-#: ../cli/src/devices.c:831
-#: ../cli/src/devices.c:832
-#: ../cli/src/devices.c:833
-#: ../cli/src/devices.c:834
-#: ../cli/src/devices.c:835
-#: ../cli/src/network-manager.c:269
-#: ../cli/src/settings.c:657
-#: ../cli/src/settings.c:659
-#: ../cli/src/settings.c:727
-#: ../cli/src/settings.c:847
-#: ../cli/src/settings.c:1129
-#: ../cli/src/settings.c:1130
-#: ../cli/src/settings.c:1132
-#: ../cli/src/settings.c:1134
-#: ../cli/src/settings.c:1135
-#: ../cli/src/settings.c:1263
-#: ../cli/src/settings.c:1264
-#: ../cli/src/settings.c:1265
-#: ../cli/src/settings.c:1266
-#: ../cli/src/settings.c:1341
-#: ../cli/src/settings.c:1342
-#: ../cli/src/settings.c:1343
-#: ../cli/src/settings.c:1344
-#: ../cli/src/settings.c:1345
-#: ../cli/src/settings.c:1346
-#: ../cli/src/settings.c:1347
-#: ../cli/src/settings.c:1348
-#: ../cli/src/settings.c:1349
-#: ../cli/src/settings.c:1350
-#: ../cli/src/settings.c:1351
-#: ../cli/src/settings.c:1352
-#: ../cli/src/settings.c:1353
-#: ../cli/src/settings.c:1424
+#: ../cli/src/connections.c:485 ../cli/src/connections.c:486
+#: ../cli/src/connections.c:714 ../cli/src/connections.c:715
+#: ../cli/src/connections.c:717 ../cli/src/devices.c:418
+#: ../cli/src/devices.c:471 ../cli/src/devices.c:587 ../cli/src/devices.c:588
+#: ../cli/src/devices.c:589 ../cli/src/devices.c:621 ../cli/src/devices.c:647
+#: ../cli/src/devices.c:648 ../cli/src/devices.c:649 ../cli/src/devices.c:650
+#: ../cli/src/devices.c:651 ../cli/src/network-manager.c:269
+#: ../cli/src/settings.c:694 ../cli/src/settings.c:696
+#: ../cli/src/settings.c:764 ../cli/src/settings.c:884
+#: ../cli/src/settings.c:1166 ../cli/src/settings.c:1167
+#: ../cli/src/settings.c:1169 ../cli/src/settings.c:1171
+#: ../cli/src/settings.c:1172 ../cli/src/settings.c:1303
+#: ../cli/src/settings.c:1304 ../cli/src/settings.c:1305
+#: ../cli/src/settings.c:1306 ../cli/src/settings.c:1383
+#: ../cli/src/settings.c:1384 ../cli/src/settings.c:1385
+#: ../cli/src/settings.c:1386 ../cli/src/settings.c:1387
+#: ../cli/src/settings.c:1388 ../cli/src/settings.c:1389
+#: ../cli/src/settings.c:1390 ../cli/src/settings.c:1391
+#: ../cli/src/settings.c:1392 ../cli/src/settings.c:1393
+#: ../cli/src/settings.c:1394 ../cli/src/settings.c:1395
+#: ../cli/src/settings.c:1466
 msgid "no"
 msgstr "tidak"
 
-#: ../cli/src/connections.c:542
+#: ../cli/src/connections.c:560
 msgid "Connection list"
 msgstr "Daftar koneksi"
 
-#: ../cli/src/connections.c:555
-#: ../cli/src/connections.c:1088
-#: ../cli/src/connections.c:1456
-#: ../cli/src/connections.c:1471
-#: ../cli/src/connections.c:1480
-#: ../cli/src/connections.c:1490
-#: ../cli/src/connections.c:1502
-#: ../cli/src/connections.c:1601
-#: ../cli/src/connections.c:1703
-#: ../cli/src/devices.c:1212
-#: ../cli/src/devices.c:1222
-#: ../cli/src/devices.c:1336
-#: ../cli/src/devices.c:1344
-#: ../cli/src/devices.c:1718
-#: ../cli/src/devices.c:1725
-#: ../cli/src/devices.c:1739
-#: ../cli/src/devices.c:1746
-#: ../cli/src/devices.c:1763
-#: ../cli/src/devices.c:1774
-#: ../cli/src/devices.c:1995
-#: ../cli/src/devices.c:2002
+#: ../cli/src/connections.c:573 ../cli/src/connections.c:1110
+#: ../cli/src/connections.c:1646 ../cli/src/connections.c:1661
+#: ../cli/src/connections.c:1670 ../cli/src/connections.c:1680
+#: ../cli/src/connections.c:1692 ../cli/src/connections.c:1800
+#: ../cli/src/connections.c:1902 ../cli/src/devices.c:1041
+#: ../cli/src/devices.c:1051 ../cli/src/devices.c:1169
+#: ../cli/src/devices.c:1177 ../cli/src/devices.c:1541
+#: ../cli/src/devices.c:1548 ../cli/src/devices.c:1562
+#: ../cli/src/devices.c:1569 ../cli/src/devices.c:1586
+#: ../cli/src/devices.c:1597 ../cli/src/devices.c:1818
+#: ../cli/src/devices.c:1825
 #, c-format
 msgid "Error: %s argument is missing."
 msgstr "Galat: argumen %s hilang."
 
-#: ../cli/src/connections.c:568
+#: ../cli/src/connections.c:586
 #, c-format
 msgid "Error: %s - no such connection."
 msgstr "Galat: %s - koneksi tak ada."
 
-#: ../cli/src/connections.c:574
-#: ../cli/src/connections.c:1515
-#: ../cli/src/connections.c:1618
-#: ../cli/src/connections.c:1710
-#: ../cli/src/devices.c:1009
-#: ../cli/src/devices.c:1089
-#: ../cli/src/devices.c:1236
-#: ../cli/src/devices.c:1350
-#: ../cli/src/devices.c:1787
-#: ../cli/src/devices.c:2008
+#: ../cli/src/connections.c:592 ../cli/src/connections.c:1705
+#: ../cli/src/connections.c:1817 ../cli/src/connections.c:1909
+#: ../cli/src/devices.c:825 ../cli/src/devices.c:905 ../cli/src/devices.c:1065
+#: ../cli/src/devices.c:1183 ../cli/src/devices.c:1610
+#: ../cli/src/devices.c:1831
 #, c-format
 msgid "Unknown parameter: %s\n"
 msgstr "Parameter tak dikenal: %s\n"
 
-#: ../cli/src/connections.c:583
+#: ../cli/src/connections.c:601
 #, c-format
 msgid "Error: no valid parameter specified."
 msgstr "Galat: tak ada parameter valid yang dinyatakan."
 
-#: ../cli/src/connections.c:598
-#: ../cli/src/connections.c:1803
-#: ../cli/src/devices.c:2216
-#: ../cli/src/network-manager.c:596
+#: ../cli/src/connections.c:616 ../cli/src/connections.c:2002
+#: ../cli/src/devices.c:2039 ../cli/src/network-manager.c:596
 #, c-format
 msgid "Error: %s."
 msgstr "Galat: %s."
 
-#: ../cli/src/connections.c:611
+#: ../cli/src/connections.c:629
 msgid "activating"
 msgstr "mengaktifkan"
 
-#: ../cli/src/connections.c:613
+#: ../cli/src/connections.c:631
 msgid "activated"
 msgstr "diaktifkan"
 
-#: ../cli/src/connections.c:615
-#: ../cli/src/devices.c:273
-msgid "deactivating"
-msgstr "menonaktifkan"
-
-#: ../cli/src/connections.c:618
-#: ../cli/src/connections.c:641
-#: ../cli/src/connections.c:1327
-#: ../cli/src/devices.c:277
-#: ../cli/src/devices.c:806
-#: ../cli/src/network-manager.c:123
-#: ../cli/src/network-manager.c:185
-#: ../cli/src/network-manager.c:188
-#: ../cli/src/network-manager.c:197
-#: ../cli/src/network-manager.c:257
-#: ../cli/src/network-manager.c:273
-#: ../cli/src/network-manager.c:431
-#: ../cli/src/network-manager.c:486
-#: ../cli/src/network-manager.c:524
-#: ../cli/src/network-manager.c:563
-#: ../cli/src/settings.c:563
-#: ../cli/src/settings.c:591
-#: ../cli/src/utils.c:531
-#: ../src/main.c:458
-#: ../src/main.c:477
-msgid "unknown"
-msgstr "tak diketahui"
-
-#: ../cli/src/connections.c:627
+#: ../cli/src/connections.c:645
 msgid "VPN connecting (prepare)"
 msgstr "VPN sedang menyiapkan"
 
-#: ../cli/src/connections.c:629
+#: ../cli/src/connections.c:647
 msgid "VPN connecting (need authentication)"
 msgstr "VPN sedang menyambung (perlu otentikasi)"
 
-#: ../cli/src/connections.c:631
+#: ../cli/src/connections.c:649
 msgid "VPN connecting"
 msgstr "VPN sedang menyambung"
 
-#: ../cli/src/connections.c:633
+#: ../cli/src/connections.c:651
 msgid "VPN connecting (getting IP configuration)"
 msgstr "VPN sedang menyambung (sedang mengambil konfigurasi IP)"
 
-#: ../cli/src/connections.c:635
+#: ../cli/src/connections.c:653
 msgid "VPN connected"
 msgstr "VPN terhubung"
 
-#: ../cli/src/connections.c:637
+#: ../cli/src/connections.c:655
 msgid "VPN connection failed"
 msgstr "Sambungan VPN gagal"
 
-#: ../cli/src/connections.c:639
+#: ../cli/src/connections.c:657
 msgid "VPN disconnected"
 msgstr "VPN diputus"
 
-#: ../cli/src/connections.c:892
-#: ../cli/src/connections.c:1116
+#: ../cli/src/connections.c:710 ../cli/src/connections.c:720
+msgid "N/A"
+msgstr "N/A"
+
+#: ../cli/src/connections.c:914 ../cli/src/connections.c:1138
 #, c-format
 msgid "Error: 'con status': %s"
 msgstr "Galat: 'con status': %s"
 
-#: ../cli/src/connections.c:894
-#: ../cli/src/connections.c:1118
+#: ../cli/src/connections.c:916 ../cli/src/connections.c:1140
 #, c-format
 msgid "Error: 'con status': %s; allowed fields: %s"
 msgstr "Galat: 'con status': %s; ruas yang diijinkan: %s"
 
-#: ../cli/src/connections.c:902
+#: ../cli/src/connections.c:924
 msgid "Active connection details"
 msgstr "Rincian koneksi aktif"
 
-#: ../cli/src/connections.c:1038
-#: ../cli/src/connections.c:1530
-#: ../cli/src/connections.c:1633
-#: ../cli/src/connections.c:1724
-#: ../cli/src/devices.c:1036
-#: ../cli/src/devices.c:1098
-#: ../cli/src/devices.c:1251
-#: ../cli/src/devices.c:1380
-#: ../cli/src/devices.c:1809
-#: ../cli/src/devices.c:2037
-#: ../cli/src/network-manager.c:311
+#: ../cli/src/connections.c:1060 ../cli/src/connections.c:1720
+#: ../cli/src/connections.c:1832 ../cli/src/connections.c:1923
+#: ../cli/src/devices.c:852 ../cli/src/devices.c:914 ../cli/src/devices.c:1080
+#: ../cli/src/devices.c:1213 ../cli/src/devices.c:1632
+#: ../cli/src/devices.c:1860 ../cli/src/network-manager.c:311
 #, c-format
 msgid "Error: Can't find out if NetworkManager is running: %s."
 msgstr "Galat: Tak bisa menentukan apakah NetworkManager sedang berjalan: %s."
 
-#: ../cli/src/connections.c:1042
-#: ../cli/src/connections.c:1534
-#: ../cli/src/connections.c:1637
-#: ../cli/src/connections.c:1728
-#: ../cli/src/devices.c:1040
-#: ../cli/src/devices.c:1102
-#: ../cli/src/devices.c:1255
-#: ../cli/src/devices.c:1384
-#: ../cli/src/devices.c:1813
-#: ../cli/src/devices.c:2041
-#: ../cli/src/network-manager.c:315
+#: ../cli/src/connections.c:1064 ../cli/src/connections.c:1724
+#: ../cli/src/connections.c:1836 ../cli/src/connections.c:1927
+#: ../cli/src/devices.c:856 ../cli/src/devices.c:918 ../cli/src/devices.c:1084
+#: ../cli/src/devices.c:1217 ../cli/src/devices.c:1636
+#: ../cli/src/devices.c:1864 ../cli/src/network-manager.c:315
 #, c-format
 msgid "Error: NetworkManager is not running."
 msgstr "Galat: NetworkManager tidak sedang berjalan."
 
-#: ../cli/src/connections.c:1074
+#: ../cli/src/connections.c:1096
 msgid "Active connections"
 msgstr "Koneksi aktif"
 
-#: ../cli/src/connections.c:1099
+#: ../cli/src/connections.c:1121
 #, c-format
 msgid "Error: '%s' is not an active connection."
 msgstr "Galat: %s bukan suatu koneksi aktif."
 
-#: ../cli/src/connections.c:1104
+#: ../cli/src/connections.c:1126
 #, c-format
 msgid "Error: unknown parameter: %s"
 msgstr "Galat: parameter tak dikenal: %s"
 
-#: ../cli/src/connections.c:1211
+#: ../cli/src/connections.c:1233
 #, c-format
 msgid "no active connection on device '%s'"
 msgstr "tak ada koneksi aktif pada perangkat '%s'"
 
-#: ../cli/src/connections.c:1219
+#: ../cli/src/connections.c:1241
 #, c-format
 msgid "no active connection or device"
-msgstr "tak ada koneksi atau perangkat aktif "
+msgstr "tak ada koneksi atau perangkat aktif"
 
-#: ../cli/src/connections.c:1290
+#: ../cli/src/connections.c:1312
 #, c-format
 msgid "device '%s' not compatible with connection '%s'"
 msgstr "perangkat '%s' tak kompatibel dengan koneksi '%s'"
 
-#: ../cli/src/connections.c:1292
+#: ../cli/src/connections.c:1314
 #, c-format
 msgid "no device found for connection '%s'"
 msgstr "tak ditemukan perangkat bagi koneksi '%s'"
 
-#: ../cli/src/connections.c:1303
+#: ../cli/src/connections.c:1325
 msgid "unknown reason"
 msgstr "alasan tidak diketahui"
 
-#: ../cli/src/connections.c:1305
+#: ../cli/src/connections.c:1327
 msgid "none"
 msgstr "tidak ada"
 
-#: ../cli/src/connections.c:1307
+#: ../cli/src/connections.c:1329
 msgid "the user was disconnected"
 msgstr "pengguna diputus"
 
-#: ../cli/src/connections.c:1309
+#: ../cli/src/connections.c:1331
 msgid "the base network connection was interrupted"
 msgstr "koneksi jaringan dasar terputus"
 
-#: ../cli/src/connections.c:1311
+#: ../cli/src/connections.c:1333
 msgid "the VPN service stopped unexpectedly"
 msgstr "layanan VPN berhenti secara tak terduga"
 
-#: ../cli/src/connections.c:1313
+#: ../cli/src/connections.c:1335
 msgid "the VPN service returned invalid configuration"
 msgstr "layanan VPN mengembalikan konfigurasi yang tak valid"
 
-#: ../cli/src/connections.c:1315
+#: ../cli/src/connections.c:1337
 msgid "the connection attempt timed out"
 msgstr "usaha koneksi kehabisan waktu"
 
-#: ../cli/src/connections.c:1317
+#: ../cli/src/connections.c:1339
 msgid "the VPN service did not start in time"
 msgstr "layanan VPN tak mulai pada waktunya"
 
-#: ../cli/src/connections.c:1319
+#: ../cli/src/connections.c:1341
 msgid "the VPN service failed to start"
 msgstr "layanan VPN gagal dimulai"
 
-#: ../cli/src/connections.c:1321
+#: ../cli/src/connections.c:1343
 msgid "no valid VPN secrets"
 msgstr "tak ada rahasia VPN yang valid"
 
-#: ../cli/src/connections.c:1323
+#: ../cli/src/connections.c:1345
 msgid "invalid VPN secrets"
 msgstr "rahasia VPN tak valid"
 
-#: ../cli/src/connections.c:1325
+#: ../cli/src/connections.c:1347
 msgid "the connection was removed"
 msgstr "koneksi dihapus"
 
-#: ../cli/src/connections.c:1339
-#, c-format
-msgid "state: %s\n"
-msgstr "keadaan: %s\n"
-
-#: ../cli/src/connections.c:1342
-#: ../cli/src/connections.c:1368
+#: ../cli/src/connections.c:1364 ../cli/src/connections.c:1569
 #, c-format
-msgid "Connection activated\n"
-msgstr "Koneksi diaktifkan\n"
+msgid "Connection successfully activated (D-Bus active path: %s)\n"
+msgstr "Koneksi sukses diaktifkan (path aktif D-Bus: %s)\n"
 
-#: ../cli/src/connections.c:1345
+#. Active connection failed and dissapeared, quit.
+#: ../cli/src/connections.c:1369 ../cli/src/connections.c:1470
 #, c-format
 msgid "Error: Connection activation failed."
 msgstr "Galat: Aktivasi koneksi gagal."
 
-#: ../cli/src/connections.c:1364
+#: ../cli/src/connections.c:1394
 #, c-format
-msgid "state: %s (%d)\n"
-msgstr "keadaan: %s (%d)\n"
+msgid "VPN connection successfully activated (D-Bus active path: %s)\n"
+msgstr "Koneksi VPN sukses diaktifkan (path aktif D-Bus: %s)\n"
 
-#: ../cli/src/connections.c:1374
+#: ../cli/src/connections.c:1402
 #, c-format
 msgid "Error: Connection activation failed: %s."
 msgstr "Galat: Aktivasi koneksi gagal: %s."
 
-#: ../cli/src/connections.c:1391
-#: ../cli/src/devices.c:1158
+#: ../cli/src/connections.c:1499 ../cli/src/devices.c:974
 #, c-format
 msgid "Error: Timeout %d sec expired."
 msgstr "Galat: Timeout %d detik telah berlalu."
 
-#: ../cli/src/connections.c:1404
+#: ../cli/src/connections.c:1560
 #, c-format
 msgid "Error: Connection activation failed: %s"
 msgstr "Galat: Aktivasi koneksi gagal: %s"
 
-#: ../cli/src/connections.c:1410
-#, c-format
-msgid "Active connection state: %s\n"
-msgstr "Keadaan koneksi aktif: %s\n"
-
-#: ../cli/src/connections.c:1411
-#, c-format
-msgid "Active connection path: %s\n"
-msgstr "Path koneksi aktif: %s\n"
-
-#: ../cli/src/connections.c:1464
-#: ../cli/src/connections.c:1609
-#: ../cli/src/connections.c:1737
+#: ../cli/src/connections.c:1654 ../cli/src/connections.c:1808
+#: ../cli/src/connections.c:1936
 #, c-format
 msgid "Error: Unknown connection: %s."
 msgstr "Galat: Koneksi tak dikenal: %s."
 
-#: ../cli/src/connections.c:1510
-#: ../cli/src/devices.c:1230
-#: ../cli/src/devices.c:1782
+#: ../cli/src/connections.c:1700 ../cli/src/devices.c:1059
+#: ../cli/src/devices.c:1605
 #, c-format
 msgid "Error: timeout value '%s' is not valid."
 msgstr "Galat: nilai timeout '%s' tak valid."
 
-#: ../cli/src/connections.c:1523
-#: ../cli/src/connections.c:1626
-#: ../cli/src/connections.c:1717
+#: ../cli/src/connections.c:1713 ../cli/src/connections.c:1825
+#: ../cli/src/connections.c:1916
 #, c-format
 msgid "Error: id or uuid has to be specified."
 msgstr "Galat: id atau uuid mesti dinyatakan."
 
-#: ../cli/src/connections.c:1555
+#: ../cli/src/connections.c:1745
 #, c-format
 msgid "Error: No suitable device found: %s."
 msgstr "Galat: tak ditemukan perangkat yang cocok: %s."
 
-#: ../cli/src/connections.c:1557
+#: ../cli/src/connections.c:1747
 #, c-format
 msgid "Error: No suitable device found."
 msgstr "Galat: tak ditemukan perangkat yang cocok."
 
-#: ../cli/src/connections.c:1662
+#: ../cli/src/connections.c:1861
 #, c-format
 msgid "Warning: Connection not active\n"
 msgstr "Peringatan: Sambungan tak aktif\n"
 
-#: ../cli/src/connections.c:1676
+#: ../cli/src/connections.c:1875
 #, c-format
 msgid "Error: Connection deletion failed: %s"
 msgstr "Galat: Penghapusan koneksi gagal: %s"
 
-#: ../cli/src/connections.c:1794
+#: ../cli/src/connections.c:1993
 #, c-format
 msgid "Error: 'con' command '%s' is not valid."
 msgstr "Galat: 'con' perintah '%s' tak valid."
 
-#: ../cli/src/connections.c:1859
+#: ../cli/src/connections.c:2061
 #, c-format
 msgid "Error: could not connect to D-Bus."
 msgstr "Galat: tak bisa menyambung ke D-Bus."
 
-#: ../cli/src/connections.c:1867
+#: ../cli/src/connections.c:2069
 #, c-format
 msgid "Error: Could not get system settings."
 msgstr "Galat: Tak bisa memperoleh tatanan sistem."
 
-#: ../cli/src/connections.c:1877
+#: ../cli/src/connections.c:2079
 #, c-format
 msgid "Error: Can't obtain connections: settings service is not running."
 msgstr "Galat: Tak bisa mendapat koneksi: layanan penataan tak berjalan."
@@ -717,797 +856,544 @@ msgstr "Galat: Tak bisa mendapat koneksi: layanan penataan tak berjalan."
 #. 0
 #. 9
 #. 3
-#: ../cli/src/devices.c:68
-#: ../cli/src/devices.c:104
-#: ../cli/src/devices.c:182
-#: ../cli/src/devices.c:198
+#: ../cli/src/devices.c:70 ../cli/src/devices.c:106 ../cli/src/devices.c:187
+#: ../cli/src/devices.c:203
 msgid "DEVICE"
 msgstr "DEVICE"
 
 #. 0
-#: ../cli/src/devices.c:81
+#: ../cli/src/devices.c:83
 msgid "CAPABILITIES"
 msgstr "CAPABILITIES"
 
 #. 1
-#: ../cli/src/devices.c:82
+#: ../cli/src/devices.c:84
 msgid "WIFI-PROPERTIES"
 msgstr "WIFI-PROPERTIES"
 
 #. 2
-#: ../cli/src/devices.c:83
+#: ../cli/src/devices.c:85
 msgid "AP"
 msgstr "AP"
 
 #. 3
-#: ../cli/src/devices.c:84
+#: ../cli/src/devices.c:86
 msgid "WIRED-PROPERTIES"
 msgstr "WIRED-PROPERTIES"
 
 #. 4
-#: ../cli/src/devices.c:85
+#: ../cli/src/devices.c:87
 msgid "WIMAX-PROPERTIES"
 msgstr "WIMAX-PROPERTIES"
 
 #. 5
 #. 0
-#: ../cli/src/devices.c:86
-#: ../cli/src/devices.c:195
+#: ../cli/src/devices.c:88 ../cli/src/devices.c:200
 msgid "NSP"
 msgstr "NSP"
 
 #. 6
-#: ../cli/src/devices.c:87
+#: ../cli/src/devices.c:89
 msgid "IP4"
 msgstr "IP4"
 
 #. 7
-#: ../cli/src/devices.c:88
+#: ../cli/src/devices.c:90
 msgid "DHCP4"
 msgstr "DHCP4"
 
 #. 8
-#: ../cli/src/devices.c:89
+#: ../cli/src/devices.c:91
 msgid "IP6"
 msgstr "IP6"
 
 #. 9
-#: ../cli/src/devices.c:90
+#: ../cli/src/devices.c:92
 msgid "DHCP6"
 msgstr "DHCP6"
 
 #. 2
-#: ../cli/src/devices.c:106
+#: ../cli/src/devices.c:108
 msgid "VENDOR"
 msgstr "VENDOR"
 
 #. 3
-#: ../cli/src/devices.c:107
+#: ../cli/src/devices.c:109
 msgid "PRODUCT"
 msgstr "PRODUCT"
 
 #. 4
-#: ../cli/src/devices.c:108
+#: ../cli/src/devices.c:110
 msgid "DRIVER"
 msgstr "DRIVER"
 
 #. 5
-#: ../cli/src/devices.c:109
-msgid "HWADDR"
-msgstr "HWADDR"
-
-#. 7
 #: ../cli/src/devices.c:111
-msgid "REASON"
-msgstr "REASON"
+msgid "DRIVER-VERSION"
+msgstr "DRIVER-VERSION"
 
-#. 8
+#. 6
 #: ../cli/src/devices.c:112
-msgid "UDI"
-msgstr "UDI"
+msgid "FIRMWARE-VERSION"
+msgstr "FIRMWARE-VERSION"
 
-#. 9
+#. 7
 #: ../cli/src/devices.c:113
-msgid "IP-IFACE"
-msgstr "IP-IFACE"
-
-#. 10
-#: ../cli/src/devices.c:114
-msgid "NM-MANAGED"
-msgstr "NM-MANAGED"
+msgid "HWADDR"
+msgstr "HWADDR"
 
-#. 11
+#. 9
 #: ../cli/src/devices.c:115
-msgid "FIRMWARE-MISSING"
-msgstr "FIRMWARE-MISSING"
-
-#. 12
-#: ../cli/src/devices.c:116
-msgid "CONNECTION"
-msgstr "CONNECTION"
-
-#. 0
-#: ../cli/src/devices.c:125
-msgid "CARRIER-DETECT"
-msgstr "CARRIER-DETECT"
-
-#. 1
-#: ../cli/src/devices.c:126
-msgid "SPEED"
-msgstr "SPEED"
-
-#. 0
-#: ../cli/src/devices.c:135
-msgid "CARRIER"
-msgstr "CARRIER"
-
-#. 0
-#: ../cli/src/devices.c:145
-msgid "WEP"
-msgstr "WEP"
-
-#. 1
-#: ../cli/src/devices.c:146
-msgid "WPA"
-msgstr " WPA"
-
-#. 2
-#: ../cli/src/devices.c:147
-msgid "WPA2"
-msgstr " WPA2"
-
-#. 3
-#: ../cli/src/devices.c:148
-msgid "TKIP"
-msgstr "TKIP"
-
-#. 4
-#: ../cli/src/devices.c:149
-msgid "CCMP"
-msgstr "CCMP"
-
-#. 0
-#: ../cli/src/devices.c:159
-msgid "CTR-FREQ"
-msgstr "CTR-FREQ"
-
-#. 1
-#: ../cli/src/devices.c:160
-msgid "RSSI"
-msgstr "RSSI"
-
-#. 2
-#: ../cli/src/devices.c:161
-msgid "CINR"
-msgstr "CINR"
-
-#. 3
-#: ../cli/src/devices.c:162
-msgid "TX-POW"
-msgstr "TX-POW"
-
-#. 4
-#: ../cli/src/devices.c:163
-msgid "BSID"
-msgstr "BSID"
-
-#. 0
-#: ../cli/src/devices.c:173
-msgid "SSID"
-msgstr "SSID"
-
-#. 1
-#: ../cli/src/devices.c:174
-msgid "BSSID"
-msgstr "BSSID"
-
-#. 2
-#: ../cli/src/devices.c:175
-msgid "MODE"
-msgstr "MODE"
-
-#. 3
-#: ../cli/src/devices.c:176
-msgid "FREQ"
-msgstr "FREQ"
-
-#. 4
-#: ../cli/src/devices.c:177
-msgid "RATE"
-msgstr "RATE"
-
-#. 5
-#. 1
-#: ../cli/src/devices.c:178
-#: ../cli/src/devices.c:196
-msgid "SIGNAL"
-msgstr "SIGNAL"
-
-#. 6
-#: ../cli/src/devices.c:179
-msgid "SECURITY"
-msgstr "SECURITY"
-
-#. 7
-#: ../cli/src/devices.c:180
-msgid "WPA-FLAGS"
-msgstr "WPA-FLAGS"
-
-#. 8
-#: ../cli/src/devices.c:181
-msgid "RSN-FLAGS"
-msgstr "RSN-FLAGS"
-
-#. 10
-#. 4
-#: ../cli/src/devices.c:183
-#: ../cli/src/devices.c:199
-msgid "ACTIVE"
-msgstr "ACTIVE"
-
-#: ../cli/src/devices.c:218
-#, 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 ]\n"
-"  disconnect iface  [--nowait] [--timeout ]\n"
-"  wifi [list [iface ] [bssid ]]\n"
-"  wifi connect <(B)SSID> [password ] [wep-key-type key|phrase] [iface ] [bssid ] [name ]\n"
-"               [--private] [--nowait] [--timeout ]\n"
-"  wimax [list [iface ] [nsp ]]\n"
-"\n"
-msgstr ""
-"Cara pakai: nmcli dev { PERINTAH | help }\n"
-"\n"
-"  PERINTAH := { status | list | disconnect | wifi | wimax }\n"
-"\n"
-"  PERINTAH := { status | list | disconnect | wifi }\n"
-"\n"
-"  status\n"
-"  list [iface ]\n"
-"  disconnect iface  [--nowait] [--timeout ]\n"
-"  wifi [list [iface ] [bssid ]]\n"
-"  wifi connect <(B)SSID> [password ] [wep-key-type key|phrase] [iface ] [bssid ] [name ]\n"
-"               [--private] [--nowait] [--timeout ]\n"
-"  wimax [list [iface ] [nsp ]]\n"
-"\n"
-
-#: ../cli/src/devices.c:253
-msgid "unmanaged"
-msgstr "tak dikelola"
-
-#: ../cli/src/devices.c:255
-msgid "unavailable"
-msgstr "tak tersedia"
-
-#: ../cli/src/devices.c:257
-#: ../cli/src/network-manager.c:120
-msgid "disconnected"
-msgstr "terputus"
-
-#: ../cli/src/devices.c:259
-msgid "connecting (prepare)"
-msgstr "sedang menyambung (bersiap)"
-
-#: ../cli/src/devices.c:261
-msgid "connecting (configuring)"
-msgstr "sedang menyambung (sedang menata)"
-
-#: ../cli/src/devices.c:263
-msgid "connecting (need authentication)"
-msgstr "sedang menyambung (perlu otentikasi)"
-
-#: ../cli/src/devices.c:265
-msgid "connecting (getting IP configuration)"
-msgstr "sedang menyambung (sedang mengambil konfigurasi IP)"
-
-#: ../cli/src/devices.c:267
-msgid "connecting (checking IP connectivity)"
-msgstr "sedang menyambung (memeriksa konektivitas IP)"
-
-#: ../cli/src/devices.c:269
-msgid "connecting (starting secondary connections)"
-msgstr "sedang menyambung (memulai koneksi sekunder)"
-
-#: ../cli/src/devices.c:271
-#: ../cli/src/network-manager.c:116
-msgid "connected"
-msgstr "terhubung"
-
-#: ../cli/src/devices.c:275
-msgid "connection failed"
-msgstr "koneksi gagal"
-
-#: ../cli/src/devices.c:286
-msgid "No reason given"
-msgstr "Tak ada alasan yang diberikan"
-
-#: ../cli/src/devices.c:289
-msgid "Unknown error"
-msgstr "Galat tak dikenal"
-
-#: ../cli/src/devices.c:292
-msgid "Device is now managed"
-msgstr "Perangkat kini dikelola"
-
-#: ../cli/src/devices.c:295
-msgid "Device is now unmanaged"
-msgstr "Perangkat kini tak dikelola"
-
-#: ../cli/src/devices.c:298
-msgid "The device could not be readied for configuration"
-msgstr "Perangkat tak dapat dibuat bersiap untuk ditata"
-
-#: ../cli/src/devices.c:301
-msgid "IP configuration could not be reserved (no available address, timeout, etc)"
-msgstr "Konfigurasi IP tak dapat dipesan (alamat tak tersedia, habis waktu, dsb)"
-
-#: ../cli/src/devices.c:304
-msgid "The IP configuration is no longer valid"
-msgstr "Konfigurasi IP tak valid lagi"
-
-#: ../cli/src/devices.c:307
-msgid "Secrets were required, but not provided"
-msgstr "Rahasia diperlukan, tapi tak disediakan"
-
-#: ../cli/src/devices.c:310
-msgid "802.1X supplicant disconnected"
-msgstr "802.1X supplicant diputus"
-
-#: ../cli/src/devices.c:313
-msgid "802.1X supplicant configuration failed"
-msgstr "Konfigurasi 802.1X supplicant gagal"
-
-#: ../cli/src/devices.c:316
-msgid "802.1X supplicant failed"
-msgstr "802.1X supplicant gagal"
-
-#: ../cli/src/devices.c:319
-msgid "802.1X supplicant took too long to authenticate"
-msgstr "802.1X supplicant makan waktu terlalu lama untuk mengotentikasi"
-
-#: ../cli/src/devices.c:322
-msgid "PPP service failed to start"
-msgstr "Layanan PPP gagal dimulai"
-
-#: ../cli/src/devices.c:325
-msgid "PPP service disconnected"
-msgstr "Layanan PPP diputus"
-
-#: ../cli/src/devices.c:328
-msgid "PPP failed"
-msgstr "PPP gagal"
-
-#: ../cli/src/devices.c:331
-msgid "DHCP client failed to start"
-msgstr "Klien DHCP gagal dimulai"
-
-#: ../cli/src/devices.c:334
-msgid "DHCP client error"
-msgstr "Galat klien DHCP"
-
-#: ../cli/src/devices.c:337
-msgid "DHCP client failed"
-msgstr "Klien DHCP gagal"
-
-#: ../cli/src/devices.c:340
-msgid "Shared connection service failed to start"
-msgstr "Layanan koneksi berbagi gagal dimulai"
-
-#: ../cli/src/devices.c:343
-msgid "Shared connection service failed"
-msgstr "Layanan koneksi berbagi gagal"
-
-#: ../cli/src/devices.c:346
-msgid "AutoIP service failed to start"
-msgstr "Layanan AutoIP gagal dimulai"
-
-#: ../cli/src/devices.c:349
-msgid "AutoIP service error"
-msgstr "Galat layanan AutoIP"
-
-#: ../cli/src/devices.c:352
-msgid "AutoIP service failed"
-msgstr "Layanan AutoIP gagal"
+msgid "REASON"
+msgstr "REASON"
 
-#: ../cli/src/devices.c:355
-msgid "The line is busy"
-msgstr "Jalur sibuk"
+#. 10
+#: ../cli/src/devices.c:116
+msgid "UDI"
+msgstr "UDI"
 
-#: ../cli/src/devices.c:358
-msgid "No dial tone"
-msgstr "Tak ada nada panggil"
+#. 11
+#: ../cli/src/devices.c:117
+msgid "IP-IFACE"
+msgstr "IP-IFACE"
 
-#: ../cli/src/devices.c:361
-msgid "No carrier could be established"
-msgstr "Carrier tak dapat dijalin"
+#. 12
+#: ../cli/src/devices.c:118
+msgid "NM-MANAGED"
+msgstr "NM-MANAGED"
 
-#: ../cli/src/devices.c:364
-msgid "The dialing request timed out"
-msgstr "Permintaan pemanggilan habis waktu"
+#. 14
+#: ../cli/src/devices.c:120
+msgid "FIRMWARE-MISSING"
+msgstr "FIRMWARE-MISSING"
 
-#: ../cli/src/devices.c:367
-msgid "The dialing attempt failed"
-msgstr "Usaha memanggil gagal"
+#. 15
+#: ../cli/src/devices.c:121
+msgid "CONNECTION"
+msgstr "CONNECTION"
 
-#: ../cli/src/devices.c:370
-msgid "Modem initialization failed"
-msgstr "Inisialisasi modem gagal"
+#. 0
+#: ../cli/src/devices.c:130
+msgid "CARRIER-DETECT"
+msgstr "CARRIER-DETECT"
 
-#: ../cli/src/devices.c:373
-msgid "Failed to select the specified APN"
-msgstr "Gagal memilih APN yang dinyatakan"
+#. 1
+#: ../cli/src/devices.c:131
+msgid "SPEED"
+msgstr "SPEED"
 
-#: ../cli/src/devices.c:376
-msgid "Not searching for networks"
-msgstr "Tak mencari jaringan"
+#. 0
+#: ../cli/src/devices.c:140
+msgid "CARRIER"
+msgstr "CARRIER"
 
-#: ../cli/src/devices.c:379
-msgid "Network registration denied"
-msgstr "Pendaftaran jaringan ditolak"
+#. 0
+#: ../cli/src/devices.c:150
+msgid "WEP"
+msgstr "WEP"
 
-#: ../cli/src/devices.c:382
-msgid "Network registration timed out"
-msgstr "Pendaftaran jaringan habis waktu"
+#. 1
+#: ../cli/src/devices.c:151
+msgid "WPA"
+msgstr " WPA"
 
-#: ../cli/src/devices.c:385
-msgid "Failed to register with the requested network"
-msgstr "Gagal mendaftar ke jaringan yang diminta"
+#. 2
+#: ../cli/src/devices.c:152
+msgid "WPA2"
+msgstr " WPA2"
 
-#: ../cli/src/devices.c:388
-msgid "PIN check failed"
-msgstr "Uji PIN gagal"
+#. 3
+#: ../cli/src/devices.c:153
+msgid "TKIP"
+msgstr "TKIP"
 
-#: ../cli/src/devices.c:391
-msgid "Necessary firmware for the device may be missing"
-msgstr "Firmware yang diperlukan bagi perangkat mungkin hilang"
+#. 4
+#: ../cli/src/devices.c:154
+msgid "CCMP"
+msgstr "CCMP"
 
-#: ../cli/src/devices.c:394
-msgid "The device was removed"
-msgstr "Perangkat dicabut"
+#. 0
+#: ../cli/src/devices.c:164
+msgid "CTR-FREQ"
+msgstr "CTR-FREQ"
 
-#: ../cli/src/devices.c:397
-msgid "NetworkManager went to sleep"
-msgstr "NetworkManager tidur"
+#. 1
+#: ../cli/src/devices.c:165
+msgid "RSSI"
+msgstr "RSSI"
 
-#: ../cli/src/devices.c:400
-msgid "The device's active connection disappeared"
-msgstr "Koneksi aktif perangkat menghilang"
+#. 2
+#: ../cli/src/devices.c:166
+msgid "CINR"
+msgstr "CINR"
 
-#: ../cli/src/devices.c:403
-msgid "Device disconnected by user or client"
-msgstr "Perangkat diputus oleh pengguna atau klien"
+#. 3
+#: ../cli/src/devices.c:167
+msgid "TX-POW"
+msgstr "TX-POW"
 
-#: ../cli/src/devices.c:406
-msgid "Carrier/link changed"
-msgstr "Carrier/link berubah"
+#. 4
+#: ../cli/src/devices.c:168
+msgid "BSID"
+msgstr "BSID"
 
-#: ../cli/src/devices.c:409
-msgid "The device's existing connection was assumed"
-msgstr "Koneksi perangkat kini diasumsikan"
+#. 0
+#: ../cli/src/devices.c:178
+msgid "SSID"
+msgstr "SSID"
 
-#: ../cli/src/devices.c:412
-msgid "The supplicant is now available"
-msgstr "Supplicant kini tersedia"
+#. 1
+#: ../cli/src/devices.c:179
+msgid "BSSID"
+msgstr "BSSID"
 
-#: ../cli/src/devices.c:415
-msgid "The modem could not be found"
-msgstr "Modem tak dapat ditemukan"
+#. 2
+#: ../cli/src/devices.c:180
+msgid "MODE"
+msgstr "MODE"
 
-#: ../cli/src/devices.c:418
-msgid "The Bluetooth connection failed or timed out"
-msgstr "Koneksi Bluetooth gagal atau kehabisan waktu"
+#. 3
+#: ../cli/src/devices.c:181
+msgid "FREQ"
+msgstr "FREQ"
 
-#: ../cli/src/devices.c:421
-msgid "GSM Modem's SIM card not inserted"
-msgstr "Kartu SIM Modem GSM tak dipasang"
+#. 4
+#: ../cli/src/devices.c:182
+msgid "RATE"
+msgstr "RATE"
 
-#: ../cli/src/devices.c:424
-msgid "GSM Modem's SIM PIN required"
-msgstr "PIN SIM Modem GSM diperlukan"
+#. 5
+#. 1
+#: ../cli/src/devices.c:183 ../cli/src/devices.c:201
+msgid "SIGNAL"
+msgstr "SIGNAL"
 
-#: ../cli/src/devices.c:427
-msgid "GSM Modem's SIM PUK required"
-msgstr "PUK SIM Modem GSM diperlukan"
+#. 6
+#: ../cli/src/devices.c:184
+msgid "SECURITY"
+msgstr "SECURITY"
 
-#: ../cli/src/devices.c:430
-msgid "GSM Modem's SIM wrong"
-msgstr "SIM Modem GSM salah"
+#. 7
+#: ../cli/src/devices.c:185
+msgid "WPA-FLAGS"
+msgstr "WPA-FLAGS"
 
-#: ../cli/src/devices.c:433
-msgid "InfiniBand device does not support connected mode"
-msgstr "Perangkat InfiniBand tak mendukung mode tersambung"
+#. 8
+#: ../cli/src/devices.c:186
+msgid "RSN-FLAGS"
+msgstr "RSN-FLAGS"
 
-#: ../cli/src/devices.c:436
-msgid "A dependency of the connection failed"
-msgstr "Suatu kebergantungan koneksi gagal"
+#. 10
+#. 4
+#: ../cli/src/devices.c:188 ../cli/src/devices.c:204
+msgid "ACTIVE"
+msgstr "ACTIVE"
 
-#: ../cli/src/devices.c:438
-#: ../cli/src/devices.c:461
-#: ../cli/src/devices.c:477
-#: ../cli/src/devices.c:597
-#: ../cli/src/devices.c:641
-msgid "Unknown"
-msgstr "Tak dikenal"
+#: ../cli/src/devices.c:223
+#, 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 ]\n"
+"  disconnect iface  [--nowait] [--timeout ]\n"
+"  wifi [list [iface ] [bssid ]]\n"
+"  wifi connect <(B)SSID> [password ] [wep-key-type key|phrase] "
+"[iface ] [bssid ] [name ]\n"
+"               [--private] [--nowait] [--timeout ]\n"
+"  wimax [list [iface ] [nsp ]]\n"
+"\n"
+msgstr ""
+"Cara pakai: nmcli dev { PERINTAH | help }\n"
+"\n"
+"  PERINTAH := { status | list | disconnect | wifi | wimax }\n"
+"\n"
+"  PERINTAH := { status | list | disconnect | wifi }\n"
+"\n"
+"  status\n"
+"  list [iface ]\n"
+"  disconnect iface  [--nowait] [--timeout ]\n"
+"  wifi [list [iface ] [bssid ]]\n"
+"  wifi connect <(B)SSID> [password ] [wep-key-type key|phrase] "
+"[iface ] [bssid ] [name ]\n"
+"               [--private] [--nowait] [--timeout ]\n"
+"  wimax [list [iface ] [nsp ]]\n"
+"\n"
 
-#: ../cli/src/devices.c:510
+#: ../cli/src/devices.c:323
 msgid "(none)"
 msgstr "(tidak ada)"
 
-#: ../cli/src/devices.c:566
+#: ../cli/src/devices.c:379
 #, c-format
 msgid "%u MHz"
 msgstr "%u MHz"
 
-#: ../cli/src/devices.c:567
+#: ../cli/src/devices.c:380
 #, c-format
 msgid "%u MB/s"
 msgstr "%u MB/s"
 
-#: ../cli/src/devices.c:576
+#: ../cli/src/devices.c:389
 msgid "Encrypted: "
-msgstr "Terenkripsi:"
+msgstr "Terenkripsi: "
 
-#: ../cli/src/devices.c:581
+#: ../cli/src/devices.c:394
 msgid "WEP "
 msgstr "WEP "
 
-#: ../cli/src/devices.c:583
+#: ../cli/src/devices.c:396
 msgid "WPA "
 msgstr "WPA "
 
-#: ../cli/src/devices.c:585
+#: ../cli/src/devices.c:398
 msgid "WPA2 "
 msgstr "WPA2 "
 
-#: ../cli/src/devices.c:588
+#: ../cli/src/devices.c:401
 msgid "Enterprise "
 msgstr "Enterprise "
 
-#: ../cli/src/devices.c:597
+#: ../cli/src/devices.c:410
 msgid "Ad-Hoc"
 msgstr "Ad-Hoc"
 
-#: ../cli/src/devices.c:597
+#: ../cli/src/devices.c:410
 msgid "Infrastructure"
 msgstr "Infrastruktur"
 
-#: ../cli/src/devices.c:632
+#: ../cli/src/devices.c:445
 msgid "Home"
 msgstr "Rumah"
 
-#: ../cli/src/devices.c:635
+#: ../cli/src/devices.c:448
 msgid "Partner"
 msgstr "Pasangan"
 
-#: ../cli/src/devices.c:638
+#: ../cli/src/devices.c:451
 msgid "Roaming"
 msgstr "Roaming"
 
-#: ../cli/src/devices.c:710
+#: ../cli/src/devices.c:523
 #, c-format
 msgid "Error: 'dev list': %s"
 msgstr "Galat: 'dev list': %s"
 
-#: ../cli/src/devices.c:712
+#: ../cli/src/devices.c:525
 #, c-format
 msgid "Error: 'dev list': %s; allowed fields: %s"
 msgstr "Galat: 'dev list': %s; ruas yang diijinkan: %s"
 
-#: ../cli/src/devices.c:721
+#: ../cli/src/devices.c:534
 msgid "Device details"
 msgstr "Rincian perangkat"
 
-#: ../cli/src/devices.c:766
-#: ../cli/src/devices.c:767
-#: ../cli/src/devices.c:1174
+#: ../cli/src/devices.c:579 ../cli/src/devices.c:582 ../cli/src/devices.c:1000
 #: ../cli/src/utils.c:477
 msgid "(unknown)"
 msgstr "(tak diketahui)"
 
-#: ../cli/src/devices.c:775
+#: ../cli/src/devices.c:591
 msgid "not connected"
 msgstr "tak terhubung"
 
-#: ../cli/src/devices.c:802
+#: ../cli/src/devices.c:618
 #, c-format
 msgid "%u Mb/s"
 msgstr "%u Mb/s"
 
 #. Print header
 #. "WIRED-PROPERTIES"
-#: ../cli/src/devices.c:875
+#: ../cli/src/devices.c:691
 msgid "on"
 msgstr "nyala"
 
-#: ../cli/src/devices.c:875
+#: ../cli/src/devices.c:691
 msgid "off"
 msgstr "mati"
 
-#: ../cli/src/devices.c:1026
+#: ../cli/src/devices.c:842
 #, c-format
 msgid "Error: 'dev status': %s"
 msgstr "Galat: 'dev status': %s"
 
-#: ../cli/src/devices.c:1028
+#: ../cli/src/devices.c:844
 #, c-format
 msgid "Error: 'dev status': %s; allowed fields: %s"
 msgstr "Galat: 'dev status': %s; ruas yang diijinkan: %s"
 
-#: ../cli/src/devices.c:1051
+#: ../cli/src/devices.c:867
 msgid "Status of devices"
 msgstr "Status perangkat"
 
-#: ../cli/src/devices.c:1082
+#: ../cli/src/devices.c:898
 #, c-format
 msgid "Error: '%s' argument is missing."
 msgstr "Galat: argumen '%s' hilang."
 
-#: ../cli/src/devices.c:1123
-#: ../cli/src/devices.c:1275
-#: ../cli/src/devices.c:1412
-#: ../cli/src/devices.c:2069
+#: ../cli/src/devices.c:939 ../cli/src/devices.c:1104
+#: ../cli/src/devices.c:1245 ../cli/src/devices.c:1892
 #, c-format
 msgid "Error: Device '%s' not found."
 msgstr "Galat: Perangkat '%s' tak ditemukan."
 
-#: ../cli/src/devices.c:1146
+#: ../cli/src/devices.c:962
 #, c-format
 msgid "Success: Device '%s' successfully disconnected."
 msgstr "Sukses: Perangkat '%s' diputus dengan sukses."
 
-#: ../cli/src/devices.c:1171
+#: ../cli/src/devices.c:997
 #, c-format
 msgid "Error: Device '%s' (%s) disconnecting failed: %s"
-msgstr "Galat: Pemutusan perangkat '%s' (%s) gagal: %s "
+msgstr "Galat: Pemutusan perangkat '%s' (%s) gagal: %s"
 
-#: ../cli/src/devices.c:1179
+#: ../cli/src/devices.c:1010
 #, c-format
-msgid "Device state: %d (%s)\n"
-msgstr "Keadaan perangkat: %d (%s)\n"
+msgid "Device '%s' has been disconnected.\n"
+msgstr "Perangkat '%s' telah diputus.\n"
 
-#: ../cli/src/devices.c:1244
+#: ../cli/src/devices.c:1073
 #, c-format
 msgid "Error: iface has to be specified."
 msgstr "Galat: iface mesti dinyatakan."
 
-#: ../cli/src/devices.c:1370
+#: ../cli/src/devices.c:1203
 #, c-format
 msgid "Error: 'dev wifi': %s"
 msgstr "Galat: 'dev wifi': %s"
 
-#: ../cli/src/devices.c:1372
+#: ../cli/src/devices.c:1205
 #, c-format
 msgid "Error: 'dev wifi': %s; allowed fields: %s"
 msgstr "Galat: 'dev wifi': %s; ruas yang diijinkan: %s"
 
-#: ../cli/src/devices.c:1395
+#: ../cli/src/devices.c:1228
 msgid "WiFi scan list"
 msgstr "Daftar pindai WiFi"
 
-#: ../cli/src/devices.c:1432
-#: ../cli/src/devices.c:1486
+#: ../cli/src/devices.c:1265 ../cli/src/devices.c:1319
 #, c-format
 msgid "Error: Access point with bssid '%s' not found."
 msgstr "Galat: Access point dengan bssid '%s' tak ditemukan."
 
-#: ../cli/src/devices.c:1449
+#: ../cli/src/devices.c:1282
 #, c-format
 msgid "Error: Device '%s' is not a WiFi device."
 msgstr "Galat: Perangkat '%s' bukan perangkat WiFi."
 
-#: ../cli/src/devices.c:1527
-#: ../cli/src/devices.c:1573
+#: ../cli/src/devices.c:1350 ../cli/src/devices.c:1396
 #, c-format
 msgid "Connection with UUID '%s' created and activated on device '%s'\n"
 msgstr "Koneksi dengan UUID '%s' dibuat dan diaktifkan pada perangkat '%s'\n"
 
-#: ../cli/src/devices.c:1532
+#: ../cli/src/devices.c:1355
 #, c-format
 msgid "Error: Connection activation failed: (%d) %s."
 msgstr "Galat: Aktivasi koneksi gagal: (%d) %s."
 
-#: ../cli/src/devices.c:1557
+#: ../cli/src/devices.c:1380
 #, c-format
 msgid "Error: Failed to add/activate new connection: (%d) %s"
 msgstr "Galat: Gagal menambah/mengaktifkan koneksi baru: (%d) %s"
 
-#: ../cli/src/devices.c:1565
+#: ../cli/src/devices.c:1388
 #, c-format
 msgid "Error: Failed to add/activate new connection: Unknown error"
 msgstr "Galat: Gagal menambah/mengaktifkan koneksi baru: Galat tak dikenal"
 
-#: ../cli/src/devices.c:1709
+#: ../cli/src/devices.c:1532
 #, c-format
 msgid "Error: SSID or BSSID are missing."
 msgstr "Galat: SSID atau BSSID hilang."
 
-#: ../cli/src/devices.c:1732
+#: ../cli/src/devices.c:1555
 #, c-format
 msgid "Error: bssid argument value '%s' is not a valid BSSID."
 msgstr "Galat: nilai argumen bssid '%s' bukan BSSID yang valid."
 
-#: ../cli/src/devices.c:1756
+#: ../cli/src/devices.c:1579
 #, c-format
-msgid "Error: wep-key-type argument value '%s' is invalid, use 'key' or 'phrase'."
-msgstr "Galat: Nilai argumen jenis-kunci-wep '%s' tak valid, gunakan 'key' atau 'phrase'."
+msgid ""
+"Error: wep-key-type argument value '%s' is invalid, use 'key' or 'phrase'."
+msgstr ""
+"Galat: Nilai argumen jenis-kunci-wep '%s' tak valid, gunakan 'key' atau "
+"'phrase'."
 
-#: ../cli/src/devices.c:1796
+#: ../cli/src/devices.c:1619
 #, c-format
 msgid "Error: BSSID to connect to (%s) differs from bssid argument (%s)."
-msgstr "Galat: BSSID yang akan dihubungi (%s) berbeda dengan argumen bssid (%s)."
+msgstr ""
+"Galat: BSSID yang akan dihubungi (%s) berbeda dengan argumen bssid (%s)."
 
-#: ../cli/src/devices.c:1802
+#: ../cli/src/devices.c:1625
 #, c-format
 msgid "Error: Parameter '%s' is neither SSID nor BSSID."
 msgstr "Galat: Parameter '%s' bukan SSID maupun BSSID."
 
-#: ../cli/src/devices.c:1831
+#: ../cli/src/devices.c:1654
 #, c-format
 msgid "Error: Device '%s' is not a Wi-Fi device."
 msgstr "Galat: Perangkat '%s' bukan perangkat WiFi."
 
-#: ../cli/src/devices.c:1833
+#: ../cli/src/devices.c:1656
 #, c-format
 msgid "Error: No Wi-Fi device found."
 msgstr "Galat: Tak ditemukan perangkat Wi-Fi."
 
-#: ../cli/src/devices.c:1851
+#: ../cli/src/devices.c:1674
 #, c-format
 msgid "Error: No network with SSID '%s' found."
 msgstr "Galat: Tak ditemukan jaringan dengan SSID '%s'."
 
-#: ../cli/src/devices.c:1853
+#: ../cli/src/devices.c:1676
 #, c-format
 msgid "Error: No access point with BSSID '%s' found."
 msgstr "Galat: Tak ditemukan access point dengan BSSID '%s'."
 
-#: ../cli/src/devices.c:1951
+#: ../cli/src/devices.c:1774
 #, c-format
 msgid "Error: 'dev wifi' command '%s' is not valid."
 msgstr "Galat: 'dev wifi' perintah '%s' tak valid."
 
-#: ../cli/src/devices.c:2027
+#: ../cli/src/devices.c:1850
 #, c-format
 msgid "Error: 'dev wimax': %s"
 msgstr "Galat: 'dev wimax': %s"
 
-#: ../cli/src/devices.c:2029
+#: ../cli/src/devices.c:1852
 #, c-format
 msgid "Error: 'dev wimax': %s; allowed fields: %s"
 msgstr "Galat: 'dev wimax': %s; ruas yang diijinkan: %s"
 
-#: ../cli/src/devices.c:2052
+#: ../cli/src/devices.c:1875
 msgid "WiMAX NSP list"
 msgstr "Daftar NSP WiMAX"
 
-#: ../cli/src/devices.c:2089
+#: ../cli/src/devices.c:1912
 #, c-format
 msgid "Error: NSP with name '%s' not found."
 msgstr "Galat: NSP bernama '%s' tak ditemukan."
 
-#: ../cli/src/devices.c:2100
+#: ../cli/src/devices.c:1923
 #, c-format
 msgid "Error: Device '%s' is not a WiMAX device."
 msgstr "Galat: Perangkat '%s' bukan perangkat WiMAX."
 
-#: ../cli/src/devices.c:2131
+#: ../cli/src/devices.c:1954
 #, c-format
 msgid "Error: Access point with nsp '%s' not found."
 msgstr "Galat: Access point dengan nsp '%s' tak ditemukan."
 
-#: ../cli/src/devices.c:2158
+#: ../cli/src/devices.c:1981
 #, c-format
 msgid "Error: 'dev wimax' command '%s' is not valid."
 msgstr "Galat: 'dev wimax' perintah '%s' tak valid."
 
-#: ../cli/src/devices.c:2208
+#: ../cli/src/devices.c:2031
 #, c-format
 msgid "Error: 'dev' command '%s' is not valid."
 msgstr "Galat: 'dev' perintah '%s' tak valid."
@@ -1570,7 +1456,8 @@ msgstr "VALUE"
 msgid ""
 "Usage: nmcli nm { COMMAND | help }\n"
 "\n"
-"  COMMAND := { status | permissions | enable | sleep | wifi | wwan | wimax }\n"
+"  COMMAND := { status | permissions | enable | sleep | wifi | wwan | "
+"wimax }\n"
 "\n"
 "  COMMAND := { status | permissions | enable | sleep | wifi | wwan }\n"
 "\n"
@@ -1585,7 +1472,8 @@ msgid ""
 msgstr ""
 "Cara pakai: nmcli nm { PERINTAH | help }\n"
 "\n"
-"  PERINTAH := { status | permissions | enable | sleep | wifi | wwan | wimax }\n"
+"  PERINTAH := { status | permissions | enable | sleep | wifi | wwan | "
+"wimax }\n"
 "\n"
 "  PERINTAH := { status | permissions | enable | sleep | wifi | wwan }\n"
 "\n"
@@ -1630,30 +1518,20 @@ msgid "Error: 'nm status': %s; allowed fields: %s"
 msgstr "Galat: 'nm status': %s; ruas yang diijinkan: %s"
 
 #. create NMClient
-#: ../cli/src/network-manager.c:173
-#: ../cli/src/network-manager.c:174
-#: ../cli/src/network-manager.c:175
-#: ../cli/src/network-manager.c:176
-#: ../cli/src/network-manager.c:177
-#: ../cli/src/network-manager.c:179
-#: ../cli/src/network-manager.c:180
-#: ../cli/src/network-manager.c:429
-#: ../cli/src/network-manager.c:484
-#: ../cli/src/network-manager.c:522
+#: ../cli/src/network-manager.c:173 ../cli/src/network-manager.c:174
+#: ../cli/src/network-manager.c:175 ../cli/src/network-manager.c:176
+#: ../cli/src/network-manager.c:177 ../cli/src/network-manager.c:179
+#: ../cli/src/network-manager.c:180 ../cli/src/network-manager.c:429
+#: ../cli/src/network-manager.c:484 ../cli/src/network-manager.c:522
 #: ../cli/src/network-manager.c:561
 msgid "enabled"
 msgstr "diaktifkan"
 
-#: ../cli/src/network-manager.c:173
-#: ../cli/src/network-manager.c:174
-#: ../cli/src/network-manager.c:175
-#: ../cli/src/network-manager.c:176
-#: ../cli/src/network-manager.c:177
-#: ../cli/src/network-manager.c:179
-#: ../cli/src/network-manager.c:180
-#: ../cli/src/network-manager.c:429
-#: ../cli/src/network-manager.c:484
-#: ../cli/src/network-manager.c:522
+#: ../cli/src/network-manager.c:173 ../cli/src/network-manager.c:174
+#: ../cli/src/network-manager.c:175 ../cli/src/network-manager.c:176
+#: ../cli/src/network-manager.c:177 ../cli/src/network-manager.c:179
+#: ../cli/src/network-manager.c:180 ../cli/src/network-manager.c:429
+#: ../cli/src/network-manager.c:484 ../cli/src/network-manager.c:522
 #: ../cli/src/network-manager.c:561
 msgid "disabled"
 msgstr "dimatikan"
@@ -1689,8 +1567,7 @@ msgstr "Galat: 'nm permissions': %s; ruas yang diijinkan: %s"
 msgid "NetworkManager permissions"
 msgstr "Ijin NetworkManager"
 
-#: ../cli/src/network-manager.c:350
-#: ../cli/src/utils.c:457
+#: ../cli/src/network-manager.c:350 ../cli/src/utils.c:457
 #, c-format
 msgid "Error: Couldn't connect to system bus: %s"
 msgstr "Galat: Tak bisa menyambung ke bus sistem: %s"
@@ -1705,10 +1582,8 @@ msgstr "Galat: Tak bisa membuat proksi objek D-Bus."
 msgid "Error in sleep: %s"
 msgstr "Galat dalam sleep: %s"
 
-#: ../cli/src/network-manager.c:416
-#: ../cli/src/network-manager.c:471
-#: ../cli/src/network-manager.c:509
-#: ../cli/src/network-manager.c:548
+#: ../cli/src/network-manager.c:416 ../cli/src/network-manager.c:471
+#: ../cli/src/network-manager.c:509 ../cli/src/network-manager.c:548
 #, c-format
 msgid "Error: '--fields' value '%s' is not valid here; allowed fields: %s"
 msgstr "Galat: nilai '--fields' '%s' tak valid disini; ruas yang diijinkan: %s"
@@ -1720,7 +1595,8 @@ msgstr "Jaringan diaktifkan"
 #: ../cli/src/network-manager.c:440
 #, c-format
 msgid "Error: invalid 'enable' parameter: '%s'; use 'true' or 'false'."
-msgstr "Galat: parameter 'enable' tak valid: '%s'; gunakan 'true' atau 'false'."
+msgstr ""
+"Galat: parameter 'enable' tak valid: '%s'; gunakan 'true' atau 'false'."
 
 #: ../cli/src/network-manager.c:450
 #, c-format
@@ -1774,8 +1650,10 @@ msgid ""
 "  -p[retty]                                  pretty output\n"
 "  -m[ode] tabular|multiline                  output mode\n"
 "  -f[ields] |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"
+"  -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"
@@ -1793,7 +1671,8 @@ msgstr ""
 "  -m[ode] tabular|multiline                  mode keluaran\n"
 "  -f[ields] |all|common   nyatakan ruas yang ditampilkan\n"
 "  -e[scape] yes|no                           pemisah kolom escape di nilai\n"
-"  -n[ocheck]                                 jangan periksa versi nmcli dan NetworkManager\n"
+"  -n[ocheck]                                 jangan periksa versi nmcli dan "
+"NetworkManager\n"
 "  -v[ersion]                                 tampilkan versi program\n"
 "  -h[elp]                                    cetak bantuan ini\n"
 "\n"
@@ -1828,14 +1707,12 @@ msgstr "Galat: Opsi '--pretty' dinyatakan kedua kali."
 msgid "Error: Option '--pretty' is mutually exclusive with '--terse'."
 msgstr "Galat: Opsi '--pretty' eksklusif mutual dengan '--terse'."
 
-#: ../cli/src/nmcli.c:167
-#: ../cli/src/nmcli.c:183
+#: ../cli/src/nmcli.c:167 ../cli/src/nmcli.c:183
 #, c-format
 msgid "Error: missing argument for '%s' option."
 msgstr "Galat: argumen hilang bagi opsi '%s'."
 
-#: ../cli/src/nmcli.c:176
-#: ../cli/src/nmcli.c:192
+#: ../cli/src/nmcli.c:176 ../cli/src/nmcli.c:192
 #, c-format
 msgid "Error: '%s' is not valid argument for '%s' option."
 msgstr "Galat: '%s' bukan argumen yang valid bagi opsi '%s'."
@@ -1868,110 +1745,117 @@ msgstr "Galat: Tak bisa membuat objek NMClient."
 msgid "Success"
 msgstr "Sukses"
 
-#: ../cli/src/settings.c:497
+#: ../cli/src/settings.c:519
 #, c-format
 msgid "%d (hex-ascii-key)"
 msgstr "%d (kunci-hex-ascii)"
 
-#: ../cli/src/settings.c:499
+#: ../cli/src/settings.c:521
 #, c-format
 msgid "%d (104/128-bit passphrase)"
 msgstr "%d (104/128-bit frasa sandi)"
 
-#: ../cli/src/settings.c:502
+#: ../cli/src/settings.c:524 ../cli/src/settings.c:652
 #, c-format
 msgid "%d (unknown)"
 msgstr "%d (tak dikenal)"
 
-#: ../cli/src/settings.c:528
+#: ../cli/src/settings.c:550
 msgid "0 (unknown)"
 msgstr "0 (tak dikenal)"
 
-#: ../cli/src/settings.c:534
+#: ../cli/src/settings.c:556
 msgid "any, "
 msgstr "sebarang, "
 
-#: ../cli/src/settings.c:536
+#: ../cli/src/settings.c:558
 msgid "900 MHz, "
 msgstr "900 MHz, "
 
-#: ../cli/src/settings.c:538
+#: ../cli/src/settings.c:560
 msgid "1800 MHz, "
 msgstr "1800 MHz, "
 
-#: ../cli/src/settings.c:540
+#: ../cli/src/settings.c:562
 msgid "1900 MHz, "
 msgstr "1900 MHz, "
 
-#: ../cli/src/settings.c:542
+#: ../cli/src/settings.c:564
 msgid "850 MHz, "
 msgstr "850 MHz, "
 
-#: ../cli/src/settings.c:544
+#: ../cli/src/settings.c:566
 msgid "WCDMA 3GPP UMTS 2100 MHz, "
 msgstr "WCDMA 3GPP UMTS 2100 MHz, "
 
-#: ../cli/src/settings.c:546
+#: ../cli/src/settings.c:568
 msgid "WCDMA 3GPP UMTS 1800 MHz, "
 msgstr "WCDMA 3GPP UMTS 1800 MHz, "
 
-#: ../cli/src/settings.c:548
+#: ../cli/src/settings.c:570
 msgid "WCDMA 3GPP UMTS 1700/2100 MHz, "
 msgstr "WCDMA 3GPP UMTS 1700/2100 MHz, "
 
-#: ../cli/src/settings.c:550
+#: ../cli/src/settings.c:572
 msgid "WCDMA 3GPP UMTS 800 MHz, "
 msgstr "WCDMA 3GPP UMTS 800 MHz, "
 
-#: ../cli/src/settings.c:552
+#: ../cli/src/settings.c:574
 msgid "WCDMA 3GPP UMTS 850 MHz, "
 msgstr "WCDMA 3GPP UMTS 850 MHz, "
 
-#: ../cli/src/settings.c:554
+#: ../cli/src/settings.c:576
 msgid "WCDMA 3GPP UMTS 900 MHz, "
 msgstr "WCDMA 3GPP UMTS 900 MHz, "
 
-#: ../cli/src/settings.c:556
+#: ../cli/src/settings.c:578
 msgid "WCDMA 3GPP UMTS 1700 MHz, "
 msgstr "WCDMA 3GPP UMTS 1700 MHz, "
 
-#: ../cli/src/settings.c:558
+#: ../cli/src/settings.c:580
 msgid "WCDMA 3GPP UMTS 1900 MHz, "
 msgstr "WCDMA 3GPP UMTS 1900 MHz, "
 
-#: ../cli/src/settings.c:560
+#: ../cli/src/settings.c:582
 msgid "WCDMA 3GPP UMTS 2600 MHz, "
 msgstr "WCDMA 3GPP UMTS 2600 MHz, "
 
-#: ../cli/src/settings.c:578
+#: ../cli/src/settings.c:600
 msgid "0 (NONE)"
 msgstr "0 (NONE)"
 
-#: ../cli/src/settings.c:584
+#: ../cli/src/settings.c:606
 msgid "REORDER_HEADERS, "
 msgstr "REORDER_HEADERS, "
 
-#: ../cli/src/settings.c:586
+#: ../cli/src/settings.c:608
 msgid "GVRP, "
 msgstr "GVRP, "
 
-#: ../cli/src/settings.c:588
+#: ../cli/src/settings.c:610
 msgid "LOOSE_BINDING, "
 msgstr "LOOSE_BINDING, "
 
-#: ../cli/src/settings.c:731
-#: ../cli/src/settings.c:927
-#: ../cli/src/settings.c:1631
+#: ../cli/src/settings.c:646
+#, c-format
+msgid "%d (disabled)"
+msgstr "%d (dimatikan)"
+
+#: ../cli/src/settings.c:648
+#, c-format
+msgid "%d (enabled, prefer public IP)"
+msgstr "%d (difungsikan, lebih suka IP publik)"
+
+#: ../cli/src/settings.c:650
+#, c-format
+msgid "%d (enabled, prefer temporary IP)"
+msgstr "%d (difungsikan, lebih suka IP temporer)"
+
+#: ../cli/src/settings.c:768 ../cli/src/settings.c:964
+#: ../cli/src/settings.c:1673
 msgid "auto"
 msgstr "otomatis"
 
-#: ../cli/src/settings.c:921
-#: ../cli/src/settings.c:924
-#: ../cli/src/settings.c:925
-#: ../cli/src/utils.c:279
-msgid "not set"
-msgstr "tak ditata"
-
 #: ../cli/src/utils.c:103
 #, c-format
 msgid "Error converting IP4 address '0x%X' to text form"
@@ -2014,13 +1898,21 @@ msgstr "Galat: Permintaan NameHasOwner gagal: %s"
 
 #: ../cli/src/utils.c:521
 #, c-format
-msgid "Warning: nmcli (%s) and NetworkManager (%s) versions don't match. Use --nocheck to suppress the warning.\n"
-msgstr "Peringatan: Versi nmcli (%s) dan NetworkManager (%s) tak cocok. Gunakan --nocheck untuk meredam peringatan.\n"
+msgid ""
+"Warning: nmcli (%s) and NetworkManager (%s) versions don't match. Use --"
+"nocheck to suppress the warning.\n"
+msgstr ""
+"Peringatan: Versi nmcli (%s) dan NetworkManager (%s) tak cocok. Gunakan --"
+"nocheck untuk meredam peringatan.\n"
 
 #: ../cli/src/utils.c:530
 #, c-format
-msgid "Error: nmcli (%s) and NetworkManager (%s) versions don't match. Force execution using --nocheck, but the results are unpredictable."
-msgstr "Galat: Versi nmcli (%s) dan NetworkManager (%s) tak cocok. Paksakan eksekusi memakai --nocheck, tapi hasilnya tak dapat ditebak."
+msgid ""
+"Error: nmcli (%s) and NetworkManager (%s) versions don't match. Force "
+"execution using --nocheck, but the results are unpredictable."
+msgstr ""
+"Galat: Versi nmcli (%s) dan NetworkManager (%s) tak cocok. Paksakan eksekusi "
+"memakai --nocheck, tapi hasilnya tak dapat ditebak."
 
 #: ../libnm-util/crypto.c:133
 #, c-format
@@ -2089,8 +1981,7 @@ msgstr "Tak cukup memori untuk menyimpan data kunci privat."
 msgid "Failed to decode PKCS#8 private key."
 msgstr "Gagal mengawa kode (decode) kunci privat PKCS#8."
 
-#: ../libnm-util/crypto.c:339
-#: ../libnm-util/crypto.c:625
+#: ../libnm-util/crypto.c:339 ../libnm-util/crypto.c:625
 #, c-format
 msgid "Not enough memory to store certificate data."
 msgstr "Tak cukup memori untuk menyimpan data sertifikat."
@@ -2110,10 +2001,8 @@ msgstr "Tak cukup memori untuk menyimpan IV."
 msgid "IV contains non-hexadecimal digits."
 msgstr "IV memuat digit bukan heksadesimal."
 
-#: ../libnm-util/crypto.c:423
-#: ../libnm-util/crypto_gnutls.c:147
-#: ../libnm-util/crypto_gnutls.c:265
-#: ../libnm-util/crypto_nss.c:167
+#: ../libnm-util/crypto.c:423 ../libnm-util/crypto_gnutls.c:147
+#: ../libnm-util/crypto_gnutls.c:265 ../libnm-util/crypto_nss.c:167
 #: ../libnm-util/crypto_nss.c:332
 #, c-format
 msgid "Private key cipher '%s' was unknown."
@@ -2127,7 +2016,8 @@ msgstr "Tak cukup memori untuk mengawa sandi (decrypt) kunci privat."
 #: ../libnm-util/crypto.c:497
 #, c-format
 msgid "Not enough memory to store decrypted private key."
-msgstr "Tak cukup memori untuk menyimpan kunci privat terawa sandi (decrypted)."
+msgstr ""
+"Tak cukup memori untuk menyimpan kunci privat terawa sandi (decrypted)."
 
 #: ../libnm-util/crypto.c:542
 #, c-format
@@ -2163,8 +2053,7 @@ msgstr "Gagal menginisialisasi mesin MD5: %s / %s."
 msgid "Invalid IV length (must be at least %zd)."
 msgstr "Panjang IV tak valid (mesti paling tidak %zd)."
 
-#: ../libnm-util/crypto_gnutls.c:164
-#: ../libnm-util/crypto_nss.c:184
+#: ../libnm-util/crypto_gnutls.c:164 ../libnm-util/crypto_nss.c:184
 #, c-format
 msgid "Not enough memory for decrypted key buffer."
 msgstr "Tak cukup memori untuk penyangga kunci terawa sandi (decrypted)."
@@ -2172,12 +2061,14 @@ msgstr "Tak cukup memori untuk penyangga kunci terawa sandi (decrypted)."
 #: ../libnm-util/crypto_gnutls.c:172
 #, c-format
 msgid "Failed to initialize the decryption cipher context: %s / %s."
-msgstr "Gagal menginisialisasi konteks cipher pengawasandian (decryption): %s / %s."
+msgstr ""
+"Gagal menginisialisasi konteks cipher pengawasandian (decryption): %s / %s."
 
 #: ../libnm-util/crypto_gnutls.c:181
 #, c-format
 msgid "Failed to set symmetric key for decryption: %s / %s."
-msgstr "Gagal menata kunci simetrik untuk pengawasandian (decryption): %s / %s."
+msgstr ""
+"Gagal menata kunci simetrik untuk pengawasandian (decryption): %s / %s."
 
 #: ../libnm-util/crypto_gnutls.c:190
 #, c-format
@@ -2189,20 +2080,18 @@ msgstr "Gagal menata IV untuk pengawasandian (decryption): %s / %s."
 msgid "Failed to decrypt the private key: %s / %s."
 msgstr "Gagal mengawa sandi (decrypt) kunci privat: %s / %s."
 
-#: ../libnm-util/crypto_gnutls.c:209
-#: ../libnm-util/crypto_nss.c:263
+#: ../libnm-util/crypto_gnutls.c:209 ../libnm-util/crypto_nss.c:263
 #, c-format
 msgid "Failed to decrypt the private key: unexpected padding length."
-msgstr "Gagal mengawa sandi (decrypt) kunci privat: panjang padding tak diharapkan."
+msgstr ""
+"Gagal mengawa sandi (decrypt) kunci privat: panjang padding tak diharapkan."
 
-#: ../libnm-util/crypto_gnutls.c:220
-#: ../libnm-util/crypto_nss.c:274
+#: ../libnm-util/crypto_gnutls.c:220 ../libnm-util/crypto_nss.c:274
 #, c-format
 msgid "Failed to decrypt the private key."
 msgstr "Gagal mengawa sandi (decrypt) kunci privat."
 
-#: ../libnm-util/crypto_gnutls.c:285
-#: ../libnm-util/crypto_nss.c:352
+#: ../libnm-util/crypto_gnutls.c:285 ../libnm-util/crypto_nss.c:352
 #, c-format
 msgid "Could not allocate memory for encrypting."
 msgstr "Tak bisa mengalokasikan memori untuk menyandi."
@@ -2265,7 +2154,7 @@ msgstr "Tak bisa mengawa kode (decode) berkas PKCS#8: %s"
 #: ../libnm-util/crypto_nss.c:56
 #, c-format
 msgid "Failed to initialize the crypto engine: %d."
-msgstr "Gagal menginisialisasi mesin kripto: %d"
+msgstr "Gagal menginisialisasi mesin kripto: %d."
 
 #: ../libnm-util/crypto_nss.c:107
 #, c-format
@@ -2300,12 +2189,13 @@ msgstr "Gagal menginisialisasi konteks pengawasandian (decryption)."
 #: ../libnm-util/crypto_nss.c:233
 #, c-format
 msgid "Failed to decrypt the private key: %d."
-msgstr "Gagal mengawa sandi (decrypt) kunci privat: %d"
+msgstr "Gagal mengawa sandi (decrypt) kunci privat: %d."
 
 #: ../libnm-util/crypto_nss.c:241
 #, c-format
 msgid "Failed to decrypt the private key: decrypted data too large."
-msgstr "Gagal mengawa sandi (decrypt) kunci privat: data terawa sandi terlalu besar."
+msgstr ""
+"Gagal mengawa sandi (decrypt) kunci privat: data terawa sandi terlalu besar."
 
 #: ../libnm-util/crypto_nss.c:252
 #, c-format
@@ -2388,7 +2278,8 @@ msgstr "Tak bisa mengalokasikan memori untuk menulis IV ke berkas PEM."
 #: ../libnm-util/nm-utils.c:2174
 #, c-format
 msgid "Could not allocate memory for writing encrypted key to PEM file."
-msgstr "Tak bisa mengalokasikan memori untuk menulis kunci tersandi ke berkas PEM."
+msgstr ""
+"Tak bisa mengalokasikan memori untuk menulis kunci tersandi ke berkas PEM."
 
 #: ../libnm-util/nm-utils.c:2193
 #, c-format
@@ -2404,12 +2295,17 @@ msgid "System policy prevents enabling or disabling system networking"
 msgstr "Kebijakan sistem mencegah mengaktifkan atau mematikan jejaring sistem"
 
 #: ../policy/org.freedesktop.NetworkManager.policy.in.h:3
-msgid "Put NetworkManager to sleep or wake it up (should only be used by system power management)"
-msgstr "Tidurkan NetworkManager atau bangunkan (mestinya hanya dipakai oleh manajemen daya sistem)"
+msgid ""
+"Put NetworkManager to sleep or wake it up (should only be used by system "
+"power management)"
+msgstr ""
+"Tidurkan NetworkManager atau bangunkan (mestinya hanya dipakai oleh "
+"manajemen daya sistem)"
 
 #: ../policy/org.freedesktop.NetworkManager.policy.in.h:4
 msgid "System policy prevents putting NetworkManager to sleep or waking it up"
-msgstr "Kebijakan sistem mencegah menidurkan NetworkManager atau membangunkannya"
+msgstr ""
+"Kebijakan sistem mencegah menidurkan NetworkManager atau membangunkannya"
 
 #: ../policy/org.freedesktop.NetworkManager.policy.in.h:5
 msgid "Enable or disable WiFi devices"
@@ -2425,15 +2321,20 @@ msgstr "Aktifkan atau matikan perangkat broadband bergerak"
 
 #: ../policy/org.freedesktop.NetworkManager.policy.in.h:8
 msgid "System policy prevents enabling or disabling mobile broadband devices"
-msgstr "Kebijakan sistem mencegah mengaktifkan atau mematikan perangkat broadband bergerak"
+msgstr ""
+"Kebijakan sistem mencegah mengaktifkan atau mematikan perangkat broadband "
+"bergerak"
 
 #: ../policy/org.freedesktop.NetworkManager.policy.in.h:9
 msgid "Enable or disable WiMAX mobile broadband devices"
 msgstr "Aktifkan atau matikan perangkat broadband bergerak WiMAX"
 
 #: ../policy/org.freedesktop.NetworkManager.policy.in.h:10
-msgid "System policy prevents enabling or disabling WiMAX mobile broadband devices"
-msgstr "Kebijakan sistem mencegah mengaktifkan atau mematikan perangkat broadband bergerak WiMAX"
+msgid ""
+"System policy prevents enabling or disabling WiMAX mobile broadband devices"
+msgstr ""
+"Kebijakan sistem mencegah mengaktifkan atau mematikan perangkat broadband "
+"bergerak WiMAX"
 
 #: ../policy/org.freedesktop.NetworkManager.policy.in.h:11
 msgid "Allow control of network connections"
@@ -2445,11 +2346,12 @@ msgstr "Kebijakan sistem mencegah pengendalian sambungan jaringan"
 
 #: ../policy/org.freedesktop.NetworkManager.policy.in.h:13
 msgid "Connection sharing via a protected WiFi network"
-msgstr "Berbagi koneksi melalui jaringan WiFi terlindung."
+msgstr "Berbagi koneksi melalui jaringan WiFi terlindung"
 
 #: ../policy/org.freedesktop.NetworkManager.policy.in.h:14
 msgid "System policy prevents sharing connections via a protected WiFi network"
-msgstr "Kebijakan sistem mencegah berbagi sambungan melalui jaringan WiFi terlindung"
+msgstr ""
+"Kebijakan sistem mencegah berbagi sambungan melalui jaringan WiFi terlindung"
 
 #: ../policy/org.freedesktop.NetworkManager.policy.in.h:15
 msgid "Connection sharing via an open WiFi network"
@@ -2457,7 +2359,8 @@ msgstr "Berbagi koneksi melalui jaringan WiFi terbuka"
 
 #: ../policy/org.freedesktop.NetworkManager.policy.in.h:16
 msgid "System policy prevents sharing connections via an open WiFi network"
-msgstr "Kebijakan sistem mencegah berbagi sambungan melalui jaringan WiFi terbuka"
+msgstr ""
+"Kebijakan sistem mencegah berbagi sambungan melalui jaringan WiFi terbuka"
 
 #: ../policy/org.freedesktop.NetworkManager.policy.in.h:17
 msgid "Modify personal network connections"
@@ -2473,7 +2376,8 @@ msgstr "Ubah koneksi jaringan bagi semua pengguna"
 
 #: ../policy/org.freedesktop.NetworkManager.policy.in.h:20
 msgid "System policy prevents modification of network settings for all users"
-msgstr "Kebijakan sistem mencegah pengubahan tatanan sistem bagi semua pengguna"
+msgstr ""
+"Kebijakan sistem mencegah pengubahan tatanan sistem bagi semua pengguna"
 
 #: ../policy/org.freedesktop.NetworkManager.policy.in.h:21
 msgid "Modify persistent system hostname"
@@ -2483,106 +2387,128 @@ msgstr "Ubah nama host sistem yang persisten"
 msgid "System policy prevents modification of the persistent system hostname"
 msgstr "Kebijakan sistem mencegah pengubahan nama host yang persisten"
 
-#: ../src/main.c:156
+#: ../src/main.c:158
 #, c-format
 msgid "Failed to set signal mask: %d"
 msgstr "Gagal menata mask sinyal: %d"
 
-#: ../src/main.c:163
+#: ../src/main.c:167
 #, c-format
 msgid "Failed to create signal handling thread: %d"
 msgstr "Gagal membuat thread penanganan sinyal: %d"
 
-#: ../src/main.c:178
+#: ../src/main.c:182
 #, c-format
 msgid "Opening %s failed: %s\n"
 msgstr "Membuka %s gagal: %s\n"
 
-#: ../src/main.c:184
+#: ../src/main.c:188
 #, c-format
 msgid "Writing to %s failed: %s\n"
 msgstr "Menulis ke %s gagal: %s\n"
 
-#: ../src/main.c:189
+#: ../src/main.c:193
 #, c-format
 msgid "Closing %s failed: %s\n"
 msgstr "Menutup %s gagal: %s\n"
 
-#: ../src/main.c:232
+#: ../src/main.c:236
 #, c-format
 msgid "NetworkManager is already running (pid %ld)\n"
 msgstr "NetworkManager telah dijalankan (pid %ld)\n"
 
-#: ../src/main.c:372
+#: ../src/main.c:376
 msgid "Print NetworkManager version and exit"
 msgstr "Cetak versi NetworkManager dan keluar"
 
-#: ../src/main.c:373
+#: ../src/main.c:377
 msgid "Don't become a daemon"
 msgstr "Jangan jadi daemon"
 
-#: ../src/main.c:374
+#: ../src/main.c:378
 msgid "Make all warnings fatal"
 msgstr "Jadikan semua peringatan fatal"
 
-#: ../src/main.c:375
+#: ../src/main.c:379
 msgid "Specify the location of a PID file"
 msgstr "Nyatakan lokasi berkas PID"
 
-#: ../src/main.c:375
+#: ../src/main.c:379
 msgid "filename"
 msgstr "filename"
 
-#: ../src/main.c:376
+#: ../src/main.c:380
 msgid "State file location"
 msgstr "Lokasi berkas keadaan"
 
-#: ../src/main.c:376
+#: ../src/main.c:380
 msgid "/path/to/state.file"
 msgstr "/path/to/state.file"
 
-#: ../src/main.c:377
+#: ../src/main.c:381
 msgid "Config file location"
 msgstr "Lokasi berkas konfig"
 
-#: ../src/main.c:377
+#: ../src/main.c:381
 msgid "/path/to/config.file"
 msgstr "/path/to/config.file"
 
-#: ../src/main.c:378
+#: ../src/main.c:382
 msgid "List of plugins separated by ','"
 msgstr "Daftar plugin dipisah oleh ','"
 
-#: ../src/main.c:378
+#: ../src/main.c:382
 msgid "plugin1,plugin2"
 msgstr "plugin1,plugin2"
 
 #. Translators: Do not translate the values in the square brackets
-#: ../src/main.c:380
+#: ../src/main.c:384
 msgid "Log level: one of [ERR, WARN, INFO, DEBUG]"
 msgstr "Aras log: satu dari [ERR, WARN, INFO, DEBUG]"
 
 #. Translators: Do not translate the values in the square brackets
-#: ../src/main.c:383
+#: ../src/main.c:387
 msgid ""
 "Log domains separated by ',': any combination of\n"
-"                                          [NONE,HW,RFKILL,ETHER,WIFI,BT,MB,DHCP4,DHCP6,PPP,\n"
-"                                           WIFI_SCAN,IP4,IP6,AUTOIP4,DNS,VPN,SHARING,SUPPLICANT,\n"
-"                                           AGENTS,SETTINGS,SUSPEND,CORE,DEVICE,OLPC,WIMAX,\n"
-"                                           INFINIBAND,FIREWALL]"
+"                                                [NONE,HW,RFKILL,ETHER,WIFI,"
+"BT,MB,DHCP4,DHCP6,PPP,\n"
+"                                                 WIFI_SCAN,IP4,IP6,AUTOIP4,"
+"DNS,VPN,SHARING,SUPPLICANT,\n"
+"                                                 AGENTS,SETTINGS,SUSPEND,"
+"CORE,DEVICE,OLPC,WIMAX,\n"
+"                                                 INFINIBAND,FIREWALL,ADSL]"
 msgstr ""
 "Domain log dipisahkan dengan ',': sebarang kombinasi dari\n"
-"                                          [NONE,HW,RFKILL,ETHER,WIFI,BT,MB,DHCP4,DHCP6,PPP,\n"
-"                                           WIFI_SCAN,IP4,IP6,AUTOIP4,DNS,VPN,SHARING,SUPPLICANT,\n"
-"                                           AGENTS,SETTINGS,SUSPEND,CORE,DEVICE,OLPC,WIMAX,\n"
-"                                           INFINIBAND,FIREWALL]"
+"                                                [NONE,HW,RFKILL,ETHER,WIFI,"
+"BT,MB,DHCP4,DHCP6,PPP,\n"
+"                                                 WIFI_SCAN,IP4,IP6,AUTOIP4,"
+"DNS,VPN,SHARING,SUPPLICANT,\n"
+"                                                 AGENTS,SETTINGS,SUSPEND,"
+"CORE,DEVICE,OLPC,WIMAX,\n"
+"                                                 INFINIBAND,FIREWALL,ADSL]"
+
+#: ../src/main.c:393
+msgid "An http(s) address for checking internet connectivity"
+msgstr "Suatu alamat http(s) untuk memeriksa konektivitas internet"
 
-#: ../src/main.c:396
+#: ../src/main.c:394
+msgid "The interval between connectivity checks (in seconds)"
+msgstr "Interval antar pemeriksaan konektivitas (dalam detik)"
+
+#: ../src/main.c:395
+msgid "The expected start of the response"
+msgstr "Awal respon yang diharapkan"
+
+#: ../src/main.c:395
+msgid "Bingo!"
+msgstr "Dapat!"
+
+#: ../src/main.c:400
 #, c-format
 msgid "GModules are not supported on your platform!\n"
 msgstr "GModules tak didukung pada platform Anda!\n"
 
-#: ../src/main.c:419
+#: ../src/main.c:423
 msgid ""
 "NetworkManager monitors all network connections and automatically\n"
 "chooses the best connection to use.  It also allows the user to\n"
@@ -2594,32 +2520,33 @@ msgstr ""
 "menyatakan access point nirkabel yang mesti dipakai oleh kartu nirkabel\n"
 "dalam komputer."
 
-#: ../src/main.c:425
+#: ../src/main.c:429
 #, c-format
 msgid "Invalid option.  Please use --help to see a list of valid options.\n"
-msgstr "Opsi tak valid.  Silakan pakai --help untuk melihat daftar opsi yang valid.\n"
+msgstr ""
+"Opsi tak valid.  Silakan pakai --help untuk melihat daftar opsi yang valid.\n"
 
-#: ../src/main.c:435
+#: ../src/main.c:439
 #, c-format
 msgid "You must be root to run NetworkManager!\n"
 msgstr "Anda mesti root untuk menjalankan NetworkManager!\n"
 
-#: ../src/main.c:456
+#: ../src/main.c:460
 #, c-format
 msgid "Failed to read configuration: (%d) %s\n"
 msgstr "Gagal membaca konfigurasi: (%d) %s\n"
 
-#: ../src/main.c:467
+#: ../src/main.c:471
 #, c-format
 msgid "%s.  Please use --help to see a list of valid options.\n"
 msgstr "%s.  Silakan pakai --help untuk melihat daftar opsi yang valid.\n"
 
-#: ../src/main.c:474
+#: ../src/main.c:478
 #, c-format
 msgid "State file %s parsing failed: (%d) %s\n"
 msgstr "Penguraian berkas keadaan %s gagal: (%d) %s\n"
 
-#: ../src/main.c:491
+#: ../src/main.c:495
 #, c-format
 msgid "Could not daemonize: %s [error %u]\n"
 msgstr "Tak bisa menjadi daemon: %s [galat %u]\n"
@@ -2654,32 +2581,30 @@ msgstr "'dhcpd' dapat ditemukan."
 msgid "unsupported DHCP client '%s'"
 msgstr "Klien DHCP '%s' yang tak didukung"
 
-#: ../src/dns-manager/nm-dns-manager.c:376
+#: ../src/dns-manager/nm-dns-manager.c:381
 msgid "NOTE: the libc resolver may not support more than 3 nameservers."
 msgstr "CATATAN: resolver libc mungkin tak mendukung lebih dari 3 nameserver."
 
-#: ../src/dns-manager/nm-dns-manager.c:378
+#: ../src/dns-manager/nm-dns-manager.c:383
 msgid "The nameservers listed below may not be recognized."
 msgstr "Nameserver yang terdaftar di bawah mungkin tak dikenali."
 
-#: ../src/logging/nm-logging.c:130
+#: ../src/logging/nm-logging.c:131
 #, c-format
 msgid "Unknown log level '%s'"
 msgstr "Aras log tak dikenal '%s'"
 
-#: ../src/logging/nm-logging.c:155
+#: ../src/logging/nm-logging.c:156
 #, c-format
 msgid "Unknown log domain '%s'"
 msgstr "Ranah log tak dikenal '%s'"
 
-#: ../src/modem-manager/nm-modem-cdma.c:279
-#: ../src/nm-device-bt.c:325
+#: ../src/modem-manager/nm-modem-cdma.c:279 ../src/nm-device-bt.c:325
 #, c-format
 msgid "CDMA connection %d"
 msgstr "Sambungan CDMA %d"
 
-#: ../src/modem-manager/nm-modem-gsm.c:547
-#: ../src/nm-device-bt.c:321
+#: ../src/modem-manager/nm-modem-gsm.c:547 ../src/nm-device-bt.c:321
 #, c-format
 msgid "GSM connection %d"
 msgstr "Sambungan GSM %d"
@@ -2689,6 +2614,11 @@ msgstr "Sambungan GSM %d"
 msgid "Bond connection %d"
 msgstr "Sambungan bond %d"
 
+#: ../src/nm-device-adsl.c:193
+#, c-format
+msgid "ADSL connection %d"
+msgstr "Sambungan ADSL %d"
+
 #: ../src/nm-device-bt.c:296
 #, c-format
 msgid "PAN connection %d"
@@ -2699,13 +2629,12 @@ msgstr "Sambungan PAN %d"
 msgid "DUN connection %d"
 msgstr "Sambungan DUN %d"
 
-#: ../src/nm-device-ethernet.c:1326
+#: ../src/nm-device-ethernet.c:1327
 #, c-format
 msgid "PPPoE connection %d"
 msgstr "Sambungan PPPoE %d"
 
-#: ../src/nm-device-ethernet.c:1326
-#: ../src/settings/nm-settings-utils.c:50
+#: ../src/nm-device-ethernet.c:1327 ../src/settings/nm-settings-utils.c:50
 #, c-format
 msgid "Wired connection %d"
 msgstr "Sambungan kabel %d"
@@ -2715,7 +2644,7 @@ msgstr "Sambungan kabel %d"
 msgid "InfiniBand connection %d"
 msgstr "Sambungan InfiniBand %d"
 
-#: ../src/nm-device-olpc-mesh.c:293
+#: ../src/nm-device-olpc-mesh.c:303
 #, c-format
 msgid "Mesh %d"
 msgstr "Mesh %d"
@@ -2730,8 +2659,7 @@ msgstr "Sambungan VLAN %d"
 msgid "VPN connection %d"
 msgstr "Sambungan VPN %d"
 
-#: ../src/nm-netlink-monitor.c:148
-#: ../src/nm-netlink-monitor.c:272
+#: ../src/nm-netlink-monitor.c:148 ../src/nm-netlink-monitor.c:272
 #: ../src/nm-netlink-monitor.c:695
 #, c-format
 msgid "error processing netlink message: %s"
@@ -2751,33 +2679,60 @@ msgstr "tak bisa menyambung ke netlink untuk pemantauan status sambungan: %s"
 msgid "unable to enable netlink handle credential passing: %s"
 msgstr "tak bisa mengaktifkan penyampaian kredensial handle netlink: %s"
 
-#: ../src/nm-netlink-monitor.c:330
-#: ../src/nm-netlink-monitor.c:390
+#: ../src/nm-netlink-monitor.c:330 ../src/nm-netlink-monitor.c:390
 #, c-format
 msgid "unable to allocate netlink handle for monitoring link status: %s"
-msgstr "tak bisa mengalokasikan handle netlink untuk pemantauan status sambungan: %s"
+msgstr ""
+"tak bisa mengalokasikan handle netlink untuk pemantauan status sambungan: %s"
 
 #: ../src/nm-netlink-monitor.c:415
 #, c-format
 msgid "unable to allocate netlink link cache for monitoring link status: %s"
-msgstr "tak bisa mengalokasikan singgahan sambungan netlink untuk pemantauan status sambungan: %s"
+msgstr ""
+"tak bisa mengalokasikan singgahan sambungan netlink untuk pemantauan status "
+"sambungan: %s"
 
 #: ../src/nm-netlink-monitor.c:542
 #, c-format
 msgid "unable to join netlink group: %s"
 msgstr "tak bisa bergabung dengan grup netlink: %s"
 
-#: ../src/nm-netlink-monitor.c:671
-#: ../src/nm-netlink-monitor.c:684
+#: ../src/nm-netlink-monitor.c:671 ../src/nm-netlink-monitor.c:684
 #, c-format
 msgid "error updating link cache: %s"
 msgstr "galat memperbarui singgahan sambungan: %s"
 
-#: ../src/settings/plugins/ifcfg-rh/reader.c:93
+#: ../src/settings/plugins/ifcfg-rh/reader.c:94
 msgid "System"
 msgstr "Sistem"
 
-#: ../src/settings/plugins/ifcfg-rh/reader.c:3634
+#: ../src/settings/plugins/ifcfg-rh/reader.c:3641
 msgid "Bond"
 msgstr "Bond"
 
+#: ../test/nm-online.c:112
+#, c-format
+msgid "\rConnecting"
+msgstr "\rMenyambung"
+
+#: ../test/nm-online.c:143
+msgid "Time to wait for a connection, in seconds (default is 30)"
+msgstr "Lama waktu tunggu koneksi, dalam detik (nilai baku adalah 30)"
+
+#: ../test/nm-online.c:144
+msgid "Exit immediately if NetworkManager is not running or connecting"
+msgstr "Keluar seketika bila NetworkManager tidak sedang berjalan atau menyambung"
+
+#: ../test/nm-online.c:145
+msgid "Don't print anything"
+msgstr "Jangan cetak apapun"
+
+#: ../test/nm-online.c:163
+msgid "Waits for a successful connection in NetworkManager."
+msgstr "Menunggu koneksi yang sukses dalam NetworkManager."
+
+#: ../test/nm-online.c:169 ../test/nm-online.c:178
+msgid "Invalid option.  Please use --help to see a list of valid options."
+msgstr ""
+"Opsi tak valid.  Silakan pakai --help untuk melihat daftar opsi yang valid."
+
diff --git a/po/it.po b/po/it.po
index 0d1041b1..dd855f14 100644
--- a/po/it.po
+++ b/po/it.po
@@ -3,104 +3,488 @@
 # This file is distributed under the same license as the NetworkManager package.
 # Francesco Marletta , 2004, 2005, 2006, 2007, 2008, 2009, 2010.
 # Vincenzo Reale , 2011.
-# Milo Casagrande , 2011.
+# Milo Casagrande , 2011, 2012.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: network-manager\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-10-23 19:22+0200\n"
-"PO-Revision-Date: 2011-10-23 19:09+0200\n"
+"POT-Creation-Date: 2012-09-02 11:55+0200\n"
+"PO-Revision-Date: 2012-09-02 12:11+0200\n"
 "Last-Translator: Milo Casagrande \n"
 "Language-Team: Italian \n"
 "Language: Italian\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"
+"Plural-Forms: nplurals=2; plural=(n!=1);\n"
 "X-Launchpad-Export-Date: 2011-10-23 16:25+0000\n"
 "X-Generator: Launchpad (build 14170)\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
+#: ../cli/src/common.c:32 ../cli/src/common.c:44 ../cli/src/common.c:52
+#: ../cli/src/common.c:63 ../cli/src/connections.c:128
+#: ../cli/src/connections.c:162
+msgid "GROUP"
+msgstr "GRUPPO"
+
+#. 0
+#: ../cli/src/common.c:33 ../cli/src/common.c:53
+msgid "ADDRESS"
+msgstr "INDIRIZZO"
+
+#. 1
+#: ../cli/src/common.c:34 ../cli/src/common.c:54
+msgid "ROUTE"
+msgstr "INSTRADAMENTO"
+
+#. 2
+#: ../cli/src/common.c:35 ../cli/src/common.c:55
+msgid "DNS"
+msgstr "DNS"
+
+#. 3
+#: ../cli/src/common.c:36 ../cli/src/common.c:56
+msgid "DOMAIN"
+msgstr "DOMINIO"
+
+#. 4
+#: ../cli/src/common.c:37
+msgid "WINS"
+msgstr "WINS"
+
+#. 0
+#: ../cli/src/common.c:45 ../cli/src/common.c:64
+msgid "OPTION"
+msgstr "OPZIONE"
+
+#: ../cli/src/common.c:366
+msgid "unmanaged"
+msgstr "non gestito"
+
+#: ../cli/src/common.c:368
+msgid "unavailable"
+msgstr "non disponibile"
+
+#: ../cli/src/common.c:370 ../cli/src/network-manager.c:120
+msgid "disconnected"
+msgstr "scollegato"
+
+#: ../cli/src/common.c:372
+msgid "connecting (prepare)"
+msgstr "connessione in corso (preparazione)"
+
+#: ../cli/src/common.c:374
+msgid "connecting (configuring)"
+msgstr "connessione in corso (configurazione)"
+
+#: ../cli/src/common.c:376
+msgid "connecting (need authentication)"
+msgstr "connessione in corso (autenticazione necessaria)"
+
+#: ../cli/src/common.c:378
+msgid "connecting (getting IP configuration)"
+msgstr "connessione in corso (acquisizione configurazione IP)"
+
+#: ../cli/src/common.c:380
+msgid "connecting (checking IP connectivity)"
+msgstr "connessione in corso (verifica connettività IP)"
+
+#: ../cli/src/common.c:382
+msgid "connecting (starting secondary connections)"
+msgstr "connessione in corso (avvio connessioni secondarie)"
+
+#: ../cli/src/common.c:384 ../cli/src/network-manager.c:116
+msgid "connected"
+msgstr "collegato"
+
+#: ../cli/src/common.c:386 ../cli/src/connections.c:633
+msgid "deactivating"
+msgstr "disattivazione"
+
+#: ../cli/src/common.c:388
+msgid "connection failed"
+msgstr "connessione non riuscita"
+
+#: ../cli/src/common.c:390 ../cli/src/connections.c:636
+#: ../cli/src/connections.c:659 ../cli/src/connections.c:1351
+#: ../cli/src/devices.c:622 ../cli/src/network-manager.c:123
+#: ../cli/src/network-manager.c:185 ../cli/src/network-manager.c:188
+#: ../cli/src/network-manager.c:197 ../cli/src/network-manager.c:257
+#: ../cli/src/network-manager.c:273 ../cli/src/network-manager.c:431
+#: ../cli/src/network-manager.c:486 ../cli/src/network-manager.c:524
+#: ../cli/src/network-manager.c:563 ../cli/src/settings.c:585
+#: ../cli/src/settings.c:613 ../cli/src/utils.c:531 ../src/main.c:462
+#: ../src/main.c:481
+msgid "unknown"
+msgstr "sconosciuto"
+
+#: ../cli/src/common.c:399
+msgid "No reason given"
+msgstr "Nessun motivo specificato"
+
+#: ../cli/src/common.c:402
+msgid "Unknown error"
+msgstr "Errore sconosciuto"
+
+#: ../cli/src/common.c:405
+msgid "Device is now managed"
+msgstr "Il dispositivo è ora gestito"
+
+#: ../cli/src/common.c:408
+msgid "Device is now unmanaged"
+msgstr "Il dispositivo non è più gestito"
+
+#: ../cli/src/common.c:411
+msgid "The device could not be readied for configuration"
+msgstr "Impossibile preparare il dispositivo per la configurazione"
+
+#: ../cli/src/common.c:414
+msgid ""
+"IP configuration could not be reserved (no available address, timeout, etc)"
+msgstr ""
+"La configurazione IP non può essere riservata (nessun indirizzo disponibile, "
+"timeout...)"
+
+#: ../cli/src/common.c:417
+msgid "The IP configuration is no longer valid"
+msgstr "La configurazione IP non è più valida"
+
+#: ../cli/src/common.c:420
+msgid "Secrets were required, but not provided"
+msgstr "Erano richiesti dei segreti, ma non ne sono stati forniti"
+
+#: ../cli/src/common.c:423
+msgid "802.1X supplicant disconnected"
+msgstr "Supplicant 802.1X scollegato"
+
+#: ../cli/src/common.c:426
+msgid "802.1X supplicant configuration failed"
+msgstr "Configurazione supplicant 802.1X non riuscita"
+
+#: ../cli/src/common.c:429
+msgid "802.1X supplicant failed"
+msgstr "Supplicant 802.1X non riuscito"
+
+#: ../cli/src/common.c:432
+msgid "802.1X supplicant took too long to authenticate"
+msgstr "L'autenticazione del supplicant 802.1X ha impiegato troppo tempo"
+
+#: ../cli/src/common.c:435
+msgid "PPP service failed to start"
+msgstr "Avvio del servizio PPP non riuscito"
+
+#: ../cli/src/common.c:438
+msgid "PPP service disconnected"
+msgstr "Servizio PPP non connesso"
+
+#: ../cli/src/common.c:441
+msgid "PPP failed"
+msgstr "Errore PPP"
+
+#: ../cli/src/common.c:444
+msgid "DHCP client failed to start"
+msgstr "Avvio del client DHCP non riuscito"
+
+#: ../cli/src/common.c:447
+msgid "DHCP client error"
+msgstr "Errore client DHCP"
+
+#: ../cli/src/common.c:450
+msgid "DHCP client failed"
+msgstr "Client DHCP non riuscito"
+
+#: ../cli/src/common.c:453
+msgid "Shared connection service failed to start"
+msgstr "Avvio del servizio di connessione condivisa non riuscito"
+
+#: ../cli/src/common.c:456
+msgid "Shared connection service failed"
+msgstr "Servizio connessione condivisa non riuscito"
+
+#: ../cli/src/common.c:459
+msgid "AutoIP service failed to start"
+msgstr "Avvio del servizio AutoIP non riuscito"
+
+#: ../cli/src/common.c:462
+msgid "AutoIP service error"
+msgstr "Errore servizio AutoIP"
+
+#: ../cli/src/common.c:465
+msgid "AutoIP service failed"
+msgstr "Servizio AutoIP non riuscito"
+
+#: ../cli/src/common.c:468
+msgid "The line is busy"
+msgstr "La linea è occupata"
+
+#: ../cli/src/common.c:471
+msgid "No dial tone"
+msgstr "Nessun segnale di chiamata"
+
+#: ../cli/src/common.c:474
+msgid "No carrier could be established"
+msgstr "Impossibile stabilire alcuna portante"
+
+#: ../cli/src/common.c:477
+msgid "The dialing request timed out"
+msgstr "La richiesta di selezione è scaduta"
+
+#: ../cli/src/common.c:480
+msgid "The dialing attempt failed"
+msgstr "Il tentativo di selezione non è riuscito"
+
+#: ../cli/src/common.c:483
+msgid "Modem initialization failed"
+msgstr "Inizializzazione modem non riuscita"
+
+#: ../cli/src/common.c:486
+msgid "Failed to select the specified APN"
+msgstr "Selezione dell'APN specificato non riuscita"
+
+#: ../cli/src/common.c:489
+msgid "Not searching for networks"
+msgstr "Nessuna ricerca attiva di reti"
+
+#: ../cli/src/common.c:492
+msgid "Network registration denied"
+msgstr "Registrazione di rete non consentita"
+
+#: ../cli/src/common.c:495
+msgid "Network registration timed out"
+msgstr "Registrazione di rete scaduta"
+
+#: ../cli/src/common.c:498
+msgid "Failed to register with the requested network"
+msgstr "Registrazione con la rete richiesta non riuscita"
+
+#: ../cli/src/common.c:501
+msgid "PIN check failed"
+msgstr "Verifica PIN non riuscita"
+
+#: ../cli/src/common.c:504
+msgid "Necessary firmware for the device may be missing"
+msgstr "Il firmware per il dispositivo potrebbe mancare"
+
+#: ../cli/src/common.c:507
+msgid "The device was removed"
+msgstr "Il dispositivo è stato rimosso"
+
+#: ../cli/src/common.c:510
+msgid "NetworkManager went to sleep"
+msgstr "NetworkManager è entrato in pausa"
+
+#: ../cli/src/common.c:513
+msgid "The device's active connection disappeared"
+msgstr "La connessione attiva del dispositivo è scomparsa"
+
+#: ../cli/src/common.c:516
+msgid "Device disconnected by user or client"
+msgstr "Dispositivo scollegato dall'utente o dal client"
+
+#: ../cli/src/common.c:519
+msgid "Carrier/link changed"
+msgstr "Modifica di portante/collegamento"
+
+#: ../cli/src/common.c:522
+msgid "The device's existing connection was assumed"
+msgstr "Considerata la connessione attiva del dispositivo"
+
+#: ../cli/src/common.c:525
+msgid "The supplicant is now available"
+msgstr "Il supplicant è ora disponibile"
+
+#: ../cli/src/common.c:528
+msgid "The modem could not be found"
+msgstr "Impossibile trovare il modem"
+
+#: ../cli/src/common.c:531
+msgid "The Bluetooth connection failed or timed out"
+msgstr "Il collegamento Bluetooth non è riuscito o è scaduto"
+
+#: ../cli/src/common.c:534
+msgid "GSM Modem's SIM card not inserted"
+msgstr "La scheda SIM non è inserita nel model GSM"
+
+#: ../cli/src/common.c:537
+msgid "GSM Modem's SIM PIN required"
+msgstr "Richiesto il PIN del modem GSM"
+
+#: ../cli/src/common.c:540
+msgid "GSM Modem's SIM PUK required"
+msgstr "Richiesto il PUK del modem GSM"
+
+#: ../cli/src/common.c:543
+msgid "GSM Modem's SIM wrong"
+msgstr "SIM del modem GSM errata"
+
+#: ../cli/src/common.c:546
+msgid "InfiniBand device does not support connected mode"
+msgstr "Il dispositivo InfiniBand non supporta la modalità collegata"
+
+#: ../cli/src/common.c:549
+msgid "A dependency of the connection failed"
+msgstr "Una dipendenza della connessione ha causato un errore"
+
+#: ../cli/src/common.c:552
+msgid "A problem with the RFC 2684 Ethernet over ADSL bridge"
+msgstr "Un problema col bridge RFC 2684 Ethernet su ADSL"
+
+#: ../cli/src/common.c:555
+msgid "ModemManager is unavailable"
+msgstr "ModemManager non è disponibile"
+
+#: ../cli/src/common.c:558 ../cli/src/devices.c:274 ../cli/src/devices.c:290
+#: ../cli/src/devices.c:410 ../cli/src/devices.c:454
+msgid "Unknown"
+msgstr "Sconosciuto"
+
+#. 0
+#. used only for 'GENERAL' group listing
+#: ../cli/src/connections.c:59 ../cli/src/connections.c:129
+#: ../cli/src/devices.c:105 ../cli/src/devices.c:129 ../cli/src/devices.c:139
+#: ../cli/src/devices.c:149 ../cli/src/devices.c:163 ../cli/src/devices.c:177
+#: ../cli/src/devices.c:199
 msgid "NAME"
 msgstr "NOME"
 
 #. 0
-#: ../cli/src/connections.c:65 ../cli/src/connections.c:79
+#. 1
+#: ../cli/src/connections.c:60 ../cli/src/connections.c:130
 msgid "UUID"
 msgstr "UUID"
 
 #. 1
-#: ../cli/src/connections.c:66
-msgid "DEVICES"
-msgstr "DISPOSITIVI"
+#. 0
+#. 1
+#. 2
+#: ../cli/src/connections.c:61 ../cli/src/connections.c:163
+#: ../cli/src/devices.c:71 ../cli/src/devices.c:107 ../cli/src/devices.c:202
+msgid "TYPE"
+msgstr "TIPO"
 
 #. 2
-#: ../cli/src/connections.c:67
-msgid "DEFAULT"
-msgstr "PREDEFINITO"
+#: ../cli/src/connections.c:62
+msgid "TIMESTAMP"
+msgstr "TIMESTAMP"
 
 #. 3
-#: ../cli/src/connections.c:68
-msgid "SPEC-OBJECT"
-msgstr "SPEC-OGGETTO"
+#: ../cli/src/connections.c:63
+msgid "TIMESTAMP-REAL"
+msgstr "TIMESTAMP-REALE"
 
 #. 4
-#: ../cli/src/connections.c:69
-msgid "VPN"
-msgstr "VPN"
+#. 13
+#: ../cli/src/connections.c:64 ../cli/src/devices.c:119
+msgid "AUTOCONNECT"
+msgstr "CONN-AUTOMATICA"
 
 #. 5
+#: ../cli/src/connections.c:65
+msgid "READONLY"
+msgstr "SOLO LETTURA"
+
 #. 6
+#. 8
 #. 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
+#: ../cli/src/connections.c:66 ../cli/src/connections.c:137
+#: ../cli/src/devices.c:73 ../cli/src/devices.c:189 ../cli/src/devices.c:205
 msgid "DBUS-PATH"
 msgstr "PERCORSO-DBUS"
 
+#. 2
+#: ../cli/src/connections.c:131
+msgid "DEVICES"
+msgstr "DISPOSITIVI"
+
+#. 3
 #. 1
+#. 8
+#. 1
+#: ../cli/src/connections.c:132 ../cli/src/devices.c:72
+#: ../cli/src/devices.c:114 ../cli/src/network-manager.c:39
+msgid "STATE"
+msgstr "STATO"
+
+#. 4
+#: ../cli/src/connections.c:133
+msgid "DEFAULT"
+msgstr "PREDEFINITO"
+
+#. 5
+#: ../cli/src/connections.c:134
+msgid "DEFAULT6"
+msgstr "PREDEFINITO6"
+
+#. 6
+#: ../cli/src/connections.c:135
+msgid "SPEC-OBJECT"
+msgstr "SPEC-OGGETTO"
+
+#. 7
+#. 1
+#: ../cli/src/connections.c:136 ../cli/src/connections.c:150
+msgid "VPN"
+msgstr "VPN"
+
+#. 9
+#: ../cli/src/connections.c:138
+msgid "CON-PATH"
+msgstr "PERCORSO-CON"
+
+#. 10
+#: ../cli/src/connections.c:139
+msgid "ZONE"
+msgstr "ZONA"
+
+#. 11
+#: ../cli/src/connections.c:140
+msgid "MASTER-PATH"
+msgstr "PERCORSO-MASTER"
+
+#: ../cli/src/connections.c:148 ../cli/src/devices.c:82
+msgid "GENERAL"
+msgstr "GENERALE"
+
 #. 0
+#: ../cli/src/connections.c:149
+msgid "IP"
+msgstr "IP"
+
 #. 1
-#. 2
-#: ../cli/src/connections.c:80 ../cli/src/devices.c:67
-#: ../cli/src/devices.c:103 ../cli/src/devices.c:227
-msgid "TYPE"
-msgstr "TIPO"
+#: ../cli/src/connections.c:164
+msgid "USERNAME"
+msgstr "NOMEUTENTE"
 
 #. 2
-#: ../cli/src/connections.c:81
-msgid "TIMESTAMP"
-msgstr "TIMESTAMP"
+#: ../cli/src/connections.c:165
+msgid "GATEWAY"
+msgstr "GATEWAY"
 
 #. 3
-#: ../cli/src/connections.c:82
-msgid "TIMESTAMP-REAL"
-msgstr "TIMESTAMP-REALE"
+#: ../cli/src/connections.c:166
+msgid "BANNER"
+msgstr "BANNER"
 
 #. 4
-#: ../cli/src/connections.c:83
-msgid "AUTOCONNECT"
-msgstr "AUTOCONNESSIONE"
+#: ../cli/src/connections.c:167
+msgid "VPN-STATE"
+msgstr "STATO-VPN"
 
 #. 5
-#: ../cli/src/connections.c:84
-msgid "READONLY"
-msgstr "SOLO LETTURA"
+#: ../cli/src/connections.c:168
+msgid "CFG"
+msgstr "CFG"
 
-#: ../cli/src/connections.c:153
+#: ../cli/src/connections.c:190
 #, c-format
 msgid ""
 "Usage: nmcli con { COMMAND | help }\n"
 "  COMMAND := { list | status | up | down | delete }\n"
 "\n"
 "  list [id  | uuid ]\n"
-"  status\n"
+"  status [id  | uuid  | path ]\n"
 "  up id  | uuid  [iface ] [ap ] [nsp ] [--"
 "nowait] [--timeout ]\n"
 "  up id  | uuid  [iface ] [ap ] [--nowait] [--timeout "
@@ -112,7 +496,7 @@ msgstr ""
 "  COMANDO := { list | status | up | down | delete }\n"
 "\n"
 "  list [id  | uuid ]\n"
-"  status\n"
+"  status [id  | uuid  | path ]\n"
 "  up id  | uuid  [iface ] [ap ] [nsp ] [--"
 "nowait] [--timeout ]\n"
 "  up id  | uuid  [iface ] [ap ] [--nowait] [--timeout "
@@ -120,354 +504,358 @@ msgstr ""
 "  down id  | uuid \n"
 "  delete id  | uuid \n"
 
-#: ../cli/src/connections.c:208 ../cli/src/connections.c:532
+#: ../cli/src/connections.c:249 ../cli/src/connections.c:609
 #, c-format
 msgid "Error: 'con list': %s"
-msgstr "Errore: \"con list\": %s"
+msgstr "Errore: «con list»: %s"
 
-#: ../cli/src/connections.c:210 ../cli/src/connections.c:534
+#: ../cli/src/connections.c:251 ../cli/src/connections.c:611
 #, c-format
 msgid "Error: 'con list': %s; allowed fields: %s"
-msgstr "Errore: \"con list\": %s; campi consentiti: %s"
+msgstr "Errore: «con list»: %s; campi consentiti: %s"
 
-#: ../cli/src/connections.c:218
+#: ../cli/src/connections.c:259
 msgid "Connection details"
-msgstr "Informazioni sulla connessione"
+msgstr "Dettagli connessione"
 
-#: ../cli/src/connections.c:407
+#: ../cli/src/connections.c:484
 msgid "never"
 msgstr "mai"
 
 #. "CAPABILITIES"
 #. Print header
 #. "WIFI-PROPERTIES"
-#: ../cli/src/connections.c:408 ../cli/src/connections.c:409
-#: ../cli/src/connections.c:587 ../cli/src/connections.c:589
-#: ../cli/src/devices.c:499 ../cli/src/devices.c:552 ../cli/src/devices.c:677
-#: ../cli/src/devices.c:703 ../cli/src/devices.c:704 ../cli/src/devices.c:705
-#: ../cli/src/devices.c:706 ../cli/src/devices.c:707 ../cli/src/settings.c:560
-#: ../cli/src/settings.c:632 ../cli/src/settings.c:753
-#: ../cli/src/settings.c:1041 ../cli/src/settings.c:1042
-#: ../cli/src/settings.c:1044 ../cli/src/settings.c:1046
-#: ../cli/src/settings.c:1047 ../cli/src/settings.c:1177
-#: ../cli/src/settings.c:1178 ../cli/src/settings.c:1179
-#: ../cli/src/settings.c:1180 ../cli/src/settings.c:1259
-#: ../cli/src/settings.c:1260 ../cli/src/settings.c:1261
-#: ../cli/src/settings.c:1262 ../cli/src/settings.c:1263
-#: ../cli/src/settings.c:1264 ../cli/src/settings.c:1265
-#: ../cli/src/settings.c:1266 ../cli/src/settings.c:1267
-#: ../cli/src/settings.c:1268 ../cli/src/settings.c:1269
-#: ../cli/src/settings.c:1270 ../cli/src/settings.c:1271
-#: ../cli/src/settings.c:1346
+#: ../cli/src/connections.c:485 ../cli/src/connections.c:486
+#: ../cli/src/connections.c:714 ../cli/src/connections.c:715
+#: ../cli/src/connections.c:717 ../cli/src/devices.c:418
+#: ../cli/src/devices.c:471 ../cli/src/devices.c:587 ../cli/src/devices.c:588
+#: ../cli/src/devices.c:589 ../cli/src/devices.c:621 ../cli/src/devices.c:647
+#: ../cli/src/devices.c:648 ../cli/src/devices.c:649 ../cli/src/devices.c:650
+#: ../cli/src/devices.c:651 ../cli/src/network-manager.c:267
+#: ../cli/src/settings.c:694 ../cli/src/settings.c:764
+#: ../cli/src/settings.c:884 ../cli/src/settings.c:1166
+#: ../cli/src/settings.c:1167 ../cli/src/settings.c:1169
+#: ../cli/src/settings.c:1171 ../cli/src/settings.c:1172
+#: ../cli/src/settings.c:1303 ../cli/src/settings.c:1304
+#: ../cli/src/settings.c:1305 ../cli/src/settings.c:1306
+#: ../cli/src/settings.c:1383 ../cli/src/settings.c:1384
+#: ../cli/src/settings.c:1385 ../cli/src/settings.c:1386
+#: ../cli/src/settings.c:1387 ../cli/src/settings.c:1388
+#: ../cli/src/settings.c:1389 ../cli/src/settings.c:1390
+#: ../cli/src/settings.c:1391 ../cli/src/settings.c:1392
+#: ../cli/src/settings.c:1393 ../cli/src/settings.c:1394
+#: ../cli/src/settings.c:1395 ../cli/src/settings.c:1466
 msgid "yes"
-msgstr "si"
-
-#: ../cli/src/connections.c:408 ../cli/src/connections.c:409
-#: ../cli/src/connections.c:587 ../cli/src/connections.c:589
-#: ../cli/src/devices.c:499 ../cli/src/devices.c:552 ../cli/src/devices.c:677
-#: ../cli/src/devices.c:703 ../cli/src/devices.c:704 ../cli/src/devices.c:705
-#: ../cli/src/devices.c:706 ../cli/src/devices.c:707 ../cli/src/settings.c:560
-#: ../cli/src/settings.c:562 ../cli/src/settings.c:632
-#: ../cli/src/settings.c:753 ../cli/src/settings.c:1041
-#: ../cli/src/settings.c:1042 ../cli/src/settings.c:1044
-#: ../cli/src/settings.c:1046 ../cli/src/settings.c:1047
-#: ../cli/src/settings.c:1177 ../cli/src/settings.c:1178
-#: ../cli/src/settings.c:1179 ../cli/src/settings.c:1180
-#: ../cli/src/settings.c:1259 ../cli/src/settings.c:1260
-#: ../cli/src/settings.c:1261 ../cli/src/settings.c:1262
-#: ../cli/src/settings.c:1263 ../cli/src/settings.c:1264
-#: ../cli/src/settings.c:1265 ../cli/src/settings.c:1266
-#: ../cli/src/settings.c:1267 ../cli/src/settings.c:1268
-#: ../cli/src/settings.c:1269 ../cli/src/settings.c:1270
-#: ../cli/src/settings.c:1271 ../cli/src/settings.c:1346
+msgstr "sì"
+
+#: ../cli/src/connections.c:485 ../cli/src/connections.c:486
+#: ../cli/src/connections.c:714 ../cli/src/connections.c:715
+#: ../cli/src/connections.c:717 ../cli/src/devices.c:418
+#: ../cli/src/devices.c:471 ../cli/src/devices.c:587 ../cli/src/devices.c:588
+#: ../cli/src/devices.c:589 ../cli/src/devices.c:621 ../cli/src/devices.c:647
+#: ../cli/src/devices.c:648 ../cli/src/devices.c:649 ../cli/src/devices.c:650
+#: ../cli/src/devices.c:651 ../cli/src/network-manager.c:269
+#: ../cli/src/settings.c:694 ../cli/src/settings.c:696
+#: ../cli/src/settings.c:764 ../cli/src/settings.c:884
+#: ../cli/src/settings.c:1166 ../cli/src/settings.c:1167
+#: ../cli/src/settings.c:1169 ../cli/src/settings.c:1171
+#: ../cli/src/settings.c:1172 ../cli/src/settings.c:1303
+#: ../cli/src/settings.c:1304 ../cli/src/settings.c:1305
+#: ../cli/src/settings.c:1306 ../cli/src/settings.c:1383
+#: ../cli/src/settings.c:1384 ../cli/src/settings.c:1385
+#: ../cli/src/settings.c:1386 ../cli/src/settings.c:1387
+#: ../cli/src/settings.c:1388 ../cli/src/settings.c:1389
+#: ../cli/src/settings.c:1390 ../cli/src/settings.c:1391
+#: ../cli/src/settings.c:1392 ../cli/src/settings.c:1393
+#: ../cli/src/settings.c:1394 ../cli/src/settings.c:1395
+#: ../cli/src/settings.c:1466
 msgid "no"
 msgstr "no"
 
-#: ../cli/src/connections.c:483
+#: ../cli/src/connections.c:560
 msgid "Connection list"
-msgstr "Elenco connessione"
-
-#: ../cli/src/connections.c:496 ../cli/src/connections.c:1356
-#: ../cli/src/connections.c:1371 ../cli/src/connections.c:1380
-#: ../cli/src/connections.c:1390 ../cli/src/connections.c:1402
-#: ../cli/src/connections.c:1497 ../cli/src/connections.c:1580
-#: ../cli/src/devices.c:1180 ../cli/src/devices.c:1190
-#: ../cli/src/devices.c:1304 ../cli/src/devices.c:1312
-#: ../cli/src/devices.c:1525 ../cli/src/devices.c:1532
+msgstr "Elenco connessioni"
+
+#: ../cli/src/connections.c:573 ../cli/src/connections.c:1110
+#: ../cli/src/connections.c:1648 ../cli/src/connections.c:1663
+#: ../cli/src/connections.c:1672 ../cli/src/connections.c:1682
+#: ../cli/src/connections.c:1694 ../cli/src/connections.c:1802
+#: ../cli/src/connections.c:1904 ../cli/src/devices.c:1041
+#: ../cli/src/devices.c:1051 ../cli/src/devices.c:1169
+#: ../cli/src/devices.c:1177 ../cli/src/devices.c:1541
+#: ../cli/src/devices.c:1548 ../cli/src/devices.c:1562
+#: ../cli/src/devices.c:1569 ../cli/src/devices.c:1586
+#: ../cli/src/devices.c:1597 ../cli/src/devices.c:1818
+#: ../cli/src/devices.c:1825
 #, c-format
 msgid "Error: %s argument is missing."
 msgstr "Errore: manca l'argomento %s."
 
-#: ../cli/src/connections.c:509
+#: ../cli/src/connections.c:586
 #, c-format
 msgid "Error: %s - no such connection."
 msgstr "Errore: %s - la connessione non esiste."
 
-#: ../cli/src/connections.c:515 ../cli/src/connections.c:1415
-#: ../cli/src/connections.c:1514 ../cli/src/connections.c:1587
-#: ../cli/src/devices.c:977 ../cli/src/devices.c:1057
-#: ../cli/src/devices.c:1204 ../cli/src/devices.c:1318
-#: ../cli/src/devices.c:1538
+#: ../cli/src/connections.c:592 ../cli/src/connections.c:1707
+#: ../cli/src/connections.c:1819 ../cli/src/connections.c:1911
+#: ../cli/src/devices.c:825 ../cli/src/devices.c:905 ../cli/src/devices.c:1065
+#: ../cli/src/devices.c:1183 ../cli/src/devices.c:1610
+#: ../cli/src/devices.c:1831
 #, c-format
 msgid "Unknown parameter: %s\n"
 msgstr "Parametro sconosciuto: %s\n"
 
-#: ../cli/src/connections.c:524
+#: ../cli/src/connections.c:601
 #, c-format
 msgid "Error: no valid parameter specified."
 msgstr "Errore: non è stato specificato alcun parametro valido."
 
-#: ../cli/src/connections.c:539 ../cli/src/connections.c:1668
-#: ../cli/src/devices.c:1746 ../cli/src/network-manager.c:456
+#: ../cli/src/connections.c:616 ../cli/src/connections.c:2004
+#: ../cli/src/devices.c:2039 ../cli/src/network-manager.c:596
 #, c-format
 msgid "Error: %s."
 msgstr "Errore: %s."
 
-#: ../cli/src/connections.c:627
+#: ../cli/src/connections.c:629
+msgid "activating"
+msgstr "attivazione"
+
+#: ../cli/src/connections.c:631
+msgid "activated"
+msgstr "attivato"
+
+#: ../cli/src/connections.c:645
+msgid "VPN connecting (prepare)"
+msgstr "Connessione VPN (preparazione)"
+
+#: ../cli/src/connections.c:647
+msgid "VPN connecting (need authentication)"
+msgstr "Connessione VPN (autenticazione necessaria)"
+
+#: ../cli/src/connections.c:649
+msgid "VPN connecting"
+msgstr "Connessione VPN"
+
+#: ../cli/src/connections.c:651
+msgid "VPN connecting (getting IP configuration)"
+msgstr "Connessione VPN (acquisizione configurazione IP)"
+
+#: ../cli/src/connections.c:653
+msgid "VPN connected"
+msgstr "Connessi alla VPN"
+
+#: ../cli/src/connections.c:655
+msgid "VPN connection failed"
+msgstr "Connessione VPN non riuscita"
+
+#: ../cli/src/connections.c:657
+msgid "VPN disconnected"
+msgstr "Disconnessi dalla VPN"
+
+#: ../cli/src/connections.c:710 ../cli/src/connections.c:720
+msgid "N/A"
+msgstr "N/D"
+
+#: ../cli/src/connections.c:914 ../cli/src/connections.c:1138
 #, c-format
 msgid "Error: 'con status': %s"
-msgstr "Errore: \"con status\": %s"
+msgstr "Errore: «con status»: %s"
 
-#: ../cli/src/connections.c:629
+#: ../cli/src/connections.c:916 ../cli/src/connections.c:1140
 #, c-format
 msgid "Error: 'con status': %s; allowed fields: %s"
-msgstr "Errore: \"con status\": %s; campi consentiti: %s"
+msgstr "Errore: «con status»: %s; campi consentiti: %s"
 
-#: ../cli/src/connections.c:637 ../cli/src/connections.c:1430
-#: ../cli/src/connections.c:1529 ../cli/src/connections.c:1601
-#: ../cli/src/devices.c:1004 ../cli/src/devices.c:1066
-#: ../cli/src/devices.c:1219 ../cli/src/devices.c:1348
-#: ../cli/src/devices.c:1567
+# [NdT] si tratta di un messaggio che descrive un'azione
+#: ../cli/src/connections.c:924
+msgid "Active connection details"
+msgstr "Dettagli connessione attiva"
+
+#: ../cli/src/connections.c:1060 ../cli/src/connections.c:1722
+#: ../cli/src/connections.c:1834 ../cli/src/connections.c:1925
+#: ../cli/src/devices.c:852 ../cli/src/devices.c:914 ../cli/src/devices.c:1080
+#: ../cli/src/devices.c:1213 ../cli/src/devices.c:1632
+#: ../cli/src/devices.c:1860 ../cli/src/network-manager.c:311
 #, c-format
 msgid "Error: Can't find out if NetworkManager is running: %s."
 msgstr "Errore: impossibile determinare se NetworkManager è in esecuzione: %s."
 
-#: ../cli/src/connections.c:641 ../cli/src/connections.c:1434
-#: ../cli/src/connections.c:1533 ../cli/src/connections.c:1605
-#: ../cli/src/devices.c:1008 ../cli/src/devices.c:1070
-#: ../cli/src/devices.c:1223 ../cli/src/devices.c:1352
-#: ../cli/src/devices.c:1571
+#: ../cli/src/connections.c:1064 ../cli/src/connections.c:1726
+#: ../cli/src/connections.c:1838 ../cli/src/connections.c:1929
+#: ../cli/src/devices.c:856 ../cli/src/devices.c:918 ../cli/src/devices.c:1084
+#: ../cli/src/devices.c:1217 ../cli/src/devices.c:1636
+#: ../cli/src/devices.c:1864 ../cli/src/network-manager.c:315
 #, c-format
 msgid "Error: NetworkManager is not running."
 msgstr "Errore: NetworkManager non è in esecuzione."
 
 # [NdT] si tratta di un messaggio che descrive un'azione
-#: ../cli/src/connections.c:649
+#: ../cli/src/connections.c:1096
 msgid "Active connections"
 msgstr "Connessioni attive"
 
-#: ../cli/src/connections.c:1073
+#: ../cli/src/connections.c:1121
 #, c-format
-msgid "no active connection on device '%s'"
-msgstr "nessuna connessione attiva sul dispositivo \"%s\""
+msgid "Error: '%s' is not an active connection."
+msgstr "Errore: «%s» non è una connessione attiva."
+
+#: ../cli/src/connections.c:1126
+#, c-format
+msgid "Error: unknown parameter: %s"
+msgstr "Errore: parametro sconosciuto: %s"
 
-#: ../cli/src/connections.c:1081
+#: ../cli/src/connections.c:1233
 #, c-format
+msgid "no active connection on device '%s'"
+msgstr "nessuna connessione attiva sul dispositivo «%s»"
+
+#: ../cli/src/connections.c:1241
 msgid "no active connection or device"
-msgstr "nessuna connessione attiva o dispositivo"
+msgstr "nessuna connessione o dispositivo attivo"
 
-#: ../cli/src/connections.c:1152
+#: ../cli/src/connections.c:1312
 #, c-format
 msgid "device '%s' not compatible with connection '%s'"
-msgstr "dispositivo '%s' non compatibile con la connessione \"%s\""
+msgstr "dispositivo «%s» non compatibile con la connessione «%s»"
 
-#: ../cli/src/connections.c:1154
+#: ../cli/src/connections.c:1315
 #, c-format
 msgid "no device found for connection '%s'"
-msgstr "nessun dispositivo trovato per la connessione \"%s\""
+msgstr "nessun dispositivo trovato per la connessione «%s»"
 
-#: ../cli/src/connections.c:1165
-msgid "activating"
-msgstr "attivazione"
-
-#: ../cli/src/connections.c:1167
-msgid "activated"
-msgstr "attivato"
-
-#: ../cli/src/connections.c:1169 ../cli/src/devices.c:294
-msgid "deactivating"
-msgstr "disattivazione"
-
-#: ../cli/src/connections.c:1172 ../cli/src/connections.c:1195
-#: ../cli/src/connections.c:1228 ../cli/src/devices.c:298
-#: ../cli/src/devices.c:678 ../cli/src/network-manager.c:111
-#: ../cli/src/network-manager.c:173 ../cli/src/network-manager.c:176
-#: ../cli/src/network-manager.c:185 ../cli/src/network-manager.c:291
-#: ../cli/src/network-manager.c:346 ../cli/src/network-manager.c:384
-#: ../cli/src/network-manager.c:423 ../cli/src/settings.c:513
-#: ../cli/src/utils.c:397
-msgid "unknown"
-msgstr "sconosciuto"
-
-#: ../cli/src/connections.c:1181
-msgid "VPN connecting (prepare)"
-msgstr "Connessione VPN (preparazione)"
-
-#: ../cli/src/connections.c:1183
-msgid "VPN connecting (need authentication)"
-msgstr "Connessione VPN (autenticazione necessaria)"
-
-#: ../cli/src/connections.c:1185
-msgid "VPN connecting"
-msgstr "connessione VPN"
-
-#: ../cli/src/connections.c:1187
-msgid "VPN connecting (getting IP configuration)"
-msgstr "Connessione VPN (acquisizione configurazione IP)"
-
-#: ../cli/src/connections.c:1189
-msgid "VPN connected"
-msgstr "Connessi alla VPN"
-
-#: ../cli/src/connections.c:1191
-msgid "VPN connection failed"
-msgstr "Connessione VPN non riuscita"
-
-#: ../cli/src/connections.c:1193
-msgid "VPN disconnected"
-msgstr "VPN scollegata"
-
-#: ../cli/src/connections.c:1204
+#: ../cli/src/connections.c:1327
 msgid "unknown reason"
 msgstr "motivo sconosciuto"
 
-#: ../cli/src/connections.c:1206
+#: ../cli/src/connections.c:1329
 msgid "none"
 msgstr "nessuno"
 
-#: ../cli/src/connections.c:1208
+#: ../cli/src/connections.c:1331
 msgid "the user was disconnected"
 msgstr "l'utente è stato scollegato"
 
-#: ../cli/src/connections.c:1210
+#: ../cli/src/connections.c:1333
 msgid "the base network connection was interrupted"
 msgstr "la connessione di rete di base è stata interrotta"
 
-#: ../cli/src/connections.c:1212
+#: ../cli/src/connections.c:1335
 msgid "the VPN service stopped unexpectedly"
 msgstr "il servizio VPN si è arrestato inaspettatamente"
 
-#: ../cli/src/connections.c:1214
+#: ../cli/src/connections.c:1337
 msgid "the VPN service returned invalid configuration"
 msgstr "il servizio VPN ha restituito una configurazione non valida"
 
-#: ../cli/src/connections.c:1216
+#: ../cli/src/connections.c:1339
 msgid "the connection attempt timed out"
 msgstr "il tentativo di connessione è scaduto"
 
-#: ../cli/src/connections.c:1218
+#: ../cli/src/connections.c:1341
 msgid "the VPN service did not start in time"
 msgstr "il servizio VPN non è stato avviato in tempo"
 
-#: ../cli/src/connections.c:1220
+#: ../cli/src/connections.c:1343
 msgid "the VPN service failed to start"
 msgstr "l'avvio del servizio VPN non è riuscito"
 
-#: ../cli/src/connections.c:1222
+#: ../cli/src/connections.c:1345
 msgid "no valid VPN secrets"
 msgstr "nessun segreto VPN valido"
 
-#: ../cli/src/connections.c:1224
+#: ../cli/src/connections.c:1347
 msgid "invalid VPN secrets"
 msgstr "segreti VPN non validi"
 
-#: ../cli/src/connections.c:1226
+#: ../cli/src/connections.c:1349
 msgid "the connection was removed"
 msgstr "la connessione è stata rimossa"
 
-#: ../cli/src/connections.c:1240
-#, c-format
-msgid "state: %s\n"
-msgstr "stato: %s\n"
-
-#: ../cli/src/connections.c:1243 ../cli/src/connections.c:1269
+#: ../cli/src/connections.c:1366 ../cli/src/connections.c:1571
 #, c-format
-msgid "Connection activated\n"
-msgstr "Connessione attivata\n"
+msgid "Connection successfully activated (D-Bus active path: %s)\n"
+msgstr "Connessione attivata con successo (percorso D-Bus attivo: %s)\n"
 
-#: ../cli/src/connections.c:1246
+#. Active connection failed and dissapeared, quit.
+#: ../cli/src/connections.c:1371 ../cli/src/connections.c:1472
 #, c-format
 msgid "Error: Connection activation failed."
 msgstr "Errore: attivazione connessione non riuscita."
 
-#: ../cli/src/connections.c:1265
+#: ../cli/src/connections.c:1396
 #, c-format
-msgid "state: %s (%d)\n"
-msgstr "stato: %s (%d)\n"
+msgid "VPN connection successfully activated (D-Bus active path: %s)\n"
+msgstr "Connessione VPN attivata con successo (percorso D-Bus attivo: %s)\n"
 
-#: ../cli/src/connections.c:1275
+#: ../cli/src/connections.c:1404
 #, c-format
 msgid "Error: Connection activation failed: %s."
 msgstr "Errore: attivazione connessione non riuscita: %s."
 
-#: ../cli/src/connections.c:1292 ../cli/src/devices.c:1126
+#: ../cli/src/connections.c:1501 ../cli/src/devices.c:974
 #, c-format
 msgid "Error: Timeout %d sec expired."
 msgstr "Errore: timeout, %d sec scaduti."
 
-#: ../cli/src/connections.c:1305
+#: ../cli/src/connections.c:1562
 #, c-format
 msgid "Error: Connection activation failed: %s"
 msgstr "Errore: attivazione connessione non riuscita: %s"
 
-#: ../cli/src/connections.c:1311
-#, c-format
-msgid "Active connection state: %s\n"
-msgstr "Stato connessione attiva: %s\n"
-
-#: ../cli/src/connections.c:1312
-#, c-format
-msgid "Active connection path: %s\n"
-msgstr "Percorso connessione attiva: %s\n"
-
-#: ../cli/src/connections.c:1364 ../cli/src/connections.c:1505
-#: ../cli/src/connections.c:1614
+#: ../cli/src/connections.c:1656 ../cli/src/connections.c:1810
+#: ../cli/src/connections.c:1938
 #, c-format
 msgid "Error: Unknown connection: %s."
 msgstr "Errore: connessione sconosciuta: %s."
 
-#: ../cli/src/connections.c:1410 ../cli/src/devices.c:1198
+#: ../cli/src/connections.c:1702 ../cli/src/devices.c:1059
+#: ../cli/src/devices.c:1605
 #, c-format
 msgid "Error: timeout value '%s' is not valid."
-msgstr "Errore: il valore di timeout \"%s\" non è valido."
+msgstr "Errore: il valore di timeout «%s» non è valido."
 
-#: ../cli/src/connections.c:1423 ../cli/src/connections.c:1522
-#: ../cli/src/connections.c:1594
+#: ../cli/src/connections.c:1715 ../cli/src/connections.c:1827
+#: ../cli/src/connections.c:1918
 #, c-format
 msgid "Error: id or uuid has to be specified."
 msgstr "Errore: specificare id o uuid."
 
-#: ../cli/src/connections.c:1451
+#: ../cli/src/connections.c:1747
 #, c-format
 msgid "Error: No suitable device found: %s."
 msgstr "Errore: nessun dispositivo idoneo trovato: %s."
 
-#: ../cli/src/connections.c:1453
+#: ../cli/src/connections.c:1749
 #, c-format
 msgid "Error: No suitable device found."
 msgstr "Errore: nessun dispositivo idoneo trovato."
 
-#: ../cli/src/connections.c:1558
+#: ../cli/src/connections.c:1863
 #, c-format
 msgid "Warning: Connection not active\n"
 msgstr "Attenzione: connessione non attiva\n"
 
-#: ../cli/src/connections.c:1659
+#: ../cli/src/connections.c:1877
+#, c-format
+msgid "Error: Connection deletion failed: %s"
+msgstr "Errore: eliminazione connessione non riuscita: %s"
+
+#: ../cli/src/connections.c:1995
 #, c-format
 msgid "Error: 'con' command '%s' is not valid."
-msgstr "Errore: il comando \"con\" \"%s\" non è valido."
+msgstr "Errore: il comando «con» «%s» non è valido."
 
-#: ../cli/src/connections.c:1724
+#: ../cli/src/connections.c:2063
 #, c-format
 msgid "Error: could not connect to D-Bus."
 msgstr "Errore: impossibile collegarsi a D-Bus."
 
-#: ../cli/src/connections.c:1732
+#: ../cli/src/connections.c:2071
 #, c-format
 msgid "Error: Could not get system settings."
 msgstr "Errore: impossibile ottenere le impostazioni del sistema."
 
-#: ../cli/src/connections.c:1742
+#: ../cli/src/connections.c:2081
 #, c-format
 msgid "Error: Can't obtain connections: settings service is not running."
 msgstr ""
@@ -477,507 +865,547 @@ msgstr ""
 #. 0
 #. 9
 #. 3
-#: ../cli/src/devices.c:66 ../cli/src/devices.c:102 ../cli/src/devices.c:212
-#: ../cli/src/devices.c:228
+#: ../cli/src/devices.c:70 ../cli/src/devices.c:106 ../cli/src/devices.c:187
+#: ../cli/src/devices.c:203
 msgid "DEVICE"
-msgstr "DISPOSITIVO"
-
-#. 1
-#. 4
-#. 1
-#: ../cli/src/devices.c:68 ../cli/src/devices.c:106
-#: ../cli/src/network-manager.c:39
-msgid "STATE"
-msgstr "STATO"
-
-#: ../cli/src/devices.c:78
-msgid "GENERAL"
-msgstr "GENERALE"
+msgstr "DEVICE"
 
 #. 0
-#: ../cli/src/devices.c:79
+#: ../cli/src/devices.c:83
 msgid "CAPABILITIES"
 msgstr "CAPACITÀ"
 
 #. 1
-#: ../cli/src/devices.c:80
+#: ../cli/src/devices.c:84
 msgid "WIFI-PROPERTIES"
 msgstr "PROPRIETÀ-WIFI"
 
 #. 2
-#: ../cli/src/devices.c:81
+#: ../cli/src/devices.c:85
 msgid "AP"
 msgstr "AP"
 
 #. 3
-#: ../cli/src/devices.c:82
+#: ../cli/src/devices.c:86
 msgid "WIRED-PROPERTIES"
 msgstr "PROPRIETÀ-VIA-CAVO"
 
 #. 4
-#: ../cli/src/devices.c:83
+#: ../cli/src/devices.c:87
 msgid "WIMAX-PROPERTIES"
 msgstr "PROPRIETÀ-WIMAX"
 
 #. 5
 #. 0
-#: ../cli/src/devices.c:84 ../cli/src/devices.c:225
+#: ../cli/src/devices.c:88 ../cli/src/devices.c:200
 msgid "NSP"
 msgstr "NSP"
 
 #. 6
-#: ../cli/src/devices.c:85
-msgid "IP4-SETTINGS"
-msgstr "IMPOSTAZIONI-IP4"
+#: ../cli/src/devices.c:89
+msgid "IP4"
+msgstr "IP4"
 
 #. 7
-#: ../cli/src/devices.c:86
-msgid "IP4-DNS"
-msgstr "IP4-DNS"
+#: ../cli/src/devices.c:90
+msgid "DHCP4"
+msgstr "DHCP4"
 
 #. 8
-#: ../cli/src/devices.c:87
-msgid "IP6-SETTINGS"
-msgstr "IMPOSTAZIONI-IP6"
+#: ../cli/src/devices.c:91
+msgid "IP6"
+msgstr "IP6"
 
 #. 9
-#: ../cli/src/devices.c:88
-msgid "IP6-DNS"
-msgstr "IP6-DNS"
+#: ../cli/src/devices.c:92
+msgid "DHCP6"
+msgstr "DHCP6"
 
 #. 2
-#: ../cli/src/devices.c:104
+#: ../cli/src/devices.c:108
+msgid "VENDOR"
+msgstr "VENDOR"
+
+#. 3
+#: ../cli/src/devices.c:109
+msgid "PRODUCT"
+msgstr "PRODOTTO"
+
+#. 4
+#: ../cli/src/devices.c:110
 msgid "DRIVER"
 msgstr "DRIVER"
 
-#. 3
-#: ../cli/src/devices.c:105
+#. 5
+#: ../cli/src/devices.c:111
+msgid "DRIVER-VERSION"
+msgstr "VERSIONE-DRIVER"
+
+#. 6
+#: ../cli/src/devices.c:112
+msgid "FIRMWARE-VERSION"
+msgstr "VERSIONE-FIRMWARE"
+
+#. 7
+#: ../cli/src/devices.c:113
 msgid "HWADDR"
 msgstr "HWADDR"
 
-#. 0
+#. 9
 #: ../cli/src/devices.c:115
+msgid "REASON"
+msgstr "MOTIVO"
+
+#. 10
+#: ../cli/src/devices.c:116
+msgid "UDI"
+msgstr "UDI"
+
+#. 11
+#: ../cli/src/devices.c:117
+msgid "IP-IFACE"
+msgstr "IP-IFACE"
+
+#. 12
+#: ../cli/src/devices.c:118
+msgid "NM-MANAGED"
+msgstr "NM-MANAGED"
+
+#. 14
+#: ../cli/src/devices.c:120
+msgid "FIRMWARE-MISSING"
+msgstr "FIRMWARE-MANCANTE"
+
+#. 15
+#: ../cli/src/devices.c:121
+msgid "CONNECTION"
+msgstr "CONNESSIONE"
+
+#. 0
+#: ../cli/src/devices.c:130
 msgid "CARRIER-DETECT"
-msgstr "RILEVAMENTO-CARRIER"
+msgstr "RILEVAMENTO-PORTANTE"
 
 #. 1
-#: ../cli/src/devices.c:116
+#: ../cli/src/devices.c:131
 msgid "SPEED"
 msgstr "VELOCITÀ"
 
 #. 0
-#: ../cli/src/devices.c:125
+#: ../cli/src/devices.c:140
 msgid "CARRIER"
-msgstr "CARRIER"
+msgstr "PORTANTE"
 
 #. 0
-#: ../cli/src/devices.c:135
+#: ../cli/src/devices.c:150
 msgid "WEP"
 msgstr "WEP"
 
 #. 1
-#: ../cli/src/devices.c:136
+#: ../cli/src/devices.c:151
 msgid "WPA"
 msgstr "WPA"
 
 #. 2
-#: ../cli/src/devices.c:137
+#: ../cli/src/devices.c:152
 msgid "WPA2"
 msgstr "WPA2"
 
 #. 3
-#: ../cli/src/devices.c:138
+#: ../cli/src/devices.c:153
 msgid "TKIP"
 msgstr "TKIP"
 
 #. 4
-#: ../cli/src/devices.c:139
+#: ../cli/src/devices.c:154
 msgid "CCMP"
 msgstr "CCMP"
 
 #. 0
-#: ../cli/src/devices.c:149
+#: ../cli/src/devices.c:164
 msgid "CTR-FREQ"
 msgstr "FREQ-CTR"
 
 #. 1
-#: ../cli/src/devices.c:150
+#: ../cli/src/devices.c:165
 msgid "RSSI"
 msgstr "RSSI"
 
 #. 2
-#: ../cli/src/devices.c:151
+#: ../cli/src/devices.c:166
 msgid "CINR"
 msgstr "CINR"
 
 #. 3
-#: ../cli/src/devices.c:152
+#: ../cli/src/devices.c:167
 msgid "TX-POW"
 msgstr "TX-POW"
 
 #. 4
-#: ../cli/src/devices.c:153
+#: ../cli/src/devices.c:168
 msgid "BSID"
 msgstr "BSID"
 
 #. 0
-#: ../cli/src/devices.c:163 ../cli/src/devices.c:174
-msgid "ADDRESS"
-msgstr "INDIRIZZO"
-
-#. 1
-#: ../cli/src/devices.c:164 ../cli/src/devices.c:175
-msgid "PREFIX"
-msgstr "PREFISSO"
-
-#. 2
-#: ../cli/src/devices.c:165 ../cli/src/devices.c:176
-msgid "GATEWAY"
-msgstr "GATEWAY"
-
-#. 0
-#: ../cli/src/devices.c:185 ../cli/src/devices.c:194
-msgid "DNS"
-msgstr "DNS"
-
-#. 0
-#: ../cli/src/devices.c:203
+#: ../cli/src/devices.c:178
 msgid "SSID"
 msgstr "SSID"
 
 #. 1
-#: ../cli/src/devices.c:204
+#: ../cli/src/devices.c:179
 msgid "BSSID"
 msgstr "BSSID"
 
 #. 2
-#: ../cli/src/devices.c:205
+#: ../cli/src/devices.c:180
 msgid "MODE"
 msgstr "MODALITÀ"
 
 #. 3
-#: ../cli/src/devices.c:206
+#: ../cli/src/devices.c:181
 msgid "FREQ"
 msgstr "FREQ"
 
 #. 4
-#: ../cli/src/devices.c:207
+#: ../cli/src/devices.c:182
 msgid "RATE"
-msgstr "VELOCITÀ  "
+msgstr "VELOCITÀ"
 
 #. 5
 #. 1
-#: ../cli/src/devices.c:208 ../cli/src/devices.c:226
+#: ../cli/src/devices.c:183 ../cli/src/devices.c:201
 msgid "SIGNAL"
 msgstr "SEGNALE"
 
 #. 6
-#: ../cli/src/devices.c:209
+#: ../cli/src/devices.c:184
 msgid "SECURITY"
 msgstr "SICUREZZA"
 
 #. 7
-#: ../cli/src/devices.c:210
+#: ../cli/src/devices.c:185
 msgid "WPA-FLAGS"
 msgstr "FLAG-WPA"
 
 #. 8
-#: ../cli/src/devices.c:211
+#: ../cli/src/devices.c:186
 msgid "RSN-FLAGS"
 msgstr "FLAG-RSN"
 
 #. 10
-#. 4
-#: ../cli/src/devices.c:213 ../cli/src/devices.c:229
-msgid "ACTIVE"
-msgstr "ATTIVO"
-
-#: ../cli/src/devices.c:246
-#, 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 ]\n"
-"  disconnect iface  [--nowait] [--timeout ]\n"
-"  wifi [list [iface ] [bssid ]]\n"
-"  wimax [list [iface ] [nsp ]]\n"
-"\n"
-msgstr ""
-"Uso: nmcli dev { COMANDO | help }\n"
-"\n"
-"  COMANDO := { status | list | disconnect | wifi | wimax }\n"
-"\n"
-"  COMANDO := { status | list | disconnect | wifi }\n"
-"\n"
-"  status\n"
-"  list [iface ]\n"
-"  disconnect iface  [--nowait] [--timeout ]\n"
-"  wifi [list [iface ] [bssid ]]\n"
-"  wimax [list [iface ] [nsp ]]\n"
-"\n"
-
-#: ../cli/src/devices.c:274
-msgid "unmanaged"
-msgstr "non gestito"
-
-#: ../cli/src/devices.c:276
-msgid "unavailable"
-msgstr "non disponibile"
-
-#: ../cli/src/devices.c:278 ../cli/src/network-manager.c:108
-msgid "disconnected"
-msgstr "scollegato"
-
-#: ../cli/src/devices.c:280
-msgid "connecting (prepare)"
-msgstr "connessione in corso (preparazione)"
-
-#: ../cli/src/devices.c:282
-msgid "connecting (configuring)"
-msgstr "connessione in corso (configurazione)"
-
-#: ../cli/src/devices.c:284
-msgid "connecting (need authentication)"
-msgstr "connessione in corso (autenticazione necessaria)"
-
-#: ../cli/src/devices.c:286
-msgid "connecting (getting IP configuration)"
-msgstr "connessione in corso (acquisizione configurazione IP)"
-
-#: ../cli/src/devices.c:288
-msgid "connecting (checking IP connectivity)"
-msgstr "connessione in corso (verifica connettività IP)"
-
-#: ../cli/src/devices.c:290
-msgid "connecting (starting secondary connections)"
-msgstr "connessione in corso (avvio connessioni secondarie)"
-
-#: ../cli/src/devices.c:292 ../cli/src/network-manager.c:104
-msgid "connected"
-msgstr "collegato"
-
-#: ../cli/src/devices.c:296
-msgid "connection failed"
-msgstr "connessione non riuscita"
+#. 4
+#: ../cli/src/devices.c:188 ../cli/src/devices.c:204
+msgid "ACTIVE"
+msgstr "ATTIVO"
 
-#: ../cli/src/devices.c:321 ../cli/src/devices.c:331 ../cli/src/devices.c:491
-#: ../cli/src/devices.c:535
-msgid "Unknown"
-msgstr "Sconosciuto"
+#: ../cli/src/devices.c:223
+#, 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 ]\n"
+"  disconnect iface  [--nowait] [--timeout ]\n"
+"  wifi [list [iface ] [bssid ]]\n"
+"  wifi connect <(B)SSID> [password ] [wep-key-type key|phrase] "
+"[iface ] [bssid ] [name ]\n"
+"               [--private] [--nowait] [--timeout ]\n"
+"  wimax [list [iface ] [nsp ]]\n"
+"\n"
+msgstr ""
+"Uso: nmcli dev { COMANDO | help }\n"
+"\n"
+"  COMANDO := { status | list | disconnect | wifi | wimax }\n"
+"\n"
+"  COMANDO := { status | list | disconnect | wifi }\n"
+"\n"
+"  status\n"
+"  list [iface ]\n"
+"  disconnect iface  [--nowait] [--timeout ]\n"
+"  wifi [list [iface ] [bssid ]]\n"
+"  wifi connect <(B)SSID> [password ] [wep-key-type key|phrase] "
+"[iface ] [bssid ] [name ]\n"
+"               [--private] [--nowait] [--timeout ]\n"
+"  wimax [list [iface ] [nsp ]]\n"
+"\n"
 
-#: ../cli/src/devices.c:364
+#: ../cli/src/devices.c:323
 msgid "(none)"
 msgstr "(nessuno)"
 
-#: ../cli/src/devices.c:389
-#, c-format
-msgid "%s: error converting IP4 address 0x%X"
-msgstr "%s: errore nella conversione dell'indirizzo IP4 0x%X"
-
-#: ../cli/src/devices.c:460
+#: ../cli/src/devices.c:379
 #, c-format
 msgid "%u MHz"
 msgstr "%u MHz"
 
-#: ../cli/src/devices.c:461
+#: ../cli/src/devices.c:380
 #, c-format
 msgid "%u MB/s"
 msgstr "%u MB/s"
 
-#: ../cli/src/devices.c:470
+#: ../cli/src/devices.c:389
 msgid "Encrypted: "
 msgstr "Cifrato: "
 
-#: ../cli/src/devices.c:475
+#: ../cli/src/devices.c:394
 msgid "WEP "
 msgstr "WEP "
 
-#: ../cli/src/devices.c:477
+#: ../cli/src/devices.c:396
 msgid "WPA "
 msgstr "WPA "
 
-#: ../cli/src/devices.c:479
+#: ../cli/src/devices.c:398
 msgid "WPA2 "
 msgstr "WPA2 "
 
-#: ../cli/src/devices.c:482
+#: ../cli/src/devices.c:401
 msgid "Enterprise "
 msgstr "Enterprise "
 
-#: ../cli/src/devices.c:491
+#: ../cli/src/devices.c:410
 msgid "Ad-Hoc"
 msgstr "Ad-Hoc"
 
-#: ../cli/src/devices.c:491
+#: ../cli/src/devices.c:410
 msgid "Infrastructure"
 msgstr "Infrastruttura"
 
-#: ../cli/src/devices.c:526
+#: ../cli/src/devices.c:445
 msgid "Home"
 msgstr "Home"
 
-#: ../cli/src/devices.c:529
+#: ../cli/src/devices.c:448
 msgid "Partner"
 msgstr "Partner"
 
-#: ../cli/src/devices.c:532
+#: ../cli/src/devices.c:451
 msgid "Roaming"
 msgstr "Roaming"
 
-#: ../cli/src/devices.c:602
+#: ../cli/src/devices.c:523
 #, c-format
 msgid "Error: 'dev list': %s"
-msgstr "Errore: \"dev list\": %s"
+msgstr "Errore: «dev list»: %s"
 
-#: ../cli/src/devices.c:604
+#: ../cli/src/devices.c:525
 #, c-format
 msgid "Error: 'dev list': %s; allowed fields: %s"
-msgstr "Errore: \"dev list\": %s; campi consentiti: %s"
+msgstr "Errore: «dev list»: %s; campi consentiti: %s"
 
-#: ../cli/src/devices.c:613
+#: ../cli/src/devices.c:534
 msgid "Device details"
-msgstr "Informazioni del dispositivo"
+msgstr "Informazioni dispositivo"
 
-#: ../cli/src/devices.c:647 ../cli/src/devices.c:1142 ../cli/src/utils.c:343
+#: ../cli/src/devices.c:579 ../cli/src/devices.c:582 ../cli/src/devices.c:1000
+#: ../cli/src/utils.c:477
 msgid "(unknown)"
 msgstr "(sconosciuto)"
 
-#: ../cli/src/devices.c:648
-msgid "unknown)"
-msgstr "sconosciuto)"
+#: ../cli/src/devices.c:591
+msgid "not connected"
+msgstr "non collegato"
 
-#: ../cli/src/devices.c:674
+#: ../cli/src/devices.c:618
 #, c-format
 msgid "%u Mb/s"
 msgstr "%u Mb/s"
 
 #. Print header
 #. "WIRED-PROPERTIES"
-#: ../cli/src/devices.c:747
+#: ../cli/src/devices.c:691
 msgid "on"
 msgstr "on"
 
-#: ../cli/src/devices.c:747
+#: ../cli/src/devices.c:691
 msgid "off"
 msgstr "off"
 
-#: ../cli/src/devices.c:994
+#: ../cli/src/devices.c:842
 #, c-format
 msgid "Error: 'dev status': %s"
-msgstr "Errore: \"dev status\": %s"
+msgstr "Errore: «dev status»: %s"
 
-#: ../cli/src/devices.c:996
+#: ../cli/src/devices.c:844
 #, c-format
 msgid "Error: 'dev status': %s; allowed fields: %s"
-msgstr "Errore: \"dev status\": %s; campi consentiti: %s"
+msgstr "Errore: «dev status»: %s; campi consentiti: %s"
 
-#: ../cli/src/devices.c:1019
+#: ../cli/src/devices.c:867
 msgid "Status of devices"
-msgstr "Stato dispositivo"
+msgstr "Stato dispositivi"
 
-#: ../cli/src/devices.c:1050
+#: ../cli/src/devices.c:898
 #, c-format
 msgid "Error: '%s' argument is missing."
-msgstr "Errore: manca l'argoamento \"%s\"."
+msgstr "Errore: manca l'argomento «%s»."
 
-#: ../cli/src/devices.c:1091 ../cli/src/devices.c:1243
-#: ../cli/src/devices.c:1380 ../cli/src/devices.c:1599
+#: ../cli/src/devices.c:939 ../cli/src/devices.c:1104
+#: ../cli/src/devices.c:1245 ../cli/src/devices.c:1892
 #, c-format
 msgid "Error: Device '%s' not found."
-msgstr "Errore: dispositivo \"%s\" non trovato."
+msgstr "Errore: dispositivo «%s» non trovato."
 
-#: ../cli/src/devices.c:1114
+#: ../cli/src/devices.c:962
 #, c-format
 msgid "Success: Device '%s' successfully disconnected."
-msgstr "Successo: dispositivo \"%s\" scollegato con successo."
+msgstr "Successo: dispositivo «%s» scollegato con successo."
 
-#: ../cli/src/devices.c:1139
+#: ../cli/src/devices.c:997
 #, c-format
 msgid "Error: Device '%s' (%s) disconnecting failed: %s"
-msgstr "Errore: scollegamento dispositivo \"%s\" (%s) non riuscito: %s"
+msgstr "Errore: scollegamento dispositivo «%s» (%s) non riuscito: %s"
 
-#: ../cli/src/devices.c:1147
+#: ../cli/src/devices.c:1010
 #, c-format
-msgid "Device state: %d (%s)\n"
-msgstr "Stato dispositivo: %d (%s)\n"
+msgid "Device '%s' has been disconnected.\n"
+msgstr "Il dispositivo «%s» è stato scollegato con successo.\n"
 
-#: ../cli/src/devices.c:1212
+#: ../cli/src/devices.c:1073
 #, c-format
 msgid "Error: iface has to be specified."
 msgstr "Errore: iface deve essere specificato."
 
-#: ../cli/src/devices.c:1338
+#: ../cli/src/devices.c:1203
 #, c-format
 msgid "Error: 'dev wifi': %s"
-msgstr "Errore: \"dev wifi\": %s"
+msgstr "Errore: «dev wifi»: %s"
 
-#: ../cli/src/devices.c:1340
+#: ../cli/src/devices.c:1205
 #, c-format
 msgid "Error: 'dev wifi': %s; allowed fields: %s"
-msgstr "Error: \"dev wifi\": %s; campi consentiti: %s"
+msgstr "Errore: «dev wifi»: %s; campi consentiti: %s"
 
-#: ../cli/src/devices.c:1363
+#: ../cli/src/devices.c:1228
 msgid "WiFi scan list"
-msgstr "Elenco scansione WiFi"
+msgstr "Elenco scansione Wi-Fi"
 
-#: ../cli/src/devices.c:1400 ../cli/src/devices.c:1454
+#: ../cli/src/devices.c:1265 ../cli/src/devices.c:1319
 #, c-format
 msgid "Error: Access point with bssid '%s' not found."
-msgstr "Errore: punto di accesso con bssid \"%s\" non trovato."
+msgstr "Errore: punto di accesso con bssid «%s» non trovato."
 
-#: ../cli/src/devices.c:1417
+#: ../cli/src/devices.c:1282
 #, c-format
 msgid "Error: Device '%s' is not a WiFi device."
-msgstr "Errore: il dispositivo \"%s\" non è un dispositivo WiFi."
+msgstr "Errore: il dispositivo «%s» non è un dispositivo Wi-Fi."
+
+#: ../cli/src/devices.c:1350 ../cli/src/devices.c:1396
+#, c-format
+msgid "Connection with UUID '%s' created and activated on device '%s'\n"
+msgstr "Connessione con UUID «%s» creata e attivata sul dispositivo «%s»\n"
+
+#: ../cli/src/devices.c:1355
+#, c-format
+msgid "Error: Connection activation failed: (%d) %s."
+msgstr "Errore: attivazione connessione non riuscita: (%d) %s."
+
+#: ../cli/src/devices.c:1380
+#, c-format
+msgid "Error: Failed to add/activate new connection: (%d) %s"
+msgstr "Errore: aggiunta/attivazione nuova connessione non riuscita: (%d) %s"
+
+#: ../cli/src/devices.c:1388
+#, c-format
+msgid "Error: Failed to add/activate new connection: Unknown error"
+msgstr ""
+"Errore: aggiunta/attivazione nuova connessione non riuscita: errore "
+"sconosciuto"
+
+#: ../cli/src/devices.c:1532
+#, c-format
+msgid "Error: SSID or BSSID are missing."
+msgstr "Errore: SSID o BSSID mancante."
+
+#: ../cli/src/devices.c:1555
+#, c-format
+msgid "Error: bssid argument value '%s' is not a valid BSSID."
+msgstr "Errore: il valore «%s» di bssid non è un BSSID valido."
+
+#: ../cli/src/devices.c:1579
+#, c-format
+msgid ""
+"Error: wep-key-type argument value '%s' is invalid, use 'key' or 'phrase'."
+msgstr ""
+"Errore: il valore «%s» di wep-key-type non è valido, usare «key» o «phrase»."
+
+#: ../cli/src/devices.c:1619
+#, c-format
+msgid "Error: BSSID to connect to (%s) differs from bssid argument (%s)."
+msgstr "Error: BSSID a cui connettersi (%s) diverso dall'argomento bssid (%s)."
+
+#: ../cli/src/devices.c:1625
+#, c-format
+msgid "Error: Parameter '%s' is neither SSID nor BSSID."
+msgstr "Errore: il parametro «%s» non è né SSID né BSSID."
+
+#: ../cli/src/devices.c:1654
+#, c-format
+msgid "Error: Device '%s' is not a Wi-Fi device."
+msgstr "Errore: il dispositivo «%s» non è un dispositivo Wi-Fi."
+
+#: ../cli/src/devices.c:1656
+#, c-format
+msgid "Error: No Wi-Fi device found."
+msgstr "Errore: nessun dispositivo Wi-Fi trovato."
+
+#: ../cli/src/devices.c:1674
+#, c-format
+msgid "Error: No network with SSID '%s' found."
+msgstr "Errore: rete con SSID «%s» non trovata."
 
-#: ../cli/src/devices.c:1481
+#: ../cli/src/devices.c:1676
+#, c-format
+msgid "Error: No access point with BSSID '%s' found."
+msgstr "Errore: punto di accesso con BSSID «%s» non trovato."
+
+#: ../cli/src/devices.c:1774
 #, c-format
 msgid "Error: 'dev wifi' command '%s' is not valid."
-msgstr "Errore: il comando \"dev wifi\" \"%s\" non è valido."
+msgstr "Errore: il comando «dev wifi» «%s» non è valido."
 
-#: ../cli/src/devices.c:1557
+#: ../cli/src/devices.c:1850
 #, c-format
 msgid "Error: 'dev wimax': %s"
-msgstr "Errore: \"dev wimax\": %s"
+msgstr "Errore: «dev wimax»: %s"
 
-#: ../cli/src/devices.c:1559
+#: ../cli/src/devices.c:1852
 #, c-format
 msgid "Error: 'dev wimax': %s; allowed fields: %s"
-msgstr "Error: \"dev wimax\": %s; campi consentiti: %s"
+msgstr "Errore: «dev wimax»: %s; campi consentiti: %s"
 
-#: ../cli/src/devices.c:1582
+#: ../cli/src/devices.c:1875
 msgid "WiMAX NSP list"
 msgstr "Elenco NSP WiMAX"
 
-#: ../cli/src/devices.c:1619
+#: ../cli/src/devices.c:1912
 #, c-format
 msgid "Error: NSP with name '%s' not found."
-msgstr "Errore: NSP con come \"%s\" non trovato."
+msgstr "Errore: NSP con nome «%s» non trovato."
 
-#: ../cli/src/devices.c:1630
+#: ../cli/src/devices.c:1923
 #, c-format
 msgid "Error: Device '%s' is not a WiMAX device."
-msgstr "Errore: il dispositivo \"%s\" non è un dispositivo WiMAX."
+msgstr "Errore: il dispositivo «%s» non è un dispositivo WiMAX."
 
-#: ../cli/src/devices.c:1661
+#: ../cli/src/devices.c:1954
 #, c-format
 msgid "Error: Access point with nsp '%s' not found."
-msgstr "Errore: punto di accesso con nso \"%s\" non trovato."
+msgstr "Errore: punto di accesso con nsp «%s» non trovato."
 
-#: ../cli/src/devices.c:1688
+#: ../cli/src/devices.c:1981
 #, c-format
 msgid "Error: 'dev wimax' command '%s' is not valid."
-msgstr "Errore: il comando \"dev wimax\" \"%s\" non è valido."
+msgstr "Errore: il comando «dev wimax» «%s» non è valido."
 
-#: ../cli/src/devices.c:1738
+#: ../cli/src/devices.c:2031
 #, c-format
 msgid "Error: 'dev' command '%s' is not valid."
-msgstr "Errore: il comando \"dev\" \"%s\" non è valido."
+msgstr "Errore: il comando «dev» «%s» non è valido."
 
 #: ../cli/src/network-manager.c:37
 msgid "RUNNING"
@@ -1023,16 +1451,27 @@ msgstr "HARDWARE-WIMAX"
 msgid "WIMAX"
 msgstr "WIMAX"
 
-#: ../cli/src/network-manager.c:67
+#: ../cli/src/network-manager.c:62
+msgid "PERMISSION"
+msgstr "PERMESSO"
+
+#. 0
+#: ../cli/src/network-manager.c:63
+msgid "VALUE"
+msgstr "VALORE"
+
+#: ../cli/src/network-manager.c:77
 #, c-format
 msgid ""
 "Usage: nmcli nm { COMMAND | help }\n"
 "\n"
-"  COMMAND := { status | enable | sleep | wifi | wwan | wimax }\n"
+"  COMMAND := { status | permissions | enable | sleep | wifi | wwan | "
+"wimax }\n"
 "\n"
-"  COMMAND := { status | enable | sleep | wifi | wwan }\n"
+"  COMMAND := { status | permissions | enable | sleep | wifi | wwan }\n"
 "\n"
 "  status\n"
+"  permissions\n"
 "  enable [true|false]\n"
 "  sleep [true|false]\n"
 "  wifi [on|off]\n"
@@ -1042,11 +1481,13 @@ msgid ""
 msgstr ""
 "Uso: nmcli nm { COMANDO | help }\n"
 "\n"
-"  COMANDO := { status | enable | sleep | wifi | wwan | wimax }\n"
+"  COMANDO := { status | permissions | enable | sleep | wifi | wwan | "
+"wimax }\n"
 "\n"
-"  COMANDO := { status | enable | sleep | wifi | wwan }\n"
+"  COMANDO := { status | permissions | enable | sleep | wifi | wwan }\n"
 "\n"
 "  status\n"
+"  permissions\n"
 "  enable [true|false]\n"
 "  sleep [true|false]\n"
 "  wifi [on|off]\n"
@@ -1054,144 +1495,160 @@ msgstr ""
 "  wimax [on|off]\n"
 "\n"
 
-#: ../cli/src/network-manager.c:96
+#: ../cli/src/network-manager.c:108
 msgid "asleep"
 msgstr "dormiente"
 
-#: ../cli/src/network-manager.c:98
+#: ../cli/src/network-manager.c:110
 msgid "connecting"
-msgstr "in connessione"
+msgstr "connessione in corso"
 
-#: ../cli/src/network-manager.c:100
+#: ../cli/src/network-manager.c:112
 msgid "connected (local only)"
 msgstr "collegato (solo local)"
 
-#: ../cli/src/network-manager.c:102
+#: ../cli/src/network-manager.c:114
 msgid "connected (site only)"
 msgstr "collegato (solo site)"
 
-#: ../cli/src/network-manager.c:106
+#: ../cli/src/network-manager.c:118
 msgid "disconnecting"
-msgstr "in disconnessione"
+msgstr "disconnessione in corso"
 
-#: ../cli/src/network-manager.c:146
+#: ../cli/src/network-manager.c:158
 #, c-format
 msgid "Error: 'nm status': %s"
-msgstr "Errore: \"nm status\": %s"
+msgstr "Errore: «nm status»: %s"
 
-#: ../cli/src/network-manager.c:148
+#: ../cli/src/network-manager.c:160
 #, c-format
 msgid "Error: 'nm status': %s; allowed fields: %s"
-msgstr "Errore: \"nm status\": %s; campi consentiti: %s"
+msgstr "Errore: «nm status»: %s; campi consentiti: %s"
 
 #. create NMClient
-#: ../cli/src/network-manager.c:161 ../cli/src/network-manager.c:162
-#: ../cli/src/network-manager.c:163 ../cli/src/network-manager.c:164
-#: ../cli/src/network-manager.c:165 ../cli/src/network-manager.c:167
-#: ../cli/src/network-manager.c:168 ../cli/src/network-manager.c:289
-#: ../cli/src/network-manager.c:344 ../cli/src/network-manager.c:382
-#: ../cli/src/network-manager.c:421
+#: ../cli/src/network-manager.c:173 ../cli/src/network-manager.c:174
+#: ../cli/src/network-manager.c:175 ../cli/src/network-manager.c:176
+#: ../cli/src/network-manager.c:177 ../cli/src/network-manager.c:179
+#: ../cli/src/network-manager.c:180 ../cli/src/network-manager.c:429
+#: ../cli/src/network-manager.c:484 ../cli/src/network-manager.c:522
+#: ../cli/src/network-manager.c:561
 msgid "enabled"
 msgstr "abilitato"
 
-#: ../cli/src/network-manager.c:161 ../cli/src/network-manager.c:162
-#: ../cli/src/network-manager.c:163 ../cli/src/network-manager.c:164
-#: ../cli/src/network-manager.c:165 ../cli/src/network-manager.c:167
-#: ../cli/src/network-manager.c:168 ../cli/src/network-manager.c:289
-#: ../cli/src/network-manager.c:344 ../cli/src/network-manager.c:382
-#: ../cli/src/network-manager.c:421
+#: ../cli/src/network-manager.c:173 ../cli/src/network-manager.c:174
+#: ../cli/src/network-manager.c:175 ../cli/src/network-manager.c:176
+#: ../cli/src/network-manager.c:177 ../cli/src/network-manager.c:179
+#: ../cli/src/network-manager.c:180 ../cli/src/network-manager.c:429
+#: ../cli/src/network-manager.c:484 ../cli/src/network-manager.c:522
+#: ../cli/src/network-manager.c:561
 msgid "disabled"
 msgstr "disabilitato"
 
-#: ../cli/src/network-manager.c:181
+#: ../cli/src/network-manager.c:193
 msgid "NetworkManager status"
 msgstr "Stato NetworkManager"
 
 #. Print header
-#: ../cli/src/network-manager.c:184
+#: ../cli/src/network-manager.c:196
 msgid "running"
 msgstr "in esecuzione"
 
-#: ../cli/src/network-manager.c:184
+#: ../cli/src/network-manager.c:196
 msgid "not running"
 msgstr "non in esecuzione"
 
-#: ../cli/src/network-manager.c:215 ../cli/src/utils.c:323
+#: ../cli/src/network-manager.c:271
+msgid "auth"
+msgstr "autorizzazione"
+
+#: ../cli/src/network-manager.c:301
+#, c-format
+msgid "Error: 'nm permissions': %s"
+msgstr "Errore: «nm permissions»: %s"
+
+#: ../cli/src/network-manager.c:303
+#, c-format
+msgid "Error: 'nm permissions': %s; allowed fields: %s"
+msgstr "Errore: «nm permissions»: %s; campi consentiti: %s"
+
+#: ../cli/src/network-manager.c:324
+msgid "NetworkManager permissions"
+msgstr "Permessi NetworkManager"
+
+#: ../cli/src/network-manager.c:350 ../cli/src/utils.c:457
 #, c-format
 msgid "Error: Couldn't connect to system bus: %s"
 msgstr "Errore: impossibile collegarsi al bus di sistema: %s."
 
-#: ../cli/src/network-manager.c:226
+#: ../cli/src/network-manager.c:361
 #, c-format
 msgid "Error: Couldn't create D-Bus object proxy."
 msgstr "Errore: impossibile creare l'oggetto proxy D-Bus."
 
-#: ../cli/src/network-manager.c:232
+#: ../cli/src/network-manager.c:367
 #, c-format
 msgid "Error in sleep: %s"
 msgstr "Errore in sleep: %s"
 
-#: ../cli/src/network-manager.c:276 ../cli/src/network-manager.c:331
-#: ../cli/src/network-manager.c:369 ../cli/src/network-manager.c:408
+#: ../cli/src/network-manager.c:416 ../cli/src/network-manager.c:471
+#: ../cli/src/network-manager.c:509 ../cli/src/network-manager.c:548
 #, c-format
 msgid "Error: '--fields' value '%s' is not valid here; allowed fields: %s"
 msgstr ""
-"Errore: qui il valore \"--fields\" \"%s\" non è valido; campi consentiti: %s"
+"Errore: qui il valore «--fields» «%s» non è valido; campi consentiti: %s"
 
-#: ../cli/src/network-manager.c:284
+#: ../cli/src/network-manager.c:424
 msgid "Networking enabled"
 msgstr "Connettività di rete abilitata"
 
-#: ../cli/src/network-manager.c:300
+#: ../cli/src/network-manager.c:440
 #, c-format
 msgid "Error: invalid 'enable' parameter: '%s'; use 'true' or 'false'."
-msgstr ""
-"Errore: parametro \"enable\" non valido: \"%s\"; usare \"true\" o \"false\"."
+msgstr "Errore: parametro «enable» non valido: «%s»; usare «true» o «false»."
 
-#: ../cli/src/network-manager.c:310
+#: ../cli/src/network-manager.c:450
 #, c-format
 msgid "Error: Sleeping status is not exported by NetworkManager."
-msgstr "Errore: lo stato di \"sleep\" non è esportato da NetworkManager."
+msgstr "Errore: lo stato di «sleep» non è esportato da NetworkManager."
 
-#: ../cli/src/network-manager.c:318
+#: ../cli/src/network-manager.c:458
 #, c-format
 msgid "Error: invalid 'sleep' parameter: '%s'; use 'true' or 'false'."
-msgstr ""
-"Errore: parametro \"sleep\" non valido: \"%s\"; usare \"true\" o \"false\"."
+msgstr "Errore: parametro «sleep» non valido: «%s»; usare «true» o «false»."
 
-#: ../cli/src/network-manager.c:339
+#: ../cli/src/network-manager.c:479
 msgid "WiFi enabled"
-msgstr "WiFi abilitato"
+msgstr "Wi-Fi abilitato"
 
-#: ../cli/src/network-manager.c:355
+#: ../cli/src/network-manager.c:495
 #, c-format
 msgid "Error: invalid 'wifi' parameter: '%s'."
-msgstr "Errore: parametro \"wifi\" non valido: \"%s\"."
+msgstr "Errore: parametro «wifi» non valido: «%s»."
 
-#: ../cli/src/network-manager.c:377
+#: ../cli/src/network-manager.c:517
 msgid "WWAN enabled"
 msgstr "WWAN abilitato"
 
-#: ../cli/src/network-manager.c:393
+#: ../cli/src/network-manager.c:533
 #, c-format
 msgid "Error: invalid 'wwan' parameter: '%s'."
-msgstr "Errore: parametro \"wwan\" non valido: \"%s\"."
+msgstr "Errore: parametro «wwan» non valido: «%s»."
 
-#: ../cli/src/network-manager.c:416
+#: ../cli/src/network-manager.c:556
 msgid "WiMAX enabled"
 msgstr "WiMAX abilitato"
 
-#: ../cli/src/network-manager.c:432
+#: ../cli/src/network-manager.c:572
 #, c-format
 msgid "Error: invalid 'wimax' parameter: '%s'."
-msgstr "Errore: parametro \"wimax\" non valido: \"%s\"."
+msgstr "Errore: parametro «wimax» non valido: «%s»."
 
-#: ../cli/src/network-manager.c:445
+#: ../cli/src/network-manager.c:585
 #, c-format
 msgid "Error: 'nm' command '%s' is not valid."
-msgstr "Errore: comando \"nm\" \"%s\" non valido."
+msgstr "Errore: comando «nm» «%s» non valido."
 
-#: ../cli/src/nmcli.c:64
+#: ../cli/src/nmcli.c:76
 #, c-format
 msgid ""
 "Usage: %s [OPTIONS] OBJECT { COMMAND | help }\n"
@@ -1217,7 +1674,7 @@ msgstr ""
 "Uso: %s [OPZIONI] OGGETTO { COMANDO | help }\n"
 "\n"
 "OPZIONI\n"
-"  -t[erse]                                   Output dettagliato\n"
+"  -t[erse]                                   Output conciso\n"
 "  -p[retty]                                  Output formattato\n"
 "  -m[ode] tabular|multiline                  Modalità output\n"
 "  -f[ields] |all|common   Specifica i campi da mostrare\n"
@@ -1237,187 +1694,223 @@ msgstr ""
 "  dev         Dispositivi gestiti da NetworkManager\n"
 "\n"
 
-#: ../cli/src/nmcli.c:109
+#: ../cli/src/nmcli.c:121
 #, c-format
 msgid "Error: Object '%s' is unknown, try 'nmcli help'."
-msgstr "Errore: l'oggetto \"%s\" è sconosciuto, provare \"nmcli help\"."
+msgstr "Errore: l'oggetto «%s» è sconosciuto, provare «nmcli help»."
 
-#: ../cli/src/nmcli.c:139
+#: ../cli/src/nmcli.c:151
 #, c-format
 msgid "Error: Option '--terse' is specified the second time."
-msgstr "Errore: l'opzione \"--terse\" è stata specificata una seconda volta."
+msgstr "Errore: l'opzione «--terse» è stata specificata una seconda volta."
 
-#: ../cli/src/nmcli.c:144
+#: ../cli/src/nmcli.c:156
 #, c-format
 msgid "Error: Option '--terse' is mutually exclusive with '--pretty'."
-msgstr "Errore: l'opzione \"--terse\" si esclude con \"--pretty\"."
+msgstr "Errore: l'opzione «--terse» si esclude con «--pretty»."
 
-#: ../cli/src/nmcli.c:152
+#: ../cli/src/nmcli.c:164
 #, c-format
 msgid "Error: Option '--pretty' is specified the second time."
-msgstr "Errore: l'opzione \"--pretty\" è stata specificata una seconda volta."
+msgstr "Errore: l'opzione «--pretty» è stata specificata una seconda volta."
 
-#: ../cli/src/nmcli.c:157
+#: ../cli/src/nmcli.c:169
 #, c-format
 msgid "Error: Option '--pretty' is mutually exclusive with '--terse'."
-msgstr "Errore: l'opzione \"--pretty\" si esclude con \"--terse\"."
+msgstr "Errore: l'opzione «--pretty» si esclude con «--terse»."
 
-#: ../cli/src/nmcli.c:167 ../cli/src/nmcli.c:183
+#: ../cli/src/nmcli.c:179 ../cli/src/nmcli.c:195
 #, c-format
 msgid "Error: missing argument for '%s' option."
-msgstr "Errore: manca l'argomento per l'opzione \"%s\"."
+msgstr "Errore: manca l'argomento per l'opzione «%s»."
 
-#: ../cli/src/nmcli.c:176 ../cli/src/nmcli.c:192
+#: ../cli/src/nmcli.c:188 ../cli/src/nmcli.c:204
 #, c-format
 msgid "Error: '%s' is not valid argument for '%s' option."
-msgstr "Errore: \"%s\" non è un argomento valido per l'opzione \"%s\"."
+msgstr "Errore: \"%s\" non è un argomento valido per l'opzione «%s»."
 
-#: ../cli/src/nmcli.c:199
+#: ../cli/src/nmcli.c:211
 #, c-format
 msgid "Error: fields for '%s' options are missing."
-msgstr "Errore: mancano i campi per le opzioni \"%s\"."
+msgstr "Errore: mancano i campi per le opzioni «%s»."
 
-#: ../cli/src/nmcli.c:207
+#: ../cli/src/nmcli.c:219
 #, c-format
 msgid "nmcli tool, version %s\n"
 msgstr "Strumento nmcli, versione %s\n"
 
-#: ../cli/src/nmcli.c:213
+#: ../cli/src/nmcli.c:225
 #, c-format
 msgid "Error: Option '%s' is unknown, try 'nmcli -help'."
-msgstr "Errore: l'opzione \"%s\" è sconosciuta, provare \"nmcli -help\"."
+msgstr "Errore: l'opzione «%s» è sconosciuta, provare «nmcli -help»."
 
-#: ../cli/src/nmcli.c:232
+#: ../cli/src/nmcli.c:244
 #, c-format
 msgid "Caught signal %d, shutting down..."
-msgstr "Intercettato segnale %d, arresto in corso"
+msgstr "Intercettato segnale %d, arresto in corso."
 
-#: ../cli/src/nmcli.c:257
+#: ../cli/src/nmcli.c:269
 msgid "Error: Could not create NMClient object."
 msgstr "Errore: impossibile creare l'oggetto NMClient."
 
-#: ../cli/src/nmcli.c:273
+#: ../cli/src/nmcli.c:285
 msgid "Success"
 msgstr "Successo"
 
-#: ../cli/src/settings.c:447
+#: ../cli/src/settings.c:519
 #, c-format
 msgid "%d (hex-ascii-key)"
 msgstr "%d (hex-ascii-key)"
 
-#: ../cli/src/settings.c:449
+#: ../cli/src/settings.c:521
 #, c-format
 msgid "%d (104/128-bit passphrase)"
 msgstr "%d (frase di accesso a 104/128-bit)"
 
-#: ../cli/src/settings.c:452
+#: ../cli/src/settings.c:524 ../cli/src/settings.c:652
 #, c-format
 msgid "%d (unknown)"
 msgstr "%d (sconosciuto)"
 
-#: ../cli/src/settings.c:478
+#: ../cli/src/settings.c:550
 msgid "0 (unknown)"
 msgstr "0 (sconosciuto)"
 
-#: ../cli/src/settings.c:484
+#: ../cli/src/settings.c:556
 msgid "any, "
 msgstr "qualsiasi, "
 
-#: ../cli/src/settings.c:486
+#: ../cli/src/settings.c:558
 msgid "900 MHz, "
 msgstr "900 MHz, "
 
-#: ../cli/src/settings.c:488
+#: ../cli/src/settings.c:560
 msgid "1800 MHz, "
 msgstr "1800 MHz, "
 
-#: ../cli/src/settings.c:490
+#: ../cli/src/settings.c:562
 msgid "1900 MHz, "
 msgstr "1900 MHz, "
 
-#: ../cli/src/settings.c:492
+#: ../cli/src/settings.c:564
 msgid "850 MHz, "
 msgstr "850 MHz, "
 
-#: ../cli/src/settings.c:494
+#: ../cli/src/settings.c:566
 msgid "WCDMA 3GPP UMTS 2100 MHz, "
 msgstr "WCDMA 3GPP UMTS 2100 MHz, "
 
-#: ../cli/src/settings.c:496
+#: ../cli/src/settings.c:568
 msgid "WCDMA 3GPP UMTS 1800 MHz, "
 msgstr "WCDMA 3GPP UMTS 1800 MHz, "
 
-#: ../cli/src/settings.c:498
+#: ../cli/src/settings.c:570
 msgid "WCDMA 3GPP UMTS 1700/2100 MHz, "
 msgstr "WCDMA 3GPP UMTS 1700/2100 MHz, "
 
-#: ../cli/src/settings.c:500
+#: ../cli/src/settings.c:572
 msgid "WCDMA 3GPP UMTS 800 MHz, "
 msgstr "WCDMA 3GPP UMTS 800 MHz, "
 
-#: ../cli/src/settings.c:502
+#: ../cli/src/settings.c:574
 msgid "WCDMA 3GPP UMTS 850 MHz, "
 msgstr "WCDMA 3GPP UMTS 850 MHz, "
 
-#: ../cli/src/settings.c:504
+#: ../cli/src/settings.c:576
 msgid "WCDMA 3GPP UMTS 900 MHz, "
 msgstr "WCDMA 3GPP UMTS 900 MHz, "
 
-#: ../cli/src/settings.c:506
+#: ../cli/src/settings.c:578
 msgid "WCDMA 3GPP UMTS 1700 MHz, "
 msgstr "WCDMA 3GPP UMTS 1700 MHz, "
 
-#: ../cli/src/settings.c:508
+#: ../cli/src/settings.c:580
 msgid "WCDMA 3GPP UMTS 1900 MHz, "
 msgstr "WCDMA 3GPP UMTS 1900 MHz, "
 
-#: ../cli/src/settings.c:510
+#: ../cli/src/settings.c:582
 msgid "WCDMA 3GPP UMTS 2600 MHz, "
 msgstr "WCDMA 3GPP UMTS 2600 MHz, "
 
-#: ../cli/src/settings.c:636 ../cli/src/settings.c:835
+#: ../cli/src/settings.c:600
+msgid "0 (NONE)"
+msgstr "0 (NESSUNO)"
+
+#: ../cli/src/settings.c:606
+msgid "REORDER_HEADERS, "
+msgstr "REORDER_HEADERS, "
+
+#: ../cli/src/settings.c:608
+msgid "GVRP, "
+msgstr "GVRP, "
+
+#: ../cli/src/settings.c:610
+msgid "LOOSE_BINDING, "
+msgstr "LOOSE_BINDING, "
+
+#: ../cli/src/settings.c:646
+#, c-format
+msgid "%d (disabled)"
+msgstr "%d (disabilitato)"
+
+#: ../cli/src/settings.c:648
+#, c-format
+msgid "%d (enabled, prefer public IP)"
+msgstr "%d (abilitato, preferire IP pubblico)"
+
+#: ../cli/src/settings.c:650
+#, c-format
+msgid "%d (enabled, prefer temporary IP)"
+msgstr "%d (abilitato, preferire IP temporaneo)"
+
+#: ../cli/src/settings.c:768 ../cli/src/settings.c:964
+#: ../cli/src/settings.c:1673
 msgid "auto"
 msgstr "auto"
 
-#: ../cli/src/settings.c:829 ../cli/src/settings.c:832
-#: ../cli/src/settings.c:833 ../cli/src/utils.c:176
-msgid "not set"
-msgstr "non impostato"
+#: ../cli/src/utils.c:103
+#, c-format
+msgid "Error converting IP4 address '0x%X' to text form"
+msgstr "Errore nel convertire l'indirizzo IP4 «0x%X» in formato testuale"
+
+#: ../cli/src/utils.c:131
+#, c-format
+msgid "Error converting IP6 address '%s' to text form"
+msgstr "Errore nel convertire l'indirizzo IP6 «%s» in formato testuale"
 
-#: ../cli/src/utils.c:128
+#: ../cli/src/utils.c:232
 #, c-format
 msgid "field '%s' has to be alone"
-msgstr "il campo \"%s\" deve essere isolato"
+msgstr "il campo «%s» deve essere isolato"
 
-#: ../cli/src/utils.c:131
+#: ../cli/src/utils.c:235
 #, c-format
 msgid "invalid field '%s'"
-msgstr "campo \"%s\" non valido"
+msgstr "campo «%s» non valido"
 
-#: ../cli/src/utils.c:150
-#, c-format
+#: ../cli/src/utils.c:254
 msgid "Option '--terse' requires specifying '--fields'"
-msgstr "Con l'opzione \"--terse\" è necessario specificare \"--fields\""
+msgstr "Con l'opzione «--terse» è necessario specificare «--fields»"
 
-#: ../cli/src/utils.c:154
+#: ../cli/src/utils.c:258
 #, c-format
 msgid "Option '--terse' requires specific '--fields' option values , not '%s'"
 msgstr ""
-"L'opzione \"--terse\" necessita valori dell'opzione \"--fields\" specifici, "
-"non \"%s\""
+"L'opzione «--terse» richiede valori specifici dell'opzione «--fields», non "
+"«%s»"
 
-#: ../cli/src/utils.c:334
+#: ../cli/src/utils.c:468
 #, c-format
 msgid "Error: Couldn't create D-Bus object proxy for org.freedesktop.DBus"
 msgstr ""
 "Errore: impossibile creare l'oggetto proxy D-Bus per org.freedesktop.DBus"
 
-#: ../cli/src/utils.c:342
+#: ../cli/src/utils.c:476
 #, c-format
 msgid "Error: NameHasOwner request failed: %s"
 msgstr "Errore: richiesta NameHasOwner non riuscita: %s"
 
-#: ../cli/src/utils.c:387
+#: ../cli/src/utils.c:521
 #, c-format
 msgid ""
 "Warning: nmcli (%s) and NetworkManager (%s) versions don't match. Use --"
@@ -1426,7 +1919,7 @@ msgstr ""
 "Attenzione: le versioni di nmcli (%s) e NetworkManager (%s) non "
 "corrispondono. Usare --nocheck per disabilitare questo avviso.\n"
 
-#: ../cli/src/utils.c:396
+#: ../cli/src/utils.c:530
 #, c-format
 msgid ""
 "Error: nmcli (%s) and NetworkManager (%s) versions don't match. Force "
@@ -1439,7 +1932,7 @@ msgstr ""
 #: ../libnm-util/crypto.c:133
 #, c-format
 msgid "PEM key file had no end tag '%s'."
-msgstr "Il file di chiave PEM non ha il tag di chiusura \"%s\""
+msgstr "Il file di chiave PEM non ha il tag di chiusura «%s»."
 
 #: ../libnm-util/crypto.c:146
 #, c-format
@@ -1459,7 +1952,7 @@ msgstr "File PEM malformato: Proc-Type non è il primo tag."
 #: ../libnm-util/crypto.c:178
 #, c-format
 msgid "Malformed PEM file: unknown Proc-Type tag '%s'."
-msgstr "File PEM malformato: tag Proc-Type \"%s\" sconosciuto."
+msgstr "File PEM malformato: tag Proc-Type «%s» sconosciuto."
 
 #: ../libnm-util/crypto.c:188
 #, c-format
@@ -1479,7 +1972,7 @@ msgstr "File PEM malformato: formato di IV nel tag DEK-Info non valido."
 #: ../libnm-util/crypto.c:219
 #, c-format
 msgid "Malformed PEM file: unknown private key cipher '%s'."
-msgstr "File PEM malformato: cifrario chiave privata \"%s\" sconosciuto."
+msgstr "File PEM malformato: cifrario chiave privata «%s» sconosciuto."
 
 #: ../libnm-util/crypto.c:238
 #, c-format
@@ -1493,7 +1986,7 @@ msgstr "Tag di apertura PKCS#8 atteso non trovato."
 #: ../libnm-util/crypto.c:292
 #, c-format
 msgid "Failed to find expected PKCS#8 end tag '%s'."
-msgstr "Tag di chiusura PKCS#8 \"%s\" atteso non trovato."
+msgstr "Tag di chiusura PKCS#8 «%s» atteso non trovato."
 
 #: ../libnm-util/crypto.c:312
 msgid "Not enough memory to store private key data."
@@ -1501,7 +1994,7 @@ msgstr "Memoria insufficiente per archiviare i dati della chiave privata."
 
 #: ../libnm-util/crypto.c:317
 msgid "Failed to decode PKCS#8 private key."
-msgstr "Decodifica della chiave private PKCS#8 non riuscita."
+msgstr "Decodifica della chiave privata PKCS#8 non riuscita."
 
 #: ../libnm-util/crypto.c:339 ../libnm-util/crypto.c:625
 #, c-format
@@ -1528,7 +2021,7 @@ msgstr "IV contiene cifre non esadecimali."
 #: ../libnm-util/crypto_nss.c:332
 #, c-format
 msgid "Private key cipher '%s' was unknown."
-msgstr "Il cifrario di chiave privata \"%s\" è sconosciuto."
+msgstr "Il cifrario di chiave privata «%s» è sconosciuto."
 
 #: ../libnm-util/crypto.c:432
 #, c-format
@@ -1548,12 +2041,12 @@ msgstr "Impossibile stabilire il tipo di chiave privata."
 #: ../libnm-util/crypto.c:597
 #, c-format
 msgid "PEM certificate had no start tag '%s'."
-msgstr "Il certificato PEM non ha il tag di apertura \"%s\"."
+msgstr "Il certificato PEM non ha il tag di apertura «%s»."
 
 #: ../libnm-util/crypto.c:606
 #, c-format
 msgid "PEM certificate had no end tag '%s'."
-msgstr "Il certificato PEM non ha il tag di chiusura \"%s\"."
+msgstr "Il certificato PEM non ha il tag di chiusura «%s»."
 
 #: ../libnm-util/crypto.c:630
 #, c-format
@@ -1572,7 +2065,7 @@ msgstr "Inizializzazione del motore MD5 non riuscita: %s / %s"
 #: ../libnm-util/crypto_gnutls.c:155
 #, c-format
 msgid "Invalid IV length (must be at least %zd)."
-msgstr "Lunghezza IV non valida (deve avere almento %zd)."
+msgstr "Lunghezza di IV non valida (deve essere almeno %zd)."
 
 #: ../libnm-util/crypto_gnutls.c:164 ../libnm-util/crypto_nss.c:184
 #, c-format
@@ -1605,8 +2098,8 @@ msgstr "Decifrazione della chiave privata non riuscita: %s / %s."
 #, c-format
 msgid "Failed to decrypt the private key: unexpected padding length."
 msgstr ""
-"Impossibile decifrare la chiave privata: lunghezza spazio di riempimento non "
-"previsto."
+"Impossibile decifrare la chiave privata: lunghezza non prevista dello spazio "
+"di riempimento."
 
 #: ../libnm-util/crypto_gnutls.c:220 ../libnm-util/crypto_nss.c:274
 #, c-format
@@ -1784,119 +2277,122 @@ msgstr "Impossibile verificare il file PKCS#12: %d"
 
 #: ../libnm-util/crypto_nss.c:568
 msgid "Could not generate random data."
-msgstr "Impossibile generare dati randomici."
+msgstr "Impossibile generare dati casuali."
 
-#: ../libnm-util/nm-utils.c:2000
+#: ../libnm-util/nm-utils.c:2040
 #, c-format
 msgid "Not enough memory to make encryption key."
 msgstr "Memoria insufficiente per creare la chiave di cifratura."
 
-#: ../libnm-util/nm-utils.c:2110
+#: ../libnm-util/nm-utils.c:2150
 msgid "Could not allocate memory for PEM file creation."
 msgstr "Impossibile assegnare memoria per la creazione del file PEM."
 
-#: ../libnm-util/nm-utils.c:2122
+#: ../libnm-util/nm-utils.c:2162
 #, c-format
 msgid "Could not allocate memory for writing IV to PEM file."
 msgstr "Impossibile assegnare memoria per la scrittura di IV sul file PEM."
 
-#: ../libnm-util/nm-utils.c:2134
+#: ../libnm-util/nm-utils.c:2174
 #, c-format
 msgid "Could not allocate memory for writing encrypted key to PEM file."
 msgstr ""
 "Impossibile assegnare memoria per la scrittura della chiave cifrata sul file "
 "PEM."
 
-#: ../libnm-util/nm-utils.c:2153
+#: ../libnm-util/nm-utils.c:2193
 #, c-format
 msgid "Could not allocate memory for PEM file data."
 msgstr "Impossibile assegnare memoria per i dati del file PEM."
 
 #: ../policy/org.freedesktop.NetworkManager.policy.in.h:1
-msgid "Allow control of network connections"
-msgstr "Permettere il controllo delle connessioni di rete"
+msgid "Enable or disable system networking"
+msgstr "Abilita o disabilita la rete di sistema"
 
+# [NdT] si tratta di un messaggio che descrive un'azione
 #: ../policy/org.freedesktop.NetworkManager.policy.in.h:2
-msgid "Connection sharing via a protected WiFi network"
-msgstr "Condivisione della connessione attraverso una rete WiFi protetta"
+msgid "System policy prevents enabling or disabling system networking"
+msgstr ""
+"La politica di sistema impedisce di abilitare o disabilitare la rete di "
+"sistema"
 
 #: ../policy/org.freedesktop.NetworkManager.policy.in.h:3
-msgid "Connection sharing via an open WiFi network"
-msgstr "Condivisione della connessione attraverso una rete WiFi aperta"
+msgid ""
+"Put NetworkManager to sleep or wake it up (should only be used by system "
+"power management)"
+msgstr ""
+"Sospendere o riattivare NetworkManager (dovrebbe essere usato solo dalla "
+"gestione dell'alimentazione di sistema)"
 
 #: ../policy/org.freedesktop.NetworkManager.policy.in.h:4
-msgid "Enable or disable WiFi devices"
-msgstr "Abilitare o disabilitare i dispositivi WiFi"
+msgid "System policy prevents putting NetworkManager to sleep or waking it up"
+msgstr ""
+"La politica di sistema impedisce di sospendere e riattivare NetworkManager"
 
 #: ../policy/org.freedesktop.NetworkManager.policy.in.h:5
-msgid "Enable or disable WiMAX mobile broadband devices"
-msgstr "Abilitare o disabilitare dispositivi WiMAX a banda larga mobile"
+msgid "Enable or disable WiFi devices"
+msgstr "Abilita o disabilita i dispositivi Wi-Fi"
 
+# [NdT] si tratta di un messaggio che descrive un'azione
 #: ../policy/org.freedesktop.NetworkManager.policy.in.h:6
-msgid "Enable or disable mobile broadband devices"
-msgstr "Abilitare o disabilitare i dispositivi a banda larga mobile"
+msgid "System policy prevents enabling or disabling WiFi devices"
+msgstr ""
+"La politica di sistema impedisce di abilitare o disabilitare i dispositivi "
+"Wi-Fi"
 
 #: ../policy/org.freedesktop.NetworkManager.policy.in.h:7
-msgid "Enable or disable system networking"
-msgstr "Abilitare o disabilitare la rete di sistema"
+msgid "Enable or disable mobile broadband devices"
+msgstr "Abilita o disabilita i dispositivi a banda larga mobile"
 
 #: ../policy/org.freedesktop.NetworkManager.policy.in.h:8
-msgid "Modify network connections for all users"
-msgstr "Modifica le connessioni di sistema per tutti gli utenti"
+msgid "System policy prevents enabling or disabling mobile broadband devices"
+msgstr ""
+"La politica di sistema impedisce di abilitare o disabilitare i dispositivi a "
+"banda larga mobile"
 
 #: ../policy/org.freedesktop.NetworkManager.policy.in.h:9
-msgid "Modify persistent system hostname"
-msgstr "Modificare il nome host persistente del sistema"
+msgid "Enable or disable WiMAX mobile broadband devices"
+msgstr "Abilita o disabilita i dispositivi WiMAX a banda larga mobile"
 
 #: ../policy/org.freedesktop.NetworkManager.policy.in.h:10
-msgid "Modify personal network connections"
-msgstr "Modificare le connessioni personali"
-
-#: ../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)"
+"System policy prevents enabling or disabling WiMAX mobile broadband devices"
 msgstr ""
-"Sospendere o riattivare NetworkManager (dovrebbe essere usato solo dalla "
-"gestione alimentazione di sistema)"
+"La politica di sistema impedisce di abilitare o disabilitare i dispositivi "
+"WiMAX a banda larga mobile"
+
+#: ../policy/org.freedesktop.NetworkManager.policy.in.h:11
+msgid "Allow control of network connections"
+msgstr "Permettere il controllo delle connessioni di rete"
 
 # [NdT] si tratta di un messaggio che descrive un'azione
 #: ../policy/org.freedesktop.NetworkManager.policy.in.h:12
 msgid "System policy prevents control of network connections"
 msgstr "La politica di sistema impedisce di controllare le connessioni di rete"
 
-# [NdT] si tratta di un messaggio che descrive un'azione
 #: ../policy/org.freedesktop.NetworkManager.policy.in.h:13
-msgid "System policy prevents enabling or disabling WiFi devices"
-msgstr ""
-"La politica di sistema impedisce di abilitare o disabilitare i dispositivi "
-"WiFi"
+msgid "Connection sharing via a protected WiFi network"
+msgstr "Condivisione della connessione attraverso una rete Wi-Fi protetta"
 
 #: ../policy/org.freedesktop.NetworkManager.policy.in.h:14
-msgid ""
-"System policy prevents enabling or disabling WiMAX mobile broadband devices"
+msgid "System policy prevents sharing connections via a protected WiFi network"
 msgstr ""
-"La politica di sistema impedisce di abilitare o disabilitare i dispositivi "
-"WiMAX a banda larga mobile"
+"La politica di sistema impedisce di condividere connessioni attraverso una "
+"rete Wi-Fi protetta"
 
 #: ../policy/org.freedesktop.NetworkManager.policy.in.h:15
-msgid "System policy prevents enabling or disabling mobile broadband devices"
-msgstr ""
-"La politica di sistema impedisce di abilitare o disabilitare i dispositivi a "
-"banda larga mobile"
+msgid "Connection sharing via an open WiFi network"
+msgstr "Condivisione della connessione attraverso una rete Wi-Fi aperta"
 
-# [NdT] si tratta di un messaggio che descrive un'azione
 #: ../policy/org.freedesktop.NetworkManager.policy.in.h:16
-msgid "System policy prevents enabling or disabling system networking"
+msgid "System policy prevents sharing connections via an open WiFi network"
 msgstr ""
-"La politica di sistema impedisce di abilitare o disabilitare la rete di "
-"sistema"
+"La politica di sistema impedisce di condividere connessioni attraverso una "
+"rete Wi-Fi aperta"
 
 #: ../policy/org.freedesktop.NetworkManager.policy.in.h:17
-msgid "System policy prevents modification of network settings for all users"
-msgstr ""
-"La politica di sistema impedisce di modificare le impostazioni di rete per "
-"tutti gli utenti"
+msgid "Modify personal network connections"
+msgstr "Modifica le connessioni personali"
 
 #: ../policy/org.freedesktop.NetworkManager.policy.in.h:18
 msgid "System policy prevents modification of personal network settings"
@@ -1905,40 +2401,190 @@ msgstr ""
 "personali"
 
 #: ../policy/org.freedesktop.NetworkManager.policy.in.h:19
+msgid "Modify network connections for all users"
+msgstr "Modifica le connessioni di sistema per tutti gli utenti"
+
+#: ../policy/org.freedesktop.NetworkManager.policy.in.h:20
+msgid "System policy prevents modification of network settings for all users"
+msgstr ""
+"La politica di sistema impedisce di modificare le impostazioni di rete per "
+"tutti gli utenti"
+
+#: ../policy/org.freedesktop.NetworkManager.policy.in.h:21
+msgid "Modify persistent system hostname"
+msgstr "Modificare il nome host persistente del sistema"
+
+#: ../policy/org.freedesktop.NetworkManager.policy.in.h:22
 msgid "System policy prevents modification of the persistent system hostname"
 msgstr ""
 "La politica di sistema impedisce di modificare il nome host persistente del "
 "sistema"
 
-#: ../policy/org.freedesktop.NetworkManager.policy.in.h:20
-msgid "System policy prevents putting NetworkManager to sleep or waking it up"
-msgstr ""
-"La politica di sistema impedisce di sospendere e riattivare NetworkManager"
+#: ../src/main.c:158
+#, c-format
+msgid "Failed to set signal mask: %d"
+msgstr "Impostazione della maschera di segnale non riuscita: %d"
 
-#: ../policy/org.freedesktop.NetworkManager.policy.in.h:21
-msgid "System policy prevents sharing connections via a protected WiFi network"
+#: ../src/main.c:167
+#, c-format
+msgid "Failed to create signal handling thread: %d"
+msgstr "Creazione del thread per la gestione del segnale non riuscita: %d"
+
+#: ../src/main.c:182
+#, c-format
+msgid "Opening %s failed: %s\n"
+msgstr "Apertura di %s non riuscita: %s\n"
+
+#: ../src/main.c:188
+#, c-format
+msgid "Writing to %s failed: %s\n"
+msgstr "Scrittura su %s non riuscita: %s\n"
+
+#: ../src/main.c:193
+#, c-format
+msgid "Closing %s failed: %s\n"
+msgstr "Chiusura di %s non riuscita: %s\n"
+
+#: ../src/main.c:236
+#, c-format
+msgid "NetworkManager is already running (pid %ld)\n"
+msgstr "NetworkManager è già in esecuzione (pid %ld)\n"
+
+#: ../src/main.c:376
+msgid "Print NetworkManager version and exit"
+msgstr "Stampa la versione di NetworkManager ed esce"
+
+#: ../src/main.c:377
+msgid "Don't become a daemon"
+msgstr "Non si avvia in modalità demone"
+
+#: ../src/main.c:378
+msgid "Make all warnings fatal"
+msgstr "Rende tutti gli avvisi fatali"
+
+#: ../src/main.c:379
+msgid "Specify the location of a PID file"
+msgstr "Specifica la posizione di un file PID"
+
+#: ../src/main.c:379
+msgid "filename"
+msgstr "nomefile"
+
+#: ../src/main.c:380
+msgid "State file location"
+msgstr "Posizione file di stato"
+
+#: ../src/main.c:380
+msgid "/path/to/state.file"
+msgstr "/percorso/a/file.di.stato"
+
+#: ../src/main.c:381
+msgid "Config file location"
+msgstr "Posizione file di configurazione"
+
+#: ../src/main.c:381
+msgid "/path/to/config.file"
+msgstr "/percorso/a/file.di.config"
+
+#: ../src/main.c:382
+msgid "List of plugins separated by ','"
+msgstr "Elenco di plugin separati da virgole"
+
+#: ../src/main.c:382
+msgid "plugin1,plugin2"
+msgstr "plugin1,plugin2"
+
+#. Translators: Do not translate the values in the square brackets
+#: ../src/main.c:384
+msgid "Log level: one of [ERR, WARN, INFO, DEBUG]"
+msgstr "Livello di registrazione, uno di [ERR, WARN, INFO, DEBUG]"
+
+#. Translators: Do not translate the values in the square brackets
+#: ../src/main.c:387
+msgid ""
+"Log domains separated by ',': any combination of\n"
+"                                                [NONE,HW,RFKILL,ETHER,WIFI,"
+"BT,MB,DHCP4,DHCP6,PPP,\n"
+"                                                 WIFI_SCAN,IP4,IP6,AUTOIP4,"
+"DNS,VPN,SHARING,SUPPLICANT,\n"
+"                                                 AGENTS,SETTINGS,SUSPEND,"
+"CORE,DEVICE,OLPC,WIMAX,\n"
+"                                                 INFINIBAND,FIREWALL,ADSL]"
 msgstr ""
-"La politica di sistema impedisce di condividere connessioni attraverso una "
-"rete WiFi protetta"
+"Domini di registrazione separati da virgole, qualsiasi combinazione di\n"
+"                                                [NONE,HW,RFKILL,ETHER,WIFI,"
+"BT,MB,DHCP4,DHCP6,PPP,\n"
+"                                                 WIFI_SCAN,IP4,IP6,AUTOIP4,"
+"DNS,VPN,SHARING,SUPPLICANT,\n"
+"                                                 AGENTS,SETTINGS,SUSPEND,"
+"CORE,DEVICE,OLPC,WIMAX,\n"
+"                                                 INFINIBAND,FIREWALL,ADSL]"
 
-#: ../policy/org.freedesktop.NetworkManager.policy.in.h:22
-msgid "System policy prevents sharing connections via an open WiFi network"
+#: ../src/main.c:393
+msgid "An http(s) address for checking internet connectivity"
+msgstr "Un indirizzo HTTP(S) per verificare la connessione"
+
+#: ../src/main.c:394
+msgid "The interval between connectivity checks (in seconds)"
+msgstr "L'intervallo tra i controlli di connettività (in secondi)"
+
+#: ../src/main.c:395
+msgid "The expected start of the response"
+msgstr "L'inizio atteso della risposta"
+
+#: ../src/main.c:395
+msgid "Bingo!"
+msgstr "Bingo!"
+
+#: ../src/main.c:400
+#, c-format
+msgid "GModules are not supported on your platform!\n"
+msgstr "GModules non supportati su questa piattaforma.\n"
+
+#: ../src/main.c:423
+msgid ""
+"NetworkManager monitors all network connections and automatically\n"
+"chooses the best connection to use.  It also allows the user to\n"
+"specify wireless access points which wireless cards in the computer\n"
+"should associate with."
 msgstr ""
-"La politica di sistema impedisce di condividere connessioni attraverso una "
-"rete WiFi aperta"
+"NetworkManager controlla tutte le connessioni di rete e\n"
+"sceglie automaticamente la migliore da usare. Consente agli\n"
+"utenti di specificare l'access point Wi-Fi e quale scheda\n"
+"Wi-Fi del computer associarvi."
 
-#: ../src/main.c:476
+#: ../src/main.c:429
 #, c-format
 msgid "Invalid option.  Please use --help to see a list of valid options.\n"
 msgstr ""
 "Opzione non valida. Usare --help per ottenere un elenco delle opzioni "
 "valide.\n"
 
-#: ../src/main.c:517
+#: ../src/main.c:439
+#, c-format
+msgid "You must be root to run NetworkManager!\n"
+msgstr "È necessario essere root per eseguire NetworkManager.\n"
+
+#: ../src/main.c:460
+#, c-format
+msgid "Failed to read configuration: (%d) %s\n"
+msgstr "Lettura della configurazione non riuscita: (%d) %s\n"
+
+#: ../src/main.c:471
 #, c-format
 msgid "%s.  Please use --help to see a list of valid options.\n"
 msgstr "%s. Usare --help per ottenere un elenco di opzioni valide.\n"
 
+#: ../src/main.c:478
+#, c-format
+msgid "State file %s parsing failed: (%d) %s\n"
+msgstr "Analisi del file di stato %s non riuscita: (%d) %s\n"
+
+#: ../src/main.c:495
+#, c-format
+msgid "Could not daemonize: %s [error %u]\n"
+msgstr "Impossibile avviare come demone: %s [errore %u]\n"
+
 #: ../src/dhcp-manager/nm-dhcp-dhclient-utils.c:62
 msgid "# Created by NetworkManager\n"
 msgstr "# Creato da NetworkManager\n"
@@ -1952,167 +2598,182 @@ msgstr ""
 "# Unito da %s\n"
 "\n"
 
-#: ../src/dhcp-manager/nm-dhcp-manager.c:284
+#: ../src/dhcp-manager/nm-dhcp-manager.c:266
 msgid "no usable DHCP client could be found."
 msgstr "non è stato trovato alcun client DHCP utilizzabile."
 
-#: ../src/dhcp-manager/nm-dhcp-manager.c:293
+#: ../src/dhcp-manager/nm-dhcp-manager.c:275
 msgid "'dhclient' could be found."
-msgstr "è stato trovato \"dhclient\"."
+msgstr "è stato trovato «dhclient»."
 
-#: ../src/dhcp-manager/nm-dhcp-manager.c:303
+#: ../src/dhcp-manager/nm-dhcp-manager.c:285
 msgid "'dhcpcd' could be found."
-msgstr "è stato trovato \"dhcpcd\"."
+msgstr "è stato trovato «dhcpcd»."
 
-#: ../src/dhcp-manager/nm-dhcp-manager.c:311
+#: ../src/dhcp-manager/nm-dhcp-manager.c:293
 #, c-format
 msgid "unsupported DHCP client '%s'"
-msgstr "client DHCP \"%s\" non supportato"
+msgstr "client DHCP «%s» non supportato"
 
-#: ../src/dns-manager/nm-dns-manager.c:376
+#: ../src/dns-manager/nm-dns-manager.c:380
 msgid "NOTE: the libc resolver may not support more than 3 nameservers."
 msgstr "Nota: il risolutore libc non supporta più di tre server di nomi."
 
-#: ../src/dns-manager/nm-dns-manager.c:378
+#: ../src/dns-manager/nm-dns-manager.c:382
 msgid "The nameservers listed below may not be recognized."
 msgstr "I server di nomi elencati sotto non possono essere riconosciuti."
 
-#: ../src/logging/nm-logging.c:152
+#: ../src/logging/nm-logging.c:131
 #, c-format
 msgid "Unknown log level '%s'"
-msgstr "Livello di registrazione \"%s\" sconosciuto"
+msgstr "Livello di registrazione «%s» sconosciuto"
 
-#: ../src/logging/nm-logging.c:177
+#: ../src/logging/nm-logging.c:156
 #, c-format
 msgid "Unknown log domain '%s'"
-msgstr "Dominio di registrazione \"%s\" sconosciuto"
+msgstr "Dominio di registrazione «%s» sconosciuto"
 
-#: ../src/modem-manager/nm-modem-cdma.c:296 ../src/nm-device-bt.c:355
+#: ../src/modem-manager/nm-modem-cdma.c:281 ../src/nm-device-bt.c:351
 #, c-format
 msgid "CDMA connection %d"
 msgstr "Connessione CDMA %d"
 
-#: ../src/modem-manager/nm-modem-gsm.c:499 ../src/nm-device-bt.c:351
+#: ../src/modem-manager/nm-modem-gsm.c:549 ../src/nm-device-bt.c:347
 #, c-format
 msgid "GSM connection %d"
 msgstr "Connessione GSM %d"
 
-#: ../src/nm-device-bt.c:326
+# [NdT] si tratta di un messaggio che descrive un'azione
+#: ../src/nm-device-bond.c:191
+#, c-format
+msgid "Bond connection %d"
+msgstr "Connessione aggregata %d"
+
+#: ../src/nm-device-adsl.c:193
+#, c-format
+msgid "ADSL connection %d"
+msgstr "Connessione ADSL %d"
+
+#: ../src/nm-device-bt.c:322
 #, c-format
 msgid "PAN connection %d"
 msgstr "Connessione PAN %d"
 
-#: ../src/nm-device-bt.c:359
+#: ../src/nm-device-bt.c:355
 #, c-format
 msgid "DUN connection %d"
 msgstr "Connessione DUN %d"
 
-#: ../src/nm-device-ethernet.c:1724
+#: ../src/nm-device-ethernet.c:1327
 #, c-format
 msgid "PPPoE connection %d"
 msgstr "Connessione PPPoE %d"
 
 # [NdT] si tratta di un messaggio che descrive un'azione
-#: ../src/nm-device-ethernet.c:1724 ../src/settings/nm-settings-utils.c:50
+#: ../src/nm-device-ethernet.c:1327 ../src/settings/nm-settings-utils.c:50
 #, c-format
 msgid "Wired connection %d"
 msgstr "Connessione via cavo %d"
 
-#: ../src/nm-device-olpc-mesh.c:393
+# [NdT] si tratta di un messaggio che descrive un'azione
+#: ../src/nm-device-infiniband.c:303
+#, c-format
+msgid "InfiniBand connection %d"
+msgstr "Connessione InfiniBand %d"
+
+#: ../src/nm-device-olpc-mesh.c:303
 #, c-format
 msgid "Mesh %d"
 msgstr "Mesh %d"
 
-#: ../src/nm-manager.c:669
+#: ../src/nm-device-vlan.c:362
+#, c-format
+msgid "VLAN connection %d"
+msgstr "Connessione VLAN %d"
+
+#: ../src/nm-manager.c:661
 #, c-format
 msgid "VPN connection %d"
 msgstr "Connessione VPN %d"
 
-#: ../src/nm-netlink-monitor.c:101 ../src/nm-netlink-monitor.c:234
-#: ../src/nm-netlink-monitor.c:661
+#: ../src/nm-netlink-monitor.c:148 ../src/nm-netlink-monitor.c:272
+#: ../src/nm-netlink-monitor.c:695
 #, c-format
 msgid "error processing netlink message: %s"
 msgstr "errore nell'elaborare il messaggio netlink: %s"
 
-#: ../src/nm-netlink-monitor.c:216
+#: ../src/nm-netlink-monitor.c:251
 msgid "error occurred while waiting for data on socket"
 msgstr "si è verificato un errore durante l'attesa dei dati sul socket"
 
-#: ../src/nm-netlink-monitor.c:260
+#: ../src/nm-netlink-monitor.c:296
 #, c-format
 msgid "unable to connect to netlink for monitoring link status: %s"
 msgstr ""
 "impossibile collegarsi a netlink per monitorare lo stato del collegamento: %s"
 
-#: ../src/nm-netlink-monitor.c:271
+#: ../src/nm-netlink-monitor.c:307
 #, c-format
 msgid "unable to enable netlink handle credential passing: %s"
 msgstr ""
 "impossibile abilitare il passaggio delle credenziali handle netlink: %s"
 
-#: ../src/nm-netlink-monitor.c:294 ../src/nm-netlink-monitor.c:354
+#: ../src/nm-netlink-monitor.c:330 ../src/nm-netlink-monitor.c:390
 #, c-format
 msgid "unable to allocate netlink handle for monitoring link status: %s"
 msgstr ""
 "impossibile allocare un handle netlink per monitorare lo stato del "
 "collegamento: %s"
 
-#: ../src/nm-netlink-monitor.c:379
+#: ../src/nm-netlink-monitor.c:415
 #, c-format
 msgid "unable to allocate netlink link cache for monitoring link status: %s"
 msgstr ""
 "impossibile allocare la cache dei collegamenti netlink per monitorare lo "
 "stato del collegamento: %s"
 
-#: ../src/nm-netlink-monitor.c:506
+#: ../src/nm-netlink-monitor.c:542
 #, c-format
 msgid "unable to join netlink group: %s"
 msgstr "impossibile unirsi a un gruppo netlink: %s"
 
-#: ../src/nm-netlink-monitor.c:637 ../src/nm-netlink-monitor.c:650
+#: ../src/nm-netlink-monitor.c:671 ../src/nm-netlink-monitor.c:684
 #, c-format
 msgid "error updating link cache: %s"
 msgstr "errore nell'aggiornare la cache dei link: %s"
 
-#: ../src/settings/plugins/ifcfg-rh/reader.c:3575
-#: ../src/settings/plugins/ifnet/connection_parser.c:51
+#: ../src/settings/plugins/ifcfg-rh/reader.c:94
 msgid "System"
 msgstr "Sistema"
 
-#~ msgid "SCOPE"
-#~ msgstr "SCOPO"
-
-#~ msgid "DBUS-SERVICE"
-#~ msgstr "SERVIZIO-DBUS"
-
-#~ msgid "system"
-#~ msgstr "sistema"
+#: ../src/settings/plugins/ifcfg-rh/reader.c:3641
+msgid "Bond"
+msgstr "Aggregata"
 
-#~ msgid "user"
-#~ msgstr "utente"
-
-# [NdT] si tratta di un messaggio che descrive un'azione
-#~ msgid "System connections"
-#~ msgstr "Connessioni di sistema"
-
-# [NdT] si tratta di un messaggio che descrive un'azione
-#~ msgid "User connections"
-#~ msgstr "Connessioni utente"
+#: ../test/nm-online.c:112
+#, c-format
+msgid "\rConnecting"
+msgstr "\rConnessione in corso"
 
-#~ msgid "Error: Obtaining active connection for '%s' failed."
-#~ msgstr "Errore: ottenimento connessione attiva per \"%s\" non riuscito."
+#: ../test/nm-online.c:143
+msgid "Time to wait for a connection, in seconds (default is 30)"
+msgstr "Tempo di attesa per una connessione, in secondi (predefinito 30)"
 
-#~ msgid "Auto %s"
-#~ msgstr "%s (automatica)"
+#: ../test/nm-online.c:144
+msgid "Exit immediately if NetworkManager is not running or connecting"
+msgstr ""
+"Esce immediatamente se il programma non è in esecuzione o non è in "
+"connessione"
 
-#~ msgid "Error: Could not get user settings."
-#~ msgstr "Errore: impossibile ottenere le impostazioni dell'utente."
+#: ../test/nm-online.c:145
+msgid "Don't print anything"
+msgstr "Non stampa nulla"
 
-#~ msgid "Allow use of user-specific connections"
-#~ msgstr "Permettere l'uso di connessioni specifiche dell'utente"
+#: ../test/nm-online.c:163
+msgid "Waits for a successful connection in NetworkManager."
+msgstr "Attende una connessione stabilita con successo"
 
-# [NdT] si tratta di un messaggio che descrive un'azione
-#~ msgid "System policy prevents use of user-specific connections"
-#~ msgstr ""
-#~ "La politica di sistema impedisce l'uso di connessioni specifiche "
-#~ "dell'utente"
+#: ../test/nm-online.c:169 ../test/nm-online.c:178
+msgid "Invalid option.  Please use --help to see a list of valid options."
+msgstr ""
+"Opzione non valida. Usare --help per ottenere un elenco delle opzioni valide."
diff --git a/po/kn.po b/po/kn.po
index 6d172a0d..c4a4630c 100644
--- a/po/kn.po
+++ b/po/kn.po
@@ -3,966 +3,1810 @@
 # Copyright (C) 2009 NetworkManager's COPYRIGHT HOLDER
 # This file is distributed under the same license as the NetworkManager package.
 #
-# Shankar Prasad , 2009, 2010.
+# Shankar Prasad , 2009, 2010, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: NetworkManager.po.master.kn\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 12:55+0530\n"
+"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
+"product=NetworkManager&keywords=I18N+L10N&component=general\n"
+"POT-Creation-Date: 2012-12-01 03:25+0000\n"
+"PO-Revision-Date: 2012-12-12 23:58+0530\n"
 "Last-Translator: Shankar Prasad \n"
-"Language-Team: kn_IN \n"
+"Language-Team: Kannada \n"
+"Language: kn\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Lokalize 1.0\n"
+"X-Generator: Lokalize 1.5\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
-msgid "NAME"
-msgstr "NAME"
+#: ../cli/src/common.c:32 ../cli/src/common.c:44 ../cli/src/common.c:52
+#: ../cli/src/common.c:63 ../cli/src/connections.c:133
+#: ../cli/src/connections.c:167
+msgid "GROUP"
+msgstr "GROUP"
 
 #. 0
-#: ../cli/src/connections.c:60 ../cli/src/connections.c:75
-msgid "UUID"
-msgstr "UUID"
+#: ../cli/src/common.c:33 ../cli/src/common.c:53
+msgid "ADDRESS"
+msgstr "ADDRESS"
 
 #. 1
-#: ../cli/src/connections.c:61
-msgid "DEVICES"
-msgstr "DEVICES"
+#: ../cli/src/common.c:34 ../cli/src/common.c:54
+msgid "ROUTE"
+msgstr "ROUTE"
 
 #. 2
-#: ../cli/src/connections.c:62 ../cli/src/connections.c:77
-msgid "SCOPE"
-msgstr "SCOPE"
+#: ../cli/src/common.c:35 ../cli/src/common.c:55
+msgid "DNS"
+msgstr "DNS"
 
 #. 3
-#: ../cli/src/connections.c:63
-msgid "DEFAULT"
-msgstr "DEFAULT"
+#: ../cli/src/common.c:36 ../cli/src/common.c:56
+msgid "DOMAIN"
+msgstr "DOMAIN"
 
 #. 4
-#: ../cli/src/connections.c:64
-msgid "DBUS-SERVICE"
-msgstr "DBUS-SERVICE"
+#: ../cli/src/common.c:37
+msgid "WINS"
+msgstr "WINS"
 
-#. 5
-#: ../cli/src/connections.c:65
-msgid "SPEC-OBJECT"
-msgstr "SPEC-OBJECT"
+#. 0
+#: ../cli/src/common.c:45 ../cli/src/common.c:64
+msgid "OPTION"
+msgstr "OPTION"
 
-#. 6
-#: ../cli/src/connections.c:66
-msgid "VPN"
-msgstr "VPN"
+#: ../cli/src/common.c:366
+msgid "unmanaged"
+msgstr "ನಿರ್ವಹಿಸದೆ ಇರುವ"
+
+#: ../cli/src/common.c:368
+msgid "unavailable"
+msgstr "ಲಭ್ಯವಿಲ್ಲ"
+
+#: ../cli/src/common.c:370 ../cli/src/network-manager.c:120
+msgid "disconnected"
+msgstr "ಸಂಪರ್ಕಕಡಿದು ಹೋಗಿದೆ"
+
+#: ../cli/src/common.c:372
+msgid "connecting (prepare)"
+msgstr "ಸಂಪರ್ಕ ಕಲ್ಪಿಸಲಾಗುತ್ತಿದೆ (ಸಿದ್ಧಗೊಳಿಕೆ)"
+
+#: ../cli/src/common.c:374
+msgid "connecting (configuring)"
+msgstr "ಸಂಪರ್ಕ ಕಲ್ಪಿಸಲಾಗುತ್ತಿದೆ (ಸಂರಚಿಸುವಿಕೆ)"
+
+#: ../cli/src/common.c:376
+msgid "connecting (need authentication)"
+msgstr "ಸಂಪರ್ಕ ಕಲ್ಪಿಸಲಾಗುತ್ತಿದೆ (ದೃಢೀಕರಣದ ಅಗತ್ಯವಿದೆ)"
+
+#: ../cli/src/common.c:378
+msgid "connecting (getting IP configuration)"
+msgstr "ಸಂಪರ್ಕ ಕಲ್ಪಿಸಲಾಗುತ್ತಿದೆ (IP ಸಂರಚನೆಯನ್ನು ಪಡೆಯಲಾಗುತ್ತಿದೆ)"
+
+#: ../cli/src/common.c:380
+#| msgid "connecting (getting IP configuration)"
+msgid "connecting (checking IP connectivity)"
+msgstr "ಸಂಪರ್ಕ ಕಲ್ಪಿಸಲಾಗುತ್ತಿದೆ (IP ಸಂಪರ್ಕವನ್ನು ಪರಿಶೀಲಿಸಲಾಗುತ್ತಿದೆ)"
+
+#: ../cli/src/common.c:382
+#| msgid "connecting (getting IP configuration)"
+msgid "connecting (starting secondary connections)"
+msgstr "ಸಂಪರ್ಕ ಕಲ್ಪಿಸಲಾಗುತ್ತಿದೆ (ಎರಡನೆಯ ಸಂರಚನೆಯನ್ನು ಆರಂಭಿಸಲಾಗುತ್ತಿದೆ)"
+
+#: ../cli/src/common.c:384 ../cli/src/network-manager.c:116
+msgid "connected"
+msgstr "ಸಂಪರ್ಕಗೊಂಡಿದೆ"
+
+#: ../cli/src/common.c:386 ../cli/src/connections.c:658
+#| msgid "activating"
+msgid "deactivating"
+msgstr "ನಿಷ್ಕ್ರಿಯಗೊಳ್ಳುತ್ತಿದೆ"
+
+#: ../cli/src/common.c:388
+msgid "connection failed"
+msgstr "ಸಂಪರ್ಕ ವಿಫಲಗೊಂಡಿದೆ"
+
+#: ../cli/src/common.c:390 ../cli/src/connections.c:661
+#: ../cli/src/connections.c:684 ../cli/src/connections.c:1376
+#: ../cli/src/devices.c:650 ../cli/src/network-manager.c:123
+#: ../cli/src/network-manager.c:185 ../cli/src/network-manager.c:188
+#: ../cli/src/network-manager.c:197 ../cli/src/network-manager.c:257
+#: ../cli/src/network-manager.c:273 ../cli/src/network-manager.c:431
+#: ../cli/src/network-manager.c:486 ../cli/src/network-manager.c:524
+#: ../cli/src/network-manager.c:563 ../cli/src/settings.c:629
+#: ../cli/src/settings.c:657 ../cli/src/utils.c:533 ../src/main.c:451
+#: ../src/main.c:470
+msgid "unknown"
+msgstr "ಗೊತ್ತಿಲ್ಲದ"
+
+#: ../cli/src/common.c:399
+msgid "No reason given"
+msgstr "ಯಾವುದೆ ಕಾರಣ ನೀಡಲಾಗಿಲ್ಲ"
+
+#: ../cli/src/common.c:402
+#| msgid "Unknown"
+msgid "Unknown error"
+msgstr "ಗೊತ್ತಿರದ ದೋಷ"
+
+#: ../cli/src/common.c:405
+msgid "Device is now managed"
+msgstr "ಸಾಧನವನ್ನು ಈಗ ನಿಯಂತ್ರಣಕ್ಕೊಳಪಡಿಸಲಾಗಿದೆ"
+
+#: ../cli/src/common.c:408
+msgid "Device is now unmanaged"
+msgstr "ಸಾಧನವನ್ನು ಈಗ ನಿಯಂತ್ರಣಕ್ಕೊಳಪಡಿಸಲಾಗಿಲ್ಲ"
+
+#: ../cli/src/common.c:411
+#| msgid "the VPN service returned invalid configuration"
+msgid "The device could not be readied for configuration"
+msgstr "ಸಾಧನವನ್ನು ಸಂರಚನೆಗಾಗಿ ಸಿದ್ಧಗೊಳಿಸಲು ಸಾಧ್ಯವಾಗಿಲ್ಲ"
+
+#: ../cli/src/common.c:414
+msgid ""
+"IP configuration could not be reserved (no available address, timeout, etc.)"
+msgstr ""
+"IP ಸಂರಚನೆಯನ್ನು ಕಾದಿರಿಸಲು ಸಾಧ್ಯವಾಗಿಲ್ಲ (ಲಭ್ಯವಿರುವ ಯಾವುದೆ ವಿಳಾಸ, ಕಾಲತೀರಿಕೆ, "
+"ಮುಂತಾದವುಗಳಿಲ್ಲ.)"
+
+#: ../cli/src/common.c:417
+msgid "The IP configuration is no longer valid"
+msgstr "IP ಸಂರಚನೆಯು ಇನ್ನು ಮುಂದೆ ಮಾನ್ಯವಾಗಿರುವುದಿಲ್ಲ"
+
+#: ../cli/src/common.c:420
+msgid "Secrets were required, but not provided"
+msgstr "ರಹಸ್ಯಗಳ ಅಗತ್ಯವಿದೆ, ಆದರೆ ಒದಗಿಸಲಾಗಿಲ್ಲ"
+
+#: ../cli/src/common.c:423
+msgid "802.1X supplicant disconnected"
+msgstr "802.1X ಸಪ್ಲಿಕ್ಯಾಂಟ್‌ನೊಂದಿಗಿನ ಸಂಪರ್ಕ ಕಡಿದಿದೆ"
+
+#: ../cli/src/common.c:426
+msgid "802.1X supplicant configuration failed"
+msgstr "802.1X ಸಪ್ಲಿಕ್ಯಾಂಟ್ ಸಂರಚನೆಯು ವಿಫಲಗೊಂಡಿದೆ"
+
+#: ../cli/src/common.c:429
+msgid "802.1X supplicant failed"
+msgstr "802.1X ಸಪ್ಲಿಕ್ಯಾಂಟ್ ವಿಫಲಗೊಂಡಿದೆ"
+
+#: ../cli/src/common.c:432
+msgid "802.1X supplicant took too long to authenticate"
+msgstr "802.1X ಸಪ್ಲಿಕ್ಯಾಂಟ್‌ ದೃಢೀಕರಿಸಲು ಬಹಳ ಸಮಯ ತೆಗೆದುಕೊಂಡಿದೆ"
+
+#: ../cli/src/common.c:435
+#| msgid "the VPN service failed to start"
+msgid "PPP service failed to start"
+msgstr "PPP ಸೇವೆಯನ್ನು ಆರಂಭಿಸುವಲ್ಲಿ ವಿಫಲತೆ"
+
+#: ../cli/src/common.c:438
+#| msgid "VPN disconnected"
+msgid "PPP service disconnected"
+msgstr "PPP ಸೇವೆಯ ಸಂಪರ್ಕ ಕಡಿದಿದೆ"
+
+#: ../cli/src/common.c:441
+msgid "PPP failed"
+msgstr "PPP ವಿಫಲಗೊಂಡಿದೆ"
+
+#: ../cli/src/common.c:444
+#| msgid "the VPN service failed to start"
+msgid "DHCP client failed to start"
+msgstr "DHCP ಕ್ಲೈಂಟ್ ಆರಂಭಗೊಳ್ಳುವಲ್ಲಿ ವಿಫಲಗೊಂಡಿದೆ"
+
+#: ../cli/src/common.c:447
+msgid "DHCP client error"
+msgstr "DHCP ಕ್ಲೈಂಟ್ ದೋಷ"
+
+#: ../cli/src/common.c:450
+#| msgid "VPN connection failed"
+msgid "DHCP client failed"
+msgstr "DHCP ಕ್ಲೈಂಟ್ ವಿಫಲಗೊಂಡಿದೆ"
+
+#: ../cli/src/common.c:453
+#| msgid "the VPN service failed to start"
+msgid "Shared connection service failed to start"
+msgstr "ಹಂಚಲಾದ ಸಂಪರ್ಕ ಸೇವೆಯು ಆರಂಭಗೊಳ್ಳುವಲ್ಲಿ ವಿಫಲಗೊಂಡಿದೆ"
+
+#: ../cli/src/common.c:456
+#| msgid "connection failed"
+msgid "Shared connection service failed"
+msgstr "ಹಂಚಲಾದ ಸಂಪರ್ಕ ಸೇವೆಯು  ವಿಫಲಗೊಂಡಿದೆ"
+
+#: ../cli/src/common.c:459
+#| msgid "the VPN service failed to start"
+msgid "AutoIP service failed to start"
+msgstr "AutoIP ಸೇವೆಯನ್ನು ಆರಂಭಿಸುವಲ್ಲಿ ವಿಫಲತೆ"
+
+#: ../cli/src/common.c:462
+msgid "AutoIP service error"
+msgstr "AutoIP ಸೇವಾ ದೋಷ"
+
+#: ../cli/src/common.c:465
+#| msgid "the VPN service failed to start"
+msgid "AutoIP service failed"
+msgstr "AutoIP ಸೇವೆಯು ವಿಫಲಗೊಂಡಿದೆ"
+
+#: ../cli/src/common.c:468
+msgid "The line is busy"
+msgstr "ಮಾರ್ಗವು ಕಾರ್ಯನಿರತವಾಗಿದೆ"
+
+#: ../cli/src/common.c:471
+msgid "No dial tone"
+msgstr "ಡಯಲ್ ಶಬ್ಧವಿಲ್ಲ"
+
+#: ../cli/src/common.c:474
+msgid "No carrier could be established"
+msgstr "ಯಾವುದೆ ವಾಹಕವನ್ನು ಸಾಧಿಸಲಾಗಿಲ್ಲ"
+
+#: ../cli/src/common.c:477
+msgid "The dialing request timed out"
+msgstr "ಡಯಲ್ ಮಾಡುವ ಮನವಿಯ ಕಾಲಾವಧಿ ಮುಗಿದಿದೆ"
+
+#: ../cli/src/common.c:480
+msgid "The dialing attempt failed"
+msgstr "ಡಯಲ್ ಮಾಡುವ ಪ್ರಯತ್ನವು ವಿಫಲಗೊಂಡಿದೆ"
+
+#: ../cli/src/common.c:483
+#| msgid "Error: Connection activation failed."
+msgid "Modem initialization failed"
+msgstr "ಮಾಡೆಮ್ ಆರಂಭಗೊಳಿಕೆಯು ವಿಫಲಗೊಂಡಿದೆ"
+
+#: ../cli/src/common.c:486
+#| msgid "Failed to decrypt the private key."
+msgid "Failed to select the specified APN"
+msgstr "ನಿಶ್ಚಿತ APN ಅನ್ನು ಆರಿಸುವಲ್ಲಿ ವಿಫಲಗೊಂಡಿದೆ."
+
+#: ../cli/src/common.c:489
+msgid "Not searching for networks"
+msgstr "ಜಾಲಬಂಧಗಳಿಗಾಗಿ ಹುಡುಕಲಾಗುತ್ತಿಲ್ಲ"
+
+#: ../cli/src/common.c:492
+msgid "Network registration denied"
+msgstr "ಜಾಲಬಂಧ ನೋಂದಣಿಯನ್ನು ನಿರಾಕರಿಸಲಾಗಿದೆ"
+
+#: ../cli/src/common.c:495
+msgid "Network registration timed out"
+msgstr "ಜಾಲಬಂಧ ನೋಂದಣಿಯ ಕಾಲಾವಧಿ ತೀರಿದೆ"
+
+#: ../cli/src/common.c:498
+msgid "Failed to register with the requested network"
+msgstr "ಮನವಿ ಸಲ್ಲಿಸಲಾದ ಜಾಲಬಂಧದೊಂದಿಗೆ ನೋಂದಾಯಿಸಲು ವಿಫಲಗೊಂಡಿದೆ"
+
+#: ../cli/src/common.c:501
+#| msgid "VPN connection failed"
+msgid "PIN check failed"
+msgstr "PIN ಪರಿಶೀಲನೆಯು ವಿಫಲಗೊಂಡಿದೆ"
+
+#: ../cli/src/common.c:504
+msgid "Necessary firmware for the device may be missing"
+msgstr "ಸಾಧನಕ್ಕಾಗಿ ಯಾವುದೆ ಅಗತ್ಯ ಫರ್ಮ್-ವೇರ್ ಕಾಣಿಸುತ್ತಿಲ್ಲ"
+
+#: ../cli/src/common.c:507
+#| msgid "the connection was removed"
+msgid "The device was removed"
+msgstr "ಸಾಧನವನ್ನು ತೆಗೆದು ಹಾಕಲಾಗಿದೆ"
+
+#: ../cli/src/common.c:510
+#| msgid "NetworkManager status"
+msgid "NetworkManager went to sleep"
+msgstr "NetworkManager ನಿದ್ರಾಸ್ಥಿತಿಗೆ ಹೋಗಿದೆ"
+
+#: ../cli/src/common.c:513
+#| msgid "no active connection or device"
+msgid "The device's active connection disappeared"
+msgstr "ಸಾಧನದ ಸಕ್ರಿಯ ಸಂಪರ್ಕವು ಮರೆಯಾಗಿದೆ"
+
+#: ../cli/src/common.c:516
+msgid "Device disconnected by user or client"
+msgstr "ಸಾಧನದೊಂದಿಗಿನ ಸಂಪರ್ಕವನ್ನು ಬಳಕೆದಾರ ಅಥವ ಕ್ಲೈಂಟ್‌ನಿಂದ ಕಡಿದು ಹಾಕಲಾಗಿದೆ"
+
+#: ../cli/src/common.c:519
+msgid "Carrier/link changed"
+msgstr "ವಾಹಕ/ಕೊಂಡಿಯನ್ನು ಬದಲಾಯಿಸಲಾಗಿದೆ"
+
+#: ../cli/src/common.c:522
+#| msgid "the connection was removed"
+msgid "The device's existing connection was assumed"
+msgstr "ಸಾಧನದ ಈಗಿನ ಸಂಪರ್ಕವನ್ನು ಊಹಿಸಲಾಗಿದೆ"
+
+#: ../cli/src/common.c:525
+msgid "The supplicant is now available"
+msgstr "ಸಪ್ಲಿಕ್ಯಾಂಟ್ ಈಗ ಲಭ್ಯವಿದೆ"
+
+#: ../cli/src/common.c:528
+#| msgid "'dhcpcd' could be found."
+msgid "The modem could not be found"
+msgstr "ಮಾಡೆಮ್‌ ಕಂಡು ಬಂದಿಲ್ಲ"
+
+#: ../cli/src/common.c:531
+#| msgid "the connection attempt timed out"
+msgid "The Bluetooth connection failed or timed out"
+msgstr "ಬ್ಲೂಟೂತ್ ಸಂಪರ್ಕವು ವಿಫಲಗೊಂಡಿದೆ ಅಥವ ಕಾಲಾವಧಿ ಮೀರಿದೆ"
+
+#: ../cli/src/common.c:534
+msgid "GSM Modem's SIM card not inserted"
+msgstr "GSM ಮಾಡೆಮ್‌ನ SIM ಕಾರ್ಡ್ ಅನ್ನು ಸೇರಿಸಲಾಗಿಲ್ಲ"
+
+#: ../cli/src/common.c:537
+msgid "GSM Modem's SIM PIN required"
+msgstr "GSM ಮಾಡೆಮ್‌ನ SIM PIN ಅಗತ್ಯವಿದೆ"
+
+#: ../cli/src/common.c:540
+msgid "GSM Modem's SIM PUK required"
+msgstr "GSM ಮಾಡೆಮ್‌ನ SIM PUK ಅಗತ್ಯವಿದೆ"
+
+#: ../cli/src/common.c:543
+msgid "GSM Modem's SIM wrong"
+msgstr "GSM ಮಾಡೆಮ್‌ನ SIM ತಪ್ಪಾಗಿದೆ"
+
+#: ../cli/src/common.c:546
+msgid "InfiniBand device does not support connected mode"
+msgstr "InfiniBand ಸಾಧನವು ಸಂಪರ್ಕಿತ ಸ್ಥಿತಿಯಲ್ಲಿ ಬೆಂಬಲಿತವಾಗಿಲ್ಲ"
+
+#: ../cli/src/common.c:549
+#| msgid "connection failed"
+msgid "A dependency of the connection failed"
+msgstr "ಸಂಪರ್ಕದ ಅವಲಂಬನೆಯು ವಿಫಲಗೊಂಡಿದೆ"
+
+#: ../cli/src/common.c:552
+msgid "A problem with the RFC 2684 Ethernet over ADSL bridge"
+msgstr "ADSL ಬ್ರಿಡ್ಜಿನ ಮುಖಾಂತರದ RFC 2684 ಎತರ್ನೆಟ್‌ನಲ್ಲಿ ಒಂದು ತೊಂದರೆ ಕಂಡುಬಂದಿದೆ"
+
+#: ../cli/src/common.c:555
+msgid "ModemManager is unavailable"
+msgstr "ModemManager ಲಭ್ಯವಿಲ್ಲ"
+
+#: ../cli/src/common.c:558
+#| msgid "'dhclient' could be found."
+msgid "The Wi-Fi network could not be found"
+msgstr "Wi-Fi ಜಾಲಬಂಧವು ಕಂಡು ಬಂದಿಲ್ಲ"
+
+#: ../cli/src/common.c:561
+msgid "A secondary connection of the base connection failed"
+msgstr "ಮೂಲ ಸಂಪರ್ಕದ ಎರಡನೇ ಸಂಪರ್ಕವು ವಿಫಲಗೊಂಡಿದೆ"
+
+#: ../cli/src/common.c:564 ../cli/src/devices.c:296 ../cli/src/devices.c:314
+#: ../cli/src/devices.c:436 ../cli/src/devices.c:480
+msgid "Unknown"
+msgstr "ಗೊತ್ತಿರದ"
+
+#. 0
+#. used only for 'GENERAL' group listing
+#: ../cli/src/connections.c:60 ../cli/src/connections.c:134
+#: ../cli/src/devices.c:108 ../cli/src/devices.c:132 ../cli/src/devices.c:142
+#: ../cli/src/devices.c:152 ../cli/src/devices.c:166 ../cli/src/devices.c:180
+#: ../cli/src/devices.c:202 ../cli/src/devices.c:218 ../cli/src/devices.c:227
+msgid "NAME"
+msgstr "NAME"
+
+#. 0
+#. 1
+#: ../cli/src/connections.c:61 ../cli/src/connections.c:135
+msgid "UUID"
+msgstr "UUID"
 
 #. 1
 #. 0
 #. 1
-#: ../cli/src/connections.c:76 ../cli/src/devices.c:61 ../cli/src/devices.c:87
+#. 2
+#: ../cli/src/connections.c:62 ../cli/src/connections.c:168
+#: ../cli/src/devices.c:72 ../cli/src/devices.c:110 ../cli/src/devices.c:205
 msgid "TYPE"
 msgstr "TYPE"
 
-#. 3
-#: ../cli/src/connections.c:78
+#. 2
+#: ../cli/src/connections.c:63
 msgid "TIMESTAMP"
 msgstr "TIMESTAMP"
 
-#. 4
-#: ../cli/src/connections.c:79
+#. 3
+#: ../cli/src/connections.c:64
 msgid "TIMESTAMP-REAL"
 msgstr "TIMESTAMP-REAL"
 
-#. 5
-#: ../cli/src/connections.c:80
+#. 4
+#. 13
+#: ../cli/src/connections.c:65 ../cli/src/devices.c:122
 msgid "AUTOCONNECT"
 msgstr "AUTOCONNECT"
 
-#. 6
-#: ../cli/src/connections.c:81
+#. 5
+#: ../cli/src/connections.c:66
 msgid "READONLY"
 msgstr "READONLY"
 
-#: ../cli/src/connections.c:157
-#, c-format
+#. 6
+#. 8
+#. 2
+#. 11
+#. 5
+#: ../cli/src/connections.c:67 ../cli/src/connections.c:142
+#: ../cli/src/devices.c:74 ../cli/src/devices.c:192 ../cli/src/devices.c:208
+msgid "DBUS-PATH"
+msgstr "DBUS-PATH"
+
+#. 2
+#: ../cli/src/connections.c:136
+msgid "DEVICES"
+msgstr "DEVICES"
+
+#. 3
+#. 1
+#. 8
+#. 1
+#: ../cli/src/connections.c:137 ../cli/src/devices.c:73
+#: ../cli/src/devices.c:117 ../cli/src/network-manager.c:39
+msgid "STATE"
+msgstr "STATE"
+
+#. 4
+#: ../cli/src/connections.c:138
+msgid "DEFAULT"
+msgstr "DEFAULT"
+
+#. 5
+#: ../cli/src/connections.c:139
+#| msgid "DEFAULT"
+msgid "DEFAULT6"
+msgstr "DEFAULT6"
+
+#. 6
+#: ../cli/src/connections.c:140
+msgid "SPEC-OBJECT"
+msgstr "SPEC-OBJECT"
+
+#. 7
+#. 1
+#: ../cli/src/connections.c:141 ../cli/src/connections.c:155
+msgid "VPN"
+msgstr "VPN"
+
+#. 9
+#: ../cli/src/connections.c:143
+msgid "CON-PATH"
+msgstr "CON-PATH"
+
+#. 10
+#: ../cli/src/connections.c:144
+msgid "ZONE"
+msgstr "ZONE"
+
+#. 11
+#: ../cli/src/connections.c:145
+msgid "MASTER-PATH"
+msgstr "MASTER-PATH"
+
+#: ../cli/src/connections.c:153 ../cli/src/devices.c:83
+msgid "GENERAL"
+msgstr "GENERAL"
+
+#. 0
+#: ../cli/src/connections.c:154
+#| msgid "TKIP"
+msgid "IP"
+msgstr "IP"
+
+#. 1
+#: ../cli/src/connections.c:169
+#| msgid "NAME"
+msgid "USERNAME"
+msgstr "USERNAME"
+
+#. 2
+#: ../cli/src/connections.c:170
+msgid "GATEWAY"
+msgstr "GATEWAY"
+
+#. 3
+#: ../cli/src/connections.c:171
+msgid "BANNER"
+msgstr "BANNER"
+
+#. 4
+#: ../cli/src/connections.c:172
+#| msgid "STATE"
+msgid "VPN-STATE"
+msgstr "VPN-STATE"
+
+#. 5
+#: ../cli/src/connections.c:173
+msgid "CFG"
+msgstr "CFG"
+
+#: ../cli/src/connections.c:195
+#, c-format
+#| msgid ""
+#| "Usage: nmcli con { COMMAND | help }\n"
+#| "  COMMAND := { list | status | up | down }\n"
+#| "\n"
+#| "  list [id  | uuid  | system | user]\n"
+#| "  status\n"
+#| "  up id  | uuid  [iface ] [ap ] [--nowait] [--"
+#| "timeout ]\n"
+#| "  down id  | uuid \n"
 msgid ""
-"Usage: nmcli con { COMMAND | help }\n"
-"  COMMAND := { list | status | up | down }\n"
+"Usage: nmcli connection { COMMAND | help }\n"
+"  COMMAND := { list | status | up | down | delete }\n"
 "\n"
-"  list [id  | uuid  | system | user]\n"
-"  status\n"
-"  up id  | uuid  [iface ] [ap ] [--nowait] [--timeout "
+"  list [id  | uuid ]\n"
+"  status [id  | uuid  | path ]\n"
+"  up id  | uuid  [iface ] [ap ] [nsp ] [--"
+"nowait] [--timeout ]\n"
+"  up id  | uuid  [iface ] [ap ] [--nowait] [--timeout "
 "]\n"
 "  down id  | uuid \n"
+"  delete id  | uuid \n"
+"\n"
 msgstr ""
-"ಬಳಕೆ: nmcli con { COMMAND | help }\n"
-"  COMMAND := { list | status | up | down }\n"
+"ಬಳಕೆ: nmcli connection { COMMAND | help }\n"
+"  COMMAND := { list | status | up | down | delete }\n"
 "\n"
-"  list [id  | uuid  | system | user]\n"
-"  status\n"
-"  up id  | uuid  [iface ] [ap ] [--nowait] [--timeout "
+"  list [id  | uuid ]\n"
+"  status [id  | uuid  | path ]\n"
+"  up id  | uuid  [iface ] [ap ] [nsp ] [--"
+"nowait] [--timeout ]\n"
+"  up id  | uuid  [iface ] [ap ] [--nowait] [--timeout "
 "]\n"
 "  down id  | uuid \n"
+"  delete id  | uuid \n"
+"\n"
 
-#: ../cli/src/connections.c:197 ../cli/src/connections.c:536
+#: ../cli/src/connections.c:256 ../cli/src/connections.c:634
 #, 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:258 ../cli/src/connections.c:636
 #, c-format
 msgid "Error: 'con list': %s; allowed fields: %s"
 msgstr "ದೋಷ: 'con list': %s; ಅನುಮತಿಸಲಾದ ಕ್ಷೇತ್ರಗಳು: %s"
 
-#: ../cli/src/connections.c:207
+#: ../cli/src/connections.c:266
 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:509
 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:510 ../cli/src/connections.c:511
+#: ../cli/src/connections.c:739 ../cli/src/connections.c:740
+#: ../cli/src/connections.c:742 ../cli/src/devices.c:444
+#: ../cli/src/devices.c:497 ../cli/src/devices.c:615 ../cli/src/devices.c:616
+#: ../cli/src/devices.c:617 ../cli/src/devices.c:649 ../cli/src/devices.c:676
+#: ../cli/src/devices.c:677 ../cli/src/devices.c:678 ../cli/src/devices.c:679
+#: ../cli/src/devices.c:680 ../cli/src/network-manager.c:267
+#: ../cli/src/settings.c:748 ../cli/src/settings.c:823
+#: ../cli/src/settings.c:943 ../cli/src/settings.c:1225
+#: ../cli/src/settings.c:1226 ../cli/src/settings.c:1228
+#: ../cli/src/settings.c:1230 ../cli/src/settings.c:1231
+#: ../cli/src/settings.c:1362 ../cli/src/settings.c:1363
+#: ../cli/src/settings.c:1364 ../cli/src/settings.c:1365
+#: ../cli/src/settings.c:1442 ../cli/src/settings.c:1443
+#: ../cli/src/settings.c:1444 ../cli/src/settings.c:1445
+#: ../cli/src/settings.c:1446 ../cli/src/settings.c:1447
+#: ../cli/src/settings.c:1448 ../cli/src/settings.c:1449
+#: ../cli/src/settings.c:1450 ../cli/src/settings.c:1451
+#: ../cli/src/settings.c:1452 ../cli/src/settings.c:1453
+#: ../cli/src/settings.c:1454 ../cli/src/settings.c:1525
+#: ../cli/src/settings.c:1867 ../cli/src/settings.c:1904
 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:510 ../cli/src/connections.c:511
+#: ../cli/src/connections.c:739 ../cli/src/connections.c:740
+#: ../cli/src/connections.c:742 ../cli/src/devices.c:444
+#: ../cli/src/devices.c:497 ../cli/src/devices.c:615 ../cli/src/devices.c:616
+#: ../cli/src/devices.c:617 ../cli/src/devices.c:649 ../cli/src/devices.c:676
+#: ../cli/src/devices.c:677 ../cli/src/devices.c:678 ../cli/src/devices.c:679
+#: ../cli/src/devices.c:680 ../cli/src/network-manager.c:269
+#: ../cli/src/settings.c:748 ../cli/src/settings.c:750
+#: ../cli/src/settings.c:823 ../cli/src/settings.c:943
+#: ../cli/src/settings.c:1225 ../cli/src/settings.c:1226
+#: ../cli/src/settings.c:1228 ../cli/src/settings.c:1230
+#: ../cli/src/settings.c:1231 ../cli/src/settings.c:1362
+#: ../cli/src/settings.c:1363 ../cli/src/settings.c:1364
+#: ../cli/src/settings.c:1365 ../cli/src/settings.c:1442
+#: ../cli/src/settings.c:1443 ../cli/src/settings.c:1444
+#: ../cli/src/settings.c:1445 ../cli/src/settings.c:1446
+#: ../cli/src/settings.c:1447 ../cli/src/settings.c:1448
+#: ../cli/src/settings.c:1449 ../cli/src/settings.c:1450
+#: ../cli/src/settings.c:1451 ../cli/src/settings.c:1452
+#: ../cli/src/settings.c:1453 ../cli/src/settings.c:1454
+#: ../cli/src/settings.c:1525 ../cli/src/settings.c:1867
+#: ../cli/src/settings.c:1904
 msgid "no"
 msgstr "ಇಲ್ಲ"
 
-#: ../cli/src/connections.c:457 ../cli/src/connections.c:500
-msgid "System connections"
-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:585
+#| msgid "Connection details"
+msgid "Connection list"
+msgstr "ಸಂಪರ್ಕದ ಪಟ್ಟಿ"
+
+#: ../cli/src/connections.c:598 ../cli/src/connections.c:1135
+#: ../cli/src/connections.c:1673 ../cli/src/connections.c:1688
+#: ../cli/src/connections.c:1697 ../cli/src/connections.c:1707
+#: ../cli/src/connections.c:1719 ../cli/src/connections.c:1828
+#: ../cli/src/connections.c:1930 ../cli/src/devices.c:1127
+#: ../cli/src/devices.c:1137 ../cli/src/devices.c:1255
+#: ../cli/src/devices.c:1263 ../cli/src/devices.c:1627
+#: ../cli/src/devices.c:1634 ../cli/src/devices.c:1648
+#: ../cli/src/devices.c:1655 ../cli/src/devices.c:1672
+#: ../cli/src/devices.c:1683 ../cli/src/devices.c:1904
+#: ../cli/src/devices.c:1911
 #, c-format
 msgid "Error: %s argument is missing."
 msgstr "ದೋಷ: %s ಆರ್ಗ್ಯುಮೆಂಟ್ ಕಾಣಿಸುತ್ತಿಲ್ಲ"
 
-#: ../cli/src/connections.c:487
+#: ../cli/src/connections.c:611
 #, 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:617 ../cli/src/connections.c:1732
+#: ../cli/src/connections.c:1845 ../cli/src/connections.c:1937
+#: ../cli/src/devices.c:911 ../cli/src/devices.c:991 ../cli/src/devices.c:1151
+#: ../cli/src/devices.c:1269 ../cli/src/devices.c:1696
+#: ../cli/src/devices.c:1917
 #, c-format
 msgid "Unknown parameter: %s\n"
 msgstr "ಗೊತ್ತಿರದ ನಿಯತಾಂಕಗಳು: %s\n"
 
-#: ../cli/src/connections.c:528
+#: ../cli/src/connections.c:626
 #, 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:641 ../cli/src/connections.c:2033
+#: ../cli/src/devices.c:2128 ../cli/src/network-manager.c:599
 #, c-format
 msgid "Error: %s."
 msgstr "ದೋಷ: %s."
 
-#: ../cli/src/connections.c:649
-#, c-format
-msgid "Error: 'con status': %s"
-msgstr "ದೋಷ: 'con status': %s"
-
-#: ../cli/src/connections.c:651
-#, c-format
-msgid "Error: 'con status': %s; allowed fields: %s"
-msgstr "ದೋಷ: 'con status': %s; ಅನುಮತಿಸಲಾದ ಕ್ಷೇತ್ರಗಳು: %s"
-
-#: ../cli/src/connections.c:658
-msgid "Active connections"
-msgstr "ಸಕ್ರಿಯ ಸಂಪರ್ಕಗಳು"
-
-#: ../cli/src/connections.c:1026
-#, c-format
-msgid "no active connection on device '%s'"
-msgstr "'%s' ಎಂಬ ಸಾಧನದಲ್ಲಿ ಯಾವುದೆ ಸಕ್ರಿಯ ಸಂಪರ್ಕವು ಕಂಡುಬಂದಿಲ್ಲ"
-
-#: ../cli/src/connections.c:1034
-#, c-format
-msgid "no active connection or device"
-msgstr "ಯಾವುದೆ ಸಕ್ರಿಯ ಸಂಪರ್ಕ ಅಥವ ಸಾಧನವು ಕಂಡುಬಂದಿಲ್ಲ"
-
-#: ../cli/src/connections.c:1084
-#, c-format
-msgid "device '%s' not compatible with connection '%s'"
-msgstr "'%s' ಎಂಬ ಸಾಧನವು '%s' ಸಂಪರ್ಕದೊಂದಿಗೆ ಹೊಂದಿಕೊಳ್ಳುತ್ತಿಲ್ಲ"
-
-#: ../cli/src/connections.c:1086
-#, c-format
-msgid "no device found for connection '%s'"
-msgstr "'%s' ಸಂಪರ್ಕಕ್ಕಾಗಿ ಯಾವುದೆ ಸಾಧನವು ಕಂಡು ಬಂದಿಲ್ಲ"
-
-#: ../cli/src/connections.c:1097
+#: ../cli/src/connections.c:654
 msgid "activating"
 msgstr "ಸಕ್ರಿಯಗೊಳ್ಳುತ್ತಿದೆ"
 
-#: ../cli/src/connections.c:1099
+#: ../cli/src/connections.c:656
 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
-msgid "unknown"
-msgstr "ಗೊತ್ತಿಲ್ಲದ"
-
-#: ../cli/src/connections.c:1111
+#: ../cli/src/connections.c:670
 msgid "VPN connecting (prepare)"
 msgstr "VPN ಸಂಪರ್ಕ ಕಲ್ಪಿಸಲಾಗುತ್ತಿದೆ (ಸಿದ್ಧಗೊಳಿಕೆ)"
 
-#: ../cli/src/connections.c:1113
+#: ../cli/src/connections.c:672
 msgid "VPN connecting (need authentication)"
 msgstr "VPN ಸಂಪರ್ಕ ಕಲ್ಪಿಸಲಾಗುತ್ತಿದೆ (ದೃಢೀಕರಣದ ಅಗತ್ಯವಿದೆ)"
 
-#: ../cli/src/connections.c:1115
+#: ../cli/src/connections.c:674
 msgid "VPN connecting"
 msgstr "VPN ಸಂಪರ್ಕಿತಗೊಳ್ಳುತ್ತಿದೆ"
 
-#: ../cli/src/connections.c:1117
+#: ../cli/src/connections.c:676
 msgid "VPN connecting (getting IP configuration)"
 msgstr "VPN ಸಂಪರ್ಕಗೊಂಡಿದೆ (IP ಸಂರಚನೆಯನ್ನು ಪಡೆಯಲಾಗುತ್ತಿದೆ)"
 
-#: ../cli/src/connections.c:1119
+#: ../cli/src/connections.c:678
 msgid "VPN connected"
 msgstr "VPN ಸಂಪರ್ಕಗೊಂಡಿದೆ"
 
-#: ../cli/src/connections.c:1121
+#: ../cli/src/connections.c:680
 msgid "VPN connection failed"
 msgstr "VPN ಸಂಪರ್ಕವು ವಿಫಲಗೊಂಡಿದೆ"
 
-#: ../cli/src/connections.c:1123
+#: ../cli/src/connections.c:682
 msgid "VPN disconnected"
 msgstr "VPN ಸಂಪರ್ಕ ಕಡಿದಿದೆ"
 
-#: ../cli/src/connections.c:1134
+#: ../cli/src/connections.c:735 ../cli/src/connections.c:745
+msgid "N/A"
+msgstr "ಲಭ್ಯವಿಲ್ಲ"
+
+#: ../cli/src/connections.c:939 ../cli/src/connections.c:1163
+#, c-format
+msgid "Error: 'con status': %s"
+msgstr "ದೋಷ: 'con status': %s"
+
+#: ../cli/src/connections.c:941 ../cli/src/connections.c:1165
+#, c-format
+msgid "Error: 'con status': %s; allowed fields: %s"
+msgstr "ದೋಷ: 'con status': %s; ಅನುಮತಿಸಲಾದ ಕ್ಷೇತ್ರಗಳು: %s"
+
+#: ../cli/src/connections.c:949
+#| msgid "Active connections"
+msgid "Active connection details"
+msgstr "ಸಕ್ರಿಯ ಸಂಪರ್ಕಗಳ ವಿವರಗಳು"
+
+#: ../cli/src/connections.c:1085 ../cli/src/connections.c:1747
+#: ../cli/src/connections.c:1860 ../cli/src/connections.c:1951
+#: ../cli/src/devices.c:938 ../cli/src/devices.c:1000
+#: ../cli/src/devices.c:1166 ../cli/src/devices.c:1299
+#: ../cli/src/devices.c:1718 ../cli/src/devices.c:1946
+#: ../cli/src/network-manager.c:311
+#, 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:1089 ../cli/src/connections.c:1751
+#: ../cli/src/connections.c:1864 ../cli/src/connections.c:1955
+#: ../cli/src/devices.c:942 ../cli/src/devices.c:1004
+#: ../cli/src/devices.c:1170 ../cli/src/devices.c:1303
+#: ../cli/src/devices.c:1722 ../cli/src/devices.c:1950
+#: ../cli/src/network-manager.c:315
+#, c-format
+#| msgid "NetworkManager status"
+msgid "Error: NetworkManager is not running."
+msgstr "ದೋಷ: NetworkManager ಚಾಲನೆಯಲ್ಲಿಲ್ಲ."
+
+#: ../cli/src/connections.c:1121
+msgid "Active connections"
+msgstr "ಸಕ್ರಿಯ ಸಂಪರ್ಕಗಳು"
+
+#: ../cli/src/connections.c:1146
+#, c-format
+#| msgid "Error: %s - no such connection."
+msgid "Error: '%s' is not an active connection."
+msgstr "ದೋಷ: '%s' ಎನ್ನುವುದು ಯಾವುದೆ ಸಕ್ರಿಯ ಸಂಪರ್ಕವಲ್ಲ."
+
+#: ../cli/src/connections.c:1151
+#, c-format
+#| msgid "Unknown parameter: %s\n"
+msgid "Error: unknown parameter: %s"
+msgstr "ದೋಷ: ಗೊತ್ತಿರದ ನಿಯತಾಂಕಗಳು: %s"
+
+#: ../cli/src/connections.c:1258
+#, c-format
+msgid "no active connection on device '%s'"
+msgstr "'%s' ಎಂಬ ಸಾಧನದಲ್ಲಿ ಯಾವುದೆ ಸಕ್ರಿಯ ಸಂಪರ್ಕವು ಕಂಡುಬಂದಿಲ್ಲ"
+
+#: ../cli/src/connections.c:1266
+msgid "no active connection or device"
+msgstr "ಯಾವುದೆ ಸಕ್ರಿಯ ಸಂಪರ್ಕ ಅಥವ ಸಾಧನವು ಕಂಡುಬಂದಿಲ್ಲ"
+
+#: ../cli/src/connections.c:1337
+#, c-format
+msgid "device '%s' not compatible with connection '%s'"
+msgstr "'%s' ಎಂಬ ಸಾಧನವು '%s' ಸಂಪರ್ಕದೊಂದಿಗೆ ಹೊಂದಿಕೊಳ್ಳುತ್ತಿಲ್ಲ"
+
+#: ../cli/src/connections.c:1340
+#, c-format
+msgid "no device found for connection '%s'"
+msgstr "'%s' ಸಂಪರ್ಕಕ್ಕಾಗಿ ಯಾವುದೆ ಸಾಧನವು ಕಂಡು ಬಂದಿಲ್ಲ"
+
+#: ../cli/src/connections.c:1352
 msgid "unknown reason"
 msgstr "ಗೊತ್ತಿರದ ಕಾರಣ"
 
-#: ../cli/src/connections.c:1136
+#: ../cli/src/connections.c:1354
 msgid "none"
 msgstr "ಯಾವುದೂ ಇಲ್ಲ"
 
-#: ../cli/src/connections.c:1138
+#: ../cli/src/connections.c:1356
 msgid "the user was disconnected"
 msgstr "ಬಳಕೆದಾರರೊಂದಿಗೆ ಸಂಪರ್ಕ ಕಡಿದುಹೋಗಿದೆ"
 
-#: ../cli/src/connections.c:1140
+#: ../cli/src/connections.c:1358
 msgid "the base network connection was interrupted"
 msgstr "ಮೂಲ ಜಾಲಬಂಧ ಸಂಪರ್ಕಕ್ಕೆ ತಡೆಯುಂಟಾಗಿದೆ"
 
-#: ../cli/src/connections.c:1142
+#: ../cli/src/connections.c:1360
 msgid "the VPN service stopped unexpectedly"
 msgstr "VPN ಸೇವೆಯನ್ನು ಅನಿರೀಕ್ಷಿತವಾಗಿ ನಿಲ್ಲಿಸಲಾಗಿದೆ"
 
-#: ../cli/src/connections.c:1144
+#: ../cli/src/connections.c:1362
 msgid "the VPN service returned invalid configuration"
 msgstr "VPN ಸೇವೆಯು ಅಮಾನ್ಯವಾದ ಸಂರಚನೆಯನ್ನು ಮರಳಿಸಿದೆ"
 
-#: ../cli/src/connections.c:1146
+#: ../cli/src/connections.c:1364
 msgid "the connection attempt timed out"
 msgstr "ಸಂಪರ್ಕದ ಪ್ರಯತ್ನದ ಕಾಲಾವಧಿ ಮೀರಿದೆ"
 
-#: ../cli/src/connections.c:1148
+#: ../cli/src/connections.c:1366
 msgid "the VPN service did not start in time"
 msgstr "VPN ಸೇವೆಯು ಸರಿಯಾದ ಸಮಯದಲ್ಲಿ ಆರಂಭಗೊಳ್ಳಲಿಲ್ಲ"
 
-#: ../cli/src/connections.c:1150
+#: ../cli/src/connections.c:1368
 msgid "the VPN service failed to start"
 msgstr "VPN ಸೇವೆಯು ಆರಂಭಗೊಳ್ಳಲು ವಿಫಲಗೊಂಡಿದೆ"
 
-#: ../cli/src/connections.c:1152
+#: ../cli/src/connections.c:1370
 msgid "no valid VPN secrets"
 msgstr "ಯಾವುದೆ ಮಾನ್ಯವಾದ VPN ರಹಸ್ಯಗಳಿಲ್ಲ (ಸೀಕ್ರೇಟ್‌ಗಳಿಲ್ಲ)"
 
-#: ../cli/src/connections.c:1154
+#: ../cli/src/connections.c:1372
 msgid "invalid VPN secrets"
 msgstr "ಅಮಾನ್ಯವಾದ VPN ರಹಸ್ಯಗಳು"
 
-#: ../cli/src/connections.c:1156
+#: ../cli/src/connections.c:1374
 msgid "the connection was removed"
 msgstr "ಸಂಪರ್ಕವನ್ನು ತೆಗೆದು ಹಾಕಲಾಗಿದೆ"
 
-#: ../cli/src/connections.c:1170
+#: ../cli/src/connections.c:1391 ../cli/src/connections.c:1596
 #, c-format
-msgid "state: %s\n"
-msgstr "ಸ್ಥಿತಿ: %s\n"
+msgid "Connection successfully activated (D-Bus active path: %s)\n"
+msgstr "ಸಂಪರ್ಕವನ್ನು ಯಶಸ್ವಿಯಾಗಿ ಸಕ್ರಿಯಗೊಳಿಸಲಾಗಿದೆ (D-ಬಸ್ ಸಕ್ರಿಯ ಮಾರ್ಗ: %s)\n"
 
-#: ../cli/src/connections.c:1173 ../cli/src/connections.c:1199
-#, c-format
-msgid "Connection activated\n"
-msgstr "ಸಂಪರ್ಕವನ್ನು ಸಕ್ರಿಯಗೊಳಿಸಲಾಗಿದೆ\n"
-
-#: ../cli/src/connections.c:1176
+#. Active connection failed and dissapeared, quit.
+#: ../cli/src/connections.c:1396 ../cli/src/connections.c:1497
 #, c-format
 msgid "Error: Connection activation failed."
 msgstr "ದೋಷ: ಸಂಪರ್ಕವನ್ನು ಸಕ್ರಿಯಗೊಳಿಕೆಯು ವಿಫಲಗೊಂಡಿದೆ."
 
-#: ../cli/src/connections.c:1195
+#: ../cli/src/connections.c:1421
 #, c-format
-msgid "state: %s (%d)\n"
-msgstr "ಸ್ಥಿತಿ: %s (%d)\n"
+msgid "VPN connection successfully activated (D-Bus active path: %s)\n"
+msgstr ""
+"VPN ಸಂಪರ್ಕವನ್ನು ಯಶಸ್ವಿಯಾಗಿ ಸಕ್ರಿಯಗೊಳಿಸಲಾಗಿದೆ (D-ಬಸ್ ಸಕ್ರಿಯ ಮಾರ್ಗ: %s)\n"
 
-#: ../cli/src/connections.c:1205
+#: ../cli/src/connections.c:1429
 #, c-format
 msgid "Error: Connection activation failed: %s."
 msgstr "ದೋಷ: ಸಂಪರ್ಕ ಸಕ್ರಿಯಗೊಳಿಕೆಯು ವಿಫಲಗೊಂಡಿದೆ: %s."
 
-#: ../cli/src/connections.c:1222 ../cli/src/devices.c:811
+#: ../cli/src/connections.c:1526 ../cli/src/devices.c:1060
 #, c-format
 msgid "Error: Timeout %d sec expired."
 msgstr "ದೋಷ: ಕಾಲಾವಧಿ %d sec ತೀರಿದೆ."
 
-#: ../cli/src/connections.c:1265
+#: ../cli/src/connections.c:1587
 #, 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
-#, c-format
-msgid "Active connection state: %s\n"
-msgstr "ಸಕ್ರಿಯ ಸಂಪರ್ಕದ ಸ್ಥಿತಿ: %s\n"
-
-#: ../cli/src/connections.c:1289
-#, 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:1681 ../cli/src/connections.c:1836
+#: ../cli/src/connections.c:1964
 #, c-format
 msgid "Error: Unknown connection: %s."
 msgstr "ದೋಷ: ಗೊತ್ತಿರದ ಸಂಪರ್ಕ: %s."
 
-#: ../cli/src/connections.c:1378 ../cli/src/devices.c:882
+#: ../cli/src/connections.c:1727 ../cli/src/devices.c:1145
+#: ../cli/src/devices.c:1691
 #, 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:1740 ../cli/src/connections.c:1853
+#: ../cli/src/connections.c:1944
 #, c-format
 msgid "Error: id or uuid has to be specified."
 msgstr "ದೋಷ: id ಅಥವ uuid ಅನ್ನು ಸೂಚಿಸಬೇಕು."
 
-#: ../cli/src/connections.c:1411
+#: ../cli/src/connections.c:1773
 #, c-format
 msgid "Error: No suitable device found: %s."
 msgstr "ದೋಷ: ಯಾವುದೆ ಸೂಕ್ತವಾದ ಸಾಧನವು ಕಂಡು ಬಂದಿಲ್ಲ: %s."
 
-#: ../cli/src/connections.c:1413
+#: ../cli/src/connections.c:1775
 #, c-format
 msgid "Error: No suitable device found."
 msgstr "ದೋಷ: ಯಾವುದೆ ಸೂಕ್ತವಾದ ಸಾಧನವು ಕಂಡು ಬಂದಿಲ್ಲ."
 
-#: ../cli/src/connections.c:1505
+#: ../cli/src/connections.c:1889
 #, c-format
 msgid "Warning: Connection not active\n"
 msgstr "ಎಚ್ಚರಿಕೆ: ಸಂಪರ್ಕವು ಸಕ್ರಿಯವಾಗಿಲ್ಲ\n"
 
-#: ../cli/src/connections.c:1561
+#: ../cli/src/connections.c:1903
+#, c-format
+#| msgid "Error: Connection activation failed: %s"
+msgid "Error: Connection deletion failed: %s"
+msgstr "ದೋಷ: ಸಂಪರ್ಕ ಅಳಿಸುವಿಕೆಯು ವಿಫಲಗೊಂಡಿದೆ: %s"
+
+#: ../cli/src/connections.c:2024
 #, c-format
 msgid "Error: 'con' command '%s' is not valid."
 msgstr "ದೋಷ: 'con' ಆಜ್ಷೆ '%s' ಎಂಬುದು ಮಾನ್ಯವಾದುದಲ್ಲ."
 
-#: ../cli/src/connections.c:1597
+#: ../cli/src/connections.c:2092
 #, c-format
 msgid "Error: could not connect to D-Bus."
 msgstr "ದೋಷ: D-Bus ನೊಂದಿಗೆ ಸಂಪರ್ಕಸಾಧಿಸಲು ಸಾಧ್ಯವಾಗಿಲ್ಲ."
 
-#: ../cli/src/connections.c:1604
+#: ../cli/src/connections.c:2100
 #, c-format
 msgid "Error: Could not get system settings."
 msgstr "ದೋಷ: ವ್ಯವಸ್ಥೆಯ ಸಿದ್ಧತೆಗಳು ಕಂಡುಬಂದಿಲ್ಲ."
 
-#: ../cli/src/connections.c:1612
+#: ../cli/src/connections.c:2110
 #, 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:71 ../cli/src/devices.c:109 ../cli/src/devices.c:190
+#: ../cli/src/devices.c:206
 msgid "DEVICE"
 msgstr "DEVICE"
 
-#. 1
-#. 4
 #. 0
-#: ../cli/src/devices.c:62 ../cli/src/devices.c:90
-#: ../cli/src/network-manager.c:36
-msgid "STATE"
-msgstr "STATE"
-
-#: ../cli/src/devices.c:71
-msgid "GENERAL"
-msgstr "GENERAL"
-
-#. 0
-#: ../cli/src/devices.c:72
+#: ../cli/src/devices.c:84
 msgid "CAPABILITIES"
 msgstr "CAPABILITIES"
 
 #. 1
-#: ../cli/src/devices.c:73
+#: ../cli/src/devices.c:85
 msgid "WIFI-PROPERTIES"
 msgstr "WIFI-PROPERTIES"
 
 #. 2
-#: ../cli/src/devices.c:74
+#: ../cli/src/devices.c:86
 msgid "AP"
 msgstr "AP"
 
 #. 3
-#: ../cli/src/devices.c:75
+#: ../cli/src/devices.c:87
 msgid "WIRED-PROPERTIES"
 msgstr "WIRED-PROPERTIES"
 
 #. 4
-#: ../cli/src/devices.c:76
-msgid "IP4-SETTINGS"
-msgstr "IP4-SETTINGS"
+#: ../cli/src/devices.c:88
+#| msgid "WIFI-PROPERTIES"
+msgid "WIMAX-PROPERTIES"
+msgstr "WIMAX-PROPERTIES"
 
 #. 5
-#: ../cli/src/devices.c:77
-msgid "IP4-DNS"
-msgstr "IP4-DNS"
+#. 0
+#: ../cli/src/devices.c:89 ../cli/src/devices.c:203
+#| msgid "DNS"
+msgid "NSP"
+msgstr "NSP"
+
+#. 6
+#: ../cli/src/devices.c:90
+#| msgid "IP4-DNS"
+msgid "IP4"
+msgstr "IP4"
+
+#. 7
+#: ../cli/src/devices.c:91
+msgid "DHCP4"
+msgstr "DHCP4"
+
+#. 8
+#: ../cli/src/devices.c:92
+msgid "IP6"
+msgstr "IP6"
+
+#. 9
+#: ../cli/src/devices.c:93
+msgid "DHCP6"
+msgstr "DHCP6"
+
+#. 10
+#: ../cli/src/devices.c:94
+msgid "BOND"
+msgstr "BOND"
+
+#. 11
+#: ../cli/src/devices.c:95
+msgid "VLAN"
+msgstr "VLAN"
 
 #. 2
-#: ../cli/src/devices.c:88
+#: ../cli/src/devices.c:111
+msgid "VENDOR"
+msgstr "VENDOR"
+
+#. 3
+#: ../cli/src/devices.c:112
+msgid "PRODUCT"
+msgstr "PRODUCT"
+
+#. 4
+#: ../cli/src/devices.c:113
 msgid "DRIVER"
 msgstr "DRIVER"
 
-#. 3
-#: ../cli/src/devices.c:89
+#. 5
+#: ../cli/src/devices.c:114
+#| msgid "DRIVER"
+msgid "DRIVER-VERSION"
+msgstr "DRIVER-VERSION"
+
+#. 6
+#: ../cli/src/devices.c:115
+msgid "FIRMWARE-VERSION"
+msgstr "FIRMWARE-VERSION"
+
+#. 7
+#: ../cli/src/devices.c:116
 msgid "HWADDR"
 msgstr "HWADDR"
 
+#. 9
+#: ../cli/src/devices.c:118
+msgid "REASON"
+msgstr "REASON"
+
+#. 10
+#: ../cli/src/devices.c:119
+msgid "UDI"
+msgstr "UDI"
+
+#. 11
+#: ../cli/src/devices.c:120
+msgid "IP-IFACE"
+msgstr "IP-IFACE"
+
+#. 12
+#: ../cli/src/devices.c:121
+msgid "NM-MANAGED"
+msgstr "NM-MANAGED"
+
+#. 14
+#: ../cli/src/devices.c:123
+msgid "FIRMWARE-MISSING"
+msgstr "FIRMWARE-MISSING"
+
+#. 15
+#: ../cli/src/devices.c:124
+#| msgid "AUTOCONNECT"
+msgid "CONNECTION"
+msgstr "CONNECTION"
+
 #. 0
-#: ../cli/src/devices.c:99
+#: ../cli/src/devices.c:133
 msgid "CARRIER-DETECT"
 msgstr "CARRIER-DETECT"
 
 #. 1
-#: ../cli/src/devices.c:100
+#: ../cli/src/devices.c:134
 msgid "SPEED"
 msgstr "SPEED"
 
 #. 0
-#: ../cli/src/devices.c:109
+#: ../cli/src/devices.c:143
 msgid "CARRIER"
 msgstr "CARRIER"
 
 #. 0
-#: ../cli/src/devices.c:119
+#: ../cli/src/devices.c:153
 msgid "WEP"
 msgstr "WEP"
 
 #. 1
-#: ../cli/src/devices.c:120
+#: ../cli/src/devices.c:154
 msgid "WPA"
 msgstr "WPA"
 
 #. 2
-#: ../cli/src/devices.c:121
+#: ../cli/src/devices.c:155
 msgid "WPA2"
 msgstr "WPA2"
 
 #. 3
-#: ../cli/src/devices.c:122
+#: ../cli/src/devices.c:156
 msgid "TKIP"
 msgstr "TKIP"
 
 #. 4
-#: ../cli/src/devices.c:123
+#: ../cli/src/devices.c:157
 msgid "CCMP"
 msgstr "CCMP"
 
 #. 0
-#: ../cli/src/devices.c:132
-msgid "ADDRESS"
-msgstr "ADDRESS"
+#: ../cli/src/devices.c:167
+#| msgid "FREQ"
+msgid "CTR-FREQ"
+msgstr "CTR-FREQ"
 
 #. 1
-#: ../cli/src/devices.c:133
-msgid "PREFIX"
-msgstr "PREFIX"
+#: ../cli/src/devices.c:168
+msgid "RSSI"
+msgstr "RSSI"
 
 #. 2
-#: ../cli/src/devices.c:134
-msgid "GATEWAY"
-msgstr "GATEWAY"
+#: ../cli/src/devices.c:169
+msgid "CINR"
+msgstr "CINR"
 
-#. 0
-#: ../cli/src/devices.c:143
-msgid "DNS"
-msgstr "DNS"
+#. 3
+#: ../cli/src/devices.c:170
+msgid "TX-POW"
+msgstr "TX-POW"
+
+#. 4
+#: ../cli/src/devices.c:171
+msgid "BSID"
+msgstr "BSID"
 
 #. 0
-#: ../cli/src/devices.c:153
+#: ../cli/src/devices.c:181
 msgid "SSID"
 msgstr "SSID"
 
 #. 1
-#: ../cli/src/devices.c:154
+#: ../cli/src/devices.c:182
 msgid "BSSID"
 msgstr "BSSID"
 
 #. 2
-#: ../cli/src/devices.c:155
+#: ../cli/src/devices.c:183
 msgid "MODE"
 msgstr "MODE"
 
 #. 3
-#: ../cli/src/devices.c:156
+#: ../cli/src/devices.c:184
 msgid "FREQ"
 msgstr "FREQ"
 
 #. 4
-#: ../cli/src/devices.c:157
+#: ../cli/src/devices.c:185
 msgid "RATE"
 msgstr "RATE"
 
 #. 5
-#: ../cli/src/devices.c:158
+#. 1
+#: ../cli/src/devices.c:186 ../cli/src/devices.c:204
 msgid "SIGNAL"
 msgstr "SIGNAL"
 
 #. 6
-#: ../cli/src/devices.c:159
+#: ../cli/src/devices.c:187
 msgid "SECURITY"
 msgstr "SECURITY"
 
 #. 7
-#: ../cli/src/devices.c:160
+#: ../cli/src/devices.c:188
 msgid "WPA-FLAGS"
 msgstr "WPA-FLAGS"
 
 #. 8
-#: ../cli/src/devices.c:161
+#: ../cli/src/devices.c:189
 msgid "RSN-FLAGS"
 msgstr "RSN-FLAGS"
 
 #. 10
-#: ../cli/src/devices.c:163
+#. 4
+#: ../cli/src/devices.c:191 ../cli/src/devices.c:207
 msgid "ACTIVE"
 msgstr "ACTIVE"
 
-#: ../cli/src/devices.c:186
-#, c-format
+#. 0
+#: ../cli/src/devices.c:219
+msgid "SLAVES"
+msgstr "SLAVES"
+
+#. 0
+#: ../cli/src/devices.c:228
+#| msgid "UUID"
+msgid "ID"
+msgstr "ID"
+
+#: ../cli/src/devices.c:244
+#, c-format
+#| msgid ""
+#| "Usage: nmcli dev { COMMAND | help }\n"
+#| "\n"
+#| "  COMMAND := { status | list | disconnect | wifi }\n"
+#| "\n"
+#| "  status\n"
+#| "  list [iface ]\n"
+#| "  disconnect iface  [--nowait] [--timeout ]\n"
+#| "  wifi [list [iface ] [hwaddr ]]\n"
+#| "\n"
 msgid ""
-"Usage: nmcli dev { COMMAND | help }\n"
+"Usage: nmcli device { COMMAND | help }\n"
+"\n"
+"  COMMAND := { status | list | disconnect | wifi | wimax }\n"
 "\n"
 "  COMMAND := { status | list | disconnect | wifi }\n"
 "\n"
 "  status\n"
 "  list [iface ]\n"
 "  disconnect iface  [--nowait] [--timeout ]\n"
-"  wifi [list [iface ] [hwaddr ]]\n"
+"  wifi [list [iface ] [bssid ]]\n"
+"  wifi connect <(B)SSID> [password ] [wep-key-type key|phrase] "
+"[iface ] [bssid ] [name ]\n"
+"               [--private] [--nowait] [--timeout ]\n"
+"  wimax [list [iface ] [nsp ]]\n"
 "\n"
 msgstr ""
-"ಬಳಕೆ:: nmcli dev { COMMAND | help }\n"
+"ಬಳಕೆ: nmcli device { COMMAND | help }\n"
+"\n"
+"  COMMAND := { status | list | disconnect | wifi | wimax }\n"
 "\n"
 "  COMMAND := { status | list | disconnect | wifi }\n"
 "\n"
 "  status\n"
 "  list [iface ]\n"
 "  disconnect iface  [--nowait] [--timeout ]\n"
-"  wifi [list [iface ] [hwaddr ]]\n"
+"  wifi [list [iface ] [bssid ]]\n"
+"  wifi connect <(B)SSID> [password ] [wep-key-type key|phrase] "
+"[iface ] [bssid ] [name ]\n"
+"               [--private] [--nowait] [--timeout ]\n"
+"  wimax [list [iface ] [nsp ]]\n"
 "\n"
 
-#: ../cli/src/devices.c:206
-msgid "unmanaged"
-msgstr "ನಿರ್ವಹಿಸದೆ ಇರುವ"
-
-#: ../cli/src/devices.c:208
-msgid "unavailable"
-msgstr "ಲಭ್ಯವಿಲ್ಲ"
-
-#: ../cli/src/devices.c:210 ../cli/src/network-manager.c:89
-msgid "disconnected"
-msgstr "ಸಂಪರ್ಕಕಡಿದು ಹೋಗಿದೆ"
-
-#: ../cli/src/devices.c:212
-msgid "connecting (prepare)"
-msgstr "ಸಂಪರ್ಕ ಕಲ್ಪಿಸಲಾಗುತ್ತಿದೆ (ಸಿದ್ಧಗೊಳಿಕೆ)"
-
-#: ../cli/src/devices.c:214
-msgid "connecting (configuring)"
-msgstr "ಸಂಪರ್ಕ ಕಲ್ಪಿಸಲಾಗುತ್ತಿದೆ (ಸಂರಚಿಸುವಿಕೆ)"
-
-#: ../cli/src/devices.c:216
-msgid "connecting (need authentication)"
-msgstr "ಸಂಪರ್ಕ ಕಲ್ಪಿಸಲಾಗುತ್ತಿದೆ (ದೃಢೀಕರಣದ ಅಗತ್ಯವಿದೆ)"
-
-#: ../cli/src/devices.c:218
-msgid "connecting (getting IP configuration)"
-msgstr "ಸಂಪರ್ಕ ಕಲ್ಪಿಸಲಾಗುತ್ತಿದೆ (IP ಸಂರಚನೆಯನ್ನು ಪಡೆಯಲಾಗುತ್ತಿದೆ)"
-
-#: ../cli/src/devices.c:220 ../cli/src/network-manager.c:87
-msgid "connected"
-msgstr "ಸಂಪರ್ಕಗೊಂಡಿದೆ"
-
-#: ../cli/src/devices.c:222
-msgid "connection failed"
-msgstr "ಸಂಪರ್ಕ ವಿಫಲಗೊಂಡಿದೆ"
-
-#: ../cli/src/devices.c:245 ../cli/src/devices.c:380
-msgid "Unknown"
-msgstr "ಗೊತ್ತಿರದ"
-
-#: ../cli/src/devices.c:277
+#: ../cli/src/devices.c:347
 msgid "(none)"
 msgstr "(ಯಾವುದೂ ಇಲ್ಲ)"
 
-#: ../cli/src/devices.c:302
-#, c-format
-msgid "%s: error converting IP4 address 0x%X"
-msgstr "%s: IP4 ವಿಳಾಸ 0x%X ಅನ್ನು ಪರಿವರ್ತಿಸುವಲ್ಲಿ ದೋಷ"
-
-#: ../cli/src/devices.c:349
+#: ../cli/src/devices.c:403
 #, c-format
 msgid "%u MHz"
 msgstr "%u MHz"
 
-#: ../cli/src/devices.c:350
+#: ../cli/src/devices.c:404
 #, c-format
 msgid "%u MB/s"
 msgstr "%u MB/s"
 
-#: ../cli/src/devices.c:359
+#: ../cli/src/devices.c:413
 msgid "Encrypted: "
 msgstr "ಗೂಢಲಿಪೀಕರಣಗೊಂಡ: "
 
-#: ../cli/src/devices.c:364
+#: ../cli/src/devices.c:418
 msgid "WEP "
 msgstr "WEP "
 
-#: ../cli/src/devices.c:366
+#: ../cli/src/devices.c:420
 msgid "WPA "
 msgstr "WPA "
 
-#: ../cli/src/devices.c:368
+#: ../cli/src/devices.c:422
 msgid "WPA2 "
 msgstr "WPA2 "
 
-#: ../cli/src/devices.c:371
+#: ../cli/src/devices.c:425
 msgid "Enterprise "
 msgstr "ಎಂಟರ್ಪ್ರೈಸ್ "
 
-#: ../cli/src/devices.c:380
+#: ../cli/src/devices.c:434
 msgid "Ad-Hoc"
 msgstr "ತಾತ್ಕಾಲಿಕ"
 
-#: ../cli/src/devices.c:380
+#: ../cli/src/devices.c:435
 msgid "Infrastructure"
 msgstr "ಮೂಲಭೂತ ವ್ಯವಸ್ಥೆ"
 
-#: ../cli/src/devices.c:442
+#: ../cli/src/devices.c:471
+msgid "Home"
+msgstr "ನೆಲೆ"
+
+#: ../cli/src/devices.c:474
+msgid "Partner"
+msgstr "ಪಾಲುದಾರ"
+
+#: ../cli/src/devices.c:477
+msgid "Roaming"
+msgstr "ರೋಮಿಂಗ್"
+
+#: ../cli/src/devices.c:549
 #, c-format
 msgid "Error: 'dev list': %s"
 msgstr "ದೋಷ: 'dev list': %s"
 
-#: ../cli/src/devices.c:444
+#: ../cli/src/devices.c:551
 #, c-format
 msgid "Error: 'dev list': %s; allowed fields: %s"
 msgstr "ದೋಷ: 'dev list'; %s; ಅನುಮತಿಸಲಾದ ಕ್ಷೇತ್ರಗಳು: %s"
 
-#: ../cli/src/devices.c:453
+#: ../cli/src/devices.c:560
 msgid "Device details"
 msgstr "ಸಾಧನದ ವಿವರಗಳು"
 
-#: ../cli/src/devices.c:483 ../cli/src/devices.c:827
+#: ../cli/src/devices.c:607 ../cli/src/devices.c:610 ../cli/src/devices.c:1086
+#: ../cli/src/utils.c:479
 msgid "(unknown)"
 msgstr "(ಗೊತ್ತಿರದ)"
 
-#: ../cli/src/devices.c:484
-msgid "unknown)"
-msgstr "ಗೊತ್ತಿರದ)"
+#: ../cli/src/devices.c:619
+#| msgid "connected"
+msgid "not connected"
+msgstr "ಸಂಪರ್ಕಿತಗೊಂಡಿಲ್ಲ"
 
-#: ../cli/src/devices.c:510
+#: ../cli/src/devices.c:646
 #, c-format
 msgid "%u Mb/s"
 msgstr "%u Mb/s"
 
 #. Print header
 #. "WIRED-PROPERTIES"
-#: ../cli/src/devices.c:583
+#: ../cli/src/devices.c:720
 msgid "on"
 msgstr "ಆನ್‌"
 
-#: ../cli/src/devices.c:583
+#: ../cli/src/devices.c:720
 msgid "off"
 msgstr "ಆಫ್"
 
-#: ../cli/src/devices.c:710
+#: ../cli/src/devices.c:928
 #, c-format
 msgid "Error: 'dev status': %s"
 msgstr "ದೋಷ: 'dev status': %s"
 
-#: ../cli/src/devices.c:712
+#: ../cli/src/devices.c:930
 #, c-format
 msgid "Error: 'dev status': %s; allowed fields: %s"
 msgstr "ದೋಷ: 'dev status': %s; ಅನುಮತಿಸಲಾದ ಕ್ಷೇತ್ರಗಳು: %s"
 
-#: ../cli/src/devices.c:719
+#: ../cli/src/devices.c:953
 msgid "Status of devices"
 msgstr "ಸಾಧನಗಳ ಸ್ಥಿತಿ"
 
-#: ../cli/src/devices.c:747
+#: ../cli/src/devices.c:984
 #, 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:1025 ../cli/src/devices.c:1190
+#: ../cli/src/devices.c:1331 ../cli/src/devices.c:1978
 #, c-format
 msgid "Error: Device '%s' not found."
 msgstr "ದೋಷ: '%s' ಎಂಬ ಸಾಧನವು ಕಂಡು ಬಂದಿಲ್ಲ."
 
-#: ../cli/src/devices.c:799
+#: ../cli/src/devices.c:1048
 #, c-format
 msgid "Success: Device '%s' successfully disconnected."
 msgstr "ಯಶಸ್ಸು: '%s' ಎಂಬ ಸಾಧನದಿಂದ ಯಶಸ್ವಿಯಾಗಿ ಸಂಪರ್ಕವನ್ನು ಕಡಿದುಹಾಕಲಾಗಿದೆ."
 
-#: ../cli/src/devices.c:824
+#: ../cli/src/devices.c:1083
 #, c-format
 msgid "Error: Device '%s' (%s) disconnecting failed: %s"
 msgstr "ದೋಷ: '%s' (%s) ಎಂಬ ಸಾಧನದ ಸಂಪರ್ಕವನ್ನು ಕಡಿದು ಹಾಕುವಲ್ಲಿ ವಿಫಲಗೊಂಡಿದೆ: %s"
 
-#: ../cli/src/devices.c:832
+#: ../cli/src/devices.c:1096
 #, c-format
-msgid "Device state: %d (%s)\n"
-msgstr "ಸಾಧನದ ಸ್ಥಿತಿ: %d (%s)\n"
+#| msgid "Success: Device '%s' successfully disconnected."
+msgid "Device '%s' has been disconnected.\n"
+msgstr "'%s' ಎಂಬ ಸಾಧನದಿಂದ ಸಂಪರ್ಕವನ್ನು ಕಡಿದುಹಾಕಲಾಗಿದೆ.\n"
 
-#: ../cli/src/devices.c:896
+#: ../cli/src/devices.c:1159
 #, c-format
 msgid "Error: iface has to be specified."
 msgstr "ದೋಷ: iface ಅನ್ನು ಸೂಚಿಸಬೇಕು."
 
-#: ../cli/src/devices.c:1011
+#: ../cli/src/devices.c:1289
 #, c-format
 msgid "Error: 'dev wifi': %s"
 msgstr "ದೋಷ: 'dev wifi': %s"
 
-#: ../cli/src/devices.c:1013
+#: ../cli/src/devices.c:1291
 #, c-format
 msgid "Error: 'dev wifi': %s; allowed fields: %s"
 msgstr "ದೋಷ: 'dev wifi': %s; ಅನುಮತಿಸಲಾದ ಕ್ಷೇತ್ರಗಳು: %s"
 
-#: ../cli/src/devices.c:1020
+#: ../cli/src/devices.c:1314
 msgid "WiFi scan list"
 msgstr "WiFi ಸ್ಕ್ಯಾನ್ ಪಟ್ಟಿ"
 
-#: ../cli/src/devices.c:1055 ../cli/src/devices.c:1109
+#: ../cli/src/devices.c:1351 ../cli/src/devices.c:1405
 #, c-format
-msgid "Error: Access point with hwaddr '%s' not found."
-msgstr "ದೋಷ: '%s' ಎಂಬ hwaddr ನ ನಿಲುಕಣಾ ಬಿಂದುವು ಕಾಣಿಸುತ್ತಿಲ್ಲ."
+#| msgid "Error: Access point with hwaddr '%s' not found."
+msgid "Error: Access point with bssid '%s' not found."
+msgstr "ದೋಷ: '%s' ಎಂಬ bssid ಯ ನಿಲುಕಣಾ ಬಿಂದುವು ಕಾಣಿಸುತ್ತಿಲ್ಲ."
 
-#: ../cli/src/devices.c:1072
+#: ../cli/src/devices.c:1368
 #, c-format
 msgid "Error: Device '%s' is not a WiFi device."
 msgstr "ದೋಷ: '%s' ಎಂಬುದು ಒಂದು WiFi ಸಾಧನವಾಗಿಲ್ಲ."
 
-#: ../cli/src/devices.c:1136
+#: ../cli/src/devices.c:1436 ../cli/src/devices.c:1482
+#, c-format
+msgid "Connection with UUID '%s' created and activated on device '%s'\n"
+msgstr ""
+"ರಚಿಸಲಾದ UUID '%s' ಯೊಂದಿಗೆ ಸಂಪರ್ಕಿತಗೊಂಡಿದೆ ಮತ್ತು '%s' ಸಾಧನದಲ್ಲಿ "
+"ಸಕ್ರಿಯಗೊಳಿಸಲಾಗಿದೆ\n"
+
+#: ../cli/src/devices.c:1441
+#, c-format
+#| msgid "Error: Connection activation failed: %s."
+msgid "Error: Connection activation failed: (%d) %s."
+msgstr "ದೋಷ: ಸಂಪರ್ಕ ಸಕ್ರಿಯಗೊಳಿಕೆಯು ವಿಫಲಗೊಂಡಿದೆ: (%d) %s."
+
+#: ../cli/src/devices.c:1466
+#, c-format
+msgid "Error: Failed to add/activate new connection: (%d) %s"
+msgstr "ದೋಷ: ಹೊಸ ಸಂಪರ್ಕವನ್ನು ಸೇರಿಸಲು/ಸಕ್ರಿಯಗೊಳಿಸಲು ವಿಫಲಗೊಂಡಿದೆ: (%d) %s"
+
+#: ../cli/src/devices.c:1474
+#, c-format
+msgid "Error: Failed to add/activate new connection: Unknown error"
+msgstr "ದೋಷ: ಹೊಸ ಸಂಪರ್ಕವನ್ನು ಸೇರಿಸಲು/ಸಕ್ರಿಯಗೊಳಿಸಲು ವಿಫಲಗೊಂಡಿದೆ: ಅಜ್ಞಾತ ದೋಷ"
+
+#: ../cli/src/devices.c:1618
+#, c-format
+#| msgid "Error: %s argument is missing."
+msgid "Error: SSID or BSSID are missing."
+msgstr "ದೋಷ: SSID ಅಥವ BSSID ಕಾಣಿಸುತ್ತಿಲ್ಲ."
+
+#: ../cli/src/devices.c:1641
+#, c-format
+#| msgid "Error: timeout value '%s' is not valid."
+msgid "Error: bssid argument value '%s' is not a valid BSSID."
+msgstr "ದೋಷ: bssid ಆರ್ಗ್ಯುಮೆಂಟ್ ಮೌಲ್ಯ '%s' ಒಂದು ಮಾನ್ಯವಾದ BSSID ಆಗಿಲ್ಲ."
+
+#: ../cli/src/devices.c:1665
+#, c-format
+msgid ""
+"Error: wep-key-type argument value '%s' is invalid, use 'key' or 'phrase'."
+msgstr ""
+"ದೋಷ: wep-key-type ಆರ್ಗ್ಯುಮೆಂಟ್ ಮೌಲ್ಯ '%s' ಅಮಾನ್ಯವಾಗಿದೆ, 'key' ಅಥವ 'phrase' "
+"ಅನ್ನು ಬಳಸಿ."
+
+#: ../cli/src/devices.c:1705
+#, c-format
+msgid "Error: BSSID to connect to (%s) differs from bssid argument (%s)."
+msgstr ""
+"ದೋಷ: ಸಂಪರ್ಕಿತಗೊಳ್ಳಬೇಕಿರುವ BSSID ಯು (%s) bssid ಆರ್ಗ್ಯುಮೆಂಟ್‌ಗಿಂತ (%"
+"s)ಭಿನ್ನವಾಗಿರುತ್ತದೆ."
+
+#: ../cli/src/devices.c:1711
+#, c-format
+msgid "Error: Parameter '%s' is neither SSID nor BSSID."
+msgstr "ದೋಷ: '%s' ನಿಯತಾಂಕವು SSID ಅಥವ BSSID ಆಗಿಲ್ಲ."
+
+#: ../cli/src/devices.c:1740
+#, c-format
+#| msgid "Error: Device '%s' is not a WiFi device."
+msgid "Error: Device '%s' is not a Wi-Fi device."
+msgstr "ದೋಷ: '%s' ಎಂಬುದು ಒಂದು Wi-Fi ಸಾಧನವಾಗಿಲ್ಲ."
+
+#: ../cli/src/devices.c:1742
+#, c-format
+#| msgid "Error: No suitable device found."
+msgid "Error: No Wi-Fi device found."
+msgstr "ದೋಷ: ಯಾವುದೆ Wi-Fi ಸಾಧನವು ಕಂಡು ಬಂದಿಲ್ಲ."
+
+#: ../cli/src/devices.c:1760
+#, c-format
+#| msgid "Error: Access point with hwaddr '%s' not found."
+msgid "Error: No network with SSID '%s' found."
+msgstr "ದೋಷ: SSID '%s' ನೊಂದಿಗೆ ಯಾವುದೆ ಜಾಲಬಂಧ ಕಾಣಿಸುತ್ತಿಲ್ಲ."
+
+#: ../cli/src/devices.c:1762
+#, c-format
+#| msgid "Error: Access point with hwaddr '%s' not found."
+msgid "Error: No access point with BSSID '%s' found."
+msgstr "ದೋಷ: '%s' ಎಂಬ BSSID ಯ ನಿಲುಕಣಾ ಬಿಂದುವು ಕಾಣಿಸುತ್ತಿಲ್ಲ."
+
+#: ../cli/src/devices.c:1860
 #, c-format
 msgid "Error: 'dev wifi' command '%s' is not valid."
 msgstr "ದೋಷ: '%s' ಎಂಬ 'dev wifi' ಆಜ್ಞೆಯು ಮಾನ್ಯವಾದುದಲ್ಲ."
 
-#: ../cli/src/devices.c:1183
+#: ../cli/src/devices.c:1936
+#, c-format
+#| msgid "Error: 'dev wifi': %s"
+msgid "Error: 'dev wimax': %s"
+msgstr "ದೋಷ: 'dev wimax': %s"
+
+#: ../cli/src/devices.c:1938
+#, 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:1961
+msgid "WiMAX NSP list"
+msgstr "WiMAX NSP ಪಟ್ಟಿ"
+
+#: ../cli/src/devices.c:1998
+#, c-format
+#| msgid "Error: Device '%s' not found."
+msgid "Error: NSP with name '%s' not found."
+msgstr "ದೋಷ: '%s' ಎಂಬ ಹೆಸರಿನ NSP ಕಂಡು ಬಂದಿಲ್ಲ."
+
+#: ../cli/src/devices.c:2009
+#, 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:2040
+#, c-format
+#| msgid "Error: Access point with hwaddr '%s' not found."
+msgid "Error: Access point with nsp '%s' not found."
+msgstr "ದೋಷ: nsp '%s' ಎಂಬುದರೊಂದಿಗಿನ ನಿಲುಕಣಾ ಬಿಂದುವು ಕಾಣಿಸುತ್ತಿಲ್ಲ."
+
+#: ../cli/src/devices.c:2067
+#, c-format
+#| msgid "Error: 'dev wifi' command '%s' is not valid."
+msgid "Error: 'dev wimax' command '%s' is not valid."
+msgstr "ದೋಷ: '%s' ಎಂಬ 'wimax' ಆಜ್ಞೆಯು ಮಾನ್ಯವಾದುದಲ್ಲ."
+
+#: ../cli/src/devices.c:2120
 #, c-format
 msgid "Error: 'dev' command '%s' is not valid."
 msgstr "ದೋಷ: '%s' ಎಂಬ 'dev' ಆಜ್ಞೆಯು ಮಾನ್ಯವಾದುದಲ್ಲ."
 
-#: ../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"
 
+#. 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:62
-#, c-format
+msgid "PERMISSION"
+msgstr "PERMISSION"
+
+#. 0
+#: ../cli/src/network-manager.c:63
+msgid "VALUE"
+msgstr "VALUE"
+
+#: ../cli/src/network-manager.c:77
+#, 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 | permissions | enable | sleep | wifi | wwan | "
+"wimax }\n"
+"\n"
+"  COMMAND := { status | permissions | enable | sleep | wifi | wwan }\n"
 "\n"
 "  status\n"
-"  sleep\n"
-"  wakeup\n"
+"  permissions\n"
+"  enable [true|false]\n"
+"  sleep [true|false]\n"
 "  wifi [on|off]\n"
 "  wwan [on|off]\n"
+"  wimax [on|off]\n"
 "\n"
 msgstr ""
-"Usage: nmcli nm { COMMAND | help }\n"
+"ಬಳಕೆ: nmcli nm { COMMAND | help }\n"
+"\n"
+"  COMMAND := { status | permissions | enable | sleep | wifi | wwan | "
+"wimax }\n"
 "\n"
-"  COMMAND := { status | sleep | wakeup | wifi | wwan }\n"
+"  COMMAND := { status | permissions | enable | sleep | wifi | wwan }\n"
 "\n"
 "  status\n"
-"  sleep\n"
-"  wakeup\n"
+"  permissions\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:108
 msgid "asleep"
 msgstr "ನಿದ್ರಿಸುವ"
 
-#: ../cli/src/network-manager.c:85
+#: ../cli/src/network-manager.c:110
 msgid "connecting"
 msgstr "ಸಂಪರ್ಕ ಕಲ್ಪಿಸಲಾಗುತ್ತಿದೆ"
 
-#: ../cli/src/network-manager.c:125
+#: ../cli/src/network-manager.c:112
+msgid "connected (local only)"
+msgstr "ಸಂಪರ್ಕಿತಗೊಂಡಿದೆ (ಸ್ಥಳೀಯ ಮಾತ್ರ)"
+
+#: ../cli/src/network-manager.c:114
+#| msgid "connected"
+msgid "connected (site only)"
+msgstr "ಸಂಪರ್ಕಿತಗೊಂಡಿದೆ (ತಾಣ ಮಾತ್ರ)"
+
+#: ../cli/src/network-manager.c:118
+#| msgid "connecting"
+msgid "disconnecting"
+msgstr "ಸಂಪರ್ಕ ತಪ್ಪಿಸಲಾಗುತ್ತಿದೆ"
+
+#: ../cli/src/network-manager.c:158
 #, c-format
 msgid "Error: 'nm status': %s"
 msgstr "ದೋಷ: 'nm status': %s"
 
-#: ../cli/src/network-manager.c:127
+#: ../cli/src/network-manager.c:160
 #, 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:173 ../cli/src/network-manager.c:174
+#: ../cli/src/network-manager.c:175 ../cli/src/network-manager.c:176
+#: ../cli/src/network-manager.c:177 ../cli/src/network-manager.c:179
+#: ../cli/src/network-manager.c:180 ../cli/src/network-manager.c:429
+#: ../cli/src/network-manager.c:484 ../cli/src/network-manager.c:522
+#: ../cli/src/network-manager.c:561
 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:173 ../cli/src/network-manager.c:174
+#: ../cli/src/network-manager.c:175 ../cli/src/network-manager.c:176
+#: ../cli/src/network-manager.c:177 ../cli/src/network-manager.c:179
+#: ../cli/src/network-manager.c:180 ../cli/src/network-manager.c:429
+#: ../cli/src/network-manager.c:484 ../cli/src/network-manager.c:522
+#: ../cli/src/network-manager.c:561
 msgid "disabled"
-msgstr "ಅಶಕ್ತಗೊಂಡ"
+msgstr "ನಿಷ್ಕ್ರಿಯಗೊಂಡ"
 
-#: ../cli/src/network-manager.c:148
+#: ../cli/src/network-manager.c:193
+msgid "NetworkManager status"
+msgstr "NetworkManager ಸ್ಥಿತಿ"
+
+#. Print header
+#: ../cli/src/network-manager.c:196
 msgid "running"
 msgstr "ಚಾಲನೆಯಲ್ಲಿದೆ"
 
-#: ../cli/src/network-manager.c:148
+#: ../cli/src/network-manager.c:196
 msgid "not running"
 msgstr "ಚಾಲನೆಯಲ್ಲಿಲ್ಲ"
 
-#: ../cli/src/network-manager.c:201 ../cli/src/network-manager.c:233
+#: ../cli/src/network-manager.c:271
+msgid "auth"
+msgstr "ದೃಢೀಕರಣ"
+
+#: ../cli/src/network-manager.c:301
+#, c-format
+#| msgid "Error: 'nm status': %s"
+msgid "Error: 'nm permissions': %s"
+msgstr "ದೋಷ: 'nm permissions': %s"
+
+#: ../cli/src/network-manager.c:303
+#, c-format
+#| msgid "Error: 'nm status': %s; allowed fields: %s"
+msgid "Error: 'nm permissions': %s; allowed fields: %s"
+msgstr "ದೋಷ: 'nm permissions': %s; ಅನುಮತಿಸಲಾದ ಕ್ಷೇತ್ರಗಳು: %s"
+
+#: ../cli/src/network-manager.c:324
+#| msgid "NetworkManager status"
+msgid "NetworkManager permissions"
+msgstr "NetworkManager ಅನುಮತಿಗಳು"
+
+#: ../cli/src/network-manager.c:350 ../cli/src/utils.c:459
+#, 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:361
+#, 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:367
+#, c-format
+#| msgid "Error: 'con list': %s"
+msgid "Error in sleep: %s"
+msgstr "ಜಡಗೊಳಿಸುವಲ್ಲಿ ದೋಷ: %s"
+
+#: ../cli/src/network-manager.c:416 ../cli/src/network-manager.c:471
+#: ../cli/src/network-manager.c:509 ../cli/src/network-manager.c:548
 #, 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:424
+#| msgid "WiFi enabled"
+msgid "Networking enabled"
+msgstr "ಜಾಲಬಂಧ ಸಕ್ರಿಯಗೊಂಡಿದೆ"
+
+#: ../cli/src/network-manager.c:440
+#, 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:450
+#, 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:209
+#: ../cli/src/network-manager.c:458
+#, 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:479
 msgid "WiFi enabled"
 msgstr "WiFi ಸಕ್ರಿಯಗೊಂಡಿದೆ"
 
-#: ../cli/src/network-manager.c:220
+#: ../cli/src/network-manager.c:495
 #, c-format
 msgid "Error: invalid 'wifi' parameter: '%s'."
 msgstr "ದೋಷ: ಅಮಾನ್ಯವಾದ 'wifi' ನಿಯತಾಂಕ: '%s'."
 
-#: ../cli/src/network-manager.c:241
+#: ../cli/src/network-manager.c:517
 msgid "WWAN enabled"
 msgstr "WWAN ಸಕ್ರಿಯಗೊಂಡಿದೆ"
 
-#: ../cli/src/network-manager.c:252
+#: ../cli/src/network-manager.c:533
 #, c-format
 msgid "Error: invalid 'wwan' parameter: '%s'."
 msgstr "ದೋಷ: ಅಮಾನ್ಯವಾದ 'wwan' ರ ನಿಯತಾಂಕ: '%s'."
 
-#: ../cli/src/network-manager.c:263
+#: ../cli/src/network-manager.c:556
+#| msgid "WiFi enabled"
+msgid "WiMAX enabled"
+msgstr "WiMAX ಸಕ್ರಿಯಗೊಂಡಿದೆ"
+
+#: ../cli/src/network-manager.c:572
+#, c-format
+#| msgid "Error: invalid 'wifi' parameter: '%s'."
+msgid "Error: invalid 'wimax' parameter: '%s'."
+msgstr "ದೋಷ: ಅಮಾನ್ಯವಾದ 'wimax' ನಿಯತಾಂಕ: '%s'."
+
+#: ../cli/src/network-manager.c:588
 #, c-format
 msgid "Error: 'nm' command '%s' is not valid."
 msgstr "ದೋಷ: '%s' ಎಂಬ 'nm' ಆಜ್ಞೆಯು ಮಾನ್ಯವಾದುದಲ್ಲ."
 
-#: ../cli/src/nmcli.c:69
-#, c-format
+#: ../cli/src/nmcli.c:76
+#, 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] |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"
@@ -973,16 +1817,18 @@ msgid ""
 "  -f[ields] |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"
 "OBJECT\n"
-"  nm          NetworkManager status\n"
-"  con         NetworkManager connections\n"
-"  dev         devices managed by NetworkManager\n"
+"  nm              NetworkManager's status\n"
+"  c[onnection]    NetworkManager's connections\n"
+"  d[evice]        devices managed by NetworkManager\n"
 "\n"
 msgstr ""
-"Usage: %s [OPTIONS] OBJECT { COMMAND | help }\n"
+"ಬಳಕೆ: %s [OPTIONS] OBJECT { COMMAND | help }\n"
 "\n"
 "OPTIONS\n"
 "  -t[erse]                                   terse output\n"
@@ -1000,661 +1846,923 @@ msgstr ""
 "  dev         devices managed by NetworkManager\n"
 "\n"
 
-#: ../cli/src/nmcli.c:113
+#: ../cli/src/nmcli.c:124
 #, c-format
 msgid "Error: Object '%s' is unknown, try 'nmcli help'."
 msgstr "ದೋಷ: '%s' ಎಂಬ ವಸ್ತುವಿನ ಬಗೆಗೆ ತಿಳಿದಿಲ್ಲ, 'nmcli help' ಅನ್ನು ಪ್ರಯತ್ನಿಸಿ."
 
-#: ../cli/src/nmcli.c:143
+#: ../cli/src/nmcli.c:154
 #, c-format
 msgid "Error: Option '--terse' is specified the second time."
 msgstr "ದೋಷ: '--terse' ಎಂಬ ಆಯ್ಕೆಯನ್ನು ಎರಡನೆ ಬಾರಿಗೆ ಸೂಚಿಸಲಾಗಿದೆ."
 
-#: ../cli/src/nmcli.c:148
+#: ../cli/src/nmcli.c:159
 #, c-format
 msgid "Error: Option '--terse' is mutually exclusive with '--pretty'."
 msgstr "ದೋಷ: '--terse' ಎಂಬುದು '--pretty' ಯೊಂದಿಗೆ ಪರಸ್ಪರ ಮೀಸಲಾಗಿದೆ."
 
-#: ../cli/src/nmcli.c:156
+#: ../cli/src/nmcli.c:167
 #, c-format
 msgid "Error: Option '--pretty' is specified the second time."
 msgstr "ದೋಷ: '--pretty' ಎಂಬ ಆಯ್ಕೆಯನ್ನು ಎರಡನೆ ಬಾರಿಗೆ ಸೂಚಿಸಲಾಗಿದೆ."
 
-#: ../cli/src/nmcli.c:161
+#: ../cli/src/nmcli.c:172
 #, 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:182 ../cli/src/nmcli.c:198
 #, 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:191 ../cli/src/nmcli.c:207
 #, c-format
 msgid "Error: '%s' is not valid argument for '%s' option."
 msgstr "ದೋಷ: '%s' ಎನ್ನುವುದು '%s' ಎಂಬ ಆಯ್ಕೆಗೆ ಸರಿಯಾದ ಆರ್ಗ್ಯುಮೆಂಟ್ ಆಗಿಲ್ಲ."
 
-#: ../cli/src/nmcli.c:203
+#: ../cli/src/nmcli.c:214
 #, c-format
 msgid "Error: fields for '%s' options are missing."
 msgstr "ದೋಷ: '%s' ಎಂಬ ಆಯ್ಕೆಯ ಕ್ಷೇತ್ರಗಳು ಕಾಣಿಸುತ್ತಿಲ್ಲ."
 
-#: ../cli/src/nmcli.c:209
+#: ../cli/src/nmcli.c:222
 #, c-format
 msgid "nmcli tool, version %s\n"
 msgstr "nmcli ಉಪಕರಣ, ಆವೃತ್ತಿ %s\n"
 
-#: ../cli/src/nmcli.c:215
+#: ../cli/src/nmcli.c:228
 #, c-format
 msgid "Error: Option '%s' is unknown, try 'nmcli -help'."
 msgstr "ದೋಷ: '%s' ಎಂಬ ಆಯ್ಕೆಯ ಬಗೆಗೆ ತಿಳಿದಿಲ್ಲ, 'nmcli -help' ಅನ್ನು ಪ್ರಯತ್ನಿಸಿ."
 
-#: ../cli/src/nmcli.c:234
+#: ../cli/src/nmcli.c:247
 #, 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:272
+#| 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:288
 msgid "Success"
 msgstr "ಯಶಸ್ವಿಯಾಗಿದೆ"
 
-#: ../cli/src/settings.c:411
+#: ../cli/src/settings.c:563
 #, c-format
 msgid "%d (hex-ascii-key)"
 msgstr "%d (hex-ascii-key)"
 
-#: ../cli/src/settings.c:413
+#: ../cli/src/settings.c:565
 #, c-format
 msgid "%d (104/128-bit passphrase)"
 msgstr "%d (104/128-ಬಿಟ್‌ ಗುಪ್ತವಾಕ್ಯಾಂಶ)"
 
-#: ../cli/src/settings.c:416
+#: ../cli/src/settings.c:568 ../cli/src/settings.c:696
 #, c-format
 msgid "%d (unknown)"
 msgstr "%d (ಅಜ್ಞಾತ)"
 
-#: ../cli/src/settings.c:442
+#: ../cli/src/settings.c:594
 msgid "0 (unknown)"
 msgstr "0 (ಗೊತ್ತಿರದ)"
 
-#: ../cli/src/settings.c:448
+#: ../cli/src/settings.c:600
 msgid "any, "
 msgstr "ಯಾವುದಾದರೂ, "
 
-#: ../cli/src/settings.c:450
+#: ../cli/src/settings.c:602
 msgid "900 MHz, "
 msgstr "900 MHz, "
 
-#: ../cli/src/settings.c:452
+#: ../cli/src/settings.c:604
 msgid "1800 MHz, "
 msgstr "1800 MHz, "
 
-#: ../cli/src/settings.c:454
+#: ../cli/src/settings.c:606
 msgid "1900 MHz, "
 msgstr "1900 MHz, "
 
-#: ../cli/src/settings.c:456
+#: ../cli/src/settings.c:608
 msgid "850 MHz, "
 msgstr "850 MHz, "
 
-#: ../cli/src/settings.c:458
+#: ../cli/src/settings.c:610
 msgid "WCDMA 3GPP UMTS 2100 MHz, "
 msgstr "WCDMA 3GPP UMTS 2100 MHz, "
 
-#: ../cli/src/settings.c:460
+#: ../cli/src/settings.c:612
 msgid "WCDMA 3GPP UMTS 1800 MHz, "
 msgstr "WCDMA 3GPP UMTS 1800 MHz, "
 
-#: ../cli/src/settings.c:462
+#: ../cli/src/settings.c:614
 msgid "WCDMA 3GPP UMTS 1700/2100 MHz, "
 msgstr "WCDMA 3GPP UMTS 1700/2100 MHz, "
 
-#: ../cli/src/settings.c:464
+#: ../cli/src/settings.c:616
 msgid "WCDMA 3GPP UMTS 800 MHz, "
 msgstr "WCDMA 3GPP UMTS 800 MHz, "
 
-#: ../cli/src/settings.c:466
+#: ../cli/src/settings.c:618
 msgid "WCDMA 3GPP UMTS 850 MHz, "
 msgstr "WCDMA 3GPP UMTS 850 MHz, "
 
-#: ../cli/src/settings.c:468
+#: ../cli/src/settings.c:620
 msgid "WCDMA 3GPP UMTS 900 MHz, "
 msgstr "WCDMA 3GPP UMTS 900 MHz, "
 
-#: ../cli/src/settings.c:470
-msgid "WCDMA 3GPP UMTS 1700 MHz, "
-msgstr "WCDMA 3GPP UMTS 1700 MHz, "
+#: ../cli/src/settings.c:622
+msgid "WCDMA 3GPP UMTS 1700 MHz, "
+msgstr "WCDMA 3GPP UMTS 1700 MHz, "
+
+#: ../cli/src/settings.c:624
+#| msgid "WCDMA 3GPP UMTS 900 MHz, "
+msgid "WCDMA 3GPP UMTS 1900 MHz, "
+msgstr "WCDMA 3GPP UMTS 1900 MHz, "
+
+#: ../cli/src/settings.c:626
+#| msgid "WCDMA 3GPP UMTS 2100 MHz, "
+msgid "WCDMA 3GPP UMTS 2600 MHz, "
+msgstr "WCDMA 3GPP UMTS 2600 MHz, "
+
+#: ../cli/src/settings.c:644
+msgid "0 (NONE)"
+msgstr "0 (NONE)"
+
+#: ../cli/src/settings.c:650
+msgid "REORDER_HEADERS, "
+msgstr "REORDER_HEADERS, "
+
+#: ../cli/src/settings.c:652
+msgid "GVRP, "
+msgstr "GVRP, "
+
+#: ../cli/src/settings.c:654
+msgid "LOOSE_BINDING, "
+msgstr "LOOSE_BINDING, "
+
+#: ../cli/src/settings.c:690
+#, c-format
+#| msgid "disabled"
+msgid "%d (disabled)"
+msgstr "%d (ನಿಷ್ಕ್ರಿಯಗೊಂಡ)"
+
+#: ../cli/src/settings.c:692
+#, c-format
+msgid "%d (enabled, prefer public IP)"
+msgstr "%d (ಸಕ್ರಿಯಗೊಂಡಿದೆ, ಸಾರ್ವಜನಿಕ IP ಗೆ ಆದ್ಯತೆ ನೀಡು)"
+
+#: ../cli/src/settings.c:694
+#, c-format
+msgid "%d (enabled, prefer temporary IP)"
+msgstr "%d (ಸಕ್ರಿಯಗೊಂಡಿದೆ, ತಾತ್ಕಾಲಿಕ IP ಗೆ ಆದ್ಯತೆ ನೀಡು)"
 
-#: ../cli/src/settings.c:554 ../cli/src/settings.c:721
+#: ../cli/src/settings.c:827 ../cli/src/settings.c:1023
+#: ../cli/src/settings.c:1732
 msgid "auto"
 msgstr "ಸ್ವಯಂಚಾಲಿತ"
 
-#: ../cli/src/settings.c:716 ../cli/src/settings.c:719
-#: ../cli/src/settings.c:720 ../cli/src/utils.c:172
-msgid "not set"
-msgstr "ಹೊಂದಿಸಲಾಗಿಲ್ಲ"
+#: ../cli/src/utils.c:105
+#, c-format
+#| msgid "%s: error converting IP4 address 0x%X"
+msgid "Error converting IP4 address '0x%X' to text form"
+msgstr "ಇದರಿಂದ IP4 ವಿಳಾಸ '0x%X' ಅನ್ನು ಪಠ್ಯವಾಗಿ ಪರಿವರ್ತಿಸುವಲ್ಲಿ ದೋಷ"
+
+#: ../cli/src/utils.c:133
+#, c-format
+#| msgid "%s: error converting IP4 address 0x%X"
+msgid "Error converting IP6 address '%s' to text form"
+msgstr "ಇದರಿಂದ IP6 ವಿಳಾಸ '%s' ಅನ್ನು ಪಠ್ಯವಾಗಿ ಪರಿವರ್ತಿಸುವಲ್ಲಿ ದೋಷ"
 
-#: ../cli/src/utils.c:124
+#: ../cli/src/utils.c:234
 #, c-format
 msgid "field '%s' has to be alone"
 msgstr "'%s' ಎಂಬ ಕ್ಷೇತ್ರವು ಒಂಟಿಯಾಗಿಯೆ ಇರಬೇಕು"
 
-#: ../cli/src/utils.c:127
+#: ../cli/src/utils.c:237
 #, c-format
 msgid "invalid field '%s'"
 msgstr "ಅಮಾನ್ಯವಾದ ಕ್ಷೇತ್ರ '%s'"
 
-#: ../cli/src/utils.c:146
-#, c-format
+#: ../cli/src/utils.c:256
 msgid "Option '--terse' requires specifying '--fields'"
 msgstr "'--terse' ಎಂಬ ಆಯ್ಕೆಗೆ '--fields' ಅನ್ನು ಸೂಚಿಸಬೇಕಾಗುತ್ತದೆ"
 
-#: ../cli/src/utils.c:150
+#: ../cli/src/utils.c:260
 #, c-format
 msgid "Option '--terse' requires specific '--fields' option values , not '%s'"
 msgstr ""
-"'--terse' ಎಂಬ ಆಯ್ಕೆಗೆ ನಿಶ್ಚಿತವಾದ '--fields' ಆಯ್ಕೆಯ ಮೌಲ್ಯದ ಅಗತ್ಯವಿರುತ್ತದೆಯೆ ಹೊರತು, '%"
-"s' ಎಂಬುದಲ್ಲ"
+"'--terse' ಎಂಬ ಆಯ್ಕೆಗೆ ನಿಶ್ಚಿತವಾದ '--fields' ಆಯ್ಕೆಯ ಮೌಲ್ಯದ ಅಗತ್ಯವಿರುತ್ತದೆಯೆ "
+"ಹೊರತು, "
+"'%s' ಎಂಬುದಲ್ಲ"
+
+#: ../cli/src/utils.c:470
+#, 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:478
+#, c-format
+msgid "Error: NameHasOwner request failed: %s"
+msgstr "ದೋಷ: NameHasOwner ಮನವಿ ವಿಫಲಗೊಂಡಿದೆ: %s"
+
+#: ../cli/src/utils.c:523
+#, 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:532
+#, 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 ಅನ್ನು ಬಳಸಿಕೊಂಡು ಕಾರ್ಯಗತಗೊಳಿಸಲು ಒತ್ತಾಯಪಡಿಸು, ಆದರೆ ಫಲಿತಾಂಶಗಳು "
+"ಅನಿರೀಕ್ಷಿತವಾಗಿರುತ್ತವೆ.\n."
 
-#: ../libnm-util/crypto.c:120
+#: ../libnm-util/crypto.c:133
 #, c-format
 msgid "PEM key file had no end tag '%s'."
 msgstr "PEM ಕೀಲಿ ಕಡತವು ಯಾವುದೆ ಅಂತ್ಯ ಟ್ಯಾಗ್ '%s' ಅನ್ನು ಹೊಂದಿಲ್ಲ."
 
-#: ../libnm-util/crypto.c:130
+#: ../libnm-util/crypto.c:146
 #, c-format
 msgid "Doesn't look like a PEM private key file."
 msgstr "ಒಂದು PEM ಖಾಸಗಿ ಕೀಲಿ ಕಡತದಂತೆ ತೋರುತ್ತಿಲ್ಲ."
 
-#: ../libnm-util/crypto.c:138
+#: ../libnm-util/crypto.c:154
 #, c-format
 msgid "Not enough memory to store PEM file data."
 msgstr "PEM ಕಡತ ದತ್ತಾಂಶವನ್ನು ಶೇಖರಿಸಿಡಲು ಸಾಕಷ್ಟು ಮೆಮೊರಿ ಇಲ್ಲ."
 
-#: ../libnm-util/crypto.c:154
+#: ../libnm-util/crypto.c:170
 #, c-format
 msgid "Malformed PEM file: Proc-Type was not first tag."
 msgstr "ತಪ್ಪಾಗಿರುವ PEM ಕಡತ: Proc-ಬಗೆಯು ಮೊದಲಿನ ಟ್ಯಾಗ್ ಆಗಿಲ್ಲ."
 
-#: ../libnm-util/crypto.c:162
+#: ../libnm-util/crypto.c:178
 #, c-format
 msgid "Malformed PEM file: unknown Proc-Type tag '%s'."
 msgstr "ತಪ್ಪಾಗಿರುವ PEM ಕಡತ: ಗೊತ್ತಿರದ Proc-ಬಗೆಯ ಟ್ಯಾಗ್ '%s'."
 
-#: ../libnm-util/crypto.c:172
+#: ../libnm-util/crypto.c:188
 #, 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:199
 #, 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:206
 #, 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:219
 #, c-format
 msgid "Malformed PEM file: unknown private key cipher '%s'."
 msgstr "ತಪ್ಪಾಗಿರುವ PEM ಕಡತ: ಗೊತ್ತಿರದ ಖಾಸಗಿ ಕೀಲಿ ಸಿಫರ್ '%s'."
 
-#: ../libnm-util/crypto.c:222
+#: ../libnm-util/crypto.c:238
 #, 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' ಯಾವುದೆ ಅಂತ್ಯ ಟ್ಯಾಗ್ '%s' ಅನ್ನು ಹೊಂದಿಲ್ಲ."
+#: ../libnm-util/crypto.c:284
+msgid "Failed to find expected PKCS#8 start tag."
+msgstr "ನಿರೀಕ್ಷಿತ PKCS#8 ಆರಂಭಿಕ ಟ್ಯಾಗ್ ಅನ್ನು ಪತ್ತೆ ಮಾಡಲು ವಿಫಲಗೊಂಡಿದೆ."
 
-#: ../libnm-util/crypto.c:277
+#: ../libnm-util/crypto.c:292
 #, c-format
-msgid "Failed to decode certificate."
-msgstr "ಪ್ರಮಾಣಪತ್ರವನ್ನು ಡೀಕೋಡ್ ಮಾಡಲು ವಿಫಲಗೊಂಡಿದೆ."
+msgid "Failed to find expected PKCS#8 end tag '%s'."
+msgstr "ನಿರೀಕ್ಷಿತ PKCS#8 ಅಂತ್ಯ ಟ್ಯಾಗ್ '%s' ಅನ್ನು ಪತ್ತೆ ಮಾಡಲು ವಿಫಲಗೊಂಡಿದೆ."
+
+#: ../libnm-util/crypto.c:312
+#| msgid "Not enough memory to store file data."
+msgid "Not enough memory to store private key data."
+msgstr "ಖಾಸಗಿ ಕೀಲಿ ದತ್ತಾಂಶವನ್ನು ಶೇಖರಿಸಿಡಲು ಸಾಕಷ್ಟು ಮೆಮೊರಿ ಇಲ್ಲ."
 
-#: ../libnm-util/crypto.c:286
+#: ../libnm-util/crypto.c:317
+#| msgid "Failed to decrypt the private key."
+msgid "Failed to decode PKCS#8 private key."
+msgstr "PKCS#8 ಖಾಸಗಿ ಕೀಲಿಯನ್ನು ಡೀಕೋಡ್ ಮಾಡುವಲ್ಲಿ ವಿಫಲಗೊಂಡಿದೆ."
+
+#: ../libnm-util/crypto.c:339 ../libnm-util/crypto.c:625
 #, 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
+#: ../libnm-util/crypto.c:365
 #, c-format
 msgid "IV must be an even number of bytes in length."
 msgstr "IV ಯ ಉದ್ದವು ಸರಿ ಸಂಖ್ಯೆಯ ಬೈಟ್‌ಗಳಂದ ಆಗಿರಬೇಕು."
 
-#: ../libnm-util/crypto.c:333
+#: ../libnm-util/crypto.c:374
 #, c-format
 msgid "Not enough memory to store the IV."
 msgstr "IV ಅನ್ನು ಶೇಖರಿಸಿಡಲು ಸಾಕಷ್ಟು ಮೆಮೊರಿ ಇಲ್ಲ."
 
-#: ../libnm-util/crypto.c:344
+#: ../libnm-util/crypto.c:385
 #, c-format
 msgid "IV contains non-hexadecimal digits."
 msgstr "IV ಯು ಹೆಕ್ಸಾ-ದಶಮಾಂಶ ಅಲ್ಲದ ಅಂಕೆಗಳನ್ನು ಹೊಂದಿದೆ."
 
-#: ../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_nss.c:336
+#: ../libnm-util/crypto.c:423 ../libnm-util/crypto_gnutls.c:147
+#: ../libnm-util/crypto_gnutls.c:265 ../libnm-util/crypto_nss.c:167
+#: ../libnm-util/crypto_nss.c:332
 #, c-format
 msgid "Private key cipher '%s' was unknown."
 msgstr "ಖಾಸಗಿ ಕೀಲಿ ಸಿಫರ್ '%s' ತಿಳಿದಿಲ್ಲ."
 
-#: ../libnm-util/crypto.c:391
+#: ../libnm-util/crypto.c:432
 #, c-format
 msgid "Not enough memory to decrypt private key."
 msgstr "ಖಾಸಗಿ ಕೀಲಿಯನ್ನು ಡೀಕ್ರಿಪ್ಟ್ ಮಾಡಲು ಸಾಕಷ್ಟು ಮೆಮೊರಿ ಇಲ್ಲ."
 
-#: ../libnm-util/crypto.c:511
+#: ../libnm-util/crypto.c:497
+#, c-format
+msgid "Not enough memory to store decrypted private key."
+msgstr "ಡೀಕ್ರಿಪ್ಟ್ ಮಾಡಲಾದ ಖಾಸಗಿ ಕೀಲಿಯನ್ನು ಶೇಖರಿಸಿಡಲು ಸಾಕಷ್ಟು ಮೆಮೊರಿ ಇಲ್ಲ."
+
+#: ../libnm-util/crypto.c:542
 #, c-format
 msgid "Unable to determine private key type."
 msgstr "ಖಾಸಗಿ ಕೀಲಿಯ ಬಗೆಯನ್ನು ನಿರ್ಧರಿಸಲು ಸಾಧ್ಯವಾಗಿಲ್ಲ."
 
-#: ../libnm-util/crypto.c:530
+#: ../libnm-util/crypto.c:597
 #, 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.c:606
+#, 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:630
+#, c-format
+msgid "Failed to decode certificate."
+msgstr "ಪ್ರಮಾಣಪತ್ರವನ್ನು ಡೀಕೋಡ್ ಮಾಡಲು ವಿಫಲಗೊಂಡಿದೆ."
 
-#: ../libnm-util/crypto_gnutls.c:49
+#: ../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:92
 #, 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:155
 #, 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:164 ../libnm-util/crypto_nss.c:184
 #, c-format
 msgid "Not enough memory for decrypted key buffer."
 msgstr "ಡೀಕ್ರಿಪ್ಟ್ ಮಾಡಲಾದ ಬಫರಿಗಾಗಿ ಸಾಕಷ್ಟು ಮೆಮೊರಿ ಇಲ್ಲ."
 
-#: ../libnm-util/crypto_gnutls.c:173
+#: ../libnm-util/crypto_gnutls.c:172
 #, c-format
 msgid "Failed to initialize the decryption cipher context: %s / %s."
-msgstr "ಡೀಕ್ರಿಪ್ಸ್ ಮಾಡುವ ಸಿಫರ್ ಸಂದರ್ಭವನ್ನು ಆರಂಭಗೊಳಿಸುವಲ್ಲಿ ವಿಫಲಗೊಂಡಿದೆ: %s / %s."
+msgstr ""
+"ಡೀಕ್ರಿಪ್ಸ್ ಮಾಡುವ ಸಿಫರ್ ಸಂದರ್ಭವನ್ನು ಆರಂಭಗೊಳಿಸುವಲ್ಲಿ ವಿಫಲಗೊಂಡಿದೆ: %s / %s."
 
-#: ../libnm-util/crypto_gnutls.c:182
+#: ../libnm-util/crypto_gnutls.c:181
 #, 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:190
 #, 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:199
 #, 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:209 ../libnm-util/crypto_nss.c:263
 #, c-format
 msgid "Failed to decrypt the private key: unexpected padding length."
-msgstr "ಖಾಸಗಿ ಕೀಲಿಯನ್ನು ಡೀಕ್ರಿಪ್ಟ್ ಮಾಡುವಲ್ಲಿ ವಿಫಲಗೊಂಡಿದೆ: ಅನಿರೀಕ್ಷಿತವಾದ ಪ್ಯಾಡಿಂಗ್ ಗಾತ್ರ"
+msgstr ""
+"ಖಾಸಗಿ ಕೀಲಿಯನ್ನು ಡೀಕ್ರಿಪ್ಟ್ ಮಾಡುವಲ್ಲಿ ವಿಫಲಗೊಂಡಿದೆ: ಅನಿರೀಕ್ಷಿತವಾದ ಪ್ಯಾಡಿಂಗ್ "
+"ಗಾತ್ರ"
 
-#: ../libnm-util/crypto_gnutls.c:221 ../libnm-util/crypto_nss.c:278
+#: ../libnm-util/crypto_gnutls.c:220 ../libnm-util/crypto_nss.c:274
 #, 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:285 ../libnm-util/crypto_nss.c:352
 #, c-format
 msgid "Could not allocate memory for encrypting."
 msgstr "ಗೂಢಲಿಪೀಕರಿಸಲು ಮೆಮೊರಿಯನ್ನು ನಿಯೋಜಸಿಲು ಸಾಧ್ಯವಾಗಿಲ್ಲ."
 
-#: ../libnm-util/crypto_gnutls.c:294
+#: ../libnm-util/crypto_gnutls.c:293
 #, 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:302
 #, 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:312
 #, 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:321
 #, c-format
 msgid "Failed to encrypt the data: %s / %s."
 msgstr "ಖಾಸಗಿ ಕೀಲಿಯನ್ನು ಗೂಢಲಿಪೀಕರಿಸುವಲ್ಲಿ ವಿಫಲಗೊಂಡಿದೆ: %s / %s."
 
-#: ../libnm-util/crypto_gnutls.c:362
+#: ../libnm-util/crypto_gnutls.c:361
 #, c-format
 msgid "Error initializing certificate data: %s"
 msgstr "ಪ್ರಮಾಣಪತ್ರ ದತ್ತಾಂಶವನ್ನು ಆರಂಭಿಸುವಲ್ಲಿ ದೋಷ ಉಂಟಾಗಿದೆ: %s"
 
-#: ../libnm-util/crypto_gnutls.c:384
+#: ../libnm-util/crypto_gnutls.c:383
 #, c-format
 msgid "Couldn't decode certificate: %s"
 msgstr "ಪ್ರಮಾಣಪತ್ರವನ್ನು ಡೀಕೋಡ್ ಮಾಡಲು ಸಾಧ್ಯವಾಗಿಲ್ಲ: %s"
 
-#: ../libnm-util/crypto_gnutls.c:408
+#: ../libnm-util/crypto_gnutls.c:407
 #, 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:420
 #, 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:432
 #, c-format
 msgid "Couldn't verify PKCS#12 file: %s"
 msgstr "PKCS#12 ಕಡತವನ್ನು ಪರಿಶೀಲಿಸಲಾಗಿಲ್ಲ: %s"
 
+#: ../libnm-util/crypto_gnutls.c:460
+#, c-format
+#| msgid "Couldn't initialize PKCS#12 decoder: %s"
+msgid "Couldn't initialize PKCS#8 decoder: %s"
+msgstr "PKCS#8 ಡೀಕೋಡರ್ ಅನ್ನು ಆರಂಭಿಸಲು ಸಾಧ್ಯವಾಗಿಲ್ಲ: %s"
+
+#: ../libnm-util/crypto_gnutls.c:483
+#, c-format
+#| msgid "Couldn't decode PKCS#12 file: %s"
+msgid "Couldn't decode PKCS#8 file: %s"
+msgstr "PKCS#8 ಕಡತವನ್ನು ಡೀಕೋಡ್ ಮಾಡಲು ಸಾಧ್ಯವಾಗಿಲ್ಲ: %s"
+
 #: ../libnm-util/crypto_nss.c:56
 #, c-format
 msgid "Failed to initialize the crypto engine: %d."
 msgstr "ಕ್ರಿಪ್ಟೊ ಎಂಜಿನ್ ಅನ್ನು ಆರಂಭಿಸುವಲ್ಲಿ ವಿಫಲಗೊಂಡಿದೆ: %d."
 
-#: ../libnm-util/crypto_nss.c:111
+#: ../libnm-util/crypto_nss.c:107
 #, c-format
 msgid "Failed to initialize the MD5 context: %d."
 msgstr "MD5 ಸಂದರ್ಭವನ್ನು ಆರಂಭಿಸುವಲ್ಲಿ ವಿಫಲಗೊಂಡಿದೆ: %d."
 
-#: ../libnm-util/crypto_nss.c:179
+#: ../libnm-util/crypto_nss.c:175
 #, c-format
 msgid "Invalid IV length (must be at least %d)."
 msgstr "ಅಮಾನ್ಯವಾದ IV ಗಾತ್ರ (ಕನಿಷ್ಟ %d ಇರಬೇಕು)."
 
-#: ../libnm-util/crypto_nss.c:196
+#: ../libnm-util/crypto_nss.c:192
 #, c-format
 msgid "Failed to initialize the decryption cipher slot."
 msgstr "ಡೀಕ್ರಪ್ಟ್ ಮಾಡಲಾಗುವ ಸಿಫರ್ ಜಾಗವನ್ನು ಆರಂಭಿಸಲು ವಿಫಲಗೊಂಡಿದೆ."
 
-#: ../libnm-util/crypto_nss.c:206
+#: ../libnm-util/crypto_nss.c:202
 #, c-format
 msgid "Failed to set symmetric key for decryption."
 msgstr "ಡೀಕ್ರಿಪ್ಟ್ ಮಾಡಲು ಸಿಮಿಟ್ರಿಕ್ ಕೀಲಿಯನ್ನು ಹೊಂದಿಸುವಲ್ಲಿ ವಿಫಲಗೊಂಡಿದೆ."
 
-#: ../libnm-util/crypto_nss.c:216
+#: ../libnm-util/crypto_nss.c:212
 #, c-format
 msgid "Failed to set IV for decryption."
 msgstr "ಡೀಕ್ರಿಪ್ಟ್ ಮಾಡಲು IV ಅನ್ನು ಹೊಂದಿಸುವಲ್ಲಿ ವಿಫಲಗೊಂಡಿದೆ."
 
-#: ../libnm-util/crypto_nss.c:224
+#: ../libnm-util/crypto_nss.c:220
 #, c-format
 msgid "Failed to initialize the decryption context."
 msgstr "ಡೀಕ್ರಿಪ್ಟ್ ಮಾಡುವ ಸನ್ನಿವೇಶವನ್ನು ಆರಂಭಿಸುವಲ್ಲಿ ವಿಫಲಗೊಂಡಿದೆ."
 
-#: ../libnm-util/crypto_nss.c:237
+#: ../libnm-util/crypto_nss.c:233
 #, c-format
 msgid "Failed to decrypt the private key: %d."
 msgstr "ಖಾಸಗಿ ಕೀಲಿಯನ್ನು ಡೀಕ್ರಿಪ್ಟ್ ಮಾಡುವಲ್ಲಿ ವಿಫಲಗೊಂಡಿದೆ: %d."
 
-#: ../libnm-util/crypto_nss.c:245
+#: ../libnm-util/crypto_nss.c:241
 #, c-format
 msgid "Failed to decrypt the private key: decrypted data too large."
 msgstr ""
-"ಖಾಸಗಿ ಕೀಲಿಯನ್ನು ಡೀಕ್ರಿಪ್ಟ್ ಮಾಡುವಲ್ಲಿ ವಿಫಲಗೊಂಡಿದೆ: ಡೀಕ್ರಿಪ್ಟ್ ಮಾಡಲಾದ ದತ್ತಾಂಶದ ಗಾತ್ರವು "
+"ಖಾಸಗಿ ಕೀಲಿಯನ್ನು ಡೀಕ್ರಿಪ್ಟ್ ಮಾಡುವಲ್ಲಿ ವಿಫಲಗೊಂಡಿದೆ: ಡೀಕ್ರಿಪ್ಟ್ ಮಾಡಲಾದ ದತ್ತಾಂಶದ "
+"ಗಾತ್ರವು "
 "ಬಹಳ ದೊಡ್ಡದಾಗಿದೆ."
 
-#: ../libnm-util/crypto_nss.c:256
+#: ../libnm-util/crypto_nss.c:252
 #, c-format
 msgid "Failed to finalize decryption of the private key: %d."
-msgstr "ಖಾಸಗಿ ಕೀಲಿಯನ್ನು ಡೀಕ್ರಿಪ್ಟ್ ಮಾಡುವಿಕೆಯನ್ನು ಪೂರ್ಣಗೊಳಿಸುವಲ್ಲಿ ವಿಫಲಗೊಂಡಿದೆ: %d."
+msgstr ""
+"ಖಾಸಗಿ ಕೀಲಿಯನ್ನು ಡೀಕ್ರಿಪ್ಟ್ ಮಾಡುವಿಕೆಯನ್ನು ಪೂರ್ಣಗೊಳಿಸುವಲ್ಲಿ ವಿಫಲಗೊಂಡಿದೆ: %d."
 
-#: ../libnm-util/crypto_nss.c:364
+#: ../libnm-util/crypto_nss.c:360
 #, c-format
 msgid "Failed to initialize the encryption cipher slot."
 msgstr "ಗೂಢಲಿಪೀಕರಿಸಲಾಗುವ ಸಿಫರ್ ಜಾಗವನ್ನು ಆರಂಭಿಸಲು ವಿಫಲಗೊಂಡಿದೆ."
 
-#: ../libnm-util/crypto_nss.c:372
+#: ../libnm-util/crypto_nss.c:368
 #, c-format
 msgid "Failed to set symmetric key for encryption."
 msgstr "ಗೂಢಲಿಪೀಕರಿಸಲು ಸಿಮಿಟ್ರಿಕ್ ಕೀಲಿಯನ್ನು ಹೊಂದಿಸುವಲ್ಲಿ ವಿಫಲಗೊಂಡಿದೆ."
 
-#: ../libnm-util/crypto_nss.c:380
+#: ../libnm-util/crypto_nss.c:376
 #, c-format
 msgid "Failed to set IV for encryption."
 msgstr "ಗೂಢಲಿಪೀಕರಿಸಲು IV ಅನ್ನು ಹೊಂದಿಸುವಲ್ಲಿ ವಿಫಲಗೊಂಡಿದೆ."
 
-#: ../libnm-util/crypto_nss.c:388
+#: ../libnm-util/crypto_nss.c:384
 #, c-format
 msgid "Failed to initialize the encryption context."
 msgstr "ಗೂಢಲಿಪೀಕರಿಸುವ ಸನ್ನಿವೇಶವನ್ನು ಆರಂಭಿಸುವಲ್ಲಿ ವಿಫಲಗೊಂಡಿದೆ."
 
-#: ../libnm-util/crypto_nss.c:396
+#: ../libnm-util/crypto_nss.c:392
 #, c-format
 msgid "Failed to encrypt: %d."
 msgstr "ಗೂಢಲಿಪೀಕರಿಸುವಲ್ಲಿ ವಿಫಲಗೊಂಡಿದೆ: %d."
 
-#: ../libnm-util/crypto_nss.c:404
+#: ../libnm-util/crypto_nss.c:400
 #, c-format
 msgid "Unexpected amount of data after encrypting."
 msgstr "ಗೂಢಲಿಪೀಕರಿಸಲು ಅನಿರೀಕ್ಷಿತವಾದ ದತ್ತಾಂಶದ ಮೊತ್ತ."
 
-#: ../libnm-util/crypto_nss.c:447
+#: ../libnm-util/crypto_nss.c:443
 #, c-format
 msgid "Couldn't decode certificate: %d"
 msgstr "ಪ್ರಮಾಣಪತ್ರವನ್ನು ಡೀಕೋಡ್ ಮಾಡಲು ಸಾಧ್ಯವಾಗಲಿಲ್ಲ: %d"
 
-#: ../libnm-util/crypto_nss.c:482
+#: ../libnm-util/crypto_nss.c:478
 #, c-format
 msgid "Couldn't convert password to UCS2: %d"
 msgstr "ಗುಪ್ತಪದವನ್ನು UCS2 ಗೆ ಬದಲಾಯಿಸಲು ಸಾಧ್ಯವಾಗಿಲ್ಲ: %d"
 
-#: ../libnm-util/crypto_nss.c:510
+#: ../libnm-util/crypto_nss.c:506
 #, c-format
 msgid "Couldn't initialize PKCS#12 decoder: %d"
 msgstr "PKCS#12 ಡೀಕೋಡರ್ ಅನ್ನು ಆರಂಭಿಸಲು ಸಾಧ್ಯವಾಗಿಲ್ಲ: %d"
 
-#: ../libnm-util/crypto_nss.c:519
+#: ../libnm-util/crypto_nss.c:515
 #, c-format
 msgid "Couldn't decode PKCS#12 file: %d"
 msgstr "PKCS#12 ಕಡತವನ್ನು ಡೀಕೋಡ್ ಮಾಡಲು ಸಾಧ್ಯವಾಗಿಲ್ಲ: %d"
 
-#: ../libnm-util/crypto_nss.c:528
+#: ../libnm-util/crypto_nss.c:524
 #, c-format
 msgid "Couldn't verify PKCS#12 file: %d"
 msgstr "PKCS#12 ಕಡತವನ್ನು ಖಚಿತಪಡಿಸಲು ಸಾಧ್ಯವಾಗಿಲ್ಲ: %d"
 
-#: ../libnm-util/crypto_nss.c:557
+#: ../libnm-util/crypto_nss.c:568
 msgid "Could not generate random data."
 msgstr "ಮನಸ್ಸಿಗೆ ಬಂದ ದತ್ತಾಂಶವನ್ನು ಉತ್ಪಾದಿಸಲಾಗಲಿಲ್ಲ."
 
-#: ../libnm-util/nm-utils.c:1925
+#: ../libnm-util/nm-utils.c:2078
 #, c-format
 msgid "Not enough memory to make encryption key."
 msgstr "ಖಾಸಗಿ ಕೀಲಿಯನ್ನು ಗೂಢಲಿಪೀಕರಿಸಲು ಸಾಕಷ್ಟು ಮೆಮೊರಿ ಇಲ್ಲ."
 
-#: ../libnm-util/nm-utils.c:2035
+#: ../libnm-util/nm-utils.c:2188
 msgid "Could not allocate memory for PEM file creation."
 msgstr "PEM ಕಡತ ರಚನೆಗೆ ಮೆಮೊರಿಯನ್ನು ನಿಯೋಜಿಸಲು ಸಾಧ್ಯವಾಗಿಲ್ಲ."
 
-#: ../libnm-util/nm-utils.c:2047
+#: ../libnm-util/nm-utils.c:2200
 #, 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:2212
 #, c-format
 msgid "Could not allocate memory for writing encrypted key to PEM file."
-msgstr "ಗೂಢಲಿಪೀಕರಿಸಲಾದ ಕೀಲಿಯನ್ನು PEM ಕಡತಕ್ಕೆ ಬರೆಯಲು ಮೆಮೊರಿಯನ್ನು ನಿಯೋಜಿಸಲು ಸಾಧ್ಯವಾಗಿಲ್ಲ."
+msgstr ""
+"ಗೂಢಲಿಪೀಕರಿಸಲಾದ ಕೀಲಿಯನ್ನು PEM ಕಡತಕ್ಕೆ ಬರೆಯಲು ಮೆಮೊರಿಯನ್ನು ನಿಯೋಜಿಸಲು "
+"ಸಾಧ್ಯವಾಗಿಲ್ಲ."
 
-#: ../libnm-util/nm-utils.c:2078
+#: ../libnm-util/nm-utils.c:2231
 #, 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.NetworkManager.policy.in.in.h:1
+msgid "Enable or disable system networking"
+msgstr "ವ್ಯವಸ್ಥೆಯ ಜಾಲಬಂಧವನ್ನು ಶಕ್ತಗೊಳಿಸಿ ಅಥವ ನಿಷ್ಕ್ರಿಯಗೊಳಿಸಿ"
 
-#: ../policy/org.freedesktop.network-manager-settings.system.policy.in.h:2
-msgid "Connection sharing via an open WiFi network"
-msgstr "ಒಂದು ಮುಕ್ತವಾದ WiFi ಜಾಲಬಂಧದ ಮೂಲಕ ಸಂಪರ್ಕ ಸಾಧಿಸುವಿಕೆ"
+#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:2
+msgid "System policy prevents enabling or disabling system networking"
+msgstr ""
+"ವ್ಯವಸ್ಥೆಯ ಜಾಲಬಂಧವನ್ನು ಶಕ್ತ ಅಥವ ನಿಷ್ಕ್ರಿಯಗೊಳಿಸದಂತೆ ವ್ಯವಸ್ಥೆಯ ಪಾಲಿಸಿಯು "
+"ತಡೆಯುತ್ತಿದೆ"
 
-#: ../policy/org.freedesktop.network-manager-settings.system.policy.in.h:3
-msgid "Modify persistent system hostname"
-msgstr "ಸ್ಥಿರ ವ್ಯವಸ್ಥೆಯ ಆತಿಥೇಯ ಹೆಸರನ್ನು ಮಾರ್ಪಡಿಸಿ"
+#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:3
+msgid ""
+"Put NetworkManager to sleep or wake it up (should only be used by system "
+"power management)"
+msgstr ""
+"NetworkManager ಅನ್ನು ನಿದ್ರಾಸ್ಥಿತಿಗೆ ಅಥವ ಎಚ್ಚರಸ್ಥಿತಿಗೆ ಕಳುಹಿಸಿ (ಇದನ್ನು ಕೇವಲ "
+"ವ್ಯವಸ್ಥೆಯ "
+"ವಿದ್ಯುಚ್ಛಕ್ತಿ ನಿರ್ವಹಣೆಯಿಂದ ಮಾತ್ರ ಬಳಸಬೇಕು)"
 
-#: ../policy/org.freedesktop.network-manager-settings.system.policy.in.h:4
-msgid "Modify system connections"
-msgstr "ವ್ಯವಸ್ಥೆಯ ಸಂಪರ್ಕಗಳನ್ನು ಮಾರ್ಪಡಿಸು"
+#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:4
+msgid "System policy prevents putting NetworkManager to sleep or waking it up"
+msgstr ""
+"NetworkManager ಅನ್ನು ನಿದ್ರಾಸ್ಥಿತಿಗೆ ಅಥವ ಎಚ್ಚರಸ್ಥಿತಿಗೆ ಕಳುಹಿಸುವುದನ್ನು "
+"ವ್ಯವಸ್ಥೆಯ "
+"ನಿಯಮವು ತಡೆಯುತ್ತಿದೆ"
 
-#: ../policy/org.freedesktop.network-manager-settings.system.policy.in.h:5
-msgid "System policy prevents modification of system settings"
-msgstr "ವ್ಯವಸ್ಥೆಯ ಸಂಪರ್ಕಗಳನ್ನು ಮಾರ್ಪಡಿಸದಂತೆ ವ್ಯವಸ್ಥೆಯ ನಿಯಮಗಳು ತಡೆಯುತ್ತಿವೆ"
+#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:5
+msgid "Enable or disable WiFi devices"
+msgstr "WiFi ಸಾಧನಗಳನ್ನು ಶಕ್ತಗೊಳಿಸಿ ಅಥವ ನಿಷ್ಕ್ರಿಯಗೊಳಿಸಿ"
 
-#: ../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.NetworkManager.policy.in.in.h:6
+msgid "System policy prevents enabling or disabling WiFi devices"
+msgstr ""
+"WiFi ಸಾಧನವನ್ನು ಶಕ್ತ ಅಥವ ನಿಷ್ಕ್ರಿಯಗೊಳಿಸದಂತೆ ವ್ಯವಸ್ಥೆಯ ನಿಯಮಗಳು ತಡೆಯುತ್ತಿವೆ"
 
-#: ../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.NetworkManager.policy.in.in.h:7
+msgid "Enable or disable mobile broadband devices"
+msgstr "ಮೊಬೈಲ್ ಬ್ರಾಡ್‌ಬ್ಯಾಂಡ್ ಸಾಧನಗಳನ್ನು ಶಕ್ತಗೊಳಿಸಿ ಅಥವ ನಿಷ್ಕ್ರಿಯಗೊಳಿಸಿ"
 
-#: ../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.in.h:8
+msgid "System policy prevents enabling or disabling mobile broadband devices"
+msgstr ""
+"ಮೊಬೈಲ್ ಬ್ರಾಡ್‌ಬ್ಯಾಂಡ್ ಸಾಧನಗಳನ್ನು ಶಕ್ತ ಅಥವ ನಿಷ್ಕ್ರಿಯಗೊಳಿಸದಂತೆ ವ್ಯವಸ್ಥೆಯ "
+"ನಿಯಮಗಳು ತಡೆಯುತ್ತಿವೆ"
+
+#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:9
+#| msgid "Enable or disable mobile broadband devices"
+msgid "Enable or disable WiMAX mobile broadband devices"
+msgstr "WiMAX  ಮೊಬೈಲ್ ಬ್ರಾಡ್‌ಬ್ಯಾಂಡ್ ಸಾಧನಗಳನ್ನು ಶಕ್ತಗೊಳಿಸಿ ಅಥವ ನಿಷ್ಕ್ರಿಯಗೊಳಿಸಿ"
 
-#: ../policy/org.freedesktop.NetworkManager.policy.in.h:1
+#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:10
+#| 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.in.h:11
 msgid "Allow control of network connections"
 msgstr "ಜಾಲಬಂಧ ಸಂಪರ್ಕಗಳನ್ನು ನಿಯಂತ್ರಿಸುವುದನ್ನು ಅನುಮತಿಸಿ"
 
-#: ../policy/org.freedesktop.NetworkManager.policy.in.h:2
-msgid "Allow use of user-specific connections"
-msgstr "ಬಳಕೆದಾರ-ನಿಶ್ಚಿತ ಸಂಪರ್ಕಗಳನ್ನು  ಬಳಸುವುದನ್ನು ಅನುಮತಿಸು"
+#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:12
+msgid "System policy prevents control of network connections"
+msgstr "ಜಾಲಬಂಧ ಸಂಪರ್ಕಗಳನ್ನು ನಿಯಂತ್ರಿಸುವುದನ್ನು ವ್ಯವಸ್ಥೆಯ ನಿಯಮಗಳು ತಡೆಯುತ್ತಿವೆ"
 
-#: ../policy/org.freedesktop.NetworkManager.policy.in.h:3
-msgid "Enable or disable WiFi devices"
-msgstr "WiFi ಸಾಧನಗಳನ್ನು ಶಕ್ತಗೊಳಿಸಿ ಅಥವ ಅಶಕ್ತಗೊಳಿಸಿ"
+#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:13
+msgid "Connection sharing via a protected WiFi network"
+msgstr "ಒಂದು ಸಂರಕ್ಷಿತವಾದ WiFi ಜಾಲಬಂಧದ ಮೂಲಕ ಸಂಪರ್ಕ ಸಾಧಿಸುವಿಕೆ"
 
-#: ../policy/org.freedesktop.NetworkManager.policy.in.h:4
-msgid "Enable or disable mobile broadband devices"
-msgstr "ಮೊಬೈಲ್ ಬ್ರಾಡ್‌ಬ್ಯಾಂಡ್ ಸಾಧನಗಳನ್ನು ಶಕ್ತಗೊಳಿಸಿ ಅಥವ ಅಶಕ್ತಗೊಳಿಸಿ"
+#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:14
+msgid "System policy prevents sharing connections via a protected WiFi network"
+msgstr ""
+"ಒಂದು ಸಂರಕ್ಷಿತವಾದ WiFi ಜಾಲಬಂಧದ ಮೂಲಕ ಸಂಪರ್ಕ ಸಾಧಿಸದಂತೆ ವ್ಯವಸ್ಥೆಯ ನಿಯಮಗಳು "
+"ತಡೆಯುತ್ತವೆ"
 
-#: ../policy/org.freedesktop.NetworkManager.policy.in.h:5
-msgid "Enable or disable system networking"
-msgstr "ವ್ಯವಸ್ಥೆಯ ಜಾಲಬಂಧವನ್ನು ಶಕ್ತಗೊಳಿಸಿ ಅಥವ ಅಶಕ್ತಗೊಳಿಸಿ"
+#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:15
+msgid "Connection sharing via an open WiFi network"
+msgstr "ಒಂದು ಮುಕ್ತವಾದ WiFi ಜಾಲಬಂಧದ ಮೂಲಕ ಸಂಪರ್ಕ ಸಾಧಿಸುವಿಕೆ"
 
-#: ../policy/org.freedesktop.NetworkManager.policy.in.h:6
-msgid ""
-"Put NetworkManager to sleep or wake it up (should only be used by system "
-"power management)"
+#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:16
+msgid "System policy prevents sharing connections via an open WiFi network"
 msgstr ""
-"NetworkManager ಅನ್ನು ನಿದ್ರಾಸ್ಥಿತಿಗೆ ಅಥವ ಎಚ್ಚರಸ್ಥಿತಿಗೆ ಕಳುಹಿಸಿ (ಇದನ್ನು ಕೇವಲ ವ್ಯವಸ್ಥೆಯ "
-"ವಿದ್ಯುಚ್ಛಕ್ತಿ ನಿರ್ವಹಣೆಯಿಂದ ಮಾತ್ರ ಬಳಸಬೇಕು)"
+"ಒಂದು ಮುಕ್ತವಾದ WiFi ಜಾಲಬಂಧದ ಮೂಲಕ ಸಂಪರ್ಕ ಸಾಧಿಸದಂತೆ ವ್ಯವಸ್ಥೆಯ ನಿಯಮಗಳು ತಡೆಯುತ್ತವೆ"
+
+#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:17
+#| msgid "Allow control of network connections"
+msgid "Modify personal network connections"
+msgstr "ವೈಯಕ್ತಿಕ ಜಾಲಬಂಧ ಸಂಪರ್ಕಗಳನ್ನು ಮಾರ್ಪಡಿಸಿ"
 
-#: ../policy/org.freedesktop.NetworkManager.policy.in.h:7
+#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:18
 #| msgid "System policy prevents modification of system settings"
-msgid "System policy prevents control of network connections"
-msgstr "ಜಾಲಬಂಧ ಸಂಪರ್ಕಗಳನ್ನು ನಿಯಂತ್ರಿಸುವುದನ್ನು ವ್ಯವಸ್ಥೆಯ ನಿಯಮಗಳು ತಡೆಯುತ್ತಿವೆ"
+msgid "System policy prevents modification of personal network settings"
+msgstr ""
+"ವೈಯಕ್ತಿಕ ಜಾಲಬಂಧದ ಸಿದ್ಧತೆಗಳನ್ನು ಮಾರ್ಪಡಿಸದಂತೆ ವ್ಯವಸ್ಥೆಯ ನಿಯಮಗಳು ತಡೆಯುತ್ತವೆ"
 
-#: ../policy/org.freedesktop.NetworkManager.policy.in.h:8
-#| msgid "System policy prevents sharing connections via an open WiFi network"
-msgid "System policy prevents enabling or disabling WiFi devices"
-msgstr "WiFi ಸಾಧನವನ್ನು ಶಕ್ತ ಅಥವ ಅಶಕ್ತಗೊಳಿಸದಂತೆ ವ್ಯವಸ್ಥೆಯ ನಿಯಮಗಳು ತಡೆಯುತ್ತಿವೆ"
+#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:19
+#| msgid "Modify system connections"
+msgid "Modify network connections for all users"
+msgstr "ಎಲ್ಲಾ ಬಳಕೆದಾರರಿಗಾಗಿ ಜಾಲಬಂಧ ಸಂಪರ್ಕಗಳನ್ನು ಮಾರ್ಪಡಿಸಿ"
 
-#: ../policy/org.freedesktop.NetworkManager.policy.in.h:9
-msgid "System policy prevents enabling or disabling mobile broadband devices"
+#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:20
+#| msgid "System policy prevents modification of system settings"
+msgid "System policy prevents modification of network settings for all users"
 msgstr ""
-"ಮೊಬೈಲ್ ಬ್ರಾಡ್‌ಬ್ಯಾಂಡ್ ಸಾಧನಗಳನ್ನು ಶಕ್ತ ಅಥವ ಅಶಕ್ತಗೊಳಿಸದಂತೆ ವ್ಯವಸ್ಥೆಯ ನಿಯಮಗಳು ತಡೆಯುತ್ತಿವೆ"
+"ಎಲ್ಲಾ ಬಳಕೆದಾರರಿಗಾಗಿ ಜಾಲಬಂಧದ ಸಿದ್ಧತೆಗಳನ್ನು ಮಾರ್ಪಡಿಸದಂತೆ ವ್ಯವಸ್ಥೆಯ ನಿಯಮಗಳು "
+"ತಡೆಯುತ್ತವೆ"
 
-#: ../policy/org.freedesktop.NetworkManager.policy.in.h:10
-#| msgid "System policy prevents modification of system settings"
-msgid "System policy prevents enabling or disabling system networking"
-msgstr "ವ್ಯವಸ್ಥೆಯ ಜಾಲಬಂಧವನ್ನು ಶಕ್ತ ಅಥವ ಅಶಕ್ತಗೊಳಿಸದಂತೆ ವ್ಯವಸ್ಥೆಯ ಪಾಲಿಸಿಯು ತಡೆಯುತ್ತಿದೆ"
+#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:21
+msgid "Modify persistent system hostname"
+msgstr "ಸ್ಥಿರ ವ್ಯವಸ್ಥೆಯ ಆತಿಥೇಯ ಹೆಸರನ್ನು ಮಾರ್ಪಡಿಸಿ"
 
-#: ../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.in.h:22
+msgid "System policy prevents modification of the persistent system hostname"
 msgstr ""
-"NetworkManager ಅನ್ನು ನಿದ್ರಾಸ್ಥಿತಿಗೆ ಅಥವ ಎಚ್ಚರಸ್ಥಿತಿಗೆ ಕಳುಹಿಸುವುದನ್ನು ವ್ಯವಸ್ಥೆಯ ನಿಯಮವು "
-"ತಡೆಯುತ್ತಿದೆ"
-
-#: ../policy/org.freedesktop.NetworkManager.policy.in.h:12
-#| msgid "System policy prevents modification of system settings"
-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
+#: ../src/main.c:158
 #, c-format
-msgid "error processing netlink message: %s"
-msgstr "ನೆಟ್‌ಲಿಂಕ್ ಸಂದೇಶವನ್ನು ಸಂಸ್ಕರಿಸುವಲ್ಲಿ ದೋಷ ಉಂಟಾಗಿದೆ: %s"
+#| msgid "Failed to encrypt: %d."
+msgid "Failed to set signal mask: %d"
+msgstr "ಸಂಜ್ಞೆ ಮುಸುಕನ್ನು ಹೊಂದಿಸುವಲ್ಲಿ ವಿಫಲಗೊಂಡಿದೆ: %d"
 
-#: ../src/nm-netlink-monitor.c:214
-msgid "error occurred while waiting for data on socket"
-msgstr "ಸಾಕೆಟ್‌ನಲ್ಲಿ ದತ್ತಾಂಶಕ್ಕಾಗಿ ಕಾಯುವಾಗ ದೋಷವು ಎದುರಾಗಿದೆ"
+#: ../src/main.c:167
+#, c-format
+msgid "Failed to create signal handling thread: %d"
+msgstr "ಸಂಜ್ಞೆ ನಿಭಾಯಿಸುವ ಎಳೆಯನ್ನು ನಿರ್ಮಿಸುವಲ್ಲಿ ವಿಫಲವಾಗಿದೆ :%d"
 
-#: ../src/nm-netlink-monitor.c:254
+#: ../src/main.c:182
 #, c-format
-msgid "unable to connect to netlink for monitoring link status: %s"
-msgstr ""
-"ಕೊಂಡಿಯ ಸ್ಥಿತಿಯನ್ನು ಮೇಲ್ವಿಚಾರಣೆ ನಡೆಸಲು ನೆಟ್‌ಲಿಂಕ್‌ನೊಂದಿಗೆ ಸಂಪರ್ಕ ಜೋಡಿಸಲು ಸಾಧ್ಯವಾಗಿಲ್ಲ: %"
-"s"
+msgid "Opening %s failed: %s\n"
+msgstr "%s ಅನ್ನು ತೆರೆಯುವಲ್ಲಿ ವಿಫಲಗೊಂಡಿದೆ: %s\n"
 
-#: ../src/nm-netlink-monitor.c:265
+#: ../src/main.c:188
 #, c-format
-msgid "unable to enable netlink handle credential passing: %s"
-msgstr "ನೆಟ್‌ಲಿಂಕ್ ಹ್ಯಾಂಡಲ್ ಕ್ರೆಡೆನ್ಶಿಯಲ್ ಪಾಸಿಂಗ್ ಅನ್ನು ಶಕ್ತಗೊಳಿಸಲು ಸಾಧ್ಯವಾಗಿಲ್ಲ: %s"
+msgid "Writing to %s failed: %s\n"
+msgstr "%s ಗೆ ಬರೆಯುವಲ್ಲಿ ವಿಫಲಗೊಂಡಿದೆ: %s\n"
 
-#: ../src/nm-netlink-monitor.c:291 ../src/nm-netlink-monitor.c:353
+#: ../src/main.c:193
 #, c-format
-msgid "unable to allocate netlink handle for monitoring link status: %s"
-msgstr ""
-"ಕೊಂಡಿಯ ಸ್ಥಿತಿಯನ್ನು ಮೇಲ್ವಿಚಾರಣೆ ನಡೆಸಲು ನೆಟ್‌ಲಿಂಕ್  ಹ್ಯಾಂಡಲ್ ಅನ್ನು ನಿಯೋಜಿಸಲು "
-"ಸಾಧ್ಯವಾಗಿಲ್ಲ: %s"
+msgid "Closing %s failed: %s\n"
+msgstr "%s ಅನ್ನು ಮುಚ್ಚುವಲ್ಲಿ ವಿಫಲಗೊಂಡಿದೆ: %s\n"
 
-#: ../src/nm-netlink-monitor.c:376
+#: ../src/main.c:236
 #, c-format
-msgid "unable to allocate netlink link cache for monitoring link status: %s"
+msgid "NetworkManager is already running (pid %ld)\n"
+msgstr "NetworkManager ಈಗಾಗಲೆ ಚಾಲನೆಯಲ್ಲಿದೆ (pid %ld)\n"
+
+#: ../src/main.c:363
+#| msgid "NetworkManager status"
+msgid "Print NetworkManager version and exit"
+msgstr "NetworkManager ಆವೃತ್ತಿಯನ್ನು ಮುದ್ರಿಸಿ ನಿರ್ಗಮಿಸು"
+
+#: ../src/main.c:364
+msgid "Don't become a daemon"
+msgstr "ಒಂದು ಡೆಮನ್ ಆಗಬೇಡ"
+
+#: ../src/main.c:365
+msgid "Make all warnings fatal"
+msgstr "ಎಲ್ಲಾ ಎಚ್ಚರಿಕೆಗಳನ್ನು ಮಾರಕವಾಗಿಸು"
+
+#: ../src/main.c:366
+msgid "Specify the location of a PID file"
+msgstr "ಒಂದು PID ಕಡತವನ್ನು ಸೂಚಿಸಿ"
+
+#: ../src/main.c:366
+msgid "filename"
+msgstr "ಕಡತದಹೆಸರು"
+
+#: ../src/main.c:367
+msgid "State file location"
+msgstr "ಸ್ಥಿತಿ ಕಡತವು ಇರುವ ಸ್ಥಳ"
+
+#: ../src/main.c:367
+msgid "/path/to/state.file"
+msgstr "/path/to/state.file"
+
+#: ../src/main.c:368
+msgid "Config file location"
+msgstr "Config ಕಡತವು ಇರುವ ಸ್ಥಳ"
+
+#: ../src/main.c:368
+msgid "/path/to/config.file"
+msgstr "/path/to/config.file"
+
+#: ../src/main.c:369
+msgid "List of plugins separated by ','"
+msgstr "',' ಇಂದ ಪ್ರತ್ಯೇಕಿಸಲಾದ ಪ್ಲಗ್‌ಇನ್‌ಗಳ ಪಟ್ಟಿ"
+
+#: ../src/main.c:369
+msgid "plugin1,plugin2"
+msgstr "plugin1,plugin2"
+
+#. Translators: Do not translate the values in the square brackets
+#: ../src/main.c:371
+msgid "Log level: one of [ERR, WARN, INFO, DEBUG]"
+msgstr "ದಿನಚರಿಯ ಹಂತ: [ERR, WARN, INFO, DEBUG] ದಲ್ಲಿ ಒಂದು"
+
+#. Translators: Do not translate the values in the square brackets
+#: ../src/main.c:374
+msgid ""
+"Log domains separated by ',': any combination of\n"
+"                                                [NONE,HW,RFKILL,ETHER,WIFI,"
+"BT,MB,DHCP4,DHCP6,PPP,\n"
+"                                                 WIFI_SCAN,IP4,IP6,AUTOIP4,"
+"DNS,VPN,SHARING,SUPPLICANT,\n"
+"                                                 AGENTS,SETTINGS,SUSPEND,"
+"CORE,DEVICE,OLPC,WIMAX,\n"
+"                                                 INFINIBAND,FIREWALL,ADSL]"
 msgstr ""
-"ಕೊಂಡಿಯ ಸ್ಥಿತಿಯನ್ನು ಮೇಲ್ವಿಚಾರಣೆ ನಡೆಸಲು ನೆಟ್‌ಲಿಂಕ್ ಕೊಂಡಿ ಕ್ಯಾಶೆಯನ್ನು ನಿಯೋಜಿಸಲು "
-"ಸಾಧ್ಯವಾಗಿಲ್ಲ: %s"
+"ದಿನಚರಿಯ ಡೊಮೈನ್‌ಗಳನ್ನು ',' ಇಂದ ಪ್ರತ್ಯೇಕಿಸಲಾಗಿರುತ್ತದೆ: ಇವುಗಳಲ್ಲಿ ಯಾವುದಾದರ "
+"ಸಂಯೋಜನೆಯಾಗಿರಬಹುದು\n"
+"                                                [NONE,HW,RFKILL,ETHER,WIFI,"
+"BT,MB,DHCP4,DHCP6,PPP,\n"
+"                                                 WIFI_SCAN,IP4,IP6,AUTOIP4,"
+"DNS,VPN,SHARING,SUPPLICANT,\n"
+"                                                 AGENTS,SETTINGS,SUSPEND,"
+"CORE,DEVICE,OLPC,WIMAX,\n"
+"                                                 INFINIBAND,FIREWALL,ADSL]"
+
+#: ../src/main.c:380
+msgid "An http(s) address for checking internet connectivity"
+msgstr "ಅಂತರಜಾಲ ಸಂಪರ್ಕವನ್ನು ಪರಿಶೀಲಿಸಲು ಒಂದು http(s) ವಿಳಾಸ"
+
+#: ../src/main.c:381
+msgid "The interval between connectivity checks (in seconds)"
+msgstr "ಸಂಪರ್ಕದ ಪರಿಶೀಲನೆಯ ನಡುವಿನ ಕಾಲಾವಧಿ (ಸೆಕೆಂಡುಗಳಲ್ಲಿ)"
+
+#: ../src/main.c:382
+msgid "The expected start of the response"
+msgstr "ಪ್ರತಿಕ್ರಿಯೆಯ ನಿರೀಕ್ಷಿತ ಆರಂಭ"
+
+#: ../src/main.c:382
+msgid "Bingo!"
+msgstr "ಬಿಂಗೂ!"
+
+#: ../src/main.c:387
+#, c-format
+msgid "GModules are not supported on your platform!\n"
+msgstr "GModules ನಿಮ್ಮ ಪ್ಲಾಟ್‌ಫಾರ್ಮಿನಲ್ಲಿ ಬೆಂಬಲಿತವಾಗಿಲ್ಲ!\n"
+
+#: ../src/main.c:406
+msgid ""
+"NetworkManager monitors all network connections and automatically\n"
+"chooses the best connection to use.  It also allows the user to\n"
+"specify wireless access points which wireless cards in the computer\n"
+"should associate with."
+msgstr ""
+"NetworkManager ಎಲ್ಲಾ ಜಾಲಬಂಧ ಸಂಪರ್ಕಗಳನ್ನು ನೋಡಿಕೊಳ್ಳುತ್ತದೆ ಮತ್ತು ಬಳಸಬೇಕಿರುವ \n"
+"ಉತ್ತಮ ಸಂಪರ್ಕವನ್ನು ಸ್ವಯಂಚಾಲಿತವಾಗಿ ಆಯ್ಕೆ ಮಾಡುತ್ತದೆ.  ಅಷ್ಟೇ ಅಲ್ಲದೆ ಇದು "
+"ಗಣಕದಲ್ಲಿನ\n"
+"ಯಾವ ವೈರ್ಲೆಸ್ ಕಾರ್ಡುಗಳನ್ನು ವೈರ್ಲೆಸ್‌ ನಿಲುಕು ಬಿಂದುಗಳಿಗೆ ಸೂಚಿಸಬೇಕು ಎಂದು "
+"ಬಳಕೆದಾರರು\n"
+"ನಿರ್ಧರಿಸಲು ಸಹಾಯ ಮಾಡುತ್ತದೆ."
 
-#: ../src/nm-netlink-monitor.c:502
+#: ../src/main.c:412
 #, c-format
-msgid "unable to join netlink group: %s"
-msgstr "ನೆಟ್‌ಲಿಂಕ್ ಗುಂಪನ್ನು ಸೇರಲು ಸಾಧ್ಯವಾಗಿಲ್ಲ: %s"
+msgid "Invalid option.  Please use --help to see a list of valid options.\n"
+msgstr "ಅಮಾನ್ಯವಾದ ಆಯ್ಕೆ.  ಮಾನ್ಯವಾದ ಆಯ್ಕೆಗಳಿಗಾಗಿ ದಯವಿಟ್ಟು --help ಅನ್ನು ನೋಡಿ.\n"
 
-#: ../src/nm-netlink-monitor.c:629 ../src/nm-netlink-monitor.c:642
+#: ../src/main.c:422
 #, c-format
-msgid "error updating link cache: %s"
-msgstr "ಕೊಂಡಿ ಕ್ಯಾಶೆಯನ್ನು ಅಪ್‌ಡೇಟ್ ಮಾಡುವಾಗ ದೋಷ ಉಂಟಾಗಿದೆ: %s"
+#| msgid "Error: Could not connect to NetworkManager."
+msgid "You must be root to run NetworkManager!\n"
+msgstr "NetworkManager ಅನ್ನು ಚಲಾಯಿಸಲು ನೀವು ನಿರ್ವಾಹಕರಾಗಿರಬೇಕು!\n"
 
-#: ../src/main.c:502
+#: ../src/main.c:449
 #, c-format
-msgid "Invalid option.  Please use --help to see a list of valid options.\n"
-msgstr "ಅಮಾನ್ಯವಾದ ಆಯ್ಕೆ.  ಮಾನ್ಯವಾದ ಆಯ್ಕೆಗಳಿಗಾಗಿ ದಯವಿಟ್ಟು --help ಅನ್ನು ನೋಡಿ.\n"
+#| msgid "Failed to set IV for encryption: %s / %s."
+msgid "Failed to read configuration: (%d) %s\n"
+msgstr "ಸಂರಚನೆಯನ್ನು ಓದುವಲ್ಲಿ ವಿಫಲಗೊಂಡಿದೆ: (%d) %s\n"
 
-#: ../src/main.c:568
+#: ../src/main.c:460
 #, 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/main.c:467
+#, c-format
+msgid "State file %s parsing failed: (%d) %s\n"
+msgstr "ಸ್ಥಿತಿ ಕಡತ %s ಅನ್ನು ಪಾರ್ಸ್ ಮಾಡುವಲ್ಲಿ ವಿಫಲತೆ: (%d) %s\n"
+
+#: ../src/main.c:484
+#, c-format
+msgid "Could not daemonize: %s [error %u]\n"
+msgstr "ಡೀಮನ್ ಮಾಡಲು ಸಾಧ್ಯವಾಗಿಲ್ಲ: %s [ದೋಷ %u]\n"
+
+#: ../src/dhcp-manager/nm-dhcp-dhclient-utils.c:138
 msgid "# Created by NetworkManager\n"
 msgstr "# NetworkManager ನಿಂದ ನಿರ್ಮಿಸಲಾಗಿದೆ\n"
 
-#: ../src/dhcp-manager/nm-dhcp-dhclient.c:341
+#: ../src/dhcp-manager/nm-dhcp-dhclient-utils.c:145
 #, c-format
 msgid ""
 "# Merged from %s\n"
@@ -1663,52 +2771,270 @@ msgstr ""
 "# %s ಇಂದ ಒಗ್ಗೂಡಿಸಲಾಗಿದೆ\n"
 "\n"
 
-#: ../src/dhcp-manager/nm-dhcp-manager.c:279
+#: ../src/dhcp-manager/nm-dhcp-manager.c:266
 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:275
 msgid "'dhclient' could be found."
 msgstr "'dhclient' ಕಂಡು ಬಂದಿದೆ."
 
-#: ../src/dhcp-manager/nm-dhcp-manager.c:298
+#: ../src/dhcp-manager/nm-dhcp-manager.c:285
 msgid "'dhcpcd' could be found."
 msgstr "'dhcpcd' ಕಂಡು ಬಂದಿದೆ."
 
-#: ../src/dhcp-manager/nm-dhcp-manager.c:306
+#: ../src/dhcp-manager/nm-dhcp-manager.c:293
 #, c-format
 msgid "unsupported DHCP client '%s'"
 msgstr "ಬೆಂಬಲವಿರದ DHCP ಕ್ಲೈಂಟ್ '%s'"
 
-#: ../src/logging/nm-logging.c:146
+#: ../src/dns-manager/nm-dns-manager.c:375
+msgid "NOTE: the libc resolver may not support more than 3 nameservers."
+msgstr ""
+"ಸೂಚನೆ: libc ಪರಿಹಾರಕವು(ರಿಸಾಲ್ವರ್) ೩ ನಾಮಪರಿಚಾರಕಗಳಿಗಿಂತ ಹೆಚ್ಚಿನವುಗಳನ್ನು "
+"ಬೆಂಬಲಿಸುವುದಿಲ್ಲ."
+
+#: ../src/dns-manager/nm-dns-manager.c:377
+msgid "The nameservers listed below may not be recognized."
+msgstr "ಈ ಕೆಳಗೆ ಸೂಚಿಸಲಾದ ನಾಮಪರಿಚಾರಕಗಳನ್ನು ಗುರುತಿಸಲಾಗಿಲ್ಲ."
+
+#: ../src/logging/nm-logging.c:142
 #, c-format
 msgid "Unknown log level '%s'"
 msgstr "ಗೊತ್ತಿರದ ದಾಖಲೆ ಮಟ್ಟ '%s'"
 
-#: ../src/logging/nm-logging.c:171
+#: ../src/logging/nm-logging.c:181
 #, 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."
+#: ../src/modem-manager/nm-modem-cdma.c:280
+#: ../src/modem-manager/nm-modem-broadband.c:546 ../src/nm-device-bt.c:352
+#, c-format
+#| msgid "connection failed"
+msgid "CDMA connection %d"
+msgstr "CDMA ಸಂಪರ್ಕ %d"
+
+#: ../src/modem-manager/nm-modem-gsm.c:558
+#: ../src/modem-manager/nm-modem-broadband.c:524 ../src/nm-device-bt.c:348
+#, c-format
+#| msgid "connection failed"
+msgid "GSM connection %d"
+msgstr "GSM ಸಂಪರ್ಕ %d"
+
+#: ../src/nm-device-bond.c:200
+#, c-format
+#| msgid "connection failed"
+msgid "Bond connection %d"
+msgstr "ಬಾಂಡ್ ಸಂಪರ್ಕ %d"
+
+#: ../src/nm-device-adsl.c:193
+#, c-format
+#| msgid "connection failed"
+msgid "ADSL connection %d"
+msgstr "ADSL ಸಂಪರ್ಕ %d"
+
+#: ../src/nm-device-bridge.c:206
+#, c-format
+#| msgid "Active connections"
+msgid "Bridge connection %d"
+msgstr "ಬ್ರಿಡ್ಜ್‍ ಸಂಪರ್ಕ %d"
+
+#: ../src/nm-device-bt.c:323
+#, c-format
+#| msgid "VPN connection failed"
+msgid "PAN connection %d"
+msgstr "PAN ಸಂಪರ್ಕ %d"
+
+#: ../src/nm-device-bt.c:356
+#, c-format
+#| msgid "VPN connection failed"
+msgid "DUN connection %d"
+msgstr "DUN ಸಂಪರ್ಕ %d"
+
+#: ../src/nm-device-ethernet.c:1326
+#, c-format
+#| msgid "VPN connection failed"
+msgid "PPPoE connection %d"
+msgstr "PPPoE ಸಂಪರ್ಕ %d"
+
+#: ../src/nm-device-ethernet.c:1326 ../src/settings/nm-settings-utils.c:50
+#, c-format
+#| msgid "Active connections"
+msgid "Wired connection %d"
+msgstr "ತಂತಿಯುಕ್ತ ಸಂಪರ್ಕ %d"
+
+#: ../src/nm-device-infiniband.c:301
+#, c-format
+msgid "InfiniBand connection %d"
+msgstr "InfiniBand ಸಂಪರ್ಕ %d"
+
+#: ../src/nm-device-olpc-mesh.c:311
+#, c-format
+msgid "Mesh %d"
+msgstr "ಜಾಲರಿ %d"
+
+#: ../src/nm-device-vlan.c:362
+#, c-format
+#| msgid "VPN connection failed"
+msgid "VLAN connection %d"
+msgstr "VLAN ಸಂಪರ್ಕ %d"
+
+#: ../src/nm-manager.c:666
+#, c-format
+#| msgid "VPN connection failed"
+msgid "VPN connection %d"
+msgstr "VPN ಸಂಪರ್ಕ %d"
+
+#: ../src/nm-netlink-monitor.c:148 ../src/nm-netlink-monitor.c:272
+#: ../src/nm-netlink-monitor.c:695
+#, c-format
+msgid "error processing netlink message: %s"
+msgstr "ನೆಟ್‌ಲಿಂಕ್ ಸಂದೇಶವನ್ನು ಸಂಸ್ಕರಿಸುವಲ್ಲಿ ದೋಷ ಉಂಟಾಗಿದೆ: %s"
+
+#: ../src/nm-netlink-monitor.c:251
+msgid "error occurred while waiting for data on socket"
+msgstr "ಸಾಕೆಟ್‌ನಲ್ಲಿ ದತ್ತಾಂಶಕ್ಕಾಗಿ ಕಾಯುವಾಗ ದೋಷವು ಎದುರಾಗಿದೆ"
+
+#: ../src/nm-netlink-monitor.c:296
+#, c-format
+msgid "unable to connect to netlink for monitoring link status: %s"
 msgstr ""
-"ಸೂಚನೆ: libc ಪರಿಹಾರಕವು(ರಿಸಾಲ್ವರ್) ೩ ನಾಮಪರಿಚಾರಕಗಳಿಗಿಂತ ಹೆಚ್ಚಿನವುಗಳನ್ನು "
-"ಬೆಂಬಲಿಸುವುದಿಲ್ಲ."
+"ಕೊಂಡಿಯ ಸ್ಥಿತಿಯನ್ನು ಮೇಲ್ವಿಚಾರಣೆ ನಡೆಸಲು ನೆಟ್‌ಲಿಂಕ್‌ನೊಂದಿಗೆ ಸಂಪರ್ಕ ಜೋಡಿಸಲು "
+"ಸಾಧ್ಯವಾಗಿಲ್ಲ: "
+"%s"
 
-#: ../src/dns-manager/nm-dns-manager.c:352
-msgid "The nameservers listed below may not be recognized."
-msgstr "ಈ ಕೆಳಗೆ ಸೂಚಿಸಲಾದ ನಾಮಪರಿಚಾರಕಗಳನ್ನು ಗುರುತಿಸಲಾಗಿಲ್ಲ."
+#: ../src/nm-netlink-monitor.c:307
+#, c-format
+msgid "unable to enable netlink handle credential passing: %s"
+msgstr ""
+"ನೆಟ್‌ಲಿಂಕ್ ಹ್ಯಾಂಡಲ್ ಕ್ರೆಡೆನ್ಶಿಯಲ್ ಪಾಸಿಂಗ್ ಅನ್ನು ಶಕ್ತಗೊಳಿಸಲು ಸಾಧ್ಯವಾಗಿಲ್ಲ: %s"
+
+#: ../src/nm-netlink-monitor.c:330 ../src/nm-netlink-monitor.c:390
+#, c-format
+msgid "unable to allocate netlink handle for monitoring link status: %s"
+msgstr ""
+"ಕೊಂಡಿಯ ಸ್ಥಿತಿಯನ್ನು ಮೇಲ್ವಿಚಾರಣೆ ನಡೆಸಲು ನೆಟ್‌ಲಿಂಕ್  ಹ್ಯಾಂಡಲ್ ಅನ್ನು ನಿಯೋಜಿಸಲು "
+"ಸಾಧ್ಯವಾಗಿಲ್ಲ: %s"
+
+#: ../src/nm-netlink-monitor.c:415
+#, c-format
+msgid "unable to allocate netlink link cache for monitoring link status: %s"
+msgstr ""
+"ಕೊಂಡಿಯ ಸ್ಥಿತಿಯನ್ನು ಮೇಲ್ವಿಚಾರಣೆ ನಡೆಸಲು ನೆಟ್‌ಲಿಂಕ್ ಕೊಂಡಿ ಕ್ಯಾಶೆಯನ್ನು ನಿಯೋಜಿಸಲು "
+"ಸಾಧ್ಯವಾಗಿಲ್ಲ: %s"
+
+#: ../src/nm-netlink-monitor.c:542
+#, c-format
+msgid "unable to join netlink group: %s"
+msgstr "ನೆಟ್‌ಲಿಂಕ್ ಗುಂಪನ್ನು ಸೇರಲು ಸಾಧ್ಯವಾಗಿಲ್ಲ: %s"
 
-#: ../src/settings/nm-default-wired-connection.c:157
+#: ../src/nm-netlink-monitor.c:671 ../src/nm-netlink-monitor.c:684
 #, c-format
-msgid "Auto %s"
-msgstr "ಸ್ವಯಂ %s"
+msgid "error updating link cache: %s"
+msgstr "ಕೊಂಡಿ ಕ್ಯಾಶೆಯನ್ನು ಅಪ್‌ಡೇಟ್ ಮಾಡುವಾಗ ದೋಷ ಉಂಟಾಗಿದೆ: %s"
 
-#: ../system-settings/plugins/ifcfg-rh/reader.c:3275
+#: ../src/settings/plugins/ifcfg-rh/reader.c:110
 msgid "System"
 msgstr "ವ್ಯವಸ್ಥೆ"
 
+#: ../src/settings/plugins/ifcfg-rh/reader.c:3702
+msgid "Bond"
+msgstr "ಬಾಂಡ್"
+
+#: ../src/settings/plugins/ifcfg-rh/reader.c:3887
+msgid "Bridge"
+msgstr "ಬ್ರಿಡ್ಜ್‍"
+
+#: ../test/nm-online.c:111
+#, c-format
+#| msgid "connecting"
+msgid "\rConnecting"
+msgstr "\rಸಂಪರ್ಕ ಕಲ್ಪಿಸಲಾಗುತ್ತಿದೆ"
+
+#: ../test/nm-online.c:142
+msgid "Time to wait for a connection, in seconds (default is 30)"
+msgstr "ಒಂದು ಸಂಪರ್ಕಕ್ಕೆ ಕಾಯಬೇಕಿರುವ ಸಮಯ (ಪೂರ್ವನಿಯೋಜಿತವು 30 ಆಗಿರುತ್ತದೆ)"
+
+#: ../test/nm-online.c:143
+msgid "Exit immediately if NetworkManager is not running or connecting"
+msgstr "NetworkManager ಸಂಪರ್ಕಿತಗೊಳ್ಳದೆ ಇದ್ದಲ್ಲಿ ತಕ್ಷಣವೆ ನಿರ್ಗಮಿಸು"
+
+#: ../test/nm-online.c:144
+msgid "Don't print anything"
+msgstr "ಏನನ್ನೂ ಮುದ್ರಿಸಬೇಡ"
+
+#: ../test/nm-online.c:162
+#| msgid "Error: Could not connect to NetworkManager."
+msgid "Waits for a successful connection in NetworkManager."
+msgstr "NetworkManager ನಲ್ಲಿನ ಒಂದು ಯಶಸ್ವಿ ಸಂಪರ್ಕಸಾಧಿಸಲು ಕಾಯಲಾಗುತ್ತಿದೆ."
+
+#: ../test/nm-online.c:168 ../test/nm-online.c:177
+#| msgid "Invalid option.  Please use --help to see a list of valid options.\n"
+msgid "Invalid option.  Please use --help to see a list of valid options."
+msgstr "ಅಮಾನ್ಯವಾದ ಆಯ್ಕೆ.  ಮಾನ್ಯವಾದ ಆಯ್ಕೆಗಳಿಗಾಗಿ ದಯವಿಟ್ಟು --help ಅನ್ನು ನೋಡಿ."
+
+#~ msgid "SCOPE"
+#~ msgstr "SCOPE"
+
+#~ msgid "DBUS-SERVICE"
+#~ msgstr "DBUS-SERVICE"
+
+#~ msgid "system"
+#~ msgstr "ವ್ಯವಸ್ಥೆ"
+
+#~ msgid "user"
+#~ msgstr "ಬಳಕೆದಾರ"
+
+#~ msgid "System connections"
+#~ msgstr "ವ್ಯವಸ್ಥೆಯ ಸಂಪರ್ಕಗಳು"
+
+#~ msgid "User connections"
+#~ msgstr "ಬಳಕೆದಾರ ಸಂಪರ್ಕಗಳು"
+
+#~ msgid "state: %s\n"
+#~ msgstr "ಸ್ಥಿತಿ: %s\n"
+
+#~ msgid "Connection activated\n"
+#~ msgstr "ಸಂಪರ್ಕವನ್ನು ಸಕ್ರಿಯಗೊಳಿಸಲಾಗಿದೆ\n"
+
+#~ msgid "state: %s (%d)\n"
+#~ msgstr "ಸ್ಥಿತಿ: %s (%d)\n"
+
+#~ msgid "Error: Obtaining active connection for '%s' failed."
+#~ msgstr "ದೋಷ: '%s' ಗಾಗಿ ಸಕ್ರಿಯ ಸಂಪರ್ಕವನ್ನು ಪಡೆಯುವಲ್ಲಿ ವಿಫಲಗೊಂಡಿದೆ."
+
+#~ msgid "Active connection state: %s\n"
+#~ msgstr "ಸಕ್ರಿಯ ಸಂಪರ್ಕದ ಸ್ಥಿತಿ: %s\n"
+
+#~ msgid "Active connection path: %s\n"
+#~ msgstr "ಸಕ್ರಿಯ ಸಂಪರ್ಕ ಮಾರ್ಗ: %s\n"
+
+#~ msgid "IP4-SETTINGS"
+#~ msgstr "IP4-SETTINGS"
+
+#~ msgid "PREFIX"
+#~ msgstr "PREFIX"
+
+#~ msgid "unknown)"
+#~ msgstr "ಗೊತ್ತಿರದ)"
+
+#~ msgid "Device state: %d (%s)\n"
+#~ msgstr "ಸಾಧನದ ಸ್ಥಿತಿ: %d (%s)\n"
+
+#~ msgid "not set"
+#~ msgstr "ಹೊಂದಿಸಲಾಗಿಲ್ಲ"
+
+#~ msgid "Allow use of user-specific connections"
+#~ msgstr "ಬಳಕೆದಾರ-ನಿಶ್ಚಿತ ಸಂಪರ್ಕಗಳನ್ನು  ಬಳಸುವುದನ್ನು ಅನುಮತಿಸು"
+
+#~| msgid "System policy prevents modification of system settings"
+#~ msgid "System policy prevents use of user-specific connections"
+#~ msgstr "ಬಳಕೆದಾರ-ನಿಶ್ಚಿತ ಸಂಪರ್ಕಗಳನ್ನು ಬಳಸುವುದಂತೆ ವ್ಯವಸ್ಥೆಯ ನಿಯಮವು ತಡೆಯುತ್ತಿದೆ"
+
+#~ msgid "Auto %s"
+#~ msgstr "ಸ್ವಯಂ %s"
+
 #~ msgid "Type"
 #~ msgstr "ಬಗೆ"
 
diff --git a/po/lt.po b/po/lt.po
index 52f70bfc..0b1abc8f 100644
--- a/po/lt.po
+++ b/po/lt.po
@@ -9,43 +9,48 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: NetworkManager HEAD\n"
-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
-"product=NetworkManager&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2012-04-28 03:24+0000\n"
-"PO-Revision-Date: 2012-04-28 16:21+0300\n"
+"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=NetworkManager&keywords=I18N+L10N&component=general\n"
+"POT-Creation-Date: 2012-07-18 15:25+0000\n"
+"PO-Revision-Date: 2012-08-25 22:45+0300\n"
 "Last-Translator: Aurimas Černius \n"
 "Language-Team: Lietuvių <>\n"
+"Language: lt\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: lt\n"
-"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && (n%"
-"100<10 || n%100>=20) ? 1 : 2)\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
 "X-Generator: Virtaal 0.5.2\n"
 
-#: ../cli/src/common.c:32 ../cli/src/common.c:44 ../cli/src/common.c:52
-#: ../cli/src/common.c:63 ../cli/src/connections.c:125
-#: ../cli/src/connections.c:159
+#: ../cli/src/common.c:32
+#: ../cli/src/common.c:44
+#: ../cli/src/common.c:52
+#: ../cli/src/common.c:63
+#: ../cli/src/connections.c:128
+#: ../cli/src/connections.c:162
 msgid "GROUP"
 msgstr "GRUPĖ"
 
 #. 0
-#: ../cli/src/common.c:33 ../cli/src/common.c:53
+#: ../cli/src/common.c:33
+#: ../cli/src/common.c:53
 msgid "ADDRESS"
 msgstr "ADRESAS"
 
 #. 1
-#: ../cli/src/common.c:34 ../cli/src/common.c:54
+#: ../cli/src/common.c:34
+#: ../cli/src/common.c:54
 msgid "ROUTE"
 msgstr "KELIAS"
 
 #. 2
-#: ../cli/src/common.c:35 ../cli/src/common.c:55
+#: ../cli/src/common.c:35
+#: ../cli/src/common.c:55
 msgid "DNS"
 msgstr "DNS"
 
 #. 3
-#: ../cli/src/common.c:36 ../cli/src/common.c:56
+#: ../cli/src/common.c:36
+#: ../cli/src/common.c:56
 msgid "DOMAIN"
 msgstr "DOMENAS"
 
@@ -55,22 +60,319 @@ msgid "WINS"
 msgstr "SĖKMĖS"
 
 #. 0
-#: ../cli/src/common.c:45 ../cli/src/common.c:64
+#: ../cli/src/common.c:45
+#: ../cli/src/common.c:64
 msgid "OPTION"
 msgstr "PARINKTIS"
 
+#: ../cli/src/common.c:366
+msgid "unmanaged"
+msgstr "nevaldomas"
+
+#: ../cli/src/common.c:368
+msgid "unavailable"
+msgstr "neprieinamas"
+
+#: ../cli/src/common.c:370
+#: ../cli/src/network-manager.c:120
+msgid "disconnected"
+msgstr "atjungtas"
+
+#: ../cli/src/common.c:372
+msgid "connecting (prepare)"
+msgstr "jungiamasi (ruošiama)"
+
+#: ../cli/src/common.c:374
+msgid "connecting (configuring)"
+msgstr "jungiamasi (konfigūruojama)"
+
+#: ../cli/src/common.c:376
+msgid "connecting (need authentication)"
+msgstr "jungiamasi (reikia nustatyti tapatybę)"
+
+#: ../cli/src/common.c:378
+msgid "connecting (getting IP configuration)"
+msgstr "jungiamasi (gaunama IP konfigūracija)"
+
+#: ../cli/src/common.c:380
+msgid "connecting (checking IP connectivity)"
+msgstr "jungiamasi (tikrinamas IP jungiamumas)"
+
+#: ../cli/src/common.c:382
+msgid "connecting (starting secondary connections)"
+msgstr "jungiamasi (paleidžiami antriniai prisijungimai)"
+
+#: ../cli/src/common.c:384
+#: ../cli/src/network-manager.c:116
+msgid "connected"
+msgstr "prisijungta"
+
+#: ../cli/src/common.c:386
+#: ../cli/src/connections.c:633
+msgid "deactivating"
+msgstr "deaktyvuojama"
+
+#: ../cli/src/common.c:388
+msgid "connection failed"
+msgstr "prisijungti nepavyko"
+
+#: ../cli/src/common.c:390
+#: ../cli/src/connections.c:636
+#: ../cli/src/connections.c:659
+#: ../cli/src/connections.c:1349
+#: ../cli/src/devices.c:622
+#: ../cli/src/network-manager.c:123
+#: ../cli/src/network-manager.c:185
+#: ../cli/src/network-manager.c:188
+#: ../cli/src/network-manager.c:197
+#: ../cli/src/network-manager.c:257
+#: ../cli/src/network-manager.c:273
+#: ../cli/src/network-manager.c:431
+#: ../cli/src/network-manager.c:486
+#: ../cli/src/network-manager.c:524
+#: ../cli/src/network-manager.c:563
+#: ../cli/src/settings.c:585
+#: ../cli/src/settings.c:613
+#: ../cli/src/utils.c:531
+#: ../src/main.c:462
+#: ../src/main.c:481
+msgid "unknown"
+msgstr "nežinoma"
+
+#: ../cli/src/common.c:399
+msgid "No reason given"
+msgstr "Nenurodyta priežastis"
+
+#: ../cli/src/common.c:402
+msgid "Unknown error"
+msgstr "Nežinoma klaida"
+
+#: ../cli/src/common.c:405
+msgid "Device is now managed"
+msgstr "Įrenginys dabar yra valdomas"
+
+#: ../cli/src/common.c:408
+msgid "Device is now unmanaged"
+msgstr "Įrenginys dabar yra nevaldomas"
+
+#: ../cli/src/common.c:411
+msgid "The device could not be readied for configuration"
+msgstr "Nepavyko paruošti įrenginio konfigūravimui"
+
+#: ../cli/src/common.c:414
+msgid "IP configuration could not be reserved (no available address, timeout, etc)"
+msgstr "Nepavyko rezervuoti IP konfigūracijos (nėra galimo adreso, baigėsi laikas ir kt.)"
+
+#: ../cli/src/common.c:417
+msgid "The IP configuration is no longer valid"
+msgstr "IP konfigūracija nebeteisinga"
+
+#: ../cli/src/common.c:420
+msgid "Secrets were required, but not provided"
+msgstr "Reikalingos bet nepateiktos paslaptys"
+
+#: ../cli/src/common.c:423
+msgid "802.1X supplicant disconnected"
+msgstr "802.1X prašytojas atjungtas"
+
+#: ../cli/src/common.c:426
+msgid "802.1X supplicant configuration failed"
+msgstr "802.1X prašytojo konfigūracija nepavyko"
+
+#: ../cli/src/common.c:429
+msgid "802.1X supplicant failed"
+msgstr "802.1X prašytojas dingo"
+
+#: ../cli/src/common.c:432
+msgid "802.1X supplicant took too long to authenticate"
+msgstr "802.1X prašytojui per ilgai užtruko patvirtinti tapatybę"
+
+#: ../cli/src/common.c:435
+msgid "PPP service failed to start"
+msgstr "nepavyko paleisti PPP tarnybos"
+
+#: ../cli/src/common.c:438
+msgid "PPP service disconnected"
+msgstr "PPP tarnyba atjungta"
+
+#: ../cli/src/common.c:441
+msgid "PPP failed"
+msgstr "PPP nepavyko"
+
+#: ../cli/src/common.c:444
+msgid "DHCP client failed to start"
+msgstr "nepavyko paleisti DHCP kliento"
+
+#: ../cli/src/common.c:447
+msgid "DHCP client error"
+msgstr "DHCO kliento klaida"
+
+#: ../cli/src/common.c:450
+msgid "DHCP client failed"
+msgstr "DHCP klientas dingo"
+
+#: ../cli/src/common.c:453
+msgid "Shared connection service failed to start"
+msgstr "Bendro ryšio tarnybos nepavyko paleisti"
+
+#: ../cli/src/common.c:456
+msgid "Shared connection service failed"
+msgstr "Nepavyko bendro ryšio tarnybos paleidimas"
+
+#: ../cli/src/common.c:459
+msgid "AutoIP service failed to start"
+msgstr "AutoIP tarnybos nepavyko paleisti"
+
+#: ../cli/src/common.c:462
+msgid "AutoIP service error"
+msgstr "AutoIP tarnybos klaida"
+
+#: ../cli/src/common.c:465
+msgid "AutoIP service failed"
+msgstr "Nepavyko AutoIP tarnybos paleidimas"
+
+#: ../cli/src/common.c:468
+msgid "The line is busy"
+msgstr "Linija užimta"
+
+#: ../cli/src/common.c:471
+msgid "No dial tone"
+msgstr "Nėra skambinimo tono"
+
+#: ../cli/src/common.c:474
+msgid "No carrier could be established"
+msgstr "Nepavyko nustatyti pernešėjo"
+
+#: ../cli/src/common.c:477
+msgid "The dialing request timed out"
+msgstr "Skambinimo užklausos laikas baigėsi"
+
+#: ../cli/src/common.c:480
+msgid "The dialing attempt failed"
+msgstr "Mėginimas skambinti nepavyko"
+
+#: ../cli/src/common.c:483
+msgid "Modem initialization failed"
+msgstr "Nepavyko inicializuoti modemo"
+
+#: ../cli/src/common.c:486
+msgid "Failed to select the specified APN"
+msgstr "Nepavyko pasirinkti nurodyto APN"
+
+#: ../cli/src/common.c:489
+msgid "Not searching for networks"
+msgstr "Neieškoma tinklų"
+
+#: ../cli/src/common.c:492
+msgid "Network registration denied"
+msgstr "Tinklo registracija draudžiama"
+
+#: ../cli/src/common.c:495
+msgid "Network registration timed out"
+msgstr "Baigėsi tinklo registracijos laikas"
+
+#: ../cli/src/common.c:498
+msgid "Failed to register with the requested network"
+msgstr "Nepavyko registruoti su prašomu tinklu"
+
+#: ../cli/src/common.c:501
+msgid "PIN check failed"
+msgstr "Nepavyko patikrinti PIN"
+
+#: ../cli/src/common.c:504
+msgid "Necessary firmware for the device may be missing"
+msgstr "Trūksta įrenginiui reikalingos aparatinės programinės įrangos"
+
+#: ../cli/src/common.c:507
+msgid "The device was removed"
+msgstr "Įrenginys buvo pašalintas"
+
+#: ../cli/src/common.c:510
+msgid "NetworkManager went to sleep"
+msgstr "NetworkManager užmigo"
+
+#: ../cli/src/common.c:513
+msgid "The device's active connection disappeared"
+msgstr "Įrenginio aktyvus ryšys dingo"
+
+#: ../cli/src/common.c:516
+msgid "Device disconnected by user or client"
+msgstr "Įrenginys atjungtas naudotojo arba kliento"
+
+#: ../cli/src/common.c:519
+msgid "Carrier/link changed"
+msgstr "Pernešėjas/saitas pasikeitė"
+
+#: ../cli/src/common.c:522
+msgid "The device's existing connection was assumed"
+msgstr "Įrenginio esamas ryšys buvo priimtas"
+
+#: ../cli/src/common.c:525
+msgid "The supplicant is now available"
+msgstr "Prašytojas dabar yra prieinamas"
+
+#: ../cli/src/common.c:528
+msgid "The modem could not be found"
+msgstr "Nepavyko rasti modemo"
+
+#: ../cli/src/common.c:531
+msgid "The Bluetooth connection failed or timed out"
+msgstr "Bluetooth ryšys nepavyko arba baigėsi laikas"
+
+#: ../cli/src/common.c:534
+msgid "GSM Modem's SIM card not inserted"
+msgstr "GSM modemo SIM kortelė neįdėta"
+
+#: ../cli/src/common.c:537
+msgid "GSM Modem's SIM PIN required"
+msgstr "Reikalingas GSM modemo SIM kortelės PIN"
+
+#: ../cli/src/common.c:540
+msgid "GSM Modem's SIM PUK required"
+msgstr "Reikalingas GSM modemo SIM kortelės PUK"
+
+#: ../cli/src/common.c:543
+msgid "GSM Modem's SIM wrong"
+msgstr "Neteisinga GSM modemo SIM"
+
+#: ../cli/src/common.c:546
+msgid "InfiniBand device does not support connected mode"
+msgstr "InfiniBand įrenginys nepalaiko ryšio veiksenos"
+
+#: ../cli/src/common.c:549
+msgid "A dependency of the connection failed"
+msgstr "Ryšio priklausomybė nepavyko"
+
+#: ../cli/src/common.c:552
+msgid "A problem with the RFC 2684 Ethernet over ADSL bridge"
+msgstr "Problema su RFC 2684 laidiniu per ADSL tiklų tiltą"
+
+#: ../cli/src/common.c:555
+#: ../cli/src/devices.c:274
+#: ../cli/src/devices.c:290
+#: ../cli/src/devices.c:410
+#: ../cli/src/devices.c:454
+msgid "Unknown"
+msgstr "Nežinoma"
+
 #. 0
 #. used only for 'GENERAL' group listing
-#: ../cli/src/connections.c:58 ../cli/src/connections.c:126
-#: ../cli/src/devices.c:102 ../cli/src/devices.c:123 ../cli/src/devices.c:133
-#: ../cli/src/devices.c:143 ../cli/src/devices.c:157 ../cli/src/devices.c:171
-#: ../cli/src/devices.c:193
+#: ../cli/src/connections.c:59
+#: ../cli/src/connections.c:129
+#: ../cli/src/devices.c:105
+#: ../cli/src/devices.c:129
+#: ../cli/src/devices.c:139
+#: ../cli/src/devices.c:149
+#: ../cli/src/devices.c:163
+#: ../cli/src/devices.c:177
+#: ../cli/src/devices.c:199
 msgid "NAME"
 msgstr "PAVADINIMAS"
 
 #. 0
 #. 1
-#: ../cli/src/connections.c:59 ../cli/src/connections.c:127
+#: ../cli/src/connections.c:60
+#: ../cli/src/connections.c:130
 msgid "UUID"
 msgstr "UUID"
 
@@ -78,28 +380,33 @@ msgstr "UUID"
 #. 0
 #. 1
 #. 2
-#: ../cli/src/connections.c:60 ../cli/src/connections.c:160
-#: ../cli/src/devices.c:68 ../cli/src/devices.c:104 ../cli/src/devices.c:196
+#: ../cli/src/connections.c:61
+#: ../cli/src/connections.c:163
+#: ../cli/src/devices.c:71
+#: ../cli/src/devices.c:107
+#: ../cli/src/devices.c:202
 msgid "TYPE"
 msgstr "TIPAS"
 
 #. 2
-#: ../cli/src/connections.c:61
+#: ../cli/src/connections.c:62
 msgid "TIMESTAMP"
 msgstr "LAIKO-ŽYMA"
 
 #. 3
-#: ../cli/src/connections.c:62
+#: ../cli/src/connections.c:63
 msgid "TIMESTAMP-REAL"
 msgstr "LAIKO-ŽYMA-TIKROJI"
 
 #. 4
-#: ../cli/src/connections.c:63
+#. 13
+#: ../cli/src/connections.c:64
+#: ../cli/src/devices.c:119
 msgid "AUTOCONNECT"
 msgstr "AUTOPRISIJUNGIMAS"
 
 #. 5
-#: ../cli/src/connections.c:64
+#: ../cli/src/connections.c:65
 msgid "READONLY"
 msgstr "TIKSKAITOMA"
 
@@ -108,96 +415,103 @@ msgstr "TIKSKAITOMA"
 #. 2
 #. 11
 #. 5
-#: ../cli/src/connections.c:65 ../cli/src/connections.c:134
-#: ../cli/src/devices.c:70 ../cli/src/devices.c:183 ../cli/src/devices.c:199
+#: ../cli/src/connections.c:66
+#: ../cli/src/connections.c:137
+#: ../cli/src/devices.c:73
+#: ../cli/src/devices.c:189
+#: ../cli/src/devices.c:205
 msgid "DBUS-PATH"
 msgstr "DBUS-KELIAS"
 
 #. 2
-#: ../cli/src/connections.c:128
+#: ../cli/src/connections.c:131
 msgid "DEVICES"
 msgstr "ĮRENGINIAI"
 
 #. 3
 #. 1
-#. 6
+#. 8
 #. 1
-#: ../cli/src/connections.c:129 ../cli/src/devices.c:69
-#: ../cli/src/devices.c:109 ../cli/src/network-manager.c:39
+#: ../cli/src/connections.c:132
+#: ../cli/src/devices.c:72
+#: ../cli/src/devices.c:114
+#: ../cli/src/network-manager.c:39
 msgid "STATE"
 msgstr "BŪSENA"
 
 #. 4
-#: ../cli/src/connections.c:130
+#: ../cli/src/connections.c:133
 msgid "DEFAULT"
 msgstr "NUMATYTASIS"
 
 #. 5
-#: ../cli/src/connections.c:131
+#: ../cli/src/connections.c:134
 msgid "DEFAULT6"
 msgstr "NUMATYTASIS6"
 
 #. 6
-#: ../cli/src/connections.c:132
+#: ../cli/src/connections.c:135
 msgid "SPEC-OBJECT"
 msgstr "SPEC-OBJECTAS"
 
 #. 7
 #. 1
-#: ../cli/src/connections.c:133 ../cli/src/connections.c:147
+#: ../cli/src/connections.c:136
+#: ../cli/src/connections.c:150
 msgid "VPN"
 msgstr "VPN"
 
 #. 9
-#: ../cli/src/connections.c:135
+#: ../cli/src/connections.c:138
 msgid "CON-PATH"
 msgstr "RYŠIO-KELIAS"
 
 #. 10
-#: ../cli/src/connections.c:136
+#: ../cli/src/connections.c:139
 msgid "ZONE"
 msgstr "ZONA"
 
 #. 11
-#: ../cli/src/connections.c:137
+#: ../cli/src/connections.c:140
 msgid "MASTER-PATH"
 msgstr "PAGRINDINIS-KELIAS"
 
-#: ../cli/src/connections.c:145 ../cli/src/devices.c:79
+#: ../cli/src/connections.c:148
+#: ../cli/src/devices.c:82
 msgid "GENERAL"
 msgstr "BENDRA"
 
 #. 0
-#: ../cli/src/connections.c:146
+#: ../cli/src/connections.c:149
 msgid "IP"
 msgstr "IP"
 
 #. 1
-#: ../cli/src/connections.c:161
+#: ../cli/src/connections.c:164
 msgid "USERNAME"
 msgstr "NAUDOTOJO VARDAS"
 
 #. 2
-#: ../cli/src/connections.c:162
+#: ../cli/src/connections.c:165
 msgid "GATEWAY"
 msgstr "ŠLIUZAS"
 
 #. 3
-#: ../cli/src/connections.c:163
+#: ../cli/src/connections.c:166
 msgid "BANNER"
 msgstr "PRANEŠIMAS"
 
 #. 4
-#: ../cli/src/connections.c:164
+#: ../cli/src/connections.c:167
 msgid "VPN-STATE"
 msgstr "VPN BŪSENA"
 
 #. 5
-#: ../cli/src/connections.c:165
+#: ../cli/src/connections.c:168
 msgid "CFG"
 msgstr "KONF"
 
-#: ../cli/src/connections.c:186
+#: ../cli/src/connections.c:190
 #, c-format
 msgid ""
 "Usage: nmcli con { COMMAND | help }\n"
@@ -205,10 +519,8 @@ msgid ""
 "\n"
 "  list [id  | uuid ]\n"
 "  status [id  | uuid  | path ]\n"
-"  up id  | uuid  [iface ] [ap ] [nsp ] [--"
-"nowait] [--timeout ]\n"
-"  up id  | uuid  [iface ] [ap ] [--nowait] [--timeout "
-"]\n"
+"  up id  | uuid  [iface ] [ap ] [nsp ] [--nowait] [--timeout ]\n"
+"  up id  | uuid  [iface ] [ap ] [--nowait] [--timeout ]\n"
 "  down id  | uuid \n"
 "  delete id  | uuid \n"
 msgstr ""
@@ -217,384 +529,448 @@ msgstr ""
 "\n"
 "  list [id  | uuid ]\n"
 "  status [id  | uuid  | path ]\n"
-"  up id  | uuid  [iface ] [ap ] [nsp ] [--"
-"nowait] [--timeout ]\n"
-"  up id  | uuid  [iface ] [ap ] [--nowait] [--timeout "
-"]\n"
+"  up id  | uuid  [iface ] [ap ] [nsp ] [--nowait] [--timeout ]\n"
+"  up id  | uuid  [iface ] [ap ] [--nowait] [--timeout ]\n"
 "  down id  | uuid \n"
 "  delete id  | uuid \n"
 
-#: ../cli/src/connections.c:240 ../cli/src/connections.c:591
+#: ../cli/src/connections.c:249
+#: ../cli/src/connections.c:609
 #, c-format
 msgid "Error: 'con list': %s"
 msgstr "Klaida: „con list“: %s"
 
-#: ../cli/src/connections.c:242 ../cli/src/connections.c:593
+#: ../cli/src/connections.c:251
+#: ../cli/src/connections.c:611
 #, c-format
 msgid "Error: 'con list': %s; allowed fields: %s"
 msgstr "Klaida: „con list“: %s; leidžiami laukai: %s"
 
-#: ../cli/src/connections.c:250
+#: ../cli/src/connections.c:259
 msgid "Connection details"
 msgstr "Ryšio informacija"
 
-#: ../cli/src/connections.c:466
+#: ../cli/src/connections.c:484
 msgid "never"
 msgstr "niekada"
 
 #. "CAPABILITIES"
 #. Print header
 #. "WIFI-PROPERTIES"
-#: ../cli/src/connections.c:467 ../cli/src/connections.c:468
-#: ../cli/src/connections.c:705 ../cli/src/connections.c:706
-#: ../cli/src/connections.c:708 ../cli/src/devices.c:595
-#: ../cli/src/devices.c:648 ../cli/src/devices.c:762 ../cli/src/devices.c:763
-#: ../cli/src/devices.c:795 ../cli/src/devices.c:821 ../cli/src/devices.c:822
-#: ../cli/src/devices.c:823 ../cli/src/devices.c:824 ../cli/src/devices.c:825
-#: ../cli/src/settings.c:657 ../cli/src/settings.c:727
-#: ../cli/src/settings.c:847 ../cli/src/settings.c:1129
-#: ../cli/src/settings.c:1130 ../cli/src/settings.c:1132
-#: ../cli/src/settings.c:1134 ../cli/src/settings.c:1135
-#: ../cli/src/settings.c:1263 ../cli/src/settings.c:1264
-#: ../cli/src/settings.c:1265 ../cli/src/settings.c:1266
-#: ../cli/src/settings.c:1341 ../cli/src/settings.c:1342
-#: ../cli/src/settings.c:1343 ../cli/src/settings.c:1344
-#: ../cli/src/settings.c:1345 ../cli/src/settings.c:1346
-#: ../cli/src/settings.c:1347 ../cli/src/settings.c:1348
-#: ../cli/src/settings.c:1349 ../cli/src/settings.c:1350
-#: ../cli/src/settings.c:1351 ../cli/src/settings.c:1352
-#: ../cli/src/settings.c:1353 ../cli/src/settings.c:1424
+#: ../cli/src/connections.c:485
+#: ../cli/src/connections.c:486
+#: ../cli/src/connections.c:714
+#: ../cli/src/connections.c:715
+#: ../cli/src/connections.c:717
+#: ../cli/src/devices.c:418
+#: ../cli/src/devices.c:471
+#: ../cli/src/devices.c:587
+#: ../cli/src/devices.c:588
+#: ../cli/src/devices.c:589
+#: ../cli/src/devices.c:621
+#: ../cli/src/devices.c:647
+#: ../cli/src/devices.c:648
+#: ../cli/src/devices.c:649
+#: ../cli/src/devices.c:650
+#: ../cli/src/devices.c:651
+#: ../cli/src/network-manager.c:267
+#: ../cli/src/settings.c:694
+#: ../cli/src/settings.c:764
+#: ../cli/src/settings.c:884
+#: ../cli/src/settings.c:1166
+#: ../cli/src/settings.c:1167
+#: ../cli/src/settings.c:1169
+#: ../cli/src/settings.c:1171
+#: ../cli/src/settings.c:1172
+#: ../cli/src/settings.c:1303
+#: ../cli/src/settings.c:1304
+#: ../cli/src/settings.c:1305
+#: ../cli/src/settings.c:1306
+#: ../cli/src/settings.c:1383
+#: ../cli/src/settings.c:1384
+#: ../cli/src/settings.c:1385
+#: ../cli/src/settings.c:1386
+#: ../cli/src/settings.c:1387
+#: ../cli/src/settings.c:1388
+#: ../cli/src/settings.c:1389
+#: ../cli/src/settings.c:1390
+#: ../cli/src/settings.c:1391
+#: ../cli/src/settings.c:1392
+#: ../cli/src/settings.c:1393
+#: ../cli/src/settings.c:1394
+#: ../cli/src/settings.c:1395
+#: ../cli/src/settings.c:1466
 msgid "yes"
 msgstr "taip"
 
-#: ../cli/src/connections.c:467 ../cli/src/connections.c:468
-#: ../cli/src/connections.c:705 ../cli/src/connections.c:706
-#: ../cli/src/connections.c:708 ../cli/src/devices.c:595
-#: ../cli/src/devices.c:648 ../cli/src/devices.c:762 ../cli/src/devices.c:763
-#: ../cli/src/devices.c:795 ../cli/src/devices.c:821 ../cli/src/devices.c:822
-#: ../cli/src/devices.c:823 ../cli/src/devices.c:824 ../cli/src/devices.c:825
-#: ../cli/src/settings.c:657 ../cli/src/settings.c:659
-#: ../cli/src/settings.c:727 ../cli/src/settings.c:847
-#: ../cli/src/settings.c:1129 ../cli/src/settings.c:1130
-#: ../cli/src/settings.c:1132 ../cli/src/settings.c:1134
-#: ../cli/src/settings.c:1135 ../cli/src/settings.c:1263
-#: ../cli/src/settings.c:1264 ../cli/src/settings.c:1265
-#: ../cli/src/settings.c:1266 ../cli/src/settings.c:1341
-#: ../cli/src/settings.c:1342 ../cli/src/settings.c:1343
-#: ../cli/src/settings.c:1344 ../cli/src/settings.c:1345
-#: ../cli/src/settings.c:1346 ../cli/src/settings.c:1347
-#: ../cli/src/settings.c:1348 ../cli/src/settings.c:1349
-#: ../cli/src/settings.c:1350 ../cli/src/settings.c:1351
-#: ../cli/src/settings.c:1352 ../cli/src/settings.c:1353
-#: ../cli/src/settings.c:1424
+#: ../cli/src/connections.c:485
+#: ../cli/src/connections.c:486
+#: ../cli/src/connections.c:714
+#: ../cli/src/connections.c:715
+#: ../cli/src/connections.c:717
+#: ../cli/src/devices.c:418
+#: ../cli/src/devices.c:471
+#: ../cli/src/devices.c:587
+#: ../cli/src/devices.c:588
+#: ../cli/src/devices.c:589
+#: ../cli/src/devices.c:621
+#: ../cli/src/devices.c:647
+#: ../cli/src/devices.c:648
+#: ../cli/src/devices.c:649
+#: ../cli/src/devices.c:650
+#: ../cli/src/devices.c:651
+#: ../cli/src/network-manager.c:269
+#: ../cli/src/settings.c:694
+#: ../cli/src/settings.c:696
+#: ../cli/src/settings.c:764
+#: ../cli/src/settings.c:884
+#: ../cli/src/settings.c:1166
+#: ../cli/src/settings.c:1167
+#: ../cli/src/settings.c:1169
+#: ../cli/src/settings.c:1171
+#: ../cli/src/settings.c:1172
+#: ../cli/src/settings.c:1303
+#: ../cli/src/settings.c:1304
+#: ../cli/src/settings.c:1305
+#: ../cli/src/settings.c:1306
+#: ../cli/src/settings.c:1383
+#: ../cli/src/settings.c:1384
+#: ../cli/src/settings.c:1385
+#: ../cli/src/settings.c:1386
+#: ../cli/src/settings.c:1387
+#: ../cli/src/settings.c:1388
+#: ../cli/src/settings.c:1389
+#: ../cli/src/settings.c:1390
+#: ../cli/src/settings.c:1391
+#: ../cli/src/settings.c:1392
+#: ../cli/src/settings.c:1393
+#: ../cli/src/settings.c:1394
+#: ../cli/src/settings.c:1395
+#: ../cli/src/settings.c:1466
 msgid "no"
 msgstr "ne"
 
-#: ../cli/src/connections.c:542
+#: ../cli/src/connections.c:560
 msgid "Connection list"
 msgstr "Ryšių sąrašas"
 
-#: ../cli/src/connections.c:555 ../cli/src/connections.c:1088
-#: ../cli/src/connections.c:1456 ../cli/src/connections.c:1471
-#: ../cli/src/connections.c:1480 ../cli/src/connections.c:1490
-#: ../cli/src/connections.c:1502 ../cli/src/connections.c:1601
-#: ../cli/src/connections.c:1703 ../cli/src/devices.c:1202
-#: ../cli/src/devices.c:1212 ../cli/src/devices.c:1326
-#: ../cli/src/devices.c:1334 ../cli/src/devices.c:1547
-#: ../cli/src/devices.c:1554
+#: ../cli/src/connections.c:573
+#: ../cli/src/connections.c:1110
+#: ../cli/src/connections.c:1646
+#: ../cli/src/connections.c:1661
+#: ../cli/src/connections.c:1670
+#: ../cli/src/connections.c:1680
+#: ../cli/src/connections.c:1692
+#: ../cli/src/connections.c:1800
+#: ../cli/src/connections.c:1902
+#: ../cli/src/devices.c:1041
+#: ../cli/src/devices.c:1051
+#: ../cli/src/devices.c:1169
+#: ../cli/src/devices.c:1177
+#: ../cli/src/devices.c:1541
+#: ../cli/src/devices.c:1548
+#: ../cli/src/devices.c:1562
+#: ../cli/src/devices.c:1569
+#: ../cli/src/devices.c:1586
+#: ../cli/src/devices.c:1597
+#: ../cli/src/devices.c:1818
+#: ../cli/src/devices.c:1825
 #, c-format
 msgid "Error: %s argument is missing."
 msgstr "Klaida: trūksta argumento %s."
 
-#: ../cli/src/connections.c:568
+#: ../cli/src/connections.c:586
 #, c-format
 msgid "Error: %s - no such connection."
 msgstr "Klaida: ryšio %s nėra."
 
-#: ../cli/src/connections.c:574 ../cli/src/connections.c:1515
-#: ../cli/src/connections.c:1618 ../cli/src/connections.c:1710
-#: ../cli/src/devices.c:999 ../cli/src/devices.c:1079
-#: ../cli/src/devices.c:1226 ../cli/src/devices.c:1340
-#: ../cli/src/devices.c:1560
+#: ../cli/src/connections.c:592
+#: ../cli/src/connections.c:1705
+#: ../cli/src/connections.c:1817
+#: ../cli/src/connections.c:1909
+#: ../cli/src/devices.c:825
+#: ../cli/src/devices.c:905
+#: ../cli/src/devices.c:1065
+#: ../cli/src/devices.c:1183
+#: ../cli/src/devices.c:1610
+#: ../cli/src/devices.c:1831
 #, c-format
 msgid "Unknown parameter: %s\n"
 msgstr "Nežinomas parametras: %s\n"
 
-#: ../cli/src/connections.c:583
+#: ../cli/src/connections.c:601
 #, c-format
 msgid "Error: no valid parameter specified."
 msgstr "Klaida: nenurodyta tinkamų parametrų."
 
-#: ../cli/src/connections.c:598 ../cli/src/connections.c:1803
-#: ../cli/src/devices.c:1768 ../cli/src/network-manager.c:456
+#: ../cli/src/connections.c:616
+#: ../cli/src/connections.c:2002
+#: ../cli/src/devices.c:2039
+#: ../cli/src/network-manager.c:596
 #, c-format
 msgid "Error: %s."
 msgstr "Klaida: %s"
 
-#: ../cli/src/connections.c:611
+#: ../cli/src/connections.c:629
 msgid "activating"
 msgstr "aktyvuojama"
 
-#: ../cli/src/connections.c:613
+#: ../cli/src/connections.c:631
 msgid "activated"
 msgstr "aktyvuota"
 
-#: ../cli/src/connections.c:615 ../cli/src/devices.c:263
-msgid "deactivating"
-msgstr "deaktyvuojama"
-
-#: ../cli/src/connections.c:618 ../cli/src/connections.c:641
-#: ../cli/src/connections.c:1327 ../cli/src/devices.c:267
-#: ../cli/src/devices.c:796 ../cli/src/network-manager.c:111
-#: ../cli/src/network-manager.c:173 ../cli/src/network-manager.c:176
-#: ../cli/src/network-manager.c:185 ../cli/src/network-manager.c:291
-#: ../cli/src/network-manager.c:346 ../cli/src/network-manager.c:384
-#: ../cli/src/network-manager.c:423 ../cli/src/settings.c:563
-#: ../cli/src/settings.c:591 ../cli/src/utils.c:499 ../src/main.c:458
-#: ../src/main.c:477
-msgid "unknown"
-msgstr "nežinoma"
-
-#: ../cli/src/connections.c:627
+#: ../cli/src/connections.c:645
 msgid "VPN connecting (prepare)"
 msgstr "VPN jungiamasi (ruošiama)"
 
-#: ../cli/src/connections.c:629
+#: ../cli/src/connections.c:647
 msgid "VPN connecting (need authentication)"
 msgstr "VPN jungiamasi (reikia nustatyti tapatybę)"
 
-#: ../cli/src/connections.c:631
+#: ../cli/src/connections.c:649
 msgid "VPN connecting"
 msgstr "VPN jungiamasi"
 
-#: ../cli/src/connections.c:633
+#: ../cli/src/connections.c:651
 msgid "VPN connecting (getting IP configuration)"
 msgstr "VPN jungiamasi (gaunama IP konfigūracija)"
 
-#: ../cli/src/connections.c:635
+#: ../cli/src/connections.c:653
 msgid "VPN connected"
 msgstr "VPN prisijungta"
 
-#: ../cli/src/connections.c:637
+#: ../cli/src/connections.c:655
 msgid "VPN connection failed"
 msgstr "VPN prisijungti nepavyko"
 
-#: ../cli/src/connections.c:639
+#: ../cli/src/connections.c:657
 msgid "VPN disconnected"
 msgstr "VPN atsijungta"
 
-#: ../cli/src/connections.c:892 ../cli/src/connections.c:1116
+#: ../cli/src/connections.c:710
+#: ../cli/src/connections.c:720
+msgid "N/A"
+msgstr "Neprieinama"
+
+#: ../cli/src/connections.c:914
+#: ../cli/src/connections.c:1138
 #, c-format
 msgid "Error: 'con status': %s"
 msgstr "Klaida: „con status“: %s"
 
-#: ../cli/src/connections.c:894 ../cli/src/connections.c:1118
+#: ../cli/src/connections.c:916
+#: ../cli/src/connections.c:1140
 #, c-format
 msgid "Error: 'con status': %s; allowed fields: %s"
 msgstr "Klaida: „con status“: %s; leidžiami laukai: %s"
 
-#: ../cli/src/connections.c:902
+#: ../cli/src/connections.c:924
 msgid "Active connection details"
 msgstr "Aktyvaus ryšio detalės"
 
-#: ../cli/src/connections.c:1038 ../cli/src/connections.c:1530
-#: ../cli/src/connections.c:1633 ../cli/src/connections.c:1724
-#: ../cli/src/devices.c:1026 ../cli/src/devices.c:1088
-#: ../cli/src/devices.c:1241 ../cli/src/devices.c:1370
-#: ../cli/src/devices.c:1589
+#: ../cli/src/connections.c:1060
+#: ../cli/src/connections.c:1720
+#: ../cli/src/connections.c:1832
+#: ../cli/src/connections.c:1923
+#: ../cli/src/devices.c:852
+#: ../cli/src/devices.c:914
+#: ../cli/src/devices.c:1080
+#: ../cli/src/devices.c:1213
+#: ../cli/src/devices.c:1632
+#: ../cli/src/devices.c:1860
+#: ../cli/src/network-manager.c:311
 #, c-format
 msgid "Error: Can't find out if NetworkManager is running: %s."
 msgstr "Klaida: nepavyko nustatyti ar veikia NetworkManager: %s."
 
-#: ../cli/src/connections.c:1042 ../cli/src/connections.c:1534
-#: ../cli/src/connections.c:1637 ../cli/src/connections.c:1728
-#: ../cli/src/devices.c:1030 ../cli/src/devices.c:1092
-#: ../cli/src/devices.c:1245 ../cli/src/devices.c:1374
-#: ../cli/src/devices.c:1593
+#: ../cli/src/connections.c:1064
+#: ../cli/src/connections.c:1724
+#: ../cli/src/connections.c:1836
+#: ../cli/src/connections.c:1927
+#: ../cli/src/devices.c:856
+#: ../cli/src/devices.c:918
+#: ../cli/src/devices.c:1084
+#: ../cli/src/devices.c:1217
+#: ../cli/src/devices.c:1636
+#: ../cli/src/devices.c:1864
+#: ../cli/src/network-manager.c:315
 #, c-format
 msgid "Error: NetworkManager is not running."
 msgstr "Klaida: NetworkManager neveikia."
 
-#: ../cli/src/connections.c:1074
+#: ../cli/src/connections.c:1096
 msgid "Active connections"
 msgstr "Aktyvūs ryšiai"
 
-#: ../cli/src/connections.c:1099
+#: ../cli/src/connections.c:1121
 #, c-format
 msgid "Error: '%s' is not an active connection."
 msgstr "Klaida: „%s“ nėra aktyvus ryšys."
 
-#: ../cli/src/connections.c:1104
+#: ../cli/src/connections.c:1126
 #, c-format
 msgid "Error: unknown parameter: %s"
 msgstr "Klaida: nežinomas parametras: %s"
 
-#: ../cli/src/connections.c:1211
+#: ../cli/src/connections.c:1233
 #, c-format
 msgid "no active connection on device '%s'"
 msgstr "nėra aktyvaus ryšio įrenginyje „%s“"
 
-#: ../cli/src/connections.c:1219
+#: ../cli/src/connections.c:1241
 #, c-format
 msgid "no active connection or device"
 msgstr "nėra aktyvaus ryšio įrenginyje"
 
-#: ../cli/src/connections.c:1290
+#: ../cli/src/connections.c:1312
 #, c-format
 msgid "device '%s' not compatible with connection '%s'"
 msgstr "įrenginys „%s“ nesuderinamas su ryšiu „%s“"
 
-#: ../cli/src/connections.c:1292
+#: ../cli/src/connections.c:1314
 #, c-format
 msgid "no device found for connection '%s'"
 msgstr "nerastas įrenginys ryšiui „%s“"
 
-#: ../cli/src/connections.c:1303
+#: ../cli/src/connections.c:1325
 msgid "unknown reason"
 msgstr "nežinoma priežastis"
 
-#: ../cli/src/connections.c:1305
+#: ../cli/src/connections.c:1327
 msgid "none"
 msgstr "jokia"
 
-#: ../cli/src/connections.c:1307
+#: ../cli/src/connections.c:1329
 msgid "the user was disconnected"
 msgstr "naudotojas buvo atjungtas"
 
-#: ../cli/src/connections.c:1309
+#: ../cli/src/connections.c:1331
 msgid "the base network connection was interrupted"
 msgstr "bazinis tinklo ryšys buvo pertrauktas"
 
-#: ../cli/src/connections.c:1311
+#: ../cli/src/connections.c:1333
 msgid "the VPN service stopped unexpectedly"
 msgstr "VPN tarnyba netikėtai sustojo"
 
-#: ../cli/src/connections.c:1313
+#: ../cli/src/connections.c:1335
 msgid "the VPN service returned invalid configuration"
 msgstr "VPN tarnyba grąžino netinkamą konfigūraciją"
 
-#: ../cli/src/connections.c:1315
+#: ../cli/src/connections.c:1337
 msgid "the connection attempt timed out"
 msgstr "bandymo jungtis laikas baigėsi"
 
-#: ../cli/src/connections.c:1317
+#: ../cli/src/connections.c:1339
 msgid "the VPN service did not start in time"
 msgstr "VPN tarnyba nebuvo paleista laiku"
 
-#: ../cli/src/connections.c:1319
+#: ../cli/src/connections.c:1341
 msgid "the VPN service failed to start"
 msgstr "nepavyko paleisti VPN tarnybos"
 
-#: ../cli/src/connections.c:1321
+#: ../cli/src/connections.c:1343
 msgid "no valid VPN secrets"
 msgstr "nėra tinkamų VPN paslapčių"
 
-#: ../cli/src/connections.c:1323
+#: ../cli/src/connections.c:1345
 msgid "invalid VPN secrets"
 msgstr "netinkamos VPN paslaptys"
 
-#: ../cli/src/connections.c:1325
+#: ../cli/src/connections.c:1347
 msgid "the connection was removed"
 msgstr "ryšys buvo pašalintas"
 
-#: ../cli/src/connections.c:1339
-#, c-format
-msgid "state: %s\n"
-msgstr "būsena: %s\n"
-
-#: ../cli/src/connections.c:1342 ../cli/src/connections.c:1368
+#: ../cli/src/connections.c:1364
+#: ../cli/src/connections.c:1569
 #, c-format
-msgid "Connection activated\n"
-msgstr "Ryšys aktyvuotas\n"
+msgid "Connection successfully activated (D-Bus active path: %s)\n"
+msgstr "Ryšys sėkmingai aktyvuotas (D-Bus aktyvus kelias: %s)\n"
 
-#: ../cli/src/connections.c:1345
+#. Active connection failed and dissapeared, quit.
+#: ../cli/src/connections.c:1369
+#: ../cli/src/connections.c:1470
 #, c-format
 msgid "Error: Connection activation failed."
 msgstr "Klaida: nepavyko aktyvuoti ryšio."
 
-#: ../cli/src/connections.c:1364
+#: ../cli/src/connections.c:1394
 #, c-format
-msgid "state: %s (%d)\n"
-msgstr "būsena: %s (%d)\n"
+msgid "VPN connection successfully activated (D-Bus active path: %s)\n"
+msgstr "VPN ryšys sėkmingai aktyvuotas (D-Bus aktyvus kelias: %s)\n"
 
-#: ../cli/src/connections.c:1374
+#: ../cli/src/connections.c:1402
 #, c-format
 msgid "Error: Connection activation failed: %s."
 msgstr "Klaida: nepavyko aktyvuoti ryšio: %s."
 
-#: ../cli/src/connections.c:1391 ../cli/src/devices.c:1148
+#: ../cli/src/connections.c:1499
+#: ../cli/src/devices.c:974
 #, c-format
 msgid "Error: Timeout %d sec expired."
 msgstr "Klaida: baigėsi %d sek. laikas."
 
-#: ../cli/src/connections.c:1404
+#: ../cli/src/connections.c:1560
 #, c-format
 msgid "Error: Connection activation failed: %s"
 msgstr "Klaida: nepavyko aktyvuoti ryšio: %s"
 
-#: ../cli/src/connections.c:1410
-#, c-format
-msgid "Active connection state: %s\n"
-msgstr "Aktyvaus ryšio būsena: %s\n"
-
-#: ../cli/src/connections.c:1411
-#, c-format
-msgid "Active connection path: %s\n"
-msgstr "Aktyvaus ryšio kelias: %s\n"
-
-#: ../cli/src/connections.c:1464 ../cli/src/connections.c:1609
-#: ../cli/src/connections.c:1737
+#: ../cli/src/connections.c:1654
+#: ../cli/src/connections.c:1808
+#: ../cli/src/connections.c:1936
 #, c-format
 msgid "Error: Unknown connection: %s."
 msgstr "Klaida: nežinomas ryšys: %s"
 
-#: ../cli/src/connections.c:1510 ../cli/src/devices.c:1220
+#: ../cli/src/connections.c:1700
+#: ../cli/src/devices.c:1059
+#: ../cli/src/devices.c:1605
 #, c-format
 msgid "Error: timeout value '%s' is not valid."
 msgstr "Klaida: netinkama laukimo laiko reikšmė „%s“."
 
-#: ../cli/src/connections.c:1523 ../cli/src/connections.c:1626
-#: ../cli/src/connections.c:1717
+#: ../cli/src/connections.c:1713
+#: ../cli/src/connections.c:1825
+#: ../cli/src/connections.c:1916
 #, c-format
 msgid "Error: id or uuid has to be specified."
 msgstr "Klaida: id arba uuid turi būti nurodytas."
 
-#: ../cli/src/connections.c:1555
+#: ../cli/src/connections.c:1745
 #, c-format
 msgid "Error: No suitable device found: %s."
 msgstr "Klaida: nerastas tinkamas įrenginys: %s."
 
-#: ../cli/src/connections.c:1557
+#: ../cli/src/connections.c:1747
 #, c-format
 msgid "Error: No suitable device found."
 msgstr "Klaida: nerastas tinkamas įrenginys."
 
-#: ../cli/src/connections.c:1662
+#: ../cli/src/connections.c:1861
 #, c-format
 msgid "Warning: Connection not active\n"
 msgstr "Įspėjimas: ryšys neaktyvus\n"
 
-#: ../cli/src/connections.c:1676
+#: ../cli/src/connections.c:1875
 #, c-format
 msgid "Error: Connection deletion failed: %s"
 msgstr "Klaida: nepavyko ištrinti ryšio: %s"
 
-#: ../cli/src/connections.c:1794
+#: ../cli/src/connections.c:1993
 #, c-format
 msgid "Error: 'con' command '%s' is not valid."
 msgstr "Klaida: netinkama „con“ komanda „%s“."
 
-#: ../cli/src/connections.c:1859
+#: ../cli/src/connections.c:2061
 #, c-format
 msgid "Error: could not connect to D-Bus."
 msgstr "Klaida: nepavyko prisijungti prie D-Bus."
 
-#: ../cli/src/connections.c:1867
+#: ../cli/src/connections.c:2069
 #, c-format
 msgid "Error: Could not get system settings."
 msgstr "Klaida: nepavyko gauti sistemos nustatymų."
 
-#: ../cli/src/connections.c:1877
+#: ../cli/src/connections.c:2079
 #, c-format
 msgid "Error: Can't obtain connections: settings service is not running."
 msgstr "Klaida: nepavyko gauti ryšių: nustatymų tarnyba neveikia."
@@ -602,715 +978,573 @@ msgstr "Klaida: nepavyko gauti ryšių: nustatymų tarnyba neveikia."
 #. 0
 #. 9
 #. 3
-#: ../cli/src/devices.c:67 ../cli/src/devices.c:103 ../cli/src/devices.c:181
-#: ../cli/src/devices.c:197
+#: ../cli/src/devices.c:70
+#: ../cli/src/devices.c:106
+#: ../cli/src/devices.c:187
+#: ../cli/src/devices.c:203
 msgid "DEVICE"
 msgstr "ĮRENGINYS"
 
 #. 0
-#: ../cli/src/devices.c:80
+#: ../cli/src/devices.c:83
 msgid "CAPABILITIES"
 msgstr "GEBOS"
 
 #. 1
-#: ../cli/src/devices.c:81
+#: ../cli/src/devices.c:84
 msgid "WIFI-PROPERTIES"
 msgstr "WIFI-SAVYBĖS"
 
 #. 2
-#: ../cli/src/devices.c:82
+#: ../cli/src/devices.c:85
 msgid "AP"
 msgstr "AP"
 
 #. 3
-#: ../cli/src/devices.c:83
+#: ../cli/src/devices.c:86
 msgid "WIRED-PROPERTIES"
 msgstr "LAIDINIO-TINKLO-SAVYBĖS"
 
 #. 4
-#: ../cli/src/devices.c:84
+#: ../cli/src/devices.c:87
 msgid "WIMAX-PROPERTIES"
 msgstr "WIMAX-SAVYBĖS"
 
 #. 5
 #. 0
-#: ../cli/src/devices.c:85 ../cli/src/devices.c:194
+#: ../cli/src/devices.c:88
+#: ../cli/src/devices.c:200
 msgid "NSP"
 msgstr "NSP"
 
 #. 6
-#: ../cli/src/devices.c:86
+#: ../cli/src/devices.c:89
 msgid "IP4"
 msgstr "IP4"
 
 #. 7
-#: ../cli/src/devices.c:87
+#: ../cli/src/devices.c:90
 msgid "DHCP4"
 msgstr "DHCP4"
 
 #. 8
-#: ../cli/src/devices.c:88
+#: ../cli/src/devices.c:91
 msgid "IP6"
 msgstr "IP6"
 
 #. 9
-#: ../cli/src/devices.c:89
+#: ../cli/src/devices.c:92
 msgid "DHCP6"
 msgstr "DHCP6"
 
 #. 2
-#: ../cli/src/devices.c:105
+#: ../cli/src/devices.c:108
 msgid "VENDOR"
 msgstr "GAMINTOJAS"
 
 #. 3
-#: ../cli/src/devices.c:106
+#: ../cli/src/devices.c:109
 msgid "PRODUCT"
 msgstr "PRODUKTAS"
 
 #. 4
-#: ../cli/src/devices.c:107
+#: ../cli/src/devices.c:110
 msgid "DRIVER"
 msgstr "TVARKYKLĖ"
 
 #. 5
-#: ../cli/src/devices.c:108
+#: ../cli/src/devices.c:111
+#| msgid "VERSION"
+msgid "DRIVER-VERSION"
+msgstr "TVARKYKLĖS-VERSIJA"
+
+#. 6
+#: ../cli/src/devices.c:112
+#| msgid "FIRMWARE-MISSING"
+msgid "FIRMWARE-VERSION"
+msgstr "APĮRANGOS-VERSIJA"
+
+#. 7
+#: ../cli/src/devices.c:113
 msgid "HWADDR"
 msgstr "APARATINIS-ADRESAS"
 
-#. 7
-#: ../cli/src/devices.c:110
+#. 9
+#: ../cli/src/devices.c:115
 msgid "REASON"
 msgstr "PRIEŽASTIS"
 
-#. 8
-#: ../cli/src/devices.c:111
+#. 10
+#: ../cli/src/devices.c:116
 msgid "UDI"
 msgstr "UDI"
 
-#. 9
-#: ../cli/src/devices.c:112
+#. 11
+#: ../cli/src/devices.c:117
 msgid "IP-IFACE"
 msgstr "IP-IFACE"
 
-#. 10
-#: ../cli/src/devices.c:113
+#. 12
+#: ../cli/src/devices.c:118
 msgid "NM-MANAGED"
 msgstr "NM-VALDOMAS"
 
-#. 11
-#: ../cli/src/devices.c:114
+#. 14
+#: ../cli/src/devices.c:120
 msgid "FIRMWARE-MISSING"
 msgstr "TRŪKSTA-APĮRANGOS"
 
-#. 12
-#: ../cli/src/devices.c:115
+#. 15
+#: ../cli/src/devices.c:121
 msgid "CONNECTION"
 msgstr "PRISIJUNGIMAS"
 
 #. 0
-#: ../cli/src/devices.c:124
+#: ../cli/src/devices.c:130
 msgid "CARRIER-DETECT"
 msgstr "NEŠLIO-APTIKIMAS"
 
 #. 1
-#: ../cli/src/devices.c:125
+#: ../cli/src/devices.c:131
 msgid "SPEED"
-msgstr "SPARTA"
-
-#. 0
-#: ../cli/src/devices.c:134
-msgid "CARRIER"
-msgstr "NEŠLYS"
-
-#. 0
-#: ../cli/src/devices.c:144
-msgid "WEP"
-msgstr "WEP"
-
-#. 1
-#: ../cli/src/devices.c:145
-msgid "WPA"
-msgstr "WPA"
-
-#. 2
-#: ../cli/src/devices.c:146
-msgid "WPA2"
-msgstr "WPA2"
-
-#. 3
-#: ../cli/src/devices.c:147
-msgid "TKIP"
-msgstr "TKIP"
-
-#. 4
-#: ../cli/src/devices.c:148
-msgid "CCMP"
-msgstr "CCMP"
-
-#. 0
-#: ../cli/src/devices.c:158
-msgid "CTR-FREQ"
-msgstr "CTR DAŽNIS"
-
-#. 1
-#: ../cli/src/devices.c:159
-msgid "RSSI"
-msgstr "RSSI"
-
-#. 2
-#: ../cli/src/devices.c:160
-msgid "CINR"
-msgstr "CINR"
-
-#. 3
-#: ../cli/src/devices.c:161
-msgid "TX-POW"
-msgstr "TX-POW"
-
-#. 4
-#: ../cli/src/devices.c:162
-msgid "BSID"
-msgstr "BSID"
-
-#. 0
-#: ../cli/src/devices.c:172
-msgid "SSID"
-msgstr "SSID"
-
-#. 1
-#: ../cli/src/devices.c:173
-msgid "BSSID"
-msgstr "BSSID"
-
-#. 2
-#: ../cli/src/devices.c:174
-msgid "MODE"
-msgstr "VEIKSENA"
-
-#. 3
-#: ../cli/src/devices.c:175
-msgid "FREQ"
-msgstr "DAŽNIS"
-
-#. 4
-#: ../cli/src/devices.c:176
-msgid "RATE"
-msgstr "DAŽNUMAS"
-
-#. 5
-#. 1
-#: ../cli/src/devices.c:177 ../cli/src/devices.c:195
-msgid "SIGNAL"
-msgstr "SIGNALAS"
-
-#. 6
-#: ../cli/src/devices.c:178
-msgid "SECURITY"
-msgstr "SAUGA"
-
-#. 7
-#: ../cli/src/devices.c:179
-msgid "WPA-FLAGS"
-msgstr "WPA-ŽYMOS"
-
-#. 8
-#: ../cli/src/devices.c:180
-msgid "RSN-FLAGS"
-msgstr "RSN-ŽYMOS"
-
-#. 10
-#. 4
-#: ../cli/src/devices.c:182 ../cli/src/devices.c:198
-msgid "ACTIVE"
-msgstr "AKTYVUS"
-
-#: ../cli/src/devices.c:215
-#, 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 ]\n"
-"  disconnect iface  [--nowait] [--timeout ]\n"
-"  wifi [list [iface ] [bssid ]]\n"
-"  wimax [list [iface ] [nsp ]]\n"
-"\n"
-msgstr ""
-"Naudojimas: nmcli dev { KOMANDA | help }\n"
-"\n"
-"  KOMANDA := { status | list | disconnect | wifi | wimax}\n"
-"\n"
-"  KOMANDA := { status | list | disconnect | wifi }\n"
-"\n"
-"  status\n"
-"  list [iface ]\n"
-"  disconnect iface  [--nowait] [--timeout ]\n"
-"  wifi [list [iface ] [bssid ]]\n"
-"  wimax [list [iface ] [nsp ]]\n"
-"\n"
-
-#: ../cli/src/devices.c:243
-msgid "unmanaged"
-msgstr "nevaldomas"
-
-#: ../cli/src/devices.c:245
-msgid "unavailable"
-msgstr "neprieinamas"
-
-#: ../cli/src/devices.c:247 ../cli/src/network-manager.c:108
-msgid "disconnected"
-msgstr "atjungtas"
-
-#: ../cli/src/devices.c:249
-msgid "connecting (prepare)"
-msgstr "jungiamasi (ruošiama)"
-
-#: ../cli/src/devices.c:251
-msgid "connecting (configuring)"
-msgstr "jungiamasi (konfigūruojama)"
-
-#: ../cli/src/devices.c:253
-msgid "connecting (need authentication)"
-msgstr "jungiamasi (reikia nustatyti tapatybę)"
-
-#: ../cli/src/devices.c:255
-msgid "connecting (getting IP configuration)"
-msgstr "jungiamasi (gaunama IP konfigūracija)"
-
-#: ../cli/src/devices.c:257
-msgid "connecting (checking IP connectivity)"
-msgstr "jungiamasi (tikrinamas IP jungiamumas)"
-
-#: ../cli/src/devices.c:259
-msgid "connecting (starting secondary connections)"
-msgstr "jungiamasi (paleidžiami antriniai prisijungimai)"
-
-#: ../cli/src/devices.c:261 ../cli/src/network-manager.c:104
-msgid "connected"
-msgstr "prisijungta"
-
-#: ../cli/src/devices.c:265
-msgid "connection failed"
-msgstr "prisijungti nepavyko"
-
-#: ../cli/src/devices.c:276
-msgid "No reason given"
-msgstr "Nenurodyta priežastis"
-
-#: ../cli/src/devices.c:279
-msgid "Unknown error"
-msgstr "Nežinoma klaida"
-
-#: ../cli/src/devices.c:282
-msgid "Device is now managed"
-msgstr "Įrenginys dabar yra valdomas"
-
-#: ../cli/src/devices.c:285
-msgid "Device is now unmanaged"
-msgstr "Įrenginys dabar yra nevaldomas"
-
-#: ../cli/src/devices.c:288
-msgid "The device could not be readied for configuration"
-msgstr "Nepavyko paruošti įrenginio konfigūravimui"
-
-#: ../cli/src/devices.c:291
-msgid ""
-"IP configuration could not be reserved (no available address, timeout, etc)"
-msgstr ""
-"Nepavyko rezervuoti IP konfigūracijos (nėra galimo adreso, baigėsi laikas ir "
-"kt.)"
-
-#: ../cli/src/devices.c:294
-msgid "The IP configuration is no longer valid"
-msgstr "IP konfigūracija nebeteisinga"
-
-#: ../cli/src/devices.c:297
-msgid "Secrets were required, but not provided"
-msgstr "Reikalingos bet nepateiktos paslaptys"
-
-#: ../cli/src/devices.c:300
-msgid "802.1X supplicant disconnected"
-msgstr "802.1X prašytojas atjungtas"
-
-#: ../cli/src/devices.c:303
-msgid "802.1X supplicant configuration failed"
-msgstr "802.1X prašytojo konfigūracija nepavyko"
-
-#: ../cli/src/devices.c:306
-msgid "802.1X supplicant failed"
-msgstr "802.1X prašytojas dingo"
-
-#: ../cli/src/devices.c:309
-msgid "802.1X supplicant took too long to authenticate"
-msgstr "802.1X prašytojui per ilgai užtruko patvirtinti tapatybę"
-
-#: ../cli/src/devices.c:312
-msgid "PPP service failed to start"
-msgstr "nepavyko paleisti PPP tarnybos"
-
-#: ../cli/src/devices.c:315
-msgid "PPP service disconnected"
-msgstr "PPP tarnyba atjungta"
-
-#: ../cli/src/devices.c:318
-msgid "PPP failed"
-msgstr "PPP nepavyko"
-
-#: ../cli/src/devices.c:321
-msgid "DHCP client failed to start"
-msgstr "nepavyko paleisti DHCP kliento"
-
-#: ../cli/src/devices.c:324
-msgid "DHCP client error"
-msgstr "DHCO kliento klaida"
-
-#: ../cli/src/devices.c:327
-msgid "DHCP client failed"
-msgstr "DHCP klientas dingo"
-
-#: ../cli/src/devices.c:330
-msgid "Shared connection service failed to start"
-msgstr "Bendro ryšio tarnybos nepavyko paleisti"
-
-#: ../cli/src/devices.c:333
-msgid "Shared connection service failed"
-msgstr "Nepavyko bendro ryšio tarnybos paleidimas"
-
-#: ../cli/src/devices.c:336
-msgid "AutoIP service failed to start"
-msgstr "AutoIP tarnybos nepavyko paleisti"
-
-#: ../cli/src/devices.c:339
-msgid "AutoIP service error"
-msgstr "AutoIP tarnybos klaida"
-
-#: ../cli/src/devices.c:342
-msgid "AutoIP service failed"
-msgstr "Nepavyko AutoIP tarnybos paleidimas"
-
-#: ../cli/src/devices.c:345
-msgid "The line is busy"
-msgstr "Linija užimta"
-
-#: ../cli/src/devices.c:348
-msgid "No dial tone"
-msgstr "Nėra skambinimo tono"
-
-#: ../cli/src/devices.c:351
-msgid "No carrier could be established"
-msgstr "Nepavyko nustatyti pernešėjo"
-
-#: ../cli/src/devices.c:354
-msgid "The dialing request timed out"
-msgstr "Skambinimo užklausos laikas baigėsi"
-
-#: ../cli/src/devices.c:357
-msgid "The dialing attempt failed"
-msgstr "Mėginimas skambinti nepavyko"
-
-#: ../cli/src/devices.c:360
-msgid "Modem initialization failed"
-msgstr "Nepavyko inicializuoti modemo"
-
-#: ../cli/src/devices.c:363
-msgid "Failed to select the specified APN"
-msgstr "Nepavyko pasirinkti nurodyto APN"
+msgstr "SPARTA"
 
-#: ../cli/src/devices.c:366
-msgid "Not searching for networks"
-msgstr "Neieškoma tinklų"
+#. 0
+#: ../cli/src/devices.c:140
+msgid "CARRIER"
+msgstr "NEŠLYS"
 
-#: ../cli/src/devices.c:369
-msgid "Network registration denied"
-msgstr "Tinklo registracija draudžiama"
+#. 0
+#: ../cli/src/devices.c:150
+msgid "WEP"
+msgstr "WEP"
 
-#: ../cli/src/devices.c:372
-msgid "Network registration timed out"
-msgstr "Baigėsi tinklo registracijos laikas"
+#. 1
+#: ../cli/src/devices.c:151
+msgid "WPA"
+msgstr "WPA"
 
-#: ../cli/src/devices.c:375
-msgid "Failed to register with the requested network"
-msgstr "Nepavyko registruoti su prašomu tinklu"
+#. 2
+#: ../cli/src/devices.c:152
+msgid "WPA2"
+msgstr "WPA2"
 
-#: ../cli/src/devices.c:378
-msgid "PIN check failed"
-msgstr "Nepavyko patikrinti PIN"
+#. 3
+#: ../cli/src/devices.c:153
+msgid "TKIP"
+msgstr "TKIP"
 
-#: ../cli/src/devices.c:381
-msgid "Necessary firmware for the device may be missing"
-msgstr "Trūksta įrenginiui reikalingos aparatinės programinės įrangos"
+#. 4
+#: ../cli/src/devices.c:154
+msgid "CCMP"
+msgstr "CCMP"
 
-#: ../cli/src/devices.c:384
-msgid "The device was removed"
-msgstr "Įrenginys buvo pašalintas"
+#. 0
+#: ../cli/src/devices.c:164
+msgid "CTR-FREQ"
+msgstr "CTR DAŽNIS"
 
-#: ../cli/src/devices.c:387
-msgid "NetworkManager went to sleep"
-msgstr "NetworkManager užmigo"
+#. 1
+#: ../cli/src/devices.c:165
+msgid "RSSI"
+msgstr "RSSI"
 
-#: ../cli/src/devices.c:390
-msgid "The device's active connection disappeared"
-msgstr "Įrenginio aktyvus ryšys dingo"
+#. 2
+#: ../cli/src/devices.c:166
+msgid "CINR"
+msgstr "CINR"
 
-#: ../cli/src/devices.c:393
-msgid "Device disconnected by user or client"
-msgstr "Įrenginys atjungtas naudotojo arba kliento"
+#. 3
+#: ../cli/src/devices.c:167
+msgid "TX-POW"
+msgstr "TX-POW"
 
-#: ../cli/src/devices.c:396
-msgid "Carrier/link changed"
-msgstr "Pernešėjas/saitas pasikeitė"
+#. 4
+#: ../cli/src/devices.c:168
+msgid "BSID"
+msgstr "BSID"
 
-#: ../cli/src/devices.c:399
-msgid "The device's existing connection was assumed"
-msgstr "Įrenginio esamas ryšys buvo priimtas"
+#. 0
+#: ../cli/src/devices.c:178
+msgid "SSID"
+msgstr "SSID"
 
-#: ../cli/src/devices.c:402
-msgid "The supplicant is now available"
-msgstr "Prašytojas dabar yra prieinamas"
+#. 1
+#: ../cli/src/devices.c:179
+msgid "BSSID"
+msgstr "BSSID"
 
-#: ../cli/src/devices.c:405
-msgid "The modem could not be found"
-msgstr "Nepavyko rasti modemo"
+#. 2
+#: ../cli/src/devices.c:180
+msgid "MODE"
+msgstr "VEIKSENA"
 
-#: ../cli/src/devices.c:408
-msgid "The Bluetooth connection failed or timed out"
-msgstr "Bluetooth ryšys nepavyko arba baigėsi laikas"
+#. 3
+#: ../cli/src/devices.c:181
+msgid "FREQ"
+msgstr "DAŽNIS"
 
-#: ../cli/src/devices.c:411
-msgid "GSM Modem's SIM card not inserted"
-msgstr "GSM modemo SIM kortelė neįdėta"
+#. 4
+#: ../cli/src/devices.c:182
+msgid "RATE"
+msgstr "DAŽNUMAS"
 
-#: ../cli/src/devices.c:414
-msgid "GSM Modem's SIM PIN required"
-msgstr "Reikalingas GSM modemo SIM kortelės PIN"
+#. 5
+#. 1
+#: ../cli/src/devices.c:183
+#: ../cli/src/devices.c:201
+msgid "SIGNAL"
+msgstr "SIGNALAS"
 
-#: ../cli/src/devices.c:417
-msgid "GSM Modem's SIM PUK required"
-msgstr "Reikalingas GSM modemo SIM kortelės PUK"
+#. 6
+#: ../cli/src/devices.c:184
+msgid "SECURITY"
+msgstr "SAUGA"
 
-#: ../cli/src/devices.c:420
-msgid "GSM Modem's SIM wrong"
-msgstr "Neteisinga GSM modemo SIM"
+#. 7
+#: ../cli/src/devices.c:185
+msgid "WPA-FLAGS"
+msgstr "WPA-ŽYMOS"
 
-#: ../cli/src/devices.c:423
-msgid "InfiniBand device does not support connected mode"
-msgstr "InfiniBand įrenginys nepalaiko ryšio veiksenos"
+#. 8
+#: ../cli/src/devices.c:186
+msgid "RSN-FLAGS"
+msgstr "RSN-ŽYMOS"
 
-#: ../cli/src/devices.c:426
-msgid "A dependency of the connection failed"
-msgstr "Ryšio priklausomybė nepavyko"
+#. 10
+#. 4
+#: ../cli/src/devices.c:188
+#: ../cli/src/devices.c:204
+msgid "ACTIVE"
+msgstr "AKTYVUS"
 
-#: ../cli/src/devices.c:428 ../cli/src/devices.c:451 ../cli/src/devices.c:467
-#: ../cli/src/devices.c:587 ../cli/src/devices.c:631
-msgid "Unknown"
-msgstr "Nežinoma"
+#: ../cli/src/devices.c:223
+#, 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 ]\n"
+#| "  disconnect iface  [--nowait] [--timeout ]\n"
+#| "  wifi [list [iface ] [bssid ]]\n"
+#| "  wimax [list [iface ] [nsp ]]\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 ]\n"
+"  disconnect iface  [--nowait] [--timeout ]\n"
+"  wifi [list [iface ] [bssid ]]\n"
+"  wifi connect <(B)SSID> [password ] [wep-key-type key|phrase] [iface ] [bssid ] [name ]\n"
+"               [--private] [--nowait] [--timeout ]\n"
+"  wimax [list [iface ] [nsp ]]\n"
+"\n"
+msgstr ""
+"Naudojimas: nmcli dev { KOMANDA | help }\n"
+"\n"
+"  KOMANDA := { status | list | disconnect | wifi | wimax }\n"
+"\n"
+"  KOMANDA := { status | list | disconnect | wifi }\n"
+"\n"
+"  status\n"
+"  list [iface ]\n"
+"  disconnect iface  [--nowait] [--timeout ]\n"
+"  wifi [list [iface ] [bssid ]]\n"
+"  wifi connect <(B)SSID> [password ] [wep-key-type key|phrase] [iface ] [bssid ] [name ]\n"
+"               [--private] [--nowait] [--timeout ]\n"
+"  wimax [list [iface ] [nsp ]]\n"
+"\n"
 
-#: ../cli/src/devices.c:500
+#: ../cli/src/devices.c:323
 msgid "(none)"
 msgstr "(jokios)"
 
-#: ../cli/src/devices.c:556
+#: ../cli/src/devices.c:379
 #, c-format
 msgid "%u MHz"
 msgstr "%u MHz"
 
-#: ../cli/src/devices.c:557
+#: ../cli/src/devices.c:380
 #, c-format
 msgid "%u MB/s"
 msgstr "%u MB/s"
 
-#: ../cli/src/devices.c:566
+#: ../cli/src/devices.c:389
 msgid "Encrypted: "
 msgstr "Šifruota: "
 
-#: ../cli/src/devices.c:571
+#: ../cli/src/devices.c:394
 msgid "WEP "
 msgstr "WEP"
 
-#: ../cli/src/devices.c:573
+#: ../cli/src/devices.c:396
 msgid "WPA "
 msgstr "WPA"
 
-#: ../cli/src/devices.c:575
+#: ../cli/src/devices.c:398
 msgid "WPA2 "
 msgstr "WPA2"
 
-#: ../cli/src/devices.c:578
+#: ../cli/src/devices.c:401
 msgid "Enterprise "
 msgstr "Kompanija "
 
-#: ../cli/src/devices.c:587
+#: ../cli/src/devices.c:410
 msgid "Ad-Hoc"
 msgstr "Ad-Hoc"
 
-#: ../cli/src/devices.c:587
+#: ../cli/src/devices.c:410
 msgid "Infrastructure"
 msgstr "Infrastruktūra"
 
-#: ../cli/src/devices.c:622
+#: ../cli/src/devices.c:445
 msgid "Home"
 msgstr "Namai"
 
-#: ../cli/src/devices.c:625
+#: ../cli/src/devices.c:448
 msgid "Partner"
 msgstr "Partneris"
 
-#: ../cli/src/devices.c:628
+#: ../cli/src/devices.c:451
 msgid "Roaming"
 msgstr "Tarptinklinio ryšio tinklas"
 
-#: ../cli/src/devices.c:700
+#: ../cli/src/devices.c:523
 #, c-format
 msgid "Error: 'dev list': %s"
 msgstr "Klaida: „dev list“: %s"
 
-#: ../cli/src/devices.c:702
+#: ../cli/src/devices.c:525
 #, c-format
 msgid "Error: 'dev list': %s; allowed fields: %s"
 msgstr "Klaida: „dev list“: %s; leidžiami laukai: %s"
 
-#: ../cli/src/devices.c:711
+#: ../cli/src/devices.c:534
 msgid "Device details"
 msgstr "Įrenginio informacija"
 
-#: ../cli/src/devices.c:756 ../cli/src/devices.c:757 ../cli/src/devices.c:1164
-#: ../cli/src/utils.c:445
+#: ../cli/src/devices.c:579
+#: ../cli/src/devices.c:582
+#: ../cli/src/devices.c:1000
+#: ../cli/src/utils.c:477
 msgid "(unknown)"
 msgstr "(nežinoma)"
 
-#: ../cli/src/devices.c:765
+#: ../cli/src/devices.c:591
 msgid "not connected"
 msgstr "neprisijungta"
 
-#: ../cli/src/devices.c:792
+#: ../cli/src/devices.c:618
 #, c-format
 msgid "%u Mb/s"
 msgstr "%u Mb/s"
 
 #. Print header
 #. "WIRED-PROPERTIES"
-#: ../cli/src/devices.c:865
+#: ../cli/src/devices.c:691
 msgid "on"
 msgstr "įjungta"
 
-#: ../cli/src/devices.c:865
+#: ../cli/src/devices.c:691
 msgid "off"
 msgstr "išjungta"
 
-#: ../cli/src/devices.c:1016
+#: ../cli/src/devices.c:842
 #, c-format
 msgid "Error: 'dev status': %s"
 msgstr "Klaida: „dev status“: %s"
 
-#: ../cli/src/devices.c:1018
+#: ../cli/src/devices.c:844
 #, c-format
 msgid "Error: 'dev status': %s; allowed fields: %s"
 msgstr "Klaida: „dev status“: %s; leidžiami laukai: %s"
 
-#: ../cli/src/devices.c:1041
+#: ../cli/src/devices.c:867
 msgid "Status of devices"
 msgstr "Įrenginių būsena"
 
-#: ../cli/src/devices.c:1072
+#: ../cli/src/devices.c:898
 #, c-format
 msgid "Error: '%s' argument is missing."
 msgstr "Klaida: trūksta argumento „%s“."
 
-#: ../cli/src/devices.c:1113 ../cli/src/devices.c:1265
-#: ../cli/src/devices.c:1402 ../cli/src/devices.c:1621
+#: ../cli/src/devices.c:939
+#: ../cli/src/devices.c:1104
+#: ../cli/src/devices.c:1245
+#: ../cli/src/devices.c:1892
 #, c-format
 msgid "Error: Device '%s' not found."
 msgstr "Klaida: nerastas įrenginys „%s“."
 
-#: ../cli/src/devices.c:1136
+#: ../cli/src/devices.c:962
 #, c-format
 msgid "Success: Device '%s' successfully disconnected."
 msgstr "Pavyko: sėkmingai atjungtas įrenginys „%s“."
 
-#: ../cli/src/devices.c:1161
+#: ../cli/src/devices.c:997
 #, c-format
 msgid "Error: Device '%s' (%s) disconnecting failed: %s"
 msgstr "Klaida: įrenginio „%s“ (%s) atjungti nepavyko: %s"
 
-#: ../cli/src/devices.c:1169
+#: ../cli/src/devices.c:1010
 #, c-format
-msgid "Device state: %d (%s)\n"
-msgstr "Įrenginio būsena: %d (%s)\n"
+#| msgid "Success: Device '%s' successfully disconnected."
+msgid "Device '%s' has been disconnected.\n"
+msgstr "Įrenginys „%s“ sėkmingai atjungtas.\n"
 
-#: ../cli/src/devices.c:1234
+#: ../cli/src/devices.c:1073
 #, c-format
 msgid "Error: iface has to be specified."
 msgstr "Klaida: turi būti nurodytas iface."
 
-#: ../cli/src/devices.c:1360
+#: ../cli/src/devices.c:1203
 #, c-format
 msgid "Error: 'dev wifi': %s"
 msgstr "Klaida: „dev wifi“: %s"
 
-#: ../cli/src/devices.c:1362
+#: ../cli/src/devices.c:1205
 #, c-format
 msgid "Error: 'dev wifi': %s; allowed fields: %s"
 msgstr "Klaida: „dev wifi“: %s; leidžiami laukai: %s"
 
-#: ../cli/src/devices.c:1385
+#: ../cli/src/devices.c:1228
 msgid "WiFi scan list"
 msgstr "WiFi skenavimo sąrašas"
 
-#: ../cli/src/devices.c:1422 ../cli/src/devices.c:1476
+#: ../cli/src/devices.c:1265
+#: ../cli/src/devices.c:1319
 #, c-format
 msgid "Error: Access point with bssid '%s' not found."
 msgstr "Klaida: prieigos taškas su bssid „%s“ nerastas"
 
-#: ../cli/src/devices.c:1439
+#: ../cli/src/devices.c:1282
 #, c-format
 msgid "Error: Device '%s' is not a WiFi device."
 msgstr "Klaida: „%s“ nėra WiFi įrenginys "
 
-#: ../cli/src/devices.c:1503
+#: ../cli/src/devices.c:1350
+#: ../cli/src/devices.c:1396
+#, c-format
+msgid "Connection with UUID '%s' created and activated on device '%s'\n"
+msgstr "Ryšys su UUID „%s“ sukurtas ir aktyvuotas įrenginyje „%s“\n"
+
+#: ../cli/src/devices.c:1355
+#, c-format
+#| msgid "Error: Connection activation failed: %s."
+msgid "Error: Connection activation failed: (%d) %s."
+msgstr "Klaida: nepavyko aktyvuoti ryšio: (%d) %s."
+
+#: ../cli/src/devices.c:1380
+#, c-format
+#| msgid "Failed to read configuration: (%d) %s\n"
+msgid "Error: Failed to add/activate new connection: (%d) %s"
+msgstr "Klaida: nepavyko pridėti/aktyvuoti naujo ryšio: (%d) %s"
+
+#: ../cli/src/devices.c:1388
+#, c-format
+msgid "Error: Failed to add/activate new connection: Unknown error"
+msgstr "Klaida: nepavyko pridėti/aktyvuoti naujo ryšio: nežinoma klaida"
+
+#: ../cli/src/devices.c:1532
+#, c-format
+#| msgid "Error: %s argument is missing."
+msgid "Error: SSID or BSSID are missing."
+msgstr "Klaida: trūksta SSID arba BSSID."
+
+#: ../cli/src/devices.c:1555
+#, c-format
+#| msgid "Error: timeout value '%s' is not valid."
+msgid "Error: bssid argument value '%s' is not a valid BSSID."
+msgstr "Klaida: bssid argumento reikšmė „%s“ nėra tinkamas BSSID."
+
+#: ../cli/src/devices.c:1579
+#, c-format
+msgid "Error: wep-key-type argument value '%s' is invalid, use 'key' or 'phrase'."
+msgstr "Klaida: wep-key-type argumento vertė „%s“ netinkama, naudokite „key“ arba „phrase“."
+
+#: ../cli/src/devices.c:1619
+#, c-format
+msgid "Error: BSSID to connect to (%s) differs from bssid argument (%s)."
+msgstr "Klaida: BSSID prisijungimui (%s) skiriasi nuo bssid argumento (%s)."
+
+#: ../cli/src/devices.c:1625
+#, c-format
+msgid "Error: Parameter '%s' is neither SSID nor BSSID."
+msgstr "Klaida: parametras „%s“ nėra nei SSID, nei BSSID."
+
+#: ../cli/src/devices.c:1654
+#, c-format
+#| msgid "Error: Device '%s' is not a WiFi device."
+msgid "Error: Device '%s' is not a Wi-Fi device."
+msgstr "Klaida: „%s“ nėra WiFi įrenginys."
+
+#: ../cli/src/devices.c:1656
+#, c-format
+#| msgid "Error: No suitable device found."
+msgid "Error: No Wi-Fi device found."
+msgstr "Klaida: nerastas Wi-Fi įrenginys."
+
+#: ../cli/src/devices.c:1674
+#, c-format
+#| msgid "Error: NSP with name '%s' not found."
+msgid "Error: No network with SSID '%s' found."
+msgstr "Klaida: nerastas tinklas su SSID „%s“."
+
+#: ../cli/src/devices.c:1676
+#, c-format
+#| msgid "Error: Access point with nsp '%s' not found."
+msgid "Error: No access point with BSSID '%s' found."
+msgstr "Klaida: nerastas prieigos taškas su BSSID „%s“."
+
+#: ../cli/src/devices.c:1774
 #, c-format
 msgid "Error: 'dev wifi' command '%s' is not valid."
 msgstr "Klaida: netinkama „dev wifi“ komanda „%s“."
 
-#: ../cli/src/devices.c:1579
+#: ../cli/src/devices.c:1850
 #, c-format
 msgid "Error: 'dev wimax': %s"
 msgstr "Klaida: „dev wimax“: %s"
 
-#: ../cli/src/devices.c:1581
+#: ../cli/src/devices.c:1852
 #, c-format
 msgid "Error: 'dev wimax': %s; allowed fields: %s"
 msgstr "Klaida: „dev wimax“: %s; leidžiami laukai: %s"
 
-#: ../cli/src/devices.c:1604
+#: ../cli/src/devices.c:1875
 msgid "WiMAX NSP list"
 msgstr "WiMAX NSP sąrašas"
 
-#: ../cli/src/devices.c:1641
+#: ../cli/src/devices.c:1912
 #, c-format
 msgid "Error: NSP with name '%s' not found."
 msgstr "Klaida: NSP pavadintas „%s“ nerastas."
 
-#: ../cli/src/devices.c:1652
+#: ../cli/src/devices.c:1923
 #, c-format
 msgid "Error: Device '%s' is not a WiMAX device."
 msgstr "Klaida: „%s“ nėra WiMAX įrenginys "
 
-#: ../cli/src/devices.c:1683
+#: ../cli/src/devices.c:1954
 #, c-format
 msgid "Error: Access point with nsp '%s' not found."
 msgstr "Klaida: prieigos su nsp „%s“ taškas nerastas."
 
-#: ../cli/src/devices.c:1710
+#: ../cli/src/devices.c:1981
 #, c-format
 msgid "Error: 'dev wimax' command '%s' is not valid."
 msgstr "Klaida: netinkama „dev wimax“ komanda „%s“."
 
-#: ../cli/src/devices.c:1760
+#: ../cli/src/devices.c:2031
 #, c-format
 msgid "Error: 'dev' command '%s' is not valid."
 msgstr "Klaida: netinkama „dev“ komanda „%s“."
@@ -1359,16 +1593,41 @@ msgstr "WIMAX-APARATINĖ-ĮRANGA"
 msgid "WIMAX"
 msgstr "WIMAX"
 
-#: ../cli/src/network-manager.c:67
-#, c-format
+#: ../cli/src/network-manager.c:62
+#| msgid "VERSION"
+msgid "PERMISSION"
+msgstr "LEIDIMAS"
+
+#. 0
+#: ../cli/src/network-manager.c:63
+msgid "VALUE"
+msgstr "VERTĖ"
+
+#: ../cli/src/network-manager.c:77
+#, 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"
+#| "  enable [true|false]\n"
+#| "  sleep [true|false]\n"
+#| "  wifi [on|off]\n"
+#| "  wwan [on|off]\n"
+#| "  wimax [on|off]\n"
+#| "\n"
 msgid ""
 "Usage: nmcli nm { COMMAND | help }\n"
 "\n"
-"  COMMAND := { status | enable | sleep | wifi | wwan | wimax }\n"
+"  COMMAND := { status | permissions | enable | sleep | wifi | wwan | wimax }\n"
 "\n"
-"  COMMAND := { status | enable | sleep | wifi | wwan }\n"
+"  COMMAND := { status | permissions | enable | sleep | wifi | wwan }\n"
 "\n"
 "  status\n"
+"  permissions\n"
 "  enable [true|false]\n"
 "  sleep [true|false]\n"
 "  wifi [on|off]\n"
@@ -1378,11 +1637,12 @@ msgid ""
 msgstr ""
 "Naudojimas: nmcli nm { KOMANDA | help }\n"
 "\n"
-"  KOMANDA := { status | enable | sleep | wifi | wwan | wimax}\n"
+"  KOMANDA := { status | permissions | enable | sleep | wifi | wwan | wimax }\n"
 "\n"
-"  KOMANDA := { status | enable | sleep | wifi | wwan }\n"
+"  KOMANDA := { status | permissions | enable | sleep | wifi | wwan }\n"
 "\n"
 "  status\n"
+"  permissions\n"
 "  enable [true|false]\n"
 "  sleep [true|false]\n"
 "  wifi [on|off]\n"
@@ -1390,138 +1650,170 @@ msgstr ""
 "  wimax [on|off]\n"
 "\n"
 
-#: ../cli/src/network-manager.c:96
+#: ../cli/src/network-manager.c:108
 msgid "asleep"
 msgstr "miegantis"
 
-#: ../cli/src/network-manager.c:98
+#: ../cli/src/network-manager.c:110
 msgid "connecting"
 msgstr "jungiamasi"
 
-#: ../cli/src/network-manager.c:100
+#: ../cli/src/network-manager.c:112
 msgid "connected (local only)"
 msgstr "prisijungta (vietinis)"
 
-#: ../cli/src/network-manager.c:102
+#: ../cli/src/network-manager.c:114
 msgid "connected (site only)"
 msgstr "prisijungta (tik puslapyje)"
 
-#: ../cli/src/network-manager.c:106
+#: ../cli/src/network-manager.c:118
 msgid "disconnecting"
 msgstr "atsijungiama"
 
-#: ../cli/src/network-manager.c:146
+#: ../cli/src/network-manager.c:158
 #, c-format
 msgid "Error: 'nm status': %s"
 msgstr "Klaida: „nm status“: %s"
 
-#: ../cli/src/network-manager.c:148
+#: ../cli/src/network-manager.c:160
 #, c-format
 msgid "Error: 'nm status': %s; allowed fields: %s"
 msgstr "Klaida: „nm status“: %s; leidžiami laukai: %s"
 
 #. create NMClient
-#: ../cli/src/network-manager.c:161 ../cli/src/network-manager.c:162
-#: ../cli/src/network-manager.c:163 ../cli/src/network-manager.c:164
-#: ../cli/src/network-manager.c:165 ../cli/src/network-manager.c:167
-#: ../cli/src/network-manager.c:168 ../cli/src/network-manager.c:289
-#: ../cli/src/network-manager.c:344 ../cli/src/network-manager.c:382
-#: ../cli/src/network-manager.c:421
+#: ../cli/src/network-manager.c:173
+#: ../cli/src/network-manager.c:174
+#: ../cli/src/network-manager.c:175
+#: ../cli/src/network-manager.c:176
+#: ../cli/src/network-manager.c:177
+#: ../cli/src/network-manager.c:179
+#: ../cli/src/network-manager.c:180
+#: ../cli/src/network-manager.c:429
+#: ../cli/src/network-manager.c:484
+#: ../cli/src/network-manager.c:522
+#: ../cli/src/network-manager.c:561
 msgid "enabled"
 msgstr "įjungta"
 
-#: ../cli/src/network-manager.c:161 ../cli/src/network-manager.c:162
-#: ../cli/src/network-manager.c:163 ../cli/src/network-manager.c:164
-#: ../cli/src/network-manager.c:165 ../cli/src/network-manager.c:167
-#: ../cli/src/network-manager.c:168 ../cli/src/network-manager.c:289
-#: ../cli/src/network-manager.c:344 ../cli/src/network-manager.c:382
-#: ../cli/src/network-manager.c:421
+#: ../cli/src/network-manager.c:173
+#: ../cli/src/network-manager.c:174
+#: ../cli/src/network-manager.c:175
+#: ../cli/src/network-manager.c:176
+#: ../cli/src/network-manager.c:177
+#: ../cli/src/network-manager.c:179
+#: ../cli/src/network-manager.c:180
+#: ../cli/src/network-manager.c:429
+#: ../cli/src/network-manager.c:484
+#: ../cli/src/network-manager.c:522
+#: ../cli/src/network-manager.c:561
 msgid "disabled"
 msgstr "išjungta"
 
-#: ../cli/src/network-manager.c:181
+#: ../cli/src/network-manager.c:193
 msgid "NetworkManager status"
 msgstr "NetworkManager būsena"
 
 #. Print header
-#: ../cli/src/network-manager.c:184
+#: ../cli/src/network-manager.c:196
 msgid "running"
 msgstr "veikia"
 
-#: ../cli/src/network-manager.c:184
+#: ../cli/src/network-manager.c:196
 msgid "not running"
 msgstr "neveikia"
 
-#: ../cli/src/network-manager.c:215 ../cli/src/utils.c:425
+#: ../cli/src/network-manager.c:271
+msgid "auth"
+msgstr "auth"
+
+#: ../cli/src/network-manager.c:301
+#, c-format
+#| msgid "Error: 'nm status': %s"
+msgid "Error: 'nm permissions': %s"
+msgstr "Klaida: „nm permissions“: %s"
+
+#: ../cli/src/network-manager.c:303
+#, c-format
+#| msgid "Error: 'nm status': %s; allowed fields: %s"
+msgid "Error: 'nm permissions': %s; allowed fields: %s"
+msgstr "Klaida: „nm permissions“: %s; leidžiami laukai: %s"
+
+#: ../cli/src/network-manager.c:324
+#| msgid "NetworkManager status"
+msgid "NetworkManager permissions"
+msgstr "NetworkManager leidimai"
+
+#: ../cli/src/network-manager.c:350
+#: ../cli/src/utils.c:457
 #, c-format
 msgid "Error: Couldn't connect to system bus: %s"
 msgstr "Klaida: nepavyko prisijungti prie sistemos magistralės: %s"
 
-#: ../cli/src/network-manager.c:226
+#: ../cli/src/network-manager.c:361
 #, c-format
 msgid "Error: Couldn't create D-Bus object proxy."
 msgstr "Klaida: nepavyko sukurti D-Bus tarpinio objekto."
 
-#: ../cli/src/network-manager.c:232
+#: ../cli/src/network-manager.c:367
 #, c-format
 msgid "Error in sleep: %s"
 msgstr "Klaida užmigdant: %s"
 
-#: ../cli/src/network-manager.c:276 ../cli/src/network-manager.c:331
-#: ../cli/src/network-manager.c:369 ../cli/src/network-manager.c:408
+#: ../cli/src/network-manager.c:416
+#: ../cli/src/network-manager.c:471
+#: ../cli/src/network-manager.c:509
+#: ../cli/src/network-manager.c:548
 #, c-format
 msgid "Error: '--fields' value '%s' is not valid here; allowed fields: %s"
 msgstr "Klaida: „--fields“ reikšmė „%s“ čia netinkama; leidžiami laukai: %s"
 
-#: ../cli/src/network-manager.c:284
+#: ../cli/src/network-manager.c:424
 msgid "Networking enabled"
 msgstr "Tinklas įjungtas"
 
-#: ../cli/src/network-manager.c:300
+#: ../cli/src/network-manager.c:440
 #, c-format
 msgid "Error: invalid 'enable' parameter: '%s'; use 'true' or 'false'."
-msgstr ""
-"Klaida: netinkamas „enable“ parametras: „%s“; naudokite „true“ arba „false“."
+msgstr "Klaida: netinkamas „enable“ parametras: „%s“; naudokite „true“ arba „false“."
 
-#: ../cli/src/network-manager.c:310
+#: ../cli/src/network-manager.c:450
 #, c-format
 msgid "Error: Sleeping status is not exported by NetworkManager."
 msgstr "Klaida: „NetworkManager“ nepateikia informacijos apie miego būseną."
 
-#: ../cli/src/network-manager.c:318
+#: ../cli/src/network-manager.c:458
 #, c-format
 msgid "Error: invalid 'sleep' parameter: '%s'; use 'true' or 'false'."
-msgstr ""
-"Klaida: netinkamas „sleep“ parametras: „%s“; naudokite „true“ arba „false“."
+msgstr "Klaida: netinkamas „sleep“ parametras: „%s“; naudokite „true“ arba „false“."
 
-#: ../cli/src/network-manager.c:339
+#: ../cli/src/network-manager.c:479
 msgid "WiFi enabled"
 msgstr "WiFi įjungtas"
 
-#: ../cli/src/network-manager.c:355
+#: ../cli/src/network-manager.c:495
 #, c-format
 msgid "Error: invalid 'wifi' parameter: '%s'."
 msgstr "Klaida: netinkamas „wifi“ parametras: „%s“."
 
-#: ../cli/src/network-manager.c:377
+#: ../cli/src/network-manager.c:517
 msgid "WWAN enabled"
 msgstr "WWAN įjungta"
 
-#: ../cli/src/network-manager.c:393
+#: ../cli/src/network-manager.c:533
 #, c-format
 msgid "Error: invalid 'wwan' parameter: '%s'."
 msgstr "Klaida: netinkamas „wwan“ parametras: „%s“."
 
-#: ../cli/src/network-manager.c:416
+#: ../cli/src/network-manager.c:556
 msgid "WiMAX enabled"
 msgstr "WiMAX įjungtas"
 
-#: ../cli/src/network-manager.c:432
+#: ../cli/src/network-manager.c:572
 #, c-format
 msgid "Error: invalid 'wimax' parameter: '%s'."
 msgstr "Klaida: netinkamas „wimax“ parametras: „%s“."
 
-#: ../cli/src/network-manager.c:445
+#: ../cli/src/network-manager.c:585
 #, c-format
 msgid "Error: 'nm' command '%s' is not valid."
 msgstr "Klaida: netinkama „nm“ komanda „%s“."
@@ -1536,10 +1828,8 @@ msgid ""
 "  -p[retty]                                  pretty output\n"
 "  -m[ode] tabular|multiline                  output mode\n"
 "  -f[ields] |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"
+"  -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"
@@ -1556,10 +1846,8 @@ msgstr ""
 "  -p[retty]                                  graži išvestis\n"
 "  -m[ode] tabular|multiline                  išvedimo veiksena\n"
 "  -f[fields] |all|common  nurodyti išvedamus laukus\n"
-"  -e[scape] yes|no                           atlikti stulpelių skirtukų "
-"kaitą\n"
-"  -n[ocheck]                                 netikrinti nmcli ir "
-"NetworkManager versijų\n"
+"  -e[scape] yes|no                           atlikti stulpelių skirtukų kaitą\n"
+"  -n[ocheck]                                 netikrinti nmcli ir NetworkManager versijų\n"
 "  -v[ersion]                                 rodyti programos versiją\n"
 "  -h[elp]                                    išvesti šią pagalbą\n"
 "\n"
@@ -1582,8 +1870,7 @@ msgstr "Klaida: parinktis „--terse“ nurodyta antrą kartą."
 #: ../cli/src/nmcli.c:144
 #, c-format
 msgid "Error: Option '--terse' is mutually exclusive with '--pretty'."
-msgstr ""
-"Klaida: parinktis „--terse“ yra tarpusavyje nesuderinama su „--pretty“."
+msgstr "Klaida: parinktis „--terse“ yra tarpusavyje nesuderinama su „--pretty“."
 
 #: ../cli/src/nmcli.c:152
 #, c-format
@@ -1593,15 +1880,16 @@ msgstr "Klaida: parinktis „--pretty“ nurodyta antrą kartą."
 #: ../cli/src/nmcli.c:157
 #, c-format
 msgid "Error: Option '--pretty' is mutually exclusive with '--terse'."
-msgstr ""
-"Klaida: parinktis „--pretty“ yra tarpusavyje nesuderinama su „--terse“."
+msgstr "Klaida: parinktis „--pretty“ yra tarpusavyje nesuderinama su „--terse“."
 
-#: ../cli/src/nmcli.c:167 ../cli/src/nmcli.c:183
+#: ../cli/src/nmcli.c:167
+#: ../cli/src/nmcli.c:183
 #, c-format
 msgid "Error: missing argument for '%s' option."
 msgstr "Klaida: trūksta argumento parinkčiai „%s“."
 
-#: ../cli/src/nmcli.c:176 ../cli/src/nmcli.c:192
+#: ../cli/src/nmcli.c:176
+#: ../cli/src/nmcli.c:192
 #, c-format
 msgid "Error: '%s' is not valid argument for '%s' option."
 msgstr "Klaida: „%s“ yra netinkamas argumentas parinkčiai „%s“."
@@ -1634,107 +1922,120 @@ msgstr "Klaida: nepavyko sukurti NMClient objekto."
 msgid "Success"
 msgstr "Pavyko"
 
-#: ../cli/src/settings.c:497
+#: ../cli/src/settings.c:519
 #, c-format
 msgid "%d (hex-ascii-key)"
 msgstr "%d (šešioliktainis ascii raktas)"
 
-#: ../cli/src/settings.c:499
+#: ../cli/src/settings.c:521
 #, c-format
 msgid "%d (104/128-bit passphrase)"
 msgstr "%d (104/128 bitų slaptažodis)"
 
-#: ../cli/src/settings.c:502
+#: ../cli/src/settings.c:524
+#: ../cli/src/settings.c:652
 #, c-format
 msgid "%d (unknown)"
 msgstr "%d (nežinoma)"
 
-#: ../cli/src/settings.c:528
+#: ../cli/src/settings.c:550
 msgid "0 (unknown)"
 msgstr "0 (nežinoma)"
 
-#: ../cli/src/settings.c:534
+#: ../cli/src/settings.c:556
 msgid "any, "
 msgstr "bet koks, "
 
-#: ../cli/src/settings.c:536
+#: ../cli/src/settings.c:558
 msgid "900 MHz, "
 msgstr "900 MHz, "
 
-#: ../cli/src/settings.c:538
+#: ../cli/src/settings.c:560
 msgid "1800 MHz, "
 msgstr "1800 MHz, "
 
-#: ../cli/src/settings.c:540
+#: ../cli/src/settings.c:562
 msgid "1900 MHz, "
 msgstr "1900 MHz, "
 
-#: ../cli/src/settings.c:542
+#: ../cli/src/settings.c:564
 msgid "850 MHz, "
 msgstr "850 MHz, "
 
-#: ../cli/src/settings.c:544
+#: ../cli/src/settings.c:566
 msgid "WCDMA 3GPP UMTS 2100 MHz, "
 msgstr "WCDMA 3GPP UMTS 2100 MHz, "
 
-#: ../cli/src/settings.c:546
+#: ../cli/src/settings.c:568
 msgid "WCDMA 3GPP UMTS 1800 MHz, "
 msgstr "WCDMA 3GPP UMTS 1800 MHz, "
 
-#: ../cli/src/settings.c:548
+#: ../cli/src/settings.c:570
 msgid "WCDMA 3GPP UMTS 1700/2100 MHz, "
 msgstr "WCDMA 3GPP UMTS 1700/2100 MHz, "
 
-#: ../cli/src/settings.c:550
+#: ../cli/src/settings.c:572
 msgid "WCDMA 3GPP UMTS 800 MHz, "
 msgstr "WCDMA 3GPP UMTS 800 MHz, "
 
-#: ../cli/src/settings.c:552
+#: ../cli/src/settings.c:574
 msgid "WCDMA 3GPP UMTS 850 MHz, "
 msgstr "WCDMA 3GPP UMTS 850 MHz, "
 
-#: ../cli/src/settings.c:554
+#: ../cli/src/settings.c:576
 msgid "WCDMA 3GPP UMTS 900 MHz, "
 msgstr "WCDMA 3GPP UMTS 900 MHz, "
 
-#: ../cli/src/settings.c:556
+#: ../cli/src/settings.c:578
 msgid "WCDMA 3GPP UMTS 1700 MHz, "
 msgstr "WCDMA 3GPP UMTS 1700 MHz, "
 
-#: ../cli/src/settings.c:558
+#: ../cli/src/settings.c:580
 msgid "WCDMA 3GPP UMTS 1900 MHz, "
 msgstr "WCDMA 3GPP UMTS 1900 MHz, "
 
-#: ../cli/src/settings.c:560
+#: ../cli/src/settings.c:582
 msgid "WCDMA 3GPP UMTS 2600 MHz, "
 msgstr "WCDMA 3GPP UMTS 2600 MHz, "
 
-#: ../cli/src/settings.c:578
+#: ../cli/src/settings.c:600
 msgid "0 (NONE)"
 msgstr "0 (JOKS)"
 
-#: ../cli/src/settings.c:584
+#: ../cli/src/settings.c:606
 msgid "REORDER_HEADERS, "
 msgstr "PERRIKIUOTI_ANTRAŠTES, "
 
-#: ../cli/src/settings.c:586
+#: ../cli/src/settings.c:608
 msgid "GVRP, "
 msgstr "GVRP, "
 
-#: ../cli/src/settings.c:588
+#: ../cli/src/settings.c:610
 msgid "LOOSE_BINDING, "
 msgstr "PRARASTI_SUSIEJIMĄ, "
 
-#: ../cli/src/settings.c:731 ../cli/src/settings.c:927
-#: ../cli/src/settings.c:1631
+#: ../cli/src/settings.c:646
+#, c-format
+#| msgid "disabled"
+msgid "%d (disabled)"
+msgstr "%d (išjungta)"
+
+#: ../cli/src/settings.c:648
+#, c-format
+msgid "%d (enabled, prefer public IP)"
+msgstr "%d (įjungta, pageidaujamas viešas IP)"
+
+#: ../cli/src/settings.c:650
+#, c-format
+msgid "%d (enabled, prefer temporary IP)"
+msgstr "%d (įjungta, pageidaujamas laikinas IP)"
+
+#: ../cli/src/settings.c:768
+#: ../cli/src/settings.c:964
+#: ../cli/src/settings.c:1673
 msgid "auto"
 msgstr "automatinis"
 
-#: ../cli/src/settings.c:921 ../cli/src/settings.c:924
-#: ../cli/src/settings.c:925 ../cli/src/utils.c:247
-msgid "not set"
-msgstr "nenustatyta"
-
 #: ../cli/src/utils.c:103
 #, c-format
 msgid "Error converting IP4 address '0x%X' to text form"
@@ -1745,56 +2046,45 @@ msgstr "Klaida konvertuojant IP4 adresą „0x%X“ į tekstinę formą"
 msgid "Error converting IP6 address '%s' to text form"
 msgstr "Klaida konvertuojant IP6 adresą „%s“ į tekstinę formą"
 
-#: ../cli/src/utils.c:200
+#: ../cli/src/utils.c:232
 #, c-format
 msgid "field '%s' has to be alone"
 msgstr "laukas „%s“ turi būti vienintelis"
 
-#: ../cli/src/utils.c:203
+#: ../cli/src/utils.c:235
 #, c-format
 msgid "invalid field '%s'"
 msgstr "netinkamas laukas „%s“"
 
-#: ../cli/src/utils.c:222
+#: ../cli/src/utils.c:254
 #, c-format
 msgid "Option '--terse' requires specifying '--fields'"
 msgstr "Parinktis „--terse“ reikalauja nurodyti „--fields“"
 
-#: ../cli/src/utils.c:226
+#: ../cli/src/utils.c:258
 #, c-format
 msgid "Option '--terse' requires specific '--fields' option values , not '%s'"
-msgstr ""
-"Parinktis „--terse“ reikalauja konkrečių parinkties „--fields“ reikšmių, ne "
-"„%s“"
+msgstr "Parinktis „--terse“ reikalauja konkrečių parinkties „--fields“ reikšmių, ne „%s“"
 
-#: ../cli/src/utils.c:436
+#: ../cli/src/utils.c:468
 #, c-format
 msgid "Error: Couldn't create D-Bus object proxy for org.freedesktop.DBus"
-msgstr ""
-"Klaida: nepavyko sukurti D-Bus tarpinio objekto skirto org.freedesktop.DBus"
+msgstr "Klaida: nepavyko sukurti D-Bus tarpinio objekto skirto org.freedesktop.DBus"
 
-#: ../cli/src/utils.c:444
+#: ../cli/src/utils.c:476
 #, c-format
 msgid "Error: NameHasOwner request failed: %s"
 msgstr "Klaida: NameHasOwner užklausa nepavyko: %s"
 
-#: ../cli/src/utils.c:489
+#: ../cli/src/utils.c:521
 #, c-format
-msgid ""
-"Warning: nmcli (%s) and NetworkManager (%s) versions don't match. Use --"
-"nocheck to suppress the warning.\n"
-msgstr ""
-"Įspėjimas: nmcli (%s) ir NetworkManager (%s) versijos neatitinka. Naudokite "
-"--nocheck įspėjimui nerodyti.\n"
+msgid "Warning: nmcli (%s) and NetworkManager (%s) versions don't match. Use --nocheck to suppress the warning.\n"
+msgstr "Įspėjimas: nmcli (%s) ir NetworkManager (%s) versijos neatitinka. Naudokite --nocheck įspėjimui nerodyti.\n"
 
-#: ../cli/src/utils.c:498
+#: ../cli/src/utils.c:530
 #, c-format
-msgid ""
-"Error: nmcli (%s) and NetworkManager (%s) versions don't match. Force "
-"execution using --nocheck, but the results are unpredictable."
-msgstr ""
-"Klaida: nmcli (%s) ir NetworkManager (%s) versijos neatitinka. Priverskite "
-"vykdymą naudodami --nocheck, bet rezultatai yra nenuspėjami."
+msgid "Error: nmcli (%s) and NetworkManager (%s) versions don't match. Force execution using --nocheck, but the results are unpredictable."
+msgstr "Klaida: nmcli (%s) ir NetworkManager (%s) versijos neatitinka. Priverskite vykdymą naudodami --nocheck, bet rezultatai yra nenuspėjami."
 
 #: ../libnm-util/crypto.c:133
 #, c-format
@@ -1834,14 +2124,12 @@ msgstr "Netinkamai suformuotas PEM failas: DEK-Info gairėje nerasta IV."
 #: ../libnm-util/crypto.c:206
 #, c-format
 msgid "Malformed PEM file: invalid format of IV in DEK-Info tag."
-msgstr ""
-"Netinkamai suformuotas PEM failas: DEK-Info gairėje netinkamas IV formatas."
+msgstr "Netinkamai suformuotas PEM failas: DEK-Info gairėje netinkamas IV formatas."
 
 #: ../libnm-util/crypto.c:219
 #, c-format
 msgid "Malformed PEM file: unknown private key cipher '%s'."
-msgstr ""
-"Netinkamai suformuotas PEM failas: nežinomas asmeninio rakto šifras „%s“."
+msgstr "Netinkamai suformuotas PEM failas: nežinomas asmeninio rakto šifras „%s“."
 
 #: ../libnm-util/crypto.c:238
 #, c-format
@@ -1865,7 +2153,8 @@ msgstr "Nepakanka atminties išsaugoti privataus rakto duomenis."
 msgid "Failed to decode PKCS#8 private key."
 msgstr "Nepavyko iššifruoti PKCS#8 asmeninio rakto."
 
-#: ../libnm-util/crypto.c:339 ../libnm-util/crypto.c:625
+#: ../libnm-util/crypto.c:339
+#: ../libnm-util/crypto.c:625
 #, c-format
 msgid "Not enough memory to store certificate data."
 msgstr "Nepakanka atminties liudijimo duomenų saugojimui."
@@ -1885,8 +2174,10 @@ msgstr "Nepakanka atminties IV saugojimui."
 msgid "IV contains non-hexadecimal digits."
 msgstr "IV yra ne šešioliktainių skaitmenų."
 
-#: ../libnm-util/crypto.c:423 ../libnm-util/crypto_gnutls.c:147
-#: ../libnm-util/crypto_gnutls.c:265 ../libnm-util/crypto_nss.c:167
+#: ../libnm-util/crypto.c:423
+#: ../libnm-util/crypto_gnutls.c:147
+#: ../libnm-util/crypto_gnutls.c:265
+#: ../libnm-util/crypto_nss.c:167
 #: ../libnm-util/crypto_nss.c:332
 #, c-format
 msgid "Private key cipher '%s' was unknown."
@@ -1936,7 +2227,8 @@ msgstr "Nepavyko inicijuoti MD5 posistemės: %s / %s."
 msgid "Invalid IV length (must be at least %zd)."
 msgstr "Netinkamas IV ilgis (turi būti bent %zd)."
 
-#: ../libnm-util/crypto_gnutls.c:164 ../libnm-util/crypto_nss.c:184
+#: ../libnm-util/crypto_gnutls.c:164
+#: ../libnm-util/crypto_nss.c:184
 #, c-format
 msgid "Not enough memory for decrypted key buffer."
 msgstr "Nepakanka atminties iššifruoto rakto buferiui."
@@ -1961,17 +2253,20 @@ msgstr "Nepavyko iššifravimui nustatyti IV: %s / %s."
 msgid "Failed to decrypt the private key: %s / %s."
 msgstr "Nepavyko iššifruoti asmeninio rakto: %s / %s."
 
-#: ../libnm-util/crypto_gnutls.c:209 ../libnm-util/crypto_nss.c:263
+#: ../libnm-util/crypto_gnutls.c:209
+#: ../libnm-util/crypto_nss.c:263
 #, c-format
 msgid "Failed to decrypt the private key: unexpected padding length."
 msgstr "Nepavyko iššifruoti asmeninio rakto: netikėtas užpildo ilgis."
 
-#: ../libnm-util/crypto_gnutls.c:220 ../libnm-util/crypto_nss.c:274
+#: ../libnm-util/crypto_gnutls.c:220
+#: ../libnm-util/crypto_nss.c:274
 #, c-format
 msgid "Failed to decrypt the private key."
 msgstr "Nepavyko iššifruoti asmeninio rakto."
 
-#: ../libnm-util/crypto_gnutls.c:285 ../libnm-util/crypto_nss.c:352
+#: ../libnm-util/crypto_gnutls.c:285
+#: ../libnm-util/crypto_nss.c:352
 #, c-format
 msgid "Could not allocate memory for encrypting."
 msgstr "Nepavyko išskirti atminties šifravimui."
@@ -2170,17 +2465,11 @@ msgstr "Įjungti arba išjungti sistemos prieigą prie tinklo"
 
 #: ../policy/org.freedesktop.NetworkManager.policy.in.h:2
 msgid "System policy prevents enabling or disabling system networking"
-msgstr ""
-"Sistemos politika neleidžia įjungti arba išjungti sistemos prieigos prie "
-"tinklo"
+msgstr "Sistemos politika neleidžia įjungti arba išjungti sistemos prieigos prie tinklo"
 
 #: ../policy/org.freedesktop.NetworkManager.policy.in.h:3
-msgid ""
-"Put NetworkManager to sleep or wake it up (should only be used by system "
-"power management)"
-msgstr ""
-"Užmigdyti arba pažadinti NetworkManager (tai turėtų naudoti tik sistemos "
-"energijos valdymo posistemė)"
+msgid "Put NetworkManager to sleep or wake it up (should only be used by system power management)"
+msgstr "Užmigdyti arba pažadinti NetworkManager (tai turėtų naudoti tik sistemos energijos valdymo posistemė)"
 
 #: ../policy/org.freedesktop.NetworkManager.policy.in.h:4
 msgid "System policy prevents putting NetworkManager to sleep or waking it up"
@@ -2200,20 +2489,15 @@ msgstr "Įjungti arba išjungti mobiliojo plačiajuosčio ryšio įrenginius"
 
 #: ../policy/org.freedesktop.NetworkManager.policy.in.h:8
 msgid "System policy prevents enabling or disabling mobile broadband devices"
-msgstr ""
-"Sistemos politika neleidžia įjungti arba išjungti mobiliojo plačiajuosčio "
-"ryšio įrenginių"
+msgstr "Sistemos politika neleidžia įjungti arba išjungti mobiliojo plačiajuosčio ryšio įrenginių"
 
 #: ../policy/org.freedesktop.NetworkManager.policy.in.h:9
 msgid "Enable or disable WiMAX mobile broadband devices"
 msgstr "Įjungti arba išjungti WiMAX mobiliojo plačiajuosčio ryšio įrenginius"
 
 #: ../policy/org.freedesktop.NetworkManager.policy.in.h:10
-msgid ""
-"System policy prevents enabling or disabling WiMAX mobile broadband devices"
-msgstr ""
-"Sistemos politika neleidžia įjungti arba išjungti WiMAX mobiliojo "
-"plačiajuosčio ryšio įrenginių"
+msgid "System policy prevents enabling or disabling WiMAX mobile broadband devices"
+msgstr "Sistemos politika neleidžia įjungti arba išjungti WiMAX mobiliojo plačiajuosčio ryšio įrenginių"
 
 #: ../policy/org.freedesktop.NetworkManager.policy.in.h:11
 msgid "Allow control of network connections"
@@ -2229,8 +2513,7 @@ msgstr "Dalijimasis ryšiu naudojant apsaugotą WiFi tinklą"
 
 #: ../policy/org.freedesktop.NetworkManager.policy.in.h:14
 msgid "System policy prevents sharing connections via a protected WiFi network"
-msgstr ""
-"Sistemos politika nelaidžia dalytis ryšiais naudojant apsaugotą WiFi tinklą"
+msgstr "Sistemos politika nelaidžia dalytis ryšiais naudojant apsaugotą WiFi tinklą"
 
 #: ../policy/org.freedesktop.NetworkManager.policy.in.h:15
 msgid "Connection sharing via an open WiFi network"
@@ -2238,8 +2521,7 @@ msgstr "Dalijimasis ryšiu naudojant atvirą WiFi tinklą"
 
 #: ../policy/org.freedesktop.NetworkManager.policy.in.h:16
 msgid "System policy prevents sharing connections via an open WiFi network"
-msgstr ""
-"Sistemos politika neleidžia dalytis ryšiais naudojant atvirą WiFi tinklą"
+msgstr "Sistemos politika neleidžia dalytis ryšiais naudojant atvirą WiFi tinklą"
 
 #: ../policy/org.freedesktop.NetworkManager.policy.in.h:17
 msgid "Modify personal network connections"
@@ -2255,9 +2537,7 @@ msgstr "Keisti visų naudotojų tinklo ryšius"
 
 #: ../policy/org.freedesktop.NetworkManager.policy.in.h:20
 msgid "System policy prevents modification of network settings for all users"
-msgstr ""
-"Sistemos politika neleidžia keisti tinklo nustatymų, skirtų visiems "
-"naudotojams"
+msgstr "Sistemos politika neleidžia keisti tinklo nustatymų, skirtų visiems naudotojams"
 
 #: ../policy/org.freedesktop.NetworkManager.policy.in.h:21
 msgid "Modify persistent system hostname"
@@ -2267,112 +2547,131 @@ msgstr "Keisti pastovų sistemos vardą"
 msgid "System policy prevents modification of the persistent system hostname"
 msgstr "Sistemos politika neleidžia keisti įsiminto sistemos vardo"
 
-#: ../src/main.c:156
+#: ../src/main.c:158
 #, c-format
 msgid "Failed to set signal mask: %d"
 msgstr "Nepavyko nustatyti signalo kaukės: %d"
 
-#: ../src/main.c:163
+#: ../src/main.c:167
 #, c-format
 msgid "Failed to create signal handling thread: %d"
 msgstr "Nepavyko sukurti signalo apdorojimo gijos: %d"
 
-#: ../src/main.c:178
+#: ../src/main.c:182
 #, c-format
 msgid "Opening %s failed: %s\n"
 msgstr "Nepavyko atverti %s: %s\n"
 
-#: ../src/main.c:184
+#: ../src/main.c:188
 #, c-format
 msgid "Writing to %s failed: %s\n"
 msgstr "Nepavyko rašymas į %s: %s\n"
 
-#: ../src/main.c:189
+#: ../src/main.c:193
 #, c-format
 msgid "Closing %s failed: %s\n"
 msgstr "Nepavyko užverti %s: %s\n"
 
-#: ../src/main.c:232
+#: ../src/main.c:236
 #, c-format
 msgid "NetworkManager is already running (pid %ld)\n"
 msgstr "NetworkManager jau veikia „pid %ld)\n"
 
-#: ../src/main.c:372
+#: ../src/main.c:376
 msgid "Print NetworkManager version and exit"
 msgstr "Parodyti NetworkManager versiją ir išeiti"
 
-#: ../src/main.c:373
+#: ../src/main.c:377
 msgid "Don't become a daemon"
 msgstr "Netapti demonu"
 
-#: ../src/main.c:374
+#: ../src/main.c:378
 msgid "Make all warnings fatal"
 msgstr "Paversti visus įspėjimus lemtingais"
 
-#: ../src/main.c:375
+#: ../src/main.c:379
 msgid "Specify the location of a PID file"
 msgstr "Nurodykite PID failo vietą"
 
-#: ../src/main.c:375
+#: ../src/main.c:379
 msgid "filename"
 msgstr "failo pavadinimas"
 
-#: ../src/main.c:376
+#: ../src/main.c:380
 msgid "State file location"
 msgstr "Būsenos failo vieta"
 
-#: ../src/main.c:376
+#: ../src/main.c:380
 msgid "/path/to/state.file"
 msgstr "/kelias/iki/būsenos.failo"
 
-#: ../src/main.c:377
+#: ../src/main.c:381
 msgid "Config file location"
 msgstr "Konfigūracijos failo vieta"
 
-#: ../src/main.c:377
+#: ../src/main.c:381
 msgid "/path/to/config.file"
 msgstr "/kelias/iki/konfigūracijos.failo"
 
-#: ../src/main.c:378
+#: ../src/main.c:382
 msgid "List of plugins separated by ','"
 msgstr "Įskiepių sąrašas skiriant „,“"
 
-#: ../src/main.c:378
+#: ../src/main.c:382
 msgid "plugin1,plugin2"
 msgstr "įskiepis1,įskiepis2"
 
 #. Translators: Do not translate the values in the square brackets
-#: ../src/main.c:380
+#: ../src/main.c:384
 msgid "Log level: one of [ERR, WARN, INFO, DEBUG]"
 msgstr "Žurnalo lygis: vienas iš [ERR, WARN, INFO, DEBUG]"
 
 #. Translators: Do not translate the values in the square brackets
-#: ../src/main.c:383
+#: ../src/main.c:387
+#| msgid ""
+#| "Log domains separated by ',': any combination of\n"
+#| "                                          [NONE,HW,RFKILL,ETHER,WIFI,BT,"
+#| "MB,DHCP4,DHCP6,PPP,\n"
+#| "                                           WIFI_SCAN,IP4,IP6,AUTOIP4,DNS,"
+#| "VPN,SHARING,SUPPLICANT,\n"
+#| "                                           AGENTS,SETTINGS,SUSPEND,CORE,"
+#| "DEVICE,OLPC,WIMAX,\n"
+#| "                                           INFINIBAND,FIREWALL]"
 msgid ""
 "Log domains separated by ',': any combination of\n"
-"                                          [NONE,HW,RFKILL,ETHER,WIFI,BT,MB,"
-"DHCP4,DHCP6,PPP,\n"
-"                                           WIFI_SCAN,IP4,IP6,AUTOIP4,DNS,VPN,"
-"SHARING,SUPPLICANT,\n"
-"                                           AGENTS,SETTINGS,SUSPEND,CORE,"
-"DEVICE,OLPC,WIMAX,\n"
-"                                           INFINIBAND,FIREWALL]"
+"                                                [NONE,HW,RFKILL,ETHER,WIFI,BT,MB,DHCP4,DHCP6,PPP,\n"
+"                                                 WIFI_SCAN,IP4,IP6,AUTOIP4,DNS,VPN,SHARING,SUPPLICANT,\n"
+"                                                 AGENTS,SETTINGS,SUSPEND,CORE,DEVICE,OLPC,WIMAX,\n"
+"                                                 INFINIBAND,FIREWALL,ADSL]"
 msgstr ""
 "Žurnalo sritys skiriamos „,“: bet kokia reikšmių kombinacija\n"
-"                                          [NONE,HW,RFKILL,ETHER,WIFI,BT,MB,"
-"DHCP4,DHCP6,PPP,\n"
-"                                           WIFI_SCAN,IP4,IP6,AUTOIP4,DNS,VPN,"
-"SHARING,SUPPLICANT,\n"
-"                                           AGENTS,SETTINGS,SUSPEND,CORE,"
-"DEVICE,OLPC,WIMAX,\n"
-"                                           INFINIBAND,FIREWALL]"
+"                                          [NONE,HW,RFKILL,ETHER,WIFI,BT,MB,DHCP4,DHCP6,PPP,\n"
+"                                           WIFI_SCAN,IP4,IP6,AUTOIP4,DNS,VPN,SHARING,SUPPLICANT,\n"
+"                                           AGENTS,SETTINGS,SUSPEND,CORE,DEVICE,OLPC,WIMAX,\n"
+"                                           INFINIBAND,FIREWALL,ADSL]"
+
+#: ../src/main.c:393
+msgid "An http(s) address for checking internet connectivity"
+msgstr "http(s) adresas interneto jungiamumui tikrinti"
+
+#: ../src/main.c:394
+msgid "The interval between connectivity checks (in seconds)"
+msgstr "Intervalas tarp jungiamumo tikrinimų (sekundėmis)"
 
-#: ../src/main.c:396
+#: ../src/main.c:395
+msgid "The expected start of the response"
+msgstr "Tikėtina atsakymo pradžia"
+
+#: ../src/main.c:395
+msgid "Bingo!"
+msgstr "Bingo!"
+
+#: ../src/main.c:400
 #, c-format
 msgid "GModules are not supported on your platform!\n"
 msgstr "GModules nepalaikomi jūsų platformoje\n"
 
-#: ../src/main.c:419
+#: ../src/main.c:423
 msgid ""
 "NetworkManager monitors all network connections and automatically\n"
 "chooses the best connection to use.  It also allows the user to\n"
@@ -2384,34 +2683,32 @@ msgstr ""
 "nurodyti belaidžio ryšio prieigos taškus, su kuriais susieti\n"
 "jūsų kompiuterio belaidžio ryšio kortas."
 
-#: ../src/main.c:425
+#: ../src/main.c:429
 #, c-format
 msgid "Invalid option.  Please use --help to see a list of valid options.\n"
-msgstr ""
-"Netinkama parinktis. Galimų parinkčių sąrašą galite pamatyti naudodami "
-"parametrą --help.\n"
+msgstr "Netinkama parinktis. Galimų parinkčių sąrašą galite pamatyti naudodami parametrą --help.\n"
 
-#: ../src/main.c:435
+#: ../src/main.c:439
 #, c-format
 msgid "You must be root to run NetworkManager!\n"
 msgstr "Jūs turite būti root, kad paleistumėte NetworkManager!\n"
 
-#: ../src/main.c:456
+#: ../src/main.c:460
 #, c-format
 msgid "Failed to read configuration: (%d) %s\n"
 msgstr "Nepavyko perskaityti konfigūracijos: (%d) %s\n"
 
-#: ../src/main.c:467
+#: ../src/main.c:471
 #, c-format
 msgid "%s.  Please use --help to see a list of valid options.\n"
 msgstr "%s.  Naudokite --help, galimų parinkčių sąrašui gauti.\n"
 
-#: ../src/main.c:474
+#: ../src/main.c:478
 #, c-format
 msgid "State file %s parsing failed: (%d) %s\n"
 msgstr "Nepavyko perskaityti būsenos failo %s: (%d) %s\n"
 
-#: ../src/main.c:491
+#: ../src/main.c:495
 #, c-format
 msgid "Could not daemonize: %s [error %u]\n"
 msgstr "Nepavyko tapri demonu: %s [klaida %u]\n"
@@ -2446,32 +2743,32 @@ msgstr "nerastas „dhcpcd“."
 msgid "unsupported DHCP client '%s'"
 msgstr "nepalaikomas DHCP klientas „%s“."
 
-#: ../src/dns-manager/nm-dns-manager.c:376
+#: ../src/dns-manager/nm-dns-manager.c:381
 msgid "NOTE: the libc resolver may not support more than 3 nameservers."
-msgstr ""
-"PASTABA: libc adresų nustatymo funkcija gali nepalaikyti daugiau nei 3 vardų "
-"serverių."
+msgstr "PASTABA: libc adresų nustatymo funkcija gali nepalaikyti daugiau nei 3 vardų serverių."
 
-#: ../src/dns-manager/nm-dns-manager.c:378
+#: ../src/dns-manager/nm-dns-manager.c:383
 msgid "The nameservers listed below may not be recognized."
 msgstr "Žemiau pateikti vardų serveriai gali būti neatpažinti."
 
-#: ../src/logging/nm-logging.c:130
+#: ../src/logging/nm-logging.c:131
 #, c-format
 msgid "Unknown log level '%s'"
 msgstr "Nežinomas žurnalo vedimo lygis „%s“"
 
-#: ../src/logging/nm-logging.c:155
+#: ../src/logging/nm-logging.c:156
 #, c-format
 msgid "Unknown log domain '%s'"
 msgstr "Nežinoma žurnalo sritis „%s“"
 
-#: ../src/modem-manager/nm-modem-cdma.c:279 ../src/nm-device-bt.c:325
+#: ../src/modem-manager/nm-modem-cdma.c:279
+#: ../src/nm-device-bt.c:325
 #, c-format
 msgid "CDMA connection %d"
 msgstr "CDMA ryšys %d"
 
-#: ../src/modem-manager/nm-modem-gsm.c:547 ../src/nm-device-bt.c:321
+#: ../src/modem-manager/nm-modem-gsm.c:547
+#: ../src/nm-device-bt.c:321
 #, c-format
 msgid "GSM connection %d"
 msgstr "GSM ryšys %d"
@@ -2481,6 +2778,12 @@ msgstr "GSM ryšys %d"
 msgid "Bond connection %d"
 msgstr "Susieti ryšį %d"
 
+#: ../src/nm-device-adsl.c:193
+#, c-format
+#| msgid "GSM connection %d"
+msgid "ADSL connection %d"
+msgstr "ADSL ryšys %d"
+
 #: ../src/nm-device-bt.c:296
 #, c-format
 msgid "PAN connection %d"
@@ -2491,12 +2794,13 @@ msgstr "PAN ryšys %d"
 msgid "DUN connection %d"
 msgstr "DUN ryšys %d"
 
-#: ../src/nm-device-ethernet.c:1326
+#: ../src/nm-device-ethernet.c:1327
 #, c-format
 msgid "PPPoE connection %d"
 msgstr "PPPoE ryšys %d"
 
-#: ../src/nm-device-ethernet.c:1326 ../src/settings/nm-settings-utils.c:50
+#: ../src/nm-device-ethernet.c:1327
+#: ../src/settings/nm-settings-utils.c:50
 #, c-format
 msgid "Wired connection %d"
 msgstr "Laidinis ryšys %d"
@@ -2506,7 +2810,7 @@ msgstr "Laidinis ryšys %d"
 msgid "InfiniBand connection %d"
 msgstr "InfiniBand ryšys %d"
 
-#: ../src/nm-device-olpc-mesh.c:293
+#: ../src/nm-device-olpc-mesh.c:303
 #, c-format
 msgid "Mesh %d"
 msgstr "Susiejimas %d"
@@ -2521,7 +2825,8 @@ msgstr "VLAN ryšys %d"
 msgid "VPN connection %d"
 msgstr "VPN ryšys %d"
 
-#: ../src/nm-netlink-monitor.c:148 ../src/nm-netlink-monitor.c:272
+#: ../src/nm-netlink-monitor.c:148
+#: ../src/nm-netlink-monitor.c:272
 #: ../src/nm-netlink-monitor.c:695
 #, c-format
 msgid "error processing netlink message: %s"
@@ -2541,7 +2846,8 @@ msgstr "nepavyko prisijungti prie netlink saito būsenai stebėti: %s"
 msgid "unable to enable netlink handle credential passing: %s"
 msgstr "nepavyko įjungti netlink valdiklio įgaliojimams perduoti: %s"
 
-#: ../src/nm-netlink-monitor.c:330 ../src/nm-netlink-monitor.c:390
+#: ../src/nm-netlink-monitor.c:330
+#: ../src/nm-netlink-monitor.c:390
 #, c-format
 msgid "unable to allocate netlink handle for monitoring link status: %s"
 msgstr "nepavyko rezervuoti netlink valdiklio saito būsenai stebėti: %s"
@@ -2556,19 +2862,70 @@ msgstr "nepavyko rezervuoti netlink saito podėlio saito būsenai stebėti: %s"
 msgid "unable to join netlink group: %s"
 msgstr "nepavyko prisijungti prie netlink grupės: %s"
 
-#: ../src/nm-netlink-monitor.c:671 ../src/nm-netlink-monitor.c:684
+#: ../src/nm-netlink-monitor.c:671
+#: ../src/nm-netlink-monitor.c:684
 #, c-format
 msgid "error updating link cache: %s"
 msgstr "klaida atnaujinant saito podėlį: %s"
 
-#: ../src/settings/plugins/ifcfg-rh/reader.c:93
+#: ../src/settings/plugins/ifcfg-rh/reader.c:94
 msgid "System"
 msgstr "Sistema"
 
-#: ../src/settings/plugins/ifcfg-rh/reader.c:3634
+#: ../src/settings/plugins/ifcfg-rh/reader.c:3641
 msgid "Bond"
 msgstr "Susieti"
 
+#: ../test/nm-online.c:112
+#, c-format
+#| msgid "connecting"
+msgid "\rConnecting"
+msgstr "\rJungiamasi"
+
+#: ../test/nm-online.c:143
+msgid "Time to wait for a connection, in seconds (default is 30)"
+msgstr "Laikas sekundėmis, kiek laukti ryšio (numatyta 30)"
+
+#: ../test/nm-online.c:144
+#| msgid "Error: NetworkManager is not running."
+msgid "Exit immediately if NetworkManager is not running or connecting"
+msgstr "Išeiti nedelsiant, jei NetworkManager neveikia arba nesijungia"
+
+#: ../test/nm-online.c:145
+msgid "Don't print anything"
+msgstr "Nespausdinti nieko"
+
+#: ../test/nm-online.c:163
+msgid "Waits for a successful connection in NetworkManager."
+msgstr "Laukia sėkmingo ryšio NetworkManager."
+
+#: ../test/nm-online.c:169
+#: ../test/nm-online.c:178
+#| msgid "Invalid option.  Please use --help to see a list of valid options.\n"
+msgid "Invalid option.  Please use --help to see a list of valid options."
+msgstr "Netinkama parinktis.  Galimų parinkčių sąrašą galite pamatyti naudodami parametrą --help."
+
+#~ msgid "state: %s\n"
+#~ msgstr "būsena: %s\n"
+
+#~ msgid "Connection activated\n"
+#~ msgstr "Ryšys aktyvuotas\n"
+
+#~ msgid "state: %s (%d)\n"
+#~ msgstr "būsena: %s (%d)\n"
+
+#~ msgid "Active connection state: %s\n"
+#~ msgstr "Aktyvaus ryšio būsena: %s\n"
+
+#~ msgid "Active connection path: %s\n"
+#~ msgstr "Aktyvaus ryšio kelias: %s\n"
+
+#~ msgid "Device state: %d (%s)\n"
+#~ msgstr "Įrenginio būsena: %d (%s)\n"
+
+#~ msgid "not set"
+#~ msgstr "nenustatyta"
+
 #~ msgid "SCOPE"
 #~ msgstr "SRITIS"
 
diff --git a/po/ml.po b/po/ml.po
index 211601d1..4d434040 100644
--- a/po/ml.po
+++ b/po/ml.po
@@ -2,26 +2,28 @@
 # translation of NetworkManager.master_upstream.ml.po to
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
-# Ani Peter , 2010
-# Mohammed , 2012
 #
+# Ani Peter , 2010, 2012.
+# Mohammed , 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ml\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
 "product=NetworkManager&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2012-02-28 03:24+0000\n"
-"PO-Revision-Date: 2010-05-10 15:31+0530\n"
-"Last-Translator: \n"
-"Language-Team:  \n"
+"POT-Creation-Date: 2012-11-13 15:25+0000\n"
+"PO-Revision-Date: 2012-11-27 13:44+0530\n"
+"Last-Translator: Ani Peter \n"
+"Language-Team: Malayalam \n"
+"Language: ml\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: KBabel 1.11.4\n"
+"X-Generator: Lokalize 1.5\n"
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
 
 #: ../cli/src/common.c:32 ../cli/src/common.c:44 ../cli/src/common.c:52
-#: ../cli/src/common.c:63 ../cli/src/connections.c:119
-#: ../cli/src/connections.c:153
+#: ../cli/src/common.c:63 ../cli/src/connections.c:128
+#: ../cli/src/connections.c:162
 msgid "GROUP"
 msgstr "GROUP"
 
@@ -55,18 +57,310 @@ msgstr "WINS"
 msgid "OPTION"
 msgstr "OPTION"
 
+#: ../cli/src/common.c:366
+msgid "unmanaged"
+msgstr "കൈകാര്യം ചെയ്തിട്ടില്ലാത്തതു്"
+
+#: ../cli/src/common.c:368
+msgid "unavailable"
+msgstr "ലഭ്യമല്ലാത്തതു്"
+
+#: ../cli/src/common.c:370 ../cli/src/network-manager.c:120
+msgid "disconnected"
+msgstr "വിഛേദിച്ചിരിക്കുന്നു"
+
+#: ../cli/src/common.c:372
+msgid "connecting (prepare)"
+msgstr "കണക്ട് ചെയ്യുന്നു (തയ്യാറാക്കുക)"
+
+#: ../cli/src/common.c:374
+msgid "connecting (configuring)"
+msgstr "കണക്ട് ചെയ്യുന്നു (ക്രമീകരിക്കുന്നു)"
+
+#: ../cli/src/common.c:376
+msgid "connecting (need authentication)"
+msgstr "കണക്ട് ചെയ്യുന്നു (ആധികാരികത ഉറപ്പാക്കേണ്ടതുണ്ടു്)"
+
+#: ../cli/src/common.c:378
+msgid "connecting (getting IP configuration)"
+msgstr "കണക്ട് ചെയ്യുന്നു (ഐപി ക്രമീകരണം ലഭ്യമാക്കുന്നു)"
+
+#: ../cli/src/common.c:380
+msgid "connecting (checking IP connectivity)"
+msgstr "കണക്ട് ചെയ്യുന്നു (ഐപി കണക്ടിവിറ്റി പരിശോധിക്കുന്നു)"
+
+#: ../cli/src/common.c:382
+msgid "connecting (starting secondary connections)"
+msgstr "കണക്ട് ചെയ്യുന്നു (രണ്ടാംഘട്ടത്തിലുള്ള കണക്ഷന്‍ തുടങ്ങുന്നു) "
+
+#: ../cli/src/common.c:384 ../cli/src/network-manager.c:116
+msgid "connected"
+msgstr "കണക്ട് ചെയ്തിരിക്കുന്നു"
+
+#: ../cli/src/common.c:386 ../cli/src/connections.c:635
+msgid "deactivating"
+msgstr "സജീവമല്ലാതാക്കുന്നു"
+
+#: ../cli/src/common.c:388
+msgid "connection failed"
+msgstr "കണക്ഷന്‍ പരാജയപ്പെട്ടു"
+
+#: ../cli/src/common.c:390 ../cli/src/connections.c:638
+#: ../cli/src/connections.c:661 ../cli/src/connections.c:1353
+#: ../cli/src/devices.c:645 ../cli/src/network-manager.c:123
+#: ../cli/src/network-manager.c:185 ../cli/src/network-manager.c:188
+#: ../cli/src/network-manager.c:197 ../cli/src/network-manager.c:257
+#: ../cli/src/network-manager.c:273 ../cli/src/network-manager.c:431
+#: ../cli/src/network-manager.c:486 ../cli/src/network-manager.c:524
+#: ../cli/src/network-manager.c:563 ../cli/src/settings.c:593
+#: ../cli/src/settings.c:621 ../cli/src/utils.c:531 ../src/main.c:451
+#: ../src/main.c:470
+msgid "unknown"
+msgstr "അപരിചിതം"
+
+#: ../cli/src/common.c:399
+msgid "No reason given"
+msgstr "കാരണം നല്‍കപ്പെട്ടിട്ടില്ല"
+
+#: ../cli/src/common.c:402
+msgid "Unknown error"
+msgstr "അപരിചിതമായ പിശക്"
+
+#: ../cli/src/common.c:405
+msgid "Device is now managed"
+msgstr "ഡിവൈസ് ഇപ്പോള്‍ കൈകാര്യം ചെയ്തിരിക്കുന്നു"
+
+#: ../cli/src/common.c:408
+msgid "Device is now unmanaged"
+msgstr "ഡിവൈസ് ഇപ്പോള്‍ കൈകാര്യം ചെയ്യുന്നില്ല"
+
+#: ../cli/src/common.c:411
+msgid "The device could not be readied for configuration"
+msgstr "ഡിവൈസ് ക്രമീകരിക്കാന്‍ സജ്ജമാക്കാന്‍ സാധിക്കുന്നില്ല"
+
+#: ../cli/src/common.c:414
+msgid ""
+"IP configuration could not be reserved (no available address, timeout, etc.)"
+msgstr ""
+"IP ക്രമീകരണം കരുതിവയ്ക്കാന്‍ സാധിക്കുന്നില്ല (മേല്‍വിലാസം ലഭ്യമല്ല, സമയപരിധി "
+"കഴിഞ്ഞു, മുതലായവ)"
+
+#: ../cli/src/common.c:417
+msgid "The IP configuration is no longer valid"
+msgstr "IP ക്രമീകരണം സാധുവല്ല"
+
+#: ../cli/src/common.c:420
+msgid "Secrets were required, but not provided"
+msgstr "രഹസ്യങ്ങള്‍ ആവിശ്യമായിരുന്നു, പക്ഷെ നല്‍കിയിട്ടില്ല"
+
+#: ../cli/src/common.c:423
+msgid "802.1X supplicant disconnected"
+msgstr "802.1X സപ്ലിക്കെന്റ്  വിച്ഛേദിച്ചിരിക്കുന്നു"
+
+#: ../cli/src/common.c:426
+msgid "802.1X supplicant configuration failed"
+msgstr "802.1X സപ്ലിക്കെന്റ് ക്രമീകരണം പരാജയപ്പെട്ടു"
+
+#: ../cli/src/common.c:429
+msgid "802.1X supplicant failed"
+msgstr "802.1X സപ്ലിക്കെന്റ് പരാജയപ്പെട്ടു"
+
+#: ../cli/src/common.c:432
+msgid "802.1X supplicant took too long to authenticate"
+msgstr "802.1X സപ്ലിക്കെന്റ് ആധികാരികതക്കു വേണ്ടി കൂടുതല്‍ സമയമെടുത്തു"
+
+#: ../cli/src/common.c:435
+msgid "PPP service failed to start"
+msgstr "പിപിപി സര്‍വീസ് ആരംഭിക്കുന്നതില്‍ പരാജയപ്പെട്ടു"
+
+#: ../cli/src/common.c:438
+msgid "PPP service disconnected"
+msgstr "പിപിപി സേവനം വിഛേദിച്ചിരിക്കുന്നു"
+
+#: ../cli/src/common.c:441
+msgid "PPP failed"
+msgstr "പിപിപി പരാജയപ്പെട്ടു"
+
+#: ../cli/src/common.c:444
+msgid "DHCP client failed to start"
+msgstr "DHCP ക്ലയ്ന്റ് ആരംഭിക്കുന്നതില്‍ പരാജയപ്പെട്ടു"
+
+#: ../cli/src/common.c:447
+msgid "DHCP client error"
+msgstr "DHCP ക്ലയ്ന്റ് പിശക്"
+
+#: ../cli/src/common.c:450
+msgid "DHCP client failed"
+msgstr "DHCP ക്ലയ്ന്റ് പരാജയപ്പെട്ടു"
+
+#: ../cli/src/common.c:453
+msgid "Shared connection service failed to start"
+msgstr "പങ്കുവെച്ച കണക്ഷന്‍ സേവനം ആരംഭിക്കുന്നതില്‍ പരാജയപ്പെട്ടു"
+
+#: ../cli/src/common.c:456
+msgid "Shared connection service failed"
+msgstr "പങ്കുവെച്ച കണക്ഷന്‍ സേവനം പരാജയപ്പെട്ടു"
+
+#: ../cli/src/common.c:459
+msgid "AutoIP service failed to start"
+msgstr "AutoIP സേവനം ആരംഭിക്കുന്നതില്‍ പരാജയപ്പെട്ടു"
+
+#: ../cli/src/common.c:462
+msgid "AutoIP service error"
+msgstr "AutoIP സേവനം പിശക്"
+
+#: ../cli/src/common.c:465
+msgid "AutoIP service failed"
+msgstr "AutoIP സേവനം പരാജയപ്പെട്ടു"
+
+#: ../cli/src/common.c:468
+msgid "The line is busy"
+msgstr "ലൈന്‍ തിരക്കിലാണു്"
+
+#: ../cli/src/common.c:471
+msgid "No dial tone"
+msgstr "ഡയല്‍ ടോണില്‍"
+
+#: ../cli/src/common.c:474
+msgid "No carrier could be established"
+msgstr "ക്യാരിയര്‍ സ്ഥാപിയ്ക്കുവാനായില്ല"
+
+#: ../cli/src/common.c:477
+msgid "The dialing request timed out"
+msgstr "ഡയലിങ് ആവശ്യത്തിന്റെ സമയപരിധി കഴിഞ്ഞിരിയ്ക്കുന്നു"
+
+#: ../cli/src/common.c:480
+msgid "The dialing attempt failed"
+msgstr "ഡയലിങ് ശ്രമം പരാജയപ്പെട്ടു"
+
+#: ../cli/src/common.c:483
+msgid "Modem initialization failed"
+msgstr "മോഡത്തിന്റെ ആരംഭം പരാജയപ്പെട്ടു."
+
+#: ../cli/src/common.c:486
+msgid "Failed to select the specified APN"
+msgstr "നിര്‍ദ്ദേശിച്ച APN തിരഞ്ഞെടുക്കുന്നതില്‍ പരാജയപ്പെട്ടു."
+
+#: ../cli/src/common.c:489
+msgid "Not searching for networks"
+msgstr "നെറ്റ്​വര്‍ക്കുന്നു വേണ്ടി തിരയുന്നില്ല്"
+
+#: ../cli/src/common.c:492
+msgid "Network registration denied"
+msgstr "നെറ്റ്‌വര്‍ക്ക് രജിസ്ട്രേഷന്‍ നിഷേധിച്ചു"
+
+#: ../cli/src/common.c:495
+msgid "Network registration timed out"
+msgstr "നെറ്റ്‌വര്‍ക്ക് രജിസ്ട്രേഷന്റെ സമയപരിധി കഴിഞ്ഞിരിയ്ക്കുന്നു"
+
+#: ../cli/src/common.c:498
+msgid "Failed to register with the requested network"
+msgstr "ആവശ്യപ്പെട്ട നെറ്റ്‌വര്‍ക്കിലേക്ക് രജിസ്ടര്‍ ചെയ്യുന്നതില്‍ പരാജയം"
+
+#: ../cli/src/common.c:501
+msgid "PIN check failed"
+msgstr "PIN പരിശോധന പരാജയപ്പെട്ടു"
+
+#: ../cli/src/common.c:504
+msgid "Necessary firmware for the device may be missing"
+msgstr "ആവശ്യമായ ഫേംവെയര്‍ ലഭ്യമല്ലെന്നു തോന്നുന്നു"
+
+#: ../cli/src/common.c:507
+msgid "The device was removed"
+msgstr "ഡിവൈസ് നീക്കം ചെയ്തിരിക്കുന്നു"
+
+#: ../cli/src/common.c:510
+msgid "NetworkManager went to sleep"
+msgstr "നെറ്റ്‌വര്‍ക്ക്മാനേജറിന്റെ ഉറക്കത്തിലേക്കു നീങ്ങി"
+
+#: ../cli/src/common.c:513
+msgid "The device's active connection disappeared"
+msgstr "ഡിവൈസിന്റെ സജീവമായ കണക്ഷന്‍ ലഭ്യമല്ലാതായി"
+
+#: ../cli/src/common.c:516
+msgid "Device disconnected by user or client"
+msgstr ""
+"ഉപയോക്താവു് അല്ലെങ്കില്‍ ക്ലയന്റ് ഡിവൈസ് കണക്ഷന്‍ നിഷേധിച്ചിരിയ്ക്കുന്നു"
+
+#: ../cli/src/common.c:519
+msgid "Carrier/link changed"
+msgstr "ക്യാരിയര്‍/കണ്ണി മാറിയിരിയ്ക്കുന്നു"
+
+#: ../cli/src/common.c:522
+msgid "The device's existing connection was assumed"
+msgstr "ഡിവൈസിന്റെ നിലവിലുള്ള കണക്ഷനാണെന്നു് ഊഹിച്ചിരിക്കുന്നു"
+
+#: ../cli/src/common.c:525
+msgid "The supplicant is now available"
+msgstr "സപ്ലിക്കെന്റ് ഇപ്പോള്‍ ലഭ്യമാണ്"
+
+#: ../cli/src/common.c:528
+msgid "The modem could not be found"
+msgstr "മോഡം കണ്ടെത്തുവാന്‍ സാധിക്കുന്നില്ല"
+
+#: ../cli/src/common.c:531
+msgid "The Bluetooth connection failed or timed out"
+msgstr "ബ്ലൂടൂത് കണക്ഷനുള്ള ശ്രമം കഴിഞ്ഞിരിക്കുന്നു"
+
+#: ../cli/src/common.c:534
+msgid "GSM Modem's SIM card not inserted"
+msgstr "GSM മോഡത്തില്‍ സിം കാര്‍ഡ് ഇല്ല"
+
+#: ../cli/src/common.c:537
+msgid "GSM Modem's SIM PIN required"
+msgstr "GSM മോഡത്തിന്റെ സിം PIN ആവിശ്യമാണ്"
+
+#: ../cli/src/common.c:540
+msgid "GSM Modem's SIM PUK required"
+msgstr "GSM മോഡത്തിന്റെ സിം PUK ആവിശ്യമാണ്"
+
+#: ../cli/src/common.c:543
+msgid "GSM Modem's SIM wrong"
+msgstr "GSM മോഡത്തിന്റെ സിം തെറ്റാണ്"
+
+#: ../cli/src/common.c:546
+msgid "InfiniBand device does not support connected mode"
+msgstr "ഇന്‍ഫിബാന്‍ഡ് ഡിവൈസ് കണക്ട് ചെയ്യുന്ന മോഡ് പിന്തുണയ്ക്കുന്നില്ല"
+
+#: ../cli/src/common.c:549
+msgid "A dependency of the connection failed"
+msgstr "കണക്ഷന്റെ ഡിപന്‍ഡന്‍സ് പരാജയപ്പെട്ടു"
+
+#: ../cli/src/common.c:552
+msgid "A problem with the RFC 2684 Ethernet over ADSL bridge"
+msgstr "എഡിഎസ്എല്‍ ബ്രിഡ്ജിനു് പകരം RFC 2684 ഇഥര്‍നെറ്റില്‍ പ്രശ്നം"
+
+#: ../cli/src/common.c:555
+msgid "ModemManager is unavailable"
+msgstr "ModemManager ലഭ്യമല്ല"
+
+#: ../cli/src/common.c:558
+#| msgid "The modem could not be found"
+msgid "The Wi-Fi network could not be found"
+msgstr "വൈ-ഫൈ നെറ്റ്‌വര്‍ക്ക് ലഭ്യമായില്ല"
+
+#: ../cli/src/common.c:561
+#| msgid "A dependency of the connection failed"
+msgid "A secondary connection of the base connection failed"
+msgstr "അടിസ്ഥാന കണക്ഷനുള്ള സെക്കണ്ടറി കണക്ഷന്‍ പരാജയപ്പെട്ടു"
+
+#: ../cli/src/common.c:564 ../cli/src/devices.c:295 ../cli/src/devices.c:311
+#: ../cli/src/devices.c:433 ../cli/src/devices.c:477
+msgid "Unknown"
+msgstr "അപരിചിതം"
+
 #. 0
 #. used only for 'GENERAL' group listing
-#: ../cli/src/connections.c:56 ../cli/src/connections.c:120
-#: ../cli/src/devices.c:100 ../cli/src/devices.c:121 ../cli/src/devices.c:131
-#: ../cli/src/devices.c:141 ../cli/src/devices.c:155 ../cli/src/devices.c:169
-#: ../cli/src/devices.c:191
+#: ../cli/src/connections.c:59 ../cli/src/connections.c:129
+#: ../cli/src/devices.c:107 ../cli/src/devices.c:131 ../cli/src/devices.c:141
+#: ../cli/src/devices.c:151 ../cli/src/devices.c:165 ../cli/src/devices.c:179
+#: ../cli/src/devices.c:201 ../cli/src/devices.c:217 ../cli/src/devices.c:226
 msgid "NAME"
 msgstr "NAME"
 
 #. 0
 #. 1
-#: ../cli/src/connections.c:57 ../cli/src/connections.c:121
+#: ../cli/src/connections.c:60 ../cli/src/connections.c:130
 msgid "UUID"
 msgstr "UUID"
 
@@ -74,28 +368,29 @@ msgstr "UUID"
 #. 0
 #. 1
 #. 2
-#: ../cli/src/connections.c:58 ../cli/src/connections.c:154
-#: ../cli/src/devices.c:66 ../cli/src/devices.c:102 ../cli/src/devices.c:194
+#: ../cli/src/connections.c:61 ../cli/src/connections.c:163
+#: ../cli/src/devices.c:71 ../cli/src/devices.c:109 ../cli/src/devices.c:204
 msgid "TYPE"
 msgstr "TYPE"
 
 #. 2
-#: ../cli/src/connections.c:59
+#: ../cli/src/connections.c:62
 msgid "TIMESTAMP"
 msgstr "TIMESTAMP"
 
 #. 3
-#: ../cli/src/connections.c:60
+#: ../cli/src/connections.c:63
 msgid "TIMESTAMP-REAL"
 msgstr "TIMESTAMP-REAL"
 
 #. 4
-#: ../cli/src/connections.c:61
+#. 13
+#: ../cli/src/connections.c:64 ../cli/src/devices.c:121
 msgid "AUTOCONNECT"
 msgstr "AUTOCONNECT"
 
 #. 5
-#: ../cli/src/connections.c:62
+#: ../cli/src/connections.c:65
 msgid "READONLY"
 msgstr "READONLY"
 
@@ -104,99 +399,111 @@ msgstr "READONLY"
 #. 2
 #. 11
 #. 5
-#: ../cli/src/connections.c:63 ../cli/src/connections.c:128
-#: ../cli/src/devices.c:68 ../cli/src/devices.c:181 ../cli/src/devices.c:197
+#: ../cli/src/connections.c:66 ../cli/src/connections.c:137
+#: ../cli/src/devices.c:73 ../cli/src/devices.c:191 ../cli/src/devices.c:207
 msgid "DBUS-PATH"
 msgstr "DBUS-PATH"
 
 #. 2
-#: ../cli/src/connections.c:122
+#: ../cli/src/connections.c:131
 msgid "DEVICES"
 msgstr "DEVICES"
 
 #. 3
 #. 1
-#. 6
+#. 8
 #. 1
-#: ../cli/src/connections.c:123 ../cli/src/devices.c:67
-#: ../cli/src/devices.c:107 ../cli/src/network-manager.c:39
+#: ../cli/src/connections.c:132 ../cli/src/devices.c:72
+#: ../cli/src/devices.c:116 ../cli/src/network-manager.c:39
 msgid "STATE"
 msgstr "STATE"
 
 #. 4
-#: ../cli/src/connections.c:124
+#: ../cli/src/connections.c:133
 msgid "DEFAULT"
 msgstr "DEFAULT"
 
 #. 5
-#: ../cli/src/connections.c:125
+#: ../cli/src/connections.c:134
 msgid "DEFAULT6"
 msgstr "DEFAULT6"
 
 #. 6
-#: ../cli/src/connections.c:126
+#: ../cli/src/connections.c:135
 msgid "SPEC-OBJECT"
 msgstr "SPEC-OBJECT"
 
 #. 7
 #. 1
-#: ../cli/src/connections.c:127 ../cli/src/connections.c:141
+#: ../cli/src/connections.c:136 ../cli/src/connections.c:150
 msgid "VPN"
 msgstr "VPN"
 
 #. 9
-#: ../cli/src/connections.c:129
+#: ../cli/src/connections.c:138
 msgid "CON-PATH"
 msgstr "CON-PATH"
 
 #. 10
-#: ../cli/src/connections.c:130
+#: ../cli/src/connections.c:139
 msgid "ZONE"
 msgstr "ZONE"
 
 #. 11
-#: ../cli/src/connections.c:131
+#: ../cli/src/connections.c:140
 msgid "MASTER-PATH"
 msgstr "MASTER-PATH"
 
-#: ../cli/src/connections.c:139 ../cli/src/devices.c:77
+#: ../cli/src/connections.c:148 ../cli/src/devices.c:82
 msgid "GENERAL"
 msgstr "GENERAL"
 
 #. 0
-#: ../cli/src/connections.c:140
+#: ../cli/src/connections.c:149
 msgid "IP"
 msgstr "IP"
 
 #. 1
-#: ../cli/src/connections.c:155
+#: ../cli/src/connections.c:164
 msgid "USERNAME"
 msgstr "USERNAME"
 
 #. 2
-#: ../cli/src/connections.c:156
+#: ../cli/src/connections.c:165
 msgid "GATEWAY"
 msgstr "GATEWAY"
 
 #. 3
-#: ../cli/src/connections.c:157
+#: ../cli/src/connections.c:166
 msgid "BANNER"
 msgstr "BANNER"
 
 #. 4
-#: ../cli/src/connections.c:158
+#: ../cli/src/connections.c:167
 msgid "VPN-STATE"
 msgstr "VPN-STATE"
 
 #. 5
-#: ../cli/src/connections.c:159
+#: ../cli/src/connections.c:168
 msgid "CFG"
 msgstr "CFG"
 
-#: ../cli/src/connections.c:180
-#, c-format
+#: ../cli/src/connections.c:190
+#, c-format
+#| msgid ""
+#| "Usage: nmcli con { COMMAND | help }\n"
+#| "  COMMAND := { list | status | up | down | delete }\n"
+#| "\n"
+#| "  list [id  | uuid ]\n"
+#| "  status [id  | uuid  | path ]\n"
+#| "  up id  | uuid  [iface ] [ap ] [nsp ] [--"
+#| "nowait] [--timeout ]\n"
+#| "  up id  | uuid  [iface ] [ap ] [--nowait] [--"
+#| "timeout ]\n"
+#| "  down id  | uuid \n"
+#| "  delete id  | uuid \n"
 msgid ""
-"Usage: nmcli con { COMMAND | help }\n"
+"Usage: nmcli connection { COMMAND | help }\n"
 "  COMMAND := { list | status | up | down | delete }\n"
 "\n"
 "  list [id  | uuid ]\n"
@@ -207,8 +514,9 @@ msgid ""
 "]\n"
 "  down id  | uuid \n"
 "  delete id  | uuid \n"
+"\n"
 msgstr ""
-"ഉപയോഗക്രമം: nmcli con { COMMAND | help }\n"
+"ഉപയോഗിയ്ക്കേണ്ടി വിധം: nmcli connection { COMMAND | help }\n"
 "  COMMAND := { list | status | up | down | delete }\n"
 "\n"
 "  list [id  | uuid ]\n"
@@ -219,1092 +527,950 @@ msgstr ""
 "]\n"
 "  down id  | uuid \n"
 "  delete id  | uuid \n"
+"\n"
 
-#: ../cli/src/connections.c:234 ../cli/src/connections.c:567
+#: ../cli/src/connections.c:251 ../cli/src/connections.c:611
 #, c-format
 msgid "Error: 'con list': %s"
 msgstr "പിശക്: 'con list': %s"
 
-#: ../cli/src/connections.c:236 ../cli/src/connections.c:569
+#: ../cli/src/connections.c:253 ../cli/src/connections.c:613
 #, c-format
 msgid "Error: 'con list': %s; allowed fields: %s"
 msgstr "പിശക്: 'con list': %s; അനുവദിക്കുന്ന ഫീള്‍ഡുകള്‍: %s"
 
-#: ../cli/src/connections.c:244
+#: ../cli/src/connections.c:261
 msgid "Connection details"
 msgstr "കണക്ഷന്‍ വിശദാംശങ്ങള്‍"
 
-#: ../cli/src/connections.c:442
+#: ../cli/src/connections.c:486
 msgid "never"
 msgstr "ഒരിക്കലുമില്ല"
 
 #. "CAPABILITIES"
 #. Print header
 #. "WIFI-PROPERTIES"
-#: ../cli/src/connections.c:443 ../cli/src/connections.c:444
-#: ../cli/src/connections.c:681 ../cli/src/connections.c:682
-#: ../cli/src/connections.c:684 ../cli/src/devices.c:586
-#: ../cli/src/devices.c:639 ../cli/src/devices.c:750 ../cli/src/devices.c:751
-#: ../cli/src/devices.c:783 ../cli/src/devices.c:809 ../cli/src/devices.c:810
-#: ../cli/src/devices.c:811 ../cli/src/devices.c:812 ../cli/src/devices.c:813
-#: ../cli/src/settings.c:576 ../cli/src/settings.c:646
-#: ../cli/src/settings.c:766 ../cli/src/settings.c:1048
-#: ../cli/src/settings.c:1049 ../cli/src/settings.c:1051
-#: ../cli/src/settings.c:1053 ../cli/src/settings.c:1054
-#: ../cli/src/settings.c:1182 ../cli/src/settings.c:1183
-#: ../cli/src/settings.c:1184 ../cli/src/settings.c:1185
-#: ../cli/src/settings.c:1260 ../cli/src/settings.c:1261
-#: ../cli/src/settings.c:1262 ../cli/src/settings.c:1263
-#: ../cli/src/settings.c:1264 ../cli/src/settings.c:1265
-#: ../cli/src/settings.c:1266 ../cli/src/settings.c:1267
-#: ../cli/src/settings.c:1268 ../cli/src/settings.c:1269
-#: ../cli/src/settings.c:1270 ../cli/src/settings.c:1271
-#: ../cli/src/settings.c:1272 ../cli/src/settings.c:1343
+#: ../cli/src/connections.c:487 ../cli/src/connections.c:488
+#: ../cli/src/connections.c:716 ../cli/src/connections.c:717
+#: ../cli/src/connections.c:719 ../cli/src/devices.c:441
+#: ../cli/src/devices.c:494 ../cli/src/devices.c:610 ../cli/src/devices.c:611
+#: ../cli/src/devices.c:612 ../cli/src/devices.c:644 ../cli/src/devices.c:671
+#: ../cli/src/devices.c:672 ../cli/src/devices.c:673 ../cli/src/devices.c:674
+#: ../cli/src/devices.c:675 ../cli/src/network-manager.c:267
+#: ../cli/src/settings.c:712 ../cli/src/settings.c:787
+#: ../cli/src/settings.c:907 ../cli/src/settings.c:1189
+#: ../cli/src/settings.c:1190 ../cli/src/settings.c:1192
+#: ../cli/src/settings.c:1194 ../cli/src/settings.c:1195
+#: ../cli/src/settings.c:1326 ../cli/src/settings.c:1327
+#: ../cli/src/settings.c:1328 ../cli/src/settings.c:1329
+#: ../cli/src/settings.c:1406 ../cli/src/settings.c:1407
+#: ../cli/src/settings.c:1408 ../cli/src/settings.c:1409
+#: ../cli/src/settings.c:1410 ../cli/src/settings.c:1411
+#: ../cli/src/settings.c:1412 ../cli/src/settings.c:1413
+#: ../cli/src/settings.c:1414 ../cli/src/settings.c:1415
+#: ../cli/src/settings.c:1416 ../cli/src/settings.c:1417
+#: ../cli/src/settings.c:1418 ../cli/src/settings.c:1489
 msgid "yes"
 msgstr "ഉവ്വു്"
 
-#: ../cli/src/connections.c:443 ../cli/src/connections.c:444
-#: ../cli/src/connections.c:681 ../cli/src/connections.c:682
-#: ../cli/src/connections.c:684 ../cli/src/devices.c:586
-#: ../cli/src/devices.c:639 ../cli/src/devices.c:750 ../cli/src/devices.c:751
-#: ../cli/src/devices.c:783 ../cli/src/devices.c:809 ../cli/src/devices.c:810
-#: ../cli/src/devices.c:811 ../cli/src/devices.c:812 ../cli/src/devices.c:813
-#: ../cli/src/settings.c:576 ../cli/src/settings.c:578
-#: ../cli/src/settings.c:646 ../cli/src/settings.c:766
-#: ../cli/src/settings.c:1048 ../cli/src/settings.c:1049
-#: ../cli/src/settings.c:1051 ../cli/src/settings.c:1053
-#: ../cli/src/settings.c:1054 ../cli/src/settings.c:1182
-#: ../cli/src/settings.c:1183 ../cli/src/settings.c:1184
-#: ../cli/src/settings.c:1185 ../cli/src/settings.c:1260
-#: ../cli/src/settings.c:1261 ../cli/src/settings.c:1262
-#: ../cli/src/settings.c:1263 ../cli/src/settings.c:1264
-#: ../cli/src/settings.c:1265 ../cli/src/settings.c:1266
-#: ../cli/src/settings.c:1267 ../cli/src/settings.c:1268
-#: ../cli/src/settings.c:1269 ../cli/src/settings.c:1270
-#: ../cli/src/settings.c:1271 ../cli/src/settings.c:1272
-#: ../cli/src/settings.c:1343
+#: ../cli/src/connections.c:487 ../cli/src/connections.c:488
+#: ../cli/src/connections.c:716 ../cli/src/connections.c:717
+#: ../cli/src/connections.c:719 ../cli/src/devices.c:441
+#: ../cli/src/devices.c:494 ../cli/src/devices.c:610 ../cli/src/devices.c:611
+#: ../cli/src/devices.c:612 ../cli/src/devices.c:644 ../cli/src/devices.c:671
+#: ../cli/src/devices.c:672 ../cli/src/devices.c:673 ../cli/src/devices.c:674
+#: ../cli/src/devices.c:675 ../cli/src/network-manager.c:269
+#: ../cli/src/settings.c:712 ../cli/src/settings.c:714
+#: ../cli/src/settings.c:787 ../cli/src/settings.c:907
+#: ../cli/src/settings.c:1189 ../cli/src/settings.c:1190
+#: ../cli/src/settings.c:1192 ../cli/src/settings.c:1194
+#: ../cli/src/settings.c:1195 ../cli/src/settings.c:1326
+#: ../cli/src/settings.c:1327 ../cli/src/settings.c:1328
+#: ../cli/src/settings.c:1329 ../cli/src/settings.c:1406
+#: ../cli/src/settings.c:1407 ../cli/src/settings.c:1408
+#: ../cli/src/settings.c:1409 ../cli/src/settings.c:1410
+#: ../cli/src/settings.c:1411 ../cli/src/settings.c:1412
+#: ../cli/src/settings.c:1413 ../cli/src/settings.c:1414
+#: ../cli/src/settings.c:1415 ../cli/src/settings.c:1416
+#: ../cli/src/settings.c:1417 ../cli/src/settings.c:1418
+#: ../cli/src/settings.c:1489
 msgid "no"
 msgstr "ഇല്ല"
 
-#: ../cli/src/connections.c:518
+#: ../cli/src/connections.c:562
 msgid "Connection list"
 msgstr "കണക്ഷന്‍ പട്ടിക"
 
-#: ../cli/src/connections.c:531 ../cli/src/connections.c:1064
-#: ../cli/src/connections.c:1808 ../cli/src/connections.c:1823
-#: ../cli/src/connections.c:1832 ../cli/src/connections.c:1842
-#: ../cli/src/connections.c:1854 ../cli/src/connections.c:1949
-#: ../cli/src/connections.c:2051 ../cli/src/devices.c:1190
-#: ../cli/src/devices.c:1200 ../cli/src/devices.c:1314
-#: ../cli/src/devices.c:1322 ../cli/src/devices.c:1535
-#: ../cli/src/devices.c:1542
+#: ../cli/src/connections.c:575 ../cli/src/connections.c:1112
+#: ../cli/src/connections.c:1650 ../cli/src/connections.c:1665
+#: ../cli/src/connections.c:1674 ../cli/src/connections.c:1684
+#: ../cli/src/connections.c:1696 ../cli/src/connections.c:1804
+#: ../cli/src/connections.c:1906 ../cli/src/devices.c:1122
+#: ../cli/src/devices.c:1132 ../cli/src/devices.c:1250
+#: ../cli/src/devices.c:1258 ../cli/src/devices.c:1622
+#: ../cli/src/devices.c:1629 ../cli/src/devices.c:1643
+#: ../cli/src/devices.c:1650 ../cli/src/devices.c:1667
+#: ../cli/src/devices.c:1678 ../cli/src/devices.c:1899
+#: ../cli/src/devices.c:1906
 #, c-format
 msgid "Error: %s argument is missing."
 msgstr "പിശക്: %s ആര്‍ഗ്യുമെന്റ് ലഭ്യമല്ല."
 
-#: ../cli/src/connections.c:544
+#: ../cli/src/connections.c:588
 #, c-format
 msgid "Error: %s - no such connection."
 msgstr "പിശക്: %s - ഇത്തരം കണക്ഷന്‍ ലഭ്യമല്ല."
 
-#: ../cli/src/connections.c:550 ../cli/src/connections.c:1867
-#: ../cli/src/connections.c:1966 ../cli/src/connections.c:2058
-#: ../cli/src/devices.c:987 ../cli/src/devices.c:1067
-#: ../cli/src/devices.c:1214 ../cli/src/devices.c:1328
-#: ../cli/src/devices.c:1548
+#: ../cli/src/connections.c:594 ../cli/src/connections.c:1709
+#: ../cli/src/connections.c:1821 ../cli/src/connections.c:1913
+#: ../cli/src/devices.c:906 ../cli/src/devices.c:986 ../cli/src/devices.c:1146
+#: ../cli/src/devices.c:1264 ../cli/src/devices.c:1691
+#: ../cli/src/devices.c:1912
 #, c-format
 msgid "Unknown parameter: %s\n"
 msgstr "അപരിചിതമായ പരാമീറ്റര്‍: %s\n"
 
-#: ../cli/src/connections.c:559
+#: ../cli/src/connections.c:603
 #, c-format
 msgid "Error: no valid parameter specified."
 msgstr "പിശക്: ശരിയായ പരാമീറ്റര്‍ നല്‍കിയിട്ടില്ല."
 
-#: ../cli/src/connections.c:574 ../cli/src/connections.c:2151
-#: ../cli/src/devices.c:1756 ../cli/src/network-manager.c:456
+#: ../cli/src/connections.c:618 ../cli/src/connections.c:2009
+#: ../cli/src/devices.c:2123 ../cli/src/network-manager.c:599
 #, c-format
 msgid "Error: %s."
 msgstr "പിശക്: %s."
 
-#: ../cli/src/connections.c:587
+#: ../cli/src/connections.c:631
 msgid "activating"
 msgstr "സജീവമാക്കുന്നു"
 
-#: ../cli/src/connections.c:589
+#: ../cli/src/connections.c:633
 msgid "activated"
 msgstr "സജീവമാക്കിയിരിക്കുന്നു"
 
-#: ../cli/src/connections.c:591 ../cli/src/devices.c:261
-msgid "deactivating"
-msgstr "സജീവമല്ലാതാക്കുന്നു"
-
-#: ../cli/src/connections.c:594 ../cli/src/connections.c:617
-#: ../cli/src/connections.c:1680 ../cli/src/devices.c:265
-#: ../cli/src/devices.c:784 ../cli/src/network-manager.c:111
-#: ../cli/src/network-manager.c:173 ../cli/src/network-manager.c:176
-#: ../cli/src/network-manager.c:185 ../cli/src/network-manager.c:291
-#: ../cli/src/network-manager.c:346 ../cli/src/network-manager.c:384
-#: ../cli/src/network-manager.c:423 ../cli/src/settings.c:531
-#: ../cli/src/utils.c:499 ../src/main.c:450 ../src/main.c:469
-msgid "unknown"
-msgstr "അപരിചിതം"
-
-#: ../cli/src/connections.c:603
+#: ../cli/src/connections.c:647
 msgid "VPN connecting (prepare)"
 msgstr "വിപിഎന്‍ കണക്ട് ചെയ്യുന്നു (തയ്യാറാകുക)"
 
-#: ../cli/src/connections.c:605
+#: ../cli/src/connections.c:649
 msgid "VPN connecting (need authentication)"
 msgstr "വിപിഎന്‍ കണക്ട് ചെയ്യുന്നു (ആധികാരികത ഉറപ്പാക്കേണ്ടതുണ്ടു്)"
 
-#: ../cli/src/connections.c:607
+#: ../cli/src/connections.c:651
 msgid "VPN connecting"
 msgstr "വിപിഎന്‍ കണക്ട് ചെയ്യുന്നു"
 
-#: ../cli/src/connections.c:609
+#: ../cli/src/connections.c:653
 msgid "VPN connecting (getting IP configuration)"
 msgstr "വിപിഎന്‍ കണക്ട് ചെയ്യുന്നു (ഐപി ക്രമീകരണം ലഭ്യമാക്കുന്നു)"
 
-#: ../cli/src/connections.c:611
+#: ../cli/src/connections.c:655
 msgid "VPN connected"
 msgstr "വിപിഎന്‍ കണക്ട് ചെയ്തിരിക്കുന്നു"
 
-#: ../cli/src/connections.c:613
+#: ../cli/src/connections.c:657
 msgid "VPN connection failed"
 msgstr "വിപിഎന്‍ കണക്ഷന്‍ പരാജയപ്പെട്ടു"
 
-#: ../cli/src/connections.c:615
+#: ../cli/src/connections.c:659
 msgid "VPN disconnected"
 msgstr "വിപിഎന്‍ വിഛേദിച്ചിരിക്കുന്നു"
 
-#: ../cli/src/connections.c:868 ../cli/src/connections.c:1092
+#: ../cli/src/connections.c:712 ../cli/src/connections.c:722
+msgid "N/A"
+msgstr "N/A"
+
+#: ../cli/src/connections.c:916 ../cli/src/connections.c:1140
 #, c-format
 msgid "Error: 'con status': %s"
 msgstr "പിശക്: 'con status': %s"
 
-#: ../cli/src/connections.c:870 ../cli/src/connections.c:1094
+#: ../cli/src/connections.c:918 ../cli/src/connections.c:1142
 #, c-format
 msgid "Error: 'con status': %s; allowed fields: %s"
 msgstr "പിശക്: 'con status': %s; അനുവദിക്കുന്ന ഫീള്‍ഡുകള്‍: %s"
 
-#: ../cli/src/connections.c:878
+#: ../cli/src/connections.c:926
 msgid "Active connection details"
 msgstr "സജീവമായ കണക്ഷന്‍ വിശദാംശങ്ങള്‍"
 
-#: ../cli/src/connections.c:1014 ../cli/src/connections.c:1882
-#: ../cli/src/connections.c:1981 ../cli/src/connections.c:2072
-#: ../cli/src/devices.c:1014 ../cli/src/devices.c:1076
-#: ../cli/src/devices.c:1229 ../cli/src/devices.c:1358
-#: ../cli/src/devices.c:1577
+#: ../cli/src/connections.c:1062 ../cli/src/connections.c:1724
+#: ../cli/src/connections.c:1836 ../cli/src/connections.c:1927
+#: ../cli/src/devices.c:933 ../cli/src/devices.c:995 ../cli/src/devices.c:1161
+#: ../cli/src/devices.c:1294 ../cli/src/devices.c:1713
+#: ../cli/src/devices.c:1941 ../cli/src/network-manager.c:311
 #, c-format
 msgid "Error: Can't find out if NetworkManager is running: %s."
-msgstr "പിശക്: നെറ്റ്‌വര്‍ക്ക്മാനേജര്‍ പ്രവര്‍ത്തിക്കുന്നുണ്ടോ എന്നറിയാന്‍ സാധിക്കുന്നില്ല: %s."
+msgstr ""
+"പിശക്: നെറ്റ്‌വര്‍ക്ക്മാനേജര്‍ പ്രവര്‍ത്തിക്കുന്നുണ്ടോ എന്നറിയാന്‍ "
+"സാധിക്കുന്നില്ല: %s."
 
-#: ../cli/src/connections.c:1018 ../cli/src/connections.c:1886
-#: ../cli/src/connections.c:1985 ../cli/src/connections.c:2076
-#: ../cli/src/devices.c:1018 ../cli/src/devices.c:1080
-#: ../cli/src/devices.c:1233 ../cli/src/devices.c:1362
-#: ../cli/src/devices.c:1581
+#: ../cli/src/connections.c:1066 ../cli/src/connections.c:1728
+#: ../cli/src/connections.c:1840 ../cli/src/connections.c:1931
+#: ../cli/src/devices.c:937 ../cli/src/devices.c:999 ../cli/src/devices.c:1165
+#: ../cli/src/devices.c:1298 ../cli/src/devices.c:1717
+#: ../cli/src/devices.c:1945 ../cli/src/network-manager.c:315
 #, c-format
 msgid "Error: NetworkManager is not running."
 msgstr "പിശക്: നെറ്റ്‌വര്‍ക്ക്മാനേജര്‍ പ്രവര്‍ത്തിക്കുന്നില്ല."
 
-#: ../cli/src/connections.c:1050
+#: ../cli/src/connections.c:1098
 msgid "Active connections"
 msgstr "സജീവമായ കണക്ഷനുകള്‍"
 
-#: ../cli/src/connections.c:1075
+#: ../cli/src/connections.c:1123
 #, c-format
 msgid "Error: '%s' is not an active connection."
 msgstr "പിശക്: '%s' ഒരു സജീവമായ കണക്ഷന്‍ അല്ല."
 
-#: ../cli/src/connections.c:1080
+#: ../cli/src/connections.c:1128
 #, c-format
 msgid "Error: unknown parameter: %s"
 msgstr "പിശക്: അപരിചിതമായ പരാമീറ്റര്‍: %s"
 
-#: ../cli/src/connections.c:1564
+#: ../cli/src/connections.c:1235
 #, c-format
 msgid "no active connection on device '%s'"
 msgstr "ഡിവൈസ് '%s'-ല്‍ സജീവമായ കണക്ഷന്‍ ലഭ്യമല്ല"
 
-#: ../cli/src/connections.c:1572
-#, c-format
+#: ../cli/src/connections.c:1243
 msgid "no active connection or device"
 msgstr "സജീവമായ കണക്ഷന്‍ അല്ലെങ്കില്‍ ഡിവൈസ് ലഭ്യമല്ല"
 
-#: ../cli/src/connections.c:1643
+#: ../cli/src/connections.c:1314
 #, c-format
 msgid "device '%s' not compatible with connection '%s'"
 msgstr "'%s' ഡിവൈസ് '%s' കണക്ഷനുമായി പൊരുത്തപ്പെടുന്നില്ല"
 
-#: ../cli/src/connections.c:1645
+#: ../cli/src/connections.c:1317
 #, c-format
 msgid "no device found for connection '%s'"
 msgstr "ഡിവൈസ് '%s'-ല്‍ സജീവമായ കണക്ഷന്‍ ലഭ്യമല്ല"
 
-#: ../cli/src/connections.c:1656
+#: ../cli/src/connections.c:1329
 msgid "unknown reason"
 msgstr "അപരിചിതമായ കാരണം"
 
-#: ../cli/src/connections.c:1658
+#: ../cli/src/connections.c:1331
 msgid "none"
 msgstr "ഒന്നുമില്ല"
 
-#: ../cli/src/connections.c:1660
+#: ../cli/src/connections.c:1333
 msgid "the user was disconnected"
 msgstr "ഉപയോക്താവു് വിഛേദിച്ചിരിക്കുന്നു"
 
-#: ../cli/src/connections.c:1662
+#: ../cli/src/connections.c:1335
 msgid "the base network connection was interrupted"
 msgstr "അടിസ്ഥാന നെറ്റ്‌വര്‍ക്ക് കണക്ഷന്‍ തടസ്സപ്പെടുത്തിയിരിക്കുന്നു"
 
-#: ../cli/src/connections.c:1664
+#: ../cli/src/connections.c:1337
 msgid "the VPN service stopped unexpectedly"
 msgstr "വിപിഎന്‍ സര്‍വീസ് അപ്രതീക്ഷിതമായി നിര്‍ത്തിയിരിക്കുന്നു"
 
-#: ../cli/src/connections.c:1666
+#: ../cli/src/connections.c:1339
 msgid "the VPN service returned invalid configuration"
 msgstr "വിപിഎന്‍ സര്‍വീസ് തെറ്റായ ക്രമീകരണം തിരികെ നല്‍കിയിരിക്കുന്നു"
 
-#: ../cli/src/connections.c:1668
+#: ../cli/src/connections.c:1341
 msgid "the connection attempt timed out"
 msgstr "കണക്ഷനുള്ള ശ്രമം കഴിഞ്ഞിരിക്കുന്നു"
 
-#: ../cli/src/connections.c:1670
+#: ../cli/src/connections.c:1343
 msgid "the VPN service did not start in time"
 msgstr "വിപിഎന്‍ സര്‍വീസ് സമയത്തിനു് ആരംഭിച്ചില്ല"
 
-#: ../cli/src/connections.c:1672
+#: ../cli/src/connections.c:1345
 msgid "the VPN service failed to start"
 msgstr "വിപിഎന്‍ സര്‍വീസ് ആരംഭിക്കുന്നതില്‍ പരാജയപ്പെട്ടു"
 
-#: ../cli/src/connections.c:1674
+#: ../cli/src/connections.c:1347
 msgid "no valid VPN secrets"
 msgstr "ശരിയായ വിപിഎന്‍ രഹസ്യങ്ങള്‍ ലഭ്യമല്ല"
 
-#: ../cli/src/connections.c:1676
+#: ../cli/src/connections.c:1349
 msgid "invalid VPN secrets"
 msgstr "തെറ്റായ വിപിഎന്‍ രഹസ്യങ്ങള്‍"
 
-#: ../cli/src/connections.c:1678
+#: ../cli/src/connections.c:1351
 msgid "the connection was removed"
 msgstr "കണക്ഷന്‍ നീക്കം ചെയ്തിരിക്കുന്നു"
 
-#: ../cli/src/connections.c:1692
-#, c-format
-msgid "state: %s\n"
-msgstr "അവസ്ഥ: %s\n"
-
-#: ../cli/src/connections.c:1695 ../cli/src/connections.c:1721
+#: ../cli/src/connections.c:1368 ../cli/src/connections.c:1573
 #, c-format
-msgid "Connection activated\n"
-msgstr "കണക്ഷന്‍ സജീവമാക്കിയിരിക്കുന്നു\n"
+msgid "Connection successfully activated (D-Bus active path: %s)\n"
+msgstr "കണക്ഷന്‍ സജീവമായി വിജയിച്ചിരിയ്ക്കുന്നു (ഡി-ബസ് സജീവ പാഥ്: %s)\n"
 
-#: ../cli/src/connections.c:1698
+#. Active connection failed and dissapeared, quit.
+#: ../cli/src/connections.c:1373 ../cli/src/connections.c:1474
 #, c-format
 msgid "Error: Connection activation failed."
 msgstr "പിശക്: കണക്ഷന്‍ സജീവമാക്കല്‍ പരാജയപ്പെട്ടു."
 
-#: ../cli/src/connections.c:1717
+#: ../cli/src/connections.c:1398
 #, c-format
-msgid "state: %s (%d)\n"
-msgstr "അവസ്ഥ: %s (%d)\n"
+msgid "VPN connection successfully activated (D-Bus active path: %s)\n"
+msgstr ""
+"വിപിഎന്‍ കണക്ഷന്‍ വിജയകരമായി സജീവമാക്കിയിരിയ്ക്കുന്നു (ഡി-ബസ് സജീവ പാഥ്: %s)\n"
 
-#: ../cli/src/connections.c:1727
+#: ../cli/src/connections.c:1406
 #, c-format
 msgid "Error: Connection activation failed: %s."
 msgstr "പിശക്: കണക്ഷന്‍ സജീവമാക്കല്‍ പരാജയപ്പെട്ടു: %s."
 
-#: ../cli/src/connections.c:1744 ../cli/src/devices.c:1136
+#: ../cli/src/connections.c:1503 ../cli/src/devices.c:1055
 #, c-format
 msgid "Error: Timeout %d sec expired."
 msgstr "പിശക്: സമയപരിധി %d നിമിഷത്തിന്റെ കാലാവധി കഴിഞ്ഞിരിക്കുന്നു."
 
-#: ../cli/src/connections.c:1757
+#: ../cli/src/connections.c:1564
 #, c-format
 msgid "Error: Connection activation failed: %s"
 msgstr "പിശക്: കണക്ഷന്‍ സജീവമാക്കല്‍ പരാജയപ്പെട്ടു: %s"
 
-#: ../cli/src/connections.c:1763
-#, c-format
-msgid "Active connection state: %s\n"
-msgstr "സജീവമായ കണക്ഷന്റെ അവസ്ഥ: %s\n"
-
-#: ../cli/src/connections.c:1764
-#, c-format
-msgid "Active connection path: %s\n"
-msgstr "സജീവമായ കണക്ഷന്‍ പാഥ്: %s\n"
-
-#: ../cli/src/connections.c:1816 ../cli/src/connections.c:1957
-#: ../cli/src/connections.c:2085
+#: ../cli/src/connections.c:1658 ../cli/src/connections.c:1812
+#: ../cli/src/connections.c:1940
 #, c-format
 msgid "Error: Unknown connection: %s."
 msgstr "പിശക്: അപരിചിതമായ കണക്ഷന്‍: %s."
 
-#: ../cli/src/connections.c:1862 ../cli/src/devices.c:1208
+#: ../cli/src/connections.c:1704 ../cli/src/devices.c:1140
+#: ../cli/src/devices.c:1686
 #, c-format
 msgid "Error: timeout value '%s' is not valid."
 msgstr "പിശഖ്: സമയപരിധിയുടെ മൂല്ല്യം '%s' തെറ്റാണു്."
 
-#: ../cli/src/connections.c:1875 ../cli/src/connections.c:1974
-#: ../cli/src/connections.c:2065
+#: ../cli/src/connections.c:1717 ../cli/src/connections.c:1829
+#: ../cli/src/connections.c:1920
 #, c-format
 msgid "Error: id or uuid has to be specified."
 msgstr "പിശക്: id അല്ലെങ്കില്‍ uuid വ്യക്തമാക്കേണ്ടതുണ്ടു്."
 
-#: ../cli/src/connections.c:1903
+#: ../cli/src/connections.c:1749
 #, c-format
 msgid "Error: No suitable device found: %s."
 msgstr "പിശക്: ഉചിതമായ ഡിവൈസ് ലഭ്യമായില്ല: %s."
 
-#: ../cli/src/connections.c:1905
+#: ../cli/src/connections.c:1751
 #, c-format
 msgid "Error: No suitable device found."
 msgstr "പിശക്: ഉചിതമായ ഡിവൈസ് ലഭ്യമായില്ല."
 
-#: ../cli/src/connections.c:2010
+#: ../cli/src/connections.c:1865
 #, c-format
 msgid "Warning: Connection not active\n"
 msgstr "മുന്നറിയിപ്പു്: കണക്ഷന്‍ സജീവമല്ല\n"
 
-#: ../cli/src/connections.c:2024
+#: ../cli/src/connections.c:1879
 #, c-format
 msgid "Error: Connection deletion failed: %s"
 msgstr "പിശക്: കണക്ഷന്‍ നീക്കം ചെയ്യുന്നത് പരാജയപ്പെട്ടു: %s"
 
-#: ../cli/src/connections.c:2142
+#: ../cli/src/connections.c:2000
 #, c-format
 msgid "Error: 'con' command '%s' is not valid."
 msgstr "പിശക്: 'con' കമാന്‍ഡ് '%s' ശരിയല്ല."
 
-#: ../cli/src/connections.c:2207
+#: ../cli/src/connections.c:2068
 #, c-format
 msgid "Error: could not connect to D-Bus."
 msgstr "പിശക്: D-Bus-ലേക്കു് കണക്ട് ചെയ്യുവാന്‍ സാധ്യമായില്ല."
 
-#: ../cli/src/connections.c:2215
+#: ../cli/src/connections.c:2076
 #, c-format
 msgid "Error: Could not get system settings."
 msgstr "പിശക്: സിസ്റ്റം സജ്ജീകരണങ്ങള്‍ ലഭ്യമാക്കവാന്‍ സാധ്യമായില്ല."
 
-#: ../cli/src/connections.c:2225
+#: ../cli/src/connections.c:2086
 #, c-format
 msgid "Error: Can't obtain connections: settings service is not running."
-msgstr "പിശക്: കണക്ഷനുകള്‍ ലഭ്യമാക്കുവാന്‍ സാധ്യമല്ല: സജ്ജീകരണങ്ങള്‍ക്കുള്ള സര്‍വീസ് പ്രവര്‍ത്തിക്കുന്നില്ല."
+msgstr ""
+"പിശക്: കണക്ഷനുകള്‍ ലഭ്യമാക്കുവാന്‍ സാധ്യമല്ല: സജ്ജീകരണങ്ങള്‍ക്കുള്ള സര്‍വീസ് "
+"പ്രവര്‍ത്തിക്കുന്നില്ല."
 
 #. 0
 #. 9
 #. 3
-#: ../cli/src/devices.c:65 ../cli/src/devices.c:101 ../cli/src/devices.c:179
-#: ../cli/src/devices.c:195
+#: ../cli/src/devices.c:70 ../cli/src/devices.c:108 ../cli/src/devices.c:189
+#: ../cli/src/devices.c:205
 msgid "DEVICE"
 msgstr "DEVICE"
 
 #. 0
-#: ../cli/src/devices.c:78
+#: ../cli/src/devices.c:83
 msgid "CAPABILITIES"
 msgstr "CAPABILITIES"
 
 #. 1
-#: ../cli/src/devices.c:79
+#: ../cli/src/devices.c:84
 msgid "WIFI-PROPERTIES"
 msgstr "WIFI-PROPERTIES"
 
 #. 2
-#: ../cli/src/devices.c:80
+#: ../cli/src/devices.c:85
 msgid "AP"
 msgstr "AP"
 
 #. 3
-#: ../cli/src/devices.c:81
+#: ../cli/src/devices.c:86
 msgid "WIRED-PROPERTIES"
 msgstr "WIRED-PROPERTIES"
 
 #. 4
-#: ../cli/src/devices.c:82
+#: ../cli/src/devices.c:87
 msgid "WIMAX-PROPERTIES"
 msgstr "WIMAX-PROPERTIES"
 
 #. 5
 #. 0
-#: ../cli/src/devices.c:83 ../cli/src/devices.c:192
+#: ../cli/src/devices.c:88 ../cli/src/devices.c:202
 msgid "NSP"
 msgstr "NSP"
 
 #. 6
-#: ../cli/src/devices.c:84
+#: ../cli/src/devices.c:89
 msgid "IP4"
 msgstr "IP4"
 
 #. 7
-#: ../cli/src/devices.c:85
+#: ../cli/src/devices.c:90
 msgid "DHCP4"
 msgstr "DHCP4"
 
 #. 8
-#: ../cli/src/devices.c:86
+#: ../cli/src/devices.c:91
 msgid "IP6"
 msgstr "IP6"
 
 #. 9
-#: ../cli/src/devices.c:87
+#: ../cli/src/devices.c:92
 msgid "DHCP6"
 msgstr "DHCP6"
 
+#. 10
+#: ../cli/src/devices.c:93
+msgid "BOND"
+msgstr "BOND"
+
+#. 11
+#: ../cli/src/devices.c:94
+msgid "VLAN"
+msgstr "VLAN"
+
 #. 2
-#: ../cli/src/devices.c:103
+#: ../cli/src/devices.c:110
 msgid "VENDOR"
 msgstr "VENDOR"
 
 #. 3
-#: ../cli/src/devices.c:104
+#: ../cli/src/devices.c:111
 msgid "PRODUCT"
 msgstr "PRODUCT"
 
 #. 4
-#: ../cli/src/devices.c:105
+#: ../cli/src/devices.c:112
 msgid "DRIVER"
 msgstr "DRIVER"
 
 #. 5
-#: ../cli/src/devices.c:106
+#: ../cli/src/devices.c:113
+msgid "DRIVER-VERSION"
+msgstr "DRIVER-VERSION"
+
+#. 6
+#: ../cli/src/devices.c:114
+msgid "FIRMWARE-VERSION"
+msgstr "FIRMWARE-VERSION"
+
+#. 7
+#: ../cli/src/devices.c:115
 msgid "HWADDR"
 msgstr "HWADDR"
 
-#. 7
-#: ../cli/src/devices.c:108
+#. 9
+#: ../cli/src/devices.c:117
 msgid "REASON"
 msgstr "REASON"
 
-#. 8
-#: ../cli/src/devices.c:109
+#. 10
+#: ../cli/src/devices.c:118
 msgid "UDI"
 msgstr "UDI"
 
-#. 9
-#: ../cli/src/devices.c:110
+#. 11
+#: ../cli/src/devices.c:119
 msgid "IP-IFACE"
 msgstr "IP-IFACE"
 
-#. 10
-#: ../cli/src/devices.c:111
+#. 12
+#: ../cli/src/devices.c:120
 msgid "NM-MANAGED"
 msgstr "NM-MANAGED"
 
-#. 11
-#: ../cli/src/devices.c:112
+#. 14
+#: ../cli/src/devices.c:122
 msgid "FIRMWARE-MISSING"
 msgstr "FIRMWARE-MISSING"
 
-#. 12
-#: ../cli/src/devices.c:113
+#. 15
+#: ../cli/src/devices.c:123
 msgid "CONNECTION"
 msgstr "CONNECTION"
 
 #. 0
-#: ../cli/src/devices.c:122
+#: ../cli/src/devices.c:132
 msgid "CARRIER-DETECT"
 msgstr "CARRIER-DETECT"
 
 #. 1
-#: ../cli/src/devices.c:123
+#: ../cli/src/devices.c:133
 msgid "SPEED"
 msgstr "SPEED"
 
 #. 0
-#: ../cli/src/devices.c:132
+#: ../cli/src/devices.c:142
 msgid "CARRIER"
 msgstr "CARRIER"
 
 #. 0
-#: ../cli/src/devices.c:142
+#: ../cli/src/devices.c:152
 msgid "WEP"
 msgstr "WEP"
 
 #. 1
-#: ../cli/src/devices.c:143
+#: ../cli/src/devices.c:153
 msgid "WPA"
 msgstr "WPA"
 
 #. 2
-#: ../cli/src/devices.c:144
+#: ../cli/src/devices.c:154
 msgid "WPA2"
 msgstr "WPA2"
 
 #. 3
-#: ../cli/src/devices.c:145
+#: ../cli/src/devices.c:155
 msgid "TKIP"
 msgstr "TKIP"
 
 #. 4
-#: ../cli/src/devices.c:146
+#: ../cli/src/devices.c:156
 msgid "CCMP"
 msgstr "CCMP"
 
 #. 0
-#: ../cli/src/devices.c:156
+#: ../cli/src/devices.c:166
 msgid "CTR-FREQ"
 msgstr "CTR-FREQ"
 
-#. 1
-#: ../cli/src/devices.c:157
-msgid "RSSI"
-msgstr "RSSI"
-
-#. 2
-#: ../cli/src/devices.c:158
-msgid "CINR"
-msgstr "CINR"
-
-#. 3
-#: ../cli/src/devices.c:159
-msgid "TX-POW"
-msgstr "TX-POW"
-
-#. 4
-#: ../cli/src/devices.c:160
-msgid "BSID"
-msgstr "BSID"
-
-#. 0
-#: ../cli/src/devices.c:170
-msgid "SSID"
-msgstr "SSID"
-
-#. 1
-#: ../cli/src/devices.c:171
-msgid "BSSID"
-msgstr "BSSID"
-
-#. 2
-#: ../cli/src/devices.c:172
-msgid "MODE"
-msgstr "MODE"
-
-#. 3
-#: ../cli/src/devices.c:173
-msgid "FREQ"
-msgstr "FREQ"
-
-#. 4
-#: ../cli/src/devices.c:174
-msgid "RATE"
-msgstr "RATE"
-
-#. 5
-#. 1
-#: ../cli/src/devices.c:175 ../cli/src/devices.c:193
-msgid "SIGNAL"
-msgstr "SIGNAL"
-
-#. 6
-#: ../cli/src/devices.c:176
-msgid "SECURITY"
-msgstr "SECURITY"
-
-#. 7
-#: ../cli/src/devices.c:177
-msgid "WPA-FLAGS"
-msgstr "WPA-FLAGS"
-
-#. 8
-#: ../cli/src/devices.c:178
-msgid "RSN-FLAGS"
-msgstr "RSN-FLAGS"
-
-#. 10
-#. 4
-#: ../cli/src/devices.c:180 ../cli/src/devices.c:196
-msgid "ACTIVE"
-msgstr "ACTIVE"
-
-#: ../cli/src/devices.c:213
-#, 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 ]\n"
-"  disconnect iface  [--nowait] [--timeout ]\n"
-"  wifi [list [iface ] [bssid ]]\n"
-"  wimax [list [iface ] [nsp ]]\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 ]\n"
-"  disconnect iface  [--nowait] [--timeout ]\n"
-"  wifi [list [iface ] [bssid ]]\n"
-"  wimax [list [iface ] [nsp ]]\n"
-"\n"
-
-#: ../cli/src/devices.c:241
-msgid "unmanaged"
-msgstr "കൈകാര്യം ചെയ്തിട്ടില്ലാത്തതു്"
-
-#: ../cli/src/devices.c:243
-msgid "unavailable"
-msgstr "ലഭ്യമല്ലാത്തതു്"
-
-#: ../cli/src/devices.c:245 ../cli/src/network-manager.c:108
-msgid "disconnected"
-msgstr "വിഛേദിച്ചിരിക്കുന്നു"
-
-#: ../cli/src/devices.c:247
-msgid "connecting (prepare)"
-msgstr "കണക്ട് ചെയ്യുന്നു (തയ്യാറാക്കുക)"
-
-#: ../cli/src/devices.c:249
-msgid "connecting (configuring)"
-msgstr "കണക്ട് ചെയ്യുന്നു (ക്രമീകരിക്കുന്നു)"
-
-#: ../cli/src/devices.c:251
-msgid "connecting (need authentication)"
-msgstr "കണക്ട് ചെയ്യുന്നു (ആധികാരികത ഉറപ്പാക്കേണ്ടതുണ്ടു്)"
-
-#: ../cli/src/devices.c:253
-msgid "connecting (getting IP configuration)"
-msgstr "കണക്ട് ചെയ്യുന്നു (ഐപി ക്രമീകരണം ലഭ്യമാക്കുന്നു)"
-
-#: ../cli/src/devices.c:255
-msgid "connecting (checking IP connectivity)"
-msgstr "കണക്ട് ചെയ്യുന്നു (ഐപി കണക്ടിവിറ്റി പരിശോധിക്കുന്നു)"
-
-#: ../cli/src/devices.c:257
-msgid "connecting (starting secondary connections)"
-msgstr "കണക്ട് ചെയ്യുന്നു (രണ്ടാംഘട്ടത്തിലുള്ള കണക്ഷന്‍ തുടങ്ങുന്നു) "
-
-#: ../cli/src/devices.c:259 ../cli/src/network-manager.c:104
-msgid "connected"
-msgstr "കണക്ട് ചെയ്തിരിക്കുന്നു"
-
-#: ../cli/src/devices.c:263
-msgid "connection failed"
-msgstr "കണക്ഷന്‍ പരാജയപ്പെട്ടു"
-
-#: ../cli/src/devices.c:274
-msgid "No reason given"
-msgstr "കാരണം നല്‍കപ്പെട്ടിട്ടില്ല"
-
-#: ../cli/src/devices.c:277
-msgid "Unknown error"
-msgstr "അപരിചിതമായ പിശക്"
-
-#: ../cli/src/devices.c:280
-msgid "Device is now managed"
-msgstr "ഡിവൈസ് ഇപ്പോള്‍ കൈകാര്യം ചെയ്തിരിക്കുന്നു"
-
-#: ../cli/src/devices.c:283
-msgid "Device is now unmanaged"
-msgstr "ഡിവൈസ് ഇപ്പോള്‍ കൈകാര്യം ചെയ്യുന്നില്ല"
-
-#: ../cli/src/devices.c:286
-msgid "The device could not be readied for configuration"
-msgstr "ഡിവൈസ് ക്രമീകരിക്കാന്‍ സജ്ജമാക്കാന്‍ സാധിക്കുന്നില്ല"
-
-#: ../cli/src/devices.c:289
-msgid ""
-"IP configuration could not be reserved (no available address, timeout, etc)"
-msgstr ""
-"IP ക്രമീകരണം കരുതിവയ്ക്കാന്‍ സാധിക്കുന്നില്ല (മേല്‍വിലാസം ലഭ്യമല്ല, സമയപരിധി കഴിഞ്ഞു, മുതലായവ)"
-
-#: ../cli/src/devices.c:292
-msgid "The IP configuration is no longer valid"
-msgstr "IP ക്രമീകരണം സാധുവല്ല"
-
-#: ../cli/src/devices.c:295
-msgid "Secrets were required, but not provided"
-msgstr "രഹസ്യങ്ങള്‍ ആവിശ്യമായിരുന്നു, പക്ഷെ നല്‍കിയിട്ടില്ല"
-
-#: ../cli/src/devices.c:298
-msgid "802.1X supplicant disconnected"
-msgstr "802.1X സപ്ലിക്കെന്റ്  വിച്ഛേദിച്ചിരിക്കുന്നു"
-
-#: ../cli/src/devices.c:301
-msgid "802.1X supplicant configuration failed"
-msgstr "802.1X സപ്ലിക്കെന്റ് ക്രമീകരണം പരാജയപ്പെട്ടു"
-
-#: ../cli/src/devices.c:304
-msgid "802.1X supplicant failed"
-msgstr "802.1X സപ്ലിക്കെന്റ് പരാജയപ്പെട്ടു"
-
-#: ../cli/src/devices.c:307
-msgid "802.1X supplicant took too long to authenticate"
-msgstr "802.1X സപ്ലിക്കെന്റ് ആധികാരികതക്കു വേണ്ടി കൂടുതല്‍ സമയമെടുത്തു"
-
-#: ../cli/src/devices.c:310
-msgid "PPP service failed to start"
-msgstr "പിപിപി സര്‍വീസ് ആരംഭിക്കുന്നതില്‍ പരാജയപ്പെട്ടു"
-
-#: ../cli/src/devices.c:313
-msgid "PPP service disconnected"
-msgstr "പിപിപി സേവനം വിഛേദിച്ചിരിക്കുന്നു"
-
-#: ../cli/src/devices.c:316
-msgid "PPP failed"
-msgstr "പിപിപി പരാജയപ്പെട്ടു"
-
-#: ../cli/src/devices.c:319
-msgid "DHCP client failed to start"
-msgstr "DHCP ക്ലയ്ന്റ് ആരംഭിക്കുന്നതില്‍ പരാജയപ്പെട്ടു"
-
-#: ../cli/src/devices.c:322
-msgid "DHCP client error"
-msgstr "DHCP ക്ലയ്ന്റ് പിശക്"
-
-#: ../cli/src/devices.c:325
-msgid "DHCP client failed"
-msgstr "DHCP ക്ലയ്ന്റ് പരാജയപ്പെട്ടു"
-
-#: ../cli/src/devices.c:328
-msgid "Shared connection service failed to start"
-msgstr "പങ്കുവെച്ച കണക്ഷന്‍ സേവനം ആരംഭിക്കുന്നതില്‍ പരാജയപ്പെട്ടു"
-
-#: ../cli/src/devices.c:331
-msgid "Shared connection service failed"
-msgstr "പങ്കുവെച്ച കണക്ഷന്‍ സേവനം പരാജയപ്പെട്ടു"
-
-#: ../cli/src/devices.c:334
-msgid "AutoIP service failed to start"
-msgstr "AutoIP സേവനം ആരംഭിക്കുന്നതില്‍ പരാജയപ്പെട്ടു"
-
-#: ../cli/src/devices.c:337
-msgid "AutoIP service error"
-msgstr "AutoIP സേവനം പിശക്"
-
-#: ../cli/src/devices.c:340
-msgid "AutoIP service failed"
-msgstr "AutoIP സേവനം പരാജയപ്പെട്ടു"
-
-#: ../cli/src/devices.c:343
-msgid "The line is busy"
-msgstr ""
-
-#: ../cli/src/devices.c:346
-msgid "No dial tone"
-msgstr ""
-
-#: ../cli/src/devices.c:349
-msgid "No carrier could be established"
-msgstr ""
-
-#: ../cli/src/devices.c:352
-msgid "The dialing request timed out"
-msgstr ""
-
-#: ../cli/src/devices.c:355
-msgid "The dialing attempt failed"
-msgstr ""
-
-#: ../cli/src/devices.c:358
-#, fuzzy
-#| msgid "Error: Connection activation failed."
-msgid "Modem initialization failed"
-msgstr "പിശക്: കണക്ഷന്‍ സജീവമാക്കല്‍ പരാജയപ്പെട്ടു."
-
-#: ../cli/src/devices.c:361
-msgid "Failed to select the specified APN"
-msgstr "നിര്‍ദ്ദേശിച്ച APN തിരഞ്ഞെടുക്കുന്നതില്‍ പരാജയപ്പെട്ടു."
-
-#: ../cli/src/devices.c:364
-msgid "Not searching for networks"
-msgstr "നെറ്റ്​വര്‍ക്കുന്നു വേണ്ടി തിരയുന്നില്ല്"
-
-#: ../cli/src/devices.c:367
-msgid "Network registration denied"
-msgstr ""
-
-#: ../cli/src/devices.c:370
-msgid "Network registration timed out"
-msgstr ""
-
-#: ../cli/src/devices.c:373
-msgid "Failed to register with the requested network"
-msgstr ""
+#. 1
+#: ../cli/src/devices.c:167
+msgid "RSSI"
+msgstr "RSSI"
 
-#: ../cli/src/devices.c:376
-msgid "PIN check failed"
-msgstr "PIN പരിശോധന പരാജയപ്പെട്ടു"
+#. 2
+#: ../cli/src/devices.c:168
+msgid "CINR"
+msgstr "CINR"
 
-#: ../cli/src/devices.c:379
-msgid "Necessary firmware for the device may be missing"
-msgstr "ആവശ്യമായ ഫേംവെയര്‍ ലഭ്യമല്ലെന്നു തോന്നുന്നു"
+#. 3
+#: ../cli/src/devices.c:169
+msgid "TX-POW"
+msgstr "TX-POW"
 
-#: ../cli/src/devices.c:382
-msgid "The device was removed"
-msgstr "ഡിവൈസ് നീക്കം ചെയ്തിരിക്കുന്നു"
+#. 4
+#: ../cli/src/devices.c:170
+msgid "BSID"
+msgstr "BSID"
 
-#: ../cli/src/devices.c:385
-msgid "NetworkManager went to sleep"
-msgstr "നെറ്റ്‌വര്‍ക്ക്മാനേജറിന്റെ ഉറക്കത്തിലേക്കു നീങ്ങി"
+#. 0
+#: ../cli/src/devices.c:180
+msgid "SSID"
+msgstr "SSID"
 
-#: ../cli/src/devices.c:388
-msgid "The device's active connection disappeared"
-msgstr "ഡിവൈസിന്റെ സജീവമായ കണക്ഷന്‍ ലഭ്യമല്ലാതായി"
+#. 1
+#: ../cli/src/devices.c:181
+msgid "BSSID"
+msgstr "BSSID"
 
-#: ../cli/src/devices.c:391
-msgid "Device disconnected by user or client"
-msgstr ""
+#. 2
+#: ../cli/src/devices.c:182
+msgid "MODE"
+msgstr "MODE"
 
-#: ../cli/src/devices.c:394
-msgid "Carrier/link changed"
-msgstr ""
+#. 3
+#: ../cli/src/devices.c:183
+msgid "FREQ"
+msgstr "FREQ"
 
-#: ../cli/src/devices.c:397
-msgid "The device's existing connection was assumed"
-msgstr "ഡിവൈസിന്റെ നിലവിലുള്ള കണക്ഷനാണെന്നു് ഊഹിച്ചിരിക്കുന്നു"
+#. 4
+#: ../cli/src/devices.c:184
+msgid "RATE"
+msgstr "RATE"
 
-#: ../cli/src/devices.c:400
-msgid "The supplicant is now available"
-msgstr "സപ്ലിക്കെന്റ് ഇപ്പോള്‍ ലഭ്യമാണ്"
+#. 5
+#. 1
+#: ../cli/src/devices.c:185 ../cli/src/devices.c:203
+msgid "SIGNAL"
+msgstr "SIGNAL"
 
-#: ../cli/src/devices.c:403
-msgid "The modem could not be found"
-msgstr "മോഡം കണ്ടെത്തുവാന്‍ സാധിക്കുന്നില്ല"
+#. 6
+#: ../cli/src/devices.c:186
+msgid "SECURITY"
+msgstr "SECURITY"
 
-#: ../cli/src/devices.c:406
-#, fuzzy
-#| msgid "the connection attempt timed out"
-msgid "The Bluetooth connection failed or timed out"
-msgstr "കണക്ഷനുള്ള ശ്രമം കഴിഞ്ഞിരിക്കുന്നു"
+#. 7
+#: ../cli/src/devices.c:187
+msgid "WPA-FLAGS"
+msgstr "WPA-FLAGS"
 
-#: ../cli/src/devices.c:409
-msgid "GSM Modem's SIM card not inserted"
-msgstr "GSM മോഡത്തില്‍ സിം കാര്‍ഡ് ഇല്ല"
+#. 8
+#: ../cli/src/devices.c:188
+msgid "RSN-FLAGS"
+msgstr "RSN-FLAGS"
 
-#: ../cli/src/devices.c:412
-msgid "GSM Modem's SIM PIN required"
-msgstr "GSM മോഡത്തിന്റെ സിം PIN ആവിശ്യമാണ്"
+#. 10
+#. 4
+#: ../cli/src/devices.c:190 ../cli/src/devices.c:206
+msgid "ACTIVE"
+msgstr "ACTIVE"
 
-#: ../cli/src/devices.c:415
-msgid "GSM Modem's SIM PUK required"
-msgstr "GSM മോഡത്തിന്റെ സിം PUK ആവിശ്യമാണ്"
+#. 0
+#: ../cli/src/devices.c:218
+msgid "SLAVES"
+msgstr "SLAVES"
 
-#: ../cli/src/devices.c:418
-msgid "GSM Modem's SIM wrong"
-msgstr "GSM മോഡത്തിന്റെ സിം തെറ്റാണ്"
+#. 0
+#: ../cli/src/devices.c:227
+#| msgid "UUID"
+msgid "ID"
+msgstr "ID"
 
-#: ../cli/src/devices.c:421
-msgid "InfiniBand device does not support connected mode"
+#: ../cli/src/devices.c:243
+#, 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 ]\n"
+#| "  disconnect iface  [--nowait] [--timeout ]\n"
+#| "  wifi [list [iface ] [bssid ]]\n"
+#| "  wifi connect <(B)SSID> [password ] [wep-key-type key|phrase] "
+#| "[iface ] [bssid ] [name ]\n"
+#| "               [--private] [--nowait] [--timeout ]\n"
+#| "  wimax [list [iface ] [nsp ]]\n"
+#| "\n"
+msgid ""
+"Usage: nmcli device { COMMAND | help }\n"
+"\n"
+"  COMMAND := { status | list | disconnect | wifi | wimax }\n"
+"\n"
+"  COMMAND := { status | list | disconnect | wifi }\n"
+"\n"
+"  status\n"
+"  list [iface ]\n"
+"  disconnect iface  [--nowait] [--timeout ]\n"
+"  wifi [list [iface ] [bssid ]]\n"
+"  wifi connect <(B)SSID> [password ] [wep-key-type key|phrase] "
+"[iface ] [bssid ] [name ]\n"
+"               [--private] [--nowait] [--timeout ]\n"
+"  wimax [list [iface ] [nsp ]]\n"
+"\n"
 msgstr ""
+"ഉപയോഗിയ്ക്കേണ്ട വിധം: nmcli device { COMMAND | help }\n"
+"\n"
+"  COMMAND := { status | list | disconnect | wifi | wimax }\n"
+"\n"
+"  COMMAND := { status | list | disconnect | wifi }\n"
+"\n"
+"  status\n"
+"  list [iface ]\n"
+"  disconnect iface  [--nowait] [--timeout ]\n"
+"  wifi [list [iface ] [bssid ]]\n"
+"  wifi connect <(B)SSID> [password ] [wep-key-type key|phrase] "
+"[iface ] [bssid ] [name ]\n"
+"               [--private] [--nowait] [--timeout ]\n"
+"  wimax [list [iface ] [nsp ]]\n"
+"\n"
 
-#: ../cli/src/devices.c:423 ../cli/src/devices.c:446 ../cli/src/devices.c:458
-#: ../cli/src/devices.c:578 ../cli/src/devices.c:622
-msgid "Unknown"
-msgstr "അപരിചിതം"
-
-#: ../cli/src/devices.c:491
+#: ../cli/src/devices.c:344
 msgid "(none)"
 msgstr "(ഒന്നുമില്ല)"
 
-#: ../cli/src/devices.c:547
+#: ../cli/src/devices.c:400
 #, c-format
 msgid "%u MHz"
 msgstr "%u MHz"
 
-#: ../cli/src/devices.c:548
+#: ../cli/src/devices.c:401
 #, c-format
 msgid "%u MB/s"
 msgstr "%u MB/s"
 
-#: ../cli/src/devices.c:557
+#: ../cli/src/devices.c:410
 msgid "Encrypted: "
 msgstr "എന്‍ക്രിപ്റ്റ് ചെയ്തിരിക്കുന്നു: "
 
-#: ../cli/src/devices.c:562
+#: ../cli/src/devices.c:415
 msgid "WEP "
 msgstr "WEP "
 
-#: ../cli/src/devices.c:564
+#: ../cli/src/devices.c:417
 msgid "WPA "
 msgstr "WPA "
 
-#: ../cli/src/devices.c:566
+#: ../cli/src/devices.c:419
 msgid "WPA2 "
 msgstr "WPA2 "
 
-#: ../cli/src/devices.c:569
+#: ../cli/src/devices.c:422
 msgid "Enterprise "
 msgstr "എന്റര്‍പ്രൈസ് "
 
-#: ../cli/src/devices.c:578
+#: ../cli/src/devices.c:431
 msgid "Ad-Hoc"
 msgstr "അഡ്-ഹോക്"
 
-#: ../cli/src/devices.c:578
+#: ../cli/src/devices.c:432
 msgid "Infrastructure"
 msgstr "ഇന്‍ഫ്രാസ്ട്രക്ചര്‍"
 
-#: ../cli/src/devices.c:613
+#: ../cli/src/devices.c:468
 msgid "Home"
 msgstr "പാര്‍പ്പിടം"
 
-#: ../cli/src/devices.c:616
+#: ../cli/src/devices.c:471
 msgid "Partner"
-msgstr ""
+msgstr "പങ്കാളി"
 
-#: ../cli/src/devices.c:619
+#: ../cli/src/devices.c:474
 msgid "Roaming"
-msgstr ""
+msgstr "റോമിങ്"
 
-#: ../cli/src/devices.c:691
+#: ../cli/src/devices.c:546
 #, c-format
 msgid "Error: 'dev list': %s"
 msgstr "പിശക്: 'dev list': %s"
 
-#: ../cli/src/devices.c:693
+#: ../cli/src/devices.c:548
 #, c-format
 msgid "Error: 'dev list': %s; allowed fields: %s"
 msgstr "പിശക്: 'dev list': %s, അനുവദിക്കുന്ന ഫീള്‍ഡുകള്‍: %s"
 
-#: ../cli/src/devices.c:702
+#: ../cli/src/devices.c:557
 msgid "Device details"
 msgstr "ഡിവൈസിന്റെ വിശദാംശങ്ങള്‍"
 
-#: ../cli/src/devices.c:744 ../cli/src/devices.c:745 ../cli/src/devices.c:1152
-#: ../cli/src/utils.c:445
+#: ../cli/src/devices.c:602 ../cli/src/devices.c:605 ../cli/src/devices.c:1081
+#: ../cli/src/utils.c:477
 msgid "(unknown)"
 msgstr "(അപരിചിതം)"
 
-#: ../cli/src/devices.c:753
+#: ../cli/src/devices.c:614
 msgid "not connected"
 msgstr "കണക്ട് ചെയ്തിട്ടില്ല"
 
-#: ../cli/src/devices.c:780
+#: ../cli/src/devices.c:641
 #, c-format
 msgid "%u Mb/s"
 msgstr "%u Mb/s"
 
 #. Print header
 #. "WIRED-PROPERTIES"
-#: ../cli/src/devices.c:853
+#: ../cli/src/devices.c:715
 msgid "on"
 msgstr "ഓണ്‍"
 
-#: ../cli/src/devices.c:853
+#: ../cli/src/devices.c:715
 msgid "off"
 msgstr "ഓഫ്"
 
-#: ../cli/src/devices.c:1004
+#: ../cli/src/devices.c:923
 #, c-format
 msgid "Error: 'dev status': %s"
 msgstr "പിശക്: 'dev status': %s"
 
-#: ../cli/src/devices.c:1006
+#: ../cli/src/devices.c:925
 #, c-format
 msgid "Error: 'dev status': %s; allowed fields: %s"
 msgstr "പിശക്: 'dev status': %s; അനുവദിക്കുന്ന ഫീള്‍ഡുകള്‍: %s"
 
-#: ../cli/src/devices.c:1029
+#: ../cli/src/devices.c:948
 msgid "Status of devices"
 msgstr "ഡിവൈസുകളുടെ അവസ്ഥ"
 
-#: ../cli/src/devices.c:1060
+#: ../cli/src/devices.c:979
 #, c-format
 msgid "Error: '%s' argument is missing."
 msgstr "പിശക്: '%s' ആര്‍ഗ്യുമെന്റ് ലഭ്യമല്ല."
 
-#: ../cli/src/devices.c:1101 ../cli/src/devices.c:1253
-#: ../cli/src/devices.c:1390 ../cli/src/devices.c:1609
+#: ../cli/src/devices.c:1020 ../cli/src/devices.c:1185
+#: ../cli/src/devices.c:1326 ../cli/src/devices.c:1973
 #, c-format
 msgid "Error: Device '%s' not found."
 msgstr "പിശക്: ഡിവൈസ് '%s' ലഭ്യമായില്ല."
 
-#: ../cli/src/devices.c:1124
+#: ../cli/src/devices.c:1043
 #, c-format
 msgid "Success: Device '%s' successfully disconnected."
 msgstr "വിജയിച്ചു: ഡിവൈസ് '%s' വിജയകരമായി വിഛേദിച്ചിരിക്കുന്നു."
 
-#: ../cli/src/devices.c:1149
+#: ../cli/src/devices.c:1078
 #, c-format
 msgid "Error: Device '%s' (%s) disconnecting failed: %s"
 msgstr "പിശക്: ഡിവൈസ് '%s' (%s) വിഛേദിക്കുന്നതില്‍ പരാജയപ്പെട്ടു: %s"
 
-#: ../cli/src/devices.c:1157
+#: ../cli/src/devices.c:1091
 #, c-format
-msgid "Device state: %d (%s)\n"
-msgstr "ഡിവൈസിന്റെ അവസ്ഥ: %d (%s)\n"
+msgid "Device '%s' has been disconnected.\n"
+msgstr "ഡിവൈസ് '%s' വിജയകരമായി വിഛേദിച്ചിരിക്കുന്നു.\n"
 
-#: ../cli/src/devices.c:1222
+#: ../cli/src/devices.c:1154
 #, c-format
 msgid "Error: iface has to be specified."
 msgstr "പിശക്: iface നല്‍കേണ്ടതുണ്ടു്."
 
-#: ../cli/src/devices.c:1348
+#: ../cli/src/devices.c:1284
 #, c-format
 msgid "Error: 'dev wifi': %s"
 msgstr "പിശക്: 'dev wifi': %s"
 
-#: ../cli/src/devices.c:1350
+#: ../cli/src/devices.c:1286
 #, c-format
 msgid "Error: 'dev wifi': %s; allowed fields: %s"
 msgstr "പിശക്: 'dev wifi': %s; അനുവദിക്കുന്ന ഫീള്‍ഡുകള്‍: %s"
 
-#: ../cli/src/devices.c:1373
+#: ../cli/src/devices.c:1309
 msgid "WiFi scan list"
 msgstr "WiFi പരിശോധന പട്ടിക"
 
-#: ../cli/src/devices.c:1410 ../cli/src/devices.c:1464
+#: ../cli/src/devices.c:1346 ../cli/src/devices.c:1400
 #, c-format
 msgid "Error: Access point with bssid '%s' not found."
 msgstr "പിശക്: '%s' എന്ന് bssid ഉള്ള ആക്സെസ്സ് പോയിന്റ് ലഭ്യമല്ല."
 
-#: ../cli/src/devices.c:1427
+#: ../cli/src/devices.c:1363
 #, c-format
 msgid "Error: Device '%s' is not a WiFi device."
 msgstr "പിശക്: '%s' ഡിവൈസ് ഒരു വൈഫൈ ഡിവൈസല്ല."
 
-#: ../cli/src/devices.c:1491
+#: ../cli/src/devices.c:1431 ../cli/src/devices.c:1477
+#, c-format
+msgid "Connection with UUID '%s' created and activated on device '%s'\n"
+msgstr ""
+"UUID '%s'-യ്ക്കള്ള കണക്ഷന്‍ തയ്യാറാക്കി '%s' ഡിവൈസില്‍ "
+"സജീവമാക്കിയിരിയ്ക്കുന്നു\n"
+
+#: ../cli/src/devices.c:1436
+#, c-format
+msgid "Error: Connection activation failed: (%d) %s."
+msgstr "പിശക്: കണക്ഷന്‍ സജീവമാക്കല്‍ പരാജയപ്പെട്ടു: (%d) %s."
+
+#: ../cli/src/devices.c:1461
+#, c-format
+msgid "Error: Failed to add/activate new connection: (%d) %s"
+msgstr "പിശക്: ക്രമീകരണങ്ങള്‍ വായിക്കുന്നതില്‍ പരാജയപ്പെട്ടു: (%d) %s"
+
+#: ../cli/src/devices.c:1469
+#, c-format
+msgid "Error: Failed to add/activate new connection: Unknown error"
+msgstr ""
+"പിശക്: പുതിയ കണക്ഷന്‍ ചേര്‍ക്കുവാന്‍/സജീവമാക്കുന്നതില്‍ പരാജയം : അപരിചിതമായ "
+"പിശക്"
+
+#: ../cli/src/devices.c:1613
+#, c-format
+msgid "Error: SSID or BSSID are missing."
+msgstr "പിശക്: SSID അല്ലെങ്കില്‍ BSSID ലഭ്യമല്ല."
+
+#: ../cli/src/devices.c:1636
+#, c-format
+msgid "Error: bssid argument value '%s' is not a valid BSSID."
+msgstr "പിശക്: bssid ആര്‍ഗ്യുമെന്റ് മൂല്ല്യം '%s' ശരിയായൊരു BSSID മൂല്ല്യമല്ല."
+
+#: ../cli/src/devices.c:1660
+#, c-format
+msgid ""
+"Error: wep-key-type argument value '%s' is invalid, use 'key' or 'phrase'."
+msgstr ""
+"പിശക്: wep-key-type ആര്‍ഗ്യുമെന്റ് മൂല്ല്യം '%s' അസാധുവാണു്, 'key' "
+"അല്ലെങ്കില്‍ 'phrase'."
+
+#: ../cli/src/devices.c:1700
+#, c-format
+msgid "Error: BSSID to connect to (%s) differs from bssid argument (%s)."
+msgstr ""
+"പിശക്: BSSID (%s)-ലേക്കുള്ള കണക്ഷന്‍ bssid ആര്‍ഗ്യുമെന്റ് (%s)-ല്‍ നിന്നും "
+"വ്യത്യാസമുണ്ടു്."
+
+#: ../cli/src/devices.c:1706
+#, c-format
+msgid "Error: Parameter '%s' is neither SSID nor BSSID."
+msgstr "പിശക്: പരാമീറ്റര്‍ '%s' SSID/BSSID അല്ല."
+
+#: ../cli/src/devices.c:1735
+#, c-format
+msgid "Error: Device '%s' is not a Wi-Fi device."
+msgstr "പിശക്: '%s' ഡിവൈസ് ഒരു വൈഫൈ ഡിവൈസല്ല."
+
+#: ../cli/src/devices.c:1737
+#, c-format
+msgid "Error: No Wi-Fi device found."
+msgstr "പിശക്: വൈഫൈ ഡിവൈസ് ലഭ്യമായില്ല."
+
+#: ../cli/src/devices.c:1755
+#, c-format
+msgid "Error: No network with SSID '%s' found."
+msgstr "പിശക്: SSID '%s' ഉള്ള നെറ്റ്‌വര്‍ക്ക് ലഭ്യമായില്ല."
+
+#: ../cli/src/devices.c:1757
+#, c-format
+msgid "Error: No access point with BSSID '%s' found."
+msgstr "പിശക്: '%s' എന്ന BSSID ഉള്ള ആക്സെസ്സ് പോയിന്റ് ലഭ്യമല്ല."
+
+#: ../cli/src/devices.c:1855
 #, c-format
 msgid "Error: 'dev wifi' command '%s' is not valid."
 msgstr "പിശക്: 'dev wifi' കമാന്‍ഡ് '%s' ശരിയല്ല."
 
-#: ../cli/src/devices.c:1567
+#: ../cli/src/devices.c:1931
 #, c-format
 msgid "Error: 'dev wimax': %s"
 msgstr "പിശക്: 'dev wimax': %s"
 
-#: ../cli/src/devices.c:1569
+#: ../cli/src/devices.c:1933
 #, c-format
 msgid "Error: 'dev wimax': %s; allowed fields: %s"
 msgstr "പിശക്: 'dev wimax': %s; അനുവദിക്കുന്ന ഫീള്‍ഡുകള്‍: %s"
 
-#: ../cli/src/devices.c:1592
+#: ../cli/src/devices.c:1956
 msgid "WiMAX NSP list"
 msgstr "WiMAX NSP പട്ടിക"
 
-#: ../cli/src/devices.c:1629
+#: ../cli/src/devices.c:1993
 #, c-format
 msgid "Error: NSP with name '%s' not found."
 msgstr "പിശക്: '%s' എന്ന പേരിലുള്ള NSP ലഭ്യമായില്ല."
 
-#: ../cli/src/devices.c:1640
+#: ../cli/src/devices.c:2004
 #, c-format
 msgid "Error: Device '%s' is not a WiMAX device."
 msgstr "പിശക്: '%s' ഡിവൈസ് ഒരു വൈമാക്സ് ഡിവൈസല്ല."
 
-#: ../cli/src/devices.c:1671
+#: ../cli/src/devices.c:2035
 #, c-format
 msgid "Error: Access point with nsp '%s' not found."
 msgstr "പിശക്: '%s' എന്ന nsp ഉള്ള ആക്സെസ്സ് പോയിന്റ് ലഭ്യമല്ല."
 
-#: ../cli/src/devices.c:1698
+#: ../cli/src/devices.c:2062
 #, c-format
 msgid "Error: 'dev wimax' command '%s' is not valid."
 msgstr "പിശക്: 'dev wimax' കമാന്‍ഡ് '%s' ശരിയല്ല."
 
-#: ../cli/src/devices.c:1748
+#: ../cli/src/devices.c:2115
 #, c-format
 msgid "Error: 'dev' command '%s' is not valid."
 msgstr "പിശക്: 'dev' കമാന്‍ഡ് '%s' ശരിയല്ല."
@@ -1353,16 +1519,27 @@ msgstr "WIMAX-HARDWARE"
 msgid "WIMAX"
 msgstr "WIMAX"
 
-#: ../cli/src/network-manager.c:67
+#: ../cli/src/network-manager.c:62
+msgid "PERMISSION"
+msgstr "PERMISSION"
+
+#. 0
+#: ../cli/src/network-manager.c:63
+msgid "VALUE"
+msgstr "VALUE"
+
+#: ../cli/src/network-manager.c:77
 #, c-format
 msgid ""
 "Usage: nmcli nm { COMMAND | help }\n"
 "\n"
-"  COMMAND := { status | enable | sleep | wifi | wwan | wimax }\n"
+"  COMMAND := { status | permissions | enable | sleep | wifi | wwan | "
+"wimax }\n"
 "\n"
-"  COMMAND := { status | enable | sleep | wifi | wwan }\n"
+"  COMMAND := { status | permissions | enable | sleep | wifi | wwan }\n"
 "\n"
 "  status\n"
+"  permissions\n"
 "  enable [true|false]\n"
 "  sleep [true|false]\n"
 "  wifi [on|off]\n"
@@ -1370,13 +1547,15 @@ msgid ""
 "  wimax [on|off]\n"
 "\n"
 msgstr ""
-"ഉപയോഗക്രമം: nmcli nm { COMMAND | help }\n"
+"Usage: nmcli nm { COMMAND | help }\n"
 "\n"
-"  COMMAND := { status | enable | sleep | wifi | wwan | wimax }\n"
+"  COMMAND := { status | permissions | enable | sleep | wifi | wwan | "
+"wimax }\n"
 "\n"
-"  COMMAND := { status | enable | sleep | wifi | wwan }\n"
+"  COMMAND := { status | permissions | enable | sleep | wifi | wwan }\n"
 "\n"
 "  status\n"
+"  permissions\n"
 "  enable [true|false]\n"
 "  sleep [true|false]\n"
 "  wifi [on|off]\n"
@@ -1384,144 +1563,186 @@ msgstr ""
 "  wimax [on|off]\n"
 "\n"
 
-#: ../cli/src/network-manager.c:96
+#: ../cli/src/network-manager.c:108
 msgid "asleep"
 msgstr "ഉറങ്ങുന്നു"
 
-#: ../cli/src/network-manager.c:98
+#: ../cli/src/network-manager.c:110
 msgid "connecting"
 msgstr "കണക്ട് ചെയ്യുന്നു"
 
-#: ../cli/src/network-manager.c:100
+#: ../cli/src/network-manager.c:112
 msgid "connected (local only)"
 msgstr "കണക്ട് ചെയ്തിരിക്കുന്നു (തദ്ദേശത്ത് മാത്രമായി)"
 
-#: ../cli/src/network-manager.c:102
+#: ../cli/src/network-manager.c:114
 msgid "connected (site only)"
 msgstr "കണക്ട് ചെയ്തിരിക്കുന്നു (സൈറ്റ് മാത്രമായി)"
 
-#: ../cli/src/network-manager.c:106
+#: ../cli/src/network-manager.c:118
 msgid "disconnecting"
 msgstr "വിച്ഛേദിച്ചുകൊണ്ടിരിക്കുന്നു"
 
-#: ../cli/src/network-manager.c:146
+#: ../cli/src/network-manager.c:158
 #, c-format
 msgid "Error: 'nm status': %s"
 msgstr "പിശക്: 'nm status': %s"
 
-#: ../cli/src/network-manager.c:148
+#: ../cli/src/network-manager.c:160
 #, c-format
 msgid "Error: 'nm status': %s; allowed fields: %s"
 msgstr "പിശക്: 'nm status': %s; അനുവദിക്കുന്ന ഫീള്‍ഡുകള്‍: %s"
 
 #. create NMClient
-#: ../cli/src/network-manager.c:161 ../cli/src/network-manager.c:162
-#: ../cli/src/network-manager.c:163 ../cli/src/network-manager.c:164
-#: ../cli/src/network-manager.c:165 ../cli/src/network-manager.c:167
-#: ../cli/src/network-manager.c:168 ../cli/src/network-manager.c:289
-#: ../cli/src/network-manager.c:344 ../cli/src/network-manager.c:382
-#: ../cli/src/network-manager.c:421
+#: ../cli/src/network-manager.c:173 ../cli/src/network-manager.c:174
+#: ../cli/src/network-manager.c:175 ../cli/src/network-manager.c:176
+#: ../cli/src/network-manager.c:177 ../cli/src/network-manager.c:179
+#: ../cli/src/network-manager.c:180 ../cli/src/network-manager.c:429
+#: ../cli/src/network-manager.c:484 ../cli/src/network-manager.c:522
+#: ../cli/src/network-manager.c:561
 msgid "enabled"
 msgstr "പ്രവര്‍ത്തന സജ്ജമാക്കിയിരിക്കുന്നു"
 
-#: ../cli/src/network-manager.c:161 ../cli/src/network-manager.c:162
-#: ../cli/src/network-manager.c:163 ../cli/src/network-manager.c:164
-#: ../cli/src/network-manager.c:165 ../cli/src/network-manager.c:167
-#: ../cli/src/network-manager.c:168 ../cli/src/network-manager.c:289
-#: ../cli/src/network-manager.c:344 ../cli/src/network-manager.c:382
-#: ../cli/src/network-manager.c:421
+#: ../cli/src/network-manager.c:173 ../cli/src/network-manager.c:174
+#: ../cli/src/network-manager.c:175 ../cli/src/network-manager.c:176
+#: ../cli/src/network-manager.c:177 ../cli/src/network-manager.c:179
+#: ../cli/src/network-manager.c:180 ../cli/src/network-manager.c:429
+#: ../cli/src/network-manager.c:484 ../cli/src/network-manager.c:522
+#: ../cli/src/network-manager.c:561
 msgid "disabled"
 msgstr "പ്രവര്‍ത്തനരഹിതമാക്കിയിരിക്കുന്നു"
 
-#: ../cli/src/network-manager.c:181
+#: ../cli/src/network-manager.c:193
 msgid "NetworkManager status"
 msgstr "നെറ്റ്‌വര്‍ക്ക്മാനേജറിന്റെ അവസ്ഥ"
 
 #. Print header
-#: ../cli/src/network-manager.c:184
+#: ../cli/src/network-manager.c:196
 msgid "running"
 msgstr "പ്രവര്‍ത്തനത്തില്‍"
 
-#: ../cli/src/network-manager.c:184
+#: ../cli/src/network-manager.c:196
 msgid "not running"
 msgstr "പ്രവര്‍ത്തനത്തിലല്ല"
 
-#: ../cli/src/network-manager.c:215 ../cli/src/utils.c:425
+#: ../cli/src/network-manager.c:271
+msgid "auth"
+msgstr "auth"
+
+#: ../cli/src/network-manager.c:301
+#, c-format
+msgid "Error: 'nm permissions': %s"
+msgstr "പിശക്: 'nm permissions': %s"
+
+#: ../cli/src/network-manager.c:303
+#, c-format
+msgid "Error: 'nm permissions': %s; allowed fields: %s"
+msgstr "പിശക്: 'nm permissions': %s; അനുവദിക്കുന്ന ഫീള്‍ഡുകള്‍: %s"
+
+#: ../cli/src/network-manager.c:324
+msgid "NetworkManager permissions"
+msgstr "NetworkManager അനുമതികള്‍"
+
+#: ../cli/src/network-manager.c:350 ../cli/src/utils.c:457
 #, c-format
 msgid "Error: Couldn't connect to system bus: %s"
 msgstr "പിശക്: സിസ്റ്റം bus-ലേക്കു് കണക്ട് ചെയ്യുവാന്‍ സാധ്യമായില്ല: %s"
 
-#: ../cli/src/network-manager.c:226
+#: ../cli/src/network-manager.c:361
 #, c-format
 msgid "Error: Couldn't create D-Bus object proxy."
 msgstr "പിശക്: D-Bus പ്രോക്സി നിര്‍മ്മിക്കുവാന്‍ സാധ്യമായില്ല."
 
-#: ../cli/src/network-manager.c:232
+#: ../cli/src/network-manager.c:367
 #, c-format
 msgid "Error in sleep: %s"
 msgstr "ഉറങ്ങുന്നതില്‍ പിശക്: %s"
 
-#: ../cli/src/network-manager.c:276 ../cli/src/network-manager.c:331
-#: ../cli/src/network-manager.c:369 ../cli/src/network-manager.c:408
+#: ../cli/src/network-manager.c:416 ../cli/src/network-manager.c:471
+#: ../cli/src/network-manager.c:509 ../cli/src/network-manager.c:548
 #, c-format
 msgid "Error: '--fields' value '%s' is not valid here; allowed fields: %s"
-msgstr "പിശക്: '%s' എന്നു് '--fields'-നുള്ള മൂല്ല്യം അസാധുവാണു്; അനുവദിക്കുന്ന ഫീള്‍ഡുകള്‍: %s"
+msgstr ""
+"പിശക്: '%s' എന്നു് '--fields'-നുള്ള മൂല്ല്യം അസാധുവാണു്; അനുവദിക്കുന്ന "
+"ഫീള്‍ഡുകള്‍: %s"
 
-#: ../cli/src/network-manager.c:284
+#: ../cli/src/network-manager.c:424
 msgid "Networking enabled"
 msgstr "നെറ്റ്​വര്‍ക്കിങ് സജ്ജമാക്കിയിരിക്കുന്നു"
 
-#: ../cli/src/network-manager.c:300
+#: ../cli/src/network-manager.c:440
 #, c-format
 msgid "Error: invalid 'enable' parameter: '%s'; use 'true' or 'false'."
-msgstr "പിശക്: തെറ്റായ 'wwan' പരാമീറ്റര്‍: '%s'; 'true' അല്ലെങ്കില്‍ 'false' ഉപയോഗിക്കുക."
+msgstr ""
+"പിശക്: തെറ്റായ 'wwan' പരാമീറ്റര്‍: '%s'; 'true' അല്ലെങ്കില്‍ 'false' "
+"ഉപയോഗിക്കുക."
 
-#: ../cli/src/network-manager.c:310
-#, fuzzy, c-format
-#| msgid "Error: Could not connect to NetworkManager."
+#: ../cli/src/network-manager.c:450
+#, c-format
 msgid "Error: Sleeping status is not exported by NetworkManager."
-msgstr "പിശക്: നെറ്റ്‌വര്‍ക്ക്മാനേജറിലേക്കു് കണക്ട് ചെയ്യുവാന്‍ സാധ്യമായില്ല."
+msgstr "പിശക്: NetworkManager സ്ലീപ്പിങ് അവസ്ഥ എക്സ്പോര്‍ട്ട് ചെയ്യുന്നില്ല."
 
-#: ../cli/src/network-manager.c:318
-#, fuzzy, c-format
-#| msgid "Error: invalid 'wifi' parameter: '%s'."
+#: ../cli/src/network-manager.c:458
+#, c-format
 msgid "Error: invalid 'sleep' parameter: '%s'; use 'true' or 'false'."
-msgstr "പിശക്: തെറ്റായ 'wifi' പരാമീറ്റര്‍: '%s'."
+msgstr ""
+"പിശക്: തെറ്റായ 'sleep' പരാമീറ്റര്‍: '%s'; 'true' അല്ലെങ്കില്‍ 'false' "
+"ഉപയോഗിയ്ക്കുക."
 
-#: ../cli/src/network-manager.c:339
+#: ../cli/src/network-manager.c:479
 msgid "WiFi enabled"
 msgstr "WiFi സജ്ജം"
 
-#: ../cli/src/network-manager.c:355
+#: ../cli/src/network-manager.c:495
 #, c-format
 msgid "Error: invalid 'wifi' parameter: '%s'."
 msgstr "പിശക്: തെറ്റായ 'wifi' പരാമീറ്റര്‍: '%s'."
 
-#: ../cli/src/network-manager.c:377
+#: ../cli/src/network-manager.c:517
 msgid "WWAN enabled"
 msgstr "WWAN സജ്ജം"
 
-#: ../cli/src/network-manager.c:393
+#: ../cli/src/network-manager.c:533
 #, c-format
 msgid "Error: invalid 'wwan' parameter: '%s'."
 msgstr "പിശക്: തെറ്റായ 'wwan' പരാമീറ്റര്‍: '%s'."
 
-#: ../cli/src/network-manager.c:416
+#: ../cli/src/network-manager.c:556
 msgid "WiMAX enabled"
 msgstr "WiMAX സജ്ജം"
 
-#: ../cli/src/network-manager.c:432
+#: ../cli/src/network-manager.c:572
 #, c-format
 msgid "Error: invalid 'wimax' parameter: '%s'."
 msgstr "പിശക്: തെറ്റായ 'wimax' പരാമീറ്റര്‍: '%s'."
 
-#: ../cli/src/network-manager.c:445
+#: ../cli/src/network-manager.c:588
 #, c-format
 msgid "Error: 'nm' command '%s' is not valid."
 msgstr "പിശക്: 'nm' കമാന്‍ഡ് '%s' ശരിയല്ല."
 
-#: ../cli/src/nmcli.c:64
-#, c-format
+#: ../cli/src/nmcli.c:76
+#, 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] |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"
+#| "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"
@@ -1538,12 +1759,12 @@ msgid ""
 "  -h[elp]                                    print this help\n"
 "\n"
 "OBJECT\n"
-"  nm          NetworkManager status\n"
-"  con         NetworkManager connections\n"
-"  dev         devices managed by NetworkManager\n"
+"  nm              NetworkManager's status\n"
+"  c[onnection]    NetworkManager's connections\n"
+"  d[evice]        devices managed by NetworkManager\n"
 "\n"
 msgstr ""
-"ഉപയോഗക്രമം: %s [OPTIONS] OBJECT { COMMAND | help }\n"
+"ഉപയോഗിയ്ക്കേണ്ട വിധം: %s [OPTIONS] OBJECT { COMMAND | help }\n"
 "\n"
 "OPTIONS\n"
 "  -t[erse]                                   terse output\n"
@@ -1558,159 +1779,185 @@ msgstr ""
 "  -h[elp]                                    print this help\n"
 "\n"
 "OBJECT\n"
-"  nm          NetworkManager status\n"
-"  con         NetworkManager connections\n"
-"  dev         devices managed by NetworkManager\n"
+"  nm              NetworkManager's status\n"
+"  c[onnection]    NetworkManager's connections\n"
+"  d[evice]        devices managed by NetworkManager\n"
 "\n"
 
-#: ../cli/src/nmcli.c:109
+#: ../cli/src/nmcli.c:124
 #, c-format
 msgid "Error: Object '%s' is unknown, try 'nmcli help'."
 msgstr "പിശക്: '%s'വസ്തു അപരിചിതം, 'nmcli help' ശ്രമിക്കുക."
 
-#: ../cli/src/nmcli.c:139
+#: ../cli/src/nmcli.c:154
 #, c-format
 msgid "Error: Option '--terse' is specified the second time."
 msgstr "പിശക്: '--terse' രണ്ടാമതും നല്‍കിയിരിക്കുന്നു."
 
-#: ../cli/src/nmcli.c:144
+#: ../cli/src/nmcli.c:159
 #, c-format
 msgid "Error: Option '--terse' is mutually exclusive with '--pretty'."
 msgstr "Error: Option '--terse' is mutually exclusive with '--pretty'."
 
-#: ../cli/src/nmcli.c:152
+#: ../cli/src/nmcli.c:167
 #, c-format
 msgid "Error: Option '--pretty' is specified the second time."
 msgstr "പിശക്: '--pretty' രണ്ടാമതും നല്‍കിയിരിക്കുന്നു."
 
-#: ../cli/src/nmcli.c:157
+#: ../cli/src/nmcli.c:172
 #, c-format
 msgid "Error: Option '--pretty' is mutually exclusive with '--terse'."
 msgstr "Error: Option '--pretty' is mutually exclusive with '--terse'."
 
-#: ../cli/src/nmcli.c:167 ../cli/src/nmcli.c:183
+#: ../cli/src/nmcli.c:182 ../cli/src/nmcli.c:198
 #, c-format
 msgid "Error: missing argument for '%s' option."
 msgstr "പിശക്: '%s' ഐച്ഛികത്തിനുള്ള ആര്‍ഗ്യുമെന്റ് ലഭ്യമല്ല."
 
-#: ../cli/src/nmcli.c:176 ../cli/src/nmcli.c:192
+#: ../cli/src/nmcli.c:191 ../cli/src/nmcli.c:207
 #, c-format
 msgid "Error: '%s' is not valid argument for '%s' option."
 msgstr "പിശക്: '%s' ഐച്ഛികത്തിനുള്ള '%s' ശരിയായ ആര്‍ഗ്യുമെന്റല്ല."
 
-#: ../cli/src/nmcli.c:199
+#: ../cli/src/nmcli.c:214
 #, c-format
 msgid "Error: fields for '%s' options are missing."
 msgstr "പിശക്: '%s' ഐച്ഛികങ്ങള്‍ക്കുള്ള ഫീള്‍ഡുകള്‍ ലഭ്യമല്ല."
 
-#: ../cli/src/nmcli.c:207
+#: ../cli/src/nmcli.c:222
 #, c-format
 msgid "nmcli tool, version %s\n"
 msgstr "nmcli പ്രയോഗം, പതിപ്പു് %s\n"
 
-#: ../cli/src/nmcli.c:213
+#: ../cli/src/nmcli.c:228
 #, c-format
 msgid "Error: Option '%s' is unknown, try 'nmcli -help'."
 msgstr "പിശക്: '%s' ഐഛികം അപരിചിതം, 'nmcli -help' ശ്രമിക്കുക."
 
-#: ../cli/src/nmcli.c:232
+#: ../cli/src/nmcli.c:247
 #, c-format
 msgid "Caught signal %d, shutting down..."
 msgstr "%d സിഗ്നല്‍ ലഭ്യമായി, അടച്ചു പൂട്ടുന്നു..."
 
-#: ../cli/src/nmcli.c:257
+#: ../cli/src/nmcli.c:272
 msgid "Error: Could not create NMClient object."
 msgstr "പിശക്: NMClient നിര്‍മ്മിക്കുവാന്‍ സാധമായില്ല"
 
-#: ../cli/src/nmcli.c:273
+#: ../cli/src/nmcli.c:288
 msgid "Success"
 msgstr "വിജയിച്ചു"
 
-#: ../cli/src/settings.c:465
+#: ../cli/src/settings.c:527
 #, c-format
 msgid "%d (hex-ascii-key)"
 msgstr "%d (hex-ascii-key)"
 
-#: ../cli/src/settings.c:467
+#: ../cli/src/settings.c:529
 #, c-format
 msgid "%d (104/128-bit passphrase)"
 msgstr "%d (104/128-ബിറ്റ് പാസ്ഫ്രെയിസ്)"
 
-#: ../cli/src/settings.c:470
+#: ../cli/src/settings.c:532 ../cli/src/settings.c:660
 #, c-format
 msgid "%d (unknown)"
 msgstr "%d (അപരിചിതം)"
 
-#: ../cli/src/settings.c:496
+#: ../cli/src/settings.c:558
 msgid "0 (unknown)"
 msgstr "0 (അപരിചിതം)"
 
-#: ../cli/src/settings.c:502
+#: ../cli/src/settings.c:564
 msgid "any, "
 msgstr "ഏതെങ്കിലും,"
 
-#: ../cli/src/settings.c:504
+#: ../cli/src/settings.c:566
 msgid "900 MHz, "
 msgstr "900 MHz, "
 
-#: ../cli/src/settings.c:506
+#: ../cli/src/settings.c:568
 msgid "1800 MHz, "
 msgstr "1800 MHz, "
 
-#: ../cli/src/settings.c:508
+#: ../cli/src/settings.c:570
 msgid "1900 MHz, "
 msgstr "1900 MHz, "
 
-#: ../cli/src/settings.c:510
+#: ../cli/src/settings.c:572
 msgid "850 MHz, "
 msgstr "850 MHz, "
 
-#: ../cli/src/settings.c:512
+#: ../cli/src/settings.c:574
 msgid "WCDMA 3GPP UMTS 2100 MHz, "
 msgstr "WCDMA 3GPP UMTS 2100 MHz, "
 
-#: ../cli/src/settings.c:514
+#: ../cli/src/settings.c:576
 msgid "WCDMA 3GPP UMTS 1800 MHz, "
 msgstr "WCDMA 3GPP UMTS 1800 MHz, "
 
-#: ../cli/src/settings.c:516
+#: ../cli/src/settings.c:578
 msgid "WCDMA 3GPP UMTS 1700/2100 MHz, "
 msgstr "WCDMA 3GPP UMTS 1700/2100 MHz, "
 
-#: ../cli/src/settings.c:518
+#: ../cli/src/settings.c:580
 msgid "WCDMA 3GPP UMTS 800 MHz, "
 msgstr "WCDMA 3GPP UMTS 800 MHz, "
 
-#: ../cli/src/settings.c:520
+#: ../cli/src/settings.c:582
 msgid "WCDMA 3GPP UMTS 850 MHz, "
 msgstr "WCDMA 3GPP UMTS 850 MHz, "
 
-#: ../cli/src/settings.c:522
+#: ../cli/src/settings.c:584
 msgid "WCDMA 3GPP UMTS 900 MHz, "
 msgstr "WCDMA 3GPP UMTS 900 MHz, "
 
-#: ../cli/src/settings.c:524
+#: ../cli/src/settings.c:586
 msgid "WCDMA 3GPP UMTS 1700 MHz, "
 msgstr "WCDMA 3GPP UMTS 1700 MHz, "
 
-#: ../cli/src/settings.c:526
+#: ../cli/src/settings.c:588
 msgid "WCDMA 3GPP UMTS 1900 MHz, "
 msgstr "WCDMA 3GPP UMTS 1900 MHz, "
 
-#: ../cli/src/settings.c:528
+#: ../cli/src/settings.c:590
 msgid "WCDMA 3GPP UMTS 2600 MHz, "
 msgstr "WCDMA 3GPP UMTS 2600 MHz, "
 
-#: ../cli/src/settings.c:650 ../cli/src/settings.c:846
-#: ../cli/src/settings.c:1550
+#: ../cli/src/settings.c:608
+msgid "0 (NONE)"
+msgstr "0 (NONE)"
+
+#: ../cli/src/settings.c:614
+msgid "REORDER_HEADERS, "
+msgstr "REORDER_HEADERS, "
+
+#: ../cli/src/settings.c:616
+msgid "GVRP, "
+msgstr "GVRP, "
+
+#: ../cli/src/settings.c:618
+msgid "LOOSE_BINDING, "
+msgstr "LOOSE_BINDING, "
+
+#: ../cli/src/settings.c:654
+#, c-format
+msgid "%d (disabled)"
+msgstr "%d (പ്രവര്‍ത്തനരഹിതമാക്കിയിരിക്കുന്നു)"
+
+#: ../cli/src/settings.c:656
+#, c-format
+msgid "%d (enabled, prefer public IP)"
+msgstr "%d (പ്രവര്‍ത്തന സജ്ജം, പബ്ലിക് ഐപി)"
+
+#: ../cli/src/settings.c:658
+#, c-format
+msgid "%d (enabled, prefer temporary IP)"
+msgstr "%d (പ്രവര്‍ത്തന സജ്ജം, താല്‍ക്കാലിക ഐപി)"
+
+#: ../cli/src/settings.c:791 ../cli/src/settings.c:987
+#: ../cli/src/settings.c:1696
 msgid "auto"
 msgstr "ഓട്ടോ"
 
-#: ../cli/src/settings.c:840 ../cli/src/settings.c:843
-#: ../cli/src/settings.c:844 ../cli/src/utils.c:247
-msgid "not set"
-msgstr "സജ്ജമല്ല"
-
 #: ../cli/src/utils.c:103
 #, c-format
 msgid "Error converting IP4 address '0x%X' to text form"
@@ -1721,49 +1968,58 @@ msgstr "'0x%X' IP4 വിലാസം വാക്യത്തിലാക്ക
 msgid "Error converting IP6 address '%s' to text form"
 msgstr "'%s' IP6 വിലാസം വാക്യത്തിലാക്കുന്നതില്‍ പിശക്"
 
-#: ../cli/src/utils.c:200
+#: ../cli/src/utils.c:232
 #, c-format
 msgid "field '%s' has to be alone"
 msgstr "ഫീള്‍ഡ് '%s' മാത്രമായിരിക്കണം"
 
-#: ../cli/src/utils.c:203
+#: ../cli/src/utils.c:235
 #, c-format
 msgid "invalid field '%s'"
 msgstr "തെറ്റായ ഫീള്‍ഡ് '%s'"
 
-#: ../cli/src/utils.c:222
-#, c-format
+#: ../cli/src/utils.c:254
 msgid "Option '--terse' requires specifying '--fields'"
 msgstr "'--terse' ഐച്ഛികത്തിനു് '--fields' നല്‍കേണ്ടതുണ്ടു്"
 
-#: ../cli/src/utils.c:226
+#: ../cli/src/utils.c:258
 #, c-format
 msgid "Option '--terse' requires specific '--fields' option values , not '%s'"
-msgstr "'--terse' എന്ന ഐച്ഛികത്തിനു് പ്രത്യേക '--fields' ഐച്ഛികം ആവശ്യമുണ്ടു്, '%s' അല്ല"
+msgstr ""
+"'--terse' എന്ന ഐച്ഛികത്തിനു് പ്രത്യേക '--fields' ഐച്ഛികം ആവശ്യമുണ്ടു്, '%s' "
+"അല്ല"
 
-#: ../cli/src/utils.c:436
+#: ../cli/src/utils.c:468
 #, c-format
 msgid "Error: Couldn't create D-Bus object proxy for org.freedesktop.DBus"
 msgstr ""
+"പിശക്: org.freedesktop.DBus-യ്ക്കുള്ള ഡി-ബസ് ഒബ്ജക്ട് പ്രോക്സി "
+"തയ്യാറാക്കുവാന്‍ സാധ്യമല്ല."
 
-#: ../cli/src/utils.c:444
+#: ../cli/src/utils.c:476
 #, c-format
 msgid "Error: NameHasOwner request failed: %s"
-msgstr ""
+msgstr "പിശക്: NameHasOwner ആവശ്യം പരാജയപ്പെട്ടു: %s"
 
-#: ../cli/src/utils.c:489
+#: ../cli/src/utils.c:521
 #, 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:498
+#: ../cli/src/utils.c:530
 #, 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:133
 #, c-format
@@ -1817,12 +2073,12 @@ msgstr "സ്വകാര്യ കീ ഡീകോഡ് ചെയ്യുവ
 
 #: ../libnm-util/crypto.c:284
 msgid "Failed to find expected PKCS#8 start tag."
-msgstr ""
+msgstr "പ്രതീക്ഷിച്ച PKCS#8 തുടക്ക റ്റാഗ് '%s' കണ്ടുപിടിയ്ക്കന്നതില്‍ പരാജയം."
 
 #: ../libnm-util/crypto.c:292
 #, c-format
 msgid "Failed to find expected PKCS#8 end tag '%s'."
-msgstr ""
+msgstr "പ്രതീക്ഷിച്ച PKCS#8 അവസാന റ്റാഗ് '%s' കണ്ടുപിടിയ്ക്കന്നതില്‍ പരാജയം."
 
 #: ../libnm-util/crypto.c:312
 msgid "Not enough memory to store private key data."
@@ -1867,7 +2123,8 @@ msgstr "സ്വകാര്യ കീ ഡീക്രിപ്റ്റ് ച
 #: ../libnm-util/crypto.c:497
 #, c-format
 msgid "Not enough memory to store decrypted private key."
-msgstr "ഡീക്രിപ്റ്റ് ചെയ്ത സ്വകാര്യ കീ സൂക്ഷിക്കുന്നതിനാവശ്യമായ മെമ്മറി ലഭ്യമല്ല."
+msgstr ""
+"ഡീക്രിപ്റ്റ് ചെയ്ത സ്വകാര്യ കീ സൂക്ഷിക്കുന്നതിനാവശ്യമായ മെമ്മറി ലഭ്യമല്ല."
 
 #: ../libnm-util/crypto.c:542
 #, c-format
@@ -1916,7 +2173,8 @@ msgstr "ഡീക്രിപ്ഷന്‍ സിഫര്‍ കോണ്‍
 #: ../libnm-util/crypto_gnutls.c:181
 #, c-format
 msgid "Failed to set symmetric key for decryption: %s / %s."
-msgstr "ഡീക്രിപ്ഷനുള്ള സിമ്മെട്രിക് കീ സജ്ജമാക്കുന്നതില്‍ പരാജയപ്പെട്ടു: %s / %s."
+msgstr ""
+"ഡീക്രിപ്ഷനുള്ള സിമ്മെട്രിക് കീ സജ്ജമാക്കുന്നതില്‍ പരാജയപ്പെട്ടു: %s / %s."
 
 #: ../libnm-util/crypto_gnutls.c:190
 #, c-format
@@ -1931,7 +2189,9 @@ msgstr "സ്വകാര്യ കീ ഡീക്രിപ്റ്റ് ച
 #: ../libnm-util/crypto_gnutls.c:209 ../libnm-util/crypto_nss.c:263
 #, c-format
 msgid "Failed to decrypt the private key: unexpected padding length."
-msgstr "സ്വകാര്യ കീ ഡീക്രിപ്റ്റ് ചെയ്യുന്നതില്‍ പരാജയപ്പെട്ടു: അപ്രതീക്ഷിതമായ പാഢിങ് നീളം."
+msgstr ""
+"സ്വകാര്യ കീ ഡീക്രിപ്റ്റ് ചെയ്യുന്നതില്‍ പരാജയപ്പെട്ടു: അപ്രതീക്ഷിതമായ പാഢിങ് "
+"നീളം."
 
 #: ../libnm-util/crypto_gnutls.c:220 ../libnm-util/crypto_nss.c:274
 #, c-format
@@ -1946,12 +2206,15 @@ msgstr "എന്‍ക്രിപ്റ്റിങിനുള്ള മെ
 #: ../libnm-util/crypto_gnutls.c:293
 #, c-format
 msgid "Failed to initialize the encryption cipher context: %s / %s."
-msgstr "എന്‍ക്രിപ്ഷന്‍ സിഫര്‍ കോണ്‍ടെക്സ്റ്റ് ആരംഭിക്കുന്നതില്‍ പരാജയപ്പെട്ടു: %s / %s."
+msgstr ""
+"എന്‍ക്രിപ്ഷന്‍ സിഫര്‍ കോണ്‍ടെക്സ്റ്റ് ആരംഭിക്കുന്നതില്‍ പരാജയപ്പെട്ടു: %s / %"
+"s."
 
 #: ../libnm-util/crypto_gnutls.c:302
 #, c-format
 msgid "Failed to set symmetric key for encryption: %s / %s."
-msgstr "എന്‍ക്രിപ്ഷനുള്ള സിമ്മെട്രിക് കീ സജ്ജമാക്കുന്നതില്‍ പരാജയപ്പെട്ടു: %s / %s."
+msgstr ""
+"എന്‍ക്രിപ്ഷനുള്ള സിമ്മെട്രിക് കീ സജ്ജമാക്കുന്നതില്‍ പരാജയപ്പെട്ടു: %s / %s."
 
 #: ../libnm-util/crypto_gnutls.c:312
 #, c-format
@@ -2042,7 +2305,8 @@ msgstr "സ്വകാര്യ കീ ഡീക്രിപ്റ്റ് ച
 #, c-format
 msgid "Failed to decrypt the private key: decrypted data too large."
 msgstr ""
-"സ്വകാര്യ കീ ഡീക്രിപ്റ്റ് ചെയ്യുന്നതില്‍ പരാജയപ്പെട്ടു: ഡീക്രിപ്റ്റ് ചെയ്ത ഡേറ്റ വളരെ വലുതാണു്."
+"സ്വകാര്യ കീ ഡീക്രിപ്റ്റ് ചെയ്യുന്നതില്‍ പരാജയപ്പെട്ടു: ഡീക്രിപ്റ്റ് ചെയ്ത "
+"ഡേറ്റ വളരെ വലുതാണു്."
 
 #: ../libnm-util/crypto_nss.c:252
 #, c-format
@@ -2108,267 +2372,332 @@ msgstr "PKCS#12 ഫയല്‍ ഉറപ്പാക്കുവാന്‍ 
 msgid "Could not generate random data."
 msgstr "വേഗത്തില്‍ ഡേറ്റാ തയ്യാറാക്കുവാന്‍ സാധ്യമായില്ല."
 
-#: ../libnm-util/nm-utils.c:2034
+#: ../libnm-util/nm-utils.c:2078
 #, c-format
 msgid "Not enough memory to make encryption key."
 msgstr "എന്‍ക്രിപ്ഷന്‍ കീ തയ്യാറാക്കുന്നതിനാവശ്യമായ മെമ്മറി ലഭ്യമല്ല."
 
-#: ../libnm-util/nm-utils.c:2144
+#: ../libnm-util/nm-utils.c:2188
 msgid "Could not allocate memory for PEM file creation."
 msgstr "PEM ഫയല്‍ ഉണ്ടാക്കുന്നതിനുള്ള മെമ്മറി അനുവദിക്കുവാന്‍ സാധ്യമായില്ല."
 
-#: ../libnm-util/nm-utils.c:2156
+#: ../libnm-util/nm-utils.c:2200
 #, c-format
 msgid "Could not allocate memory for writing IV to PEM file."
-msgstr "PEM ഫയലിലേക്ക് IV സൂക്ഷിക്കുന്നതിനാവശ്യമുള്ള മെമ്മറി അനുവദിക്കുവാന്‍ സാധ്യമായില്ല."
+msgstr ""
+"PEM ഫയലിലേക്ക് IV സൂക്ഷിക്കുന്നതിനാവശ്യമുള്ള മെമ്മറി അനുവദിക്കുവാന്‍ "
+"സാധ്യമായില്ല."
 
-#: ../libnm-util/nm-utils.c:2168
+#: ../libnm-util/nm-utils.c:2212
 #, c-format
 msgid "Could not allocate memory for writing encrypted key to PEM file."
 msgstr ""
-"PEM ഫയലിലേക്ക് എന്‍ക്രിപ്റ്റ് ചെയ്ത കീ സൂക്ഷിക്കുന്നതിനുള്ള മെമ്മറി അനുവദിക്കുവാന്‍ സാധ്യമായില്ല."
+"PEM ഫയലിലേക്ക് എന്‍ക്രിപ്റ്റ് ചെയ്ത കീ സൂക്ഷിക്കുന്നതിനുള്ള മെമ്മറി "
+"അനുവദിക്കുവാന്‍ സാധ്യമായില്ല."
 
-#: ../libnm-util/nm-utils.c:2187
+#: ../libnm-util/nm-utils.c:2231
 #, c-format
 msgid "Could not allocate memory for PEM file data."
 msgstr "PEM ഫയല്‍ ഡേറ്റായ്ക്കുള്ള മെമ്മറി അനുവദിക്കുവാന്‍ സാധ്യമായില്ല."
 
-#: ../policy/org.freedesktop.NetworkManager.policy.in.h:1
+#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:1
 msgid "Enable or disable system networking"
 msgstr ""
+"സിസ്റ്റം നെറ്റ്‌വര്‍ക്കിങ് പ്രവര്‍ത്തന സജ്ജമാക്കുക അല്ലെങ്കില്‍ പ്രവര്‍ത്തന "
+"രഹിതമാക്കുക"
 
-#: ../policy/org.freedesktop.NetworkManager.policy.in.h:2
+#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:2
 msgid "System policy prevents enabling or disabling system networking"
 msgstr ""
-" സിസ്റ്റം നെറ്റ്​വര്‍ക്കിങ് പ്രവര്‍ത്തനസജ്ജമാക്കുന്നതും പ്രവര്‍ത്തനരഹിതമാക്കുന്നതും സിസ്റ്റം പോളിസി തടയുന്നു"
+" സിസ്റ്റം നെറ്റ്​വര്‍ക്കിങ് പ്രവര്‍ത്തനസജ്ജമാക്കുന്നതും "
+"പ്രവര്‍ത്തനരഹിതമാക്കുന്നതും സിസ്റ്റം പോളിസി തടയുന്നു"
 
-#: ../policy/org.freedesktop.NetworkManager.policy.in.h:3
+#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:3
 msgid ""
 "Put NetworkManager to sleep or wake it up (should only be used by system "
 "power management)"
 msgstr ""
+"NetworkManager നിശ്ചലമാക്കുക അല്ലെങ്കില്‍ പ്രവര്‍ത്തിപ്പിയ്ക്കുക (സിസ്റ്റം "
+"പവര്‍ മാനേജ്മെന്റായി "
+"മാത്രമേ ഉപയോഗിയ്ക്കുവാന്‍ പാടുള്ളൂ)"
 
-#: ../policy/org.freedesktop.NetworkManager.policy.in.h:4
+#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:4
 msgid "System policy prevents putting NetworkManager to sleep or waking it up"
-msgstr "നെറ്റ്​വര്‍ക്ക് മാനേജറിനെ ഉറക്കുന്നതും ഉണര്‍ത്തുന്നതും സിസ്റ്റം പോളിസി തടയുന്നു"
+msgstr ""
+"നെറ്റ്​വര്‍ക്ക് മാനേജറിനെ ഉറക്കുന്നതും ഉണര്‍ത്തുന്നതും സിസ്റ്റം പോളിസി "
+"തടയുന്നു"
 
-#: ../policy/org.freedesktop.NetworkManager.policy.in.h:5
+#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:5
 msgid "Enable or disable WiFi devices"
-msgstr " WiFi ഡിവൈസുകള്‍ പ്രവര്‍ത്തനസജ്ജമാക്കുകയോ പ്രവര്‍ത്തനരഹിതമാക്കുകയോ ചെയ്യുക"
+msgstr ""
+" WiFi ഡിവൈസുകള്‍ പ്രവര്‍ത്തനസജ്ജമാക്കുകയോ പ്രവര്‍ത്തനരഹിതമാക്കുകയോ ചെയ്യുക"
 
-#: ../policy/org.freedesktop.NetworkManager.policy.in.h:6
+#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:6
 msgid "System policy prevents enabling or disabling WiFi devices"
 msgstr ""
-"WiFi ഡിവൈസുകള്‍ പ്രവര്‍ത്തനസജ്ജമാക്കുകയോ പ്രവര്‍ത്തനരഹിതമാക്കുകയോ ചെയ്യുന്നത് സിസ്റ്റം പോളിസി തടയുന്നു"
+"WiFi ഡിവൈസുകള്‍ പ്രവര്‍ത്തനസജ്ജമാക്കുകയോ പ്രവര്‍ത്തനരഹിതമാക്കുകയോ ചെയ്യുന്നത് "
+"സിസ്റ്റം പോളിസി തടയുന്നു"
 
-#: ../policy/org.freedesktop.NetworkManager.policy.in.h:7
+#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:7
 msgid "Enable or disable mobile broadband devices"
-msgstr "മുബൈല്‍ ബ്രോഡ്ബാന്റ് ഡിവൈസുകള്‍ പ്രവര്‍ത്തനസജ്ജമാക്കുകയോ പ്രവര്‍ത്തനരഹിതമാക്കുകയോ ചെയ്യുക"
+msgstr ""
+"മുബൈല്‍ ബ്രോഡ്ബാന്റ് ഡിവൈസുകള്‍ പ്രവര്‍ത്തനസജ്ജമാക്കുകയോ "
+"പ്രവര്‍ത്തനരഹിതമാക്കുകയോ ചെയ്യുക"
 
-#: ../policy/org.freedesktop.NetworkManager.policy.in.h:8
+#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:8
 msgid "System policy prevents enabling or disabling mobile broadband devices"
 msgstr ""
-"മുബൈല്‍ ബ്രോഡ്ബാന്റ് ഡിവൈസുകള്‍ പ്രവര്‍ത്തനസജ്ജമാക്കുകയോ പ്രവര്‍ത്തനരഹിതമാക്കുകയോ ചെയ്യുന്നത് സിസ്റ്റം "
+"മുബൈല്‍ ബ്രോഡ്ബാന്റ് ഡിവൈസുകള്‍ പ്രവര്‍ത്തനസജ്ജമാക്കുകയോ "
+"പ്രവര്‍ത്തനരഹിതമാക്കുകയോ ചെയ്യുന്നത് സിസ്റ്റം "
 "പോളിസി തടയുന്നു"
 
-#: ../policy/org.freedesktop.NetworkManager.policy.in.h:9
+#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:9
 msgid "Enable or disable WiMAX mobile broadband devices"
-msgstr "WiMAX മുബൈല്‍ ബ്രോഡ്ബാന്റ് ഡിവൈസുകള്‍ പ്രവര്‍ത്തനസജ്ജമാക്കുകയോ പ്രവര്‍ത്തനരഹിതമാക്കുകയോ ചെയ്യുക"
+msgstr ""
+"WiMAX മുബൈല്‍ ബ്രോഡ്ബാന്റ് ഡിവൈസുകള്‍ പ്രവര്‍ത്തനസജ്ജമാക്കുകയോ "
+"പ്രവര്‍ത്തനരഹിതമാക്കുകയോ ചെയ്യുക"
 
-#: ../policy/org.freedesktop.NetworkManager.policy.in.h:10
+#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:10
 msgid ""
 "System policy prevents enabling or disabling WiMAX mobile broadband devices"
 msgstr ""
-"iMAX മുബൈല്‍ ബ്രോഡ്ബാന്റ് ഡിവൈസുകള്‍ പ്രവര്‍ത്തനസജ്ജമാക്കുകയോ പ്രവര്‍ത്തനരഹിതമാക്കുകയോ ചെയ്യുന്നത് "
+"iMAX മുബൈല്‍ ബ്രോഡ്ബാന്റ് ഡിവൈസുകള്‍ പ്രവര്‍ത്തനസജ്ജമാക്കുകയോ "
+"പ്രവര്‍ത്തനരഹിതമാക്കുകയോ ചെയ്യുന്നത് "
 "സിസ്റ്റം പോളിസി തടയുന്നു"
 
-#: ../policy/org.freedesktop.NetworkManager.policy.in.h:11
+#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:11
 msgid "Allow control of network connections"
 msgstr "നെറ്റ്​വര്‍ക്ക് കണക്ഷനുകളെ നിയന്ത്രിക്കുന്നത് അനുവദിക്കുക"
 
-#: ../policy/org.freedesktop.NetworkManager.policy.in.h:12
+#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:12
 msgid "System policy prevents control of network connections"
-msgstr " നെറ്റ്​വര്‍ക്ക് കണക്ഷനുകളെ നിയന്ത്രിക്കുന്നത് സിസ്റ്റം പോളിസി തടയുന്നു"
+msgstr ""
+" നെറ്റ്​വര്‍ക്ക് കണക്ഷനുകളെ നിയന്ത്രിക്കുന്നത് സിസ്റ്റം പോളിസി തടയുന്നു"
 
-#: ../policy/org.freedesktop.NetworkManager.policy.in.h:13
+#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:13
 msgid "Connection sharing via a protected WiFi network"
 msgstr "സുരക്ഷിതമായ ഒരു വൈഫൈ നെറ്റ്‌വര്‍ക്ക് വഴി കണക്ഷന്‍ പങ്കിടുക"
 
-#: ../policy/org.freedesktop.NetworkManager.policy.in.h:14
+#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:14
 msgid "System policy prevents sharing connections via a protected WiFi network"
-msgstr "സുരക്ഷിതമായ ഒരു വൈഫൈ നെറ്റ്‌വര്‍ക്ക് വഴി കണക്ഷനുകള്‍ പങ്കിടുന്നതു് സിസ്റ്റം പോളിസി തടയുന്നു"
+msgstr ""
+"സുരക്ഷിതമായ ഒരു വൈഫൈ നെറ്റ്‌വര്‍ക്ക് വഴി കണക്ഷനുകള്‍ പങ്കിടുന്നതു് സിസ്റ്റം "
+"പോളിസി തടയുന്നു"
 
-#: ../policy/org.freedesktop.NetworkManager.policy.in.h:15
+#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:15
 msgid "Connection sharing via an open WiFi network"
 msgstr "ഒരു തുറന്ന വൈഫൈ നെറ്റ്‌വര്‍ക്ക് വഴി കണക്ഷന്‍ പങ്കിടുക"
 
-#: ../policy/org.freedesktop.NetworkManager.policy.in.h:16
+#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:16
 msgid "System policy prevents sharing connections via an open WiFi network"
-msgstr "ഒരു തുറന്ന വൈഫൈ നെറ്റ്‌വര്‍ക്ക് വഴി കണക്ഷനുകള്‍ പങ്കിടുന്നതു് സിസ്റ്റം പോളിസി തടയുന്നു"
+msgstr ""
+"ഒരു തുറന്ന വൈഫൈ നെറ്റ്‌വര്‍ക്ക് വഴി കണക്ഷനുകള്‍ പങ്കിടുന്നതു് സിസ്റ്റം പോളിസി "
+"തടയുന്നു"
 
-#: ../policy/org.freedesktop.NetworkManager.policy.in.h:17
+#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:17
 msgid "Modify personal network connections"
 msgstr "സ്വന്തമായ നെറ്റ്​വര്‍ക്ക് കണക്ഷനുകളില്‍ മാറ്റം വരുത്തുക"
 
-#: ../policy/org.freedesktop.NetworkManager.policy.in.h:18
+#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:18
 msgid "System policy prevents modification of personal network settings"
-msgstr " സ്വന്തമായ നെറ്റ്​വര്‍ക്ക് സജ്ജീകരണങ്ങള്‍ മാറ്റം വരുത്തുന്നതു് സിസ്റ്റം പോളിസി തടയുന്നു"
+msgstr ""
+" സ്വന്തമായ നെറ്റ്​വര്‍ക്ക് സജ്ജീകരണങ്ങള്‍ മാറ്റം വരുത്തുന്നതു് സിസ്റ്റം "
+"പോളിസി തടയുന്നു"
 
-#: ../policy/org.freedesktop.NetworkManager.policy.in.h:19
-#, fuzzy
-#| msgid "Modify system connections"
+#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:19
 msgid "Modify network connections for all users"
-msgstr "സിസ്റ്റം കണക്ഷനുകളില്‍ മാറ്റം വരുത്തുക"
+msgstr "എല്ലാ ഉപയോക്തള്‍ക്കുള്ള നെറ്റ്‌വര്‍ക്ക് കണക്ഷനുകളില്‍ മാറ്റം വരുത്തുക"
 
-#: ../policy/org.freedesktop.NetworkManager.policy.in.h:20
-#, fuzzy
-#| msgid "System policy prevents modification of system settings"
+#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:20
 msgid "System policy prevents modification of network settings for all users"
-msgstr " സിസ്റ്റത്തിന്റെ സജ്ജീകരണങ്ങളില്‍ മാറ്റം വരുത്തുന്നതു് സിസ്റ്റം പോളിസി തടയുന്നു"
+msgstr ""
+"സിസ്റ്റത്തിന്റെ സജ്ജീകരണങ്ങളില്‍ മാറ്റം വരുത്തുന്നതു് സിസ്റ്റം പോളിസി തടയുന്നു"
 
-#: ../policy/org.freedesktop.NetworkManager.policy.in.h:21
+#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:21
 msgid "Modify persistent system hostname"
 msgstr "സിസ്റ്റത്തിന്റെ ഹോസ്റ്റ്നാമത്തില്‍ മാറ്റം വരുത്തുക"
 
-#: ../policy/org.freedesktop.NetworkManager.policy.in.h:22
+#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:22
 msgid "System policy prevents modification of the persistent system hostname"
-msgstr "സിസ്റ്റത്തിന്റെ ഹോസ്റ്റ്നാമത്തില്‍ മാറ്റം വരുത്തുന്നതു് സിസ്റ്റം പോളിസി തടയുന്നു"
+msgstr ""
+"സിസ്റ്റത്തിന്റെ ഹോസ്റ്റ്നാമത്തില്‍ മാറ്റം വരുത്തുന്നതു് സിസ്റ്റം പോളിസി "
+"തടയുന്നു"
+
+#: ../src/main.c:158
+#, c-format
+msgid "Failed to set signal mask: %d"
+msgstr "സിഗ്നല്‍ മാസ്ക് സജ്ജമാക്കുന്നതില്‍ പരാജയപ്പെട്ടു: %d."
 
-#: ../src/main.c:143
+#: ../src/main.c:167
 #, c-format
-msgid "Failed to initialize SIGTERM pipe: %d"
-msgstr "SIGTERM പൈപ് ആരംഭിക്കുന്നതില്‍ പരാജയപ്പെട്ടു: %d"
+msgid "Failed to create signal handling thread: %d"
+msgstr "സിഗ്നല്‍ കൈകാര്യം ചെയ്യുന്ന സിഗ്നല്‍ തയ്യാറാക്കുന്നതില്‍ പരാജയം: %d"
 
-#: ../src/main.c:174
+#: ../src/main.c:182
 #, c-format
 msgid "Opening %s failed: %s\n"
 msgstr "%s തുറക്കുന്നതില്‍ പരാജയപ്പെട്ടു: %s\n"
 
-#: ../src/main.c:180
+#: ../src/main.c:188
 #, c-format
 msgid "Writing to %s failed: %s\n"
 msgstr "%s ഇലേക്കു എഴുതുന്നത് പരാജയപ്പെട്ടു: %s\n"
 
-#: ../src/main.c:185
+#: ../src/main.c:193
 #, c-format
 msgid "Closing %s failed: %s\n"
 msgstr "%s അടയ്ക്കുന്നത് പരാജയപ്പെട്ടു: %s\n"
 
-#: ../src/main.c:228
+#: ../src/main.c:236
 #, c-format
 msgid "NetworkManager is already running (pid %ld)\n"
-msgstr "നെറ്റ്​വര്‍ക്ക് മാനേജര്‍ ആദ്യമേ പ്രവര്‍ത്തിച്ചുകൊണ്ടിരിക്കുന്നുണ്ട് (pid %ld)\n"
+msgstr ""
+"നെറ്റ്​വര്‍ക്ക് മാനേജര്‍ ആദ്യമേ പ്രവര്‍ത്തിച്ചുകൊണ്ടിരിക്കുന്നുണ്ട് (pid %"
+"ld)\n"
 
-#: ../src/main.c:368
+#: ../src/main.c:363
 msgid "Print NetworkManager version and exit"
 msgstr "നെറ്റ്‌വര്‍ക്ക്മാനേജറിന്റെ പതിപ്പ് വിവരം കാണിച്ചു പുറത്തു കടക്കുക"
 
-#: ../src/main.c:369
+#: ../src/main.c:364
 msgid "Don't become a daemon"
-msgstr ""
+msgstr "ഒരു ഡെമണ്‍ ആകേണ്ട"
 
-#: ../src/main.c:370
+#: ../src/main.c:365
 msgid "Make all warnings fatal"
 msgstr "എല്ലാ മുന്നറിയിപ്പുകളും സുപ്രധാനമാക്കുക"
 
-#: ../src/main.c:371
+#: ../src/main.c:366
 msgid "Specify the location of a PID file"
-msgstr ""
+msgstr "PID ഫയലിന്റെ സ്ഥാനം നല്‍കുക"
 
-#: ../src/main.c:371
+#: ../src/main.c:366
 msgid "filename"
 msgstr "പ്രമാണനാമം"
 
-#: ../src/main.c:372
+#: ../src/main.c:367
 msgid "State file location"
 msgstr "പ്രമാണത്തിന്റെ സ്ഥാനം പ്രസ്താവിക്കുക"
 
-#: ../src/main.c:372
+#: ../src/main.c:367
 msgid "/path/to/state.file"
 msgstr "/path/to/state.file"
 
-#: ../src/main.c:373
+#: ../src/main.c:368
 msgid "Config file location"
 msgstr "ക്രമീകരണ പ്രമാണത്തിന്റെ സ്ഥാനം"
 
-#: ../src/main.c:373
+#: ../src/main.c:368
 msgid "/path/to/config.file"
 msgstr "/path/to/config.file"
 
-#: ../src/main.c:374
+#: ../src/main.c:369
 msgid "List of plugins separated by ','"
-msgstr ""
+msgstr "',' ഉപയോഗിച്ചു് വേര്‍തിരിയ്ക്കുന്ന പ്ലഗിനുകളുടെ പട്ടിക"
 
-#: ../src/main.c:374
+#: ../src/main.c:369
 msgid "plugin1,plugin2"
 msgstr "plugin1,plugin2"
 
 #. Translators: Do not translate the values in the square brackets
-#: ../src/main.c:376
+#: ../src/main.c:371
 msgid "Log level: one of [ERR, WARN, INFO, DEBUG]"
-msgstr ""
+msgstr "[ERR, WARN, INFO, DEBUG]-ന്റെ ലോഗ് ലവല്‍ ഒണ്‍"
 
 #. Translators: Do not translate the values in the square brackets
-#: ../src/main.c:379
+#: ../src/main.c:374
 msgid ""
 "Log domains separated by ',': any combination of\n"
-"                                          [NONE,HW,RFKILL,ETHER,WIFI,BT,MB,"
-"DHCP4,DHCP6,PPP,\n"
-"                                           WIFI_SCAN,IP4,IP6,AUTOIP4,DNS,VPN,"
-"SHARING,SUPPLICANT,\n"
-"                                           AGENTS,SETTINGS,SUSPEND,CORE,"
-"DEVICE,OLPC,WIMAX,\n"
-"                                           INFINIBAND,FIREWALL]"
+"                                                [NONE,HW,RFKILL,ETHER,WIFI,"
+"BT,MB,DHCP4,DHCP6,PPP,\n"
+"                                                 WIFI_SCAN,IP4,IP6,AUTOIP4,"
+"DNS,VPN,SHARING,SUPPLICANT,\n"
+"                                                 AGENTS,SETTINGS,SUSPEND,"
+"CORE,DEVICE,OLPC,WIMAX,\n"
+"                                                 INFINIBAND,FIREWALL,ADSL]"
 msgstr ""
+"Log domains separated by ',': any combination of\n"
+"                                                [NONE,HW,RFKILL,ETHER,WIFI,"
+"BT,MB,DHCP4,DHCP6,PPP,\n"
+"                                                 WIFI_SCAN,IP4,IP6,AUTOIP4,"
+"DNS,VPN,SHARING,SUPPLICANT,\n"
+"                                                 AGENTS,SETTINGS,SUSPEND,"
+"CORE,DEVICE,OLPC,WIMAX,\n"
+"                                                 INFINIBAND,FIREWALL,ADSL]"
+
+#: ../src/main.c:380
+msgid "An http(s) address for checking internet connectivity"
+msgstr "ഇന്റര്‍നെറ്റ് കണക്റ്റിവിറ്റി പരിശോധിയ്ക്കുന്നതിനുള്ള http വിലാസം"
+
+#: ../src/main.c:381
+msgid "The interval between connectivity checks (in seconds)"
+msgstr "കണക്റ്റിവിറ്റി പരിശോധനകളുടെ ഇടവേള (സെക്കന്‍ഡുകളില്‍)"
 
-#: ../src/main.c:392
+#: ../src/main.c:382
+msgid "The expected start of the response"
+msgstr "മറുപടിയുടെ പ്രതീക്ഷിച്ച ആരംഭം"
+
+#: ../src/main.c:382
+msgid "Bingo!"
+msgstr "ഹുറേ!!"
+
+#: ../src/main.c:387
 #, c-format
 msgid "GModules are not supported on your platform!\n"
-msgstr ""
+msgstr "ഈ പ്ലാറ്റ്ഫോമില്‍ GModules പിന്തണയ്ക്കുന്നില്ല!\n"
 
-#: ../src/main.c:411
+#: ../src/main.c:406
 msgid ""
 "NetworkManager monitors all network connections and automatically\n"
 "chooses the best connection to use.  It also allows the user to\n"
 "specify wireless access points which wireless cards in the computer\n"
 "should associate with."
 msgstr ""
+"NetworkManager എല്ലാ നെറ്റ്‌വര്‍ക്ക് കണക്ഷനുകളും നിരീക്ഷിച്ചു്, "
+"ഓട്ടോമാറ്റിയ്ക്കായി\n"
+"ഉപയോഗിയ്ക്കുവാന്‍ ഉത്തമമായ കണക്ഷന്‍ തെരഞ്ഞെടുക്കുന്നു. കമ്പ്യൂട്ടറിലുള്ള "
+"വയര്‍ലെസ്സ്\n"
+"കാര്‍ഡുകള്‍ക്കുള്ള വയര്‍ലെസ്സ് ആക്സസ്സ് പോയിന്റുകള്‍ നല്‍കുവാന്‍ ഇതു്\n"
+"ഉപയോക്താവിനെ സഹായിയ്ക്കുന്നു."
 
-#: ../src/main.c:417
+#: ../src/main.c:412
 #, c-format
 msgid "Invalid option.  Please use --help to see a list of valid options.\n"
-msgstr "തെറ്റായ ഉപാധി.  ശരിയായ കൂടുതല്‍ ഉപാധികള്‍ക്കായി ദയവായി --help ഉപയോഗിക്കുക.\n"
+msgstr ""
+"തെറ്റായ ഉപാധി.  ശരിയായ കൂടുതല്‍ ഉപാധികള്‍ക്കായി ദയവായി --help ഉപയോഗിക്കുക.\n"
 
-#: ../src/main.c:427
+#: ../src/main.c:422
 #, c-format
 msgid "You must be root to run NetworkManager!\n"
-msgstr "പിശക്: നെറ്റ്‌വര്‍ക്ക്മാനേജര്‍ പ്രവര്‍ത്തിക്കാന്‍ നിങ്ങള്‍ root ആയിരിക്കേണ്ടത് അത്യാവശ്യമാണ്\n"
+msgstr ""
+"പിശക്: നെറ്റ്‌വര്‍ക്ക്മാനേജര്‍ പ്രവര്‍ത്തിക്കാന്‍ നിങ്ങള്‍ root "
+"ആയിരിക്കേണ്ടത് അത്യാവശ്യമാണ്\n"
 
-#: ../src/main.c:448
+#: ../src/main.c:449
 #, c-format
 msgid "Failed to read configuration: (%d) %s\n"
 msgstr "ക്രമീകരണങ്ങള്‍ വായിക്കുന്നതില്‍ പരാജയപ്പെട്ടു: (%d) %s\n"
 
-#: ../src/main.c:459
+#: ../src/main.c:460
 #, c-format
 msgid "%s.  Please use --help to see a list of valid options.\n"
 msgstr "%s.  ശരിയായ കൂടുതല്‍ ഉപാധികള്‍ക്കായി ദയവായി --help ഉപയോഗിക്കുക.\n"
 
-#: ../src/main.c:466
+#: ../src/main.c:467
 #, c-format
 msgid "State file %s parsing failed: (%d) %s\n"
-msgstr ""
+msgstr "അവസ്ഥ ഫയല്‍ %s പാഴ്സിങ് പരാജയം: (%d) %s\n"
 
-#: ../src/main.c:483
+#: ../src/main.c:484
 #, c-format
 msgid "Could not daemonize: %s [error %u]\n"
-msgstr ""
+msgstr "ഡെമണൈസ് ചെയ്യുവാന്‍ സാധ്യമല്ല: %s [error %u]\n"
 
-#: ../src/dhcp-manager/nm-dhcp-dhclient-utils.c:62
+#: ../src/dhcp-manager/nm-dhcp-dhclient-utils.c:61
 msgid "# Created by NetworkManager\n"
 msgstr "# തയ്യാറാക്കിയതു് NetworkManager\n"
 
-#: ../src/dhcp-manager/nm-dhcp-dhclient-utils.c:69
+#: ../src/dhcp-manager/nm-dhcp-dhclient-utils.c:68
 #, c-format
 msgid ""
 "# Merged from %s\n"
@@ -2394,55 +2723,61 @@ msgstr "'dhcpcd' ലഭ്യമായില്ല."
 msgid "unsupported DHCP client '%s'"
 msgstr "പിന്തണലഭ്യമല്ലാത്ത DHCP ക്ലയന്റ് '%s'"
 
-#: ../src/dns-manager/nm-dns-manager.c:376
+#: ../src/dns-manager/nm-dns-manager.c:375
 msgid "NOTE: the libc resolver may not support more than 3 nameservers."
-msgstr "കുറിപ്പു്: libc റിസോള്‍വര്‍ 3 നെയിംസര്‍വറുകളില്‍ കൂടതല്‍ പിന്തുണയ്ക്കുന്നതല്ല."
+msgstr ""
+"കുറിപ്പു്: libc റിസോള്‍വര്‍ 3 നെയിംസര്‍വറുകളില്‍ കൂടതല്‍ പിന്തുണയ്ക്കുന്നതല്ല."
 
-#: ../src/dns-manager/nm-dns-manager.c:378
+#: ../src/dns-manager/nm-dns-manager.c:377
 msgid "The nameservers listed below may not be recognized."
 msgstr "താഴെ പറഞ്ഞിരിക്കുന്ന നെയിംസര്‍വറുകള്‍ തിരിച്ചറിയപ്പെടുന്നവയല്ല."
 
-#: ../src/logging/nm-logging.c:130
+#: ../src/logging/nm-logging.c:142
 #, c-format
 msgid "Unknown log level '%s'"
 msgstr "അപരിചതമായ ലോഗ് ലവല്‍ '%s'"
 
-#: ../src/logging/nm-logging.c:155
+#: ../src/logging/nm-logging.c:181
 #, c-format
 msgid "Unknown log domain '%s'"
 msgstr "അപരിചിതമായ ലോഗ് ഡൊമെയിന്‍ '%s'"
 
-#: ../src/modem-manager/nm-modem-cdma.c:279 ../src/nm-device-bt.c:325
+#: ../src/modem-manager/nm-modem-cdma.c:280 ../src/nm-device-bt.c:351
 #, c-format
 msgid "CDMA connection %d"
 msgstr "CDMA കണക്ഷന്‍ %d"
 
-#: ../src/modem-manager/nm-modem-gsm.c:512 ../src/nm-device-bt.c:321
+#: ../src/modem-manager/nm-modem-gsm.c:558 ../src/nm-device-bt.c:347
 #, c-format
 msgid "GSM connection %d"
 msgstr "GSM കണക്ഷന്‍ %d"
 
-#: ../src/nm-device-bond.c:190
+#: ../src/nm-device-bond.c:192
 #, c-format
 msgid "Bond connection %d"
 msgstr "Bond കണക്ഷന്‍ %d"
 
-#: ../src/nm-device-bt.c:296
+#: ../src/nm-device-adsl.c:193
+#, c-format
+msgid "ADSL connection %d"
+msgstr "ADSL കണക്ഷന്‍ %d"
+
+#: ../src/nm-device-bt.c:322
 #, c-format
 msgid "PAN connection %d"
 msgstr "PAN കണക്ഷന്‍ %d"
 
-#: ../src/nm-device-bt.c:329
+#: ../src/nm-device-bt.c:355
 #, c-format
 msgid "DUN connection %d"
 msgstr "DUN കണക്ഷന്‍ %d"
 
-#: ../src/nm-device-ethernet.c:1433
+#: ../src/nm-device-ethernet.c:1326
 #, c-format
 msgid "PPPoE connection %d"
 msgstr "PPPoE കണക്ഷന്‍ %d"
 
-#: ../src/nm-device-ethernet.c:1433 ../src/settings/nm-settings-utils.c:50
+#: ../src/nm-device-ethernet.c:1326 ../src/settings/nm-settings-utils.c:50
 #, c-format
 msgid "Wired connection %d"
 msgstr "Wired കണക്ഷന്‍ %d"
@@ -2452,12 +2787,17 @@ msgstr "Wired കണക്ഷന്‍ %d"
 msgid "InfiniBand connection %d"
 msgstr "InfiniBand കണക്ഷന്‍ %d"
 
-#: ../src/nm-device-olpc-mesh.c:293
+#: ../src/nm-device-olpc-mesh.c:311
 #, c-format
 msgid "Mesh %d"
 msgstr "മെഷ് %d"
 
-#: ../src/nm-manager.c:657
+#: ../src/nm-device-vlan.c:362
+#, c-format
+msgid "VLAN connection %d"
+msgstr "VLAN കണക്ഷന്‍ %d"
+
+#: ../src/nm-manager.c:662
 #, c-format
 msgid "VPN connection %d"
 msgstr "വിപിഎന്‍  കണക്ഷന്‍ %d"
@@ -2475,7 +2815,9 @@ msgstr "സോക്കറ്റില്‍ ഡേറ്റായ്ക്ക
 #: ../src/nm-netlink-monitor.c:296
 #, c-format
 msgid "unable to connect to netlink for monitoring link status: %s"
-msgstr "ലിങ്കിന്റെ അവസ്ഥ നിരീക്ഷിക്കുന്നതിനുള്ള നെറ്റ്ലിങ്കുമായി കണക്ട് ചെയ്യുവാന്‍ സാധ്യമല്ല: %s"
+msgstr ""
+"ലിങ്കിന്റെ അവസ്ഥ നിരീക്ഷിക്കുന്നതിനുള്ള നെറ്റ്ലിങ്കുമായി കണക്ട് ചെയ്യുവാന്‍ "
+"സാധ്യമല്ല: %s"
 
 #: ../src/nm-netlink-monitor.c:307
 #, c-format
@@ -2485,13 +2827,16 @@ msgstr "നെറ്റ്ലിങ്ക് ഹാന്‍ഡില്‍ അ
 #: ../src/nm-netlink-monitor.c:330 ../src/nm-netlink-monitor.c:390
 #, c-format
 msgid "unable to allocate netlink handle for monitoring link status: %s"
-msgstr "ലിങ്കിന്റെ അവസ്ഥ നിരീക്ഷിക്കുന്നതിനുള്ള നെറ്റ്ലിങ്ക് ഹാന്‍ഡില്‍ അനുവദിക്കുവാന്‍ സാധ്യമല്ല: %s"
+msgstr ""
+"ലിങ്കിന്റെ അവസ്ഥ നിരീക്ഷിക്കുന്നതിനുള്ള നെറ്റ്ലിങ്ക് ഹാന്‍ഡില്‍ "
+"അനുവദിക്കുവാന്‍ സാധ്യമല്ല: %s"
 
 #: ../src/nm-netlink-monitor.c:415
 #, c-format
 msgid "unable to allocate netlink link cache for monitoring link status: %s"
 msgstr ""
-"ലിങ്കിന്റെ അവസ്ഥ നിരീക്ഷിക്കുന്നതിനുള്ള നെറ്റ്ലിങ്ക് ലിങ്ക് കാഷേ അനുവദിക്കുവാന്‍ സാധ്യമല്ല: %s "
+"ലിങ്കിന്റെ അവസ്ഥ നിരീക്ഷിക്കുന്നതിനുള്ള നെറ്റ്ലിങ്ക് ലിങ്ക് കാഷേ "
+"അനുവദിക്കുവാന്‍ സാധ്യമല്ല: %s "
 
 #: ../src/nm-netlink-monitor.c:542
 #, c-format
@@ -2503,15 +2848,66 @@ msgstr "നെറ്റ്ലിങ്ക് ഗ്രൂപ്പില്‍ 
 msgid "error updating link cache: %s"
 msgstr "ലിങ്ക് കാഷേ പരിഷ്കരിക്കുന്നതില്‍ പിശക്: %s"
 
-#: ../src/settings/plugins/ifcfg-rh/reader.c:92
-#: ../src/settings/plugins/ifnet/connection_parser.c:51
+#: ../src/settings/plugins/ifcfg-rh/reader.c:93
 msgid "System"
 msgstr "സിസ്റ്റം"
 
-#: ../src/settings/plugins/ifcfg-rh/reader.c:3672
+#: ../src/settings/plugins/ifcfg-rh/reader.c:3663
 msgid "Bond"
 msgstr "Bond"
 
+#: ../test/nm-online.c:111
+#, c-format
+msgid "\rConnecting"
+msgstr "\rകണക്ട് ചെയ്യുന്നു"
+
+#: ../test/nm-online.c:142
+msgid "Time to wait for a connection, in seconds (default is 30)"
+msgstr ""
+"ഒരു കണക്ഷനു് വേണ്ടി കാത്തിരിയ്ക്കുവാനുള്ള സമയം, സെക്കന്റുകളില്‍ (സ്വതവേ 30)"
+
+#: ../test/nm-online.c:143
+msgid "Exit immediately if NetworkManager is not running or connecting"
+msgstr ""
+"NetworkManager പ്രവര്‍ത്തനത്തിലില്ലെങ്കില്‍ ഉടന്‍ തന്നെ പുറത്തു് കടക്കുക"
+
+#: ../test/nm-online.c:144
+msgid "Don't print anything"
+msgstr "ഒന്നും പ്രിന്റ് ചെയ്യേണ്ട"
+
+#: ../test/nm-online.c:162
+msgid "Waits for a successful connection in NetworkManager."
+msgstr "NetworkManager-ല്‍ വിജയകരമായൊരു കണക്ഷനു് വേണ്ടി കാത്തിരിയ്ക്കുന്നു."
+
+#: ../test/nm-online.c:168 ../test/nm-online.c:177
+msgid "Invalid option.  Please use --help to see a list of valid options."
+msgstr ""
+"തെറ്റായ ഉപാധി.  ശരിയായ കൂടുതല്‍ ഉപാധികള്‍ക്കായി ദയവായി --help ഉപയോഗിക്കുക."
+
+#~ msgid "state: %s\n"
+#~ msgstr "അവസ്ഥ: %s\n"
+
+#~ msgid "Connection activated\n"
+#~ msgstr "കണക്ഷന്‍ സജീവമാക്കിയിരിക്കുന്നു\n"
+
+#~ msgid "state: %s (%d)\n"
+#~ msgstr "അവസ്ഥ: %s (%d)\n"
+
+#~ msgid "Active connection state: %s\n"
+#~ msgstr "സജീവമായ കണക്ഷന്റെ അവസ്ഥ: %s\n"
+
+#~ msgid "Active connection path: %s\n"
+#~ msgstr "സജീവമായ കണക്ഷന്‍ പാഥ്: %s\n"
+
+#~ msgid "Device state: %d (%s)\n"
+#~ msgstr "ഡിവൈസിന്റെ അവസ്ഥ: %d (%s)\n"
+
+#~ msgid "not set"
+#~ msgstr "സജ്ജമല്ല"
+
+#~ msgid "Failed to initialize SIGTERM pipe: %d"
+#~ msgstr "SIGTERM പൈപ് ആരംഭിക്കുന്നതില്‍ പരാജയപ്പെട്ടു: %d"
+
 #~ msgid "SCOPE"
 #~ msgstr "SCOPE"
 
diff --git a/po/mr.po b/po/mr.po
index 4065a8d8..1e465d85 100644
--- a/po/mr.po
+++ b/po/mr.po
@@ -2,997 +2,1458 @@
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
 #
-# Sandeep Shedmake , 2009.
-# Sandeep Shedmake , 2010, 2011.
+# Sandeep Shedmake , 2009.
+# Sandeep Shedmake , 2010, 2011, 2012.
 msgid ""
 msgstr ""
 "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"
+"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
+"product=NetworkManager&keywords=I18N+L10N&component=general\n"
+"POT-Creation-Date: 2012-11-13 15:25+0000\n"
+"PO-Revision-Date: 2012-11-22 13:46+0530\n"
 "Last-Translator: Sandeep Shedmake \n"
-"Language-Team: Marathi \n"
+"Language-Team: Marathi \n"
+"Language: mr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: KBabel 1.11.4\n"
+"X-Generator: Lokalize 1.5\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"
+#: ../cli/src/common.c:32 ../cli/src/common.c:44 ../cli/src/common.c:52
+#: ../cli/src/common.c:63 ../cli/src/connections.c:128
+#: ../cli/src/connections.c:162
+msgid "GROUP"
+msgstr "GROUP"
 
 #. 0
-#: ../cli/src/connections.c:65 ../cli/src/connections.c:79
-msgid "UUID"
-msgstr "UUID"
+#: ../cli/src/common.c:33 ../cli/src/common.c:53
+msgid "ADDRESS"
+msgstr "ADDRESS"
 
 #. 1
-#: ../cli/src/connections.c:66
-msgid "DEVICES"
-msgstr "DEVICES"
+#: ../cli/src/common.c:34 ../cli/src/common.c:54
+msgid "ROUTE"
+msgstr "ROUTE"
 
 #. 2
-#: ../cli/src/connections.c:67
-msgid "DEFAULT"
-msgstr "DEFAULT"
+#: ../cli/src/common.c:35 ../cli/src/common.c:55
+msgid "DNS"
+msgstr "DNS"
 
 #. 3
-#: ../cli/src/connections.c:68
-msgid "SPEC-OBJECT"
-msgstr "SPEC-OBJECT"
+#: ../cli/src/common.c:36 ../cli/src/common.c:56
+msgid "DOMAIN"
+msgstr "DOMAIN"
 
 #. 4
-#: ../cli/src/connections.c:69
-msgid "VPN"
-msgstr "VPN"
+#: ../cli/src/common.c:37
+msgid "WINS"
+msgstr "WINS"
 
-#. 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"
+#. 0
+#: ../cli/src/common.c:45 ../cli/src/common.c:64
+msgid "OPTION"
+msgstr "OPTION"
+
+#: ../cli/src/common.c:366
+msgid "unmanaged"
+msgstr "अव्यवस्थापीत"
+
+#: ../cli/src/common.c:368
+msgid "unavailable"
+msgstr "अनुपल्बध"
+
+#: ../cli/src/common.c:370 ../cli/src/network-manager.c:120
+msgid "disconnected"
+msgstr "खंडीत"
+
+#: ../cli/src/common.c:372
+msgid "connecting (prepare)"
+msgstr "जोडणी (तयार करत आहे)"
+
+#: ../cli/src/common.c:374
+msgid "connecting (configuring)"
+msgstr "जोडणी (संरचीत करत आहे)"
+
+#: ../cli/src/common.c:376
+msgid "connecting (need authentication)"
+msgstr "जोडणी (ओळख पटवणे आवश्यक आहे)"
+
+#: ../cli/src/common.c:378
+msgid "connecting (getting IP configuration)"
+msgstr "जोडणी (IP संरचना प्राप्त करत आहे)"
+
+#: ../cli/src/common.c:380
+msgid "connecting (checking IP connectivity)"
+msgstr "जोडणी करत आहे (IP जोडणी तपासत आहे)"
+
+#: ../cli/src/common.c:382
+msgid "connecting (starting secondary connections)"
+msgstr "जोडणी (दुसरी जोडणी सुरू करत आहे)"
+
+#: ../cli/src/common.c:384 ../cli/src/network-manager.c:116
+msgid "connected"
+msgstr "जोडणी यशस्वी"
+
+#: ../cli/src/common.c:386 ../cli/src/connections.c:635
+msgid "deactivating"
+msgstr "बंद करत आहे"
+
+#: ../cli/src/common.c:388
+msgid "connection failed"
+msgstr "जोडणी अपयशी"
+
+#: ../cli/src/common.c:390 ../cli/src/connections.c:638
+#: ../cli/src/connections.c:661 ../cli/src/connections.c:1353
+#: ../cli/src/devices.c:645 ../cli/src/network-manager.c:123
+#: ../cli/src/network-manager.c:185 ../cli/src/network-manager.c:188
+#: ../cli/src/network-manager.c:197 ../cli/src/network-manager.c:257
+#: ../cli/src/network-manager.c:273 ../cli/src/network-manager.c:431
+#: ../cli/src/network-manager.c:486 ../cli/src/network-manager.c:524
+#: ../cli/src/network-manager.c:563 ../cli/src/settings.c:593
+#: ../cli/src/settings.c:621 ../cli/src/utils.c:531 ../src/main.c:451
+#: ../src/main.c:470
+msgid "unknown"
+msgstr "अपरिचीत"
+
+#: ../cli/src/common.c:399
+msgid "No reason given"
+msgstr "कारण दिले नाही"
+
+#: ../cli/src/common.c:402
+msgid "Unknown error"
+msgstr "अपरिचीत त्रुटी"
+
+#: ../cli/src/common.c:405
+msgid "Device is now managed"
+msgstr "साधन आता व्यवस्थापीत आहे"
+
+#: ../cli/src/common.c:408
+msgid "Device is now unmanaged"
+msgstr "साधन आता व्यवस्थापन अशक्य आहे"
+
+#: ../cli/src/common.c:411
+msgid "The device could not be readied for configuration"
+msgstr "साधनाला संरचनाकरीता सज्ज करणे अशक्य"
+
+#: ../cli/src/common.c:414
+msgid ""
+"IP configuration could not be reserved (no available address, timeout, etc.)"
+msgstr "IP संरचना आरक्षित (पत्ता, वेळसमाप्ति, इत्यादि अनुपलब्ध) करणे अशक्य"
+
+#: ../cli/src/common.c:417
+msgid "The IP configuration is no longer valid"
+msgstr "IP संरचना यापुढे वैध नाही"
+
+#: ../cli/src/common.c:420
+msgid "Secrets were required, but not provided"
+msgstr "गोपनीयता आवश्यक, परंतु पुरवले नाही"
+
+#: ../cli/src/common.c:423
+msgid "802.1X supplicant disconnected"
+msgstr "802.1X सप्पिकंट खंडीत केले"
+
+#: ../cli/src/common.c:426
+msgid "802.1X supplicant configuration failed"
+msgstr "802.1X सप्लिकंट संरचना अपयशी"
+
+#: ../cli/src/common.c:429
+msgid "802.1X supplicant failed"
+msgstr "802.1X सप्लिकंट अपयशी"
+
+#: ../cli/src/common.c:432
+msgid "802.1X supplicant took too long to authenticate"
+msgstr "802.1X सप्लिकंटला ओळख पटवण्याकरीता जास्त वेळ लागला"
+
+#: ../cli/src/common.c:435
+msgid "PPP service failed to start"
+msgstr "PPP सर्व्हिस सुरू होण्यास अपयशी"
+
+#: ../cli/src/common.c:438
+msgid "PPP service disconnected"
+msgstr "PPP सर्व्हिस खंडीत"
+
+#: ../cli/src/common.c:441
+msgid "PPP failed"
+msgstr "PPP अपयशी"
+
+#: ../cli/src/common.c:444
+msgid "DHCP client failed to start"
+msgstr "DHCP क्लाएंट सुरू होण्यास अपयशी"
+
+#: ../cli/src/common.c:447
+msgid "DHCP client error"
+msgstr "DHCP क्लाएंट त्रुटी"
+
+#: ../cli/src/common.c:450
+msgid "DHCP client failed"
+msgstr "DHCP क्लाएंट अपयशी"
+
+#: ../cli/src/common.c:453
+msgid "Shared connection service failed to start"
+msgstr "शेअर्ड जोडणी सर्व्हिस सुरू होण्यास अपयशी"
+
+#: ../cli/src/common.c:456
+msgid "Shared connection service failed"
+msgstr "शेअर्ड जोडणी सर्व्हिस अपयशी"
+
+#: ../cli/src/common.c:459
+msgid "AutoIP service failed to start"
+msgstr "ऑटोIP सर्व्हिस सुरू होण्यास अपयशी"
+
+#: ../cli/src/common.c:462
+msgid "AutoIP service error"
+msgstr "ऑटोIP सर्व्हिस सुरू होण्यास अपयशी"
+
+#: ../cli/src/common.c:465
+msgid "AutoIP service failed"
+msgstr "ऑटोIP सर्व्हिस अपयशी"
+
+#: ../cli/src/common.c:468
+msgid "The line is busy"
+msgstr "लाइन व्यस्थ आहे"
+
+#: ../cli/src/common.c:471
+msgid "No dial tone"
+msgstr "डायल सूर आढळले नाही"
+
+#: ../cli/src/common.c:474
+msgid "No carrier could be established"
+msgstr "कॅरिअर स्थापित करणे अशक्य"
+
+#: ../cli/src/common.c:477
+msgid "The dialing request timed out"
+msgstr "डायलिंग विनंतीची वेळसमाप्ति"
+
+#: ../cli/src/common.c:480
+msgid "The dialing attempt failed"
+msgstr "डायलिंग प्रयत्न अपयशी"
+
+#: ../cli/src/common.c:483
+msgid "Modem initialization failed"
+msgstr "मोडेम प्रारंभिकरण अपयशी"
+
+#: ../cli/src/common.c:486
+msgid "Failed to select the specified APN"
+msgstr "निर्देशीत APN नीवडण्यास अपयशी"
+
+#: ../cli/src/common.c:489
+msgid "Not searching for networks"
+msgstr "नेटवर्ककरीता शोधत आहे"
+
+#: ../cli/src/common.c:492
+msgid "Network registration denied"
+msgstr "नेटवर्क नोंदणी नकारले"
+
+#: ../cli/src/common.c:495
+msgid "Network registration timed out"
+msgstr "नेटवर्क नोंदणीची वेळसमाप्ति"
+
+#: ../cli/src/common.c:498
+msgid "Failed to register with the requested network"
+msgstr "विनंती केलेल्या नेटवर्कसह नोंदणी अपयशी"
+
+#: ../cli/src/common.c:501
+msgid "PIN check failed"
+msgstr "PIN तपासणी अपयशी"
+
+#: ../cli/src/common.c:504
+msgid "Necessary firmware for the device may be missing"
+msgstr "साधनकरीता आवश्यक फर्मवेअर कदाचित आढळले नाही"
+
+#: ../cli/src/common.c:507
+msgid "The device was removed"
+msgstr "साधन काढून टाकले"
+
+#: ../cli/src/common.c:510
+msgid "NetworkManager went to sleep"
+msgstr "NetworkManager पूर्णपणे निष्क्रीय झाले"
+
+#: ../cli/src/common.c:513
+msgid "The device's active connection disappeared"
+msgstr "साधनाची सक्रिय जोडणी खंडीत झाली"
+
+#: ../cli/src/common.c:516
+msgid "Device disconnected by user or client"
+msgstr "वापरकर्ता किंवा क्लाएंटतर्फे साधन खंडीत केले"
+
+#: ../cli/src/common.c:519
+msgid "Carrier/link changed"
+msgstr "कॅरिअर किंवा दुवा बदलले"
+
+#: ../cli/src/common.c:522
+msgid "The device's existing connection was assumed"
+msgstr "साधनाची अस्तित्वातील जोडणी गृहीत धरले"
+
+#: ../cli/src/common.c:525
+msgid "The supplicant is now available"
+msgstr "सप्लिकंट आता उपलब्ध आहे"
+
+#: ../cli/src/common.c:528
+msgid "The modem could not be found"
+msgstr "मोडेम आढळले नाही"
+
+#: ../cli/src/common.c:531
+msgid "The Bluetooth connection failed or timed out"
+msgstr "ब्ल्युटूथ जोडणी अपयशी किंवा वेळ समाप्ति आढळली"
+
+#: ../cli/src/common.c:534
+msgid "GSM Modem's SIM card not inserted"
+msgstr "GSM मोडेमचे SIM कार्ड अंतर्भुत केले नाही"
+
+#: ../cli/src/common.c:537
+msgid "GSM Modem's SIM PIN required"
+msgstr "GSM मोडेमचे SIM PIN आवश्यक"
+
+#: ../cli/src/common.c:540
+msgid "GSM Modem's SIM PUK required"
+msgstr "GSM मोडेमचे SIM PUK आवश्यक"
+
+#: ../cli/src/common.c:543
+msgid "GSM Modem's SIM wrong"
+msgstr "GSM मोडेमचे SIM चुकिचे"
+
+#: ../cli/src/common.c:546
+msgid "InfiniBand device does not support connected mode"
+msgstr "इंफिनिबँड साधन जोडणी मोडकरीता समर्थन पुरवत नाही"
+
+#: ../cli/src/common.c:549
+msgid "A dependency of the connection failed"
+msgstr "जोडणीचे अवलंबन अपयशी"
+
+#: ../cli/src/common.c:552
+msgid "A problem with the RFC 2684 Ethernet over ADSL bridge"
+msgstr "RFC 2684 इथरनेट ओव्हर ADSL ब्रिजसह अडचण"
+
+#: ../cli/src/common.c:555
+msgid "ModemManager is unavailable"
+msgstr "ModemManager अनुपलब्ध"
+
+#: ../cli/src/common.c:558
+msgid "The Wi-Fi network could not be found"
+msgstr "Wi-Fi नेटवर्क आढळले नाही"
+
+#: ../cli/src/common.c:561
+#| msgid "A seconadary connection of the base connection failed"
+msgid "A secondary connection of the base connection failed"
+msgstr "बेस जोडणीचे सेकंडरि जोड अपयशी"
+
+#: ../cli/src/common.c:564 ../cli/src/devices.c:295 ../cli/src/devices.c:311
+#: ../cli/src/devices.c:433 ../cli/src/devices.c:477
+msgid "Unknown"
+msgstr "अपरिचीत"
+
+#. 0
+#. used only for 'GENERAL' group listing
+#: ../cli/src/connections.c:59 ../cli/src/connections.c:129
+#: ../cli/src/devices.c:107 ../cli/src/devices.c:131 ../cli/src/devices.c:141
+#: ../cli/src/devices.c:151 ../cli/src/devices.c:165 ../cli/src/devices.c:179
+#: ../cli/src/devices.c:201 ../cli/src/devices.c:217 ../cli/src/devices.c:226
+msgid "NAME"
+msgstr "NAME"
+
+#. 0
+#. 1
+#: ../cli/src/connections.c:60 ../cli/src/connections.c:130
+msgid "UUID"
+msgstr "UUID"
 
 #. 1
 #. 0
 #. 1
 #. 2
-#: ../cli/src/connections.c:80 ../cli/src/devices.c:67
-#: ../cli/src/devices.c:103 ../cli/src/devices.c:227
+#: ../cli/src/connections.c:61 ../cli/src/connections.c:163
+#: ../cli/src/devices.c:71 ../cli/src/devices.c:109 ../cli/src/devices.c:204
 msgid "TYPE"
 msgstr "TYPE"
 
 #. 2
-#: ../cli/src/connections.c:81
+#: ../cli/src/connections.c:62
 msgid "TIMESTAMP"
 msgstr "TIMESTAMP"
 
 #. 3
-#: ../cli/src/connections.c:82
+#: ../cli/src/connections.c:63
 msgid "TIMESTAMP-REAL"
 msgstr "TIMESTAMP-REAL"
 
 #. 4
-#: ../cli/src/connections.c:83
+#. 13
+#: ../cli/src/connections.c:64 ../cli/src/devices.c:121
 msgid "AUTOCONNECT"
 msgstr "AUTOCONNECT"
 
 #. 5
-#: ../cli/src/connections.c:84
+#: ../cli/src/connections.c:65
 msgid "READONLY"
 msgstr "READONLY"
 
+#. 6
+#. 8
+#. 2
+#. 11
+#. 5
+#: ../cli/src/connections.c:66 ../cli/src/connections.c:137
+#: ../cli/src/devices.c:73 ../cli/src/devices.c:191 ../cli/src/devices.c:207
+msgid "DBUS-PATH"
+msgstr "DBUS-PATH"
+
+#. 2
+#: ../cli/src/connections.c:131
+msgid "DEVICES"
+msgstr "DEVICES"
+
+#. 3
+#. 1
+#. 8
+#. 1
+#: ../cli/src/connections.c:132 ../cli/src/devices.c:72
+#: ../cli/src/devices.c:116 ../cli/src/network-manager.c:39
+msgid "STATE"
+msgstr "STATE"
+
+#. 4
+#: ../cli/src/connections.c:133
+msgid "DEFAULT"
+msgstr "DEFAULT"
+
+#. 5
+#: ../cli/src/connections.c:134
+msgid "DEFAULT6"
+msgstr "DEFAULT6"
+
+#. 6
+#: ../cli/src/connections.c:135
+msgid "SPEC-OBJECT"
+msgstr "SPEC-OBJECT"
+
+#. 7
+#. 1
+#: ../cli/src/connections.c:136 ../cli/src/connections.c:150
+msgid "VPN"
+msgstr "VPN"
+
+#. 9
+#: ../cli/src/connections.c:138
+msgid "CON-PATH"
+msgstr "CON-PATH"
+
+#. 10
+#: ../cli/src/connections.c:139
+msgid "ZONE"
+msgstr "ZONE"
+
+#. 11
+#: ../cli/src/connections.c:140
+msgid "MASTER-PATH"
+msgstr "MASTER-PATH"
+
+#: ../cli/src/connections.c:148 ../cli/src/devices.c:82
+msgid "GENERAL"
+msgstr "GENERAL"
+
+#. 0
+#: ../cli/src/connections.c:149
+msgid "IP"
+msgstr "IP"
+
+#. 1
+#: ../cli/src/connections.c:164
+msgid "USERNAME"
+msgstr "USERNAME"
+
+#. 2
+#: ../cli/src/connections.c:165
+msgid "GATEWAY"
+msgstr "GATEWAY"
+
+#. 3
+#: ../cli/src/connections.c:166
+msgid "BANNER"
+msgstr "BANNER"
+
+#. 4
 #: ../cli/src/connections.c:167
+msgid "VPN-STATE"
+msgstr "VPN-STATE"
+
+#. 5
+#: ../cli/src/connections.c:168
+msgid "CFG"
+msgstr "CFG"
+
+#: ../cli/src/connections.c:190
 #, c-format
 #| msgid ""
 #| "Usage: nmcli con { COMMAND | help }\n"
-#| "  COMMAND := { list | status | up | down }\n"
+#| "  COMMAND := { list | status | up | down | delete }\n"
 #| "\n"
-#| "  list [id  | uuid  | system | user]\n"
-#| "  status\n"
-#| "  up id  | uuid  [iface ] [ap ] [--nowait] [--"
+#| "  list [id  | uuid ]\n"
+#| "  status [id  | uuid  | path ]\n"
+#| "  up id  | uuid  [iface ] [ap ] [nsp ] [--"
+#| "nowait] [--timeout ]\n"
+#| "  up id  | uuid  [iface ] [ap ] [--nowait] [--"
 #| "timeout ]\n"
 #| "  down id  | uuid \n"
+#| "  delete id  | uuid \n"
 msgid ""
-"Usage: nmcli con { COMMAND | help }\n"
-"  COMMAND := { list | status | up | down }\n"
+"Usage: nmcli connection { COMMAND | help }\n"
+"  COMMAND := { list | status | up | down | delete }\n"
 "\n"
 "  list [id  | uuid ]\n"
-"  status\n"
-"  up id  | uuid  [iface ] [ap ] [nsp ] [--"
+"  status [id  | uuid  | path ]\n"
+"  up id  | uuid  [iface ] [ap ] [nsp ] [--"
 "nowait] [--timeout ]\n"
-"  up id  | uuid  [iface ] [ap ] [--nowait] [--timeout "
+"  up id  | uuid  [iface ] [ap ] [--nowait] [--timeout "
 "]\n"
 "  down id  | uuid \n"
+"  delete id  | uuid \n"
+"\n"
 msgstr ""
-"वापर: nmcli con { COMMAND | help }\n"
-"  COMMAND := { list | status | up | down }\n"
+"वापर: nmcli connection { COMMAND | help }\n"
+"  COMMAND := { list | status | up | down | delete }\n"
 "\n"
 "  list [id  | uuid ]\n"
-"  status\n"
-"  up id  | uuid  [iface ] [ap ] [nsp ] [--"
+"  status [id  | uuid  | path ]\n"
+"  up id  | uuid  [iface ] [ap ] [nsp ] [--"
 "nowait] [--timeout ]\n"
-"  up id  | uuid  [iface ] [ap ] [--nowait] [--timeout "
+"  up id  | uuid  [iface ] [ap ] [--nowait] [--timeout "
 "]\n"
 "  down id  | uuid \n"
+"  delete id  | uuid \n"
+"\n"
 
-#: ../cli/src/connections.c:220 ../cli/src/connections.c:542
+#: ../cli/src/connections.c:251 ../cli/src/connections.c:611
 #, c-format
 msgid "Error: 'con list': %s"
 msgstr "त्रुटी: 'con list': %s"
 
-#: ../cli/src/connections.c:222 ../cli/src/connections.c:544
+#: ../cli/src/connections.c:253 ../cli/src/connections.c:613
 #, c-format
 msgid "Error: 'con list': %s; allowed fields: %s"
 msgstr "त्रुटी: 'con list': %s; स्वीकार्य क्षेत्र: %s"
 
-#: ../cli/src/connections.c:230
+#: ../cli/src/connections.c:261
 msgid "Connection details"
 msgstr "जोडणीचे तपशील"
 
-#: ../cli/src/connections.c:417
+#: ../cli/src/connections.c:486
 msgid "never"
 msgstr "कधिच नाही"
 
 #. "CAPABILITIES"
 #. Print header
 #. "WIFI-PROPERTIES"
-#: ../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
+#: ../cli/src/connections.c:487 ../cli/src/connections.c:488
+#: ../cli/src/connections.c:716 ../cli/src/connections.c:717
+#: ../cli/src/connections.c:719 ../cli/src/devices.c:441
+#: ../cli/src/devices.c:494 ../cli/src/devices.c:610 ../cli/src/devices.c:611
+#: ../cli/src/devices.c:612 ../cli/src/devices.c:644 ../cli/src/devices.c:671
+#: ../cli/src/devices.c:672 ../cli/src/devices.c:673 ../cli/src/devices.c:674
+#: ../cli/src/devices.c:675 ../cli/src/network-manager.c:267
+#: ../cli/src/settings.c:712 ../cli/src/settings.c:787
+#: ../cli/src/settings.c:907 ../cli/src/settings.c:1189
+#: ../cli/src/settings.c:1190 ../cli/src/settings.c:1192
+#: ../cli/src/settings.c:1194 ../cli/src/settings.c:1195
+#: ../cli/src/settings.c:1326 ../cli/src/settings.c:1327
+#: ../cli/src/settings.c:1328 ../cli/src/settings.c:1329
+#: ../cli/src/settings.c:1406 ../cli/src/settings.c:1407
+#: ../cli/src/settings.c:1408 ../cli/src/settings.c:1409
+#: ../cli/src/settings.c:1410 ../cli/src/settings.c:1411
+#: ../cli/src/settings.c:1412 ../cli/src/settings.c:1413
+#: ../cli/src/settings.c:1414 ../cli/src/settings.c:1415
+#: ../cli/src/settings.c:1416 ../cli/src/settings.c:1417
+#: ../cli/src/settings.c:1418 ../cli/src/settings.c:1489
 msgid "yes"
 msgstr "होय"
 
-#: ../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
+#: ../cli/src/connections.c:487 ../cli/src/connections.c:488
+#: ../cli/src/connections.c:716 ../cli/src/connections.c:717
+#: ../cli/src/connections.c:719 ../cli/src/devices.c:441
+#: ../cli/src/devices.c:494 ../cli/src/devices.c:610 ../cli/src/devices.c:611
+#: ../cli/src/devices.c:612 ../cli/src/devices.c:644 ../cli/src/devices.c:671
+#: ../cli/src/devices.c:672 ../cli/src/devices.c:673 ../cli/src/devices.c:674
+#: ../cli/src/devices.c:675 ../cli/src/network-manager.c:269
+#: ../cli/src/settings.c:712 ../cli/src/settings.c:714
+#: ../cli/src/settings.c:787 ../cli/src/settings.c:907
+#: ../cli/src/settings.c:1189 ../cli/src/settings.c:1190
+#: ../cli/src/settings.c:1192 ../cli/src/settings.c:1194
+#: ../cli/src/settings.c:1195 ../cli/src/settings.c:1326
+#: ../cli/src/settings.c:1327 ../cli/src/settings.c:1328
+#: ../cli/src/settings.c:1329 ../cli/src/settings.c:1406
+#: ../cli/src/settings.c:1407 ../cli/src/settings.c:1408
+#: ../cli/src/settings.c:1409 ../cli/src/settings.c:1410
+#: ../cli/src/settings.c:1411 ../cli/src/settings.c:1412
+#: ../cli/src/settings.c:1413 ../cli/src/settings.c:1414
+#: ../cli/src/settings.c:1415 ../cli/src/settings.c:1416
+#: ../cli/src/settings.c:1417 ../cli/src/settings.c:1418
+#: ../cli/src/settings.c:1489
 msgid "no"
 msgstr "नाही"
 
-#: ../cli/src/connections.c:493
-#| msgid "Connection details"
+#: ../cli/src/connections.c:562
 msgid "Connection list"
 msgstr "जोडणी सूची"
 
-#: ../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
+#: ../cli/src/connections.c:575 ../cli/src/connections.c:1112
+#: ../cli/src/connections.c:1650 ../cli/src/connections.c:1665
+#: ../cli/src/connections.c:1674 ../cli/src/connections.c:1684
+#: ../cli/src/connections.c:1696 ../cli/src/connections.c:1804
+#: ../cli/src/connections.c:1906 ../cli/src/devices.c:1122
+#: ../cli/src/devices.c:1132 ../cli/src/devices.c:1250
+#: ../cli/src/devices.c:1258 ../cli/src/devices.c:1622
+#: ../cli/src/devices.c:1629 ../cli/src/devices.c:1643
+#: ../cli/src/devices.c:1650 ../cli/src/devices.c:1667
+#: ../cli/src/devices.c:1678 ../cli/src/devices.c:1899
+#: ../cli/src/devices.c:1906
 #, c-format
 msgid "Error: %s argument is missing."
 msgstr "त्रुटी: %s घटक आढळले नाही."
 
-#: ../cli/src/connections.c:519
+#: ../cli/src/connections.c:588
 #, c-format
 msgid "Error: %s - no such connection."
 msgstr "त्रुटी: %s - याप्रकारची जोडणी आढळली नाही."
 
-#: ../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
+#: ../cli/src/connections.c:594 ../cli/src/connections.c:1709
+#: ../cli/src/connections.c:1821 ../cli/src/connections.c:1913
+#: ../cli/src/devices.c:906 ../cli/src/devices.c:986 ../cli/src/devices.c:1146
+#: ../cli/src/devices.c:1264 ../cli/src/devices.c:1691
+#: ../cli/src/devices.c:1912
 #, c-format
 msgid "Unknown parameter: %s\n"
 msgstr "अपरिचीत घटक: %s\n"
 
-#: ../cli/src/connections.c:534
+#: ../cli/src/connections.c:603
 #, c-format
 msgid "Error: no valid parameter specified."
 msgstr "त्रुटी: वैध घटक निर्देशीत नाही."
 
-#: ../cli/src/connections.c:549 ../cli/src/connections.c:1627
-#: ../cli/src/devices.c:1755 ../cli/src/network-manager.c:463
+#: ../cli/src/connections.c:618 ../cli/src/connections.c:2009
+#: ../cli/src/devices.c:2123 ../cli/src/network-manager.c:599
 #, c-format
 msgid "Error: %s."
 msgstr "त्रुटी: %s."
 
-#: ../cli/src/connections.c:637
+#: ../cli/src/connections.c:631
+msgid "activating"
+msgstr "बंद करत आहे"
+
+#: ../cli/src/connections.c:633
+msgid "activated"
+msgstr "सक्रिय केले"
+
+#: ../cli/src/connections.c:647
+msgid "VPN connecting (prepare)"
+msgstr "VPN जोडणी (तयार करा)"
+
+#: ../cli/src/connections.c:649
+msgid "VPN connecting (need authentication)"
+msgstr "VPN जोडणी (ओळख पटवणे आवश्यक आहे)"
+
+#: ../cli/src/connections.c:651
+msgid "VPN connecting"
+msgstr "VPN जोडणी"
+
+#: ../cli/src/connections.c:653
+msgid "VPN connecting (getting IP configuration)"
+msgstr "VPN जोडणी (IP संरचना प्राप्त करत आहे)"
+
+#: ../cli/src/connections.c:655
+msgid "VPN connected"
+msgstr "VPN जोडणी यशस्वी"
+
+#: ../cli/src/connections.c:657
+msgid "VPN connection failed"
+msgstr "VPN जोडणी अपयशी"
+
+#: ../cli/src/connections.c:659
+msgid "VPN disconnected"
+msgstr "VPN जोडणी खंडीत झाली"
+
+#: ../cli/src/connections.c:712 ../cli/src/connections.c:722
+msgid "N/A"
+msgstr "N/A"
+
+#: ../cli/src/connections.c:916 ../cli/src/connections.c:1140
 #, c-format
 msgid "Error: 'con status': %s"
 msgstr "त्रुटी: 'con status': %s"
 
-#: ../cli/src/connections.c:639
+#: ../cli/src/connections.c:918 ../cli/src/connections.c:1142
 #, c-format
 msgid "Error: 'con status': %s; allowed fields: %s"
 msgstr "त्रुटी: 'con status': %s; स्वीकार्य क्षेत्र: %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
+#: ../cli/src/connections.c:926
+msgid "Active connection details"
+msgstr "सक्रीय जोडणीचे तपशील"
+
+#: ../cli/src/connections.c:1062 ../cli/src/connections.c:1724
+#: ../cli/src/connections.c:1836 ../cli/src/connections.c:1927
+#: ../cli/src/devices.c:933 ../cli/src/devices.c:995 ../cli/src/devices.c:1161
+#: ../cli/src/devices.c:1294 ../cli/src/devices.c:1713
+#: ../cli/src/devices.c:1941 ../cli/src/network-manager.c:311
 #, 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
+#: ../cli/src/connections.c:1066 ../cli/src/connections.c:1728
+#: ../cli/src/connections.c:1840 ../cli/src/connections.c:1931
+#: ../cli/src/devices.c:937 ../cli/src/devices.c:999 ../cli/src/devices.c:1165
+#: ../cli/src/devices.c:1298 ../cli/src/devices.c:1717
+#: ../cli/src/devices.c:1945 ../cli/src/network-manager.c:315
 #, c-format
-#| msgid "NetworkManager status"
 msgid "Error: NetworkManager is not running."
 msgstr "त्रुटी: NetworkManager कार्यरत नाही."
 
-#: ../cli/src/connections.c:659
+#: ../cli/src/connections.c:1098
 msgid "Active connections"
 msgstr "सक्रिय जोडणी"
 
-#: ../cli/src/connections.c:1095
+#: ../cli/src/connections.c:1123
+#, c-format
+msgid "Error: '%s' is not an active connection."
+msgstr "त्रुटी: '%s' सक्रीय जोडणी नाही."
+
+#: ../cli/src/connections.c:1128
+#, c-format
+msgid "Error: unknown parameter: %s"
+msgstr "त्रुटी: अपरिचीत घटक: %s"
+
+#: ../cli/src/connections.c:1235
 #, c-format
 msgid "no active connection on device '%s'"
 msgstr "साधन '%s' वरील सक्रिय जोडणी आढळली नाही"
 
-#: ../cli/src/connections.c:1103
-#, c-format
+#: ../cli/src/connections.c:1243
 msgid "no active connection or device"
 msgstr "सक्रिय जोडणी किंवा साधन आढळले नाही"
 
-#: ../cli/src/connections.c:1174
+#: ../cli/src/connections.c:1314
 #, c-format
 msgid "device '%s' not compatible with connection '%s'"
 msgstr "साधन '%s' जोडणी '%s' सह सहत्व नाही"
 
-#: ../cli/src/connections.c:1176
+#: ../cli/src/connections.c:1317
 #, c-format
 msgid "no device found for connection '%s'"
 msgstr "जोडणी '%s' करीता साधन आढळले नाही"
 
-#: ../cli/src/connections.c:1187
-msgid "activating"
-msgstr "बंद करत आहे"
-
-#: ../cli/src/connections.c:1189
-msgid "activated"
-msgstr "सक्रिय केले"
-
-#: ../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:1203
-msgid "VPN connecting (prepare)"
-msgstr "VPN जोडणी (तयार करा)"
-
-#: ../cli/src/connections.c:1205
-msgid "VPN connecting (need authentication)"
-msgstr "VPN जोडणी (ओळख पटवणे आवश्यक आहे)"
-
-#: ../cli/src/connections.c:1207
-msgid "VPN connecting"
-msgstr "VPN जोडणी"
-
-#: ../cli/src/connections.c:1209
-msgid "VPN connecting (getting IP configuration)"
-msgstr "VPN जोडणी (IP संरचना प्राप्त करत आहे)"
-
-#: ../cli/src/connections.c:1211
-msgid "VPN connected"
-msgstr "VPN जोडणी यशस्वी"
-
-#: ../cli/src/connections.c:1213
-msgid "VPN connection failed"
-msgstr "VPN जोडणी अपयशी"
-
-#: ../cli/src/connections.c:1215
-msgid "VPN disconnected"
-msgstr "VPN जोडणी खंडीत झाली"
-
-#: ../cli/src/connections.c:1226
+#: ../cli/src/connections.c:1329
 msgid "unknown reason"
 msgstr "अपरिचीत कारण"
 
-#: ../cli/src/connections.c:1228
+#: ../cli/src/connections.c:1331
 msgid "none"
 msgstr "काहिच नाही"
 
-#: ../cli/src/connections.c:1230
+#: ../cli/src/connections.c:1333
 msgid "the user was disconnected"
 msgstr "वापरकर्ता खंडीत झाले"
 
-#: ../cli/src/connections.c:1232
+#: ../cli/src/connections.c:1335
 msgid "the base network connection was interrupted"
 msgstr "बेस नेटवर्क जोडणी खंडीत झाले"
 
-#: ../cli/src/connections.c:1234
+#: ../cli/src/connections.c:1337
 msgid "the VPN service stopped unexpectedly"
 msgstr "VPN सेवा अनपेक्षीतरित्या थांबली"
 
-#: ../cli/src/connections.c:1236
+#: ../cli/src/connections.c:1339
 msgid "the VPN service returned invalid configuration"
 msgstr "VPN सेवाने अवैध संरचना रिटर्न केली"
 
-#: ../cli/src/connections.c:1238
+#: ../cli/src/connections.c:1341
 msgid "the connection attempt timed out"
 msgstr "जोडणी प्रयत्नाची वेळ समाप्ती आढळली"
 
-#: ../cli/src/connections.c:1240
+#: ../cli/src/connections.c:1343
 msgid "the VPN service did not start in time"
 msgstr "VPN सेवा वेळेवर सुरू झाली नाही"
 
-#: ../cli/src/connections.c:1242
+#: ../cli/src/connections.c:1345
 msgid "the VPN service failed to start"
 msgstr "VPN सेवा सुरू होण्यास अपयशी"
 
-#: ../cli/src/connections.c:1244
+#: ../cli/src/connections.c:1347
 msgid "no valid VPN secrets"
 msgstr "वैध VPN गोपणीयता आढळले नाही"
 
-#: ../cli/src/connections.c:1246
+#: ../cli/src/connections.c:1349
 msgid "invalid VPN secrets"
 msgstr "अवैध VPN गोपणीयता"
 
-#: ../cli/src/connections.c:1248
+#: ../cli/src/connections.c:1351
 msgid "the connection was removed"
 msgstr "जोडणी काढून टाकली"
 
-#: ../cli/src/connections.c:1262
-#, c-format
-msgid "state: %s\n"
-msgstr "स्तर: %s\n"
-
-#: ../cli/src/connections.c:1265 ../cli/src/connections.c:1291
+#: ../cli/src/connections.c:1368 ../cli/src/connections.c:1573
 #, c-format
-msgid "Connection activated\n"
-msgstr "जोडणी सक्रिय केली\n"
+msgid "Connection successfully activated (D-Bus active path: %s)\n"
+msgstr "जोडणी यशस्वीरित्या सुरू केले (D-Bus सक्रिय मार्ग: %s)\n"
 
-#: ../cli/src/connections.c:1268
+#. Active connection failed and dissapeared, quit.
+#: ../cli/src/connections.c:1373 ../cli/src/connections.c:1474
 #, c-format
 msgid "Error: Connection activation failed."
 msgstr "त्रुटी: जोडणी सक्रिय करण्यास अपयशी."
 
-#: ../cli/src/connections.c:1287
+#: ../cli/src/connections.c:1398
 #, c-format
-msgid "state: %s (%d)\n"
-msgstr "स्तर: %s (%d)\n"
+msgid "VPN connection successfully activated (D-Bus active path: %s)\n"
+msgstr "VPN जोडणी यशस्वीरित्या सुरू केले (D-Bus सक्रिय मार्ग: %s)\n"
 
-#: ../cli/src/connections.c:1297
+#: ../cli/src/connections.c:1406
 #, c-format
 msgid "Error: Connection activation failed: %s."
 msgstr "त्रुटी: जोडणी सक्रिय करण्यास अपयशी: %s."
 
-#: ../cli/src/connections.c:1314 ../cli/src/devices.c:1136
+#: ../cli/src/connections.c:1503 ../cli/src/devices.c:1055
 #, c-format
 msgid "Error: Timeout %d sec expired."
 msgstr "त्रुटी: वेळसमाप्ती %d सेकंद समाप्त."
 
-#: ../cli/src/connections.c:1327
+#: ../cli/src/connections.c:1564
 #, c-format
 msgid "Error: Connection activation failed: %s"
 msgstr "त्रुटी: जोडणी सक्रिय करण्यास अपयशी: %s"
 
-#: ../cli/src/connections.c:1333
-#, c-format
-msgid "Active connection state: %s\n"
-msgstr "सक्रिय जोडणीचे स्तर: %s\n"
-
-#: ../cli/src/connections.c:1334
-#, c-format
-msgid "Active connection path: %s\n"
-msgstr "सक्रिय जोडणीचे मार्ग: %s\n"
-
-#: ../cli/src/connections.c:1386 ../cli/src/connections.c:1527
+#: ../cli/src/connections.c:1658 ../cli/src/connections.c:1812
+#: ../cli/src/connections.c:1940
 #, c-format
 msgid "Error: Unknown connection: %s."
 msgstr "त्रुटी: अपरिचीत जोडणी: %s."
 
-#: ../cli/src/connections.c:1432 ../cli/src/devices.c:1208
+#: ../cli/src/connections.c:1704 ../cli/src/devices.c:1140
+#: ../cli/src/devices.c:1686
 #, c-format
 msgid "Error: timeout value '%s' is not valid."
 msgstr "त्रुटी: वेळसमाप्तीचे मुल्य '%s' वैध नाही."
 
-#: ../cli/src/connections.c:1445 ../cli/src/connections.c:1544
+#: ../cli/src/connections.c:1717 ../cli/src/connections.c:1829
+#: ../cli/src/connections.c:1920
 #, c-format
 msgid "Error: id or uuid has to be specified."
 msgstr "त्रुटी: id किंवा uuid निर्देशीत करणे आवश्यक आहे."
 
-#: ../cli/src/connections.c:1473
+#: ../cli/src/connections.c:1749
 #, c-format
 msgid "Error: No suitable device found: %s."
 msgstr "त्रुटी: योग्य साधन आढळले नाही: %s."
 
-#: ../cli/src/connections.c:1475
+#: ../cli/src/connections.c:1751
 #, c-format
 msgid "Error: No suitable device found."
 msgstr "त्रुटी: योग्य साधन आढळले नाही."
 
-#: ../cli/src/connections.c:1580
+#: ../cli/src/connections.c:1865
 #, c-format
 msgid "Warning: Connection not active\n"
 msgstr "सावधान: जोडणी सक्रिय नाही\n"
 
-#: ../cli/src/connections.c:1618
+#: ../cli/src/connections.c:1879
+#, c-format
+msgid "Error: Connection deletion failed: %s"
+msgstr "त्रुटी: जोडणी नष्ट करणे अपयशी: %s"
+
+#: ../cli/src/connections.c:2000
 #, c-format
 msgid "Error: 'con' command '%s' is not valid."
 msgstr "त्रुटी: 'con' आदेश '%s' वैध नाही."
 
-#: ../cli/src/connections.c:1683
+#: ../cli/src/connections.c:2068
 #, c-format
 msgid "Error: could not connect to D-Bus."
 msgstr "त्रुटी: D-Bus सह जोडणी करणे अशक्य."
 
-#: ../cli/src/connections.c:1690
+#: ../cli/src/connections.c:2076
 #, c-format
 msgid "Error: Could not get system settings."
 msgstr "त्रुटी: प्रणालीची संयोजना प्राप्त करणे अशक्य."
 
-#: ../cli/src/connections.c:1700
+#: ../cli/src/connections.c:2086
 #, 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 "त्रुटी: जोडणी प्राप्त करण्यास अशक्य: सेटिंग्स् सर्व्हिस कार्यरत नाही."
 
 #. 0
 #. 9
 #. 3
-#: ../cli/src/devices.c:66 ../cli/src/devices.c:102 ../cli/src/devices.c:212
-#: ../cli/src/devices.c:228
+#: ../cli/src/devices.c:70 ../cli/src/devices.c:108 ../cli/src/devices.c:189
+#: ../cli/src/devices.c:205
 msgid "DEVICE"
 msgstr "DEVICE"
 
-#. 1
-#. 4
-#. 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:78
-msgid "GENERAL"
-msgstr "GENERAL"
-
 #. 0
-#: ../cli/src/devices.c:79
+#: ../cli/src/devices.c:83
 msgid "CAPABILITIES"
 msgstr "CAPABILITIES"
 
 #. 1
-#: ../cli/src/devices.c:80
+#: ../cli/src/devices.c:84
 msgid "WIFI-PROPERTIES"
 msgstr "WIFI-PROPERTIES"
 
 #. 2
-#: ../cli/src/devices.c:81
+#: ../cli/src/devices.c:85
 msgid "AP"
 msgstr "AP"
 
 #. 3
-#: ../cli/src/devices.c:82
+#: ../cli/src/devices.c:86
 msgid "WIRED-PROPERTIES"
 msgstr "WIRED-PROPERTIES"
 
 #. 4
-#: ../cli/src/devices.c:83
-#| msgid "WIFI-PROPERTIES"
+#: ../cli/src/devices.c:87
 msgid "WIMAX-PROPERTIES"
 msgstr "WIMAX-PROPERTIES"
 
 #. 5
 #. 0
-#: ../cli/src/devices.c:84 ../cli/src/devices.c:225
-#| msgid "DNS"
+#: ../cli/src/devices.c:88 ../cli/src/devices.c:202
 msgid "NSP"
 msgstr "NSP"
 
 #. 6
-#: ../cli/src/devices.c:85
-msgid "IP4-SETTINGS"
-msgstr "IP4-SETTINGS"
+#: ../cli/src/devices.c:89
+msgid "IP4"
+msgstr "IP4"
 
 #. 7
-#: ../cli/src/devices.c:86
-msgid "IP4-DNS"
-msgstr "IP4-DNS"
+#: ../cli/src/devices.c:90
+msgid "DHCP4"
+msgstr "DHCP4"
 
 #. 8
-#: ../cli/src/devices.c:87
-#| msgid "IP4-SETTINGS"
-msgid "IP6-SETTINGS"
-msgstr "IP6-SETTINGS"
+#: ../cli/src/devices.c:91
+msgid "IP6"
+msgstr "IP6"
 
 #. 9
-#: ../cli/src/devices.c:88
-#| msgid "IP4-DNS"
-msgid "IP6-DNS"
-msgstr "IP6-DNS"
+#: ../cli/src/devices.c:92
+msgid "DHCP6"
+msgstr "DHCP6"
+
+#. 10
+#: ../cli/src/devices.c:93
+msgid "BOND"
+msgstr "BOND"
+
+#. 11
+#: ../cli/src/devices.c:94
+msgid "VLAN"
+msgstr "VLAN"
 
 #. 2
-#: ../cli/src/devices.c:104
+#: ../cli/src/devices.c:110
+msgid "VENDOR"
+msgstr "VENDOR"
+
+#. 3
+#: ../cli/src/devices.c:111
+msgid "PRODUCT"
+msgstr "PRODUCT"
+
+#. 4
+#: ../cli/src/devices.c:112
 msgid "DRIVER"
 msgstr "DRIVER"
 
-#. 3
-#: ../cli/src/devices.c:105
+#. 5
+#: ../cli/src/devices.c:113
+msgid "DRIVER-VERSION"
+msgstr "DRIVER-VERSION"
+
+#. 6
+#: ../cli/src/devices.c:114
+msgid "FIRMWARE-VERSION"
+msgstr "FIRMWARE-VERSION"
+
+#. 7
+#: ../cli/src/devices.c:115
 msgid "HWADDR"
 msgstr "HWADDR"
 
+#. 9
+#: ../cli/src/devices.c:117
+msgid "REASON"
+msgstr "REASON"
+
+#. 10
+#: ../cli/src/devices.c:118
+msgid "UDI"
+msgstr "UDI"
+
+#. 11
+#: ../cli/src/devices.c:119
+msgid "IP-IFACE"
+msgstr "IP-IFACE"
+
+#. 12
+#: ../cli/src/devices.c:120
+msgid "NM-MANAGED"
+msgstr "NM-MANAGED"
+
+#. 14
+#: ../cli/src/devices.c:122
+msgid "FIRMWARE-MISSING"
+msgstr "FIRMWARE-MISSING"
+
+#. 15
+#: ../cli/src/devices.c:123
+msgid "CONNECTION"
+msgstr "CONNECTION"
+
 #. 0
-#: ../cli/src/devices.c:115
+#: ../cli/src/devices.c:132
 msgid "CARRIER-DETECT"
 msgstr "CARRIER-DETECT"
 
 #. 1
-#: ../cli/src/devices.c:116
+#: ../cli/src/devices.c:133
 msgid "SPEED"
 msgstr "SPEED"
 
 #. 0
-#: ../cli/src/devices.c:125
+#: ../cli/src/devices.c:142
 msgid "CARRIER"
 msgstr "CARRIER"
 
 #. 0
-#: ../cli/src/devices.c:135
+#: ../cli/src/devices.c:152
 msgid "WEP"
 msgstr "WEP"
 
 #. 1
-#: ../cli/src/devices.c:136
+#: ../cli/src/devices.c:153
 msgid "WPA"
 msgstr "WPA"
 
 #. 2
-#: ../cli/src/devices.c:137
+#: ../cli/src/devices.c:154
 msgid "WPA2"
 msgstr "WPA2"
 
 #. 3
-#: ../cli/src/devices.c:138
+#: ../cli/src/devices.c:155
 msgid "TKIP"
 msgstr "TKIP"
 
 #. 4
-#: ../cli/src/devices.c:139
+#: ../cli/src/devices.c:156
 msgid "CCMP"
 msgstr "CCMP"
 
 #. 0
-#: ../cli/src/devices.c:149
-#| msgid "FREQ"
+#: ../cli/src/devices.c:166
 msgid "CTR-FREQ"
 msgstr "CTR-FREQ"
 
 #. 1
-#: ../cli/src/devices.c:150
-#| msgid "SSID"
+#: ../cli/src/devices.c:167
 msgid "RSSI"
 msgstr "RSSI"
 
 #. 2
-#: ../cli/src/devices.c:151
+#: ../cli/src/devices.c:168
 msgid "CINR"
 msgstr "CINR"
 
 #. 3
-#: ../cli/src/devices.c:152
+#: ../cli/src/devices.c:169
 msgid "TX-POW"
 msgstr "TX-POW"
 
 #. 4
-#: ../cli/src/devices.c:153
-#| msgid "BSSID"
+#: ../cli/src/devices.c:170
 msgid "BSID"
 msgstr "BSID"
 
 #. 0
-#: ../cli/src/devices.c:163 ../cli/src/devices.c:174
-msgid "ADDRESS"
-msgstr "ADDRESS"
-
-#. 1
-#: ../cli/src/devices.c:164 ../cli/src/devices.c:175
-msgid "PREFIX"
-msgstr "PREFIX"
-
-#. 2
-#: ../cli/src/devices.c:165 ../cli/src/devices.c:176
-msgid "GATEWAY"
-msgstr "GATEWAY"
-
-#. 0
-#: ../cli/src/devices.c:185 ../cli/src/devices.c:194
-msgid "DNS"
-msgstr "DNS"
-
-#. 0
-#: ../cli/src/devices.c:203
+#: ../cli/src/devices.c:180
 msgid "SSID"
 msgstr "SSID"
 
 #. 1
-#: ../cli/src/devices.c:204
+#: ../cli/src/devices.c:181
 msgid "BSSID"
 msgstr "BSSID"
 
 #. 2
-#: ../cli/src/devices.c:205
+#: ../cli/src/devices.c:182
 msgid "MODE"
 msgstr "MODE"
 
 #. 3
-#: ../cli/src/devices.c:206
+#: ../cli/src/devices.c:183
 msgid "FREQ"
 msgstr "FREQ"
 
 #. 4
-#: ../cli/src/devices.c:207
+#: ../cli/src/devices.c:184
 msgid "RATE"
 msgstr "RATE"
 
 #. 5
 #. 1
-#: ../cli/src/devices.c:208 ../cli/src/devices.c:226
+#: ../cli/src/devices.c:185 ../cli/src/devices.c:203
 msgid "SIGNAL"
 msgstr "SIGNAL"
 
 #. 6
-#: ../cli/src/devices.c:209
+#: ../cli/src/devices.c:186
 msgid "SECURITY"
 msgstr "SECURITY"
 
 #. 7
-#: ../cli/src/devices.c:210
+#: ../cli/src/devices.c:187
 msgid "WPA-FLAGS"
 msgstr "WPA-FLAGS"
 
 #. 8
-#: ../cli/src/devices.c:211
+#: ../cli/src/devices.c:188
 msgid "RSN-FLAGS"
 msgstr "RSN-FLAGS"
 
 #. 10
 #. 4
-#: ../cli/src/devices.c:213 ../cli/src/devices.c:229
+#: ../cli/src/devices.c:190 ../cli/src/devices.c:206
 msgid "ACTIVE"
 msgstr "ACTIVE"
 
-#: ../cli/src/devices.c:256
+#. 0
+#: ../cli/src/devices.c:218
+msgid "SLAVES"
+msgstr "SLAVES"
+
+#. 0
+#: ../cli/src/devices.c:227
+msgid "ID"
+msgstr "ID"
+
+#: ../cli/src/devices.c:243
 #, 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 ]\n"
 #| "  disconnect iface  [--nowait] [--timeout ]\n"
-#| "  wifi [list [iface ] [hwaddr ]]\n"
+#| "  wifi [list [iface ] [bssid ]]\n"
+#| "  wifi connect <(B)SSID> [password ] [wep-key-type key|phrase] "
+#| "[iface ] [bssid ] [name ]\n"
+#| "               [--private] [--nowait] [--timeout ]\n"
+#| "  wimax [list [iface ] [nsp ]]\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 ]\n"
-"  disconnect iface  [--nowait] [--timeout ]\n"
-"  wifi [list [iface ] [hwaddr ]]\n"
-"  wimax [list [iface ] [nsp ]]\n"
-"\n"
-msgstr ""
-"वापर: nmcli dev { COMMAND | help }\n"
+"Usage: nmcli device { COMMAND | help }\n"
 "\n"
 "  COMMAND := { status | list | disconnect | wifi | wimax }\n"
 "\n"
-"  COMMAND := { 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:284
-msgid "unmanaged"
-msgstr "अव्यवस्थापीत"
-
-#: ../cli/src/devices.c:286
-msgid "unavailable"
-msgstr "अनुपल्बध"
-
-#: ../cli/src/devices.c:288 ../cli/src/network-manager.c:115
-msgid "disconnected"
-msgstr "खंडीत"
-
-#: ../cli/src/devices.c:290
-msgid "connecting (prepare)"
-msgstr "जोडणी (तयार करत आहे)"
-
-#: ../cli/src/devices.c:292
-msgid "connecting (configuring)"
-msgstr "जोडणी (संरचीत करत आहे)"
-
-#: ../cli/src/devices.c:294
-msgid "connecting (need authentication)"
-msgstr "जोडणी (ओळख पटवणे आवश्यक आहे)"
-
-#: ../cli/src/devices.c:296
-msgid "connecting (getting IP configuration)"
-msgstr "जोडणी (IP संरचना प्राप्त करत आहे)"
-
-#: ../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:306
-msgid "connection failed"
-msgstr "जोडणी अपयशी"
-
-#: ../cli/src/devices.c:331 ../cli/src/devices.c:341 ../cli/src/devices.c:501
-#: ../cli/src/devices.c:545
-msgid "Unknown"
-msgstr "अपरिचीत"
+"  COMMAND := { status | list | disconnect | wifi }\n"
+"\n"
+"  status\n"
+"  list [iface ]\n"
+"  disconnect iface  [--nowait] [--timeout ]\n"
+"  wifi [list [iface ] [bssid ]]\n"
+"  wifi connect <(B)SSID> [password ] [wep-key-type key|phrase] "
+"[iface ] [bssid ] [name ]\n"
+"               [--private] [--nowait] [--timeout ]\n"
+"  wimax [list [iface ] [nsp ]]\n"
+"\n"
+msgstr ""
+"वापर: nmcli device { COMMAND | help }\n"
+"\n"
+"  COMMAND := { status | list | disconnect | wifi | wimax }\n"
+"\n"
+"  COMMAND := { status | list | disconnect | wifi }\n"
+"\n"
+"  status\n"
+"  list [iface ]\n"
+"  disconnect iface  [--nowait] [--timeout ]\n"
+"  wifi [list [iface ] [bssid ]]\n"
+"  wifi connect <(B)SSID> [password ] [wep-key-type key|phrase] "
+"[iface ] [bssid ] [name ]\n"
+"               [--private] [--nowait] [--timeout ]\n"
+"  wimax [list [iface ] [nsp ]]\n"
+"\n"
 
-#: ../cli/src/devices.c:374
+#: ../cli/src/devices.c:344
 msgid "(none)"
 msgstr "(काहिच नाही)"
 
-#: ../cli/src/devices.c:399
-#, c-format
-msgid "%s: error converting IP4 address 0x%X"
-msgstr "%s: IP4 पत्ता 0x%X यांस रूपांतरीत करतेवेळी त्रुटी"
-
-#: ../cli/src/devices.c:470
+#: ../cli/src/devices.c:400
 #, c-format
 msgid "%u MHz"
 msgstr "%u MHz"
 
-#: ../cli/src/devices.c:471
+#: ../cli/src/devices.c:401
 #, c-format
 msgid "%u MB/s"
 msgstr "%u MB/s"
 
-#: ../cli/src/devices.c:480
+#: ../cli/src/devices.c:410
 msgid "Encrypted: "
 msgstr "एनक्रिप्टेड: "
 
-#: ../cli/src/devices.c:485
+#: ../cli/src/devices.c:415
 msgid "WEP "
 msgstr "WEP "
 
-#: ../cli/src/devices.c:487
+#: ../cli/src/devices.c:417
 msgid "WPA "
 msgstr "WPA "
 
-#: ../cli/src/devices.c:489
+#: ../cli/src/devices.c:419
 msgid "WPA2 "
 msgstr "WPA2 "
 
-#: ../cli/src/devices.c:492
+#: ../cli/src/devices.c:422
 msgid "Enterprise "
 msgstr "एंटरप्राइज"
 
-#: ../cli/src/devices.c:501
+#: ../cli/src/devices.c:431
 msgid "Ad-Hoc"
 msgstr "ऍड-हॉक"
 
-#: ../cli/src/devices.c:501
+#: ../cli/src/devices.c:432
 msgid "Infrastructure"
 msgstr "इंफ्रास्ट्रक्चर"
 
-#: ../cli/src/devices.c:536
+#: ../cli/src/devices.c:468
 msgid "Home"
 msgstr "होम"
 
-#: ../cli/src/devices.c:539
+#: ../cli/src/devices.c:471
 msgid "Partner"
 msgstr "पार्टनर"
 
-#: ../cli/src/devices.c:542
+#: ../cli/src/devices.c:474
 msgid "Roaming"
 msgstr "रोमिंग"
 
-#: ../cli/src/devices.c:612
+#: ../cli/src/devices.c:546
 #, c-format
 msgid "Error: 'dev list': %s"
 msgstr "त्रुटी: 'dev list': %s"
 
-#: ../cli/src/devices.c:614
+#: ../cli/src/devices.c:548
 #, c-format
 msgid "Error: 'dev list': %s; allowed fields: %s"
 msgstr "त्रुटी: 'dev list': %s; स्वीकार्य क्षेत्र: %s"
 
-#: ../cli/src/devices.c:623
+#: ../cli/src/devices.c:557
 msgid "Device details"
 msgstr "साधनाचे तपशील"
 
-#: ../cli/src/devices.c:657 ../cli/src/devices.c:1152 ../cli/src/utils.c:342
+#: ../cli/src/devices.c:602 ../cli/src/devices.c:605 ../cli/src/devices.c:1081
+#: ../cli/src/utils.c:477
 msgid "(unknown)"
 msgstr "(अपरिचीत)"
 
-#: ../cli/src/devices.c:658
-msgid "unknown)"
-msgstr "अपरिचीत)"
+#: ../cli/src/devices.c:614
+msgid "not connected"
+msgstr "जोडणी अशक्य"
 
-#: ../cli/src/devices.c:684
+#: ../cli/src/devices.c:641
 #, c-format
 msgid "%u Mb/s"
 msgstr "%u Mb/s"
 
 #. Print header
 #. "WIRED-PROPERTIES"
-#: ../cli/src/devices.c:757
+#: ../cli/src/devices.c:715
 msgid "on"
 msgstr "सुरू करा"
 
-#: ../cli/src/devices.c:757
+#: ../cli/src/devices.c:715
 msgid "off"
 msgstr "बंद करा"
 
-#: ../cli/src/devices.c:1004
+#: ../cli/src/devices.c:923
 #, c-format
 msgid "Error: 'dev status': %s"
 msgstr "त्रुटी: 'dev status': %s"
 
-#: ../cli/src/devices.c:1006
+#: ../cli/src/devices.c:925
 #, c-format
 msgid "Error: 'dev status': %s; allowed fields: %s"
 msgstr "त्रुटी: 'dev status': %s; स्वीकार्य क्षेत्र: %s"
 
-#: ../cli/src/devices.c:1029
+#: ../cli/src/devices.c:948
 msgid "Status of devices"
 msgstr "साधनांची स्थिती"
 
-#: ../cli/src/devices.c:1060
+#: ../cli/src/devices.c:979
 #, c-format
 msgid "Error: '%s' argument is missing."
 msgstr "त्रुटी: '%s' घटक आढळले नाही."
 
-#: ../cli/src/devices.c:1101 ../cli/src/devices.c:1253
-#: ../cli/src/devices.c:1389 ../cli/src/devices.c:1608
+#: ../cli/src/devices.c:1020 ../cli/src/devices.c:1185
+#: ../cli/src/devices.c:1326 ../cli/src/devices.c:1973
 #, c-format
 msgid "Error: Device '%s' not found."
 msgstr "त्रुटी: साधन '%s' आढळले नाही."
 
-#: ../cli/src/devices.c:1124
+#: ../cli/src/devices.c:1043
 #, c-format
 msgid "Success: Device '%s' successfully disconnected."
 msgstr "यशस्वी: साधन '%s' यशस्वीरित्या खंडीत झाले."
 
-#: ../cli/src/devices.c:1149
+#: ../cli/src/devices.c:1078
 #, c-format
 msgid "Error: Device '%s' (%s) disconnecting failed: %s"
 msgstr "त्रुटी: साधन '%s' (%s) खंडीत होणे अपयशी झाले: %s"
 
-#: ../cli/src/devices.c:1157
+#: ../cli/src/devices.c:1091
 #, c-format
-msgid "Device state: %d (%s)\n"
-msgstr "साधनाचे स्तर: %d (%s)\n"
+msgid "Device '%s' has been disconnected.\n"
+msgstr "साधन '%s' खंडीत झाले. \n"
 
-#: ../cli/src/devices.c:1222
+#: ../cli/src/devices.c:1154
 #, c-format
 msgid "Error: iface has to be specified."
 msgstr "त्रुटी: iface निर्देशीत करणे आवश्यक आहे."
 
-#: ../cli/src/devices.c:1347
+#: ../cli/src/devices.c:1284
 #, c-format
 msgid "Error: 'dev wifi': %s"
 msgstr "त्रुटी: 'dev wifi': %s"
 
-#: ../cli/src/devices.c:1349
+#: ../cli/src/devices.c:1286
 #, c-format
 msgid "Error: 'dev wifi': %s; allowed fields: %s"
 msgstr "त्रुटी: 'dev wifi': %s; स्वीकार्य क्षेत्र: %s"
 
-#: ../cli/src/devices.c:1372
+#: ../cli/src/devices.c:1309
 msgid "WiFi scan list"
 msgstr "WiFi स्कॅन सूची"
 
-#: ../cli/src/devices.c:1409 ../cli/src/devices.c:1463
-#: ../cli/src/devices.c:1670
+#: ../cli/src/devices.c:1346 ../cli/src/devices.c:1400
 #, c-format
-msgid "Error: Access point with hwaddr '%s' not found."
-msgstr "त्रुटी: ऍक्सेस पॉईंट hwaddr '%s' सह आढळले नाही."
+msgid "Error: Access point with bssid '%s' not found."
+msgstr "त्रुटी: bssid '%s' सह ॲक्सेस पॉइंट आढळले नाही."
 
-#: ../cli/src/devices.c:1426
+#: ../cli/src/devices.c:1363
 #, c-format
 msgid "Error: Device '%s' is not a WiFi device."
 msgstr "त्रुटी: साधन '%s' WiFi साधन नाही."
 
-#: ../cli/src/devices.c:1490
+#: ../cli/src/devices.c:1431 ../cli/src/devices.c:1477
+#, c-format
+msgid "Connection with UUID '%s' created and activated on device '%s'\n"
+msgstr "UUID '%s' सह जोडणी निर्माण केली व साधन '%s' वर सुरू केली\n"
+
+#: ../cli/src/devices.c:1436
+#, c-format
+msgid "Error: Connection activation failed: (%d) %s."
+msgstr "त्रुटी: जोडणी सुरू करणे अपयशी: (%d) %s."
+
+#: ../cli/src/devices.c:1461
+#, c-format
+msgid "Error: Failed to add/activate new connection: (%d) %s"
+msgstr "त्रुटी: नवीन जोडणी: (%d) %s समाविष्ट/सुरू करण्यास अपयशी"
+
+#: ../cli/src/devices.c:1469
+#, c-format
+msgid "Error: Failed to add/activate new connection: Unknown error"
+msgstr "त्रुटी: नवीन जोडणी समाविष्ट/सुरू करण्यास अपयशी: अपरिचीत त्रुटी"
+
+#: ../cli/src/devices.c:1613
+#, c-format
+msgid "Error: SSID or BSSID are missing."
+msgstr "त्रुटी: SSID किंवा BSSID आढळले नाही."
+
+#: ../cli/src/devices.c:1636
+#, c-format
+msgid "Error: bssid argument value '%s' is not a valid BSSID."
+msgstr "त्रुटी: bssid घटक मूल्य '%s' वैध BSSID नाही."
+
+#: ../cli/src/devices.c:1660
+#, c-format
+msgid ""
+"Error: wep-key-type argument value '%s' is invalid, use 'key' or 'phrase'."
+msgstr ""
+"त्रुटी: wep-key-type आर्ग्युमेंट मूल्य '%s' अवैध आहे, 'key' किंवा 'phrase'चा "
+"वापर करा."
+
+#: ../cli/src/devices.c:1700
+#, c-format
+msgid "Error: BSSID to connect to (%s) differs from bssid argument (%s)."
+msgstr "त्रुटी: जोडण्याजोगी BSSID (%s) bssid आर्ग्युमेंट (%s) पासून भिन्न आहे."
+
+#: ../cli/src/devices.c:1706
+#, c-format
+msgid "Error: Parameter '%s' is neither SSID nor BSSID."
+msgstr "त्रुटी: घटक '%s' SSID किंवा BSSID नाही."
+
+#: ../cli/src/devices.c:1735
+#, c-format
+msgid "Error: Device '%s' is not a Wi-Fi device."
+msgstr "त्रुटी: साधन '%s' Wi-Fi साधन नाही."
+
+#: ../cli/src/devices.c:1737
+#, c-format
+msgid "Error: No Wi-Fi device found."
+msgstr "त्रुटी: Wi-Fi साधन आढळले नाही."
+
+#: ../cli/src/devices.c:1755
+#, c-format
+msgid "Error: No network with SSID '%s' found."
+msgstr "त्रुटी: SSID '%s' सह नेटवर्क आढळले नाही."
+
+#: ../cli/src/devices.c:1757
+#, c-format
+msgid "Error: No access point with BSSID '%s' found."
+msgstr "त्रुटी: BSSID '%s' सह ॲक्सेस पॉईंट आढळले नाही."
+
+#: ../cli/src/devices.c:1855
 #, c-format
 msgid "Error: 'dev wifi' command '%s' is not valid."
 msgstr "त्रुटी: 'dev wifi' आदेश '%s' वैध नाही."
 
-#: ../cli/src/devices.c:1566
+#: ../cli/src/devices.c:1931
 #, c-format
-#| msgid "Error: 'dev wifi': %s"
 msgid "Error: 'dev wimax': %s"
 msgstr "त्रुटी: 'dev wimax': %s"
 
-#: ../cli/src/devices.c:1568
+#: ../cli/src/devices.c:1933
 #, 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
+#: ../cli/src/devices.c:1956
 msgid "WiMAX NSP list"
 msgstr "WiMAX NSP सूची"
 
-#: ../cli/src/devices.c:1628
+#: ../cli/src/devices.c:1993
 #, c-format
-#| msgid "Error: Device '%s' not found."
 msgid "Error: NSP with name '%s' not found."
 msgstr "त्रुटी: NSP, साधन '%s' सह आढळले नाही."
 
-#: ../cli/src/devices.c:1639
+#: ../cli/src/devices.c:2004
 #, 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
+#: ../cli/src/devices.c:2035
+#, c-format
+msgid "Error: Access point with nsp '%s' not found."
+msgstr "त्रुटी: nsp '%s' सह ॲक्सेस पॉईंट आढळले नाही."
+
+#: ../cli/src/devices.c:2062
 #, 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
+#: ../cli/src/devices.c:2115
 #, c-format
 msgid "Error: 'dev' command '%s' is not valid."
 msgstr "त्रुटी: 'dev' आदेश '%s' वैध नाही."
@@ -1033,7 +1494,6 @@ msgstr "WWAN"
 
 #. 7
 #: ../cli/src/network-manager.c:45
-#| msgid "WIFI-HARDWARE"
 msgid "WIMAX-HARDWARE"
 msgstr "WIMAX-HARDWARE"
 
@@ -1042,27 +1502,27 @@ msgstr "WIMAX-HARDWARE"
 msgid "WIMAX"
 msgstr "WIMAX"
 
-#: ../cli/src/network-manager.c:74
+#: ../cli/src/network-manager.c:62
+msgid "PERMISSION"
+msgstr "PERMISSION"
+
+#. 0
+#: ../cli/src/network-manager.c:63
+msgid "VALUE"
+msgstr "VALUE"
+
+#: ../cli/src/network-manager.c:77
 #, 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 | enable | sleep | wifi | wwan | wimax }\n"
+"  COMMAND := { status | permissions | enable | sleep | wifi | wwan | "
+"wimax }\n"
 "\n"
-"  COMMAND := { status | enable | sleep | wifi | wwan }\n"
+"  COMMAND := { status | permissions | enable | sleep | wifi | wwan }\n"
 "\n"
 "  status\n"
+"  permissions\n"
 "  enable [true|false]\n"
 "  sleep [true|false]\n"
 "  wifi [on|off]\n"
@@ -1072,11 +1532,13 @@ msgid ""
 msgstr ""
 "वापर: nmcli nm { COMMAND | help }\n"
 "\n"
-"  COMMAND := { status | enable | sleep | wifi | wwan | wimax }\n"
+"  COMMAND := { status | permissions | enable | sleep | wifi | wwan | "
+"wimax }\n"
 "\n"
-"  COMMAND := { status | enable | sleep | wifi | wwan }\n"
+"  COMMAND := { status | permissions | enable | sleep | wifi | wwan }\n"
 "\n"
 "  status\n"
+"  permissions\n"
 "  enable [true|false]\n"
 "  sleep [true|false]\n"
 "  wifi [on|off]\n"
@@ -1084,152 +1546,159 @@ msgstr ""
 "  wimax [on|off]\n"
 "\n"
 
-#: ../cli/src/network-manager.c:103
+#: ../cli/src/network-manager.c:108
 msgid "asleep"
 msgstr "अस्लीप्"
 
-#: ../cli/src/network-manager.c:105
+#: ../cli/src/network-manager.c:110
 msgid "connecting"
 msgstr "जोडणी करत आहे"
 
-#: ../cli/src/network-manager.c:107
+#: ../cli/src/network-manager.c:112
 msgid "connected (local only)"
 msgstr "जोडले (फक्त स्थानीय)"
 
-#: ../cli/src/network-manager.c:109
-#| msgid "connected"
+#: ../cli/src/network-manager.c:114
 msgid "connected (site only)"
 msgstr "जोडले (फक्त स्थळ)"
 
-#: ../cli/src/network-manager.c:113
-#| msgid "connecting"
+#: ../cli/src/network-manager.c:118
 msgid "disconnecting"
 msgstr "जोडणी अशक्य करत आहे"
 
-#: ../cli/src/network-manager.c:153
+#: ../cli/src/network-manager.c:158
 #, c-format
 msgid "Error: 'nm status': %s"
 msgstr "त्रुटी: 'nm status': %s"
 
-#: ../cli/src/network-manager.c:155
+#: ../cli/src/network-manager.c:160
 #, c-format
 msgid "Error: 'nm status': %s; allowed fields: %s"
 msgstr "त्रुटी: 'nm status': %s; स्वीकार्य क्षेत्र: %s"
 
 #. 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
+#: ../cli/src/network-manager.c:173 ../cli/src/network-manager.c:174
+#: ../cli/src/network-manager.c:175 ../cli/src/network-manager.c:176
+#: ../cli/src/network-manager.c:177 ../cli/src/network-manager.c:179
+#: ../cli/src/network-manager.c:180 ../cli/src/network-manager.c:429
+#: ../cli/src/network-manager.c:484 ../cli/src/network-manager.c:522
+#: ../cli/src/network-manager.c:561
 msgid "enabled"
 msgstr "सुरू केले"
 
-#: ../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
+#: ../cli/src/network-manager.c:173 ../cli/src/network-manager.c:174
+#: ../cli/src/network-manager.c:175 ../cli/src/network-manager.c:176
+#: ../cli/src/network-manager.c:177 ../cli/src/network-manager.c:179
+#: ../cli/src/network-manager.c:180 ../cli/src/network-manager.c:429
+#: ../cli/src/network-manager.c:484 ../cli/src/network-manager.c:522
+#: ../cli/src/network-manager.c:561
 msgid "disabled"
 msgstr "बंद केले"
 
-#: ../cli/src/network-manager.c:188
+#: ../cli/src/network-manager.c:193
 msgid "NetworkManager status"
 msgstr "NetworkManager स्थिती"
 
 #. Print header
-#: ../cli/src/network-manager.c:191
+#: ../cli/src/network-manager.c:196
 msgid "running"
 msgstr "कार्यरत आहे"
 
-#: ../cli/src/network-manager.c:191
+#: ../cli/src/network-manager.c:196
 msgid "not running"
 msgstr "कार्यरत नाही"
 
-#: ../cli/src/network-manager.c:222 ../cli/src/utils.c:322
+#: ../cli/src/network-manager.c:271
+msgid "auth"
+msgstr "auth"
+
+#: ../cli/src/network-manager.c:301
+#, c-format
+msgid "Error: 'nm permissions': %s"
+msgstr "त्रुटी: 'nm permissions': %s"
+
+#: ../cli/src/network-manager.c:303
+#, c-format
+msgid "Error: 'nm permissions': %s; allowed fields: %s"
+msgstr "त्रुटी: 'nm permissions': %s; स्वीकार्य क्षेत्र: %s"
+
+#: ../cli/src/network-manager.c:324
+msgid "NetworkManager permissions"
+msgstr "NetworkManager परवानगी"
+
+#: ../cli/src/network-manager.c:350 ../cli/src/utils.c:457
 #, 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
+#: ../cli/src/network-manager.c:361
 #, 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
+#: ../cli/src/network-manager.c:367
 #, 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
+#: ../cli/src/network-manager.c:416 ../cli/src/network-manager.c:471
+#: ../cli/src/network-manager.c:509 ../cli/src/network-manager.c:548
 #, c-format
 msgid "Error: '--fields' value '%s' is not valid here; allowed fields: %s"
 msgstr "त्रुटी: येथील '--fields' मूल्य '%s' वैध नाही; स्वीकार्य क्षेत्र: %s"
 
-#: ../cli/src/network-manager.c:291
-#| msgid "WiFi enabled"
+#: ../cli/src/network-manager.c:424
 msgid "Networking enabled"
 msgstr "नेटवर्किंग सुरू केले"
 
-#: ../cli/src/network-manager.c:307
+#: ../cli/src/network-manager.c:440
 #, 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
+#: ../cli/src/network-manager.c:450
 #, 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
+#: ../cli/src/network-manager.c:458
 #, 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
+#: ../cli/src/network-manager.c:479
 msgid "WiFi enabled"
 msgstr "WiFi समर्थीत"
 
-#: ../cli/src/network-manager.c:362
+#: ../cli/src/network-manager.c:495
 #, c-format
 msgid "Error: invalid 'wifi' parameter: '%s'."
 msgstr "त्रुटी: अवैध 'wifi' घटक: '%s'."
 
-#: ../cli/src/network-manager.c:384
+#: ../cli/src/network-manager.c:517
 msgid "WWAN enabled"
 msgstr "WWAN समर्थीत"
 
-#: ../cli/src/network-manager.c:400
+#: ../cli/src/network-manager.c:533
 #, c-format
 msgid "Error: invalid 'wwan' parameter: '%s'."
 msgstr "त्रुटी: अवैध 'wwan' घटक: '%s'."
 
-#: ../cli/src/network-manager.c:423
-#| msgid "WiFi enabled"
+#: ../cli/src/network-manager.c:556
 msgid "WiMAX enabled"
 msgstr "WiMAX समर्थीत"
 
-#: ../cli/src/network-manager.c:439
+#: ../cli/src/network-manager.c:572
 #, c-format
-#| msgid "Error: invalid 'wifi' parameter: '%s'."
 msgid "Error: invalid 'wimax' parameter: '%s'."
 msgstr "त्रुटी: अवैध 'wimax' घटक: '%s'."
 
-#: ../cli/src/network-manager.c:452
+#: ../cli/src/network-manager.c:588
 #, c-format
 msgid "Error: 'nm' command '%s' is not valid."
 msgstr "त्रुटी: 'nm' आदेश '%s' वैध नाही."
 
-#: ../cli/src/nmcli.c:64
+#: ../cli/src/nmcli.c:76
 #, c-format
 #| msgid ""
 #| "Usage: %s [OPTIONS] OBJECT { COMMAND | help }\n"
@@ -1241,6 +1710,8 @@ msgstr "त्रुटी: 'nm' आदेश '%s' वैध नाही."
 #| "  -f[ields] |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"
@@ -1265,319 +1736,386 @@ msgid ""
 "  -h[elp]                                    print this help\n"
 "\n"
 "OBJECT\n"
-"  nm          NetworkManager status\n"
-"  con         NetworkManager connections\n"
-"  dev         devices managed by NetworkManager\n"
+"  nm              NetworkManager's status\n"
+"  c[onnection]    NetworkManager's connections\n"
+"  d[evice]        devices managed by NetworkManager\n"
 "\n"
 msgstr ""
 "वापर: %s [OPTIONS] OBJECT { COMMAND | help }\n"
 "\n"
 "OPTIONS\n"
-"  -t[erse]                                   टर्स आऊटपुट\n"
-"  -p[retty]                                  प्रेटि आऊटपुट\n"
-"  -m[ode] tabular|multiline                  आऊटपुट मोड\n"
-"  -f[ields] |all|common   आऊटपुटमध्ये क्षेत्र निर्देशीत करा\n"
-"  -e[scape] yes|no                           मूल्यांमध्ये कॉलम विभाजक एस्केप करा\n"
-"  -n[ocheck]                                 nmcli व "
-"NetworkManager आवृत्ती तपासू नका\n"
-"  -v[ersion]                                 कार्यक्रमाची आवृत्ती दाखवा\n"
-"  -h[elp]                                    या मदतची छपाई करा\n"
+"  -t[erse]                                   terse output\n"
+"  -p[retty]                                  pretty output\n"
+"  -m[ode] tabular|multiline                  output mode\n"
+"  -f[ields] |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"
 "OBJECT\n"
-"  nm          NetworkManager स्थिती\n"
-"  con         NetworkManager जोडणी\n"
-"  dev         NetworkManager द्वारे व्यवस्थापीत साधने\n"
+"  nm              NetworkManager's status\n"
+"  c[onnection]    NetworkManager's connections\n"
+"  d[evice]        devices managed by NetworkManager\n"
 "\n"
 
-#: ../cli/src/nmcli.c:109
+#: ../cli/src/nmcli.c:124
 #, c-format
 msgid "Error: Object '%s' is unknown, try 'nmcli help'."
 msgstr "त्रुटी: घटक '%s' अपरिचीत आहे, 'nmcli help' वापरून पहा."
 
-#: ../cli/src/nmcli.c:139
+#: ../cli/src/nmcli.c:154
 #, c-format
 msgid "Error: Option '--terse' is specified the second time."
 msgstr "त्रुटी: पर्याय '--terse' दुसऱ्यावेळी निर्देशीत केले."
 
-#: ../cli/src/nmcli.c:144
+#: ../cli/src/nmcli.c:159
 #, c-format
 msgid "Error: Option '--terse' is mutually exclusive with '--pretty'."
 msgstr "त्रुटी: '--pretty' च्या तुलनेत पर्याय '--terse' वेगळे आहे."
 
-#: ../cli/src/nmcli.c:152
+#: ../cli/src/nmcli.c:167
 #, c-format
 msgid "Error: Option '--pretty' is specified the second time."
 msgstr "त्रुटी: पर्याय '--pretty' दुसऱ्यावेळी निर्देशीत केले."
 
-#: ../cli/src/nmcli.c:157
+#: ../cli/src/nmcli.c:172
 #, c-format
 msgid "Error: Option '--pretty' is mutually exclusive with '--terse'."
 msgstr "त्रुटी: '--terse' च्या तुलनेत पर्याय '--pretty' वेगळे आहे."
 
-#: ../cli/src/nmcli.c:167 ../cli/src/nmcli.c:183
+#: ../cli/src/nmcli.c:182 ../cli/src/nmcli.c:198
 #, c-format
 msgid "Error: missing argument for '%s' option."
 msgstr "त्रुटी: '%s' पर्यायकरीता न आढळलेले घटक."
 
-#: ../cli/src/nmcli.c:176 ../cli/src/nmcli.c:192
+#: ../cli/src/nmcli.c:191 ../cli/src/nmcli.c:207
 #, c-format
 msgid "Error: '%s' is not valid argument for '%s' option."
 msgstr "त्रुटी: '%s' पर्यायकरीता '%s' वैध घटक नाही."
 
-#: ../cli/src/nmcli.c:199
+#: ../cli/src/nmcli.c:214
 #, c-format
 msgid "Error: fields for '%s' options are missing."
 msgstr "त्रुटी: '%s' पर्यायकरीता क्षेत्र आढळले नाही."
 
-#: ../cli/src/nmcli.c:207
+#: ../cli/src/nmcli.c:222
 #, c-format
 msgid "nmcli tool, version %s\n"
 msgstr "nmcli साधन, आवृत्ती %s\n"
 
-#: ../cli/src/nmcli.c:213
+#: ../cli/src/nmcli.c:228
 #, c-format
 msgid "Error: Option '%s' is unknown, try 'nmcli -help'."
 msgstr "त्रुटी: पर्याय '%s' अपरिचीत आहे, 'nmcli -help' वापरून पहा."
 
-#: ../cli/src/nmcli.c:232
+#: ../cli/src/nmcli.c:247
 #, c-format
 msgid "Caught signal %d, shutting down..."
 msgstr "संकेत %d प्राप्त झाले, बंद करत आहे..."
 
-#: ../cli/src/nmcli.c:257
-#| msgid "Error: Could not get user settings."
+#: ../cli/src/nmcli.c:272
 msgid "Error: Could not create NMClient object."
 msgstr "त्रुटी: NMClient ऑब्जेक्ट निर्माण करणे अशक्य."
 
-#: ../cli/src/nmcli.c:273
+#: ../cli/src/nmcli.c:288
 msgid "Success"
 msgstr "यश"
 
-#: ../cli/src/settings.c:423
+#: ../cli/src/settings.c:527
 #, c-format
 msgid "%d (hex-ascii-key)"
 msgstr "%d (hex-ascii-key)"
 
-#: ../cli/src/settings.c:425
+#: ../cli/src/settings.c:529
 #, c-format
 msgid "%d (104/128-bit passphrase)"
 msgstr "%d (104/128-बीट पासफ्रेज)"
 
-#: ../cli/src/settings.c:428
+#: ../cli/src/settings.c:532 ../cli/src/settings.c:660
 #, c-format
 msgid "%d (unknown)"
 msgstr "%d (अपरिचीत)"
 
-#: ../cli/src/settings.c:454
+#: ../cli/src/settings.c:558
 msgid "0 (unknown)"
 msgstr "0 (अपरिचीत)"
 
-#: ../cli/src/settings.c:460
+#: ../cli/src/settings.c:564
 msgid "any, "
 msgstr "कुठलेही, "
 
-#: ../cli/src/settings.c:462
+#: ../cli/src/settings.c:566
 msgid "900 MHz, "
 msgstr "900 MHz, "
 
-#: ../cli/src/settings.c:464
+#: ../cli/src/settings.c:568
 msgid "1800 MHz, "
 msgstr "1800 MHz, "
 
-#: ../cli/src/settings.c:466
+#: ../cli/src/settings.c:570
 msgid "1900 MHz, "
 msgstr "1900 MHz, "
 
-#: ../cli/src/settings.c:468
+#: ../cli/src/settings.c:572
 msgid "850 MHz, "
 msgstr "850 MHz, "
 
-#: ../cli/src/settings.c:470
+#: ../cli/src/settings.c:574
 msgid "WCDMA 3GPP UMTS 2100 MHz, "
 msgstr "WCDMA 3GPP UMTS 2100 MHz, "
 
-#: ../cli/src/settings.c:472
+#: ../cli/src/settings.c:576
 msgid "WCDMA 3GPP UMTS 1800 MHz, "
 msgstr "WCDMA 3GPP UMTS 1800 MHz, "
 
-#: ../cli/src/settings.c:474
+#: ../cli/src/settings.c:578
 msgid "WCDMA 3GPP UMTS 1700/2100 MHz, "
 msgstr "WCDMA 3GPP UMTS 1700/2100 MHz, "
 
-#: ../cli/src/settings.c:476
+#: ../cli/src/settings.c:580
 msgid "WCDMA 3GPP UMTS 800 MHz, "
 msgstr "WCDMA 3GPP UMTS 800 MHz, "
 
-#: ../cli/src/settings.c:478
+#: ../cli/src/settings.c:582
 msgid "WCDMA 3GPP UMTS 850 MHz, "
 msgstr "WCDMA 3GPP UMTS 850 MHz, "
 
-#: ../cli/src/settings.c:480
+#: ../cli/src/settings.c:584
 msgid "WCDMA 3GPP UMTS 900 MHz, "
 msgstr "WCDMA 3GPP UMTS 900 MHz, "
 
-#: ../cli/src/settings.c:482
+#: ../cli/src/settings.c:586
 msgid "WCDMA 3GPP UMTS 1700 MHz, "
 msgstr "WCDMA 3GPP UMTS 1700 MHz, "
 
-#: ../cli/src/settings.c:566 ../cli/src/settings.c:732
+#: ../cli/src/settings.c:588
+msgid "WCDMA 3GPP UMTS 1900 MHz, "
+msgstr "WCDMA 3GPP UMTS 1900 MHz, "
+
+#: ../cli/src/settings.c:590
+msgid "WCDMA 3GPP UMTS 2600 MHz, "
+msgstr "WCDMA 3GPP UMTS 2600 MHz, "
+
+#: ../cli/src/settings.c:608
+msgid "0 (NONE)"
+msgstr "0 (NONE)"
+
+#: ../cli/src/settings.c:614
+msgid "REORDER_HEADERS, "
+msgstr "REORDER_HEADERS, "
+
+#: ../cli/src/settings.c:616
+msgid "GVRP, "
+msgstr "GVRP, "
+
+#: ../cli/src/settings.c:618
+msgid "LOOSE_BINDING, "
+msgstr "LOOSE_BINDING, "
+
+#: ../cli/src/settings.c:654
+#, c-format
+msgid "%d (disabled)"
+msgstr "%d (बंद केले)"
+
+#: ../cli/src/settings.c:656
+#, c-format
+msgid "%d (enabled, prefer public IP)"
+msgstr "%d (सुरू केले, पब्लिक IP शिफारसीय आहे)"
+
+#: ../cli/src/settings.c:658
+#, c-format
+msgid "%d (enabled, prefer temporary IP)"
+msgstr "%d (सुरू केले, तात्पुर्ते IP शिफारसीय आहे)"
+
+#: ../cli/src/settings.c:791 ../cli/src/settings.c:987
+#: ../cli/src/settings.c:1696
 msgid "auto"
 msgstr "स्वयं"
 
-#: ../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:103
+#, c-format
+msgid "Error converting IP4 address '0x%X' to text form"
+msgstr "IP4 पत्ता '0x%X' यास मजकूर स्वरूपात रूपांतरीत करतेवेळी त्रुटी"
+
+#: ../cli/src/utils.c:131
+#, c-format
+msgid "Error converting IP6 address '%s' to text form"
+msgstr "IP6 पत्ता '%s' यास मजकूर स्वरूपात रूपांतरीत करतेवेळी त्रुटी"
 
-#: ../cli/src/utils.c:128
+#: ../cli/src/utils.c:232
 #, c-format
 msgid "field '%s' has to be alone"
 msgstr "क्षेत्र '%s' वेगळे असायला हवे"
 
-#: ../cli/src/utils.c:131
+#: ../cli/src/utils.c:235
 #, c-format
 msgid "invalid field '%s'"
 msgstr "अवैध क्षेत्र '%s'"
 
-#: ../cli/src/utils.c:150
-#, c-format
+#: ../cli/src/utils.c:254
 msgid "Option '--terse' requires specifying '--fields'"
 msgstr "पर्याय '--terse' यांस '--fields' निर्देशीत करणे आवश्यक आहे"
 
-#: ../cli/src/utils.c:154
+#: ../cli/src/utils.c:258
 #, c-format
 msgid "Option '--terse' requires specific '--fields' option values , not '%s'"
-msgstr "पर्याय '--terse' यांस '--fields' पर्याय मूल्ये निर्देशीत करणे आवश्यक आहे , '%s' नाही"
+msgstr ""
+"पर्याय '--terse' यांस '--fields' पर्याय मूल्ये निर्देशीत करणे आवश्यक आहे , '%"
+"s' नाही"
 
-#: ../cli/src/utils.c:333
+#: ../cli/src/utils.c:468
 #, c-format
 msgid "Error: Couldn't create D-Bus object proxy for org.freedesktop.DBus"
-msgstr "त्रुटी: org.freedesktop.DBus करीता D-Bus ऑब्जेक्ट प्रॉक्सी निर्माण करणे अशक्य"
+msgstr ""
+"त्रुटी: org.freedesktop.DBus करीता D-Bus ऑब्जेक्ट प्रॉक्सी निर्माण करणे अशक्य"
 
-#: ../cli/src/utils.c:341
+#: ../cli/src/utils.c:476
 #, c-format
 msgid "Error: NameHasOwner request failed: %s"
 msgstr "त्रुटी: NameHasOwner विनंती अपयशी: %s"
 
-#: ../cli/src/utils.c:386
+#: ../cli/src/utils.c:521
 #, 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"
+msgstr ""
+"सावधानता: nmcli (%s) व NetworkManager (%s) आवृत्ती जुळत नाही. सावधानता "
+"दडपण्यासाठी --nocheck याचा वापर करा.\n"
 
-#: ../cli/src/utils.c:395
+#: ../cli/src/utils.c:530
 #, 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 याचा वापर करा, परंतु परिणाम वर्तवणेजोगी नाही."
+msgstr ""
+"त्रुटी: nmcli (%s) व NetworkManager (%s) आवृत्ती जुळत नाही. जबरनरित्या "
+"चालवण्यासाठी "
+"--nocheck याचा वापर करा, परंतु परिणाम वर्तवणेजोगी नाही."
 
-#: ../libnm-util/crypto.c:127
+#: ../libnm-util/crypto.c:133
 #, c-format
 msgid "PEM key file had no end tag '%s'."
 msgstr "PEM कि फाइल अंतर्गत समाप्त टॅघ '%s' आढळले नाही."
 
-#: ../libnm-util/crypto.c:140
+#: ../libnm-util/crypto.c:146
 #, c-format
 msgid "Doesn't look like a PEM private key file."
 msgstr "PEM वैयक्तिक कि फाइल नुरूप आढळले नाही."
 
-#: ../libnm-util/crypto.c:148
+#: ../libnm-util/crypto.c:154
 #, c-format
 msgid "Not enough memory to store PEM file data."
 msgstr "PEM फाइल माहिती साठवण्याकरीता स्मृती शिल्लक नाही."
 
-#: ../libnm-util/crypto.c:164
+#: ../libnm-util/crypto.c:170
 #, c-format
 msgid "Malformed PEM file: Proc-Type was not first tag."
 msgstr "सदोषीत PEM फाइल: Proc-Type प्रथम टॅग नव्हते."
 
-#: ../libnm-util/crypto.c:172
+#: ../libnm-util/crypto.c:178
 #, c-format
 msgid "Malformed PEM file: unknown Proc-Type tag '%s'."
 msgstr "सदोषीत PEM फाइल: अपरिचीत Proc-Type टॅग '%s'."
 
-#: ../libnm-util/crypto.c:182
+#: ../libnm-util/crypto.c:188
 #, c-format
 msgid "Malformed PEM file: DEK-Info was not the second tag."
 msgstr "सदोषीत PEM फाइल: DEK-Info दूसरे टॅग नव्हते."
 
-#: ../libnm-util/crypto.c:193
+#: ../libnm-util/crypto.c:199
 #, c-format
 msgid "Malformed PEM file: no IV found in DEK-Info tag."
 msgstr "सदोषीत PEM फाइल: DEK-Info टॅग अंतर्गत IV आढळले नाही."
 
-#: ../libnm-util/crypto.c:200
+#: ../libnm-util/crypto.c:206
 #, c-format
 msgid "Malformed PEM file: invalid format of IV in DEK-Info tag."
 msgstr "सदोषीत PEM फाइल:DEK-Info टॅग अंतर्गत IV चे अवैध स्वरूप आढळे."
 
-#: ../libnm-util/crypto.c:213
+#: ../libnm-util/crypto.c:219
 #, c-format
 msgid "Malformed PEM file: unknown private key cipher '%s'."
 msgstr "सदोषीत PEM फाइल: अपरिचीत वैयक्तिक सीफर कि '%s'."
 
-#: ../libnm-util/crypto.c:232
+#: ../libnm-util/crypto.c:238
 #, c-format
 msgid "Could not decode private key."
 msgstr "वैयक्तिक कि डिकोड करू शकले नाही."
 
-#: ../libnm-util/crypto.c:268 ../libnm-util/crypto.c:554
+#: ../libnm-util/crypto.c:284
+msgid "Failed to find expected PKCS#8 start tag."
+msgstr "अपेक्षित PKCS#8 सुरूवातीचे टॅग शोधण्यास अपयशी."
+
+#: ../libnm-util/crypto.c:292
+#, c-format
+msgid "Failed to find expected PKCS#8 end tag '%s'."
+msgstr "अपेक्षित PKCS#8 समाप्तिचे टॅग '%s' शोधण्यास अपयशी."
+
+#: ../libnm-util/crypto.c:312
+msgid "Not enough memory to store private key data."
+msgstr "व्यक्तिगत कि डाटा साठवण्याकरीता अतिरिक्त स्मृती नाही."
+
+#: ../libnm-util/crypto.c:317
+msgid "Failed to decode PKCS#8 private key."
+msgstr "PKCS#8 प्राइव्हेट कि डिकोड करण्यास अपयशी."
+
+#: ../libnm-util/crypto.c:339 ../libnm-util/crypto.c:625
 #, c-format
 msgid "Not enough memory to store certificate data."
 msgstr "प्रमाणपत्र माहिती साठवण्याकरीता स्मृती शिल्लक नाही."
 
-#: ../libnm-util/crypto.c:294
+#: ../libnm-util/crypto.c:365
 #, c-format
 msgid "IV must be an even number of bytes in length."
 msgstr "IV ची लांबी सम बाईटस् ची संख्या असायला हवी."
 
-#: ../libnm-util/crypto.c:303
+#: ../libnm-util/crypto.c:374
 #, c-format
 msgid "Not enough memory to store the IV."
 msgstr "IV साठवण्याकरीता स्मृती शिल्ल्क नाही."
 
-#: ../libnm-util/crypto.c:314
+#: ../libnm-util/crypto.c:385
 #, c-format
 msgid "IV contains non-hexadecimal digits."
 msgstr "IV अंतर्गत non-hexadecimal अंक."
 
-#: ../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
+#: ../libnm-util/crypto.c:423 ../libnm-util/crypto_gnutls.c:147
+#: ../libnm-util/crypto_gnutls.c:265 ../libnm-util/crypto_nss.c:167
+#: ../libnm-util/crypto_nss.c:332
 #, c-format
 msgid "Private key cipher '%s' was unknown."
 msgstr "वैयक्तिक कि सिफर '%s' अपरिचीत नुरूप आढळले."
 
-#: ../libnm-util/crypto.c:361
+#: ../libnm-util/crypto.c:432
 #, c-format
 msgid "Not enough memory to decrypt private key."
 msgstr "फाइल माहिती साठवण्याकरीता स्मृती शिल्लक नाही."
 
-#: ../libnm-util/crypto.c:426
+#: ../libnm-util/crypto.c:497
 #, c-format
 msgid "Not enough memory to store decrypted private key."
 msgstr "जुणी वैयक्तिक कि साठवण्याकरीता स्मृती शिल्ल्क नाही."
 
-#: ../libnm-util/crypto.c:471
+#: ../libnm-util/crypto.c:542
 #, c-format
 msgid "Unable to determine private key type."
 msgstr "वैयक्तिक कि प्रकार ओळखणे अशक्य."
 
-#: ../libnm-util/crypto.c:526
+#: ../libnm-util/crypto.c:597
 #, c-format
-#| msgid "PEM certificate '%s' had no end tag '%s'."
 msgid "PEM certificate had no start tag '%s'."
 msgstr "PEM प्रमाणपत्रात सुरवात टॅग '%s' आढळले नाही."
 
-#: ../libnm-util/crypto.c:535
+#: ../libnm-util/crypto.c:606
 #, 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
+#: ../libnm-util/crypto.c:630
 #, c-format
 msgid "Failed to decode certificate."
 msgstr "प्रमाणपत्र डिकोड करण्यास अपयशी."
@@ -1586,346 +2124,512 @@ msgstr "प्रमाणपत्र डिकोड करण्यास अ
 msgid "Failed to initialize the crypto engine."
 msgstr "क्रिप्टो इंजीन प्रारंभ करण्यास अपयशी."
 
-#: ../libnm-util/crypto_gnutls.c:94
+#: ../libnm-util/crypto_gnutls.c:92
 #, c-format
 msgid "Failed to initialize the MD5 engine: %s / %s."
 msgstr "MD5 इंजीन प्रारंभ करण्यास अपयशी: %s / %s."
 
-#: ../libnm-util/crypto_gnutls.c:157
+#: ../libnm-util/crypto_gnutls.c:155
 #, c-format
 msgid "Invalid IV length (must be at least %zd)."
 msgstr "अवैध IV लांबी (किमान %zd असायला हवे)."
 
-#: ../libnm-util/crypto_gnutls.c:166 ../libnm-util/crypto_nss.c:188
+#: ../libnm-util/crypto_gnutls.c:164 ../libnm-util/crypto_nss.c:184
 #, c-format
 msgid "Not enough memory for decrypted key buffer."
 msgstr "जुणे कि बफर करीता स्मृती शिल्लक नाही."
 
-#: ../libnm-util/crypto_gnutls.c:174
+#: ../libnm-util/crypto_gnutls.c:172
 #, c-format
 msgid "Failed to initialize the decryption cipher context: %s / %s."
 msgstr "डिक्रीपशन सिफर संदर्भ प्रारंभ करण्यास अपयशी: %s / %s."
 
-#: ../libnm-util/crypto_gnutls.c:183
+#: ../libnm-util/crypto_gnutls.c:181
 #, c-format
 msgid "Failed to set symmetric key for decryption: %s / %s."
 msgstr "डिक्रीपशन करीता सम कि निश्चित करण्यास अपयशी: %s / %s."
 
-#: ../libnm-util/crypto_gnutls.c:192
+#: ../libnm-util/crypto_gnutls.c:190
 #, c-format
 msgid "Failed to set IV for decryption: %s / %s."
 msgstr "डिक्रीपशन करीता IV निश्चित करण्यास अपयशी: %s / %s."
 
-#: ../libnm-util/crypto_gnutls.c:201
+#: ../libnm-util/crypto_gnutls.c:199
 #, c-format
 msgid "Failed to decrypt the private key: %s / %s."
 msgstr "वैयक्तिक कि डिक्रीप्ट करण्यास अपयशी: %s / %s."
 
-#: ../libnm-util/crypto_gnutls.c:211 ../libnm-util/crypto_nss.c:267
+#: ../libnm-util/crypto_gnutls.c:209 ../libnm-util/crypto_nss.c:263
 #, c-format
 msgid "Failed to decrypt the private key: unexpected padding length."
 msgstr "प्राइव्हेट कि डिक्रीप्ट करणे अशक्य: अनपेक्षीत पॅडींग लांबी."
 
-#: ../libnm-util/crypto_gnutls.c:222 ../libnm-util/crypto_nss.c:278
+#: ../libnm-util/crypto_gnutls.c:220 ../libnm-util/crypto_nss.c:274
 #, c-format
 msgid "Failed to decrypt the private key."
 msgstr "वैयक्तिक कि डिक्रीप्ट करण्यास अपयशी."
 
-#: ../libnm-util/crypto_gnutls.c:287 ../libnm-util/crypto_nss.c:356
+#: ../libnm-util/crypto_gnutls.c:285 ../libnm-util/crypto_nss.c:352
 #, c-format
 msgid "Could not allocate memory for encrypting."
 msgstr "एनक्रिप्टींग करीता मेमरीचे वाटप करणे अशक्य."
 
-#: ../libnm-util/crypto_gnutls.c:295
+#: ../libnm-util/crypto_gnutls.c:293
 #, c-format
 msgid "Failed to initialize the encryption cipher context: %s / %s."
 msgstr "एनक्रिप्शन सीफर संदर्भ सुरू करण्यास अपयशी: %s / %s."
 
-#: ../libnm-util/crypto_gnutls.c:304
+#: ../libnm-util/crypto_gnutls.c:302
 #, c-format
 msgid "Failed to set symmetric key for encryption: %s / %s."
 msgstr "एनक्रिप्शनकरीता सम कि सेट करण्यास अपयशी: %s / %s."
 
-#: ../libnm-util/crypto_gnutls.c:314
+#: ../libnm-util/crypto_gnutls.c:312
 #, c-format
 msgid "Failed to set IV for encryption: %s / %s."
 msgstr "एनक्रिप्शन करीता IV सेट करण्यास अपयशी: %s / %s."
 
-#: ../libnm-util/crypto_gnutls.c:323
+#: ../libnm-util/crypto_gnutls.c:321
 #, c-format
 msgid "Failed to encrypt the data: %s / %s."
 msgstr "डिक्रीप्ट करण्यास अपयशी: %s / %s."
 
-#: ../libnm-util/crypto_gnutls.c:363
+#: ../libnm-util/crypto_gnutls.c:361
 #, c-format
 msgid "Error initializing certificate data: %s"
 msgstr "प्रमाण माहिती प्रारंभ करण्यास त्रुटी: %s"
 
-#: ../libnm-util/crypto_gnutls.c:385
+#: ../libnm-util/crypto_gnutls.c:383
 #, c-format
 msgid "Couldn't decode certificate: %s"
 msgstr "प्रमाणपत्र डिकोड करण्यास अशक्य: %s"
 
-#: ../libnm-util/crypto_gnutls.c:409
+#: ../libnm-util/crypto_gnutls.c:407
 #, c-format
 msgid "Couldn't initialize PKCS#12 decoder: %s"
 msgstr "PKCS#12 डिकोडर प्रारंभ करण्यास अशक्य: %s"
 
-#: ../libnm-util/crypto_gnutls.c:422
+#: ../libnm-util/crypto_gnutls.c:420
 #, c-format
 msgid "Couldn't decode PKCS#12 file: %s"
 msgstr "PKCS#12 फाइल डिकोड करण्यास अपयशी: %s"
 
-#: ../libnm-util/crypto_gnutls.c:434
+#: ../libnm-util/crypto_gnutls.c:432
 #, c-format
 msgid "Couldn't verify PKCS#12 file: %s"
 msgstr "PKCS#12 फाइल तपासण्यास अशक्य: %s"
 
+#: ../libnm-util/crypto_gnutls.c:460
+#, c-format
+msgid "Couldn't initialize PKCS#8 decoder: %s"
+msgstr "PKCS#8 डिकोडर: %s सुरू करणे अशक्य"
+
+#: ../libnm-util/crypto_gnutls.c:483
+#, c-format
+msgid "Couldn't decode PKCS#8 file: %s"
+msgstr "PKCS#8 फाइल: %s डिकोड करणे अशक्य"
+
 #: ../libnm-util/crypto_nss.c:56
 #, c-format
 msgid "Failed to initialize the crypto engine: %d."
 msgstr "क्रिप्टो इंजीन प्रारंभ करण्यास अपयशी: %d."
 
-#: ../libnm-util/crypto_nss.c:111
+#: ../libnm-util/crypto_nss.c:107
 #, c-format
 msgid "Failed to initialize the MD5 context: %d."
 msgstr "MD5 संदर्भ प्रारंभ करण्यास अपयशी: %d."
 
-#: ../libnm-util/crypto_nss.c:179
+#: ../libnm-util/crypto_nss.c:175
 #, c-format
 msgid "Invalid IV length (must be at least %d)."
 msgstr "अवैध IV लांबी (किमान %d असायला हवे)."
 
-#: ../libnm-util/crypto_nss.c:196
+#: ../libnm-util/crypto_nss.c:192
 #, c-format
 msgid "Failed to initialize the decryption cipher slot."
 msgstr "डिक्रीपशन सिफर क्षेत्र प्रारंभ करण्यास अपयशी."
 
-#: ../libnm-util/crypto_nss.c:206
+#: ../libnm-util/crypto_nss.c:202
 #, c-format
 msgid "Failed to set symmetric key for decryption."
 msgstr "डिक्रीपशन करीता सम कि निश्चित करण्यास अपयशी."
 
-#: ../libnm-util/crypto_nss.c:216
+#: ../libnm-util/crypto_nss.c:212
 #, c-format
 msgid "Failed to set IV for decryption."
 msgstr "डिक्रीपशन करीता IV निश्चित करण्यास अपयशी."
 
-#: ../libnm-util/crypto_nss.c:224
+#: ../libnm-util/crypto_nss.c:220
 #, c-format
 msgid "Failed to initialize the decryption context."
 msgstr "डिक्रीपशन संदर्भ प्रारंभ करण्यास अपयशी."
 
-#: ../libnm-util/crypto_nss.c:237
+#: ../libnm-util/crypto_nss.c:233
 #, c-format
 msgid "Failed to decrypt the private key: %d."
 msgstr "वैयक्तिक कि डिक्रीप्ट करण्यास अपयशी: %d."
 
-#: ../libnm-util/crypto_nss.c:245
+#: ../libnm-util/crypto_nss.c:241
 #, c-format
 msgid "Failed to decrypt the private key: decrypted data too large."
-msgstr "प्राइव्हेट कि डिक्रीप्ट करणे अशक्य: डिक्रीप्ट केलेला डाटा खूप मोठा आहे."
+msgstr ""
+"प्राइव्हेट कि डिक्रीप्ट करणे अशक्य: डिक्रीप्ट केलेला डाटा खूप मोठा आहे."
 
-#: ../libnm-util/crypto_nss.c:256
+#: ../libnm-util/crypto_nss.c:252
 #, c-format
 msgid "Failed to finalize decryption of the private key: %d."
 msgstr "वैयक्तिक किचे डिक्रीपशन ठरविण्यास अपयशी: %d."
 
-#: ../libnm-util/crypto_nss.c:364
+#: ../libnm-util/crypto_nss.c:360
 #, c-format
 msgid "Failed to initialize the encryption cipher slot."
 msgstr "एनक्रिप्शन सीफर स्लॉट सुरू करणे अशक्य."
 
-#: ../libnm-util/crypto_nss.c:372
+#: ../libnm-util/crypto_nss.c:368
 #, c-format
 msgid "Failed to set symmetric key for encryption."
 msgstr "एनक्रिप्शन करीता सिमेट्रीक कि सेट करण्यास अपयशी."
 
-#: ../libnm-util/crypto_nss.c:380
+#: ../libnm-util/crypto_nss.c:376
 #, c-format
 msgid "Failed to set IV for encryption."
 msgstr "एनक्रिप्शनसाठी IV सेट करण्यास अपयशी."
 
-#: ../libnm-util/crypto_nss.c:388
+#: ../libnm-util/crypto_nss.c:384
 #, c-format
 msgid "Failed to initialize the encryption context."
 msgstr "एनक्रिप्शन संदर्भ प्रारंभ करण्यास अपयशी."
 
-#: ../libnm-util/crypto_nss.c:396
+#: ../libnm-util/crypto_nss.c:392
 #, c-format
 msgid "Failed to encrypt: %d."
 msgstr "एनक्रिप्ट करण्यास अपयशी: %d."
 
-#: ../libnm-util/crypto_nss.c:404
+#: ../libnm-util/crypto_nss.c:400
 #, c-format
 msgid "Unexpected amount of data after encrypting."
 msgstr "एनक्रिप्टींग नंतर अनपेक्षीत डाटाचे प्रमाण."
 
-#: ../libnm-util/crypto_nss.c:447
+#: ../libnm-util/crypto_nss.c:443
 #, c-format
 msgid "Couldn't decode certificate: %d"
 msgstr "प्रमाणपत्र डिकोड करणे अशक्य: %d"
 
-#: ../libnm-util/crypto_nss.c:482
+#: ../libnm-util/crypto_nss.c:478
 #, c-format
 msgid "Couldn't convert password to UCS2: %d"
 msgstr "परवलीचा शब्द UCS2 नुरूप रूपांतरन अशक्य: %d"
 
-#: ../libnm-util/crypto_nss.c:510
+#: ../libnm-util/crypto_nss.c:506
 #, c-format
 msgid "Couldn't initialize PKCS#12 decoder: %d"
 msgstr "PKCS#12 डिकोडर प्रारंभ करण्यास अशक्य: %d"
 
-#: ../libnm-util/crypto_nss.c:519
+#: ../libnm-util/crypto_nss.c:515
 #, c-format
 msgid "Couldn't decode PKCS#12 file: %d"
 msgstr "PKCS#12 फाइल डिकोड करण्यास अशक्य: %d"
 
-#: ../libnm-util/crypto_nss.c:528
+#: ../libnm-util/crypto_nss.c:524
 #, c-format
 msgid "Couldn't verify PKCS#12 file: %d"
 msgstr "PKCS#12 फाइल तपास करण्यास अशक्य: %d"
 
-#: ../libnm-util/crypto_nss.c:557
+#: ../libnm-util/crypto_nss.c:568
 msgid "Could not generate random data."
 msgstr "विनाक्रम डाटा निर्माण करणे अशक्य."
 
-#: ../libnm-util/nm-utils.c:1989
+#: ../libnm-util/nm-utils.c:2078
 #, c-format
 msgid "Not enough memory to make encryption key."
 msgstr "एनक्रिप्शन कि निर्माण करण्यास अतिरीक्त मेमरी आढळली नाही."
 
-#: ../libnm-util/nm-utils.c:2099
+#: ../libnm-util/nm-utils.c:2188
 msgid "Could not allocate memory for PEM file creation."
 msgstr "PEM फाइल निर्माणकरीता मेमरीचे वाटप करणे अशक्य."
 
-#: ../libnm-util/nm-utils.c:2111
+#: ../libnm-util/nm-utils.c:2200
 #, c-format
 msgid "Could not allocate memory for writing IV to PEM file."
 msgstr "IV ला PEM फाइलवर लिहण्यासाठी मेमरीचे वाटप करणे अशक्य."
 
-#: ../libnm-util/nm-utils.c:2123
+#: ../libnm-util/nm-utils.c:2212
 #, c-format
 msgid "Could not allocate memory for writing encrypted key to PEM file."
 msgstr "एनक्रिप्टेड किला PEM फाइलवर लिहण्यासाठी मेमरीचे वाटप करणे अशक्य."
 
-#: ../libnm-util/nm-utils.c:2142
+#: ../libnm-util/nm-utils.c:2231
 #, c-format
 msgid "Could not allocate memory for PEM file data."
 msgstr "PEM फाइल डाटाकरीता मेमरीचे वाटप करणे अशक्य."
 
-#: ../policy/org.freedesktop.NetworkManager.policy.in.h:1
-msgid "Allow control of network connections"
-msgstr "नेटवर्क जोडणींचे नियंत्रण स्वीकारा"
+#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:1
+msgid "Enable or disable system networking"
+msgstr "प्रणाली नेटवर्किंग सुरू किंवा बंद करा"
 
-#: ../policy/org.freedesktop.NetworkManager.policy.in.h:2
-msgid "Connection sharing via a protected WiFi network"
-msgstr "सुरक्षीत WiFi नेटवर्क द्वारे जोडणीचे शेअरींग करा"
+#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:2
+msgid "System policy prevents enabling or disabling system networking"
+msgstr "प्रणाली करार प्रणाली नेटवर्किंगसा सुरू किंवा बंद होण्यापासून रोखते"
 
-#: ../policy/org.freedesktop.NetworkManager.policy.in.h:3
-msgid "Connection sharing via an open WiFi network"
-msgstr "ओपन WiFi नेटवर्क द्वारे कनेक्शन शेअरींग करा"
+#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:3
+msgid ""
+"Put NetworkManager to sleep or wake it up (should only be used by system "
+"power management)"
+msgstr ""
+"NetworkManager ला स्लीप किंवा वेकअप स्तरात न्या (फक्त प्रणाली पावर "
+"मॅनेजमेंटनेच याचा "
+"वापर करावा)"
 
-#: ../policy/org.freedesktop.NetworkManager.policy.in.h:4
+#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:4
+msgid "System policy prevents putting NetworkManager to sleep or waking it up"
+msgstr ""
+"प्रणाली करार NetworkManager ला स्लीप किंवा वेकअप मध्ये जाण्यापासून रोखते"
+
+#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:5
 msgid "Enable or disable WiFi devices"
 msgstr "WiFi साधने सुरू किंवा बंद करा"
 
-#: ../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.in.h:6
+msgid "System policy prevents enabling or disabling WiFi devices"
+msgstr "प्रणाली करार WiFi साधनांना सुरू किंवा बंद होण्यापासून रोखते"
 
-#: ../policy/org.freedesktop.NetworkManager.policy.in.h:6
+#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:7
 msgid "Enable or disable mobile broadband devices"
 msgstr "मोबाईल ब्रॉडबँड साधने सुरू किंवा बंद करा"
 
-#: ../policy/org.freedesktop.NetworkManager.policy.in.h:7
-msgid "Enable or disable system networking"
-msgstr "प्रणाली नेटवर्किंग सुरू किंवा बंद करा"
-
-#: ../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.in.h:8
+msgid "System policy prevents enabling or disabling mobile broadband devices"
+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.in.h:9
+msgid "Enable or disable WiMAX mobile broadband devices"
+msgstr "WiMAX मोबाईल ब्रॉडबँड साधने सुरू किंवा बंद करा"
 
-#: ../policy/org.freedesktop.NetworkManager.policy.in.h:11
+#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:10
 msgid ""
-"Put NetworkManager to sleep or wake it up (should only be used by system "
-"power management)"
-msgstr "NetworkManager ला स्लीप किंवा वेकअप स्तरात न्या (फक्त प्रणाली पावर मॅनेजमेंटनेच याचा वापर करावा)"
+"System policy prevents enabling or disabling WiMAX mobile broadband devices"
+msgstr ""
+"प्रणाली करार WiMAX मोबाईल ब्रॉडबँड साधनांना सुरू किंवा बंद होण्यापासून रोखते"
 
-#: ../policy/org.freedesktop.NetworkManager.policy.in.h:12
+#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:11
+msgid "Allow control of network connections"
+msgstr "नेटवर्क जोडणींचे नियंत्रण स्वीकारा"
+
+#: ../policy/org.freedesktop.NetworkManager.policy.in.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.in.h:13
+msgid "Connection sharing via a protected WiFi network"
+msgstr "सुरक्षीत WiFi नेटवर्क द्वारे जोडणीचे शेअरींग करा"
 
-#: ../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.in.h:14
+msgid "System policy prevents sharing connections via a protected WiFi network"
+msgstr "प्रणाली करार सुरक्षीत WiFi नेटवर्क द्वारे जोडणीचे शेअरींग रोखत आहे"
 
-#: ../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.in.h:15
+msgid "Connection sharing via an open WiFi network"
+msgstr "ओपन WiFi नेटवर्क द्वारे कनेक्शन शेअरींग करा"
 
-#: ../policy/org.freedesktop.NetworkManager.policy.in.h:16
-msgid "System policy prevents enabling or disabling system networking"
-msgstr "प्रणाली करार प्रणाली नेटवर्किंगसा सुरू किंवा बंद होण्यापासून रोखते"
+#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:16
+msgid "System policy prevents sharing connections via an open WiFi network"
+msgstr "प्रणाली करार ओपन WiFi नेटवर्क द्वारे जोडणीचे शेअरींग रोखत आहे"
 
-#: ../policy/org.freedesktop.NetworkManager.policy.in.h:17
-#| msgid "System policy prevents modification of system settings"
-msgid "System policy prevents modification of network settings for all users"
-msgstr "प्रणाली करार सर्व वापरकर्त्यांना नेटवर्क सेटिंग्स् संपादीत करण्यापासून रोखते"
+#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:17
+msgid "Modify personal network connections"
+msgstr "वैयक्तिक नेटवर्क जोडणी संपादित करा"
 
-#: ../policy/org.freedesktop.NetworkManager.policy.in.h:18
-#| msgid "System policy prevents modification of system settings"
+#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:18
 msgid "System policy prevents modification of personal network settings"
 msgstr "प्रणाली करार, व्यक्तिगत नेटवर्क सेटिंग्स् संपादीत करण्यापासून रोखते"
 
-#: ../policy/org.freedesktop.NetworkManager.policy.in.h:19
+#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:19
+msgid "Modify network connections for all users"
+msgstr "सर्व वापरकर्त्यांकरीता नेटवर्क जोडणी संपादित करा"
+
+#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:20
+msgid "System policy prevents modification of network settings for all users"
+msgstr ""
+"प्रणाली करार सर्व वापरकर्त्यांना नेटवर्क सेटिंग्स् संपादीत करण्यापासून रोखते"
+
+#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:21
+msgid "Modify persistent system hostname"
+msgstr "पर्सिस्टंट प्रणाली यजमाननाव संपादीत करा"
+
+#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:22
 msgid "System policy prevents modification of the persistent system hostname"
 msgstr "प्रणाली करार पर्सिस्टंट प्रणाली यजमाननावाचे संपादन रोखत आहे"
 
-#: ../policy/org.freedesktop.NetworkManager.policy.in.h:20
-msgid "System policy prevents putting NetworkManager to sleep or waking it up"
-msgstr "प्रणाली करार NetworkManager ला स्लीप किंवा वेकअप मध्ये जाण्यापासून रोखते"
+#: ../src/main.c:158
+#, c-format
+msgid "Failed to set signal mask: %d"
+msgstr "सिग्नल मास्क: %d सेट करण्यास अपयशी"
 
-#: ../policy/org.freedesktop.NetworkManager.policy.in.h:21
-msgid "System policy prevents sharing connections via a protected WiFi network"
-msgstr "प्रणाली करार सुरक्षीत WiFi नेटवर्क द्वारे जोडणीचे शेअरींग रोखत आहे"
+#: ../src/main.c:167
+#, c-format
+msgid "Failed to create signal handling thread: %d"
+msgstr "सिग्नल हाताळणी थ्रेड: %d निर्माण करण्यास अपयशी"
 
-#: ../policy/org.freedesktop.NetworkManager.policy.in.h:22
-msgid "System policy prevents sharing connections via an open WiFi network"
-msgstr "प्रणाली करार ओपन WiFi नेटवर्क द्वारे जोडणीचे शेअरींग रोखत आहे"
+#: ../src/main.c:182
+#, c-format
+msgid "Opening %s failed: %s\n"
+msgstr "%s ला उघडण्यास अपयशी: %s\n"
+
+#: ../src/main.c:188
+#, c-format
+msgid "Writing to %s failed: %s\n"
+msgstr "%s करीता लिहण्यास अपयशी: %s\n"
+
+#: ../src/main.c:193
+#, c-format
+msgid "Closing %s failed: %s\n"
+msgstr "%s बंद करण्यास अपयशी: %s\n"
+
+#: ../src/main.c:236
+#, c-format
+msgid "NetworkManager is already running (pid %ld)\n"
+msgstr "NetworkManager आधिपासूनच (pid %ld) चालवत आहे\n"
 
-#: ../src/main.c:519
+#: ../src/main.c:363
+msgid "Print NetworkManager version and exit"
+msgstr "NetworkManager आवृत्तीची छपाई करा व बाहेर पडा"
+
+#: ../src/main.c:364
+msgid "Don't become a daemon"
+msgstr "डिमन बनू नका"
+
+#: ../src/main.c:365
+msgid "Make all warnings fatal"
+msgstr "सर्व सावधानता धोकादायक करा"
+
+#: ../src/main.c:366
+msgid "Specify the location of a PID file"
+msgstr "PID फाइलचे ठिकाण निर्देशीत करा"
+
+#: ../src/main.c:366
+msgid "filename"
+msgstr "फाइलनाव"
+
+#: ../src/main.c:367
+msgid "State file location"
+msgstr "फाइल ठिकाण ठरवा"
+
+#: ../src/main.c:367
+msgid "/path/to/state.file"
+msgstr "/path/to/state.file"
+
+#: ../src/main.c:368
+msgid "Config file location"
+msgstr "फाइल ठिकाण संरचीत करा"
+
+#: ../src/main.c:368
+msgid "/path/to/config.file"
+msgstr "/path/to/config.file"
+
+#: ../src/main.c:369
+msgid "List of plugins separated by ','"
+msgstr "',' तर्फे विभाजीत प्लगइंस्ची सूची"
+
+#: ../src/main.c:369
+msgid "plugin1,plugin2"
+msgstr "plugin1,plugin2"
+
+#. Translators: Do not translate the values in the square brackets
+#: ../src/main.c:371
+msgid "Log level: one of [ERR, WARN, INFO, DEBUG]"
+msgstr "लॉग स्तर: [ERR, WARN, INFO, DEBUG] पैकी एक"
+
+#. Translators: Do not translate the values in the square brackets
+#: ../src/main.c:374
+msgid ""
+"Log domains separated by ',': any combination of\n"
+"                                                [NONE,HW,RFKILL,ETHER,WIFI,"
+"BT,MB,DHCP4,DHCP6,PPP,\n"
+"                                                 WIFI_SCAN,IP4,IP6,AUTOIP4,"
+"DNS,VPN,SHARING,SUPPLICANT,\n"
+"                                                 AGENTS,SETTINGS,SUSPEND,"
+"CORE,DEVICE,OLPC,WIMAX,\n"
+"                                                 INFINIBAND,FIREWALL,ADSL]"
+msgstr ""
+"',' तर्फे विभाजीत लॉग डोमैन्स्: खालीलपैकी कोणतेहि एक\n"
+"                                                [NONE,HW,RFKILL,ETHER,WIFI,"
+"BT,MB,DHCP4,DHCP6,PPP,\n"
+"                                                 WIFI_SCAN,IP4,IP6,AUTOIP4,"
+"DNS,VPN,SHARING,SUPPLICANT,\n"
+"                                                 AGENTS,SETTINGS,SUSPEND,"
+"CORE,DEVICE,OLPC,WIMAX,\n"
+"                                                 INFINIBAND,FIREWALL,ADSL]"
+
+#: ../src/main.c:380
+msgid "An http(s) address for checking internet connectivity"
+msgstr "इंटरनेट जोडणी तपासणीकरीता http(s) पत्ता"
+
+#: ../src/main.c:381
+msgid "The interval between connectivity checks (in seconds)"
+msgstr "जोडणी तपासणी (सेकंदात) अंतर्गत कालवधि"
+
+#: ../src/main.c:382
+msgid "The expected start of the response"
+msgstr "प्रतिसादाची अपेक्षित सुरूवात"
+
+#: ../src/main.c:382
+msgid "Bingo!"
+msgstr "बिंगो!"
+
+#: ../src/main.c:387
+#, c-format
+msgid "GModules are not supported on your platform!\n"
+msgstr "GModules तुमच्या प्लॅफॉर्मवर समर्थीत नाही!\n"
+
+#: ../src/main.c:406
+msgid ""
+"NetworkManager monitors all network connections and automatically\n"
+"chooses the best connection to use.  It also allows the user to\n"
+"specify wireless access points which wireless cards in the computer\n"
+"should associate with."
+msgstr ""
+"NetworkManager सर्व नेटवर्क जोडणी नियंत्रीत करतो व स्वयंरित्या वापरकरीता\n"
+"उत्तम जोडणी पसंत करतो. ते वापरकर्त्याला वायरलेस ॲक्सेस पॉईंटस् निर्देशीत "
+"करण्यास\n"
+"परवानगी देते ज्यासह संगणकातील वायरलेस\n"
+"कार्डस् संपर्क\n"
+"साधतात."
+
+#: ../src/main.c:412
 #, c-format
 msgid "Invalid option.  Please use --help to see a list of valid options.\n"
 msgstr "अवैध पर्याय.  वैध पर्यायची यादी पहाण्याकरीता कृपया --help वापरा.\n"
 
-#: ../src/main.c:590
+#: ../src/main.c:422
+#, c-format
+msgid "You must be root to run NetworkManager!\n"
+msgstr "NetworkManager सुरू करण्यासाठी रूट असणे आवश्यक!\n"
+
+#: ../src/main.c:449
+#, c-format
+msgid "Failed to read configuration: (%d) %s\n"
+msgstr "संरचना: (%d) %s वाचण्यास अशक्य\n"
+
+#: ../src/main.c:460
 #, 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-utils.c:62
+#: ../src/main.c:467
+#, c-format
+msgid "State file %s parsing failed: (%d) %s\n"
+msgstr "स्टेट फाइल %s वाचण्यास अपयशी: (%d) %s\n"
+
+#: ../src/main.c:484
+#, c-format
+msgid "Could not daemonize: %s [error %u]\n"
+msgstr "डिमनाइज करणे अशक्य: %s [error %u]\n"
+
+#: ../src/dhcp-manager/nm-dhcp-dhclient-utils.c:61
 msgid "# Created by NetworkManager\n"
 msgstr "# NetworkManager द्वारे निर्मीत\n"
 
-#: ../src/dhcp-manager/nm-dhcp-dhclient-utils.c:69
+#: ../src/dhcp-manager/nm-dhcp-dhclient-utils.c:68
 #, c-format
 msgid ""
 "# Merged from %s\n"
@@ -1934,130 +2638,209 @@ msgstr ""
 "# %s पासून एकत्रीत केले\n"
 "\n"
 
-#: ../src/dhcp-manager/nm-dhcp-manager.c:284
+#: ../src/dhcp-manager/nm-dhcp-manager.c:266
 msgid "no usable DHCP client could be found."
 msgstr "वापरण्याजोगी DHCP क्लाएंट आढळले नाही."
 
-#: ../src/dhcp-manager/nm-dhcp-manager.c:293
+#: ../src/dhcp-manager/nm-dhcp-manager.c:275
 msgid "'dhclient' could be found."
 msgstr "'dhclient' आढळले नाही."
 
-#: ../src/dhcp-manager/nm-dhcp-manager.c:303
+#: ../src/dhcp-manager/nm-dhcp-manager.c:285
 msgid "'dhcpcd' could be found."
 msgstr "'dhcpcd' आढळले नाही."
 
-#: ../src/dhcp-manager/nm-dhcp-manager.c:311
+#: ../src/dhcp-manager/nm-dhcp-manager.c:293
 #, c-format
 msgid "unsupported DHCP client '%s'"
 msgstr "असमर्थीत DHCP क्लाएंट '%s'"
 
-#: ../src/dns-manager/nm-dns-manager.c:367
+#: ../src/dns-manager/nm-dns-manager.c:375
 msgid "NOTE: the libc resolver may not support more than 3 nameservers."
-msgstr "NOTE: libc रिजॉलव्हर 3 पेक्षा जास्त नेमसर्व्हर्स् करीता समर्थन पुरवू शकणार नाही."
+msgstr ""
+"NOTE: libc रिजॉलव्हर 3 पेक्षा जास्त नेमसर्व्हर्स् करीता समर्थन पुरवू शकणार "
+"नाही."
 
-#: ../src/dns-manager/nm-dns-manager.c:369
+#: ../src/dns-manager/nm-dns-manager.c:377
 msgid "The nameservers listed below may not be recognized."
 msgstr "खालिल यादीतील नेमसर्व्हर्स् अनोळखी राहतील."
 
-#: ../src/logging/nm-logging.c:149
+#: ../src/logging/nm-logging.c:142
 #, c-format
 msgid "Unknown log level '%s'"
 msgstr "अपरिचीत लॉग स्तर '%s'"
 
-#: ../src/logging/nm-logging.c:174
+#: ../src/logging/nm-logging.c:181
 #, c-format
 msgid "Unknown log domain '%s'"
 msgstr "अपरिचीत लॉग डोमेन '%s'"
 
-#: ../src/modem-manager/nm-modem-cdma.c:296 ../src/nm-device-bt.c:355
+#: ../src/modem-manager/nm-modem-cdma.c:280 ../src/nm-device-bt.c:351
 #, c-format
-#| msgid "connection failed"
 msgid "CDMA connection %d"
 msgstr "CDMA जोडणी %d"
 
-#: ../src/modem-manager/nm-modem-gsm.c:499 ../src/nm-device-bt.c:351
+#: ../src/modem-manager/nm-modem-gsm.c:558 ../src/nm-device-bt.c:347
 #, c-format
-#| msgid "connection failed"
 msgid "GSM connection %d"
 msgstr "GSM जोडणी %d"
 
-#: ../src/nm-device-bt.c:326
+#: ../src/nm-device-bond.c:192
+#, c-format
+msgid "Bond connection %d"
+msgstr "बाँड जोडणी %d"
+
+#: ../src/nm-device-adsl.c:193
+#, c-format
+msgid "ADSL connection %d"
+msgstr "ADSL जोडणी %d"
+
+#: ../src/nm-device-bt.c:322
 #, c-format
-#| msgid "VPN connection failed"
 msgid "PAN connection %d"
 msgstr "PAN जोडणी %d"
 
-#: ../src/nm-device-bt.c:359
+#: ../src/nm-device-bt.c:355
 #, c-format
-#| msgid "VPN connection failed"
 msgid "DUN connection %d"
 msgstr "DUN जोडणी %d"
 
-#: ../src/nm-device-ethernet.c:1681
+#: ../src/nm-device-ethernet.c:1326
 #, c-format
-#| msgid "VPN connection failed"
 msgid "PPPoE connection %d"
 msgstr "PPPoE जोडणी %d"
 
-#: ../src/nm-device-ethernet.c:1681 ../src/settings/nm-settings.c:1354
+#: ../src/nm-device-ethernet.c:1326 ../src/settings/nm-settings-utils.c:50
 #, c-format
-#| msgid "Active connections"
 msgid "Wired connection %d"
 msgstr "वायर्ड् जोडणी %d"
 
-#: ../src/nm-device-olpc-mesh.c:423
+#: ../src/nm-device-infiniband.c:303
+#, c-format
+msgid "InfiniBand connection %d"
+msgstr "इंफिनिबँड जोडणी %d"
+
+#: ../src/nm-device-olpc-mesh.c:311
 #, c-format
 msgid "Mesh %d"
 msgstr "मेशMesh %d"
 
-#: ../src/nm-manager.c:660
+#: ../src/nm-device-vlan.c:362
+#, c-format
+msgid "VLAN connection %d"
+msgstr "VLAN जोडणी %d"
+
+#: ../src/nm-manager.c:662
 #, 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
+#: ../src/nm-netlink-monitor.c:148 ../src/nm-netlink-monitor.c:272
+#: ../src/nm-netlink-monitor.c:695
 #, c-format
 msgid "error processing netlink message: %s"
 msgstr "netlink संदेश विश्लेषीत करतेवेळी त्रुटी: %s"
 
-#: ../src/nm-netlink-monitor.c:214
+#: ../src/nm-netlink-monitor.c:251
 msgid "error occurred while waiting for data on socket"
 msgstr "सॉकेट वरील माहिती करीता प्रतिक्षा करतेवेळी त्रुटी आढळली"
 
-#: ../src/nm-netlink-monitor.c:254
+#: ../src/nm-netlink-monitor.c:296
 #, c-format
 msgid "unable to connect to netlink for monitoring link status: %s"
-msgstr "दुवा स्थिती नियंत्रीत करण्याकरीता netlink शी जुळवणी स्थापीत करणे अशक्य: %s"
+msgstr ""
+"दुवा स्थिती नियंत्रीत करण्याकरीता netlink शी जुळवणी स्थापीत करणे अशक्य: %s"
 
-#: ../src/nm-netlink-monitor.c:265
+#: ../src/nm-netlink-monitor.c:307
 #, 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
+#: ../src/nm-netlink-monitor.c:330 ../src/nm-netlink-monitor.c:390
 #, c-format
 msgid "unable to allocate netlink handle for monitoring link status: %s"
 msgstr "दुवा स्थिती नियंत्रीत करण्याकरीता netlink handle चे वाटप अशक्य: %s"
 
-#: ../src/nm-netlink-monitor.c:376
+#: ../src/nm-netlink-monitor.c:415
 #, c-format
 msgid "unable to allocate netlink link cache for monitoring link status: %s"
-msgstr "दुवा स्थिती नियंत्रीत करण्याकरीता netlink दुवा कॅशे वाटप करणे अशक्य: %s"
+msgstr ""
+"दुवा स्थिती नियंत्रीत करण्याकरीता netlink दुवा कॅशे वाटप करणे अशक्य: %s"
 
-#: ../src/nm-netlink-monitor.c:502
+#: ../src/nm-netlink-monitor.c:542
 #, c-format
 msgid "unable to join netlink group: %s"
 msgstr "netlink गटसह जोडणी करणे अशक्य: %s"
 
-#: ../src/nm-netlink-monitor.c:629 ../src/nm-netlink-monitor.c:642
+#: ../src/nm-netlink-monitor.c:671 ../src/nm-netlink-monitor.c:684
 #, c-format
 msgid "error updating link cache: %s"
 msgstr "दुवा कॅशे अद्ययावत करतेवेळी त्रुटी: %s"
 
-#: ../src/settings/plugins/ifcfg-rh/reader.c:3464
-#: ../src/settings/plugins/ifnet/connection_parser.c:51
+#: ../src/settings/plugins/ifcfg-rh/reader.c:93
 msgid "System"
 msgstr "प्रणाली"
 
+#: ../src/settings/plugins/ifcfg-rh/reader.c:3663
+msgid "Bond"
+msgstr "बाँड"
+
+#: ../test/nm-online.c:111
+#, c-format
+msgid "\rConnecting"
+msgstr "\rजोडणी करत आहे"
+
+#: ../test/nm-online.c:142
+msgid "Time to wait for a connection, in seconds (default is 30)"
+msgstr "जोडणीकरीता थांबण्याजोगी वेळ, सेकंदात (30 पूर्वनिर्धारित आहे)"
+
+#: ../test/nm-online.c:143
+msgid "Exit immediately if NetworkManager is not running or connecting"
+msgstr "NetworkManager सुरू नसल्यास किंवा जोडणी अशक्य असल्यास पटकन बाहेर पडा"
+
+#: ../test/nm-online.c:144
+msgid "Don't print anything"
+msgstr "काहिहि छापू नका"
+
+#: ../test/nm-online.c:162
+msgid "Waits for a successful connection in NetworkManager."
+msgstr "NetworkManager मध्ये यशस्वी जोडणीकरीता थांबतो."
+
+#: ../test/nm-online.c:168 ../test/nm-online.c:177
+msgid "Invalid option.  Please use --help to see a list of valid options."
+msgstr ""
+"अवैध पर्याय.  वैध पर्यायांची सूची पहाण्याकरीता कृपया --helpचा वापर करा."
+
+#~ msgid "state: %s\n"
+#~ msgstr "स्तर: %s\n"
+
+#~ msgid "Connection activated\n"
+#~ msgstr "जोडणी सक्रिय केली\n"
+
+#~ msgid "state: %s (%d)\n"
+#~ msgstr "स्तर: %s (%d)\n"
+
+#~ msgid "Active connection state: %s\n"
+#~ msgstr "सक्रिय जोडणीचे स्तर: %s\n"
+
+#~ msgid "Active connection path: %s\n"
+#~ msgstr "सक्रिय जोडणीचे मार्ग: %s\n"
+
+#~ msgid "IP4-SETTINGS"
+#~ msgstr "IP4-SETTINGS"
+
+#~| msgid "IP4-SETTINGS"
+#~ msgid "IP6-SETTINGS"
+#~ msgstr "IP6-SETTINGS"
+
+#~ msgid "PREFIX"
+#~ msgstr "PREFIX"
+
+#~ msgid "unknown)"
+#~ msgstr "अपरिचीत)"
+
+#~ msgid "Device state: %d (%s)\n"
+#~ msgstr "साधनाचे स्तर: %d (%s)\n"
+
+#~ msgid "not set"
+#~ msgstr "सेट केले नाही"
diff --git a/po/or.po b/po/or.po
index 32eb1aa1..55488371 100644
--- a/po/or.po
+++ b/po/or.po
@@ -2,982 +2,1808 @@
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
 #
-# Manoj Kumar Giri , 2008, 2010.
+# Manoj Kumar Giri , 2008, 2010, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: NetworkManager.master.or\n"
-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=NetworkManager&component=general\n"
-"POT-Creation-Date: 2010-08-10 03:25+0000\n"
-"PO-Revision-Date: 2010-08-10 12:47+0530\n"
+"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
+"product=NetworkManager&keywords=I18N+L10N&component=general\n"
+"POT-Creation-Date: 2012-11-13 15:25+0000\n"
+"PO-Revision-Date: 2012-11-27 16:40+0530\n"
 "Last-Translator: Manoj Kumar Giri \n"
-"Language-Team: Oriya \n"
+"Language-Team: Oriya \n"
+"Language: or\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: KBabel 1.11.4\n"
+"X-Generator: Lokalize 1.5\n"
 "Plural-Forms: nplurals=2; plural=(n!=1);\n"
 "\n"
 "\n"
 "\n"
 "\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
-msgid "NAME"
-msgstr "NAME"
+#: ../cli/src/common.c:32 ../cli/src/common.c:44 ../cli/src/common.c:52
+#: ../cli/src/common.c:63 ../cli/src/connections.c:128
+#: ../cli/src/connections.c:162
+msgid "GROUP"
+msgstr "ସମୁହ"
 
 #. 0
-#: ../cli/src/connections.c:61 ../cli/src/connections.c:76
-msgid "UUID"
-msgstr "UUID"
+#: ../cli/src/common.c:33 ../cli/src/common.c:53
+msgid "ADDRESS"
+msgstr "ADDRESS"
 
 #. 1
-#: ../cli/src/connections.c:62
-msgid "DEVICES"
-msgstr "DEVICES"
+#: ../cli/src/common.c:34 ../cli/src/common.c:54
+msgid "ROUTE"
+msgstr "ପଥ"
 
 #. 2
-#: ../cli/src/connections.c:63 ../cli/src/connections.c:78
-msgid "SCOPE"
-msgstr "SCOPE"
+#: ../cli/src/common.c:35 ../cli/src/common.c:55
+msgid "DNS"
+msgstr "DNS"
 
 #. 3
-#: ../cli/src/connections.c:64
-msgid "DEFAULT"
-msgstr "DEFAULT"
+#: ../cli/src/common.c:36 ../cli/src/common.c:56
+msgid "DOMAIN"
+msgstr "ଡମେନ"
 
 #. 4
-#: ../cli/src/connections.c:65
-msgid "DBUS-SERVICE"
-msgstr "DBUS-SERVICE"
+#: ../cli/src/common.c:37
+msgid "WINS"
+msgstr "ୱିନସ"
 
-#. 5
-#: ../cli/src/connections.c:66
-msgid "SPEC-OBJECT"
-msgstr "SPEC-OBJECT"
+#. 0
+#: ../cli/src/common.c:45 ../cli/src/common.c:64
+msgid "OPTION"
+msgstr "ବିକଳ୍ପ"
 
-#. 6
-#: ../cli/src/connections.c:67
-msgid "VPN"
-msgstr "VPN"
+#: ../cli/src/common.c:366
+msgid "unmanaged"
+msgstr "ଅପରିଚାଳିତ"
+
+#: ../cli/src/common.c:368
+msgid "unavailable"
+msgstr "ଅନୁପଲବ୍ଧ"
+
+#: ../cli/src/common.c:370 ../cli/src/network-manager.c:120
+msgid "disconnected"
+msgstr "ସଂଯୋଗ ବିଚ୍ଛିନ୍ନ ହୋଇଛି"
+
+#: ../cli/src/common.c:372
+msgid "connecting (prepare)"
+msgstr "ସଂଯୋଗ କରୁଅଛି (ପ୍ରସ୍ତୁତ)"
+
+#: ../cli/src/common.c:374
+msgid "connecting (configuring)"
+msgstr "ସଂଯୋଗ କରୁଅଛି (ବିନ୍ୟାସ କରୁଅଛି)"
+
+#: ../cli/src/common.c:376
+msgid "connecting (need authentication)"
+msgstr "ସଂଯୋଗ କରୁଅଛି (ବୈଧିକରଣ ଆବଶ୍ୟକ)"
+
+#: ../cli/src/common.c:378
+msgid "connecting (getting IP configuration)"
+msgstr "ସଂଯୋଗ କରୁଅଛି (IP ସଂରଚନା ଗ୍ରହଣ କରୁଅଛି)"
+
+#: ../cli/src/common.c:380
+#| msgid "connecting (getting IP configuration)"
+msgid "connecting (checking IP connectivity)"
+msgstr "ସଂଯୋଗ କରୁଅଛି (IP ସଂଯୋଜକତାକୁ ଯାଞ୍ଚ କରୁଅଛି)"
+
+#: ../cli/src/common.c:382
+#| msgid "connecting (getting IP configuration)"
+msgid "connecting (starting secondary connections)"
+msgstr "ସଂଯୋଗ କରୁଅଛି (ଦ୍ୱିତୀୟକ ସଂଯୋଗଗୁଡ଼ିକୁ ଆରମ୍ଭ କରୁଅଛି)"
+
+#: ../cli/src/common.c:384 ../cli/src/network-manager.c:116
+msgid "connected"
+msgstr "ସଂଯୋଗ ସ୍ଥାପିତ ହେଲା"
+
+#: ../cli/src/common.c:386 ../cli/src/connections.c:635
+#| msgid "activating"
+msgid "deactivating"
+msgstr "ନିଷ୍କ୍ରିୟ କରୁଅଛି"
+
+#: ../cli/src/common.c:388
+msgid "connection failed"
+msgstr "ସଂଯୋଗ ବିଫଳ ହୋଇଛି"
+
+#: ../cli/src/common.c:390 ../cli/src/connections.c:638
+#: ../cli/src/connections.c:661 ../cli/src/connections.c:1353
+#: ../cli/src/devices.c:645 ../cli/src/network-manager.c:123
+#: ../cli/src/network-manager.c:185 ../cli/src/network-manager.c:188
+#: ../cli/src/network-manager.c:197 ../cli/src/network-manager.c:257
+#: ../cli/src/network-manager.c:273 ../cli/src/network-manager.c:431
+#: ../cli/src/network-manager.c:486 ../cli/src/network-manager.c:524
+#: ../cli/src/network-manager.c:563 ../cli/src/settings.c:593
+#: ../cli/src/settings.c:621 ../cli/src/utils.c:531 ../src/main.c:451
+#: ../src/main.c:470
+msgid "unknown"
+msgstr "ଅଜଣା"
+
+#: ../cli/src/common.c:399
+msgid "No reason given"
+msgstr "କୌଣସି କାରଣ ଦିଆଯାଇ ନାହିଁ"
+
+#: ../cli/src/common.c:402
+#| msgid "Unknown"
+msgid "Unknown error"
+msgstr "ଅଜଣା ତ୍ରୁଟି"
+
+#: ../cli/src/common.c:405
+msgid "Device is now managed"
+msgstr "ଉପକରଣଟି ବର୍ତ୍ତମାନ ପରିଚାଳିତ"
+
+#: ../cli/src/common.c:408
+msgid "Device is now unmanaged"
+msgstr "ଉପକରଣଟି ବର୍ତ୍ତମାନ ଅପରିଚାଳିତ"
+
+#: ../cli/src/common.c:411
+#| msgid "the VPN service returned invalid configuration"
+msgid "The device could not be readied for configuration"
+msgstr "ଉପକରଣକୁ ସଂରଚନା ପାଇଁ ପଢ଼ିହେଲା ନାହିଁ"
+
+#: ../cli/src/common.c:414
+msgid ""
+"IP configuration could not be reserved (no available address, timeout, etc.)"
+msgstr ""
+"IP ସଂରଚନାକୁ ସଂରକ୍ଷଣ କରିହେଲା ନାହିଁ (କୌଣସି ଉପଲବ୍ଧ ଠିକଣା, ସମୟ ସମାପ୍ତି, ଇତ୍ୟାଦି "
+"ନାହିଁ।)"
+
+#: ../cli/src/common.c:417
+msgid "The IP configuration is no longer valid"
+msgstr "IP ସଂରଚନାଟି ବର୍ତ୍ତମାନ ବୈଧ ନାହିଁ"
+
+#: ../cli/src/common.c:420
+msgid "Secrets were required, but not provided"
+msgstr "ଗୁପ୍ତ ତଥ୍ୟଗୁଡ଼ିକ ଆବଶ୍ୟକ, କିନ୍ତୁ ଦିଆଯାଇ ନାହିଁ"
+
+#: ../cli/src/common.c:423
+msgid "802.1X supplicant disconnected"
+msgstr "802.1X ପ୍ରାର୍ଥି ସହିତ ସଂଯୋଗ ବିଚ୍ଛିନ୍ନ"
+
+#: ../cli/src/common.c:426
+msgid "802.1X supplicant configuration failed"
+msgstr "802.1X ପ୍ରାର୍ଥି ସଂରଚନା ବିଫଳ ହୋଇଛି"
+
+#: ../cli/src/common.c:429
+msgid "802.1X supplicant failed"
+msgstr "802.1X ପ୍ରାର୍ଥି ବିଫଳ"
+
+#: ../cli/src/common.c:432
+msgid "802.1X supplicant took too long to authenticate"
+msgstr "802.1X ପ୍ରାର୍ଥି ବୈଧିକୃତ ହେବା ପାଇଁ ଅଧିକ ସମୟ ନେଇନଥାଏ"
+
+#: ../cli/src/common.c:435
+#| msgid "the VPN service failed to start"
+msgid "PPP service failed to start"
+msgstr "PPC ସର୍ଭିସ ଆରମ୍ଭ ହେବାରେ ବିଫଳ ହୋଇଛି"
+
+#: ../cli/src/common.c:438
+#| msgid "VPN disconnected"
+msgid "PPP service disconnected"
+msgstr "PPP ସର୍ଭିସ ସହିତ ସଂଯୋଗ ବିଚ୍ଛିନ୍ନ ହୋଇଛି"
+
+#: ../cli/src/common.c:441
+msgid "PPP failed"
+msgstr "PPP ବିଫଳ ହୋଇଛି"
+
+#: ../cli/src/common.c:444
+#| msgid "the VPN service failed to start"
+msgid "DHCP client failed to start"
+msgstr "DHCP କ୍ଲାଏଣ୍ଟ ଆରମ୍ଭ ହେବାରେ ବିଫଳ ହୋଇଛି"
+
+#: ../cli/src/common.c:447
+msgid "DHCP client error"
+msgstr "DHCP କ୍ଲାଏଣ୍ଟ ତ୍ରୁଟି"
+
+#: ../cli/src/common.c:450
+#| msgid "VPN connection failed"
+msgid "DHCP client failed"
+msgstr "DHCP କ୍ଲାଏଣ୍ଟ ବିଫଳ ହୋଇଛି"
+
+#: ../cli/src/common.c:453
+#| msgid "the VPN service failed to start"
+msgid "Shared connection service failed to start"
+msgstr "ସହଭାଗୀ ସଂଯୋଗ ସର୍ଭିସ ଆରମ୍ଭ ହେବାରେ ବିଫଳ ହୋଇଛି"
+
+#: ../cli/src/common.c:456
+#| msgid "connection failed"
+msgid "Shared connection service failed"
+msgstr "ସହଭାଗୀ ସଂଯୋଗ ସର୍ଭିସ ବିଫଳ ହୋଇଛି"
+
+#: ../cli/src/common.c:459
+#| msgid "the VPN service failed to start"
+msgid "AutoIP service failed to start"
+msgstr "AutoIP ସର୍ଭିସ ଆରମ୍ଭ ହେବାରେ ବିଫଳ ହୋଇଛି"
+
+#: ../cli/src/common.c:462
+msgid "AutoIP service error"
+msgstr "AutoIP ସର୍ଭିସ ତ୍ରୁଟି"
+
+#: ../cli/src/common.c:465
+#| msgid "the VPN service failed to start"
+msgid "AutoIP service failed"
+msgstr "AutoIP ସର୍ଭିସ ବିଫଳ ହୋଇଛି"
+
+#: ../cli/src/common.c:468
+msgid "The line is busy"
+msgstr "ଧାଡ଼ି ବ୍ୟସ୍ତ ଅଛି"
+
+#: ../cli/src/common.c:471
+msgid "No dial tone"
+msgstr "କୌଣସି ଡାଏଲଟନ ନାହିଁ"
+
+#: ../cli/src/common.c:474
+msgid "No carrier could be established"
+msgstr "କୌଣସିବାହକ ପ୍ରତିଷ୍ଠା ହୋଇ ପାରିବ ନାହିଁ"
+
+#: ../cli/src/common.c:477
+msgid "The dialing request timed out"
+msgstr "ଡାଏଲ ଅନୁରୋଧ ସମୟ ସମାପ୍ତି"
+
+#: ../cli/src/common.c:480
+msgid "The dialing attempt failed"
+msgstr "ଡାଏଲ ପ୍ରଚେଷ୍ଟା ବିଫଳ ହୋଇଛି"
+
+#: ../cli/src/common.c:483
+#| msgid "Error: Connection activation failed."
+msgid "Modem initialization failed"
+msgstr "ମଡେମ ସକ୍ରିୟଣ ବିଫଳ ହୋଇଛି"
+
+#: ../cli/src/common.c:486
+#| msgid "Failed to decrypt the private key."
+msgid "Failed to select the specified APN"
+msgstr "ଉଲ୍ଲିଖିତ APN ବାଛିବାରେ ବିଫଳ"
+
+#: ../cli/src/common.c:489
+msgid "Not searching for networks"
+msgstr "ନେଟୱର୍କଗୁଡ଼ିକ ପାଇଁ କୌଣସି ସନ୍ଧାନ ନାହିଁ"
+
+#: ../cli/src/common.c:492
+msgid "Network registration denied"
+msgstr "ନେଟୱର୍କ ପଞ୍ଜିକରଣ ବାରଣ ହୋଇଛି"
+
+#: ../cli/src/common.c:495
+msgid "Network registration timed out"
+msgstr "ନେଟୱର୍କ ପଞ୍ଜିକରଣ ସମୟ ସମାପ୍ତ"
+
+#: ../cli/src/common.c:498
+msgid "Failed to register with the requested network"
+msgstr "ଅନୁରୋଧ କରାଯାଇଥିବା ନେଟୱର୍କ ସହିତ ପଞ୍ଜିକରଣ କରିବାରେ ବିଫଳ"
+
+#: ../cli/src/common.c:501
+#| msgid "VPN connection failed"
+msgid "PIN check failed"
+msgstr "PIN ଯାଞ୍ଚ ବିଫଳ ହୋଇଛି"
+
+#: ../cli/src/common.c:504
+msgid "Necessary firmware for the device may be missing"
+msgstr "ଉପକରଣ ପାଇଁ ଆବଶ୍ୟକୀୟ ଫର୍ମୱେର ଅନୁପସ୍ଥିତ ଅଛି"
+
+#: ../cli/src/common.c:507
+#| msgid "the connection was removed"
+msgid "The device was removed"
+msgstr "ଉପକରଣଟିକୁ କଢ଼ାଯାଇଛି"
+
+#: ../cli/src/common.c:510
+#| msgid "NetworkManager status"
+msgid "NetworkManager went to sleep"
+msgstr "NetworkManager ସୁପ୍ତ ଅଛି"
+
+#: ../cli/src/common.c:513
+#| msgid "no active connection or device"
+msgid "The device's active connection disappeared"
+msgstr "ଉପକରଣର ସକ୍ରିୟ ସଂଯୋଗ ଅଦୃଶ୍ୟ ହୋଇଛି"
+
+#: ../cli/src/common.c:516
+msgid "Device disconnected by user or client"
+msgstr "ଉପକରଣଟି ବ୍ୟବହାରକାରୀ କିମ୍ବା କ୍ଲାଏଣ୍ଟ ଦ୍ୱାରା ସଂଯୋଗ ବିଚ୍ଛିନ୍ନ ହୋଇଛି"
+
+#: ../cli/src/common.c:519
+msgid "Carrier/link changed"
+msgstr "ବାହକ/ଲିଙ୍କ ପରିବର୍ତ୍ତିତ ହୋଇଛି"
+
+#: ../cli/src/common.c:522
+#| msgid "the connection was removed"
+msgid "The device's existing connection was assumed"
+msgstr "ଉପକରଣର ସ୍ଥିତବାନ ସଂଯୋଗକୁ ଗ୍ରହଣ କରାଯାଇଛି"
+
+#: ../cli/src/common.c:525
+msgid "The supplicant is now available"
+msgstr "ପ୍ରାର୍ଥି ବର୍ତ୍ତମାନ ଉପଲବ୍ଧ"
+
+#: ../cli/src/common.c:528
+#| msgid "'dhcpcd' could be found."
+msgid "The modem could not be found"
+msgstr "ମଡେମ ମିଳିପାରିଲା ନାହିଁ"
+
+#: ../cli/src/common.c:531
+#| msgid "the connection attempt timed out"
+msgid "The Bluetooth connection failed or timed out"
+msgstr "ବ୍ଲୁଟୁଥ ସଂଯୋଗ ବିଫଳ ହୋଇଛି ଅଥବା ସମୟ ସମାପ୍ତ ହୋଇଛି"
+
+#: ../cli/src/common.c:534
+msgid "GSM Modem's SIM card not inserted"
+msgstr "GSM ମଡେମର SIM କାର୍ଡ ଭର୍ତ୍ତି ହୋଇ ନାହିଁ"
+
+#: ../cli/src/common.c:537
+msgid "GSM Modem's SIM PIN required"
+msgstr "GSM ମଡେମର SIM PIN ଆବଶ୍ୟକ"
+
+#: ../cli/src/common.c:540
+msgid "GSM Modem's SIM PUK required"
+msgstr "GSM ମଡେମର SIM PUK ଆବଶ୍ୟକ"
+
+#: ../cli/src/common.c:543
+msgid "GSM Modem's SIM wrong"
+msgstr "GSM ମଡେମର SIM ଭୁଲ ଅଛି"
+
+#: ../cli/src/common.c:546
+msgid "InfiniBand device does not support connected mode"
+msgstr "InfiniBand ଉପକରଣ ସଂଯୁକ୍ତ ଧାରାକୁ ସହାୟତା କରିନଥାଏ"
+
+#: ../cli/src/common.c:549
+#| msgid "connection failed"
+msgid "A dependency of the connection failed"
+msgstr "ସଂଯୋଗର ନିର୍ଭରକ ବିଫଳ ହୋଇଛି"
+
+#: ../cli/src/common.c:552
+msgid "A problem with the RFC 2684 Ethernet over ADSL bridge"
+msgstr "ADSL ବ୍ରିଜ ଉପରେ RFC 2684 ଇଥରନେଟ ସହିତ ଏକ ସମସ୍ୟା ଦେଖାଦେଇଛି"
+
+#: ../cli/src/common.c:555
+msgid "ModemManager is unavailable"
+msgstr "ମଡେମ ପରିଚାଳକ ଉପଲବ୍ଧ ନାହିଁ"
+
+#: ../cli/src/common.c:558
+#| msgid "'dhclient' could be found."
+msgid "The Wi-Fi network could not be found"
+msgstr "Wi-Fi ନେଟୱର୍କ ମିଳିଲା ନାହିଁ"
+
+#: ../cli/src/common.c:561
+msgid "A secondary connection of the base connection failed"
+msgstr "ମୂଳ ସଂଯୋଗର ଏକ ଦ୍ୱିତୀୟକ ସଂଯୋଗ ବିଫଳ ହୋଇଛି"
+
+#: ../cli/src/common.c:564 ../cli/src/devices.c:295 ../cli/src/devices.c:311
+#: ../cli/src/devices.c:433 ../cli/src/devices.c:477
+msgid "Unknown"
+msgstr "ଅଜଣା"
+
+#. 0
+#. used only for 'GENERAL' group listing
+#: ../cli/src/connections.c:59 ../cli/src/connections.c:129
+#: ../cli/src/devices.c:107 ../cli/src/devices.c:131 ../cli/src/devices.c:141
+#: ../cli/src/devices.c:151 ../cli/src/devices.c:165 ../cli/src/devices.c:179
+#: ../cli/src/devices.c:201 ../cli/src/devices.c:217 ../cli/src/devices.c:226
+msgid "NAME"
+msgstr "NAME"
+
+#. 0
+#. 1
+#: ../cli/src/connections.c:60 ../cli/src/connections.c:130
+msgid "UUID"
+msgstr "UUID"
 
 #. 1
 #. 0
 #. 1
-#: ../cli/src/connections.c:77 ../cli/src/devices.c:62 ../cli/src/devices.c:90
+#. 2
+#: ../cli/src/connections.c:61 ../cli/src/connections.c:163
+#: ../cli/src/devices.c:71 ../cli/src/devices.c:109 ../cli/src/devices.c:204
 msgid "TYPE"
 msgstr "TYPE"
 
-#. 3
-#: ../cli/src/connections.c:79
+#. 2
+#: ../cli/src/connections.c:62
 msgid "TIMESTAMP"
 msgstr "TIMESTAMP"
 
-#. 4
-#: ../cli/src/connections.c:80
+#. 3
+#: ../cli/src/connections.c:63
 msgid "TIMESTAMP-REAL"
 msgstr "TIMESTAMP-REAL"
 
-#. 5
-#: ../cli/src/connections.c:81
+#. 4
+#. 13
+#: ../cli/src/connections.c:64 ../cli/src/devices.c:121
 msgid "AUTOCONNECT"
 msgstr "AUTOCONNECT"
 
-#. 6
-#: ../cli/src/connections.c:82
+#. 5
+#: ../cli/src/connections.c:65
 msgid "READONLY"
 msgstr "READONLY"
 
-#: ../cli/src/connections.c:158
-#, c-format
+#. 6
+#. 8
+#. 2
+#. 11
+#. 5
+#: ../cli/src/connections.c:66 ../cli/src/connections.c:137
+#: ../cli/src/devices.c:73 ../cli/src/devices.c:191 ../cli/src/devices.c:207
+msgid "DBUS-PATH"
+msgstr "DBUS-PATH"
+
+#. 2
+#: ../cli/src/connections.c:131
+msgid "DEVICES"
+msgstr "DEVICES"
+
+#. 3
+#. 1
+#. 8
+#. 1
+#: ../cli/src/connections.c:132 ../cli/src/devices.c:72
+#: ../cli/src/devices.c:116 ../cli/src/network-manager.c:39
+msgid "STATE"
+msgstr "STATE"
+
+#. 4
+#: ../cli/src/connections.c:133
+msgid "DEFAULT"
+msgstr "DEFAULT"
+
+#. 5
+#: ../cli/src/connections.c:134
+#| msgid "DEFAULT"
+msgid "DEFAULT6"
+msgstr "DEFAULT6"
+
+#. 6
+#: ../cli/src/connections.c:135
+msgid "SPEC-OBJECT"
+msgstr "SPEC-OBJECT"
+
+#. 7
+#. 1
+#: ../cli/src/connections.c:136 ../cli/src/connections.c:150
+msgid "VPN"
+msgstr "VPN"
+
+#. 9
+#: ../cli/src/connections.c:138
+msgid "CON-PATH"
+msgstr "CON-PATH"
+
+#. 10
+#: ../cli/src/connections.c:139
+msgid "ZONE"
+msgstr "ZONE"
+
+#. 11
+#: ../cli/src/connections.c:140
+msgid "MASTER-PATH"
+msgstr "MASTER-PATH"
+
+#: ../cli/src/connections.c:148 ../cli/src/devices.c:82
+msgid "GENERAL"
+msgstr "GENERAL"
+
+#. 0
+#: ../cli/src/connections.c:149
+#| msgid "TKIP"
+msgid "IP"
+msgstr "IP"
+
+#. 1
+#: ../cli/src/connections.c:164
+#| msgid "NAME"
+msgid "USERNAME"
+msgstr "USERNAME"
+
+#. 2
+#: ../cli/src/connections.c:165
+msgid "GATEWAY"
+msgstr "GATEWAY"
+
+#. 3
+#: ../cli/src/connections.c:166
+msgid "BANNER"
+msgstr "BANNER"
+
+#. 4
+#: ../cli/src/connections.c:167
+#| msgid "STATE"
+msgid "VPN-STATE"
+msgstr "VPN-STATE"
+
+#. 5
+#: ../cli/src/connections.c:168
+msgid "CFG"
+msgstr "CFG"
+
+#: ../cli/src/connections.c:190
+#, c-format
+#| msgid ""
+#| "Usage: nmcli con { COMMAND | help }\n"
+#| "  COMMAND := { list | status | up | down }\n"
+#| "\n"
+#| "  list [id  | uuid  | system | user]\n"
+#| "  status\n"
+#| "  up id  | uuid  [iface ] [ap ] [--nowait] [--"
+#| "timeout ]\n"
+#| "  down id  | uuid \n"
 msgid ""
-"Usage: nmcli con { COMMAND | help }\n"
-"  COMMAND := { list | status | up | down }\n"
+"Usage: nmcli connection { COMMAND | help }\n"
+"  COMMAND := { list | status | up | down | delete }\n"
 "\n"
-"  list [id  | uuid  | system | user]\n"
-"  status\n"
-"  up id  | uuid  [iface ] [ap ] [--nowait] [--timeout "
+"  list [id  | uuid ]\n"
+"  status [id  | uuid  | path ]\n"
+"  up id  | uuid  [iface ] [ap ] [nsp ] [--"
+"nowait] [--timeout ]\n"
+"  up id  | uuid  [iface ] [ap ] [--nowait] [--timeout "
 "]\n"
 "  down id  | uuid \n"
+"  delete id  | uuid \n"
+"\n"
 msgstr ""
-"Usage: nmcli con { COMMAND | help }\n"
-"  COMMAND := { list | status | up | down }\n"
+"ବ୍ୟବହାର ବିଧି: nmcli connection { COMMAND | help }\n"
+"  COMMAND := { list | status | up | down | delete }\n"
 "\n"
-"  list [id  | uuid  | system | user]\n"
-"  status\n"
-"  up id  | uuid  [iface ] [ap ] [--nowait] [--timeout "
+"  list [id  | uuid ]\n"
+"  status [id  | uuid  | path ]\n"
+"  up id  | uuid  [iface ] [ap ] [nsp ] [--"
+"nowait] [--timeout ]\n"
+"  up id  | uuid  [iface ] [ap ] [--nowait] [--timeout "
 "]\n"
 "  down id  | uuid \n"
+"  delete id  | uuid \n"
+"\n"
 
-#: ../cli/src/connections.c:198 ../cli/src/connections.c:537
+#: ../cli/src/connections.c:251 ../cli/src/connections.c:611
 #, c-format
 msgid "Error: 'con list': %s"
 msgstr "ତ୍ରୁଟି: 'con list': %s"
 
-#: ../cli/src/connections.c:200 ../cli/src/connections.c:539
+#: ../cli/src/connections.c:253 ../cli/src/connections.c:613
 #, c-format
 msgid "Error: 'con list': %s; allowed fields: %s"
 msgstr "ତ୍ରୁଟି: 'con list': %s; ଅନୁମତିପ୍ରାପ୍ତ କ୍ଷେତ୍ର: %s"
 
-#: ../cli/src/connections.c:208
+#: ../cli/src/connections.c:261
 msgid "Connection details"
 msgstr "ସଂଯୋଗ ବିବରଣୀ"
 
-#: ../cli/src/connections.c:382 ../cli/src/connections.c:602
-msgid "system"
-msgstr "ତନ୍ତ୍ର"
-
-#: ../cli/src/connections.c:382 ../cli/src/connections.c:602
-msgid "user"
-msgstr "ଚାଳକ"
-
-#: ../cli/src/connections.c:384
+#: ../cli/src/connections.c:486
 msgid "never"
 msgstr "କଦାପି ନୁହଁ"
 
 #. "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:487 ../cli/src/connections.c:488
+#: ../cli/src/connections.c:716 ../cli/src/connections.c:717
+#: ../cli/src/connections.c:719 ../cli/src/devices.c:441
+#: ../cli/src/devices.c:494 ../cli/src/devices.c:610 ../cli/src/devices.c:611
+#: ../cli/src/devices.c:612 ../cli/src/devices.c:644 ../cli/src/devices.c:671
+#: ../cli/src/devices.c:672 ../cli/src/devices.c:673 ../cli/src/devices.c:674
+#: ../cli/src/devices.c:675 ../cli/src/network-manager.c:267
+#: ../cli/src/settings.c:712 ../cli/src/settings.c:787
+#: ../cli/src/settings.c:907 ../cli/src/settings.c:1189
+#: ../cli/src/settings.c:1190 ../cli/src/settings.c:1192
+#: ../cli/src/settings.c:1194 ../cli/src/settings.c:1195
+#: ../cli/src/settings.c:1326 ../cli/src/settings.c:1327
+#: ../cli/src/settings.c:1328 ../cli/src/settings.c:1329
+#: ../cli/src/settings.c:1406 ../cli/src/settings.c:1407
+#: ../cli/src/settings.c:1408 ../cli/src/settings.c:1409
+#: ../cli/src/settings.c:1410 ../cli/src/settings.c:1411
+#: ../cli/src/settings.c:1412 ../cli/src/settings.c:1413
+#: ../cli/src/settings.c:1414 ../cli/src/settings.c:1415
+#: ../cli/src/settings.c:1416 ../cli/src/settings.c:1417
+#: ../cli/src/settings.c:1418 ../cli/src/settings.c:1489
 msgid "yes"
 msgstr "ହଁ"
 
-#: ../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:487 ../cli/src/connections.c:488
+#: ../cli/src/connections.c:716 ../cli/src/connections.c:717
+#: ../cli/src/connections.c:719 ../cli/src/devices.c:441
+#: ../cli/src/devices.c:494 ../cli/src/devices.c:610 ../cli/src/devices.c:611
+#: ../cli/src/devices.c:612 ../cli/src/devices.c:644 ../cli/src/devices.c:671
+#: ../cli/src/devices.c:672 ../cli/src/devices.c:673 ../cli/src/devices.c:674
+#: ../cli/src/devices.c:675 ../cli/src/network-manager.c:269
+#: ../cli/src/settings.c:712 ../cli/src/settings.c:714
+#: ../cli/src/settings.c:787 ../cli/src/settings.c:907
+#: ../cli/src/settings.c:1189 ../cli/src/settings.c:1190
+#: ../cli/src/settings.c:1192 ../cli/src/settings.c:1194
+#: ../cli/src/settings.c:1195 ../cli/src/settings.c:1326
+#: ../cli/src/settings.c:1327 ../cli/src/settings.c:1328
+#: ../cli/src/settings.c:1329 ../cli/src/settings.c:1406
+#: ../cli/src/settings.c:1407 ../cli/src/settings.c:1408
+#: ../cli/src/settings.c:1409 ../cli/src/settings.c:1410
+#: ../cli/src/settings.c:1411 ../cli/src/settings.c:1412
+#: ../cli/src/settings.c:1413 ../cli/src/settings.c:1414
+#: ../cli/src/settings.c:1415 ../cli/src/settings.c:1416
+#: ../cli/src/settings.c:1417 ../cli/src/settings.c:1418
+#: ../cli/src/settings.c:1489
 msgid "no"
 msgstr "ନାଁ"
 
-#: ../cli/src/connections.c:458 ../cli/src/connections.c:501
-msgid "System connections"
-msgstr "ତନ୍ତ୍ର ସଂଯୋଗଗୁଡ଼ିକ"
-
-#: ../cli/src/connections.c:463 ../cli/src/connections.c:514
-msgid "User connections"
-msgstr "ଚାଳକ ସଂଯୋଗଗୁଡ଼ିକ"
-
-#: ../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:562
+#| msgid "Connection details"
+msgid "Connection list"
+msgstr "ସଂଯୋଗ ତାଲିକା"
+
+#: ../cli/src/connections.c:575 ../cli/src/connections.c:1112
+#: ../cli/src/connections.c:1650 ../cli/src/connections.c:1665
+#: ../cli/src/connections.c:1674 ../cli/src/connections.c:1684
+#: ../cli/src/connections.c:1696 ../cli/src/connections.c:1804
+#: ../cli/src/connections.c:1906 ../cli/src/devices.c:1122
+#: ../cli/src/devices.c:1132 ../cli/src/devices.c:1250
+#: ../cli/src/devices.c:1258 ../cli/src/devices.c:1622
+#: ../cli/src/devices.c:1629 ../cli/src/devices.c:1643
+#: ../cli/src/devices.c:1650 ../cli/src/devices.c:1667
+#: ../cli/src/devices.c:1678 ../cli/src/devices.c:1899
+#: ../cli/src/devices.c:1906
 #, c-format
 msgid "Error: %s argument is missing."
 msgstr "ତ୍ରୁଟି: %s ସ୍ୱତନ୍ତ୍ରଚର ଅନୁପସ୍ଥିତ ଅଛି।"
 
-#: ../cli/src/connections.c:488
+#: ../cli/src/connections.c:588
 #, c-format
 msgid "Error: %s - no such connection."
 msgstr "ତ୍ରୁଟି: %s - ଏପରି କୌଣସି ସଂଯୋଗ ନାହିଁ।"
 
-#: ../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:594 ../cli/src/connections.c:1709
+#: ../cli/src/connections.c:1821 ../cli/src/connections.c:1913
+#: ../cli/src/devices.c:906 ../cli/src/devices.c:986 ../cli/src/devices.c:1146
+#: ../cli/src/devices.c:1264 ../cli/src/devices.c:1691
+#: ../cli/src/devices.c:1912
 #, c-format
 msgid "Unknown parameter: %s\n"
 msgstr "ଅଜଣା ପ୍ରାଚଳ: %s\n"
 
-#: ../cli/src/connections.c:529
+#: ../cli/src/connections.c:603
 #, c-format
 msgid "Error: no valid parameter specified."
 msgstr "ତ୍ରୁଟି: କୌଣସି ବୈଧ ପ୍ରାଚଳ ଉଲ୍ଲେଖ ହୋଇନାହିଁ।"
 
-#: ../cli/src/connections.c:544 ../cli/src/connections.c:1577
-#: ../cli/src/devices.c:1293 ../cli/src/network-manager.c:274
+#: ../cli/src/connections.c:618 ../cli/src/connections.c:2009
+#: ../cli/src/devices.c:2123 ../cli/src/network-manager.c:599
 #, c-format
 msgid "Error: %s."
 msgstr "ତ୍ରୁଟି: %s."
 
-#: ../cli/src/connections.c:650
-#, c-format
-msgid "Error: 'con status': %s"
-msgstr "ତ୍ରୁଟି: 'con status': %s"
-
-#: ../cli/src/connections.c:652
-#, c-format
-msgid "Error: 'con status': %s; allowed fields: %s"
-msgstr "ତ୍ରୁଟି: 'con status': %s; ଅନୁମତିପ୍ରାପ୍ତ କ୍ଷେତ୍ର: %s"
-
-#: ../cli/src/connections.c:659
-msgid "Active connections"
-msgstr "ସକ୍ରିୟ ସଂଯୋଗଗୁଡ଼ିକ"
-
-#: ../cli/src/connections.c:1027
-#, c-format
-msgid "no active connection on device '%s'"
-msgstr "ଉପକରଣ '%s' ରେ କୌଣସି ସକ୍ରିୟ ସଂଯୋଗ ନାହିଁ"
-
-#: ../cli/src/connections.c:1035
-#, c-format
-msgid "no active connection or device"
-msgstr "କୌଣସି ସକ୍ରିୟ ସଂଯୋଗ କିମ୍ବା ଉପକରଣ ନାହିଁ"
-
-#: ../cli/src/connections.c:1085
-#, c-format
-msgid "device '%s' not compatible with connection '%s'"
-msgstr "ଉପକରଣ '%s' ସଂଯୋଗ '%s' ସହିତ ସୁସଙ୍ଗତ ନୁହଁ"
-
-#: ../cli/src/connections.c:1087
-#, c-format
-msgid "no device found for connection '%s'"
-msgstr "ସଂଯୋଗ '%s' ପାଇଁ କୌଣସି ଉପକରଣ ମିଳିଲା ନାହିଁ"
-
-#: ../cli/src/connections.c:1098
+#: ../cli/src/connections.c:631
 msgid "activating"
 msgstr "ସକ୍ରିୟ କରୁଅଛି"
 
-#: ../cli/src/connections.c:1100
+#: ../cli/src/connections.c:633
 msgid "activated"
 msgstr "ସକ୍ରିୟ ହୋଇସାରିଛି"
 
-#: ../cli/src/connections.c:1103 ../cli/src/connections.c:1126
-#: ../cli/src/connections.c:1159 ../cli/src/devices.c:246
-#: ../cli/src/devices.c:558 ../cli/src/network-manager.c:92
-#: ../cli/src/network-manager.c:145 ../cli/src/settings.c:473
-msgid "unknown"
-msgstr "ଅଜଣା"
-
-#: ../cli/src/connections.c:1112
+#: ../cli/src/connections.c:647
 msgid "VPN connecting (prepare)"
 msgstr "VPN ସଂଯୋଗ କରୁଅଛି (ପ୍ରସ୍ତୁତ)"
 
-#: ../cli/src/connections.c:1114
+#: ../cli/src/connections.c:649
 msgid "VPN connecting (need authentication)"
 msgstr "VPN ସଂଯୋଗ କରୁଅଛି (ବୈଧିକରଣ ଆବଶ୍ୟକ)"
 
-#: ../cli/src/connections.c:1116
+#: ../cli/src/connections.c:651
 msgid "VPN connecting"
 msgstr "VPN ସଂଯୋଗ କରୁଅଛି"
 
-#: ../cli/src/connections.c:1118
+#: ../cli/src/connections.c:653
 msgid "VPN connecting (getting IP configuration)"
 msgstr "VPN ସଂଯୋଗ କରୁଅଛି (IP ସଂରଚନା ଗ୍ରହଣ କରୁଅଛି)"
 
-#: ../cli/src/connections.c:1120
+#: ../cli/src/connections.c:655
 msgid "VPN connected"
 msgstr "VPN ସଂଯୁକ୍ତ ହୋଇଛି"
 
-#: ../cli/src/connections.c:1122
+#: ../cli/src/connections.c:657
 msgid "VPN connection failed"
 msgstr "VPN ସଂଯୋଗ ବିଫଳ ହୋଇଛି"
 
-#: ../cli/src/connections.c:1124
+#: ../cli/src/connections.c:659
 msgid "VPN disconnected"
 msgstr "VPN ସଂଯୋଗ ବିଚ୍ଛିନ୍ନ ହୋଇଛି"
 
-#: ../cli/src/connections.c:1135
+#: ../cli/src/connections.c:712 ../cli/src/connections.c:722
+msgid "N/A"
+msgstr "N/A"
+
+#: ../cli/src/connections.c:916 ../cli/src/connections.c:1140
+#, c-format
+msgid "Error: 'con status': %s"
+msgstr "ତ୍ରୁଟି: 'con status': %s"
+
+#: ../cli/src/connections.c:918 ../cli/src/connections.c:1142
+#, c-format
+msgid "Error: 'con status': %s; allowed fields: %s"
+msgstr "ତ୍ରୁଟି: 'con status': %s; ଅନୁମତିପ୍ରାପ୍ତ କ୍ଷେତ୍ର: %s"
+
+#: ../cli/src/connections.c:926
+#| msgid "Active connections"
+msgid "Active connection details"
+msgstr "ସକ୍ରିୟ ସଂଯୋଗ ବିବରଣୀ"
+
+#: ../cli/src/connections.c:1062 ../cli/src/connections.c:1724
+#: ../cli/src/connections.c:1836 ../cli/src/connections.c:1927
+#: ../cli/src/devices.c:933 ../cli/src/devices.c:995 ../cli/src/devices.c:1161
+#: ../cli/src/devices.c:1294 ../cli/src/devices.c:1713
+#: ../cli/src/devices.c:1941 ../cli/src/network-manager.c:311
+#, 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:1066 ../cli/src/connections.c:1728
+#: ../cli/src/connections.c:1840 ../cli/src/connections.c:1931
+#: ../cli/src/devices.c:937 ../cli/src/devices.c:999 ../cli/src/devices.c:1165
+#: ../cli/src/devices.c:1298 ../cli/src/devices.c:1717
+#: ../cli/src/devices.c:1945 ../cli/src/network-manager.c:315
+#, c-format
+#| msgid "NetworkManager status"
+msgid "Error: NetworkManager is not running."
+msgstr "ତ୍ରୁଟି: NetworkManager ଚାଲୁ ନାହିଁ।"
+
+#: ../cli/src/connections.c:1098
+msgid "Active connections"
+msgstr "ସକ୍ରିୟ ସଂଯୋଗଗୁଡ଼ିକ"
+
+#: ../cli/src/connections.c:1123
+#, c-format
+#| msgid "Error: %s - no such connection."
+msgid "Error: '%s' is not an active connection."
+msgstr "ତ୍ରୁଟି: '%s' ଟି ଏକ ସକ୍ରିୟ ସଂଯୋଗ ନୁହଁ।"
+
+#: ../cli/src/connections.c:1128
+#, c-format
+#| msgid "Unknown parameter: %s\n"
+msgid "Error: unknown parameter: %s"
+msgstr "ତ୍ରୁଟି: ଅଜଣା ପ୍ରାଚଳ: %s"
+
+#: ../cli/src/connections.c:1235
+#, c-format
+msgid "no active connection on device '%s'"
+msgstr "ଉପକରଣ '%s' ରେ କୌଣସି ସକ୍ରିୟ ସଂଯୋଗ ନାହିଁ"
+
+#: ../cli/src/connections.c:1243
+msgid "no active connection or device"
+msgstr "କୌଣସି ସକ୍ରିୟ ସଂଯୋଗ କିମ୍ବା ଉପକରଣ ନାହିଁ"
+
+#: ../cli/src/connections.c:1314
+#, c-format
+msgid "device '%s' not compatible with connection '%s'"
+msgstr "ଉପକରଣ '%s' ସଂଯୋଗ '%s' ସହିତ ସୁସଙ୍ଗତ ନୁହଁ"
+
+#: ../cli/src/connections.c:1317
+#, c-format
+msgid "no device found for connection '%s'"
+msgstr "ସଂଯୋଗ '%s' ପାଇଁ କୌଣସି ଉପକରଣ ମିଳିଲା ନାହିଁ"
+
+#: ../cli/src/connections.c:1329
 msgid "unknown reason"
 msgstr "ଅଜଣା କାରଣ"
 
-#: ../cli/src/connections.c:1137
+#: ../cli/src/connections.c:1331
 msgid "none"
 msgstr "କିଛି ନୁହେଁ"
 
-#: ../cli/src/connections.c:1139
+#: ../cli/src/connections.c:1333
 msgid "the user was disconnected"
 msgstr "ଚାଳକଟି ସଂଯୋଗ ବିଚ୍ଛିନ୍ନ ହୋଇଥିଲା"
 
-#: ../cli/src/connections.c:1141
+#: ../cli/src/connections.c:1335
 msgid "the base network connection was interrupted"
 msgstr "ମୂଳ ନେଟୱର୍କ ସଂଯୋଗଟି ବାଧାପ୍ରାପ୍ତ ହୋଇଥିଲା"
 
-#: ../cli/src/connections.c:1143
+#: ../cli/src/connections.c:1337
 msgid "the VPN service stopped unexpectedly"
 msgstr "VPN ସର୍ଭିସ ଅପ୍ରତ୍ୟାଶିତ ଭାବରେ ବନ୍ଦ ହୋଇଯାଇଛି"
 
-#: ../cli/src/connections.c:1145
+#: ../cli/src/connections.c:1339
 msgid "the VPN service returned invalid configuration"
 msgstr "VPN ସର୍ଭିସ ଅବୈଧ ସଂରଚନା ଫେରାଇଛି"
 
-#: ../cli/src/connections.c:1147
+#: ../cli/src/connections.c:1341
 msgid "the connection attempt timed out"
 msgstr "ସଂଯୋଗ ସମୟ ସମାପ୍ତ ପାଇଁ ଚେଷ୍ଟାକରିଛି"
 
-#: ../cli/src/connections.c:1149
+#: ../cli/src/connections.c:1343
 msgid "the VPN service did not start in time"
 msgstr "VPN ସର୍ଭିସ ଠିକ ସମୟରେ ଆରମ୍ଭ ହୋଇନଥିଲା"
 
-#: ../cli/src/connections.c:1151
+#: ../cli/src/connections.c:1345
 msgid "the VPN service failed to start"
 msgstr "VPN ସର୍ଭିସ ଆରମ୍ଭ ହେବାରେ ବିଫଳ ହୋଇଛି"
 
-#: ../cli/src/connections.c:1153
+#: ../cli/src/connections.c:1347
 msgid "no valid VPN secrets"
 msgstr "କୌଣସି ବୈଧ VPN ଗୁପ୍ତ ତଥ୍ୟ ନାହିଁ"
 
-#: ../cli/src/connections.c:1155
+#: ../cli/src/connections.c:1349
 msgid "invalid VPN secrets"
 msgstr "ଅବୈଧ VPN ଗୁପ୍ତ ତଥ୍ୟଗୁଡ଼ିକ"
 
-#: ../cli/src/connections.c:1157
+#: ../cli/src/connections.c:1351
 msgid "the connection was removed"
 msgstr "ସଂଯୋଗକୁ କଢ଼ାଯାଇଛି"
 
-#: ../cli/src/connections.c:1171
-#, c-format
-msgid "state: %s\n"
-msgstr "ଅବସ୍ଥା: %s\n"
-
-#: ../cli/src/connections.c:1174 ../cli/src/connections.c:1200
+#: ../cli/src/connections.c:1368 ../cli/src/connections.c:1573
 #, c-format
-msgid "Connection activated\n"
-msgstr "ସଂଯୋଗ ସକ୍ରିୟ ହୋଇଛି\n"
+msgid "Connection successfully activated (D-Bus active path: %s)\n"
+msgstr "ସଂଯୋଗ ସଫଳଭାବରେ ସକ୍ରିୟ ହୋଇଛି (D-Bus ସକ୍ରିୟ ପଥ: %s)\n"
 
-#: ../cli/src/connections.c:1177
+#. Active connection failed and dissapeared, quit.
+#: ../cli/src/connections.c:1373 ../cli/src/connections.c:1474
 #, c-format
 msgid "Error: Connection activation failed."
 msgstr "ତ୍ରୁଟି: ସଂଯୋଗ ସକ୍ରିୟଣ ବିଫଳ ହୋଇଛି।"
 
-#: ../cli/src/connections.c:1196
+#: ../cli/src/connections.c:1398
 #, c-format
-msgid "state: %s (%d)\n"
-msgstr "ଅବସ୍ଥା: %s (%d)\n"
+msgid "VPN connection successfully activated (D-Bus active path: %s)\n"
+msgstr "VPN ସଂଯୋଗ ସଫଳତାର ସହିତ ସକ୍ରିୟ ହୋଇଛି (D-Bus ସକ୍ରିୟ ପଥ: %s)\n"
 
-#: ../cli/src/connections.c:1206
+#: ../cli/src/connections.c:1406
 #, c-format
 msgid "Error: Connection activation failed: %s."
 msgstr "ତ୍ରୁଟି: ସଂଯୋଗ ସକ୍ରିୟଣ ବିଫଳ ହୋଇଛି: %s."
 
-#: ../cli/src/connections.c:1223 ../cli/src/devices.c:909
+#: ../cli/src/connections.c:1503 ../cli/src/devices.c:1055
 #, c-format
 msgid "Error: Timeout %d sec expired."
 msgstr "ତ୍ରୁଟି: ସମୟ ସମାପ୍ତ %d ସେକଣ୍ଡ ବିତିଯାଇଛି।"
 
-#: ../cli/src/connections.c:1266
+#: ../cli/src/connections.c:1564
 #, c-format
 msgid "Error: Connection activation failed: %s"
 msgstr "ତ୍ରୁଟି: ସଂଯୋଗ ସକ୍ରିୟଣ ବିଫଳ ହୋଇଛି: %s"
 
-#: ../cli/src/connections.c:1280
-#, c-format
-msgid "Error: Obtaining active connection for '%s' failed."
-msgstr "ତ୍ରୁଟି: '%s' ପାଇଁ ସକ୍ରିୟ ସଂଯୋଗ ଧାରଣ କରିବାରେ ବିଫଳ ହୋଇଛି।"
-
-#: ../cli/src/connections.c:1289
-#, c-format
-msgid "Active connection state: %s\n"
-msgstr "ସକ୍ରିୟ ସଂଯୋଗ ଅବସ୍ଥା: %s\n"
-
-#: ../cli/src/connections.c:1290
-#, c-format
-msgid "Active connection path: %s\n"
-msgstr "ସକ୍ରିୟ ସଂଯୋଗ ପଥ: %s\n"
-
-#: ../cli/src/connections.c:1344 ../cli/src/connections.c:1465
+#: ../cli/src/connections.c:1658 ../cli/src/connections.c:1812
+#: ../cli/src/connections.c:1940
 #, c-format
 msgid "Error: Unknown connection: %s."
 msgstr "ତ୍ରୁଟି: ଅଜଣା ସଂଯୋଗ: %s."
 
-#: ../cli/src/connections.c:1379 ../cli/src/devices.c:980
+#: ../cli/src/connections.c:1704 ../cli/src/devices.c:1140
+#: ../cli/src/devices.c:1686
 #, c-format
 msgid "Error: timeout value '%s' is not valid."
 msgstr "ତ୍ରୁଟି: ସମୟ ସମାପ୍ତ ମୂଲ୍ୟ '%s' ଟି ବୈଧ ନୁହଁ।"
 
-#: ../cli/src/connections.c:1392 ../cli/src/connections.c:1482
+#: ../cli/src/connections.c:1717 ../cli/src/connections.c:1829
+#: ../cli/src/connections.c:1920
 #, c-format
 msgid "Error: id or uuid has to be specified."
 msgstr "ତ୍ରୁଟି: id କିମ୍ବା uuid କୁ ଉଲ୍ଲେଖ କରିବା ଉଚିତ।"
 
-#: ../cli/src/connections.c:1412
+#: ../cli/src/connections.c:1749
 #, c-format
 msgid "Error: No suitable device found: %s."
 msgstr "ତ୍ରୁଟି: କୌଣସି ଉପଯୁକ୍ତ ଉପକରଣ ମିଳିଲାନାହିଁ: %s."
 
-#: ../cli/src/connections.c:1414
+#: ../cli/src/connections.c:1751
 #, c-format
 msgid "Error: No suitable device found."
 msgstr "ତ୍ରୁଟି: କୌଣସି ଉପଯୁକ୍ତ ଉପକରଣ ମିଳିଲାନାହିଁ।"
 
-#: ../cli/src/connections.c:1509
+#: ../cli/src/connections.c:1865
 #, c-format
 msgid "Warning: Connection not active\n"
 msgstr "ଚେତାବନୀ: ସଂଯୋଗ ସକ୍ରିୟ ନୁହଁ\n"
 
-#: ../cli/src/connections.c:1566
+#: ../cli/src/connections.c:1879
+#, c-format
+#| msgid "Error: Connection activation failed: %s"
+msgid "Error: Connection deletion failed: %s"
+msgstr "ତ୍ରୁଟି: ସଂଯୋଗ ଅପସାରଣ ବିଫଳ ହୋଇଛି: %s"
+
+#: ../cli/src/connections.c:2000
 #, c-format
 msgid "Error: 'con' command '%s' is not valid."
 msgstr "ତ୍ରୁଟି: 'con' ନିର୍ଦ୍ଦେଶ '%s' ଟି ବୈଧ ନୁହଁ।"
 
-#: ../cli/src/connections.c:1602
+#: ../cli/src/connections.c:2068
 #, c-format
 msgid "Error: could not connect to D-Bus."
 msgstr "ତ୍ରୁଟି: D-Bus ସହିତ ସଂଯୁକ୍ତ ହୋଇପାରିଲା ନାହିଁ।"
 
-#: ../cli/src/connections.c:1609
+#: ../cli/src/connections.c:2076
 #, c-format
 msgid "Error: Could not get system settings."
 msgstr "ତ୍ରୁଟି: ତନ୍ତ୍ର ସଂରଚନା ପାଇଲା ନାହିଁ।"
 
-#: ../cli/src/connections.c:1617
-#, c-format
-msgid "Error: Could not get user settings."
-msgstr "ତ୍ରୁଟି: ଚାଳକ ସଂରଚନା ପାଇଲା ନାହିଁ।"
-
-#: ../cli/src/connections.c:1627
+#: ../cli/src/connections.c:2086
 #, 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 "ତ୍ରୁଟି: ସଂଯୋଗ ଧାରଣ କରିପାରିବେ ନାହିଁ: ବିନ୍ୟାସ ସର୍ଭିସଗୁଡ଼ିକ ଚାଲୁନାହିଁ।"
 
 #. 0
 #. 9
-#: ../cli/src/devices.c:61 ../cli/src/devices.c:89 ../cli/src/devices.c:184
+#. 3
+#: ../cli/src/devices.c:70 ../cli/src/devices.c:108 ../cli/src/devices.c:189
+#: ../cli/src/devices.c:205
 msgid "DEVICE"
 msgstr "DEVICE"
 
-#. 1
-#. 4
-#. 0
-#: ../cli/src/devices.c:63 ../cli/src/devices.c:93
-#: ../cli/src/network-manager.c:36
-msgid "STATE"
-msgstr "STATE"
-
-#: ../cli/src/devices.c:72
-msgid "GENERAL"
-msgstr "GENERAL"
-
 #. 0
-#: ../cli/src/devices.c:73
+#: ../cli/src/devices.c:83
 msgid "CAPABILITIES"
 msgstr "CAPABILITIES"
 
 #. 1
-#: ../cli/src/devices.c:74
+#: ../cli/src/devices.c:84
 msgid "WIFI-PROPERTIES"
 msgstr "WIFI-PROPERTIES"
 
 #. 2
-#: ../cli/src/devices.c:75
+#: ../cli/src/devices.c:85
 msgid "AP"
 msgstr "AP"
 
 #. 3
-#: ../cli/src/devices.c:76
+#: ../cli/src/devices.c:86
 msgid "WIRED-PROPERTIES"
 msgstr "WIRED-PROPERTIES"
 
 #. 4
-#: ../cli/src/devices.c:77
-msgid "IP4-SETTINGS"
-msgstr "IP4-SETTINGS"
+#: ../cli/src/devices.c:87
+#| msgid "WIFI-PROPERTIES"
+msgid "WIMAX-PROPERTIES"
+msgstr "WIMAX-PROPERTIES"
 
 #. 5
-#: ../cli/src/devices.c:78
-msgid "IP4-DNS"
-msgstr "IP4-DNS"
+#. 0
+#: ../cli/src/devices.c:88 ../cli/src/devices.c:202
+#| msgid "DNS"
+msgid "NSP"
+msgstr "NSP"
 
 #. 6
-#: ../cli/src/devices.c:79
-#| msgid "IP4-SETTINGS"
-msgid "IP6-SETTINGS"
-msgstr "IP6-SETTINGS"
+#: ../cli/src/devices.c:89
+#| msgid "IP4-DNS"
+msgid "IP4"
+msgstr "IP4"
 
 #. 7
-#: ../cli/src/devices.c:80
-#| msgid "IP4-DNS"
-msgid "IP6-DNS"
-msgstr "IP6-DNS"
+#: ../cli/src/devices.c:90
+msgid "DHCP4"
+msgstr "DHCP4"
 
-#. 2
+#. 8
 #: ../cli/src/devices.c:91
+#| msgid "IP6-DNS"
+msgid "IP6"
+msgstr "IP6"
+
+#. 9
+#: ../cli/src/devices.c:92
+msgid "DHCP6"
+msgstr "DHCP6"
+
+#. 10
+#: ../cli/src/devices.c:93
+msgid "BOND"
+msgstr "BOND"
+
+#. 11
+#: ../cli/src/devices.c:94
+msgid "VLAN"
+msgstr "VLAN"
+
+#. 2
+#: ../cli/src/devices.c:110
+msgid "VENDOR"
+msgstr "VENDOR"
+
+#. 3
+#: ../cli/src/devices.c:111
+msgid "PRODUCT"
+msgstr "PRODUCT"
+
+#. 4
+#: ../cli/src/devices.c:112
 msgid "DRIVER"
 msgstr "DRIVER"
 
-#. 3
-#: ../cli/src/devices.c:92
+#. 5
+#: ../cli/src/devices.c:113
+#| msgid "DRIVER"
+msgid "DRIVER-VERSION"
+msgstr "DRIVER-VERSION"
+
+#. 6
+#: ../cli/src/devices.c:114
+msgid "FIRMWARE-VERSION"
+msgstr "FIRMWARE-VERSION"
+
+#. 7
+#: ../cli/src/devices.c:115
 msgid "HWADDR"
 msgstr "HWADDR"
 
+#. 9
+#: ../cli/src/devices.c:117
+msgid "REASON"
+msgstr "REASON"
+
+#. 10
+#: ../cli/src/devices.c:118
+msgid "UDI"
+msgstr "UDI"
+
+#. 11
+#: ../cli/src/devices.c:119
+msgid "IP-IFACE"
+msgstr "IP-IFACE"
+
+#. 12
+#: ../cli/src/devices.c:120
+msgid "NM-MANAGED"
+msgstr "NM-MANAGED"
+
+#. 14
+#: ../cli/src/devices.c:122
+msgid "FIRMWARE-MISSING"
+msgstr "FIRMWARE-MISSING"
+
+#. 15
+#: ../cli/src/devices.c:123
+#| msgid "AUTOCONNECT"
+msgid "CONNECTION"
+msgstr "CONNECTION"
+
 #. 0
-#: ../cli/src/devices.c:102
+#: ../cli/src/devices.c:132
 msgid "CARRIER-DETECT"
 msgstr "CARRIER-DETECT"
 
 #. 1
-#: ../cli/src/devices.c:103
+#: ../cli/src/devices.c:133
 msgid "SPEED"
 msgstr "SPEED"
 
 #. 0
-#: ../cli/src/devices.c:112
+#: ../cli/src/devices.c:142
 msgid "CARRIER"
 msgstr "CARRIER"
 
 #. 0
-#: ../cli/src/devices.c:122
+#: ../cli/src/devices.c:152
 msgid "WEP"
 msgstr "WEP"
 
 #. 1
-#: ../cli/src/devices.c:123
+#: ../cli/src/devices.c:153
 msgid "WPA"
 msgstr "WPA"
 
 #. 2
-#: ../cli/src/devices.c:124
+#: ../cli/src/devices.c:154
 msgid "WPA2"
 msgstr "WPA2"
 
 #. 3
-#: ../cli/src/devices.c:125
+#: ../cli/src/devices.c:155
 msgid "TKIP"
 msgstr "TKIP"
 
 #. 4
-#: ../cli/src/devices.c:126
+#: ../cli/src/devices.c:156
 msgid "CCMP"
 msgstr "CCMP"
 
 #. 0
-#: ../cli/src/devices.c:135 ../cli/src/devices.c:146
-msgid "ADDRESS"
-msgstr "ADDRESS"
+#: ../cli/src/devices.c:166
+#| msgid "FREQ"
+msgid "CTR-FREQ"
+msgstr "CTR-FREQ"
 
 #. 1
-#: ../cli/src/devices.c:136 ../cli/src/devices.c:147
-msgid "PREFIX"
-msgstr "PREFIX"
+#: ../cli/src/devices.c:167
+msgid "RSSI"
+msgstr "RSSI"
 
 #. 2
-#: ../cli/src/devices.c:137 ../cli/src/devices.c:148
-msgid "GATEWAY"
-msgstr "GATEWAY"
+#: ../cli/src/devices.c:168
+msgid "CINR"
+msgstr "CINR"
 
-#. 0
-#: ../cli/src/devices.c:157 ../cli/src/devices.c:166
-msgid "DNS"
-msgstr "DNS"
+#. 3
+#: ../cli/src/devices.c:169
+msgid "TX-POW"
+msgstr "TX-POW"
+
+#. 4
+#: ../cli/src/devices.c:170
+msgid "BSID"
+msgstr "BSID"
 
 #. 0
-#: ../cli/src/devices.c:175
+#: ../cli/src/devices.c:180
 msgid "SSID"
 msgstr "SSID"
 
 #. 1
-#: ../cli/src/devices.c:176
+#: ../cli/src/devices.c:181
 msgid "BSSID"
 msgstr "BSSID"
 
 #. 2
-#: ../cli/src/devices.c:177
+#: ../cli/src/devices.c:182
 msgid "MODE"
 msgstr "MODE"
 
 #. 3
-#: ../cli/src/devices.c:178
+#: ../cli/src/devices.c:183
 msgid "FREQ"
 msgstr "FREQ"
 
 #. 4
-#: ../cli/src/devices.c:179
+#: ../cli/src/devices.c:184
 msgid "RATE"
 msgstr "RATE"
 
 #. 5
-#: ../cli/src/devices.c:180
+#. 1
+#: ../cli/src/devices.c:185 ../cli/src/devices.c:203
 msgid "SIGNAL"
 msgstr "SIGNAL"
 
 #. 6
-#: ../cli/src/devices.c:181
+#: ../cli/src/devices.c:186
 msgid "SECURITY"
 msgstr "SECURITY"
 
 #. 7
-#: ../cli/src/devices.c:182
+#: ../cli/src/devices.c:187
 msgid "WPA-FLAGS"
 msgstr "WPA-FLAGS"
 
 #. 8
-#: ../cli/src/devices.c:183
+#: ../cli/src/devices.c:188
 msgid "RSN-FLAGS"
 msgstr "RSN-FLAGS"
 
 #. 10
-#: ../cli/src/devices.c:185
+#. 4
+#: ../cli/src/devices.c:190 ../cli/src/devices.c:206
 msgid "ACTIVE"
 msgstr "ACTIVE"
 
-#: ../cli/src/devices.c:208
-#, c-format
+#. 0
+#: ../cli/src/devices.c:218
+msgid "SLAVES"
+msgstr "SLAVES"
+
+#. 0
+#: ../cli/src/devices.c:227
+#| msgid "UUID"
+msgid "ID"
+msgstr "ID"
+
+#: ../cli/src/devices.c:243
+#, c-format
+#| msgid ""
+#| "Usage: nmcli dev { COMMAND | help }\n"
+#| "\n"
+#| "  COMMAND := { status | list | disconnect | wifi }\n"
+#| "\n"
+#| "  status\n"
+#| "  list [iface ]\n"
+#| "  disconnect iface  [--nowait] [--timeout ]\n"
+#| "  wifi [list [iface ] [hwaddr ]]\n"
+#| "\n"
 msgid ""
-"Usage: nmcli dev { COMMAND | help }\n"
+"Usage: nmcli device { COMMAND | help }\n"
+"\n"
+"  COMMAND := { status | list | disconnect | wifi | wimax }\n"
 "\n"
 "  COMMAND := { status | list | disconnect | wifi }\n"
 "\n"
 "  status\n"
 "  list [iface ]\n"
 "  disconnect iface  [--nowait] [--timeout ]\n"
-"  wifi [list [iface ] [hwaddr ]]\n"
+"  wifi [list [iface ] [bssid ]]\n"
+"  wifi connect <(B)SSID> [password ] [wep-key-type key|phrase] "
+"[iface ] [bssid ] [name ]\n"
+"               [--private] [--nowait] [--timeout ]\n"
+"  wimax [list [iface ] [nsp ]]\n"
 "\n"
 msgstr ""
-"Usage: nmcli dev { COMMAND | help }\n"
+"ବ୍ୟବହାର ବିଧି: nmcli device { COMMAND | help }\n"
+"\n"
+"  COMMAND := { status | list | disconnect | wifi | wimax }\n"
 "\n"
 "  COMMAND := { status | list | disconnect | wifi }\n"
 "\n"
 "  status\n"
 "  list [iface ]\n"
 "  disconnect iface  [--nowait] [--timeout ]\n"
-"  wifi [list [iface ] [hwaddr ]]\n"
+"  wifi [list [iface ] [bssid ]]\n"
+"  wifi connect <(B)SSID> [password ] [wep-key-type key|phrase] "
+"[iface ] [bssid ] [name ]\n"
+"               [--private] [--nowait] [--timeout ]\n"
+"  wimax [list [iface ] [nsp ]]\n"
 "\n"
 
-#: ../cli/src/devices.c:228
-msgid "unmanaged"
-msgstr "ଅପରିଚାଳିତ"
-
-#: ../cli/src/devices.c:230
-msgid "unavailable"
-msgstr "ଅନୁପଲବ୍ଧ"
-
-#: ../cli/src/devices.c:232 ../cli/src/network-manager.c:89
-msgid "disconnected"
-msgstr "ସଂଯୋଗ ବିଚ୍ଛିନ୍ନ ହୋଇଛି"
-
-#: ../cli/src/devices.c:234
-msgid "connecting (prepare)"
-msgstr "ସଂଯୋଗ କରୁଅଛି (ପ୍ରସ୍ତୁତ)"
-
-#: ../cli/src/devices.c:236
-msgid "connecting (configuring)"
-msgstr "ସଂଯୋଗ କରୁଅଛି (ବିନ୍ୟାସ କରୁଅଛି)"
-
-#: ../cli/src/devices.c:238
-msgid "connecting (need authentication)"
-msgstr "ସଂଯୋଗ କରୁଅଛି (ବୈଧିକରଣ ଆବଶ୍ୟକ)"
-
-#: ../cli/src/devices.c:240
-msgid "connecting (getting IP configuration)"
-msgstr "ସଂଯୋଗ କରୁଅଛି (IP ସଂରଚନା ଗ୍ରହଣ କରୁଅଛି)"
-
-#: ../cli/src/devices.c:242 ../cli/src/network-manager.c:87
-msgid "connected"
-msgstr "ସଂଯୋଗ ସ୍ଥାପିତ ହେଲା"
-
-#: ../cli/src/devices.c:244
-msgid "connection failed"
-msgstr "ସଂଯୋଗ ବିଫଳ ହୋଇଛି"
-
-#: ../cli/src/devices.c:267 ../cli/src/devices.c:424
-msgid "Unknown"
-msgstr "ଅଜଣା"
-
-#: ../cli/src/devices.c:299
+#: ../cli/src/devices.c:344
 msgid "(none)"
 msgstr "(କିଛି ନାହିଁ)"
 
-#: ../cli/src/devices.c:324
-#, c-format
-msgid "%s: error converting IP4 address 0x%X"
-msgstr "%s: IP4 ଠିକଣା 0x%X କୁ ପରିବର୍ତ୍ତନ କରିବାରେ ତ୍ରୁଟି"
-
-#: ../cli/src/devices.c:393
+#: ../cli/src/devices.c:400
 #, c-format
 msgid "%u MHz"
 msgstr "%u MHz"
 
-#: ../cli/src/devices.c:394
+#: ../cli/src/devices.c:401
 #, c-format
 msgid "%u MB/s"
 msgstr "%u MB/s"
 
-#: ../cli/src/devices.c:403
+#: ../cli/src/devices.c:410
 msgid "Encrypted: "
 msgstr "ସଂଗୁପ୍ତ: "
 
-#: ../cli/src/devices.c:408
+#: ../cli/src/devices.c:415
 msgid "WEP "
 msgstr "WEP "
 
-#: ../cli/src/devices.c:410
+#: ../cli/src/devices.c:417
 msgid "WPA "
 msgstr "WPA "
 
-#: ../cli/src/devices.c:412
+#: ../cli/src/devices.c:419
 msgid "WPA2 "
 msgstr "WPA2 "
 
-#: ../cli/src/devices.c:415
+#: ../cli/src/devices.c:422
 msgid "Enterprise "
 msgstr "ବାଣିଜ୍ୟିକ"
 
-#: ../cli/src/devices.c:424
+#: ../cli/src/devices.c:431
 msgid "Ad-Hoc"
 msgstr "ଏଡ-ହୋକ"
 
-#: ../cli/src/devices.c:424
+#: ../cli/src/devices.c:432
 msgid "Infrastructure"
 msgstr "ଅବସଂରଚନା"
 
-#: ../cli/src/devices.c:486
+#: ../cli/src/devices.c:468
+msgid "Home"
+msgstr "ମୂଳ ସ୍ଥାନ"
+
+#: ../cli/src/devices.c:471
+msgid "Partner"
+msgstr "ସାଥୀ"
+
+#: ../cli/src/devices.c:474
+msgid "Roaming"
+msgstr "ରୋମିଙ୍ଗ"
+
+#: ../cli/src/devices.c:546
 #, c-format
 msgid "Error: 'dev list': %s"
 msgstr "ତ୍ରୁଟି: 'dev list': %s"
 
-#: ../cli/src/devices.c:488
+#: ../cli/src/devices.c:548
 #, c-format
 msgid "Error: 'dev list': %s; allowed fields: %s"
 msgstr "ତ୍ରୁଟି: 'dev list': %s; ଅନୁମତିପ୍ରାପ୍ତ କ୍ଷେତ୍ରଗୁଡ଼ିକ: %s"
 
-#: ../cli/src/devices.c:497
+#: ../cli/src/devices.c:557
 msgid "Device details"
 msgstr "ଉପକରଣ ବିବରଣୀ"
 
-#: ../cli/src/devices.c:527 ../cli/src/devices.c:925
+#: ../cli/src/devices.c:602 ../cli/src/devices.c:605 ../cli/src/devices.c:1081
+#: ../cli/src/utils.c:477
 msgid "(unknown)"
 msgstr "(ଅଜଣା)"
 
-#: ../cli/src/devices.c:528
-msgid "unknown)"
-msgstr "ଅଜଣା)"
+#: ../cli/src/devices.c:614
+#| msgid "connected"
+msgid "not connected"
+msgstr "ସଂଯୋଗ ହୋଇ ନାହିଁ"
 
-#: ../cli/src/devices.c:554
+#: ../cli/src/devices.c:641
 #, c-format
 msgid "%u Mb/s"
 msgstr "%u Mb/s"
 
 #. Print header
 #. "WIRED-PROPERTIES"
-#: ../cli/src/devices.c:627
+#: ../cli/src/devices.c:715
 msgid "on"
 msgstr "ଚାଲୁ"
 
-#: ../cli/src/devices.c:627
+#: ../cli/src/devices.c:715
 msgid "off"
 msgstr "ବନ୍ଦ"
 
-#: ../cli/src/devices.c:808
+#: ../cli/src/devices.c:923
 #, c-format
 msgid "Error: 'dev status': %s"
 msgstr "ତ୍ରୁଟି: 'dev status': %s"
 
-#: ../cli/src/devices.c:810
+#: ../cli/src/devices.c:925
 #, c-format
 msgid "Error: 'dev status': %s; allowed fields: %s"
 msgstr "ତ୍ରୁଟି: 'dev status': %s; ଅନୁମତିପ୍ରାପ୍ତ କ୍ଷେତ୍ରଗୁଡ଼ିକ: %s"
 
-#: ../cli/src/devices.c:817
+#: ../cli/src/devices.c:948
 msgid "Status of devices"
 msgstr "ଉପକରଣର ସ୍ଥିତି"
 
-#: ../cli/src/devices.c:845
+#: ../cli/src/devices.c:979
 #, c-format
 msgid "Error: '%s' argument is missing."
 msgstr "ତ୍ରୁଟି: '%s' ସ୍ୱତନ୍ତ୍ରଚର ଅନୁପସ୍ଥିତ।"
 
-#: ../cli/src/devices.c:874 ../cli/src/devices.c:1013
-#: ../cli/src/devices.c:1136
+#: ../cli/src/devices.c:1020 ../cli/src/devices.c:1185
+#: ../cli/src/devices.c:1326 ../cli/src/devices.c:1973
 #, c-format
 msgid "Error: Device '%s' not found."
 msgstr "ତ୍ରୁଟି: ଉପକରଣ '%s' ମିଳିଲା ନାହିଁ।"
 
-#: ../cli/src/devices.c:897
+#: ../cli/src/devices.c:1043
 #, c-format
 msgid "Success: Device '%s' successfully disconnected."
 msgstr "ସଫଳ: ଉପକରଣ '%s' ସଫଳତାର ସହିତ ସଂଯୋଗ ବିଚ୍ଛିନ୍ନ ହୋଇଛି।"
 
-#: ../cli/src/devices.c:922
+#: ../cli/src/devices.c:1078
 #, c-format
 msgid "Error: Device '%s' (%s) disconnecting failed: %s"
 msgstr "ତ୍ରୁଟି: ଉପକରଣ '%s' (%s) ସଂଯୋଗ ବିଚ୍ଛିନ୍ନ ବିଫଳ ହୋଇଛି: %s"
 
-#: ../cli/src/devices.c:930
+#: ../cli/src/devices.c:1091
 #, c-format
-msgid "Device state: %d (%s)\n"
-msgstr "ଉପକରଣ ସ୍ଥିତି: %d (%s)\n"
+#| msgid "Success: Device '%s' successfully disconnected."
+msgid "Device '%s' has been disconnected.\n"
+msgstr "ଉପକରଣ '%s' ସଫଳତାର ସହିତ ସଂଯୋଗ ବିଚ୍ଛିନ୍ନ ହୋଇଛି।\n"
 
-#: ../cli/src/devices.c:994
+#: ../cli/src/devices.c:1154
 #, c-format
 msgid "Error: iface has to be specified."
 msgstr "ତ୍ରୁଟି: iface କୁ ଉଲ୍ଲେଖ କରାଯିବା ଉଚିତ।"
 
-#: ../cli/src/devices.c:1112
+#: ../cli/src/devices.c:1284
 #, c-format
 msgid "Error: 'dev wifi': %s"
 msgstr "ତ୍ରୁଟି: 'dev wifi': %s"
 
-#: ../cli/src/devices.c:1114
+#: ../cli/src/devices.c:1286
 #, c-format
 msgid "Error: 'dev wifi': %s; allowed fields: %s"
 msgstr "ତ୍ରୁଟି: 'dev wifi': %s; ଅନୁମତିପ୍ରାପ୍ତ କ୍ଷେତ୍ରଗୁଡ଼ିକ: %s"
 
-#: ../cli/src/devices.c:1121
+#: ../cli/src/devices.c:1309
 msgid "WiFi scan list"
 msgstr "WiFi କ୍ରମବୀକ୍ଷଣ ତାଲିକା"
 
-#: ../cli/src/devices.c:1156 ../cli/src/devices.c:1210
+#: ../cli/src/devices.c:1346 ../cli/src/devices.c:1400
 #, c-format
-msgid "Error: Access point with hwaddr '%s' not found."
-msgstr "ତ୍ରୁଟି: hwaddr '%s' ସହିତ ଅଭିଗମ୍ୟତା ବିନ୍ଦୁ ମିଳିଲା ନାହିଁ।"
+#| msgid "Error: Access point with hwaddr '%s' not found."
+msgid "Error: Access point with bssid '%s' not found."
+msgstr "ତ୍ରୁଟି:bssid '%s' ସହିତ ଅଭିଗମ୍ୟତା ବିନ୍ଦୁ ମିଳିଲା ନାହିଁ।"
 
-#: ../cli/src/devices.c:1173
+#: ../cli/src/devices.c:1363
 #, c-format
 msgid "Error: Device '%s' is not a WiFi device."
 msgstr "ତ୍ରୁଟି: ଉପକରଣ '%s' ଟି ଗୋଟିଏ WiFi ଉପକରଣ ନୁହଁ।"
 
-#: ../cli/src/devices.c:1237
+#: ../cli/src/devices.c:1431 ../cli/src/devices.c:1477
+#, c-format
+msgid "Connection with UUID '%s' created and activated on device '%s'\n"
+msgstr "UUID '%s' ସହିତ ସଂଯୋଗ ନିର୍ମାଣ ହୋଇଛି ଏବଂ ଉପକରଣ '%s' ରେ ସକ୍ରିୟ ହୋଇଛି\n"
+
+#: ../cli/src/devices.c:1436
+#, c-format
+#| msgid "Error: Connection activation failed: %s."
+msgid "Error: Connection activation failed: (%d) %s."
+msgstr "ତ୍ରୁଟି: ସଂଯୋଗ ସକ୍ରିୟଣ ବିଫଳ ହୋଇଛି: (%d) %s."
+
+#: ../cli/src/devices.c:1461
+#, c-format
+msgid "Error: Failed to add/activate new connection: (%d) %s"
+msgstr "ତ୍ରୁଟି:ନୂତନ ସଂଯୋଗକୁ ଯୋଗ କରିବା/ସକ୍ରିୟ କରିବାରେ ବିଫଳ: (%d) %s"
+
+#: ../cli/src/devices.c:1469
+#, c-format
+msgid "Error: Failed to add/activate new connection: Unknown error"
+msgstr "ତ୍ରୁଟି:ନୂତନ ସଂଯୋଗକୁ ଯୋଗ କରିବା/ସକ୍ରିୟ କରିବାରେ ବିଫଳ: ଅଜଣା ତ୍ରୁଟି"
+
+#: ../cli/src/devices.c:1613
+#, c-format
+#| msgid "Error: %s argument is missing."
+msgid "Error: SSID or BSSID are missing."
+msgstr "ତ୍ରୁଟି: %s  SSID କିମ୍ବା BSSID ଅନୁପସ୍ଥିତ ଅଛି।"
+
+#: ../cli/src/devices.c:1636
+#, c-format
+#| msgid "Error: timeout value '%s' is not valid."
+msgid "Error: bssid argument value '%s' is not a valid BSSID."
+msgstr "ତ୍ରୁଟି: bssid ସ୍ୱତନ୍ତ୍ରଚର ମୂଲ୍ୟ '%s' ଟି ଏକ ବୈଧ BSSID ନୁହଁ।"
+
+#: ../cli/src/devices.c:1660
+#, c-format
+msgid ""
+"Error: wep-key-type argument value '%s' is invalid, use 'key' or 'phrase'."
+msgstr ""
+"ତ୍ରୁଟି: wep-key-type ସ୍ୱତନ୍ତ୍ରଚର ମୂଲ୍ୟ '%s' ଟି ଅବୈଧ ଅଟେ, 'key' କିମ୍ବା "
+"'phrase' କୁ ବ୍ୟବହାର କରନ୍ତୁ।"
+
+#: ../cli/src/devices.c:1700
+#, c-format
+msgid "Error: BSSID to connect to (%s) differs from bssid argument (%s)."
+msgstr ""
+"ତ୍ରୁଟି: (%s) ସହିତ ସଂଯୋଗ କରିବାକୁ ଥିବା BSSID bssid ସ୍ୱତନ୍ତ୍ରଚର ଠାରୁ ଭିନ୍ନ ଅଟେ (%"
+"s)."
+
+#: ../cli/src/devices.c:1706
+#, c-format
+msgid "Error: Parameter '%s' is neither SSID nor BSSID."
+msgstr "ତ୍ରୁଟି: ପ୍ରାଚଳ '%s' ଟି SSID କିମ୍ବା BSSID ନୁହଁ।"
+
+#: ../cli/src/devices.c:1735
+#, c-format
+#| msgid "Error: Device '%s' is not a WiFi device."
+msgid "Error: Device '%s' is not a Wi-Fi device."
+msgstr "ତ୍ରୁଟି: ଉପକରଣ '%s' ଟି ଗୋଟିଏ Wi-Fi ଉପକରଣ ନୁହଁ।"
+
+#: ../cli/src/devices.c:1737
+#, c-format
+#| msgid "Error: No suitable device found."
+msgid "Error: No Wi-Fi device found."
+msgstr "ତ୍ରୁଟି: କୌଣସି Wi-Fi ଉପକରଣ ମିଳିଲାନାହିଁ।"
+
+#: ../cli/src/devices.c:1755
+#, c-format
+#| msgid "Error: Access point with hwaddr '%s' not found."
+msgid "Error: No network with SSID '%s' found."
+msgstr "ତ୍ରୁଟି: SSID '%s' ସହିତ କୌଣସି ନେଟୱର୍କ ମିଳିଲା ନାହିଁ।"
+
+#: ../cli/src/devices.c:1757
+#, c-format
+#| msgid "Error: Access point with hwaddr '%s' not found."
+msgid "Error: No access point with BSSID '%s' found."
+msgstr "ତ୍ରୁଟି: BSSID '%s' ସହିତ ଅଭିଗମ୍ୟତା ବିନ୍ଦୁ ମିଳିଲା ନାହିଁ।"
+
+#: ../cli/src/devices.c:1855
 #, c-format
 msgid "Error: 'dev wifi' command '%s' is not valid."
 msgstr "ତ୍ରୁଟି: 'dev wifi' ନିର୍ଦ୍ଦେଶ '%s' ଟି ବୈଧ ନୁହଁ।"
 
-#: ../cli/src/devices.c:1284
+#: ../cli/src/devices.c:1931
+#, c-format
+#| msgid "Error: 'dev wifi': %s"
+msgid "Error: 'dev wimax': %s"
+msgstr "ତ୍ରୁଟି: 'devwimax': %s"
+
+#: ../cli/src/devices.c:1933
+#, 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:1956
+msgid "WiMAX NSP list"
+msgstr "WiMAX NSP ତାଲିକା"
+
+#: ../cli/src/devices.c:1993
+#, c-format
+#| msgid "Error: Device '%s' not found."
+msgid "Error: NSP with name '%s' not found."
+msgstr "ତ୍ରୁଟି: '%s' ନାମ ସହିତ NSP ମିଳିଲା ନାହିଁ।"
+
+#: ../cli/src/devices.c:2004
+#, 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:2035
+#, c-format
+#| msgid "Error: Access point with hwaddr '%s' not found."
+msgid "Error: Access point with nsp '%s' not found."
+msgstr "ତ୍ରୁଟି: nsp '%s' ସହିତ ଅଭିଗମ୍ୟତା ବିନ୍ଦୁ ମିଳିଲା ନାହିଁ।"
+
+#: ../cli/src/devices.c:2062
+#, c-format
+#| msgid "Error: 'dev wifi' command '%s' is not valid."
+msgid "Error: 'dev wimax' command '%s' is not valid."
+msgstr "ତ୍ରୁଟି: 'devwimax' ନିର୍ଦ୍ଦେଶ '%s' ଟି ବୈଧ ନୁହଁ।"
+
+#: ../cli/src/devices.c:2115
 #, 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 "ସଂସ୍କରଣ"
+
+#. 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"
 
+#. 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:62
-#, c-format
+msgid "PERMISSION"
+msgstr "ଅନୁମତି"
+
+#. 0
+#: ../cli/src/network-manager.c:63
+msgid "VALUE"
+msgstr "ମୂଲ୍ଯ"
+
+#: ../cli/src/network-manager.c:77
+#, 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 | permissions | enable | sleep | wifi | wwan | "
+"wimax }\n"
+"\n"
+"  COMMAND := { status | permissions | enable | sleep | wifi | wwan }\n"
 "\n"
 "  status\n"
-"  sleep\n"
-"  wakeup\n"
+"  permissions\n"
+"  enable [true|false]\n"
+"  sleep [true|false]\n"
 "  wifi [on|off]\n"
 "  wwan [on|off]\n"
+"  wimax [on|off]\n"
 "\n"
 msgstr ""
-"Usage: nmcli nm { COMMAND | help }\n"
+"ବ୍ୟବହାର ବିଧି: nmcli nm { COMMAND | help }\n"
 "\n"
-"  COMMAND := { status | sleep | wakeup | wifi | wwan }\n"
+"  COMMAND := { status | permissions | enable | sleep | wifi | wwan | "
+"wimax }\n"
+"\n"
+"  COMMAND := { status | permissions | enable | sleep | wifi | wwan }\n"
 "\n"
 "  status\n"
-"  sleep\n"
-"  wakeup\n"
+"  permissions\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:108
 msgid "asleep"
 msgstr "ଶୁପ୍ତ"
 
-#: ../cli/src/network-manager.c:85
+#: ../cli/src/network-manager.c:110
 msgid "connecting"
 msgstr "ସଂଯୋଗ କରୁଅଛି"
 
-#: ../cli/src/network-manager.c:125
+#: ../cli/src/network-manager.c:112
+msgid "connected (local only)"
+msgstr "ସଂଯୁକ୍ତ (କେବଳ ସ୍ଥାନୀୟ)"
+
+#: ../cli/src/network-manager.c:114
+#| msgid "connected"
+msgid "connected (site only)"
+msgstr "ସଂଯୁକ୍ତ ଅଛି (କେବଳ ସାଇଟ)"
+
+#: ../cli/src/network-manager.c:118
+#| msgid "connecting"
+msgid "disconnecting"
+msgstr "ସଂଯୋଗ ବିଚ୍ଛିନ୍ନ କରୁଅଛି"
+
+#: ../cli/src/network-manager.c:158
 #, c-format
 msgid "Error: 'nm status': %s"
 msgstr "ତ୍ରୁଟି: 'nm status': %s"
 
-#: ../cli/src/network-manager.c:127
+#: ../cli/src/network-manager.c:160
 #, 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:173 ../cli/src/network-manager.c:174
+#: ../cli/src/network-manager.c:175 ../cli/src/network-manager.c:176
+#: ../cli/src/network-manager.c:177 ../cli/src/network-manager.c:179
+#: ../cli/src/network-manager.c:180 ../cli/src/network-manager.c:429
+#: ../cli/src/network-manager.c:484 ../cli/src/network-manager.c:522
+#: ../cli/src/network-manager.c:561
 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:173 ../cli/src/network-manager.c:174
+#: ../cli/src/network-manager.c:175 ../cli/src/network-manager.c:176
+#: ../cli/src/network-manager.c:177 ../cli/src/network-manager.c:179
+#: ../cli/src/network-manager.c:180 ../cli/src/network-manager.c:429
+#: ../cli/src/network-manager.c:484 ../cli/src/network-manager.c:522
+#: ../cli/src/network-manager.c:561
 msgid "disabled"
 msgstr "ନିଷ୍କ୍ରିୟ"
 
-#: ../cli/src/network-manager.c:148
+#: ../cli/src/network-manager.c:193
+msgid "NetworkManager status"
+msgstr "NetworkManager ସ୍ଥିତି"
+
+#. Print header
+#: ../cli/src/network-manager.c:196
 msgid "running"
 msgstr "ଚାଲୁଅଛି"
 
-#: ../cli/src/network-manager.c:148
+#: ../cli/src/network-manager.c:196
 msgid "not running"
 msgstr "ଚାଲୁନାହିଁ"
 
-#: ../cli/src/network-manager.c:201 ../cli/src/network-manager.c:233
+#: ../cli/src/network-manager.c:271
+msgid "auth"
+msgstr "auth"
+
+#: ../cli/src/network-manager.c:301
+#, c-format
+#| msgid "Error: 'nm status': %s"
+msgid "Error: 'nm permissions': %s"
+msgstr "ତ୍ରୁଟି: 'nm ଅନୁମତିଗୁଡ଼ିକ': %s"
+
+#: ../cli/src/network-manager.c:303
+#, c-format
+#| msgid "Error: 'nm status': %s; allowed fields: %s"
+msgid "Error: 'nm permissions': %s; allowed fields: %s"
+msgstr "ତ୍ରୁଟି: 'nm ଅନୁମତିଗୁଡ଼ିକ': %s; ଅନୁମୋଦିତ ସ୍ଥାନ: %s"
+
+#: ../cli/src/network-manager.c:324
+#| msgid "NetworkManager status"
+msgid "NetworkManager permissions"
+msgstr "NetworkManager ଅନୁମତିଗୁଡ଼ିକ"
+
+#: ../cli/src/network-manager.c:350 ../cli/src/utils.c:457
+#, 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:361
+#, 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:367
+#, c-format
+#| msgid "Error: 'con list': %s"
+msgid "Error in sleep: %s"
+msgstr "ସୁପ୍ତ ଅବସ୍ଥାରେ ତ୍ରୁଟି: %s"
+
+#: ../cli/src/network-manager.c:416 ../cli/src/network-manager.c:471
+#: ../cli/src/network-manager.c:509 ../cli/src/network-manager.c:548
 #, 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:424
+#| msgid "WiFi enabled"
+msgid "Networking enabled"
+msgstr "ନେଟୱର୍କିଙ୍ଗ ସକ୍ରିୟ ଅଛି"
+
+#: ../cli/src/network-manager.c:440
+#, c-format
+#| msgid "Error: invalid 'wwan' parameter: '%s'."
+msgid "Error: invalid 'enable' parameter: '%s'; use 'true' or 'false'."
+msgstr ""
+"ତ୍ରୁଟି: ଅବୈଧ 'ସକ୍ରିୟ' ପ୍ରାଚଳ: '%s'; 'true' କିମ୍ବା 'false' କୁ ବ୍ୟବହାର କରନ୍ତୁ।"
+
+#: ../cli/src/network-manager.c:450
+#, 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:458
+#, c-format
+#| msgid "Error: invalid 'wifi' parameter: '%s'."
+msgid "Error: invalid 'sleep' parameter: '%s'; use 'true' or 'false'."
+msgstr ""
+"ତ୍ରୁଟି: ଅବୈଧ 'ସୁପ୍ତ' ପ୍ରାଚଳ: '%s'; 'true' କିମ୍ବା 'false' କୁ ବ୍ୟବହାର କରନ୍ତୁ।"
 
-#: ../cli/src/network-manager.c:209
+#: ../cli/src/network-manager.c:479
 msgid "WiFi enabled"
 msgstr "WiFi ସକ୍ରିୟ ଅଛି"
 
-#: ../cli/src/network-manager.c:220
+#: ../cli/src/network-manager.c:495
 #, c-format
 msgid "Error: invalid 'wifi' parameter: '%s'."
 msgstr "ତ୍ରୁଟି: ଅବୈଧ 'wifi' ପ୍ରାଚଳ: '%s'."
 
-#: ../cli/src/network-manager.c:241
+#: ../cli/src/network-manager.c:517
 msgid "WWAN enabled"
 msgstr "WWAN ସକ୍ରିୟ ଅଛି"
 
-#: ../cli/src/network-manager.c:252
+#: ../cli/src/network-manager.c:533
 #, c-format
 msgid "Error: invalid 'wwan' parameter: '%s'."
 msgstr "ତ୍ରୁଟି: ଅବୈଧ 'wwan' ପ୍ରାଚଳ: '%s'."
 
-#: ../cli/src/network-manager.c:263
+#: ../cli/src/network-manager.c:556
+#| msgid "WiFi enabled"
+msgid "WiMAX enabled"
+msgstr "WiMAX ସକ୍ରିୟ ଅଛି"
+
+#: ../cli/src/network-manager.c:572
+#, c-format
+#| msgid "Error: invalid 'wifi' parameter: '%s'."
+msgid "Error: invalid 'wimax' parameter: '%s'."
+msgstr "ତ୍ରୁଟି: ଅବୈଧ 'wimax' ପ୍ରାଚଳ: '%s'."
+
+#: ../cli/src/network-manager.c:588
 #, c-format
 msgid "Error: 'nm' command '%s' is not valid."
 msgstr "ତ୍ରୁଟି: 'nm' ନିର୍ଦ୍ଦେଶ '%s' ଟି ବୈଧ ନୁହଁ।"
 
-#: ../cli/src/nmcli.c:69
-#, c-format
+#: ../cli/src/nmcli.c:76
+#, 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] |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"
@@ -988,16 +1814,18 @@ msgid ""
 "  -f[ields] |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"
 "OBJECT\n"
-"  nm          NetworkManager status\n"
-"  con         NetworkManager connections\n"
-"  dev         devices managed by NetworkManager\n"
+"  nm              NetworkManager's status\n"
+"  c[onnection]    NetworkManager's connections\n"
+"  d[evice]        devices managed by NetworkManager\n"
 "\n"
 msgstr ""
-"Usage: %s [OPTIONS] OBJECT { COMMAND | help }\n"
+"ବ୍ୟବହାର ବିଧି: %s [OPTIONS] OBJECT { COMMAND | help }\n"
 "\n"
 "OPTIONS\n"
 "  -t[erse]                                   terse output\n"
@@ -1006,653 +1834,914 @@ msgstr ""
 "  -f[ields] |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"
 "OBJECT\n"
-"  nm          NetworkManager status\n"
-"  con         NetworkManager connections\n"
-"  dev         devices managed by NetworkManager\n"
+"  nm              NetworkManager's status\n"
+"  c[onnection]    NetworkManager's connections\n"
+"  d[evice]        devices managed by NetworkManager\n"
 "\n"
 
-#: ../cli/src/nmcli.c:113
+#: ../cli/src/nmcli.c:124
 #, c-format
 msgid "Error: Object '%s' is unknown, try 'nmcli help'."
 msgstr "ତ୍ରୁଟି: ବସ୍ତୁ '%s' ଟି ଅଜଣା ଅଟେ, 'nmcli help' କୁ ଚେଷ୍ଟା କରନ୍ତୁ।"
 
-#: ../cli/src/nmcli.c:143
+#: ../cli/src/nmcli.c:154
 #, c-format
 msgid "Error: Option '--terse' is specified the second time."
 msgstr "ତ୍ରୁଟି: ବିକଳ୍ପ '--terse' କୁ ଦ୍ୱିତୀୟ ଥର ପାଇଁ ଉଲ୍ଲେଖ କରାଯାଇଛି।"
 
-#: ../cli/src/nmcli.c:148
+#: ../cli/src/nmcli.c:159
 #, c-format
 msgid "Error: Option '--terse' is mutually exclusive with '--pretty'."
 msgstr "ତ୍ରୁଟି: ବିକଳ୍ପ '--terse' ଏବଂ '--pretty' ପରସ୍ପର ଠାରୁ ପୃଥକ।"
 
-#: ../cli/src/nmcli.c:156
+#: ../cli/src/nmcli.c:167
 #, c-format
 msgid "Error: Option '--pretty' is specified the second time."
 msgstr "ତ୍ରୁଟି: ବିକଳ୍ପ '--pretty' କୁ ଦ୍ୱିତୀୟ ଥର ପାଇଁ ଉଲ୍ଲେଖ କରାଯାଇଛି।"
 
-#: ../cli/src/nmcli.c:161
+#: ../cli/src/nmcli.c:172
 #, 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:182 ../cli/src/nmcli.c:198
 #, 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:191 ../cli/src/nmcli.c:207
 #, c-format
 msgid "Error: '%s' is not valid argument for '%s' option."
 msgstr "ତ୍ରୁଟି: '%s' ଟି '%s' ପାଇଁ ଗୋଟିଏ ବୈଧ ସ୍ୱତନ୍ତ୍ରଚର ନୁହଁ।"
 
-#: ../cli/src/nmcli.c:203
+#: ../cli/src/nmcli.c:214
 #, c-format
 msgid "Error: fields for '%s' options are missing."
 msgstr "ତ୍ରୁଟି: '%s' ବିକଳ୍ପ ପାଇଁ ସ୍ଥାନ ଅନୁପସ୍ଥିତ।"
 
-#: ../cli/src/nmcli.c:209
+#: ../cli/src/nmcli.c:222
 #, c-format
 msgid "nmcli tool, version %s\n"
 msgstr "nmcli ସାଧନ, ସଂସ୍କରଣ %s\n"
 
-#: ../cli/src/nmcli.c:215
+#: ../cli/src/nmcli.c:228
 #, c-format
 msgid "Error: Option '%s' is unknown, try 'nmcli -help'."
 msgstr "ତ୍ରୁଟି: ବିକଳ୍ପ '%s' ଟି ଅଜଣା, 'nmcli -help' କୁ ଚେଷ୍ଟାକରନ୍ତୁ।"
 
-#: ../cli/src/nmcli.c:234
+#: ../cli/src/nmcli.c:247
 #, 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:272
+#| 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:288
 msgid "Success"
 msgstr "ସଫଳତା"
 
-#: ../cli/src/settings.c:411
+#: ../cli/src/settings.c:527
 #, c-format
 msgid "%d (hex-ascii-key)"
 msgstr "%d (hex-ascii-key)"
 
-#: ../cli/src/settings.c:413
+#: ../cli/src/settings.c:529
 #, c-format
 msgid "%d (104/128-bit passphrase)"
 msgstr "%d (104/128-ବିଟ ପ୍ରବେଶ ସଂକେତ ବାକ୍ୟାଂଶ)"
 
-#: ../cli/src/settings.c:416
+#: ../cli/src/settings.c:532 ../cli/src/settings.c:660
 #, c-format
 msgid "%d (unknown)"
 msgstr "%d (ଅଜଣା)"
 
-#: ../cli/src/settings.c:442
+#: ../cli/src/settings.c:558
 msgid "0 (unknown)"
 msgstr "0 (ଅଜଣା)"
 
-#: ../cli/src/settings.c:448
+#: ../cli/src/settings.c:564
 msgid "any, "
 msgstr "ଯେକୌଣସି, "
 
-#: ../cli/src/settings.c:450
+#: ../cli/src/settings.c:566
 msgid "900 MHz, "
 msgstr "900 MHz, "
 
-#: ../cli/src/settings.c:452
+#: ../cli/src/settings.c:568
 msgid "1800 MHz, "
 msgstr "1800 MHz, "
 
-#: ../cli/src/settings.c:454
+#: ../cli/src/settings.c:570
 msgid "1900 MHz, "
 msgstr "1900 MHz, "
 
-#: ../cli/src/settings.c:456
+#: ../cli/src/settings.c:572
 msgid "850 MHz, "
 msgstr "850 MHz, "
 
-#: ../cli/src/settings.c:458
+#: ../cli/src/settings.c:574
 msgid "WCDMA 3GPP UMTS 2100 MHz, "
 msgstr "WCDMA 3GPP UMTS 2100 MHz, "
 
-#: ../cli/src/settings.c:460
+#: ../cli/src/settings.c:576
 msgid "WCDMA 3GPP UMTS 1800 MHz, "
 msgstr "WCDMA 3GPP UMTS 1800 MHz, "
 
-#: ../cli/src/settings.c:462
+#: ../cli/src/settings.c:578
 msgid "WCDMA 3GPP UMTS 1700/2100 MHz, "
 msgstr "WCDMA 3GPP UMTS 1700/2100 MHz, "
 
-#: ../cli/src/settings.c:464
+#: ../cli/src/settings.c:580
 msgid "WCDMA 3GPP UMTS 800 MHz, "
 msgstr "WCDMA 3GPP UMTS 800 MHz, "
 
-#: ../cli/src/settings.c:466
+#: ../cli/src/settings.c:582
 msgid "WCDMA 3GPP UMTS 850 MHz, "
 msgstr "WCDMA 3GPP UMTS 850 MHz, "
 
-#: ../cli/src/settings.c:468
+#: ../cli/src/settings.c:584
 msgid "WCDMA 3GPP UMTS 900 MHz, "
 msgstr "WCDMA 3GPP UMTS 900 MHz, "
 
-#: ../cli/src/settings.c:470
-msgid "WCDMA 3GPP UMTS 1700 MHz, "
-msgstr "WCDMA 3GPP UMTS 1700 MHz, "
+#: ../cli/src/settings.c:586
+msgid "WCDMA 3GPP UMTS 1700 MHz, "
+msgstr "WCDMA 3GPP UMTS 1700 MHz, "
+
+#: ../cli/src/settings.c:588
+#| msgid "WCDMA 3GPP UMTS 900 MHz, "
+msgid "WCDMA 3GPP UMTS 1900 MHz, "
+msgstr "WCDMA 3GPP UMTS 1900 MHz, "
+
+#: ../cli/src/settings.c:590
+#| msgid "WCDMA 3GPP UMTS 2100 MHz, "
+msgid "WCDMA 3GPP UMTS 2600 MHz, "
+msgstr "WCDMA 3GPP UMTS 2600 MHz, "
+
+#: ../cli/src/settings.c:608
+msgid "0 (NONE)"
+msgstr "0 (NONE)"
+
+#: ../cli/src/settings.c:614
+msgid "REORDER_HEADERS, "
+msgstr "REORDER_HEADERS, "
+
+#: ../cli/src/settings.c:616
+msgid "GVRP, "
+msgstr "GVRP, "
+
+#: ../cli/src/settings.c:618
+msgid "LOOSE_BINDING, "
+msgstr "LOOSE_BINDING, "
+
+#: ../cli/src/settings.c:654
+#, c-format
+#| msgid "disabled"
+msgid "%d (disabled)"
+msgstr "%d (ନିଷ୍କ୍ରିୟ)"
+
+#: ../cli/src/settings.c:656
+#, c-format
+msgid "%d (enabled, prefer public IP)"
+msgstr "%d (ସକ୍ରିୟ, ସର୍ବସାଧାରଣ IP କୁ ପସନ୍ଦ କରନ୍ତୁ)"
+
+#: ../cli/src/settings.c:658
+#, c-format
+msgid "%d (enabled, prefer temporary IP)"
+msgstr "%d (ସକ୍ରିୟ, ଅସ୍ଥାୟୀ IP କୁ ପସନ୍ଦ କରନ୍ତୁ)"
 
-#: ../cli/src/settings.c:554 ../cli/src/settings.c:721
+#: ../cli/src/settings.c:791 ../cli/src/settings.c:987
+#: ../cli/src/settings.c:1696
 msgid "auto"
 msgstr "ସ୍ୱୟଂଚାଳିତ"
 
-#: ../cli/src/settings.c:716 ../cli/src/settings.c:719
-#: ../cli/src/settings.c:720 ../cli/src/utils.c:172
-msgid "not set"
-msgstr "ସେଟ ହୋଇନାହିଁ"
+#: ../cli/src/utils.c:103
+#, c-format
+#| msgid "%s: error converting IP4 address 0x%X"
+msgid "Error converting IP4 address '0x%X' to text form"
+msgstr "IP4 ଠିକଣା '0x%X' କୁ ପାଠ୍ୟ ଧାରାରେ ପରିବର୍ତ୍ତନ କରିବାରେ ତ୍ରୁଟି"
+
+#: ../cli/src/utils.c:131
+#, c-format
+#| msgid "%s: error converting IP4 address 0x%X"
+msgid "Error converting IP6 address '%s' to text form"
+msgstr "IP6 ଠିକଣା '%s' କୁ ପାଠ୍ୟ ଧାରାରେ ପରିବର୍ତ୍ତନ କରିବାରେ ତ୍ରୁଟି"
 
-#: ../cli/src/utils.c:124
+#: ../cli/src/utils.c:232
 #, c-format
 msgid "field '%s' has to be alone"
 msgstr "କ୍ଷେତ୍ର '%s' ଏକୁଟିଆ ଥିବା ଉଚିତ"
 
-#: ../cli/src/utils.c:127
+#: ../cli/src/utils.c:235
 #, c-format
 msgid "invalid field '%s'"
 msgstr "ଅବୈଧ କ୍ଷେତ୍ର '%s'"
 
-#: ../cli/src/utils.c:146
-#, c-format
+#: ../cli/src/utils.c:254
 msgid "Option '--terse' requires specifying '--fields'"
 msgstr "ବିକଳ୍ପ '--terse' '--fields' କୁ ଉଲ୍ଲେଖ କରିବା ଆବଶ୍ୟକ କରିଥାଏ"
 
-#: ../cli/src/utils.c:150
+#: ../cli/src/utils.c:258
 #, c-format
 msgid "Option '--terse' requires specific '--fields' option values , not '%s'"
-msgstr "ବିକଳ୍ପ '--terse' ନିର୍ଦ୍ଦିଷ୍ଟ '--fields' ବିକଳ୍ପ ମୂଲ୍ୟଗୁଡ଼ିକୁ ଆବଶ୍ୟକ କରିଥାଏ , '%s' କୁ ନୁହଁ"
+msgstr ""
+"ବିକଳ୍ପ '--terse' ନିର୍ଦ୍ଦିଷ୍ଟ '--fields' ବିକଳ୍ପ ମୂଲ୍ୟଗୁଡ଼ିକୁ ଆବଶ୍ୟକ କରିଥାଏ , '%"
+"s' କୁ ନୁହଁ"
+
+#: ../cli/src/utils.c:468
+#, 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:476
+#, c-format
+msgid "Error: NameHasOwner request failed: %s"
+msgstr "ତ୍ରୁଟି: NameHasOwner ଅନୁରୋଧ ବିଫଳ: %s"
+
+#: ../cli/src/utils.c:521
+#, 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:530
+#, 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:120
+#: ../libnm-util/crypto.c:133
 #, c-format
 msgid "PEM key file had no end tag '%s'."
 msgstr "PEM କି ଫାଇଲରେ କୌଣସି ଅନ୍ତ ଟ୍ୟାଗ ନାହିଁ '%s'."
 
-#: ../libnm-util/crypto.c:130
+#: ../libnm-util/crypto.c:146
 #, c-format
 msgid "Doesn't look like a PEM private key file."
 msgstr "PEM ବ୍ୟକ୍ତିଗତ କି ଫାଇଲ ପରି ଦେଖାଯାଉନାହିଁ."
 
-#: ../libnm-util/crypto.c:138
+#: ../libnm-util/crypto.c:154
 #, c-format
 msgid "Not enough memory to store PEM file data."
 msgstr "PEM ଫାଇଲ ତଥ୍ୟକୁ ସଂରକ୍ଷଣ କରିବା ପାଇଁ ଯଥେଷ୍ଟ ସ୍ଥାନ ନାହିଁ."
 
-#: ../libnm-util/crypto.c:154
+#: ../libnm-util/crypto.c:170
 #, c-format
 msgid "Malformed PEM file: Proc-Type was not first tag."
 msgstr "ତ୍ରୁଟିଯୁକ୍ତ PEM ଫାଇଲ: Proc-ପ୍ରକାରଟି ପ୍ରଥମ ଟ୍ୟାଗ ନୁହଁ."
 
-#: ../libnm-util/crypto.c:162
+#: ../libnm-util/crypto.c:178
 #, c-format
 msgid "Malformed PEM file: unknown Proc-Type tag '%s'."
 msgstr "ତ୍ରୁଟିଯୁକ୍ତ PEM ଫାଇଲ: ଅଜଣା Proc-ପ୍ରକାର ଟ୍ୟାଗ '%s'."
 
-#: ../libnm-util/crypto.c:172
+#: ../libnm-util/crypto.c:188
 #, c-format
 msgid "Malformed PEM file: DEK-Info was not the second tag."
 msgstr "ତ୍ରୁଟିଯୁକ୍ତ PEM ଫାଇଲ: DEK-ସୂଚନାଟି ଦ୍ୱିତୀୟ ଟ୍ୟାଗ ନୁହଁ."
 
-#: ../libnm-util/crypto.c:183
+#: ../libnm-util/crypto.c:199
 #, c-format
 msgid "Malformed PEM file: no IV found in DEK-Info tag."
 msgstr "ତ୍ରୁଟିଯୁକ୍ତ PEM ଫାଇଲ: DEK-ସୂଚନା ଟ୍ୟାଗରେ କୌଣସି IV ମିଳିଲା ନାହିଁ."
 
-#: ../libnm-util/crypto.c:190
+#: ../libnm-util/crypto.c:206
 #, c-format
 msgid "Malformed PEM file: invalid format of IV in DEK-Info tag."
 msgstr "ତ୍ରୁଟିଯୁକ୍ତ PEM ଫାଇଲ: DEK-ସୂଚନା ଟ୍ୟାଗରେ IVର ଅବୈଧ ଶୈଳୀ."
 
-#: ../libnm-util/crypto.c:203
+#: ../libnm-util/crypto.c:219
 #, c-format
 msgid "Malformed PEM file: unknown private key cipher '%s'."
 msgstr "ତ୍ରୁଟିଯୁକ୍ତ PEM ଫାଇଲ: ଅଜଣା ବ୍ୟକ୍ତିଗତ କି କୁଞ୍ଜି '%s'."
 
-#: ../libnm-util/crypto.c:222
+#: ../libnm-util/crypto.c:238
 #, 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' ରେ ଅନ୍ତ ଟ୍ୟାଗ ନାହିଁ '%s'."
+#: ../libnm-util/crypto.c:284
+msgid "Failed to find expected PKCS#8 start tag."
+msgstr "ଆଶାତିତ PKCS#8 କୁ ଖୋଜିବାରେ ବିଫଳ।"
 
-#: ../libnm-util/crypto.c:277
+#: ../libnm-util/crypto.c:292
 #, c-format
-msgid "Failed to decode certificate."
-msgstr "ପ୍ରମାଣପତ୍ର ଅବସଂକେତକ କରିବାରେ ବିଫଳ."
+msgid "Failed to find expected PKCS#8 end tag '%s'."
+msgstr "ଆଶାତିତ PKCS#8 ସମାପ୍ତି ଟ୍ୟାଗ '%s' କୁ ଖୋଜିବାରେ ବିଫଳ।"
 
-#: ../libnm-util/crypto.c:286
+#: ../libnm-util/crypto.c:312
+#| msgid "Not enough memory to store file data."
+msgid "Not enough memory to store private key data."
+msgstr "ବ୍ୟକ୍ତିଗତ କି ତଥ୍ୟକୁ ସଂରକ୍ଷଣ କରିବା ପାଇଁ ଯଥେଷ୍ଟ ସ୍ମୃତି ସ୍ଥାନ ନାହିଁ।"
+
+#: ../libnm-util/crypto.c:317
+#| msgid "Failed to decrypt the private key."
+msgid "Failed to decode PKCS#8 private key."
+msgstr "PKCS#8 ବ୍ୟକ୍ତିଗତ କି କୁ ଖୋଲିବାରେ ବିଫଳ।"
+
+#: ../libnm-util/crypto.c:339 ../libnm-util/crypto.c:625
 #, 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
+#: ../libnm-util/crypto.c:365
 #, c-format
 msgid "IV must be an even number of bytes in length."
 msgstr "IV ଆକାରରେ ନିଶ୍ଚିତ ରୂପେ ଗୋଟିଏ ଯୁଗ୍ମ ସଂଖ୍ୟକ ବାଇଟ ହୋଇଥିବା ଉଚିତ."
 
-#: ../libnm-util/crypto.c:333
+#: ../libnm-util/crypto.c:374
 #, c-format
 msgid "Not enough memory to store the IV."
 msgstr "IV କୁ ସଂରକ୍ଷଣ କରିବା ପାଇଁ ଯଥେଷ୍ଟ ସ୍ଥାନ ନାହିଁ."
 
-#: ../libnm-util/crypto.c:344
+#: ../libnm-util/crypto.c:385
 #, c-format
 msgid "IV contains non-hexadecimal digits."
 msgstr "IV ଷୋହଳମିକ ସଂଖ୍ୟା ଧାରଣ କରିନଥାଏ."
 
-#: ../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_nss.c:336
+#: ../libnm-util/crypto.c:423 ../libnm-util/crypto_gnutls.c:147
+#: ../libnm-util/crypto_gnutls.c:265 ../libnm-util/crypto_nss.c:167
+#: ../libnm-util/crypto_nss.c:332
 #, c-format
 msgid "Private key cipher '%s' was unknown."
 msgstr "ବ୍ୟକ୍ତିଗତ କି କୁଞ୍ଜି '%s' ଅଜଣା ଥିଲା."
 
-#: ../libnm-util/crypto.c:391
+#: ../libnm-util/crypto.c:432
 #, c-format
 msgid "Not enough memory to decrypt private key."
 msgstr "ବ୍ୟକ୍ତିଗତ କି କୁ ବିକୋଡ଼ନ କରିବା ପାଇଁ ଯଥେଷ୍ଟ ସ୍ଥାନ ନାହିଁ."
 
-#: ../libnm-util/crypto.c:511
+#: ../libnm-util/crypto.c:497
+#, c-format
+msgid "Not enough memory to store decrypted private key."
+msgstr "ବିକୋଡ଼ନ ବ୍ୟକ୍ତିଗତ ତଥ୍ୟ ସଂରକ୍ଷଣ କରିବା ପାଇଁ ଯଥେଷ୍ଟ ସ୍ଥାନ ନାହିଁ."
+
+#: ../libnm-util/crypto.c:542
 #, c-format
 msgid "Unable to determine private key type."
 msgstr "ବ୍ୟକ୍ତିଗତ କି ପ୍ରକାର ନିର୍ଧାରଣ କରିବାରେ ଅସମର୍ଥ."
 
-#: ../libnm-util/crypto.c:530
+#: ../libnm-util/crypto.c:597
 #, 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.c:606
+#, 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_gnutls.c:49
+#: ../libnm-util/crypto.c:630
+#, 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:92
 #, 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:155
 #, 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:164 ../libnm-util/crypto_nss.c:184
 #, c-format
 msgid "Not enough memory for decrypted key buffer."
 msgstr "କି ବଫରକୁ ବିକୋଡ଼ନ କରିବା ପାଇଁ ଯଥେଷ୍ଟ ସ୍ଥାନ ନାହିଁ."
 
-#: ../libnm-util/crypto_gnutls.c:173
+#: ../libnm-util/crypto_gnutls.c:172
 #, 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:181
 #, 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:190
 #, 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:199
 #, 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:209 ../libnm-util/crypto_nss.c:263
 #, 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:220 ../libnm-util/crypto_nss.c:274
 #, 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:285 ../libnm-util/crypto_nss.c:352
 #, c-format
 msgid "Could not allocate memory for encrypting."
 msgstr "ସଂଗୁପ୍ତ କରିବା ପାଇଁ ସ୍ମୃତି ସ୍ଥାନକୁ ବଣ୍ଟନ କରିପାରିଲା ନାହିଁ।"
 
-#: ../libnm-util/crypto_gnutls.c:294
+#: ../libnm-util/crypto_gnutls.c:293
 #, 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:302
 #, 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:312
 #, 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:321
 #, c-format
 msgid "Failed to encrypt the data: %s / %s."
 msgstr "ତଥ୍ୟକୁ ବିକୋଡ଼ନ କରିବାରେ ବିଫଳ: %s / %s."
 
-#: ../libnm-util/crypto_gnutls.c:362
+#: ../libnm-util/crypto_gnutls.c:361
 #, c-format
 msgid "Error initializing certificate data: %s"
 msgstr "ପ୍ରମାଣପତ୍ର ତଥ୍ୟକୁ ଆରମ୍ଭ କରିବାରେ ତ୍ରୁଟି: %s"
 
-#: ../libnm-util/crypto_gnutls.c:384
+#: ../libnm-util/crypto_gnutls.c:383
 #, c-format
 msgid "Couldn't decode certificate: %s"
 msgstr "ପ୍ରମାଣପତ୍ରକୁ ଅବସଂକେତ କରିପାରିଲେ ନାହିଁ: %s"
 
-#: ../libnm-util/crypto_gnutls.c:408
+#: ../libnm-util/crypto_gnutls.c:407
 #, 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:420
 #, 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:432
 #, c-format
 msgid "Couldn't verify PKCS#12 file: %s"
 msgstr "PKCS#12 ଫାଇଲକୁ ଯାଞ୍ଚ କରିହେଲା ନାହିଁ: %s"
 
+#: ../libnm-util/crypto_gnutls.c:460
+#, c-format
+#| msgid "Couldn't initialize PKCS#12 decoder: %s"
+msgid "Couldn't initialize PKCS#8 decoder: %s"
+msgstr "PKCS#8 ଅବସଂକେତକକୁ ଆରମ୍ଭ କରିପାରିଲେ ନାହିଁ: %s"
+
+#: ../libnm-util/crypto_gnutls.c:483
+#, c-format
+#| msgid "Couldn't decode PKCS#12 file: %s"
+msgid "Couldn't decode PKCS#8 file: %s"
+msgstr "PKCS#8 ଫାଇଲକୁ ଅବସଂକେତ କରିହେବ ନାହିଁ: %s"
+
 #: ../libnm-util/crypto_nss.c:56
 #, c-format
 msgid "Failed to initialize the crypto engine: %d."
 msgstr "କ୍ରିପ୍ଟ ଯନ୍ତ୍ରକୁ ଆରମ୍ଭ କରିବାରେ ବିଫଳ: %d."
 
-#: ../libnm-util/crypto_nss.c:111
+#: ../libnm-util/crypto_nss.c:107
 #, c-format
 msgid "Failed to initialize the MD5 context: %d."
 msgstr "MD5 ପ୍ରସଙ୍ଗକୁ ଆରମ୍ଭ କରିବାରେ ବିଫଳ: %d."
 
-#: ../libnm-util/crypto_nss.c:179
+#: ../libnm-util/crypto_nss.c:175
 #, c-format
 msgid "Invalid IV length (must be at least %d)."
 msgstr "ଅବୈଧ IV ଲମ୍ବ (ନିଶ୍ଚିତ ଭାବରେ ଅତିକମରେ %d ହେବା ଉଚିତ)।"
 
-#: ../libnm-util/crypto_nss.c:196
+#: ../libnm-util/crypto_nss.c:192
 #, c-format
 msgid "Failed to initialize the decryption cipher slot."
 msgstr "ଅବସଂକେତନ କୁଞ୍ଜି ସ୍ଥାନକୁ ଆରମ୍ଭ କରିବାରେ ବିଫଳ."
 
-#: ../libnm-util/crypto_nss.c:206
+#: ../libnm-util/crypto_nss.c:202
 #, c-format
 msgid "Failed to set symmetric key for decryption."
 msgstr "ଅବସଂକେତନ ପାଇଁ ସମମିତ କିକୁ ବିନ୍ୟାସ କରିବାରେ ବିଫଳ."
 
-#: ../libnm-util/crypto_nss.c:216
+#: ../libnm-util/crypto_nss.c:212
 #, c-format
 msgid "Failed to set IV for decryption."
 msgstr "ଅବସଂକେତନ ପାଇଁ IV ବିନ୍ୟାସ କରିବାରେ ବିଫଳ."
 
-#: ../libnm-util/crypto_nss.c:224
+#: ../libnm-util/crypto_nss.c:220
 #, c-format
 msgid "Failed to initialize the decryption context."
 msgstr "ଅବସଂକେତନ ପ୍ରସଙ୍ଗକୁ ଆରମ୍ଭ କରିବାରେ ବିଫଳ."
 
-#: ../libnm-util/crypto_nss.c:237
+#: ../libnm-util/crypto_nss.c:233
 #, c-format
 msgid "Failed to decrypt the private key: %d."
 msgstr "ବ୍ୟକ୍ତିଗତ କିକୁ ଅବସଂକେତ କରିବାରେ ବିଫଳ: %d."
 
-#: ../libnm-util/crypto_nss.c:245
+#: ../libnm-util/crypto_nss.c:241
 #, c-format
 msgid "Failed to decrypt the private key: decrypted data too large."
 msgstr "ବ୍ୟକ୍ତିଗତ କିକୁ ଅବସଂକେତ କରିବାରେ ବିଫଳ: ଅବସଂକେତ ତଥ୍ୟଟି ଅତ୍ୟଧିକ ବଡ଼।"
 
-#: ../libnm-util/crypto_nss.c:256
+#: ../libnm-util/crypto_nss.c:252
 #, c-format
 msgid "Failed to finalize decryption of the private key: %d."
 msgstr "ବ୍ୟକ୍ତିଗତ କିର ଅବସଂକେତନକୁ ନିଶ୍ଚୟ କରିବାରେ ବିଫଳ: %d."
 
-#: ../libnm-util/crypto_nss.c:364
+#: ../libnm-util/crypto_nss.c:360
 #, c-format
 msgid "Failed to initialize the encryption cipher slot."
 msgstr "ଅବସଂକେତନ କୁଞ୍ଜି ସ୍ଥାନକୁ ଆରମ୍ଭ କରିବାରେ ବିଫଳ।"
 
-#: ../libnm-util/crypto_nss.c:372
+#: ../libnm-util/crypto_nss.c:368
 #, c-format
 msgid "Failed to set symmetric key for encryption."
 msgstr "ଅବସଂକେତନ ପାଇଁ ସମମିତ କିକୁ ବିନ୍ୟାସ କରିବାରେ ବିଫଳ।"
 
-#: ../libnm-util/crypto_nss.c:380
+#: ../libnm-util/crypto_nss.c:376
 #, c-format
 msgid "Failed to set IV for encryption."
 msgstr "ଅବସଂକେତନ ପାଇଁ IV ବିନ୍ୟାସ କରିବାରେ ବିଫଳ।"
 
-#: ../libnm-util/crypto_nss.c:388
+#: ../libnm-util/crypto_nss.c:384
 #, c-format
 msgid "Failed to initialize the encryption context."
 msgstr "ଅବସଂକେତନ ପ୍ରସଙ୍ଗକୁ ଆରମ୍ଭ କରିବାରେ ବିଫଳ।"
 
-#: ../libnm-util/crypto_nss.c:396
+#: ../libnm-util/crypto_nss.c:392
 #, c-format
 msgid "Failed to encrypt: %d."
 msgstr "ଅବସଂକେତ କରିବାରେ ବିଫଳ: %d."
 
-#: ../libnm-util/crypto_nss.c:404
+#: ../libnm-util/crypto_nss.c:400
 #, c-format
 msgid "Unexpected amount of data after encrypting."
 msgstr "ସଂଗୁପ୍ତ କରିବା ପରେ ଅପ୍ରତ୍ୟଶିତ ପରିମାଣର ତଥ୍ୟ।"
 
-#: ../libnm-util/crypto_nss.c:447
+#: ../libnm-util/crypto_nss.c:443
 #, c-format
 msgid "Couldn't decode certificate: %d"
 msgstr "ପ୍ରମାଣପତ୍ରକୁ ଅବସଂକେତନ କରିହେଲା ନାହିଁ: %d"
 
-#: ../libnm-util/crypto_nss.c:482
+#: ../libnm-util/crypto_nss.c:478
 #, c-format
 msgid "Couldn't convert password to UCS2: %d"
 msgstr "ପ୍ରବେଶସଙ୍କେତକୁ UCS2ରେ ପରିବର୍ତ୍ତନ କରିହେଲା ନାହିଁ: %d"
 
-#: ../libnm-util/crypto_nss.c:510
+#: ../libnm-util/crypto_nss.c:506
 #, c-format
 msgid "Couldn't initialize PKCS#12 decoder: %d"
 msgstr "PKCS#12 ଅବସଂକେତକକୁ ଆରମ୍ଭ କରିହେଲା ନାହିଁ: %d"
 
-#: ../libnm-util/crypto_nss.c:519
+#: ../libnm-util/crypto_nss.c:515
 #, c-format
 msgid "Couldn't decode PKCS#12 file: %d"
 msgstr "PKCS#12 ଫାଇଲକୁ ଅବସଂକେତନ କରିହେଲା ନାହିଁ: %d"
 
-#: ../libnm-util/crypto_nss.c:528
+#: ../libnm-util/crypto_nss.c:524
 #, c-format
 msgid "Couldn't verify PKCS#12 file: %d"
 msgstr "PKCS#12 ଫାଇଲକୁ ଯାଞ୍ଚ କରିହେଲାନାହିଁ: %d"
 
-#: ../libnm-util/crypto_nss.c:557
+#: ../libnm-util/crypto_nss.c:568
 msgid "Could not generate random data."
 msgstr "ମନଇଚ୍ଛା ତଥ୍ୟକୁ ଅବସଂକେତ କରିହେଲା ନାହିଁ।"
 
-#: ../libnm-util/nm-utils.c:1975
+#: ../libnm-util/nm-utils.c:2078
 #, c-format
 msgid "Not enough memory to make encryption key."
 msgstr "ବିକୋଡ଼ନ କି କୁ ନିର୍ମାଣ କରିବା ପାଇଁ ଯଥେଷ୍ଟ ସ୍ମୃତି ସ୍ଥାନ ନାହିଁ।"
 
-#: ../libnm-util/nm-utils.c:2085
+#: ../libnm-util/nm-utils.c:2188
 msgid "Could not allocate memory for PEM file creation."
 msgstr "PEM ଫାଇଲ ନିର୍ମାଣ ପାଇଁ ସ୍ମୃତି ସ୍ଥାନ ବଣ୍ଟନ କରିପାରିଲା ନାହିଁ।"
 
-#: ../libnm-util/nm-utils.c:2097
+#: ../libnm-util/nm-utils.c:2200
 #, c-format
 msgid "Could not allocate memory for writing IV to PEM file."
 msgstr "PEM ଫାଇଲରେ IV ଲେଖିବା ପାଇଁ ସ୍ମୃତି ସ୍ଥାନ ବଣ୍ଟନ କରିପାରିଲା ନାହିଁ।"
 
-#: ../libnm-util/nm-utils.c:2109
+#: ../libnm-util/nm-utils.c:2212
 #, c-format
 msgid "Could not allocate memory for writing encrypted key to PEM file."
 msgstr "PEM ଫାଇଲରେ ସଂଗୁପ୍ତ କି ଲେଖିବା ପାଇଁ ସ୍ମୃତି ସ୍ଥାନ ବଣ୍ଟନ କରିପାରିଲା ନାହିଁ।"
 
-#: ../libnm-util/nm-utils.c:2128
+#: ../libnm-util/nm-utils.c:2231
 #, 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.NetworkManager.policy.in.in.h:1
+msgid "Enable or disable system networking"
+msgstr "ତନ୍ତ୍ର ନେଟୱର୍କିଙ୍ଗକୁ ସକ୍ରିୟ କିମ୍ବା ନିଷ୍କ୍ରିୟ କରନ୍ତୁ"
 
-#: ../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.in.h:2
+msgid "System policy prevents enabling or disabling system networking"
+msgstr ""
+"ତନ୍ତ୍ର ନିତୀ ତନ୍ତ୍ର ନେଟୱର୍କିଙ୍ଗକୁ ସକ୍ରିୟ କିମ୍ବା ନିଷ୍କ୍ରିୟ ହେବାରୁ ବାରଣ କରିଥାଏ"
 
-#: ../policy/org.freedesktop.NetworkManager.policy.in.h:1
-msgid "Allow control of network connections"
-msgstr "ନେଟୱର୍କ ସଂଯୋଗଗୁଡ଼ିକ ପାଇଁ ନିୟନ୍ତ୍ରଣକୁ ଅନୁମତି ଦିଅନ୍ତୁ"
+#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:3
+msgid ""
+"Put NetworkManager to sleep or wake it up (should only be used by system "
+"power management)"
+msgstr ""
+"NetworkManager କୁ ସୁପ୍ତ କିମ୍ବା ଜାଗ୍ରତ ରଖନ୍ତୁ (କେବଳ ତନ୍ତ୍ର ଶକ୍ତି ପରିଚାଳନା "
+"ଦ୍ୱାରା ବ୍ୟବହାର "
+"ହେବା ଉଚିତ)"
 
-#: ../policy/org.freedesktop.NetworkManager.policy.in.h:2
-msgid "Allow use of user-specific connections"
-msgstr "ଚାଳକ-ନିର୍ଦ୍ଦିଷ୍ଟ ସଂଯୋଗଗୁଡ଼ିକର ବ୍ୟବହାରକୁ ଅନୁମତି ଦିଅନ୍ତୁ"
+#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:4
+msgid "System policy prevents putting NetworkManager to sleep or waking it up"
+msgstr "ତନ୍ତ୍ର ନିତୀ NetworkManager କୁ ସୁପ୍ତ କିମ୍ବା ଜାଗ୍ରତ ରହିବାରୁ ବାରଣ କରିଥାଏ"
 
-#: ../policy/org.freedesktop.NetworkManager.policy.in.h:3
+#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:5
 msgid "Enable or disable WiFi devices"
 msgstr "WiFi ଉପକରଣଗୁଡ଼ିକୁ ସକ୍ରିୟ କିମ୍ବା ନିଷ୍କ୍ରିୟ କରନ୍ତୁ"
 
-#: ../policy/org.freedesktop.NetworkManager.policy.in.h:4
+#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:6
+msgid "System policy prevents enabling or disabling WiFi devices"
+msgstr ""
+"ତନ୍ତ୍ର ନିତୀ WiFi ଉପକରଣଗୁଡ଼ିକୁ ସକ୍ରିୟ କିମ୍ବା ନିଷ୍କ୍ରିୟ ହେବାରୁ ବାରଣ କରିଥାଏ"
+
+#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:7
 msgid "Enable or disable mobile broadband devices"
 msgstr "ମୋବାଇଲ ବ୍ରୋଡବ୍ୟାଣ୍ଡ ଉପକରଣଗୁଡ଼ିକୁ ସକ୍ରିୟ କିମ୍ବା ନିଷ୍କ୍ରିୟ କରନ୍ତୁ"
 
-#: ../policy/org.freedesktop.NetworkManager.policy.in.h:5
-msgid "Enable or disable system networking"
-msgstr "ତନ୍ତ୍ର ନେଟୱର୍କିଙ୍ଗକୁ ସକ୍ରିୟ କିମ୍ବା ନିଷ୍କ୍ରିୟ କରନ୍ତୁ"
+#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:8
+msgid "System policy prevents enabling or disabling mobile broadband devices"
+msgstr ""
+"ତନ୍ତ୍ର ନିତୀ ମୋବାଇଲ ବ୍ରୋଡବ୍ୟାଣ୍ଡ ଉପକରଣଗୁଡ଼ିକୁ ସକ୍ରିୟ କିମ୍ବା ନିଷ୍କ୍ରିୟ ହେବାରୁ "
+"ବାରଣ କରିଥାଏ"
+
+#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:9
+#| 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
+#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:10
+#| msgid ""
+#| "System policy prevents enabling or disabling mobile broadband devices"
 msgid ""
-"Put NetworkManager to sleep or wake it up (should only be used by system "
-"power management)"
+"System policy prevents enabling or disabling WiMAX mobile broadband devices"
 msgstr ""
-"NetworkManager କୁ ସୁପ୍ତ କିମ୍ବା ଜାଗ୍ରତ ରଖନ୍ତୁ (କେବଳ ତନ୍ତ୍ର ଶକ୍ତି ପରିଚାଳନା ଦ୍ୱାରା ବ୍ୟବହାର "
-"ହେବା ଉଚିତ)"
+"ତନ୍ତ୍ର ନିତୀ  WiMAX ମୋବାଇଲ ବ୍ରୋଡବ୍ୟାଣ୍ଡ ଉପକରଣଗୁଡ଼ିକୁ ସକ୍ରିୟ କିମ୍ବା ନିଷ୍କ୍ରିୟ "
+"ହେବାରୁ "
+"ବାରଣ କରିଥାଏ"
+
+#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:11
+msgid "Allow control of network connections"
+msgstr "ନେଟୱର୍କ ସଂଯୋଗଗୁଡ଼ିକ ପାଇଁ ନିୟନ୍ତ୍ରଣକୁ ଅନୁମତି ଦିଅନ୍ତୁ"
 
-#: ../policy/org.freedesktop.NetworkManager.policy.in.h:7
+#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:12
 msgid "System policy prevents control of network connections"
 msgstr "ତନ୍ତ୍ର ନିତୀ ନେଟୱର୍କ ସଂଯୋଗଗୁଡ଼ିକର ନିୟନ୍ତ୍ରଣକୁ ବାରଣ କରିଥାଏ"
 
-#: ../policy/org.freedesktop.NetworkManager.policy.in.h:8
-msgid "System policy prevents enabling or disabling WiFi devices"
-msgstr "ତନ୍ତ୍ର ନିତୀ WiFi ଉପକରଣଗୁଡ଼ିକୁ ସକ୍ରିୟ କିମ୍ବା ନିଷ୍କ୍ରିୟ ହେବାରୁ ବାରଣ କରିଥାଏ"
+#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:13
+msgid "Connection sharing via a protected WiFi network"
+msgstr "ଗୋଟିଏ ସୁରକ୍ଷିତ WiFi ନେଟୱର୍କରେ ସଂଯୋଗ ସହଭାଗ"
 
-#: ../policy/org.freedesktop.NetworkManager.policy.in.h:9
-msgid "System policy prevents enabling or disabling mobile broadband devices"
-msgstr "ତନ୍ତ୍ର ନିତୀ ମୋବାଇଲ ବ୍ରୋଡବ୍ୟାଣ୍ଡ ଉପକରଣଗୁଡ଼ିକୁ ସକ୍ରିୟ କିମ୍ବା ନିଷ୍କ୍ରିୟ ହେବାରୁ ବାରଣ କରିଥାଏ"
+#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:14
+msgid "System policy prevents sharing connections via a protected WiFi network"
+msgstr ""
+"ତନ୍ତ୍ର ନିତୀ ଗୋଟିଏ ସୁରକ୍ଷିତ WiFi ନେଟୱର୍କରେ ସଂଯୋଗ ସହଭାଗ କରିବାରେ ବାରଣ କରିଥାଏ"
 
-#: ../policy/org.freedesktop.NetworkManager.policy.in.h:10
-msgid "System policy prevents enabling or disabling system networking"
-msgstr "ତନ୍ତ୍ର ନିତୀ ତନ୍ତ୍ର ନେଟୱର୍କିଙ୍ଗକୁ ସକ୍ରିୟ କିମ୍ବା ନିଷ୍କ୍ରିୟ ହେବାରୁ ବାରଣ କରିଥାଏ"
+#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:15
+msgid "Connection sharing via an open WiFi network"
+msgstr "ଗୋଟିଏ ଖୋଲା WiFi ନେଟୱର୍କରେ ସଂଯୋଗ ସହଭାଗ"
 
-#: ../policy/org.freedesktop.NetworkManager.policy.in.h:11
-msgid "System policy prevents putting NetworkManager to sleep or waking it up"
-msgstr "ତନ୍ତ୍ର ନିତୀ NetworkManager କୁ ସୁପ୍ତ କିମ୍ବା ଜାଗ୍ରତ ରହିବାରୁ ବାରଣ କରିଥାଏ"
+#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:16
+msgid "System policy prevents sharing connections via an open WiFi network"
+msgstr "ତନ୍ତ୍ର ନିତୀ ଗୋଟିଏ ଖୋଲା WiFi ନେଟୱର୍କରେ ସଂଯୋଗ ସହଭାଗ କରିବାରେ ବାରଣ କରିଥାଏ"
 
-#: ../policy/org.freedesktop.NetworkManager.policy.in.h:12
-msgid "System policy prevents use of user-specific connections"
-msgstr "ତନ୍ତ୍ର ନିତୀ ତନ୍ତ୍ର-ନିର୍ଦ୍ଦିଷ୍ଟ ସଂଯୋଗଗୁଡ଼ିକୁ ବାରଣ କରିଥାଏ"
+#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:17
+#| msgid "Allow control of network connections"
+msgid "Modify personal network 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"
+#: ../policy/org.freedesktop.NetworkManager.policy.in.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:214
-msgid "error occurred while waiting for data on socket"
-msgstr "ସକେଟରେ ତଥ୍ୟ ପାଇଁ ଅପେକ୍ଷା କରିବା ସମୟରେ ତ୍ରୁଟି"
+#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:19
+#| msgid "Modify system connections"
+msgid "Modify network connections for all users"
+msgstr "ସମସ୍ତ ବ୍ୟବହାରକାରୀଙ୍କ ପାଇଁ ନେଟୱର୍କ ସଂଯୋଗଗୁଡ଼ିକୁ ପରିବର୍ତ୍ତନ କରନ୍ତୁ"
+
+#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:20
+#| 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:254
+#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:21
+msgid "Modify persistent system hostname"
+msgstr "ସ୍ଥାୟୀ ତନ୍ତ୍ର ହୋଷ୍ଟନାମକୁ ପରିବର୍ତ୍ତନ କରନ୍ତୁ"
+
+#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:22
+msgid "System policy prevents modification of the persistent system hostname"
+msgstr "ତନ୍ତ୍ର ନିତୀ ସ୍ଥାୟୀ ତନ୍ତ୍ର ହୋଷ୍ଟନାମର ପରିବର୍ତ୍ତନକୁ ବାରଣ କରିଥାଏ"
+
+#: ../src/main.c:158
 #, c-format
-msgid "unable to connect to netlink for monitoring link status: %s"
-msgstr "ସଂଯୋଗ ସ୍ଥିତି ଅନ୍ୱେଷଣ କରିବା ପାଇଁ netlink ସହିତ ସଂଯୋଗ ହେବାରେ ଅସମର୍ଥ: %s"
+#| msgid "Failed to encrypt: %d."
+msgid "Failed to set signal mask: %d"
+msgstr "ସଂକେତ ମୁଖା ସେଟ କରିବାରେ ବିଫଳ: %d"
 
-#: ../src/nm-netlink-monitor.c:265
+#: ../src/main.c:167
 #, c-format
-msgid "unable to enable netlink handle credential passing: %s"
-msgstr "netlink ନିୟନ୍ତ୍ରଣ ଅଧିକାର ପଠାଇବାକୁ ସକ୍ରିୟ କରିବାରେ ଅସମର୍ଥ: %s"
+msgid "Failed to create signal handling thread: %d"
+msgstr "ସଂକେତ ନିୟନ୍ତ୍ରଣ ଥ୍ରେଡ ନିର୍ମାଣ କରିବାରେ ବିଫଳ: %d"
 
-#: ../src/nm-netlink-monitor.c:291 ../src/nm-netlink-monitor.c:353
+#: ../src/main.c:182
 #, c-format
-msgid "unable to allocate netlink handle for monitoring link status: %s"
-msgstr "ସଂଯୋଗ ସ୍ଥିତି ଅନ୍ୱେଷଣ କରିବା ପାଇଁ netlink ନିୟନ୍ତ୍ରଣ ଦର୍ଶାଇବାରେ ଅସମର୍ଥ: %s"
+msgid "Opening %s failed: %s\n"
+msgstr "%s କୁ ଖୋଲିବାରେ ବିଫଳ: %s\n"
 
-#: ../src/nm-netlink-monitor.c:376
+#: ../src/main.c:188
 #, c-format
-msgid "unable to allocate netlink link cache for monitoring link status: %s"
-msgstr "ସଂଯୋଗ ସ୍ଥିତି ଅନ୍ୱେଷଣ କରିବା ପାଇଁ netlink କ୍ୟାଶେ ଦର୍ଶାଇବାରେ ଅସମର୍ଥ: %s"
+msgid "Writing to %s failed: %s\n"
+msgstr "%s ରେ ଲେଖିବା ବିଫଳ ହୋଇଛି: %s\n"
 
-#: ../src/nm-netlink-monitor.c:502
+#: ../src/main.c:193
 #, c-format
-msgid "unable to join netlink group: %s"
-msgstr "netlink ଶ୍ରେଣୀରେ ମିଶିବାରେ ଅସମର୍ଥ: %s"
+msgid "Closing %s failed: %s\n"
+msgstr "%s କୁ ବନ୍ଦ କରିବା ବିଫଳ ହୋଇଛି: %s\n"
 
-#: ../src/nm-netlink-monitor.c:629 ../src/nm-netlink-monitor.c:642
+#: ../src/main.c:236
 #, c-format
-msgid "error updating link cache: %s"
-msgstr "ସଂଯୋଗ କ୍ୟାଶେ ଅଦ୍ୟତନ କରିବାରେ ତ୍ରୁଟି: %s"
+msgid "NetworkManager is already running (pid %ld)\n"
+msgstr "NetworkManager ପୂର୍ବରୁ ଚାଲୁଅଛି (pid %ld)\n"
+
+#: ../src/main.c:363
+#| msgid "NetworkManager status"
+msgid "Print NetworkManager version and exit"
+msgstr "NetworkManager ସଂସ୍କରଣକୁ ମୁଦ୍ରଣ କରନ୍ତୁ ଏବଂ ପ୍ରସ୍ଥାନ କରନ୍ତୁ"
+
+#: ../src/main.c:364
+msgid "Don't become a daemon"
+msgstr "ଗୋଟିଏ ଡିମୋନ ହୁଅ ନାହିଁ"
+
+#: ../src/main.c:365
+msgid "Make all warnings fatal"
+msgstr "ସବୁ ଚେତାବନୀଗୁଡିକୁ ମାରାତ୍ମକ କରନ୍ତୁ"
+
+#: ../src/main.c:366
+msgid "Specify the location of a PID file"
+msgstr "ଏକ PID ଫାଇଲର ଅବସ୍ଥାନକୁ ଉଲ୍ଲେଖ କରନ୍ତୁ"
+
+#: ../src/main.c:366
+msgid "filename"
+msgstr "ଫାଇଲ ନାମ"
+
+#: ../src/main.c:367
+msgid "State file location"
+msgstr "ଫାଇଲ ଅବସ୍ଥାନ ଜଣାନ୍ତୁ"
+
+#: ../src/main.c:367
+msgid "/path/to/state.file"
+msgstr "/path/to/state.file"
+
+#: ../src/main.c:368
+msgid "Config file location"
+msgstr "ସଂରଚନା ଫାଇଲ ଅବସ୍ଥାନ"
+
+#: ../src/main.c:368
+msgid "/path/to/config.file"
+msgstr "/path/to/config.file"
+
+#: ../src/main.c:369
+msgid "List of plugins separated by ','"
+msgstr "',' ଦ୍ୱାରା ପୃଥକ ପ୍ଲଗଇନ ତାଲିକା"
+
+#: ../src/main.c:369
+msgid "plugin1,plugin2"
+msgstr "ପ୍ଲଗଇନ1,ପ୍ଲଗଇନ2"
+
+#. Translators: Do not translate the values in the square brackets
+#: ../src/main.c:371
+msgid "Log level: one of [ERR, WARN, INFO, DEBUG]"
+msgstr "ଲଗ ସ୍ତର:  [ERR, WARN, INFO, DEBUG] ମଧ୍ଯରୁ ଗୋଟିଏ"
+
+#. Translators: Do not translate the values in the square brackets
+#: ../src/main.c:374
+msgid ""
+"Log domains separated by ',': any combination of\n"
+"                                                [NONE,HW,RFKILL,ETHER,WIFI,"
+"BT,MB,DHCP4,DHCP6,PPP,\n"
+"                                                 WIFI_SCAN,IP4,IP6,AUTOIP4,"
+"DNS,VPN,SHARING,SUPPLICANT,\n"
+"                                                 AGENTS,SETTINGS,SUSPEND,"
+"CORE,DEVICE,OLPC,WIMAX,\n"
+"                                                 INFINIBAND,FIREWALL,ADSL]"
+msgstr ""
+"ଲଗ ଡମେନଗୁଡ଼ିକ ',' ଦ୍ୱାରା ପୃଥକ ହୋଇଛି: ଏହାର ଯେକୌଣସି ଯୁଗଳ\n"
+"                                                [NONE,HW,RFKILL,ETHER,WIFI,"
+"BT,MB,DHCP4,DHCP6,PPP,\n"
+"                                                 WIFI_SCAN,IP4,IP6,AUTOIP4,"
+"DNS,VPN,SHARING,SUPPLICANT,\n"
+"                                                 AGENTS,SETTINGS,SUSPEND,"
+"CORE,DEVICE,OLPC,WIMAX,\n"
+"                                                 INFINIBAND,FIREWALL,ADSL]"
 
-#: ../src/main.c:502
+#: ../src/main.c:380
+msgid "An http(s) address for checking internet connectivity"
+msgstr "ଇଣ୍ଟରନେଟ ସଂଯୋଗକୁ ଯାଞ୍ଚ କରିବା ପାଇଁ ଏକ http(s) ଠିକଣା"
+
+#: ../src/main.c:381
+msgid "The interval between connectivity checks (in seconds)"
+msgstr "ସଂଯୋଜକତା ଯାଞ୍ଚ ମଧ୍ଯରେ ଅନ୍ତରାଳ (ସେକଣ୍ଡରେ)"
+
+#: ../src/main.c:382
+msgid "The expected start of the response"
+msgstr "ଉତ୍ତରର ଆରମ୍ଭ"
+
+#: ../src/main.c:382
+msgid "Bingo!"
+msgstr "ବିଙ୍ଗୋ!"
+
+#: ../src/main.c:387
+#, c-format
+msgid "GModules are not supported on your platform!\n"
+msgstr "GModule ଗୁଡ଼ିକ ଆପଣଙ୍କ ପ୍ଲାଟଫର୍ମରେ ସହାୟତା ପ୍ରାପ୍ତ ନୁହଁ!\n"
+
+#: ../src/main.c:406
+msgid ""
+"NetworkManager monitors all network connections and automatically\n"
+"chooses the best connection to use.  It also allows the user to\n"
+"specify wireless access points which wireless cards in the computer\n"
+"should associate with."
+msgstr ""
+"NetworkManager ସମସ୍ତ ନେଟୱର୍କ ସଂଯୋଗଗୁଡ଼ିକୁ ଦେଖିଥାଏ ଏବଂ ସ୍ୱୟଂଚାଳିତ ଭାବରେ\n"
+"ଉତ୍ତମ ସଂଯୋଗକୁ ବାଛିଥାଏ।  ଏହା ମଧ୍ଯ ବ୍ୟବହାରକାରୀଙ୍କୁ ବେତାର ଅଭିଗମ୍ୟତା ଉଲ୍ଲେଖ କରିବା "
+"ପାଇଁ\n"
+"ଅନୁମତି ଦେଇଥାଏ ଯିଏକି ବେତାର କାର୍ଡଗୁଡ଼ିକୁ କମ୍ପୁଟର ସହିତ\n"
+" ସମ୍ପୃକ୍ତ ଥାଏ।"
+
+#: ../src/main.c:412
 #, c-format
 msgid "Invalid option.  Please use --help to see a list of valid options.\n"
-msgstr "ଅବୈଧ ବିକଳ୍ପ.   ବୈଧ ବିକଳ୍ପର ତାଲିକା ଦେଖିବା ପାଇଁ ଦୟାକରି --ସହାୟତା ବ୍ୟବହାର କରନ୍ତୁ.\n"
+msgstr ""
+"ଅବୈଧ ବିକଳ୍ପ.   ବୈଧ ବିକଳ୍ପର ତାଲିକା ଦେଖିବା ପାଇଁ ଦୟାକରି --ସହାୟତା ବ୍ୟବହାର "
+"କରନ୍ତୁ.\n"
+
+#: ../src/main.c:422
+#, c-format
+#| msgid "Error: Could not connect to NetworkManager."
+msgid "You must be root to run NetworkManager!\n"
+msgstr "NetworkManager କୁ ଚଲାଇବା ପାଇଁ ଆପଣଙ୍କୁ ରୁଟ ହେବାକୁ ପଡ଼ିବ!\n"
 
-#: ../src/main.c:573
+#: ../src/main.c:449
+#, c-format
+#| msgid "Failed to set IV for encryption: %s / %s."
+msgid "Failed to read configuration: (%d) %s\n"
+msgstr "ସଂରଚନା ପଢ଼ିବାରେ ବିଫଳ: (%d) %s\n"
+
+#: ../src/main.c:460
 #, 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:324
+#: ../src/main.c:467
+#, c-format
+msgid "State file %s parsing failed: (%d) %s\n"
+msgstr "ସ୍ଥିତି ଫାଇଲ %s ବିଶ୍ଳେଷଣ ବିଫଳ ହୋଇଛି: (%d) %s\n"
+
+#: ../src/main.c:484
+#, c-format
+msgid "Could not daemonize: %s [error %u]\n"
+msgstr "ଡେମନ କରିପାରିଲା ନାହିଁ: %s [ତ୍ରୁଟି %u]\n"
+
+#: ../src/dhcp-manager/nm-dhcp-dhclient-utils.c:61
 msgid "# Created by NetworkManager\n"
 msgstr "# NetworkManager ଦ୍ୱାରା ନିର୍ମିତ\n"
 
-#: ../src/dhcp-manager/nm-dhcp-dhclient.c:340
+#: ../src/dhcp-manager/nm-dhcp-dhclient-utils.c:68
 #, c-format
 msgid ""
 "# Merged from %s\n"
@@ -1661,47 +2750,251 @@ msgstr ""
 "# %s ରୁ ମିଶ୍ରିତ\n"
 "\n"
 
-#: ../src/dhcp-manager/nm-dhcp-manager.c:284
+#: ../src/dhcp-manager/nm-dhcp-manager.c:266
 msgid "no usable DHCP client could be found."
 msgstr "କୌଣସି ଉପଯୋଗୀ DHCP କ୍ଲାଏଣ୍ଟ ମିଳିଲା ନାହିଁ।"
 
-#: ../src/dhcp-manager/nm-dhcp-manager.c:293
+#: ../src/dhcp-manager/nm-dhcp-manager.c:275
 msgid "'dhclient' could be found."
 msgstr "'dhclient' ମିଳି ପାରିଲା।"
 
-#: ../src/dhcp-manager/nm-dhcp-manager.c:303
+#: ../src/dhcp-manager/nm-dhcp-manager.c:285
 msgid "'dhcpcd' could be found."
 msgstr "'dhcpcd' ମିଳିପାରିଲା।"
 
-#: ../src/dhcp-manager/nm-dhcp-manager.c:311
+#: ../src/dhcp-manager/nm-dhcp-manager.c:293
 #, c-format
 msgid "unsupported DHCP client '%s'"
 msgstr "ଅସମର୍ଥିତ DHCP କ୍ଲାଏଣ୍ଟ '%s'"
 
-#: ../src/logging/nm-logging.c:146
+#: ../src/dns-manager/nm-dns-manager.c:375
+msgid "NOTE: the libc resolver may not support more than 3 nameservers."
+msgstr "ଟିପ୍ପଣୀ: libc resolver 3 ରୁ ଅଧିକ nameserverଗୁଡ଼ିକୁ ସମର୍ଥନ କରିନପାରେ."
+
+#: ../src/dns-manager/nm-dns-manager.c:377
+msgid "The nameservers listed below may not be recognized."
+msgstr "ନିମ୍ନରେ ତାଲିକାଭୁକ୍ତ nameserverଗୁଡ଼ିକୁ ଚିହ୍ନି ହୋଇନପାରେ."
+
+#: ../src/logging/nm-logging.c:142
 #, c-format
 msgid "Unknown log level '%s'"
 msgstr "ଅଜ୍ଞାତ ଲଗ ସ୍ତର '%s'"
 
-#: ../src/logging/nm-logging.c:171
+#: ../src/logging/nm-logging.c:181
 #, c-format
 msgid "Unknown log domain '%s'"
 msgstr "ଅଜ୍ଞାତ ଲଗ ଡମେନ '%s'"
 
-#: ../src/dns-manager/nm-dns-manager.c:384
-msgid "NOTE: the libc resolver may not support more than 3 nameservers."
-msgstr "ଟିପ୍ପଣୀ: libc resolver 3 ରୁ ଅଧିକ nameserverଗୁଡ଼ିକୁ ସମର୍ଥନ କରିନପାରେ."
+#: ../src/modem-manager/nm-modem-cdma.c:280 ../src/nm-device-bt.c:351
+#, c-format
+#| msgid "connection failed"
+msgid "CDMA connection %d"
+msgstr "CDMA ସଂଯୋଗ %d"
 
-#: ../src/dns-manager/nm-dns-manager.c:386
-msgid "The nameservers listed below may not be recognized."
-msgstr "ନିମ୍ନରେ ତାଲିକାଭୁକ୍ତ nameserverଗୁଡ଼ିକୁ ଚିହ୍ନି ହୋଇନପାରେ."
+#: ../src/modem-manager/nm-modem-gsm.c:558 ../src/nm-device-bt.c:347
+#, c-format
+#| msgid "connection failed"
+msgid "GSM connection %d"
+msgstr "GSM ସଂଯୋଗ %d"
+
+#: ../src/nm-device-bond.c:192
+#, c-format
+#| msgid "connection failed"
+msgid "Bond connection %d"
+msgstr "ବନ୍ଧନ ସଂଯୋଗ %d"
+
+#: ../src/nm-device-adsl.c:193
+#, c-format
+#| msgid "connection failed"
+msgid "ADSL connection %d"
+msgstr "ADSL ସଂଯୋଗ %d"
+
+#: ../src/nm-device-bt.c:322
+#, c-format
+#| msgid "VPN connection failed"
+msgid "PAN connection %d"
+msgstr "PAN ସଂଯୋଗ %d"
+
+#: ../src/nm-device-bt.c:355
+#, c-format
+#| msgid "VPN connection failed"
+msgid "DUN connection %d"
+msgstr "DUN ସଂଯୋଗ %d"
+
+#: ../src/nm-device-ethernet.c:1326
+#, c-format
+#| msgid "VPN connection failed"
+msgid "PPPoE connection %d"
+msgstr "PPPoE ସଂଯୋଗ %d"
+
+#: ../src/nm-device-ethernet.c:1326 ../src/settings/nm-settings-utils.c:50
+#, c-format
+#| msgid "Active connections"
+msgid "Wired connection %d"
+msgstr "ତାରମୟ ସଂଯୋଗ %d"
+
+#: ../src/nm-device-infiniband.c:303
+#, c-format
+msgid "InfiniBand connection %d"
+msgstr "InfiniBand ସଂଯୋଗ %d"
+
+#: ../src/nm-device-olpc-mesh.c:311
+#, c-format
+msgid "Mesh %d"
+msgstr "ମେସ %d"
 
-#: ../src/settings/nm-default-wired-connection.c:157
+#: ../src/nm-device-vlan.c:362
 #, c-format
-msgid "Auto %s"
-msgstr "ସ୍ୱୟଂ %s"
+#| msgid "VPN connection failed"
+msgid "VLAN connection %d"
+msgstr "VLAN ସଂଯୋଗ %d"
 
-#: ../system-settings/plugins/ifcfg-rh/reader.c:3412
+#: ../src/nm-manager.c:662
+#, c-format
+#| msgid "VPN connection failed"
+msgid "VPN connection %d"
+msgstr "VPN ସଂଯୋଗ %d"
+
+#: ../src/nm-netlink-monitor.c:148 ../src/nm-netlink-monitor.c:272
+#: ../src/nm-netlink-monitor.c:695
+#, c-format
+msgid "error processing netlink message: %s"
+msgstr "netlink ସନ୍ଦେଶ ପଠାଇବାରେ ତ୍ରୁଟି: %s"
+
+#: ../src/nm-netlink-monitor.c:251
+msgid "error occurred while waiting for data on socket"
+msgstr "ସକେଟରେ ତଥ୍ୟ ପାଇଁ ଅପେକ୍ଷା କରିବା ସମୟରେ ତ୍ରୁଟି"
+
+#: ../src/nm-netlink-monitor.c:296
+#, c-format
+msgid "unable to connect to netlink for monitoring link status: %s"
+msgstr "ସଂଯୋଗ ସ୍ଥିତି ଅନ୍ୱେଷଣ କରିବା ପାଇଁ netlink ସହିତ ସଂଯୋଗ ହେବାରେ ଅସମର୍ଥ: %s"
+
+#: ../src/nm-netlink-monitor.c:307
+#, c-format
+msgid "unable to enable netlink handle credential passing: %s"
+msgstr "netlink ନିୟନ୍ତ୍ରଣ ଅଧିକାର ପଠାଇବାକୁ ସକ୍ରିୟ କରିବାରେ ଅସମର୍ଥ: %s"
+
+#: ../src/nm-netlink-monitor.c:330 ../src/nm-netlink-monitor.c:390
+#, c-format
+msgid "unable to allocate netlink handle for monitoring link status: %s"
+msgstr ""
+"ସଂଯୋଗ ସ୍ଥିତି ଅନ୍ୱେଷଣ କରିବା ପାଇଁ netlink ନିୟନ୍ତ୍ରଣ ଦର୍ଶାଇବାରେ ଅସମର୍ଥ: %s"
+
+#: ../src/nm-netlink-monitor.c:415
+#, c-format
+msgid "unable to allocate netlink link cache for monitoring link status: %s"
+msgstr "ସଂଯୋଗ ସ୍ଥିତି ଅନ୍ୱେଷଣ କରିବା ପାଇଁ netlink କ୍ୟାଶେ ଦର୍ଶାଇବାରେ ଅସମର୍ଥ: %s"
+
+#: ../src/nm-netlink-monitor.c:542
+#, c-format
+msgid "unable to join netlink group: %s"
+msgstr "netlink ଶ୍ରେଣୀରେ ମିଶିବାରେ ଅସମର୍ଥ: %s"
+
+#: ../src/nm-netlink-monitor.c:671 ../src/nm-netlink-monitor.c:684
+#, c-format
+msgid "error updating link cache: %s"
+msgstr "ସଂଯୋଗ କ୍ୟାଶେ ଅଦ୍ୟତନ କରିବାରେ ତ୍ରୁଟି: %s"
+
+#: ../src/settings/plugins/ifcfg-rh/reader.c:93
 msgid "System"
 msgstr "ତନ୍ତ୍ର"
 
+#: ../src/settings/plugins/ifcfg-rh/reader.c:3663
+msgid "Bond"
+msgstr "ବନ୍ଧନ"
+
+#: ../test/nm-online.c:111
+#, c-format
+#| msgid "connecting"
+msgid "\rConnecting"
+msgstr "\rସଂଯୋଗ କରୁଅଛି"
+
+#: ../test/nm-online.c:142
+msgid "Time to wait for a connection, in seconds (default is 30)"
+msgstr ""
+"ଏକ ସଂଯୋଗ ପାଇଁ ଅପେକ୍ଷା କରିବାକୁ ଥିବା ସମୟ, ସେକଣ୍ଡରେ (ପୂର୍ବନିର୍ଦ୍ଧାରିତଟି ହେଉଛି 30)"
+
+#: ../test/nm-online.c:143
+msgid "Exit immediately if NetworkManager is not running or connecting"
+msgstr ""
+"NetworkManager ଚାଲୁନଥିଲେ କିମ୍ବା ସଂଯୋଗ କରୁନଥିଲେ ସଙ୍ଗେ ସଙ୍ଗେ ପ୍ରସ୍ଥାନ କରନ୍ତୁ"
+
+#: ../test/nm-online.c:144
+msgid "Don't print anything"
+msgstr "କିଛି ମୁଦ୍ରଣ କରନ୍ତୁ ନାହିଁ"
+
+#: ../test/nm-online.c:162
+#| msgid "Error: Could not connect to NetworkManager."
+msgid "Waits for a successful connection in NetworkManager."
+msgstr "NetworkManager ରେ ଏକ ସଫଳ ସଂଯୋଗ ପାଇଁ ଅପେକ୍ଷା କରନ୍ତୁ।"
+
+#: ../test/nm-online.c:168 ../test/nm-online.c:177
+#| msgid "Invalid option.  Please use --help to see a list of valid options.\n"
+msgid "Invalid option.  Please use --help to see a list of valid options."
+msgstr ""
+"ଅବୈଧ ବିକଳ୍ପ।  ବୈଧ ବିକଳ୍ପର ତାଲିକା ଦେଖିବା ପାଇଁ ଦୟାକରି --help ବ୍ୟବହାର କରନ୍ତୁ।"
+
+#~ msgid "SCOPE"
+#~ msgstr "SCOPE"
+
+#~ msgid "DBUS-SERVICE"
+#~ msgstr "DBUS-SERVICE"
+
+#~ msgid "system"
+#~ msgstr "ତନ୍ତ୍ର"
+
+#~ msgid "user"
+#~ msgstr "ଚାଳକ"
+
+#~ msgid "System connections"
+#~ msgstr "ତନ୍ତ୍ର ସଂଯୋଗଗୁଡ଼ିକ"
+
+#~ msgid "User connections"
+#~ msgstr "ଚାଳକ ସଂଯୋଗଗୁଡ଼ିକ"
+
+#~ msgid "state: %s\n"
+#~ msgstr "ଅବସ୍ଥା: %s\n"
+
+#~ msgid "Connection activated\n"
+#~ msgstr "ସଂଯୋଗ ସକ୍ରିୟ ହୋଇଛି\n"
+
+#~ msgid "state: %s (%d)\n"
+#~ msgstr "ଅବସ୍ଥା: %s (%d)\n"
+
+#~ msgid "Error: Obtaining active connection for '%s' failed."
+#~ msgstr "ତ୍ରୁଟି: '%s' ପାଇଁ ସକ୍ରିୟ ସଂଯୋଗ ଧାରଣ କରିବାରେ ବିଫଳ ହୋଇଛି।"
+
+#~ msgid "Active connection state: %s\n"
+#~ msgstr "ସକ୍ରିୟ ସଂଯୋଗ ଅବସ୍ଥା: %s\n"
+
+#~ msgid "Active connection path: %s\n"
+#~ msgstr "ସକ୍ରିୟ ସଂଯୋଗ ପଥ: %s\n"
+
+#~ msgid "IP4-SETTINGS"
+#~ msgstr "IP4-SETTINGS"
+
+#~| msgid "IP4-SETTINGS"
+#~ msgid "IP6-SETTINGS"
+#~ msgstr "IP6-SETTINGS"
+
+#~ msgid "PREFIX"
+#~ msgstr "PREFIX"
+
+#~ msgid "unknown)"
+#~ msgstr "ଅଜଣା)"
+
+#~ msgid "Device state: %d (%s)\n"
+#~ msgstr "ଉପକରଣ ସ୍ଥିତି: %d (%s)\n"
+
+#~ msgid "not set"
+#~ msgstr "ସେଟ ହୋଇନାହିଁ"
+
+#~ msgid "Allow use of user-specific connections"
+#~ msgstr "ଚାଳକ-ନିର୍ଦ୍ଦିଷ୍ଟ ସଂଯୋଗଗୁଡ଼ିକର ବ୍ୟବହାରକୁ ଅନୁମତି ଦିଅନ୍ତୁ"
+
+#~ msgid "System policy prevents use of user-specific connections"
+#~ msgstr "ତନ୍ତ୍ର ନିତୀ ତନ୍ତ୍ର-ନିର୍ଦ୍ଦିଷ୍ଟ ସଂଯୋଗଗୁଡ଼ିକୁ ବାରଣ କରିଥାଏ"
+
+#~ msgid "Auto %s"
+#~ msgstr "ସ୍ୱୟଂ %s"
diff --git a/po/pa.po b/po/pa.po
index 87092b0f..0fd02753 100644
--- a/po/pa.po
+++ b/po/pa.po
@@ -4,1039 +4,1770 @@
 #
 # Amanpreet Singh Alam , 2004.
 # Amanpreet Singh Alam , 2005.
-# A S Alam , 2007, 2010.
+# A S Alam , 2007, 2010, 2012.
 # Jaswinder Singh , 2010.
 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 03:25+0000\n"
-"PO-Revision-Date: 2010-09-19 08:09+0530\n"
+"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
+"product=NetworkManager&keywords=I18N+L10N&component=general\n"
+"POT-Creation-Date: 2012-09-24 15:26+0000\n"
+"PO-Revision-Date: 2012-09-28 08:45+0530\n"
 "Last-Translator: A S Alam \n"
 "Language-Team: Punjabi/Panjabi \n"
+"Language: pa\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Lokalize 1.0\n"
+"X-Generator: Lokalize 1.5\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "\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/common.c:32 ../cli/src/common.c:44 ../cli/src/common.c:52
+#: ../cli/src/common.c:63 ../cli/src/connections.c:128
+#: ../cli/src/connections.c:162
+msgid "GROUP"
+msgstr "ਗਰੁੱਪ"
+
+#. 0
+#: ../cli/src/common.c:33 ../cli/src/common.c:53
+msgid "ADDRESS"
+msgstr "ਐਡਰੈੱਸ"
+
+#. 1
+#: ../cli/src/common.c:34 ../cli/src/common.c:54
+msgid "ROUTE"
+msgstr "ਰੂਟ"
+
+#. 2
+#: ../cli/src/common.c:35 ../cli/src/common.c:55
+msgid "DNS"
+msgstr "DNS"
+
+#. 3
+#: ../cli/src/common.c:36 ../cli/src/common.c:56
+msgid "DOMAIN"
+msgstr "ਡੋਮੇਨ"
+
+#. 4
+#: ../cli/src/common.c:37
+msgid "WINS"
+msgstr "WINS"
+
+#. 0
+#: ../cli/src/common.c:45 ../cli/src/common.c:64
+msgid "OPTION"
+msgstr "ਚੋਣ"
+
+#: ../cli/src/common.c:366
+msgid "unmanaged"
+msgstr "ਬਿਨ-ਪਰਬੰਧ"
+
+#: ../cli/src/common.c:368
+msgid "unavailable"
+msgstr "ਨਾ-ਉਪਲੱਬਧ"
+
+#: ../cli/src/common.c:370 ../cli/src/network-manager.c:120
+msgid "disconnected"
+msgstr "ਡਿਸ-ਕੁਨੈਕਟ ਕੀਤਾ"
+
+#: ../cli/src/common.c:372
+msgid "connecting (prepare)"
+msgstr "ਕੁਨੈਕਟ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ (ਤਿਆਰੀ)"
+
+#: ../cli/src/common.c:374
+msgid "connecting (configuring)"
+msgstr "ਕੁਨੈਕਟ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ (ਸੰਰਚਨਾ ਜਾਰੀ)"
+
+#: ../cli/src/common.c:376
+msgid "connecting (need authentication)"
+msgstr "ਕੁਨੈਕਟ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ (ਪਰਮਾਣਕਿਤਾ ਦੀ ਲੋੜ)"
+
+#: ../cli/src/common.c:378
+msgid "connecting (getting IP configuration)"
+msgstr "ਕੁਨੈਕਟ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ (IP ਸੰਰਚਨਾ ਲਈ ਜਾ ਰਹੀ ਹੈ)"
+
+#: ../cli/src/common.c:380
+#| msgid "connecting (getting IP configuration)"
+msgid "connecting (checking IP connectivity)"
+msgstr "ਕੁਨੈਕਟ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ (IP ਕੁਨੈਕਸ਼ਨ ਜਾਂਚਿਆ ਜਾ ਰਿਹਾ ਹੈ)"
+
+#: ../cli/src/common.c:382
+#| msgid "connecting (getting IP configuration)"
+msgid "connecting (starting secondary connections)"
+msgstr "ਕੁਨੈਕਟ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ (ਸੈਕੰਡਰੀ ਕੁਨੈਕਸ਼ਨ ਸ਼ੁਰੂ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ)"
+
+#: ../cli/src/common.c:384 ../cli/src/network-manager.c:116
+msgid "connected"
+msgstr "ਕੁਨੈਕਟ ਹੋਇਆ"
+
+#: ../cli/src/common.c:386 ../cli/src/connections.c:633
+#| msgid "activating"
+msgid "deactivating"
+msgstr "ਡਿਐਕਟਈਵੇਟ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ"
+
+#: ../cli/src/common.c:388
+msgid "connection failed"
+msgstr "ਕੁਨੈਕਸ਼ਨ ਫੇਲ੍ਹ ਹੈ"
+
+#: ../cli/src/common.c:390 ../cli/src/connections.c:636
+#: ../cli/src/connections.c:659 ../cli/src/connections.c:1351
+#: ../cli/src/devices.c:622 ../cli/src/network-manager.c:123
+#: ../cli/src/network-manager.c:185 ../cli/src/network-manager.c:188
+#: ../cli/src/network-manager.c:197 ../cli/src/network-manager.c:257
+#: ../cli/src/network-manager.c:273 ../cli/src/network-manager.c:431
+#: ../cli/src/network-manager.c:486 ../cli/src/network-manager.c:524
+#: ../cli/src/network-manager.c:563 ../cli/src/settings.c:593
+#: ../cli/src/settings.c:621 ../cli/src/utils.c:531 ../src/main.c:458
+#: ../src/main.c:477
+msgid "unknown"
+msgstr "ਅਣਜਾਣ"
+
+#: ../cli/src/common.c:399
+msgid "No reason given"
+msgstr "ਕੋਈ ਕਾਰਨ ਨਹੀਂ ਦਿੱਤਾ ਹੈ।"
+
+#: ../cli/src/common.c:402
+#| msgid "Unknown"
+msgid "Unknown error"
+msgstr "ਅਣਜਾਣ ਗਲਤੀ"
+
+#: ../cli/src/common.c:405
+msgid "Device is now managed"
+msgstr "ਜੰਤਰ ਹੁਣ ਪ੍ਰਬੰਧ ਅਧੀਨ ਹੈ"
+
+#: ../cli/src/common.c:408
+msgid "Device is now unmanaged"
+msgstr "ਜੰਤਰ ਹੁਣ ਪਰਬੰਧ ਅਧੀਨ ਨਹੀਂ ਹੈ"
+
+#: ../cli/src/common.c:411
+#| msgid "the VPN service returned invalid configuration"
+msgid "The device could not be readied for configuration"
+msgstr "ਜੰਤਰ ਨੂੰ ਸੰਰਚਨਾ ਲਈ ਤਿਆਰ ਨਹੀਂ ਕੀਤ ਜਾ ਸਕਿਆ"
+
+#: ../cli/src/common.c:414
+msgid ""
+"IP configuration could not be reserved (no available address, timeout, etc.)"
+msgstr ""
+"IP ਸੰਰਚਨਾ ਨੂੰ ਰਾਖਵਾਂ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਿਆ (ਕੋਈ ਐਡਰੈਸ ਉਪਲੱਬਧ ਨਹੀਂ, ਸਮਾਂ ਸਮਾਪਤ "
+"ਹੋਣਾ ਆਦਿ)"
+
+#: ../cli/src/common.c:417
+msgid "The IP configuration is no longer valid"
+msgstr "IP ਸੰਰਚਨਾ ਹੁਣ ਢੁੱਕਵੀਂ ਨਹੀਂ ਹੈ"
+
+#: ../cli/src/common.c:420
+msgid "Secrets were required, but not provided"
+msgstr "ਭੇਦ ਦੀ ਲੋੜ ਸੀ, ਪਰ ਦਿੱਤਾ ਨਹੀਂ ਗਿਆ"
+
+#: ../cli/src/common.c:423
+msgid "802.1X supplicant disconnected"
+msgstr "802.1X ਸਪਲੀਕੈਂਟ ਡਿਸ-ਕੁਨੈਕਟ ਹੈ"
+
+#: ../cli/src/common.c:426
+msgid "802.1X supplicant configuration failed"
+msgstr "802.1X ਸਪਲੀਕੈਂਟ ਸੰਰਚਨਾ ਫੇਲ੍ਹ ਹੈ"
+
+#: ../cli/src/common.c:429
+msgid "802.1X supplicant failed"
+msgstr "802.1X ਸਪਲੀਕੈਂਟ ਫੇਲ੍ਹ ਹੈ"
+
+#: ../cli/src/common.c:432
+msgid "802.1X supplicant took too long to authenticate"
+msgstr "802.1X ਸਪਲੀਕੈਂਟ ਨੇ ਪਰਮਾਣਿਤ ਹੋਣ ਲਈ ਬਹੁਤ ਲੰਮਾ ਸਮਾਂ ਲੈ ਲਿਆ ਹੈ"
+
+#: ../cli/src/common.c:435
+#| msgid "the VPN service failed to start"
+msgid "PPP service failed to start"
+msgstr "PPP ਸਰਵਿਸ ਸ਼ੁਰੂ ਕਰਨ ਲਈ ਫੇਲ੍ਹ"
+
+#: ../cli/src/common.c:438
+#| msgid "VPN disconnected"
+msgid "PPP service disconnected"
+msgstr "PPP ਸਰਵਿਸ ਡਿਸ-ਕੁਨੈਕਟ ਹੈ"
+
+#: ../cli/src/common.c:441
+msgid "PPP failed"
+msgstr "PPP ਫੇਲ੍ਹ ਹੈ"
+
+#: ../cli/src/common.c:444
+#| msgid "the VPN service failed to start"
+msgid "DHCP client failed to start"
+msgstr "DHCP ਕਲਾਇਟ ਸ਼ੁਰੂ ਕਰਨ ਲਈ ਫੇਲ੍ਹ"
+
+#: ../cli/src/common.c:447
+msgid "DHCP client error"
+msgstr "DHCP ਕਲਾਇਟ ਗਲਤੀ"
+
+#: ../cli/src/common.c:450
+#| msgid "VPN connection failed"
+msgid "DHCP client failed"
+msgstr "DHCP ਕਲਾਇਟ ਫੇਲ੍ਹ ਹੈ"
+
+#: ../cli/src/common.c:453
+#| msgid "the VPN service failed to start"
+msgid "Shared connection service failed to start"
+msgstr "ਸਾਂਝੀ ਕੀਤੀ ਕੁਨੈਕਸ਼ਨ ਸਰਵਿਸ ਸ਼ੁਰੂ ਕਰਨ ਲਈ ਫੇਲ੍ਹ"
+
+#: ../cli/src/common.c:456
+#| msgid "connection failed"
+msgid "Shared connection service failed"
+msgstr "ਸਾਂਝਾ ਕੀਤੀ ਕੁਨੈਕਸ਼ਨ ਸਰਵਿਸ ਫੇਲ੍ਹ ਹੈ"
+
+#: ../cli/src/common.c:459
+#| msgid "the VPN service failed to start"
+msgid "AutoIP service failed to start"
+msgstr "ਆਟੋ-IP ਸਰਵਿਸ ਸ਼ੁਰੂ ਕਰਨ ਲਈ ਫੇਲ੍ਹ"
+
+#: ../cli/src/common.c:462
+msgid "AutoIP service error"
+msgstr "ਆਟੋ-IP ਸਰਵਿਸ ਗਲਤੀ"
+
+#: ../cli/src/common.c:465
+#| msgid "the VPN service failed to start"
+msgid "AutoIP service failed"
+msgstr "ਆਟੋ-IP ਸਰਵਿਸ ਫੇਲ੍ਹ ਹੋਈ"
+
+#: ../cli/src/common.c:468
+msgid "The line is busy"
+msgstr "ਲਾਈਨ ਰੁੱਝੀ ਹੋਈ ਹੈ"
+
+#: ../cli/src/common.c:471
+msgid "No dial tone"
+msgstr "ਕੋਈ ਡਾਇਲ ਟੋਨ ਨਹੀਂ"
+
+#: ../cli/src/common.c:474
+msgid "No carrier could be established"
+msgstr "ਕੋਈ ਕੈਰੀਅਰ ਤਿਆਰ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਿਆ"
+
+#: ../cli/src/common.c:477
+msgid "The dialing request timed out"
+msgstr "ਡਾਇਲ ਕਰਨ ਦੀ ਮੰਗ ਲਈ ਸਮਾਂ ਸਮਾਪਤ"
+
+#: ../cli/src/common.c:480
+msgid "The dialing attempt failed"
+msgstr "ਡਾਇਲ ਕਰਨ ਦੀ ਕੋਸ਼ਿਸ਼ ਫੇਲ੍ਹ ਹੋਈ"
+
+#: ../cli/src/common.c:483
+#| msgid "Error: Connection activation failed."
+msgid "Modem initialization failed"
+msgstr "ਮਾਡਮ ਸ਼ੁਰੂਆਤ ਕਰਨ ਲਈ ਫੇਲ੍ਹ"
+
+#: ../cli/src/common.c:486
+#| msgid "Failed to decrypt the private key."
+msgid "Failed to select the specified APN"
+msgstr "ਦਿੱਤੇ APN ਨੂੰ ਚੁਣਨ ਲਈ ਫੇਲ੍ਹ ਹੈ"
+
+#: ../cli/src/common.c:489
+msgid "Not searching for networks"
+msgstr "ਨੈੱਟਵਰਕ ਲਈ ਖੋਜ ਨਹੀਂ ਕੀਤੀ ਜਾ ਰਹੀ"
+
+#: ../cli/src/common.c:492
+#| msgid "Networking enabled"
+msgid "Network registration denied"
+msgstr "ਨੈੱਟਵਰਕ ਰਜਿਸਟਰੇਸ਼ਨ ਉੱਤੇ ਪਾਬੰਦੀ"
+
+#: ../cli/src/common.c:495
+msgid "Network registration timed out"
+msgstr "ਨੈੱਟਵਰਕ ਰਜਿਸਟਰ ਲਈ ਸਮਾਂ-ਸਮਾਪਤ"
+
+#: ../cli/src/common.c:498
+msgid "Failed to register with the requested network"
+msgstr "ਮੰਗੇ ਗਏ ਨੈੱਟਵਰਕ ਉੱਤੇ ਰਜਿਸਟਰ ਕਰਨ ਲਈ ਫੇਲ੍ਹ"
+
+#: ../cli/src/common.c:501
+#| msgid "VPN connection failed"
+msgid "PIN check failed"
+msgstr "PIN ਚੈਕ ਫੇਲ੍ਹ ਹੈ"
+
+#: ../cli/src/common.c:504
+msgid "Necessary firmware for the device may be missing"
+msgstr "ਜੰਤਰ ਲਈ ਲੋੜੀਦਾ ਫਿਰਮਵੇਅਰ ਸ਼ਾਇਦ ਮੌਜੂਦ ਨਹੀਂ"
+
+#: ../cli/src/common.c:507
+#| msgid "the connection was removed"
+msgid "The device was removed"
+msgstr "ਜੰਤਰ ਹਟਾਇਆ ਗਿਆ ਸੀ"
+
+#: ../cli/src/common.c:510
+#| msgid "NetworkManager status"
+msgid "NetworkManager went to sleep"
+msgstr "ਨੈੱਟਵਰਕਮੈਨੇਜਰ ਸਲੀਪ ਮੋਡ ਵਿੱਚ ਗਿਆ"
+
+#: ../cli/src/common.c:513
+#| msgid "no active connection or device"
+msgid "The device's active connection disappeared"
+msgstr "ਜੰਤਰ ਦਾ ਸਰਗਰਮ ਕੁਨੈਕਸ਼ਨ ਅਲੋਪ ਹੋਇਆ"
+
+#: ../cli/src/common.c:516
+msgid "Device disconnected by user or client"
+msgstr "ਜੰਤਰ ਯੂਜ਼ਰ ਜਾਂ ਕਲਾਇਟ ਵਲੋਂ ਡਿਸ-ਕੁਨੈਕਟ ਕੀਤਾ ਗਿਆ ਹੈ"
+
+#: ../cli/src/common.c:519
+msgid "Carrier/link changed"
+msgstr "ਕੈਰੀਅਰ/ਲਿੰਕ ਬਦਲਿਆ"
+
+#: ../cli/src/common.c:522
+#| msgid "the connection was removed"
+msgid "The device's existing connection was assumed"
+msgstr "ਜੰਤਰ ਦਾ ਮੌਜੂਦਾ ਕੁਨੈਕਸ਼ਨ ਮੁੜ-ਪ੍ਰਾਪਤ ਕੀਤਾ ਗਿਆ"
+
+#: ../cli/src/common.c:525
+msgid "The supplicant is now available"
+msgstr "ਸਪਲੀਕੈਂਟ ਹੁਣ ਉਪਲੱਬਧ ਹੈ"
+
+#: ../cli/src/common.c:528
+#| msgid "'dhcpcd' could be found."
+msgid "The modem could not be found"
+msgstr "ਮਾਡਮ ਨਹੀਂ ਲੱਭਿਆ ਜਾ ਸਕਿਆ"
+
+#: ../cli/src/common.c:531
+#| msgid "the connection attempt timed out"
+msgid "The Bluetooth connection failed or timed out"
+msgstr "ਬਲਿਊਟੁੱਥ ਕੁਨੈਕਸ਼ਨ ਫੇਲ੍ਹ ਹੋਇਆ ਜਾਂ ਸਮਾਂ ਸਮਾਪਤ"
+
+#: ../cli/src/common.c:534
+msgid "GSM Modem's SIM card not inserted"
+msgstr "GSM ਦਾ ਸਿਮ ਕਾਰਡ ਨਹੀਂ ਪਾਇਆ ਗਿਆ ਹੈ"
+
+#: ../cli/src/common.c:537
+msgid "GSM Modem's SIM PIN required"
+msgstr "GSM ਮਾਡਮ ਦਾ ਸਿਮ ਪਿੰਨ ਚਾਹੀਦਾ ਹੈ"
+
+#: ../cli/src/common.c:540
+msgid "GSM Modem's SIM PUK required"
+msgstr "GSM ਮਾਡਮ ਦਾ ਸਿਮ PUK ਚਾਹੀਦਾ ਹੈ"
+
+#: ../cli/src/common.c:543
+msgid "GSM Modem's SIM wrong"
+msgstr "GSM ਮਾਡਮ ਦਾ ਗਲਤ ਸਿਮ (SIM)"
+
+#: ../cli/src/common.c:546
+msgid "InfiniBand device does not support connected mode"
+msgstr "ਇੰਫੀਬੀਮ ਜੰਤਰ ਕੁਨੈਕਟ ਕੀਤੇ ਮੋਡ ਵਿੱਚ ਸਹਾਇਕ ਨਹੀਂ ਹੈ"
+
+#: ../cli/src/common.c:549
+#| msgid "connection failed"
+msgid "A dependency of the connection failed"
+msgstr "ਕੁਨੈਕਸ਼ਨ ਦੀ ਨਿਰਭਰਤਾ ਫੇਲ੍ਹ ਹੋਇਆ"
+
+#: ../cli/src/common.c:552
+msgid "A problem with the RFC 2684 Ethernet over ADSL bridge"
+msgstr "ADSL ਬਰਿੱਜ਼ ਉੱਤੇ RFC 2684 ਈਥਰਨੈੱਟ ਨਾਲ ਸਮੱਸਿਆ ਆਈ ਹੈ"
+
+#: ../cli/src/common.c:555
+msgid "ModemManager is unavailable"
+msgstr "ਮਾਡਮਮੈਨੇਜਰ ਉਪਲੱਬਧ ਨਹੀਂ ਹੈ"
+
+#: ../cli/src/common.c:558
+#| msgid "'dhclient' could be found."
+msgid "The Wi-Fi network could not be found"
+msgstr "ਵਾਈ-ਫਾਈ ਨੈੱਟਵਰਕ ਲੱਭਿਆ ਨਹੀਂ ਜਾ ਸਕਿਆ"
+
+#: ../cli/src/common.c:561
+msgid "A secondary connection of the base connection failed"
+msgstr "ਬੇਸ ਕੁਨੈਕਸ਼ਨ ਦਾ ਸੈਕੰਡਰੀ ਕੁਨੈਕਸ਼ਨ ਫੇਲ੍ਹ ਹੋਇਆ ਹੈ"
+
+#: ../cli/src/common.c:564 ../cli/src/devices.c:274 ../cli/src/devices.c:290
+#: ../cli/src/devices.c:410 ../cli/src/devices.c:454
+msgid "Unknown"
+msgstr "ਅਣਜਾਣ"
+
+#. 0
+#. used only for 'GENERAL' group listing
+#: ../cli/src/connections.c:59 ../cli/src/connections.c:129
+#: ../cli/src/devices.c:105 ../cli/src/devices.c:129 ../cli/src/devices.c:139
+#: ../cli/src/devices.c:149 ../cli/src/devices.c:163 ../cli/src/devices.c:177
+#: ../cli/src/devices.c:199
 msgid "NAME"
 msgstr "NAME"
 
 #. 0
-#: ../cli/src/connections.c:61 ../cli/src/connections.c:76
+#. 1
+#: ../cli/src/connections.c:60 ../cli/src/connections.c:130
 msgid "UUID"
 msgstr "UUID"
 
 #. 1
-#: ../cli/src/connections.c:62
-msgid "DEVICES"
-msgstr "DEVICES"
+#. 0
+#. 1
+#. 2
+#: ../cli/src/connections.c:61 ../cli/src/connections.c:163
+#: ../cli/src/devices.c:71 ../cli/src/devices.c:107 ../cli/src/devices.c:202
+msgid "TYPE"
+msgstr "TYPE"
 
 #. 2
-#: ../cli/src/connections.c:63 ../cli/src/connections.c:78
-msgid "SCOPE"
-msgstr "SCOPE"
+#: ../cli/src/connections.c:62
+msgid "TIMESTAMP"
+msgstr "TIMESTAMP"
 
 #. 3
-#: ../cli/src/connections.c:64
-msgid "DEFAULT"
-msgstr "DEFAULT"
+#: ../cli/src/connections.c:63
+msgid "TIMESTAMP-REAL"
+msgstr "TIMESTAMP-REAL"
 
 #. 4
+#. 13
+#: ../cli/src/connections.c:64 ../cli/src/devices.c:119
+msgid "AUTOCONNECT"
+msgstr "AUTOCONNECT"
+
+#. 5
 #: ../cli/src/connections.c:65
-msgid "DBUS-SERVICE"
-msgstr "DBUS-SERVICE"
+msgid "READONLY"
+msgstr "READONLY"
 
+#. 6
+#. 8
+#. 2
+#. 11
 #. 5
-#: ../cli/src/connections.c:66
+#: ../cli/src/connections.c:66 ../cli/src/connections.c:137
+#: ../cli/src/devices.c:73 ../cli/src/devices.c:189 ../cli/src/devices.c:205
+msgid "DBUS-PATH"
+msgstr "ਡੀਬੱਸ-ਪਾਥ"
+
+#. 2
+#: ../cli/src/connections.c:131
+msgid "DEVICES"
+msgstr "ਜੰਤਰ"
+
+#. 3
+#. 1
+#. 8
+#. 1
+#: ../cli/src/connections.c:132 ../cli/src/devices.c:72
+#: ../cli/src/devices.c:114 ../cli/src/network-manager.c:39
+msgid "STATE"
+msgstr "ਹਾਲਤ"
+
+#. 4
+#: ../cli/src/connections.c:133
+msgid "DEFAULT"
+msgstr "DEFAULT"
+
+#. 5
+#: ../cli/src/connections.c:134
+#| msgid "DEFAULT"
+msgid "DEFAULT6"
+msgstr "DEFAULT6"
+
+#. 6
+#: ../cli/src/connections.c:135
 msgid "SPEC-OBJECT"
 msgstr "SPEC-OBJECT"
 
-#. 6
-#: ../cli/src/connections.c:67
+#. 7
+#. 1
+#: ../cli/src/connections.c:136 ../cli/src/connections.c:150
 msgid "VPN"
 msgstr "VPN"
 
-#. 1
+#. 9
+#: ../cli/src/connections.c:138
+msgid "CON-PATH"
+msgstr "ਕੁਨ-ਪਾਥ"
+
+#. 10
+#: ../cli/src/connections.c:139
+msgid "ZONE"
+msgstr "ਜ਼ੋਨ"
+
+#. 11
+#: ../cli/src/connections.c:140
+msgid "MASTER-PATH"
+msgstr "ਮਾਸਟਰ-ਪਾਥ"
+
+#: ../cli/src/connections.c:148 ../cli/src/devices.c:82
+msgid "GENERAL"
+msgstr "ਆਮ"
+
 #. 0
+#: ../cli/src/connections.c:149
+#| msgid "TKIP"
+msgid "IP"
+msgstr "IP"
+
 #. 1
-#: ../cli/src/connections.c:77 ../cli/src/devices.c:62 ../cli/src/devices.c:90
-msgid "TYPE"
-msgstr "TYPE"
+#: ../cli/src/connections.c:164
+#| msgid "NAME"
+msgid "USERNAME"
+msgstr "ਯੂਜ਼ਰ-ਨਾਂ"
+
+#. 2
+#: ../cli/src/connections.c:165
+msgid "GATEWAY"
+msgstr "ਗੇਟਵੇ"
 
 #. 3
-#: ../cli/src/connections.c:79
-msgid "TIMESTAMP"
-msgstr "TIMESTAMP"
+#: ../cli/src/connections.c:166
+msgid "BANNER"
+msgstr "ਬੈਨਰ"
 
 #. 4
-#: ../cli/src/connections.c:80
-msgid "TIMESTAMP-REAL"
-msgstr "TIMESTAMP-REAL"
+#: ../cli/src/connections.c:167
+#| msgid "STATE"
+msgid "VPN-STATE"
+msgstr "VPN-ਹਾਲਤ"
 
 #. 5
-#: ../cli/src/connections.c:81
-msgid "AUTOCONNECT"
-msgstr "AUTOCONNECT"
+#: ../cli/src/connections.c:168
+msgid "CFG"
+msgstr "CFG"
 
-#. 6
-#: ../cli/src/connections.c:82
-msgid "READONLY"
-msgstr "READONLY"
-
-#: ../cli/src/connections.c:158
+#: ../cli/src/connections.c:190
 #, c-format
+#| msgid ""
+#| "Usage: nmcli con { COMMAND | help }\n"
+#| "  COMMAND := { list | status | up | down }\n"
+#| "\n"
+#| "  list [id  | uuid  | system | user]\n"
+#| "  status\n"
+#| "  up id  | uuid  [iface ] [ap ] [--nowait] [--"
+#| "timeout ]\n"
+#| "  down id  | uuid \n"
 msgid ""
 "Usage: nmcli con { COMMAND | help }\n"
-"  COMMAND := { list | status | up | down }\n"
+"  COMMAND := { list | status | up | down | delete }\n"
 "\n"
-"  list [id  | uuid  | system | user]\n"
-"  status\n"
-"  up id  | uuid  [iface ] [ap ] [--nowait] [--timeout "
+"  list [id  | uuid ]\n"
+"  status [id  | uuid  | path ]\n"
+"  up id  | uuid  [iface ] [ap ] [nsp ] [--"
+"nowait] [--timeout ]\n"
+"  up id  | uuid  [iface ] [ap ] [--nowait] [--timeout "
 "]\n"
 "  down id  | uuid \n"
+"  delete id  | uuid \n"
 msgstr ""
 "ਵਰਤੋਂ: nmcli con { COMMAND | help }\n"
-"  COMMAND := { list | status | up | down }\n"
+"  COMMAND := { list | status | up | down | delete }\n"
 "\n"
-"  list [id  | uuid  | system | user]\n"
-"  status\n"
-"  up id  | uuid  [iface ] [ap ] [--nowait] [--timeout "
+"  list [id  | uuid ]\n"
+"  status [id  | uuid  | path ]\n"
+"  up id  | uuid  [iface ] [ap ] [nsp ] [--"
+"nowait] [--timeout ]\n"
+"  up id  | uuid  [iface ] [ap ] [--nowait] [--timeout "
 "]\n"
 "  down id  | uuid \n"
+"  delete id  | uuid \n"
 
-#: ../cli/src/connections.c:198 ../cli/src/connections.c:537
+#: ../cli/src/connections.c:249 ../cli/src/connections.c:609
 #, c-format
 msgid "Error: 'con list': %s"
 msgstr "Error: 'con list': %s"
 
-#: ../cli/src/connections.c:200 ../cli/src/connections.c:539
+#: ../cli/src/connections.c:251 ../cli/src/connections.c:611
 #, c-format
 msgid "Error: 'con list': %s; allowed fields: %s"
 msgstr "Error: 'con list': %s; allowed fields: %s"
 
-#: ../cli/src/connections.c:208
+#: ../cli/src/connections.c:259
 msgid "Connection details"
 msgstr "ਕੁਨੈਕਸ਼ਨ ਵੇਰਵਾ"
 
-#: ../cli/src/connections.c:382 ../cli/src/connections.c:602
-msgid "system"
-msgstr "ਸਿਸਟਮ"
-
-#: ../cli/src/connections.c:382 ../cli/src/connections.c:602
-msgid "user"
-msgstr "ਯੂਜ਼ਰ"
-
-#: ../cli/src/connections.c:384
+#: ../cli/src/connections.c:484
 msgid "never"
 msgstr "ਕਦੇ ਨਹੀਂ"
 
 #. "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:485 ../cli/src/connections.c:486
+#: ../cli/src/connections.c:714 ../cli/src/connections.c:715
+#: ../cli/src/connections.c:717 ../cli/src/devices.c:418
+#: ../cli/src/devices.c:471 ../cli/src/devices.c:587 ../cli/src/devices.c:588
+#: ../cli/src/devices.c:589 ../cli/src/devices.c:621 ../cli/src/devices.c:647
+#: ../cli/src/devices.c:648 ../cli/src/devices.c:649 ../cli/src/devices.c:650
+#: ../cli/src/devices.c:651 ../cli/src/network-manager.c:267
+#: ../cli/src/settings.c:712 ../cli/src/settings.c:787
+#: ../cli/src/settings.c:907 ../cli/src/settings.c:1189
+#: ../cli/src/settings.c:1190 ../cli/src/settings.c:1192
+#: ../cli/src/settings.c:1194 ../cli/src/settings.c:1195
+#: ../cli/src/settings.c:1326 ../cli/src/settings.c:1327
+#: ../cli/src/settings.c:1328 ../cli/src/settings.c:1329
+#: ../cli/src/settings.c:1406 ../cli/src/settings.c:1407
+#: ../cli/src/settings.c:1408 ../cli/src/settings.c:1409
+#: ../cli/src/settings.c:1410 ../cli/src/settings.c:1411
+#: ../cli/src/settings.c:1412 ../cli/src/settings.c:1413
+#: ../cli/src/settings.c:1414 ../cli/src/settings.c:1415
+#: ../cli/src/settings.c:1416 ../cli/src/settings.c:1417
+#: ../cli/src/settings.c:1418 ../cli/src/settings.c:1489
 msgid "yes"
 msgstr "ਹਾਂ"
 
-#: ../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:485 ../cli/src/connections.c:486
+#: ../cli/src/connections.c:714 ../cli/src/connections.c:715
+#: ../cli/src/connections.c:717 ../cli/src/devices.c:418
+#: ../cli/src/devices.c:471 ../cli/src/devices.c:587 ../cli/src/devices.c:588
+#: ../cli/src/devices.c:589 ../cli/src/devices.c:621 ../cli/src/devices.c:647
+#: ../cli/src/devices.c:648 ../cli/src/devices.c:649 ../cli/src/devices.c:650
+#: ../cli/src/devices.c:651 ../cli/src/network-manager.c:269
+#: ../cli/src/settings.c:712 ../cli/src/settings.c:714
+#: ../cli/src/settings.c:787 ../cli/src/settings.c:907
+#: ../cli/src/settings.c:1189 ../cli/src/settings.c:1190
+#: ../cli/src/settings.c:1192 ../cli/src/settings.c:1194
+#: ../cli/src/settings.c:1195 ../cli/src/settings.c:1326
+#: ../cli/src/settings.c:1327 ../cli/src/settings.c:1328
+#: ../cli/src/settings.c:1329 ../cli/src/settings.c:1406
+#: ../cli/src/settings.c:1407 ../cli/src/settings.c:1408
+#: ../cli/src/settings.c:1409 ../cli/src/settings.c:1410
+#: ../cli/src/settings.c:1411 ../cli/src/settings.c:1412
+#: ../cli/src/settings.c:1413 ../cli/src/settings.c:1414
+#: ../cli/src/settings.c:1415 ../cli/src/settings.c:1416
+#: ../cli/src/settings.c:1417 ../cli/src/settings.c:1418
+#: ../cli/src/settings.c:1489
 msgid "no"
 msgstr "ਨਹੀਂ"
 
-#: ../cli/src/connections.c:458 ../cli/src/connections.c:501
-msgid "System connections"
-msgstr "ਸਿਸਟਮ ਕੁਨੈਕਸ਼ਨ"
-
-#: ../cli/src/connections.c:463 ../cli/src/connections.c:514
-msgid "User connections"
-msgstr "ਯੂਜ਼ਰ ਕੁਨੈਕਸ਼ਨ"
-
-#: ../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:560
+#| msgid "Connection details"
+msgid "Connection list"
+msgstr "ਕੁਨੈਕਸ਼ਨ ਲਿਸਟ"
+
+#: ../cli/src/connections.c:573 ../cli/src/connections.c:1110
+#: ../cli/src/connections.c:1648 ../cli/src/connections.c:1663
+#: ../cli/src/connections.c:1672 ../cli/src/connections.c:1682
+#: ../cli/src/connections.c:1694 ../cli/src/connections.c:1802
+#: ../cli/src/connections.c:1904 ../cli/src/devices.c:1041
+#: ../cli/src/devices.c:1051 ../cli/src/devices.c:1169
+#: ../cli/src/devices.c:1177 ../cli/src/devices.c:1541
+#: ../cli/src/devices.c:1548 ../cli/src/devices.c:1562
+#: ../cli/src/devices.c:1569 ../cli/src/devices.c:1586
+#: ../cli/src/devices.c:1597 ../cli/src/devices.c:1818
+#: ../cli/src/devices.c:1825
 #, c-format
 msgid "Error: %s argument is missing."
 msgstr "ਗਲਤੀ: %s ਆਰਗੂਮੈਂਟ ਮੌਜੂਦ ਨਹੀਂ ਹੈ।"
 
-#: ../cli/src/connections.c:488
+#: ../cli/src/connections.c:586
 #, c-format
 msgid "Error: %s - no such connection."
 msgstr "ਗਲਤੀ: %s - ਇੰਝ ਦਾ ਕੋਈ ਕੁਨੈਕਸ਼ਨ ਨਹੀਂ ਹੈ"
 
-#: ../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:592 ../cli/src/connections.c:1707
+#: ../cli/src/connections.c:1819 ../cli/src/connections.c:1911
+#: ../cli/src/devices.c:825 ../cli/src/devices.c:905 ../cli/src/devices.c:1065
+#: ../cli/src/devices.c:1183 ../cli/src/devices.c:1610
+#: ../cli/src/devices.c:1831
 #, c-format
 msgid "Unknown parameter: %s\n"
 msgstr "ਅਣਜਾਣ ਪੈਰਾਮੀਟਰ: %s\n"
 
-#: ../cli/src/connections.c:529
+#: ../cli/src/connections.c:601
 #, c-format
 msgid "Error: no valid parameter specified."
 msgstr "ਗਲਤੀ: ਕੋਈ ਢੁੱਕਵਾਂ ਪੈਰਾਮੀਟਰ ਨਹੀਂ ਦਿੱਤਾ।"
 
-#: ../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:616 ../cli/src/connections.c:2004
+#: ../cli/src/devices.c:2039 ../cli/src/network-manager.c:596
 #, c-format
 msgid "Error: %s."
 msgstr "ਗਲਤੀ: %s"
 
-#: ../cli/src/connections.c:650
-#, c-format
-msgid "Error: 'con status': %s"
-msgstr "ਗਲਤੀ: 'con status': %s"
-
-#: ../cli/src/connections.c:652
-#, c-format
-msgid "Error: 'con status': %s; allowed fields: %s"
-msgstr "ਗਲਤੀ: 'con status': %s; allowed fields: %s"
-
-#: ../cli/src/connections.c:659
-msgid "Active connections"
-msgstr "ਚਾਲੂ ਕੁਨੈਕਸ਼ਨ"
-
-#: ../cli/src/connections.c:1027
-#, c-format
-msgid "no active connection on device '%s'"
-msgstr "ਜੰਤਰ '%s' ਉੱਤੇ ਕੋਈ ਚਾਲੂ ਕੁਨੈਕਸ਼ਨ ਨਹੀਂ ਹੈ"
-
-#: ../cli/src/connections.c:1035
-#, c-format
-msgid "no active connection or device"
-msgstr "ਕੋਈ ਚਾਲੂ ਕੁਨੈਕਸ਼ਨ ਜਾਂ ਜੰਤਰ ਨਹੀਂ ਹੈ"
-
-#: ../cli/src/connections.c:1085
-#, c-format
-msgid "device '%s' not compatible with connection '%s'"
-msgstr "ਜੰਤਰ '%s' ਕੁਨੈਕਸ਼ਨ '%s' ਨਾਲ ਅਨੁਕੂਲ ਨਹੀਂ ਹੈ"
-
-#: ../cli/src/connections.c:1087
-#, c-format
-msgid "no device found for connection '%s'"
-msgstr "ਕੁਨੈਕਸ਼ਨ '%s' ਲਈ ਕੋਈ ਜੰਤਰ ਨਹੀਂ ਲੱਭਿਆ"
-
-#: ../cli/src/connections.c:1098
+#: ../cli/src/connections.c:629
 msgid "activating"
 msgstr "ਚਾਲੂ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ"
 
-#: ../cli/src/connections.c:1100
+#: ../cli/src/connections.c:631
 msgid "activated"
 msgstr "ਚਾਲੂ ਕੀਤਾ"
 
-#: ../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
-msgid "unknown"
-msgstr "ਅਣਜਾਣ"
-
-#: ../cli/src/connections.c:1112
+#: ../cli/src/connections.c:645
 msgid "VPN connecting (prepare)"
 msgstr "VPN ਕੁਨੈਕਸ਼ਨ (ਤਿਆਰੀ)"
 
-#: ../cli/src/connections.c:1114
+#: ../cli/src/connections.c:647
 msgid "VPN connecting (need authentication)"
 msgstr "VPN ਕੁਨੈਕਟ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ (ਪਰਮਾਣਕਿਤਾ ਦੀ ਲੋੜ ਹੈ)"
 
-#: ../cli/src/connections.c:1116
+#: ../cli/src/connections.c:649
 msgid "VPN connecting"
 msgstr "VPN ਕੁਨੈਕਟ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ"
 
-#: ../cli/src/connections.c:1118
+#: ../cli/src/connections.c:651
 msgid "VPN connecting (getting IP configuration)"
 msgstr "VPN ਕੁਨੈਕਟ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ (IP ਸੰਰਚਨਾ ਲਈ ਜਾ ਰਹੀ ਹੈ)"
 
-#: ../cli/src/connections.c:1120
+#: ../cli/src/connections.c:653
 msgid "VPN connected"
 msgstr "VPN ਕੁਨੈਕਟ ਹੈ"
 
-#: ../cli/src/connections.c:1122
+#: ../cli/src/connections.c:655
 msgid "VPN connection failed"
 msgstr "VPN ਕੁਨੈਕਸ਼ਨ ਫੇਲ੍ਹ ਹੋਇਆ"
 
-#: ../cli/src/connections.c:1124
+#: ../cli/src/connections.c:657
 msgid "VPN disconnected"
 msgstr "VPN ਡਿਸ-ਕੁਨੈਕਟ"
 
-#: ../cli/src/connections.c:1135
+#: ../cli/src/connections.c:710 ../cli/src/connections.c:720
+msgid "N/A"
+msgstr "ਨਾ ਉਪਲੱਬਧ"
+
+#: ../cli/src/connections.c:914 ../cli/src/connections.c:1138
+#, c-format
+msgid "Error: 'con status': %s"
+msgstr "ਗਲਤੀ: 'con status': %s"
+
+#: ../cli/src/connections.c:916 ../cli/src/connections.c:1140
+#, c-format
+msgid "Error: 'con status': %s; allowed fields: %s"
+msgstr "ਗਲਤੀ: 'con status': %s; allowed fields: %s"
+
+#: ../cli/src/connections.c:924
+#| msgid "Active connections"
+msgid "Active connection details"
+msgstr "ਸਰਗਰਮ ਕੁਨੈਕਸ਼ਨ ਵੇਰਵਾ"
+
+#: ../cli/src/connections.c:1060 ../cli/src/connections.c:1722
+#: ../cli/src/connections.c:1834 ../cli/src/connections.c:1925
+#: ../cli/src/devices.c:852 ../cli/src/devices.c:914 ../cli/src/devices.c:1080
+#: ../cli/src/devices.c:1213 ../cli/src/devices.c:1632
+#: ../cli/src/devices.c:1860 ../cli/src/network-manager.c:311
+#, c-format
+#| msgid "Error: Could not connect to NetworkManager."
+msgid "Error: Can't find out if NetworkManager is running: %s."
+msgstr "ਗਲਤੀ: ਲੱਭਿਆ ਨਹੀਂ ਜਾ ਸਕਦਾ ਹੈ, ਜੇ ਨੈੱਟਵਰਕਮੈਨੇਜਰ ਚੱਲਦਾ ਹੈ: %s।"
+
+#: ../cli/src/connections.c:1064 ../cli/src/connections.c:1726
+#: ../cli/src/connections.c:1838 ../cli/src/connections.c:1929
+#: ../cli/src/devices.c:856 ../cli/src/devices.c:918 ../cli/src/devices.c:1084
+#: ../cli/src/devices.c:1217 ../cli/src/devices.c:1636
+#: ../cli/src/devices.c:1864 ../cli/src/network-manager.c:315
+#, c-format
+#| msgid "NetworkManager status"
+msgid "Error: NetworkManager is not running."
+msgstr "ਗਲਤੀ: ਨੈੱਟਵਰਕਮੈਨੇਜਰ ਚੱਲ ਨਹੀਂ ਰਿਹਾ ਹੈ।"
+
+#: ../cli/src/connections.c:1096
+msgid "Active connections"
+msgstr "ਚਾਲੂ ਕੁਨੈਕਸ਼ਨ"
+
+#: ../cli/src/connections.c:1121
+#, c-format
+#| msgid "Error: %s - no such connection."
+msgid "Error: '%s' is not an active connection."
+msgstr "ਗਲਤੀ: '%s' ਸਰਗਰਮ ਕੁਨੈਕਸ਼ਨ ਨਹੀਂ ਹੈ।"
+
+#: ../cli/src/connections.c:1126
+#, c-format
+#| msgid "Unknown parameter: %s\n"
+msgid "Error: unknown parameter: %s"
+msgstr "ਗਲਤੀ: ਅਣਜਾਣ ਪੈਰਾਮੀਟਰ: %s"
+
+#: ../cli/src/connections.c:1233
+#, c-format
+msgid "no active connection on device '%s'"
+msgstr "ਜੰਤਰ '%s' ਉੱਤੇ ਕੋਈ ਚਾਲੂ ਕੁਨੈਕਸ਼ਨ ਨਹੀਂ ਹੈ"
+
+#: ../cli/src/connections.c:1241
+msgid "no active connection or device"
+msgstr "ਕੋਈ ਚਾਲੂ ਕੁਨੈਕਸ਼ਨ ਜਾਂ ਜੰਤਰ ਨਹੀਂ ਹੈ"
+
+#: ../cli/src/connections.c:1312
+#, c-format
+msgid "device '%s' not compatible with connection '%s'"
+msgstr "ਜੰਤਰ '%s' ਕੁਨੈਕਸ਼ਨ '%s' ਨਾਲ ਅਨੁਕੂਲ ਨਹੀਂ ਹੈ"
+
+#: ../cli/src/connections.c:1315
+#, c-format
+msgid "no device found for connection '%s'"
+msgstr "ਕੁਨੈਕਸ਼ਨ '%s' ਲਈ ਕੋਈ ਜੰਤਰ ਨਹੀਂ ਲੱਭਿਆ"
+
+#: ../cli/src/connections.c:1327
 msgid "unknown reason"
 msgstr "ਅਣਜਾਣ ਕਾਰਨ"
 
-#: ../cli/src/connections.c:1137
+#: ../cli/src/connections.c:1329
 msgid "none"
 msgstr "ਕੋਈ ਨਹੀਂ"
 
-#: ../cli/src/connections.c:1139
+#: ../cli/src/connections.c:1331
 msgid "the user was disconnected"
 msgstr "ਯੂਜ਼ਰ ਡਿਸ-ਕੁਨੈਕਟ ਹੋ ਗਿਆ"
 
-#: ../cli/src/connections.c:1141
+#: ../cli/src/connections.c:1333
 msgid "the base network connection was interrupted"
 msgstr "ਬੇਸ ਨੈੱਟਵਰਕ ਕੁਨੈਕਸ਼ਨ 'ਚ ਰੁਕਾਵਟ"
 
-#: ../cli/src/connections.c:1143
+#: ../cli/src/connections.c:1335
 msgid "the VPN service stopped unexpectedly"
 msgstr "VPN ਸਰਵਿਸ ਅਚਾਨਕ ਰੁਕ ਗਈ"
 
-#: ../cli/src/connections.c:1145
+#: ../cli/src/connections.c:1337
 msgid "the VPN service returned invalid configuration"
 msgstr "VPN ਸਰਵਿਸ ਨੇ ਅਢੁੱਕਵੀਂ ਸੰਰਚਨਾ ਵਾਪਸ ਕੀਤੀ"
 
-#: ../cli/src/connections.c:1147
+#: ../cli/src/connections.c:1339
 msgid "the connection attempt timed out"
 msgstr "ਕੁਨੈਕਸ਼ਨ ਕੋਸ਼ਿਸ਼ ਦੌਰਾਨ ਸਮਾਂ ਸਮਾਪਤ ਹੋ ਗਿਆ"
 
-#: ../cli/src/connections.c:1149
+#: ../cli/src/connections.c:1341
 msgid "the VPN service did not start in time"
 msgstr "VPN ਸਰਵਿਸ ਸਮੇਂ 'ਚ ਸ਼ੁਰੂ ਨਹੀਂ ਹੋਈ"
 
-#: ../cli/src/connections.c:1151
+#: ../cli/src/connections.c:1343
 msgid "the VPN service failed to start"
 msgstr "VPN ਸਰਵਿਸ ਸ਼ੁਰੂ ਹੋਣ ਲਈ ਫੇਲ੍ਹ ਹੋਈ"
 
-#: ../cli/src/connections.c:1153
+#: ../cli/src/connections.c:1345
 msgid "no valid VPN secrets"
 msgstr "ਕੋਈ ਢੁੱਕਵਾਂ VPN ਭੇਦ  ਨਹੀਂ"
 
-#: ../cli/src/connections.c:1155
+#: ../cli/src/connections.c:1347
 msgid "invalid VPN secrets"
 msgstr "ਅਢੁੱਕਵਾਂ VPN ਭੇਦ"
 
-#: ../cli/src/connections.c:1157
+#: ../cli/src/connections.c:1349
 msgid "the connection was removed"
 msgstr "ਕੁਨੈਕਸ਼ਨ ਹਟਾਇਆ ਗਿਆ"
 
-#: ../cli/src/connections.c:1171
+#: ../cli/src/connections.c:1366 ../cli/src/connections.c:1571
 #, c-format
-msgid "state: %s\n"
-msgstr "ਹਾਲਤ: %s\n"
+msgid "Connection successfully activated (D-Bus active path: %s)\n"
+msgstr "ਕੁਨੈਕਸ਼ਨ ਠੀਕ ਤਰ੍ਹਾਂ ਸਰਗਰਮ ਕੀਤਾ ਗਿਆ (ਡੀ-ਬੱਸ ਐਕਟਿਵ ਪਾਥ: %s)\n"
 
-#: ../cli/src/connections.c:1174 ../cli/src/connections.c:1200
-#, c-format
-msgid "Connection activated\n"
-msgstr "ਕੁਨੈਕਸ਼ਨ ਚਾਲੂ ਕੀਤਾ\n"
-
-#: ../cli/src/connections.c:1177
+#. Active connection failed and dissapeared, quit.
+#: ../cli/src/connections.c:1371 ../cli/src/connections.c:1472
 #, c-format
 msgid "Error: Connection activation failed."
 msgstr "ਗਲਤੀ: ਕੁਨੈਕਸ਼ਨ ਚਾਲੂ ਕਰਨ ਲਈ ਫੇਲ੍ਹ ਹੈ।"
 
-#: ../cli/src/connections.c:1196
+#: ../cli/src/connections.c:1396
 #, c-format
-msgid "state: %s (%d)\n"
-msgstr "ਹਾਲਤ: %s (%d)\n"
+msgid "VPN connection successfully activated (D-Bus active path: %s)\n"
+msgstr "VPN ਕੁਨੈਕਸ਼ਨ ਠੀਕ ਤਰ੍ਹਾਂ ਸਰਗਰਮ ਕੀਤਾ ਗਿਆ (ਡੀ-ਬੱਸ ਐਕਟਿਵ ਪਾਥ: %s)\n"
 
-#: ../cli/src/connections.c:1206
+#: ../cli/src/connections.c:1404
 #, c-format
 msgid "Error: Connection activation failed: %s."
 msgstr "ਗਲਤੀ: ਕੁਨੈਕਸ਼ਨ ਚਾਲੂ ਕਰਨ ਲਈ ਫੇਲ੍ਹ: %s।"
 
-#: ../cli/src/connections.c:1223 ../cli/src/devices.c:909
+#: ../cli/src/connections.c:1501 ../cli/src/devices.c:974
 #, c-format
 msgid "Error: Timeout %d sec expired."
 msgstr "ਗਲਤੀ: ਸਮਾਂ-ਸਮਾਪਤੀ %d ਸਕਿੰਟ ਖਤਮ ਹੋਏ।"
 
-#: ../cli/src/connections.c:1266
+#: ../cli/src/connections.c:1562
 #, c-format
 msgid "Error: Connection activation failed: %s"
 msgstr "ਗਲਤੀ: ਕੁਨੈਕਸ਼ਨ ਚਾਲੂ ਕਰਨ ਲਈ ਫੇਲ੍ਹ: %s"
 
-#: ../cli/src/connections.c:1280
-#, c-format
-msgid "Error: Obtaining active connection for '%s' failed."
-msgstr "ਗਲਤੀ: '%s' ਲਈ ਚਾਲੂ ਕੁਨੈਕਸ਼ਨ ਲੈਣ ਲਈ ਫੇਲ੍ਹ ਹੈ।"
-
-#: ../cli/src/connections.c:1289
-#, c-format
-msgid "Active connection state: %s\n"
-msgstr "ਚਾਲੂ ਕੁਨੈਕਸ਼ਨ ਹਾਲਤ: %s\n"
-
-#: ../cli/src/connections.c:1290
-#, c-format
-msgid "Active connection path: %s\n"
-msgstr "ਚਾਲੂ ਕੁਨੈਕਸ਼ਨ ਪਾਥ: %s\n"
-
-#: ../cli/src/connections.c:1344 ../cli/src/connections.c:1465
+#: ../cli/src/connections.c:1656 ../cli/src/connections.c:1810
+#: ../cli/src/connections.c:1938
 #, c-format
 msgid "Error: Unknown connection: %s."
 msgstr "ਗਲਤੀ: ਅਣਜਾਣ ਕੁਨੈਕਸ਼ਨ: %s।"
 
-#: ../cli/src/connections.c:1379 ../cli/src/devices.c:980
+#: ../cli/src/connections.c:1702 ../cli/src/devices.c:1059
+#: ../cli/src/devices.c:1605
 #, c-format
 msgid "Error: timeout value '%s' is not valid."
 msgstr "ਗਲਤੀ: ਸਮਾਂ-ਸਮਾਪਤੀ ਮੁੱਲ '%s' ਢੁੱਕਵਾਂ ਨਹੀਂ ਹੈ।"
 
-#: ../cli/src/connections.c:1392 ../cli/src/connections.c:1482
+#: ../cli/src/connections.c:1715 ../cli/src/connections.c:1827
+#: ../cli/src/connections.c:1918
 #, c-format
 msgid "Error: id or uuid has to be specified."
 msgstr "ਗਲਤੀ: id ਜਾਂ uuid ਨਹੀਂ ਦਿੱਤਾ।"
 
-#: ../cli/src/connections.c:1412
+#: ../cli/src/connections.c:1747
 #, c-format
 msgid "Error: No suitable device found: %s."
 msgstr "ਗਲਤੀ: ਕੋਈ ਢੁੱਕਵਾਂ ਜੰਤਰ ਨਹੀਂ ਲੱਭਿਆ: %s।"
 
-#: ../cli/src/connections.c:1414
+#: ../cli/src/connections.c:1749
 #, c-format
 msgid "Error: No suitable device found."
 msgstr "ਗਲਤੀ: ਕੋਈ ਢੁੱਕਵਾਂ ਜੰਤਰ ਨਹੀਂ ਮਿਲਿਆ।"
 
-#: ../cli/src/connections.c:1509
+#: ../cli/src/connections.c:1863
 #, c-format
 msgid "Warning: Connection not active\n"
 msgstr "ਚੇਤਾਵਨੀ: ਕੁਨੈਕਸ਼ਨ ਚਾਲੂ ਨਹੀਂ ਹੈ\n"
 
-#: ../cli/src/connections.c:1566
+#: ../cli/src/connections.c:1877
+#, c-format
+#| msgid "Error: Connection activation failed: %s"
+msgid "Error: Connection deletion failed: %s"
+msgstr "ਗਲਤੀ: ਕੁਨੈਕਸ਼ਨ ਹਟਾਉਣ ਲਈ ਫੇਲ੍ਹ: %s"
+
+#: ../cli/src/connections.c:1995
 #, c-format
 msgid "Error: 'con' command '%s' is not valid."
 msgstr "ਗਲਤੀ: 'con' ਕਮਾਂਡ '%s' ਢੁੱਕਵਾਂ ਨਹੀਂ।"
 
-#: ../cli/src/connections.c:1602
+#: ../cli/src/connections.c:2063
 #, c-format
 msgid "Error: could not connect to D-Bus."
 msgstr "ਗਲਤੀ: ਡੀ-ਬੱਸ ਨਾਲ ਕੁਨੈਕਟ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਿਆ।"
 
-#: ../cli/src/connections.c:1609
+#: ../cli/src/connections.c:2071
 #, c-format
 msgid "Error: Could not get system settings."
 msgstr "ਗਲਤੀ: ਸਿਸਟਮ ਸੈਟਿੰਗ ਨਹੀਂ ਲਈ ਜਾ ਸਕੀ।"
 
-#: ../cli/src/connections.c:1617
+#: ../cli/src/connections.c:2081
 #, c-format
-msgid "Error: Could not get user settings."
-msgstr "ਗਲਤੀ: ਯੂਜ਼ਰ ਸੈਟਿੰਗ ਨਹੀਂ ਲਈ ਜਾ ਸਕੀ।"
-
-#: ../cli/src/connections.c:1627
-#, 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 "ਗਲਤੀ: ਕੁਨੈਕਸ਼ਨ ਨਹੀਂ ਲਿਆ ਜਾ ਸਕਦਾ: ਸਿਸਟਮ ਸਰਵਿਸ ਨਹੀਂ ਚੱਲ ਰਹੀ ਹੈ।"
 
 #. 0
 #. 9
-#: ../cli/src/devices.c:61 ../cli/src/devices.c:89 ../cli/src/devices.c:184
+#. 3
+#: ../cli/src/devices.c:70 ../cli/src/devices.c:106 ../cli/src/devices.c:187
+#: ../cli/src/devices.c:203
 msgid "DEVICE"
 msgstr "ਜੰਤਰ"
 
-#. 1
-#. 4
 #. 0
-#: ../cli/src/devices.c:63 ../cli/src/devices.c:93
-#: ../cli/src/network-manager.c:36
-msgid "STATE"
-msgstr "ਹਾਲਤ"
-
-#: ../cli/src/devices.c:72
-msgid "GENERAL"
-msgstr "ਆਮ"
-
-#. 0
-#: ../cli/src/devices.c:73
+#: ../cli/src/devices.c:83
 msgid "CAPABILITIES"
 msgstr "ਸਮਰੱਥਾ"
 
 #. 1
-#: ../cli/src/devices.c:74
+#: ../cli/src/devices.c:84
 msgid "WIFI-PROPERTIES"
 msgstr "ਵਾਈਫਾਈ-ਵਿਸ਼ੇਸ਼ਤਾ"
 
 #. 2
-#: ../cli/src/devices.c:75
+#: ../cli/src/devices.c:85
 msgid "AP"
 msgstr "AP"
 
 #. 3
-#: ../cli/src/devices.c:76
+#: ../cli/src/devices.c:86
 msgid "WIRED-PROPERTIES"
 msgstr "ਤਾਰ-ਵਿਸ਼ੇਸ਼ਤਾ"
 
 #. 4
-#: ../cli/src/devices.c:77
-msgid "IP4-SETTINGS"
-msgstr "IP4-ਸੈਟਿੰਗ"
+#: ../cli/src/devices.c:87
+#| msgid "WIFI-PROPERTIES"
+msgid "WIMAX-PROPERTIES"
+msgstr "ਵਾਈਮੈਕਸ-ਵਿਸ਼ੇਸ਼ਤਾ"
 
 #. 5
-#: ../cli/src/devices.c:78
-msgid "IP4-DNS"
-msgstr "IP4-DNS"
+#. 0
+#: ../cli/src/devices.c:88 ../cli/src/devices.c:200
+#| msgid "DNS"
+msgid "NSP"
+msgstr "NSP"
 
 #. 6
-#: ../cli/src/devices.c:79
-msgid "IP6-SETTINGS"
-msgstr "IP6-ਸੈਟਿੰਗ"
+#: ../cli/src/devices.c:89
+#| msgid "IP4-DNS"
+msgid "IP4"
+msgstr "IP4"
 
 #. 7
-#: ../cli/src/devices.c:80
-msgid "IP6-DNS"
-msgstr "IP6-DNS"
+#: ../cli/src/devices.c:90
+msgid "DHCP4"
+msgstr "DHCP4"
 
-#. 2
+#. 8
 #: ../cli/src/devices.c:91
+#| msgid "IP6-DNS"
+msgid "IP6"
+msgstr "IP6"
+
+#. 9
+#: ../cli/src/devices.c:92
+msgid "DHCP6"
+msgstr "DHCP6"
+
+#. 2
+#: ../cli/src/devices.c:108
+msgid "VENDOR"
+msgstr "ਵੇਂਡਰ"
+
+#. 3
+#: ../cli/src/devices.c:109
+msgid "PRODUCT"
+msgstr "ਪਰੋਡੱਕਟ"
+
+#. 4
+#: ../cli/src/devices.c:110
 msgid "DRIVER"
 msgstr "ਡਰਾਇਵਰ"
 
-#. 3
-#: ../cli/src/devices.c:92
+#. 5
+#: ../cli/src/devices.c:111
+#| msgid "DRIVER"
+msgid "DRIVER-VERSION"
+msgstr "ਡਰਾਇਵਰ-ਵਰਜਨ"
+
+#. 6
+#: ../cli/src/devices.c:112
+msgid "FIRMWARE-VERSION"
+msgstr "ਫਿਰਮਵੇਅਰ ਵਰਜਨ"
+
+#. 7
+#: ../cli/src/devices.c:113
 msgid "HWADDR"
 msgstr "HWADDR"
 
+#. 9
+#: ../cli/src/devices.c:115
+msgid "REASON"
+msgstr "ਕਾਰਨ"
+
+#. 10
+#: ../cli/src/devices.c:116
+msgid "UDI"
+msgstr "UDI"
+
+#. 11
+#: ../cli/src/devices.c:117
+msgid "IP-IFACE"
+msgstr "IP-IFACE"
+
+#. 12
+#: ../cli/src/devices.c:118
+msgid "NM-MANAGED"
+msgstr "NM-MANAGED"
+
+#. 14
+#: ../cli/src/devices.c:120
+msgid "FIRMWARE-MISSING"
+msgstr "ਫਿਰਮਵੇਅਰ ਮੌਜੂਦ ਨਹੀਂ ਹੈ"
+
+#. 15
+#: ../cli/src/devices.c:121
+#| msgid "AUTOCONNECT"
+msgid "CONNECTION"
+msgstr "ਕੁਨੈਕਸ਼ਨ"
+
 #. 0
-#: ../cli/src/devices.c:102
+#: ../cli/src/devices.c:130
 msgid "CARRIER-DETECT"
 msgstr "ਕੈਰੀਅਰ-ਖੋਜ"
 
 #. 1
-#: ../cli/src/devices.c:103
+#: ../cli/src/devices.c:131
 msgid "SPEED"
 msgstr "ਸਪੀਡ"
 
 #. 0
-#: ../cli/src/devices.c:112
+#: ../cli/src/devices.c:140
 msgid "CARRIER"
 msgstr "ਕੈਰੀਅਰ"
 
 #. 0
-#: ../cli/src/devices.c:122
+#: ../cli/src/devices.c:150
 msgid "WEP"
 msgstr "WEP"
 
 #. 1
-#: ../cli/src/devices.c:123
+#: ../cli/src/devices.c:151
 msgid "WPA"
 msgstr "WPA"
 
 #. 2
-#: ../cli/src/devices.c:124
+#: ../cli/src/devices.c:152
 msgid "WPA2"
 msgstr "WPA2"
 
 #. 3
-#: ../cli/src/devices.c:125
+#: ../cli/src/devices.c:153
 msgid "TKIP"
 msgstr "TKIP"
 
 #. 4
-#: ../cli/src/devices.c:126
+#: ../cli/src/devices.c:154
 msgid "CCMP"
 msgstr "CCMP"
 
 #. 0
-#: ../cli/src/devices.c:135 ../cli/src/devices.c:146
-msgid "ADDRESS"
-msgstr "ਐਡਰੈੱਸ"
+#: ../cli/src/devices.c:164
+#| msgid "FREQ"
+msgid "CTR-FREQ"
+msgstr "CTR-FREQ"
 
 #. 1
-#: ../cli/src/devices.c:136 ../cli/src/devices.c:147
-msgid "PREFIX"
-msgstr "ਪ੍ਰੀ-ਫਿਕਸ"
+#: ../cli/src/devices.c:165
+msgid "RSSI"
+msgstr "RSSI"
 
 #. 2
-#: ../cli/src/devices.c:137 ../cli/src/devices.c:148
-msgid "GATEWAY"
-msgstr "ਗੇਟਵੇ"
+#: ../cli/src/devices.c:166
+msgid "CINR"
+msgstr "CINR"
 
-#. 0
-#: ../cli/src/devices.c:157 ../cli/src/devices.c:166
-msgid "DNS"
-msgstr "DNS"
+#. 3
+#: ../cli/src/devices.c:167
+msgid "TX-POW"
+msgstr "TX-POW"
+
+#. 4
+#: ../cli/src/devices.c:168
+msgid "BSID"
+msgstr "BSID"
 
 #. 0
-#: ../cli/src/devices.c:175
+#: ../cli/src/devices.c:178
 msgid "SSID"
 msgstr "SSID"
 
 #. 1
-#: ../cli/src/devices.c:176
+#: ../cli/src/devices.c:179
 msgid "BSSID"
 msgstr "BSSID"
 
 #. 2
-#: ../cli/src/devices.c:177
+#: ../cli/src/devices.c:180
 msgid "MODE"
 msgstr "ਮੋਡ"
 
 #. 3
-#: ../cli/src/devices.c:178
+#: ../cli/src/devices.c:181
 msgid "FREQ"
 msgstr "ਫਰੀਕਿਊਂਸੀ"
 
 #. 4
-#: ../cli/src/devices.c:179
+#: ../cli/src/devices.c:182
 msgid "RATE"
 msgstr "ਰੇਟ"
 
 #. 5
-#: ../cli/src/devices.c:180
+#. 1
+#: ../cli/src/devices.c:183 ../cli/src/devices.c:201
 msgid "SIGNAL"
 msgstr "ਸਿਗਨਲ"
 
 #. 6
-#: ../cli/src/devices.c:181
+#: ../cli/src/devices.c:184
 msgid "SECURITY"
 msgstr "ਸੁਰੱਖਿਆ"
 
 #. 7
-#: ../cli/src/devices.c:182
+#: ../cli/src/devices.c:185
 msgid "WPA-FLAGS"
 msgstr "WPA-FLAGS"
 
 #. 8
-#: ../cli/src/devices.c:183
+#: ../cli/src/devices.c:186
 msgid "RSN-FLAGS"
 msgstr "RSN-FLAGS"
 
 #. 10
-#: ../cli/src/devices.c:185
+#. 4
+#: ../cli/src/devices.c:188 ../cli/src/devices.c:204
 msgid "ACTIVE"
 msgstr "ਚਾਲੂ"
 
-#: ../cli/src/devices.c:208
+#: ../cli/src/devices.c:223
 #, c-format
+#| msgid ""
+#| "Usage: nmcli dev { COMMAND | help }\n"
+#| "\n"
+#| "  COMMAND := { status | list | disconnect | wifi }\n"
+#| "\n"
+#| "  status\n"
+#| "  list [iface ]\n"
+#| "  disconnect iface  [--nowait] [--timeout ]\n"
+#| "  wifi [list [iface ] [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 ]\n"
 "  disconnect iface  [--nowait] [--timeout ]\n"
-"  wifi [list [iface ] [hwaddr ]]\n"
+"  wifi [list [iface ] [bssid ]]\n"
+"  wifi connect <(B)SSID> [password ] [wep-key-type key|phrase] "
+"[iface ] [bssid ] [name ]\n"
+"               [--private] [--nowait] [--timeout ]\n"
+"  wimax [list [iface ] [nsp ]]\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 ]\n"
 "  disconnect iface  [--nowait] [--timeout ]\n"
-"  wifi [list [iface ] [hwaddr ]]\n"
+"  wifi [list [iface ] [bssid ]]\n"
+"  wifi connect <(B)SSID> [password ] [wep-key-type key|phrase] "
+"[iface ] [bssid ] [name ]\n"
+"               [--private] [--nowait] [--timeout ]\n"
+"  wimax [list [iface ] [nsp ]]\n"
 "\n"
 
-#: ../cli/src/devices.c:228
-msgid "unmanaged"
-msgstr "ਬਿਨ-ਪਰਬੰਧ"
-
-#: ../cli/src/devices.c:230
-msgid "unavailable"
-msgstr "ਨਾ-ਉਪਲੱਬਧ"
-
-#: ../cli/src/devices.c:232 ../cli/src/network-manager.c:91
-msgid "disconnected"
-msgstr "ਡਿਸ-ਕੁਨੈਕਟ ਕੀਤਾ"
-
-#: ../cli/src/devices.c:234
-msgid "connecting (prepare)"
-msgstr "ਕੁਨੈਕਟ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ (ਤਿਆਰੀ)"
-
-#: ../cli/src/devices.c:236
-msgid "connecting (configuring)"
-msgstr "ਕੁਨੈਕਟ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ (ਸੰਰਚਨਾ ਜਾਰੀ)"
-
-#: ../cli/src/devices.c:238
-msgid "connecting (need authentication)"
-msgstr "ਕੁਨੈਕਟ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ (ਪਰਮਾਣਕਿਤਾ ਦੀ ਲੋੜ)"
-
-#: ../cli/src/devices.c:240
-msgid "connecting (getting IP configuration)"
-msgstr "ਕੁਨੈਕਟ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ (IP ਸੰਰਚਨਾ ਲਈ ਜਾ ਰਹੀ ਹੈ)"
-
-#: ../cli/src/devices.c:242 ../cli/src/network-manager.c:89
-msgid "connected"
-msgstr "ਕੁਨੈਕਟ ਹੋਇਆ"
-
-#: ../cli/src/devices.c:244
-msgid "connection failed"
-msgstr "ਕੁਨੈਕਸ਼ਨ ਫੇਲ੍ਹ ਹੈ"
-
-#: ../cli/src/devices.c:267 ../cli/src/devices.c:424
-msgid "Unknown"
-msgstr "ਅਣਜਾਣ"
-
-#: ../cli/src/devices.c:299
+#: ../cli/src/devices.c:323
 msgid "(none)"
 msgstr "(ਕੋਈ ਨਹੀਂ)"
 
-#: ../cli/src/devices.c:324
-#, c-format
-msgid "%s: error converting IP4 address 0x%X"
-msgstr "%s: IP4 ਐਡਰੈੱਸ 0x%X ਬਦਲਣ ਦੌਰਾਨ ਗਲਤੀ"
-
-#: ../cli/src/devices.c:393
+#: ../cli/src/devices.c:379
 #, c-format
 msgid "%u MHz"
 msgstr "%u MHz"
 
-#: ../cli/src/devices.c:394
+#: ../cli/src/devices.c:380
 #, c-format
 msgid "%u MB/s"
 msgstr "%u MB/s"
 
-#: ../cli/src/devices.c:403
+#: ../cli/src/devices.c:389
 msgid "Encrypted: "
 msgstr "ਇੰਕ੍ਰਿਪਟ ਕੀਤਾ: "
 
-#: ../cli/src/devices.c:408
+#: ../cli/src/devices.c:394
 msgid "WEP "
 msgstr "WEP "
 
-#: ../cli/src/devices.c:410
+#: ../cli/src/devices.c:396
 msgid "WPA "
 msgstr "WPA "
 
-#: ../cli/src/devices.c:412
+#: ../cli/src/devices.c:398
 msgid "WPA2 "
 msgstr "WPA2 "
 
-#: ../cli/src/devices.c:415
+#: ../cli/src/devices.c:401
 msgid "Enterprise "
 msgstr "ਇੰਟਰਪ੍ਰਾਈਜ਼ "
 
-#: ../cli/src/devices.c:424
+#: ../cli/src/devices.c:410
 msgid "Ad-Hoc"
 msgstr "ਐਡ-ਹਾਕ"
 
-#: ../cli/src/devices.c:424
+#: ../cli/src/devices.c:410
 msgid "Infrastructure"
 msgstr "ਇੰਫਰਾਸਟੱਕਚਰ"
 
-#: ../cli/src/devices.c:486
+#: ../cli/src/devices.c:445
+msgid "Home"
+msgstr "ਘਰ"
+
+#: ../cli/src/devices.c:448
+msgid "Partner"
+msgstr "ਸਹਿਯੋਗੀ"
+
+#: ../cli/src/devices.c:451
+msgid "Roaming"
+msgstr "ਰੋਮਿੰਗ"
+
+#: ../cli/src/devices.c:523
 #, c-format
 msgid "Error: 'dev list': %s"
 msgstr "ਗਲਤੀ: 'dev list': %s"
 
-#: ../cli/src/devices.c:488
+#: ../cli/src/devices.c:525
 #, c-format
 msgid "Error: 'dev list': %s; allowed fields: %s"
 msgstr "ਗਲਤੀ: 'dev list': %s; ਮਨਜ਼ੂਰ ਖੇਤਰ: %s"
 
-#: ../cli/src/devices.c:497
+#: ../cli/src/devices.c:534
 msgid "Device details"
 msgstr "ਜੰਤਰ ਵੇਰਵਾ"
 
-#: ../cli/src/devices.c:527 ../cli/src/devices.c:925
+#: ../cli/src/devices.c:579 ../cli/src/devices.c:582 ../cli/src/devices.c:1000
+#: ../cli/src/utils.c:477
 msgid "(unknown)"
 msgstr "(ਅਣਜਾਣ)"
 
-#: ../cli/src/devices.c:528
-msgid "unknown)"
-msgstr "ਅਣਜਾਣ)"
+#: ../cli/src/devices.c:591
+#| msgid "connected"
+msgid "not connected"
+msgstr "ਕੁਨੈਕਟ ਨਹੀਂ ਹੈ"
 
-#: ../cli/src/devices.c:554
+#: ../cli/src/devices.c:618
 #, c-format
 msgid "%u Mb/s"
 msgstr "%u Mb/s"
 
 #. Print header
 #. "WIRED-PROPERTIES"
-#: ../cli/src/devices.c:627
+#: ../cli/src/devices.c:691
 msgid "on"
 msgstr "ਚਾਲੂ"
 
-#: ../cli/src/devices.c:627
+#: ../cli/src/devices.c:691
 msgid "off"
 msgstr "ਬੰਦ"
 
-#: ../cli/src/devices.c:808
+#: ../cli/src/devices.c:842
 #, c-format
 msgid "Error: 'dev status': %s"
 msgstr "ਗਲਤੀ: 'dev status': %s"
 
-#: ../cli/src/devices.c:810
+#: ../cli/src/devices.c:844
 #, c-format
 msgid "Error: 'dev status': %s; allowed fields: %s"
 msgstr "ਗਲਤੀ: 'dev status': %s; ਮਨਜ਼ੂਰ ਖੇਤਰ: %s"
 
-#: ../cli/src/devices.c:817
+#: ../cli/src/devices.c:867
 msgid "Status of devices"
 msgstr "ਜੰਤਰਾਂ ਦੀ ਹਾਲਤ"
 
-#: ../cli/src/devices.c:845
+#: ../cli/src/devices.c:898
 #, c-format
 msgid "Error: '%s' argument is missing."
 msgstr "ਗਲਤੀ: '%s' ਆਰਗੂਮੈਂਟ ਗੁੰਮ ਹੈ।"
 
-#: ../cli/src/devices.c:874 ../cli/src/devices.c:1013
-#: ../cli/src/devices.c:1136
+#: ../cli/src/devices.c:939 ../cli/src/devices.c:1104
+#: ../cli/src/devices.c:1245 ../cli/src/devices.c:1892
 #, c-format
 msgid "Error: Device '%s' not found."
 msgstr "ਗਲਤੀ: ਜੰਤਰ '%s' ਨਹੀਂ ਲੱਭਿਆ।"
 
-#: ../cli/src/devices.c:897
+#: ../cli/src/devices.c:962
 #, c-format
 msgid "Success: Device '%s' successfully disconnected."
 msgstr "ਸਫ਼ਲ: ਜੰਤਰ '%s' ਠੀਕ ਤਰ੍ਹਾਂ ਡਿਸ-ਕੁਨੈਕਟ ਹੋ ਗਿਆ।"
 
-#: ../cli/src/devices.c:922
+#: ../cli/src/devices.c:997
 #, c-format
 msgid "Error: Device '%s' (%s) disconnecting failed: %s"
 msgstr "ਗਲਤੀ: ਜੰਤਰ '%s' (%s) ਡਿਸ-ਕੁਨੈਕਸ਼ਨ ਫੇਲ੍ਹ: %s"
 
-#: ../cli/src/devices.c:930
+#: ../cli/src/devices.c:1010
 #, c-format
-msgid "Device state: %d (%s)\n"
-msgstr "ਜੰਤਰ ਹਾਲਤ: %d (%s)\n"
+#| msgid "Success: Device '%s' successfully disconnected."
+msgid "Device '%s' has been disconnected.\n"
+msgstr "ਜੰਤਰ '%s' ਡਿਸ-ਕੁਨੈਕਟ ਹੋ ਚੁੱਕਾ ਹੈ।\n"
 
-#: ../cli/src/devices.c:994
+#: ../cli/src/devices.c:1073
 #, c-format
 msgid "Error: iface has to be specified."
 msgstr "ਗਲਤੀ: iface ਦੇਣ ਲਈ ਫੇਲ੍ਹ ਹੈ।"
 
-#: ../cli/src/devices.c:1112
+#: ../cli/src/devices.c:1203
 #, c-format
 msgid "Error: 'dev wifi': %s"
 msgstr "ਗਲਤੀ: 'dev wifi': %s"
 
-#: ../cli/src/devices.c:1114
+#: ../cli/src/devices.c:1205
 #, c-format
 msgid "Error: 'dev wifi': %s; allowed fields: %s"
 msgstr "ਗਲਤੀ: 'dev wifi': %s; ਮਨਜ਼ੂਰ ਖੇਤਰ: %s"
 
-#: ../cli/src/devices.c:1121
+#: ../cli/src/devices.c:1228
 msgid "WiFi scan list"
 msgstr "ਵਾਈਫਾਈ ਸਕੈਨ ਲਿਸਟ"
 
-#: ../cli/src/devices.c:1156 ../cli/src/devices.c:1210
+#: ../cli/src/devices.c:1265 ../cli/src/devices.c:1319
 #, c-format
-msgid "Error: Access point with hwaddr '%s' not found."
-msgstr "ਗਲਤੀ: hwaddr '%s' ਵਾਲਾ ਅਸੈੱਸ ਪੁਆਇੰਟ ਨਹੀਂ ਲੱਭਿਆ।"
+#| msgid "Error: Access point with hwaddr '%s' not found."
+msgid "Error: Access point with bssid '%s' not found."
+msgstr "ਗਲਤੀ: bssid '%s' ਵਾਲਾ ਅਸੈੱਸ ਪੁਆਇੰਟ ਨਹੀਂ ਲੱਭਿਆ।"
 
-#: ../cli/src/devices.c:1173
+#: ../cli/src/devices.c:1282
 #, c-format
 msgid "Error: Device '%s' is not a WiFi device."
 msgstr "ਗਲਤੀ: ਜੰਤਰ '%s' ਵਾਈ-ਫਾਈ ਜੰਤਰ ਨਹੀਂ ਹੈ।"
 
-#: ../cli/src/devices.c:1237
+#: ../cli/src/devices.c:1350 ../cli/src/devices.c:1396
+#, c-format
+msgid "Connection with UUID '%s' created and activated on device '%s'\n"
+msgstr "UUID '%s' ਨਾਲ ਕੁਨੈਕਸ਼ਨ ਬਣਾਇਆ ਗਿਆ ਅਤੇ ਜੰਤਰ '%s' ਉੱਤੇ ਐਕਟੀਵੇਟ ਕੀਤਾ ਗਿਆ\n"
+
+#: ../cli/src/devices.c:1355
+#, c-format
+#| msgid "Error: Connection activation failed: %s."
+msgid "Error: Connection activation failed: (%d) %s."
+msgstr "ਗਲਤੀ: ਕੁਨੈਕਸ਼ਨ ਚਾਲੂ ਕਰਨ ਲਈ ਫੇਲ੍ਹ: (%d) %s।"
+
+#: ../cli/src/devices.c:1380
+#, c-format
+msgid "Error: Failed to add/activate new connection: (%d) %s"
+msgstr "ਗਲਤੀ: ਨਵਾਂ ਕੁਨੈਕਸ਼ਨ ਜੋੜਨ/ਸਰਗਰਮ ਕਰਨ ਲਈ ਫੇਲ੍ਹ: (%d) %s"
+
+#: ../cli/src/devices.c:1388
+#, c-format
+msgid "Error: Failed to add/activate new connection: Unknown error"
+msgstr "ਗਲਤੀ: ਨਵਾਂ ਕੁਨੈਕਸ਼ਨ ਜੋੜਨ/ਸਰਗਰਮ ਕਰਨ ਲਈ ਫੇਲ੍ਹ: ਅਣਜਾਣ ਗਲਤੀ"
+
+#: ../cli/src/devices.c:1532
+#, c-format
+#| msgid "Error: %s argument is missing."
+msgid "Error: SSID or BSSID are missing."
+msgstr "ਗਲਤੀ: SSID ਜਾਂ BSSID ਮੌਜੂਦ ਨਹੀਂ ਹੈ।"
+
+#: ../cli/src/devices.c:1555
+#, c-format
+#| msgid "Error: timeout value '%s' is not valid."
+msgid "Error: bssid argument value '%s' is not a valid BSSID."
+msgstr "ਗਲਤੀ: bssid ਆਰਗੂਮੈਂਟ '%s' ਢੁੱਕਵਾਂ BSSID ਨਹੀਂ ਹੈ।"
+
+#: ../cli/src/devices.c:1579
+#, c-format
+msgid ""
+"Error: wep-key-type argument value '%s' is invalid, use 'key' or 'phrase'."
+msgstr "ਗਲਤੀ: wep-key-type ਆਰਗੂਮੈਂਟ ਮੁੱਲ '%s' ਗਲਤ ਹੈ, 'key' ਜਾਂ 'phrase' ਵਰਤੋ।"
+
+#: ../cli/src/devices.c:1619
+#, c-format
+msgid "Error: BSSID to connect to (%s) differs from bssid argument (%s)."
+msgstr "ਗਲਤੀ: (%s) ਨਾਲ ਕੁਨੈਕਟ ਕਰਨ ਲਈ BSSID bssid ਆਰਗੂਮੈਂਟ (%s) ਤੋਂ ਵੱਖਰਾ ਹੈ।"
+
+#: ../cli/src/devices.c:1625
+#, c-format
+msgid "Error: Parameter '%s' is neither SSID nor BSSID."
+msgstr "ਗਲਤੀ: ਪੈਰਾਮੀਟਰ '%s' ਨਾ ਤਾਂ SSID ਹੈ ਨਾ BSSID।"
+
+#: ../cli/src/devices.c:1654
+#, c-format
+#| msgid "Error: Device '%s' is not a WiFi device."
+msgid "Error: Device '%s' is not a Wi-Fi device."
+msgstr "ਗਲਤੀ: ਜੰਤਰ '%s' ਵਾਈ-ਫਾਈ ਜੰਤਰ ਨਹੀਂ ਹੈ।"
+
+#: ../cli/src/devices.c:1656
+#, c-format
+#| msgid "Error: No suitable device found."
+msgid "Error: No Wi-Fi device found."
+msgstr "ਗਲਤੀ: ਕੋਈ ਵਾਈ-ਫਾਈ ਜੰਤਰ ਨਹੀਂ ਮਿਲਿਆ।"
+
+#: ../cli/src/devices.c:1674
+#, c-format
+#| msgid "Error: Access point with hwaddr '%s' not found."
+msgid "Error: No network with SSID '%s' found."
+msgstr "ਗਲਤੀ: SSID '%s' ਵਾਲਾ ਕੋਈ ਨੈੱਟਵਰਕ ਨਹੀਂ ਲੱਭਿਆ।"
+
+#: ../cli/src/devices.c:1676
+#, c-format
+#| msgid "Error: Access point with hwaddr '%s' not found."
+msgid "Error: No access point with BSSID '%s' found."
+msgstr "ਗਲਤੀ: BSSID '%s' ਵਾਲਾ ਕੋਈ ਅਸੈੱਸ ਪੁਆਇੰਟ ਨਹੀਂ ਲੱਭਿਆ।"
+
+#: ../cli/src/devices.c:1774
 #, c-format
 msgid "Error: 'dev wifi' command '%s' is not valid."
 msgstr "ਗਲਤੀ: 'dev wifi' ਕਮਾਂਡ '%s' ਢੁੱਕਵੀਂ ਨਹੀਂ ਹੈ।"
 
-#: ../cli/src/devices.c:1284
+#: ../cli/src/devices.c:1850
+#, c-format
+#| msgid "Error: 'dev wifi': %s"
+msgid "Error: 'dev wimax': %s"
+msgstr "ਗਲਤੀ: 'dev wimax': %s"
+
+#: ../cli/src/devices.c:1852
+#, 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:1875
+msgid "WiMAX NSP list"
+msgstr "WiMAX NSP ਸੂਚੀ"
+
+#: ../cli/src/devices.c:1912
+#, c-format
+#| msgid "Error: Device '%s' not found."
+msgid "Error: NSP with name '%s' not found."
+msgstr "ਗਲਤੀ: '%s' ਨਾਂ ਨਾਲ NSP ਨਹੀਂ ਲੱਭਿਆ।"
+
+#: ../cli/src/devices.c:1923
+#, c-format
+#| msgid "Error: Device '%s' is not a WiFi device."
+msgid "Error: Device '%s' is not a WiMAX device."
+msgstr "ਗਲਤੀ: ਜੰਤਰ '%s' ਵਾਈਮੈਕਸ ਜੰਤਰ ਨਹੀਂ ਹੈ।"
+
+#: ../cli/src/devices.c:1954
+#, c-format
+#| msgid "Error: Access point with hwaddr '%s' not found."
+msgid "Error: Access point with nsp '%s' not found."
+msgstr "ਗਲਤੀ: nsp '%s' ਵਾਲਾ ਅਸੈੱਸ ਪੁਆਇੰਟ ਨਹੀਂ ਲੱਭਿਆ।"
+
+#: ../cli/src/devices.c:1981
+#, 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:2031
 #, 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 "ਚੱਲ ਰਿਹਾ ਹੈ"
 
-#. 1
-#: ../cli/src/network-manager.c:37
+#. 0
+#: ../cli/src/network-manager.c:38
+msgid "VERSION"
+msgstr "ਵਰਜਨ"
+
+#. 2
+#: ../cli/src/network-manager.c:40
 msgid "NET-ENABLED"
 msgstr "NET-ENABLED"
 
-#. 2
-#: ../cli/src/network-manager.c:38
+#. 3
+#: ../cli/src/network-manager.c:41
 msgid "WIFI-HARDWARE"
 msgstr "ਵਾਈਫਾਈ ਹਾਰਡਵੇਅਰ"
 
-#. 3
-#: ../cli/src/network-manager.c:39
+#. 4
+#: ../cli/src/network-manager.c:42
 msgid "WIFI"
 msgstr "ਵਾਈਫਾਈ"
 
-#. 4
-#: ../cli/src/network-manager.c:40
+#. 5
+#: ../cli/src/network-manager.c:43
 msgid "WWAN-HARDWARE"
 msgstr "WWAN-ਹਾਰਡਵੇਅਰ"
 
-#. 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 "WIFI-HARDWARE"
+msgid "WIMAX-HARDWARE"
+msgstr "ਵਾਈਮੈਕਸ-ਹਾਰਡਵੇਅਰ"
+
+#. 8
+#: ../cli/src/network-manager.c:46
+msgid "WIMAX"
+msgstr "ਵਾਈਮੈਕਸ"
+
+#: ../cli/src/network-manager.c:62
+msgid "PERMISSION"
+msgstr "ਅਧਿਕਾਰ"
+
+#. 0
+#: ../cli/src/network-manager.c:63
+msgid "VALUE"
+msgstr "ਮੁੱਲ"
+
+#: ../cli/src/network-manager.c:77
 #, c-format
 #| msgid ""
 #| "Usage: nmcli nm { COMMAND | help }\n"
 #| "\n"
-#| "  COMMAND := { status | sleep | wakeup | wifi | wwan }\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"
 #| "\n"
 msgid ""
 "Usage: nmcli nm { COMMAND | help }\n"
 "\n"
-"  COMMAND := { status | enable | sleep | wifi | wwan }\n"
+"  COMMAND := { status | permissions | enable | sleep | wifi | wwan | "
+"wimax }\n"
+"\n"
+"  COMMAND := { status | permissions | enable | sleep | wifi | wwan }\n"
 "\n"
 "  status\n"
+"  permissions\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"
+"ਵਰਤੋ: nmcli nm { COMMAND | help }\n"
+"\n"
+"  COMMAND := { status | permissions | enable | sleep | wifi | wwan | "
+"wimax }\n"
 "\n"
-"  COMMAND := { status | enable | sleep | wifi | wwan }\n"
+"  COMMAND := { status | permissions | enable | sleep | wifi | wwan }\n"
 "\n"
 "  status\n"
+"  permissions\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:108
 msgid "asleep"
 msgstr "asleep"
 
-#: ../cli/src/network-manager.c:87
+#: ../cli/src/network-manager.c:110
 msgid "connecting"
 msgstr "ਕੁਨੈਕਟ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ"
 
-#: ../cli/src/network-manager.c:128
+#: ../cli/src/network-manager.c:112
+msgid "connected (local only)"
+msgstr "ਕੁਨੈਕਟ ਹੈ (ਕੇਵਲ ਲੋਕਲ ਹੀ)"
+
+#: ../cli/src/network-manager.c:114
+#| msgid "connected"
+msgid "connected (site only)"
+msgstr "ਕੁਨੈਕਟ ਹੈ (ਕੇਵਲ ਸਾਈਟ)"
+
+#: ../cli/src/network-manager.c:118
+#| msgid "connecting"
+msgid "disconnecting"
+msgstr "ਡਿਸ-ਕੁਨੈਕਟ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ"
+
+#: ../cli/src/network-manager.c:158
 #, c-format
 msgid "Error: 'nm status': %s"
 msgstr "ਗਲਤੀ: 'nm status': %s"
 
-#: ../cli/src/network-manager.c:130
+#: ../cli/src/network-manager.c:160
 #, c-format
 msgid "Error: 'nm status': %s; allowed fields: %s"
 msgstr "ਗਲਤੀ: 'nm status': %s; ਮਨਜ਼ੂਰ ਖੇਤਰ: %s"
 
-#: ../cli/src/network-manager.c:137
-msgid "NetworkManager status"
-msgstr "ਨੈੱਟਵਰਕਮੈਨੇਜਰ ਹਾਲਤ"
-
-#. 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:173 ../cli/src/network-manager.c:174
+#: ../cli/src/network-manager.c:175 ../cli/src/network-manager.c:176
+#: ../cli/src/network-manager.c:177 ../cli/src/network-manager.c:179
+#: ../cli/src/network-manager.c:180 ../cli/src/network-manager.c:429
+#: ../cli/src/network-manager.c:484 ../cli/src/network-manager.c:522
+#: ../cli/src/network-manager.c:561
 msgid "enabled"
 msgstr "ਚਾਲੂ ਹੈ"
 
-#: ../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:173 ../cli/src/network-manager.c:174
+#: ../cli/src/network-manager.c:175 ../cli/src/network-manager.c:176
+#: ../cli/src/network-manager.c:177 ../cli/src/network-manager.c:179
+#: ../cli/src/network-manager.c:180 ../cli/src/network-manager.c:429
+#: ../cli/src/network-manager.c:484 ../cli/src/network-manager.c:522
+#: ../cli/src/network-manager.c:561
 msgid "disabled"
 msgstr "ਬੰਦ ਹੈ"
 
-#: ../cli/src/network-manager.c:152
+#: ../cli/src/network-manager.c:193
+msgid "NetworkManager status"
+msgstr "ਨੈੱਟਵਰਕਮੈਨੇਜਰ ਹਾਲਤ"
+
+#. Print header
+#: ../cli/src/network-manager.c:196
 msgid "running"
 msgstr "ਚੱਲ ਰਿਹਾ ਹੈ"
 
-#: ../cli/src/network-manager.c:152
+#: ../cli/src/network-manager.c:196
 msgid "not running"
 msgstr "ਨਹੀਂ ਚੱਲ ਰਿਹਾ ਹੈ"
 
-#: ../cli/src/network-manager.c:175
+#: ../cli/src/network-manager.c:271
+msgid "auth"
+msgstr "ਪਰਮਾਣ"
+
+#: ../cli/src/network-manager.c:301
+#, c-format
+#| msgid "Error: 'nm status': %s"
+msgid "Error: 'nm permissions': %s"
+msgstr "ਗਲਤੀ: 'nm permissions': %s"
+
+#: ../cli/src/network-manager.c:303
+#, c-format
+#| msgid "Error: 'nm status': %s; allowed fields: %s"
+msgid "Error: 'nm permissions': %s; allowed fields: %s"
+msgstr "ਗਲਤੀ: 'nm permissions': %s; ਮਨਜ਼ੂਰਸ਼ੁਦਾ ਖੇਤਰ: %s"
+
+#: ../cli/src/network-manager.c:324
+#| msgid "NetworkManager status"
+msgid "NetworkManager permissions"
+msgstr "ਨੈੱਟਵਰਕਮੈਨੇਜਰ ਅਧਿਕਾਰ"
+
+#: ../cli/src/network-manager.c:350 ../cli/src/utils.c:457
 #, 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:186
+#: ../cli/src/network-manager.c:361
 #, c-format
-#| msgid "Error: could not connect to D-Bus."
 msgid "Error: Couldn't create D-Bus object proxy."
 msgstr "ਗਲਤੀ: ਡੀ-ਬੱਸ ਆਬਜੈਕਟ ਪਰਾਕਸੀ ਨਹੀਂ ਬਣਾਇਆ ਜਾ ਸਕਿਆ।"
 
-#: ../cli/src/network-manager.c:192
+#: ../cli/src/network-manager.c:367
 #, c-format
-#| msgid "Error: 'con list': %s"
 msgid "Error in sleep: %s"
 msgstr "ਸਲੀਪ 'ਚ ਗਲਤੀ: %s"
 
-#: ../cli/src/network-manager.c:237 ../cli/src/network-manager.c:286
-#: ../cli/src/network-manager.c:318
+#: ../cli/src/network-manager.c:416 ../cli/src/network-manager.c:471
+#: ../cli/src/network-manager.c:509 ../cli/src/network-manager.c:548
 #, c-format
 msgid "Error: '--fields' value '%s' is not valid here; allowed fields: %s"
 msgstr "ਗਲਤੀ: '--fields' value '%s' is not valid here; allowed fields: %s"
 
-#: ../cli/src/network-manager.c:245
-#| msgid "WiFi enabled"
+#: ../cli/src/network-manager.c:424
 msgid "Networking enabled"
 msgstr "ਨੈਟਵਰਕਿੰਗ ਚਾਲੂ ਹੈ"
 
-#: ../cli/src/network-manager.c:256
+#: ../cli/src/network-manager.c:440
 #, 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:265
+#: ../cli/src/network-manager.c:450
 #, c-format
-#| msgid "Error: Could not connect to NetworkManager."
 msgid "Error: Sleeping status is not exported by NetworkManager."
 msgstr "ਗਲਤੀ: ਨੈੱਟਵਰਕਮੈਨੇਜਰ ਵਲੋਂ ਸਲੀਪ (sleep) ਹਾਲਤ ਐਕਸਪੋਰਟ ਨਹੀਂ ਕੀਤੀ ਜਾ ਸਕਦੀ।"
 
-#: ../cli/src/network-manager.c:273
+#: ../cli/src/network-manager.c:458
 #, 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:294
+#: ../cli/src/network-manager.c:479
 msgid "WiFi enabled"
 msgstr "ਵਾਈਫਾਈ ਚਾਲੂ ਹੈ"
 
-#: ../cli/src/network-manager.c:305
+#: ../cli/src/network-manager.c:495
 #, c-format
 msgid "Error: invalid 'wifi' parameter: '%s'."
 msgstr "ਗਲਤੀ: ਅਢੁੱਕਵਾਂ 'wifi' ਪੈਰਾਮੀਟਰ: '%s'."
 
-#: ../cli/src/network-manager.c:326
+#: ../cli/src/network-manager.c:517
 msgid "WWAN enabled"
 msgstr "WWAN ਚਾਲੂ ਹੈ"
 
-#: ../cli/src/network-manager.c:337
+#: ../cli/src/network-manager.c:533
 #, c-format
 msgid "Error: invalid 'wwan' parameter: '%s'."
 msgstr "ਗਲਤੀ: ਅਢੁੱਕਵਾਂ 'wwan' ਪੈਰਾਮੀਟਰ: '%s'."
 
-#: ../cli/src/network-manager.c:348
+#: ../cli/src/network-manager.c:556
+#| msgid "WiFi enabled"
+msgid "WiMAX enabled"
+msgstr "ਵਾਈਮੈਕਸ ਚਾਲੂ ਹੈ"
+
+#: ../cli/src/network-manager.c:572
+#, c-format
+#| msgid "Error: invalid 'wifi' parameter: '%s'."
+msgid "Error: invalid 'wimax' parameter: '%s'."
+msgstr "ਗਲਤੀ: ਅਢੁੱਕਵਾਂ 'wimax' ਪੈਰਾਮੀਟਰ: '%s'."
+
+#: ../cli/src/network-manager.c:585
 #, c-format
 msgid "Error: 'nm' command '%s' is not valid."
 msgstr "ਗਲਤੀ: 'nm' ਕਮਾਂਡ '%s' ਢੁੱਕਵੀਂ ਨਹੀਂ ਹੈ।"
 
-#: ../cli/src/nmcli.c:69
+#: ../cli/src/nmcli.c:76
 #, 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] |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"
@@ -1047,6 +1778,8 @@ msgid ""
 "  -f[ields] |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"
@@ -1056,7 +1789,7 @@ msgid ""
 "  dev         devices managed by NetworkManager\n"
 "\n"
 msgstr ""
-"ਵਰਤੋਂ: %s [OPTIONS] OBJECT { COMMAND | help }\n"
+"ਵਰਤੋ: %s [OPTIONS] OBJECT { COMMAND | help }\n"
 "\n"
 "OPTIONS\n"
 "  -t[erse]                                   terse output\n"
@@ -1065,6 +1798,8 @@ msgstr ""
 "  -f[ields] |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"
@@ -1074,644 +1809,893 @@ msgstr ""
 "  dev         devices managed by NetworkManager\n"
 "\n"
 
-#: ../cli/src/nmcli.c:113
+#: ../cli/src/nmcli.c:121
 #, c-format
 msgid "Error: Object '%s' is unknown, try 'nmcli help'."
 msgstr "ਗਲਤੀ: ਆਬਜੈਕਟ '%s' ਅਣਜਾਣ ਹੈ, 'nmcli help' ਵਰਤੋਂ।"
 
-#: ../cli/src/nmcli.c:143
+#: ../cli/src/nmcli.c:151
 #, c-format
 msgid "Error: Option '--terse' is specified the second time."
 msgstr "ਗਲਤੀ: ਚੋਣ '--terse' ਦੂਜੀ ਵਾਰ ਦਿੱਤੀ ਗਈ।"
 
-#: ../cli/src/nmcli.c:148
+#: ../cli/src/nmcli.c:156
 #, c-format
 msgid "Error: Option '--terse' is mutually exclusive with '--pretty'."
 msgstr "ਗਲਤੀ: Option '--terse' is mutually exclusive with '--pretty'."
 
-#: ../cli/src/nmcli.c:156
+#: ../cli/src/nmcli.c:164
 #, c-format
 msgid "Error: Option '--pretty' is specified the second time."
 msgstr "ਗਲਤੀ: Option '--pretty' is specified the second time."
 
-#: ../cli/src/nmcli.c:161
+#: ../cli/src/nmcli.c:169
 #, c-format
 msgid "Error: Option '--pretty' is mutually exclusive with '--terse'."
 msgstr "ਗਲਤੀ: Option '--pretty' is mutually exclusive with '--terse'."
 
-#: ../cli/src/nmcli.c:171 ../cli/src/nmcli.c:187
+#: ../cli/src/nmcli.c:179 ../cli/src/nmcli.c:195
 #, 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:188 ../cli/src/nmcli.c:204
 #, c-format
 msgid "Error: '%s' is not valid argument for '%s' option."
 msgstr "ਗਲਤੀ: '%s' is not valid argument for '%s' option."
 
-#: ../cli/src/nmcli.c:203
+#: ../cli/src/nmcli.c:211
 #, c-format
 msgid "Error: fields for '%s' options are missing."
 msgstr "ਗਲਤੀ: fields for '%s' options are missing."
 
-#: ../cli/src/nmcli.c:209
+#: ../cli/src/nmcli.c:219
 #, c-format
 msgid "nmcli tool, version %s\n"
 msgstr "nmcli ਟੂਲ, ਵਰਜਨ %s\n"
 
-#: ../cli/src/nmcli.c:215
+#: ../cli/src/nmcli.c:225
 #, c-format
 msgid "Error: Option '%s' is unknown, try 'nmcli -help'."
 msgstr "ਗਲਤੀ: ਚੋਣ '%s' ਅਣਜਾਣੀ ਹੈ 'nmcli -help' ਵਰਤ ਕੇ ਵੇਖੋ।"
 
-#: ../cli/src/nmcli.c:234
+#: ../cli/src/nmcli.c:244
 #, 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 "ਗਲਤੀ: ਨੈੱਟਵਰਕਮੈਨੇਜਰ ਨਾਲ ਕੁਨੈਕਟ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਿਆ।"
+#: ../cli/src/nmcli.c:269
+#| msgid "Error: Couldn't create D-Bus object proxy."
+msgid "Error: Could not create NMClient object."
+msgstr "ਗਲਤੀ: NMClient ਆਬਜੈਕਟ ਪਰਾਕਸੀ ਨਹੀਂ ਬਣਾਇਆ ਜਾ ਸਕਿਆ।"
 
-#: ../cli/src/nmcli.c:275
+#: ../cli/src/nmcli.c:285
 msgid "Success"
 msgstr "ਸਫ਼ਲ"
 
-#: ../cli/src/settings.c:411
+#: ../cli/src/settings.c:527
 #, c-format
 msgid "%d (hex-ascii-key)"
 msgstr "%d (hex-ascii-key)"
 
-#: ../cli/src/settings.c:413
+#: ../cli/src/settings.c:529
 #, c-format
 msgid "%d (104/128-bit passphrase)"
 msgstr "%d (104/128-bit ਗੁਪਤ-ਕੋਡ)"
 
-#: ../cli/src/settings.c:416
+#: ../cli/src/settings.c:532 ../cli/src/settings.c:660
 #, c-format
 msgid "%d (unknown)"
 msgstr "%d (ਅਣਜਾਣ)"
 
-#: ../cli/src/settings.c:442
+#: ../cli/src/settings.c:558
 msgid "0 (unknown)"
 msgstr "0 (ਅਣਜਾਣ)"
 
-#: ../cli/src/settings.c:448
+#: ../cli/src/settings.c:564
 msgid "any, "
 msgstr "ਕੋਈ ਵੀ, "
 
-#: ../cli/src/settings.c:450
+#: ../cli/src/settings.c:566
 msgid "900 MHz, "
 msgstr "900 MHz, "
 
-#: ../cli/src/settings.c:452
+#: ../cli/src/settings.c:568
 msgid "1800 MHz, "
 msgstr "1800 MHz, "
 
-#: ../cli/src/settings.c:454
+#: ../cli/src/settings.c:570
 msgid "1900 MHz, "
 msgstr "1900 MHz, "
 
-#: ../cli/src/settings.c:456
+#: ../cli/src/settings.c:572
 msgid "850 MHz, "
 msgstr "850 MHz, "
 
-#: ../cli/src/settings.c:458
+#: ../cli/src/settings.c:574
 msgid "WCDMA 3GPP UMTS 2100 MHz, "
 msgstr "WCDMA 3GPP UMTS 2100 MHz, "
 
-#: ../cli/src/settings.c:460
+#: ../cli/src/settings.c:576
 msgid "WCDMA 3GPP UMTS 1800 MHz, "
 msgstr "WCDMA 3GPP UMTS 1800 MHz, "
 
-#: ../cli/src/settings.c:462
+#: ../cli/src/settings.c:578
 msgid "WCDMA 3GPP UMTS 1700/2100 MHz, "
 msgstr "WCDMA 3GPP UMTS 1700/2100 MHz, "
 
-#: ../cli/src/settings.c:464
+#: ../cli/src/settings.c:580
 msgid "WCDMA 3GPP UMTS 800 MHz, "
 msgstr "WCDMA 3GPP UMTS 800 MHz, "
 
-#: ../cli/src/settings.c:466
+#: ../cli/src/settings.c:582
 msgid "WCDMA 3GPP UMTS 850 MHz, "
 msgstr "WCDMA 3GPP UMTS 850 MHz, "
 
-#: ../cli/src/settings.c:468
+#: ../cli/src/settings.c:584
 msgid "WCDMA 3GPP UMTS 900 MHz, "
 msgstr "WCDMA 3GPP UMTS 900 MHz, "
 
-#: ../cli/src/settings.c:470
+#: ../cli/src/settings.c:586
 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:588
+#| msgid "WCDMA 3GPP UMTS 900 MHz, "
+msgid "WCDMA 3GPP UMTS 1900 MHz, "
+msgstr "WCDMA 3GPP UMTS 1900 MHz, "
+
+#: ../cli/src/settings.c:590
+#| msgid "WCDMA 3GPP UMTS 2100 MHz, "
+msgid "WCDMA 3GPP UMTS 2600 MHz, "
+msgstr "WCDMA 3GPP UMTS 2600 MHz, "
+
+#: ../cli/src/settings.c:608
+msgid "0 (NONE)"
+msgstr "0 (ਕੋਈ ਨਹੀਂ)"
+
+#: ../cli/src/settings.c:614
+msgid "REORDER_HEADERS, "
+msgstr "REORDER_HEADERS, "
+
+#: ../cli/src/settings.c:616
+msgid "GVRP, "
+msgstr "GVRP, "
+
+#: ../cli/src/settings.c:618
+msgid "LOOSE_BINDING, "
+msgstr "LOOSE_BINDING, "
+
+#: ../cli/src/settings.c:654
+#, c-format
+#| msgid "disabled"
+msgid "%d (disabled)"
+msgstr "%d (ਬੰਦ ਹੈ)"
+
+#: ../cli/src/settings.c:656
+#, c-format
+msgid "%d (enabled, prefer public IP)"
+msgstr "%d (ਚਾਲੂ ਹੈ, ਪਸੰਦੀਦਾ ਪਬਲਿਕ IP)"
+
+#: ../cli/src/settings.c:658
+#, c-format
+msgid "%d (enabled, prefer temporary IP)"
+msgstr "%d (ਚਾਲੂ ਹੈ, ਪਸੰਦੀਦਾ ਆਰਜ਼ੀ IP)"
+
+#: ../cli/src/settings.c:791 ../cli/src/settings.c:987
+#: ../cli/src/settings.c:1696
 msgid "auto"
 msgstr "ਆਟੋ"
 
-#: ../cli/src/settings.c:716 ../cli/src/settings.c:719
-#: ../cli/src/settings.c:720 ../cli/src/utils.c:172
-msgid "not set"
-msgstr "ਸੈੱਟ ਨਹੀਂ ਹੈ"
+#: ../cli/src/utils.c:103
+#, c-format
+#| msgid "%s: error converting IP4 address 0x%X"
+msgid "Error converting IP4 address '0x%X' to text form"
+msgstr "IP4 ਐਡਰੈੱਸ 0x%X ਨੂੰ ਸ਼ਬਦ ਰੂਪ ਵਿੱਚ ਬਦਲਣ ਦੌਰਾਨ ਗਲਤੀ"
 
-#: ../cli/src/utils.c:124
+#: ../cli/src/utils.c:131
+#, c-format
+#| msgid "%s: error converting IP4 address 0x%X"
+msgid "Error converting IP6 address '%s' to text form"
+msgstr "IP6 ਐਡਰੈੱਸ '%s' ਨੂੰ ਸ਼ਬਦ ਰੂਪ ਵਿੱਚ ਬਦਲਣ ਦੌਰਾਨ ਗਲਤੀ"
+
+#: ../cli/src/utils.c:232
 #, c-format
 msgid "field '%s' has to be alone"
 msgstr "ਖੇਤਰ '%s' ਇਕੱਲਾ ਹੋਵੇਗਾ"
 
-#: ../cli/src/utils.c:127
+#: ../cli/src/utils.c:235
 #, c-format
 msgid "invalid field '%s'"
 msgstr "ਗਲਤ ਖੇਤਰ '%s'"
 
-#: ../cli/src/utils.c:146
-#, c-format
+#: ../cli/src/utils.c:254
 msgid "Option '--terse' requires specifying '--fields'"
 msgstr "Option '--terse' requires specifying '--fields'"
 
-#: ../cli/src/utils.c:150
+#: ../cli/src/utils.c:258
 #, c-format
 msgid "Option '--terse' requires specific '--fields' option values , not '%s'"
 msgstr "Option '--terse' requires specific '--fields' option values , not '%s'"
 
-#: ../libnm-util/crypto.c:120
+#: ../cli/src/utils.c:468
+#, 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 "ਗਲਤੀ: org.freedesktop.DBus ਲਈ ਡੀ-ਬੱਸ ਆਬਜੈਕਟ ਪਰਾਕਸੀ ਨਹੀਂ ਬਣਾਇਆ ਜਾ ਸਕਿਆ।"
+
+#: ../cli/src/utils.c:476
+#, c-format
+msgid "Error: NameHasOwner request failed: %s"
+msgstr "ਗਲਤੀ: NameHasOwner ਮੰਗ ਫੇਲ੍ਹ ਹੋਈ: %s"
+
+#: ../cli/src/utils.c:521
+#, 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:530
+#, 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:133
 #, c-format
 msgid "PEM key file had no end tag '%s'."
 msgstr "PEM ਕੁੰਜੀ ਫਾਇਲ ਦਾ ਕੋਈ ਅੰਤ ਟੈਗ '%s' ਨਹੀਂ ਹੈ।"
 
-#: ../libnm-util/crypto.c:130
+#: ../libnm-util/crypto.c:146
 #, c-format
 msgid "Doesn't look like a PEM private key file."
 msgstr "PEM ਪ੍ਰਾਈਵੇਟ ਕੁੰਜੀ ਫਾਇਲ ਵਾਂਗ ਨਹੀਂ ਜਾਪਦੀ।"
 
-#: ../libnm-util/crypto.c:138
+#: ../libnm-util/crypto.c:154
 #, c-format
 msgid "Not enough memory to store PEM file data."
 msgstr "PEM ਫਾਇਲ ਡਾਟਾ ਸਟੋਰ ਕਰਨ ਲਈ ਲੋੜੀਦੀ ਮੈਮੋਰੀ ਨਹੀਂ ਹੈ।"
 
-#: ../libnm-util/crypto.c:154
+#: ../libnm-util/crypto.c:170
 #, 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:178
 #, 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:188
 #, 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:199
 #, 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:206
 #, 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:219
 #, c-format
 msgid "Malformed PEM file: unknown private key cipher '%s'."
 msgstr "ਨਿਕਾਰਾ PEM ਫਾਇਲ: ਅਣਜਾਣ ਪ੍ਰਾਈਵੇਟ ਕੁੰਜੀ ਸੀਫਰ '%s'।"
 
-#: ../libnm-util/crypto.c:222
+#: ../libnm-util/crypto.c:238
 #, 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' ਵਿੱਚ ਕੋਈ ਅੰਤ ਟੈਗ '%s' ਨਹੀਂ ਹੈ।"
+#: ../libnm-util/crypto.c:284
+msgid "Failed to find expected PKCS#8 start tag."
+msgstr "ਲੋੜੀਦਾ PKCS#8 ਸ਼ੁਰੂ ਟੈਗ '%s' ਲੱਭਣ ਲਈ ਫੇਲ੍ਹ ਹੈ।"
 
-#: ../libnm-util/crypto.c:277
+#: ../libnm-util/crypto.c:292
 #, c-format
-msgid "Failed to decode certificate."
-msgstr "ਸਰਟੀਫਿਕੇਟ ਡੀਕੋਡ ਕਰਨ ਲਈ ਫੇਲ੍ਹ ਹੈ।"
+msgid "Failed to find expected PKCS#8 end tag '%s'."
+msgstr "ਲੋੜੀਦਾ PKCS#8 ਅੰਤ ਟੈਗ '%s' ਲੱਭਣ ਲਈ ਫੇਲ੍ਹ ਹੈ।"
+
+#: ../libnm-util/crypto.c:312
+#| msgid "Not enough memory to store file data."
+msgid "Not enough memory to store private key data."
+msgstr "ਪ੍ਰਾਈਵੇਟ ਕੁੰਜੀ ਡਾਟਾ ਸਟੋਰ ਕਰਨ ਲਈ ਲੋੜੀਦੀ ਮੈਮੋਰੀ ਨਹੀਂ ਹੈ।"
 
-#: ../libnm-util/crypto.c:286
+#: ../libnm-util/crypto.c:317
+#| msgid "Failed to decrypt the private key."
+msgid "Failed to decode PKCS#8 private key."
+msgstr "PKCS#8 ਪ੍ਰਾਈਵੇਟ ਕੁੰਜੀ ਡੀਕੋਡ ਕਰਨ ਲਈ ਫੇਲ੍ਹ ਹੈ।"
+
+#: ../libnm-util/crypto.c:339 ../libnm-util/crypto.c:625
 #, 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
+#: ../libnm-util/crypto.c:365
 #, c-format
 msgid "IV must be an even number of bytes in length."
 msgstr "IV ਲਈ ਲੰਬਾਈ ਜਿਸਤ ਅੰਕ ਹੋਣੀ ਲਾਜ਼ਮੀ ਹੈ।"
 
-#: ../libnm-util/crypto.c:333
+#: ../libnm-util/crypto.c:374
 #, c-format
 msgid "Not enough memory to store the IV."
 msgstr "IV ਸਟੋਰ ਕਰਨ ਲਈ ਲੋੜੀਦੀ ਮੈਮੋਰੀ ਨਹੀਂ ਹੈ।"
 
-#: ../libnm-util/crypto.c:344
+#: ../libnm-util/crypto.c:385
 #, c-format
 msgid "IV contains non-hexadecimal digits."
 msgstr "IV ਵਿੱਚ ਗ਼ੈਰ-ਹੈਕਸਾਡੈਸੀਮਲ ਅੰਕ ਹਨ।"
 
-#: ../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_nss.c:336
+#: ../libnm-util/crypto.c:423 ../libnm-util/crypto_gnutls.c:147
+#: ../libnm-util/crypto_gnutls.c:265 ../libnm-util/crypto_nss.c:167
+#: ../libnm-util/crypto_nss.c:332
 #, c-format
 msgid "Private key cipher '%s' was unknown."
 msgstr "ਪ੍ਰਾਈਵੇਟ ਕੁੰਜੀ ਸੀਫ਼ਰ '%s' ਅਣਜਾਣ ਹੈ।"
 
-#: ../libnm-util/crypto.c:391
+#: ../libnm-util/crypto.c:432
 #, c-format
 msgid "Not enough memory to decrypt private key."
 msgstr "ਪ੍ਰਾਈਵੇਟ ਕੁੰਜੀ ਡੀਕੋਡ ਕਰਨ ਲਈ ਲੋੜੀਦੀ ਮੈਮੋਰੀ ਨਹੀਂ ਹੈ।"
 
-#: ../libnm-util/crypto.c:511
+#: ../libnm-util/crypto.c:497
+#, c-format
+msgid "Not enough memory to store decrypted private key."
+msgstr "ਡਿਕ੍ਰਿਪਟ ਕੀਤੀ ਪ੍ਰਾਈਵੇਟ ਕੁੰਜੀ ਸਟੋਰ ਕਰਨ ਲਈ ਲੋੜੀਦੀ ਮੈਮੋਰੀ ਨਹੀਂ ਹੈ।"
+
+#: ../libnm-util/crypto.c:542
 #, c-format
 msgid "Unable to determine private key type."
 msgstr "ਪ੍ਰਾਈਵੇਟ ਕੁੰਜੀ ਕਿਸਮ ਜਾਣਨ ਲਈ ਅਸਮਰੱਥ ਹੈ।"
 
-#: ../libnm-util/crypto.c:530
+#: ../libnm-util/crypto.c:597
 #, 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.c:606
+#, 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:630
+#, c-format
+msgid "Failed to decode certificate."
+msgstr "ਸਰਟੀਫਿਕੇਟ ਡੀਕੋਡ ਕਰਨ ਲਈ ਫੇਲ੍ਹ ਹੈ।"
 
-#: ../libnm-util/crypto_gnutls.c:49
+#: ../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:92
 #, 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:155
 #, 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:164 ../libnm-util/crypto_nss.c:184
 #, c-format
 msgid "Not enough memory for decrypted key buffer."
 msgstr "ਡੀਕ੍ਰਿਪਟ ਕੀਤੇ ਕੁੰਜੀ ਬਫ਼ਰ ਲਈ ਲੋੜੀਦੀ ਮੈਮੋਰੀ ਨਹੀਂ ਹੈ।"
 
-#: ../libnm-util/crypto_gnutls.c:173
+#: ../libnm-util/crypto_gnutls.c:172
 #, 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:181
 #, 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:190
 #, c-format
 msgid "Failed to set IV for decryption: %s / %s."
 msgstr "%s / %s : ਡਿਕ੍ਰਿਪਟ ਲਈ IV ਸੈੱਟ ਕਰਨ ਲਈ ਫੇਲ੍ਹ ਹੈ।"
 
-#: ../libnm-util/crypto_gnutls.c:200
+#: ../libnm-util/crypto_gnutls.c:199
 #, 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:209 ../libnm-util/crypto_nss.c:263
 #, 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:220 ../libnm-util/crypto_nss.c:274
 #, 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:285 ../libnm-util/crypto_nss.c:352
 #, c-format
 msgid "Could not allocate memory for encrypting."
 msgstr "ਇੰਕ੍ਰਿਪਸ਼ਨ ਲਈ ਮੈਮੋਰੀ ਜਾਰੀ ਨਹੀਂ ਕੀਤੀ ਜਾ ਸਕੀ।"
 
-#: ../libnm-util/crypto_gnutls.c:294
+#: ../libnm-util/crypto_gnutls.c:293
 #, 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:302
 #, 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:312
 #, 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:321
 #, c-format
 msgid "Failed to encrypt the data: %s / %s."
 msgstr "ਡਾਟਾ ਡਿਕ੍ਰਿਪਟ ਕਰਨ ਲਈ ਫੇਲ੍ਹ: %s / %s"
 
-#: ../libnm-util/crypto_gnutls.c:362
+#: ../libnm-util/crypto_gnutls.c:361
 #, c-format
 msgid "Error initializing certificate data: %s"
 msgstr "ਸਰਟੀਫਿਕੇਟ ਡਾਟਾ ਸ਼ੁਰੂ 'ਚ ਗਲਤੀ: %s"
 
-#: ../libnm-util/crypto_gnutls.c:384
+#: ../libnm-util/crypto_gnutls.c:383
 #, c-format
 msgid "Couldn't decode certificate: %s"
 msgstr "ਸਰਟੀਫਿਕੇਟ ਡੀਕੋਡ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਿਆ: %s"
 
-#: ../libnm-util/crypto_gnutls.c:408
+#: ../libnm-util/crypto_gnutls.c:407
 #, 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:420
 #, 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:432
 #, c-format
 msgid "Couldn't verify PKCS#12 file: %s"
 msgstr "PKCS#12 ਫਾਇਲ ਜਾਂਚੀ ਨਹੀਂ ਜਾ ਸਕੀ: %s"
 
+#: ../libnm-util/crypto_gnutls.c:460
+#, c-format
+#| msgid "Couldn't initialize PKCS#12 decoder: %s"
+msgid "Couldn't initialize PKCS#8 decoder: %s"
+msgstr "PKCS#8 ਡੀਕੋਡਰ ਸ਼ੁਰੂ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਿਆ: %s"
+
+#: ../libnm-util/crypto_gnutls.c:483
+#, c-format
+#| msgid "Couldn't decode PKCS#12 file: %s"
+msgid "Couldn't decode PKCS#8 file: %s"
+msgstr "PKCS#8 ਫਾਇਲ ਡੀਕੋਡ ਨਹੀਂ ਜਾ ਸਕੀ: %s"
+
 #: ../libnm-util/crypto_nss.c:56
 #, c-format
 msgid "Failed to initialize the crypto engine: %d."
 msgstr "ਕ੍ਰਿਪਟੂ ਇੰਜਣ ਸ਼ੁਰੂ ਕਰਨ ਲਈ ਫੇਲ੍ਹ: %d"
 
-#: ../libnm-util/crypto_nss.c:111
+#: ../libnm-util/crypto_nss.c:107
 #, c-format
 msgid "Failed to initialize the MD5 context: %d."
 msgstr "MD5 ਪਰਸੰਗ ਸ਼ੁਰੂ ਕਰਨ ਲਈ ਫੇਲ੍ਹ: %d"
 
-#: ../libnm-util/crypto_nss.c:179
+#: ../libnm-util/crypto_nss.c:175
 #, c-format
 msgid "Invalid IV length (must be at least %d)."
 msgstr "ਅਢੁੱਕਵੀਂ IV ਲੰਬਾਈ (ਘੱਟੋ-ਘੱਟ %d ਹੋਣੀ ਲਾਜ਼ਮੀ ਹੈ)।"
 
-#: ../libnm-util/crypto_nss.c:196
+#: ../libnm-util/crypto_nss.c:192
 #, c-format
 msgid "Failed to initialize the decryption cipher slot."
 msgstr "ਡਿਕ੍ਰਿਪਸ਼ਨ ਸੀਫਰ ਸਲਾਟ ਸ਼ੁਰੂ ਕਰਨ ਲਈ ਫੇਲ੍ਹ ਹੈ।"
 
-#: ../libnm-util/crypto_nss.c:206
+#: ../libnm-util/crypto_nss.c:202
 #, c-format
 msgid "Failed to set symmetric key for decryption."
 msgstr "ਡਿਕ੍ਰਿਪਸ਼ਨ ਲਈ ਸਮਮਿਤੀ ਕੁੰਜੀ ਸੈੱਟ ਕਰਨ ਲਈ ਫੇਲ੍ਹ ਹੈ।"
 
-#: ../libnm-util/crypto_nss.c:216
+#: ../libnm-util/crypto_nss.c:212
 #, c-format
 msgid "Failed to set IV for decryption."
 msgstr "ਡਿਕ੍ਰਿਪਟ ਲਈ IV ਸੈੱਟ ਕਰਨ ਲਈ ਫੇਲ੍ਹ ਹੈ।"
 
-#: ../libnm-util/crypto_nss.c:224
+#: ../libnm-util/crypto_nss.c:220
 #, c-format
 msgid "Failed to initialize the decryption context."
 msgstr "ਡਿਕ੍ਰਿਪਸ਼ਨ ਪਰਸੰਗ ਸ਼ੁਰੂ ਕਰਨ ਲਈ ਫੇਲ੍ਹ: "
 
-#: ../libnm-util/crypto_nss.c:237
+#: ../libnm-util/crypto_nss.c:233
 #, c-format
 msgid "Failed to decrypt the private key: %d."
 msgstr "ਪ੍ਰਾਈਵੇਟ ਕੁੰਜੀ ਡਿਕ੍ਰਿਪਟ ਕਰਨ ਲਈ ਫੇਲ੍ਹ: %d"
 
-#: ../libnm-util/crypto_nss.c:245
+#: ../libnm-util/crypto_nss.c:241
 #, c-format
 msgid "Failed to decrypt the private key: decrypted data too large."
 msgstr "ਪ੍ਰਾਈਵੇਟ ਕੁੰਜੀ ਡਿਕ੍ਰਿਪਟ ਕਰਨ ਲਈ ਫੇਲ੍ਹ: ਡਿਕ੍ਰਿਪਟ ਡਾਟਾ ਬਹੁਤ ਵੱਡਾ ਹੈ।"
 
-#: ../libnm-util/crypto_nss.c:256
+#: ../libnm-util/crypto_nss.c:252
 #, c-format
 msgid "Failed to finalize decryption of the private key: %d."
 msgstr "ਪ੍ਰਾਈਵੇਟ ਕੁੰਜ ਲਈ ਡੀਕ੍ਰਿਪਸ਼ਨ ਮੁਕੰਮਲ ਕਰਨ ਲਈ ਫੇਲ੍ਹ ਹੈ: %d।"
 
-#: ../libnm-util/crypto_nss.c:364
+#: ../libnm-util/crypto_nss.c:360
 #, c-format
 msgid "Failed to initialize the encryption cipher slot."
 msgstr "ਕ੍ਰਿਪਸ਼ਨ ਸੀਫ਼ਰ ਸਲਾਟ ਸ਼ੁਰੂ ਕਰਨ ਲਈ ਫੇਲ੍ਹ ਹੈ।"
 
-#: ../libnm-util/crypto_nss.c:372
+#: ../libnm-util/crypto_nss.c:368
 #, c-format
 msgid "Failed to set symmetric key for encryption."
 msgstr "ਇੰਕ੍ਰਿਪਸ਼ਨ ਲਈ ਸਮਮਿਤੀ ਕੁੰਜੀ ਸੈੱਟ ਕਰਨ ਲਈ ਫੇਲ੍ਹ।"
 
-#: ../libnm-util/crypto_nss.c:380
+#: ../libnm-util/crypto_nss.c:376
 #, c-format
 msgid "Failed to set IV for encryption."
 msgstr "ਇੰਕ੍ਰਿਪਸ਼ਨ ਲਈ IV ਸੈੱਟ ਕਰਨ ਵਾਸਤੇ ਫੇਲ੍ਹ।"
 
-#: ../libnm-util/crypto_nss.c:388
+#: ../libnm-util/crypto_nss.c:384
 #, c-format
 msgid "Failed to initialize the encryption context."
 msgstr "ਇੰਕ੍ਰਿਪਸ਼ਨ ਪਰਸੰਗ ਸ਼ੁਰੂ ਕਰਨ ਲਈ ਫੇਲ੍ਹ ਹੈ।"
 
-#: ../libnm-util/crypto_nss.c:396
+#: ../libnm-util/crypto_nss.c:392
 #, c-format
 msgid "Failed to encrypt: %d."
 msgstr "ਇੰਕ੍ਰਿਪਟ ਕਰਨ ਲਈ ਫੇਲ੍ਹ: %d"
 
-#: ../libnm-util/crypto_nss.c:404
+#: ../libnm-util/crypto_nss.c:400
 #, c-format
 msgid "Unexpected amount of data after encrypting."
 msgstr "ਇੰਕ੍ਰਿਪਟ ਕਰਨ ਦੇ ਬਾਅਦ ਅਚਾਨਕ ਅਣਜਾਣ ਮਾਤਰਾ 'ਚ ਡਾਟਾ।"
 
-#: ../libnm-util/crypto_nss.c:447
+#: ../libnm-util/crypto_nss.c:443
 #, c-format
 msgid "Couldn't decode certificate: %d"
 msgstr "ਸਰਟੀਫਿਕੇਟ ਡੀਕੋਡ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਿਆ: %d"
 
-#: ../libnm-util/crypto_nss.c:482
+#: ../libnm-util/crypto_nss.c:478
 #, c-format
 msgid "Couldn't convert password to UCS2: %d"
 msgstr "ਪਾਸਵਰਡ ਨੂੰ UCS2 'ਚ ਬਦਲਿਆ ਨਹੀਂ ਜਾ ਸਕਿਆ: %d"
 
-#: ../libnm-util/crypto_nss.c:510
+#: ../libnm-util/crypto_nss.c:506
 #, c-format
 msgid "Couldn't initialize PKCS#12 decoder: %d"
 msgstr "PKCS#12 ਡੀਕੋਡਰ ਸ਼ੁਰੂ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਿਆ: %d"
 
-#: ../libnm-util/crypto_nss.c:519
+#: ../libnm-util/crypto_nss.c:515
 #, c-format
 msgid "Couldn't decode PKCS#12 file: %d"
 msgstr "PKCS#12 ਫਾਇਲ ਜਾਂਚੀ ਨਹੀਂ ਜਾ ਸਕੀ: %d"
 
-#: ../libnm-util/crypto_nss.c:528
+#: ../libnm-util/crypto_nss.c:524
 #, c-format
 msgid "Couldn't verify PKCS#12 file: %d"
 msgstr "PKCS#12 ਫਾਇਲ ਜਾਂਚੀ ਨਹੀਂ ਜਾ ਸਕੀ: %d"
 
-#: ../libnm-util/crypto_nss.c:557
+#: ../libnm-util/crypto_nss.c:568
 msgid "Could not generate random data."
 msgstr "ਰਲਵਾਂ ਡਾਟਾ ਤਿਆਰ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਿਆ।"
 
-#: ../libnm-util/nm-utils.c:1975
+#: ../libnm-util/nm-utils.c:2040
 #, c-format
 msgid "Not enough memory to make encryption key."
 msgstr "ਇੰਕ੍ਰਿਪਸ਼ਨ ਕੁੰਜੀ ਬਣਾਉਣ ਲਈ ਲੋੜੀਦੀ ਮੈਮੋਰੀ ਨਹੀਂ ਹੈ।"
 
-#: ../libnm-util/nm-utils.c:2085
+#: ../libnm-util/nm-utils.c:2150
 msgid "Could not allocate memory for PEM file creation."
 msgstr "PEM ਫਾਇਲ ਬਣਾਉਣ ਲਈ ਮੈਮੋਰੀ ਜਾਰੀ ਨਹੀਂ ਕੀਤੀ ਜਾ ਸਕੀ।"
 
-#: ../libnm-util/nm-utils.c:2097
+#: ../libnm-util/nm-utils.c:2162
 #, c-format
 msgid "Could not allocate memory for writing IV to PEM file."
 msgstr "PEM ਫਾਇਲ ਵਾਸਤੇ IV ਲਿਖਣ ਲਈ ਮੈਮੋਰੀ ਦਿੱਤੀ ਨਹੀਂ ਜਾ ਸਕੀ।"
 
-#: ../libnm-util/nm-utils.c:2109
+#: ../libnm-util/nm-utils.c:2174
 #, c-format
 msgid "Could not allocate memory for writing encrypted key to PEM file."
 msgstr "PEM ਫਾਇਲ ਵਾਸਤੇ ਇੰਕ੍ਰਿਪਟ ਕੀਤੀ ਕੁੰਜੀ ਲਿਖਣ ਲਈ ਮੈਮੋਰੀ ਦਿੱਤੀ ਨਹੀਂ ਜਾ ਸਕੀ।"
 
-#: ../libnm-util/nm-utils.c:2128
+#: ../libnm-util/nm-utils.c:2193
 #, 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 "ਸੁਰੱਖਿਅਤ ਵਾਈ-ਫਾਈ ਨੈੱਟਵਰਕ ਰਾਹੀਂ ਕੁਨੈਕਸ਼ਨ ਸਾਂਝਾ ਕਰੋ"
-
-#: ../policy/org.freedesktop.network-manager-settings.system.policy.in.h:2
-msgid "Connection sharing via an open WiFi network"
-msgstr "ਓਪਨ ਵਾਈ-ਫਾਈ ਨੈੱਟਵਰਕ ਰਾਹੀਂ ਕੁਨੈਕਸ਼ਨ ਸਾਂਝਾ ਕਰੋ"
-
-#: ../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 "ਸਿਸਟਮ ਪਾਲਸੀ ਕੁਨੈਕਸ਼ਨ ਨੂੰ ਸੁਰੱਖਿਅਤ ਵਾਈ-ਫਾਈ ਨੈੱਟਵਰਕ ਰਾਹੀਂ ਸਾਂਝਾ ਕਰਨ ਤੋਂ ਰੋਕਦੀ ਹੈ"
-
-#: ../policy/org.freedesktop.network-manager-settings.system.policy.in.h:8
-msgid "System policy prevents sharing connections via an open WiFi network"
-msgstr "ਸਿਸਟਮ ਪਾਲਸੀ ਕੁਨੈਕਸ਼ਨ ਨੂੰ ਓਪਨ ਵਾਈ-ਫਾਈ ਨੈੱਟਵਰਕ ਰਾਹੀਂ ਸਾਂਝਾ ਕਰਨ ਤੋਂ ਰੋਕਦੀ ਹੈ"
-
 #: ../policy/org.freedesktop.NetworkManager.policy.in.h:1
-msgid "Allow control of network connections"
-msgstr "ਨੈੱਟਵਰਕ ਕੁਨੈਕਸ਼ਨਾਂ ਲਈ ਕੰਟਰੋਲ ਮਨਜ਼ੂਰ"
+msgid "Enable or disable system networking"
+msgstr "ਸਿਸਟਮ ਨੈੱਟਵਰਕਿੰਗ ਚਾਲੂ ਜਾਂ ਬੰਦ"
 
 #: ../policy/org.freedesktop.NetworkManager.policy.in.h:2
-msgid "Allow use of user-specific connections"
-msgstr "ਖਾਸ ਯੂਜ਼ਰ ਕੁਨੈਕਸ਼ਨਾਂ ਦੀ ਵਰਤੋਂ ਮਨਜ਼ੂਰ"
+msgid "System policy prevents enabling or disabling system networking"
+msgstr "ਸਿਸਟਮ ਪਾਲਸੀ ਸਿਸਟਮ ਨੈੱਟਵਰਕਿੰਗ ਚਾਲੂ ਜਾਂ ਬੰਦ ਕਰਨ ਤੋਂ ਰੋਕਦੀ ਹੈ"
 
 #: ../policy/org.freedesktop.NetworkManager.policy.in.h:3
-msgid "Enable or disable WiFi devices"
-msgstr "ਵਾਈ-ਫਾਈ ਜੰਤਰ ਚਾਲੂ ਜਾਂ ਬੰਦ ਕਰੋ"
-
-#: ../policy/org.freedesktop.NetworkManager.policy.in.h:4
-msgid "Enable or disable mobile broadband devices"
-msgstr "ਮੋਬਾਇਲ ਬਰਾਡਬੈਂਡ ਜੰਤਰ ਚਾਲੂ ਜਾਂ ਬੰਦ"
-
-#: ../policy/org.freedesktop.NetworkManager.policy.in.h:5
-msgid "Enable or disable system networking"
-msgstr "ਸਿਸਟਮ ਨੈੱਟਵਰਕਿੰਗ ਚਾਲੂ ਜਾਂ ਬੰਦ"
-
-#: ../policy/org.freedesktop.NetworkManager.policy.in.h:6
 msgid ""
 "Put NetworkManager to sleep or wake it up (should only be used by system "
 "power management)"
 msgstr ""
-"ਨੈੱਟਵਰਕਮੈਨਜੇਰ ਨੂੰ ਸਲੀਪ ਕਰੋ ਜਾਂ ਵੇਕ ਅੱਪ ਕਰੋ (ਕੇਵਲ ਸਿਸਟਮ ਪਾਵਰ ਮੈਨਜੇਮੈਂਟ ਰਾਹੀਂ ਵਰਤਿਆ ਜਾਣਾ ਚਾਹੀਦਾ "
+"ਨੈੱਟਵਰਕਮੈਨਜੇਰ ਨੂੰ ਸਲੀਪ ਕਰੋ ਜਾਂ ਵੇਕ ਅੱਪ ਕਰੋ (ਕੇਵਲ ਸਿਸਟਮ ਪਾਵਰ ਮੈਨਜੇਮੈਂਟ ਰਾਹੀਂ "
+"ਵਰਤਿਆ ਜਾਣਾ ਚਾਹੀਦਾ "
 "ਹੈ)"
 
-#: ../policy/org.freedesktop.NetworkManager.policy.in.h:7
-msgid "System policy prevents control of network connections"
-msgstr "ਸਿਸਟਮ ਪਾਲਸੀ ਨੈੱਟਵਰਕ ਕੁਨੈਕਸ਼ਨ ਕੰਟਰੋਲ ਕਰਨ ਤੋਂ ਸੋਧ ਤੋਂ ਰੋਕਦੀ ਹੈ"
+#: ../policy/org.freedesktop.NetworkManager.policy.in.h:4
+msgid "System policy prevents putting NetworkManager to sleep or waking it up"
+msgstr "ਸਿਸਟਮ ਪਾਲਸੀ ਨੈੱਟਵਰਕਮੈਨੇਜਰ ਨੂੰ ਸਲੀਪ ਜਾਂ ਵੇਕਅੱਪ ਕਰਨ ਤੋਂ ਰੋਕਦੀ ਹੈ"
 
-#: ../policy/org.freedesktop.NetworkManager.policy.in.h:8
+#: ../policy/org.freedesktop.NetworkManager.policy.in.h:5
+msgid "Enable or disable WiFi devices"
+msgstr "ਵਾਈ-ਫਾਈ ਜੰਤਰ ਚਾਲੂ ਜਾਂ ਬੰਦ ਕਰੋ"
+
+#: ../policy/org.freedesktop.NetworkManager.policy.in.h:6
 msgid "System policy prevents enabling or disabling WiFi devices"
 msgstr "ਸਿਸਟਮ ਪਾਲਸੀ ਵਾਈ-ਫਾਈ ਜੰਤਰ ਚਾਲੂ ਜਾਂ ਬੰਦ ਕਰਨੋਂ ਰੋਕਦੀ ਹੈ"
 
-#: ../policy/org.freedesktop.NetworkManager.policy.in.h:9
+#: ../policy/org.freedesktop.NetworkManager.policy.in.h:7
+msgid "Enable or disable mobile broadband devices"
+msgstr "ਮੋਬਾਇਲ ਬਰਾਡਬੈਂਡ ਜੰਤਰ ਚਾਲੂ ਜਾਂ ਬੰਦ"
+
+#: ../policy/org.freedesktop.NetworkManager.policy.in.h:8
 msgid "System policy prevents enabling or disabling mobile broadband devices"
 msgstr "ਸਿਸਟਮ ਪਾਲਸੀ ਮੋਬਾਇਲ ਬਰਾਡਬੈਂਡ ਜੰਤਰ ਚਾਲੂ ਜਾਂ ਬੰਦ ਕਰਨ ਤੋਂ ਰੋਕਦੀ ਹੈ"
 
+#: ../policy/org.freedesktop.NetworkManager.policy.in.h:9
+#| msgid "Enable or disable mobile broadband devices"
+msgid "Enable or disable WiMAX mobile broadband devices"
+msgstr "ਵਾਈ-ਮੈਕਸ ਮੋਬਾਇਲ ਬਰਾਡਬੈਂਡ ਜੰਤਰ ਚਾਲੂ ਜਾਂ ਬੰਦ ਕਰੋ"
+
 #: ../policy/org.freedesktop.NetworkManager.policy.in.h:10
-msgid "System policy prevents enabling or disabling system networking"
-msgstr "ਸਿਸਟਮ ਪਾਲਸੀ ਸਿਸਟਮ ਨੈੱਟਵਰਕਿੰਗ ਚਾਲੂ ਜਾਂ ਬੰਦ ਕਰਨ ਤੋਂ ਰੋਕਦੀ ਹੈ"
+#| msgid ""
+#| "System policy prevents enabling or disabling mobile broadband devices"
+msgid ""
+"System policy prevents enabling or disabling WiMAX mobile broadband devices"
+msgstr "ਸਿਸਟਮ ਪਾਲਸੀ ਵਾਈਮੈਕਸ ਮੋਬਾਇਲ ਬਰਾਡਬੈਂਡ ਜੰਤਰ ਚਾਲੂ ਜਾਂ ਬੰਦ ਕਰਨ ਤੋਂ ਰੋਕਦੀ ਹੈ"
 
 #: ../policy/org.freedesktop.NetworkManager.policy.in.h:11
-msgid "System policy prevents putting NetworkManager to sleep or waking it up"
-msgstr "ਸਿਸਟਮ ਪਾਲਸੀ ਨੈੱਟਵਰਕਮੈਨੇਜਰ ਨੂੰ ਸਲੀਪ ਜਾਂ ਵੇਕਅੱਪ ਕਰਨ ਤੋਂ ਰੋਕਦੀ ਹੈ"
+msgid "Allow control of network connections"
+msgstr "ਨੈੱਟਵਰਕ ਕੁਨੈਕਸ਼ਨਾਂ ਲਈ ਕੰਟਰੋਲ ਮਨਜ਼ੂਰ"
 
 #: ../policy/org.freedesktop.NetworkManager.policy.in.h:12
-msgid "System policy prevents use of user-specific connections"
-msgstr "ਸਿਸਟਮ ਪਾਲਸੀ ਖਾਸ-ਯੂਜ਼ਰ ਕੁਨੈਕਸ਼ਨ ਵਰਤੋਂ ਤੋਂ ਰੋਕਦੀ ਹੈ"
+msgid "System policy prevents control of network 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 "ਨੈੱਟਲਿੰਕ ਸੁਨੇਹੇ ਉੱਤੇ ਕਾਰਵਾਈ ਕਰਨ ਦੌਰਾਨ ਗਲਤੀ: %s"
+#: ../policy/org.freedesktop.NetworkManager.policy.in.h:13
+msgid "Connection sharing via a protected WiFi network"
+msgstr "ਸੁਰੱਖਿਅਤ ਵਾਈ-ਫਾਈ ਨੈੱਟਵਰਕ ਰਾਹੀਂ ਕੁਨੈਕਸ਼ਨ ਸਾਂਝਾ ਕਰੋ"
 
-#: ../src/nm-netlink-monitor.c:214
-msgid "error occurred while waiting for data on socket"
-msgstr "ਸਾਕਟ ਉੱਤੇ ਡਾਟੇ ਦੀ ਉਡੀਕ ਕਰਨ ਦੌਰਾਨ ਗਲਤੀ"
+#: ../policy/org.freedesktop.NetworkManager.policy.in.h:14
+msgid "System policy prevents sharing connections via a protected WiFi network"
+msgstr ""
+"ਸਿਸਟਮ ਪਾਲਸੀ ਕੁਨੈਕਸ਼ਨ ਨੂੰ ਸੁਰੱਖਿਅਤ ਵਾਈ-ਫਾਈ ਨੈੱਟਵਰਕ ਰਾਹੀਂ ਸਾਂਝਾ ਕਰਨ ਤੋਂ ਰੋਕਦੀ ਹੈ"
+
+#: ../policy/org.freedesktop.NetworkManager.policy.in.h:15
+msgid "Connection sharing via an open WiFi network"
+msgstr "ਓਪਨ ਵਾਈ-ਫਾਈ ਨੈੱਟਵਰਕ ਰਾਹੀਂ ਕੁਨੈਕਸ਼ਨ ਸਾਂਝਾ ਕਰੋ"
+
+#: ../policy/org.freedesktop.NetworkManager.policy.in.h:16
+msgid "System policy prevents sharing connections via an open WiFi network"
+msgstr ""
+"ਸਿਸਟਮ ਪਾਲਸੀ ਕੁਨੈਕਸ਼ਨ ਨੂੰ ਓਪਨ ਵਾਈ-ਫਾਈ ਨੈੱਟਵਰਕ ਰਾਹੀਂ ਸਾਂਝਾ ਕਰਨ ਤੋਂ ਰੋਕਦੀ ਹੈ"
+
+#: ../policy/org.freedesktop.NetworkManager.policy.in.h:17
+#| msgid "Allow control of network connections"
+msgid "Modify personal network connections"
+msgstr "ਨਿੱਜੀ ਨੈੱਟਵਰਕ ਕੁਨੈਕਸ਼ਨ ਸੋਧੋ"
+
+#: ../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 "ਸਿਸਟਮ ਪਾਲਸੀ ਨਿੱਜੀ ਨੈੱਟਵਰਕ ਸੈਟਿੰਗ ਲਈ ਸੋਧ ਤੋਂ ਰੋਕਦੀ ਹੈ"
+
+#: ../policy/org.freedesktop.NetworkManager.policy.in.h:19
+#| msgid "Modify system connections"
+msgid "Modify network connections for all users"
+msgstr "ਸਭ ਯੂਜ਼ਰ ਲਈ ਨੈੱਟਵਰਕ ਕੁਨੈਸ਼ਨ ਸੋਧ"
+
+#: ../policy/org.freedesktop.NetworkManager.policy.in.h:20
+#| msgid "System policy prevents modification of system settings"
+msgid "System policy prevents modification of network settings for all users"
+msgstr "ਸਿਸਟਮ ਪਾਲਸੀ ਸਭ ਯੂਜ਼ਰ ਨੂੰ ਨੈੱਟਵਰਕ ਸੈਟਿੰਗ ਲਈ ਸੋਧ ਤੋਂ ਰੋਕਦੀ ਹੈ"
+
+#: ../policy/org.freedesktop.NetworkManager.policy.in.h:21
+msgid "Modify persistent system hostname"
+msgstr "ਸਥਿਰ ਸਿਸਟਮ ਹੋਸਟ-ਨਾਂ ਸੋਧ"
+
+#: ../policy/org.freedesktop.NetworkManager.policy.in.h:22
+msgid "System policy prevents modification of the persistent system hostname"
+msgstr "ਸਿਸਟਮ ਪਾਲਸੀ ਸਥਿਰ ਸਿਸਟਮ ਹੋਸਟ-ਨਾਂ ਲਈ ਸੋਧਾਂ ਤੋਂ ਰੋਕਦੀ ਹੈ"
 
-#: ../src/nm-netlink-monitor.c:254
+#: ../src/main.c:158
 #, c-format
-msgid "unable to connect to netlink for monitoring link status: %s"
-msgstr "ਲਿੰਕ ਹਾਲਤ ਦੀ ਨਿਗਰਾਨੀ ਲਈ ਨੈੱਟਲਿੰਕ ਨਾਲ ਕੁਨੈਕਟ ਕਰਨ ਲਈ ਅਸਮਰੱਥ: %s"
+#| msgid "Failed to encrypt: %d."
+msgid "Failed to set signal mask: %d"
+msgstr "ਸਿਗਨਲ ਮਾਸਕ ਸੈੱਟ ਲਈ ਫੇਲ੍ਹ: %d"
 
-#: ../src/nm-netlink-monitor.c:265
+#: ../src/main.c:167
 #, c-format
-msgid "unable to enable netlink handle credential passing: %s"
-msgstr "netlink ਹੈੱਡਲ ਸਨਦ ਪਾਸ ਕਰਨ ਲਈ ਅਸਮਰੱਥ: %s"
+msgid "Failed to create signal handling thread: %d"
+msgstr "ਸਿਗਨਲ ਹੈਂਡਲ ਥਰਿਡ ਬਣਾਉਣ ਲਈ ਫੇਲ੍ਹ: %d"
 
-#: ../src/nm-netlink-monitor.c:291 ../src/nm-netlink-monitor.c:353
+#: ../src/main.c:182
 #, c-format
-msgid "unable to allocate netlink handle for monitoring link status: %s"
-msgstr "ਲਿੰਕ ਹਾਲਤ ਦੀ ਨਿਗਰਾਨੀ ਲਈ ਨੈੱਟਲਿੰਕ ਜਾਰੀ ਕਰਨ ਲਈ ਅਸਮਰੱਥ: %s"
+msgid "Opening %s failed: %s\n"
+msgstr "'%s' ਨੂੰ ਖੋਲ੍ਹਣ ਲਈ ਫੇਲ੍ਹ: %s\n"
 
-#: ../src/nm-netlink-monitor.c:376
+#: ../src/main.c:188
 #, c-format
-msgid "unable to allocate netlink link cache for monitoring link status: %s"
-msgstr "ਲਿੰਕ ਹਾਲਤ ਦੀ ਨਿਗਰਾਨੀ ਲਈ ਨੈੱਟਲਿੰਕ ਲਿੰਕ ਕੈਸ਼ ਜਾਰੀ ਕਰਨ ਲਈ ਅਸਮਰੱਥ: %s"
+msgid "Writing to %s failed: %s\n"
+msgstr "'%s' ਲਿਖਣ ਲਈ ਫੇਲ੍ਹ: %s\n"
 
-#: ../src/nm-netlink-monitor.c:502
+#: ../src/main.c:193
 #, c-format
-msgid "unable to join netlink group: %s"
-msgstr "netlink ਗਰੁੱਪ ਜੁਆਇੰਨ ਕਰਨ ਲਈ ਅਸਮਰੱਥ:: %s"
+msgid "Closing %s failed: %s\n"
+msgstr "%s ਬੰਦ ਕਰਨ ਲਈ ਫੇਲ੍ਹ ਹੈ: %s\n"
 
-#: ../src/nm-netlink-monitor.c:629 ../src/nm-netlink-monitor.c:642
+#: ../src/main.c:236
 #, c-format
-msgid "error updating link cache: %s"
-msgstr "ਲਿੰਕ ਕੈਸ਼ ਅੱਪਡੇਟ ਕਰਨ ਦੌਰਾਨ ਗਲਤੀ: %s"
+msgid "NetworkManager is already running (pid %ld)\n"
+msgstr "ਨੈੱਟਵਰਕਮੈਨੇਜਰ ਪਹਿਲਾਂ ਹੀ ਚੱਲ ਰਿਹਾ ਹੈ (pid %ld)\n"
+
+#: ../src/main.c:376
+#| msgid "NetworkManager status"
+msgid "Print NetworkManager version and exit"
+msgstr "ਨੈੱਟਵਰਕਮੈਨੇਜਰ ਵਰਜਨ ਦਿਉ ਅਤੇ ਬੰਦ ਕਰੋ"
+
+#: ../src/main.c:377
+msgid "Don't become a daemon"
+msgstr "ਡੈਮਨ ਨਾ ਬਣੋ"
 
-#: ../src/main.c:499
+#: ../src/main.c:378
+msgid "Make all warnings fatal"
+msgstr "ਸਭ ਚੇਤਾਵਨੀਆਂ ਨੂੰ ਘਾਤਕ ਬਣਾਓ"
+
+#: ../src/main.c:379
+msgid "Specify the location of a PID file"
+msgstr "PID ਫਾਇਲ ਦਾ ਟਿਕਾਣਾ ਦਿਓ"
+
+#: ../src/main.c:379
+msgid "filename"
+msgstr "ਫਾਇਲਨਾਂ"
+
+#: ../src/main.c:380
+msgid "State file location"
+msgstr "ਹਾਲਤ ਫਾਇਲ ਟਿਕਾਣਾ"
+
+#: ../src/main.c:380
+msgid "/path/to/state.file"
+msgstr "/path/to/state.file"
+
+#: ../src/main.c:381
+msgid "Config file location"
+msgstr "ਸੰਰਚਨਾ ਫਾਇਲ ਟਿਕਾਣਾ"
+
+#: ../src/main.c:381
+msgid "/path/to/config.file"
+msgstr "/path/to/config.file"
+
+#: ../src/main.c:382
+msgid "List of plugins separated by ','"
+msgstr "',' ਰਾਹੀਂ ਵੱਖ ਕਰਕੇ ਪਲੱਗਇਨ ਦੀ ਲਿਸਟ ਦਿਓ"
+
+#: ../src/main.c:382
+msgid "plugin1,plugin2"
+msgstr "ਪਲੱਗਇਨ1,ਪਲੱਗਇਨ2"
+
+#. Translators: Do not translate the values in the square brackets
+#: ../src/main.c:384
+msgid "Log level: one of [ERR, WARN, INFO, DEBUG]"
+msgstr "ਲਾਗ ਪੱਧਰ: [ERR, WARN, INFO, DEBUG] ਵਿੱਚੋਂ ਇੱਕ"
+
+#. Translators: Do not translate the values in the square brackets
+#: ../src/main.c:387
+msgid ""
+"Log domains separated by ',': any combination of\n"
+"                                                [NONE,HW,RFKILL,ETHER,WIFI,"
+"BT,MB,DHCP4,DHCP6,PPP,\n"
+"                                                 WIFI_SCAN,IP4,IP6,AUTOIP4,"
+"DNS,VPN,SHARING,SUPPLICANT,\n"
+"                                                 AGENTS,SETTINGS,SUSPEND,"
+"CORE,DEVICE,OLPC,WIMAX,\n"
+"                                                 INFINIBAND,FIREWALL,ADSL]"
+msgstr ""
+"',' ਨਾਲ ਵੱਖ ਕੀਤੀਆਂ ਲਾਗ ਡੋਮੇਨ: ਇਹਨਾਂ ਵਿੱਚੋਂ ਕੋਈ ਵੀ\n"
+"                                                [NONE,HW,RFKILL,ETHER,WIFI,"
+"BT,MB,DHCP4,DHCP6,PPP,\n"
+"                                                 WIFI_SCAN,IP4,IP6,AUTOIP4,"
+"DNS,VPN,SHARING,SUPPLICANT,\n"
+"                                                 AGENTS,SETTINGS,SUSPEND,"
+"CORE,DEVICE,OLPC,WIMAX,\n"
+"                                                 INFINIBAND,FIREWALL,ADSL]"
+
+#: ../src/main.c:393
+msgid "An http(s) address for checking internet connectivity"
+msgstr "ਇੰਟਰਨੈੱਟ ਕੁਨੈਕਸ਼ਨ ਜਾਂਚਣ ਲਈ http(s) ਐਡਰੈਸ"
+
+#: ../src/main.c:394
+msgid "The interval between connectivity checks (in seconds)"
+msgstr "ਕੁਨੈਕਟਵਿਟੀ ਚੈੱਕਕ ਰਨ ਲਈ ਅੰਤਰਾਲ (ਸਕਿੰਟਾਂ ਵਿੱਚ)"
+
+#: ../src/main.c:395
+msgid "The expected start of the response"
+msgstr "ਜਵਾਬ ਲਈ ਲੋੜੀਦੀ ਸ਼ੁਰੂਆਤ"
+
+#: ../src/main.c:395
+msgid "Bingo!"
+msgstr "ਵਾਹ!"
+
+#: ../src/main.c:400
+#, c-format
+msgid "GModules are not supported on your platform!\n"
+msgstr "ਤੁਹਾਡੇ ਪਲੇਟਫਾਰਮ ਲਈ GModules ਸਹਾਇਕ ਨਹੀਂ ਹਨ!\n"
+
+#: ../src/main.c:419
+msgid ""
+"NetworkManager monitors all network connections and automatically\n"
+"chooses the best connection to use.  It also allows the user to\n"
+"specify wireless access points which wireless cards in the computer\n"
+"should associate with."
+msgstr ""
+"ਨੈੱਟਵਰਕਮੈਨੇਜਰ ਸਭ ਨੈੱਟਵਰਕ ਕੁਨਕੈਸ਼ਨ ਦੀ ਨਿਗਰਾਨੀ ਕਰਨ ਅਤੇ ਵਰਤਣ ਲਈ\n"
+"ਸਭ ਤੋਂ ਵਧੀਆ ਦੀ ਚੋਣ ਆਪਣੇ-ਆਪ ਕਰ ਸਕਦਾ ਹੈ। ਇਹ ਯੂਜ਼ਰ ਨੂੰ ਬੇਤਾਰ ਅਸੈਸ\n"
+"ਪੁਆਇੰਟ ਦੇਣ ਲਈ ਵੀ ਸਹਾਇਕ ਹੈ, ਜਿਸ ਨਾਲ ਕੰਪਿਊਟਰ ਵਿਚਲੇ ਬੇਤਾਰ ਕਾਰਡ\n"
+"ਸਬੰਧਿਤ ਹੋਣੇ ਚਾਹੀਦੇ ਹਨ।"
+
+#: ../src/main.c:425
 #, c-format
 msgid "Invalid option.  Please use --help to see a list of valid options.\n"
 msgstr "ਗਲਤ ਚੋਣ। ਢੁੱਕਵੀਆਂ ਚੋਣਾਂ ਵੇਖਣ ਲਈ --help ਵਰਤੋਂ ਜੀ।\n"
 
-#: ../src/main.c:570
+#: ../src/main.c:435
+#, c-format
+#| msgid "Error: Could not connect to NetworkManager."
+msgid "You must be root to run NetworkManager!\n"
+msgstr "ਨੈੱਟਵਰਕਮੈਨੇਜਰ ਚਲਾਉਣ ਲਈ ਤੁਹਾਡਾ ਰੂਟ (root) ਹੋਣਾ ਲਾਜ਼ਮੀ ਹੈ!\n"
+
+#: ../src/main.c:456
+#, c-format
+#| msgid "Failed to set IV for encryption: %s / %s."
+msgid "Failed to read configuration: (%d) %s\n"
+msgstr "ਸੰਰਚਨਾ ਪੜ੍ਹਨ ਲਈ ਗਲਤੀ: (%d) %s\n"
+
+#: ../src/main.c:467
 #, 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:328
+#: ../src/main.c:474
+#, c-format
+msgid "State file %s parsing failed: (%d) %s\n"
+msgstr "ਹਾਲਤ ਫਾਇਲ %s ਪਾਰਸ ਕਰਨ ਲਈ ਫੇਲ੍ਹ: (%d) %s\n"
+
+#: ../src/main.c:491
+#, c-format
+msgid "Could not daemonize: %s [error %u]\n"
+msgstr "ਡੈਮਨ ਨਹੀਂ ਬਣਾਇਆ ਜਾ ਸਕਿਆ: %s [ਗਲਤੀ %u]\n"
+
+#: ../src/dhcp-manager/nm-dhcp-dhclient-utils.c:62
 msgid "# Created by NetworkManager\n"
 msgstr "#ਨੈੱਟਵਰਕ ਮੈਨੇਜਰ ਵਲੋਂ ਬਣਾਈ\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"
@@ -1720,51 +2704,255 @@ msgstr ""
 "#%s ਤੋਂ ਮਿਲਾਇਆ\n"
 "\n"
 
-#: ../src/dhcp-manager/nm-dhcp-manager.c:284
+#: ../src/dhcp-manager/nm-dhcp-manager.c:266
 msgid "no usable DHCP client could be found."
 msgstr "ਕੋਈ ਵਰਤੋਂਯੋਗ DHCP ਕਲਾਇਟ ਨਹੀਂ ਲੱਭਿਆ ਜਾ ਸਕਿਆ।"
 
-#: ../src/dhcp-manager/nm-dhcp-manager.c:293
+#: ../src/dhcp-manager/nm-dhcp-manager.c:275
 msgid "'dhclient' could be found."
 msgstr "'dhclient' ਲੱਭਿਆ ਜਾ ਸਕਿਆ।"
 
-#: ../src/dhcp-manager/nm-dhcp-manager.c:303
+#: ../src/dhcp-manager/nm-dhcp-manager.c:285
 msgid "'dhcpcd' could be found."
 msgstr "'dhcpcd' ਲੱਭਿਆ ਜਾ ਸਕਿਆ।"
 
-#: ../src/dhcp-manager/nm-dhcp-manager.c:311
+#: ../src/dhcp-manager/nm-dhcp-manager.c:293
 #, c-format
 msgid "unsupported DHCP client '%s'"
 msgstr "ਗੈਰਸਹਾਇਕ DHCP ਕਲਾਇਟ '%s'"
 
-#: ../src/logging/nm-logging.c:146
+#: ../src/dns-manager/nm-dns-manager.c:380
+msgid "NOTE: the libc resolver may not support more than 3 nameservers."
+msgstr "ਨੋਟ: libc ਰਿਜ਼ੋਲਵਰ ੩ ਤੋਂ ਵੱਧ ਨੇਮ-ਸਰਵਰ ਲਈ ਸਹਾਇਕ ਨਹੀਂ ਹੋ ਸਕਦਾ ਹੈ।"
+
+#: ../src/dns-manager/nm-dns-manager.c:382
+msgid "The nameservers listed below may not be recognized."
+msgstr "ਹੇਠਾਂ ਦਿੱਤੇ ਨੇਮ-ਸਰਵਰ ਪਛਾਣੇ ਨਹੀਂ ਜਾ ਸਕਦੇ।"
+
+#: ../src/logging/nm-logging.c:131
 #, c-format
 msgid "Unknown log level '%s'"
 msgstr "ਅਣਜਾਣ ਲਾਗ ਲੈਵਲ '%s'"
 
-#: ../src/logging/nm-logging.c:171
+#: ../src/logging/nm-logging.c:156
 #, c-format
 msgid "Unknown log domain '%s'"
 msgstr "ਅਣਜਾਣ ਲਾਗ ਡੋਮੇਨ '%s'"
 
-#: ../src/dns-manager/nm-dns-manager.c:384
-msgid "NOTE: the libc resolver may not support more than 3 nameservers."
-msgstr "ਨੋਟ: libc ਰਿਜ਼ੋਲਵਰ ੩ ਤੋਂ ਵੱਧ ਨੇਮ-ਸਰਵਰ ਲਈ ਸਹਾਇਕ ਨਹੀਂ ਹੋ ਸਕਦਾ ਹੈ।"
+#: ../src/modem-manager/nm-modem-cdma.c:281 ../src/nm-device-bt.c:351
+#, c-format
+#| msgid "connection failed"
+msgid "CDMA connection %d"
+msgstr "CDMA ਕੁਨੈਕਸ਼ਨ %d"
 
-#: ../src/dns-manager/nm-dns-manager.c:386
-msgid "The nameservers listed below may not be recognized."
-msgstr "ਹੇਠਾਂ ਦਿੱਤੇ ਨੇਮ-ਸਰਵਰ ਪਛਾਣੇ ਨਹੀਂ ਜਾ ਸਕਦੇ।"
+#: ../src/modem-manager/nm-modem-gsm.c:559 ../src/nm-device-bt.c:347
+#, c-format
+#| msgid "connection failed"
+msgid "GSM connection %d"
+msgstr "GSM ਕੁਨੈਕਸ਼ਨ %d"
+
+#: ../src/nm-device-bond.c:191
+#, c-format
+#| msgid "connection failed"
+msgid "Bond connection %d"
+msgstr "ਬੌਂਡ ਕੁਨੈਕਸ਼ਨ %d"
+
+#: ../src/nm-device-adsl.c:193
+#, c-format
+#| msgid "connection failed"
+msgid "ADSL connection %d"
+msgstr "ADSL ਕੁਨੈਕਸ਼ਨ %d"
+
+#: ../src/nm-device-bt.c:322
+#, c-format
+#| msgid "VPN connection failed"
+msgid "PAN connection %d"
+msgstr "PAN ਕੁਨੈਕਸ਼ਨ %d"
+
+#: ../src/nm-device-bt.c:355
+#, c-format
+#| msgid "VPN connection failed"
+msgid "DUN connection %d"
+msgstr "DUN ਕੁਨੈਕਸ਼ਨ %d"
+
+#: ../src/nm-device-ethernet.c:1328
+#, c-format
+#| msgid "VPN connection failed"
+msgid "PPPoE connection %d"
+msgstr "PPPoE ਕੁਨੈਕਸ਼ਨ %d"
+
+#: ../src/nm-device-ethernet.c:1328 ../src/settings/nm-settings-utils.c:50
+#, c-format
+#| msgid "Active connections"
+msgid "Wired connection %d"
+msgstr "ਤਾਰ ਵਾਲਾ ਕੁਨੈਕਸ਼ਨ %d"
+
+#: ../src/nm-device-infiniband.c:303
+#, c-format
+#| msgid "Cannot add VPN connection"
+msgid "InfiniBand connection %d"
+msgstr "ਇਫੀਂਬੈਂਡ ਕੁਨੈਕਸ਼ਨ %d"
+
+#: ../src/nm-device-olpc-mesh.c:303
+#, c-format
+msgid "Mesh %d"
+msgstr "ਮੈਸ਼ %d"
+
+#: ../src/nm-device-vlan.c:362
+#, c-format
+#| msgid "VPN connection failed"
+msgid "VLAN connection %d"
+msgstr "VLAN ਕੁਨੈਕਸ਼ਨ %d"
+
+#: ../src/nm-manager.c:662
+#, c-format
+#| msgid "VPN connection failed"
+msgid "VPN connection %d"
+msgstr "VPN ਕੁਨੈਕਸ਼ਨ %d"
+
+#: ../src/nm-netlink-monitor.c:148 ../src/nm-netlink-monitor.c:272
+#: ../src/nm-netlink-monitor.c:695
+#, c-format
+msgid "error processing netlink message: %s"
+msgstr "ਨੈੱਟਲਿੰਕ ਸੁਨੇਹੇ ਉੱਤੇ ਕਾਰਵਾਈ ਕਰਨ ਦੌਰਾਨ ਗਲਤੀ: %s"
+
+#: ../src/nm-netlink-monitor.c:251
+msgid "error occurred while waiting for data on socket"
+msgstr "ਸਾਕਟ ਉੱਤੇ ਡਾਟੇ ਦੀ ਉਡੀਕ ਕਰਨ ਦੌਰਾਨ ਗਲਤੀ"
+
+#: ../src/nm-netlink-monitor.c:296
+#, c-format
+msgid "unable to connect to netlink for monitoring link status: %s"
+msgstr "ਲਿੰਕ ਹਾਲਤ ਦੀ ਨਿਗਰਾਨੀ ਲਈ ਨੈੱਟਲਿੰਕ ਨਾਲ ਕੁਨੈਕਟ ਕਰਨ ਲਈ ਅਸਮਰੱਥ: %s"
+
+#: ../src/nm-netlink-monitor.c:307
+#, c-format
+msgid "unable to enable netlink handle credential passing: %s"
+msgstr "netlink ਹੈੱਡਲ ਸਨਦ ਪਾਸ ਕਰਨ ਲਈ ਅਸਮਰੱਥ: %s"
 
-#: ../src/settings/nm-default-wired-connection.c:157
+#: ../src/nm-netlink-monitor.c:330 ../src/nm-netlink-monitor.c:390
 #, c-format
-msgid "Auto %s"
-msgstr "ਆਟੋ %s"
+msgid "unable to allocate netlink handle for monitoring link status: %s"
+msgstr "ਲਿੰਕ ਹਾਲਤ ਦੀ ਨਿਗਰਾਨੀ ਲਈ ਨੈੱਟਲਿੰਕ ਜਾਰੀ ਕਰਨ ਲਈ ਅਸਮਰੱਥ: %s"
+
+#: ../src/nm-netlink-monitor.c:415
+#, c-format
+msgid "unable to allocate netlink link cache for monitoring link status: %s"
+msgstr "ਲਿੰਕ ਹਾਲਤ ਦੀ ਨਿਗਰਾਨੀ ਲਈ ਨੈੱਟਲਿੰਕ ਲਿੰਕ ਕੈਸ਼ ਜਾਰੀ ਕਰਨ ਲਈ ਅਸਮਰੱਥ: %s"
+
+#: ../src/nm-netlink-monitor.c:542
+#, c-format
+msgid "unable to join netlink group: %s"
+msgstr "netlink ਗਰੁੱਪ ਜੁਆਇੰਨ ਕਰਨ ਲਈ ਅਸਮਰੱਥ:: %s"
+
+#: ../src/nm-netlink-monitor.c:671 ../src/nm-netlink-monitor.c:684
+#, c-format
+msgid "error updating link cache: %s"
+msgstr "ਲਿੰਕ ਕੈਸ਼ ਅੱਪਡੇਟ ਕਰਨ ਦੌਰਾਨ ਗਲਤੀ: %s"
 
-#: ../system-settings/plugins/ifcfg-rh/reader.c:3412
-#: ../system-settings/plugins/ifnet/connection_parser.c:49
+#: ../src/settings/plugins/ifcfg-rh/reader.c:94
 msgid "System"
 msgstr "ਸਿਸਟਮ।"
 
+#: ../src/settings/plugins/ifcfg-rh/reader.c:3657
+msgid "Bond"
+msgstr "ਬੌਂਡ"
+
+#: ../test/nm-online.c:112
+#, c-format
+#| msgid "connecting"
+msgid "\rConnecting"
+msgstr "\rਕੁਨੈਕਟ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ"
+
+#: ../test/nm-online.c:143
+msgid "Time to wait for a connection, in seconds (default is 30)"
+msgstr "ਸਕਿੰਟ ਵਿੱਚ ਕੁਨੈਕਸ਼ਨ ਲਈ ਉਡੀਕ ਕਰਨ ਦਾ ਸਮਾਂ (ਮੂਲ 30 ਸਕਿੰਟ ਹੈ)"
+
+#: ../test/nm-online.c:144
+msgid "Exit immediately if NetworkManager is not running or connecting"
+msgstr ""
+"ਜੇ ਨੈਟਵਰਕਮੈਨੇਜਰ ਚੱਲ ਨਹੀਂ ਰਿਹਾ ਹੈ ਜਾਂ ਕੁਨੈਕਟ ਕਰ ਰਿਹਾ ਹੈ ਤਾਂ ਤੁਰੰਤ ਬੰਦ ਕਰੋ"
+
+#: ../test/nm-online.c:145
+msgid "Don't print anything"
+msgstr "ਕੁਝ ਵੀ ਪਰਿੰਟ ਨਾ ਕਰੋ"
+
+#: ../test/nm-online.c:163
+#| msgid "Error: Could not connect to NetworkManager."
+msgid "Waits for a successful connection in NetworkManager."
+msgstr "ਨੈੱਟਵਰਕਮੈਨੇਜਰ ਵਿੱਚ ਸਫ਼ਲ ਕੁਨੈਕਸ਼ਨ ਦੀ ਉਡੀਕ ਕੀਤੀ ਜਾ ਰਹੀ ਹੈ।"
+
+#: ../test/nm-online.c:169 ../test/nm-online.c:178
+#| msgid "Invalid option.  Please use --help to see a list of valid options.\n"
+msgid "Invalid option.  Please use --help to see a list of valid options."
+msgstr "ਗਲਤ ਚੋਣ। ਢੁੱਕਵੀਆਂ ਚੋਣਾਂ ਵੇਖਣ ਲਈ --help ਵਰਤੋਂ ਜੀ।"
+
+#~ msgid "SCOPE"
+#~ msgstr "SCOPE"
+
+#~ msgid "DBUS-SERVICE"
+#~ msgstr "DBUS-SERVICE"
+
+#~ msgid "system"
+#~ msgstr "ਸਿਸਟਮ"
+
+#~ msgid "user"
+#~ msgstr "ਯੂਜ਼ਰ"
+
+#~ msgid "System connections"
+#~ msgstr "ਸਿਸਟਮ ਕੁਨੈਕਸ਼ਨ"
+
+#~ msgid "User connections"
+#~ msgstr "ਯੂਜ਼ਰ ਕੁਨੈਕਸ਼ਨ"
+
+#~ msgid "state: %s\n"
+#~ msgstr "ਹਾਲਤ: %s\n"
+
+#~ msgid "Connection activated\n"
+#~ msgstr "ਕੁਨੈਕਸ਼ਨ ਚਾਲੂ ਕੀਤਾ\n"
+
+#~ msgid "state: %s (%d)\n"
+#~ msgstr "ਹਾਲਤ: %s (%d)\n"
+
+#~ msgid "Error: Obtaining active connection for '%s' failed."
+#~ msgstr "ਗਲਤੀ: '%s' ਲਈ ਚਾਲੂ ਕੁਨੈਕਸ਼ਨ ਲੈਣ ਲਈ ਫੇਲ੍ਹ ਹੈ।"
+
+#~ msgid "Active connection state: %s\n"
+#~ msgstr "ਚਾਲੂ ਕੁਨੈਕਸ਼ਨ ਹਾਲਤ: %s\n"
+
+#~ msgid "Active connection path: %s\n"
+#~ msgstr "ਚਾਲੂ ਕੁਨੈਕਸ਼ਨ ਪਾਥ: %s\n"
+
+#~ msgid "Error: Could not get user settings."
+#~ msgstr "ਗਲਤੀ: ਯੂਜ਼ਰ ਸੈਟਿੰਗ ਨਹੀਂ ਲਈ ਜਾ ਸਕੀ।"
+
+#~ msgid "IP4-SETTINGS"
+#~ msgstr "IP4-ਸੈਟਿੰਗ"
+
+#~ msgid "IP6-SETTINGS"
+#~ msgstr "IP6-ਸੈਟਿੰਗ"
+
+#~ msgid "PREFIX"
+#~ msgstr "ਪ੍ਰੀ-ਫਿਕਸ"
+
+#~ msgid "unknown)"
+#~ msgstr "ਅਣਜਾਣ)"
+
+#~ msgid "Device state: %d (%s)\n"
+#~ msgstr "ਜੰਤਰ ਹਾਲਤ: %d (%s)\n"
+
+#~ msgid "not set"
+#~ msgstr "ਸੈੱਟ ਨਹੀਂ ਹੈ"
+
+#~ msgid "Allow use of user-specific connections"
+#~ msgstr "ਖਾਸ ਯੂਜ਼ਰ ਕੁਨੈਕਸ਼ਨਾਂ ਦੀ ਵਰਤੋਂ ਮਨਜ਼ੂਰ"
+
+#~ msgid "System policy prevents use of user-specific connections"
+#~ msgstr "ਸਿਸਟਮ ਪਾਲਸੀ ਖਾਸ-ਯੂਜ਼ਰ ਕੁਨੈਕਸ਼ਨ ਵਰਤੋਂ ਤੋਂ ਰੋਕਦੀ ਹੈ"
+
+#~ msgid "Auto %s"
+#~ msgstr "ਆਟੋ %s"
+
 #~ msgid "Type"
 #~ msgstr "ਕਿਸਮ"
 
@@ -1926,9 +3114,6 @@ msgstr "ਸਿਸਟਮ।"
 #~ msgid "unable to connect to netlink: %s"
 #~ msgstr "netlink ਨਾਲ ਕੁਨੈਕਟ ਹੋਣ ਲਈ ਅਸਮਰੱਥ: %s"
 
-#~ msgid "Cannot add VPN connection"
-#~ msgstr "VPN ਕੁਨੈਕਸ਼ਨ ਜੋੜਿਆ ਨਹੀਂ ਜਾ ਸਕਦਾ ਹੈ"
-
 #~ msgid ""
 #~ "No suitable VPN software was found on your system. Contact your system "
 #~ "administrator."
diff --git a/po/ru.po b/po/ru.po
index a4ea1406..56f3fce3 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -8,961 +8,1424 @@
 # Yulia , 2010.
 # Sergey Isachenko aka Zabuldon , 2011.
 # Yuri Kozlov , 2011.
+# Stas Solovey , 2012.
+# Yuri Myasoedov , 2012.
+#
 msgid ""
 msgstr ""
 "Project-Id-Version: ru\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
 "product=NetworkManager&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2011-05-31 03:25+0000\n"
-"PO-Revision-Date: 2011-06-17 20:37+0400\n"
-"Last-Translator: Yuri Kozlov \n"
-"Language-Team: Russian \n"
+"POT-Creation-Date: 2012-10-22 15:26+0000\n"
+"PO-Revision-Date: 2012-10-24 00:17+0400\n"
+"Last-Translator: Yuri Myasoedov \n"
+"Language-Team: русский \n"
+"Language: ru\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bits\n"
-"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%"
-"10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
-"X-Launchpad-Export-Date: 2009-02-12 11:00+0000\n"
-"X-Generator: Lokalize 1.0\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
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-10-20 12:08+0000\n"
+"X-Generator: Gtranslator 2.91.5\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
+"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
+
+#: ../cli/src/common.c:32 ../cli/src/common.c:44 ../cli/src/common.c:52
+#: ../cli/src/common.c:63 ../cli/src/connections.c:128
+#: ../cli/src/connections.c:162
+msgid "GROUP"
+msgstr "ГРУППА"
+
+#. 0
+#: ../cli/src/common.c:33 ../cli/src/common.c:53
+msgid "ADDRESS"
+msgstr "АДРЕС"
+
+#. 1
+#: ../cli/src/common.c:34 ../cli/src/common.c:54
+msgid "ROUTE"
+msgstr "МАРШРУТ"
+
+#. 2
+#: ../cli/src/common.c:35 ../cli/src/common.c:55
+msgid "DNS"
+msgstr "DNS"
+
+#. 3
+#: ../cli/src/common.c:36 ../cli/src/common.c:56
+msgid "DOMAIN"
+msgstr "ДОМЕН"
+
+#. 4
+#: ../cli/src/common.c:37
+msgid "WINS"
+msgstr "WINS"
+
+#. 0
+#: ../cli/src/common.c:45 ../cli/src/common.c:64
+msgid "OPTION"
+msgstr "ПАРАМЕТР"
+
+#: ../cli/src/common.c:366
+msgid "unmanaged"
+msgstr "без управления"
+
+#: ../cli/src/common.c:368
+msgid "unavailable"
+msgstr "недоступен"
+
+#: ../cli/src/common.c:370 ../cli/src/network-manager.c:120
+msgid "disconnected"
+msgstr "отключено"
+
+#: ../cli/src/common.c:372
+msgid "connecting (prepare)"
+msgstr "подключение (подготовка)"
+
+#: ../cli/src/common.c:374
+msgid "connecting (configuring)"
+msgstr "подключение (настройка)"
+
+#: ../cli/src/common.c:376
+msgid "connecting (need authentication)"
+msgstr "подключение (требуется аутентификация)"
+
+#: ../cli/src/common.c:378
+msgid "connecting (getting IP configuration)"
+msgstr "подключение (получение конфигурации IP)"
+
+#: ../cli/src/common.c:380
+msgid "connecting (checking IP connectivity)"
+msgstr "подключение (проверка IP-подключения)"
+
+#: ../cli/src/common.c:382
+msgid "connecting (starting secondary connections)"
+msgstr "подключение (запуск второстепенных соединений)"
+
+#: ../cli/src/common.c:384 ../cli/src/network-manager.c:116
+msgid "connected"
+msgstr "подключено"
+
+#: ../cli/src/common.c:386 ../cli/src/connections.c:633
+msgid "deactivating"
+msgstr "деактивация"
+
+#: ../cli/src/common.c:388
+msgid "connection failed"
+msgstr "сбой соединения"
+
+#: ../cli/src/common.c:390 ../cli/src/connections.c:636
+#: ../cli/src/connections.c:659 ../cli/src/connections.c:1351
+#: ../cli/src/devices.c:645 ../cli/src/network-manager.c:123
+#: ../cli/src/network-manager.c:185 ../cli/src/network-manager.c:188
+#: ../cli/src/network-manager.c:197 ../cli/src/network-manager.c:257
+#: ../cli/src/network-manager.c:273 ../cli/src/network-manager.c:431
+#: ../cli/src/network-manager.c:486 ../cli/src/network-manager.c:524
+#: ../cli/src/network-manager.c:563 ../cli/src/settings.c:593
+#: ../cli/src/settings.c:621 ../cli/src/utils.c:531 ../src/main.c:457
+#: ../src/main.c:476
+msgid "unknown"
+msgstr "неизвестно"
+
+#: ../cli/src/common.c:399
+msgid "No reason given"
+msgstr "Причина не указана"
+
+#: ../cli/src/common.c:402
+msgid "Unknown error"
+msgstr "Неизвестная ошибка"
+
+#: ../cli/src/common.c:405
+msgid "Device is now managed"
+msgstr "Устройство обслуживается"
+
+#: ../cli/src/common.c:408
+msgid "Device is now unmanaged"
+msgstr "Устройство не обслуживается"
+
+#: ../cli/src/common.c:411
+msgid "The device could not be readied for configuration"
+msgstr "Устройство не позволяет чтение конфигурации"
+
+#: ../cli/src/common.c:414
+msgid ""
+"IP configuration could not be reserved (no available address, timeout, etc.)"
+msgstr ""
+"Конфигурация IP не может быть зарезервирована (отсутствует доступный адрес, "
+"истекло время ожидания и т.д.)"
+
+#: ../cli/src/common.c:417
+msgid "The IP configuration is no longer valid"
+msgstr "Конфигурация IP не актуальна"
+
+#: ../cli/src/common.c:420
+msgid "Secrets were required, but not provided"
+msgstr "Не предоставлена требуемая секретная информация"
+
+#: ../cli/src/common.c:423
+msgid "802.1X supplicant disconnected"
+msgstr "Заявитель 802.1X отключён"
+
+#: ../cli/src/common.c:426
+msgid "802.1X supplicant configuration failed"
+msgstr "Сбой конфигурации заявителя 802.1X"
+
+#: ../cli/src/common.c:429
+msgid "802.1X supplicant failed"
+msgstr "Сбой заявителя 802.1X"
+
+#: ../cli/src/common.c:432
+msgid "802.1X supplicant took too long to authenticate"
+msgstr "Превышено время ожидания при проверке подлинности заявителя 802.1X"
+
+#: ../cli/src/common.c:435
+msgid "PPP service failed to start"
+msgstr "Не удалось запустить службу PPP"
+
+#: ../cli/src/common.c:438
+msgid "PPP service disconnected"
+msgstr "Служба PPP отключена"
+
+#: ../cli/src/common.c:441
+msgid "PPP failed"
+msgstr "Сбой PPP"
+
+#: ../cli/src/common.c:444
+msgid "DHCP client failed to start"
+msgstr "Не удалось запустить клиент DHCP"
+
+#: ../cli/src/common.c:447
+msgid "DHCP client error"
+msgstr "Ошибка клиента DHCP"
+
+#: ../cli/src/common.c:450
+msgid "DHCP client failed"
+msgstr "Сбой клиента DHCP"
+
+#: ../cli/src/common.c:453
+msgid "Shared connection service failed to start"
+msgstr "Не удалось запустить службу общего подключения"
+
+#: ../cli/src/common.c:456
+msgid "Shared connection service failed"
+msgstr "Сбой службы общего подключения"
+
+#: ../cli/src/common.c:459
+msgid "AutoIP service failed to start"
+msgstr "Не удалось запустить службу AutoIP"
+
+#: ../cli/src/common.c:462
+msgid "AutoIP service error"
+msgstr "Сбой службы AutoIP"
+
+#: ../cli/src/common.c:465
+msgid "AutoIP service failed"
+msgstr "Ошибка службы AutoIP"
+
+#: ../cli/src/common.c:468
+msgid "The line is busy"
+msgstr "Линия занята"
+
+#: ../cli/src/common.c:471
+msgid "No dial tone"
+msgstr "Нет гудка"
+
+#: ../cli/src/common.c:474
+#, fuzzy
+msgid "No carrier could be established"
+msgstr "Не удалось установить несущую частоту"
+
+#: ../cli/src/common.c:477
+msgid "The dialing request timed out"
+msgstr "Истекло время ожидания набора номера"
+
+#: ../cli/src/common.c:480
+msgid "The dialing attempt failed"
+msgstr "Во время набора номера произошла ошибка"
+
+#: ../cli/src/common.c:483
+msgid "Modem initialization failed"
+msgstr "Не удалось инициализировать модем"
+
+#: ../cli/src/common.c:486
+msgid "Failed to select the specified APN"
+msgstr "Не удалось выбрать указанный APN"
+
+#: ../cli/src/common.c:489
+msgid "Not searching for networks"
+msgstr "Не выполнять поиск сетей"
+
+#: ../cli/src/common.c:492
+msgid "Network registration denied"
+msgstr "Регистрация сети запрещена"
+
+#: ../cli/src/common.c:495
+msgid "Network registration timed out"
+msgstr "Истекло время ожидания регистрации сети"
+
+#: ../cli/src/common.c:498
+msgid "Failed to register with the requested network"
+msgstr "Не удалось зарегистрироваться в запрошенной сети"
+
+#: ../cli/src/common.c:501
+msgid "PIN check failed"
+msgstr "PIN-код не прошёл проверку"
+
+#: ../cli/src/common.c:504
+msgid "Necessary firmware for the device may be missing"
+msgstr ""
+"Возможно для устройства требуется дополнительное программное обеспечение"
+
+#: ../cli/src/common.c:507
+msgid "The device was removed"
+msgstr "Устройство извлечено"
+
+#: ../cli/src/common.c:510
+msgid "NetworkManager went to sleep"
+msgstr "NetworkManager перешёл в спящий режим"
+
+#: ../cli/src/common.c:513
+msgid "The device's active connection disappeared"
+msgstr "Устройство потеряло используемое соединение"
+
+#: ../cli/src/common.c:516
+msgid "Device disconnected by user or client"
+msgstr "Устройство отключено пользователем или клиентом"
+
+#: ../cli/src/common.c:519
+msgid "Carrier/link changed"
+msgstr ""
+
+#: ../cli/src/common.c:522
+msgid "The device's existing connection was assumed"
+msgstr "Существующее соединение устройства принято"
+
+#: ../cli/src/common.c:525
+msgid "The supplicant is now available"
+msgstr "Доступен заявитель"
+
+#: ../cli/src/common.c:528
+msgid "The modem could not be found"
+msgstr "Не удалось обнаружить модем"
+
+#: ../cli/src/common.c:531
+msgid "The Bluetooth connection failed or timed out"
+msgstr "Время ожидания соединения по Bluetooth истекло или произошла ошибка"
+
+#: ../cli/src/common.c:534
+msgid "GSM Modem's SIM card not inserted"
+msgstr "Не вставлена SIM-карта GSM-модема"
+
+#: ../cli/src/common.c:537
+msgid "GSM Modem's SIM PIN required"
+msgstr "Требуется PIN-код к SIM-карте GSM-модема"
+
+#: ../cli/src/common.c:540
+msgid "GSM Modem's SIM PUK required"
+msgstr "Требуется PUK-код к SIM-карте GSM-модема"
+
+#: ../cli/src/common.c:543
+msgid "GSM Modem's SIM wrong"
+msgstr "Неверная SIM-карта GSM модема"
+
+#: ../cli/src/common.c:546
+msgid "InfiniBand device does not support connected mode"
+msgstr "Устройство InfiniBand не поддерживает режим соединения"
+
+#: ../cli/src/common.c:549
+msgid "A dependency of the connection failed"
+msgstr "Сбой зависимости соединения"
+
+#: ../cli/src/common.c:552
+msgid "A problem with the RFC 2684 Ethernet over ADSL bridge"
+msgstr "Ошибка RFC 2684 Ethernet с использованием моста ADSL"
+
+#: ../cli/src/common.c:555
+msgid "ModemManager is unavailable"
+msgstr "ModemManager недоступен"
+
+#: ../cli/src/common.c:558
+msgid "The Wi-Fi network could not be found"
+msgstr "Не удалось обнаружить сеть Wi-Fi"
+
+#: ../cli/src/common.c:561
+msgid "A secondary connection of the base connection failed"
+msgstr "Сбой вторичного подключения основого соединения"
+
+#: ../cli/src/common.c:564 ../cli/src/devices.c:294 ../cli/src/devices.c:310
+#: ../cli/src/devices.c:433 ../cli/src/devices.c:477
+msgid "Unknown"
+msgstr "Неизвестно"
+
+#. 0
+#. used only for 'GENERAL' group listing
+#: ../cli/src/connections.c:59 ../cli/src/connections.c:129
+#: ../cli/src/devices.c:107 ../cli/src/devices.c:131 ../cli/src/devices.c:141
+#: ../cli/src/devices.c:151 ../cli/src/devices.c:165 ../cli/src/devices.c:179
+#: ../cli/src/devices.c:201 ../cli/src/devices.c:217 ../cli/src/devices.c:226
 msgid "NAME"
 msgstr "ИМЯ"
 
 #. 0
-#: ../cli/src/connections.c:65 ../cli/src/connections.c:79
+#. 1
+#: ../cli/src/connections.c:60 ../cli/src/connections.c:130
 msgid "UUID"
 msgstr "UUID"
 
 #. 1
-#: ../cli/src/connections.c:66
-msgid "DEVICES"
-msgstr "УСТРОЙСТВА"
+#. 0
+#. 1
+#. 2
+#: ../cli/src/connections.c:61 ../cli/src/connections.c:163
+#: ../cli/src/devices.c:71 ../cli/src/devices.c:109 ../cli/src/devices.c:204
+msgid "TYPE"
+msgstr "ТИП"
 
 #. 2
-#: ../cli/src/connections.c:67
-msgid "DEFAULT"
-msgstr "ПО УМОЛЧАНИЮ"
+#: ../cli/src/connections.c:62
+msgid "TIMESTAMP"
+msgstr "МЕТКА ВРЕМЕНИ"
 
 #. 3
-#: ../cli/src/connections.c:68
-msgid "SPEC-OBJECT"
-msgstr "SPEC-OBJECT"
+#: ../cli/src/connections.c:63
+msgid "TIMESTAMP-REAL"
+msgstr "ДЕЙСТВ. МЕТКА ВРЕМЕНИ"
 
 #. 4
-#: ../cli/src/connections.c:69
-msgid "VPN"
-msgstr "VPN"
+#. 13
+#: ../cli/src/connections.c:64 ../cli/src/devices.c:121
+msgid "AUTOCONNECT"
+msgstr "АВТОПОДКЛЮЧЕНИЕ"
 
 #. 5
+#: ../cli/src/connections.c:65
+msgid "READONLY"
+msgstr "ТОЛЬКО ДЛЯ ЧТЕНИЯ"
+
 #. 6
+#. 8
 #. 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
+#: ../cli/src/connections.c:66 ../cli/src/connections.c:137
+#: ../cli/src/devices.c:73 ../cli/src/devices.c:191 ../cli/src/devices.c:207
 msgid "DBUS-PATH"
 msgstr "DBUS-PATH"
 
+#. 2
+#: ../cli/src/connections.c:131
+msgid "DEVICES"
+msgstr "УСТРОЙСТВА"
+
+#. 3
 #. 1
+#. 8
+#. 1
+#: ../cli/src/connections.c:132 ../cli/src/devices.c:72
+#: ../cli/src/devices.c:116 ../cli/src/network-manager.c:39
+msgid "STATE"
+msgstr "СОСТОЯНИЕ"
+
+#. 4
+#: ../cli/src/connections.c:133
+msgid "DEFAULT"
+msgstr "ПО УМОЛЧАНИЮ"
+
+#. 5
+#: ../cli/src/connections.c:134
+msgid "DEFAULT6"
+msgstr "ПО УМОЛЧАНИЮ 6"
+
+#. 6
+#: ../cli/src/connections.c:135
+msgid "SPEC-OBJECT"
+msgstr "SPEC-OBJECT"
+
+#. 7
+#. 1
+#: ../cli/src/connections.c:136 ../cli/src/connections.c:150
+msgid "VPN"
+msgstr "VPN"
+
+#. 9
+#: ../cli/src/connections.c:138
+msgid "CON-PATH"
+msgstr ""
+
+#. 10
+#: ../cli/src/connections.c:139
+msgid "ZONE"
+msgstr "ЗОНА"
+
+#. 11
+#: ../cli/src/connections.c:140
+msgid "MASTER-PATH"
+msgstr ""
+
+#: ../cli/src/connections.c:148 ../cli/src/devices.c:82
+msgid "GENERAL"
+msgstr "ОБЩИЕ"
+
 #. 0
+#: ../cli/src/connections.c:149
+msgid "IP"
+msgstr "IP"
+
 #. 1
-#. 2
-#: ../cli/src/connections.c:80 ../cli/src/devices.c:67
-#: ../cli/src/devices.c:103 ../cli/src/devices.c:227
-msgid "TYPE"
-msgstr "ТИП"
+#: ../cli/src/connections.c:164
+msgid "USERNAME"
+msgstr "ИМЯ_ПОЛЬЗОВАТЕЛЯ"
 
 #. 2
-#: ../cli/src/connections.c:81
-msgid "TIMESTAMP"
-msgstr "ВРЕМЕННАЯ МЕТКА"
+#: ../cli/src/connections.c:165
+msgid "GATEWAY"
+msgstr "ШЛЮЗ"
 
 #. 3
-#: ../cli/src/connections.c:82
-msgid "TIMESTAMP-REAL"
-msgstr "ДЕЙСТВ. ВРЕМЕННАЯ МЕТКА"
+#: ../cli/src/connections.c:166
+msgid "BANNER"
+msgstr ""
 
 #. 4
-#: ../cli/src/connections.c:83
-msgid "AUTOCONNECT"
-msgstr "АВТОПОДКЛЮЧЕНИЕ"
+#: ../cli/src/connections.c:167
+msgid "VPN-STATE"
+msgstr ""
 
 #. 5
-#: ../cli/src/connections.c:84
-msgid "READONLY"
-msgstr "ТОЛЬКО ДЛЯ ЧТЕНИЯ"
+#: ../cli/src/connections.c:168
+msgid "CFG"
+msgstr ""
 
-#: ../cli/src/connections.c:167
+#: ../cli/src/connections.c:190
 #, c-format
 msgid ""
 "Usage: nmcli con { COMMAND | help }\n"
-"  COMMAND := { list | status | up | down }\n"
+"  COMMAND := { list | status | up | down | delete }\n"
 "\n"
 "  list [id  | uuid ]\n"
-"  status\n"
-"  up id  | uuid  [iface ] [ap ] [nsp ] [--"
+"  status [id  | uuid  | path ]\n"
+"  up id  | uuid  [iface ] [ap ] [nsp ] [--"
 "nowait] [--timeout ]\n"
-"  up id  | uuid  [iface ] [ap ] [--nowait] [--timeout "
+"  up id  | uuid  [iface ] [ap ] [--nowait] [--timeout "
 "]\n"
 "  down id  | uuid \n"
+"  delete id  | uuid \n"
 msgstr ""
 "Использование: nmcli con { КОМАНДА | help }\n"
-"  КОМАНДА := { list | status | up | down }\n"
+"  КОМАНДЫ := { list | status | up | down | delete }\n"
 "\n"
-"   list [id  | uuid ]\n"
-"  status\n"
-"  up id  | uuid  [iface <интерфейс>] [ap <апп.адр.>] [nsp <имя>] [--"
-"nowait] [--timeout <ожидание>]\n"
-"  up id  | uuid  [iface <интерфейс>] [ap <апп.адр.>] [--nowait] [--"
-"timeout <ожидание>]\n"
-"  down id  | uuid \n"
+"  list (список) [id  | uuid ]\n"
+"  status (состояние) [id  | uuid  | path <расположение>]\n"
+"  up id  (задействовать) | uuid  [iface ] [ap ] [nsp "
+"<имя>] [--nowait] [--timeout <время ожидания>]\n"
+"  up id  (задействовать) | uuid  [iface ] [ap ] [--"
+"nowait] [--timeout <время ожидания>]\n"
+"  down id  (деактивировать) | uuid \n"
+"  delete id  (удалить id) | uuid \n"
 
-#: ../cli/src/connections.c:220 ../cli/src/connections.c:544
+#: ../cli/src/connections.c:249 ../cli/src/connections.c:609
 #, c-format
 msgid "Error: 'con list': %s"
 msgstr "Ошибка: «con list»: %s"
 
-#: ../cli/src/connections.c:222 ../cli/src/connections.c:546
+#: ../cli/src/connections.c:251 ../cli/src/connections.c:611
 #, c-format
 msgid "Error: 'con list': %s; allowed fields: %s"
 msgstr "Ошибка: «con list»: %s; разрешённые поля: %s"
 
-#: ../cli/src/connections.c:230
+#: ../cli/src/connections.c:259
 msgid "Connection details"
-msgstr "Сведения о соединении"
+msgstr "Информация о подключении"
 
-#: ../cli/src/connections.c:419
+#: ../cli/src/connections.c:484
 msgid "never"
 msgstr "никогда"
 
 #. "CAPABILITIES"
 #. Print header
 #. "WIFI-PROPERTIES"
-#: ../cli/src/connections.c:420 ../cli/src/connections.c:421
-#: ../cli/src/connections.c:599 ../cli/src/connections.c:601
-#: ../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
+#: ../cli/src/connections.c:485 ../cli/src/connections.c:486
+#: ../cli/src/connections.c:714 ../cli/src/connections.c:715
+#: ../cli/src/connections.c:717 ../cli/src/devices.c:441
+#: ../cli/src/devices.c:494 ../cli/src/devices.c:610 ../cli/src/devices.c:611
+#: ../cli/src/devices.c:612 ../cli/src/devices.c:644 ../cli/src/devices.c:671
+#: ../cli/src/devices.c:672 ../cli/src/devices.c:673 ../cli/src/devices.c:674
+#: ../cli/src/devices.c:675 ../cli/src/network-manager.c:267
+#: ../cli/src/settings.c:712 ../cli/src/settings.c:787
+#: ../cli/src/settings.c:907 ../cli/src/settings.c:1189
+#: ../cli/src/settings.c:1190 ../cli/src/settings.c:1192
+#: ../cli/src/settings.c:1194 ../cli/src/settings.c:1195
+#: ../cli/src/settings.c:1326 ../cli/src/settings.c:1327
+#: ../cli/src/settings.c:1328 ../cli/src/settings.c:1329
+#: ../cli/src/settings.c:1406 ../cli/src/settings.c:1407
+#: ../cli/src/settings.c:1408 ../cli/src/settings.c:1409
+#: ../cli/src/settings.c:1410 ../cli/src/settings.c:1411
+#: ../cli/src/settings.c:1412 ../cli/src/settings.c:1413
+#: ../cli/src/settings.c:1414 ../cli/src/settings.c:1415
+#: ../cli/src/settings.c:1416 ../cli/src/settings.c:1417
+#: ../cli/src/settings.c:1418 ../cli/src/settings.c:1489
 msgid "yes"
 msgstr "да"
 
-#: ../cli/src/connections.c:420 ../cli/src/connections.c:421
-#: ../cli/src/connections.c:599 ../cli/src/connections.c:601
-#: ../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
+#: ../cli/src/connections.c:485 ../cli/src/connections.c:486
+#: ../cli/src/connections.c:714 ../cli/src/connections.c:715
+#: ../cli/src/connections.c:717 ../cli/src/devices.c:441
+#: ../cli/src/devices.c:494 ../cli/src/devices.c:610 ../cli/src/devices.c:611
+#: ../cli/src/devices.c:612 ../cli/src/devices.c:644 ../cli/src/devices.c:671
+#: ../cli/src/devices.c:672 ../cli/src/devices.c:673 ../cli/src/devices.c:674
+#: ../cli/src/devices.c:675 ../cli/src/network-manager.c:269
+#: ../cli/src/settings.c:712 ../cli/src/settings.c:714
+#: ../cli/src/settings.c:787 ../cli/src/settings.c:907
+#: ../cli/src/settings.c:1189 ../cli/src/settings.c:1190
+#: ../cli/src/settings.c:1192 ../cli/src/settings.c:1194
+#: ../cli/src/settings.c:1195 ../cli/src/settings.c:1326
+#: ../cli/src/settings.c:1327 ../cli/src/settings.c:1328
+#: ../cli/src/settings.c:1329 ../cli/src/settings.c:1406
+#: ../cli/src/settings.c:1407 ../cli/src/settings.c:1408
+#: ../cli/src/settings.c:1409 ../cli/src/settings.c:1410
+#: ../cli/src/settings.c:1411 ../cli/src/settings.c:1412
+#: ../cli/src/settings.c:1413 ../cli/src/settings.c:1414
+#: ../cli/src/settings.c:1415 ../cli/src/settings.c:1416
+#: ../cli/src/settings.c:1417 ../cli/src/settings.c:1418
+#: ../cli/src/settings.c:1489
 msgid "no"
 msgstr "нет"
 
-#: ../cli/src/connections.c:495
+#: ../cli/src/connections.c:560
 msgid "Connection list"
 msgstr "Список подключений"
 
-#: ../cli/src/connections.c:508 ../cli/src/connections.c:1380
-#: ../cli/src/connections.c:1395 ../cli/src/connections.c:1404
-#: ../cli/src/connections.c:1414 ../cli/src/connections.c:1426
-#: ../cli/src/connections.c:1521 ../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
+#: ../cli/src/connections.c:573 ../cli/src/connections.c:1110
+#: ../cli/src/connections.c:1648 ../cli/src/connections.c:1663
+#: ../cli/src/connections.c:1672 ../cli/src/connections.c:1682
+#: ../cli/src/connections.c:1694 ../cli/src/connections.c:1802
+#: ../cli/src/connections.c:1904 ../cli/src/devices.c:1122
+#: ../cli/src/devices.c:1132 ../cli/src/devices.c:1250
+#: ../cli/src/devices.c:1258 ../cli/src/devices.c:1622
+#: ../cli/src/devices.c:1629 ../cli/src/devices.c:1643
+#: ../cli/src/devices.c:1650 ../cli/src/devices.c:1667
+#: ../cli/src/devices.c:1678 ../cli/src/devices.c:1899
+#: ../cli/src/devices.c:1906
 #, c-format
 msgid "Error: %s argument is missing."
 msgstr "Ошибка: отсутствует аргумент %s."
 
-#: ../cli/src/connections.c:521
+#: ../cli/src/connections.c:586
 #, c-format
 msgid "Error: %s - no such connection."
 msgstr "Ошибка: неизвестное подключение %s."
 
-#: ../cli/src/connections.c:527 ../cli/src/connections.c:1439
-#: ../cli/src/connections.c:1538 ../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
+#: ../cli/src/connections.c:592 ../cli/src/connections.c:1707
+#: ../cli/src/connections.c:1819 ../cli/src/connections.c:1911
+#: ../cli/src/devices.c:906 ../cli/src/devices.c:986 ../cli/src/devices.c:1146
+#: ../cli/src/devices.c:1264 ../cli/src/devices.c:1691
+#: ../cli/src/devices.c:1912
 #, c-format
 msgid "Unknown parameter: %s\n"
 msgstr "Неизвестный параметр: %s\n"
 
-#: ../cli/src/connections.c:536
+#: ../cli/src/connections.c:601
 #, c-format
 msgid "Error: no valid parameter specified."
 msgstr "Ошибка: указан недопустимый параметр."
 
-#: ../cli/src/connections.c:551 ../cli/src/connections.c:1629
-#: ../cli/src/devices.c:1755 ../cli/src/network-manager.c:463
+#: ../cli/src/connections.c:616 ../cli/src/connections.c:2004
+#: ../cli/src/devices.c:2120 ../cli/src/network-manager.c:596
 #, c-format
 msgid "Error: %s."
 msgstr "Ошибка: %s."
 
-#: ../cli/src/connections.c:639
+#: ../cli/src/connections.c:629
+msgid "activating"
+msgstr "активация"
+
+#: ../cli/src/connections.c:631
+msgid "activated"
+msgstr "активно"
+
+#: ../cli/src/connections.c:645
+msgid "VPN connecting (prepare)"
+msgstr "Подключение VPN (подготовка)"
+
+#: ../cli/src/connections.c:647
+msgid "VPN connecting (need authentication)"
+msgstr "Подключение VPN (требуется аутентификация)"
+
+#: ../cli/src/connections.c:649
+msgid "VPN connecting"
+msgstr "Подключение VPN"
+
+#: ../cli/src/connections.c:651
+msgid "VPN connecting (getting IP configuration)"
+msgstr "Подключение VPN (получение конфигурации IP)"
+
+#: ../cli/src/connections.c:653
+msgid "VPN connected"
+msgstr "VPN подключён"
+
+#: ../cli/src/connections.c:655
+msgid "VPN connection failed"
+msgstr "Сбой подключения VPN"
+
+#: ../cli/src/connections.c:657
+msgid "VPN disconnected"
+msgstr "VPN отключён"
+
+#: ../cli/src/connections.c:710 ../cli/src/connections.c:720
+msgid "N/A"
+msgstr "Н/Д"
+
+#: ../cli/src/connections.c:914 ../cli/src/connections.c:1138
 #, c-format
 msgid "Error: 'con status': %s"
 msgstr "Ошибка: «con status»: %s"
 
-#: ../cli/src/connections.c:641
+#: ../cli/src/connections.c:916 ../cli/src/connections.c:1140
 #, c-format
 msgid "Error: 'con status': %s; allowed fields: %s"
 msgstr "Ошибка: «con status»: %s; разрешённые поля: %s"
 
-#: ../cli/src/connections.c:649 ../cli/src/connections.c:1454
-#: ../cli/src/connections.c:1553 ../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
+#: ../cli/src/connections.c:924
+msgid "Active connection details"
+msgstr "Сведения об используемом соединении"
+
+#: ../cli/src/connections.c:1060 ../cli/src/connections.c:1722
+#: ../cli/src/connections.c:1834 ../cli/src/connections.c:1925
+#: ../cli/src/devices.c:933 ../cli/src/devices.c:995 ../cli/src/devices.c:1161
+#: ../cli/src/devices.c:1294 ../cli/src/devices.c:1713
+#: ../cli/src/devices.c:1941 ../cli/src/network-manager.c:311
 #, c-format
 msgid "Error: Can't find out if NetworkManager is running: %s."
 msgstr "Ошибка: не удалось проверить запущен ли NetworkManager: %s."
 
-#: ../cli/src/connections.c:653 ../cli/src/connections.c:1458
-#: ../cli/src/connections.c:1557 ../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
+#: ../cli/src/connections.c:1064 ../cli/src/connections.c:1726
+#: ../cli/src/connections.c:1838 ../cli/src/connections.c:1929
+#: ../cli/src/devices.c:937 ../cli/src/devices.c:999 ../cli/src/devices.c:1165
+#: ../cli/src/devices.c:1298 ../cli/src/devices.c:1717
+#: ../cli/src/devices.c:1945 ../cli/src/network-manager.c:315
 #, c-format
 msgid "Error: NetworkManager is not running."
 msgstr "Ошибка: NetworkManager не запущен."
 
-#: ../cli/src/connections.c:661
+#: ../cli/src/connections.c:1096
 msgid "Active connections"
-msgstr "Активные соединения"
+msgstr "Используемые соединения"
 
-#: ../cli/src/connections.c:1097
+#: ../cli/src/connections.c:1121
 #, c-format
-msgid "no active connection on device '%s'"
-msgstr "нет активных соединений на устройстве «%s»"
+msgid "Error: '%s' is not an active connection."
+msgstr "Ошибка: «%s» не является активным соединением."
+
+#: ../cli/src/connections.c:1126
+#, c-format
+msgid "Error: unknown parameter: %s"
+msgstr "Ошибка: неизвестный параметр: %s"
 
-#: ../cli/src/connections.c:1105
+#: ../cli/src/connections.c:1233
 #, c-format
+msgid "no active connection on device '%s'"
+msgstr "на устройстве «%s» нет активных соединений"
+
+#: ../cli/src/connections.c:1241
 msgid "no active connection or device"
-msgstr "нет активного соединения или устройства"
+msgstr "на устройстве нет активных соединений"
 
-#: ../cli/src/connections.c:1176
+#: ../cli/src/connections.c:1312
 #, c-format
 msgid "device '%s' not compatible with connection '%s'"
 msgstr "устройство «%s» несовместимо с соединением «%s»"
 
-#: ../cli/src/connections.c:1178
+#: ../cli/src/connections.c:1315
 #, c-format
 msgid "no device found for connection '%s'"
 msgstr "не найдено устройство для соединения «%s»"
 
-#: ../cli/src/connections.c:1189
-msgid "activating"
-msgstr "активация"
-
-#: ../cli/src/connections.c:1191
-msgid "activated"
-msgstr "активно"
-
-#: ../cli/src/connections.c:1193 ../cli/src/devices.c:304
-msgid "deactivating"
-msgstr "деактивация"
-
-#: ../cli/src/connections.c:1196 ../cli/src/connections.c:1219
-#: ../cli/src/connections.c:1252 ../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:192 ../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:1205
-msgid "VPN connecting (prepare)"
-msgstr "Подключение VPN (подготовка)"
-
-#: ../cli/src/connections.c:1207
-msgid "VPN connecting (need authentication)"
-msgstr "Подключение VPN (требуется аутентификация)"
-
-#: ../cli/src/connections.c:1209
-msgid "VPN connecting"
-msgstr "Подключение VPN"
-
-#: ../cli/src/connections.c:1211
-msgid "VPN connecting (getting IP configuration)"
-msgstr "Подключение VPN (получение настроек IP)"
-
-#: ../cli/src/connections.c:1213
-msgid "VPN connected"
-msgstr "VPN подключён"
-
-#: ../cli/src/connections.c:1215
-msgid "VPN connection failed"
-msgstr "Сбой подключения VPN"
-
-#: ../cli/src/connections.c:1217
-msgid "VPN disconnected"
-msgstr "VPN отключён"
-
-#: ../cli/src/connections.c:1228
+#: ../cli/src/connections.c:1327
 msgid "unknown reason"
 msgstr "неизвестная причина"
 
-#: ../cli/src/connections.c:1230
+#: ../cli/src/connections.c:1329
 msgid "none"
 msgstr "нет"
 
-#: ../cli/src/connections.c:1232
+#: ../cli/src/connections.c:1331
 msgid "the user was disconnected"
 msgstr "пользователь был отключён"
 
-#: ../cli/src/connections.c:1234
+#: ../cli/src/connections.c:1333
 msgid "the base network connection was interrupted"
 msgstr "основное соединение с сетью было разорвано"
 
-#: ../cli/src/connections.c:1236
+#: ../cli/src/connections.c:1335
 msgid "the VPN service stopped unexpectedly"
 msgstr "служба VPN внезапно прекратила работу"
 
-#: ../cli/src/connections.c:1238
+#: ../cli/src/connections.c:1337
 msgid "the VPN service returned invalid configuration"
 msgstr "служба VPN вернула недопустимую конфигурацию"
 
-#: ../cli/src/connections.c:1240
+#: ../cli/src/connections.c:1339
 msgid "the connection attempt timed out"
 msgstr "время ожидания соединения истекло"
 
-#: ../cli/src/connections.c:1242
+#: ../cli/src/connections.c:1341
 msgid "the VPN service did not start in time"
 msgstr "служба VPN не была запущена вовремя"
 
-#: ../cli/src/connections.c:1244
+#: ../cli/src/connections.c:1343
 msgid "the VPN service failed to start"
 msgstr "не удалось запустить службу VPN"
 
-#: ../cli/src/connections.c:1246
+#: ../cli/src/connections.c:1345
 msgid "no valid VPN secrets"
 msgstr "нет верных секретов VPN"
 
-#: ../cli/src/connections.c:1248
+#: ../cli/src/connections.c:1347
 msgid "invalid VPN secrets"
 msgstr "неверные секреты VPN"
 
-#: ../cli/src/connections.c:1250
+#: ../cli/src/connections.c:1349
 msgid "the connection was removed"
 msgstr "соединение удалено"
 
-#: ../cli/src/connections.c:1264
+#: ../cli/src/connections.c:1366 ../cli/src/connections.c:1571
 #, c-format
-msgid "state: %s\n"
-msgstr "состояние: %s\n"
+msgid "Connection successfully activated (D-Bus active path: %s)\n"
+msgstr "Соединение успешно активировано (адрес действующего D-Bus: %s)\n"
 
-#: ../cli/src/connections.c:1267 ../cli/src/connections.c:1293
-#, c-format
-msgid "Connection activated\n"
-msgstr "Соединение активно\n"
-
-#: ../cli/src/connections.c:1270
+#. Active connection failed and dissapeared, quit.
+#: ../cli/src/connections.c:1371 ../cli/src/connections.c:1472
 #, c-format
 msgid "Error: Connection activation failed."
 msgstr "Ошибка: сбой активации соединения."
 
-#: ../cli/src/connections.c:1289
+#: ../cli/src/connections.c:1396
 #, c-format
-msgid "state: %s (%d)\n"
-msgstr "состояние: %s (%d)\n"
+msgid "VPN connection successfully activated (D-Bus active path: %s)\n"
+msgstr "VPN-соединение успешно установлено (адрес действующего D-Bus: %s)\n"
 
-#: ../cli/src/connections.c:1299
+#: ../cli/src/connections.c:1404
 #, c-format
 msgid "Error: Connection activation failed: %s."
 msgstr "Ошибка: сбой активации соединения: %s."
 
-#: ../cli/src/connections.c:1316 ../cli/src/devices.c:1136
+#: ../cli/src/connections.c:1501 ../cli/src/devices.c:1055
 #, c-format
 msgid "Error: Timeout %d sec expired."
-msgstr "Ошибка: превышено время ожидания — %d секунд."
+msgstr "Ошибка: превышено время ожидания (%d с)."
 
-#: ../cli/src/connections.c:1329
+#: ../cli/src/connections.c:1562
 #, c-format
 msgid "Error: Connection activation failed: %s"
 msgstr "Ошибка: сбой активации соединения: %s"
 
-#: ../cli/src/connections.c:1335
-#, c-format
-msgid "Active connection state: %s\n"
-msgstr "Состояние активного соединения: %s\n"
-
-#: ../cli/src/connections.c:1336
-#, c-format
-msgid "Active connection path: %s\n"
-msgstr "Путь активного соединения: %s\n"
-
-#: ../cli/src/connections.c:1388 ../cli/src/connections.c:1529
+#: ../cli/src/connections.c:1656 ../cli/src/connections.c:1810
+#: ../cli/src/connections.c:1938
 #, c-format
 msgid "Error: Unknown connection: %s."
 msgstr "Ошибка: неизвестное соединение: %s."
 
-#: ../cli/src/connections.c:1434 ../cli/src/devices.c:1208
+#: ../cli/src/connections.c:1702 ../cli/src/devices.c:1140
+#: ../cli/src/devices.c:1686
 #, c-format
 msgid "Error: timeout value '%s' is not valid."
 msgstr "Ошибка: недопустимое значение ожидания: «%s»."
 
-#: ../cli/src/connections.c:1447 ../cli/src/connections.c:1546
+#: ../cli/src/connections.c:1715 ../cli/src/connections.c:1827
+#: ../cli/src/connections.c:1918
 #, c-format
 msgid "Error: id or uuid has to be specified."
-msgstr "Ошибка: необходимо указать id или uuid."
+msgstr "Ошибка: необходимо указать ID или UUID."
 
-#: ../cli/src/connections.c:1475
+#: ../cli/src/connections.c:1747
 #, c-format
 msgid "Error: No suitable device found: %s."
 msgstr "Ошибка: подходящее устройство не найдено: %s."
 
-#: ../cli/src/connections.c:1477
+#: ../cli/src/connections.c:1749
 #, c-format
 msgid "Error: No suitable device found."
 msgstr "Ошибка: подходящее устройство не найдено."
 
-#: ../cli/src/connections.c:1582
+#: ../cli/src/connections.c:1863
 #, c-format
 msgid "Warning: Connection not active\n"
-msgstr "Предупреждение: соединение не активно\n"
+msgstr "Предупреждение: неактивное соединение\n"
+
+#: ../cli/src/connections.c:1877
+#, c-format
+msgid "Error: Connection deletion failed: %s"
+msgstr "Ошибка: сбой удаления соединения: %s"
 
-#: ../cli/src/connections.c:1620
+#: ../cli/src/connections.c:1995
 #, c-format
 msgid "Error: 'con' command '%s' is not valid."
 msgstr "Ошибка: недопустимая команда «con»: «%s»"
 
-#: ../cli/src/connections.c:1685
+#: ../cli/src/connections.c:2063
 #, c-format
 msgid "Error: could not connect to D-Bus."
 msgstr "Ошибка: не удалось подключиться к D-Bus."
 
-#: ../cli/src/connections.c:1692
+#: ../cli/src/connections.c:2071
 #, c-format
 msgid "Error: Could not get system settings."
-msgstr "Ошибка: не удалось получить системные настройки."
+msgstr "Ошибка: не удалось получить системные параметры."
 
-#: ../cli/src/connections.c:1702
+#: ../cli/src/connections.c:2081
 #, c-format
 msgid "Error: Can't obtain connections: settings service is not running."
-msgstr "Ошибка: не удалось получить подключение, службы настроек не запущена."
+msgstr "Ошибка: не удалось получить соединения: служба параметров не запущена."
 
 #. 0
 #. 9
 #. 3
-#: ../cli/src/devices.c:66 ../cli/src/devices.c:102 ../cli/src/devices.c:212
-#: ../cli/src/devices.c:228
+#: ../cli/src/devices.c:70 ../cli/src/devices.c:108 ../cli/src/devices.c:189
+#: ../cli/src/devices.c:205
 msgid "DEVICE"
 msgstr "УСТРОЙСТВО"
 
-#. 1
-#. 4
-#. 1
-#: ../cli/src/devices.c:68 ../cli/src/devices.c:106
-#: ../cli/src/network-manager.c:39
-msgid "STATE"
-msgstr "СОСТОЯНИЕ"
-
-#: ../cli/src/devices.c:78
-msgid "GENERAL"
-msgstr "ОБЩИЕ"
-
 #. 0
-#: ../cli/src/devices.c:79
+#: ../cli/src/devices.c:83
 msgid "CAPABILITIES"
 msgstr "ВОЗМОЖНОСТИ"
 
 #. 1
-#: ../cli/src/devices.c:80
+#: ../cli/src/devices.c:84
 msgid "WIFI-PROPERTIES"
 msgstr "СВОЙСТВА WIFI"
 
 #. 2
-#: ../cli/src/devices.c:81
+#: ../cli/src/devices.c:85 ../cli/src/devices.c:431
 msgid "AP"
-msgstr "ТД"
+msgstr "ТОЧКА ДОСТУПА"
 
 #. 3
-#: ../cli/src/devices.c:82
+#: ../cli/src/devices.c:86
 msgid "WIRED-PROPERTIES"
 msgstr "СВОЙСТВА ПРОВОДНОГО СОЕДИНЕНИЯ"
 
 #. 4
-#: ../cli/src/devices.c:83
+#: ../cli/src/devices.c:87
 msgid "WIMAX-PROPERTIES"
 msgstr "СВОЙСТВА WIMAX"
 
 #. 5
 #. 0
-#: ../cli/src/devices.c:84 ../cli/src/devices.c:225
+#: ../cli/src/devices.c:88 ../cli/src/devices.c:202
 msgid "NSP"
 msgstr "NSP"
 
 #. 6
-#: ../cli/src/devices.c:85
-msgid "IP4-SETTINGS"
-msgstr "ПАРАМЕТРЫ IP4"
+#: ../cli/src/devices.c:89
+msgid "IP4"
+msgstr "IP4"
 
 #. 7
-#: ../cli/src/devices.c:86
-msgid "IP4-DNS"
-msgstr "IP4-DNS"
+#: ../cli/src/devices.c:90
+msgid "DHCP4"
+msgstr "DHCP4"
 
 #. 8
-#: ../cli/src/devices.c:87
-msgid "IP6-SETTINGS"
-msgstr "ПАРАМЕТРЫ IP6"
+#: ../cli/src/devices.c:91
+msgid "IP6"
+msgstr "IP6"
 
 #. 9
-#: ../cli/src/devices.c:88
-msgid "IP6-DNS"
-msgstr "IP6-DNS"
+#: ../cli/src/devices.c:92
+msgid "DHCP6"
+msgstr "DHCP6"
+
+#. 10
+#: ../cli/src/devices.c:93
+msgid "BOND"
+msgstr ""
+
+#. 11
+#: ../cli/src/devices.c:94
+msgid "VLAN"
+msgstr ""
 
 #. 2
-#: ../cli/src/devices.c:104
+#: ../cli/src/devices.c:110
+msgid "VENDOR"
+msgstr "ПОСТАВЩИК"
+
+#. 3
+#: ../cli/src/devices.c:111
+msgid "PRODUCT"
+msgstr "ПРОДУКТ"
+
+#. 4
+#: ../cli/src/devices.c:112
 msgid "DRIVER"
 msgstr "ДРАЙВЕР"
 
-#. 3
-#: ../cli/src/devices.c:105
+#. 5
+#: ../cli/src/devices.c:113
+msgid "DRIVER-VERSION"
+msgstr "ВЕРСИЯ ДРАЙВЕРА"
+
+#. 6
+#: ../cli/src/devices.c:114
+msgid "FIRMWARE-VERSION"
+msgstr "ВЕРСИЯ ПРОШИВКИ"
+
+#. 7
+#: ../cli/src/devices.c:115
 msgid "HWADDR"
-msgstr "АПП.АДРЕС"
+msgstr "АППАРАТНЫЙ АДРЕС"
+
+#. 9
+#: ../cli/src/devices.c:117
+msgid "REASON"
+msgstr "ПРИЧИНА"
+
+#. 10
+#: ../cli/src/devices.c:118
+msgid "UDI"
+msgstr "UDI"
+
+#. 11
+#: ../cli/src/devices.c:119
+msgid "IP-IFACE"
+msgstr ""
+
+#. 12
+#: ../cli/src/devices.c:120
+msgid "NM-MANAGED"
+msgstr ""
+
+#. 14
+#: ../cli/src/devices.c:122
+msgid "FIRMWARE-MISSING"
+msgstr "ТРЕБУЕТСЯ ПРОШИВКА"
+
+#. 15
+#: ../cli/src/devices.c:123
+msgid "CONNECTION"
+msgstr "СОЕДИНЕНИЕ"
 
 #. 0
-#: ../cli/src/devices.c:115
+#: ../cli/src/devices.c:132
 msgid "CARRIER-DETECT"
 msgstr "ОПРЕД.НЕСУЩЕЙ"
 
 #. 1
-#: ../cli/src/devices.c:116
+#: ../cli/src/devices.c:133
 msgid "SPEED"
 msgstr "СКОРОСТЬ"
 
 #. 0
-#: ../cli/src/devices.c:125
+#: ../cli/src/devices.c:142
 msgid "CARRIER"
 msgstr "НЕСУЩАЯ"
 
 #. 0
-#: ../cli/src/devices.c:135
+#: ../cli/src/devices.c:152
 msgid "WEP"
 msgstr "WEP"
 
 #. 1
-#: ../cli/src/devices.c:136
+#: ../cli/src/devices.c:153
 msgid "WPA"
 msgstr "WPA"
 
 #. 2
-#: ../cli/src/devices.c:137
+#: ../cli/src/devices.c:154
 msgid "WPA2"
 msgstr "WPA2"
 
 #. 3
-#: ../cli/src/devices.c:138
+#: ../cli/src/devices.c:155
 msgid "TKIP"
 msgstr "TKIP"
 
 #. 4
-#: ../cli/src/devices.c:139
+#: ../cli/src/devices.c:156
 msgid "CCMP"
 msgstr "CCMP"
 
 #. 0
-#: ../cli/src/devices.c:149
+#: ../cli/src/devices.c:166
 msgid "CTR-FREQ"
 msgstr "CTR-FREQ"
 
 #. 1
-#: ../cli/src/devices.c:150
+#: ../cli/src/devices.c:167
 msgid "RSSI"
 msgstr "RSSI"
 
 #. 2
-#: ../cli/src/devices.c:151
+#: ../cli/src/devices.c:168
 msgid "CINR"
 msgstr "CINR"
 
 #. 3
-#: ../cli/src/devices.c:152
+#: ../cli/src/devices.c:169
 msgid "TX-POW"
 msgstr "TX-POW"
 
 #. 4
-#: ../cli/src/devices.c:153
+#: ../cli/src/devices.c:170
 msgid "BSID"
 msgstr "BSID"
 
 #. 0
-#: ../cli/src/devices.c:163 ../cli/src/devices.c:174
-msgid "ADDRESS"
-msgstr "АДРЕС"
-
-#. 1
-#: ../cli/src/devices.c:164 ../cli/src/devices.c:175
-msgid "PREFIX"
-msgstr "ПРЕФИКС"
-
-#. 2
-#: ../cli/src/devices.c:165 ../cli/src/devices.c:176
-msgid "GATEWAY"
-msgstr "ШЛЮЗ"
-
-#. 0
-#: ../cli/src/devices.c:185 ../cli/src/devices.c:194
-msgid "DNS"
-msgstr "DNS"
-
-#. 0
-#: ../cli/src/devices.c:203
+#: ../cli/src/devices.c:180
 msgid "SSID"
 msgstr "SSID"
 
 #. 1
-#: ../cli/src/devices.c:204
+#: ../cli/src/devices.c:181
 msgid "BSSID"
 msgstr "BSSID"
 
 #. 2
-#: ../cli/src/devices.c:205
+#: ../cli/src/devices.c:182
 msgid "MODE"
 msgstr "РЕЖИМ"
 
 #. 3
-#: ../cli/src/devices.c:206
+#: ../cli/src/devices.c:183
 msgid "FREQ"
 msgstr "ЧАСТОТА"
 
 #. 4
-#: ../cli/src/devices.c:207
+#: ../cli/src/devices.c:184
 msgid "RATE"
 msgstr "СКОРОСТЬ"
 
 #. 5
 #. 1
-#: ../cli/src/devices.c:208 ../cli/src/devices.c:226
+#: ../cli/src/devices.c:185 ../cli/src/devices.c:203
 msgid "SIGNAL"
 msgstr "СИГНАЛ"
 
 #. 6
-#: ../cli/src/devices.c:209
+#: ../cli/src/devices.c:186
 msgid "SECURITY"
 msgstr "ЗАЩИТА"
 
 #. 7
-#: ../cli/src/devices.c:210
+#: ../cli/src/devices.c:187
 msgid "WPA-FLAGS"
 msgstr "ФЛАГИ WPA"
 
-#. 8
-#: ../cli/src/devices.c:211
-msgid "RSN-FLAGS"
-msgstr "ФЛАГИ RSN"
-
-#. 10
-#. 4
-#: ../cli/src/devices.c:213 ../cli/src/devices.c:229
-msgid "ACTIVE"
-msgstr "АКТИВЕН"
-
-#: ../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 ]\n"
-"  disconnect iface  [--nowait] [--timeout ]\n"
-"  wifi [list [iface ] [hwaddr ]]\n"
-"  wimax [list [iface ] [nsp ]]\n"
-"\n"
-msgstr ""
-"Использование: nmcli dev { КОМАНДА | help }\n"
-"\n"
-"  КОМАНДА := { status | list | disconnect | wifi | wimax }\n"
-"\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:284
-msgid "unmanaged"
-msgstr "без управления"
-
-#: ../cli/src/devices.c:286
-msgid "unavailable"
-msgstr "недоступен"
-
-#: ../cli/src/devices.c:288 ../cli/src/network-manager.c:115
-msgid "disconnected"
-msgstr "отключено"
-
-#: ../cli/src/devices.c:290
-msgid "connecting (prepare)"
-msgstr "подключение (подготовка)"
-
-#: ../cli/src/devices.c:292
-msgid "connecting (configuring)"
-msgstr "подключение (настройка)"
-
-#: ../cli/src/devices.c:294
-msgid "connecting (need authentication)"
-msgstr "подключение (требуется аутентификация)"
-
-#: ../cli/src/devices.c:296
-msgid "connecting (getting IP configuration)"
-msgstr "подключение (получение настроек IP)"
-
-#: ../cli/src/devices.c:298
-msgid "connecting (checking IP connectivity)"
-msgstr "подключение (проверка IP-подключения)"
+#. 8
+#: ../cli/src/devices.c:188
+msgid "RSN-FLAGS"
+msgstr "ФЛАГИ RSN"
 
-#: ../cli/src/devices.c:300
-msgid "connecting (starting secondary connections)"
-msgstr "подключение (запуск второстепенных соединений)"
+#. 10
+#. 4
+#: ../cli/src/devices.c:190 ../cli/src/devices.c:206
+msgid "ACTIVE"
+msgstr "АКТИВЕН"
 
-#: ../cli/src/devices.c:302 ../cli/src/network-manager.c:111
-msgid "connected"
-msgstr "подключено"
+#. 0
+#: ../cli/src/devices.c:218
+msgid "SLAVES"
+msgstr ""
 
-#: ../cli/src/devices.c:306
-msgid "connection failed"
-msgstr "сбой соединения"
+#. 0
+#: ../cli/src/devices.c:227
+#, fuzzy
+#| msgid "UUID"
+msgid "ID"
+msgstr "UUID"
 
-#: ../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:243
+#, 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 ]\n"
+"  disconnect iface  [--nowait] [--timeout ]\n"
+"  wifi [list [iface ] [bssid ]]\n"
+"  wifi connect <(B)SSID> [password ] [wep-key-type key|phrase] "
+"[iface ] [bssid ] [name ]\n"
+"               [--private] [--nowait] [--timeout ]\n"
+"  wimax [list [iface ] [nsp ]]\n"
+"\n"
+msgstr ""
 
-#: ../cli/src/devices.c:374
+#: ../cli/src/devices.c:343
 msgid "(none)"
 msgstr "(нет)"
 
 #: ../cli/src/devices.c:399
 #, c-format
-msgid "%s: error converting IP4 address 0x%X"
-msgstr "%s: ошибка преобразования адреса IP4 0x%X"
-
-#: ../cli/src/devices.c:470
-#, c-format
 msgid "%u MHz"
 msgstr "%u МГц"
 
-#: ../cli/src/devices.c:471
+#: ../cli/src/devices.c:400
 #, c-format
 msgid "%u MB/s"
 msgstr "%u МБ/с"
 
-#: ../cli/src/devices.c:480
+#: ../cli/src/devices.c:409
 msgid "Encrypted: "
 msgstr "Зашифровано: "
 
-#: ../cli/src/devices.c:485
+#: ../cli/src/devices.c:414
 msgid "WEP "
 msgstr "WEP "
 
-#: ../cli/src/devices.c:487
+#: ../cli/src/devices.c:416
 msgid "WPA "
 msgstr "WPA "
 
-#: ../cli/src/devices.c:489
+#: ../cli/src/devices.c:418
 msgid "WPA2 "
 msgstr "WPA2 "
 
-#: ../cli/src/devices.c:492
+#: ../cli/src/devices.c:421
 msgid "Enterprise "
 msgstr "Enterprise "
 
-#: ../cli/src/devices.c:501
+#: ../cli/src/devices.c:430
 msgid "Ad-Hoc"
 msgstr "Ad-Hoc"
 
-#: ../cli/src/devices.c:501
+#: ../cli/src/devices.c:432
 msgid "Infrastructure"
 msgstr "Инфраструктура"
 
-#: ../cli/src/devices.c:536
+#: ../cli/src/devices.c:468
 msgid "Home"
-msgstr "Домой"
+msgstr "Дом"
 
-#: ../cli/src/devices.c:539
+#: ../cli/src/devices.c:471
 msgid "Partner"
-msgstr "Партнер"
+msgstr "Партнёр"
 
-#: ../cli/src/devices.c:542
+#: ../cli/src/devices.c:474
 msgid "Roaming"
 msgstr "Роуминг"
 
-#: ../cli/src/devices.c:612
+#: ../cli/src/devices.c:546
 #, c-format
 msgid "Error: 'dev list': %s"
 msgstr "Ошибка: «dev list»: %s"
 
-#: ../cli/src/devices.c:614
+#: ../cli/src/devices.c:548
 #, c-format
 msgid "Error: 'dev list': %s; allowed fields: %s"
 msgstr "Ошибка: «dev list»: %s; разрешённые поля: %s"
 
-#: ../cli/src/devices.c:623
+#: ../cli/src/devices.c:557
 msgid "Device details"
 msgstr "Сведения об устройстве"
 
-#: ../cli/src/devices.c:657 ../cli/src/devices.c:1152 ../cli/src/utils.c:342
+#: ../cli/src/devices.c:602 ../cli/src/devices.c:605 ../cli/src/devices.c:1081
+#: ../cli/src/utils.c:477
 msgid "(unknown)"
 msgstr "(неизвестно)"
 
-#: ../cli/src/devices.c:658
-msgid "unknown)"
-msgstr "неизвестно)"
+#: ../cli/src/devices.c:614
+msgid "not connected"
+msgstr "не подключён"
 
-#: ../cli/src/devices.c:684
+#: ../cli/src/devices.c:641
 #, c-format
 msgid "%u Mb/s"
 msgstr "%u Мб/c"
 
 #. Print header
 #. "WIRED-PROPERTIES"
-#: ../cli/src/devices.c:757
+#: ../cli/src/devices.c:715
 msgid "on"
-msgstr "вкл"
+msgstr "вкл."
 
-#: ../cli/src/devices.c:757
+#: ../cli/src/devices.c:715
 msgid "off"
-msgstr "выкл"
+msgstr "выкл."
 
-#: ../cli/src/devices.c:1004
+#: ../cli/src/devices.c:923
 #, c-format
 msgid "Error: 'dev status': %s"
 msgstr "Ошибка: «dev status»: %s"
 
-#: ../cli/src/devices.c:1006
+#: ../cli/src/devices.c:925
 #, c-format
 msgid "Error: 'dev status': %s; allowed fields: %s"
 msgstr "Ошибка: «dev status»: %s; разрешённые поля: %s"
 
-#: ../cli/src/devices.c:1029
+#: ../cli/src/devices.c:948
 msgid "Status of devices"
 msgstr "Состояние устройств"
 
-#: ../cli/src/devices.c:1060
+#: ../cli/src/devices.c:979
 #, c-format
 msgid "Error: '%s' argument is missing."
 msgstr "Ошибка: отсутствует аргумент «%s»."
 
-#: ../cli/src/devices.c:1101 ../cli/src/devices.c:1253
-#: ../cli/src/devices.c:1389 ../cli/src/devices.c:1608
+#: ../cli/src/devices.c:1020 ../cli/src/devices.c:1185
+#: ../cli/src/devices.c:1326 ../cli/src/devices.c:1973
 #, c-format
 msgid "Error: Device '%s' not found."
 msgstr "Ошибка: не найдено устройство «%s»."
 
-#: ../cli/src/devices.c:1124
+#: ../cli/src/devices.c:1043
 #, c-format
 msgid "Success: Device '%s' successfully disconnected."
 msgstr "Выполнено: устройство «%s» отключено."
 
-#: ../cli/src/devices.c:1149
+#: ../cli/src/devices.c:1078
 #, c-format
 msgid "Error: Device '%s' (%s) disconnecting failed: %s"
 msgstr "Ошибка: не удалось отключить устройство «%s» (%s): %s"
 
-#: ../cli/src/devices.c:1157
+#: ../cli/src/devices.c:1091
 #, c-format
-msgid "Device state: %d (%s)\n"
-msgstr "Состояние устройства: %d (%s)\n"
+msgid "Device '%s' has been disconnected.\n"
+msgstr "Устройство «%s» отключено.\n"
 
-#: ../cli/src/devices.c:1222
+#: ../cli/src/devices.c:1154
 #, c-format
 msgid "Error: iface has to be specified."
 msgstr "Ошибка: необходимо указать интерфейс."
 
-#: ../cli/src/devices.c:1347
+#: ../cli/src/devices.c:1284
 #, c-format
 msgid "Error: 'dev wifi': %s"
 msgstr "Ошибка: «dev wifi»: «%s»"
 
-#: ../cli/src/devices.c:1349
+#: ../cli/src/devices.c:1286
 #, c-format
 msgid "Error: 'dev wifi': %s; allowed fields: %s"
 msgstr "Ошибка: «dev wifi»: %s; разрешённые поля: %s"
 
-#: ../cli/src/devices.c:1372
+#: ../cli/src/devices.c:1309
 msgid "WiFi scan list"
 msgstr "Список сканирования WiFi"
 
-#: ../cli/src/devices.c:1409 ../cli/src/devices.c:1463
-#: ../cli/src/devices.c:1670
+#: ../cli/src/devices.c:1346 ../cli/src/devices.c:1400
 #, c-format
-msgid "Error: Access point with hwaddr '%s' not found."
-msgstr "Ошибка: точка доступа с аппаратным адресом «%s» не найдена."
+msgid "Error: Access point with bssid '%s' not found."
+msgstr "Ошибка: точка доступа с bssid «%s» не найдена."
 
-#: ../cli/src/devices.c:1426
+#: ../cli/src/devices.c:1363
 #, c-format
 msgid "Error: Device '%s' is not a WiFi device."
 msgstr "Ошибка: «%s» не является устройством WiFi."
 
-#: ../cli/src/devices.c:1490
+#: ../cli/src/devices.c:1431 ../cli/src/devices.c:1477
+#, c-format
+msgid "Connection with UUID '%s' created and activated on device '%s'\n"
+msgstr "Соединение с UUID «%s» создано и задействовано на устройстве «%s»\n"
+
+#: ../cli/src/devices.c:1436
+#, c-format
+msgid "Error: Connection activation failed: (%d) %s."
+msgstr "Ошибка: сбой активации соединения: (%d) %s."
+
+#: ../cli/src/devices.c:1461
+#, c-format
+msgid "Error: Failed to add/activate new connection: (%d) %s"
+msgstr "Ошибка: не удалось добавить или активировать новое соединение: (%d) %s"
+
+#: ../cli/src/devices.c:1469
+#, c-format
+msgid "Error: Failed to add/activate new connection: Unknown error"
+msgstr ""
+"Ошибка: не удалось добавить или активировать новое соединение: неизвестная "
+"ошибка"
+
+#: ../cli/src/devices.c:1613
+#, c-format
+msgid "Error: SSID or BSSID are missing."
+msgstr "Ошибка: не указан SSID или BSSID."
+
+#: ../cli/src/devices.c:1636
+#, c-format
+msgid "Error: bssid argument value '%s' is not a valid BSSID."
+msgstr "Ошибка: недопустимое значение аргумента bssid «%s»."
+
+#: ../cli/src/devices.c:1660
+#, c-format
+msgid ""
+"Error: wep-key-type argument value '%s' is invalid, use 'key' or 'phrase'."
+msgstr ""
+"Ошибка: недопустимое значение аргумента wep-key-type «%s»; используйте «key» "
+"или «phrase»."
+
+#: ../cli/src/devices.c:1700
+#, c-format
+msgid "Error: BSSID to connect to (%s) differs from bssid argument (%s)."
+msgstr ""
+"Ошибка: BSSID для подключения к (%s) отличается от bssid аргумента (%s)."
+
+#: ../cli/src/devices.c:1706
+#, c-format
+msgid "Error: Parameter '%s' is neither SSID nor BSSID."
+msgstr "Ошибка: параметр «%s» не является SSID или BSSID."
+
+#: ../cli/src/devices.c:1735
+#, c-format
+msgid "Error: Device '%s' is not a Wi-Fi device."
+msgstr "Ошибка: «%s» не является устройством WiFi."
+
+#: ../cli/src/devices.c:1737
+#, c-format
+msgid "Error: No Wi-Fi device found."
+msgstr "Ошибка: устройства Wi-Fi не найдены."
+
+#: ../cli/src/devices.c:1755
+#, c-format
+msgid "Error: No network with SSID '%s' found."
+msgstr "Ошибка: не найдена сеть с SSID «%s»."
+
+#: ../cli/src/devices.c:1757
+#, c-format
+msgid "Error: No access point with BSSID '%s' found."
+msgstr "Ошибка: точка доступа с BSSID «%s» не найдена."
+
+#: ../cli/src/devices.c:1855
 #, c-format
 msgid "Error: 'dev wifi' command '%s' is not valid."
 msgstr "Ошибка: неверная команда «dev wifi»: «%s»."
 
-#: ../cli/src/devices.c:1566
+#: ../cli/src/devices.c:1931
 #, c-format
 msgid "Error: 'dev wimax': %s"
 msgstr "Ошибка: «dev wimax»: %s"
 
-#: ../cli/src/devices.c:1568
+#: ../cli/src/devices.c:1933
 #, c-format
 msgid "Error: 'dev wimax': %s; allowed fields: %s"
 msgstr "Ошибка: «dev wimax»: %s; разрешённые поля: %s"
 
-#: ../cli/src/devices.c:1591
+#: ../cli/src/devices.c:1956
 msgid "WiMAX NSP list"
 msgstr "Список WiMAX NSP"
 
-#: ../cli/src/devices.c:1628
+#: ../cli/src/devices.c:1993
 #, c-format
 msgid "Error: NSP with name '%s' not found."
 msgstr "Ошибка: NSP с именем «%s» не найден."
 
-#: ../cli/src/devices.c:1639
+#: ../cli/src/devices.c:2004
 #, c-format
 msgid "Error: Device '%s' is not a WiMAX device."
 msgstr "Ошибка: «%s» не является устройством WIMAX."
 
-#: ../cli/src/devices.c:1697
+#: ../cli/src/devices.c:2035
+#, c-format
+msgid "Error: Access point with nsp '%s' not found."
+msgstr "Ошибка: точка доступа с nsp «%s» не найдена."
+
+#: ../cli/src/devices.c:2062
 #, c-format
 msgid "Error: 'dev wimax' command '%s' is not valid."
-msgstr "Ошибка: неверная команда «dev wimax»: %s"
+msgstr "Ошибка: неверная команда «dev wimax»: %s."
 
-#: ../cli/src/devices.c:1747
+#: ../cli/src/devices.c:2112
 #, c-format
 msgid "Error: 'dev' command '%s' is not valid."
 msgstr "Ошибка: неверная команда «dev»: «%s»."
@@ -1011,16 +1474,27 @@ msgstr "ОБОРУДОВАНИЕ WIMAX"
 msgid "WIMAX"
 msgstr "WIMAX"
 
-#: ../cli/src/network-manager.c:74
+#: ../cli/src/network-manager.c:62
+msgid "PERMISSION"
+msgstr "РАЗРЕШЕНИЕ"
+
+#. 0
+#: ../cli/src/network-manager.c:63
+msgid "VALUE"
+msgstr "ЗНАЧЕНИЕ"
+
+#: ../cli/src/network-manager.c:77
 #, c-format
 msgid ""
 "Usage: nmcli nm { COMMAND | help }\n"
 "\n"
-"  COMMAND := { status | enable | sleep | wifi | wwan | wimax }\n"
+"  COMMAND := { status | permissions | enable | sleep | wifi | wwan | "
+"wimax }\n"
 "\n"
-"  COMMAND := { status | enable | sleep | wifi | wwan }\n"
+"  COMMAND := { status | permissions | enable | sleep | wifi | wwan }\n"
 "\n"
 "  status\n"
+"  permissions\n"
 "  enable [true|false]\n"
 "  sleep [true|false]\n"
 "  wifi [on|off]\n"
@@ -1028,157 +1502,162 @@ msgid ""
 "  wimax [on|off]\n"
 "\n"
 msgstr ""
-"Использование: nmcli nm { КОМАНДА | help }\n"
-"\n"
-"  КОМАНДА := { status | sleep | wakeup | wifi | wwan | wimax  }\n"
-"\n"
-"  КОМАНДА := { status | sleep | wakeup | wifi | wwan }\n"
-"\n"
-"  status\n"
-"  enable [true|false]\n"
-"  sleep\n"
-"  wifi [on|off]\n"
-"  wwan [on|off]\n"
-"  wimax [on|off]\n"
-"\n"
 
-#: ../cli/src/network-manager.c:103
+#: ../cli/src/network-manager.c:108
 msgid "asleep"
 msgstr "спящий"
 
-#: ../cli/src/network-manager.c:105
+#: ../cli/src/network-manager.c:110
 msgid "connecting"
-msgstr "подключается"
+msgstr "подключение"
 
-#: ../cli/src/network-manager.c:107
+#: ../cli/src/network-manager.c:112
 msgid "connected (local only)"
 msgstr "подключён (локально)"
 
-#: ../cli/src/network-manager.c:109
+#: ../cli/src/network-manager.c:114
 msgid "connected (site only)"
 msgstr "подключён (на узле)"
 
-#: ../cli/src/network-manager.c:113
+#: ../cli/src/network-manager.c:118
 msgid "disconnecting"
 msgstr "отключение"
 
-#: ../cli/src/network-manager.c:153
+#: ../cli/src/network-manager.c:158
 #, c-format
 msgid "Error: 'nm status': %s"
 msgstr "Ошибка: «nm status»: %s"
 
-#: ../cli/src/network-manager.c:155
+#: ../cli/src/network-manager.c:160
 #, c-format
 msgid "Error: 'nm status': %s; allowed fields: %s"
 msgstr "Ошибка: «nm status»: %s; разрешённые поля: %s"
 
 #. 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
+#: ../cli/src/network-manager.c:173 ../cli/src/network-manager.c:174
+#: ../cli/src/network-manager.c:175 ../cli/src/network-manager.c:176
+#: ../cli/src/network-manager.c:177 ../cli/src/network-manager.c:179
+#: ../cli/src/network-manager.c:180 ../cli/src/network-manager.c:429
+#: ../cli/src/network-manager.c:484 ../cli/src/network-manager.c:522
+#: ../cli/src/network-manager.c:561
 msgid "enabled"
 msgstr "включён"
 
-#: ../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
+#: ../cli/src/network-manager.c:173 ../cli/src/network-manager.c:174
+#: ../cli/src/network-manager.c:175 ../cli/src/network-manager.c:176
+#: ../cli/src/network-manager.c:177 ../cli/src/network-manager.c:179
+#: ../cli/src/network-manager.c:180 ../cli/src/network-manager.c:429
+#: ../cli/src/network-manager.c:484 ../cli/src/network-manager.c:522
+#: ../cli/src/network-manager.c:561
 msgid "disabled"
 msgstr "отключён"
 
-#: ../cli/src/network-manager.c:188
+#: ../cli/src/network-manager.c:193
 msgid "NetworkManager status"
 msgstr "Состояние NetworkManager"
 
 #. Print header
-#: ../cli/src/network-manager.c:191
+#: ../cli/src/network-manager.c:196
 msgid "running"
 msgstr "выполняется"
 
-#: ../cli/src/network-manager.c:191
+#: ../cli/src/network-manager.c:196
 msgid "not running"
 msgstr "не выполняется"
 
-#: ../cli/src/network-manager.c:222 ../cli/src/utils.c:322
+#: ../cli/src/network-manager.c:271
+msgid "auth"
+msgstr "подлинный"
+
+#: ../cli/src/network-manager.c:301
+#, c-format
+msgid "Error: 'nm permissions': %s"
+msgstr "Ошибка прав доступа: %s"
+
+#: ../cli/src/network-manager.c:303
+#, c-format
+msgid "Error: 'nm permissions': %s; allowed fields: %s"
+msgstr "Ошибка прав доступа: %s; разрешённые поля: %s"
+
+#: ../cli/src/network-manager.c:324
+msgid "NetworkManager permissions"
+msgstr "Права доступа NetworkManager"
+
+#: ../cli/src/network-manager.c:350 ../cli/src/utils.c:457
 #, c-format
 msgid "Error: Couldn't connect to system bus: %s"
 msgstr "Ошибка: не удалось подключиться к системной шине: %s"
 
-#: ../cli/src/network-manager.c:233
+#: ../cli/src/network-manager.c:361
 #, c-format
 msgid "Error: Couldn't create D-Bus object proxy."
 msgstr "Ошибка: не удалось создать прокси-объект D-Bus."
 
-#: ../cli/src/network-manager.c:239
+#: ../cli/src/network-manager.c:367
 #, c-format
 msgid "Error in sleep: %s"
 msgstr "Ошибка в задержке: %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
+#: ../cli/src/network-manager.c:416 ../cli/src/network-manager.c:471
+#: ../cli/src/network-manager.c:509 ../cli/src/network-manager.c:548
 #, c-format
 msgid "Error: '--fields' value '%s' is not valid here; allowed fields: %s"
 msgstr "Ошибка: недопустимое значение «--fields»: «%s»; разрешённые поля: %s"
 
-#: ../cli/src/network-manager.c:291
+#: ../cli/src/network-manager.c:424
 msgid "Networking enabled"
 msgstr "Сеть включена"
 
-#: ../cli/src/network-manager.c:307
+#: ../cli/src/network-manager.c:440
 #, c-format
 msgid "Error: invalid 'enable' parameter: '%s'; use 'true' or 'false'."
 msgstr ""
 "Ошибка: недопустимый параметр «enable»: «%s»; используйте «true» или «false»."
 
-#: ../cli/src/network-manager.c:317
+#: ../cli/src/network-manager.c:450
 #, c-format
 msgid "Error: Sleeping status is not exported by NetworkManager."
 msgstr "Ошибка: NetworkManager не удалось экспортировать состояние сна."
 
-#: ../cli/src/network-manager.c:325
+#: ../cli/src/network-manager.c:458
 #, c-format
 msgid "Error: invalid 'sleep' parameter: '%s'; use 'true' or 'false'."
 msgstr ""
 "Ошибка: недопустимый параметр «sleep»: «%s»; используйте «true» или «false»."
 
-#: ../cli/src/network-manager.c:346
+#: ../cli/src/network-manager.c:479
 msgid "WiFi enabled"
 msgstr "WiFi включён"
 
-#: ../cli/src/network-manager.c:362
+#: ../cli/src/network-manager.c:495
 #, c-format
 msgid "Error: invalid 'wifi' parameter: '%s'."
 msgstr "Ошибка: недопустимый параметр «wifi»: «%s»."
 
-#: ../cli/src/network-manager.c:384
+#: ../cli/src/network-manager.c:517
 msgid "WWAN enabled"
 msgstr "WWAN включён"
 
-#: ../cli/src/network-manager.c:400
+#: ../cli/src/network-manager.c:533
 #, c-format
 msgid "Error: invalid 'wwan' parameter: '%s'."
 msgstr "Ошибка: недопустимый параметр «wwan»: «%s»."
 
-#: ../cli/src/network-manager.c:423
+#: ../cli/src/network-manager.c:556
 msgid "WiMAX enabled"
 msgstr "WiMAX включён"
 
-#: ../cli/src/network-manager.c:439
+#: ../cli/src/network-manager.c:572
 #, c-format
 msgid "Error: invalid 'wimax' parameter: '%s'."
-msgstr "Ошибка: недопустимый параметр «wimax»: «%s»"
+msgstr "Ошибка: недопустимый параметр «wimax»: «%s»."
 
-#: ../cli/src/network-manager.c:452
+#: ../cli/src/network-manager.c:585
 #, c-format
 msgid "Error: 'nm' command '%s' is not valid."
 msgstr "Ошибка: недопустимая команда «nm»: «%s»."
 
-#: ../cli/src/nmcli.c:64
+#: ../cli/src/nmcli.c:76
 #, c-format
 msgid ""
 "Usage: %s [OPTIONS] OBJECT { COMMAND | help }\n"
@@ -1221,177 +1700,222 @@ msgstr ""
 "  dev         устройства под управлением NetworkManager\n"
 "\n"
 
-#: ../cli/src/nmcli.c:109
+#: ../cli/src/nmcli.c:121
 #, c-format
 msgid "Error: Object '%s' is unknown, try 'nmcli help'."
 msgstr "Ошибка: неизвестный объект «%s». Попробуйте выполнить «nmcli help»."
 
-#: ../cli/src/nmcli.c:139
+#: ../cli/src/nmcli.c:151
 #, c-format
 msgid "Error: Option '--terse' is specified the second time."
 msgstr "Ошибка: параметр «--terse» указан дважды."
 
-#: ../cli/src/nmcli.c:144
+#: ../cli/src/nmcli.c:156
 #, c-format
 msgid "Error: Option '--terse' is mutually exclusive with '--pretty'."
 msgstr "Ошибка: параметры «--terse» и «--pretty» взаимоисключаемы."
 
-#: ../cli/src/nmcli.c:152
+#: ../cli/src/nmcli.c:164
 #, c-format
 msgid "Error: Option '--pretty' is specified the second time."
 msgstr "Ошибка: параметр «--pretty» указан дважды."
 
-#: ../cli/src/nmcli.c:157
+#: ../cli/src/nmcli.c:169
 #, c-format
 msgid "Error: Option '--pretty' is mutually exclusive with '--terse'."
 msgstr "Ошибка: параметры «--pretty» и «--terse» взаимоисключаемы."
 
-#: ../cli/src/nmcli.c:167 ../cli/src/nmcli.c:183
+#: ../cli/src/nmcli.c:179 ../cli/src/nmcli.c:195
 #, c-format
 msgid "Error: missing argument for '%s' option."
 msgstr "Ошибка: отсутствует аргумент параметра «%s»."
 
-#: ../cli/src/nmcli.c:176 ../cli/src/nmcli.c:192
+#: ../cli/src/nmcli.c:188 ../cli/src/nmcli.c:204
 #, c-format
 msgid "Error: '%s' is not valid argument for '%s' option."
 msgstr "Ошибка: недопустимый аргумент «%s» для параметра «%s»."
 
-#: ../cli/src/nmcli.c:199
+#: ../cli/src/nmcli.c:211
 #, c-format
 msgid "Error: fields for '%s' options are missing."
 msgstr "Ошибка: отсутствуют поля для параметров «%s»."
 
-#: ../cli/src/nmcli.c:207
+#: ../cli/src/nmcli.c:219
 #, c-format
 msgid "nmcli tool, version %s\n"
 msgstr "утилита nmcli, версия %s\n"
 
-#: ../cli/src/nmcli.c:213
+#: ../cli/src/nmcli.c:225
 #, c-format
 msgid "Error: Option '%s' is unknown, try 'nmcli -help'."
 msgstr "Ошибка: неизвестный параметр «%s». Попробуйте выполнить «nmcli -help»."
 
-#: ../cli/src/nmcli.c:232
+#: ../cli/src/nmcli.c:244
 #, c-format
 msgid "Caught signal %d, shutting down..."
 msgstr "Получен сигнал %d. Завершение работы…"
 
-#: ../cli/src/nmcli.c:257
+#: ../cli/src/nmcli.c:269
 msgid "Error: Could not create NMClient object."
-msgstr "Ошибка: не удалось создать объект NMClient."
+msgstr "Ошибка: невозможно создать объект NMClient."
 
-#: ../cli/src/nmcli.c:273
+#: ../cli/src/nmcli.c:285
 msgid "Success"
 msgstr "Успешно"
 
-#: ../cli/src/settings.c:423
+#: ../cli/src/settings.c:527
 #, c-format
 msgid "%d (hex-ascii-key)"
 msgstr "%d (16-теричный ASCII-ключ)"
 
-#: ../cli/src/settings.c:425
+#: ../cli/src/settings.c:529
 #, c-format
 msgid "%d (104/128-bit passphrase)"
 msgstr "%d (104/128-битная парольная фраза)"
 
-#: ../cli/src/settings.c:428
+#: ../cli/src/settings.c:532 ../cli/src/settings.c:660
 #, c-format
 msgid "%d (unknown)"
 msgstr "%d (неизвестно)"
 
-#: ../cli/src/settings.c:454
+#: ../cli/src/settings.c:558
 msgid "0 (unknown)"
 msgstr "0 (неизвестно)"
 
-#: ../cli/src/settings.c:460
+#: ../cli/src/settings.c:564
 msgid "any, "
 msgstr "любой, "
 
-#: ../cli/src/settings.c:462
+#: ../cli/src/settings.c:566
 msgid "900 MHz, "
 msgstr "900 МГц, "
 
-#: ../cli/src/settings.c:464
+#: ../cli/src/settings.c:568
 msgid "1800 MHz, "
 msgstr "1800 МГц, "
 
-#: ../cli/src/settings.c:466
+#: ../cli/src/settings.c:570
 msgid "1900 MHz, "
 msgstr "1900 МГц, "
 
-#: ../cli/src/settings.c:468
+#: ../cli/src/settings.c:572
 msgid "850 MHz, "
 msgstr "850 МГц, "
 
-#: ../cli/src/settings.c:470
+#: ../cli/src/settings.c:574
 msgid "WCDMA 3GPP UMTS 2100 MHz, "
 msgstr "WCDMA 3GPP UMTS 2100 МГц, "
 
-#: ../cli/src/settings.c:472
+#: ../cli/src/settings.c:576
 msgid "WCDMA 3GPP UMTS 1800 MHz, "
 msgstr "WCDMA 3GPP UMTS 1800 МГц, "
 
-#: ../cli/src/settings.c:474
+#: ../cli/src/settings.c:578
 msgid "WCDMA 3GPP UMTS 1700/2100 MHz, "
 msgstr "WCDMA 3GPP UMTS 1700/2100 МГц, "
 
-#: ../cli/src/settings.c:476
+#: ../cli/src/settings.c:580
 msgid "WCDMA 3GPP UMTS 800 MHz, "
 msgstr "WCDMA 3GPP UMTS 800 МГц, "
 
-#: ../cli/src/settings.c:478
+#: ../cli/src/settings.c:582
 msgid "WCDMA 3GPP UMTS 850 MHz, "
 msgstr "WCDMA 3GPP UMTS 850 МГц, "
 
-#: ../cli/src/settings.c:480
+#: ../cli/src/settings.c:584
 msgid "WCDMA 3GPP UMTS 900 MHz, "
 msgstr "WCDMA 3GPP UMTS 900 МГц, "
 
-#: ../cli/src/settings.c:482
+#: ../cli/src/settings.c:586
 msgid "WCDMA 3GPP UMTS 1700 MHz, "
 msgstr "WCDMA 3GPP UMTS 1700 МГц, "
 
-#: ../cli/src/settings.c:566 ../cli/src/settings.c:732
+#: ../cli/src/settings.c:588
+msgid "WCDMA 3GPP UMTS 1900 MHz, "
+msgstr "WCDMA 3GPP UMTS 1900 МГц, "
+
+#: ../cli/src/settings.c:590
+msgid "WCDMA 3GPP UMTS 2600 MHz, "
+msgstr "WCDMA 3GPP UMTS 2600 МГц, "
+
+#: ../cli/src/settings.c:608
+msgid "0 (NONE)"
+msgstr ""
+
+#: ../cli/src/settings.c:614
+msgid "REORDER_HEADERS, "
+msgstr ""
+
+#: ../cli/src/settings.c:616
+msgid "GVRP, "
+msgstr ""
+
+#: ../cli/src/settings.c:618
+msgid "LOOSE_BINDING, "
+msgstr ""
+
+#: ../cli/src/settings.c:654
+#, c-format
+msgid "%d (disabled)"
+msgstr "%d (отключено)"
+
+#: ../cli/src/settings.c:656
+#, c-format
+msgid "%d (enabled, prefer public IP)"
+msgstr "%d (включено, предпочитается публичный IP-адрес)"
+
+#: ../cli/src/settings.c:658
+#, c-format
+msgid "%d (enabled, prefer temporary IP)"
+msgstr "%d (включено, предпочитается временный IP-адрес)"
+
+#: ../cli/src/settings.c:791 ../cli/src/settings.c:987
+#: ../cli/src/settings.c:1696
 msgid "auto"
-msgstr "авто"
+msgstr "автоматически"
 
-#: ../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:103
+#, c-format
+msgid "Error converting IP4 address '0x%X' to text form"
+msgstr "Ошибка преобразования адреса IP4 «0x%X» в текстовый формат"
+
+#: ../cli/src/utils.c:131
+#, c-format
+msgid "Error converting IP6 address '%s' to text form"
+msgstr "Ошибка преобразования адреса IP6 «%s» в текстовый формат"
 
-#: ../cli/src/utils.c:128
+#: ../cli/src/utils.c:232
 #, c-format
 msgid "field '%s' has to be alone"
 msgstr "поле «%s» должно быть единственным"
 
-#: ../cli/src/utils.c:131
+#: ../cli/src/utils.c:235
 #, c-format
 msgid "invalid field '%s'"
 msgstr "недопустимое поле «%s»"
 
-#: ../cli/src/utils.c:150
-#, c-format
+#: ../cli/src/utils.c:254
 msgid "Option '--terse' requires specifying '--fields'"
 msgstr "Параметр «--terse» требует указания «--fields»"
 
-#: ../cli/src/utils.c:154
+#: ../cli/src/utils.c:258
 #, c-format
 msgid "Option '--terse' requires specific '--fields' option values , not '%s'"
-msgstr "Параметр «--terse» требует определённых значений «--fields», но не «%s»"
+msgstr ""
+"Параметр «--terse» требует определённых значений «--fields», но не «%s»"
 
-#: ../cli/src/utils.c:333
+#: ../cli/src/utils.c:468
 #, c-format
 msgid "Error: Couldn't create D-Bus object proxy for org.freedesktop.DBus"
 msgstr ""
 "Ошибка: не удалось создать прокси-объект D-Bus для org.freedesktop.DBus"
 
-#: ../cli/src/utils.c:341
+#: ../cli/src/utils.c:476
 #, c-format
 msgid "Error: NameHasOwner request failed: %s"
 msgstr "Ошибка: сбой запроса NameHasOwner: %s"
 
-#: ../cli/src/utils.c:386
+#: ../cli/src/utils.c:521
 #, c-format
 msgid ""
 "Warning: nmcli (%s) and NetworkManager (%s) versions don't match. Use --"
@@ -1400,7 +1924,7 @@ msgstr ""
 "Предупреждение: версии nmcli (%s) и NetworkManager (%s) не совпадают. "
 "Используйте --nocheck для подавления этого предупреждения.\n"
 
-#: ../cli/src/utils.c:395
+#: ../cli/src/utils.c:530
 #, c-format
 msgid ""
 "Error: nmcli (%s) and NetworkManager (%s) versions don't match. Force "
@@ -1461,12 +1985,12 @@ msgstr "Не удалось расшифровать личный ключ."
 
 #: ../libnm-util/crypto.c:284
 msgid "Failed to find expected PKCS#8 start tag."
-msgstr "Невозможно найти открывающий тег PKCS#8."
+msgstr "Не удалось найти открывающий тег PKCS#8."
 
 #: ../libnm-util/crypto.c:292
 #, c-format
 msgid "Failed to find expected PKCS#8 end tag '%s'."
-msgstr "Невозможно найти  закрывающий тег PKCS#8 — «%s»."
+msgstr "Не удалось найти закрывающий тег PKCS#8 — «%s»."
 
 #: ../libnm-util/crypto.c:312
 msgid "Not enough memory to store private key data."
@@ -1516,7 +2040,7 @@ msgstr "Недостаточно памяти для загрузки расши
 #: ../libnm-util/crypto.c:542
 #, c-format
 msgid "Unable to determine private key type."
-msgstr "Не удаётся определить тип личного ключа."
+msgstr "Не удалось определить тип личного ключа."
 
 #: ../libnm-util/crypto.c:597
 #, c-format
@@ -1753,71 +2277,40 @@ msgstr "Не удалось проверить файл PKCS#12: %d"
 msgid "Could not generate random data."
 msgstr "Ошибка при генерации случайных данных."
 
-#: ../libnm-util/nm-utils.c:2000
+#: ../libnm-util/nm-utils.c:2078
 #, c-format
 msgid "Not enough memory to make encryption key."
 msgstr "Недостаточно памяти для создания ключа шифрования."
 
-#: ../libnm-util/nm-utils.c:2110
+#: ../libnm-util/nm-utils.c:2188
 msgid "Could not allocate memory for PEM file creation."
 msgstr "Не удалось выделить память для создания файла PEM."
 
-#: ../libnm-util/nm-utils.c:2122
+#: ../libnm-util/nm-utils.c:2200
 #, c-format
 msgid "Could not allocate memory for writing IV to PEM file."
 msgstr "Не удалось выделить память для записи ВИ в файл PEM."
 
-#: ../libnm-util/nm-utils.c:2134
+#: ../libnm-util/nm-utils.c:2212
 #, c-format
 msgid "Could not allocate memory for writing encrypted key to PEM file."
 msgstr "Не удалось выделить память для записи зашифрованного ключа в файл PEM."
 
-#: ../libnm-util/nm-utils.c:2153
+#: ../libnm-util/nm-utils.c:2231
 #, c-format
 msgid "Could not allocate memory for PEM file data."
 msgstr "Не удалось выделить память для данных файла PEM."
 
-#: ../policy/org.freedesktop.NetworkManager.policy.in.h:1
-msgid "Allow control of network connections"
-msgstr "Разрешить контроль сетевых подключений"
-
-#: ../policy/org.freedesktop.NetworkManager.policy.in.h:2
-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:5
-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:7
+#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:1
 msgid "Enable or disable system networking"
-msgstr "Включить или выключить системные соединения"
-
-#: ../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 "Изменить постоянное имя узла компьютера"
+msgstr "Включение или выключение сетевой подсистемы"
 
-#: ../policy/org.freedesktop.NetworkManager.policy.in.h:10
-msgid "Modify personal network connections"
-msgstr "Редактировать личные настройки подключения"
+#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:2
+msgid "System policy prevents enabling or disabling system networking"
+msgstr ""
+"Системная политика препятствует включению или отключению сетевой подсистемы"
 
-#: ../policy/org.freedesktop.NetworkManager.policy.in.h:11
+#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:3
 msgid ""
 "Put NetworkManager to sleep or wake it up (should only be used by system "
 "power management)"
@@ -1825,80 +2318,265 @@ msgstr ""
 "Перевести NetworkManager в режим сна или пробудить его (должно "
 "использоваться только системой управления питанием)"
 
-#: ../policy/org.freedesktop.NetworkManager.policy.in.h:12
-msgid "System policy prevents control of network connections"
-msgstr "Системная политика запрещает управление подключениями."
+#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:4
+msgid "System policy prevents putting NetworkManager to sleep or waking it up"
+msgstr ""
+"Системная политика не разрешает переводить NetworkManager в режим сна или "
+"пробуждать его"
 
-#: ../policy/org.freedesktop.NetworkManager.policy.in.h:13
+#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:5
+msgid "Enable or disable WiFi devices"
+msgstr "Включить или выключить устройства WiFi"
+
+#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:6
 msgid "System policy prevents enabling or disabling WiFi devices"
 msgstr "Системная политика запрещает включение и выключение WiFi устройств"
 
-#: ../policy/org.freedesktop.NetworkManager.policy.in.h:14
+#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:7
+msgid "Enable or disable mobile broadband devices"
+msgstr "Включить или выключить устройства широкополосных мобильных сетей"
+
+#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:8
+msgid "System policy prevents enabling or disabling mobile broadband devices"
+msgstr ""
+"Системная политика запрещает включение или выключение устройств "
+"широкополосной мобильной связи"
+
+#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:9
+msgid "Enable or disable WiMAX mobile broadband devices"
+msgstr "Включить или выключить устройства мобильных сетей WiMax"
+
+#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:10
 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"
+#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:11
+msgid "Allow control of network connections"
+msgstr "Разрешить контроль сетевых подключений"
+
+#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:12
+msgid "System policy prevents control of network connections"
+msgstr "Системная политика запрещает управление подключениями."
+
+#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:13
+msgid "Connection sharing via a protected WiFi network"
+msgstr "Совместное использование соединений в закрытой сети WiFi"
+
+#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:14
+msgid "System policy prevents sharing connections via a protected WiFi network"
 msgstr ""
-"Системная политика запрещает включение или выключение устройств мобильной "
-"связи"
+"Системная политика запрещает совместное использование соединений в закрытой "
+"сети WiFi"
 
-#: ../policy/org.freedesktop.NetworkManager.policy.in.h:16
-msgid "System policy prevents enabling or disabling system networking"
+#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:15
+msgid "Connection sharing via an open WiFi network"
+msgstr "Совместное использование соединений в открытой сети WiFi"
+
+#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:16
+msgid "System policy prevents sharing connections via an open WiFi network"
 msgstr ""
-"Системная политика запрещает включение и выключение системных подключений"
+"Системная политика запрещает совместное использование соединений в открытой "
+"сети WiFi"
 
-#: ../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.in.h:17
+msgid "Modify personal network connections"
+msgstr "Редактировать личные настройки подключения"
 
-#: ../policy/org.freedesktop.NetworkManager.policy.in.h:18
+#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:18
 msgid "System policy prevents modification of personal network settings"
 msgstr "Системная политика запрещает изменение персональных настроек сети"
 
-#: ../policy/org.freedesktop.NetworkManager.policy.in.h:19
+#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:19
+msgid "Modify network connections for all users"
+msgstr "Изменить подключения доступные всем пользователям"
+
+#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:20
+msgid "System policy prevents modification of network settings for all users"
+msgstr "Системная политика запрещает изменение настроек для всех пользователей"
+
+#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:21
+msgid "Modify persistent system hostname"
+msgstr "Изменить постоянное имя узла компьютера"
+
+#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:22
 msgid "System policy prevents modification of the persistent system hostname"
 msgstr ""
 "Системная политика запрещает изменение постоянного имени узла компьютера"
 
-#: ../policy/org.freedesktop.NetworkManager.policy.in.h:20
-msgid "System policy prevents putting NetworkManager to sleep or waking it up"
-msgstr ""
-"Системная политика не разрешает переводить NetworkManager в режим сна или "
-"пробуждать его"
+#: ../src/main.c:159
+#, c-format
+msgid "Failed to set signal mask: %d"
+msgstr "Ошибка установки маски сигнала: %d"
 
-#: ../policy/org.freedesktop.NetworkManager.policy.in.h:21
-msgid "System policy prevents sharing connections via a protected WiFi network"
+#: ../src/main.c:168
+#, c-format
+msgid "Failed to create signal handling thread: %d"
+msgstr "Ошибка создания потока обработки сигнала: %d"
+
+#: ../src/main.c:183
+#, c-format
+msgid "Opening %s failed: %s\n"
+msgstr "При открытии %s произошла ошибка: %s\n"
+
+#: ../src/main.c:189
+#, c-format
+msgid "Writing to %s failed: %s\n"
+msgstr "При записи в %s произошла ошибка: %s\n"
+
+#: ../src/main.c:194
+#, c-format
+msgid "Closing %s failed: %s\n"
+msgstr "При закрытии %s произошла ошибка: %s\n"
+
+#: ../src/main.c:236
+#, c-format
+msgid "NetworkManager is already running (pid %ld)\n"
+msgstr "NetworkManager уже запущен (pid %ld)\n"
+
+#: ../src/main.c:375
+msgid "Print NetworkManager version and exit"
+msgstr "Показать версию NetworkManager и выйти"
+
+#: ../src/main.c:376
+msgid "Don't become a daemon"
+msgstr "Не использовать в качестве службы"
+
+#: ../src/main.c:377
+msgid "Make all warnings fatal"
+msgstr "Сделать все предупреждения критическими"
+
+#: ../src/main.c:378
+msgid "Specify the location of a PID file"
+msgstr "Укажите расположение PID файла"
+
+#: ../src/main.c:378
+msgid "filename"
+msgstr "имя файла"
+
+#: ../src/main.c:379
+msgid "State file location"
+msgstr "Расположение файла состояния"
+
+#: ../src/main.c:379
+msgid "/path/to/state.file"
+msgstr "/путь/к/state.file"
+
+#: ../src/main.c:380
+msgid "Config file location"
+msgstr "Расположение файла конфигурации"
+
+#: ../src/main.c:380
+msgid "/path/to/config.file"
+msgstr "/путь/к/config.file"
+
+#: ../src/main.c:381
+msgid "List of plugins separated by ','"
+msgstr "Список модулей, разделённых «,»"
+
+#: ../src/main.c:381
+msgid "plugin1,plugin2"
+msgstr "модуль1,модуль2"
+
+#. Translators: Do not translate the values in the square brackets
+#: ../src/main.c:383
+msgid "Log level: one of [ERR, WARN, INFO, DEBUG]"
+msgstr "Уровень информативности журнала: один из [ERR, WARN, INFO, DEBUG]"
+
+#. Translators: Do not translate the values in the square brackets
+#: ../src/main.c:386
+msgid ""
+"Log domains separated by ',': any combination of\n"
+"                                                [NONE,HW,RFKILL,ETHER,WIFI,"
+"BT,MB,DHCP4,DHCP6,PPP,\n"
+"                                                 WIFI_SCAN,IP4,IP6,AUTOIP4,"
+"DNS,VPN,SHARING,SUPPLICANT,\n"
+"                                                 AGENTS,SETTINGS,SUSPEND,"
+"CORE,DEVICE,OLPC,WIMAX,\n"
+"                                                 INFINIBAND,FIREWALL,ADSL]"
 msgstr ""
-"Системная политика запрещает совместное использование соединений в закрытой "
-"сети WiFi"
+"Запись журнала доменов, разделённых «,»: любая комбинация из\n"
+"                                               [NONE,HW,RFKILL,ETHER,WIFI,BT,"
+"MB,DHCP4,DHCP6,PPP,\n"
+"                                                WIFI_SCAN,IP4,IP6,AUTOIP4,"
+"DNS,VPN,SHARING,SUPPLICANT,\n"
+"                                                AGENTS,SETTINGS,SUSPEND,CORE,"
+"DEVICE,OLPC,WIMAX,\n"
+"                                                INFINIBAND,FIREWALL,ADSL]"
 
-#: ../policy/org.freedesktop.NetworkManager.policy.in.h:22
-msgid "System policy prevents sharing connections via an open WiFi network"
+#: ../src/main.c:392
+msgid "An http(s) address for checking internet connectivity"
+msgstr "http(s) адрес для проверки соединения с Интернетом"
+
+#: ../src/main.c:393
+msgid "The interval between connectivity checks (in seconds)"
+msgstr "Интервал между проверками соединения (в секундах)"
+
+#: ../src/main.c:394
+msgid "The expected start of the response"
+msgstr "Ожидается начало ответа"
+
+#: ../src/main.c:394
+msgid "Bingo!"
+msgstr "Бинго!"
+
+#: ../src/main.c:399
+#, c-format
+msgid "GModules are not supported on your platform!\n"
+msgstr "GModules не поддерживаются на вашей платформе.\n"
+
+#: ../src/main.c:418
+msgid ""
+"NetworkManager monitors all network connections and automatically\n"
+"chooses the best connection to use.  It also allows the user to\n"
+"specify wireless access points which wireless cards in the computer\n"
+"should associate with."
 msgstr ""
-"Системная политика запрещает совместное использование соединений в открытой "
-"сети WiFi"
+"NetworkManager отслеживает все сетевые соединения и автоматически\n"
+"выбирает для использования наиболее подходящее соединение. А также "
+"позволяет\n"
+"пользователю задать беспроводным картам точки доступа, с которыми они \n"
+"должны ассоциироваться."
 
-#: ../src/main.c:530
+#: ../src/main.c:424
 #, c-format
 msgid "Invalid option.  Please use --help to see a list of valid options.\n"
 msgstr ""
 "Неверный параметр. Используйте --help для вывода списка возможных "
 "параметров.\n"
 
-#: ../src/main.c:611
+#: ../src/main.c:434
+#, c-format
+msgid "You must be root to run NetworkManager!\n"
+msgstr "Для запуска NetworkManager, необходимы права администратора.\n"
+
+#: ../src/main.c:455
+#, c-format
+msgid "Failed to read configuration: (%d) %s\n"
+msgstr "Не удалось прочитать конфигурацию: (%d) %s\n"
+
+#: ../src/main.c:466
 #, 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-utils.c:62
+#: ../src/main.c:473
+#, c-format
+msgid "State file %s parsing failed: (%d) %s\n"
+msgstr "Сбой при разборе файла состояния %s: (%d) %s\n"
+
+#: ../src/main.c:490
+#, c-format
+msgid "Could not daemonize: %s [error %u]\n"
+msgstr "Невозможно преобразовать в службу: %s [ошибка %u]\n"
+
+#: ../src/dhcp-manager/nm-dhcp-dhclient-utils.c:61
 msgid "# Created by NetworkManager\n"
 msgstr "# Создано NetworkManager\n"
 
-#: ../src/dhcp-manager/nm-dhcp-dhclient-utils.c:69
+#: ../src/dhcp-manager/nm-dhcp-dhclient-utils.c:68
 #, c-format
 msgid ""
 "# Merged from %s\n"
@@ -1907,152 +2585,178 @@ msgstr ""
 "# Объединено с %s\n"
 "\n"
 
-#: ../src/dhcp-manager/nm-dhcp-manager.c:284
+#: ../src/dhcp-manager/nm-dhcp-manager.c:266
 msgid "no usable DHCP client could be found."
 msgstr "не найден клиент DHCP."
 
-#: ../src/dhcp-manager/nm-dhcp-manager.c:293
+#: ../src/dhcp-manager/nm-dhcp-manager.c:275
 msgid "'dhclient' could be found."
 msgstr "«dhclient» не найден."
 
-#: ../src/dhcp-manager/nm-dhcp-manager.c:303
+#: ../src/dhcp-manager/nm-dhcp-manager.c:285
 msgid "'dhcpcd' could be found."
 msgstr "«dhcpcd» не найден."
 
-#: ../src/dhcp-manager/nm-dhcp-manager.c:311
+#: ../src/dhcp-manager/nm-dhcp-manager.c:293
 #, c-format
 msgid "unsupported DHCP client '%s'"
 msgstr "клиент DHCP «%s» не поддерживается"
 
-#: ../src/dns-manager/nm-dns-manager.c:369
+#: ../src/dns-manager/nm-dns-manager.c:379
 msgid "NOTE: the libc resolver may not support more than 3 nameservers."
 msgstr ""
 "ЗАМЕЧАНИЕ: преобразователь имён glibc не поддерживает более трёх серверов "
 "имён."
 
-#: ../src/dns-manager/nm-dns-manager.c:371
+#: ../src/dns-manager/nm-dns-manager.c:381
 msgid "The nameservers listed below may not be recognized."
-msgstr "Нижеперечисленные сервера имён могут быть пропущены."
+msgstr "Нижеперечисленные серверы имён могут быть не распознаны."
 
-#: ../src/logging/nm-logging.c:149
+#: ../src/logging/nm-logging.c:131
 #, c-format
 msgid "Unknown log level '%s'"
 msgstr "Неизвестный уровень журналирования «%s»"
 
-#: ../src/logging/nm-logging.c:174
+#: ../src/logging/nm-logging.c:156
 #, c-format
 msgid "Unknown log domain '%s'"
 msgstr "Неизвестный домен журналирования «%s»"
 
-#: ../src/modem-manager/nm-modem-cdma.c:296 ../src/nm-device-bt.c:355
+#: ../src/modem-manager/nm-modem-cdma.c:281 ../src/nm-device-bt.c:351
 #, c-format
 msgid "CDMA connection %d"
 msgstr "Подключение CDMA %d"
 
-#: ../src/modem-manager/nm-modem-gsm.c:499 ../src/nm-device-bt.c:351
+#: ../src/modem-manager/nm-modem-gsm.c:559 ../src/nm-device-bt.c:347
 #, c-format
 msgid "GSM connection %d"
 msgstr "Подключение GSM %d"
 
-#: ../src/nm-device-bt.c:326
+#: ../src/nm-device-bond.c:192
+#, c-format
+msgid "Bond connection %d"
+msgstr "Подключение Bond %d"
+
+#: ../src/nm-device-adsl.c:193
+#, c-format
+msgid "ADSL connection %d"
+msgstr "Подключение ADSL %d"
+
+#: ../src/nm-device-bt.c:322
 #, c-format
 msgid "PAN connection %d"
 msgstr "Подключение PAN %d"
 
-#: ../src/nm-device-bt.c:359
+#: ../src/nm-device-bt.c:355
 #, c-format
 msgid "DUN connection %d"
 msgstr "Подключение DUN %d"
 
-#: ../src/nm-device-ethernet.c:1681
+#: ../src/nm-device-ethernet.c:1326
 #, c-format
 msgid "PPPoE connection %d"
 msgstr "Подключение PPoE %d"
 
-#: ../src/nm-device-ethernet.c:1681 ../src/settings/nm-settings-utils.c:50
+#: ../src/nm-device-ethernet.c:1326 ../src/settings/nm-settings-utils.c:50
 #, c-format
 msgid "Wired connection %d"
 msgstr "Проводное соединение %d"
 
-#: ../src/nm-device-olpc-mesh.c:423
+#: ../src/nm-device-infiniband.c:303
+#, c-format
+msgid "InfiniBand connection %d"
+msgstr "Подключение InfiniBand %d"
+
+#: ../src/nm-device-olpc-mesh.c:306
 #, c-format
 msgid "Mesh %d"
 msgstr "Mesh %d"
 
-#: ../src/nm-manager.c:655
+#: ../src/nm-device-vlan.c:362
+#, c-format
+msgid "VLAN connection %d"
+msgstr "Подключение VLAN %d"
+
+#: ../src/nm-manager.c:661
 #, c-format
 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
+#: ../src/nm-netlink-monitor.c:148 ../src/nm-netlink-monitor.c:272
+#: ../src/nm-netlink-monitor.c:695
 #, c-format
 msgid "error processing netlink message: %s"
 msgstr "ошибка обработки сообщения netlink: %s"
 
-#: ../src/nm-netlink-monitor.c:214
+#: ../src/nm-netlink-monitor.c:251
 msgid "error occurred while waiting for data on socket"
 msgstr "произошла ошибка при ожидании данных из сокета"
 
-#: ../src/nm-netlink-monitor.c:254
+#: ../src/nm-netlink-monitor.c:296
 #, c-format
 msgid "unable to connect to netlink for monitoring link status: %s"
 msgstr ""
-"не удаётся подключиться к netlink для отслеживания состояния соединения: %s"
+"не удалось подключиться к netlink для отслеживания состояния соединения: %s"
 
-#: ../src/nm-netlink-monitor.c:265
+#: ../src/nm-netlink-monitor.c:307
 #, c-format
 msgid "unable to enable netlink handle credential passing: %s"
-msgstr "не удаётся включить передачу мандата идентификатора netlink: %s"
+msgstr "не удалось включить передачу мандата идентификатора netlink: %s"
 
-#: ../src/nm-netlink-monitor.c:291 ../src/nm-netlink-monitor.c:353
+#: ../src/nm-netlink-monitor.c:330 ../src/nm-netlink-monitor.c:390
 #, c-format
 msgid "unable to allocate netlink handle for monitoring link status: %s"
 msgstr ""
 "не удалось создать идентификатор netlink для отслеживания состояния "
 "соединения: %s"
 
-#: ../src/nm-netlink-monitor.c:376
+#: ../src/nm-netlink-monitor.c:415
 #, c-format
 msgid "unable to allocate netlink link cache for monitoring link status: %s"
 msgstr ""
 "не удалось выделить кэш netlink для отслеживания состояния соединения: %s"
 
-#: ../src/nm-netlink-monitor.c:502
+#: ../src/nm-netlink-monitor.c:542
 #, c-format
 msgid "unable to join netlink group: %s"
 msgstr "не удалось войти в группу netlink: %s"
 
-#: ../src/nm-netlink-monitor.c:629 ../src/nm-netlink-monitor.c:642
+#: ../src/nm-netlink-monitor.c:671 ../src/nm-netlink-monitor.c:684
 #, c-format
 msgid "error updating link cache: %s"
 msgstr "ошибка обновления кэша соединения: %s"
 
-#: ../src/settings/plugins/ifcfg-rh/reader.c:3512
-#: ../src/settings/plugins/ifnet/connection_parser.c:51
+#: ../src/settings/plugins/ifcfg-rh/reader.c:93
 msgid "System"
 msgstr "Система"
 
-#~ msgid "SCOPE"
-#~ msgstr "ОБЛАСТЬ"
+#: ../src/settings/plugins/ifcfg-rh/reader.c:3663
+msgid "Bond"
+msgstr "Bond"
 
-#~ msgid "DBUS-SERVICE"
-#~ msgstr "СЛУЖБА DBUS"
-
-#~ msgid "system"
-#~ msgstr "система"
+#: ../test/nm-online.c:111
+#, c-format
+msgid "\rConnecting"
+msgstr "\rПодключение"
 
-#~ msgid "user"
-#~ msgstr "пользователь"
+#: ../test/nm-online.c:142
+msgid "Time to wait for a connection, in seconds (default is 30)"
+msgstr "Время ожидания соединения, в секундах (по умолчанию 30)"
 
-#~ msgid "System connections"
-#~ msgstr "Соединения систем"
+#: ../test/nm-online.c:143
+msgid "Exit immediately if NetworkManager is not running or connecting"
+msgstr ""
+"Выйти немедленно, если NetworkManager не запущен или выполняет подключение"
 
-#~ msgid "User connections"
-#~ msgstr "Соединения пользователя"
+#: ../test/nm-online.c:144
+msgid "Don't print anything"
+msgstr "Ничего не выводить"
 
-#~ msgid "Error: Obtaining active connection for '%s' failed."
-#~ msgstr "Ошибка: не удалось установить активное соединение для «%s»"
+#: ../test/nm-online.c:162
+msgid "Waits for a successful connection in NetworkManager."
+msgstr "Ожидать успешного соединения в NetworkManager."
 
-#~ msgid "Auto %s"
-#~ msgstr "Авто %s"
+#: ../test/nm-online.c:168 ../test/nm-online.c:177
+msgid "Invalid option.  Please use --help to see a list of valid options."
+msgstr ""
+"Неверный параметр. Используйте --help для вывода списка возможных параметров."
diff --git a/po/sl.po b/po/sl.po
index fa7d89e3..744beb3b 100644
--- a/po/sl.po
+++ b/po/sl.po
@@ -4,21 +4,21 @@
 #
 # Matic Žgur , 2007.
 # Andrej Žnidaršič , 2009 - 2010.
-# Matej Urbančič , 2010.
-# Martin Srebotnjak  , 2011.
+# Martin Srebotnjak  , 2011 - 2012.
+# Matej Urbančič , 2010 - 2012.
 #
 msgid ""
 msgstr ""
 "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: 2012-06-11 15:25+0000\n"
-"PO-Revision-Date: 2012-06-16 23:23+0100\n"
-"Last-Translator: filmsi\n"
+"POT-Creation-Date: 2012-10-19 03:25+0000\n"
+"PO-Revision-Date: 2012-10-19 09:07+0100\n"
+"Last-Translator: Matej Urbančič \n"
 "Language-Team: Slovenian GNOME Translation Team \n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: \n"
 "Plural-Forms: nplurals=4; plural=(n%100==1 ? 1 : n%100==2 ? 2 : n%100==3 || n%100==4 ? 3 : 0);\n"
 "X-Poedit-Country: SLOVENIA\n"
 "X-Poedit-Language: Slovenian\n"
@@ -122,8 +122,8 @@ msgstr "povezava je spodletela"
 #: ../cli/src/common.c:390
 #: ../cli/src/connections.c:636
 #: ../cli/src/connections.c:659
-#: ../cli/src/connections.c:1349
-#: ../cli/src/devices.c:622
+#: ../cli/src/connections.c:1351
+#: ../cli/src/devices.c:625
 #: ../cli/src/network-manager.c:123
 #: ../cli/src/network-manager.c:185
 #: ../cli/src/network-manager.c:188
@@ -134,11 +134,11 @@ msgstr "povezava je spodletela"
 #: ../cli/src/network-manager.c:486
 #: ../cli/src/network-manager.c:524
 #: ../cli/src/network-manager.c:563
-#: ../cli/src/settings.c:583
-#: ../cli/src/settings.c:611
+#: ../cli/src/settings.c:593
+#: ../cli/src/settings.c:621
 #: ../cli/src/utils.c:531
-#: ../src/main.c:462
-#: ../src/main.c:481
+#: ../src/main.c:457
+#: ../src/main.c:476
 msgid "unknown"
 msgstr "neznano"
 
@@ -163,8 +163,8 @@ msgid "The device could not be readied for configuration"
 msgstr "Naprave ni mogoče pripraviti za prilagoditev"
 
 #: ../cli/src/common.c:414
-msgid "IP configuration could not be reserved (no available address, timeout, etc)"
-msgstr "Prilagoditve IP ni mogoče rezervirati (naslov ni na voljo, časovna prekoračitev itn.)"
+msgid "IP configuration could not be reserved (no available address, timeout, etc.)"
+msgstr "Prilagoditev IP ni mogoče zadržati (naslov ni na voljo, časovna prekoračitev itn.)"
 
 #: ../cli/src/common.c:417
 msgid "The IP configuration is no longer valid"
@@ -348,13 +348,25 @@ msgstr "Odvisnost povezave je spodletela"
 
 #: ../cli/src/common.c:552
 msgid "A problem with the RFC 2684 Ethernet over ADSL bridge"
-msgstr "Težava z Ethernet RFC 2684 prek mostu ADSL"
+msgstr "Zaznane so težave z vmesnikom Ethernet RFC 2684 prek mostu ADSL"
 
 #: ../cli/src/common.c:555
+msgid "ModemManager is unavailable"
+msgstr "Program ModemManager ni na voljo."
+
+#: ../cli/src/common.c:558
+msgid "The Wi-Fi network could not be found"
+msgstr "Omrežja Wi-Fi ni mogoče najti."
+
+#: ../cli/src/common.c:561
+msgid "A secondary connection of the base connection failed"
+msgstr "Drugo povezovanje z osnovno povezavo je spodletelo."
+
+#: ../cli/src/common.c:564
 #: ../cli/src/devices.c:274
 #: ../cli/src/devices.c:290
-#: ../cli/src/devices.c:410
-#: ../cli/src/devices.c:454
+#: ../cli/src/devices.c:413
+#: ../cli/src/devices.c:457
 msgid "Unknown"
 msgstr "Neznano"
 
@@ -565,44 +577,44 @@ msgstr "nikoli"
 #: ../cli/src/connections.c:714
 #: ../cli/src/connections.c:715
 #: ../cli/src/connections.c:717
-#: ../cli/src/devices.c:418
-#: ../cli/src/devices.c:471
-#: ../cli/src/devices.c:587
-#: ../cli/src/devices.c:588
-#: ../cli/src/devices.c:589
-#: ../cli/src/devices.c:621
-#: ../cli/src/devices.c:647
-#: ../cli/src/devices.c:648
-#: ../cli/src/devices.c:649
+#: ../cli/src/devices.c:421
+#: ../cli/src/devices.c:474
+#: ../cli/src/devices.c:590
+#: ../cli/src/devices.c:591
+#: ../cli/src/devices.c:592
+#: ../cli/src/devices.c:624
 #: ../cli/src/devices.c:650
 #: ../cli/src/devices.c:651
+#: ../cli/src/devices.c:652
+#: ../cli/src/devices.c:653
+#: ../cli/src/devices.c:654
 #: ../cli/src/network-manager.c:267
-#: ../cli/src/settings.c:677
-#: ../cli/src/settings.c:747
-#: ../cli/src/settings.c:867
-#: ../cli/src/settings.c:1149
-#: ../cli/src/settings.c:1150
-#: ../cli/src/settings.c:1152
-#: ../cli/src/settings.c:1154
-#: ../cli/src/settings.c:1155
-#: ../cli/src/settings.c:1283
-#: ../cli/src/settings.c:1284
-#: ../cli/src/settings.c:1285
-#: ../cli/src/settings.c:1286
-#: ../cli/src/settings.c:1361
-#: ../cli/src/settings.c:1362
-#: ../cli/src/settings.c:1363
-#: ../cli/src/settings.c:1364
-#: ../cli/src/settings.c:1365
-#: ../cli/src/settings.c:1366
-#: ../cli/src/settings.c:1367
-#: ../cli/src/settings.c:1368
-#: ../cli/src/settings.c:1369
-#: ../cli/src/settings.c:1370
-#: ../cli/src/settings.c:1371
-#: ../cli/src/settings.c:1372
-#: ../cli/src/settings.c:1373
-#: ../cli/src/settings.c:1444
+#: ../cli/src/settings.c:712
+#: ../cli/src/settings.c:787
+#: ../cli/src/settings.c:907
+#: ../cli/src/settings.c:1189
+#: ../cli/src/settings.c:1190
+#: ../cli/src/settings.c:1192
+#: ../cli/src/settings.c:1194
+#: ../cli/src/settings.c:1195
+#: ../cli/src/settings.c:1326
+#: ../cli/src/settings.c:1327
+#: ../cli/src/settings.c:1328
+#: ../cli/src/settings.c:1329
+#: ../cli/src/settings.c:1406
+#: ../cli/src/settings.c:1407
+#: ../cli/src/settings.c:1408
+#: ../cli/src/settings.c:1409
+#: ../cli/src/settings.c:1410
+#: ../cli/src/settings.c:1411
+#: ../cli/src/settings.c:1412
+#: ../cli/src/settings.c:1413
+#: ../cli/src/settings.c:1414
+#: ../cli/src/settings.c:1415
+#: ../cli/src/settings.c:1416
+#: ../cli/src/settings.c:1417
+#: ../cli/src/settings.c:1418
+#: ../cli/src/settings.c:1489
 msgid "yes"
 msgstr "da"
 
@@ -611,45 +623,45 @@ msgstr "da"
 #: ../cli/src/connections.c:714
 #: ../cli/src/connections.c:715
 #: ../cli/src/connections.c:717
-#: ../cli/src/devices.c:418
-#: ../cli/src/devices.c:471
-#: ../cli/src/devices.c:587
-#: ../cli/src/devices.c:588
-#: ../cli/src/devices.c:589
-#: ../cli/src/devices.c:621
-#: ../cli/src/devices.c:647
-#: ../cli/src/devices.c:648
-#: ../cli/src/devices.c:649
+#: ../cli/src/devices.c:421
+#: ../cli/src/devices.c:474
+#: ../cli/src/devices.c:590
+#: ../cli/src/devices.c:591
+#: ../cli/src/devices.c:592
+#: ../cli/src/devices.c:624
 #: ../cli/src/devices.c:650
 #: ../cli/src/devices.c:651
+#: ../cli/src/devices.c:652
+#: ../cli/src/devices.c:653
+#: ../cli/src/devices.c:654
 #: ../cli/src/network-manager.c:269
-#: ../cli/src/settings.c:677
-#: ../cli/src/settings.c:679
-#: ../cli/src/settings.c:747
-#: ../cli/src/settings.c:867
-#: ../cli/src/settings.c:1149
-#: ../cli/src/settings.c:1150
-#: ../cli/src/settings.c:1152
-#: ../cli/src/settings.c:1154
-#: ../cli/src/settings.c:1155
-#: ../cli/src/settings.c:1283
-#: ../cli/src/settings.c:1284
-#: ../cli/src/settings.c:1285
-#: ../cli/src/settings.c:1286
-#: ../cli/src/settings.c:1361
-#: ../cli/src/settings.c:1362
-#: ../cli/src/settings.c:1363
-#: ../cli/src/settings.c:1364
-#: ../cli/src/settings.c:1365
-#: ../cli/src/settings.c:1366
-#: ../cli/src/settings.c:1367
-#: ../cli/src/settings.c:1368
-#: ../cli/src/settings.c:1369
-#: ../cli/src/settings.c:1370
-#: ../cli/src/settings.c:1371
-#: ../cli/src/settings.c:1372
-#: ../cli/src/settings.c:1373
-#: ../cli/src/settings.c:1444
+#: ../cli/src/settings.c:712
+#: ../cli/src/settings.c:714
+#: ../cli/src/settings.c:787
+#: ../cli/src/settings.c:907
+#: ../cli/src/settings.c:1189
+#: ../cli/src/settings.c:1190
+#: ../cli/src/settings.c:1192
+#: ../cli/src/settings.c:1194
+#: ../cli/src/settings.c:1195
+#: ../cli/src/settings.c:1326
+#: ../cli/src/settings.c:1327
+#: ../cli/src/settings.c:1328
+#: ../cli/src/settings.c:1329
+#: ../cli/src/settings.c:1406
+#: ../cli/src/settings.c:1407
+#: ../cli/src/settings.c:1408
+#: ../cli/src/settings.c:1409
+#: ../cli/src/settings.c:1410
+#: ../cli/src/settings.c:1411
+#: ../cli/src/settings.c:1412
+#: ../cli/src/settings.c:1413
+#: ../cli/src/settings.c:1414
+#: ../cli/src/settings.c:1415
+#: ../cli/src/settings.c:1416
+#: ../cli/src/settings.c:1417
+#: ../cli/src/settings.c:1418
+#: ../cli/src/settings.c:1489
 msgid "no"
 msgstr "ne"
 
@@ -659,25 +671,25 @@ msgstr "Seznam povezav"
 
 #: ../cli/src/connections.c:573
 #: ../cli/src/connections.c:1110
-#: ../cli/src/connections.c:1646
-#: ../cli/src/connections.c:1661
-#: ../cli/src/connections.c:1670
-#: ../cli/src/connections.c:1680
-#: ../cli/src/connections.c:1692
-#: ../cli/src/connections.c:1800
-#: ../cli/src/connections.c:1902
-#: ../cli/src/devices.c:1041
-#: ../cli/src/devices.c:1051
-#: ../cli/src/devices.c:1169
-#: ../cli/src/devices.c:1177
-#: ../cli/src/devices.c:1541
-#: ../cli/src/devices.c:1548
-#: ../cli/src/devices.c:1562
-#: ../cli/src/devices.c:1569
-#: ../cli/src/devices.c:1586
-#: ../cli/src/devices.c:1597
-#: ../cli/src/devices.c:1818
-#: ../cli/src/devices.c:1825
+#: ../cli/src/connections.c:1648
+#: ../cli/src/connections.c:1663
+#: ../cli/src/connections.c:1672
+#: ../cli/src/connections.c:1682
+#: ../cli/src/connections.c:1694
+#: ../cli/src/connections.c:1802
+#: ../cli/src/connections.c:1904
+#: ../cli/src/devices.c:1044
+#: ../cli/src/devices.c:1054
+#: ../cli/src/devices.c:1172
+#: ../cli/src/devices.c:1180
+#: ../cli/src/devices.c:1544
+#: ../cli/src/devices.c:1551
+#: ../cli/src/devices.c:1565
+#: ../cli/src/devices.c:1572
+#: ../cli/src/devices.c:1589
+#: ../cli/src/devices.c:1600
+#: ../cli/src/devices.c:1821
+#: ../cli/src/devices.c:1828
 #, c-format
 msgid "Error: %s argument is missing."
 msgstr "Napaka: manjka argument %s."
@@ -688,15 +700,15 @@ msgid "Error: %s - no such connection."
 msgstr "Napaka: %s - povezava ne obstaja."
 
 #: ../cli/src/connections.c:592
-#: ../cli/src/connections.c:1705
-#: ../cli/src/connections.c:1817
-#: ../cli/src/connections.c:1909
-#: ../cli/src/devices.c:825
-#: ../cli/src/devices.c:905
-#: ../cli/src/devices.c:1065
-#: ../cli/src/devices.c:1183
-#: ../cli/src/devices.c:1610
-#: ../cli/src/devices.c:1831
+#: ../cli/src/connections.c:1707
+#: ../cli/src/connections.c:1819
+#: ../cli/src/connections.c:1911
+#: ../cli/src/devices.c:828
+#: ../cli/src/devices.c:908
+#: ../cli/src/devices.c:1068
+#: ../cli/src/devices.c:1186
+#: ../cli/src/devices.c:1613
+#: ../cli/src/devices.c:1834
 #, c-format
 msgid "Unknown parameter: %s\n"
 msgstr "Neznan parameter: %s\n"
@@ -707,8 +719,8 @@ msgid "Error: no valid parameter specified."
 msgstr "Napaka: ni podanega veljavnega parametra."
 
 #: ../cli/src/connections.c:616
-#: ../cli/src/connections.c:2002
-#: ../cli/src/devices.c:2039
+#: ../cli/src/connections.c:2004
+#: ../cli/src/devices.c:2042
 #: ../cli/src/network-manager.c:596
 #, c-format
 msgid "Error: %s."
@@ -772,30 +784,30 @@ msgid "Active connection details"
 msgstr "Podrobnosti dejavne povezave"
 
 #: ../cli/src/connections.c:1060
-#: ../cli/src/connections.c:1720
-#: ../cli/src/connections.c:1832
-#: ../cli/src/connections.c:1923
-#: ../cli/src/devices.c:852
-#: ../cli/src/devices.c:914
-#: ../cli/src/devices.c:1080
-#: ../cli/src/devices.c:1213
-#: ../cli/src/devices.c:1632
-#: ../cli/src/devices.c:1860
+#: ../cli/src/connections.c:1722
+#: ../cli/src/connections.c:1834
+#: ../cli/src/connections.c:1925
+#: ../cli/src/devices.c:855
+#: ../cli/src/devices.c:917
+#: ../cli/src/devices.c:1083
+#: ../cli/src/devices.c:1216
+#: ../cli/src/devices.c:1635
+#: ../cli/src/devices.c:1863
 #: ../cli/src/network-manager.c:311
 #, c-format
 msgid "Error: Can't find out if NetworkManager is running: %s."
 msgstr "Napaka: ni mogoče ugotoviti, ali se program NetworkManager izvaja: %s."
 
 #: ../cli/src/connections.c:1064
-#: ../cli/src/connections.c:1724
-#: ../cli/src/connections.c:1836
-#: ../cli/src/connections.c:1927
-#: ../cli/src/devices.c:856
-#: ../cli/src/devices.c:918
-#: ../cli/src/devices.c:1084
-#: ../cli/src/devices.c:1217
-#: ../cli/src/devices.c:1636
-#: ../cli/src/devices.c:1864
+#: ../cli/src/connections.c:1726
+#: ../cli/src/connections.c:1838
+#: ../cli/src/connections.c:1929
+#: ../cli/src/devices.c:859
+#: ../cli/src/devices.c:921
+#: ../cli/src/devices.c:1087
+#: ../cli/src/devices.c:1220
+#: ../cli/src/devices.c:1639
+#: ../cli/src/devices.c:1867
 #: ../cli/src/network-manager.c:315
 #, c-format
 msgid "Error: NetworkManager is not running."
@@ -821,7 +833,6 @@ msgid "no active connection on device '%s'"
 msgstr "ni dejavnih povezav na napravi '%s'"
 
 #: ../cli/src/connections.c:1241
-#, c-format
 msgid "no active connection or device"
 msgstr "ni dejavne povezave ali naprave"
 
@@ -830,150 +841,150 @@ msgstr "ni dejavne povezave ali naprave"
 msgid "device '%s' not compatible with connection '%s'"
 msgstr "naprava '%s' ni združljiva s povezavo '%s'"
 
-#: ../cli/src/connections.c:1314
+#: ../cli/src/connections.c:1315
 #, c-format
 msgid "no device found for connection '%s'"
 msgstr "ni naprave za povezavo '%s'"
 
-#: ../cli/src/connections.c:1325
+#: ../cli/src/connections.c:1327
 msgid "unknown reason"
 msgstr "neznan vzrok"
 
-#: ../cli/src/connections.c:1327
+#: ../cli/src/connections.c:1329
 msgid "none"
 msgstr "brez"
 
-#: ../cli/src/connections.c:1329
+#: ../cli/src/connections.c:1331
 msgid "the user was disconnected"
 msgstr "povezava z uporabnikom je prekinjena"
 
-#: ../cli/src/connections.c:1331
+#: ../cli/src/connections.c:1333
 msgid "the base network connection was interrupted"
 msgstr "osnovna omrežna povezava je bila prekinjena"
 
-#: ../cli/src/connections.c:1333
+#: ../cli/src/connections.c:1335
 msgid "the VPN service stopped unexpectedly"
 msgstr "storitev VPN je nepričakovano zaustavljena"
 
-#: ../cli/src/connections.c:1335
+#: ../cli/src/connections.c:1337
 msgid "the VPN service returned invalid configuration"
 msgstr "storitev VPN je vrnila neveljavne nastavitve"
 
-#: ../cli/src/connections.c:1337
+#: ../cli/src/connections.c:1339
 msgid "the connection attempt timed out"
 msgstr "poskus povezave je časovno potekel"
 
-#: ../cli/src/connections.c:1339
+#: ../cli/src/connections.c:1341
 msgid "the VPN service did not start in time"
 msgstr "storitev VPN se ni pravočasno začela"
 
-#: ../cli/src/connections.c:1341
+#: ../cli/src/connections.c:1343
 msgid "the VPN service failed to start"
 msgstr "storitev VPN ni uspešno začeta"
 
-#: ../cli/src/connections.c:1343
+#: ../cli/src/connections.c:1345
 msgid "no valid VPN secrets"
 msgstr "ni veljavnih VPN skrivnosti"
 
-#: ../cli/src/connections.c:1345
+#: ../cli/src/connections.c:1347
 msgid "invalid VPN secrets"
 msgstr "neveljavne VPN skrivnosti"
 
-#: ../cli/src/connections.c:1347
+#: ../cli/src/connections.c:1349
 msgid "the connection was removed"
 msgstr "povezava je odstranjena"
 
-#: ../cli/src/connections.c:1364
-#: ../cli/src/connections.c:1569
+#: ../cli/src/connections.c:1366
+#: ../cli/src/connections.c:1571
 #, c-format
 msgid "Connection successfully activated (D-Bus active path: %s)\n"
-msgstr "Povezava uspešno aktivirana (dejavna pot D-Bus: %s)\n"
+msgstr "Povezava je uspešno vzpostavljena (dejavna pot vodila D-Bus: %s)\n"
 
 #. Active connection failed and dissapeared, quit.
-#: ../cli/src/connections.c:1369
-#: ../cli/src/connections.c:1470
+#: ../cli/src/connections.c:1371
+#: ../cli/src/connections.c:1472
 #, c-format
 msgid "Error: Connection activation failed."
 msgstr "Napaka: začenjanje povezave ni uspelo."
 
-#: ../cli/src/connections.c:1394
+#: ../cli/src/connections.c:1396
 #, c-format
 msgid "VPN connection successfully activated (D-Bus active path: %s)\n"
-msgstr "Povezava VPN uspešno aktivirana (dejavna pot D-Bus: %s)\n"
+msgstr "Povezava VPN je uspešno vzpostavljena (dejavna pot vodila D-Bus: %s)\n"
 
-#: ../cli/src/connections.c:1402
+#: ../cli/src/connections.c:1404
 #, c-format
 msgid "Error: Connection activation failed: %s."
 msgstr "Napaka: začenjanje povezave ni uspelo: %s."
 
-#: ../cli/src/connections.c:1499
-#: ../cli/src/devices.c:974
+#: ../cli/src/connections.c:1501
+#: ../cli/src/devices.c:977
 #, c-format
 msgid "Error: Timeout %d sec expired."
 msgstr "Napaka: časovna omejitev %d sekund je potekla."
 
-#: ../cli/src/connections.c:1560
+#: ../cli/src/connections.c:1562
 #, c-format
 msgid "Error: Connection activation failed: %s"
 msgstr "Napaka: začenjanje povezave ni uspelo: %s."
 
-#: ../cli/src/connections.c:1654
-#: ../cli/src/connections.c:1808
-#: ../cli/src/connections.c:1936
+#: ../cli/src/connections.c:1656
+#: ../cli/src/connections.c:1810
+#: ../cli/src/connections.c:1938
 #, c-format
 msgid "Error: Unknown connection: %s."
 msgstr "Napaka: neznana povezava: %s."
 
-#: ../cli/src/connections.c:1700
-#: ../cli/src/devices.c:1059
-#: ../cli/src/devices.c:1605
+#: ../cli/src/connections.c:1702
+#: ../cli/src/devices.c:1062
+#: ../cli/src/devices.c:1608
 #, c-format
 msgid "Error: timeout value '%s' is not valid."
 msgstr "Napaka: vrednost časovne omejitve '%s' ni veljavna."
 
-#: ../cli/src/connections.c:1713
-#: ../cli/src/connections.c:1825
-#: ../cli/src/connections.c:1916
+#: ../cli/src/connections.c:1715
+#: ../cli/src/connections.c:1827
+#: ../cli/src/connections.c:1918
 #, c-format
 msgid "Error: id or uuid has to be specified."
 msgstr "Napaka: podatek id ali uuid ni naveden."
 
-#: ../cli/src/connections.c:1745
+#: ../cli/src/connections.c:1747
 #, c-format
 msgid "Error: No suitable device found: %s."
 msgstr "Napaka: ni mogoče najti ustrezne naprave: %s."
 
-#: ../cli/src/connections.c:1747
+#: ../cli/src/connections.c:1749
 #, c-format
 msgid "Error: No suitable device found."
 msgstr "Napaka: ni mogoče najti ustrezne naprave."
 
-#: ../cli/src/connections.c:1861
+#: ../cli/src/connections.c:1863
 #, c-format
 msgid "Warning: Connection not active\n"
 msgstr "Opozorilo: povezava ni dejavna\n"
 
-#: ../cli/src/connections.c:1875
+#: ../cli/src/connections.c:1877
 #, c-format
 msgid "Error: Connection deletion failed: %s"
 msgstr "Napaka: brisanje povezave ni uspelo: %s"
 
-#: ../cli/src/connections.c:1993
+#: ../cli/src/connections.c:1995
 #, c-format
 msgid "Error: 'con' command '%s' is not valid."
 msgstr "Napaka: ukaz 'con' '%s' ni veljaven."
 
-#: ../cli/src/connections.c:2061
+#: ../cli/src/connections.c:2063
 #, c-format
 msgid "Error: could not connect to D-Bus."
 msgstr "Napaka: povezava z D-Bus ni mogoča."
 
-#: ../cli/src/connections.c:2069
+#: ../cli/src/connections.c:2071
 #, c-format
 msgid "Error: Could not get system settings."
 msgstr "Napaka: ni mogoče pridobiti sistemskih nastavitev."
 
-#: ../cli/src/connections.c:2079
+#: ../cli/src/connections.c:2081
 #, c-format
 msgid "Error: Can't obtain connections: settings service is not running."
 msgstr "Napaka: ni mogoče pridobiti povezav: storitev nastavitev ni zagnana."
@@ -1000,6 +1011,7 @@ msgstr "WIFI-LASTNOSTI"
 
 #. 2
 #: ../cli/src/devices.c:85
+#: ../cli/src/devices.c:411
 msgid "AP"
 msgstr "AP"
 
@@ -1057,15 +1069,13 @@ msgstr "GONILNIK"
 
 #. 5
 #: ../cli/src/devices.c:111
-#| msgid "VERSION"
 msgid "DRIVER-VERSION"
 msgstr "RAZLIČICA-GONILNIKA"
 
 #. 6
 #: ../cli/src/devices.c:112
-#| msgid "FIRMWARE-MISSING"
 msgid "FIRMWARE-VERSION"
-msgstr "RAZLIČICA-STROJNEGA-PROGRAMA"
+msgstr "RAZLIČICA-STROJNE-PROGRAMSKE-OPREME"
 
 #. 7
 #: ../cli/src/devices.c:113
@@ -1291,240 +1301,240 @@ msgstr "Podjetniški "
 msgid "Ad-Hoc"
 msgstr "Ad-Hoc"
 
-#: ../cli/src/devices.c:410
+#: ../cli/src/devices.c:412
 msgid "Infrastructure"
 msgstr "infrastruktura"
 
-#: ../cli/src/devices.c:445
+#: ../cli/src/devices.c:448
 msgid "Home"
 msgstr "Domov"
 
-#: ../cli/src/devices.c:448
+#: ../cli/src/devices.c:451
 msgid "Partner"
 msgstr "Partner"
 
-#: ../cli/src/devices.c:451
+#: ../cli/src/devices.c:454
 msgid "Roaming"
 msgstr "Gostovanje"
 
-#: ../cli/src/devices.c:523
+#: ../cli/src/devices.c:526
 #, c-format
 msgid "Error: 'dev list': %s"
 msgstr "Napaka: 'dev list': %s"
 
-#: ../cli/src/devices.c:525
+#: ../cli/src/devices.c:528
 #, c-format
 msgid "Error: 'dev list': %s; allowed fields: %s"
 msgstr "Napaka: 'dev list': %s; dovoljena polja: %s"
 
-#: ../cli/src/devices.c:534
+#: ../cli/src/devices.c:537
 msgid "Device details"
 msgstr "Podrobnosti naprave"
 
-#: ../cli/src/devices.c:579
 #: ../cli/src/devices.c:582
-#: ../cli/src/devices.c:1000
+#: ../cli/src/devices.c:585
+#: ../cli/src/devices.c:1003
 #: ../cli/src/utils.c:477
 msgid "(unknown)"
 msgstr "(neznano)"
 
-#: ../cli/src/devices.c:591
+#: ../cli/src/devices.c:594
 msgid "not connected"
 msgstr "brez povezave"
 
-#: ../cli/src/devices.c:618
+#: ../cli/src/devices.c:621
 #, c-format
 msgid "%u Mb/s"
 msgstr "%u Mb/s"
 
 #. Print header
 #. "WIRED-PROPERTIES"
-#: ../cli/src/devices.c:691
+#: ../cli/src/devices.c:694
 msgid "on"
 msgstr "omogočeno"
 
-#: ../cli/src/devices.c:691
+#: ../cli/src/devices.c:694
 msgid "off"
 msgstr "onemogočeno"
 
-#: ../cli/src/devices.c:842
+#: ../cli/src/devices.c:845
 #, c-format
 msgid "Error: 'dev status': %s"
 msgstr "Napaka: 'dev status': %s"
 
-#: ../cli/src/devices.c:844
+#: ../cli/src/devices.c:847
 #, c-format
 msgid "Error: 'dev status': %s; allowed fields: %s"
 msgstr "Napaka: 'dev status': %s; dovoljena polja: %s"
 
-#: ../cli/src/devices.c:867
+#: ../cli/src/devices.c:870
 msgid "Status of devices"
 msgstr "Stanje naprav"
 
-#: ../cli/src/devices.c:898
+#: ../cli/src/devices.c:901
 #, c-format
 msgid "Error: '%s' argument is missing."
 msgstr "Napaka: manjka argument '%s'"
 
-#: ../cli/src/devices.c:939
-#: ../cli/src/devices.c:1104
-#: ../cli/src/devices.c:1245
-#: ../cli/src/devices.c:1892
+#: ../cli/src/devices.c:942
+#: ../cli/src/devices.c:1107
+#: ../cli/src/devices.c:1248
+#: ../cli/src/devices.c:1895
 #, c-format
 msgid "Error: Device '%s' not found."
 msgstr "Napaka: naprave '%s' ni mogoče najti"
 
-#: ../cli/src/devices.c:962
+#: ../cli/src/devices.c:965
 #, c-format
 msgid "Success: Device '%s' successfully disconnected."
 msgstr "Obvestilo: povezava naprave '%s' je uspešno prekinjena."
 
-#: ../cli/src/devices.c:997
+#: ../cli/src/devices.c:1000
 #, c-format
 msgid "Error: Device '%s' (%s) disconnecting failed: %s"
 msgstr "Napaka: prišlo je do napake med prekinjanjem naprave '%s' (%s): %s"
 
-#: ../cli/src/devices.c:1010
+#: ../cli/src/devices.c:1013
 #, c-format
 msgid "Device '%s' has been disconnected.\n"
-msgstr "Naprava '%s' je bila odklopljena.\n"
+msgstr "Naprava '%s' je odklopljena.\n"
 
-#: ../cli/src/devices.c:1073
+#: ../cli/src/devices.c:1076
 #, c-format
 msgid "Error: iface has to be specified."
 msgstr "Napaka: iface nastavitev mora določena."
 
-#: ../cli/src/devices.c:1203
+#: ../cli/src/devices.c:1206
 #, c-format
 msgid "Error: 'dev wifi': %s"
 msgstr "Napaka: 'dev wifi': %s"
 
-#: ../cli/src/devices.c:1205
+#: ../cli/src/devices.c:1208
 #, c-format
 msgid "Error: 'dev wifi': %s; allowed fields: %s"
 msgstr "Napaka: 'dev wifi': %s; dovoljena polja: %s"
 
-#: ../cli/src/devices.c:1228
+#: ../cli/src/devices.c:1231
 msgid "WiFi scan list"
 msgstr "WiFi seznam preiskovanja"
 
-#: ../cli/src/devices.c:1265
-#: ../cli/src/devices.c:1319
+#: ../cli/src/devices.c:1268
+#: ../cli/src/devices.c:1322
 #, c-format
 msgid "Error: Access point with bssid '%s' not found."
 msgstr "Napaka: dostopne točke z bssid '%s' ni mogoče najti."
 
-#: ../cli/src/devices.c:1282
+#: ../cli/src/devices.c:1285
 #, c-format
 msgid "Error: Device '%s' is not a WiFi device."
 msgstr "Napaka: naprava '%s' ni veljavna WiFi naprava."
 
-#: ../cli/src/devices.c:1350
-#: ../cli/src/devices.c:1396
+#: ../cli/src/devices.c:1353
+#: ../cli/src/devices.c:1399
 #, c-format
 msgid "Connection with UUID '%s' created and activated on device '%s'\n"
-msgstr "Povezava z UUID '%s' na napravi '%s' ustvarjena in aktivirana\n"
+msgstr "Povezava z UUID '%s' na napravi '%s' je ustvarjena in omogočena.\n"
 
-#: ../cli/src/devices.c:1355
+#: ../cli/src/devices.c:1358
 #, c-format
 msgid "Error: Connection activation failed: (%d) %s."
 msgstr "Napaka: začenjanje povezave ni uspelo: (%d) %s."
 
-#: ../cli/src/devices.c:1380
+#: ../cli/src/devices.c:1383
 #, c-format
 msgid "Error: Failed to add/activate new connection: (%d) %s"
-msgstr "Napaka: dodajanje/aktiviranje nove povezave je spodletelo: (%d) %s"
+msgstr "Napaka: dodajanje ali vzpostavljanje nove povezave je spodletelo: (%d) %s."
 
-#: ../cli/src/devices.c:1388
+#: ../cli/src/devices.c:1391
 #, c-format
 msgid "Error: Failed to add/activate new connection: Unknown error"
-msgstr "Napaka: dodajanje/aktivacija nove povezave ni uspela - neznana napaka"
+msgstr "Napaka: dodajanje ali vzpostavljanje nove povezave je spodletelo: neznana napaka."
 
-#: ../cli/src/devices.c:1532
+#: ../cli/src/devices.c:1535
 #, c-format
 msgid "Error: SSID or BSSID are missing."
-msgstr "Napaka: manjka SSID ali BSSID."
+msgstr "Napaka: manjka podatek SSID ali BSSID."
 
-#: ../cli/src/devices.c:1555
+#: ../cli/src/devices.c:1558
 #, c-format
 msgid "Error: bssid argument value '%s' is not a valid BSSID."
 msgstr "Napaka: vrednost bssid '%s' ni veljavna oznaka BSSID."
 
-#: ../cli/src/devices.c:1579
+#: ../cli/src/devices.c:1582
 #, c-format
 msgid "Error: wep-key-type argument value '%s' is invalid, use 'key' or 'phrase'."
-msgstr "Napaka: vrednost wep-key-type '%s' ni veljavna, uporabite zgolj 'key' ali 'phrase'."
+msgstr "Napaka: vrednost wep-key-type '%s' ni veljavna, uporabljena sta lahko le 'key' ali 'phrase'."
 
-#: ../cli/src/devices.c:1619
+#: ../cli/src/devices.c:1622
 #, c-format
 msgid "Error: BSSID to connect to (%s) differs from bssid argument (%s)."
 msgstr "Napaka: BSSID za povezavo z (%s) se razlikuje od podane vrednosti bssid (%s)."
 
-#: ../cli/src/devices.c:1625
+#: ../cli/src/devices.c:1628
 #, c-format
 msgid "Error: Parameter '%s' is neither SSID nor BSSID."
 msgstr "Napaka: parameter '%s' ni niti SSID niti BSSID."
 
-#: ../cli/src/devices.c:1654
+#: ../cli/src/devices.c:1657
 #, c-format
 msgid "Error: Device '%s' is not a Wi-Fi device."
 msgstr "Napaka: naprava '%s' ni naprava WiFi."
 
-#: ../cli/src/devices.c:1656
+#: ../cli/src/devices.c:1659
 #, c-format
 msgid "Error: No Wi-Fi device found."
 msgstr "Napaka: naprave WiFi ni mogoče najti."
 
-#: ../cli/src/devices.c:1674
+#: ../cli/src/devices.c:1677
 #, c-format
 msgid "Error: No network with SSID '%s' found."
 msgstr "Napaka: omrežja s SSID '%s' ni mogoče najti."
 
-#: ../cli/src/devices.c:1676
+#: ../cli/src/devices.c:1679
 #, c-format
 msgid "Error: No access point with BSSID '%s' found."
 msgstr "Napaka: dostopne točke z BSSID '%s' ni mogoče najti."
 
-#: ../cli/src/devices.c:1774
+#: ../cli/src/devices.c:1777
 #, c-format
 msgid "Error: 'dev wifi' command '%s' is not valid."
 msgstr "Napaka: 'dev wifi' ukaz '%s' ni veljaven."
 
-#: ../cli/src/devices.c:1850
+#: ../cli/src/devices.c:1853
 #, c-format
 msgid "Error: 'dev wimax': %s"
 msgstr "Napaka: 'dev wimax': %s"
 
-#: ../cli/src/devices.c:1852
+#: ../cli/src/devices.c:1855
 #, c-format
 msgid "Error: 'dev wimax': %s; allowed fields: %s"
 msgstr "Napaka: 'dev wimax': %s; dovoljena polja: %s"
 
-#: ../cli/src/devices.c:1875
+#: ../cli/src/devices.c:1878
 msgid "WiMAX NSP list"
 msgstr "Seznam ponudnikov storitev WiMAX"
 
-#: ../cli/src/devices.c:1912
+#: ../cli/src/devices.c:1915
 #, c-format
 msgid "Error: NSP with name '%s' not found."
 msgstr "Napaka: ponudnika omrežnih storitev '%s' ni mogoče najti"
 
-#: ../cli/src/devices.c:1923
+#: ../cli/src/devices.c:1926
 #, c-format
 msgid "Error: Device '%s' is not a WiMAX device."
 msgstr "Napaka: naprava '%s' ni naprava WiMAX."
 
-#: ../cli/src/devices.c:1954
+#: ../cli/src/devices.c:1957
 #, c-format
 msgid "Error: Access point with nsp '%s' not found."
 msgstr "Napaka: dostopne točke z nsp '%s' ni mogoče najti."
 
-#: ../cli/src/devices.c:1981
+#: ../cli/src/devices.c:1984
 #, c-format
 msgid "Error: 'dev wimax' command '%s' is not valid."
 msgstr "Napaka: 'dev wimax' ukaz '%s' ni veljaven."
 
-#: ../cli/src/devices.c:2031
+#: ../cli/src/devices.c:2034
 #, c-format
 msgid "Error: 'dev' command '%s' is not valid."
 msgstr "Napaka: 'dev' ukaz '%s' ni veljaven."
@@ -1703,7 +1713,7 @@ msgstr "Napaka: 'nm permissions': %s; dovoljena polja: %s"
 
 #: ../cli/src/network-manager.c:324
 msgid "NetworkManager permissions"
-msgstr "Pravice NetworkManager"
+msgstr "Dovoljenja programa NetworkManager"
 
 #: ../cli/src/network-manager.c:350
 #: ../cli/src/utils.c:457
@@ -1780,7 +1790,7 @@ msgstr "Napaka: neveljaven parameter 'wimax': '%s'."
 msgid "Error: 'nm' command '%s' is not valid."
 msgstr "Napaka: ukaz 'nm' '%s' ni veljaven"
 
-#: ../cli/src/nmcli.c:64
+#: ../cli/src/nmcli.c:76
 #, c-format
 msgid ""
 "Usage: %s [OPTIONS] OBJECT { COMMAND | help }\n"
@@ -1819,165 +1829,181 @@ msgstr ""
 "dev naprave, upravljane s programom NetworkManager\n"
 "\n"
 
-#: ../cli/src/nmcli.c:109
+#: ../cli/src/nmcli.c:121
 #, c-format
 msgid "Error: Object '%s' is unknown, try 'nmcli help'."
 msgstr "Napaka: predmeta '%s' ni mogoče prepoznati, poskusite: 'nmcli help'."
 
-#: ../cli/src/nmcli.c:139
+#: ../cli/src/nmcli.c:151
 #, c-format
 msgid "Error: Option '--terse' is specified the second time."
 msgstr "Napaka: možnost '--terse' je podana dvakrat."
 
-#: ../cli/src/nmcli.c:144
+#: ../cli/src/nmcli.c:156
 #, c-format
 msgid "Error: Option '--terse' is mutually exclusive with '--pretty'."
 msgstr "Napaka: možnosti \"--terse\" in \"--pretty\" se med seboj izključujeta."
 
-#: ../cli/src/nmcli.c:152
+#: ../cli/src/nmcli.c:164
 #, c-format
 msgid "Error: Option '--pretty' is specified the second time."
 msgstr "Napaka: možnost '--pretty' je podana dvakrat."
 
-#: ../cli/src/nmcli.c:157
+#: ../cli/src/nmcli.c:169
 #, c-format
 msgid "Error: Option '--pretty' is mutually exclusive with '--terse'."
 msgstr "Napaka: možnosti \"--pretty\" in \"--tearse\" se med seboj izključujeta."
 
-#: ../cli/src/nmcli.c:167
-#: ../cli/src/nmcli.c:183
+#: ../cli/src/nmcli.c:179
+#: ../cli/src/nmcli.c:195
 #, c-format
 msgid "Error: missing argument for '%s' option."
 msgstr "Napaka: manjka argument za možnost '%s'."
 
-#: ../cli/src/nmcli.c:176
-#: ../cli/src/nmcli.c:192
+#: ../cli/src/nmcli.c:188
+#: ../cli/src/nmcli.c:204
 #, c-format
 msgid "Error: '%s' is not valid argument for '%s' option."
 msgstr "Napaka: '%s' ni veljaven argument za možnost '%s'."
 
-#: ../cli/src/nmcli.c:199
+#: ../cli/src/nmcli.c:211
 #, c-format
 msgid "Error: fields for '%s' options are missing."
 msgstr "Napaka: polja za možnosti '%s' manjkajo."
 
-#: ../cli/src/nmcli.c:207
+#: ../cli/src/nmcli.c:219
 #, c-format
 msgid "nmcli tool, version %s\n"
 msgstr "nmcli orodje, različica %s\n"
 
-#: ../cli/src/nmcli.c:213
+#: ../cli/src/nmcli.c:225
 #, c-format
 msgid "Error: Option '%s' is unknown, try 'nmcli -help'."
 msgstr "Napaka: možnost '%s' ni prepoznana, poskusite 'nmcli -help'."
 
-#: ../cli/src/nmcli.c:232
+#: ../cli/src/nmcli.c:244
 #, c-format
 msgid "Caught signal %d, shutting down..."
 msgstr "Ujet signal %d, povezava bo izklopljena ..."
 
-#: ../cli/src/nmcli.c:257
+#: ../cli/src/nmcli.c:269
 msgid "Error: Could not create NMClient object."
 msgstr "Napaka: ni mogoče ustvariti predmeta NMClient."
 
-#: ../cli/src/nmcli.c:273
+#: ../cli/src/nmcli.c:285
 msgid "Success"
 msgstr "Uspešno zaključeno"
 
-#: ../cli/src/settings.c:517
+#: ../cli/src/settings.c:527
 #, c-format
 msgid "%d (hex-ascii-key)"
 msgstr "%d (šestnajstiški-ascii-ključ)"
 
-#: ../cli/src/settings.c:519
+#: ../cli/src/settings.c:529
 #, c-format
 msgid "%d (104/128-bit passphrase)"
 msgstr "%d (104/128-bitno šifrirno geslo)"
 
-#: ../cli/src/settings.c:522
+#: ../cli/src/settings.c:532
+#: ../cli/src/settings.c:660
 #, c-format
 msgid "%d (unknown)"
 msgstr "%d (neznano)"
 
-#: ../cli/src/settings.c:548
+#: ../cli/src/settings.c:558
 msgid "0 (unknown)"
 msgstr "0 (neznano)"
 
-#: ../cli/src/settings.c:554
+#: ../cli/src/settings.c:564
 msgid "any, "
 msgstr "karkoli, "
 
-#: ../cli/src/settings.c:556
+#: ../cli/src/settings.c:566
 msgid "900 MHz, "
 msgstr "900 MHz, "
 
-#: ../cli/src/settings.c:558
+#: ../cli/src/settings.c:568
 msgid "1800 MHz, "
 msgstr "1800 MHz, "
 
-#: ../cli/src/settings.c:560
+#: ../cli/src/settings.c:570
 msgid "1900 MHz, "
 msgstr "1900 MHz, "
 
-#: ../cli/src/settings.c:562
+#: ../cli/src/settings.c:572
 msgid "850 MHz, "
 msgstr "850 MHz, "
 
-#: ../cli/src/settings.c:564
+#: ../cli/src/settings.c:574
 msgid "WCDMA 3GPP UMTS 2100 MHz, "
 msgstr "WCDMA 3GPP UMTS 2100 MHz, "
 
-#: ../cli/src/settings.c:566
+#: ../cli/src/settings.c:576
 msgid "WCDMA 3GPP UMTS 1800 MHz, "
 msgstr "WCDMA 3GPP UMTS 1800 MHz, "
 
-#: ../cli/src/settings.c:568
+#: ../cli/src/settings.c:578
 msgid "WCDMA 3GPP UMTS 1700/2100 MHz, "
 msgstr "WCDMA 3GPP UMTS 1700/2100 MHz, "
 
-#: ../cli/src/settings.c:570
+#: ../cli/src/settings.c:580
 msgid "WCDMA 3GPP UMTS 800 MHz, "
 msgstr "WCDMA 3GPP UMTS 800 MHz, "
 
-#: ../cli/src/settings.c:572
+#: ../cli/src/settings.c:582
 msgid "WCDMA 3GPP UMTS 850 MHz, "
 msgstr "WCDMA 3GPP UMTS 850 MHz, "
 
-#: ../cli/src/settings.c:574
+#: ../cli/src/settings.c:584
 msgid "WCDMA 3GPP UMTS 900 MHz, "
 msgstr "WCDMA 3GPP UMTS 900 MHz, "
 
-#: ../cli/src/settings.c:576
+#: ../cli/src/settings.c:586
 msgid "WCDMA 3GPP UMTS 1700 MHz, "
 msgstr "WCDMA 3GPP UMTS 1700 MHz, "
 
-#: ../cli/src/settings.c:578
+#: ../cli/src/settings.c:588
 msgid "WCDMA 3GPP UMTS 1900 MHz, "
 msgstr "WCDMA 3GPP UMTS 900 MHz, "
 
-#: ../cli/src/settings.c:580
+#: ../cli/src/settings.c:590
 msgid "WCDMA 3GPP UMTS 2600 MHz, "
 msgstr "WCDMA 3GPP UMTS 2100 MHz, "
 
-#: ../cli/src/settings.c:598
+#: ../cli/src/settings.c:608
 msgid "0 (NONE)"
 msgstr "0 (BREZ)"
 
-#: ../cli/src/settings.c:604
+#: ../cli/src/settings.c:614
 msgid "REORDER_HEADERS, "
 msgstr "PRERAZVRSTI_GLAVE,"
 
-#: ../cli/src/settings.c:606
+#: ../cli/src/settings.c:616
 msgid "GVRP, "
 msgstr "GVRP,"
 
-#: ../cli/src/settings.c:608
+#: ../cli/src/settings.c:618
 msgid "LOOSE_BINDING, "
 msgstr "OHLAPNE_VEZAVE,"
 
-#: ../cli/src/settings.c:751
-#: ../cli/src/settings.c:947
-#: ../cli/src/settings.c:1651
+#: ../cli/src/settings.c:654
+#, c-format
+msgid "%d (disabled)"
+msgstr "%d (onemogočeno)"
+
+#: ../cli/src/settings.c:656
+#, c-format
+msgid "%d (enabled, prefer public IP)"
+msgstr "%d (omogočeno, prednostno izbran javni IP)"
+
+#: ../cli/src/settings.c:658
+#, c-format
+msgid "%d (enabled, prefer temporary IP)"
+msgstr "%d (omogočeno, prednostno izbran začasni IP)"
+
+#: ../cli/src/settings.c:791
+#: ../cli/src/settings.c:987
+#: ../cli/src/settings.c:1696
 msgid "auto"
 msgstr "samodejno"
 
@@ -2002,7 +2028,6 @@ msgid "invalid field '%s'"
 msgstr "neveljavno polje '%s'"
 
 #: ../cli/src/utils.c:254
-#, c-format
 msgid "Option '--terse' requires specifying '--fields'"
 msgstr "Možnost '--terse' zahteva podan argument '--fields'"
 
@@ -2380,139 +2405,139 @@ msgstr "Datoteke PCKS#12 ni mogoče preveriti: %d"
 msgid "Could not generate random data."
 msgstr "Naključnih podatkov ni mogoče ustvariti."
 
-#: ../libnm-util/nm-utils.c:2040
+#: ../libnm-util/nm-utils.c:2078
 #, c-format
 msgid "Not enough memory to make encryption key."
 msgstr "Ni dovolj pomnilnika za ustvarjanje šifrirnega ključa."
 
-#: ../libnm-util/nm-utils.c:2150
+#: ../libnm-util/nm-utils.c:2188
 msgid "Could not allocate memory for PEM file creation."
 msgstr "Ni mogoče dodeliti pomnilnika za ustvarjanje datoteke PEM."
 
-#: ../libnm-util/nm-utils.c:2162
+#: ../libnm-util/nm-utils.c:2200
 #, c-format
 msgid "Could not allocate memory for writing IV to PEM file."
 msgstr "Ni mogoče dodeliti pomnilnika za zapis IV v datoteko PEM."
 
-#: ../libnm-util/nm-utils.c:2174
+#: ../libnm-util/nm-utils.c:2212
 #, c-format
 msgid "Could not allocate memory for writing encrypted key to PEM file."
 msgstr "Ni mogoče dodeliti pomnilnika za zapis šifriranega ključa v datoteko PEM."
 
-#: ../libnm-util/nm-utils.c:2193
+#: ../libnm-util/nm-utils.c:2231
 #, c-format
 msgid "Could not allocate memory for PEM file data."
 msgstr "Ni mogoče dodeliti pomnilnika za podatke datoteke PEM."
 
-#: ../policy/org.freedesktop.NetworkManager.policy.in.h:1
+#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:1
 msgid "Enable or disable system networking"
 msgstr "Omogoči ali onemogoči sistemske omrežne povezave"
 
-#: ../policy/org.freedesktop.NetworkManager.policy.in.h:2
+#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:2
 msgid "System policy prevents enabling or disabling system networking"
 msgstr "Sistemska določila preprečujejo omogočanje ali onemogočanje omrežnih povezav."
 
-#: ../policy/org.freedesktop.NetworkManager.policy.in.h:3
+#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:3
 msgid "Put NetworkManager to sleep or wake it up (should only be used by system power management)"
 msgstr "Postavi program NetworkManager v mirovanje ali iz njega (možnost je namenjena upravljanju napajanja)"
 
-#: ../policy/org.freedesktop.NetworkManager.policy.in.h:4
+#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:4
 msgid "System policy prevents putting NetworkManager to sleep or waking it up"
 msgstr "Sistemska določila preprečujejo postavitev programa NetworkManager v mirovanje ali iz njega."
 
-#: ../policy/org.freedesktop.NetworkManager.policy.in.h:5
+#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:5
 msgid "Enable or disable WiFi devices"
 msgstr "Omogoči ali onemogoči naprave WiFi"
 
-#: ../policy/org.freedesktop.NetworkManager.policy.in.h:6
+#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:6
 msgid "System policy prevents enabling or disabling WiFi devices"
 msgstr "Sistemska določila preprečujejo omogočanja ali onemogočanje WiFi naprav"
 
-#: ../policy/org.freedesktop.NetworkManager.policy.in.h:7
+#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:7
 msgid "Enable or disable mobile broadband devices"
 msgstr "Omogoči ali onemogoči naprave mobilnih širokopasovnih storitev"
 
-#: ../policy/org.freedesktop.NetworkManager.policy.in.h:8
+#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:8
 msgid "System policy prevents enabling or disabling mobile broadband devices"
 msgstr "Sistemska določila preprečuje omogočanja ali onemogočanje mobilne širokopasovne naprave"
 
-#: ../policy/org.freedesktop.NetworkManager.policy.in.h:9
+#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:9
 msgid "Enable or disable WiMAX mobile broadband devices"
 msgstr "Omogoči ali onemogoči mobilne širokopasovne naprave WiMAX"
 
-#: ../policy/org.freedesktop.NetworkManager.policy.in.h:10
+#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:10
 msgid "System policy prevents enabling or disabling WiMAX mobile broadband devices"
 msgstr "Sistemska določila preprečujejo omogočanje ali onemogočanje mobilnih širokopasovnih naprav WiMAX"
 
-#: ../policy/org.freedesktop.NetworkManager.policy.in.h:11
+#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:11
 msgid "Allow control of network connections"
 msgstr "Dovoli nadzor omrežnih povezav"
 
-#: ../policy/org.freedesktop.NetworkManager.policy.in.h:12
+#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:12
 msgid "System policy prevents control of network connections"
 msgstr "Sistemska določila preprečujejo nadzor omrežnih povezav"
 
-#: ../policy/org.freedesktop.NetworkManager.policy.in.h:13
+#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:13
 msgid "Connection sharing via a protected WiFi network"
 msgstr "Souporaba povezave preko zaščitenega WiFi omrežja"
 
-#: ../policy/org.freedesktop.NetworkManager.policy.in.h:14
+#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:14
 msgid "System policy prevents sharing connections via a protected WiFi network"
 msgstr "Sistemska pravila preprečujejo souporabo povezav preko zaščitenega WiFi omrežja"
 
-#: ../policy/org.freedesktop.NetworkManager.policy.in.h:15
+#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:15
 msgid "Connection sharing via an open WiFi network"
 msgstr "Souporaba povezave preko odprtega WiFi omrežja"
 
-#: ../policy/org.freedesktop.NetworkManager.policy.in.h:16
+#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:16
 msgid "System policy prevents sharing connections via an open WiFi network"
 msgstr "Sistemska pravila preprečujejo souporabo povezav preko odprtega WiFi omrežja"
 
-#: ../policy/org.freedesktop.NetworkManager.policy.in.h:17
+#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:17
 msgid "Modify personal network connections"
 msgstr "Spremeni osebne omrežne povezave"
 
-#: ../policy/org.freedesktop.NetworkManager.policy.in.h:18
+#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:18
 msgid "System policy prevents modification of personal network settings"
 msgstr "Sistemska določila preprečujejo spreminjanje osebnih omrežnih nastavitev"
 
-#: ../policy/org.freedesktop.NetworkManager.policy.in.h:19
+#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:19
 msgid "Modify network connections for all users"
 msgstr "Spremeni omrežne povezave za vse uporabnike"
 
-#: ../policy/org.freedesktop.NetworkManager.policy.in.h:20
+#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:20
 msgid "System policy prevents modification of network settings for all users"
 msgstr "Sistemska določila preprečujejo spreminjanje sistemskih nastavitev za vse uporabnike"
 
-#: ../policy/org.freedesktop.NetworkManager.policy.in.h:21
+#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:21
 msgid "Modify persistent system hostname"
 msgstr "Spremeni trajno sistemsko ime gostitelja"
 
-#: ../policy/org.freedesktop.NetworkManager.policy.in.h:22
+#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:22
 msgid "System policy prevents modification of the persistent system hostname"
 msgstr "Sistemska pravila preprečujejo spremembo imena gostitelja trajnega sistema"
 
-#: ../src/main.c:158
+#: ../src/main.c:159
 #, c-format
 msgid "Failed to set signal mask: %d"
 msgstr "Določanje maske signala je spodletelo: %d"
 
-#: ../src/main.c:167
+#: ../src/main.c:168
 #, c-format
 msgid "Failed to create signal handling thread: %d"
 msgstr "Ustvarjanje niti obravnave signala je spodletelo: %d"
 
-#: ../src/main.c:182
+#: ../src/main.c:183
 #, c-format
 msgid "Opening %s failed: %s\n"
 msgstr "Odpiranje %s je spodletelo: %s\n"
 
-#: ../src/main.c:188
+#: ../src/main.c:189
 #, c-format
 msgid "Writing to %s failed: %s\n"
 msgstr "Zapisovanje v %s je spodletelo: %s\n"
 
-#: ../src/main.c:193
+#: ../src/main.c:194
 #, c-format
 msgid "Closing %s failed: %s\n"
 msgstr "Zapiranje %s je spodletelo: %s\n"
@@ -2522,76 +2547,92 @@ msgstr "Zapiranje %s je spodletelo: %s\n"
 msgid "NetworkManager is already running (pid %ld)\n"
 msgstr "Program NetworkManager je že zagnan (pid %ld)\n"
 
-#: ../src/main.c:376
+#: ../src/main.c:375
 msgid "Print NetworkManager version and exit"
 msgstr "Izpiši različico programa NetworkManager in končaj"
 
-#: ../src/main.c:377
+#: ../src/main.c:376
 msgid "Don't become a daemon"
 msgstr "Ne postani ozadnji program"
 
-#: ../src/main.c:378
+#: ../src/main.c:377
 msgid "Make all warnings fatal"
 msgstr "Vsa opozorila naj bodo podana kot usodna"
 
-#: ../src/main.c:379
+#: ../src/main.c:378
 msgid "Specify the location of a PID file"
 msgstr "Določite mesto datoteke PID"
 
-#: ../src/main.c:379
+#: ../src/main.c:378
 msgid "filename"
 msgstr "ime datoteke"
 
-#: ../src/main.c:380
+#: ../src/main.c:379
 msgid "State file location"
 msgstr "Mesto datoteke stanja"
 
-#: ../src/main.c:380
+#: ../src/main.c:379
 msgid "/path/to/state.file"
 msgstr "/pot/do/state.file"
 
-#: ../src/main.c:381
+#: ../src/main.c:380
 msgid "Config file location"
 msgstr "Mesto datoteke nastavitev"
 
-#: ../src/main.c:381
+#: ../src/main.c:380
 msgid "/path/to/config.file"
 msgstr "/pot/do/config.file"
 
-#: ../src/main.c:382
+#: ../src/main.c:381
 msgid "List of plugins separated by ','"
 msgstr "Seznam vstavkov, ločenih z vejico"
 
-#: ../src/main.c:382
+#: ../src/main.c:381
 msgid "plugin1,plugin2"
 msgstr "vstavek1,vstavek2"
 
 #. Translators: Do not translate the values in the square brackets
-#: ../src/main.c:384
+#: ../src/main.c:383
 msgid "Log level: one of [ERR, WARN, INFO, DEBUG]"
 msgstr "Raven beleženja: ena izmed [ERR, WARN, INFO, DEBUG]"
 
 #. Translators: Do not translate the values in the square brackets
-#: ../src/main.c:387
+#: ../src/main.c:386
 msgid ""
 "Log domains separated by ',': any combination of\n"
-"                                          [NONE,HW,RFKILL,ETHER,WIFI,BT,MB,DHCP4,DHCP6,PPP,\n"
-"                                           WIFI_SCAN,IP4,IP6,AUTOIP4,DNS,VPN,SHARING,SUPPLICANT,\n"
-"                                           AGENTS,SETTINGS,SUSPEND,CORE,DEVICE,OLPC,WIMAX,\n"
-"                                           INFINIBAND,FIREWALL,ADSL]"
+"                                                [NONE,HW,RFKILL,ETHER,WIFI,BT,MB,DHCP4,DHCP6,PPP,\n"
+"                                                 WIFI_SCAN,IP4,IP6,AUTOIP4,DNS,VPN,SHARING,SUPPLICANT,\n"
+"                                                 AGENTS,SETTINGS,SUSPEND,CORE,DEVICE,OLPC,WIMAX,\n"
+"                                                 INFINIBAND,FIREWALL,ADSL]"
 msgstr ""
 "Beleži domene, ločene z vejico: poljubna kombinacija\n"
-"                                          [NONE,HW,RFKILL,ETHER,WIFI,BT,MB,DHCP4,DHCP6,PPP,\n"
-"                                           WIFI_SCAN,IP4,IP6,AUTOIP4,DNS,VPN,SHARING,SUPPLICANT,\n"
-"                                           AGENTS,SETTINGS,SUSPEND,CORE,DEVICE,OLPC,WIMAX,\n"
-"                                           INFINIBAND,FIREWALL,ADSL]"
+"                                                [NONE,HW,RFKILL,ETHER,WIFI,BT,MB,DHCP4,DHCP6,PPP,\n"
+"                                                 WIFI_SCAN,IP4,IP6,AUTOIP4,DNS,VPN,SHARING,SUPPLICANT,\n"
+"                                                 AGENTS,SETTINGS,SUSPEND,CORE,DEVICE,OLPC,WIMAX,\n"
+"                                                 INFINIBAND,FIREWALL,ADSL]"
+
+#: ../src/main.c:392
+msgid "An http(s) address for checking internet connectivity"
+msgstr "Naslov HTTP(s) za preverjanje povezljivosti v omrežje"
+
+#: ../src/main.c:393
+msgid "The interval between connectivity checks (in seconds)"
+msgstr "Čas med preverjanji povezave v sekundah"
 
-#: ../src/main.c:400
+#: ../src/main.c:394
+msgid "The expected start of the response"
+msgstr "Pričakovan začetek odziva"
+
+#: ../src/main.c:394
+msgid "Bingo!"
+msgstr "Končno!"
+
+#: ../src/main.c:399
 #, c-format
 msgid "GModules are not supported on your platform!\n"
 msgstr "V vašem sistemskem okolju Gmoduli niso podprti!\n"
 
-#: ../src/main.c:423
+#: ../src/main.c:418
 msgid ""
 "NetworkManager monitors all network connections and automatically\n"
 "chooses the best connection to use.  It also allows the user to\n"
@@ -2603,41 +2644,41 @@ msgstr ""
 "brezžičnih dostopnih točk, s katerimi naj se povezujejo\n"
 "brezžični omrežni vmesniki računalnika."
 
-#: ../src/main.c:429
+#: ../src/main.c:424
 #, c-format
 msgid "Invalid option.  Please use --help to see a list of valid options.\n"
 msgstr "Neveljavna možnost. Uporabite --help za seznam veljavnih možnosti.\n"
 
-#: ../src/main.c:439
+#: ../src/main.c:434
 #, c-format
 msgid "You must be root to run NetworkManager!\n"
 msgstr "Za zagon programa NetworkManager so zahtevana skrbniška dovoljenja!\n"
 
-#: ../src/main.c:460
+#: ../src/main.c:455
 #, c-format
 msgid "Failed to read configuration: (%d) %s\n"
 msgstr "Branje nastavitev je spodletelo: (%d) %s\n"
 
-#: ../src/main.c:471
+#: ../src/main.c:466
 #, c-format
 msgid "%s.  Please use --help to see a list of valid options.\n"
 msgstr "%s. Uporabite --help za prikaz seznam veljavnih možnosti.\n"
 
-#: ../src/main.c:478
+#: ../src/main.c:473
 #, c-format
 msgid "State file %s parsing failed: (%d) %s\n"
 msgstr "Razčlenjevanje datoteke stanja %s je spodletelo: (%d) %s\n"
 
-#: ../src/main.c:495
+#: ../src/main.c:490
 #, c-format
 msgid "Could not daemonize: %s [error %u]\n"
 msgstr "Opravila ni mogoče pretvoriti za ozadnje delovanje: %s [napaka %u]\n"
 
-#: ../src/dhcp-manager/nm-dhcp-dhclient-utils.c:62
+#: ../src/dhcp-manager/nm-dhcp-dhclient-utils.c:61
 msgid "# Created by NetworkManager\n"
 msgstr "#Ustvarjeno z upravljalnikom omrežij\n"
 
-#: ../src/dhcp-manager/nm-dhcp-dhclient-utils.c:69
+#: ../src/dhcp-manager/nm-dhcp-dhclient-utils.c:68
 #, c-format
 msgid ""
 "# Merged from %s\n"
@@ -2663,11 +2704,11 @@ msgstr "'dhcpcd' ni mogoče najti."
 msgid "unsupported DHCP client '%s'"
 msgstr "nepodprt odjemalec DHCP '%s'"
 
-#: ../src/dns-manager/nm-dns-manager.c:383
+#: ../src/dns-manager/nm-dns-manager.c:379
 msgid "NOTE: the libc resolver may not support more than 3 nameservers."
 msgstr "OPOMBA: razreševalnik libc morda ne podpira več kot 3 imenskih strežnikov."
 
-#: ../src/dns-manager/nm-dns-manager.c:385
+#: ../src/dns-manager/nm-dns-manager.c:381
 msgid "The nameservers listed below may not be recognized."
 msgstr "Navedeni imenski strežniki morda ne bodo prepoznani."
 
@@ -2681,19 +2722,19 @@ msgstr "Neznana raven beleženja '%s'"
 msgid "Unknown log domain '%s'"
 msgstr "Neznana domena beleženja '%s'"
 
-#: ../src/modem-manager/nm-modem-cdma.c:279
-#: ../src/nm-device-bt.c:325
+#: ../src/modem-manager/nm-modem-cdma.c:281
+#: ../src/nm-device-bt.c:351
 #, c-format
 msgid "CDMA connection %d"
 msgstr "Povezava CDMA %d"
 
-#: ../src/modem-manager/nm-modem-gsm.c:547
-#: ../src/nm-device-bt.c:321
+#: ../src/modem-manager/nm-modem-gsm.c:559
+#: ../src/nm-device-bt.c:347
 #, c-format
 msgid "GSM connection %d"
 msgstr "Povezava GSM %d"
 
-#: ../src/nm-device-bond.c:191
+#: ../src/nm-device-bond.c:190
 #, c-format
 msgid "Bond connection %d"
 msgstr "Povezava vezi %d"
@@ -2703,22 +2744,22 @@ msgstr "Povezava vezi %d"
 msgid "ADSL connection %d"
 msgstr "Povezava ADSL %d"
 
-#: ../src/nm-device-bt.c:296
+#: ../src/nm-device-bt.c:322
 #, c-format
 msgid "PAN connection %d"
 msgstr "Povezava PAN %d"
 
-#: ../src/nm-device-bt.c:329
+#: ../src/nm-device-bt.c:355
 #, c-format
 msgid "DUN connection %d"
 msgstr "Povezava DUN %d"
 
-#: ../src/nm-device-ethernet.c:1327
+#: ../src/nm-device-ethernet.c:1326
 #, c-format
 msgid "PPPoE connection %d"
 msgstr "Povezava PPPoE %d"
 
-#: ../src/nm-device-ethernet.c:1327
+#: ../src/nm-device-ethernet.c:1326
 #: ../src/settings/nm-settings-utils.c:50
 #, c-format
 msgid "Wired connection %d"
@@ -2729,7 +2770,7 @@ msgstr "Žična povezava %d"
 msgid "InfiniBand connection %d"
 msgstr "Povezava InfiniBand %d"
 
-#: ../src/nm-device-olpc-mesh.c:303
+#: ../src/nm-device-olpc-mesh.c:306
 #, c-format
 msgid "Mesh %d"
 msgstr "Mreža %d"
@@ -2739,7 +2780,7 @@ msgstr "Mreža %d"
 msgid "VLAN connection %d"
 msgstr "Povezava VLAN %d"
 
-#: ../src/nm-manager.c:660
+#: ../src/nm-manager.c:661
 #, c-format
 msgid "VPN connection %d"
 msgstr "Povezava VPN %d"
@@ -2787,11 +2828,37 @@ msgstr "skupini netlink se ni mogoče pridružiti: %s"
 msgid "error updating link cache: %s"
 msgstr "napaka med posodabljanjem predpomnilnika povezave: %s"
 
-#: ../src/settings/plugins/ifcfg-rh/reader.c:94
+#: ../src/settings/plugins/ifcfg-rh/reader.c:93
 msgid "System"
 msgstr "Sistem"
 
-#: ../src/settings/plugins/ifcfg-rh/reader.c:3641
+#: ../src/settings/plugins/ifcfg-rh/reader.c:3663
 msgid "Bond"
 msgstr "Vez"
 
+#: ../test/nm-online.c:111
+#, c-format
+msgid "\rConnecting"
+msgstr "\rPonovno vzpostavljanje povezave"
+
+#: ../test/nm-online.c:142
+msgid "Time to wait for a connection, in seconds (default is 30)"
+msgstr "Čas čakanja na vzpostavitev povezave v sekundah (privzeto je 30 sekund)"
+
+#: ../test/nm-online.c:143
+msgid "Exit immediately if NetworkManager is not running or connecting"
+msgstr "Končaj takoj, če program NetworkManager ni zagnan oziroma ni v postopku vzpostavljanju povezave."
+
+#: ../test/nm-online.c:144
+msgid "Don't print anything"
+msgstr "Ne natisni ničesar"
+
+#: ../test/nm-online.c:162
+msgid "Waits for a successful connection in NetworkManager."
+msgstr "Počaka na uspešno vzpostavitev povezave s programom NetworkManager."
+
+#: ../test/nm-online.c:168
+#: ../test/nm-online.c:177
+msgid "Invalid option.  Please use --help to see a list of valid options."
+msgstr "Neveljavna možnost. Uporabite --help za seznam veljavnih možnosti."
+
diff --git a/po/ta.po b/po/ta.po
index 44125c38..7d5eef3f 100644
--- a/po/ta.po
+++ b/po/ta.po
@@ -6,14 +6,17 @@
 # Felix I , 2009.
 # I. Felix , 2009, 2010.
 # I Felix , 2010.
+# Shantha kumar , 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: NetworkManager.po.master.ta\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-05-06 14:31+0530\n"
-"PO-Revision-Date: 2010-05-10 13:26+0530\n"
-"Last-Translator: I Felix \n"
-"Language-Team: Tamil \n"
+"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug."
+"cgi?product=NetworkManager&keywords=I18N+L10N&component=general\n"
+"POT-Creation-Date: 2012-12-18 03:25+0000\n"
+"PO-Revision-Date: 2012-12-19 15:05+0530\n"
+"Last-Translator: Shantha kumar \n"
+"Language-Team: Tamil <>\n"
+"Language: ta\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -21,949 +24,1658 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n!=1);\\n"
 "\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
-msgid "NAME"
-msgstr "NAME"
+#: ../cli/src/common.c:32 ../cli/src/common.c:44 ../cli/src/common.c:52
+#: ../cli/src/common.c:63 ../cli/src/connections.c:133
+#: ../cli/src/connections.c:167
+msgid "GROUP"
+msgstr "GROUP"
 
 #. 0
-#: ../cli/src/connections.c:60 ../cli/src/connections.c:75
-msgid "UUID"
-msgstr "UUID"
+#: ../cli/src/common.c:33 ../cli/src/common.c:53
+msgid "ADDRESS"
+msgstr "ADDRESS"
 
 #. 1
-#: ../cli/src/connections.c:61
-msgid "DEVICES"
-msgstr "DEVICES"
+#: ../cli/src/common.c:34 ../cli/src/common.c:54
+msgid "ROUTE"
+msgstr "ROUTE"
 
 #. 2
-#: ../cli/src/connections.c:62 ../cli/src/connections.c:77
-msgid "SCOPE"
-msgstr "SCOPE"
+#: ../cli/src/common.c:35 ../cli/src/common.c:55
+msgid "DNS"
+msgstr "DNS"
 
 #. 3
-#: ../cli/src/connections.c:63
-msgid "DEFAULT"
-msgstr "DEFAULT"
+#: ../cli/src/common.c:36 ../cli/src/common.c:56
+msgid "DOMAIN"
+msgstr "DOMAIN"
 
 #. 4
-#: ../cli/src/connections.c:64
-msgid "DBUS-SERVICE"
-msgstr "DBUS-SERVICE"
+#: ../cli/src/common.c:37
+msgid "WINS"
+msgstr "WINS"
 
-#. 5
-#: ../cli/src/connections.c:65
-msgid "SPEC-OBJECT"
-msgstr "SPEC-OBJECT"
+#. 0
+#: ../cli/src/common.c:45 ../cli/src/common.c:64
+msgid "OPTION"
+msgstr "OPTION"
 
-#. 6
-#: ../cli/src/connections.c:66
-msgid "VPN"
-msgstr "VPN"
+#: ../cli/src/common.c:366
+msgid "unmanaged"
+msgstr "பராமரிக்கப்படாத"
+
+#: ../cli/src/common.c:368
+msgid "unavailable"
+msgstr "கிடைக்கப்பெறாத"
+
+#: ../cli/src/common.c:370 ../cli/src/network-manager.c:120
+msgid "disconnected"
+msgstr "துண்டிக்கப்பட்டது"
+
+#: ../cli/src/common.c:372
+msgid "connecting (prepare)"
+msgstr "இணைக்கிறது (தயாராக்கு)"
+
+#: ../cli/src/common.c:374
+msgid "connecting (configuring)"
+msgstr "இணைக்கிறது (கட்டமைக்கிறது)"
+
+#: ../cli/src/common.c:376
+msgid "connecting (need authentication)"
+msgstr "இணைக்கிறது (அங்கீகாரம் தேவை)"
+
+#: ../cli/src/common.c:378
+msgid "connecting (getting IP configuration)"
+msgstr "இணைக்கிறது (IP கட்டமைப்பை பெறுகிறது)"
+
+#: ../cli/src/common.c:380
+msgid "connecting (checking IP connectivity)"
+msgstr "இணைக்கிறது (IP இணைப்பை சோதிக்கிறது)"
+
+#: ../cli/src/common.c:382
+msgid "connecting (starting secondary connections)"
+msgstr "இணைக்கிறது (இரண்டாம் நிலை இணைப்புகளைத் தொடங்குகிறது)"
+
+#: ../cli/src/common.c:384 ../cli/src/network-manager.c:116
+msgid "connected"
+msgstr "இணைக்கப்பட்டது"
+
+#: ../cli/src/common.c:386 ../cli/src/connections.c:658
+msgid "deactivating"
+msgstr "முடக்குகிறது"
+
+#: ../cli/src/common.c:388
+msgid "connection failed"
+msgstr "இணைக்க முடியவில்லை"
+
+#: ../cli/src/common.c:390 ../cli/src/connections.c:661
+#: ../cli/src/connections.c:684 ../cli/src/connections.c:1376
+#: ../cli/src/devices.c:650 ../cli/src/network-manager.c:123
+#: ../cli/src/network-manager.c:185 ../cli/src/network-manager.c:188
+#: ../cli/src/network-manager.c:197 ../cli/src/network-manager.c:257
+#: ../cli/src/network-manager.c:273 ../cli/src/network-manager.c:431
+#: ../cli/src/network-manager.c:486 ../cli/src/network-manager.c:524
+#: ../cli/src/network-manager.c:563 ../cli/src/settings.c:629
+#: ../cli/src/settings.c:657 ../cli/src/utils.c:533 ../src/main.c:457
+#: ../src/main.c:476
+msgid "unknown"
+msgstr "தெரியாத"
+
+#: ../cli/src/common.c:399
+msgid "No reason given"
+msgstr "காரணம் கொடுக்கப்படவில்லை"
+
+#: ../cli/src/common.c:402
+msgid "Unknown error"
+msgstr "தெரியாத பிழை"
+
+#: ../cli/src/common.c:405
+msgid "Device is now managed"
+msgstr "சாதனம் இப்போது நிர்வகிக்கப்படுகிறது"
+
+#: ../cli/src/common.c:408
+msgid "Device is now unmanaged"
+msgstr "சாதனம் இப்போது நிர்வகிக்கப்படவில்லை"
+
+#: ../cli/src/common.c:411
+msgid "The device could not be readied for configuration"
+msgstr "அமைவாக்கம் செய்வதற்கு சாதனத்தை தயார்செய்ய முடியவில்லை"
+
+#: ../cli/src/common.c:414
+msgid "IP configuration could not be reserved (no available address, timeout, etc.)"
+msgstr "IP அமைவாக்கத்தை ஒதுக்க முடியவில்லை (முகவரி கிடைக்கவில்லை, காலாவதியாதல் போன்றவை)"
+
+#: ../cli/src/common.c:417
+msgid "The IP configuration is no longer valid"
+msgstr "IP அமைவாக்கம் இப்போது செல்லாது"
+
+#: ../cli/src/common.c:420
+msgid "Secrets were required, but not provided"
+msgstr "ரகசியங்கள் தேவையாயிருந்தன, ஆனால் தரப்படவில்லை"
+
+#: ../cli/src/common.c:423
+msgid "802.1X supplicant disconnected"
+msgstr "802.1x சப்ளிகன்ட் துண்டிக்கபட்டது"
+
+#: ../cli/src/common.c:426
+msgid "802.1X supplicant configuration failed"
+msgstr "802.1x சப்ளிகன்ட் அமைவாக்கம் தோல்வி"
+
+#: ../cli/src/common.c:429
+msgid "802.1X supplicant failed"
+msgstr "802.1x சப்ளிகன்ட் தோல்வி"
+
+#: ../cli/src/common.c:432
+msgid "802.1X supplicant took too long to authenticate"
+msgstr "802.1x சப்ளிகன்ட் அங்கீகாரத்திற்கு நீண்ட நேரம் எடுத்துக்கொண்டது"
+
+#: ../cli/src/common.c:435
+msgid "PPP service failed to start"
+msgstr "பிபிபி சேவை துவக்கம் தோல்வி"
+
+#: ../cli/src/common.c:438
+msgid "PPP service disconnected"
+msgstr "பிபிபி சேவை துண்டிக்கபட்டது"
+
+#: ../cli/src/common.c:441
+msgid "PPP failed"
+msgstr "பிபிபி தோல்வியுற்றது"
+
+#: ../cli/src/common.c:444
+msgid "DHCP client failed to start"
+msgstr "டிஹெச்சிபி கிளையன்ட் துவக்கம் தோல்வி"
+
+#: ../cli/src/common.c:447
+msgid "DHCP client error"
+msgstr "DHCP கிளையன்ட் பிழை"
+
+#: ../cli/src/common.c:450
+msgid "DHCP client failed"
+msgstr "DHCP கிளையன்ட் தோல்வி"
+
+#: ../cli/src/common.c:453
+msgid "Shared connection service failed to start"
+msgstr "பகிர்ந்த இணைப்பு சேவை துவக்கம் தோல்வி"
+
+#: ../cli/src/common.c:456
+msgid "Shared connection service failed"
+msgstr "பகிர்ந்த இணைப்பு சேவை தோல்வியுற்றது"
+
+#: ../cli/src/common.c:459
+msgid "AutoIP service failed to start"
+msgstr "AutoIP சேவையைத் தொடங்குவதில் தோல்வி"
+
+#: ../cli/src/common.c:462
+msgid "AutoIP service error"
+msgstr "AutoIP சேவை பிழை"
+
+#: ../cli/src/common.c:465
+msgid "AutoIP service failed"
+msgstr "AutoIP சேவை தொடங்குவதில் தோல்வி"
+
+#: ../cli/src/common.c:468
+msgid "The line is busy"
+msgstr "தடம் பயன்பாட்டில் உள்ளது"
+
+#: ../cli/src/common.c:471
+msgid "No dial tone"
+msgstr "டயல் டோன் இல்லை"
+
+#: ../cli/src/common.c:474
+msgid "No carrier could be established"
+msgstr "கேரியரை அமைக்க முடியவில்லை"
+
+#: ../cli/src/common.c:477
+msgid "The dialing request timed out"
+msgstr "டயல் செய்யும் நேரம் கடந்தது"
+
+#: ../cli/src/common.c:480
+msgid "The dialing attempt failed"
+msgstr "டயல் செய்யும் முயற்சி தோல்வி"
+
+#: ../cli/src/common.c:483
+msgid "Modem initialization failed"
+msgstr "மோடத்தைத் தொடங்குதல் தோல்வி"
+
+#: ../cli/src/common.c:486
+msgid "Failed to select the specified APN"
+msgstr "குறிப்பிட்ட ஏபிஎன் ஐ தேர்ந்தெடுத்தல் தோல்வி"
+
+#: ../cli/src/common.c:489
+msgid "Not searching for networks"
+msgstr "நெட்வொர்க்குகளைத் தேடவில்லை"
+
+#: ../cli/src/common.c:492
+msgid "Network registration denied"
+msgstr "நெட்வொர்க்கில் பதிவுசெய்தல் மறுக்கப்பட்டது"
+
+#: ../cli/src/common.c:495
+msgid "Network registration timed out"
+msgstr "நெட்வொர்க்கில் பதிவுசெய்தல் நேரம் கடந்தது"
+
+#: ../cli/src/common.c:498
+msgid "Failed to register with the requested network"
+msgstr "வேண்டிய நெட்வொர்க்கில் பதிவுசெய்தல் தோல்வி"
+
+#: ../cli/src/common.c:501
+msgid "PIN check failed"
+msgstr "PIN சோதனை தோல்வி"
+
+#: ../cli/src/common.c:504
+msgid "Necessary firmware for the device may be missing"
+msgstr "சாதனத்தின் தேவையான வர்த்தக மென்பொருள் இல்லை"
+
+#: ../cli/src/common.c:507
+msgid "The device was removed"
+msgstr "சாதனம் நீக்கப்பட்டது"
+
+#: ../cli/src/common.c:510
+msgid "NetworkManager went to sleep"
+msgstr "NetworkManager உறங்கிவிட்டது"
+
+#: ../cli/src/common.c:513
+msgid "The device's active connection disappeared"
+msgstr "சாதனத்தின் செயலிலுள்ள இணைப்பு போய்விட்டது"
+
+#: ../cli/src/common.c:516
+msgid "Device disconnected by user or client"
+msgstr "பயனர் அல்லது கிளையன்ட் சாதனத்தை இணைப்பு துண்டித்தார்"
+
+#: ../cli/src/common.c:519
+msgid "Carrier/link changed"
+msgstr "கேரியர்/இணைப்பு மாறிவிட்டது"
+
+#: ../cli/src/common.c:522
+msgid "The device's existing connection was assumed"
+msgstr "சாதனத்தின் தற்போதுள்ள இணைப்பு இருப்பதாக கொள்ளப்பட்டது"
+
+#: ../cli/src/common.c:525
+msgid "The supplicant is now available"
+msgstr "சப்ளிகன்ட் உள்ளது"
+
+#: ../cli/src/common.c:528
+msgid "The modem could not be found"
+msgstr "மோடத்தைக் கண்டறிய முடியவில்லை"
+
+#: ../cli/src/common.c:531
+msgid "The Bluetooth connection failed or timed out"
+msgstr "Bluetooth இணைப்பு தோல்வி அல்லது அதற்கான நேரம் கடந்துவிட்டது"
+
+#: ../cli/src/common.c:534
+msgid "GSM Modem's SIM card not inserted"
+msgstr "GSM மோடத்தின் SIM கார்டு செருகப்படவில்லை"
+
+#: ../cli/src/common.c:537
+msgid "GSM Modem's SIM PIN required"
+msgstr "GSM மோடத்தின் SIM PIN தேவை"
+
+#: ../cli/src/common.c:540
+msgid "GSM Modem's SIM PUK required"
+msgstr "GSM மோடத்தின் SIM PUK தேவை"
+
+#: ../cli/src/common.c:543
+msgid "GSM Modem's SIM wrong"
+msgstr "GSM மோடத்தின் SIM தவறு"
+
+#: ../cli/src/common.c:546
+msgid "InfiniBand device does not support connected mode"
+msgstr "இன்பினிபேன்ட் சாதனம் இணைப்பு பாங்கை ஆதரிக்கவில்லை"
+
+#: ../cli/src/common.c:549
+msgid "A dependency of the connection failed"
+msgstr "இணைப்பின் சார்நிலை தோல்வி"
+
+#: ../cli/src/common.c:552
+msgid "A problem with the RFC 2684 Ethernet over ADSL bridge"
+msgstr "RFC 2684 ஈத்தர்னெட் ஓவர் ADSL பிரிட்ஜில் சிக்கல்"
+
+#: ../cli/src/common.c:555
+msgid "ModemManager is unavailable"
+msgstr "ModemManager இல்லை"
+
+#: ../cli/src/common.c:558
+msgid "The Wi-Fi network could not be found"
+msgstr "Wi-Fi பிணையத்தைக் கண்டறிய முடியவில்லை"
+
+#: ../cli/src/common.c:561
+msgid "A secondary connection of the base connection failed"
+msgstr "அடிப்படை இணைப்பின் இரண்டாம் நிலை இணைப்பு தோல்வி"
+
+#: ../cli/src/common.c:564 ../cli/src/devices.c:296 ../cli/src/devices.c:314
+#: ../cli/src/devices.c:436 ../cli/src/devices.c:480
+msgid "Unknown"
+msgstr "தெரியாத"
+
+#. 0
+#. used only for 'GENERAL' group listing
+#: ../cli/src/connections.c:60 ../cli/src/connections.c:134
+#: ../cli/src/devices.c:108 ../cli/src/devices.c:132 ../cli/src/devices.c:142
+#: ../cli/src/devices.c:152 ../cli/src/devices.c:166 ../cli/src/devices.c:180
+#: ../cli/src/devices.c:202 ../cli/src/devices.c:218 ../cli/src/devices.c:227
+msgid "NAME"
+msgstr "NAME"
+
+#. 0
+#. 1
+#: ../cli/src/connections.c:61 ../cli/src/connections.c:135
+msgid "UUID"
+msgstr "UUID"
 
 #. 1
 #. 0
 #. 1
-#: ../cli/src/connections.c:76 ../cli/src/devices.c:61 ../cli/src/devices.c:87
+#. 2
+#: ../cli/src/connections.c:62 ../cli/src/connections.c:168
+#: ../cli/src/devices.c:72 ../cli/src/devices.c:110 ../cli/src/devices.c:205
 msgid "TYPE"
 msgstr "TYPE"
 
-#. 3
-#: ../cli/src/connections.c:78
+#. 2
+#: ../cli/src/connections.c:63
 msgid "TIMESTAMP"
 msgstr "TIMESTAMP"
 
-#. 4
-#: ../cli/src/connections.c:79
+#. 3
+#: ../cli/src/connections.c:64
 msgid "TIMESTAMP-REAL"
 msgstr "TIMESTAMP-REAL"
 
-#. 5
-#: ../cli/src/connections.c:80
+#. 4
+#. 13
+#: ../cli/src/connections.c:65 ../cli/src/devices.c:122
 msgid "AUTOCONNECT"
 msgstr "AUTOCONNECT"
 
-#. 6
-#: ../cli/src/connections.c:81
+#. 5
+#: ../cli/src/connections.c:66
 msgid "READONLY"
 msgstr "READONLY"
 
-#: ../cli/src/connections.c:157
+#. 6
+#. 8
+#. 2
+#. 11
+#. 5
+#: ../cli/src/connections.c:67 ../cli/src/connections.c:142
+#: ../cli/src/devices.c:74 ../cli/src/devices.c:192 ../cli/src/devices.c:208
+msgid "DBUS-PATH"
+msgstr "DBUS-PATH"
+
+#. 2
+#: ../cli/src/connections.c:136
+msgid "DEVICES"
+msgstr "DEVICES"
+
+#. 3
+#. 1
+#. 8
+#. 1
+#: ../cli/src/connections.c:137 ../cli/src/devices.c:73
+#: ../cli/src/devices.c:117 ../cli/src/network-manager.c:39
+msgid "STATE"
+msgstr "STATE"
+
+#. 4
+#: ../cli/src/connections.c:138
+msgid "DEFAULT"
+msgstr "DEFAULT"
+
+#. 5
+#: ../cli/src/connections.c:139
+msgid "DEFAULT6"
+msgstr "DEFAULT6"
+
+#. 6
+#: ../cli/src/connections.c:140
+msgid "SPEC-OBJECT"
+msgstr "SPEC-OBJECT"
+
+#. 7
+#. 1
+#: ../cli/src/connections.c:141 ../cli/src/connections.c:155
+msgid "VPN"
+msgstr "VPN"
+
+#. 9
+#: ../cli/src/connections.c:143
+msgid "CON-PATH"
+msgstr "CON-PATH"
+
+#. 10
+#: ../cli/src/connections.c:144
+msgid "ZONE"
+msgstr "ZONE"
+
+#. 11
+#: ../cli/src/connections.c:145
+msgid "MASTER-PATH"
+msgstr "MASTER-PATH"
+
+#: ../cli/src/connections.c:153 ../cli/src/devices.c:83
+msgid "GENERAL"
+msgstr "GENERAL"
+
+#. 0
+#: ../cli/src/connections.c:154
+msgid "IP"
+msgstr "IP"
+
+#. 1
+#: ../cli/src/connections.c:169
+msgid "USERNAME"
+msgstr "USERNAME"
+
+#. 2
+#: ../cli/src/connections.c:170
+msgid "GATEWAY"
+msgstr "GATEWAY"
+
+#. 3
+#: ../cli/src/connections.c:171
+msgid "BANNER"
+msgstr "BANNER"
+
+#. 4
+#: ../cli/src/connections.c:172
+msgid "VPN-STATE"
+msgstr "VPN-STATE"
+
+#. 5
+#: ../cli/src/connections.c:173
+msgid "CFG"
+msgstr "CFG"
+
+#: ../cli/src/connections.c:195
 #, c-format
 msgid ""
-"Usage: nmcli con { COMMAND | help }\n"
-"  COMMAND := { list | status | up | down }\n"
+"Usage: nmcli connection { COMMAND | help }\n"
+"  COMMAND := { list | status | up | down | delete }\n"
 "\n"
-"  list [id  | uuid  | system | user]\n"
-"  status\n"
-"  up id  | uuid  [iface ] [ap ] [--nowait] [--timeout "
+"  list [id  | uuid ]\n"
+"  status [id  | uuid  | path ]\n"
+"  up id  | uuid  [iface ] [ap ] [nsp ] [--"
+"nowait] [--timeout ]\n"
+"  up id  | uuid  [iface ] [ap ] [--nowait] [--timeout "
 "]\n"
 "  down id  | uuid \n"
+"  delete id  | uuid \n"
+"\n"
 msgstr ""
-"பயன்பாடு: nmcli con { COMMAND | help }\n"
-"  COMMAND := { list | status | up | down }\n"
+"Usage: nmcli connection { COMMAND | help }\n"
+"  COMMAND := { list | status | up | down | delete }\n"
 "\n"
-"  list [id  | uuid  | system | user]\n"
-"  status\n"
-"  up id  | uuid  [iface ] [ap ] [--nowait] [--timeout "
+"  list [id  | uuid ]\n"
+"  status [id  | uuid  | path ]\n"
+"  up id  | uuid  [iface ] [ap ] [nsp ] [--"
+"nowait] [--timeout ]\n"
+"  up id  | uuid  [iface ] [ap ] [--nowait] [--timeout "
 "]\n"
 "  down id  | uuid \n"
+"  delete id  | uuid \n"
+"\n"
 
-#: ../cli/src/connections.c:197 ../cli/src/connections.c:536
+#: ../cli/src/connections.c:256 ../cli/src/connections.c:634
 #, 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:258 ../cli/src/connections.c:636
 #, c-format
 msgid "Error: 'con list': %s; allowed fields: %s"
 msgstr "Error: 'con list': %s; அனுமதிக்கப்பட்ட புலங்கள்: %s"
 
-#: ../cli/src/connections.c:207
+#: ../cli/src/connections.c:266
 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:509
 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:510 ../cli/src/connections.c:511
+#: ../cli/src/connections.c:739 ../cli/src/connections.c:740
+#: ../cli/src/connections.c:742 ../cli/src/devices.c:444
+#: ../cli/src/devices.c:497 ../cli/src/devices.c:615 ../cli/src/devices.c:616
+#: ../cli/src/devices.c:617 ../cli/src/devices.c:649 ../cli/src/devices.c:676
+#: ../cli/src/devices.c:677 ../cli/src/devices.c:678 ../cli/src/devices.c:679
+#: ../cli/src/devices.c:680 ../cli/src/network-manager.c:267
+#: ../cli/src/settings.c:748 ../cli/src/settings.c:823
+#: ../cli/src/settings.c:943 ../cli/src/settings.c:1225
+#: ../cli/src/settings.c:1226 ../cli/src/settings.c:1228
+#: ../cli/src/settings.c:1230 ../cli/src/settings.c:1231
+#: ../cli/src/settings.c:1362 ../cli/src/settings.c:1363
+#: ../cli/src/settings.c:1364 ../cli/src/settings.c:1365
+#: ../cli/src/settings.c:1442 ../cli/src/settings.c:1443
+#: ../cli/src/settings.c:1444 ../cli/src/settings.c:1445
+#: ../cli/src/settings.c:1446 ../cli/src/settings.c:1447
+#: ../cli/src/settings.c:1448 ../cli/src/settings.c:1449
+#: ../cli/src/settings.c:1450 ../cli/src/settings.c:1451
+#: ../cli/src/settings.c:1452 ../cli/src/settings.c:1453
+#: ../cli/src/settings.c:1454 ../cli/src/settings.c:1525
+#: ../cli/src/settings.c:1867 ../cli/src/settings.c:1904
 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:510 ../cli/src/connections.c:511
+#: ../cli/src/connections.c:739 ../cli/src/connections.c:740
+#: ../cli/src/connections.c:742 ../cli/src/devices.c:444
+#: ../cli/src/devices.c:497 ../cli/src/devices.c:615 ../cli/src/devices.c:616
+#: ../cli/src/devices.c:617 ../cli/src/devices.c:649 ../cli/src/devices.c:676
+#: ../cli/src/devices.c:677 ../cli/src/devices.c:678 ../cli/src/devices.c:679
+#: ../cli/src/devices.c:680 ../cli/src/network-manager.c:269
+#: ../cli/src/settings.c:748 ../cli/src/settings.c:750
+#: ../cli/src/settings.c:823 ../cli/src/settings.c:943
+#: ../cli/src/settings.c:1225 ../cli/src/settings.c:1226
+#: ../cli/src/settings.c:1228 ../cli/src/settings.c:1230
+#: ../cli/src/settings.c:1231 ../cli/src/settings.c:1362
+#: ../cli/src/settings.c:1363 ../cli/src/settings.c:1364
+#: ../cli/src/settings.c:1365 ../cli/src/settings.c:1442
+#: ../cli/src/settings.c:1443 ../cli/src/settings.c:1444
+#: ../cli/src/settings.c:1445 ../cli/src/settings.c:1446
+#: ../cli/src/settings.c:1447 ../cli/src/settings.c:1448
+#: ../cli/src/settings.c:1449 ../cli/src/settings.c:1450
+#: ../cli/src/settings.c:1451 ../cli/src/settings.c:1452
+#: ../cli/src/settings.c:1453 ../cli/src/settings.c:1454
+#: ../cli/src/settings.c:1525 ../cli/src/settings.c:1867
+#: ../cli/src/settings.c:1904
 msgid "no"
 msgstr "இல்லை"
 
-#: ../cli/src/connections.c:457 ../cli/src/connections.c:500
-msgid "System connections"
-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:585
+msgid "Connection list"
+msgstr "இணைப்பு பட்டியல்"
+
+#: ../cli/src/connections.c:598 ../cli/src/connections.c:1135
+#: ../cli/src/connections.c:1673 ../cli/src/connections.c:1688
+#: ../cli/src/connections.c:1697 ../cli/src/connections.c:1707
+#: ../cli/src/connections.c:1719 ../cli/src/connections.c:1828
+#: ../cli/src/connections.c:1930 ../cli/src/devices.c:1127
+#: ../cli/src/devices.c:1137 ../cli/src/devices.c:1255
+#: ../cli/src/devices.c:1263 ../cli/src/devices.c:1627
+#: ../cli/src/devices.c:1634 ../cli/src/devices.c:1648
+#: ../cli/src/devices.c:1655 ../cli/src/devices.c:1672
+#: ../cli/src/devices.c:1683 ../cli/src/devices.c:1904
+#: ../cli/src/devices.c:1911
 #, c-format
 msgid "Error: %s argument is missing."
 msgstr "பிழை: %s விவாதம் விடுபட்டுள்ளது."
 
-#: ../cli/src/connections.c:487
+#: ../cli/src/connections.c:611
 #, 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:617 ../cli/src/connections.c:1732
+#: ../cli/src/connections.c:1845 ../cli/src/connections.c:1937
+#: ../cli/src/devices.c:911 ../cli/src/devices.c:991 ../cli/src/devices.c:1151
+#: ../cli/src/devices.c:1269 ../cli/src/devices.c:1696
+#: ../cli/src/devices.c:1917
 #, c-format
 msgid "Unknown parameter: %s\n"
 msgstr "தெரியாத அளவுரு: %s\n"
 
-#: ../cli/src/connections.c:528
+#: ../cli/src/connections.c:626
 #, 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:641 ../cli/src/connections.c:2033
+#: ../cli/src/devices.c:2128 ../cli/src/network-manager.c:599
 #, c-format
 msgid "Error: %s."
 msgstr "பிழை: %s."
 
-#: ../cli/src/connections.c:649
-#, c-format
-msgid "Error: 'con status': %s"
-msgstr "பிழை: 'con status': %s"
-
-#: ../cli/src/connections.c:651
-#, c-format
-msgid "Error: 'con status': %s; allowed fields: %s"
-msgstr "பிழை: 'con status': %s; அனுமதிக்கப்பட்ட புலங்கள்: %s"
-
-#: ../cli/src/connections.c:658
-msgid "Active connections"
-msgstr "இணைப்புகளை செயற்படுத்து"
-
-#: ../cli/src/connections.c:1026
-#, c-format
-msgid "no active connection on device '%s'"
-msgstr "சாதனம் '%s' இல் செயல்படும் இணைப்பு இல்லை"
-
-#: ../cli/src/connections.c:1034
-#, c-format
-msgid "no active connection or device"
-msgstr "செயல்படும் இணைப்பு அல்லது சாதனம் இல்லை"
-
-#: ../cli/src/connections.c:1084
-#, c-format
-msgid "device '%s' not compatible with connection '%s'"
-msgstr "சாதனம் '%s' இணைப்பு '%s' உடன் உகந்தது அல்ல"
-
-#: ../cli/src/connections.c:1086
-#, c-format
-msgid "no device found for connection '%s'"
-msgstr "இணைப்பு '%s'க்கு சாதனம் எதுவும் இல்லை"
-
-#: ../cli/src/connections.c:1097
+#: ../cli/src/connections.c:654
 msgid "activating"
 msgstr "செயல்படுகிறது"
 
-#: ../cli/src/connections.c:1099
+#: ../cli/src/connections.c:656
 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
-msgid "unknown"
-msgstr "தெரியாத"
-
-#: ../cli/src/connections.c:1111
+#: ../cli/src/connections.c:670
 msgid "VPN connecting (prepare)"
 msgstr "VPN இணைக்கிறது (தயாராகு)"
 
-#: ../cli/src/connections.c:1113
+#: ../cli/src/connections.c:672
 msgid "VPN connecting (need authentication)"
 msgstr "VPN இணைக்கிறது (அங்கீகாரம் தேவை)"
 
-#: ../cli/src/connections.c:1115
+#: ../cli/src/connections.c:674
 msgid "VPN connecting"
 msgstr "VPN இணைக்கிறது"
 
-#: ../cli/src/connections.c:1117
+#: ../cli/src/connections.c:676
 msgid "VPN connecting (getting IP configuration)"
 msgstr "VPN இணைக்கிறது (IP கட்டமைப்பை பெறுகிறது)"
 
-#: ../cli/src/connections.c:1119
+#: ../cli/src/connections.c:678
 msgid "VPN connected"
 msgstr "VPN இணைக்கிறது"
 
-#: ../cli/src/connections.c:1121
+#: ../cli/src/connections.c:680
 msgid "VPN connection failed"
 msgstr "VPN ஐ இணைக்க முடியவில்லை"
 
-#: ../cli/src/connections.c:1123
+#: ../cli/src/connections.c:682
 msgid "VPN disconnected"
 msgstr "VPN துண்டிக்கப்பட்டது"
 
-#: ../cli/src/connections.c:1134
+#: ../cli/src/connections.c:735 ../cli/src/connections.c:745
+msgid "N/A"
+msgstr "பொருந்தாது "
+
+#: ../cli/src/connections.c:939 ../cli/src/connections.c:1163
+#, c-format
+msgid "Error: 'con status': %s"
+msgstr "பிழை: 'con status': %s"
+
+#: ../cli/src/connections.c:941 ../cli/src/connections.c:1165
+#, c-format
+msgid "Error: 'con status': %s; allowed fields: %s"
+msgstr "பிழை: 'con status': %s; அனுமதிக்கப்பட்ட புலங்கள்: %s"
+
+#: ../cli/src/connections.c:949
+msgid "Active connection details"
+msgstr "செயலிலுள்ள இணைப்பு விவரங்கள்"
+
+#: ../cli/src/connections.c:1085 ../cli/src/connections.c:1747
+#: ../cli/src/connections.c:1860 ../cli/src/connections.c:1951
+#: ../cli/src/devices.c:938 ../cli/src/devices.c:1000
+#: ../cli/src/devices.c:1166 ../cli/src/devices.c:1299
+#: ../cli/src/devices.c:1718 ../cli/src/devices.c:1946
+#: ../cli/src/network-manager.c:311
+#, c-format
+msgid "Error: Can't find out if NetworkManager is running: %s."
+msgstr "பிழை: NetworkManager இயங்குகிறதா எனக் கண்டறிய முடியவில்லை: %s."
+
+#: ../cli/src/connections.c:1089 ../cli/src/connections.c:1751
+#: ../cli/src/connections.c:1864 ../cli/src/connections.c:1955
+#: ../cli/src/devices.c:942 ../cli/src/devices.c:1004
+#: ../cli/src/devices.c:1170 ../cli/src/devices.c:1303
+#: ../cli/src/devices.c:1722 ../cli/src/devices.c:1950
+#: ../cli/src/network-manager.c:315
+#, c-format
+msgid "Error: NetworkManager is not running."
+msgstr "பிழை: NetworkManager இயங்கவில்லை."
+
+#: ../cli/src/connections.c:1121
+msgid "Active connections"
+msgstr "இணைப்புகளை செயற்படுத்து"
+
+#: ../cli/src/connections.c:1146
+#, c-format
+msgid "Error: '%s' is not an active connection."
+msgstr "பிழை: '%s' என்பது ஓரு செயலிலுள்ள இணைப்பு இல்லை."
+
+#: ../cli/src/connections.c:1151
+#, c-format
+msgid "Error: unknown parameter: %s"
+msgstr "பிழை: தெரியாத அளவுரு: %s"
+
+#: ../cli/src/connections.c:1258
+#, c-format
+msgid "no active connection on device '%s'"
+msgstr "சாதனம் '%s' இல் செயல்படும் இணைப்பு இல்லை"
+
+#: ../cli/src/connections.c:1266
+msgid "no active connection or device"
+msgstr "செயல்படும் இணைப்பு அல்லது சாதனம் இல்லை"
+
+#: ../cli/src/connections.c:1337
+#, c-format
+msgid "device '%s' not compatible with connection '%s'"
+msgstr "சாதனம் '%s' இணைப்பு '%s' உடன் உகந்தது அல்ல"
+
+#: ../cli/src/connections.c:1340
+#, c-format
+msgid "no device found for connection '%s'"
+msgstr "இணைப்பு '%s'க்கு சாதனம் எதுவும் இல்லை"
+
+#: ../cli/src/connections.c:1352
 msgid "unknown reason"
 msgstr "தெரியாத காரணம்"
 
-#: ../cli/src/connections.c:1136
+#: ../cli/src/connections.c:1354
 msgid "none"
 msgstr "ஒன்றுமில்லாத"
 
-#: ../cli/src/connections.c:1138
+#: ../cli/src/connections.c:1356
 msgid "the user was disconnected"
 msgstr "பயனர் செயல்நீக்கப்பட்டார்"
 
-#: ../cli/src/connections.c:1140
+#: ../cli/src/connections.c:1358
 msgid "the base network connection was interrupted"
 msgstr "தளப் பிணைய இணைப்பானது தடை செய்யப்பட்டிருந்தது"
 
-#: ../cli/src/connections.c:1142
+#: ../cli/src/connections.c:1360
 msgid "the VPN service stopped unexpectedly"
 msgstr "எதிர்பாராமல் VPN சேவை நிறுத்தப்பட்டது"
 
-#: ../cli/src/connections.c:1144
+#: ../cli/src/connections.c:1362
 msgid "the VPN service returned invalid configuration"
 msgstr "VPN சேவையானது தவறான கட்டமைப்பிற்கு திரும்பியது"
 
-#: ../cli/src/connections.c:1146
+#: ../cli/src/connections.c:1364
 msgid "the connection attempt timed out"
 msgstr "இணைப்பு முயற்சியின் நேரம் முடிந்தது"
 
-#: ../cli/src/connections.c:1148
+#: ../cli/src/connections.c:1366
 msgid "the VPN service did not start in time"
 msgstr "VPN சேவை நேரத்திற்கு துவங்கவில்லை"
 
-#: ../cli/src/connections.c:1150
+#: ../cli/src/connections.c:1368
 msgid "the VPN service failed to start"
 msgstr "VPN சேவையை துவக முடியவில்லை"
 
-#: ../cli/src/connections.c:1152
+#: ../cli/src/connections.c:1370
 msgid "no valid VPN secrets"
 msgstr "சரியான VPN இரகசியங்கள் இல்லை"
 
-#: ../cli/src/connections.c:1154
+#: ../cli/src/connections.c:1372
 msgid "invalid VPN secrets"
 msgstr "தவறான VPN இரகசியங்கள்"
 
-#: ../cli/src/connections.c:1156
+#: ../cli/src/connections.c:1374
 msgid "the connection was removed"
 msgstr "இணைப்பானது நீக்கப்பட்டது"
 
-#: ../cli/src/connections.c:1170
-#, c-format
-msgid "state: %s\n"
-msgstr "நிலை: %s\n"
-
-#: ../cli/src/connections.c:1173 ../cli/src/connections.c:1199
+#: ../cli/src/connections.c:1391 ../cli/src/connections.c:1596
 #, c-format
-msgid "Connection activated\n"
-msgstr "இணைப்பு செயல்படுத்தப்பட்டது\n"
+msgid "Connection successfully activated (D-Bus active path: %s)\n"
+msgstr "இணைப்பு வெற்றிகரமாக செயல்படுத்தப்பட்டது (டி-பஸ் செயல் பாதை: %s)\n"
 
-#: ../cli/src/connections.c:1176
+#. Active connection failed and dissapeared, quit.
+#: ../cli/src/connections.c:1396 ../cli/src/connections.c:1497
 #, c-format
 msgid "Error: Connection activation failed."
 msgstr "பிழை: இணைப்பை செயல்படுத்த முடியவில்லை."
 
-#: ../cli/src/connections.c:1195
+#: ../cli/src/connections.c:1421
 #, c-format
-msgid "state: %s (%d)\n"
-msgstr "நிலை: %s (%d)\n"
+msgid "VPN connection successfully activated (D-Bus active path: %s)\n"
+msgstr "VPN இணைப்பு வெற்றிகரமாக செயல்படுத்தப்பட்டது (டி-பஸ் செயல் பாதை: %s)\n"
 
-#: ../cli/src/connections.c:1205
+#: ../cli/src/connections.c:1429
 #, c-format
 msgid "Error: Connection activation failed: %s."
 msgstr "பிழை: இணைப்பை செயல்படுத்த முடியவில்லை: %s."
 
-#: ../cli/src/connections.c:1222 ../cli/src/devices.c:811
+#: ../cli/src/connections.c:1526 ../cli/src/devices.c:1060
 #, c-format
 msgid "Error: Timeout %d sec expired."
 msgstr "பிழை: நேரமுடிந்த %d விநாடி காலாவதியானது."
 
-#: ../cli/src/connections.c:1265
+#: ../cli/src/connections.c:1587
 #, 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 "Error: Obtaining active connection for '%s' failed."
-
-#: ../cli/src/connections.c:1288
-#, c-format
-msgid "Active connection state: %s\n"
-msgstr "செயல்படும் இணைப்பின் நிலை: %s\n"
-
-#: ../cli/src/connections.c:1289
-#, 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:1681 ../cli/src/connections.c:1836
+#: ../cli/src/connections.c:1964
 #, c-format
 msgid "Error: Unknown connection: %s."
 msgstr "பிழை: தெரியாத பிழை: %s."
 
-#: ../cli/src/connections.c:1378 ../cli/src/devices.c:882
+#: ../cli/src/connections.c:1727 ../cli/src/devices.c:1145
+#: ../cli/src/devices.c:1691
 #, 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:1740 ../cli/src/connections.c:1853
+#: ../cli/src/connections.c:1944
 #, c-format
 msgid "Error: id or uuid has to be specified."
 msgstr "பிழை: id அல்லது uuid குறிப்பிடப்பட வேண்டும்."
 
-#: ../cli/src/connections.c:1411
+#: ../cli/src/connections.c:1773
 #, c-format
 msgid "Error: No suitable device found: %s."
 msgstr "பிழை: தகுதியான சாதனம் காணப்படவில்லை: %s."
 
-#: ../cli/src/connections.c:1413
+#: ../cli/src/connections.c:1775
 #, c-format
 msgid "Error: No suitable device found."
 msgstr "பிழை: தகுதியான சாதனம் காணப்படவில்லை."
 
-#: ../cli/src/connections.c:1505
+#: ../cli/src/connections.c:1889
 #, c-format
 msgid "Warning: Connection not active\n"
 msgstr "எச்சரிக்கை: இணைப்பு செயல்பாட்டில் இல்லை\n"
 
-#: ../cli/src/connections.c:1561
+#: ../cli/src/connections.c:1903
+#, c-format
+msgid "Error: Connection deletion failed: %s"
+msgstr "பிழை: இணைப்பை நீக்குவதில் தோல்வி: %s"
+
+#: ../cli/src/connections.c:2024
 #, c-format
 msgid "Error: 'con' command '%s' is not valid."
 msgstr "பிழை: 'con' கட்டளை '%s' சரியானதல்ல."
 
-#: ../cli/src/connections.c:1597
+#: ../cli/src/connections.c:2092
 #, c-format
 msgid "Error: could not connect to D-Bus."
 msgstr "பிழை: D-பஸ்ஸை இணைக்க முடியவில்லை."
 
-#: ../cli/src/connections.c:1604
+#: ../cli/src/connections.c:2100
 #, c-format
 msgid "Error: Could not get system settings."
 msgstr "பிழை: கணினி அமைவுகளை பெற முடியவில்லை."
 
-#: ../cli/src/connections.c:1612
-#, c-format
-msgid "Error: Could not get user settings."
-msgstr "பிழை: பயனர் அமைவுகளை பெற முடியவில்லை."
-
-#: ../cli/src/connections.c:1622
+#: ../cli/src/connections.c:2110
 #, 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:71 ../cli/src/devices.c:109 ../cli/src/devices.c:190
+#: ../cli/src/devices.c:206
 msgid "DEVICE"
 msgstr "DEVICE"
 
-#. 1
-#. 4
 #. 0
-#: ../cli/src/devices.c:62 ../cli/src/devices.c:90
-#: ../cli/src/network-manager.c:36
-msgid "STATE"
-msgstr "STATE"
-
-#: ../cli/src/devices.c:71
-msgid "GENERAL"
-msgstr "GENERAL"
-
-#. 0
-#: ../cli/src/devices.c:72
+#: ../cli/src/devices.c:84
 msgid "CAPABILITIES"
 msgstr "CAPABILITIES"
 
 #. 1
-#: ../cli/src/devices.c:73
+#: ../cli/src/devices.c:85
 msgid "WIFI-PROPERTIES"
 msgstr "WIFI-PROPERTIES"
 
 #. 2
-#: ../cli/src/devices.c:74
+#: ../cli/src/devices.c:86
 msgid "AP"
 msgstr "AP"
 
 #. 3
-#: ../cli/src/devices.c:75
+#: ../cli/src/devices.c:87
 msgid "WIRED-PROPERTIES"
 msgstr "WIRED-PROPERTIES"
 
 #. 4
-#: ../cli/src/devices.c:76
-msgid "IP4-SETTINGS"
-msgstr "IP4-SETTINGS"
+#: ../cli/src/devices.c:88
+msgid "WIMAX-PROPERTIES"
+msgstr "WIMAX-PROPERTIES"
 
 #. 5
-#: ../cli/src/devices.c:77
-msgid "IP4-DNS"
-msgstr "IP4-DNS"
+#. 0
+#: ../cli/src/devices.c:89 ../cli/src/devices.c:203
+msgid "NSP"
+msgstr "NSP"
+
+#. 6
+#: ../cli/src/devices.c:90
+msgid "IP4"
+msgstr "IP4"
+
+#. 7
+#: ../cli/src/devices.c:91
+msgid "DHCP4"
+msgstr "DHCP4"
+
+#. 8
+#: ../cli/src/devices.c:92
+msgid "IP6"
+msgstr "IP6"
+
+#. 9
+#: ../cli/src/devices.c:93
+msgid "DHCP6"
+msgstr "DHCP6"
+
+#. 10
+#: ../cli/src/devices.c:94
+msgid "BOND"
+msgstr "BOND"
+
+#. 11
+#: ../cli/src/devices.c:95
+msgid "VLAN"
+msgstr "VLAN"
 
 #. 2
-#: ../cli/src/devices.c:88
+#: ../cli/src/devices.c:111
+msgid "VENDOR"
+msgstr "VENDOR"
+
+#. 3
+#: ../cli/src/devices.c:112
+msgid "PRODUCT"
+msgstr "PRODUCT"
+
+#. 4
+#: ../cli/src/devices.c:113
 msgid "DRIVER"
 msgstr "DRIVER"
 
-#. 3
-#: ../cli/src/devices.c:89
+#. 5
+#: ../cli/src/devices.c:114
+msgid "DRIVER-VERSION"
+msgstr "DRIVER-VERSION"
+
+#. 6
+#: ../cli/src/devices.c:115
+msgid "FIRMWARE-VERSION"
+msgstr "FIRMWARE-VERSION"
+
+#. 7
+#: ../cli/src/devices.c:116
 msgid "HWADDR"
 msgstr "HWADDR"
 
+#. 9
+#: ../cli/src/devices.c:118
+msgid "REASON"
+msgstr "REASON"
+
+#. 10
+#: ../cli/src/devices.c:119
+msgid "UDI"
+msgstr "UDI"
+
+#. 11
+#: ../cli/src/devices.c:120
+msgid "IP-IFACE"
+msgstr "IP-IFACE"
+
+#. 12
+#: ../cli/src/devices.c:121
+msgid "NM-MANAGED"
+msgstr "NM-MANAGED"
+
+#. 14
+#: ../cli/src/devices.c:123
+msgid "FIRMWARE-MISSING"
+msgstr "FIRMWARE-MISSING"
+
+#. 15
+#: ../cli/src/devices.c:124
+msgid "CONNECTION"
+msgstr "CONNECTION"
+
 #. 0
-#: ../cli/src/devices.c:99
+#: ../cli/src/devices.c:133
 msgid "CARRIER-DETECT"
 msgstr "CARRIER-DETECT"
 
 #. 1
-#: ../cli/src/devices.c:100
+#: ../cli/src/devices.c:134
 msgid "SPEED"
 msgstr "SPEED"
 
 #. 0
-#: ../cli/src/devices.c:109
+#: ../cli/src/devices.c:143
 msgid "CARRIER"
 msgstr "CARRIER"
 
 #. 0
-#: ../cli/src/devices.c:119
+#: ../cli/src/devices.c:153
 msgid "WEP"
 msgstr "WEP"
 
 #. 1
-#: ../cli/src/devices.c:120
+#: ../cli/src/devices.c:154
 msgid "WPA"
 msgstr "WPA"
 
 #. 2
-#: ../cli/src/devices.c:121
+#: ../cli/src/devices.c:155
 msgid "WPA2"
 msgstr "WPA2"
 
 #. 3
-#: ../cli/src/devices.c:122
+#: ../cli/src/devices.c:156
 msgid "TKIP"
 msgstr "TKIP"
 
 #. 4
-#: ../cli/src/devices.c:123
+#: ../cli/src/devices.c:157
 msgid "CCMP"
 msgstr "CCMP"
 
 #. 0
-#: ../cli/src/devices.c:132
-msgid "ADDRESS"
-msgstr "ADDRESS"
+#: ../cli/src/devices.c:167
+msgid "CTR-FREQ"
+msgstr "CTR-FREQ"
 
 #. 1
-#: ../cli/src/devices.c:133
-msgid "PREFIX"
-msgstr "PREFIX"
+#: ../cli/src/devices.c:168
+msgid "RSSI"
+msgstr "RSSI"
 
 #. 2
-#: ../cli/src/devices.c:134
-msgid "GATEWAY"
-msgstr "GATEWAY"
+#: ../cli/src/devices.c:169
+msgid "CINR"
+msgstr "CINR"
 
-#. 0
-#: ../cli/src/devices.c:143
-msgid "DNS"
-msgstr "DNS"
+#. 3
+#: ../cli/src/devices.c:170
+msgid "TX-POW"
+msgstr "TX-POW"
+
+#. 4
+#: ../cli/src/devices.c:171
+msgid "BSID"
+msgstr "BSID"
 
 #. 0
-#: ../cli/src/devices.c:153
+#: ../cli/src/devices.c:181
 msgid "SSID"
 msgstr "SSID"
 
 #. 1
-#: ../cli/src/devices.c:154
+#: ../cli/src/devices.c:182
 msgid "BSSID"
 msgstr "BSSID"
 
 #. 2
-#: ../cli/src/devices.c:155
+#: ../cli/src/devices.c:183
 msgid "MODE"
 msgstr "MODE"
 
 #. 3
-#: ../cli/src/devices.c:156
+#: ../cli/src/devices.c:184
 msgid "FREQ"
 msgstr "FREQ"
 
 #. 4
-#: ../cli/src/devices.c:157
+#: ../cli/src/devices.c:185
 msgid "RATE"
 msgstr "RATE"
 
 #. 5
-#: ../cli/src/devices.c:158
+#. 1
+#: ../cli/src/devices.c:186 ../cli/src/devices.c:204
 msgid "SIGNAL"
 msgstr "SIGNAL"
 
 #. 6
-#: ../cli/src/devices.c:159
+#: ../cli/src/devices.c:187
 msgid "SECURITY"
 msgstr "SECURITY"
 
 #. 7
-#: ../cli/src/devices.c:160
+#: ../cli/src/devices.c:188
 msgid "WPA-FLAGS"
 msgstr "WPA-FLAGS"
 
 #. 8
-#: ../cli/src/devices.c:161
+#: ../cli/src/devices.c:189
 msgid "RSN-FLAGS"
 msgstr "RSN-FLAGS"
 
 #. 10
-#: ../cli/src/devices.c:163
+#. 4
+#: ../cli/src/devices.c:191 ../cli/src/devices.c:207
 msgid "ACTIVE"
 msgstr "ACTIVE"
 
-#: ../cli/src/devices.c:186
+#. 0
+#: ../cli/src/devices.c:219
+msgid "SLAVES"
+msgstr "SLAVES"
+
+#. 0
+#: ../cli/src/devices.c:228
+msgid "ID"
+msgstr "ID"
+
+#: ../cli/src/devices.c:244
 #, c-format
 msgid ""
-"Usage: nmcli dev { COMMAND | help }\n"
+"Usage: nmcli device { COMMAND | help }\n"
+"\n"
+"  COMMAND := { status | list | disconnect | wifi | wimax }\n"
 "\n"
 "  COMMAND := { status | list | disconnect | wifi }\n"
 "\n"
 "  status\n"
 "  list [iface ]\n"
 "  disconnect iface  [--nowait] [--timeout ]\n"
-"  wifi [list [iface ] [hwaddr ]]\n"
+"  wifi [list [iface ] [bssid ]]\n"
+"  wifi connect <(B)SSID> [password ] [wep-key-type key|phrase] "
+"[iface ] [bssid ] [name ]\n"
+"               [--private] [--nowait] [--timeout ]\n"
+"  wimax [list [iface ] [nsp ]]\n"
 "\n"
 msgstr ""
-"Usage: nmcli dev { COMMAND | help }\n"
+"Usage: nmcli device { COMMAND | help }\n"
+"\n"
+"  COMMAND := { status | list | disconnect | wifi | wimax }\n"
 "\n"
 "  COMMAND := { status | list | disconnect | wifi }\n"
 "\n"
 "  status\n"
 "  list [iface ]\n"
 "  disconnect iface  [--nowait] [--timeout ]\n"
-"  wifi [list [iface ] [hwaddr ]]\n"
+"  wifi [list [iface ] [bssid ]]\n"
+"  wifi connect <(B)SSID> [password ] [wep-key-type key|phrase] "
+"[iface ] [bssid ] [name ]\n"
+"               [--private] [--nowait] [--timeout ]\n"
+"  wimax [list [iface ] [nsp ]]\n"
 "\n"
 
-#: ../cli/src/devices.c:206
-msgid "unmanaged"
-msgstr "பராமரிக்கப்படாத"
-
-#: ../cli/src/devices.c:208
-msgid "unavailable"
-msgstr "கிடைக்கப்பெறாத"
-
-#: ../cli/src/devices.c:210 ../cli/src/network-manager.c:89
-msgid "disconnected"
-msgstr "துண்டிக்கப்பட்டது"
-
-#: ../cli/src/devices.c:212
-msgid "connecting (prepare)"
-msgstr "இணைக்கிறது (தயாராக்கு)"
-
-#: ../cli/src/devices.c:214
-msgid "connecting (configuring)"
-msgstr "இணைக்கிறது (கட்டமைக்கிறது)"
-
-#: ../cli/src/devices.c:216
-msgid "connecting (need authentication)"
-msgstr "இணைக்கிறது (அங்கீகாரம் தேவை)"
-
-#: ../cli/src/devices.c:218
-msgid "connecting (getting IP configuration)"
-msgstr "இணைக்கிறது (IP கட்டமைப்பை பெறுகிறது)"
-
-#: ../cli/src/devices.c:220 ../cli/src/network-manager.c:87
-msgid "connected"
-msgstr "இணைக்கப்பட்டது"
-
-#: ../cli/src/devices.c:222
-msgid "connection failed"
-msgstr "இணைக்க முடியவில்லை"
-
-#: ../cli/src/devices.c:245 ../cli/src/devices.c:380
-msgid "Unknown"
-msgstr "தெரியாத"
-
-#: ../cli/src/devices.c:277
+#: ../cli/src/devices.c:347
 msgid "(none)"
 msgstr "(ஒன்றுமில்லாத)"
 
-#: ../cli/src/devices.c:302
-#, c-format
-msgid "%s: error converting IP4 address 0x%X"
-msgstr "%s: IP4 முகவரி 0x%X ஐ மாற்றுவதில் பிழை"
-
-#: ../cli/src/devices.c:349
+#: ../cli/src/devices.c:403
 #, c-format
 msgid "%u MHz"
 msgstr "%u MHz"
 
-#: ../cli/src/devices.c:350
+#: ../cli/src/devices.c:404
 #, c-format
 msgid "%u MB/s"
 msgstr "%u MB/s"
 
-#: ../cli/src/devices.c:359
+#: ../cli/src/devices.c:413
 msgid "Encrypted: "
 msgstr "மறைகுறியாக்கப்பட்டது: "
 
-#: ../cli/src/devices.c:364
+#: ../cli/src/devices.c:418
 msgid "WEP "
 msgstr "WEP "
 
-#: ../cli/src/devices.c:366
+#: ../cli/src/devices.c:420
 msgid "WPA "
 msgstr "WPA "
 
-#: ../cli/src/devices.c:368
+#: ../cli/src/devices.c:422
 msgid "WPA2 "
 msgstr "WPA2 "
 
-#: ../cli/src/devices.c:371
+#: ../cli/src/devices.c:425
 msgid "Enterprise "
 msgstr "என்டர்பிரைசஸ்"
 
-#: ../cli/src/devices.c:380
+#: ../cli/src/devices.c:434
 msgid "Ad-Hoc"
 msgstr "Ad-Hoc"
 
-#: ../cli/src/devices.c:380
+#: ../cli/src/devices.c:435
 msgid "Infrastructure"
 msgstr "அடித்தளம்"
 
-#: ../cli/src/devices.c:442
+#: ../cli/src/devices.c:471
+msgid "Home"
+msgstr "இல்லம்"
+
+#: ../cli/src/devices.c:474
+msgid "Partner"
+msgstr "கூட்டாளர்"
+
+#: ../cli/src/devices.c:477
+msgid "Roaming"
+msgstr "ரோமிங்"
+
+#: ../cli/src/devices.c:549
 #, c-format
 msgid "Error: 'dev list': %s"
 msgstr "பிழை: 'dev list': %s"
 
-#: ../cli/src/devices.c:444
+#: ../cli/src/devices.c:551
 #, c-format
 msgid "Error: 'dev list': %s; allowed fields: %s"
 msgstr "பிழை: 'dev list': %s; அனுமதிக்கப்பட்ட புலங்கள்: %s"
 
-#: ../cli/src/devices.c:453
+#: ../cli/src/devices.c:560
 msgid "Device details"
 msgstr "சாதன விவரங்கள்"
 
-#: ../cli/src/devices.c:483 ../cli/src/devices.c:827
+#: ../cli/src/devices.c:607 ../cli/src/devices.c:610 ../cli/src/devices.c:1086
+#: ../cli/src/utils.c:479
 msgid "(unknown)"
 msgstr "(தெரியாத)"
 
-#: ../cli/src/devices.c:484
-msgid "unknown)"
-msgstr "தெரியாத)"
+#: ../cli/src/devices.c:619
+msgid "not connected"
+msgstr "இணைக்கப்படவில்லை"
 
-#: ../cli/src/devices.c:510
+#: ../cli/src/devices.c:646
 #, c-format
 msgid "%u Mb/s"
 msgstr "%u Mb/s"
 
 #. Print header
 #. "WIRED-PROPERTIES"
-#: ../cli/src/devices.c:583
+#: ../cli/src/devices.c:720
 msgid "on"
 msgstr "ஆன் "
 
-#: ../cli/src/devices.c:583
+#: ../cli/src/devices.c:720
 msgid "off"
 msgstr "ஆஃப்"
 
-#: ../cli/src/devices.c:710
+#: ../cli/src/devices.c:928
 #, c-format
 msgid "Error: 'dev status': %s"
 msgstr "பிழை: 'dev status': %s"
 
-#: ../cli/src/devices.c:712
+#: ../cli/src/devices.c:930
 #, c-format
 msgid "Error: 'dev status': %s; allowed fields: %s"
 msgstr "பிழை: 'dev status': %s; அனுமதிக்கப்பட்ட புலங்கள்: %s"
 
-#: ../cli/src/devices.c:719
+#: ../cli/src/devices.c:953
 msgid "Status of devices"
 msgstr "சாதனங்களின் நிலை"
 
-#: ../cli/src/devices.c:747
+#: ../cli/src/devices.c:984
 #, 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:1025 ../cli/src/devices.c:1190
+#: ../cli/src/devices.c:1331 ../cli/src/devices.c:1978
 #, c-format
 msgid "Error: Device '%s' not found."
 msgstr "பிழை: சாதனம் '%s' காணப்படவில்லை."
 
-#: ../cli/src/devices.c:799
+#: ../cli/src/devices.c:1048
 #, c-format
 msgid "Success: Device '%s' successfully disconnected."
 msgstr "வெற்றி: சாதனம் '%s' வெற்றிகரமாக துண்டிக்கப்பட்டது."
 
-#: ../cli/src/devices.c:824
+#: ../cli/src/devices.c:1083
 #, c-format
 msgid "Error: Device '%s' (%s) disconnecting failed: %s"
 msgstr "பிழை: சாதனம் '%s' (%s) துண்டிக்கபடவில்லை: %s"
 
-#: ../cli/src/devices.c:832
+#: ../cli/src/devices.c:1096
 #, c-format
-msgid "Device state: %d (%s)\n"
-msgstr "சாதன நிலை: %d (%s)\n"
+msgid "Device '%s' has been disconnected.\n"
+msgstr "சாதனம் '%s' துண்டிக்கப்பட்டது.\n"
 
-#: ../cli/src/devices.c:896
+#: ../cli/src/devices.c:1159
 #, c-format
 msgid "Error: iface has to be specified."
 msgstr "பிழை: iபேஸ் குறிப்பிடப்பட வேண்டும்."
 
-#: ../cli/src/devices.c:1011
+#: ../cli/src/devices.c:1289
 #, c-format
 msgid "Error: 'dev wifi': %s"
 msgstr "பிழை: 'dev wifi': '%s'"
 
-#: ../cli/src/devices.c:1013
+#: ../cli/src/devices.c:1291
 #, c-format
 msgid "Error: 'dev wifi': %s; allowed fields: %s"
 msgstr "பிழை: 'dev wifi': %s; அனுமதிக்கப்பட்ட புலங்கள்: %s"
 
-#: ../cli/src/devices.c:1020
+#: ../cli/src/devices.c:1314
 msgid "WiFi scan list"
 msgstr "WiFi ஸ்கேன் பட்டியல்"
 
-#: ../cli/src/devices.c:1055 ../cli/src/devices.c:1109
+#: ../cli/src/devices.c:1351 ../cli/src/devices.c:1405
 #, c-format
-msgid "Error: Access point with hwaddr '%s' not found."
-msgstr "பிழை:hwaddr '%s' உடன் அணுகல் புள்ளி காணப்படவில்லை."
+msgid "Error: Access point with bssid '%s' not found."
+msgstr "பிழை: '%s' என்ற bssis கொண்ட அணுகல் புள்ளி காணப்படவில்லை."
 
-#: ../cli/src/devices.c:1072
+#: ../cli/src/devices.c:1368
 #, c-format
 msgid "Error: Device '%s' is not a WiFi device."
 msgstr "பிழை: சாதனம் '%s' ஒரு WiFi சாதனம் இல்லை."
 
-#: ../cli/src/devices.c:1136
+#: ../cli/src/devices.c:1436 ../cli/src/devices.c:1482
+#, c-format
+msgid "Connection with UUID '%s' created and activated on device '%s'\n"
+msgstr "'%s' சாதனத்தில் '%s' எனும் UUID கொண்ட இணைப்பு உருவாக்கப்பட்டு செயல்படுத்தப்பட்டது\n"
+
+#: ../cli/src/devices.c:1441
+#, c-format
+msgid "Error: Connection activation failed: (%d) %s."
+msgstr "பிழை: இணைப்பை செயல்படுத்துவதில் தோல்வி: (%d) %s."
+
+#: ../cli/src/devices.c:1466
+#, c-format
+msgid "Error: Failed to add/activate new connection: (%d) %s"
+msgstr "பிழை: புதிய இணைப்பை சேர்க்க/செயல்படுத்த முடியவில்லை: (%d) %s"
+
+#: ../cli/src/devices.c:1474
+#, c-format
+msgid "Error: Failed to add/activate new connection: Unknown error"
+msgstr "பிழை: புதிய இணைப்பை சேர்க்க/செயல்படுத்த முடியவில்லை: தெரியாத பிழை"
+
+#: ../cli/src/devices.c:1618
+#, c-format
+msgid "Error: SSID or BSSID are missing."
+msgstr "பிழை: SSID அலல்து BSSID இல்லை."
+
+#: ../cli/src/devices.c:1641
+#, c-format
+msgid "Error: bssid argument value '%s' is not a valid BSSID."
+msgstr "பிழை: bssid அளவுரு மதிப்பு '%s' ஒரு சரியான BSSID அல்ல."
+
+#: ../cli/src/devices.c:1665
+#, c-format
+msgid "Error: wep-key-type argument value '%s' is invalid, use 'key' or 'phrase'."
+msgstr ""
+"பிழை: wep-key-type அளவுரு மதிப்பு '%s' தவறானது 'key' அல்லது 'phrase' ஐப் "
+"பயன்படுத்தவும்."
+
+#: ../cli/src/devices.c:1705
+#, c-format
+msgid "Error: BSSID to connect to (%s) differs from bssid argument (%s)."
+msgstr "பிழை: (%s) க்கு இணைக்க வேண்டிய BSSID bssid அளவுருவிலிர்நுது (%s) வேறுபட்டுள்ளது."
+
+#: ../cli/src/devices.c:1711
+#, c-format
+msgid "Error: Parameter '%s' is neither SSID nor BSSID."
+msgstr "பிழை: அளவுரு '%s' SSID ஆகவும் இல்லை BSSID ஆகவும் இல்லை."
+
+#: ../cli/src/devices.c:1740
+#, c-format
+msgid "Error: Device '%s' is not a Wi-Fi device."
+msgstr "பிழை: '%s' சாதனம் ஒரு Wi-Fi சாதனமல்ல."
+
+#: ../cli/src/devices.c:1742
+#, c-format
+msgid "Error: No Wi-Fi device found."
+msgstr "பிழை: Wi-Fi சாதனம் இல்லை."
+
+#: ../cli/src/devices.c:1760
+#, c-format
+msgid "Error: No network with SSID '%s' found."
+msgstr "பிழை: '%s' என்ற SSID கொண்ட பிணையம் இல்லை."
+
+#: ../cli/src/devices.c:1762
+#, c-format
+msgid "Error: No access point with BSSID '%s' found."
+msgstr "பிழை: '%s' என்ற BSSID கொண்ட அணுகல் புள்ளி காணப்படவில்லை."
+
+#: ../cli/src/devices.c:1860
 #, c-format
 msgid "Error: 'dev wifi' command '%s' is not valid."
 msgstr "பிழை: 'dev wifi' கட்டளை '%s' ஆனது தவறானது."
 
-#: ../cli/src/devices.c:1183
+#: ../cli/src/devices.c:1936
+#, c-format
+msgid "Error: 'dev wimax': %s"
+msgstr "Error: 'dev wimax': %s"
+
+#: ../cli/src/devices.c:1938
+#, c-format
+msgid "Error: 'dev wimax': %s; allowed fields: %s"
+msgstr "பிழை: 'dev wimax': %s; அனுமதிக்கப்பட்ட புலங்கள்: %s"
+
+#: ../cli/src/devices.c:1961
+msgid "WiMAX NSP list"
+msgstr "WiMAX NSP பட்டியல்"
+
+#: ../cli/src/devices.c:1998
+#, c-format
+msgid "Error: NSP with name '%s' not found."
+msgstr "பிழை: '%s' என்ற பெயர் கொண்ட NSP இல்லை."
+
+#: ../cli/src/devices.c:2009
+#, c-format
+msgid "Error: Device '%s' is not a WiMAX device."
+msgstr "பிழை: சாதனம் '%s' ஒரு WiMAX சாதனம் இல்லை."
+
+#: ../cli/src/devices.c:2040
+#, c-format
+msgid "Error: Access point with nsp '%s' not found."
+msgstr "பிழை: '%s' என்ற nsp கொண்ட அணுகல் புள்ளி காணப்படவில்லை."
+
+#: ../cli/src/devices.c:2067
+#, c-format
+msgid "Error: 'dev wimax' command '%s' is not valid."
+msgstr "பிழை: '%s' என்ற 'dev wimax' கட்டளை தவறானது."
+
+#: ../cli/src/devices.c:2120
 #, 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"
 
+#. 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:62
+msgid "PERMISSION"
+msgstr "PERMISSION"
+
+#. 0
+#: ../cli/src/network-manager.c:63
+msgid "VALUE"
+msgstr "VALUE"
+
+#: ../cli/src/network-manager.c:77
 #, c-format
 msgid ""
 "Usage: nmcli nm { COMMAND | help }\n"
 "\n"
-"  COMMAND := { status | sleep | wakeup | wifi | wwan }\n"
+"  COMMAND := { status | permissions | enable | sleep | wifi | wwan | "
+"wimax }\n"
+"\n"
+"  COMMAND := { status | permissions | enable | sleep | wifi | wwan }\n"
 "\n"
 "  status\n"
-"  sleep\n"
-"  wakeup\n"
+"  permissions\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 | permissions | enable | sleep | wifi | wwan | "
+"wimax }\n"
 "\n"
-" நிலை\n"
-"  தூக்கம்\n"
-"  விழிப்பு\n"
+"  COMMAND := { status | permissions | enable | sleep | wifi | wwan }\n"
+"\n"
+"  status\n"
+"  permissions\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:108
 msgid "asleep"
 msgstr "தூங்கிக் கொண்டிருத்தல்"
 
-#: ../cli/src/network-manager.c:85
+#: ../cli/src/network-manager.c:110
 msgid "connecting"
 msgstr "இணைக்கிறது"
 
-#: ../cli/src/network-manager.c:125
+#: ../cli/src/network-manager.c:112
+msgid "connected (local only)"
+msgstr "இணைக்கப்பட்டது (கணினிக்குள் மட்டும்)"
+
+#: ../cli/src/network-manager.c:114
+msgid "connected (site only)"
+msgstr "இணைக்கப்பட்டது (தளம் மட்டும்)"
+
+#: ../cli/src/network-manager.c:118
+msgid "disconnecting"
+msgstr "துண்டிக்கப்படுகிறது"
+
+#: ../cli/src/network-manager.c:158
 #, c-format
 msgid "Error: 'nm status': %s"
 msgstr "பிழை: 'nm status': %s"
 
-#: ../cli/src/network-manager.c:127
+#: ../cli/src/network-manager.c:160
 #, c-format
 msgid "Error: 'nm status': %s; allowed fields: %s"
 msgstr "பிழை: 'nm status': %s; அனுமதிக்கப்பட்ட புலங்கள்: %s"
 
-#: ../cli/src/network-manager.c:134
+#. create NMClient
+#: ../cli/src/network-manager.c:173 ../cli/src/network-manager.c:174
+#: ../cli/src/network-manager.c:175 ../cli/src/network-manager.c:176
+#: ../cli/src/network-manager.c:177 ../cli/src/network-manager.c:179
+#: ../cli/src/network-manager.c:180 ../cli/src/network-manager.c:429
+#: ../cli/src/network-manager.c:484 ../cli/src/network-manager.c:522
+#: ../cli/src/network-manager.c:561
+msgid "enabled"
+msgstr "செயல்படுத்தப்பட்டது"
+
+#: ../cli/src/network-manager.c:173 ../cli/src/network-manager.c:174
+#: ../cli/src/network-manager.c:175 ../cli/src/network-manager.c:176
+#: ../cli/src/network-manager.c:177 ../cli/src/network-manager.c:179
+#: ../cli/src/network-manager.c:180 ../cli/src/network-manager.c:429
+#: ../cli/src/network-manager.c:484 ../cli/src/network-manager.c:522
+#: ../cli/src/network-manager.c:561
+msgid "disabled"
+msgstr "செயல்நீக்கப்பட்டது"
+
+#: ../cli/src/network-manager.c:193
 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
-msgid "enabled"
-msgstr "செயல்படுத்தப்பட்டது"
+#: ../cli/src/network-manager.c:196
+msgid "running"
+msgstr "இயங்குகிறது"
+
+#: ../cli/src/network-manager.c:196
+msgid "not running"
+msgstr "இயங்கவில்லை"
+
+#: ../cli/src/network-manager.c:271
+msgid "auth"
+msgstr "auth"
+
+#: ../cli/src/network-manager.c:301
+#, c-format
+msgid "Error: 'nm permissions': %s"
+msgstr "பிழை: 'nm அனுமதிகள்': %s"
+
+#: ../cli/src/network-manager.c:303
+#, c-format
+msgid "Error: 'nm permissions': %s; allowed fields: %s"
+msgstr "பிழை: 'nm அனுமதிகள்': %s; அனுமதிக்கப்பட்ட புலங்கள்: %s"
 
-#: ../cli/src/network-manager.c:140 ../cli/src/network-manager.c:141
-#: ../cli/src/network-manager.c:142 ../cli/src/network-manager.c:143
-#: ../cli/src/network-manager.c:211 ../cli/src/network-manager.c:243
-msgid "disabled"
-msgstr "செயல்நீக்கப்பட்டது"
+#: ../cli/src/network-manager.c:324
+msgid "NetworkManager permissions"
+msgstr "NetworkManager அனுமதிகள்"
 
-#: ../cli/src/network-manager.c:148
-msgid "running"
-msgstr "இயங்குகிறது"
+#: ../cli/src/network-manager.c:350 ../cli/src/utils.c:459
+#, c-format
+msgid "Error: Couldn't connect to system bus: %s"
+msgstr "பிழை: கணினி பஸுடன் இணைக்க முடியவில்லை: %s"
 
-#: ../cli/src/network-manager.c:148
-msgid "not running"
-msgstr "இயங்கவில்லை"
+#: ../cli/src/network-manager.c:361
+#, c-format
+msgid "Error: Couldn't create D-Bus object proxy."
+msgstr "பிழை: D-பஸ் பொருள் பதிலியை உருவாக்க முடியவில்லை."
+
+#: ../cli/src/network-manager.c:367
+#, c-format
+msgid "Error in sleep: %s"
+msgstr "ஸ்லீப்பில் பிழை: %s"
 
-#: ../cli/src/network-manager.c:201 ../cli/src/network-manager.c:233
+#: ../cli/src/network-manager.c:416 ../cli/src/network-manager.c:471
+#: ../cli/src/network-manager.c:509 ../cli/src/network-manager.c:548
 #, 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:424
+msgid "Networking enabled"
+msgstr "நெட்வொர்க்கிங் செயல்படுத்தப்பட்டது"
+
+#: ../cli/src/network-manager.c:440
+#, c-format
+msgid "Error: invalid 'enable' parameter: '%s'; use 'true' or 'false'."
+msgstr "பிழை: தவறான 'enable' அளவுரு: '%s'; 'true' அல்லது 'false' ஐப் பயன்படுத்தவும்."
+
+#: ../cli/src/network-manager.c:450
+#, c-format
+msgid "Error: Sleeping status is not exported by NetworkManager."
+msgstr "பிழை: உறங்கும் நிலை NetworkManager ஆல் ஏற்றுமதி செய்யப்படவில்லை."
+
+#: ../cli/src/network-manager.c:458
+#, c-format
+msgid "Error: invalid 'sleep' parameter: '%s'; use 'true' or 'false'."
+msgstr "பிழை: தவறான 'sleep' அளவுரு: '%s'; 'true' அல்லது 'false' ஐப் பயன்படுத்தவும்."
+
+#: ../cli/src/network-manager.c:479
 msgid "WiFi enabled"
 msgstr "WiFi செயல்படுத்தப்பட்டது"
 
-#: ../cli/src/network-manager.c:220
+#: ../cli/src/network-manager.c:495
 #, c-format
 msgid "Error: invalid 'wifi' parameter: '%s'."
 msgstr "பிழை: தவறான 'wifi' அளவுரு: '%s'."
 
-#: ../cli/src/network-manager.c:241
+#: ../cli/src/network-manager.c:517
 msgid "WWAN enabled"
 msgstr "WWAN செயல்படுத்தப்பட்டது"
 
-#: ../cli/src/network-manager.c:252
+#: ../cli/src/network-manager.c:533
 #, c-format
 msgid "Error: invalid 'wwan' parameter: '%s'."
 msgstr "பிழை: தவறான 'wwan' அளவுரு: '%s'."
 
-#: ../cli/src/network-manager.c:263
+#: ../cli/src/network-manager.c:556
+msgid "WiMAX enabled"
+msgstr "WiMAX செயல்படுத்தப்பட்டது"
+
+#: ../cli/src/network-manager.c:572
+#, c-format
+msgid "Error: invalid 'wimax' parameter: '%s'."
+msgstr "பிழை: தவறான 'wimax' அளவுரு: '%s'."
+
+#: ../cli/src/network-manager.c:588
 #, c-format
 msgid "Error: 'nm' command '%s' is not valid."
 msgstr "Error: 'nm' கட்டளை '%s' தவனாறது."
 
-#: ../cli/src/nmcli.c:69
+#: ../cli/src/nmcli.c:76
 #, c-format
 msgid ""
 "Usage: %s [OPTIONS] OBJECT { COMMAND | help }\n"
@@ -975,13 +1687,15 @@ msgid ""
 "  -f[ields] |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"
 "OBJECT\n"
-"  nm          NetworkManager status\n"
-"  con         NetworkManager connections\n"
-"  dev         devices managed by NetworkManager\n"
+"  nm              NetworkManager's status\n"
+"  c[onnection]    NetworkManager's connections\n"
+"  d[evice]        devices managed by NetworkManager\n"
 "\n"
 msgstr ""
 "Usage: %s [OPTIONS] OBJECT { COMMAND | help }\n"
@@ -993,572 +1707,883 @@ msgstr ""
 "  -f[ields] |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"
 "OBJECT\n"
-"  nm          NetworkManager status\n"
-"  con         NetworkManager connections\n"
-"  dev         devices managed by NetworkManager\n"
+"  nm              NetworkManager's status\n"
+"  c[onnection]    NetworkManager's connections\n"
+"  d[evice]        devices managed by NetworkManager\n"
 "\n"
 
-#: ../cli/src/nmcli.c:113
+#: ../cli/src/nmcli.c:124
 #, c-format
 msgid "Error: Object '%s' is unknown, try 'nmcli help'."
 msgstr "பிழை: பொருள் '%s' ஆனது தெரியாதது, 'nmcli உதவியை' முயற்சிக்கவும்."
 
-#: ../cli/src/nmcli.c:143
+#: ../cli/src/nmcli.c:154
 #, c-format
 msgid "Error: Option '--terse' is specified the second time."
 msgstr "பிழை: விருப்பம் '--terse' இரண்டாவது முறை குறிப்பிடப்பட்டது."
 
-#: ../cli/src/nmcli.c:148
+#: ../cli/src/nmcli.c:159
 #, c-format
 msgid "Error: Option '--terse' is mutually exclusive with '--pretty'."
 msgstr "பிழை: விருப்பம் '--terse'ஆனது '--pretty' உடன் ஒன்றாக உள்ளது."
 
-#: ../cli/src/nmcli.c:156
+#: ../cli/src/nmcli.c:167
 #, c-format
 msgid "Error: Option '--pretty' is specified the second time."
 msgstr "பிழை: விருப்பம் '--pretty' இரண்டாவது முறை குறிப்பிட்டது."
 
-#: ../cli/src/nmcli.c:161
+#: ../cli/src/nmcli.c:172
 #, 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:182 ../cli/src/nmcli.c:198
 #, 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:191 ../cli/src/nmcli.c:207
 #, c-format
 msgid "Error: '%s' is not valid argument for '%s' option."
 msgstr "பிழை: '%s' ஆனது '%s' விருப்பத்திற்கு சரியான விவாதம் அல்ல."
 
-#: ../cli/src/nmcli.c:203
+#: ../cli/src/nmcli.c:214
 #, c-format
 msgid "Error: fields for '%s' options are missing."
 msgstr "பிழை: '%s' க்கு புலங்கள் விடுபட்டது."
 
-#: ../cli/src/nmcli.c:209
+#: ../cli/src/nmcli.c:222
 #, c-format
 msgid "nmcli tool, version %s\n"
 msgstr "nmcli கருவி, பதிப்பு %s\n"
 
-#: ../cli/src/nmcli.c:215
+#: ../cli/src/nmcli.c:228
 #, c-format
 msgid "Error: Option '%s' is unknown, try 'nmcli -help'."
 msgstr "பிழை: விருப்பம் '%s'ஆனது தெரியாதது, 'nmcli -உதவியை' முயற்சிக்கவும்."
 
-#: ../cli/src/nmcli.c:234
+#: ../cli/src/nmcli.c:247
 #, 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 "பிழை: பிணைய மேலாளரை இணைக்க முடியவில்லை."
+#: ../cli/src/nmcli.c:272
+msgid "Error: Could not create NMClient object."
+msgstr "பிழை: NMClient பொருளை உருவாக்க முடியவில்லை."
 
-#: ../cli/src/nmcli.c:275
+#: ../cli/src/nmcli.c:288
 msgid "Success"
 msgstr "வெற்றி"
 
-#: ../cli/src/settings.c:407
+#: ../cli/src/settings.c:563
 #, c-format
 msgid "%d (hex-ascii-key)"
 msgstr "%d (hex-ascii-key)"
 
-#: ../cli/src/settings.c:409
+#: ../cli/src/settings.c:565
 #, c-format
 msgid "%d (104/128-bit passphrase)"
 msgstr "%d (104/128-bit கடவுச்சொல்)"
 
-#: ../cli/src/settings.c:412
+#: ../cli/src/settings.c:568 ../cli/src/settings.c:696
 #, c-format
 msgid "%d (unknown)"
 msgstr "%d (தெரியாத)"
 
-#: ../cli/src/settings.c:438
+#: ../cli/src/settings.c:594
 msgid "0 (unknown)"
 msgstr "0 (தெரியாத)"
 
-#: ../cli/src/settings.c:444
+#: ../cli/src/settings.c:600
 msgid "any, "
 msgstr "ஏதாவது,"
 
-#: ../cli/src/settings.c:446
+#: ../cli/src/settings.c:602
 msgid "900 MHz, "
 msgstr "900 MHz, "
 
-#: ../cli/src/settings.c:448
+#: ../cli/src/settings.c:604
 msgid "1800 MHz, "
 msgstr "1800 MHz, "
 
-#: ../cli/src/settings.c:450
+#: ../cli/src/settings.c:606
 msgid "1900 MHz, "
 msgstr "1900 MHz, "
 
-#: ../cli/src/settings.c:452
+#: ../cli/src/settings.c:608
 msgid "850 MHz, "
 msgstr "850 MHz, "
 
-#: ../cli/src/settings.c:454
+#: ../cli/src/settings.c:610
 msgid "WCDMA 3GPP UMTS 2100 MHz, "
 msgstr "WCDMA 3GPP UMTS 2100 MHz, "
 
-#: ../cli/src/settings.c:456
+#: ../cli/src/settings.c:612
 msgid "WCDMA 3GPP UMTS 1800 MHz, "
 msgstr "WCDMA 3GPP UMTS 1800 MHz, "
 
-#: ../cli/src/settings.c:458
+#: ../cli/src/settings.c:614
 msgid "WCDMA 3GPP UMTS 1700/2100 MHz, "
 msgstr "WCDMA 3GPP UMTS 1700/2100 MHz, "
 
-#: ../cli/src/settings.c:460
+#: ../cli/src/settings.c:616
 msgid "WCDMA 3GPP UMTS 800 MHz, "
 msgstr "WCDMA 3GPP UMTS 800 MHz, "
 
-#: ../cli/src/settings.c:462
+#: ../cli/src/settings.c:618
 msgid "WCDMA 3GPP UMTS 850 MHz, "
 msgstr "WCDMA 3GPP UMTS 850 MHz, "
 
-#: ../cli/src/settings.c:464
+#: ../cli/src/settings.c:620
 msgid "WCDMA 3GPP UMTS 900 MHz, "
 msgstr "WCDMA 3GPP UMTS 900 MHz, "
 
-#: ../cli/src/settings.c:466
+#: ../cli/src/settings.c:622
 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:624
+msgid "WCDMA 3GPP UMTS 1900 MHz, "
+msgstr "WCDMA 3GPP UMTS 1900 MHz, "
+
+#: ../cli/src/settings.c:626
+msgid "WCDMA 3GPP UMTS 2600 MHz, "
+msgstr "WCDMA 3GPP UMTS 2600 MHz, "
+
+#: ../cli/src/settings.c:644
+msgid "0 (NONE)"
+msgstr "0 (NONE)"
+
+#: ../cli/src/settings.c:650
+msgid "REORDER_HEADERS, "
+msgstr "REORDER_HEADERS, "
+
+#: ../cli/src/settings.c:652
+msgid "GVRP, "
+msgstr "GVRP, "
+
+#: ../cli/src/settings.c:654
+msgid "LOOSE_BINDING, "
+msgstr "LOOSE_BINDING, "
+
+#: ../cli/src/settings.c:690
+#, c-format
+msgid "%d (disabled)"
+msgstr "%d (முடக்கப்பட்டது)"
+
+#: ../cli/src/settings.c:692
+#, c-format
+msgid "%d (enabled, prefer public IP)"
+msgstr "%d (செயல்படுத்தப்பட்டது, பொது IP சிறந்தது)"
+
+#: ../cli/src/settings.c:694
+#, c-format
+msgid "%d (enabled, prefer temporary IP)"
+msgstr "%d (செயல்படுத்தப்பட்டது, தற்காலிக IP சிறந்தது)"
+
+#: ../cli/src/settings.c:827 ../cli/src/settings.c:1023
+#: ../cli/src/settings.c:1732
 msgid "auto"
 msgstr "தானே"
 
-#: ../cli/src/settings.c:704 ../cli/src/settings.c:707 ../cli/src/utils.c:172
-msgid "not set"
-msgstr "அமைக்கப்படவில்லை"
+#: ../cli/src/utils.c:105
+#, c-format
+msgid "Error converting IP4 address '0x%X' to text form"
+msgstr "IP4 முகவரி '0x%X' ஐ உரை வடிவத்திற்கு மாற்றுவதில் பிழை"
+
+#: ../cli/src/utils.c:133
+#, c-format
+msgid "Error converting IP6 address '%s' to text form"
+msgstr "IP6 முகவரி '%s' ஐ உரை வடிவத்திற்கு மாற்றுவதில் பிழை"
 
-#: ../cli/src/utils.c:124
+#: ../cli/src/utils.c:234
 #, c-format
 msgid "field '%s' has to be alone"
 msgstr "புலம் '%s' தனியாக இருக்க வேண்டும்"
 
-#: ../cli/src/utils.c:127
+#: ../cli/src/utils.c:237
 #, c-format
 msgid "invalid field '%s'"
 msgstr "தவறான புலம் '%s'"
 
-#: ../cli/src/utils.c:146
-#, c-format
+#: ../cli/src/utils.c:256
 msgid "Option '--terse' requires specifying '--fields'"
 msgstr "விருப்பம் '--terse' '--fields'ஐ குறிப்பிட தேவைப்படுகிறது"
 
-#: ../cli/src/utils.c:150
+#: ../cli/src/utils.c:260
 #, c-format
 msgid "Option '--terse' requires specific '--fields' option values , not '%s'"
+msgstr "விருப்பம் '--terse'க்கு குறிப்பிட்ட '--fields' விருப்ப மதிப்புகள் தேவை, '%s' அல்ல"
+
+#: ../cli/src/utils.c:470
+#, c-format
+msgid "Error: Couldn't create D-Bus object proxy for org.freedesktop.DBus"
+msgstr "பிழை: org.freedesktop.DBus க்கு D-பஸ் பொருள் பதிலியை உருவாக்க முடியவில்லை"
+
+#: ../cli/src/utils.c:478
+#, c-format
+msgid "Error: NameHasOwner request failed: %s"
+msgstr "பிழை: NameHasOwner கோரிக்கை தோல்வி: %s"
+
+#: ../cli/src/utils.c:523
+#, 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:532
+#, c-format
+msgid ""
+"Error: nmcli (%s) and NetworkManager (%s) versions don't match. Force "
+"execution using --nocheck, but the results are unpredictable."
 msgstr ""
-"விருப்பம் '--terse'க்கு குறிப்பிட்ட '--fields' விருப்ப மதிப்புகள் தேவை, '%s' அல்ல"
+"பிழை: nmcli (%s) மற்றும் NetworkManager (%s) பதிப்பு பொருந்தவில்லை. --nocheck "
+"கட்டளையைப் பயன்படுத்தி கட்டாயப்படுத்தி செயல்படவைக்கலாம், ஆனால் விளைவு எப்படி இருக்கும் என "
+"கணிக்க முடியாது."
 
-#: ../libnm-util/crypto.c:120
+#: ../libnm-util/crypto.c:133
 #, c-format
 msgid "PEM key file had no end tag '%s'."
 msgstr "PEM விசைக் கோப்பிற்கு முடிவு ஒட்டு'%s' இல்லை."
 
-#: ../libnm-util/crypto.c:130
+#: ../libnm-util/crypto.c:146
 #, c-format
 msgid "Doesn't look like a PEM private key file."
 msgstr "இதைப் பார்ப்பதற்கு ஒரு PEM தனிப்பட்ட விசைக் கோப்பு போல் இல்லை."
 
-#: ../libnm-util/crypto.c:138
+#: ../libnm-util/crypto.c:154
 #, c-format
 msgid "Not enough memory to store PEM file data."
 msgstr "PEM கோப்பு தரவை சேமிக்க போதைய நினைவகம் இல்லை."
 
-#: ../libnm-util/crypto.c:154
+#: ../libnm-util/crypto.c:170
 #, c-format
 msgid "Malformed PEM file: Proc-Type was not first tag."
 msgstr "முறையற்ற PEM கோப்பு: Proc-வகையானது முதல் ஒட்டு இல்லை."
 
-#: ../libnm-util/crypto.c:162
+#: ../libnm-util/crypto.c:178
 #, c-format
 msgid "Malformed PEM file: unknown Proc-Type tag '%s'."
 msgstr "முறையற்ற PEM கோப்பு: தெரியாத Proc-வகை ஒட்டு '%s'."
 
-#: ../libnm-util/crypto.c:172
+#: ../libnm-util/crypto.c:188
 #, c-format
 msgid "Malformed PEM file: DEK-Info was not the second tag."
 msgstr "முறையற்ற PEM கோப்பு: DEK-தகவலானது இரண்டாவது ஒட்டாக இருக்க முடியாது."
 
-#: ../libnm-util/crypto.c:183
+#: ../libnm-util/crypto.c:199
 #, c-format
 msgid "Malformed PEM file: no IV found in DEK-Info tag."
 msgstr "முறையற்ற PEM கோப்பு: IV ஆனது DEK-தகவல் ஒட்டில் காணப்படவில்லை."
 
-#: ../libnm-util/crypto.c:190
+#: ../libnm-util/crypto.c:206
 #, c-format
 msgid "Malformed PEM file: invalid format of IV in DEK-Info tag."
 msgstr "முறையற்ற PEM கோப்பு: DEK-தகவல் ஒட்டினுள் IV ன் தவறான வடிவம்."
 
-#: ../libnm-util/crypto.c:203
+#: ../libnm-util/crypto.c:219
 #, c-format
 msgid "Malformed PEM file: unknown private key cipher '%s'."
 msgstr "முறையற்ற PEM கோப்பு: தெரியாத தனிப்பட்ட விசை cipher '%s'."
 
-#: ../libnm-util/crypto.c:222
+#: ../libnm-util/crypto.c:238
 #, 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' முடிவு ஒட்டு '%s'ஐ பெற்றிருக்கவில்லை."
+#: ../libnm-util/crypto.c:284
+msgid "Failed to find expected PKCS#8 start tag."
+msgstr "எதிர்பார்க்கப்பட்ட PKCS#8 தொடக்கக் குறிச்சொல்லைக் கண்டறிவதில் தோல்வி."
 
-#: ../libnm-util/crypto.c:277
+#: ../libnm-util/crypto.c:292
 #, c-format
-msgid "Failed to decode certificate."
-msgstr "சான்றிதழை குறியாக முடியவில்லை."
+msgid "Failed to find expected PKCS#8 end tag '%s'."
+msgstr "எதிர்பார்க்கப்பட்ட PKCS#8 முடிவு குறிச்சொல் '%s' ஐக் கண்டறிவதில் தோல்வி."
+
+#: ../libnm-util/crypto.c:312
+msgid "Not enough memory to store private key data."
+msgstr "தனிப்பட்ட விசையின் தரவைச் சேமிக்க போதிய நினைவகம் இல்லை."
+
+#: ../libnm-util/crypto.c:317
+msgid "Failed to decode PKCS#8 private key."
+msgstr "PKCS#8 தனிப்பட்ட விசையை குறிநீக்கம் செய்தல் தோல்வி."
 
-#: ../libnm-util/crypto.c:286
+#: ../libnm-util/crypto.c:339 ../libnm-util/crypto.c:625
 #, 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
+#: ../libnm-util/crypto.c:365
 #, c-format
 msgid "IV must be an even number of bytes in length."
 msgstr "IV ஆனது நீளத்தில் ஒரு பைட்டிகளின் எண்னைப் பெற்றுள்ளது."
 
-#: ../libnm-util/crypto.c:333
+#: ../libnm-util/crypto.c:374
 #, c-format
 msgid "Not enough memory to store the IV."
 msgstr "IVஐ சேமிக்க போதைய நினைவகம் இல்லை."
 
-#: ../libnm-util/crypto.c:344
+#: ../libnm-util/crypto.c:385
 #, c-format
 msgid "IV contains non-hexadecimal digits."
 msgstr "IV ஆனது-ஹெக்ஸா தசம எண்களை பெற்றிருக்கவில்லை."
 
-#: ../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_nss.c:336
+#: ../libnm-util/crypto.c:423 ../libnm-util/crypto_gnutls.c:147
+#: ../libnm-util/crypto_gnutls.c:265 ../libnm-util/crypto_nss.c:167
+#: ../libnm-util/crypto_nss.c:332
 #, c-format
 msgid "Private key cipher '%s' was unknown."
 msgstr "தனிப்பட்ட விசை cipher '%s' ஆனது தெரியாதது."
 
-#: ../libnm-util/crypto.c:391
+#: ../libnm-util/crypto.c:432
 #, c-format
 msgid "Not enough memory to decrypt private key."
 msgstr "தனிப்பட்ட விசையின் மறைகுறிமுறையை நீக்க போதை நினைவகம் இல்லை."
 
-#: ../libnm-util/crypto.c:511
+#: ../libnm-util/crypto.c:497
+#, c-format
+msgid "Not enough memory to store decrypted private key."
+msgstr "தனிப்பட்ட விசையின் மறைகுறிமுறையை நீக்கத்தை சேமிக்க போதை நினைவகம் இல்லை."
+
+#: ../libnm-util/crypto.c:542
 #, c-format
 msgid "Unable to determine private key type."
 msgstr "தனிப்பட்ட விசை வகையை வரையறுக்க முடியவில்லை."
 
-#: ../libnm-util/crypto.c:530
+#: ../libnm-util/crypto.c:597
 #, c-format
-msgid "Not enough memory to store decrypted private key."
-msgstr "தனிப்பட்ட விசையின் மறைகுறிமுறையை நீக்கத்தை சேமிக்க போதை நினைவகம் இல்லை."
+msgid "PEM certificate had no start tag '%s'."
+msgstr "PEM சான்றிதழில் '%s' என்ற தொடக்கக் குறிச்சொல் இல்லை."
 
-#: ../libnm-util/crypto_gnutls.c:49
+#: ../libnm-util/crypto.c:606
+#, c-format
+msgid "PEM certificate had no end tag '%s'."
+msgstr "PEM சான்றிதழில் '%s' என்ற முடிவுக் குறிச்சொல் இல்லை."
+
+#: ../libnm-util/crypto.c:630
+#, c-format
+msgid "Failed to decode certificate."
+msgstr "சான்றிதழை குறியாக முடியவில்லை."
+
+#: ../libnm-util/crypto_gnutls.c:50
 msgid "Failed to initialize the crypto engine."
 msgstr "crypto என்ஜினைத் துவக்க முடியவில்லை."
 
-#: ../libnm-util/crypto_gnutls.c:93
+#: ../libnm-util/crypto_gnutls.c:92
 #, c-format
 msgid "Failed to initialize the MD5 engine: %s / %s."
 msgstr "MD5 என்ஜினைத் துவக்க முடியவில்லை: %s / %s."
 
-#: ../libnm-util/crypto_gnutls.c:156
+#: ../libnm-util/crypto_gnutls.c:155
 #, 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:164 ../libnm-util/crypto_nss.c:184
 #, c-format
 msgid "Not enough memory for decrypted key buffer."
 msgstr "மறைகுறிமுறைநீக்க விசை பஃப்பருக்கான போதைய நினைவகம் இல்லை."
 
-#: ../libnm-util/crypto_gnutls.c:173
+#: ../libnm-util/crypto_gnutls.c:172
 #, c-format
 msgid "Failed to initialize the decryption cipher context: %s / %s."
 msgstr "cipher சேர்த்து மறைகுறிமுறை நீக்கத்தை துவக்க முடியவில்லை: %s / %s."
 
-#: ../libnm-util/crypto_gnutls.c:182
+#: ../libnm-util/crypto_gnutls.c:181
 #, 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:190
 #, 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:199
 #, 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:209 ../libnm-util/crypto_nss.c:263
 #, 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:220 ../libnm-util/crypto_nss.c:274
 #, 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:285 ../libnm-util/crypto_nss.c:352
 #, c-format
 msgid "Could not allocate memory for encrypting."
 msgstr "மறைகுறியாக்கத்திற்கான நினைவகத்தை ஒதுக்கிட முடியவில்லை."
 
-#: ../libnm-util/crypto_gnutls.c:294
+#: ../libnm-util/crypto_gnutls.c:293
 #, c-format
 msgid "Failed to initialize the encryption cipher context: %s / %s."
 msgstr "cipher சேர்த்து மறைகுறியாக்கத்தை துவக்க முடியவில்லை: %s / %s."
 
-#: ../libnm-util/crypto_gnutls.c:303
+#: ../libnm-util/crypto_gnutls.c:302
 #, 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:312
 #, 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:321
 #, c-format
 msgid "Failed to encrypt the data: %s / %s."
 msgstr "தரவை மறைகுறியாக்க முடியவில்லை: %s / %s."
 
-#: ../libnm-util/crypto_gnutls.c:362
+#: ../libnm-util/crypto_gnutls.c:361
 #, c-format
 msgid "Error initializing certificate data: %s"
 msgstr "சான்றிதழ் தரவை துவக்குவதில் பிழை: %s"
 
-#: ../libnm-util/crypto_gnutls.c:384
+#: ../libnm-util/crypto_gnutls.c:383
 #, c-format
 msgid "Couldn't decode certificate: %s"
 msgstr "சான்றிதழை குறியாக்க முடியவில்லை: %s"
 
-#: ../libnm-util/crypto_gnutls.c:408
+#: ../libnm-util/crypto_gnutls.c:407
 #, 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:420
 #, 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:432
 #, c-format
 msgid "Couldn't verify PKCS#12 file: %s"
 msgstr "PKCS#12 கோப்பை சரிபார்க்க முடியவில்லை: %s"
 
+#: ../libnm-util/crypto_gnutls.c:460
+#, c-format
+msgid "Couldn't initialize PKCS#8 decoder: %s"
+msgstr "PKCS#8 டீகோடரைத் துவக்க முடியவில்லை: %s"
+
+#: ../libnm-util/crypto_gnutls.c:483
+#, c-format
+msgid "Couldn't decode PKCS#8 file: %s"
+msgstr "PKCS#8 கோப்பை குறிநீக்க முடியவில்லை: %s"
+
 #: ../libnm-util/crypto_nss.c:56
 #, c-format
 msgid "Failed to initialize the crypto engine: %d."
 msgstr "crypto என்ஜினைத் துவக்க முடியவில்லை: %d."
 
-#: ../libnm-util/crypto_nss.c:111
+#: ../libnm-util/crypto_nss.c:107
 #, c-format
 msgid "Failed to initialize the MD5 context: %d."
 msgstr "MD5 உரையை துவக்க முடியவில்லை: %d."
 
-#: ../libnm-util/crypto_nss.c:179
+#: ../libnm-util/crypto_nss.c:175
 #, c-format
 msgid "Invalid IV length (must be at least %d)."
 msgstr "தவறான IV நீளம் (%dயாவது இருக்க வேண்டும்)."
 
-#: ../libnm-util/crypto_nss.c:196
+#: ../libnm-util/crypto_nss.c:192
 #, c-format
 msgid "Failed to initialize the decryption cipher slot."
 msgstr "மறைகுறிமுறையை நீக்க cipher வரிசையை துவக்க முடியவில்லை."
 
-#: ../libnm-util/crypto_nss.c:206
+#: ../libnm-util/crypto_nss.c:202
 #, c-format
 msgid "Failed to set symmetric key for decryption."
 msgstr "மறைகுறிமுறைநீக்கத்திற்கான ஒத்த விசையை அமைக்க முடியவில்லை."
 
-#: ../libnm-util/crypto_nss.c:216
+#: ../libnm-util/crypto_nss.c:212
 #, c-format
 msgid "Failed to set IV for decryption."
 msgstr "IV கான மறைகுறிமுறையை அமைக்க முடியவில்லை."
 
-#: ../libnm-util/crypto_nss.c:224
+#: ../libnm-util/crypto_nss.c:220
 #, c-format
 msgid "Failed to initialize the decryption context."
 msgstr "மறைகுறிமுறைநீக்கத்தை சேர்த்து துவக்க முடியவில்லை."
 
-#: ../libnm-util/crypto_nss.c:237
+#: ../libnm-util/crypto_nss.c:233
 #, c-format
 msgid "Failed to decrypt the private key: %d."
 msgstr "தனிப்பட்ட விசையின் மறைகுறிமுறையை நீக்க முடியவில்லை: %d."
 
-#: ../libnm-util/crypto_nss.c:245
+#: ../libnm-util/crypto_nss.c:241
 #, c-format
 msgid "Failed to decrypt the private key: decrypted data too large."
 msgstr ""
 "தனிப்பட்ட விசையின் மறைகுறிமுறையை நீக்க முடியவில்லை: மறைகுறிமுறை நீக்கப்பட்ட தரவு மிக "
 "நீளமானது."
 
-#: ../libnm-util/crypto_nss.c:256
+#: ../libnm-util/crypto_nss.c:252
 #, c-format
 msgid "Failed to finalize decryption of the private key: %d."
 msgstr "தனிப்பட்ட விசையின் மறைகுறிமுறையை முடி முடியவில்லை: %d."
 
-#: ../libnm-util/crypto_nss.c:364
+#: ../libnm-util/crypto_nss.c:360
 #, c-format
 msgid "Failed to initialize the encryption cipher slot."
 msgstr "மறைகுறியாக்க cipher வரிசையை துவக்க முடியவில்லை."
 
-#: ../libnm-util/crypto_nss.c:372
+#: ../libnm-util/crypto_nss.c:368
 #, c-format
 msgid "Failed to set symmetric key for encryption."
 msgstr "மறைகுறியாக்கத்திற்கான ஒத்த விசையை அமைக்க முடியவில்லை."
 
-#: ../libnm-util/crypto_nss.c:380
+#: ../libnm-util/crypto_nss.c:376
 #, c-format
 msgid "Failed to set IV for encryption."
 msgstr "IV கான மறைகுறியாக்கத்தை அமைக்க முடியவில்லை."
 
-#: ../libnm-util/crypto_nss.c:388
+#: ../libnm-util/crypto_nss.c:384
 #, c-format
 msgid "Failed to initialize the encryption context."
 msgstr "மறைகுறியாக்க சேர்த்து துவக்க முடியவில்லை."
 
-#: ../libnm-util/crypto_nss.c:396
+#: ../libnm-util/crypto_nss.c:392
 #, c-format
 msgid "Failed to encrypt: %d."
 msgstr "மறைகுறியாக்க முடியவில்லை: %d."
 
-#: ../libnm-util/crypto_nss.c:404
+#: ../libnm-util/crypto_nss.c:400
 #, c-format
 msgid "Unexpected amount of data after encrypting."
 msgstr "மறைகுறியாக்கத்திற்குப் பின் எதிர்பாராத தரவின் எண்ணிக்கை."
 
-#: ../libnm-util/crypto_nss.c:447
+#: ../libnm-util/crypto_nss.c:443
 #, c-format
 msgid "Couldn't decode certificate: %d"
 msgstr "சான்றிதழை குறியாக்க முடியவில்லை: %d"
 
-#: ../libnm-util/crypto_nss.c:482
+#: ../libnm-util/crypto_nss.c:478
 #, c-format
 msgid "Couldn't convert password to UCS2: %d"
 msgstr "கடவுச்சொல்லை UCS2க்கு மாற்ற முடியவில்லை: %d"
 
-#: ../libnm-util/crypto_nss.c:510
+#: ../libnm-util/crypto_nss.c:506
 #, c-format
 msgid "Couldn't initialize PKCS#12 decoder: %d"
 msgstr "PKCS#12 குறியாக்கத்தை துவக்க முடியவில்லை: %d"
 
-#: ../libnm-util/crypto_nss.c:519
+#: ../libnm-util/crypto_nss.c:515
 #, c-format
 msgid "Couldn't decode PKCS#12 file: %d"
 msgstr "PKCS#12 கோப்பை குறியாக்க முடியவில்லை: %d"
 
-#: ../libnm-util/crypto_nss.c:528
+#: ../libnm-util/crypto_nss.c:524
 #, c-format
 msgid "Couldn't verify PKCS#12 file: %d"
 msgstr "PKCS#12 கோப்பை சரிபார்க்க முடியவில்லை: %d"
 
-#: ../libnm-util/crypto_nss.c:557
+#: ../libnm-util/crypto_nss.c:568
 msgid "Could not generate random data."
 msgstr "தற்செயலான தரவை உருவாக்க முடியவில்லை."
 
-#: ../libnm-util/nm-utils.c:1925
+#: ../libnm-util/nm-utils.c:2078
 #, c-format
 msgid "Not enough memory to make encryption key."
 msgstr "மறைகுறியாக்க விசையை செய்ய போதைய நினைவகம் இல்லை."
 
-#: ../libnm-util/nm-utils.c:2035
+#: ../libnm-util/nm-utils.c:2188
 msgid "Could not allocate memory for PEM file creation."
 msgstr "PEM கோப்பிற்கான உருவாக்கத்திற்கு போதைய நினைவ ஒதுக்கீடு இல்லை."
 
-#: ../libnm-util/nm-utils.c:2047
+#: ../libnm-util/nm-utils.c:2200
 #, c-format
 msgid "Could not allocate memory for writing IV to PEM file."
 msgstr "PEM கோப்பில் IVஐ எழுதுவதற்கு போதைய நினைவக ஒதுக்கீடு இல்லை."
 
-#: ../libnm-util/nm-utils.c:2059
+#: ../libnm-util/nm-utils.c:2212
 #, 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:2231
 #, 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 "netlink செய்தியின் செயல்முறையில் பிழை: %s"
+#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:1
+msgid "Enable or disable system networking"
+msgstr "கணினி நெட்வொர்க்கிங் வசதியை செயல்படுத்து அல்லது நீக்கு"
 
-#: ../src/nm-netlink-monitor.c:214
-msgid "error occurred while waiting for data on socket"
-msgstr "சாக்கெட்டில் தரவிற்காக காத்திருக்கும் போது பிழை ஏற்பட்டது"
+#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:2
+msgid "System policy prevents enabling or disabling system networking"
+msgstr "கணினி பிணையத்தை செயல்படுத்துவதை அல்லது நீக்குவதை கணினி பாலிசி தடுக்கிறது"
+
+#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:3
+msgid ""
+"Put NetworkManager to sleep or wake it up (should only be used by system "
+"power management)"
+msgstr ""
+"NetworkManager ஐ தூங்க வை அல்லது எழுப்பு (கணினி மின் மேலாண்மையால் மட்டுமே "
+"பயன்படுத்தப்படும்)"
+
+#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:4
+msgid "System policy prevents putting NetworkManager to sleep or waking it up"
+msgstr "NetworkManagerஐ தூங்கவைப்பது அல்லது எழுப்புவதை கணினி பாலிசி தடுக்கிறது"
+
+#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:5
+msgid "Enable or disable WiFi devices"
+msgstr "WiFi சாதனங்களை செயல்படுத்து அல்லது நீக்கு"
+
+#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:6
+msgid "System policy prevents enabling or disabling WiFi devices"
+msgstr "WiFi சாதனங்களை செயல்படுத்துவதை அல்லது நீக்குவதை கணினி பாலிசி தடுக்கிறது"
+
+#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:7
+msgid "Enable or disable mobile broadband devices"
+msgstr "மொபல் ப்ராட்பேண்ட் சாதனங்களை செயல்படுத்து அல்லது நீக்கு"
+
+#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:8
+msgid "System policy prevents enabling or disabling mobile broadband devices"
+msgstr ""
+"மொபைல் ப்ராட்பேண்ட் சாதனங்களை செயல்படுத்துவதை அல்லது நீக்குவதை கணினி பாலிசி தடுக்கிறது"
+
+#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:9
+msgid "Enable or disable WiMAX mobile broadband devices"
+msgstr "WiMAX மொபைல் ப்ராட்பேண்ட் சாதனங்களை செயல்படுத்து அல்லது முடக்கு"
+
+#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:10
+msgid "System policy prevents enabling or disabling WiMAX mobile broadband devices"
+msgstr ""
+"WiMAX மொபைல் ப்ராட்பேண்ட் சாதனங்களை செயல்படுத்துவதை அல்லது முடக்குவதை கணினி கொள்கை "
+"தடுக்கிறது"
+
+#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:11
+msgid "Allow control of network connections"
+msgstr "பிணைய இணைப்புகளின் கட்டுப்பாட்டை அனுமதி"
+
+#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:12
+msgid "System policy prevents control of network connections"
+msgstr "கணினி பிணைய இணைப்புகளின் கட்டுப்பாட்டை கணினி பாலிசி தடுக்கிறது"
+
+#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:13
+msgid "Connection sharing via a protected WiFi network"
+msgstr "ஒரு பாதுகாக்கப்ப WiFi நெட்வொர்க்கின் வழியாக இணைப்பு பகிரப்படுகிறது"
+
+#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:14
+msgid "System policy prevents sharing connections via a protected WiFi network"
+msgstr ""
+"பாதுகாக்கப்பட்ட WiFi நெட்வொர்க்கின் வழியாக இணைப்புகளை பகிருவதை கணினி பாலிசி தடுக்கிறது"
+
+#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:15
+msgid "Connection sharing via an open WiFi network"
+msgstr "ஒரு திறந்த WiFi நெட்வொர்க்கின் வழியாக இணைப்பு பகிரப்படுகிறது"
+
+#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:16
+msgid "System policy prevents sharing connections via an open WiFi network"
+msgstr "திறந்த WiFi நெட்வொர்க்கின் வழியாக இணைப்புகளை பகிருவதை கணினி பாலிசி தடுக்கிறது"
+
+#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:17
+msgid "Modify personal network connections"
+msgstr "தனிப்பட்ட பிணைய இணைப்புகளை மாற்றியமை"
+
+#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:18
+msgid "System policy prevents modification of personal network settings"
+msgstr "தனிப்பட்ட பிணைய அமைவுகளின் மாற்றத்தை கணினி பாலிசி தடுக்கிறது"
+
+#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:19
+msgid "Modify network connections for all users"
+msgstr "எல்லாப் பயனர்களுக்குமான பிணைய இணைப்புகளை மாற்றியமைக்கவும்"
+
+#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:20
+msgid "System policy prevents modification of network settings for all users"
+msgstr "எல்லாப் பயனர்களுக்குமான பிணைய இணைப்புகளின் மாற்றத்தை கணினி பாலிசி தடுக்கிறது"
 
-#: ../src/nm-netlink-monitor.c:254
+#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:21
+msgid "Modify persistent system hostname"
+msgstr "நிலையான கணினி புரவலப்பெயரை மாற்றியமை"
+
+#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:22
+msgid "System policy prevents modification of the persistent system hostname"
+msgstr "நிலையான கணினி புரவலபெயர் மாற்றியமைப்பதை கணினி பாலிசி தடுக்கிறது"
+
+#: ../src/main.c:158
 #, c-format
-msgid "unable to connect to netlink for monitoring link status: %s"
-msgstr "இணைப்பு நிலையை பார்வையிட நெட்இணைப்பை இணைக்க முடியவில்லை: %s"
+msgid "Failed to set signal mask: %d"
+msgstr "சிக்னல் மூடுதலை அமைப்பதில் தோல்வி: %d"
 
-#: ../src/nm-netlink-monitor.c:265
+#: ../src/main.c:167
 #, c-format
-msgid "unable to enable netlink handle credential passing: %s"
-msgstr "netlink ஹாண்டில் நற்சான்றை செயல்படுத்த முடியவில்லை: %s"
+msgid "Failed to create signal handling thread: %d"
+msgstr "சிக்னலைக் கையாளும் இழையை உருவாக்குவதில் தோல்வி: %d"
 
-#: ../src/nm-netlink-monitor.c:291 ../src/nm-netlink-monitor.c:353
+#: ../src/main.c:182
 #, c-format
-msgid "unable to allocate netlink handle for monitoring link status: %s"
-msgstr "இணைப்பு நிலைக்கான netlink ஹாண்டிலை ஒதுக்கிட முடியவில்லை: %s"
+msgid "Opening %s failed: %s\n"
+msgstr "%s ஐத் திறப்பதில் தோல்வி: %s\n"
 
-#: ../src/nm-netlink-monitor.c:376
+#: ../src/main.c:188
 #, c-format
-msgid "unable to allocate netlink link cache for monitoring link status: %s"
-msgstr "இணைப்பு நிலையை கண்கானிக்க netlink இணைப்பு செக்கை ஒதுக்கிட முடியவில்லை: %s"
+msgid "Writing to %s failed: %s\n"
+msgstr "%s இல் எழுதுதல் தோல்வி: %s\n"
 
-#: ../src/nm-netlink-monitor.c:502
+#: ../src/main.c:193
 #, c-format
-msgid "unable to join netlink group: %s"
-msgstr "netlink குழுவுடன் சேர முடியவில்லை: %s"
+msgid "Closing %s failed: %s\n"
+msgstr "%s ஐ மூடுதல் தோல்வி: %s\n"
 
-#: ../src/nm-netlink-monitor.c:629 ../src/nm-netlink-monitor.c:642
+#: ../src/main.c:236
 #, c-format
-msgid "error updating link cache: %s"
-msgstr "பிழை மேம்படுத்தும் இணைப்பு செக்: %s"
+msgid "NetworkManager is already running (pid %ld)\n"
+msgstr "NetworkManager ஏற்கனவே இயங்கிக்கொண்டுள்ளது (pid %ld)\n"
+
+#: ../src/main.c:363
+msgid "Print NetworkManager version and exit"
+msgstr "NetworkManager பதிப்பை அச்சிட்டு விட்டுவெளியேறு"
+
+#: ../src/main.c:364
+msgid "Don't become a daemon"
+msgstr "ஒரு டெமானாக ஆக வேண்டாம்"
+
+#: ../src/main.c:365
+msgid "Make all warnings fatal"
+msgstr "அனைத்து எச்சரிக்கை செய்திகளையும் முடிவடைய செய்யவும்"
+
+#: ../src/main.c:366
+msgid "Specify the location of a PID file"
+msgstr "ஒரு PID கோப்பின் இருப்பிடத்தைக் குறிப்பிடவும்"
+
+#: ../src/main.c:366
+msgid "filename"
+msgstr "கோப்பு பெயர்"
+
+#: ../src/main.c:367
+msgid "State file location"
+msgstr "கோப்பின் இருப்பிடத்தைக் குறிப்பிடவும்"
+
+#: ../src/main.c:367
+msgid "/path/to/state.file"
+msgstr "/path/to/state.file"
+
+#: ../src/main.c:368
+msgid "Config file location"
+msgstr "அமைவாக்கக் கோப்பின் இருப்பிடம்"
+
+#: ../src/main.c:368
+msgid "/path/to/config.file"
+msgstr "/path/to/config.file"
+
+#: ../src/main.c:369
+msgid "List of plugins separated by ','"
+msgstr "',' ஆல் பிரித்தபடி செருகுநிரல்களின் பட்டியல்"
+
+#: ../src/main.c:369
+msgid "plugin1,plugin2"
+msgstr "plugin1,plugin2"
+
+#. Translators: Do not translate the values in the square brackets
+#: ../src/main.c:371
+msgid "Log level: one of [ERR, WARN, INFO, DEBUG]"
+msgstr "பதிவு நிலை: [ERR, WARN, INFO, DEBUG] இல் ஒன்று"
+
+#. Translators: Do not translate the values in the square brackets
+#: ../src/main.c:374
+msgid ""
+"Log domains separated by ',': any combination of\n"
+"                                                [NONE,HW,RFKILL,ETHER,WIFI,"
+"BT,MB,DHCP4,DHCP6,PPP,\n"
+"                                                 WIFI_SCAN,IP4,IP6,AUTOIP4,"
+"DNS,VPN,SHARING,SUPPLICANT,\n"
+"                                                 AGENTS,SETTINGS,SUSPEND,"
+"CORE,DEVICE,OLPC,WIMAX,\n"
+"                                                 INFINIBAND,FIREWALL,ADSL]"
+msgstr ""
+"',' ஆல் பிரித்தபடி பதிவு களங்கள்: இவற்றில் ஏதேனும் ஒரு சேர்க்கை\n"
+"                                                [NONE,HW,RFKILL,ETHER,WIFI,"
+"BT,MB,DHCP4,DHCP6,PPP,\n"
+"                                                 WIFI_SCAN,IP4,IP6,AUTOIP4,"
+"DNS,VPN,SHARING,SUPPLICANT,\n"
+"                                                 AGENTS,SETTINGS,SUSPEND,"
+"CORE,DEVICE,OLPC,WIMAX,\n"
+"                                                 INFINIBAND,FIREWALL,ADSL]"
+
+#: ../src/main.c:380
+msgid "An http(s) address for checking internet connectivity"
+msgstr "இணைய இணைப்பைச் சோதிக்க ஒரு http(s) முகவரி"
+
+#: ../src/main.c:381
+msgid "The interval between connectivity checks (in seconds)"
+msgstr "இணைப்பை சோதிக்கும் இடைவெளி (வினாடி)"
+
+#: ../src/main.c:382
+msgid "The expected start of the response"
+msgstr "எதிர்பார்க்கப்படும் பதிலளிப்பின் தொடக்கம்"
+
+#: ../src/main.c:382
+msgid "Bingo!"
+msgstr "Bingo!"
+
+#: ../src/main.c:387
+#, c-format
+msgid "GModules are not supported on your platform!\n"
+msgstr "உங்கள் இயக்குதளத்தில் GModules க்கு ஆதரவில்லை!\n"
+
+#: ../src/main.c:406
+msgid ""
+"NetworkManager monitors all network connections and automatically\n"
+"chooses the best connection to use.  It also allows the user to\n"
+"specify wireless access points which wireless cards in the computer\n"
+"should associate with."
+msgstr ""
+"NetworkManager எல்லா பிணைய இணைப்புகளையும் கண்காணித்து\n"
+"பயன்படுத்த சிறந்த இணைப்பை தானாகவே தேர்ந்தெடுக்கும்.  கணினியில் உள்ள வயர்லெஸ் கார்டுகள் "
+"இணைய வேண்டிய\n"
+"வயர்லெஸ் அணுகல் புள்ளிகளை பயனரே குறிப்பிடவும் அனுமதிக்கிறது\n"
+"."
 
-#: ../src/main.c:502
+#: ../src/main.c:412
 #, c-format
 msgid "Invalid option.  Please use --help to see a list of valid options.\n"
 msgstr ""
 "தவறான விருப்பம்.  உதவியை --பயன்படுத்தி சரியான விருப்பங்களின் பட்டியலைப் பார்க்கவும்.\n"
 
-#: ../src/main.c:562
+#: ../src/main.c:422
+#, c-format
+msgid "You must be root to run NetworkManager!\n"
+msgstr "NetworkManager ஐ இயக்க நீங்கள் மூலப் பயனராக இருக்க வேண்டும்!\n"
+
+#: ../src/main.c:455
+#, c-format
+msgid "Failed to read configuration: (%d) %s\n"
+msgstr "அமைவாக்கத்தை வாசிப்பதில் பிழை: (%d) %s\n"
+
+#: ../src/main.c:466
 #, 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/main.c:473
+#, c-format
+msgid "State file %s parsing failed: (%d) %s\n"
+msgstr "நிலைக் கோப்பு %s ஐப் பாகுபடுத்துவதில் தோல்வி: (%d) %s\n"
+
+#: ../src/main.c:490
+#, c-format
+msgid "Could not daemonize: %s [error %u]\n"
+msgstr "டெமானாக்க முடியவில்லை: %s [error %u]\n"
+
+#: ../src/dhcp-manager/nm-dhcp-dhclient-utils.c:138
 msgid "# Created by NetworkManager\n"
 msgstr "# Created by NetworkManager\n"
 
-#: ../src/dhcp-manager/nm-dhcp-dhclient.c:341
+#: ../src/dhcp-manager/nm-dhcp-dhclient-utils.c:145
 #, c-format
 msgid ""
 "# Merged from %s\n"
@@ -1567,82 +2592,240 @@ msgstr ""
 "# Merged from %s\n"
 "\n"
 
-#: ../src/dhcp-manager/nm-dhcp-manager.c:279
+#: ../src/dhcp-manager/nm-dhcp-manager.c:266
 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:275
 msgid "'dhclient' could be found."
 msgstr "'dhclient' காணப்படவில்லை."
 
-#: ../src/dhcp-manager/nm-dhcp-manager.c:298
+#: ../src/dhcp-manager/nm-dhcp-manager.c:285
 msgid "'dhcpcd' could be found."
 msgstr "'dhcpcd' காணப்படவில்லை."
 
-#: ../src/dhcp-manager/nm-dhcp-manager.c:306
+#: ../src/dhcp-manager/nm-dhcp-manager.c:293
 #, c-format
 msgid "unsupported DHCP client '%s'"
 msgstr "துணைபுரியாத DHCP வாடிக்கையாளர் '%s'"
 
-#: ../src/logging/nm-logging.c:146
+#: ../src/dns-manager/nm-dns-manager.c:375
+msgid "NOTE: the libc resolver may not support more than 3 nameservers."
+msgstr "குறிப்பு: இந்த libc மறுதீர்வாளர் 3 பெயர்சேவையர்களுக்கு மேல் துணைபுரியவதில்லை."
+
+#: ../src/dns-manager/nm-dns-manager.c:377
+msgid "The nameservers listed below may not be recognized."
+msgstr "கீழே பட்டியலிட்டப்படுள்ள பெயர்சேவையகங்கள் கண்டுபிடிக்கப்படவில்லை."
+
+#: ../src/logging/nm-logging.c:142
 #, c-format
 msgid "Unknown log level '%s'"
 msgstr "தெரியாத பதிவு நிலை '%s'"
 
-#: ../src/logging/nm-logging.c:171
+#: ../src/logging/nm-logging.c:181
 #, 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:280
+#: ../src/modem-manager/nm-modem-broadband.c:546 ../src/nm-device-bt.c:352
+#, 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:558
+#: ../src/modem-manager/nm-modem-broadband.c:524 ../src/nm-device-bt.c:348
+#, c-format
+msgid "GSM connection %d"
+msgstr "GSM இணைப்பு %d"
+
+#: ../src/nm-device-bond.c:200
+#, c-format
+msgid "Bond connection %d"
+msgstr "பிணைப்பு இணைப்பு %d"
+
+#: ../src/nm-device-adsl.c:193
+#, c-format
+msgid "ADSL connection %d"
+msgstr "ADSL இணைப்பு %d"
+
+#: ../src/nm-device-bridge.c:206
+#, c-format
+#| msgid "Bond connection %d"
+msgid "Bridge connection %d"
+msgstr "பிணைப்பு இணைப்பு %d"
+
+#: ../src/nm-device-bt.c:323
+#, c-format
+msgid "PAN connection %d"
+msgstr "PAN இணைப்பு %d"
+
+#: ../src/nm-device-bt.c:356
+#, c-format
+msgid "DUN connection %d"
+msgstr "DUN இணைப்பு %d"
+
+#: ../src/nm-device-ethernet.c:1326
+#, c-format
+msgid "PPPoE connection %d"
+msgstr "PPPoE இணைப்பு %d"
+
+#: ../src/nm-device-ethernet.c:1326 ../src/settings/nm-settings-utils.c:50
+#, c-format
+msgid "Wired connection %d"
+msgstr "வயர் இணைப்பு %d"
+
+#: ../src/nm-device-infiniband.c:301
+#, c-format
+msgid "InfiniBand connection %d"
+msgstr "InfiniBand இணைப்பு %d"
+
+#: ../src/nm-device-olpc-mesh.c:311
+#, c-format
+msgid "Mesh %d"
+msgstr "மெஷ் %d"
 
-#: ../src/settings/nm-default-wired-connection.c:157
+#: ../src/nm-device-vlan.c:362
 #, c-format
-msgid "Auto %s"
-msgstr "தானியக்கி %s"
+msgid "VLAN connection %d"
+msgstr "VLAN இணைப்பு %d"
 
-#: ../system-settings/plugins/ifcfg-rh/reader.c:3256
+#: ../src/nm-manager.c:742
+#, c-format
+msgid "VPN connection %d"
+msgstr "VPN இணைப்பு %d"
+
+#: ../src/nm-netlink-monitor.c:148 ../src/nm-netlink-monitor.c:272
+#: ../src/nm-netlink-monitor.c:695
+#, c-format
+msgid "error processing netlink message: %s"
+msgstr "netlink செய்தியின் செயல்முறையில் பிழை: %s"
+
+#: ../src/nm-netlink-monitor.c:251
+msgid "error occurred while waiting for data on socket"
+msgstr "சாக்கெட்டில் தரவிற்காக காத்திருக்கும் போது பிழை ஏற்பட்டது"
+
+#: ../src/nm-netlink-monitor.c:296
+#, c-format
+msgid "unable to connect to netlink for monitoring link status: %s"
+msgstr "இணைப்பு நிலையை பார்வையிட நெட்இணைப்பை இணைக்க முடியவில்லை: %s"
+
+#: ../src/nm-netlink-monitor.c:307
+#, c-format
+msgid "unable to enable netlink handle credential passing: %s"
+msgstr "netlink ஹாண்டில் நற்சான்றை செயல்படுத்த முடியவில்லை: %s"
+
+#: ../src/nm-netlink-monitor.c:330 ../src/nm-netlink-monitor.c:390
+#, c-format
+msgid "unable to allocate netlink handle for monitoring link status: %s"
+msgstr "இணைப்பு நிலைக்கான netlink ஹாண்டிலை ஒதுக்கிட முடியவில்லை: %s"
+
+#: ../src/nm-netlink-monitor.c:415
+#, c-format
+msgid "unable to allocate netlink link cache for monitoring link status: %s"
+msgstr "இணைப்பு நிலையை கண்கானிக்க netlink இணைப்பு செக்கை ஒதுக்கிட முடியவில்லை: %s"
+
+#: ../src/nm-netlink-monitor.c:542
+#, c-format
+msgid "unable to join netlink group: %s"
+msgstr "netlink குழுவுடன் சேர முடியவில்லை: %s"
+
+#: ../src/nm-netlink-monitor.c:671 ../src/nm-netlink-monitor.c:684
+#, c-format
+msgid "error updating link cache: %s"
+msgstr "பிழை மேம்படுத்தும் இணைப்பு செக்: %s"
+
+#: ../src/settings/plugins/ifcfg-rh/reader.c:110
 msgid "System"
 msgstr "கணினி"
 
-#: ../policy/org.freedesktop.network-manager-settings.system.policy.in.h:1
-msgid "Connection sharing via a protected WiFi network"
-msgstr "ஒரு பாதுகாக்கப்ப WiFi நெட்வொர்க்கின் வழியாக இணைப்பு பகிரப்படுகிறது"
+#: ../src/settings/plugins/ifcfg-rh/reader.c:3702
+msgid "Bond"
+msgstr "பிணைப்பு"
 
-#: ../policy/org.freedesktop.network-manager-settings.system.policy.in.h:2
-msgid "Connection sharing via an open WiFi network"
-msgstr "ஒரு திறந்த WiFi நெட்வொர்க்கின் வழியாக இணைப்பு பகிரப்படுகிறது"
+#: ../src/settings/plugins/ifcfg-rh/reader.c:3887
+msgid "Bridge"
+msgstr "பிரிட்ஜ்"
 
-#: ../policy/org.freedesktop.network-manager-settings.system.policy.in.h:3
-msgid "Modify persistent system hostname"
-msgstr "நிலையான கணினி புரவலப்பெயரை மாற்றியமை"
+#: ../test/nm-online.c:111
+#, c-format
+msgid "\rConnecting"
+msgstr "\rஇணைக்கிறது"
 
-#: ../policy/org.freedesktop.network-manager-settings.system.policy.in.h:4
-msgid "Modify system connections"
-msgstr "கணினி இணைப்புகளை மாற்றியமைக்கவும்"
+#: ../test/nm-online.c:142
+msgid "Time to wait for a connection, in seconds (default is 30)"
+msgstr "ஒரு இணைப்புக்காக காத்திருக்க வேண்டிய நேரம், வினாடிகளில் (முன்னிருப்பு, 30)"
 
-#: ../policy/org.freedesktop.network-manager-settings.system.policy.in.h:5
-msgid "System policy prevents modification of system settings"
-msgstr "கணினி அமைவுகளின் மாற்றத்தை கணினி பாலிசி தடுக்கிறது"
+#: ../test/nm-online.c:143
+msgid "Exit immediately if NetworkManager is not running or connecting"
+msgstr "NetworkManager இயங்காவிட்டால் அல்லது இணைக்காவிட்டால் உடனடியாக வெளியேறு"
 
-#: ../policy/org.freedesktop.network-manager-settings.system.policy.in.h:6
-msgid "System policy prevents modification of the persistent system hostname"
-msgstr "நிலையான கணினி புரவலபெயர் மாற்றியமைப்பதை கணினி பாலிசி தடுக்கிறது"
+#: ../test/nm-online.c:144
+msgid "Don't print anything"
+msgstr "எதையும் அச்சிட வேண்டாம்"
 
-#: ../policy/org.freedesktop.network-manager-settings.system.policy.in.h:7
-msgid "System policy prevents sharing connections via a protected WiFi network"
+#: ../test/nm-online.c:162
+msgid "Waits for a successful connection in NetworkManager."
+msgstr "இணைப்பு வெற்றிகரமாக கிடைக்கும் வரை NetworkManager இல் காத்திருக்கும்."
+
+#: ../test/nm-online.c:168 ../test/nm-online.c:177
+msgid "Invalid option.  Please use --help to see a list of valid options."
 msgstr ""
-"பாதுகாக்கப்பட்ட WiFi நெட்வொர்க்கின் வழியாக இணைப்புகளை பகிருவதை கணினி பாலிசி தடுக்கிறது"
+"தவறான விருப்பம்.  சரியான விருப்பங்களின் பட்டியலைப் பார்க்க --help ஐப் பயன்படுத்தவும்."
 
-#: ../policy/org.freedesktop.network-manager-settings.system.policy.in.h:8
-msgid "System policy prevents sharing connections via an open WiFi network"
-msgstr "திறந்த WiFi நெட்வொர்க்கின் வழியாக இணைப்புகளை பகிருவதை கணினி பாலிசி தடுக்கிறது"
+#~ msgid "SCOPE"
+#~ msgstr "SCOPE"
+
+#~ msgid "DBUS-SERVICE"
+#~ msgstr "DBUS-SERVICE"
+
+#~ msgid "system"
+#~ msgstr "கணினி"
+
+#~ msgid "user"
+#~ msgstr "பயனர்"
+
+#~ msgid "System connections"
+#~ msgstr "கணினி இணைப்புகள்"
+
+#~ msgid "User connections"
+#~ msgstr "பயனர் இணைப்புகள்"
+
+#~ msgid "state: %s\n"
+#~ msgstr "நிலை: %s\n"
+
+#~ msgid "Connection activated\n"
+#~ msgstr "இணைப்பு செயல்படுத்தப்பட்டது\n"
+
+#~ msgid "state: %s (%d)\n"
+#~ msgstr "நிலை: %s (%d)\n"
+
+#~ msgid "Error: Obtaining active connection for '%s' failed."
+#~ msgstr "Error: Obtaining active connection for '%s' failed."
+
+#~ msgid "Active connection state: %s\n"
+#~ msgstr "செயல்படும் இணைப்பின் நிலை: %s\n"
+
+#~ msgid "Active connection path: %s\n"
+#~ msgstr "செயல்படும் இணைப்பின் பாதை: %s\n"
+
+#~ msgid "IP4-SETTINGS"
+#~ msgstr "IP4-SETTINGS"
+
+#~ msgid "PREFIX"
+#~ msgstr "PREFIX"
+
+#~ msgid "unknown)"
+#~ msgstr "தெரியாத)"
+
+#~ msgid "Device state: %d (%s)\n"
+#~ msgstr "சாதன நிலை: %d (%s)\n"
+
+#~ msgid "not set"
+#~ msgstr "அமைக்கப்படவில்லை"
+
+#~ msgid "Auto %s"
+#~ msgstr "தானியக்கி %s"
 
 #~ msgid "Type"
 #~ msgstr "வகை"
diff --git a/po/te.po b/po/te.po
index a8d55575..b84730e5 100644
--- a/po/te.po
+++ b/po/te.po
@@ -3,20 +3,21 @@
 # Copyright (C) 2009 NetworkManager's COPYRIGHT HOLDER
 # This file is distributed under the same license as the NetworkManager package.
 #
-# Krishna Babu K , 2009, 2010.
+# Krishna Babu K , 2009, 2010, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: te\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-22 17:20+0530\n"
-"Last-Translator: Krishna Babu K \n"
+"product=NetworkManager&keywords=I18N+L10N&component=general\n"
+"POT-Creation-Date: 2012-10-22 15:26+0000\n"
+"PO-Revision-Date: 2012-11-27 16:24+0530\n"
+"Last-Translator: Krishnababu Krothapalli \n"
 "Language-Team: Telugu \n"
+"Language: te\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: KBabel 1.11.4\n"
+"X-Generator: Lokalize 1.5\n"
 "Plural-Forms: nplurals=2; plural=(n!=1);\n"
 "\n"
 "\n"
@@ -26,950 +27,1787 @@ msgstr ""
 "\n"
 "\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/common.c:32 ../cli/src/common.c:44 ../cli/src/common.c:52
+#: ../cli/src/common.c:63 ../cli/src/connections.c:128
+#: ../cli/src/connections.c:162
+msgid "GROUP"
+msgstr "GROUP"
+
+#. 0
+#: ../cli/src/common.c:33 ../cli/src/common.c:53
+msgid "ADDRESS"
+msgstr "ADDRESS"
+
+#. 1
+#: ../cli/src/common.c:34 ../cli/src/common.c:54
+msgid "ROUTE"
+msgstr "ROUTE"
+
+#. 2
+#: ../cli/src/common.c:35 ../cli/src/common.c:55
+msgid "DNS"
+msgstr "DNS"
+
+#. 3
+#: ../cli/src/common.c:36 ../cli/src/common.c:56
+msgid "DOMAIN"
+msgstr "DOMAIN"
+
+#. 4
+#: ../cli/src/common.c:37
+msgid "WINS"
+msgstr "WINS"
+
+#. 0
+#: ../cli/src/common.c:45 ../cli/src/common.c:64
+msgid "OPTION"
+msgstr "OPTION"
+
+#: ../cli/src/common.c:366
+msgid "unmanaged"
+msgstr "నిర్వహించని"
+
+#: ../cli/src/common.c:368
+msgid "unavailable"
+msgstr "అందుబాటులోలేని"
+
+#: ../cli/src/common.c:370 ../cli/src/network-manager.c:120
+msgid "disconnected"
+msgstr "అననుసంధానమైన"
+
+#: ../cli/src/common.c:372
+msgid "connecting (prepare)"
+msgstr "అనుసంధానమౌచున్నది (సిద్దపడుతోంది)"
+
+#: ../cli/src/common.c:374
+msgid "connecting (configuring)"
+msgstr "అనుసంధానమౌచున్నది (ఆకృతీకరించబడుతోంది)"
+
+#: ../cli/src/common.c:376
+msgid "connecting (need authentication)"
+msgstr "అనుసంధానమౌచున్నది (ధృవీకరణము అవసరము)"
+
+#: ../cli/src/common.c:378
+msgid "connecting (getting IP configuration)"
+msgstr "అనుసంధానమౌచున్నది (IP ఆకృతీకరణను పొందుచున్నది)"
+
+#: ../cli/src/common.c:380
+#| msgid "connecting (getting IP configuration)"
+msgid "connecting (checking IP connectivity)"
+msgstr "అనుసంధానమౌచున్నది (IP అనుసంధానతను పరిశీలిస్తోంది)"
+
+#: ../cli/src/common.c:382
+#| msgid "connecting (getting IP configuration)"
+msgid "connecting (starting secondary connections)"
+msgstr "అనుసంధానమౌచున్నది (ద్వితీయ అనుసంధానాలను ప్రారంభిస్తోంది)"
+
+#: ../cli/src/common.c:384 ../cli/src/network-manager.c:116
+msgid "connected"
+msgstr "అనుసంధానమైంది"
+
+#: ../cli/src/common.c:386 ../cli/src/connections.c:633
+#| msgid "activating"
+msgid "deactivating"
+msgstr "క్రియాహీనంచేస్తోంది"
+
+#: ../cli/src/common.c:388
+msgid "connection failed"
+msgstr "అనుసంధానము విఫలమైంది"
+
+#: ../cli/src/common.c:390 ../cli/src/connections.c:636
+#: ../cli/src/connections.c:659 ../cli/src/connections.c:1351
+#: ../cli/src/devices.c:645 ../cli/src/network-manager.c:123
+#: ../cli/src/network-manager.c:185 ../cli/src/network-manager.c:188
+#: ../cli/src/network-manager.c:197 ../cli/src/network-manager.c:257
+#: ../cli/src/network-manager.c:273 ../cli/src/network-manager.c:431
+#: ../cli/src/network-manager.c:486 ../cli/src/network-manager.c:524
+#: ../cli/src/network-manager.c:563 ../cli/src/settings.c:593
+#: ../cli/src/settings.c:621 ../cli/src/utils.c:531 ../src/main.c:457
+#: ../src/main.c:476
+msgid "unknown"
+msgstr "తెలియని"
+
+#: ../cli/src/common.c:399
+msgid "No reason given"
+msgstr "ఏ కారణం ఇవ్వలేదు"
+
+#: ../cli/src/common.c:402
+#| msgid "Unknown"
+msgid "Unknown error"
+msgstr "తెలియని దోషం"
+
+#: ../cli/src/common.c:405
+msgid "Device is now managed"
+msgstr "పరికరం యిప్పుడు నిర్వహించబడుతోంది"
+
+#: ../cli/src/common.c:408
+msgid "Device is now unmanaged"
+msgstr "పరికరం యిప్పుడు నిర్వహించబడుటలేదు"
+
+#: ../cli/src/common.c:411
+#| msgid "the VPN service returned invalid configuration"
+msgid "The device could not be readied for configuration"
+msgstr "ఆకృతీకరణ కొరకు పరికరం సిద్దంకాలేదు"
+
+#: ../cli/src/common.c:414
+msgid ""
+"IP configuration could not be reserved (no available address, timeout, etc.)"
+msgstr ""
+"ఐపి ఆకృతీకరణనను రిజర్వుచేసి కలిగివుండలేదు (చిరునామా, సమయముగింపు, మొద. "
+"అందుబాటులోలేవు)"
+
+#: ../cli/src/common.c:417
+msgid "The IP configuration is no longer valid"
+msgstr "ఐపి ఆకృతీకరణ యిక చెల్లునది కాదు"
+
+#: ../cli/src/common.c:420
+msgid "Secrets were required, but not provided"
+msgstr "రహస్యాలు అవసరమైనవి, అయితే అందించబడలేదు"
+
+#: ../cli/src/common.c:423
+msgid "802.1X supplicant disconnected"
+msgstr "802.1X సప్లికెంట్ అనుసంధానంపోయింది"
+
+#: ../cli/src/common.c:426
+msgid "802.1X supplicant configuration failed"
+msgstr "802.1X సప్లికెంట్ ఆకృతీకరణ విఫలమైంది"
+
+#: ../cli/src/common.c:429
+msgid "802.1X supplicant failed"
+msgstr "802.1X సప్లికెంట్ విఫలమైంది"
+
+#: ../cli/src/common.c:432
+msgid "802.1X supplicant took too long to authenticate"
+msgstr "ధృవీకరణకు 802.1X సప్లికెంట్ చాలా సమయం తీసుకొంది"
+
+#: ../cli/src/common.c:435
+#| msgid "the VPN service failed to start"
+msgid "PPP service failed to start"
+msgstr "ప్రారంభమవుటకు PPP సేవ విఫలమైంది"
+
+#: ../cli/src/common.c:438
+#| msgid "VPN disconnected"
+msgid "PPP service disconnected"
+msgstr "PPP సేవ తెంచబడింది"
+
+#: ../cli/src/common.c:441
+msgid "PPP failed"
+msgstr "PPP విఫలమైంది"
+
+#: ../cli/src/common.c:444
+#| msgid "the VPN service failed to start"
+msgid "DHCP client failed to start"
+msgstr "ప్రారంభమగుటకు DHCP క్లైంట్ విఫలమైంది"
+
+#: ../cli/src/common.c:447
+msgid "DHCP client error"
+msgstr "DHCP క్లైంట్ దోషం"
+
+#: ../cli/src/common.c:450
+#| msgid "VPN connection failed"
+msgid "DHCP client failed"
+msgstr "DHCP క్లైంట్ విఫలమైంది"
+
+#: ../cli/src/common.c:453
+#| msgid "the VPN service failed to start"
+msgid "Shared connection service failed to start"
+msgstr "ప్రారంభమగుటకు భాగస్వామ్య అనుసంధానం విఫలమైంది"
+
+#: ../cli/src/common.c:456
+#| msgid "connection failed"
+msgid "Shared connection service failed"
+msgstr "భాగస్వామ్య అనుసంధానం సేవ విఫలమైంది"
+
+#: ../cli/src/common.c:459
+#| msgid "the VPN service failed to start"
+msgid "AutoIP service failed to start"
+msgstr "ప్రారంభమగుటకు AutoIP సేవ విఫలమైంది"
+
+#: ../cli/src/common.c:462
+msgid "AutoIP service error"
+msgstr "AutoIP సేవ దోషం"
+
+#: ../cli/src/common.c:465
+#| msgid "the VPN service failed to start"
+msgid "AutoIP service failed"
+msgstr "AutoIP సేవ విఫలమైంది"
+
+#: ../cli/src/common.c:468
+msgid "The line is busy"
+msgstr "లైన్ రద్దీగా వుంది"
+
+#: ../cli/src/common.c:471
+msgid "No dial tone"
+msgstr "డైల్ టోన్ లేదు"
+
+#: ../cli/src/common.c:474
+msgid "No carrier could be established"
+msgstr "ఏ వాహకం ఏర్పరచలేక పోయింది"
+
+#: ../cli/src/common.c:477
+msgid "The dialing request timed out"
+msgstr "డయిలింగ్ అభ్యర్ధన కాలం మించినది"
+
+#: ../cli/src/common.c:480
+msgid "The dialing attempt failed"
+msgstr "డయిలింగ్ యత్నం విఫలమైంది"
+
+#: ../cli/src/common.c:483
+#| msgid "Error: Connection activation failed."
+msgid "Modem initialization failed"
+msgstr "మోడెమ్ సిద్దీకరణ విఫలమైంది"
+
+#: ../cli/src/common.c:486
+#| msgid "Failed to decrypt the private key."
+msgid "Failed to select the specified APN"
+msgstr "తెలిపిన APNను యెంపికచేయుటకు విఫలమైంది"
+
+#: ../cli/src/common.c:489
+msgid "Not searching for networks"
+msgstr "నెట్వర్కుల కొరకు అన్వేషించుటలేదు"
+
+#: ../cli/src/common.c:492
+msgid "Network registration denied"
+msgstr "నెట్వర్కు నమోదీకరణ తిరస్కరించబడింది"
+
+#: ../cli/src/common.c:495
+msgid "Network registration timed out"
+msgstr "నెట్వర్కు నమోదీకరణ సమయం మించినది"
+
+#: ../cli/src/common.c:498
+msgid "Failed to register with the requested network"
+msgstr "అభ్యర్ధించిన నెట్వర్కుతో నమోదగుటకు విఫలమైంది"
+
+#: ../cli/src/common.c:501
+#| msgid "VPN connection failed"
+msgid "PIN check failed"
+msgstr "పిన్ పరిశీలన విఫలమైంది"
+
+#: ../cli/src/common.c:504
+msgid "Necessary firmware for the device may be missing"
+msgstr "పరికరము కొరకు తప్పనిసరిగా కావలసిన ఫర్మువేర్ దొరకట్లేదు"
+
+#: ../cli/src/common.c:507
+#| msgid "the connection was removed"
+msgid "The device was removed"
+msgstr "పరికరం తీసివేయబడింది"
+
+#: ../cli/src/common.c:510
+#| msgid "NetworkManager status"
+msgid "NetworkManager went to sleep"
+msgstr "నెట్వర్కునిర్వాహిక స్లీప్‌లోకి వెళ్ళింది"
+
+#: ../cli/src/common.c:513
+#| msgid "no active connection or device"
+msgid "The device's active connection disappeared"
+msgstr "పరికరం యొక్క క్రియాశీల అనుసంధానం మాయమైంది"
+
+#: ../cli/src/common.c:516
+msgid "Device disconnected by user or client"
+msgstr "వాడుకరి లేదా క్లైంట్ చేత పరికరం అనుసంధానం తీసివేయబడింది"
+
+#: ../cli/src/common.c:519
+msgid "Carrier/link changed"
+msgstr "వాహకం/లంకె మార్చబడింది"
+
+#: ../cli/src/common.c:522
+#| msgid "the connection was removed"
+msgid "The device's existing connection was assumed"
+msgstr "పరికరపు వున్న అనుసంధానం పరిగణించడమైంది"
+
+#: ../cli/src/common.c:525
+msgid "The supplicant is now available"
+msgstr "సప్లికెంట్ యిప్పుడు అందుబాటులో వుంది"
+
+#: ../cli/src/common.c:528
+#| msgid "'dhcpcd' could be found."
+msgid "The modem could not be found"
+msgstr "మోడెమ్ కనుగొనబడలేదు"
+
+#: ../cli/src/common.c:531
+#| msgid "the connection attempt timed out"
+msgid "The Bluetooth connection failed or timed out"
+msgstr "బ్లూటూత్ అనుసంధానం విఫలమైంది లేదా సమయం మించెను"
+
+#: ../cli/src/common.c:534
+msgid "GSM Modem's SIM card not inserted"
+msgstr "GSM మోడెమ్ యొక్క సిమ్ కార్డ్ చొప్పించలేదు"
+
+#: ../cli/src/common.c:537
+msgid "GSM Modem's SIM PIN required"
+msgstr "GSM మోడెమ్ యొక్క సిమ్ పిన్ అవసరం"
+
+#: ../cli/src/common.c:540
+msgid "GSM Modem's SIM PUK required"
+msgstr "GSM మోడెమ్ యొక్క సిమ్ PUK అవసరం"
+
+#: ../cli/src/common.c:543
+msgid "GSM Modem's SIM wrong"
+msgstr "GSM మోడెమ్ యొక్క సిమ్ సరికానిది"
+
+#: ../cli/src/common.c:546
+msgid "InfiniBand device does not support connected mode"
+msgstr "అనుసంధానించిన రీతిని యిన్ఫీబాండ్ పరికరం తోడ్పాటునీయటులేదు"
+
+#: ../cli/src/common.c:549
+#| msgid "connection failed"
+msgid "A dependency of the connection failed"
+msgstr "అనుసంధానం యొక్క ఆధారం విఫలమైంది"
+
+#: ../cli/src/common.c:552
+msgid "A problem with the RFC 2684 Ethernet over ADSL bridge"
+msgstr "ADSL బ్రిడ్జ్ నందు RFC 2684 ఈథర్నెట్‌తో వొక సమస్య"
+
+#: ../cli/src/common.c:555
+msgid "ModemManager is unavailable"
+msgstr "ModemManager అందుబాటులో లేదు"
+
+#: ../cli/src/common.c:558
+#| msgid "'dhclient' could be found."
+msgid "The Wi-Fi network could not be found"
+msgstr "Wi-Fi నెట్వర్కు కనుగొనలేక పోయింది"
+
+#: ../cli/src/common.c:561
+msgid "A seconadary connection of the base connection failed"
+msgstr "ప్రాధమిక అనుసంధానం యొక్క ద్వితీయ అనుసంధానం విఫలమైంది"
+
+#: ../cli/src/common.c:564 ../cli/src/devices.c:294 ../cli/src/devices.c:310
+#: ../cli/src/devices.c:433 ../cli/src/devices.c:477
+msgid "Unknown"
+msgstr "తెలియని"
+
+#. 0
+#. used only for 'GENERAL' group listing
+#: ../cli/src/connections.c:59 ../cli/src/connections.c:129
+#: ../cli/src/devices.c:107 ../cli/src/devices.c:131 ../cli/src/devices.c:141
+#: ../cli/src/devices.c:151 ../cli/src/devices.c:165 ../cli/src/devices.c:179
+#: ../cli/src/devices.c:201 ../cli/src/devices.c:217 ../cli/src/devices.c:226
 msgid "NAME"
 msgstr "NAME"
 
 #. 0
-#: ../cli/src/connections.c:60 ../cli/src/connections.c:75
+#. 1
+#: ../cli/src/connections.c:60 ../cli/src/connections.c:130
 msgid "UUID"
 msgstr "UUID"
 
 #. 1
-#: ../cli/src/connections.c:61
-msgid "DEVICES"
-msgstr "DEVICES"
+#. 0
+#. 1
+#. 2
+#: ../cli/src/connections.c:61 ../cli/src/connections.c:163
+#: ../cli/src/devices.c:71 ../cli/src/devices.c:109 ../cli/src/devices.c:204
+msgid "TYPE"
+msgstr "TYPE"
 
 #. 2
-#: ../cli/src/connections.c:62 ../cli/src/connections.c:77
-msgid "SCOPE"
-msgstr "SCOPE"
+#: ../cli/src/connections.c:62
+msgid "TIMESTAMP"
+msgstr "TIMESTAMP"
 
 #. 3
 #: ../cli/src/connections.c:63
-msgid "DEFAULT"
-msgstr "DEFAULT"
+msgid "TIMESTAMP-REAL"
+msgstr "TIMESTAMP-REAL"
 
 #. 4
-#: ../cli/src/connections.c:64
-msgid "DBUS-SERVICE"
-msgstr "DBUS-SERVICE"
+#. 13
+#: ../cli/src/connections.c:64 ../cli/src/devices.c:121
+msgid "AUTOCONNECT"
+msgstr "AUTOCONNECT"
 
 #. 5
 #: ../cli/src/connections.c:65
+msgid "READONLY"
+msgstr "READONLY"
+
+#. 6
+#. 8
+#. 2
+#. 11
+#. 5
+#: ../cli/src/connections.c:66 ../cli/src/connections.c:137
+#: ../cli/src/devices.c:73 ../cli/src/devices.c:191 ../cli/src/devices.c:207
+msgid "DBUS-PATH"
+msgstr "DBUS-PATH"
+
+#. 2
+#: ../cli/src/connections.c:131
+msgid "DEVICES"
+msgstr "DEVICES"
+
+#. 3
+#. 1
+#. 8
+#. 1
+#: ../cli/src/connections.c:132 ../cli/src/devices.c:72
+#: ../cli/src/devices.c:116 ../cli/src/network-manager.c:39
+msgid "STATE"
+msgstr "STATE"
+
+#. 4
+#: ../cli/src/connections.c:133
+msgid "DEFAULT"
+msgstr "DEFAULT"
+
+#. 5
+#: ../cli/src/connections.c:134
+#| msgid "DEFAULT"
+msgid "DEFAULT6"
+msgstr "DEFAULT6"
+
+#. 6
+#: ../cli/src/connections.c:135
 msgid "SPEC-OBJECT"
 msgstr "SPEC-OBJECT"
 
-#. 6
-#: ../cli/src/connections.c:66
+#. 7
+#. 1
+#: ../cli/src/connections.c:136 ../cli/src/connections.c:150
 msgid "VPN"
 msgstr "VPN"
 
-#. 1
+#. 9
+#: ../cli/src/connections.c:138
+msgid "CON-PATH"
+msgstr "CON-PATH"
+
+#. 10
+#: ../cli/src/connections.c:139
+msgid "ZONE"
+msgstr "ZONE"
+
+#. 11
+#: ../cli/src/connections.c:140
+msgid "MASTER-PATH"
+msgstr "MASTER-PATH"
+
+#: ../cli/src/connections.c:148 ../cli/src/devices.c:82
+msgid "GENERAL"
+msgstr "GENERAL"
+
 #. 0
+#: ../cli/src/connections.c:149
+#| msgid "TKIP"
+msgid "IP"
+msgstr "IP"
+
 #. 1
-#: ../cli/src/connections.c:76 ../cli/src/devices.c:61 ../cli/src/devices.c:87
-msgid "TYPE"
-msgstr "TYPE"
+#: ../cli/src/connections.c:164
+#| msgid "NAME"
+msgid "USERNAME"
+msgstr "USERNAME"
+
+#. 2
+#: ../cli/src/connections.c:165
+msgid "GATEWAY"
+msgstr "GATEWAY"
 
 #. 3
-#: ../cli/src/connections.c:78
-msgid "TIMESTAMP"
-msgstr "TIMESTAMP"
+#: ../cli/src/connections.c:166
+msgid "BANNER"
+msgstr "BANNER"
 
 #. 4
-#: ../cli/src/connections.c:79
-msgid "TIMESTAMP-REAL"
-msgstr "TIMESTAMP-REAL"
+#: ../cli/src/connections.c:167
+#| msgid "STATE"
+msgid "VPN-STATE"
+msgstr "VPN-STATE"
 
 #. 5
-#: ../cli/src/connections.c:80
-msgid "AUTOCONNECT"
-msgstr "AUTOCONNECT"
-
-#. 6
-#: ../cli/src/connections.c:81
-msgid "READONLY"
-msgstr "READONLY"
-
-#: ../cli/src/connections.c:157
-#, c-format
+#: ../cli/src/connections.c:168
+msgid "CFG"
+msgstr "CFG"
+
+#: ../cli/src/connections.c:190
+#, c-format
+#| msgid ""
+#| "Usage: nmcli con { COMMAND | help }\n"
+#| "  COMMAND := { list | status | up | down }\n"
+#| "\n"
+#| "  list [id  | uuid  | system | user]\n"
+#| "  status\n"
+#| "  up id  | uuid  [iface ] [ap ] [--nowait] [--"
+#| "timeout ]\n"
+#| "  down id  | uuid \n"
 msgid ""
 "Usage: nmcli con { COMMAND | help }\n"
-"  COMMAND := { list | status | up | down }\n"
+"  COMMAND := { list | status | up | down | delete }\n"
 "\n"
-"  list [id  | uuid  | system | user]\n"
-"  status\n"
-"  up id  | uuid  [iface ] [ap ] [--nowait] [--timeout "
+"  list [id  | uuid ]\n"
+"  status [id  | uuid  | path ]\n"
+"  up id  | uuid  [iface ] [ap ] [nsp ] [--"
+"nowait] [--timeout ]\n"
+"  up id  | uuid  [iface ] [ap ] [--nowait] [--timeout "
 "]\n"
 "  down id  | uuid \n"
+"  delete id  | uuid \n"
 msgstr ""
 "Usage: nmcli con { COMMAND | help }\n"
-"  COMMAND := { list | status | up | down }\n"
+"  COMMAND := { list | status | up | down | delete }\n"
 "\n"
-"  list [id  | uuid  | system | user]\n"
-"  status\n"
-"  up id  | uuid  [iface ] [ap ] [--nowait] [--timeout "
+"  list [id  | uuid ]\n"
+"  status [id  | uuid  | path ]\n"
+"  up id  | uuid  [iface ] [ap ] [nsp ] [--"
+"nowait] [--timeout ]\n"
+"  up id  | uuid  [iface ] [ap ] [--nowait] [--timeout "
 "]\n"
 "  down id  | uuid \n"
+"  delete id  | uuid \n"
 
-#: ../cli/src/connections.c:197 ../cli/src/connections.c:536
+#: ../cli/src/connections.c:249 ../cli/src/connections.c:609
 #, 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:251 ../cli/src/connections.c:611
 #, c-format
 msgid "Error: 'con list': %s; allowed fields: %s"
 msgstr "దోషము: 'con list': %s; అనుమతించబడు క్షేత్రములు: %s"
 
-#: ../cli/src/connections.c:207
+#: ../cli/src/connections.c:259
 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:484
 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:485 ../cli/src/connections.c:486
+#: ../cli/src/connections.c:714 ../cli/src/connections.c:715
+#: ../cli/src/connections.c:717 ../cli/src/devices.c:441
+#: ../cli/src/devices.c:494 ../cli/src/devices.c:610 ../cli/src/devices.c:611
+#: ../cli/src/devices.c:612 ../cli/src/devices.c:644 ../cli/src/devices.c:671
+#: ../cli/src/devices.c:672 ../cli/src/devices.c:673 ../cli/src/devices.c:674
+#: ../cli/src/devices.c:675 ../cli/src/network-manager.c:267
+#: ../cli/src/settings.c:712 ../cli/src/settings.c:787
+#: ../cli/src/settings.c:907 ../cli/src/settings.c:1189
+#: ../cli/src/settings.c:1190 ../cli/src/settings.c:1192
+#: ../cli/src/settings.c:1194 ../cli/src/settings.c:1195
+#: ../cli/src/settings.c:1326 ../cli/src/settings.c:1327
+#: ../cli/src/settings.c:1328 ../cli/src/settings.c:1329
+#: ../cli/src/settings.c:1406 ../cli/src/settings.c:1407
+#: ../cli/src/settings.c:1408 ../cli/src/settings.c:1409
+#: ../cli/src/settings.c:1410 ../cli/src/settings.c:1411
+#: ../cli/src/settings.c:1412 ../cli/src/settings.c:1413
+#: ../cli/src/settings.c:1414 ../cli/src/settings.c:1415
+#: ../cli/src/settings.c:1416 ../cli/src/settings.c:1417
+#: ../cli/src/settings.c:1418 ../cli/src/settings.c:1489
 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:485 ../cli/src/connections.c:486
+#: ../cli/src/connections.c:714 ../cli/src/connections.c:715
+#: ../cli/src/connections.c:717 ../cli/src/devices.c:441
+#: ../cli/src/devices.c:494 ../cli/src/devices.c:610 ../cli/src/devices.c:611
+#: ../cli/src/devices.c:612 ../cli/src/devices.c:644 ../cli/src/devices.c:671
+#: ../cli/src/devices.c:672 ../cli/src/devices.c:673 ../cli/src/devices.c:674
+#: ../cli/src/devices.c:675 ../cli/src/network-manager.c:269
+#: ../cli/src/settings.c:712 ../cli/src/settings.c:714
+#: ../cli/src/settings.c:787 ../cli/src/settings.c:907
+#: ../cli/src/settings.c:1189 ../cli/src/settings.c:1190
+#: ../cli/src/settings.c:1192 ../cli/src/settings.c:1194
+#: ../cli/src/settings.c:1195 ../cli/src/settings.c:1326
+#: ../cli/src/settings.c:1327 ../cli/src/settings.c:1328
+#: ../cli/src/settings.c:1329 ../cli/src/settings.c:1406
+#: ../cli/src/settings.c:1407 ../cli/src/settings.c:1408
+#: ../cli/src/settings.c:1409 ../cli/src/settings.c:1410
+#: ../cli/src/settings.c:1411 ../cli/src/settings.c:1412
+#: ../cli/src/settings.c:1413 ../cli/src/settings.c:1414
+#: ../cli/src/settings.c:1415 ../cli/src/settings.c:1416
+#: ../cli/src/settings.c:1417 ../cli/src/settings.c:1418
+#: ../cli/src/settings.c:1489
 msgid "no"
 msgstr "కాదు"
 
-#: ../cli/src/connections.c:457 ../cli/src/connections.c:500
-msgid "System connections"
-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:560
+#| msgid "Connection details"
+msgid "Connection list"
+msgstr "అనుసంధానము జాబితా"
+
+#: ../cli/src/connections.c:573 ../cli/src/connections.c:1110
+#: ../cli/src/connections.c:1648 ../cli/src/connections.c:1663
+#: ../cli/src/connections.c:1672 ../cli/src/connections.c:1682
+#: ../cli/src/connections.c:1694 ../cli/src/connections.c:1802
+#: ../cli/src/connections.c:1904 ../cli/src/devices.c:1122
+#: ../cli/src/devices.c:1132 ../cli/src/devices.c:1250
+#: ../cli/src/devices.c:1258 ../cli/src/devices.c:1622
+#: ../cli/src/devices.c:1629 ../cli/src/devices.c:1643
+#: ../cli/src/devices.c:1650 ../cli/src/devices.c:1667
+#: ../cli/src/devices.c:1678 ../cli/src/devices.c:1899
+#: ../cli/src/devices.c:1906
 #, c-format
 msgid "Error: %s argument is missing."
 msgstr "దోషము: %s ఆర్గుమెంట్ తప్పిపోయినది."
 
-#: ../cli/src/connections.c:487
+#: ../cli/src/connections.c:586
 #, 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:592 ../cli/src/connections.c:1707
+#: ../cli/src/connections.c:1819 ../cli/src/connections.c:1911
+#: ../cli/src/devices.c:906 ../cli/src/devices.c:986 ../cli/src/devices.c:1146
+#: ../cli/src/devices.c:1264 ../cli/src/devices.c:1691
+#: ../cli/src/devices.c:1912
 #, c-format
 msgid "Unknown parameter: %s\n"
 msgstr "తెలియని పారామితి: %s\n"
 
-#: ../cli/src/connections.c:528
+#: ../cli/src/connections.c:601
 #, 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:616 ../cli/src/connections.c:2004
+#: ../cli/src/devices.c:2120 ../cli/src/network-manager.c:596
 #, c-format
 msgid "Error: %s."
 msgstr "దోషము: %s."
 
-#: ../cli/src/connections.c:649
-#, c-format
-msgid "Error: 'con status': %s"
-msgstr "దోషము: 'con status': %s"
-
-#: ../cli/src/connections.c:651
-#, c-format
-msgid "Error: 'con status': %s; allowed fields: %s"
-msgstr "దోషము: 'con status': %s; అనుమతించబడు క్షేత్రములు: %s"
-
-#: ../cli/src/connections.c:658
-msgid "Active connections"
-msgstr "క్రియాశీల అనుసంధానములు"
-
-#: ../cli/src/connections.c:1026
-#, c-format
-msgid "no active connection on device '%s'"
-msgstr "పరికరము '%s' పైన యెటువంటి క్రియాశీల అనుసంధానము లేదు"
-
-#: ../cli/src/connections.c:1034
-#, c-format
-msgid "no active connection or device"
-msgstr "ఎటువంటి క్రియాశీల అనుసంధానము లేదా పరికరము లేదు"
-
-#: ../cli/src/connections.c:1084
-#, c-format
-msgid "device '%s' not compatible with connection '%s'"
-msgstr "పరికరము '%s' అనుసంధానము '%s'తో సారూప్యమైనది కాదు"
-
-#: ../cli/src/connections.c:1086
-#, c-format
-msgid "no device found for connection '%s'"
-msgstr "అనుసంధానము '%s' కొరకు యే పరికరము కనుగొనబడలేదు"
-
-#: ../cli/src/connections.c:1097
+#: ../cli/src/connections.c:629
 msgid "activating"
 msgstr "క్రియాశీలపరచుచున్నది"
 
-#: ../cli/src/connections.c:1099
+#: ../cli/src/connections.c:631
 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
-msgid "unknown"
-msgstr "తెలియని"
-
-#: ../cli/src/connections.c:1111
+#: ../cli/src/connections.c:645
 msgid "VPN connecting (prepare)"
 msgstr "VPN అనుసంధానమౌచున్నది (సిద్దపరచు)"
 
-#: ../cli/src/connections.c:1113
+#: ../cli/src/connections.c:647
 msgid "VPN connecting (need authentication)"
 msgstr "VPN అనుసంధానమౌచున్నది (ధృవీకరణము అవసరము)"
 
-#: ../cli/src/connections.c:1115
+#: ../cli/src/connections.c:649
 msgid "VPN connecting"
 msgstr "VPN అనుసంధానమౌచున్నది"
 
-#: ../cli/src/connections.c:1117
+#: ../cli/src/connections.c:651
 msgid "VPN connecting (getting IP configuration)"
 msgstr "VPN అనుసంధానమౌచున్నది (IP ఆకృతీకరణను పొందుచున్నది)"
 
-#: ../cli/src/connections.c:1119
+#: ../cli/src/connections.c:653
 msgid "VPN connected"
 msgstr "VPN అనుసంధానమైంది"
 
-#: ../cli/src/connections.c:1121
+#: ../cli/src/connections.c:655
 msgid "VPN connection failed"
 msgstr "VPN అనుసంధానము విఫలమైంది"
 
-#: ../cli/src/connections.c:1123
+#: ../cli/src/connections.c:657
 msgid "VPN disconnected"
 msgstr "VPN అననుసంధానమైంది"
 
-#: ../cli/src/connections.c:1134
+#: ../cli/src/connections.c:710 ../cli/src/connections.c:720
+msgid "N/A"
+msgstr "N/A"
+
+#: ../cli/src/connections.c:914 ../cli/src/connections.c:1138
+#, c-format
+msgid "Error: 'con status': %s"
+msgstr "దోషము: 'con status': %s"
+
+#: ../cli/src/connections.c:916 ../cli/src/connections.c:1140
+#, c-format
+msgid "Error: 'con status': %s; allowed fields: %s"
+msgstr "దోషము: 'con status': %s; అనుమతించబడు క్షేత్రములు: %s"
+
+#: ../cli/src/connections.c:924
+#| msgid "Active connections"
+msgid "Active connection details"
+msgstr "క్రియాశీల అనుసంధానము వివరాలు"
+
+#: ../cli/src/connections.c:1060 ../cli/src/connections.c:1722
+#: ../cli/src/connections.c:1834 ../cli/src/connections.c:1925
+#: ../cli/src/devices.c:933 ../cli/src/devices.c:995 ../cli/src/devices.c:1161
+#: ../cli/src/devices.c:1294 ../cli/src/devices.c:1713
+#: ../cli/src/devices.c:1941 ../cli/src/network-manager.c:311
+#, c-format
+#| msgid "Error: Could not connect to NetworkManager."
+msgid "Error: Can't find out if NetworkManager is running: %s."
+msgstr "దోషము: నెట్వర్కునిర్వాహిక నడుచుచున్నదో లేదో కనుగొనలేక పోయింది: %s"
+
+#: ../cli/src/connections.c:1064 ../cli/src/connections.c:1726
+#: ../cli/src/connections.c:1838 ../cli/src/connections.c:1929
+#: ../cli/src/devices.c:937 ../cli/src/devices.c:999 ../cli/src/devices.c:1165
+#: ../cli/src/devices.c:1298 ../cli/src/devices.c:1717
+#: ../cli/src/devices.c:1945 ../cli/src/network-manager.c:315
+#, c-format
+#| msgid "NetworkManager status"
+msgid "Error: NetworkManager is not running."
+msgstr "దోషం: నెట్వర్కునిర్వాహిక నడుచుటలేదు."
+
+#: ../cli/src/connections.c:1096
+msgid "Active connections"
+msgstr "క్రియాశీల అనుసంధానములు"
+
+#: ../cli/src/connections.c:1121
+#, c-format
+#| msgid "Error: %s - no such connection."
+msgid "Error: '%s' is not an active connection."
+msgstr "దోషము: '%s' క్రియాశీల అనుసంధానం కాదు."
+
+#: ../cli/src/connections.c:1126
+#, c-format
+#| msgid "Unknown parameter: %s\n"
+msgid "Error: unknown parameter: %s"
+msgstr "దోషం: తెలియని పారామితి: %s"
+
+#: ../cli/src/connections.c:1233
+#, c-format
+msgid "no active connection on device '%s'"
+msgstr "పరికరము '%s' పైన యెటువంటి క్రియాశీల అనుసంధానము లేదు"
+
+#: ../cli/src/connections.c:1241
+msgid "no active connection or device"
+msgstr "ఎటువంటి క్రియాశీల అనుసంధానము లేదా పరికరము లేదు"
+
+#: ../cli/src/connections.c:1312
+#, c-format
+msgid "device '%s' not compatible with connection '%s'"
+msgstr "పరికరము '%s' అనుసంధానము '%s'తో సారూప్యమైనది కాదు"
+
+#: ../cli/src/connections.c:1315
+#, c-format
+msgid "no device found for connection '%s'"
+msgstr "అనుసంధానము '%s' కొరకు యే పరికరము కనుగొనబడలేదు"
+
+#: ../cli/src/connections.c:1327
 msgid "unknown reason"
 msgstr "తెలియని కారణము"
 
-#: ../cli/src/connections.c:1136
+#: ../cli/src/connections.c:1329
 msgid "none"
 msgstr "ఏదీకాదు"
 
-#: ../cli/src/connections.c:1138
+#: ../cli/src/connections.c:1331
 msgid "the user was disconnected"
 msgstr "వినియోగదారి అననుసంధానింప బడినారు"
 
-#: ../cli/src/connections.c:1140
+#: ../cli/src/connections.c:1333
 msgid "the base network connection was interrupted"
 msgstr "ఆధార నెట్వర్కు అనుసంధానము ఆటంకపరచబడింది"
 
-#: ../cli/src/connections.c:1142
+#: ../cli/src/connections.c:1335
 msgid "the VPN service stopped unexpectedly"
 msgstr "VPN సేవ అనుకోకుండా ఆపివేయబడింది"
 
-#: ../cli/src/connections.c:1144
+#: ../cli/src/connections.c:1337
 msgid "the VPN service returned invalid configuration"
 msgstr "VPN సేవ చెల్లని ఆకృతీకరణను తిప్పియిచ్చినది"
 
-#: ../cli/src/connections.c:1146
+#: ../cli/src/connections.c:1339
 msgid "the connection attempt timed out"
 msgstr "అనుసంధానపు ప్రయత్నం సమయం మించిపోయినది"
 
-#: ../cli/src/connections.c:1148
+#: ../cli/src/connections.c:1341
 msgid "the VPN service did not start in time"
 msgstr "VPN సేవ సమయం లోపల ప్రారంభించబడలేదు"
 
-#: ../cli/src/connections.c:1150
+#: ../cli/src/connections.c:1343
 msgid "the VPN service failed to start"
 msgstr "VPN సేవ ప్రారంభమగుటకు విఫలమైంది"
 
-#: ../cli/src/connections.c:1152
+#: ../cli/src/connections.c:1345
 msgid "no valid VPN secrets"
 msgstr "ఏ విలువైన VPN రహస్యాలు లేవు"
 
-#: ../cli/src/connections.c:1154
+#: ../cli/src/connections.c:1347
 msgid "invalid VPN secrets"
 msgstr "చెల్లని VPN రహస్యాలు"
 
-#: ../cli/src/connections.c:1156
+#: ../cli/src/connections.c:1349
 msgid "the connection was removed"
 msgstr "అనుసంధానము తీసివేయబడింది"
 
-#: ../cli/src/connections.c:1170
+#: ../cli/src/connections.c:1366 ../cli/src/connections.c:1571
 #, c-format
-msgid "state: %s\n"
-msgstr "స్థితి: %s\n"
+msgid "Connection successfully activated (D-Bus active path: %s)\n"
+msgstr "అనుసంధానం సఫలవంతంగా క్రియాశీలపరచబడెను (డి-బస్ క్రియాశీల పాత్: %s)\n"
 
-#: ../cli/src/connections.c:1173 ../cli/src/connections.c:1199
-#, c-format
-msgid "Connection activated\n"
-msgstr "అనుసంధానము క్రియాశీలపరచబడింది\n"
-
-#: ../cli/src/connections.c:1176
+#. Active connection failed and dissapeared, quit.
+#: ../cli/src/connections.c:1371 ../cli/src/connections.c:1472
 #, c-format
 msgid "Error: Connection activation failed."
 msgstr "దోషము: అనుసంధానము క్రియాశీలపరచుట విఫలమైంది."
 
-#: ../cli/src/connections.c:1195
+#: ../cli/src/connections.c:1396
 #, c-format
-msgid "state: %s (%d)\n"
-msgstr "స్థితి: %s (%d)\n"
+msgid "VPN connection successfully activated (D-Bus active path: %s)\n"
+msgstr ""
+"VPN అనుసంధానం సఫలవంతంగా క్రియాశీలపరచబడెను (డి-బస్ క్రియాశీల పాత్: %s)\n"
 
-#: ../cli/src/connections.c:1205
+#: ../cli/src/connections.c:1404
 #, c-format
 msgid "Error: Connection activation failed: %s."
 msgstr "దోషము: అనుసంధానము క్రియాశీలపరచుట విఫలమైంది: %s."
 
-#: ../cli/src/connections.c:1222 ../cli/src/devices.c:811
+#: ../cli/src/connections.c:1501 ../cli/src/devices.c:1055
 #, c-format
 msgid "Error: Timeout %d sec expired."
 msgstr "దోషము: కాలపరిమితి %d సె మించినది."
 
-#: ../cli/src/connections.c:1265
+#: ../cli/src/connections.c:1562
 #, 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
-#, c-format
-msgid "Active connection state: %s\n"
-msgstr "క్రియాశీల అనుసంధానము స్థితి: %s\n"
-
-#: ../cli/src/connections.c:1289
-#, 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:1656 ../cli/src/connections.c:1810
+#: ../cli/src/connections.c:1938
 #, c-format
 msgid "Error: Unknown connection: %s."
 msgstr "దోషము: తెలియని దోషము: %s."
 
-#: ../cli/src/connections.c:1378 ../cli/src/devices.c:882
+#: ../cli/src/connections.c:1702 ../cli/src/devices.c:1140
+#: ../cli/src/devices.c:1686
 #, 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:1715 ../cli/src/connections.c:1827
+#: ../cli/src/connections.c:1918
 #, c-format
 msgid "Error: id or uuid has to be specified."
 msgstr "దోషము: id లేదా uuid తెలుపవలసి వుంది."
 
-#: ../cli/src/connections.c:1411
+#: ../cli/src/connections.c:1747
 #, c-format
 msgid "Error: No suitable device found: %s."
 msgstr "దోషము: ఎటువంటి సూటయ్యే పరికరము కనబడలేదు: %s."
 
-#: ../cli/src/connections.c:1413
+#: ../cli/src/connections.c:1749
 #, c-format
 msgid "Error: No suitable device found."
 msgstr "దోషము: ఏ సూటగు పరికరము కనబడలేదు."
 
-#: ../cli/src/connections.c:1505
+#: ../cli/src/connections.c:1863
 #, c-format
 msgid "Warning: Connection not active\n"
 msgstr "దహెచ్చరిక: అనుసంధానము క్రియాశీలంగా లేదు\n"
 
-#: ../cli/src/connections.c:1561
+#: ../cli/src/connections.c:1877
+#, c-format
+#| msgid "Error: Connection activation failed: %s"
+msgid "Error: Connection deletion failed: %s"
+msgstr "దోషము: అనుసంధానము తొలగింపు విఫలమైంది: %s"
+
+#: ../cli/src/connections.c:1995
 #, c-format
 msgid "Error: 'con' command '%s' is not valid."
 msgstr "దోషము: 'con' ఆదేశము '%s' చెల్లునది కాదు."
 
-#: ../cli/src/connections.c:1597
+#: ../cli/src/connections.c:2063
 #, c-format
 msgid "Error: could not connect to D-Bus."
 msgstr "దోషము: D-Busకు అనుసంధానము కాలేకపోయినది."
 
-#: ../cli/src/connections.c:1604
+#: ../cli/src/connections.c:2071
 #, c-format
 msgid "Error: Could not get system settings."
 msgstr "దోషము: సిస్టమ్ అమరికలను పొందలేక పోయింది."
 
-#: ../cli/src/connections.c:1612
+#: ../cli/src/connections.c:2081
 #, 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:70 ../cli/src/devices.c:108 ../cli/src/devices.c:189
+#: ../cli/src/devices.c:205
 msgid "DEVICE"
 msgstr "DEVICE"
 
-#. 1
-#. 4
 #. 0
-#: ../cli/src/devices.c:62 ../cli/src/devices.c:90
-#: ../cli/src/network-manager.c:36
-msgid "STATE"
-msgstr "STATE"
-
-#: ../cli/src/devices.c:71
-msgid "GENERAL"
-msgstr "GENERAL"
-
-#. 0
-#: ../cli/src/devices.c:72
+#: ../cli/src/devices.c:83
 msgid "CAPABILITIES"
 msgstr "CAPABILITIES"
 
 #. 1
-#: ../cli/src/devices.c:73
+#: ../cli/src/devices.c:84
 msgid "WIFI-PROPERTIES"
 msgstr "WIFI-PROPERTIES"
 
 #. 2
-#: ../cli/src/devices.c:74
+#: ../cli/src/devices.c:85 ../cli/src/devices.c:431
 msgid "AP"
 msgstr "AP"
 
 #. 3
-#: ../cli/src/devices.c:75
+#: ../cli/src/devices.c:86
 msgid "WIRED-PROPERTIES"
 msgstr "WIRED-PROPERTIES"
 
 #. 4
-#: ../cli/src/devices.c:76
-msgid "IP4-SETTINGS"
-msgstr "IP4-SETTINGS"
+#: ../cli/src/devices.c:87
+#| msgid "WIFI-PROPERTIES"
+msgid "WIMAX-PROPERTIES"
+msgstr "WIMAX-PROPERTIES"
 
 #. 5
-#: ../cli/src/devices.c:77
-msgid "IP4-DNS"
-msgstr "IP4-DNS"
+#. 0
+#: ../cli/src/devices.c:88 ../cli/src/devices.c:202
+#| msgid "DNS"
+msgid "NSP"
+msgstr "NSP"
+
+#. 6
+#: ../cli/src/devices.c:89
+#| msgid "IP4-DNS"
+msgid "IP4"
+msgstr "IP4"
+
+#. 7
+#: ../cli/src/devices.c:90
+msgid "DHCP4"
+msgstr "DHCP4"
+
+#. 8
+#: ../cli/src/devices.c:91
+#| msgid "IP6-DNS"
+msgid "IP6"
+msgstr "IP6"
+
+#. 9
+#: ../cli/src/devices.c:92
+msgid "DHCP6"
+msgstr "DHCP6"
+
+#. 10
+#: ../cli/src/devices.c:93
+msgid "BOND"
+msgstr "బాండ్"
+
+#. 11
+#: ../cli/src/devices.c:94
+msgid "VLAN"
+msgstr "VLAN"
 
 #. 2
-#: ../cli/src/devices.c:88
-msgid "DRIVER"
-msgstr "DRIVER"
+#: ../cli/src/devices.c:110
+msgid "VENDOR"
+msgstr "అమ్మకందారు"
 
 #. 3
-#: ../cli/src/devices.c:89
+#: ../cli/src/devices.c:111
+msgid "PRODUCT"
+msgstr "ఉత్పత్తి"
+
+#. 4
+#: ../cli/src/devices.c:112
+msgid "DRIVER"
+msgstr "డ్రైవర్"
+
+#. 5
+#: ../cli/src/devices.c:113
+#| msgid "DRIVER"
+msgid "DRIVER-VERSION"
+msgstr "డ్రైవర్-వర్షన్"
+
+#. 6
+#: ../cli/src/devices.c:114
+msgid "FIRMWARE-VERSION"
+msgstr "FIRMWARE-VERSION"
+
+#. 7
+#: ../cli/src/devices.c:115
 msgid "HWADDR"
 msgstr "HWADDR"
 
+#. 9
+#: ../cli/src/devices.c:117
+msgid "REASON"
+msgstr "REASON"
+
+#. 10
+#: ../cli/src/devices.c:118
+msgid "UDI"
+msgstr "UDI"
+
+#. 11
+#: ../cli/src/devices.c:119
+msgid "IP-IFACE"
+msgstr "IP-IFACE"
+
+#. 12
+#: ../cli/src/devices.c:120
+msgid "NM-MANAGED"
+msgstr "NM-MANAGED"
+
+#. 14
+#: ../cli/src/devices.c:122
+msgid "FIRMWARE-MISSING"
+msgstr "ఫర్మువేర్-దొరకట్లేదు"
+
+#. 15
+#: ../cli/src/devices.c:123
+#| msgid "AUTOCONNECT"
+msgid "CONNECTION"
+msgstr "CONNECTION"
+
 #. 0
-#: ../cli/src/devices.c:99
+#: ../cli/src/devices.c:132
 msgid "CARRIER-DETECT"
 msgstr "CARRIER-DETECT"
 
 #. 1
-#: ../cli/src/devices.c:100
+#: ../cli/src/devices.c:133
 msgid "SPEED"
 msgstr "SPEED"
 
 #. 0
-#: ../cli/src/devices.c:109
+#: ../cli/src/devices.c:142
 msgid "CARRIER"
 msgstr "CARRIER"
 
 #. 0
-#: ../cli/src/devices.c:119
+#: ../cli/src/devices.c:152
 msgid "WEP"
 msgstr "WEP"
 
 #. 1
-#: ../cli/src/devices.c:120
+#: ../cli/src/devices.c:153
 msgid "WPA"
 msgstr "WPA"
 
 #. 2
-#: ../cli/src/devices.c:121
+#: ../cli/src/devices.c:154
 msgid "WPA2"
 msgstr "WPA2"
 
 #. 3
-#: ../cli/src/devices.c:122
+#: ../cli/src/devices.c:155
 msgid "TKIP"
 msgstr "TKIP"
 
 #. 4
-#: ../cli/src/devices.c:123
+#: ../cli/src/devices.c:156
 msgid "CCMP"
 msgstr "CCMP"
 
 #. 0
-#: ../cli/src/devices.c:132
-msgid "ADDRESS"
-msgstr "ADDRESS"
+#: ../cli/src/devices.c:166
+#| msgid "FREQ"
+msgid "CTR-FREQ"
+msgstr "CTR-FREQ"
 
 #. 1
-#: ../cli/src/devices.c:133
-msgid "PREFIX"
-msgstr "PREFIX"
+#: ../cli/src/devices.c:167
+msgid "RSSI"
+msgstr "RSSI"
 
 #. 2
-#: ../cli/src/devices.c:134
-msgid "GATEWAY"
-msgstr "GATEWAY"
+#: ../cli/src/devices.c:168
+msgid "CINR"
+msgstr "CINR"
 
-#. 0
-#: ../cli/src/devices.c:143
-msgid "DNS"
-msgstr "DNS"
+#. 3
+#: ../cli/src/devices.c:169
+msgid "TX-POW"
+msgstr "TX-POW"
+
+#. 4
+#: ../cli/src/devices.c:170
+msgid "BSID"
+msgstr "BSID"
 
 #. 0
-#: ../cli/src/devices.c:153
+#: ../cli/src/devices.c:180
 msgid "SSID"
 msgstr "SSID"
 
 #. 1
-#: ../cli/src/devices.c:154
+#: ../cli/src/devices.c:181
 msgid "BSSID"
 msgstr "BSSID"
 
 #. 2
-#: ../cli/src/devices.c:155
+#: ../cli/src/devices.c:182
 msgid "MODE"
 msgstr "MODE"
 
 #. 3
-#: ../cli/src/devices.c:156
+#: ../cli/src/devices.c:183
 msgid "FREQ"
 msgstr "FREQ"
 
 #. 4
-#: ../cli/src/devices.c:157
+#: ../cli/src/devices.c:184
 msgid "RATE"
 msgstr "RATE"
 
 #. 5
-#: ../cli/src/devices.c:158
+#. 1
+#: ../cli/src/devices.c:185 ../cli/src/devices.c:203
 msgid "SIGNAL"
 msgstr "SIGNAL"
 
 #. 6
-#: ../cli/src/devices.c:159
+#: ../cli/src/devices.c:186
 msgid "SECURITY"
 msgstr "SECURITY"
 
 #. 7
-#: ../cli/src/devices.c:160
+#: ../cli/src/devices.c:187
 msgid "WPA-FLAGS"
 msgstr "WPA-FLAGS"
 
 #. 8
-#: ../cli/src/devices.c:161
+#: ../cli/src/devices.c:188
 msgid "RSN-FLAGS"
 msgstr "RSN-FLAGS"
 
 #. 10
-#: ../cli/src/devices.c:163
+#. 4
+#: ../cli/src/devices.c:190 ../cli/src/devices.c:206
 msgid "ACTIVE"
 msgstr "ACTIVE"
 
-#: ../cli/src/devices.c:186
-#, c-format
+#. 0
+#: ../cli/src/devices.c:218
+msgid "SLAVES"
+msgstr "స్లేవ్స్"
+
+#. 0
+#: ../cli/src/devices.c:227
+#| msgid "UUID"
+msgid "ID"
+msgstr "ID"
+
+#: ../cli/src/devices.c:243
+#, c-format
+#| msgid ""
+#| "Usage: nmcli dev { COMMAND | help }\n"
+#| "\n"
+#| "  COMMAND := { status | list | disconnect | wifi }\n"
+#| "\n"
+#| "  status\n"
+#| "  list [iface ]\n"
+#| "  disconnect iface  [--nowait] [--timeout ]\n"
+#| "  wifi [list [iface ] [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 ]\n"
 "  disconnect iface  [--nowait] [--timeout ]\n"
-"  wifi [list [iface ] [hwaddr ]]\n"
+"  wifi [list [iface ] [bssid ]]\n"
+"  wifi connect <(B)SSID> [password ] [wep-key-type key|phrase] "
+"[iface ] [bssid ] [name ]\n"
+"               [--private] [--nowait] [--timeout ]\n"
+"  wimax [list [iface ] [nsp ]]\n"
 "\n"
 msgstr ""
 "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 ]\n"
 "  disconnect iface  [--nowait] [--timeout ]\n"
-"  wifi [list [iface ] [hwaddr ]]\n"
+"  wifi [list [iface ] [bssid ]]\n"
+"  wifi connect <(B)SSID> [password ] [wep-key-type key|phrase] "
+"[iface ] [bssid ] [name ]\n"
+"               [--private] [--nowait] [--timeout ]\n"
+"  wimax [list [iface ] [nsp ]]\n"
 "\n"
 
-#: ../cli/src/devices.c:206
-msgid "unmanaged"
-msgstr "నిర్వహించని"
-
-#: ../cli/src/devices.c:208
-msgid "unavailable"
-msgstr "అందుబాటులోలేని"
-
-#: ../cli/src/devices.c:210 ../cli/src/network-manager.c:89
-msgid "disconnected"
-msgstr "అననుసంధానమైన"
-
-#: ../cli/src/devices.c:212
-msgid "connecting (prepare)"
-msgstr "అనుసంధానమౌచున్నది (సిద్దపడుతోంది)"
-
-#: ../cli/src/devices.c:214
-msgid "connecting (configuring)"
-msgstr "అనుసంధానమౌచున్నది (ఆకృతీకరించబడుతోంది)"
-
-#: ../cli/src/devices.c:216
-msgid "connecting (need authentication)"
-msgstr "అనుసంధానమౌచున్నది (ధృవీకరణము అవసరము)"
-
-#: ../cli/src/devices.c:218
-msgid "connecting (getting IP configuration)"
-msgstr "అనుసంధానమౌచున్నది (IP ఆకృతీకరణను పొందుచున్నది)"
-
-#: ../cli/src/devices.c:220 ../cli/src/network-manager.c:87
-msgid "connected"
-msgstr "అనుసంధానమైంది"
-
-#: ../cli/src/devices.c:222
-msgid "connection failed"
-msgstr "అనుసంధానము విఫలమైంది"
-
-#: ../cli/src/devices.c:245 ../cli/src/devices.c:380
-msgid "Unknown"
-msgstr "తెలియని"
-
-#: ../cli/src/devices.c:277
+#: ../cli/src/devices.c:343
 msgid "(none)"
 msgstr "(ఏదీకాదు)"
 
-#: ../cli/src/devices.c:302
-#, c-format
-msgid "%s: error converting IP4 address 0x%X"
-msgstr "%s: IP4 చిరునామా 0x%X మార్చుటలో దోషము"
-
-#: ../cli/src/devices.c:349
+#: ../cli/src/devices.c:399
 #, c-format
 msgid "%u MHz"
 msgstr "%u MHz"
 
-#: ../cli/src/devices.c:350
+#: ../cli/src/devices.c:400
 #, c-format
 msgid "%u MB/s"
 msgstr "%u MB/s"
 
-#: ../cli/src/devices.c:359
+#: ../cli/src/devices.c:409
 msgid "Encrypted: "
 msgstr "ఎన్క్రిప్టెడ్: "
 
-#: ../cli/src/devices.c:364
+#: ../cli/src/devices.c:414
 msgid "WEP "
 msgstr "WEP "
 
-#: ../cli/src/devices.c:366
+#: ../cli/src/devices.c:416
 msgid "WPA "
 msgstr "WPA "
 
-#: ../cli/src/devices.c:368
+#: ../cli/src/devices.c:418
 msgid "WPA2 "
 msgstr "WPA2 "
 
-#: ../cli/src/devices.c:371
+#: ../cli/src/devices.c:421
 msgid "Enterprise "
 msgstr "ఎంటర్‌ప్రైజ్ "
 
-#: ../cli/src/devices.c:380
+#: ../cli/src/devices.c:430
 msgid "Ad-Hoc"
 msgstr "Ad-Hoc"
 
-#: ../cli/src/devices.c:380
+#: ../cli/src/devices.c:432
 msgid "Infrastructure"
 msgstr "అవస్థాపన(ఇన్ఫ్రాస్ట్రక్చర్)"
 
-#: ../cli/src/devices.c:442
+#: ../cli/src/devices.c:468
+msgid "Home"
+msgstr "నివాసం"
+
+#: ../cli/src/devices.c:471
+msgid "Partner"
+msgstr "భాగస్వామి"
+
+#: ../cli/src/devices.c:474
+msgid "Roaming"
+msgstr "రోమింగ్"
+
+#: ../cli/src/devices.c:546
 #, c-format
 msgid "Error: 'dev list': %s"
 msgstr "దోషము: 'dev list': %s"
 
-#: ../cli/src/devices.c:444
+#: ../cli/src/devices.c:548
 #, c-format
 msgid "Error: 'dev list': %s; allowed fields: %s"
 msgstr "దోషము: 'dev list': %s; అనుమతించబడు క్షేత్రములు: %s"
 
-#: ../cli/src/devices.c:453
+#: ../cli/src/devices.c:557
 msgid "Device details"
 msgstr "పరికరము వివరములు"
 
-#: ../cli/src/devices.c:483 ../cli/src/devices.c:827
+#: ../cli/src/devices.c:602 ../cli/src/devices.c:605 ../cli/src/devices.c:1081
+#: ../cli/src/utils.c:477
 msgid "(unknown)"
 msgstr "(తెలియని)"
 
-#: ../cli/src/devices.c:484
-msgid "unknown)"
-msgstr "తెలియని)"
+#: ../cli/src/devices.c:614
+#| msgid "connected"
+msgid "not connected"
+msgstr "అనుసంధానం కాలేదు"
 
-#: ../cli/src/devices.c:510
+#: ../cli/src/devices.c:641
 #, c-format
 msgid "%u Mb/s"
 msgstr "%u Mb/s"
 
 #. Print header
 #. "WIRED-PROPERTIES"
-#: ../cli/src/devices.c:583
+#: ../cli/src/devices.c:715
 msgid "on"
 msgstr "ఆన్"
 
-#: ../cli/src/devices.c:583
+#: ../cli/src/devices.c:715
 msgid "off"
 msgstr "ఆఫ్"
 
-#: ../cli/src/devices.c:710
+#: ../cli/src/devices.c:923
 #, c-format
 msgid "Error: 'dev status': %s"
 msgstr "దోషము: 'dev status': %s"
 
-#: ../cli/src/devices.c:712
+#: ../cli/src/devices.c:925
 #, c-format
 msgid "Error: 'dev status': %s; allowed fields: %s"
 msgstr "దోషము: 'dev status': %s; అనుమతించబడు క్షేత్రములు: %s"
 
-#: ../cli/src/devices.c:719
+#: ../cli/src/devices.c:948
 msgid "Status of devices"
 msgstr "పరికరముల యొక్క స్థితి"
 
-#: ../cli/src/devices.c:747
+#: ../cli/src/devices.c:979
 #, 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:1020 ../cli/src/devices.c:1185
+#: ../cli/src/devices.c:1326 ../cli/src/devices.c:1973
 #, c-format
 msgid "Error: Device '%s' not found."
 msgstr "దోషము: పరికరము '%s' కనబడలేదు."
 
-#: ../cli/src/devices.c:799
+#: ../cli/src/devices.c:1043
 #, c-format
 msgid "Success: Device '%s' successfully disconnected."
 msgstr "సఫలమైంది: పరికరము '%s' సఫలవంతంగా అననుసంధానించబడింది."
 
-#: ../cli/src/devices.c:824
+#: ../cli/src/devices.c:1078
 #, c-format
 msgid "Error: Device '%s' (%s) disconnecting failed: %s"
 msgstr "దోషము: పరికరము '%s' (%s) అననుసంధానము విఫలమైంది: %s"
 
-#: ../cli/src/devices.c:832
+#: ../cli/src/devices.c:1091
 #, c-format
-msgid "Device state: %d (%s)\n"
-msgstr "పరికరము స్థితి: %d (%s)\n"
+#| msgid "Success: Device '%s' successfully disconnected."
+msgid "Device '%s' has been disconnected.\n"
+msgstr "పరికరము '%s' అనుసంధానం తెంచబడింది.\n"
 
-#: ../cli/src/devices.c:896
+#: ../cli/src/devices.c:1154
 #, c-format
 msgid "Error: iface has to be specified."
 msgstr "దోషము: iface తెలుపవలసి వుంది."
 
-#: ../cli/src/devices.c:1011
+#: ../cli/src/devices.c:1284
 #, c-format
 msgid "Error: 'dev wifi': %s"
 msgstr "దోషము: 'dev wifi': %s"
 
-#: ../cli/src/devices.c:1013
+#: ../cli/src/devices.c:1286
 #, c-format
 msgid "Error: 'dev wifi': %s; allowed fields: %s"
 msgstr "దోషము: 'dev wifi': %s; అనుమతించబడు క్షేత్రములు: %s"
 
-#: ../cli/src/devices.c:1020
+#: ../cli/src/devices.c:1309
 msgid "WiFi scan list"
 msgstr "WiFi స్కాన్ జాబితా"
 
-#: ../cli/src/devices.c:1055 ../cli/src/devices.c:1109
+#: ../cli/src/devices.c:1346 ../cli/src/devices.c:1400
 #, c-format
-msgid "Error: Access point with hwaddr '%s' not found."
-msgstr "దోషము: హార్డువేర్‌చిరునామా '%s'తో యాక్సెస్ పాయింట్ కనబడలేదు."
+#| msgid "Error: Access point with hwaddr '%s' not found."
+msgid "Error: Access point with bssid '%s' not found."
+msgstr "దోషము: bssid '%s' తో యాక్సెస్ పాయింట్ కనబడలేదు."
 
-#: ../cli/src/devices.c:1072
+#: ../cli/src/devices.c:1363
 #, c-format
 msgid "Error: Device '%s' is not a WiFi device."
 msgstr "దోషము: పరికరము '%s' అనునది WiFi పరికరము కాదు."
 
-#: ../cli/src/devices.c:1136
+#: ../cli/src/devices.c:1431 ../cli/src/devices.c:1477
+#, c-format
+msgid "Connection with UUID '%s' created and activated on device '%s'\n"
+msgstr ""
+"UUID '%s' తో అనుసంధానం సృష్టించబడింది మరియు పరికరం '%s' పై క్రియాశీలపరచబడెను\n"
+
+#: ../cli/src/devices.c:1436
+#, c-format
+#| msgid "Error: Connection activation failed: %s."
+msgid "Error: Connection activation failed: (%d) %s."
+msgstr "దోషము: అనుసంధానము క్రియాశీలపరచుట విఫలమైంది: (%d) %s."
+
+#: ../cli/src/devices.c:1461
+#, c-format
+msgid "Error: Failed to add/activate new connection: (%d) %s"
+msgstr "దోషం: కొత్త అనుసంధానం జతచేయుటకు/క్రియాశీలపరచుటకు విఫలమైంది: (%d) %s"
+
+#: ../cli/src/devices.c:1469
+#, c-format
+msgid "Error: Failed to add/activate new connection: Unknown error"
+msgstr ""
+"దోషం: కొత్త అనుసంధానం జతచేయుటకు/క్రియాశీలపరచుటకు విఫలమైంది: తెలియని దోషం"
+
+#: ../cli/src/devices.c:1613
+#, c-format
+#| msgid "Error: %s argument is missing."
+msgid "Error: SSID or BSSID are missing."
+msgstr "దోషము: SSID లేదా BSSID దొరకట్లేదు."
+
+#: ../cli/src/devices.c:1636
+#, c-format
+#| msgid "Error: timeout value '%s' is not valid."
+msgid "Error: bssid argument value '%s' is not a valid BSSID."
+msgstr "దోషము: bssid ఆర్గుమెంట్ విలువ '%s' చెల్లునటువంటి BSSID కాదు."
+
+#: ../cli/src/devices.c:1660
+#, c-format
+msgid ""
+"Error: wep-key-type argument value '%s' is invalid, use 'key' or 'phrase'."
+msgstr ""
+"దోషం: wep-key-type ఆర్గుమెంట్ విలువ '%s' చెల్లనిది, 'key' లేదా 'phrase' "
+"వుపయోగించు."
+
+#: ../cli/src/devices.c:1700
+#, c-format
+msgid "Error: BSSID to connect to (%s) differs from bssid argument (%s)."
+msgstr ""
+"దోషం: (%s) కు అనుసంధానమగుటకు BSSID అనునది bssid ఆర్గుమెంట్ (%s)తో "
+"విభేదిస్తోంది."
+
+#: ../cli/src/devices.c:1706
+#, c-format
+msgid "Error: Parameter '%s' is neither SSID nor BSSID."
+msgstr "దోషం: పారామితి '%s' అనునది SSID లేదా BSSID కాదు."
+
+#: ../cli/src/devices.c:1735
+#, c-format
+#| msgid "Error: Device '%s' is not a WiFi device."
+msgid "Error: Device '%s' is not a Wi-Fi device."
+msgstr "దోషము: పరికరము '%s' అనునది Wi-Fi పరికరము కాదు."
+
+#: ../cli/src/devices.c:1737
+#, c-format
+#| msgid "Error: No suitable device found."
+msgid "Error: No Wi-Fi device found."
+msgstr "దోషము: ఏ Wi-Fi పరికరము కనబడలేదు."
+
+#: ../cli/src/devices.c:1755
+#, c-format
+#| msgid "Error: Access point with hwaddr '%s' not found."
+msgid "Error: No network with SSID '%s' found."
+msgstr "దోషము: SSID '%s'తో ఏ నెట్వర్కు కనబడలేదు."
+
+#: ../cli/src/devices.c:1757
+#, c-format
+#| msgid "Error: Access point with hwaddr '%s' not found."
+msgid "Error: No access point with BSSID '%s' found."
+msgstr "దోషము: BSSID '%s'తో యే యాక్సెస్ పాయింట్ కనబడలేదు."
+
+#: ../cli/src/devices.c:1855
 #, c-format
 msgid "Error: 'dev wifi' command '%s' is not valid."
 msgstr "దోషము: 'dev wifi' ఆదేశము '%s' చెల్లనిది."
 
-#: ../cli/src/devices.c:1183
+#: ../cli/src/devices.c:1931
+#, c-format
+#| msgid "Error: 'dev wifi': %s"
+msgid "Error: 'dev wimax': %s"
+msgstr "దోషము: 'dev wimax': %s"
+
+#: ../cli/src/devices.c:1933
+#, 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:1956
+msgid "WiMAX NSP list"
+msgstr "WiMAX NSP జాబితా"
+
+#: ../cli/src/devices.c:1993
+#, c-format
+#| msgid "Error: Device '%s' not found."
+msgid "Error: NSP with name '%s' not found."
+msgstr "దోషము: పేరు '%s'తో NSP కనబడలేదు."
+
+#: ../cli/src/devices.c:2004
+#, 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:2035
+#, c-format
+#| msgid "Error: Access point with hwaddr '%s' not found."
+msgid "Error: Access point with nsp '%s' not found."
+msgstr "దోషం: nsp '%s'తో యాక్సెస్ పాయింట్ కనబడలేదు."
+
+#: ../cli/src/devices.c:2062
+#, 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:2112
 #, 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 "వర్షన్"
+
+#. 2
+#: ../cli/src/network-manager.c:40
+msgid "NET-ENABLED"
+msgstr "నెట్-చేతనమైంది"
+
+#. 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"
 
+#. 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 "వైమాక్స్"
+
 #: ../cli/src/network-manager.c:62
-#, c-format
+msgid "PERMISSION"
+msgstr "అనుమతి"
+
+#. 0
+#: ../cli/src/network-manager.c:63
+msgid "VALUE"
+msgstr "విలువ"
+
+#: ../cli/src/network-manager.c:77
+#, 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 | permissions | enable | sleep | wifi | wwan | "
+"wimax }\n"
+"\n"
+"  COMMAND := { status | permissions | enable | sleep | wifi | wwan }\n"
 "\n"
 "  status\n"
-"  sleep\n"
-"  wakeup\n"
+"  permissions\n"
+"  enable [true|false]\n"
+"  sleep [true|false]\n"
 "  wifi [on|off]\n"
 "  wwan [on|off]\n"
+"  wimax [on|off]\n"
 "\n"
 msgstr ""
 "Usage: nmcli nm { COMMAND | help }\n"
 "\n"
-"  COMMAND := { status | sleep | wakeup | wifi | wwan }\n"
+"  COMMAND := { status | permissions | enable | sleep | wifi | wwan | "
+"wimax }\n"
+"\n"
+"  COMMAND := { status | permissions | enable | sleep | wifi | wwan }\n"
 "\n"
 "  status\n"
-"  sleep\n"
-"  wakeup\n"
+"  permissions\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:108
 msgid "asleep"
 msgstr "స్థబ్దుగా(asleep)"
 
-#: ../cli/src/network-manager.c:85
+#: ../cli/src/network-manager.c:110
 msgid "connecting"
 msgstr "అనుసంధానమౌచున్నది"
 
-#: ../cli/src/network-manager.c:125
+#: ../cli/src/network-manager.c:112
+msgid "connected (local only)"
+msgstr "అనుసంధానమైంది(స్థానికం మాత్రమే)"
+
+#: ../cli/src/network-manager.c:114
+#| msgid "connected"
+msgid "connected (site only)"
+msgstr "అనుసంధానమైంది (సైటు మాత్రమే)"
+
+#: ../cli/src/network-manager.c:118
+#| msgid "connecting"
+msgid "disconnecting"
+msgstr "సంధానం తెంచుతోంది"
+
+#: ../cli/src/network-manager.c:158
 #, c-format
 msgid "Error: 'nm status': %s"
 msgstr "దోషము: 'nm status': %s"
 
-#: ../cli/src/network-manager.c:127
+#: ../cli/src/network-manager.c:160
 #, c-format
 msgid "Error: 'nm status': %s; allowed fields: %s"
 msgstr "దోషము: 'nm status': %s; allowed fields: %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
+#. create NMClient
+#: ../cli/src/network-manager.c:173 ../cli/src/network-manager.c:174
+#: ../cli/src/network-manager.c:175 ../cli/src/network-manager.c:176
+#: ../cli/src/network-manager.c:177 ../cli/src/network-manager.c:179
+#: ../cli/src/network-manager.c:180 ../cli/src/network-manager.c:429
+#: ../cli/src/network-manager.c:484 ../cli/src/network-manager.c:522
+#: ../cli/src/network-manager.c:561
 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:173 ../cli/src/network-manager.c:174
+#: ../cli/src/network-manager.c:175 ../cli/src/network-manager.c:176
+#: ../cli/src/network-manager.c:177 ../cli/src/network-manager.c:179
+#: ../cli/src/network-manager.c:180 ../cli/src/network-manager.c:429
+#: ../cli/src/network-manager.c:484 ../cli/src/network-manager.c:522
+#: ../cli/src/network-manager.c:561
 msgid "disabled"
 msgstr "అచేతనమైంది"
 
-#: ../cli/src/network-manager.c:148
+#: ../cli/src/network-manager.c:193
+msgid "NetworkManager status"
+msgstr "నెట్వర్కునిర్వాహిక స్థితి"
+
+#. Print header
+#: ../cli/src/network-manager.c:196
 msgid "running"
 msgstr "నడుచుచున్నది"
 
-#: ../cli/src/network-manager.c:148
+#: ../cli/src/network-manager.c:196
 msgid "not running"
 msgstr "నడుచుటలేదు"
 
-#: ../cli/src/network-manager.c:201 ../cli/src/network-manager.c:233
+#: ../cli/src/network-manager.c:271
+msgid "auth"
+msgstr "auth"
+
+#: ../cli/src/network-manager.c:301
+#, c-format
+#| msgid "Error: 'nm status': %s"
+msgid "Error: 'nm permissions': %s"
+msgstr "దోషం: 'nm permissions': %s"
+
+#: ../cli/src/network-manager.c:303
+#, c-format
+#| msgid "Error: 'nm status': %s; allowed fields: %s"
+msgid "Error: 'nm permissions': %s; allowed fields: %s"
+msgstr "దోషం: 'nm permissions': %s; అనుమతించిన క్షేత్రములు: %s"
+
+#: ../cli/src/network-manager.c:324
+#| msgid "NetworkManager status"
+msgid "NetworkManager permissions"
+msgstr "నెట్వర్కునిర్వాహిక అనుమతులు"
+
+#: ../cli/src/network-manager.c:350 ../cli/src/utils.c:457
+#, 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:361
+#, 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:367
+#, c-format
+#| msgid "Error: 'con list': %s"
+msgid "Error in sleep: %s"
+msgstr "స్లీప్ నందు దోషం: %s"
+
+#: ../cli/src/network-manager.c:416 ../cli/src/network-manager.c:471
+#: ../cli/src/network-manager.c:509 ../cli/src/network-manager.c:548
 #, 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:424
+#| msgid "WiFi enabled"
+msgid "Networking enabled"
+msgstr "నెట్వర్కింగ్ చేతనమైంది"
+
+#: ../cli/src/network-manager.c:440
+#, c-format
+#| msgid "Error: invalid 'wwan' parameter: '%s'."
+msgid "Error: invalid 'enable' parameter: '%s'; use 'true' or 'false'."
+msgstr "దోషం: చెల్లని 'చేతన' పారామితి: '%s'; 'true' లేదా 'false' వుపయోగించు."
+
+#: ../cli/src/network-manager.c:450
+#, c-format
+#| msgid "Error: Could not connect to NetworkManager."
+msgid "Error: Sleeping status is not exported by NetworkManager."
+msgstr "దోషము: నెట్వర్కునిర్వాహిక చే స్లీపింగ్ స్థితి యెగుమతికాలేదు."
+
+#: ../cli/src/network-manager.c:458
+#, c-format
+#| msgid "Error: invalid 'wifi' parameter: '%s'."
+msgid "Error: invalid 'sleep' parameter: '%s'; use 'true' or 'false'."
+msgstr "దోషం: చెల్లని 'స్లీప్' పారామితి: '%s'; 'true' లేదా 'false' వుపయోగించు."
 
-#: ../cli/src/network-manager.c:209
+#: ../cli/src/network-manager.c:479
 msgid "WiFi enabled"
 msgstr "WiFi చేతనమైంది"
 
-#: ../cli/src/network-manager.c:220
+#: ../cli/src/network-manager.c:495
 #, c-format
 msgid "Error: invalid 'wifi' parameter: '%s'."
 msgstr "దోషము: చెల్లని 'wifi' పారామితి: '%s'."
 
-#: ../cli/src/network-manager.c:241
+#: ../cli/src/network-manager.c:517
 msgid "WWAN enabled"
 msgstr "WWAN చేతనమైంది"
 
-#: ../cli/src/network-manager.c:252
+#: ../cli/src/network-manager.c:533
 #, c-format
 msgid "Error: invalid 'wwan' parameter: '%s'."
 msgstr "దోషము: చెల్లని 'wwan' పారామితి: '%s'."
 
-#: ../cli/src/network-manager.c:263
+#: ../cli/src/network-manager.c:556
+#| msgid "WiFi enabled"
+msgid "WiMAX enabled"
+msgstr "WiMAX చేతనమైంది"
+
+#: ../cli/src/network-manager.c:572
+#, c-format
+#| msgid "Error: invalid 'wifi' parameter: '%s'."
+msgid "Error: invalid 'wimax' parameter: '%s'."
+msgstr "దోషము: చెల్లని 'wimax' పారామితి: '%s'."
+
+#: ../cli/src/network-manager.c:585
 #, c-format
 msgid "Error: 'nm' command '%s' is not valid."
 msgstr "దోషము: 'nm' ఆదేశము '%s' చెల్లనిది."
 
-#: ../cli/src/nmcli.c:69
-#, c-format
+#: ../cli/src/nmcli.c:76
+#, 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] |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"
@@ -980,6 +1818,8 @@ msgid ""
 "  -f[ields] |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"
@@ -998,6 +1838,8 @@ msgstr ""
 "  -f[ields] |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"
@@ -1007,645 +1849,916 @@ msgstr ""
 "  dev         devices managed by NetworkManager\n"
 "\n"
 
-#: ../cli/src/nmcli.c:113
+#: ../cli/src/nmcli.c:121
 #, c-format
 msgid "Error: Object '%s' is unknown, try 'nmcli help'."
 msgstr "దోషము: ఆబ్జక్టు '%s' తెలియనిది, 'nmcli help' ప్రయత్నించు."
 
-#: ../cli/src/nmcli.c:143
+#: ../cli/src/nmcli.c:151
 #, c-format
 msgid "Error: Option '--terse' is specified the second time."
 msgstr "దోషము: ఐచ్చికము '--terse' రెండవ సమయాన్ని తెలిపినది."
 
-#: ../cli/src/nmcli.c:148
+#: ../cli/src/nmcli.c:156
 #, c-format
 msgid "Error: Option '--terse' is mutually exclusive with '--pretty'."
-msgstr "దోషము: ఐచ్చికము '--terse' అనునది '--pretty'తో పరస్పరం విభేదించుచున్నది."
+msgstr ""
+"దోషము: ఐచ్చికము '--terse' అనునది '--pretty'తో పరస్పరం విభేదించుచున్నది."
 
-#: ../cli/src/nmcli.c:156
+#: ../cli/src/nmcli.c:164
 #, c-format
 msgid "Error: Option '--pretty' is specified the second time."
 msgstr "దోషము: ఐచ్చికము '--pretty' రెండవసారి తెలుపబడింది."
 
-#: ../cli/src/nmcli.c:161
+#: ../cli/src/nmcli.c:169
 #, c-format
 msgid "Error: Option '--pretty' is mutually exclusive with '--terse'."
-msgstr "దోషము: ఐచ్చికము '--pretty' అనునది '--terse'తో పరస్పరం విభేదించుచున్నది."
+msgstr ""
+"దోషము: ఐచ్చికము '--pretty' అనునది '--terse'తో పరస్పరం విభేదించుచున్నది."
 
-#: ../cli/src/nmcli.c:171 ../cli/src/nmcli.c:187
+#: ../cli/src/nmcli.c:179 ../cli/src/nmcli.c:195
 #, 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:188 ../cli/src/nmcli.c:204
 #, c-format
 msgid "Error: '%s' is not valid argument for '%s' option."
 msgstr "దోషము: '%s' అనునది '%s' ఐచ్చికము కొరకు చెల్లునటువంటి ఆర్గుమెంట్ కాదు."
 
-#: ../cli/src/nmcli.c:203
+#: ../cli/src/nmcli.c:211
 #, c-format
 msgid "Error: fields for '%s' options are missing."
 msgstr "దోషము: '%s' ఐచ్చికముల కొరకు క్షేత్రములు అనునవి తప్పిపోవుచున్నవి."
 
-#: ../cli/src/nmcli.c:209
+#: ../cli/src/nmcli.c:219
 #, c-format
 msgid "nmcli tool, version %s\n"
 msgstr "nmcli సాధనము, వర్షన్ %s\n"
 
-#: ../cli/src/nmcli.c:215
+#: ../cli/src/nmcli.c:225
 #, c-format
 msgid "Error: Option '%s' is unknown, try 'nmcli -help'."
 msgstr "దోషము: ఐచ్చికము '%s' తెలియనిది, 'nmcli -help' ప్రయత్నించుము."
 
-#: ../cli/src/nmcli.c:234
+#: ../cli/src/nmcli.c:244
 #, 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 "దోషము: నెట్వర్కునిర్వాహికకు అనుసంధానము కాలేకపోయింది."
+#: ../cli/src/nmcli.c:269
+#| 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:285
 msgid "Success"
 msgstr "సఫలంమైంది"
 
-#: ../cli/src/settings.c:411
+#: ../cli/src/settings.c:527
 #, c-format
 msgid "%d (hex-ascii-key)"
 msgstr "%d (hex-ascii-key)"
 
-#: ../cli/src/settings.c:413
+#: ../cli/src/settings.c:529
 #, c-format
 msgid "%d (104/128-bit passphrase)"
 msgstr "%d (104/128-bit passphrase)"
 
-#: ../cli/src/settings.c:416
+#: ../cli/src/settings.c:532 ../cli/src/settings.c:660
 #, c-format
 msgid "%d (unknown)"
 msgstr "%d (తెలియని)"
 
-#: ../cli/src/settings.c:442
+#: ../cli/src/settings.c:558
 msgid "0 (unknown)"
 msgstr "0 (తెలియని)"
 
-#: ../cli/src/settings.c:448
+#: ../cli/src/settings.c:564
 msgid "any, "
 msgstr "ఏదైనా, "
 
-#: ../cli/src/settings.c:450
+#: ../cli/src/settings.c:566
 msgid "900 MHz, "
 msgstr "900 MHz, "
 
-#: ../cli/src/settings.c:452
+#: ../cli/src/settings.c:568
 msgid "1800 MHz, "
 msgstr "1800 MHz, "
 
-#: ../cli/src/settings.c:454
+#: ../cli/src/settings.c:570
 msgid "1900 MHz, "
 msgstr "1900 MHz, "
 
-#: ../cli/src/settings.c:456
+#: ../cli/src/settings.c:572
 msgid "850 MHz, "
 msgstr "850 MHz, "
 
-#: ../cli/src/settings.c:458
+#: ../cli/src/settings.c:574
 msgid "WCDMA 3GPP UMTS 2100 MHz, "
 msgstr "WCDMA 3GPP UMTS 2100 MHz, "
 
-#: ../cli/src/settings.c:460
+#: ../cli/src/settings.c:576
 msgid "WCDMA 3GPP UMTS 1800 MHz, "
 msgstr "WCDMA 3GPP UMTS 1800 MHz, "
 
-#: ../cli/src/settings.c:462
+#: ../cli/src/settings.c:578
 msgid "WCDMA 3GPP UMTS 1700/2100 MHz, "
 msgstr "WCDMA 3GPP UMTS 1700/2100 MHz, "
 
-#: ../cli/src/settings.c:464
+#: ../cli/src/settings.c:580
 msgid "WCDMA 3GPP UMTS 800 MHz, "
 msgstr "WCDMA 3GPP UMTS 800 MHz, "
 
-#: ../cli/src/settings.c:466
+#: ../cli/src/settings.c:582
 msgid "WCDMA 3GPP UMTS 850 MHz, "
 msgstr "WCDMA 3GPP UMTS 850 MHz, "
 
-#: ../cli/src/settings.c:468
+#: ../cli/src/settings.c:584
 msgid "WCDMA 3GPP UMTS 900 MHz, "
 msgstr "WCDMA 3GPP UMTS 900 MHz, "
 
-#: ../cli/src/settings.c:470
+#: ../cli/src/settings.c:586
 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:588
+#| msgid "WCDMA 3GPP UMTS 900 MHz, "
+msgid "WCDMA 3GPP UMTS 1900 MHz, "
+msgstr "WCDMA 3GPP UMTS 1900 MHz, "
+
+#: ../cli/src/settings.c:590
+#| msgid "WCDMA 3GPP UMTS 2100 MHz, "
+msgid "WCDMA 3GPP UMTS 2600 MHz, "
+msgstr "WCDMA 3GPP UMTS 2600 MHz, "
+
+#: ../cli/src/settings.c:608
+msgid "0 (NONE)"
+msgstr "0 (ఏదీకాదు)"
+
+#: ../cli/src/settings.c:614
+msgid "REORDER_HEADERS, "
+msgstr "REORDER_HEADERS, "
+
+#: ../cli/src/settings.c:616
+msgid "GVRP, "
+msgstr "GVRP, "
+
+#: ../cli/src/settings.c:618
+msgid "LOOSE_BINDING, "
+msgstr "LOOSE_BINDING, "
+
+#: ../cli/src/settings.c:654
+#, c-format
+#| msgid "disabled"
+msgid "%d (disabled)"
+msgstr "%d (అచేతనమైంది)"
+
+#: ../cli/src/settings.c:656
+#, c-format
+msgid "%d (enabled, prefer public IP)"
+msgstr "%d (చైతనమైన, అభీష్ట పబ్లిక్ ఐపి)"
+
+#: ../cli/src/settings.c:658
+#, c-format
+msgid "%d (enabled, prefer temporary IP)"
+msgstr "%d (చేతనమైన, అభీష్ట తాత్కాలిక ఐపి)"
+
+#: ../cli/src/settings.c:791 ../cli/src/settings.c:987
+#: ../cli/src/settings.c:1696
 msgid "auto"
 msgstr "స్వయంచాలక"
 
-#: ../cli/src/settings.c:716 ../cli/src/settings.c:719
-#: ../cli/src/settings.c:720 ../cli/src/utils.c:172
-msgid "not set"
-msgstr "అమర్చ లేదు"
+#: ../cli/src/utils.c:103
+#, c-format
+#| msgid "%s: error converting IP4 address 0x%X"
+msgid "Error converting IP4 address '0x%X' to text form"
+msgstr "IP4 చిరునామా '0x%X'ను పాఠ రూపంలోనికి మార్చుటలో దోషం"
+
+#: ../cli/src/utils.c:131
+#, c-format
+#| msgid "%s: error converting IP4 address 0x%X"
+msgid "Error converting IP6 address '%s' to text form"
+msgstr "IP6 చిరునామా '%s' ను పాఠం రూపంలోనికి మార్చుటలో దోషం"
 
-#: ../cli/src/utils.c:124
+#: ../cli/src/utils.c:232
 #, c-format
 msgid "field '%s' has to be alone"
 msgstr "క్షేత్రము '%s' వొంటరిగా వుండాలి"
 
-#: ../cli/src/utils.c:127
+#: ../cli/src/utils.c:235
 #, c-format
 msgid "invalid field '%s'"
 msgstr "క్షేత్రము '%s' చెల్లనిది"
 
-#: ../cli/src/utils.c:146
-#, c-format
+#: ../cli/src/utils.c:254
 msgid "Option '--terse' requires specifying '--fields'"
 msgstr "ఐచ్చికము '--terse' కు '--fields' తెలుపుట అవసరము"
 
-#: ../cli/src/utils.c:150
+#: ../cli/src/utils.c:258
 #, c-format
 msgid "Option '--terse' requires specific '--fields' option values , not '%s'"
-msgstr "ఐచ్చికము '--terse' కు ప్రత్యేకించి '--fields' ఐచ్చికము విలువలు అవసరము , '%s' కాదు"
+msgstr ""
+"ఐచ్చికము '--terse' కు ప్రత్యేకించి '--fields' ఐచ్చికము విలువలు అవసరము , '%s' "
+"కాదు"
+
+#: ../cli/src/utils.c:468
+#, c-format
+msgid "Error: Couldn't create D-Bus object proxy for org.freedesktop.DBus"
+msgstr ""
+"దోషం: org.freedesktop.DBus కొరకు డి-బస్ ఆబ్జక్ట్ ప్రోక్సీ సృష్టించలేక పోయింది"
+
+#: ../cli/src/utils.c:476
+#, c-format
+msgid "Error: NameHasOwner request failed: %s"
+msgstr "దోషం: NameHasOwner అభ్యర్ధన విఫలమైంది: %s"
+
+#: ../cli/src/utils.c:521
+#, 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:530
+#, 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:120
+#: ../libnm-util/crypto.c:133
 #, c-format
 msgid "PEM key file had no end tag '%s'."
 msgstr "PEM కీ ఫైలు అంత్య టాగ్ '%s' కలిగిలేదు."
 
-#: ../libnm-util/crypto.c:130
+#: ../libnm-util/crypto.c:146
 #, c-format
 msgid "Doesn't look like a PEM private key file."
 msgstr "PEM వ్యక్తిగత కీ ఫైలువలె అనిపించుటలేదు."
 
-#: ../libnm-util/crypto.c:138
+#: ../libnm-util/crypto.c:154
 #, c-format
 msgid "Not enough memory to store PEM file data."
 msgstr "PEM ఫైలు డాటాను నిల్వవుంచుటకు సరిపోవు మెమొరి లేదు."
 
-#: ../libnm-util/crypto.c:154
+#: ../libnm-util/crypto.c:170
 #, 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:178
 #, 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:188
 #, 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:199
 #, 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:206
 #, c-format
 msgid "Malformed PEM file: invalid format of IV in DEK-Info tag."
 msgstr "తప్పుగావున్న PEM ఫైలు: DEK-Info టాగ్‌నందు చెల్లని ఫార్మాట్."
 
-#: ../libnm-util/crypto.c:203
+#: ../libnm-util/crypto.c:219
 #, c-format
 msgid "Malformed PEM file: unknown private key cipher '%s'."
 msgstr "తప్పుగావున్న PEM ఫైలు: తెలియని వ్యక్తిగత కీ సైఫర్ '%s'."
 
-#: ../libnm-util/crypto.c:222
+#: ../libnm-util/crypto.c:238
 #, 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' అంత్య టాగ్‌ '%s'ను కలిగిలేదు."
+#: ../libnm-util/crypto.c:284
+msgid "Failed to find expected PKCS#8 start tag."
+msgstr "కావలసిన PKCS#8 ప్రారంభ టాగ్ కనుగొనలేక పోయింది."
 
-#: ../libnm-util/crypto.c:277
+#: ../libnm-util/crypto.c:292
 #, c-format
-msgid "Failed to decode certificate."
-msgstr "దృవీకరణపత్రమును డీకోడ్ చేయుటకు విఫలమైంది."
+msgid "Failed to find expected PKCS#8 end tag '%s'."
+msgstr "కావలసిన PKCS#8 ముగింపు టాగ్ '%s' కనుగొనుటలో విఫలమైంది."
+
+#: ../libnm-util/crypto.c:312
+#| msgid "Not enough memory to store file data."
+msgid "Not enough memory to store private key data."
+msgstr "వ్యక్తిగత కీ దత్తాంశం నిల్వవుంచుటలో తగు మెమొరీ లేదు."
+
+#: ../libnm-util/crypto.c:317
+#| msgid "Failed to decrypt the private key."
+msgid "Failed to decode PKCS#8 private key."
+msgstr "PKCS#8 వ్యక్తిగత కీ డీకోడ్ చేయుటకు విఫలమైంది."
 
-#: ../libnm-util/crypto.c:286
+#: ../libnm-util/crypto.c:339 ../libnm-util/crypto.c:625
 #, 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
+#: ../libnm-util/crypto.c:365
 #, c-format
 msgid "IV must be an even number of bytes in length."
 msgstr "IV పొడవు తప్పక సరిసంఖ్య బైట్లలోనే వుండాలి."
 
-#: ../libnm-util/crypto.c:333
+#: ../libnm-util/crypto.c:374
 #, c-format
 msgid "Not enough memory to store the IV."
 msgstr "IV నిల్వవుంచుటకు సరిపోవునంత మెమొరి లేదు."
 
-#: ../libnm-util/crypto.c:344
+#: ../libnm-util/crypto.c:385
 #, c-format
 msgid "IV contains non-hexadecimal digits."
 msgstr "IV నాన్-హెక్సాడెసిమల్ సంఖ్యలను కలిగివుంది."
 
-#: ../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_nss.c:336
+#: ../libnm-util/crypto.c:423 ../libnm-util/crypto_gnutls.c:147
+#: ../libnm-util/crypto_gnutls.c:265 ../libnm-util/crypto_nss.c:167
+#: ../libnm-util/crypto_nss.c:332
 #, c-format
 msgid "Private key cipher '%s' was unknown."
 msgstr "వ్యక్తిగత కీ సైఫర్ '%s' అనునది తెలియనిది."
 
-#: ../libnm-util/crypto.c:391
+#: ../libnm-util/crypto.c:432
 #, c-format
 msgid "Not enough memory to decrypt private key."
 msgstr "వ్యక్తిగత కీను డిక్రిప్టు చేయుటకు సరిపోవునంత మెమొరీలేదు."
 
-#: ../libnm-util/crypto.c:511
+#: ../libnm-util/crypto.c:497
+#, c-format
+msgid "Not enough memory to store decrypted private key."
+msgstr "డీక్రిప్టు చేసిన వ్యక్తిగత కీను నిల్వవుంచుటకు సరిపోవునంత మెమొరీలేదు."
+
+#: ../libnm-util/crypto.c:542
 #, c-format
 msgid "Unable to determine private key type."
 msgstr "వ్యక్తిగత కీ రకమును నిర్ణయించలేక పోయింది."
 
-#: ../libnm-util/crypto.c:530
+#: ../libnm-util/crypto.c:597
 #, 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:606
+#, 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:630
+#, 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:92
 #, 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:155
 #, 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:164 ../libnm-util/crypto_nss.c:184
 #, c-format
 msgid "Not enough memory for decrypted key buffer."
 msgstr "డిక్రిప్టెడ్ కీ బఫర్ కొరకు సరిపోవునంత మెమొరి లేదు."
 
-#: ../libnm-util/crypto_gnutls.c:173
+#: ../libnm-util/crypto_gnutls.c:172
 #, 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:181
 #, 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:190
 #, 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:199
 #, 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:209 ../libnm-util/crypto_nss.c:263
 #, 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:220 ../libnm-util/crypto_nss.c:274
 #, 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:285 ../libnm-util/crypto_nss.c:352
 #, c-format
 msgid "Could not allocate memory for encrypting."
 msgstr "ఎన్క్రిప్టింగ్ కొరకు మెమొరీ కేటాయించలేక పోయింది."
 
-#: ../libnm-util/crypto_gnutls.c:294
+#: ../libnm-util/crypto_gnutls.c:293
 #, 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:302
 #, 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:312
 #, 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:321
 #, c-format
 msgid "Failed to encrypt the data: %s / %s."
 msgstr "డాటాను ఎన్క్రిప్టు చేయుటలో విఫలమైంది: %s / %s."
 
-#: ../libnm-util/crypto_gnutls.c:362
+#: ../libnm-util/crypto_gnutls.c:361
 #, c-format
 msgid "Error initializing certificate data: %s"
 msgstr "దృవీకరణపత్రం డాటాను సిద్దపరచుటలో దోషము: %s"
 
-#: ../libnm-util/crypto_gnutls.c:384
+#: ../libnm-util/crypto_gnutls.c:383
 #, c-format
 msgid "Couldn't decode certificate: %s"
 msgstr "దృవీకరణపత్రమును డీకోడ్ చేయలేక పోయింది: %s"
 
-#: ../libnm-util/crypto_gnutls.c:408
+#: ../libnm-util/crypto_gnutls.c:407
 #, 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:420
 #, 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:432
 #, c-format
 msgid "Couldn't verify PKCS#12 file: %s"
 msgstr "PKCS#12 ఫైలును నిర్ధారించలేక పోయింది: %s"
 
+#: ../libnm-util/crypto_gnutls.c:460
+#, c-format
+#| msgid "Couldn't initialize PKCS#12 decoder: %s"
+msgid "Couldn't initialize PKCS#8 decoder: %s"
+msgstr "PKCS#8 డీకోడర్ సిద్దపరచలేదు: %s"
+
+#: ../libnm-util/crypto_gnutls.c:483
+#, c-format
+#| msgid "Couldn't decode PKCS#12 file: %s"
+msgid "Couldn't decode PKCS#8 file: %s"
+msgstr "PKCS#8 ఫైలు డీకోడ్ చేయలేక పోయింది: %s"
+
 #: ../libnm-util/crypto_nss.c:56
 #, c-format
 msgid "Failed to initialize the crypto engine: %d."
 msgstr "క్రిప్టో యింజన్ సిద్దము చేయుటలో విఫలమైంది: %d."
 
-#: ../libnm-util/crypto_nss.c:111
+#: ../libnm-util/crypto_nss.c:107
 #, c-format
 msgid "Failed to initialize the MD5 context: %d."
 msgstr "MD5 కాంటెస్టును సిద్దము చేయుటలో విఫలమైంది: %d."
 
-#: ../libnm-util/crypto_nss.c:179
+#: ../libnm-util/crypto_nss.c:175
 #, c-format
 msgid "Invalid IV length (must be at least %d)."
 msgstr "చెల్లని IV పొడవు (తప్పక కనీసం %d వుండాలి)."
 
-#: ../libnm-util/crypto_nss.c:196
+#: ../libnm-util/crypto_nss.c:192
 #, c-format
 msgid "Failed to initialize the decryption cipher slot."
 msgstr "డిక్రిప్షన్ సైఫర్ స్లాట్‌ను సిద్దము చేయుటలో విఫలమైంది."
 
-#: ../libnm-util/crypto_nss.c:206
+#: ../libnm-util/crypto_nss.c:202
 #, c-format
 msgid "Failed to set symmetric key for decryption."
 msgstr "వివరణ కొరకు సిమెట్రిక్ కీ అమర్చుటలో విఫలమైంది."
 
-#: ../libnm-util/crypto_nss.c:216
+#: ../libnm-util/crypto_nss.c:212
 #, c-format
 msgid "Failed to set IV for decryption."
 msgstr "వివరణ కొరకు IV అమర్చుటలో విఫలమైంది."
 
-#: ../libnm-util/crypto_nss.c:224
+#: ../libnm-util/crypto_nss.c:220
 #, c-format
 msgid "Failed to initialize the decryption context."
 msgstr "వివరణ సందర్భమును సిద్దపరచుటలో విఫలమైంది."
 
-#: ../libnm-util/crypto_nss.c:237
+#: ../libnm-util/crypto_nss.c:233
 #, c-format
 msgid "Failed to decrypt the private key: %d."
 msgstr "వ్యక్తిగత కీను డిక్రిప్టు చేయుటలో విఫలమైంది: %d."
 
-#: ../libnm-util/crypto_nss.c:245
+#: ../libnm-util/crypto_nss.c:241
 #, c-format
 msgid "Failed to decrypt the private key: decrypted data too large."
-msgstr "వ్యక్తిగత కీను డిక్రిప్టు చేయుటలో విఫలమైంది: డిక్రిప్టు చేసిన డాటా మరీ పెద్దది."
+msgstr ""
+"వ్యక్తిగత కీను డిక్రిప్టు చేయుటలో విఫలమైంది: డిక్రిప్టు చేసిన డాటా మరీ "
+"పెద్దది."
 
-#: ../libnm-util/crypto_nss.c:256
+#: ../libnm-util/crypto_nss.c:252
 #, c-format
 msgid "Failed to finalize decryption of the private key: %d."
 msgstr "వ్యక్తిగత కీ యొక్క డిక్రిప్షన్ ఖరారు చేయుటలో విఫలమైంది: %d."
 
-#: ../libnm-util/crypto_nss.c:364
+#: ../libnm-util/crypto_nss.c:360
 #, c-format
 msgid "Failed to initialize the encryption cipher slot."
 msgstr "ఎన్క్రిప్షన్ సైఫర్ స్లాట్‌ను సిద్దముచేయుటలో విఫలమైంది."
 
-#: ../libnm-util/crypto_nss.c:372
+#: ../libnm-util/crypto_nss.c:368
 #, c-format
 msgid "Failed to set symmetric key for encryption."
 msgstr "ఎన్క్రిప్షన్ కొరకు సిమ్మెట్రిక్ కీను అమర్చుటలో విఫలమైంది."
 
-#: ../libnm-util/crypto_nss.c:380
+#: ../libnm-util/crypto_nss.c:376
 #, c-format
 msgid "Failed to set IV for encryption."
 msgstr "ఎన్క్రిప్షన్ కొరకు IV అమర్చుటలో విఫలమైంది."
 
-#: ../libnm-util/crypto_nss.c:388
+#: ../libnm-util/crypto_nss.c:384
 #, c-format
 msgid "Failed to initialize the encryption context."
 msgstr "ఎన్క్రిప్షన్ సందర్భమును సిద్దముచేయుటలో విఫలమైంది."
 
-#: ../libnm-util/crypto_nss.c:396
+#: ../libnm-util/crypto_nss.c:392
 #, c-format
 msgid "Failed to encrypt: %d."
 msgstr "ఎన్క్రిప్టు చేయుటకు విఫలమైంది: %d."
 
-#: ../libnm-util/crypto_nss.c:404
+#: ../libnm-util/crypto_nss.c:400
 #, c-format
 msgid "Unexpected amount of data after encrypting."
 msgstr "ఎన్క్రిప్టు చేసిన తర్వాత అనుకోని డాటా మొత్తము."
 
-#: ../libnm-util/crypto_nss.c:447
+#: ../libnm-util/crypto_nss.c:443
 #, c-format
 msgid "Couldn't decode certificate: %d"
 msgstr "దృవీకరణపత్రమును డీకోడ్ చేయలేక పోయింది: %d"
 
-#: ../libnm-util/crypto_nss.c:482
+#: ../libnm-util/crypto_nss.c:478
 #, c-format
 msgid "Couldn't convert password to UCS2: %d"
 msgstr "సంకేతపదమును UCS2కు మార్చలేక పోయింది: %d"
 
-#: ../libnm-util/crypto_nss.c:510
+#: ../libnm-util/crypto_nss.c:506
 #, c-format
 msgid "Couldn't initialize PKCS#12 decoder: %d"
 msgstr "PKCS#12 డీకోడర్‌ను సిద్దము చేయలేక పోయింది: %d"
 
-#: ../libnm-util/crypto_nss.c:519
+#: ../libnm-util/crypto_nss.c:515
 #, c-format
 msgid "Couldn't decode PKCS#12 file: %d"
 msgstr "PKCS#12 ఫైలు డీకోడ్ చేయలేక పోయింది: %d"
 
-#: ../libnm-util/crypto_nss.c:528
+#: ../libnm-util/crypto_nss.c:524
 #, c-format
 msgid "Couldn't verify PKCS#12 file: %d"
 msgstr "PKCS#12 ఫైలు నిర్దారించలేక పోయింది: %d"
 
-#: ../libnm-util/crypto_nss.c:557
+#: ../libnm-util/crypto_nss.c:568
 msgid "Could not generate random data."
 msgstr "యాదృశ్చిక డాటాను జనియింపచేయలేక పోయింది."
 
-#: ../libnm-util/nm-utils.c:1925
+#: ../libnm-util/nm-utils.c:2078
 #, c-format
 msgid "Not enough memory to make encryption key."
 msgstr "ఎన్క్రిప్షన్ కీను తయారుచేయుటకు సరిపోవు మెమొరీ లేదు."
 
-#: ../libnm-util/nm-utils.c:2035
+#: ../libnm-util/nm-utils.c:2188
 msgid "Could not allocate memory for PEM file creation."
 msgstr "మెమొరీను PEM ఫైలు సృష్టీకరణ కొరకు కేటాయించలేక పోయింది."
 
-#: ../libnm-util/nm-utils.c:2047
+#: ../libnm-util/nm-utils.c:2200
 #, 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:2212
 #, c-format
 msgid "Could not allocate memory for writing encrypted key to PEM file."
-msgstr "ఎన్క్రిప్టు చేసిన కీను PEM ఫైలునకు వ్రాయుటకు మెమొరీను కేటాయించలేక పోయింది."
+msgstr ""
+"ఎన్క్రిప్టు చేసిన కీను PEM ఫైలునకు వ్రాయుటకు మెమొరీను కేటాయించలేక పోయింది."
 
-#: ../libnm-util/nm-utils.c:2078
+#: ../libnm-util/nm-utils.c:2231
 #, 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.NetworkManager.policy.in.in.h:1
+msgid "Enable or disable system networking"
+msgstr "సిస్టమ్ నెట్వర్కింగ్‌ను చేతనము లేదా అచేతనము చేయుము"
 
-#: ../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.in.h:2
+msgid "System policy prevents enabling or disabling system networking"
+msgstr ""
+"సిస్టమ్ నెట్వర్కింగ్‌ను చేతనము చేయుటకు లేదా అచేతనము చేయుటకు సిస్టమ్ విధానము "
+"నిరోధించుచున్నది"
 
-#: ../policy/org.freedesktop.NetworkManager.policy.in.h:1
-msgid "Allow control of network connections"
-msgstr "నెట్వర్కు అనుసంధానముల యొక్క నియంత్రణ అనుమతించుము"
+#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:3
+msgid ""
+"Put NetworkManager to sleep or wake it up (should only be used by system "
+"power management)"
+msgstr ""
+"నెట్వర్కుమేనేజర్‌ను స్లీప్‌నకు లేదా దానిని మెల్కొలుపుటకు వుంచండి (సిస్టమ్ "
+"పవర్ నిర్వహణ చేత మాత్రమే "
+"వుపయోగించబడాలి)"
 
-#: ../policy/org.freedesktop.NetworkManager.policy.in.h:2
-msgid "Allow use of user-specific connections"
-msgstr "వినియోగదారి-ప్రత్యేక అనుసంధానముల వుపయోగమును అనుమతించుము"
+#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:4
+msgid "System policy prevents putting NetworkManager to sleep or waking it up"
+msgstr ""
+"నెట్వర్కుమేనేజర్‌ను స్లీప్‌నకు లేదా దానిని మెల్కొలుపుటకు వుంచుటను సిస్టమ్ "
+"విధానము నిరోధించుచున్నది"
 
-#: ../policy/org.freedesktop.NetworkManager.policy.in.h:3
+#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:5
 msgid "Enable or disable WiFi devices"
 msgstr "WiFi పరికరములను చేతనము లేదా అచేతనము చేయుము"
 
-#: ../policy/org.freedesktop.NetworkManager.policy.in.h:4
+#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:6
+msgid "System policy prevents enabling or disabling WiFi devices"
+msgstr ""
+"WiFi పరికరములను చేతనము చేయుటకు లేదా అచేతనము చేయుటకు సిస్టమ్ విధానము "
+"నిరోధించుచున్నది"
+
+#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:7
 msgid "Enable or disable mobile broadband devices"
 msgstr "మొబైల్ బ్రాడ్‌బాండ్ పరికరములను చేతనము లేదా అచేతనము చేయుము"
 
-#: ../policy/org.freedesktop.NetworkManager.policy.in.h:5
-msgid "Enable or disable system networking"
-msgstr "సిస్టమ్ నెట్వర్కింగ్‌ను చేతనము లేదా అచేతనము చేయుము"
+#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:8
+msgid "System policy prevents enabling or disabling mobile broadband devices"
+msgstr ""
+"మొబైల్ బ్రాడ్‌బాండ్ పరికరములను చేతనముచేయుటకు లేదా అచేతనముచేయుటకు సిస్టమ్ "
+"విధానము నిరోధించుచున్నది"
+
+#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:9
+#| 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
+#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:10
+#| msgid ""
+#| "System policy prevents enabling or disabling mobile broadband devices"
 msgid ""
-"Put NetworkManager to sleep or wake it up (should only be used by system "
-"power management)"
+"System policy prevents enabling or disabling WiMAX mobile broadband devices"
 msgstr ""
-"నెట్వర్కుమేనేజర్‌ను స్లీప్‌నకు లేదా దానిని మెల్కొలుపుటకు వుంచండి (సిస్టమ్ పవర్ నిర్వహణ చేత మాత్రమే "
-"వుపయోగించబడాలి)"
+"WIMAX మొబైల్ బ్రాడ్‌బాండ్ పరికరాలను చేతనం లేదా అచేతనం చేయుటను వ్యవస్థ విధానం "
+"నిరోధిస్తోంది"
+
+#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:11
+msgid "Allow control of network connections"
+msgstr "నెట్వర్కు అనుసంధానముల యొక్క నియంత్రణ అనుమతించుము"
 
-#: ../policy/org.freedesktop.NetworkManager.policy.in.h:7
+#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:12
 msgid "System policy prevents control of network connections"
 msgstr "నెట్వర్కు అనుసంధానముల నియంత్రణను సిస్టమ్ విధానము నిరోధించుచున్నది"
 
-#: ../policy/org.freedesktop.NetworkManager.policy.in.h:8
-msgid "System policy prevents enabling or disabling WiFi devices"
-msgstr "WiFi పరికరములను చేతనము చేయుటకు లేదా అచేతనము చేయుటకు సిస్టమ్ విధానము నిరోధించుచున్నది"
+#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:13
+msgid "Connection sharing via a protected WiFi network"
+msgstr "రక్షిత WiFi నెట్వర్కు ద్వారా అనుసంధానపు భాగస్వామ్యము."
 
-#: ../policy/org.freedesktop.NetworkManager.policy.in.h:9
-msgid "System policy prevents enabling or disabling mobile broadband devices"
+#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:14
+msgid "System policy prevents sharing connections via a protected WiFi network"
 msgstr ""
-"మొబైల్ బ్రాడ్‌బాండ్ పరికరములను చేతనముచేయుటకు లేదా అచేతనముచేయుటకు సిస్టమ్ విధానము నిరోధించుచున్నది"
+"రక్షిత WiFi నెట్వర్కు ద్వారా అనుసంధానములను భాగస్వామ్యపరచుట సిస్టమ్ విధానము "
+"నిరోధించుచున్నది"
 
-#: ../policy/org.freedesktop.NetworkManager.policy.in.h:10
-msgid "System policy prevents enabling or disabling system networking"
-msgstr "సిస్టమ్ నెట్వర్కింగ్‌ను చేతనము చేయుటకు లేదా అచేతనము చేయుటకు సిస్టమ్ విధానము నిరోధించుచున్నది"
+#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:15
+msgid "Connection sharing via an open WiFi network"
+msgstr "ఓపెన్ WiFi నెట్వర్కు ద్వారా అనుసంధానపు భాగస్వామ్యము"
 
-#: ../policy/org.freedesktop.NetworkManager.policy.in.h:11
-msgid "System policy prevents putting NetworkManager to sleep or waking it up"
-msgstr "నెట్వర్కుమేనేజర్‌ను స్లీప్‌నకు లేదా దానిని మెల్కొలుపుటకు వుంచుటను సిస్టమ్ విధానము నిరోధించుచున్నది"
+#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:16
+msgid "System policy prevents sharing connections via an open WiFi network"
+msgstr ""
+"ఓపెన్ WiFi నెట్వర్కు ద్వారా అనుసంధానములను భాగస్వామ్యపరచుట సిస్టమ్ విధానము "
+"నిరోధించుచున్నది"
+
+#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:17
+#| msgid "Allow control of network connections"
+msgid "Modify personal network connections"
+msgstr "వ్యక్తిగత నెట్వర్కు అనుసంధానాలను సవరించు"
+
+#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:18
+#| msgid "System policy prevents modification of system settings"
+msgid "System policy prevents modification of personal network settings"
+msgstr "వ్యక్తిగత నెట్వర్కు అమరికల యొక్క సవరింపును వ్యవస్థ విధానం నిరోధించును"
+
+#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:19
+#| msgid "Modify system connections"
+msgid "Modify network connections for all users"
+msgstr "వాడుకరులందరికి నెట్వర్కు అనుసంధానాలను సవరించు"
+
+#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:20
+#| msgid "System policy prevents modification of system settings"
+msgid "System policy prevents modification of network settings for all users"
+msgstr "వాడుకరులందరికి నెట్వర్కు అమరికల సవరింపును వ్యవస్థ విధానం నిరోధిస్తోంది"
+
+#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:21
+msgid "Modify persistent system hostname"
+msgstr "నిరంతర సిస్టమ్ హోస్టునామము మార్చుము"
 
-#: ../policy/org.freedesktop.NetworkManager.policy.in.h:12
-msgid "System policy prevents use of user-specific connections"
-msgstr "వినియోగదారి-ప్రత్యేక అనుసంధానములను వుపయోగించుటకు సిస్టమ్ విధానము నిరోధించుచున్నది"
+#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:22
+msgid "System policy prevents modification of the persistent system hostname"
+msgstr ""
+"నిరంతర సిస్టమ్ హోస్టునామమును సవరించుటను సిస్టమ్ విధానము నిరోధించుచున్నది"
 
-#: ../src/nm-netlink-monitor.c:100 ../src/nm-netlink-monitor.c:231
-#: ../src/nm-netlink-monitor.c:653
+#: ../src/main.c:159
 #, c-format
-msgid "error processing netlink message: %s"
-msgstr "నెట్‌లింక్ సందేశమును ప్రోసెసింగ్ చేయుటలో దోషము: %s"
-
-#: ../src/nm-netlink-monitor.c:214
-msgid "error occurred while waiting for data on socket"
-msgstr "సాకెట్ నందు డాటా కొరకు వేచివుండునప్పుడు దోషము సంభవించినది"
+#| msgid "Failed to encrypt: %d."
+msgid "Failed to set signal mask: %d"
+msgstr "సంకేత మాస్క్ అమర్చుటకు విఫలమైంది: %d"
 
-#: ../src/nm-netlink-monitor.c:254
+#: ../src/main.c:168
 #, c-format
-msgid "unable to connect to netlink for monitoring link status: %s"
-msgstr "లింకు స్థితిని పర్యవేక్షించుటకు నెట్‌లింకుకు అనుసంధానము కాలేకపోయింది: %s"
+msgid "Failed to create signal handling thread: %d"
+msgstr "సంకేతం సంభాలించు త్రెడ్ సృష్టించుటలో విఫలమైంది: %d"
 
-#: ../src/nm-netlink-monitor.c:265
+#: ../src/main.c:183
 #, c-format
-msgid "unable to enable netlink handle credential passing: %s"
-msgstr "నెట్‌లింక్ హాండిల్ క్రెడెన్షియల్ పాసింగ్ చేతము చేయలేదు: %s"
+msgid "Opening %s failed: %s\n"
+msgstr "%s తెరుచుటకు విఫలమైంది: %s\n"
 
-#: ../src/nm-netlink-monitor.c:291 ../src/nm-netlink-monitor.c:353
+#: ../src/main.c:189
 #, c-format
-msgid "unable to allocate netlink handle for monitoring link status: %s"
-msgstr "లింకు స్థితిని పర్యవేక్షించుటకు నెట్‌లింకు హాండిల్‌ను కేటాయించలేక పోయింది: %s"
+msgid "Writing to %s failed: %s\n"
+msgstr "%s కు వ్రాయుటకు విఫలమైంది: %s\n"
 
-#: ../src/nm-netlink-monitor.c:376
+#: ../src/main.c:194
 #, c-format
-msgid "unable to allocate netlink link cache for monitoring link status: %s"
-msgstr "లింకు స్థితిని పర్యవేక్షించుటకు నెట్‌లింకు క్యాచీని కేటాయించలేక పోయింది: %s"
+msgid "Closing %s failed: %s\n"
+msgstr "%s మూయుటకు విఫలమైంది: %s\n"
 
-#: ../src/nm-netlink-monitor.c:502
+#: ../src/main.c:236
 #, c-format
-msgid "unable to join netlink group: %s"
-msgstr "నెట్‌లింకు సమూహాన్ని చేర్చుకొనలేక పోయింది: %s"
+msgid "NetworkManager is already running (pid %ld)\n"
+msgstr "నెట్వర్కుమేనేజర్ యిప్పటికే నడుస్తోంది (pid %ld)\n"
+
+#: ../src/main.c:375
+#| msgid "NetworkManager status"
+msgid "Print NetworkManager version and exit"
+msgstr "నెట్వర్కునిర్వాహిక వర్షన్ ముద్రించి నిష్క్రమించుము"
+
+#: ../src/main.c:376
+msgid "Don't become a daemon"
+msgstr "డీమన్ కావద్దు"
+
+#: ../src/main.c:377
+msgid "Make all warnings fatal"
+msgstr "అన్ని హెచ్చరికలను హానికారకంగా గుర్తుంచు"
+
+#: ../src/main.c:378
+msgid "Specify the location of a PID file"
+msgstr "PID ఫైలు యొక్క స్థానము తెలుపుము"
+
+#: ../src/main.c:378
+msgid "filename"
+msgstr "ఫైల్‌పేరు"
+
+#: ../src/main.c:379
+msgid "State file location"
+msgstr "ఫైలు స్థానము తెలియజెప్పు"
+
+#: ../src/main.c:379
+msgid "/path/to/state.file"
+msgstr "/path/to/state.file"
+
+#: ../src/main.c:380
+msgid "Config file location"
+msgstr "ఆకృతీకరణ ఫైలు స్థానము"
+
+#: ../src/main.c:380
+msgid "/path/to/config.file"
+msgstr "/path/to/config.file"
+
+#: ../src/main.c:381
+msgid "List of plugins separated by ','"
+msgstr "',' తో వేరుచేయబడిన చొప్పింతల జాబితా"
+
+#: ../src/main.c:381
+msgid "plugin1,plugin2"
+msgstr "చొప్పింత1,చొప్పింత2"
+
+#. Translators: Do not translate the values in the square brackets
+#: ../src/main.c:383
+msgid "Log level: one of [ERR, WARN, INFO, DEBUG]"
+msgstr "లాగ్ స్థాయి: వీటిలో వొకటి [ERR, WARN, INFO, DEBUG]"
+
+#. Translators: Do not translate the values in the square brackets
+#: ../src/main.c:386
+msgid ""
+"Log domains separated by ',': any combination of\n"
+"                                                [NONE,HW,RFKILL,ETHER,WIFI,"
+"BT,MB,DHCP4,DHCP6,PPP,\n"
+"                                                 WIFI_SCAN,IP4,IP6,AUTOIP4,"
+"DNS,VPN,SHARING,SUPPLICANT,\n"
+"                                                 AGENTS,SETTINGS,SUSPEND,"
+"CORE,DEVICE,OLPC,WIMAX,\n"
+"                                                 INFINIBAND,FIREWALL,ADSL]"
+msgstr ""
+"',' వేరు చేయబడిన లాగ్ డొమైన్లు: వీటిలో వొక సంయోగం\n"
+"                                                [NONE,HW,RFKILL,ETHER,WIFI,"
+"BT,MB,DHCP4,DHCP6,PPP,\n"
+"                                                 WIFI_SCAN,IP4,IP6,AUTOIP4,"
+"DNS,VPN,SHARING,SUPPLICANT,\n"
+"                                                 AGENTS,SETTINGS,SUSPEND,"
+"CORE,DEVICE,OLPC,WIMAX,\n"
+"                                                 INFINIBAND,FIREWALL,ADSL]"
+
+#: ../src/main.c:392
+msgid "An http(s) address for checking internet connectivity"
+msgstr "ఇంటర్నెట్ అనుసంధానత పరిశీలించుటకు వొక http(s) చిరునామా"
+
+#: ../src/main.c:393
+msgid "The interval between connectivity checks (in seconds)"
+msgstr "అనుసంధానత పరిశీలన మధ్య విరామం (క్షణాలలో)"
 
-#: ../src/nm-netlink-monitor.c:629 ../src/nm-netlink-monitor.c:642
+#: ../src/main.c:394
+msgid "The expected start of the response"
+msgstr "ప్రతిస్పందన యొక్క అనుకొన్న ప్రారంభం"
+
+#: ../src/main.c:394
+msgid "Bingo!"
+msgstr "బింగో!"
+
+#: ../src/main.c:399
 #, c-format
-msgid "error updating link cache: %s"
-msgstr "లింకు క్యాచీని నవీకరించుటలో దోషము: %s"
+msgid "GModules are not supported on your platform!\n"
+msgstr "మీ ప్లాట్‌ఫాం పై GModules తోడ్పాటునీయవు!\n"
 
-#: ../src/main.c:502
+#: ../src/main.c:418
+msgid ""
+"NetworkManager monitors all network connections and automatically\n"
+"chooses the best connection to use.  It also allows the user to\n"
+"specify wireless access points which wireless cards in the computer\n"
+"should associate with."
+msgstr ""
+"నెట్వర్కుమేనేజర్ అన్ని నెట్వర్కు అనుసంధానాలను స్వయంచాలకంగా సంభాలించి\n"
+"వుత్తమ అనుసంధానాన్ని వుపయోగించుటకు యెంచును. కంప్యూటర్ నందలి\n"
+"యే వైర్‌లెస్ కార్డులు యే వైర్‌లెస్ యాక్సెస్ పాయింట్లతో కలిసివుండాలో "
+"తెలుపుటకు\n"
+"వాడుకరులను అనుమతించును."
+
+#: ../src/main.c:424
 #, c-format
 msgid "Invalid option.  Please use --help to see a list of valid options.\n"
-msgstr "చెల్లని ఐచ్చికము.  చెల్లునటువంటి ఐచ్చికముల జాబితా కొరకు --help వుపయోగించండి.\n"
+msgstr ""
+"చెల్లని ఐచ్చికము.  చెల్లునటువంటి ఐచ్చికముల జాబితా కొరకు --help వుపయోగించండి.\n"
+
+#: ../src/main.c:434
+#, c-format
+#| msgid "Error: Could not connect to NetworkManager."
+msgid "You must be root to run NetworkManager!\n"
+msgstr "నెట్వర్కునిర్వాహికను నడుపుటకు మీరు తప్పక రూట్ గా వుండాలి!\n"
+
+#: ../src/main.c:455
+#, c-format
+#| msgid "Failed to set IV for encryption: %s / %s."
+msgid "Failed to read configuration: (%d) %s\n"
+msgstr "ఆకృతీకరణను చదువుటకు విఫలమైంది: (%d) %s\n"
 
-#: ../src/main.c:568
+#: ../src/main.c:466
 #, c-format
 msgid "%s.  Please use --help to see a list of valid options.\n"
-msgstr "%s.  చెల్లునటువంటి ఐచ్చికముల జాబితా చూచుటకు దయచేసి --help వుపయోగించుము.\n"
+msgstr ""
+"%s.  చెల్లునటువంటి ఐచ్చికముల జాబితా చూచుటకు దయచేసి --help వుపయోగించుము.\n"
+
+#: ../src/main.c:473
+#, c-format
+msgid "State file %s parsing failed: (%d) %s\n"
+msgstr "స్టేట్ ఫైల్ %s పార్సింగ్ విఫలమైంది: (%d) %s\n"
+
+#: ../src/main.c:490
+#, c-format
+msgid "Could not daemonize: %s [error %u]\n"
+msgstr "డెమొనైజ్ చేయలేదు: %s [error %u]\n"
 
-#: ../src/dhcp-manager/nm-dhcp-dhclient.c:325
+#: ../src/dhcp-manager/nm-dhcp-dhclient-utils.c:61
 msgid "# Created by NetworkManager\n"
 msgstr "# నెట్వర్కునిర్వాహిక ద్వారా సృష్టించబడింది\n"
 
-#: ../src/dhcp-manager/nm-dhcp-dhclient.c:341
+#: ../src/dhcp-manager/nm-dhcp-dhclient-utils.c:68
 #, c-format
 msgid ""
 "# Merged from %s\n"
@@ -1654,52 +2767,252 @@ msgstr ""
 "# %sనుండి కలుపబడింది\n"
 "\n"
 
-#: ../src/dhcp-manager/nm-dhcp-manager.c:279
+#: ../src/dhcp-manager/nm-dhcp-manager.c:266
 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:275
 msgid "'dhclient' could be found."
 msgstr "'dhclient' కనుగొనబడ గలదు."
 
-#: ../src/dhcp-manager/nm-dhcp-manager.c:298
+#: ../src/dhcp-manager/nm-dhcp-manager.c:285
 msgid "'dhcpcd' could be found."
 msgstr "'dhcpcd' కనుగొనబడ గలదు."
 
-#: ../src/dhcp-manager/nm-dhcp-manager.c:306
+#: ../src/dhcp-manager/nm-dhcp-manager.c:293
 #, c-format
 msgid "unsupported DHCP client '%s'"
 msgstr "మద్దతీయని DHCP క్లైంట్ '%s'"
 
-#: ../src/logging/nm-logging.c:146
+#: ../src/dns-manager/nm-dns-manager.c:379
+msgid "NOTE: the libc resolver may not support more than 3 nameservers."
+msgstr ""
+"గమనిక: libc రిజాల్వర్ 3 నామపు సేవికలకన్నా యెక్కువ వాటికి మద్దతివ్వలేదు."
+
+#: ../src/dns-manager/nm-dns-manager.c:381
+msgid "The nameservers listed below may not be recognized."
+msgstr "క్రిందన జాబితాచేసివున్న నామపుసేవికలు గుర్తించబడక పోవచ్చును."
+
+#: ../src/logging/nm-logging.c:131
 #, c-format
 msgid "Unknown log level '%s'"
 msgstr "తెలియని లాగ్ స్థాయి '%s'"
 
-#: ../src/logging/nm-logging.c:171
+#: ../src/logging/nm-logging.c:156
 #, 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 "గమనిక: libc రిజాల్వర్ 3 నామపు సేవికలకన్నా యెక్కువ వాటికి మద్దతివ్వలేదు."
+#: ../src/modem-manager/nm-modem-cdma.c:281 ../src/nm-device-bt.c:351
+#, 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:559 ../src/nm-device-bt.c:347
+#, c-format
+#| msgid "connection failed"
+msgid "GSM connection %d"
+msgstr "GSM అనుసంధానం %d"
+
+#: ../src/nm-device-bond.c:192
+#, c-format
+#| msgid "connection failed"
+msgid "Bond connection %d"
+msgstr "బాండ్ అనుసంధానం %d"
+
+#: ../src/nm-device-adsl.c:193
+#, c-format
+#| msgid "connection failed"
+msgid "ADSL connection %d"
+msgstr "ADSL అనుసంధానం %d"
+
+#: ../src/nm-device-bt.c:322
+#, c-format
+#| msgid "VPN connection failed"
+msgid "PAN connection %d"
+msgstr "PAN అనుసంధానం %d"
+
+#: ../src/nm-device-bt.c:355
+#, c-format
+#| msgid "VPN connection failed"
+msgid "DUN connection %d"
+msgstr "DUN అనుసంధానం %d"
+
+#: ../src/nm-device-ethernet.c:1326
+#, c-format
+#| msgid "VPN connection failed"
+msgid "PPPoE connection %d"
+msgstr "PPPoE అనుసంధానం %d"
+
+#: ../src/nm-device-ethernet.c:1326 ../src/settings/nm-settings-utils.c:50
+#, c-format
+#| msgid "Active connections"
+msgid "Wired connection %d"
+msgstr "వైరుతో అనుసంధానం %d"
+
+#: ../src/nm-device-infiniband.c:303
+#, c-format
+msgid "InfiniBand connection %d"
+msgstr "ఇన్ఫిబాండ్ అనుసంధానం %d"
+
+#: ../src/nm-device-olpc-mesh.c:306
+#, c-format
+msgid "Mesh %d"
+msgstr "మెష్ %d"
 
-#: ../src/settings/nm-default-wired-connection.c:157
+#: ../src/nm-device-vlan.c:362
 #, c-format
-msgid "Auto %s"
-msgstr "స్వయంచాలక %s"
+#| msgid "VPN connection failed"
+msgid "VLAN connection %d"
+msgstr "VLAN అనుసంధానం %d"
 
-#: ../system-settings/plugins/ifcfg-rh/reader.c:3275
+#: ../src/nm-manager.c:661
+#, c-format
+#| msgid "VPN connection failed"
+msgid "VPN connection %d"
+msgstr "VPN అనుసంధానం %d"
+
+#: ../src/nm-netlink-monitor.c:148 ../src/nm-netlink-monitor.c:272
+#: ../src/nm-netlink-monitor.c:695
+#, c-format
+msgid "error processing netlink message: %s"
+msgstr "నెట్‌లింక్ సందేశమును ప్రోసెసింగ్ చేయుటలో దోషము: %s"
+
+#: ../src/nm-netlink-monitor.c:251
+msgid "error occurred while waiting for data on socket"
+msgstr "సాకెట్ నందు డాటా కొరకు వేచివుండునప్పుడు దోషము సంభవించినది"
+
+#: ../src/nm-netlink-monitor.c:296
+#, c-format
+msgid "unable to connect to netlink for monitoring link status: %s"
+msgstr ""
+"లింకు స్థితిని పర్యవేక్షించుటకు నెట్‌లింకుకు అనుసంధానము కాలేకపోయింది: %s"
+
+#: ../src/nm-netlink-monitor.c:307
+#, c-format
+msgid "unable to enable netlink handle credential passing: %s"
+msgstr "నెట్‌లింక్ హాండిల్ క్రెడెన్షియల్ పాసింగ్ చేతము చేయలేదు: %s"
+
+#: ../src/nm-netlink-monitor.c:330 ../src/nm-netlink-monitor.c:390
+#, c-format
+msgid "unable to allocate netlink handle for monitoring link status: %s"
+msgstr ""
+"లింకు స్థితిని పర్యవేక్షించుటకు నెట్‌లింకు హాండిల్‌ను కేటాయించలేక పోయింది: %s"
+
+#: ../src/nm-netlink-monitor.c:415
+#, c-format
+msgid "unable to allocate netlink link cache for monitoring link status: %s"
+msgstr ""
+"లింకు స్థితిని పర్యవేక్షించుటకు నెట్‌లింకు క్యాచీని కేటాయించలేక పోయింది: %s"
+
+#: ../src/nm-netlink-monitor.c:542
+#, c-format
+msgid "unable to join netlink group: %s"
+msgstr "నెట్‌లింకు సమూహాన్ని చేర్చుకొనలేక పోయింది: %s"
+
+#: ../src/nm-netlink-monitor.c:671 ../src/nm-netlink-monitor.c:684
+#, c-format
+msgid "error updating link cache: %s"
+msgstr "లింకు క్యాచీని నవీకరించుటలో దోషము: %s"
+
+#: ../src/settings/plugins/ifcfg-rh/reader.c:93
 msgid "System"
 msgstr "సిస్టమ్"
 
+#: ../src/settings/plugins/ifcfg-rh/reader.c:3663
+msgid "Bond"
+msgstr "బాండ్"
+
+#: ../test/nm-online.c:111
+#, c-format
+#| msgid "connecting"
+msgid "\rConnecting"
+msgstr "\rఅనుసంధానమౌచున్నది"
+
+#: ../test/nm-online.c:142
+msgid "Time to wait for a connection, in seconds (default is 30)"
+msgstr "అనుసంధానం కొరకు వేచివుండవలసిన సమయం, క్షణాలలో(అప్రమేయంగా 30)"
+
+#: ../test/nm-online.c:143
+msgid "Exit immediately if NetworkManager is not running or connecting"
+msgstr ""
+"నెట్వర్కుమేనేజర్ నడువకపోయినా లేక అనుసంధానం కాకపోయినా తక్షణమే నిష్క్రమించు"
+
+#: ../test/nm-online.c:144
+msgid "Don't print anything"
+msgstr "దేనిని ముద్రించవద్దు"
+
+#: ../test/nm-online.c:162
+#| msgid "Error: Could not connect to NetworkManager."
+msgid "Waits for a successful connection in NetworkManager."
+msgstr "నెట్వర్కునిర్వాహిక నందు సఫలవంతమైన అనుసంధానము కొరకు వేచివుంది."
+
+#: ../test/nm-online.c:168 ../test/nm-online.c:177
+#| msgid "Invalid option.  Please use --help to see a list of valid options.\n"
+msgid "Invalid option.  Please use --help to see a list of valid options."
+msgstr ""
+"చెల్లని ఐచ్చికము.  చెల్లునటువంటి ఐచ్చికముల జాబితా కొరకు --help వుపయోగించండి."
+
+#~ msgid "SCOPE"
+#~ msgstr "SCOPE"
+
+#~ msgid "DBUS-SERVICE"
+#~ msgstr "DBUS-SERVICE"
+
+#~ msgid "system"
+#~ msgstr "సిస్టమ్"
+
+#~ msgid "user"
+#~ msgstr "వినియోగదారి"
+
+#~ msgid "System connections"
+#~ msgstr "సిస్టమ్ అనుసంధానములు"
+
+#~ msgid "User connections"
+#~ msgstr "వినియోగదారి అనుసంధానములు"
+
+#~ msgid "state: %s\n"
+#~ msgstr "స్థితి: %s\n"
+
+#~ msgid "Connection activated\n"
+#~ msgstr "అనుసంధానము క్రియాశీలపరచబడింది\n"
+
+#~ msgid "state: %s (%d)\n"
+#~ msgstr "స్థితి: %s (%d)\n"
+
+#~ msgid "Error: Obtaining active connection for '%s' failed."
+#~ msgstr "దోషము: '%s' కొరకు క్రియాశీల అనుసంధానమును పొందుటలో విఫలమైంది."
+
+#~ msgid "Active connection state: %s\n"
+#~ msgstr "క్రియాశీల అనుసంధానము స్థితి: %s\n"
+
+#~ msgid "Active connection path: %s\n"
+#~ msgstr "క్రియాశీల అనుసంధానము పాత్: %s\n"
+
+#~ msgid "IP4-SETTINGS"
+#~ msgstr "IP4-SETTINGS"
+
+#~ msgid "PREFIX"
+#~ msgstr "PREFIX"
+
+#~ msgid "unknown)"
+#~ msgstr "తెలియని)"
+
+#~ msgid "Device state: %d (%s)\n"
+#~ msgstr "పరికరము స్థితి: %d (%s)\n"
+
+#~ msgid "not set"
+#~ msgstr "అమర్చ లేదు"
+
+#~ msgid "Allow use of user-specific connections"
+#~ msgstr "వినియోగదారి-ప్రత్యేక అనుసంధానముల వుపయోగమును అనుమతించుము"
+
+#~ msgid "System policy prevents use of user-specific connections"
+#~ msgstr "వినియోగదారి-ప్రత్యేక అనుసంధానములను వుపయోగించుటకు సిస్టమ్ విధానము నిరోధించుచున్నది"
+
+#~ msgid "Auto %s"
+#~ msgstr "స్వయంచాలక %s"
+
 #~ msgid "IP6-SETTINGS"
 #~ msgstr "IP6-SETTINGS"
-
-#~ msgid "IP6-DNS"
-#~ msgstr "IP6-DNS"
diff --git a/po/uk.po b/po/uk.po
index 3611f5b3..f784ccc0 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -7,20 +7,20 @@ msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
 "product=NetworkManager&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2012-02-09 15:25+0000\n"
-"PO-Revision-Date: 2012-02-16 16:45+0200\n"
+"POT-Creation-Date: 2012-07-18 15:25+0000\n"
+"PO-Revision-Date: 2012-08-10 21:08+0300\n"
 "Last-Translator: Yuri Chornoivan \n"
 "Language-Team: Ukrainian \n"
+"Language: uk\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: uk\n"
-"X-Generator: Lokalize 1.2\n"
+"X-Generator: Lokalize 1.5\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
 #: ../cli/src/common.c:32 ../cli/src/common.c:44 ../cli/src/common.c:52
-#: ../cli/src/common.c:63 ../cli/src/connections.c:119
-#: ../cli/src/connections.c:153
+#: ../cli/src/common.c:63 ../cli/src/connections.c:128
+#: ../cli/src/connections.c:162
 msgid "GROUP"
 msgstr "ГРУПА"
 
@@ -31,7 +31,6 @@ msgstr "АДРЕСА"
 
 #. 1
 #: ../cli/src/common.c:34 ../cli/src/common.c:54
-#| msgid "RATE"
 msgid "ROUTE"
 msgstr "МАРШРУТ"
 
@@ -55,18 +54,300 @@ msgstr "WINS"
 msgid "OPTION"
 msgstr "ПАРАМЕТР"
 
+#: ../cli/src/common.c:366
+msgid "unmanaged"
+msgstr "некерований"
+
+#: ../cli/src/common.c:368
+msgid "unavailable"
+msgstr "недоступний"
+
+#: ../cli/src/common.c:370 ../cli/src/network-manager.c:120
+msgid "disconnected"
+msgstr "роз'єднано"
+
+#: ../cli/src/common.c:372
+msgid "connecting (prepare)"
+msgstr "з’єднання (приготування)"
+
+#: ../cli/src/common.c:374
+msgid "connecting (configuring)"
+msgstr "з’єднання (налаштовування)"
+
+#: ../cli/src/common.c:376
+msgid "connecting (need authentication)"
+msgstr "з’єднання (потрібне розпізнавання)"
+
+#: ../cli/src/common.c:378
+msgid "connecting (getting IP configuration)"
+msgstr "з’єднання (отримання налаштувань IP)"
+
+#: ../cli/src/common.c:380
+msgid "connecting (checking IP connectivity)"
+msgstr "з’єднання (перевірка можливості з’єднання)"
+
+#: ../cli/src/common.c:382
+msgid "connecting (starting secondary connections)"
+msgstr "з’єднання (встановлення другорядних з’єднань)"
+
+#: ../cli/src/common.c:384 ../cli/src/network-manager.c:116
+msgid "connected"
+msgstr "з'єднано"
+
+#: ../cli/src/common.c:386 ../cli/src/connections.c:633
+msgid "deactivating"
+msgstr "деактивація"
+
+#: ../cli/src/common.c:388
+msgid "connection failed"
+msgstr "невдала спроба з’єднання"
+
+#: ../cli/src/common.c:390 ../cli/src/connections.c:636
+#: ../cli/src/connections.c:659 ../cli/src/connections.c:1349
+#: ../cli/src/devices.c:622 ../cli/src/network-manager.c:123
+#: ../cli/src/network-manager.c:185 ../cli/src/network-manager.c:188
+#: ../cli/src/network-manager.c:197 ../cli/src/network-manager.c:257
+#: ../cli/src/network-manager.c:273 ../cli/src/network-manager.c:431
+#: ../cli/src/network-manager.c:486 ../cli/src/network-manager.c:524
+#: ../cli/src/network-manager.c:563 ../cli/src/settings.c:585
+#: ../cli/src/settings.c:613 ../cli/src/utils.c:531 ../src/main.c:462
+#: ../src/main.c:481
+msgid "unknown"
+msgstr "невідомо"
+
+#: ../cli/src/common.c:399
+msgid "No reason given"
+msgstr "Причину не вказано"
+
+#: ../cli/src/common.c:402
+msgid "Unknown error"
+msgstr "Невідома помилка"
+
+#: ../cli/src/common.c:405
+msgid "Device is now managed"
+msgstr "Тепер пристрій є керованим"
+
+#: ../cli/src/common.c:408
+msgid "Device is now unmanaged"
+msgstr "Тепер пристрій є некерованим"
+
+#: ../cli/src/common.c:411
+msgid "The device could not be readied for configuration"
+msgstr "Пристрій не може бути приготовано до налаштовування"
+
+#: ../cli/src/common.c:414
+msgid ""
+"IP configuration could not be reserved (no available address, timeout, etc)"
+msgstr ""
+"Налаштування IP не можна резервувати (немає доступних адрес, часу очікування "
+"тощо)"
+
+#: ../cli/src/common.c:417
+msgid "The IP configuration is no longer valid"
+msgstr "Налаштування IP вже не є коректними"
+
+#: ../cli/src/common.c:420
+msgid "Secrets were required, but not provided"
+msgstr "Потрібні були реєстраційні дані, яких не було надано"
+
+#: ../cli/src/common.c:423
+msgid "802.1X supplicant disconnected"
+msgstr "Допоміжну програму 802.1X від’єднано"
+
+#: ../cli/src/common.c:426
+msgid "802.1X supplicant configuration failed"
+msgstr "Спроба налаштувати допоміжну програму 802.1X завершилася невдало"
+
+#: ../cli/src/common.c:429
+msgid "802.1X supplicant failed"
+msgstr "Помилка допоміжної програми 802.1X"
+
+#: ../cli/src/common.c:432
+msgid "802.1X supplicant took too long to authenticate"
+msgstr ""
+"Розпізнавання за допомогою допоміжної програми 802.1X триває занадто довго"
+
+#: ../cli/src/common.c:435
+msgid "PPP service failed to start"
+msgstr "Не вдалося запустити службу PPP"
+
+#: ../cli/src/common.c:438
+msgid "PPP service disconnected"
+msgstr "Службу PPP від’єднано"
+
+#: ../cli/src/common.c:441
+msgid "PPP failed"
+msgstr "помилка PPP"
+
+#: ../cli/src/common.c:444
+msgid "DHCP client failed to start"
+msgstr "Не вдалося запустити клієнтську програму DHCP"
+
+#: ../cli/src/common.c:447
+msgid "DHCP client error"
+msgstr "помилка клієнтської програми DHCP"
+
+#: ../cli/src/common.c:450
+msgid "DHCP client failed"
+msgstr "критична помилка клієнтської програми DHCP"
+
+#: ../cli/src/common.c:453
+msgid "Shared connection service failed to start"
+msgstr "Не вдалося запустити службу спільного використання з’єднання"
+
+#: ../cli/src/common.c:456
+msgid "Shared connection service failed"
+msgstr "Критична помилка служби спільного використання з’єднання"
+
+#: ../cli/src/common.c:459
+msgid "AutoIP service failed to start"
+msgstr "Не вдалося запустити службу AutoIP"
+
+#: ../cli/src/common.c:462
+msgid "AutoIP service error"
+msgstr "Помилка служби AutoIP"
+
+#: ../cli/src/common.c:465
+msgid "AutoIP service failed"
+msgstr "Помилка служби AutoIP"
+
+#: ../cli/src/common.c:468
+msgid "The line is busy"
+msgstr "Лінію зайнято"
+
+#: ../cli/src/common.c:471
+msgid "No dial tone"
+msgstr "Немає гудка"
+
+#: ../cli/src/common.c:474
+msgid "No carrier could be established"
+msgstr "Не вдалося визначити носій сигналу"
+
+#: ../cli/src/common.c:477
+msgid "The dialing request timed out"
+msgstr "Перевищено час очікування на підтвердження запиту щодо набору номера"
+
+#: ../cli/src/common.c:480
+msgid "The dialing attempt failed"
+msgstr "Спроба набирання номера завершилася невдало"
+
+#: ../cli/src/common.c:483
+msgid "Modem initialization failed"
+msgstr "Не вдалося ініціалізувати модем"
+
+#: ../cli/src/common.c:486
+msgid "Failed to select the specified APN"
+msgstr "Не вдалося вибрати вказаний APN"
+
+#: ../cli/src/common.c:489
+msgid "Not searching for networks"
+msgstr "Пошук мереж не виконується"
+
+#: ../cli/src/common.c:492
+msgid "Network registration denied"
+msgstr "Реєстрацію у мережі заборонено"
+
+#: ../cli/src/common.c:495
+msgid "Network registration timed out"
+msgstr "Перевищено час очікування на реєстрацію у мережі"
+
+#: ../cli/src/common.c:498
+msgid "Failed to register with the requested network"
+msgstr "Не вдалося зареєструватися у потрібній мережі"
+
+#: ../cli/src/common.c:501
+msgid "PIN check failed"
+msgstr "Помилка під час спроби перевірити PIN-код"
+
+#: ../cli/src/common.c:504
+msgid "Necessary firmware for the device may be missing"
+msgstr "Можливо, не вистачає потрібної для роботи пристрою мікропрограми"
+
+#: ../cli/src/common.c:507
+msgid "The device was removed"
+msgstr "Пристрій вилучено"
+
+#: ../cli/src/common.c:510
+msgid "NetworkManager went to sleep"
+msgstr "NetworkManager переведено у режим сну"
+
+#: ../cli/src/common.c:513
+msgid "The device's active connection disappeared"
+msgstr "Активне з’єднання з пристроєм зникло"
+
+#: ../cli/src/common.c:516
+msgid "Device disconnected by user or client"
+msgstr "Пристрій роз’єднано з боку користувача або клієнтської програми"
+
+#: ../cli/src/common.c:519
+msgid "Carrier/link changed"
+msgstr "Змінено носій або зв’язок"
+
+#: ../cli/src/common.c:522
+msgid "The device's existing connection was assumed"
+msgstr ""
+"Зроблено припущення щодо використання вже встановленого з’єднання з пристроєм"
+
+#: ../cli/src/common.c:525
+msgid "The supplicant is now available"
+msgstr "Відкрито доступ до допоміжної програми"
+
+#: ../cli/src/common.c:528
+msgid "The modem could not be found"
+msgstr "Не вдалося виявити модем"
+
+#: ../cli/src/common.c:531
+msgid "The Bluetooth connection failed or timed out"
+msgstr ""
+"Помилка з’єднання Bluetooth або перевищення часу очікування на передавання "
+"даних з’єднанням"
+
+#: ../cli/src/common.c:534
+msgid "GSM Modem's SIM card not inserted"
+msgstr "До модема GSM не вставлено SIM-картки"
+
+#: ../cli/src/common.c:537
+msgid "GSM Modem's SIM PIN required"
+msgstr "Слід вказати PIN-код SIM-картки у модемі GSM"
+
+#: ../cli/src/common.c:540
+msgid "GSM Modem's SIM PUK required"
+msgstr "Слід вказати код розпізнавання (PUK) SIM-картки у модемі GSM"
+
+#: ../cli/src/common.c:543
+msgid "GSM Modem's SIM wrong"
+msgstr "Помилкова SIM-картка у модемі GSM"
+
+#: ../cli/src/common.c:546
+msgid "InfiniBand device does not support connected mode"
+msgstr "У пристрої InfiniBand не передбачено режиму з’єднання"
+
+#: ../cli/src/common.c:549
+#| msgid "connection failed"
+msgid "A dependency of the connection failed"
+msgstr "Не вдалося використати залежність з’єднання"
+
+#: ../cli/src/common.c:552
+msgid "A problem with the RFC 2684 Ethernet over ADSL bridge"
+msgstr "Проблема з містком Ethernet на основі ADSL відповідно до RFC 2684"
+
+#: ../cli/src/common.c:555 ../cli/src/devices.c:274 ../cli/src/devices.c:290
+#: ../cli/src/devices.c:410 ../cli/src/devices.c:454
+msgid "Unknown"
+msgstr "Невідомо"
+
 #. 0
 #. used only for 'GENERAL' group listing
-#: ../cli/src/connections.c:56 ../cli/src/connections.c:120
-#: ../cli/src/devices.c:100 ../cli/src/devices.c:121 ../cli/src/devices.c:131
-#: ../cli/src/devices.c:141 ../cli/src/devices.c:155 ../cli/src/devices.c:169
-#: ../cli/src/devices.c:191
+#: ../cli/src/connections.c:59 ../cli/src/connections.c:129
+#: ../cli/src/devices.c:105 ../cli/src/devices.c:129 ../cli/src/devices.c:139
+#: ../cli/src/devices.c:149 ../cli/src/devices.c:163 ../cli/src/devices.c:177
+#: ../cli/src/devices.c:199
 msgid "NAME"
 msgstr "НАЗВА"
 
 #. 0
 #. 1
-#: ../cli/src/connections.c:57 ../cli/src/connections.c:121
+#: ../cli/src/connections.c:60 ../cli/src/connections.c:130
 msgid "UUID"
 msgstr "UUID"
 
@@ -74,28 +355,29 @@ msgstr "UUID"
 #. 0
 #. 1
 #. 2
-#: ../cli/src/connections.c:58 ../cli/src/connections.c:154
-#: ../cli/src/devices.c:66 ../cli/src/devices.c:102 ../cli/src/devices.c:194
+#: ../cli/src/connections.c:61 ../cli/src/connections.c:163
+#: ../cli/src/devices.c:71 ../cli/src/devices.c:107 ../cli/src/devices.c:202
 msgid "TYPE"
 msgstr "ТИП"
 
 #. 2
-#: ../cli/src/connections.c:59
+#: ../cli/src/connections.c:62
 msgid "TIMESTAMP"
 msgstr "ЧАСОВА МІТКА"
 
 #. 3
-#: ../cli/src/connections.c:60
+#: ../cli/src/connections.c:63
 msgid "TIMESTAMP-REAL"
 msgstr "ДІЙСНА ЧАСОВА МІТКА"
 
 #. 4
-#: ../cli/src/connections.c:61
+#. 13
+#: ../cli/src/connections.c:64 ../cli/src/devices.c:119
 msgid "AUTOCONNECT"
 msgstr "АВТОЗ’ЄДНАННЯ"
 
 #. 5
-#: ../cli/src/connections.c:62
+#: ../cli/src/connections.c:65
 msgid "READONLY"
 msgstr "ЛИШЕ ЧИТАННЯ"
 
@@ -104,113 +386,97 @@ msgstr "ЛИШЕ ЧИТАННЯ"
 #. 2
 #. 11
 #. 5
-#: ../cli/src/connections.c:63 ../cli/src/connections.c:128
-#: ../cli/src/devices.c:68 ../cli/src/devices.c:181 ../cli/src/devices.c:197
+#: ../cli/src/connections.c:66 ../cli/src/connections.c:137
+#: ../cli/src/devices.c:73 ../cli/src/devices.c:189 ../cli/src/devices.c:205
 msgid "DBUS-PATH"
 msgstr "DBUS-PATH"
 
 #. 2
-#: ../cli/src/connections.c:122
+#: ../cli/src/connections.c:131
 msgid "DEVICES"
 msgstr "ПРИСТРОЇ"
 
 #. 3
 #. 1
-#. 6
+#. 8
 #. 1
-#: ../cli/src/connections.c:123 ../cli/src/devices.c:67
-#: ../cli/src/devices.c:107 ../cli/src/network-manager.c:39
+#: ../cli/src/connections.c:132 ../cli/src/devices.c:72
+#: ../cli/src/devices.c:114 ../cli/src/network-manager.c:39
 msgid "STATE"
 msgstr "СТАН"
 
 #. 4
-#: ../cli/src/connections.c:124
+#: ../cli/src/connections.c:133
 msgid "DEFAULT"
 msgstr "ТИПОВЕ"
 
 #. 5
-#: ../cli/src/connections.c:125
-#| msgid "DEFAULT"
+#: ../cli/src/connections.c:134
 msgid "DEFAULT6"
 msgstr "ТИПОВИЙ6"
 
 #. 6
-#: ../cli/src/connections.c:126
+#: ../cli/src/connections.c:135
 msgid "SPEC-OBJECT"
 msgstr "SPEC-OBJECT"
 
 #. 7
 #. 1
-#: ../cli/src/connections.c:127 ../cli/src/connections.c:141
+#: ../cli/src/connections.c:136 ../cli/src/connections.c:150
 msgid "VPN"
 msgstr "VPN"
 
 #. 9
-#: ../cli/src/connections.c:129
+#: ../cli/src/connections.c:138
 msgid "CON-PATH"
 msgstr "ШЛЯХ-ДО-CON"
 
 #. 10
-#: ../cli/src/connections.c:130
+#: ../cli/src/connections.c:139
 msgid "ZONE"
 msgstr "ЗОНА"
 
 #. 11
-#: ../cli/src/connections.c:131
-#| msgid "DBUS-PATH"
+#: ../cli/src/connections.c:140
 msgid "MASTER-PATH"
 msgstr "ОСНОВНИЙ-ШЛЯХ"
 
-#: ../cli/src/connections.c:139 ../cli/src/devices.c:77
+#: ../cli/src/connections.c:148 ../cli/src/devices.c:82
 msgid "GENERAL"
 msgstr "ЗАГАЛЬНІ"
 
 #. 0
-#: ../cli/src/connections.c:140
-#| msgid "TKIP"
+#: ../cli/src/connections.c:149
 msgid "IP"
 msgstr "IP"
 
 #. 1
-#: ../cli/src/connections.c:155
-#| msgid "NAME"
+#: ../cli/src/connections.c:164
 msgid "USERNAME"
 msgstr "КОРИСТУВАЧ"
 
 #. 2
-#: ../cli/src/connections.c:156
+#: ../cli/src/connections.c:165
 msgid "GATEWAY"
 msgstr "ШЛЮЗ"
 
 #. 3
-#: ../cli/src/connections.c:157
+#: ../cli/src/connections.c:166
 msgid "BANNER"
 msgstr "БАНЕР"
 
 #. 4
-#: ../cli/src/connections.c:158
-#| msgid "STATE"
+#: ../cli/src/connections.c:167
 msgid "VPN-STATE"
 msgstr "СТАН-VPN"
 
 #. 5
-#: ../cli/src/connections.c:159
+#: ../cli/src/connections.c:168
 msgid "CFG"
 msgstr "КОНФ"
 
-#: ../cli/src/connections.c:180
+#: ../cli/src/connections.c:190
 #, c-format
-#| msgid ""
-#| "Usage: nmcli con { COMMAND | help }\n"
-#| "  COMMAND := { list | status | up | down }\n"
-#| "\n"
-#| "  list [id  | uuid ]\n"
-#| "  status\n"
-#| "  up id  | uuid  [iface ] [ap ] [nsp ] [--"
-#| "nowait] [--timeout ]\n"
-#| "  up id  | uuid  [iface ] [ap ] [--nowait] [--"
-#| "timeout ]\n"
-#| "  down id  | uuid \n"
 msgid ""
 "Usage: nmcli con { COMMAND | help }\n"
 "  COMMAND := { list | status | up | down | delete }\n"
@@ -236,380 +502,357 @@ msgstr ""
 "  down id  | uuid \n"
 "  delete id  | uuid \n"
 
-#: ../cli/src/connections.c:234 ../cli/src/connections.c:567
+#: ../cli/src/connections.c:249 ../cli/src/connections.c:609
 #, c-format
 msgid "Error: 'con list': %s"
 msgstr "Помилка: «con list»: %s"
 
-#: ../cli/src/connections.c:236 ../cli/src/connections.c:569
+#: ../cli/src/connections.c:251 ../cli/src/connections.c:611
 #, c-format
 msgid "Error: 'con list': %s; allowed fields: %s"
 msgstr "Помилка: «con list»: %s; дозволені поля: %s"
 
-#: ../cli/src/connections.c:244
+#: ../cli/src/connections.c:259
 msgid "Connection details"
 msgstr "Параметри з’єднання"
 
-#: ../cli/src/connections.c:442
+#: ../cli/src/connections.c:484
 msgid "never"
 msgstr "ніколи"
 
 #. "CAPABILITIES"
 #. Print header
 #. "WIFI-PROPERTIES"
-#: ../cli/src/connections.c:443 ../cli/src/connections.c:444
-#: ../cli/src/connections.c:681 ../cli/src/connections.c:682
-#: ../cli/src/connections.c:684 ../cli/src/devices.c:586
-#: ../cli/src/devices.c:639 ../cli/src/devices.c:750 ../cli/src/devices.c:751
-#: ../cli/src/devices.c:783 ../cli/src/devices.c:809 ../cli/src/devices.c:810
-#: ../cli/src/devices.c:811 ../cli/src/devices.c:812 ../cli/src/devices.c:813
-#: ../cli/src/settings.c:576 ../cli/src/settings.c:646
-#: ../cli/src/settings.c:766 ../cli/src/settings.c:1048
-#: ../cli/src/settings.c:1049 ../cli/src/settings.c:1051
-#: ../cli/src/settings.c:1053 ../cli/src/settings.c:1054
-#: ../cli/src/settings.c:1182 ../cli/src/settings.c:1183
-#: ../cli/src/settings.c:1184 ../cli/src/settings.c:1185
-#: ../cli/src/settings.c:1260 ../cli/src/settings.c:1261
-#: ../cli/src/settings.c:1262 ../cli/src/settings.c:1263
-#: ../cli/src/settings.c:1264 ../cli/src/settings.c:1265
-#: ../cli/src/settings.c:1266 ../cli/src/settings.c:1267
-#: ../cli/src/settings.c:1268 ../cli/src/settings.c:1269
-#: ../cli/src/settings.c:1270 ../cli/src/settings.c:1271
-#: ../cli/src/settings.c:1272 ../cli/src/settings.c:1343
+#: ../cli/src/connections.c:485 ../cli/src/connections.c:486
+#: ../cli/src/connections.c:714 ../cli/src/connections.c:715
+#: ../cli/src/connections.c:717 ../cli/src/devices.c:418
+#: ../cli/src/devices.c:471 ../cli/src/devices.c:587 ../cli/src/devices.c:588
+#: ../cli/src/devices.c:589 ../cli/src/devices.c:621 ../cli/src/devices.c:647
+#: ../cli/src/devices.c:648 ../cli/src/devices.c:649 ../cli/src/devices.c:650
+#: ../cli/src/devices.c:651 ../cli/src/network-manager.c:267
+#: ../cli/src/settings.c:694 ../cli/src/settings.c:764
+#: ../cli/src/settings.c:884 ../cli/src/settings.c:1166
+#: ../cli/src/settings.c:1167 ../cli/src/settings.c:1169
+#: ../cli/src/settings.c:1171 ../cli/src/settings.c:1172
+#: ../cli/src/settings.c:1303 ../cli/src/settings.c:1304
+#: ../cli/src/settings.c:1305 ../cli/src/settings.c:1306
+#: ../cli/src/settings.c:1383 ../cli/src/settings.c:1384
+#: ../cli/src/settings.c:1385 ../cli/src/settings.c:1386
+#: ../cli/src/settings.c:1387 ../cli/src/settings.c:1388
+#: ../cli/src/settings.c:1389 ../cli/src/settings.c:1390
+#: ../cli/src/settings.c:1391 ../cli/src/settings.c:1392
+#: ../cli/src/settings.c:1393 ../cli/src/settings.c:1394
+#: ../cli/src/settings.c:1395 ../cli/src/settings.c:1466
 msgid "yes"
 msgstr "так"
 
-#: ../cli/src/connections.c:443 ../cli/src/connections.c:444
-#: ../cli/src/connections.c:681 ../cli/src/connections.c:682
-#: ../cli/src/connections.c:684 ../cli/src/devices.c:586
-#: ../cli/src/devices.c:639 ../cli/src/devices.c:750 ../cli/src/devices.c:751
-#: ../cli/src/devices.c:783 ../cli/src/devices.c:809 ../cli/src/devices.c:810
-#: ../cli/src/devices.c:811 ../cli/src/devices.c:812 ../cli/src/devices.c:813
-#: ../cli/src/settings.c:576 ../cli/src/settings.c:578
-#: ../cli/src/settings.c:646 ../cli/src/settings.c:766
-#: ../cli/src/settings.c:1048 ../cli/src/settings.c:1049
-#: ../cli/src/settings.c:1051 ../cli/src/settings.c:1053
-#: ../cli/src/settings.c:1054 ../cli/src/settings.c:1182
-#: ../cli/src/settings.c:1183 ../cli/src/settings.c:1184
-#: ../cli/src/settings.c:1185 ../cli/src/settings.c:1260
-#: ../cli/src/settings.c:1261 ../cli/src/settings.c:1262
-#: ../cli/src/settings.c:1263 ../cli/src/settings.c:1264
-#: ../cli/src/settings.c:1265 ../cli/src/settings.c:1266
-#: ../cli/src/settings.c:1267 ../cli/src/settings.c:1268
-#: ../cli/src/settings.c:1269 ../cli/src/settings.c:1270
-#: ../cli/src/settings.c:1271 ../cli/src/settings.c:1272
-#: ../cli/src/settings.c:1343
+#: ../cli/src/connections.c:485 ../cli/src/connections.c:486
+#: ../cli/src/connections.c:714 ../cli/src/connections.c:715
+#: ../cli/src/connections.c:717 ../cli/src/devices.c:418
+#: ../cli/src/devices.c:471 ../cli/src/devices.c:587 ../cli/src/devices.c:588
+#: ../cli/src/devices.c:589 ../cli/src/devices.c:621 ../cli/src/devices.c:647
+#: ../cli/src/devices.c:648 ../cli/src/devices.c:649 ../cli/src/devices.c:650
+#: ../cli/src/devices.c:651 ../cli/src/network-manager.c:269
+#: ../cli/src/settings.c:694 ../cli/src/settings.c:696
+#: ../cli/src/settings.c:764 ../cli/src/settings.c:884
+#: ../cli/src/settings.c:1166 ../cli/src/settings.c:1167
+#: ../cli/src/settings.c:1169 ../cli/src/settings.c:1171
+#: ../cli/src/settings.c:1172 ../cli/src/settings.c:1303
+#: ../cli/src/settings.c:1304 ../cli/src/settings.c:1305
+#: ../cli/src/settings.c:1306 ../cli/src/settings.c:1383
+#: ../cli/src/settings.c:1384 ../cli/src/settings.c:1385
+#: ../cli/src/settings.c:1386 ../cli/src/settings.c:1387
+#: ../cli/src/settings.c:1388 ../cli/src/settings.c:1389
+#: ../cli/src/settings.c:1390 ../cli/src/settings.c:1391
+#: ../cli/src/settings.c:1392 ../cli/src/settings.c:1393
+#: ../cli/src/settings.c:1394 ../cli/src/settings.c:1395
+#: ../cli/src/settings.c:1466
 msgid "no"
 msgstr "ні"
 
-#: ../cli/src/connections.c:518
+#: ../cli/src/connections.c:560
 msgid "Connection list"
 msgstr "Список з’єднань"
 
-#: ../cli/src/connections.c:531 ../cli/src/connections.c:1064
-#: ../cli/src/connections.c:1808 ../cli/src/connections.c:1823
-#: ../cli/src/connections.c:1832 ../cli/src/connections.c:1842
-#: ../cli/src/connections.c:1854 ../cli/src/connections.c:1949
-#: ../cli/src/connections.c:2051 ../cli/src/devices.c:1190
-#: ../cli/src/devices.c:1200 ../cli/src/devices.c:1314
-#: ../cli/src/devices.c:1322 ../cli/src/devices.c:1535
-#: ../cli/src/devices.c:1542
+#: ../cli/src/connections.c:573 ../cli/src/connections.c:1110
+#: ../cli/src/connections.c:1646 ../cli/src/connections.c:1661
+#: ../cli/src/connections.c:1670 ../cli/src/connections.c:1680
+#: ../cli/src/connections.c:1692 ../cli/src/connections.c:1800
+#: ../cli/src/connections.c:1902 ../cli/src/devices.c:1041
+#: ../cli/src/devices.c:1051 ../cli/src/devices.c:1169
+#: ../cli/src/devices.c:1177 ../cli/src/devices.c:1541
+#: ../cli/src/devices.c:1548 ../cli/src/devices.c:1562
+#: ../cli/src/devices.c:1569 ../cli/src/devices.c:1586
+#: ../cli/src/devices.c:1597 ../cli/src/devices.c:1818
+#: ../cli/src/devices.c:1825
 #, c-format
 msgid "Error: %s argument is missing."
 msgstr "Помилка: пропущено аргумент %s."
 
-#: ../cli/src/connections.c:544
+#: ../cli/src/connections.c:586
 #, c-format
 msgid "Error: %s - no such connection."
 msgstr "Помилка: невідоме з’єднання %s."
 
-#: ../cli/src/connections.c:550 ../cli/src/connections.c:1867
-#: ../cli/src/connections.c:1966 ../cli/src/connections.c:2058
-#: ../cli/src/devices.c:987 ../cli/src/devices.c:1067
-#: ../cli/src/devices.c:1214 ../cli/src/devices.c:1328
-#: ../cli/src/devices.c:1548
+#: ../cli/src/connections.c:592 ../cli/src/connections.c:1705
+#: ../cli/src/connections.c:1817 ../cli/src/connections.c:1909
+#: ../cli/src/devices.c:825 ../cli/src/devices.c:905 ../cli/src/devices.c:1065
+#: ../cli/src/devices.c:1183 ../cli/src/devices.c:1610
+#: ../cli/src/devices.c:1831
 #, c-format
 msgid "Unknown parameter: %s\n"
 msgstr "Невідомий параметр: %s\n"
 
-#: ../cli/src/connections.c:559
+#: ../cli/src/connections.c:601
 #, c-format
 msgid "Error: no valid parameter specified."
 msgstr "Помилка: не вказано коректних параметрів."
 
-#: ../cli/src/connections.c:574 ../cli/src/connections.c:2151
-#: ../cli/src/devices.c:1756 ../cli/src/network-manager.c:456
+#: ../cli/src/connections.c:616 ../cli/src/connections.c:2002
+#: ../cli/src/devices.c:2039 ../cli/src/network-manager.c:596
 #, c-format
 msgid "Error: %s."
 msgstr "Помилка: %s."
 
-#: ../cli/src/connections.c:587
+#: ../cli/src/connections.c:629
 msgid "activating"
 msgstr "активація"
 
-#: ../cli/src/connections.c:589
+#: ../cli/src/connections.c:631
 msgid "activated"
 msgstr "активовано"
 
-#: ../cli/src/connections.c:591 ../cli/src/devices.c:261
-msgid "deactivating"
-msgstr "деактивація"
-
-#: ../cli/src/connections.c:594 ../cli/src/connections.c:617
-#: ../cli/src/connections.c:1680 ../cli/src/devices.c:265
-#: ../cli/src/devices.c:784 ../cli/src/network-manager.c:111
-#: ../cli/src/network-manager.c:173 ../cli/src/network-manager.c:176
-#: ../cli/src/network-manager.c:185 ../cli/src/network-manager.c:291
-#: ../cli/src/network-manager.c:346 ../cli/src/network-manager.c:384
-#: ../cli/src/network-manager.c:423 ../cli/src/settings.c:531
-#: ../cli/src/utils.c:499 ../src/main.c:443 ../src/main.c:462
-msgid "unknown"
-msgstr "невідомо"
-
-#: ../cli/src/connections.c:603
+#: ../cli/src/connections.c:645
 msgid "VPN connecting (prepare)"
 msgstr "З’єднання VPN (приготування)"
 
-#: ../cli/src/connections.c:605
+#: ../cli/src/connections.c:647
 msgid "VPN connecting (need authentication)"
 msgstr "З’єднання VPN (потрібне розпізнавання)"
 
-#: ../cli/src/connections.c:607
+#: ../cli/src/connections.c:649
 msgid "VPN connecting"
 msgstr "З’єднання VPN"
 
-#: ../cli/src/connections.c:609
+#: ../cli/src/connections.c:651
 msgid "VPN connecting (getting IP configuration)"
 msgstr "З’єднання VPN (отримання налаштувань IP)"
 
-#: ../cli/src/connections.c:611
+#: ../cli/src/connections.c:653
 msgid "VPN connected"
 msgstr "VPN з’єднано"
 
-#: ../cli/src/connections.c:613
+#: ../cli/src/connections.c:655
 msgid "VPN connection failed"
 msgstr "Невдала спроба з’єднання VPN"
 
-#: ../cli/src/connections.c:615
+#: ../cli/src/connections.c:657
 msgid "VPN disconnected"
 msgstr "VPN роз’єднано"
 
-#: ../cli/src/connections.c:868 ../cli/src/connections.c:1092
+#: ../cli/src/connections.c:710 ../cli/src/connections.c:720
+msgid "N/A"
+msgstr "н/д"
+
+#: ../cli/src/connections.c:914 ../cli/src/connections.c:1138
 #, c-format
 msgid "Error: 'con status': %s"
 msgstr "Помилка: «con status»: %s"
 
-#: ../cli/src/connections.c:870 ../cli/src/connections.c:1094
+#: ../cli/src/connections.c:916 ../cli/src/connections.c:1140
 #, c-format
 msgid "Error: 'con status': %s; allowed fields: %s"
 msgstr "Помилка: «con status»: %s; дозволені поля: %s"
 
-#: ../cli/src/connections.c:878
-#| msgid "Active connections"
+#: ../cli/src/connections.c:924
 msgid "Active connection details"
 msgstr "Параметри активного з’єднання"
 
-#: ../cli/src/connections.c:1014 ../cli/src/connections.c:1882
-#: ../cli/src/connections.c:1981 ../cli/src/connections.c:2072
-#: ../cli/src/devices.c:1014 ../cli/src/devices.c:1076
-#: ../cli/src/devices.c:1229 ../cli/src/devices.c:1358
-#: ../cli/src/devices.c:1577
+#: ../cli/src/connections.c:1060 ../cli/src/connections.c:1720
+#: ../cli/src/connections.c:1832 ../cli/src/connections.c:1923
+#: ../cli/src/devices.c:852 ../cli/src/devices.c:914 ../cli/src/devices.c:1080
+#: ../cli/src/devices.c:1213 ../cli/src/devices.c:1632
+#: ../cli/src/devices.c:1860 ../cli/src/network-manager.c:311
 #, c-format
 msgid "Error: Can't find out if NetworkManager is running: %s."
 msgstr "Помилка: не вдалося визначити, чи працює NetworkManager: %s."
 
-#: ../cli/src/connections.c:1018 ../cli/src/connections.c:1886
-#: ../cli/src/connections.c:1985 ../cli/src/connections.c:2076
-#: ../cli/src/devices.c:1018 ../cli/src/devices.c:1080
-#: ../cli/src/devices.c:1233 ../cli/src/devices.c:1362
-#: ../cli/src/devices.c:1581
+#: ../cli/src/connections.c:1064 ../cli/src/connections.c:1724
+#: ../cli/src/connections.c:1836 ../cli/src/connections.c:1927
+#: ../cli/src/devices.c:856 ../cli/src/devices.c:918 ../cli/src/devices.c:1084
+#: ../cli/src/devices.c:1217 ../cli/src/devices.c:1636
+#: ../cli/src/devices.c:1864 ../cli/src/network-manager.c:315
 #, c-format
 msgid "Error: NetworkManager is not running."
 msgstr "Помилка: NetworkManager не працює."
 
-#: ../cli/src/connections.c:1050
+#: ../cli/src/connections.c:1096
 msgid "Active connections"
 msgstr "Активні з’єднання"
 
-#: ../cli/src/connections.c:1075
+#: ../cli/src/connections.c:1121
 #, c-format
-#| msgid "Error: %s - no such connection."
 msgid "Error: '%s' is not an active connection."
 msgstr "Помилка: «%s» не є активним з’єднанням."
 
-#: ../cli/src/connections.c:1080
+#: ../cli/src/connections.c:1126
 #, c-format
-#| msgid "Unknown parameter: %s\n"
 msgid "Error: unknown parameter: %s"
 msgstr "Помилка: невідомий параметр: %s"
 
-#: ../cli/src/connections.c:1564
+#: ../cli/src/connections.c:1233
 #, c-format
 msgid "no active connection on device '%s'"
 msgstr "на пристрої «%s» немає активних з’єднань"
 
-#: ../cli/src/connections.c:1572
+#: ../cli/src/connections.c:1241
 #, c-format
 msgid "no active connection or device"
 msgstr "немає активних з’єднань або пристроїв"
 
-#: ../cli/src/connections.c:1643
+#: ../cli/src/connections.c:1312
 #, c-format
 msgid "device '%s' not compatible with connection '%s'"
 msgstr "пристрій «%s» несумісний зі з’єднанням «%s»"
 
-#: ../cli/src/connections.c:1645
+#: ../cli/src/connections.c:1314
 #, c-format
 msgid "no device found for connection '%s'"
 msgstr "не виявлено пристрою для з’єднання «%s»"
 
-#: ../cli/src/connections.c:1656
+#: ../cli/src/connections.c:1325
 msgid "unknown reason"
 msgstr "невідома причина"
 
-#: ../cli/src/connections.c:1658
+#: ../cli/src/connections.c:1327
 msgid "none"
 msgstr "немає"
 
-#: ../cli/src/connections.c:1660
+#: ../cli/src/connections.c:1329
 msgid "the user was disconnected"
 msgstr "користувача від’єднано"
 
-#: ../cli/src/connections.c:1662
+#: ../cli/src/connections.c:1331
 msgid "the base network connection was interrupted"
 msgstr "основне з’єднання з мережею розірвано"
 
-#: ../cli/src/connections.c:1664
+#: ../cli/src/connections.c:1333
 msgid "the VPN service stopped unexpectedly"
 msgstr "служба VPN неочікувано завершила роботу"
 
-#: ../cli/src/connections.c:1666
+#: ../cli/src/connections.c:1335
 msgid "the VPN service returned invalid configuration"
 msgstr "службою VPN повернуто неприпустимі налаштування"
 
-#: ../cli/src/connections.c:1668
+#: ../cli/src/connections.c:1337
 msgid "the connection attempt timed out"
 msgstr "перевищено час очікування на встановлення з’єднання"
 
-#: ../cli/src/connections.c:1670
+#: ../cli/src/connections.c:1339
 msgid "the VPN service did not start in time"
 msgstr "службу VPN не було вчасно запущено"
 
-#: ../cli/src/connections.c:1672
+#: ../cli/src/connections.c:1341
 msgid "the VPN service failed to start"
 msgstr "не вдалося запустити службу VPN"
 
-#: ../cli/src/connections.c:1674
+#: ../cli/src/connections.c:1343
 msgid "no valid VPN secrets"
 msgstr "не виявлено коректних реєстраційних даних VPN"
 
-#: ../cli/src/connections.c:1676
+#: ../cli/src/connections.c:1345
 msgid "invalid VPN secrets"
 msgstr "некоректні реєстраційні дані VPN"
 
-#: ../cli/src/connections.c:1678
+#: ../cli/src/connections.c:1347
 msgid "the connection was removed"
 msgstr "з’єднання було вилучено"
 
-#: ../cli/src/connections.c:1692
-#, c-format
-msgid "state: %s\n"
-msgstr "стан: %s\n"
-
-#: ../cli/src/connections.c:1695 ../cli/src/connections.c:1721
+#: ../cli/src/connections.c:1364 ../cli/src/connections.c:1569
 #, c-format
-msgid "Connection activated\n"
-msgstr "З’єднання активовано\n"
+msgid "Connection successfully activated (D-Bus active path: %s)\n"
+msgstr "З’єднання успішно задіяно (активний шлях D-Bus: %s)\n"
 
-#: ../cli/src/connections.c:1698
+#. Active connection failed and dissapeared, quit.
+#: ../cli/src/connections.c:1369 ../cli/src/connections.c:1470
 #, c-format
 msgid "Error: Connection activation failed."
 msgstr "Помилка: невдала спроба активації з’єднання."
 
-#: ../cli/src/connections.c:1717
+#: ../cli/src/connections.c:1394
 #, c-format
-msgid "state: %s (%d)\n"
-msgstr "стан: %s (%d)\n"
+msgid "VPN connection successfully activated (D-Bus active path: %s)\n"
+msgstr "З’єднання VPN успішно задіяно (активний шлях D-Bus: %s)\n"
 
-#: ../cli/src/connections.c:1727
+#: ../cli/src/connections.c:1402
 #, c-format
 msgid "Error: Connection activation failed: %s."
 msgstr "Помилка: не вдалося активувати з’єднання: %s."
 
-#: ../cli/src/connections.c:1744 ../cli/src/devices.c:1136
+#: ../cli/src/connections.c:1499 ../cli/src/devices.c:974
 #, c-format
 msgid "Error: Timeout %d sec expired."
 msgstr "Помилка: перевищено час очікування у %d с."
 
-#: ../cli/src/connections.c:1757
+#: ../cli/src/connections.c:1560
 #, c-format
 msgid "Error: Connection activation failed: %s"
 msgstr "Помилка: не вдалося активувати з’єднання: %s"
 
-#: ../cli/src/connections.c:1763
-#, c-format
-msgid "Active connection state: %s\n"
-msgstr "Стан активного з’єднання: %s\n"
-
-#: ../cli/src/connections.c:1764
-#, c-format
-msgid "Active connection path: %s\n"
-msgstr "Адреса активного з’єднання: %s\n"
-
-#: ../cli/src/connections.c:1816 ../cli/src/connections.c:1957
-#: ../cli/src/connections.c:2085
+#: ../cli/src/connections.c:1654 ../cli/src/connections.c:1808
+#: ../cli/src/connections.c:1936
 #, c-format
 msgid "Error: Unknown connection: %s."
 msgstr "Помилка: невідоме з’єднання: %s."
 
-#: ../cli/src/connections.c:1862 ../cli/src/devices.c:1208
+#: ../cli/src/connections.c:1700 ../cli/src/devices.c:1059
+#: ../cli/src/devices.c:1605
 #, c-format
 msgid "Error: timeout value '%s' is not valid."
 msgstr "Помилка: значення часу очікування «%s» є некоректним."
 
-#: ../cli/src/connections.c:1875 ../cli/src/connections.c:1974
-#: ../cli/src/connections.c:2065
+#: ../cli/src/connections.c:1713 ../cli/src/connections.c:1825
+#: ../cli/src/connections.c:1916
 #, c-format
 msgid "Error: id or uuid has to be specified."
 msgstr "Помилка: мало бути вказано id або uuid."
 
-#: ../cli/src/connections.c:1903
+#: ../cli/src/connections.c:1745
 #, c-format
 msgid "Error: No suitable device found: %s."
 msgstr "Помилка: не знайдено відповідних пристроїв: %s."
 
-#: ../cli/src/connections.c:1905
+#: ../cli/src/connections.c:1747
 #, c-format
 msgid "Error: No suitable device found."
 msgstr "Помилка: не знайдено відповідних пристроїв."
 
-#: ../cli/src/connections.c:2010
+#: ../cli/src/connections.c:1861
 #, c-format
 msgid "Warning: Connection not active\n"
 msgstr "Помилка: з’єднання не є активним\n"
 
-#: ../cli/src/connections.c:2024
+#: ../cli/src/connections.c:1875
 #, c-format
-#| msgid "Error: Connection activation failed: %s"
 msgid "Error: Connection deletion failed: %s"
 msgstr "Помилка: не вдалося вилучити з’єднання: %s"
 
-#: ../cli/src/connections.c:2142
+#: ../cli/src/connections.c:1993
 #, c-format
 msgid "Error: 'con' command '%s' is not valid."
 msgstr "Помилка: команда «con» «%s» є некоректною."
 
-#: ../cli/src/connections.c:2207
+#: ../cli/src/connections.c:2061
 #, c-format
 msgid "Error: could not connect to D-Bus."
 msgstr "Помилка: не вдалося встановити з’єднання з D-Bus."
 
-#: ../cli/src/connections.c:2215
+#: ../cli/src/connections.c:2069
 #, c-format
 msgid "Error: Could not get system settings."
 msgstr "Помилка: не вдалося отримати параметри системи."
 
-#: ../cli/src/connections.c:2225
+#: ../cli/src/connections.c:2079
 #, c-format
 msgid "Error: Can't obtain connections: settings service is not running."
 msgstr ""
@@ -618,755 +861,569 @@ msgstr ""
 #. 0
 #. 9
 #. 3
-#: ../cli/src/devices.c:65 ../cli/src/devices.c:101 ../cli/src/devices.c:179
-#: ../cli/src/devices.c:195
+#: ../cli/src/devices.c:70 ../cli/src/devices.c:106 ../cli/src/devices.c:187
+#: ../cli/src/devices.c:203
 msgid "DEVICE"
 msgstr "ПРИСТРІЙ"
 
 #. 0
-#: ../cli/src/devices.c:78
+#: ../cli/src/devices.c:83
 msgid "CAPABILITIES"
 msgstr "МОЖЛИВОСТІ"
 
 #. 1
-#: ../cli/src/devices.c:79
+#: ../cli/src/devices.c:84
 msgid "WIFI-PROPERTIES"
 msgstr "ПАРАМЕТРИ WIFI"
 
 #. 2
-#: ../cli/src/devices.c:80
+#: ../cli/src/devices.c:85
 msgid "AP"
 msgstr "ТД"
 
 #. 3
-#: ../cli/src/devices.c:81
+#: ../cli/src/devices.c:86
 msgid "WIRED-PROPERTIES"
 msgstr "ПАРАМЕТРИ WIRED"
 
 #. 4
-#: ../cli/src/devices.c:82
+#: ../cli/src/devices.c:87
 msgid "WIMAX-PROPERTIES"
 msgstr "ПАРАМЕТРИ WIMAX"
 
 #. 5
 #. 0
-#: ../cli/src/devices.c:83 ../cli/src/devices.c:192
+#: ../cli/src/devices.c:88 ../cli/src/devices.c:200
 msgid "NSP"
 msgstr "NSP"
 
 #. 6
-#: ../cli/src/devices.c:84
-#| msgid "IP4-DNS"
+#: ../cli/src/devices.c:89
 msgid "IP4"
 msgstr "IP4"
 
 #. 7
-#: ../cli/src/devices.c:85
+#: ../cli/src/devices.c:90
 msgid "DHCP4"
 msgstr "DHCP4"
 
 #. 8
-#: ../cli/src/devices.c:86
-#| msgid "IP6-DNS"
+#: ../cli/src/devices.c:91
 msgid "IP6"
 msgstr "IP6"
 
 #. 9
-#: ../cli/src/devices.c:87
+#: ../cli/src/devices.c:92
 msgid "DHCP6"
 msgstr "DHCP6"
 
 #. 2
-#: ../cli/src/devices.c:103
+#: ../cli/src/devices.c:108
 msgid "VENDOR"
 msgstr "ВИРОБНИК"
 
 #. 3
-#: ../cli/src/devices.c:104
+#: ../cli/src/devices.c:109
 msgid "PRODUCT"
 msgstr "ПРОДУКТ"
 
 #. 4
-#: ../cli/src/devices.c:105
+#: ../cli/src/devices.c:110
 msgid "DRIVER"
 msgstr "ДРАЙВЕР"
 
 #. 5
-#: ../cli/src/devices.c:106
+#: ../cli/src/devices.c:111
+#| msgid "VERSION"
+msgid "DRIVER-VERSION"
+msgstr "ВЕРСІЯ-ДРАЙВЕРА"
+
+#. 6
+#: ../cli/src/devices.c:112
+#| msgid "FIRMWARE-MISSING"
+msgid "FIRMWARE-VERSION"
+msgstr "ВЕРСІЯ-МІКРОПРОГРАМИ"
+
+#. 7
+#: ../cli/src/devices.c:113
 msgid "HWADDR"
 msgstr "АП.АДРЕСА"
 
-#. 7
-#: ../cli/src/devices.c:108
-#| msgid "READONLY"
+#. 9
+#: ../cli/src/devices.c:115
 msgid "REASON"
 msgstr "ПРИЧИНА"
 
-#. 8
-#: ../cli/src/devices.c:109
+#. 10
+#: ../cli/src/devices.c:116
 msgid "UDI"
 msgstr "UDI"
 
-#. 9
-#: ../cli/src/devices.c:110
+#. 11
+#: ../cli/src/devices.c:117
 msgid "IP-IFACE"
 msgstr "IP-IFACE"
 
-#. 10
-#: ../cli/src/devices.c:111
+#. 12
+#: ../cli/src/devices.c:118
 msgid "NM-MANAGED"
 msgstr "КЕРОВАНЕ-NM"
 
-#. 11
-#: ../cli/src/devices.c:112
+#. 14
+#: ../cli/src/devices.c:120
 msgid "FIRMWARE-MISSING"
 msgstr "ПОТРІБНИЙ-МІКРОКОД"
 
-#. 12
-#: ../cli/src/devices.c:113
-#| msgid "AUTOCONNECT"
+#. 15
+#: ../cli/src/devices.c:121
 msgid "CONNECTION"
 msgstr "З’ЄДНАННЯ"
 
 #. 0
-#: ../cli/src/devices.c:122
+#: ../cli/src/devices.c:130
 msgid "CARRIER-DETECT"
 msgstr "ВИЗН.НОСІЯ"
 
 #. 1
-#: ../cli/src/devices.c:123
+#: ../cli/src/devices.c:131
 msgid "SPEED"
 msgstr "ШВИДКІСТЬ"
 
 #. 0
-#: ../cli/src/devices.c:132
+#: ../cli/src/devices.c:140
 msgid "CARRIER"
 msgstr "НОСІЙ"
 
-#. 0
-#: ../cli/src/devices.c:142
-msgid "WEP"
-msgstr "WEP"
-
-#. 1
-#: ../cli/src/devices.c:143
-msgid "WPA"
-msgstr "WPA"
-
-#. 2
-#: ../cli/src/devices.c:144
-msgid "WPA2"
-msgstr "WPA2"
-
-#. 3
-#: ../cli/src/devices.c:145
-msgid "TKIP"
-msgstr "TKIP"
-
-#. 4
-#: ../cli/src/devices.c:146
-msgid "CCMP"
-msgstr "CCMP"
-
-#. 0
-#: ../cli/src/devices.c:156
-msgid "CTR-FREQ"
-msgstr "CTR-FREQ"
-
-#. 1
-#: ../cli/src/devices.c:157
-msgid "RSSI"
-msgstr "RSSI"
-
-#. 2
-#: ../cli/src/devices.c:158
-msgid "CINR"
-msgstr "CINR"
-
-#. 3
-#: ../cli/src/devices.c:159
-msgid "TX-POW"
-msgstr "TX-POW"
-
-#. 4
-#: ../cli/src/devices.c:160
-msgid "BSID"
-msgstr "BSID"
-
-#. 0
-#: ../cli/src/devices.c:170
-msgid "SSID"
-msgstr "SSID"
-
-#. 1
-#: ../cli/src/devices.c:171
-msgid "BSSID"
-msgstr "BSSID"
-
-#. 2
-#: ../cli/src/devices.c:172
-msgid "MODE"
-msgstr "РЕЖИМ"
-
-#. 3
-#: ../cli/src/devices.c:173
-msgid "FREQ"
-msgstr "ЧАСТОТА"
-
-#. 4
-#: ../cli/src/devices.c:174
-msgid "RATE"
-msgstr "ШВИДКІСТЬ"
-
-#. 5
-#. 1
-#: ../cli/src/devices.c:175 ../cli/src/devices.c:193
-msgid "SIGNAL"
-msgstr "СИГНАЛ"
-
-#. 6
-#: ../cli/src/devices.c:176
-msgid "SECURITY"
-msgstr "ЗАХИСТ"
-
-#. 7
-#: ../cli/src/devices.c:177
-msgid "WPA-FLAGS"
-msgstr "ПРАПОРЦІ WPA"
-
-#. 8
-#: ../cli/src/devices.c:178
-msgid "RSN-FLAGS"
-msgstr "ПРАПОРЦІ RSN"
-
-#. 10
-#. 4
-#: ../cli/src/devices.c:180 ../cli/src/devices.c:196
-msgid "ACTIVE"
-msgstr "АКТИВНИЙ"
-
-#: ../cli/src/devices.c:213
-#, 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 ]\n"
-#| "  disconnect iface  [--nowait] [--timeout ]\n"
-#| "  wifi [list [iface ] [hwaddr ]]\n"
-#| "  wimax [list [iface ] [nsp ]]\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 ]\n"
-"  disconnect iface  [--nowait] [--timeout ]\n"
-"  wifi [list [iface ] [bssid ]]\n"
-"  wimax [list [iface ] [nsp ]]\n"
-"\n"
-msgstr ""
-"Використання: nmcli dev { КОМАНДА | help }\n"
-"\n"
-"  КОМАНДА := { status | list | disconnect | wifi | wimax }\n"
-"\n"
-"  КОМАНДА := { status | list | disconnect | wifi }\n"
-"\n"
-"  status\n"
-"  list [iface <інтерфейс>]\n"
-"  disconnect iface <інтерфейс> [--nowait] [--timeout <очікування>]\n"
-"  wifi [list [iface <інтерфейс>] [bssid ]]\n"
-"  wimax [list [iface <інтерфейс>] [nsp <назва>]]\n"
-"\n"
-
-#: ../cli/src/devices.c:241
-msgid "unmanaged"
-msgstr "некерований"
-
-#: ../cli/src/devices.c:243
-msgid "unavailable"
-msgstr "недоступний"
-
-#: ../cli/src/devices.c:245 ../cli/src/network-manager.c:108
-msgid "disconnected"
-msgstr "роз'єднано"
-
-#: ../cli/src/devices.c:247
-msgid "connecting (prepare)"
-msgstr "з’єднання (приготування)"
-
-#: ../cli/src/devices.c:249
-msgid "connecting (configuring)"
-msgstr "з’єднання (налаштовування)"
-
-#: ../cli/src/devices.c:251
-msgid "connecting (need authentication)"
-msgstr "з’єднання (потрібне розпізнавання)"
-
-#: ../cli/src/devices.c:253
-msgid "connecting (getting IP configuration)"
-msgstr "з’єднання (отримання налаштувань IP)"
-
-#: ../cli/src/devices.c:255
-msgid "connecting (checking IP connectivity)"
-msgstr "з’єднання (перевірка можливості з’єднання)"
-
-#: ../cli/src/devices.c:257
-msgid "connecting (starting secondary connections)"
-msgstr "з’єднання (встановлення другорядних з’єднань)"
-
-#: ../cli/src/devices.c:259 ../cli/src/network-manager.c:104
-msgid "connected"
-msgstr "з'єднано"
-
-#: ../cli/src/devices.c:263
-msgid "connection failed"
-msgstr "невдала спроба з’єднання"
-
-#: ../cli/src/devices.c:274
-msgid "No reason given"
-msgstr "Причину не вказано"
-
-#: ../cli/src/devices.c:277
-#| msgid "Unknown"
-msgid "Unknown error"
-msgstr "Невідома помилка"
-
-#: ../cli/src/devices.c:280
-msgid "Device is now managed"
-msgstr "Тепер пристрій є керованим"
-
-#: ../cli/src/devices.c:283
-msgid "Device is now unmanaged"
-msgstr "Тепер пристрій є некерованим"
-
-#: ../cli/src/devices.c:286
-#| msgid "the VPN service returned invalid configuration"
-msgid "The device could not be readied for configuration"
-msgstr "Пристрій не може бути приготовано до налаштовування"
-
-#: ../cli/src/devices.c:289
-msgid ""
-"IP configuration could not be reserved (no available address, timeout, etc)"
-msgstr ""
-"Налаштування IP не можна резервувати (немає доступних адрес, часу очікування "
-"тощо)"
-
-#: ../cli/src/devices.c:292
-msgid "The IP configuration is no longer valid"
-msgstr "Налаштування IP вже не є коректними"
-
-#: ../cli/src/devices.c:295
-msgid "Secrets were required, but not provided"
-msgstr "Потрібні були реєстраційні дані, яких не було надано"
-
-#: ../cli/src/devices.c:298
-msgid "802.1X supplicant disconnected"
-msgstr "Допоміжну програму 802.1X від’єднано"
-
-#: ../cli/src/devices.c:301
-msgid "802.1X supplicant configuration failed"
-msgstr "Спроба налаштувати допоміжну програму 802.1X завершилася невдало"
-
-#: ../cli/src/devices.c:304
-msgid "802.1X supplicant failed"
-msgstr "Помилка допоміжної програми 802.1X"
-
-#: ../cli/src/devices.c:307
-msgid "802.1X supplicant took too long to authenticate"
-msgstr ""
-"Розпізнавання за допомогою допоміжної програми 802.1X триває занадто довго"
-
-#: ../cli/src/devices.c:310
-#| msgid "the VPN service failed to start"
-msgid "PPP service failed to start"
-msgstr "Не вдалося запустити службу PPP"
-
-#: ../cli/src/devices.c:313
-#| msgid "VPN disconnected"
-msgid "PPP service disconnected"
-msgstr "Службу PPP від’єднано"
-
-#: ../cli/src/devices.c:316
-msgid "PPP failed"
-msgstr "помилка PPP"
-
-#: ../cli/src/devices.c:319
-#| msgid "the VPN service failed to start"
-msgid "DHCP client failed to start"
-msgstr "Не вдалося запустити клієнтську програму DHCP"
-
-#: ../cli/src/devices.c:322
-msgid "DHCP client error"
-msgstr "помилка клієнтської програми DHCP"
-
-#: ../cli/src/devices.c:325
-#| msgid "VPN connection failed"
-msgid "DHCP client failed"
-msgstr "критична помилка клієнтської програми DHCP"
-
-#: ../cli/src/devices.c:328
-#| msgid "the VPN service failed to start"
-msgid "Shared connection service failed to start"
-msgstr "Не вдалося запустити службу спільного використання з’єднання"
-
-#: ../cli/src/devices.c:331
-#| msgid "connection failed"
-msgid "Shared connection service failed"
-msgstr "Критична помилка служби спільного використання з’єднання"
-
-#: ../cli/src/devices.c:334
-#| msgid "the VPN service failed to start"
-msgid "AutoIP service failed to start"
-msgstr "Не вдалося запустити службу AutoIP"
-
-#: ../cli/src/devices.c:337
-msgid "AutoIP service error"
-msgstr "Помилка служби AutoIP"
-
-#: ../cli/src/devices.c:340
-#| msgid "the VPN service failed to start"
-msgid "AutoIP service failed"
-msgstr "Помилка служби AutoIP"
-
-#: ../cli/src/devices.c:343
-msgid "The line is busy"
-msgstr "Лінію зайнято"
-
-#: ../cli/src/devices.c:346
-msgid "No dial tone"
-msgstr "Немає гудка"
-
-#: ../cli/src/devices.c:349
-msgid "No carrier could be established"
-msgstr "Не вдалося визначити носій сигналу"
-
-#: ../cli/src/devices.c:352
-msgid "The dialing request timed out"
-msgstr "Перевищено час очікування на підтвердження запиту щодо набору номера"
-
-#: ../cli/src/devices.c:355
-msgid "The dialing attempt failed"
-msgstr "Спроба набирання номера завершилася невдало"
-
-#: ../cli/src/devices.c:358
-#| msgid "Error: Connection activation failed."
-msgid "Modem initialization failed"
-msgstr "Не вдалося ініціалізувати модем"
-
-#: ../cli/src/devices.c:361
-#| msgid "Failed to decrypt the private key."
-msgid "Failed to select the specified APN"
-msgstr "Не вдалося вибрати вказаний APN"
-
-#: ../cli/src/devices.c:364
-msgid "Not searching for networks"
-msgstr "Пошук мереж не виконується"
+#. 0
+#: ../cli/src/devices.c:150
+msgid "WEP"
+msgstr "WEP"
 
-#: ../cli/src/devices.c:367
-#| msgid "Networking enabled"
-msgid "Network registration denied"
-msgstr "Реєстрацію у мережі заборонено"
+#. 1
+#: ../cli/src/devices.c:151
+msgid "WPA"
+msgstr "WPA"
 
-#: ../cli/src/devices.c:370
-msgid "Network registration timed out"
-msgstr "Перевищено час очікування на реєстрацію у мережі"
+#. 2
+#: ../cli/src/devices.c:152
+msgid "WPA2"
+msgstr "WPA2"
 
-#: ../cli/src/devices.c:373
-msgid "Failed to register with the requested network"
-msgstr "Не вдалося зареєструватися у потрібній мережі"
+#. 3
+#: ../cli/src/devices.c:153
+msgid "TKIP"
+msgstr "TKIP"
 
-#: ../cli/src/devices.c:376
-#| msgid "VPN connection failed"
-msgid "PIN check failed"
-msgstr "Помилка під час спроби перевірити PIN-код"
+#. 4
+#: ../cli/src/devices.c:154
+msgid "CCMP"
+msgstr "CCMP"
 
-#: ../cli/src/devices.c:379
-msgid "Necessary firmware for the device may be missing"
-msgstr "Можливо, не вистачає потрібної для роботи пристрою мікропрограми"
+#. 0
+#: ../cli/src/devices.c:164
+msgid "CTR-FREQ"
+msgstr "CTR-FREQ"
 
-#: ../cli/src/devices.c:382
-#| msgid "the connection was removed"
-msgid "The device was removed"
-msgstr "Пристрій вилучено"
+#. 1
+#: ../cli/src/devices.c:165
+msgid "RSSI"
+msgstr "RSSI"
 
-#: ../cli/src/devices.c:385
-#| msgid "NetworkManager status"
-msgid "NetworkManager went to sleep"
-msgstr "NetworkManager переведено у режим сну"
+#. 2
+#: ../cli/src/devices.c:166
+msgid "CINR"
+msgstr "CINR"
 
-#: ../cli/src/devices.c:388
-#| msgid "no active connection or device"
-msgid "The device's active connection disappeared"
-msgstr "Активне з’єднання з пристроєм зникло"
+#. 3
+#: ../cli/src/devices.c:167
+msgid "TX-POW"
+msgstr "TX-POW"
 
-#: ../cli/src/devices.c:391
-msgid "Device disconnected by user or client"
-msgstr "Пристрій роз’єднано з боку користувача або клієнтської програми"
+#. 4
+#: ../cli/src/devices.c:168
+msgid "BSID"
+msgstr "BSID"
 
-#: ../cli/src/devices.c:394
-msgid "Carrier/link changed"
-msgstr "Змінено носій або зв’язок"
+#. 0
+#: ../cli/src/devices.c:178
+msgid "SSID"
+msgstr "SSID"
 
-#: ../cli/src/devices.c:397
-#| msgid "the connection was removed"
-msgid "The device's existing connection was assumed"
-msgstr ""
-"Зроблено припущення щодо використання вже встановленого з’єднання з пристроєм"
+#. 1
+#: ../cli/src/devices.c:179
+msgid "BSSID"
+msgstr "BSSID"
 
-#: ../cli/src/devices.c:400
-msgid "The supplicant is now available"
-msgstr "Відкрито доступ до допоміжної програми"
+#. 2
+#: ../cli/src/devices.c:180
+msgid "MODE"
+msgstr "РЕЖИМ"
 
-#: ../cli/src/devices.c:403
-#| msgid "'dhcpcd' could be found."
-msgid "The modem could not be found"
-msgstr "Не вдалося виявити модем"
+#. 3
+#: ../cli/src/devices.c:181
+msgid "FREQ"
+msgstr "ЧАСТОТА"
 
-#: ../cli/src/devices.c:406
-#| msgid "the connection attempt timed out"
-msgid "The Bluetooth connection failed or timed out"
-msgstr ""
-"Помилка з’єднання Bluetooth або перевищення часу очікування на передавання "
-"даних з’єднанням"
+#. 4
+#: ../cli/src/devices.c:182
+msgid "RATE"
+msgstr "ШВИДКІСТЬ"
 
-#: ../cli/src/devices.c:409
-msgid "GSM Modem's SIM card not inserted"
-msgstr "До модема GSM не вставлено SIM-картки"
+#. 5
+#. 1
+#: ../cli/src/devices.c:183 ../cli/src/devices.c:201
+msgid "SIGNAL"
+msgstr "СИГНАЛ"
 
-#: ../cli/src/devices.c:412
-msgid "GSM Modem's SIM PIN required"
-msgstr "Слід вказати PIN-код SIM-картки у модемі GSM"
+#. 6
+#: ../cli/src/devices.c:184
+msgid "SECURITY"
+msgstr "ЗАХИСТ"
 
-#: ../cli/src/devices.c:415
-msgid "GSM Modem's SIM PUK required"
-msgstr "Слід вказати код розпізнавання (PUK) SIM-картки у модемі GSM"
+#. 7
+#: ../cli/src/devices.c:185
+msgid "WPA-FLAGS"
+msgstr "ПРАПОРЦІ WPA"
 
-#: ../cli/src/devices.c:418
-msgid "GSM Modem's SIM wrong"
-msgstr "Помилкова SIM-картка у модемі GSM"
+#. 8
+#: ../cli/src/devices.c:186
+msgid "RSN-FLAGS"
+msgstr "ПРАПОРЦІ RSN"
 
-#: ../cli/src/devices.c:421
-msgid "InfiniBand device does not support connected mode"
-msgstr "У пристрої InfiniBand не передбачено режиму з’єднання"
+#. 10
+#. 4
+#: ../cli/src/devices.c:188 ../cli/src/devices.c:204
+msgid "ACTIVE"
+msgstr "АКТИВНИЙ"
 
-#: ../cli/src/devices.c:423 ../cli/src/devices.c:446 ../cli/src/devices.c:458
-#: ../cli/src/devices.c:578 ../cli/src/devices.c:622
-msgid "Unknown"
-msgstr "Невідомо"
+#: ../cli/src/devices.c:223
+#, 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 ]\n"
+#| "  disconnect iface  [--nowait] [--timeout ]\n"
+#| "  wifi [list [iface ] [bssid ]]\n"
+#| "  wimax [list [iface ] [nsp ]]\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 ]\n"
+"  disconnect iface  [--nowait] [--timeout ]\n"
+"  wifi [list [iface ] [bssid ]]\n"
+"  wifi connect <(B)SSID> [password ] [wep-key-type key|phrase] "
+"[iface ] [bssid ] [name ]\n"
+"               [--private] [--nowait] [--timeout ]\n"
+"  wimax [list [iface ] [nsp ]]\n"
+"\n"
+msgstr ""
+"Використання: nmcli dev { КОМАНДА | help }\n"
+"\n"
+"  КОМАНДА := { status | list | disconnect | wifi | wimax }\n"
+"\n"
+"  КОМАНДА := { status | list | disconnect | wifi }\n"
+"\n"
+"  status\n"
+"  list [iface <інтерфейс>]\n"
+"  disconnect iface <інтерфейс> [--nowait] [--timeout <очікування>]\n"
+"  wifi [list [iface <інтерфейс>] [bssid ]]\n"
+"  wifi connect <(B)SSID> [password <пароль>] [wep-key-type key|phrase] "
+"[iface <інтерфейс>] [bssid ] [name <назва>]\n"
+"               [--private] [--nowait] [--timeout <час очікування>]\n"
+"  wimax [list [iface <інтерфейс>] [nsp <назва>]]\n"
+"\n"
 
-#: ../cli/src/devices.c:491
+#: ../cli/src/devices.c:323
 msgid "(none)"
 msgstr "(немає)"
 
-#: ../cli/src/devices.c:547
+#: ../cli/src/devices.c:379
 #, c-format
 msgid "%u MHz"
 msgstr "%u МГц"
 
-#: ../cli/src/devices.c:548
+#: ../cli/src/devices.c:380
 #, c-format
 msgid "%u MB/s"
 msgstr "%u МБ/с"
 
-#: ../cli/src/devices.c:557
+#: ../cli/src/devices.c:389
 msgid "Encrypted: "
 msgstr "Зашифровано: "
 
-#: ../cli/src/devices.c:562
+#: ../cli/src/devices.c:394
 msgid "WEP "
 msgstr "WEP "
 
-#: ../cli/src/devices.c:564
+#: ../cli/src/devices.c:396
 msgid "WPA "
 msgstr "WPA "
 
-#: ../cli/src/devices.c:566
+#: ../cli/src/devices.c:398
 msgid "WPA2 "
 msgstr "WPA2 "
 
-#: ../cli/src/devices.c:569
+#: ../cli/src/devices.c:401
 msgid "Enterprise "
 msgstr "Enterprise "
 
-#: ../cli/src/devices.c:578
+#: ../cli/src/devices.c:410
 msgid "Ad-Hoc"
 msgstr "Ad-Hoc"
 
-#: ../cli/src/devices.c:578
+#: ../cli/src/devices.c:410
 msgid "Infrastructure"
 msgstr "Інфраструктура"
 
-#: ../cli/src/devices.c:613
+#: ../cli/src/devices.c:445
 msgid "Home"
 msgstr "Домівка"
 
-#: ../cli/src/devices.c:616
+#: ../cli/src/devices.c:448
 msgid "Partner"
 msgstr "Партнер"
 
-#: ../cli/src/devices.c:619
+#: ../cli/src/devices.c:451
 msgid "Roaming"
 msgstr "Роумінг"
 
-#: ../cli/src/devices.c:691
+#: ../cli/src/devices.c:523
 #, c-format
 msgid "Error: 'dev list': %s"
 msgstr "Помилка: «dev list»: %s"
 
-#: ../cli/src/devices.c:693
+#: ../cli/src/devices.c:525
 #, c-format
 msgid "Error: 'dev list': %s; allowed fields: %s"
 msgstr "Помилка: «dev list»: %s; дозволені поля: %s"
 
-#: ../cli/src/devices.c:702
+#: ../cli/src/devices.c:534
 msgid "Device details"
 msgstr "Дані щодо пристрою"
 
-#: ../cli/src/devices.c:744 ../cli/src/devices.c:745 ../cli/src/devices.c:1152
-#: ../cli/src/utils.c:445
+#: ../cli/src/devices.c:579 ../cli/src/devices.c:582 ../cli/src/devices.c:1000
+#: ../cli/src/utils.c:477
 msgid "(unknown)"
 msgstr "(невідомо)"
 
-#: ../cli/src/devices.c:753
-#| msgid "connected"
+#: ../cli/src/devices.c:591
 msgid "not connected"
 msgstr "не з’єднано"
 
-#: ../cli/src/devices.c:780
+#: ../cli/src/devices.c:618
 #, c-format
 msgid "%u Mb/s"
 msgstr "%u Мб/с"
 
 #. Print header
 #. "WIRED-PROPERTIES"
-#: ../cli/src/devices.c:853
+#: ../cli/src/devices.c:691
 msgid "on"
 msgstr "увімкн."
 
-#: ../cli/src/devices.c:853
+#: ../cli/src/devices.c:691
 msgid "off"
 msgstr "вимкн."
 
-#: ../cli/src/devices.c:1004
+#: ../cli/src/devices.c:842
 #, c-format
 msgid "Error: 'dev status': %s"
 msgstr "Помилка: «dev status»: %s"
 
-#: ../cli/src/devices.c:1006
+#: ../cli/src/devices.c:844
 #, c-format
 msgid "Error: 'dev status': %s; allowed fields: %s"
 msgstr "Помилка: «dev status»: %s; дозволені поля: %s"
 
-#: ../cli/src/devices.c:1029
+#: ../cli/src/devices.c:867
 msgid "Status of devices"
 msgstr "Стан пристрою"
 
-#: ../cli/src/devices.c:1060
+#: ../cli/src/devices.c:898
 #, c-format
 msgid "Error: '%s' argument is missing."
 msgstr "Помилка: не вказано аргументу «%s»."
 
-#: ../cli/src/devices.c:1101 ../cli/src/devices.c:1253
-#: ../cli/src/devices.c:1390 ../cli/src/devices.c:1609
+#: ../cli/src/devices.c:939 ../cli/src/devices.c:1104
+#: ../cli/src/devices.c:1245 ../cli/src/devices.c:1892
 #, c-format
 msgid "Error: Device '%s' not found."
 msgstr "Помилка: не знайдено пристрій «%s»."
 
-#: ../cli/src/devices.c:1124
+#: ../cli/src/devices.c:962
 #, c-format
 msgid "Success: Device '%s' successfully disconnected."
 msgstr "Виконано: пристрій «%s» успішно від’єднано."
 
-#: ../cli/src/devices.c:1149
+#: ../cli/src/devices.c:997
 #, c-format
 msgid "Error: Device '%s' (%s) disconnecting failed: %s"
 msgstr "Помилка: невдала спроба від’єднання «%s» (%s): %s"
 
-#: ../cli/src/devices.c:1157
+#: ../cli/src/devices.c:1010
 #, c-format
-msgid "Device state: %d (%s)\n"
-msgstr "Стан пристрою: %d (%s)\n"
+#| msgid "Success: Device '%s' successfully disconnected."
+msgid "Device '%s' has been disconnected.\n"
+msgstr "Пристрій «%s» було від’єднано.\n"
 
-#: ../cli/src/devices.c:1222
+#: ../cli/src/devices.c:1073
 #, c-format
 msgid "Error: iface has to be specified."
 msgstr "Помилка: мало бути вказано інтерфейс."
 
-#: ../cli/src/devices.c:1348
+#: ../cli/src/devices.c:1203
 #, c-format
 msgid "Error: 'dev wifi': %s"
 msgstr "Помилка: «dev wifi»: %s"
 
-#: ../cli/src/devices.c:1350
+#: ../cli/src/devices.c:1205
 #, c-format
 msgid "Error: 'dev wifi': %s; allowed fields: %s"
 msgstr "Помилка: «dev wifi»: %s; дозволені поля: %s"
 
-#: ../cli/src/devices.c:1373
+#: ../cli/src/devices.c:1228
 msgid "WiFi scan list"
 msgstr "Список сканування WiFi"
 
-#: ../cli/src/devices.c:1410 ../cli/src/devices.c:1464
+#: ../cli/src/devices.c:1265 ../cli/src/devices.c:1319
 #, c-format
-#| msgid "Error: Access point with hwaddr '%s' not found."
 msgid "Error: Access point with bssid '%s' not found."
 msgstr "Помилка: не знайдено точки доступу з bssid «%s»."
 
-#: ../cli/src/devices.c:1427
+#: ../cli/src/devices.c:1282
 #, c-format
 msgid "Error: Device '%s' is not a WiFi device."
 msgstr "Помилка: пристрій «%s» не є пристроєм WiFi."
 
-#: ../cli/src/devices.c:1491
+#: ../cli/src/devices.c:1350 ../cli/src/devices.c:1396
+#, c-format
+msgid "Connection with UUID '%s' created and activated on device '%s'\n"
+msgstr "Створено і задіяно з’єднання з UUID «%s» на пристрої «%s»\n"
+
+#: ../cli/src/devices.c:1355
+#, c-format
+#| msgid "Error: Connection activation failed: %s."
+msgid "Error: Connection activation failed: (%d) %s."
+msgstr "Помилка: не вдалося активувати з’єднання: (%d) %s."
+
+#: ../cli/src/devices.c:1380
+#, c-format
+#| msgid "Failed to read configuration: (%d) %s\n"
+msgid "Error: Failed to add/activate new connection: (%d) %s"
+msgstr "Помилка: не вдалося додати або задіяти нове з’єднання: (%d) %s"
+
+#: ../cli/src/devices.c:1388
+#, c-format
+msgid "Error: Failed to add/activate new connection: Unknown error"
+msgstr ""
+"Помилка: не вдалося додати або задіяти нове з’єднання (невідома помилка)"
+
+#: ../cli/src/devices.c:1532
+#, c-format
+#| msgid "Error: %s argument is missing."
+msgid "Error: SSID or BSSID are missing."
+msgstr "Помилка: не вистачає SSID або BSSID."
+
+#: ../cli/src/devices.c:1555
+#, c-format
+#| msgid "Error: timeout value '%s' is not valid."
+msgid "Error: bssid argument value '%s' is not a valid BSSID."
+msgstr "Помилка: значення параметра bssid, «%s», не є коректним BSSID."
+
+#: ../cli/src/devices.c:1579
+#, c-format
+msgid ""
+"Error: wep-key-type argument value '%s' is invalid, use 'key' or 'phrase'."
+msgstr ""
+"Помилка: значення параметра wep-key-type, «%s», є некоректним, слід "
+"використовувати «key» або «phrase»."
+
+#: ../cli/src/devices.c:1619
+#, c-format
+msgid "Error: BSSID to connect to (%s) differs from bssid argument (%s)."
+msgstr ""
+"Помилка: BSSID для з’єднання з (%s) відрізняється від параметра bssid (%s)."
+
+#: ../cli/src/devices.c:1625
+#, c-format
+msgid "Error: Parameter '%s' is neither SSID nor BSSID."
+msgstr "Помилка: параметр «%s» не дорівнює ні SSID, ні BSSID."
+
+#: ../cli/src/devices.c:1654
+#, c-format
+#| msgid "Error: Device '%s' is not a WiFi device."
+msgid "Error: Device '%s' is not a Wi-Fi device."
+msgstr "Помилка: пристрій «%s» не є пристроєм Wi-Fi."
+
+#: ../cli/src/devices.c:1656
+#, c-format
+#| msgid "Error: No suitable device found."
+msgid "Error: No Wi-Fi device found."
+msgstr "Помилка: не знайдено жодного пристрою Wi-Fi."
+
+#: ../cli/src/devices.c:1674
+#, c-format
+#| msgid "Error: NSP with name '%s' not found."
+msgid "Error: No network with SSID '%s' found."
+msgstr "Помилка: не знайдено мережі з SSID «%s»."
+
+#: ../cli/src/devices.c:1676
+#, c-format
+#| msgid "Error: Access point with nsp '%s' not found."
+msgid "Error: No access point with BSSID '%s' found."
+msgstr "Помилка: не знайдено точки доступу з BSSID «%s»."
+
+#: ../cli/src/devices.c:1774
 #, c-format
 msgid "Error: 'dev wifi' command '%s' is not valid."
 msgstr "Помилка: команда «dev wifi» «%s» є некоректною."
 
-#: ../cli/src/devices.c:1567
+#: ../cli/src/devices.c:1850
 #, c-format
 msgid "Error: 'dev wimax': %s"
 msgstr "Помилка: «dev wimax»: %s"
 
-#: ../cli/src/devices.c:1569
+#: ../cli/src/devices.c:1852
 #, c-format
 msgid "Error: 'dev wimax': %s; allowed fields: %s"
 msgstr "Помилка: «dev wimax»: %s; дозволені поля: %s"
 
-#: ../cli/src/devices.c:1592
+#: ../cli/src/devices.c:1875
 msgid "WiMAX NSP list"
 msgstr "Список WiMAX NSP"
 
-#: ../cli/src/devices.c:1629
+#: ../cli/src/devices.c:1912
 #, c-format
 msgid "Error: NSP with name '%s' not found."
 msgstr "Помилка: не знайдено NSP з назвою «%s»."
 
-#: ../cli/src/devices.c:1640
+#: ../cli/src/devices.c:1923
 #, c-format
 msgid "Error: Device '%s' is not a WiMAX device."
 msgstr "Помилка: пристрій «%s» не є пристроєм WiMAX."
 
-#: ../cli/src/devices.c:1671
+#: ../cli/src/devices.c:1954
 #, c-format
-#| msgid "Error: Access point with hwaddr '%s' not found."
 msgid "Error: Access point with nsp '%s' not found."
 msgstr "Помилка: не знайдено точки доступу з nsp «%s»."
 
-#: ../cli/src/devices.c:1698
+#: ../cli/src/devices.c:1981
 #, c-format
 msgid "Error: 'dev wimax' command '%s' is not valid."
 msgstr "Помилка: команда «dev wimax» «%s» є некоректною."
 
-#: ../cli/src/devices.c:1748
+#: ../cli/src/devices.c:2031
 #, c-format
 msgid "Error: 'dev' command '%s' is not valid."
 msgstr "Помилка: команда «dev» «%s» є некоректною."
@@ -1415,16 +1472,42 @@ msgstr "ОБЛАДНАННЯ WIMAX"
 msgid "WIMAX"
 msgstr "WIMAX"
 
-#: ../cli/src/network-manager.c:67
+#: ../cli/src/network-manager.c:62
+#| msgid "VERSION"
+msgid "PERMISSION"
+msgstr "ДОСТУП"
+
+#. 0
+#: ../cli/src/network-manager.c:63
+msgid "VALUE"
+msgstr "ЗНАЧЕННЯ"
+
+#: ../cli/src/network-manager.c:77
 #, 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"
+#| "  enable [true|false]\n"
+#| "  sleep [true|false]\n"
+#| "  wifi [on|off]\n"
+#| "  wwan [on|off]\n"
+#| "  wimax [on|off]\n"
+#| "\n"
 msgid ""
 "Usage: nmcli nm { COMMAND | help }\n"
 "\n"
-"  COMMAND := { status | enable | sleep | wifi | wwan | wimax }\n"
+"  COMMAND := { status | permissions | enable | sleep | wifi | wwan | "
+"wimax }\n"
 "\n"
-"  COMMAND := { status | enable | sleep | wifi | wwan }\n"
+"  COMMAND := { status | permissions | enable | sleep | wifi | wwan }\n"
 "\n"
 "  status\n"
+"  permissions\n"
 "  enable [true|false]\n"
 "  sleep [true|false]\n"
 "  wifi [on|off]\n"
@@ -1434,11 +1517,12 @@ msgid ""
 msgstr ""
 "Використання: nmcli nm { КОМАНДА | help }\n"
 "\n"
-"  КОМАНДА := { status | enable | sleep | wifi | wwan | wimax }\n"
+"  КОМАНДА := { status | permissions | enable | sleep | wifi | wwan | wimax }\n"
 "\n"
-"  КОМАНДА := { status | enable | sleep | wifi | wwan }\n"
+"  КОМАНДА := { status | permissions | enable | sleep | wifi | wwan }\n"
 "\n"
 "  status\n"
+"  permissions\n"
 "  enable [true|false]\n"
 "  sleep [true|false]\n"
 "  wifi [on|off]\n"
@@ -1446,142 +1530,163 @@ msgstr ""
 "  wimax [on|off]\n"
 "\n"
 
-#: ../cli/src/network-manager.c:96
+#: ../cli/src/network-manager.c:108
 msgid "asleep"
 msgstr "приспаний"
 
-#: ../cli/src/network-manager.c:98
+#: ../cli/src/network-manager.c:110
 msgid "connecting"
 msgstr "з’єднується"
 
-#: ../cli/src/network-manager.c:100
+#: ../cli/src/network-manager.c:112
 msgid "connected (local only)"
 msgstr "з’єднується (локально)"
 
-#: ../cli/src/network-manager.c:102
+#: ../cli/src/network-manager.c:114
 msgid "connected (site only)"
 msgstr "з’єднано (на вузлі)"
 
-#: ../cli/src/network-manager.c:106
+#: ../cli/src/network-manager.c:118
 msgid "disconnecting"
 msgstr "роз’єднується"
 
-#: ../cli/src/network-manager.c:146
+#: ../cli/src/network-manager.c:158
 #, c-format
 msgid "Error: 'nm status': %s"
 msgstr "Помилка: «nm status»: %s"
 
-#: ../cli/src/network-manager.c:148
+#: ../cli/src/network-manager.c:160
 #, c-format
 msgid "Error: 'nm status': %s; allowed fields: %s"
 msgstr "Помилка: «nm status»: %s; дозволені поля: %s"
 
 #. create NMClient
-#: ../cli/src/network-manager.c:161 ../cli/src/network-manager.c:162
-#: ../cli/src/network-manager.c:163 ../cli/src/network-manager.c:164
-#: ../cli/src/network-manager.c:165 ../cli/src/network-manager.c:167
-#: ../cli/src/network-manager.c:168 ../cli/src/network-manager.c:289
-#: ../cli/src/network-manager.c:344 ../cli/src/network-manager.c:382
-#: ../cli/src/network-manager.c:421
+#: ../cli/src/network-manager.c:173 ../cli/src/network-manager.c:174
+#: ../cli/src/network-manager.c:175 ../cli/src/network-manager.c:176
+#: ../cli/src/network-manager.c:177 ../cli/src/network-manager.c:179
+#: ../cli/src/network-manager.c:180 ../cli/src/network-manager.c:429
+#: ../cli/src/network-manager.c:484 ../cli/src/network-manager.c:522
+#: ../cli/src/network-manager.c:561
 msgid "enabled"
 msgstr "увімкнено"
 
-#: ../cli/src/network-manager.c:161 ../cli/src/network-manager.c:162
-#: ../cli/src/network-manager.c:163 ../cli/src/network-manager.c:164
-#: ../cli/src/network-manager.c:165 ../cli/src/network-manager.c:167
-#: ../cli/src/network-manager.c:168 ../cli/src/network-manager.c:289
-#: ../cli/src/network-manager.c:344 ../cli/src/network-manager.c:382
-#: ../cli/src/network-manager.c:421
+#: ../cli/src/network-manager.c:173 ../cli/src/network-manager.c:174
+#: ../cli/src/network-manager.c:175 ../cli/src/network-manager.c:176
+#: ../cli/src/network-manager.c:177 ../cli/src/network-manager.c:179
+#: ../cli/src/network-manager.c:180 ../cli/src/network-manager.c:429
+#: ../cli/src/network-manager.c:484 ../cli/src/network-manager.c:522
+#: ../cli/src/network-manager.c:561
 msgid "disabled"
 msgstr "вимкнено"
 
-#: ../cli/src/network-manager.c:181
+#: ../cli/src/network-manager.c:193
 msgid "NetworkManager status"
 msgstr "Стан NetworkManager"
 
 #. Print header
-#: ../cli/src/network-manager.c:184
+#: ../cli/src/network-manager.c:196
 msgid "running"
 msgstr "виконується"
 
-#: ../cli/src/network-manager.c:184
+#: ../cli/src/network-manager.c:196
 msgid "not running"
 msgstr "не виконується"
 
-#: ../cli/src/network-manager.c:215 ../cli/src/utils.c:425
+#: ../cli/src/network-manager.c:271
+msgid "auth"
+msgstr "розпізн"
+
+#: ../cli/src/network-manager.c:301
+#, c-format
+#| msgid "Error: 'nm status': %s"
+msgid "Error: 'nm permissions': %s"
+msgstr "Помилка: «nm permissions»: %s"
+
+#: ../cli/src/network-manager.c:303
+#, c-format
+#| msgid "Error: 'nm status': %s; allowed fields: %s"
+msgid "Error: 'nm permissions': %s; allowed fields: %s"
+msgstr "Помилка: «nm permissions»: %s; дозволені поля: %s"
+
+#: ../cli/src/network-manager.c:324
+#| msgid "NetworkManager status"
+msgid "NetworkManager permissions"
+msgstr "Права доступу NetworkManager"
+
+#: ../cli/src/network-manager.c:350 ../cli/src/utils.c:457
 #, c-format
 msgid "Error: Couldn't connect to system bus: %s"
 msgstr ""
-"Помилка: не вдалося встановити з’єднання з системним каналом обміну даними: %"
-"s"
+"Помилка: не вдалося встановити з’єднання з системним каналом обміну даними: "
+"%s"
 
-#: ../cli/src/network-manager.c:226
+#: ../cli/src/network-manager.c:361
 #, c-format
 msgid "Error: Couldn't create D-Bus object proxy."
 msgstr "Помилка: не вдалося створити проксі-об’єкт D-Bus."
 
-#: ../cli/src/network-manager.c:232
+#: ../cli/src/network-manager.c:367
 #, c-format
 msgid "Error in sleep: %s"
 msgstr "Помилка у затримці: %s"
 
-#: ../cli/src/network-manager.c:276 ../cli/src/network-manager.c:331
-#: ../cli/src/network-manager.c:369 ../cli/src/network-manager.c:408
+#: ../cli/src/network-manager.c:416 ../cli/src/network-manager.c:471
+#: ../cli/src/network-manager.c:509 ../cli/src/network-manager.c:548
 #, c-format
 msgid "Error: '--fields' value '%s' is not valid here; allowed fields: %s"
 msgstr ""
 "Помилка: значення «--fields» «%s» не можна використовувати тут; дозволені "
 "поля: %s"
 
-#: ../cli/src/network-manager.c:284
+#: ../cli/src/network-manager.c:424
 msgid "Networking enabled"
 msgstr "Мережу увімкнено"
 
-#: ../cli/src/network-manager.c:300
+#: ../cli/src/network-manager.c:440
 #, c-format
 msgid "Error: invalid 'enable' parameter: '%s'; use 'true' or 'false'."
 msgstr ""
 "Помилка: некоректний параметр «enable»: «%s»; мало бути «true» або «false»."
 
-#: ../cli/src/network-manager.c:310
+#: ../cli/src/network-manager.c:450
 #, c-format
 msgid "Error: Sleeping status is not exported by NetworkManager."
 msgstr "Помилка: стан присипляння не експортовано NetworkManager."
 
-#: ../cli/src/network-manager.c:318
+#: ../cli/src/network-manager.c:458
 #, c-format
 msgid "Error: invalid 'sleep' parameter: '%s'; use 'true' or 'false'."
 msgstr ""
 "Помилка: некоректний параметр «sleep»: «%s»; мало бути «true» або «false»."
 
-#: ../cli/src/network-manager.c:339
+#: ../cli/src/network-manager.c:479
 msgid "WiFi enabled"
 msgstr "WiFi увімкнено"
 
-#: ../cli/src/network-manager.c:355
+#: ../cli/src/network-manager.c:495
 #, c-format
 msgid "Error: invalid 'wifi' parameter: '%s'."
 msgstr "Помилка: некоректний параметр «wifi»: «%s»."
 
-#: ../cli/src/network-manager.c:377
+#: ../cli/src/network-manager.c:517
 msgid "WWAN enabled"
 msgstr "WWAN увімкнено"
 
-#: ../cli/src/network-manager.c:393
+#: ../cli/src/network-manager.c:533
 #, c-format
 msgid "Error: invalid 'wwan' parameter: '%s'."
 msgstr "Помилка: некоректний параметр «wwan»: «%s»."
 
-#: ../cli/src/network-manager.c:416
+#: ../cli/src/network-manager.c:556
 msgid "WiMAX enabled"
 msgstr "WiMAX увімкнено"
 
-#: ../cli/src/network-manager.c:432
+#: ../cli/src/network-manager.c:572
 #, c-format
 msgid "Error: invalid 'wimax' parameter: '%s'."
 msgstr "Помилка: некоректний параметр «wimax»: «%s»."
 
-#: ../cli/src/network-manager.c:445
+#: ../cli/src/network-manager.c:585
 #, c-format
 msgid "Error: 'nm' command '%s' is not valid."
 msgstr "Помилка: команда «nm» «%s» є некоректною."
@@ -1694,139 +1799,162 @@ msgstr "Помилка: не вдалося створити об’єкт NMCli
 msgid "Success"
 msgstr "Виконано"
 
-#: ../cli/src/settings.c:465
+#: ../cli/src/settings.c:519
 #, c-format
 msgid "%d (hex-ascii-key)"
 msgstr "%d (16-ковий ASCII-ключ)"
 
-#: ../cli/src/settings.c:467
+#: ../cli/src/settings.c:521
 #, c-format
 msgid "%d (104/128-bit passphrase)"
 msgstr "%d (104/128-бітовий пароль)"
 
-#: ../cli/src/settings.c:470
+#: ../cli/src/settings.c:524 ../cli/src/settings.c:652
 #, c-format
 msgid "%d (unknown)"
 msgstr "%d (невідомо)"
 
-#: ../cli/src/settings.c:496
+#: ../cli/src/settings.c:550
 msgid "0 (unknown)"
 msgstr "0 (невідомо)"
 
-#: ../cli/src/settings.c:502
+#: ../cli/src/settings.c:556
 msgid "any, "
 msgstr "будь-який, "
 
-#: ../cli/src/settings.c:504
+#: ../cli/src/settings.c:558
 msgid "900 MHz, "
 msgstr "900 МГц, "
 
-#: ../cli/src/settings.c:506
+#: ../cli/src/settings.c:560
 msgid "1800 MHz, "
 msgstr "1800 МГц, "
 
-#: ../cli/src/settings.c:508
+#: ../cli/src/settings.c:562
 msgid "1900 MHz, "
 msgstr "1900 МГц, "
 
-#: ../cli/src/settings.c:510
+#: ../cli/src/settings.c:564
 msgid "850 MHz, "
 msgstr "800 МГц, "
 
-#: ../cli/src/settings.c:512
+#: ../cli/src/settings.c:566
 msgid "WCDMA 3GPP UMTS 2100 MHz, "
 msgstr "WCDMA 3GPP UMTS 2100 МГц, "
 
-#: ../cli/src/settings.c:514
+#: ../cli/src/settings.c:568
 msgid "WCDMA 3GPP UMTS 1800 MHz, "
 msgstr "WCDMA 3GPP UMTS 1800 МГц, "
 
-#: ../cli/src/settings.c:516
+#: ../cli/src/settings.c:570
 msgid "WCDMA 3GPP UMTS 1700/2100 MHz, "
 msgstr "WCDMA 3GPP UMTS 1700/2100 МГц, "
 
-#: ../cli/src/settings.c:518
+#: ../cli/src/settings.c:572
 msgid "WCDMA 3GPP UMTS 800 MHz, "
 msgstr "WCDMA 3GPP UMTS 800 МГц, "
 
-#: ../cli/src/settings.c:520
+#: ../cli/src/settings.c:574
 msgid "WCDMA 3GPP UMTS 850 MHz, "
 msgstr "WCDMA 3GPP UMTS 850 МГц, "
 
-#: ../cli/src/settings.c:522
+#: ../cli/src/settings.c:576
 msgid "WCDMA 3GPP UMTS 900 MHz, "
 msgstr "WCDMA 3GPP UMTS 900 МГц, "
 
-#: ../cli/src/settings.c:524
+#: ../cli/src/settings.c:578
 msgid "WCDMA 3GPP UMTS 1700 MHz, "
 msgstr "WCDMA 3GPP UMTS 1700 МГц, "
 
-#: ../cli/src/settings.c:526
-#| msgid "WCDMA 3GPP UMTS 900 MHz, "
+#: ../cli/src/settings.c:580
 msgid "WCDMA 3GPP UMTS 1900 MHz, "
 msgstr "WCDMA 3GPP UMTS 1900 МГц, "
 
-#: ../cli/src/settings.c:528
-#| msgid "WCDMA 3GPP UMTS 2100 MHz, "
+#: ../cli/src/settings.c:582
 msgid "WCDMA 3GPP UMTS 2600 MHz, "
 msgstr "WCDMA 3GPP UMTS 2600 МГц, "
 
-#: ../cli/src/settings.c:650 ../cli/src/settings.c:846
-#: ../cli/src/settings.c:1550
+#: ../cli/src/settings.c:600
+msgid "0 (NONE)"
+msgstr "0 (НЕМАЄ)"
+
+#: ../cli/src/settings.c:606
+msgid "REORDER_HEADERS, "
+msgstr "ПЕРЕВПОРЯДКОВУВАННЯ_ЗАГОЛОВКІВ, "
+
+#: ../cli/src/settings.c:608
+msgid "GVRP, "
+msgstr "GVRP, "
+
+#: ../cli/src/settings.c:610
+msgid "LOOSE_BINDING, "
+msgstr "ШИРОКЕ_ПРИВ’ЯЗУВАННЯ, "
+
+#: ../cli/src/settings.c:646
+#, c-format
+#| msgid "disabled"
+msgid "%d (disabled)"
+msgstr "%d (вимкнено)"
+
+#: ../cli/src/settings.c:648
+#, c-format
+msgid "%d (enabled, prefer public IP)"
+msgstr "%d (увімкнено, перевага відкритого IP)"
+
+#: ../cli/src/settings.c:650
+#, c-format
+msgid "%d (enabled, prefer temporary IP)"
+msgstr "%d (увімкнено, перевага тимчасового IP)"
+
+#: ../cli/src/settings.c:768 ../cli/src/settings.c:964
+#: ../cli/src/settings.c:1673
 msgid "auto"
 msgstr "авто"
 
-#: ../cli/src/settings.c:840 ../cli/src/settings.c:843
-#: ../cli/src/settings.c:844 ../cli/src/utils.c:247
-msgid "not set"
-msgstr "не встановлено"
-
 #: ../cli/src/utils.c:103
 #, c-format
-#| msgid "%s: error converting IP4 address 0x%X"
 msgid "Error converting IP4 address '0x%X' to text form"
 msgstr ""
 "Помилка під час спроби перетворення адреси IP4 «0x%X» у текстовий формат"
 
 #: ../cli/src/utils.c:131
 #, c-format
-#| msgid "%s: error converting IP4 address 0x%X"
 msgid "Error converting IP6 address '%s' to text form"
 msgstr "Помилка під час спроби перетворення адреси IP6 «%s» у текстовий формат"
 
-#: ../cli/src/utils.c:200
+#: ../cli/src/utils.c:232
 #, c-format
 msgid "field '%s' has to be alone"
 msgstr "поле «%s» має бути єдиним"
 
-#: ../cli/src/utils.c:203
+#: ../cli/src/utils.c:235
 #, c-format
 msgid "invalid field '%s'"
 msgstr "некоректне поле «%s»"
 
-#: ../cli/src/utils.c:222
+#: ../cli/src/utils.c:254
 #, c-format
 msgid "Option '--terse' requires specifying '--fields'"
 msgstr "Використання параметра «--terse» потребує визначення «--fields»"
 
-#: ../cli/src/utils.c:226
+#: ../cli/src/utils.c:258
 #, c-format
 msgid "Option '--terse' requires specific '--fields' option values , not '%s'"
 msgstr ""
 "Параметр «--terse» потребує певних значень параметра «--fields», а не «%s»"
 
-#: ../cli/src/utils.c:436
+#: ../cli/src/utils.c:468
 #, c-format
 msgid "Error: Couldn't create D-Bus object proxy for org.freedesktop.DBus"
 msgstr ""
 "Помилка: не вдалося створити проксі-об’єкт D-Bus для org.freedesktop.DBus"
 
-#: ../cli/src/utils.c:444
+#: ../cli/src/utils.c:476
 #, c-format
 msgid "Error: NameHasOwner request failed: %s"
 msgstr "Помилка: невдала спроба запиту NameHasOwner: %s"
 
-#: ../cli/src/utils.c:489
+#: ../cli/src/utils.c:521
 #, c-format
 msgid ""
 "Warning: nmcli (%s) and NetworkManager (%s) versions don't match. Use --"
@@ -1835,7 +1963,7 @@ msgstr ""
 "Увага: версії nmcli (%s) і NetworkManager (%s) не збігаються. Скористайтеся "
 "параметром --nocheck для вимикання цього попередження.\n"
 
-#: ../cli/src/utils.c:498
+#: ../cli/src/utils.c:530
 #, c-format
 msgid ""
 "Error: nmcli (%s) and NetworkManager (%s) versions don't match. Force "
@@ -2191,28 +2319,28 @@ msgstr "Не вдалося перевірити файл PKCS#12: %d"
 msgid "Could not generate random data."
 msgstr "Не вдалося створити псевдовипадкові дані."
 
-#: ../libnm-util/nm-utils.c:2034
+#: ../libnm-util/nm-utils.c:2040
 #, c-format
 msgid "Not enough memory to make encryption key."
 msgstr "Недостатньо пам’яті для створення ключа шифрування."
 
-#: ../libnm-util/nm-utils.c:2144
+#: ../libnm-util/nm-utils.c:2150
 msgid "Could not allocate memory for PEM file creation."
 msgstr "Не вдалося отримати область пам’яті для створення файла PEM."
 
-#: ../libnm-util/nm-utils.c:2156
+#: ../libnm-util/nm-utils.c:2162
 #, c-format
 msgid "Could not allocate memory for writing IV to PEM file."
 msgstr "Не вдалося отримати область пам’яті для запису ВІ до файла PEM."
 
-#: ../libnm-util/nm-utils.c:2168
+#: ../libnm-util/nm-utils.c:2174
 #, c-format
 msgid "Could not allocate memory for writing encrypted key to PEM file."
 msgstr ""
 "Не вдалося отримати область пам’яті для запису зашифрованого ключа до файла "
 "PEM."
 
-#: ../libnm-util/nm-utils.c:2187
+#: ../libnm-util/nm-utils.c:2193
 #, c-format
 msgid "Could not allocate memory for PEM file data."
 msgstr "Не вдалося отримати область пам’яті для даних файла PEM."
@@ -2325,111 +2453,139 @@ msgid "System policy prevents modification of the persistent system hostname"
 msgstr ""
 "Правила системи забороняють внесення змін до постійної назви вузла у мережі"
 
-#: ../src/main.c:143
+#: ../src/main.c:158
 #, c-format
-#| msgid "Failed to initialize the crypto engine: %d."
-msgid "Failed to initialize SIGTERM pipe: %d"
-msgstr "Не вдалося ініціалізувати канал SIGTERM: %d"
+#| msgid "Failed to encrypt: %d."
+msgid "Failed to set signal mask: %d"
+msgstr "Не вдалося встановити маску сигналу: %d"
 
-#: ../src/main.c:174
+#: ../src/main.c:167
+#, c-format
+msgid "Failed to create signal handling thread: %d"
+msgstr "Не вдалося створити потік обробки сигналів: %d"
+
+#: ../src/main.c:182
 #, c-format
 msgid "Opening %s failed: %s\n"
 msgstr "Помилка під час спроби відкрити %s: %s\n"
 
-#: ../src/main.c:180
+#: ../src/main.c:188
 #, c-format
 msgid "Writing to %s failed: %s\n"
 msgstr "Помилка під час спроби запису даних до %s: %s\n"
 
-#: ../src/main.c:185
+#: ../src/main.c:193
 #, c-format
 msgid "Closing %s failed: %s\n"
 msgstr "Не вдалося завершити роботу %s: %s\n"
 
-#: ../src/main.c:228
+#: ../src/main.c:236
 #, c-format
-#| msgid "Error: NetworkManager is not running."
 msgid "NetworkManager is already running (pid %ld)\n"
 msgstr "NetworkManager вже запущено (pid %ld)\n"
 
-#: ../src/main.c:365
-#| msgid "NetworkManager status"
+#: ../src/main.c:376
 msgid "Print NetworkManager version and exit"
 msgstr "Вивести дані щодо версії NetworkManager і завершити роботу"
 
-#: ../src/main.c:366
+#: ../src/main.c:377
 msgid "Don't become a daemon"
 msgstr "Не переходити у стан фонової служби"
 
-#: ../src/main.c:367
+#: ../src/main.c:378
 msgid "Make all warnings fatal"
 msgstr "Вважати всі попередження помилками"
 
-#: ../src/main.c:368
+#: ../src/main.c:379
 msgid "Specify the location of a PID file"
 msgstr "Вказати розташування файла ідентифікатора процесу (PID)"
 
-#: ../src/main.c:368
+#: ../src/main.c:379
 msgid "filename"
 msgstr "назва файла"
 
-#: ../src/main.c:369
+#: ../src/main.c:380
 msgid "State file location"
 msgstr "Розташування файла стану"
 
-#: ../src/main.c:369
+#: ../src/main.c:380
 msgid "/path/to/state.file"
 msgstr "/шлях/до/файла.стану"
 
-#: ../src/main.c:370
+#: ../src/main.c:381
 msgid "Config file location"
 msgstr "Розташування файла налаштувань"
 
-#: ../src/main.c:370
+#: ../src/main.c:381
 msgid "/path/to/config.file"
 msgstr "/шлях/до/файла.налаштувань"
 
-#: ../src/main.c:371
+#: ../src/main.c:382
 msgid "List of plugins separated by ','"
 msgstr "Список додатків, відокремлених комами («,»)"
 
-#: ../src/main.c:371
+#: ../src/main.c:382
 msgid "plugin1,plugin2"
 msgstr "додаток1,додаток2"
 
 #. Translators: Do not translate the values in the square brackets
-#: ../src/main.c:373
+#: ../src/main.c:384
 msgid "Log level: one of [ERR, WARN, INFO, DEBUG]"
 msgstr "Рівень докладності журналу, одне зі значень: ERR, WARN, INFO, DEBUG"
 
 #. Translators: Do not translate the values in the square brackets
-#: ../src/main.c:376
+#: ../src/main.c:387
+#| msgid ""
+#| "Log domains separated by ',': any combination of\n"
+#| "                                          [NONE,HW,RFKILL,ETHER,WIFI,BT,"
+#| "MB,DHCP4,DHCP6,PPP,\n"
+#| "                                           WIFI_SCAN,IP4,IP6,AUTOIP4,DNS,"
+#| "VPN,SHARING,SUPPLICANT,\n"
+#| "                                           AGENTS,SETTINGS,SUSPEND,CORE,"
+#| "DEVICE,OLPC,WIMAX,\n"
+#| "                                           INFINIBAND,FIREWALL]"
 msgid ""
 "Log domains separated by ',': any combination of\n"
-"                                          [NONE,HW,RFKILL,ETHER,WIFI,BT,MB,"
-"DHCP4,DHCP6,PPP,\n"
-"                                           WIFI_SCAN,IP4,IP6,AUTOIP4,DNS,VPN,"
-"SHARING,SUPPLICANT,\n"
-"                                           AGENTS,SETTINGS,SUSPEND,CORE,"
-"DEVICE,OLPC,WIMAX,\n"
-"                                           INFINIBAND,FIREWALL]"
+"                                                [NONE,HW,RFKILL,ETHER,WIFI,"
+"BT,MB,DHCP4,DHCP6,PPP,\n"
+"                                                 WIFI_SCAN,IP4,IP6,AUTOIP4,"
+"DNS,VPN,SHARING,SUPPLICANT,\n"
+"                                                 AGENTS,SETTINGS,SUSPEND,"
+"CORE,DEVICE,OLPC,WIMAX,\n"
+"                                                 INFINIBAND,FIREWALL,ADSL]"
 msgstr ""
 "Області ведення журналу, відокремлені комами, довільна комбінація таких "
 "значень:\n"
-"                                          NONE,HW,RFKILL,ETHER,WIFI,BT,MB,"
-"DHCP4,DHCP6,PPP,\n"
+"                                          NONE,HW,RFKILL,ETHER,WIFI, "
+"BT,MB,DHCP4,DHCP6,PPP,\n"
 "                                           WIFI_SCAN,IP4,IP6,AUTOIP4,DNS,VPN,"
 "SHARING,SUPPLICANT,\n"
 "                                           AGENTS,SETTINGS,SUSPEND,CORE,"
 "DEVICE,OLPC,WIMAX,\n"
-"                                           INFINIBAND,FIREWALL"
+"                                           INFINIBAND,FIREWALL,ADSL]"
+
+#: ../src/main.c:393
+msgid "An http(s) address for checking internet connectivity"
+msgstr "Адреса http(s) для спроб перевірки можливості встановлення з’єднання"
 
-#: ../src/main.c:386
+#: ../src/main.c:394
+msgid "The interval between connectivity checks (in seconds)"
+msgstr "Інтервал між перевірками можливості з’єднання (у секундах)"
+
+#: ../src/main.c:395
+msgid "The expected start of the response"
+msgstr "Очікуваний початок відповіді"
+
+#: ../src/main.c:395
+msgid "Bingo!"
+msgstr "Влучно!"
+
+#: ../src/main.c:400
 #, c-format
 msgid "GModules are not supported on your platform!\n"
 msgstr "Підтримки GModules на цій платформі не передбачено!\n"
 
-#: ../src/main.c:405
+#: ../src/main.c:423
 msgid ""
 "NetworkManager monitors all network connections and automatically\n"
 "chooses the best connection to use.  It also allows the user to\n"
@@ -2442,39 +2598,38 @@ msgstr ""
 "з якими слід пов’язувати картки бездротового доступу на вашому\n"
 "комп’ютері."
 
-#: ../src/main.c:411
+#: ../src/main.c:429
 #, c-format
 msgid "Invalid option.  Please use --help to see a list of valid options.\n"
 msgstr ""
 "Некоректний параметр. Щоб ознайомитися зі списком параметрів, скористайтеся "
 "параметром --help.\n"
 
-#: ../src/main.c:421
+#: ../src/main.c:439
 #, c-format
 msgid "You must be root to run NetworkManager!\n"
 msgstr ""
 "Запуск NetworkManager слід здійснювати з облікового запису адміністратора "
 "(root)!\n"
 
-#: ../src/main.c:441
+#: ../src/main.c:460
 #, c-format
-#| msgid "Failed to set IV for encryption: %s / %s."
 msgid "Failed to read configuration: (%d) %s\n"
 msgstr "Не вдалося прочитати налаштування: (%d) %s\n"
 
-#: ../src/main.c:452
+#: ../src/main.c:471
 #, c-format
 msgid "%s.  Please use --help to see a list of valid options.\n"
 msgstr ""
 "%s. Щоб ознайомитися зі списком параметрів, скористайтеся параметром --"
 "help.\n"
 
-#: ../src/main.c:459
+#: ../src/main.c:478
 #, c-format
 msgid "State file %s parsing failed: (%d) %s\n"
 msgstr "Помилка під час обробки файла стану %s: (%d) %s\n"
 
-#: ../src/main.c:476
+#: ../src/main.c:495
 #, c-format
 msgid "Could not daemonize: %s [error %u]\n"
 msgstr "Не вдалося створити фонову службу: %s [помилка %u]\n"
@@ -2492,85 +2647,102 @@ msgstr ""
 "# Об’єднано з %s\n"
 "\n"
 
-#: ../src/dhcp-manager/nm-dhcp-manager.c:284
+#: ../src/dhcp-manager/nm-dhcp-manager.c:266
 msgid "no usable DHCP client could be found."
 msgstr "не вдалося знайти придатного до використання клієнта DHCP."
 
-#: ../src/dhcp-manager/nm-dhcp-manager.c:293
+#: ../src/dhcp-manager/nm-dhcp-manager.c:275
 msgid "'dhclient' could be found."
 msgstr "не вдалося знайти «dhclient»."
 
-#: ../src/dhcp-manager/nm-dhcp-manager.c:303
+#: ../src/dhcp-manager/nm-dhcp-manager.c:285
 msgid "'dhcpcd' could be found."
 msgstr "не вдалося знайти «dhcpcd»."
 
-#: ../src/dhcp-manager/nm-dhcp-manager.c:311
+#: ../src/dhcp-manager/nm-dhcp-manager.c:293
 #, c-format
 msgid "unsupported DHCP client '%s'"
 msgstr "підтримки клієнта DHCP «%s» не передбачено"
 
-#: ../src/dns-manager/nm-dns-manager.c:376
+#: ../src/dns-manager/nm-dns-manager.c:381
 msgid "NOTE: the libc resolver may not support more than 3 nameservers."
 msgstr ""
 "ЗАУВАЖЕННЯ: можливо, інструмент визначення адрес за назвами libc вашої "
 "системи не підтримує використання понад 3 серверів назв."
 
-#: ../src/dns-manager/nm-dns-manager.c:378
+#: ../src/dns-manager/nm-dns-manager.c:383
 msgid "The nameservers listed below may not be recognized."
 msgstr "Вказані у наведеному нижче списку сервери назв може бути пропущено."
 
-#: ../src/logging/nm-logging.c:153
+#: ../src/logging/nm-logging.c:131
 #, c-format
 msgid "Unknown log level '%s'"
 msgstr "Невідомий рівень журналювання «%s»"
 
-#: ../src/logging/nm-logging.c:178
+#: ../src/logging/nm-logging.c:156
 #, c-format
 msgid "Unknown log domain '%s'"
 msgstr "Невідомий домен журналювання «%s»"
 
-#: ../src/modem-manager/nm-modem-cdma.c:308 ../src/nm-device-bt.c:354
+#: ../src/modem-manager/nm-modem-cdma.c:279 ../src/nm-device-bt.c:325
 #, c-format
 msgid "CDMA connection %d"
 msgstr "З’єднання CDMA %d"
 
-#: ../src/modem-manager/nm-modem-gsm.c:542 ../src/nm-device-bt.c:350
+#: ../src/modem-manager/nm-modem-gsm.c:547 ../src/nm-device-bt.c:321
 #, c-format
 msgid "GSM connection %d"
 msgstr "З’єднання GSM %d"
 
-#: ../src/nm-device-bt.c:325
+#: ../src/nm-device-bond.c:191
+#, c-format
+#| msgid "Wired connection %d"
+msgid "Bond connection %d"
+msgstr "Прив’язане з’єднання %d"
+
+#: ../src/nm-device-adsl.c:193
+#, c-format
+#| msgid "GSM connection %d"
+msgid "ADSL connection %d"
+msgstr "З’єднання ADSL %d"
+
+#: ../src/nm-device-bt.c:296
 #, c-format
 msgid "PAN connection %d"
 msgstr "З’єднання PAN %d"
 
-#: ../src/nm-device-bt.c:358
+#: ../src/nm-device-bt.c:329
 #, c-format
 msgid "DUN connection %d"
 msgstr "З’єднання DUN %d"
 
-#: ../src/nm-device-ethernet.c:1382
+#: ../src/nm-device-ethernet.c:1327
 #, c-format
 msgid "PPPoE connection %d"
 msgstr "З’єднання PPPoE %d"
 
-#: ../src/nm-device-ethernet.c:1382 ../src/settings/nm-settings-utils.c:50
+#: ../src/nm-device-ethernet.c:1327 ../src/settings/nm-settings-utils.c:50
 #, c-format
 msgid "Wired connection %d"
 msgstr "Дротове з’єднання %d"
 
-#: ../src/nm-device-infiniband.c:332
+#: ../src/nm-device-infiniband.c:303
 #, c-format
-#| msgid "Wired connection %d"
 msgid "InfiniBand connection %d"
 msgstr "З’єднання InfiniBand %d"
 
-#: ../src/nm-device-olpc-mesh.c:323
+#: ../src/nm-device-olpc-mesh.c:303
 #, c-format
 msgid "Mesh %d"
 msgstr "Mesh %d"
 
-#: ../src/nm-manager.c:680
+#: ../src/nm-device-vlan.c:362
+#, c-format
+#| msgid "PAN connection %d"
+msgid "VLAN connection %d"
+msgstr "З’єднання VLAN %d"
+
+#: ../src/nm-manager.c:661
 #, c-format
 msgid "VPN connection %d"
 msgstr "З’єднання VPN %d"
@@ -2622,16 +2794,71 @@ msgstr "не вдалося долучитися до групи netlink: %s"
 msgid "error updating link cache: %s"
 msgstr "помилка під час спроби оновлення кешу з’єднання: %s"
 
-#: ../src/settings/plugins/ifcfg-rh/reader.c:91
-#: ../src/settings/plugins/ifnet/connection_parser.c:51
+#: ../src/settings/plugins/ifcfg-rh/reader.c:94
 msgid "System"
 msgstr "Система"
 
-#: ../src/settings/plugins/ifcfg-rh/reader.c:3660
-#| msgid "on"
+#: ../src/settings/plugins/ifcfg-rh/reader.c:3641
 msgid "Bond"
 msgstr "Прив’язка"
 
+#: ../test/nm-online.c:112
+#, c-format
+#| msgid "connecting"
+msgid "\rConnecting"
+msgstr "\rВстановлюється з’єднання"
+
+#: ../test/nm-online.c:143
+msgid "Time to wait for a connection, in seconds (default is 30)"
+msgstr "Час очікування на з’єднання, у секундах (типовим є 30)"
+
+#: ../test/nm-online.c:144
+#| msgid "Error: NetworkManager is not running."
+msgid "Exit immediately if NetworkManager is not running or connecting"
+msgstr ""
+"Негайно завершити роботу, якщо NetworkManager не запущено або виконується "
+"спроба з’єднання"
+
+#: ../test/nm-online.c:145
+msgid "Don't print anything"
+msgstr "Нічого не виводити"
+
+#: ../test/nm-online.c:163
+msgid "Waits for a successful connection in NetworkManager."
+msgstr "Очікувати на успішне з’єднання у NetworkManager."
+
+#: ../test/nm-online.c:169 ../test/nm-online.c:178
+#| msgid "Invalid option.  Please use --help to see a list of valid options.\n"
+msgid "Invalid option.  Please use --help to see a list of valid options."
+msgstr ""
+"Некоректний параметр. Щоб ознайомитися зі списком параметрів, скористайтеся "
+"параметром --help."
+
+#~ msgid "state: %s\n"
+#~ msgstr "стан: %s\n"
+
+#~ msgid "Connection activated\n"
+#~ msgstr "З’єднання активовано\n"
+
+#~ msgid "state: %s (%d)\n"
+#~ msgstr "стан: %s (%d)\n"
+
+#~ msgid "Active connection state: %s\n"
+#~ msgstr "Стан активного з’єднання: %s\n"
+
+#~ msgid "Active connection path: %s\n"
+#~ msgstr "Адреса активного з’єднання: %s\n"
+
+#~ msgid "Device state: %d (%s)\n"
+#~ msgstr "Стан пристрою: %d (%s)\n"
+
+#~ msgid "not set"
+#~ msgstr "не встановлено"
+
+#~| msgid "Failed to initialize the crypto engine: %d."
+#~ msgid "Failed to initialize SIGTERM pipe: %d"
+#~ msgstr "Не вдалося ініціалізувати канал SIGTERM: %d"
+
 #~ msgid "IP4-SETTINGS"
 #~ msgstr "ПАРАМЕТРИ IP4"
 
diff --git a/policy/Makefile.am b/policy/Makefile.am
index 289d220b..37c4344a 100644
--- a/policy/Makefile.am
+++ b/policy/Makefile.am
@@ -1,9 +1,9 @@
 polkit_policydir = $(datadir)/polkit-1/actions
 
-dist_polkit_policy_in_files = \
-	org.freedesktop.NetworkManager.policy.in
+dist_polkit_policy_in_in_files = \
+	org.freedesktop.NetworkManager.policy.in.in
 
-dist_polkit_policy_DATA = $(dist_polkit_policy_in_files:.policy.in=.policy)
+polkit_policy_DATA = $(dist_polkit_policy_in_in_files:.policy.in.in=.policy)
 
 @INTLTOOL_POLICY_RULE@
 
@@ -25,4 +25,4 @@ dist_polkit_policy_DATA = $(dist_polkit_policy_in_files:.policy.in=.policy)
 clean-local :
 	rm -f *~
 
-EXTRA_DIST = $(dist_polkit_policy_in_files)
+DISTCLEANFILES = $(polkit_policy_DATA)
diff --git a/policy/Makefile.in b/policy/Makefile.in
index c28e54bc..2d54c7c1 100644
--- a/policy/Makefile.in
+++ b/policy/Makefile.in
@@ -52,25 +52,27 @@ POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
 subdir = policy
-DIST_COMMON = $(dist_polkit_policy_DATA) $(srcdir)/Makefile.am \
-	$(srcdir)/Makefile.in
+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
+	$(srcdir)/org.freedesktop.NetworkManager.policy.in.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/compiler_warnings.m4 \
-	$(top_srcdir)/m4/gettext.m4 $(top_srcdir)/m4/gtk-doc.m4 \
-	$(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/intlmacosx.m4 \
-	$(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/introspection.m4 \
-	$(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \
-	$(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/libnl-check.m4 \
-	$(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \
-	$(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
-	$(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/nls.m4 \
-	$(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/progtest.m4 \
-	$(top_srcdir)/m4/vapigen.m4 $(top_srcdir)/configure.ac
+	$(top_srcdir)/m4/gettext.m4 \
+	$(top_srcdir)/m4/gnome-code-coverage.m4 \
+	$(top_srcdir)/m4/gtk-doc.m4 $(top_srcdir)/m4/iconv.m4 \
+	$(top_srcdir)/m4/intlmacosx.m4 $(top_srcdir)/m4/intltool.m4 \
+	$(top_srcdir)/m4/introspection.m4 $(top_srcdir)/m4/lib-ld.m4 \
+	$(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \
+	$(top_srcdir)/m4/libnl-check.m4 $(top_srcdir)/m4/libtool.m4 \
+	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
+	$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
+	$(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/po.m4 \
+	$(top_srcdir)/m4/progtest.m4 $(top_srcdir)/m4/vapigen.m4 \
+	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = $(top_builddir)/config.h
-CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_FILES = org.freedesktop.NetworkManager.policy.in
 CONFIG_CLEAN_VPATH_FILES =
 AM_V_GEN = $(am__v_GEN_@AM_V@)
 am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
@@ -113,7 +115,7 @@ am__uninstall_files_from_dir = { \
          $(am__cd) "$$dir" && rm -f $$files; }; \
   }
 am__installdirs = "$(DESTDIR)$(polkit_policydir)"
-DATA = $(dist_polkit_policy_DATA)
+DATA = $(polkit_policy_DATA)
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 ALL_LINGUAS = @ALL_LINGUAS@
@@ -127,6 +129,10 @@ AWK = @AWK@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
+CKDB_PATH = @CKDB_PATH@
+CODE_COVERAGE_CFLAGS = @CODE_COVERAGE_CFLAGS@
+CODE_COVERAGE_ENABLED = @CODE_COVERAGE_ENABLED@
+CODE_COVERAGE_LDFLAGS = @CODE_COVERAGE_LDFLAGS@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CXX = @CXX@
@@ -141,9 +147,7 @@ DBUS_SYS_DIR = @DBUS_SYS_DIR@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
 DHCLIENT_PATH = @DHCLIENT_PATH@
-DHCLIENT_VERSION = @DHCLIENT_VERSION@
 DHCPCD_PATH = @DHCPCD_PATH@
-DISABLE_DEPRECATED = @DISABLE_DEPRECATED@
 DLLTOOL = @DLLTOOL@
 DSYMUTIL = @DSYMUTIL@
 DUMPBIN = @DUMPBIN@
@@ -153,17 +157,14 @@ ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
 FGREP = @FGREP@
+GENHTML = @GENHTML@
 GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
 GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
-GIO_CFLAGS = @GIO_CFLAGS@
-GIO_LIBS = @GIO_LIBS@
 GLIB_CFLAGS = @GLIB_CFLAGS@
 GLIB_GENMARSHAL = @GLIB_GENMARSHAL@
 GLIB_LIBS = @GLIB_LIBS@
 GLIB_MAKEFILE = @GLIB_MAKEFILE@
 GLIB_MKENUMS = @GLIB_MKENUMS@
-GMODULE_CFLAGS = @GMODULE_CFLAGS@
-GMODULE_LIBS = @GMODULE_LIBS@
 GMSGFMT = @GMSGFMT@
 GMSGFMT_015 = @GMSGFMT_015@
 GNUTLS_CFLAGS = @GNUTLS_CFLAGS@
@@ -204,6 +205,7 @@ IPTABLES_PATH = @IPTABLES_PATH@
 IWMX_SDK_CFLAGS = @IWMX_SDK_CFLAGS@
 IWMX_SDK_LIBS = @IWMX_SDK_LIBS@
 KERNEL_FIRMWARE_DIR = @KERNEL_FIRMWARE_DIR@
+LCOV = @LCOV@
 LD = @LD@
 LDFLAGS = @LDFLAGS@
 LIBDL = @LIBDL@
@@ -220,11 +222,7 @@ LIBNL2_LIBS = @LIBNL2_LIBS@
 LIBNL3_CFLAGS = @LIBNL3_CFLAGS@
 LIBNL3_LIBS = @LIBNL3_LIBS@
 LIBNL_CFLAGS = @LIBNL_CFLAGS@
-LIBNL_GENL3_CFLAGS = @LIBNL_GENL3_CFLAGS@
-LIBNL_GENL3_LIBS = @LIBNL_GENL3_LIBS@
 LIBNL_LIBS = @LIBNL_LIBS@
-LIBNL_ROUTE3_CFLAGS = @LIBNL_ROUTE3_CFLAGS@
-LIBNL_ROUTE3_LIBS = @LIBNL_ROUTE3_LIBS@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
 LIBSOUP_CFLAGS = @LIBSOUP_CFLAGS@
@@ -239,6 +237,8 @@ MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MANIFEST_TOOL = @MANIFEST_TOOL@
 MKDIR_P = @MKDIR_P@
+MM_GLIB_CFLAGS = @MM_GLIB_CFLAGS@
+MM_GLIB_LIBS = @MM_GLIB_LIBS@
 MOC = @MOC@
 MSGFMT = @MSGFMT@
 MSGFMT_015 = @MSGFMT_015@
@@ -248,6 +248,7 @@ NMEDIT = @NMEDIT@
 NM_MAJOR_VERSION = @NM_MAJOR_VERSION@
 NM_MICRO_VERSION = @NM_MICRO_VERSION@
 NM_MINOR_VERSION = @NM_MINOR_VERSION@
+NM_MODIFY_SYSTEM_POLICY = @NM_MODIFY_SYSTEM_POLICY@
 NM_VERSION = @NM_VERSION@
 NSS_CFLAGS = @NSS_CFLAGS@
 NSS_LIBS = @NSS_LIBS@
@@ -274,13 +275,14 @@ PPPD_PLUGIN_DIR = @PPPD_PLUGIN_DIR@
 QT_CFLAGS = @QT_CFLAGS@
 QT_LIBS = @QT_LIBS@
 RANLIB = @RANLIB@
-RESOLVCONF_PATH = @RESOLVCONF_PATH@
 SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
-SYSTEMD_CFLAGS = @SYSTEMD_CFLAGS@
-SYSTEMD_LIBS = @SYSTEMD_LIBS@
+SYSTEMD_INHIBIT_CFLAGS = @SYSTEMD_INHIBIT_CFLAGS@
+SYSTEMD_INHIBIT_LIBS = @SYSTEMD_INHIBIT_LIBS@
+SYSTEMD_LOGIN_CFLAGS = @SYSTEMD_LOGIN_CFLAGS@
+SYSTEMD_LOGIN_LIBS = @SYSTEMD_LOGIN_LIBS@
 SYSTEM_CA_PATH = @SYSTEM_CA_PATH@
 UDEV_BASE_DIR = @UDEV_BASE_DIR@
 USE_NLS = @USE_NLS@
@@ -335,6 +337,11 @@ localedir = @localedir@
 localstatedir = @localstatedir@
 mandir = @mandir@
 mkdir_p = @mkdir_p@
+nmbinary = @nmbinary@
+nmconfdir = @nmconfdir@
+nmdatadir = @nmdatadir@
+nmrundir = @nmrundir@
+nmstatedir = @nmstatedir@
 oldincludedir = @oldincludedir@
 pdfdir = @pdfdir@
 prefix = @prefix@
@@ -349,12 +356,16 @@ target_alias = @target_alias@
 top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
+with_dhclient = @with_dhclient@
+with_dhcpcd = @with_dhcpcd@
+with_netconfig = @with_netconfig@
+with_resolvconf = @with_resolvconf@
 polkit_policydir = $(datadir)/polkit-1/actions
-dist_polkit_policy_in_files = \
-	org.freedesktop.NetworkManager.policy.in
+dist_polkit_policy_in_in_files = \
+	org.freedesktop.NetworkManager.policy.in.in
 
-dist_polkit_policy_DATA = $(dist_polkit_policy_in_files:.policy.in=.policy)
-EXTRA_DIST = $(dist_polkit_policy_in_files)
+polkit_policy_DATA = $(dist_polkit_policy_in_in_files:.policy.in.in=.policy)
+DISTCLEANFILES = $(polkit_policy_DATA)
 all: all-am
 
 .SUFFIXES:
@@ -388,15 +399,17 @@ $(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 $(am__aclocal_m4_deps):
+org.freedesktop.NetworkManager.policy.in: $(top_builddir)/config.status $(srcdir)/org.freedesktop.NetworkManager.policy.in.in
+	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
 
 mostlyclean-libtool:
 	-rm -f *.lo
 
 clean-libtool:
 	-rm -rf .libs _libs
-install-dist_polkit_policyDATA: $(dist_polkit_policy_DATA)
+install-polkit_policyDATA: $(polkit_policy_DATA)
 	@$(NORMAL_INSTALL)
-	@list='$(dist_polkit_policy_DATA)'; test -n "$(polkit_policydir)" || list=; \
+	@list='$(polkit_policy_DATA)'; test -n "$(polkit_policydir)" || list=; \
 	if test -n "$$list"; then \
 	  echo " $(MKDIR_P) '$(DESTDIR)$(polkit_policydir)'"; \
 	  $(MKDIR_P) "$(DESTDIR)$(polkit_policydir)" || exit 1; \
@@ -410,9 +423,9 @@ install-dist_polkit_policyDATA: $(dist_polkit_policy_DATA)
 	  $(INSTALL_DATA) $$files "$(DESTDIR)$(polkit_policydir)" || exit $$?; \
 	done
 
-uninstall-dist_polkit_policyDATA:
+uninstall-polkit_policyDATA:
 	@$(NORMAL_UNINSTALL)
-	@list='$(dist_polkit_policy_DATA)'; test -n "$(polkit_policydir)" || list=; \
+	@list='$(polkit_policy_DATA)'; test -n "$(polkit_policydir)" || list=; \
 	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
 	dir='$(DESTDIR)$(polkit_policydir)'; $(am__uninstall_files_from_dir)
 tags: TAGS
@@ -485,6 +498,7 @@ clean-generic:
 distclean-generic:
 	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
 	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
+	-test -z "$(DISTCLEANFILES)" || rm -f $(DISTCLEANFILES)
 
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
@@ -509,7 +523,7 @@ info: info-am
 
 info-am:
 
-install-data-am: install-dist_polkit_policyDATA
+install-data-am: install-polkit_policyDATA
 
 install-dvi: install-dvi-am
 
@@ -553,22 +567,22 @@ ps: ps-am
 
 ps-am:
 
-uninstall-am: uninstall-dist_polkit_policyDATA
+uninstall-am: uninstall-polkit_policyDATA
 
 .MAKE: install-am install-strip
 
 .PHONY: all all-am check check-am clean clean-generic clean-libtool \
 	clean-local distclean distclean-generic distclean-libtool \
 	distdir dvi dvi-am html html-am info info-am install \
-	install-am install-data install-data-am \
-	install-dist_polkit_policyDATA install-dvi install-dvi-am \
-	install-exec install-exec-am install-html install-html-am \
-	install-info install-info-am install-man install-pdf \
-	install-pdf-am install-ps install-ps-am install-strip \
-	installcheck installcheck-am installdirs maintainer-clean \
+	install-am install-data install-data-am install-dvi \
+	install-dvi-am install-exec install-exec-am install-html \
+	install-html-am install-info install-info-am install-man \
+	install-pdf install-pdf-am install-polkit_policyDATA \
+	install-ps install-ps-am install-strip installcheck \
+	installcheck-am installdirs maintainer-clean \
 	maintainer-clean-generic mostlyclean mostlyclean-generic \
 	mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \
-	uninstall-dist_polkit_policyDATA
+	uninstall-polkit_policyDATA
 
 
 @INTLTOOL_POLICY_RULE@
diff --git a/policy/org.freedesktop.NetworkManager.policy b/policy/org.freedesktop.NetworkManager.policy
deleted file mode 100644
index 5e4eb8b4..00000000
--- a/policy/org.freedesktop.NetworkManager.policy
+++ /dev/null
@@ -1,802 +0,0 @@
-
-
-
-
-  NetworkManager
-  http://www.gnome.org/projects/NetworkManager
-  nm-icon
-
-  
-    Enable or disable system networking
-    Включване и изключване на мрежата на системно ниво
-    Habilita o inhabilita la xarxa del sistema
-    Povolit nebo zakázat systémovou síť
-    Aktiver eller deaktiver systemnetværk
-    System-Netzwerke aktivieren oder deaktivieren
-    Ενεργοποίηση ή απενεργοποίηση δικτύωσης συστήματος
-    Enŝalti aŭ elŝalti sistemretkonektadon
-    Activar o desactivar la red del sistema
-    Activer ou désactiver le réseau système
-    Activar ou desactivar a rede do sistema
-    तंत्र संजालन सक्रिय या निष्क्रिय करें
-    Rendszer hálózatkezelésének be- és kikapcsolása
-    Aktifkan atau matikan jejaring sistem
-    Abilitare o disabilitare la rete di sistema
-    ವ್ಯವಸ್ಥೆಯ ಜಾಲಬಂಧವನ್ನು ಶಕ್ತಗೊಳಿಸಿ ಅಥವ ಅಶಕ್ತಗೊಳಿಸಿ
-    시스템 네트워크 사용 여부
-    Įjungti arba išjungti sistemos prieigą prie tinklo
-    प्रणाली नेटवर्किंग सुरू किंवा बंद करा
-    ତନ୍ତ୍ର ନେଟୱର୍କିଙ୍ଗକୁ ସକ୍ରିୟ କିମ୍ବା ନିଷ୍କ୍ରିୟ କରନ୍ତୁ
-    ਸਿਸਟਮ ਨੈੱਟਵਰਕਿੰਗ ਚਾਲੂ ਜਾਂ ਬੰਦ
-    Włączenie lub wyłączenie sieci systemowej
-    Habilita ou desabilita o sistema de redes
-    Включить или выключить системные соединения
-    Omogoči ali onemogoči sistemske omrežne povezave
-    Омогући или онемогући умрежавање на систему
-    Omogući ili onemogući umrežavanje na sistemu
-    Aktivera eller inaktivera systemnätverk
-    సిస్టమ్ నెట్వర్కింగ్‌ను చేతనము లేదా అచేతనము చేయుము
-    Sistem ağını etkinleştir ya da etkisizleştir
-    Увімкнути або вимкнути системну роботу у мережі
-    启用或禁用系统网络
-    System policy prevents enabling or disabling system networking
-    Политиката на системата не позволява включване и изключване на мрежата на системно ниво
-    La política del sistema impedeix habilitar o inhabilitar la xarxa del sistema
-    Systémová zásada zamezuje povolit nebo zakázat systémovou síť
-    Systempolitik forhindrer aktivering eller deaktivering af systemnetværk
-    Die Systemrichtlinien verhindern die Aktivierung oder Deaktivierung von System-Netzwerken
-    Η πολιτική συστήματος δεν επιτρέπει ενεργοποίηση ή απενεργοποίηση της δικτύωσης του συστήματος
-    Sistempolitiko preventas enŝalton aŭ elŝalton de sistema retkonektado
-    La política del sistema evita activar o desactivar la red del sistema
-    La politique du système empêche l'activation ou la désactivation du réseau du système
-    A normativa do sistema evita a activación ou desactivación da rede do sistema
-    तंत्र संजालन के युक्ति के सक्रियण या निष्क्रियण को तंत्र नीति रोकता है
-    A rendszer házirendje megakadályozza a rendszer hálózatkezelésének be- vagy kikapcsolását
-    Kebijakan sistem mencegah mengaktifkan atau mematikan jejaring sistem
-    La politica di sistema impedisce di abilitare o disabilitare la rete di sistema
-    ವ್ಯವಸ್ಥೆಯ ಜಾಲಬಂಧವನ್ನು ಶಕ್ತ ಅಥವ ಅಶಕ್ತಗೊಳಿಸದಂತೆ ವ್ಯವಸ್ಥೆಯ ಪಾಲಿಸಿಯು ತಡೆಯುತ್ತಿದೆ
-    시스템 정책이 시스템 네트워크의 사용 여부 설정을 금지합니다
-    Sistemos politika neleidžia įjungti arba išjungti sistemos prieigos prie tinklo
-     സിസ്റ്റം നെറ്റ്​വര്‍ക്കിങ് പ്രവര്‍ത്തനസജ്ജമാക്കുന്നതും പ്രവര്‍ത്തനരഹിതമാക്കുന്നതും സിസ്റ്റം പോളിസി തടയുന്നു
-    प्रणाली करार प्रणाली नेटवर्किंगसा सुरू किंवा बंद होण्यापासून रोखते
-    ତନ୍ତ୍ର ନିତୀ ତନ୍ତ୍ର ନେଟୱର୍କିଙ୍ଗକୁ ସକ୍ରିୟ କିମ୍ବା ନିଷ୍କ୍ରିୟ ହେବାରୁ ବାରଣ କରିଥାଏ
-    ਸਿਸਟਮ ਪਾਲਸੀ ਸਿਸਟਮ ਨੈੱਟਵਰਕਿੰਗ ਚਾਲੂ ਜਾਂ ਬੰਦ ਕਰਨ ਤੋਂ ਰੋਕਦੀ ਹੈ
-    Polityka systemu powstrzymuje włączanie lub wyłączanie sieci systemowej
-    Políticas de sistema previnem habilitação ou desabilitação do sistema de redes
-    Системная политика запрещает включение и выключение системных подключений
-    Sistemska določila preprečujejo omogočanje ali onemogočanje omrežnih povezav.
-    Овлашћења система онемогућавају управљање мрежом на систему
-    Ovlašćenja sistema onemogućavaju upravljanje mrežom na sistemu
-    Systemets policy förhindrar aktivering eller inaktivering av systemnätverk
-    సిస్టమ్ నెట్వర్కింగ్‌ను చేతనము చేయుటకు లేదా అచేతనము చేయుటకు సిస్టమ్ విధానము నిరోధించుచున్నది
-    Sistem kuralları, sistem ağını etkinleştirmeyi ya da etkisizleştirmeyi engelliyor
-    Правила системи забороняють вмикання або вимикання з’єднань з мережею на системному рівні
-    系统策略阻止启用或禁用系统网络
-    
-      no
-      yes
-    
-  
-
-  
-    Put NetworkManager to sleep or wake it up (should only be used by system power management)
-    Приспиване и събуждане на NetworkManager (за целите на модула за управление на захранването на системата)
-    Posa el NetworkManager a dormir o desperta'l (només l'hauria d'utilitzar el sistema de gestió d'energia)
-    Uspat Network Manager nebo jej probudit (mělo by být používáno pouze systémovou správou napájení)
-    Sæt NetworkManager i hvile eller væk den (bør kun bruges af systemstrømstyringen)
-    NetworkManager in den Schlafzustand versetzen oder daraus aufwecken (Sollte nur von der System-Energieverwaltung verwendet werden)
-    Θέση της Διαχείρισης δικτύου σε αδράνεια ή ενεργοποίησή της (πρέπει να χρησιμοποιείται μόνο από τη διαχείριση ενέργειας του συστήματος)
-    Dormigi aŭ veki NetworkManager (estu uzata nur de sistema energimastumado)
-    Poner NetworkManager a dormir o despertarlo (sólo lo debería usar el gestor de energía del sistema)
-    Mettre NetworkManager en veille ou le réveiller (utile uniquement pour la gestion d'énergie du système)
-    Poñer o NetworkManager en suspensión e espertalo (só debe ser usado polo sistema de xestión de rede)
-     NetworkManager को स्लीप स्थिति या वेकअप स्थिति में रखें (केवल सिस्टम पावर मैनेजमेंट के द्वारा प्रयोग किया जाएगा)
-    Hálózatkezelő elaltatása vagy felébresztése (csak a rendszer energiagazdálkodása által használandó)
-    Tidurkan NetworkManager atau bangunkan (mestinya hanya dipakai oleh manajemen daya sistem)
-    Sospendere o riattivare NetworkManager (dovrebbe essere usato solo dalla gestione alimentazione di sistema)
-    NetworkManager ಅನ್ನು ನಿದ್ರಾಸ್ಥಿತಿಗೆ ಅಥವ ಎಚ್ಚರಸ್ಥಿತಿಗೆ ಕಳುಹಿಸಿ (ಇದನ್ನು ಕೇವಲ ವ್ಯವಸ್ಥೆಯ ವಿದ್ಯುಚ್ಛಕ್ತಿ ನಿರ್ವಹಣೆಯಿಂದ ಮಾತ್ರ ಬಳಸಬೇಕು)
-    네트워크 관리 프로그램을 일시 중지하거나 다시 시작합니다 (시스템 전원 관리에서만 사용)
-    Užmigdyti arba pažadinti NetworkManager (tai turėtų naudoti tik sistemos energijos valdymo posistemė)
-    NetworkManager ला स्लीप किंवा वेकअप स्तरात न्या (फक्त प्रणाली पावर मॅनेजमेंटनेच याचा वापर करावा)
-    NetworkManager କୁ ସୁପ୍ତ କିମ୍ବା ଜାଗ୍ରତ ରଖନ୍ତୁ (କେବଳ ତନ୍ତ୍ର ଶକ୍ତି ପରିଚାଳନା ଦ୍ୱାରା ବ୍ୟବହାର ହେବା ଉଚିତ)
-    ਨੈੱਟਵਰਕਮੈਨਜੇਰ ਨੂੰ ਸਲੀਪ ਕਰੋ ਜਾਂ ਵੇਕ ਅੱਪ ਕਰੋ (ਕੇਵਲ ਸਿਸਟਮ ਪਾਵਰ ਮੈਨਜੇਮੈਂਟ ਰਾਹੀਂ ਵਰਤਿਆ ਜਾਣਾ ਚਾਹੀਦਾ ਹੈ)
-    Umieszczenie usługi NetworkManager w stanie uśpienia lub przebudzenie go (powinno być używane tylko przez systemowe zarządzanie zasilaniem)
-    Põe o NetworkManager para dormir ou acordar (deve ser usado somente pelo sistema de gerenciamento de energia
-    Перевести NetworkManager в режим сна или пробудить его (должно использоваться только системой управления питанием)
-    Postavi program NetworkManager v mirovanje ali iz njega (možnost je namenjena upravljanju napajanja)
-    Омогућава успављивање Управника мреже (користи се са Управником потрошње на систему)
-    Omogućava uspavljivanje Upravnika mreže (koristi se sa Upravnikom potrošnje na sistemu)
-    Försätt Nätverkshanterare i vänteläge eller återställ efter det (bör endast användas av systemets strömhantering)
-    నెట్వర్కుమేనేజర్‌ను స్లీప్‌నకు లేదా దానిని మెల్కొలుపుటకు వుంచండి (సిస్టమ్ పవర్ నిర్వహణ చేత మాత్రమే వుపయోగించబడాలి)
-    NetworkManager'i uykuda konumuna getir veya uyandır (yalnızca sistem güç yönetimi tarafından kullanılmalıdır)
-    Призупинити або поновити роботу NetworkManager (має використовуватися лише інструментами керування живленням системи)
-    挂起或唤醒 NetworkManager (应仅用于系统电源管理)
-    System policy prevents putting NetworkManager to sleep or waking it up
-    Политиката на системата не позволява приспиване и събуждане на NetworkManager
-    La política del sistema impedeix posar el NetworkManager a dormir o despertar-lo
-    Systémová zásada zamezuje NetworkManager uspat nebo probudit
-    Systempolitik forhindrer at sætte NetworkManager i hvile eller at vække den
-    Die Systemrichtlinien verhindern das in den Schlaf versetzen oder Aufwecken von NetworkManager
-    Η πολιτική του συστήματος δεν επιτρέπει να τίθεται η διαχείριση δικτύου σε αδράνεια ή να ενεργοποιείται.
-    Sistempolitiko preventas dormigi aŭ veki NetworkManager
-    La política del sistema evita poner a NetworkManager a dormir o despertarlo
-    La politique du système empêche la mise en veille et le réveil de NetworkManager
-    A normativa do sistema evita poñer o NetworkManager en suspensión ou espertalo
-    NetworkManager को स्लीप या वेकअप स्थिति में लाने के लिए नेटवर्कमैनेजर रोकता है
-    A rendszer házirendje megakadályozza a Hálózatkezelő elaltatását vagy felébresztését
-    Kebijakan sistem mencegah menidurkan NetworkManager atau membangunkannya
-    La politica di sistema impedisce di sospendere e riattivare NetworkManager
-    NetworkManager ಅನ್ನು ನಿದ್ರಾಸ್ಥಿತಿಗೆ ಅಥವ ಎಚ್ಚರಸ್ಥಿತಿಗೆ ಕಳುಹಿಸುವುದನ್ನು ವ್ಯವಸ್ಥೆಯ ನಿಯಮವು ತಡೆಯುತ್ತಿದೆ
-    시스템 정책이 네트워크 관리 프로그램의 일시 중지나 다시 시작을 금지합니다
-    Sistemos politika neleidžia užmigdyti arba pažadinti NetworkManager
-    നെറ്റ്​വര്‍ക്ക് മാനേജറിനെ ഉറക്കുന്നതും ഉണര്‍ത്തുന്നതും സിസ്റ്റം പോളിസി തടയുന്നു
-    प्रणाली करार NetworkManager ला स्लीप किंवा वेकअप मध्ये जाण्यापासून रोखते
-    ତନ୍ତ୍ର ନିତୀ NetworkManager କୁ ସୁପ୍ତ କିମ୍ବା ଜାଗ୍ରତ ରହିବାରୁ ବାରଣ କରିଥାଏ
-    ਸਿਸਟਮ ਪਾਲਸੀ ਨੈੱਟਵਰਕਮੈਨੇਜਰ ਨੂੰ ਸਲੀਪ ਜਾਂ ਵੇਕਅੱਪ ਕਰਨ ਤੋਂ ਰੋਕਦੀ ਹੈ
-    Polityka systemu powstrzymuje umieszczenie usługi NetworkManager w stanie uśpienia lub przebudzenie go
-    Políticas de sistema previnem que se coloque o NetworkManager para dormir ou acordar
-    Системная политика не разрешает переводить NetworkManager в режим сна или пробуждать его
-    Sistemska določila preprečujejo postavitev programa NetworkManager v mirovanje ali iz njega.
-    Овлашћења система онемогућавају успављивање Управника мрежом
-    Ovlašćenja sistema onemogućavaju uspavljivanje Upravnika mrežom
-    Systemets policy förhindrar att Nätverkshanterare försätts i vänteläge eller återställs efter det
-    నెట్వర్కుమేనేజర్‌ను స్లీప్‌నకు లేదా దానిని మెల్కొలుపుటకు వుంచుటను సిస్టమ్ విధానము నిరోధించుచున్నది
-    Sistem kuralları, NetworkManager'ı uykuda konumuna getirmeyi veya uyandırmayı engelliyor
-    Правила системи забороняють присипляння та поновлення роботи NetworkManager
-    系统策略阻止挂起或唤醒 NetworkManager
-    
-      no
-      no
-    
-  
-
-  
-    Enable or disable WiFi devices
-    Включване и изключване на устройства за безжични мрежи
-    Habilita o inhabilita els dispositius Wi-Fi
-    Povolit nebo zakázat zařízení WiFi
-    Aktiver eller deaktiver WiFi-enheder
-    WLAN-Geräte aktivieren oder deaktivieren
-    Ενεργοποίηση ή απενεργοποίηση συσκευών ασύρματης δικτύωσης (WiFi)
-    Enŝalti aŭ elŝalti WiFi-aparatojn
-    Activar o desactivar los dispositivos inalámbricos
-    Activer ou désactiver des périphériques WiFi
-    Activar ou desactivar os dispositivos WiFi
-    WiFi युक्तियाँ सक्रिय या निष्क्रिय करें
-    Omogućuje ili onemogućuje WiFi uređaje
-    WiFi eszközök be- és kikapcsolása
-    Aktifkan atau matikan perangkat WiFi
-    Abilitare o disabilitare i dispositivi WiFi
-    WiFi ಸಾಧನಗಳನ್ನು ಶಕ್ತಗೊಳಿಸಿ ಅಥವ ಅಶಕ್ತಗೊಳಿಸಿ
-    WiFi 장치 사용 여부
-    Įjungti arba išjungti WiFi įrenginius
-     WiFi ഡിവൈസുകള്‍ പ്രവര്‍ത്തനസജ്ജമാക്കുകയോ പ്രവര്‍ത്തനരഹിതമാക്കുകയോ ചെയ്യുക
-    WiFi साधने सुरू किंवा बंद करा
-    WiFi ଉପକରଣଗୁଡ଼ିକୁ ସକ୍ରିୟ କିମ୍ବା ନିଷ୍କ୍ରିୟ କରନ୍ତୁ
-    ਵਾਈ-ਫਾਈ ਜੰਤਰ ਚਾਲੂ ਜਾਂ ਬੰਦ ਕਰੋ
-    Włączenie lub wyłączenie urządzeń WiFi
-    Habilita ou desabilita dispositivos WiFi
-    Включить или выключить устройства WiFi
-    Omogoči ali onemogoči naprave WiFi
-    Омогући или онемогући бежичне уређаје
-    Omogući ili onemogući bežične uređaje
-    Aktivera eller inaktivera WiFi-enheter
-    WiFi పరికరములను చేతనము లేదా అచేతనము చేయుము
-    WiFi aygıtlarını etkinleştir ya da etkisizleştir
-    Увімкнути або вимкнути пристрої WiFi
-    启用或禁用 WiFi 设备
-    System policy prevents enabling or disabling WiFi devices
-    Политиката на системата не позволява включване и изключване на устройства за безжични мрежи
-    La política del sistema impedeix habilitar o inhabilitar els dispositius Wi-Fi
-    Systémová zásada zamezuje povolit nebo zakázat zařízení WiFi
-    Systempolitik forhindrer aktivering eller deaktivering af WiFi-enheder
-    Die Systemrichtlinien verhindern die Aktivierung oder Deaktivierung von WLAN-Geräten
-    Η πολιτική συστήματος δεν επιτρέπει ενεργοποίηση ή απενεργοποίηση συσκευών ανοιχτού ασύρματου δικτύου (WiFi)
-    Sistempolitiko preventas enŝalton aŭ elŝalton de WiFi-aparatoj
-    La política de sistema evita activar o desactivar los dispositivos inalámbricos
-    La politique du système empêche l'activation ou la désactivation de périphériques WiFi
-    A normativa do sistema evita a activación e desactivación dos dispositivos WiFi
-    WiFi युक्ति के सक्रियण या निष्क्रियण को तंत्र नीति रोकता है
-    A rendszer házirendje megakadályozza a WiFi eszközök be- vagy kikapcsolását
-    Kebijakan sistem mencegah mengaktifkan atau mematikan perangkat WiFi
-    La politica di sistema impedisce di abilitare o disabilitare i dispositivi WiFi
-    WiFi ಸಾಧನವನ್ನು ಶಕ್ತ ಅಥವ ಅಶಕ್ತಗೊಳಿಸದಂತೆ ವ್ಯವಸ್ಥೆಯ ನಿಯಮಗಳು ತಡೆಯುತ್ತಿವೆ
-    시스템 정책이 WiFi 장치 사용 여부 설정을 금지합니다
-    Sistemos politika neleidžia įjungti arba išjungti WiFi įrenginių
-    WiFi ഡിവൈസുകള്‍ പ്രവര്‍ത്തനസജ്ജമാക്കുകയോ പ്രവര്‍ത്തനരഹിതമാക്കുകയോ ചെയ്യുന്നത് സിസ്റ്റം പോളിസി തടയുന്നു
-    प्रणाली करार WiFi साधनांना सुरू किंवा बंद होण्यापासून रोखते
-    ତନ୍ତ୍ର ନିତୀ WiFi ଉପକରଣଗୁଡ଼ିକୁ ସକ୍ରିୟ କିମ୍ବା ନିଷ୍କ୍ରିୟ ହେବାରୁ ବାରଣ କରିଥାଏ
-    ਸਿਸਟਮ ਪਾਲਸੀ ਵਾਈ-ਫਾਈ ਜੰਤਰ ਚਾਲੂ ਜਾਂ ਬੰਦ ਕਰਨੋਂ ਰੋਕਦੀ ਹੈ
-    Polityka systemu powstrzymuje włączanie lub wyłączanie urządzeń WiFi
-    Políticas de sistema previnem a habilitação ou desabilitação de dispositivos WiFi
-    Системная политика запрещает включение и выключение WiFi устройств
-    Sistemska določila preprečujejo omogočanja ali onemogočanje WiFi naprav
-    Овлашћења система онемогућавају управљање бежичним уређајима
-    Ovlašćenja sistema onemogućavaju upravljanje bežičnim uređajima
-    Systemets policy förhindrar aktivering eller inaktivering av WiFi-enheter
-    WiFi పరికరములను చేతనము చేయుటకు లేదా అచేతనము చేయుటకు సిస్టమ్ విధానము నిరోధించుచున్నది
-    Sistem kuralları, WiFi aygıtlarını etkinleştirmeyi ya da etkisizleştirmeyi engelliyor
-    Правила системи забороняють вмикання або вимикання пристроїв WiFi
-    系统策略阻止启用或禁用 WiFi 设备
-    
-      no
-      yes
-    
-  
-
-  
-    Enable or disable mobile broadband devices
-    Включване и изключване на устройства за достъп до мобилни мрежи
-    Habilita o inhabilita els dispositius de banda ampla mòbil
-    Povolit nebo zakázat mobilní širokopásmová zařízení
-    Aktiver eller deaktiver mobile bredbåndsenheder
-    Mobile Breitbandgeräte aktivieren oder deaktivieren
-    Ενεργοποίηση ή απενεργοποίηση συσκευών ευρυζωνικότητας κινητής τηλεφωνίας
-    Enŝalti aŭ elŝalti poŝtelefonajn larĝkapacitajn aparatojn
-    Activar o desactivar los dispositivos de banda ancha móvil
-    Activer ou désactiver des périphériques mobiles à large bande
-    Activar ou desactivar os dispositivos de banda ancha móbiles
-    मोबाइल ब्राडबैंड युक्तियाँ सक्रिय या निष्क्रिय करें
-    Omogućuje ili onemogućuje mobilne širokopojasne uređaje
-    Mobil széles sávú eszközök be- és kikapcsolása
-    Aktifkan atau matikan perangkat broadband bergerak
-    Abilitare o disabilitare i dispositivi a banda larga mobile
-    ಮೊಬೈಲ್ ಬ್ರಾಡ್‌ಬ್ಯಾಂಡ್ ಸಾಧನಗಳನ್ನು ಶಕ್ತಗೊಳಿಸಿ ಅಥವ ಅಶಕ್ತಗೊಳಿಸಿ
-    모바일 광대역 장치 사용 여부
-    Įjungti arba išjungti mobiliojo plačiajuosčio ryšio įrenginius
-    മുബൈല്‍ ബ്രോഡ്ബാന്റ് ഡിവൈസുകള്‍ പ്രവര്‍ത്തനസജ്ജമാക്കുകയോ പ്രവര്‍ത്തനരഹിതമാക്കുകയോ ചെയ്യുക
-    मोबाईल ब्रॉडबँड साधने सुरू किंवा बंद करा
-    ମୋବାଇଲ ବ୍ରୋଡବ୍ୟାଣ୍ଡ ଉପକରଣଗୁଡ଼ିକୁ ସକ୍ରିୟ କିମ୍ବା ନିଷ୍କ୍ରିୟ କରନ୍ତୁ
-    ਮੋਬਾਇਲ ਬਰਾਡਬੈਂਡ ਜੰਤਰ ਚਾਲੂ ਜਾਂ ਬੰਦ
-    Włączenie lub wyłączenie urządzeń komórkowych
-    Habilita ou desabilita dispositivos móveis de banda larga
-    Включить или выключить устройства мобильных сетей
-    Omogoči ali onemogoči naprave mobilnih širokopasovnih storitev
-    Омогући или онемогући мобилне широкопојасне уређаје
-    Omogući ili onemogući mobilne širokopojasne uređaje
-    Aktivera eller inaktivera mobila bredbandsenheter
-    మొబైల్ బ్రాడ్‌బాండ్ పరికరములను చేతనము లేదా అచేతనము చేయుము
-    Mobil genişbant aygıtlarını etkinleştir ya da etkisizleştir
-    Увімкнути або вимкнути пристрої широкосмугових мобільних мереж
-    启用或禁用移动宽带设备
-    System policy prevents enabling or disabling mobile broadband devices
-    Политиката на системата не позволява включване и изключване на устройства за мобилни мрежи
-    La política del sistema impedeix habilitar o inhabilitar els dispositius de banda ampla mòbil
-    Systémová zásada zamezuje povolení nebo zakázání mobilních širokopásmových zařízení
-    Systempolitik forhindrer aktivering eller deaktivering af mobile bredbåndsenheder
-    Die Systemrichtlinien verhindern die Aktivierung oder Deaktivierung mobiler Breitbandgeräte
-    Η πολιτική του συστήματος δεν επιτρέπει την ενεργοποίηση ή απενεργοποίηση συσκευών ευρυζωνικότητας κινητής τηλεφωνίας
-    Sistempolitiko preventas enŝalton aŭ elŝalton de poŝtelefonaj larĝkapacitaj aparatoj
-    La política del sistema evita activar o desactivar los dispositivos de banda ancha móvil
-    La politique du système empêche l'activation ou la désactivation de périphériques mobiles à large bande
-    A normativa do sistema evita a activación ou desactivación dos dispositivos de banda ancha.
-    मोबाइल ब्रॉडबैंड युक्ति के सक्रियण या निष्क्रियण को तंत्र नीति रोकता है
-    A rendszer házirendje megakadályozza a mobil széles sávú eszközök be- vagy kikapcsolását
-    Kebijakan sistem mencegah mengaktifkan atau mematikan perangkat broadband bergerak
-    La politica di sistema impedisce di abilitare o disabilitare i dispositivi a banda larga mobile
-    ಮೊಬೈಲ್ ಬ್ರಾಡ್‌ಬ್ಯಾಂಡ್ ಸಾಧನಗಳನ್ನು ಶಕ್ತ ಅಥವ ಅಶಕ್ತಗೊಳಿಸದಂತೆ ವ್ಯವಸ್ಥೆಯ ನಿಯಮಗಳು ತಡೆಯುತ್ತಿವೆ
-    시스템 정책이 모바일 광대역 장치의 사용 여부 설정을 금지합니다
-    Sistemos politika neleidžia įjungti arba išjungti mobiliojo plačiajuosčio ryšio įrenginių
-    മുബൈല്‍ ബ്രോഡ്ബാന്റ് ഡിവൈസുകള്‍ പ്രവര്‍ത്തനസജ്ജമാക്കുകയോ പ്രവര്‍ത്തനരഹിതമാക്കുകയോ ചെയ്യുന്നത് സിസ്റ്റം പോളിസി തടയുന്നു
-    प्रणाली करार मोबाईल ब्रॉडबँड साधनांना सुरू किंवा बंद होण्यापासून रोखते
-    ତନ୍ତ୍ର ନିତୀ ମୋବାଇଲ ବ୍ରୋଡବ୍ୟାଣ୍ଡ ଉପକରଣଗୁଡ଼ିକୁ ସକ୍ରିୟ କିମ୍ବା ନିଷ୍କ୍ରିୟ ହେବାରୁ ବାରଣ କରିଥାଏ
-    ਸਿਸਟਮ ਪਾਲਸੀ ਮੋਬਾਇਲ ਬਰਾਡਬੈਂਡ ਜੰਤਰ ਚਾਲੂ ਜਾਂ ਬੰਦ ਕਰਨ ਤੋਂ ਰੋਕਦੀ ਹੈ
-    Polityka systemu powstrzymuje włączenie lub wyłączenie urządzeń komórkowych
-    Políticas de sistema previnem a habilitação ou desabilitação de dispositivos móveis de banda larga
-    Системная политика запрещает включение или выключение устройств мобильной связи
-    Sistemska določila preprečuje omogočanja ali onemogočanje mobilne širokopasovne naprave
-    Овлашћења система онемогућавају управљање мобилним широкопојасним уређајима
-    Ovlašćenja sistema onemogućavaju upravljanje mobilnim širokopojasnim uređajima
-    Systemets policy förhindrar aktivering eller inaktivering av mobila bredbandsenheter
-    మొబైల్ బ్రాడ్‌బాండ్ పరికరములను చేతనముచేయుటకు లేదా అచేతనముచేయుటకు సిస్టమ్ విధానము నిరోధించుచున్నది
-    Sistem kuralları, mobil genişbant aygıtlarını etkinleştirmeyi ya da etkisizleştirmeyi engelliyor
-    Правила системи забороняють вмикання або вимикання пристроїв широкосмугових мобільних мереж
-    系统策略阻止启用或禁用移动宽带设备
-    
-      no
-      yes
-    
-  
-
-  
-    Enable or disable WiMAX mobile broadband devices
-    Включване и изключване на устройства за достъп до мобилни мрежи по WiMAX
-    Habilita o inhabilita els dispositius de banda ampla mòbil WiMAX
-    Povolit nebo zakázat mobilní širokopásmová zařízení WiMAX
-    Mobile WiMAX-Breitbandgeräte aktivieren oder deaktivieren
-    Enŝalti aŭ elŝalti WiMAX-larĝkapacitajn aparatojn
-    Activar o desactivar los dispositivos de banda ancha móvil WiMAX
-    Activer ou désactiver des périphériques WiMAX à large bande
-    Activar ou desactivar os dispositivos de banda larga móbil WIMAX
-    Omogućuje ili onemogućuje WiMAX mobilne širokopojasne uređaje
-    WiMAX mobil széles sávú eszközök be- és kikapcsolása
-    Aktifkan atau matikan perangkat broadband bergerak WiMAX
-    Abilitare o disabilitare dispositivi WiMAX a banda larga mobile
-    와이맥스 모바일 광대역 장치 사용 여부
-    Įjungti arba išjungti WiMAX mobiliojo plačiajuosčio ryšio įrenginius
-    WiMAX മുബൈല്‍ ബ്രോഡ്ബാന്റ് ഡിവൈസുകള്‍ പ്രവര്‍ത്തനസജ്ജമാക്കുകയോ പ്രവര്‍ത്തനരഹിതമാക്കുകയോ ചെയ്യുക
-    WiMAX मोबाईल ब्रॉडबँड साधने सुरू किंवा बंद करा
-    Włączenie lub wyłączenie urządzeń komórkowych WiMAX
-    Habilita ou desabilita dispositivos móveis WiMAX
-    Включить или выключить устройства мобильных сетей WiMax
-    Omogoči ali onemogoči mobilne širokopasovne naprave WiMAX
-    Aktivera eller inaktivera mobila WiMAX-bredbandsenheter
-    WiMAX mobil genişbant aygıtlarını etkinleştir ya da etkisizleştir
-    Увімкнути або вимкнути пристрої широкосмугових мобільних мереж WiMAX
-    System policy prevents enabling or disabling WiMAX mobile broadband devices
-    Политиката на системата не позволява включване и изключване на устройства за мобилни мрежи по WiMAX
-    La política del sistema impedeix habilitar o inhabilitar els dispositius de banda ampla mòbil WiMAX
-    Systémová zásada zamezuje povolení nebo zakázání mobilních širokopásmových zařízení WiMAX
-    Die Systemrichtlinien verhindern die Aktivierung oder Deaktivierung mobiler WiMAX-Breitbandgeräte
-    Sistempolitiko preventas enŝalton aŭ elŝalton de larĝkapacitaj WiMAX-aparatoj
-    La política del sistema evita activar o desactivar los dispositivos de banda ancha móvil WiMAX
-    La politique du système empêche l'activation ou la désactivation de périphériques WiMAX à large bande
-    A normativa do sistema evita activar ou desactivar os dispositivos de banda larga móbil WIMAX.
-    A rendszer házirendje megakadályozza a WiMAX mobil széles sávú eszközök be- vagy kikapcsolását
-    Kebijakan sistem mencegah mengaktifkan atau mematikan perangkat broadband bergerak WiMAX
-    La politica di sistema impedisce di abilitare o disabilitare i dispositivi WiMAX a banda larga mobile
-    시스템 정책이 와이맥스 모바일 광대역 장치의 사용 여부 설정을 금지합니다
-    Sistemos politika neleidžia įjungti arba išjungti WiMAX mobiliojo plačiajuosčio ryšio įrenginių
-    iMAX മുബൈല്‍ ബ്രോഡ്ബാന്റ് ഡിവൈസുകള്‍ പ്രവര്‍ത്തനസജ്ജമാക്കുകയോ പ്രവര്‍ത്തനരഹിതമാക്കുകയോ ചെയ്യുന്നത് സിസ്റ്റം പോളിസി തടയുന്നു
-    प्रणाली करार WiMAX मोबाईल ब्रॉडबँड साधनांना सुरू किंवा बंद होण्यापासून रोखते
-    Polityka systemu powstrzymuje włączenie lub wyłączenie urządzeń komórkowych WiMAX
-    Políticas de sistema previnem a habilitação ou desabilitação de dispositivos móveis de banda larga WiMAX
-    Системная политика запрещает включение или выключение устройств мобильной связи WiMAX
-    Sistemska določila preprečujejo omogočanje ali onemogočanje mobilnih širokopasovnih naprav WiMAX
-    Systemets policy förhindrar aktivering eller inaktivering av mobila WiMAX-bredbandsenheter
-    Sistem kuralları, WiMAX mobil genişbant aygıtlarını etkinleştirmeyi ya da etkisizleştirmeyi engelliyor
-    Правила системи забороняють вмикання або вимикання пристроїв широкосмугових мобільних мереж WiMAX
-    
-      no
-      yes
-    
-  
-
-  
-    Allow control of network connections
-    Разрешаване на управлението на мрежовите връзки
-    Permet el control de les connexions de xarxa
-    Povolit ovládání síťových připojení
-    Tillad kontrol af netværksforbindelser
-    Die Kontrolle von Netzwerkverbindungen erlauben
-    Να επιτρέπεται ο έλεγχος των συνδέσεων δικτύου
-    Permesi kontrolon de retkonektoj
-    Permitir controlar las conexiones de red
-    Autoriser le contrôle des connexions réseau
-    Permitir o control das conexións de rede
-    संजाल कनेक्शन के नियंत्रण स्वीकार करें
-    Dozvoli upravljanje mrežnim vezama
-    Hálózati kapcsolatok felügyeletének engedélyezése
-    Ijinkan pengendalian sambungan jaringan
-    Permettere il controllo delle connessioni di rete
-    ಜಾಲಬಂಧ ಸಂಪರ್ಕಗಳನ್ನು ನಿಯಂತ್ರಿಸುವುದನ್ನು ಅನುಮತಿಸಿ
-    네트워크 연결 조작 허용
-    Leisti valdyti tinklo ryšius
-    നെറ്റ്​വര്‍ക്ക് കണക്ഷനുകളെ നിയന്ത്രിക്കുന്നത് അനുവദിക്കുക
-    नेटवर्क जोडणींचे नियंत्रण स्वीकारा
-    ନେଟୱର୍କ ସଂଯୋଗଗୁଡ଼ିକ ପାଇଁ ନିୟନ୍ତ୍ରଣକୁ ଅନୁମତି ଦିଅନ୍ତୁ
-    ਨੈੱਟਵਰਕ ਕੁਨੈਕਸ਼ਨਾਂ ਲਈ ਕੰਟਰੋਲ ਮਨਜ਼ੂਰ
-    Umożliwienie kontroli połączeń sieciowych
-    Permite o controle de conexões de rede
-    Разрешить контроль сетевых подключений
-    Dovoli nadzor omrežnih povezav
-    Дозволи контролу мрежних веза
-    Dozvoli kontrolu mrežnih veza
-    Tillåt kontroll av nätverksanslutningar
-    నెట్వర్కు అనుసంధానముల యొక్క నియంత్రణ అనుమతించుము
-    Ağ bağlantılarının denetimine izin ver
-    Дозволити керування з’єднаннями мережею
-    允许控制网络连接
-    System policy prevents control of network connections
-    Политиката на системата не позволява управляване на мрежовите връзки
-    La política del sistema impedeix el control de les connexions de xarxa
-    Systémová zásada zamezuje ovládání síťových připojení
-    Systempolitik forhindrer kontrol af netværksforbindelser
-    Die Systemrichtlinien verhindern die Kontrolle von Netzwerkverbindungen
-    Η πολιτική συστήματος δεν επιτρέπει τον έλεγχο των συνδέσεων δικτύου
-    Sistempolitiko preventas kontrolon de retkonektoj
-    La política de sistema evita el control de las conexiones de red
-    La politique du système empêche le contrôle des connexions réseau
-    A normativa do sistema evita o control das conexións de rede
-    सिस्टम कनेक्शन के नियंत्रण को सिस्टम नीति रोकता है
-    A rendszer házirendje megakadályozza a hálózati kapcsolatok felügyeletét
-    Kebijakan sistem mencegah pengendalian sambungan jaringan
-    La politica di sistema impedisce di controllare le connessioni di rete
-    ಜಾಲಬಂಧ ಸಂಪರ್ಕಗಳನ್ನು ನಿಯಂತ್ರಿಸುವುದನ್ನು ವ್ಯವಸ್ಥೆಯ ನಿಯಮಗಳು ತಡೆಯುತ್ತಿವೆ
-    시스템 정책이 네트워크 연결 조작을 금지합니다
-    Sistemos politika neleidžia valdyti tinklo ryšių
-     നെറ്റ്​വര്‍ക്ക് കണക്ഷനുകളെ നിയന്ത്രിക്കുന്നത് സിസ്റ്റം പോളിസി തടയുന്നു
-    प्रणाली करार नेटवर्क जोडणीचे नियंत्रण रोखते
-    ତନ୍ତ୍ର ନିତୀ ନେଟୱର୍କ ସଂଯୋଗଗୁଡ଼ିକର ନିୟନ୍ତ୍ରଣକୁ ବାରଣ କରିଥାଏ
-    ਸਿਸਟਮ ਪਾਲਸੀ ਨੈੱਟਵਰਕ ਕੁਨੈਕਸ਼ਨ ਕੰਟਰੋਲ ਕਰਨ ਤੋਂ ਸੋਧ ਤੋਂ ਰੋਕਦੀ ਹੈ
-    Polityka systemu powstrzymuje kontrolę połączeń sieciowych
-    Políticas de sistema previnem o controle de conexões de rede
-    Системная политика запрещает управление подключениями.
-    Sistemska določila preprečujejo nadzor omrežnih povezav
-    Овлашћења система онемогућавају контролу мрежних веза
-    Ovlašćenja sistema onemogućavaju kontrolu mrežnih veza
-    Systemets policy förhindrar kontroll av nätverksanslutningar
-    నెట్వర్కు అనుసంధానముల నియంత్రణను సిస్టమ్ విధానము నిరోధించుచున్నది
-    Sistem kuralları, ağ bağlantılarını denetlemeyi engelliyor
-    Правила системи забороняють керування з’єднаннями
-    系统策略阻止更改网络连接
-    
-      yes
-      yes
-    
-  
-
-  
-    Connection sharing via a protected WiFi network
-    নিৰাপদ ৱাই-ফাইলৈ নে'টৱৰ্কৰ মাধ্যমে সংযোগৰ যৌথ ব্যৱহাৰ
-    Споделяне на връзката през защитена безжична мрежа
-    নিরাপদ ওয়াই-ফাইল নেটওয়ার্কের মাধ্যমে সংযোগের যৌথ ব্যবহার
-    Connexió compartida mitjançant una xarxa Wi-Fi protegida
-    Sdílení připojení přes chráněnou síť WiFi
-    Deling af forbindelse via et beskyttet WiFi-netværk
-    Verbindungsfreigabe über ein geschütztes WLAN-Netzwerk
-    Κοινή χρήση σύνδεσης μέσω προστατευμένου ασύρματου δικτύου
-    Connection sharing via a protected Wi-Fi network
-    Kundivido de konektoj per protektita WiFi-reto
-    Compartir conexión a través de una red WIFI protegida
-    Konexio partekatua babestutako haririk gabeko sarearen bidez
-    Yhteyden jakaminen suojatun langattoman verkon kautta
-    Partage de connexion via un réseau WiFi protégé
-    Conexión compartida a través dunha rede WiFi protexida
-    સુરક્ષિત થયેલ WiFi નેટવર્ક મારફતે જોડાણ વહેંચણી
-    किसी संरक्षित WiFi संजाल के द्वारा कनेक्शन साझा
-    Dijeljenje veze korištenjem zaštićene WiFi mreže
-    Kapcsolatmegosztás védett WiFi hálózaton
-    Berbagi koneksi melalui jaringan WiFi terlindung.
-    Condivisione della connessione attraverso una rete WiFi protetta
-    保護された WiFi ネットワーク経由で接続共有
-    ಒಂದು ಸಂರಕ್ಷಿತವಾದ WiFi ಜಾಲಬಂಧದ ಮೂಲಕ ಸಂಪರ್ಕ ಸಾಧಿಸುವಿಕೆ
-    보호된 WiFi 네트워크를 통한 연결 공유
-    Dalijimasis ryšiu naudojant apsaugotą WiFi tinklą
-    സുരക്ഷിതമായ ഒരു വൈഫൈ നെറ്റ്‌വര്‍ക്ക് വഴി കണക്ഷന്‍ പങ്കിടുക
-    सुरक्षीत WiFi नेटवर्क द्वारे जोडणीचे शेअरींग करा
-    ଗୋଟିଏ ସୁରକ୍ଷିତ WiFi ନେଟୱର୍କରେ ସଂଯୋଗ ସହଭାଗ
-    ਸੁਰੱਖਿਅਤ ਵਾਈ-ਫਾਈ ਨੈੱਟਵਰਕ ਰਾਹੀਂ ਕੁਨੈਕਸ਼ਨ ਸਾਂਝਾ ਕਰੋ
-    Współdzielenie połączenia przez chronioną sieć WiFi
-    Compartilhamento de conexão via rede sem fio protegida
-    Совместное использование соединений в закрытой сети WiFi
-    Souporaba povezave preko zaščitenega WiFi omrežja
-    Веза се дели преко заштићене бежичне мреже
-    Veza se deli preko zaštićene bežične mreže
-    Anslutningsdelning via ett skyddat trådlöst nätverk
-    ஒரு பாதுகாக்கப்ப WiFi நெட்வொர்க்கின் வழியாக இணைப்பு பகிரப்படுகிறது
-    రక్షిత WiFi నెట్వర్కు ద్వారా అనుసంధానపు భాగస్వామ్యము.
-    Korumalı bir WiFi ağı yoluyla bağlantı paylaşımı
-    Спільне використання з’єднання на основі захищеної мережі WiFi
-    通过受保护的 WiFi 网络共享连接
-    透過受保護的 WiFi 網路共享連線
-    System policy prevents sharing connections via a protected WiFi network
-    প্ৰণালীৰ নিয়মনীতিয়ে নিৰাপদ ৱাই-ফাই নে'টৱৰ্কৰ মাধ্যমে সংযোগৰ যৌথ ব্যৱহাৰ প্ৰতিৰোধ কৰিছে
-    Политиката на системата не позволява споделяне на връзки през защитена безжична мрежа
-    সিস্টেমের নিয়মনীতির কারণে, নিরাপদ ওয়াই-ফাই নেটওয়ার্কের মাধ্যমে সংযোগের যৌথ ব্যবহার প্রতিরোধ করা হয়েছে
-    La política del sistema impedeix compartir connexions mitjançant una xarxa Wi-Fi protegida
-    Systémová zásada zabránila sdílení připojení přes chráněnou síť WiFi
-    Systempolitikken forhindrer deling af forbindelser via et beskyttet WiFi-netværk
-    Die Systemrichtlinien verhindern Verbindungsfreigaben über ein geschütztes WLAN-Netzwerk
-    Η πολιτική συστήματος δεν επιτρέπει κοινή χρήση συνδέσεων μέσω προστατευμένου ασύρματου δικτύου
-    System policy prevents sharing connections via a protected Wi-Fi network
-    Sistempolitiko preventas kundividon de konektoj per protektita WiFi-reto
-    La política del sistema evita compartir conexiones a través de una red WiFi protegida
-    Sistemako arauek babestutako haririk gabeko sareen bidez konexioak partekatzea saihesten dute
-    Tietoturvakäytäntö estää yhteyksien jakamisen suojatun langattoman verkon kautta
-    La politique du système empêche tout partage des connexions via un réseau WiFi protégé
-    A política do sistema impide compartir conexións a través dunha rede WiFi protexida
-    સિસ્ટમ પોલિસી એ સુરક્ષિત થયેલ WiFi નેટવર્ક મારફતે વહેંચણી જોડાણોને રોકી રહ્યા છે
-    किसी संरक्षित WiFi संजाल के द्वारा साझा कनेक्शन को सिस्टम नीति रोकता है
-    A rendszer házirendje megakadályozza a kapcsolatok megosztását védett WiFi hálózaton
-    Kebijakan sistem mencegah berbagi sambungan melalui jaringan WiFi terlindung
-    La politica di sistema impedisce di condividere connessioni attraverso una rete WiFi protetta
-    システムポリシーが保護された WiFi ネットワーク経由の接続共有を阻止します。
-    ಒಂದು ಸಂರಕ್ಷಿತವಾದ WiFi ಜಾಲಬಂಧದ ಮೂಲಕ ಸಂಪರ್ಕ ಸಾಧಿಸದಂತೆ ವ್ಯವಸ್ಥೆಯ ನಿಯಮಗಳು ತಡೆಯುತ್ತವೆ
-    시스템 정책이 보호된 WiFi 네트워크를 통한 연결 공유를 금지합니다
-    Sistemos politika nelaidžia dalytis ryšiais naudojant apsaugotą WiFi tinklą
-    സുരക്ഷിതമായ ഒരു വൈഫൈ നെറ്റ്‌വര്‍ക്ക് വഴി കണക്ഷനുകള്‍ പങ്കിടുന്നതു് സിസ്റ്റം പോളിസി തടയുന്നു
-    प्रणाली करार सुरक्षीत WiFi नेटवर्क द्वारे जोडणीचे शेअरींग रोखत आहे
-    ତନ୍ତ୍ର ନିତୀ ଗୋଟିଏ ସୁରକ୍ଷିତ WiFi ନେଟୱର୍କରେ ସଂଯୋଗ ସହଭାଗ କରିବାରେ ବାରଣ କରିଥାଏ
-    ਸਿਸਟਮ ਪਾਲਸੀ ਕੁਨੈਕਸ਼ਨ ਨੂੰ ਸੁਰੱਖਿਅਤ ਵਾਈ-ਫਾਈ ਨੈੱਟਵਰਕ ਰਾਹੀਂ ਸਾਂਝਾ ਕਰਨ ਤੋਂ ਰੋਕਦੀ ਹੈ
-    Polityka systemu powstrzymuje współdzielenie połączeń przez chronioną sieć WiFi
-    Políticas de sistema previnem compartilhamento de conexões através de uma rede sem fio protegida
-    Системная политика запрещает совместное использование соединений в закрытой сети WiFi
-    Sistemska pravila preprečujejo souporabo povezav preko zaščitenega WiFi omrežja
-    Овлашћења система не дозвољавају дељење везе преко заштићене бежичне мреже
-    Ovlašćenja sistema ne dozvoljavaju deljenje veze preko zaštićene bežične mreže
-    Systemets policy förhindrar delning av anslutningar via ett skyddat trådlöst nätverk
-    பாதுகாக்கப்பட்ட WiFi நெட்வொர்க்கின் வழியாக இணைப்புகளை பகிருவதை கணினி பாலிசி தடுக்கிறது
-    రక్షిత WiFi నెట్వర్కు ద్వారా అనుసంధానములను భాగస్వామ్యపరచుట సిస్టమ్ విధానము నిరోధించుచున్నది
-    Sistem kuralları, korumalı kablosuz ağ yoluyla bağlantı paylaşımını önlüyor
-    Правила системи забороняють спільне використання з’єднань за допомогою захищеної мережі WiFi
-    系统策略阻止使用受保护的 WiFi 网络共享连接
-    系統政策讓您無法透過受保護的 WiFi 網路共享連結
-    
-      no
-      yes
-    
-  
-
-  
-    Connection sharing via an open WiFi network
-    উন্মুক্ত ৱাই-ফাই নে'টৱৰ্কৰ মাধ্যমে সংযোগৰ যৌথ ব্যৱহাৰ
-    Споделяне на връзката през отворена безжична мрежа
-    উন্মুক্ত ওয়াই-ফাইল নেটওয়ার্কের মাধ্যমে সংযোগের যৌথ ব্যবহার
-    Connexió compartida mitjançant una xarxa Wi-Fi oberta
-    Sdílení připojení přes otevřenou síť WiFi
-    Deling af forbindelse via et åbent WiFi-netværk
-    Verbindungsfreigabe über ein offenes WLAN-Netzwerk
-    Κοινή χρήση σύνδεσης μέσω ανοιχτού ασύρματου δικτύου
-    Connection sharing via an open Wi-Fi network
-    Kundivido de konektoj per malferma WiFi-reto
-    Compartir conexión a través de una red WIFI abierta
-    Konexio partekatua irekitako haririk gabeko sarearen bidez
-    Yhteyden jakaminen avoimen langattoman verkon kautta
-    Partage de connexion via un réseau WiFi ouvert
-    Conexión compartida a través dunha rede WiFi aberta
-    ખુલ્લા WiFi નેટવર્ક મારફતે જોડાણ વહેંચણી
-    किसी खुले WiFi संजाल के द्वारा कनेक्शन साझा
-    Dijeljenje veze korištenjem otvorene WiFi mreže
-    Kapcsolatmegosztás nyílt WiFi hálózaton
-    Berbagi koneksi melalui jaringan WiFi terbuka
-    Condivisione della connessione attraverso una rete WiFi aperta
-    開放した WiFi ネットワーク経由で接続共有
-    ಒಂದು ಮುಕ್ತವಾದ WiFi ಜಾಲಬಂಧದ ಮೂಲಕ ಸಂಪರ್ಕ ಸಾಧಿಸುವಿಕೆ
-    열린 WiFi 네트워크를 통한 연결 공유
-    Dalijimasis ryšiu naudojant atvirą WiFi tinklą
-    ഒരു തുറന്ന വൈഫൈ നെറ്റ്‌വര്‍ക്ക് വഴി കണക്ഷന്‍ പങ്കിടുക
-    ओपन WiFi नेटवर्क द्वारे कनेक्शन शेअरींग करा
-    ଗୋଟିଏ ଖୋଲା WiFi ନେଟୱର୍କରେ ସଂଯୋଗ ସହଭାଗ
-    ਓਪਨ ਵਾਈ-ਫਾਈ ਨੈੱਟਵਰਕ ਰਾਹੀਂ ਕੁਨੈਕਸ਼ਨ ਸਾਂਝਾ ਕਰੋ
-    Współdzielenie połączenia przez otwartą sieć WiFi
-    Compartilhamento de conexão via rede sem fio aberta
-    Совместное использование соединений в открытой сети WiFi
-    Souporaba povezave preko odprtega WiFi omrežja
-    Веза се дели преко отворене бежичне мреже
-    Veza se deli preko otvorene bežične mreže
-    Anslutningsdelning via ett öppet trådlöst nätverk
-    ஒரு திறந்த WiFi நெட்வொர்க்கின் வழியாக இணைப்பு பகிரப்படுகிறது
-    ఓపెన్ WiFi నెట్వర్కు ద్వారా అనుసంధానపు భాగస్వామ్యము
-    Açık bir Wfi ağı yoluyla bağlantı paylaşımı
-    Спільне використання з’єднання на основі відкритої мережі WiFi
-    通过公开 WiFi 网络共享连接
-    透過開放的 WiFi 網路共享連線
-    System policy prevents sharing connections via an open WiFi network
-    প্ৰণালীৰ নিয়মনীতিয়ে উন্মুক্ত ৱাই-ফাই নে'টৱৰ্কৰ মাধ্যমে সংযোগৰ যৌথ ব্যৱহাৰ প্ৰতিৰোধ কৰিছে
-    Политиката на системата не позволява споделяне на връзки през отворена безжична мрежа
-    সিস্টেমের নিয়মনীতির কারণে, উন্মুক্ত ওয়াই-ফাই নেটওয়ার্কের মাধ্যমে সংযোগের যৌথ ব্যবহার প্রতিরোধ করা হয়েছে
-    La política del sistema impedeix compartir connexions mitjançant una xarxa Wi-Fi oberta
-    Systémová zásada zabránila sdílení připojení přes otevřenou síť WiFi
-    Systempolitikken forhindrer deling af forbindelser via et åbent WiFi-netværk
-    Die Systemrichtlinien verhindern Verbindungsfreigaben über ein offenes WLAN-Netzwerk
-    Η πολιτική συστήματος δεν επιτρέπει κοινή χρήση συνδέσεων μέσω ανοιχτού ασύρματου δικτύου
-    System policy prevents sharing connections via an open Wi-Fi network
-    Sistempolitiko preventas kundividon de konektoj per malferma WiFi-reto
-    La política del sistema evita compartir conexiones a través de una red WiFi abierta
-    Sistemako arauek irakitako haririk gabeko sareen bidez konexioak partekatzea saihesten dute
-    Tietoturvakäytäntö estää yhteyksien jakamisen avoimen langattoman verkon kautta
-    La politique du système empêche tout partage des connexions via un réseau WiFi ouvert
-    A política do sistema impide compartir conexións a través dunha rede WiFi aberta
-    સિસ્ટમ પોલિસી એ ખુલ્લા WiFi નેટવર્ક મારફતે વહેંચણી જોડાણોને રોકી રહ્યા છે
-    किसी खुले WiFi संजाल के द्वारा साझा कनेक्शन को सिस्टम नीति रोकता है
-    A rendszer házirendje megakadályozza a kapcsolatok megosztását nyílt WiFi hálózaton
-    Kebijakan sistem mencegah berbagi sambungan melalui jaringan WiFi terbuka
-    La politica di sistema impedisce di condividere connessioni attraverso una rete WiFi aperta
-    システムポリシーが開放した WiFi ネットワーク経由の接続共有を阻止します。
-    ಒಂದು ಮುಕ್ತವಾದ WiFi ಜಾಲಬಂಧದ ಮೂಲಕ ಸಂಪರ್ಕ ಸಾಧಿಸದಂತೆ ವ್ಯವಸ್ಥೆಯ ನಿಯಮಗಳು ತಡೆಯುತ್ತವೆ
-    시스템 정책이 열린 WiFi 네트워크를 통한 연결 공유를 금지합니다
-    Sistemos politika neleidžia dalytis ryšiais naudojant atvirą WiFi tinklą
-    ഒരു തുറന്ന വൈഫൈ നെറ്റ്‌വര്‍ക്ക് വഴി കണക്ഷനുകള്‍ പങ്കിടുന്നതു് സിസ്റ്റം പോളിസി തടയുന്നു
-    प्रणाली करार ओपन WiFi नेटवर्क द्वारे जोडणीचे शेअरींग रोखत आहे
-    ତନ୍ତ୍ର ନିତୀ ଗୋଟିଏ ଖୋଲା WiFi ନେଟୱର୍କରେ ସଂଯୋଗ ସହଭାଗ କରିବାରେ ବାରଣ କରିଥାଏ
-    ਸਿਸਟਮ ਪਾਲਸੀ ਕੁਨੈਕਸ਼ਨ ਨੂੰ ਓਪਨ ਵਾਈ-ਫਾਈ ਨੈੱਟਵਰਕ ਰਾਹੀਂ ਸਾਂਝਾ ਕਰਨ ਤੋਂ ਰੋਕਦੀ ਹੈ
-    Polityka systemu powstrzymuje współdzielenie połączeń przez otwartą sieć WiFi
-    Políticas de sistema previnem compartilhamento de conexões através de uma rede sem fio aberta
-    Системная политика запрещает совместное использование соединений в открытой сети WiFi
-    Sistemska pravila preprečujejo souporabo povezav preko odprtega WiFi omrežja
-    Овлашћења система не дозвољавају дељење везе преко отворене бежичне мреже
-    Ovlašćenja sistema ne dozvoljavaju deljenje veze preko otvorene bežične mreže
-    Systemets policy förhindrar delning av anslutningar via ett öppet trådlöst nätverk
-    திறந்த WiFi நெட்வொர்க்கின் வழியாக இணைப்புகளை பகிருவதை கணினி பாலிசி தடுக்கிறது
-    ఓపెన్ WiFi నెట్వర్కు ద్వారా అనుసంధానములను భాగస్వామ్యపరచుట సిస్టమ్ విధానము నిరోధించుచున్నది
-    Sistem kuralları, korumasız kablosuz ağ yoluyla bağlantı paylaşımını önlüyor
-    Правила системи забороняють спільне використання з’єднань за допомогою відкритої мережі WiFi
-    系统策略阻止使用公开 WiFi 网络共享连接
-    系統政策讓您無法透過開放的 WiFi 網路共享連線
-    
-      no
-      yes
-    
-  
-
-  
-    Modify personal network connections
-    Měnit osobní síťová připojení
-    Eigene Netzwerkverbindungen bearbeiten
-    Modifi proprajn retkonektojn
-    Modificar las conexiones de red personales
-    Modifier les connexions du réseau personnel
-    Modificar as conexións de rede persoais
-    Személyes hálózati kapcsolatok módosítása
-    Ubah koneksi jaringan personal
-    Modificare le connessioni personali
-    개인 네트워크 연결을 수정합니다
-    Keisti asmeninius tinklo ryšius
-    സ്വന്തമായ നെറ്റ്​വര്‍ക്ക് കണക്ഷനുകളില്‍ മാറ്റം വരുത്തുക
-    वैयक्तिक नेटवर्क जोडणी संपादित करा
-    Modyfikacja osobistych połączeń sieciowych
-    Modificar conexões pessoais de rede
-    Редактировать личные настройки подключения
-    Spremeni osebne omrežne povezave
-    Ändra personliga nätverksanslutningar
-    Kişisel ağ bağlantılarını düzenle
-    Змінити параметри особистих з’єднань з мережею
-    System policy prevents modification of personal network settings
-    Systémová zásada zabránila změně osobního síťového nastavení
-    Die Systemrichtlinien verhindern das Bearbeiten von eigenen Netzwerkeinstellungen
-    Sistempolitiko preventas modifadon de propraj retagordoj
-    La política del sistema evita la modificación de la configuración personal de la red
-    La politique du système empêche toute modification des paramètres réseau personnels
-    A política do sistema impide a modificación da configuración persoal da rede
-    A rendszer házirendje megakadályozza a személyes hálózati beállítások módosítását
-    Kebijakan sistem mencegah pengubahan tatanan jaringan pribadi
-    La politica di sistema impedisce di modificare le impostazioni di rete personali
-    시스템 정책이 개인 네트워크 설정의 수정을 금지합니다
-    Sistemos politika neleidžia keisti asmeninių tinklų nustatymų
-     സ്വന്തമായ നെറ്റ്​വര്‍ക്ക് സജ്ജീകരണങ്ങള്‍ മാറ്റം വരുത്തുന്നതു് സിസ്റ്റം പോളിസി തടയുന്നു
-    प्रणाली करार, व्यक्तिगत नेटवर्क सेटिंग्स् संपादीत करण्यापासून रोखते
-    Polityka systemu powstrzymuje modyfikację osobistych ustawień systemowych
-    Políticas de sistema previnem modificação das configurações pessoais de redes
-    Системная политика запрещает изменение персональных настроек сети
-    Sistemska določila preprečujejo spreminjanje osebnih omrežnih nastavitev
-    Systemets policy förhindrar ändring av personliga nätverksinställningar
-    Sistem kuralları, kişisel ağ ayarlarının değiştirilmesine izin vermiyor
-    Правила системи забороняють внесення змін до особистих параметрів мережі
-    
-      no
-      yes
-    
-  
-
-  
-    Modify network connections for all users
-    Měnit síťová připojení pro všechny uživatele
-    Netzwerkverbindungen für alle Benutzer bearbeiten
-    Modifi retkonektojn por ĉiuj uzantoj
-    Modificar las conexiones de red para todos los usuarios
-    Modifier les connexions réseau pour tous les utilisateurs
-    Modificar as conexións de rede para tódolos usuarios
-    Hálózati kapcsolatok módosítása minden felhasználó számára
-    Ubah koneksi jaringan bagi semua pengguna
-    Modifica le connessioni di sistema per tutti gli utenti
-    모든 사용자의 네트워크 연결을 수정합니다
-    Keisti visų naudotojų tinklo ryšius
-    सर्व वापरकर्त्यांकरीता नेटवर्क जोडणी संपादित करा
-    Modyfikacja połączeń sieciowych dla wszystkich użytkowników
-    Modificar conexões de rede para todos os usuários
-    Изменить подключения доступные всем пользователям
-    Spremeni omrežne povezave za vse uporabnike
-    Ändra nätverksanslutningar för alla användare
-    Tüm kullanıcılar için ağ bağlantılarını düzenle
-    Внести зміни до мережевих з’єднань всіх користувачів
-    System policy prevents modification of network settings for all users
-    Systémová zásada zabránila změně síťového nastavení pro všechny uživatele
-    Die Systemrichtlinien verhindern das Bearbeiten von Netzwerkeinstellungen für alle Benutzer
-    Sistempolitiko preventas modifadon de retagordoj por ĉiuj uzantoj
-    La política del sistema evita la modificación de la configuración de la red para todos los usuarios
-    La politique du système empêche toute modification des paramètres réseau pour tous les utilisateurs
-    A política do sistema impide a modificación da configuración da rede para tódolos usuarios
-    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
-    Kebijakan sistem mencegah pengubahan tatanan sistem bagi semua pengguna
-    La politica di sistema impedisce di modificare le impostazioni di rete per tutti gli utenti
-    시스템 정책이 모든 사용자의 네트워크 설정의 수정을 금지합니다
-    Sistemos politika neleidžia keisti tinklo nustatymų, skirtų visiems naudotojams
-    प्रणाली करार सर्व वापरकर्त्यांना नेटवर्क सेटिंग्स् संपादीत करण्यापासून रोखते
-    Polityka systemu powstrzymuje modyfikację ustawień sieciowych dla wszystkich użytkowników
-    Políticas de sistema previnem modificação das configurações de rede para todos os usuários
-    Системная политика запрещает изменение настроек для всех пользователей
-    Sistemska določila preprečujejo spreminjanje sistemskih nastavitev za vse uporabnike
-    Systemets policy förhindrar ändring av nätverksinställningar för alla användare
-    Sistem kuralları, tüm kullanıcılar için ağ ayarlarının değiştirilmesine izin vermiyor
-    Правила системи забороняють внесення змін до параметрів мережі для всіх користувачів
-    
-      no
-      auth_admin_keep
-    
-  
-
-  
-    Modify persistent system hostname
-    প্ৰণালীৰ স্থায়ী গৃহস্থৰ নাম পৰিবৰ্তন কৰক
-    Промяна на името на хоста
-    সিস্টেমের স্থায়ী হোস্ট-নেম পরিবর্তন করুন
-    Modifica el nom de l'ordinador de forma permanent
-    Měnit trvalý systémový název počítače
-    Ændr fast systemværtsnavn
-    Den ständigen Rechnernamen des Systems bearbeiten
-    Αλλαγή πάγιου ονόματος συστήματος
-    Modify persistent system hostname
-    Modifi permanentan sisteman gastigan nomon
-    Modificar nombre de host de sistema persistente
-    Aldatu sistemako ostalari-izen iraunkorra
-    Muuta järjestelmän verkkonimeä
-    Modifier le nom d'hôte persistant du système
-    Modificar o nome persistente do anfitrión do sistema
-    નિરંતર સિસ્ટમ યજમાનનામને બદલો
-    स्थिर सिस्टम होस्टनेम को सुधारें
-    Állandó rendszergépnév módosítása
-    Ubah nama host sistem yang persisten
-    Modificare il nome host persistente del sistema
-    永続化システムのホスト名を修正
-    ಸ್ಥಿರ ವ್ಯವಸ್ಥೆಯ ಆತಿಥೇಯ ಹೆಸರನ್ನು ಮಾರ್ಪಡಿಸಿ
-    영구적인 시스템 호스트 이름을 수정합니다
-    Keisti pastovų sistemos vardą
-    സിസ്റ്റത്തിന്റെ ഹോസ്റ്റ്നാമത്തില്‍ മാറ്റം വരുത്തുക
-    पर्सिस्टंट प्रणाली यजमाननाव संपादीत करा
-    ସ୍ଥାୟୀ ତନ୍ତ୍ର ହୋଷ୍ଟନାମକୁ ପରିବର୍ତ୍ତନ କରନ୍ତୁ
-    ਸਥਿਰ ਸਿਸਟਮ ਹੋਸਟ-ਨਾਂ ਸੋਧ
-    Modyfikacja trwałej systemowej nazwy komputera
-    Modificar máquina de sistema persistente
-    Изменить постоянное имя узла компьютера
-    Spremeni trajno sistemsko ime gostitelja
-    Трајно измени име хоста
-    Trajno izmeni ime hosta
-    Ändra bestående värdnamn för systemet
-    நிலையான கணினி புரவலப்பெயரை மாற்றியமை
-    నిరంతర సిస్టమ్ హోస్టునామము మార్చుము
-    Direşken sistemin adını değiştir
-    Змінити постійну назву вузла у мережі
-    更改系统固有主机名
-    修改永久系統的主機名稱
-    System policy prevents modification of the persistent system hostname
-    প্ৰণালীত ব্যৱহৃত নিয়ম-নীতিৰ বিধি নিষেধৰ কাৰণে প্ৰণালীৰ স্থায়ী গৃহস্থৰ নাম পৰিবৰ্তন কৰা সম্ভৱ নহয়
-    Политиката на системата не позволява промяна на името на хоста
-    সিস্টেমে ব্যবহৃত নিয়ম-নীতির বিধিনিষেধের কারণে সিস্টেমের স্থায়ী হোস্ট-নেম পরিবর্তন করা সম্ভব নয়
-    La política del sistema impedeix la modificació del nom de l'ordinador de forma permanent
-    Systémová zásada zabránila změně trvalého systémového názvu počítače
-    Systempolitikken forhindrer ændring af det faste systemværtsnavn
-    Die Systemrichtlinien verhindern das Bearbeiten des ständigen Rechnernamens des Systems
-    Η πολιτική συστήματος δεν επιτρέπει τροποποίηση του πάγιου ονόματος συστήματος
-    System policy prevents modification of the persistent system hostname
-    Sistempolitiko preventas modifadon de la konstanta sistem-gastnomo
-    La política del sistema evita la modificación del nombre persistente del sistema
-    Sistemako arauek sistemako ostalari-izen iraunkorra aldatzea saihesten dute
-    Tietoturvakäytäntö estää tietokoneen nimen muuttamisen
-    La politique du système empêche toute modification du nom d'hôte persistant du système
-    A política do sistema impide a modificación do nome do anfitrión do sistema
-    સિસ્ટમ પોલિસી એ નિરંતર સિસ્ટમ યજમાનનામનાં બદલાવને અટકાવે છે
-    सिस्टम नीति स्थिर सिस्टम होस्टनेम के रूपांतरण को रोकता है.
-    A rendszer házirendje megakadályozza a rendszer állandó gépnevének módosítását
-    Kebijakan sistem mencegah pengubahan nama host yang persisten
-    La politica di sistema impedisce di modificare il nome host persistente del sistema
-    システムポリシーが永続化システムのホスト名修正を阻止します。
-    ಸ್ಥಿರ ವ್ಯವಸ್ಥೆಯ ಆತಿಥೇಯ ಹೆಸರನ್ನು ಮಾರ್ಪಡಿಸದಂತೆ ವ್ಯವಸ್ಥೆಯ ನಿಯಮಗಳು ತಡೆಯುತ್ತವೆ
-    시스템 정책이 호스트 이름의 변경을 금지합니다
-    Sistemos politika neleidžia keisti įsiminto sistemos vardo
-    സിസ്റ്റത്തിന്റെ ഹോസ്റ്റ്നാമത്തില്‍ മാറ്റം വരുത്തുന്നതു് സിസ്റ്റം പോളിസി തടയുന്നു
-    प्रणाली करार पर्सिस्टंट प्रणाली यजमाननावाचे संपादन रोखत आहे
-    ତନ୍ତ୍ର ନିତୀ ସ୍ଥାୟୀ ତନ୍ତ୍ର ହୋଷ୍ଟନାମର ପରିବର୍ତ୍ତନକୁ ବାରଣ କରିଥାଏ
-    ਸਿਸਟਮ ਪਾਲਸੀ ਸਥਿਰ ਸਿਸਟਮ ਹੋਸਟ-ਨਾਂ ਲਈ ਸੋਧਾਂ ਤੋਂ ਰੋਕਦੀ ਹੈ
-    Polityka systemu powstrzymuje modyfikację trwałej systemowej nazwy komputera
-    Políticas de sistema previnem modificação da máquina persistente do sistema
-    Системная политика запрещает изменение постоянного имени узла компьютера
-    Sistemska pravila preprečujejo spremembo imena gostitelja trajnega sistema
-    Овлашћења система не дозвољавају измену хоста
-    Ovlašćenja sistema ne dozvoljavaju izmenu hosta
-    Systemets policy förhindrar ändring av bestående värdnamn för systemet
-    நிலையான கணினி புரவலபெயர் மாற்றியமைப்பதை கணினி பாலிசி தடுக்கிறது
-    నిరంతర సిస్టమ్ హోస్టునామమును సవరించుటను సిస్టమ్ విధానము నిరోధించుచున్నది
-    Sistem kuralları, direşken sistemin adının değiştirilmesini önlüyor
-    Правила системи забороняють внесення змін до постійної назви вузла у мережі
-    系统策略阻止更改系统固有主机名
-    系統政策讓您無法修改永久的系統主機名稱
-    
-      no
-      auth_admin_keep
-    
-  
-
-
\ No newline at end of file
diff --git a/policy/org.freedesktop.NetworkManager.policy.in b/policy/org.freedesktop.NetworkManager.policy.in
deleted file mode 100644
index 8e43809f..00000000
--- a/policy/org.freedesktop.NetworkManager.policy.in
+++ /dev/null
@@ -1,112 +0,0 @@
-
-
-
-
-
-  NetworkManager
-  http://www.gnome.org/projects/NetworkManager
-  nm-icon
-
-  
-    <_description>Enable or disable system networking
-    <_message>System policy prevents enabling or disabling system networking
-    
-      no
-      yes
-    
-  
-
-  
-    <_description>Put NetworkManager to sleep or wake it up (should only be used by system power management)
-    <_message>System policy prevents putting NetworkManager to sleep or waking it up
-    
-      no
-      no
-    
-  
-
-  
-    <_description>Enable or disable WiFi devices
-    <_message>System policy prevents enabling or disabling WiFi devices
-    
-      no
-      yes
-    
-  
-
-  
-    <_description>Enable or disable mobile broadband devices
-    <_message>System policy prevents enabling or disabling mobile broadband devices
-    
-      no
-      yes
-    
-  
-
-  
-    <_description>Enable or disable WiMAX mobile broadband devices
-    <_message>System policy prevents enabling or disabling WiMAX mobile broadband devices
-    
-      no
-      yes
-    
-  
-
-  
-    <_description>Allow control of network connections
-    <_message>System policy prevents control of network connections
-    
-      yes
-      yes
-    
-  
-
-  
-    <_description>Connection sharing via a protected WiFi network
-    <_message>System policy prevents sharing connections via a protected WiFi network
-    
-      no
-      yes
-    
-  
-
-  
-    <_description>Connection sharing via an open WiFi network
-    <_message>System policy prevents sharing connections via an open WiFi network
-    
-      no
-      yes
-    
-  
-
-  
-    <_description>Modify personal network connections
-    <_message>System policy prevents modification of personal network settings
-    
-      no
-      yes
-    
-  
-
-  
-    <_description>Modify network connections for all users
-    <_message>System policy prevents modification of network settings for all users
-    
-      no
-      auth_admin_keep
-    
-  
-
-  
-    <_description>Modify persistent system hostname
-    <_message>System policy prevents modification of the persistent system hostname
-    
-      no
-      auth_admin_keep
-    
-  
-
-
-
diff --git a/policy/org.freedesktop.NetworkManager.policy.in.in b/policy/org.freedesktop.NetworkManager.policy.in.in
new file mode 100644
index 00000000..ea3777a4
--- /dev/null
+++ b/policy/org.freedesktop.NetworkManager.policy.in.in
@@ -0,0 +1,112 @@
+
+
+
+
+
+  NetworkManager
+  http://www.gnome.org/projects/NetworkManager
+  nm-icon
+
+  
+    <_description>Enable or disable system networking
+    <_message>System policy prevents enabling or disabling system networking
+    
+      no
+      yes
+    
+  
+
+  
+    <_description>Put NetworkManager to sleep or wake it up (should only be used by system power management)
+    <_message>System policy prevents putting NetworkManager to sleep or waking it up
+    
+      no
+      no
+    
+  
+
+  
+    <_description>Enable or disable WiFi devices
+    <_message>System policy prevents enabling or disabling WiFi devices
+    
+      no
+      yes
+    
+  
+
+  
+    <_description>Enable or disable mobile broadband devices
+    <_message>System policy prevents enabling or disabling mobile broadband devices
+    
+      no
+      yes
+    
+  
+
+  
+    <_description>Enable or disable WiMAX mobile broadband devices
+    <_message>System policy prevents enabling or disabling WiMAX mobile broadband devices
+    
+      no
+      yes
+    
+  
+
+  
+    <_description>Allow control of network connections
+    <_message>System policy prevents control of network connections
+    
+      yes
+      yes
+    
+  
+
+  
+    <_description>Connection sharing via a protected WiFi network
+    <_message>System policy prevents sharing connections via a protected WiFi network
+    
+      no
+      yes
+    
+  
+
+  
+    <_description>Connection sharing via an open WiFi network
+    <_message>System policy prevents sharing connections via an open WiFi network
+    
+      no
+      yes
+    
+  
+
+  
+    <_description>Modify personal network connections
+    <_message>System policy prevents modification of personal network settings
+    
+      no
+      yes
+    
+  
+
+  
+    <_description>Modify network connections for all users
+    <_message>System policy prevents modification of network settings for all users
+    
+      no
+      @NM_MODIFY_SYSTEM_POLICY@
+    
+  
+
+  
+    <_description>Modify persistent system hostname
+    <_message>System policy prevents modification of the persistent system hostname
+    
+      no
+      auth_admin_keep
+    
+  
+
+
+
diff --git a/src/Makefile.am b/src/Makefile.am
index 73104345..db11d6b7 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -8,7 +8,6 @@ SUBDIRS= \
 	ip6-manager \
 	supplicant-manager \
 	ppp-manager \
-	backends \
 	dnsmasq-manager \
 	modem-manager \
 	bluez-manager \
@@ -115,6 +114,7 @@ libtest_wifi_ap_utils_la_LIBADD = \
 sbin_PROGRAMS = NetworkManager
 
 NetworkManager_SOURCES = \
+		nm-types.h \
 		nm-call-store.c \
 		nm-call-store.h \
 		nm-device.c \
@@ -138,6 +138,8 @@ NetworkManager_SOURCES = \
 		nm-device-infiniband.h \
 		nm-device-bond.c \
 		nm-device-bond.h \
+		nm-device-bridge.c \
+		nm-device-bridge.h \
 		nm-device-vlan.c \
 		nm-device-vlan.h \
 		nm-wifi-ap.c \
@@ -192,8 +194,11 @@ NetworkManager_SOURCES = \
 		nm-session-monitor.h \
 		nm-session-utils.c \
 		nm-session-utils.h \
+		nm-sleep-monitor.h \
 		nm-connection-provider.h \
-		nm-connection-provider.c
+		nm-connection-provider.c \
+		nm-dispatcher.c \
+		nm-dispatcher.h
 
 if WITH_CONCHECK
 NetworkManager_SOURCES += nm-connectivity.c nm-connectivity.h
@@ -209,6 +214,13 @@ NetworkManager_SOURCES += nm-session-monitor-null.c
 endif
 endif
 
+if SUSPEND_RESUME_SYSTEMD
+NetworkManager_SOURCES += nm-sleep-monitor-systemd.c
+else
+# UPower suspend/resume used whenever systemd is not enabled
+NetworkManager_SOURCES += nm-sleep-monitor-upower.c
+endif
+
 nm-access-point-glue.h: $(top_srcdir)/introspection/nm-access-point.xml
 	$(AM_V_GEN) dbus-binding-tool --prefix=nm_access_point --mode=glib-server --output=$@ $<
 
@@ -239,6 +251,9 @@ nm-device-olpc-mesh-glue.h: $(top_srcdir)/introspection/nm-device-olpc-mesh.xml
 nm-device-bond-glue.h: $(top_srcdir)/introspection/nm-device-bond.xml
 	$(AM_V_GEN) dbus-binding-tool --prefix=nm_device_bond --mode=glib-server --output=$@ $<
 
+nm-device-bridge-glue.h: $(top_srcdir)/introspection/nm-device-bridge.xml
+	$(AM_V_GEN) dbus-binding-tool --prefix=nm_device_bridge --mode=glib-server --output=$@ $<
+
 nm-device-vlan-glue.h: $(top_srcdir)/introspection/nm-device-vlan.xml
 	$(AM_V_GEN) dbus-binding-tool --prefix=nm_device_vlan --mode=glib-server --output=$@ $<
 
@@ -267,6 +282,7 @@ BUILT_SOURCES = \
 	nm-device-ethernet-glue.h \
 	nm-device-infiniband-glue.h \
 	nm-device-bond-glue.h \
+	nm-device-bridge-glue.h \
 	nm-device-vlan-glue.h \
 	nm-device-adsl-glue.h \
 	nm-device-wifi-glue.h \
@@ -284,25 +300,29 @@ NetworkManager_CPPFLAGS = \
 	$(GLIB_CFLAGS) \
 	$(GUDEV_CFLAGS) \
 	$(LIBNL_CFLAGS) \
-	$(GMODULE_CFLAGS) \
 	$(POLKIT_CFLAGS) \
-	$(SYSTEMD_CFLAGS) \
-	-DG_DISABLE_DEPRECATED \
+	$(SYSTEMD_LOGIN_CFLAGS) \
 	-DBINDIR=\"$(bindir)\" \
 	-DSBINDIR=\"$(sbindir)\" \
 	-DLIBEXECDIR=\"$(libexecdir)\" \
 	-DDATADIR=\"$(datadir)\" \
 	-DSYSCONFDIR=\"$(sysconfdir)\" \
 	-DLOCALSTATEDIR=\"$(localstatedir)\" \
-	-DNM_RUN_DIR=\"$(rundir)\" \
 	-DNMLOCALEDIR=\"$(datadir)/locale\" \
-	-DNMPLUGINDIR=\"$(pkglibdir)\"
+	-DNMPLUGINDIR=\"$(pkglibdir)\" \
+	-DNMCONFDIR=\"$(nmconfdir)\" \
+	-DNMRUNDIR=\"$(nmrundir)\" \
+	-DNMSTATEDIR=\"$(nmstatedir)\" \
 	-DARP_DEBUG
 
 if WITH_CONCHECK
 NetworkManager_CPPFLAGS += $(LIBSOUP_CFLAGS)
 endif
 
+if SESSION_TRACKING_CK
+NetworkManager_CPPFLAGS += -DCKDB_PATH=\"${CKDB_PATH}\"
+endif
+
 NetworkManager_LDADD = \
 	./generated/libnm-generated.la \
 	./logging/libnm-logging.la \
@@ -319,15 +339,13 @@ NetworkManager_LDADD = \
 	./wifi/libwifi-utils.la \
 	./firewall-manager/libfirewall-manager.la \
 	./settings/libsettings.la \
-	./backends/libnmbackend.la \
 	$(top_builddir)/libnm-util/libnm-util.la \
 	$(DBUS_LIBS) \
 	$(GLIB_LIBS) \
 	$(GUDEV_LIBS) \
 	$(LIBNL_LIBS) \
-	$(GMODULE_LIBS) \
 	$(POLKIT_LIBS) \
-	$(SYSTEMD_LIBS) \
+	$(SYSTEMD_LOGIN_LIBS) \
 	$(LIBM) \
 	$(LIBDL)
 
@@ -341,12 +359,11 @@ libexec_PROGRAMS = nm-crash-logger
 nm_crash_logger_SOURCES = nm-crash-logger.c
 nm_crash_logger_CPPFLAGS = \
 	$(GLIB_CFLAGS) \
-	-DG_DISABLE_DEPRECATED \
 	-DBINDIR=\"$(bindir)\" \
-	-DSBINDIR=\"$(sbindir)\" \
-	-DDATADIR=\"$(datadir)\" \
+	-DNMBINARY=\"$(nmbinary)\" \
+	-DNMDATADIR=\"$(nmdatadir)\" \
 	-DSYSCONFDIR=\"$(sysconfdir)\" \
-	-DLOCALSTATEDIR=\"$(localstatedir)\"
+	-DNMSTATEDIR=\"$(nmstatedir)\"
 nm_crash_logger_LDADD = $(GLIB_LIBS)
 
 
@@ -365,6 +382,7 @@ statedir=$(localstatedir)/lib/NetworkManager
 install-data-hook:
 	$(mkinstalldirs) -m 0700 $(DESTDIR)$(rundir)
 	$(mkinstalldirs) -m 0700 $(DESTDIR)$(statedir)
+	$(mkinstalldirs) -m 0755 $(DESTDIR)$(pkglibdir)
 
 CLEANFILES = $(BUILT_SOURCES)
 
diff --git a/src/Makefile.in b/src/Makefile.in
index b286e057..0011a0d3 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -59,23 +59,29 @@ sbin_PROGRAMS = NetworkManager$(EXEEXT)
 @SESSION_TRACKING_SYSTEMD_TRUE@am__append_3 = nm-session-monitor-systemd.c
 @SESSION_TRACKING_CK_TRUE@@SESSION_TRACKING_SYSTEMD_FALSE@am__append_4 = nm-session-monitor-ck.c
 @SESSION_TRACKING_CK_FALSE@@SESSION_TRACKING_SYSTEMD_FALSE@am__append_5 = nm-session-monitor-null.c
-@WITH_CONCHECK_TRUE@am__append_6 = $(LIBSOUP_CFLAGS)
-@WITH_CONCHECK_TRUE@am__append_7 = $(LIBSOUP_LIBS)
+@SUSPEND_RESUME_SYSTEMD_TRUE@am__append_6 = nm-sleep-monitor-systemd.c
+# UPower suspend/resume used whenever systemd is not enabled
+@SUSPEND_RESUME_SYSTEMD_FALSE@am__append_7 = nm-sleep-monitor-upower.c
+@WITH_CONCHECK_TRUE@am__append_8 = $(LIBSOUP_CFLAGS)
+@SESSION_TRACKING_CK_TRUE@am__append_9 = -DCKDB_PATH=\"${CKDB_PATH}\"
+@WITH_CONCHECK_TRUE@am__append_10 = $(LIBSOUP_LIBS)
 libexec_PROGRAMS = nm-crash-logger$(EXEEXT)
 subdir = src
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/compiler_warnings.m4 \
-	$(top_srcdir)/m4/gettext.m4 $(top_srcdir)/m4/gtk-doc.m4 \
-	$(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/intlmacosx.m4 \
-	$(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/introspection.m4 \
-	$(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \
-	$(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/libnl-check.m4 \
-	$(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \
-	$(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
-	$(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/nls.m4 \
-	$(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/progtest.m4 \
-	$(top_srcdir)/m4/vapigen.m4 $(top_srcdir)/configure.ac
+	$(top_srcdir)/m4/gettext.m4 \
+	$(top_srcdir)/m4/gnome-code-coverage.m4 \
+	$(top_srcdir)/m4/gtk-doc.m4 $(top_srcdir)/m4/iconv.m4 \
+	$(top_srcdir)/m4/intlmacosx.m4 $(top_srcdir)/m4/intltool.m4 \
+	$(top_srcdir)/m4/introspection.m4 $(top_srcdir)/m4/lib-ld.m4 \
+	$(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \
+	$(top_srcdir)/m4/libnl-check.m4 $(top_srcdir)/m4/libtool.m4 \
+	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
+	$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
+	$(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/po.m4 \
+	$(top_srcdir)/m4/progtest.m4 $(top_srcdir)/m4/vapigen.m4 \
+	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(install_sh) -d
@@ -112,23 +118,23 @@ libtest_wifi_ap_utils_la_OBJECTS =  \
 am__installdirs = "$(DESTDIR)$(libexecdir)" "$(DESTDIR)$(sbindir)" \
 	"$(DESTDIR)$(NetworkManagerdir)" "$(DESTDIR)$(dbusservicedir)"
 PROGRAMS = $(libexec_PROGRAMS) $(sbin_PROGRAMS)
-am__NetworkManager_SOURCES_DIST = nm-call-store.c nm-call-store.h \
-	nm-device.c nm-device.h nm-device-private.h \
+am__NetworkManager_SOURCES_DIST = nm-types.h nm-call-store.c \
+	nm-call-store.h nm-device.c nm-device.h nm-device-private.h \
 	nm-device-ethernet.c nm-device-ethernet.h nm-device-adsl.c \
 	nm-device-adsl.h nm-device-wifi.c nm-device-wifi.h \
 	nm-device-wired.c nm-device-wired.h nm-device-olpc-mesh.c \
 	nm-device-olpc-mesh.h nm-device-bt.c nm-device-bt.h \
 	nm-device-modem.h nm-device-modem.c nm-device-infiniband.c \
 	nm-device-infiniband.h nm-device-bond.c nm-device-bond.h \
-	nm-device-vlan.c nm-device-vlan.h nm-wifi-ap.c nm-wifi-ap.h \
-	nm-wifi-ap-utils.c nm-wifi-ap-utils.h nm-dbus-manager.h \
-	nm-dbus-manager.c nm-udev-manager.c nm-udev-manager.h \
-	nm-device-factory.h nm-hostname-provider.c \
-	nm-hostname-provider.h nm-ip4-config.c nm-ip4-config.h \
-	nm-ip6-config.c nm-ip6-config.h nm-active-connection.h \
-	nm-active-connection.c nm-config.h nm-config.c main.c \
-	nm-policy.c nm-policy.h nm-policy-hosts.c nm-policy-hosts.h \
-	nm-policy-hostname.c nm-policy-hostname.h \
+	nm-device-bridge.c nm-device-bridge.h nm-device-vlan.c \
+	nm-device-vlan.h nm-wifi-ap.c nm-wifi-ap.h nm-wifi-ap-utils.c \
+	nm-wifi-ap-utils.h nm-dbus-manager.h nm-dbus-manager.c \
+	nm-udev-manager.c nm-udev-manager.h nm-device-factory.h \
+	nm-hostname-provider.c nm-hostname-provider.h nm-ip4-config.c \
+	nm-ip4-config.h nm-ip6-config.c nm-ip6-config.h \
+	nm-active-connection.h nm-active-connection.c nm-config.h \
+	nm-config.c main.c nm-policy.c nm-policy.h nm-policy-hosts.c \
+	nm-policy-hosts.h nm-policy-hostname.c nm-policy-hostname.h \
 	NetworkManagerUtils.c NetworkManagerUtils.h nm-system.c \
 	nm-system.h nm-manager.c nm-manager.h nm-manager-auth.c \
 	nm-manager-auth.h nm-netlink-monitor.c nm-netlink-monitor.h \
@@ -138,15 +144,19 @@ am__NetworkManager_SOURCES_DIST = nm-call-store.c nm-call-store.h \
 	nm-properties-changed-signal.h nm-dhcp4-config.c \
 	nm-dhcp4-config.h nm-dhcp6-config.c nm-dhcp6-config.h \
 	nm-rfkill.h nm-session-monitor.h nm-session-utils.c \
-	nm-session-utils.h nm-connection-provider.h \
-	nm-connection-provider.c nm-connectivity.c nm-connectivity.h \
+	nm-session-utils.h nm-sleep-monitor.h nm-connection-provider.h \
+	nm-connection-provider.c nm-dispatcher.c nm-dispatcher.h \
+	nm-connectivity.c nm-connectivity.h \
 	nm-session-monitor-systemd.c nm-session-monitor-ck.c \
-	nm-session-monitor-null.c
+	nm-session-monitor-null.c nm-sleep-monitor-systemd.c \
+	nm-sleep-monitor-upower.c
 @WITH_CONCHECK_TRUE@am__objects_1 =  \
 @WITH_CONCHECK_TRUE@	NetworkManager-nm-connectivity.$(OBJEXT)
 @SESSION_TRACKING_SYSTEMD_TRUE@am__objects_2 = NetworkManager-nm-session-monitor-systemd.$(OBJEXT)
 @SESSION_TRACKING_CK_TRUE@@SESSION_TRACKING_SYSTEMD_FALSE@am__objects_3 = NetworkManager-nm-session-monitor-ck.$(OBJEXT)
 @SESSION_TRACKING_CK_FALSE@@SESSION_TRACKING_SYSTEMD_FALSE@am__objects_4 = NetworkManager-nm-session-monitor-null.$(OBJEXT)
+@SUSPEND_RESUME_SYSTEMD_TRUE@am__objects_5 = NetworkManager-nm-sleep-monitor-systemd.$(OBJEXT)
+@SUSPEND_RESUME_SYSTEMD_FALSE@am__objects_6 = NetworkManager-nm-sleep-monitor-upower.$(OBJEXT)
 am_NetworkManager_OBJECTS = NetworkManager-nm-call-store.$(OBJEXT) \
 	NetworkManager-nm-device.$(OBJEXT) \
 	NetworkManager-nm-device-ethernet.$(OBJEXT) \
@@ -158,6 +168,7 @@ am_NetworkManager_OBJECTS = NetworkManager-nm-call-store.$(OBJEXT) \
 	NetworkManager-nm-device-modem.$(OBJEXT) \
 	NetworkManager-nm-device-infiniband.$(OBJEXT) \
 	NetworkManager-nm-device-bond.$(OBJEXT) \
+	NetworkManager-nm-device-bridge.$(OBJEXT) \
 	NetworkManager-nm-device-vlan.$(OBJEXT) \
 	NetworkManager-nm-wifi-ap.$(OBJEXT) \
 	NetworkManager-nm-wifi-ap-utils.$(OBJEXT) \
@@ -185,8 +196,9 @@ am_NetworkManager_OBJECTS = NetworkManager-nm-call-store.$(OBJEXT) \
 	NetworkManager-nm-dhcp6-config.$(OBJEXT) \
 	NetworkManager-nm-session-utils.$(OBJEXT) \
 	NetworkManager-nm-connection-provider.$(OBJEXT) \
-	$(am__objects_1) $(am__objects_2) $(am__objects_3) \
-	$(am__objects_4)
+	NetworkManager-nm-dispatcher.$(OBJEXT) $(am__objects_1) \
+	$(am__objects_2) $(am__objects_3) $(am__objects_4) \
+	$(am__objects_5) $(am__objects_6)
 NetworkManager_OBJECTS = $(am_NetworkManager_OBJECTS)
 @WITH_CONCHECK_TRUE@am__DEPENDENCIES_2 = $(am__DEPENDENCIES_1)
 NetworkManager_DEPENDENCIES = ./generated/libnm-generated.la \
@@ -202,13 +214,12 @@ NetworkManager_DEPENDENCIES = ./generated/libnm-generated.la \
 	./modem-manager/libmodem-manager.la \
 	./bluez-manager/libbluez-manager.la ./wifi/libwifi-utils.la \
 	./firewall-manager/libfirewall-manager.la \
-	./settings/libsettings.la ./backends/libnmbackend.la \
+	./settings/libsettings.la \
 	$(top_builddir)/libnm-util/libnm-util.la $(am__DEPENDENCIES_1) \
 	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
 	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
 	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
-	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
-	$(am__DEPENDENCIES_2)
+	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_2)
 NetworkManager_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
 	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
 	$(AM_CFLAGS) $(CFLAGS) $(NetworkManager_LDFLAGS) $(LDFLAGS) -o \
@@ -300,8 +311,8 @@ ETAGS = etags
 CTAGS = ctags
 DIST_SUBDIRS = generated logging posix-signals dns-manager vpn-manager \
 	dhcp-manager ip6-manager supplicant-manager ppp-manager \
-	backends dnsmasq-manager modem-manager bluez-manager \
-	firewall-manager wifi settings wimax . tests
+	dnsmasq-manager modem-manager bluez-manager firewall-manager \
+	wifi settings wimax . tests
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 am__relativize = \
   dir0=`pwd`; \
@@ -340,6 +351,10 @@ AWK = @AWK@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
+CKDB_PATH = @CKDB_PATH@
+CODE_COVERAGE_CFLAGS = @CODE_COVERAGE_CFLAGS@
+CODE_COVERAGE_ENABLED = @CODE_COVERAGE_ENABLED@
+CODE_COVERAGE_LDFLAGS = @CODE_COVERAGE_LDFLAGS@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CXX = @CXX@
@@ -354,9 +369,7 @@ DBUS_SYS_DIR = @DBUS_SYS_DIR@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
 DHCLIENT_PATH = @DHCLIENT_PATH@
-DHCLIENT_VERSION = @DHCLIENT_VERSION@
 DHCPCD_PATH = @DHCPCD_PATH@
-DISABLE_DEPRECATED = @DISABLE_DEPRECATED@
 DLLTOOL = @DLLTOOL@
 DSYMUTIL = @DSYMUTIL@
 DUMPBIN = @DUMPBIN@
@@ -366,17 +379,14 @@ ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
 FGREP = @FGREP@
+GENHTML = @GENHTML@
 GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
 GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
-GIO_CFLAGS = @GIO_CFLAGS@
-GIO_LIBS = @GIO_LIBS@
 GLIB_CFLAGS = @GLIB_CFLAGS@
 GLIB_GENMARSHAL = @GLIB_GENMARSHAL@
 GLIB_LIBS = @GLIB_LIBS@
 GLIB_MAKEFILE = @GLIB_MAKEFILE@
 GLIB_MKENUMS = @GLIB_MKENUMS@
-GMODULE_CFLAGS = @GMODULE_CFLAGS@
-GMODULE_LIBS = @GMODULE_LIBS@
 GMSGFMT = @GMSGFMT@
 GMSGFMT_015 = @GMSGFMT_015@
 GNUTLS_CFLAGS = @GNUTLS_CFLAGS@
@@ -417,6 +427,7 @@ IPTABLES_PATH = @IPTABLES_PATH@
 IWMX_SDK_CFLAGS = @IWMX_SDK_CFLAGS@
 IWMX_SDK_LIBS = @IWMX_SDK_LIBS@
 KERNEL_FIRMWARE_DIR = @KERNEL_FIRMWARE_DIR@
+LCOV = @LCOV@
 LD = @LD@
 LDFLAGS = @LDFLAGS@
 LIBDL = @LIBDL@
@@ -433,11 +444,7 @@ LIBNL2_LIBS = @LIBNL2_LIBS@
 LIBNL3_CFLAGS = @LIBNL3_CFLAGS@
 LIBNL3_LIBS = @LIBNL3_LIBS@
 LIBNL_CFLAGS = @LIBNL_CFLAGS@
-LIBNL_GENL3_CFLAGS = @LIBNL_GENL3_CFLAGS@
-LIBNL_GENL3_LIBS = @LIBNL_GENL3_LIBS@
 LIBNL_LIBS = @LIBNL_LIBS@
-LIBNL_ROUTE3_CFLAGS = @LIBNL_ROUTE3_CFLAGS@
-LIBNL_ROUTE3_LIBS = @LIBNL_ROUTE3_LIBS@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
 LIBSOUP_CFLAGS = @LIBSOUP_CFLAGS@
@@ -452,6 +459,8 @@ MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MANIFEST_TOOL = @MANIFEST_TOOL@
 MKDIR_P = @MKDIR_P@
+MM_GLIB_CFLAGS = @MM_GLIB_CFLAGS@
+MM_GLIB_LIBS = @MM_GLIB_LIBS@
 MOC = @MOC@
 MSGFMT = @MSGFMT@
 MSGFMT_015 = @MSGFMT_015@
@@ -461,6 +470,7 @@ NMEDIT = @NMEDIT@
 NM_MAJOR_VERSION = @NM_MAJOR_VERSION@
 NM_MICRO_VERSION = @NM_MICRO_VERSION@
 NM_MINOR_VERSION = @NM_MINOR_VERSION@
+NM_MODIFY_SYSTEM_POLICY = @NM_MODIFY_SYSTEM_POLICY@
 NM_VERSION = @NM_VERSION@
 NSS_CFLAGS = @NSS_CFLAGS@
 NSS_LIBS = @NSS_LIBS@
@@ -487,13 +497,14 @@ PPPD_PLUGIN_DIR = @PPPD_PLUGIN_DIR@
 QT_CFLAGS = @QT_CFLAGS@
 QT_LIBS = @QT_LIBS@
 RANLIB = @RANLIB@
-RESOLVCONF_PATH = @RESOLVCONF_PATH@
 SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
-SYSTEMD_CFLAGS = @SYSTEMD_CFLAGS@
-SYSTEMD_LIBS = @SYSTEMD_LIBS@
+SYSTEMD_INHIBIT_CFLAGS = @SYSTEMD_INHIBIT_CFLAGS@
+SYSTEMD_INHIBIT_LIBS = @SYSTEMD_INHIBIT_LIBS@
+SYSTEMD_LOGIN_CFLAGS = @SYSTEMD_LOGIN_CFLAGS@
+SYSTEMD_LOGIN_LIBS = @SYSTEMD_LOGIN_LIBS@
 SYSTEM_CA_PATH = @SYSTEM_CA_PATH@
 UDEV_BASE_DIR = @UDEV_BASE_DIR@
 USE_NLS = @USE_NLS@
@@ -548,6 +559,11 @@ localedir = @localedir@
 localstatedir = @localstatedir@
 mandir = @mandir@
 mkdir_p = @mkdir_p@
+nmbinary = @nmbinary@
+nmconfdir = @nmconfdir@
+nmdatadir = @nmdatadir@
+nmrundir = @nmrundir@
+nmstatedir = @nmstatedir@
 oldincludedir = @oldincludedir@
 pdfdir = @pdfdir@
 prefix = @prefix@
@@ -562,10 +578,14 @@ target_alias = @target_alias@
 top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
+with_dhclient = @with_dhclient@
+with_dhcpcd = @with_dhcpcd@
+with_netconfig = @with_netconfig@
+with_resolvconf = @with_resolvconf@
 SUBDIRS = generated logging posix-signals dns-manager vpn-manager \
 	dhcp-manager ip6-manager supplicant-manager ppp-manager \
-	backends dnsmasq-manager modem-manager bluez-manager \
-	firewall-manager wifi settings $(am__append_1) . tests
+	dnsmasq-manager modem-manager bluez-manager firewall-manager \
+	wifi settings $(am__append_1) . tests
 INCLUDES = -I${top_srcdir} \
            -I${top_builddir}/include \
            -I${top_srcdir}/include \
@@ -650,23 +670,23 @@ libtest_wifi_ap_utils_la_LIBADD = \
 	${top_builddir}/libnm-util/libnm-util.la \
 	$(GLIB_LIBS)
 
-NetworkManager_SOURCES = nm-call-store.c nm-call-store.h nm-device.c \
-	nm-device.h nm-device-private.h nm-device-ethernet.c \
-	nm-device-ethernet.h nm-device-adsl.c nm-device-adsl.h \
-	nm-device-wifi.c nm-device-wifi.h nm-device-wired.c \
-	nm-device-wired.h nm-device-olpc-mesh.c nm-device-olpc-mesh.h \
-	nm-device-bt.c nm-device-bt.h nm-device-modem.h \
-	nm-device-modem.c nm-device-infiniband.c \
+NetworkManager_SOURCES = nm-types.h nm-call-store.c nm-call-store.h \
+	nm-device.c nm-device.h nm-device-private.h \
+	nm-device-ethernet.c nm-device-ethernet.h nm-device-adsl.c \
+	nm-device-adsl.h nm-device-wifi.c nm-device-wifi.h \
+	nm-device-wired.c nm-device-wired.h nm-device-olpc-mesh.c \
+	nm-device-olpc-mesh.h nm-device-bt.c nm-device-bt.h \
+	nm-device-modem.h nm-device-modem.c nm-device-infiniband.c \
 	nm-device-infiniband.h nm-device-bond.c nm-device-bond.h \
-	nm-device-vlan.c nm-device-vlan.h nm-wifi-ap.c nm-wifi-ap.h \
-	nm-wifi-ap-utils.c nm-wifi-ap-utils.h nm-dbus-manager.h \
-	nm-dbus-manager.c nm-udev-manager.c nm-udev-manager.h \
-	nm-device-factory.h nm-hostname-provider.c \
-	nm-hostname-provider.h nm-ip4-config.c nm-ip4-config.h \
-	nm-ip6-config.c nm-ip6-config.h nm-active-connection.h \
-	nm-active-connection.c nm-config.h nm-config.c main.c \
-	nm-policy.c nm-policy.h nm-policy-hosts.c nm-policy-hosts.h \
-	nm-policy-hostname.c nm-policy-hostname.h \
+	nm-device-bridge.c nm-device-bridge.h nm-device-vlan.c \
+	nm-device-vlan.h nm-wifi-ap.c nm-wifi-ap.h nm-wifi-ap-utils.c \
+	nm-wifi-ap-utils.h nm-dbus-manager.h nm-dbus-manager.c \
+	nm-udev-manager.c nm-udev-manager.h nm-device-factory.h \
+	nm-hostname-provider.c nm-hostname-provider.h nm-ip4-config.c \
+	nm-ip4-config.h nm-ip6-config.c nm-ip6-config.h \
+	nm-active-connection.h nm-active-connection.c nm-config.h \
+	nm-config.c main.c nm-policy.c nm-policy.h nm-policy-hosts.c \
+	nm-policy-hosts.h nm-policy-hostname.c nm-policy-hostname.h \
 	NetworkManagerUtils.c NetworkManagerUtils.h nm-system.c \
 	nm-system.h nm-manager.c nm-manager.h nm-manager-auth.c \
 	nm-manager-auth.h nm-netlink-monitor.c nm-netlink-monitor.h \
@@ -676,9 +696,10 @@ NetworkManager_SOURCES = nm-call-store.c nm-call-store.h nm-device.c \
 	nm-properties-changed-signal.h nm-dhcp4-config.c \
 	nm-dhcp4-config.h nm-dhcp6-config.c nm-dhcp6-config.h \
 	nm-rfkill.h nm-session-monitor.h nm-session-utils.c \
-	nm-session-utils.h nm-connection-provider.h \
-	nm-connection-provider.c $(am__append_2) $(am__append_3) \
-	$(am__append_4) $(am__append_5)
+	nm-session-utils.h nm-sleep-monitor.h nm-connection-provider.h \
+	nm-connection-provider.c nm-dispatcher.c nm-dispatcher.h \
+	$(am__append_2) $(am__append_3) $(am__append_4) \
+	$(am__append_5) $(am__append_6) $(am__append_7)
 BUILT_SOURCES = \
 	nm-access-point-glue.h \
 	nm-manager-glue.h \
@@ -686,6 +707,7 @@ BUILT_SOURCES = \
 	nm-device-ethernet-glue.h \
 	nm-device-infiniband-glue.h \
 	nm-device-bond-glue.h \
+	nm-device-bridge-glue.h \
 	nm-device-vlan-glue.h \
 	nm-device-adsl-glue.h \
 	nm-device-wifi-glue.h \
@@ -699,14 +721,15 @@ BUILT_SOURCES = \
 	nm-dhcp6-config-glue.h
 
 NetworkManager_CPPFLAGS = $(DBUS_CFLAGS) $(GLIB_CFLAGS) \
-	$(GUDEV_CFLAGS) $(LIBNL_CFLAGS) $(GMODULE_CFLAGS) \
-	$(POLKIT_CFLAGS) $(SYSTEMD_CFLAGS) -DG_DISABLE_DEPRECATED \
-	-DBINDIR=\"$(bindir)\" -DSBINDIR=\"$(sbindir)\" \
-	-DLIBEXECDIR=\"$(libexecdir)\" -DDATADIR=\"$(datadir)\" \
-	-DSYSCONFDIR=\"$(sysconfdir)\" \
+	$(GUDEV_CFLAGS) $(LIBNL_CFLAGS) $(POLKIT_CFLAGS) \
+	$(SYSTEMD_LOGIN_CFLAGS) -DBINDIR=\"$(bindir)\" \
+	-DSBINDIR=\"$(sbindir)\" -DLIBEXECDIR=\"$(libexecdir)\" \
+	-DDATADIR=\"$(datadir)\" -DSYSCONFDIR=\"$(sysconfdir)\" \
 	-DLOCALSTATEDIR=\"$(localstatedir)\" \
-	-DNM_RUN_DIR=\"$(rundir)\" -DNMLOCALEDIR=\"$(datadir)/locale\" \
-	-DNMPLUGINDIR=\"$(pkglibdir)\" $(am__append_6)
+	-DNMLOCALEDIR=\"$(datadir)/locale\" \
+	-DNMPLUGINDIR=\"$(pkglibdir)\" -DNMCONFDIR=\"$(nmconfdir)\" \
+	-DNMRUNDIR=\"$(nmrundir)\" -DNMSTATEDIR=\"$(nmstatedir)\" \
+	-DARP_DEBUG $(am__append_8) $(am__append_9)
 NetworkManager_LDADD = ./generated/libnm-generated.la \
 	./logging/libnm-logging.la \
 	./posix-signals/libnm-posix-signals.la \
@@ -720,21 +743,19 @@ NetworkManager_LDADD = ./generated/libnm-generated.la \
 	./modem-manager/libmodem-manager.la \
 	./bluez-manager/libbluez-manager.la ./wifi/libwifi-utils.la \
 	./firewall-manager/libfirewall-manager.la \
-	./settings/libsettings.la ./backends/libnmbackend.la \
+	./settings/libsettings.la \
 	$(top_builddir)/libnm-util/libnm-util.la $(DBUS_LIBS) \
-	$(GLIB_LIBS) $(GUDEV_LIBS) $(LIBNL_LIBS) $(GMODULE_LIBS) \
-	$(POLKIT_LIBS) $(SYSTEMD_LIBS) $(LIBM) $(LIBDL) \
-	$(am__append_7)
+	$(GLIB_LIBS) $(GUDEV_LIBS) $(LIBNL_LIBS) $(POLKIT_LIBS) \
+	$(SYSTEMD_LOGIN_LIBS) $(LIBM) $(LIBDL) $(am__append_10)
 NetworkManager_LDFLAGS = -rdynamic
 nm_crash_logger_SOURCES = nm-crash-logger.c
 nm_crash_logger_CPPFLAGS = \
 	$(GLIB_CFLAGS) \
-	-DG_DISABLE_DEPRECATED \
 	-DBINDIR=\"$(bindir)\" \
-	-DSBINDIR=\"$(sbindir)\" \
-	-DDATADIR=\"$(datadir)\" \
+	-DNMBINARY=\"$(nmbinary)\" \
+	-DNMDATADIR=\"$(nmdatadir)\" \
 	-DSYSCONFDIR=\"$(sysconfdir)\" \
-	-DLOCALSTATEDIR=\"$(localstatedir)\"
+	-DNMSTATEDIR=\"$(nmstatedir)\"
 
 nm_crash_logger_LDADD = $(GLIB_LIBS)
 NetworkManagerdir = $(datadir)/NetworkManager
@@ -914,6 +935,7 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/NetworkManager-nm-dbus-manager.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/NetworkManager-nm-device-adsl.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/NetworkManager-nm-device-bond.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/NetworkManager-nm-device-bridge.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/NetworkManager-nm-device-bt.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/NetworkManager-nm-device-ethernet.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/NetworkManager-nm-device-infiniband.Po@am__quote@
@@ -925,6 +947,7 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/NetworkManager-nm-device.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/NetworkManager-nm-dhcp4-config.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/NetworkManager-nm-dhcp6-config.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/NetworkManager-nm-dispatcher.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/NetworkManager-nm-hostname-provider.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/NetworkManager-nm-ip4-config.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/NetworkManager-nm-ip6-config.Po@am__quote@
@@ -941,6 +964,8 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/NetworkManager-nm-session-monitor-null.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/NetworkManager-nm-session-monitor-systemd.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/NetworkManager-nm-session-utils.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/NetworkManager-nm-sleep-monitor-systemd.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/NetworkManager-nm-sleep-monitor-upower.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/NetworkManager-nm-system.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/NetworkManager-nm-udev-manager.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/NetworkManager-nm-wifi-ap-utils.Po@am__quote@
@@ -954,25 +979,22 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/nm_crash_logger-nm-crash-logger.Po@am__quote@
 
 .c.o:
-@am__fastdepCC_TRUE@	$(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\
-@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
-@am__fastdepCC_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.Po
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $<
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c $<
 
 .c.obj:
-@am__fastdepCC_TRUE@	$(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.obj$$||'`;\
-@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ `$(CYGPATH_W) '$<'` &&\
-@am__fastdepCC_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.Po
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c `$(CYGPATH_W) '$<'`
 
 .c.lo:
-@am__fastdepCC_TRUE@	$(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.lo$$||'`;\
-@am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
-@am__fastdepCC_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.Plo
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $<
@@ -1173,6 +1195,20 @@ NetworkManager-nm-device-bond.obj: nm-device-bond.c
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(NetworkManager_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o NetworkManager-nm-device-bond.obj `if test -f 'nm-device-bond.c'; then $(CYGPATH_W) 'nm-device-bond.c'; else $(CYGPATH_W) '$(srcdir)/nm-device-bond.c'; fi`
 
+NetworkManager-nm-device-bridge.o: nm-device-bridge.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(NetworkManager_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT NetworkManager-nm-device-bridge.o -MD -MP -MF $(DEPDIR)/NetworkManager-nm-device-bridge.Tpo -c -o NetworkManager-nm-device-bridge.o `test -f 'nm-device-bridge.c' || echo '$(srcdir)/'`nm-device-bridge.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/NetworkManager-nm-device-bridge.Tpo $(DEPDIR)/NetworkManager-nm-device-bridge.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='nm-device-bridge.c' object='NetworkManager-nm-device-bridge.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(NetworkManager_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o NetworkManager-nm-device-bridge.o `test -f 'nm-device-bridge.c' || echo '$(srcdir)/'`nm-device-bridge.c
+
+NetworkManager-nm-device-bridge.obj: nm-device-bridge.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(NetworkManager_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT NetworkManager-nm-device-bridge.obj -MD -MP -MF $(DEPDIR)/NetworkManager-nm-device-bridge.Tpo -c -o NetworkManager-nm-device-bridge.obj `if test -f 'nm-device-bridge.c'; then $(CYGPATH_W) 'nm-device-bridge.c'; else $(CYGPATH_W) '$(srcdir)/nm-device-bridge.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/NetworkManager-nm-device-bridge.Tpo $(DEPDIR)/NetworkManager-nm-device-bridge.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='nm-device-bridge.c' object='NetworkManager-nm-device-bridge.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(NetworkManager_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o NetworkManager-nm-device-bridge.obj `if test -f 'nm-device-bridge.c'; then $(CYGPATH_W) 'nm-device-bridge.c'; else $(CYGPATH_W) '$(srcdir)/nm-device-bridge.c'; fi`
+
 NetworkManager-nm-device-vlan.o: nm-device-vlan.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(NetworkManager_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT NetworkManager-nm-device-vlan.o -MD -MP -MF $(DEPDIR)/NetworkManager-nm-device-vlan.Tpo -c -o NetworkManager-nm-device-vlan.o `test -f 'nm-device-vlan.c' || echo '$(srcdir)/'`nm-device-vlan.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/NetworkManager-nm-device-vlan.Tpo $(DEPDIR)/NetworkManager-nm-device-vlan.Po
@@ -1551,6 +1587,20 @@ NetworkManager-nm-connection-provider.obj: nm-connection-provider.c
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(NetworkManager_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o NetworkManager-nm-connection-provider.obj `if test -f 'nm-connection-provider.c'; then $(CYGPATH_W) 'nm-connection-provider.c'; else $(CYGPATH_W) '$(srcdir)/nm-connection-provider.c'; fi`
 
+NetworkManager-nm-dispatcher.o: nm-dispatcher.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(NetworkManager_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT NetworkManager-nm-dispatcher.o -MD -MP -MF $(DEPDIR)/NetworkManager-nm-dispatcher.Tpo -c -o NetworkManager-nm-dispatcher.o `test -f 'nm-dispatcher.c' || echo '$(srcdir)/'`nm-dispatcher.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/NetworkManager-nm-dispatcher.Tpo $(DEPDIR)/NetworkManager-nm-dispatcher.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='nm-dispatcher.c' object='NetworkManager-nm-dispatcher.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(NetworkManager_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o NetworkManager-nm-dispatcher.o `test -f 'nm-dispatcher.c' || echo '$(srcdir)/'`nm-dispatcher.c
+
+NetworkManager-nm-dispatcher.obj: nm-dispatcher.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(NetworkManager_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT NetworkManager-nm-dispatcher.obj -MD -MP -MF $(DEPDIR)/NetworkManager-nm-dispatcher.Tpo -c -o NetworkManager-nm-dispatcher.obj `if test -f 'nm-dispatcher.c'; then $(CYGPATH_W) 'nm-dispatcher.c'; else $(CYGPATH_W) '$(srcdir)/nm-dispatcher.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/NetworkManager-nm-dispatcher.Tpo $(DEPDIR)/NetworkManager-nm-dispatcher.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='nm-dispatcher.c' object='NetworkManager-nm-dispatcher.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(NetworkManager_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o NetworkManager-nm-dispatcher.obj `if test -f 'nm-dispatcher.c'; then $(CYGPATH_W) 'nm-dispatcher.c'; else $(CYGPATH_W) '$(srcdir)/nm-dispatcher.c'; fi`
+
 NetworkManager-nm-connectivity.o: nm-connectivity.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(NetworkManager_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT NetworkManager-nm-connectivity.o -MD -MP -MF $(DEPDIR)/NetworkManager-nm-connectivity.Tpo -c -o NetworkManager-nm-connectivity.o `test -f 'nm-connectivity.c' || echo '$(srcdir)/'`nm-connectivity.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/NetworkManager-nm-connectivity.Tpo $(DEPDIR)/NetworkManager-nm-connectivity.Po
@@ -1607,6 +1657,34 @@ NetworkManager-nm-session-monitor-null.obj: nm-session-monitor-null.c
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(NetworkManager_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o NetworkManager-nm-session-monitor-null.obj `if test -f 'nm-session-monitor-null.c'; then $(CYGPATH_W) 'nm-session-monitor-null.c'; else $(CYGPATH_W) '$(srcdir)/nm-session-monitor-null.c'; fi`
 
+NetworkManager-nm-sleep-monitor-systemd.o: nm-sleep-monitor-systemd.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(NetworkManager_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT NetworkManager-nm-sleep-monitor-systemd.o -MD -MP -MF $(DEPDIR)/NetworkManager-nm-sleep-monitor-systemd.Tpo -c -o NetworkManager-nm-sleep-monitor-systemd.o `test -f 'nm-sleep-monitor-systemd.c' || echo '$(srcdir)/'`nm-sleep-monitor-systemd.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/NetworkManager-nm-sleep-monitor-systemd.Tpo $(DEPDIR)/NetworkManager-nm-sleep-monitor-systemd.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='nm-sleep-monitor-systemd.c' object='NetworkManager-nm-sleep-monitor-systemd.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(NetworkManager_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o NetworkManager-nm-sleep-monitor-systemd.o `test -f 'nm-sleep-monitor-systemd.c' || echo '$(srcdir)/'`nm-sleep-monitor-systemd.c
+
+NetworkManager-nm-sleep-monitor-systemd.obj: nm-sleep-monitor-systemd.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(NetworkManager_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT NetworkManager-nm-sleep-monitor-systemd.obj -MD -MP -MF $(DEPDIR)/NetworkManager-nm-sleep-monitor-systemd.Tpo -c -o NetworkManager-nm-sleep-monitor-systemd.obj `if test -f 'nm-sleep-monitor-systemd.c'; then $(CYGPATH_W) 'nm-sleep-monitor-systemd.c'; else $(CYGPATH_W) '$(srcdir)/nm-sleep-monitor-systemd.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/NetworkManager-nm-sleep-monitor-systemd.Tpo $(DEPDIR)/NetworkManager-nm-sleep-monitor-systemd.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='nm-sleep-monitor-systemd.c' object='NetworkManager-nm-sleep-monitor-systemd.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(NetworkManager_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o NetworkManager-nm-sleep-monitor-systemd.obj `if test -f 'nm-sleep-monitor-systemd.c'; then $(CYGPATH_W) 'nm-sleep-monitor-systemd.c'; else $(CYGPATH_W) '$(srcdir)/nm-sleep-monitor-systemd.c'; fi`
+
+NetworkManager-nm-sleep-monitor-upower.o: nm-sleep-monitor-upower.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(NetworkManager_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT NetworkManager-nm-sleep-monitor-upower.o -MD -MP -MF $(DEPDIR)/NetworkManager-nm-sleep-monitor-upower.Tpo -c -o NetworkManager-nm-sleep-monitor-upower.o `test -f 'nm-sleep-monitor-upower.c' || echo '$(srcdir)/'`nm-sleep-monitor-upower.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/NetworkManager-nm-sleep-monitor-upower.Tpo $(DEPDIR)/NetworkManager-nm-sleep-monitor-upower.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='nm-sleep-monitor-upower.c' object='NetworkManager-nm-sleep-monitor-upower.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(NetworkManager_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o NetworkManager-nm-sleep-monitor-upower.o `test -f 'nm-sleep-monitor-upower.c' || echo '$(srcdir)/'`nm-sleep-monitor-upower.c
+
+NetworkManager-nm-sleep-monitor-upower.obj: nm-sleep-monitor-upower.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(NetworkManager_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT NetworkManager-nm-sleep-monitor-upower.obj -MD -MP -MF $(DEPDIR)/NetworkManager-nm-sleep-monitor-upower.Tpo -c -o NetworkManager-nm-sleep-monitor-upower.obj `if test -f 'nm-sleep-monitor-upower.c'; then $(CYGPATH_W) 'nm-sleep-monitor-upower.c'; else $(CYGPATH_W) '$(srcdir)/nm-sleep-monitor-upower.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/NetworkManager-nm-sleep-monitor-upower.Tpo $(DEPDIR)/NetworkManager-nm-sleep-monitor-upower.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='nm-sleep-monitor-upower.c' object='NetworkManager-nm-sleep-monitor-upower.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(NetworkManager_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o NetworkManager-nm-sleep-monitor-upower.obj `if test -f 'nm-sleep-monitor-upower.c'; then $(CYGPATH_W) 'nm-sleep-monitor-upower.c'; else $(CYGPATH_W) '$(srcdir)/nm-sleep-monitor-upower.c'; fi`
+
 nm_crash_logger-nm-crash-logger.o: nm-crash-logger.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(nm_crash_logger_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT nm_crash_logger-nm-crash-logger.o -MD -MP -MF $(DEPDIR)/nm_crash_logger-nm-crash-logger.Tpo -c -o nm_crash_logger-nm-crash-logger.o `test -f 'nm-crash-logger.c' || echo '$(srcdir)/'`nm-crash-logger.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/nm_crash_logger-nm-crash-logger.Tpo $(DEPDIR)/nm_crash_logger-nm-crash-logger.Po
@@ -2029,6 +2107,9 @@ nm-device-olpc-mesh-glue.h: $(top_srcdir)/introspection/nm-device-olpc-mesh.xml
 nm-device-bond-glue.h: $(top_srcdir)/introspection/nm-device-bond.xml
 	$(AM_V_GEN) dbus-binding-tool --prefix=nm_device_bond --mode=glib-server --output=$@ $<
 
+nm-device-bridge-glue.h: $(top_srcdir)/introspection/nm-device-bridge.xml
+	$(AM_V_GEN) dbus-binding-tool --prefix=nm_device_bridge --mode=glib-server --output=$@ $<
+
 nm-device-vlan-glue.h: $(top_srcdir)/introspection/nm-device-vlan.xml
 	$(AM_V_GEN) dbus-binding-tool --prefix=nm_device_vlan --mode=glib-server --output=$@ $<
 
@@ -2049,10 +2130,10 @@ nm-dhcp6-config-glue.h: $(top_srcdir)/introspection/nm-dhcp6-config.xml
 
 nm-device-modem-glue.h: $(top_srcdir)/introspection/nm-device-modem.xml
 	$(AM_V_GEN) dbus-binding-tool --prefix=nm_device_modem --mode=glib-server --output=$@ $<
-	-DARP_DEBUG
 install-data-hook:
 	$(mkinstalldirs) -m 0700 $(DESTDIR)$(rundir)
 	$(mkinstalldirs) -m 0700 $(DESTDIR)$(statedir)
+	$(mkinstalldirs) -m 0755 $(DESTDIR)$(pkglibdir)
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
diff --git a/src/NetworkManagerUtils.c b/src/NetworkManagerUtils.c
index 45d867d9..db627091 100644
--- a/src/NetworkManagerUtils.c
+++ b/src/NetworkManagerUtils.c
@@ -22,19 +22,14 @@
 #include 
 #include 
 #include 
-#include 
 #include 
 #include 
-#include 
 #include 
 
 #include "NetworkManagerUtils.h"
 #include "nm-utils.h"
 #include "nm-logging.h"
 #include "nm-device.h"
-#include "nm-dbus-manager.h"
-#include "nm-dispatcher-action.h"
-#include "nm-dbus-glib-types.h"
 #include "nm-setting-connection.h"
 #include "nm-setting-ip4-config.h"
 #include "nm-setting-ip6-config.h"
@@ -368,221 +363,6 @@ nm_utils_merge_ip6_config (NMIP6Config *ip6_config, NMSettingIP6Config *setting)
 		nm_ip6_config_set_never_default (ip6_config, TRUE);
 }
 
-static void
-dump_object_to_props (GObject *object, GHashTable *hash)
-{
-	GParamSpec **pspecs;
-	guint len = 0, i;
-
-	pspecs = g_object_class_list_properties (G_OBJECT_GET_CLASS (object), &len);
-	for (i = 0; i < len; i++) {
-		value_hash_add_object_property (hash,
-		                                pspecs[i]->name,
-		                                object,
-		                                pspecs[i]->name,
-		                                pspecs[i]->value_type);
-	}
-	g_free (pspecs);
-}
-
-static void
-dump_dhcp4_to_props (NMDHCP4Config *config, GHashTable *hash)
-{
-	GSList *options, *iter;
-
-	options = nm_dhcp4_config_list_options (config);
-	for (iter = options; iter; iter = g_slist_next (iter)) {
-		const char *option = (const char *) iter->data;
-		const char *val;
-
-		val = nm_dhcp4_config_get_option (config, option);
-		value_hash_add_str (hash, option, val);
-	}
-	g_slist_free (options);
-}
-
-static void
-dump_dhcp6_to_props (NMDHCP6Config *config, GHashTable *hash)
-{
-	GSList *options, *iter;
-
-	options = nm_dhcp6_config_list_options (config);
-	for (iter = options; iter; iter = g_slist_next (iter)) {
-		const char *option = (const char *) iter->data;
-		const char *val;
-
-		val = nm_dhcp6_config_get_option (config, option);
-		value_hash_add_str (hash, option, val);
-	}
-	g_slist_free (options);
-}
-
-static void
-fill_device_props (NMDevice *device,
-                   GHashTable *dev_hash,
-                   GHashTable *ip4_hash,
-                   GHashTable *ip6_hash,
-                   GHashTable *dhcp4_hash,
-                   GHashTable *dhcp6_hash)
-{
-	NMIP4Config *ip4_config;
-	NMIP6Config *ip6_config;
-	NMDHCP4Config *dhcp4_config;
-	NMDHCP6Config *dhcp6_config;
-
-	/* If the action is for a VPN, send the VPN's IP interface instead of the device's */
-	value_hash_add_str (dev_hash, NMD_DEVICE_PROPS_IP_INTERFACE, nm_device_get_ip_iface (device));
-	value_hash_add_str (dev_hash, NMD_DEVICE_PROPS_INTERFACE, nm_device_get_iface (device));
-	value_hash_add_uint (dev_hash, NMD_DEVICE_PROPS_TYPE, nm_device_get_device_type (device));
-	value_hash_add_uint (dev_hash, NMD_DEVICE_PROPS_STATE, nm_device_get_state (device));
-	value_hash_add_object_path (dev_hash, NMD_DEVICE_PROPS_PATH, nm_device_get_path (device));
-
-	ip4_config = nm_device_get_ip4_config (device);
-	if (ip4_config)
-		dump_object_to_props (G_OBJECT (ip4_config), ip4_hash);
-
-	ip6_config = nm_device_get_ip6_config (device);
-	if (ip6_config)
-		dump_object_to_props (G_OBJECT (ip6_config), ip6_hash);
-
-	dhcp4_config = nm_device_get_dhcp4_config (device);
-	if (dhcp4_config)
-		dump_dhcp4_to_props (dhcp4_config, dhcp4_hash);
-
-	dhcp6_config = nm_device_get_dhcp6_config (device);
-	if (dhcp6_config)
-		dump_dhcp6_to_props (dhcp6_config, dhcp6_hash);
-}
-
-static void
-fill_vpn_props (NMIP4Config *ip4_config,
-                NMIP6Config *ip6_config,
-                GHashTable *ip4_hash,
-                GHashTable *ip6_hash)
-{
-	if (ip4_config)
-		dump_object_to_props (G_OBJECT (ip4_config), ip4_hash);
-	if (ip6_config)
-		dump_object_to_props (G_OBJECT (ip6_config), ip6_hash);
-}
-
-static void
-dispatcher_done_cb (DBusGProxy *proxy, DBusGProxyCall *call, gpointer user_data)
-{
-	dbus_g_proxy_end_call (proxy, call, NULL, G_TYPE_INVALID);
-	g_object_unref (proxy);
-}
-
-void
-nm_utils_call_dispatcher (const char *action,
-                          NMConnection *connection,
-                          NMDevice *device,
-                          const char *vpn_iface,
-                          NMIP4Config *vpn_ip4_config,
-                          NMIP6Config *vpn_ip6_config)
-{
-	NMDBusManager *dbus_mgr;
-	DBusGProxy *proxy;
-	DBusGConnection *g_connection;
-	GHashTable *connection_hash;
-	GHashTable *connection_props;
-	GHashTable *device_props;
-	GHashTable *device_ip4_props;
-	GHashTable *device_ip6_props;
-	GHashTable *device_dhcp4_props;
-	GHashTable *device_dhcp6_props;
-	GHashTable *vpn_ip4_props;
-	GHashTable *vpn_ip6_props;
-
-	g_return_if_fail (action != NULL);
-
-	/* All actions except 'hostname' require a device */
-	if (strcmp (action, "hostname") != 0)
-		g_return_if_fail (NM_IS_DEVICE (device));
-	/* VPN actions require at least an IPv4 config (for now) */
-	if (strcmp (action, "vpn-up") == 0)
-		g_return_if_fail (vpn_ip4_config != NULL);
-
-	dbus_mgr = nm_dbus_manager_get ();
-	g_connection = nm_dbus_manager_get_connection (dbus_mgr);
-	proxy = dbus_g_proxy_new_for_name (g_connection,
-	                                   NM_DISPATCHER_DBUS_SERVICE,
-	                                   NM_DISPATCHER_DBUS_PATH,
-	                                   NM_DISPATCHER_DBUS_IFACE);
-	if (!proxy) {
-		nm_log_err (LOGD_CORE, "could not get dispatcher proxy!");
-		g_object_unref (dbus_mgr);
-		return;
-	}
-
-	if (connection) {
-		connection_hash = nm_connection_to_hash (connection, NM_SETTING_HASH_FLAG_NO_SECRETS);
-
-		connection_props = value_hash_create ();
-
-		/* path */
-		value_hash_add_object_path (connection_props,
-									NMD_CONNECTION_PROPS_PATH,
-									nm_connection_get_path (connection));
-	} else {
-		connection_hash = value_hash_create ();
-		connection_props = value_hash_create ();
-	}
-
-	device_props = value_hash_create ();
-	device_ip4_props = value_hash_create ();
-	device_ip6_props = value_hash_create ();
-	device_dhcp4_props = value_hash_create ();
-	device_dhcp6_props = value_hash_create ();
-	vpn_ip4_props = value_hash_create ();
-	vpn_ip6_props = value_hash_create ();
-
-	/* hostname actions only send the hostname */
-	if (strcmp (action, "hostname") != 0) {
-		fill_device_props (device,
-			               device_props,
-			               device_ip4_props,
-			               device_ip6_props,
-			               device_dhcp4_props,
-			               device_dhcp6_props);
-		if (vpn_iface)
-			fill_vpn_props (vpn_ip4_config, NULL, vpn_ip4_props, vpn_ip6_props);
-	}
-
-	/* Do a non-blocking call, but wait for the reply, because dbus-glib
-	 * sometimes needs time to complete internal housekeeping.  If we use
-	 * dbus_g_proxy_call_no_reply(), that housekeeping (specifically the
-	 * GetNameOwner response) doesn't complete and we run into an assert
-	 * on unreffing the proxy.
-	 */
-	dbus_g_proxy_begin_call_with_timeout (proxy, "Action",
-	                                      dispatcher_done_cb,
-	                                      dbus_mgr,       /* automatically unref the dbus mgr when call is done */
-	                                      g_object_unref,
-	                                      5000,
-	                                      G_TYPE_STRING, action,
-	                                      DBUS_TYPE_G_MAP_OF_MAP_OF_VARIANT, connection_hash,
-	                                      DBUS_TYPE_G_MAP_OF_VARIANT, connection_props,
-	                                      DBUS_TYPE_G_MAP_OF_VARIANT, device_props,
-	                                      DBUS_TYPE_G_MAP_OF_VARIANT, device_ip4_props,
-	                                      DBUS_TYPE_G_MAP_OF_VARIANT, device_ip6_props,
-	                                      DBUS_TYPE_G_MAP_OF_VARIANT, device_dhcp4_props,
-	                                      DBUS_TYPE_G_MAP_OF_VARIANT, device_dhcp6_props,
-	                                      G_TYPE_STRING, vpn_iface ? vpn_iface : "",
-	                                      DBUS_TYPE_G_MAP_OF_VARIANT, vpn_ip4_props,
-	                                      DBUS_TYPE_G_MAP_OF_VARIANT, vpn_ip6_props,
-	                                      G_TYPE_INVALID);
-	g_hash_table_destroy (connection_hash);
-	g_hash_table_destroy (connection_props);
-	g_hash_table_destroy (device_props);
-	g_hash_table_destroy (device_ip4_props);
-	g_hash_table_destroy (device_ip6_props);
-	g_hash_table_destroy (device_dhcp4_props);
-	g_hash_table_destroy (device_dhcp6_props);
-	g_hash_table_destroy (vpn_ip4_props);
-	g_hash_table_destroy (vpn_ip6_props);
-}
-
 gboolean
 nm_match_spec_hwaddr (const GSList *specs, const char *hwaddr)
 {
@@ -629,12 +409,12 @@ parse_subchannels (const char *subchannels, guint32 *a, guint32 *b, guint32 *c)
 	g_return_val_if_fail (*c == 0, FALSE);
 
 	/* sanity check */
-	if (!isxdigit (subchannels[0]))
+	if (!g_ascii_isxdigit (subchannels[0]))
 		return FALSE;
 
 	/* Get the first channel */
 	while (*p && (*p != ',')) {
-		if (!isxdigit (*p) && (*p != '.'))
+		if (!g_ascii_isxdigit (*p) && (*p != '.'))
 			return FALSE;  /* Invalid chars */
 		if (i >= BUFSIZE)
 			return FALSE;  /* Too long to be a subchannel */
@@ -830,27 +610,48 @@ value_hash_add_object_property (GHashTable *hash,
 gboolean
 nm_utils_do_sysctl (const char *path, const char *value)
 {
-	int fd, len, nwrote, total;
+	int fd, len, nwrote, tries;
+	char *actual;
+
+	g_return_val_if_fail (path != NULL, FALSE);
+	g_return_val_if_fail (value != NULL, FALSE);
+	g_return_val_if_fail (value[0], FALSE);
 
 	fd = open (path, O_WRONLY | O_TRUNC);
-	if (fd == -1)
+	if (fd == -1) {
+		nm_log_warn (LOGD_CORE, "sysctl: failed to open '%s': (%d) %s",
+		             path, errno, strerror (errno));
 		return FALSE;
+	}
+
+	nm_log_dbg (LOGD_CORE, "sysctl: setting '%s' to '%s'", path, value);
 
-	len = strlen (value);
-	total = 0;
-	do {
-		nwrote = write (fd, value + total, len - total);
+	/* Most sysfs and sysctl options don't care about a trailing CR, while some
+	 * (like infiniband) do.  So always add the CR.  Also, neither sysfs nor
+	 * sysctl support partial writes so the CR must be added to the string we're
+	 * about to write.
+	 */
+	actual = g_strdup_printf ("%s\n", value);
+
+	/* Try to write the entire value three times if a partial write occurs */
+	len = strlen (actual);
+	for (tries = 0, nwrote = 0; tries < 3 && nwrote != len; tries++) {
+		nwrote = write (fd, actual, len);
 		if (nwrote == -1) {
 			if (errno == EINTR)
 				continue;
-			close (fd);
-			return FALSE;
+			break;
 		}
-		total += nwrote;
-	} while (total < len);
+	}
+	g_free (actual);
+
+	if (nwrote != len) {
+		nm_log_warn (LOGD_CORE, "sysctl: failed to set '%s' to '%s': (%d) %s",
+		             path, value, errno, strerror (errno));
+	}
 
 	close (fd);
-	return TRUE;
+	return (nwrote == len);
 }
 
 gboolean
@@ -1018,23 +819,6 @@ nm_utils_complete_generic (NMConnection *connection,
 	}
 }
 
-gboolean
-nm_utils_is_uuid (const char *str)
-{
-	const char *p = str;
-	int num_dashes = 0;
-
-	while (*p) {
-		if (*p == '-')
-			num_dashes++;
-		else if (!isxdigit (*p))
-			return FALSE;
-		p++;
-	}
-
-	return (num_dashes == 4) && (p - str == 36);
-}
-
 char *
 nm_utils_new_vlan_name (const char *parent_iface, guint32 vlan_id)
 {
diff --git a/src/NetworkManagerUtils.h b/src/NetworkManagerUtils.h
index 2474f654..057ad283 100644
--- a/src/NetworkManagerUtils.h
+++ b/src/NetworkManagerUtils.h
@@ -26,7 +26,6 @@
 #include 
 #include 
 
-#include "nm-device.h"
 #include "nm-ip4-config.h"
 #include "nm-setting-ip4-config.h"
 #include "nm-ip6-config.h"
@@ -40,13 +39,6 @@ int nm_spawn_process (const char *args);
 void nm_utils_merge_ip4_config (NMIP4Config *ip4_config, NMSettingIP4Config *setting);
 void nm_utils_merge_ip6_config (NMIP6Config *ip6_config, NMSettingIP6Config *setting);
 
-void nm_utils_call_dispatcher (const char *action,
-                               NMConnection *connection,
-                               NMDevice *device,
-                               const char *vpn_iface,
-                               NMIP4Config *vpn_ip4_config,
-                               NMIP6Config *vpn_ip6_config);
-
 gboolean nm_match_spec_hwaddr (const GSList *specs, const char *hwaddr);
 gboolean nm_match_spec_s390_subchannels (const GSList *specs, const char *subchannels);
 
@@ -98,8 +90,6 @@ void nm_utils_complete_generic (NMConnection *connection,
                                 const char *preferred,
                                 gboolean default_enable_ipv6);
 
-gboolean nm_utils_is_uuid (const char *str);
-
 char *nm_utils_new_vlan_name (const char *parent_iface, guint32 vlan_id);
 
 #endif /* NETWORK_MANAGER_UTILS_H */
diff --git a/src/backends/Makefile.am b/src/backends/Makefile.am
deleted file mode 100644
index 647e5e5b..00000000
--- a/src/backends/Makefile.am
+++ /dev/null
@@ -1,85 +0,0 @@
-INCLUDES = \
-	-I${top_srcdir} \
-	-I${top_srcdir}/src/logging \
-	-I${top_srcdir}/include \
-	-I${top_builddir}/include \
-	-I${top_srcdir}/src \
-	-I${top_srcdir}/libnm-util
-
-noinst_LTLIBRARIES = libnmbackend.la
-
-libnmbackend_la_SOURCES = \
-	NetworkManagerGeneric.c \
-	NetworkManagerGeneric.h \
-	nm-backend.h
-
-libnmbackend_la_LIBADD =
-
-if TARGET_REDHAT
-libnmbackend_la_SOURCES += NetworkManagerRedHat.c
-endif
-
-if TARGET_SUSE
-libnmbackend_la_SOURCES += NetworkManagerSuSE.c
-endif
-
-if TARGET_GENTOO
-libnmbackend_la_SOURCES += NetworkManagerGentoo.c
-endif
-
-if TARGET_DEBIAN
-libnmbackend_la_SOURCES += NetworkManagerDebian.c
-endif
-
-if TARGET_SLACKWARE
-libnmbackend_la_SOURCES += NetworkManagerSlackware.c
-endif
-
-if TARGET_ARCH
-libnmbackend_la_SOURCES += NetworkManagerArch.c
-endif
-
-if TARGET_PALDO
-libnmbackend_la_SOURCES += NetworkManagerPaldo.c
-endif
-
-if TARGET_FRUGALWARE
-libnmbackend_la_SOURCES += NetworkManagerFrugalware.c
-libnmbackend_la_LIBADD += -lfwnetconfig -lfwutil
-endif
-
-if TARGET_MANDRIVA
-libnmbackend_la_SOURCES += NetworkManagerMandriva.c
-endif
-
-if TARGET_PARDUS
-libnmbackend_la_SOURCES += NetworkManagerPardus.c
-endif
-
-if TARGET_LINEXA
-libnmbackend_la_SOURCES += NetworkManagerLinexa.c
-endif
-
-if TARGET_EXHERBO
-libnmbackend_la_SOURCES += NetworkManagerExherbo.c
-endif
-
-if TARGET_LFS
-libnmbackend_la_SOURCES += NetworkManagerLFS.c
-endif
-
-libnmbackend_la_LIBADD += \
-	$(top_builddir)/src/logging/libnm-logging.la \
-	$(LIBNL_LIBS) \
-	$(DBUS_LIBS) \
-	$(GLIB_LIBS)
-
-libnmbackend_la_CPPFLAGS = \
-	$(LIBNL_CFLAGS) \
-	$(DBUS_CFLAGS) \
-	$(GLIB_CFLAGS) \
-	-DG_DISABLE_DEPRECATED \
-	-DBINDIR=\"$(bindir)\" \
-	-DDATADIR=\"$(datadir)\" \
-	-DSYSCONFDIR=\"$(sysconfdir)\"
-
diff --git a/src/backends/Makefile.in b/src/backends/Makefile.in
deleted file mode 100644
index b821d6d7..00000000
--- a/src/backends/Makefile.in
+++ /dev/null
@@ -1,832 +0,0 @@
-# Makefile.in generated by automake 1.11.6 from Makefile.am.
-# @configure_input@
-
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
-# Foundation, Inc.
-# This Makefile.in is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-@SET_MAKE@
-
-VPATH = @srcdir@
-am__make_dryrun = \
-  { \
-    am__dry=no; \
-    case $$MAKEFLAGS in \
-      *\\[\ \	]*) \
-        echo 'am--echo: ; @echo "AM"  OK' | $(MAKE) -f - 2>/dev/null \
-          | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
-      *) \
-        for am__flg in $$MAKEFLAGS; do \
-          case $$am__flg in \
-            *=*|--*) ;; \
-            *n*) am__dry=yes; break;; \
-          esac; \
-        done;; \
-    esac; \
-    test $$am__dry = yes; \
-  }
-pkgdatadir = $(datadir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
-pkglibexecdir = $(libexecdir)/@PACKAGE@
-am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-install_sh_DATA = $(install_sh) -c -m 644
-install_sh_PROGRAM = $(install_sh) -c
-install_sh_SCRIPT = $(install_sh) -c
-INSTALL_HEADER = $(INSTALL_DATA)
-transform = $(program_transform_name)
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-build_triplet = @build@
-host_triplet = @host@
-@TARGET_REDHAT_TRUE@am__append_1 = NetworkManagerRedHat.c
-@TARGET_SUSE_TRUE@am__append_2 = NetworkManagerSuSE.c
-@TARGET_GENTOO_TRUE@am__append_3 = NetworkManagerGentoo.c
-@TARGET_DEBIAN_TRUE@am__append_4 = NetworkManagerDebian.c
-@TARGET_SLACKWARE_TRUE@am__append_5 = NetworkManagerSlackware.c
-@TARGET_ARCH_TRUE@am__append_6 = NetworkManagerArch.c
-@TARGET_PALDO_TRUE@am__append_7 = NetworkManagerPaldo.c
-@TARGET_FRUGALWARE_TRUE@am__append_8 = NetworkManagerFrugalware.c
-@TARGET_FRUGALWARE_TRUE@am__append_9 = -lfwnetconfig -lfwutil
-@TARGET_MANDRIVA_TRUE@am__append_10 = NetworkManagerMandriva.c
-@TARGET_PARDUS_TRUE@am__append_11 = NetworkManagerPardus.c
-@TARGET_LINEXA_TRUE@am__append_12 = NetworkManagerLinexa.c
-@TARGET_EXHERBO_TRUE@am__append_13 = NetworkManagerExherbo.c
-@TARGET_LFS_TRUE@am__append_14 = NetworkManagerLFS.c
-subdir = src/backends
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/compiler_warnings.m4 \
-	$(top_srcdir)/m4/gettext.m4 $(top_srcdir)/m4/gtk-doc.m4 \
-	$(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/intlmacosx.m4 \
-	$(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/introspection.m4 \
-	$(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \
-	$(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/libnl-check.m4 \
-	$(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \
-	$(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
-	$(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/nls.m4 \
-	$(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/progtest.m4 \
-	$(top_srcdir)/m4/vapigen.m4 $(top_srcdir)/configure.ac
-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
-	$(ACLOCAL_M4)
-mkinstalldirs = $(install_sh) -d
-CONFIG_HEADER = $(top_builddir)/config.h
-CONFIG_CLEAN_FILES =
-CONFIG_CLEAN_VPATH_FILES =
-LTLIBRARIES = $(noinst_LTLIBRARIES)
-am__DEPENDENCIES_1 =
-libnmbackend_la_DEPENDENCIES = $(am__DEPENDENCIES_1) \
-	$(top_builddir)/src/logging/libnm-logging.la \
-	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
-	$(am__DEPENDENCIES_1)
-am__libnmbackend_la_SOURCES_DIST = NetworkManagerGeneric.c \
-	NetworkManagerGeneric.h nm-backend.h NetworkManagerRedHat.c \
-	NetworkManagerSuSE.c NetworkManagerGentoo.c \
-	NetworkManagerDebian.c NetworkManagerSlackware.c \
-	NetworkManagerArch.c NetworkManagerPaldo.c \
-	NetworkManagerFrugalware.c NetworkManagerMandriva.c \
-	NetworkManagerPardus.c NetworkManagerLinexa.c \
-	NetworkManagerExherbo.c NetworkManagerLFS.c
-@TARGET_REDHAT_TRUE@am__objects_1 =  \
-@TARGET_REDHAT_TRUE@	libnmbackend_la-NetworkManagerRedHat.lo
-@TARGET_SUSE_TRUE@am__objects_2 =  \
-@TARGET_SUSE_TRUE@	libnmbackend_la-NetworkManagerSuSE.lo
-@TARGET_GENTOO_TRUE@am__objects_3 =  \
-@TARGET_GENTOO_TRUE@	libnmbackend_la-NetworkManagerGentoo.lo
-@TARGET_DEBIAN_TRUE@am__objects_4 =  \
-@TARGET_DEBIAN_TRUE@	libnmbackend_la-NetworkManagerDebian.lo
-@TARGET_SLACKWARE_TRUE@am__objects_5 = libnmbackend_la-NetworkManagerSlackware.lo
-@TARGET_ARCH_TRUE@am__objects_6 =  \
-@TARGET_ARCH_TRUE@	libnmbackend_la-NetworkManagerArch.lo
-@TARGET_PALDO_TRUE@am__objects_7 =  \
-@TARGET_PALDO_TRUE@	libnmbackend_la-NetworkManagerPaldo.lo
-@TARGET_FRUGALWARE_TRUE@am__objects_8 = libnmbackend_la-NetworkManagerFrugalware.lo
-@TARGET_MANDRIVA_TRUE@am__objects_9 = libnmbackend_la-NetworkManagerMandriva.lo
-@TARGET_PARDUS_TRUE@am__objects_10 =  \
-@TARGET_PARDUS_TRUE@	libnmbackend_la-NetworkManagerPardus.lo
-@TARGET_LINEXA_TRUE@am__objects_11 =  \
-@TARGET_LINEXA_TRUE@	libnmbackend_la-NetworkManagerLinexa.lo
-@TARGET_EXHERBO_TRUE@am__objects_12 =  \
-@TARGET_EXHERBO_TRUE@	libnmbackend_la-NetworkManagerExherbo.lo
-@TARGET_LFS_TRUE@am__objects_13 =  \
-@TARGET_LFS_TRUE@	libnmbackend_la-NetworkManagerLFS.lo
-am_libnmbackend_la_OBJECTS = libnmbackend_la-NetworkManagerGeneric.lo \
-	$(am__objects_1) $(am__objects_2) $(am__objects_3) \
-	$(am__objects_4) $(am__objects_5) $(am__objects_6) \
-	$(am__objects_7) $(am__objects_8) $(am__objects_9) \
-	$(am__objects_10) $(am__objects_11) $(am__objects_12) \
-	$(am__objects_13)
-libnmbackend_la_OBJECTS = $(am_libnmbackend_la_OBJECTS)
-AM_V_lt = $(am__v_lt_@AM_V@)
-am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
-am__v_lt_0 = --silent
-DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
-depcomp = $(SHELL) $(top_srcdir)/build-aux/depcomp
-am__depfiles_maybe = depfiles
-am__mv = mv -f
-COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
-	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
-	$(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \
-	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-	$(AM_CFLAGS) $(CFLAGS)
-AM_V_CC = $(am__v_CC_@AM_V@)
-am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@)
-am__v_CC_0 = @echo "  CC    " $@;
-AM_V_at = $(am__v_at_@AM_V@)
-am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
-am__v_at_0 = @
-CCLD = $(CC)
-LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
-	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
-	$(AM_LDFLAGS) $(LDFLAGS) -o $@
-AM_V_CCLD = $(am__v_CCLD_@AM_V@)
-am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@)
-am__v_CCLD_0 = @echo "  CCLD  " $@;
-AM_V_GEN = $(am__v_GEN_@AM_V@)
-am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
-am__v_GEN_0 = @echo "  GEN   " $@;
-SOURCES = $(libnmbackend_la_SOURCES)
-DIST_SOURCES = $(am__libnmbackend_la_SOURCES_DIST)
-am__can_run_installinfo = \
-  case $$AM_UPDATE_INFO_DIR in \
-    n|no|NO) false;; \
-    *) (install-info --version) >/dev/null 2>&1;; \
-  esac
-ETAGS = etags
-CTAGS = ctags
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-ACLOCAL = @ACLOCAL@
-ALL_LINGUAS = @ALL_LINGUAS@
-AMTAR = @AMTAR@
-AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
-AR = @AR@
-AUTOCONF = @AUTOCONF@
-AUTOHEADER = @AUTOHEADER@
-AUTOMAKE = @AUTOMAKE@
-AWK = @AWK@
-CC = @CC@
-CCDEPMODE = @CCDEPMODE@
-CFLAGS = @CFLAGS@
-CPP = @CPP@
-CPPFLAGS = @CPPFLAGS@
-CXX = @CXX@
-CXXCPP = @CXXCPP@
-CXXDEPMODE = @CXXDEPMODE@
-CXXFLAGS = @CXXFLAGS@
-CYGPATH_W = @CYGPATH_W@
-DATADIRNAME = @DATADIRNAME@
-DBUS_CFLAGS = @DBUS_CFLAGS@
-DBUS_LIBS = @DBUS_LIBS@
-DBUS_SYS_DIR = @DBUS_SYS_DIR@
-DEFS = @DEFS@
-DEPDIR = @DEPDIR@
-DHCLIENT_PATH = @DHCLIENT_PATH@
-DHCLIENT_VERSION = @DHCLIENT_VERSION@
-DHCPCD_PATH = @DHCPCD_PATH@
-DISABLE_DEPRECATED = @DISABLE_DEPRECATED@
-DLLTOOL = @DLLTOOL@
-DSYMUTIL = @DSYMUTIL@
-DUMPBIN = @DUMPBIN@
-ECHO_C = @ECHO_C@
-ECHO_N = @ECHO_N@
-ECHO_T = @ECHO_T@
-EGREP = @EGREP@
-EXEEXT = @EXEEXT@
-FGREP = @FGREP@
-GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
-GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
-GIO_CFLAGS = @GIO_CFLAGS@
-GIO_LIBS = @GIO_LIBS@
-GLIB_CFLAGS = @GLIB_CFLAGS@
-GLIB_GENMARSHAL = @GLIB_GENMARSHAL@
-GLIB_LIBS = @GLIB_LIBS@
-GLIB_MAKEFILE = @GLIB_MAKEFILE@
-GLIB_MKENUMS = @GLIB_MKENUMS@
-GMODULE_CFLAGS = @GMODULE_CFLAGS@
-GMODULE_LIBS = @GMODULE_LIBS@
-GMSGFMT = @GMSGFMT@
-GMSGFMT_015 = @GMSGFMT_015@
-GNUTLS_CFLAGS = @GNUTLS_CFLAGS@
-GNUTLS_LIBS = @GNUTLS_LIBS@
-GREP = @GREP@
-GTKDOC_CHECK = @GTKDOC_CHECK@
-GTKDOC_DEPS_CFLAGS = @GTKDOC_DEPS_CFLAGS@
-GTKDOC_DEPS_LIBS = @GTKDOC_DEPS_LIBS@
-GTKDOC_MKPDF = @GTKDOC_MKPDF@
-GTKDOC_REBASE = @GTKDOC_REBASE@
-GUDEV_CFLAGS = @GUDEV_CFLAGS@
-GUDEV_LIBS = @GUDEV_LIBS@
-HTML_DIR = @HTML_DIR@
-INSTALL = @INSTALL@
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-INTLLIBS = @INTLLIBS@
-INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
-INTLTOOL_MERGE = @INTLTOOL_MERGE@
-INTLTOOL_PERL = @INTLTOOL_PERL@
-INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
-INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@
-INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@
-INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@
-INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@
-INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
-INTROSPECTION_CFLAGS = @INTROSPECTION_CFLAGS@
-INTROSPECTION_COMPILER = @INTROSPECTION_COMPILER@
-INTROSPECTION_GENERATE = @INTROSPECTION_GENERATE@
-INTROSPECTION_GIRDIR = @INTROSPECTION_GIRDIR@
-INTROSPECTION_LIBS = @INTROSPECTION_LIBS@
-INTROSPECTION_MAKEFILE = @INTROSPECTION_MAKEFILE@
-INTROSPECTION_SCANNER = @INTROSPECTION_SCANNER@
-INTROSPECTION_TYPELIBDIR = @INTROSPECTION_TYPELIBDIR@
-IPTABLES_PATH = @IPTABLES_PATH@
-IWMX_SDK_CFLAGS = @IWMX_SDK_CFLAGS@
-IWMX_SDK_LIBS = @IWMX_SDK_LIBS@
-KERNEL_FIRMWARE_DIR = @KERNEL_FIRMWARE_DIR@
-LD = @LD@
-LDFLAGS = @LDFLAGS@
-LIBDL = @LIBDL@
-LIBGCRYPT_CFLAGS = @LIBGCRYPT_CFLAGS@
-LIBGCRYPT_CONFIG = @LIBGCRYPT_CONFIG@
-LIBGCRYPT_LIBS = @LIBGCRYPT_LIBS@
-LIBICONV = @LIBICONV@
-LIBINTL = @LIBINTL@
-LIBM = @LIBM@
-LIBNL1_CFLAGS = @LIBNL1_CFLAGS@
-LIBNL1_LIBS = @LIBNL1_LIBS@
-LIBNL2_CFLAGS = @LIBNL2_CFLAGS@
-LIBNL2_LIBS = @LIBNL2_LIBS@
-LIBNL3_CFLAGS = @LIBNL3_CFLAGS@
-LIBNL3_LIBS = @LIBNL3_LIBS@
-LIBNL_CFLAGS = @LIBNL_CFLAGS@
-LIBNL_GENL3_CFLAGS = @LIBNL_GENL3_CFLAGS@
-LIBNL_GENL3_LIBS = @LIBNL_GENL3_LIBS@
-LIBNL_LIBS = @LIBNL_LIBS@
-LIBNL_ROUTE3_CFLAGS = @LIBNL_ROUTE3_CFLAGS@
-LIBNL_ROUTE3_LIBS = @LIBNL_ROUTE3_LIBS@
-LIBOBJS = @LIBOBJS@
-LIBS = @LIBS@
-LIBSOUP_CFLAGS = @LIBSOUP_CFLAGS@
-LIBSOUP_LIBS = @LIBSOUP_LIBS@
-LIBTOOL = @LIBTOOL@
-LIPO = @LIPO@
-LN_S = @LN_S@
-LTLIBICONV = @LTLIBICONV@
-LTLIBINTL = @LTLIBINTL@
-LTLIBOBJS = @LTLIBOBJS@
-MAINT = @MAINT@
-MAKEINFO = @MAKEINFO@
-MANIFEST_TOOL = @MANIFEST_TOOL@
-MKDIR_P = @MKDIR_P@
-MOC = @MOC@
-MSGFMT = @MSGFMT@
-MSGFMT_015 = @MSGFMT_015@
-MSGMERGE = @MSGMERGE@
-NM = @NM@
-NMEDIT = @NMEDIT@
-NM_MAJOR_VERSION = @NM_MAJOR_VERSION@
-NM_MICRO_VERSION = @NM_MICRO_VERSION@
-NM_MINOR_VERSION = @NM_MINOR_VERSION@
-NM_VERSION = @NM_VERSION@
-NSS_CFLAGS = @NSS_CFLAGS@
-NSS_LIBS = @NSS_LIBS@
-OBJDUMP = @OBJDUMP@
-OBJEXT = @OBJEXT@
-OTOOL = @OTOOL@
-OTOOL64 = @OTOOL64@
-PACKAGE = @PACKAGE@
-PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-PACKAGE_NAME = @PACKAGE_NAME@
-PACKAGE_STRING = @PACKAGE_STRING@
-PACKAGE_TARNAME = @PACKAGE_TARNAME@
-PACKAGE_URL = @PACKAGE_URL@
-PACKAGE_VERSION = @PACKAGE_VERSION@
-PATH_SEPARATOR = @PATH_SEPARATOR@
-PKGCONFIG_PATH = @PKGCONFIG_PATH@
-PKG_CONFIG = @PKG_CONFIG@
-PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
-PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
-POLKIT_CFLAGS = @POLKIT_CFLAGS@
-POLKIT_LIBS = @POLKIT_LIBS@
-POSUB = @POSUB@
-PPPD_PLUGIN_DIR = @PPPD_PLUGIN_DIR@
-QT_CFLAGS = @QT_CFLAGS@
-QT_LIBS = @QT_LIBS@
-RANLIB = @RANLIB@
-RESOLVCONF_PATH = @RESOLVCONF_PATH@
-SED = @SED@
-SET_MAKE = @SET_MAKE@
-SHELL = @SHELL@
-STRIP = @STRIP@
-SYSTEMD_CFLAGS = @SYSTEMD_CFLAGS@
-SYSTEMD_LIBS = @SYSTEMD_LIBS@
-SYSTEM_CA_PATH = @SYSTEM_CA_PATH@
-UDEV_BASE_DIR = @UDEV_BASE_DIR@
-USE_NLS = @USE_NLS@
-UUID_CFLAGS = @UUID_CFLAGS@
-UUID_LIBS = @UUID_LIBS@
-VAPIGEN = @VAPIGEN@
-VAPIGEN_MAKEFILE = @VAPIGEN_MAKEFILE@
-VAPIGEN_VAPIDIR = @VAPIGEN_VAPIDIR@
-VERSION = @VERSION@
-XGETTEXT = @XGETTEXT@
-XGETTEXT_015 = @XGETTEXT_015@
-XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
-abs_builddir = @abs_builddir@
-abs_srcdir = @abs_srcdir@
-abs_top_builddir = @abs_top_builddir@
-abs_top_srcdir = @abs_top_srcdir@
-ac_ct_AR = @ac_ct_AR@
-ac_ct_CC = @ac_ct_CC@
-ac_ct_CXX = @ac_ct_CXX@
-ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-am__include = @am__include@
-am__leading_dot = @am__leading_dot@
-am__quote = @am__quote@
-am__tar = @am__tar@
-am__untar = @am__untar@
-bindir = @bindir@
-build = @build@
-build_alias = @build_alias@
-build_cpu = @build_cpu@
-build_os = @build_os@
-build_vendor = @build_vendor@
-builddir = @builddir@
-datadir = @datadir@
-datarootdir = @datarootdir@
-docdir = @docdir@
-dvidir = @dvidir@
-exec_prefix = @exec_prefix@
-host = @host@
-host_alias = @host_alias@
-host_cpu = @host_cpu@
-host_os = @host_os@
-host_vendor = @host_vendor@
-htmldir = @htmldir@
-includedir = @includedir@
-infodir = @infodir@
-install_sh = @install_sh@
-intltool__v_merge_options_ = @intltool__v_merge_options_@
-intltool__v_merge_options_0 = @intltool__v_merge_options_0@
-libdir = @libdir@
-libexecdir = @libexecdir@
-localedir = @localedir@
-localstatedir = @localstatedir@
-mandir = @mandir@
-mkdir_p = @mkdir_p@
-oldincludedir = @oldincludedir@
-pdfdir = @pdfdir@
-prefix = @prefix@
-program_transform_name = @program_transform_name@
-psdir = @psdir@
-sbindir = @sbindir@
-sharedstatedir = @sharedstatedir@
-srcdir = @srcdir@
-sysconfdir = @sysconfdir@
-systemdsystemunitdir = @systemdsystemunitdir@
-target_alias = @target_alias@
-top_build_prefix = @top_build_prefix@
-top_builddir = @top_builddir@
-top_srcdir = @top_srcdir@
-INCLUDES = \
-	-I${top_srcdir} \
-	-I${top_srcdir}/src/logging \
-	-I${top_srcdir}/include \
-	-I${top_builddir}/include \
-	-I${top_srcdir}/src \
-	-I${top_srcdir}/libnm-util
-
-noinst_LTLIBRARIES = libnmbackend.la
-libnmbackend_la_SOURCES = NetworkManagerGeneric.c \
-	NetworkManagerGeneric.h nm-backend.h $(am__append_1) \
-	$(am__append_2) $(am__append_3) $(am__append_4) \
-	$(am__append_5) $(am__append_6) $(am__append_7) \
-	$(am__append_8) $(am__append_10) $(am__append_11) \
-	$(am__append_12) $(am__append_13) $(am__append_14)
-libnmbackend_la_LIBADD = $(am__append_9) \
-	$(top_builddir)/src/logging/libnm-logging.la $(LIBNL_LIBS) \
-	$(DBUS_LIBS) $(GLIB_LIBS)
-libnmbackend_la_CPPFLAGS = \
-	$(LIBNL_CFLAGS) \
-	$(DBUS_CFLAGS) \
-	$(GLIB_CFLAGS) \
-	-DG_DISABLE_DEPRECATED \
-	-DBINDIR=\"$(bindir)\" \
-	-DDATADIR=\"$(datadir)\" \
-	-DSYSCONFDIR=\"$(sysconfdir)\"
-
-all: all-am
-
-.SUFFIXES:
-.SUFFIXES: .c .lo .o .obj
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
-	@for dep in $?; do \
-	  case '$(am__configure_deps)' in \
-	    *$$dep*) \
-	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
-	        && { if test -f $@; then exit 0; else break; fi; }; \
-	      exit 1;; \
-	  esac; \
-	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/backends/Makefile'; \
-	$(am__cd) $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu src/backends/Makefile
-.PRECIOUS: Makefile
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-	@case '$?' in \
-	  *config.status*) \
-	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
-	  *) \
-	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
-	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
-	esac;
-
-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-
-$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(am__aclocal_m4_deps):
-
-clean-noinstLTLIBRARIES:
-	-test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES)
-	@list='$(noinst_LTLIBRARIES)'; for p in $$list; do \
-	  dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
-	  test "$$dir" != "$$p" || dir=.; \
-	  echo "rm -f \"$${dir}/so_locations\""; \
-	  rm -f "$${dir}/so_locations"; \
-	done
-libnmbackend.la: $(libnmbackend_la_OBJECTS) $(libnmbackend_la_DEPENDENCIES) $(EXTRA_libnmbackend_la_DEPENDENCIES) 
-	$(AM_V_CCLD)$(LINK)  $(libnmbackend_la_OBJECTS) $(libnmbackend_la_LIBADD) $(LIBS)
-
-mostlyclean-compile:
-	-rm -f *.$(OBJEXT)
-
-distclean-compile:
-	-rm -f *.tab.c
-
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libnmbackend_la-NetworkManagerArch.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libnmbackend_la-NetworkManagerDebian.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libnmbackend_la-NetworkManagerExherbo.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libnmbackend_la-NetworkManagerFrugalware.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libnmbackend_la-NetworkManagerGeneric.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libnmbackend_la-NetworkManagerGentoo.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libnmbackend_la-NetworkManagerLFS.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libnmbackend_la-NetworkManagerLinexa.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libnmbackend_la-NetworkManagerMandriva.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libnmbackend_la-NetworkManagerPaldo.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libnmbackend_la-NetworkManagerPardus.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libnmbackend_la-NetworkManagerRedHat.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libnmbackend_la-NetworkManagerSlackware.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libnmbackend_la-NetworkManagerSuSE.Plo@am__quote@
-
-.c.o:
-@am__fastdepCC_TRUE@	$(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\
-@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
-@am__fastdepCC_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $<
-
-.c.obj:
-@am__fastdepCC_TRUE@	$(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.obj$$||'`;\
-@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ `$(CYGPATH_W) '$<'` &&\
-@am__fastdepCC_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
-
-.c.lo:
-@am__fastdepCC_TRUE@	$(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.lo$$||'`;\
-@am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
-@am__fastdepCC_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $<
-
-libnmbackend_la-NetworkManagerGeneric.lo: NetworkManagerGeneric.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnmbackend_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libnmbackend_la-NetworkManagerGeneric.lo -MD -MP -MF $(DEPDIR)/libnmbackend_la-NetworkManagerGeneric.Tpo -c -o libnmbackend_la-NetworkManagerGeneric.lo `test -f 'NetworkManagerGeneric.c' || echo '$(srcdir)/'`NetworkManagerGeneric.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libnmbackend_la-NetworkManagerGeneric.Tpo $(DEPDIR)/libnmbackend_la-NetworkManagerGeneric.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='NetworkManagerGeneric.c' object='libnmbackend_la-NetworkManagerGeneric.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnmbackend_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libnmbackend_la-NetworkManagerGeneric.lo `test -f 'NetworkManagerGeneric.c' || echo '$(srcdir)/'`NetworkManagerGeneric.c
-
-libnmbackend_la-NetworkManagerRedHat.lo: NetworkManagerRedHat.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnmbackend_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libnmbackend_la-NetworkManagerRedHat.lo -MD -MP -MF $(DEPDIR)/libnmbackend_la-NetworkManagerRedHat.Tpo -c -o libnmbackend_la-NetworkManagerRedHat.lo `test -f 'NetworkManagerRedHat.c' || echo '$(srcdir)/'`NetworkManagerRedHat.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libnmbackend_la-NetworkManagerRedHat.Tpo $(DEPDIR)/libnmbackend_la-NetworkManagerRedHat.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='NetworkManagerRedHat.c' object='libnmbackend_la-NetworkManagerRedHat.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnmbackend_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libnmbackend_la-NetworkManagerRedHat.lo `test -f 'NetworkManagerRedHat.c' || echo '$(srcdir)/'`NetworkManagerRedHat.c
-
-libnmbackend_la-NetworkManagerSuSE.lo: NetworkManagerSuSE.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnmbackend_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libnmbackend_la-NetworkManagerSuSE.lo -MD -MP -MF $(DEPDIR)/libnmbackend_la-NetworkManagerSuSE.Tpo -c -o libnmbackend_la-NetworkManagerSuSE.lo `test -f 'NetworkManagerSuSE.c' || echo '$(srcdir)/'`NetworkManagerSuSE.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libnmbackend_la-NetworkManagerSuSE.Tpo $(DEPDIR)/libnmbackend_la-NetworkManagerSuSE.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='NetworkManagerSuSE.c' object='libnmbackend_la-NetworkManagerSuSE.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnmbackend_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libnmbackend_la-NetworkManagerSuSE.lo `test -f 'NetworkManagerSuSE.c' || echo '$(srcdir)/'`NetworkManagerSuSE.c
-
-libnmbackend_la-NetworkManagerGentoo.lo: NetworkManagerGentoo.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnmbackend_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libnmbackend_la-NetworkManagerGentoo.lo -MD -MP -MF $(DEPDIR)/libnmbackend_la-NetworkManagerGentoo.Tpo -c -o libnmbackend_la-NetworkManagerGentoo.lo `test -f 'NetworkManagerGentoo.c' || echo '$(srcdir)/'`NetworkManagerGentoo.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libnmbackend_la-NetworkManagerGentoo.Tpo $(DEPDIR)/libnmbackend_la-NetworkManagerGentoo.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='NetworkManagerGentoo.c' object='libnmbackend_la-NetworkManagerGentoo.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnmbackend_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libnmbackend_la-NetworkManagerGentoo.lo `test -f 'NetworkManagerGentoo.c' || echo '$(srcdir)/'`NetworkManagerGentoo.c
-
-libnmbackend_la-NetworkManagerDebian.lo: NetworkManagerDebian.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnmbackend_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libnmbackend_la-NetworkManagerDebian.lo -MD -MP -MF $(DEPDIR)/libnmbackend_la-NetworkManagerDebian.Tpo -c -o libnmbackend_la-NetworkManagerDebian.lo `test -f 'NetworkManagerDebian.c' || echo '$(srcdir)/'`NetworkManagerDebian.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libnmbackend_la-NetworkManagerDebian.Tpo $(DEPDIR)/libnmbackend_la-NetworkManagerDebian.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='NetworkManagerDebian.c' object='libnmbackend_la-NetworkManagerDebian.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnmbackend_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libnmbackend_la-NetworkManagerDebian.lo `test -f 'NetworkManagerDebian.c' || echo '$(srcdir)/'`NetworkManagerDebian.c
-
-libnmbackend_la-NetworkManagerSlackware.lo: NetworkManagerSlackware.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnmbackend_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libnmbackend_la-NetworkManagerSlackware.lo -MD -MP -MF $(DEPDIR)/libnmbackend_la-NetworkManagerSlackware.Tpo -c -o libnmbackend_la-NetworkManagerSlackware.lo `test -f 'NetworkManagerSlackware.c' || echo '$(srcdir)/'`NetworkManagerSlackware.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libnmbackend_la-NetworkManagerSlackware.Tpo $(DEPDIR)/libnmbackend_la-NetworkManagerSlackware.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='NetworkManagerSlackware.c' object='libnmbackend_la-NetworkManagerSlackware.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnmbackend_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libnmbackend_la-NetworkManagerSlackware.lo `test -f 'NetworkManagerSlackware.c' || echo '$(srcdir)/'`NetworkManagerSlackware.c
-
-libnmbackend_la-NetworkManagerArch.lo: NetworkManagerArch.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnmbackend_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libnmbackend_la-NetworkManagerArch.lo -MD -MP -MF $(DEPDIR)/libnmbackend_la-NetworkManagerArch.Tpo -c -o libnmbackend_la-NetworkManagerArch.lo `test -f 'NetworkManagerArch.c' || echo '$(srcdir)/'`NetworkManagerArch.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libnmbackend_la-NetworkManagerArch.Tpo $(DEPDIR)/libnmbackend_la-NetworkManagerArch.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='NetworkManagerArch.c' object='libnmbackend_la-NetworkManagerArch.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnmbackend_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libnmbackend_la-NetworkManagerArch.lo `test -f 'NetworkManagerArch.c' || echo '$(srcdir)/'`NetworkManagerArch.c
-
-libnmbackend_la-NetworkManagerPaldo.lo: NetworkManagerPaldo.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnmbackend_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libnmbackend_la-NetworkManagerPaldo.lo -MD -MP -MF $(DEPDIR)/libnmbackend_la-NetworkManagerPaldo.Tpo -c -o libnmbackend_la-NetworkManagerPaldo.lo `test -f 'NetworkManagerPaldo.c' || echo '$(srcdir)/'`NetworkManagerPaldo.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libnmbackend_la-NetworkManagerPaldo.Tpo $(DEPDIR)/libnmbackend_la-NetworkManagerPaldo.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='NetworkManagerPaldo.c' object='libnmbackend_la-NetworkManagerPaldo.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnmbackend_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libnmbackend_la-NetworkManagerPaldo.lo `test -f 'NetworkManagerPaldo.c' || echo '$(srcdir)/'`NetworkManagerPaldo.c
-
-libnmbackend_la-NetworkManagerFrugalware.lo: NetworkManagerFrugalware.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnmbackend_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libnmbackend_la-NetworkManagerFrugalware.lo -MD -MP -MF $(DEPDIR)/libnmbackend_la-NetworkManagerFrugalware.Tpo -c -o libnmbackend_la-NetworkManagerFrugalware.lo `test -f 'NetworkManagerFrugalware.c' || echo '$(srcdir)/'`NetworkManagerFrugalware.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libnmbackend_la-NetworkManagerFrugalware.Tpo $(DEPDIR)/libnmbackend_la-NetworkManagerFrugalware.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='NetworkManagerFrugalware.c' object='libnmbackend_la-NetworkManagerFrugalware.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnmbackend_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libnmbackend_la-NetworkManagerFrugalware.lo `test -f 'NetworkManagerFrugalware.c' || echo '$(srcdir)/'`NetworkManagerFrugalware.c
-
-libnmbackend_la-NetworkManagerMandriva.lo: NetworkManagerMandriva.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnmbackend_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libnmbackend_la-NetworkManagerMandriva.lo -MD -MP -MF $(DEPDIR)/libnmbackend_la-NetworkManagerMandriva.Tpo -c -o libnmbackend_la-NetworkManagerMandriva.lo `test -f 'NetworkManagerMandriva.c' || echo '$(srcdir)/'`NetworkManagerMandriva.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libnmbackend_la-NetworkManagerMandriva.Tpo $(DEPDIR)/libnmbackend_la-NetworkManagerMandriva.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='NetworkManagerMandriva.c' object='libnmbackend_la-NetworkManagerMandriva.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnmbackend_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libnmbackend_la-NetworkManagerMandriva.lo `test -f 'NetworkManagerMandriva.c' || echo '$(srcdir)/'`NetworkManagerMandriva.c
-
-libnmbackend_la-NetworkManagerPardus.lo: NetworkManagerPardus.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnmbackend_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libnmbackend_la-NetworkManagerPardus.lo -MD -MP -MF $(DEPDIR)/libnmbackend_la-NetworkManagerPardus.Tpo -c -o libnmbackend_la-NetworkManagerPardus.lo `test -f 'NetworkManagerPardus.c' || echo '$(srcdir)/'`NetworkManagerPardus.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libnmbackend_la-NetworkManagerPardus.Tpo $(DEPDIR)/libnmbackend_la-NetworkManagerPardus.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='NetworkManagerPardus.c' object='libnmbackend_la-NetworkManagerPardus.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnmbackend_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libnmbackend_la-NetworkManagerPardus.lo `test -f 'NetworkManagerPardus.c' || echo '$(srcdir)/'`NetworkManagerPardus.c
-
-libnmbackend_la-NetworkManagerLinexa.lo: NetworkManagerLinexa.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnmbackend_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libnmbackend_la-NetworkManagerLinexa.lo -MD -MP -MF $(DEPDIR)/libnmbackend_la-NetworkManagerLinexa.Tpo -c -o libnmbackend_la-NetworkManagerLinexa.lo `test -f 'NetworkManagerLinexa.c' || echo '$(srcdir)/'`NetworkManagerLinexa.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libnmbackend_la-NetworkManagerLinexa.Tpo $(DEPDIR)/libnmbackend_la-NetworkManagerLinexa.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='NetworkManagerLinexa.c' object='libnmbackend_la-NetworkManagerLinexa.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnmbackend_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libnmbackend_la-NetworkManagerLinexa.lo `test -f 'NetworkManagerLinexa.c' || echo '$(srcdir)/'`NetworkManagerLinexa.c
-
-libnmbackend_la-NetworkManagerExherbo.lo: NetworkManagerExherbo.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnmbackend_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libnmbackend_la-NetworkManagerExherbo.lo -MD -MP -MF $(DEPDIR)/libnmbackend_la-NetworkManagerExherbo.Tpo -c -o libnmbackend_la-NetworkManagerExherbo.lo `test -f 'NetworkManagerExherbo.c' || echo '$(srcdir)/'`NetworkManagerExherbo.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libnmbackend_la-NetworkManagerExherbo.Tpo $(DEPDIR)/libnmbackend_la-NetworkManagerExherbo.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='NetworkManagerExherbo.c' object='libnmbackend_la-NetworkManagerExherbo.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnmbackend_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libnmbackend_la-NetworkManagerExherbo.lo `test -f 'NetworkManagerExherbo.c' || echo '$(srcdir)/'`NetworkManagerExherbo.c
-
-libnmbackend_la-NetworkManagerLFS.lo: NetworkManagerLFS.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnmbackend_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libnmbackend_la-NetworkManagerLFS.lo -MD -MP -MF $(DEPDIR)/libnmbackend_la-NetworkManagerLFS.Tpo -c -o libnmbackend_la-NetworkManagerLFS.lo `test -f 'NetworkManagerLFS.c' || echo '$(srcdir)/'`NetworkManagerLFS.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libnmbackend_la-NetworkManagerLFS.Tpo $(DEPDIR)/libnmbackend_la-NetworkManagerLFS.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='NetworkManagerLFS.c' object='libnmbackend_la-NetworkManagerLFS.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnmbackend_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libnmbackend_la-NetworkManagerLFS.lo `test -f 'NetworkManagerLFS.c' || echo '$(srcdir)/'`NetworkManagerLFS.c
-
-mostlyclean-libtool:
-	-rm -f *.lo
-
-clean-libtool:
-	-rm -rf .libs _libs
-
-ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
-	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	mkid -fID $$unique
-tags: TAGS
-
-TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
-	set x; \
-	here=`pwd`; \
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	shift; \
-	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
-	  test -n "$$unique" || unique=$$empty_fix; \
-	  if test $$# -gt 0; then \
-	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	      "$$@" $$unique; \
-	  else \
-	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	      $$unique; \
-	  fi; \
-	fi
-ctags: CTAGS
-CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	test -z "$(CTAGS_ARGS)$$unique" \
-	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
-	     $$unique
-
-GTAGS:
-	here=`$(am__cd) $(top_builddir) && pwd` \
-	  && $(am__cd) $(top_srcdir) \
-	  && gtags -i $(GTAGS_ARGS) "$$here"
-
-distclean-tags:
-	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-
-distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-	list='$(DISTFILES)'; \
-	  dist_files=`for file in $$list; do echo $$file; done | \
-	  sed -e "s|^$$srcdirstrip/||;t" \
-	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
-	case $$dist_files in \
-	  */*) $(MKDIR_P) `echo "$$dist_files" | \
-			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
-			   sort -u` ;; \
-	esac; \
-	for file in $$dist_files; do \
-	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  if test -d $$d/$$file; then \
-	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
-	    if test -d "$(distdir)/$$file"; then \
-	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-	    fi; \
-	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
-	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-	    fi; \
-	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
-	  else \
-	    test -f "$(distdir)/$$file" \
-	    || cp -p $$d/$$file "$(distdir)/$$file" \
-	    || exit 1; \
-	  fi; \
-	done
-check-am: all-am
-check: check-am
-all-am: Makefile $(LTLIBRARIES)
-installdirs:
-install: install-am
-install-exec: install-exec-am
-install-data: install-data-am
-uninstall: uninstall-am
-
-install-am: all-am
-	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-
-installcheck: installcheck-am
-install-strip:
-	if test -z '$(STRIP)'; then \
-	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	      install; \
-	else \
-	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
-	fi
-mostlyclean-generic:
-
-clean-generic:
-
-distclean-generic:
-	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
-
-maintainer-clean-generic:
-	@echo "This command is intended for maintainers to use"
-	@echo "it deletes files that may require special tools to rebuild."
-clean: clean-am
-
-clean-am: clean-generic clean-libtool clean-noinstLTLIBRARIES \
-	mostlyclean-am
-
-distclean: distclean-am
-	-rm -rf ./$(DEPDIR)
-	-rm -f Makefile
-distclean-am: clean-am distclean-compile distclean-generic \
-	distclean-tags
-
-dvi: dvi-am
-
-dvi-am:
-
-html: html-am
-
-html-am:
-
-info: info-am
-
-info-am:
-
-install-data-am:
-
-install-dvi: install-dvi-am
-
-install-dvi-am:
-
-install-exec-am:
-
-install-html: install-html-am
-
-install-html-am:
-
-install-info: install-info-am
-
-install-info-am:
-
-install-man:
-
-install-pdf: install-pdf-am
-
-install-pdf-am:
-
-install-ps: install-ps-am
-
-install-ps-am:
-
-installcheck-am:
-
-maintainer-clean: maintainer-clean-am
-	-rm -rf ./$(DEPDIR)
-	-rm -f Makefile
-maintainer-clean-am: distclean-am maintainer-clean-generic
-
-mostlyclean: mostlyclean-am
-
-mostlyclean-am: mostlyclean-compile mostlyclean-generic \
-	mostlyclean-libtool
-
-pdf: pdf-am
-
-pdf-am:
-
-ps: ps-am
-
-ps-am:
-
-uninstall-am:
-
-.MAKE: install-am install-strip
-
-.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
-	clean-libtool clean-noinstLTLIBRARIES ctags distclean \
-	distclean-compile distclean-generic distclean-libtool \
-	distclean-tags distdir dvi dvi-am html html-am info info-am \
-	install install-am install-data install-data-am install-dvi \
-	install-dvi-am install-exec install-exec-am install-html \
-	install-html-am install-info install-info-am install-man \
-	install-pdf install-pdf-am install-ps install-ps-am \
-	install-strip installcheck installcheck-am installdirs \
-	maintainer-clean maintainer-clean-generic mostlyclean \
-	mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
-	pdf pdf-am ps ps-am tags uninstall uninstall-am
-
-
-# Tell versions [3.59,3.63) of GNU make to not export all variables.
-# Otherwise a system limit (for SysV at least) may be exceeded.
-.NOEXPORT:
diff --git a/src/backends/NetworkManagerArch.c b/src/backends/NetworkManagerArch.c
deleted file mode 100644
index 7e25ee37..00000000
--- a/src/backends/NetworkManagerArch.c
+++ /dev/null
@@ -1,60 +0,0 @@
-/* NetworkManager -- Network link manager
- *
- * Backend implementation for the Arch Linux distribution http://www.archlinux.org
- * 
- * Tor Krill  and Will Rea 
- *
- * Updated by Wael Nasreddine 
- *
- * Updated by Valentine Sinitsyn 
- * 
- * Heavily based on NetworkManagerDebian.c by Matthew Garrett 
- *
- * Heavily based on NetworkManagerRedhat.c by Dan Williams 
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * (C) Copyright 2004 Tom Parker
- * (C) Copyright 2004 Matthew Garrett
- * (C) Copyright 2004 - 2012 Red Hat, Inc.
- */
-
-#ifdef HAVE_CONFIG_H
-#include 
-#endif
-
-#include "NetworkManagerGeneric.h"
-#include "NetworkManagerUtils.h"
-
-void nm_backend_enable_loopback (void)
-{
-	nm_generic_enable_loopback ();
-}
-
-void nm_backend_update_dns (void)
-{
-	/* Make glibc/nscd aware of any changes to the resolv.conf file by
-	 * restarting nscd; check if the daemon was already running - do not
-	 * start a new instance
-	 */
-	if (g_file_test("/var/run/daemons/nscd", G_FILE_TEST_EXISTS))
-		nm_spawn_process ("/etc/rc.d/nscd restart");
-}
-
-int nm_backend_ipv6_use_tempaddr (void)
-{
-	return nm_generic_ipv6_use_tempaddr ();
-}
-
diff --git a/src/backends/NetworkManagerDebian.c b/src/backends/NetworkManagerDebian.c
deleted file mode 100644
index ed29dd3a..00000000
--- a/src/backends/NetworkManagerDebian.c
+++ /dev/null
@@ -1,57 +0,0 @@
-/* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */
-/* NetworkManager -- Network link manager
- *
- * Matthew Garrett 
- *
- * Heavily based on NetworkManagerRedhat.c by Dan Williams 
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * (C) Copyright 2004 Tom Parker
- * (C) Copyright 2004 Matthew Garrett
- * (C) Copyright 2004 - 2012 Red Hat, Inc.
- */
-
-#ifdef HAVE_CONFIG_H
-#include 
-#endif
-
-#include "NetworkManagerGeneric.h"
-#include "NetworkManagerUtils.h"
-#include "nm-logging.h"
-
-void nm_backend_enable_loopback (void)
-{
-	/* ifupdown isn't always installed (bgo #625427) */
-	if (g_file_test ("/sbin/ifup", G_FILE_TEST_EXISTS))
-		nm_spawn_process ("/sbin/ifup lo");
-	else
-		nm_generic_enable_loopback ();
-}
-
-void nm_backend_update_dns (void)
-{
-	/* Invalidate the nscd host cache since we changed resolv.conf */
-	if (g_file_test ("/usr/sbin/nscd", G_FILE_TEST_IS_EXECUTABLE)) {
-		nm_log_info (LOGD_DNS, "Clearing nscd hosts cache.");
-		nm_spawn_process ("/usr/sbin/nscd -i hosts");
-	}
-}
-
-int nm_backend_ipv6_use_tempaddr (void)
-{
-	return nm_generic_ipv6_use_tempaddr ();
-}
-
diff --git a/src/backends/NetworkManagerExherbo.c b/src/backends/NetworkManagerExherbo.c
deleted file mode 100644
index d0277896..00000000
--- a/src/backends/NetworkManagerExherbo.c
+++ /dev/null
@@ -1,54 +0,0 @@
-/* NetworkManager -- Network link manager
- *
- * Dan Williams 
- * Dan Willemsen 
- * Robert Paskowitz
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * (C) Copyright 2004 - 2012 Red Hat, Inc.
- * (C) Copyright 2004 Dan Willemsen
- * (C) Copyright 2004 Robert Paskowitz
- */
-
-#ifdef HAVE_CONFIG_H
-#include 
-#endif
-
-#include "NetworkManagerGeneric.h"
-#include "NetworkManagerUtils.h"
-#include "nm-logging.h"
-
-void nm_backend_enable_loopback (void)
-{
-	nm_generic_enable_loopback ();
-}
-
-void nm_backend_update_dns (void)
-{
-	/* Make glibc/nscd aware of any changes to the resolv.conf file by
-	 * restarting nscd. Only restart if already running.
-	 */
-	if (g_file_test ("/usr/sbin/nscd", G_FILE_TEST_IS_EXECUTABLE)) {
-		nm_log_info (LOGD_DNS, "Clearing nscd hosts cache.");
-		nm_spawn_process ("/usr/sbin/nscd -i hosts");
-	}
-}
-
-int nm_backend_ipv6_use_tempaddr (void)
-{
-	return nm_generic_ipv6_use_tempaddr ();
-}
-
diff --git a/src/backends/NetworkManagerFrugalware.c b/src/backends/NetworkManagerFrugalware.c
deleted file mode 100644
index 301751e9..00000000
--- a/src/backends/NetworkManagerFrugalware.c
+++ /dev/null
@@ -1,43 +0,0 @@
-/* NetworkManager -- Network link manager
- *
- * Implementation for the Frugalware Linux distro - http://www.frugalware.org
- *
- * Alex Smith 
- *
- * Based on NetworkManagerSlackware.c by Narayan Newton 
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * (C) Copyright 2006 Alex Smith
- */
-
-/* Provided by the frugalwareutils package on Frugalware */
-#include  
-
-void nm_backend_enable_loopback (void)
-{
-	fwnet_loup ();
-}
-
-void nm_backend_update_dns (void)
-{
-	/* I'm not running nscd */
-}
-
-int nm_backend_ipv6_use_tempaddr (void)
-{
-	return nm_generic_ipv6_use_tempaddr ();
-}
-
diff --git a/src/backends/NetworkManagerGeneric.c b/src/backends/NetworkManagerGeneric.c
deleted file mode 100644
index eae6f733..00000000
--- a/src/backends/NetworkManagerGeneric.c
+++ /dev/null
@@ -1,177 +0,0 @@
-/* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */
-/* NetworkManager -- Network link manager
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * (C) Copyright 2004 - 2012 Red Hat, Inc.
- * (C) Copyright 2006 Timothee Lecomte 
- */
-
-#ifdef HAVE_CONFIG_H
-#include 
-#endif
-
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-
-#include "NetworkManagerGeneric.h"
-#include "nm-system.h"
-#include "NetworkManagerUtils.h"
-#include "nm-logging.h"
-#include "nm-netlink-compat.h"
-#include "nm-netlink-monitor.h"
-#include "nm-netlink-utils.h"
-
-/* Because of a bug in libnl, rtnl.h should be included before route.h */
-#include 
-
-#include 
-#include 
-
-/*
- * nm_generic_enable_loopback
- *
- * Bring up the loopback interface
- *
- */
-void nm_generic_enable_loopback (void)
-{
-	struct nl_sock *	nlh = NULL;
-	struct rtnl_addr *	addr = NULL;
-	struct nl_addr *	nl_addr = NULL;
-	guint32			binaddr = 0;
-	int			iface_idx = -1;
-	int			err;
-
-	nlh = nm_netlink_get_default_handle ();
-	if (!nlh)
-		return;
-
-	iface_idx = nm_netlink_iface_to_index ("lo");
-	if (iface_idx < 0)
-		return;
-
-	nm_system_iface_set_up (iface_idx, TRUE, NULL);
-
-	addr = rtnl_addr_alloc ();
-	if (!addr)
-		return;
-
-	binaddr = htonl (0x7f000001); /* 127.0.0.1 */
-	nl_addr = nl_addr_build (AF_INET, &binaddr, sizeof(binaddr));
-	if (!nl_addr)
-		goto out;
-	rtnl_addr_set_local (addr, nl_addr);
-	nl_addr_put (nl_addr);
-
-	binaddr = htonl (0x7fffffff); /* 127.255.255.255 */
-	nl_addr = nl_addr_build (AF_INET, &binaddr, sizeof(binaddr));
-	if (!nl_addr)
-		goto out;
-	rtnl_addr_set_broadcast (addr, nl_addr);
-	nl_addr_put (nl_addr);
-
-	rtnl_addr_set_prefixlen (addr, 8);
-	rtnl_addr_set_ifindex (addr, iface_idx);
-	rtnl_addr_set_scope (addr, RT_SCOPE_HOST);
-	rtnl_addr_set_label (addr, "lo");
-
-	err = rtnl_addr_add (nlh, addr, 0);
-	if (err && (err != -NLE_EXIST)) {
-		nm_log_warn (LOGD_CORE, "error setting loopback address: (%d) %s",
-			         err, nl_geterror (err));
-	}
-out:
-	if (addr)
-		rtnl_addr_put (addr);
-}
-
-/*
- * nm_generic_update_dns
- *
- * Make glibc/nscd aware of any changes to the resolv.conf file by
- * restarting nscd.
- *
- */
-void nm_generic_update_dns (void)
-{
-}
-
-/*
- * nm_generic_ipv6_use_tempaddr
- *
- * Get net.ipv6.conf.default.use_tempaddr value from /etc/sysctl.conf or
- * /lib/sysctl.d/sysctl.conf
- *
- */
-int nm_generic_ipv6_use_tempaddr (void)
-{
-	char *contents = NULL;
-	gsize len = 0;
-	const char *group_name = "[forged_group]\n";
-	char *sysctl_data = NULL;
-	GKeyFile *keyfile;
-	GError *error = NULL;
-	int tmp, ret = -1;
-
-	/* Read file contents to a string. */
-	if (!g_file_get_contents ("/etc/sysctl.conf", &contents, &len, NULL))
-		if (!g_file_get_contents ("/lib/sysctl.d/sysctl.conf", &contents, &len, NULL))
-			return -1;
-
-	/* Prepend a group so that we can use GKeyFile parser. */
-	sysctl_data = g_strdup_printf ("%s%s", group_name, contents);
-
-	keyfile = g_key_file_new ();
-	if (keyfile == NULL)
-		goto done;
-
-	if (!g_key_file_load_from_data (keyfile, sysctl_data, len + strlen (group_name), G_KEY_FILE_NONE, NULL))
-		goto done;
-
-	tmp = g_key_file_get_integer (keyfile, "forged_group", "net.ipv6.conf.default.use_tempaddr", &error);
-	if (error == NULL)
-		ret = tmp;
-
-done:
-	g_free (contents);
-	g_free (sysctl_data);
-	g_clear_error (&error);
-	g_key_file_free (keyfile);
-
-	return ret;
-}
-
-#ifdef TARGET_GENERIC
-void nm_backend_enable_loopback (void)
-{
-	nm_generic_enable_loopback ();
-}
-
-void nm_backend_update_dns (void)
-{
-	nm_generic_update_dns ();
-}
-
-int nm_backend_ipv6_use_tempaddr (void)
-{
-	return nm_generic_ipv6_use_tempaddr ();
-}
-#endif
-
diff --git a/src/backends/NetworkManagerGeneric.h b/src/backends/NetworkManagerGeneric.h
deleted file mode 100644
index 3d4017e4..00000000
--- a/src/backends/NetworkManagerGeneric.h
+++ /dev/null
@@ -1,33 +0,0 @@
-/* NetworkManager -- Network link manager
- *
- * Timothee Lecomte 
- *
- * Heavily based on NetworkManagerSystem.h by Dan Williams 
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * (C) Copyright 2004 - 2012 Red Hat, Inc.
- */
-
-#ifndef NM_GENERIC_H
-#define NM_GENERIC_H
-
-#include "nm-backend.h"
-
-void nm_generic_enable_loopback (void);
-void nm_generic_update_dns      (void);
-int nm_generic_ipv6_use_tempaddr (void);
-
-#endif  /* NM_GENERIC_H */
diff --git a/src/backends/NetworkManagerGentoo.c b/src/backends/NetworkManagerGentoo.c
deleted file mode 100644
index 7370645a..00000000
--- a/src/backends/NetworkManagerGentoo.c
+++ /dev/null
@@ -1,82 +0,0 @@
-/* NetworkManager -- Network link manager
- *
- * Dan Williams 
- * Dan Willemsen 
- * Robert Paskowitz
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * (C) Copyright 2004 - 2012 Red Hat, Inc.
- * (C) Copyright 2004 Dan Willemsen
- * (C) Copyright 2004 Robert Paskowitz
- */
-
-#ifdef HAVE_CONFIG_H
-#include 
-#endif
-
-#include 
-
-#include "NetworkManagerGeneric.h"
-#include "NetworkManagerUtils.h"
-#include "nm-logging.h"
-
-static void openrc_start_lo_if_necessary() 
-{
-	/* No need to run net.lo if it is already running */
-        if (nm_spawn_process ("/etc/init.d/net.lo status") != 0)
-                nm_spawn_process ("/etc/init.d/net.lo start");
-}
-
-void nm_backend_enable_loopback (void)
-{
-	gchar *comm;
-
-	/* If anything goes wrong trying to open /proc/1/comm, we will assume OpenRC */
-	if (!g_file_get_contents ("/proc/1/comm", &comm, NULL, NULL)) {
-		nm_log_info (LOGD_CORE, "NetworkManager is running with OpenRC...");
-		openrc_start_lo_if_necessary ();
-		return;
-	}
-
-	if (g_strstr_len (comm, -1, "systemd")) {
-		/* We use the generic loopback enabler if using systemd. */
-		nm_log_info (LOGD_CORE, "NetworkManager is running with systemd...");
-		nm_generic_enable_loopback ();
-	} else {
-		/* OpenRC otherwise. */
-		nm_log_info (LOGD_CORE, "NetworkManager is running with OpenRC...");
-		openrc_start_lo_if_necessary();
-	}
-
-	g_free (comm);
-}
-
-void nm_backend_update_dns (void)
-{
-	/* Make glibc/nscd aware of any changes to the resolv.conf file by
-	 * restarting nscd. Only restart if already running.
-	 */
-	if (g_file_test ("/usr/sbin/nscd", G_FILE_TEST_IS_EXECUTABLE)) {
-		nm_log_info (LOGD_DNS, "Clearing nscd hosts cache.");
-		nm_spawn_process ("/usr/sbin/nscd -i hosts");
-	}
-}
-
-int nm_backend_ipv6_use_tempaddr (void)
-{
-	return nm_generic_ipv6_use_tempaddr ();
-}
-
diff --git a/src/backends/NetworkManagerLFS.c b/src/backends/NetworkManagerLFS.c
deleted file mode 100644
index 7df2031c..00000000
--- a/src/backends/NetworkManagerLFS.c
+++ /dev/null
@@ -1,50 +0,0 @@
-/* NetworkManager -- Network link manager
- *
- * Backend implementation for the Linux From Scratch http://www.linuxfromscratch.org/
- *
- * Wayne Blaszczyk 
- * Armin K. 
- *
- * Heavily based on NetworkManagerRedhat.c by Dan Williams 
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * (C) Copyright 2004 Tom Parker
- * (C) Copyright 2004 Matthew Garrett
- * (C) Copyright 2004 - 2012 Red Hat, Inc.
- */
-
-#ifdef HAVE_CONFIG_H
-#include 
-#endif
-
-#include "NetworkManagerGeneric.h"
-#include "NetworkManagerUtils.h"
-
-void nm_backend_enable_loopback (void)
-{
-	nm_generic_enable_loopback ();
-}
-
-void nm_backend_update_dns (void)
-{
-	if (g_file_test("/var/run/nscd/nscd.pid", G_FILE_TEST_EXISTS))
-		nm_spawn_process ("/usr/sbin/nscd -i hosts");
-}
-
-int nm_backend_ipv6_use_tempaddr (void)
-{
-	return nm_generic_ipv6_use_tempaddr ();
-}
diff --git a/src/backends/NetworkManagerLinexa.c b/src/backends/NetworkManagerLinexa.c
deleted file mode 100644
index 34fed3bb..00000000
--- a/src/backends/NetworkManagerLinexa.c
+++ /dev/null
@@ -1,53 +0,0 @@
-/* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */
-/* NetworkManager -- Network link manager
- *
- * Matthew Garrett 
- *
- * Heavily based on NetworkManagerRedhat.c by Dan Williams 
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * (C) Copyright 2004 Tom Parker
- * (C) Copyright 2004 Matthew Garrett
- * (C) Copyright 2004 - 2012 Red Hat, Inc.
- */
-
-#ifdef HAVE_CONFIG_H
-#include 
-#endif
-
-#include "NetworkManagerGeneric.h"
-#include "NetworkManagerUtils.h"
-#include "nm-logging.h"
-
-void nm_backend_enable_loopback (void)
-{
-	nm_generic_enable_loopback ();
-}
-
-void nm_backend_update_dns (void)
-{
-	/* Invalidate the nscd host cache, if it exists, since we changed resolv.conf */
-	if (g_file_test ("/usr/sbin/nscd", G_FILE_TEST_IS_EXECUTABLE)) {
-		nm_log_info (LOGD_DNS, "Clearing nscd hosts cache.");
-		nm_spawn_process ("/usr/sbin/nscd -i hosts");
-	}
-}
-
-int nm_backend_ipv6_use_tempaddr (void)
-{
-	return nm_generic_ipv6_use_tempaddr ();
-}
-
diff --git a/src/backends/NetworkManagerMandriva.c b/src/backends/NetworkManagerMandriva.c
deleted file mode 100644
index f059beb6..00000000
--- a/src/backends/NetworkManagerMandriva.c
+++ /dev/null
@@ -1,49 +0,0 @@
-/* NetworkManager -- Network link manager
- *
- * Dan Williams 
- * Per Øyvind Karlsen 
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * (C) Copyright 2004 - 2012 Red Hat, Inc.
- * (C) Copyright 2008 Per Øyvind Karlsen
- */
-
-#ifdef HAVE_CONFIG_H
-#include 
-#endif
-
-#include "NetworkManagerGeneric.h"
-#include "NetworkManagerUtils.h"
-
-void nm_backend_enable_loopback (void)
-{
-	nm_generic_enable_loopback ();
-}
-
-void nm_backend_update_dns (void)
-{
-	/* Invalidate the nscd host cache, if it exists, since we changed resolv.conf */
-	if (g_file_test ("/usr/sbin/nscd", G_FILE_TEST_EXISTS | G_FILE_TEST_IS_EXECUTABLE | G_FILE_TEST_IS_REGULAR)) {
-		nm_spawn_process ("/etc/init.d/nscd condrestart");
-		nm_spawn_process ("/usr/sbin/nscd -i hosts");
-	}
-}
-
-int nm_backend_ipv6_use_tempaddr (void)
-{
-	return nm_generic_ipv6_use_tempaddr ();
-}
-
diff --git a/src/backends/NetworkManagerPaldo.c b/src/backends/NetworkManagerPaldo.c
deleted file mode 100644
index 2d01d857..00000000
--- a/src/backends/NetworkManagerPaldo.c
+++ /dev/null
@@ -1,51 +0,0 @@
-/* NetworkManager -- Network link manager
- *
- * Jürg Billeter 
- *
- * Heavily based on NetworkManagerRedhat.c by Dan Williams 
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * (C) Copyright 2004 - 2012 Red Hat, Inc.
- * (C) Copyright 2006 Jürg Billeter
- */
-
-#ifdef HAVE_CONFIG_H
-#include 
-#endif
-
-#include "NetworkManagerGeneric.h"
-#include "NetworkManagerUtils.h"
-#include "nm-logging.h"
-
-void nm_backend_enable_loopback (void)
-{
-	nm_generic_enable_loopback ();
-}
-
-void nm_backend_update_dns (void)
-{
-	/* Invalidate the nscd host cache, if it exists, since we changed resolv.conf */
-	if (g_file_test ("/usr/sbin/nscd", G_FILE_TEST_IS_EXECUTABLE)) {
-		nm_log_info (LOGD_DNS, "Clearing nscd hosts cache.");
-		nm_spawn_process ("/usr/sbin/nscd -i hosts");
-	}
-}
-
-int nm_backend_ipv6_use_tempaddr (void)
-{
-	return nm_generic_ipv6_use_tempaddr ();
-}
-
diff --git a/src/backends/NetworkManagerPardus.c b/src/backends/NetworkManagerPardus.c
deleted file mode 100644
index acfeaed3..00000000
--- a/src/backends/NetworkManagerPardus.c
+++ /dev/null
@@ -1,42 +0,0 @@
-/* NetworkManager -- Network link manager
- *
- * Ozan Caglayan 
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * (C) Copyright 2004 - 2012 RedHat, Inc.
- * (C) Copyright 2009 TUBITAK/UEKAE
- */
-
-#ifdef HAVE_CONFIG_H
-#include 
-#endif
-
-#include "NetworkManagerGeneric.h"
-
-void nm_backend_enable_loopback (void)
-{
-	nm_generic_enable_loopback ();
-}
-
-void nm_backend_update_dns (void)
-{
-}
-
-int nm_backend_ipv6_use_tempaddr (void)
-{
-	return nm_generic_ipv6_use_tempaddr ();
-}
-
diff --git a/src/backends/NetworkManagerRedHat.c b/src/backends/NetworkManagerRedHat.c
deleted file mode 100644
index 843b03b2..00000000
--- a/src/backends/NetworkManagerRedHat.c
+++ /dev/null
@@ -1,51 +0,0 @@
-/* NetworkManager -- Network link manager
- *
- * Dan Williams 
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * (C) Copyright 2004 - 2012 Red Hat, Inc.
- */
-
-#ifdef HAVE_CONFIG_H
-#include 
-#endif
-
-#include "NetworkManagerGeneric.h"
-#include "NetworkManagerUtils.h"
-
-void nm_backend_enable_loopback (void)
-{
-	nm_generic_enable_loopback ();
-}
-
-void nm_backend_update_dns (void)
-{
-	/* Invalidate the nscd host cache since we changed resolv.conf */
-	if (g_file_test ("/usr/sbin/nscd", G_FILE_TEST_EXISTS | G_FILE_TEST_IS_EXECUTABLE | G_FILE_TEST_IS_REGULAR)) {
-		if (g_file_test ("/etc/init.d/nscd", G_FILE_TEST_EXISTS))
-			nm_spawn_process ("/etc/init.d/nscd condrestart");
-		else if (g_file_test ("/bin/systemctl", G_FILE_TEST_IS_EXECUTABLE))
-			nm_spawn_process ("/bin/systemctl condrestart nscd.service");
-
-		nm_spawn_process ("/usr/sbin/nscd -i hosts");
-	}
-}
-
-int nm_backend_ipv6_use_tempaddr (void)
-{
-	return nm_generic_ipv6_use_tempaddr ();
-}
-
diff --git a/src/backends/NetworkManagerSlackware.c b/src/backends/NetworkManagerSlackware.c
deleted file mode 100644
index cdd2dfb0..00000000
--- a/src/backends/NetworkManagerSlackware.c
+++ /dev/null
@@ -1,42 +0,0 @@
-/* NetworkManager -- Network link manager
- *
- * Narayan Newton 
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * (C) Copyright 2004 - 2012 RedHat, Inc.
- * (C) Copyright 2004 Narayan Newton
- */
-
-#ifdef HAVE_CONFIG_H
-#include 
-#endif
-
-#include "NetworkManagerGeneric.h"
-
-void nm_backend_enable_loopback (void)
-{
-	nm_generic_enable_loopback ();
-}
-
-void nm_backend_update_dns (void)
-{
-}
-
-int nm_backend_ipv6_use_tempaddr (void)
-{
-	return nm_generic_ipv6_use_tempaddr ();
-}
-
diff --git a/src/backends/NetworkManagerSuSE.c b/src/backends/NetworkManagerSuSE.c
deleted file mode 100644
index 12618532..00000000
--- a/src/backends/NetworkManagerSuSE.c
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
- * NetworkManager -- Network link manager
- *
- * Dan Williams 
- * Kay Sievers 
- * Robert Love 
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * (C) Copyright 2004 - 2012 Red Hat, Inc.
- * (C) Copyright 2005-2006 SuSE GmbH
- */
-
-#ifdef HAVE_CONFIG_H
-#include 
-#endif
-
-#include "NetworkManagerGeneric.h"
-#include "NetworkManagerUtils.h"
-#include "nm-logging.h"
-
-void nm_backend_enable_loopback (void)
-{
-	nm_generic_enable_loopback ();
-}
-
-void nm_backend_update_dns (void)
-{
-	/* Invalidate the nscd host cache, if it exists, since we changed resolv.conf */
-	if (g_file_test ("/usr/sbin/nscd", G_FILE_TEST_IS_EXECUTABLE)) {
-		nm_log_info (LOGD_DNS, "Clearing nscd hosts cache.");
-		nm_spawn_process ("/usr/sbin/nscd -i hosts");
-	}
-}
-
-int nm_backend_ipv6_use_tempaddr (void)
-{
-	return nm_generic_ipv6_use_tempaddr ();
-}
-
diff --git a/src/backends/nm-backend.h b/src/backends/nm-backend.h
deleted file mode 100644
index 17d1ff64..00000000
--- a/src/backends/nm-backend.h
+++ /dev/null
@@ -1,30 +0,0 @@
-/* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */
-/* NetworkManager -- Network link manager
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Copyright (C) 2011 - 2012 Red Hat, Inc.
- */
-
-#ifndef NM_BACKEND_H
-#define NM_BACKEND_H
-
-/* Random disto-specific stuff */
-
-void nm_backend_enable_loopback (void);
-void nm_backend_update_dns      (void);
-int nm_backend_ipv6_use_tempaddr (void);
-
-#endif  /* NM_BACKEND_H */
diff --git a/src/bluez-manager/Makefile.am b/src/bluez-manager/Makefile.am
index 63c6d3de..7e7ed9a0 100644
--- a/src/bluez-manager/Makefile.am
+++ b/src/bluez-manager/Makefile.am
@@ -24,7 +24,6 @@ libbluez_manager_la_CPPFLAGS = \
 	$(DBUS_CFLAGS) \
 	$(GLIB_CFLAGS) \
 	$(BLUEZ_CFLAGS) \
-	-DG_DISABLE_DEPRECATED \
 	-DBINDIR=\"$(bindir)\" \
 	-DDATADIR=\"$(datadir)\" \
 	-DSYSCONFDIR=\"$(sysconfdir)\" \
diff --git a/src/bluez-manager/Makefile.in b/src/bluez-manager/Makefile.in
index dfd62f46..f80f8cb0 100644
--- a/src/bluez-manager/Makefile.in
+++ b/src/bluez-manager/Makefile.in
@@ -55,16 +55,18 @@ subdir = src/bluez-manager
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/compiler_warnings.m4 \
-	$(top_srcdir)/m4/gettext.m4 $(top_srcdir)/m4/gtk-doc.m4 \
-	$(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/intlmacosx.m4 \
-	$(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/introspection.m4 \
-	$(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \
-	$(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/libnl-check.m4 \
-	$(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \
-	$(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
-	$(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/nls.m4 \
-	$(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/progtest.m4 \
-	$(top_srcdir)/m4/vapigen.m4 $(top_srcdir)/configure.ac
+	$(top_srcdir)/m4/gettext.m4 \
+	$(top_srcdir)/m4/gnome-code-coverage.m4 \
+	$(top_srcdir)/m4/gtk-doc.m4 $(top_srcdir)/m4/iconv.m4 \
+	$(top_srcdir)/m4/intlmacosx.m4 $(top_srcdir)/m4/intltool.m4 \
+	$(top_srcdir)/m4/introspection.m4 $(top_srcdir)/m4/lib-ld.m4 \
+	$(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \
+	$(top_srcdir)/m4/libnl-check.m4 $(top_srcdir)/m4/libtool.m4 \
+	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
+	$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
+	$(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/po.m4 \
+	$(top_srcdir)/m4/progtest.m4 $(top_srcdir)/m4/vapigen.m4 \
+	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(install_sh) -d
@@ -133,6 +135,10 @@ AWK = @AWK@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
+CKDB_PATH = @CKDB_PATH@
+CODE_COVERAGE_CFLAGS = @CODE_COVERAGE_CFLAGS@
+CODE_COVERAGE_ENABLED = @CODE_COVERAGE_ENABLED@
+CODE_COVERAGE_LDFLAGS = @CODE_COVERAGE_LDFLAGS@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CXX = @CXX@
@@ -147,9 +153,7 @@ DBUS_SYS_DIR = @DBUS_SYS_DIR@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
 DHCLIENT_PATH = @DHCLIENT_PATH@
-DHCLIENT_VERSION = @DHCLIENT_VERSION@
 DHCPCD_PATH = @DHCPCD_PATH@
-DISABLE_DEPRECATED = @DISABLE_DEPRECATED@
 DLLTOOL = @DLLTOOL@
 DSYMUTIL = @DSYMUTIL@
 DUMPBIN = @DUMPBIN@
@@ -159,17 +163,14 @@ ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
 FGREP = @FGREP@
+GENHTML = @GENHTML@
 GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
 GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
-GIO_CFLAGS = @GIO_CFLAGS@
-GIO_LIBS = @GIO_LIBS@
 GLIB_CFLAGS = @GLIB_CFLAGS@
 GLIB_GENMARSHAL = @GLIB_GENMARSHAL@
 GLIB_LIBS = @GLIB_LIBS@
 GLIB_MAKEFILE = @GLIB_MAKEFILE@
 GLIB_MKENUMS = @GLIB_MKENUMS@
-GMODULE_CFLAGS = @GMODULE_CFLAGS@
-GMODULE_LIBS = @GMODULE_LIBS@
 GMSGFMT = @GMSGFMT@
 GMSGFMT_015 = @GMSGFMT_015@
 GNUTLS_CFLAGS = @GNUTLS_CFLAGS@
@@ -210,6 +211,7 @@ IPTABLES_PATH = @IPTABLES_PATH@
 IWMX_SDK_CFLAGS = @IWMX_SDK_CFLAGS@
 IWMX_SDK_LIBS = @IWMX_SDK_LIBS@
 KERNEL_FIRMWARE_DIR = @KERNEL_FIRMWARE_DIR@
+LCOV = @LCOV@
 LD = @LD@
 LDFLAGS = @LDFLAGS@
 LIBDL = @LIBDL@
@@ -226,11 +228,7 @@ LIBNL2_LIBS = @LIBNL2_LIBS@
 LIBNL3_CFLAGS = @LIBNL3_CFLAGS@
 LIBNL3_LIBS = @LIBNL3_LIBS@
 LIBNL_CFLAGS = @LIBNL_CFLAGS@
-LIBNL_GENL3_CFLAGS = @LIBNL_GENL3_CFLAGS@
-LIBNL_GENL3_LIBS = @LIBNL_GENL3_LIBS@
 LIBNL_LIBS = @LIBNL_LIBS@
-LIBNL_ROUTE3_CFLAGS = @LIBNL_ROUTE3_CFLAGS@
-LIBNL_ROUTE3_LIBS = @LIBNL_ROUTE3_LIBS@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
 LIBSOUP_CFLAGS = @LIBSOUP_CFLAGS@
@@ -245,6 +243,8 @@ MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MANIFEST_TOOL = @MANIFEST_TOOL@
 MKDIR_P = @MKDIR_P@
+MM_GLIB_CFLAGS = @MM_GLIB_CFLAGS@
+MM_GLIB_LIBS = @MM_GLIB_LIBS@
 MOC = @MOC@
 MSGFMT = @MSGFMT@
 MSGFMT_015 = @MSGFMT_015@
@@ -254,6 +254,7 @@ NMEDIT = @NMEDIT@
 NM_MAJOR_VERSION = @NM_MAJOR_VERSION@
 NM_MICRO_VERSION = @NM_MICRO_VERSION@
 NM_MINOR_VERSION = @NM_MINOR_VERSION@
+NM_MODIFY_SYSTEM_POLICY = @NM_MODIFY_SYSTEM_POLICY@
 NM_VERSION = @NM_VERSION@
 NSS_CFLAGS = @NSS_CFLAGS@
 NSS_LIBS = @NSS_LIBS@
@@ -280,13 +281,14 @@ PPPD_PLUGIN_DIR = @PPPD_PLUGIN_DIR@
 QT_CFLAGS = @QT_CFLAGS@
 QT_LIBS = @QT_LIBS@
 RANLIB = @RANLIB@
-RESOLVCONF_PATH = @RESOLVCONF_PATH@
 SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
-SYSTEMD_CFLAGS = @SYSTEMD_CFLAGS@
-SYSTEMD_LIBS = @SYSTEMD_LIBS@
+SYSTEMD_INHIBIT_CFLAGS = @SYSTEMD_INHIBIT_CFLAGS@
+SYSTEMD_INHIBIT_LIBS = @SYSTEMD_INHIBIT_LIBS@
+SYSTEMD_LOGIN_CFLAGS = @SYSTEMD_LOGIN_CFLAGS@
+SYSTEMD_LOGIN_LIBS = @SYSTEMD_LOGIN_LIBS@
 SYSTEM_CA_PATH = @SYSTEM_CA_PATH@
 UDEV_BASE_DIR = @UDEV_BASE_DIR@
 USE_NLS = @USE_NLS@
@@ -341,6 +343,11 @@ localedir = @localedir@
 localstatedir = @localstatedir@
 mandir = @mandir@
 mkdir_p = @mkdir_p@
+nmbinary = @nmbinary@
+nmconfdir = @nmconfdir@
+nmdatadir = @nmdatadir@
+nmrundir = @nmrundir@
+nmstatedir = @nmstatedir@
 oldincludedir = @oldincludedir@
 pdfdir = @pdfdir@
 prefix = @prefix@
@@ -355,6 +362,10 @@ target_alias = @target_alias@
 top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
+with_dhclient = @with_dhclient@
+with_dhcpcd = @with_dhcpcd@
+with_netconfig = @with_netconfig@
+with_resolvconf = @with_resolvconf@
 INCLUDES = \
 	-I${top_srcdir} \
 	-I${top_builddir}/include \
@@ -380,7 +391,6 @@ libbluez_manager_la_CPPFLAGS = \
 	$(DBUS_CFLAGS) \
 	$(GLIB_CFLAGS) \
 	$(BLUEZ_CFLAGS) \
-	-DG_DISABLE_DEPRECATED \
 	-DBINDIR=\"$(bindir)\" \
 	-DDATADIR=\"$(datadir)\" \
 	-DSYSCONFDIR=\"$(sysconfdir)\" \
@@ -451,25 +461,22 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libbluez_manager_la-nm-bluez-manager.Plo@am__quote@
 
 .c.o:
-@am__fastdepCC_TRUE@	$(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\
-@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
-@am__fastdepCC_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.Po
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $<
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c $<
 
 .c.obj:
-@am__fastdepCC_TRUE@	$(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.obj$$||'`;\
-@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ `$(CYGPATH_W) '$<'` &&\
-@am__fastdepCC_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.Po
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c `$(CYGPATH_W) '$<'`
 
 .c.lo:
-@am__fastdepCC_TRUE@	$(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.lo$$||'`;\
-@am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
-@am__fastdepCC_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.Plo
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $<
diff --git a/src/dhcp-manager/Makefile.am b/src/dhcp-manager/Makefile.am
index 60286703..04ae1489 100644
--- a/src/dhcp-manager/Makefile.am
+++ b/src/dhcp-manager/Makefile.am
@@ -1,4 +1,4 @@
-SUBDIRS=. tests
+SUBDIRS = . tests
 
 INCLUDES = \
 	-I${top_srcdir} \
@@ -25,12 +25,12 @@ libdhcp_dhclient_la_SOURCES = \
 libdhcp_dhclient_la_CPPFLAGS = \
 	$(DBUS_CFLAGS) \
 	$(GLIB_CFLAGS) \
-	-DG_DISABLE_DEPRECATED \
 	-DSYSCONFDIR=\"$(sysconfdir)\" \
 	-DLIBEXECDIR=\"$(libexecdir)\" \
 	-DLOCALSTATEDIR=\"$(localstatedir)\" \
 	-DDHCLIENT_PATH=\"$(DHCLIENT_PATH)\" \
-	-DDHCLIENT_V$(DHCLIENT_VERSION)
+	-DNMSTATEDIR=\"$(nmstatedir)\" \
+	-DNMCONFDIR=\"$(nmconfdir)\"
 
 libdhcp_dhclient_la_LIBADD = \
 	$(top_builddir)/src/logging/libnm-logging.la \
@@ -52,11 +52,11 @@ libdhcp_manager_la_SOURCES = \
 libdhcp_manager_la_CPPFLAGS = \
 	$(DBUS_CFLAGS) \
 	$(GLIB_CFLAGS) \
-	-DG_DISABLE_DEPRECATED \
 	-DLIBEXECDIR=\"$(libexecdir)\" \
 	-DLOCALSTATEDIR=\"$(localstatedir)\" \
 	-DDHCLIENT_PATH=\"$(DHCLIENT_PATH)\" \
-	-DDHCPCD_PATH=\"$(DHCPCD_PATH)\"
+	-DDHCPCD_PATH=\"$(DHCPCD_PATH)\" \
+	-DNMSTATEDIR=\"$(nmstatedir)\"
 
 libdhcp_manager_la_LIBADD = \
 	$(top_builddir)/src/logging/libnm-logging.la \
diff --git a/src/dhcp-manager/Makefile.in b/src/dhcp-manager/Makefile.in
index f7ed43f0..f161c210 100644
--- a/src/dhcp-manager/Makefile.in
+++ b/src/dhcp-manager/Makefile.in
@@ -55,16 +55,18 @@ subdir = src/dhcp-manager
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/compiler_warnings.m4 \
-	$(top_srcdir)/m4/gettext.m4 $(top_srcdir)/m4/gtk-doc.m4 \
-	$(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/intlmacosx.m4 \
-	$(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/introspection.m4 \
-	$(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \
-	$(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/libnl-check.m4 \
-	$(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \
-	$(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
-	$(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/nls.m4 \
-	$(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/progtest.m4 \
-	$(top_srcdir)/m4/vapigen.m4 $(top_srcdir)/configure.ac
+	$(top_srcdir)/m4/gettext.m4 \
+	$(top_srcdir)/m4/gnome-code-coverage.m4 \
+	$(top_srcdir)/m4/gtk-doc.m4 $(top_srcdir)/m4/iconv.m4 \
+	$(top_srcdir)/m4/intlmacosx.m4 $(top_srcdir)/m4/intltool.m4 \
+	$(top_srcdir)/m4/introspection.m4 $(top_srcdir)/m4/lib-ld.m4 \
+	$(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \
+	$(top_srcdir)/m4/libnl-check.m4 $(top_srcdir)/m4/libtool.m4 \
+	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
+	$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
+	$(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/po.m4 \
+	$(top_srcdir)/m4/progtest.m4 $(top_srcdir)/m4/vapigen.m4 \
+	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(install_sh) -d
@@ -181,6 +183,10 @@ AWK = @AWK@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
+CKDB_PATH = @CKDB_PATH@
+CODE_COVERAGE_CFLAGS = @CODE_COVERAGE_CFLAGS@
+CODE_COVERAGE_ENABLED = @CODE_COVERAGE_ENABLED@
+CODE_COVERAGE_LDFLAGS = @CODE_COVERAGE_LDFLAGS@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CXX = @CXX@
@@ -195,9 +201,7 @@ DBUS_SYS_DIR = @DBUS_SYS_DIR@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
 DHCLIENT_PATH = @DHCLIENT_PATH@
-DHCLIENT_VERSION = @DHCLIENT_VERSION@
 DHCPCD_PATH = @DHCPCD_PATH@
-DISABLE_DEPRECATED = @DISABLE_DEPRECATED@
 DLLTOOL = @DLLTOOL@
 DSYMUTIL = @DSYMUTIL@
 DUMPBIN = @DUMPBIN@
@@ -207,17 +211,14 @@ ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
 FGREP = @FGREP@
+GENHTML = @GENHTML@
 GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
 GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
-GIO_CFLAGS = @GIO_CFLAGS@
-GIO_LIBS = @GIO_LIBS@
 GLIB_CFLAGS = @GLIB_CFLAGS@
 GLIB_GENMARSHAL = @GLIB_GENMARSHAL@
 GLIB_LIBS = @GLIB_LIBS@
 GLIB_MAKEFILE = @GLIB_MAKEFILE@
 GLIB_MKENUMS = @GLIB_MKENUMS@
-GMODULE_CFLAGS = @GMODULE_CFLAGS@
-GMODULE_LIBS = @GMODULE_LIBS@
 GMSGFMT = @GMSGFMT@
 GMSGFMT_015 = @GMSGFMT_015@
 GNUTLS_CFLAGS = @GNUTLS_CFLAGS@
@@ -258,6 +259,7 @@ IPTABLES_PATH = @IPTABLES_PATH@
 IWMX_SDK_CFLAGS = @IWMX_SDK_CFLAGS@
 IWMX_SDK_LIBS = @IWMX_SDK_LIBS@
 KERNEL_FIRMWARE_DIR = @KERNEL_FIRMWARE_DIR@
+LCOV = @LCOV@
 LD = @LD@
 LDFLAGS = @LDFLAGS@
 LIBDL = @LIBDL@
@@ -274,11 +276,7 @@ LIBNL2_LIBS = @LIBNL2_LIBS@
 LIBNL3_CFLAGS = @LIBNL3_CFLAGS@
 LIBNL3_LIBS = @LIBNL3_LIBS@
 LIBNL_CFLAGS = @LIBNL_CFLAGS@
-LIBNL_GENL3_CFLAGS = @LIBNL_GENL3_CFLAGS@
-LIBNL_GENL3_LIBS = @LIBNL_GENL3_LIBS@
 LIBNL_LIBS = @LIBNL_LIBS@
-LIBNL_ROUTE3_CFLAGS = @LIBNL_ROUTE3_CFLAGS@
-LIBNL_ROUTE3_LIBS = @LIBNL_ROUTE3_LIBS@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
 LIBSOUP_CFLAGS = @LIBSOUP_CFLAGS@
@@ -293,6 +291,8 @@ MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MANIFEST_TOOL = @MANIFEST_TOOL@
 MKDIR_P = @MKDIR_P@
+MM_GLIB_CFLAGS = @MM_GLIB_CFLAGS@
+MM_GLIB_LIBS = @MM_GLIB_LIBS@
 MOC = @MOC@
 MSGFMT = @MSGFMT@
 MSGFMT_015 = @MSGFMT_015@
@@ -302,6 +302,7 @@ NMEDIT = @NMEDIT@
 NM_MAJOR_VERSION = @NM_MAJOR_VERSION@
 NM_MICRO_VERSION = @NM_MICRO_VERSION@
 NM_MINOR_VERSION = @NM_MINOR_VERSION@
+NM_MODIFY_SYSTEM_POLICY = @NM_MODIFY_SYSTEM_POLICY@
 NM_VERSION = @NM_VERSION@
 NSS_CFLAGS = @NSS_CFLAGS@
 NSS_LIBS = @NSS_LIBS@
@@ -328,13 +329,14 @@ PPPD_PLUGIN_DIR = @PPPD_PLUGIN_DIR@
 QT_CFLAGS = @QT_CFLAGS@
 QT_LIBS = @QT_LIBS@
 RANLIB = @RANLIB@
-RESOLVCONF_PATH = @RESOLVCONF_PATH@
 SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
-SYSTEMD_CFLAGS = @SYSTEMD_CFLAGS@
-SYSTEMD_LIBS = @SYSTEMD_LIBS@
+SYSTEMD_INHIBIT_CFLAGS = @SYSTEMD_INHIBIT_CFLAGS@
+SYSTEMD_INHIBIT_LIBS = @SYSTEMD_INHIBIT_LIBS@
+SYSTEMD_LOGIN_CFLAGS = @SYSTEMD_LOGIN_CFLAGS@
+SYSTEMD_LOGIN_LIBS = @SYSTEMD_LOGIN_LIBS@
 SYSTEM_CA_PATH = @SYSTEM_CA_PATH@
 UDEV_BASE_DIR = @UDEV_BASE_DIR@
 USE_NLS = @USE_NLS@
@@ -389,6 +391,11 @@ localedir = @localedir@
 localstatedir = @localstatedir@
 mandir = @mandir@
 mkdir_p = @mkdir_p@
+nmbinary = @nmbinary@
+nmconfdir = @nmconfdir@
+nmdatadir = @nmdatadir@
+nmrundir = @nmrundir@
+nmstatedir = @nmstatedir@
 oldincludedir = @oldincludedir@
 pdfdir = @pdfdir@
 prefix = @prefix@
@@ -403,6 +410,10 @@ target_alias = @target_alias@
 top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
+with_dhclient = @with_dhclient@
+with_dhcpcd = @with_dhcpcd@
+with_netconfig = @with_netconfig@
+with_resolvconf = @with_resolvconf@
 SUBDIRS = . tests
 INCLUDES = \
 	-I${top_srcdir} \
@@ -428,12 +439,12 @@ libdhcp_dhclient_la_SOURCES = \
 libdhcp_dhclient_la_CPPFLAGS = \
 	$(DBUS_CFLAGS) \
 	$(GLIB_CFLAGS) \
-	-DG_DISABLE_DEPRECATED \
 	-DSYSCONFDIR=\"$(sysconfdir)\" \
 	-DLIBEXECDIR=\"$(libexecdir)\" \
 	-DLOCALSTATEDIR=\"$(localstatedir)\" \
 	-DDHCLIENT_PATH=\"$(DHCLIENT_PATH)\" \
-	-DDHCLIENT_V$(DHCLIENT_VERSION)
+	-DNMSTATEDIR=\"$(nmstatedir)\" \
+	-DNMCONFDIR=\"$(nmconfdir)\"
 
 libdhcp_dhclient_la_LIBADD = \
 	$(top_builddir)/src/logging/libnm-logging.la \
@@ -455,11 +466,11 @@ libdhcp_manager_la_SOURCES = \
 libdhcp_manager_la_CPPFLAGS = \
 	$(DBUS_CFLAGS) \
 	$(GLIB_CFLAGS) \
-	-DG_DISABLE_DEPRECATED \
 	-DLIBEXECDIR=\"$(libexecdir)\" \
 	-DLOCALSTATEDIR=\"$(localstatedir)\" \
 	-DDHCLIENT_PATH=\"$(DHCLIENT_PATH)\" \
-	-DDHCPCD_PATH=\"$(DHCPCD_PATH)\"
+	-DDHCPCD_PATH=\"$(DHCPCD_PATH)\" \
+	-DNMSTATEDIR=\"$(nmstatedir)\"
 
 libdhcp_manager_la_LIBADD = \
 	$(top_builddir)/src/logging/libnm-logging.la \
@@ -529,25 +540,22 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libdhcp_manager_la-nm-dhcp-manager.Plo@am__quote@
 
 .c.o:
-@am__fastdepCC_TRUE@	$(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\
-@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
-@am__fastdepCC_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.Po
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $<
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c $<
 
 .c.obj:
-@am__fastdepCC_TRUE@	$(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.obj$$||'`;\
-@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ `$(CYGPATH_W) '$<'` &&\
-@am__fastdepCC_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.Po
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c `$(CYGPATH_W) '$<'`
 
 .c.lo:
-@am__fastdepCC_TRUE@	$(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.lo$$||'`;\
-@am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
-@am__fastdepCC_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.Plo
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $<
diff --git a/src/dhcp-manager/nm-dhcp-client.c b/src/dhcp-manager/nm-dhcp-client.c
index ea4084ac..f721adf5 100644
--- a/src/dhcp-manager/nm-dhcp-client.c
+++ b/src/dhcp-manager/nm-dhcp-client.c
@@ -18,7 +18,6 @@
  */
 
 #include 
-#include 
 #include 
 #include 
 #include 
@@ -183,7 +182,7 @@ nm_dhcp_client_stop_pid (GPid pid, const char *iface, guint timeout_secs)
 }
 
 static void
-real_stop (NMDHCPClient *self, gboolean release)
+stop (NMDHCPClient *self, gboolean release)
 {
 	NMDHCPClientPrivate *priv;
 
@@ -886,7 +885,7 @@ ip4_process_classless_routes (GHashTable *options,
 
 	p = str;
 	while (*p) {
-		if (!isdigit (*p) && (*p != ' ') && (*p != '.') && (*p != '/')) {
+		if (!g_ascii_isdigit (*p) && (*p != ' ') && (*p != '.') && (*p != '/')) {
 			nm_log_warn (LOGD_DHCP4, "ignoring invalid classless static routes '%s'", str);
 			return FALSE;
 		}
@@ -1399,7 +1398,7 @@ nm_dhcp_client_class_init (NMDHCPClientClass *client_class)
 	object_class->get_property = get_property;
 	object_class->set_property = set_property;
 
-	client_class->stop = real_stop;
+	client_class->stop = stop;
 
 	g_object_class_install_property
 		(object_class, PROP_IFACE,
diff --git a/src/dhcp-manager/nm-dhcp-dhclient-utils.c b/src/dhcp-manager/nm-dhcp-dhclient-utils.c
index ab49a765..f3d3b1b6 100644
--- a/src/dhcp-manager/nm-dhcp-dhclient-utils.c
+++ b/src/dhcp-manager/nm-dhcp-dhclient-utils.c
@@ -22,7 +22,6 @@
 #include 
 #include 
 #include 
-#include 
 
 #include "nm-dhcp-dhclient-utils.h"
 
@@ -30,8 +29,11 @@
 #define CLIENTID_FORMAT         CLIENTID_TAG " \"%s\"; # added by NetworkManager"
 #define CLIENTID_FORMAT_OCTETS  CLIENTID_TAG " %s; # added by NetworkManager"
 
-#define HOSTNAME_TAG     "send host-name"
-#define HOSTNAME_FORMAT  HOSTNAME_TAG " \"%s\"; # added by NetworkManager"
+#define HOSTNAME4_TAG    "send host-name"
+#define HOSTNAME4_FORMAT HOSTNAME4_TAG " \"%s\"; # added by NetworkManager"
+
+#define HOSTNAME6_TAG    "send fqdn.fqdn"
+#define HOSTNAME6_FORMAT HOSTNAME6_TAG " \"%s\"; # added by NetworkManager"
 
 #define ALSOREQ_TAG "also request "
 
@@ -47,9 +49,83 @@ add_also_request (GPtrArray *array, const char *item)
 	g_ptr_array_add (array, g_strdup (item));
 }
 
+static void
+add_hostname (GString *str, const char *format, const char *hostname)
+{
+	char *plain_hostname, *dot;
+
+	if (hostname) {
+		plain_hostname = g_strdup (hostname);
+		dot = strchr (plain_hostname, '.');
+		/* get rid of the domain */
+		if (dot)
+			*dot = '\0';
+
+		g_string_append_printf (str, format, plain_hostname);
+		g_free (plain_hostname);
+	}
+}
+
+static void
+add_ip4_config (GString *str, NMSettingIP4Config *s_ip4, const char *hostname)
+{
+	if (s_ip4) {
+		const char *tmp;
+
+		tmp = nm_setting_ip4_config_get_dhcp_client_id (s_ip4);
+		if (tmp) {
+			gboolean is_octets = TRUE;
+			const char *p = tmp;
+
+			while (*p) {
+				if (!g_ascii_isxdigit (*p) && (*p != ':')) {
+					is_octets = FALSE;
+					break;
+				}
+				p++;
+			}
+
+			/* If the client ID is just hex digits and : then don't use quotes,
+			 * because dhclient expects either a quoted ASCII string, or a byte
+			 * array formated as hex octets separated by :
+			 */
+			if (is_octets)
+				g_string_append_printf (str, CLIENTID_FORMAT_OCTETS "\n", tmp);
+			else
+				g_string_append_printf (str, CLIENTID_FORMAT "\n", tmp);
+		}
+	}
+
+	add_hostname (str, HOSTNAME4_FORMAT "\n", hostname);
+
+	g_string_append_c (str, '\n');
+
+	/* Define options for classless static routes */
+	g_string_append (str,
+	                 "option rfc3442-classless-static-routes code 121 = array of unsigned integer 8;\n");
+	g_string_append (str,
+	                 "option ms-classless-static-routes code 249 = array of unsigned integer 8;\n");
+	/* Web Proxy Auto-Discovery option (bgo #368423) */
+	g_string_append (str, "option wpad code 252 = string;\n");
+
+	g_string_append_c (str, '\n');
+}
+
+static void
+add_ip6_config (GString *str, NMSettingIP6Config *s_ip6, const char *hostname)
+{
+	add_hostname (str, HOSTNAME6_FORMAT "\n", hostname);
+	g_string_append (str,
+	                 "send fqdn.encoded on;\n"
+	                 "send fqdn.no-client-update on;\n"
+	                 "send fqdn.server-update on;\n");
+}
+
 char *
 nm_dhcp_dhclient_create_config (const char *interface,
+                                gboolean is_ip6,
                                 NMSettingIP4Config *s_ip4,
+                                NMSettingIP6Config *s_ip6,
                                 guint8 *anycast_addr,
                                 const char *hostname,
                                 const char *orig_path,
@@ -84,8 +160,12 @@ nm_dhcp_dhclient_create_config (const char *interface,
 				continue;
 
 			/* Override config file hostname and use one from the connection */
-			if (hostname && !strncmp (p, HOSTNAME_TAG, strlen (HOSTNAME_TAG)))
-				continue;
+			if (hostname) {
+				if (strncmp (p, HOSTNAME4_TAG, strlen (HOSTNAME4_TAG)) == 0)
+					continue;
+				if (strncmp (p, HOSTNAME6_TAG, strlen (HOSTNAME6_TAG)) == 0)
+					continue;
+			}
 
 			/* Check for "also require" */
 			if (!strncmp (p, ALSOREQ_TAG, strlen (ALSOREQ_TAG))) {
@@ -108,7 +188,7 @@ nm_dhcp_dhclient_create_config (const char *interface,
 						break;
 					}
 
-					if (!isalnum ((*aiter)[0]))
+					if (!g_ascii_isalnum ((*aiter)[0]))
 						continue;
 
 					if ((*aiter)[strlen (*aiter) - 1] == ';') {
@@ -136,71 +216,20 @@ nm_dhcp_dhclient_create_config (const char *interface,
 	} else
 		g_string_append_c (new_contents, '\n');
 
-	/* Add NM options from connection */
-	if (s_ip4) {
-		const char *tmp;
-		gboolean added = FALSE;
-
-		tmp = nm_setting_ip4_config_get_dhcp_client_id (s_ip4);
-		if (tmp) {
-			gboolean is_octets = TRUE;
-			const char *p = tmp;
-
-			while (*p) {
-				if (!isxdigit (*p) && (*p != ':')) {
-					is_octets = FALSE;
-					break;
-				}
-				p++;
-			}
-
-			/* If the client ID is just hex digits and : then don't use quotes,
-			 * because dhclient expects either a quoted ASCII string, or a byte
-			 * array formated as hex octets separated by :
-			 */
-			if (is_octets)
-				g_string_append_printf (new_contents, CLIENTID_FORMAT_OCTETS "\n", tmp);
-			else
-				g_string_append_printf (new_contents, CLIENTID_FORMAT "\n", tmp);
-			added = TRUE;
-		}
-
-		if (hostname) {
-			char *plain_hostname, *dot;
-
-			plain_hostname = g_strdup (hostname);
-			dot = strchr (plain_hostname, '.');
-
-			/* get rid of the domain */
-			if (dot)
-				*dot = '\0';
-
-			g_string_append_printf (new_contents, HOSTNAME_FORMAT "\n", plain_hostname);
-			added = TRUE;
-
-			g_free (plain_hostname);
-		}
-
-		if (added)
-			g_string_append_c (new_contents, '\n');
+	if (is_ip6) {
+		add_ip6_config (new_contents, s_ip6, hostname);
+		add_also_request (alsoreq, "dhcp6.name-servers");
+		add_also_request (alsoreq, "dhcp6.domain-search");
+		add_also_request (alsoreq, "dhcp6.client-id");
+		add_also_request (alsoreq, "dhcp6.server-id");
+	} else {
+		add_ip4_config (new_contents, s_ip4, hostname);
+		add_also_request (alsoreq, "rfc3442-classless-static-routes");
+		add_also_request (alsoreq, "ms-classless-static-routes");
+		add_also_request (alsoreq, "wpad");
+		add_also_request (alsoreq, "ntp-servers");
 	}
 
-	/* Define options for classless static routes */
-	g_string_append (new_contents,
-	                 "option rfc3442-classless-static-routes code 121 = array of unsigned integer 8;\n");
-	g_string_append (new_contents,
-	                 "option ms-classless-static-routes code 249 = array of unsigned integer 8;\n");
-	/* Web Proxy Auto-Discovery option (bgo #368423) */
-	g_string_append (new_contents, "option wpad code 252 = string;\n");
-
-	g_string_append_c (new_contents, '\n');
-
-	/* Everything we want to request from the DHCP server */
-	add_also_request (alsoreq, "rfc3442-classless-static-routes");
-	add_also_request (alsoreq, "ms-classless-static-routes");
-	add_also_request (alsoreq, "wpad");
-	add_also_request (alsoreq, "ntp-servers");
-
 	/* And add it to the dhclient configuration */
 	for (i = 0; i < alsoreq->len; i++) {
 		char *t = g_ptr_array_index (alsoreq, i);
diff --git a/src/dhcp-manager/nm-dhcp-dhclient-utils.h b/src/dhcp-manager/nm-dhcp-dhclient-utils.h
index 77def551..2f9f7c45 100644
--- a/src/dhcp-manager/nm-dhcp-dhclient-utils.h
+++ b/src/dhcp-manager/nm-dhcp-dhclient-utils.h
@@ -23,9 +23,12 @@
 #include 
 
 #include 
+#include 
 
 char *nm_dhcp_dhclient_create_config (const char *interface,
+                                      gboolean is_ip6,
                                       NMSettingIP4Config *s_ip4,
+                                      NMSettingIP6Config *s_ip6,
                                       guint8 *anycast_addr,
                                       const char *hostname,
                                       const char *orig_path,
diff --git a/src/dhcp-manager/nm-dhcp-dhclient.c b/src/dhcp-manager/nm-dhcp-dhclient.c
index 043cd63d..347d97c4 100644
--- a/src/dhcp-manager/nm-dhcp-dhclient.c
+++ b/src/dhcp-manager/nm-dhcp-dhclient.c
@@ -32,7 +32,6 @@
 #include 
 #include 
 #include 
-#include 
 
 #include 
 
@@ -46,16 +45,6 @@ G_DEFINE_TYPE (NMDHCPDhclient, nm_dhcp_dhclient, NM_TYPE_DHCP_CLIENT)
 
 #define NM_DHCP_DHCLIENT_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), NM_TYPE_DHCP_DHCLIENT, NMDHCPDhclientPrivate))
 
-#if defined(TARGET_DEBIAN) || defined(TARGET_SUSE) || defined(TARGET_MANDRIVA)
-#if defined(DHCLIENT_V3)
-#define NM_DHCLIENT_LEASE_DIR			LOCALSTATEDIR "/lib/dhcp3"
-#else
-#define NM_DHCLIENT_LEASE_DIR           LOCALSTATEDIR "/lib/dhcp"
-#endif
-#else
-#define NM_DHCLIENT_LEASE_DIR           LOCALSTATEDIR "/lib/dhclient"
-#endif
-
 #define ACTION_SCRIPT_PATH	LIBEXECDIR "/nm-dhcp-client.action"
 
 typedef struct {
@@ -90,10 +79,9 @@ nm_dhcp_dhclient_get_path (const char *try_first)
 }
 
 static char *
-get_leasefile_for_iface (const char * iface, const char *uuid, gboolean ipv6)
+get_dhclient_leasefile (const char * iface, const char *uuid, gboolean ipv6)
 {
-	return g_strdup_printf ("%s/dhclient%s-%s-%s.lease",
-	                        NM_DHCLIENT_LEASE_DIR,
+	return g_strdup_printf (NMSTATEDIR "/dhclient%s-%s-%s.lease",
 	                        ipv6 ? "6" : "",
 	                        uuid,
 	                        iface);
@@ -140,7 +128,7 @@ add_lease_option (GHashTable *hash, char *line)
 }
 
 GSList *
-nm_dhcp_dhclient_get_lease_config (const char *iface, const char *uuid)
+nm_dhcp_dhclient_get_lease_config (const char *iface, const char *uuid, gboolean ipv6)
 {
 	GSList *parsed = NULL, *iter, *leases = NULL;
 	char *contents = NULL;
@@ -148,7 +136,11 @@ nm_dhcp_dhclient_get_lease_config (const char *iface, const char *uuid)
 	char **line, **split = NULL;
 	GHashTable *hash = NULL;
 
-	leasefile = get_leasefile_for_iface (iface, uuid, FALSE);
+	/* IPv6 not supported */
+	if (ipv6)
+		return NULL;
+
+	leasefile = get_dhclient_leasefile (iface, uuid, FALSE);
 	if (!leasefile)
 		return NULL;
 
@@ -308,7 +300,9 @@ out:
 static gboolean
 merge_dhclient_config (const char *iface,
                        const char *conf_file,
+                       gboolean is_ip6,
                        NMSettingIP4Config *s_ip4,
+                       NMSettingIP6Config *s_ip6,
                        guint8 *anycast_addr,
                        const char *hostname,
                        const char *orig_path,
@@ -324,13 +318,13 @@ merge_dhclient_config (const char *iface,
 		GError *read_error = NULL;
 
 		if (!g_file_get_contents (orig_path, &orig, NULL, &read_error)) {
-			nm_log_warn (LOGD_DHCP, "(%s): error reading dhclient configuration %s: %s",
-			             iface, orig_path, read_error->message);
+			nm_log_warn (LOGD_DHCP, "(%s): error reading dhclient%s configuration %s: %s",
+			             iface, is_ip6 ? "6" : "", orig_path, read_error->message);
 			g_error_free (read_error);
 		}
 	}
 
-	new = nm_dhcp_dhclient_create_config (iface, s_ip4, anycast_addr, hostname, orig_path, orig);
+	new = nm_dhcp_dhclient_create_config (iface, is_ip6, s_ip4, s_ip6, anycast_addr, hostname, orig_path, orig);
 	g_assert (new);
 	success = g_file_set_contents (conf_file, new, -1, error);
 	g_free (new);
@@ -339,6 +333,64 @@ merge_dhclient_config (const char *iface,
 	return success;
 }
 
+static char *
+get_dhclient_config (const char * iface, const char *uuid, gboolean ipv6)
+{
+	char *path;
+
+	/* NetworkManager-overridden configuration can be used to ship DHCP config
+	 * with NetworkManager itself. It can be uuid-specific, device-specific
+	 * or generic.
+	 */
+	if (uuid) {
+		path = g_strdup_printf (NMCONFDIR "/dhclient%s-%s.conf", ipv6 ? "6" : "", uuid);
+		if (g_file_test (path, G_FILE_TEST_EXISTS))
+			return path;
+		g_free (path);
+	}
+
+	path = g_strdup_printf (NMCONFDIR "/dhclient%s-%s.conf", ipv6 ? "6" : "", iface);
+	if (g_file_test (path, G_FILE_TEST_EXISTS))
+		return path;
+	g_free (path);
+
+	path = g_strdup_printf (NMCONFDIR "/dhclient%s.conf", ipv6 ? "6" : "");
+	if (g_file_test (path, G_FILE_TEST_EXISTS))
+		return path;
+	g_free (path);
+
+	/* Distribution's dhclient configuration is used so that we can use
+	 * configuration shipped with dhclient (if any).
+	 *
+	 * This replaces conditional compilation based on distribution name. Fedora
+	 * and Debian store the configs in /etc/dhcp while upstream defaults to /etc
+	 * which is then used by many other distributions. Some distributions
+	 * (including Fedora) don't even provide a default configuration file.
+	 */
+	path = g_strdup_printf (SYSCONFDIR "/dhcp/dhclient%s-%s.conf", ipv6 ? "6" : "", iface);
+	if (g_file_test (path, G_FILE_TEST_EXISTS))
+		return path;
+	g_free (path);
+
+	path = g_strdup_printf (SYSCONFDIR "/dhclient%s-%s.conf", ipv6 ? "6" : "", iface);
+	if (g_file_test (path, G_FILE_TEST_EXISTS))
+		return path;
+	g_free (path);
+
+	path = g_strdup_printf (SYSCONFDIR "/dhcp/dhclient%s.conf", ipv6 ? "6" : "");
+	if (g_file_test (path, G_FILE_TEST_EXISTS))
+		return path;
+	g_free (path);
+
+	path = g_strdup_printf (SYSCONFDIR "/dhclient%s.conf", ipv6 ? "6" : "");
+	if (g_file_test (path, G_FILE_TEST_EXISTS))
+		return path;
+	g_free (path);
+
+	return NULL;
+}
+
+
 /* NM provides interface-specific options; thus the same dhclient config
  * file cannot be used since DHCP transactions can happen in parallel.
  * Since some distros don't have default per-interface dhclient config files,
@@ -347,59 +399,32 @@ merge_dhclient_config (const char *iface,
  */
 static char *
 create_dhclient_config (const char *iface,
+                        gboolean is_ip6,
                         NMSettingIP4Config *s_ip4,
+                        NMSettingIP6Config *s_ip6,
                         guint8 *dhcp_anycast_addr,
                         const char *hostname)
 {
-	char *orig = NULL, *tmp, *conf_file = NULL;
+	char *orig = NULL, *new = NULL;
 	GError *error = NULL;
 	gboolean success = FALSE;
 
 	g_return_val_if_fail (iface != NULL, NULL);
 
-#if defined(TARGET_SUSE)
-	orig = g_strdup (SYSCONFDIR "/dhclient.conf");
-#elif defined(TARGET_DEBIAN) || defined(TARGET_GENTOO)
-#if defined(DHCLIENT_V3)
-	orig = g_strdup (SYSCONFDIR "/dhcp3/dhclient.conf");
-#else
-	orig = g_strdup (SYSCONFDIR "/dhcp/dhclient.conf");
-#endif
-#else
-	orig = g_strdup_printf (SYSCONFDIR "/dhclient-%s.conf", iface);
-#endif
-
-	if (!orig) {
-		nm_log_warn (LOGD_DHCP, "(%s): not enough memory for dhclient options.", iface);
-		return NULL;
-	}
-
-#if !defined(TARGET_SUSE) && !defined(TARGET_DEBIAN) && !defined(TARGET_GENTOO)
-	/* Try /etc/dhcp/ too (rh #607759) */
-	if (!g_file_test (orig, G_FILE_TEST_EXISTS)) {
-		g_free (orig);
-		orig = g_strdup_printf (SYSCONFDIR "/dhcp/dhclient-%s.conf", iface);
-		if (!orig) {
-			nm_log_warn (LOGD_DHCP, "(%s): not enough memory for dhclient options.", iface);
-			return NULL;
-		}
-	}
-#endif
-
-	tmp = g_strdup_printf ("nm-dhclient-%s.conf", iface);
-	conf_file = g_build_filename ("/var", "run", tmp, NULL);
-	g_free (tmp);
+	new = g_strdup_printf (NMSTATEDIR "/dhclient%s-%s.conf", is_ip6 ? "6" : "", iface);
 
+	/* TODO: also support UUID */
+	orig = get_dhclient_config (iface, NULL, is_ip6);
 	error = NULL;
-	success = merge_dhclient_config (iface, conf_file, s_ip4, dhcp_anycast_addr, hostname, orig, &error);
+	success = merge_dhclient_config (iface, new, is_ip6, s_ip4, s_ip6, dhcp_anycast_addr, hostname, orig, &error);
 	if (!success) {
-		nm_log_warn (LOGD_DHCP, "(%s): error creating dhclient configuration: %s",
-		             iface, error->message);
+		nm_log_warn (LOGD_DHCP, "(%s): error creating dhclient%s configuration: %s",
+		             iface, is_ip6 ? "6" : "", error->message);
 		g_error_free (error);
 	}
 
 	g_free (orig);
-	return conf_file;
+	return new;
 }
 
 
@@ -439,13 +464,6 @@ dhclient_start (NMDHCPClient *client,
 
 	log_domain = ipv6 ? LOGD_DHCP6 : LOGD_DHCP4;
 
-#if defined(DHCLIENT_V3)
-	if (ipv6) {
-		nm_log_warn (log_domain, "(%s): ISC dhcp3 does not support IPv6", iface);
-		return -1;
-	}
-#endif
-
 	if (!g_file_test (priv->path, G_FILE_TEST_EXISTS)) {
 		nm_log_warn (log_domain, "%s does not exist.", priv->path);
 		return -1;
@@ -471,7 +489,7 @@ dhclient_start (NMDHCPClient *client,
 	}
 
 	g_free (priv->lease_file);
-	priv->lease_file = get_leasefile_for_iface (iface, uuid, ipv6);
+	priv->lease_file = get_dhclient_leasefile (iface, uuid, ipv6);
 	if (!priv->lease_file) {
 		nm_log_warn (log_domain, "(%s): not enough memory for dhclient options.", iface);
 		return -1;
@@ -485,16 +503,11 @@ dhclient_start (NMDHCPClient *client,
 	if (release)
 		g_ptr_array_add (argv, (gpointer) "-r");
 
-#if !defined(DHCLIENT_V3)
 	if (ipv6) {
 		g_ptr_array_add (argv, (gpointer) "-6");
 		if (mode_opt)
 			g_ptr_array_add (argv, (gpointer) mode_opt);
-	} else {
-		g_ptr_array_add (argv, (gpointer) "-4");
 	}
-#endif
-
 	g_ptr_array_add (argv, (gpointer) "-sf");	/* Set script file */
 	g_ptr_array_add (argv, (gpointer) ACTION_SCRIPT_PATH );
 
@@ -546,17 +559,17 @@ dhclient_start (NMDHCPClient *client,
 }
 
 static GPid
-real_ip4_start (NMDHCPClient *client,
-                NMSettingIP4Config *s_ip4,
-                guint8 *dhcp_anycast_addr,
-                const char *hostname)
+ip4_start (NMDHCPClient *client,
+           NMSettingIP4Config *s_ip4,
+           guint8 *dhcp_anycast_addr,
+           const char *hostname)
 {
 	NMDHCPDhclientPrivate *priv = NM_DHCP_DHCLIENT_GET_PRIVATE (client);
 	const char *iface;
 
 	iface = nm_dhcp_client_get_iface (client);
 
-	priv->conf_file = create_dhclient_config (iface, s_ip4, dhcp_anycast_addr, hostname);
+	priv->conf_file = create_dhclient_config (iface, FALSE, s_ip4, NULL, dhcp_anycast_addr, hostname);
 	if (!priv->conf_file) {
 		nm_log_warn (LOGD_DHCP4, "(%s): error creating dhclient configuration file.", iface);
 		return -1;
@@ -566,17 +579,28 @@ real_ip4_start (NMDHCPClient *client,
 }
 
 static GPid
-real_ip6_start (NMDHCPClient *client,
-                NMSettingIP6Config *s_ip6,
-                guint8 *dhcp_anycast_addr,
-                const char *hostname,
-                gboolean info_only)
+ip6_start (NMDHCPClient *client,
+           NMSettingIP6Config *s_ip6,
+           guint8 *dhcp_anycast_addr,
+           const char *hostname,
+           gboolean info_only)
 {
+	NMDHCPDhclientPrivate *priv = NM_DHCP_DHCLIENT_GET_PRIVATE (client);
+	const char *iface;
+
+	iface = nm_dhcp_client_get_iface (client);
+
+	priv->conf_file = create_dhclient_config (iface, TRUE, NULL, s_ip6, dhcp_anycast_addr, hostname);
+	if (!priv->conf_file) {
+		nm_log_warn (LOGD_DHCP6, "(%s): error creating dhclient6 configuration file.", iface);
+		return -1;
+	}
+
 	return dhclient_start (client, info_only ? "-S" : "-N", FALSE);
 }
 
 static void
-real_stop (NMDHCPClient *client, gboolean release)
+stop (NMDHCPClient *client, gboolean release)
 {
 	NMDHCPDhclientPrivate *priv = NM_DHCP_DHCLIENT_GET_PRIVATE (client);
 
@@ -635,8 +659,8 @@ nm_dhcp_dhclient_class_init (NMDHCPDhclientClass *dhclient_class)
 	/* virtual methods */
 	object_class->dispose = dispose;
 
-	client_class->ip4_start = real_ip4_start;
-	client_class->ip6_start = real_ip6_start;
-	client_class->stop = real_stop;
+	client_class->ip4_start = ip4_start;
+	client_class->ip6_start = ip6_start;
+	client_class->stop = stop;
 }
 
diff --git a/src/dhcp-manager/nm-dhcp-dhclient.h b/src/dhcp-manager/nm-dhcp-dhclient.h
index f3da6014..89039189 100644
--- a/src/dhcp-manager/nm-dhcp-dhclient.h
+++ b/src/dhcp-manager/nm-dhcp-dhclient.h
@@ -41,7 +41,7 @@ typedef struct {
 
 GType nm_dhcp_dhclient_get_type (void);
 
-GSList *nm_dhcp_dhclient_get_lease_config (const char *iface, const char *uuid);
+GSList *nm_dhcp_dhclient_get_lease_config (const char *iface, const char *uuid, gboolean ipv6);
 
 const char *nm_dhcp_dhclient_get_path (const char *try_first);
 
diff --git a/src/dhcp-manager/nm-dhcp-dhcpcd.c b/src/dhcp-manager/nm-dhcp-dhcpcd.c
index dc9bee13..dda96e2a 100644
--- a/src/dhcp-manager/nm-dhcp-dhcpcd.c
+++ b/src/dhcp-manager/nm-dhcp-dhcpcd.c
@@ -73,7 +73,7 @@ nm_dhcp_dhcpcd_get_path (const char *try_first)
 }
 
 GSList *
-nm_dhcp_dhcpcd_get_lease_config (const char *iface, const char *uuid)
+nm_dhcp_dhcpcd_get_lease_config (const char *iface, const char *uuid, gboolean ipv6)
 {
 	return NULL;
 }
@@ -93,10 +93,10 @@ dhcpcd_child_setup (gpointer user_data G_GNUC_UNUSED)
 }
 
 static GPid
-real_ip4_start (NMDHCPClient *client,
-                NMSettingIP4Config *s_ip4,
-                guint8 *dhcp_anycast_addr,
-                const char *hostname)
+ip4_start (NMDHCPClient *client,
+           NMSettingIP4Config *s_ip4,
+           guint8 *dhcp_anycast_addr,
+           const char *hostname)
 {
 	NMDHCPDhcpcdPrivate *priv = NM_DHCP_DHCPCD_GET_PRIVATE (client);
 	GPtrArray *argv = NULL;
@@ -110,7 +110,7 @@ real_ip4_start (NMDHCPClient *client,
 	iface = nm_dhcp_client_get_iface (client);
 	uuid = nm_dhcp_client_get_uuid (client);
 
-	priv->pid_file = g_strdup_printf (LOCALSTATEDIR "/run/dhcpcd-%s.pid", iface);
+	priv->pid_file = g_strdup_printf (NMSTATEDIR "/dhcpcd-%s.pid", iface);
 	if (!priv->pid_file) {
 		nm_log_warn (LOGD_DHCP4, "(%s): not enough memory for dhcpcd options.", iface);
 		return -1;
@@ -166,18 +166,18 @@ real_ip4_start (NMDHCPClient *client,
 }
 
 static GPid
-real_ip6_start (NMDHCPClient *client,
-                NMSettingIP6Config *s_ip6,
-                guint8 *dhcp_anycast_addr,
-                const char *hostname,
-                gboolean info_only)
+ip6_start (NMDHCPClient *client,
+           NMSettingIP6Config *s_ip6,
+           guint8 *dhcp_anycast_addr,
+           const char *hostname,
+           gboolean info_only)
 {
 	nm_log_warn (LOGD_DHCP6, "the dhcpcd backend does not support IPv6.");
 	return -1;
 }
 
 static void
-real_stop (NMDHCPClient *client, gboolean release)
+stop (NMDHCPClient *client, gboolean release)
 {
 	NMDHCPDhcpcdPrivate *priv = NM_DHCP_DHCPCD_GET_PRIVATE (client);
 
@@ -221,8 +221,8 @@ nm_dhcp_dhcpcd_class_init (NMDHCPDhcpcdClass *dhcpcd_class)
 	/* virtual methods */
 	object_class->dispose = dispose;
 
-	client_class->ip4_start = real_ip4_start;
-	client_class->ip6_start = real_ip6_start;
-	client_class->stop = real_stop;
+	client_class->ip4_start = ip4_start;
+	client_class->ip6_start = ip6_start;
+	client_class->stop = stop;
 }
 
diff --git a/src/dhcp-manager/nm-dhcp-dhcpcd.h b/src/dhcp-manager/nm-dhcp-dhcpcd.h
index 4ddc1089..c90dcb74 100644
--- a/src/dhcp-manager/nm-dhcp-dhcpcd.h
+++ b/src/dhcp-manager/nm-dhcp-dhcpcd.h
@@ -41,7 +41,7 @@ typedef struct {
 
 GType nm_dhcp_dhcpcd_get_type (void);
 
-GSList *nm_dhcp_dhcpcd_get_lease_config (const char *iface, const char *uuid);
+GSList *nm_dhcp_dhcpcd_get_lease_config (const char *iface, const char *uuid, gboolean ipv6);
 
 const char *nm_dhcp_dhcpcd_get_path (const char *try_first);
 
diff --git a/src/dhcp-manager/nm-dhcp-manager.c b/src/dhcp-manager/nm-dhcp-manager.c
index 1af1b163..995bff47 100644
--- a/src/dhcp-manager/nm-dhcp-manager.c
+++ b/src/dhcp-manager/nm-dhcp-manager.c
@@ -62,7 +62,7 @@ nm_dhcp_manager_error_quark (void)
 
 static NMDHCPManager *singleton = NULL;
 
-typedef GSList * (*GetLeaseConfigFunc) (const char *iface, const char *uuid);
+typedef GSList * (*GetLeaseConfigFunc) (const char *iface, const char *uuid, gboolean ipv6);
 
 typedef struct {
 	GType               client_type;
@@ -450,6 +450,7 @@ nm_dhcp_manager_start_ip4 (NMDHCPManager *self,
 	NMDHCPManagerPrivate *priv;
 	NMDHCPClient *client = NULL;
 	const char *hostname = NULL;
+	gboolean send_hostname = TRUE;
 
 	g_return_val_if_fail (self, NULL);
 	g_return_val_if_fail (NM_IS_DHCP_MANAGER (self), NULL);
@@ -464,22 +465,23 @@ nm_dhcp_manager_start_ip4 (NMDHCPManager *self,
 			g_return_val_if_fail (strcmp (method, NM_SETTING_IP4_CONFIG_METHOD_AUTO) == 0, NULL);
 		}
 
-		/* If we're asked to send the hostname to DHCP server, and the hostname
-		 * isn't specified, and a hostname provider is registered: use that
-		 */
-		if (nm_setting_ip4_config_get_dhcp_send_hostname (s_ip4)) {
+		send_hostname = nm_setting_ip4_config_get_dhcp_send_hostname (s_ip4);
+		if (send_hostname)
 			hostname = nm_setting_ip4_config_get_dhcp_hostname (s_ip4);
+	}
 
-			/* If we're supposed to send the hostname to the DHCP server but
-			 * the user didn't specify one, use the persistent hostname.
-			 */
-			if (!hostname && priv->hostname_provider) {
-				hostname = nm_hostname_provider_get_hostname (priv->hostname_provider);
-				if (   hostname
-				    && (!strcmp (hostname, "localhost.localdomain") ||
-				        !strcmp (hostname, "localhost6.localdomain6")))
-					hostname = NULL;
-			}
+	if (send_hostname) {
+		/* If we're supposed to send the hostname to the DHCP server but
+		 * the user didn't specify one, then use the hostname from the
+		 * hostname provider if there is one, otherwise use the persistent
+		 * hostname.
+		 */
+		if (!hostname && priv->hostname_provider) {
+			hostname = nm_hostname_provider_get_hostname (priv->hostname_provider);
+			if (   hostname
+			    && (!strcmp (hostname, "localhost.localdomain") ||
+			        !strcmp (hostname, "localhost6.localdomain6")))
+				hostname = NULL;
 		}
 	}
 
@@ -498,7 +500,23 @@ nm_dhcp_manager_start_ip6 (NMDHCPManager *self,
                            guint8 *dhcp_anycast_addr,
                            gboolean info_only)
 {
-	return client_start (self, iface, uuid, TRUE, NULL, s_ip6, timeout, dhcp_anycast_addr, NULL, info_only);
+	NMDHCPManagerPrivate *priv;
+	const char *hostname = NULL;
+
+	g_return_val_if_fail (self, NULL);
+	g_return_val_if_fail (NM_IS_DHCP_MANAGER (self), NULL);
+
+	priv = NM_DHCP_MANAGER_GET_PRIVATE (self);
+
+	hostname = nm_setting_ip6_config_get_dhcp_hostname (s_ip6);
+	if (!hostname && priv->hostname_provider) {
+		hostname = nm_hostname_provider_get_hostname (priv->hostname_provider);
+		if (   g_strcmp0 (hostname, "localhost.localdomain") == 0
+		    || g_strcmp0 (hostname, "localhost6.localdomain6") == 0)
+			hostname = NULL;
+	}
+
+	return client_start (self, iface, uuid, TRUE, NULL, s_ip6, timeout, dhcp_anycast_addr, hostname, info_only);
 }
 
 static void
@@ -531,14 +549,15 @@ nm_dhcp_manager_set_hostname_provider (NMDHCPManager *manager,
 GSList *
 nm_dhcp_manager_get_lease_config (NMDHCPManager *self,
                                   const char *iface,
-                                  const char *uuid)
+                                  const char *uuid,
+                                  gboolean ipv6)
 {
 	g_return_val_if_fail (self != NULL, NULL);
 	g_return_val_if_fail (NM_IS_DHCP_MANAGER (self), NULL);
 	g_return_val_if_fail (iface != NULL, NULL);
 	g_return_val_if_fail (uuid != NULL, NULL);
 
-	return NM_DHCP_MANAGER_GET_PRIVATE (self)->get_lease_config_func (iface, uuid);
+	return NM_DHCP_MANAGER_GET_PRIVATE (self)->get_lease_config_func (iface, uuid, ipv6);
 }
 
 NMIP4Config *
diff --git a/src/dhcp-manager/nm-dhcp-manager.h b/src/dhcp-manager/nm-dhcp-manager.h
index fe329046..68db7e37 100644
--- a/src/dhcp-manager/nm-dhcp-manager.h
+++ b/src/dhcp-manager/nm-dhcp-manager.h
@@ -82,7 +82,8 @@ NMDHCPClient * nm_dhcp_manager_start_ip6     (NMDHCPManager *manager,
 
 GSList *       nm_dhcp_manager_get_lease_config (NMDHCPManager *self,
                                                  const char *iface,
-                                                 const char *uuid);
+                                                 const char *uuid,
+                                                 gboolean ipv6);
 
 /* For testing only */
 NMIP4Config *nm_dhcp_manager_test_ip4_options_to_config (const char *dhcp_client,
diff --git a/src/dhcp-manager/tests/Makefile.am b/src/dhcp-manager/tests/Makefile.am
index 1feade86..251aa224 100644
--- a/src/dhcp-manager/tests/Makefile.am
+++ b/src/dhcp-manager/tests/Makefile.am
@@ -1,3 +1,5 @@
+if ENABLE_TESTS
+
 INCLUDES = \
 	-I$(top_srcdir)/include \
 	-I$(top_builddir)/include \
@@ -21,10 +23,7 @@ test_dhcp_dhclient_LDADD = \
 	$(top_builddir)/libnm-util/libnm-util.la \
 	$(GLIB_LIBS)
 
-if WITH_TESTS
-
 check-local: test-dhcp-dhclient
 	$(abs_builddir)/test-dhcp-dhclient
 
 endif
-
diff --git a/src/dhcp-manager/tests/Makefile.in b/src/dhcp-manager/tests/Makefile.in
index 5d03e22a..32cdf4db 100644
--- a/src/dhcp-manager/tests/Makefile.in
+++ b/src/dhcp-manager/tests/Makefile.in
@@ -51,21 +51,23 @@ PRE_UNINSTALL = :
 POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
-noinst_PROGRAMS = test-dhcp-dhclient$(EXEEXT)
+@ENABLE_TESTS_TRUE@noinst_PROGRAMS = test-dhcp-dhclient$(EXEEXT)
 subdir = src/dhcp-manager/tests
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/compiler_warnings.m4 \
-	$(top_srcdir)/m4/gettext.m4 $(top_srcdir)/m4/gtk-doc.m4 \
-	$(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/intlmacosx.m4 \
-	$(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/introspection.m4 \
-	$(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \
-	$(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/libnl-check.m4 \
-	$(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \
-	$(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
-	$(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/nls.m4 \
-	$(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/progtest.m4 \
-	$(top_srcdir)/m4/vapigen.m4 $(top_srcdir)/configure.ac
+	$(top_srcdir)/m4/gettext.m4 \
+	$(top_srcdir)/m4/gnome-code-coverage.m4 \
+	$(top_srcdir)/m4/gtk-doc.m4 $(top_srcdir)/m4/iconv.m4 \
+	$(top_srcdir)/m4/intlmacosx.m4 $(top_srcdir)/m4/intltool.m4 \
+	$(top_srcdir)/m4/introspection.m4 $(top_srcdir)/m4/lib-ld.m4 \
+	$(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \
+	$(top_srcdir)/m4/libnl-check.m4 $(top_srcdir)/m4/libtool.m4 \
+	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
+	$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
+	$(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/po.m4 \
+	$(top_srcdir)/m4/progtest.m4 $(top_srcdir)/m4/vapigen.m4 \
+	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(install_sh) -d
@@ -73,13 +75,13 @@ CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
 CONFIG_CLEAN_VPATH_FILES =
 PROGRAMS = $(noinst_PROGRAMS)
-am_test_dhcp_dhclient_OBJECTS =  \
-	test_dhcp_dhclient-test-dhcp-dhclient.$(OBJEXT)
+am__test_dhcp_dhclient_SOURCES_DIST = test-dhcp-dhclient.c
+@ENABLE_TESTS_TRUE@am_test_dhcp_dhclient_OBJECTS = test_dhcp_dhclient-test-dhcp-dhclient.$(OBJEXT)
 test_dhcp_dhclient_OBJECTS = $(am_test_dhcp_dhclient_OBJECTS)
 am__DEPENDENCIES_1 =
-test_dhcp_dhclient_DEPENDENCIES =  \
-	$(top_builddir)/src/dhcp-manager/libdhcp-dhclient.la \
-	$(top_builddir)/libnm-util/libnm-util.la $(am__DEPENDENCIES_1)
+@ENABLE_TESTS_TRUE@test_dhcp_dhclient_DEPENDENCIES = $(top_builddir)/src/dhcp-manager/libdhcp-dhclient.la \
+@ENABLE_TESTS_TRUE@	$(top_builddir)/libnm-util/libnm-util.la \
+@ENABLE_TESTS_TRUE@	$(am__DEPENDENCIES_1)
 AM_V_lt = $(am__v_lt_@AM_V@)
 am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
 am__v_lt_0 = --silent
@@ -110,7 +112,7 @@ AM_V_GEN = $(am__v_GEN_@AM_V@)
 am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
 am__v_GEN_0 = @echo "  GEN   " $@;
 SOURCES = $(test_dhcp_dhclient_SOURCES)
-DIST_SOURCES = $(test_dhcp_dhclient_SOURCES)
+DIST_SOURCES = $(am__test_dhcp_dhclient_SOURCES_DIST)
 am__can_run_installinfo = \
   case $$AM_UPDATE_INFO_DIR in \
     n|no|NO) false;; \
@@ -131,6 +133,10 @@ AWK = @AWK@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
+CKDB_PATH = @CKDB_PATH@
+CODE_COVERAGE_CFLAGS = @CODE_COVERAGE_CFLAGS@
+CODE_COVERAGE_ENABLED = @CODE_COVERAGE_ENABLED@
+CODE_COVERAGE_LDFLAGS = @CODE_COVERAGE_LDFLAGS@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CXX = @CXX@
@@ -145,9 +151,7 @@ DBUS_SYS_DIR = @DBUS_SYS_DIR@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
 DHCLIENT_PATH = @DHCLIENT_PATH@
-DHCLIENT_VERSION = @DHCLIENT_VERSION@
 DHCPCD_PATH = @DHCPCD_PATH@
-DISABLE_DEPRECATED = @DISABLE_DEPRECATED@
 DLLTOOL = @DLLTOOL@
 DSYMUTIL = @DSYMUTIL@
 DUMPBIN = @DUMPBIN@
@@ -157,17 +161,14 @@ ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
 FGREP = @FGREP@
+GENHTML = @GENHTML@
 GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
 GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
-GIO_CFLAGS = @GIO_CFLAGS@
-GIO_LIBS = @GIO_LIBS@
 GLIB_CFLAGS = @GLIB_CFLAGS@
 GLIB_GENMARSHAL = @GLIB_GENMARSHAL@
 GLIB_LIBS = @GLIB_LIBS@
 GLIB_MAKEFILE = @GLIB_MAKEFILE@
 GLIB_MKENUMS = @GLIB_MKENUMS@
-GMODULE_CFLAGS = @GMODULE_CFLAGS@
-GMODULE_LIBS = @GMODULE_LIBS@
 GMSGFMT = @GMSGFMT@
 GMSGFMT_015 = @GMSGFMT_015@
 GNUTLS_CFLAGS = @GNUTLS_CFLAGS@
@@ -208,6 +209,7 @@ IPTABLES_PATH = @IPTABLES_PATH@
 IWMX_SDK_CFLAGS = @IWMX_SDK_CFLAGS@
 IWMX_SDK_LIBS = @IWMX_SDK_LIBS@
 KERNEL_FIRMWARE_DIR = @KERNEL_FIRMWARE_DIR@
+LCOV = @LCOV@
 LD = @LD@
 LDFLAGS = @LDFLAGS@
 LIBDL = @LIBDL@
@@ -224,11 +226,7 @@ LIBNL2_LIBS = @LIBNL2_LIBS@
 LIBNL3_CFLAGS = @LIBNL3_CFLAGS@
 LIBNL3_LIBS = @LIBNL3_LIBS@
 LIBNL_CFLAGS = @LIBNL_CFLAGS@
-LIBNL_GENL3_CFLAGS = @LIBNL_GENL3_CFLAGS@
-LIBNL_GENL3_LIBS = @LIBNL_GENL3_LIBS@
 LIBNL_LIBS = @LIBNL_LIBS@
-LIBNL_ROUTE3_CFLAGS = @LIBNL_ROUTE3_CFLAGS@
-LIBNL_ROUTE3_LIBS = @LIBNL_ROUTE3_LIBS@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
 LIBSOUP_CFLAGS = @LIBSOUP_CFLAGS@
@@ -243,6 +241,8 @@ MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MANIFEST_TOOL = @MANIFEST_TOOL@
 MKDIR_P = @MKDIR_P@
+MM_GLIB_CFLAGS = @MM_GLIB_CFLAGS@
+MM_GLIB_LIBS = @MM_GLIB_LIBS@
 MOC = @MOC@
 MSGFMT = @MSGFMT@
 MSGFMT_015 = @MSGFMT_015@
@@ -252,6 +252,7 @@ NMEDIT = @NMEDIT@
 NM_MAJOR_VERSION = @NM_MAJOR_VERSION@
 NM_MICRO_VERSION = @NM_MICRO_VERSION@
 NM_MINOR_VERSION = @NM_MINOR_VERSION@
+NM_MODIFY_SYSTEM_POLICY = @NM_MODIFY_SYSTEM_POLICY@
 NM_VERSION = @NM_VERSION@
 NSS_CFLAGS = @NSS_CFLAGS@
 NSS_LIBS = @NSS_LIBS@
@@ -278,13 +279,14 @@ PPPD_PLUGIN_DIR = @PPPD_PLUGIN_DIR@
 QT_CFLAGS = @QT_CFLAGS@
 QT_LIBS = @QT_LIBS@
 RANLIB = @RANLIB@
-RESOLVCONF_PATH = @RESOLVCONF_PATH@
 SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
-SYSTEMD_CFLAGS = @SYSTEMD_CFLAGS@
-SYSTEMD_LIBS = @SYSTEMD_LIBS@
+SYSTEMD_INHIBIT_CFLAGS = @SYSTEMD_INHIBIT_CFLAGS@
+SYSTEMD_INHIBIT_LIBS = @SYSTEMD_INHIBIT_LIBS@
+SYSTEMD_LOGIN_CFLAGS = @SYSTEMD_LOGIN_CFLAGS@
+SYSTEMD_LOGIN_LIBS = @SYSTEMD_LOGIN_LIBS@
 SYSTEM_CA_PATH = @SYSTEM_CA_PATH@
 UDEV_BASE_DIR = @UDEV_BASE_DIR@
 USE_NLS = @USE_NLS@
@@ -339,6 +341,11 @@ localedir = @localedir@
 localstatedir = @localstatedir@
 mandir = @mandir@
 mkdir_p = @mkdir_p@
+nmbinary = @nmbinary@
+nmconfdir = @nmconfdir@
+nmdatadir = @nmdatadir@
+nmrundir = @nmrundir@
+nmstatedir = @nmstatedir@
 oldincludedir = @oldincludedir@
 pdfdir = @pdfdir@
 prefix = @prefix@
@@ -353,26 +360,30 @@ target_alias = @target_alias@
 top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
-INCLUDES = \
-	-I$(top_srcdir)/include \
-	-I$(top_builddir)/include \
-	-I${top_srcdir}/libnm-util \
-	-I${top_builddir}/libnm-util \
-	-I$(top_srcdir)/src/dhcp-manager
+with_dhclient = @with_dhclient@
+with_dhcpcd = @with_dhcpcd@
+with_netconfig = @with_netconfig@
+with_resolvconf = @with_resolvconf@
+@ENABLE_TESTS_TRUE@INCLUDES = \
+@ENABLE_TESTS_TRUE@	-I$(top_srcdir)/include \
+@ENABLE_TESTS_TRUE@	-I$(top_builddir)/include \
+@ENABLE_TESTS_TRUE@	-I${top_srcdir}/libnm-util \
+@ENABLE_TESTS_TRUE@	-I${top_builddir}/libnm-util \
+@ENABLE_TESTS_TRUE@	-I$(top_srcdir)/src/dhcp-manager
 
 
 ####### policy /etc/hosts test #######
-test_dhcp_dhclient_SOURCES = \
-	test-dhcp-dhclient.c
+@ENABLE_TESTS_TRUE@test_dhcp_dhclient_SOURCES = \
+@ENABLE_TESTS_TRUE@	test-dhcp-dhclient.c
 
-test_dhcp_dhclient_CPPFLAGS = \
-	$(GLIB_CFLAGS)
+@ENABLE_TESTS_TRUE@test_dhcp_dhclient_CPPFLAGS = \
+@ENABLE_TESTS_TRUE@	$(GLIB_CFLAGS)
 
-test_dhcp_dhclient_LDADD = \
-	-ldl \
-	$(top_builddir)/src/dhcp-manager/libdhcp-dhclient.la \
-	$(top_builddir)/libnm-util/libnm-util.la \
-	$(GLIB_LIBS)
+@ENABLE_TESTS_TRUE@test_dhcp_dhclient_LDADD = \
+@ENABLE_TESTS_TRUE@	-ldl \
+@ENABLE_TESTS_TRUE@	$(top_builddir)/src/dhcp-manager/libdhcp-dhclient.la \
+@ENABLE_TESTS_TRUE@	$(top_builddir)/libnm-util/libnm-util.la \
+@ENABLE_TESTS_TRUE@	$(GLIB_LIBS)
 
 all: all-am
 
@@ -430,25 +441,22 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_dhcp_dhclient-test-dhcp-dhclient.Po@am__quote@
 
 .c.o:
-@am__fastdepCC_TRUE@	$(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\
-@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
-@am__fastdepCC_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.Po
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $<
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c $<
 
 .c.obj:
-@am__fastdepCC_TRUE@	$(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.obj$$||'`;\
-@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ `$(CYGPATH_W) '$<'` &&\
-@am__fastdepCC_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.Po
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c `$(CYGPATH_W) '$<'`
 
 .c.lo:
-@am__fastdepCC_TRUE@	$(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.lo$$||'`;\
-@am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
-@am__fastdepCC_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.Plo
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $<
@@ -555,7 +563,7 @@ distdir: $(DISTFILES)
 	    || exit 1; \
 	  fi; \
 	done
-@WITH_TESTS_FALSE@check-local:
+@ENABLE_TESTS_FALSE@check-local:
 check-am: all-am
 	$(MAKE) $(AM_MAKEFLAGS) check-local
 check: check-am
@@ -679,8 +687,8 @@ uninstall-am:
 	tags uninstall uninstall-am
 
 
-@WITH_TESTS_TRUE@check-local: test-dhcp-dhclient
-@WITH_TESTS_TRUE@	$(abs_builddir)/test-dhcp-dhclient
+@ENABLE_TESTS_TRUE@check-local: test-dhcp-dhclient
+@ENABLE_TESTS_TRUE@	$(abs_builddir)/test-dhcp-dhclient
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
diff --git a/src/dhcp-manager/tests/test-dhcp-dhclient.c b/src/dhcp-manager/tests/test-dhcp-dhclient.c
index c1cd6f80..a87c29aa 100644
--- a/src/dhcp-manager/tests/test-dhcp-dhclient.c
+++ b/src/dhcp-manager/tests/test-dhcp-dhclient.c
@@ -41,7 +41,9 @@ test_config (const char *orig,
 	g_object_set (s_ip4, NM_SETTING_IP4_CONFIG_DHCP_CLIENT_ID, dhcp_client_id, NULL);
 
 	new = nm_dhcp_dhclient_create_config (iface,
+	                                      FALSE,
 	                                      s_ip4,
+	                                      NULL,
 	                                      anycast_addr,
 	                                      hostname,
 	                                      "/path/to/dhclient.conf",
@@ -49,12 +51,15 @@ test_config (const char *orig,
 	g_assert (new != NULL);
 
 #if DEBUG
-	g_message ("\n- NEW ---------------------------------\n"
-	           "%s"
-	           "+ EXPECTED ++++++++++++++++++++++++++++++\n"
-	           "%s"
-	           "^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^\n",
-	           new, expected);
+	if (   strlen (new) != strlen (expected)
+	    || strcmp (new, expected)) {
+		g_message ("\n- NEW ---------------------------------\n"
+		           "%s"
+		           "+ EXPECTED ++++++++++++++++++++++++++++++\n"
+		           "%s"
+		           "^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^\n",
+		           new, expected);
+	}
 #endif
 	g_assert (strlen (new) == strlen (expected));
 	g_assert (strcmp (new, expected) == 0);
@@ -65,7 +70,7 @@ test_config (const char *orig,
 
 static const char *orig_missing_expected = \
 	"# Created by NetworkManager\n"
-	"\n"
+	"\n\n"
 	"option rfc3442-classless-static-routes code 121 = array of unsigned integer 8;\n"
 	"option ms-classless-static-routes code 249 = array of unsigned integer 8;\n"
 	"option wpad code 252 = string;\n"
@@ -158,7 +163,7 @@ static const char *existing_alsoreq_orig = \
 static const char *existing_alsoreq_expected = \
 	"# Created by NetworkManager\n"
 	"# Merged from /path/to/dhclient.conf\n"
-	"\n"
+	"\n\n"
 	"option rfc3442-classless-static-routes code 121 = array of unsigned integer 8;\n"
 	"option ms-classless-static-routes code 249 = array of unsigned integer 8;\n"
 	"option wpad code 252 = string;\n"
@@ -191,7 +196,7 @@ static const char *existing_multiline_alsoreq_orig = \
 static const char *existing_multiline_alsoreq_expected = \
 	"# Created by NetworkManager\n"
 	"# Merged from /path/to/dhclient.conf\n"
-	"\n"
+	"\n\n"
 	"option rfc3442-classless-static-routes code 121 = array of unsigned integer 8;\n"
 	"option ms-classless-static-routes code 249 = array of unsigned integer 8;\n"
 	"option wpad code 252 = string;\n"
diff --git a/src/dns-manager/Makefile.am b/src/dns-manager/Makefile.am
index c6c28446..e6c2ff22 100644
--- a/src/dns-manager/Makefile.am
+++ b/src/dns-manager/Makefile.am
@@ -16,8 +16,6 @@ libdns_manager_la_SOURCES = \
 	nm-dns-plugin.c \
 	nm-dns-dnsmasq.h \
 	nm-dns-dnsmasq.c \
-	nm-dns-bind.h \
-	nm-dns-bind.c \
 	nm-dns-utils.h \
 	nm-dns-utils.c
 
@@ -26,7 +24,9 @@ libdns_manager_la_CPPFLAGS = \
 	$(DBUS_CFLAGS) \
 	$(GLIB_CFLAGS) \
 	-DLOCALSTATEDIR=\"$(localstatedir)\" \
-	-DSYSCONFDIR=\"$(sysconfdir)\"
+	-DSYSCONFDIR=\"$(sysconfdir)\" \
+	-DNMCONFDIR=\"$(nmconfdir)\" \
+	-DNMRUNDIR=\"$(nmrundir)\"
 
 libdns_manager_la_LIBADD = \
 	$(top_builddir)/src/logging/libnm-logging.la \
diff --git a/src/dns-manager/Makefile.in b/src/dns-manager/Makefile.in
index b8d5c12b..b0ea7e77 100644
--- a/src/dns-manager/Makefile.in
+++ b/src/dns-manager/Makefile.in
@@ -55,16 +55,18 @@ subdir = src/dns-manager
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/compiler_warnings.m4 \
-	$(top_srcdir)/m4/gettext.m4 $(top_srcdir)/m4/gtk-doc.m4 \
-	$(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/intlmacosx.m4 \
-	$(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/introspection.m4 \
-	$(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \
-	$(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/libnl-check.m4 \
-	$(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \
-	$(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
-	$(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/nls.m4 \
-	$(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/progtest.m4 \
-	$(top_srcdir)/m4/vapigen.m4 $(top_srcdir)/configure.ac
+	$(top_srcdir)/m4/gettext.m4 \
+	$(top_srcdir)/m4/gnome-code-coverage.m4 \
+	$(top_srcdir)/m4/gtk-doc.m4 $(top_srcdir)/m4/iconv.m4 \
+	$(top_srcdir)/m4/intlmacosx.m4 $(top_srcdir)/m4/intltool.m4 \
+	$(top_srcdir)/m4/introspection.m4 $(top_srcdir)/m4/lib-ld.m4 \
+	$(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \
+	$(top_srcdir)/m4/libnl-check.m4 $(top_srcdir)/m4/libtool.m4 \
+	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
+	$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
+	$(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/po.m4 \
+	$(top_srcdir)/m4/progtest.m4 $(top_srcdir)/m4/vapigen.m4 \
+	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(install_sh) -d
@@ -81,7 +83,6 @@ libdns_manager_la_DEPENDENCIES =  \
 am_libdns_manager_la_OBJECTS = libdns_manager_la-nm-dns-manager.lo \
 	libdns_manager_la-nm-dns-plugin.lo \
 	libdns_manager_la-nm-dns-dnsmasq.lo \
-	libdns_manager_la-nm-dns-bind.lo \
 	libdns_manager_la-nm-dns-utils.lo
 libdns_manager_la_OBJECTS = $(am_libdns_manager_la_OBJECTS)
 AM_V_lt = $(am__v_lt_@AM_V@)
@@ -135,6 +136,10 @@ AWK = @AWK@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
+CKDB_PATH = @CKDB_PATH@
+CODE_COVERAGE_CFLAGS = @CODE_COVERAGE_CFLAGS@
+CODE_COVERAGE_ENABLED = @CODE_COVERAGE_ENABLED@
+CODE_COVERAGE_LDFLAGS = @CODE_COVERAGE_LDFLAGS@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CXX = @CXX@
@@ -149,9 +154,7 @@ DBUS_SYS_DIR = @DBUS_SYS_DIR@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
 DHCLIENT_PATH = @DHCLIENT_PATH@
-DHCLIENT_VERSION = @DHCLIENT_VERSION@
 DHCPCD_PATH = @DHCPCD_PATH@
-DISABLE_DEPRECATED = @DISABLE_DEPRECATED@
 DLLTOOL = @DLLTOOL@
 DSYMUTIL = @DSYMUTIL@
 DUMPBIN = @DUMPBIN@
@@ -161,17 +164,14 @@ ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
 FGREP = @FGREP@
+GENHTML = @GENHTML@
 GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
 GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
-GIO_CFLAGS = @GIO_CFLAGS@
-GIO_LIBS = @GIO_LIBS@
 GLIB_CFLAGS = @GLIB_CFLAGS@
 GLIB_GENMARSHAL = @GLIB_GENMARSHAL@
 GLIB_LIBS = @GLIB_LIBS@
 GLIB_MAKEFILE = @GLIB_MAKEFILE@
 GLIB_MKENUMS = @GLIB_MKENUMS@
-GMODULE_CFLAGS = @GMODULE_CFLAGS@
-GMODULE_LIBS = @GMODULE_LIBS@
 GMSGFMT = @GMSGFMT@
 GMSGFMT_015 = @GMSGFMT_015@
 GNUTLS_CFLAGS = @GNUTLS_CFLAGS@
@@ -212,6 +212,7 @@ IPTABLES_PATH = @IPTABLES_PATH@
 IWMX_SDK_CFLAGS = @IWMX_SDK_CFLAGS@
 IWMX_SDK_LIBS = @IWMX_SDK_LIBS@
 KERNEL_FIRMWARE_DIR = @KERNEL_FIRMWARE_DIR@
+LCOV = @LCOV@
 LD = @LD@
 LDFLAGS = @LDFLAGS@
 LIBDL = @LIBDL@
@@ -228,11 +229,7 @@ LIBNL2_LIBS = @LIBNL2_LIBS@
 LIBNL3_CFLAGS = @LIBNL3_CFLAGS@
 LIBNL3_LIBS = @LIBNL3_LIBS@
 LIBNL_CFLAGS = @LIBNL_CFLAGS@
-LIBNL_GENL3_CFLAGS = @LIBNL_GENL3_CFLAGS@
-LIBNL_GENL3_LIBS = @LIBNL_GENL3_LIBS@
 LIBNL_LIBS = @LIBNL_LIBS@
-LIBNL_ROUTE3_CFLAGS = @LIBNL_ROUTE3_CFLAGS@
-LIBNL_ROUTE3_LIBS = @LIBNL_ROUTE3_LIBS@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
 LIBSOUP_CFLAGS = @LIBSOUP_CFLAGS@
@@ -247,6 +244,8 @@ MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MANIFEST_TOOL = @MANIFEST_TOOL@
 MKDIR_P = @MKDIR_P@
+MM_GLIB_CFLAGS = @MM_GLIB_CFLAGS@
+MM_GLIB_LIBS = @MM_GLIB_LIBS@
 MOC = @MOC@
 MSGFMT = @MSGFMT@
 MSGFMT_015 = @MSGFMT_015@
@@ -256,6 +255,7 @@ NMEDIT = @NMEDIT@
 NM_MAJOR_VERSION = @NM_MAJOR_VERSION@
 NM_MICRO_VERSION = @NM_MICRO_VERSION@
 NM_MINOR_VERSION = @NM_MINOR_VERSION@
+NM_MODIFY_SYSTEM_POLICY = @NM_MODIFY_SYSTEM_POLICY@
 NM_VERSION = @NM_VERSION@
 NSS_CFLAGS = @NSS_CFLAGS@
 NSS_LIBS = @NSS_LIBS@
@@ -282,13 +282,14 @@ PPPD_PLUGIN_DIR = @PPPD_PLUGIN_DIR@
 QT_CFLAGS = @QT_CFLAGS@
 QT_LIBS = @QT_LIBS@
 RANLIB = @RANLIB@
-RESOLVCONF_PATH = @RESOLVCONF_PATH@
 SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
-SYSTEMD_CFLAGS = @SYSTEMD_CFLAGS@
-SYSTEMD_LIBS = @SYSTEMD_LIBS@
+SYSTEMD_INHIBIT_CFLAGS = @SYSTEMD_INHIBIT_CFLAGS@
+SYSTEMD_INHIBIT_LIBS = @SYSTEMD_INHIBIT_LIBS@
+SYSTEMD_LOGIN_CFLAGS = @SYSTEMD_LOGIN_CFLAGS@
+SYSTEMD_LOGIN_LIBS = @SYSTEMD_LOGIN_LIBS@
 SYSTEM_CA_PATH = @SYSTEM_CA_PATH@
 UDEV_BASE_DIR = @UDEV_BASE_DIR@
 USE_NLS = @USE_NLS@
@@ -343,6 +344,11 @@ localedir = @localedir@
 localstatedir = @localstatedir@
 mandir = @mandir@
 mkdir_p = @mkdir_p@
+nmbinary = @nmbinary@
+nmconfdir = @nmconfdir@
+nmdatadir = @nmdatadir@
+nmrundir = @nmrundir@
+nmstatedir = @nmstatedir@
 oldincludedir = @oldincludedir@
 pdfdir = @pdfdir@
 prefix = @prefix@
@@ -357,6 +363,10 @@ target_alias = @target_alias@
 top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
+with_dhclient = @with_dhclient@
+with_dhcpcd = @with_dhcpcd@
+with_netconfig = @with_netconfig@
+with_resolvconf = @with_resolvconf@
 INCLUDES = \
 	-I${top_srcdir}/src/logging \
 	-I${top_srcdir}/src/posix-signals \
@@ -374,8 +384,6 @@ libdns_manager_la_SOURCES = \
 	nm-dns-plugin.c \
 	nm-dns-dnsmasq.h \
 	nm-dns-dnsmasq.c \
-	nm-dns-bind.h \
-	nm-dns-bind.c \
 	nm-dns-utils.h \
 	nm-dns-utils.c
 
@@ -384,7 +392,9 @@ libdns_manager_la_CPPFLAGS = \
 	$(DBUS_CFLAGS) \
 	$(GLIB_CFLAGS) \
 	-DLOCALSTATEDIR=\"$(localstatedir)\" \
-	-DSYSCONFDIR=\"$(sysconfdir)\"
+	-DSYSCONFDIR=\"$(sysconfdir)\" \
+	-DNMCONFDIR=\"$(nmconfdir)\" \
+	-DNMRUNDIR=\"$(nmrundir)\"
 
 libdns_manager_la_LIBADD = \
 	$(top_builddir)/src/logging/libnm-logging.la \
@@ -445,32 +455,28 @@ mostlyclean-compile:
 distclean-compile:
 	-rm -f *.tab.c
 
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libdns_manager_la-nm-dns-bind.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libdns_manager_la-nm-dns-dnsmasq.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libdns_manager_la-nm-dns-manager.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libdns_manager_la-nm-dns-plugin.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libdns_manager_la-nm-dns-utils.Plo@am__quote@
 
 .c.o:
-@am__fastdepCC_TRUE@	$(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\
-@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
-@am__fastdepCC_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.Po
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $<
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c $<
 
 .c.obj:
-@am__fastdepCC_TRUE@	$(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.obj$$||'`;\
-@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ `$(CYGPATH_W) '$<'` &&\
-@am__fastdepCC_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.Po
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c `$(CYGPATH_W) '$<'`
 
 .c.lo:
-@am__fastdepCC_TRUE@	$(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.lo$$||'`;\
-@am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
-@am__fastdepCC_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.Plo
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $<
@@ -496,13 +502,6 @@ libdns_manager_la-nm-dns-dnsmasq.lo: nm-dns-dnsmasq.c
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdns_manager_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libdns_manager_la-nm-dns-dnsmasq.lo `test -f 'nm-dns-dnsmasq.c' || echo '$(srcdir)/'`nm-dns-dnsmasq.c
 
-libdns_manager_la-nm-dns-bind.lo: nm-dns-bind.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdns_manager_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libdns_manager_la-nm-dns-bind.lo -MD -MP -MF $(DEPDIR)/libdns_manager_la-nm-dns-bind.Tpo -c -o libdns_manager_la-nm-dns-bind.lo `test -f 'nm-dns-bind.c' || echo '$(srcdir)/'`nm-dns-bind.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libdns_manager_la-nm-dns-bind.Tpo $(DEPDIR)/libdns_manager_la-nm-dns-bind.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='nm-dns-bind.c' object='libdns_manager_la-nm-dns-bind.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdns_manager_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libdns_manager_la-nm-dns-bind.lo `test -f 'nm-dns-bind.c' || echo '$(srcdir)/'`nm-dns-bind.c
-
 libdns_manager_la-nm-dns-utils.lo: nm-dns-utils.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdns_manager_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libdns_manager_la-nm-dns-utils.lo -MD -MP -MF $(DEPDIR)/libdns_manager_la-nm-dns-utils.Tpo -c -o libdns_manager_la-nm-dns-utils.lo `test -f 'nm-dns-utils.c' || echo '$(srcdir)/'`nm-dns-utils.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libdns_manager_la-nm-dns-utils.Tpo $(DEPDIR)/libdns_manager_la-nm-dns-utils.Plo
diff --git a/src/dns-manager/nm-dns-bind.c b/src/dns-manager/nm-dns-bind.c
deleted file mode 100644
index 1a3243be..00000000
--- a/src/dns-manager/nm-dns-bind.c
+++ /dev/null
@@ -1,529 +0,0 @@
-/* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */
-/*
- * Copyright (C) 2010 Dan Williams 
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2, or (at your option)
- * any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- */
-
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-
-#include 
-#include 
-
-#include "nm-dns-bind.h"
-#include "nm-logging.h"
-#include "nm-ip4-config.h"
-#include "nm-ip6-config.h"
-
-G_DEFINE_TYPE (NMDnsBind, nm_dns_bind, NM_TYPE_DNS_PLUGIN)
-
-#define NM_DNS_BIND_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), NM_TYPE_DNS_BIND, NMDnsBindPrivate))
-
-#define PIDFILE LOCALSTATEDIR "/run/nm-dns-named.pid"
-#define CONFFILE LOCALSTATEDIR "/run/nm-dns-named.conf"
-
-typedef struct {
-	GPid pid;
-} NMDnsBindPrivate;
-
-/*******************************************/
-
-static inline const char *
-find_bind (void)
-{
-	static const char *paths[] = {
-		"/usr/local/sbin/named",
-		"/usr/sbin/named",
-		"/sbin/named",
-		NULL
-	};
-	const char **binary = paths;
-
-	while (*binary != NULL) {
-		if (g_file_test (*binary, G_FILE_TEST_EXISTS))
-			return *binary;
-		binary++;
-	}
-	return NULL;
-}
-
-static gboolean
-start_bind (NMDnsBind *self)
-{
-	const char *argv[10];
-
-	argv[0] = find_bind ();
-	argv[1] = "-f";  /* don't daemonize; stay in foreground */
-	argv[2] = "-c";
-	argv[3] = CONFFILE;
-	argv[4] = NULL;
-
-	/* And finally spawn bind */
-	return nm_dns_plugin_child_spawn (NM_DNS_PLUGIN (self), argv, PIDFILE, "bin/named");
-}
-
-/*******************************************/
-
-static gboolean
-find_address (GPtrArray *array, const char *addr)
-{
-	int n;
-
-	for (n = 0; n < array->len; n++) {
-		if (g_strcmp0 ((const char*) g_ptr_array_index (array, n), addr) == 0)
-			return TRUE;
-	}
-	return FALSE;
-}
-
-static void
-add_ip4_nameservers (NMIP4Config *ip4, GPtrArray *array)
-{
-	int i;
-
-	for (i = 0; i < nm_ip4_config_get_num_nameservers (ip4); i++) {
-		char buf[INET_ADDRSTRLEN + 1];
-		struct in_addr addr;
-
-		memset (&buf[0], 0, sizeof (buf));
-		addr.s_addr = nm_ip4_config_get_nameserver (ip4, i);
-		if (inet_ntop (AF_INET, &addr, buf, sizeof (buf))) {
-			if (!find_address (array, buf))
-				g_ptr_array_add (array, g_strdup (buf));
-		}
-	}
-}
-
-static gboolean
-ip6_addr_to_string (const struct in6_addr *addr, char *buf, size_t buflen)
-{
-	/* inet_ntop is probably supposed to do this for us, but it doesn't */
-	if (IN6_IS_ADDR_V4MAPPED (addr))
-		return !!inet_ntop (AF_INET, &(addr->s6_addr32[3]), buf, buflen);
-
-	return !!inet_ntop (AF_INET6, addr, buf, buflen);
-}
-
-static void
-add_ip6_nameservers (NMIP6Config *ip6, GPtrArray *array)
-{
-	char buf[INET6_ADDRSTRLEN + 1];
-	int i;
-
-	for (i = 0; i < nm_ip6_config_get_num_nameservers (ip6); i++) {
-		memset (buf, 0, sizeof (buf));
-		if (ip6_addr_to_string (nm_ip6_config_get_nameserver (ip6, i), buf, sizeof (buf))) {
-			if (!find_address (array, buf))
-				g_ptr_array_add (array, g_strdup (buf));
-		}
-	}
-}
-
-typedef struct {
-	guint32 dhash;
-	char *domain;
-	GPtrArray *servers;
-} ZoneInfo;
-
-static ZoneInfo *
-zone_new (const char *domain)
-{
-	ZoneInfo *info;
-
-	g_return_val_if_fail (domain != NULL, NULL);
-
-	info = g_malloc0 (sizeof (ZoneInfo));
-	info->domain = g_strdup (domain);
-	info->dhash = g_str_hash (domain);
-	info->servers = g_ptr_array_sized_new (4);
-	return info;
-}
-
-static void
-zone_add_nameserver (ZoneInfo *info, const char *server)
-{
-	guint32 i;
-
-	g_return_if_fail (info != NULL);
-	g_return_if_fail (server != NULL);
-
-	for (i = 0; i < info->servers->len; i++) {
-		if (g_strcmp0 ((char *) g_ptr_array_index (info->servers, i), server) == 0)
-			return;
-	}
-	g_ptr_array_add (info->servers, g_strdup (server));
-}
-
-static void
-zone_free (ZoneInfo *info)
-{
-	g_return_if_fail (info != NULL);
-
-	g_free (info->domain);
-	g_ptr_array_foreach (info->servers, (GFunc) g_free, NULL);
-	g_ptr_array_free (info->servers, TRUE);
-	memset (info, 0, sizeof (ZoneInfo));
-	g_free (info);
-}
-
-static ZoneInfo *
-find_zone (GPtrArray *zones, const char *domain)
-{
-	guint32 dhash, i;
-
-	g_return_val_if_fail (domain != NULL, NULL);
-
-	dhash = g_str_hash (domain);
-	for (i = 0; i < zones->len; i++) {
-		ZoneInfo *zone = g_ptr_array_index (zones, i);
-
-		if (zone->dhash == dhash)
-			return zone;
-	}
-	return NULL;
-}
-
-static void
-add_zone (GObject *ip, GPtrArray *zones)
-{
-	guint32 i, j, ns, nd, nn;
-	GPtrArray *to_add;
-	ZoneInfo *z;
-
-	if (NM_IS_IP4_CONFIG (ip)) {
-		ns = nm_ip4_config_get_num_searches (NM_IP4_CONFIG (ip));
-		nd = nm_ip4_config_get_num_domains (NM_IP4_CONFIG (ip));
-		nn = nm_ip4_config_get_num_nameservers (NM_IP4_CONFIG (ip));
-	} else if (NM_IS_IP6_CONFIG (ip)) {
-		ns = nm_ip6_config_get_num_searches (NM_IP6_CONFIG (ip));
-		nd = nm_ip6_config_get_num_domains (NM_IP6_CONFIG (ip));
-		nn = nm_ip6_config_get_num_nameservers (NM_IP6_CONFIG (ip));
-	} else
-		g_assert_not_reached ();
-
-	/* If we don't have any domains or searches, or we don't have any
-	 * nameservers, we can't do split DNS for this config.
-	 */
-	if ((!nd && !ns) || !nn)
-		return;
-
-	to_add = g_ptr_array_sized_new (MAX (ns, nd));
-
-	/* searches are preferred over domains */
-	for (i = 0; i < ns; i++) {
-		const char *domain = NULL;
-
-		if (NM_IS_IP4_CONFIG (ip))
-			domain = nm_ip4_config_get_search (NM_IP4_CONFIG (ip), i);
-		else if (NM_IS_IP6_CONFIG (ip))
-			domain = nm_ip6_config_get_search (NM_IP6_CONFIG (ip), i);
-
-		z = find_zone (zones, domain);
-		if (!z) {
-			z = zone_new (domain);
-			g_ptr_array_add (zones, z);
-		}
-		g_ptr_array_add (to_add, z);
-	}
-
-	if (ns == 0) {
-		/* If no searches, add any domains */
-		for (i = 0; i < nd; i++) {
-			const char *domain = NULL;
-
-			if (NM_IS_IP4_CONFIG (ip))
-				domain = nm_ip4_config_get_domain (NM_IP4_CONFIG (ip), i);
-			else if (NM_IS_IP6_CONFIG (ip))
-				domain = nm_ip6_config_get_domain (NM_IP6_CONFIG (ip), i);
-
-			z = find_zone (zones, domain);
-			if (!z) {
-				z = zone_new (domain);
-				g_ptr_array_add (zones, z);
-			}
-			g_ptr_array_add (to_add, z);
-		}
-	}
-
-	/* Now add the nameservers to every zone for this config */
-	for (i = 0; i < nn; i++) {
-		char buf[INET6_ADDRSTRLEN + 1];
-		struct in_addr addr4;
-		const struct in6_addr *addr6;
-
-		memset (&buf[0], 0, sizeof (buf));
-
-		if (NM_IS_IP4_CONFIG (ip)) {
-			addr4.s_addr = nm_ip4_config_get_nameserver (NM_IP4_CONFIG (ip), i);
-			if (!inet_ntop (AF_INET, &addr4, buf, sizeof (buf)))
-				continue;
-		} else if (NM_IS_IP6_CONFIG (ip)) {
-			addr6 = nm_ip6_config_get_nameserver (NM_IP6_CONFIG (ip), i);
-			if (!ip6_addr_to_string (addr6, buf, sizeof (buf)))
-				continue;
-		}
-
-		/* Add this nameserver to every zone from this IP config */
-		for (j = 0; j < to_add->len; j++) {
-			z = g_ptr_array_index (to_add, j);
-			zone_add_nameserver (z, buf);
-		}
-	}
-
-	g_ptr_array_free (to_add, TRUE);
-}
-
-static gboolean
-update (NMDnsPlugin *plugin,
-        const GSList *vpn_configs,
-        const GSList *dev_configs,
-        const GSList *other_configs,
-        const char *hostname,
-        const char *iface)
-{
-	NMDnsBind *self = NM_DNS_BIND (plugin);
-	NMDnsBindPrivate *priv = NM_DNS_BIND_GET_PRIVATE (self);
-	GString *conf;
-	GPtrArray *globals, *zones;
-	GSList *iter;
-	GError *error = NULL;
-	int ignored, i, j;
-	gboolean success = FALSE;
-
-	/* Build up the new bind config file */
-	conf = g_string_sized_new (200);
-	globals = g_ptr_array_sized_new (6);
-
-	/* If any of the VPN configs *don't* have domains or searches, then we
-	 * dont' have any split DNS configuration for them, and we add them
-	 * first in the global nameserver lists.  Otherwise we add them later as
-	 * split DNS zones.
-	 */
-	for (iter = (GSList *) vpn_configs; iter;iter = g_slist_next (iter)) {
-		if (NM_IS_IP4_CONFIG (iter->data)) {
-			NMIP4Config *ip4 = NM_IP4_CONFIG (iter->data);
-
-			if (!nm_ip4_config_get_num_domains (ip4) && !nm_ip4_config_get_num_searches (ip4))
-				add_ip4_nameservers (ip4, globals);
-		} else if (NM_IS_IP6_CONFIG (iter->data)) {
-			NMIP6Config *ip6 = NM_IP6_CONFIG (iter->data);
-
-			if (!nm_ip6_config_get_num_domains (ip6) && !nm_ip6_config_get_num_searches (ip6))
-				add_ip6_nameservers (ip6, globals);
-		}
-	}
-
-	/* Get a list of global upstream servers with dupe checking */
-	for (iter = (GSList *) dev_configs; iter;iter = g_slist_next (iter)) {
-		if (NM_IS_IP4_CONFIG (iter->data))
-			add_ip4_nameservers (NM_IP4_CONFIG (iter->data), globals);
-		else if (NM_IS_IP6_CONFIG (iter->data))
-			add_ip6_nameservers (NM_IP6_CONFIG (iter->data), globals);
-	}
-
-	/* And any other random configs with dupe checking */
-	for (iter = (GSList *) other_configs; iter;iter = g_slist_next (iter)) {
-		if (NM_IS_IP4_CONFIG (iter->data))
-			add_ip4_nameservers (NM_IP4_CONFIG (iter->data), globals);
-		else if (NM_IS_IP6_CONFIG (iter->data))
-			add_ip6_nameservers (NM_IP6_CONFIG (iter->data), globals);
-	}
-
-	g_string_append (conf,
-		"options {\n"
-		"    directory \"" LOCALSTATEDIR "/named\";\n"
-		"    forward only;\n"
-		"    recursion yes;\n"
-		"    listen-on-v6 { ::1; };\n"
-		"    listen-on { 127.0.0.1; };\n"
-		"    forwarders {\n");
-
-	for (i = 0; i < globals->len; i++) {
-		char *ns = g_ptr_array_index (globals, i);
-
-		g_string_append_printf (conf, "        %s;\n", ns);
-		g_free (ns);
-	}
-	g_ptr_array_free (globals, TRUE);
-
-	g_string_append (conf,
-		"    };\n"
-		"};\n\n");
-
-	/* Build up the list of any split DNS zones, avoiding duplicates */
-	zones = g_ptr_array_sized_new (4);
-	for (iter = (GSList *) vpn_configs; iter;iter = g_slist_next (iter)) {
-		if (NM_IS_IP4_CONFIG (iter->data))
-			add_zone (G_OBJECT (iter->data), zones);
-		else if (NM_IS_IP6_CONFIG (iter->data))
-			add_zone (G_OBJECT (iter->data), zones);
-	}
-
-	/* Add all the zones to the config */
-	for (i = 0; i < zones->len; i++) {
-		ZoneInfo *z = g_ptr_array_index (zones, i);
-
-		g_string_append_printf (conf,
-			"zone \"%s\" IN {\n"
-			"    type forward;\n"
-			"    forward only;\n"
-			"    forwarders {\n",
-			z->domain);
-
-		/* Add each nameserver for this zone */
-		for (j = 0; j < z->servers->len; j++) {
-			g_string_append_printf (conf,
-				"        %s;\n",
-				(const char *) g_ptr_array_index (z->servers, j));
-		}
-
-		g_string_append (conf,
-			"    };\n"
-			"};\n\n");
-
-		zone_free (z);
-	}
-	g_ptr_array_free (zones, TRUE);
-
-	/* Write out the config file */
-	if (!g_file_set_contents (CONFFILE, conf->str, -1, &error)) {
-		nm_log_warn (LOGD_DNS, "Failed to write named config file %s: (%d) %s",
-		             CONFFILE,
-		             error ? error->code : -1,
-		             error && error->message ? error->message : "(unknown)");
-		g_clear_error (&error);
-		goto out;
-	}
-	ignored = chmod (CONFFILE, 0644);
-
-	nm_log_dbg (LOGD_DNS, "BIND local caching DNS configuration:");
-	nm_log_dbg (LOGD_DNS, "%s", conf->str);
-
-	if (priv->pid) {
-		/* Send it SIGHUP to reload the new configuration */
-		if (kill (priv->pid, SIGHUP) == 0)
-			success = TRUE;
-		else {
-			/* Sigh... some error.  Kill it and restart */
-			 nm_dns_plugin_child_kill (NM_DNS_PLUGIN (self));
-			 priv->pid = 0;
-		}
-	}
-
-	if (!success) {
-		/* Spawn it */
-		priv->pid = start_bind (self);
-		if (priv->pid)
-			success = TRUE;
-	}
-
-out:
-	g_string_free (conf, TRUE);
-	return success;
-}
-
-/****************************************************************/
-
-static void
-child_quit (NMDnsPlugin *plugin, gint status)
-{
-	NMDnsBind *self = NM_DNS_BIND (plugin);
-	gboolean failed = TRUE;
-	int err;
-
-	if (WIFEXITED (status)) {
-		err = WEXITSTATUS (status);
-		if (err) {
-			nm_log_warn (LOGD_DNS, "named exited with error %d", err);
-		} else
-			failed = FALSE;
-	} else if (WIFSTOPPED (status)) {
-		nm_log_warn (LOGD_DNS, "named stopped unexpectedly with signal %d", WSTOPSIG (status));
-	} else if (WIFSIGNALED (status)) {
-		nm_log_warn (LOGD_DNS, "named died with signal %d", WTERMSIG (status));
-	} else {
-		nm_log_warn (LOGD_DNS, "named died from an unknown cause");
-	}
-	unlink (CONFFILE);
-
-	if (failed)
-		g_signal_emit_by_name (self, NM_DNS_PLUGIN_FAILED);
-}
-
-/****************************************************************/
-
-static gboolean
-init (NMDnsPlugin *plugin)
-{
-	return TRUE;
-}
-
-static gboolean
-is_caching (NMDnsPlugin *plugin)
-{
-	return TRUE;
-}
-
-static const char *
-get_name (NMDnsPlugin *plugin)
-{
-	return "bind";
-}
-
-/****************************************************************/
-
-NMDnsBind *
-nm_dns_bind_new (void)
-{
-	return (NMDnsBind *) g_object_new (NM_TYPE_DNS_BIND, NULL);
-}
-
-static void
-nm_dns_bind_init (NMDnsBind *self)
-{
-}
-
-static void
-dispose (GObject *object)
-{
-	unlink (CONFFILE);
-
-	G_OBJECT_CLASS (nm_dns_bind_parent_class)->dispose (object);
-}
-
-static void
-nm_dns_bind_class_init (NMDnsBindClass *dns_class)
-{
-	NMDnsPluginClass *plugin_class = NM_DNS_PLUGIN_CLASS (dns_class);
-	GObjectClass *object_class = G_OBJECT_CLASS (dns_class);
-
-	g_type_class_add_private (dns_class, sizeof (NMDnsBindPrivate));
-
-	object_class->dispose = dispose;
-
-	plugin_class->init = init;
-	plugin_class->child_quit = child_quit;
-	plugin_class->is_caching = is_caching;
-	plugin_class->update = update;
-	plugin_class->get_name = get_name;
-}
-
diff --git a/src/dns-manager/nm-dns-bind.h b/src/dns-manager/nm-dns-bind.h
deleted file mode 100644
index d3ab3819..00000000
--- a/src/dns-manager/nm-dns-bind.h
+++ /dev/null
@@ -1,47 +0,0 @@
-/* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */
-/* This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2, or (at your option)
- * any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Copyright (C) 2010 Red Hat, Inc.
- */
-
-#ifndef NM_DNS_BIND_H
-#define NM_DNS_BIND_H
-
-#include 
-#include 
-
-#include "nm-dns-plugin.h"
-
-#define NM_TYPE_DNS_BIND            (nm_dns_bind_get_type ())
-#define NM_DNS_BIND(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), NM_TYPE_DNS_BIND, NMDnsBind))
-#define NM_DNS_BIND_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), NM_TYPE_DNS_BIND, NMDnsBindClass))
-#define NM_IS_DNS_BIND(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), NM_TYPE_DNS_BIND))
-#define NM_IS_DNS_BIND_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), NM_TYPE_DNS_BIND))
-#define NM_DNS_BIND_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), NM_TYPE_DNS_BIND, NMDnsBindClass))
-
-typedef struct {
-	NMDnsPlugin parent;
-} NMDnsBind;
-
-typedef struct {
-	NMDnsPluginClass parent;
-} NMDnsBindClass;
-
-GType nm_dns_bind_get_type (void);
-
-NMDnsBind *nm_dns_bind_new (void);
-
-#endif /* NM_DNS_BIND_H */
-
diff --git a/src/dns-manager/nm-dns-dnsmasq.c b/src/dns-manager/nm-dns-dnsmasq.c
index 5d37e374..e07240c5 100644
--- a/src/dns-manager/nm-dns-dnsmasq.c
+++ b/src/dns-manager/nm-dns-dnsmasq.c
@@ -39,9 +39,9 @@ G_DEFINE_TYPE (NMDnsDnsmasq, nm_dns_dnsmasq, NM_TYPE_DNS_PLUGIN)
 
 #define NM_DNS_DNSMASQ_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), NM_TYPE_DNS_DNSMASQ, NMDnsDnsmasqPrivate))
 
-#define PIDFILE LOCALSTATEDIR "/run/nm-dns-dnsmasq.pid"
-#define CONFFILE LOCALSTATEDIR "/run/nm-dns-dnsmasq.conf"
-#define CONFDIR SYSCONFDIR "/NetworkManager/dnsmasq.d"
+#define PIDFILE NMRUNDIR "/dnsmasq.pid"
+#define CONFFILE NMRUNDIR "/dnsmasq.conf"
+#define CONFDIR NMCONFDIR "/dnsmasq.d"
 
 typedef struct {
 	guint32 foo;
@@ -253,10 +253,11 @@ update (NMDnsPlugin *plugin,
 	NMDnsDnsmasq *self = NM_DNS_DNSMASQ (plugin);
 	GString *conf;
 	GSList *iter;
-	const char *argv[12];
+	const char *argv[15];
 	GError *error = NULL;
 	int ignored;
 	GPid pid = 0;
+	guint idx = 0;
 
 	/* Kill the old dnsmasq; there doesn't appear to be a way to get dnsmasq
 	 * to reread the config file using SIGHUP or similar.  This is a small race
@@ -306,18 +307,23 @@ update (NMDnsPlugin *plugin,
 	nm_log_dbg (LOGD_DNS, "dnsmasq local caching DNS configuration:");
 	nm_log_dbg (LOGD_DNS, "%s", conf->str);
 
-	argv[0] = find_dnsmasq ();
-	argv[1] = "--no-resolv";  /* Use only commandline */
-	argv[2] = "--keep-in-foreground";
-	argv[3] = "--no-hosts"; /* don't use /etc/hosts to resolve */
-	argv[4] = "--bind-interfaces";
-	argv[5] = "--pid-file=" PIDFILE;
-	argv[6] = "--listen-address=127.0.0.1"; /* Should work for both 4 and 6 */
-	argv[7] = "--conf-file=" CONFFILE;
-	argv[8] = "--cache-size=400";
-	argv[9] = "--proxy-dnssec"; /* Allow DNSSEC to pass through */
-	argv[10] = "--conf-dir=" CONFDIR;
-	argv[11] = NULL;
+	argv[idx++] = find_dnsmasq ();
+	argv[idx++] = "--no-resolv";  /* Use only commandline */
+	argv[idx++] = "--keep-in-foreground";
+	argv[idx++] = "--no-hosts"; /* don't use /etc/hosts to resolve */
+	argv[idx++] = "--bind-interfaces";
+	argv[idx++] = "--pid-file=" PIDFILE;
+	argv[idx++] = "--listen-address=127.0.0.1"; /* Should work for both 4 and 6 */
+	argv[idx++] = "--conf-file=" CONFFILE;
+	argv[idx++] = "--cache-size=400";
+	argv[idx++] = "--proxy-dnssec"; /* Allow DNSSEC to pass through */
+
+	/* dnsmasq exits if the conf dir is not present */
+	if (g_file_test (CONFDIR, G_FILE_TEST_IS_DIR))
+		argv[idx++] = "--conf-dir=" CONFDIR;
+
+	argv[idx++] = NULL;
+	g_warn_if_fail (idx <= G_N_ELEMENTS (argv));
 
 	/* And finally spawn dnsmasq */
 	pid = nm_dns_plugin_child_spawn (NM_DNS_PLUGIN (self), argv, PIDFILE, "bin/dnsmasq");
diff --git a/src/dns-manager/nm-dns-manager.c b/src/dns-manager/nm-dns-manager.c
index 38ef08ea..38691f37 100644
--- a/src/dns-manager/nm-dns-manager.c
+++ b/src/dns-manager/nm-dns-manager.c
@@ -40,17 +40,11 @@
 #include "nm-ip4-config.h"
 #include "nm-ip6-config.h"
 #include "nm-logging.h"
-#include "backends/nm-backend.h"
 #include "NetworkManagerUtils.h"
 #include "nm-posix-signals.h"
 
 #include "nm-dns-plugin.h"
 #include "nm-dns-dnsmasq.h"
-#include "nm-dns-bind.h"
-
-#ifdef HAVE_SELINUX
-#include 
-#endif
 
 #ifndef RESOLV_CONF
 #define RESOLV_CONF "/etc/resolv.conf"
@@ -208,7 +202,7 @@ merge_one_ip6_config (NMResolvConfData *rc, NMIP6Config *src, const char *iface)
 }
 
 
-#if defined(TARGET_SUSE)
+#if defined(NETCONFIG_PATH)
 /**********************************/
 /* SUSE */
 
@@ -232,7 +226,7 @@ run_netconfig (GError **error, gint *stdin_fd)
 	char *tmp;
 	GPid pid = -1;
 
-	argv[0] = "/sbin/netconfig";
+	argv[0] = NETCONFIG_PATH;
 	argv[1] = "modify";
 	argv[2] = "--service";
 	argv[3] = "NetworkManager";
@@ -756,7 +750,7 @@ update_dns (NMDnsManager *self,
 	success = dispatch_resolvconf (domain, searches, nameservers, iface, error);
 #endif
 
-#ifdef TARGET_SUSE
+#ifdef NETCONFIG_PATH
 	if (success == FALSE) {
 		success = dispatch_netconfig (domain, searches, nameservers,
 		                              nis_domain, nis_servers,
@@ -767,9 +761,6 @@ update_dns (NMDnsManager *self,
 	if (success == FALSE)
 		success = update_resolv_conf (domain, searches, nameservers, iface, error);
 
-	if (success)
-		nm_backend_update_dns ();
-
 	if (searches)
 		g_strfreev (searches);
 	if (nameservers)
@@ -1055,10 +1046,7 @@ load_plugins (NMDnsManager *self, const char **plugins)
 		for (iter = plugins; iter && *iter; iter++) {
 			if (!strcasecmp (*iter, "dnsmasq"))
 				plugin = NM_DNS_PLUGIN (nm_dns_dnsmasq_new ());
-			else if (!strcasecmp (*iter, "bind")) {
-				plugin = NM_DNS_PLUGIN (nm_dns_bind_new ());
-				nm_log_warn (LOGD_DNS, "The BIND plugin is experimental!");
-			} else {
+			else {
 				nm_log_warn (LOGD_DNS, "Unknown DNS plugin '%s'", *iter);\
 				continue;
 			}
diff --git a/src/dnsmasq-manager/Makefile.in b/src/dnsmasq-manager/Makefile.in
index a1aae508..55bdc75a 100644
--- a/src/dnsmasq-manager/Makefile.in
+++ b/src/dnsmasq-manager/Makefile.in
@@ -55,16 +55,18 @@ subdir = src/dnsmasq-manager
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/compiler_warnings.m4 \
-	$(top_srcdir)/m4/gettext.m4 $(top_srcdir)/m4/gtk-doc.m4 \
-	$(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/intlmacosx.m4 \
-	$(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/introspection.m4 \
-	$(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \
-	$(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/libnl-check.m4 \
-	$(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \
-	$(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
-	$(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/nls.m4 \
-	$(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/progtest.m4 \
-	$(top_srcdir)/m4/vapigen.m4 $(top_srcdir)/configure.ac
+	$(top_srcdir)/m4/gettext.m4 \
+	$(top_srcdir)/m4/gnome-code-coverage.m4 \
+	$(top_srcdir)/m4/gtk-doc.m4 $(top_srcdir)/m4/iconv.m4 \
+	$(top_srcdir)/m4/intlmacosx.m4 $(top_srcdir)/m4/intltool.m4 \
+	$(top_srcdir)/m4/introspection.m4 $(top_srcdir)/m4/lib-ld.m4 \
+	$(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \
+	$(top_srcdir)/m4/libnl-check.m4 $(top_srcdir)/m4/libtool.m4 \
+	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
+	$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
+	$(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/po.m4 \
+	$(top_srcdir)/m4/progtest.m4 $(top_srcdir)/m4/vapigen.m4 \
+	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(install_sh) -d
@@ -131,6 +133,10 @@ AWK = @AWK@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
+CKDB_PATH = @CKDB_PATH@
+CODE_COVERAGE_CFLAGS = @CODE_COVERAGE_CFLAGS@
+CODE_COVERAGE_ENABLED = @CODE_COVERAGE_ENABLED@
+CODE_COVERAGE_LDFLAGS = @CODE_COVERAGE_LDFLAGS@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CXX = @CXX@
@@ -145,9 +151,7 @@ DBUS_SYS_DIR = @DBUS_SYS_DIR@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
 DHCLIENT_PATH = @DHCLIENT_PATH@
-DHCLIENT_VERSION = @DHCLIENT_VERSION@
 DHCPCD_PATH = @DHCPCD_PATH@
-DISABLE_DEPRECATED = @DISABLE_DEPRECATED@
 DLLTOOL = @DLLTOOL@
 DSYMUTIL = @DSYMUTIL@
 DUMPBIN = @DUMPBIN@
@@ -157,17 +161,14 @@ ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
 FGREP = @FGREP@
+GENHTML = @GENHTML@
 GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
 GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
-GIO_CFLAGS = @GIO_CFLAGS@
-GIO_LIBS = @GIO_LIBS@
 GLIB_CFLAGS = @GLIB_CFLAGS@
 GLIB_GENMARSHAL = @GLIB_GENMARSHAL@
 GLIB_LIBS = @GLIB_LIBS@
 GLIB_MAKEFILE = @GLIB_MAKEFILE@
 GLIB_MKENUMS = @GLIB_MKENUMS@
-GMODULE_CFLAGS = @GMODULE_CFLAGS@
-GMODULE_LIBS = @GMODULE_LIBS@
 GMSGFMT = @GMSGFMT@
 GMSGFMT_015 = @GMSGFMT_015@
 GNUTLS_CFLAGS = @GNUTLS_CFLAGS@
@@ -208,6 +209,7 @@ IPTABLES_PATH = @IPTABLES_PATH@
 IWMX_SDK_CFLAGS = @IWMX_SDK_CFLAGS@
 IWMX_SDK_LIBS = @IWMX_SDK_LIBS@
 KERNEL_FIRMWARE_DIR = @KERNEL_FIRMWARE_DIR@
+LCOV = @LCOV@
 LD = @LD@
 LDFLAGS = @LDFLAGS@
 LIBDL = @LIBDL@
@@ -224,11 +226,7 @@ LIBNL2_LIBS = @LIBNL2_LIBS@
 LIBNL3_CFLAGS = @LIBNL3_CFLAGS@
 LIBNL3_LIBS = @LIBNL3_LIBS@
 LIBNL_CFLAGS = @LIBNL_CFLAGS@
-LIBNL_GENL3_CFLAGS = @LIBNL_GENL3_CFLAGS@
-LIBNL_GENL3_LIBS = @LIBNL_GENL3_LIBS@
 LIBNL_LIBS = @LIBNL_LIBS@
-LIBNL_ROUTE3_CFLAGS = @LIBNL_ROUTE3_CFLAGS@
-LIBNL_ROUTE3_LIBS = @LIBNL_ROUTE3_LIBS@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
 LIBSOUP_CFLAGS = @LIBSOUP_CFLAGS@
@@ -243,6 +241,8 @@ MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MANIFEST_TOOL = @MANIFEST_TOOL@
 MKDIR_P = @MKDIR_P@
+MM_GLIB_CFLAGS = @MM_GLIB_CFLAGS@
+MM_GLIB_LIBS = @MM_GLIB_LIBS@
 MOC = @MOC@
 MSGFMT = @MSGFMT@
 MSGFMT_015 = @MSGFMT_015@
@@ -252,6 +252,7 @@ NMEDIT = @NMEDIT@
 NM_MAJOR_VERSION = @NM_MAJOR_VERSION@
 NM_MICRO_VERSION = @NM_MICRO_VERSION@
 NM_MINOR_VERSION = @NM_MINOR_VERSION@
+NM_MODIFY_SYSTEM_POLICY = @NM_MODIFY_SYSTEM_POLICY@
 NM_VERSION = @NM_VERSION@
 NSS_CFLAGS = @NSS_CFLAGS@
 NSS_LIBS = @NSS_LIBS@
@@ -278,13 +279,14 @@ PPPD_PLUGIN_DIR = @PPPD_PLUGIN_DIR@
 QT_CFLAGS = @QT_CFLAGS@
 QT_LIBS = @QT_LIBS@
 RANLIB = @RANLIB@
-RESOLVCONF_PATH = @RESOLVCONF_PATH@
 SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
-SYSTEMD_CFLAGS = @SYSTEMD_CFLAGS@
-SYSTEMD_LIBS = @SYSTEMD_LIBS@
+SYSTEMD_INHIBIT_CFLAGS = @SYSTEMD_INHIBIT_CFLAGS@
+SYSTEMD_INHIBIT_LIBS = @SYSTEMD_INHIBIT_LIBS@
+SYSTEMD_LOGIN_CFLAGS = @SYSTEMD_LOGIN_CFLAGS@
+SYSTEMD_LOGIN_LIBS = @SYSTEMD_LOGIN_LIBS@
 SYSTEM_CA_PATH = @SYSTEM_CA_PATH@
 UDEV_BASE_DIR = @UDEV_BASE_DIR@
 USE_NLS = @USE_NLS@
@@ -339,6 +341,11 @@ localedir = @localedir@
 localstatedir = @localstatedir@
 mandir = @mandir@
 mkdir_p = @mkdir_p@
+nmbinary = @nmbinary@
+nmconfdir = @nmconfdir@
+nmdatadir = @nmdatadir@
+nmrundir = @nmrundir@
+nmstatedir = @nmstatedir@
 oldincludedir = @oldincludedir@
 pdfdir = @pdfdir@
 prefix = @prefix@
@@ -353,6 +360,10 @@ target_alias = @target_alias@
 top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
+with_dhclient = @with_dhclient@
+with_dhcpcd = @with_dhcpcd@
+with_netconfig = @with_netconfig@
+with_resolvconf = @with_resolvconf@
 INCLUDES = \
 	-I${top_srcdir}/libnm-util \
 	-I${top_srcdir}/src/logging \
@@ -429,25 +440,22 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libdnsmasq_manager_la-nm-dnsmasq-manager.Plo@am__quote@
 
 .c.o:
-@am__fastdepCC_TRUE@	$(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\
-@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
-@am__fastdepCC_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.Po
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $<
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c $<
 
 .c.obj:
-@am__fastdepCC_TRUE@	$(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.obj$$||'`;\
-@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ `$(CYGPATH_W) '$<'` &&\
-@am__fastdepCC_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.Po
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c `$(CYGPATH_W) '$<'`
 
 .c.lo:
-@am__fastdepCC_TRUE@	$(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.lo$$||'`;\
-@am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
-@am__fastdepCC_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.Plo
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $<
diff --git a/src/dnsmasq-manager/nm-dnsmasq-manager.c b/src/dnsmasq-manager/nm-dnsmasq-manager.c
index 0b3b629f..f708f6f6 100644
--- a/src/dnsmasq-manager/nm-dnsmasq-manager.c
+++ b/src/dnsmasq-manager/nm-dnsmasq-manager.c
@@ -258,8 +258,8 @@ create_dm_cmd_line (const char *iface,
 
 	dm_binary = nm_find_dnsmasq ();
 	if (!dm_binary) {
-		g_set_error (error, NM_DNSMASQ_MANAGER_ERROR, NM_DNSMASQ_MANAGER_ERROR_NOT_FOUND,
-		             "Could not find dnsmasq binary.");
+		g_set_error_literal (error, NM_DNSMASQ_MANAGER_ERROR, NM_DNSMASQ_MANAGER_ERROR_NOT_FOUND,
+		                     "Could not find dnsmasq binary.");
 		return NULL;
 	}
 
@@ -298,8 +298,11 @@ create_dm_cmd_line (const char *iface,
 	s = g_string_new ("--listen-address=");
 	addr.s_addr = nm_ip4_address_get_address (tmp);
 	if (!inet_ntop (AF_INET, &addr, &localaddr[0], INET_ADDRSTRLEN)) {
-		nm_log_warn (LOGD_SHARING, "error converting IP4 address 0x%X",
-		             ntohl (addr.s_addr));
+		char *err_msg = g_strdup_printf ("error converting IP4 address 0x%X",
+		                                 ntohl (addr.s_addr));
+		g_set_error_literal (error, NM_DNSMASQ_MANAGER_ERROR, NM_DNSMASQ_MANAGER_ERROR_NOT_FOUND, err_msg);
+		nm_log_warn (LOGD_SHARING, "%s", err_msg);
+		g_free (err_msg);
 		goto error;
 	}
 	g_string_append (s, localaddr);
@@ -311,8 +314,11 @@ create_dm_cmd_line (const char *iface,
 	/* Add start of address range */
 	addr.s_addr = nm_ip4_address_get_address (tmp) + htonl (9);
 	if (!inet_ntop (AF_INET, &addr, &buf[0], INET_ADDRSTRLEN)) {
-		nm_log_warn (LOGD_SHARING, "error converting IP4 address 0x%X",
-		             ntohl (addr.s_addr));
+		char *err_msg = g_strdup_printf ("error converting IP4 address 0x%X",
+		                                 ntohl (addr.s_addr));
+		g_set_error_literal (error, NM_DNSMASQ_MANAGER_ERROR, NM_DNSMASQ_MANAGER_ERROR_NOT_FOUND, err_msg);
+		nm_log_warn (LOGD_SHARING, "%s", err_msg);
+		g_free (err_msg);
 		goto error;
 	}
 	g_string_append (s, buf);
@@ -322,8 +328,11 @@ create_dm_cmd_line (const char *iface,
 	/* Add end of address range */
 	addr.s_addr = nm_ip4_address_get_address (tmp) + htonl (99);
 	if (!inet_ntop (AF_INET, &addr, &buf[0], INET_ADDRSTRLEN)) {
-		nm_log_warn (LOGD_SHARING, "error converting IP4 address 0x%X",
-		             ntohl (addr.s_addr));
+		char *err_msg = g_strdup_printf ("error converting IP4 address 0x%X",
+		                                 ntohl (addr.s_addr));
+		g_set_error_literal (error, NM_DNSMASQ_MANAGER_ERROR, NM_DNSMASQ_MANAGER_ERROR_NOT_FOUND, err_msg);
+		nm_log_warn (LOGD_SHARING, "%s", err_msg);
+		g_free (err_msg);
 		goto error;
 	}
 	g_string_append (s, buf);
diff --git a/src/firewall-manager/Makefile.in b/src/firewall-manager/Makefile.in
index 8c6284d8..bf3f46c4 100644
--- a/src/firewall-manager/Makefile.in
+++ b/src/firewall-manager/Makefile.in
@@ -55,16 +55,18 @@ subdir = src/firewall-manager
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/compiler_warnings.m4 \
-	$(top_srcdir)/m4/gettext.m4 $(top_srcdir)/m4/gtk-doc.m4 \
-	$(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/intlmacosx.m4 \
-	$(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/introspection.m4 \
-	$(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \
-	$(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/libnl-check.m4 \
-	$(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \
-	$(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
-	$(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/nls.m4 \
-	$(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/progtest.m4 \
-	$(top_srcdir)/m4/vapigen.m4 $(top_srcdir)/configure.ac
+	$(top_srcdir)/m4/gettext.m4 \
+	$(top_srcdir)/m4/gnome-code-coverage.m4 \
+	$(top_srcdir)/m4/gtk-doc.m4 $(top_srcdir)/m4/iconv.m4 \
+	$(top_srcdir)/m4/intlmacosx.m4 $(top_srcdir)/m4/intltool.m4 \
+	$(top_srcdir)/m4/introspection.m4 $(top_srcdir)/m4/lib-ld.m4 \
+	$(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \
+	$(top_srcdir)/m4/libnl-check.m4 $(top_srcdir)/m4/libtool.m4 \
+	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
+	$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
+	$(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/po.m4 \
+	$(top_srcdir)/m4/progtest.m4 $(top_srcdir)/m4/vapigen.m4 \
+	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(install_sh) -d
@@ -130,6 +132,10 @@ AWK = @AWK@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
+CKDB_PATH = @CKDB_PATH@
+CODE_COVERAGE_CFLAGS = @CODE_COVERAGE_CFLAGS@
+CODE_COVERAGE_ENABLED = @CODE_COVERAGE_ENABLED@
+CODE_COVERAGE_LDFLAGS = @CODE_COVERAGE_LDFLAGS@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CXX = @CXX@
@@ -144,9 +150,7 @@ DBUS_SYS_DIR = @DBUS_SYS_DIR@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
 DHCLIENT_PATH = @DHCLIENT_PATH@
-DHCLIENT_VERSION = @DHCLIENT_VERSION@
 DHCPCD_PATH = @DHCPCD_PATH@
-DISABLE_DEPRECATED = @DISABLE_DEPRECATED@
 DLLTOOL = @DLLTOOL@
 DSYMUTIL = @DSYMUTIL@
 DUMPBIN = @DUMPBIN@
@@ -156,17 +160,14 @@ ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
 FGREP = @FGREP@
+GENHTML = @GENHTML@
 GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
 GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
-GIO_CFLAGS = @GIO_CFLAGS@
-GIO_LIBS = @GIO_LIBS@
 GLIB_CFLAGS = @GLIB_CFLAGS@
 GLIB_GENMARSHAL = @GLIB_GENMARSHAL@
 GLIB_LIBS = @GLIB_LIBS@
 GLIB_MAKEFILE = @GLIB_MAKEFILE@
 GLIB_MKENUMS = @GLIB_MKENUMS@
-GMODULE_CFLAGS = @GMODULE_CFLAGS@
-GMODULE_LIBS = @GMODULE_LIBS@
 GMSGFMT = @GMSGFMT@
 GMSGFMT_015 = @GMSGFMT_015@
 GNUTLS_CFLAGS = @GNUTLS_CFLAGS@
@@ -207,6 +208,7 @@ IPTABLES_PATH = @IPTABLES_PATH@
 IWMX_SDK_CFLAGS = @IWMX_SDK_CFLAGS@
 IWMX_SDK_LIBS = @IWMX_SDK_LIBS@
 KERNEL_FIRMWARE_DIR = @KERNEL_FIRMWARE_DIR@
+LCOV = @LCOV@
 LD = @LD@
 LDFLAGS = @LDFLAGS@
 LIBDL = @LIBDL@
@@ -223,11 +225,7 @@ LIBNL2_LIBS = @LIBNL2_LIBS@
 LIBNL3_CFLAGS = @LIBNL3_CFLAGS@
 LIBNL3_LIBS = @LIBNL3_LIBS@
 LIBNL_CFLAGS = @LIBNL_CFLAGS@
-LIBNL_GENL3_CFLAGS = @LIBNL_GENL3_CFLAGS@
-LIBNL_GENL3_LIBS = @LIBNL_GENL3_LIBS@
 LIBNL_LIBS = @LIBNL_LIBS@
-LIBNL_ROUTE3_CFLAGS = @LIBNL_ROUTE3_CFLAGS@
-LIBNL_ROUTE3_LIBS = @LIBNL_ROUTE3_LIBS@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
 LIBSOUP_CFLAGS = @LIBSOUP_CFLAGS@
@@ -242,6 +240,8 @@ MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MANIFEST_TOOL = @MANIFEST_TOOL@
 MKDIR_P = @MKDIR_P@
+MM_GLIB_CFLAGS = @MM_GLIB_CFLAGS@
+MM_GLIB_LIBS = @MM_GLIB_LIBS@
 MOC = @MOC@
 MSGFMT = @MSGFMT@
 MSGFMT_015 = @MSGFMT_015@
@@ -251,6 +251,7 @@ NMEDIT = @NMEDIT@
 NM_MAJOR_VERSION = @NM_MAJOR_VERSION@
 NM_MICRO_VERSION = @NM_MICRO_VERSION@
 NM_MINOR_VERSION = @NM_MINOR_VERSION@
+NM_MODIFY_SYSTEM_POLICY = @NM_MODIFY_SYSTEM_POLICY@
 NM_VERSION = @NM_VERSION@
 NSS_CFLAGS = @NSS_CFLAGS@
 NSS_LIBS = @NSS_LIBS@
@@ -277,13 +278,14 @@ PPPD_PLUGIN_DIR = @PPPD_PLUGIN_DIR@
 QT_CFLAGS = @QT_CFLAGS@
 QT_LIBS = @QT_LIBS@
 RANLIB = @RANLIB@
-RESOLVCONF_PATH = @RESOLVCONF_PATH@
 SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
-SYSTEMD_CFLAGS = @SYSTEMD_CFLAGS@
-SYSTEMD_LIBS = @SYSTEMD_LIBS@
+SYSTEMD_INHIBIT_CFLAGS = @SYSTEMD_INHIBIT_CFLAGS@
+SYSTEMD_INHIBIT_LIBS = @SYSTEMD_INHIBIT_LIBS@
+SYSTEMD_LOGIN_CFLAGS = @SYSTEMD_LOGIN_CFLAGS@
+SYSTEMD_LOGIN_LIBS = @SYSTEMD_LOGIN_LIBS@
 SYSTEM_CA_PATH = @SYSTEM_CA_PATH@
 UDEV_BASE_DIR = @UDEV_BASE_DIR@
 USE_NLS = @USE_NLS@
@@ -338,6 +340,11 @@ localedir = @localedir@
 localstatedir = @localstatedir@
 mandir = @mandir@
 mkdir_p = @mkdir_p@
+nmbinary = @nmbinary@
+nmconfdir = @nmconfdir@
+nmdatadir = @nmdatadir@
+nmrundir = @nmrundir@
+nmstatedir = @nmstatedir@
 oldincludedir = @oldincludedir@
 pdfdir = @pdfdir@
 prefix = @prefix@
@@ -352,6 +359,10 @@ target_alias = @target_alias@
 top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
+with_dhclient = @with_dhclient@
+with_dhcpcd = @with_dhcpcd@
+with_netconfig = @with_netconfig@
+with_resolvconf = @with_resolvconf@
 INCLUDES = \
 	-I${top_srcdir}/src \
 	-I${top_srcdir}/src/logging \
@@ -429,25 +440,22 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libfirewall_manager_la-nm-firewall-manager.Plo@am__quote@
 
 .c.o:
-@am__fastdepCC_TRUE@	$(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\
-@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
-@am__fastdepCC_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.Po
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $<
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c $<
 
 .c.obj:
-@am__fastdepCC_TRUE@	$(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.obj$$||'`;\
-@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ `$(CYGPATH_W) '$<'` &&\
-@am__fastdepCC_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.Po
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c `$(CYGPATH_W) '$<'`
 
 .c.lo:
-@am__fastdepCC_TRUE@	$(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.lo$$||'`;\
-@am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
-@am__fastdepCC_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.Plo
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $<
diff --git a/src/generated/Makefile.am b/src/generated/Makefile.am
index 252973cd..307766e1 100644
--- a/src/generated/Makefile.am
+++ b/src/generated/Makefile.am
@@ -16,7 +16,6 @@ nm_daemon_all_sources = \
 	$(top_srcdir)/src/dhcp-manager/*.[ch] \
 	$(top_srcdir)/src/ip6-manager/*.[ch] \
 	$(top_srcdir)/src/supplicant-manager/*.[ch] \
-	$(top_srcdir)/src/backends/*.[ch] \
 	$(top_srcdir)/src/ppp-manager/*.[ch] \
 	$(top_srcdir)/src/dnsmasq-manager/*.[ch] \
 	$(top_srcdir)/src/modem-manager/*.[ch] \
@@ -28,9 +27,21 @@ if WITH_WIMAX
 nm_daemon_all_sources += $(top_srcdir)/src/wimax/*.[ch]
 endif
 
-nm_daemon_sources = \
+nm_daemon_sources_no_bindings = \
 	$(filter-out %-glue.h %-bindings.h, $(wildcard $(nm_daemon_all_sources)))
 
+if WITH_MODEM_MANAGER_1
+# We filter out this file, which doesn't have any enum, and which clashes
+# with ModemManager1-defined symbols
+nm_daemon_sources = \
+	$(filter-out $(top_srcdir)/src/modem-manager/nm-modem-types.h, $(wildcard $(nm_daemon_sources_no_bindings)))
+else
+# Don't include ModemManager1-specific headers if we're not compiling with
+# ModemManager1 support.
+nm_daemon_sources = \
+	$(filter-out $(top_srcdir)/src/modem-manager/nm-modem-broadband.h, $(wildcard $(nm_daemon_sources_no_bindings)))
+endif
+
 GLIB_GENERATED = nm-enum-types.h nm-enum-types.c
 nm_enum_types_sources = $(nm_daemon_sources)
 GLIB_MKENUMS_H_FLAGS = --identifier-prefix NM
@@ -49,7 +60,6 @@ INCLUDES = \
 	-I${top_srcdir}/src/dhcp-manager \
 	-I${top_srcdir}/src/ip6-manager \
 	-I${top_srcdir}/src/supplicant-manager \
-	-I${top_srcdir}/src/backends \
 	-I${top_srcdir}/src/ppp-manager \
 	-I${top_srcdir}/src/dnsmasq-manager \
 	-I${top_srcdir}/src/modem-manager \
@@ -68,11 +78,14 @@ libnm_generated_la_CPPFLAGS = \
 	$(GLIB_CFLAGS) \
 	$(GUDEV_CFLAGS) \
 	$(LIBNL_CFLAGS) \
-	$(GMODULE_CFLAGS) \
 	$(POLKIT_CFLAGS) \
-	$(SYSTEMD_CFLAGS) \
+	$(SYSTEMD_LOGIN_CFLAGS) \
 	$(IWMX_SDK_CFLAGS)
 
+if WITH_MODEM_MANAGER_1
+	libnm_generated_la_CPPFLAGS += $(MM_GLIB_CFLAGS)
+endif
+
 libnm_generated_la_LIBADD = \
 	$(GLIB_LIBS)
 
diff --git a/src/generated/Makefile.in b/src/generated/Makefile.in
index a38efc02..7d55789b 100644
--- a/src/generated/Makefile.in
+++ b/src/generated/Makefile.in
@@ -57,16 +57,18 @@ subdir = src/generated
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/compiler_warnings.m4 \
-	$(top_srcdir)/m4/gettext.m4 $(top_srcdir)/m4/gtk-doc.m4 \
-	$(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/intlmacosx.m4 \
-	$(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/introspection.m4 \
-	$(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \
-	$(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/libnl-check.m4 \
-	$(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \
-	$(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
-	$(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/nls.m4 \
-	$(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/progtest.m4 \
-	$(top_srcdir)/m4/vapigen.m4 $(top_srcdir)/configure.ac
+	$(top_srcdir)/m4/gettext.m4 \
+	$(top_srcdir)/m4/gnome-code-coverage.m4 \
+	$(top_srcdir)/m4/gtk-doc.m4 $(top_srcdir)/m4/iconv.m4 \
+	$(top_srcdir)/m4/intlmacosx.m4 $(top_srcdir)/m4/intltool.m4 \
+	$(top_srcdir)/m4/introspection.m4 $(top_srcdir)/m4/lib-ld.m4 \
+	$(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \
+	$(top_srcdir)/m4/libnl-check.m4 $(top_srcdir)/m4/libtool.m4 \
+	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
+	$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
+	$(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/po.m4 \
+	$(top_srcdir)/m4/progtest.m4 $(top_srcdir)/m4/vapigen.m4 \
+	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(install_sh) -d
@@ -130,6 +132,10 @@ AWK = @AWK@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
+CKDB_PATH = @CKDB_PATH@
+CODE_COVERAGE_CFLAGS = @CODE_COVERAGE_CFLAGS@
+CODE_COVERAGE_ENABLED = @CODE_COVERAGE_ENABLED@
+CODE_COVERAGE_LDFLAGS = @CODE_COVERAGE_LDFLAGS@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CXX = @CXX@
@@ -144,9 +150,7 @@ DBUS_SYS_DIR = @DBUS_SYS_DIR@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
 DHCLIENT_PATH = @DHCLIENT_PATH@
-DHCLIENT_VERSION = @DHCLIENT_VERSION@
 DHCPCD_PATH = @DHCPCD_PATH@
-DISABLE_DEPRECATED = @DISABLE_DEPRECATED@
 DLLTOOL = @DLLTOOL@
 DSYMUTIL = @DSYMUTIL@
 DUMPBIN = @DUMPBIN@
@@ -156,17 +160,14 @@ ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
 FGREP = @FGREP@
+GENHTML = @GENHTML@
 GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
 GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
-GIO_CFLAGS = @GIO_CFLAGS@
-GIO_LIBS = @GIO_LIBS@
 GLIB_CFLAGS = @GLIB_CFLAGS@
 GLIB_GENMARSHAL = @GLIB_GENMARSHAL@
 GLIB_LIBS = @GLIB_LIBS@
 GLIB_MAKEFILE = @GLIB_MAKEFILE@
 GLIB_MKENUMS = @GLIB_MKENUMS@
-GMODULE_CFLAGS = @GMODULE_CFLAGS@
-GMODULE_LIBS = @GMODULE_LIBS@
 GMSGFMT = @GMSGFMT@
 GMSGFMT_015 = @GMSGFMT_015@
 GNUTLS_CFLAGS = @GNUTLS_CFLAGS@
@@ -207,6 +208,7 @@ IPTABLES_PATH = @IPTABLES_PATH@
 IWMX_SDK_CFLAGS = @IWMX_SDK_CFLAGS@
 IWMX_SDK_LIBS = @IWMX_SDK_LIBS@
 KERNEL_FIRMWARE_DIR = @KERNEL_FIRMWARE_DIR@
+LCOV = @LCOV@
 LD = @LD@
 LDFLAGS = @LDFLAGS@
 LIBDL = @LIBDL@
@@ -223,11 +225,7 @@ LIBNL2_LIBS = @LIBNL2_LIBS@
 LIBNL3_CFLAGS = @LIBNL3_CFLAGS@
 LIBNL3_LIBS = @LIBNL3_LIBS@
 LIBNL_CFLAGS = @LIBNL_CFLAGS@
-LIBNL_GENL3_CFLAGS = @LIBNL_GENL3_CFLAGS@
-LIBNL_GENL3_LIBS = @LIBNL_GENL3_LIBS@
 LIBNL_LIBS = @LIBNL_LIBS@
-LIBNL_ROUTE3_CFLAGS = @LIBNL_ROUTE3_CFLAGS@
-LIBNL_ROUTE3_LIBS = @LIBNL_ROUTE3_LIBS@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
 LIBSOUP_CFLAGS = @LIBSOUP_CFLAGS@
@@ -242,6 +240,8 @@ MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MANIFEST_TOOL = @MANIFEST_TOOL@
 MKDIR_P = @MKDIR_P@
+MM_GLIB_CFLAGS = @MM_GLIB_CFLAGS@
+MM_GLIB_LIBS = @MM_GLIB_LIBS@
 MOC = @MOC@
 MSGFMT = @MSGFMT@
 MSGFMT_015 = @MSGFMT_015@
@@ -251,6 +251,7 @@ NMEDIT = @NMEDIT@
 NM_MAJOR_VERSION = @NM_MAJOR_VERSION@
 NM_MICRO_VERSION = @NM_MICRO_VERSION@
 NM_MINOR_VERSION = @NM_MINOR_VERSION@
+NM_MODIFY_SYSTEM_POLICY = @NM_MODIFY_SYSTEM_POLICY@
 NM_VERSION = @NM_VERSION@
 NSS_CFLAGS = @NSS_CFLAGS@
 NSS_LIBS = @NSS_LIBS@
@@ -277,13 +278,14 @@ PPPD_PLUGIN_DIR = @PPPD_PLUGIN_DIR@
 QT_CFLAGS = @QT_CFLAGS@
 QT_LIBS = @QT_LIBS@
 RANLIB = @RANLIB@
-RESOLVCONF_PATH = @RESOLVCONF_PATH@
 SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
-SYSTEMD_CFLAGS = @SYSTEMD_CFLAGS@
-SYSTEMD_LIBS = @SYSTEMD_LIBS@
+SYSTEMD_INHIBIT_CFLAGS = @SYSTEMD_INHIBIT_CFLAGS@
+SYSTEMD_INHIBIT_LIBS = @SYSTEMD_INHIBIT_LIBS@
+SYSTEMD_LOGIN_CFLAGS = @SYSTEMD_LOGIN_CFLAGS@
+SYSTEMD_LOGIN_LIBS = @SYSTEMD_LOGIN_LIBS@
 SYSTEM_CA_PATH = @SYSTEM_CA_PATH@
 UDEV_BASE_DIR = @UDEV_BASE_DIR@
 USE_NLS = @USE_NLS@
@@ -338,6 +340,11 @@ localedir = @localedir@
 localstatedir = @localstatedir@
 mandir = @mandir@
 mkdir_p = @mkdir_p@
+nmbinary = @nmbinary@
+nmconfdir = @nmconfdir@
+nmdatadir = @nmdatadir@
+nmrundir = @nmrundir@
+nmstatedir = @nmstatedir@
 oldincludedir = @oldincludedir@
 pdfdir = @pdfdir@
 prefix = @prefix@
@@ -352,6 +359,10 @@ target_alias = @target_alias@
 top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
+with_dhclient = @with_dhclient@
+with_dhcpcd = @with_dhcpcd@
+with_netconfig = @with_netconfig@
+with_resolvconf = @with_resolvconf@
 noinst_LTLIBRARIES = libnm-generated.la
 libnm_generated_la_SOURCES = \
 	nm-enum-types.c \
@@ -366,16 +377,26 @@ nm_daemon_all_sources = $(top_srcdir)/src/*.[ch] \
 	$(top_srcdir)/src/dhcp-manager/*.[ch] \
 	$(top_srcdir)/src/ip6-manager/*.[ch] \
 	$(top_srcdir)/src/supplicant-manager/*.[ch] \
-	$(top_srcdir)/src/backends/*.[ch] \
 	$(top_srcdir)/src/ppp-manager/*.[ch] \
 	$(top_srcdir)/src/dnsmasq-manager/*.[ch] \
 	$(top_srcdir)/src/modem-manager/*.[ch] \
 	$(top_srcdir)/src/bluez-manager/*.[ch] \
 	$(top_srcdir)/src/firewall-manager/*.[ch] \
 	$(top_srcdir)/src/settings/*.[ch] $(am__append_1)
-nm_daemon_sources = \
+nm_daemon_sources_no_bindings = \
 	$(filter-out %-glue.h %-bindings.h, $(wildcard $(nm_daemon_all_sources)))
 
+# Don't include ModemManager1-specific headers if we're not compiling with
+# ModemManager1 support.
+@WITH_MODEM_MANAGER_1_FALSE@nm_daemon_sources = \
+@WITH_MODEM_MANAGER_1_FALSE@	$(filter-out $(top_srcdir)/src/modem-manager/nm-modem-broadband.h, $(wildcard $(nm_daemon_sources_no_bindings)))
+
+
+# We filter out this file, which doesn't have any enum, and which clashes
+# with ModemManager1-defined symbols
+@WITH_MODEM_MANAGER_1_TRUE@nm_daemon_sources = \
+@WITH_MODEM_MANAGER_1_TRUE@	$(filter-out $(top_srcdir)/src/modem-manager/nm-modem-types.h, $(wildcard $(nm_daemon_sources_no_bindings)))
+
 GLIB_GENERATED = nm-enum-types.h nm-enum-types.c nm-marshal.h \
 	nm-marshal.c
 nm_enum_types_sources = $(nm_daemon_sources)
@@ -389,7 +410,7 @@ INCLUDES = -I${top_srcdir}/include -I${top_builddir}/include \
 	-I${top_srcdir}/src/dhcp-manager \
 	-I${top_srcdir}/src/ip6-manager \
 	-I${top_srcdir}/src/supplicant-manager \
-	-I${top_srcdir}/src/backends -I${top_srcdir}/src/ppp-manager \
+	-I${top_srcdir}/src/ppp-manager \
 	-I${top_srcdir}/src/dnsmasq-manager \
 	-I${top_srcdir}/src/modem-manager \
 	-I$(top_srcdir)/src/bluez-manager \
@@ -401,9 +422,8 @@ libnm_generated_la_CPPFLAGS = \
 	$(GLIB_CFLAGS) \
 	$(GUDEV_CFLAGS) \
 	$(LIBNL_CFLAGS) \
-	$(GMODULE_CFLAGS) \
 	$(POLKIT_CFLAGS) \
-	$(SYSTEMD_CFLAGS) \
+	$(SYSTEMD_LOGIN_CFLAGS) \
 	$(IWMX_SDK_CFLAGS)
 
 libnm_generated_la_LIBADD = \
@@ -467,25 +487,22 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libnm_generated_la-nm-marshal.Plo@am__quote@
 
 .c.o:
-@am__fastdepCC_TRUE@	$(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\
-@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
-@am__fastdepCC_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.Po
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $<
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c $<
 
 .c.obj:
-@am__fastdepCC_TRUE@	$(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.obj$$||'`;\
-@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ `$(CYGPATH_W) '$<'` &&\
-@am__fastdepCC_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.Po
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c `$(CYGPATH_W) '$<'`
 
 .c.lo:
-@am__fastdepCC_TRUE@	$(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.lo$$||'`;\
-@am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
-@am__fastdepCC_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.Plo
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $<
@@ -717,6 +734,8 @@ uninstall-am:
 
 include $(GLIB_MAKEFILE)
 
+@WITH_MODEM_MANAGER_1_TRUE@	libnm_generated_la_CPPFLAGS += $(MM_GLIB_CFLAGS)
+
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
diff --git a/src/generated/nm-enum-types.c b/src/generated/nm-enum-types.c
index a7a6c9fa..6d09c50a 100644
--- a/src/generated/nm-enum-types.c
+++ b/src/generated/nm-enum-types.c
@@ -5,53 +5,56 @@
 
 #include "nm-enum-types.h"
 
+#include "nm-hostname-provider.h" 
+#include "nm-sleep-monitor.h" 
 #include "nm-device.h" 
-#include "NetworkManagerUtils.h" 
-#include "nm-system.h" 
+#include "nm-rfkill.h" 
+#include "nm-device-vlan.h" 
 #include "nm-device-factory.h" 
 #include "nm-active-connection.h" 
 #include "nm-wifi-ap.h" 
-#include "nm-device-ethernet.h" 
 #include "nm-device-bt.h" 
 #include "nm-call-store.h" 
-#include "nm-device-infiniband.h" 
 #include "nm-device-wifi.h" 
 #include "nm-dbus-manager.h" 
-#include "nm-device-wired.h" 
-#include "nm-device-private.h" 
+#include "nm-device-olpc-mesh.h" 
+#include "nm-device-bridge.h" 
 #include "nm-dhcp4-config.h" 
 #include "nm-dhcp6-config.h" 
-#include "nm-session-utils.h" 
 #include "nm-netlink-compat.h" 
 #include "nm-session-monitor.h" 
-#include "nm-ip4-config.h" 
+#include "nm-connection-provider.h" 
 #include "nm-device-bond.h" 
 #include "nm-wifi-ap-utils.h" 
-#include "nm-hostname-provider.h" 
 #include "nm-device-adsl.h" 
 #include "nm-policy-hosts.h" 
-#include "nm-rfkill.h" 
+#include "nm-dispatcher.h" 
 #include "nm-manager.h" 
 #include "nm-device-modem.h" 
+#include "nm-device-wired.h" 
 #include "nm-activation-request.h" 
+#include "nm-session-utils.h" 
 #include "nm-policy-hostname.h" 
-#include "nm-connection-provider.h" 
+#include "nm-device-infiniband.h" 
 #include "nm-properties-changed-signal.h" 
+#include "nm-types.h" 
 #include "nm-ip6-config.h" 
+#include "nm-device-private.h" 
 #include "nm-policy.h" 
 #include "nm-manager-auth.h" 
+#include "NetworkManagerUtils.h" 
 #include "nm-config.h" 
 #include "nm-netlink-utils.h" 
 #include "nm-netlink-monitor.h" 
 #include "nm-udev-manager.h" 
+#include "nm-system.h" 
 #include "nm-connectivity.h" 
-#include "nm-device-vlan.h" 
-#include "nm-device-olpc-mesh.h" 
+#include "nm-device-ethernet.h" 
+#include "nm-ip4-config.h" 
 #include "nm-logging.h" 
 #include "nm-dns-utils.h" 
 #include "nm-dns-plugin.h" 
 #include "nm-dns-manager.h" 
-#include "nm-dns-bind.h" 
 #include "nm-dns-dnsmasq.h" 
 #include "nm-vpn-connection.h" 
 #include "nm-vpn-manager.h" 
@@ -67,15 +70,14 @@
 #include "nm-supplicant-settings-verify.h" 
 #include "nm-supplicant-manager.h" 
 #include "nm-supplicant-interface.h" 
-#include "nm-backend.h" 
-#include "NetworkManagerGeneric.h" 
 #include "nm-ppp-status.h" 
 #include "nm-pppd-plugin.h" 
 #include "nm-ppp-manager.h" 
 #include "nm-dnsmasq-manager.h" 
 #include "nm-modem.h" 
+#include "nm-modem-generic.h" 
 #include "nm-modem-cdma.h" 
-#include "nm-modem-types.h" 
+#include "nm-modem-broadband.h" 
 #include "nm-modem-gsm.h" 
 #include "nm-modem-manager.h" 
 #include "nm-bluez-device.h" 
@@ -119,60 +121,82 @@ nm_device_error_get_type (void)
   return g_define_type_id__volatile;
 }
 GType
-nm_ethernet_error_get_type (void)
+nm_rf_kill_state_get_type (void)
 {
   static volatile gsize g_define_type_id__volatile = 0;
 
   if (g_once_init_enter (&g_define_type_id__volatile))
     {
       static const GEnumValue values[] = {
-        { NM_ETHERNET_ERROR_CONNECTION_NOT_WIRED, "NM_ETHERNET_ERROR_CONNECTION_NOT_WIRED", "ConnectionNotWired" },
-        { NM_ETHERNET_ERROR_CONNECTION_INVALID, "NM_ETHERNET_ERROR_CONNECTION_INVALID", "ConnectionInvalid" },
-        { NM_ETHERNET_ERROR_CONNECTION_INCOMPATIBLE, "NM_ETHERNET_ERROR_CONNECTION_INCOMPATIBLE", "ConnectionIncompatible" },
+        { RFKILL_UNBLOCKED, "RFKILL_UNBLOCKED", "unblocked" },
+        { RFKILL_SOFT_BLOCKED, "RFKILL_SOFT_BLOCKED", "soft-blocked" },
+        { RFKILL_HARD_BLOCKED, "RFKILL_HARD_BLOCKED", "hard-blocked" },
         { 0, NULL, NULL }
       };
       GType g_define_type_id =
-        g_enum_register_static (g_intern_static_string ("NMEthernetError"), values);
+        g_enum_register_static (g_intern_static_string ("RfKillState"), values);
       g_once_init_leave (&g_define_type_id__volatile, g_define_type_id);
     }
 
   return g_define_type_id__volatile;
 }
 GType
-nm_bt_error_get_type (void)
+nm_rf_kill_type_get_type (void)
 {
   static volatile gsize g_define_type_id__volatile = 0;
 
   if (g_once_init_enter (&g_define_type_id__volatile))
     {
       static const GEnumValue values[] = {
-        { NM_BT_ERROR_CONNECTION_NOT_BT, "NM_BT_ERROR_CONNECTION_NOT_BT", "ConnectionNotBt" },
-        { NM_BT_ERROR_CONNECTION_INVALID, "NM_BT_ERROR_CONNECTION_INVALID", "ConnectionInvalid" },
-        { NM_BT_ERROR_CONNECTION_INCOMPATIBLE, "NM_BT_ERROR_CONNECTION_INCOMPATIBLE", "ConnectionIncompatible" },
+        { RFKILL_TYPE_WLAN, "RFKILL_TYPE_WLAN", "wlan" },
+        { RFKILL_TYPE_WWAN, "RFKILL_TYPE_WWAN", "wwan" },
+        { RFKILL_TYPE_WIMAX, "RFKILL_TYPE_WIMAX", "wimax" },
+        { RFKILL_TYPE_UNKNOWN, "RFKILL_TYPE_UNKNOWN", "unknown" },
+        { RFKILL_TYPE_MAX, "RFKILL_TYPE_MAX", "max" },
         { 0, NULL, NULL }
       };
       GType g_define_type_id =
-        g_enum_register_static (g_intern_static_string ("NMBtError"), values);
+        g_enum_register_static (g_intern_static_string ("RfKillType"), values);
       g_once_init_leave (&g_define_type_id__volatile, g_define_type_id);
     }
 
   return g_define_type_id__volatile;
 }
 GType
-nm_infiniband_error_get_type (void)
+nm_vlan_error_get_type (void)
 {
   static volatile gsize g_define_type_id__volatile = 0;
 
   if (g_once_init_enter (&g_define_type_id__volatile))
     {
       static const GEnumValue values[] = {
-        { NM_INFINIBAND_ERROR_CONNECTION_NOT_INFINIBAND, "NM_INFINIBAND_ERROR_CONNECTION_NOT_INFINIBAND", "ConnectionNotInfiniband" },
-        { NM_INFINIBAND_ERROR_CONNECTION_INVALID, "NM_INFINIBAND_ERROR_CONNECTION_INVALID", "ConnectionInvalid" },
-        { NM_INFINIBAND_ERROR_CONNECTION_INCOMPATIBLE, "NM_INFINIBAND_ERROR_CONNECTION_INCOMPATIBLE", "ConnectionIncompatible" },
+        { NM_VLAN_ERROR_CONNECTION_NOT_VLAN, "NM_VLAN_ERROR_CONNECTION_NOT_VLAN", "ConnectionNotVlan" },
+        { NM_VLAN_ERROR_CONNECTION_INVALID, "NM_VLAN_ERROR_CONNECTION_INVALID", "ConnectionInvalid" },
+        { NM_VLAN_ERROR_CONNECTION_INCOMPATIBLE, "NM_VLAN_ERROR_CONNECTION_INCOMPATIBLE", "ConnectionIncompatible" },
         { 0, NULL, NULL }
       };
       GType g_define_type_id =
-        g_enum_register_static (g_intern_static_string ("NMInfinibandError"), values);
+        g_enum_register_static (g_intern_static_string ("NMVlanError"), values);
+      g_once_init_leave (&g_define_type_id__volatile, g_define_type_id);
+    }
+
+  return g_define_type_id__volatile;
+}
+GType
+nm_bt_error_get_type (void)
+{
+  static volatile gsize g_define_type_id__volatile = 0;
+
+  if (g_once_init_enter (&g_define_type_id__volatile))
+    {
+      static const GEnumValue values[] = {
+        { NM_BT_ERROR_CONNECTION_NOT_BT, "NM_BT_ERROR_CONNECTION_NOT_BT", "ConnectionNotBt" },
+        { NM_BT_ERROR_CONNECTION_INVALID, "NM_BT_ERROR_CONNECTION_INVALID", "ConnectionInvalid" },
+        { NM_BT_ERROR_CONNECTION_INCOMPATIBLE, "NM_BT_ERROR_CONNECTION_INCOMPATIBLE", "ConnectionIncompatible" },
+        { 0, NULL, NULL }
+      };
+      GType g_define_type_id =
+        g_enum_register_static (g_intern_static_string ("NMBtError"), values);
       g_once_init_leave (&g_define_type_id__volatile, g_define_type_id);
     }
 
@@ -191,6 +215,7 @@ nm_wifi_error_get_type (void)
         { NM_WIFI_ERROR_CONNECTION_INCOMPATIBLE, "NM_WIFI_ERROR_CONNECTION_INCOMPATIBLE", "ConnectionIncompatible" },
         { NM_WIFI_ERROR_ACCESS_POINT_NOT_FOUND, "NM_WIFI_ERROR_ACCESS_POINT_NOT_FOUND", "AccessPointNotFound" },
         { NM_WIFI_ERROR_SCAN_NOT_ALLOWED, "NM_WIFI_ERROR_SCAN_NOT_ALLOWED", "ScanNotAllowed" },
+        { NM_WIFI_ERROR_AP_MODE_UNSUPPORTED, "NM_WIFI_ERROR_AP_MODE_UNSUPPORTED", "ApModeUnsupported" },
         { 0, NULL, NULL }
       };
       GType g_define_type_id =
@@ -201,51 +226,40 @@ nm_wifi_error_get_type (void)
   return g_define_type_id__volatile;
 }
 GType
-nm_session_monitor_error_get_type (void)
+nm_olpc_mesh_error_get_type (void)
 {
   static volatile gsize g_define_type_id__volatile = 0;
 
   if (g_once_init_enter (&g_define_type_id__volatile))
     {
       static const GEnumValue values[] = {
-        { NM_SESSION_MONITOR_ERROR_IO_ERROR, "NM_SESSION_MONITOR_ERROR_IO_ERROR", "IOError" },
-        { NM_SESSION_MONITOR_ERROR_MALFORMED_DATABASE, "NM_SESSION_MONITOR_ERROR_MALFORMED_DATABASE", "MalformedDatabase" },
-        { NM_SESSION_MONITOR_ERROR_UNKNOWN_USER, "NM_SESSION_MONITOR_ERROR_UNKNOWN_USER", "UnknownUser" },
-        { NM_SESSION_MONITOR_ERROR_NO_DATABASE, "NM_SESSION_MONITOR_ERROR_NO_DATABASE", "NoDatabase" },
+        { NM_OLPC_MESH_ERROR_CONNECTION_NOT_MESH, "NM_OLPC_MESH_ERROR_CONNECTION_NOT_MESH", "ConnectionNotMesh" },
+        { NM_OLPC_MESH_ERROR_CONNECTION_INVALID, "NM_OLPC_MESH_ERROR_CONNECTION_INVALID", "ConnectionInvalid" },
+        { NM_OLPC_MESH_ERROR_CONNECTION_INCOMPATIBLE, "NM_OLPC_MESH_ERROR_CONNECTION_INCOMPATIBLE", "ConnectionIncompatible" },
         { 0, NULL, NULL }
       };
       GType g_define_type_id =
-        g_enum_register_static (g_intern_static_string ("NMSessionMonitorError"), values);
+        g_enum_register_static (g_intern_static_string ("NMOlpcMeshError"), values);
       g_once_init_leave (&g_define_type_id__volatile, g_define_type_id);
     }
 
   return g_define_type_id__volatile;
 }
 GType
-nm_ip4_config_compare_flags_get_type (void)
+nm_bridge_error_get_type (void)
 {
   static volatile gsize g_define_type_id__volatile = 0;
 
   if (g_once_init_enter (&g_define_type_id__volatile))
     {
       static const GEnumValue values[] = {
-        { NM_IP4_COMPARE_FLAG_NONE, "NM_IP4_COMPARE_FLAG_NONE", "none" },
-        { NM_IP4_COMPARE_FLAG_ADDRESSES, "NM_IP4_COMPARE_FLAG_ADDRESSES", "addresses" },
-        { NM_IP4_COMPARE_FLAG_PTP_ADDRESS, "NM_IP4_COMPARE_FLAG_PTP_ADDRESS", "ptp-address" },
-        { NM_IP4_COMPARE_FLAG_NAMESERVERS, "NM_IP4_COMPARE_FLAG_NAMESERVERS", "nameservers" },
-        { NM_IP4_COMPARE_FLAG_ROUTES, "NM_IP4_COMPARE_FLAG_ROUTES", "routes" },
-        { NM_IP4_COMPARE_FLAG_DOMAINS, "NM_IP4_COMPARE_FLAG_DOMAINS", "domains" },
-        { NM_IP4_COMPARE_FLAG_SEARCHES, "NM_IP4_COMPARE_FLAG_SEARCHES", "searches" },
-        { NM_IP4_COMPARE_FLAG_MTU, "NM_IP4_COMPARE_FLAG_MTU", "mtu" },
-        { NM_IP4_COMPARE_FLAG_MSS, "NM_IP4_COMPARE_FLAG_MSS", "mss" },
-        { NM_IP4_COMPARE_FLAG_WINS_SERVERS, "NM_IP4_COMPARE_FLAG_WINS_SERVERS", "wins-servers" },
-        { NM_IP4_COMPARE_FLAG_NIS_SERVERS, "NM_IP4_COMPARE_FLAG_NIS_SERVERS", "nis-servers" },
-        { NM_IP4_COMPARE_FLAG_NIS_DOMAIN, "NM_IP4_COMPARE_FLAG_NIS_DOMAIN", "nis-domain" },
-        { NM_IP4_COMPARE_FLAG_ALL, "NM_IP4_COMPARE_FLAG_ALL", "all" },
+        { NM_BRIDGE_ERROR_CONNECTION_NOT_BRIDGE, "NM_BRIDGE_ERROR_CONNECTION_NOT_BRIDGE", "ConnectionNotBridge" },
+        { NM_BRIDGE_ERROR_CONNECTION_INVALID, "NM_BRIDGE_ERROR_CONNECTION_INVALID", "ConnectionInvalid" },
+        { NM_BRIDGE_ERROR_CONNECTION_INCOMPATIBLE, "NM_BRIDGE_ERROR_CONNECTION_INCOMPATIBLE", "ConnectionIncompatible" },
         { 0, NULL, NULL }
       };
       GType g_define_type_id =
-        g_enum_register_static (g_intern_static_string ("NMIP4ConfigCompareFlags"), values);
+        g_enum_register_static (g_intern_static_string ("NMBridgeError"), values);
       g_once_init_leave (&g_define_type_id__volatile, g_define_type_id);
     }
 
@@ -292,90 +306,94 @@ nm_adsl_error_get_type (void)
   return g_define_type_id__volatile;
 }
 GType
-nm_rf_kill_state_get_type (void)
+nm_dispatcher_action_get_type (void)
 {
   static volatile gsize g_define_type_id__volatile = 0;
 
   if (g_once_init_enter (&g_define_type_id__volatile))
     {
       static const GEnumValue values[] = {
-        { RFKILL_UNBLOCKED, "RFKILL_UNBLOCKED", "unblocked" },
-        { RFKILL_SOFT_BLOCKED, "RFKILL_SOFT_BLOCKED", "soft-blocked" },
-        { RFKILL_HARD_BLOCKED, "RFKILL_HARD_BLOCKED", "hard-blocked" },
+        { DISPATCHER_ACTION_HOSTNAME, "DISPATCHER_ACTION_HOSTNAME", "hostname" },
+        { DISPATCHER_ACTION_UP, "DISPATCHER_ACTION_UP", "up" },
+        { DISPATCHER_ACTION_PRE_DOWN, "DISPATCHER_ACTION_PRE_DOWN", "pre-down" },
+        { DISPATCHER_ACTION_DOWN, "DISPATCHER_ACTION_DOWN", "down" },
+        { DISPATCHER_ACTION_VPN_UP, "DISPATCHER_ACTION_VPN_UP", "vpn-up" },
+        { DISPATCHER_ACTION_VPN_PRE_DOWN, "DISPATCHER_ACTION_VPN_PRE_DOWN", "vpn-pre-down" },
+        { DISPATCHER_ACTION_VPN_DOWN, "DISPATCHER_ACTION_VPN_DOWN", "vpn-down" },
+        { DISPATCHER_ACTION_DHCP4_CHANGE, "DISPATCHER_ACTION_DHCP4_CHANGE", "dhcp4-change" },
+        { DISPATCHER_ACTION_DHCP6_CHANGE, "DISPATCHER_ACTION_DHCP6_CHANGE", "dhcp6-change" },
         { 0, NULL, NULL }
       };
       GType g_define_type_id =
-        g_enum_register_static (g_intern_static_string ("RfKillState"), values);
+        g_enum_register_static (g_intern_static_string ("DispatcherAction"), values);
       g_once_init_leave (&g_define_type_id__volatile, g_define_type_id);
     }
 
   return g_define_type_id__volatile;
 }
 GType
-nm_rf_kill_type_get_type (void)
+nm_manager_error_get_type (void)
 {
   static volatile gsize g_define_type_id__volatile = 0;
 
   if (g_once_init_enter (&g_define_type_id__volatile))
     {
       static const GEnumValue values[] = {
-        { RFKILL_TYPE_WLAN, "RFKILL_TYPE_WLAN", "wlan" },
-        { RFKILL_TYPE_WWAN, "RFKILL_TYPE_WWAN", "wwan" },
-        { RFKILL_TYPE_WIMAX, "RFKILL_TYPE_WIMAX", "wimax" },
-        { RFKILL_TYPE_UNKNOWN, "RFKILL_TYPE_UNKNOWN", "unknown" },
-        { RFKILL_TYPE_MAX, "RFKILL_TYPE_MAX", "max" },
+        { NM_MANAGER_ERROR_UNKNOWN_CONNECTION, "NM_MANAGER_ERROR_UNKNOWN_CONNECTION", "UnknownConnection" },
+        { NM_MANAGER_ERROR_UNKNOWN_DEVICE, "NM_MANAGER_ERROR_UNKNOWN_DEVICE", "UnknownDevice" },
+        { NM_MANAGER_ERROR_UNMANAGED_DEVICE, "NM_MANAGER_ERROR_UNMANAGED_DEVICE", "UnmanagedDevice" },
+        { NM_MANAGER_ERROR_SYSTEM_CONNECTION, "NM_MANAGER_ERROR_SYSTEM_CONNECTION", "SystemConnection" },
+        { NM_MANAGER_ERROR_PERMISSION_DENIED, "NM_MANAGER_ERROR_PERMISSION_DENIED", "PermissionDenied" },
+        { NM_MANAGER_ERROR_CONNECTION_NOT_ACTIVE, "NM_MANAGER_ERROR_CONNECTION_NOT_ACTIVE", "ConnectionNotActive" },
+        { NM_MANAGER_ERROR_ALREADY_ASLEEP_OR_AWAKE, "NM_MANAGER_ERROR_ALREADY_ASLEEP_OR_AWAKE", "AlreadyAsleepOrAwake" },
+        { NM_MANAGER_ERROR_ALREADY_ENABLED_OR_DISABLED, "NM_MANAGER_ERROR_ALREADY_ENABLED_OR_DISABLED", "AlreadyEnabledOrDisabled" },
+        { NM_MANAGER_ERROR_UNSUPPORTED_CONNECTION_TYPE, "NM_MANAGER_ERROR_UNSUPPORTED_CONNECTION_TYPE", "UnsupportedConnectionType" },
+        { NM_MANAGER_ERROR_DEPENDENCY_FAILED, "NM_MANAGER_ERROR_DEPENDENCY_FAILED", "DependencyFailed" },
         { 0, NULL, NULL }
       };
       GType g_define_type_id =
-        g_enum_register_static (g_intern_static_string ("RfKillType"), values);
+        g_enum_register_static (g_intern_static_string ("NMManagerError"), values);
       g_once_init_leave (&g_define_type_id__volatile, g_define_type_id);
     }
 
   return g_define_type_id__volatile;
 }
 GType
-nm_manager_error_get_type (void)
+nm_session_monitor_error_get_type (void)
 {
   static volatile gsize g_define_type_id__volatile = 0;
 
   if (g_once_init_enter (&g_define_type_id__volatile))
     {
       static const GEnumValue values[] = {
-        { NM_MANAGER_ERROR_UNKNOWN_CONNECTION, "NM_MANAGER_ERROR_UNKNOWN_CONNECTION", "UnknownConnection" },
-        { NM_MANAGER_ERROR_UNKNOWN_DEVICE, "NM_MANAGER_ERROR_UNKNOWN_DEVICE", "UnknownDevice" },
-        { NM_MANAGER_ERROR_UNMANAGED_DEVICE, "NM_MANAGER_ERROR_UNMANAGED_DEVICE", "UnmanagedDevice" },
-        { NM_MANAGER_ERROR_SYSTEM_CONNECTION, "NM_MANAGER_ERROR_SYSTEM_CONNECTION", "SystemConnection" },
-        { NM_MANAGER_ERROR_PERMISSION_DENIED, "NM_MANAGER_ERROR_PERMISSION_DENIED", "PermissionDenied" },
-        { NM_MANAGER_ERROR_CONNECTION_NOT_ACTIVE, "NM_MANAGER_ERROR_CONNECTION_NOT_ACTIVE", "ConnectionNotActive" },
-        { NM_MANAGER_ERROR_ALREADY_ASLEEP_OR_AWAKE, "NM_MANAGER_ERROR_ALREADY_ASLEEP_OR_AWAKE", "AlreadyAsleepOrAwake" },
-        { NM_MANAGER_ERROR_ALREADY_ENABLED_OR_DISABLED, "NM_MANAGER_ERROR_ALREADY_ENABLED_OR_DISABLED", "AlreadyEnabledOrDisabled" },
-        { NM_MANAGER_ERROR_UNSUPPORTED_CONNECTION_TYPE, "NM_MANAGER_ERROR_UNSUPPORTED_CONNECTION_TYPE", "UnsupportedConnectionType" },
-        { NM_MANAGER_ERROR_DEPENDENCY_FAILED, "NM_MANAGER_ERROR_DEPENDENCY_FAILED", "DependencyFailed" },
+        { NM_SESSION_MONITOR_ERROR_IO_ERROR, "NM_SESSION_MONITOR_ERROR_IO_ERROR", "IOError" },
+        { NM_SESSION_MONITOR_ERROR_MALFORMED_DATABASE, "NM_SESSION_MONITOR_ERROR_MALFORMED_DATABASE", "MalformedDatabase" },
+        { NM_SESSION_MONITOR_ERROR_UNKNOWN_USER, "NM_SESSION_MONITOR_ERROR_UNKNOWN_USER", "UnknownUser" },
+        { NM_SESSION_MONITOR_ERROR_NO_DATABASE, "NM_SESSION_MONITOR_ERROR_NO_DATABASE", "NoDatabase" },
         { 0, NULL, NULL }
       };
       GType g_define_type_id =
-        g_enum_register_static (g_intern_static_string ("NMManagerError"), values);
+        g_enum_register_static (g_intern_static_string ("NMSessionMonitorError"), values);
       g_once_init_leave (&g_define_type_id__volatile, g_define_type_id);
     }
 
   return g_define_type_id__volatile;
 }
 GType
-nm_act_request_dependency_result_get_type (void)
+nm_infiniband_error_get_type (void)
 {
   static volatile gsize g_define_type_id__volatile = 0;
 
   if (g_once_init_enter (&g_define_type_id__volatile))
     {
       static const GEnumValue values[] = {
-        { NM_ACT_REQUEST_DEP_RESULT_UNKNOWN, "NM_ACT_REQUEST_DEP_RESULT_UNKNOWN", "unknown" },
-        { NM_ACT_REQUEST_DEP_RESULT_WAIT, "NM_ACT_REQUEST_DEP_RESULT_WAIT", "wait" },
-        { NM_ACT_REQUEST_DEP_RESULT_READY, "NM_ACT_REQUEST_DEP_RESULT_READY", "ready" },
-        { NM_ACT_REQUEST_DEP_RESULT_FAILED, "NM_ACT_REQUEST_DEP_RESULT_FAILED", "failed" },
+        { NM_INFINIBAND_ERROR_CONNECTION_NOT_INFINIBAND, "NM_INFINIBAND_ERROR_CONNECTION_NOT_INFINIBAND", "ConnectionNotInfiniband" },
+        { NM_INFINIBAND_ERROR_CONNECTION_INVALID, "NM_INFINIBAND_ERROR_CONNECTION_INVALID", "ConnectionInvalid" },
+        { NM_INFINIBAND_ERROR_CONNECTION_INCOMPATIBLE, "NM_INFINIBAND_ERROR_CONNECTION_INCOMPATIBLE", "ConnectionIncompatible" },
         { 0, NULL, NULL }
       };
       GType g_define_type_id =
-        g_enum_register_static (g_intern_static_string ("NMActRequestDependencyResult"), values);
+        g_enum_register_static (g_intern_static_string ("NMInfinibandError"), values);
       g_once_init_leave (&g_define_type_id__volatile, g_define_type_id);
     }
 
@@ -495,40 +513,50 @@ nm_netlink_monitor_error_get_type (void)
   return g_define_type_id__volatile;
 }
 GType
-nm_vlan_error_get_type (void)
+nm_ethernet_error_get_type (void)
 {
   static volatile gsize g_define_type_id__volatile = 0;
 
   if (g_once_init_enter (&g_define_type_id__volatile))
     {
       static const GEnumValue values[] = {
-        { NM_VLAN_ERROR_CONNECTION_NOT_VLAN, "NM_VLAN_ERROR_CONNECTION_NOT_VLAN", "ConnectionNotVlan" },
-        { NM_VLAN_ERROR_CONNECTION_INVALID, "NM_VLAN_ERROR_CONNECTION_INVALID", "ConnectionInvalid" },
-        { NM_VLAN_ERROR_CONNECTION_INCOMPATIBLE, "NM_VLAN_ERROR_CONNECTION_INCOMPATIBLE", "ConnectionIncompatible" },
+        { NM_ETHERNET_ERROR_CONNECTION_NOT_WIRED, "NM_ETHERNET_ERROR_CONNECTION_NOT_WIRED", "ConnectionNotWired" },
+        { NM_ETHERNET_ERROR_CONNECTION_INVALID, "NM_ETHERNET_ERROR_CONNECTION_INVALID", "ConnectionInvalid" },
+        { NM_ETHERNET_ERROR_CONNECTION_INCOMPATIBLE, "NM_ETHERNET_ERROR_CONNECTION_INCOMPATIBLE", "ConnectionIncompatible" },
         { 0, NULL, NULL }
       };
       GType g_define_type_id =
-        g_enum_register_static (g_intern_static_string ("NMVlanError"), values);
+        g_enum_register_static (g_intern_static_string ("NMEthernetError"), values);
       g_once_init_leave (&g_define_type_id__volatile, g_define_type_id);
     }
 
   return g_define_type_id__volatile;
 }
 GType
-nm_olpc_mesh_error_get_type (void)
+nm_ip4_config_compare_flags_get_type (void)
 {
   static volatile gsize g_define_type_id__volatile = 0;
 
   if (g_once_init_enter (&g_define_type_id__volatile))
     {
       static const GEnumValue values[] = {
-        { NM_OLPC_MESH_ERROR_CONNECTION_NOT_MESH, "NM_OLPC_MESH_ERROR_CONNECTION_NOT_MESH", "ConnectionNotMesh" },
-        { NM_OLPC_MESH_ERROR_CONNECTION_INVALID, "NM_OLPC_MESH_ERROR_CONNECTION_INVALID", "ConnectionInvalid" },
-        { NM_OLPC_MESH_ERROR_CONNECTION_INCOMPATIBLE, "NM_OLPC_MESH_ERROR_CONNECTION_INCOMPATIBLE", "ConnectionIncompatible" },
+        { NM_IP4_COMPARE_FLAG_NONE, "NM_IP4_COMPARE_FLAG_NONE", "none" },
+        { NM_IP4_COMPARE_FLAG_ADDRESSES, "NM_IP4_COMPARE_FLAG_ADDRESSES", "addresses" },
+        { NM_IP4_COMPARE_FLAG_PTP_ADDRESS, "NM_IP4_COMPARE_FLAG_PTP_ADDRESS", "ptp-address" },
+        { NM_IP4_COMPARE_FLAG_NAMESERVERS, "NM_IP4_COMPARE_FLAG_NAMESERVERS", "nameservers" },
+        { NM_IP4_COMPARE_FLAG_ROUTES, "NM_IP4_COMPARE_FLAG_ROUTES", "routes" },
+        { NM_IP4_COMPARE_FLAG_DOMAINS, "NM_IP4_COMPARE_FLAG_DOMAINS", "domains" },
+        { NM_IP4_COMPARE_FLAG_SEARCHES, "NM_IP4_COMPARE_FLAG_SEARCHES", "searches" },
+        { NM_IP4_COMPARE_FLAG_MTU, "NM_IP4_COMPARE_FLAG_MTU", "mtu" },
+        { NM_IP4_COMPARE_FLAG_MSS, "NM_IP4_COMPARE_FLAG_MSS", "mss" },
+        { NM_IP4_COMPARE_FLAG_WINS_SERVERS, "NM_IP4_COMPARE_FLAG_WINS_SERVERS", "wins-servers" },
+        { NM_IP4_COMPARE_FLAG_NIS_SERVERS, "NM_IP4_COMPARE_FLAG_NIS_SERVERS", "nis-servers" },
+        { NM_IP4_COMPARE_FLAG_NIS_DOMAIN, "NM_IP4_COMPARE_FLAG_NIS_DOMAIN", "nis-domain" },
+        { NM_IP4_COMPARE_FLAG_ALL, "NM_IP4_COMPARE_FLAG_ALL", "all" },
         { 0, NULL, NULL }
       };
       GType g_define_type_id =
-        g_enum_register_static (g_intern_static_string ("NMOlpcMeshError"), values);
+        g_enum_register_static (g_intern_static_string ("NMIP4ConfigCompareFlags"), values);
       g_once_init_leave (&g_define_type_id__volatile, g_define_type_id);
     }
 
@@ -700,6 +728,26 @@ nm_opt_type_get_type (void)
   return g_define_type_id__volatile;
 }
 GType
+nm_ap_support_get_type (void)
+{
+  static volatile gsize g_define_type_id__volatile = 0;
+
+  if (g_once_init_enter (&g_define_type_id__volatile))
+    {
+      static const GEnumValue values[] = {
+        { AP_SUPPORT_UNKNOWN, "AP_SUPPORT_UNKNOWN", "unknown" },
+        { AP_SUPPORT_NO, "AP_SUPPORT_NO", "no" },
+        { AP_SUPPORT_YES, "AP_SUPPORT_YES", "yes" },
+        { 0, NULL, NULL }
+      };
+      GType g_define_type_id =
+        g_enum_register_static (g_intern_static_string ("ApSupport"), values);
+      g_once_init_leave (&g_define_type_id__volatile, g_define_type_id);
+    }
+
+  return g_define_type_id__volatile;
+}
+GType
 nm_ppp_status_get_type (void)
 {
   static volatile gsize g_define_type_id__volatile = 0;
@@ -751,6 +799,34 @@ nm_dns_masq_status_get_type (void)
   return g_define_type_id__volatile;
 }
 GType
+nm_modem_state_get_type (void)
+{
+  static volatile gsize g_define_type_id__volatile = 0;
+
+  if (g_once_init_enter (&g_define_type_id__volatile))
+    {
+      static const GEnumValue values[] = {
+        { NM_MODEM_STATE_UNKNOWN, "NM_MODEM_STATE_UNKNOWN", "unknown" },
+        { NM_MODEM_STATE_DISABLED, "NM_MODEM_STATE_DISABLED", "disabled" },
+        { NM_MODEM_STATE_DISABLING, "NM_MODEM_STATE_DISABLING", "disabling" },
+        { NM_MODEM_STATE_ENABLING, "NM_MODEM_STATE_ENABLING", "enabling" },
+        { NM_MODEM_STATE_ENABLED, "NM_MODEM_STATE_ENABLED", "enabled" },
+        { NM_MODEM_STATE_SEARCHING, "NM_MODEM_STATE_SEARCHING", "searching" },
+        { NM_MODEM_STATE_REGISTERED, "NM_MODEM_STATE_REGISTERED", "registered" },
+        { NM_MODEM_STATE_DISCONNECTING, "NM_MODEM_STATE_DISCONNECTING", "disconnecting" },
+        { NM_MODEM_STATE_CONNECTING, "NM_MODEM_STATE_CONNECTING", "connecting" },
+        { NM_MODEM_STATE_CONNECTED, "NM_MODEM_STATE_CONNECTED", "connected" },
+        { NM_MODEM_STATE_LAST, "NM_MODEM_STATE_LAST", "last" },
+        { 0, NULL, NULL }
+      };
+      GType g_define_type_id =
+        g_enum_register_static (g_intern_static_string ("NMModemState"), values);
+      g_once_init_leave (&g_define_type_id__volatile, g_define_type_id);
+    }
+
+  return g_define_type_id__volatile;
+}
+GType
 nm_cdma_error_get_type (void)
 {
   static volatile gsize g_define_type_id__volatile = 0;
@@ -771,6 +847,27 @@ nm_cdma_error_get_type (void)
   return g_define_type_id__volatile;
 }
 GType
+nm_modem_broadband_error_get_type (void)
+{
+  static volatile gsize g_define_type_id__volatile = 0;
+
+  if (g_once_init_enter (&g_define_type_id__volatile))
+    {
+      static const GEnumValue values[] = {
+        { NM_MODEM_BROADBAND_ERROR_CONNECTION_NOT_GSM, "NM_MODEM_BROADBAND_ERROR_CONNECTION_NOT_GSM", "ConnectionNotGsm" },
+        { NM_MODEM_BROADBAND_ERROR_CONNECTION_NOT_CDMA, "NM_MODEM_BROADBAND_ERROR_CONNECTION_NOT_CDMA", "ConnectionNotCdma" },
+        { NM_MODEM_BROADBAND_ERROR_CONNECTION_INVALID, "NM_MODEM_BROADBAND_ERROR_CONNECTION_INVALID", "ConnectionInvalid" },
+        { NM_MODEM_BROADBAND_ERROR_CONNECTION_INCOMPATIBLE, "NM_MODEM_BROADBAND_ERROR_CONNECTION_INCOMPATIBLE", "ConnectionIncompatible" },
+        { 0, NULL, NULL }
+      };
+      GType g_define_type_id =
+        g_enum_register_static (g_intern_static_string ("NMModemBroadbandError"), values);
+      g_once_init_leave (&g_define_type_id__volatile, g_define_type_id);
+    }
+
+  return g_define_type_id__volatile;
+}
+GType
 nm_gsm_error_get_type (void)
 {
   static volatile gsize g_define_type_id__volatile = 0;
diff --git a/src/generated/nm-enum-types.h b/src/generated/nm-enum-types.h
index e1b06a4f..36de65cc 100644
--- a/src/generated/nm-enum-types.h
+++ b/src/generated/nm-enum-types.h
@@ -11,30 +11,32 @@
 G_BEGIN_DECLS
 GType nm_device_error_get_type (void) G_GNUC_CONST;
 #define NM_TYPE_DEVICE_ERROR (nm_device_error_get_type ())
-GType nm_ethernet_error_get_type (void) G_GNUC_CONST;
-#define NM_TYPE_ETHERNET_ERROR (nm_ethernet_error_get_type ())
+GType nm_rf_kill_state_get_type (void) G_GNUC_CONST;
+#define NM_TYPE_RF_KILL_STATE (nm_rf_kill_state_get_type ())
+GType nm_rf_kill_type_get_type (void) G_GNUC_CONST;
+#define NM_TYPE_RF_KILL_TYPE (nm_rf_kill_type_get_type ())
+GType nm_vlan_error_get_type (void) G_GNUC_CONST;
+#define NM_TYPE_VLAN_ERROR (nm_vlan_error_get_type ())
 GType nm_bt_error_get_type (void) G_GNUC_CONST;
 #define NM_TYPE_BT_ERROR (nm_bt_error_get_type ())
-GType nm_infiniband_error_get_type (void) G_GNUC_CONST;
-#define NM_TYPE_INFINIBAND_ERROR (nm_infiniband_error_get_type ())
 GType nm_wifi_error_get_type (void) G_GNUC_CONST;
 #define NM_TYPE_WIFI_ERROR (nm_wifi_error_get_type ())
-GType nm_session_monitor_error_get_type (void) G_GNUC_CONST;
-#define NM_TYPE_SESSION_MONITOR_ERROR (nm_session_monitor_error_get_type ())
-GType nm_ip4_config_compare_flags_get_type (void) G_GNUC_CONST;
-#define NM_TYPE_IP4_CONFIG_COMPARE_FLAGS (nm_ip4_config_compare_flags_get_type ())
+GType nm_olpc_mesh_error_get_type (void) G_GNUC_CONST;
+#define NM_TYPE_OLPC_MESH_ERROR (nm_olpc_mesh_error_get_type ())
+GType nm_bridge_error_get_type (void) G_GNUC_CONST;
+#define NM_TYPE_BRIDGE_ERROR (nm_bridge_error_get_type ())
 GType nm_bond_error_get_type (void) G_GNUC_CONST;
 #define NM_TYPE_BOND_ERROR (nm_bond_error_get_type ())
 GType nm_adsl_error_get_type (void) G_GNUC_CONST;
 #define NM_TYPE_ADSL_ERROR (nm_adsl_error_get_type ())
-GType nm_rf_kill_state_get_type (void) G_GNUC_CONST;
-#define NM_TYPE_RF_KILL_STATE (nm_rf_kill_state_get_type ())
-GType nm_rf_kill_type_get_type (void) G_GNUC_CONST;
-#define NM_TYPE_RF_KILL_TYPE (nm_rf_kill_type_get_type ())
+GType nm_dispatcher_action_get_type (void) G_GNUC_CONST;
+#define NM_TYPE_DISPATCHER_ACTION (nm_dispatcher_action_get_type ())
 GType nm_manager_error_get_type (void) G_GNUC_CONST;
 #define NM_TYPE_MANAGER_ERROR (nm_manager_error_get_type ())
-GType nm_act_request_dependency_result_get_type (void) G_GNUC_CONST;
-#define NM_TYPE_ACT_REQUEST_DEPENDENCY_RESULT (nm_act_request_dependency_result_get_type ())
+GType nm_session_monitor_error_get_type (void) G_GNUC_CONST;
+#define NM_TYPE_SESSION_MONITOR_ERROR (nm_session_monitor_error_get_type ())
+GType nm_infiniband_error_get_type (void) G_GNUC_CONST;
+#define NM_TYPE_INFINIBAND_ERROR (nm_infiniband_error_get_type ())
 GType nm_ip6_config_compare_flags_get_type (void) G_GNUC_CONST;
 #define NM_TYPE_IP6_CONFIG_COMPARE_FLAGS (nm_ip6_config_compare_flags_get_type ())
 GType nm_auth_call_result_get_type (void) G_GNUC_CONST;
@@ -45,10 +47,10 @@ GType nm_nm_nl_prop_get_type (void) G_GNUC_CONST;
 #define NM_TYPE_NM_NL_PROP (nm_nm_nl_prop_get_type ())
 GType nm_netlink_monitor_error_get_type (void) G_GNUC_CONST;
 #define NM_TYPE_NETLINK_MONITOR_ERROR (nm_netlink_monitor_error_get_type ())
-GType nm_vlan_error_get_type (void) G_GNUC_CONST;
-#define NM_TYPE_VLAN_ERROR (nm_vlan_error_get_type ())
-GType nm_olpc_mesh_error_get_type (void) G_GNUC_CONST;
-#define NM_TYPE_OLPC_MESH_ERROR (nm_olpc_mesh_error_get_type ())
+GType nm_ethernet_error_get_type (void) G_GNUC_CONST;
+#define NM_TYPE_ETHERNET_ERROR (nm_ethernet_error_get_type ())
+GType nm_ip4_config_compare_flags_get_type (void) G_GNUC_CONST;
+#define NM_TYPE_IP4_CONFIG_COMPARE_FLAGS (nm_ip4_config_compare_flags_get_type ())
 GType nm_logging_error_get_type (void) G_GNUC_CONST;
 #define NM_TYPE_LOGGING_ERROR (nm_logging_error_get_type ())
 GType nm_dns_manager_error_get_type (void) G_GNUC_CONST;
@@ -63,12 +65,18 @@ GType nm_dhcp_state_get_type (void) G_GNUC_CONST;
 #define NM_TYPE_DHCP_STATE (nm_dhcp_state_get_type ())
 GType nm_opt_type_get_type (void) G_GNUC_CONST;
 #define NM_TYPE_OPT_TYPE (nm_opt_type_get_type ())
+GType nm_ap_support_get_type (void) G_GNUC_CONST;
+#define NM_TYPE_AP_SUPPORT (nm_ap_support_get_type ())
 GType nm_ppp_status_get_type (void) G_GNUC_CONST;
 #define NM_TYPE_PPP_STATUS (nm_ppp_status_get_type ())
 GType nm_dns_masq_status_get_type (void) G_GNUC_CONST;
 #define NM_TYPE_DNS_MASQ_STATUS (nm_dns_masq_status_get_type ())
+GType nm_modem_state_get_type (void) G_GNUC_CONST;
+#define NM_TYPE_MODEM_STATE (nm_modem_state_get_type ())
 GType nm_cdma_error_get_type (void) G_GNUC_CONST;
 #define NM_TYPE_CDMA_ERROR (nm_cdma_error_get_type ())
+GType nm_modem_broadband_error_get_type (void) G_GNUC_CONST;
+#define NM_TYPE_MODEM_BROADBAND_ERROR (nm_modem_broadband_error_get_type ())
 GType nm_gsm_error_get_type (void) G_GNUC_CONST;
 #define NM_TYPE_GSM_ERROR (nm_gsm_error_get_type ())
 GType nm_system_config_interface_capabilities_get_type (void) G_GNUC_CONST;
diff --git a/src/generated/nm-marshal.c b/src/generated/nm-marshal.c
index e3d39724..6f6808df 100644
--- a/src/generated/nm-marshal.c
+++ b/src/generated/nm-marshal.c
@@ -200,20 +200,20 @@ _nm_marshal_VOID__OBJECT_OBJECT (GClosure     *closure,
             data2);
 }
 
-/* VOID:OBJECT,STRING (nm-marshal.list:5) */
+/* VOID:OBJECT,POINTER (nm-marshal.list:5) */
 void
-_nm_marshal_VOID__OBJECT_STRING (GClosure     *closure,
-                                 GValue       *return_value G_GNUC_UNUSED,
-                                 guint         n_param_values,
-                                 const GValue *param_values,
-                                 gpointer      invocation_hint G_GNUC_UNUSED,
-                                 gpointer      marshal_data)
+_nm_marshal_VOID__OBJECT_POINTER (GClosure     *closure,
+                                  GValue       *return_value G_GNUC_UNUSED,
+                                  guint         n_param_values,
+                                  const GValue *param_values,
+                                  gpointer      invocation_hint G_GNUC_UNUSED,
+                                  gpointer      marshal_data)
 {
-  typedef void (*GMarshalFunc_VOID__OBJECT_STRING) (gpointer     data1,
-                                                    gpointer     arg_1,
-                                                    gpointer     arg_2,
-                                                    gpointer     data2);
-  register GMarshalFunc_VOID__OBJECT_STRING callback;
+  typedef void (*GMarshalFunc_VOID__OBJECT_POINTER) (gpointer     data1,
+                                                     gpointer     arg_1,
+                                                     gpointer     arg_2,
+                                                     gpointer     data2);
+  register GMarshalFunc_VOID__OBJECT_POINTER callback;
   register GCClosure *cc = (GCClosure*) closure;
   register gpointer data1, data2;
 
@@ -229,34 +229,32 @@ _nm_marshal_VOID__OBJECT_STRING (GClosure     *closure,
       data1 = g_value_peek_pointer (param_values + 0);
       data2 = closure->data;
     }
-  callback = (GMarshalFunc_VOID__OBJECT_STRING) (marshal_data ? marshal_data : cc->callback);
+  callback = (GMarshalFunc_VOID__OBJECT_POINTER) (marshal_data ? marshal_data : cc->callback);
 
   callback (data1,
             g_marshal_value_peek_object (param_values + 1),
-            g_marshal_value_peek_string (param_values + 2),
+            g_marshal_value_peek_pointer (param_values + 2),
             data2);
 }
 
-/* VOID:OBJECT,UINT,UINT,UINT (nm-marshal.list:6) */
+/* VOID:OBJECT,STRING (nm-marshal.list:6) */
 void
-_nm_marshal_VOID__OBJECT_UINT_UINT_UINT (GClosure     *closure,
-                                         GValue       *return_value G_GNUC_UNUSED,
-                                         guint         n_param_values,
-                                         const GValue *param_values,
-                                         gpointer      invocation_hint G_GNUC_UNUSED,
-                                         gpointer      marshal_data)
+_nm_marshal_VOID__OBJECT_STRING (GClosure     *closure,
+                                 GValue       *return_value G_GNUC_UNUSED,
+                                 guint         n_param_values,
+                                 const GValue *param_values,
+                                 gpointer      invocation_hint G_GNUC_UNUSED,
+                                 gpointer      marshal_data)
 {
-  typedef void (*GMarshalFunc_VOID__OBJECT_UINT_UINT_UINT) (gpointer     data1,
-                                                            gpointer     arg_1,
-                                                            guint        arg_2,
-                                                            guint        arg_3,
-                                                            guint        arg_4,
-                                                            gpointer     data2);
-  register GMarshalFunc_VOID__OBJECT_UINT_UINT_UINT callback;
+  typedef void (*GMarshalFunc_VOID__OBJECT_STRING) (gpointer     data1,
+                                                    gpointer     arg_1,
+                                                    gpointer     arg_2,
+                                                    gpointer     data2);
+  register GMarshalFunc_VOID__OBJECT_STRING callback;
   register GCClosure *cc = (GCClosure*) closure;
   register gpointer data1, data2;
 
-  g_return_if_fail (n_param_values == 5);
+  g_return_if_fail (n_param_values == 3);
 
   if (G_CCLOSURE_SWAP_DATA (closure))
     {
@@ -268,13 +266,11 @@ _nm_marshal_VOID__OBJECT_UINT_UINT_UINT (GClosure     *closure,
       data1 = g_value_peek_pointer (param_values + 0);
       data2 = closure->data;
     }
-  callback = (GMarshalFunc_VOID__OBJECT_UINT_UINT_UINT) (marshal_data ? marshal_data : cc->callback);
+  callback = (GMarshalFunc_VOID__OBJECT_STRING) (marshal_data ? marshal_data : cc->callback);
 
   callback (data1,
             g_marshal_value_peek_object (param_values + 1),
-            g_marshal_value_peek_uint (param_values + 2),
-            g_marshal_value_peek_uint (param_values + 3),
-            g_marshal_value_peek_uint (param_values + 4),
+            g_marshal_value_peek_string (param_values + 2),
             data2);
 }
 
@@ -516,46 +512,7 @@ _nm_marshal_VOID__STRING_OBJECT (GClosure     *closure,
             data2);
 }
 
-/* VOID:STRING,OBJECT,POINTER (nm-marshal.list:14) */
-void
-_nm_marshal_VOID__STRING_OBJECT_POINTER (GClosure     *closure,
-                                         GValue       *return_value G_GNUC_UNUSED,
-                                         guint         n_param_values,
-                                         const GValue *param_values,
-                                         gpointer      invocation_hint G_GNUC_UNUSED,
-                                         gpointer      marshal_data)
-{
-  typedef void (*GMarshalFunc_VOID__STRING_OBJECT_POINTER) (gpointer     data1,
-                                                            gpointer     arg_1,
-                                                            gpointer     arg_2,
-                                                            gpointer     arg_3,
-                                                            gpointer     data2);
-  register GMarshalFunc_VOID__STRING_OBJECT_POINTER callback;
-  register GCClosure *cc = (GCClosure*) closure;
-  register gpointer data1, data2;
-
-  g_return_if_fail (n_param_values == 4);
-
-  if (G_CCLOSURE_SWAP_DATA (closure))
-    {
-      data1 = closure->data;
-      data2 = g_value_peek_pointer (param_values + 0);
-    }
-  else
-    {
-      data1 = g_value_peek_pointer (param_values + 0);
-      data2 = closure->data;
-    }
-  callback = (GMarshalFunc_VOID__STRING_OBJECT_POINTER) (marshal_data ? marshal_data : cc->callback);
-
-  callback (data1,
-            g_marshal_value_peek_string (param_values + 1),
-            g_marshal_value_peek_object (param_values + 2),
-            g_marshal_value_peek_pointer (param_values + 3),
-            data2);
-}
-
-/* VOID:STRING,POINTER (nm-marshal.list:15) */
+/* VOID:STRING,POINTER (nm-marshal.list:14) */
 void
 _nm_marshal_VOID__STRING_POINTER (GClosure     *closure,
                                   GValue       *return_value G_GNUC_UNUSED,
@@ -592,7 +549,7 @@ _nm_marshal_VOID__STRING_POINTER (GClosure     *closure,
             data2);
 }
 
-/* VOID:STRING,STRING (nm-marshal.list:16) */
+/* VOID:STRING,STRING (nm-marshal.list:15) */
 void
 _nm_marshal_VOID__STRING_STRING (GClosure     *closure,
                                  GValue       *return_value G_GNUC_UNUSED,
@@ -629,7 +586,7 @@ _nm_marshal_VOID__STRING_STRING (GClosure     *closure,
             data2);
 }
 
-/* VOID:STRING,STRING,STRING (nm-marshal.list:17) */
+/* VOID:STRING,STRING,STRING (nm-marshal.list:16) */
 void
 _nm_marshal_VOID__STRING_STRING_STRING (GClosure     *closure,
                                         GValue       *return_value G_GNUC_UNUSED,
@@ -668,7 +625,7 @@ _nm_marshal_VOID__STRING_STRING_STRING (GClosure     *closure,
             data2);
 }
 
-/* VOID:STRING,STRING,STRING,UINT (nm-marshal.list:18) */
+/* VOID:STRING,STRING,STRING,UINT (nm-marshal.list:17) */
 void
 _nm_marshal_VOID__STRING_STRING_STRING_UINT (GClosure     *closure,
                                              GValue       *return_value G_GNUC_UNUSED,
@@ -709,7 +666,7 @@ _nm_marshal_VOID__STRING_STRING_STRING_UINT (GClosure     *closure,
             data2);
 }
 
-/* VOID:UINT,UINT (nm-marshal.list:19) */
+/* VOID:UINT,UINT (nm-marshal.list:18) */
 void
 _nm_marshal_VOID__UINT_UINT (GClosure     *closure,
                              GValue       *return_value G_GNUC_UNUSED,
@@ -746,6 +703,45 @@ _nm_marshal_VOID__UINT_UINT (GClosure     *closure,
             data2);
 }
 
+/* VOID:UINT,UINT,INT (nm-marshal.list:19) */
+void
+_nm_marshal_VOID__UINT_UINT_INT (GClosure     *closure,
+                                 GValue       *return_value G_GNUC_UNUSED,
+                                 guint         n_param_values,
+                                 const GValue *param_values,
+                                 gpointer      invocation_hint G_GNUC_UNUSED,
+                                 gpointer      marshal_data)
+{
+  typedef void (*GMarshalFunc_VOID__UINT_UINT_INT) (gpointer     data1,
+                                                    guint        arg_1,
+                                                    guint        arg_2,
+                                                    gint         arg_3,
+                                                    gpointer     data2);
+  register GMarshalFunc_VOID__UINT_UINT_INT callback;
+  register GCClosure *cc = (GCClosure*) closure;
+  register gpointer data1, data2;
+
+  g_return_if_fail (n_param_values == 4);
+
+  if (G_CCLOSURE_SWAP_DATA (closure))
+    {
+      data1 = closure->data;
+      data2 = g_value_peek_pointer (param_values + 0);
+    }
+  else
+    {
+      data1 = g_value_peek_pointer (param_values + 0);
+      data2 = closure->data;
+    }
+  callback = (GMarshalFunc_VOID__UINT_UINT_INT) (marshal_data ? marshal_data : cc->callback);
+
+  callback (data1,
+            g_marshal_value_peek_uint (param_values + 1),
+            g_marshal_value_peek_uint (param_values + 2),
+            g_marshal_value_peek_int (param_values + 3),
+            data2);
+}
+
 /* VOID:UINT,UINT,UINT (nm-marshal.list:20) */
 void
 _nm_marshal_VOID__UINT_UINT_UINT (GClosure     *closure,
diff --git a/src/generated/nm-marshal.h b/src/generated/nm-marshal.h
index 61ef6479..bc64ec5c 100644
--- a/src/generated/nm-marshal.h
+++ b/src/generated/nm-marshal.h
@@ -38,7 +38,15 @@ extern void _nm_marshal_VOID__OBJECT_OBJECT (GClosure     *closure,
                                              gpointer      invocation_hint,
                                              gpointer      marshal_data);
 
-/* VOID:OBJECT,STRING (nm-marshal.list:5) */
+/* VOID:OBJECT,POINTER (nm-marshal.list:5) */
+extern void _nm_marshal_VOID__OBJECT_POINTER (GClosure     *closure,
+                                              GValue       *return_value,
+                                              guint         n_param_values,
+                                              const GValue *param_values,
+                                              gpointer      invocation_hint,
+                                              gpointer      marshal_data);
+
+/* VOID:OBJECT,STRING (nm-marshal.list:6) */
 extern void _nm_marshal_VOID__OBJECT_STRING (GClosure     *closure,
                                              GValue       *return_value,
                                              guint         n_param_values,
@@ -46,14 +54,6 @@ extern void _nm_marshal_VOID__OBJECT_STRING (GClosure     *closure,
                                              gpointer      invocation_hint,
                                              gpointer      marshal_data);
 
-/* VOID:OBJECT,UINT,UINT,UINT (nm-marshal.list:6) */
-extern void _nm_marshal_VOID__OBJECT_UINT_UINT_UINT (GClosure     *closure,
-                                                     GValue       *return_value,
-                                                     guint         n_param_values,
-                                                     const GValue *param_values,
-                                                     gpointer      invocation_hint,
-                                                     gpointer      marshal_data);
-
 /* VOID:POINTER (nm-marshal.list:7) */
 #define _nm_marshal_VOID__POINTER	g_cclosure_marshal_VOID__POINTER
 
@@ -105,15 +105,7 @@ extern void _nm_marshal_VOID__STRING_OBJECT (GClosure     *closure,
                                              gpointer      invocation_hint,
                                              gpointer      marshal_data);
 
-/* VOID:STRING,OBJECT,POINTER (nm-marshal.list:14) */
-extern void _nm_marshal_VOID__STRING_OBJECT_POINTER (GClosure     *closure,
-                                                     GValue       *return_value,
-                                                     guint         n_param_values,
-                                                     const GValue *param_values,
-                                                     gpointer      invocation_hint,
-                                                     gpointer      marshal_data);
-
-/* VOID:STRING,POINTER (nm-marshal.list:15) */
+/* VOID:STRING,POINTER (nm-marshal.list:14) */
 extern void _nm_marshal_VOID__STRING_POINTER (GClosure     *closure,
                                               GValue       *return_value,
                                               guint         n_param_values,
@@ -121,7 +113,7 @@ extern void _nm_marshal_VOID__STRING_POINTER (GClosure     *closure,
                                               gpointer      invocation_hint,
                                               gpointer      marshal_data);
 
-/* VOID:STRING,STRING (nm-marshal.list:16) */
+/* VOID:STRING,STRING (nm-marshal.list:15) */
 extern void _nm_marshal_VOID__STRING_STRING (GClosure     *closure,
                                              GValue       *return_value,
                                              guint         n_param_values,
@@ -129,7 +121,7 @@ extern void _nm_marshal_VOID__STRING_STRING (GClosure     *closure,
                                              gpointer      invocation_hint,
                                              gpointer      marshal_data);
 
-/* VOID:STRING,STRING,STRING (nm-marshal.list:17) */
+/* VOID:STRING,STRING,STRING (nm-marshal.list:16) */
 extern void _nm_marshal_VOID__STRING_STRING_STRING (GClosure     *closure,
                                                     GValue       *return_value,
                                                     guint         n_param_values,
@@ -137,7 +129,7 @@ extern void _nm_marshal_VOID__STRING_STRING_STRING (GClosure     *closure,
                                                     gpointer      invocation_hint,
                                                     gpointer      marshal_data);
 
-/* VOID:STRING,STRING,STRING,UINT (nm-marshal.list:18) */
+/* VOID:STRING,STRING,STRING,UINT (nm-marshal.list:17) */
 extern void _nm_marshal_VOID__STRING_STRING_STRING_UINT (GClosure     *closure,
                                                          GValue       *return_value,
                                                          guint         n_param_values,
@@ -145,7 +137,7 @@ extern void _nm_marshal_VOID__STRING_STRING_STRING_UINT (GClosure     *closure,
                                                          gpointer      invocation_hint,
                                                          gpointer      marshal_data);
 
-/* VOID:UINT,UINT (nm-marshal.list:19) */
+/* VOID:UINT,UINT (nm-marshal.list:18) */
 extern void _nm_marshal_VOID__UINT_UINT (GClosure     *closure,
                                          GValue       *return_value,
                                          guint         n_param_values,
@@ -153,6 +145,14 @@ extern void _nm_marshal_VOID__UINT_UINT (GClosure     *closure,
                                          gpointer      invocation_hint,
                                          gpointer      marshal_data);
 
+/* VOID:UINT,UINT,INT (nm-marshal.list:19) */
+extern void _nm_marshal_VOID__UINT_UINT_INT (GClosure     *closure,
+                                             GValue       *return_value,
+                                             guint         n_param_values,
+                                             const GValue *param_values,
+                                             gpointer      invocation_hint,
+                                             gpointer      marshal_data);
+
 /* VOID:UINT,UINT,UINT (nm-marshal.list:20) */
 extern void _nm_marshal_VOID__UINT_UINT_UINT (GClosure     *closure,
                                               GValue       *return_value,
diff --git a/src/ip6-manager/Makefile.am b/src/ip6-manager/Makefile.am
index be4b9713..eb730394 100644
--- a/src/ip6-manager/Makefile.am
+++ b/src/ip6-manager/Makefile.am
@@ -18,8 +18,7 @@ libip6_manager_la_SOURCES = \
 libip6_manager_la_CPPFLAGS = \
 	$(LIBNL_CFLAGS) \
 	$(DBUS_CFLAGS) \
-	$(GLIB_CFLAGS) \
-	-DG_DISABLE_DEPRECATED
+	$(GLIB_CFLAGS)
 
 libip6_manager_la_LIBADD = \
 	$(top_builddir)/src/generated/libnm-generated.la \
diff --git a/src/ip6-manager/Makefile.in b/src/ip6-manager/Makefile.in
index 833245b0..317f27fb 100644
--- a/src/ip6-manager/Makefile.in
+++ b/src/ip6-manager/Makefile.in
@@ -55,16 +55,18 @@ subdir = src/ip6-manager
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/compiler_warnings.m4 \
-	$(top_srcdir)/m4/gettext.m4 $(top_srcdir)/m4/gtk-doc.m4 \
-	$(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/intlmacosx.m4 \
-	$(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/introspection.m4 \
-	$(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \
-	$(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/libnl-check.m4 \
-	$(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \
-	$(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
-	$(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/nls.m4 \
-	$(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/progtest.m4 \
-	$(top_srcdir)/m4/vapigen.m4 $(top_srcdir)/configure.ac
+	$(top_srcdir)/m4/gettext.m4 \
+	$(top_srcdir)/m4/gnome-code-coverage.m4 \
+	$(top_srcdir)/m4/gtk-doc.m4 $(top_srcdir)/m4/iconv.m4 \
+	$(top_srcdir)/m4/intlmacosx.m4 $(top_srcdir)/m4/intltool.m4 \
+	$(top_srcdir)/m4/introspection.m4 $(top_srcdir)/m4/lib-ld.m4 \
+	$(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \
+	$(top_srcdir)/m4/libnl-check.m4 $(top_srcdir)/m4/libtool.m4 \
+	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
+	$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
+	$(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/po.m4 \
+	$(top_srcdir)/m4/progtest.m4 $(top_srcdir)/m4/vapigen.m4 \
+	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(install_sh) -d
@@ -131,6 +133,10 @@ AWK = @AWK@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
+CKDB_PATH = @CKDB_PATH@
+CODE_COVERAGE_CFLAGS = @CODE_COVERAGE_CFLAGS@
+CODE_COVERAGE_ENABLED = @CODE_COVERAGE_ENABLED@
+CODE_COVERAGE_LDFLAGS = @CODE_COVERAGE_LDFLAGS@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CXX = @CXX@
@@ -145,9 +151,7 @@ DBUS_SYS_DIR = @DBUS_SYS_DIR@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
 DHCLIENT_PATH = @DHCLIENT_PATH@
-DHCLIENT_VERSION = @DHCLIENT_VERSION@
 DHCPCD_PATH = @DHCPCD_PATH@
-DISABLE_DEPRECATED = @DISABLE_DEPRECATED@
 DLLTOOL = @DLLTOOL@
 DSYMUTIL = @DSYMUTIL@
 DUMPBIN = @DUMPBIN@
@@ -157,17 +161,14 @@ ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
 FGREP = @FGREP@
+GENHTML = @GENHTML@
 GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
 GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
-GIO_CFLAGS = @GIO_CFLAGS@
-GIO_LIBS = @GIO_LIBS@
 GLIB_CFLAGS = @GLIB_CFLAGS@
 GLIB_GENMARSHAL = @GLIB_GENMARSHAL@
 GLIB_LIBS = @GLIB_LIBS@
 GLIB_MAKEFILE = @GLIB_MAKEFILE@
 GLIB_MKENUMS = @GLIB_MKENUMS@
-GMODULE_CFLAGS = @GMODULE_CFLAGS@
-GMODULE_LIBS = @GMODULE_LIBS@
 GMSGFMT = @GMSGFMT@
 GMSGFMT_015 = @GMSGFMT_015@
 GNUTLS_CFLAGS = @GNUTLS_CFLAGS@
@@ -208,6 +209,7 @@ IPTABLES_PATH = @IPTABLES_PATH@
 IWMX_SDK_CFLAGS = @IWMX_SDK_CFLAGS@
 IWMX_SDK_LIBS = @IWMX_SDK_LIBS@
 KERNEL_FIRMWARE_DIR = @KERNEL_FIRMWARE_DIR@
+LCOV = @LCOV@
 LD = @LD@
 LDFLAGS = @LDFLAGS@
 LIBDL = @LIBDL@
@@ -224,11 +226,7 @@ LIBNL2_LIBS = @LIBNL2_LIBS@
 LIBNL3_CFLAGS = @LIBNL3_CFLAGS@
 LIBNL3_LIBS = @LIBNL3_LIBS@
 LIBNL_CFLAGS = @LIBNL_CFLAGS@
-LIBNL_GENL3_CFLAGS = @LIBNL_GENL3_CFLAGS@
-LIBNL_GENL3_LIBS = @LIBNL_GENL3_LIBS@
 LIBNL_LIBS = @LIBNL_LIBS@
-LIBNL_ROUTE3_CFLAGS = @LIBNL_ROUTE3_CFLAGS@
-LIBNL_ROUTE3_LIBS = @LIBNL_ROUTE3_LIBS@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
 LIBSOUP_CFLAGS = @LIBSOUP_CFLAGS@
@@ -243,6 +241,8 @@ MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MANIFEST_TOOL = @MANIFEST_TOOL@
 MKDIR_P = @MKDIR_P@
+MM_GLIB_CFLAGS = @MM_GLIB_CFLAGS@
+MM_GLIB_LIBS = @MM_GLIB_LIBS@
 MOC = @MOC@
 MSGFMT = @MSGFMT@
 MSGFMT_015 = @MSGFMT_015@
@@ -252,6 +252,7 @@ NMEDIT = @NMEDIT@
 NM_MAJOR_VERSION = @NM_MAJOR_VERSION@
 NM_MICRO_VERSION = @NM_MICRO_VERSION@
 NM_MINOR_VERSION = @NM_MINOR_VERSION@
+NM_MODIFY_SYSTEM_POLICY = @NM_MODIFY_SYSTEM_POLICY@
 NM_VERSION = @NM_VERSION@
 NSS_CFLAGS = @NSS_CFLAGS@
 NSS_LIBS = @NSS_LIBS@
@@ -278,13 +279,14 @@ PPPD_PLUGIN_DIR = @PPPD_PLUGIN_DIR@
 QT_CFLAGS = @QT_CFLAGS@
 QT_LIBS = @QT_LIBS@
 RANLIB = @RANLIB@
-RESOLVCONF_PATH = @RESOLVCONF_PATH@
 SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
-SYSTEMD_CFLAGS = @SYSTEMD_CFLAGS@
-SYSTEMD_LIBS = @SYSTEMD_LIBS@
+SYSTEMD_INHIBIT_CFLAGS = @SYSTEMD_INHIBIT_CFLAGS@
+SYSTEMD_INHIBIT_LIBS = @SYSTEMD_INHIBIT_LIBS@
+SYSTEMD_LOGIN_CFLAGS = @SYSTEMD_LOGIN_CFLAGS@
+SYSTEMD_LOGIN_LIBS = @SYSTEMD_LOGIN_LIBS@
 SYSTEM_CA_PATH = @SYSTEM_CA_PATH@
 UDEV_BASE_DIR = @UDEV_BASE_DIR@
 USE_NLS = @USE_NLS@
@@ -339,6 +341,11 @@ localedir = @localedir@
 localstatedir = @localstatedir@
 mandir = @mandir@
 mkdir_p = @mkdir_p@
+nmbinary = @nmbinary@
+nmconfdir = @nmconfdir@
+nmdatadir = @nmdatadir@
+nmrundir = @nmrundir@
+nmstatedir = @nmstatedir@
 oldincludedir = @oldincludedir@
 pdfdir = @pdfdir@
 prefix = @prefix@
@@ -353,6 +360,10 @@ target_alias = @target_alias@
 top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
+with_dhclient = @with_dhclient@
+with_dhcpcd = @with_dhcpcd@
+with_netconfig = @with_netconfig@
+with_resolvconf = @with_resolvconf@
 INCLUDES = \
 	-I${top_srcdir} \
 	-I${top_builddir}/include \
@@ -372,8 +383,7 @@ libip6_manager_la_SOURCES = \
 libip6_manager_la_CPPFLAGS = \
 	$(LIBNL_CFLAGS) \
 	$(DBUS_CFLAGS) \
-	$(GLIB_CFLAGS) \
-	-DG_DISABLE_DEPRECATED
+	$(GLIB_CFLAGS)
 
 libip6_manager_la_LIBADD = \
 	$(top_builddir)/src/generated/libnm-generated.la \
@@ -437,25 +447,22 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libip6_manager_la-nm-ip6-manager.Plo@am__quote@
 
 .c.o:
-@am__fastdepCC_TRUE@	$(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\
-@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
-@am__fastdepCC_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.Po
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $<
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c $<
 
 .c.obj:
-@am__fastdepCC_TRUE@	$(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.obj$$||'`;\
-@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ `$(CYGPATH_W) '$<'` &&\
-@am__fastdepCC_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.Po
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c `$(CYGPATH_W) '$<'`
 
 .c.lo:
-@am__fastdepCC_TRUE@	$(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.lo$$||'`;\
-@am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
-@am__fastdepCC_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.Plo
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $<
diff --git a/src/ip6-manager/nm-ip6-manager.c b/src/ip6-manager/nm-ip6-manager.c
index 4432aa5c..490e9574 100644
--- a/src/ip6-manager/nm-ip6-manager.c
+++ b/src/ip6-manager/nm-ip6-manager.c
@@ -140,7 +140,7 @@ nm_ip6_device_destroy (NMIP6Device *device)
 	/* reset the saved IPv6 value */
 	if (device->disable_ip6_save_valid) {
 		nm_utils_do_sysctl (device->disable_ip6_path,
-		                    device->disable_ip6_save ? "1\n" : "0\n");
+		                    device->disable_ip6_save ? "1" : "0");
 	}
 
 	if (device->finish_addrconf_id)
@@ -1399,10 +1399,10 @@ nm_ip6_manager_prepare_interface (NMIP6Manager *manager,
 	/* Establish target state and turn router advertisement acceptance on or off */
 	if (!strcmp (method, NM_SETTING_IP6_CONFIG_METHOD_LINK_LOCAL)) {
 		device->target_state = NM_IP6_DEVICE_GOT_LINK_LOCAL;
-		nm_utils_do_sysctl (accept_ra_path, "0\n");
+		nm_utils_do_sysctl (accept_ra_path, "0");
 	} else {
 		device->target_state = NM_IP6_DEVICE_GOT_ADDRESS;
-		nm_utils_do_sysctl (accept_ra_path, "2\n");
+		nm_utils_do_sysctl (accept_ra_path, "2");
 	}
 
 	return TRUE;
@@ -1447,9 +1447,9 @@ nm_ip6_manager_begin_addrconf (NMIP6Manager *manager, int ifindex)
 	 * new RAs; there doesn't seem to be a better way to do this right now.
 	 */
 	if (device->target_state >= NM_IP6_DEVICE_GOT_ADDRESS) {
-		nm_utils_do_sysctl (device->disable_ip6_path, "1\n");
+		nm_utils_do_sysctl (device->disable_ip6_path, "1");
 		g_usleep (200);
-		nm_utils_do_sysctl (device->disable_ip6_path, "0\n");
+		nm_utils_do_sysctl (device->disable_ip6_path, "0");
 	}
 
 	device->ip6flags_poll_id = g_timeout_add_seconds (1, poll_ip6_flags, priv->monitor);
diff --git a/src/logging/Makefile.am b/src/logging/Makefile.am
index 51a6b25d..e8fe60ee 100644
--- a/src/logging/Makefile.am
+++ b/src/logging/Makefile.am
@@ -6,8 +6,7 @@ libnm_logging_la_SOURCES = \
 
 libnm_logging_la_CPPFLAGS = \
 	$(GLIB_CFLAGS) \
-	-DLIBEXECDIR=\"$(libexecdir)\" \
-	-DG_DISABLE_DEPRECATED
+	-DLIBEXECDIR=\"$(libexecdir)\"
 
 libnm_logging_la_LIBADD = \
 	-ldl \
diff --git a/src/logging/Makefile.in b/src/logging/Makefile.in
index 8af1bde3..38c994c2 100644
--- a/src/logging/Makefile.in
+++ b/src/logging/Makefile.in
@@ -55,16 +55,18 @@ subdir = src/logging
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/compiler_warnings.m4 \
-	$(top_srcdir)/m4/gettext.m4 $(top_srcdir)/m4/gtk-doc.m4 \
-	$(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/intlmacosx.m4 \
-	$(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/introspection.m4 \
-	$(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \
-	$(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/libnl-check.m4 \
-	$(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \
-	$(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
-	$(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/nls.m4 \
-	$(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/progtest.m4 \
-	$(top_srcdir)/m4/vapigen.m4 $(top_srcdir)/configure.ac
+	$(top_srcdir)/m4/gettext.m4 \
+	$(top_srcdir)/m4/gnome-code-coverage.m4 \
+	$(top_srcdir)/m4/gtk-doc.m4 $(top_srcdir)/m4/iconv.m4 \
+	$(top_srcdir)/m4/intlmacosx.m4 $(top_srcdir)/m4/intltool.m4 \
+	$(top_srcdir)/m4/introspection.m4 $(top_srcdir)/m4/lib-ld.m4 \
+	$(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \
+	$(top_srcdir)/m4/libnl-check.m4 $(top_srcdir)/m4/libtool.m4 \
+	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
+	$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
+	$(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/po.m4 \
+	$(top_srcdir)/m4/progtest.m4 $(top_srcdir)/m4/vapigen.m4 \
+	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(install_sh) -d
@@ -127,6 +129,10 @@ AWK = @AWK@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
+CKDB_PATH = @CKDB_PATH@
+CODE_COVERAGE_CFLAGS = @CODE_COVERAGE_CFLAGS@
+CODE_COVERAGE_ENABLED = @CODE_COVERAGE_ENABLED@
+CODE_COVERAGE_LDFLAGS = @CODE_COVERAGE_LDFLAGS@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CXX = @CXX@
@@ -141,9 +147,7 @@ DBUS_SYS_DIR = @DBUS_SYS_DIR@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
 DHCLIENT_PATH = @DHCLIENT_PATH@
-DHCLIENT_VERSION = @DHCLIENT_VERSION@
 DHCPCD_PATH = @DHCPCD_PATH@
-DISABLE_DEPRECATED = @DISABLE_DEPRECATED@
 DLLTOOL = @DLLTOOL@
 DSYMUTIL = @DSYMUTIL@
 DUMPBIN = @DUMPBIN@
@@ -153,17 +157,14 @@ ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
 FGREP = @FGREP@
+GENHTML = @GENHTML@
 GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
 GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
-GIO_CFLAGS = @GIO_CFLAGS@
-GIO_LIBS = @GIO_LIBS@
 GLIB_CFLAGS = @GLIB_CFLAGS@
 GLIB_GENMARSHAL = @GLIB_GENMARSHAL@
 GLIB_LIBS = @GLIB_LIBS@
 GLIB_MAKEFILE = @GLIB_MAKEFILE@
 GLIB_MKENUMS = @GLIB_MKENUMS@
-GMODULE_CFLAGS = @GMODULE_CFLAGS@
-GMODULE_LIBS = @GMODULE_LIBS@
 GMSGFMT = @GMSGFMT@
 GMSGFMT_015 = @GMSGFMT_015@
 GNUTLS_CFLAGS = @GNUTLS_CFLAGS@
@@ -204,6 +205,7 @@ IPTABLES_PATH = @IPTABLES_PATH@
 IWMX_SDK_CFLAGS = @IWMX_SDK_CFLAGS@
 IWMX_SDK_LIBS = @IWMX_SDK_LIBS@
 KERNEL_FIRMWARE_DIR = @KERNEL_FIRMWARE_DIR@
+LCOV = @LCOV@
 LD = @LD@
 LDFLAGS = @LDFLAGS@
 LIBDL = @LIBDL@
@@ -220,11 +222,7 @@ LIBNL2_LIBS = @LIBNL2_LIBS@
 LIBNL3_CFLAGS = @LIBNL3_CFLAGS@
 LIBNL3_LIBS = @LIBNL3_LIBS@
 LIBNL_CFLAGS = @LIBNL_CFLAGS@
-LIBNL_GENL3_CFLAGS = @LIBNL_GENL3_CFLAGS@
-LIBNL_GENL3_LIBS = @LIBNL_GENL3_LIBS@
 LIBNL_LIBS = @LIBNL_LIBS@
-LIBNL_ROUTE3_CFLAGS = @LIBNL_ROUTE3_CFLAGS@
-LIBNL_ROUTE3_LIBS = @LIBNL_ROUTE3_LIBS@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
 LIBSOUP_CFLAGS = @LIBSOUP_CFLAGS@
@@ -239,6 +237,8 @@ MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MANIFEST_TOOL = @MANIFEST_TOOL@
 MKDIR_P = @MKDIR_P@
+MM_GLIB_CFLAGS = @MM_GLIB_CFLAGS@
+MM_GLIB_LIBS = @MM_GLIB_LIBS@
 MOC = @MOC@
 MSGFMT = @MSGFMT@
 MSGFMT_015 = @MSGFMT_015@
@@ -248,6 +248,7 @@ NMEDIT = @NMEDIT@
 NM_MAJOR_VERSION = @NM_MAJOR_VERSION@
 NM_MICRO_VERSION = @NM_MICRO_VERSION@
 NM_MINOR_VERSION = @NM_MINOR_VERSION@
+NM_MODIFY_SYSTEM_POLICY = @NM_MODIFY_SYSTEM_POLICY@
 NM_VERSION = @NM_VERSION@
 NSS_CFLAGS = @NSS_CFLAGS@
 NSS_LIBS = @NSS_LIBS@
@@ -274,13 +275,14 @@ PPPD_PLUGIN_DIR = @PPPD_PLUGIN_DIR@
 QT_CFLAGS = @QT_CFLAGS@
 QT_LIBS = @QT_LIBS@
 RANLIB = @RANLIB@
-RESOLVCONF_PATH = @RESOLVCONF_PATH@
 SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
-SYSTEMD_CFLAGS = @SYSTEMD_CFLAGS@
-SYSTEMD_LIBS = @SYSTEMD_LIBS@
+SYSTEMD_INHIBIT_CFLAGS = @SYSTEMD_INHIBIT_CFLAGS@
+SYSTEMD_INHIBIT_LIBS = @SYSTEMD_INHIBIT_LIBS@
+SYSTEMD_LOGIN_CFLAGS = @SYSTEMD_LOGIN_CFLAGS@
+SYSTEMD_LOGIN_LIBS = @SYSTEMD_LOGIN_LIBS@
 SYSTEM_CA_PATH = @SYSTEM_CA_PATH@
 UDEV_BASE_DIR = @UDEV_BASE_DIR@
 USE_NLS = @USE_NLS@
@@ -335,6 +337,11 @@ localedir = @localedir@
 localstatedir = @localstatedir@
 mandir = @mandir@
 mkdir_p = @mkdir_p@
+nmbinary = @nmbinary@
+nmconfdir = @nmconfdir@
+nmdatadir = @nmdatadir@
+nmrundir = @nmrundir@
+nmstatedir = @nmstatedir@
 oldincludedir = @oldincludedir@
 pdfdir = @pdfdir@
 prefix = @prefix@
@@ -349,6 +356,10 @@ target_alias = @target_alias@
 top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
+with_dhclient = @with_dhclient@
+with_dhcpcd = @with_dhcpcd@
+with_netconfig = @with_netconfig@
+with_resolvconf = @with_resolvconf@
 noinst_LTLIBRARIES = libnm-logging.la
 libnm_logging_la_SOURCES = \
 	nm-logging.c \
@@ -356,8 +367,7 @@ libnm_logging_la_SOURCES = \
 
 libnm_logging_la_CPPFLAGS = \
 	$(GLIB_CFLAGS) \
-	-DLIBEXECDIR=\"$(libexecdir)\" \
-	-DG_DISABLE_DEPRECATED
+	-DLIBEXECDIR=\"$(libexecdir)\"
 
 libnm_logging_la_LIBADD = \
 	-ldl \
@@ -418,25 +428,22 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libnm_logging_la-nm-logging.Plo@am__quote@
 
 .c.o:
-@am__fastdepCC_TRUE@	$(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\
-@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
-@am__fastdepCC_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.Po
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $<
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c $<
 
 .c.obj:
-@am__fastdepCC_TRUE@	$(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.obj$$||'`;\
-@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ `$(CYGPATH_W) '$<'` &&\
-@am__fastdepCC_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.Po
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c `$(CYGPATH_W) '$<'`
 
 .c.lo:
-@am__fastdepCC_TRUE@	$(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.lo$$||'`;\
-@am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
-@am__fastdepCC_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.Plo
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $<
diff --git a/src/logging/nm-logging.c b/src/logging/nm-logging.c
index 8ec22982..3461412e 100644
--- a/src/logging/nm-logging.c
+++ b/src/logging/nm-logging.c
@@ -15,7 +15,7 @@
  * with this program; if not, write to the Free Software Foundation, Inc.,
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  *
- * Copyright (C) 2006 - 2010 Red Hat, Inc.
+ * Copyright (C) 2006 - 2012 Red Hat, Inc.
  * Copyright (C) 2006 - 2008 Novell, Inc.
  */
 
@@ -40,13 +40,19 @@
 
 #include "nm-logging.h"
 
+#define LOGD_ALL \
+	(LOGD_HW | LOGD_RFKILL | LOGD_ETHER | LOGD_WIFI | LOGD_BT | LOGD_MB | \
+	 LOGD_DHCP4 | LOGD_DHCP6 | LOGD_PPP | LOGD_WIFI_SCAN | LOGD_IP4 | \
+	 LOGD_IP6 | LOGD_AUTOIP4 | LOGD_DNS | LOGD_VPN | LOGD_SHARING | \
+	 LOGD_SUPPLICANT | LOGD_AGENTS | LOGD_SETTINGS | LOGD_SUSPEND | \
+	 LOGD_CORE | LOGD_DEVICE | LOGD_OLPC_MESH | LOGD_WIMAX | \
+	 LOGD_INFINIBAND | LOGD_FIREWALL | LOGD_ADSL | LOGD_BOND | \
+	 LOGD_VLAN)
+
+#define LOGD_DEFAULT (LOGD_ALL & ~LOGD_WIFI_SCAN)
+
 static guint32 log_level = LOGL_INFO | LOGL_WARN | LOGL_ERR;
-static guint32 log_domains = \
-	LOGD_HW | LOGD_RFKILL | LOGD_ETHER | LOGD_WIFI | LOGD_BT | LOGD_MB | \
-	LOGD_DHCP4 | LOGD_DHCP6 | LOGD_PPP | LOGD_IP4 | LOGD_IP6 | LOGD_AUTOIP4 | \
-	LOGD_DNS | LOGD_VPN | LOGD_SHARING | LOGD_SUPPLICANT | LOGD_AGENTS | \
-	LOGD_SETTINGS | LOGD_SUSPEND | LOGD_CORE | LOGD_DEVICE | LOGD_OLPC_MESH | \
-	LOGD_WIMAX | LOGD_INFINIBAND | LOGD_FIREWALL | LOGD_ADSL;
+static guint32 log_domains = LOGD_DEFAULT;
 
 typedef struct {
 	guint32 num;
@@ -90,9 +96,17 @@ static const LogDesc domain_descs[] = {
 	{ LOGD_INFINIBAND,"INFINIBAND" },
 	{ LOGD_FIREWALL,  "FIREWALL" },
 	{ LOGD_ADSL,      "ADSL" },
+	{ LOGD_BOND,      "BOND" },
+	{ LOGD_VLAN,      "VLAN" },
 	{ 0, NULL }
 };
 
+/* Combined domains */
+#define LOGD_ALL_STRING     "ALL"
+#define LOGD_DEFAULT_STRING "DEFAULT"
+#define LOGD_DHCP_STRING    "DHCP"
+#define LOGD_IP_STRING      "IP"
+
 /************************************************************************/
 
 GQuark
@@ -151,6 +165,21 @@ nm_logging_setup (const char *level, const char *domains, GError **error)
 				}
 			}
 
+			/* Check for combined domains */
+			if (!strcasecmp (*iter, LOGD_ALL_STRING)) {
+				new_domains = LOGD_ALL;
+				found = TRUE;
+			} else if (!strcasecmp (*iter, LOGD_DEFAULT_STRING)) {
+				new_domains = LOGD_DEFAULT;
+				found = TRUE;
+			} else if (!strcasecmp (*iter, LOGD_DHCP_STRING)) {
+				new_domains |= LOGD_DHCP;
+				found = TRUE;
+			} else if (!strcasecmp (*iter, LOGD_IP_STRING)) {
+				new_domains |= LOGD_IP;
+				found = TRUE;
+			}
+
 			if (!found) {
 				g_set_error (error, NM_LOGGING_ERROR, NM_LOGGING_ERROR_UNKNOWN_DOMAIN,
 				             _("Unknown log domain '%s'"), *iter);
diff --git a/src/logging/nm-logging.h b/src/logging/nm-logging.h
index b3595d18..b3c583f2 100644
--- a/src/logging/nm-logging.h
+++ b/src/logging/nm-logging.h
@@ -15,7 +15,7 @@
  * with this program; if not, write to the Free Software Foundation, Inc.,
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  *
- * Copyright (C) 2006 - 2010 Red Hat, Inc.
+ * Copyright (C) 2006 - 2012 Red Hat, Inc.
  * Copyright (C) 2006 - 2008 Novell, Inc.
  */
 
@@ -55,9 +55,12 @@ enum {
 	LOGD_INFINIBAND = 0x01000000,
 	LOGD_FIREWALL   = 0x02000000,
 	LOGD_ADSL       = 0x04000000,
+	LOGD_BOND       = 0x08000000,
+	LOGD_VLAN       = 0x10000000,
 };
 
 #define LOGD_DHCP (LOGD_DHCP4 | LOGD_DHCP6)
+#define LOGD_IP   (LOGD_IP4 | LOGD_IP6)
 
 /* Log levels */
 enum {
diff --git a/src/main.c b/src/main.c
index 8bc6d3f6..b074bd8a 100644
--- a/src/main.c
+++ b/src/main.c
@@ -42,7 +42,6 @@
 #include "NetworkManagerUtils.h"
 #include "nm-manager.h"
 #include "nm-policy.h"
-#include "backends/nm-backend.h"
 #include "nm-dns-manager.h"
 #include "nm-dbus-manager.h"
 #include "nm-supplicant-manager.h"
@@ -55,13 +54,14 @@
 #include "nm-policy-hosts.h"
 #include "nm-config.h"
 #include "nm-posix-signals.h"
+#include "nm-system.h"
 
 #if !defined(NM_DIST_VERSION)
 # define NM_DIST_VERSION VERSION
 #endif
 
-#define NM_DEFAULT_PID_FILE          LOCALSTATEDIR"/run/NetworkManager.pid"
-#define NM_DEFAULT_SYSTEM_STATE_FILE LOCALSTATEDIR"/lib/NetworkManager/NetworkManager.state"
+#define NM_DEFAULT_PID_FILE          NMRUNDIR "/NetworkManager.pid"
+#define NM_DEFAULT_SYSTEM_STATE_FILE NMSTATEDIR "/NetworkManager.state"
 
 /*
  * Globals
@@ -278,24 +278,11 @@ parse_state_file (const char *filename,
 		 * users upgrading NM get this working too.
 		 */
 		if (g_error_matches (tmp_error, G_FILE_ERROR, G_FILE_ERROR_NOENT)) {
-			char *data, *dirname;
+			char *data;
 			gsize len = 0;
 
 			g_clear_error (&tmp_error);
 
-			/* try to create the directory if it doesn't exist */
-			dirname = g_path_get_dirname (filename);
-			errno = 0;
-			if (g_mkdir_with_parents (dirname, 0755) != 0) {
-				if (errno != EEXIST) {
-					g_set_error (error, G_FILE_ERROR, G_FILE_ERROR_ACCES,
-					             "Error creating state directory %s: %s", dirname, strerror(errno));
-					g_free (dirname);
-					return FALSE;
-				}
-			}
-			g_free (dirname);
-
 			/* Write out the initial state to the state file */
 			g_key_file_set_boolean (state_file, "main", "NetworkingEnabled", *net_enabled);
 			g_key_file_set_boolean (state_file, "main", "WirelessEnabled", *wifi_enabled);
@@ -401,10 +388,6 @@ main (int argc, char *argv[])
 		exit (1);
 	}
 
-	/* Set up unix signal handling */
-	if (!setup_signals ())
-		exit (1);
-
 	/* Set locale to be able to use environment variables */
 	setlocale (LC_ALL, "");
 
@@ -446,6 +429,18 @@ main (int argc, char *argv[])
 	 */
 	setenv ("GIO_USE_VFS", "local", 1);
 
+	/* Setup runtime directory */
+	if (g_mkdir_with_parents (NMRUNDIR, 0755) != 0) {
+		nm_log_err (LOGD_CORE, "Cannot create '%s': %s", NMRUNDIR, strerror (errno));
+		exit (1);
+	}
+
+	/* Ensure state directory exists */
+	if (g_mkdir_with_parents (NMSTATEDIR, 0755) != 0) {
+		nm_log_err (LOGD_CORE, "Cannot create '%s': %s", NMSTATEDIR, strerror (errno));
+		exit (1);
+	}
+
 	pidfile = pidfile ? pidfile : g_strdup (NM_DEFAULT_PID_FILE);
 	state_file = state_file ? state_file : g_strdup (NM_DEFAULT_SYSTEM_STATE_FILE);
 
@@ -501,6 +496,10 @@ main (int argc, char *argv[])
 			wrote_pidfile = TRUE;
 	}
 
+	/* Set up unix signal handling - before creating threads, but after daemonizing! */
+	if (!setup_signals ())
+		exit (1);
+
 	if (g_fatal_warnings) {
 		GLogLevelFlags fatal_mask;
 
@@ -600,7 +599,7 @@ main (int argc, char *argv[])
 		goto done;
 	}
 
-	policy = nm_policy_new (manager, vpn_manager, settings);
+	policy = nm_policy_new (manager, settings);
 	if (policy == NULL) {
 		nm_log_err (LOGD_CORE, "failed to initialize the policy.");
 		goto done;
@@ -640,8 +639,18 @@ main (int argc, char *argv[])
 
 	nm_manager_start (manager);
 
-	/* Bring up the loopback interface. */
-	nm_backend_enable_loopback ();
+	/* Make sure the loopback interface is up. If interface is down, we bring
+	 * it up and kernel will assign it link-local IPv4 and IPv6 addresses. If
+	 * it was already up, we assume is in clean state.
+	 *
+	 * TODO: it might be desirable to check the list of addresses and compare
+	 * it with a list of expected addresses (one of the protocol families
+	 * could be disabled). The 'lo' interface is sometimes used for assigning
+	 * global addresses so their availability doesn't depend on the state of
+	 * physical interfaces.
+	 */
+	nm_log_dbg (LOGD_CORE, "setting up local loopback");
+	nm_system_iface_set_up (nm_netlink_iface_to_index ("lo"), TRUE, NULL);
 
 	success = TRUE;
 
diff --git a/src/modem-manager/Makefile.am b/src/modem-manager/Makefile.am
index b9cc7644..aa5534fc 100644
--- a/src/modem-manager/Makefile.am
+++ b/src/modem-manager/Makefile.am
@@ -15,6 +15,8 @@ noinst_LTLIBRARIES = libmodem-manager.la
 libmodem_manager_la_SOURCES = \
 	nm-modem.c \
 	nm-modem.h \
+	nm-modem-generic.c \
+	nm-modem-generic.h \
 	nm-modem-cdma.c \
 	nm-modem-cdma.h \
 	nm-modem-gsm.c \
@@ -33,3 +35,11 @@ libmodem_manager_la_LIBADD = \
 	$(LIBNL_LIBS) \
 	$(DBUS_LIBS)
 
+# Support for the new ModemManager1 interface
+if WITH_MODEM_MANAGER_1
+libmodem_manager_la_SOURCES += \
+	nm-modem-broadband.h \
+	nm-modem-broadband.c
+libmodem_manager_la_CPPFLAGS += $(MM_GLIB_CFLAGS)
+libmodem_manager_la_LIBADD += $(MM_GLIB_LIBS)
+endif
diff --git a/src/modem-manager/Makefile.in b/src/modem-manager/Makefile.in
index 6da50ed0..0546ee2e 100644
--- a/src/modem-manager/Makefile.in
+++ b/src/modem-manager/Makefile.in
@@ -51,20 +51,30 @@ PRE_UNINSTALL = :
 POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
+
+# Support for the new ModemManager1 interface
+@WITH_MODEM_MANAGER_1_TRUE@am__append_1 = \
+@WITH_MODEM_MANAGER_1_TRUE@	nm-modem-broadband.h \
+@WITH_MODEM_MANAGER_1_TRUE@	nm-modem-broadband.c
+
+@WITH_MODEM_MANAGER_1_TRUE@am__append_2 = $(MM_GLIB_CFLAGS)
+@WITH_MODEM_MANAGER_1_TRUE@am__append_3 = $(MM_GLIB_LIBS)
 subdir = src/modem-manager
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+DIST_COMMON = README $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/compiler_warnings.m4 \
-	$(top_srcdir)/m4/gettext.m4 $(top_srcdir)/m4/gtk-doc.m4 \
-	$(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/intlmacosx.m4 \
-	$(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/introspection.m4 \
-	$(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \
-	$(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/libnl-check.m4 \
-	$(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \
-	$(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
-	$(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/nls.m4 \
-	$(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/progtest.m4 \
-	$(top_srcdir)/m4/vapigen.m4 $(top_srcdir)/configure.ac
+	$(top_srcdir)/m4/gettext.m4 \
+	$(top_srcdir)/m4/gnome-code-coverage.m4 \
+	$(top_srcdir)/m4/gtk-doc.m4 $(top_srcdir)/m4/iconv.m4 \
+	$(top_srcdir)/m4/intlmacosx.m4 $(top_srcdir)/m4/intltool.m4 \
+	$(top_srcdir)/m4/introspection.m4 $(top_srcdir)/m4/lib-ld.m4 \
+	$(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \
+	$(top_srcdir)/m4/libnl-check.m4 $(top_srcdir)/m4/libtool.m4 \
+	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
+	$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
+	$(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/po.m4 \
+	$(top_srcdir)/m4/progtest.m4 $(top_srcdir)/m4/vapigen.m4 \
+	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(install_sh) -d
@@ -73,14 +83,23 @@ CONFIG_CLEAN_FILES =
 CONFIG_CLEAN_VPATH_FILES =
 LTLIBRARIES = $(noinst_LTLIBRARIES)
 am__DEPENDENCIES_1 =
+@WITH_MODEM_MANAGER_1_TRUE@am__DEPENDENCIES_2 = $(am__DEPENDENCIES_1)
 libmodem_manager_la_DEPENDENCIES =  \
 	$(top_builddir)/src/generated/libnm-generated.la \
 	$(top_builddir)/src/logging/libnm-logging.la \
-	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
+	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+	$(am__DEPENDENCIES_2)
+am__libmodem_manager_la_SOURCES_DIST = nm-modem.c nm-modem.h \
+	nm-modem-generic.c nm-modem-generic.h nm-modem-cdma.c \
+	nm-modem-cdma.h nm-modem-gsm.c nm-modem-gsm.h \
+	nm-modem-manager.h nm-modem-manager.c nm-modem-types.h \
+	nm-modem-broadband.h nm-modem-broadband.c
+@WITH_MODEM_MANAGER_1_TRUE@am__objects_1 = libmodem_manager_la-nm-modem-broadband.lo
 am_libmodem_manager_la_OBJECTS = libmodem_manager_la-nm-modem.lo \
+	libmodem_manager_la-nm-modem-generic.lo \
 	libmodem_manager_la-nm-modem-cdma.lo \
 	libmodem_manager_la-nm-modem-gsm.lo \
-	libmodem_manager_la-nm-modem-manager.lo
+	libmodem_manager_la-nm-modem-manager.lo $(am__objects_1)
 libmodem_manager_la_OBJECTS = $(am_libmodem_manager_la_OBJECTS)
 AM_V_lt = $(am__v_lt_@AM_V@)
 am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
@@ -112,7 +131,7 @@ AM_V_GEN = $(am__v_GEN_@AM_V@)
 am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
 am__v_GEN_0 = @echo "  GEN   " $@;
 SOURCES = $(libmodem_manager_la_SOURCES)
-DIST_SOURCES = $(libmodem_manager_la_SOURCES)
+DIST_SOURCES = $(am__libmodem_manager_la_SOURCES_DIST)
 am__can_run_installinfo = \
   case $$AM_UPDATE_INFO_DIR in \
     n|no|NO) false;; \
@@ -133,6 +152,10 @@ AWK = @AWK@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
+CKDB_PATH = @CKDB_PATH@
+CODE_COVERAGE_CFLAGS = @CODE_COVERAGE_CFLAGS@
+CODE_COVERAGE_ENABLED = @CODE_COVERAGE_ENABLED@
+CODE_COVERAGE_LDFLAGS = @CODE_COVERAGE_LDFLAGS@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CXX = @CXX@
@@ -147,9 +170,7 @@ DBUS_SYS_DIR = @DBUS_SYS_DIR@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
 DHCLIENT_PATH = @DHCLIENT_PATH@
-DHCLIENT_VERSION = @DHCLIENT_VERSION@
 DHCPCD_PATH = @DHCPCD_PATH@
-DISABLE_DEPRECATED = @DISABLE_DEPRECATED@
 DLLTOOL = @DLLTOOL@
 DSYMUTIL = @DSYMUTIL@
 DUMPBIN = @DUMPBIN@
@@ -159,17 +180,14 @@ ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
 FGREP = @FGREP@
+GENHTML = @GENHTML@
 GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
 GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
-GIO_CFLAGS = @GIO_CFLAGS@
-GIO_LIBS = @GIO_LIBS@
 GLIB_CFLAGS = @GLIB_CFLAGS@
 GLIB_GENMARSHAL = @GLIB_GENMARSHAL@
 GLIB_LIBS = @GLIB_LIBS@
 GLIB_MAKEFILE = @GLIB_MAKEFILE@
 GLIB_MKENUMS = @GLIB_MKENUMS@
-GMODULE_CFLAGS = @GMODULE_CFLAGS@
-GMODULE_LIBS = @GMODULE_LIBS@
 GMSGFMT = @GMSGFMT@
 GMSGFMT_015 = @GMSGFMT_015@
 GNUTLS_CFLAGS = @GNUTLS_CFLAGS@
@@ -210,6 +228,7 @@ IPTABLES_PATH = @IPTABLES_PATH@
 IWMX_SDK_CFLAGS = @IWMX_SDK_CFLAGS@
 IWMX_SDK_LIBS = @IWMX_SDK_LIBS@
 KERNEL_FIRMWARE_DIR = @KERNEL_FIRMWARE_DIR@
+LCOV = @LCOV@
 LD = @LD@
 LDFLAGS = @LDFLAGS@
 LIBDL = @LIBDL@
@@ -226,11 +245,7 @@ LIBNL2_LIBS = @LIBNL2_LIBS@
 LIBNL3_CFLAGS = @LIBNL3_CFLAGS@
 LIBNL3_LIBS = @LIBNL3_LIBS@
 LIBNL_CFLAGS = @LIBNL_CFLAGS@
-LIBNL_GENL3_CFLAGS = @LIBNL_GENL3_CFLAGS@
-LIBNL_GENL3_LIBS = @LIBNL_GENL3_LIBS@
 LIBNL_LIBS = @LIBNL_LIBS@
-LIBNL_ROUTE3_CFLAGS = @LIBNL_ROUTE3_CFLAGS@
-LIBNL_ROUTE3_LIBS = @LIBNL_ROUTE3_LIBS@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
 LIBSOUP_CFLAGS = @LIBSOUP_CFLAGS@
@@ -245,6 +260,8 @@ MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MANIFEST_TOOL = @MANIFEST_TOOL@
 MKDIR_P = @MKDIR_P@
+MM_GLIB_CFLAGS = @MM_GLIB_CFLAGS@
+MM_GLIB_LIBS = @MM_GLIB_LIBS@
 MOC = @MOC@
 MSGFMT = @MSGFMT@
 MSGFMT_015 = @MSGFMT_015@
@@ -254,6 +271,7 @@ NMEDIT = @NMEDIT@
 NM_MAJOR_VERSION = @NM_MAJOR_VERSION@
 NM_MICRO_VERSION = @NM_MICRO_VERSION@
 NM_MINOR_VERSION = @NM_MINOR_VERSION@
+NM_MODIFY_SYSTEM_POLICY = @NM_MODIFY_SYSTEM_POLICY@
 NM_VERSION = @NM_VERSION@
 NSS_CFLAGS = @NSS_CFLAGS@
 NSS_LIBS = @NSS_LIBS@
@@ -280,13 +298,14 @@ PPPD_PLUGIN_DIR = @PPPD_PLUGIN_DIR@
 QT_CFLAGS = @QT_CFLAGS@
 QT_LIBS = @QT_LIBS@
 RANLIB = @RANLIB@
-RESOLVCONF_PATH = @RESOLVCONF_PATH@
 SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
-SYSTEMD_CFLAGS = @SYSTEMD_CFLAGS@
-SYSTEMD_LIBS = @SYSTEMD_LIBS@
+SYSTEMD_INHIBIT_CFLAGS = @SYSTEMD_INHIBIT_CFLAGS@
+SYSTEMD_INHIBIT_LIBS = @SYSTEMD_INHIBIT_LIBS@
+SYSTEMD_LOGIN_CFLAGS = @SYSTEMD_LOGIN_CFLAGS@
+SYSTEMD_LOGIN_LIBS = @SYSTEMD_LOGIN_LIBS@
 SYSTEM_CA_PATH = @SYSTEM_CA_PATH@
 UDEV_BASE_DIR = @UDEV_BASE_DIR@
 USE_NLS = @USE_NLS@
@@ -341,6 +360,11 @@ localedir = @localedir@
 localstatedir = @localstatedir@
 mandir = @mandir@
 mkdir_p = @mkdir_p@
+nmbinary = @nmbinary@
+nmconfdir = @nmconfdir@
+nmdatadir = @nmdatadir@
+nmrundir = @nmrundir@
+nmstatedir = @nmstatedir@
 oldincludedir = @oldincludedir@
 pdfdir = @pdfdir@
 prefix = @prefix@
@@ -355,6 +379,10 @@ target_alias = @target_alias@
 top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
+with_dhclient = @with_dhclient@
+with_dhcpcd = @with_dhcpcd@
+with_netconfig = @with_netconfig@
+with_resolvconf = @with_resolvconf@
 INCLUDES = \
 	-I${top_srcdir}/src \
 	-I${top_builddir}/src/generated \
@@ -366,27 +394,16 @@ INCLUDES = \
 	-I${top_srcdir}/libnm-util
 
 noinst_LTLIBRARIES = libmodem-manager.la
-libmodem_manager_la_SOURCES = \
-	nm-modem.c \
-	nm-modem.h \
-	nm-modem-cdma.c \
-	nm-modem-cdma.h \
-	nm-modem-gsm.c \
-	nm-modem-gsm.h \
-	nm-modem-manager.h \
-	nm-modem-manager.c \
-	nm-modem-types.h
-
-libmodem_manager_la_CPPFLAGS = \
-	$(LIBNL_CFLAGS) \
-	$(DBUS_CFLAGS)
-
-libmodem_manager_la_LIBADD = \
+libmodem_manager_la_SOURCES = nm-modem.c nm-modem.h nm-modem-generic.c \
+	nm-modem-generic.h nm-modem-cdma.c nm-modem-cdma.h \
+	nm-modem-gsm.c nm-modem-gsm.h nm-modem-manager.h \
+	nm-modem-manager.c nm-modem-types.h $(am__append_1)
+libmodem_manager_la_CPPFLAGS = $(LIBNL_CFLAGS) $(DBUS_CFLAGS) \
+	$(am__append_2)
+libmodem_manager_la_LIBADD =  \
 	$(top_builddir)/src/generated/libnm-generated.la \
-	$(top_builddir)/src/logging/libnm-logging.la \
-	$(LIBNL_LIBS) \
-	$(DBUS_LIBS)
-
+	$(top_builddir)/src/logging/libnm-logging.la $(LIBNL_LIBS) \
+	$(DBUS_LIBS) $(am__append_3)
 all: all-am
 
 .SUFFIXES:
@@ -439,31 +456,30 @@ mostlyclean-compile:
 distclean-compile:
 	-rm -f *.tab.c
 
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libmodem_manager_la-nm-modem-broadband.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libmodem_manager_la-nm-modem-cdma.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libmodem_manager_la-nm-modem-generic.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libmodem_manager_la-nm-modem-gsm.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libmodem_manager_la-nm-modem-manager.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libmodem_manager_la-nm-modem.Plo@am__quote@
 
 .c.o:
-@am__fastdepCC_TRUE@	$(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\
-@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
-@am__fastdepCC_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.Po
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $<
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c $<
 
 .c.obj:
-@am__fastdepCC_TRUE@	$(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.obj$$||'`;\
-@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ `$(CYGPATH_W) '$<'` &&\
-@am__fastdepCC_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.Po
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c `$(CYGPATH_W) '$<'`
 
 .c.lo:
-@am__fastdepCC_TRUE@	$(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.lo$$||'`;\
-@am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
-@am__fastdepCC_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.Plo
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $<
@@ -475,6 +491,13 @@ libmodem_manager_la-nm-modem.lo: nm-modem.c
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmodem_manager_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libmodem_manager_la-nm-modem.lo `test -f 'nm-modem.c' || echo '$(srcdir)/'`nm-modem.c
 
+libmodem_manager_la-nm-modem-generic.lo: nm-modem-generic.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmodem_manager_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libmodem_manager_la-nm-modem-generic.lo -MD -MP -MF $(DEPDIR)/libmodem_manager_la-nm-modem-generic.Tpo -c -o libmodem_manager_la-nm-modem-generic.lo `test -f 'nm-modem-generic.c' || echo '$(srcdir)/'`nm-modem-generic.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libmodem_manager_la-nm-modem-generic.Tpo $(DEPDIR)/libmodem_manager_la-nm-modem-generic.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='nm-modem-generic.c' object='libmodem_manager_la-nm-modem-generic.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmodem_manager_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libmodem_manager_la-nm-modem-generic.lo `test -f 'nm-modem-generic.c' || echo '$(srcdir)/'`nm-modem-generic.c
+
 libmodem_manager_la-nm-modem-cdma.lo: nm-modem-cdma.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmodem_manager_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libmodem_manager_la-nm-modem-cdma.lo -MD -MP -MF $(DEPDIR)/libmodem_manager_la-nm-modem-cdma.Tpo -c -o libmodem_manager_la-nm-modem-cdma.lo `test -f 'nm-modem-cdma.c' || echo '$(srcdir)/'`nm-modem-cdma.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libmodem_manager_la-nm-modem-cdma.Tpo $(DEPDIR)/libmodem_manager_la-nm-modem-cdma.Plo
@@ -496,6 +519,13 @@ libmodem_manager_la-nm-modem-manager.lo: nm-modem-manager.c
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmodem_manager_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libmodem_manager_la-nm-modem-manager.lo `test -f 'nm-modem-manager.c' || echo '$(srcdir)/'`nm-modem-manager.c
 
+libmodem_manager_la-nm-modem-broadband.lo: nm-modem-broadband.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmodem_manager_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libmodem_manager_la-nm-modem-broadband.lo -MD -MP -MF $(DEPDIR)/libmodem_manager_la-nm-modem-broadband.Tpo -c -o libmodem_manager_la-nm-modem-broadband.lo `test -f 'nm-modem-broadband.c' || echo '$(srcdir)/'`nm-modem-broadband.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libmodem_manager_la-nm-modem-broadband.Tpo $(DEPDIR)/libmodem_manager_la-nm-modem-broadband.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='nm-modem-broadband.c' object='libmodem_manager_la-nm-modem-broadband.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmodem_manager_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libmodem_manager_la-nm-modem-broadband.lo `test -f 'nm-modem-broadband.c' || echo '$(srcdir)/'`nm-modem-broadband.c
+
 mostlyclean-libtool:
 	-rm -f *.lo
 
diff --git a/src/modem-manager/README b/src/modem-manager/README
new file mode 100644
index 00000000..c9f0f5f1
--- /dev/null
+++ b/src/modem-manager/README
@@ -0,0 +1,45 @@
+
+ModemManager integration is organized as follows:
+
+
+Common source
+********************************************************************************
+
+ * nm-modem.[h|c]:
+      Defines the basic `NMModem' object. The core NetworkManager implementation
+      will use this interface exclusively, regardless of the real final type of
+      the modem object.
+
+ * nm-modem-manager.[h|c]:
+      Defines the `NMModemManager' object, which takes care of listening to
+      signals from the DBus inteface notifying about added or removed modems.
+      It also takes care of creating proper `NMModem' objects from the
+      information retrieved from the DBus interface.
+
+
+ModemManager 0.7 integration
+********************************************************************************
+
+ * nm-modem-broadband.[h|c]:
+      Defines the `NMModemBroadband' object, which is a subclass of `NMModem'.
+      This object handles both 3GPP and 3GPP2 modems exposed in the new
+      `ModemManager1' interface.
+
+
+ModemManager 0.4/0.5/0.6 integration
+********************************************************************************
+
+ * nm-modem-types.h:
+      Defines helper types to use with the (old) ModemManager DBus API.
+
+ * nm-modem-generic.[h|c]:
+      Defines the `NMModemGeneric' object. All modem objects based on the old
+      ModemManager interface are subclasses of this one.
+
+ * nm-modem-gsm.[h|c]:
+      Defines the `NMModemGsm' object, which is a subclass of `NMModemGeneric'.
+      This object handles 3GPP-specific (GSM, UMTS, HSPA, LTE) modems.
+
+ * nm-modem-cdma.[h|c]:
+      Defines the `NMModemCdma' object, which is a subclass of `NMModemGeneric'.
+      This object handles 3GPP2-specific modems (CDMA, EV-DO).
diff --git a/src/modem-manager/nm-modem-broadband.c b/src/modem-manager/nm-modem-broadband.c
new file mode 100644
index 00000000..05cd3565
--- /dev/null
+++ b/src/modem-manager/nm-modem-broadband.c
@@ -0,0 +1,1033 @@
+/* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */
+/* NetworkManager -- Network link manager
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Copyright (C) 2012 Aleksander Morgado 
+ */
+
+#include 
+#include 
+#include 
+#include "nm-modem-broadband.h"
+#include "nm-system.h"
+#include "nm-setting-connection.h"
+#include "nm-logging.h"
+#include "NetworkManagerUtils.h"
+#include "nm-device-private.h"
+
+G_DEFINE_TYPE (NMModemBroadband, nm_modem_broadband, NM_TYPE_MODEM)
+
+struct _NMModemBroadbandPrivate {
+	/* The modem object from dbus */
+	MMObject *modem_object;
+	/* Per-interface objects */
+	MMModem *modem_iface;
+	MMModemSimple *simple_iface;
+
+	/* Connection setup */
+	MMSimpleConnectProperties *connect_properties;
+	MMBearer *bearer;
+	MMBearerIpConfig *ipv4_config;
+	MMBearerIpConfig *ipv6_config;
+
+	guint32 pin_tries;
+};
+
+enum {
+	PROP_0,
+	PROP_MODEM,
+};
+
+#define MODEM_CAPS_3GPP(caps) (caps & (MM_MODEM_CAPABILITY_GSM_UMTS |    \
+                                       MM_MODEM_CAPABILITY_LTE |         \
+                                       MM_MODEM_CAPABILITY_LTE_ADVANCED))
+
+#define MODEM_CAPS_3GPP2(caps) (caps & (MM_MODEM_CAPABILITY_CDMA_EVDO))
+
+/*****************************************************************************/
+
+#define NM_MODEM_BROADBAND_ERROR (nm_modem_broadband_error_quark ())
+
+static GQuark
+nm_modem_broadband_error_quark (void)
+{
+	static GQuark quark = 0;
+	if (!quark)
+		quark = g_quark_from_static_string ("nm-modem-broadband-error");
+	return quark;
+}
+
+static NMDeviceStateReason
+translate_mm_error (GError *error)
+{
+	NMDeviceStateReason reason;
+
+	if (g_error_matches (error, MM_CONNECTION_ERROR, MM_CONNECTION_ERROR_NO_CARRIER))
+		reason = NM_DEVICE_STATE_REASON_MODEM_NO_CARRIER;
+	else if (g_error_matches (error, MM_CONNECTION_ERROR, MM_CONNECTION_ERROR_NO_DIALTONE))
+		reason = NM_DEVICE_STATE_REASON_MODEM_NO_DIAL_TONE;
+	else if (g_error_matches (error, MM_CONNECTION_ERROR, MM_CONNECTION_ERROR_BUSY))
+		reason = NM_DEVICE_STATE_REASON_MODEM_BUSY;
+	else if (g_error_matches (error, MM_CONNECTION_ERROR, MM_CONNECTION_ERROR_NO_ANSWER))
+		reason = NM_DEVICE_STATE_REASON_MODEM_DIAL_TIMEOUT;
+	else if (g_error_matches (error, MM_MOBILE_EQUIPMENT_ERROR, MM_MOBILE_EQUIPMENT_ERROR_NETWORK_NOT_ALLOWED))
+		reason = NM_DEVICE_STATE_REASON_GSM_REGISTRATION_DENIED;
+	else if (g_error_matches (error, MM_MOBILE_EQUIPMENT_ERROR, MM_MOBILE_EQUIPMENT_ERROR_NETWORK_TIMEOUT))
+		reason = NM_DEVICE_STATE_REASON_GSM_REGISTRATION_TIMEOUT;
+	else if (g_error_matches (error, MM_MOBILE_EQUIPMENT_ERROR, MM_MOBILE_EQUIPMENT_ERROR_NO_NETWORK))
+		reason = NM_DEVICE_STATE_REASON_GSM_REGISTRATION_NOT_SEARCHING;
+	else if (g_error_matches (error, MM_MOBILE_EQUIPMENT_ERROR, MM_MOBILE_EQUIPMENT_ERROR_SIM_NOT_INSERTED))
+		reason = NM_DEVICE_STATE_REASON_GSM_SIM_NOT_INSERTED;
+	else if (g_error_matches (error, MM_MOBILE_EQUIPMENT_ERROR, MM_MOBILE_EQUIPMENT_ERROR_SIM_PIN))
+		reason = NM_DEVICE_STATE_REASON_GSM_SIM_PIN_REQUIRED;
+	else if (g_error_matches (error, MM_MOBILE_EQUIPMENT_ERROR, MM_MOBILE_EQUIPMENT_ERROR_SIM_PUK))
+		reason = NM_DEVICE_STATE_REASON_GSM_SIM_PUK_REQUIRED;
+	else if (g_error_matches (error, MM_MOBILE_EQUIPMENT_ERROR, MM_MOBILE_EQUIPMENT_ERROR_SIM_WRONG))
+		reason = NM_DEVICE_STATE_REASON_GSM_SIM_WRONG;
+	else {
+		/* unable to map the ModemManager error to a NM_DEVICE_STATE_REASON */
+		nm_log_dbg (LOGD_MB, "unmapped error detected: '%s'", error->message);
+		reason = NM_DEVICE_STATE_REASON_UNKNOWN;
+	}
+
+	return reason;
+}
+
+/*****************************************************************************/
+
+void
+nm_modem_broadband_get_capabilities (NMModemBroadband *self,
+                                     NMDeviceModemCapabilities *modem_caps,
+                                     NMDeviceModemCapabilities *current_caps)
+{
+	*modem_caps = (NMDeviceModemCapabilities)mm_modem_get_modem_capabilities (self->priv->modem_iface);
+	*current_caps = (NMDeviceModemCapabilities)mm_modem_get_current_capabilities (self->priv->modem_iface);
+}
+
+/*****************************************************************************/
+
+static void
+ask_for_pin (NMModemBroadband *self)
+{
+	guint32 tries;
+
+	tries = self->priv->pin_tries++;
+	nm_modem_get_secrets (NM_MODEM (self),
+	                      NM_SETTING_GSM_SETTING_NAME,
+	                      tries ? TRUE : FALSE,
+	                      NM_SETTING_GSM_PIN);
+}
+
+static void
+connect_ready (MMModemSimple *simple_iface,
+               GAsyncResult *res,
+               NMModemBroadband *self)
+{
+	GError *error = NULL;
+	guint ip_method;
+
+	g_clear_object (&self->priv->connect_properties);
+
+	self->priv->bearer = mm_modem_simple_connect_finish (simple_iface, res, &error);
+	if (!self->priv->bearer) {
+		if (g_error_matches (error,
+		                     MM_MOBILE_EQUIPMENT_ERROR,
+		                     MM_MOBILE_EQUIPMENT_ERROR_SIM_PIN) ||
+			(g_error_matches (error,
+		                          MM_CORE_ERROR,
+		                          MM_CORE_ERROR_UNAUTHORIZED) &&
+			 mm_modem_get_unlock_required (self->priv->modem_iface) == MM_MODEM_LOCK_SIM_PIN)) {
+			/* Request PIN */
+			ask_for_pin (self);
+		} else {
+			/* Strip remote error info before logging it */
+			if (g_dbus_error_is_remote_error (error))
+				g_dbus_error_strip_remote_error (error);
+
+			nm_log_warn (LOGD_MB, "(%s) failed to connect modem: %s",
+			             nm_modem_get_uid (NM_MODEM (self)),
+			             error && error->message ? error->message : "(unknown)");
+			g_signal_emit_by_name (self, NM_MODEM_PREPARE_RESULT, FALSE, translate_mm_error (error));
+		}
+
+		g_clear_error (&error);
+		g_object_unref (self);
+		return;
+	}
+
+	/* Grab IP configurations */
+	self->priv->ipv4_config = mm_bearer_get_ipv4_config (self->priv->bearer);
+	self->priv->ipv6_config = mm_bearer_get_ipv6_config (self->priv->bearer);
+
+	switch (mm_bearer_ip_config_get_method (self->priv->ipv4_config)) {
+	case MM_BEARER_IP_METHOD_PPP:
+		ip_method = MM_MODEM_IP_METHOD_PPP;
+		break;
+	case MM_BEARER_IP_METHOD_STATIC:
+		ip_method = MM_MODEM_IP_METHOD_STATIC;
+		break;
+	case MM_BEARER_IP_METHOD_DHCP:
+		ip_method = MM_MODEM_IP_METHOD_DHCP;
+		break;
+	default:
+		error = g_error_new (NM_MODEM_BROADBAND_ERROR,
+		                     NM_MODEM_BROADBAND_ERROR_CONNECTION_INVALID,
+		                     "invalid IP config");
+		nm_log_warn (LOGD_MB, "(%s) failed to connect modem: %s",
+		             nm_modem_get_uid (NM_MODEM (self)),
+		             error->message);
+		g_signal_emit_by_name (self, NM_MODEM_PREPARE_RESULT, FALSE, translate_mm_error (error));
+		g_error_free (error);
+		g_object_unref (self);
+		return;
+	}
+
+	/* IPv4 for now only */
+	g_object_set (self,
+	              NM_MODEM_DATA_PORT,  mm_bearer_get_interface (self->priv->bearer),
+	              NM_MODEM_IP_METHOD,  ip_method,
+	              NM_MODEM_IP_TIMEOUT, mm_bearer_get_ip_timeout (self->priv->bearer),
+	              NULL);
+
+	g_signal_emit_by_name (self, NM_MODEM_PREPARE_RESULT, TRUE, NM_DEVICE_STATE_REASON_NONE);
+	g_object_unref (self);
+}
+
+static MMSimpleConnectProperties *
+create_cdma_connect_properties (NMConnection *connection)
+{
+	NMSettingCdma *setting;
+	MMSimpleConnectProperties *properties;
+	const gchar *str;
+
+	setting = nm_connection_get_setting_cdma (connection);
+	properties = mm_simple_connect_properties_new ();
+
+	str = nm_setting_cdma_get_number (setting);
+	if (str)
+		mm_simple_connect_properties_set_number (properties, str);
+
+	return properties;
+}
+
+static MMSimpleConnectProperties *
+create_gsm_connect_properties (NMConnection *connection)
+{
+	NMSettingGsm *setting;
+	NMSettingPPP *s_ppp;
+	MMSimpleConnectProperties *properties;
+	const gchar *str;
+
+	setting = nm_connection_get_setting_gsm (connection);
+	properties = mm_simple_connect_properties_new ();
+
+	/* TODO: not needed */
+	str = nm_setting_gsm_get_number (setting);
+	if (str)
+		mm_simple_connect_properties_set_number (properties, str);
+
+	str = nm_setting_gsm_get_apn (setting);
+	if (str)
+		mm_simple_connect_properties_set_apn (properties, str);
+
+	str = nm_setting_gsm_get_network_id (setting);
+	if (str)
+		mm_simple_connect_properties_set_operator_id (properties, str);
+
+	str = nm_setting_gsm_get_pin (setting);
+	if (str)
+		mm_simple_connect_properties_set_pin (properties, str);
+
+	str = nm_setting_gsm_get_username (setting);
+	if (str)
+		mm_simple_connect_properties_set_user (properties, str);
+
+	str = nm_setting_gsm_get_password (setting);
+	if (str)
+		mm_simple_connect_properties_set_password (properties, str);
+
+	/* TODO: We should check SUPPORTED MODES here */
+	switch (nm_setting_gsm_get_network_type (setting)) {
+	case NM_SETTING_GSM_NETWORK_TYPE_UMTS_HSPA:
+		mm_simple_connect_properties_set_allowed_modes (properties,
+		                                                MM_MODEM_MODE_3G,
+		                                                MM_MODEM_MODE_NONE);
+		break;
+	case NM_SETTING_GSM_NETWORK_TYPE_GPRS_EDGE:
+		mm_simple_connect_properties_set_allowed_modes (properties,
+		                                                MM_MODEM_MODE_2G,
+		                                                MM_MODEM_MODE_NONE);
+		break;
+	case NM_SETTING_GSM_NETWORK_TYPE_PREFER_UMTS_HSPA:
+		mm_simple_connect_properties_set_allowed_modes (properties,
+		                                                MM_MODEM_MODE_ANY,
+		                                                MM_MODEM_MODE_3G);
+		break;
+	case NM_SETTING_GSM_NETWORK_TYPE_PREFER_GPRS_EDGE:
+		mm_simple_connect_properties_set_allowed_modes (properties,
+		                                                MM_MODEM_MODE_ANY,
+		                                                MM_MODEM_MODE_2G);
+		break;
+	case NM_SETTING_GSM_NETWORK_TYPE_PREFER_4G:
+		mm_simple_connect_properties_set_allowed_modes (properties,
+		                                                MM_MODEM_MODE_ANY,
+		                                                MM_MODEM_MODE_4G);
+		break;
+	case NM_SETTING_GSM_NETWORK_TYPE_4G:
+		mm_simple_connect_properties_set_allowed_modes (properties,
+		                                                MM_MODEM_MODE_4G,
+		                                                MM_MODEM_MODE_NONE);
+		break;
+	default:
+		mm_simple_connect_properties_set_allowed_modes (properties,
+		                                                MM_MODEM_MODE_ANY,
+		                                                MM_MODEM_MODE_NONE);
+		break;
+	}
+
+	/* Roaming */
+	if (nm_setting_gsm_get_home_only (setting))
+		mm_simple_connect_properties_set_allow_roaming (properties, FALSE);
+
+	/* For IpMethod == STATIC or DHCP */
+	s_ppp = nm_connection_get_setting_ppp (connection);
+	if (s_ppp) {
+		MMBearerAllowedAuth allowed_auth = MM_BEARER_ALLOWED_AUTH_UNKNOWN;
+
+		if (nm_setting_ppp_get_noauth (s_ppp))
+			allowed_auth = MM_BEARER_ALLOWED_AUTH_NONE;
+		if (!nm_setting_ppp_get_refuse_pap (s_ppp))
+			allowed_auth |= MM_BEARER_ALLOWED_AUTH_PAP;
+		if (!nm_setting_ppp_get_refuse_chap (s_ppp))
+			allowed_auth |= MM_BEARER_ALLOWED_AUTH_CHAP;
+		if (!nm_setting_ppp_get_refuse_mschap (s_ppp))
+			allowed_auth |= MM_BEARER_ALLOWED_AUTH_MSCHAP;
+		if (!nm_setting_ppp_get_refuse_mschapv2 (s_ppp))
+			allowed_auth |= MM_BEARER_ALLOWED_AUTH_MSCHAPV2;
+		if (!nm_setting_ppp_get_refuse_eap (s_ppp))
+			allowed_auth |= MM_BEARER_ALLOWED_AUTH_EAP;
+
+		mm_simple_connect_properties_set_allowed_auth (properties, allowed_auth);
+	}
+
+	return properties;
+}
+
+static NMActStageReturn
+act_stage1_prepare (NMModem *_self,
+                    NMActRequest *req,
+                    GPtrArray **out_hints,
+                    const char **out_setting_name,
+                    NMDeviceStateReason *reason)
+{
+	NMModemBroadband *self = NM_MODEM_BROADBAND (_self);
+	NMConnection *connection;
+
+	connection = nm_act_request_get_connection (req);
+	g_assert (connection);
+
+	*out_setting_name = nm_connection_need_secrets (connection, out_hints);
+	if (!*out_setting_name) {
+		MMModemCapability caps;
+
+		caps = mm_modem_get_current_capabilities (self->priv->modem_iface);
+
+		g_clear_object (&self->priv->connect_properties);
+
+		if (MODEM_CAPS_3GPP (caps))
+			self->priv->connect_properties = create_gsm_connect_properties (connection);
+		else if (MODEM_CAPS_3GPP2 (caps))
+			self->priv->connect_properties = create_cdma_connect_properties (connection);
+		else {
+			nm_log_warn (LOGD_MB, "(%s) not a mobile broadband modem",
+						 nm_modem_get_uid (NM_MODEM (self)));
+			return NM_ACT_STAGE_RETURN_FAILURE;
+		}
+
+		if (!self->priv->simple_iface)
+			self->priv->simple_iface = mm_object_get_modem_simple (self->priv->modem_object);
+
+		mm_modem_simple_connect (self->priv->simple_iface,
+		                         self->priv->connect_properties,
+		                         NULL,
+		                         (GAsyncReadyCallback)connect_ready,
+		                         g_object_ref (self));
+	} else {
+		/* NMModem will handle requesting secrets... */
+	}
+
+	return NM_ACT_STAGE_RETURN_POSTPONE;
+}
+
+/*****************************************************************************/
+
+static NMConnection *
+get_best_auto_connection (NMModem *_self,
+                          GSList *connections,
+                          char **specific_object)
+{
+	NMModemBroadband *self = NM_MODEM_BROADBAND (_self);
+	MMModemCapability modem_caps;
+	GSList *iter;
+
+	modem_caps = mm_modem_get_current_capabilities (self->priv->modem_iface);
+
+	for (iter = connections; iter; iter = g_slist_next (iter)) {
+		NMConnection *connection = NM_CONNECTION (iter->data);
+		NMSettingConnection *s_con;
+
+		s_con = nm_connection_get_setting_connection (connection);
+		g_assert (s_con);
+
+		if (!nm_setting_connection_get_autoconnect (s_con))
+			continue;
+
+		/* If GSM settings given and our modem is 3GPP, those are the best ones */
+		if (   g_str_equal (nm_setting_connection_get_connection_type (s_con),
+		                    NM_SETTING_GSM_SETTING_NAME)
+		    && MODEM_CAPS_3GPP (modem_caps))
+			return connection;
+
+		/* If CDMA settings given and our modem is 3GPP2, return those */
+		if (   g_str_equal (nm_setting_connection_get_connection_type (s_con),
+		                    NM_SETTING_CDMA_SETTING_NAME)
+		    && MODEM_CAPS_3GPP2 (modem_caps))
+			return connection;
+
+		/* continue */
+	}
+
+	return NULL;
+}
+
+/*****************************************************************************/
+
+static gboolean
+check_connection_compatible (NMModem *_self,
+                             NMConnection *connection,
+                             GError **error)
+{
+	NMModemBroadband *self = NM_MODEM_BROADBAND (_self);
+	MMModemCapability modem_caps;
+	NMSettingConnection *s_con;
+
+	modem_caps = mm_modem_get_current_capabilities (self->priv->modem_iface);
+	s_con = nm_connection_get_setting_connection (connection);
+	g_assert (s_con);
+
+	if (MODEM_CAPS_3GPP (modem_caps)) {
+		NMSettingGsm *s_gsm;
+
+		if (!g_str_equal (nm_setting_connection_get_connection_type (s_con),
+		                  NM_SETTING_GSM_SETTING_NAME)) {
+			g_set_error (error,
+			             NM_MODEM_BROADBAND_ERROR,
+			             NM_MODEM_BROADBAND_ERROR_CONNECTION_NOT_GSM,
+			             "The connection was not a 3GPP connection.");
+			return FALSE;
+		}
+
+		s_gsm = nm_connection_get_setting_gsm (connection);
+		if (!s_gsm) {
+			g_set_error (error,
+			             NM_MODEM_BROADBAND_ERROR,
+			             NM_MODEM_BROADBAND_ERROR_CONNECTION_INVALID,
+			             "The connection was not a valid 3GPP connection.");
+			return FALSE;
+		}
+
+		return TRUE;
+	}
+
+	if (MODEM_CAPS_3GPP2 (modem_caps)) {
+		NMSettingCdma *s_cdma;
+
+		if (!g_str_equal (nm_setting_connection_get_connection_type (s_con),
+		                  NM_SETTING_CDMA_SETTING_NAME)) {
+			g_set_error (error,
+			             NM_MODEM_BROADBAND_ERROR,
+			             NM_MODEM_BROADBAND_ERROR_CONNECTION_NOT_CDMA,
+			             "The connection was not a 3GPP2 connection.");
+			return FALSE;
+		}
+
+		s_cdma = nm_connection_get_setting_cdma (connection);
+		if (!s_cdma) {
+			g_set_error (error,
+			             NM_MODEM_BROADBAND_ERROR,
+			             NM_MODEM_BROADBAND_ERROR_CONNECTION_INVALID,
+			             "The connection was not a valid 3GPP2 connection.");
+			return FALSE;
+		}
+
+		return TRUE;
+	}
+
+	g_set_error (error,
+	             NM_MODEM_BROADBAND_ERROR,
+	             NM_MODEM_BROADBAND_ERROR_CONNECTION_INCOMPATIBLE,
+	             "Device is not a mobile broadband modem");
+	return FALSE;
+}
+
+/*****************************************************************************/
+
+static gboolean
+complete_connection (NMModem *_self,
+                     NMConnection *connection,
+                     const GSList *existing_connections,
+                     GError **error)
+{
+	NMModemBroadband *self = NM_MODEM_BROADBAND (_self);
+	MMModemCapability modem_caps;
+	NMSettingPPP *s_ppp;
+
+	modem_caps = mm_modem_get_current_capabilities (self->priv->modem_iface);
+
+	/* PPP settings common to 3GPP and 3GPP2 */
+	s_ppp = nm_connection_get_setting_ppp (connection);
+	if (!s_ppp) {
+		s_ppp = (NMSettingPPP *) nm_setting_ppp_new ();
+		g_object_set (G_OBJECT (s_ppp),
+		              NM_SETTING_PPP_LCP_ECHO_FAILURE, 5,
+		              NM_SETTING_PPP_LCP_ECHO_INTERVAL, 30,
+		              NULL);
+		nm_connection_add_setting (connection, NM_SETTING (s_ppp));
+	}
+
+	if (MODEM_CAPS_3GPP (modem_caps)) {
+		NMSettingGsm *s_gsm;
+
+		s_gsm = nm_connection_get_setting_gsm (connection);
+		if (!s_gsm || !nm_setting_gsm_get_apn (s_gsm)) {
+			/* Need an APN at least */
+			g_set_error_literal (error,
+			                     NM_SETTING_GSM_ERROR,
+			                     NM_SETTING_GSM_ERROR_MISSING_PROPERTY,
+			                     NM_SETTING_GSM_APN);
+			return FALSE;
+		}
+
+		/* TODO: This is not needed */
+		if (!nm_setting_gsm_get_number (s_gsm))
+			g_object_set (G_OBJECT (s_gsm), NM_SETTING_GSM_NUMBER, "*99#", NULL);
+
+		nm_utils_complete_generic (connection,
+		                           NM_SETTING_GSM_SETTING_NAME,
+		                           existing_connections,
+		                           _("GSM connection %d"),
+		                           NULL,
+		                           FALSE); /* No IPv6 yet by default */
+
+		return TRUE;
+	}
+
+	if (MODEM_CAPS_3GPP2 (modem_caps)) {
+		NMSettingCdma *s_cdma;
+
+		s_cdma = nm_connection_get_setting_cdma (connection);
+		if (!s_cdma) {
+			s_cdma = (NMSettingCdma *) nm_setting_cdma_new ();
+			nm_connection_add_setting (connection, NM_SETTING (s_cdma));
+		}
+
+		if (!nm_setting_cdma_get_number (s_cdma))
+			g_object_set (G_OBJECT (s_cdma), NM_SETTING_CDMA_NUMBER, "#777", NULL);
+
+		nm_utils_complete_generic (connection,
+		                           NM_SETTING_CDMA_SETTING_NAME,
+		                           existing_connections,
+		                           _("CDMA connection %d"),
+		                           NULL,
+		                           FALSE); /* No IPv6 yet by default */
+
+		return TRUE;
+	}
+
+	g_set_error (error,
+	             NM_MODEM_BROADBAND_ERROR,
+	             NM_MODEM_BROADBAND_ERROR_CONNECTION_INCOMPATIBLE,
+	             "Device is not a mobile broadband modem");
+	return FALSE;
+}
+
+/*****************************************************************************/
+
+static gboolean
+get_user_pass (NMModem *modem,
+               NMConnection *connection,
+               const char **user,
+               const char **pass)
+{
+	NMSettingGsm *s_gsm;
+	NMSettingCdma *s_cdma;
+
+	s_gsm = nm_connection_get_setting_gsm (connection);
+	s_cdma = nm_connection_get_setting_cdma (connection);
+	if (!s_gsm && !s_cdma)
+		return FALSE;
+
+	if (user) {
+		if (s_gsm)
+			*user = nm_setting_gsm_get_username (s_gsm);
+		else if (s_cdma)
+			*user = nm_setting_cdma_get_username (s_cdma);
+	}
+	if (pass) {
+		if (s_gsm)
+			*pass = nm_setting_gsm_get_password (s_gsm);
+		else if (s_cdma)
+			*pass = nm_setting_cdma_get_password (s_cdma);
+	}
+
+	return TRUE;
+}
+
+/*****************************************************************************/
+
+static const char *
+get_setting_name (NMModem *_self)
+{
+	NMModemBroadband *self = NM_MODEM_BROADBAND (_self);
+	MMModemCapability modem_caps;
+
+	modem_caps = mm_modem_get_current_capabilities (self->priv->modem_iface);
+	if (MODEM_CAPS_3GPP (modem_caps))
+		return NM_SETTING_GSM_SETTING_NAME;
+
+	if (MODEM_CAPS_3GPP2 (modem_caps))
+		return NM_SETTING_CDMA_SETTING_NAME;
+
+	return "unknown";
+}
+
+/*****************************************************************************/
+/* Query/Update enabled state */
+
+static void
+update_mm_enabled (NMModem *self,
+                   gboolean new_enabled)
+{
+	if (nm_modem_get_mm_enabled (self) != new_enabled) {
+		g_object_set (self,
+		              NM_MODEM_ENABLED, new_enabled,
+		              NULL);
+	}
+}
+
+static void
+modem_disable_ready (MMModem *modem_iface,
+                     GAsyncResult *res,
+                     NMModemBroadband *self)
+{
+	GError *error = NULL;
+
+	if (!mm_modem_disable_finish (modem_iface, res, &error)) {
+		nm_log_warn (LOGD_MB, "(%s) failed to disable modem: %s",
+		             nm_modem_get_uid (NM_MODEM (self)),
+		             error && error->message ? error->message : "(unknown)");
+		g_clear_error (&error);
+	} else
+		/* Update enabled/disabled state again */
+		update_mm_enabled (NM_MODEM (self), FALSE);
+
+	/* Balance refcount */
+	g_object_unref (self);
+}
+
+static void
+modem_enable_ready (MMModem *modem_iface,
+                    GAsyncResult *res,
+                    NMModemBroadband *self)
+{
+	GError *error = NULL;
+
+	if (!mm_modem_enable_finish (modem_iface, res, &error)) {
+		nm_log_warn (LOGD_MB, "(%s) failed to enable modem: %s",
+		             nm_modem_get_uid (NM_MODEM (self)),
+		             error && error->message ? error->message : "(unknown)");
+		g_clear_error (&error);
+	} else
+		update_mm_enabled (NM_MODEM (self), TRUE);
+
+	/* Balance refcount */
+	g_object_unref (self);
+}
+
+static void
+set_mm_enabled (NMModem *_self,
+                gboolean enabled)
+{
+	NMModemBroadband *self = NM_MODEM_BROADBAND (_self);
+
+	if (enabled) {
+		/* Don't even try to enable if we're known to be already locked */
+		if (mm_modem_get_state (self->priv->modem_iface) == MM_MODEM_STATE_LOCKED) {
+			nm_log_warn (LOGD_MB, "(%s) cannot enable modem: locked",
+			             nm_modem_get_uid (NM_MODEM (self)));
+			g_signal_emit_by_name (self, NM_MODEM_AUTH_REQUESTED, 0);
+			return;
+		}
+
+		mm_modem_enable (self->priv->modem_iface,
+		                 NULL, /* cancellable */
+		                 (GAsyncReadyCallback)modem_enable_ready,
+		                 g_object_ref (self));
+	} else {
+		mm_modem_disable (self->priv->modem_iface,
+		                  NULL, /* cancellable */
+		                  (GAsyncReadyCallback)modem_disable_ready,
+		                  g_object_ref (self));
+
+		/* When disabling don't say we're enabled */
+		update_mm_enabled (NM_MODEM (self), enabled);
+	}
+}
+
+/*****************************************************************************/
+/* IP method static */
+
+static gboolean
+ip_string_to_network_address (const gchar *str,
+                              guint32 *out)
+{
+	struct in_addr addr;
+
+	/* IP address */
+	if (inet_pton (AF_INET, str, &addr) <= 0)
+		return FALSE;
+
+	*out = (guint32)addr.s_addr;
+	return TRUE;
+}
+
+static gboolean
+static_stage3_done (NMModemBroadband *self)
+{
+	GError *error = NULL;
+	NMIP4Config *config = NULL;
+	const gchar *address_string;
+	guint32 address_network;
+	NMIP4Address *addr;
+	const gchar **dns;
+	guint i;
+	guint prefix;
+
+	g_assert (self->priv->ipv4_config);
+
+	nm_log_info (LOGD_MB, "(%s): IPv4 static configuration:",
+	             nm_modem_get_uid (NM_MODEM (self)));
+
+	/* Fully fail if invalid IP address retrieved */
+	address_string = mm_bearer_ip_config_get_address (self->priv->ipv4_config);
+	if (!ip_string_to_network_address (address_string, &address_network)) {
+		error = g_error_new (NM_MODEM_BROADBAND_ERROR,
+		                     NM_MODEM_BROADBAND_ERROR_CONNECTION_INVALID,
+		                     "(%s) retrieving IP4 configuration failed: invalid address given '%s'",
+		                     nm_modem_get_uid (NM_MODEM (self)),
+		                     address_string);
+		goto out;
+	}
+
+	config = nm_ip4_config_new ();
+	addr = nm_ip4_address_new ();
+	nm_ip4_address_set_address (addr, address_network);
+	prefix = mm_bearer_ip_config_get_prefix (self->priv->ipv4_config);
+	if (prefix > 0)
+		nm_ip4_address_set_prefix (addr, prefix);
+	nm_ip4_config_take_address (config, addr);
+
+	nm_log_info (LOGD_MB, "  address %s/%d",
+	             mm_bearer_ip_config_get_address (self->priv->ipv4_config),
+	             mm_bearer_ip_config_get_prefix (self->priv->ipv4_config));
+
+	/* DNS servers */
+	dns = mm_bearer_ip_config_get_dns (self->priv->ipv4_config);
+	for (i = 0; dns[i]; i++) {
+		if (   ip_string_to_network_address (dns[i], &address_network)
+		    && address_network > 0) {
+			nm_ip4_config_add_nameserver (config, address_network);
+			nm_log_info (LOGD_MB, "  DNS %s", dns[i]);
+		}
+	}
+
+out:
+	g_signal_emit_by_name (self, NM_MODEM_IP4_CONFIG_RESULT, config, error);
+	g_clear_error (&error);
+	return FALSE;
+}
+
+static NMActStageReturn
+static_stage3_ip4_config_start (NMModem *_self,
+                                NMActRequest *req,
+                                NMDeviceStateReason *reason)
+{
+	NMModemBroadband *self = NM_MODEM_BROADBAND (_self);
+
+	/* We schedule it in an idle just to follow the same logic as in the
+	 * generic modem implementation. */
+	g_idle_add ((GSourceFunc)static_stage3_done, self);
+
+	return NM_ACT_STAGE_RETURN_POSTPONE;
+}
+
+/*****************************************************************************/
+/* Disconnect */
+
+typedef struct {
+	NMModemBroadband *self;
+	gboolean warn;
+} SimpleDisconnectContext;
+
+static void
+simple_disconnect_context_free (SimpleDisconnectContext *ctx)
+{
+	g_object_unref (ctx->self);
+	g_slice_free (SimpleDisconnectContext, ctx);
+}
+
+static void
+simple_disconnect_ready (MMModemSimple *modem_iface,
+                         GAsyncResult *res,
+                         SimpleDisconnectContext *ctx)
+{
+	GError *error = NULL;
+
+	if (!mm_modem_simple_disconnect_finish (modem_iface, res, &error)) {
+		if (ctx->warn)
+			nm_log_warn (LOGD_MB, "(%s) failed to disconnect modem: %s",
+			             nm_modem_get_uid (NM_MODEM (ctx->self)),
+			             error && error->message ? error->message : "(unknown)");
+		g_clear_error (&error);
+	}
+
+	simple_disconnect_context_free (ctx);
+}
+
+static void
+disconnect (NMModem *self,
+            gboolean warn)
+{
+	SimpleDisconnectContext *ctx;
+
+	ctx = g_slice_new (SimpleDisconnectContext);
+	ctx->self = g_object_ref (self);
+
+	/* Don't bother warning on FAILED since the modem is already gone */
+	ctx->warn = warn;
+
+	mm_modem_simple_disconnect (
+		ctx->self->priv->simple_iface,
+		NULL, /* bearer path; if NULL given ALL get disconnected */
+		NULL, /* cancellable */
+		(GAsyncReadyCallback)simple_disconnect_ready,
+		ctx);
+}
+
+/*****************************************************************************/
+
+static void
+deactivate (NMModem *_self, NMDevice *device)
+{
+	NMModemBroadband *self = NM_MODEM_BROADBAND (_self);
+
+	/* TODO: cancel SimpleConnect() if any */
+
+	/* Cleanup IPv4 addresses and routes */
+	g_clear_object (&self->priv->ipv4_config);
+	g_clear_object (&self->priv->ipv6_config);
+	g_clear_object (&self->priv->bearer);
+
+	self->priv->pin_tries = 0;
+
+	/* Chain up parent's */
+	NM_MODEM_CLASS (nm_modem_broadband_parent_class)->deactivate (_self, device);
+}
+
+/*****************************************************************************/
+
+static void
+modem_state_changed (MMModem *modem,
+                     MMModemState old_state,
+                     MMModemState new_state,
+                     MMModemStateChangeReason reason,
+                     NMModemBroadband *self)
+{
+	gboolean old;
+	gboolean new;
+
+	nm_log_info (LOGD_MB, "(%s) state changed, '%s' --> '%s' (reason: %s)\n",
+	             nm_modem_get_uid (NM_MODEM (self)),
+	             mm_modem_state_get_string (old_state),
+	             mm_modem_state_get_string (new_state),
+	             mm_modem_state_change_reason_get_string (reason));
+
+	old = nm_modem_get_mm_enabled (NM_MODEM (self));
+	new = (mm_modem_get_state (self->priv->modem_iface) >= MM_MODEM_STATE_ENABLED);
+	if (old != new)
+		g_object_set (self,
+		              NM_MODEM_ENABLED, new,
+		              NULL);
+
+	old = nm_modem_get_mm_connected (NM_MODEM (self));
+	new = (mm_modem_get_state (self->priv->modem_iface) >= MM_MODEM_STATE_CONNECTED);
+	if (old != new)
+		g_object_set (self,
+		              NM_MODEM_CONNECTED, new,
+		              NULL);
+}
+
+/*****************************************************************************/
+
+NMModem *
+nm_modem_broadband_new (GObject *object)
+{
+	MMObject *modem_object;
+	MMModem *modem_iface;
+
+	g_return_val_if_fail (MM_IS_OBJECT (object), NULL);
+	modem_object = MM_OBJECT (object);
+
+	/* Ensure we have the 'Modem' interface and the primary port at least */
+	modem_iface = mm_object_peek_modem (modem_object);
+	g_return_val_if_fail (!!modem_iface, NULL);
+	g_return_val_if_fail (!!mm_modem_get_primary_port (modem_iface), NULL);
+
+	/* If the modem is in 'FAILED' state we cannot do anything with it.
+	 * This happens when a severe error happened when trying to initialize it,
+	 * like missing SIM. */
+	if (mm_modem_get_state (modem_iface) == MM_MODEM_STATE_FAILED) {
+		nm_log_warn (LOGD_MB, "(%s): unusable modem detected",
+					 mm_modem_get_primary_port (modem_iface));
+		return NULL;
+	}
+
+	return (NMModem *) g_object_new (NM_TYPE_MODEM_BROADBAND,
+	                                 NM_MODEM_PATH, mm_object_get_path (modem_object),
+	                                 NM_MODEM_UID, mm_modem_get_primary_port (modem_iface),
+	                                 NM_MODEM_CONTROL_PORT, mm_modem_get_primary_port (modem_iface),
+	                                 NM_MODEM_DATA_PORT, NULL, /* We don't know it until bearer created */
+	                                 NM_MODEM_BROADBAND_MODEM, modem_object,
+	                                 NULL);
+}
+
+static void
+nm_modem_broadband_init (NMModemBroadband *self)
+{
+	self->priv = G_TYPE_INSTANCE_GET_PRIVATE (self,
+	                                          NM_TYPE_MODEM_BROADBAND,
+	                                          NMModemBroadbandPrivate);
+}
+
+static void
+set_property (GObject *object,
+              guint prop_id,
+			  const GValue *value,
+              GParamSpec *pspec)
+{
+	NMModemBroadband *self = NM_MODEM_BROADBAND (object);
+
+	switch (prop_id) {
+	case PROP_MODEM:
+		/* construct-only */
+		self->priv->modem_object = g_value_dup_object (value);
+		self->priv->modem_iface = mm_object_get_modem (self->priv->modem_object);
+		g_assert (self->priv->modem_iface != NULL);
+		g_signal_connect (self->priv->modem_iface,
+                          "state-changed",
+                          G_CALLBACK (modem_state_changed),
+                          self);
+
+		g_object_set (object,
+		              NM_MODEM_ENABLED, (mm_modem_get_state (self->priv->modem_iface) >= MM_MODEM_STATE_ENABLED),
+		              NM_MODEM_CONNECTED, (mm_modem_get_state (self->priv->modem_iface) >= MM_MODEM_STATE_CONNECTED),
+		              NULL);
+
+		/* Note: don't grab the Simple iface here; the Modem interface is the
+		 * only one assumed to be always valid and available */
+		break;
+	default:
+		G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
+		break;
+	}
+}
+
+static void
+get_property (GObject *object,
+              guint prop_id,
+			  GValue *value,
+              GParamSpec *pspec)
+{
+	NMModemBroadband *self = NM_MODEM_BROADBAND (object);
+
+	switch (prop_id) {
+	case PROP_MODEM:
+		g_value_set_object (value, self->priv->modem_object);
+		break;
+	default:
+		G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
+		break;
+	}
+}
+
+static void
+dispose (GObject *object)
+{
+	NMModemBroadband *self = NM_MODEM_BROADBAND (object);
+
+	g_clear_object (&self->priv->ipv4_config);
+	g_clear_object (&self->priv->ipv6_config);
+	g_clear_object (&self->priv->bearer);
+	g_clear_object (&self->priv->modem_iface);
+	g_clear_object (&self->priv->simple_iface);
+	g_clear_object (&self->priv->modem_object);
+
+	G_OBJECT_CLASS (nm_modem_broadband_parent_class)->dispose (object);
+}
+
+static void
+nm_modem_broadband_class_init (NMModemBroadbandClass *klass)
+{
+	GObjectClass *object_class = G_OBJECT_CLASS (klass);
+	NMModemClass *modem_class = NM_MODEM_CLASS (klass);
+
+	g_type_class_add_private (object_class, sizeof (NMModemBroadbandPrivate));
+
+	/* Virtual methods */
+	object_class->dispose = dispose;
+	object_class->get_property = get_property;
+	object_class->set_property = set_property;
+
+	modem_class->static_stage3_ip4_config_start = static_stage3_ip4_config_start;
+	modem_class->disconnect = disconnect;
+	modem_class->deactivate = deactivate;
+	modem_class->set_mm_enabled = set_mm_enabled;
+	modem_class->get_user_pass = get_user_pass;
+	modem_class->get_setting_name = get_setting_name;
+	modem_class->get_best_auto_connection = get_best_auto_connection;
+	modem_class->check_connection_compatible = check_connection_compatible;
+	modem_class->complete_connection = complete_connection;
+	modem_class->act_stage1_prepare = act_stage1_prepare;
+
+	/* Properties */
+	g_object_class_install_property
+		(object_class, PROP_MODEM,
+		 g_param_spec_object (NM_MODEM_BROADBAND_MODEM,
+		                      "Modem",
+		                      "Broadband modem object",
+		                      MM_GDBUS_TYPE_OBJECT,
+		                      G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY));
+}
diff --git a/src/modem-manager/nm-modem-broadband.h b/src/modem-manager/nm-modem-broadband.h
new file mode 100644
index 00000000..005c3853
--- /dev/null
+++ b/src/modem-manager/nm-modem-broadband.h
@@ -0,0 +1,69 @@
+/* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */
+/* NetworkManager -- Network link manager
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Copyright (C) 2012 - Aleksander Morgado 
+ */
+
+#ifndef NM_MODEM_BROADBAND_H
+#define NM_MODEM_BROADBAND_H
+
+#include 
+#include 
+#include "nm-modem.h"
+
+G_BEGIN_DECLS
+
+#define NM_TYPE_MODEM_BROADBAND            (nm_modem_broadband_get_type ())
+#define NM_MODEM_BROADBAND(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), NM_TYPE_MODEM_BROADBAND, NMModemBroadband))
+#define NM_MODEM_BROADBAND_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass),  NM_TYPE_MODEM_BROADBAND, NMModemBroadbandClass))
+#define NM_IS_MODEM_BROADBAND(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), NM_TYPE_MODEM_BROADBAND))
+#define NM_IS_MODEM_BROADBAND_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass),  NM_TYPE_MODEM_BROADBAND))
+#define NM_MODEM_BROADBAND_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj),  NM_TYPE_MODEM_BROADBAND, NMModemBroadbandClass))
+
+#define NM_MODEM_BROADBAND_MODEM "modem"
+
+typedef struct _NMModemBroadband        NMModemBroadband;
+typedef struct _NMModemBroadbandClass   NMModemBroadbandClass;
+typedef struct _NMModemBroadbandPrivate NMModemBroadbandPrivate;
+
+typedef enum {
+	NM_MODEM_BROADBAND_ERROR_CONNECTION_NOT_GSM,      /*< nick=ConnectionNotGsm >*/
+	NM_MODEM_BROADBAND_ERROR_CONNECTION_NOT_CDMA,     /*< nick=ConnectionNotCdma >*/
+	NM_MODEM_BROADBAND_ERROR_CONNECTION_INVALID,      /*< nick=ConnectionInvalid >*/
+	NM_MODEM_BROADBAND_ERROR_CONNECTION_INCOMPATIBLE, /*< nick=ConnectionIncompatible >*/
+} NMModemBroadbandError;
+
+struct _NMModemBroadband {
+	NMModem parent;
+	NMModemBroadbandPrivate *priv;
+};
+
+struct _NMModemBroadbandClass {
+	NMModemClass parent;
+};
+
+GType nm_modem_broadband_get_type (void);
+
+NMModem *nm_modem_broadband_new (GObject *object);
+
+void nm_modem_broadband_get_capabilities (NMModemBroadband *self,
+                                          NMDeviceModemCapabilities *modem_caps,
+                                          NMDeviceModemCapabilities *current_caps);
+
+G_END_DECLS
+
+#endif /* NM_MODEM_BROADBAND_H */
diff --git a/src/modem-manager/nm-modem-cdma.c b/src/modem-manager/nm-modem-cdma.c
index fa19a342..73c87c28 100644
--- a/src/modem-manager/nm-modem-cdma.c
+++ b/src/modem-manager/nm-modem-cdma.c
@@ -37,7 +37,7 @@
 #include "NetworkManagerUtils.h"
 #include "nm-logging.h"
 
-G_DEFINE_TYPE (NMModemCdma, nm_modem_cdma, NM_TYPE_MODEM)
+G_DEFINE_TYPE (NMModemCdma, nm_modem_cdma, NM_TYPE_MODEM_GENERIC)
 
 #define NM_MODEM_CDMA_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), NM_TYPE_MODEM_CDMA, NMModemCdmaPrivate))
 
@@ -62,19 +62,20 @@ nm_cdma_error_quark (void)
 
 NMModem *
 nm_modem_cdma_new (const char *path,
-                   const char *device,
                    const char *data_device,
-                   guint32 ip_method)
+                   guint32 ip_method,
+                   NMModemState state)
 {
 	g_return_val_if_fail (path != NULL, NULL);
-	g_return_val_if_fail (device != NULL, NULL);
 	g_return_val_if_fail (data_device != NULL, NULL);
 
 	return (NMModem *) g_object_new (NM_TYPE_MODEM_CDMA,
 	                                 NM_MODEM_PATH, path,
-	                                 NM_MODEM_DEVICE, device,
-	                                 NM_MODEM_IFACE, data_device,
+	                                 NM_MODEM_UID, data_device,
+	                                 NM_MODEM_CONTROL_PORT, NULL,
+	                                 NM_MODEM_DATA_PORT, data_device,
 	                                 NM_MODEM_IP_METHOD, ip_method,
+	                                 NM_MODEM_CONNECTED, (state == NM_MODEM_STATE_CONNECTED),
 	                                 NULL);
 }
 
@@ -109,7 +110,7 @@ do_connect (NMModemCdma *self)
 	NMModemCdmaPrivate *priv = NM_MODEM_CDMA_GET_PRIVATE (self);
 	DBusGProxy *proxy;
 
-	proxy = nm_modem_get_proxy (NM_MODEM (self), MM_DBUS_INTERFACE_MODEM_SIMPLE);
+	proxy = nm_modem_generic_get_proxy (NM_MODEM_GENERIC (self), MM_OLD_DBUS_INTERFACE_MODEM_SIMPLE);
 	priv->call = dbus_g_proxy_begin_call_with_timeout (proxy,
 	                                                   "Connect", stage1_prepare_done,
 	                                                   self, NULL, 120000,
@@ -152,11 +153,11 @@ create_connect_properties (NMConnection *connection)
 }
 
 static NMActStageReturn
-real_act_stage1_prepare (NMModem *modem,
-                         NMActRequest *req,
-                         GPtrArray **out_hints,
-                         const char **out_setting_name,
-                         NMDeviceStateReason *reason)
+act_stage1_prepare (NMModem *modem,
+                    NMActRequest *req,
+                    GPtrArray **out_hints,
+                    const char **out_setting_name,
+                    NMDeviceStateReason *reason)
 {
 	NMModemCdma *self = NM_MODEM_CDMA (modem);
 	NMModemCdmaPrivate *priv = NM_MODEM_CDMA_GET_PRIVATE (self);
@@ -177,7 +178,7 @@ real_act_stage1_prepare (NMModem *modem,
 		if (enabled)
 			do_connect (self);
 		else {
-			proxy = nm_modem_get_proxy (modem, MM_DBUS_INTERFACE_MODEM);
+			proxy = nm_modem_generic_get_proxy (NM_MODEM_GENERIC (modem), MM_OLD_DBUS_INTERFACE_MODEM);
 			dbus_g_proxy_begin_call_with_timeout (proxy,
 			                                      "Enable", stage1_enable_done,
 			                                      modem, NULL, 20000,
@@ -192,9 +193,9 @@ real_act_stage1_prepare (NMModem *modem,
 }
 
 static NMConnection *
-real_get_best_auto_connection (NMModem *modem,
-							   GSList *connections,
-							   char **specific_object)
+get_best_auto_connection (NMModem *modem,
+                          GSList *connections,
+                          char **specific_object)
 {
 	GSList *iter;
 
@@ -217,9 +218,9 @@ real_get_best_auto_connection (NMModem *modem,
 }
 
 static gboolean
-real_check_connection_compatible (NMModem *modem,
-                                  NMConnection *connection,
-                                  GError **error)
+check_connection_compatible (NMModem *modem,
+                             NMConnection *connection,
+                             GError **error)
 {
 	NMSettingConnection *s_con;
 	NMSettingCdma *s_cdma;
@@ -246,10 +247,10 @@ real_check_connection_compatible (NMModem *modem,
 }
 
 static gboolean
-real_complete_connection (NMModem *modem,
-                          NMConnection *connection,
-                          const GSList *existing_connections,
-                          GError **error)
+complete_connection (NMModem *modem,
+                     NMConnection *connection,
+                     const GSList *existing_connections,
+                     GError **error)
 {
 	NMSettingCdma *s_cdma;
 	NMSettingPPP *s_ppp;
@@ -284,10 +285,10 @@ real_complete_connection (NMModem *modem,
 }
 
 static gboolean
-real_get_user_pass (NMModem *modem,
-                    NMConnection *connection,
-                    const char **user,
-                    const char **pass)
+get_user_pass (NMModem *modem,
+               NMConnection *connection,
+               const char **user,
+               const char **pass)
 {
 	NMSettingCdma *s_cdma;
 
@@ -304,25 +305,25 @@ real_get_user_pass (NMModem *modem,
 }
 
 static const char *
-real_get_setting_name (NMModem *modem)
+get_setting_name (NMModem *modem)
 {
 	return NM_SETTING_CDMA_SETTING_NAME;
 }
 
 static void
-real_deactivate (NMModem *modem, NMDevice *device)
+deactivate (NMModem *modem, NMDevice *device)
 {
 	NMModemCdmaPrivate *priv = NM_MODEM_CDMA_GET_PRIVATE (modem);
 
 	if (priv->call) {
 		DBusGProxy *proxy;
 
-		proxy = nm_modem_get_proxy (modem, MM_DBUS_INTERFACE_MODEM_SIMPLE);
+		proxy = nm_modem_generic_get_proxy (NM_MODEM_GENERIC (modem), MM_OLD_DBUS_INTERFACE_MODEM_SIMPLE);
 		dbus_g_proxy_cancel_call (proxy, priv->call);
 		priv->call = NULL;
 	}
 
-	NM_MODEM_CLASS (nm_modem_cdma_parent_class)->deactivate (modem, device);	
+	NM_MODEM_CLASS (nm_modem_cdma_parent_class)->deactivate (modem, device);
 }
 
 /*****************************************************************************/
@@ -354,13 +355,13 @@ nm_modem_cdma_class_init (NMModemCdmaClass *klass)
 
 	/* Virtual methods */
 	object_class->dispose = dispose;
-	modem_class->get_user_pass = real_get_user_pass;
-	modem_class->get_setting_name = real_get_setting_name;
-	modem_class->get_best_auto_connection = real_get_best_auto_connection;
-	modem_class->check_connection_compatible = real_check_connection_compatible;
-	modem_class->complete_connection = real_complete_connection;
-	modem_class->act_stage1_prepare = real_act_stage1_prepare;
-	modem_class->deactivate = real_deactivate;
+	modem_class->get_user_pass = get_user_pass;
+	modem_class->get_setting_name = get_setting_name;
+	modem_class->get_best_auto_connection = get_best_auto_connection;
+	modem_class->check_connection_compatible = check_connection_compatible;
+	modem_class->complete_connection = complete_connection;
+	modem_class->act_stage1_prepare = act_stage1_prepare;
+	modem_class->deactivate = deactivate;
 
 	dbus_g_error_domain_register (NM_CDMA_ERROR, NULL, NM_TYPE_CDMA_ERROR);
 }
diff --git a/src/modem-manager/nm-modem-cdma.h b/src/modem-manager/nm-modem-cdma.h
index 2229c183..ab1b4874 100644
--- a/src/modem-manager/nm-modem-cdma.h
+++ b/src/modem-manager/nm-modem-cdma.h
@@ -22,14 +22,14 @@
 #ifndef NM_MODEM_CDMA_H
 #define NM_MODEM_CDMA_H
 
-#include 
+#include 
 
 G_BEGIN_DECLS
 
-#define NM_TYPE_MODEM_CDMA			  (nm_modem_cdma_get_type ())
-#define NM_MODEM_CDMA(obj)			  (G_TYPE_CHECK_INSTANCE_CAST ((obj), NM_TYPE_MODEM_CDMA, NMModemCdma))
-#define NM_MODEM_CDMA_CLASS(klass)	  (G_TYPE_CHECK_CLASS_CAST ((klass),  NM_TYPE_MODEM_CDMA, NMModemCdmaClass))
-#define NM_IS_MODEM_CDMA(obj)		  (G_TYPE_CHECK_INSTANCE_TYPE ((obj), NM_TYPE_MODEM_CDMA))
+#define NM_TYPE_MODEM_CDMA            (nm_modem_cdma_get_type ())
+#define NM_MODEM_CDMA(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), NM_TYPE_MODEM_CDMA, NMModemCdma))
+#define NM_MODEM_CDMA_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass),  NM_TYPE_MODEM_CDMA, NMModemCdmaClass))
+#define NM_IS_MODEM_CDMA(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), NM_TYPE_MODEM_CDMA))
 #define NM_IS_MODEM_CDMA_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass),  NM_TYPE_MODEM_CDMA))
 #define NM_MODEM_CDMA_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj),  NM_TYPE_MODEM_CDMA, NMModemCdmaClass))
 
@@ -40,22 +40,19 @@ typedef enum {
 } NMCdmaError;
 
 typedef struct {
-	NMModem parent;
+	NMModemGeneric parent;
 } NMModemCdma;
 
 typedef struct {
-	NMModemClass parent;
-
-	/* Signals */
-	void (*signal_quality) (NMModemCdma *self, guint32 quality);
+	NMModemGenericClass parent;
 } NMModemCdmaClass;
 
 GType nm_modem_cdma_get_type (void);
 
 NMModem *nm_modem_cdma_new (const char *path,
-                            const char *device,
                             const char *data_device,
-                            guint32 ip_method);
+                            guint32 ip_method,
+                            NMModemState state);
 
 G_END_DECLS
 
diff --git a/src/modem-manager/nm-modem-generic.c b/src/modem-manager/nm-modem-generic.c
new file mode 100644
index 00000000..f4e7a52f
--- /dev/null
+++ b/src/modem-manager/nm-modem-generic.c
@@ -0,0 +1,445 @@
+/* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */
+/* NetworkManager -- Network link manager
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Copyright (C) 2009 - 2011 Red Hat, Inc.
+ * Copyright (C) 2009 Novell, Inc.
+ */
+
+#include 
+#include "nm-modem-generic.h"
+#include "nm-system.h"
+#include "nm-dbus-manager.h"
+#include "nm-setting-connection.h"
+#include "nm-marshal.h"
+#include "nm-properties-changed-signal.h"
+#include "nm-modem-types.h"
+#include "nm-logging.h"
+#include "NetworkManagerUtils.h"
+#include "nm-device-private.h"
+#include "nm-dbus-glib-types.h"
+
+G_DEFINE_TYPE (NMModemGeneric, nm_modem_generic, NM_TYPE_MODEM)
+
+#define NM_MODEM_GENERIC_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), NM_TYPE_MODEM_GENERIC, NMModemGenericPrivate))
+
+typedef struct {
+	NMDBusManager *dbus_mgr;
+	DBusGProxy *proxy;
+	DBusGProxy *props_proxy;
+
+	DBusGProxyCall *call;
+
+	NMModemState state;
+} NMModemGenericPrivate;
+
+/*****************************************************************************/
+
+DBusGProxy *
+nm_modem_generic_get_proxy (NMModemGeneric *self,
+                            const char *interface)
+{
+
+	NMModemGenericPrivate *priv = NM_MODEM_GENERIC_GET_PRIVATE (self);
+	const char *current_iface;
+
+	g_return_val_if_fail (NM_IS_MODEM_GENERIC (self), NULL);
+
+	/* Default to the default interface. */
+	if (interface == NULL)
+		interface = MM_OLD_DBUS_INTERFACE_MODEM;
+
+	if (interface && !strcmp (interface, DBUS_INTERFACE_PROPERTIES))
+		return priv->props_proxy;
+
+	current_iface = dbus_g_proxy_get_interface (priv->proxy);
+	if (!current_iface || strcmp (current_iface, interface))
+		dbus_g_proxy_set_interface (priv->proxy, interface);
+
+	return priv->proxy;
+}
+
+/*****************************************************************************/
+/* Query/Update enabled state */
+
+static void
+update_mm_enabled (NMModem *self,
+                   gboolean new_enabled)
+{
+	if (nm_modem_get_mm_enabled (self) != new_enabled) {
+		g_object_set (self,
+		              NM_MODEM_ENABLED, new_enabled,
+		              NULL);
+	}
+}
+
+static void
+get_mm_enabled_done (DBusGProxy *proxy, DBusGProxyCall *call_id, gpointer user_data)
+{
+	NMModem *self = NM_MODEM (user_data);
+	GError *error = NULL;
+	GValue value = { 0, };
+
+	if (!dbus_g_proxy_end_call (proxy, call_id, &error,
+	                            G_TYPE_VALUE, &value,
+	                            G_TYPE_INVALID)) {
+		nm_log_warn (LOGD_MB, "failed get modem enabled state: (%d) %s",
+		             error ? error->code : -1,
+		             error && error->message ? error->message : "(unknown)");
+		return;
+	}
+
+	if (G_VALUE_HOLDS_BOOLEAN (&value)) {
+		update_mm_enabled (self, g_value_get_boolean (&value));
+	} else
+		nm_log_warn (LOGD_MB, "failed get modem enabled state: unexpected reply type");
+
+	g_value_unset (&value);
+}
+
+static void
+query_mm_enabled (NMModemGeneric *self)
+{
+	dbus_g_proxy_begin_call (NM_MODEM_GENERIC_GET_PRIVATE (self)->props_proxy,
+	                         "Get", get_mm_enabled_done,
+	                         self, NULL,
+	                         G_TYPE_STRING, MM_OLD_DBUS_INTERFACE_MODEM,
+	                         G_TYPE_STRING, "Enabled",
+	                         G_TYPE_INVALID);
+}
+
+static void
+set_mm_enabled_done (DBusGProxy *proxy, DBusGProxyCall *call_id, gpointer user_data)
+{
+	GError *error = NULL;
+
+	if (!dbus_g_proxy_end_call (proxy, call_id, &error, G_TYPE_INVALID)) {
+		nm_log_warn (LOGD_MB, "failed to enable/disable modem: (%d) %s",
+		             error ? error->code : -1,
+		             error && error->message ? error->message : "(unknown)");
+	}
+
+	/* Update enabled/disabled state again */
+	query_mm_enabled (NM_MODEM_GENERIC (user_data));
+}
+
+static void
+set_mm_enabled (NMModem *self, gboolean enabled)
+{
+	/* FIXME: For now this just toggles the ModemManager enabled state.  In the
+	 * future we want to tie this into rfkill state instead so that the user can
+	 * toggle rfkill status of the WWAN modem.
+	 */
+	dbus_g_proxy_begin_call (nm_modem_generic_get_proxy (NM_MODEM_GENERIC (self),
+	                                                     MM_OLD_DBUS_INTERFACE_MODEM),
+	                         "Enable", set_mm_enabled_done,
+	                         self, NULL,
+	                         G_TYPE_BOOLEAN, enabled,
+	                         G_TYPE_INVALID);
+	/* If we are disabling the modem, stop saying that it's enabled. */
+	if (!enabled)
+		update_mm_enabled (self, enabled);
+}
+
+/*****************************************************************************/
+/* IP method static */
+
+static char addr_to_string_buf[INET6_ADDRSTRLEN + 1];
+
+static const char *
+ip_address_to_string (guint32 numeric)
+{
+	struct in_addr temp_addr;
+
+	memset (&addr_to_string_buf, '\0', sizeof (addr_to_string_buf));
+	temp_addr.s_addr = numeric;
+
+	if (inet_ntop (AF_INET, &temp_addr, addr_to_string_buf, INET_ADDRSTRLEN)) {
+		return addr_to_string_buf;
+	} else {
+		nm_log_warn (LOGD_VPN, "error converting IP4 address 0x%X",
+		             ntohl (temp_addr.s_addr));
+		return NULL;
+	}
+}
+
+static void
+static_stage3_done (DBusGProxy *proxy, DBusGProxyCall *call, gpointer user_data)
+{
+	NMModemGeneric *self = NM_MODEM_GENERIC (user_data);
+	NMModemGenericPrivate *priv = NM_MODEM_GENERIC_GET_PRIVATE (self);
+	GValueArray *ret_array = NULL;
+	GError *error = NULL;
+	NMIP4Config *config = NULL;
+
+	priv->call = NULL;
+
+	/* Returned value array is (uuuu): [IP, DNS1, DNS2, DNS3], all in
+	 * network byte order.
+	 */
+	if (dbus_g_proxy_end_call (proxy, call, &error,
+	                           G_TYPE_VALUE_ARRAY, &ret_array,
+	                           G_TYPE_INVALID)) {
+		NMIP4Address *addr;
+		int i;
+
+		config = nm_ip4_config_new ();
+
+		addr = nm_ip4_address_new ();
+
+		nm_log_info (LOGD_MB, "(%s): IPv4 static configuration:",
+		             nm_modem_get_uid (NM_MODEM (self)));
+
+		/* IP address */
+		nm_ip4_address_set_address (addr, g_value_get_uint (g_value_array_get_nth (ret_array, 0)));
+		nm_ip4_address_set_prefix (addr, 32);
+		nm_ip4_config_take_address (config, addr);
+
+		nm_log_info (LOGD_MB, "  address %s/%d",
+		             ip_address_to_string (nm_ip4_address_get_address (addr)),
+		             nm_ip4_address_get_prefix (addr));
+
+		/* DNS servers */
+		for (i = 1; i < ret_array->n_values; i++) {
+			GValue *value = g_value_array_get_nth (ret_array, i);
+			guint32 tmp = g_value_get_uint (value);
+
+			if (tmp > 0) {
+				nm_ip4_config_add_nameserver (config, tmp);
+				nm_log_info (LOGD_MB, "  DNS %s", ip_address_to_string (tmp));
+			}
+		}
+		g_value_array_free (ret_array);
+	}
+
+	g_signal_emit_by_name (self, NM_MODEM_IP4_CONFIG_RESULT, config, error);
+	g_clear_error (&error);
+}
+
+static NMActStageReturn
+static_stage3_ip4_config_start (NMModem *self,
+                                NMActRequest *req,
+                                NMDeviceStateReason *reason)
+{
+	NMModemGenericPrivate *priv;
+
+	g_return_val_if_fail (self != NULL, NM_ACT_STAGE_RETURN_FAILURE);
+	g_return_val_if_fail (NM_IS_MODEM (self), NM_ACT_STAGE_RETURN_FAILURE);
+	g_return_val_if_fail (req != NULL, NM_ACT_STAGE_RETURN_FAILURE);
+	g_return_val_if_fail (NM_IS_ACT_REQUEST (req), NM_ACT_STAGE_RETURN_FAILURE);
+	g_return_val_if_fail (reason !=	NULL, NM_ACT_STAGE_RETURN_FAILURE);
+
+	priv = NM_MODEM_GENERIC_GET_PRIVATE (self);
+
+	priv->call = dbus_g_proxy_begin_call (nm_modem_generic_get_proxy (NM_MODEM_GENERIC (self),
+	                                                                  MM_OLD_DBUS_INTERFACE_MODEM),
+	                                      "GetIP4Config", static_stage3_done,
+	                                      self, NULL,
+	                                      G_TYPE_INVALID);
+
+	return NM_ACT_STAGE_RETURN_POSTPONE;
+}
+
+/*****************************************************************************/
+
+static void
+disconnect_done (DBusGProxy *proxy,
+                 DBusGProxyCall *call_id,
+                 gpointer user_data)
+{
+	GError *error = NULL;
+	gboolean warn = GPOINTER_TO_UINT (user_data);
+
+	if (!dbus_g_proxy_end_call (proxy, call_id, &error, G_TYPE_INVALID) && warn) {
+		nm_log_info (LOGD_MB, "disconnect failed: (%d) %s",
+		             error ? error->code : -1,
+		             error && error->message ? error->message : "(unknown)");
+	}
+}
+
+static void
+disconnect (NMModem *self,
+            gboolean warn)
+{
+	dbus_g_proxy_begin_call (nm_modem_generic_get_proxy (NM_MODEM_GENERIC (self),
+	                                                     MM_OLD_DBUS_INTERFACE_MODEM),
+	                         "Disconnect",
+	                         disconnect_done,
+	                         GUINT_TO_POINTER (warn),
+	                         NULL,
+	                         G_TYPE_INVALID);
+}
+
+/*****************************************************************************/
+
+static void
+deactivate (NMModem *self, NMDevice *device)
+{
+	NMModemGenericPrivate *priv;
+
+	g_assert (NM_IS_MODEM_GENERIC (self));
+	g_assert (NM_IS_DEVICE (device));
+
+	priv = NM_MODEM_GENERIC_GET_PRIVATE (self);
+
+	if (priv->call) {
+		dbus_g_proxy_cancel_call (priv->proxy, priv->call);
+		priv->call = NULL;
+	}
+
+	/* Chain up parent's */
+	NM_MODEM_CLASS (nm_modem_generic_parent_class)->deactivate (self, device);
+}
+
+/*****************************************************************************/
+
+static void
+modem_properties_changed (DBusGProxy *proxy,
+                          const char *interface,
+                          GHashTable *props,
+                          gpointer user_data)
+{
+	NMModemGeneric *self = NM_MODEM_GENERIC (user_data);
+	NMModemGenericPrivate *priv = NM_MODEM_GENERIC_GET_PRIVATE (self);
+	GValue *value;
+	NMModemState new_state;
+
+	if (strcmp (interface, MM_OLD_DBUS_INTERFACE_MODEM))
+		return;
+
+	value = g_hash_table_lookup (props, "Enabled");
+	if (value && G_VALUE_HOLDS_BOOLEAN (value)) {
+		g_object_set (self,
+		              NM_MODEM_ENABLED, g_value_get_boolean (value),
+		              NULL);
+	}
+
+	value = g_hash_table_lookup (props, "IpMethod");
+	if (value && G_VALUE_HOLDS_UINT (value)) {
+		g_object_set (self,
+		              NM_MODEM_IP_METHOD, g_value_get_uint (value),
+		              NULL);
+	}
+
+	value = g_hash_table_lookup (props, "State");
+	if (value && G_VALUE_HOLDS_UINT (value)) {
+		new_state = g_value_get_uint (value);
+		if (new_state != priv->state) {
+			if (new_state == NM_MODEM_STATE_CONNECTED)
+				g_object_set (self,
+				              NM_MODEM_CONNECTED, TRUE,
+				              NULL);
+			else if (priv->state == NM_MODEM_STATE_CONNECTED)
+				g_object_set (self,
+				              NM_MODEM_CONNECTED, FALSE,
+				              NULL);
+			priv->state = new_state;
+		}
+	}
+}
+
+/*****************************************************************************/
+
+static void
+nm_modem_generic_init (NMModemGeneric *self)
+{
+	NMModemGenericPrivate *priv = NM_MODEM_GENERIC_GET_PRIVATE (self);
+
+	priv->dbus_mgr = nm_dbus_manager_get ();
+}
+
+static GObject*
+constructor (GType type,
+			 guint n_construct_params,
+			 GObjectConstructParam *construct_params)
+{
+	GObject *object;
+	NMModemGenericPrivate *priv;
+	DBusGConnection *bus;
+
+	object = G_OBJECT_CLASS (nm_modem_generic_parent_class)->constructor (type, n_construct_params, construct_params);
+	if (!object)
+		return NULL;
+
+	priv = NM_MODEM_GENERIC_GET_PRIVATE (object);
+
+	bus = nm_dbus_manager_get_connection (priv->dbus_mgr);
+	priv->proxy = dbus_g_proxy_new_for_name (bus,
+	                                         MM_OLD_DBUS_SERVICE,
+	                                         nm_modem_get_path (NM_MODEM (object)),
+	                                         MM_OLD_DBUS_INTERFACE_MODEM);
+
+	priv->props_proxy = dbus_g_proxy_new_for_name (bus,
+	                                               MM_OLD_DBUS_SERVICE,
+	                                               nm_modem_get_path (NM_MODEM (object)),
+	                                               DBUS_INTERFACE_PROPERTIES);
+	dbus_g_object_register_marshaller (_nm_marshal_VOID__STRING_BOXED,
+	                                   G_TYPE_NONE,
+	                                   G_TYPE_STRING, DBUS_TYPE_G_MAP_OF_VARIANT,
+	                                   G_TYPE_INVALID);
+	dbus_g_proxy_add_signal (priv->props_proxy, "MmPropertiesChanged",
+	                         G_TYPE_STRING, DBUS_TYPE_G_MAP_OF_VARIANT,
+	                         G_TYPE_INVALID);
+	dbus_g_proxy_connect_signal (priv->props_proxy, "MmPropertiesChanged",
+	                             G_CALLBACK (modem_properties_changed),
+	                             object,
+	                             NULL);
+
+	query_mm_enabled (NM_MODEM_GENERIC (object));
+
+	return object;
+}
+
+static void
+dispose (GObject *object)
+{
+	NMModemGenericPrivate *priv = NM_MODEM_GENERIC_GET_PRIVATE (object);
+
+	if (priv->proxy) {
+		g_object_unref (priv->proxy);
+		priv->proxy = NULL;
+	}
+
+	if (priv->props_proxy) {
+		g_object_unref (priv->props_proxy);
+		priv->props_proxy = NULL;
+	}
+
+	if (priv->dbus_mgr) {
+		g_object_unref (priv->dbus_mgr);
+		priv->dbus_mgr = NULL;
+	}
+
+	G_OBJECT_CLASS (nm_modem_generic_parent_class)->dispose (object);
+}
+
+static void
+nm_modem_generic_class_init (NMModemGenericClass *klass)
+{
+	GObjectClass *object_class = G_OBJECT_CLASS (klass);
+	NMModemClass *modem_class = NM_MODEM_CLASS (klass);
+
+	g_type_class_add_private (object_class, sizeof (NMModemGenericPrivate));
+
+	/* Virtual methods */
+	object_class->constructor = constructor;
+	object_class->dispose = dispose;
+
+	modem_class->static_stage3_ip4_config_start = static_stage3_ip4_config_start;
+	modem_class->disconnect = disconnect;
+	modem_class->deactivate = deactivate;
+	modem_class->set_mm_enabled = set_mm_enabled;
+}
diff --git a/src/modem-manager/nm-modem-generic.h b/src/modem-manager/nm-modem-generic.h
new file mode 100644
index 00000000..59866a1e
--- /dev/null
+++ b/src/modem-manager/nm-modem-generic.h
@@ -0,0 +1,69 @@
+/* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */
+/* NetworkManager -- Network link manager
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Copyright (C) 2009 - 2011 Red Hat, Inc.
+ * Copyright (C) 2009 Novell, Inc.
+ */
+
+#ifndef NM_MODEM_GENERIC_H
+#define NM_MODEM_GENERIC_H
+
+#include 
+#include 
+#include "nm-modem.h"
+
+G_BEGIN_DECLS
+
+#define NM_TYPE_MODEM_GENERIC            (nm_modem_generic_get_type ())
+#define NM_MODEM_GENERIC(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), NM_TYPE_MODEM_GENERIC, NMModemGeneric))
+#define NM_MODEM_GENERIC_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass),  NM_TYPE_MODEM_GENERIC, NMModemGenericClass))
+#define NM_IS_MODEM_GENERIC(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), NM_TYPE_MODEM_GENERIC))
+#define NM_IS_MODEM_GENERIC_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass),  NM_TYPE_MODEM_GENERIC))
+#define NM_MODEM_GENERIC_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj),  NM_TYPE_MODEM_GENERIC, NMModemGenericClass))
+
+typedef enum {
+    NM_MODEM_STATE_UNKNOWN = 0,
+    NM_MODEM_STATE_DISABLED = 10,
+    NM_MODEM_STATE_DISABLING = 20,
+    NM_MODEM_STATE_ENABLING = 30,
+    NM_MODEM_STATE_ENABLED = 40,
+    NM_MODEM_STATE_SEARCHING = 50,
+    NM_MODEM_STATE_REGISTERED = 60,
+    NM_MODEM_STATE_DISCONNECTING = 70,
+    NM_MODEM_STATE_CONNECTING = 80,
+    NM_MODEM_STATE_CONNECTED = 90,
+
+    NM_MODEM_STATE_LAST = NM_MODEM_STATE_CONNECTED
+} NMModemState;
+
+typedef struct {
+	NMModem parent;
+} NMModemGeneric;
+
+typedef struct {
+	NMModemClass parent;
+} NMModemGenericClass;
+
+GType nm_modem_generic_get_type (void);
+
+/* Protected */
+DBusGProxy *nm_modem_generic_get_proxy (NMModemGeneric *modem,
+                                        const gchar *interface);
+
+G_END_DECLS
+
+#endif /* NM_MODEM_GENERIC_H */
diff --git a/src/modem-manager/nm-modem-gsm.c b/src/modem-manager/nm-modem-gsm.c
index 183b4780..b6d3c857 100644
--- a/src/modem-manager/nm-modem-gsm.c
+++ b/src/modem-manager/nm-modem-gsm.c
@@ -58,8 +58,10 @@ typedef enum {
     MM_MODEM_GSM_ALLOWED_MODE_3G_PREFERRED = 2,
     MM_MODEM_GSM_ALLOWED_MODE_2G_ONLY      = 3,
     MM_MODEM_GSM_ALLOWED_MODE_3G_ONLY      = 4,
+    MM_MODEM_GSM_ALLOWED_MODE_4G_PREFERRED = 5,
+    MM_MODEM_GSM_ALLOWED_MODE_4G_ONLY      = 6,
 
-    MM_MODEM_GSM_ALLOWED_MODE_LAST = MM_MODEM_GSM_ALLOWED_MODE_3G_ONLY
+    MM_MODEM_GSM_ALLOWED_MODE_LAST = MM_MODEM_GSM_ALLOWED_MODE_4G_ONLY
 } MMModemGsmAllowedMode;
 
 typedef enum {
@@ -75,7 +77,7 @@ typedef enum {
     MM_MODEM_GSM_ALLOWED_AUTH_LAST = MM_MODEM_GSM_ALLOWED_AUTH_EAP
 } MMModemGsmAllowedAuth;
 
-G_DEFINE_TYPE (NMModemGsm, nm_modem_gsm, NM_TYPE_MODEM)
+G_DEFINE_TYPE (NMModemGsm, nm_modem_gsm, NM_TYPE_MODEM_GENERIC)
 
 #define NM_MODEM_GSM_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), NM_TYPE_MODEM_GSM, NMModemGsmPrivate))
 
@@ -102,19 +104,20 @@ nm_gsm_error_quark (void)
 
 NMModem *
 nm_modem_gsm_new (const char *path,
-                  const char *device,
                   const char *data_device,
-                  guint32 ip_method)
+                  guint32 ip_method,
+                  NMModemState state)
 {
 	g_return_val_if_fail (path != NULL, NULL);
-	g_return_val_if_fail (device != NULL, NULL);
 	g_return_val_if_fail (data_device != NULL, NULL);
 
 	return (NMModem *) g_object_new (NM_TYPE_MODEM_GSM,
 	                                 NM_MODEM_PATH, path,
-	                                 NM_MODEM_DEVICE, device,
-	                                 NM_MODEM_IFACE, data_device,
+	                                 NM_MODEM_UID, data_device,
+	                                 NM_MODEM_CONTROL_PORT, NULL,
+	                                 NM_MODEM_DATA_PORT, data_device,
 	                                 NM_MODEM_IP_METHOD, ip_method,
+	                                 NM_MODEM_CONNECTED, (state == NM_MODEM_STATE_CONNECTED),
 	                                 NULL);
 }
 
@@ -222,12 +225,12 @@ do_connect (NMModemGsm *self)
 	NMModemGsmPrivate *priv = NM_MODEM_GSM_GET_PRIVATE (self);
 	DBusGProxy *proxy;
 
-	proxy = nm_modem_get_proxy (NM_MODEM (self), MM_DBUS_INTERFACE_MODEM_SIMPLE);
-	dbus_g_proxy_begin_call_with_timeout (proxy,
-	                                      "Connect", stage1_prepare_done,
-	                                      self, NULL, 120000,
-	                                      DBUS_TYPE_G_MAP_OF_VARIANT, priv->connect_properties,
-	                                      G_TYPE_INVALID);
+	proxy = nm_modem_generic_get_proxy (NM_MODEM_GENERIC (self), MM_OLD_DBUS_INTERFACE_MODEM_SIMPLE);
+	priv->call = dbus_g_proxy_begin_call_with_timeout (proxy,
+	                                                   "Connect", stage1_prepare_done,
+	                                                   self, NULL, 120000,
+	                                                   DBUS_TYPE_G_MAP_OF_VARIANT, priv->connect_properties,
+	                                                   G_TYPE_INVALID);
 }
 
 static void stage1_enable_done (DBusGProxy *proxy, DBusGProxyCall *call_id, gpointer user_data);
@@ -242,7 +245,7 @@ do_enable (NMModemGsm *self)
 	g_return_val_if_fail (NM_IS_MODEM_GSM (self), FALSE);
 
 	NM_MODEM_GSM_GET_PRIVATE (self)->enable_delay_id = 0;
-	proxy = nm_modem_get_proxy (NM_MODEM (self), MM_DBUS_INTERFACE_MODEM);
+	proxy = nm_modem_generic_get_proxy (NM_MODEM_GENERIC (self), MM_OLD_DBUS_INTERFACE_MODEM);
 	dbus_g_proxy_begin_call_with_timeout (proxy,
 	                                      "Enable", stage1_enable_done,
 	                                      self, NULL, 20000,
@@ -295,7 +298,7 @@ handle_enable_pin_required (NMModemGsm *self)
 
 	/* If we do, send it */
 	if (pin) {
-		proxy = nm_modem_get_proxy (NM_MODEM (self), MM_DBUS_INTERFACE_MODEM_GSM_CARD);
+		proxy = nm_modem_generic_get_proxy (NM_MODEM_GENERIC (self), MM_OLD_DBUS_INTERFACE_MODEM_GSM_CARD);
 		dbus_g_proxy_begin_call_with_timeout (proxy,
 		                                      "SendPin", stage1_pin_done,
 		                                      self, NULL, 10000,
@@ -387,6 +390,14 @@ create_connect_properties (NMConnection *connection)
 		value_hash_add_uint (properties, "network_mode", MM_MODEM_GSM_NETWORK_DEPRECATED_MODE_2G_PREFERRED);
 		value_hash_add_uint (properties, "allowed_mode", MM_MODEM_GSM_ALLOWED_MODE_2G_PREFERRED);
 		break;
+	case NM_SETTING_GSM_NETWORK_TYPE_PREFER_4G:
+		/* deprecated modes not extended for 4G, so no need to set them here */
+		value_hash_add_uint (properties, "allowed_mode", MM_MODEM_GSM_ALLOWED_MODE_4G_PREFERRED);
+		break;
+	case NM_SETTING_GSM_NETWORK_TYPE_4G:
+		/* deprecated modes not extended for 4G, so no need to set them here */
+		value_hash_add_uint (properties, "allowed_mode", MM_MODEM_GSM_ALLOWED_MODE_4G_ONLY);
+		break;
 	default:
 		value_hash_add_uint (properties, "network_mode", MM_MODEM_GSM_NETWORK_DEPRECATED_MODE_ANY);
 		value_hash_add_uint (properties, "allowed_mode", MM_MODEM_GSM_ALLOWED_MODE_ANY);
@@ -423,11 +434,11 @@ create_connect_properties (NMConnection *connection)
 }
 
 static NMActStageReturn
-real_act_stage1_prepare (NMModem *modem,
-                         NMActRequest *req,
-                         GPtrArray **out_hints,
-                         const char **out_setting_name,
-                         NMDeviceStateReason *reason)
+act_stage1_prepare (NMModem *modem,
+                    NMActRequest *req,
+                    GPtrArray **out_hints,
+                    const char **out_setting_name,
+                    NMDeviceStateReason *reason)
 {
 	NMModemGsm *self = NM_MODEM_GSM (modem);
 	NMModemGsmPrivate *priv = NM_MODEM_GSM_GET_PRIVATE (self);
@@ -456,9 +467,9 @@ real_act_stage1_prepare (NMModem *modem,
 }
 
 static NMConnection *
-real_get_best_auto_connection (NMModem *modem,
-							   GSList *connections,
-							   char **specific_object)
+get_best_auto_connection (NMModem *modem,
+                          GSList *connections,
+                          char **specific_object)
 {
 	GSList *iter;
 
@@ -481,9 +492,9 @@ real_get_best_auto_connection (NMModem *modem,
 }
 
 static gboolean
-real_check_connection_compatible (NMModem *modem,
-                                  NMConnection *connection,
-                                  GError **error)
+check_connection_compatible (NMModem *modem,
+                             NMConnection *connection,
+                             GError **error)
 {
 	NMSettingConnection *s_con;
 	NMSettingGsm *s_gsm;
@@ -510,10 +521,10 @@ real_check_connection_compatible (NMModem *modem,
 }
 
 static gboolean
-real_complete_connection (NMModem *modem,
-                          NMConnection *connection,
-                          const GSList *existing_connections,
-                          GError **error)
+complete_connection (NMModem *modem,
+                     NMConnection *connection,
+                     const GSList *existing_connections,
+                     GError **error)
 {
 	NMSettingGsm *s_gsm;
 	NMSettingPPP *s_ppp;
@@ -552,10 +563,10 @@ real_complete_connection (NMModem *modem,
 }
 
 static gboolean
-real_get_user_pass (NMModem *modem,
-                    NMConnection *connection,
-                    const char **user,
-                    const char **pass)
+get_user_pass (NMModem *modem,
+               NMConnection *connection,
+               const char **user,
+               const char **pass)
 {
 	NMSettingGsm *s_gsm;
 
@@ -572,20 +583,20 @@ real_get_user_pass (NMModem *modem,
 }
 
 static const char *
-real_get_setting_name (NMModem *modem)
+get_setting_name (NMModem *modem)
 {
 	return NM_SETTING_GSM_SETTING_NAME;
 }
 
 static void
-real_deactivate (NMModem *modem, NMDevice *device)
+deactivate (NMModem *modem, NMDevice *device)
 {
 	NMModemGsmPrivate *priv = NM_MODEM_GSM_GET_PRIVATE (modem);
 
 	if (priv->call) {
 		DBusGProxy *proxy;
 
-		proxy = nm_modem_get_proxy (modem, MM_DBUS_INTERFACE_MODEM_SIMPLE);
+		proxy = nm_modem_generic_get_proxy (NM_MODEM_GENERIC (modem), MM_OLD_DBUS_INTERFACE_MODEM_SIMPLE);
 		dbus_g_proxy_cancel_call (proxy, priv->call);
 		priv->call = NULL;
 	}
@@ -630,13 +641,13 @@ nm_modem_gsm_class_init (NMModemGsmClass *klass)
 
 	/* Virtual methods */
 	object_class->dispose = dispose;
-	modem_class->get_user_pass = real_get_user_pass;
-	modem_class->get_setting_name = real_get_setting_name;
-	modem_class->get_best_auto_connection = real_get_best_auto_connection;
-	modem_class->check_connection_compatible = real_check_connection_compatible;
-	modem_class->complete_connection = real_complete_connection;
-	modem_class->act_stage1_prepare = real_act_stage1_prepare;
-	modem_class->deactivate = real_deactivate;
+	modem_class->get_user_pass = get_user_pass;
+	modem_class->get_setting_name = get_setting_name;
+	modem_class->get_best_auto_connection = get_best_auto_connection;
+	modem_class->check_connection_compatible = check_connection_compatible;
+	modem_class->complete_connection = complete_connection;
+	modem_class->act_stage1_prepare = act_stage1_prepare;
+	modem_class->deactivate = deactivate;
 
 	dbus_g_error_domain_register (NM_GSM_ERROR, NULL, NM_TYPE_GSM_ERROR);
 }
diff --git a/src/modem-manager/nm-modem-gsm.h b/src/modem-manager/nm-modem-gsm.h
index e1c94f04..b0f78b0a 100644
--- a/src/modem-manager/nm-modem-gsm.h
+++ b/src/modem-manager/nm-modem-gsm.h
@@ -22,16 +22,16 @@
 #ifndef NM_MODEM_GSM_H
 #define NM_MODEM_GSM_H
 
-#include 
+#include 
 
 G_BEGIN_DECLS
 
-#define NM_TYPE_MODEM_GSM			 (nm_modem_gsm_get_type ())
-#define NM_MODEM_GSM(obj)			 (G_TYPE_CHECK_INSTANCE_CAST ((obj), NM_TYPE_MODEM_GSM, NMModemGsm))
-#define NM_MODEM_GSM_CLASS(klass)	 (G_TYPE_CHECK_CLASS_CAST ((klass),	 NM_TYPE_MODEM_GSM, NMModemGsmClass))
-#define NM_IS_MODEM_GSM(obj)		 (G_TYPE_CHECK_INSTANCE_TYPE ((obj), NM_TYPE_MODEM_GSM))
+#define NM_TYPE_MODEM_GSM            (nm_modem_gsm_get_type ())
+#define NM_MODEM_GSM(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), NM_TYPE_MODEM_GSM, NMModemGsm))
+#define NM_MODEM_GSM_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass),	 NM_TYPE_MODEM_GSM, NMModemGsmClass))
+#define NM_IS_MODEM_GSM(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), NM_TYPE_MODEM_GSM))
 #define NM_IS_MODEM_GSM_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass),	 NM_TYPE_MODEM_GSM))
-#define NM_MODEM_GSM_GET_CLASS(obj)	 (G_TYPE_INSTANCE_GET_CLASS ((obj),	 NM_TYPE_MODEM_GSM, NMModemGsmClass))
+#define NM_MODEM_GSM_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj),	 NM_TYPE_MODEM_GSM, NMModemGsmClass))
 
 typedef enum {
 	NM_GSM_ERROR_CONNECTION_NOT_GSM = 0,  /*< nick=ConnectionNotGsm >*/
@@ -40,22 +40,19 @@ typedef enum {
 } NMGsmError;
 
 typedef struct {
-	NMModem parent;
+	NMModemGeneric parent;
 } NMModemGsm;
 
 typedef struct {
-	NMModemClass parent;
-
-	/* Signals */
-	void (*signal_quality) (NMModemGsm *self, guint32 quality);
+	NMModemGenericClass parent;
 } NMModemGsmClass;
 
 GType nm_modem_gsm_get_type (void);
 
 NMModem *nm_modem_gsm_new (const char *path,
-                           const char *device,
                            const char *data_device,
-                           guint32 ip_method);
+                           guint32 ip_method,
+                           NMModemState state);
 
 G_END_DECLS
 
diff --git a/src/modem-manager/nm-modem-manager.c b/src/modem-manager/nm-modem-manager.c
index 051940f5..d896b468 100644
--- a/src/modem-manager/nm-modem-manager.c
+++ b/src/modem-manager/nm-modem-manager.c
@@ -21,6 +21,7 @@
  */
 
 #include 
+#include "config.h"
 #include "nm-modem-manager.h"
 #include "nm-logging.h"
 #include "nm-modem.h"
@@ -31,19 +32,33 @@
 #include "nm-marshal.h"
 #include "nm-dbus-glib-types.h"
 
+#if WITH_MODEM_MANAGER_1
+#include 
+#include "nm-modem-broadband.h"
+#endif
+
 #define MODEM_POKE_INTERVAL 120
 
 G_DEFINE_TYPE (NMModemManager, nm_modem_manager, G_TYPE_OBJECT)
 
-#define NM_MODEM_MANAGER_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), NM_TYPE_MODEM_MANAGER, NMModemManagerPrivate))
-
-typedef struct {
+struct _NMModemManagerPrivate {
+	/* ModemManager < 0.7 */
 	NMDBusManager *dbus_mgr;
 	DBusGProxy *proxy;
-	GHashTable *modems;
-	gboolean disposed;
 	guint poke_id;
-} NMModemManagerPrivate;
+
+#if WITH_MODEM_MANAGER_1
+	/* ModemManager >= 0.7 */
+	GDBusConnection *dbus_connection;
+	MMManager *modem_manager_1;
+	guint modem_manager_1_poke_id;
+	gboolean old_modem_manager_found;
+	gboolean new_modem_manager_found;
+#endif
+
+	/* Common */
+	GHashTable *modems;
+};
 
 enum {
 	MODEM_ADDED,
@@ -69,6 +84,28 @@ nm_modem_manager_get (void)
 	return singleton;
 }
 
+/************************************************************************/
+/* Support for ModemManager < 0.7 */
+
+static void
+clear_modem_manager_support (NMModemManager *self)
+{
+	if (self->priv->poke_id) {
+		g_source_remove (self->priv->poke_id);
+		self->priv->poke_id = 0;
+	}
+
+	if (self->priv->proxy) {
+		g_object_unref (self->priv->proxy);
+		self->priv->proxy = NULL;
+	}
+
+	if (self->priv->dbus_mgr) {
+		g_object_unref (self->priv->dbus_mgr);
+		self->priv->dbus_mgr = NULL;
+	}
+}
+
 static gboolean
 get_modem_properties (DBusGConnection *connection,
 					  const char *path,
@@ -77,7 +114,8 @@ get_modem_properties (DBusGConnection *connection,
 					  char **driver,
 					  guint32 *type,
 					  guint32 *ip_method,
-					  guint32 *ip_timeout)
+					  guint32 *ip_timeout,
+					  NMModemState *state)
 {
 	DBusGProxy *proxy;
 	GError *err = NULL;
@@ -87,12 +125,12 @@ get_modem_properties (DBusGConnection *connection,
 	GValue *value;
 
 	proxy = dbus_g_proxy_new_for_name (connection,
-	                                   MM_DBUS_SERVICE,
+	                                   MM_OLD_DBUS_SERVICE,
 	                                   path,
 	                                   "org.freedesktop.DBus.Properties");
 
 	if (!dbus_g_proxy_call_with_timeout (proxy, "GetAll", 15000, &err,
-	                                     G_TYPE_STRING, MM_DBUS_INTERFACE_MODEM,
+	                                     G_TYPE_STRING, MM_OLD_DBUS_INTERFACE_MODEM,
 	                                     G_TYPE_INVALID,
 	                                     DBUS_TYPE_G_MAP_OF_VARIANT, &props,
 	                                     G_TYPE_INVALID)) {
@@ -122,6 +160,8 @@ get_modem_properties (DBusGConnection *connection,
 			*driver = g_value_dup_string (value);
 		else if (g_strcmp0 (prop, "IpTimeout") == 0)
 			*ip_timeout = g_value_get_uint (value);
+		else if (g_strcmp0 (prop, "State") == 0)
+			*state = g_value_get_uint (value);
 	}
 	g_hash_table_unref (props);
 
@@ -132,23 +172,23 @@ get_modem_properties (DBusGConnection *connection,
 }
 
 static void
-create_modem (NMModemManager *manager, const char *path)
+create_modem (NMModemManager *self, const char *path)
 {
-	NMModemManagerPrivate *priv = NM_MODEM_MANAGER_GET_PRIVATE (manager);
 	NMModem *modem = NULL;
 	char *data_device = NULL, *driver = NULL, *master_device = NULL;
 	uint modem_type = MM_MODEM_TYPE_UNKNOWN;
 	uint ip_method = MM_MODEM_IP_METHOD_PPP;
 	uint ip_timeout = 0;
+	NMModemState state = NM_MODEM_STATE_UNKNOWN;
 
-	if (g_hash_table_lookup (priv->modems, path)) {
+	if (g_hash_table_lookup (self->priv->modems, path)) {
 		nm_log_warn (LOGD_MB, "modem with path %s already exists, ignoring", path);
 		return;
 	}
 
-	if (!get_modem_properties (nm_dbus_manager_get_connection (priv->dbus_mgr),
+	if (!get_modem_properties (nm_dbus_manager_get_connection (self->priv->dbus_mgr),
 	                           path, &master_device, &data_device, &driver,
-	                           &modem_type, &ip_method, &ip_timeout))
+	                           &modem_type, &ip_method, &ip_timeout, &state))
 		return;
 
 	if (modem_type == MM_MODEM_TYPE_UNKNOWN) {
@@ -172,9 +212,9 @@ create_modem (NMModemManager *manager, const char *path)
 	}
 
 	if (modem_type == MM_MODEM_TYPE_GSM)
-		modem = nm_modem_gsm_new (path, master_device, data_device, ip_method);
+		modem = nm_modem_gsm_new (path, data_device, ip_method, state);
 	else if (modem_type == MM_MODEM_TYPE_CDMA)
-		modem = nm_modem_cdma_new (path, master_device, data_device, ip_method);
+		modem = nm_modem_cdma_new (path, data_device, ip_method, state);
 	else
 		nm_log_warn (LOGD_MB, "unknown modem type '%d'", modem_type);
 
@@ -182,8 +222,8 @@ create_modem (NMModemManager *manager, const char *path)
 
 	if (modem) {
 		g_object_set (G_OBJECT (modem), NM_MODEM_IP_TIMEOUT, ip_timeout, NULL);
-		g_hash_table_insert (priv->modems, g_strdup (path), modem);
-		g_signal_emit (manager, signals[MODEM_ADDED], 0, modem, driver);
+		g_hash_table_insert (self->priv->modems, g_strdup (path), modem);
+		g_signal_emit (self, signals[MODEM_ADDED], 0, modem, driver);
 	}
 
 	g_free (driver);
@@ -198,13 +238,13 @@ modem_added (DBusGProxy *proxy, const char *path, gpointer user_data)
 static void
 modem_removed (DBusGProxy *proxy, const char *path, gpointer user_data)
 {
-	NMModemManagerPrivate *priv = NM_MODEM_MANAGER_GET_PRIVATE (user_data);
+	NMModemManager *self = NM_MODEM_MANAGER (user_data);
 	NMModem *modem;
 
-	modem = (NMModem *) g_hash_table_lookup (priv->modems, path);
+	modem = (NMModem *) g_hash_table_lookup (self->priv->modems, path);
 	if (modem) {
-		g_signal_emit (user_data, signals[MODEM_REMOVED], 0, modem);
-		g_hash_table_remove (priv->modems, path);
+		g_signal_emit (self, signals[MODEM_REMOVED], 0, modem);
+		g_hash_table_remove (self->priv->modems, path);
 	}
 }
 
@@ -229,16 +269,17 @@ static gboolean
 poke_modem_cb (gpointer user_data)
 {
 	NMModemManager *self = NM_MODEM_MANAGER (user_data);
-	NMModemManagerPrivate *priv = NM_MODEM_MANAGER_GET_PRIVATE (self);
 	DBusGConnection *g_connection;
 	DBusGProxy *proxy;
 	DBusGProxyCall *call;
 
-	g_connection = nm_dbus_manager_get_connection (priv->dbus_mgr);
+	g_connection = nm_dbus_manager_get_connection (self->priv->dbus_mgr);
 	proxy = dbus_g_proxy_new_for_name (g_connection,
-									   MM_DBUS_SERVICE,
-									   MM_DBUS_PATH,
-									   MM_DBUS_INTERFACE);
+									   MM_OLD_DBUS_SERVICE,
+									   MM_OLD_DBUS_PATH,
+									   MM_OLD_DBUS_INTERFACE);
+
+	nm_log_dbg (LOGD_MB, "Requesting to (re)launch modem-manager...");
 
 	call = dbus_g_proxy_begin_call_with_timeout (proxy,
 	                                             "EnumerateDevices",
@@ -276,33 +317,43 @@ enumerate_devices_done (DBusGProxy *proxy, DBusGProxyCall *call_id, gpointer dat
 	}
 }
 
+#if WITH_MODEM_MANAGER_1
+static void clear_modem_manager_1_support (NMModemManager *self);
+#endif
+
 static void
 modem_manager_appeared (NMModemManager *self, gboolean enumerate_devices)
 {
-	NMModemManagerPrivate *priv = NM_MODEM_MANAGER_GET_PRIVATE (self);
-
-	if (priv->poke_id) {
-		g_source_remove (priv->poke_id);
-		priv->poke_id = 0;
+	if (self->priv->poke_id) {
+		g_source_remove (self->priv->poke_id);
+		self->priv->poke_id = 0;
 	}
 
 	nm_log_info (LOGD_MB, "modem-manager is now available");
 
-	priv->proxy = dbus_g_proxy_new_for_name (nm_dbus_manager_get_connection (priv->dbus_mgr),
-											 MM_DBUS_SERVICE, MM_DBUS_PATH, MM_DBUS_INTERFACE);
+#if WITH_MODEM_MANAGER_1
+	self->priv->old_modem_manager_found = TRUE;
+	if (self->priv->new_modem_manager_found)
+		nm_log_warn (LOGD_MB, "Both the old and the new ModemManager were found");
+	else
+		clear_modem_manager_1_support (self);
+#endif
+
+	self->priv->proxy = dbus_g_proxy_new_for_name (nm_dbus_manager_get_connection (self->priv->dbus_mgr),
+	                                               MM_OLD_DBUS_SERVICE, MM_OLD_DBUS_PATH, MM_OLD_DBUS_INTERFACE);
 
-	dbus_g_proxy_add_signal (priv->proxy, "DeviceAdded", DBUS_TYPE_G_OBJECT_PATH, G_TYPE_INVALID);
-	dbus_g_proxy_connect_signal (priv->proxy, "DeviceAdded",
+	dbus_g_proxy_add_signal (self->priv->proxy, "DeviceAdded", DBUS_TYPE_G_OBJECT_PATH, G_TYPE_INVALID);
+	dbus_g_proxy_connect_signal (self->priv->proxy, "DeviceAdded",
 								 G_CALLBACK (modem_added), self,
 								 NULL);
 
-	dbus_g_proxy_add_signal (priv->proxy, "DeviceRemoved", DBUS_TYPE_G_OBJECT_PATH, G_TYPE_INVALID);
-	dbus_g_proxy_connect_signal (priv->proxy, "DeviceRemoved",
+	dbus_g_proxy_add_signal (self->priv->proxy, "DeviceRemoved", DBUS_TYPE_G_OBJECT_PATH, G_TYPE_INVALID);
+	dbus_g_proxy_connect_signal (self->priv->proxy, "DeviceRemoved",
 								 G_CALLBACK (modem_removed), self,
 								 NULL);
 
 	if (enumerate_devices)
-		dbus_g_proxy_begin_call (priv->proxy, "EnumerateDevices", enumerate_devices_done, self, NULL, G_TYPE_INVALID);
+		dbus_g_proxy_begin_call (self->priv->proxy, "EnumerateDevices", enumerate_devices_done, self, NULL, G_TYPE_INVALID);
 }
 
 static gboolean
@@ -316,19 +367,17 @@ remove_one_modem (gpointer key, gpointer value, gpointer user_data)
 static void
 modem_manager_disappeared (NMModemManager *self)
 {
-	NMModemManagerPrivate *priv = NM_MODEM_MANAGER_GET_PRIVATE (self);
-
-	g_hash_table_foreach_remove (priv->modems, remove_one_modem, self);
+	g_hash_table_foreach_remove (self->priv->modems, remove_one_modem, self);
 
-	if (priv->proxy) {
-		g_object_unref (priv->proxy);
-		priv->proxy = NULL;
+	if (self->priv->proxy) {
+		g_object_unref (self->priv->proxy);
+		self->priv->proxy = NULL;
 	}
 
 	/* Try to activate the modem-manager */
-	nm_log_info (LOGD_MB, "trying to start the modem manager...");
+	nm_log_dbg (LOGD_MB, "trying to start the modem manager...");
 	poke_modem_cb (self);
-	priv->poke_id = g_timeout_add_seconds (MODEM_POKE_INTERVAL, poke_modem_cb, self);
+	self->priv->poke_id = g_timeout_add_seconds (MODEM_POKE_INTERVAL, poke_modem_cb, self);
 }
 
 static void
@@ -342,7 +391,7 @@ nm_modem_manager_name_owner_changed (NMDBusManager *dbus_mgr,
 	gboolean new_owner_good;
 
 	/* Can't handle the signal if its not from the modem service */
-	if (strcmp (MM_DBUS_SERVICE, name) != 0)
+	if (strcmp (MM_OLD_DBUS_SERVICE, name) != 0)
 		return;
 
 	old_owner_good = (old_owner && strlen (old_owner));
@@ -356,52 +405,306 @@ nm_modem_manager_name_owner_changed (NMDBusManager *dbus_mgr,
 	}
 }
 
-/*******************************************************/
+/************************************************************************/
+/* Support for ModemManager >= 0.7 */
+
+#if WITH_MODEM_MANAGER_1
 
 static void
-nm_modem_manager_init (NMModemManager *self)
+clear_modem_manager_1_support (NMModemManager *self)
 {
-	NMModemManagerPrivate *priv = NM_MODEM_MANAGER_GET_PRIVATE (self);
+	if (self->priv->modem_manager_1_poke_id) {
+		g_source_remove (self->priv->modem_manager_1_poke_id);
+		self->priv->modem_manager_1_poke_id = 0;
+	}
 
-	priv->modems = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, g_object_unref);
-	priv->dbus_mgr = nm_dbus_manager_get ();
+	g_clear_object (&self->priv->modem_manager_1);
+	g_clear_object (&self->priv->dbus_connection);
+}
 
-	g_signal_connect (priv->dbus_mgr, NM_DBUS_MANAGER_NAME_OWNER_CHANGED,
-					  G_CALLBACK (nm_modem_manager_name_owner_changed),
-					  self);
+static void
+modem_object_added (MMManager *modem_manager,
+                    MMObject  *modem_object,
+                    NMModemManager *self)
+{
+	const gchar *path;
+	gchar *drivers;
+	MMModem *modem_iface;
+	NMModem *modem;
 
-	if (nm_dbus_manager_name_has_owner (priv->dbus_mgr, MM_DBUS_SERVICE))
-		modem_manager_appeared (self, TRUE);
+	/* Ensure we don't have the same modem already */
+	path = mm_object_get_path (modem_object);
+	if (g_hash_table_lookup (self->priv->modems, path)) {
+		nm_log_warn (LOGD_MB, "modem with path %s already exists, ignoring", path);
+		return;
+	}
+
+	/* Ensure we have the 'Modem' interface at least */
+	modem_iface = mm_object_peek_modem (modem_object);
+	if (!modem_iface) {
+		nm_log_warn (LOGD_MB, "modem with path %s doesn't have the Modem interface, ignoring", path);
+		return;
+	}
+
+	/* Ensure we have a primary port reported */
+	if (!mm_modem_get_primary_port (modem_iface)) {
+		nm_log_warn (LOGD_MB, "modem with path %s has unknown primary port, ignoring", path);
+		return;
+	}
+
+	/* Create a new modem object */
+	modem = nm_modem_broadband_new (G_OBJECT (modem_object));
+	if (!modem)
+		return;
+
+	/* Build a single string with all drivers listed */
+	drivers = g_strjoinv (", ", (gchar **)mm_modem_get_drivers (modem_iface));
+
+	/* Keep track of the new modem and notify about it */
+	g_hash_table_insert (self->priv->modems, g_strdup (path), modem);
+	g_signal_emit (self, signals[MODEM_ADDED], 0, modem, drivers);
+	g_free (drivers);
+}
+
+static void
+modem_object_removed (MMManager *manager,
+                      MMObject  *modem_object,
+                      NMModemManager *self)
+{
+	NMModem *modem;
+	const gchar *path;
+
+	path = mm_object_get_path (modem_object);
+	modem = (NMModem *) g_hash_table_lookup (self->priv->modems, path);
+	if (!modem)
+		return;
+
+	g_signal_emit (self, signals[MODEM_REMOVED], 0, modem);
+	g_hash_table_remove (self->priv->modems, path);
+}
+
+static void
+modem_manager_1_available (NMModemManager *self)
+{
+	GList *modems, *l;
+
+	nm_log_info (LOGD_MB, "ModemManager available in the bus");
+
+	self->priv->new_modem_manager_found = TRUE;
+	if (self->priv->old_modem_manager_found)
+		nm_log_warn (LOGD_MB, "Both the old and the new ModemManager were found");
 	else
-		modem_manager_disappeared (self);
+		clear_modem_manager_support (self);
+
+	/* Update initial modems list */
+    modems = g_dbus_object_manager_get_objects (G_DBUS_OBJECT_MANAGER (self->priv->modem_manager_1));
+    for (l = modems; l; l = g_list_next (l))
+	    modem_object_added (self->priv->modem_manager_1, MM_OBJECT (l->data), self);
+    g_list_free_full (modems, (GDestroyNotify) g_object_unref);
 }
 
+static void schedule_modem_manager_1_relaunch (NMModemManager *self,
+                                               guint n_seconds);
+
 static void
-dispose (GObject *object)
+modem_manager_1_name_owner_changed (MMManager *modem_manager_1,
+                                    GParamSpec *pspec,
+                                    NMModemManager *self)
 {
-	NMModemManagerPrivate *priv = NM_MODEM_MANAGER_GET_PRIVATE (object);
+	/* Quit poking, if any */
+	if (self->priv->modem_manager_1_poke_id) {
+		g_source_remove (self->priv->modem_manager_1_poke_id);
+		self->priv->modem_manager_1_poke_id = 0;
+	}
 
-	if (priv->disposed)
+	if (!g_dbus_object_manager_client_get_name_owner (G_DBUS_OBJECT_MANAGER_CLIENT (modem_manager_1))) {
+		nm_log_info (LOGD_MB, "ModemManager disappeared from bus");
+		schedule_modem_manager_1_relaunch (self, 0);
 		return;
+	}
+
+	/* Available! */
+	modem_manager_1_available (self);
+}
+
+static void
+manager_new_ready (GObject *source,
+                   GAsyncResult *res,
+                   NMModemManager *self)
+{
+	/* Note we always get an extra reference to self here */
 
-	priv->disposed = TRUE;
+	GError *error = NULL;
 
-	if (priv->poke_id) {
-		g_source_remove (priv->poke_id);
-		priv->poke_id = 0;
+	g_assert (!self->priv->modem_manager_1);
+	self->priv->modem_manager_1 = mm_manager_new_finish (res, &error);
+	if (!self->priv->modem_manager_1) {
+		if (   !g_error_matches (error, G_DBUS_ERROR, G_DBUS_ERROR_SERVICE_UNKNOWN)
+		    && !g_error_matches (error, G_DBUS_ERROR, G_DBUS_ERROR_SPAWN_EXEC_FAILED)
+		    && !g_error_matches (error, G_DBUS_ERROR, G_DBUS_ERROR_SPAWN_FORK_FAILED)
+		    && !g_error_matches (error, G_DBUS_ERROR, G_DBUS_ERROR_SPAWN_FAILED)
+		    && !g_error_matches (error, G_DBUS_ERROR, G_DBUS_ERROR_TIMEOUT)
+		    && !g_error_matches (error, G_DBUS_ERROR, G_DBUS_ERROR_SPAWN_SERVICE_NOT_FOUND)) {
+			nm_log_warn (LOGD_MB, "error creating ModemManager client: %s", error->message);
+		}
+		g_error_free (error);
+		/* Setup timeout to relaunch */
+		schedule_modem_manager_1_relaunch (self, MODEM_POKE_INTERVAL);
+	} else if (self->priv->old_modem_manager_found) {
+		/* If we found the old MM, abort */
+		clear_modem_manager_1_support (self);
+	} else {
+		gchar *name_owner;
+
+		g_signal_connect (self->priv->modem_manager_1,
+		                  "notify::name-owner",
+		                  G_CALLBACK (modem_manager_1_name_owner_changed),
+		                  self);
+		g_signal_connect (self->priv->modem_manager_1,
+		                  "object-added",
+		                  G_CALLBACK (modem_object_added),
+		                  self);
+		g_signal_connect (self->priv->modem_manager_1,
+		                  "object-removed",
+		                  G_CALLBACK (modem_object_removed),
+		                  self);
+
+		/* If there is no current owner right away, ensure we poke until we get
+		 * one */
+		name_owner = g_dbus_object_manager_client_get_name_owner (G_DBUS_OBJECT_MANAGER_CLIENT (self->priv->modem_manager_1));
+		if (!name_owner) {
+			/* Setup timeout to wait for an owner */
+			schedule_modem_manager_1_relaunch (self, MODEM_POKE_INTERVAL);
+		} else {
+			/* Available! */
+			modem_manager_1_available (self);
+			g_free (name_owner);
+		}
 	}
 
-	g_hash_table_foreach_remove (priv->modems, remove_one_modem, object);
-	g_hash_table_destroy (priv->modems);
+	/* Balance refcount */
+	g_object_unref (self);
+}
+
+static void
+recreate_client (NMModemManager *self)
+{
+	g_assert (self->priv->dbus_connection);
+
+	/* Re-create the GDBusObjectManagerClient so that we request again the owner
+	 * for the well-known name.
+	 * Note that we pass an extra reference always */
+	g_clear_object (&self->priv->modem_manager_1);
+	mm_manager_new (self->priv->dbus_connection,
+	                G_DBUS_OBJECT_MANAGER_CLIENT_FLAGS_NONE,
+	                NULL,
+	                (GAsyncReadyCallback)manager_new_ready,
+	                g_object_ref (self));
+}
+
+static void
+bus_get_ready (GObject *source,
+               GAsyncResult *res,
+               NMModemManager *self)
+{
+	/* Note we always get an extra reference to self here */
+
+	GError *error = NULL;
 
-	if (priv->proxy) {
-		g_object_unref (priv->proxy);
-		priv->proxy = NULL;
+	self->priv->dbus_connection = g_bus_get_finish (res, &error);
+	if (!self->priv->dbus_connection) {
+		nm_log_warn (LOGD_CORE, "error getting bus connection: %s", error->message);
+		g_error_free (error);
+		/* Setup timeout to relaunch */
+		schedule_modem_manager_1_relaunch (self, MODEM_POKE_INTERVAL);
+	} else if (self->priv->old_modem_manager_found) {
+		/* If we found the old MM, abort */
+		clear_modem_manager_1_support (self);
+	} else {
+		/* Got the bus, create new ModemManager client. */
+		recreate_client (self);
 	}
 
-	if (priv->dbus_mgr) {
-		g_object_unref (priv->dbus_mgr);
-		priv->dbus_mgr = NULL;
+	/* Balance refcount */
+	g_object_unref (self);
+}
+
+static gboolean
+ensure_bus (NMModemManager *self)
+{
+	nm_log_dbg (LOGD_MB, "Requesting to (re)launch ModemManager...");
+
+	/* Clear poke ID */
+	self->priv->modem_manager_1_poke_id = 0;
+
+	if (!self->priv->dbus_connection)
+		g_bus_get (G_BUS_TYPE_SYSTEM,
+		           NULL,
+		           (GAsyncReadyCallback)bus_get_ready,
+		           g_object_ref (self));
+	else
+		/* If bus is already available, launch client re-creation */
+		recreate_client (self);
+
+	return FALSE;
+}
+
+static void
+schedule_modem_manager_1_relaunch (NMModemManager *self,
+                                   guint n_seconds)
+{
+	/* No need to pass an extra reference to self; timeout/idle will be
+	 * cancelled if the object gets disposed. */
+
+	if (n_seconds)
+		self->priv->modem_manager_1_poke_id = g_timeout_add_seconds (n_seconds, (GSourceFunc)ensure_bus, self);
+	else
+		self->priv->modem_manager_1_poke_id = g_idle_add ((GSourceFunc)ensure_bus, self);
+}
+
+#endif /* WITH_MODEM_MANAGER_1 */
+
+/************************************************************************/
+
+static void
+nm_modem_manager_init (NMModemManager *self)
+{
+	self->priv = G_TYPE_INSTANCE_GET_PRIVATE (self, NM_TYPE_MODEM_MANAGER, NMModemManagerPrivate);
+
+	self->priv->modems = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, g_object_unref);
+
+	/* ModemManager < 0.7 */
+	self->priv->dbus_mgr = nm_dbus_manager_get ();
+	g_signal_connect (self->priv->dbus_mgr, NM_DBUS_MANAGER_NAME_OWNER_CHANGED,
+					  G_CALLBACK (nm_modem_manager_name_owner_changed),
+					  self);
+	if (nm_dbus_manager_name_has_owner (self->priv->dbus_mgr, MM_OLD_DBUS_SERVICE))
+		modem_manager_appeared (self, TRUE);
+	else
+		modem_manager_disappeared (self);
+
+#if WITH_MODEM_MANAGER_1
+	/* ModemManager >= 0.7 */
+	schedule_modem_manager_1_relaunch (self, 0);
+#endif
+}
+
+static void
+dispose (GObject *object)
+{
+	NMModemManager *self = NM_MODEM_MANAGER (object);
+
+	/* ModemManager < 0.7 */
+	clear_modem_manager_support (self);
+
+#if WITH_MODEM_MANAGER_1
+	/* ModemManager >= 0.7 */
+	clear_modem_manager_1_support (self);
+#endif
+
+	if (self->priv->modems) {
+		g_hash_table_foreach_remove (self->priv->modems, remove_one_modem, object);
+		g_hash_table_destroy (self->priv->modems);
 	}
 
 	/* Chain up to the parent class */
diff --git a/src/modem-manager/nm-modem-manager.h b/src/modem-manager/nm-modem-manager.h
index 56427baf..0c2b243b 100644
--- a/src/modem-manager/nm-modem-manager.h
+++ b/src/modem-manager/nm-modem-manager.h
@@ -33,18 +33,23 @@
 #define NM_IS_MODEM_MANAGER_CLASS(klass)	(G_TYPE_CHECK_CLASS_TYPE ((klass),	NM_TYPE_MODEM_MANAGER))
 #define NM_MODEM_MANAGER_GET_CLASS(obj)	(G_TYPE_INSTANCE_GET_CLASS ((obj),	NM_TYPE_MODEM_MANAGER, NMModemManagerClass))
 
-typedef struct {
+typedef struct _NMModemManager NMModemManager;
+typedef struct _NMModemManagerClass NMModemManagerClass;
+typedef struct _NMModemManagerPrivate NMModemManagerPrivate;
+
+struct _NMModemManager {
 	GObject parent;
-} NMModemManager;
+	NMModemManagerPrivate *priv;
+};
 
-typedef struct {
+struct _NMModemManagerClass {
 	GObjectClass parent;
 
 	/* Signals */
 	void (*modem_added) (NMModemManager *manager, NMModem *modem, const char *driver);
 
 	void (*modem_removed) (NMModemManager *manager, NMModem *modem);
-} NMModemManagerClass;
+};
 
 GType nm_modem_manager_get_type (void);
 
diff --git a/src/modem-manager/nm-modem-types.h b/src/modem-manager/nm-modem-types.h
index e805cb21..9fc8deed 100644
--- a/src/modem-manager/nm-modem-types.h
+++ b/src/modem-manager/nm-modem-types.h
@@ -21,37 +21,32 @@
 #ifndef NM_MODEM_TYPES_H
 #define NM_MODEM_TYPES_H
 
-#define MM_DBUS_SERVICE              "org.freedesktop.ModemManager"
-#define MM_DBUS_PATH                 "/org/freedesktop/ModemManager"
-#define MM_DBUS_INTERFACE            "org.freedesktop.ModemManager"
-#define MM_DBUS_INTERFACE_MODEM      "org.freedesktop.ModemManager.Modem"
-#define MM_DBUS_INTERFACE_MODEM_SIMPLE "org.freedesktop.ModemManager.Modem.Simple"
-#define MM_DBUS_INTERFACE_MODEM_CDMA "org.freedesktop.ModemManager.Modem.Cdma"
-
-#define MM_DBUS_INTERFACE_MODEM_GSM_CARD    "org.freedesktop.ModemManager.Modem.Gsm.Card"
-#define MM_DBUS_INTERFACE_MODEM_GSM_NETWORK "org.freedesktop.ModemManager.Modem.Gsm.Network"
+#define MM_OLD_DBUS_SERVICE                     "org.freedesktop.ModemManager"
+#define MM_OLD_DBUS_PATH                        "/org/freedesktop/ModemManager"
+#define MM_OLD_DBUS_INTERFACE                   "org.freedesktop.ModemManager"
+#define MM_OLD_DBUS_INTERFACE_MODEM             "org.freedesktop.ModemManager.Modem"
+#define MM_OLD_DBUS_INTERFACE_MODEM_SIMPLE      "org.freedesktop.ModemManager.Modem.Simple"
+#define MM_OLD_DBUS_INTERFACE_MODEM_CDMA        "org.freedesktop.ModemManager.Modem.Cdma"
+#define MM_OLD_DBUS_INTERFACE_MODEM_GSM_CARD    "org.freedesktop.ModemManager.Modem.Gsm.Card"
+#define MM_OLD_DBUS_INTERFACE_MODEM_GSM_NETWORK "org.freedesktop.ModemManager.Modem.Gsm.Network"
 
 #define MM_MODEM_TYPE_UNKNOWN  0
 #define MM_MODEM_TYPE_GSM      1
 #define MM_MODEM_TYPE_CDMA     2
 
-#define MM_MODEM_IP_METHOD_PPP    0
-#define MM_MODEM_IP_METHOD_STATIC 1
-#define MM_MODEM_IP_METHOD_DHCP   2
-
 /* Errors */
 
-#define MM_SERIAL_OPEN_FAILED MM_DBUS_INTERFACE_MODEM ".SerialOpenFailed"
-#define MM_SERIAL_SEND_FAILED MM_DBUS_INTERFACE_MODEM ".SerialSendFailed"
-#define MM_SERIAL_RESPONSE_TIMEOUT MM_DBUS_INTERFACE_MODEM ".SerialResponseTimeout"
+#define MM_SERIAL_OPEN_FAILED MM_OLD_DBUS_INTERFACE_MODEM ".SerialOpenFailed"
+#define MM_SERIAL_SEND_FAILED MM_OLD_DBUS_INTERFACE_MODEM ".SerialSendFailed"
+#define MM_SERIAL_RESPONSE_TIMEOUT MM_OLD_DBUS_INTERFACE_MODEM ".SerialResponseTimeout"
 
-#define MM_MODEM_ERROR_GENERAL MM_DBUS_INTERFACE_MODEM ".General"
-#define MM_MODEM_ERROR_OPERATION_NOT_SUPPORTED MM_DBUS_INTERFACE_MODEM ".OperationNotSupported"
+#define MM_MODEM_ERROR_GENERAL MM_OLD_DBUS_INTERFACE_MODEM ".General"
+#define MM_MODEM_ERROR_OPERATION_NOT_SUPPORTED MM_OLD_DBUS_INTERFACE_MODEM ".OperationNotSupported"
 
-#define MM_MODEM_CONNECT_ERROR_NO_CARRIER MM_DBUS_INTERFACE_MODEM ".NoCarrier"
-#define MM_MODEM_CONNECT_ERROR_NO_DIALTONE MM_DBUS_INTERFACE_MODEM ".NoDialtone"
-#define MM_MODEM_CONNECT_ERROR_BUSY MM_DBUS_INTERFACE_MODEM ".Busy"
-#define MM_MODEM_CONNECT_ERROR_NO_ANSWER MM_DBUS_INTERFACE_MODEM ".NoAnswer"
+#define MM_MODEM_CONNECT_ERROR_NO_CARRIER MM_OLD_DBUS_INTERFACE_MODEM ".NoCarrier"
+#define MM_MODEM_CONNECT_ERROR_NO_DIALTONE MM_OLD_DBUS_INTERFACE_MODEM ".NoDialtone"
+#define MM_MODEM_CONNECT_ERROR_BUSY MM_OLD_DBUS_INTERFACE_MODEM ".Busy"
+#define MM_MODEM_CONNECT_ERROR_NO_ANSWER MM_OLD_DBUS_INTERFACE_MODEM ".NoAnswer"
 
 #define MM_MODEM_ERROR "org.freedesktop.ModemManager.Modem.Gsm"
 
diff --git a/src/modem-manager/nm-modem.c b/src/modem-manager/nm-modem.c
index c43e5e16..2d24a3ea 100644
--- a/src/modem-manager/nm-modem.c
+++ b/src/modem-manager/nm-modem.c
@@ -38,35 +38,34 @@ G_DEFINE_TYPE (NMModem, nm_modem, G_TYPE_OBJECT)
 
 enum {
 	PROP_0,
-	PROP_DEVICE,
-	PROP_IFACE,
+	PROP_CONTROL_PORT,
+	PROP_DATA_PORT,
 	PROP_PATH,
+	PROP_UID,
 	PROP_IP_METHOD,
 	PROP_IP_TIMEOUT,
 	PROP_ENABLED,
+	PROP_CONNECTED,
 
 	LAST_PROP
 };
 
 typedef struct {
-	NMDBusManager *dbus_mgr;
-	DBusGProxy *proxy;
-	DBusGProxy *props_proxy;
-
+	char *uid;
 	char *path;
-	NMPPPManager *ppp_manager;
+	char *control_port;
+	char *data_port;
 	guint32 ip_method;
-	char *device;
-	char *iface;
+
+	NMPPPManager *ppp_manager;
 
 	NMActRequest *act_request;
 	guint32 secrets_tries;
 	guint32 secrets_id;
 
-	DBusGProxyCall *call;
-
 	gboolean mm_enabled;
 	guint32 mm_ip_timeout;
+	gboolean mm_connected;
 
 	/* PPP stats */
 	guint32 in_bytes;
@@ -86,47 +85,31 @@ enum {
 
 static guint signals[LAST_SIGNAL] = { 0 };
 
-static void
-update_mm_enabled (NMModem *self, gboolean new_enabled)
-{
-	NMModemPrivate *priv = NM_MODEM_GET_PRIVATE (self);
-
-	if (priv->mm_enabled != new_enabled) {
-		priv->mm_enabled = new_enabled;
-		g_object_notify (G_OBJECT (self), NM_MODEM_ENABLED);
-	}
-}
+/*****************************************************************************/
+/* Get/Set enabled/connected */
 
 gboolean
 nm_modem_get_mm_enabled (NMModem *self)
 {
-	g_return_val_if_fail (NM_IS_MODEM (self), TRUE);
-
 	return NM_MODEM_GET_PRIVATE (self)->mm_enabled;
 }
 
-DBusGProxy *
-nm_modem_get_proxy (NMModem *self,
-					const char *interface)
+void
+nm_modem_set_mm_enabled (NMModem *self,
+                         gboolean enabled)
 {
+	NMModemPrivate *priv;
 
-	NMModemPrivate *priv = NM_MODEM_GET_PRIVATE (self);
-	const char *current_iface;
-
-	g_return_val_if_fail (NM_IS_MODEM (self), NULL);
-
-	/* Default to the default interface. */
-	if (interface == NULL)
-		interface = MM_DBUS_INTERFACE_MODEM;
-
-	if (interface && !strcmp (interface, DBUS_INTERFACE_PROPERTIES))
-		return priv->props_proxy;
+	priv = NM_MODEM_GET_PRIVATE (self);
 
-	current_iface = dbus_g_proxy_get_interface (priv->proxy);
-	if (!current_iface || strcmp (current_iface, interface))
-		dbus_g_proxy_set_interface (priv->proxy, interface);
+	if (priv->mm_enabled != enabled)
+		NM_MODEM_GET_CLASS (self)->set_mm_enabled (self, enabled);
+}
 
-	return priv->proxy;
+gboolean
+nm_modem_get_mm_connected (NMModem *self)
+{
+	return NM_MODEM_GET_PRIVATE (self)->mm_connected;
 }
 
 /*****************************************************************************/
@@ -154,6 +137,7 @@ ppp_ip4_config (NMPPPManager *ppp_manager,
 				gpointer user_data)
 {
 	NMModem *self = NM_MODEM (user_data);
+	NMModemPrivate *priv = NM_MODEM_GET_PRIVATE (self);
 	guint32 i, num;
 	guint32 bad_dns1 = htonl (0x0A0B0C0D);
 	guint32 good_dns1 = htonl (0x04020201);  /* GTE nameserver */
@@ -161,6 +145,11 @@ ppp_ip4_config (NMPPPManager *ppp_manager,
 	guint32 good_dns2 = htonl (0x04020202);  /* GTE nameserver */
 	gboolean dns_workaround = FALSE;
 
+	/* Notify about the new data port to use */
+	g_free (priv->data_port);
+	priv->data_port = g_strdup (iface);
+	g_object_notify (G_OBJECT (self), NM_MODEM_DATA_PORT);
+
 	/* Work around a PPP bug (#1732) which causes many mobile broadband
 	 * providers to return 10.11.12.13 and 10.11.12.14 for the DNS servers.
 	 * Apparently fixed in ppp-2.4.5 but we've had some reports that this is
@@ -197,7 +186,7 @@ ppp_ip4_config (NMPPPManager *ppp_manager,
 		nm_ip4_config_add_nameserver (config, good_dns2);
 	}
 
-	g_signal_emit (self, signals[IP4_CONFIG_RESULT], 0, iface, config, NULL);
+	g_signal_emit (self, signals[IP4_CONFIG_RESULT], 0, config, NULL);
 }
 
 static void
@@ -250,17 +239,17 @@ ppp_stage3_ip4_config_start (NMModem *self,
 		ip_timeout = priv->mm_ip_timeout;
 	}
 
-	priv->ppp_manager = nm_ppp_manager_new (priv->iface);
+	priv->ppp_manager = nm_ppp_manager_new (priv->data_port);
 	if (nm_ppp_manager_start (priv->ppp_manager, req, ppp_name, ip_timeout, &error)) {
 		g_signal_connect (priv->ppp_manager, "state-changed",
-						  G_CALLBACK (ppp_state_changed),
-						  self);
+		                  G_CALLBACK (ppp_state_changed),
+		                  self);
 		g_signal_connect (priv->ppp_manager, "ip4-config",
-						  G_CALLBACK (ppp_ip4_config),
-						  self);
+		                  G_CALLBACK (ppp_ip4_config),
+		                  self);
 		g_signal_connect (priv->ppp_manager, "stats",
-						  G_CALLBACK (ppp_stats),
-						  self);
+		                  G_CALLBACK (ppp_stats),
+		                  self);
 
 		ret = NM_ACT_STAGE_RETURN_POSTPONE;
 	} else {
@@ -279,103 +268,6 @@ ppp_stage3_ip4_config_start (NMModem *self,
 	return ret;
 }
 
-/*****************************************************************************/
-/* IP method static */
-
-static char addr_to_string_buf[INET6_ADDRSTRLEN + 1];
-
-static const char *
-ip_address_to_string (guint32 numeric)
-{
-	struct in_addr temp_addr;
-
-	memset (&addr_to_string_buf, '\0', sizeof (addr_to_string_buf));
-	temp_addr.s_addr = numeric;
-
-	if (inet_ntop (AF_INET, &temp_addr, addr_to_string_buf, INET_ADDRSTRLEN)) {
-		return addr_to_string_buf;
-	} else {
-		nm_log_warn (LOGD_VPN, "error converting IP4 address 0x%X",
-		             ntohl (temp_addr.s_addr));
-		return NULL;
-	}
-}
-
-static void
-static_stage3_done (DBusGProxy *proxy, DBusGProxyCall *call, gpointer user_data)
-{
-	NMModem *self = NM_MODEM (user_data);
-	NMModemPrivate *priv = NM_MODEM_GET_PRIVATE (self);
-	GValueArray *ret_array = NULL;
-	GError *error = NULL;
-	NMIP4Config *config = NULL;
-
-	priv->call = NULL;
-
-	/* Returned value array is (uuuu): [IP, DNS1, DNS2, DNS3], all in
-	 * network byte order.
-	 */
-	if (dbus_g_proxy_end_call (proxy, call, &error,
-	                           G_TYPE_VALUE_ARRAY, &ret_array,
-	                           G_TYPE_INVALID)) {
-		NMIP4Address *addr;
-		int i;
-
-		config = nm_ip4_config_new ();
-
-		addr = nm_ip4_address_new ();
-
-		nm_log_info (LOGD_MB, "(%s): IPv4 static configuration:", priv->iface);
-
-		/* IP address */
-		nm_ip4_address_set_address (addr, g_value_get_uint (g_value_array_get_nth (ret_array, 0)));
-		nm_ip4_address_set_prefix (addr, 32);
-		nm_ip4_config_take_address (config, addr);
-
-		nm_log_info (LOGD_MB, "  address %s/%d",
-		             ip_address_to_string (nm_ip4_address_get_address (addr)),
-		             nm_ip4_address_get_prefix (addr));
-
-		/* DNS servers */
-		for (i = 1; i < ret_array->n_values; i++) {
-			GValue *value = g_value_array_get_nth (ret_array, i);
-			guint32 tmp = g_value_get_uint (value);
-
-			if (tmp > 0) {
-				nm_ip4_config_add_nameserver (config, tmp);
-				nm_log_info (LOGD_MB, "  DNS %s", ip_address_to_string (tmp));
-			}
-		}
-		g_value_array_free (ret_array);
-	}
-
-	g_signal_emit (self, signals[IP4_CONFIG_RESULT], 0, NULL, config, error);
-	g_clear_error (&error);
-}
-
-static NMActStageReturn
-static_stage3_ip4_config_start (NMModem *self,
-                                NMActRequest *req,
-                                NMDeviceStateReason *reason)
-{
-	NMModemPrivate *priv;
-
-	g_return_val_if_fail (self != NULL, NM_ACT_STAGE_RETURN_FAILURE);
-	g_return_val_if_fail (NM_IS_MODEM (self), NM_ACT_STAGE_RETURN_FAILURE);
-	g_return_val_if_fail (req != NULL, NM_ACT_STAGE_RETURN_FAILURE);
-	g_return_val_if_fail (NM_IS_ACT_REQUEST (req), NM_ACT_STAGE_RETURN_FAILURE);
-	g_return_val_if_fail (reason !=	NULL, NM_ACT_STAGE_RETURN_FAILURE);
-
-	priv = NM_MODEM_GET_PRIVATE (self);
-
-	priv->call = dbus_g_proxy_begin_call (nm_modem_get_proxy (self, MM_DBUS_INTERFACE_MODEM),
-	                                      "GetIP4Config", static_stage3_done,
-	                                      self, NULL,
-	                                      G_TYPE_INVALID);
-
-	return NM_ACT_STAGE_RETURN_POSTPONE;
-}
-
 /*****************************************************************************/
 
 NMActStageReturn
@@ -405,7 +297,7 @@ nm_modem_stage3_ip4_config_start (NMModem *self,
 		ret = ppp_stage3_ip4_config_start (self, req, reason);
 		break;
 	case MM_MODEM_IP_METHOD_STATIC:
-		ret = static_stage3_ip4_config_start (self, req, reason);
+		ret = NM_MODEM_GET_CLASS (self)->static_stage3_ip4_config_start (self, req, reason);
 		break;
 	case MM_MODEM_IP_METHOD_DHCP:
 		ret = device_class->act_stage3_ip4_config_start (device, NULL, reason);
@@ -419,6 +311,29 @@ nm_modem_stage3_ip4_config_start (NMModem *self,
 	return ret;
 }
 
+void
+nm_modem_ip4_pre_commit (NMModem *modem,
+                         NMDevice *device,
+                         NMIP4Config *config)
+{
+	NMModemPrivate *priv = NM_MODEM_GET_PRIVATE (modem);
+
+	/* If the modem has an ethernet-type data interface (ie, not PPP and thus
+	 * not point-to-point) and IP config has a /32 prefix, then we assume that
+	 * ARP will be pointless and we turn it off.
+	 */
+	if (   priv->ip_method == MM_MODEM_IP_METHOD_STATIC
+	    || priv->ip_method == MM_MODEM_IP_METHOD_DHCP) {
+		NMIP4Address *addr = nm_ip4_config_get_address (config, 0);
+
+		g_assert (addr);
+		if (nm_ip4_address_get_prefix (addr) == 32)
+			nm_system_iface_set_arp (nm_device_get_ip_ifindex (device), FALSE);
+	}
+}
+
+/*****************************************************************************/
+
 NMActStageReturn
 nm_modem_stage3_ip6_config_start (NMModem *self,
                                   NMDevice *device,
@@ -430,6 +345,8 @@ nm_modem_stage3_ip6_config_start (NMModem *self,
 	return NM_ACT_STAGE_RETURN_POSTPONE;
 }
 
+/*****************************************************************************/
+
 static void
 cancel_get_secrets (NMModem *self)
 {
@@ -486,12 +403,14 @@ nm_modem_get_secrets (NMModem *self,
 	return !!(priv->secrets_id);
 }
 
+/*****************************************************************************/
+
 static NMActStageReturn
-real_act_stage1_prepare (NMModem *modem,
-                         NMActRequest *req,
-                         GPtrArray **out_hints,
-                         const char **out_setting_name,
-                         NMDeviceStateReason *reason)
+act_stage1_prepare (NMModem *modem,
+                    NMActRequest *req,
+                    GPtrArray **out_hints,
+                    const char **out_setting_name,
+                    NMDeviceStateReason *reason)
 {
 	*reason = NM_DEVICE_STATE_REASON_UNKNOWN;
 	return NM_ACT_STAGE_RETURN_FAILURE;
@@ -541,6 +460,8 @@ nm_modem_act_stage1_prepare (NMModem *self,
 	return ret;
 }
 
+/*****************************************************************************/
+
 NMActStageReturn
 nm_modem_act_stage2_config (NMModem *self,
                             NMActRequest *req,
@@ -556,6 +477,8 @@ nm_modem_act_stage2_config (NMModem *self,
 	return NM_ACT_STAGE_RETURN_SUCCESS;
 }
 
+/*****************************************************************************/
+
 NMConnection *
 nm_modem_get_best_auto_connection (NMModem *self,
                                    GSList *connections,
@@ -566,6 +489,8 @@ nm_modem_get_best_auto_connection (NMModem *self,
 	return NULL;
 }
 
+/*****************************************************************************/
+
 gboolean
 nm_modem_check_connection_compatible (NMModem *self,
                                       NMConnection *connection,
@@ -576,6 +501,8 @@ nm_modem_check_connection_compatible (NMModem *self,
 	return FALSE;
 }
 
+/*****************************************************************************/
+
 gboolean
 nm_modem_complete_connection (NMModem *self,
                               NMConnection *connection,
@@ -587,8 +514,10 @@ nm_modem_complete_connection (NMModem *self,
 	return FALSE;
 }
 
+/*****************************************************************************/
+
 static void
-real_deactivate (NMModem *self, NMDevice *device)
+deactivate (NMModem *self, NMDevice *device)
 {
 	NMModemPrivate *priv;
 	int ifindex;
@@ -608,11 +537,6 @@ real_deactivate (NMModem *self, NMDevice *device)
 		priv->act_request = NULL;
 	}
 
-	if (priv->call) {
-		dbus_g_proxy_cancel_call (priv->proxy, priv->call);
-		priv->call = NULL;
-	}
-
 	priv->in_bytes = priv->out_bytes = 0;
 
 	if (priv->ppp_manager) {
@@ -639,24 +563,15 @@ real_deactivate (NMModem *self, NMDevice *device)
 	}
 }
 
+/*****************************************************************************/
+
 void
 nm_modem_deactivate (NMModem *self, NMDevice *device)
 {
 	NM_MODEM_GET_CLASS (self)->deactivate (self, device);
 }
 
-static void
-disconnect_done (DBusGProxy *proxy, DBusGProxyCall *call_id, gpointer user_data)
-{
-	GError *error = NULL;
-	gboolean warn = GPOINTER_TO_UINT (user_data);
-
-	if (!dbus_g_proxy_end_call (proxy, call_id, &error, G_TYPE_INVALID) && warn) {
-		nm_log_info (LOGD_MB, "disconnect failed: (%d) %s",
-		             error ? error->code : -1,
-		             error && error->message ? error->message : "(unknown)");
-	}
-}
+/*****************************************************************************/
 
 void
 nm_modem_device_state_changed (NMModem *self,
@@ -697,12 +612,7 @@ nm_modem_device_state_changed (NMModem *self,
 			/* Don't bother warning on FAILED since the modem is already gone */
 			if (new_state == NM_DEVICE_STATE_FAILED)
 				warn = FALSE;
-			dbus_g_proxy_begin_call (nm_modem_get_proxy (self, MM_DBUS_INTERFACE_MODEM),
-			                         "Disconnect",
-			                         disconnect_done,
-			                         GUINT_TO_POINTER (warn),
-			                         NULL,
-			                         G_TYPE_INVALID);
+			NM_MODEM_GET_CLASS (self)->disconnect (self, warn);
 		}
 		break;
 	default:
@@ -710,29 +620,15 @@ nm_modem_device_state_changed (NMModem *self,
 	}
 }
 
-gboolean
-nm_modem_hw_is_up (NMModem *self, NMDevice *device)
-{
-	int ifindex = nm_device_get_ip_ifindex (device);
-
-	return ifindex > 0 ? nm_system_iface_is_up (ifindex) : TRUE;
-}
-
-gboolean
-nm_modem_hw_bring_up (NMModem *self, NMDevice *device, gboolean *no_firmware)
-{
-	int ifindex = nm_device_get_ip_ifindex (device);
-
-	return ifindex > 0 ? nm_system_iface_set_up (ifindex, TRUE, no_firmware) : TRUE;
-}
+/*****************************************************************************/
 
 const char *
-nm_modem_get_iface (NMModem *self)
+nm_modem_get_uid (NMModem *self)
 {
 	g_return_val_if_fail (self != NULL, NULL);
 	g_return_val_if_fail (NM_IS_MODEM (self), NULL);
 
-	return NM_MODEM_GET_PRIVATE (self)->iface;
+	return NM_MODEM_GET_PRIVATE (self)->uid;
 }
 
 const char *
@@ -744,109 +640,22 @@ nm_modem_get_path (NMModem *self)
 	return NM_MODEM_GET_PRIVATE (self)->path;
 }
 
-static void
-get_mm_enabled_done (DBusGProxy *proxy, DBusGProxyCall *call_id, gpointer user_data)
-{
-	NMModem *self = NM_MODEM (user_data);
-	GError *error = NULL;
-	GValue value = { 0, };
-
-	if (!dbus_g_proxy_end_call (proxy, call_id, &error,
-	                            G_TYPE_VALUE, &value,
-	                            G_TYPE_INVALID)) {
-		nm_log_warn (LOGD_MB, "failed get modem enabled state: (%d) %s",
-		             error ? error->code : -1,
-		             error && error->message ? error->message : "(unknown)");
-		return;
-	}
-
-	if (G_VALUE_HOLDS_BOOLEAN (&value)) {
-		update_mm_enabled (self, g_value_get_boolean (&value));
-	} else
-		nm_log_warn (LOGD_MB, "failed get modem enabled state: unexpected reply type");
-
-	g_value_unset (&value);
-}
-
-static void
-query_mm_enabled (NMModem *self)
-{
-	dbus_g_proxy_begin_call (NM_MODEM_GET_PRIVATE (self)->props_proxy,
-	                         "Get", get_mm_enabled_done,
-	                         self, NULL,
-	                         G_TYPE_STRING, MM_DBUS_INTERFACE_MODEM,
-	                         G_TYPE_STRING, "Enabled",
-	                         G_TYPE_INVALID);
-}
-
-static void
-set_mm_enabled_done (DBusGProxy *proxy, DBusGProxyCall *call_id, gpointer user_data)
-{
-	GError *error = NULL;
-
-	if (!dbus_g_proxy_end_call (proxy, call_id, &error, G_TYPE_INVALID)) {
-		nm_log_warn (LOGD_MB, "failed to enable/disable modem: (%d) %s",
-		             error ? error->code : -1,
-		             error && error->message ? error->message : "(unknown)");
-	}
-
-	/* Update enabled/disabled state again */
-	query_mm_enabled (NM_MODEM (user_data));
-}
-
-void
-nm_modem_set_mm_enabled (NMModem *self, gboolean enabled)
+const char *
+nm_modem_get_control_port (NMModem *self)
 {
-	NMModemPrivate *priv;
-
-	g_return_if_fail (self != NULL);
-	g_return_if_fail (NM_IS_MODEM (self));
-
-	priv = NM_MODEM_GET_PRIVATE (self);
-
-	/* FIXME: For now this just toggles the ModemManager enabled state.  In the
-	 * future we want to tie this into rfkill state instead so that the user can
-	 * toggle rfkill status of the WWAN modem.
-	 */
+	g_return_val_if_fail (self != NULL, NULL);
+	g_return_val_if_fail (NM_IS_MODEM (self), NULL);
 
-	if (priv->mm_enabled != enabled) {
-		DBusGProxy *proxy;
-
-		proxy = nm_modem_get_proxy (self, MM_DBUS_INTERFACE_MODEM);
-		dbus_g_proxy_begin_call (proxy,
-		                         "Enable", set_mm_enabled_done,
-		                         self, NULL,
-		                         G_TYPE_BOOLEAN, enabled,
-		                         G_TYPE_INVALID);
-		/* If we are disabling the modem, stop saying that it's enabled. */
-		if (!enabled)
-			update_mm_enabled (self, enabled);
-	}
+	return NM_MODEM_GET_PRIVATE (self)->control_port;
 }
 
-static void
-modem_properties_changed (DBusGProxy *proxy,
-                          const char *interface,
-                          GHashTable *props,
-                          gpointer user_data)
+const char *
+nm_modem_get_data_port (NMModem *self)
 {
-	NMModem *self = NM_MODEM (user_data);
-	NMModemPrivate *priv = NM_MODEM_GET_PRIVATE (self);
-	GValue *value;
-
-	if (strcmp (interface, MM_DBUS_INTERFACE_MODEM))
-		return;
-
-	value = g_hash_table_lookup (props, "Enabled");
-	if (value && G_VALUE_HOLDS_BOOLEAN (value)) {
-		update_mm_enabled (self, g_value_get_boolean (value));
-	}
+	g_return_val_if_fail (self != NULL, NULL);
+	g_return_val_if_fail (NM_IS_MODEM (self), NULL);
 
-	value = g_hash_table_lookup (props, "IpMethod");
-	if (value && G_VALUE_HOLDS_UINT (value)) {
-		priv->ip_method = g_value_get_uint (value);
-		g_object_notify (G_OBJECT (self), NM_MODEM_IP_METHOD);
-	}
+	return NM_MODEM_GET_PRIVATE (self)->data_port;
 }
 
 /*****************************************************************************/
@@ -854,9 +663,6 @@ modem_properties_changed (DBusGProxy *proxy,
 static void
 nm_modem_init (NMModem *self)
 {
-	NMModemPrivate *priv = NM_MODEM_GET_PRIVATE (self);
-
-	priv->dbus_mgr = nm_dbus_manager_get ();
 }
 
 static GObject*
@@ -866,23 +672,17 @@ constructor (GType type,
 {
 	GObject *object;
 	NMModemPrivate *priv;
-	DBusGConnection *bus;
 
 	object = G_OBJECT_CLASS (nm_modem_parent_class)->constructor (type,
-																  n_construct_params,
-																  construct_params);
+	                                                              n_construct_params,
+	                                                              construct_params);
 	if (!object)
 		return NULL;
 
 	priv = NM_MODEM_GET_PRIVATE (object);
 
-	if (!priv->device) {
-		nm_log_err (LOGD_HW, "modem parent device not provided");
-		goto err;
-	}
-
-	if (!priv->device) {
-		nm_log_err (LOGD_HW, "modem command interface not provided");
+	if (!priv->data_port && !priv->control_port) {
+		nm_log_err (LOGD_HW, "neither modem command nor data interface provided");
 		goto err;
 	}
 
@@ -891,30 +691,6 @@ constructor (GType type,
 		goto err;
 	}
 
-	bus = nm_dbus_manager_get_connection (priv->dbus_mgr);
-	priv->proxy = dbus_g_proxy_new_for_name (bus,
-	                                         MM_DBUS_SERVICE,
-	                                         priv->path,
-	                                         MM_DBUS_INTERFACE_MODEM);
-
-	priv->props_proxy = dbus_g_proxy_new_for_name (bus,
-	                                               MM_DBUS_SERVICE,
-	                                               priv->path,
-	                                               DBUS_INTERFACE_PROPERTIES);
-	dbus_g_object_register_marshaller (_nm_marshal_VOID__STRING_BOXED,
-	                                   G_TYPE_NONE,
-	                                   G_TYPE_STRING, DBUS_TYPE_G_MAP_OF_VARIANT,
-	                                   G_TYPE_INVALID);
-	dbus_g_proxy_add_signal (priv->props_proxy, "MmPropertiesChanged",
-	                         G_TYPE_STRING, DBUS_TYPE_G_MAP_OF_VARIANT,
-	                         G_TYPE_INVALID);
-	dbus_g_proxy_connect_signal (priv->props_proxy, "MmPropertiesChanged",
-	                             G_CALLBACK (modem_properties_changed),
-	                             object,
-	                             NULL);
-
-	query_mm_enabled (NM_MODEM (object));
-
 	return object;
 
  err:
@@ -924,7 +700,7 @@ constructor (GType type,
 
 static void
 get_property (GObject *object, guint prop_id,
-			  GValue *value, GParamSpec *pspec)
+              GValue *value, GParamSpec *pspec)
 {
 	NMModemPrivate *priv = NM_MODEM_GET_PRIVATE (object);
 
@@ -932,11 +708,14 @@ get_property (GObject *object, guint prop_id,
 	case PROP_PATH:
 		g_value_set_string (value, priv->path);
 		break;
-	case PROP_DEVICE:
-		g_value_set_string (value, priv->device);
+	case PROP_CONTROL_PORT:
+		g_value_set_string (value, priv->control_port);
 		break;
-	case PROP_IFACE:
-		g_value_set_string (value, priv->iface);
+	case PROP_DATA_PORT:
+		g_value_set_string (value, priv->data_port);
+		break;
+	case PROP_UID:
+		g_value_set_string (value, priv->uid);
 		break;
 	case PROP_IP_METHOD:
 		g_value_set_uint (value, priv->ip_method);
@@ -947,16 +726,18 @@ get_property (GObject *object, guint prop_id,
 	case PROP_ENABLED:
 		g_value_set_boolean (value, priv->mm_enabled);
 		break;
+	case PROP_CONNECTED:
+		g_value_set_boolean (value, priv->mm_connected);
+		break;
 	default:
 		G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
 		break;
 	}
-
 }
 
 static void
 set_property (GObject *object, guint prop_id,
-			  const GValue *value, GParamSpec *pspec)
+              const GValue *value, GParamSpec *pspec)
 {
 	NMModemPrivate *priv = NM_MODEM_GET_PRIVATE (object);
 
@@ -965,22 +746,27 @@ set_property (GObject *object, guint prop_id,
 		/* Construct only */
 		priv->path = g_value_dup_string (value);
 		break;
-	case PROP_DEVICE:
-		/* Construct only */
-		priv->device = g_value_dup_string (value);
+	case PROP_CONTROL_PORT:
+		priv->control_port = g_value_dup_string (value);
+		break;
+	case PROP_DATA_PORT:
+		priv->data_port = g_value_dup_string (value);
 		break;
-	case PROP_IFACE:
+	case PROP_UID:
 		/* Construct only */
-		priv->iface = g_value_dup_string (value);
+		priv->uid = g_value_dup_string (value);
 		break;
 	case PROP_IP_METHOD:
-		/* Construct only */
 		priv->ip_method = g_value_get_uint (value);
 		break;
 	case PROP_IP_TIMEOUT:
 		priv->mm_ip_timeout = g_value_get_uint (value);
 		break;
 	case PROP_ENABLED:
+		priv->mm_enabled = g_value_get_boolean (value);
+		break;
+	case PROP_CONNECTED:
+		priv->mm_connected = g_value_get_boolean (value);
 		break;
 	default:
 		G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
@@ -989,24 +775,27 @@ set_property (GObject *object, guint prop_id,
 }
 
 static void
-finalize (GObject *object)
+dispose (GObject *object)
 {
 	NMModemPrivate *priv = NM_MODEM_GET_PRIVATE (object);
 
-	if (priv->act_request)
+	if (priv->act_request) {
 		g_object_unref (priv->act_request);
+		priv->act_request = NULL;
+	}
 
-	if (priv->proxy)
-		g_object_unref (priv->proxy);
-
-	if (priv->props_proxy)
-		g_object_unref (priv->props_proxy);
+	G_OBJECT_CLASS (nm_modem_parent_class)->dispose (object);
+}
 
-	g_object_unref (priv->dbus_mgr);
+static void
+finalize (GObject *object)
+{
+	NMModemPrivate *priv = NM_MODEM_GET_PRIVATE (object);
 
-	g_free (priv->iface);
+	g_free (priv->uid);
 	g_free (priv->path);
-	g_free (priv->device);
+	g_free (priv->control_port);
+	g_free (priv->data_port);
 
 	G_OBJECT_CLASS (nm_modem_parent_class)->finalize (object);
 }
@@ -1022,45 +811,55 @@ nm_modem_class_init (NMModemClass *klass)
 	object_class->constructor = constructor;
 	object_class->set_property = set_property;
 	object_class->get_property = get_property;
+	object_class->dispose = dispose;
 	object_class->finalize = finalize;
 
-	klass->act_stage1_prepare = real_act_stage1_prepare;
-	klass->deactivate = real_deactivate;
+	klass->act_stage1_prepare = act_stage1_prepare;
+	klass->deactivate = deactivate;
 
 	/* Properties */
+
+	g_object_class_install_property
+		(object_class, PROP_UID,
+		 g_param_spec_string (NM_MODEM_UID,
+		                      "UID",
+		                      "Modem unique ID",
+		                      NULL,
+		                      G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY));
+
 	g_object_class_install_property
 		(object_class, PROP_PATH,
 		 g_param_spec_string (NM_MODEM_PATH,
-							  "DBus path",
-							  "DBus path",
-							  NULL,
-							  G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY));
+		                      "DBus path",
+		                      "DBus path",
+		                      NULL,
+		                      G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY));
 
 	g_object_class_install_property
-		(object_class, PROP_DEVICE,
-		 g_param_spec_string (NM_MODEM_DEVICE,
-		                      "Device",
-		                      "Master modem parent device",
+		(object_class, PROP_CONTROL_PORT,
+		 g_param_spec_string (NM_MODEM_CONTROL_PORT,
+		                      "Control port",
+		                      "The port controlling the modem",
 		                      NULL,
 		                      G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY));
 
 	g_object_class_install_property
-		(object_class, PROP_IFACE,
-		 g_param_spec_string (NM_MODEM_IFACE,
-		                      "Interface",
-		                      "Modem command interface",
+		(object_class, PROP_DATA_PORT,
+		 g_param_spec_string (NM_MODEM_DATA_PORT,
+		                      "Data port",
+		                      "The port to connect to",
 		                      NULL,
-		                      G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY));
+		                      G_PARAM_READWRITE | G_PARAM_CONSTRUCT));
 
 	g_object_class_install_property
 		(object_class, PROP_IP_METHOD,
 		 g_param_spec_uint (NM_MODEM_IP_METHOD,
-							"IP method",
-							"IP method",
-							MM_MODEM_IP_METHOD_PPP,
-							MM_MODEM_IP_METHOD_DHCP,
-							MM_MODEM_IP_METHOD_PPP,
-							G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY));
+		                    "IP method",
+		                    "IP method",
+		                    MM_MODEM_IP_METHOD_PPP,
+		                    MM_MODEM_IP_METHOD_DHCP,
+		                    MM_MODEM_IP_METHOD_PPP,
+		                    G_PARAM_READWRITE));
 
 	g_object_class_install_property
 		(object_class, PROP_IP_TIMEOUT,
@@ -1068,7 +867,7 @@ nm_modem_class_init (NMModemClass *klass)
 		                    "IP timeout",
 		                    "IP timeout",
 		                    0, 360, 20,
-		                    G_PARAM_READWRITE | G_PARAM_CONSTRUCT));
+		                    G_PARAM_READWRITE));
 
 	g_object_class_install_property
 		(object_class, PROP_ENABLED,
@@ -1076,62 +875,70 @@ nm_modem_class_init (NMModemClass *klass)
 		                       "Enabled",
 		                       "Enabled",
 		                       TRUE,
-		                       G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY | NM_PROPERTY_PARAM_NO_EXPORT));
+		                       G_PARAM_READWRITE));
+
+	g_object_class_install_property
+		(object_class, PROP_CONNECTED,
+		 g_param_spec_boolean (NM_MODEM_CONNECTED,
+		                       "Connected",
+		                       "Connected",
+		                       TRUE,
+		                       G_PARAM_READWRITE));
 
 	/* Signals */
+
 	signals[PPP_STATS] =
 		g_signal_new ("ppp-stats",
-					  G_OBJECT_CLASS_TYPE (object_class),
-					  G_SIGNAL_RUN_FIRST,
-					  G_STRUCT_OFFSET (NMModemClass, ppp_stats),
-					  NULL, NULL,
-					  _nm_marshal_VOID__UINT_UINT,
-					  G_TYPE_NONE, 2,
-					  G_TYPE_UINT, G_TYPE_UINT);
+		              G_OBJECT_CLASS_TYPE (object_class),
+		              G_SIGNAL_RUN_FIRST,
+		              G_STRUCT_OFFSET (NMModemClass, ppp_stats),
+		              NULL, NULL,
+		              _nm_marshal_VOID__UINT_UINT,
+		              G_TYPE_NONE, 2,
+		              G_TYPE_UINT, G_TYPE_UINT);
 
 	signals[PPP_FAILED] =
 		g_signal_new ("ppp-failed",
-					  G_OBJECT_CLASS_TYPE (object_class),
-					  G_SIGNAL_RUN_FIRST,
-					  G_STRUCT_OFFSET (NMModemClass, ppp_failed),
-					  NULL, NULL,
-					  g_cclosure_marshal_VOID__UINT,
-					  G_TYPE_NONE, 1, G_TYPE_UINT);
+		              G_OBJECT_CLASS_TYPE (object_class),
+		              G_SIGNAL_RUN_FIRST,
+		              G_STRUCT_OFFSET (NMModemClass, ppp_failed),
+		              NULL, NULL,
+		              g_cclosure_marshal_VOID__UINT,
+		              G_TYPE_NONE, 1, G_TYPE_UINT);
 
 	signals[IP4_CONFIG_RESULT] =
 		g_signal_new (NM_MODEM_IP4_CONFIG_RESULT,
-					  G_OBJECT_CLASS_TYPE (object_class),
-					  G_SIGNAL_RUN_FIRST,
-					  G_STRUCT_OFFSET (NMModemClass, ip4_config_result),
-					  NULL, NULL,
-					  _nm_marshal_VOID__STRING_OBJECT_POINTER,
-					  G_TYPE_NONE, 3, G_TYPE_STRING, G_TYPE_OBJECT, G_TYPE_POINTER);
+		              G_OBJECT_CLASS_TYPE (object_class),
+		              G_SIGNAL_RUN_FIRST,
+		              G_STRUCT_OFFSET (NMModemClass, ip4_config_result),
+		              NULL, NULL,
+		              _nm_marshal_VOID__OBJECT_POINTER,
+		              G_TYPE_NONE, 2, G_TYPE_OBJECT, G_TYPE_POINTER);
 
 	signals[PREPARE_RESULT] =
 		g_signal_new (NM_MODEM_PREPARE_RESULT,
-					  G_OBJECT_CLASS_TYPE (object_class),
-					  G_SIGNAL_RUN_FIRST,
-					  G_STRUCT_OFFSET (NMModemClass, prepare_result),
-					  NULL, NULL,
-					  _nm_marshal_VOID__BOOLEAN_UINT,
-					  G_TYPE_NONE, 2, G_TYPE_BOOLEAN, G_TYPE_UINT);
+		              G_OBJECT_CLASS_TYPE (object_class),
+		              G_SIGNAL_RUN_FIRST,
+		              G_STRUCT_OFFSET (NMModemClass, prepare_result),
+		              NULL, NULL,
+		              _nm_marshal_VOID__BOOLEAN_UINT,
+		              G_TYPE_NONE, 2, G_TYPE_BOOLEAN, G_TYPE_UINT);
 
 	signals[AUTH_REQUESTED] =
 		g_signal_new (NM_MODEM_AUTH_REQUESTED,
-					  G_OBJECT_CLASS_TYPE (object_class),
-					  G_SIGNAL_RUN_FIRST,
-					  G_STRUCT_OFFSET (NMModemClass, auth_requested),
-					  NULL, NULL,
-					  g_cclosure_marshal_VOID__VOID,
-					  G_TYPE_NONE, 0);
+		              G_OBJECT_CLASS_TYPE (object_class),
+		              G_SIGNAL_RUN_FIRST,
+		              G_STRUCT_OFFSET (NMModemClass, auth_requested),
+		              NULL, NULL,
+		              g_cclosure_marshal_VOID__VOID,
+		              G_TYPE_NONE, 0);
 
 	signals[AUTH_RESULT] =
 		g_signal_new (NM_MODEM_AUTH_RESULT,
-					  G_OBJECT_CLASS_TYPE (object_class),
-					  G_SIGNAL_RUN_FIRST,
-					  G_STRUCT_OFFSET (NMModemClass, auth_result),
-					  NULL, NULL,
-					  g_cclosure_marshal_VOID__POINTER,
-					  G_TYPE_NONE, 1, G_TYPE_POINTER);
+		              G_OBJECT_CLASS_TYPE (object_class),
+		              G_SIGNAL_RUN_FIRST,
+		              G_STRUCT_OFFSET (NMModemClass, auth_result),
+		              NULL, NULL,
+		              g_cclosure_marshal_VOID__POINTER,
+		              G_TYPE_NONE, 1, G_TYPE_POINTER);
 }
-
diff --git a/src/modem-manager/nm-modem.h b/src/modem-manager/nm-modem.h
index 8fe52bc0..d01aaf2c 100644
--- a/src/modem-manager/nm-modem.h
+++ b/src/modem-manager/nm-modem.h
@@ -29,19 +29,21 @@
 
 G_BEGIN_DECLS
 
-#define NM_TYPE_MODEM			(nm_modem_get_type ())
-#define NM_MODEM(obj)			(G_TYPE_CHECK_INSTANCE_CAST ((obj), NM_TYPE_MODEM, NMModem))
-#define NM_MODEM_CLASS(klass)	(G_TYPE_CHECK_CLASS_CAST ((klass),	NM_TYPE_MODEM, NMModemClass))
-#define NM_IS_MODEM(obj)		(G_TYPE_CHECK_INSTANCE_TYPE ((obj), NM_TYPE_MODEM))
-#define NM_IS_MODEM_CLASS(klass)	(G_TYPE_CHECK_CLASS_TYPE ((klass),	NM_TYPE_MODEM))
-#define NM_MODEM_GET_CLASS(obj)	(G_TYPE_INSTANCE_GET_CLASS ((obj),	NM_TYPE_MODEM, NMModemClass))
-
-#define NM_MODEM_PATH      "path"
-#define NM_MODEM_DEVICE    "device"
-#define NM_MODEM_IFACE     "iface"
-#define NM_MODEM_IP_METHOD "ip-method"
-#define NM_MODEM_IP_TIMEOUT "ip-timeout"
-#define NM_MODEM_ENABLED   "enabled"
+#define NM_TYPE_MODEM            (nm_modem_get_type ())
+#define NM_MODEM(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), NM_TYPE_MODEM, NMModem))
+#define NM_MODEM_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass),  NM_TYPE_MODEM, NMModemClass))
+#define NM_IS_MODEM(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), NM_TYPE_MODEM))
+#define NM_IS_MODEM_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass),  NM_TYPE_MODEM))
+#define NM_MODEM_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj),  NM_TYPE_MODEM, NMModemClass))
+
+#define NM_MODEM_UID          "uid"
+#define NM_MODEM_PATH         "path"
+#define NM_MODEM_CONTROL_PORT "control-port"
+#define NM_MODEM_DATA_PORT    "data-port"
+#define NM_MODEM_IP_METHOD    "ip-method"
+#define NM_MODEM_IP_TIMEOUT   "ip-timeout"
+#define NM_MODEM_ENABLED      "enabled"
+#define NM_MODEM_CONNECTED    "connected"
 
 #define NM_MODEM_PPP_STATS         "ppp-stats"
 #define NM_MODEM_PPP_FAILED        "ppp-failed"
@@ -50,6 +52,10 @@ G_BEGIN_DECLS
 #define NM_MODEM_AUTH_REQUESTED    "auth-requested"
 #define NM_MODEM_AUTH_RESULT       "auth-result"
 
+#define MM_MODEM_IP_METHOD_PPP    0
+#define MM_MODEM_IP_METHOD_STATIC 1
+#define MM_MODEM_IP_METHOD_DHCP   2
+
 typedef struct {
 	GObject parent;
 } NMModem;
@@ -83,6 +89,14 @@ typedef struct {
 	                                            const char **out_setting_name,
 	                                            NMDeviceStateReason *reason);
 
+	NMActStageReturn (*static_stage3_ip4_config_start) (NMModem *self,
+	                                                    NMActRequest *req,
+	                                                    NMDeviceStateReason *reason);
+
+	void (*set_mm_enabled)                     (NMModem *self, gboolean enabled);
+
+	void (*disconnect)                         (NMModem *self, gboolean warn);
+
 	void (*deactivate)                         (NMModem *self, NMDevice *device);
 
 	/* Signals */
@@ -90,7 +104,7 @@ typedef struct {
 	void (*ppp_failed) (NMModem *self, NMDeviceStateReason reason);
 
 	void (*prepare_result)    (NMModem *self, gboolean success, NMDeviceStateReason reason);
-	void (*ip4_config_result) (NMModem *self, const char *iface, NMIP4Config *config, GError *error);
+	void (*ip4_config_result) (NMModem *self, NMIP4Config *config, GError *error);
 
 	void (*auth_requested)    (NMModem *self);
 	void (*auth_result)       (NMModem *self, GError *error);
@@ -98,11 +112,10 @@ typedef struct {
 
 GType nm_modem_get_type (void);
 
-/* Protected */
-
-DBusGProxy *  nm_modem_get_proxy       (NMModem *modem, const char *interface);
-const char *  nm_modem_get_iface       (NMModem *modem);
-const char *  nm_modem_get_path        (NMModem *modem);
+const char *nm_modem_get_path         (NMModem *modem);
+const char *nm_modem_get_uid          (NMModem *modem);
+const char *nm_modem_get_control_port (NMModem *modem);
+const char *nm_modem_get_data_port    (NMModem *modem);
 
 NMConnection *nm_modem_get_best_auto_connection (NMModem *self,
                                                  GSList *connections,
@@ -135,6 +148,8 @@ NMActStageReturn nm_modem_stage3_ip6_config_start (NMModem *modem,
                                                    NMDeviceClass *device_class,
                                                    NMDeviceStateReason *reason);
 
+void nm_modem_ip4_pre_commit (NMModem *modem, NMDevice *device, NMIP4Config *config);
+
 gboolean nm_modem_get_secrets (NMModem *modem,
                                const char *setting_name,
                                gboolean request_new,
@@ -147,14 +162,12 @@ void nm_modem_device_state_changed (NMModem *modem,
                                     NMDeviceState old_state,
                                     NMDeviceStateReason reason);
 
-gboolean nm_modem_hw_is_up (NMModem *modem, NMDevice *device);
-
-gboolean nm_modem_hw_bring_up (NMModem *modem, NMDevice *device, gboolean *no_firmware);
-
 gboolean      nm_modem_get_mm_enabled (NMModem *self);
 
 void          nm_modem_set_mm_enabled (NMModem *self, gboolean enabled);
 
+gboolean      nm_modem_get_mm_connected (NMModem *self);
+
 G_END_DECLS
 
 #endif /* NM_MODEM_H */
diff --git a/src/nm-activation-request.c b/src/nm-activation-request.c
index 1a3cb77a..88504ce0 100644
--- a/src/nm-activation-request.c
+++ b/src/nm-activation-request.c
@@ -28,11 +28,9 @@
 #include 
 
 #include "nm-activation-request.h"
-#include "nm-marshal.h"
 #include "nm-logging.h"
 #include "nm-setting-wireless-security.h"
 #include "nm-setting-8021x.h"
-#include "nm-dbus-manager.h"
 #include "nm-device.h"
 #include "nm-active-connection.h"
 #include "nm-settings-connection.h"
@@ -51,35 +49,32 @@ typedef struct {
 } ShareRule;
 
 typedef struct {
-	gboolean disposed;
-
 	NMConnection *connection;
-
-	GSList *secrets_calls;
-
 	NMDevice *device;
-	gboolean user_requested;
-	gulong user_uid;
-
-	NMActiveConnection *dep;
-	guint dep_state_id;
-
+	guint device_state_id;
+	char *dbus_sender;
+	GSList *secrets_calls;
 	gboolean shared;
 	GSList *share_rules;
-
-	gboolean assumed;
 } NMActRequestPrivate;
 
-enum {
-	PROP_MASTER = 2000,
-};
+/*******************************************************************/
+
+NMConnection *
+nm_act_request_get_connection (NMActRequest *req)
+{
+	g_return_val_if_fail (NM_IS_ACT_REQUEST (req), NULL);
+
+	return nm_active_connection_get_connection (NM_ACTIVE_CONNECTION (req));
+}
 
-enum {
-	DEP_RESULT,
+const char *
+nm_act_request_get_dbus_sender (NMActRequest *req)
+{
+	g_return_val_if_fail (NM_IS_ACT_REQUEST (req), NULL);
 
-	LAST_SIGNAL
-};
-static guint signals[LAST_SIGNAL] = { 0 };
+	return NM_ACT_REQUEST_GET_PRIVATE (req)->dbus_sender;
+}
 
 /*******************************************************************/
 
@@ -119,6 +114,8 @@ nm_act_request_get_secrets (NMActRequest *self,
 	NMActRequestPrivate *priv;
 	GetSecretsInfo *info;
 	guint32 call_id;
+	NMConnection *connection;
+	gboolean user_requested;
 
 	g_return_val_if_fail (self, 0);
 	g_return_val_if_fail (NM_IS_ACT_REQUEST (self), 0);
@@ -130,12 +127,14 @@ nm_act_request_get_secrets (NMActRequest *self,
 	info->callback = callback;
 	info->callback_data = callback_data;
 
-	if (priv->user_requested)
+	user_requested = nm_active_connection_get_user_requested (NM_ACTIVE_CONNECTION (self));
+	if (user_requested)
 		flags |= NM_SETTINGS_GET_SECRETS_FLAG_USER_REQUESTED;
 
-	call_id = nm_settings_connection_get_secrets (NM_SETTINGS_CONNECTION (priv->connection),
-	                                              priv->user_requested,
-	                                              priv->user_uid,
+	connection = nm_active_connection_get_connection (NM_ACTIVE_CONNECTION (self));
+	call_id = nm_settings_connection_get_secrets (NM_SETTINGS_CONNECTION (connection),
+	                                              user_requested,
+	                                              nm_active_connection_get_user_uid (NM_ACTIVE_CONNECTION (self)),
 	                                              setting_name,
 	                                              flags,
 	                                              hint,
@@ -178,67 +177,6 @@ nm_act_request_cancel_secrets (NMActRequest *self, guint32 call_id)
 	}
 }
 
-/*******************************************************************/
-
-NMConnection *
-nm_act_request_get_connection (NMActRequest *req)
-{
-	g_return_val_if_fail (NM_IS_ACT_REQUEST (req), NULL);
-
-	return NM_ACT_REQUEST_GET_PRIVATE (req)->connection;
-}
-
-gboolean
-nm_act_request_get_user_requested (NMActRequest *req)
-{
-	g_return_val_if_fail (NM_IS_ACT_REQUEST (req), FALSE);
-
-	return NM_ACT_REQUEST_GET_PRIVATE (req)->user_requested;
-}
-
-GObject *
-nm_act_request_get_device (NMActRequest *req)
-{
-	g_return_val_if_fail (NM_IS_ACT_REQUEST (req), NULL);
-
-	return G_OBJECT (NM_ACT_REQUEST_GET_PRIVATE (req)->device);
-}
-
-gboolean
-nm_act_request_get_assumed (NMActRequest *req)
-{
-	g_return_val_if_fail (NM_IS_ACT_REQUEST (req), FALSE);
-
-	return NM_ACT_REQUEST_GET_PRIVATE (req)->assumed;
-}
-
-NMActiveConnection *
-nm_act_request_get_dependency (NMActRequest *req)
-{
-	return NM_ACT_REQUEST_GET_PRIVATE (req)->dep;
-}
-
-static NMActRequestDependencyResult
-ac_state_to_dep_result (NMActiveConnection *ac)
-{
-	NMActiveConnectionState state = nm_active_connection_get_state (ac);
-
-	if (state == NM_ACTIVE_CONNECTION_STATE_ACTIVATING)
-		return NM_ACT_REQUEST_DEP_RESULT_WAIT;
-	else if (state == NM_ACTIVE_CONNECTION_STATE_ACTIVATED)
-		return NM_ACT_REQUEST_DEP_RESULT_READY;
-
-	return NM_ACT_REQUEST_DEP_RESULT_FAILED;
-}
-
-NMActRequestDependencyResult
-nm_act_request_get_dependency_result (NMActRequest *req)
-{
-	NMActRequestPrivate *priv = NM_ACT_REQUEST_GET_PRIVATE (req);
-
-	return priv->dep ? ac_state_to_dep_result (priv->dep) : NM_ACT_REQUEST_DEP_RESULT_READY;
-}
-
 /********************************************************************/
 
 static void
@@ -357,76 +295,45 @@ nm_act_request_add_share_rule (NMActRequest *req,
 /********************************************************************/
 
 static void
-device_state_changed (NMDevice *device,
-                      NMDeviceState new_state,
-                      NMDeviceState old_state,
-                      NMDeviceStateReason reason,
-                      gpointer user_data)
+device_state_changed (NMDevice *device, GParamSpec *pspec, NMActRequest *self)
 {
-	NMActRequest *self = NM_ACT_REQUEST (user_data);
-	NMActiveConnectionState new_ac_state;
+	NMActiveConnectionState ac_state = NM_ACTIVE_CONNECTION_STATE_UNKNOWN;
 
 	/* Set NMActiveConnection state based on the device's state */
-	switch (new_state) {
+	switch (nm_device_get_state (device)) {
 	case NM_DEVICE_STATE_PREPARE:
 	case NM_DEVICE_STATE_CONFIG:
 	case NM_DEVICE_STATE_NEED_AUTH:
 	case NM_DEVICE_STATE_IP_CONFIG:
 	case NM_DEVICE_STATE_IP_CHECK:
 	case NM_DEVICE_STATE_SECONDARIES:
-		new_ac_state = NM_ACTIVE_CONNECTION_STATE_ACTIVATING;
+		ac_state = NM_ACTIVE_CONNECTION_STATE_ACTIVATING;
 		break;
 	case NM_DEVICE_STATE_ACTIVATED:
-		new_ac_state = NM_ACTIVE_CONNECTION_STATE_ACTIVATED;
+		ac_state = NM_ACTIVE_CONNECTION_STATE_ACTIVATED;
 		break;
 	case NM_DEVICE_STATE_DEACTIVATING:
-		new_ac_state = NM_ACTIVE_CONNECTION_STATE_DEACTIVATING;
+		ac_state = NM_ACTIVE_CONNECTION_STATE_DEACTIVATING;
+		break;
+	case NM_DEVICE_STATE_FAILED:
+	case NM_DEVICE_STATE_DISCONNECTED:
+		ac_state = NM_ACTIVE_CONNECTION_STATE_DEACTIVATED;
 		break;
 	default:
-		new_ac_state = NM_ACTIVE_CONNECTION_STATE_UNKNOWN;
+		break;
+	}
+
+	if (   ac_state == NM_ACTIVE_CONNECTION_STATE_DEACTIVATED
+	    || ac_state == NM_ACTIVE_CONNECTION_STATE_UNKNOWN) {
 		nm_active_connection_set_default (NM_ACTIVE_CONNECTION (self), FALSE);
 		nm_active_connection_set_default6 (NM_ACTIVE_CONNECTION (self), FALSE);
-		break;
 	}
 
-	nm_active_connection_set_state (NM_ACTIVE_CONNECTION (self), new_ac_state);
+	nm_active_connection_set_state (NM_ACTIVE_CONNECTION (self), ac_state);
 }
 
 /********************************************************************/
 
-static void
-dep_gone (NMActRequest *self, GObject *ignored)
-{
-	NMActRequestPrivate *priv = NM_ACT_REQUEST_GET_PRIVATE (self);
-
-	g_warn_if_fail (G_OBJECT (priv->dep) == ignored);
-
-	/* Dependent connection is gone; clean up and fail */
-	priv->dep = NULL;
-	priv->dep_state_id = 0;
-	g_signal_emit (self, signals[DEP_RESULT], 0, NM_ACT_REQUEST_DEP_RESULT_FAILED);
-}
-
-static void
-dep_state_changed (NMActiveConnection *dep,
-                   GParamSpec *pspec,
-                   NMActRequest *self)
-{
-	NMActRequestPrivate *priv = NM_ACT_REQUEST_GET_PRIVATE (self);
-	NMActRequestDependencyResult result;
-
-	g_warn_if_fail (priv->dep == dep);
-
-	result = ac_state_to_dep_result (priv->dep);
-	if (result == NM_ACT_REQUEST_DEP_RESULT_FAILED) {
-		g_object_weak_unref (G_OBJECT (priv->dep), (GWeakNotify) dep_gone, self);
-		g_signal_handler_disconnect (priv->dep, priv->dep_state_id);
-		priv->dep = NULL;
-		priv->dep_state_id = 0;
-	}
-	g_signal_emit (self, signals[DEP_RESULT], 0, result);
-}
-
 /**
  * nm_act_request_new:
  *
@@ -436,13 +343,14 @@ dep_state_changed (NMActiveConnection *dep,
  * @user_requested: pass %TRUE if the activation was requested via D-Bus,
  *    otherwise %FALSE if requested internally by NM (ie, autoconnect)
  * @user_uid: if @user_requested is %TRUE, the Unix UID of the user that requested
+ * @dbus_sender: if @user_requested is %TRUE, the D-BUS sender that requested
  *    the activation
  * @assumed: pass %TRUE if the activation should "assume" (ie, taking over) an
  *    existing connection made before this instance of NM started
  * @device: the device/interface to configure according to @connection
- * @dependency: if the activation depends on another device (ie, VLAN slave,
- *    bond slave, etc) pass the #NMActiveConnection that this activation request
- *    should wait for before proceeding
+ * @master: if the activation depends on another device (ie, bond or bridge
+ *    master to which this device will be enslaved) pass the #NMDevice that this
+ *    activation request be enslaved to
  *
  * Begins activation of @device using the given @connection and other details.
  *
@@ -453,48 +361,28 @@ nm_act_request_new (NMConnection *connection,
                     const char *specific_object,
                     gboolean user_requested,
                     gulong user_uid,
+                    const char *dbus_sender,
                     gboolean assumed,
-                    gpointer *device,
-                    NMActiveConnection *dependency)
+                    NMDevice *device,
+                    NMDevice *master)
 {
 	GObject *object;
-	NMActRequestPrivate *priv;
 
 	g_return_val_if_fail (NM_IS_CONNECTION (connection), NULL);
 	g_return_val_if_fail (NM_DEVICE (device), NULL);
 
 	object = g_object_new (NM_TYPE_ACT_REQUEST,
+	                       NM_ACTIVE_CONNECTION_INT_CONNECTION, connection,
+	                       NM_ACTIVE_CONNECTION_INT_DEVICE, device,
 	                       NM_ACTIVE_CONNECTION_SPECIFIC_OBJECT, specific_object,
+	                       NM_ACTIVE_CONNECTION_INT_USER_REQUESTED, user_requested,
+	                       NM_ACTIVE_CONNECTION_INT_USER_UID, user_uid,
+	                       NM_ACTIVE_CONNECTION_INT_ASSUMED, assumed,
+	                       NM_ACTIVE_CONNECTION_INT_MASTER, master,
 	                       NULL);
-	if (!object)
-		return NULL;
-
-	priv = NM_ACT_REQUEST_GET_PRIVATE (object);
-
-	priv->connection = g_object_ref (connection);
-	priv->device = NM_DEVICE (device);
-	g_signal_connect (device, "state-changed",
-	                  G_CALLBACK (device_state_changed),
-	                  NM_ACT_REQUEST (object));
-
-	priv->user_uid = user_uid;
-	priv->user_requested = user_requested;
-	priv->assumed = assumed;
-
-	if (dependency) {
-		priv->dep = dependency;
-		g_object_weak_ref (G_OBJECT (dependency), (GWeakNotify) dep_gone, object);
-		priv->dep_state_id = g_signal_connect (dependency,
-		                                       "notify::" NM_ACTIVE_CONNECTION_STATE,
-		                                       G_CALLBACK (dep_state_changed),
-		                                       object);
-	}
-
-	if (!nm_active_connection_export (NM_ACTIVE_CONNECTION (object),
-	                                  connection,
-	                                  nm_device_get_path (NM_DEVICE (device)))) {
-		g_object_unref (object);
-		object = NULL;
+	if (object) {
+		nm_active_connection_export (NM_ACTIVE_CONNECTION (object));
+		NM_ACT_REQUEST_GET_PRIVATE (object)->dbus_sender = g_strdup (dbus_sender);
 	}
 
 	return (NMActRequest *) object;
@@ -506,24 +394,24 @@ nm_act_request_init (NMActRequest *req)
 }
 
 static void
-get_property (GObject *object, guint prop_id,
-			  GValue *value, GParamSpec *pspec)
+constructed (GObject *object)
 {
 	NMActRequestPrivate *priv = NM_ACT_REQUEST_GET_PRIVATE (object);
-	NMDevice *master;
-
-	switch (prop_id) {
-	case PROP_MASTER:
-		if (priv->dep && NM_IS_ACT_REQUEST (priv->dep)) {
-			master = NM_DEVICE (nm_act_request_get_device (NM_ACT_REQUEST (priv->dep)));
-			g_assert (master);
-			g_value_set_boxed (value, nm_device_get_path (master));
-		} else
-			g_value_set_boxed (value, "/");
-		break;
-	default:
-		G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
-		break;
+	NMConnection *connection;
+	NMDevice *device;
+
+	G_OBJECT_CLASS (nm_act_request_parent_class)->constructed (object);
+
+	connection = nm_active_connection_get_connection (NM_ACTIVE_CONNECTION (object));
+	priv->connection = g_object_ref (connection);
+
+	device = nm_active_connection_get_device (NM_ACTIVE_CONNECTION (object));
+	if (device) {
+		priv->device = g_object_ref (device);
+		priv->device_state_id = g_signal_connect (priv->device,
+		                                          "notify::" NM_DEVICE_STATE,
+		                                          G_CALLBACK (device_state_changed),
+		                                          NM_ACT_REQUEST (object));
 	}
 }
 
@@ -533,49 +421,37 @@ dispose (GObject *object)
 	NMActRequestPrivate *priv = NM_ACT_REQUEST_GET_PRIVATE (object);
 	GSList *iter;
 
-	if (priv->disposed) {
-		G_OBJECT_CLASS (nm_act_request_parent_class)->dispose (object);
-		return;
+	if (priv->device && priv->device_state_id) {
+		g_signal_handler_disconnect (priv->device, priv->device_state_id);
+		priv->device_state_id = 0;
 	}
-	priv->disposed = TRUE;
-
-	g_signal_handlers_disconnect_by_func (G_OBJECT (priv->device),
-	                                      G_CALLBACK (device_state_changed),
-	                                      NM_ACT_REQUEST (object));
 
 	/* Clear any share rules */
-	nm_act_request_set_shared (NM_ACT_REQUEST (object), FALSE);
+	if (priv->share_rules) {
+		nm_act_request_set_shared (NM_ACT_REQUEST (object), FALSE);
+		clear_share_rules (NM_ACT_REQUEST (object));
+	}
 
 	/* Kill any in-progress secrets requests */
-	g_assert (priv->connection);
 	for (iter = priv->secrets_calls; iter; iter = g_slist_next (iter)) {
 		GetSecretsInfo *info = iter->data;
 
+		g_assert (priv->connection);
 		nm_settings_connection_cancel_secrets (NM_SETTINGS_CONNECTION (priv->connection), info->call_id);
 		g_free (info);
 	}
 	g_slist_free (priv->secrets_calls);
+	priv->secrets_calls = NULL;
 
-	g_object_unref (priv->connection);
+	g_free (priv->dbus_sender);
+	priv->dbus_sender = NULL;
 
-	if (priv->dep) {
-		g_object_weak_unref (G_OBJECT (priv->dep), (GWeakNotify) dep_gone, object);
-		g_signal_handler_disconnect (priv->dep, priv->dep_state_id);
-		priv->dep = NULL;
-		priv->dep_state_id = 0;
-	}
+	g_clear_object (&priv->device);
+	g_clear_object (&priv->connection);
 
 	G_OBJECT_CLASS (nm_act_request_parent_class)->dispose (object);
 }
 
-static void
-finalize (GObject *object)
-{
-	clear_share_rules (NM_ACT_REQUEST (object));
-
-	G_OBJECT_CLASS (nm_act_request_parent_class)->finalize (object);
-}
-
 static void
 nm_act_request_class_init (NMActRequestClass *req_class)
 {
@@ -584,18 +460,7 @@ nm_act_request_class_init (NMActRequestClass *req_class)
 	g_type_class_add_private (req_class, sizeof (NMActRequestPrivate));
 
 	/* virtual methods */
-	object_class->get_property = get_property;
+	object_class->constructed = constructed;
 	object_class->dispose = dispose;
-	object_class->finalize = finalize;
-
-	g_object_class_override_property (object_class, PROP_MASTER, NM_ACTIVE_CONNECTION_MASTER);
-
-	signals[DEP_RESULT] =
-		g_signal_new (NM_ACT_REQUEST_DEPENDENCY_RESULT,
-					  G_OBJECT_CLASS_TYPE (object_class),
-					  G_SIGNAL_RUN_FIRST,
-					  0, NULL, NULL,
-					  g_cclosure_marshal_VOID__UINT,
-					  G_TYPE_NONE, 1, G_TYPE_UINT);
 }
 
diff --git a/src/nm-activation-request.h b/src/nm-activation-request.h
index 16467f9c..15971094 100644
--- a/src/nm-activation-request.h
+++ b/src/nm-activation-request.h
@@ -15,7 +15,7 @@
  * with this program; if not, write to the Free Software Foundation, Inc.,
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  *
- * (C) Copyright 2005 - 2010 Red Hat, Inc.
+ * (C) Copyright 2005 - 2012 Red Hat, Inc.
  */
 
 #ifndef NM_ACTIVATION_REQUEST_H
@@ -23,6 +23,7 @@
 
 #include 
 #include 
+#include "nm-types.h"
 #include "nm-connection.h"
 #include "nm-active-connection.h"
 #include "nm-settings-flags.h"
@@ -34,26 +35,15 @@
 #define NM_IS_ACT_REQUEST_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), NM_TYPE_ACT_REQUEST))
 #define NM_ACT_REQUEST_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), NM_TYPE_ACT_REQUEST, NMActRequestClass))
 
-typedef enum {
-	NM_ACT_REQUEST_DEP_RESULT_UNKNOWN,
-	NM_ACT_REQUEST_DEP_RESULT_WAIT,
-	NM_ACT_REQUEST_DEP_RESULT_READY,
-	NM_ACT_REQUEST_DEP_RESULT_FAILED,
-} NMActRequestDependencyResult;
-
-#define NM_ACT_REQUEST_DEPENDENCY_RESULT "dependency-result"
-
 typedef struct {
-	GObject parent;
+	NMActiveConnection parent;
 } NMActRequest;
 
 typedef struct {
-	GObjectClass parent;
+	NMActiveConnectionClass parent;
 
 	/* Signals */
 	void (*properties_changed) (NMActRequest *req, GHashTable *properties);
-
-	void (*dependency_result) (NMActRequest *req, NMActRequestDependencyResult result);
 } NMActRequestClass;
 
 GType nm_act_request_get_type (void);
@@ -62,13 +52,16 @@ NMActRequest *nm_act_request_new          (NMConnection *connection,
                                            const char *specific_object,
                                            gboolean user_requested,
                                            gulong user_uid,
+                                           const char *dbus_sender,
                                            gboolean assumed,
-                                           gpointer *device,  /* An NMDevice */
-                                           NMActiveConnection *dependency);
+                                           NMDevice *device,
+                                           NMDevice *master);
+
+NMConnection *nm_act_request_get_connection (NMActRequest *req);
 
-NMConnection *nm_act_request_get_connection     (NMActRequest *req);
+gulong        nm_act_request_get_user_uid (NMActRequest *req);
 
-gboolean      nm_act_request_get_user_requested (NMActRequest *req);
+const char   *nm_act_request_get_dbus_sender (NMActRequest *req);
 
 gboolean      nm_act_request_get_shared (NMActRequest *req);
 
@@ -78,14 +71,6 @@ void          nm_act_request_add_share_rule (NMActRequest *req,
                                              const char *table,
                                              const char *rule);
 
-GObject *     nm_act_request_get_device (NMActRequest *req);
-
-gboolean      nm_act_request_get_assumed (NMActRequest *req);
-
-NMActiveConnection *         nm_act_request_get_dependency (NMActRequest *req);
-
-NMActRequestDependencyResult nm_act_request_get_dependency_result (NMActRequest *req);
-
 /* Secrets handling */
 
 typedef void (*NMActRequestSecretsFunc) (NMActRequest *req,
diff --git a/src/nm-active-connection.c b/src/nm-active-connection.c
index 2de62197..15b4b485 100644
--- a/src/nm-active-connection.c
+++ b/src/nm-active-connection.c
@@ -19,12 +19,15 @@
  */
 
 #include 
+#include "nm-types.h"
 #include "nm-active-connection.h"
 #include "NetworkManager.h"
 #include "nm-logging.h"
 #include "nm-dbus-glib-types.h"
 #include "nm-dbus-manager.h"
 #include "nm-properties-changed-signal.h"
+#include "nm-device.h"
+#include "nm-settings-connection.h"
 
 #include "nm-active-connection-glue.h"
 
@@ -36,16 +39,20 @@ G_DEFINE_ABSTRACT_TYPE (NMActiveConnection, nm_active_connection, G_TYPE_OBJECT)
                                              NMActiveConnectionPrivate))
 
 typedef struct {
-	gboolean disposed;
-
 	NMConnection *connection;
 	char *path;
 	char *specific_object;
-	char *device_path;
+	NMDevice *device;
+
 	gboolean is_default;
 	gboolean is_default6;
 	NMActiveConnectionState state;
 	gboolean vpn;
+
+	gboolean user_requested;
+	gulong user_uid;
+	gboolean assumed;
+	NMDevice *master;
 } NMActiveConnectionPrivate;
 
 enum {
@@ -60,6 +67,13 @@ enum {
 	PROP_VPN,
 	PROP_MASTER,
 
+	PROP_INT_CONNECTION,
+	PROP_INT_DEVICE,
+	PROP_INT_USER_REQUESTED,
+	PROP_INT_USER_UID,
+	PROP_INT_ASSUMED,
+	PROP_INT_MASTER,
+
 	LAST_PROP
 };
 
@@ -82,13 +96,30 @@ nm_active_connection_set_state (NMActiveConnection *self,
                                 NMActiveConnectionState new_state)
 {
 	NMActiveConnectionPrivate *priv = NM_ACTIVE_CONNECTION_GET_PRIVATE (self);
+	NMActiveConnectionState old_state;
 
-	if (priv->state != new_state) {
-		priv->state = new_state;
-		g_object_notify (G_OBJECT (self), NM_ACTIVE_CONNECTION_STATE);
+	if (priv->state == new_state)
+		return;
+
+	old_state = priv->state;
+	priv->state = new_state;
+	g_object_notify (G_OBJECT (self), NM_ACTIVE_CONNECTION_STATE);
+
+	if (   new_state == NM_ACTIVE_CONNECTION_STATE_ACTIVATED
+	    || old_state == NM_ACTIVE_CONNECTION_STATE_ACTIVATED) {
+		nm_settings_connection_update_timestamp (NM_SETTINGS_CONNECTION (priv->connection),
+		                                         (guint64) time (NULL), TRUE);
 	}
 }
 
+const char *
+nm_active_connection_get_name (NMActiveConnection *self)
+{
+	g_return_val_if_fail (NM_IS_ACTIVE_CONNECTION (self), NULL);
+
+	return nm_connection_get_id (NM_ACTIVE_CONNECTION_GET_PRIVATE (self)->connection);
+}
+
 NMConnection *
 nm_active_connection_get_connection (NMActiveConnection *self)
 {
@@ -167,51 +198,65 @@ nm_active_connection_get_default6 (NMActiveConnection *self)
 	return NM_ACTIVE_CONNECTION_GET_PRIVATE (self)->is_default6;
 }
 
-gboolean
-nm_active_connection_export (NMActiveConnection *self,
-                             NMConnection *connection,
-                             const char *devpath)
+void
+nm_active_connection_export (NMActiveConnection *self)
 {
 	NMActiveConnectionPrivate *priv = NM_ACTIVE_CONNECTION_GET_PRIVATE (self);
 	NMDBusManager *dbus_mgr;
 	static guint32 counter = 0;
 
-	g_return_val_if_fail (connection != NULL, FALSE);
-	g_return_val_if_fail (devpath != NULL, FALSE);
-
-	priv->connection = g_object_ref (connection);
 	priv->path = g_strdup_printf (NM_DBUS_PATH "/ActiveConnection/%d", counter++);
-	priv->device_path = g_strdup (devpath);
-
 	dbus_mgr = nm_dbus_manager_get ();
 	dbus_g_connection_register_g_object (nm_dbus_manager_get_connection (dbus_mgr),
 	                                     priv->path, G_OBJECT (self));
 	g_object_unref (dbus_mgr);
-	return TRUE;
 }
 
-/****************************************************************/
+gboolean
+nm_active_connection_get_user_requested (NMActiveConnection *self)
+{
+	g_return_val_if_fail (NM_IS_ACTIVE_CONNECTION (self), FALSE);
 
-static void
-nm_active_connection_init (NMActiveConnection *self)
+	return NM_ACTIVE_CONNECTION_GET_PRIVATE (self)->user_requested;
+}
+
+gulong
+nm_active_connection_get_user_uid (NMActiveConnection *self)
 {
+	g_return_val_if_fail (NM_IS_ACTIVE_CONNECTION (self), G_MAXULONG);
+
+	return NM_ACTIVE_CONNECTION_GET_PRIVATE (self)->user_uid;
 }
 
-static void
-dispose (GObject *object)
+gboolean
+nm_active_connection_get_assumed (NMActiveConnection *self)
 {
-	NMActiveConnectionPrivate *priv = NM_ACTIVE_CONNECTION_GET_PRIVATE (object);
+	g_return_val_if_fail (NM_IS_ACTIVE_CONNECTION (self), FALSE);
 
-	if (!priv->disposed) {
-		priv->disposed = TRUE;
+	return NM_ACTIVE_CONNECTION_GET_PRIVATE (self)->assumed;
+}
 
-		g_free (priv->path);
-		g_free (priv->specific_object);
-		g_free (priv->device_path);
-		g_object_unref (priv->connection);
-	}
+NMDevice *
+nm_active_connection_get_device (NMActiveConnection *self)
+{
+	g_return_val_if_fail (NM_IS_ACTIVE_CONNECTION (self), NULL);
 
-	G_OBJECT_CLASS (nm_active_connection_parent_class)->dispose (object);
+	return NM_ACTIVE_CONNECTION_GET_PRIVATE (self)->device;
+}
+
+NMDevice *
+nm_active_connection_get_master (NMActiveConnection *self)
+{
+	g_return_val_if_fail (NM_IS_ACTIVE_CONNECTION (self), NULL);
+
+	return NM_ACTIVE_CONNECTION_GET_PRIVATE (self)->master;
+}
+
+/****************************************************************/
+
+static void
+nm_active_connection_init (NMActiveConnection *self)
+{
 }
 
 static void
@@ -221,6 +266,31 @@ set_property (GObject *object, guint prop_id,
 	NMActiveConnectionPrivate *priv = NM_ACTIVE_CONNECTION_GET_PRIVATE (object);
 
 	switch (prop_id) {
+	case PROP_INT_CONNECTION:
+		g_warn_if_fail (priv->connection == NULL);
+		priv->connection = g_value_dup_object (value);
+		break;
+	case PROP_INT_DEVICE:
+		g_warn_if_fail (priv->device == NULL);
+		priv->device = g_value_dup_object (value);
+		if (priv->device)
+			g_warn_if_fail (priv->device != priv->master);
+		break;
+	case PROP_INT_USER_REQUESTED:
+		priv->user_requested = g_value_get_boolean (value);
+		break;
+	case PROP_INT_USER_UID:
+		priv->user_uid = g_value_get_ulong (value);
+		break;
+	case PROP_INT_ASSUMED:
+		priv->assumed = g_value_get_boolean (value);
+		break;
+	case PROP_INT_MASTER:
+		g_warn_if_fail (priv->master == NULL);
+		priv->master = g_value_dup_object (value);
+		if (priv->master)
+			g_warn_if_fail (priv->master != priv->device);
+		break;
 	case PROP_SPECIFIC_OBJECT:
 		priv->specific_object = g_value_dup_boxed (value);
 		break;
@@ -233,6 +303,8 @@ set_property (GObject *object, guint prop_id,
 	case PROP_VPN:
 		priv->vpn = g_value_get_boolean (value);
 		break;
+	case PROP_MASTER:
+		break;
 	default:
 		G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
 		break;
@@ -258,7 +330,8 @@ get_property (GObject *object, guint prop_id,
 		break;
 	case PROP_DEVICES:
 		devices = g_ptr_array_sized_new (1);
-		g_ptr_array_add (devices, g_strdup (priv->device_path));
+		if (priv->device)
+			g_ptr_array_add (devices, g_strdup (nm_device_get_path (priv->device)));
 		g_value_take_boxed (value, devices);
 		break;
 	case PROP_STATE:
@@ -274,6 +347,7 @@ get_property (GObject *object, guint prop_id,
 		g_value_set_boolean (value, priv->vpn);
 		break;
 	case PROP_MASTER:
+		g_value_set_boxed (value, priv->master ? nm_device_get_path (priv->master) : "/");
 		break;
 	default:
 		G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
@@ -281,6 +355,23 @@ get_property (GObject *object, guint prop_id,
 	}
 }
 
+static void
+dispose (GObject *object)
+{
+	NMActiveConnectionPrivate *priv = NM_ACTIVE_CONNECTION_GET_PRIVATE (object);
+
+	g_free (priv->path);
+	priv->path = NULL;
+	g_free (priv->specific_object);
+	priv->specific_object = NULL;
+
+	g_clear_object (&priv->connection);
+	g_clear_object (&priv->device);
+	g_clear_object (&priv->master);
+
+	G_OBJECT_CLASS (nm_active_connection_parent_class)->dispose (object);
+}
+
 static void
 nm_active_connection_class_init (NMActiveConnectionClass *vpn_class)
 {
@@ -293,7 +384,7 @@ nm_active_connection_class_init (NMActiveConnectionClass *vpn_class)
 	object_class->set_property = set_property;
 	object_class->dispose = dispose;
 
-	/* properties */
+	/* D-Bus exported properties */
 	g_object_class_install_property (object_class, PROP_CONNECTION,
 		g_param_spec_boxed (NM_ACTIVE_CONNECTION_CONNECTION,
 		                    "Connection",
@@ -359,6 +450,49 @@ nm_active_connection_class_init (NMActiveConnectionClass *vpn_class)
 		                    DBUS_TYPE_G_OBJECT_PATH,
 		                    G_PARAM_READABLE));
 
+	/* Internal properties */
+	g_object_class_install_property (object_class, PROP_INT_CONNECTION,
+		g_param_spec_object (NM_ACTIVE_CONNECTION_INT_CONNECTION,
+		                     "Internal Connection",
+		                     "Internal connection",
+		                     NM_TYPE_CONNECTION,
+		                     G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY | NM_PROPERTY_PARAM_NO_EXPORT));
+
+	g_object_class_install_property (object_class, PROP_INT_DEVICE,
+		g_param_spec_object (NM_ACTIVE_CONNECTION_INT_DEVICE,
+		                     "Internal device",
+		                     "Internal device",
+		                     NM_TYPE_DEVICE,
+		                     G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY | NM_PROPERTY_PARAM_NO_EXPORT));
+
+	g_object_class_install_property (object_class, PROP_INT_USER_REQUESTED,
+		g_param_spec_boolean (NM_ACTIVE_CONNECTION_INT_USER_REQUESTED,
+		                      "User requested",
+		                      "User requested",
+		                      FALSE,
+		                      G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY | NM_PROPERTY_PARAM_NO_EXPORT));
+
+	g_object_class_install_property (object_class, PROP_INT_USER_UID,
+		g_param_spec_ulong (NM_ACTIVE_CONNECTION_INT_USER_UID,
+		                    "User UID",
+		                    "User UID (if user requested)",
+		                    0, G_MAXULONG, 0,
+		                    G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY | NM_PROPERTY_PARAM_NO_EXPORT));
+
+	g_object_class_install_property (object_class, PROP_INT_ASSUMED,
+		g_param_spec_boolean (NM_ACTIVE_CONNECTION_INT_ASSUMED,
+		                      "Assumed",
+		                      "Assumed",
+		                      FALSE,
+		                      G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY | NM_PROPERTY_PARAM_NO_EXPORT));
+
+	g_object_class_install_property (object_class, PROP_INT_MASTER,
+		g_param_spec_object (NM_ACTIVE_CONNECTION_INT_MASTER,
+		                     "Internal master device",
+		                     "Internal device",
+		                     NM_TYPE_DEVICE,
+		                     G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY | NM_PROPERTY_PARAM_NO_EXPORT));
+
 	/* Signals */
 	signals[PROPERTIES_CHANGED] = 
 		nm_properties_changed_signal_new (object_class,
diff --git a/src/nm-active-connection.h b/src/nm-active-connection.h
index 49ff5adc..2f17c583 100644
--- a/src/nm-active-connection.h
+++ b/src/nm-active-connection.h
@@ -22,6 +22,7 @@
 #define NM_ACTIVE_CONNECTION_H
 
 #include 
+#include "nm-types.h"
 #include "nm-connection.h"
 
 #define NM_TYPE_ACTIVE_CONNECTION            (nm_active_connection_get_type ())
@@ -31,7 +32,7 @@
 #define NM_IS_ACTIVE_CONNECTION_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), NM_TYPE_ACTIVE_CONNECTION))
 #define NM_ACTIVE_CONNECTION_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), NM_TYPE_ACTIVE_CONNECTION, NMActiveConnectionClass))
 
-/* Properties */
+/* D-Bus Exported Properties */
 #define NM_ACTIVE_CONNECTION_CONNECTION      "connection"
 #define NM_ACTIVE_CONNECTION_UUID            "uuid"
 #define NM_ACTIVE_CONNECTION_SPECIFIC_OBJECT "specific-object"
@@ -42,6 +43,15 @@
 #define NM_ACTIVE_CONNECTION_VPN             "vpn"
 #define NM_ACTIVE_CONNECTION_MASTER          "master"
 
+/* Internal non-exported construct-time properties */
+#define NM_ACTIVE_CONNECTION_INT_CONNECTION     "int-connection"
+#define NM_ACTIVE_CONNECTION_INT_DEVICE         "int-device"
+#define NM_ACTIVE_CONNECTION_INT_USER_REQUESTED "int-user-requested"
+#define NM_ACTIVE_CONNECTION_INT_USER_UID       "int-user-uid"
+#define NM_ACTIVE_CONNECTION_INT_ASSUMED        "int-assumed"
+#define NM_ACTIVE_CONNECTION_INT_MASTER         "int-master"
+
+
 typedef struct {
 	GObject parent;
 } NMActiveConnection;
@@ -50,16 +60,15 @@ typedef struct {
 	GObjectClass parent;
 
 	/* Signals */
-	void (*properties_changed) (NMActiveConnection *req, GHashTable *properties);
+	void (*properties_changed) (NMActiveConnection *active, GHashTable *properties);
 } NMActiveConnectionClass;
 
 GType         nm_active_connection_get_type (void);
 
-gboolean      nm_active_connection_export (NMActiveConnection *self,
-                                           NMConnection *connection,
-                                           const char *devpath);
+void          nm_active_connection_export (NMActiveConnection *self);
 
 NMConnection *nm_active_connection_get_connection (NMActiveConnection *self);
+const char *  nm_active_connection_get_name       (NMActiveConnection *self);
 
 const char *  nm_active_connection_get_path (NMActiveConnection *self);
 
@@ -83,4 +92,14 @@ NMActiveConnectionState nm_active_connection_get_state (NMActiveConnection *self
 void          nm_active_connection_set_state (NMActiveConnection *self,
                                               NMActiveConnectionState state);
 
+NMDevice *    nm_active_connection_get_device (NMActiveConnection *self);
+
+gboolean      nm_active_connection_get_user_requested (NMActiveConnection *self);
+
+gulong        nm_active_connection_get_user_uid (NMActiveConnection *self);
+
+gboolean      nm_active_connection_get_assumed (NMActiveConnection *self);
+
+NMDevice *    nm_active_connection_get_master (NMActiveConnection *self);
+
 #endif /* NM_ACTIVE_CONNECTION_H */
diff --git a/src/nm-config.c b/src/nm-config.c
index 1efad451..6e801d35 100644
--- a/src/nm-config.c
+++ b/src/nm-config.c
@@ -24,8 +24,8 @@
 
 #include "nm-config.h"
 
-#define NM_DEFAULT_SYSTEM_CONF_FILE  SYSCONFDIR"/NetworkManager/NetworkManager.conf"
-#define NM_OLD_SYSTEM_CONF_FILE      SYSCONFDIR"/NetworkManager/nm-system-settings.conf"
+#define NM_DEFAULT_SYSTEM_CONF_FILE  NMCONFDIR "/NetworkManager.conf"
+#define NM_OLD_SYSTEM_CONF_FILE      NMCONFDIR "/nm-system-settings.conf"
 
 struct NMConfig {
 	char *path;
diff --git a/src/nm-crash-logger.c b/src/nm-crash-logger.c
index e0e7cbf6..f10e9ffe 100644
--- a/src/nm-crash-logger.c
+++ b/src/nm-crash-logger.c
@@ -39,8 +39,8 @@ int main (int argc, char ** argv)
 	char *	args[] = { BINDIR "/gdb",
                           "--batch", 
                           "--quiet",
-                          "--command=" DATADIR "/NetworkManager/gdb-cmd",
-                          SBINDIR "/NetworkManager",
+                          "--command=" NMDATADIR "/gdb-cmd",
+                          NMBINARY,
                           NULL, NULL };
 
 	snprintf (nm_pid, sizeof (nm_pid), "%d", getppid ());
diff --git a/src/nm-device-adsl.c b/src/nm-device-adsl.c
index e171b46e..29d30cd0 100644
--- a/src/nm-device-adsl.c
+++ b/src/nm-device-adsl.c
@@ -101,7 +101,7 @@ enum {
 /**************************************************************/
 
 static guint32
-real_get_generic_capabilities (NMDevice *dev)
+get_generic_capabilities (NMDevice *dev)
 {
 	guint32 caps = NM_DEVICE_CAP_NM_SUPPORTED;
 	caps |= NM_DEVICE_CAP_CARRIER_DETECT;
@@ -109,7 +109,7 @@ real_get_generic_capabilities (NMDevice *dev)
 }
 
 static gboolean
-real_can_interrupt_activation (NMDevice *dev)
+can_interrupt_activation (NMDevice *dev)
 {
 	NMDeviceAdsl *self = NM_DEVICE_ADSL (dev);
 	gboolean interrupt = FALSE;
@@ -124,7 +124,7 @@ real_can_interrupt_activation (NMDevice *dev)
 }
 
 static gboolean
-real_is_available (NMDevice *dev)
+is_available (NMDevice *dev)
 {
 	NMDeviceAdsl *self = NM_DEVICE_ADSL (dev);
 
@@ -136,9 +136,9 @@ real_is_available (NMDevice *dev)
 }
 
 static gboolean
-real_check_connection_compatible (NMDevice *device,
-                                  NMConnection *connection,
-                                  GError **error)
+check_connection_compatible (NMDevice *device,
+                             NMConnection *connection,
+                             GError **error)
 {
 	NMSettingAdsl *s_adsl;
 	const char *protocol;
@@ -171,11 +171,11 @@ real_check_connection_compatible (NMDevice *device,
 }
 
 static gboolean
-real_complete_connection (NMDevice *device,
-                          NMConnection *connection,
-                          const char *specific_object,
-                          const GSList *existing_connections,
-                          GError **error)
+complete_connection (NMDevice *device,
+                     NMConnection *connection,
+                     const char *specific_object,
+                     const GSList *existing_connections,
+                     GError **error)
 {
 	NMSettingAdsl *s_adsl;
 
@@ -199,9 +199,9 @@ real_complete_connection (NMDevice *device,
 }
 
 static NMConnection *
-real_get_best_auto_connection (NMDevice *dev,
-                               GSList *connections,
-                               char **specific_object)
+get_best_auto_connection (NMDevice *dev,
+                          GSList *connections,
+                          char **specific_object)
 {
 	GSList *iter;
 
@@ -418,7 +418,7 @@ netlink_notification (NMNetlinkMonitor *monitor,
 }
 
 static NMActStageReturn
-real_act_stage2_config (NMDevice *device, NMDeviceStateReason *out_reason)
+act_stage2_config (NMDevice *device, NMDeviceStateReason *out_reason)
 {
 	NMDeviceAdsl *self = NM_DEVICE_ADSL (device);
 	NMDeviceAdslPrivate *priv = NM_DEVICE_ADSL_GET_PRIVATE (self);
@@ -505,9 +505,9 @@ ppp_ip4_config (NMPPPManager *ppp_manager,
 }
 
 static NMActStageReturn
-real_act_stage3_ip4_config_start (NMDevice *device,
-                                  NMIP4Config **out_config,
-                                  NMDeviceStateReason *reason)
+act_stage3_ip4_config_start (NMDevice *device,
+                             NMIP4Config **out_config,
+                             NMDeviceStateReason *reason)
 {
 	NMDeviceAdsl *self = NM_DEVICE_ADSL (device);
 	NMDeviceAdslPrivate *priv = NM_DEVICE_ADSL_GET_PRIVATE (self);
@@ -563,7 +563,7 @@ real_act_stage3_ip4_config_start (NMDevice *device,
 }
 
 static void
-real_deactivate (NMDevice *device)
+deactivate (NMDevice *device)
 {
 	NMDeviceAdsl *self = NM_DEVICE_ADSL (device);
 	NMDeviceAdslPrivate *priv = NM_DEVICE_ADSL_GET_PRIVATE (self);
@@ -810,17 +810,17 @@ nm_device_adsl_class_init (NMDeviceAdslClass *klass)
 	object_class->get_property = get_property;
 	object_class->set_property = set_property;
 
-	parent_class->get_generic_capabilities = real_get_generic_capabilities;
-	parent_class->can_interrupt_activation = real_can_interrupt_activation;
-	parent_class->is_available = real_is_available;
+	parent_class->get_generic_capabilities = get_generic_capabilities;
+	parent_class->can_interrupt_activation = can_interrupt_activation;
+	parent_class->is_available = is_available;
 
-	parent_class->check_connection_compatible = real_check_connection_compatible;
-	parent_class->get_best_auto_connection = real_get_best_auto_connection;
-	parent_class->complete_connection = real_complete_connection;
+	parent_class->check_connection_compatible = check_connection_compatible;
+	parent_class->get_best_auto_connection = get_best_auto_connection;
+	parent_class->complete_connection = complete_connection;
 
-	parent_class->act_stage2_config = real_act_stage2_config;
-	parent_class->act_stage3_ip4_config_start = real_act_stage3_ip4_config_start;
-	parent_class->deactivate = real_deactivate;
+	parent_class->act_stage2_config = act_stage2_config;
+	parent_class->act_stage3_ip4_config_start = act_stage3_ip4_config_start;
+	parent_class->deactivate = deactivate;
 
 	/* properties */
 	g_object_class_install_property
diff --git a/src/nm-device-bond.c b/src/nm-device-bond.c
index 22f78145..30df94fa 100644
--- a/src/nm-device-bond.c
+++ b/src/nm-device-bond.c
@@ -46,7 +46,8 @@ G_DEFINE_TYPE (NMDeviceBond, nm_device_bond, NM_TYPE_DEVICE_WIRED)
 #define NM_BOND_ERROR (nm_bond_error_quark ())
 
 typedef struct {
-	GSList *slaves;
+	gboolean ip4_waiting;
+	gboolean ip6_waiting;
 } NMDeviceBondPrivate;
 
 enum {
@@ -83,17 +84,23 @@ static void
 device_state_changed (NMDevice *device,
                       NMDeviceState new_state,
                       NMDeviceState old_state,
-                      NMDeviceStateReason reason,
-                      gpointer user_data)
+                      NMDeviceStateReason reason)
 {
+	NMDeviceBondPrivate *priv = NM_DEVICE_BOND_GET_PRIVATE (device);
+
 	if (new_state == NM_DEVICE_STATE_UNAVAILABLE) {
 		/* Use NM_DEVICE_STATE_REASON_CARRIER to make sure num retries is reset */
 		nm_device_queue_state (device, NM_DEVICE_STATE_DISCONNECTED, NM_DEVICE_STATE_REASON_CARRIER);
 	}
+
+	if (new_state <= NM_DEVICE_STATE_DISCONNECTED || new_state > NM_DEVICE_STATE_ACTIVATED) {
+		priv->ip4_waiting = FALSE;
+		priv->ip6_waiting = FALSE;
+	}
 }
 
 static void
-real_update_hw_address (NMDevice *dev)
+update_hw_address (NMDevice *dev)
 {
 	const guint8 *hw_addr;
 	guint8 old_addr[NM_UTILS_HWADDR_LEN_MAX];
@@ -115,7 +122,7 @@ real_update_hw_address (NMDevice *dev)
 }
 
 static guint32
-real_get_generic_capabilities (NMDevice *dev)
+get_generic_capabilities (NMDevice *dev)
 {
 	return NM_DEVICE_CAP_CARRIER_DETECT | NM_DEVICE_CAP_NM_SUPPORTED;
 }
@@ -147,9 +154,9 @@ match_bond_connection (NMDevice *device, NMConnection *connection, GError **erro
 }
 
 static NMConnection *
-real_get_best_auto_connection (NMDevice *dev,
-                               GSList *connections,
-                               char **specific_object)
+get_best_auto_connection (NMDevice *dev,
+                          GSList *connections,
+                          char **specific_object)
 {
 	GSList *iter;
 
@@ -167,19 +174,19 @@ real_get_best_auto_connection (NMDevice *dev,
 }
 
 static gboolean
-real_check_connection_compatible (NMDevice *device,
-                                  NMConnection *connection,
-                                  GError **error)
+check_connection_compatible (NMDevice *device,
+                             NMConnection *connection,
+                             GError **error)
 {
 	return match_bond_connection (device, connection, error);
 }
 
 static gboolean
-real_complete_connection (NMDevice *device,
-                          NMConnection *connection,
-                          const char *specific_object,
-                          const GSList *existing_connections,
-                          GError **error)
+complete_connection (NMDevice *device,
+                     NMConnection *connection,
+                     const char *specific_object,
+                     const GSList *existing_connections,
+                     GError **error)
 {
 	NMSettingBond *s_bond, *tmp;
 	guint32 i = 0;
@@ -295,7 +302,7 @@ connection_match_config (NMDevice *self, const GSList *connections)
 /******************************************************************/
 
 static NMActStageReturn
-real_act_stage1_prepare (NMDevice *dev, NMDeviceStateReason *reason)
+act_stage1_prepare (NMDevice *dev, NMDeviceStateReason *reason)
 {
 	NMActStageReturn ret = NM_ACT_STAGE_RETURN_SUCCESS;
 	NMConnection *connection;
@@ -304,6 +311,9 @@ real_act_stage1_prepare (NMDevice *dev, NMDeviceStateReason *reason)
 
 	g_return_val_if_fail (reason != NULL, NM_ACT_STAGE_RETURN_FAILURE);
 
+	NM_DEVICE_BOND_GET_PRIVATE (dev)->ip4_waiting = FALSE;
+	NM_DEVICE_BOND_GET_PRIVATE (dev)->ip6_waiting = FALSE;
+
 	ret = NM_DEVICE_CLASS (nm_device_bond_parent_class)->act_stage1_prepare (dev, reason);
 	if (ret == NM_ACT_STAGE_RETURN_SUCCESS) {
 		connection = nm_device_get_connection (dev);
@@ -322,120 +332,145 @@ real_act_stage1_prepare (NMDevice *dev, NMDeviceStateReason *reason)
 	return ret;
 }
 
-static void
-slave_state_changed (NMDevice *slave,
-                     NMDeviceState new_state,
-                     NMDeviceState old_state,
-                     NMDeviceStateReason reason,
-                     gpointer user_data)
+static gboolean
+enslave_slave (NMDevice *device, NMDevice *slave, NMConnection *connection)
 {
-	NMDeviceBond *self = NM_DEVICE_BOND (user_data);
-
-	nm_log_dbg (LOGD_DEVICE, "(%s): slave %s state change %d -> %d",
-	            nm_device_get_iface (NM_DEVICE (self)),
-	            nm_device_get_iface (slave),
-	            old_state,
-	            new_state);
-
-	if (   old_state > NM_DEVICE_STATE_DISCONNECTED
-	    && new_state <= NM_DEVICE_STATE_DISCONNECTED) {
-		/* Slave is no longer available or managed; can't use it */
-		nm_device_release_slave (NM_DEVICE (self), slave);
-	}
-}
+	NMDeviceBondPrivate *priv = NM_DEVICE_BOND_GET_PRIVATE (device);
+	gboolean success, no_firmware = FALSE;
+	const char *iface = nm_device_get_ip_iface (device);
+	const char *slave_iface = nm_device_get_ip_iface (slave);
 
-typedef struct {
-	NMDevice *slave;
-	guint state_id;
-} SlaveInfo;
+	nm_device_hw_take_down (slave, TRUE);
 
-static SlaveInfo *
-find_slave_info_by_device (NMDeviceBond *self, NMDevice *slave)
-{
-	NMDeviceBondPrivate *priv = NM_DEVICE_BOND_GET_PRIVATE (self);
-	GSList *iter;
+	success = nm_system_bond_enslave (nm_device_get_ip_ifindex (device),
+	                                  iface,
+	                                  nm_device_get_ip_ifindex (slave),
+	                                  slave_iface);
+
+	nm_device_hw_bring_up (slave, TRUE, &no_firmware);
+
+	if (success) {
+		nm_log_info (LOGD_BOND, "(%s): enslaved bond slave %s", iface, slave_iface);
+		g_object_notify (G_OBJECT (device), "slaves");
 
-	for (iter = priv->slaves; iter; iter = g_slist_next (iter)) {
-		if (((SlaveInfo *) iter->data)->slave == slave)
-			return iter->data;
+		/* If waiting for a slave to continue with IP config, start now */
+		if (priv->ip4_waiting) {
+			nm_log_info (LOGD_BOND | LOGD_IP4, "(%s): retrying IPv4 config with first slave", iface);
+			priv->ip4_waiting = FALSE;
+			nm_device_activate_stage3_ip4_start (device);
+		}
+
+		if (priv->ip6_waiting) {
+			nm_log_info (LOGD_BOND | LOGD_IP6, "(%s): retrying IPv6 config with first slave", iface);
+			priv->ip6_waiting = FALSE;
+			nm_device_activate_stage3_ip6_start (device);
+		}
 	}
-	return NULL;
+
+	return success;
 }
 
-static void
-free_slave_info (SlaveInfo *sinfo)
+static gboolean
+release_slave (NMDevice *device, NMDevice *slave)
 {
-	g_return_if_fail (sinfo != NULL);
-	g_return_if_fail (sinfo->slave != NULL);
+	gboolean success;
 
-	g_signal_handler_disconnect (sinfo->slave, sinfo->state_id);
-	g_object_unref (sinfo->slave);
-	memset (sinfo, 0, sizeof (*sinfo));
-	g_free (sinfo);
+	success = nm_system_bond_release (nm_device_get_ip_ifindex (device),
+	                                  nm_device_get_ip_iface (device),
+	                                  nm_device_get_ip_ifindex (slave),
+	                                  nm_device_get_ip_iface (slave));
+	nm_log_info (LOGD_BOND, "(%s): released bond slave %s (success %d)",
+	             nm_device_get_ip_iface (device),
+	             nm_device_get_ip_iface (slave),
+	             success);
+	g_object_notify (G_OBJECT (device), "slaves");
+	return success;
 }
 
-static gboolean
-enslave_slave (NMDevice *device, NMDevice *slave)
+static NMActStageReturn
+act_stage3_ip4_config_start (NMDevice *device,
+                             NMIP4Config **out_config,
+                             NMDeviceStateReason *reason)
 {
-	NMDeviceBond *self = NM_DEVICE_BOND (device);
-	NMDeviceBondPrivate *priv = NM_DEVICE_BOND_GET_PRIVATE (self);
-	gboolean success, no_firmware = FALSE;
+	NMDeviceBondPrivate *priv = NM_DEVICE_BOND_GET_PRIVATE (device);
+	NMActStageReturn ret = NM_ACT_STAGE_RETURN_SUCCESS;
+	NMConnection *connection;
+	NMSettingIP4Config *s_ip4;
+	const char *method = NULL;
+	GSList *slaves;
 
-	if (find_slave_info_by_device (self, slave))
-		return TRUE;
+	priv->ip4_waiting = FALSE;
 
-	nm_device_hw_take_down (slave, TRUE);
+	slaves = nm_device_master_get_slaves (device);
+	if (slaves == NULL) {
+		connection = nm_device_get_connection (device);
+		g_assert (connection);
 
-	success = nm_system_iface_enslave (nm_device_get_ip_ifindex (device),
-	                                   nm_device_get_ip_iface (device),
-	                                   nm_device_get_ip_ifindex (slave),
-	                                   nm_device_get_ip_iface (slave));
-	if (success) {
-		SlaveInfo *sinfo;
-
-		sinfo = g_malloc0 (sizeof (*slave));
-		sinfo->slave = g_object_ref (slave);
-		sinfo->state_id = g_signal_connect (slave,
-		                                    "state-changed",
-		                                    (GCallback) slave_state_changed,
-		                                    self);
-		priv->slaves = g_slist_append (priv->slaves, sinfo);
-
-		nm_log_dbg (LOGD_DEVICE, "(%s): enslaved bond slave %s",
-			        nm_device_get_ip_iface (device),
-			        nm_device_get_ip_iface (slave));
-		g_object_notify (G_OBJECT (device), "slaves");
-	}
+		s_ip4 = nm_connection_get_setting_ip4_config (connection);
+		if (s_ip4)
+			method = nm_setting_ip4_config_get_method (s_ip4);
 
-	nm_device_hw_bring_up (slave, TRUE, &no_firmware);
+		if (g_strcmp0 (method, NM_SETTING_IP4_CONFIG_METHOD_AUTO) == 0)
+			priv->ip4_waiting = TRUE;
+	}
+	g_slist_free (slaves);
+
+	if (priv->ip4_waiting) {
+		ret = NM_ACT_STAGE_RETURN_WAIT;
+		nm_log_info (LOGD_BOND | LOGD_IP4, "(%s): IPv4 config waiting until slaves are present",
+					 nm_device_get_ip_iface (device));
+	} else {
+		/* We have slaves; proceed with normal IPv4 configuration */
+		ret = NM_DEVICE_CLASS (nm_device_bond_parent_class)->act_stage3_ip4_config_start (device, out_config, reason);
+	}
 
-	return success;
+	return ret;
 }
 
-static gboolean
-release_slave (NMDevice *device, NMDevice *slave)
+static NMActStageReturn
+act_stage3_ip6_config_start (NMDevice *device,
+                             NMIP6Config **out_config,
+                             NMDeviceStateReason *reason)
 {
-	NMDeviceBond *self = NM_DEVICE_BOND (device);
-	NMDeviceBondPrivate *priv = NM_DEVICE_BOND_GET_PRIVATE (self);
-	gboolean success;
-	SlaveInfo *sinfo;
+	NMDeviceBondPrivate *priv = NM_DEVICE_BOND_GET_PRIVATE (device);
+	NMActStageReturn ret = NM_ACT_STAGE_RETURN_SUCCESS;
+	NMConnection *connection;
+	NMSettingIP6Config *s_ip6;
+	const char *method = NULL;
+	GSList *slaves;
 
-	sinfo = find_slave_info_by_device (self, slave);
-	if (!sinfo)
-		return FALSE;
+	priv->ip6_waiting = FALSE;
 
-	success = nm_system_iface_release (nm_device_get_ip_ifindex (device),
-	                                   nm_device_get_ip_iface (device),
-	                                   nm_device_get_ip_ifindex (slave),
-	                                   nm_device_get_ip_iface (slave));
-	nm_log_dbg (LOGD_DEVICE, "(%s): released bond slave %s (success %d)",
-	            nm_device_get_ip_iface (device),
-	            nm_device_get_ip_iface (slave),
-	            success);
-	priv->slaves = g_slist_remove (priv->slaves, sinfo);
-	free_slave_info (sinfo);
-	g_object_notify (G_OBJECT (device), "slaves");
-	return success;
+	slaves = nm_device_master_get_slaves (device);
+	if (slaves == NULL) {
+		connection = nm_device_get_connection (device);
+		g_assert (connection);
+
+		s_ip6 = nm_connection_get_setting_ip6_config (connection);
+		if (s_ip6)
+			method = nm_setting_ip6_config_get_method (s_ip6);
+
+		/* SLAAC, DHCP, and Link-Local depend on connectivity (and thus slaves)
+		 * to complete addressing.  SLAAC and DHCP obviously need a peer to
+		 * provide a prefix, while Link-Local must perform DAD on the local link.
+		 */
+		if (   !g_strcmp0 (method, NM_SETTING_IP6_CONFIG_METHOD_AUTO)
+		    || !g_strcmp0 (method, NM_SETTING_IP6_CONFIG_METHOD_DHCP)
+		    || !g_strcmp0 (method, NM_SETTING_IP6_CONFIG_METHOD_LINK_LOCAL))
+			priv->ip6_waiting = TRUE;
+	}
+	g_slist_free (slaves);
+
+	if (priv->ip6_waiting) {
+		ret = NM_ACT_STAGE_RETURN_WAIT;
+		nm_log_info (LOGD_BOND | LOGD_IP6, "(%s): IPv6 config waiting until slaves are present",
+					 nm_device_get_ip_iface (device));
+	} else {
+		/* We have slaves; proceed with normal IPv6 configuration */
+		ret = NM_DEVICE_CLASS (nm_device_bond_parent_class)->act_stage3_ip6_config_start (device, out_config, reason);
+	}
+
+	return ret;
 }
 
 /******************************************************************/
@@ -460,7 +495,7 @@ constructed (GObject *object)
 {
 	G_OBJECT_CLASS (nm_device_bond_parent_class)->constructed (object);
 
-	nm_log_dbg (LOGD_HW | LOGD_DEVICE, "(%s): kernel ifindex %d",
+	nm_log_dbg (LOGD_HW | LOGD_BOND, "(%s): kernel ifindex %d",
 	            nm_device_get_iface (NM_DEVICE (object)),
 	            nm_device_get_ifindex (NM_DEVICE (object)));
 }
@@ -468,19 +503,15 @@ constructed (GObject *object)
 static void
 nm_device_bond_init (NMDeviceBond * self)
 {
-	g_signal_connect (self, "state-changed", G_CALLBACK (device_state_changed), NULL);
 }
 
 static void
 get_property (GObject *object, guint prop_id,
               GValue *value, GParamSpec *pspec)
 {
-	NMDeviceBond *self = NM_DEVICE_BOND (object);
-	NMDeviceBondPrivate *priv = NM_DEVICE_BOND_GET_PRIVATE (self);
 	const guint8 *current_addr;
 	GPtrArray *slaves;
-	GSList *iter;
-	SlaveInfo *info;
+	GSList *list, *iter;
 
 	switch (prop_id) {
 	case PROP_HW_ADDRESS:
@@ -492,10 +523,10 @@ get_property (GObject *object, guint prop_id,
 		break;
 	case PROP_SLAVES:
 		slaves = g_ptr_array_new ();
-		for (iter = priv->slaves; iter; iter = iter->next) {
-			info = iter->data;
-			g_ptr_array_add (slaves, g_strdup (nm_device_get_path (info->slave)));
-		}
+		list = nm_device_master_get_slaves (NM_DEVICE (object));
+		for (iter = list; iter; iter = iter->next)
+			g_ptr_array_add (slaves, g_strdup (nm_device_get_path (NM_DEVICE (iter->data))));
+		g_slist_free (list);
 		g_value_take_boxed (value, slaves);
 		break;
 	default:
@@ -515,21 +546,6 @@ set_property (GObject *object, guint prop_id,
 	}
 }
 
-static void
-dispose (GObject *object)
-{
-	NMDeviceBond *self = NM_DEVICE_BOND (object);
-	NMDeviceBondPrivate *priv = NM_DEVICE_BOND_GET_PRIVATE (self);
-	GSList *iter;
-
-	for (iter = priv->slaves; iter; iter = g_slist_next (iter))
-		release_slave (NM_DEVICE (self), ((SlaveInfo *) iter->data)->slave);
-	g_slist_free (priv->slaves);
-	priv->slaves = NULL;
-
-	G_OBJECT_CLASS (nm_device_bond_parent_class)->dispose (object);
-}
-
 static void
 nm_device_bond_class_init (NMDeviceBondClass *klass)
 {
@@ -542,21 +558,24 @@ nm_device_bond_class_init (NMDeviceBondClass *klass)
 	object_class->constructed = constructed;
 	object_class->get_property = get_property;
 	object_class->set_property = set_property;
-	object_class->dispose = dispose;
 
-	parent_class->get_generic_capabilities = real_get_generic_capabilities;
-	parent_class->update_hw_address = real_update_hw_address;
-	parent_class->get_best_auto_connection = real_get_best_auto_connection;
-	parent_class->check_connection_compatible = real_check_connection_compatible;
-	parent_class->complete_connection = real_complete_connection;
+	parent_class->get_generic_capabilities = get_generic_capabilities;
+	parent_class->update_hw_address = update_hw_address;
+	parent_class->get_best_auto_connection = get_best_auto_connection;
+	parent_class->check_connection_compatible = check_connection_compatible;
+	parent_class->complete_connection = complete_connection;
 
 	parent_class->spec_match_list = spec_match_list;
 	parent_class->connection_match_config = connection_match_config;
 
-	parent_class->act_stage1_prepare = real_act_stage1_prepare;
+	parent_class->act_stage1_prepare = act_stage1_prepare;
+	parent_class->act_stage3_ip4_config_start = act_stage3_ip4_config_start;
+	parent_class->act_stage3_ip6_config_start = act_stage3_ip6_config_start;
 	parent_class->enslave_slave = enslave_slave;
 	parent_class->release_slave = release_slave;
 
+	parent_class->state_changed = device_state_changed;
+
 	/* properties */
 	g_object_class_install_property
 		(object_class, PROP_HW_ADDRESS,
diff --git a/src/nm-device-bridge.c b/src/nm-device-bridge.c
new file mode 100644
index 00000000..6f3d70e4
--- /dev/null
+++ b/src/nm-device-bridge.c
@@ -0,0 +1,683 @@
+/* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */
+/* NetworkManager -- Network link manager
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Copyright 2011 - 2012 Red Hat, Inc.
+ */
+
+#include "config.h"
+
+#include 
+#include 
+
+#include 
+
+#include "nm-device-bridge.h"
+#include "nm-logging.h"
+#include "nm-properties-changed-signal.h"
+#include "nm-utils.h"
+#include "NetworkManagerUtils.h"
+#include "nm-device-private.h"
+#include "nm-netlink-monitor.h"
+#include "nm-dbus-glib-types.h"
+#include "nm-enum-types.h"
+#include "nm-system.h"
+
+#include "nm-device-bridge-glue.h"
+
+
+G_DEFINE_TYPE (NMDeviceBridge, nm_device_bridge, NM_TYPE_DEVICE_WIRED)
+
+#define NM_DEVICE_BRIDGE_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), NM_TYPE_DEVICE_BRIDGE, NMDeviceBridgePrivate))
+
+#define NM_BRIDGE_ERROR (nm_bridge_error_quark ())
+
+typedef struct {
+	gboolean ip4_waiting;
+	gboolean ip6_waiting;
+} NMDeviceBridgePrivate;
+
+enum {
+	PROPERTIES_CHANGED,
+
+	LAST_SIGNAL
+};
+
+static guint signals[LAST_SIGNAL] = { 0 };
+
+enum {
+	PROP_0,
+	PROP_HW_ADDRESS,
+	PROP_CARRIER,
+	PROP_SLAVES,
+
+	LAST_PROP
+};
+
+/******************************************************************/
+
+static GQuark
+nm_bridge_error_quark (void)
+{
+	static GQuark quark = 0;
+	if (!quark)
+		quark = g_quark_from_static_string ("nm-bridge-error");
+	return quark;
+}
+
+/******************************************************************/
+
+static void
+device_state_changed (NMDevice *device,
+                      NMDeviceState new_state,
+                      NMDeviceState old_state,
+                      NMDeviceStateReason reason)
+{
+	NMDeviceBridgePrivate *priv = NM_DEVICE_BRIDGE_GET_PRIVATE (device);
+
+	if (new_state == NM_DEVICE_STATE_UNAVAILABLE) {
+		/* Use NM_DEVICE_STATE_REASON_CARRIER to make sure num retries is reset */
+		nm_device_queue_state (device, NM_DEVICE_STATE_DISCONNECTED, NM_DEVICE_STATE_REASON_CARRIER);
+	}
+
+	if (new_state <= NM_DEVICE_STATE_DISCONNECTED || new_state > NM_DEVICE_STATE_ACTIVATED) {
+		priv->ip4_waiting = FALSE;
+		priv->ip6_waiting = FALSE;
+	}
+}
+
+static void
+update_hw_address (NMDevice *dev)
+{
+	const guint8 *hw_addr;
+	guint8 old_addr[NM_UTILS_HWADDR_LEN_MAX];
+	int addrtype, addrlen;
+
+	addrtype = nm_device_wired_get_hwaddr_type (NM_DEVICE_WIRED (dev));
+	g_assert (addrtype >= 0);
+	addrlen = nm_utils_hwaddr_len (addrtype);
+	g_assert (addrlen > 0);
+
+	hw_addr = nm_device_wired_get_hwaddr (NM_DEVICE_WIRED (dev));
+	memcpy (old_addr, hw_addr, addrlen);
+
+	NM_DEVICE_CLASS (nm_device_bridge_parent_class)->update_hw_address (dev);
+
+	hw_addr = nm_device_wired_get_hwaddr (NM_DEVICE_WIRED (dev));
+	if (memcmp (old_addr, hw_addr, addrlen))
+		g_object_notify (G_OBJECT (dev), NM_DEVICE_BRIDGE_HW_ADDRESS);
+}
+
+static guint32
+get_generic_capabilities (NMDevice *dev)
+{
+	return NM_DEVICE_CAP_CARRIER_DETECT | NM_DEVICE_CAP_NM_SUPPORTED;
+}
+
+static gboolean
+is_available (NMDevice *dev)
+{
+	if (NM_DEVICE_GET_CLASS (dev)->hw_is_up)
+		return NM_DEVICE_GET_CLASS (dev)->hw_is_up (dev);
+	return FALSE;
+}
+
+static gboolean
+match_bridge_connection (NMDevice *device, NMConnection *connection, GError **error)
+{
+	const char *iface;
+	NMSettingBridge *s_bridge;
+
+	s_bridge = nm_connection_get_setting_bridge (connection);
+	if (!s_bridge || !nm_connection_is_type (connection, NM_SETTING_BRIDGE_SETTING_NAME)) {
+		g_set_error (error, NM_BRIDGE_ERROR, NM_BRIDGE_ERROR_CONNECTION_NOT_BRIDGE,
+		             "The connection was not a bridge connection.");
+		return FALSE;
+	}
+
+	/* Bridge connections must specify the virtual interface name */
+	iface = nm_connection_get_virtual_iface_name (connection);
+	if (!iface || strcmp (nm_device_get_iface (device), iface)) {
+		g_set_error (error, NM_BRIDGE_ERROR, NM_BRIDGE_ERROR_CONNECTION_INVALID,
+		             "The bridge connection virtual interface name did not match.");
+		return FALSE;
+	}
+
+	return TRUE;
+}
+
+static NMConnection *
+get_best_auto_connection (NMDevice *dev,
+                          GSList *connections,
+                          char **specific_object)
+{
+	GSList *iter;
+
+	for (iter = connections; iter; iter = g_slist_next (iter)) {
+		NMConnection *connection = NM_CONNECTION (iter->data);
+		NMSettingConnection *s_con;
+
+		s_con = nm_connection_get_setting_connection (connection);
+		g_assert (s_con);
+		if (   nm_setting_connection_get_autoconnect (s_con)
+		    && match_bridge_connection (dev, connection, NULL))
+			return connection;
+	}
+	return NULL;
+}
+
+static gboolean
+check_connection_compatible (NMDevice *device,
+                             NMConnection *connection,
+                             GError **error)
+{
+	return match_bridge_connection (device, connection, error);
+}
+
+static gboolean
+complete_connection (NMDevice *device,
+                     NMConnection *connection,
+                     const char *specific_object,
+                     const GSList *existing_connections,
+                     GError **error)
+{
+	NMSettingBridge *s_bridge, *tmp;
+	guint32 i = 0;
+	char *name;
+	const GSList *iter;
+	gboolean found;
+
+	nm_utils_complete_generic (connection,
+	                           NM_SETTING_BRIDGE_SETTING_NAME,
+	                           existing_connections,
+	                           _("Bridge connection %d"),
+	                           NULL,
+	                           TRUE);
+
+	s_bridge = nm_connection_get_setting_bridge (connection);
+	if (!s_bridge) {
+		s_bridge = (NMSettingBridge *) nm_setting_bridge_new ();
+		nm_connection_add_setting (connection, NM_SETTING (s_bridge));
+	}
+
+	/* Grab the first name that doesn't exist in either our connections
+	 * or a device on the system.
+	 */
+	while (i < 500 && !nm_setting_bridge_get_interface_name (s_bridge)) {
+		name = g_strdup_printf ("br%u", i);
+		/* check interface names */
+		if (nm_netlink_iface_to_index (name) < 0) {
+			/* check existing bridge connections */
+			for (iter = existing_connections, found = FALSE; iter; iter = g_slist_next (iter)) {
+				NMConnection *candidate = iter->data;
+
+				tmp = nm_connection_get_setting_bridge (candidate);
+				if (tmp && nm_connection_is_type (candidate, NM_SETTING_BRIDGE_SETTING_NAME)) {
+					if (g_strcmp0 (nm_setting_bridge_get_interface_name (tmp), name) == 0) {
+						found = TRUE;
+						break;
+					}
+				}
+			}
+
+			if (!found)
+				g_object_set (G_OBJECT (s_bridge), NM_SETTING_BRIDGE_INTERFACE_NAME, name, NULL);
+		}
+
+		g_free (name);
+		i++;
+	}
+
+	return TRUE;
+}
+
+static gboolean
+spec_match_list (NMDevice *device, const GSList *specs)
+{
+	char *hwaddr;
+	gboolean matched;
+
+	hwaddr = nm_utils_hwaddr_ntoa (nm_device_wired_get_hwaddr (NM_DEVICE_WIRED (device)), ARPHRD_ETHER);
+	matched = nm_match_spec_hwaddr (specs, hwaddr);
+	g_free (hwaddr);
+
+	return matched;
+}
+
+static gboolean
+bridge_match_config (NMDevice *self, NMConnection *connection)
+{
+	NMSettingBridge *s_bridge;
+	const char *ifname;
+
+	s_bridge = nm_connection_get_setting_bridge (connection);
+	if (!s_bridge)
+		return FALSE;
+
+	/* Interface name */
+	ifname = nm_setting_bridge_get_interface_name (s_bridge);
+	if (g_strcmp0 (ifname, nm_device_get_ip_iface (self)) != 0)
+		return FALSE;
+
+	return TRUE;
+}
+
+static NMConnection *
+connection_match_config (NMDevice *self, const GSList *connections)
+{
+	const GSList *iter;
+	GSList *bridge_matches;
+	NMConnection *match;
+
+	/* First narrow @connections down to those that match in their
+	 * NMSettingBridge configuration.
+	 */
+	bridge_matches = NULL;
+	for (iter = connections; iter; iter = iter->next) {
+		NMConnection *candidate = NM_CONNECTION (iter->data);
+
+		if (!nm_connection_is_type (candidate, NM_SETTING_BRIDGE_SETTING_NAME))
+			continue;
+		if (!bridge_match_config (self, candidate))
+			continue;
+
+		bridge_matches = g_slist_prepend (bridge_matches, candidate);
+	}
+
+	/* Now pass those to the super method, which will check IP config */
+	bridge_matches = g_slist_reverse (bridge_matches);
+	match = NM_DEVICE_CLASS (nm_device_bridge_parent_class)->connection_match_config (self, bridge_matches);
+	g_slist_free (bridge_matches);
+
+	return match;
+}
+
+/******************************************************************/
+
+static void
+set_sysfs_uint (const char *iface,
+                GObject *obj,
+                const char *obj_prop,
+                const char *sysfs_prop,
+                gboolean default_if_zero,
+                gboolean user_hz_compensate)
+{
+	char *path, *s;
+	GParamSpec *pspec;
+	GValue val = { 0 };
+	guint32 uval = 0;
+
+	pspec = g_object_class_find_property (G_OBJECT_GET_CLASS (obj), obj_prop);
+	g_return_if_fail (pspec != NULL);
+
+	/* Get the property's value */
+	g_value_init (&val, G_PARAM_SPEC_VALUE_TYPE (pspec));
+	g_object_get_property (obj, obj_prop, &val);
+	if (G_VALUE_HOLDS_BOOLEAN (&val))
+		uval = g_value_get_boolean (&val) ? 1 : 0;
+	else if (G_VALUE_HOLDS_UINT (&val)) {
+		uval = g_value_get_uint (&val);
+
+		/* zero means "unspecified" for some NM properties but isn't in the
+		 * allowed kernel range, so reset the property to the default value.
+		 */
+		if (default_if_zero && uval == 0) {
+			g_value_unset (&val);
+			g_value_init (&val, G_PARAM_SPEC_VALUE_TYPE (pspec));
+			g_param_value_set_default (pspec, &val);
+			uval = g_value_get_uint (&val);
+		}
+	} else
+		g_assert_not_reached ();
+
+	g_value_unset (&val);
+
+	/* Linux kernel bridge interfaces use 'centiseconds' for time-based values.
+	 * In reality it's not centiseconds, but depends on HZ and USER_HZ, which
+	 * is almost always works out to be a multiplier of 100, so we can assume
+	 * centiseconds.  See clock_t_to_jiffies().
+	 */
+	if (user_hz_compensate)
+		uval *= 100;
+
+	path = g_strdup_printf ("/sys/class/net/%s/bridge/%s", iface, sysfs_prop);
+	s = g_strdup_printf ("%u", uval);
+	/* FIXME: how should failure be handled? */
+	nm_utils_do_sysctl (path, s);
+	g_free (path);
+	g_free (s);
+}
+
+static NMActStageReturn
+act_stage1_prepare (NMDevice *dev, NMDeviceStateReason *reason)
+{
+	NMActStageReturn ret = NM_ACT_STAGE_RETURN_SUCCESS;
+	NMConnection *connection;
+	NMSettingBridge *s_bridge;
+	const char *iface;
+
+	g_return_val_if_fail (reason != NULL, NM_ACT_STAGE_RETURN_FAILURE);
+
+	NM_DEVICE_BRIDGE_GET_PRIVATE (dev)->ip4_waiting = FALSE;
+	NM_DEVICE_BRIDGE_GET_PRIVATE (dev)->ip6_waiting = FALSE;
+
+	ret = NM_DEVICE_CLASS (nm_device_bridge_parent_class)->act_stage1_prepare (dev, reason);
+	if (ret == NM_ACT_STAGE_RETURN_SUCCESS) {
+		connection = nm_device_get_connection (dev);
+		g_assert (connection);
+
+		s_bridge = nm_connection_get_setting_bridge (connection);
+		g_assert (s_bridge);
+
+		iface = nm_device_get_ip_iface (dev);
+		g_assert (iface);
+
+		set_sysfs_uint (iface, G_OBJECT (s_bridge), NM_SETTING_BRIDGE_STP, "stp_state", FALSE, FALSE);
+		set_sysfs_uint (iface, G_OBJECT (s_bridge), NM_SETTING_BRIDGE_PRIORITY, "priority", TRUE, FALSE);
+		set_sysfs_uint (iface, G_OBJECT (s_bridge), NM_SETTING_BRIDGE_FORWARD_DELAY, "forward_delay", TRUE, TRUE);
+		set_sysfs_uint (iface, G_OBJECT (s_bridge), NM_SETTING_BRIDGE_HELLO_TIME, "hello_time", TRUE, TRUE);
+		set_sysfs_uint (iface, G_OBJECT (s_bridge), NM_SETTING_BRIDGE_MAX_AGE, "max_age", TRUE, TRUE);
+		set_sysfs_uint (iface, G_OBJECT (s_bridge), NM_SETTING_BRIDGE_AGEING_TIME, "ageing_time", TRUE, TRUE);
+	}
+	return ret;
+}
+
+static gboolean
+enslave_slave (NMDevice *device, NMDevice *slave, NMConnection *connection)
+{
+	NMDeviceBridgePrivate *priv = NM_DEVICE_BRIDGE_GET_PRIVATE (device);
+	gboolean success;
+	NMSettingBridgePort *s_port;
+	const char *iface = nm_device_get_ip_iface (device);
+	const char *slave_iface = nm_device_get_ip_iface (slave);
+
+	success = nm_system_bridge_attach (nm_device_get_ip_ifindex (device),
+	                                   iface,
+	                                   nm_device_get_ip_ifindex (slave),
+	                                   slave_iface);
+	if (!success)
+		return FALSE;
+
+	/* Set port properties */
+	s_port = nm_connection_get_setting_bridge_port (connection);
+	if (s_port) {
+		set_sysfs_uint (slave_iface, G_OBJECT (s_port), NM_SETTING_BRIDGE_PORT_PRIORITY, "priority", TRUE, FALSE);
+		set_sysfs_uint (slave_iface, G_OBJECT (s_port), NM_SETTING_BRIDGE_PORT_PATH_COST, "path_cost", TRUE, FALSE);
+		set_sysfs_uint (slave_iface, G_OBJECT (s_port), NM_SETTING_BRIDGE_PORT_HAIRPIN_MODE, "hairpin_mode", FALSE, FALSE);
+	}
+
+	nm_log_info (LOGD_DEVICE, "(%s): attached bridge port %s", iface, slave_iface);
+
+	g_object_notify (G_OBJECT (device), NM_DEVICE_BRIDGE_SLAVES);
+
+	/* If waiting for a slave to continue with IP config, start now */
+	if (priv->ip4_waiting) {
+		nm_log_info (LOGD_DEVICE | LOGD_IP4, "(%s): retrying IPv4 config with first slave", iface);
+		priv->ip4_waiting = FALSE;
+		nm_device_activate_stage3_ip4_start (device);
+	}
+
+	if (priv->ip6_waiting) {
+		nm_log_info (LOGD_DEVICE | LOGD_IP6, "(%s): retrying IPv6 config with first slave", iface);
+		priv->ip6_waiting = FALSE;
+		nm_device_activate_stage3_ip6_start (device);
+	}
+
+	return TRUE;
+}
+
+static gboolean
+release_slave (NMDevice *device, NMDevice *slave)
+{
+	gboolean success;
+
+	success = nm_system_bridge_detach (nm_device_get_ip_ifindex (device),
+	                                   nm_device_get_ip_iface (device),
+	                                   nm_device_get_ip_ifindex (slave),
+	                                   nm_device_get_ip_iface (slave));
+	nm_log_info (LOGD_DEVICE, "(%s): detached bridge port %s (success %d)",
+	             nm_device_get_ip_iface (device),
+	             nm_device_get_ip_iface (slave),
+	             success);
+	g_object_notify (G_OBJECT (device), NM_DEVICE_BRIDGE_SLAVES);
+	return success;
+}
+
+static NMActStageReturn
+act_stage3_ip4_config_start (NMDevice *device,
+                             NMIP4Config **out_config,
+                             NMDeviceStateReason *reason)
+{
+	NMDeviceBridgePrivate *priv = NM_DEVICE_BRIDGE_GET_PRIVATE (device);
+	NMActStageReturn ret = NM_ACT_STAGE_RETURN_SUCCESS;
+	NMConnection *connection;
+	NMSettingIP4Config *s_ip4;
+	const char *method = NULL;
+	GSList *slaves;
+
+	priv->ip4_waiting = FALSE;
+
+	slaves = nm_device_master_get_slaves (device);
+	if (slaves == NULL) {
+		connection = nm_device_get_connection (device);
+		g_assert (connection);
+
+		s_ip4 = nm_connection_get_setting_ip4_config (connection);
+		if (s_ip4)
+			method = nm_setting_ip4_config_get_method (s_ip4);
+
+		if (g_strcmp0 (method, NM_SETTING_IP4_CONFIG_METHOD_AUTO) == 0)
+			priv->ip4_waiting = TRUE;
+	}
+	g_slist_free (slaves);
+
+	if (priv->ip4_waiting) {
+		ret = NM_ACT_STAGE_RETURN_WAIT;
+		nm_log_info (LOGD_DEVICE | LOGD_IP4, "(%s): IPv4 config waiting until slaves are present",
+					 nm_device_get_ip_iface (device));
+	} else {
+		/* We have slaves; proceed with normal IPv4 configuration */
+		ret = NM_DEVICE_CLASS (nm_device_bridge_parent_class)->act_stage3_ip4_config_start (device, out_config, reason);
+	}
+
+	return ret;
+}
+
+static NMActStageReturn
+act_stage3_ip6_config_start (NMDevice *device,
+                             NMIP6Config **out_config,
+                             NMDeviceStateReason *reason)
+{
+	NMDeviceBridgePrivate *priv = NM_DEVICE_BRIDGE_GET_PRIVATE (device);
+	NMActStageReturn ret = NM_ACT_STAGE_RETURN_SUCCESS;
+	NMConnection *connection;
+	NMSettingIP6Config *s_ip6;
+	const char *method = NULL;
+	GSList *slaves;
+
+	priv->ip6_waiting = FALSE;
+
+	slaves = nm_device_master_get_slaves (device);
+	if (slaves == NULL) {
+		connection = nm_device_get_connection (device);
+		g_assert (connection);
+
+		s_ip6 = nm_connection_get_setting_ip6_config (connection);
+		if (s_ip6)
+			method = nm_setting_ip6_config_get_method (s_ip6);
+
+		/* SLAAC, DHCP, and Link-Local depend on connectivity (and thus slaves)
+		 * to complete addressing.  SLAAC and DHCP obviously need a peer to
+		 * provide a prefix, while Link-Local must perform DAD on the local link.
+		 */
+		if (   !g_strcmp0 (method, NM_SETTING_IP6_CONFIG_METHOD_AUTO)
+		    || !g_strcmp0 (method, NM_SETTING_IP6_CONFIG_METHOD_DHCP)
+		    || !g_strcmp0 (method, NM_SETTING_IP6_CONFIG_METHOD_LINK_LOCAL))
+			priv->ip6_waiting = TRUE;
+	}
+	g_slist_free (slaves);
+
+	if (priv->ip6_waiting) {
+		ret = NM_ACT_STAGE_RETURN_WAIT;
+		nm_log_info (LOGD_DEVICE | LOGD_IP6, "(%s): IPv6 config waiting until slaves are present",
+					 nm_device_get_ip_iface (device));
+	} else {
+		/* We have slaves; proceed with normal IPv6 configuration */
+		ret = NM_DEVICE_CLASS (nm_device_bridge_parent_class)->act_stage3_ip6_config_start (device, out_config, reason);
+	}
+
+	return ret;
+}
+
+/******************************************************************/
+
+NMDevice *
+nm_device_bridge_new (const char *udi, const char *iface)
+{
+	g_return_val_if_fail (udi != NULL, NULL);
+	g_return_val_if_fail (iface != NULL, NULL);
+
+	return (NMDevice *) g_object_new (NM_TYPE_DEVICE_BRIDGE,
+	                                  NM_DEVICE_UDI, udi,
+	                                  NM_DEVICE_IFACE, iface,
+	                                  NM_DEVICE_DRIVER, "bridge",
+	                                  NM_DEVICE_TYPE_DESC, "Bridge",
+	                                  NM_DEVICE_DEVICE_TYPE, NM_DEVICE_TYPE_BRIDGE,
+	                                  NULL);
+}
+
+static void
+constructed (GObject *object)
+{
+	G_OBJECT_CLASS (nm_device_bridge_parent_class)->constructed (object);
+
+	nm_log_dbg (LOGD_HW | LOGD_DEVICE, "(%s): kernel ifindex %d",
+	            nm_device_get_iface (NM_DEVICE (object)),
+	            nm_device_get_ifindex (NM_DEVICE (object)));
+}
+
+static void
+nm_device_bridge_init (NMDeviceBridge * self)
+{
+}
+
+static void
+get_property (GObject *object, guint prop_id,
+              GValue *value, GParamSpec *pspec)
+{
+	const guint8 *current_addr;
+	GPtrArray *slaves;
+	GSList *list, *iter;
+
+	switch (prop_id) {
+	case PROP_HW_ADDRESS:
+		current_addr = nm_device_wired_get_hwaddr (NM_DEVICE_WIRED (object));
+		g_value_take_string (value, nm_utils_hwaddr_ntoa (current_addr, ARPHRD_ETHER));
+		break;
+	case PROP_CARRIER:
+		g_value_set_boolean (value, nm_device_wired_get_carrier (NM_DEVICE_WIRED (object)));
+		break;
+	case PROP_SLAVES:
+		slaves = g_ptr_array_new ();
+		list = nm_device_master_get_slaves (NM_DEVICE (object));
+		for (iter = list; iter; iter = iter->next)
+			g_ptr_array_add (slaves, g_strdup (nm_device_get_path (NM_DEVICE (iter->data))));
+		g_slist_free (list);
+		g_value_take_boxed (value, slaves);
+		break;
+	default:
+		G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
+		break;
+	}
+}
+
+static void
+set_property (GObject *object, guint prop_id,
+			  const GValue *value, GParamSpec *pspec)
+{
+	switch (prop_id) {
+	default:
+		G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
+		break;
+	}
+}
+
+static void
+nm_device_bridge_class_init (NMDeviceBridgeClass *klass)
+{
+	GObjectClass *object_class = G_OBJECT_CLASS (klass);
+	NMDeviceClass *parent_class = NM_DEVICE_CLASS (klass);
+
+	g_type_class_add_private (object_class, sizeof (NMDeviceBridgePrivate));
+
+	/* virtual methods */
+	object_class->constructed = constructed;
+	object_class->get_property = get_property;
+	object_class->set_property = set_property;
+
+	parent_class->get_generic_capabilities = get_generic_capabilities;
+	parent_class->update_hw_address = update_hw_address;
+	parent_class->is_available = is_available;
+	parent_class->get_best_auto_connection = get_best_auto_connection;
+	parent_class->check_connection_compatible = check_connection_compatible;
+	parent_class->complete_connection = complete_connection;
+
+	parent_class->spec_match_list = spec_match_list;
+	parent_class->connection_match_config = connection_match_config;
+
+	parent_class->act_stage1_prepare = act_stage1_prepare;
+	parent_class->act_stage3_ip4_config_start = act_stage3_ip4_config_start;
+	parent_class->act_stage3_ip6_config_start = act_stage3_ip6_config_start;
+	parent_class->enslave_slave = enslave_slave;
+	parent_class->release_slave = release_slave;
+
+	parent_class->state_changed = device_state_changed;
+
+	/* properties */
+	g_object_class_install_property
+		(object_class, PROP_HW_ADDRESS,
+		 g_param_spec_string (NM_DEVICE_BRIDGE_HW_ADDRESS,
+							  "Active MAC Address",
+							  "Currently set hardware MAC address",
+							  NULL,
+							  G_PARAM_READABLE));
+
+	g_object_class_install_property
+		(object_class, PROP_CARRIER,
+		 g_param_spec_boolean (NM_DEVICE_BRIDGE_CARRIER,
+							   "Carrier",
+							   "Carrier",
+							   FALSE,
+							   G_PARAM_READABLE));
+
+	g_object_class_install_property
+		(object_class, PROP_SLAVES,
+		 g_param_spec_boxed (NM_DEVICE_BRIDGE_SLAVES,
+		                     "Slaves",
+		                     "Slaves",
+		                     DBUS_TYPE_G_ARRAY_OF_OBJECT_PATH,
+		                     G_PARAM_READABLE));
+
+	/* Signals */
+	signals[PROPERTIES_CHANGED] =
+		nm_properties_changed_signal_new (object_class,
+										  G_STRUCT_OFFSET (NMDeviceBridgeClass, properties_changed));
+
+	dbus_g_object_type_install_info (G_TYPE_FROM_CLASS (klass),
+									 &dbus_glib_nm_device_bridge_object_info);
+
+	dbus_g_error_domain_register (NM_BRIDGE_ERROR, NULL, NM_TYPE_BRIDGE_ERROR);
+}
diff --git a/src/nm-device-bridge.h b/src/nm-device-bridge.h
new file mode 100644
index 00000000..bf0ed01e
--- /dev/null
+++ b/src/nm-device-bridge.h
@@ -0,0 +1,66 @@
+/* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */
+/* NetworkManager -- Network link manager
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Copyright 2012 Red Hat, Inc.
+ */
+
+#ifndef NM_DEVICE_BRIDGE_H
+#define NM_DEVICE_BRIDGE_H
+
+#include 
+
+#include "nm-device-wired.h"
+
+G_BEGIN_DECLS
+
+#define NM_TYPE_DEVICE_BRIDGE            (nm_device_bridge_get_type ())
+#define NM_DEVICE_BRIDGE(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), NM_TYPE_DEVICE_BRIDGE, NMDeviceBridge))
+#define NM_DEVICE_BRIDGE_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass),  NM_TYPE_DEVICE_BRIDGE, NMDeviceBridgeClass))
+#define NM_IS_DEVICE_BRIDGE(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), NM_TYPE_DEVICE_BRIDGE))
+#define NM_IS_DEVICE_BRIDGE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass),  NM_TYPE_DEVICE_BRIDGE))
+#define NM_DEVICE_BRIDGE_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj),  NM_TYPE_DEVICE_BRIDGE, NMDeviceBridgeClass))
+
+typedef enum {
+	NM_BRIDGE_ERROR_CONNECTION_NOT_BRIDGE = 0, /*< nick=ConnectionNotBridge >*/
+	NM_BRIDGE_ERROR_CONNECTION_INVALID,      /*< nick=ConnectionInvalid >*/
+	NM_BRIDGE_ERROR_CONNECTION_INCOMPATIBLE, /*< nick=ConnectionIncompatible >*/
+} NMBridgeError;
+
+#define NM_DEVICE_BRIDGE_HW_ADDRESS "hw-address"
+#define NM_DEVICE_BRIDGE_CARRIER "carrier"
+#define NM_DEVICE_BRIDGE_SLAVES "slaves"
+
+typedef struct {
+	NMDeviceWired parent;
+} NMDeviceBridge;
+
+typedef struct {
+	NMDeviceWiredClass parent;
+
+	/* Signals */
+	void (*properties_changed) (NMDeviceBridge *device, GHashTable *properties);
+} NMDeviceBridgeClass;
+
+
+GType nm_device_bridge_get_type (void);
+
+NMDevice *nm_device_bridge_new (const char *udi,
+                                const char *iface);
+
+G_END_DECLS
+
+#endif	/* NM_DEVICE_BRIDGE_H */
diff --git a/src/nm-device-bt.c b/src/nm-device-bt.c
index f61aeb57..cadedcf7 100644
--- a/src/nm-device-bt.c
+++ b/src/nm-device-bt.c
@@ -47,6 +47,8 @@
 #include "nm-enum-types.h"
 #include "nm-utils.h"
 
+#define MM_OLD_DBUS_SERVICE  "org.freedesktop.ModemManager"
+#define MM_NEW_DBUS_SERVICE  "org.freedesktop.ModemManager1"
 #define BLUETOOTH_DUN_UUID "dun"
 #define BLUETOOTH_NAP_UUID "nap"
 
@@ -57,6 +59,10 @@ G_DEFINE_TYPE (NMDeviceBt, nm_device_bt, NM_TYPE_DEVICE)
 static gboolean modem_stage1 (NMDeviceBt *self, NMModem *modem, NMDeviceStateReason *reason);
 
 typedef struct {
+	NMDBusManager *dbus_mgr;
+	guint mm_watch_id;
+	gboolean mm_running;
+
 	char *bdaddr;
 	char *name;
 	guint32 capabilities;
@@ -141,9 +147,9 @@ get_connection_bt_type (NMConnection *connection)
 }
 
 static NMConnection *
-real_get_best_auto_connection (NMDevice *device,
-                               GSList *connections,
-                               char **specific_object)
+get_best_auto_connection (NMDevice *device,
+                          GSList *connections,
+                          char **specific_object)
 {
 	NMDeviceBtPrivate *priv = NM_DEVICE_BT_GET_PRIVATE (device);
 	GSList *iter;
@@ -166,15 +172,19 @@ real_get_best_auto_connection (NMDevice *device,
 		if (!(bt_type & priv->capabilities))
 			continue;
 
+		/* Can't auto-activate a DUN connection without ModemManager */
+		if (bt_type == NM_BT_CAPABILITY_DUN && priv->mm_running == FALSE)
+			continue;
+
 		return connection;
 	}
 	return NULL;
 }
 
 static gboolean
-real_check_connection_compatible (NMDevice *device,
-                                  NMConnection *connection,
-                                  GError **error)
+check_connection_compatible (NMDevice *device,
+                             NMConnection *connection,
+                             GError **error)
 {
 	NMDeviceBtPrivate *priv = NM_DEVICE_BT_GET_PRIVATE (device);
 	NMSettingConnection *s_con;
@@ -228,11 +238,28 @@ real_check_connection_compatible (NMDevice *device,
 }
 
 static gboolean
-real_complete_connection (NMDevice *device,
-                          NMConnection *connection,
-                          const char *specific_object,
-                          const GSList *existing_connections,
-                          GError **error)
+check_connection_available (NMDevice *device, NMConnection *connection)
+{
+	NMDeviceBtPrivate *priv = NM_DEVICE_BT_GET_PRIVATE (device);
+	guint32 bt_type;
+
+	bt_type = get_connection_bt_type (connection);
+	if (!(bt_type & priv->capabilities))
+		return FALSE;
+
+	/* DUN connections aren't available without ModemManager */
+	if (bt_type == NM_BT_CAPABILITY_DUN && priv->mm_running == FALSE)
+		return FALSE;
+
+	return TRUE;
+}
+
+static gboolean
+complete_connection (NMDevice *device,
+                     NMConnection *connection,
+                     const char *specific_object,
+                     const GSList *existing_connections,
+                     GError **error)
 {
 	NMDeviceBtPrivate *priv = NM_DEVICE_BT_GET_PRIVATE (device);
 	NMSettingBluetooth *s_bt;
@@ -369,7 +396,7 @@ real_complete_connection (NMDevice *device,
 }
 
 static guint32
-real_get_generic_capabilities (NMDevice *dev)
+get_generic_capabilities (NMDevice *dev)
 {
 	return NM_DEVICE_CAP_NM_SUPPORTED;
 }
@@ -517,8 +544,7 @@ static void
 device_state_changed (NMDevice *device,
                       NMDeviceState new_state,
                       NMDeviceState old_state,
-                      NMDeviceStateReason reason,
-                      gpointer user_data)
+                      NMDeviceStateReason reason)
 {
 	NMDeviceBtPrivate *priv = NM_DEVICE_BT_GET_PRIVATE (device);
 
@@ -528,7 +554,6 @@ device_state_changed (NMDevice *device,
 
 static void
 modem_ip4_config_result (NMModem *self,
-                         const char *iface,
                          NMIP4Config *config,
                          GError *error,
                          gpointer user_data)
@@ -545,12 +570,16 @@ modem_ip4_config_result (NMModem *self,
 		             error && error->message ? error->message : "(unknown)");
 
 		nm_device_state_changed (device, NM_DEVICE_STATE_FAILED, NM_DEVICE_STATE_REASON_IP_CONFIG_UNAVAILABLE);
-	} else {
-		if (iface)
-			nm_device_set_ip_iface (device, iface);
-
+	} else
 		nm_device_activate_schedule_ip4_config_result (device, config);
-	}
+}
+
+static void
+data_port_changed_cb (NMModem *modem, GParamSpec *pspec, gpointer user_data)
+{
+	NMDevice *self = NM_DEVICE (user_data);
+
+	nm_device_set_ip_iface (self, nm_modem_get_data_port (modem));
 }
 
 static gboolean
@@ -586,7 +615,8 @@ nm_device_bt_modem_added (NMDeviceBt *self,
                           const char *driver)
 {
 	NMDeviceBtPrivate *priv;
-	const char *modem_iface;
+	const gchar *modem_data_port;
+	const gchar *modem_control_port;
 	char *base;
 	NMDeviceState state;
 	NMDeviceStateReason reason = NM_DEVICE_STATE_REASON_NONE;
@@ -597,14 +627,15 @@ nm_device_bt_modem_added (NMDeviceBt *self,
 	g_return_val_if_fail (NM_IS_MODEM (modem), FALSE);
 
 	priv = NM_DEVICE_BT_GET_PRIVATE (self);
-	modem_iface = nm_modem_get_iface (modem);
-	g_return_val_if_fail (modem_iface != NULL, FALSE);
+	modem_data_port = nm_modem_get_data_port (modem);
+	modem_control_port = nm_modem_get_control_port (modem);
+	g_return_val_if_fail (modem_data_port != NULL || modem_control_port != NULL, FALSE);
 
 	if (!priv->rfcomm_iface)
 		return FALSE;
 
 	base = g_path_get_basename (priv->rfcomm_iface);
-	if (strcmp (base, modem_iface)) {
+	if (g_strcmp0 (base, modem_data_port) && g_strcmp0 (base, modem_control_port)) {
 		g_free (base);
 		return FALSE;
 	}
@@ -645,6 +676,13 @@ nm_device_bt_modem_added (NMDeviceBt *self,
 	g_signal_connect (modem, NM_MODEM_AUTH_REQUESTED, G_CALLBACK (modem_auth_requested), self);
 	g_signal_connect (modem, NM_MODEM_AUTH_RESULT, G_CALLBACK (modem_auth_result), self);
 
+	/* In the old ModemManager the data port is known from the very beginning;
+	 * while in the new ModemManager the data port is set afterwards when the bearer gets
+	 * created */
+	if (modem_data_port)
+		nm_device_set_ip_iface (NM_DEVICE (self), modem_data_port);
+	g_signal_connect (modem, "notify::" NM_MODEM_DATA_PORT, G_CALLBACK (data_port_changed_cb), self);
+
 	/* Kick off the modem connection */
 	if (!modem_stage1 (self, modem, &reason))
 		nm_device_state_changed (NM_DEVICE (self), NM_DEVICE_STATE_FAILED, reason);
@@ -854,11 +892,10 @@ bt_connect_timeout (gpointer user_data)
 }
 
 static NMActStageReturn
-real_act_stage2_config (NMDevice *device, NMDeviceStateReason *reason)
+act_stage2_config (NMDevice *device, NMDeviceStateReason *reason)
 {
 	NMDeviceBtPrivate *priv = NM_DEVICE_BT_GET_PRIVATE (device);
-	NMDBusManager *dbus_mgr;
-	DBusGConnection *g_connection;
+	DBusGConnection *bus;
 	gboolean dun = FALSE;
 	NMConnection *connection;
 
@@ -870,9 +907,10 @@ real_act_stage2_config (NMDevice *device, NMDeviceStateReason *reason)
 		return NM_ACT_STAGE_RETURN_FAILURE;
 	}
 
-	dbus_mgr = nm_dbus_manager_get ();
-	g_connection = nm_dbus_manager_get_connection (dbus_mgr);
-	g_object_unref (dbus_mgr);
+	if (priv->bt_type == NM_BT_CAPABILITY_DUN && !priv->mm_running) {
+		*reason = NM_DEVICE_STATE_REASON_MODEM_MANAGER_UNAVAILABLE;
+		return NM_ACT_STAGE_RETURN_FAILURE;
+	}
 
 	if (priv->bt_type == NM_BT_CAPABILITY_DUN)
 		dun = TRUE;
@@ -881,10 +919,11 @@ real_act_stage2_config (NMDevice *device, NMDeviceStateReason *reason)
 	else
 		g_assert_not_reached ();
 
-	priv->dev_proxy = dbus_g_proxy_new_for_name (g_connection,
-	                                               BLUEZ_SERVICE,
-	                                               nm_device_get_udi (device),
-	                                               BLUEZ_DEVICE_INTERFACE);
+	bus = nm_dbus_manager_get_connection (priv->dbus_mgr);
+	priv->dev_proxy = dbus_g_proxy_new_for_name (bus,
+	                                             BLUEZ_SERVICE,
+	                                             nm_device_get_udi (device),
+	                                             BLUEZ_DEVICE_INTERFACE);
 	if (!priv->dev_proxy) {
 		// FIXME: set a reason code
 		return NM_ACT_STAGE_RETURN_FAILURE;
@@ -900,7 +939,7 @@ real_act_stage2_config (NMDevice *device, NMDeviceStateReason *reason)
 	dbus_g_proxy_connect_signal (priv->dev_proxy, "PropertyChanged",
 	                             G_CALLBACK (bluez_property_changed), device, NULL);
 
-	priv->type_proxy = dbus_g_proxy_new_for_name (g_connection,
+	priv->type_proxy = dbus_g_proxy_new_for_name (bus,
 	                                              BLUEZ_SERVICE,
 	                                              nm_device_get_udi (device),
 	                                              dun ? BLUEZ_SERIAL_INTERFACE : BLUEZ_NETWORK_INTERFACE);
@@ -929,9 +968,9 @@ real_act_stage2_config (NMDevice *device, NMDeviceStateReason *reason)
 }
 
 static NMActStageReturn
-real_act_stage3_ip4_config_start (NMDevice *device,
-                                  NMIP4Config **out_config,
-                                  NMDeviceStateReason *reason)
+act_stage3_ip4_config_start (NMDevice *device,
+                             NMIP4Config **out_config,
+                             NMDeviceStateReason *reason)
 {
 	NMDeviceBtPrivate *priv = NM_DEVICE_BT_GET_PRIVATE (device);
 	NMActStageReturn ret;
@@ -948,9 +987,9 @@ real_act_stage3_ip4_config_start (NMDevice *device,
 }
 
 static NMActStageReturn
-real_act_stage3_ip6_config_start (NMDevice *device,
-                                  NMIP6Config **out_config,
-                                  NMDeviceStateReason *reason)
+act_stage3_ip6_config_start (NMDevice *device,
+                             NMIP6Config **out_config,
+                             NMDeviceStateReason *reason)
 {
 	NMDeviceBtPrivate *priv = NM_DEVICE_BT_GET_PRIVATE (device);
 	NMActStageReturn ret;
@@ -967,7 +1006,7 @@ real_act_stage3_ip6_config_start (NMDevice *device,
 }
 
 static void
-real_deactivate (NMDevice *device)
+deactivate (NMDevice *device)
 {
 	NMDeviceBtPrivate *priv = NM_DEVICE_BT_GET_PRIVATE (device);
 
@@ -1032,6 +1071,109 @@ real_deactivate (NMDevice *device)
 
 /*****************************************************************************/
 
+static gboolean
+is_available (NMDevice *dev)
+{
+	NMDeviceBt *self = NM_DEVICE_BT (dev);
+	NMDeviceBtPrivate *priv = NM_DEVICE_BT_GET_PRIVATE (self);
+
+	/* PAN doesn't need ModemManager, so devices that support it are always available */
+	if (priv->capabilities & NM_BT_CAPABILITY_NAP)
+		return TRUE;
+
+	/* DUN requires ModemManager */
+	return priv->mm_running;
+}
+
+static void
+handle_availability_change (NMDeviceBt *self,
+                            gboolean old_available,
+                            NMDeviceStateReason unavailable_reason)
+{
+	NMDevice *device = NM_DEVICE (self);
+	NMDeviceState state;
+	gboolean available;
+
+	state = nm_device_get_state (device);
+	if (state < NM_DEVICE_STATE_UNAVAILABLE) {
+		nm_log_dbg (LOGD_BT, "(%s): availability blocked by UNMANAGED state",
+		            nm_device_get_iface (device));
+		return;
+	}
+
+	available = nm_device_is_available (device);
+	if (available == old_available)
+		return;
+
+	if (available) {
+		if (state != NM_DEVICE_STATE_UNAVAILABLE)
+			nm_log_warn (LOGD_CORE | LOGD_BT, "not in expected unavailable state!");
+
+		nm_device_state_changed (device,
+		                         NM_DEVICE_STATE_DISCONNECTED,
+		                         NM_DEVICE_STATE_REASON_NONE);
+	} else {
+		nm_device_state_changed (device,
+		                         NM_DEVICE_STATE_UNAVAILABLE,
+		                         unavailable_reason);
+	}
+}
+
+static void
+set_mm_running (NMDeviceBt *self, gboolean running)
+{
+	NMDeviceBtPrivate *priv = NM_DEVICE_BT_GET_PRIVATE (self);
+	gboolean old_available;
+
+	if (priv->mm_running == running)
+		return;
+
+	nm_log_dbg (LOGD_BT, "(%s): ModemManager now %s",
+	            nm_device_get_iface (NM_DEVICE (self)),
+	            running ? "available" : "unavailable");
+
+	old_available = nm_device_is_available (NM_DEVICE (self));
+	priv->mm_running = running;
+	handle_availability_change (self, old_available, NM_DEVICE_STATE_REASON_MODEM_MANAGER_UNAVAILABLE);
+
+	/* Need to recheck available connections whenever MM appears or disappears,
+	 * since the device could be both DUN and NAP capable and thus may not
+	 * change state (which rechecks available connections) when MM comes and goes.
+	 */
+	if (priv->capabilities & NM_BT_CAPABILITY_DUN)
+	    nm_device_recheck_available_connections (NM_DEVICE (self));
+}
+
+static void
+mm_name_owner_changed (NMDBusManager *dbus_mgr,
+                       const char *name,
+                       const char *old_owner,
+                       const char *new_owner,
+                       NMDeviceBt *self)
+{
+	gboolean old_owner_good;
+	gboolean new_owner_good;
+
+	/* Can't handle the signal if its not from the modem service */
+	if (strcmp (MM_OLD_DBUS_SERVICE, name) != 0)
+		return;
+
+#if WITH_MODEM_MANAGER_1
+	if (strcmp (MM_NEW_DBUS_SERVICE, name) != 0)
+		return;
+#endif
+
+	old_owner_good = (old_owner && strlen (old_owner));
+	new_owner_good = (new_owner && strlen (new_owner));
+
+	if (!old_owner_good && new_owner_good)
+		set_mm_running (self, TRUE);
+	else if (old_owner_good && !new_owner_good)
+		set_mm_running (self, FALSE);
+}
+
+/*****************************************************************************/
+
 NMDevice *
 nm_device_bt_new (const char *udi,
                   const char *bdaddr,
@@ -1039,33 +1181,44 @@ nm_device_bt_new (const char *udi,
                   guint32 capabilities,
                   gboolean managed)
 {
-	NMDevice *device;
-
 	g_return_val_if_fail (udi != NULL, NULL);
 	g_return_val_if_fail (bdaddr != NULL, NULL);
 	g_return_val_if_fail (name != NULL, NULL);
 	g_return_val_if_fail (capabilities != NM_BT_CAPABILITY_NONE, NULL);
 
-	device = (NMDevice *) g_object_new (NM_TYPE_DEVICE_BT,
-	                                    NM_DEVICE_UDI, udi,
-	                                    NM_DEVICE_IFACE, bdaddr,
-	                                    NM_DEVICE_DRIVER, "bluez",
-	                                    NM_DEVICE_BT_HW_ADDRESS, bdaddr,
-	                                    NM_DEVICE_BT_NAME, name,
-	                                    NM_DEVICE_BT_CAPABILITIES, capabilities,
-	                                    NM_DEVICE_MANAGED, managed,
-	                                    NM_DEVICE_TYPE_DESC, "Bluetooth",
-	                                    NM_DEVICE_DEVICE_TYPE, NM_DEVICE_TYPE_BT,
-	                                    NULL);
-	if (device)
-		g_signal_connect (device, "state-changed", G_CALLBACK (device_state_changed), device);
-
-	return device;
+	return (NMDevice *) g_object_new (NM_TYPE_DEVICE_BT,
+	                                  NM_DEVICE_UDI, udi,
+	                                  NM_DEVICE_IFACE, bdaddr,
+	                                  NM_DEVICE_DRIVER, "bluez",
+	                                  NM_DEVICE_BT_HW_ADDRESS, bdaddr,
+	                                  NM_DEVICE_BT_NAME, name,
+	                                  NM_DEVICE_BT_CAPABILITIES, capabilities,
+	                                  NM_DEVICE_MANAGED, managed,
+	                                  NM_DEVICE_TYPE_DESC, "Bluetooth",
+	                                  NM_DEVICE_DEVICE_TYPE, NM_DEVICE_TYPE_BT,
+	                                  NULL);
 }
 
 static void
 nm_device_bt_init (NMDeviceBt *self)
 {
+	NMDeviceBtPrivate *priv = NM_DEVICE_BT_GET_PRIVATE (self);
+	gboolean mm_running;
+
+	priv->dbus_mgr = nm_dbus_manager_get ();
+
+	priv->mm_watch_id = g_signal_connect (priv->dbus_mgr,
+	                                      NM_DBUS_MANAGER_NAME_OWNER_CHANGED,
+	                                      G_CALLBACK (mm_name_owner_changed),
+	                                      self);
+
+	/* Initial check to see if ModemManager is running */
+	mm_running = nm_dbus_manager_name_has_owner (priv->dbus_mgr, MM_OLD_DBUS_SERVICE);
+#if WITH_MODEM_MANAGER_1
+	if (!mm_running)
+		mm_running = nm_dbus_manager_name_has_owner (priv->dbus_mgr, MM_NEW_DBUS_SERVICE);
+#endif
+	set_mm_running (self, mm_running);
 }
 
 static void
@@ -1116,7 +1269,7 @@ get_property (GObject *object, guint prop_id,
 }
 
 static void
-finalize (GObject *object)
+dispose (GObject *object)
 {
 	NMDeviceBtPrivate *priv = NM_DEVICE_BT_GET_PRIVATE (object);
 
@@ -1125,14 +1278,23 @@ finalize (GObject *object)
 		priv->timeout_id = 0;
 	}
 
-	if (priv->type_proxy)
-		g_object_unref (priv->type_proxy);
+	if (priv->dbus_mgr && priv->mm_watch_id) {
+		g_signal_handler_disconnect (priv->dbus_mgr, priv->mm_watch_id);
+		priv->mm_watch_id = 0;
+	}
+	g_clear_object (&priv->dbus_mgr);
 
-	if (priv->dev_proxy)
-		g_object_unref (priv->dev_proxy);
+	g_clear_object (&priv->type_proxy);
+	g_clear_object (&priv->dev_proxy);
+	g_clear_object (&priv->modem);
 
-	if (priv->modem)
-		g_object_unref (priv->modem);
+	G_OBJECT_CLASS (nm_device_bt_parent_class)->dispose (object);
+}
+
+static void
+finalize (GObject *object)
+{
+	NMDeviceBtPrivate *priv = NM_DEVICE_BT_GET_PRIVATE (object);
 
 	g_free (priv->rfcomm_iface);
 	g_free (priv->bdaddr);
@@ -1151,17 +1313,22 @@ nm_device_bt_class_init (NMDeviceBtClass *klass)
 
 	object_class->get_property = get_property;
 	object_class->set_property = set_property;
+	object_class->dispose = dispose;
 	object_class->finalize = finalize;
 
-	device_class->get_best_auto_connection = real_get_best_auto_connection;
-	device_class->get_generic_capabilities = real_get_generic_capabilities;
-	device_class->deactivate = real_deactivate;
-	device_class->act_stage2_config = real_act_stage2_config;
-	device_class->act_stage3_ip4_config_start = real_act_stage3_ip4_config_start;
-	device_class->act_stage3_ip6_config_start = real_act_stage3_ip6_config_start;
-	device_class->check_connection_compatible = real_check_connection_compatible;
-	device_class->complete_connection = real_complete_connection;
+	device_class->get_best_auto_connection = get_best_auto_connection;
+	device_class->get_generic_capabilities = get_generic_capabilities;
+	device_class->deactivate = deactivate;
+	device_class->act_stage2_config = act_stage2_config;
+	device_class->act_stage3_ip4_config_start = act_stage3_ip4_config_start;
+	device_class->act_stage3_ip6_config_start = act_stage3_ip6_config_start;
+	device_class->check_connection_compatible = check_connection_compatible;
+	device_class->check_connection_available = check_connection_available;
+	device_class->complete_connection = complete_connection;
 	device_class->hwaddr_matches = hwaddr_matches;
+	device_class->is_available = is_available;
+
+	device_class->state_changed = device_state_changed;
 
 	/* Properties */
 	g_object_class_install_property
@@ -1199,7 +1366,7 @@ nm_device_bt_class_init (NMDeviceBtClass *klass)
 		              G_TYPE_NONE, 2,
 		              G_TYPE_UINT, G_TYPE_UINT);
 
-	signals[PROPERTIES_CHANGED] = 
+	signals[PROPERTIES_CHANGED] =
 		nm_properties_changed_signal_new (object_class,
 		                                  G_STRUCT_OFFSET (NMDeviceBtClass, properties_changed));
 
diff --git a/src/nm-device-ethernet.c b/src/nm-device-ethernet.c
index ede31cc1..4b8f9497 100644
--- a/src/nm-device-ethernet.c
+++ b/src/nm-device-ethernet.c
@@ -283,8 +283,7 @@ static void
 device_state_changed (NMDevice *device,
                       NMDeviceState new_state,
                       NMDeviceState old_state,
-                      NMDeviceStateReason reason,
-                      gpointer user_data)
+                      NMDeviceStateReason reason)
 {
 	switch (new_state) {
 	case NM_DEVICE_STATE_ACTIVATED:
@@ -300,11 +299,10 @@ device_state_changed (NMDevice *device,
 static void
 nm_device_ethernet_init (NMDeviceEthernet * self)
 {
-	g_signal_connect (self, "state-changed", G_CALLBACK (device_state_changed), NULL);
 }
 
 static gboolean
-real_is_up (NMDevice *device)
+is_up (NMDevice *device)
 {
 	if (!NM_DEVICE_ETHERNET_GET_PRIVATE (device)->supplicant.mgr)
 		return FALSE;
@@ -313,7 +311,7 @@ real_is_up (NMDevice *device)
 }
 
 static gboolean
-real_bring_up (NMDevice *dev)
+bring_up (NMDevice *dev)
 {
 	NMDeviceEthernetPrivate *priv = NM_DEVICE_ETHERNET_GET_PRIVATE (dev);
 
@@ -323,7 +321,7 @@ real_bring_up (NMDevice *dev)
 }
 
 static void
-real_take_down (NMDevice *dev)
+take_down (NMDevice *dev)
 {
 	NMDeviceEthernetPrivate *priv = NM_DEVICE_ETHERNET_GET_PRIVATE (dev);
 
@@ -408,7 +406,7 @@ _set_hw_addr (NMDeviceEthernet *self, const guint8 *addr, const char *detail)
 }
 
 static void
-real_update_hw_address (NMDevice *dev)
+update_hw_address (NMDevice *dev)
 {
 	const guint8 *hw_addr;
 	guint8 old_addr[ETH_ALEN];
@@ -424,7 +422,7 @@ real_update_hw_address (NMDevice *dev)
 }
 
 static void
-real_update_permanent_hw_address (NMDevice *dev)
+update_permanent_hw_address (NMDevice *dev)
 {
 	NMDeviceEthernet *self = NM_DEVICE_ETHERNET (dev);
 	NMDeviceEthernetPrivate *priv = NM_DEVICE_ETHERNET_GET_PRIVATE (self);
@@ -468,7 +466,7 @@ real_update_permanent_hw_address (NMDevice *dev)
 }
 
 static void
-real_update_initial_hw_address (NMDevice *dev)
+update_initial_hw_address (NMDevice *dev)
 {
 	NMDeviceEthernet *self = NM_DEVICE_ETHERNET (dev);
 	NMDeviceEthernetPrivate *priv = NM_DEVICE_ETHERNET_GET_PRIVATE (self);
@@ -482,7 +480,7 @@ real_update_initial_hw_address (NMDevice *dev)
 	 */
 	current_addr = nm_device_wired_get_hwaddr (NM_DEVICE_WIRED (self));
 	if (!memcmp (current_addr, &zero, ETH_ALEN))
-		real_update_hw_address (dev);
+		update_hw_address (dev);
 
 	if (memcmp (&priv->initial_hw_addr, current_addr, ETH_ALEN))
 		memcpy (&priv->initial_hw_addr, current_addr, ETH_ALEN);
@@ -497,7 +495,7 @@ real_update_initial_hw_address (NMDevice *dev)
 }
 
 static guint32
-real_get_generic_capabilities (NMDevice *dev)
+get_generic_capabilities (NMDevice *dev)
 {
 	NMDeviceEthernet *self = NM_DEVICE_ETHERNET (dev);
 	guint32	caps = NM_DEVICE_CAP_NONE;
@@ -620,9 +618,9 @@ match_ethernet_connection (NMDevice *device, NMConnection *connection,
 }
 
 static NMConnection *
-real_get_best_auto_connection (NMDevice *dev,
-                               GSList *connections,
-                               char **specific_object)
+get_best_auto_connection (NMDevice *dev,
+                          GSList *connections,
+                          char **specific_object)
 {
 	GSList *iter;
 
@@ -826,6 +824,7 @@ static void
 supplicant_iface_state_cb (NMSupplicantInterface *iface,
                            guint32 new_state,
                            guint32 old_state,
+                           int disconnect_reason,
                            gpointer user_data)
 {
 	NMDeviceEthernet *self = NM_DEVICE_ETHERNET (user_data);
@@ -1029,7 +1028,7 @@ supplicant_interface_init (NMDeviceEthernet *self)
 
 	/* Listen for it's state signals */
 	priv->supplicant.iface_state_id = g_signal_connect (priv->supplicant.iface,
-	                                                    "state",
+	                                                    NM_SUPPLICANT_INTERFACE_STATE,
 	                                                    G_CALLBACK (supplicant_iface_state_cb),
 	                                                    self);
 
@@ -1046,7 +1045,7 @@ supplicant_interface_init (NMDeviceEthernet *self)
 }
 
 static NMActStageReturn
-real_act_stage1_prepare (NMDevice *dev, NMDeviceStateReason *reason)
+act_stage1_prepare (NMDevice *dev, NMDeviceStateReason *reason)
 {
 	NMDeviceEthernet *self = NM_DEVICE_ETHERNET (dev);
 	NMActRequest *req;
@@ -1197,7 +1196,7 @@ pppoe_stage3_ip4_config_start (NMDeviceEthernet *self, NMDeviceStateReason *reas
 }
 
 static NMActStageReturn
-real_act_stage2_config (NMDevice *device, NMDeviceStateReason *reason)
+act_stage2_config (NMDevice *device, NMDeviceStateReason *reason)
 {
 	NMSettingConnection *s_con;
 	const char *connection_type;
@@ -1224,9 +1223,9 @@ real_act_stage2_config (NMDevice *device, NMDeviceStateReason *reason)
 }
 
 static NMActStageReturn
-real_act_stage3_ip4_config_start (NMDevice *device,
-                                  NMIP4Config **out_config,
-                                  NMDeviceStateReason *reason)
+act_stage3_ip4_config_start (NMDevice *device,
+                             NMIP4Config **out_config,
+                             NMDeviceStateReason *reason)
 {
 	NMSettingConnection *s_con;
 	const char *connection_type;
@@ -1244,7 +1243,7 @@ real_act_stage3_ip4_config_start (NMDevice *device,
 }
 
 static void
-real_ip4_config_pre_commit (NMDevice *device, NMIP4Config *config)
+ip4_config_pre_commit (NMDevice *device, NMIP4Config *config)
 {
 	NMConnection *connection;
 	NMSettingWired *s_wired;
@@ -1266,7 +1265,7 @@ real_ip4_config_pre_commit (NMDevice *device, NMIP4Config *config)
 }
 
 static void
-real_deactivate (NMDevice *device)
+deactivate (NMDevice *device)
 {
 	NMDeviceEthernet *self = NM_DEVICE_ETHERNET (device);
 	NMDeviceEthernetPrivate *priv = NM_DEVICE_ETHERNET_GET_PRIVATE (self);
@@ -1291,19 +1290,19 @@ real_deactivate (NMDevice *device)
 }
 
 static gboolean
-real_check_connection_compatible (NMDevice *device,
-                                  NMConnection *connection,
-                                  GError **error)
+check_connection_compatible (NMDevice *device,
+                             NMConnection *connection,
+                             GError **error)
 {
 	return match_ethernet_connection (device, connection, TRUE, error);
 }
 
 static gboolean
-real_complete_connection (NMDevice *device,
-                          NMConnection *connection,
-                          const char *specific_object,
-                          const GSList *existing_connections,
-                          GError **error)
+complete_connection (NMDevice *device,
+                     NMConnection *connection,
+                     const char *specific_object,
+                     const GSList *existing_connections,
+                     GError **error)
 {
 	NMDeviceEthernetPrivate *priv = NM_DEVICE_ETHERNET_GET_PRIVATE (device);
 	NMSettingWired *s_wired;
@@ -1513,26 +1512,28 @@ nm_device_ethernet_class_init (NMDeviceEthernetClass *klass)
 	object_class->get_property = get_property;
 	object_class->set_property = set_property;
 
-	parent_class->get_generic_capabilities = real_get_generic_capabilities;
-	parent_class->is_up = real_is_up;
-	parent_class->bring_up = real_bring_up;
-	parent_class->take_down = real_take_down;
-	parent_class->update_hw_address = real_update_hw_address;
-	parent_class->update_permanent_hw_address = real_update_permanent_hw_address;
-	parent_class->update_initial_hw_address = real_update_initial_hw_address;
-	parent_class->get_best_auto_connection = real_get_best_auto_connection;
-	parent_class->check_connection_compatible = real_check_connection_compatible;
-	parent_class->complete_connection = real_complete_connection;
-
-	parent_class->act_stage1_prepare = real_act_stage1_prepare;
-	parent_class->act_stage2_config = real_act_stage2_config;
-	parent_class->act_stage3_ip4_config_start = real_act_stage3_ip4_config_start;
-	parent_class->ip4_config_pre_commit = real_ip4_config_pre_commit;
-	parent_class->deactivate = real_deactivate;
+	parent_class->get_generic_capabilities = get_generic_capabilities;
+	parent_class->is_up = is_up;
+	parent_class->bring_up = bring_up;
+	parent_class->take_down = take_down;
+	parent_class->update_hw_address = update_hw_address;
+	parent_class->update_permanent_hw_address = update_permanent_hw_address;
+	parent_class->update_initial_hw_address = update_initial_hw_address;
+	parent_class->get_best_auto_connection = get_best_auto_connection;
+	parent_class->check_connection_compatible = check_connection_compatible;
+	parent_class->complete_connection = complete_connection;
+
+	parent_class->act_stage1_prepare = act_stage1_prepare;
+	parent_class->act_stage2_config = act_stage2_config;
+	parent_class->act_stage3_ip4_config_start = act_stage3_ip4_config_start;
+	parent_class->ip4_config_pre_commit = ip4_config_pre_commit;
+	parent_class->deactivate = deactivate;
 	parent_class->spec_match_list = spec_match_list;
 	parent_class->connection_match_config = connection_match_config;
 	parent_class->hwaddr_matches = hwaddr_matches;
 
+	parent_class->state_changed = device_state_changed;
+
 	/* properties */
 	g_object_class_install_property
 		(object_class, PROP_HW_ADDRESS,
diff --git a/src/nm-device-infiniband.c b/src/nm-device-infiniband.c
index 5e43f060..b2915f9e 100644
--- a/src/nm-device-infiniband.c
+++ b/src/nm-device-infiniband.c
@@ -122,7 +122,7 @@ nm_device_infiniband_new (const char *udi,
 
 
 static void
-real_update_hw_address (NMDevice *dev)
+update_hw_address (NMDevice *dev)
 {
 	const guint8 *hw_addr;
 	guint8 old_addr[INFINIBAND_ALEN];
@@ -138,15 +138,15 @@ real_update_hw_address (NMDevice *dev)
 }
 
 static guint32
-real_get_generic_capabilities (NMDevice *dev)
+get_generic_capabilities (NMDevice *dev)
 {
 	return NM_DEVICE_CAP_CARRIER_DETECT | NM_DEVICE_CAP_NM_SUPPORTED;
 }
 
 static NMConnection *
-real_get_best_auto_connection (NMDevice *dev,
-                               GSList *connections,
-                               char **specific_object)
+get_best_auto_connection (NMDevice *dev,
+                          GSList *connections,
+                          char **specific_object)
 {
 	GSList *iter;
 
@@ -182,13 +182,13 @@ real_get_best_auto_connection (NMDevice *dev,
 }
 
 static NMActStageReturn
-real_act_stage1_prepare (NMDevice *dev, NMDeviceStateReason *reason)
+act_stage1_prepare (NMDevice *dev, NMDeviceStateReason *reason)
 {
 	NMActRequest *req;
 	NMConnection *connection;
 	NMSettingInfiniband *s_infiniband;
 	const char *transport_mode;
-	char *mode_path, *mode_value;
+	char *mode_path;
 	gboolean ok;
 
 	g_return_val_if_fail (reason != NULL, NM_ACT_STAGE_RETURN_FAILURE);
@@ -215,9 +215,7 @@ real_act_stage1_prepare (NMDevice *dev, NMDeviceStateReason *reason)
 		}
 	}
 
-	mode_value = g_strdup_printf ("%s\n", transport_mode);
-	ok = nm_utils_do_sysctl (mode_path, mode_value);
-	g_free (mode_value);
+	ok = nm_utils_do_sysctl (mode_path, transport_mode);
 	g_free (mode_path);
 
 	if (!ok) {
@@ -229,7 +227,7 @@ real_act_stage1_prepare (NMDevice *dev, NMDeviceStateReason *reason)
 }
 
 static void
-real_ip4_config_pre_commit (NMDevice *self, NMIP4Config *config)
+ip4_config_pre_commit (NMDevice *self, NMIP4Config *config)
 {
 	NMConnection *connection;
 	NMSettingInfiniband *s_infiniband;
@@ -247,9 +245,9 @@ real_ip4_config_pre_commit (NMDevice *self, NMIP4Config *config)
 }
 
 static gboolean
-real_check_connection_compatible (NMDevice *device,
-                                  NMConnection *connection,
-                                  GError **error)
+check_connection_compatible (NMDevice *device,
+                             NMConnection *connection,
+                             GError **error)
 {
 	NMSettingInfiniband *s_infiniband;
 	const GByteArray *mac;
@@ -287,11 +285,11 @@ real_check_connection_compatible (NMDevice *device,
 }
 
 static gboolean
-real_complete_connection (NMDevice *device,
-                          NMConnection *connection,
-                          const char *specific_object,
-                          const GSList *existing_connections,
-                          GError **error)
+complete_connection (NMDevice *device,
+                     NMConnection *connection,
+                     const char *specific_object,
+                     const GSList *existing_connections,
+                     GError **error)
 {
 	NMSettingInfiniband *s_infiniband;
 	const GByteArray *setting_mac;
@@ -476,14 +474,14 @@ nm_device_infiniband_class_init (NMDeviceInfinibandClass *klass)
 	object_class->get_property = get_property;
 	object_class->set_property = set_property;
 
-	parent_class->get_generic_capabilities = real_get_generic_capabilities;
-	parent_class->update_hw_address = real_update_hw_address;
-	parent_class->get_best_auto_connection = real_get_best_auto_connection;
-	parent_class->check_connection_compatible = real_check_connection_compatible;
-	parent_class->complete_connection = real_complete_connection;
+	parent_class->get_generic_capabilities = get_generic_capabilities;
+	parent_class->update_hw_address = update_hw_address;
+	parent_class->get_best_auto_connection = get_best_auto_connection;
+	parent_class->check_connection_compatible = check_connection_compatible;
+	parent_class->complete_connection = complete_connection;
 
-	parent_class->act_stage1_prepare = real_act_stage1_prepare;
-	parent_class->ip4_config_pre_commit = real_ip4_config_pre_commit;
+	parent_class->act_stage1_prepare = act_stage1_prepare;
+	parent_class->ip4_config_pre_commit = ip4_config_pre_commit;
 	parent_class->spec_match_list = spec_match_list;
 	parent_class->connection_match_config = connection_match_config;
 	parent_class->hwaddr_matches = hwaddr_matches;
diff --git a/src/nm-device-modem.c b/src/nm-device-modem.c
index e7cd9259..57f0bf8e 100644
--- a/src/nm-device-modem.c
+++ b/src/nm-device-modem.c
@@ -18,6 +18,8 @@
  * Copyright (C) 2009 - 2011 Red Hat, Inc.
  */
 
+#include "config.h"
+
 #include 
 
 #include "nm-device-modem.h"
@@ -29,6 +31,11 @@
 #include "nm-rfkill.h"
 #include "nm-marshal.h"
 #include "nm-logging.h"
+#include "nm-system.h"
+
+#if WITH_MODEM_MANAGER_1
+#include "nm-modem-broadband.h"
+#endif
 
 G_DEFINE_TYPE (NMDeviceModem, nm_device_modem, NM_TYPE_DEVICE)
 
@@ -56,7 +63,7 @@ enum {
 };
 static guint signals[LAST_SIGNAL] = { 0 };
 
-static void real_set_enabled (NMDevice *device, gboolean enabled);
+static void set_enabled (NMDevice *device, gboolean enabled);
 
 /*****************************************************************************/
 
@@ -132,7 +139,6 @@ modem_auth_result (NMModem *modem, GError *error, gpointer user_data)
 
 static void
 modem_ip4_config_result (NMModem *self,
-                         const char *iface,
                          NMIP4Config *config,
                          GError *error,
                          gpointer user_data)
@@ -147,12 +153,18 @@ modem_ip4_config_result (NMModem *self,
 		             error && error->message ? error->message : "(unknown)");
 
 		nm_device_state_changed (device, NM_DEVICE_STATE_FAILED, NM_DEVICE_STATE_REASON_IP_CONFIG_UNAVAILABLE);
-	} else {
-		if (iface)
-			nm_device_set_ip_iface (device, iface);
-
+	} else
 		nm_device_activate_schedule_ip4_config_result (device, config);
-	}
+}
+
+static void
+data_port_changed_cb (NMModem *modem, GParamSpec *pspec, gpointer user_data)
+{
+	NMDevice *self = NM_DEVICE (user_data);
+
+	/* We set the IP iface in the device as soon as we know it, so that we
+	 * properly ifup it if needed */
+	nm_device_set_ip_iface (self, nm_modem_get_data_port (modem));
 }
 
 static void
@@ -161,11 +173,24 @@ modem_enabled_cb (NMModem *modem, GParamSpec *pspec, gpointer user_data)
 	NMDeviceModem *self = NM_DEVICE_MODEM (user_data);
 	NMDeviceModemPrivate *priv = NM_DEVICE_MODEM_GET_PRIVATE (self);
 
-	real_set_enabled (NM_DEVICE (self), nm_modem_get_mm_enabled (priv->modem));
+	set_enabled (NM_DEVICE (self), nm_modem_get_mm_enabled (priv->modem));
 
 	g_signal_emit (G_OBJECT (self), signals[ENABLE_CHANGED], 0);
 }
 
+static void
+modem_connected_cb (NMModem *modem, GParamSpec *pspec, gpointer user_data)
+{
+	NMDeviceModem *self = NM_DEVICE_MODEM (user_data);
+	NMDeviceModemPrivate *priv = NM_DEVICE_MODEM_GET_PRIVATE (self);
+
+	if (   nm_device_get_state (NM_DEVICE (self)) == NM_DEVICE_STATE_ACTIVATED
+	    && !nm_modem_get_mm_connected (priv->modem)) {
+		/* Fail the device if the modem disconnects unexpectedly */
+		nm_device_state_changed (NM_DEVICE (self), NM_DEVICE_STATE_FAILED, NM_DEVICE_STATE_REASON_MODEM_NO_CARRIER);
+	}
+}
+
 /*****************************************************************************/
 
 NMModem *
@@ -183,8 +208,7 @@ static void
 device_state_changed (NMDevice *device,
                       NMDeviceState new_state,
                       NMDeviceState old_state,
-                      NMDeviceStateReason reason,
-                      gpointer user_data)
+                      NMDeviceStateReason reason)
 {
 	nm_modem_device_state_changed (NM_DEVICE_MODEM_GET_PRIVATE (device)->modem,
 	                               new_state,
@@ -193,15 +217,15 @@ device_state_changed (NMDevice *device,
 }
 
 static guint32
-real_get_generic_capabilities (NMDevice *device)
+get_generic_capabilities (NMDevice *device)
 {
 	return NM_DEVICE_CAP_NM_SUPPORTED;
 }
 
 static NMConnection *
-real_get_best_auto_connection (NMDevice *device,
-							   GSList *connections,
-							   char **specific_object)
+get_best_auto_connection (NMDevice *device,
+                          GSList *connections,
+                          char **specific_object)
 {
 	NMDeviceModemPrivate *priv = NM_DEVICE_MODEM_GET_PRIVATE (device);
 
@@ -209,9 +233,9 @@ real_get_best_auto_connection (NMDevice *device,
 }
 
 static gboolean
-real_check_connection_compatible (NMDevice *device,
-                                  NMConnection *connection,
-                                  GError **error)
+check_connection_compatible (NMDevice *device,
+                             NMConnection *connection,
+                             GError **error)
 {
 	NMDeviceModemPrivate *priv = NM_DEVICE_MODEM_GET_PRIVATE (device);
 
@@ -219,11 +243,11 @@ real_check_connection_compatible (NMDevice *device,
 }
 
 static gboolean
-real_complete_connection (NMDevice *device,
-                          NMConnection *connection,
-                          const char *specific_object,
-                          const GSList *existing_connections,
-                          GError **error)
+complete_connection (NMDevice *device,
+                     NMConnection *connection,
+                     const char *specific_object,
+                     const GSList *existing_connections,
+                     GError **error)
 {
 	NMDeviceModemPrivate *priv = NM_DEVICE_MODEM_GET_PRIVATE (device);
 
@@ -231,25 +255,29 @@ real_complete_connection (NMDevice *device,
 }
 
 static gboolean
-real_hw_is_up (NMDevice *device)
+hw_is_up (NMDevice *device)
 {
-	return nm_modem_hw_is_up (NM_DEVICE_MODEM_GET_PRIVATE (device)->modem, device);
+	int ifindex = nm_device_get_ip_ifindex (device);
+
+	return ifindex > 0 ? nm_system_iface_is_up (ifindex) : TRUE;
 }
 
 static gboolean
-real_hw_bring_up (NMDevice *device, gboolean *no_firmware)
+hw_bring_up (NMDevice *device, gboolean *no_firmware)
 {
-	return nm_modem_hw_bring_up (NM_DEVICE_MODEM_GET_PRIVATE (device)->modem, device, no_firmware);
+	int ifindex = nm_device_get_ip_ifindex (device);
+
+	return ifindex > 0 ? nm_system_iface_set_up (ifindex, TRUE, no_firmware) : TRUE;
 }
 
 static void
-real_deactivate (NMDevice *device)
+deactivate (NMDevice *device)
 {
 	nm_modem_deactivate (NM_DEVICE_MODEM_GET_PRIVATE (device)->modem, device);
 }
 
 static NMActStageReturn
-real_act_stage1_prepare (NMDevice *device, NMDeviceStateReason *reason)
+act_stage1_prepare (NMDevice *device, NMDeviceStateReason *reason)
 {
 	NMActRequest *req;
 
@@ -260,7 +288,7 @@ real_act_stage1_prepare (NMDevice *device, NMDeviceStateReason *reason)
 }
 
 static NMActStageReturn
-real_act_stage2_config (NMDevice *device, NMDeviceStateReason *reason)
+act_stage2_config (NMDevice *device, NMDeviceStateReason *reason)
 {
 	NMActRequest *req;
 
@@ -271,9 +299,9 @@ real_act_stage2_config (NMDevice *device, NMDeviceStateReason *reason)
 }
 
 static NMActStageReturn
-real_act_stage3_ip4_config_start (NMDevice *device,
-                                  NMIP4Config **out_config,
-                                  NMDeviceStateReason *reason)
+act_stage3_ip4_config_start (NMDevice *device,
+                             NMIP4Config **out_config,
+                             NMDeviceStateReason *reason)
 {
 	return nm_modem_stage3_ip4_config_start (NM_DEVICE_MODEM_GET_PRIVATE (device)->modem,
 	                                         device,
@@ -281,10 +309,16 @@ real_act_stage3_ip4_config_start (NMDevice *device,
 	                                         reason);
 }
 
+static void
+ip4_config_pre_commit (NMDevice *device, NMIP4Config *config)
+{
+	nm_modem_ip4_pre_commit (NM_DEVICE_MODEM_GET_PRIVATE (device)->modem, device, config);
+}
+
 static NMActStageReturn
-real_act_stage3_ip6_config_start (NMDevice *device,
-                                  NMIP6Config **out_config,
-                                  NMDeviceStateReason *reason)
+act_stage3_ip6_config_start (NMDevice *device,
+                             NMIP6Config **out_config,
+                             NMDeviceStateReason *reason)
 {
 	return nm_modem_stage3_ip6_config_start (NM_DEVICE_MODEM_GET_PRIVATE (device)->modem,
 	                                         device,
@@ -295,13 +329,13 @@ real_act_stage3_ip6_config_start (NMDevice *device,
 /*****************************************************************************/
 
 static gboolean
-real_get_enabled (NMDevice *device)
+get_enabled (NMDevice *device)
 {
 	return nm_modem_get_mm_enabled (NM_DEVICE_MODEM_GET_PRIVATE (device)->modem);
 }
 
 static void
-real_set_enabled (NMDevice *device, gboolean enabled)
+set_enabled (NMDevice *device, gboolean enabled)
 {
 	NMDeviceModem *self = NM_DEVICE_MODEM (device);
 	NMDeviceModemPrivate *priv = NM_DEVICE_MODEM_GET_PRIVATE (self);
@@ -328,7 +362,9 @@ NMDevice *
 nm_device_modem_new (NMModem *modem, const char *driver)
 {
 	NMDeviceModemCapabilities caps = NM_DEVICE_MODEM_CAPABILITY_NONE;
-	const char *type_desc = NULL;
+	NMDeviceModemCapabilities current_caps = NM_DEVICE_MODEM_CAPABILITY_NONE;
+	const gchar *type_desc = NULL;
+	const gchar *ip_iface = NULL;
 
 	g_return_val_if_fail (modem != NULL, NULL);
 	g_return_val_if_fail (NM_IS_MODEM (modem), NULL);
@@ -336,18 +372,31 @@ nm_device_modem_new (NMModem *modem, const char *driver)
 
 	if (NM_IS_MODEM_CDMA (modem)) {
 		caps = NM_DEVICE_MODEM_CAPABILITY_CDMA_EVDO;
+		current_caps = caps;
 		type_desc = "CDMA/EVDO";
+		ip_iface = nm_modem_get_data_port (modem);
 	} else if (NM_IS_MODEM_GSM (modem)) {
 		caps = NM_DEVICE_MODEM_CAPABILITY_GSM_UMTS;
+		current_caps = caps;
 		type_desc = "GSM/UMTS";
-	} else {
+		ip_iface = nm_modem_get_data_port (modem);
+	}
+#if WITH_MODEM_MANAGER_1
+	else if (NM_IS_MODEM_BROADBAND (modem)) {
+		nm_modem_broadband_get_capabilities (NM_MODEM_BROADBAND (modem), &caps, ¤t_caps);
+		type_desc = "Broadband";
+		/* data port not yet known in broadband modems */
+	}
+#endif
+	else {
 		nm_log_warn (LOGD_MB, "unhandled modem type %s", G_OBJECT_TYPE_NAME (modem));
 		return NULL;
 	}
 
 	return (NMDevice *) g_object_new (NM_TYPE_DEVICE_MODEM,
 	                                  NM_DEVICE_UDI, nm_modem_get_path (modem),
-	                                  NM_DEVICE_IFACE, nm_modem_get_iface (modem),
+	                                  NM_DEVICE_IFACE, nm_modem_get_uid (modem),
+	                                  NM_DEVICE_IP_IFACE, ip_iface,
 	                                  NM_DEVICE_DRIVER, driver,
 	                                  NM_DEVICE_TYPE_DESC, type_desc,
 	                                  NM_DEVICE_DEVICE_TYPE, NM_DEVICE_TYPE_MODEM,
@@ -361,7 +410,6 @@ nm_device_modem_new (NMModem *modem, const char *driver)
 static void
 nm_device_modem_init (NMDeviceModem *self)
 {
-	g_signal_connect (self, "state-changed", G_CALLBACK (device_state_changed), self);
 }
 
 static void
@@ -379,6 +427,12 @@ set_modem (NMDeviceModem *self, NMModem *modem)
 	g_signal_connect (modem, NM_MODEM_AUTH_REQUESTED, G_CALLBACK (modem_auth_requested), self);
 	g_signal_connect (modem, NM_MODEM_AUTH_RESULT, G_CALLBACK (modem_auth_result), self);
 	g_signal_connect (modem, "notify::" NM_MODEM_ENABLED, G_CALLBACK (modem_enabled_cb), self);
+	g_signal_connect (modem, "notify::" NM_MODEM_CONNECTED, G_CALLBACK (modem_connected_cb), self);
+
+	/* In the old ModemManager the data port is known from the very beginning;
+	 * while in the new ModemManager the data port is set afterwards when the bearer gets
+	 * created */
+	g_signal_connect (modem, "notify::" NM_MODEM_DATA_PORT, G_CALLBACK (data_port_changed_cb), self);
 }
 
 static void
@@ -450,19 +504,22 @@ nm_device_modem_class_init (NMDeviceModemClass *mclass)
 	object_class->get_property = get_property;
 	object_class->set_property = set_property;
 
-	device_class->get_generic_capabilities = real_get_generic_capabilities;
-	device_class->get_best_auto_connection = real_get_best_auto_connection;
-	device_class->check_connection_compatible = real_check_connection_compatible;
-	device_class->complete_connection = real_complete_connection;
-	device_class->hw_is_up = real_hw_is_up;
-	device_class->hw_bring_up = real_hw_bring_up;
-	device_class->deactivate = real_deactivate;
-	device_class->act_stage1_prepare = real_act_stage1_prepare;
-	device_class->act_stage2_config = real_act_stage2_config;
-	device_class->act_stage3_ip4_config_start = real_act_stage3_ip4_config_start;
-	device_class->act_stage3_ip6_config_start = real_act_stage3_ip6_config_start;
-	device_class->get_enabled = real_get_enabled;
-    device_class->set_enabled = real_set_enabled;
+	device_class->get_generic_capabilities = get_generic_capabilities;
+	device_class->get_best_auto_connection = get_best_auto_connection;
+	device_class->check_connection_compatible = check_connection_compatible;
+	device_class->complete_connection = complete_connection;
+	device_class->hw_is_up = hw_is_up;
+	device_class->hw_bring_up = hw_bring_up;
+	device_class->deactivate = deactivate;
+	device_class->act_stage1_prepare = act_stage1_prepare;
+	device_class->act_stage2_config = act_stage2_config;
+	device_class->act_stage3_ip4_config_start = act_stage3_ip4_config_start;
+	device_class->act_stage3_ip6_config_start = act_stage3_ip6_config_start;
+	device_class->ip4_config_pre_commit = ip4_config_pre_commit;
+	device_class->get_enabled = get_enabled;
+	device_class->set_enabled = set_enabled;
+
+	device_class->state_changed = device_state_changed;
 
 	/* Properties */
 	g_object_class_install_property
@@ -488,7 +545,7 @@ nm_device_modem_class_init (NMDeviceModemClass *mclass)
 		                   G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY));
 
 	/* Signals */
-	signals[PROPERTIES_CHANGED] = 
+	signals[PROPERTIES_CHANGED] =
 		nm_properties_changed_signal_new (object_class,
 		                                  G_STRUCT_OFFSET (NMDeviceModemClass, properties_changed));
 
@@ -503,4 +560,3 @@ nm_device_modem_class_init (NMDeviceModemClass *mclass)
 	dbus_g_object_type_install_info (G_TYPE_FROM_CLASS (mclass),
 	                                 &dbus_glib_nm_device_modem_object_info);
 }
-
diff --git a/src/nm-device-olpc-mesh.c b/src/nm-device-olpc-mesh.c
index b3d8b794..289e5be3 100644
--- a/src/nm-device-olpc-mesh.c
+++ b/src/nm-device-olpc-mesh.c
@@ -112,6 +112,9 @@ struct _NMDeviceOlpcMeshPrivate
 	guint             cmp_autoconnect_allowed_id;
 };
 
+static void state_changed (NMDevice *device, NMDeviceState new_state,
+                           NMDeviceState old_state, NMDeviceStateReason reason);
+
 static GQuark
 nm_olpc_mesh_error_quark (void)
 {
@@ -122,7 +125,7 @@ nm_olpc_mesh_error_quark (void)
 }
 
 static guint32
-real_get_generic_capabilities (NMDevice *dev)
+get_generic_capabilities (NMDevice *dev)
 {
 	return NM_DEVICE_CAP_NM_SUPPORTED;
 }
@@ -184,25 +187,25 @@ constructor (GType type,
 }
 
 static gboolean
-real_hw_is_up (NMDevice *device)
+hw_is_up (NMDevice *device)
 {
 	return nm_system_iface_is_up (nm_device_get_ip_ifindex (device));
 }
 
 static gboolean
-real_hw_bring_up (NMDevice *dev, gboolean *no_firmware)
+hw_bring_up (NMDevice *dev, gboolean *no_firmware)
 {
 	return nm_system_iface_set_up (nm_device_get_ip_ifindex (dev), TRUE, no_firmware);
 }
 
 static void
-real_hw_take_down (NMDevice *dev)
+hw_take_down (NMDevice *dev)
 {
 	nm_system_iface_set_up (nm_device_get_ip_ifindex (dev), FALSE, NULL);
 }
 
 static gboolean
-real_is_up (NMDevice *device)
+is_up (NMDevice *device)
 {
 	NMDeviceOlpcMesh *self = NM_DEVICE_OLPC_MESH (device);
 	NMDeviceOlpcMeshPrivate *priv = NM_DEVICE_OLPC_MESH_GET_PRIVATE (self);
@@ -211,7 +214,7 @@ real_is_up (NMDevice *device)
 }
 
 static gboolean
-real_bring_up (NMDevice *dev)
+bring_up (NMDevice *dev)
 {
 	NMDeviceOlpcMesh *self = NM_DEVICE_OLPC_MESH (dev);
 	NMDeviceOlpcMeshPrivate *priv = NM_DEVICE_OLPC_MESH_GET_PRIVATE (self);
@@ -233,15 +236,15 @@ device_cleanup (NMDeviceOlpcMesh *self)
 }
 
 static void
-real_take_down (NMDevice *dev)
+take_down (NMDevice *dev)
 {
 	device_cleanup (NM_DEVICE_OLPC_MESH (dev));
 }
 
 static gboolean
-real_check_connection_compatible (NMDevice *device,
-                                  NMConnection *connection,
-                                  GError **error)
+check_connection_compatible (NMDevice *device,
+                             NMConnection *connection,
+                             GError **error)
 {
 	NMSettingConnection *s_con;
 	NMSettingOlpcMesh *s_mesh;
@@ -270,11 +273,11 @@ real_check_connection_compatible (NMDevice *device,
 #define DEFAULT_SSID "olpc-mesh"
 
 static gboolean
-real_complete_connection (NMDevice *device,
-                          NMConnection *connection,
-                          const char *specific_object,
-                          const GSList *existing_connections,
-                          GError **error)
+complete_connection (NMDevice *device,
+                     NMConnection *connection,
+                     const char *specific_object,
+                     const GSList *existing_connections,
+                     GError **error)
 {
 	NMSettingOlpcMesh *s_mesh;
 	GByteArray *tmp;
@@ -332,7 +335,7 @@ nm_device_olpc_mesh_get_address (NMDeviceOlpcMesh *self,
 /****************************************************************************/
 
 static void
-real_update_hw_address (NMDevice *dev)
+update_hw_address (NMDevice *dev)
 {
 	NMDeviceOlpcMesh *self = NM_DEVICE_OLPC_MESH (dev);
 	NMDeviceOlpcMeshPrivate *priv = NM_DEVICE_OLPC_MESH_GET_PRIVATE (self);
@@ -365,7 +368,7 @@ out:
 
 
 static NMActStageReturn
-real_act_stage1_prepare (NMDevice *dev, NMDeviceStateReason *reason)
+act_stage1_prepare (NMDevice *dev, NMDeviceStateReason *reason)
 {
 	NMDeviceOlpcMeshPrivate *priv = NM_DEVICE_OLPC_MESH_GET_PRIVATE (dev);
 	gboolean scanning;
@@ -407,7 +410,7 @@ _mesh_set_channel (NMDeviceOlpcMesh *self, guint32 channel)
 }
 
 static NMActStageReturn
-real_act_stage2_config (NMDevice *dev, NMDeviceStateReason *reason)
+act_stage2_config (NMDevice *dev, NMDeviceStateReason *reason)
 {
 	NMDeviceOlpcMesh *self = NM_DEVICE_OLPC_MESH (dev);
 	NMDeviceOlpcMeshPrivate *priv = NM_DEVICE_OLPC_MESH_GET_PRIVATE (self);
@@ -550,19 +553,21 @@ nm_device_olpc_mesh_class_init (NMDeviceOlpcMeshClass *klass)
 	object_class->dispose = dispose;
 
 	parent_class->get_type_capabilities = NULL;
-	parent_class->get_generic_capabilities = real_get_generic_capabilities;
-	parent_class->hw_is_up = real_hw_is_up;
-	parent_class->hw_bring_up = real_hw_bring_up;
-	parent_class->hw_take_down = real_hw_take_down;
-	parent_class->is_up = real_is_up;
-	parent_class->bring_up = real_bring_up;
-	parent_class->take_down = real_take_down;
-	parent_class->update_hw_address = real_update_hw_address;
-	parent_class->check_connection_compatible = real_check_connection_compatible;
-	parent_class->complete_connection = real_complete_connection;
-
-	parent_class->act_stage1_prepare = real_act_stage1_prepare;
-	parent_class->act_stage2_config = real_act_stage2_config;
+	parent_class->get_generic_capabilities = get_generic_capabilities;
+	parent_class->hw_is_up = hw_is_up;
+	parent_class->hw_bring_up = hw_bring_up;
+	parent_class->hw_take_down = hw_take_down;
+	parent_class->is_up = is_up;
+	parent_class->bring_up = bring_up;
+	parent_class->take_down = take_down;
+	parent_class->update_hw_address = update_hw_address;
+	parent_class->check_connection_compatible = check_connection_compatible;
+	parent_class->complete_connection = complete_connection;
+
+	parent_class->act_stage1_prepare = act_stage1_prepare;
+	parent_class->act_stage2_config = act_stage2_config;
+
+	parent_class->state_changed = state_changed;
 
 	/* Properties */
 	g_object_class_install_property
@@ -771,15 +776,16 @@ check_companion_cb (gpointer user_data)
 }
 
 static void
-state_changed_cb (NMDevice *device, NMDeviceState state, gpointer user_data)
+state_changed (NMDevice *device, NMDeviceState new_state,
+               NMDeviceState old_state, NMDeviceStateReason reason)
 {
 	NMDeviceOlpcMesh *self = NM_DEVICE_OLPC_MESH (device);
 
-	switch (state) {
+	switch (new_state) {
 	case NM_DEVICE_STATE_UNMANAGED:
 		break;
 	case NM_DEVICE_STATE_UNAVAILABLE:
-		/* If transitioning to UNAVAILBLE and the companion device is known then
+		/* If transitioning to UNAVAILABLE and the companion device is known then
 		 * transition to DISCONNECTED otherwise wait for our companion.
 		 */
 		g_idle_add (check_companion_cb, self);
@@ -801,23 +807,15 @@ nm_device_olpc_mesh_new (const char *udi,
                          const char *iface,
                          const char *driver)
 {
-	GObject *obj;
-
 	g_return_val_if_fail (udi != NULL, NULL);
 	g_return_val_if_fail (iface != NULL, NULL);
 	g_return_val_if_fail (driver != NULL, NULL);
 
-	obj = g_object_new (NM_TYPE_DEVICE_OLPC_MESH,
-	                    NM_DEVICE_UDI, udi,
-	                    NM_DEVICE_IFACE, iface,
-	                    NM_DEVICE_DRIVER, driver,
-	                    NM_DEVICE_TYPE_DESC, "802.11 OLPC Mesh",
-	                    NM_DEVICE_DEVICE_TYPE, NM_DEVICE_TYPE_OLPC_MESH,
-	                    NULL);
-	if (obj == NULL)
-		return NULL;
-
-	g_signal_connect (obj, "state-changed", G_CALLBACK (state_changed_cb), NULL);
-
-	return NM_DEVICE (obj);
+	return (NMDevice *) g_object_new (NM_TYPE_DEVICE_OLPC_MESH,
+	                                  NM_DEVICE_UDI, udi,
+	                                  NM_DEVICE_IFACE, iface,
+	                                  NM_DEVICE_DRIVER, driver,
+	                                  NM_DEVICE_TYPE_DESC, "802.11 OLPC Mesh",
+	                                  NM_DEVICE_DEVICE_TYPE, NM_DEVICE_TYPE_OLPC_MESH,
+	                                  NULL);
 }
diff --git a/src/nm-device-private.h b/src/nm-device-private.h
index 0320a722..57e16c0f 100644
--- a/src/nm-device-private.h
+++ b/src/nm-device-private.h
@@ -28,15 +28,20 @@
 
 enum NMActStageReturn {
 	NM_ACT_STAGE_RETURN_FAILURE = 0,
-	NM_ACT_STAGE_RETURN_SUCCESS,
-	NM_ACT_STAGE_RETURN_POSTPONE,
-	NM_ACT_STAGE_RETURN_STOP         /* This activation chain is done */
+	NM_ACT_STAGE_RETURN_SUCCESS,     /* Activation stage done */
+	NM_ACT_STAGE_RETURN_POSTPONE,    /* Long-running operation in progress */
+	NM_ACT_STAGE_RETURN_WAIT,        /* Not ready to start stage; wait */
+	NM_ACT_STAGE_RETURN_STOP         /* Activation stage done; nothing to do */
 };
 
 void nm_device_set_ip_iface (NMDevice *self, const char *iface);
 
 void nm_device_activate_schedule_stage3_ip_config_start (NMDevice *device);
 
+gboolean nm_device_activate_stage3_ip4_start (NMDevice *self);
+
+gboolean nm_device_activate_stage3_ip6_start (NMDevice *self);
+
 gboolean nm_device_hw_bring_up (NMDevice *self, gboolean wait, gboolean *no_firmware);
 
 void nm_device_hw_take_down (NMDevice *self, gboolean block);
@@ -69,6 +74,8 @@ gboolean nm_device_match_ip_config (NMDevice *device, NMConnection *connection);
 
 NMConnectionProvider *nm_device_get_connection_provider (NMDevice *device);
 
+void nm_device_recheck_available_connections (NMDevice *device);
+
 void nm_device_queued_state_clear (NMDevice *device);
 
 NMDeviceState nm_device_queued_state_peek (NMDevice *device);
diff --git a/src/nm-device-vlan.c b/src/nm-device-vlan.c
index fe3548d7..f22d47d8 100644
--- a/src/nm-device-vlan.c
+++ b/src/nm-device-vlan.c
@@ -100,7 +100,7 @@ nm_vlan_error_quark (void)
 /******************************************************************/
 
 static guint32
-real_get_generic_capabilities (NMDevice *dev)
+get_generic_capabilities (NMDevice *dev)
 {
 	/* We assume VLAN interfaces always support carrier detect */
 	return NM_DEVICE_CAP_CARRIER_DETECT | NM_DEVICE_CAP_NM_SUPPORTED;
@@ -118,7 +118,7 @@ get_carrier_sync (NMDeviceVlan *self)
 	                                        nm_device_get_ip_ifindex (NM_DEVICE (self)),
 	                                        &ifflags,
 	                                        &error)) {
-		nm_log_warn (LOGD_HW | LOGD_DEVICE,
+		nm_log_warn (LOGD_HW | LOGD_VLAN,
 		             "(%s): couldn't get carrier state: (%d) %s",
 		             nm_device_get_ip_iface (NM_DEVICE (self)),
 		             error ? error->code : -1,
@@ -130,13 +130,13 @@ get_carrier_sync (NMDeviceVlan *self)
 }
 
 static gboolean
-real_hw_is_up (NMDevice *device)
+hw_is_up (NMDevice *device)
 {
 	return nm_system_iface_is_up (nm_device_get_ip_ifindex (device));
 }
 
 static gboolean
-real_hw_bring_up (NMDevice *dev, gboolean *no_firmware)
+hw_bring_up (NMDevice *dev, gboolean *no_firmware)
 {
 	gboolean success = FALSE, carrier;
 	guint i = 20;
@@ -163,13 +163,13 @@ real_hw_bring_up (NMDevice *dev, gboolean *no_firmware)
 }
 
 static void
-real_hw_take_down (NMDevice *dev)
+hw_take_down (NMDevice *dev)
 {
 	nm_system_iface_set_up (nm_device_get_ip_ifindex (dev), FALSE, NULL);
 }
 
 static void
-real_update_hw_address (NMDevice *dev)
+update_hw_address (NMDevice *dev)
 {
 	NMDeviceVlan *self = NM_DEVICE_VLAN (dev);
 	NMDeviceVlanPrivate *priv = NM_DEVICE_VLAN_GET_PRIVATE (self);
@@ -178,7 +178,7 @@ real_update_hw_address (NMDevice *dev)
 
 	rtnl = nm_netlink_index_to_rtnl_link (nm_device_get_ip_ifindex (dev));
 	if (!rtnl) {
-		nm_log_err (LOGD_HW | LOGD_DEVICE,
+		nm_log_err (LOGD_HW | LOGD_VLAN,
 		            "(%s) failed to read hardware address (error %d)",
 		            nm_device_get_iface (dev), errno);
 		return;
@@ -186,14 +186,14 @@ real_update_hw_address (NMDevice *dev)
 
 	addr = rtnl_link_get_addr (rtnl);
 	if (!addr) {
-		nm_log_err (LOGD_HW | LOGD_DEVICE,
+		nm_log_err (LOGD_HW | LOGD_VLAN,
 		            "(%s) no hardware address?",
 		            nm_device_get_iface (dev));
 		goto out;
 	}
 
 	if (nl_addr_get_len (addr) > sizeof (priv->hw_addr)) {
-		nm_log_err (LOGD_HW | LOGD_DEVICE,
+		nm_log_err (LOGD_HW | LOGD_VLAN,
 		            "(%s) hardware address is wrong length (got %d max %zd)",
 		            nm_device_get_iface (dev),
 		            nl_addr_get_len (addr),
@@ -209,14 +209,14 @@ out:
 }
 
 static gboolean
-real_can_interrupt_activation (NMDevice *dev)
+can_interrupt_activation (NMDevice *dev)
 {
 	/* Can interrupt activation if the carrier drops while activating */
 	return NM_DEVICE_VLAN_GET_PRIVATE (dev)->carrier ? FALSE : TRUE;
 }
 
 static gboolean
-real_is_available (NMDevice *dev)
+is_available (NMDevice *dev)
 {
 	return NM_DEVICE_VLAN_GET_PRIVATE (dev)->carrier ? TRUE : FALSE;
 }
@@ -319,9 +319,9 @@ match_vlan_connection (NMDeviceVlan *self, NMConnection *connection, GError **er
 }
 
 static NMConnection *
-real_get_best_auto_connection (NMDevice *dev,
-                               GSList *connections,
-                               char **specific_object)
+get_best_auto_connection (NMDevice *dev,
+                          GSList *connections,
+                          char **specific_object)
 {
 	GSList *iter;
 
@@ -339,19 +339,19 @@ real_get_best_auto_connection (NMDevice *dev,
 }
 
 static gboolean
-real_check_connection_compatible (NMDevice *device,
-                                  NMConnection *connection,
-                                  GError **error)
+check_connection_compatible (NMDevice *device,
+                             NMConnection *connection,
+                             GError **error)
 {
 	return match_vlan_connection (NM_DEVICE_VLAN (device), connection, error);
 }
 
 static gboolean
-real_complete_connection (NMDevice *device,
-                          NMConnection *connection,
-                          const char *specific_object,
-                          const GSList *existing_connections,
-                          GError **error)
+complete_connection (NMDevice *device,
+                     NMConnection *connection,
+                     const char *specific_object,
+                     const GSList *existing_connections,
+                     GError **error)
 {
 	NMDeviceVlanPrivate *priv = NM_DEVICE_VLAN_GET_PRIVATE (device);
 	NMSettingVlan *s_vlan;
@@ -521,7 +521,7 @@ set_carrier (NMDeviceVlan *self,
 	g_object_notify (G_OBJECT (self), NM_DEVICE_VLAN_CARRIER);
 
 	state = nm_device_get_state (NM_DEVICE (self));
-	nm_log_info (LOGD_HW | LOGD_DEVICE,
+	nm_log_info (LOGD_HW | LOGD_VLAN,
 	             "(%s): carrier now %s (device state %d%s)",
 	             nm_device_get_iface (NM_DEVICE (self)),
 	             carrier ? "ON" : "OFF",
@@ -577,7 +577,7 @@ carrier_watch_init (NMDeviceVlan *self)
 
 	priv->carrier = get_carrier_sync (NM_DEVICE_VLAN (self));
 
-	nm_log_info (LOGD_HW | LOGD_DEVICE, "(%s): carrier is %s",
+	nm_log_info (LOGD_HW | LOGD_VLAN, "(%s): carrier is %s",
 	             nm_device_get_iface (NM_DEVICE (self)),
 	             priv->carrier ? "ON" : "OFF");
 
@@ -637,13 +637,13 @@ nm_device_vlan_new (const char *udi, const char *iface, NMDevice *parent)
 
 		itype = nm_system_get_iface_type (ifindex, iface);
 		if (itype != NM_IFACE_TYPE_VLAN) {
-			nm_log_err (LOGD_DEVICE, "(%s): failed to get VLAN interface type.", iface);
+			nm_log_err (LOGD_VLAN, "(%s): failed to get VLAN interface type.", iface);
 			g_object_unref (device);
 			return NULL;
 		}
 
 		if (!nm_system_get_iface_vlan_info (ifindex, &parent_ifindex, &vlan_id)) {
-			nm_log_warn (LOGD_DEVICE, "(%s): failed to get VLAN interface info.", iface);
+			nm_log_warn (LOGD_VLAN, "(%s): failed to get VLAN interface info.", iface);
 			g_object_unref (device);
 			return NULL;
 		}
@@ -651,7 +651,7 @@ nm_device_vlan_new (const char *udi, const char *iface, NMDevice *parent)
 		if (   parent_ifindex < 0
 		    || parent_ifindex != nm_device_get_ip_ifindex (parent)
 		    || vlan_id < 0) {
-			nm_log_warn (LOGD_DEVICE, "(%s): VLAN parent ifindex (%d) or VLAN ID (%d) invalid.",
+			nm_log_warn (LOGD_VLAN, "(%s): VLAN parent ifindex (%d) or VLAN ID (%d) invalid.",
 			             iface, parent_ifindex, priv->vlan_id);
 			g_object_unref (device);
 			return NULL;
@@ -758,17 +758,17 @@ nm_device_vlan_class_init (NMDeviceVlanClass *klass)
 	object_class->set_property = set_property;
 	object_class->dispose = dispose;
 
-	parent_class->get_generic_capabilities = real_get_generic_capabilities;
-	parent_class->update_hw_address = real_update_hw_address;
-	parent_class->hw_is_up = real_hw_is_up;
-	parent_class->hw_bring_up = real_hw_bring_up;
-	parent_class->hw_take_down = real_hw_take_down;
-	parent_class->can_interrupt_activation = real_can_interrupt_activation;
-	parent_class->is_available = real_is_available;
-
-	parent_class->get_best_auto_connection = real_get_best_auto_connection;
-	parent_class->check_connection_compatible = real_check_connection_compatible;
-	parent_class->complete_connection = real_complete_connection;
+	parent_class->get_generic_capabilities = get_generic_capabilities;
+	parent_class->update_hw_address = update_hw_address;
+	parent_class->hw_is_up = hw_is_up;
+	parent_class->hw_bring_up = hw_bring_up;
+	parent_class->hw_take_down = hw_take_down;
+	parent_class->can_interrupt_activation = can_interrupt_activation;
+	parent_class->is_available = is_available;
+
+	parent_class->get_best_auto_connection = get_best_auto_connection;
+	parent_class->check_connection_compatible = check_connection_compatible;
+	parent_class->complete_connection = complete_connection;
 	parent_class->spec_match_list = spec_match_list;
 	parent_class->connection_match_config = connection_match_config;
 
diff --git a/src/nm-device-wifi.c b/src/nm-device-wifi.c
index 0f57727d..eb5ac1aa 100644
--- a/src/nm-device-wifi.c
+++ b/src/nm-device-wifi.c
@@ -150,6 +150,8 @@ struct _NMDeviceWifiPrivate {
 
 	Supplicant        supplicant;
 	WifiData *        wifi_data;
+	gboolean          ssid_found;
+	NM80211Mode       mode;
 
 	guint32           failed_link_count;
 	guint             periodic_source_id;
@@ -172,6 +174,7 @@ static void remove_supplicant_timeouts (NMDeviceWifi *self);
 static void supplicant_iface_state_cb (NMSupplicantInterface *iface,
                                        guint32 new_state,
                                        guint32 old_state,
+                                       int disconnect_reason,
                                        gpointer user_data);
 
 static void supplicant_iface_new_bss_cb (NMSupplicantInterface * iface,
@@ -276,7 +279,7 @@ ipw_rfkill_state_work (gpointer user_data)
 /*****************************************************************/
 
 static guint32
-real_get_generic_capabilities (NMDevice *dev)
+get_generic_capabilities (NMDevice *dev)
 {
 	return NM_DEVICE_CAP_NM_SUPPORTED;
 }
@@ -315,7 +318,7 @@ constructor (GType type,
 	priv->capabilities = wifi_utils_get_caps (priv->wifi_data);
 
 	if (priv->capabilities & NM_WIFI_DEVICE_CAP_AP) {
-		nm_log_warn (LOGD_HW | LOGD_WIFI, "(%s): driver supports Access Point (AP) mode",
+		nm_log_info (LOGD_HW | LOGD_WIFI, "(%s): driver supports Access Point (AP) mode",
 		             nm_device_get_iface (NM_DEVICE (self)));
 	}
 
@@ -653,7 +656,7 @@ update_seen_bssids_cache (NMDeviceWifi *self, NMAccessPoint *ap)
 }
 
 static void
-set_current_ap (NMDeviceWifi *self, NMAccessPoint *new_ap)
+set_active_ap (NMDeviceWifi *self, NMAccessPoint *new_ap)
 {
 	NMDeviceWifiPrivate *priv;
 	char *old_path = NULL;
@@ -705,6 +708,7 @@ periodic_update (gpointer user_data)
 	NMAccessPoint *new_ap;
 	guint32 new_rate, percent;
 	NMDeviceState state;
+	guint32 supplicant_state;
 
 	/* BSSID and signal strength have meaningful values only if the device
 	 * is activated and not scanning.
@@ -713,7 +717,18 @@ periodic_update (gpointer user_data)
 	if (state != NM_DEVICE_STATE_ACTIVATED)
 		return TRUE;
 
-	if (nm_supplicant_interface_get_scanning (priv->supplicant.iface))
+	/* Only update current AP if we're actually talking to something, otherwise
+	 * assume the old one (if any) is still valid until we're told otherwise or
+	 * the connection fails.
+	 */
+	supplicant_state = nm_supplicant_interface_get_state (priv->supplicant.iface);
+	if (   supplicant_state < NM_SUPPLICANT_INTERFACE_STATE_AUTHENTICATING
+	    || supplicant_state > NM_SUPPLICANT_INTERFACE_STATE_COMPLETED
+	    || nm_supplicant_interface_get_scanning (priv->supplicant.iface))
+		return TRUE;
+
+	/* In AP mode we currently have nothing to do. */
+	if (priv->mode == NM_802_11_MODE_AP)
 		return TRUE;
 
 	/* In IBSS mode, most newer firmware/drivers do "BSS coalescing" where
@@ -776,7 +791,7 @@ periodic_update (gpointer user_data)
 		g_free (old_addr);
 		g_free (new_addr);
 
-		set_current_ap (self, new_ap);
+		set_active_ap (self, new_ap);
 	}
 
 	new_rate = wifi_utils_get_rate (priv->wifi_data);
@@ -789,13 +804,13 @@ periodic_update (gpointer user_data)
 }
 
 static gboolean
-real_hw_is_up (NMDevice *device)
+hw_is_up (NMDevice *device)
 {
 	return nm_system_iface_is_up (nm_device_get_ip_ifindex (device));
 }
 
 static gboolean
-real_hw_bring_up (NMDevice *device, gboolean *no_firmware)
+hw_bring_up (NMDevice *device, gboolean *no_firmware)
 {
 	if (!NM_DEVICE_WIFI_GET_PRIVATE (device)->enabled)
 		return FALSE;
@@ -804,13 +819,13 @@ real_hw_bring_up (NMDevice *device, gboolean *no_firmware)
 }
 
 static void
-real_hw_take_down (NMDevice *device)
+hw_take_down (NMDevice *device)
 {
 	nm_system_iface_set_up (nm_device_get_ip_ifindex (device), FALSE, NULL);
 }
 
 static gboolean
-real_is_up (NMDevice *device)
+is_up (NMDevice *device)
 {
 	if (!NM_DEVICE_WIFI_GET_PRIVATE (device)->periodic_source_id)
 		return FALSE;
@@ -819,7 +834,7 @@ real_is_up (NMDevice *device)
 }
 
 static gboolean
-real_bring_up (NMDevice *dev)
+bring_up (NMDevice *dev)
 {
 	NMDeviceWifi *self = NM_DEVICE_WIFI (dev);
 	NMDeviceWifiPrivate *priv = NM_DEVICE_WIFI_GET_PRIVATE (self);
@@ -865,7 +880,7 @@ _set_hw_addr (NMDeviceWifi *self, const guint8 *addr, const char *detail)
 	}
 
 	/* Can't change MAC address while device is up */
-	real_hw_take_down (dev);
+	hw_take_down (dev);
 
 	success = nm_system_iface_set_mac (nm_device_get_ip_ifindex (dev), (struct ether_addr *) addr);
 	if (success) {
@@ -877,16 +892,22 @@ _set_hw_addr (NMDeviceWifi *self, const guint8 *addr, const char *detail)
 		nm_log_warn (LOGD_DEVICE | LOGD_ETHER, "(%s): failed to %s MAC address to %s",
 		             iface, detail, mac_str);
 	}
-	real_hw_bring_up (dev, NULL);
+	hw_bring_up (dev, NULL);
 	g_free (mac_str);
 
 	return success;
 }
 
 static void
-access_point_removed (NMDeviceWifi *device, NMAccessPoint *ap)
+remove_access_point (NMDeviceWifi *device, NMAccessPoint *ap)
 {
+	NMDeviceWifiPrivate *priv = NM_DEVICE_WIFI_GET_PRIVATE (device);
+
 	g_signal_emit (device, signals[ACCESS_POINT_REMOVED], 0, ap);
+	priv->ap_list = g_slist_remove (priv->ap_list, ap);
+	g_object_unref (ap);
+
+	nm_device_recheck_available_connections (NM_DEVICE (device));
 }
 
 static void
@@ -897,17 +918,14 @@ remove_all_aps (NMDeviceWifi *self)
 	/* Remove outdated APs */
 	while (g_slist_length (priv->ap_list)) {
 		NMAccessPoint *ap = NM_AP (priv->ap_list->data);
-
-		access_point_removed (self, ap);
-		priv->ap_list = g_slist_remove (priv->ap_list, ap);
-		g_object_unref (ap);
+		remove_access_point (self, ap);
 	}
 	g_slist_free (priv->ap_list);
 	priv->ap_list = NULL;
 }
 
 static void
-real_take_down (NMDevice *dev)
+take_down (NMDevice *dev)
 {
 	NMDeviceWifi *self = NM_DEVICE_WIFI (dev);
 	NMDeviceWifiPrivate *priv = NM_DEVICE_WIFI_GET_PRIVATE (self);
@@ -918,18 +936,19 @@ real_take_down (NMDevice *dev)
 	}
 
 	cleanup_association_attempt (self, TRUE);
-	set_current_ap (self, NULL);
+	set_active_ap (self, NULL);
 	remove_all_aps (self);
 }
 
 static void
-real_deactivate (NMDevice *dev)
+deactivate (NMDevice *dev)
 {
 	NMDeviceWifi *self = NM_DEVICE_WIFI (dev);
 	NMDeviceWifiPrivate *priv = NM_DEVICE_WIFI_GET_PRIVATE (self);
 	NMAccessPoint *orig_ap = nm_device_wifi_get_activation_ap (self);
 	NMActRequest *req;
 	NMConnection *connection;
+	NM80211Mode old_mode = priv->mode;
 
 	req = nm_device_get_act_request (dev);
 	if (req) {
@@ -940,7 +959,7 @@ real_deactivate (NMDevice *dev)
 
 	cleanup_association_attempt (self, TRUE);
 
-	set_current_ap (self, NULL);
+	set_active_ap (self, NULL);
 	priv->rate = 0;
 
 	/* If the AP is 'fake', i.e. it wasn't actually found from
@@ -952,9 +971,7 @@ real_deactivate (NMDevice *dev)
 	 * and thus the AP culling never happens. (bgo #569241)
 	 */
 	if (orig_ap && nm_ap_get_fake (orig_ap)) {
-		access_point_removed (self, orig_ap);
-		priv->ap_list = g_slist_remove (priv->ap_list, orig_ap);
-		g_object_unref (orig_ap);
+	    remove_access_point (self, orig_ap);
 	}
 
 	/* Reset MAC address back to initial address */
@@ -963,7 +980,22 @@ real_deactivate (NMDevice *dev)
 	/* Ensure we're in infrastructure mode after deactivation; some devices
 	 * (usually older ones) don't scan well in adhoc mode.
 	 */
-	wifi_utils_set_mode (priv->wifi_data, NM_802_11_MODE_INFRA);
+	if (wifi_utils_get_mode (priv->wifi_data) != NM_802_11_MODE_INFRA) {
+		nm_device_hw_take_down (NM_DEVICE (self), TRUE);
+		wifi_utils_set_mode (priv->wifi_data, NM_802_11_MODE_INFRA);
+		nm_device_hw_bring_up (NM_DEVICE (self), TRUE, NULL);
+	}
+
+	if (priv->mode != NM_802_11_MODE_INFRA) {
+		priv->mode = NM_802_11_MODE_INFRA;
+		g_object_notify (G_OBJECT (self), NM_DEVICE_WIFI_MODE);
+	}
+
+	/* Ensure we trigger a scan after deactivating a Hotspot */
+	if (old_mode == NM_802_11_MODE_AP) {
+		cancel_pending_scan (self);
+		request_wireless_scan (self);
+	}
 }
 
 static gboolean
@@ -997,9 +1029,9 @@ is_adhoc_wpa (NMConnection *connection)
 }
 
 static gboolean
-real_check_connection_compatible (NMDevice *device,
-                                  NMConnection *connection,
-                                  GError **error)
+check_connection_compatible (NMDevice *device,
+                             NMConnection *connection,
+                             GError **error)
 {
 	NMDeviceWifi *self = NM_DEVICE_WIFI (device);
 	NMDeviceWifiPrivate *priv = NM_DEVICE_WIFI_GET_PRIVATE (self);
@@ -1062,6 +1094,32 @@ real_check_connection_compatible (NMDevice *device,
 		return FALSE;
 	}
 
+	/* Early exit if supplicant or device don't support AP mode */
+	if (g_strcmp0 (nm_setting_wireless_get_mode (s_wireless), NM_SETTING_WIRELESS_MODE_AP) == 0) {
+		if (!(priv->capabilities & NM_WIFI_DEVICE_CAP_AP)) {
+			g_set_error_literal (error,
+			                     NM_WIFI_ERROR,
+			                     NM_WIFI_ERROR_AP_MODE_UNSUPPORTED,
+			                     "Access Point (AP) mode is not supported by this device.");
+			return FALSE;
+		}
+
+		if (priv->supplicant.iface) {
+			switch (nm_supplicant_interface_get_ap_support (priv->supplicant.iface)) {
+			case AP_SUPPORT_NO:
+				g_set_error_literal (error,
+				                     NM_WIFI_ERROR,
+				                     NM_WIFI_ERROR_AP_MODE_UNSUPPORTED,
+				                     "Access Point (AP) mode is not supported by the supplicant.");
+				return FALSE;
+			case AP_SUPPORT_YES:
+			case AP_SUPPORT_UNKNOWN:
+			default:
+				break;
+			}
+		}
+	}
+
 	// FIXME: check channel/freq/band against bands the hardware supports
 	// FIXME: check encryption against device capabilities
 	// FIXME: check bitrate against device capabilities
@@ -1069,6 +1127,37 @@ real_check_connection_compatible (NMDevice *device,
 	return TRUE;
 }
 
+
+static gboolean
+check_connection_available (NMDevice *device, NMConnection *connection)
+{
+	NMDeviceWifiPrivate *priv = NM_DEVICE_WIFI_GET_PRIVATE (device);
+	NMSettingWireless *s_wifi;
+	const char *mode;
+	GSList *ap_iter = NULL;
+
+	s_wifi = nm_connection_get_setting_wireless (connection);
+
+	/* Ad-Hoc connections are always available because they may be started
+	 * at any time.
+	 */
+	mode = nm_setting_wireless_get_mode (s_wifi);
+	if (g_strcmp0 (mode, "adhoc") == 0)
+		return TRUE;
+
+	/* Hidden SSIDs obviously don't always appear in the scan list either */
+	if (nm_setting_wireless_get_hidden (s_wifi))
+		return TRUE;
+
+	/* check if its visible */
+	for (ap_iter = priv->ap_list; ap_iter; ap_iter = g_slist_next (ap_iter)) {
+		if (nm_ap_check_compatible (NM_AP (ap_iter->data), connection))
+			return TRUE;
+	}
+
+	return FALSE;
+}
+
 /*
  * List of manufacturer default SSIDs that are often unchanged by users.
  *
@@ -1106,11 +1195,11 @@ is_manf_default_ssid (const GByteArray *ssid)
 }
 
 static gboolean
-real_complete_connection (NMDevice *device,
-                          NMConnection *connection,
-                          const char *specific_object,
-                          const GSList *existing_connections,
-                          GError **error)
+complete_connection (NMDevice *device,
+                     NMConnection *connection,
+                     const char *specific_object,
+                     const GSList *existing_connections,
+                     GError **error)
 {
 	NMDeviceWifi *self = NM_DEVICE_WIFI (device);
 	NMDeviceWifiPrivate *priv = NM_DEVICE_WIFI_GET_PRIVATE (self);
@@ -1278,7 +1367,7 @@ real_complete_connection (NMDevice *device,
 }
 
 static gboolean
-real_is_available (NMDevice *dev)
+is_available (NMDevice *dev)
 {
 	NMDeviceWifi *self = NM_DEVICE_WIFI (dev);
 	NMDeviceWifiPrivate *priv = NM_DEVICE_WIFI_GET_PRIVATE (self);
@@ -1299,7 +1388,8 @@ real_is_available (NMDevice *dev)
 	}
 
 	state = nm_supplicant_interface_get_state (sup_iface);
-	if (state != NM_SUPPLICANT_INTERFACE_STATE_READY) {
+	if (   state < NM_SUPPLICANT_INTERFACE_STATE_READY
+	    || state > NM_SUPPLICANT_INTERFACE_STATE_COMPLETED) {
 		nm_log_dbg (LOGD_WIFI, "(%s): not available because supplicant interface not ready",
 		            nm_device_get_iface (dev));
 		return FALSE;
@@ -1309,9 +1399,9 @@ real_is_available (NMDevice *dev)
 }
 
 static NMConnection *
-real_get_best_auto_connection (NMDevice *dev,
-                               GSList *connections,
-                               char **specific_object)
+get_best_auto_connection (NMDevice *dev,
+                          GSList *connections,
+                          char **specific_object)
 {
 	NMDeviceWifi *self = NM_DEVICE_WIFI (dev);
 	NMDeviceWifiPrivate *priv = NM_DEVICE_WIFI_GET_PRIVATE (self);
@@ -1326,6 +1416,7 @@ real_get_best_auto_connection (NMDevice *dev,
 		gboolean mac_blacklist_found = FALSE;
 		NMSettingIP4Config *s_ip4;
 		const char *method = NULL;
+		guint64 timestamp = 0;
 
 		s_con = nm_connection_get_setting_connection (connection);
 		if (s_con == NULL)
@@ -1335,6 +1426,15 @@ real_get_best_auto_connection (NMDevice *dev,
 		if (!nm_setting_connection_get_autoconnect (s_con))
 			continue;
 
+		/* Don't autoconnect to networks that have been tried at least once
+		 * but haven't been successful, since these are often accidental choices
+		 * from the menu and the user may not know the password.
+		 */
+		if (nm_settings_connection_get_timestamp (NM_SETTINGS_CONNECTION (connection), ×tamp)) {
+			if (timestamp == 0)
+				continue;
+		}
+
 		s_wireless = nm_connection_get_setting_wireless (connection);
 		if (!s_wireless)
 			continue;
@@ -1521,6 +1621,10 @@ scanning_allowed (NMDeviceWifi *self)
 
 	g_return_val_if_fail (priv->supplicant.iface != NULL, FALSE);
 
+	/* Scanning not done in AP mode */
+	if (priv->mode == NM_802_11_MODE_AP)
+		return FALSE;
+
 	switch (nm_device_get_state (NM_DEVICE (self))) {
 	case NM_DEVICE_STATE_UNKNOWN:
 	case NM_DEVICE_STATE_UNMANAGED:
@@ -1903,6 +2007,7 @@ merge_scanned_ap (NMDeviceWifi *self,
 		priv->ap_list = g_slist_prepend (priv->ap_list, merge_ap);
 		nm_ap_export_to_dbus (merge_ap);
 		g_signal_emit (self, signals[ACCESS_POINT_ADDED], 0, merge_ap);
+		nm_device_recheck_available_connections (NM_DEVICE (self));
 	}
 }
 
@@ -1965,9 +2070,7 @@ cull_scan_list (NMDeviceWifi *self)
 		            ssid ? nm_utils_escape_ssid (ssid->data, ssid->len) : "(none)",
 		            ssid ? "'" : "");
 
-		access_point_removed (self, outdated_ap);
-		priv->ap_list = g_slist_remove (priv->ap_list, outdated_ap);
-		g_object_unref (outdated_ap);
+		remove_access_point (self, outdated_ap);
 		removed++;
 	}
 	g_slist_free (outdated_list);
@@ -1978,6 +2081,9 @@ cull_scan_list (NMDeviceWifi *self)
 
 	ap_list_dump (self);
 
+	if(removed > 0)
+	    nm_device_recheck_available_connections (NM_DEVICE (self));
+
 	return FALSE;
 }
 
@@ -2005,10 +2111,12 @@ supplicant_iface_new_bss_cb (NMSupplicantInterface *iface,
 	g_return_if_fail (properties != NULL);
 	g_return_if_fail (iface != NULL);
 
-	/* Ignore new APs when unavailable or unamnaged */
+	/* Ignore new APs when unavailable, unmanaged, or in AP mode */
 	state = nm_device_get_state (NM_DEVICE (self));
 	if (state <= NM_DEVICE_STATE_UNAVAILABLE)
 		return;
+	if (NM_DEVICE_WIFI_GET_PRIVATE (self)->mode == NM_802_11_MODE_AP)
+		return;
 
 	ap = nm_ap_new_from_properties (object_path, properties);
 	if (ap) {
@@ -2127,6 +2235,9 @@ static gboolean
 link_timeout_cb (gpointer user_data)
 {
 	NMDevice *dev = NM_DEVICE (user_data);
+	NMDeviceWifi *self = NM_DEVICE_WIFI (dev);
+	NMDeviceWifiPrivate *priv = NM_DEVICE_WIFI_GET_PRIVATE (self);
+	NMAccessPoint *ap;
 
 	nm_log_warn (LOGD_WIFI, "(%s): link timed out.", nm_device_get_iface (dev));
 
@@ -2136,65 +2247,134 @@ link_timeout_cb (gpointer user_data)
 	 * to reassociate within the timeout period, so the connection must
 	 * fail.
 	 */
-	if (nm_device_get_state (dev) == NM_DEVICE_STATE_ACTIVATED) {
-		nm_device_state_changed (dev,
-		                         NM_DEVICE_STATE_FAILED,
-		                         NM_DEVICE_STATE_REASON_SUPPLICANT_TIMEOUT);
-	}
+	if (nm_device_get_state (dev) != NM_DEVICE_STATE_ACTIVATED)
+		return FALSE;
+
+	/* Remove whatever access point we used to be connected to from the list
+	 * since it failed and might no longer be visible.  If it's actually still
+	 * there, we'll find it in the next scan.
+	 */
+	if (priv->current_ap) {
+		ap = priv->current_ap;
+		priv->current_ap = NULL;
+	} else
+		ap = nm_device_wifi_get_activation_ap (self);
 
+	if (ap)
+		remove_access_point (self, ap);
+
+	nm_device_state_changed (dev,
+	                         NM_DEVICE_STATE_FAILED,
+	                         priv->ssid_found ? NM_DEVICE_STATE_REASON_SUPPLICANT_TIMEOUT :
+	                                            NM_DEVICE_STATE_REASON_SSID_NOT_FOUND);
 	return FALSE;
 }
 
 static gboolean
-handle_8021x_auth_fail (NMDeviceWifi *self, guint32 new_state, guint32 old_state)
+need_new_8021x_secrets (NMDeviceWifi *self,
+                        guint32 old_state,
+                        const char **setting_name)
 {
-	NMDevice *device = NM_DEVICE (self);
 	NMSetting8021x *s_8021x;
 	NMSettingWirelessSecurity *s_wsec;
 	NMSettingSecretFlags secret_flags = NM_SETTING_SECRET_FLAG_NONE;
-	NMActRequest *req;
 	NMConnection *connection;
-	const char *setting_name = NULL;
-	gboolean handled = FALSE;
 
-	g_return_val_if_fail (new_state == NM_SUPPLICANT_INTERFACE_STATE_DISCONNECTED, FALSE);
+	g_assert (setting_name != NULL);
+
+	connection = nm_device_get_connection (NM_DEVICE (self));
+	g_return_val_if_fail (connection != NULL, FALSE);
 
-	/* Only care about ASSOCIATED -> DISCONNECTED transitions since 802.1x stuff
-	 * happens between the ASSOCIATED and AUTHENTICATED states.
+	/* 802.1x stuff only happens in the supplicant's ASSOCIATED state when it's
+	 * attempting to authenticate with the AP.
 	 */
 	if (old_state != NM_SUPPLICANT_INTERFACE_STATE_ASSOCIATED)
 		return FALSE;
 
-	req = nm_device_get_act_request (NM_DEVICE (self));
-	g_return_val_if_fail (req != NULL, FALSE);
-
-	connection = nm_act_request_get_connection (req);
-	g_return_val_if_fail (connection != NULL, FALSE);
-
 	/* If it's an 802.1x or LEAP connection with "always ask"/unsaved secrets
 	 * then we need to ask again because it might be an OTP token and the PIN
 	 * may have changed.
 	 */
-	s_8021x = nm_connection_get_setting_802_1x (connection);
-	s_wsec = nm_connection_get_setting_wireless_security (connection);
 
+	s_8021x = nm_connection_get_setting_802_1x (connection);
 	if (s_8021x) {
 		nm_setting_get_secret_flags (NM_SETTING (s_8021x),
 		                             NM_SETTING_802_1X_PASSWORD,
 		                             &secret_flags,
 		                             NULL);
-		setting_name = NM_SETTING_802_1X_SETTING_NAME;
-	} else if (s_wsec) {
+		if (secret_flags & NM_SETTING_SECRET_FLAG_NOT_SAVED)
+			*setting_name = NM_SETTING_802_1X_SETTING_NAME;
+		return *setting_name ? TRUE : FALSE;
+	}
+
+	s_wsec = nm_connection_get_setting_wireless_security (connection);
+	if (s_wsec) {
 		nm_setting_get_secret_flags (NM_SETTING (s_wsec),
 		                             NM_SETTING_WIRELESS_SECURITY_LEAP_PASSWORD,
 		                             &secret_flags,
 		                             NULL);
-		setting_name = NM_SETTING_WIRELESS_SECURITY_SETTING_NAME;
+		if (secret_flags & NM_SETTING_SECRET_FLAG_NOT_SAVED)
+			*setting_name = NM_SETTING_WIRELESS_SECURITY_SETTING_NAME;
+		return *setting_name ? TRUE : FALSE;
+	}
+
+	/* Not a LEAP or 802.1x connection */
+	return FALSE;
+}
+
+static gboolean
+need_new_wpa_psk (NMDeviceWifi *self,
+                  guint32 old_state,
+                  const char **setting_name)
+{
+	NMSettingWirelessSecurity *s_wsec;
+	NMConnection *connection;
+	const char *key_mgmt = NULL;
+
+	g_assert (setting_name != NULL);
+
+	connection = nm_device_get_connection (NM_DEVICE (self));
+	g_return_val_if_fail (connection != NULL, FALSE);
+
+	/* A bad PSK will cause the supplicant to disconnect during the 4-way handshake */
+	if (old_state != NM_SUPPLICANT_INTERFACE_STATE_4WAY_HANDSHAKE)
+		return FALSE;
+
+	s_wsec = nm_connection_get_setting_wireless_security (connection);
+	if (s_wsec)
+		key_mgmt = nm_setting_wireless_security_get_key_mgmt (s_wsec);
+
+	if (g_strcmp0 (key_mgmt, "wpa-psk") == 0) {
+		*setting_name = NM_SETTING_WIRELESS_SECURITY_SETTING_NAME;
+		return TRUE;
 	}
 
-	if (setting_name && (secret_flags & NM_SETTING_SECRET_FLAG_NOT_SAVED)) {
-		NMSettingsGetSecretsFlags flags =   NM_SETTINGS_GET_SECRETS_FLAG_ALLOW_INTERACTION
-		                                  | NM_SETTINGS_GET_SECRETS_FLAG_REQUEST_NEW;
+	/* Not a WPA-PSK connection */
+	return FALSE;
+}
+
+static gboolean
+handle_8021x_or_psk_auth_fail (NMDeviceWifi *self,
+                               guint32 new_state,
+                               guint32 old_state,
+                               int disconnect_reason)
+{
+	NMDevice *device = NM_DEVICE (self);
+	NMActRequest *req;
+	NMConnection *connection;
+	const char *setting_name = NULL;
+	gboolean handled = FALSE;
+
+	g_return_val_if_fail (new_state == NM_SUPPLICANT_INTERFACE_STATE_DISCONNECTED, FALSE);
+
+	req = nm_device_get_act_request (NM_DEVICE (self));
+	g_return_val_if_fail (req != NULL, FALSE);
+
+	connection = nm_act_request_get_connection (req);
+	g_assert (connection);
+
+	if (   need_new_8021x_secrets (self, old_state, &setting_name)
+	    || need_new_wpa_psk (self, old_state, &setting_name)) {
 
 		nm_connection_clear_secrets (connection);
 
@@ -2204,7 +2384,13 @@ handle_8021x_auth_fail (NMDeviceWifi *self, guint32 new_state, guint32 old_state
 
 		cleanup_association_attempt (self, TRUE);
 		nm_device_state_changed (device, NM_DEVICE_STATE_NEED_AUTH, NM_DEVICE_STATE_REASON_SUPPLICANT_DISCONNECT);
-		nm_act_request_get_secrets (req, setting_name, flags, NULL, wifi_secrets_cb, self);
+		nm_act_request_get_secrets (req,
+		                            setting_name,
+		                            NM_SETTINGS_GET_SECRETS_FLAG_ALLOW_INTERACTION
+		                              | NM_SETTINGS_GET_SECRETS_FLAG_REQUEST_NEW,
+		                            NULL,
+		                            wifi_secrets_cb,
+		                            self);
 		handled = TRUE;
 	}
 
@@ -2215,6 +2401,7 @@ static void
 supplicant_iface_state_cb (NMSupplicantInterface *iface,
                            guint32 new_state,
                            guint32 old_state,
+                           int disconnect_reason,
                            gpointer user_data)
 {
 	NMDeviceWifi *self = NM_DEVICE_WIFI (user_data);
@@ -2235,6 +2422,11 @@ supplicant_iface_state_cb (NMSupplicantInterface *iface,
 	devstate = nm_device_get_state (device);
 	scanning = nm_supplicant_interface_get_scanning (iface);
 
+	/* In these states we know the supplicant is actually talking to something */
+	if (   new_state >= NM_SUPPLICANT_INTERFACE_STATE_ASSOCIATING
+	    && new_state <= NM_SUPPLICANT_INTERFACE_STATE_COMPLETED)
+		priv->ssid_found = TRUE;
+
 	switch (new_state) {
 	case NM_SUPPLICANT_INTERFACE_STATE_READY:
 		priv->scan_interval = SCAN_INTERVAL_MIN;
@@ -2269,20 +2461,24 @@ supplicant_iface_state_cb (NMSupplicantInterface *iface,
 
 			nm_log_info (LOGD_DEVICE | LOGD_WIFI,
 			             "Activation (%s/wireless) Stage 2 of 5 (Device Configure) "
-			             "successful.  Connected to wireless network '%s'.",
+			             "successful.  %s '%s'.",
 			             nm_device_get_iface (device),
+			             priv->mode == NM_802_11_MODE_AP ? "Started Wi-Fi Hotspot" :
+			                 "Connected to wireless network",
 			             ssid ? nm_utils_escape_ssid (ssid->data, ssid->len) : "(none)");
 			nm_device_activate_schedule_stage3_ip_config_start (device);
-		}
+		} else if (devstate == NM_DEVICE_STATE_ACTIVATED)
+			periodic_update (self);
 		break;
 	case NM_SUPPLICANT_INTERFACE_STATE_DISCONNECTED:
 		if ((devstate == NM_DEVICE_STATE_ACTIVATED) || nm_device_is_activating (device)) {
-			/* Disconnect of an 802.1x/LEAP connection during authentication
-			 * means secrets might be wrong. Not always the case, but until we
+			/* Disconnect of an 802.1x/LEAP connection during authentication,
+			 * or disconnect of a WPA-PSK connection during the 4-way handshake,
+			 * often means secrets are wrong. Not always the case, but until we
 			 * have more information from wpa_supplicant about why the
 			 * disconnect happened this is the best we can do.
 			 */
-			if (handle_8021x_auth_fail (self, new_state, old_state))
+			if (handle_8021x_or_psk_auth_fail (self, new_state, old_state, disconnect_reason))
 				break;
 		}
 
@@ -2292,8 +2488,10 @@ supplicant_iface_state_cb (NMSupplicantInterface *iface,
 		 * the scan but will be re-established when the scan is done.
 		 */
 		if (devstate == NM_DEVICE_STATE_ACTIVATED) {
-			if (priv->link_timeout_id == 0)
+			if (priv->link_timeout_id == 0) {
 				priv->link_timeout_id = g_timeout_add_seconds (scanning ? 30 : 15, link_timeout_cb, self);
+				priv->ssid_found = FALSE;
+			}
 		}
 		break;
 	case NM_SUPPLICANT_INTERFACE_STATE_DOWN:
@@ -2388,6 +2586,7 @@ supplicant_iface_notify_scanning_cb (NMSupplicantInterface *iface,
                                      GParamSpec *pspec,
                                      NMDeviceWifi *self)
 {
+	NMDeviceState state;
 	gboolean scanning;
 
 	scanning = nm_supplicant_interface_get_scanning (iface);
@@ -2396,6 +2595,11 @@ supplicant_iface_notify_scanning_cb (NMSupplicantInterface *iface,
 	            scanning ? "scanning" : "idle");
 
 	g_object_notify (G_OBJECT (self), "scanning");
+
+	/* Run a quick update of current AP when coming out of a scan */
+	state = nm_device_get_state (NM_DEVICE (self));
+	if (!scanning && state == NM_DEVICE_STATE_ACTIVATED)
+		periodic_update (self);
 }
 
 static void
@@ -2444,10 +2648,7 @@ handle_auth_or_fail (NMDeviceWifi *self,
 	if (setting_name) {
 		NMSettingsGetSecretsFlags flags = NM_SETTINGS_GET_SECRETS_FLAG_ALLOW_INTERACTION;
 
-		/* If the caller doesn't necessarily want completely new secrets,
-		 * only ask for new secrets after the first failure.
-		 */
-		if (new_secrets || tries)
+		if (new_secrets)
 			flags |= NM_SETTINGS_GET_SECRETS_FLAG_REQUEST_NEW;
 		nm_act_request_get_secrets (req, setting_name, flags, NULL, wifi_secrets_cb, self);
 
@@ -2493,6 +2694,7 @@ supplicant_connection_timeout_cb (gpointer user_data)
 {
 	NMDevice *dev = NM_DEVICE (user_data);
 	NMDeviceWifi *self = NM_DEVICE_WIFI (user_data);
+	NMDeviceWifiPrivate *priv = NM_DEVICE_WIFI_GET_PRIVATE (self);
 	NMAccessPoint *ap;
 	NMActRequest *req;
 	NMConnection *connection;
@@ -2514,24 +2716,30 @@ supplicant_connection_timeout_cb (gpointer user_data)
 	connection = nm_act_request_get_connection (req);
 	g_assert (connection);
 
-	ap = nm_device_wifi_get_activation_ap (self);
-	g_assert (ap);
-
-	if (nm_ap_get_mode (ap) == NM_802_11_MODE_ADHOC) {
-		/* In Ad-Hoc mode there's nothing to check the encryption key (if any)
-		 * so supplicant timeouts here are almost certainly the wifi driver
-		 * being really stupid.
+	if (   priv->mode == NM_802_11_MODE_ADHOC
+	    || priv->mode == NM_802_11_MODE_AP) {
+		/* In Ad-Hoc and AP modes there's nothing to check the encryption key
+		 * (if any), so supplicant timeouts here are almost certainly the wifi
+		 * driver being really stupid.
 		 */
 		nm_log_warn (LOGD_DEVICE | LOGD_WIFI,
-		             "Activation (%s/wireless): Ad-Hoc network creation took "
+		             "Activation (%s/wireless): %s network creation took "
 		             "too long, failing activation.",
-		             nm_device_get_iface (dev));
+		             nm_device_get_iface (dev),
+		             priv->mode == NM_802_11_MODE_ADHOC ? "Ad-Hoc" : "Hotspot");
 		nm_device_state_changed (dev, NM_DEVICE_STATE_FAILED,
 		                         NM_DEVICE_STATE_REASON_SUPPLICANT_TIMEOUT);
 		return FALSE;
 	}
 
-	if (is_encrypted (ap, connection)) {
+	g_assert (priv->mode == NM_802_11_MODE_INFRA);
+	ap = nm_device_wifi_get_activation_ap (self);
+	g_assert (ap);
+
+	if (priv->ssid_found && is_encrypted (ap, connection)) {
+		guint64 timestamp = 0;
+		gboolean new_secrets = TRUE;
+
 		/* Connection failed; either driver problems, the encryption key is
 		 * wrong, or the passwords or certificates were wrong.
 		 */
@@ -2539,7 +2747,15 @@ supplicant_connection_timeout_cb (gpointer user_data)
 		             "Activation (%s/wireless): association took too long.",
 		             nm_device_get_iface (dev));
 
-		if (handle_auth_or_fail (self, req, TRUE) == NM_ACT_STAGE_RETURN_POSTPONE) {
+		/* Ask for new secrets only if we've never activated this connection
+		 * before.  If we've connected before, don't bother the user with
+		 * dialogs, just retry or fail, and if we never connect the user can
+		 * fix the password somewhere else.
+		 */
+		if (nm_settings_connection_get_timestamp (NM_SETTINGS_CONNECTION (connection), ×tamp))
+			new_secrets = !timestamp;
+
+		if (handle_auth_or_fail (self, req, new_secrets) == NM_ACT_STAGE_RETURN_POSTPONE) {
 			nm_log_warn (LOGD_DEVICE | LOGD_WIFI,
 			             "Activation (%s/wireless): asking for new secrets",
 			             nm_device_get_iface (dev));
@@ -2553,7 +2769,8 @@ supplicant_connection_timeout_cb (gpointer user_data)
 		             "failing activation.",
 		             nm_device_get_iface (dev));
 		nm_device_state_changed (dev, NM_DEVICE_STATE_FAILED,
-		                         NM_DEVICE_STATE_REASON_SUPPLICANT_TIMEOUT);
+		                         priv->ssid_found ? NM_DEVICE_STATE_REASON_SUPPLICANT_TIMEOUT :
+		                                            NM_DEVICE_STATE_REASON_SSID_NOT_FOUND);
 	}
 
 	return FALSE;
@@ -2602,7 +2819,6 @@ build_supplicant_config (NMDeviceWifi *self,
 	NMSupplicantConfig *config = NULL;
 	NMSettingWireless *s_wireless;
 	NMSettingWirelessSecurity *s_wireless_sec;
-	guint32 adhoc_freq = 0;
 
 	g_return_val_if_fail (self != NULL, NULL);
 
@@ -2613,35 +2829,16 @@ build_supplicant_config (NMDeviceWifi *self,
 	if (!config)
 		return NULL;
 
-	/* Supplicant requires an initial frequency for Ad-Hoc networks; if the user
-	 * didn't specify one and we didn't find an AP that matched the connection,
-	 * just pick a frequency the device supports.
-	 */
-	if (nm_ap_get_mode (ap) == NM_802_11_MODE_ADHOC) {
-		const char *band = nm_setting_wireless_get_band (s_wireless);
-		const guint32 a_freqs[] = { 5180, 5200, 5220, 5745, 5765, 5785, 5805, 0 };
-		const guint32 bg_freqs[] = { 2412, 2437, 2462, 2472, 0 };
-
-		adhoc_freq = nm_ap_get_freq (ap);
-		if (!adhoc_freq) {
-			if (g_strcmp0 (band, "a") == 0)
-				adhoc_freq = wifi_utils_find_freq (priv->wifi_data, a_freqs);
-			else
-				adhoc_freq = wifi_utils_find_freq (priv->wifi_data, bg_freqs);
-		}
-
-		if (!adhoc_freq) {
-			if (g_strcmp0 (band, "a") == 0)
-				adhoc_freq = 5180;
-			else
-				adhoc_freq = 2462;
-		}
+	/* Warn if AP mode may not be supported */
+	if (   g_strcmp0 (nm_setting_wireless_get_mode (s_wireless), NM_SETTING_WIRELESS_MODE_AP) == 0
+	    && nm_supplicant_interface_get_ap_support (priv->supplicant.iface) == AP_SUPPORT_UNKNOWN) {
+		nm_log_warn (LOGD_WIFI, "Supplicant may not support AP mode; connection may time out.");
 	}
 
 	if (!nm_supplicant_config_add_setting_wireless (config,
 	                                                s_wireless,
 	                                                nm_ap_get_broadcast (ap),
-	                                                adhoc_freq,
+	                                                nm_ap_get_freq (ap),
 	                                                wifi_utils_can_scan_ssid (priv->wifi_data))) {
 		nm_log_err (LOGD_WIFI, "Couldn't add 802-11-wireless setting to supplicant config.");
 		goto error;
@@ -2679,7 +2876,7 @@ error:
 /****************************************************************************/
 
 static void
-real_update_hw_address (NMDevice *dev)
+update_hw_address (NMDevice *dev)
 {
 	NMDeviceWifi *self = NM_DEVICE_WIFI (dev);
 	struct ifreq req;
@@ -2704,7 +2901,7 @@ real_update_hw_address (NMDevice *dev)
 }
 
 static void
-real_update_permanent_hw_address (NMDevice *dev)
+update_permanent_hw_address (NMDevice *dev)
 {
 	NMDeviceWifi *self = NM_DEVICE_WIFI (dev);
 	NMDeviceWifiPrivate *priv = NM_DEVICE_WIFI_GET_PRIVATE (self);
@@ -2746,7 +2943,7 @@ real_update_permanent_hw_address (NMDevice *dev)
 }
 
 static void
-real_update_initial_hw_address (NMDevice *dev)
+update_initial_hw_address (NMDevice *dev)
 {
 	NMDeviceWifi *self = NM_DEVICE_WIFI (dev);
 	NMDeviceWifiPrivate *priv = NM_DEVICE_WIFI_GET_PRIVATE (self);
@@ -2758,7 +2955,7 @@ real_update_initial_hw_address (NMDevice *dev)
 	 * be called from NMDevice constructor() to really get the initial address.
 	 */
 	if (!memcmp (&priv->hw_addr, &zero, ETH_ALEN))
-		real_update_hw_address (dev);
+		update_hw_address (dev);
 
 	if (memcmp (&priv->initial_hw_addr, &priv->hw_addr, ETH_ALEN))
 		memcpy (&priv->initial_hw_addr, &priv->hw_addr, ETH_ALEN);
@@ -2773,7 +2970,7 @@ real_update_initial_hw_address (NMDevice *dev)
 }
 
 static NMActStageReturn
-real_act_stage1_prepare (NMDevice *dev, NMDeviceStateReason *reason)
+act_stage1_prepare (NMDevice *dev, NMDeviceStateReason *reason)
 {
 	NMDeviceWifi *self = NM_DEVICE_WIFI (dev);
 	NMDeviceWifiPrivate *priv = NM_DEVICE_WIFI_GET_PRIVATE (self);
@@ -2783,6 +2980,7 @@ real_act_stage1_prepare (NMDevice *dev, NMDeviceStateReason *reason)
 	NMSettingWireless *s_wireless;
 	const GByteArray *cloned_mac;
 	GSList *iter;
+	const char *mode;
 
 	req = nm_device_get_act_request (NM_DEVICE (self));
 	g_return_val_if_fail (req != NULL, NM_ACT_STAGE_RETURN_FAILURE);
@@ -2790,6 +2988,22 @@ real_act_stage1_prepare (NMDevice *dev, NMDeviceStateReason *reason)
 	connection = nm_act_request_get_connection (req);
 	g_return_val_if_fail (connection != NULL, NM_ACT_STAGE_RETURN_FAILURE);
 
+	s_wireless = nm_connection_get_setting_wireless (connection);
+	g_assert (s_wireless);
+
+	mode = nm_setting_wireless_get_mode (s_wireless);
+	if (g_strcmp0 (mode, "infra") == 0)
+		priv->mode = NM_802_11_MODE_INFRA;
+	else if (g_strcmp0 (mode, "adhoc") == 0)
+		priv->mode = NM_802_11_MODE_ADHOC;
+	else if (g_strcmp0 (mode, "ap") == 0) {
+		priv->mode = NM_802_11_MODE_AP;
+
+		/* Scanning not done in AP mode; clear the scan list */
+		remove_all_aps (self);
+	}
+	g_object_notify (G_OBJECT (self), NM_DEVICE_WIFI_MODE);
+
 	/* The kernel doesn't support Ad-Hoc WPA connections well at this time,
 	 * and turns them into open networks.  It's been this way since at least
 	 * 2.6.30 or so; until that's fixed, disable WPA-protected Ad-Hoc networks.
@@ -2801,34 +3015,32 @@ real_act_stage1_prepare (NMDevice *dev, NMDeviceStateReason *reason)
 	}
 
 	/* Set spoof MAC to the interface */
-	s_wireless = nm_connection_get_setting_wireless (connection);
-	g_assert (s_wireless);
-
 	cloned_mac = nm_setting_wireless_get_cloned_mac_address (s_wireless);
 	if (cloned_mac && (cloned_mac->len == ETH_ALEN))
 		_set_hw_addr (self, (const guint8 *) cloned_mac->data, "set");
 
-	/* If the user is trying to connect to an AP that NM doesn't yet know about
-	 * (hidden network or something), create an fake AP from the security
-	 * settings in the connection to use until the AP is recognized from the
-	 * scan list, which should show up when the connection is successful.
-	 */
-	ap = nm_device_wifi_get_activation_ap (self);
-	if (ap)
-		goto done;
+	/* AP mode never uses a specific object or existing scanned AP */
+	if (priv->mode != NM_802_11_MODE_AP) {
+		ap = nm_device_wifi_get_activation_ap (self);
+		if (ap)
+			goto done;
 
-	/* Find a compatible AP in the scan list */
-	for (iter = priv->ap_list; iter; iter = g_slist_next (iter)) {
-		NMAccessPoint *candidate = NM_AP (iter->data);
+		/* Find a compatible AP in the scan list */
+		for (iter = priv->ap_list; iter; iter = g_slist_next (iter)) {
+			NMAccessPoint *candidate = NM_AP (iter->data);
 
-		if (nm_ap_check_compatible (candidate, connection)) {
-			ap = candidate;
-			break;
+			if (nm_ap_check_compatible (candidate, connection)) {
+				ap = candidate;
+				break;
+			}
 		}
 	}
 
-	/* If no compatible AP was found, create a fake AP (network is likely
-	 * hidden) and try to use that.
+	/* If the user is trying to connect to an AP that NM doesn't yet know about
+	 * (hidden network or something) or starting a Hotspot, create an fake AP
+	 * from the security settings in the connection.  This "fake" AP gets used
+	 * until the real one is found in the scan list (Ad-Hoc or Hidden), or until
+	 * the device is deactivated (Hotspot).
 	 */
 	if (!ap) {
 		ap = nm_ap_new_fake_from_connection (connection);
@@ -2836,21 +3048,51 @@ real_act_stage1_prepare (NMDevice *dev, NMDeviceStateReason *reason)
 
 		if (nm_ap_get_mode (ap) == NM_802_11_MODE_INFRA)
 			nm_ap_set_broadcast (ap, FALSE);
+		else if (nm_ap_is_hotspot (ap))
+			nm_ap_set_address (ap, (const struct ether_addr *) &priv->hw_addr);
 
 		priv->ap_list = g_slist_prepend (priv->ap_list, ap);
 		nm_ap_export_to_dbus (ap);
 		g_signal_emit (self, signals[ACCESS_POINT_ADDED], 0, ap);
+		nm_device_recheck_available_connections (NM_DEVICE (self));
 	}
 
 	nm_active_connection_set_specific_object (NM_ACTIVE_CONNECTION (req), nm_ap_get_dbus_path (ap));
 
 done:
-	set_current_ap (self, ap);
+	set_active_ap (self, ap);
 	return NM_ACT_STAGE_RETURN_SUCCESS;
 }
 
+static void
+ensure_hotspot_frequency (NMDeviceWifi *self,
+                          NMSettingWireless *s_wifi,
+                          NMAccessPoint *ap)
+{
+	NMDeviceWifiPrivate *priv = NM_DEVICE_WIFI_GET_PRIVATE (self);
+	const char *band = nm_setting_wireless_get_band (s_wifi);
+	const guint32 a_freqs[] = { 5180, 5200, 5220, 5745, 5765, 5785, 5805, 0 };
+	const guint32 bg_freqs[] = { 2412, 2437, 2462, 2472, 0 };
+	guint32 freq = 0;
+
+	g_assert (ap);
+
+	if (nm_ap_get_freq (ap))
+		return;
+
+	if (g_strcmp0 (band, "a") == 0)
+		freq = wifi_utils_find_freq (priv->wifi_data, a_freqs);
+	else
+		freq = wifi_utils_find_freq (priv->wifi_data, bg_freqs);
+
+	if (!freq)
+		freq = (g_strcmp0 (band, "a") == 0) ? 5180 : 2462;
+
+	nm_ap_set_freq (ap, freq);
+}
+
 static NMActStageReturn
-real_act_stage2_config (NMDevice *dev, NMDeviceStateReason *reason)
+act_stage2_config (NMDevice *dev, NMDeviceStateReason *reason)
 {
 	NMDeviceWifi *self = NM_DEVICE_WIFI (dev);
 	NMDeviceWifiPrivate *priv = NM_DEVICE_WIFI_GET_PRIVATE (self);
@@ -2907,6 +3149,16 @@ real_act_stage2_config (NMDevice *dev, NMDeviceStateReason *reason)
 		             iface, nm_connection_get_id (connection));
 	}
 
+	priv->ssid_found = FALSE;
+
+	/* Supplicant requires an initial frequency for Ad-Hoc and Hotspot; if the user
+	 * didn't specify one and we didn't find an AP that matched the connection,
+	 * just pick a frequency the device supports.
+	 */
+	if ((nm_ap_get_mode (ap) == NM_802_11_MODE_ADHOC) || nm_ap_is_hotspot (ap))
+		ensure_hotspot_frequency (self, s_wireless, ap);
+
+	/* Build up the supplicant configuration */
 	config = build_supplicant_config (self, connection, ap);
 	if (config == NULL) {
 		nm_log_err (LOGD_DEVICE | LOGD_WIFI,
@@ -2953,7 +3205,7 @@ out:
 }
 
 static void
-real_ip4_config_pre_commit (NMDevice *device, NMIP4Config *config)
+ip4_config_pre_commit (NMDevice *device, NMIP4Config *config)
 {
 	NMConnection *connection;
 	NMSettingWireless *s_wifi;
@@ -3011,6 +3263,11 @@ handle_ip_config_timeout (NMDeviceWifi *self,
 
 	g_return_val_if_fail (connection != NULL, NM_ACT_STAGE_RETURN_FAILURE);
 
+	if (NM_DEVICE_WIFI_GET_PRIVATE (self)->mode == NM_802_11_MODE_AP) {
+		*chain_up = TRUE;
+		return ret;
+	}
+
 	ap = nm_device_wifi_get_activation_ap (self);
 	g_assert (ap);
 
@@ -3047,7 +3304,7 @@ handle_ip_config_timeout (NMDeviceWifi *self,
 
 
 static NMActStageReturn
-real_act_stage4_ip4_config_timeout (NMDevice *dev, NMDeviceStateReason *reason)
+act_stage4_ip4_config_timeout (NMDevice *dev, NMDeviceStateReason *reason)
 {
 	NMConnection *connection;
 	NMSettingIP4Config *s_ip4;
@@ -3069,7 +3326,7 @@ real_act_stage4_ip4_config_timeout (NMDevice *dev, NMDeviceStateReason *reason)
 }
 
 static NMActStageReturn
-real_act_stage4_ip6_config_timeout (NMDevice *dev, NMDeviceStateReason *reason)
+act_stage4_ip6_config_timeout (NMDevice *dev, NMDeviceStateReason *reason)
 {
 	NMConnection *connection;
 	NMSettingIP6Config *s_ip6;
@@ -3163,7 +3420,6 @@ static void
 activation_failure_handler (NMDevice *dev)
 {
 	NMDeviceWifi *self = NM_DEVICE_WIFI (dev);
-	NMDeviceWifiPrivate *priv = NM_DEVICE_WIFI_GET_PRIVATE (self);
 	NMAccessPoint *ap;
 	NMConnection *connection;
 
@@ -3181,15 +3437,13 @@ activation_failure_handler (NMDevice *dev)
 			 * list because we don't have any scan or capability info
 			 * for it, and they are pretty much useless.
 			 */
-			access_point_removed (self, ap);
-			priv->ap_list = g_slist_remove (priv->ap_list, ap);
-			g_object_unref (ap);
+			remove_access_point (self, ap);
 		}
 	}
 }
 
 static gboolean
-real_can_interrupt_activation (NMDevice *dev)
+can_interrupt_activation (NMDevice *dev)
 {
 	if (nm_device_get_state (dev) == NM_DEVICE_STATE_NEED_AUTH)
 		return TRUE;
@@ -3199,7 +3453,7 @@ real_can_interrupt_activation (NMDevice *dev)
 
 
 static guint32
-real_get_type_capabilities (NMDevice *dev)
+get_type_capabilities (NMDevice *dev)
 {
 	return NM_DEVICE_WIFI_GET_PRIVATE (dev)->capabilities;
 }
@@ -3252,8 +3506,7 @@ static void
 device_state_changed (NMDevice *device,
                       NMDeviceState new_state,
                       NMDeviceState old_state,
-                      NMDeviceStateReason reason,
-                      gpointer user_data)
+                      NMDeviceStateReason reason)
 {
 	NMDeviceWifi *self = NM_DEVICE_WIFI (device);
 	NMDeviceWifiPrivate *priv = NM_DEVICE_WIFI_GET_PRIVATE (self);
@@ -3306,7 +3559,10 @@ device_state_changed (NMDevice *device,
 		activation_failure_handler (device);
 		break;
 	case NM_DEVICE_STATE_DISCONNECTED:
-		// FIXME: ensure that the activation request is destroyed
+		/* Kick off a scan to get latest results */
+		priv->scan_interval = SCAN_INTERVAL_MIN;
+		cancel_pending_scan (self);
+		request_wireless_scan (self);
 		break;
 	default:
 		break;
@@ -3334,7 +3590,7 @@ nm_device_wifi_get_activation_ap (NMDeviceWifi *self)
 }
 
 static void
-real_set_enabled (NMDevice *device, gboolean enabled)
+set_enabled (NMDevice *device, gboolean enabled)
 {
 	NMDeviceWifi *self = NM_DEVICE_WIFI (device);
 	NMDeviceWifiPrivate *priv = NM_DEVICE_WIFI_GET_PRIVATE (self);
@@ -3413,9 +3669,9 @@ nm_device_wifi_new (const char *udi,
 }
 
 static void
-nm_device_wifi_init (NMDeviceWifi * self)
+nm_device_wifi_init (NMDeviceWifi *self)
 {
-	g_signal_connect (self, "state-changed", G_CALLBACK (device_state_changed), NULL);
+	NM_DEVICE_WIFI_GET_PRIVATE (self)->mode = NM_802_11_MODE_INFRA;
 }
 
 static void
@@ -3444,7 +3700,7 @@ dispose (GObject *object)
 		priv->supplicant.mgr = NULL;
 	}
 
-	set_current_ap (self, NULL);
+	set_active_ap (self, NULL);
 	remove_all_aps (self);
 
 	if (priv->wifi_data)
@@ -3474,7 +3730,7 @@ get_property (GObject *object, guint prop_id,
 		g_value_take_string (value, nm_utils_hwaddr_ntoa (&priv->perm_hw_addr, ARPHRD_ETHER));
 		break;
 	case PROP_MODE:
-		g_value_set_uint (value, wifi_utils_get_mode (priv->wifi_data));
+		g_value_set_uint (value, priv->mode);
 		break;
 	case PROP_BITRATE:
 		g_value_set_uint (value, priv->rate);
@@ -3531,33 +3787,36 @@ nm_device_wifi_class_init (NMDeviceWifiClass *klass)
 	object_class->set_property = set_property;
 	object_class->dispose = dispose;
 
-	parent_class->get_type_capabilities = real_get_type_capabilities;
-	parent_class->get_generic_capabilities = real_get_generic_capabilities;
-	parent_class->hw_is_up = real_hw_is_up;
-	parent_class->hw_bring_up = real_hw_bring_up;
-	parent_class->hw_take_down = real_hw_take_down;
-	parent_class->is_up = real_is_up;
-	parent_class->bring_up = real_bring_up;
-	parent_class->take_down = real_take_down;
-	parent_class->update_hw_address = real_update_hw_address;
-	parent_class->update_permanent_hw_address = real_update_permanent_hw_address;
-	parent_class->update_initial_hw_address = real_update_initial_hw_address;
-	parent_class->get_best_auto_connection = real_get_best_auto_connection;
-	parent_class->is_available = real_is_available;
-	parent_class->check_connection_compatible = real_check_connection_compatible;
-	parent_class->complete_connection = real_complete_connection;
-	parent_class->set_enabled = real_set_enabled;
-
-	parent_class->act_stage1_prepare = real_act_stage1_prepare;
-	parent_class->act_stage2_config = real_act_stage2_config;
-	parent_class->ip4_config_pre_commit = real_ip4_config_pre_commit;
-	parent_class->act_stage4_ip4_config_timeout = real_act_stage4_ip4_config_timeout;
-	parent_class->act_stage4_ip6_config_timeout = real_act_stage4_ip6_config_timeout;
-	parent_class->deactivate = real_deactivate;
-	parent_class->can_interrupt_activation = real_can_interrupt_activation;
+	parent_class->get_type_capabilities = get_type_capabilities;
+	parent_class->get_generic_capabilities = get_generic_capabilities;
+	parent_class->hw_is_up = hw_is_up;
+	parent_class->hw_bring_up = hw_bring_up;
+	parent_class->hw_take_down = hw_take_down;
+	parent_class->is_up = is_up;
+	parent_class->bring_up = bring_up;
+	parent_class->take_down = take_down;
+	parent_class->update_hw_address = update_hw_address;
+	parent_class->update_permanent_hw_address = update_permanent_hw_address;
+	parent_class->update_initial_hw_address = update_initial_hw_address;
+	parent_class->get_best_auto_connection = get_best_auto_connection;
+	parent_class->is_available = is_available;
+	parent_class->check_connection_compatible = check_connection_compatible;
+	parent_class->check_connection_available = check_connection_available;
+	parent_class->complete_connection = complete_connection;
+	parent_class->set_enabled = set_enabled;
+
+	parent_class->act_stage1_prepare = act_stage1_prepare;
+	parent_class->act_stage2_config = act_stage2_config;
+	parent_class->ip4_config_pre_commit = ip4_config_pre_commit;
+	parent_class->act_stage4_ip4_config_timeout = act_stage4_ip4_config_timeout;
+	parent_class->act_stage4_ip6_config_timeout = act_stage4_ip6_config_timeout;
+	parent_class->deactivate = deactivate;
+	parent_class->can_interrupt_activation = can_interrupt_activation;
 	parent_class->spec_match_list = spec_match_list;
 	parent_class->hwaddr_matches = hwaddr_matches;
 
+	parent_class->state_changed = device_state_changed;
+
 	klass->scanning_allowed = scanning_allowed;
 
 	/* Properties */
@@ -3580,7 +3839,7 @@ nm_device_wifi_class_init (NMDeviceWifiClass *klass)
 		                   "Mode",
 		                   "Mode",
 		                   NM_802_11_MODE_UNKNOWN,
-		                   NM_802_11_MODE_INFRA,
+		                   NM_802_11_MODE_AP,
 		                   NM_802_11_MODE_INFRA,
 		                   G_PARAM_READABLE));
 
@@ -3634,7 +3893,7 @@ nm_device_wifi_class_init (NMDeviceWifiClass *klass)
 		g_signal_new ("access-point-removed",
 		              G_OBJECT_CLASS_TYPE (object_class),
 		              G_SIGNAL_RUN_FIRST,
-		              G_STRUCT_OFFSET (NMDeviceWifiClass, access_point_removed),
+		              0,
 		              NULL, NULL,
 		              g_cclosure_marshal_VOID__OBJECT,
 		              G_TYPE_NONE, 1,
diff --git a/src/nm-device-wifi.h b/src/nm-device-wifi.h
index b22c78b3..26d66ffc 100644
--- a/src/nm-device-wifi.h
+++ b/src/nm-device-wifi.h
@@ -47,6 +47,7 @@ typedef enum {
 	NM_WIFI_ERROR_CONNECTION_INCOMPATIBLE,     /*< nick=ConnectionIncompatible >*/
 	NM_WIFI_ERROR_ACCESS_POINT_NOT_FOUND,      /*< nick=AccessPointNotFound >*/
 	NM_WIFI_ERROR_SCAN_NOT_ALLOWED,            /*< nick=ScanNotAllowed >*/
+	NM_WIFI_ERROR_AP_MODE_UNSUPPORTED,         /*< nick=ApModeUnsupported >*/
 } NMWifiError;
 
 #define NM_DEVICE_WIFI_HW_ADDRESS          "hw-address"
diff --git a/src/nm-device-wired.c b/src/nm-device-wired.c
index c1122e55..44510fc6 100644
--- a/src/nm-device-wired.c
+++ b/src/nm-device-wired.c
@@ -311,6 +311,9 @@ constructor (GType type,
 		/* We may not know the hardware address type until a slave is added */
 		priv->hw_addr_type = ARPHRD_ETHER;
 		priv->hw_addr_len = ETH_ALEN;
+	} else if (nm_device_get_device_type (self) == NM_DEVICE_TYPE_BRIDGE) {
+		priv->hw_addr_type = ARPHRD_ETHER;
+		priv->hw_addr_len = ETH_ALEN;
 	} else
 		g_assert_not_reached ();
 
@@ -354,13 +357,13 @@ nm_device_wired_init (NMDeviceWired * self)
 }
 
 static gboolean
-real_hw_is_up (NMDevice *device)
+hw_is_up (NMDevice *device)
 {
 	return nm_system_iface_is_up (nm_device_get_ip_ifindex (device));
 }
 
 static gboolean
-real_hw_bring_up (NMDevice *dev, gboolean *no_firmware)
+hw_bring_up (NMDevice *dev, gboolean *no_firmware)
 {
 	gboolean success, carrier;
 	guint32 caps;
@@ -377,13 +380,13 @@ real_hw_bring_up (NMDevice *dev, gboolean *no_firmware)
 }
 
 static void
-real_hw_take_down (NMDevice *dev)
+hw_take_down (NMDevice *dev)
 {
 	nm_system_iface_set_up (nm_device_get_ip_ifindex (dev), FALSE, NULL);
 }
 
 static void
-real_update_hw_address (NMDevice *dev)
+update_hw_address (NMDevice *dev)
 {
 	NMDeviceWired *self = NM_DEVICE_WIRED (dev);
 	NMDeviceWiredPrivate *priv = NM_DEVICE_WIRED_GET_PRIVATE (self);
@@ -421,7 +424,7 @@ real_update_hw_address (NMDevice *dev)
 }
 
 static gboolean
-real_can_interrupt_activation (NMDevice *dev)
+can_interrupt_activation (NMDevice *dev)
 {
 	NMDeviceWired *self = NM_DEVICE_WIRED (dev);
 	gboolean interrupt = FALSE;
@@ -437,7 +440,7 @@ real_can_interrupt_activation (NMDevice *dev)
 }
 
 static gboolean
-real_is_available (NMDevice *dev)
+is_available (NMDevice *dev)
 {
 	NMDeviceWired *self = NM_DEVICE_WIRED (dev);
 
@@ -502,12 +505,12 @@ nm_device_wired_class_init (NMDeviceWiredClass *klass)
 	object_class->constructor = constructor;
 	object_class->dispose = dispose;
 
-	parent_class->hw_is_up = real_hw_is_up;
-	parent_class->hw_bring_up = real_hw_bring_up;
-	parent_class->hw_take_down = real_hw_take_down;
-	parent_class->can_interrupt_activation = real_can_interrupt_activation;
-	parent_class->update_hw_address = real_update_hw_address;
-	parent_class->is_available = real_is_available;
+	parent_class->hw_is_up = hw_is_up;
+	parent_class->hw_bring_up = hw_bring_up;
+	parent_class->hw_take_down = hw_take_down;
+	parent_class->can_interrupt_activation = can_interrupt_activation;
+	parent_class->update_hw_address = update_hw_address;
+	parent_class->is_available = is_available;
 	parent_class->connection_match_config = connection_match_config;
 }
 
diff --git a/src/nm-device.c b/src/nm-device.c
index cfd3ba56..c4cfbce0 100644
--- a/src/nm-device.c
+++ b/src/nm-device.c
@@ -40,7 +40,7 @@
 #include "nm-glib-compat.h"
 #include "nm-device.h"
 #include "nm-device-private.h"
-#include "backends/nm-backend.h"
+#include "nm-device-ethernet.h"
 #include "NetworkManagerUtils.h"
 #include "nm-system.h"
 #include "nm-dhcp-manager.h"
@@ -65,6 +65,8 @@
 #include "nm-connection-provider.h"
 #include "nm-posix-signals.h"
 #include "nm-manager-auth.h"
+#include "nm-dbus-glib-types.h"
+#include "nm-dispatcher.h"
 
 static void impl_device_disconnect (NMDevice *device, DBusGMethodInvocation *context);
 
@@ -123,6 +125,7 @@ enum {
 	PROP_TYPE_DESC,
 	PROP_RFKILL_TYPE,
 	PROP_IFINDEX,
+	PROP_AVAILABLE_CONNECTIONS,
 	LAST_PROP
 };
 
@@ -136,6 +139,7 @@ G_DEFINE_ABSTRACT_TYPE (NMDevice, nm_device, G_TYPE_OBJECT)
 
 typedef enum {
 	IP_NONE = 0,
+	IP_WAIT,
 	IP_CONF,
 	IP_DONE
 } IpState;
@@ -146,6 +150,12 @@ typedef struct {
 	guint id;
 } QueuedState;
 
+typedef struct {
+	NMDevice *slave;
+	gboolean enslaved;
+	guint watch_id;
+} SlaveInfo;
+
 typedef struct {
 	gboolean disposed;
 	gboolean initialized;
@@ -169,6 +179,7 @@ typedef struct {
 	gboolean      managed; /* whether managed by NM or not */
 	RfKillType    rfkill_type;
 	gboolean      firmware_missing;
+	GHashTable *  available_connections;
 
 	guint32         ip4_address;
 
@@ -177,8 +188,6 @@ typedef struct {
 	gpointer        act_source_func;
 	guint           act_source6_id;
 	gpointer        act_source6_func;
-	guint           act_dep_result_id;
-	guint           act_dep_timeout_id;
 	gulong          secrets_updated_id;
 	gulong          secrets_failed_id;
 
@@ -237,10 +246,20 @@ typedef struct {
 	/* allow autoconnect feature */
 	gboolean        autoconnect;
 
-	/* master interface for bridge, bond, vlan, etc */
-	NMDevice *	master;
+	/* master interface for bridge/bond slave */
+	NMDevice *      master;
+	gboolean        enslaved;
+
+	/* list of SlaveInfo for bond/bridge master */
+	GSList *        slaves;
 
 	NMConnectionProvider *con_provider;
+
+	/* connection provider signals for available connections property */
+	guint cp_added_id;
+	guint cp_loaded_id;
+	guint cp_removed_id;
+	guint cp_updated_id;
 } NMDevicePrivate;
 
 static void nm_device_take_down (NMDevice *dev, gboolean wait, NMDeviceStateReason reason);
@@ -258,10 +277,21 @@ static gboolean nm_device_set_ip6_config (NMDevice *dev,
 
 static gboolean nm_device_activate_ip6_config_commit (gpointer user_data);
 
+static gboolean check_connection_available (NMDevice *device, NMConnection *connection);
+
+static void _clear_available_connections (NMDevice *device, gboolean do_signal);
+
 static void dhcp4_cleanup (NMDevice *self, gboolean stop, gboolean release);
 
 static const char *reason_to_string (NMDeviceStateReason reason);
 
+static void cp_connection_added (NMConnectionProvider *cp, NMConnection *connection, gpointer user_data);
+static void cp_connections_loaded (NMConnectionProvider *cp, NMConnection *connection, gpointer user_data);
+static void cp_connection_removed (NMConnectionProvider *cp, NMConnection *connection, gpointer user_data);
+static void cp_connection_updated (NMConnectionProvider *cp, NMConnection *connection, gpointer user_data);
+
+static const char *state_to_string (NMDeviceState state);
+
 static void
 nm_device_init (NMDevice *self)
 {
@@ -274,6 +304,7 @@ nm_device_init (NMDevice *self)
 	priv->dhcp_timeout = 0;
 	priv->rfkill_type = RFKILL_TYPE_UNKNOWN;
 	priv->autoconnect = DEFAULT_AUTOCONNECT;
+	priv->available_connections = g_hash_table_new_full (g_direct_hash, g_direct_equal, g_object_unref, NULL);
 }
 
 static void
@@ -468,7 +499,7 @@ nm_device_hw_is_up (NMDevice *self)
 }
 
 static guint32
-real_get_generic_capabilities (NMDevice *dev)
+get_generic_capabilities (NMDevice *dev)
 {
 	return 0;
 }
@@ -685,7 +716,7 @@ nm_device_get_type_capabilities (NMDevice *self)
 }
 
 static guint32
-real_get_type_capabilities (NMDevice *self)
+get_type_capabilities (NMDevice *self)
 {
 	return NM_DEVICE_CAP_NONE;
 }
@@ -713,6 +744,25 @@ nm_device_set_connection_provider (NMDevice *device,
 	g_return_if_fail (priv->con_provider == NULL);
 
 	priv->con_provider = provider;
+	priv->cp_added_id = g_signal_connect (priv->con_provider,
+	                                      NM_CP_SIGNAL_CONNECTION_ADDED,
+	                                      G_CALLBACK (cp_connection_added),
+	                                      device);
+
+	priv->cp_loaded_id = g_signal_connect (priv->con_provider,
+	                                       NM_CP_SIGNAL_CONNECTIONS_LOADED,
+	                                       G_CALLBACK (cp_connections_loaded),
+	                                       device);
+
+	priv->cp_removed_id = g_signal_connect (priv->con_provider,
+	                                        NM_CP_SIGNAL_CONNECTION_REMOVED,
+	                                        G_CALLBACK (cp_connection_removed),
+	                                        device);
+
+	priv->cp_updated_id = g_signal_connect (priv->con_provider,
+	                                        NM_CP_SIGNAL_CONNECTION_UPDATED,
+	                                        G_CALLBACK (cp_connection_updated),
+	                                        device);
 }
 
 NMConnectionProvider *
@@ -723,10 +773,35 @@ nm_device_get_connection_provider (NMDevice *device)
 	return NM_DEVICE_GET_PRIVATE (device)->con_provider;
 }
 
+static SlaveInfo *
+find_slave_info (NMDevice *self, NMDevice *slave)
+{
+	NMDevicePrivate *priv = NM_DEVICE_GET_PRIVATE (self);
+	SlaveInfo *info;
+	GSList *iter;
+
+	for (iter = priv->slaves; iter; iter = g_slist_next (iter)) {
+		info = iter->data;
+		if (info->slave == slave)
+			return info;
+	}
+	return NULL;
+}
+
+static void
+free_slave_info (SlaveInfo *info)
+{
+	g_signal_handler_disconnect (info->slave, info->watch_id);
+	g_clear_object (&info->slave);
+	memset (info, 0, sizeof (*info));
+	g_free (info);
+}
+
 /**
  * nm_device_enslave_slave:
  * @dev: the master device
  * @slave: the slave device to enslave
+ * @connection: the slave device's connection
  *
  * If @dev is capable of enslaving other devices (ie it's a bridge, bond, etc)
  * then this function enslaves @slave.
@@ -734,22 +809,35 @@ nm_device_get_connection_provider (NMDevice *device)
  * Returns: %TRUE on success, %FALSE on failure or if this device cannot enslave
  *  other devices.
  */
-gboolean
-nm_device_enslave_slave (NMDevice *dev, NMDevice *slave)
+static gboolean
+nm_device_enslave_slave (NMDevice *dev, NMDevice *slave, NMConnection *connection)
 {
+	SlaveInfo *info;
+	gboolean success = FALSE;
+
 	g_return_val_if_fail (dev != NULL, FALSE);
 	g_return_val_if_fail (slave != NULL, FALSE);
 	g_return_val_if_fail (nm_device_get_state (slave) >= NM_DEVICE_STATE_DISCONNECTED, FALSE);
+	g_return_val_if_fail (NM_DEVICE_GET_CLASS (dev)->enslave_slave != NULL, FALSE);
 
-	if (NM_DEVICE_GET_CLASS (dev)->enslave_slave)
-		return NM_DEVICE_GET_CLASS (dev)->enslave_slave (dev, slave);
-	return FALSE;
+	info = find_slave_info (dev, slave);
+	if (!info)
+		return FALSE;
+
+	g_warn_if_fail (info->enslaved == FALSE);
+	success = NM_DEVICE_GET_CLASS (dev)->enslave_slave (dev, slave, connection);
+	if (success) {
+		info->enslaved = TRUE;
+		nm_device_slave_notify_enslaved (info->slave, TRUE, FALSE);
+	}
+	return success;
 }
 
 /**
- * nm_device_release_slave:
+ * nm_device_release_one_slave:
  * @dev: the master device
  * @slave: the slave device to release
+ * @failed: %TRUE if the release was unexpected, ie the master failed
  *
  * If @dev is capable of enslaving other devices (ie it's a bridge, bond, etc)
  * then this function releases the previously enslaved @slave.
@@ -757,15 +845,197 @@ nm_device_enslave_slave (NMDevice *dev, NMDevice *slave)
  * Returns: %TRUE on success, %FALSE on failure, if this device cannot enslave
  *  other devices, or if @slave was never enslaved.
  */
+static gboolean
+nm_device_release_one_slave (NMDevice *dev, NMDevice *slave, gboolean failed)
+{
+	NMDevicePrivate *priv = NM_DEVICE_GET_PRIVATE (dev);
+	SlaveInfo *info;
+	gboolean success = FALSE;
+
+	g_return_val_if_fail (slave != NULL, FALSE);
+	g_return_val_if_fail (NM_DEVICE_GET_CLASS (dev)->release_slave != NULL, FALSE);
+
+	info = find_slave_info (dev, slave);
+	if (!info)
+		return FALSE;
+
+	if (info->enslaved) {
+		success = NM_DEVICE_GET_CLASS (dev)->release_slave (dev, slave);
+		g_warn_if_fail (success);
+	}
+	nm_device_slave_notify_enslaved (info->slave, FALSE, failed);
+
+	priv->slaves = g_slist_remove (priv->slaves, info);
+	free_slave_info (info);
+	return success;
+}
+
+static void
+slave_state_changed (NMDevice *slave,
+                     NMDeviceState slave_new_state,
+                     NMDeviceState slave_old_state,
+                     NMDeviceStateReason reason,
+                     NMDevice *self)
+{
+	NMDevicePrivate *priv = NM_DEVICE_GET_PRIVATE (self);
+	gboolean release = FALSE;
+
+	nm_log_dbg (LOGD_DEVICE, "(%s): slave %s state change %d (%s) -> %d (%s)",
+	            nm_device_get_iface (self),
+	            nm_device_get_iface (slave),
+	            slave_old_state,
+	            state_to_string (slave_old_state),
+	            slave_new_state,
+	            state_to_string (slave_new_state));
+
+	g_assert (priv->state > NM_DEVICE_STATE_DISCONNECTED);
+	g_assert (priv->state <= NM_DEVICE_STATE_ACTIVATED);
+
+	/* Don't try to enslave slaves until the master is ready */
+	if (priv->state < NM_DEVICE_STATE_CONFIG)
+		return;
+
+	if (slave_new_state == NM_DEVICE_STATE_IP_CONFIG)
+		nm_device_enslave_slave (self, slave, nm_device_get_connection (slave));
+	else if (slave_new_state > NM_DEVICE_STATE_ACTIVATED)
+		release = TRUE;
+	else if (   slave_new_state <= NM_DEVICE_STATE_DISCONNECTED
+	         && slave_old_state > NM_DEVICE_STATE_DISCONNECTED) {
+		/* Catch failures due to unavailable or unmanaged */
+		release = TRUE;
+	}
+
+	if (release) {
+		nm_device_release_one_slave (self, slave, FALSE);
+		if (priv->slaves == NULL) {
+			/* FIXME: all slaves gone; do something? */
+		}
+	}
+}
+
+/**
+ * nm_device_master_add_slave:
+ * @dev: the master device
+ * @slave: the slave device to enslave
+ *
+ * If @dev is capable of enslaving other devices (ie it's a bridge, bond, etc)
+ * then this function adds @slave to the slave list for later enslavement.
+ *
+ * Returns: %TRUE on success, %FALSE on failure
+ */
 gboolean
-nm_device_release_slave (NMDevice *dev, NMDevice *slave)
+nm_device_master_add_slave (NMDevice *dev, NMDevice *slave)
 {
+	NMDevicePrivate *priv = NM_DEVICE_GET_PRIVATE (dev);
+	SlaveInfo *info;
+
 	g_return_val_if_fail (dev != NULL, FALSE);
 	g_return_val_if_fail (slave != NULL, FALSE);
+	g_return_val_if_fail (nm_device_get_state (slave) >= NM_DEVICE_STATE_DISCONNECTED, FALSE);
+	g_return_val_if_fail (NM_DEVICE_GET_CLASS (dev)->enslave_slave != NULL, FALSE);
+
+	if (!find_slave_info (dev, slave)) {
+		info = g_malloc0 (sizeof (SlaveInfo));
+		info->slave = g_object_ref (slave);
+		info->watch_id = g_signal_connect (slave, "state-changed",
+		                                   G_CALLBACK (slave_state_changed), dev);
+		priv->slaves = g_slist_prepend (priv->slaves, info);
+	}
 
-	if (NM_DEVICE_GET_CLASS (dev)->release_slave)
-		return NM_DEVICE_GET_CLASS (dev)->release_slave (dev, slave);
-	return FALSE;
+	return TRUE;
+}
+
+
+/**
+ * nm_device_master_get_slaves:
+ * @dev: the master device
+ *
+ * Returns: any slaves of which @device is the master.  Caller owns returned list.
+ */
+GSList *
+nm_device_master_get_slaves (NMDevice *dev)
+{
+	NMDevicePrivate *priv = NM_DEVICE_GET_PRIVATE (dev);
+	GSList *slaves = NULL, *iter;
+
+	for (iter = priv->slaves; iter; iter = g_slist_next (iter))
+		slaves = g_slist_prepend (slaves, ((SlaveInfo *) iter->data)->slave);
+
+	return slaves;
+}
+
+/* release all slaves */
+static void
+nm_device_master_release_slaves (NMDevice *self, gboolean failed)
+{
+	NMDevicePrivate *priv = NM_DEVICE_GET_PRIVATE (self);
+	GSList *iter;
+
+	for (iter = priv->slaves; iter; iter = g_slist_next (iter))
+		nm_device_release_one_slave (self, ((SlaveInfo *) iter->data)->slave, failed);
+	g_slist_free (priv->slaves);
+	priv->slaves = NULL;
+}
+
+
+/**
+ * nm_device_slave_notify_enslaved:
+ * @dev: the slave device
+ * @enslaved: %TRUE if the device is now enslaved, %FALSE if released
+ * @master_failed: if released, indicates whether the release was unexpected,
+ *   ie the master device failed.
+ *
+ * Notifies a slave that it has been enslaved or released.  If released, provides
+ * information on whether the release was expected or not, and thus whether the
+ * slave should fail it's activation or gracefully deactivate.
+ */
+void
+nm_device_slave_notify_enslaved (NMDevice *dev,
+                                 gboolean enslaved,
+                                 gboolean master_failed)
+{
+	NMDevicePrivate *priv = NM_DEVICE_GET_PRIVATE (dev);
+	NMConnection *connection = nm_device_get_connection (dev);
+
+	g_assert (priv->master);
+
+	if (enslaved) {
+		g_warn_if_fail (priv->enslaved == FALSE);
+		g_warn_if_fail (priv->state == NM_DEVICE_STATE_IP_CONFIG);
+
+		nm_log_info (LOGD_DEVICE,
+				     "Activation (%s) connection '%s' enslaved, continuing activation",
+				     nm_device_get_iface (dev),
+				     nm_connection_get_id (connection));
+
+		/* Now that we're enslaved, proceed with activation.  Remember, slaves
+		 * don't have any IP configuration, so they skip directly to SECONDARIES.
+		 */
+		priv->enslaved = TRUE;
+		priv->ip4_state = IP_DONE;
+		priv->ip6_state = IP_DONE;
+		nm_device_queue_state (dev, NM_DEVICE_STATE_SECONDARIES, NM_DEVICE_STATE_REASON_NONE);
+	} else {
+		NMDeviceState new_state = NM_DEVICE_STATE_DISCONNECTED;
+		NMDeviceStateReason reason = NM_DEVICE_STATE_REASON_NONE;
+
+		if (master_failed) {
+			new_state = NM_DEVICE_STATE_FAILED;
+			reason = NM_DEVICE_STATE_REASON_DEPENDENCY_FAILED;
+
+			nm_log_warn (LOGD_DEVICE,
+					     "Activation (%s) connection '%s' master failed",
+					     nm_device_get_iface (dev),
+					     nm_connection_get_id (connection));
+		} else {
+			nm_log_dbg (LOGD_DEVICE,
+					    "Activation (%s) connection '%s' master deactivated",
+					    nm_device_get_iface (dev),
+					    nm_connection_get_id (connection));
+		}
+
+		nm_device_queue_state (dev, new_state, reason);
+	}
 }
 
 /*
@@ -1055,28 +1325,9 @@ ip6_method_matches (NMConnection *connection, const char *match)
 }
 
 static NMActStageReturn
-real_act_stage1_prepare (NMDevice *self, NMDeviceStateReason *reason)
+act_stage1_prepare (NMDevice *self, NMDeviceStateReason *reason)
 {
-	NMActRequest *req;
-	NMActiveConnection *master_ac;
-	NMDevice *master;
-	NMActStageReturn ret = NM_ACT_STAGE_RETURN_SUCCESS;
-
-	req = nm_device_get_act_request (self);
-	g_assert (req);
-
-	/* If the interface is going to be a slave, let the master enslave it here */
-	master_ac = nm_act_request_get_dependency (req);
-	if (master_ac && NM_IS_ACT_REQUEST (master_ac)) {
-		/* FIXME: handle VPNs here too */
-
-		master = NM_DEVICE (nm_act_request_get_device (NM_ACT_REQUEST (master_ac)));
-		g_assert (master);
-		if (!nm_device_enslave_slave (master, self))
-			ret = NM_ACT_STAGE_RETURN_FAILURE;
-	}
-
-	return ret;
+	return NM_ACT_STAGE_RETURN_SUCCESS;
 }
 
 /*
@@ -1097,11 +1348,6 @@ nm_device_activate_stage1_device_prepare (gpointer user_data)
 	/* Clear the activation source ID now that this stage has run */
 	activation_source_clear (self, FALSE, 0);
 
-	if (priv->act_dep_timeout_id) {
-		g_source_remove (priv->act_dep_timeout_id);
-		priv->act_dep_timeout_id = 0;
-	}
-
 	priv->ip4_state = priv->ip6_state = IP_NONE;
 
 	iface = nm_device_get_iface (self);
@@ -1148,8 +1394,19 @@ nm_device_activate_schedule_stage1_device_prepare (NMDevice *self)
 }
 
 static NMActStageReturn
-real_act_stage2_config (NMDevice *dev, NMDeviceStateReason *reason)
+act_stage2_config (NMDevice *dev, NMDeviceStateReason *reason)
 {
+	NMDevicePrivate *priv = NM_DEVICE_GET_PRIVATE (dev);
+	GSList *iter;
+
+	/* If we have slaves that aren't yet enslaved, do that now */
+	for (iter = priv->slaves; iter; iter = g_slist_next (iter)) {
+		SlaveInfo *info = iter->data;
+
+		if (nm_device_get_state (info->slave) == NM_DEVICE_STATE_IP_CONFIG)
+			nm_device_enslave_slave (dev, info->slave, nm_device_get_connection (info->slave));
+	}
+
 	/* Nothing to do */
 	return NM_ACT_STAGE_RETURN_SUCCESS;
 }
@@ -1550,14 +1807,14 @@ dhcp4_lease_change (NMDevice *device, NMIP4Config *config)
 	nm_utils_merge_ip4_config (config, nm_connection_get_setting_ip4_config (connection));
 
 	if (!nm_device_set_ip4_config (device, config, FALSE, &reason)) {
-		nm_log_warn (LOGD_DHCP6, "(%s): failed to update IPv4 config in response to DHCP event.",
+		nm_log_warn (LOGD_DHCP4, "(%s): failed to update IPv4 config in response to DHCP event.",
 		             nm_device_get_ip_iface (device));
 		nm_device_state_changed (device, NM_DEVICE_STATE_FAILED, reason);
 		return;
 	}
 
 	/* Notify dispatcher scripts of new DHCP4 config */
-	nm_utils_call_dispatcher ("dhcp4-change", connection, device, NULL, NULL, NULL);
+	nm_dispatcher_call (DISPATCHER_ACTION_DHCP4_CHANGE, connection, device, NULL, NULL);
 }
 
 static void
@@ -1770,9 +2027,9 @@ shared4_new_config (NMDevice *self, NMDeviceStateReason *reason)
 /*********************************************/
 
 static NMActStageReturn
-real_act_stage3_ip4_config_start (NMDevice *self,
-                                  NMIP4Config **out_config,
-                                  NMDeviceStateReason *reason)
+act_stage3_ip4_config_start (NMDevice *self,
+                             NMIP4Config **out_config,
+                             NMDeviceStateReason *reason)
 {
 	NMDevicePrivate *priv = NM_DEVICE_GET_PRIVATE (self);
 	NMConnection *connection;
@@ -1932,7 +2189,7 @@ dhcp6_lease_change (NMDevice *device)
 		nm_device_state_changed (device, NM_DEVICE_STATE_FAILED, reason);
 	} else {
 		/* Notify dispatcher scripts of new DHCPv6 config */
-		nm_utils_call_dispatcher ("dhcp6-change", connection, device, NULL, NULL, NULL);
+		nm_dispatcher_call (DISPATCHER_ACTION_DHCP6_CHANGE, connection, device, NULL, NULL);
 	}
 }
 
@@ -2030,8 +2287,6 @@ dhcp6_start (NMDevice *self,
 	NMActStageReturn ret = NM_ACT_STAGE_RETURN_FAILURE;
 	guint8 *anycast = NULL;
 	const char *ip_iface;
-	const struct in6_addr dest = { { { 0xFF,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 } } };
-	int err;
 
 	if (!connection) {
 		connection = nm_device_get_connection (self);
@@ -2054,18 +2309,6 @@ dhcp6_start (NMDevice *self,
 		priv->dhcp6_ip6_config = NULL;
 	}
 
-	/* DHCPv6 communicates with the DHCPv6 server via two multicast addresses,
-	 * ff02::1:2 (link-scope) and ff05::1:3 (site-scope).  Make sure we have
-	 * a multicast route (ff00::/8) for client <-> server communication.
-	 */
-	err = nm_system_set_ip6_route (priv->ip_iface ? priv->ip_ifindex : priv->ifindex,
-	                               &dest, 8, NULL, 256, 0, RTPROT_BOOT, RT_TABLE_LOCAL, NULL);
-	if (err && (err != -NLE_EXIST)) {
-		nm_log_err (LOGD_DEVICE | LOGD_IP6,
-		            "(%s): failed to add IPv6 multicast route: %s",
-		            priv->ip_iface ? priv->ip_iface : priv->iface, nl_geterror (err));
-	}
-
 	ip_iface = nm_device_get_ip_iface (self);
 	priv->dhcp6_client = nm_dhcp_manager_start_ip6 (priv->dhcp_manager,
 	                                                ip_iface,
@@ -2270,10 +2513,52 @@ addrconf6_cleanup (NMDevice *self)
 
 /******************************************/
 
+/* Get net.ipv6.conf.default.use_tempaddr value from /etc/sysctl.conf or
+ * /lib/sysctl.d/sysctl.conf
+ */
+static int
+ip6_use_tempaddr (void)
+{
+	char *contents = NULL;
+	gsize len = 0;
+	const char *group_name = "[forged_group]\n";
+	char *sysctl_data = NULL;
+	GKeyFile *keyfile;
+	GError *error = NULL;
+	int tmp, ret = -1;
+
+	/* Read file contents to a string. */
+	if (!g_file_get_contents ("/etc/sysctl.conf", &contents, &len, NULL))
+		if (!g_file_get_contents ("/lib/sysctl.d/sysctl.conf", &contents, &len, NULL))
+			return -1;
+
+	/* Prepend a group so that we can use GKeyFile parser. */
+	sysctl_data = g_strdup_printf ("%s%s", group_name, contents);
+
+	keyfile = g_key_file_new ();
+	if (keyfile == NULL)
+		goto done;
+
+	if (!g_key_file_load_from_data (keyfile, sysctl_data, len + strlen (group_name), G_KEY_FILE_NONE, NULL))
+		goto done;
+
+	tmp = g_key_file_get_integer (keyfile, "forged_group", "net.ipv6.conf.default.use_tempaddr", &error);
+	if (error == NULL)
+		ret = tmp;
+
+done:
+	g_free (contents);
+	g_free (sysctl_data);
+	g_clear_error (&error);
+	g_key_file_free (keyfile);
+
+	return ret;
+}
+
 static NMActStageReturn
-real_act_stage3_ip6_config_start (NMDevice *self,
-                                  NMIP6Config **out_config,
-                                  NMDeviceStateReason *reason)
+act_stage3_ip6_config_start (NMDevice *self,
+                             NMIP6Config **out_config,
+                             NMDeviceStateReason *reason)
 {
 	NMDevicePrivate *priv = NM_DEVICE_GET_PRIVATE (self);
 	const char *ip_iface;
@@ -2306,7 +2591,7 @@ real_act_stage3_ip6_config_start (NMDevice *self,
 	} else if (ip6_method_matches (connection, NM_SETTING_IP6_CONFIG_METHOD_DHCP)) {
 		/* Router advertisements shouldn't be used in pure DHCP mode */
 		if (priv->ip6_accept_ra_path)
-			nm_utils_do_sysctl (priv->ip6_accept_ra_path, "0\n");
+			nm_utils_do_sysctl (priv->ip6_accept_ra_path, "0");
 
 		priv->dhcp6_mode = IP6_DHCP_OPT_MANAGED;
 		ret = dhcp6_start (self, connection, priv->dhcp6_mode, reason);
@@ -2314,7 +2599,7 @@ real_act_stage3_ip6_config_start (NMDevice *self,
 		/* reset the saved RA value when ipv6 is ignored */
 		if (priv->ip6_accept_ra_path) {
 			nm_utils_do_sysctl (priv->ip6_accept_ra_path,
-			                    priv->ip6_accept_ra_save ? "1\n" : "0\n");
+			                    priv->ip6_accept_ra_save ? "1" : "0");
 		}
 		ret = NM_ACT_STAGE_RETURN_STOP;
 	} else if (ip6_method_matches (connection, NM_SETTING_IP6_CONFIG_METHOD_MANUAL)) {
@@ -2324,7 +2609,7 @@ real_act_stage3_ip6_config_start (NMDevice *self,
 
 		/* Router advertisements shouldn't be used in manual mode */
 		if (priv->ip6_accept_ra_path)
-			nm_utils_do_sysctl (priv->ip6_accept_ra_path, "0\n");
+			nm_utils_do_sysctl (priv->ip6_accept_ra_path, "0");
 		ret = NM_ACT_STAGE_RETURN_SUCCESS;
 	} else {
 		nm_log_warn (LOGD_IP6, "(%s): unhandled IPv6 config method; will fail",
@@ -2337,7 +2622,7 @@ real_act_stage3_ip6_config_start (NMDevice *self,
 	 * If a global value is configured by sysadmin (e.g. /etc/sysctl.conf),
 	 * use that value instead of per-connection value.
 	 */
-	conf_use_tempaddr = nm_backend_ipv6_use_tempaddr ();
+	conf_use_tempaddr = ip6_use_tempaddr ();
 	if (conf_use_tempaddr >= 0)
 		ip6_privacy = conf_use_tempaddr;
 	else {
@@ -2350,13 +2635,13 @@ real_act_stage3_ip6_config_start (NMDevice *self,
 	switch (ip6_privacy) {
 	case NM_SETTING_IP6_CONFIG_PRIVACY_UNKNOWN:
 	case NM_SETTING_IP6_CONFIG_PRIVACY_DISABLED:
-		ip6_privacy_str = "0\n";
+		ip6_privacy_str = "0";
 	break;
 	case NM_SETTING_IP6_CONFIG_PRIVACY_PREFER_PUBLIC_ADDR:
-		ip6_privacy_str = "1\n";
+		ip6_privacy_str = "1";
 	break;
 	case NM_SETTING_IP6_CONFIG_PRIVACY_PREFER_TEMP_ADDR:
-		ip6_privacy_str = "2\n";
+		ip6_privacy_str = "2";
 	break;
 	}
 	if (priv->ip6_privacy_tempaddr_path)
@@ -2365,39 +2650,23 @@ real_act_stage3_ip6_config_start (NMDevice *self,
 	return ret;
 }
 
-
-/*
- * nm_device_activate_stage3_ip_config_start
- *
- * Begin automatic/manual IP configuration
+/**
+ * nm_device_activate_stage3_ip4_start:
+ * @self: the device
  *
+ * Try starting IPv4 configuration.
  */
-static gboolean
-nm_device_activate_stage3_ip_config_start (gpointer user_data)
+gboolean
+nm_device_activate_stage3_ip4_start (NMDevice *self)
 {
-	NMDevice *self = NM_DEVICE (user_data);
 	NMDevicePrivate *priv = NM_DEVICE_GET_PRIVATE (self);
-	const char *iface;
 	NMActStageReturn ret;
 	NMDeviceStateReason reason = NM_DEVICE_STATE_REASON_NONE;
 	NMIP4Config *ip4_config = NULL;
-	NMIP6Config *ip6_config = NULL;
-	int ifindex;
 
-	/* Clear the activation source ID now that this stage has run */
-	activation_source_clear (self, FALSE, 0);
-
-	iface = nm_device_get_iface (self);
-	nm_log_info (LOGD_DEVICE, "Activation (%s) Stage 3 of 5 (IP Configure Start) started...", iface);
-	nm_device_state_changed (self, NM_DEVICE_STATE_IP_CONFIG, NM_DEVICE_STATE_REASON_NONE);
-
-	/* Make sure the interface is up before trying to do anything with it */
-	ifindex = nm_device_get_ip_ifindex (self);
-	if ((ifindex > 0) && (nm_system_iface_is_up (ifindex) == FALSE))
-		nm_system_iface_set_up (ifindex, TRUE, NULL);
-
-	priv->ip4_state = priv->ip6_state = IP_CONF;
+	g_assert (priv->ip4_state == IP_WAIT);
 
+	priv->ip4_state = IP_CONF;
 	ret = NM_DEVICE_GET_CLASS (self)->act_stage3_ip4_config_start (self, &ip4_config, &reason);
 	if (ret == NM_ACT_STAGE_RETURN_SUCCESS) {
 		g_assert (ip4_config);
@@ -2405,13 +2674,36 @@ nm_device_activate_stage3_ip_config_start (gpointer user_data)
 		g_object_unref (ip4_config);
 	} else if (ret == NM_ACT_STAGE_RETURN_FAILURE) {
 		nm_device_state_changed (self, NM_DEVICE_STATE_FAILED, reason);
-		goto out;
+		return FALSE;
 	} else if (ret == NM_ACT_STAGE_RETURN_STOP) {
-		/* Nothing to do */
+		/* Early finish */
 		priv->ip4_state = IP_DONE;
+	} else if (ret == NM_ACT_STAGE_RETURN_WAIT) {
+		/* Wait for something to try IP config again */
+		priv->ip4_state = IP_WAIT;
 	} else
 		g_assert (ret == NM_ACT_STAGE_RETURN_POSTPONE);
 
+	return TRUE;
+}
+
+/**
+ * nm_device_activate_stage3_ip6_start:
+ * @self: the device
+ *
+ * Try starting IPv6 configuration.
+ */
+gboolean
+nm_device_activate_stage3_ip6_start (NMDevice *self)
+{
+	NMDevicePrivate *priv = NM_DEVICE_GET_PRIVATE (self);
+	NMActStageReturn ret;
+	NMDeviceStateReason reason = NM_DEVICE_STATE_REASON_NONE;
+	NMIP6Config *ip6_config = NULL;
+
+	g_assert (priv->ip6_state == IP_WAIT);
+
+	priv->ip6_state = IP_CONF;
 	ret = NM_DEVICE_GET_CLASS (self)->act_stage3_ip6_config_start (self, &ip6_config, &reason);
 	if (ret == NM_ACT_STAGE_RETURN_SUCCESS) {
 		g_assert (ip6_config);
@@ -2419,24 +2711,77 @@ nm_device_activate_stage3_ip_config_start (gpointer user_data)
 		g_object_unref (ip6_config);
 	} else if (ret == NM_ACT_STAGE_RETURN_FAILURE) {
 		nm_device_state_changed (self, NM_DEVICE_STATE_FAILED, reason);
-		goto out;
+		return FALSE;
 	} else if (ret == NM_ACT_STAGE_RETURN_STOP) {
-		/* Nothing to do */
+		/* Early finish */
 		priv->ip6_state = IP_DONE;
+	} else if (ret == NM_ACT_STAGE_RETURN_WAIT) {
+		/* Wait for something to try IP config again */
+		priv->ip6_state = IP_WAIT;
 	} else
 		g_assert (ret == NM_ACT_STAGE_RETURN_POSTPONE);
 
-out:
-	nm_log_info (LOGD_DEVICE, "Activation (%s) Stage 3 of 5 (IP Configure Start) complete.", iface);
+	return TRUE;
+}
 
-	/* Handle interfaces (bond slaves, etc) that won't have any IP config; they
-	 * need to move to ACTIVATED.
+/*
+ * nm_device_activate_stage3_ip_config_start
+ *
+ * Begin automatic/manual IP configuration
+ *
+ */
+static gboolean
+nm_device_activate_stage3_ip_config_start (gpointer user_data)
+{
+	NMDevice *self = NM_DEVICE (user_data);
+	NMDevicePrivate *priv = NM_DEVICE_GET_PRIVATE (self);
+	const char *iface;
+	int ifindex;
+	NMDevice *master;
+
+	/* Clear the activation source ID now that this stage has run */
+	activation_source_clear (self, FALSE, 0);
+
+	iface = nm_device_get_iface (self);
+	nm_log_info (LOGD_DEVICE, "Activation (%s) Stage 3 of 5 (IP Configure Start) started...", iface);
+	nm_device_state_changed (self, NM_DEVICE_STATE_IP_CONFIG, NM_DEVICE_STATE_REASON_NONE);
+
+	/* Make sure the interface is up before trying to do anything with it */
+	ifindex = nm_device_get_ip_ifindex (self);
+	if ((ifindex > 0) && (nm_system_iface_is_up (ifindex) == FALSE))
+		nm_system_iface_set_up (ifindex, TRUE, NULL);
+
+	priv->ip4_state = priv->ip6_state = IP_WAIT;
+
+	/* If the device is a slave, then we don't do any IP configuration but we
+	 * use the IP config stage to indicate to the master we're ready for
+	 * enslavement.  Either the master has already enslaved us, in which case
+	 * our state transition to SECONDARIES is already queued courtesy of
+	 * nm_device_slave_notify_enslaved(), or the master is still activating,
+	 * in which case we postpone activation here until the master enslaves us,
+	 * which calls nm_device_slave_notify_enslaved().
 	 */
-	if (priv->ip4_state == IP_DONE && priv->ip6_state == IP_DONE) {
-		/* FIXME: call layer2 stuff to set MTU? */
-		nm_device_state_changed (self, NM_DEVICE_STATE_ACTIVATED, NM_DEVICE_STATE_REASON_NONE);
+	master = nm_active_connection_get_master (NM_ACTIVE_CONNECTION (priv->act_request));
+	if (master) {
+		if (priv->enslaved == FALSE) {
+			nm_log_info (LOGD_DEVICE, "Activation (%s) connection '%s' waiting on master '%s'",
+						 nm_device_get_iface (self),
+						 nm_connection_get_id (nm_device_get_connection (self)),
+						 nm_device_get_iface (master));
+		}
+		goto out;
 	}
 
+	/* IPv4 */
+	if (!nm_device_activate_stage3_ip4_start (self))
+		goto out;
+
+	/* IPv6 */
+	if (!nm_device_activate_stage3_ip6_start (self))
+		goto out;
+
+out:
+	nm_log_info (LOGD_DEVICE, "Activation (%s) Stage 3 of 5 (IP Configure Start) complete.", iface);
 	return FALSE;
 }
 
@@ -2479,7 +2824,7 @@ nm_device_activate_schedule_stage3_ip_config_start (NMDevice *self)
 	g_return_if_fail (priv->act_request);
 
 	state = nm_device_get_state (self);
-	if (nm_act_request_get_assumed (priv->act_request) == FALSE)
+	if (nm_active_connection_get_assumed (NM_ACTIVE_CONNECTION (priv->act_request)) == FALSE)
 		g_warn_if_fail (state >= NM_DEVICE_STATE_PREPARE && state <= NM_DEVICE_STATE_NEED_AUTH);
 
 	/* Add the interface to the specified firewall zone */
@@ -2499,7 +2844,7 @@ nm_device_activate_schedule_stage3_ip_config_start (NMDevice *self)
 }
 
 static NMActStageReturn
-real_act_stage4_ip4_config_timeout (NMDevice *self, NMDeviceStateReason *reason)
+act_stage4_ip4_config_timeout (NMDevice *self, NMDeviceStateReason *reason)
 {
 	if (nm_device_ip_config_should_fail (self, FALSE)) {
 		*reason = NM_DEVICE_STATE_REASON_IP_CONFIG_UNAVAILABLE;
@@ -2583,7 +2928,7 @@ nm_device_activate_schedule_ip4_config_timeout (NMDevice *self)
 
 
 static NMActStageReturn
-real_act_stage4_ip6_config_timeout (NMDevice *self, NMDeviceStateReason *reason)
+act_stage4_ip6_config_timeout (NMDevice *self, NMDeviceStateReason *reason)
 {
 	if (nm_device_ip_config_should_fail (self, TRUE)) {
 		*reason = NM_DEVICE_STATE_REASON_IP_CONFIG_UNAVAILABLE;
@@ -2685,13 +3030,13 @@ share_init (void)
 	                    NULL };
 	char **iter;
 
-	if (!nm_utils_do_sysctl ("/proc/sys/net/ipv4/ip_forward", "1\n")) {
+	if (!nm_utils_do_sysctl ("/proc/sys/net/ipv4/ip_forward", "1")) {
 		nm_log_err (LOGD_SHARING, "Error starting IP forwarding: (%d) %s",
 					errno, strerror (errno));
 		return FALSE;
 	}
 
-	if (!nm_utils_do_sysctl ("/proc/sys/net/ipv4/ip_dynaddr", "1\n")) {
+	if (!nm_utils_do_sysctl ("/proc/sys/net/ipv4/ip_dynaddr", "1")) {
 		nm_log_err (LOGD_SHARING, "error starting IP forwarding: (%d) %s",
 					errno, strerror (errno));
 	}
@@ -2777,7 +3122,8 @@ start_sharing (NMDevice *self, NMIP4Config *config)
 
 	if (!nm_dnsmasq_manager_start (priv->dnsmasq_manager, config, &error)) {
 		nm_log_err (LOGD_SHARING, "(%s/%s): failed to start dnsmasq: %s",
-		            nm_device_get_iface (self), ip_iface, error->message);
+		            nm_device_get_iface (self), ip_iface,
+		            (error && error->message) ? error->message : "(unknown)");
 		g_error_free (error);
 		nm_act_request_set_shared (req, FALSE);
 		return FALSE;
@@ -2830,7 +3176,7 @@ nm_device_activate_ip4_config_commit (gpointer user_data)
 	/* Merge with user overrides */
 	nm_utils_merge_ip4_config (config, nm_connection_get_setting_ip4_config (connection));
 
-	assumed = nm_act_request_get_assumed (priv->act_request);
+	assumed = nm_active_connection_get_assumed (NM_ACTIVE_CONNECTION (priv->act_request));
 	if (!nm_device_set_ip4_config (self, config, assumed, &reason)) {
 		nm_log_info (LOGD_DEVICE | LOGD_IP4,
 			         "Activation (%s) Stage 5 of 5 (IPv4 Commit) failed",
@@ -2852,10 +3198,10 @@ nm_device_activate_ip4_config_commit (gpointer user_data)
 		}
 	}
 
-	/* Enter the ACTIVATED state if this is the first method to complete */
+	/* Enter the SECONDARIES state if this is the first method to complete */
 	priv->ip4_state = IP_DONE;
 	if (nm_device_get_state (self) == NM_DEVICE_STATE_IP_CONFIG)
-		nm_device_state_changed (self, NM_DEVICE_STATE_ACTIVATED, NM_DEVICE_STATE_REASON_NONE);
+		nm_device_state_changed (self, NM_DEVICE_STATE_SECONDARIES, NM_DEVICE_STATE_REASON_NONE);
 
 out:
 	nm_log_info (LOGD_DEVICE, "Activation (%s) Stage 5 of 5 (IPv4 Commit) complete.",
@@ -2938,10 +3284,10 @@ nm_device_activate_ip6_config_commit (gpointer user_data)
 		NM_DEVICE_GET_CLASS (self)->ip6_config_pre_commit (self, config);
 
 	if (ip6_config_merge_and_apply (self, config, &reason)) {
-		/* Enter the ACTIVATED state if this is the first method to complete */
+		/* Enter the SECONDARIES state if this is the first method to complete */
 		priv->ip6_state = IP_DONE;
 		if (nm_device_get_state (self) == NM_DEVICE_STATE_IP_CONFIG)
-			nm_device_state_changed (self, NM_DEVICE_STATE_ACTIVATED, NM_DEVICE_STATE_REASON_NONE);
+			nm_device_state_changed (self, NM_DEVICE_STATE_SECONDARIES, NM_DEVICE_STATE_REASON_NONE);
 	} else {
 		nm_log_info (LOGD_DEVICE | LOGD_IP6,
 			         "Activation (%s) Stage 5 of 5 (IPv6 Commit) failed",
@@ -3181,15 +3527,6 @@ nm_device_deactivate (NMDevice *self, NMDeviceStateReason reason)
 	activation_source_clear (self, TRUE, AF_INET);
 	activation_source_clear (self, TRUE, AF_INET6);
 
-	if (priv->act_dep_result_id) {
-		g_source_remove (priv->act_dep_result_id);
-		priv->act_dep_result_id = 0;
-	}
-	if (priv->act_dep_timeout_id) {
-		g_source_remove (priv->act_dep_timeout_id);
-		priv->act_dep_timeout_id = 0;
-	}
-
 	/* Clear any queued transitions */
 	nm_device_queued_state_clear (self);
 
@@ -3205,16 +3542,23 @@ nm_device_deactivate (NMDevice *self, NMDeviceStateReason reason)
 
 	/* Turn off router advertisements until they are needed */
 	if (priv->ip6_accept_ra_path)
-		nm_utils_do_sysctl (priv->ip6_accept_ra_path, "0\n");
+		nm_utils_do_sysctl (priv->ip6_accept_ra_path, "0");
 
 	/* Turn off IPv6 privacy extensions */
 	if (priv->ip6_privacy_tempaddr_path)
-		nm_utils_do_sysctl (priv->ip6_privacy_tempaddr_path, "0\n");
+		nm_utils_do_sysctl (priv->ip6_privacy_tempaddr_path, "0");
 
 	/* Call device type-specific deactivation */
 	if (NM_DEVICE_GET_CLASS (self)->deactivate)
 		NM_DEVICE_GET_CLASS (self)->deactivate (self);
 
+	/* master: release slaves */
+	g_clear_object (&priv->master);
+	nm_device_master_release_slaves (self, FALSE);
+
+	/* slave: mark no longer enslaved */
+	priv->enslaved = FALSE;
+
 	/* Tear down an existing activation request */
 	clear_act_request (self);
 
@@ -3284,71 +3628,16 @@ impl_device_disconnect (NMDevice *device, DBusGMethodInvocation *context)
 	               NULL);
 }
 
-static gboolean
-act_dep_timeout_cb (gpointer user_data)
-{
-	NMDevice *self = NM_DEVICE (user_data);
-	NMDevicePrivate *priv = NM_DEVICE_GET_PRIVATE (self);
-	NMConnection *connection;
-
-	connection = nm_active_connection_get_connection (NM_ACTIVE_CONNECTION (priv->act_request));
-	nm_log_warn (LOGD_DEVICE,
-	             "Activation (%s) connection '%s' dependency timed out",
-	             nm_device_get_iface (self),
-	             nm_connection_get_id (connection));
-
-	nm_device_queue_state (self, NM_DEVICE_STATE_FAILED, NM_DEVICE_STATE_REASON_DEPENDENCY_FAILED);
-	return FALSE;
-}
-
-static void
-act_dep_result_cb (NMActRequest *req,
-                   NMActRequestDependencyResult result,
-                   NMDevice *self)
-{
-	NMDevicePrivate *priv = NM_DEVICE_GET_PRIVATE (self);
-	NMConnection *connection;
-
-	connection = nm_active_connection_get_connection (NM_ACTIVE_CONNECTION (priv->act_request));
-
-	switch (result) {
-	case NM_ACT_REQUEST_DEP_RESULT_FAILED:
-		g_source_remove (priv->act_dep_result_id);
-		priv->act_dep_result_id = 0;
-
-		nm_log_warn (LOGD_DEVICE,
-			         "Activation (%s) connection '%s' dependency failed",
-			         nm_device_get_iface (self),
-			         nm_connection_get_id (connection));
-		nm_device_queue_state (self, NM_DEVICE_STATE_FAILED, NM_DEVICE_STATE_REASON_DEPENDENCY_FAILED);
-		break;
-	case NM_ACT_REQUEST_DEP_RESULT_READY:
-		g_warn_if_fail (priv->state == NM_DEVICE_STATE_PREPARE);
-		if (priv->state == NM_DEVICE_STATE_PREPARE) {
-			nm_log_info (LOGD_DEVICE,
-					     "Activation (%s) connection '%s' dependency ready, continuing activation",
-					     nm_device_get_iface (self),
-					     nm_connection_get_id (connection));
-			nm_device_activate_schedule_stage1_device_prepare (self);
-		}
-		break;
-	case NM_ACT_REQUEST_DEP_RESULT_WAIT:
-	default:
-		g_assert_not_reached ();
-		break;
-	}
-}
-
-gboolean
-nm_device_activate (NMDevice *self, NMActRequest *req, GError **error)
+void
+nm_device_activate (NMDevice *self, NMActRequest *req)
 {
 	NMDevicePrivate *priv;
 	NMConnection *connection;
 
-	g_return_val_if_fail (self != NULL, FALSE);
-	g_return_val_if_fail (NM_IS_DEVICE (self), FALSE);
-	g_return_val_if_fail (req != NULL, FALSE);
-	g_return_val_if_fail (NM_IS_ACT_REQUEST (req), FALSE);
+	g_return_if_fail (self != NULL);
+	g_return_if_fail (NM_IS_DEVICE (self));
+	g_return_if_fail (req != NULL);
+	g_return_if_fail (NM_IS_ACT_REQUEST (req));
 
 	priv = NM_DEVICE_GET_PRIVATE (self);
 
@@ -3359,27 +3648,20 @@ nm_device_activate (NMDevice *self, NMActRequest *req, GError **error)
 	             nm_device_get_iface (self),
 	             nm_connection_get_id (connection));
 
-	/* Make sure this connection isn't activated already, or in the process of
-	 * being activated.
-	 */
-	if (   nm_device_is_activating (self)
-	    || (nm_device_get_state (self) == NM_DEVICE_STATE_ACTIVATED)) {
-		NMConnection *new = nm_act_request_get_connection (req);
-		NMConnection *current = nm_act_request_get_connection (priv->act_request);
-
-		if (new == current) {
-			g_set_error_literal (error, NM_DEVICE_ERROR, NM_DEVICE_ERROR_CONNECTION_ACTIVATING,
-			                     "Connection is already activating");
-			return FALSE;
-		}
-	}
+	g_warn_if_fail (priv->state == NM_DEVICE_STATE_DISCONNECTED);
 
 	priv->act_request = g_object_ref (req);
 	g_object_notify (G_OBJECT (self), NM_DEVICE_ACTIVE_CONNECTION);
 
-	if (!nm_act_request_get_assumed (req)) {
-		NMActiveConnection *dep_ac;
-		NMConnection *dep_con;
+	if (nm_active_connection_get_assumed (NM_ACTIVE_CONNECTION (req))) {
+		/* If it's an assumed connection, let the device subclass short-circuit
+		 * the normal connection process and just copy its IP configs from the
+		 * interface.
+		 */
+		nm_device_state_changed (self, NM_DEVICE_STATE_IP_CONFIG, NM_DEVICE_STATE_REASON_NONE);
+		nm_device_activate_schedule_stage3_ip_config_start (self);
+	} else {
+		NMDevice *master;
 
 		/* HACK: update the state a bit early to avoid a race between the 
 		 * scheduled stage1 handler and nm_policy_device_change_check() thinking
@@ -3389,43 +3671,18 @@ nm_device_activate (NMDevice *self, NMActRequest *req, GError **error)
 		nm_device_state_changed (self, NM_DEVICE_STATE_PREPARE, NM_DEVICE_STATE_REASON_NONE);
 
 		/* Handle any dependencies this connection might have */
-		switch (nm_act_request_get_dependency_result (priv->act_request)) {
-		case NM_ACT_REQUEST_DEP_RESULT_FAILED:
-			nm_device_queue_state (self, NM_DEVICE_STATE_FAILED, NM_DEVICE_STATE_REASON_DEPENDENCY_FAILED);
-			break;
-		case NM_ACT_REQUEST_DEP_RESULT_WAIT:
-			dep_ac = nm_act_request_get_dependency (priv->act_request);
-			g_assert (dep_ac);
-			dep_con = nm_active_connection_get_connection (dep_ac);
-			g_assert (dep_con);
-			nm_log_info (LOGD_DEVICE, "Activation (%s) connection '%s' waiting on dependency '%s'",
-						 nm_device_get_iface (self),
-						 nm_connection_get_id (connection),
-						 nm_connection_get_id (dep_con));
-
-			priv->act_dep_result_id = g_signal_connect (priv->act_request,
-					                                    NM_ACT_REQUEST_DEPENDENCY_RESULT,
-					                                    G_CALLBACK (act_dep_result_cb),
-					                                    self);
-			priv->act_dep_timeout_id = g_timeout_add_seconds (60, act_dep_timeout_cb, self);
-			break;
-		default:
-			g_warn_if_reached ();
-			/* fall through */
-		case NM_ACT_REQUEST_DEP_RESULT_READY:
-			nm_device_activate_schedule_stage1_device_prepare (self);
-			break;
+		master = nm_active_connection_get_master (NM_ACTIVE_CONNECTION (req));
+		if (master) {
+			/* Master should at least already be activating */
+			g_assert (nm_device_get_state (master) > NM_DEVICE_STATE_DISCONNECTED);
+
+			g_assert (priv->master == NULL);
+			priv->master = g_object_ref (master);
+			nm_device_master_add_slave (master, self);
 		}
-	} else {
-		/* If it's an assumed connection, let the device subclass short-circuit
-		 * the normal connection process and just copy its IP configs from the
-		 * interface.
-		 */
-		nm_device_state_changed (self, NM_DEVICE_STATE_IP_CONFIG, NM_DEVICE_STATE_REASON_NONE);
-		nm_device_activate_schedule_stage3_ip_config_start (self);
-	}
 
-	return TRUE;
+		nm_device_activate_schedule_stage1_device_prepare (self);
+	}
 }
 
 /*
@@ -3743,7 +4000,6 @@ dispose (GObject *object)
 
 		connection = nm_device_get_connection (self);
 		if (connection) {
-
 			/* Only static or DHCP IPv4 connections can be left up.
 			 * All IPv6 connections can be left up, so we don't have
 			 * to check that.
@@ -3753,7 +4009,8 @@ dispose (GObject *object)
 				method = nm_setting_ip4_config_get_method (s_ip4);
 			if (   !method
 			    || !strcmp (method, NM_SETTING_IP4_CONFIG_METHOD_AUTO)
-			    || !strcmp (method, NM_SETTING_IP4_CONFIG_METHOD_MANUAL))
+			    || !strcmp (method, NM_SETTING_IP4_CONFIG_METHOD_MANUAL)
+			    || !strcmp (method, NM_SETTING_IP4_CONFIG_METHOD_DISABLED))
 				take_down = FALSE;
 		}
 	}
@@ -3767,6 +4024,8 @@ dispose (GObject *object)
 	addrconf6_cleanup (self);
 	dnsmasq_cleanup (self);
 
+	g_warn_if_fail (priv->slaves == NULL);
+
 	/* Take the device itself down and clear its IPv4 configuration */
 	if (priv->managed && take_down) {
 		NMDeviceStateReason ignored = NM_DEVICE_STATE_REASON_NONE;
@@ -3778,7 +4037,7 @@ dispose (GObject *object)
 	/* reset the saved RA value */
 	if (priv->ip6_accept_ra_path) {
 		nm_utils_do_sysctl (priv->ip6_accept_ra_path,
-		                    priv->ip6_accept_ra_save ? "1\n" : "0\n");
+		                    priv->ip6_accept_ra_save ? "1" : "0");
 	}
 	g_free (priv->ip6_accept_ra_path);
 
@@ -3786,11 +4045,33 @@ dispose (GObject *object)
 	if (priv->ip6_privacy_tempaddr_path) {
 		char tmp[16];
 
-		snprintf (tmp, sizeof (tmp), "%d\n", priv->ip6_privacy_tempaddr_save);
+		snprintf (tmp, sizeof (tmp), "%d", priv->ip6_privacy_tempaddr_save);
 		nm_utils_do_sysctl (priv->ip6_privacy_tempaddr_path, tmp);
 	}
 	g_free (priv->ip6_privacy_tempaddr_path);
 
+	if (priv->cp_added_id) {
+	    g_signal_handler_disconnect (priv->con_provider, priv->cp_added_id);
+	    priv->cp_added_id = 0;
+	}
+
+	if (priv->cp_loaded_id) {
+	    g_signal_handler_disconnect (priv->con_provider, priv->cp_loaded_id);
+	    priv->cp_loaded_id = 0;
+	}
+
+	if (priv->cp_removed_id) {
+	    g_signal_handler_disconnect (priv->con_provider, priv->cp_removed_id);
+	    priv->cp_removed_id = 0;
+	}
+
+	if (priv->cp_updated_id) {
+	    g_signal_handler_disconnect (priv->con_provider, priv->cp_updated_id);
+	    priv->cp_updated_id = 0;
+	}
+
+	g_hash_table_unref (priv->available_connections);
+
 	activation_source_clear (self, TRUE, AF_INET);
 	activation_source_clear (self, TRUE, AF_INET6);
 
@@ -3916,6 +4197,9 @@ get_property (GObject *object, guint prop_id,
 	NMDevicePrivate *priv = NM_DEVICE_GET_PRIVATE (self);
 	NMDeviceState state;
 	const char *ac_path = NULL;
+	GPtrArray *array;
+	GHashTableIter iter;
+	NMConnection *connection;
 
 	state = nm_device_get_state (self);
 
@@ -4008,6 +4292,13 @@ get_property (GObject *object, guint prop_id,
 	case PROP_RFKILL_TYPE:
 		g_value_set_uint (value, priv->rfkill_type);
 		break;
+	case PROP_AVAILABLE_CONNECTIONS:
+		array = g_ptr_array_sized_new (g_hash_table_size (priv->available_connections));
+		g_hash_table_iter_init (&iter, priv->available_connections);
+		while (g_hash_table_iter_next (&iter, (gpointer) &connection, NULL))
+			g_ptr_array_add (array, g_strdup (nm_connection_get_path (connection)));
+		g_value_take_boxed (value, array);
+		break;
 	default:
 		G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
 		break;
@@ -4030,14 +4321,15 @@ nm_device_class_init (NMDeviceClass *klass)
 	object_class->constructor = constructor;
 	object_class->constructed = constructed;
 
-	klass->get_type_capabilities = real_get_type_capabilities;
-	klass->get_generic_capabilities = real_get_generic_capabilities;
-	klass->act_stage1_prepare = real_act_stage1_prepare;
-	klass->act_stage2_config = real_act_stage2_config;
-	klass->act_stage3_ip4_config_start = real_act_stage3_ip4_config_start;
-	klass->act_stage3_ip6_config_start = real_act_stage3_ip6_config_start;
-	klass->act_stage4_ip4_config_timeout = real_act_stage4_ip4_config_timeout;
-	klass->act_stage4_ip6_config_timeout = real_act_stage4_ip6_config_timeout;
+	klass->get_type_capabilities = get_type_capabilities;
+	klass->get_generic_capabilities = get_generic_capabilities;
+	klass->act_stage1_prepare = act_stage1_prepare;
+	klass->act_stage2_config = act_stage2_config;
+	klass->act_stage3_ip4_config_start = act_stage3_ip4_config_start;
+	klass->act_stage3_ip6_config_start = act_stage3_ip6_config_start;
+	klass->act_stage4_ip4_config_timeout = act_stage4_ip4_config_timeout;
+	klass->act_stage4_ip6_config_timeout = act_stage4_ip6_config_timeout;
+	klass->check_connection_available = check_connection_available;
 
 	/* Properties */
 	g_object_class_install_property
@@ -4217,12 +4509,21 @@ nm_device_class_init (NMDeviceClass *klass)
 		                   0, G_MAXINT, 0,
 		                   G_PARAM_READABLE | NM_PROPERTY_PARAM_NO_EXPORT));
 
+	g_object_class_install_property
+		(object_class, PROP_AVAILABLE_CONNECTIONS,
+		 g_param_spec_boxed (NM_DEVICE_AVAILABLE_CONNECTIONS,
+		                     "AvailableConnections",
+		                     "AvailableConnections",
+		                     DBUS_TYPE_G_ARRAY_OF_OBJECT_PATH,
+		                     G_PARAM_READABLE));
+
 	/* Signals */
 	signals[STATE_CHANGED] =
 		g_signal_new ("state-changed",
 		              G_OBJECT_CLASS_TYPE (object_class),
-		              G_SIGNAL_RUN_FIRST,
-		              0, NULL, NULL,
+		              G_SIGNAL_RUN_LAST,
+		              G_STRUCT_OFFSET (NMDeviceClass, state_changed),
+		              NULL, NULL,
 		              _nm_marshal_VOID__UINT_UINT_UINT,
 		              G_TYPE_NONE, 3,
 		              G_TYPE_UINT, G_TYPE_UINT, G_TYPE_UINT);
@@ -4427,7 +4728,13 @@ reason_to_string (NMDeviceStateReason reason)
 	case NM_DEVICE_STATE_REASON_DEPENDENCY_FAILED:
 		return "dependency-failed";
 	case NM_DEVICE_STATE_REASON_BR2684_FAILED:
-		return "br2684 bridge failed";
+		return "br2684-bridge-failed";
+	case NM_DEVICE_STATE_REASON_MODEM_MANAGER_UNAVAILABLE:
+		return "modem-manager-unavailable";
+	case NM_DEVICE_STATE_REASON_SSID_NOT_FOUND:
+		return "SSID not found";
+	case NM_DEVICE_STATE_REASON_SECONDARY_CONNECTION_FAILED:
+		return "secondary-connection-failed";
 	default:
 		break;
 	}
@@ -4445,6 +4752,12 @@ nm_device_state_changed (NMDevice *device,
 	gboolean no_firmware = FALSE;
 	NMConnection *connection;
 
+	/* Track re-entry */
+	static gboolean in_state_changed = FALSE;
+
+	g_warn_if_fail (in_state_changed == FALSE);
+	in_state_changed = TRUE;
+
 	g_return_if_fail (NM_IS_DEVICE (device));
 
 	/* Do nothing if state isn't changing, but as a special case allow
@@ -4452,8 +4765,10 @@ nm_device_state_changed (NMDevice *device,
 	 * can retry device initialization.
 	 */
 	if (   (priv->state == state)
-	    && !(state == NM_DEVICE_STATE_UNAVAILABLE && priv->firmware_missing))
+	    && !(state == NM_DEVICE_STATE_UNAVAILABLE && priv->firmware_missing)) {
+		in_state_changed = FALSE;
 		return;
+	}
 
 	old_state = priv->state;
 	priv->state = state;
@@ -4474,14 +4789,13 @@ nm_device_state_changed (NMDevice *device,
 	/* Cache the activation request for the dispatcher */
 	req = priv->act_request ? g_object_ref (priv->act_request) : NULL;
 
-	/* Update connection timestamps; do this before possibly deactivating the
-	 * device since that will clear the activation request and thus the
-	 * connection, which we need.
-	 */
-	if (state == NM_DEVICE_STATE_ACTIVATED || old_state == NM_DEVICE_STATE_ACTIVATED) {
-		nm_settings_connection_update_timestamp (NM_SETTINGS_CONNECTION (nm_act_request_get_connection (req)),
-		                                         (guint64) time (NULL), TRUE);
-	}
+	if (state <= NM_DEVICE_STATE_UNAVAILABLE)
+		_clear_available_connections (device, TRUE);
+
+	/* Update the available connections list when a device first becomes available */
+	if (   state >= NM_DEVICE_STATE_DISCONNECTED
+	    && old_state < NM_DEVICE_STATE_DISCONNECTED)
+		nm_device_recheck_available_connections (device);
 
 	/* Handle the new state here; but anything that could trigger
 	 * another state change should be done below.
@@ -4541,7 +4855,7 @@ nm_device_state_changed (NMDevice *device,
 	case NM_DEVICE_STATE_ACTIVATED:
 		nm_log_info (LOGD_DEVICE, "Activation (%s) successful, device activated.",
 		             nm_device_get_iface (device));
-		nm_utils_call_dispatcher ("up", nm_act_request_get_connection (req), device, NULL, NULL, NULL);
+		nm_dispatcher_call (DISPATCHER_ACTION_UP, nm_act_request_get_connection (req), device, NULL, NULL);
 		break;
 	case NM_DEVICE_STATE_FAILED:
 		connection = nm_act_request_get_connection (req);
@@ -4549,22 +4863,43 @@ nm_device_state_changed (NMDevice *device,
 		             "Activation (%s) failed for connection '%s'",
 		             nm_device_get_iface (device),
 		             nm_connection_get_id (connection));
+
+		/* Notify any slaves of the unexpected failure */
+		nm_device_master_release_slaves (device, TRUE);
+
+		/* If the connection doesn't yet have a timestamp, set it to zero so that
+		 * we can distinguish between connections we've tried to activate and have
+		 * failed (zero timestamp), connections that succeeded (non-zero timestamp),
+		 * and those we haven't tried yet (no timestamp).
+		 */
+		if (!nm_settings_connection_get_timestamp (NM_SETTINGS_CONNECTION (connection), NULL)) {
+			nm_settings_connection_update_timestamp (NM_SETTINGS_CONNECTION (connection),
+			                                         (guint64) 0,
+			                                         TRUE);
+		}
+
 		/* Schedule the transition to DISCONNECTED.  The device can't transition
 		 * immediately because we can't change states again from the state
 		 * handler for a variety of reasons.
 		 */
 		nm_device_queue_state (device, NM_DEVICE_STATE_DISCONNECTED, NM_DEVICE_STATE_REASON_NONE);
 		break;
+	case NM_DEVICE_STATE_SECONDARIES:
+		nm_log_dbg (LOGD_DEVICE, "(%s): device entered SECONDARIES state",
+		            nm_device_get_iface (device));
+		break;
 	default:
 		break;
 	}
 
 	if (old_state == NM_DEVICE_STATE_ACTIVATED)
-		nm_utils_call_dispatcher ("down", nm_act_request_get_connection (req), device, NULL, NULL, NULL);
+		nm_dispatcher_call (DISPATCHER_ACTION_DOWN, nm_act_request_get_connection (req), device, NULL, NULL);
 
 	/* Dispose of the cached activation request */
 	if (req)
 		g_object_unref (req);
+
+	in_state_changed = FALSE;
 }
 
 static gboolean
@@ -4572,16 +4907,28 @@ queued_set_state (gpointer user_data)
 {
 	NMDevice *self = NM_DEVICE (user_data);
 	NMDevicePrivate *priv = NM_DEVICE_GET_PRIVATE (self);
+	NMDeviceState new_state;
+	NMDeviceStateReason new_reason;
 
 	if (priv->queued_state.id) {
 		nm_log_dbg (LOGD_DEVICE, "(%s): running queued state change to %s (id %d)",
 			        nm_device_get_iface (self),
 			        state_to_string (priv->queued_state.state),
 			        priv->queued_state.id);
+
+		/* Clear queued state struct before triggering state change, since
+		 * the state change may queue another state.
+		 */
 		priv->queued_state.id = 0;
-		nm_device_state_changed (self, priv->queued_state.state, priv->queued_state.reason);
+		new_state = priv->queued_state.state;
+		new_reason = priv->queued_state.reason;
+		nm_device_queued_state_clear (self);
+
+		nm_device_state_changed (self, new_state, new_reason);
+	} else {
+		g_warn_if_fail (priv->queued_state.state == NM_DEVICE_STATE_UNKNOWN);
+		g_warn_if_fail (priv->queued_state.reason == NM_DEVICE_STATE_REASON_NONE);
 	}
-	nm_device_queued_state_clear (self);
 	return FALSE;
 }
 
@@ -4707,7 +5054,8 @@ ip4_match_config (NMDevice *self, NMConnection *connection)
 	dhcp_mgr = nm_dhcp_manager_get ();
 	leases = nm_dhcp_manager_get_lease_config (dhcp_mgr,
 	                                           nm_device_get_iface (self),
-	                                           nm_connection_get_uuid (connection));
+	                                           nm_connection_get_uuid (connection),
+						   FALSE);
 	g_object_unref (dhcp_mgr);
 
 	method = s_ip4 ? nm_setting_ip4_config_get_method (s_ip4) : NM_SETTING_IP4_CONFIG_METHOD_AUTO;
@@ -4869,3 +5217,119 @@ nm_device_get_autoconnect (NMDevice *device)
 	return NM_DEVICE_GET_PRIVATE (device)->autoconnect;
 }
 
+static void
+_signal_available_connections_changed (NMDevice *device)
+{
+	g_object_notify (G_OBJECT (device), NM_DEVICE_AVAILABLE_CONNECTIONS);
+}
+
+static void
+_clear_available_connections (NMDevice *device, gboolean do_signal)
+{
+	g_hash_table_remove_all (NM_DEVICE_GET_PRIVATE (device)->available_connections);
+	if (do_signal == TRUE)
+		_signal_available_connections_changed (device);
+}
+
+static gboolean
+_try_add_available_connection (NMDevice *self, NMConnection *connection)
+{
+	if (nm_device_get_state (self) < NM_DEVICE_STATE_DISCONNECTED)
+		return FALSE;
+
+	if (nm_device_check_connection_compatible (self, connection, NULL)) {
+		/* Let subclasses implement additional checks on the connection */
+		if (   NM_DEVICE_GET_CLASS (self)->check_connection_available
+		    && NM_DEVICE_GET_CLASS (self)->check_connection_available (self, connection)) {
+
+			g_hash_table_insert (NM_DEVICE_GET_PRIVATE (self)->available_connections,
+					             g_object_ref (connection),
+					             GUINT_TO_POINTER (1));
+		}
+	}
+	return FALSE;
+}
+
+static gboolean
+_del_available_connection (NMDevice *device, NMConnection *connection)
+{
+	return g_hash_table_remove (NM_DEVICE_GET_PRIVATE (device)->available_connections, connection);
+}
+
+static gboolean
+check_connection_available (NMDevice *device, NMConnection *connection)
+{
+	/* Default is to assume the connection is available unless a subclass
+	 * overrides this with more specific checks.
+	 */
+	return TRUE;
+}
+
+void
+nm_device_recheck_available_connections (NMDevice *device)
+{
+	NMDevicePrivate *priv;
+	const GSList *connections, *iter;
+
+	g_return_if_fail (device != NULL);
+	g_return_if_fail (NM_IS_DEVICE (device));
+
+	priv = NM_DEVICE_GET_PRIVATE(device);
+
+	_clear_available_connections (device, FALSE);
+
+	connections = nm_connection_provider_get_connections (priv->con_provider);
+	for (iter = connections; iter; iter = g_slist_next (iter))
+		_try_add_available_connection (device, NM_CONNECTION (iter->data));
+
+	_signal_available_connections_changed (device);
+}
+
+static void
+cp_connection_added (NMConnectionProvider *cp, NMConnection *connection, gpointer user_data)
+{
+	if (_try_add_available_connection (NM_DEVICE (user_data), connection))
+		_signal_available_connections_changed (NM_DEVICE (user_data));
+}
+
+static void
+cp_connections_loaded (NMConnectionProvider *cp, NMConnection *connection, gpointer user_data)
+{
+	const GSList *connections, *iter;
+	gboolean added = FALSE;
+
+	connections = nm_connection_provider_get_connections (cp);
+	for (iter = connections; iter; iter = g_slist_next (iter))
+		added |= _try_add_available_connection (NM_DEVICE (user_data), NM_CONNECTION (iter->data));
+
+	if (added)
+		_signal_available_connections_changed (NM_DEVICE (user_data));
+}
+
+static void
+cp_connection_removed (NMConnectionProvider *cp, NMConnection *connection, gpointer user_data)
+{
+	if (_del_available_connection (NM_DEVICE (user_data), connection))
+		_signal_available_connections_changed (NM_DEVICE (user_data));
+}
+
+static void
+cp_connection_updated (NMConnectionProvider *cp, NMConnection *connection, gpointer user_data)
+{
+	gboolean added, deleted;
+
+	/* FIXME: don't remove it from the hash if it's just going to get re-added */
+	deleted = _del_available_connection (NM_DEVICE (user_data), connection);
+	added = _try_add_available_connection (NM_DEVICE (user_data), connection);
+
+	/* Only signal if the connection was removed OR added, but not both */
+	if (added != deleted)
+		_signal_available_connections_changed (NM_DEVICE (user_data));
+}
+
+gboolean
+nm_device_supports_vlans (NMDevice *device)
+{
+	/* At the moment, NM's VLAN code assumes all VLANs are over ethernet. */
+	return NM_IS_DEVICE_ETHERNET (device);
+}
diff --git a/src/nm-device.h b/src/nm-device.h
index 91d9166a..05b39622 100644
--- a/src/nm-device.h
+++ b/src/nm-device.h
@@ -27,6 +27,7 @@
 #include 
 
 #include "NetworkManager.h"
+#include "nm-types.h"
 #include "nm-activation-request.h"
 #include "nm-ip4-config.h"
 #include "nm-ip6-config.h"
@@ -59,6 +60,7 @@
 #define NM_DEVICE_TYPE_DESC        "type-desc"    /* Internal only */
 #define NM_DEVICE_RFKILL_TYPE      "rfkill-type"  /* Internal only */
 #define NM_DEVICE_IFINDEX          "ifindex"      /* Internal only */
+#define NM_DEVICE_AVAILABLE_CONNECTIONS "available-connections"
 
 /* Internal signals */
 #define NM_DEVICE_AUTH_REQUEST "auth-request"
@@ -83,9 +85,9 @@ typedef enum {
 	NM_DEVICE_ERROR_NOT_ACTIVE,                /*< nick=NotActive >*/
 } NMDeviceError;
 
-typedef struct {
+struct _NMDevice {
 	GObject parent;
-} NMDevice;
+};
 
 typedef struct {
 	GObjectClass parent;
@@ -124,10 +126,21 @@ typedef struct {
 	                                             GSList *connections,
 	                                             char **specific_object);
 
+	/* Checks whether the connection is compatible with the device using
+	 * only the devices type and characteristics.  Does not use any live
+	 * network information like WiFi/WiMAX scan lists etc.
+	 */
 	gboolean    (* check_connection_compatible) (NMDevice *self,
 	                                             NMConnection *connection,
 	                                             GError **error);
 
+	/* Checks whether the connection is likely available to be activated,
+	 * including any live network information like scan lists.  Returns
+	 * TRUE if the connection is available; FALSE if not.
+	 */
+	gboolean    (* check_connection_available) (NMDevice *self,
+	                                            NMConnection *connection);
+
 	gboolean    (* complete_connection)         (NMDevice *self,
 	                                             NMConnection *connection,
 	                                             const char *specific_object,
@@ -168,7 +181,8 @@ typedef struct {
 	                                    gboolean fail_if_no_hwaddr);
 
 	gboolean        (* enslave_slave) (NMDevice *self,
-	                                   NMDevice *slave);
+	                                   NMDevice *slave,
+	                                   NMConnection *connection);
 
 	gboolean        (* release_slave) (NMDevice *self,
 	                                   NMDevice *slave);
@@ -204,8 +218,14 @@ NMDHCP6Config * nm_device_get_dhcp6_config (NMDevice *dev);
 NMIP4Config *	nm_device_get_ip4_config	(NMDevice *dev);
 NMIP6Config *	nm_device_get_ip6_config	(NMDevice *dev);
 
-gboolean        nm_device_enslave_slave     (NMDevice *dev, NMDevice *slave);
-gboolean        nm_device_release_slave     (NMDevice *dev, NMDevice *slave);
+/* Master */
+gboolean        nm_device_master_add_slave  (NMDevice *dev, NMDevice *slave);
+GSList *        nm_device_master_get_slaves (NMDevice *dev);
+
+/* Slave */
+void            nm_device_slave_notify_enslaved (NMDevice *dev,
+                                                 gboolean enslaved,
+                                                 gboolean master_failed);
 
 NMActRequest *	nm_device_get_act_request	(NMDevice *dev);
 NMConnection *  nm_device_get_connection	(NMDevice *dev);
@@ -272,10 +292,12 @@ void nm_device_queue_state   (NMDevice *self,
 
 gboolean nm_device_get_firmware_missing (NMDevice *self);
 
-gboolean nm_device_activate (NMDevice *device, NMActRequest *req, GError **error);
+void nm_device_activate (NMDevice *device, NMActRequest *req);
 
 void nm_device_set_connection_provider (NMDevice *device, NMConnectionProvider *provider);
 
+gboolean nm_device_supports_vlans (NMDevice *device);
+
 G_END_DECLS
 
 #endif	/* NM_DEVICE_H */
diff --git a/src/nm-dispatcher.c b/src/nm-dispatcher.c
new file mode 100644
index 00000000..61dfd7c0
--- /dev/null
+++ b/src/nm-dispatcher.c
@@ -0,0 +1,396 @@
+/* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */
+/* NetworkManager -- Network link manager
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Copyright (C) 2004 - 2012 Red Hat, Inc.
+ * Copyright (C) 2005 - 2008 Novell, Inc.
+ */
+
+#include 
+#include 
+
+#include "nm-dispatcher.h"
+#include "nm-dispatcher-action.h"
+#include "NetworkManagerUtils.h"
+#include "nm-utils.h"
+#include "nm-logging.h"
+#include "nm-dbus-manager.h"
+#include "nm-dbus-glib-types.h"
+
+static GSList *requests = NULL;
+
+static void
+dump_object_to_props (GObject *object, GHashTable *hash)
+{
+	GParamSpec **pspecs;
+	guint len = 0, i;
+
+	pspecs = g_object_class_list_properties (G_OBJECT_GET_CLASS (object), &len);
+	for (i = 0; i < len; i++) {
+		value_hash_add_object_property (hash,
+		                                pspecs[i]->name,
+		                                object,
+		                                pspecs[i]->name,
+		                                pspecs[i]->value_type);
+	}
+	g_free (pspecs);
+}
+
+static void
+dump_dhcp4_to_props (NMDHCP4Config *config, GHashTable *hash)
+{
+	GSList *options, *iter;
+
+	options = nm_dhcp4_config_list_options (config);
+	for (iter = options; iter; iter = g_slist_next (iter)) {
+		const char *option = (const char *) iter->data;
+		const char *val;
+
+		val = nm_dhcp4_config_get_option (config, option);
+		value_hash_add_str (hash, option, val);
+	}
+	g_slist_free (options);
+}
+
+static void
+dump_dhcp6_to_props (NMDHCP6Config *config, GHashTable *hash)
+{
+	GSList *options, *iter;
+
+	options = nm_dhcp6_config_list_options (config);
+	for (iter = options; iter; iter = g_slist_next (iter)) {
+		const char *option = (const char *) iter->data;
+		const char *val;
+
+		val = nm_dhcp6_config_get_option (config, option);
+		value_hash_add_str (hash, option, val);
+	}
+	g_slist_free (options);
+}
+
+static void
+fill_device_props (NMDevice *device,
+                   GHashTable *dev_hash,
+                   GHashTable *ip4_hash,
+                   GHashTable *ip6_hash,
+                   GHashTable *dhcp4_hash,
+                   GHashTable *dhcp6_hash)
+{
+	NMIP4Config *ip4_config;
+	NMIP6Config *ip6_config;
+	NMDHCP4Config *dhcp4_config;
+	NMDHCP6Config *dhcp6_config;
+
+	/* If the action is for a VPN, send the VPN's IP interface instead of the device's */
+	value_hash_add_str (dev_hash, NMD_DEVICE_PROPS_IP_INTERFACE, nm_device_get_ip_iface (device));
+	value_hash_add_str (dev_hash, NMD_DEVICE_PROPS_INTERFACE, nm_device_get_iface (device));
+	value_hash_add_uint (dev_hash, NMD_DEVICE_PROPS_TYPE, nm_device_get_device_type (device));
+	value_hash_add_uint (dev_hash, NMD_DEVICE_PROPS_STATE, nm_device_get_state (device));
+	value_hash_add_object_path (dev_hash, NMD_DEVICE_PROPS_PATH, nm_device_get_path (device));
+
+	ip4_config = nm_device_get_ip4_config (device);
+	if (ip4_config)
+		dump_object_to_props (G_OBJECT (ip4_config), ip4_hash);
+
+	ip6_config = nm_device_get_ip6_config (device);
+	if (ip6_config)
+		dump_object_to_props (G_OBJECT (ip6_config), ip6_hash);
+
+	dhcp4_config = nm_device_get_dhcp4_config (device);
+	if (dhcp4_config)
+		dump_dhcp4_to_props (dhcp4_config, dhcp4_hash);
+
+	dhcp6_config = nm_device_get_dhcp6_config (device);
+	if (dhcp6_config)
+		dump_dhcp6_to_props (dhcp6_config, dhcp6_hash);
+}
+
+static void
+fill_vpn_props (NMIP4Config *ip4_config,
+                NMIP6Config *ip6_config,
+                GHashTable *ip4_hash,
+                GHashTable *ip6_hash)
+{
+	if (ip4_config)
+		dump_object_to_props (G_OBJECT (ip4_config), ip4_hash);
+	if (ip6_config)
+		dump_object_to_props (G_OBJECT (ip6_config), ip6_hash);
+}
+
+typedef struct {
+	DispatcherFunc callback;
+	gpointer user_data;
+	NMDBusManager *dbus_mgr;
+} DispatchInfo;
+
+static void
+dispatcher_info_free (DispatchInfo *info)
+{
+	requests = g_slist_remove (requests, info);
+	g_object_unref (info->dbus_mgr);
+	g_free (info);
+}
+
+static const char *
+dispatch_result_to_string (DispatchResult result)
+{
+	switch (result) {
+	case DISPATCH_RESULT_UNKNOWN:
+		return "unknown";
+	case DISPATCH_RESULT_SUCCESS:
+		return "success";
+	case DISPATCH_RESULT_EXEC_FAILED:
+		return "exec failed";
+	case DISPATCH_RESULT_FAILED:
+		return "failed";
+	case DISPATCH_RESULT_TIMEOUT:
+		return "timed out";
+	}
+	g_assert_not_reached ();
+}
+
+static void
+dispatcher_done_cb (DBusGProxy *proxy, DBusGProxyCall *call, gpointer user_data)
+{
+	DispatchInfo *info = user_data;
+	GError *error = NULL;
+	GPtrArray *results = NULL;
+	guint i;
+
+	if (dbus_g_proxy_end_call (proxy, call, &error,
+	                           DISPATCHER_TYPE_RESULT_ARRAY, &results,
+	                           G_TYPE_INVALID)) {
+		for (i = 0; results && (i < results->len); i++) {
+			GValueArray *item = g_ptr_array_index (results, i);
+			GValue *tmp;
+			const char *script, *err;
+			DispatchResult result;
+
+			if (   (G_VALUE_TYPE (g_value_array_get_nth (item, 0)) == G_TYPE_STRING)
+			    && (G_VALUE_TYPE (g_value_array_get_nth (item, 1)) == G_TYPE_UINT)
+			    && (G_VALUE_TYPE (g_value_array_get_nth (item, 2)) == G_TYPE_STRING)) {
+				/* result */
+				tmp = g_value_array_get_nth (item, 1);
+				result = g_value_get_uint (tmp);
+				if (result != DISPATCH_RESULT_SUCCESS) {
+					/* script */
+					tmp = g_value_array_get_nth (item, 0);
+					script = g_value_get_string (tmp);
+
+					/* error */
+					tmp = g_value_array_get_nth (item, 2);
+					err = g_value_get_string (tmp);
+
+					nm_log_warn (LOGD_CORE, "Dispatcher script %s: %s",
+					             dispatch_result_to_string (result), err);
+				}
+			} else
+				nm_log_dbg (LOGD_CORE, "Dispatcher result element %d invalid type", i);
+
+			g_value_array_free (item);
+		}
+		g_ptr_array_free (results, TRUE);
+	} else {
+		g_assert (error);
+		nm_log_warn (LOGD_CORE, "Dispatcher failed: (%d) %s", error->code, error->message);
+	}
+
+	if (info->callback)
+		info->callback (info, info->user_data);
+
+	g_clear_error (&error);
+	g_object_unref (proxy);
+}
+
+static const char *
+action_to_string (DispatcherAction action)
+{
+	switch (action) {
+	case DISPATCHER_ACTION_HOSTNAME:
+		return "hostname";
+	case DISPATCHER_ACTION_UP:
+		return "up";
+	case DISPATCHER_ACTION_PRE_DOWN:
+		return "pre-down";
+	case DISPATCHER_ACTION_DOWN:
+		return "down";
+	case DISPATCHER_ACTION_VPN_UP:
+		return "vpn-up";
+	case DISPATCHER_ACTION_VPN_PRE_DOWN:
+		return "vpn-pre-down";
+	case DISPATCHER_ACTION_VPN_DOWN:
+		return "vpn-down";
+	case DISPATCHER_ACTION_DHCP4_CHANGE:
+		return "dhcp4-change";
+	case DISPATCHER_ACTION_DHCP6_CHANGE:
+		return "dhcp6-change";
+	default:
+		break;
+	}
+	g_assert_not_reached ();
+}
+
+static gconstpointer
+_dispatcher_call (DispatcherAction action,
+                  NMConnection *connection,
+                  NMDevice *device,
+                  const char *vpn_iface,
+                  NMIP4Config *vpn_ip4_config,
+                  NMIP6Config *vpn_ip6_config,
+                  DispatcherFunc callback,
+                  gpointer user_data)
+{
+	NMDBusManager *dbus_mgr;
+	DBusGProxy *proxy;
+	DBusGConnection *g_connection;
+	GHashTable *connection_hash;
+	GHashTable *connection_props;
+	GHashTable *device_props;
+	GHashTable *device_ip4_props;
+	GHashTable *device_ip6_props;
+	GHashTable *device_dhcp4_props;
+	GHashTable *device_dhcp6_props;
+	GHashTable *vpn_ip4_props;
+	GHashTable *vpn_ip6_props;
+	DBusGProxyCall *call;
+	DispatchInfo *info;
+
+	/* All actions except 'hostname' require a device */
+	if (action != DISPATCHER_ACTION_HOSTNAME)
+		g_return_val_if_fail (NM_IS_DEVICE (device), NULL);
+	/* VPN actions require at least an IPv4 config (for now) */
+	if (action == DISPATCHER_ACTION_VPN_UP)
+		g_return_val_if_fail (vpn_ip4_config != NULL, NULL);
+
+	dbus_mgr = nm_dbus_manager_get ();
+	g_connection = nm_dbus_manager_get_connection (dbus_mgr);
+	proxy = dbus_g_proxy_new_for_name (g_connection,
+	                                   NM_DISPATCHER_DBUS_SERVICE,
+	                                   NM_DISPATCHER_DBUS_PATH,
+	                                   NM_DISPATCHER_DBUS_IFACE);
+	if (!proxy) {
+		nm_log_err (LOGD_CORE, "could not get dispatcher proxy!");
+		g_object_unref (dbus_mgr);
+		return NULL;
+	}
+
+	if (connection) {
+		connection_hash = nm_connection_to_hash (connection, NM_SETTING_HASH_FLAG_NO_SECRETS);
+
+		connection_props = value_hash_create ();
+		value_hash_add_object_path (connection_props,
+		                            NMD_CONNECTION_PROPS_PATH,
+		                            nm_connection_get_path (connection));
+	} else {
+		connection_hash = value_hash_create ();
+		connection_props = value_hash_create ();
+	}
+
+	device_props = value_hash_create ();
+	device_ip4_props = value_hash_create ();
+	device_ip6_props = value_hash_create ();
+	device_dhcp4_props = value_hash_create ();
+	device_dhcp6_props = value_hash_create ();
+	vpn_ip4_props = value_hash_create ();
+	vpn_ip6_props = value_hash_create ();
+
+	/* hostname actions only send the hostname */
+	if (action != DISPATCHER_ACTION_HOSTNAME) {
+		fill_device_props (device,
+		                   device_props,
+		                   device_ip4_props,
+		                   device_ip6_props,
+		                   device_dhcp4_props,
+		                   device_dhcp6_props);
+		if (vpn_iface)
+			fill_vpn_props (vpn_ip4_config, NULL, vpn_ip4_props, vpn_ip6_props);
+	}
+
+	info = g_malloc0 (sizeof (*info));
+	info->callback = callback;
+	info->user_data = user_data;
+	info->dbus_mgr = dbus_mgr;
+
+	/* Send the action to the dispatcher */
+	call = dbus_g_proxy_begin_call_with_timeout (proxy, "Action",
+	                                             dispatcher_done_cb,
+	                                             info,
+	                                             (GDestroyNotify) dispatcher_info_free,
+	                                             15000,
+	                                             G_TYPE_STRING, action_to_string (action),
+	                                             DBUS_TYPE_G_MAP_OF_MAP_OF_VARIANT, connection_hash,
+	                                             DBUS_TYPE_G_MAP_OF_VARIANT, connection_props,
+	                                             DBUS_TYPE_G_MAP_OF_VARIANT, device_props,
+	                                             DBUS_TYPE_G_MAP_OF_VARIANT, device_ip4_props,
+	                                             DBUS_TYPE_G_MAP_OF_VARIANT, device_ip6_props,
+	                                             DBUS_TYPE_G_MAP_OF_VARIANT, device_dhcp4_props,
+	                                             DBUS_TYPE_G_MAP_OF_VARIANT, device_dhcp6_props,
+	                                             G_TYPE_STRING, vpn_iface ? vpn_iface : "",
+	                                             DBUS_TYPE_G_MAP_OF_VARIANT, vpn_ip4_props,
+	                                             DBUS_TYPE_G_MAP_OF_VARIANT, vpn_ip6_props,
+	                                             G_TYPE_INVALID);
+	g_hash_table_destroy (connection_hash);
+	g_hash_table_destroy (connection_props);
+	g_hash_table_destroy (device_props);
+	g_hash_table_destroy (device_ip4_props);
+	g_hash_table_destroy (device_ip6_props);
+	g_hash_table_destroy (device_dhcp4_props);
+	g_hash_table_destroy (device_dhcp6_props);
+	g_hash_table_destroy (vpn_ip4_props);
+	g_hash_table_destroy (vpn_ip6_props);
+
+	/* Track the request in case of cancelation */
+	requests = g_slist_append (requests, info);
+
+	return info;
+}
+
+gconstpointer
+nm_dispatcher_call (DispatcherAction action,
+                    NMConnection *connection,
+                    NMDevice *device,
+                    DispatcherFunc callback,
+                    gpointer user_data)
+{
+	return _dispatcher_call (action, connection, device, NULL, NULL, NULL, callback, user_data);
+}
+
+gconstpointer
+nm_dispatcher_call_vpn (DispatcherAction action,
+                        NMConnection *connection,
+                        NMDevice *device,
+                        const char *vpn_iface,
+                        NMIP4Config *vpn_ip4_config,
+                        NMIP6Config *vpn_ip6_config,
+                        DispatcherFunc callback,
+                        gpointer user_data)
+{
+	return _dispatcher_call (action, connection, device, vpn_iface, vpn_ip4_config, vpn_ip6_config, callback, user_data);
+}
+
+void
+nm_dispatcher_call_cancel (gconstpointer call)
+{
+	/* 'call' is really a DispatchInfo pointer, just opaque to callers.
+	 * Look it up in our requests list, but don't access it directly before
+	 * we've made sure it's a valid request,since it may have long since been
+	 * freed.  Canceling just means the callback doesn't get called, so set
+	 * the DispatcherInfo's callback to NULL.
+	 */
+	if (g_slist_find (requests, call))
+		((DispatchInfo *) call)->callback = NULL;
+}
+
diff --git a/src/nm-dispatcher.h b/src/nm-dispatcher.h
new file mode 100644
index 00000000..05a6c875
--- /dev/null
+++ b/src/nm-dispatcher.h
@@ -0,0 +1,64 @@
+/* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */
+/* NetworkManager -- Network link manager
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Copyright (C) 2004 - 2012 Red Hat, Inc.
+ * Copyright (C) 2005 - 2008 Novell, Inc.
+ */
+
+#ifndef NM_DISPATCHER_H
+#define NM_DISPATCHER_H
+
+#include 
+#include 
+
+#include "nm-device.h"
+#include "nm-ip4-config.h"
+#include "nm-ip6-config.h"
+#include "nm-connection.h"
+
+typedef enum {
+	DISPATCHER_ACTION_HOSTNAME,
+	DISPATCHER_ACTION_UP,
+	DISPATCHER_ACTION_PRE_DOWN,
+	DISPATCHER_ACTION_DOWN,
+	DISPATCHER_ACTION_VPN_UP,
+	DISPATCHER_ACTION_VPN_PRE_DOWN,
+	DISPATCHER_ACTION_VPN_DOWN,
+	DISPATCHER_ACTION_DHCP4_CHANGE,
+	DISPATCHER_ACTION_DHCP6_CHANGE
+} DispatcherAction;
+
+typedef void (*DispatcherFunc) (gconstpointer call, gpointer user_data);
+
+gconstpointer nm_dispatcher_call (DispatcherAction action,
+                                  NMConnection *connection,
+                                  NMDevice *device,
+                                  DispatcherFunc callback,
+                                  gpointer user_data);
+
+gconstpointer nm_dispatcher_call_vpn (DispatcherAction action,
+                                      NMConnection *connection,
+                                      NMDevice *device,
+                                      const char *vpn_iface,
+                                      NMIP4Config *vpn_ip4_config,
+                                      NMIP6Config *vpn_ip6_config,
+                                      DispatcherFunc callback,
+                                      gpointer user_data);
+
+void nm_dispatcher_call_cancel (gconstpointer call);
+
+#endif /* NM_DISPATCHER_H */
diff --git a/src/nm-manager.c b/src/nm-manager.c
index 22c3bd43..fbc9d23d 100644
--- a/src/nm-manager.c
+++ b/src/nm-manager.c
@@ -47,6 +47,7 @@
 #include "nm-device-modem.h"
 #include "nm-device-infiniband.h"
 #include "nm-device-bond.h"
+#include "nm-device-bridge.h"
 #include "nm-device-vlan.h"
 #include "nm-device-adsl.h"
 #include "nm-system.h"
@@ -69,6 +70,7 @@
 #include "nm-device-factory.h"
 #include "wifi-utils.h"
 #include "nm-enum-types.h"
+#include "nm-sleep-monitor.h"
 
 #if WITH_CONCHECK
 #include "nm-connectivity.h"
@@ -78,8 +80,6 @@
 #define NM_AUTOIP_DBUS_SERVICE "org.freedesktop.nm_avahi_autoipd"
 #define NM_AUTOIP_DBUS_IFACE   "org.freedesktop.nm_avahi_autoipd"
 
-#define UPOWER_DBUS_SERVICE "org.freedesktop.UPower"
-
 static gboolean impl_manager_get_devices (NMManager *manager,
                                           GPtrArray **devices,
                                           GError **err);
@@ -125,6 +125,10 @@ static gboolean impl_manager_set_logging (NMManager *manager,
                                           const char *domains,
                                           GError **error);
 
+static void impl_manager_get_logging (NMManager *manager,
+                                      char **level,
+                                      char **domains);
+
 #include "nm-manager-glue.h"
 
 static void bluez_manager_bdaddr_added_cb (NMBluezManager *bluez_mgr,
@@ -149,6 +153,7 @@ static NMActiveConnection *internal_activate_device (NMManager *manager,
                                                      const char *specific_object,
                                                      gboolean user_requested,
                                                      gulong sender_uid,
+                                                     const char *dbus_sender,
                                                      gboolean assumed,
                                                      NMActiveConnection *master,
                                                      GError **error);
@@ -198,6 +203,9 @@ typedef struct {
 typedef struct {
 	char *state_file;
 
+	GSList *active_connections;
+	guint ac_cleanup_id;
+
 	GSList *devices;
 	NMState state;
 #if WITH_CONCHECK
@@ -219,15 +227,13 @@ typedef struct {
 	gboolean net_enabled;
 
 	NMVPNManager *vpn_manager;
-	gulong vpn_manager_activated_id;
-	gulong vpn_manager_deactivated_id;
 
 	NMModemManager *modem_manager;
 	guint modem_added_id;
 	guint modem_removed_id;
 
 	DBusGProxy *aipd_proxy;
-	DBusGProxy *upower_proxy;
+	NMSleepMonitor *sleep_monitor;
 
 	GSList *auth_chains;
 
@@ -254,6 +260,8 @@ enum {
 	PROPERTIES_CHANGED,
 	CHECK_PERMISSIONS,
 	USER_PERMISSIONS_CHANGED,
+	ACTIVE_CONNECTION_ADDED,
+	ACTIVE_CONNECTION_REMOVED,
 
 	LAST_SIGNAL
 };
@@ -296,6 +304,102 @@ nm_manager_error_quark (void)
 
 /************************************************************************/
 
+static void active_connection_state_changed (NMActiveConnection *active,
+                                             GParamSpec *pspec,
+                                             NMManager *self);
+
+static gboolean
+_active_connection_cleanup (gpointer user_data)
+{
+	NMManager *self = NM_MANAGER (user_data);
+	NMManagerPrivate *priv = NM_MANAGER_GET_PRIVATE (self);
+	GSList *iter;
+	gboolean changed = FALSE;
+
+	priv->ac_cleanup_id = 0;
+
+	iter = priv->active_connections;
+	while (iter) {
+		NMActiveConnection *ac = iter->data;
+
+		iter = iter->next;
+		if (nm_active_connection_get_state (ac) == NM_ACTIVE_CONNECTION_STATE_DEACTIVATED) {
+			priv->active_connections = g_slist_remove (priv->active_connections, ac);
+			g_signal_emit (self, signals[ACTIVE_CONNECTION_REMOVED], 0, ac);
+			g_signal_handlers_disconnect_by_func (ac, active_connection_state_changed, self);
+			g_object_unref (ac);
+			changed = TRUE;
+		}
+	}
+
+	if (changed)
+		g_object_notify (G_OBJECT (self), NM_MANAGER_ACTIVE_CONNECTIONS);
+
+	return FALSE;
+}
+
+static void
+active_connection_state_changed (NMActiveConnection *active,
+                                 GParamSpec *pspec,
+                                 NMManager *self)
+{
+	NMManagerPrivate *priv = NM_MANAGER_GET_PRIVATE (self);
+	NMActiveConnectionState state;
+
+	state = nm_active_connection_get_state (active);
+	if (state == NM_ACTIVE_CONNECTION_STATE_DEACTIVATED) {
+		/* Destroy active connections from an idle handler to ensure that
+		 * their last property change notifications go out, which wouldn't
+		 * happen if we destroyed them immediately when their state was set
+		 * to DEACTIVATED.
+		 */
+		if (!priv->ac_cleanup_id)
+			priv->ac_cleanup_id = g_idle_add (_active_connection_cleanup, self);
+	}
+}
+
+static void
+active_connection_add (NMManager *self, NMActiveConnection *active)
+{
+	NMManagerPrivate *priv = NM_MANAGER_GET_PRIVATE (self);
+
+	g_return_if_fail (g_slist_find (priv->active_connections, active) == FALSE);
+
+	priv->active_connections = g_slist_prepend (priv->active_connections, active);
+	g_signal_connect (active, "notify::" NM_ACTIVE_CONNECTION_STATE,
+	                  G_CALLBACK (active_connection_state_changed),
+	                  self);
+
+	g_signal_emit (self, signals[ACTIVE_CONNECTION_ADDED], 0, active);
+	g_object_notify (G_OBJECT (self), NM_MANAGER_ACTIVE_CONNECTIONS);
+}
+
+const GSList *
+nm_manager_get_active_connections (NMManager *manager)
+{
+	return NM_MANAGER_GET_PRIVATE (manager)->active_connections;
+}
+
+static NMActiveConnection *
+active_connection_get_by_path (NMManager *manager, const char *path)
+{
+	NMManagerPrivate *priv = NM_MANAGER_GET_PRIVATE (manager);
+	GSList *iter;
+
+	g_return_val_if_fail (manager != NULL, NULL);
+	g_return_val_if_fail (path != NULL, NULL);
+
+	for (iter = priv->active_connections; iter; iter = g_slist_next (iter)) {
+		NMActiveConnection *candidate = iter->data;
+
+		if (strcmp (path, nm_active_connection_get_path (candidate)) == 0)
+			return candidate;
+	}
+	return NULL;
+}
+
+/************************************************************************/
+
 static NMDevice *
 nm_manager_get_device_by_udi (NMManager *manager, const char *udi)
 {
@@ -352,29 +456,6 @@ manager_sleeping (NMManager *self)
 	return FALSE;
 }
 
-static void
-vpn_manager_connection_activated_cb (NMVPNManager *manager,
-                                     NMVPNConnection *vpn,
-                                     gpointer user_data)
-{
-	NMConnection *connection = nm_vpn_connection_get_connection (vpn);
-
-	/* Update timestamp for the VPN connection */
-	nm_settings_connection_update_timestamp (NM_SETTINGS_CONNECTION (connection),
-	                                         (guint64) time (NULL), TRUE);
-}
-
-static void
-vpn_manager_connection_deactivated_cb (NMVPNManager *manager,
-                                       NMVPNConnection *vpn,
-                                       NMVPNConnectionState new_state,
-                                       NMVPNConnectionState old_state,
-                                       NMVPNConnectionStateReason reason,
-                                       gpointer user_data)
-{
-	g_object_notify (G_OBJECT (user_data), NM_MANAGER_ACTIVE_CONNECTIONS);
-}
-
 static void
 modem_added (NMModemManager *modem_manager,
 			 NMModem *modem,
@@ -384,12 +465,16 @@ modem_added (NMModemManager *modem_manager,
 	NMManager *self = NM_MANAGER (user_data);
 	NMManagerPrivate *priv = NM_MANAGER_GET_PRIVATE (self);
 	NMDevice *replace_device, *device = NULL;
-	const char *ip_iface;
+	const char *modem_iface;
 	GSList *iter;
 
-	ip_iface = nm_modem_get_iface (modem);
+	/* Don't rely only on the data port; use the control port if available */
+	modem_iface = nm_modem_get_data_port (modem);
+	if (!modem_iface)
+		modem_iface = nm_modem_get_control_port (modem);
+	g_return_if_fail (modem_iface);
 
-	replace_device = find_device_by_ip_iface (NM_MANAGER (user_data), ip_iface);
+	replace_device = find_device_by_ip_iface (NM_MANAGER (user_data), modem_iface);
 	if (replace_device) {
 		priv->devices = remove_one_device (NM_MANAGER (user_data),
 		                                   priv->devices,
@@ -410,7 +495,7 @@ modem_added (NMModemManager *modem_manager,
 	 * by the Bluetooth code during the connection process.
 	 */
 	if (driver && !strcmp (driver, "bluetooth")) {
-		nm_log_info (LOGD_MB, "ignoring modem '%s' (no associated Bluetooth device)", ip_iface);
+		nm_log_info (LOGD_MB, "ignoring modem '%s' (no associated Bluetooth device)", modem_iface);
 		return;
 	}
 
@@ -885,36 +970,6 @@ pending_activation_destroy (PendingActivation *pending,
 	g_slice_free (PendingActivation, pending);
 }
 
-static GPtrArray *
-get_active_connections (NMManager *manager, NMConnection *filter)
-{
-	NMManagerPrivate *priv = NM_MANAGER_GET_PRIVATE (manager);
-	GPtrArray *active;
-	GSList *iter;
-
- 	active = g_ptr_array_sized_new (3);
-
-	/* Add active device connections */
-	for (iter = priv->devices; iter; iter = g_slist_next (iter)) {
-		NMActRequest *req;
-		const char *path;
-
-		req = nm_device_get_act_request (NM_DEVICE (iter->data));
-		if (!req)
-			continue;
-
-		if (!filter || (nm_act_request_get_connection (req) == filter)) {
-			path = nm_active_connection_get_path (NM_ACTIVE_CONNECTION (req));
-			g_ptr_array_add (active, g_strdup (path));
-		}
-	}
-
-	/* Add active VPN connections */
-	nm_vpn_manager_add_active_connections (priv->vpn_manager, filter, active);
-
-	return active;
-}
-
 /*******************************************************************/
 /* Settings stuff via NMSettings                                   */
 /*******************************************************************/
@@ -945,8 +1000,8 @@ find_vlan_parent (NMManager *self,
 	GSList *iter;
 
 	/* The 'parent' property could be either an interface name, a connection
-	 * UUID, or even given by the MAC address of the connection's ethernet,
-	 * InfiniBand, or WiFi setting.
+	 * UUID, or even given by the MAC address of the connection's ethernet
+	 * or WiFi setting.
 	 */
 	s_vlan = nm_connection_get_setting_vlan (connection);
 	g_return_val_if_fail (s_vlan != NULL, NULL);
@@ -1016,6 +1071,9 @@ get_virtual_iface_name (NMManager *self,
 	if (nm_connection_is_type (connection, NM_SETTING_BOND_SETTING_NAME))
 		return g_strdup (nm_connection_get_virtual_iface_name (connection));
 
+	if (nm_connection_is_type (connection, NM_SETTING_BRIDGE_SETTING_NAME))
+		return g_strdup (nm_connection_get_virtual_iface_name (connection));
+
 	if (nm_connection_is_type (connection, NM_SETTING_VLAN_SETTING_NAME)) {
 		NMSettingVlan *s_vlan;
 		const char *ifname;
@@ -1025,11 +1083,20 @@ get_virtual_iface_name (NMManager *self,
 
 		parent = find_vlan_parent (self, connection, TRUE);
 		if (parent) {
+			ifname = nm_connection_get_virtual_iface_name (connection);
+
+			if (!nm_device_supports_vlans (parent)) {
+				nm_log_warn (LOGD_DEVICE, "(%s): No support for VLANs on interface %s of type %s",
+				             ifname ? ifname : nm_connection_get_id (connection),
+				             nm_device_get_ip_iface (parent),
+				             nm_device_get_type_desc (parent));
+				return NULL;
+			}
+
 			/* If the connection doesn't specify the interface name for the VLAN
 			 * device, we create one for it using the VLAN ID and the parent
 			 * interface's name.
 			 */
-			ifname = nm_connection_get_virtual_iface_name (connection);
 			if (ifname)
 				vname = g_strdup (ifname);
 			else {
@@ -1047,9 +1114,9 @@ get_virtual_iface_name (NMManager *self,
 static gboolean
 connection_needs_virtual_device (NMConnection *connection)
 {
-	if (nm_connection_is_type (connection, NM_SETTING_BOND_SETTING_NAME))
-		return TRUE;
-	if (nm_connection_is_type (connection, NM_SETTING_VLAN_SETTING_NAME))
+	if (   nm_connection_is_type (connection, NM_SETTING_BOND_SETTING_NAME)
+	    || nm_connection_is_type (connection, NM_SETTING_BRIDGE_SETTING_NAME)
+	    || nm_connection_is_type (connection, NM_SETTING_VLAN_SETTING_NAME))
 		return TRUE;
 
 	return FALSE;
@@ -1111,6 +1178,16 @@ system_create_virtual_device (NMManager *self, NMConnection *connection)
 		udi = get_virtual_iface_placeholder_udi ();
 		device = nm_device_bond_new (udi, iface);
 		g_free (udi);
+	} else if (nm_connection_is_type (connection, NM_SETTING_BRIDGE_SETTING_NAME)) {
+		if (!nm_system_create_bridge (iface)) {
+			nm_log_warn (LOGD_DEVICE, "(%s): failed to add bridging interface for '%s'",
+			             iface, nm_connection_get_id (connection));
+			goto out;
+		}
+
+		udi = get_virtual_iface_placeholder_udi ();
+		device = nm_device_bridge_new (udi, iface);
+		g_free (udi);
 	} else if (nm_connection_is_type (connection, NM_SETTING_VLAN_SETTING_NAME)) {
 		g_return_val_if_fail (parent != NULL, FALSE);
 
@@ -1157,17 +1234,24 @@ system_create_virtual_devices (NMManager *self)
 
 static void
 connection_added (NMSettings *settings,
-                  NMSettingsConnection *connection,
+                  NMSettingsConnection *settings_connection,
                   NMManager *manager)
 {
-	if (connection_needs_virtual_device (NM_CONNECTION (connection)))
-		system_create_virtual_device (manager, NM_CONNECTION (connection));
+	NMConnection *connection = NM_CONNECTION (settings_connection);
+
+	if (connection_needs_virtual_device (connection)) {
+		NMSettingConnection *s_con = nm_connection_get_setting_connection (connection);
+
+		g_assert (s_con);
+		if (nm_setting_connection_get_autoconnect (s_con))
+			system_create_virtual_device (manager, connection);
+	}
 }
 
 static void
 connection_changed (NMSettings *settings,
-                     NMSettingsConnection *connection,
-                     NMManager *manager)
+                    NMSettingsConnection *connection,
+                    NMManager *manager)
 {
 	/* FIXME: Some virtual devices may need to be updated in the future. */
 }
@@ -1528,7 +1612,7 @@ manager_ipw_rfkill_state_changed (NMDeviceWifi *device,
 }
 
 static void
-manager_modem_enabled_changed (NMModem *device, gpointer user_data)
+manager_modem_enabled_changed (NMDevice *device, gpointer user_data)
 {
 	nm_manager_rfkill_update (NM_MANAGER (user_data), RFKILL_TYPE_WWAN);
 }
@@ -1759,9 +1843,9 @@ add_device (NMManager *self, NMDevice *device)
 		nm_log_dbg (LOGD_DEVICE, "(%s): will attempt to assume existing connection",
 		            nm_device_get_iface (device));
 
-		ac = internal_activate_device (self, device, existing, NULL, FALSE, 0, TRUE, NULL, &error);
+		ac = internal_activate_device (self, device, existing, NULL, FALSE, 0, NULL, TRUE, NULL, &error);
 		if (ac)
-			g_object_notify (G_OBJECT (self), NM_MANAGER_ACTIVE_CONNECTIONS);
+			active_connection_add (self, ac);
 		else {
 			nm_log_warn (LOGD_DEVICE, "assumed connection %s failed to activate: (%d) %s",
 			             nm_connection_get_path (existing),
@@ -2006,6 +2090,12 @@ is_bond (int ifindex)
 	return (nm_system_get_iface_type (ifindex, NULL) == NM_IFACE_TYPE_BOND);
 }
 
+static gboolean
+is_bridge (int ifindex)
+{
+	return (nm_system_get_iface_type (ifindex, NULL) == NM_IFACE_TYPE_BRIDGE);
+}
+
 static gboolean
 is_vlan (int ifindex)
 {
@@ -2085,6 +2175,8 @@ udev_device_added_cb (NMUdevManager *udev_mgr,
 			device = nm_device_infiniband_new (sysfs_path, iface, driver);
 		else if (is_bond (ifindex))
 			device = nm_device_bond_new (sysfs_path, iface);
+		else if (is_bridge (ifindex))
+			device = nm_device_bridge_new (sysfs_path, iface);
 		else if (is_vlan (ifindex)) {
 			int parent_ifindex = -1;
 			NMDevice *parent;
@@ -2203,37 +2295,6 @@ impl_manager_get_device_by_ip_iface (NMManager *self,
 	return path ? TRUE : FALSE;
 }
 
-static NMActRequest *
-nm_manager_get_act_request_by_path (NMManager *manager,
-                                    const char *path,
-                                    NMDevice **device)
-{
-	NMManagerPrivate *priv = NM_MANAGER_GET_PRIVATE (manager);
-	GSList *iter;
-
-	g_return_val_if_fail (manager != NULL, NULL);
-	g_return_val_if_fail (path != NULL, NULL);
-	g_return_val_if_fail (device != NULL, NULL);
-	g_return_val_if_fail (*device == NULL, NULL);
-
-	for (iter = priv->devices; iter; iter = g_slist_next (iter)) {
-		NMActRequest *req;
-		const char *ac_path;
-
-		req = nm_device_get_act_request (NM_DEVICE (iter->data));
-		if (!req)
-			continue;
-
-		ac_path = nm_active_connection_get_path (NM_ACTIVE_CONNECTION (req));
-		if (!strcmp (path, ac_path)) {
-			*device = NM_DEVICE (iter->data);
-			return req;
-		}
-	}
-
-	return NULL;
-}
-
 static NMActiveConnection *
 internal_activate_device (NMManager *manager,
                           NMDevice *device,
@@ -2241,12 +2302,13 @@ internal_activate_device (NMManager *manager,
                           const char *specific_object,
                           gboolean user_requested,
                           gulong sender_uid,
+                          const char *dbus_sender,
                           gboolean assumed,
                           NMActiveConnection *master,
                           GError **error)
 {
 	NMActRequest *req;
-	gboolean success;
+	NMDevice *master_device = NULL;
 
 	g_return_val_if_fail (NM_IS_MANAGER (manager), NULL);
 	g_return_val_if_fail (NM_IS_DEVICE (device), NULL);
@@ -2265,17 +2327,21 @@ internal_activate_device (NMManager *manager,
 		                         NM_DEVICE_STATE_REASON_NONE);
 	}
 
+	if (master)
+		master_device = nm_active_connection_get_device (master);
+
 	req = nm_act_request_new (connection,
 	                          specific_object,
 	                          user_requested,
 	                          sender_uid,
+	                          dbus_sender,
 	                          assumed,
-	                          (gpointer) device,
-	                          master);
-	success = nm_device_activate (device, req, error);
-	g_object_unref (req);
+	                          device,
+	                          master_device);
+	g_assert (req);
+	nm_device_activate (device, req);
 
-	return success ? NM_ACTIVE_CONNECTION (req) : NULL;
+	return NM_ACTIVE_CONNECTION (req);
 }
 
 /**
@@ -2538,48 +2604,50 @@ static NMActiveConnection *
 activate_vpn_connection (NMManager *self,
                          NMConnection *connection,
                          const char *specific_object,
-                         const char *device_path,
                          gulong sender_uid,
                          GError **error)
 {
 	NMManagerPrivate *priv = NM_MANAGER_GET_PRIVATE (self);
-	NMActRequest *parent_req = NULL;
+	NMActiveConnection *parent = NULL;
 	NMDevice *device = NULL;
 	GSList *iter;
 
 	if (specific_object) {
 		/* Find the specifc connection the client requested we use */
-		parent_req = nm_manager_get_act_request_by_path (self, specific_object, &device);
-		if (!parent_req) {
+		parent = active_connection_get_by_path (self, specific_object);
+		if (!parent) {
 			g_set_error_literal (error, NM_MANAGER_ERROR, NM_MANAGER_ERROR_CONNECTION_NOT_ACTIVE,
 			                     "Base connection for VPN connection not active.");
 			return NULL;
 		}
 	} else {
-		/* Just find the current default connection */
-		for (iter = priv->devices; iter; iter = g_slist_next (iter)) {
-			NMDevice *candidate = NM_DEVICE (iter->data);
-			NMActRequest *candidate_req;
+		for (iter = priv->active_connections; iter; iter = g_slist_next (iter)) {
+			NMActiveConnection *candidate = iter->data;
 
-			candidate_req = nm_device_get_act_request (candidate);
-			if (candidate_req && nm_active_connection_get_default (NM_ACTIVE_CONNECTION (candidate_req))) {
-				device = candidate;
-				parent_req = candidate_req;
+			if (nm_active_connection_get_default (candidate)) {
+				parent = candidate;
 				break;
 			}
 		}
 	}
 
-	if (!device || !parent_req) {
+	if (!parent) {
+		g_set_error_literal (error, NM_MANAGER_ERROR, NM_MANAGER_ERROR_UNKNOWN_CONNECTION,
+		                     "Could not find source connection.");
+		return NULL;
+	}
+
+	device = nm_active_connection_get_device (parent);
+	if (!device) {
 		g_set_error_literal (error, NM_MANAGER_ERROR, NM_MANAGER_ERROR_UNKNOWN_DEVICE,
-		                     "Could not find source connection, or the source connection had no active device.");
+		                     "Source connection had no active device.");
 		return NULL;
 	}
 
 	return nm_vpn_manager_activate_connection (priv->vpn_manager,
 	                                           connection,
 	                                           device,
-	                                           nm_active_connection_get_path (NM_ACTIVE_CONNECTION (parent_req)),
+	                                           nm_active_connection_get_path (parent),
 	                                           TRUE,
 	                                           sender_uid,
 	                                           error);
@@ -2601,7 +2669,7 @@ nm_manager_activate_connection (NMManager *manager,
 	char *iface;
 	NMDevice *master_device = NULL;
 	NMConnection *master_connection = NULL;
-	NMActiveConnection *master_ac = NULL;
+	NMActiveConnection *master_ac = NULL, *ac = NULL;
 
 	g_return_val_if_fail (manager != NULL, NULL);
 	g_return_val_if_fail (connection != NULL, NULL);
@@ -2626,8 +2694,10 @@ nm_manager_activate_connection (NMManager *manager,
 	}
 
 	/* VPN ? */
-	if (nm_connection_is_type (connection, NM_SETTING_VPN_SETTING_NAME))
-		return activate_vpn_connection (manager, connection, specific_object, device_path, sender_uid, error);
+	if (nm_connection_is_type (connection, NM_SETTING_VPN_SETTING_NAME)) {
+		ac = activate_vpn_connection (manager, connection, specific_object, sender_uid, error);
+		goto activated;
+	}
 
 	/* Device-based connection */
 	if (device_path) {
@@ -2751,15 +2821,22 @@ nm_manager_activate_connection (NMManager *manager,
 		            nm_active_connection_get_path (master_ac));
 	}
 
-	return internal_activate_device (manager,
-	                                 device,
-	                                 connection,
-	                                 specific_object,
-	                                 dbus_sender ? TRUE : FALSE,
-	                                 dbus_sender ? sender_uid : 0,
-	                                 FALSE,
-	                                 master_ac,
-	                                 error);
+	ac = internal_activate_device (manager,
+	                               device,
+	                               connection,
+	                               specific_object,
+	                               dbus_sender ? TRUE : FALSE,
+	                               dbus_sender ? sender_uid : 0,
+	                               dbus_sender,
+	                               FALSE,
+	                               master_ac,
+	                               error);
+
+activated:
+	if (ac)
+		active_connection_add (manager, ac);
+
+	return ac;
 }
 
 /* 
@@ -2797,9 +2874,7 @@ pending_activate (NMManager *self, PendingActivation *pending)
 	                                     &error);
 	g_free (sender);
 
-	if (ac)
-		g_object_notify (G_OBJECT (pending->manager), NM_MANAGER_ACTIVE_CONNECTIONS);
-	else {
+	if (!ac) {
 		nm_log_warn (LOGD_CORE, "connection %s failed to activate: (%d) %s",
 		             pending->connection_path,
 		             error ? error->code : -1,
@@ -2926,41 +3001,35 @@ nm_manager_deactivate_connection (NMManager *manager,
                                   GError **error)
 {
 	NMManagerPrivate *priv = NM_MANAGER_GET_PRIVATE (manager);
-	GSList *iter;
+	NMActiveConnection *active;
 	gboolean success = FALSE;
-	NMVPNConnectionStateReason vpn_reason = NM_VPN_CONNECTION_STATE_REASON_USER_DISCONNECTED;
 
-	/* Check for device connections first */
-	for (iter = priv->devices; iter; iter = g_slist_next (iter)) {
-		NMDevice *device = NM_DEVICE (iter->data);
-		NMActRequest *req;
+	active = active_connection_get_by_path (manager, connection_path);
+	if (!active) {
+		g_set_error_literal (error, NM_MANAGER_ERROR, NM_MANAGER_ERROR_CONNECTION_NOT_ACTIVE,
+		                     "The connection was not active.");
+		return FALSE;
+	}
 
-		req = nm_device_get_act_request (device);
-		if (!req)
-			continue;
+	if (NM_IS_VPN_CONNECTION (active)) {
+		NMVPNConnectionStateReason vpn_reason = NM_VPN_CONNECTION_STATE_REASON_USER_DISCONNECTED;
 
-		if (!strcmp (connection_path, nm_active_connection_get_path (NM_ACTIVE_CONNECTION (req)))) {
-			nm_device_state_changed (device,
-			                         NM_DEVICE_STATE_DISCONNECTED,
-			                         reason);
+		if (reason == NM_DEVICE_STATE_REASON_CONNECTION_REMOVED)
+			vpn_reason = NM_VPN_CONNECTION_STATE_REASON_CONNECTION_REMOVED;
+		if (nm_vpn_manager_deactivate_connection (priv->vpn_manager, NM_VPN_CONNECTION (active), vpn_reason))
 			success = TRUE;
-			goto done;
-		}
-	}
-
-	/* Check for VPN connections next */
-	if (reason == NM_DEVICE_STATE_REASON_CONNECTION_REMOVED)
-		vpn_reason = NM_VPN_CONNECTION_STATE_REASON_CONNECTION_REMOVED;
-	if (nm_vpn_manager_deactivate_connection (priv->vpn_manager, connection_path, vpn_reason)) {
-		success = TRUE;
 	} else {
-		g_set_error (error,
-		             NM_MANAGER_ERROR, NM_MANAGER_ERROR_CONNECTION_NOT_ACTIVE,
-		             "%s", "The connection was not active.");
+		g_assert (NM_IS_ACT_REQUEST (active));
+		/* FIXME: use DEACTIVATING state */
+		nm_device_state_changed (nm_active_connection_get_device (active),
+		                         NM_DEVICE_STATE_DISCONNECTED,
+		                         reason);
+		success = TRUE;
 	}
 
-done:
-	g_object_notify (G_OBJECT (manager), NM_MANAGER_ACTIVE_CONNECTIONS);
+	if (success)
+		g_object_notify (G_OBJECT (manager), NM_MANAGER_ACTIVE_CONNECTIONS);
+
 	return success;
 }
 
@@ -3021,25 +3090,16 @@ impl_manager_deactivate_connection (NMManager *self,
 	gulong sender_uid = G_MAXULONG;
 	char *error_desc = NULL;
 
-	/* Check for device connections first */
-	for (iter = priv->devices; iter; iter = g_slist_next (iter)) {
-		NMActRequest *req;
-		const char *req_path = NULL;
-
-		req = nm_device_get_act_request (NM_DEVICE (iter->data));
-		if (req)
-			req_path = nm_active_connection_get_path (NM_ACTIVE_CONNECTION (req));
+	/* Find the connection by its object path */
+	for (iter = priv->active_connections; iter; iter = g_slist_next (iter)) {
+		NMActiveConnection *ac = iter->data;
 
-		if (req_path && !strcmp (active_path, req_path)) {
-			connection = nm_act_request_get_connection (req);
+		if (g_strcmp0 (nm_active_connection_get_path (ac), active_path) == 0) {
+			connection = nm_active_connection_get_connection (ac);
 			break;
 		}
 	}
 
-	/* Maybe it's a VPN */
-	if (!connection)
-		connection = nm_vpn_manager_get_connection_for_active (priv->vpn_manager, active_path);
-
 	if (!connection) {
 		error = g_error_new_literal (NM_MANAGER_ERROR,
 		                             NM_MANAGER_ERROR_CONNECTION_NOT_ACTIVE,
@@ -3275,16 +3335,16 @@ impl_manager_sleep (NMManager *self,
 }
 
 static void
-upower_sleeping_cb (DBusGProxy *proxy, gpointer user_data)
+sleeping_cb (DBusGProxy *proxy, gpointer user_data)
 {
-	nm_log_dbg (LOGD_SUSPEND, "Received UPower sleeping signal");
+	nm_log_dbg (LOGD_SUSPEND, "Received sleeping signal");
 	_internal_sleep (NM_MANAGER (user_data), TRUE);
 }
 
 static void
-upower_resuming_cb (DBusGProxy *proxy, gpointer user_data)
+resuming_cb (DBusGProxy *proxy, gpointer user_data)
 {
-	nm_log_dbg (LOGD_SUSPEND, "Received UPower resuming signal");
+	nm_log_dbg (LOGD_SUSPEND, "Received resuming signal");
 	_internal_sleep (NM_MANAGER (user_data), FALSE);
 }
 
@@ -3517,11 +3577,13 @@ impl_manager_set_logging (NMManager *manager,
 	return FALSE;
 }
 
-GPtrArray *
-nm_manager_get_active_connections_by_connection (NMManager *manager,
-                                                 NMConnection *connection)
+static void
+impl_manager_get_logging (NMManager *manager,
+                          char **level,
+                          char **domains)
 {
-	return get_active_connections (manager, connection);
+	*level = g_strdup (nm_logging_level_to_string ());
+	*domains = g_strdup (nm_logging_domains_to_string ());
 }
 
 void
@@ -3971,6 +4033,7 @@ dispose (GObject *object)
 	NMManagerPrivate *priv = NM_MANAGER_GET_PRIVATE (manager);
 	DBusGConnection *bus;
 	DBusConnection *dbus_connection;
+	GSList *iter;
 
 	if (priv->disposed) {
 		G_OBJECT_CLASS (nm_manager_parent_class)->dispose (object);
@@ -3990,6 +4053,17 @@ dispose (GObject *object)
 		                                   TRUE);
 	}
 
+	if (priv->ac_cleanup_id) {
+		g_source_remove (priv->ac_cleanup_id);
+		priv->ac_cleanup_id = 0;
+	}
+
+	for (iter = priv->active_connections; iter; iter = g_slist_next (iter)) {
+		g_signal_handlers_disconnect_by_func (iter->data, active_connection_state_changed, object);
+		g_object_unref (iter->data);
+	}
+	g_slist_free (priv->active_connections);
+
 #if WITH_CONCHECK
 	if (priv->connectivity) {
 		g_object_unref (priv->connectivity);
@@ -4000,15 +4074,6 @@ dispose (GObject *object)
 	g_free (priv->hostname);
 
 	g_object_unref (priv->settings);
-
-	if (priv->vpn_manager_activated_id) {
-		g_source_remove (priv->vpn_manager_activated_id);
-		priv->vpn_manager_activated_id = 0;
-	}
-	if (priv->vpn_manager_deactivated_id) {
-		g_source_remove (priv->vpn_manager_deactivated_id);
-		priv->vpn_manager_deactivated_id = 0;
-	}
 	g_object_unref (priv->vpn_manager);
 
 	if (priv->modem_added_id) {
@@ -4036,8 +4101,8 @@ dispose (GObject *object)
 	if (priv->aipd_proxy)
 		g_object_unref (priv->aipd_proxy);
 
-	if (priv->upower_proxy)
-		g_object_unref (priv->upower_proxy);
+	if (priv->sleep_monitor)
+		g_object_unref (priv->sleep_monitor);
 
 	if (priv->fw_monitor) {
 		if (priv->fw_monitor_id)
@@ -4201,6 +4266,9 @@ get_property (GObject *object, guint prop_id,
 {
 	NMManager *self = NM_MANAGER (object);
 	NMManagerPrivate *priv = NM_MANAGER_GET_PRIVATE (self);
+	GSList *iter;
+	GPtrArray *active;
+	const char *path;
 
 	switch (prop_id) {
 	case PROP_VERSION:
@@ -4232,7 +4300,12 @@ get_property (GObject *object, guint prop_id,
 		g_value_set_boolean (value, priv->radio_states[RFKILL_TYPE_WIMAX].hw_enabled);
 		break;
 	case PROP_ACTIVE_CONNECTIONS:
-		g_value_take_boxed (value, get_active_connections (self, NULL));
+		active = g_ptr_array_sized_new (3);
+		for (iter = priv->active_connections; iter; iter = g_slist_next (iter)) {
+			path = nm_active_connection_get_path (NM_ACTIVE_CONNECTION (iter->data));
+			g_ptr_array_add (active, g_strdup (path));
+		}
+		g_value_take_boxed (value, active);
 		break;
 	case PROP_HOSTNAME:
 		g_value_set_string (value, priv->hostname);
@@ -4251,28 +4324,15 @@ periodic_update_active_connection_timestamps (gpointer user_data)
 {
 	NMManager *manager = NM_MANAGER (user_data);
 	NMManagerPrivate *priv = NM_MANAGER_GET_PRIVATE (manager);
-	GPtrArray *active;
-	int i;
-
-	active = get_active_connections (manager, NULL);
-
-	for (i = 0; i < active->len; i++) {
-		const char *active_path = g_ptr_array_index (active, i);
-		NMActRequest *req;
-		NMDevice *device = NULL;
+	GSList *iter;
 
-		req = nm_manager_get_act_request_by_path (manager, active_path, &device);
-		if (device && nm_device_get_state (device) == NM_DEVICE_STATE_ACTIVATED)
-			nm_settings_connection_update_timestamp (NM_SETTINGS_CONNECTION (nm_act_request_get_connection (req)),
-			                                         (guint64) time (NULL), FALSE);
-		else {
-			/* The connection is probably VPN */
-			NMVPNConnection *vpn_con;
+	for (iter = priv->active_connections; iter; iter = g_slist_next (iter)) {
+		NMActiveConnection *ac = iter->data;
+		NMSettingsConnection *connection;
 
-			vpn_con = nm_vpn_manager_get_vpn_connection_for_active (priv->vpn_manager, active_path);
-			if (vpn_con && nm_vpn_connection_get_vpn_state (vpn_con) == NM_VPN_CONNECTION_STATE_ACTIVATED)
-				nm_settings_connection_update_timestamp (NM_SETTINGS_CONNECTION (nm_vpn_connection_get_connection (vpn_con)),
-				                                         (guint64) time (NULL), FALSE);
+		if (nm_active_connection_get_state (ac) == NM_ACTIVE_CONNECTION_STATE_ACTIVATED) {
+			connection = NM_SETTINGS_CONNECTION (nm_active_connection_get_connection (ac));
+			nm_settings_connection_update_timestamp (connection, (guint64) time (NULL), FALSE);
 		}
 	}
 
@@ -4329,10 +4389,6 @@ nm_manager_init (NMManager *manager)
 	                                           G_CALLBACK (modem_removed), manager);
 
 	priv->vpn_manager = nm_vpn_manager_get ();
-	priv->vpn_manager_activated_id = g_signal_connect (G_OBJECT (priv->vpn_manager), "connection-activated",
-	                                                   G_CALLBACK (vpn_manager_connection_activated_cb), manager);
-	priv->vpn_manager_deactivated_id = g_signal_connect (G_OBJECT (priv->vpn_manager), "connection-deactivated",
-	                                                   G_CALLBACK (vpn_manager_connection_deactivated_cb), manager);
 
 	g_connection = nm_dbus_manager_get_connection (priv->dbus_mgr);
 
@@ -4359,23 +4415,12 @@ nm_manager_init (NMManager *manager)
 	} else
 		nm_log_warn (LOGD_AUTOIP4, "could not initialize avahi-autoipd D-Bus proxy");
 
-	/* upower sleep/wake handling */
-	priv->upower_proxy = dbus_g_proxy_new_for_name (g_connection,
-	                                                UPOWER_DBUS_SERVICE,
-	                                                "/org/freedesktop/UPower",
-	                                                "org.freedesktop.UPower");
-	if (priv->upower_proxy) {
-		dbus_g_proxy_add_signal (priv->upower_proxy, "Sleeping", G_TYPE_INVALID);
-		dbus_g_proxy_connect_signal (priv->upower_proxy, "Sleeping",
-		                             G_CALLBACK (upower_sleeping_cb),
-		                             manager, NULL);
-
-		dbus_g_proxy_add_signal (priv->upower_proxy, "Resuming", G_TYPE_INVALID);
-		dbus_g_proxy_connect_signal (priv->upower_proxy, "Resuming",
-		                             G_CALLBACK (upower_resuming_cb),
-		                             manager, NULL);
-	} else
-		nm_log_warn (LOGD_SUSPEND, "could not initialize UPower D-Bus proxy");
+	/* sleep/wake handling */
+	priv->sleep_monitor = nm_sleep_monitor_get ();
+	g_signal_connect (priv->sleep_monitor, "sleeping",
+	                  G_CALLBACK (sleeping_cb), manager);
+	g_signal_connect (priv->sleep_monitor, "resuming",
+	                  G_CALLBACK (resuming_cb), manager);
 
 	/* Listen for authorization changes */
 	nm_auth_changed_func_register (authority_changed_cb, manager);
@@ -4563,6 +4608,22 @@ nm_manager_class_init (NMManagerClass *manager_class)
 		              g_cclosure_marshal_VOID__VOID,
 		              G_TYPE_NONE, 0);
 
+	signals[ACTIVE_CONNECTION_ADDED] =
+		g_signal_new (NM_MANAGER_ACTIVE_CONNECTION_ADDED,
+		              G_OBJECT_CLASS_TYPE (object_class),
+		              G_SIGNAL_RUN_FIRST,
+		              0, NULL, NULL,
+		              g_cclosure_marshal_VOID__OBJECT,
+		              G_TYPE_NONE, 1, G_TYPE_OBJECT);
+
+	signals[ACTIVE_CONNECTION_REMOVED] =
+		g_signal_new (NM_MANAGER_ACTIVE_CONNECTION_REMOVED,
+		              G_OBJECT_CLASS_TYPE (object_class),
+		              G_SIGNAL_RUN_FIRST,
+		              0, NULL, NULL,
+		              g_cclosure_marshal_VOID__OBJECT,
+		              G_TYPE_NONE, 1, G_TYPE_OBJECT);
+
 	dbus_g_object_type_install_info (G_TYPE_FROM_CLASS (manager_class),
 	                                 &dbus_glib_nm_manager_object_info);
 
diff --git a/src/nm-manager.h b/src/nm-manager.h
index 91d1c410..66d06783 100644
--- a/src/nm-manager.h
+++ b/src/nm-manager.h
@@ -63,6 +63,11 @@ typedef enum {
 #define NM_MANAGER_HOSTNAME "hostname"
 #define NM_MANAGER_SLEEPING "sleeping"
 
+/* Internal signals */
+#define NM_MANAGER_ACTIVE_CONNECTION_ADDED   "active-connection-added"
+#define NM_MANAGER_ACTIVE_CONNECTION_REMOVED "active-connection-removed"
+
+
 typedef struct {
 	GObject parent;
 } NMManager;
@@ -95,6 +100,8 @@ NMManager *nm_manager_get (void);
 
 void nm_manager_start (NMManager *manager);
 
+const GSList *nm_manager_get_active_connections (NMManager *manager);
+
 /* Device handling */
 
 GSList *nm_manager_get_devices (NMManager *manager);
@@ -119,7 +126,4 @@ gboolean nm_manager_deactivate_connection (NMManager *manager,
 
 NMState nm_manager_get_state (NMManager *manager);
 
-GPtrArray * nm_manager_get_active_connections_by_connection (NMManager *manager,
-                                                             NMConnection *connection);
-
 #endif /* NM_MANAGER_H */
diff --git a/src/nm-netlink-compat.c b/src/nm-netlink-compat.c
index e30ec37a..68ee1215 100644
--- a/src/nm-netlink-compat.c
+++ b/src/nm-netlink-compat.c
@@ -29,7 +29,7 @@
 #include "nm-logging.h"
 #include "nm-netlink-compat.h"
 
-#ifndef HAVE_LIBNL1
+#if HAVE_LIBNL != 1
 struct rtnl_nexthop *
 nm_netlink_get_nh (struct rtnl_route * route)
 {
@@ -93,7 +93,7 @@ rtnl_route_get_dst_len(struct rtnl_route * rtnlroute)
 }
 #endif
 
-#ifdef HAVE_LIBNL1
+#if HAVE_LIBNL == 1
 int
 nl_compat_error (int err)
 {
diff --git a/src/nm-netlink-compat.h b/src/nm-netlink-compat.h
index eb0926ad..80df0967 100644
--- a/src/nm-netlink-compat.h
+++ b/src/nm-netlink-compat.h
@@ -43,7 +43,7 @@
 #include 
 
 /* libnl-1 API compatibility for libnl-2/3*/
-#ifndef HAVE_LIBNL1
+#if HAVE_LIBNL != 1
 
 struct rtnl_nexthop * nm_netlink_get_nh(struct rtnl_route *);
 int rtnl_route_get_oif(struct rtnl_route *);
@@ -54,7 +54,7 @@ struct nl_addr * rtnl_route_get_gateway(struct rtnl_route *);
 #endif
 
 /* libnl-2 API compatibility for libnl-3 */
-#ifdef HAVE_LIBNL3
+#if HAVE_LIBNL == 3
 static inline int
 __rtnl_link_alloc_cache (struct nl_sock *h, struct nl_cache **cache)
 {
@@ -65,15 +65,15 @@ __rtnl_link_alloc_cache (struct nl_sock *h, struct nl_cache **cache)
 
 
 /* libnl-2.0 compat functions */
-#ifdef HAVE_LIBNL2
+#if HAVE_LIBNL == 2
 
 /* functions with similar prototypes */
 #define nlmsg_datalen nlmsg_len
-#endif  /* HAVE_LIBNL2 */
+#endif
 
 
 /* libnl-1.0 compat functions */
-#ifdef HAVE_LIBNL1
+#if HAVE_LIBNL == 1
 
 #define nl_sock nl_handle
 
@@ -204,10 +204,10 @@ __nl_cache_include (struct nl_cache *cache, struct nl_object *obj, change_func_t
 #define NLE_PERM                28
 #define NLE_PKTLOC_FILE         29
 
-#endif  /* HAVE_LIBNL1 */
+#endif
 
 /* Stuff that only libnl3 has */
-#if defined(HAVE_LIBNL1) || defined(HAVE_LIBNL2)
+#if HAVE_LIBNL == 1 || HAVE_LIBNL == 2
 
 static inline int
 rtnl_link_bond_add (struct nl_sock *h, const char *name, void *data)
@@ -276,6 +276,6 @@ rtnl_link_delete(struct nl_sock *sk, const struct rtnl_link *l)
 	/* Operation only in libnl3 */
 	return -NLE_OPNOTSUPP;
 }
-#endif  /* HAVE_LIBNL1 || HAVE_LIBNL2 */
+#endif
 
 #endif /* NM_NETLINK_COMPAT_H */
diff --git a/src/nm-policy-hostname.c b/src/nm-policy-hostname.c
index f98aa9c6..0ea16158 100644
--- a/src/nm-policy-hostname.c
+++ b/src/nm-policy-hostname.c
@@ -15,7 +15,7 @@
  * with this program; if not, write to the Free Software Foundation, Inc.,
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  *
- * Copyright (C) 2004 - 2011 Red Hat, Inc.
+ * Copyright (C) 2004 - 2012 Red Hat, Inc.
  * Copyright (C) 2007 - 2008 Novell, Inc.
  */
 
@@ -23,7 +23,6 @@
 #include 
 #include 
 #include 
-#include 
 #include 
 
 #include 
@@ -107,7 +106,7 @@ hostname_thread_worker (gpointer data)
 		nm_log_dbg (LOGD_DNS, "(%p) address reverse-lookup returned hostname '%s'",
 		            ht, ht->hostname);
 		for (i = 0; i < strlen (ht->hostname); i++)
-			ht->hostname[i] = tolower (ht->hostname[i]);
+			ht->hostname[i] = g_ascii_tolower (ht->hostname[i]);
 	} else {
 		nm_log_dbg (LOGD_DNS, "(%p) address reverse-lookup failed: (%d) %s",
 		            ht, ht->ret, gai_strerror (ht->ret));
@@ -140,7 +139,6 @@ hostname4_thread_new (guint32 ip4_addr,
                       gpointer user_data)
 {
 	HostnameThread *ht;
-	struct sockaddr_in addr4;
 	char buf[INET_ADDRSTRLEN + 1];
 
 	ht = g_malloc0 (sizeof (HostnameThread));
@@ -161,7 +159,7 @@ hostname4_thread_new (guint32 ip4_addr,
 		return NULL;
 	}
 
-	if (!inet_ntop (AF_INET, &addr4.sin_addr, buf, sizeof (buf)))
+	if (!inet_ntop (AF_INET, &ht->addr4.sin_addr, buf, sizeof (buf)))
 		strcpy (buf, "(unknown)");
 
 	nm_log_dbg (LOGD_DNS, "(%p) started IPv4 reverse-lookup thread for address '%s'",
diff --git a/src/nm-policy.c b/src/nm-policy.c
index a6accfcb..420a9411 100644
--- a/src/nm-policy.c
+++ b/src/nm-policy.c
@@ -24,7 +24,6 @@
 #include 
 #include 
 #include 
-#include 
 
 #include "nm-policy.h"
 #include "NetworkManagerUtils.h"
@@ -41,6 +40,8 @@
 #include "nm-policy-hostname.h"
 #include "nm-manager-auth.h"
 #include "nm-firewall-manager.h"
+#include "nm-dispatcher.h"
+#include "nm-utils.h"
 
 struct NMPolicy {
 	NMManager *manager;
@@ -50,9 +51,7 @@ struct NMPolicy {
 	GSList *settings_ids;
 	GSList *dev_ids;
 
-	NMVPNManager *vpn_manager;
-	gulong vpn_activated_id;
-	gulong vpn_deactivated_id;
+	GSList *pending_secondaries;
 
 	NMFirewallManager *fw_manager;
 	gulong fw_started_id;
@@ -103,7 +102,8 @@ get_best_ip4_device (NMManager *manager)
 		gboolean can_default = FALSE;
 		const char *method = NULL;
 
-		if (nm_device_get_state (dev) != NM_DEVICE_STATE_ACTIVATED)
+		if (   nm_device_get_state (dev) != NM_DEVICE_STATE_ACTIVATED
+		    && nm_device_get_state (dev) != NM_DEVICE_STATE_SECONDARIES)
 			continue;
 
 		ip4_config = nm_device_get_ip4_config (dev);
@@ -175,7 +175,8 @@ get_best_ip6_device (NMManager *manager)
 		gboolean can_default = FALSE;
 		const char *method = NULL;
 
-		if (nm_device_get_state (dev) != NM_DEVICE_STATE_ACTIVATED)
+		if (   nm_device_get_state (dev) != NM_DEVICE_STATE_ACTIVATED
+		    && nm_device_get_state (dev) != NM_DEVICE_STATE_SECONDARIES)
 			continue;
 
 		ip6_config = nm_device_get_ip6_config (dev);
@@ -259,7 +260,7 @@ _set_hostname (NMPolicy *policy,
 	g_object_unref (dns_mgr);
 
 	if (nm_policy_set_system_hostname (policy->cur_hostname, msg))
-		nm_utils_call_dispatcher ("hostname", NULL, NULL, NULL, NULL, NULL);
+		nm_dispatcher_call (DISPATCHER_ACTION_HOSTNAME, NULL, NULL, NULL, NULL);
 }
 
 static void
@@ -339,7 +340,7 @@ update_system_hostname (NMPolicy *policy, NMDevice *best4, NMDevice *best6)
 			if (dhcp_hostname && strlen (dhcp_hostname)) {
 				/* Sanity check; strip leading spaces */
 				while (*p) {
-					if (!isblank (*p++)) {
+					if (!g_ascii_isspace (*p++)) {
 						_set_hostname (policy, p-1, "from DHCPv4");
 						return;
 					}
@@ -358,7 +359,7 @@ update_system_hostname (NMPolicy *policy, NMDevice *best4, NMDevice *best6)
 			if (dhcp_hostname && strlen (dhcp_hostname)) {
 				/* Sanity check; strip leading spaces */
 				while (*p) {
-					if (!isblank (*p++)) {
+					if (!g_ascii_isspace (*p++)) {
 						_set_hostname (policy, p-1, "from DHCPv6");
 						return;
 					}
@@ -429,26 +430,17 @@ update_default_ac (NMPolicy *policy,
                    NMActiveConnection *best,
                    void (*set_active_func)(NMActiveConnection*, gboolean))
 {
-	GSList *devices, *vpns, *iter;
-	NMActRequest *req;
+	const GSList *connections, *iter;
 
 	/* Clear the 'default[6]' flag on all active connections that aren't the new
 	 * default active connection.  We'll set the new default after; this ensures
 	 * we don't ever have two marked 'default[6]' simultaneously.
 	 */
-	devices = nm_manager_get_devices (policy->manager);
-	for (iter = devices; iter; iter = g_slist_next (iter)) {
-		req = nm_device_get_act_request (NM_DEVICE (iter->data));
-		if (req && (NM_ACTIVE_CONNECTION (req) != best))
-			set_active_func (NM_ACTIVE_CONNECTION (req), FALSE);
-	}
-
-	vpns = nm_vpn_manager_get_active_connections (policy->vpn_manager);
-	for (iter = vpns; iter; iter = g_slist_next (iter)) {
+	connections = nm_manager_get_active_connections (policy->manager);
+	for (iter = connections; iter; iter = g_slist_next (iter)) {
 		if (NM_ACTIVE_CONNECTION (iter->data) != best)
 			set_active_func (NM_ACTIVE_CONNECTION (iter->data), FALSE);
 	}
-	g_slist_free (vpns);
 
 	/* Mark new default active connection */
 	if (best)
@@ -464,21 +456,27 @@ get_best_ip4_config (NMPolicy *policy,
                      NMDevice **out_device,
                      NMVPNConnection **out_vpn)
 {
-	GSList *vpns, *iter;
+	const GSList *connections, *iter;
 	NMDevice *device;
 	NMActRequest *req = NULL;
 	NMIP4Config *ip4_config = NULL;
 
 	/* If a VPN connection is active, it is preferred */
-	vpns = nm_vpn_manager_get_active_connections (policy->vpn_manager);
-	for (iter = vpns; iter; iter = g_slist_next (iter)) {
-		NMVPNConnection *candidate = NM_VPN_CONNECTION (iter->data);
+	connections = nm_manager_get_active_connections (policy->manager);
+	for (iter = connections; iter; iter = g_slist_next (iter)) {
+		NMActiveConnection *active = NM_ACTIVE_CONNECTION (iter->data);
+		NMVPNConnection *candidate;
 		NMIP4Config *vpn_ip4;
 		NMConnection *tmp;
 		NMSettingIP4Config *s_ip4;
 		NMVPNConnectionState vpn_state;
 
-		tmp = nm_vpn_connection_get_connection (candidate);
+		if (!NM_IS_VPN_CONNECTION (active))
+			continue;
+
+		candidate = NM_VPN_CONNECTION (active);
+
+		tmp = nm_active_connection_get_connection (active);
 		g_assert (tmp);
 
 		vpn_state = nm_vpn_connection_get_vpn_state (candidate);
@@ -504,14 +502,13 @@ get_best_ip4_config (NMPolicy *policy,
 		if (out_vpn)
 			*out_vpn = candidate;
 		if (out_ac)
-			*out_ac = NM_ACTIVE_CONNECTION (candidate);
+			*out_ac = active;
 		if (out_ip_iface)
 			*out_ip_iface = nm_vpn_connection_get_ip_iface (candidate);
 		if (out_ip_ifindex)
 			*out_ip_ifindex = nm_vpn_connection_get_ip_ifindex (candidate);
 		break;
 	}
-	g_slist_free (vpns);
 
 	/* If no VPN connections, we use the best device instead */
 	if (!ip4_config) {
@@ -629,21 +626,27 @@ get_best_ip6_config (NMPolicy *policy,
                      NMDevice **out_device,
                      NMVPNConnection **out_vpn)
 {
-	GSList *vpns, *iter;
+	const GSList *connections, *iter;
 	NMDevice *device;
 	NMActRequest *req = NULL;
 	NMIP6Config *ip6_config = NULL;
 
 	/* If a VPN connection is active, it is preferred */
-	vpns = nm_vpn_manager_get_active_connections (policy->vpn_manager);
-	for (iter = vpns; iter; iter = g_slist_next (iter)) {
-		NMVPNConnection *candidate = NM_VPN_CONNECTION (iter->data);
+	connections = nm_manager_get_active_connections (policy->manager);
+	for (iter = connections; iter; iter = g_slist_next (iter)) {
+		NMActiveConnection *active = NM_ACTIVE_CONNECTION (iter->data);
+		NMVPNConnection *candidate;
 		NMIP6Config *vpn_ip6;
 		NMConnection *tmp;
 		NMSettingIP6Config *s_ip6;
 		NMVPNConnectionState vpn_state;
 
-		tmp = nm_vpn_connection_get_connection (candidate);
+		if (!NM_IS_VPN_CONNECTION (active))
+			continue;
+
+		candidate = NM_VPN_CONNECTION (active);
+
+		tmp = nm_active_connection_get_connection (active);
 		g_assert (tmp);
 
 		vpn_state = nm_vpn_connection_get_vpn_state (candidate);
@@ -676,7 +679,6 @@ get_best_ip6_config (NMPolicy *policy,
 			*out_ip_ifindex = nm_vpn_connection_get_ip_ifindex (candidate);
 		break;
 	}
-	g_slist_free (vpns);
 
 	/* If no VPN connections, we use the best device instead */
 	if (!ip6_config) {
@@ -954,101 +956,83 @@ find_pending_activation (GSList *list, NMDevice *device)
 
 /*****************************************************************************/
 
-static void
-vpn_connection_activated (NMVPNManager *manager,
-                          NMVPNConnection *vpn,
-                          gpointer user_data)
-{
-	NMDnsManager *mgr;
-	NMIP4Config *ip4_config;
-	NMIP6Config *ip6_config;
-	const char *ip_iface;
-
-	mgr = nm_dns_manager_get (NULL);
-	nm_dns_manager_begin_updates (mgr, __func__);
-
-	ip_iface = nm_vpn_connection_get_ip_iface (vpn);
-
-	/* Add the VPN connection's IP configs from DNS */
-
-	ip4_config = nm_vpn_connection_get_ip4_config (vpn);
-	if (ip4_config)
-		nm_dns_manager_add_ip4_config (mgr, ip_iface, ip4_config, NM_DNS_IP_CONFIG_TYPE_VPN);
-
-	ip6_config = nm_vpn_connection_get_ip6_config (vpn);
-	if (ip6_config)
-		nm_dns_manager_add_ip6_config (mgr, ip_iface, ip6_config, NM_DNS_IP_CONFIG_TYPE_VPN);
+typedef struct {
+	NMDevice *device;
+	GSList *secondaries;
+} PendingSecondaryData;
 
-	update_routing_and_dns ((NMPolicy *) user_data, TRUE);
+static PendingSecondaryData *
+pending_secondary_data_new (NMDevice *device, GSList *secondaries)
+{
+	PendingSecondaryData *data;
 
-	nm_dns_manager_end_updates (mgr, __func__);
+	data = g_malloc0 (sizeof (PendingSecondaryData));
+	data->device = g_object_ref (device);
+	data->secondaries = secondaries;
+	return data;
 }
 
 static void
-vpn_connection_deactivated (NMVPNManager *manager,
-                            NMVPNConnection *vpn,
-                            NMVPNConnectionState new_state,
-                            NMVPNConnectionState old_state,
-                            NMVPNConnectionStateReason reason,
-                            gpointer user_data)
+pending_secondary_data_free (PendingSecondaryData *data)
 {
-	NMDnsManager *mgr;
-	NMIP4Config *ip4_config, *parent_ip4 = NULL;
-	NMIP6Config *ip6_config, *parent_ip6 = NULL;
-	const char *ip_iface;
-	NMDevice *parent;
-
-	mgr = nm_dns_manager_get (NULL);
-	nm_dns_manager_begin_updates (mgr, __func__);
-
-	ip_iface = nm_vpn_connection_get_ip_iface (vpn);
-	parent = nm_vpn_connection_get_parent_device (vpn);
-
-	ip4_config = nm_vpn_connection_get_ip4_config (vpn);
-	if (ip4_config) {
-		/* Remove the VPN connection's IP4 config from DNS */
-		nm_dns_manager_remove_ip4_config (mgr, ip_iface, ip4_config);
-
-		/* Re-apply routes and addresses of the VPN connection's parent interface,
-		 * which the VPN might have overridden.
-		 */
-		if (parent) {
-			parent_ip4 = nm_device_get_ip4_config (parent);
-			if (parent_ip4) {
-				if (!nm_system_apply_ip4_config (nm_device_get_ip_ifindex (parent),
-				                                 parent_ip4,
-				                                 nm_device_get_priority (parent),
-				                                 NM_IP4_COMPARE_FLAG_ADDRESSES | NM_IP4_COMPARE_FLAG_ROUTES)) {
-					nm_log_err (LOGD_VPN, "failed to re-apply VPN parent device IPv4 addresses and routes.");
-				}
-			}
-		}
-	}
-
-	ip6_config = nm_vpn_connection_get_ip6_config (vpn);
-	if (ip6_config) {
-		/* Remove the VPN connection's IP6 config from DNS */
-		nm_dns_manager_remove_ip6_config (mgr, ip_iface, ip6_config);
+	g_object_unref (data->device);
+	nm_utils_slist_free (data->secondaries, g_free);
+	memset (data, 0, sizeof (*data));
+	g_free (data);
+}
 
-		/* Re-apply routes and addresses of the VPN connection's parent interface,
-		 * which the VPN might have overridden.
-		 */
-		if (parent) {
-			parent_ip6 = nm_device_get_ip6_config (parent);
-			if (parent_ip6) {
-				if (!nm_system_apply_ip6_config (nm_device_get_ip_ifindex (parent),
-				                                 parent_ip6,
-				                                 nm_device_get_priority (parent),
-				                                 NM_IP6_COMPARE_FLAG_ADDRESSES | NM_IP6_COMPARE_FLAG_ROUTES)) {
-					nm_log_err (LOGD_VPN, "failed to re-apply VPN parent device IPv6 addresses and routes.");
+static void
+process_secondaries (NMPolicy *policy,
+                     NMActiveConnection *active,
+                     gboolean connected)
+{
+	NMDevice *device = NULL;
+	const char *ac_path;
+	GSList *iter, *iter2;
+
+	nm_log_dbg (LOGD_DEVICE, "Secondary connection '%s' %s; active path '%s'",
+	            nm_active_connection_get_name (active),
+	            connected ? "SUCCEEDED" : "FAILED",
+	            nm_active_connection_get_path (active));
+
+	ac_path = nm_active_connection_get_path (active);
+
+	if (NM_IS_VPN_CONNECTION (active))
+		device = nm_vpn_connection_get_parent_device (NM_VPN_CONNECTION (active));
+
+	for (iter = policy->pending_secondaries; iter; iter = g_slist_next (iter)) {
+		PendingSecondaryData *secondary_data = (PendingSecondaryData *) iter->data;
+		NMDevice *item_device = secondary_data->device;
+
+		if (!device || item_device == device) {
+			for (iter2 = secondary_data->secondaries; iter2; iter2 = g_slist_next (iter2)) {
+				char *list_ac_path = (char *) iter2->data;
+
+				if (g_strcmp0 (ac_path, list_ac_path) == 0) {
+					if (connected) {
+						/* Secondary connection activated */
+						secondary_data->secondaries = g_slist_remove (secondary_data->secondaries, list_ac_path);
+						g_free (list_ac_path);
+						if (!secondary_data->secondaries) {
+							/* None secondary UUID remained -> remove the secondary data item */
+							policy->pending_secondaries = g_slist_remove (policy->pending_secondaries, secondary_data);
+							pending_secondary_data_free (secondary_data);
+							nm_device_state_changed (item_device, NM_DEVICE_STATE_ACTIVATED, NM_DEVICE_STATE_REASON_NONE);
+							return;
+						}
+					} else {
+						/* Secondary connection failed -> do not watch other connections */
+						policy->pending_secondaries = g_slist_remove (policy->pending_secondaries, secondary_data);
+						pending_secondary_data_free (secondary_data);
+						nm_device_state_changed (item_device, NM_DEVICE_STATE_FAILED,
+						                                      NM_DEVICE_STATE_REASON_SECONDARY_CONNECTION_FAILED);
+						return;
+					}
 				}
 			}
+			return;
 		}
 	}
-
-	update_routing_and_dns ((NMPolicy *) user_data, TRUE);
-
-	nm_dns_manager_end_updates (mgr, __func__);
 }
 
 static void
@@ -1204,6 +1188,69 @@ activate_slave_connections (NMPolicy *policy, NMConnection *connection,
 	schedule_activate_all (policy);
 }
 
+static gboolean
+activate_secondary_connections (NMPolicy *policy,
+                                NMConnection *connection,
+                                NMDevice *device)
+{
+	NMSettingConnection *s_con;
+	NMSettingsConnection *settings_con;
+	NMActiveConnection *ac;
+	PendingSecondaryData *secondary_data;
+	GSList *secondary_ac_list = NULL;
+	GError *error = NULL;
+	guint32 i;
+	gboolean success = TRUE;
+
+	s_con = nm_connection_get_setting_connection (connection);
+	g_assert (s_con);
+
+	for (i = 0; i < nm_setting_connection_get_num_secondaries (s_con); i++) {
+		const char *sec_uuid = nm_setting_connection_get_secondary (s_con, i);
+
+		settings_con = nm_settings_get_connection_by_uuid (policy->settings, sec_uuid);
+		if (settings_con) {
+			NMActRequest *req = nm_device_get_act_request (device);
+			g_assert (req);
+
+			nm_log_dbg (LOGD_DEVICE, "Activating secondary connection '%s (%s)' for base connection '%s (%s)'",
+			            nm_connection_get_id (NM_CONNECTION (settings_con)), sec_uuid,
+			            nm_connection_get_id (connection), nm_connection_get_uuid (connection));
+			ac = nm_manager_activate_connection (policy->manager,
+			                                     NM_CONNECTION (settings_con),
+			                                     nm_active_connection_get_path (NM_ACTIVE_CONNECTION (req)),
+			                                     nm_device_get_path (device),
+			                                     nm_act_request_get_dbus_sender (req),
+			                                     &error);
+			if (ac) {
+				secondary_ac_list = g_slist_append (secondary_ac_list,
+				                                    g_strdup (nm_active_connection_get_path (ac)));
+			} else {
+				nm_log_warn (LOGD_DEVICE, "Secondary connection '%s' auto-activation failed: (%d) %s",
+				             sec_uuid,
+				             error ? error->code : 0,
+				             (error && error->message) ? error->message : "unknown");
+				g_clear_error (&error);
+				success = FALSE;
+				break;
+			}
+		} else {
+			nm_log_warn (LOGD_DEVICE, "Secondary connection '%s' auto-activation failed: The connection doesn't exist.",
+			             sec_uuid);
+			success = FALSE;
+			break;
+		}
+	}
+
+	if (success && secondary_ac_list != NULL) {
+		secondary_data = pending_secondary_data_new (device, secondary_ac_list);
+		policy->pending_secondaries = g_slist_append (policy->pending_secondaries, secondary_data);
+	} else
+		nm_utils_slist_free (secondary_ac_list, g_free);
+
+	return success;
+}
+
 static void
 device_state_changed (NMDevice *device,
                       NMDeviceState new_state,
@@ -1216,6 +1263,7 @@ device_state_changed (NMDevice *device,
 	const char *ip_iface = nm_device_get_ip_iface (device);
 	NMIP4Config *ip4_config;
 	NMIP6Config *ip6_config;
+	NMSettingConnection *s_con;
 	NMDnsManager *dns_mgr;
 
 	if (connection)
@@ -1278,22 +1326,16 @@ device_state_changed (NMDevice *device,
 		nm_dns_manager_begin_updates (dns_mgr, __func__);
 
 		ip4_config = nm_device_get_ip4_config (device);
-		if (ip4_config) {
+		if (ip4_config)
 			nm_dns_manager_add_ip4_config (dns_mgr, ip_iface, ip4_config, NM_DNS_IP_CONFIG_TYPE_DEFAULT);
-			update_ip4_dns (policy, dns_mgr);
-		}
 		ip6_config = nm_device_get_ip6_config (device);
-		if (ip6_config) {
+		if (ip6_config)
 			nm_dns_manager_add_ip6_config (dns_mgr, ip_iface, ip6_config, NM_DNS_IP_CONFIG_TYPE_DEFAULT);
-			update_ip6_dns (policy, dns_mgr);
-		}
+
+		update_routing_and_dns (policy, FALSE);
 
 		nm_dns_manager_end_updates (dns_mgr, __func__);
 		g_object_unref (dns_mgr);
-
-		/* And make sure the best devices have the default route */
-		update_ip4_routing (policy, FALSE);
-		update_ip6_routing (policy, FALSE);
 		break;
 	case NM_DEVICE_STATE_UNMANAGED:
 	case NM_DEVICE_STATE_UNAVAILABLE:
@@ -1318,6 +1360,20 @@ device_state_changed (NMDevice *device,
 		 * activation. */
 		activate_slave_connections (policy, connection, device);
 		break;
+	case NM_DEVICE_STATE_SECONDARIES:
+		s_con = nm_connection_get_setting_connection (connection);
+		if (s_con && nm_setting_connection_get_num_secondaries (s_con) > 0) {
+			/* Make routes and DNS up-to-date before activating dependent connections */
+			update_routing_and_dns (policy, FALSE);
+
+			/* Activate secondary (VPN) connections */
+			if (!activate_secondary_connections (policy, connection, device))
+				nm_device_queue_state (device, NM_DEVICE_STATE_FAILED,
+				                       NM_DEVICE_STATE_REASON_SECONDARY_CONNECTION_FAILED);
+		} else
+			nm_device_queue_state (device, NM_DEVICE_STATE_ACTIVATED,
+			                       NM_DEVICE_STATE_REASON_NONE);
+		break;
 
 	default:
 		break;
@@ -1502,6 +1558,145 @@ device_removed (NMManager *manager, NMDevice *device, gpointer user_data)
 	 */
 }
 
+/**************************************************************************/
+
+static void
+vpn_connection_activated (NMPolicy *policy, NMVPNConnection *vpn)
+{
+	NMDnsManager *mgr;
+	NMIP4Config *ip4_config;
+	NMIP6Config *ip6_config;
+	const char *ip_iface;
+
+	mgr = nm_dns_manager_get (NULL);
+	nm_dns_manager_begin_updates (mgr, __func__);
+
+	ip_iface = nm_vpn_connection_get_ip_iface (vpn);
+
+	/* Add the VPN connection's IP configs from DNS */
+
+	ip4_config = nm_vpn_connection_get_ip4_config (vpn);
+	if (ip4_config)
+		nm_dns_manager_add_ip4_config (mgr, ip_iface, ip4_config, NM_DNS_IP_CONFIG_TYPE_VPN);
+
+	ip6_config = nm_vpn_connection_get_ip6_config (vpn);
+	if (ip6_config)
+		nm_dns_manager_add_ip6_config (mgr, ip_iface, ip6_config, NM_DNS_IP_CONFIG_TYPE_VPN);
+
+	update_routing_and_dns (policy, TRUE);
+
+	nm_dns_manager_end_updates (mgr, __func__);
+
+	process_secondaries (policy, NM_ACTIVE_CONNECTION (vpn), TRUE);
+}
+
+static void
+vpn_connection_deactivated (NMPolicy *policy, NMVPNConnection *vpn)
+{
+	NMDnsManager *mgr;
+	NMIP4Config *ip4_config, *parent_ip4 = NULL;
+	NMIP6Config *ip6_config, *parent_ip6 = NULL;
+	const char *ip_iface;
+	NMDevice *parent;
+
+	mgr = nm_dns_manager_get (NULL);
+	nm_dns_manager_begin_updates (mgr, __func__);
+
+	ip_iface = nm_vpn_connection_get_ip_iface (vpn);
+	parent = nm_vpn_connection_get_parent_device (vpn);
+
+	ip4_config = nm_vpn_connection_get_ip4_config (vpn);
+	if (ip4_config) {
+		/* Remove the VPN connection's IP4 config from DNS */
+		nm_dns_manager_remove_ip4_config (mgr, ip_iface, ip4_config);
+
+		/* Re-apply routes and addresses of the VPN connection's parent interface,
+		 * which the VPN might have overridden.
+		 */
+		if (parent) {
+			parent_ip4 = nm_device_get_ip4_config (parent);
+			if (parent_ip4) {
+				if (!nm_system_apply_ip4_config (nm_device_get_ip_ifindex (parent),
+				                                 parent_ip4,
+				                                 nm_device_get_priority (parent),
+				                                 NM_IP4_COMPARE_FLAG_ADDRESSES | NM_IP4_COMPARE_FLAG_ROUTES)) {
+					nm_log_err (LOGD_VPN, "failed to re-apply VPN parent device IPv4 addresses and routes.");
+				}
+			}
+		}
+	}
+
+	ip6_config = nm_vpn_connection_get_ip6_config (vpn);
+	if (ip6_config) {
+		/* Remove the VPN connection's IP6 config from DNS */
+		nm_dns_manager_remove_ip6_config (mgr, ip_iface, ip6_config);
+
+		/* Re-apply routes and addresses of the VPN connection's parent interface,
+		 * which the VPN might have overridden.
+		 */
+		if (parent) {
+			parent_ip6 = nm_device_get_ip6_config (parent);
+			if (parent_ip6) {
+				if (!nm_system_apply_ip6_config (nm_device_get_ip_ifindex (parent),
+				                                 parent_ip6,
+				                                 nm_device_get_priority (parent),
+				                                 NM_IP6_COMPARE_FLAG_ADDRESSES | NM_IP6_COMPARE_FLAG_ROUTES)) {
+					nm_log_err (LOGD_VPN, "failed to re-apply VPN parent device IPv6 addresses and routes.");
+				}
+			}
+		}
+	}
+
+	update_routing_and_dns (policy, TRUE);
+
+	nm_dns_manager_end_updates (mgr, __func__);
+
+	process_secondaries (policy, NM_ACTIVE_CONNECTION (vpn), FALSE);
+}
+
+static void
+active_connection_state_changed (NMActiveConnection *active,
+                                 GParamSpec *pspec,
+                                 NMPolicy *policy)
+{
+	switch (nm_active_connection_get_state (active)) {
+	case NM_ACTIVE_CONNECTION_STATE_ACTIVATED:
+		if (NM_IS_VPN_CONNECTION (active))
+			vpn_connection_activated (policy, NM_VPN_CONNECTION (active));
+		break;
+	case NM_ACTIVE_CONNECTION_STATE_DEACTIVATED:
+		if (NM_IS_VPN_CONNECTION (active))
+			vpn_connection_deactivated (policy, NM_VPN_CONNECTION (active));
+		break;
+	default:
+		break;
+	}
+}
+
+static void
+active_connection_added (NMManager *manager,
+                         NMActiveConnection *active,
+                         gpointer user_data)
+{
+	NMPolicy *policy = (NMPolicy *) user_data;
+
+	g_signal_connect (active, "notify::" NM_ACTIVE_CONNECTION_STATE,
+	                  G_CALLBACK (active_connection_state_changed),
+	                  policy);
+}
+
+static void
+active_connection_removed (NMManager *manager,
+                           NMActiveConnection *active,
+                           gpointer user_data)
+{
+	g_signal_handlers_disconnect_by_func (active,
+	                                      active_connection_state_changed,
+	                                      (NMPolicy *) user_data);
+}
+
+/**************************************************************************/
+
 static void
 schedule_activate_all (NMPolicy *policy)
 {
@@ -1614,25 +1809,26 @@ connection_updated (NMSettings *settings,
 static void
 _deactivate_if_active (NMManager *manager, NMConnection *connection)
 {
-	GPtrArray *list;
-	int i;
+	const GSList *active, *iter;
 
-	list = nm_manager_get_active_connections_by_connection (manager, connection);
-	if (!list)
-		return;
-
-	for (i = 0; i < list->len; i++) {
-		char *path = g_ptr_array_index (list, i);
+	active = nm_manager_get_active_connections (manager);
+	for (iter = active; iter; iter = g_slist_next (iter)) {
+		NMActiveConnection *ac = iter->data;
 		GError *error = NULL;
 
-		if (!nm_manager_deactivate_connection (manager, path, NM_DEVICE_STATE_REASON_CONNECTION_REMOVED, &error)) {
-			nm_log_warn (LOGD_DEVICE, "Connection '%s' disappeared, but error deactivating it: (%d) %s",
-			             nm_connection_get_id (connection), error->code, error->message);
-			g_error_free (error);
+		if (nm_active_connection_get_connection (ac) == connection) {
+			if (!nm_manager_deactivate_connection (manager,
+			                                       nm_active_connection_get_path (ac),
+			                                       NM_DEVICE_STATE_REASON_CONNECTION_REMOVED,
+			                                       &error)) {
+				nm_log_warn (LOGD_DEVICE, "Connection '%s' disappeared, but error deactivating it: (%d) %s",
+					         nm_connection_get_id (connection),
+					         error ? error->code : -1,
+					         error ? error->message : "(unknown)");
+				g_clear_error (&error);
+			}
 		}
-		g_free (path);
 	}
-	g_ptr_array_free (list, TRUE);
 }
 
 static void
@@ -1690,9 +1886,7 @@ _connect_settings_signal (NMPolicy *policy, const char *name, gpointer callback)
 }
 
 NMPolicy *
-nm_policy_new (NMManager *manager,
-               NMVPNManager *vpn_manager,
-               NMSettings *settings)
+nm_policy_new (NMManager *manager, NMSettings *settings)
 {
 	NMPolicy *policy;
 	static gboolean initialized = FALSE;
@@ -1718,14 +1912,6 @@ nm_policy_new (NMManager *manager,
 			policy->orig_hostname = g_strdup (hostname);
 	}
 
-	policy->vpn_manager = g_object_ref (vpn_manager);
-	id = g_signal_connect (policy->vpn_manager, "connection-activated",
-	                       G_CALLBACK (vpn_connection_activated), policy);
-	policy->vpn_activated_id = id;
-	id = g_signal_connect (policy->vpn_manager, "connection-deactivated",
-	                       G_CALLBACK (vpn_connection_deactivated), policy);
-	policy->vpn_deactivated_id = id;
-
 	policy->fw_manager = nm_firewall_manager_get();
 	id = g_signal_connect (policy->fw_manager, "started",
 	                       G_CALLBACK (firewall_started), policy);
@@ -1737,6 +1923,8 @@ nm_policy_new (NMManager *manager,
 	_connect_manager_signal (policy, "notify::" NM_MANAGER_NETWORKING_ENABLED, sleeping_changed);
 	_connect_manager_signal (policy, "device-added", device_added);
 	_connect_manager_signal (policy, "device-removed", device_removed);
+	_connect_manager_signal (policy, NM_MANAGER_ACTIVE_CONNECTION_ADDED, active_connection_added);
+	_connect_manager_signal (policy, NM_MANAGER_ACTIVE_CONNECTION_REMOVED, active_connection_removed);
 
 	_connect_settings_signal (policy, NM_SETTINGS_SIGNAL_CONNECTIONS_LOADED, connections_loaded);
 	_connect_settings_signal (policy, NM_SETTINGS_SIGNAL_CONNECTION_ADDED, connection_added);
@@ -1756,7 +1944,7 @@ nm_policy_new (NMManager *manager,
 void
 nm_policy_destroy (NMPolicy *policy)
 {
-	GSList *iter;
+	const GSList *connections, *iter;
 
 	g_return_if_fail (policy != NULL);
 
@@ -1771,9 +1959,8 @@ nm_policy_destroy (NMPolicy *policy)
 	g_slist_foreach (policy->pending_activation_checks, (GFunc) activate_data_free, NULL);
 	g_slist_free (policy->pending_activation_checks);
 
-	g_signal_handler_disconnect (policy->vpn_manager, policy->vpn_activated_id);
-	g_signal_handler_disconnect (policy->vpn_manager, policy->vpn_deactivated_id);
-	g_object_unref (policy->vpn_manager);
+	g_slist_foreach (policy->pending_secondaries, (GFunc) pending_secondary_data_free, NULL);
+	g_slist_free (policy->pending_secondaries);
 
 	g_signal_handler_disconnect (policy->fw_manager, policy->fw_started_id);
 	g_object_unref (policy->fw_manager);
@@ -1794,6 +1981,10 @@ nm_policy_destroy (NMPolicy *policy)
 	}
 	g_slist_free (policy->dev_ids);
 
+	connections = nm_manager_get_active_connections (policy->manager);
+	for (iter = connections; iter; iter = g_slist_next (iter))
+		active_connection_removed (policy->manager, NM_ACTIVE_CONNECTION (iter->data), policy);
+
 	if (policy->reset_retries_id)
 		g_source_remove (policy->reset_retries_id);
 
diff --git a/src/nm-policy.h b/src/nm-policy.h
index 33796bca..c00c3ded 100644
--- a/src/nm-policy.h
+++ b/src/nm-policy.h
@@ -23,14 +23,11 @@
 #define NM_POLICY_H
 
 #include "nm-manager.h"
-#include "nm-vpn-manager.h"
 #include "nm-settings.h"
 
 typedef struct NMPolicy NMPolicy;
 
-NMPolicy *nm_policy_new (NMManager *manager,
-                         NMVPNManager *vpn_manager,
-                         NMSettings *settings);
+NMPolicy *nm_policy_new (NMManager *manager, NMSettings *settings);
 void nm_policy_destroy (NMPolicy *policy);
 
 #endif /* NM_POLICY_H */
diff --git a/src/nm-session-monitor-ck.c b/src/nm-session-monitor-ck.c
index 72ffc9ff..02e2d06e 100644
--- a/src/nm-session-monitor-ck.c
+++ b/src/nm-session-monitor-ck.c
@@ -28,8 +28,6 @@
 #include "nm-session-utils.h"
 #include "nm-session-monitor.h"
 
-#define CKDB_PATH "/var/run/ConsoleKit/database"
-
 /* 
  * SECTION:nm-session-monitor
  * @title: NMSessionMonitor
diff --git a/src/nm-sleep-monitor-systemd.c b/src/nm-sleep-monitor-systemd.c
new file mode 100644
index 00000000..576cb141
--- /dev/null
+++ b/src/nm-sleep-monitor-systemd.c
@@ -0,0 +1,364 @@
+/* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */
+/* This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * (C) Copyright 2012 Red Hat, Inc.
+ * Author: Matthias Clasen 
+ */
+
+#include "config.h"
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+
+#include "nm-logging.h"
+#include "nm-dbus-manager.h"
+
+#include "nm-sleep-monitor.h"
+
+#define SD_NAME              "org.freedesktop.login1"
+#define SD_PATH              "/org/freedesktop/login1"
+#define SD_INTERFACE         "org.freedesktop.login1.Manager"
+
+/* Do we have GDBus (glib >= 2.26) and GUnixFDList (glib >= 2.30) support ? */
+#if GLIB_CHECK_VERSION(2,30,0)
+#define IS_GDBUS_UNIXFD_AVAILABLE 1
+#endif
+
+
+struct _NMSleepMonitor {
+	GObject parent_instance;
+
+#if defined(IS_GDBUS_UNIXFD_AVAILABLE)
+	GDBusProxy *sd_proxy;
+#else
+	DBusGProxy *sd_proxy;
+#endif
+	gint inhibit_fd;
+};
+
+struct _NMSleepMonitorClass {
+	GObjectClass parent_class;
+
+	void (*sleeping) (NMSleepMonitor *monitor);
+	void (*resuming) (NMSleepMonitor *monitor);
+};
+
+
+enum {
+	SLEEPING,
+	RESUMING,
+	LAST_SIGNAL,
+};
+static guint signals[LAST_SIGNAL] = {0};
+
+G_DEFINE_TYPE (NMSleepMonitor, nm_sleep_monitor, G_TYPE_OBJECT);
+
+/********************************************************************/
+
+static gboolean
+drop_inhibitor (NMSleepMonitor *self)
+{
+	if (self->inhibit_fd >= 0) {
+		nm_log_dbg (LOGD_SUSPEND, "Dropping systemd sleep inhibitor");
+		close (self->inhibit_fd);
+		self->inhibit_fd = -1;
+		return TRUE;
+	}
+	return FALSE;
+}
+
+#if defined(IS_GDBUS_UNIXFD_AVAILABLE)
+/* Great! We have GDBus (glib >= 2.26) and GUnixFDList (glib >= 2.30) */
+static void
+inhibit_done (GObject      *source,
+              GAsyncResult *result,
+              gpointer      user_data)
+{
+	GDBusProxy *sd_proxy = G_DBUS_PROXY (source);
+	NMSleepMonitor *self = user_data;
+	GError *error = NULL;
+	GVariant *res;
+	GUnixFDList *fd_list;
+
+	res = g_dbus_proxy_call_with_unix_fd_list_finish (sd_proxy, &fd_list, result, &error);
+	if (!res) {
+		nm_log_warn (LOGD_SUSPEND, "Inhibit failed: %s", error->message);
+		g_error_free (error);
+	} else {
+		if (!fd_list || g_unix_fd_list_get_length (fd_list) != 1)
+			nm_log_warn (LOGD_SUSPEND, "Didn't get a single fd back");
+
+		self->inhibit_fd = g_unix_fd_list_get (fd_list, 0, NULL);
+
+		nm_log_dbg (LOGD_SUSPEND, "Inhibitor fd is %d", self->inhibit_fd);
+		g_object_unref (fd_list);
+		g_variant_unref (res);
+	}
+}
+
+static void
+take_inhibitor (NMSleepMonitor *self)
+{
+	g_assert (self->inhibit_fd == -1);
+
+	nm_log_dbg (LOGD_SUSPEND, "Taking systemd sleep inhibitor");
+	g_dbus_proxy_call_with_unix_fd_list (self->sd_proxy,
+	                                     "Inhibit",
+	                                     g_variant_new ("(ssss)",
+	                                                    "sleep",
+	                                                    g_get_user_name (),
+	                                                    "inhibited",
+	                                                    "delay"),
+	                                     0,
+	                                     G_MAXINT,
+	                                     NULL,
+	                                     NULL,
+	                                     inhibit_done,
+	                                     self);
+}
+
+static void
+signal_cb (GDBusProxy  *proxy,
+           const gchar *sendername,
+           const gchar *signalname,
+           GVariant    *args,
+           gpointer     data)
+{
+	NMSleepMonitor *self = data;
+	gboolean is_about_to_suspend;
+
+	if (strcmp (signalname, "PrepareForSleep") != 0)
+		return;
+
+	g_variant_get (args, "(b)", &is_about_to_suspend);
+	nm_log_dbg (LOGD_SUSPEND, "Received PrepareForSleep signal: %d", is_about_to_suspend);
+
+	if (is_about_to_suspend) {
+		g_signal_emit (self, signals[SLEEPING], 0);
+		drop_inhibitor (self);
+	} else {
+		take_inhibitor (self);
+		g_signal_emit (self, signals[RESUMING], 0);
+	}
+}
+
+static void
+sleep_setup (NMSleepMonitor *self)
+{
+	GDBusConnection *bus;
+
+	bus = g_bus_get_sync (G_BUS_TYPE_SYSTEM, NULL, NULL);
+	self->sd_proxy = g_dbus_proxy_new_sync (bus, 0, NULL,
+	                                        SD_NAME, SD_PATH, SD_INTERFACE,
+	                                        NULL, NULL);
+	g_object_unref (bus);
+	g_signal_connect (self->sd_proxy, "g-signal", G_CALLBACK (signal_cb), self);
+}
+
+#else
+
+/* GDBus nor GUnixFDList available. We have to get by with dbus-glib and libdbus */
+static void
+inhibit_done (DBusPendingCall *pending,
+              gpointer user_data)
+{
+	NMSleepMonitor *self = user_data;
+	DBusMessage *reply;
+	DBusError error;
+	int mtype;
+
+	dbus_error_init (&error);
+	reply = dbus_pending_call_steal_reply (pending);
+	g_assert (reply);
+
+	mtype = dbus_message_get_type (reply);
+	switch (mtype) {
+	case DBUS_MESSAGE_TYPE_ERROR:
+		dbus_set_error_from_message (&error, reply);
+		nm_log_warn (LOGD_SUSPEND, "Inhibit() failed: %s", error.message ? error.message : "unknown");
+		break;
+	case DBUS_MESSAGE_TYPE_METHOD_RETURN:
+		if (!dbus_message_get_args (reply,
+		                            &error,
+		                            DBUS_TYPE_UNIX_FD, &self->inhibit_fd,
+		                            DBUS_TYPE_INVALID)) {
+			nm_log_warn (LOGD_SUSPEND, "Inhibit() reply parsing failed: %s",
+			                          error.message ? error.message : "unknown");
+			break;
+		}
+		nm_log_dbg (LOGD_SUSPEND, "Inhibitor fd is %d", self->inhibit_fd);
+		break;
+	default:
+		nm_log_warn (LOGD_SUSPEND, "Invalid Inhibit() reply message type %d", mtype);
+		break;
+	}
+
+	dbus_message_unref (reply);
+	dbus_error_free (&error);
+}
+
+static void
+take_inhibitor (NMSleepMonitor *self)
+{
+	NMDBusManager *dbus_mgr;
+	DBusConnection *bus;
+	DBusMessage *message = NULL;
+	DBusPendingCall *pending = NULL;
+	const char *arg_what = "sleep";
+	const char *arg_who = g_get_user_name ();
+	const char *arg_why = "inhibited";
+	const char *arg_mode = "delay";
+
+	g_assert (self->inhibit_fd == -1);
+
+	nm_log_dbg (LOGD_SUSPEND, "Taking systemd sleep inhibitor");
+
+	dbus_mgr = nm_dbus_manager_get ();
+	bus = nm_dbus_manager_get_dbus_connection (dbus_mgr);
+	g_assert (bus);
+	g_object_unref (dbus_mgr);
+
+	if (!(message = dbus_message_new_method_call (SD_NAME,
+	                                              SD_PATH,
+	                                              SD_INTERFACE,
+	                                              "Inhibit"))) {
+		nm_log_warn (LOGD_SUSPEND, "Unable to call Inhibit()");
+		return;
+	}
+	if (!dbus_message_append_args (message,
+	                               DBUS_TYPE_STRING, &arg_what,
+	                               DBUS_TYPE_STRING, &arg_who,
+	                               DBUS_TYPE_STRING, &arg_why,
+	                               DBUS_TYPE_STRING, &arg_mode,
+	                               DBUS_TYPE_INVALID)) {
+		nm_log_warn (LOGD_SUSPEND, "Unable to call Inhibit()");
+		goto done;
+	}
+
+	if (!dbus_connection_send_with_reply (bus, message, &pending, -1))
+		goto done;
+
+	if (!dbus_pending_call_set_notify (pending, inhibit_done, self, NULL)) {
+		dbus_pending_call_cancel (pending);
+		dbus_pending_call_unref (pending);
+	}
+
+done:
+	if (message)
+		dbus_message_unref (message);
+}
+
+static void
+signal_cb (DBusGProxy *proxy, gboolean about_to_suspend, gpointer data)
+{
+	NMSleepMonitor *self = data;
+
+	nm_log_dbg (LOGD_SUSPEND, "Received PrepareForSleep signal: %d", about_to_suspend);
+
+	if (about_to_suspend) {
+		g_signal_emit (self, signals[SLEEPING], 0);
+		drop_inhibitor (self);
+	} else {
+		take_inhibitor (self);
+		g_signal_emit (self, signals[RESUMING], 0);
+	}
+}
+
+static void
+sleep_setup (NMSleepMonitor *self)
+{
+	NMDBusManager *dbus_mgr;
+	DBusGConnection *bus;
+
+	dbus_mgr = nm_dbus_manager_get ();
+	bus = nm_dbus_manager_get_connection (dbus_mgr);
+	self->sd_proxy = dbus_g_proxy_new_for_name (bus, SD_NAME, SD_PATH, SD_INTERFACE);
+	g_object_unref (dbus_mgr);
+
+	if (self->sd_proxy) {
+		dbus_g_proxy_add_signal (self->sd_proxy, "PrepareForSleep", G_TYPE_BOOLEAN, G_TYPE_INVALID);
+		dbus_g_proxy_connect_signal (self->sd_proxy, "PrepareForSleep",
+		                             G_CALLBACK (signal_cb),
+		                             self, NULL);
+	} else
+		nm_log_warn (LOGD_SUSPEND, "could not initialize systemd-logind D-Bus proxy");
+}
+#endif  /* IS_GDBUS_UNIXFD_AVAILABLE */
+
+static void
+nm_sleep_monitor_init (NMSleepMonitor *self)
+{
+	self->inhibit_fd = -1;
+	sleep_setup (self);
+	take_inhibitor (self);
+}
+
+static void
+finalize (GObject *object)
+{
+	NMSleepMonitor *self = NM_SLEEP_MONITOR (object);
+
+	drop_inhibitor (self);
+	if (self->sd_proxy)
+		g_object_unref (self->sd_proxy);
+
+	if (G_OBJECT_CLASS (nm_sleep_monitor_parent_class)->finalize != NULL)
+		G_OBJECT_CLASS (nm_sleep_monitor_parent_class)->finalize (object);
+}
+
+static void
+nm_sleep_monitor_class_init (NMSleepMonitorClass *klass)
+{
+	GObjectClass *gobject_class;
+
+	gobject_class = G_OBJECT_CLASS (klass);
+
+	gobject_class->finalize = finalize;
+
+	signals[SLEEPING] = g_signal_new (NM_SLEEP_MONITOR_SLEEPING,
+	                                  NM_TYPE_SLEEP_MONITOR,
+	                                  G_SIGNAL_RUN_LAST,
+	                                  G_STRUCT_OFFSET (NMSleepMonitorClass, sleeping),
+	                                  NULL,                   /* accumulator      */
+	                                  NULL,                   /* accumulator data */
+	                                  g_cclosure_marshal_VOID__VOID,
+	                                  G_TYPE_NONE, 0);
+	signals[RESUMING] = g_signal_new (NM_SLEEP_MONITOR_RESUMING,
+	                                  NM_TYPE_SLEEP_MONITOR,
+	                                  G_SIGNAL_RUN_LAST,
+	                                  G_STRUCT_OFFSET (NMSleepMonitorClass, resuming),
+	                                  NULL,                   /* accumulator      */
+	                                  NULL,                   /* accumulator data */
+	                                  g_cclosure_marshal_VOID__VOID,
+	                                  G_TYPE_NONE, 0);
+}
+
+NMSleepMonitor *
+nm_sleep_monitor_get (void)
+{
+	static NMSleepMonitor *singleton = NULL;
+
+	if (singleton)
+		return g_object_ref (singleton);
+
+	singleton = NM_SLEEP_MONITOR (g_object_new (NM_TYPE_SLEEP_MONITOR, NULL));
+	return singleton;
+}
+
+/* ---------------------------------------------------------------------------------------------------- */
diff --git a/src/nm-sleep-monitor-upower.c b/src/nm-sleep-monitor-upower.c
new file mode 100644
index 00000000..3c93f663
--- /dev/null
+++ b/src/nm-sleep-monitor-upower.c
@@ -0,0 +1,151 @@
+/* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */
+/* This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * (C) Copyright 2012 Red Hat, Inc.
+ * Author: Matthias Clasen 
+ */
+
+#include "config.h"
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include "nm-logging.h"
+#include "nm-dbus-manager.h"
+
+#include "nm-sleep-monitor.h"
+
+#define UPOWER_DBUS_SERVICE "org.freedesktop.UPower"
+
+struct _NMSleepMonitor {
+        GObject parent_instance;
+
+        DBusGProxy *upower_proxy;
+};
+
+struct _NMSleepMonitorClass {
+        GObjectClass parent_class;
+
+        void (*sleeping) (NMSleepMonitor *monitor);
+        void (*resuming) (NMSleepMonitor *monitor);
+};
+
+
+enum {
+        SLEEPING,
+        RESUMING,
+        LAST_SIGNAL,
+};
+static guint signals[LAST_SIGNAL] = {0};
+
+G_DEFINE_TYPE (NMSleepMonitor, nm_sleep_monitor, G_TYPE_OBJECT);
+
+/********************************************************************/
+
+static void
+upower_sleeping_cb (DBusGProxy *proxy, gpointer user_data)
+{
+        nm_log_dbg (LOGD_SUSPEND, "Received UPower sleeping signal");
+        g_signal_emit (user_data, signals[SLEEPING], 0);
+}
+
+static void
+upower_resuming_cb (DBusGProxy *proxy, gpointer user_data)
+{
+        nm_log_dbg (LOGD_SUSPEND, "Received UPower resuming signal");
+        g_signal_emit (user_data, signals[RESUMING], 0);
+}
+
+static void
+nm_sleep_monitor_init (NMSleepMonitor *self)
+{
+        NMDBusManager *dbus_mgr;
+        DBusGConnection *bus;
+
+        dbus_mgr = nm_dbus_manager_get ();
+        bus = nm_dbus_manager_get_connection (dbus_mgr);
+        self->upower_proxy = dbus_g_proxy_new_for_name (bus,
+                                                        UPOWER_DBUS_SERVICE,
+                                                        "/org/freedesktop/UPower",
+                                                        "org.freedesktop.UPower");
+        if (self->upower_proxy) {
+                dbus_g_proxy_add_signal (self->upower_proxy, "Sleeping", G_TYPE_INVALID);
+                dbus_g_proxy_connect_signal (self->upower_proxy, "Sleeping",
+                                             G_CALLBACK (upower_sleeping_cb),
+                                             self, NULL);
+
+                dbus_g_proxy_add_signal (self->upower_proxy, "Resuming", G_TYPE_INVALID);
+                dbus_g_proxy_connect_signal (self->upower_proxy, "Resuming",
+                                             G_CALLBACK (upower_resuming_cb),
+                                             self, NULL);
+        } else
+                nm_log_warn (LOGD_SUSPEND, "could not initialize UPower D-Bus proxy");
+        g_object_unref (dbus_mgr);
+}
+
+static void
+finalize (GObject *object)
+{
+        NMSleepMonitor *self = NM_SLEEP_MONITOR (object);
+
+        if (self->upower_proxy)
+                g_object_unref (self->upower_proxy);
+
+        if (G_OBJECT_CLASS (nm_sleep_monitor_parent_class)->finalize != NULL)
+                G_OBJECT_CLASS (nm_sleep_monitor_parent_class)->finalize (object);
+}
+
+static void
+nm_sleep_monitor_class_init (NMSleepMonitorClass *klass)
+{
+        GObjectClass *gobject_class;
+
+        gobject_class = G_OBJECT_CLASS (klass);
+
+        gobject_class->finalize = finalize;
+
+        signals[SLEEPING] = g_signal_new (NM_SLEEP_MONITOR_SLEEPING,
+                                          NM_TYPE_SLEEP_MONITOR,
+                                          G_SIGNAL_RUN_LAST,
+                                          G_STRUCT_OFFSET (NMSleepMonitorClass, sleeping),
+                                          NULL,                   /* accumulator      */
+                                          NULL,                   /* accumulator data */
+                                          g_cclosure_marshal_VOID__VOID,
+                                          G_TYPE_NONE, 0);
+        signals[RESUMING] = g_signal_new (NM_SLEEP_MONITOR_RESUMING,
+                                          NM_TYPE_SLEEP_MONITOR,
+                                          G_SIGNAL_RUN_LAST,
+                                          G_STRUCT_OFFSET (NMSleepMonitorClass, resuming),
+                                          NULL,                   /* accumulator      */
+                                          NULL,                   /* accumulator data */
+                                          g_cclosure_marshal_VOID__VOID,
+                                          G_TYPE_NONE, 0);
+}
+
+NMSleepMonitor *
+nm_sleep_monitor_get (void)
+{
+        static NMSleepMonitor *singleton = NULL;
+
+        if (singleton)
+                return g_object_ref (singleton);
+
+        singleton = NM_SLEEP_MONITOR (g_object_new (NM_TYPE_SLEEP_MONITOR, NULL));
+        return singleton;
+}
+
+/* ---------------------------------------------------------------------------------------------------- */
diff --git a/src/nm-sleep-monitor.h b/src/nm-sleep-monitor.h
new file mode 100644
index 00000000..173e6a13
--- /dev/null
+++ b/src/nm-sleep-monitor.h
@@ -0,0 +1,46 @@
+/* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */
+/* This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * (C) Copyright 2012 Red Hat, Inc.
+ * Author: Matthias Clasen 
+ */
+
+#ifndef NM_SLEEP_MONITOR_H
+#define NM_SLEEP_MONITOR_H
+
+#include 
+
+G_BEGIN_DECLS
+
+#define NM_TYPE_SLEEP_MONITOR         (nm_sleep_monitor_get_type ())
+#define NM_SLEEP_MONITOR(o)           (G_TYPE_CHECK_INSTANCE_CAST ((o), NM_TYPE_SLEEP_MONITOR, NMSleepMonitor))
+#define NM_SLEEP_MONITOR_CLASS(k)     (G_TYPE_CHECK_CLASS_CAST ((k), NM_TYPE_SLEEP_MONITOR, NMSleepMonitorClass))
+#define NM_SLEEP_MONITOR_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), NM_TYPE_SLEEP_MONITOR, NMSleepMonitorClass))
+#define NM_IS_SLEEP_MONITOR(o)        (G_TYPE_CHECK_INSTANCE_TYPE ((o), NM_TYPE_SLEEP_MONITOR))
+#define NM_IS_SLEEP_MONITOR_CLASS(k)  (G_TYPE_CHECK_CLASS_TYPE ((k), NM_TYPE_SLEEP_MONITOR))
+
+#define NM_SLEEP_MONITOR_SLEEPING "sleeping"
+#define NM_SLEEP_MONITOR_RESUMING "resuming"
+
+typedef struct _NMSleepMonitor         NMSleepMonitor;
+typedef struct _NMSleepMonitorClass    NMSleepMonitorClass;
+
+GType           nm_sleep_monitor_get_type     (void) G_GNUC_CONST;
+NMSleepMonitor *nm_sleep_monitor_get          (void);
+
+G_END_DECLS
+
+#endif /* NM_SLEEP_MONITOR_H */
+
diff --git a/src/nm-system.c b/src/nm-system.c
index 09e1da58..5d1a4895 100644
--- a/src/nm-system.c
+++ b/src/nm-system.c
@@ -40,11 +40,11 @@
 #include 
 #include 
 #include 
-#include 
 #include 
 #include 
 #include 
 #include 
+#include 
 
 #include "nm-system.h"
 #include "nm-device.h"
@@ -61,7 +61,7 @@
 #include 
 #include 
 
-#ifdef HAVE_LIBNL3
+#if HAVE_LIBNL == 3
 #include 
 #include 
 #endif
@@ -897,6 +897,50 @@ out:
 	return success;
 }
 
+/**
+ * nm_system_iface_set_arp:
+ * @ifindex: interface index
+ * @enable: %TRUE to enable ARP, or %FALSE to disable
+ *
+ * Sets a flag to indicate that ARP should or should not be used on the
+ * interface.  Point-to-point or IPv4 /32 interfaces often require that ARP
+ * be disabled.
+ *
+ * Returns: %TRUE on success, %FALSE on failure
+ **/
+gboolean
+nm_system_iface_set_arp (int ifindex, gboolean enable)
+{
+	struct rtnl_link *request = NULL, *old = NULL;
+	struct nl_sock *nlh;
+	gboolean success = FALSE;
+	int err;
+
+	g_return_val_if_fail (ifindex > 0, FALSE);
+
+	if (!(request = rtnl_link_alloc ()))
+		return FALSE;
+
+	if (enable)
+		rtnl_link_unset_flags (request, IFF_NOARP);
+	else
+		rtnl_link_set_flags (request, IFF_NOARP);
+
+	old = nm_netlink_index_to_rtnl_link (ifindex);
+	if (old) {
+		nlh = nm_netlink_get_default_handle ();
+		if (nlh) {
+			err = rtnl_link_change (nlh, old, request, 0);
+			if (err == 0)
+				success = TRUE;
+		}
+	}
+
+	rtnl_link_put (old);
+	rtnl_link_put (request);
+	return success;
+}
+
 static struct rtnl_route *
 add_ip4_route_to_gateway (int ifindex, guint32 gw, guint32 mss)
 {
@@ -1160,12 +1204,16 @@ replace_default_ip6_route (int ifindex, const struct in6_addr *gw, int mss)
 	char gw_str[INET6_ADDRSTRLEN + 1];
 
 	g_return_val_if_fail (ifindex > 0, FALSE);
-	g_return_val_if_fail (gw != NULL, FALSE);
 
 	if (nm_logging_level_enabled (LOGL_DEBUG)) {
-		memset (gw_str, 0, sizeof (gw_str));
-		if (inet_ntop (AF_INET6, gw, gw_str, sizeof (gw_str) - 1))
-			nm_log_dbg (LOGD_IP6, "Setting IPv6 default route via %s", gw_str);
+		if (gw) {
+			memset (gw_str, 0, sizeof (gw_str));
+			if (inet_ntop (AF_INET6, gw, gw_str, sizeof (gw_str) - 1))
+				nm_log_dbg (LOGD_IP6, "Setting IPv6 default route via %s", gw_str);
+		} else {
+			nm_log_dbg (LOGD_IP6, "Setting IPv6 default route via %s",
+			            nm_netlink_index_to_iface (ifindex));
+		}
 	}
 
 	/* We can't just use NLM_F_REPLACE here like in the IPv4 case, because
@@ -1572,7 +1620,7 @@ nm_system_add_bonding_master (const char *iface)
 }
 
 static gboolean
-nm_system_iface_compat_enslave (const char *master_iface, const char *slave_iface)
+nm_system_bond_compat_enslave (const char *master_iface, const char *slave_iface)
 {
 	struct ifreq ifr;
 	int fd;
@@ -1602,7 +1650,7 @@ nm_system_iface_compat_enslave (const char *master_iface, const char *slave_ifac
 }
 
 /**
- * nm_system_iface_enslave:
+ * nm_system_bond_enslave:
  * @master_ifindex: master device interface index
  * @master_iface: master device interface name
  * @slave_ifindex: slave device interface index
@@ -1618,10 +1666,10 @@ nm_system_iface_compat_enslave (const char *master_iface, const char *slave_ifac
  * Returns: %TRUE on success, or %FALSE
  */
 gboolean
-nm_system_iface_enslave (gint master_ifindex,
-                         const char *master_iface,
-                         gint slave_ifindex,
-                         const char *slave_iface)
+nm_system_bond_enslave (gint master_ifindex,
+                        const char *master_iface,
+                        gint slave_ifindex,
+                        const char *slave_iface)
 {
 	struct nl_sock *sock;
 	int err;
@@ -1648,7 +1696,7 @@ nm_system_iface_enslave (gint master_ifindex,
 
 	err = rtnl_link_bond_enslave_ifindex (sock, master_ifindex, slave_ifindex);
 	if (err == -NLE_OPNOTSUPP)
-		return nm_system_iface_compat_enslave (master_iface, slave_iface);
+		return nm_system_bond_compat_enslave (master_iface, slave_iface);
 
 	if (err < 0) {
 		nm_log_err (LOGD_DEVICE, "(%s): error enslaving %s: %d (%s)",
@@ -1660,7 +1708,7 @@ nm_system_iface_enslave (gint master_ifindex,
 }
 
 static gboolean
-nm_system_iface_compat_release (const char *master_iface, const char *slave_iface)
+nm_system_bond_compat_release (const char *master_iface, const char *slave_iface)
 {
 	struct ifreq ifr;
 	int fd;
@@ -1689,7 +1737,7 @@ nm_system_iface_compat_release (const char *master_iface, const char *slave_ifac
 }
 
 /**
- * nm_system_iface_release:
+ * nm_system_bond_release:
  * @master_ifindex: master device interface index
  * @master_iface: master device interface name
  * @slave_ifindex: slave device interface index
@@ -1703,10 +1751,10 @@ nm_system_iface_compat_release (const char *master_iface, const char *slave_ifac
  * Returns: %TRUE on success, or %FALSE
  */
 gboolean
-nm_system_iface_release (gint master_ifindex,
-                         const char *master_iface,
-                         gint slave_ifindex,
-                         const char *slave_iface)
+nm_system_bond_release (gint master_ifindex,
+                        const char *master_iface,
+                        gint slave_ifindex,
+                        const char *slave_iface)
 {
 	struct nl_sock *sock;
 	int err;
@@ -1724,7 +1772,7 @@ nm_system_iface_release (gint master_ifindex,
 
 	err = rtnl_link_bond_release_ifindex (sock, slave_ifindex);
 	if (err == -NLE_OPNOTSUPP)
-		return nm_system_iface_compat_release (master_iface, slave_iface);
+		return nm_system_bond_compat_release (master_iface, slave_iface);
 	else if (err < 0) {
 		nm_log_err (LOGD_DEVICE, "(%s): error releasing slave %s: %d (%s)",
 		            master_iface, slave_iface, err, nl_geterror (err));
@@ -1817,7 +1865,7 @@ nm_system_get_iface_type (int ifindex, const char *name)
 		goto out;
 
 	/* Prefer interface indexes to names */
-	err = rtnl_link_get_kernel (nlh, ifindex, ifindex < 0 ? name : NULL, &result);
+	err = rtnl_link_get_kernel (nlh, ifindex, ifindex <= 0 ? name : NULL, &result);
 	if (err < 0) {
 		if (err == -NLE_OPNOTSUPP)
 			res = nm_system_compat_get_iface_type (ifindex, name);
@@ -1830,6 +1878,8 @@ nm_system_get_iface_type (int ifindex, const char *name)
 		res = NM_IFACE_TYPE_BOND;
 	else if (!g_strcmp0 (type, "vlan"))
 		res = NM_IFACE_TYPE_VLAN;
+	else if (!g_strcmp0 (type, "bridge"))
+		res = NM_IFACE_TYPE_BRIDGE;
 	else if (!g_strcmp0 (type, "dummy"))
 		res = NM_IFACE_TYPE_DUMMY;
 
@@ -2266,3 +2316,243 @@ nm_system_del_vlan_iface (const char *iface)
 	nl_cache_free (cache);
 	return (ret == 0) ? TRUE : FALSE;
 }
+
+static int
+_bridge_create_compat (const char *iface)
+{
+	int ret = 0, fd;
+
+	if ((fd = socket (AF_LOCAL, SOCK_STREAM, 0)) < 0) {
+		nm_log_err (LOGD_DEVICE, "couldn't open control socket.");
+		return -EBADF;
+	}
+
+	if (ioctl (fd, SIOCBRADDBR, iface) < 0)
+		ret = -errno;
+
+	close (fd);
+	return ret;
+}
+
+/**
+ * nm_system_create_bridge:
+ * @iface: Name bridging device to create
+ *
+ * Creates a new bridging device in the kernel. If a bridging device with
+ * the specified name already exists, it is being reused.
+ *
+ * Returns: %TRUE on success, %FALSE on error.
+ */
+gboolean
+nm_system_create_bridge (const char *iface)
+{
+	int err;
+
+	/* FIXME: use netlink */
+	err = _bridge_create_compat (iface);
+	if (err < 0 && err != -EEXIST) {
+		nm_log_err (LOGD_DEVICE, "(%s): error while adding bridge: %s",
+		            iface, strerror (-err));
+		return FALSE;
+	}
+	return TRUE;
+}
+
+static int
+_bridge_del_compat (const char *iface)
+{
+	int ret = 0, fd;
+
+	if ((fd = socket (AF_LOCAL, SOCK_STREAM, 0)) < 0) {
+		nm_log_err (LOGD_DEVICE, "couldn't open control socket.");
+		return -EBADF;
+	}
+
+	if (ioctl (fd, SIOCBRDELBR, iface) < 0)
+		ret = -errno;
+
+	close (fd);
+	return ret;
+}
+
+/**
+ * nm_system_del_bridge:
+ * @iface: Name of bridging device to delete
+ *
+ * Deletes the specified bridging device in the kernel.
+ *
+ * Returns: %TRUE on success, %FALSE on error.
+ */
+gboolean
+nm_system_del_bridge (const char *iface)
+{
+	int err;
+
+	/* FIXME: use netlink */
+	err = _bridge_del_compat (iface);
+	if (err < 0 && err != -ENXIO) {
+		nm_log_err (LOGD_DEVICE, "(%s): error while deleting bridge: %s ",
+		            iface, strerror (-err));
+		return FALSE;
+	}
+	return TRUE;
+}
+
+static int
+_bridge_attach_compat (int master_ifindex,
+                       const char *master_iface,
+                       int slave_ifindex,
+                       const char *slave_iface)
+{
+	int ret = 0, fd;
+	struct ifreq ifr;
+
+	if ((fd = socket (AF_LOCAL, SOCK_STREAM, 0)) < 0) {
+		nm_log_err (LOGD_DEVICE, "couldn't open control socket.");
+		return -EBADF;
+	}
+
+	memset (&ifr, 0, sizeof (ifr));
+	strncpy (ifr.ifr_name, master_iface, IFNAMSIZ);
+	ifr.ifr_ifindex = slave_ifindex;
+	if (ioctl (fd, SIOCBRADDIF, &ifr) < 0)
+		ret = -errno;
+
+	close (fd);
+	return ret;
+}
+
+static int
+_bridge_detach_compat (int master_ifindex,
+                       const char *master_iface,
+                       int slave_ifindex,
+                       const char *slave_iface)
+{
+	int ret = 0, fd;
+	struct ifreq ifr;
+
+	if ((fd = socket (AF_LOCAL, SOCK_STREAM, 0)) < 0) {
+		nm_log_err (LOGD_DEVICE, "couldn't open control socket.");
+		return -EBADF;
+	}
+
+	memset (&ifr, 0, sizeof(ifr));
+	strncpy (ifr.ifr_name, master_iface, IFNAMSIZ);
+	ifr.ifr_ifindex = slave_ifindex;
+	if (ioctl (fd, SIOCBRDELIF, &ifr) < 0)
+		ret = -errno;
+
+	close (fd);
+	return ret;
+}
+
+/**
+ * nm_system_bridge_attach:
+ * @master_ifindex: master device interface index
+ * @master_iface: master device interface name
+ * @slave_ifindex: slave device interface index
+ * @slave_iface: slave device interface name
+ *
+ * Attaches interface 'slave' to bridge 'master'
+ *
+ * Returns: %TRUE on success, or %FALSE
+ */
+gboolean
+nm_system_bridge_attach (int master_ifindex,
+                         const char *master_iface,
+                         int slave_ifindex,
+                         const char *slave_iface)
+{
+	char *mif = NULL, *sif = NULL;
+	int err = -1;
+
+	g_return_val_if_fail (master_ifindex >= 0, FALSE);
+	g_return_val_if_fail (slave_ifindex >= 0, FALSE);
+
+	if (!master_iface) {
+		mif = nm_netlink_index_to_iface (master_ifindex);
+		if (mif == NULL) {
+			nm_log_err (LOGD_DEVICE, "interface name lookup failed for index %d", master_ifindex);
+			goto out;
+		}
+	}
+
+	if (!slave_ifindex) {
+		sif = nm_netlink_index_to_iface (slave_ifindex);
+		if (sif == NULL) {
+			nm_log_err (LOGD_DEVICE, "interface name lookup failed for index %d", slave_ifindex);
+			goto out;
+		}
+	}
+
+	/* FIXME: long term plan is to use netlink for this */
+	err = _bridge_attach_compat (master_ifindex,
+	                             mif ? mif : master_iface,
+	                             slave_ifindex,
+	                             sif ? sif : slave_iface);
+	if (err < 0 && err != -EBUSY) {
+		nm_log_err (LOGD_DEVICE, "(%s): failed to attach slave %s: %s",
+		            master_iface, slave_iface, strerror (-err));
+	}
+
+out:
+	g_free (sif);
+	g_free (mif);
+	return err == 0 ? TRUE : FALSE;
+}
+
+/**
+ * nm_system_bridge_detach:
+ * @master_ifindex: master device interface index
+ * @master_iface: master device interface name
+ * @slave_ifindex: slave device interface index
+ * @slave_iface: slave device interface name
+ *
+ * Detaches the interface 'slave' from the bridge 'master'.
+ *
+ * Returns: %TRUE on success, or %FALSE
+ */
+gboolean
+nm_system_bridge_detach (int master_ifindex,
+                         const char *master_iface,
+                         int slave_ifindex,
+                         const char *slave_iface)
+{
+	char *mif = NULL, *sif = NULL;
+	int err = -1;
+
+	g_return_val_if_fail (master_ifindex >= 0, FALSE);
+	g_return_val_if_fail (slave_ifindex >= 0, FALSE);
+
+	if (!master_iface) {
+		mif = nm_netlink_index_to_iface (master_ifindex);
+		if (mif == NULL) {
+			nm_log_err (LOGD_DEVICE, "interface name lookup failed for index %d", master_ifindex);
+			goto out;
+		}
+	}
+
+	if (!slave_ifindex) {
+		sif = nm_netlink_index_to_iface (slave_ifindex);
+		if (sif == NULL) {
+			nm_log_err (LOGD_DEVICE, "interface name lookup failed for index %d", slave_ifindex);
+			goto out;
+		}
+	}
+
+	/* FIXME: long term plan is to use netlink for this */
+	err = _bridge_detach_compat (master_ifindex,
+	                             mif ? mif : master_iface,
+	                             slave_ifindex,
+	                             sif ? sif : slave_iface);
+	/* Kernel doesn't return an error detaching an already-detached interface */
+	if (err < 0) {
+		nm_log_err (LOGD_DEVICE, "(%s): failed to detach slave %s: %s",
+		            master_iface, slave_iface, strerror (-err));
+	}
+
+out:
+	g_free (mif);
+	g_free (sif);
+	return err == 0 ? TRUE : FALSE;
+}
diff --git a/src/nm-system.h b/src/nm-system.h
index 1acb8853..ca07d0f2 100644
--- a/src/nm-system.h
+++ b/src/nm-system.h
@@ -33,10 +33,6 @@
 #include "nm-setting-bond.h"
 #include "nm-setting-vlan.h"
 
-/* Prototypes for system/distribution dependent functions,
- * implemented in the backend files in backends/ directory
- */
-
 gboolean        nm_system_iface_flush_routes         (int ifindex, int family);
 
 gboolean		nm_system_replace_default_ip4_route   (int ifindex,
@@ -98,15 +94,17 @@ gboolean		nm_system_iface_set_mtu                 (int ifindex, guint32 mtu);
 
 gboolean		nm_system_iface_set_mac                 (int ifindex, const struct ether_addr *mac);
 
+gboolean        nm_system_iface_set_arp                 (int ifindex, gboolean arp);
+
 gboolean        nm_system_apply_bonding_config          (const char *iface,
                                                          NMSettingBond *s_bond);
 gboolean        nm_system_add_bonding_master            (const char *iface);
 
-gboolean        nm_system_iface_enslave                 (gint master_ifindex,
+gboolean        nm_system_bond_enslave                  (gint master_ifindex,
                                                          const char *master_iface,
                                                          gint slave_ifindex,
                                                          const char *slave_iface);
-gboolean        nm_system_iface_release                 (gint master_ifindex,
+gboolean        nm_system_bond_release                  (gint master_ifindex,
                                                          const char *master_iface,
                                                          gint slave_ifindex,
                                                          const char *slave_iface);
@@ -115,7 +113,8 @@ enum {
 		NM_IFACE_TYPE_UNSPEC = 0,
 		NM_IFACE_TYPE_BOND,
 		NM_IFACE_TYPE_VLAN,
-		NM_IFACE_TYPE_DUMMY,
+		NM_IFACE_TYPE_BRIDGE,
+		NM_IFACE_TYPE_DUMMY
 };
 
 int             nm_system_get_iface_type      (int ifindex, const char *name);
@@ -129,4 +128,16 @@ gboolean        nm_system_add_vlan_iface (NMConnection *connection,
                                           int parent_ifindex);
 gboolean        nm_system_del_vlan_iface (const char *iface);
 
+gboolean        nm_system_create_bridge (const char *iface);
+gboolean        nm_system_del_bridge (const char *iface);
+
+gboolean        nm_system_bridge_attach (int master_ifindex,
+                                         const char *master_iface,
+                                         int slave_ifindex,
+                                         const char *slave_iface);
+gboolean        nm_system_bridge_detach (int master_ifindex,
+                                         const char *master_iface,
+                                         int slave_ifindex,
+                                         const char *slave_iface);
+
 #endif
diff --git a/src/nm-types.h b/src/nm-types.h
new file mode 100644
index 00000000..c558d7ba
--- /dev/null
+++ b/src/nm-types.h
@@ -0,0 +1,26 @@
+/* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */
+/* NetworkManager -- Network link manager
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Copyright (C) 2012 Red Hat, Inc.
+ */
+
+#ifndef NM_TYPES_H
+#define NM_TYPES_H
+
+typedef struct _NMDevice NMDevice;
+
+#endif  /* NM_TYPES_H */
diff --git a/src/nm-udev-manager.c b/src/nm-udev-manager.c
index 792e53bf..7e867406 100644
--- a/src/nm-udev-manager.c
+++ b/src/nm-udev-manager.c
@@ -401,6 +401,9 @@ dev_get_attrs (GUdevDevice *udev_device,
 		case NM_IFACE_TYPE_BOND:
 			driver = "bonding";
 			break;
+		case NM_IFACE_TYPE_BRIDGE:
+			driver = "bridge";
+			break;
 		case NM_IFACE_TYPE_VLAN:
 			driver = "8021q";
 			break;
@@ -515,25 +518,35 @@ void
 nm_udev_manager_query_devices (NMUdevManager *self)
 {
 	NMUdevManagerPrivate *priv = NM_UDEV_MANAGER_GET_PRIVATE (self);
+	GUdevEnumerator *enumerator;
 	GList *devices, *iter;
 
 	g_return_if_fail (self != NULL);
 	g_return_if_fail (NM_IS_UDEV_MANAGER (self));
 
-	devices = g_udev_client_query_by_subsystem (priv->client, "net");
+	enumerator = g_udev_enumerator_new (priv->client);
+	g_udev_enumerator_add_match_subsystem (enumerator, "net");
+	g_udev_enumerator_add_match_is_initialized (enumerator);
+
+	devices = g_udev_enumerator_execute (enumerator);
 	for (iter = devices; iter; iter = g_list_next (iter)) {
 		net_add (self, G_UDEV_DEVICE (iter->data));
 		g_object_unref (G_UDEV_DEVICE (iter->data));
 	}
 	g_list_free (devices);
+	g_object_unref (enumerator);
 
 
-	devices = g_udev_client_query_by_subsystem (priv->client, "atm");
+	enumerator = g_udev_enumerator_new (priv->client);
+	g_udev_enumerator_add_match_subsystem (enumerator, "atm");
+	g_udev_enumerator_add_match_is_initialized (enumerator);
+	devices = g_udev_enumerator_execute (enumerator);
 	for (iter = devices; iter; iter = g_list_next (iter)) {
 		adsl_add (self, G_UDEV_DEVICE (iter->data));
 		g_object_unref (G_UDEV_DEVICE (iter->data));
 	}
 	g_list_free (devices);
+	g_object_unref (enumerator);
 }
 
 static void
diff --git a/src/nm-wifi-ap-utils.c b/src/nm-wifi-ap-utils.c
index 215c4935..29aa52a4 100644
--- a/src/nm-wifi-ap-utils.c
+++ b/src/nm-wifi-ap-utils.c
@@ -514,7 +514,8 @@ nm_ap_utils_complete_connection (const GByteArray *ap_ssid,
 		gboolean valid = FALSE;
 
 		/* Make sure the supplied mode matches the AP's */
-		if (!strcmp (mode, NM_SETTING_WIRELESS_MODE_INFRA)) {
+		if (   !strcmp (mode, NM_SETTING_WIRELESS_MODE_INFRA)
+		    || !strcmp (mode, NM_SETTING_WIRELESS_MODE_AP)) {
 			if (ap_mode == NM_802_11_MODE_INFRA)
 				valid = TRUE;
 		} else if (!strcmp (mode, NM_SETTING_WIRELESS_MODE_ADHOC)) {
diff --git a/src/nm-wifi-ap.c b/src/nm-wifi-ap.c
index 6a607960..e6db6920 100644
--- a/src/nm-wifi-ap.c
+++ b/src/nm-wifi-ap.c
@@ -58,6 +58,7 @@ typedef struct
 
 	/* Non-scanned attributes */
 	gboolean			fake;	/* Whether or not the AP is from a scan */
+	gboolean            hotspot;    /* Whether the AP is a local device's hotspot network */
 	gboolean			broadcast;	/* Whether or not the AP is broadcasting (hidden) */
 	glong				last_seen;	/* Last time the AP was seen in a scan in seconds */
 } NMAccessPointPrivate;
@@ -650,7 +651,10 @@ nm_ap_new_fake_from_connection (NMConnection *connection)
 			nm_ap_set_mode (ap, NM_802_11_MODE_INFRA);
 		else if (!strcmp (mode, "adhoc"))
 			nm_ap_set_mode (ap, NM_802_11_MODE_ADHOC);
-		else
+		else if (!strcmp (mode, "ap")) {
+			nm_ap_set_mode (ap, NM_802_11_MODE_INFRA);
+			NM_AP_GET_PRIVATE (ap)->hotspot = TRUE;
+		} else
 			goto error;
 	} else {
 		nm_ap_set_mode (ap, NM_802_11_MODE_INFRA);
@@ -975,6 +979,13 @@ void nm_ap_set_mode (NMAccessPoint *ap, const NM80211Mode mode)
 	}
 }
 
+gboolean
+nm_ap_is_hotspot (NMAccessPoint *ap)
+{
+	g_return_val_if_fail (NM_IS_AP (ap), FALSE);
+
+	return NM_AP_GET_PRIVATE (ap)->hotspot;
+}
 
 /*
  * Get/set functions for strength
@@ -1160,6 +1171,9 @@ nm_ap_check_compatible (NMAccessPoint *self,
 			return FALSE;
 		if (!strcmp (mode, "adhoc") && (priv->mode != NM_802_11_MODE_ADHOC))
 			return FALSE;
+		if (   !strcmp (mode, "ap")
+		    && (priv->mode != NM_802_11_MODE_INFRA || priv->hotspot != TRUE))
+			return FALSE;
 	}
 
 	band = nm_setting_wireless_get_band (s_wireless);
diff --git a/src/nm-wifi-ap.h b/src/nm-wifi-ap.h
index 2058deda..a1a0da92 100644
--- a/src/nm-wifi-ap.h
+++ b/src/nm-wifi-ap.h
@@ -86,6 +86,8 @@ void				nm_ap_set_address		(NMAccessPoint *ap, const struct ether_addr *addr);
 NM80211Mode			nm_ap_get_mode			(NMAccessPoint *ap);
 void				nm_ap_set_mode			(NMAccessPoint *ap, const NM80211Mode mode);
 
+gboolean            nm_ap_is_hotspot        (NMAccessPoint *ap);
+
 gint8			nm_ap_get_strength		(NMAccessPoint *ap);
 void				nm_ap_set_strength		(NMAccessPoint *ap, gint8 strength);
 
diff --git a/src/posix-signals/Makefile.am b/src/posix-signals/Makefile.am
index 88c3d8d4..183214bd 100644
--- a/src/posix-signals/Makefile.am
+++ b/src/posix-signals/Makefile.am
@@ -6,8 +6,7 @@ libnm_posix_signals_la_SOURCES = \
 
 libnm_posix_signals_la_CPPFLAGS = \
 	$(GLIB_CFLAGS) \
-	-DLIBEXECDIR=\"$(libexecdir)\" \
-	-DG_DISABLE_DEPRECATED
+	-DLIBEXECDIR=\"$(libexecdir)\"
 
 libnm_posix_signals_la_LIBADD = \
 	-ldl \
diff --git a/src/posix-signals/Makefile.in b/src/posix-signals/Makefile.in
index bdd9cca3..db24efa6 100644
--- a/src/posix-signals/Makefile.in
+++ b/src/posix-signals/Makefile.in
@@ -55,16 +55,18 @@ subdir = src/posix-signals
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/compiler_warnings.m4 \
-	$(top_srcdir)/m4/gettext.m4 $(top_srcdir)/m4/gtk-doc.m4 \
-	$(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/intlmacosx.m4 \
-	$(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/introspection.m4 \
-	$(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \
-	$(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/libnl-check.m4 \
-	$(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \
-	$(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
-	$(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/nls.m4 \
-	$(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/progtest.m4 \
-	$(top_srcdir)/m4/vapigen.m4 $(top_srcdir)/configure.ac
+	$(top_srcdir)/m4/gettext.m4 \
+	$(top_srcdir)/m4/gnome-code-coverage.m4 \
+	$(top_srcdir)/m4/gtk-doc.m4 $(top_srcdir)/m4/iconv.m4 \
+	$(top_srcdir)/m4/intlmacosx.m4 $(top_srcdir)/m4/intltool.m4 \
+	$(top_srcdir)/m4/introspection.m4 $(top_srcdir)/m4/lib-ld.m4 \
+	$(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \
+	$(top_srcdir)/m4/libnl-check.m4 $(top_srcdir)/m4/libtool.m4 \
+	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
+	$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
+	$(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/po.m4 \
+	$(top_srcdir)/m4/progtest.m4 $(top_srcdir)/m4/vapigen.m4 \
+	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(install_sh) -d
@@ -128,6 +130,10 @@ AWK = @AWK@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
+CKDB_PATH = @CKDB_PATH@
+CODE_COVERAGE_CFLAGS = @CODE_COVERAGE_CFLAGS@
+CODE_COVERAGE_ENABLED = @CODE_COVERAGE_ENABLED@
+CODE_COVERAGE_LDFLAGS = @CODE_COVERAGE_LDFLAGS@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CXX = @CXX@
@@ -142,9 +148,7 @@ DBUS_SYS_DIR = @DBUS_SYS_DIR@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
 DHCLIENT_PATH = @DHCLIENT_PATH@
-DHCLIENT_VERSION = @DHCLIENT_VERSION@
 DHCPCD_PATH = @DHCPCD_PATH@
-DISABLE_DEPRECATED = @DISABLE_DEPRECATED@
 DLLTOOL = @DLLTOOL@
 DSYMUTIL = @DSYMUTIL@
 DUMPBIN = @DUMPBIN@
@@ -154,17 +158,14 @@ ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
 FGREP = @FGREP@
+GENHTML = @GENHTML@
 GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
 GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
-GIO_CFLAGS = @GIO_CFLAGS@
-GIO_LIBS = @GIO_LIBS@
 GLIB_CFLAGS = @GLIB_CFLAGS@
 GLIB_GENMARSHAL = @GLIB_GENMARSHAL@
 GLIB_LIBS = @GLIB_LIBS@
 GLIB_MAKEFILE = @GLIB_MAKEFILE@
 GLIB_MKENUMS = @GLIB_MKENUMS@
-GMODULE_CFLAGS = @GMODULE_CFLAGS@
-GMODULE_LIBS = @GMODULE_LIBS@
 GMSGFMT = @GMSGFMT@
 GMSGFMT_015 = @GMSGFMT_015@
 GNUTLS_CFLAGS = @GNUTLS_CFLAGS@
@@ -205,6 +206,7 @@ IPTABLES_PATH = @IPTABLES_PATH@
 IWMX_SDK_CFLAGS = @IWMX_SDK_CFLAGS@
 IWMX_SDK_LIBS = @IWMX_SDK_LIBS@
 KERNEL_FIRMWARE_DIR = @KERNEL_FIRMWARE_DIR@
+LCOV = @LCOV@
 LD = @LD@
 LDFLAGS = @LDFLAGS@
 LIBDL = @LIBDL@
@@ -221,11 +223,7 @@ LIBNL2_LIBS = @LIBNL2_LIBS@
 LIBNL3_CFLAGS = @LIBNL3_CFLAGS@
 LIBNL3_LIBS = @LIBNL3_LIBS@
 LIBNL_CFLAGS = @LIBNL_CFLAGS@
-LIBNL_GENL3_CFLAGS = @LIBNL_GENL3_CFLAGS@
-LIBNL_GENL3_LIBS = @LIBNL_GENL3_LIBS@
 LIBNL_LIBS = @LIBNL_LIBS@
-LIBNL_ROUTE3_CFLAGS = @LIBNL_ROUTE3_CFLAGS@
-LIBNL_ROUTE3_LIBS = @LIBNL_ROUTE3_LIBS@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
 LIBSOUP_CFLAGS = @LIBSOUP_CFLAGS@
@@ -240,6 +238,8 @@ MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MANIFEST_TOOL = @MANIFEST_TOOL@
 MKDIR_P = @MKDIR_P@
+MM_GLIB_CFLAGS = @MM_GLIB_CFLAGS@
+MM_GLIB_LIBS = @MM_GLIB_LIBS@
 MOC = @MOC@
 MSGFMT = @MSGFMT@
 MSGFMT_015 = @MSGFMT_015@
@@ -249,6 +249,7 @@ NMEDIT = @NMEDIT@
 NM_MAJOR_VERSION = @NM_MAJOR_VERSION@
 NM_MICRO_VERSION = @NM_MICRO_VERSION@
 NM_MINOR_VERSION = @NM_MINOR_VERSION@
+NM_MODIFY_SYSTEM_POLICY = @NM_MODIFY_SYSTEM_POLICY@
 NM_VERSION = @NM_VERSION@
 NSS_CFLAGS = @NSS_CFLAGS@
 NSS_LIBS = @NSS_LIBS@
@@ -275,13 +276,14 @@ PPPD_PLUGIN_DIR = @PPPD_PLUGIN_DIR@
 QT_CFLAGS = @QT_CFLAGS@
 QT_LIBS = @QT_LIBS@
 RANLIB = @RANLIB@
-RESOLVCONF_PATH = @RESOLVCONF_PATH@
 SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
-SYSTEMD_CFLAGS = @SYSTEMD_CFLAGS@
-SYSTEMD_LIBS = @SYSTEMD_LIBS@
+SYSTEMD_INHIBIT_CFLAGS = @SYSTEMD_INHIBIT_CFLAGS@
+SYSTEMD_INHIBIT_LIBS = @SYSTEMD_INHIBIT_LIBS@
+SYSTEMD_LOGIN_CFLAGS = @SYSTEMD_LOGIN_CFLAGS@
+SYSTEMD_LOGIN_LIBS = @SYSTEMD_LOGIN_LIBS@
 SYSTEM_CA_PATH = @SYSTEM_CA_PATH@
 UDEV_BASE_DIR = @UDEV_BASE_DIR@
 USE_NLS = @USE_NLS@
@@ -336,6 +338,11 @@ localedir = @localedir@
 localstatedir = @localstatedir@
 mandir = @mandir@
 mkdir_p = @mkdir_p@
+nmbinary = @nmbinary@
+nmconfdir = @nmconfdir@
+nmdatadir = @nmdatadir@
+nmrundir = @nmrundir@
+nmstatedir = @nmstatedir@
 oldincludedir = @oldincludedir@
 pdfdir = @pdfdir@
 prefix = @prefix@
@@ -350,6 +357,10 @@ target_alias = @target_alias@
 top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
+with_dhclient = @with_dhclient@
+with_dhcpcd = @with_dhcpcd@
+with_netconfig = @with_netconfig@
+with_resolvconf = @with_resolvconf@
 noinst_LTLIBRARIES = libnm-posix-signals.la
 libnm_posix_signals_la_SOURCES = \
 	nm-posix-signals.c \
@@ -357,8 +368,7 @@ libnm_posix_signals_la_SOURCES = \
 
 libnm_posix_signals_la_CPPFLAGS = \
 	$(GLIB_CFLAGS) \
-	-DLIBEXECDIR=\"$(libexecdir)\" \
-	-DG_DISABLE_DEPRECATED
+	-DLIBEXECDIR=\"$(libexecdir)\"
 
 libnm_posix_signals_la_LIBADD = \
 	-ldl \
@@ -419,25 +429,22 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libnm_posix_signals_la-nm-posix-signals.Plo@am__quote@
 
 .c.o:
-@am__fastdepCC_TRUE@	$(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\
-@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
-@am__fastdepCC_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.Po
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $<
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c $<
 
 .c.obj:
-@am__fastdepCC_TRUE@	$(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.obj$$||'`;\
-@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ `$(CYGPATH_W) '$<'` &&\
-@am__fastdepCC_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.Po
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c `$(CYGPATH_W) '$<'`
 
 .c.lo:
-@am__fastdepCC_TRUE@	$(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.lo$$||'`;\
-@am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
-@am__fastdepCC_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.Plo
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $<
diff --git a/src/ppp-manager/Makefile.am b/src/ppp-manager/Makefile.am
index 9de58169..7e8102a5 100644
--- a/src/ppp-manager/Makefile.am
+++ b/src/ppp-manager/Makefile.am
@@ -26,7 +26,6 @@ $(libppp_manager_la_OBJECTS): $(built_sources)
 
 libppp_manager_la_CPPFLAGS = \
 	$(DBUS_CFLAGS) \
-	-DG_DISABLE_DEPRECATED \
 	-DSYSCONFDIR=\"$(sysconfdir)\" \
 	-DLIBDIR=\"$(libdir)\" \
 	-DPLUGINDIR=\"$(PPPD_PLUGIN_DIR)\"
diff --git a/src/ppp-manager/Makefile.in b/src/ppp-manager/Makefile.in
index f43c4bf5..f53e808b 100644
--- a/src/ppp-manager/Makefile.in
+++ b/src/ppp-manager/Makefile.in
@@ -55,16 +55,18 @@ subdir = src/ppp-manager
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/compiler_warnings.m4 \
-	$(top_srcdir)/m4/gettext.m4 $(top_srcdir)/m4/gtk-doc.m4 \
-	$(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/intlmacosx.m4 \
-	$(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/introspection.m4 \
-	$(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \
-	$(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/libnl-check.m4 \
-	$(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \
-	$(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
-	$(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/nls.m4 \
-	$(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/progtest.m4 \
-	$(top_srcdir)/m4/vapigen.m4 $(top_srcdir)/configure.ac
+	$(top_srcdir)/m4/gettext.m4 \
+	$(top_srcdir)/m4/gnome-code-coverage.m4 \
+	$(top_srcdir)/m4/gtk-doc.m4 $(top_srcdir)/m4/iconv.m4 \
+	$(top_srcdir)/m4/intlmacosx.m4 $(top_srcdir)/m4/intltool.m4 \
+	$(top_srcdir)/m4/introspection.m4 $(top_srcdir)/m4/lib-ld.m4 \
+	$(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \
+	$(top_srcdir)/m4/libnl-check.m4 $(top_srcdir)/m4/libtool.m4 \
+	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
+	$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
+	$(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/po.m4 \
+	$(top_srcdir)/m4/progtest.m4 $(top_srcdir)/m4/vapigen.m4 \
+	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(install_sh) -d
@@ -173,6 +175,10 @@ AWK = @AWK@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
+CKDB_PATH = @CKDB_PATH@
+CODE_COVERAGE_CFLAGS = @CODE_COVERAGE_CFLAGS@
+CODE_COVERAGE_ENABLED = @CODE_COVERAGE_ENABLED@
+CODE_COVERAGE_LDFLAGS = @CODE_COVERAGE_LDFLAGS@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CXX = @CXX@
@@ -187,9 +193,7 @@ DBUS_SYS_DIR = @DBUS_SYS_DIR@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
 DHCLIENT_PATH = @DHCLIENT_PATH@
-DHCLIENT_VERSION = @DHCLIENT_VERSION@
 DHCPCD_PATH = @DHCPCD_PATH@
-DISABLE_DEPRECATED = @DISABLE_DEPRECATED@
 DLLTOOL = @DLLTOOL@
 DSYMUTIL = @DSYMUTIL@
 DUMPBIN = @DUMPBIN@
@@ -199,17 +203,14 @@ ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
 FGREP = @FGREP@
+GENHTML = @GENHTML@
 GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
 GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
-GIO_CFLAGS = @GIO_CFLAGS@
-GIO_LIBS = @GIO_LIBS@
 GLIB_CFLAGS = @GLIB_CFLAGS@
 GLIB_GENMARSHAL = @GLIB_GENMARSHAL@
 GLIB_LIBS = @GLIB_LIBS@
 GLIB_MAKEFILE = @GLIB_MAKEFILE@
 GLIB_MKENUMS = @GLIB_MKENUMS@
-GMODULE_CFLAGS = @GMODULE_CFLAGS@
-GMODULE_LIBS = @GMODULE_LIBS@
 GMSGFMT = @GMSGFMT@
 GMSGFMT_015 = @GMSGFMT_015@
 GNUTLS_CFLAGS = @GNUTLS_CFLAGS@
@@ -250,6 +251,7 @@ IPTABLES_PATH = @IPTABLES_PATH@
 IWMX_SDK_CFLAGS = @IWMX_SDK_CFLAGS@
 IWMX_SDK_LIBS = @IWMX_SDK_LIBS@
 KERNEL_FIRMWARE_DIR = @KERNEL_FIRMWARE_DIR@
+LCOV = @LCOV@
 LD = @LD@
 LDFLAGS = @LDFLAGS@
 LIBDL = @LIBDL@
@@ -266,11 +268,7 @@ LIBNL2_LIBS = @LIBNL2_LIBS@
 LIBNL3_CFLAGS = @LIBNL3_CFLAGS@
 LIBNL3_LIBS = @LIBNL3_LIBS@
 LIBNL_CFLAGS = @LIBNL_CFLAGS@
-LIBNL_GENL3_CFLAGS = @LIBNL_GENL3_CFLAGS@
-LIBNL_GENL3_LIBS = @LIBNL_GENL3_LIBS@
 LIBNL_LIBS = @LIBNL_LIBS@
-LIBNL_ROUTE3_CFLAGS = @LIBNL_ROUTE3_CFLAGS@
-LIBNL_ROUTE3_LIBS = @LIBNL_ROUTE3_LIBS@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
 LIBSOUP_CFLAGS = @LIBSOUP_CFLAGS@
@@ -285,6 +283,8 @@ MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MANIFEST_TOOL = @MANIFEST_TOOL@
 MKDIR_P = @MKDIR_P@
+MM_GLIB_CFLAGS = @MM_GLIB_CFLAGS@
+MM_GLIB_LIBS = @MM_GLIB_LIBS@
 MOC = @MOC@
 MSGFMT = @MSGFMT@
 MSGFMT_015 = @MSGFMT_015@
@@ -294,6 +294,7 @@ NMEDIT = @NMEDIT@
 NM_MAJOR_VERSION = @NM_MAJOR_VERSION@
 NM_MICRO_VERSION = @NM_MICRO_VERSION@
 NM_MINOR_VERSION = @NM_MINOR_VERSION@
+NM_MODIFY_SYSTEM_POLICY = @NM_MODIFY_SYSTEM_POLICY@
 NM_VERSION = @NM_VERSION@
 NSS_CFLAGS = @NSS_CFLAGS@
 NSS_LIBS = @NSS_LIBS@
@@ -320,13 +321,14 @@ PPPD_PLUGIN_DIR = @PPPD_PLUGIN_DIR@
 QT_CFLAGS = @QT_CFLAGS@
 QT_LIBS = @QT_LIBS@
 RANLIB = @RANLIB@
-RESOLVCONF_PATH = @RESOLVCONF_PATH@
 SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
-SYSTEMD_CFLAGS = @SYSTEMD_CFLAGS@
-SYSTEMD_LIBS = @SYSTEMD_LIBS@
+SYSTEMD_INHIBIT_CFLAGS = @SYSTEMD_INHIBIT_CFLAGS@
+SYSTEMD_INHIBIT_LIBS = @SYSTEMD_INHIBIT_LIBS@
+SYSTEMD_LOGIN_CFLAGS = @SYSTEMD_LOGIN_CFLAGS@
+SYSTEMD_LOGIN_LIBS = @SYSTEMD_LOGIN_LIBS@
 SYSTEM_CA_PATH = @SYSTEM_CA_PATH@
 UDEV_BASE_DIR = @UDEV_BASE_DIR@
 USE_NLS = @USE_NLS@
@@ -381,6 +383,11 @@ localedir = @localedir@
 localstatedir = @localstatedir@
 mandir = @mandir@
 mkdir_p = @mkdir_p@
+nmbinary = @nmbinary@
+nmconfdir = @nmconfdir@
+nmdatadir = @nmdatadir@
+nmrundir = @nmrundir@
+nmstatedir = @nmstatedir@
 oldincludedir = @oldincludedir@
 pdfdir = @pdfdir@
 prefix = @prefix@
@@ -395,6 +402,10 @@ target_alias = @target_alias@
 top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
+with_dhclient = @with_dhclient@
+with_dhcpcd = @with_dhcpcd@
+with_netconfig = @with_netconfig@
+with_resolvconf = @with_resolvconf@
 INCLUDES = \
 	-I${top_srcdir} \
 	-I${top_builddir}/include \
@@ -416,7 +427,6 @@ libppp_manager_la_SOURCES = \
 built_sources = nm-ppp-manager-glue.h
 libppp_manager_la_CPPFLAGS = \
 	$(DBUS_CFLAGS) \
-	-DG_DISABLE_DEPRECATED \
 	-DSYSCONFDIR=\"$(sysconfdir)\" \
 	-DLIBDIR=\"$(libdir)\" \
 	-DPLUGINDIR=\"$(PPPD_PLUGIN_DIR)\"
@@ -538,25 +548,22 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/nm_pppd_plugin_la-nm-pppd-plugin.Plo@am__quote@
 
 .c.o:
-@am__fastdepCC_TRUE@	$(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\
-@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
-@am__fastdepCC_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.Po
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $<
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c $<
 
 .c.obj:
-@am__fastdepCC_TRUE@	$(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.obj$$||'`;\
-@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ `$(CYGPATH_W) '$<'` &&\
-@am__fastdepCC_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.Po
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c `$(CYGPATH_W) '$<'`
 
 .c.lo:
-@am__fastdepCC_TRUE@	$(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.lo$$||'`;\
-@am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
-@am__fastdepCC_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.Plo
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $<
diff --git a/src/settings/Makefile.am b/src/settings/Makefile.am
index eb6190bb..6ca7633f 100644
--- a/src/settings/Makefile.am
+++ b/src/settings/Makefile.am
@@ -1,4 +1,4 @@
-SUBDIRS=plugins . tests
+SUBDIRS = plugins . tests
 
 INCLUDES = -I${top_srcdir} \
            -I${top_builddir}/include \
@@ -53,15 +53,13 @@ libsettings_la_SOURCES = \
 libsettings_la_CPPFLAGS = \
 	$(DBUS_CFLAGS) \
 	$(GLIB_CFLAGS) \
-	$(GMODULE_CFLAGS) \
 	$(POLKIT_CFLAGS) \
-	-DG_DISABLE_DEPRECATED	\
 	-DBINDIR=\"$(bindir)\" \
 	-DSBINDIR=\"$(sbindir)\" \
 	-DLIBEXECDIR=\"$(libexecdir)\" \
 	-DDATADIR=\"$(datadir)\" \
 	-DSYSCONFDIR=\"$(sysconfdir)\" \
-	-DLOCALSTATEDIR=\"$(localstatedir)\" \
+	-DNMSTATEDIR=\"$(nmstatedir)\" \
 	-DGNOMELOCALEDIR=\"$(datadir)/locale\" \
 	-DPLUGINDIR=\"$(pkglibdir)\"
 
@@ -72,7 +70,6 @@ libsettings_la_LIBADD = \
 	$(builddir)/plugins/keyfile/libnm-settings-plugin-keyfile.la \
 	$(DBUS_LIBS) \
 	$(GLIB_LIBS) \
-	$(GMODULE_LIBS) \
 	$(POLKIT_LIBS)
 
 libsettings_la_LDFLAGS = -rdynamic
diff --git a/src/settings/Makefile.in b/src/settings/Makefile.in
index 50c63cf0..0c95d968 100644
--- a/src/settings/Makefile.in
+++ b/src/settings/Makefile.in
@@ -55,16 +55,18 @@ subdir = src/settings
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/compiler_warnings.m4 \
-	$(top_srcdir)/m4/gettext.m4 $(top_srcdir)/m4/gtk-doc.m4 \
-	$(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/intlmacosx.m4 \
-	$(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/introspection.m4 \
-	$(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \
-	$(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/libnl-check.m4 \
-	$(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \
-	$(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
-	$(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/nls.m4 \
-	$(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/progtest.m4 \
-	$(top_srcdir)/m4/vapigen.m4 $(top_srcdir)/configure.ac
+	$(top_srcdir)/m4/gettext.m4 \
+	$(top_srcdir)/m4/gnome-code-coverage.m4 \
+	$(top_srcdir)/m4/gtk-doc.m4 $(top_srcdir)/m4/iconv.m4 \
+	$(top_srcdir)/m4/intlmacosx.m4 $(top_srcdir)/m4/intltool.m4 \
+	$(top_srcdir)/m4/introspection.m4 $(top_srcdir)/m4/lib-ld.m4 \
+	$(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \
+	$(top_srcdir)/m4/libnl-check.m4 $(top_srcdir)/m4/libtool.m4 \
+	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
+	$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
+	$(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/po.m4 \
+	$(top_srcdir)/m4/progtest.m4 $(top_srcdir)/m4/vapigen.m4 \
+	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(install_sh) -d
@@ -79,7 +81,7 @@ libsettings_la_DEPENDENCIES =  \
 	$(top_builddir)/src/logging/libnm-logging.la \
 	$(builddir)/plugins/keyfile/libnm-settings-plugin-keyfile.la \
 	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
-	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
+	$(am__DEPENDENCIES_1)
 am_libsettings_la_OBJECTS = libsettings_la-nm-settings.lo \
 	libsettings_la-nm-inotify-helper.lo \
 	libsettings_la-nm-settings-error.lo \
@@ -192,6 +194,10 @@ AWK = @AWK@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
+CKDB_PATH = @CKDB_PATH@
+CODE_COVERAGE_CFLAGS = @CODE_COVERAGE_CFLAGS@
+CODE_COVERAGE_ENABLED = @CODE_COVERAGE_ENABLED@
+CODE_COVERAGE_LDFLAGS = @CODE_COVERAGE_LDFLAGS@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CXX = @CXX@
@@ -206,9 +212,7 @@ DBUS_SYS_DIR = @DBUS_SYS_DIR@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
 DHCLIENT_PATH = @DHCLIENT_PATH@
-DHCLIENT_VERSION = @DHCLIENT_VERSION@
 DHCPCD_PATH = @DHCPCD_PATH@
-DISABLE_DEPRECATED = @DISABLE_DEPRECATED@
 DLLTOOL = @DLLTOOL@
 DSYMUTIL = @DSYMUTIL@
 DUMPBIN = @DUMPBIN@
@@ -218,17 +222,14 @@ ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
 FGREP = @FGREP@
+GENHTML = @GENHTML@
 GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
 GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
-GIO_CFLAGS = @GIO_CFLAGS@
-GIO_LIBS = @GIO_LIBS@
 GLIB_CFLAGS = @GLIB_CFLAGS@
 GLIB_GENMARSHAL = @GLIB_GENMARSHAL@
 GLIB_LIBS = @GLIB_LIBS@
 GLIB_MAKEFILE = @GLIB_MAKEFILE@
 GLIB_MKENUMS = @GLIB_MKENUMS@
-GMODULE_CFLAGS = @GMODULE_CFLAGS@
-GMODULE_LIBS = @GMODULE_LIBS@
 GMSGFMT = @GMSGFMT@
 GMSGFMT_015 = @GMSGFMT_015@
 GNUTLS_CFLAGS = @GNUTLS_CFLAGS@
@@ -269,6 +270,7 @@ IPTABLES_PATH = @IPTABLES_PATH@
 IWMX_SDK_CFLAGS = @IWMX_SDK_CFLAGS@
 IWMX_SDK_LIBS = @IWMX_SDK_LIBS@
 KERNEL_FIRMWARE_DIR = @KERNEL_FIRMWARE_DIR@
+LCOV = @LCOV@
 LD = @LD@
 LDFLAGS = @LDFLAGS@
 LIBDL = @LIBDL@
@@ -285,11 +287,7 @@ LIBNL2_LIBS = @LIBNL2_LIBS@
 LIBNL3_CFLAGS = @LIBNL3_CFLAGS@
 LIBNL3_LIBS = @LIBNL3_LIBS@
 LIBNL_CFLAGS = @LIBNL_CFLAGS@
-LIBNL_GENL3_CFLAGS = @LIBNL_GENL3_CFLAGS@
-LIBNL_GENL3_LIBS = @LIBNL_GENL3_LIBS@
 LIBNL_LIBS = @LIBNL_LIBS@
-LIBNL_ROUTE3_CFLAGS = @LIBNL_ROUTE3_CFLAGS@
-LIBNL_ROUTE3_LIBS = @LIBNL_ROUTE3_LIBS@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
 LIBSOUP_CFLAGS = @LIBSOUP_CFLAGS@
@@ -304,6 +302,8 @@ MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MANIFEST_TOOL = @MANIFEST_TOOL@
 MKDIR_P = @MKDIR_P@
+MM_GLIB_CFLAGS = @MM_GLIB_CFLAGS@
+MM_GLIB_LIBS = @MM_GLIB_LIBS@
 MOC = @MOC@
 MSGFMT = @MSGFMT@
 MSGFMT_015 = @MSGFMT_015@
@@ -313,6 +313,7 @@ NMEDIT = @NMEDIT@
 NM_MAJOR_VERSION = @NM_MAJOR_VERSION@
 NM_MICRO_VERSION = @NM_MICRO_VERSION@
 NM_MINOR_VERSION = @NM_MINOR_VERSION@
+NM_MODIFY_SYSTEM_POLICY = @NM_MODIFY_SYSTEM_POLICY@
 NM_VERSION = @NM_VERSION@
 NSS_CFLAGS = @NSS_CFLAGS@
 NSS_LIBS = @NSS_LIBS@
@@ -339,13 +340,14 @@ PPPD_PLUGIN_DIR = @PPPD_PLUGIN_DIR@
 QT_CFLAGS = @QT_CFLAGS@
 QT_LIBS = @QT_LIBS@
 RANLIB = @RANLIB@
-RESOLVCONF_PATH = @RESOLVCONF_PATH@
 SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
-SYSTEMD_CFLAGS = @SYSTEMD_CFLAGS@
-SYSTEMD_LIBS = @SYSTEMD_LIBS@
+SYSTEMD_INHIBIT_CFLAGS = @SYSTEMD_INHIBIT_CFLAGS@
+SYSTEMD_INHIBIT_LIBS = @SYSTEMD_INHIBIT_LIBS@
+SYSTEMD_LOGIN_CFLAGS = @SYSTEMD_LOGIN_CFLAGS@
+SYSTEMD_LOGIN_LIBS = @SYSTEMD_LOGIN_LIBS@
 SYSTEM_CA_PATH = @SYSTEM_CA_PATH@
 UDEV_BASE_DIR = @UDEV_BASE_DIR@
 USE_NLS = @USE_NLS@
@@ -400,6 +402,11 @@ localedir = @localedir@
 localstatedir = @localstatedir@
 mandir = @mandir@
 mkdir_p = @mkdir_p@
+nmbinary = @nmbinary@
+nmconfdir = @nmconfdir@
+nmdatadir = @nmdatadir@
+nmrundir = @nmrundir@
+nmstatedir = @nmstatedir@
 oldincludedir = @oldincludedir@
 pdfdir = @pdfdir@
 prefix = @prefix@
@@ -414,6 +421,10 @@ target_alias = @target_alias@
 top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
+with_dhclient = @with_dhclient@
+with_dhcpcd = @with_dhcpcd@
+with_netconfig = @with_netconfig@
+with_resolvconf = @with_resolvconf@
 SUBDIRS = plugins . tests
 INCLUDES = -I${top_srcdir} \
            -I${top_builddir}/include \
@@ -467,15 +478,13 @@ libsettings_la_SOURCES = \
 libsettings_la_CPPFLAGS = \
 	$(DBUS_CFLAGS) \
 	$(GLIB_CFLAGS) \
-	$(GMODULE_CFLAGS) \
 	$(POLKIT_CFLAGS) \
-	-DG_DISABLE_DEPRECATED	\
 	-DBINDIR=\"$(bindir)\" \
 	-DSBINDIR=\"$(sbindir)\" \
 	-DLIBEXECDIR=\"$(libexecdir)\" \
 	-DDATADIR=\"$(datadir)\" \
 	-DSYSCONFDIR=\"$(sysconfdir)\" \
-	-DLOCALSTATEDIR=\"$(localstatedir)\" \
+	-DNMSTATEDIR=\"$(nmstatedir)\" \
 	-DGNOMELOCALEDIR=\"$(datadir)/locale\" \
 	-DPLUGINDIR=\"$(pkglibdir)\"
 
@@ -486,7 +495,6 @@ libsettings_la_LIBADD = \
 	$(builddir)/plugins/keyfile/libnm-settings-plugin-keyfile.la \
 	$(DBUS_LIBS) \
 	$(GLIB_LIBS) \
-	$(GMODULE_LIBS) \
 	$(POLKIT_LIBS)
 
 libsettings_la_LDFLAGS = -rdynamic
@@ -560,25 +568,22 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libtest_settings_utils_la-nm-settings-utils.Plo@am__quote@
 
 .c.o:
-@am__fastdepCC_TRUE@	$(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\
-@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
-@am__fastdepCC_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.Po
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $<
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c $<
 
 .c.obj:
-@am__fastdepCC_TRUE@	$(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.obj$$||'`;\
-@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ `$(CYGPATH_W) '$<'` &&\
-@am__fastdepCC_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.Po
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c `$(CYGPATH_W) '$<'`
 
 .c.lo:
-@am__fastdepCC_TRUE@	$(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.lo$$||'`;\
-@am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
-@am__fastdepCC_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.Plo
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $<
diff --git a/src/settings/nm-agent-manager.c b/src/settings/nm-agent-manager.c
index b7057400..d9199f51 100644
--- a/src/settings/nm-agent-manager.c
+++ b/src/settings/nm-agent-manager.c
@@ -20,7 +20,6 @@
 
 #include 
 #include 
-#include 
 #include 
 
 #include 
@@ -166,7 +165,7 @@ validate_identifier (const char *identifier, GError **error)
 
 	/* FIXME: do complete validation here */
 	while (p && *p) {
-		if (!isalnum (*p) && (*p != '_') && (*p != '-') && (*p != '.')) {
+		if (!g_ascii_isalnum (*p) && (*p != '_') && (*p != '-') && (*p != '.')) {
 			g_set_error (error,
 			             NM_AGENT_MANAGER_ERROR,
 				         NM_AGENT_MANAGER_ERROR_INVALID_IDENTIFIER,
diff --git a/src/settings/nm-inotify-helper.c b/src/settings/nm-inotify-helper.c
index f44fee82..2391d993 100644
--- a/src/settings/nm-inotify-helper.c
+++ b/src/settings/nm-inotify-helper.c
@@ -27,6 +27,10 @@
 #include "nm-inotify-helper.h"
 #include "nm-logging.h"
 
+/* NOTE: this code should be killed once we depend on a new enough glib to
+ * include the patches from https://bugzilla.gnome.org/show_bug.cgi?id=532815
+ */
+
 G_DEFINE_TYPE (NMInotifyHelper, nm_inotify_helper, G_TYPE_OBJECT)
 
 #define NM_INOTIFY_HELPER_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), NM_TYPE_INOTIFY_HELPER, NMInotifyHelperPrivate))
diff --git a/src/settings/nm-inotify-helper.h b/src/settings/nm-inotify-helper.h
index bdebaf8e..31e6b9ff 100644
--- a/src/settings/nm-inotify-helper.h
+++ b/src/settings/nm-inotify-helper.h
@@ -25,6 +25,10 @@
 #include 
 #include 
 
+/* NOTE: this code should be killed once we depend on a new enough glib to
+ * include the patches from https://bugzilla.gnome.org/show_bug.cgi?id=532815
+ */
+
 #define NM_TYPE_INOTIFY_HELPER            (nm_inotify_helper_get_type ())
 #define NM_INOTIFY_HELPER(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), NM_TYPE_INOTIFY_HELPER, NMInotifyHelper))
 #define NM_INOTIFY_HELPER_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), NM_TYPE_INOTIFY_HELPER, NMInotifyHelperClass))
diff --git a/src/settings/nm-secret-agent.c b/src/settings/nm-secret-agent.c
index 94f046e5..e79d4281 100644
--- a/src/settings/nm-secret-agent.c
+++ b/src/settings/nm-secret-agent.c
@@ -30,6 +30,7 @@
 #include "NetworkManager.h"
 #include "nm-secret-agent.h"
 #include "nm-dbus-glib-types.h"
+#include "nm-logging.h"
 
 G_DEFINE_TYPE (NMSecretAgent, nm_secret_agent, G_TYPE_OBJECT)
 
@@ -296,6 +297,20 @@ nm_secret_agent_get_secrets (NMSecretAgent *self,
 	return r->call;
 }
 
+static void
+cancel_done (DBusGProxy *proxy, DBusGProxyCall *call_id, void *user_data)
+{
+	GError *error = NULL;
+
+	if (!dbus_g_proxy_end_call (proxy, call_id, &error, G_TYPE_INVALID)) {
+		nm_log_dbg (LOGD_AGENTS, "(%s): agent failed to cancel secrets: (%d) %s",
+		            (const char *) user_data,
+		            error ? error->code : -1,
+		            error && error->message ? error->message : "(unknown)");
+		g_clear_error (&error);
+	}
+}
+
 void
 nm_secret_agent_cancel_secrets (NMSecretAgent *self, gconstpointer call)
 {
@@ -308,13 +323,16 @@ nm_secret_agent_cancel_secrets (NMSecretAgent *self, gconstpointer call)
 	r = g_hash_table_lookup (priv->requests, call);
 	g_return_if_fail (r != NULL);
 
-	dbus_g_proxy_cancel_call (NM_SECRET_AGENT_GET_PRIVATE (self)->proxy, (gpointer) call);
+	dbus_g_proxy_cancel_call (priv->proxy, (gpointer) call);
 
-	dbus_g_proxy_call_no_reply (priv->proxy,
-	                            "CancelGetSecrets",
-	                            G_TYPE_STRING, r->path,
-	                            G_TYPE_STRING, r->setting_name,
-	                            G_TYPE_INVALID);
+	dbus_g_proxy_begin_call (priv->proxy,
+	                         "CancelGetSecrets",
+	                         cancel_done,
+	                         g_strdup (nm_secret_agent_get_description (self)),
+	                         g_free,
+	                         DBUS_TYPE_G_OBJECT_PATH, r->path,
+	                         G_TYPE_STRING, r->setting_name,
+	                         G_TYPE_INVALID);
 	g_hash_table_remove (priv->requests, call);
 }
 
diff --git a/src/settings/nm-settings-connection.c b/src/settings/nm-settings-connection.c
index ddc758c7..f0cfc3fc 100644
--- a/src/settings/nm-settings-connection.c
+++ b/src/settings/nm-settings-connection.c
@@ -16,7 +16,7 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  *
  * (C) Copyright 2008 Novell, Inc.
- * (C) Copyright 2008 - 2011 Red Hat, Inc.
+ * (C) Copyright 2008 - 2012 Red Hat, Inc.
  */
 
 #include "config.h"
@@ -28,6 +28,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 
 #include "nm-settings-connection.h"
@@ -41,8 +42,8 @@
 #include "nm-agent-manager.h"
 #include "NetworkManagerUtils.h"
 
-#define SETTINGS_TIMESTAMPS_FILE  LOCALSTATEDIR"/lib/NetworkManager/timestamps"
-#define SETTINGS_SEEN_BSSIDS_FILE LOCALSTATEDIR"/lib/NetworkManager/seen-bssids"
+#define SETTINGS_TIMESTAMPS_FILE  NMSTATEDIR "/timestamps"
+#define SETTINGS_SEEN_BSSIDS_FILE NMSTATEDIR "/seen-bssids"
 
 static void impl_settings_connection_get_settings (NMSettingsConnection *connection,
                                                    DBusGMethodInvocation *context);
@@ -107,6 +108,7 @@ typedef struct {
 	NMConnection *agent_secrets;
 
 	guint64 timestamp;   /* Up-to-date timestamp of connection use */
+	gboolean timestamp_set;
 	GHashTable *seen_bssids; /* Up-to-date BSSIDs that's been seen for the connection */
 } NMSettingsConnectionPrivate;
 
@@ -572,8 +574,6 @@ do_delete (NMSettingsConnection *connection,
 	/* Remove connection from seen-bssids database file */
 	remove_entry_from_db (connection, "seen-bssids");
 
-	/* Signal the connection is removed and deleted */
-	g_signal_emit (connection, signals[REMOVED], 0);
 	callback (connection, NULL, user_data);
 	g_object_unref (connection);
 }
@@ -1061,7 +1061,9 @@ get_settings_auth_cb (NMSettingsConnection *self,
 		GHashTable *settings;
 		NMConnection *dupl_con;
 		NMSettingConnection *s_con;
-		guint64 timestamp;
+		NMSettingWireless *s_wifi;
+		guint64 timestamp = 0;
+		GSList *bssid_list;
 
 		dupl_con = nm_connection_duplicate (NM_CONNECTION (self));
 		g_assert (dupl_con);
@@ -1072,12 +1074,22 @@ get_settings_auth_cb (NMSettingsConnection *self,
 		 * timestamps are kept track of in a private variable. So, substitute
 		 * timestamp property with the real one here before returning the settings.
 		 */
-		timestamp = nm_settings_connection_get_timestamp (self);
+		nm_settings_connection_get_timestamp (self, ×tamp);
 		if (timestamp) {
 			s_con = nm_connection_get_setting_connection (NM_CONNECTION (dupl_con));
 			g_assert (s_con);
 			g_object_set (s_con, NM_SETTING_CONNECTION_TIMESTAMP, timestamp, NULL);
 		}
+		/* Seen BSSIDs are not updated in 802-11-wireless 'seen-bssids' property
+		 * from the same reason as timestamp. Thus we put it here to GetSettings()
+		 * return settings too.
+		 */
+		bssid_list = nm_settings_connection_get_seen_bssids (self);
+		s_wifi = nm_connection_get_setting_wireless (NM_CONNECTION (dupl_con));
+		if (bssid_list && s_wifi) {
+			g_object_set (s_wifi, NM_SETTING_WIRELESS_SEEN_BSSIDS, bssid_list, NULL);
+			nm_utils_slist_free (bssid_list, g_free);
+		}
 
 		/* Secrets should *never* be returned by the GetSettings method, they
 		 * get returned by the GetSecrets method which can be better
@@ -1403,18 +1415,23 @@ nm_settings_connection_signal_remove (NMSettingsConnection *self)
 /**
  * nm_settings_connection_get_timestamp:
  * @connection: the #NMSettingsConnection
+ * @out_timestamp: the connection's timestamp
  *
- * Returns current connection's timestamp.
+ * Returns the time (in seconds since the Unix epoch) when the connection
+ * was last successfully activated.
  *
- * Returns: timestamp of the last connection use (0 when it's not used)
+ * Returns: %TRUE if the timestamp has ever been set, otherwise %FALSE.
  **/
-guint64
-nm_settings_connection_get_timestamp (NMSettingsConnection *connection)
+gboolean
+nm_settings_connection_get_timestamp (NMSettingsConnection *connection,
+                                      guint64 *out_timestamp)
 {
 	g_return_val_if_fail (connection != NULL, 0);
 	g_return_val_if_fail (NM_IS_SETTINGS_CONNECTION (connection), 0);
 
-	return NM_SETTINGS_CONNECTION_GET_PRIVATE (connection)->timestamp;
+	if (out_timestamp)
+		*out_timestamp = NM_SETTINGS_CONNECTION_GET_PRIVATE (connection)->timestamp;
+	return NM_SETTINGS_CONNECTION_GET_PRIVATE (connection)->timestamp_set;
 }
 
 /**
@@ -1440,6 +1457,7 @@ nm_settings_connection_update_timestamp (NMSettingsConnection *connection,
 
 	/* Update timestamp in private storage */
 	priv->timestamp = timestamp;
+	priv->timestamp_set = TRUE;
 
 	if (flush_to_disk == FALSE)
 		return;
@@ -1497,9 +1515,10 @@ nm_settings_connection_read_and_fill_timestamp (NMSettingsConnection *connection
 	}
 
 	/* Update connection's timestamp */
-	if (!err)
+	if (!err) {
 		priv->timestamp = timestamp;
-	else {
+		priv->timestamp_set = TRUE;
+	} else {
 		nm_log_dbg (LOGD_SETTINGS, "failed to read connection timestamp for '%s': (%d) %s",
 		            connection_uuid, err->code, err->message);
 		g_clear_error (&err);
@@ -1536,6 +1555,33 @@ mac_dup (const struct ether_addr *old)
 	return new;
 }
 
+/**
+ * nm_settings_connection_get_seen_bssids:
+ * @connection: the #NMSettingsConnection
+ *
+ * Returns current list of seen BSSIDs for the connection.
+ *
+ * Returns: (transfer full) list of seen BSSIDs (in the standard hex-digits-and-colons notation).
+ * The caller is responsible for freeing the list.
+ **/
+GSList *
+nm_settings_connection_get_seen_bssids (NMSettingsConnection *connection)
+{
+	NMSettingsConnectionPrivate *priv = NM_SETTINGS_CONNECTION_GET_PRIVATE (connection);
+	GHashTableIter iter;
+	char *bssid_str;
+	GSList *bssid_list = NULL;
+
+	g_return_val_if_fail (connection != NULL, 0);
+	g_return_val_if_fail (NM_IS_SETTINGS_CONNECTION (connection), NULL);
+
+	g_hash_table_iter_init (&iter, priv->seen_bssids);
+	while (g_hash_table_iter_next (&iter, NULL, (gpointer) &bssid_str))
+		bssid_list = g_slist_prepend (bssid_list, g_strdup (bssid_str));
+
+	return bssid_list;
+}
+
 /**
  * nm_settings_connection_has_seen_bssid:
  * @connection: the #NMSettingsConnection
diff --git a/src/settings/nm-settings-connection.h b/src/settings/nm-settings-connection.h
index 9a0e866c..7875afbe 100644
--- a/src/settings/nm-settings-connection.h
+++ b/src/settings/nm-settings-connection.h
@@ -122,7 +122,8 @@ gboolean nm_settings_connection_check_permission (NMSettingsConnection *self,
 
 void nm_settings_connection_signal_remove (NMSettingsConnection *self);
 
-guint64 nm_settings_connection_get_timestamp (NMSettingsConnection *connection);
+gboolean nm_settings_connection_get_timestamp (NMSettingsConnection *connection,
+                                               guint64 *out_timestamp);
 
 void nm_settings_connection_update_timestamp (NMSettingsConnection *connection,
                                               guint64 timestamp,
@@ -130,6 +131,8 @@ void nm_settings_connection_update_timestamp (NMSettingsConnection *connection,
 
 void nm_settings_connection_read_and_fill_timestamp (NMSettingsConnection *connection);
 
+GSList *nm_settings_connection_get_seen_bssids (NMSettingsConnection *connection);
+
 gboolean nm_settings_connection_has_seen_bssid (NMSettingsConnection *connection,
                                                 const struct ether_addr *bssid);
 
diff --git a/src/settings/nm-settings.c b/src/settings/nm-settings.c
index ea0ff31a..0c139174 100644
--- a/src/settings/nm-settings.c
+++ b/src/settings/nm-settings.c
@@ -27,7 +27,6 @@
 
 #include 
 #include 
-#include 
 #include 
 #include 
 #include 
@@ -287,7 +286,7 @@ connection_sort (gconstpointer pa, gconstpointer pb)
 	NMSettingConnection *con_a;
 	NMConnection *b = NM_CONNECTION (pb);
 	NMSettingConnection *con_b;
-	guint64 ts_a, ts_b;
+	guint64 ts_a = 0, ts_b = 0;
 
 	con_a = nm_connection_get_setting_connection (a);
 	g_assert (con_a);
@@ -300,8 +299,8 @@ connection_sort (gconstpointer pa, gconstpointer pb)
 		return 1;
 	}
 
-	ts_a = nm_settings_connection_get_timestamp (NM_SETTINGS_CONNECTION (pa));
-	ts_b = nm_settings_connection_get_timestamp (NM_SETTINGS_CONNECTION (pb));
+	nm_settings_connection_get_timestamp (NM_SETTINGS_CONNECTION (pa), &ts_a);
+	nm_settings_connection_get_timestamp (NM_SETTINGS_CONNECTION (pb), &ts_b);
 	if (ts_a > ts_b)
 		return -1;
 	else if (ts_a == ts_b)
@@ -596,7 +595,7 @@ load_plugins (NMSettings *self, const char **plugins, GError **error)
 		GObject * (*factory_func) (const char *);
 
 		/* strip leading spaces */
-		while (isblank (*pname))
+		while (g_ascii_isspace (*pname))
 			pname++;
 
 		/* ifcfg-fedora was renamed ifcfg-rh; handle old configs here */
@@ -1657,7 +1656,7 @@ best_connection_sort (gconstpointer a, gconstpointer b, gpointer user_data)
 {
 	NMSettingsConnection *ac = (NMSettingsConnection *) a;
 	NMSettingsConnection *bc = (NMSettingsConnection *) b;
-	guint64 ats, bts;
+	guint64 ats = 0, bts = 0;
 
 	if (!ac && bc)
 		return -1;
@@ -1669,8 +1668,8 @@ best_connection_sort (gconstpointer a, gconstpointer b, gpointer user_data)
 	g_assert (ac && bc);
 
 	/* In the future we may use connection priorities in addition to timestamps */
-	ats = nm_settings_connection_get_timestamp (ac);
-	bts = nm_settings_connection_get_timestamp (bc);
+	nm_settings_connection_get_timestamp (ac, &ats);
+	nm_settings_connection_get_timestamp (bc, &bts);
 
 	if (ats < bts)
 		return -1;
@@ -1697,6 +1696,8 @@ get_best_connections (NMConnectionProvider *provider,
 
 	g_hash_table_iter_init (&iter, priv->connections);
 	while (g_hash_table_iter_next (&iter, NULL, (gpointer) &connection)) {
+		guint64 cur_ts = 0;
+
 		if (ctype1 && !nm_connection_is_type (NM_CONNECTION (connection), ctype1))
 			continue;
 		if (ctype2 && !nm_connection_is_type (NM_CONNECTION (connection), ctype2))
@@ -1705,10 +1706,11 @@ get_best_connections (NMConnectionProvider *provider,
 			continue;
 
 		/* Don't bother with a connection that's older than the oldest one in the list */
-		if (   max_requested
-		    && added >= max_requested
-		    && nm_settings_connection_get_timestamp (connection) <= oldest)
-			continue;
+		if (max_requested && added >= max_requested) {
+		    nm_settings_connection_get_timestamp (connection, &cur_ts);
+		    if (cur_ts <= oldest)
+				continue;
+		}
 
 		/* List is sorted with oldest first */
 		sorted = g_slist_insert_sorted_with_data (sorted, connection, best_connection_sort, NULL);
@@ -1720,7 +1722,7 @@ get_best_connections (NMConnectionProvider *provider,
 			added--;
 		}
 
-		oldest = nm_settings_connection_get_timestamp (NM_SETTINGS_CONNECTION (sorted->data));
+		nm_settings_connection_get_timestamp (NM_SETTINGS_CONNECTION (sorted->data), &oldest);
 	}
 
 	return g_slist_reverse (sorted);
diff --git a/src/settings/plugins/Makefile.am b/src/settings/plugins/Makefile.am
index d4ba12f0..8b39b3fc 100644
--- a/src/settings/plugins/Makefile.am
+++ b/src/settings/plugins/Makefile.am
@@ -1,21 +1,17 @@
 SUBDIRS=keyfile example
 
-if TARGET_REDHAT
+if CONFIG_PLUGIN_IFCFG_RH
 SUBDIRS+=ifcfg-rh
 endif
 
-if TARGET_SUSE
+if CONFIG_PLUGIN_IFCFG_SUSE
 SUBDIRS+=ifcfg-suse
 endif
 
-if TARGET_MANDRIVA
-SUBDIRS+=ifcfg-rh
-endif
-
-if TARGET_DEBIAN
+if CONFIG_PLUGIN_IFUPDOWN
 SUBDIRS+=ifupdown
 endif
 
-if TARGET_GENTOO
+if CONFIG_PLUGIN_IFNET
 SUBDIRS+=ifnet
 endif
diff --git a/src/settings/plugins/Makefile.in b/src/settings/plugins/Makefile.in
index 2e8dff02..5642eda7 100644
--- a/src/settings/plugins/Makefile.in
+++ b/src/settings/plugins/Makefile.in
@@ -50,25 +50,26 @@ PRE_UNINSTALL = :
 POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
-@TARGET_REDHAT_TRUE@am__append_1 = ifcfg-rh
-@TARGET_SUSE_TRUE@am__append_2 = ifcfg-suse
-@TARGET_MANDRIVA_TRUE@am__append_3 = ifcfg-rh
-@TARGET_DEBIAN_TRUE@am__append_4 = ifupdown
-@TARGET_GENTOO_TRUE@am__append_5 = ifnet
+@CONFIG_PLUGIN_IFCFG_RH_TRUE@am__append_1 = ifcfg-rh
+@CONFIG_PLUGIN_IFCFG_SUSE_TRUE@am__append_2 = ifcfg-suse
+@CONFIG_PLUGIN_IFUPDOWN_TRUE@am__append_3 = ifupdown
+@CONFIG_PLUGIN_IFNET_TRUE@am__append_4 = ifnet
 subdir = src/settings/plugins
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/compiler_warnings.m4 \
-	$(top_srcdir)/m4/gettext.m4 $(top_srcdir)/m4/gtk-doc.m4 \
-	$(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/intlmacosx.m4 \
-	$(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/introspection.m4 \
-	$(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \
-	$(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/libnl-check.m4 \
-	$(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \
-	$(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
-	$(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/nls.m4 \
-	$(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/progtest.m4 \
-	$(top_srcdir)/m4/vapigen.m4 $(top_srcdir)/configure.ac
+	$(top_srcdir)/m4/gettext.m4 \
+	$(top_srcdir)/m4/gnome-code-coverage.m4 \
+	$(top_srcdir)/m4/gtk-doc.m4 $(top_srcdir)/m4/iconv.m4 \
+	$(top_srcdir)/m4/intlmacosx.m4 $(top_srcdir)/m4/intltool.m4 \
+	$(top_srcdir)/m4/introspection.m4 $(top_srcdir)/m4/lib-ld.m4 \
+	$(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \
+	$(top_srcdir)/m4/libnl-check.m4 $(top_srcdir)/m4/libtool.m4 \
+	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
+	$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
+	$(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/po.m4 \
+	$(top_srcdir)/m4/progtest.m4 $(top_srcdir)/m4/vapigen.m4 \
+	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(install_sh) -d
@@ -141,6 +142,10 @@ AWK = @AWK@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
+CKDB_PATH = @CKDB_PATH@
+CODE_COVERAGE_CFLAGS = @CODE_COVERAGE_CFLAGS@
+CODE_COVERAGE_ENABLED = @CODE_COVERAGE_ENABLED@
+CODE_COVERAGE_LDFLAGS = @CODE_COVERAGE_LDFLAGS@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CXX = @CXX@
@@ -155,9 +160,7 @@ DBUS_SYS_DIR = @DBUS_SYS_DIR@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
 DHCLIENT_PATH = @DHCLIENT_PATH@
-DHCLIENT_VERSION = @DHCLIENT_VERSION@
 DHCPCD_PATH = @DHCPCD_PATH@
-DISABLE_DEPRECATED = @DISABLE_DEPRECATED@
 DLLTOOL = @DLLTOOL@
 DSYMUTIL = @DSYMUTIL@
 DUMPBIN = @DUMPBIN@
@@ -167,17 +170,14 @@ ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
 FGREP = @FGREP@
+GENHTML = @GENHTML@
 GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
 GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
-GIO_CFLAGS = @GIO_CFLAGS@
-GIO_LIBS = @GIO_LIBS@
 GLIB_CFLAGS = @GLIB_CFLAGS@
 GLIB_GENMARSHAL = @GLIB_GENMARSHAL@
 GLIB_LIBS = @GLIB_LIBS@
 GLIB_MAKEFILE = @GLIB_MAKEFILE@
 GLIB_MKENUMS = @GLIB_MKENUMS@
-GMODULE_CFLAGS = @GMODULE_CFLAGS@
-GMODULE_LIBS = @GMODULE_LIBS@
 GMSGFMT = @GMSGFMT@
 GMSGFMT_015 = @GMSGFMT_015@
 GNUTLS_CFLAGS = @GNUTLS_CFLAGS@
@@ -218,6 +218,7 @@ IPTABLES_PATH = @IPTABLES_PATH@
 IWMX_SDK_CFLAGS = @IWMX_SDK_CFLAGS@
 IWMX_SDK_LIBS = @IWMX_SDK_LIBS@
 KERNEL_FIRMWARE_DIR = @KERNEL_FIRMWARE_DIR@
+LCOV = @LCOV@
 LD = @LD@
 LDFLAGS = @LDFLAGS@
 LIBDL = @LIBDL@
@@ -234,11 +235,7 @@ LIBNL2_LIBS = @LIBNL2_LIBS@
 LIBNL3_CFLAGS = @LIBNL3_CFLAGS@
 LIBNL3_LIBS = @LIBNL3_LIBS@
 LIBNL_CFLAGS = @LIBNL_CFLAGS@
-LIBNL_GENL3_CFLAGS = @LIBNL_GENL3_CFLAGS@
-LIBNL_GENL3_LIBS = @LIBNL_GENL3_LIBS@
 LIBNL_LIBS = @LIBNL_LIBS@
-LIBNL_ROUTE3_CFLAGS = @LIBNL_ROUTE3_CFLAGS@
-LIBNL_ROUTE3_LIBS = @LIBNL_ROUTE3_LIBS@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
 LIBSOUP_CFLAGS = @LIBSOUP_CFLAGS@
@@ -253,6 +250,8 @@ MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MANIFEST_TOOL = @MANIFEST_TOOL@
 MKDIR_P = @MKDIR_P@
+MM_GLIB_CFLAGS = @MM_GLIB_CFLAGS@
+MM_GLIB_LIBS = @MM_GLIB_LIBS@
 MOC = @MOC@
 MSGFMT = @MSGFMT@
 MSGFMT_015 = @MSGFMT_015@
@@ -262,6 +261,7 @@ NMEDIT = @NMEDIT@
 NM_MAJOR_VERSION = @NM_MAJOR_VERSION@
 NM_MICRO_VERSION = @NM_MICRO_VERSION@
 NM_MINOR_VERSION = @NM_MINOR_VERSION@
+NM_MODIFY_SYSTEM_POLICY = @NM_MODIFY_SYSTEM_POLICY@
 NM_VERSION = @NM_VERSION@
 NSS_CFLAGS = @NSS_CFLAGS@
 NSS_LIBS = @NSS_LIBS@
@@ -288,13 +288,14 @@ PPPD_PLUGIN_DIR = @PPPD_PLUGIN_DIR@
 QT_CFLAGS = @QT_CFLAGS@
 QT_LIBS = @QT_LIBS@
 RANLIB = @RANLIB@
-RESOLVCONF_PATH = @RESOLVCONF_PATH@
 SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
-SYSTEMD_CFLAGS = @SYSTEMD_CFLAGS@
-SYSTEMD_LIBS = @SYSTEMD_LIBS@
+SYSTEMD_INHIBIT_CFLAGS = @SYSTEMD_INHIBIT_CFLAGS@
+SYSTEMD_INHIBIT_LIBS = @SYSTEMD_INHIBIT_LIBS@
+SYSTEMD_LOGIN_CFLAGS = @SYSTEMD_LOGIN_CFLAGS@
+SYSTEMD_LOGIN_LIBS = @SYSTEMD_LOGIN_LIBS@
 SYSTEM_CA_PATH = @SYSTEM_CA_PATH@
 UDEV_BASE_DIR = @UDEV_BASE_DIR@
 USE_NLS = @USE_NLS@
@@ -349,6 +350,11 @@ localedir = @localedir@
 localstatedir = @localstatedir@
 mandir = @mandir@
 mkdir_p = @mkdir_p@
+nmbinary = @nmbinary@
+nmconfdir = @nmconfdir@
+nmdatadir = @nmdatadir@
+nmrundir = @nmrundir@
+nmstatedir = @nmstatedir@
 oldincludedir = @oldincludedir@
 pdfdir = @pdfdir@
 prefix = @prefix@
@@ -363,8 +369,12 @@ target_alias = @target_alias@
 top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
+with_dhclient = @with_dhclient@
+with_dhcpcd = @with_dhcpcd@
+with_netconfig = @with_netconfig@
+with_resolvconf = @with_resolvconf@
 SUBDIRS = keyfile example $(am__append_1) $(am__append_2) \
-	$(am__append_3) $(am__append_4) $(am__append_5)
+	$(am__append_3) $(am__append_4)
 all: all-recursive
 
 .SUFFIXES:
diff --git a/src/settings/plugins/example/Makefile.am b/src/settings/plugins/example/Makefile.am
index 027f6f89..95558b72 100644
--- a/src/settings/plugins/example/Makefile.am
+++ b/src/settings/plugins/example/Makefile.am
@@ -25,16 +25,12 @@ libnm_settings_plugin_example_la_SOURCES = \
 
 libnm_settings_plugin_example_la_CPPFLAGS = \
 	$(GLIB_CFLAGS) \
-	$(GMODULE_CFLAGS) \
 	$(DBUS_CFLAGS) \
-	-DSYSCONFDIR=\"$(sysconfdir)\" \
-	-DG_DISABLE_DEPRECATED
+	-DNMCONFDIR=\"$(nmconfdir)\"
 
 libnm_settings_plugin_example_la_LIBADD = \
 	$(top_builddir)/libnm-util/libnm-util.la \
-	$(GLIB_LIBS) \
-	$(GMODULE_LIBS) \
-	$(GIO_LIBS)
+	$(GLIB_LIBS)
 
 libnm_settings_plugin_example_la_LDFLAGS = -module -avoid-version
 
diff --git a/src/settings/plugins/example/Makefile.in b/src/settings/plugins/example/Makefile.in
index 775fabc0..fcdcd7b3 100644
--- a/src/settings/plugins/example/Makefile.in
+++ b/src/settings/plugins/example/Makefile.in
@@ -55,16 +55,18 @@ subdir = src/settings/plugins/example
 DIST_COMMON = README $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/compiler_warnings.m4 \
-	$(top_srcdir)/m4/gettext.m4 $(top_srcdir)/m4/gtk-doc.m4 \
-	$(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/intlmacosx.m4 \
-	$(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/introspection.m4 \
-	$(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \
-	$(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/libnl-check.m4 \
-	$(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \
-	$(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
-	$(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/nls.m4 \
-	$(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/progtest.m4 \
-	$(top_srcdir)/m4/vapigen.m4 $(top_srcdir)/configure.ac
+	$(top_srcdir)/m4/gettext.m4 \
+	$(top_srcdir)/m4/gnome-code-coverage.m4 \
+	$(top_srcdir)/m4/gtk-doc.m4 $(top_srcdir)/m4/iconv.m4 \
+	$(top_srcdir)/m4/intlmacosx.m4 $(top_srcdir)/m4/intltool.m4 \
+	$(top_srcdir)/m4/introspection.m4 $(top_srcdir)/m4/lib-ld.m4 \
+	$(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \
+	$(top_srcdir)/m4/libnl-check.m4 $(top_srcdir)/m4/libtool.m4 \
+	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
+	$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
+	$(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/po.m4 \
+	$(top_srcdir)/m4/progtest.m4 $(top_srcdir)/m4/vapigen.m4 \
+	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(install_sh) -d
@@ -74,8 +76,7 @@ CONFIG_CLEAN_VPATH_FILES =
 LTLIBRARIES = $(noinst_LTLIBRARIES)
 am__DEPENDENCIES_1 =
 libnm_settings_plugin_example_la_DEPENDENCIES =  \
-	$(top_builddir)/libnm-util/libnm-util.la $(am__DEPENDENCIES_1) \
-	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
+	$(top_builddir)/libnm-util/libnm-util.la $(am__DEPENDENCIES_1)
 am_libnm_settings_plugin_example_la_OBJECTS =  \
 	libnm_settings_plugin_example_la-nm-example-connection.lo \
 	libnm_settings_plugin_example_la-plugin.lo \
@@ -139,6 +140,10 @@ AWK = @AWK@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
+CKDB_PATH = @CKDB_PATH@
+CODE_COVERAGE_CFLAGS = @CODE_COVERAGE_CFLAGS@
+CODE_COVERAGE_ENABLED = @CODE_COVERAGE_ENABLED@
+CODE_COVERAGE_LDFLAGS = @CODE_COVERAGE_LDFLAGS@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CXX = @CXX@
@@ -153,9 +158,7 @@ DBUS_SYS_DIR = @DBUS_SYS_DIR@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
 DHCLIENT_PATH = @DHCLIENT_PATH@
-DHCLIENT_VERSION = @DHCLIENT_VERSION@
 DHCPCD_PATH = @DHCPCD_PATH@
-DISABLE_DEPRECATED = @DISABLE_DEPRECATED@
 DLLTOOL = @DLLTOOL@
 DSYMUTIL = @DSYMUTIL@
 DUMPBIN = @DUMPBIN@
@@ -165,17 +168,14 @@ ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
 FGREP = @FGREP@
+GENHTML = @GENHTML@
 GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
 GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
-GIO_CFLAGS = @GIO_CFLAGS@
-GIO_LIBS = @GIO_LIBS@
 GLIB_CFLAGS = @GLIB_CFLAGS@
 GLIB_GENMARSHAL = @GLIB_GENMARSHAL@
 GLIB_LIBS = @GLIB_LIBS@
 GLIB_MAKEFILE = @GLIB_MAKEFILE@
 GLIB_MKENUMS = @GLIB_MKENUMS@
-GMODULE_CFLAGS = @GMODULE_CFLAGS@
-GMODULE_LIBS = @GMODULE_LIBS@
 GMSGFMT = @GMSGFMT@
 GMSGFMT_015 = @GMSGFMT_015@
 GNUTLS_CFLAGS = @GNUTLS_CFLAGS@
@@ -216,6 +216,7 @@ IPTABLES_PATH = @IPTABLES_PATH@
 IWMX_SDK_CFLAGS = @IWMX_SDK_CFLAGS@
 IWMX_SDK_LIBS = @IWMX_SDK_LIBS@
 KERNEL_FIRMWARE_DIR = @KERNEL_FIRMWARE_DIR@
+LCOV = @LCOV@
 LD = @LD@
 LDFLAGS = @LDFLAGS@
 LIBDL = @LIBDL@
@@ -232,11 +233,7 @@ LIBNL2_LIBS = @LIBNL2_LIBS@
 LIBNL3_CFLAGS = @LIBNL3_CFLAGS@
 LIBNL3_LIBS = @LIBNL3_LIBS@
 LIBNL_CFLAGS = @LIBNL_CFLAGS@
-LIBNL_GENL3_CFLAGS = @LIBNL_GENL3_CFLAGS@
-LIBNL_GENL3_LIBS = @LIBNL_GENL3_LIBS@
 LIBNL_LIBS = @LIBNL_LIBS@
-LIBNL_ROUTE3_CFLAGS = @LIBNL_ROUTE3_CFLAGS@
-LIBNL_ROUTE3_LIBS = @LIBNL_ROUTE3_LIBS@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
 LIBSOUP_CFLAGS = @LIBSOUP_CFLAGS@
@@ -251,6 +248,8 @@ MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MANIFEST_TOOL = @MANIFEST_TOOL@
 MKDIR_P = @MKDIR_P@
+MM_GLIB_CFLAGS = @MM_GLIB_CFLAGS@
+MM_GLIB_LIBS = @MM_GLIB_LIBS@
 MOC = @MOC@
 MSGFMT = @MSGFMT@
 MSGFMT_015 = @MSGFMT_015@
@@ -260,6 +259,7 @@ NMEDIT = @NMEDIT@
 NM_MAJOR_VERSION = @NM_MAJOR_VERSION@
 NM_MICRO_VERSION = @NM_MICRO_VERSION@
 NM_MINOR_VERSION = @NM_MINOR_VERSION@
+NM_MODIFY_SYSTEM_POLICY = @NM_MODIFY_SYSTEM_POLICY@
 NM_VERSION = @NM_VERSION@
 NSS_CFLAGS = @NSS_CFLAGS@
 NSS_LIBS = @NSS_LIBS@
@@ -286,13 +286,14 @@ PPPD_PLUGIN_DIR = @PPPD_PLUGIN_DIR@
 QT_CFLAGS = @QT_CFLAGS@
 QT_LIBS = @QT_LIBS@
 RANLIB = @RANLIB@
-RESOLVCONF_PATH = @RESOLVCONF_PATH@
 SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
-SYSTEMD_CFLAGS = @SYSTEMD_CFLAGS@
-SYSTEMD_LIBS = @SYSTEMD_LIBS@
+SYSTEMD_INHIBIT_CFLAGS = @SYSTEMD_INHIBIT_CFLAGS@
+SYSTEMD_INHIBIT_LIBS = @SYSTEMD_INHIBIT_LIBS@
+SYSTEMD_LOGIN_CFLAGS = @SYSTEMD_LOGIN_CFLAGS@
+SYSTEMD_LOGIN_LIBS = @SYSTEMD_LOGIN_LIBS@
 SYSTEM_CA_PATH = @SYSTEM_CA_PATH@
 UDEV_BASE_DIR = @UDEV_BASE_DIR@
 USE_NLS = @USE_NLS@
@@ -347,6 +348,11 @@ localedir = @localedir@
 localstatedir = @localstatedir@
 mandir = @mandir@
 mkdir_p = @mkdir_p@
+nmbinary = @nmbinary@
+nmconfdir = @nmconfdir@
+nmdatadir = @nmdatadir@
+nmrundir = @nmrundir@
+nmstatedir = @nmstatedir@
 oldincludedir = @oldincludedir@
 pdfdir = @pdfdir@
 prefix = @prefix@
@@ -361,6 +367,10 @@ target_alias = @target_alias@
 top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
+with_dhclient = @with_dhclient@
+with_dhcpcd = @with_dhcpcd@
+with_netconfig = @with_netconfig@
+with_resolvconf = @with_resolvconf@
 INCLUDES = \
 	-I$(top_srcdir)/src/settings \
 	-I$(top_srcdir)/include \
@@ -388,16 +398,12 @@ libnm_settings_plugin_example_la_SOURCES = \
 
 libnm_settings_plugin_example_la_CPPFLAGS = \
 	$(GLIB_CFLAGS) \
-	$(GMODULE_CFLAGS) \
 	$(DBUS_CFLAGS) \
-	-DSYSCONFDIR=\"$(sysconfdir)\" \
-	-DG_DISABLE_DEPRECATED
+	-DNMCONFDIR=\"$(nmconfdir)\"
 
 libnm_settings_plugin_example_la_LIBADD = \
 	$(top_builddir)/libnm-util/libnm-util.la \
-	$(GLIB_LIBS) \
-	$(GMODULE_LIBS) \
-	$(GIO_LIBS)
+	$(GLIB_LIBS)
 
 libnm_settings_plugin_example_la_LDFLAGS = -module -avoid-version
 all: all-am
@@ -459,25 +465,22 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libnm_settings_plugin_example_la-writer.Plo@am__quote@
 
 .c.o:
-@am__fastdepCC_TRUE@	$(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\
-@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
-@am__fastdepCC_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.Po
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $<
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c $<
 
 .c.obj:
-@am__fastdepCC_TRUE@	$(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.obj$$||'`;\
-@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ `$(CYGPATH_W) '$<'` &&\
-@am__fastdepCC_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.Po
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c `$(CYGPATH_W) '$<'`
 
 .c.lo:
-@am__fastdepCC_TRUE@	$(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.lo$$||'`;\
-@am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
-@am__fastdepCC_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.Plo
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $<
diff --git a/src/settings/plugins/example/common.h b/src/settings/plugins/example/common.h
index a4197070..ed0be9a7 100644
--- a/src/settings/plugins/example/common.h
+++ b/src/settings/plugins/example/common.h
@@ -31,7 +31,7 @@
 #define EXAMPLE_PLUGIN_NAME "example"
 #define EXAMPLE_PLUGIN_INFO "(c) 2012 Red Hat, Inc.  To report bugs please use the NetworkManager mailing list."
 
-#define EXAMPLE_DIR SYSCONFDIR"/NetworkManager/example-plugin"
+#define EXAMPLE_DIR NMCONFDIR "/example-plugin"
 
 /* Boilerplate stuff for the plugin's error domain.  Bits of the code that
  * create new errors in the plugin's domain will create errors of
diff --git a/src/settings/plugins/ifcfg-rh/Makefile.am b/src/settings/plugins/ifcfg-rh/Makefile.am
index 68225ba1..a2c3f0f0 100644
--- a/src/settings/plugins/ifcfg-rh/Makefile.am
+++ b/src/settings/plugins/ifcfg-rh/Makefile.am
@@ -1,4 +1,4 @@
-SUBDIRS=. tests
+SUBDIRS = . tests
 
 nm-ifcfg-rh-glue.h: nm-ifcfg-rh.xml
 	$(AM_V_GEN) dbus-binding-tool --prefix=nm_ifcfg_rh --mode=glib-server --output=$@ $<
@@ -29,13 +29,13 @@ INCLUDES = \
 	-I$(top_srcdir)/include \
 	-I$(top_builddir)/include \
 	-I$(top_srcdir)/libnm-glib \
-	-I$(top_srcdir)/libnm-util
+	-I$(top_srcdir)/libnm-util \
+	-I$(top_builddir)/libnm-util
 
 libifcfg_rh_io_la_CPPFLAGS = \
 	$(GLIB_CFLAGS) \
 	$(DBUS_CFLAGS) \
 	$(NSS_CFLAGS) \
-	-DG_DISABLE_DEPRECATED \
 	-DSYSCONFDIR=\"$(sysconfdir)\" \
 	-DSBINDIR=\"$(sbindir)\"
 
@@ -54,9 +54,7 @@ libnm_settings_plugin_ifcfg_rh_la_SOURCES = \
 
 libnm_settings_plugin_ifcfg_rh_la_CPPFLAGS = \
 	$(GLIB_CFLAGS) \
-	$(GMODULE_CFLAGS) \
 	$(DBUS_CFLAGS) \
-	-DG_DISABLE_DEPRECATED \
 	-DSYSCONFDIR=\"$(sysconfdir)\"
 
 libnm_settings_plugin_ifcfg_rh_la_LDFLAGS = -module -avoid-version
@@ -64,9 +62,7 @@ libnm_settings_plugin_ifcfg_rh_la_LIBADD = \
 	$(top_builddir)/libnm-util/libnm-util.la \
 	$(top_builddir)/libnm-glib/libnm-glib.la \
 	libifcfg-rh-io.la \
-	$(GLIB_LIBS) \
-	$(GMODULE_LIBS) \
-	$(GIO_LIBS)
+	$(GLIB_LIBS)
 
 dbusservicedir = $(DBUS_SYS_DIR)
 dbusservice_DATA = nm-ifcfg-rh.conf
diff --git a/src/settings/plugins/ifcfg-rh/Makefile.in b/src/settings/plugins/ifcfg-rh/Makefile.in
index 6bdf1cc9..53492e72 100644
--- a/src/settings/plugins/ifcfg-rh/Makefile.in
+++ b/src/settings/plugins/ifcfg-rh/Makefile.in
@@ -56,16 +56,18 @@ subdir = src/settings/plugins/ifcfg-rh
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/compiler_warnings.m4 \
-	$(top_srcdir)/m4/gettext.m4 $(top_srcdir)/m4/gtk-doc.m4 \
-	$(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/intlmacosx.m4 \
-	$(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/introspection.m4 \
-	$(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \
-	$(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/libnl-check.m4 \
-	$(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \
-	$(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
-	$(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/nls.m4 \
-	$(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/progtest.m4 \
-	$(top_srcdir)/m4/vapigen.m4 $(top_srcdir)/configure.ac
+	$(top_srcdir)/m4/gettext.m4 \
+	$(top_srcdir)/m4/gnome-code-coverage.m4 \
+	$(top_srcdir)/m4/gtk-doc.m4 $(top_srcdir)/m4/iconv.m4 \
+	$(top_srcdir)/m4/intlmacosx.m4 $(top_srcdir)/m4/intltool.m4 \
+	$(top_srcdir)/m4/introspection.m4 $(top_srcdir)/m4/lib-ld.m4 \
+	$(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \
+	$(top_srcdir)/m4/libnl-check.m4 $(top_srcdir)/m4/libtool.m4 \
+	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
+	$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
+	$(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/po.m4 \
+	$(top_srcdir)/m4/progtest.m4 $(top_srcdir)/m4/vapigen.m4 \
+	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(install_sh) -d
@@ -118,7 +120,6 @@ am__v_lt_0 = --silent
 libnm_settings_plugin_ifcfg_rh_la_DEPENDENCIES =  \
 	$(top_builddir)/libnm-util/libnm-util.la \
 	$(top_builddir)/libnm-glib/libnm-glib.la libifcfg-rh-io.la \
-	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
 	$(am__DEPENDENCIES_1)
 am_libnm_settings_plugin_ifcfg_rh_la_OBJECTS =  \
 	libnm_settings_plugin_ifcfg_rh_la-plugin.lo \
@@ -218,6 +219,10 @@ AWK = @AWK@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
+CKDB_PATH = @CKDB_PATH@
+CODE_COVERAGE_CFLAGS = @CODE_COVERAGE_CFLAGS@
+CODE_COVERAGE_ENABLED = @CODE_COVERAGE_ENABLED@
+CODE_COVERAGE_LDFLAGS = @CODE_COVERAGE_LDFLAGS@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CXX = @CXX@
@@ -232,9 +237,7 @@ DBUS_SYS_DIR = @DBUS_SYS_DIR@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
 DHCLIENT_PATH = @DHCLIENT_PATH@
-DHCLIENT_VERSION = @DHCLIENT_VERSION@
 DHCPCD_PATH = @DHCPCD_PATH@
-DISABLE_DEPRECATED = @DISABLE_DEPRECATED@
 DLLTOOL = @DLLTOOL@
 DSYMUTIL = @DSYMUTIL@
 DUMPBIN = @DUMPBIN@
@@ -244,17 +247,14 @@ ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
 FGREP = @FGREP@
+GENHTML = @GENHTML@
 GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
 GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
-GIO_CFLAGS = @GIO_CFLAGS@
-GIO_LIBS = @GIO_LIBS@
 GLIB_CFLAGS = @GLIB_CFLAGS@
 GLIB_GENMARSHAL = @GLIB_GENMARSHAL@
 GLIB_LIBS = @GLIB_LIBS@
 GLIB_MAKEFILE = @GLIB_MAKEFILE@
 GLIB_MKENUMS = @GLIB_MKENUMS@
-GMODULE_CFLAGS = @GMODULE_CFLAGS@
-GMODULE_LIBS = @GMODULE_LIBS@
 GMSGFMT = @GMSGFMT@
 GMSGFMT_015 = @GMSGFMT_015@
 GNUTLS_CFLAGS = @GNUTLS_CFLAGS@
@@ -295,6 +295,7 @@ IPTABLES_PATH = @IPTABLES_PATH@
 IWMX_SDK_CFLAGS = @IWMX_SDK_CFLAGS@
 IWMX_SDK_LIBS = @IWMX_SDK_LIBS@
 KERNEL_FIRMWARE_DIR = @KERNEL_FIRMWARE_DIR@
+LCOV = @LCOV@
 LD = @LD@
 LDFLAGS = @LDFLAGS@
 LIBDL = @LIBDL@
@@ -311,11 +312,7 @@ LIBNL2_LIBS = @LIBNL2_LIBS@
 LIBNL3_CFLAGS = @LIBNL3_CFLAGS@
 LIBNL3_LIBS = @LIBNL3_LIBS@
 LIBNL_CFLAGS = @LIBNL_CFLAGS@
-LIBNL_GENL3_CFLAGS = @LIBNL_GENL3_CFLAGS@
-LIBNL_GENL3_LIBS = @LIBNL_GENL3_LIBS@
 LIBNL_LIBS = @LIBNL_LIBS@
-LIBNL_ROUTE3_CFLAGS = @LIBNL_ROUTE3_CFLAGS@
-LIBNL_ROUTE3_LIBS = @LIBNL_ROUTE3_LIBS@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
 LIBSOUP_CFLAGS = @LIBSOUP_CFLAGS@
@@ -330,6 +327,8 @@ MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MANIFEST_TOOL = @MANIFEST_TOOL@
 MKDIR_P = @MKDIR_P@
+MM_GLIB_CFLAGS = @MM_GLIB_CFLAGS@
+MM_GLIB_LIBS = @MM_GLIB_LIBS@
 MOC = @MOC@
 MSGFMT = @MSGFMT@
 MSGFMT_015 = @MSGFMT_015@
@@ -339,6 +338,7 @@ NMEDIT = @NMEDIT@
 NM_MAJOR_VERSION = @NM_MAJOR_VERSION@
 NM_MICRO_VERSION = @NM_MICRO_VERSION@
 NM_MINOR_VERSION = @NM_MINOR_VERSION@
+NM_MODIFY_SYSTEM_POLICY = @NM_MODIFY_SYSTEM_POLICY@
 NM_VERSION = @NM_VERSION@
 NSS_CFLAGS = @NSS_CFLAGS@
 NSS_LIBS = @NSS_LIBS@
@@ -365,13 +365,14 @@ PPPD_PLUGIN_DIR = @PPPD_PLUGIN_DIR@
 QT_CFLAGS = @QT_CFLAGS@
 QT_LIBS = @QT_LIBS@
 RANLIB = @RANLIB@
-RESOLVCONF_PATH = @RESOLVCONF_PATH@
 SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
-SYSTEMD_CFLAGS = @SYSTEMD_CFLAGS@
-SYSTEMD_LIBS = @SYSTEMD_LIBS@
+SYSTEMD_INHIBIT_CFLAGS = @SYSTEMD_INHIBIT_CFLAGS@
+SYSTEMD_INHIBIT_LIBS = @SYSTEMD_INHIBIT_LIBS@
+SYSTEMD_LOGIN_CFLAGS = @SYSTEMD_LOGIN_CFLAGS@
+SYSTEMD_LOGIN_LIBS = @SYSTEMD_LOGIN_LIBS@
 SYSTEM_CA_PATH = @SYSTEM_CA_PATH@
 UDEV_BASE_DIR = @UDEV_BASE_DIR@
 USE_NLS = @USE_NLS@
@@ -426,6 +427,11 @@ localedir = @localedir@
 localstatedir = @localstatedir@
 mandir = @mandir@
 mkdir_p = @mkdir_p@
+nmbinary = @nmbinary@
+nmconfdir = @nmconfdir@
+nmdatadir = @nmdatadir@
+nmrundir = @nmrundir@
+nmstatedir = @nmstatedir@
 oldincludedir = @oldincludedir@
 pdfdir = @pdfdir@
 prefix = @prefix@
@@ -440,6 +446,10 @@ target_alias = @target_alias@
 top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
+with_dhclient = @with_dhclient@
+with_dhcpcd = @with_dhcpcd@
+with_netconfig = @with_netconfig@
+with_resolvconf = @with_resolvconf@
 SUBDIRS = . tests
 BUILT_SOURCES = \
 	nm-ifcfg-rh-glue.h
@@ -465,13 +475,13 @@ INCLUDES = \
 	-I$(top_srcdir)/include \
 	-I$(top_builddir)/include \
 	-I$(top_srcdir)/libnm-glib \
-	-I$(top_srcdir)/libnm-util
+	-I$(top_srcdir)/libnm-util \
+	-I$(top_builddir)/libnm-util
 
 libifcfg_rh_io_la_CPPFLAGS = \
 	$(GLIB_CFLAGS) \
 	$(DBUS_CFLAGS) \
 	$(NSS_CFLAGS) \
-	-DG_DISABLE_DEPRECATED \
 	-DSYSCONFDIR=\"$(sysconfdir)\" \
 	-DSBINDIR=\"$(sbindir)\"
 
@@ -490,9 +500,7 @@ libnm_settings_plugin_ifcfg_rh_la_SOURCES = \
 
 libnm_settings_plugin_ifcfg_rh_la_CPPFLAGS = \
 	$(GLIB_CFLAGS) \
-	$(GMODULE_CFLAGS) \
 	$(DBUS_CFLAGS) \
-	-DG_DISABLE_DEPRECATED \
 	-DSYSCONFDIR=\"$(sysconfdir)\"
 
 libnm_settings_plugin_ifcfg_rh_la_LDFLAGS = -module -avoid-version
@@ -500,9 +508,7 @@ libnm_settings_plugin_ifcfg_rh_la_LIBADD = \
 	$(top_builddir)/libnm-util/libnm-util.la \
 	$(top_builddir)/libnm-glib/libnm-glib.la \
 	libifcfg-rh-io.la \
-	$(GLIB_LIBS) \
-	$(GMODULE_LIBS) \
-	$(GIO_LIBS)
+	$(GLIB_LIBS)
 
 dbusservicedir = $(DBUS_SYS_DIR)
 dbusservice_DATA = nm-ifcfg-rh.conf
@@ -607,25 +613,22 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libnm_settings_plugin_ifcfg_rh_la-plugin.Plo@am__quote@
 
 .c.o:
-@am__fastdepCC_TRUE@	$(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\
-@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
-@am__fastdepCC_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.Po
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $<
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c $<
 
 .c.obj:
-@am__fastdepCC_TRUE@	$(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.obj$$||'`;\
-@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ `$(CYGPATH_W) '$<'` &&\
-@am__fastdepCC_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.Po
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c `$(CYGPATH_W) '$<'`
 
 .c.lo:
-@am__fastdepCC_TRUE@	$(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.lo$$||'`;\
-@am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
-@am__fastdepCC_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.Plo
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $<
diff --git a/src/settings/plugins/ifcfg-rh/plugin.c b/src/settings/plugins/ifcfg-rh/plugin.c
index 04d5463c..50cbdf07 100644
--- a/src/settings/plugins/ifcfg-rh/plugin.c
+++ b/src/settings/plugins/ifcfg-rh/plugin.c
@@ -80,10 +80,12 @@ typedef struct {
 
 	gulong ih_event_id;
 	int sc_network_wd;
+	GFileMonitor *hostname_monitor;
+	guint hostname_monitor_id;
 	char *hostname;
 
-	GFileMonitor *monitor;
-	guint monitor_id;
+	GFileMonitor *ifcfg_monitor;
+	guint ifcfg_monitor_id;
 
 	DBusGConnection *bus;
 } SCPluginIfcfgPrivate;
@@ -325,11 +327,11 @@ connection_new_or_changed (SCPluginIfcfg *self,
 }
 
 static void
-dir_changed (GFileMonitor *monitor,
-		   GFile *file,
-		   GFile *other_file,
-		   GFileMonitorEvent event_type,
-		   gpointer user_data)
+ifcfg_dir_changed (GFileMonitor *monitor,
+                   GFile *file,
+                   GFile *other_file,
+                   GFileMonitorEvent event_type,
+                   gpointer user_data)
 {
 	SCPluginIfcfg *plugin = SC_PLUGIN_IFCFG (user_data);
 	SCPluginIfcfgPrivate *priv = SC_PLUGIN_IFCFG_GET_PRIVATE (plugin);
@@ -379,8 +381,9 @@ setup_ifcfg_monitoring (SCPluginIfcfg *plugin)
 	g_object_unref (file);
 
 	if (monitor) {
-		priv->monitor_id = g_signal_connect (monitor, "changed", G_CALLBACK (dir_changed), plugin);
-		priv->monitor = monitor;
+		priv->ifcfg_monitor_id = g_signal_connect (monitor, "changed",
+		                                           G_CALLBACK (ifcfg_dir_changed), plugin);
+		priv->ifcfg_monitor = monitor;
 	}
 }
 
@@ -463,7 +466,8 @@ add_connection (NMSystemConfigInterface *config,
 	return (NMSettingsConnection *) added;
 }
 
-#define SC_NETWORK_FILE SYSCONFDIR"/sysconfig/network"
+#define SC_NETWORK_FILE "/etc/sysconfig/network"
+#define HOSTNAME_FILE   "/etc/hostname"
 
 static char *
 plugin_get_hostname (SCPluginIfcfg *plugin)
@@ -472,6 +476,11 @@ plugin_get_hostname (SCPluginIfcfg *plugin)
 	char *hostname;
 	gboolean ignore_localhost;
 
+	if (g_file_get_contents (HOSTNAME_FILE, &hostname, NULL, NULL)) {
+		g_strchomp (hostname);
+		return hostname;
+	}
+
 	network = svNewFile (SC_NETWORK_FILE);
 	if (!network) {
 		PLUGIN_WARN (IFCFG_PLUGIN_NAME, "Could not get hostname: failed to read " SC_NETWORK_FILE);
@@ -500,34 +509,31 @@ plugin_set_hostname (SCPluginIfcfg *plugin, const char *hostname)
 	SCPluginIfcfgPrivate *priv = SC_PLUGIN_IFCFG_GET_PRIVATE (plugin);
 	shvarFile *network;
 
-	network = svCreateFile (SC_NETWORK_FILE);
-	if (!network) {
-		PLUGIN_WARN (IFCFG_PLUGIN_NAME, "Could not save hostname: failed to create/open " SC_NETWORK_FILE);
+	if (!g_file_set_contents (HOSTNAME_FILE, hostname, -1, NULL)) {
+		PLUGIN_WARN (IFCFG_PLUGIN_NAME, "Could not save hostname: failed to create/open " HOSTNAME_FILE);
 		return FALSE;
 	}
 
-	svSetValue (network, "HOSTNAME", hostname, FALSE);
-	svWriteFile (network, 0644);
-	svCloseFile (network);
-
 	g_free (priv->hostname);
 	priv->hostname = g_strdup (hostname);
+
+	/* Remove "HOSTNAME" from SC_NETWORK_FILE, if present */
+	network = svNewFile (SC_NETWORK_FILE);
+	if (network) {
+		svSetValue (network, "HOSTNAME", NULL, FALSE);
+		svWriteFile (network, 0644);
+		svCloseFile (network);
+	}
+
 	return TRUE;
 }
 
 static void
-sc_network_changed_cb (NMInotifyHelper *ih,
-                       struct inotify_event *evt,
-                       const char *path,
-                       gpointer user_data)
+hostname_maybe_changed (SCPluginIfcfg *plugin)
 {
-	SCPluginIfcfg *plugin = SC_PLUGIN_IFCFG (user_data);
 	SCPluginIfcfgPrivate *priv = SC_PLUGIN_IFCFG_GET_PRIVATE (plugin);
 	char *new_hostname;
 
-	if (evt->wd != priv->sc_network_wd)
-		return;
-
 	new_hostname = plugin_get_hostname (plugin);
 	if (   (new_hostname && !priv->hostname)
 	    || (!new_hostname && priv->hostname)
@@ -539,6 +545,33 @@ sc_network_changed_cb (NMInotifyHelper *ih,
 		g_free (new_hostname);
 }
 
+static void
+sc_network_changed_cb (NMInotifyHelper *ih,
+                       struct inotify_event *evt,
+                       const char *path,
+                       gpointer user_data)
+{
+	SCPluginIfcfg *plugin = SC_PLUGIN_IFCFG (user_data);
+	SCPluginIfcfgPrivate *priv = SC_PLUGIN_IFCFG_GET_PRIVATE (plugin);
+
+	if (evt->wd != priv->sc_network_wd)
+		return;
+
+	hostname_maybe_changed (plugin);
+}
+
+static void
+hostname_changed_cb (GFileMonitor *monitor,
+                     GFile *file,
+                     GFile *other_file,
+                     GFileMonitorEvent event_type,
+                     gpointer user_data)
+{
+	SCPluginIfcfg *plugin = SC_PLUGIN_IFCFG (user_data);
+
+	hostname_maybe_changed (plugin);
+}
+
 static gboolean
 impl_ifcfgrh_get_ifcfg_details (SCPluginIfcfg *plugin,
                                 const char *in_ifcfg,
@@ -614,11 +647,29 @@ sc_plugin_ifcfg_init (SCPluginIfcfg *plugin)
 	NMInotifyHelper *ih;
 	GError *error = NULL;
 	gboolean success = FALSE;
+	GFile *file;
+	GFileMonitor *monitor;
+
+	/* We watch SC_NETWORK_FILE via NMInotifyHelper (which doesn't track file creation but
+	 * *does* track modifications made via other hard links), since we expect it to always
+	 * exist. But we watch HOSTNAME_FILE via GFileMonitor (which has the opposite
+	 * semantics), since /etc/hostname might not exist, but is unlikely to have hard
+	 * links. bgo 532815 is the bug for being able to just use GFileMonitor for both.
+	 */
 
 	ih = nm_inotify_helper_get ();
 	priv->ih_event_id = g_signal_connect (ih, "event", G_CALLBACK (sc_network_changed_cb), plugin);
 	priv->sc_network_wd = nm_inotify_helper_add_watch (ih, SC_NETWORK_FILE);
 
+	file = g_file_new_for_path (HOSTNAME_FILE);
+	monitor = g_file_monitor_file (file, G_FILE_MONITOR_NONE, NULL, NULL);
+	g_object_unref (file);
+	if (monitor) {
+		priv->hostname_monitor_id =
+			g_signal_connect (monitor, "changed", G_CALLBACK (hostname_changed_cb), plugin);
+		priv->hostname_monitor = monitor;
+	}
+
 	priv->hostname = plugin_get_hostname (plugin);
 
 	priv->bus = dbus_g_bus_get (DBUS_BUS_SYSTEM, &error);
@@ -674,24 +725,35 @@ dispose (GObject *object)
 		priv->bus = NULL;
 	}
 
-	ih = nm_inotify_helper_get ();
+	if (priv->ih_event_id) {
+		ih = nm_inotify_helper_get ();
+
+		g_signal_handler_disconnect (ih, priv->ih_event_id);
+		priv->ih_event_id = 0;
 
-	g_signal_handler_disconnect (ih, priv->ih_event_id);
+		if (priv->sc_network_wd >= 0)
+			nm_inotify_helper_remove_watch (ih, priv->sc_network_wd);
+	}
+
+	if (priv->hostname_monitor) {
+		if (priv->hostname_monitor_id)
+			g_signal_handler_disconnect (priv->hostname_monitor, priv->hostname_monitor_id);
 
-	if (priv->sc_network_wd >= 0)
-		nm_inotify_helper_remove_watch (ih, priv->sc_network_wd);
+		g_file_monitor_cancel (priv->hostname_monitor);
+		g_object_unref (priv->hostname_monitor);
+	}
 
 	g_free (priv->hostname);
 
 	if (priv->connections)
 		g_hash_table_destroy (priv->connections);
 
-	if (priv->monitor) {
-		if (priv->monitor_id)
-			g_signal_handler_disconnect (priv->monitor, priv->monitor_id);
+	if (priv->ifcfg_monitor) {
+		if (priv->ifcfg_monitor_id)
+			g_signal_handler_disconnect (priv->ifcfg_monitor, priv->ifcfg_monitor_id);
 
-		g_file_monitor_cancel (priv->monitor);
-		g_object_unref (priv->monitor);
+		g_file_monitor_cancel (priv->ifcfg_monitor);
+		g_object_unref (priv->ifcfg_monitor);
 	}
 
 	G_OBJECT_CLASS (sc_plugin_ifcfg_parent_class)->dispose (object);
diff --git a/src/settings/plugins/ifcfg-rh/reader.c b/src/settings/plugins/ifcfg-rh/reader.c
index 6e5ec3c0..bbe83436 100644
--- a/src/settings/plugins/ifcfg-rh/reader.c
+++ b/src/settings/plugins/ifcfg-rh/reader.c
@@ -25,7 +25,6 @@
 #include 
 #include 
 #include 
-#include 
 #include 
 #include 
 #include 
@@ -45,6 +44,8 @@
 #include 
 #include 
 #include 
+#include 
+#include 
 #include 
 
 #include "wifi-utils.h"
@@ -66,12 +67,27 @@ static gboolean
 get_int (const char *str, int *value)
 {
 	char *e;
+	long int tmp;
 
 	errno = 0;
-	*value = strtol (str, &e, 0);
+	tmp = strtol (str, &e, 0);
 	if (errno || *e != '\0')
 		return FALSE;
+	*value = (int) tmp;
+	return TRUE;
+}
+
+static gboolean
+get_uint (const char *str, guint32 *value)
+{
+	char *e;
+	long unsigned int tmp;
 
+	errno = 0;
+	tmp = strtoul (str, &e, 0);
+	if (errno || *e != '\0')
+		return FALSE;
+	*value = (guint32) tmp;
 	return TRUE;
 }
 
@@ -168,6 +184,39 @@ make_connection_setting (const char *file,
 	g_object_set (s_con, NM_SETTING_CONNECTION_ZONE, zone, NULL);
 	g_free (zone);
 
+	value = svGetValue (ifcfg, "SECONDARY_UUIDS", FALSE);
+	if (value) {
+		char **items, **iter;
+
+		items = g_strsplit_set (value, " \t", -1);
+		for (iter = items; iter && *iter; iter++) {
+			if (strlen (*iter)) {
+				if (!nm_setting_connection_add_secondary (s_con, *iter))
+					PLUGIN_WARN (IFCFG_PLUGIN_NAME,
+					             "    warning: secondary connection UUID '%s' already added", *iter);
+			}
+		}
+		g_free (value);
+		g_strfreev (items);
+	}
+
+	value = svGetValue (ifcfg, "BRIDGE", FALSE);
+	if (value) {
+		const char *bridge;
+
+		if ((bridge = nm_setting_connection_get_master (s_con))) {
+			PLUGIN_WARN (IFCFG_PLUGIN_NAME,
+			             "     warning: Already configured as slave of %s. "
+			             "Ignoring BRIDGE=\"%s\"", bridge, value);
+			g_free (value);
+		}
+
+		g_object_set (s_con, NM_SETTING_CONNECTION_MASTER, value, NULL);
+		g_object_set (s_con, NM_SETTING_CONNECTION_SLAVE_TYPE,
+		              NM_SETTING_BRIDGE_SETTING_NAME, NULL);
+		g_free (value);
+	}
+
 	return NM_SETTING (s_con);
 }
 
@@ -1590,8 +1639,13 @@ make_ip6_setting (shvarFile *ifcfg,
 			nm_ip6_address_unref (addr);
 		}
 		g_strfreev (list);
-	} else if (!strcmp (method, NM_SETTING_IP6_CONFIG_METHOD_AUTO)) {
-		/* TODO - autoconf or DHCPv6 stuff goes here */
+	} else if (   !strcmp (method, NM_SETTING_IP6_CONFIG_METHOD_AUTO)
+	           || !strcmp (method, NM_SETTING_IP6_CONFIG_METHOD_DHCP)) {
+		/* METHOD_AUTO may trigger DHCPv6, so save the hostname to send to DHCP */
+		value = svGetValue (ifcfg, "DHCP_HOSTNAME", FALSE);
+		if (value && value[0])
+			g_object_set (s_ip6, NM_SETTING_IP6_CONFIG_DHCP_HOSTNAME, value, NULL);
+		g_free (value);
 	}
 
 	/* DNS servers
@@ -1647,6 +1701,22 @@ error:
 	return NULL;
 }
 
+static void
+check_if_bond_slave (shvarFile *ifcfg,
+                     NMSettingConnection *s_con)
+{
+	char *value;
+
+	value = svGetValue (ifcfg, "MASTER", FALSE);
+	if (value) {
+		g_object_set (s_con, NM_SETTING_CONNECTION_MASTER, value, NULL);
+		g_object_set (s_con,
+		              NM_SETTING_CONNECTION_SLAVE_TYPE, NM_SETTING_BOND_SETTING_NAME,
+		              NULL);
+		g_free (value);
+	}
+}
+
 static gboolean
 add_one_wep_key (shvarFile *ifcfg,
                  const char *shvar_key,
@@ -1699,7 +1769,7 @@ add_one_wep_key (shvarFile *ifcfg,
 			char *p = value + 2;
 
 			while (*p) {
-				if (!isascii ((int) (*p))) {
+				if (!g_ascii_isprint ((int) (*p))) {
 					g_set_error (error, IFCFG_PLUGIN_ERROR, 0,
 					             "Invalid ASCII WEP key.");
 					goto out;
@@ -1997,7 +2067,7 @@ parse_wpa_psk (shvarFile *ifcfg,
 	if (!quoted && (strlen (psk) == 64)) {
 		/* Verify the hex PSK; 64 digits */
 		while (*p) {
-			if (!isxdigit (*p++)) {
+			if (!g_ascii_isxdigit (*p++)) {
 				g_set_error (error, IFCFG_PLUGIN_ERROR, 0,
 				             "Invalid WPA_PSK (contains non-hexadecimal characters)");
 				goto out;
@@ -2978,7 +3048,7 @@ make_wireless_setting (shvarFile *ifcfg,
 
 			p = value + 2;
 			while (*p) {
-				if (!isxdigit (*p)) {
+				if (!g_ascii_isxdigit (*p)) {
 					g_set_error (error, IFCFG_PLUGIN_ERROR, 0,
 					             "Invalid SSID '%s' character (looks like hex SSID but '%c' isn't a hex digit)",
 					             value, *p);
@@ -3249,7 +3319,7 @@ make_wired_setting (shvarFile *ifcfg,
 
 		/* basic sanity checks */
 		while (*p) {
-			if (!isxdigit (*p) && (*p != ',') && (*p != '.')) {
+			if (!g_ascii_isxdigit (*p) && (*p != ',') && (*p != '.')) {
 				PLUGIN_WARN (IFCFG_PLUGIN_NAME, "    warning: invalid SUBCHANNELS '%s'", value);
 				success = FALSE;
 				break;
@@ -3401,7 +3471,6 @@ wired_connection_from_ifcfg (const char *file,
 	NMSetting *con_setting = NULL;
 	NMSetting *wired_setting = NULL;
 	NMSetting8021x *s_8021x = NULL;
-	char *value;
 
 	g_return_val_if_fail (file != NULL, NULL);
 	g_return_val_if_fail (ifcfg != NULL, NULL);
@@ -3420,18 +3489,9 @@ wired_connection_from_ifcfg (const char *file,
 		g_object_unref (connection);
 		return NULL;
 	}
+	check_if_bond_slave (ifcfg, NM_SETTING_CONNECTION (con_setting));
 	nm_connection_add_setting (connection, con_setting);
 
-	/* Might be a bond slave; handle master device or connection */
-	value = svGetValue (ifcfg, "MASTER", FALSE);
-	if (value) {
-		g_object_set (con_setting, NM_SETTING_CONNECTION_MASTER, value, NULL);
-		g_object_set (con_setting,
-		              NM_SETTING_CONNECTION_SLAVE_TYPE, NM_SETTING_BOND_SETTING_NAME,
-		              NULL);
-		g_free (value);
-	}
-
 	wired_setting = make_wired_setting (ifcfg, file, nm_controlled, unmanaged, &s_8021x, error);
 	if (!wired_setting) {
 		g_object_unref (connection);
@@ -3537,6 +3597,7 @@ infiniband_connection_from_ifcfg (const char *file,
 		g_object_unref (connection);
 		return NULL;
 	}
+	check_if_bond_slave (ifcfg, NM_SETTING_CONNECTION (con_setting));
 	nm_connection_add_setting (connection, con_setting);
 
 	infiniband_setting = make_infiniband_setting (ifcfg, file, nm_controlled, unmanaged, error);
@@ -3672,6 +3733,232 @@ bond_connection_from_ifcfg (const char *file,
 	return connection;
 }
 
+typedef void (*BridgeOptFunc) (NMSetting *setting,
+                               gboolean stp,
+                               const char *key,
+                               const char *value);
+
+static void
+handle_bridge_option (NMSetting *setting,
+                      gboolean stp,
+                      const char *key,
+                      const char *value)
+{
+	guint32 u = 0;
+
+	if (!strcmp (key, "priority")) {
+		if (stp == FALSE) {
+			PLUGIN_WARN (IFCFG_PLUGIN_NAME, "    warning: 'priority' invalid when STP is disabled");
+		} else if (get_uint (value, &u))
+			g_object_set (setting, NM_SETTING_BRIDGE_PRIORITY, u, NULL);
+		else
+			PLUGIN_WARN (IFCFG_PLUGIN_NAME, "    warning: invalid priority value '%s'", value);
+	} else if (!strcmp (key, "hello_time")) {
+		if (stp == FALSE) {
+			PLUGIN_WARN (IFCFG_PLUGIN_NAME, "    warning: 'hello_time' invalid when STP is disabled");
+		} else if (get_uint (value, &u))
+			g_object_set (setting, NM_SETTING_BRIDGE_HELLO_TIME, u, NULL);
+		else
+			PLUGIN_WARN (IFCFG_PLUGIN_NAME, "    warning: invalid hello_time value '%s'", value);
+	} else if (!strcmp (key, "max_age")) {
+		if (stp == FALSE) {
+			PLUGIN_WARN (IFCFG_PLUGIN_NAME, "    warning: 'max_age' invalid when STP is disabled");
+		} else if (get_uint (value, &u))
+			g_object_set (setting, NM_SETTING_BRIDGE_MAX_AGE, u, NULL);
+		else
+			PLUGIN_WARN (IFCFG_PLUGIN_NAME, "    warning: invalid max_age value '%s'", value);
+	} else if (!strcmp (key, "ageing_time")) {
+		if (get_uint (value, &u))
+			g_object_set (setting, NM_SETTING_BRIDGE_AGEING_TIME, u, NULL);
+		else
+			PLUGIN_WARN (IFCFG_PLUGIN_NAME, "    warning: invalid ageing_time value '%s'", value);
+	} else
+			PLUGIN_WARN (IFCFG_PLUGIN_NAME, "    warning: unhandled bridge option '%s'", key);
+}
+
+static void
+handle_bridging_opts (NMSetting *setting,
+                      gboolean stp,
+                      const char *value,
+                      BridgeOptFunc func)
+{
+	char **items, **iter;
+
+	items = g_strsplit_set (value, " ", -1);
+	for (iter = items; iter && *iter; iter++) {
+		if (strlen (*iter)) {
+			char **keys, *key, *val;
+
+			keys = g_strsplit_set (*iter, "=", 2);
+			if (keys && *keys) {
+				key = *keys;
+				val = *(keys + 1);
+				if (val && strlen(key) && strlen(val))
+					func (setting, stp, key, val);
+			}
+
+			g_strfreev (keys);
+		}
+	}
+	g_strfreev (items);
+}
+
+static NMSetting *
+make_bridge_setting (shvarFile *ifcfg,
+                     const char *file,
+                     gboolean nm_controlled,
+                     char **unmanaged,
+                     GError **error)
+{
+	NMSettingBridge *s_bridge;
+	char *value;
+	guint32 u;
+	gboolean stp = FALSE;
+
+	s_bridge = NM_SETTING_BRIDGE (nm_setting_bridge_new ());
+
+	value = svGetValue (ifcfg, "DEVICE", FALSE);
+	if (!value || !strlen (value)) {
+		g_set_error (error, IFCFG_PLUGIN_ERROR, 0, "mandatory DEVICE keyword missing");
+		goto error;
+	}
+
+	g_object_set (s_bridge, NM_SETTING_BRIDGE_INTERFACE_NAME, value, NULL);
+	g_free (value);
+
+	value = svGetValue (ifcfg, "STP", FALSE);
+	if (value) {
+		if (!strcasecmp (value, "on") || !strcasecmp (value, "yes")) {
+			g_object_set (s_bridge, NM_SETTING_BRIDGE_STP, TRUE, NULL);
+			stp = TRUE;
+		} else if (!strcasecmp (value, "off") || !strcasecmp (value, "no"))
+			g_object_set (s_bridge, NM_SETTING_BRIDGE_STP, FALSE, NULL);
+		else
+			PLUGIN_WARN (IFCFG_PLUGIN_NAME, "    warning: invalid STP value '%s'", value);
+		g_free (value);
+	}
+
+	value = svGetValue (ifcfg, "DELAY", FALSE);
+	if (value) {
+		if (stp) {
+			if (get_uint (value, &u))
+				g_object_set (s_bridge, NM_SETTING_BRIDGE_FORWARD_DELAY, u, NULL);
+			else
+				PLUGIN_WARN (IFCFG_PLUGIN_NAME, "    warning: invalid forward delay value '%s'", value);
+		} else
+			PLUGIN_WARN (IFCFG_PLUGIN_NAME, "    warning: DELAY invalid when STP is disabled");
+		g_free (value);
+	}
+
+	value = svGetValue (ifcfg, "BRIDGING_OPTS", FALSE);
+	if (value) {
+		handle_bridging_opts (NM_SETTING (s_bridge), stp, value, handle_bridge_option);
+		g_free (value);
+	}
+
+	return (NMSetting *) s_bridge;
+
+error:
+	g_object_unref (s_bridge);
+	return NULL;
+}
+
+static NMConnection *
+bridge_connection_from_ifcfg (const char *file,
+                              shvarFile *ifcfg,
+                              gboolean nm_controlled,
+                              char **unmanaged,
+                              GError **error)
+{
+	NMConnection *connection = NULL;
+	NMSetting *con_setting = NULL;
+	NMSetting *bridge_setting = NULL;
+
+	g_return_val_if_fail (file != NULL, NULL);
+	g_return_val_if_fail (ifcfg != NULL, NULL);
+
+	connection = nm_connection_new ();
+	if (!connection) {
+		g_set_error (error, IFCFG_PLUGIN_ERROR, 0,
+		             "Failed to allocate new connection for %s.", file);
+		return NULL;
+	}
+
+	con_setting = make_connection_setting (file, ifcfg, NM_SETTING_BRIDGE_SETTING_NAME, NULL, _("Bridge"));
+	if (!con_setting) {
+		g_set_error (error, IFCFG_PLUGIN_ERROR, 0,
+		             "Failed to create connection setting.");
+		g_object_unref (connection);
+		return NULL;
+	}
+	nm_connection_add_setting (connection, con_setting);
+
+	bridge_setting = make_bridge_setting (ifcfg, file, nm_controlled, unmanaged, error);
+	if (!bridge_setting) {
+		g_object_unref (connection);
+		return NULL;
+	}
+	nm_connection_add_setting (connection, bridge_setting);	
+
+	if (!nm_connection_verify (connection, error)) {
+		g_object_unref (connection);
+		return NULL;
+	}
+
+	return connection;
+}
+
+static void
+handle_bridge_port_option (NMSetting *setting,
+                           gboolean stp,
+                           const char *key,
+                           const char *value)
+{
+	guint32 u = 0;
+
+	if (!strcmp (key, "priority")) {
+		if (get_uint (value, &u))
+			g_object_set (setting, NM_SETTING_BRIDGE_PORT_PRIORITY, u, NULL);
+		else
+			PLUGIN_WARN (IFCFG_PLUGIN_NAME, "    warning: invalid priority value '%s'", value);
+	} else if (!strcmp (key, "path_cost")) {
+		if (get_uint (value, &u))
+			g_object_set (setting, NM_SETTING_BRIDGE_PORT_PATH_COST, u, NULL);
+		else
+			PLUGIN_WARN (IFCFG_PLUGIN_NAME, "    warning: invalid path_cost value '%s'", value);
+	} else if (!strcmp (key, "hairpin_mode")) {
+		if (!strcasecmp (value, "on") || !strcasecmp (value, "yes") || !strcmp (value, "1"))
+			g_object_set (setting, NM_SETTING_BRIDGE_PORT_HAIRPIN_MODE, TRUE, NULL);
+		else if (!strcasecmp (value, "off") || !strcasecmp (value, "no"))
+			g_object_set (setting, NM_SETTING_BRIDGE_PORT_HAIRPIN_MODE, FALSE, NULL);
+		else
+			PLUGIN_WARN (IFCFG_PLUGIN_NAME, "    warning: invalid hairpin_mode value '%s'", value);
+	} else
+			PLUGIN_WARN (IFCFG_PLUGIN_NAME, "    warning: unhandled bridge port option '%s'", key);
+}
+
+static NMSetting *
+make_bridge_port_setting (shvarFile *ifcfg, GError **error)
+{
+	NMSetting *s_port;
+	char *value;
+
+	value = svGetValue (ifcfg, "BRIDGE", FALSE);
+	if (!value)
+		return NULL;
+	g_free (value);
+
+	s_port = nm_setting_bridge_port_new ();
+
+	value = svGetValue (ifcfg, "BRIDGING_OPTS", FALSE);
+	if (value) {
+		handle_bridging_opts (s_port, FALSE, value, handle_bridge_port_option);
+		g_free (value);
+	}
+
+	return s_port;
+}
+
 static gboolean
 is_bond_device (const char *name, shvarFile *parsed)
 {
@@ -3904,11 +4191,6 @@ vlan_connection_from_ifcfg (const char *file,
 	return connection;
 }
 
-enum {
-	IGNORE_REASON_NONE = 0x00,
-	IGNORE_REASON_BRIDGE = 0x01,
-};
-
 NMConnection *
 connection_from_file (const char *filename,
                       const char *network_file,  /* for unit tests only */
@@ -3923,13 +4205,12 @@ connection_from_file (const char *filename,
 {
 	NMConnection *connection = NULL;
 	shvarFile *parsed;
-	char *type, *nmc = NULL, *bootproto, *tmp;
-	NMSetting *s_ip4, *s_ip6;
+	char *type, *nmc = NULL, *bootproto;
+	NMSetting *s_ip4, *s_ip6, *s_port;
 	const char *ifcfg_name = NULL;
 	gboolean nm_controlled = TRUE;
 	gboolean can_disable_ip4 = FALSE;
 	GError *error = NULL;
-	guint32 ignore_reason = IGNORE_REASON_NONE;
 
 	g_return_val_if_fail (filename != NULL, NULL);
 	g_return_val_if_fail (unmanaged != NULL, NULL);
@@ -4028,14 +4309,6 @@ connection_from_file (const char *filename,
 		goto done;
 	}
 
-	/* Ignore BRIDGE= connections for now too (rh #619863) */
-	tmp = svGetValue (parsed, "BRIDGE", FALSE);
-	if (tmp) {
-		g_free (tmp);
-		nm_controlled = FALSE;
-		ignore_reason = IGNORE_REASON_BRIDGE;
-	}
-
 	/* Construct the connection */
 	if (!strcasecmp (type, TYPE_ETHERNET))
 		connection = wired_connection_from_ifcfg (filename, parsed, nm_controlled, unmanaged, &error);
@@ -4048,8 +4321,7 @@ connection_from_file (const char *filename,
 	else if (!strcasecmp (type, TYPE_VLAN))
 		connection = vlan_connection_from_ifcfg (filename, parsed, nm_controlled, unmanaged, &error);
 	else if (!strcasecmp (type, TYPE_BRIDGE))
-		g_set_error (&error, IFCFG_PLUGIN_ERROR, 0,
-		             "Bridge connections are not yet supported");
+		connection = bridge_connection_from_ifcfg (filename, parsed, nm_controlled, unmanaged, &error);
 	else {
 		g_set_error (&error, IFCFG_PLUGIN_ERROR, 0,
 		             "Unknown connection type '%s'", type);
@@ -4063,24 +4335,8 @@ connection_from_file (const char *filename,
 	g_free (type);
 
 	/* Don't bother reading the connection fully if it's unmanaged or ignored */
-	if (!connection || *unmanaged || ignore_reason) {
-		if (connection && !*unmanaged) {
-			/* However,BRIDGE and VLAN connections that don't have HWADDR won't
-			 * be unmanaged because the unmanaged state is keyed off HWADDR.
-			 * They willl still be tagged 'ignore' from code that checks BRIDGE
-			 * and VLAN above.  Since they aren't marked unmanaged, kill them
-			 * completely.
-			 */
-			if (ignore_reason) {
-				g_object_unref (connection);
-				connection = NULL;
-				g_set_error (&error, IFCFG_PLUGIN_ERROR, 0,
-				             "%s connections are not yet supported",
-				             ignore_reason == IGNORE_REASON_BRIDGE ? "Bridge" : "VLAN");
-			}
-		}
+	if (!connection || *unmanaged)
 		goto done;
-	}
 
 	s_ip6 = make_ip6_setting (parsed, network_file, iscsiadm_path, &error);
 	if (error) {
@@ -4110,6 +4366,15 @@ connection_from_file (const char *filename,
 	} else if (s_ip4)
 		nm_connection_add_setting (connection, s_ip4);
 
+	/* Bridge port? */
+	s_port = make_bridge_port_setting (parsed, &error);
+	if (error) {
+		g_object_unref (connection);
+		connection = NULL;
+		goto done;
+	} else if (s_port)
+		nm_connection_add_setting (connection, s_port);
+
 	/* iSCSI / ibft connections are read-only since their settings are
 	 * stored in NVRAM and can only be changed in BIOS.
 	 */
diff --git a/src/settings/plugins/ifcfg-rh/tests/Makefile.am b/src/settings/plugins/ifcfg-rh/tests/Makefile.am
index 5b34ffe3..9aec92fe 100644
--- a/src/settings/plugins/ifcfg-rh/tests/Makefile.am
+++ b/src/settings/plugins/ifcfg-rh/tests/Makefile.am
@@ -1,9 +1,12 @@
+if ENABLE_TESTS
+
 SUBDIRS=network-scripts
 
 INCLUDES = \
 	-I$(top_srcdir)/include \
 	-I$(top_builddir)/include \
 	-I$(top_srcdir)/libnm-util \
+	-I$(top_builddir)/libnm-util \
 	-I$(top_srcdir)/libnm-glib \
 	-I$(srcdir)/../
 
@@ -35,14 +38,10 @@ test_ifcfg_rh_utils_CPPFLAGS = \
 test_ifcfg_rh_utils_LDADD = \
 	$(builddir)/../libifcfg-rh-io.la
 
-if WITH_TESTS
-
 check-local: test-ifcfg-rh
 	$(abs_builddir)/test-ifcfg-rh-utils
 	$(abs_builddir)/test-ifcfg-rh
 
-endif
-
 EXTRA_DIST = \
 	iscsiadm-test-dhcp \
 	iscsiadm-test-static \
@@ -53,4 +52,5 @@ EXTRA_DIST = \
 	iscsiadm-test-bad-entry \
 	iscsiadm-test-bad-record
 
+endif
 
diff --git a/src/settings/plugins/ifcfg-rh/tests/Makefile.in b/src/settings/plugins/ifcfg-rh/tests/Makefile.in
index 24855a7b..155cb672 100644
--- a/src/settings/plugins/ifcfg-rh/tests/Makefile.in
+++ b/src/settings/plugins/ifcfg-rh/tests/Makefile.in
@@ -51,21 +51,24 @@ PRE_UNINSTALL = :
 POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
-noinst_PROGRAMS = test-ifcfg-rh$(EXEEXT) test-ifcfg-rh-utils$(EXEEXT)
+@ENABLE_TESTS_TRUE@noinst_PROGRAMS = test-ifcfg-rh$(EXEEXT) \
+@ENABLE_TESTS_TRUE@	test-ifcfg-rh-utils$(EXEEXT)
 subdir = src/settings/plugins/ifcfg-rh/tests
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/compiler_warnings.m4 \
-	$(top_srcdir)/m4/gettext.m4 $(top_srcdir)/m4/gtk-doc.m4 \
-	$(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/intlmacosx.m4 \
-	$(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/introspection.m4 \
-	$(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \
-	$(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/libnl-check.m4 \
-	$(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \
-	$(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
-	$(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/nls.m4 \
-	$(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/progtest.m4 \
-	$(top_srcdir)/m4/vapigen.m4 $(top_srcdir)/configure.ac
+	$(top_srcdir)/m4/gettext.m4 \
+	$(top_srcdir)/m4/gnome-code-coverage.m4 \
+	$(top_srcdir)/m4/gtk-doc.m4 $(top_srcdir)/m4/iconv.m4 \
+	$(top_srcdir)/m4/intlmacosx.m4 $(top_srcdir)/m4/intltool.m4 \
+	$(top_srcdir)/m4/introspection.m4 $(top_srcdir)/m4/lib-ld.m4 \
+	$(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \
+	$(top_srcdir)/m4/libnl-check.m4 $(top_srcdir)/m4/libtool.m4 \
+	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
+	$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
+	$(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/po.m4 \
+	$(top_srcdir)/m4/progtest.m4 $(top_srcdir)/m4/vapigen.m4 \
+	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(install_sh) -d
@@ -73,20 +76,25 @@ CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
 CONFIG_CLEAN_VPATH_FILES =
 PROGRAMS = $(noinst_PROGRAMS)
-am_test_ifcfg_rh_OBJECTS = test_ifcfg_rh-test-ifcfg-rh.$(OBJEXT)
+am__test_ifcfg_rh_SOURCES_DIST = test-ifcfg-rh.c
+@ENABLE_TESTS_TRUE@am_test_ifcfg_rh_OBJECTS =  \
+@ENABLE_TESTS_TRUE@	test_ifcfg_rh-test-ifcfg-rh.$(OBJEXT)
 test_ifcfg_rh_OBJECTS = $(am_test_ifcfg_rh_OBJECTS)
 am__DEPENDENCIES_1 =
-test_ifcfg_rh_DEPENDENCIES = $(top_builddir)/libnm-glib/libnm-glib.la \
-	$(top_builddir)/libnm-util/libnm-util.la \
-	$(top_builddir)/src/wifi/libwifi-utils.la \
-	$(builddir)/../libifcfg-rh-io.la $(am__DEPENDENCIES_1)
+@ENABLE_TESTS_TRUE@test_ifcfg_rh_DEPENDENCIES =  \
+@ENABLE_TESTS_TRUE@	$(top_builddir)/libnm-glib/libnm-glib.la \
+@ENABLE_TESTS_TRUE@	$(top_builddir)/libnm-util/libnm-util.la \
+@ENABLE_TESTS_TRUE@	$(top_builddir)/src/wifi/libwifi-utils.la \
+@ENABLE_TESTS_TRUE@	$(builddir)/../libifcfg-rh-io.la \
+@ENABLE_TESTS_TRUE@	$(am__DEPENDENCIES_1)
 AM_V_lt = $(am__v_lt_@AM_V@)
 am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
 am__v_lt_0 = --silent
-am_test_ifcfg_rh_utils_OBJECTS =  \
-	test_ifcfg_rh_utils-test-ifcfg-rh-utils.$(OBJEXT)
+am__test_ifcfg_rh_utils_SOURCES_DIST = test-ifcfg-rh-utils.c
+@ENABLE_TESTS_TRUE@am_test_ifcfg_rh_utils_OBJECTS = test_ifcfg_rh_utils-test-ifcfg-rh-utils.$(OBJEXT)
 test_ifcfg_rh_utils_OBJECTS = $(am_test_ifcfg_rh_utils_OBJECTS)
-test_ifcfg_rh_utils_DEPENDENCIES = $(builddir)/../libifcfg-rh-io.la
+@ENABLE_TESTS_TRUE@test_ifcfg_rh_utils_DEPENDENCIES =  \
+@ENABLE_TESTS_TRUE@	$(builddir)/../libifcfg-rh-io.la
 DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
 depcomp = $(SHELL) $(top_srcdir)/build-aux/depcomp
 am__depfiles_maybe = depfiles
@@ -114,7 +122,8 @@ AM_V_GEN = $(am__v_GEN_@AM_V@)
 am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
 am__v_GEN_0 = @echo "  GEN   " $@;
 SOURCES = $(test_ifcfg_rh_SOURCES) $(test_ifcfg_rh_utils_SOURCES)
-DIST_SOURCES = $(test_ifcfg_rh_SOURCES) $(test_ifcfg_rh_utils_SOURCES)
+DIST_SOURCES = $(am__test_ifcfg_rh_SOURCES_DIST) \
+	$(am__test_ifcfg_rh_utils_SOURCES_DIST)
 RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
 	html-recursive info-recursive install-data-recursive \
 	install-dvi-recursive install-exec-recursive \
@@ -134,7 +143,7 @@ AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \
 	distdir
 ETAGS = etags
 CTAGS = ctags
-DIST_SUBDIRS = $(SUBDIRS)
+DIST_SUBDIRS = network-scripts
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 am__relativize = \
   dir0=`pwd`; \
@@ -173,6 +182,10 @@ AWK = @AWK@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
+CKDB_PATH = @CKDB_PATH@
+CODE_COVERAGE_CFLAGS = @CODE_COVERAGE_CFLAGS@
+CODE_COVERAGE_ENABLED = @CODE_COVERAGE_ENABLED@
+CODE_COVERAGE_LDFLAGS = @CODE_COVERAGE_LDFLAGS@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CXX = @CXX@
@@ -187,9 +200,7 @@ DBUS_SYS_DIR = @DBUS_SYS_DIR@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
 DHCLIENT_PATH = @DHCLIENT_PATH@
-DHCLIENT_VERSION = @DHCLIENT_VERSION@
 DHCPCD_PATH = @DHCPCD_PATH@
-DISABLE_DEPRECATED = @DISABLE_DEPRECATED@
 DLLTOOL = @DLLTOOL@
 DSYMUTIL = @DSYMUTIL@
 DUMPBIN = @DUMPBIN@
@@ -199,17 +210,14 @@ ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
 FGREP = @FGREP@
+GENHTML = @GENHTML@
 GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
 GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
-GIO_CFLAGS = @GIO_CFLAGS@
-GIO_LIBS = @GIO_LIBS@
 GLIB_CFLAGS = @GLIB_CFLAGS@
 GLIB_GENMARSHAL = @GLIB_GENMARSHAL@
 GLIB_LIBS = @GLIB_LIBS@
 GLIB_MAKEFILE = @GLIB_MAKEFILE@
 GLIB_MKENUMS = @GLIB_MKENUMS@
-GMODULE_CFLAGS = @GMODULE_CFLAGS@
-GMODULE_LIBS = @GMODULE_LIBS@
 GMSGFMT = @GMSGFMT@
 GMSGFMT_015 = @GMSGFMT_015@
 GNUTLS_CFLAGS = @GNUTLS_CFLAGS@
@@ -250,6 +258,7 @@ IPTABLES_PATH = @IPTABLES_PATH@
 IWMX_SDK_CFLAGS = @IWMX_SDK_CFLAGS@
 IWMX_SDK_LIBS = @IWMX_SDK_LIBS@
 KERNEL_FIRMWARE_DIR = @KERNEL_FIRMWARE_DIR@
+LCOV = @LCOV@
 LD = @LD@
 LDFLAGS = @LDFLAGS@
 LIBDL = @LIBDL@
@@ -266,11 +275,7 @@ LIBNL2_LIBS = @LIBNL2_LIBS@
 LIBNL3_CFLAGS = @LIBNL3_CFLAGS@
 LIBNL3_LIBS = @LIBNL3_LIBS@
 LIBNL_CFLAGS = @LIBNL_CFLAGS@
-LIBNL_GENL3_CFLAGS = @LIBNL_GENL3_CFLAGS@
-LIBNL_GENL3_LIBS = @LIBNL_GENL3_LIBS@
 LIBNL_LIBS = @LIBNL_LIBS@
-LIBNL_ROUTE3_CFLAGS = @LIBNL_ROUTE3_CFLAGS@
-LIBNL_ROUTE3_LIBS = @LIBNL_ROUTE3_LIBS@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
 LIBSOUP_CFLAGS = @LIBSOUP_CFLAGS@
@@ -285,6 +290,8 @@ MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MANIFEST_TOOL = @MANIFEST_TOOL@
 MKDIR_P = @MKDIR_P@
+MM_GLIB_CFLAGS = @MM_GLIB_CFLAGS@
+MM_GLIB_LIBS = @MM_GLIB_LIBS@
 MOC = @MOC@
 MSGFMT = @MSGFMT@
 MSGFMT_015 = @MSGFMT_015@
@@ -294,6 +301,7 @@ NMEDIT = @NMEDIT@
 NM_MAJOR_VERSION = @NM_MAJOR_VERSION@
 NM_MICRO_VERSION = @NM_MICRO_VERSION@
 NM_MINOR_VERSION = @NM_MINOR_VERSION@
+NM_MODIFY_SYSTEM_POLICY = @NM_MODIFY_SYSTEM_POLICY@
 NM_VERSION = @NM_VERSION@
 NSS_CFLAGS = @NSS_CFLAGS@
 NSS_LIBS = @NSS_LIBS@
@@ -320,13 +328,14 @@ PPPD_PLUGIN_DIR = @PPPD_PLUGIN_DIR@
 QT_CFLAGS = @QT_CFLAGS@
 QT_LIBS = @QT_LIBS@
 RANLIB = @RANLIB@
-RESOLVCONF_PATH = @RESOLVCONF_PATH@
 SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
-SYSTEMD_CFLAGS = @SYSTEMD_CFLAGS@
-SYSTEMD_LIBS = @SYSTEMD_LIBS@
+SYSTEMD_INHIBIT_CFLAGS = @SYSTEMD_INHIBIT_CFLAGS@
+SYSTEMD_INHIBIT_LIBS = @SYSTEMD_INHIBIT_LIBS@
+SYSTEMD_LOGIN_CFLAGS = @SYSTEMD_LOGIN_CFLAGS@
+SYSTEMD_LOGIN_LIBS = @SYSTEMD_LOGIN_LIBS@
 SYSTEM_CA_PATH = @SYSTEM_CA_PATH@
 UDEV_BASE_DIR = @UDEV_BASE_DIR@
 USE_NLS = @USE_NLS@
@@ -381,6 +390,11 @@ localedir = @localedir@
 localstatedir = @localstatedir@
 mandir = @mandir@
 mkdir_p = @mkdir_p@
+nmbinary = @nmbinary@
+nmconfdir = @nmconfdir@
+nmdatadir = @nmdatadir@
+nmrundir = @nmrundir@
+nmstatedir = @nmstatedir@
 oldincludedir = @oldincludedir@
 pdfdir = @pdfdir@
 prefix = @prefix@
@@ -395,48 +409,53 @@ target_alias = @target_alias@
 top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
-SUBDIRS = network-scripts
-INCLUDES = \
-	-I$(top_srcdir)/include \
-	-I$(top_builddir)/include \
-	-I$(top_srcdir)/libnm-util \
-	-I$(top_srcdir)/libnm-glib \
-	-I$(srcdir)/../
-
-test_ifcfg_rh_SOURCES = \
-	test-ifcfg-rh.c
-
-test_ifcfg_rh_CPPFLAGS = \
-	$(GLIB_CFLAGS) \
-	$(DBUS_CFLAGS) \
-	-DTEST_IFCFG_DIR=\"$(abs_srcdir)\" \
-	-DTEST_SCRATCH_DIR=\"$(abs_builddir)/\"
-
-test_ifcfg_rh_LDADD = \
-	$(top_builddir)/libnm-glib/libnm-glib.la \
-	$(top_builddir)/libnm-util/libnm-util.la \
-	$(top_builddir)/src/wifi/libwifi-utils.la \
-	$(builddir)/../libifcfg-rh-io.la \
-	$(LIBM)
-
-test_ifcfg_rh_utils_SOURCES = \
-	test-ifcfg-rh-utils.c
-
-test_ifcfg_rh_utils_CPPFLAGS = \
-	$(GLIB_CFLAGS)
-
-test_ifcfg_rh_utils_LDADD = \
-	$(builddir)/../libifcfg-rh-io.la
-
-EXTRA_DIST = \
-	iscsiadm-test-dhcp \
-	iscsiadm-test-static \
-	iscsiadm-test-bad-ipaddr \
-	iscsiadm-test-bad-gateway \
-	iscsiadm-test-bad-dns1 \
-	iscsiadm-test-bad-dns2 \
-	iscsiadm-test-bad-entry \
-	iscsiadm-test-bad-record
+with_dhclient = @with_dhclient@
+with_dhcpcd = @with_dhcpcd@
+with_netconfig = @with_netconfig@
+with_resolvconf = @with_resolvconf@
+@ENABLE_TESTS_TRUE@SUBDIRS = network-scripts
+@ENABLE_TESTS_TRUE@INCLUDES = \
+@ENABLE_TESTS_TRUE@	-I$(top_srcdir)/include \
+@ENABLE_TESTS_TRUE@	-I$(top_builddir)/include \
+@ENABLE_TESTS_TRUE@	-I$(top_srcdir)/libnm-util \
+@ENABLE_TESTS_TRUE@	-I$(top_builddir)/libnm-util \
+@ENABLE_TESTS_TRUE@	-I$(top_srcdir)/libnm-glib \
+@ENABLE_TESTS_TRUE@	-I$(srcdir)/../
+
+@ENABLE_TESTS_TRUE@test_ifcfg_rh_SOURCES = \
+@ENABLE_TESTS_TRUE@	test-ifcfg-rh.c
+
+@ENABLE_TESTS_TRUE@test_ifcfg_rh_CPPFLAGS = \
+@ENABLE_TESTS_TRUE@	$(GLIB_CFLAGS) \
+@ENABLE_TESTS_TRUE@	$(DBUS_CFLAGS) \
+@ENABLE_TESTS_TRUE@	-DTEST_IFCFG_DIR=\"$(abs_srcdir)\" \
+@ENABLE_TESTS_TRUE@	-DTEST_SCRATCH_DIR=\"$(abs_builddir)/\"
+
+@ENABLE_TESTS_TRUE@test_ifcfg_rh_LDADD = \
+@ENABLE_TESTS_TRUE@	$(top_builddir)/libnm-glib/libnm-glib.la \
+@ENABLE_TESTS_TRUE@	$(top_builddir)/libnm-util/libnm-util.la \
+@ENABLE_TESTS_TRUE@	$(top_builddir)/src/wifi/libwifi-utils.la \
+@ENABLE_TESTS_TRUE@	$(builddir)/../libifcfg-rh-io.la \
+@ENABLE_TESTS_TRUE@	$(LIBM)
+
+@ENABLE_TESTS_TRUE@test_ifcfg_rh_utils_SOURCES = \
+@ENABLE_TESTS_TRUE@	test-ifcfg-rh-utils.c
+
+@ENABLE_TESTS_TRUE@test_ifcfg_rh_utils_CPPFLAGS = \
+@ENABLE_TESTS_TRUE@	$(GLIB_CFLAGS)
+
+@ENABLE_TESTS_TRUE@test_ifcfg_rh_utils_LDADD = \
+@ENABLE_TESTS_TRUE@	$(builddir)/../libifcfg-rh-io.la
+
+@ENABLE_TESTS_TRUE@EXTRA_DIST = \
+@ENABLE_TESTS_TRUE@	iscsiadm-test-dhcp \
+@ENABLE_TESTS_TRUE@	iscsiadm-test-static \
+@ENABLE_TESTS_TRUE@	iscsiadm-test-bad-ipaddr \
+@ENABLE_TESTS_TRUE@	iscsiadm-test-bad-gateway \
+@ENABLE_TESTS_TRUE@	iscsiadm-test-bad-dns1 \
+@ENABLE_TESTS_TRUE@	iscsiadm-test-bad-dns2 \
+@ENABLE_TESTS_TRUE@	iscsiadm-test-bad-entry \
+@ENABLE_TESTS_TRUE@	iscsiadm-test-bad-record
 
 all: all-recursive
 
@@ -498,25 +517,22 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_ifcfg_rh_utils-test-ifcfg-rh-utils.Po@am__quote@
 
 .c.o:
-@am__fastdepCC_TRUE@	$(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\
-@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
-@am__fastdepCC_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.Po
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $<
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c $<
 
 .c.obj:
-@am__fastdepCC_TRUE@	$(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.obj$$||'`;\
-@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ `$(CYGPATH_W) '$<'` &&\
-@am__fastdepCC_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.Po
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c `$(CYGPATH_W) '$<'`
 
 .c.lo:
-@am__fastdepCC_TRUE@	$(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.lo$$||'`;\
-@am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
-@am__fastdepCC_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.Plo
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $<
@@ -745,7 +761,7 @@ distdir: $(DISTFILES)
 	      || exit 1; \
 	  fi; \
 	done
-@WITH_TESTS_FALSE@check-local:
+@ENABLE_TESTS_FALSE@check-local:
 check-am: all-am
 	$(MAKE) $(AM_MAKEFLAGS) check-local
 check: check-recursive
@@ -871,11 +887,11 @@ uninstall-am:
 	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
 	tags tags-recursive uninstall uninstall-am
 
-	$(DBUS_LIBS)
+@ENABLE_TESTS_TRUE@	$(DBUS_LIBS)
 
-@WITH_TESTS_TRUE@check-local: test-ifcfg-rh
-@WITH_TESTS_TRUE@	$(abs_builddir)/test-ifcfg-rh-utils
-@WITH_TESTS_TRUE@	$(abs_builddir)/test-ifcfg-rh
+@ENABLE_TESTS_TRUE@check-local: test-ifcfg-rh
+@ENABLE_TESTS_TRUE@	$(abs_builddir)/test-ifcfg-rh-utils
+@ENABLE_TESTS_TRUE@	$(abs_builddir)/test-ifcfg-rh
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/Makefile.am b/src/settings/plugins/ifcfg-rh/tests/network-scripts/Makefile.am
index f4d416bf..94d8d834 100644
--- a/src/settings/plugins/ifcfg-rh/tests/network-scripts/Makefile.am
+++ b/src/settings/plugins/ifcfg-rh/tests/network-scripts/Makefile.am
@@ -91,7 +91,8 @@ EXTRA_DIST = \
 	keys-test-wifi-dynamic-wep-leap \
 	ifcfg-test-infiniband \
 	ifcfg-test-bond-main \
-	ifcfg-test-bond-slave
+	ifcfg-test-bond-slave \
+	ifcfg-test-bond-slave-ib
 
 check-local:
 	@for f in $(EXTRA_DIST); do \
diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/Makefile.in b/src/settings/plugins/ifcfg-rh/tests/network-scripts/Makefile.in
index cb78cea2..43b0aadb 100644
--- a/src/settings/plugins/ifcfg-rh/tests/network-scripts/Makefile.in
+++ b/src/settings/plugins/ifcfg-rh/tests/network-scripts/Makefile.in
@@ -54,16 +54,18 @@ subdir = src/settings/plugins/ifcfg-rh/tests/network-scripts
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/compiler_warnings.m4 \
-	$(top_srcdir)/m4/gettext.m4 $(top_srcdir)/m4/gtk-doc.m4 \
-	$(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/intlmacosx.m4 \
-	$(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/introspection.m4 \
-	$(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \
-	$(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/libnl-check.m4 \
-	$(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \
-	$(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
-	$(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/nls.m4 \
-	$(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/progtest.m4 \
-	$(top_srcdir)/m4/vapigen.m4 $(top_srcdir)/configure.ac
+	$(top_srcdir)/m4/gettext.m4 \
+	$(top_srcdir)/m4/gnome-code-coverage.m4 \
+	$(top_srcdir)/m4/gtk-doc.m4 $(top_srcdir)/m4/iconv.m4 \
+	$(top_srcdir)/m4/intlmacosx.m4 $(top_srcdir)/m4/intltool.m4 \
+	$(top_srcdir)/m4/introspection.m4 $(top_srcdir)/m4/lib-ld.m4 \
+	$(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \
+	$(top_srcdir)/m4/libnl-check.m4 $(top_srcdir)/m4/libtool.m4 \
+	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
+	$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
+	$(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/po.m4 \
+	$(top_srcdir)/m4/progtest.m4 $(top_srcdir)/m4/vapigen.m4 \
+	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(install_sh) -d
@@ -96,6 +98,10 @@ AWK = @AWK@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
+CKDB_PATH = @CKDB_PATH@
+CODE_COVERAGE_CFLAGS = @CODE_COVERAGE_CFLAGS@
+CODE_COVERAGE_ENABLED = @CODE_COVERAGE_ENABLED@
+CODE_COVERAGE_LDFLAGS = @CODE_COVERAGE_LDFLAGS@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CXX = @CXX@
@@ -110,9 +116,7 @@ DBUS_SYS_DIR = @DBUS_SYS_DIR@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
 DHCLIENT_PATH = @DHCLIENT_PATH@
-DHCLIENT_VERSION = @DHCLIENT_VERSION@
 DHCPCD_PATH = @DHCPCD_PATH@
-DISABLE_DEPRECATED = @DISABLE_DEPRECATED@
 DLLTOOL = @DLLTOOL@
 DSYMUTIL = @DSYMUTIL@
 DUMPBIN = @DUMPBIN@
@@ -122,17 +126,14 @@ ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
 FGREP = @FGREP@
+GENHTML = @GENHTML@
 GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
 GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
-GIO_CFLAGS = @GIO_CFLAGS@
-GIO_LIBS = @GIO_LIBS@
 GLIB_CFLAGS = @GLIB_CFLAGS@
 GLIB_GENMARSHAL = @GLIB_GENMARSHAL@
 GLIB_LIBS = @GLIB_LIBS@
 GLIB_MAKEFILE = @GLIB_MAKEFILE@
 GLIB_MKENUMS = @GLIB_MKENUMS@
-GMODULE_CFLAGS = @GMODULE_CFLAGS@
-GMODULE_LIBS = @GMODULE_LIBS@
 GMSGFMT = @GMSGFMT@
 GMSGFMT_015 = @GMSGFMT_015@
 GNUTLS_CFLAGS = @GNUTLS_CFLAGS@
@@ -173,6 +174,7 @@ IPTABLES_PATH = @IPTABLES_PATH@
 IWMX_SDK_CFLAGS = @IWMX_SDK_CFLAGS@
 IWMX_SDK_LIBS = @IWMX_SDK_LIBS@
 KERNEL_FIRMWARE_DIR = @KERNEL_FIRMWARE_DIR@
+LCOV = @LCOV@
 LD = @LD@
 LDFLAGS = @LDFLAGS@
 LIBDL = @LIBDL@
@@ -189,11 +191,7 @@ LIBNL2_LIBS = @LIBNL2_LIBS@
 LIBNL3_CFLAGS = @LIBNL3_CFLAGS@
 LIBNL3_LIBS = @LIBNL3_LIBS@
 LIBNL_CFLAGS = @LIBNL_CFLAGS@
-LIBNL_GENL3_CFLAGS = @LIBNL_GENL3_CFLAGS@
-LIBNL_GENL3_LIBS = @LIBNL_GENL3_LIBS@
 LIBNL_LIBS = @LIBNL_LIBS@
-LIBNL_ROUTE3_CFLAGS = @LIBNL_ROUTE3_CFLAGS@
-LIBNL_ROUTE3_LIBS = @LIBNL_ROUTE3_LIBS@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
 LIBSOUP_CFLAGS = @LIBSOUP_CFLAGS@
@@ -208,6 +206,8 @@ MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MANIFEST_TOOL = @MANIFEST_TOOL@
 MKDIR_P = @MKDIR_P@
+MM_GLIB_CFLAGS = @MM_GLIB_CFLAGS@
+MM_GLIB_LIBS = @MM_GLIB_LIBS@
 MOC = @MOC@
 MSGFMT = @MSGFMT@
 MSGFMT_015 = @MSGFMT_015@
@@ -217,6 +217,7 @@ NMEDIT = @NMEDIT@
 NM_MAJOR_VERSION = @NM_MAJOR_VERSION@
 NM_MICRO_VERSION = @NM_MICRO_VERSION@
 NM_MINOR_VERSION = @NM_MINOR_VERSION@
+NM_MODIFY_SYSTEM_POLICY = @NM_MODIFY_SYSTEM_POLICY@
 NM_VERSION = @NM_VERSION@
 NSS_CFLAGS = @NSS_CFLAGS@
 NSS_LIBS = @NSS_LIBS@
@@ -243,13 +244,14 @@ PPPD_PLUGIN_DIR = @PPPD_PLUGIN_DIR@
 QT_CFLAGS = @QT_CFLAGS@
 QT_LIBS = @QT_LIBS@
 RANLIB = @RANLIB@
-RESOLVCONF_PATH = @RESOLVCONF_PATH@
 SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
-SYSTEMD_CFLAGS = @SYSTEMD_CFLAGS@
-SYSTEMD_LIBS = @SYSTEMD_LIBS@
+SYSTEMD_INHIBIT_CFLAGS = @SYSTEMD_INHIBIT_CFLAGS@
+SYSTEMD_INHIBIT_LIBS = @SYSTEMD_INHIBIT_LIBS@
+SYSTEMD_LOGIN_CFLAGS = @SYSTEMD_LOGIN_CFLAGS@
+SYSTEMD_LOGIN_LIBS = @SYSTEMD_LOGIN_LIBS@
 SYSTEM_CA_PATH = @SYSTEM_CA_PATH@
 UDEV_BASE_DIR = @UDEV_BASE_DIR@
 USE_NLS = @USE_NLS@
@@ -304,6 +306,11 @@ localedir = @localedir@
 localstatedir = @localstatedir@
 mandir = @mandir@
 mkdir_p = @mkdir_p@
+nmbinary = @nmbinary@
+nmconfdir = @nmconfdir@
+nmdatadir = @nmdatadir@
+nmrundir = @nmrundir@
+nmstatedir = @nmstatedir@
 oldincludedir = @oldincludedir@
 pdfdir = @pdfdir@
 prefix = @prefix@
@@ -318,6 +325,10 @@ target_alias = @target_alias@
 top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
+with_dhclient = @with_dhclient@
+with_dhcpcd = @with_dhcpcd@
+with_netconfig = @with_netconfig@
+with_resolvconf = @with_resolvconf@
 EXTRA_DIST = \
 	ifcfg-test-minimal \
 	ifcfg-test-variables-corner-cases-1 \
@@ -411,7 +422,8 @@ EXTRA_DIST = \
 	keys-test-wifi-dynamic-wep-leap \
 	ifcfg-test-infiniband \
 	ifcfg-test-bond-main \
-	ifcfg-test-bond-slave
+	ifcfg-test-bond-slave \
+	ifcfg-test-bond-slave-ib
 
 all: all-am
 
diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-bond-slave-ib b/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-bond-slave-ib
new file mode 100644
index 00000000..5bd9a3a8
--- /dev/null
+++ b/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-bond-slave-ib
@@ -0,0 +1,7 @@
+TYPE=InfiniBand
+DEVICE=ib0
+HWADDR=80:00:11:22:33:44:55:66:77:88:99:aa:bb:cc:dd:ee:ff:00:11:22
+ONBOOT=no
+MASTER=bond0
+# This should be ignored
+BOOTPROTO=dhcp
diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-bridge-component b/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-bridge-component
index f586637e..24b51221 100644
--- a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-bridge-component
+++ b/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-bridge-component
@@ -2,4 +2,4 @@ DEVICE=eth0
 HWADDR=00:22:15:59:62:97
 ONBOOT=no
 BRIDGE=br0
-
+BRIDGING_OPTS="priority=28 hairpin_mode=1 path_cost=100"
diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-bridge-main b/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-bridge-main
index c5caf3fc..c406bbb3 100644
--- a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-bridge-main
+++ b/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-bridge-main
@@ -4,4 +4,4 @@ TYPE=Bridge
 BOOTPROTO=dhcp
 STP=on
 DELAY=0
-
+BRIDGING_OPTS="priority=32744 hello_time=7 max_age=39 ageing_time=235352"
diff --git a/src/settings/plugins/ifcfg-rh/tests/test-ifcfg-rh.c b/src/settings/plugins/ifcfg-rh/tests/test-ifcfg-rh.c
index f5cf32e1..fcad1707 100644
--- a/src/settings/plugins/ifcfg-rh/tests/test-ifcfg-rh.c
+++ b/src/settings/plugins/ifcfg-rh/tests/test-ifcfg-rh.c
@@ -11929,6 +11929,7 @@ static void
 test_read_bridge_main (void)
 {
 	NMConnection *connection;
+	NMSettingBridge *s_bridge;
 	char *unmanaged = NULL;
 	char *keyfile = NULL;
 	char *routefile = NULL;
@@ -11946,13 +11947,140 @@ test_read_bridge_main (void)
 	                                   &route6file,
 	                                   &error,
 	                                   &ignore_error);
-	ASSERT (connection == NULL,
-	        "bridge-main-read", "unexpected success reading %s", TEST_IFCFG_BRIDGE_MAIN);
+	g_assert (connection);
+	g_assert (nm_connection_verify (connection, &error));
+	g_assert_no_error (error);
+
+	/* ===== Bridging SETTING ===== */
+
+	s_bridge = nm_connection_get_setting_bridge (connection);
+	g_assert (s_bridge);
+	g_assert_cmpstr (nm_setting_bridge_get_interface_name (s_bridge), ==, "br0");
+	g_assert_cmpuint (nm_setting_bridge_get_forward_delay (s_bridge), ==, 0);
+	g_assert_cmpuint (nm_setting_bridge_get_stp (s_bridge), ==, TRUE);
+	g_assert_cmpuint (nm_setting_bridge_get_priority (s_bridge), ==, 32744);
+	g_assert_cmpuint (nm_setting_bridge_get_hello_time (s_bridge), ==, 7);
+	g_assert_cmpuint (nm_setting_bridge_get_max_age (s_bridge), ==, 39);
+	g_assert_cmpuint (nm_setting_bridge_get_ageing_time (s_bridge), ==, 235352);
+
+	g_free (unmanaged);
+	g_free (keyfile);
+	g_free (routefile);
+	g_free (route6file);
+	g_object_unref (connection);
+}
+
+static void
+test_write_bridge_main (void)
+{
+	NMConnection *connection;
+	NMConnection *reread;
+	NMSettingConnection *s_con;
+	NMSettingBridge *s_bridge;
+	NMSettingIP4Config *s_ip4;
+	NMSettingIP6Config *s_ip6;
+	char *uuid;
+	const guint32 ip1 = htonl (0x01010103);
+	const guint32 gw = htonl (0x01010101);
+	const guint32 prefix = 24;
+	NMIP4Address *addr;
+	gboolean success;
+	GError *error = NULL;
+	char *testfile = NULL;
+	char *unmanaged = NULL;
+	char *keyfile = NULL;
+	char *routefile = NULL;
+	char *route6file = NULL;
+	gboolean ignore_error = FALSE;
+
+	connection = nm_connection_new ();
+	g_assert (connection);
+
+	/* Connection setting */
+	s_con = (NMSettingConnection *) nm_setting_connection_new ();
+	g_assert (s_con);
+	nm_connection_add_setting (connection, NM_SETTING (s_con));
+
+	uuid = nm_utils_uuid_generate ();
+	g_object_set (s_con,
+	              NM_SETTING_CONNECTION_ID, "Test Write Bridge Main",
+	              NM_SETTING_CONNECTION_UUID, uuid,
+	              NM_SETTING_CONNECTION_AUTOCONNECT, TRUE,
+	              NM_SETTING_CONNECTION_TYPE, NM_SETTING_BRIDGE_SETTING_NAME,
+	              NULL);
+	g_free (uuid);
+
+	/* bridge setting */
+	s_bridge = (NMSettingBridge *) nm_setting_bridge_new ();
+	g_assert (s_bridge);
+	nm_connection_add_setting (connection, NM_SETTING (s_bridge));
+
+	g_object_set (s_bridge,
+	              NM_SETTING_BRIDGE_INTERFACE_NAME, "br0",
+	              NULL);
+
+	/* IP4 setting */
+	s_ip4 = (NMSettingIP4Config *) nm_setting_ip4_config_new ();
+	g_assert (s_ip4);
+	nm_connection_add_setting (connection, NM_SETTING (s_ip4));
+
+	g_object_set (s_ip4,
+	              NM_SETTING_IP4_CONFIG_METHOD, NM_SETTING_IP4_CONFIG_METHOD_MANUAL,
+	              NM_SETTING_IP4_CONFIG_MAY_FAIL, TRUE,
+	              NULL);
+
+	addr = nm_ip4_address_new ();
+	nm_ip4_address_set_address (addr, ip1);
+	nm_ip4_address_set_prefix (addr, prefix);
+	nm_ip4_address_set_gateway (addr, gw);
+	nm_setting_ip4_config_add_address (s_ip4, addr);
+	nm_ip4_address_unref (addr);
+
+	/* IP6 setting */
+	s_ip6 = (NMSettingIP6Config *) nm_setting_ip6_config_new ();
+	g_assert (s_ip6);
+	nm_connection_add_setting (connection, NM_SETTING (s_ip6));
+
+	g_object_set (s_ip6,
+	              NM_SETTING_IP6_CONFIG_METHOD, NM_SETTING_IP6_CONFIG_METHOD_IGNORE,
+	              NULL);
+
+	g_assert (nm_connection_verify (connection, &error));
+	g_assert_no_error (error);
+
+	/* Save the ifcfg */
+	success = writer_new_connection (connection,
+	                                 TEST_SCRATCH_DIR "/network-scripts/",
+	                                 &testfile,
+	                                 &error);
+	g_assert (success);
+	g_assert_cmpstr (testfile, !=, NULL);
 
+	/* re-read the connection for comparison */
+	reread = connection_from_file (testfile,
+	                               NULL,
+	                               TYPE_BRIDGE,
+	                               NULL,
+	                               &unmanaged,
+	                               &keyfile,
+	                               &routefile,
+	                               &route6file,
+	                               &error,
+	                               &ignore_error);
+	unlink (testfile);
+
+	g_assert (reread);
+	g_assert (nm_connection_verify (reread, &error));
+	g_assert_no_error (error);
+	g_assert (nm_connection_compare (connection, reread, NM_SETTING_COMPARE_FLAG_EXACT));
+
+	g_free (testfile);
 	g_free (unmanaged);
 	g_free (keyfile);
 	g_free (routefile);
 	g_free (route6file);
+	g_object_unref (connection);
+	g_object_unref (reread);
 }
 
 #define TEST_IFCFG_BRIDGE_COMPONENT TEST_IFCFG_DIR"/network-scripts/ifcfg-test-bridge-component"
@@ -11961,12 +12089,15 @@ static void
 test_read_bridge_component (void)
 {
 	NMConnection *connection;
+	NMSettingConnection *s_con;
+	NMSettingBridgePort *s_port;
 	char *unmanaged = NULL;
 	char *keyfile = NULL;
 	char *routefile = NULL;
 	char *route6file = NULL;
 	gboolean ignore_error = FALSE;
 	GError *error = NULL;
+	gboolean success;
 
 	connection = connection_from_file (TEST_IFCFG_BRIDGE_COMPONENT,
 	                                   NULL,
@@ -11978,14 +12109,22 @@ test_read_bridge_component (void)
 	                                   &route6file,
 	                                   &error,
 	                                   &ignore_error);
-	ASSERT (connection != NULL,
-	        "bridge-component-read", "unexpected failure reading %s", TEST_IFCFG_BRIDGE_COMPONENT);
+	g_assert (connection);
 
-	ASSERT (unmanaged != NULL,
-	        "bridge-component-read", "missing unmanaged spec from %s", TEST_IFCFG_BRIDGE_COMPONENT);
+	success = nm_connection_verify (connection, &error);
+	g_assert_no_error (error);
+	g_assert (success);
 
-	ASSERT (g_strcmp0 (unmanaged, "mac:00:22:15:59:62:97") == 0,
-	        "bridge-component-read", "unexpected unmanaged spec from %s", TEST_IFCFG_BRIDGE_COMPONENT);
+	s_con = nm_connection_get_setting_connection (connection);
+	g_assert (s_con);
+	g_assert_cmpstr (nm_setting_connection_get_master (s_con), ==, "br0");
+	g_assert_cmpstr (nm_setting_connection_get_slave_type (s_con), ==, NM_SETTING_BRIDGE_SETTING_NAME);
+
+	s_port = nm_connection_get_setting_bridge_port (connection);
+	g_assert (s_port);
+	g_assert (nm_setting_bridge_port_get_hairpin_mode (s_port));
+	g_assert_cmpuint (nm_setting_bridge_port_get_priority (s_port), ==, 28);
+	g_assert_cmpuint (nm_setting_bridge_port_get_path_cost (s_port), ==, 100);
 
 	g_free (unmanaged);
 	g_free (keyfile);
@@ -11994,6 +12133,113 @@ test_read_bridge_component (void)
 	g_object_unref (connection);
 }
 
+static void
+test_write_bridge_component (void)
+{
+	NMConnection *connection;
+	NMConnection *reread;
+	NMSettingConnection *s_con;
+	NMSettingWired *s_wired;
+	NMSetting *s_port;
+	static unsigned char tmpmac[] = { 0x31, 0x33, 0x33, 0x37, 0xbe, 0xcd };
+	GByteArray *mac;
+	guint32 mtu = 1492;
+	char *uuid;
+	gboolean success;
+	GError *error = NULL;
+	char *testfile = NULL;
+	char *unmanaged = NULL;
+	char *keyfile = NULL;
+	char *routefile = NULL;
+	char *route6file = NULL;
+	gboolean ignore_error = FALSE;
+
+	connection = nm_connection_new ();
+	g_assert (connection);
+
+	/* Connection setting */
+	s_con = (NMSettingConnection *) nm_setting_connection_new ();
+	g_assert (s_con);
+	nm_connection_add_setting (connection, NM_SETTING (s_con));
+
+	uuid = nm_utils_uuid_generate ();
+	g_object_set (s_con,
+	              NM_SETTING_CONNECTION_ID, "Test Write Bridge Component",
+	              NM_SETTING_CONNECTION_UUID, uuid,
+	              NM_SETTING_CONNECTION_AUTOCONNECT, TRUE,
+	              NM_SETTING_CONNECTION_TYPE, NM_SETTING_WIRED_SETTING_NAME,
+				  NM_SETTING_CONNECTION_MASTER, "br0",
+				  NM_SETTING_CONNECTION_SLAVE_TYPE, NM_SETTING_BRIDGE_SETTING_NAME,
+	              NULL);
+	g_free (uuid);
+
+	/* Wired setting */
+	s_wired = (NMSettingWired *) nm_setting_wired_new ();
+	g_assert (s_wired);
+	nm_connection_add_setting (connection, NM_SETTING (s_wired));
+
+	mac = g_byte_array_sized_new (sizeof (tmpmac));
+	g_byte_array_append (mac, &tmpmac[0], sizeof (tmpmac));
+
+	g_object_set (s_wired,
+	              NM_SETTING_WIRED_MAC_ADDRESS, mac,
+	              NM_SETTING_WIRED_MTU, mtu,
+	              NULL);
+	g_byte_array_free (mac, TRUE);
+
+	/* Bridge port */
+	s_port = nm_setting_bridge_port_new ();
+	nm_connection_add_setting (connection, s_port);
+	g_object_set (s_port,
+	              NM_SETTING_BRIDGE_PORT_PRIORITY, 50,
+	              NM_SETTING_BRIDGE_PORT_PATH_COST, 33,
+	              NULL);
+
+	success = nm_connection_verify (connection, &error);
+	g_assert_no_error (error);
+	g_assert (success);
+
+	/* Save the ifcfg */
+	success = writer_new_connection (connection,
+	                                 TEST_SCRATCH_DIR "/network-scripts/",
+	                                 &testfile,
+	                                 &error);
+	g_assert_no_error (error);
+	g_assert (success);
+	g_assert (testfile);
+
+	/* re-read the connection for comparison */
+	reread = connection_from_file (testfile,
+	                               NULL,
+	                               TYPE_ETHERNET,
+	                               NULL,
+	                               &unmanaged,
+	                               &keyfile,
+	                               &routefile,
+	                               &route6file,
+	                               &error,
+	                               &ignore_error);
+	unlink (testfile);
+
+	g_assert (reread);
+
+	success = nm_connection_verify (reread, &error);
+	g_assert_no_error (error);
+
+	g_assert (nm_connection_compare (connection, reread, NM_SETTING_COMPARE_FLAG_EXACT));
+
+	if (route6file)
+		unlink (route6file);
+
+	g_free (testfile);
+	g_free (unmanaged);
+	g_free (keyfile);
+	g_free (routefile);
+	g_free (route6file);
+	g_object_unref (connection);
+	g_object_unref (reread);
+}
+
 #define TEST_IFCFG_VLAN_INTERFACE TEST_IFCFG_DIR"/network-scripts/ifcfg-test-vlan-interface"
 
 static void
@@ -12262,6 +12508,124 @@ test_write_vlan_only_vlanid (void)
 	g_object_unref (reread);
 }
 
+static void
+test_write_ethernet_missing_ipv6 (void)
+{
+	NMConnection *connection;
+	NMConnection *reread;
+	NMSettingConnection *s_con;
+	NMSettingWired *s_wired;
+	NMSettingIP4Config *s_ip4;
+	NMSettingIP6Config *s_ip6;
+	char *uuid;
+	gboolean success;
+	GError *error = NULL;
+	char *testfile = NULL;
+	char *unmanaged = NULL;
+	char *keyfile = NULL;
+	char *routefile = NULL;
+	char *route6file = NULL;
+	gboolean ignore_error = FALSE;
+
+	connection = nm_connection_new ();
+	g_assert (connection);
+
+	/* Connection setting */
+	s_con = (NMSettingConnection *) nm_setting_connection_new ();
+	g_assert (s_con);
+	nm_connection_add_setting (connection, NM_SETTING (s_con));
+
+	uuid = nm_utils_uuid_generate ();
+	g_object_set (s_con,
+	              NM_SETTING_CONNECTION_ID, "Test Write Ethernet Without IPv6 Setting",
+	              NM_SETTING_CONNECTION_UUID, uuid,
+	              NM_SETTING_CONNECTION_AUTOCONNECT, TRUE,
+	              NM_SETTING_CONNECTION_TYPE, NM_SETTING_WIRED_SETTING_NAME,
+	              NULL);
+	g_free (uuid);
+
+	/* Wired setting */
+	s_wired = (NMSettingWired *) nm_setting_wired_new ();
+	g_assert (s_wired);
+	nm_connection_add_setting (connection, NM_SETTING (s_wired));
+
+	/* IP4 setting */
+	s_ip4 = (NMSettingIP4Config *) nm_setting_ip4_config_new ();
+	g_assert (s_ip4);
+	nm_connection_add_setting (connection, NM_SETTING (s_ip4));
+	g_object_set (s_ip4,
+	              NM_SETTING_IP4_CONFIG_METHOD, NM_SETTING_IP4_CONFIG_METHOD_AUTO,
+	              NM_SETTING_IP4_CONFIG_DHCP_CLIENT_ID, "random-client-id-00:22:33",
+	              NM_SETTING_IP4_CONFIG_IGNORE_AUTO_ROUTES, TRUE,
+	              NM_SETTING_IP4_CONFIG_IGNORE_AUTO_DNS, TRUE,
+	              NULL);
+
+	/* IP6 setting */
+	/*
+	 * We intentionally don't add IPv6 setting here. ifcfg-rh plugin should regard
+	 * missing IPv6 as IPv6 with NM_SETTING_IP6_CONFIG_METHOD_AUTO method.
+	 */
+
+	ASSERT (nm_connection_verify (connection, &error) == TRUE,
+	        "ethernet-missing-ipv6", "failed to verify connection: %s",
+	        (error && error->message) ? error->message : "(unknown)");
+
+	/* Save the ifcfg */
+	success = writer_new_connection (connection,
+	                                 TEST_SCRATCH_DIR "/network-scripts/",
+	                                 &testfile,
+	                                 &error);
+	ASSERT (success == TRUE,
+	        "ethernet-missing-ipv6", "failed to write connection to disk: %s",
+	        (error && error->message) ? error->message : "(unknown)");
+
+	ASSERT (testfile != NULL,
+	        "ethernet-missing-ipv6", "didn't get ifcfg file path back after writing connection");
+
+	/* re-read the connection for comparison */
+	reread = connection_from_file (testfile,
+	                               NULL,
+	                               TYPE_ETHERNET,
+	                               NULL,
+	                               &unmanaged,
+	                               &keyfile,
+	                               &routefile,
+	                               &route6file,
+	                               &error,
+	                               &ignore_error);
+	unlink (testfile);
+
+	ASSERT (reread != NULL,
+	        "ethernet-missing-ipv6-reread", "failed to read %s: %s", testfile, error->message);
+
+	ASSERT (nm_connection_verify (reread, &error),
+	        "ethernet-missing-ipv6-reread-verify", "failed to verify %s: %s", testfile, error->message);
+
+	/*
+	 * We need to add IPv6 setting to the original connection now so that
+	 * the comparison can succeed. Missing IPv6 setting should have been
+	 * written out (and re-read) as Automatic IPv6.
+	 */
+	s_ip6 = (NMSettingIP6Config *) nm_setting_ip6_config_new ();
+	g_assert (s_ip6);
+	nm_connection_add_setting (connection, NM_SETTING (s_ip6));
+	g_object_set (s_ip6,
+	              NM_SETTING_IP6_CONFIG_METHOD, NM_SETTING_IP6_CONFIG_METHOD_AUTO,
+	              NM_SETTING_IP6_CONFIG_MAY_FAIL, TRUE,
+	              NULL);
+
+	ASSERT (nm_connection_compare (connection, reread, NM_SETTING_COMPARE_FLAG_EXACT) == TRUE,
+	        "ethernet-missing-ipv6", "written and re-read connection weren't the same.");
+
+	g_free (testfile);
+	g_free (unmanaged);
+	g_free (keyfile);
+	g_free (routefile);
+	g_free (route6file);
+	g_object_unref (connection);
+	g_object_unref (reread);
+}
+
 #define TEST_IFCFG_BOND_MAIN TEST_IFCFG_DIR"/network-scripts/ifcfg-test-bond-main"
 
 static void
@@ -12479,10 +12843,10 @@ test_read_bond_slave (void)
 	                                   &error,
 	                                   &ignore_error);
 	ASSERT (connection != NULL,
-	        "bond-slave-read", "unexpected failure reading %s", TEST_IFCFG_BOND_MAIN);
+	        "bond-slave-read", "unexpected failure reading %s", TEST_IFCFG_BOND_SLAVE);
 
 	ASSERT (nm_connection_verify (connection, &error),
-	        "bond-slave-read", "failed to verify %s: %s", TEST_IFCFG_BOND_MAIN, error->message);
+	        "bond-slave-read", "failed to verify %s: %s", TEST_IFCFG_BOND_SLAVE, error->message);
 
 	s_con = nm_connection_get_setting_connection (connection);
 	ASSERT (s_con != NULL,
@@ -12834,6 +13198,167 @@ test_write_infiniband (void)
 	g_object_unref (reread);
 }
 
+#define TEST_IFCFG_BOND_SLAVE_IB TEST_IFCFG_DIR"/network-scripts/ifcfg-test-bond-slave-ib"
+
+static void
+test_read_bond_slave_ib (void)
+{
+	NMConnection *connection;
+	NMSettingConnection *s_con;
+	char *unmanaged = NULL;
+	char *keyfile = NULL;
+	char *routefile = NULL;
+	char *route6file = NULL;
+	gboolean ignore_error = FALSE;
+	GError *error = NULL;
+
+	connection = connection_from_file (TEST_IFCFG_BOND_SLAVE_IB,
+	                                   NULL,
+	                                   NULL,
+	                                   NULL,
+	                                   &unmanaged,
+	                                   &keyfile,
+	                                   &routefile,
+	                                   &route6file,
+	                                   &error,
+	                                   &ignore_error);
+	ASSERT (connection != NULL,
+	        "bond-slave-read-ib", "unexpected failure reading %s", TEST_IFCFG_BOND_SLAVE_IB);
+
+	ASSERT (nm_connection_verify (connection, &error),
+	        "bond-slave-read-ib", "failed to verify %s: %s", TEST_IFCFG_BOND_SLAVE_IB, error->message);
+
+	s_con = nm_connection_get_setting_connection (connection);
+	ASSERT (s_con != NULL,
+	        "bond-slave-read-ib", "failed to verify %s: missing %s setting",
+	        TEST_IFCFG_BOND_SLAVE_IB, NM_SETTING_CONNECTION_SETTING_NAME);
+
+	ASSERT (g_strcmp0 (nm_setting_connection_get_master (s_con), "bond0") == 0,
+	        "bond-slave-read-ib", "failed to verify %s: master is not bond0",
+	        TEST_IFCFG_BOND_SLAVE_IB);
+
+	ASSERT (g_strcmp0 (nm_setting_connection_get_slave_type (s_con), NM_SETTING_BOND_SETTING_NAME) == 0,
+	        "bond-slave-read-ib", "failed to verify %s: slave-type is not bond",
+	        TEST_IFCFG_BOND_SLAVE_IB);
+
+	g_free (unmanaged);
+	g_free (keyfile);
+	g_free (routefile);
+	g_free (route6file);
+	g_object_unref (connection);
+}
+
+static void
+test_write_bond_slave_ib (void)
+{
+	NMConnection *connection;
+	NMConnection *reread;
+	NMSettingConnection *s_con;
+	NMSettingInfiniband *s_infiniband;
+	static unsigned char tmpmac[] = { 
+		0x80, 0x00, 0x11, 0x22, 0x33, 0x44, 0x55, 0x66, 0x77, 0x88,
+		0x99, 0xaa, 0xbb, 0xcc, 0xdd, 0xee, 0xff, 0x00, 0x11, 0x22
+	};
+	GByteArray *mac;
+	char *uuid;
+	gboolean success;
+	GError *error = NULL;
+	char *testfile = NULL;
+	char *unmanaged = NULL;
+	char *keyfile = NULL;
+	char *routefile = NULL;
+	char *route6file = NULL;
+	gboolean ignore_error = FALSE;
+
+	connection = nm_connection_new ();
+	ASSERT (connection != NULL,
+	        "bond-slave-write-ib", "failed to allocate new connection");
+
+	/* Connection setting */
+	s_con = (NMSettingConnection *) nm_setting_connection_new ();
+	ASSERT (s_con != NULL,
+	        "bond-slave-write-ib", "failed to allocate new %s setting",
+	        NM_SETTING_CONNECTION_SETTING_NAME);
+	nm_connection_add_setting (connection, NM_SETTING (s_con));
+
+	uuid = nm_utils_uuid_generate ();
+	g_object_set (s_con,
+	              NM_SETTING_CONNECTION_ID, "Test Write Bond Slave InfiniBand",
+	              NM_SETTING_CONNECTION_UUID, uuid,
+	              NM_SETTING_CONNECTION_AUTOCONNECT, TRUE,
+	              NM_SETTING_CONNECTION_TYPE, NM_SETTING_INFINIBAND_SETTING_NAME,
+				  NM_SETTING_CONNECTION_MASTER, "bond0",
+				  NM_SETTING_CONNECTION_SLAVE_TYPE, NM_SETTING_BOND_SETTING_NAME,
+	              NULL);
+	g_free (uuid);
+
+	/* InfiniBand setting */
+	s_infiniband = (NMSettingInfiniband *) nm_setting_infiniband_new ();
+	ASSERT (s_infiniband != NULL,
+	        "bond-main-write", "failed to allocate new %s setting",
+	        NM_SETTING_INFINIBAND_SETTING_NAME);
+	nm_connection_add_setting (connection, NM_SETTING (s_infiniband));
+
+	mac = g_byte_array_sized_new (sizeof (tmpmac));
+	g_byte_array_append (mac, &tmpmac[0], sizeof (tmpmac));
+
+	g_object_set (s_infiniband,
+	              NM_SETTING_INFINIBAND_MAC_ADDRESS, mac,
+	              NM_SETTING_INFINIBAND_MTU, 2044,
+	              NM_SETTING_INFINIBAND_TRANSPORT_MODE, "datagram",
+	              NULL);
+	g_byte_array_free (mac, TRUE);
+
+	ASSERT (nm_connection_verify (connection, &error) == TRUE,
+	        "bond-slave-write-ib", "failed to verify connection: %s",
+	        (error && error->message) ? error->message : "(unknown)");
+
+	/* Save the ifcfg */
+	success = writer_new_connection (connection,
+	                                 TEST_SCRATCH_DIR "/network-scripts/",
+	                                 &testfile,
+	                                 &error);
+	ASSERT (success == TRUE,
+	        "bond-slave-write-ib", "failed to write connection to disk: %s",
+	        (error && error->message) ? error->message : "(unknown)");
+
+	ASSERT (testfile != NULL,
+	        "bond-slave-write-ib", "didn't get ifcfg file path back after writing connection");
+
+	/* re-read the connection for comparison */
+	reread = connection_from_file (testfile,
+	                               NULL,
+	                               NULL,
+	                               NULL,
+	                               &unmanaged,
+	                               &keyfile,
+	                               &routefile,
+	                               &route6file,
+	                               &error,
+	                               &ignore_error);
+	unlink (testfile);
+
+	ASSERT (reread != NULL,
+	        "bond-slave-write-ib-reread", "failed to read %s: %s", testfile, error->message);
+
+	ASSERT (nm_connection_verify (reread, &error),
+	        "bond-slave-write-ib-reread-verify", "failed to verify %s: %s", testfile, error->message);
+
+	ASSERT (nm_connection_compare (connection, reread, NM_SETTING_COMPARE_FLAG_EXACT) == TRUE,
+	        "bond-slave-write-ib", "written and re-read connection weren't the same.");
+
+	if (route6file)
+		unlink (route6file);
+
+	g_free (testfile);
+	g_free (unmanaged);
+	g_free (keyfile);
+	g_free (routefile);
+	g_free (route6file);
+	g_object_unref (connection);
+	g_object_unref (reread);
+}
+
 #define TEST_IFCFG_WIFI_OPEN_SSID_BAD_HEX TEST_IFCFG_DIR"/network-scripts/ifcfg-test-wifi-open-ssid-bad-hex"
 #define TEST_IFCFG_WIFI_OPEN_SSID_LONG_QUOTED TEST_IFCFG_DIR"/network-scripts/ifcfg-test-wifi-open-ssid-long-quoted"
 #define TEST_IFCFG_WIFI_OPEN_SSID_LONG_HEX TEST_IFCFG_DIR"/network-scripts/ifcfg-test-wifi-open-ssid-long-hex"
@@ -12996,6 +13521,7 @@ int main (int argc, char **argv)
 	test_write_infiniband ();
 	test_write_vlan ();
 	test_write_vlan_only_vlanid ();
+	test_write_ethernet_missing_ipv6 ();
 
 	/* iSCSI / ibft */
 	test_read_ibft_dhcp ();
@@ -13010,16 +13536,21 @@ int main (int argc, char **argv)
 	/* bonding */
 	test_read_bond_main ();
 	test_read_bond_slave ();
+	test_read_bond_slave_ib ();
 	test_write_bond_main ();
 	test_write_bond_slave ();
+	test_write_bond_slave_ib ();
+
+	test_read_bridge_main ();
+	test_write_bridge_main ();
+	test_read_bridge_component ();
+	test_write_bridge_component ();
 
 	/* Stuff we expect to fail for now */
 	test_write_wired_pppoe ();
 	test_write_vpn ();
 	test_write_mobile_broadband (TRUE);
 	test_write_mobile_broadband (FALSE);
-	test_read_bridge_main ();
-	test_read_bridge_component ();
 
 	base = g_path_get_basename (argv[0]);
 	fprintf (stdout, "%s: SUCCESS\n", base);
diff --git a/src/settings/plugins/ifcfg-rh/utils.c b/src/settings/plugins/ifcfg-rh/utils.c
index 4e0afb96..04df6671 100644
--- a/src/settings/plugins/ifcfg-rh/utils.c
+++ b/src/settings/plugins/ifcfg-rh/utils.c
@@ -454,7 +454,8 @@ utils_ignore_ip_config (NMConnection *connection)
 	/* bonding slaves have no IP configuration, and the system
 	 * scripts just ignore it if it's there.
 	 */
-	if (nm_setting_connection_is_slave_type (s_con, NM_SETTING_BOND_SETTING_NAME))
+	if (   nm_setting_connection_is_slave_type (s_con, NM_SETTING_BOND_SETTING_NAME)
+	    || nm_setting_connection_is_slave_type (s_con, NM_SETTING_BRIDGE_SETTING_NAME))
 		return TRUE;
 
 	return FALSE;
diff --git a/src/settings/plugins/ifcfg-rh/writer.c b/src/settings/plugins/ifcfg-rh/writer.c
index 26a1585b..e258081f 100644
--- a/src/settings/plugins/ifcfg-rh/writer.c
+++ b/src/settings/plugins/ifcfg-rh/writer.c
@@ -18,7 +18,6 @@
  * Copyright (C) 2009 - 2012 Red Hat, Inc.
  */
 
-#include 
 #include 
 #include 
 #include 
@@ -845,7 +844,7 @@ write_wireless_setting (NMConnection *connection,
 	 * hex notation of the SSID instead.
 	 */
 	for (i = 0; i < ssid->len; i++) {
-		if (!isprint (ssid->data[i])) {
+		if (!g_ascii_isprint (ssid->data[i])) {
 			hex_ssid = TRUE;
 			break;
 		}
@@ -1123,7 +1122,8 @@ write_wired_setting (NMConnection *connection, shvarFile *ifcfg, GError **error)
 	return TRUE;
 }
 
-static GString *vlan_priority_maplist_to_stringlist (NMSettingVlan *s_vlan, NMVlanPriorityMap map)
+static GString *
+vlan_priority_maplist_to_stringlist (NMSettingVlan *s_vlan, NMVlanPriorityMap map)
 {
 	GSList *strlist = NULL, *iter;
 	GString *value = NULL;
@@ -1145,10 +1145,11 @@ static GString *vlan_priority_maplist_to_stringlist (NMSettingVlan *s_vlan, NMVl
 }
 
 static gboolean
-write_vlan_setting (NMConnection *connection, shvarFile *ifcfg, GError **error)
+write_vlan_setting (NMConnection *connection, shvarFile *ifcfg, gboolean *wired, GError **error)
 {
 	NMSettingVlan *s_vlan;
 	NMSettingConnection *s_con;
+	NMSettingWired *s_wired;
 	char *tmp;
 	guint32 vlan_flags = 0;
 	GString *text = NULL;
@@ -1200,6 +1201,39 @@ write_vlan_setting (NMConnection *connection, shvarFile *ifcfg, GError **error)
 	if (text)
 		g_string_free (text, TRUE);
 
+	svSetValue (ifcfg, "HWADDR", NULL, FALSE);
+	svSetValue (ifcfg, "MACADDR", NULL, FALSE);
+	svSetValue (ifcfg, "MTU", NULL, FALSE);
+
+	s_wired = nm_connection_get_setting_wired (connection);
+	if (s_wired) {
+		const GByteArray *device_mac, *cloned_mac;
+		guint32 mtu;
+
+		*wired = TRUE;
+
+		device_mac = nm_setting_wired_get_mac_address (s_wired);
+		if (device_mac) {
+			tmp = nm_utils_hwaddr_ntoa (device_mac->data, ARPHRD_ETHER);
+			svSetValue (ifcfg, "HWADDR", tmp, FALSE);
+			g_free (tmp);
+		}
+
+		cloned_mac = nm_setting_wired_get_cloned_mac_address (s_wired);
+		if (cloned_mac) {
+			tmp = nm_utils_hwaddr_ntoa (cloned_mac->data, ARPHRD_ETHER);
+			svSetValue (ifcfg, "MACADDR", tmp, FALSE);
+			g_free (tmp);
+		}
+
+		mtu = nm_setting_wired_get_mtu (s_wired);
+		if (mtu) {
+			tmp = g_strdup_printf ("%u", mtu);
+			svSetValue (ifcfg, "MTU", tmp, FALSE);
+			g_free (tmp);
+		}
+	}
+
 	return TRUE;
 }
 
@@ -1254,6 +1288,136 @@ write_bonding_setting (NMConnection *connection, shvarFile *ifcfg, GError **erro
 	return TRUE;
 }
 
+static guint32
+get_setting_default (NMSetting *setting, const char *prop)
+{
+	GParamSpec *pspec;
+	GValue val = { 0 };
+	guint32 ret = 0;
+
+	pspec = g_object_class_find_property (G_OBJECT_GET_CLASS (setting), prop);
+	g_assert (pspec);
+	g_value_init (&val, pspec->value_type);
+	g_param_value_set_default (pspec, &val);
+	g_assert (G_VALUE_HOLDS_UINT (&val));
+	ret = g_value_get_uint (&val);
+	g_value_unset (&val);
+	return ret;
+}
+
+static gboolean
+write_bridge_setting (NMConnection *connection, shvarFile *ifcfg, GError **error)
+{
+	NMSettingBridge *s_bridge;
+	const char *iface;
+	guint32 i;
+	GString *opts;
+	char *s;
+
+	s_bridge = nm_connection_get_setting_bridge (connection);
+	if (!s_bridge) {
+		g_set_error (error, IFCFG_PLUGIN_ERROR, 0,
+		             "Missing '%s' setting", NM_SETTING_BRIDGE_SETTING_NAME);
+		return FALSE;
+	}
+
+	iface = nm_setting_bridge_get_interface_name (s_bridge);
+	if (!iface) {
+		g_set_error (error, IFCFG_PLUGIN_ERROR, 0, "Missing interface name");
+		return FALSE;
+	}
+
+	svSetValue (ifcfg, "DEVICE", iface, FALSE);
+	svSetValue (ifcfg, "BRIDGING_OPTS", NULL, FALSE);
+	svSetValue (ifcfg, "STP", NULL, FALSE);
+	svSetValue (ifcfg, "DELAY", NULL, FALSE);
+
+	/* Bridge options */
+	opts = g_string_sized_new (32);
+
+	if (nm_setting_bridge_get_stp (s_bridge)) {
+		svSetValue (ifcfg, "STP", "yes", FALSE);
+
+		i = nm_setting_bridge_get_forward_delay (s_bridge);
+		if (i && i != get_setting_default (NM_SETTING (s_bridge), NM_SETTING_BRIDGE_FORWARD_DELAY)) {
+			s = g_strdup_printf ("%u", i);
+			svSetValue (ifcfg, "DELAY", s, FALSE);
+			g_free (s);
+		}
+
+		g_string_append_printf (opts, "priority=%u", nm_setting_bridge_get_priority (s_bridge));
+
+		i = nm_setting_bridge_get_hello_time (s_bridge);
+		if (i && i != get_setting_default (NM_SETTING (s_bridge), NM_SETTING_BRIDGE_HELLO_TIME)) {
+			if (opts->len)
+				g_string_append_c (opts, ' ');
+			g_string_append_printf (opts, "hello_time=%u", i);
+		}
+
+		i = nm_setting_bridge_get_max_age (s_bridge);
+		if (i && i != get_setting_default (NM_SETTING (s_bridge), NM_SETTING_BRIDGE_MAX_AGE)) {
+			if (opts->len)
+				g_string_append_c (opts, ' ');
+			g_string_append_printf (opts, "max_age=%u", i);
+		}
+	}
+
+	i = nm_setting_bridge_get_ageing_time (s_bridge);
+	if (i != get_setting_default (NM_SETTING (s_bridge), NM_SETTING_BRIDGE_AGEING_TIME)) {
+		if (opts->len)
+			g_string_append_c (opts, ' ');
+		g_string_append_printf (opts, "ageing_time=%u", i);
+	}
+
+	if (opts->len)
+		svSetValue (ifcfg, "BRIDGING_OPTS", opts->str, FALSE);
+	g_string_free (opts, TRUE);
+
+	svSetValue (ifcfg, "TYPE", TYPE_BRIDGE, FALSE);
+
+	return TRUE;
+}
+
+static gboolean
+write_bridge_port_setting (NMConnection *connection, shvarFile *ifcfg, GError **error)
+{
+	NMSettingBridgePort *s_port;
+	guint32 i;
+	GString *opts;
+
+	s_port = nm_connection_get_setting_bridge_port (connection);
+	if (!s_port)
+		return TRUE;
+
+	svSetValue (ifcfg, "BRIDGING_OPTS", NULL, FALSE);
+
+	/* Bridge options */
+	opts = g_string_sized_new (32);
+
+	i = nm_setting_bridge_port_get_priority (s_port);
+	if (i && i != get_setting_default (NM_SETTING (s_port), NM_SETTING_BRIDGE_PORT_PRIORITY))
+		g_string_append_printf (opts, "priority=%u", i);
+
+	i = nm_setting_bridge_port_get_path_cost (s_port);
+	if (i && i != get_setting_default (NM_SETTING (s_port), NM_SETTING_BRIDGE_PORT_PATH_COST)) {
+		if (opts->len)
+			g_string_append_c (opts, ' ');
+		g_string_append_printf (opts, "path_cost=%u", i);
+	}
+
+	if (nm_setting_bridge_port_get_hairpin_mode (s_port)) {
+		if (opts->len)
+			g_string_append_c (opts, ' ');
+		g_string_append_printf (opts, "hairpin_mode=1");
+	}
+
+	if (opts->len)
+		svSetValue (ifcfg, "BRIDGING_OPTS", opts->str, FALSE);
+	g_string_free (opts, TRUE);
+
+	return TRUE;
+}
+
 static void
 write_connection_setting (NMSettingConnection *s_con, shvarFile *ifcfg)
 {
@@ -1295,6 +1459,30 @@ write_connection_setting (NMSettingConnection *s_con, shvarFile *ifcfg)
 	if (master) {
 		if (nm_setting_connection_is_slave_type (s_con, NM_SETTING_BOND_SETTING_NAME))
 			svSetValue (ifcfg, "MASTER", master, FALSE);
+		else if (nm_setting_connection_is_slave_type (s_con, NM_SETTING_BRIDGE_SETTING_NAME))
+			svSetValue (ifcfg, "BRIDGE", master, FALSE);
+	}
+
+	/* secondary connection UUIDs */
+	svSetValue (ifcfg, "SECONDARY_UUIDS", NULL, FALSE);
+	n = nm_setting_connection_get_num_secondaries (s_con);
+	if (n > 0) {
+		str = g_string_sized_new (n * 37);
+
+		for (i = 0; i < n; i++) {
+			const char *uuid;
+
+			/* Items separated by space for consistency with eg
+			 * IPV6ADDR_SECONDARIES and DOMAIN.
+			 */
+			if (str->len)
+				g_string_append_c (str, ' ');
+
+			if ((uuid = nm_setting_connection_get_secondary (s_con, i)) != NULL)
+				g_string_append (str, uuid);
+		}
+		svSetValue (ifcfg, "SECONDARY_UUIDS", str->str, FALSE);
+		g_string_free (str, TRUE);
 	}
 }
 
@@ -1517,7 +1705,6 @@ write_ip4_setting (NMConnection *connection, shvarFile *ifcfg, GError **error)
 
 	svSetValue (ifcfg, "PEERDNS", NULL, FALSE);
 	svSetValue (ifcfg, "PEERROUTES", NULL, FALSE);
-	svSetValue (ifcfg, "DHCP_HOSTNAME", NULL, FALSE);
 	svSetValue (ifcfg, "DHCP_CLIENT_ID", NULL, FALSE);
 	if (!strcmp (method, NM_SETTING_IP4_CONFIG_METHOD_AUTO)) {
 		svSetValue (ifcfg, "PEERDNS",
@@ -1710,9 +1897,15 @@ write_ip6_setting (NMConnection *connection, shvarFile *ifcfg, GError **error)
 
 	s_ip6 = nm_connection_get_setting_ip6_config (connection);
 	if (!s_ip6) {
-		g_set_error (error, IFCFG_PLUGIN_ERROR, 0,
-		             "Missing '%s' setting", NM_SETTING_IP6_CONFIG_SETTING_NAME);
-		return FALSE;
+		/* Treat missing IPv6 setting as a setting with method "auto" */
+		svSetValue (ifcfg, "IPV6INIT", "yes", FALSE);
+		svSetValue (ifcfg, "IPV6_AUTOCONF", "yes", FALSE);
+		svSetValue (ifcfg, "DHCPV6C", NULL, FALSE);
+		svSetValue (ifcfg, "IPV6_DEFROUTE", "yes", FALSE);
+		svSetValue (ifcfg, "IPV6_PEERDNS", "yes", FALSE);
+		svSetValue (ifcfg, "IPV6_PEERROUTES", "yes", FALSE);
+		svSetValue (ifcfg, "IPV6_FAILURE_FATAL", "no", FALSE);
+		return TRUE;
 	}
 
 	value = nm_setting_ip6_config_get_method (s_ip6);
@@ -1726,9 +1919,13 @@ write_ip6_setting (NMConnection *connection, shvarFile *ifcfg, GError **error)
 		svSetValue (ifcfg, "IPV6_AUTOCONF", "yes", FALSE);
 		svSetValue (ifcfg, "DHCPV6C", NULL, FALSE);
 	} else if (!strcmp (value, NM_SETTING_IP6_CONFIG_METHOD_DHCP)) {
+		const char *hostname;
 		svSetValue (ifcfg, "IPV6INIT", "yes", FALSE);
 		svSetValue (ifcfg, "IPV6_AUTOCONF", "no", FALSE);
 		svSetValue (ifcfg, "DHCPV6C", "yes", FALSE);
+		hostname = nm_setting_ip6_config_get_dhcp_hostname (s_ip6);
+		if (hostname)
+			svSetValue (ifcfg, "DHCP_HOSTNAME", hostname, FALSE);
 	} else if (!strcmp (value, NM_SETTING_IP6_CONFIG_METHOD_MANUAL)) {
 		svSetValue (ifcfg, "IPV6INIT", "yes", FALSE);
 		svSetValue (ifcfg, "IPV6_AUTOCONF", "no", FALSE);
@@ -1907,8 +2104,6 @@ write_connection (NMConnection *connection,
                   GError **error)
 {
 	NMSettingConnection *s_con;
-	NMSettingIP4Config *s_ip4;
-	NMSettingIP6Config *s_ip6;
 	gboolean success = FALSE;
 	shvarFile *ifcfg = NULL;
 	char *ifcfg_name = NULL;
@@ -1987,7 +2182,7 @@ write_connection (NMConnection *connection,
 			goto out;
 		wired = TRUE;
 	} else if (!strcmp (type, NM_SETTING_VLAN_SETTING_NAME)) {
-		if (!write_vlan_setting (connection, ifcfg, error))
+		if (!write_vlan_setting (connection, ifcfg, &wired, error))
 			goto out;
 	} else if (!strcmp (type, NM_SETTING_WIRELESS_SETTING_NAME)) {
 		if (!write_wireless_setting (connection, ifcfg, &no_8021x, error))
@@ -1998,6 +2193,9 @@ write_connection (NMConnection *connection,
 	} else if (!strcmp (type, NM_SETTING_BOND_SETTING_NAME)) {
 		if (!write_bonding_setting (connection, ifcfg, error))
 			goto out;
+	} else if (!strcmp (type, NM_SETTING_BRIDGE_SETTING_NAME)) {
+		if (!write_bridge_setting (connection, ifcfg, error))
+			goto out;
 	} else {
 		g_set_error (error, IFCFG_PLUGIN_ERROR, 0,
 		             "Can't write connection type '%s'", type);
@@ -2009,16 +2207,17 @@ write_connection (NMConnection *connection,
 			goto out;
 	}
 
+	if (!write_bridge_port_setting (connection, ifcfg, error))
+		goto out;
+
 	if (!utils_ignore_ip_config (connection)) {
-		s_ip4 = nm_connection_get_setting_ip4_config (connection);
+		svSetValue (ifcfg, "DHCP_HOSTNAME", NULL, FALSE);
+
 		if (!write_ip4_setting (connection, ifcfg, error))
 			goto out;
 
-		s_ip6 = nm_connection_get_setting_ip6_config (connection);
-		if (s_ip6) {
-			if (!write_ip6_setting (connection, ifcfg, error))
-				goto out;
-		}
+		if (!write_ip6_setting (connection, ifcfg, error))
+			goto out;
 	}
 
 	write_connection_setting (s_con, ifcfg);
diff --git a/src/settings/plugins/ifcfg-suse/Makefile.am b/src/settings/plugins/ifcfg-suse/Makefile.am
index 3db8ed31..6b14bfe2 100644
--- a/src/settings/plugins/ifcfg-suse/Makefile.am
+++ b/src/settings/plugins/ifcfg-suse/Makefile.am
@@ -7,11 +7,10 @@ libnm_settings_plugin_ifcfg_suse_la_SOURCES = \
 
 libnm_settings_plugin_ifcfg_suse_la_CPPFLAGS = \
 	$(GLIB_CFLAGS) \
-	$(GMODULE_CFLAGS) \
 	$(DBUS_CFLAGS) \
-	-DG_DISABLE_DEPRECATED \
 	-I${top_srcdir}/src/settings \
 	-I$(top_srcdir)/include \
+	-I$(top_builddir)/include \
 	-I$(top_srcdir)/libnm-util \
 	-I$(top_srcdir)/libnm-glib \
 	-DSYSCONFDIR=\"$(sysconfdir)\"
@@ -20,7 +19,5 @@ libnm_settings_plugin_ifcfg_suse_la_LDFLAGS = -module -avoid-version
 libnm_settings_plugin_ifcfg_suse_la_LIBADD = \
 	$(top_builddir)/libnm-util/libnm-util.la \
 	$(top_builddir)/libnm-glib/libnm-glib.la \
-	$(GLIB_LIBS) \
-	$(GMODULE_LIBS) \
-	$(GIO_LIBS)
+	$(GLIB_LIBS)
 
diff --git a/src/settings/plugins/ifcfg-suse/Makefile.in b/src/settings/plugins/ifcfg-suse/Makefile.in
index 90028f85..8832e679 100644
--- a/src/settings/plugins/ifcfg-suse/Makefile.in
+++ b/src/settings/plugins/ifcfg-suse/Makefile.in
@@ -55,16 +55,18 @@ subdir = src/settings/plugins/ifcfg-suse
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/compiler_warnings.m4 \
-	$(top_srcdir)/m4/gettext.m4 $(top_srcdir)/m4/gtk-doc.m4 \
-	$(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/intlmacosx.m4 \
-	$(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/introspection.m4 \
-	$(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \
-	$(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/libnl-check.m4 \
-	$(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \
-	$(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
-	$(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/nls.m4 \
-	$(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/progtest.m4 \
-	$(top_srcdir)/m4/vapigen.m4 $(top_srcdir)/configure.ac
+	$(top_srcdir)/m4/gettext.m4 \
+	$(top_srcdir)/m4/gnome-code-coverage.m4 \
+	$(top_srcdir)/m4/gtk-doc.m4 $(top_srcdir)/m4/iconv.m4 \
+	$(top_srcdir)/m4/intlmacosx.m4 $(top_srcdir)/m4/intltool.m4 \
+	$(top_srcdir)/m4/introspection.m4 $(top_srcdir)/m4/lib-ld.m4 \
+	$(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \
+	$(top_srcdir)/m4/libnl-check.m4 $(top_srcdir)/m4/libtool.m4 \
+	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
+	$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
+	$(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/po.m4 \
+	$(top_srcdir)/m4/progtest.m4 $(top_srcdir)/m4/vapigen.m4 \
+	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(install_sh) -d
@@ -103,8 +105,7 @@ LTLIBRARIES = $(pkglib_LTLIBRARIES)
 am__DEPENDENCIES_1 =
 libnm_settings_plugin_ifcfg_suse_la_DEPENDENCIES =  \
 	$(top_builddir)/libnm-util/libnm-util.la \
-	$(top_builddir)/libnm-glib/libnm-glib.la $(am__DEPENDENCIES_1) \
-	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
+	$(top_builddir)/libnm-glib/libnm-glib.la $(am__DEPENDENCIES_1)
 am_libnm_settings_plugin_ifcfg_suse_la_OBJECTS =  \
 	libnm_settings_plugin_ifcfg_suse_la-plugin.lo
 libnm_settings_plugin_ifcfg_suse_la_OBJECTS =  \
@@ -165,6 +166,10 @@ AWK = @AWK@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
+CKDB_PATH = @CKDB_PATH@
+CODE_COVERAGE_CFLAGS = @CODE_COVERAGE_CFLAGS@
+CODE_COVERAGE_ENABLED = @CODE_COVERAGE_ENABLED@
+CODE_COVERAGE_LDFLAGS = @CODE_COVERAGE_LDFLAGS@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CXX = @CXX@
@@ -179,9 +184,7 @@ DBUS_SYS_DIR = @DBUS_SYS_DIR@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
 DHCLIENT_PATH = @DHCLIENT_PATH@
-DHCLIENT_VERSION = @DHCLIENT_VERSION@
 DHCPCD_PATH = @DHCPCD_PATH@
-DISABLE_DEPRECATED = @DISABLE_DEPRECATED@
 DLLTOOL = @DLLTOOL@
 DSYMUTIL = @DSYMUTIL@
 DUMPBIN = @DUMPBIN@
@@ -191,17 +194,14 @@ ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
 FGREP = @FGREP@
+GENHTML = @GENHTML@
 GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
 GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
-GIO_CFLAGS = @GIO_CFLAGS@
-GIO_LIBS = @GIO_LIBS@
 GLIB_CFLAGS = @GLIB_CFLAGS@
 GLIB_GENMARSHAL = @GLIB_GENMARSHAL@
 GLIB_LIBS = @GLIB_LIBS@
 GLIB_MAKEFILE = @GLIB_MAKEFILE@
 GLIB_MKENUMS = @GLIB_MKENUMS@
-GMODULE_CFLAGS = @GMODULE_CFLAGS@
-GMODULE_LIBS = @GMODULE_LIBS@
 GMSGFMT = @GMSGFMT@
 GMSGFMT_015 = @GMSGFMT_015@
 GNUTLS_CFLAGS = @GNUTLS_CFLAGS@
@@ -242,6 +242,7 @@ IPTABLES_PATH = @IPTABLES_PATH@
 IWMX_SDK_CFLAGS = @IWMX_SDK_CFLAGS@
 IWMX_SDK_LIBS = @IWMX_SDK_LIBS@
 KERNEL_FIRMWARE_DIR = @KERNEL_FIRMWARE_DIR@
+LCOV = @LCOV@
 LD = @LD@
 LDFLAGS = @LDFLAGS@
 LIBDL = @LIBDL@
@@ -258,11 +259,7 @@ LIBNL2_LIBS = @LIBNL2_LIBS@
 LIBNL3_CFLAGS = @LIBNL3_CFLAGS@
 LIBNL3_LIBS = @LIBNL3_LIBS@
 LIBNL_CFLAGS = @LIBNL_CFLAGS@
-LIBNL_GENL3_CFLAGS = @LIBNL_GENL3_CFLAGS@
-LIBNL_GENL3_LIBS = @LIBNL_GENL3_LIBS@
 LIBNL_LIBS = @LIBNL_LIBS@
-LIBNL_ROUTE3_CFLAGS = @LIBNL_ROUTE3_CFLAGS@
-LIBNL_ROUTE3_LIBS = @LIBNL_ROUTE3_LIBS@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
 LIBSOUP_CFLAGS = @LIBSOUP_CFLAGS@
@@ -277,6 +274,8 @@ MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MANIFEST_TOOL = @MANIFEST_TOOL@
 MKDIR_P = @MKDIR_P@
+MM_GLIB_CFLAGS = @MM_GLIB_CFLAGS@
+MM_GLIB_LIBS = @MM_GLIB_LIBS@
 MOC = @MOC@
 MSGFMT = @MSGFMT@
 MSGFMT_015 = @MSGFMT_015@
@@ -286,6 +285,7 @@ NMEDIT = @NMEDIT@
 NM_MAJOR_VERSION = @NM_MAJOR_VERSION@
 NM_MICRO_VERSION = @NM_MICRO_VERSION@
 NM_MINOR_VERSION = @NM_MINOR_VERSION@
+NM_MODIFY_SYSTEM_POLICY = @NM_MODIFY_SYSTEM_POLICY@
 NM_VERSION = @NM_VERSION@
 NSS_CFLAGS = @NSS_CFLAGS@
 NSS_LIBS = @NSS_LIBS@
@@ -312,13 +312,14 @@ PPPD_PLUGIN_DIR = @PPPD_PLUGIN_DIR@
 QT_CFLAGS = @QT_CFLAGS@
 QT_LIBS = @QT_LIBS@
 RANLIB = @RANLIB@
-RESOLVCONF_PATH = @RESOLVCONF_PATH@
 SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
-SYSTEMD_CFLAGS = @SYSTEMD_CFLAGS@
-SYSTEMD_LIBS = @SYSTEMD_LIBS@
+SYSTEMD_INHIBIT_CFLAGS = @SYSTEMD_INHIBIT_CFLAGS@
+SYSTEMD_INHIBIT_LIBS = @SYSTEMD_INHIBIT_LIBS@
+SYSTEMD_LOGIN_CFLAGS = @SYSTEMD_LOGIN_CFLAGS@
+SYSTEMD_LOGIN_LIBS = @SYSTEMD_LOGIN_LIBS@
 SYSTEM_CA_PATH = @SYSTEM_CA_PATH@
 UDEV_BASE_DIR = @UDEV_BASE_DIR@
 USE_NLS = @USE_NLS@
@@ -373,6 +374,11 @@ localedir = @localedir@
 localstatedir = @localstatedir@
 mandir = @mandir@
 mkdir_p = @mkdir_p@
+nmbinary = @nmbinary@
+nmconfdir = @nmconfdir@
+nmdatadir = @nmdatadir@
+nmrundir = @nmrundir@
+nmstatedir = @nmstatedir@
 oldincludedir = @oldincludedir@
 pdfdir = @pdfdir@
 prefix = @prefix@
@@ -387,6 +393,10 @@ target_alias = @target_alias@
 top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
+with_dhclient = @with_dhclient@
+with_dhcpcd = @with_dhcpcd@
+with_netconfig = @with_netconfig@
+with_resolvconf = @with_resolvconf@
 pkglib_LTLIBRARIES = libnm-settings-plugin-ifcfg-suse.la
 libnm_settings_plugin_ifcfg_suse_la_SOURCES = \
 	plugin.c \
@@ -394,11 +404,10 @@ libnm_settings_plugin_ifcfg_suse_la_SOURCES = \
 
 libnm_settings_plugin_ifcfg_suse_la_CPPFLAGS = \
 	$(GLIB_CFLAGS) \
-	$(GMODULE_CFLAGS) \
 	$(DBUS_CFLAGS) \
-	-DG_DISABLE_DEPRECATED \
 	-I${top_srcdir}/src/settings \
 	-I$(top_srcdir)/include \
+	-I$(top_builddir)/include \
 	-I$(top_srcdir)/libnm-util \
 	-I$(top_srcdir)/libnm-glib \
 	-DSYSCONFDIR=\"$(sysconfdir)\"
@@ -407,9 +416,7 @@ libnm_settings_plugin_ifcfg_suse_la_LDFLAGS = -module -avoid-version
 libnm_settings_plugin_ifcfg_suse_la_LIBADD = \
 	$(top_builddir)/libnm-util/libnm-util.la \
 	$(top_builddir)/libnm-glib/libnm-glib.la \
-	$(GLIB_LIBS) \
-	$(GMODULE_LIBS) \
-	$(GIO_LIBS)
+	$(GLIB_LIBS)
 
 all: all-am
 
@@ -489,25 +496,22 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libnm_settings_plugin_ifcfg_suse_la-plugin.Plo@am__quote@
 
 .c.o:
-@am__fastdepCC_TRUE@	$(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\
-@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
-@am__fastdepCC_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.Po
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $<
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c $<
 
 .c.obj:
-@am__fastdepCC_TRUE@	$(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.obj$$||'`;\
-@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ `$(CYGPATH_W) '$<'` &&\
-@am__fastdepCC_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.Po
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c `$(CYGPATH_W) '$<'`
 
 .c.lo:
-@am__fastdepCC_TRUE@	$(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.lo$$||'`;\
-@am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
-@am__fastdepCC_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.Plo
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $<
diff --git a/src/settings/plugins/ifnet/Makefile.am b/src/settings/plugins/ifnet/Makefile.am
index 07a2fc88..9aaa06f8 100644
--- a/src/settings/plugins/ifnet/Makefile.am
+++ b/src/settings/plugins/ifnet/Makefile.am
@@ -1,10 +1,13 @@
 SUBDIRS = . tests
+
 INCLUDES = \
 	-I$(top_srcdir)/src/wifi \
 	-I$(top_srcdir)/src/settings \
 	-I$(top_srcdir)/include \
+	-I$(top_builddir)/include \
 	-I$(top_srcdir)/libnm-glib \
-	-I$(top_srcdir)/libnm-util
+	-I$(top_srcdir)/libnm-util \
+	-I$(top_builddir)/libnm-util
 
 pkglib_LTLIBRARIES = libnm-settings-plugin-ifnet.la
 
@@ -18,10 +21,8 @@ libnm_settings_plugin_ifnet_la_SOURCES = \
 
 libnm_settings_plugin_ifnet_la_CPPFLAGS = \
 	$(GLIB_CFLAGS) \
-	$(GMODULE_CFLAGS) \
 	$(DBUS_CFLAGS) \
 	$(GUDEV_CFLAGS) \
-	-DG_DISABLE_DEPRECATED \
 	-DSYSCONFDIR=\"$(sysconfdir)\"
 
 libnm_settings_plugin_ifnet_la_LDFLAGS = -module -avoid-version
@@ -31,9 +32,7 @@ libnm_settings_plugin_ifnet_la_LIBADD = \
 	$(top_builddir)/libnm-glib/libnm-glib.la \
 	lib-ifnet-io.la\
 	$(GLIB_LIBS) \
-	$(GMODULE_LIBS) \
-	$(GUDEV_LIBS) \
-	$(GIO_LIBS)
+	$(GUDEV_LIBS)
 
 lib_ifnet_io_la_SOURCES = \
 	net_parser.c\
@@ -48,12 +47,10 @@ lib_ifnet_io_la_SOURCES = \
 lib_ifnet_io_la_CPPFLAGS = \
 	$(GLIB_CFLAGS) \
 	$(DBUS_CFLAGS) \
-	-DG_DISABLE_DEPRECATED \
 	-DSYSCONFDIR=\"$(sysconfdir)\" \
 	-DSBINDIR=\"$(sbindir)\"
 
 lib_ifnet_io_la_LIBADD = \
 	 $(top_builddir)/src/wifi/libwifi-utils.la \
 	 $(top_builddir)/libnm-util/libnm-util.la \
-	 $(GLIB_LIBS)\
-	 $(GIO_LIBS)
+	 $(GLIB_LIBS)
diff --git a/src/settings/plugins/ifnet/Makefile.in b/src/settings/plugins/ifnet/Makefile.in
index e351a6ed..6cdf335d 100644
--- a/src/settings/plugins/ifnet/Makefile.in
+++ b/src/settings/plugins/ifnet/Makefile.in
@@ -55,16 +55,18 @@ subdir = src/settings/plugins/ifnet
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/compiler_warnings.m4 \
-	$(top_srcdir)/m4/gettext.m4 $(top_srcdir)/m4/gtk-doc.m4 \
-	$(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/intlmacosx.m4 \
-	$(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/introspection.m4 \
-	$(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \
-	$(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/libnl-check.m4 \
-	$(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \
-	$(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
-	$(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/nls.m4 \
-	$(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/progtest.m4 \
-	$(top_srcdir)/m4/vapigen.m4 $(top_srcdir)/configure.ac
+	$(top_srcdir)/m4/gettext.m4 \
+	$(top_srcdir)/m4/gnome-code-coverage.m4 \
+	$(top_srcdir)/m4/gtk-doc.m4 $(top_srcdir)/m4/iconv.m4 \
+	$(top_srcdir)/m4/intlmacosx.m4 $(top_srcdir)/m4/intltool.m4 \
+	$(top_srcdir)/m4/introspection.m4 $(top_srcdir)/m4/lib-ld.m4 \
+	$(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \
+	$(top_srcdir)/m4/libnl-check.m4 $(top_srcdir)/m4/libtool.m4 \
+	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
+	$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
+	$(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/po.m4 \
+	$(top_srcdir)/m4/progtest.m4 $(top_srcdir)/m4/vapigen.m4 \
+	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(install_sh) -d
@@ -103,8 +105,7 @@ LTLIBRARIES = $(noinst_LTLIBRARIES) $(pkglib_LTLIBRARIES)
 am__DEPENDENCIES_1 =
 lib_ifnet_io_la_DEPENDENCIES =  \
 	$(top_builddir)/src/wifi/libwifi-utils.la \
-	$(top_builddir)/libnm-util/libnm-util.la $(am__DEPENDENCIES_1) \
-	$(am__DEPENDENCIES_1)
+	$(top_builddir)/libnm-util/libnm-util.la $(am__DEPENDENCIES_1)
 am_lib_ifnet_io_la_OBJECTS = lib_ifnet_io_la-net_parser.lo \
 	lib_ifnet_io_la-connection_parser.lo \
 	lib_ifnet_io_la-net_utils.lo lib_ifnet_io_la-wpa_parser.lo
@@ -115,7 +116,6 @@ am__v_lt_0 = --silent
 libnm_settings_plugin_ifnet_la_DEPENDENCIES =  \
 	$(top_builddir)/libnm-util/libnm-util.la \
 	$(top_builddir)/libnm-glib/libnm-glib.la lib-ifnet-io.la \
-	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
 	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
 am_libnm_settings_plugin_ifnet_la_OBJECTS =  \
 	libnm_settings_plugin_ifnet_la-nm-ifnet-connection.lo \
@@ -214,6 +214,10 @@ AWK = @AWK@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
+CKDB_PATH = @CKDB_PATH@
+CODE_COVERAGE_CFLAGS = @CODE_COVERAGE_CFLAGS@
+CODE_COVERAGE_ENABLED = @CODE_COVERAGE_ENABLED@
+CODE_COVERAGE_LDFLAGS = @CODE_COVERAGE_LDFLAGS@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CXX = @CXX@
@@ -228,9 +232,7 @@ DBUS_SYS_DIR = @DBUS_SYS_DIR@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
 DHCLIENT_PATH = @DHCLIENT_PATH@
-DHCLIENT_VERSION = @DHCLIENT_VERSION@
 DHCPCD_PATH = @DHCPCD_PATH@
-DISABLE_DEPRECATED = @DISABLE_DEPRECATED@
 DLLTOOL = @DLLTOOL@
 DSYMUTIL = @DSYMUTIL@
 DUMPBIN = @DUMPBIN@
@@ -240,17 +242,14 @@ ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
 FGREP = @FGREP@
+GENHTML = @GENHTML@
 GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
 GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
-GIO_CFLAGS = @GIO_CFLAGS@
-GIO_LIBS = @GIO_LIBS@
 GLIB_CFLAGS = @GLIB_CFLAGS@
 GLIB_GENMARSHAL = @GLIB_GENMARSHAL@
 GLIB_LIBS = @GLIB_LIBS@
 GLIB_MAKEFILE = @GLIB_MAKEFILE@
 GLIB_MKENUMS = @GLIB_MKENUMS@
-GMODULE_CFLAGS = @GMODULE_CFLAGS@
-GMODULE_LIBS = @GMODULE_LIBS@
 GMSGFMT = @GMSGFMT@
 GMSGFMT_015 = @GMSGFMT_015@
 GNUTLS_CFLAGS = @GNUTLS_CFLAGS@
@@ -291,6 +290,7 @@ IPTABLES_PATH = @IPTABLES_PATH@
 IWMX_SDK_CFLAGS = @IWMX_SDK_CFLAGS@
 IWMX_SDK_LIBS = @IWMX_SDK_LIBS@
 KERNEL_FIRMWARE_DIR = @KERNEL_FIRMWARE_DIR@
+LCOV = @LCOV@
 LD = @LD@
 LDFLAGS = @LDFLAGS@
 LIBDL = @LIBDL@
@@ -307,11 +307,7 @@ LIBNL2_LIBS = @LIBNL2_LIBS@
 LIBNL3_CFLAGS = @LIBNL3_CFLAGS@
 LIBNL3_LIBS = @LIBNL3_LIBS@
 LIBNL_CFLAGS = @LIBNL_CFLAGS@
-LIBNL_GENL3_CFLAGS = @LIBNL_GENL3_CFLAGS@
-LIBNL_GENL3_LIBS = @LIBNL_GENL3_LIBS@
 LIBNL_LIBS = @LIBNL_LIBS@
-LIBNL_ROUTE3_CFLAGS = @LIBNL_ROUTE3_CFLAGS@
-LIBNL_ROUTE3_LIBS = @LIBNL_ROUTE3_LIBS@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
 LIBSOUP_CFLAGS = @LIBSOUP_CFLAGS@
@@ -326,6 +322,8 @@ MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MANIFEST_TOOL = @MANIFEST_TOOL@
 MKDIR_P = @MKDIR_P@
+MM_GLIB_CFLAGS = @MM_GLIB_CFLAGS@
+MM_GLIB_LIBS = @MM_GLIB_LIBS@
 MOC = @MOC@
 MSGFMT = @MSGFMT@
 MSGFMT_015 = @MSGFMT_015@
@@ -335,6 +333,7 @@ NMEDIT = @NMEDIT@
 NM_MAJOR_VERSION = @NM_MAJOR_VERSION@
 NM_MICRO_VERSION = @NM_MICRO_VERSION@
 NM_MINOR_VERSION = @NM_MINOR_VERSION@
+NM_MODIFY_SYSTEM_POLICY = @NM_MODIFY_SYSTEM_POLICY@
 NM_VERSION = @NM_VERSION@
 NSS_CFLAGS = @NSS_CFLAGS@
 NSS_LIBS = @NSS_LIBS@
@@ -361,13 +360,14 @@ PPPD_PLUGIN_DIR = @PPPD_PLUGIN_DIR@
 QT_CFLAGS = @QT_CFLAGS@
 QT_LIBS = @QT_LIBS@
 RANLIB = @RANLIB@
-RESOLVCONF_PATH = @RESOLVCONF_PATH@
 SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
-SYSTEMD_CFLAGS = @SYSTEMD_CFLAGS@
-SYSTEMD_LIBS = @SYSTEMD_LIBS@
+SYSTEMD_INHIBIT_CFLAGS = @SYSTEMD_INHIBIT_CFLAGS@
+SYSTEMD_INHIBIT_LIBS = @SYSTEMD_INHIBIT_LIBS@
+SYSTEMD_LOGIN_CFLAGS = @SYSTEMD_LOGIN_CFLAGS@
+SYSTEMD_LOGIN_LIBS = @SYSTEMD_LOGIN_LIBS@
 SYSTEM_CA_PATH = @SYSTEM_CA_PATH@
 UDEV_BASE_DIR = @UDEV_BASE_DIR@
 USE_NLS = @USE_NLS@
@@ -422,6 +422,11 @@ localedir = @localedir@
 localstatedir = @localstatedir@
 mandir = @mandir@
 mkdir_p = @mkdir_p@
+nmbinary = @nmbinary@
+nmconfdir = @nmconfdir@
+nmdatadir = @nmdatadir@
+nmrundir = @nmrundir@
+nmstatedir = @nmstatedir@
 oldincludedir = @oldincludedir@
 pdfdir = @pdfdir@
 prefix = @prefix@
@@ -436,13 +441,19 @@ target_alias = @target_alias@
 top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
+with_dhclient = @with_dhclient@
+with_dhcpcd = @with_dhcpcd@
+with_netconfig = @with_netconfig@
+with_resolvconf = @with_resolvconf@
 SUBDIRS = . tests
 INCLUDES = \
 	-I$(top_srcdir)/src/wifi \
 	-I$(top_srcdir)/src/settings \
 	-I$(top_srcdir)/include \
+	-I$(top_builddir)/include \
 	-I$(top_srcdir)/libnm-glib \
-	-I$(top_srcdir)/libnm-util
+	-I$(top_srcdir)/libnm-util \
+	-I$(top_builddir)/libnm-util
 
 pkglib_LTLIBRARIES = libnm-settings-plugin-ifnet.la
 noinst_LTLIBRARIES = lib-ifnet-io.la
@@ -454,10 +465,8 @@ libnm_settings_plugin_ifnet_la_SOURCES = \
 
 libnm_settings_plugin_ifnet_la_CPPFLAGS = \
 	$(GLIB_CFLAGS) \
-	$(GMODULE_CFLAGS) \
 	$(DBUS_CFLAGS) \
 	$(GUDEV_CFLAGS) \
-	-DG_DISABLE_DEPRECATED \
 	-DSYSCONFDIR=\"$(sysconfdir)\"
 
 libnm_settings_plugin_ifnet_la_LDFLAGS = -module -avoid-version
@@ -466,9 +475,7 @@ libnm_settings_plugin_ifnet_la_LIBADD = \
 	$(top_builddir)/libnm-glib/libnm-glib.la \
 	lib-ifnet-io.la\
 	$(GLIB_LIBS) \
-	$(GMODULE_LIBS) \
-	$(GUDEV_LIBS) \
-	$(GIO_LIBS)
+	$(GUDEV_LIBS)
 
 lib_ifnet_io_la_SOURCES = \
 	net_parser.c\
@@ -483,15 +490,13 @@ lib_ifnet_io_la_SOURCES = \
 lib_ifnet_io_la_CPPFLAGS = \
 	$(GLIB_CFLAGS) \
 	$(DBUS_CFLAGS) \
-	-DG_DISABLE_DEPRECATED \
 	-DSYSCONFDIR=\"$(sysconfdir)\" \
 	-DSBINDIR=\"$(sbindir)\"
 
 lib_ifnet_io_la_LIBADD = \
 	 $(top_builddir)/src/wifi/libwifi-utils.la \
 	 $(top_builddir)/libnm-util/libnm-util.la \
-	 $(GLIB_LIBS)\
-	 $(GIO_LIBS)
+	 $(GLIB_LIBS)
 
 all: all-recursive
 
@@ -587,25 +592,22 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libnm_settings_plugin_ifnet_la-plugin.Plo@am__quote@
 
 .c.o:
-@am__fastdepCC_TRUE@	$(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\
-@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
-@am__fastdepCC_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.Po
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $<
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c $<
 
 .c.obj:
-@am__fastdepCC_TRUE@	$(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.obj$$||'`;\
-@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ `$(CYGPATH_W) '$<'` &&\
-@am__fastdepCC_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.Po
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c `$(CYGPATH_W) '$<'`
 
 .c.lo:
-@am__fastdepCC_TRUE@	$(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.lo$$||'`;\
-@am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
-@am__fastdepCC_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.Plo
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $<
diff --git a/src/settings/plugins/ifnet/connection_parser.c b/src/settings/plugins/ifnet/connection_parser.c
index 78812f97..c85b5c4b 100644
--- a/src/settings/plugins/ifnet/connection_parser.c
+++ b/src/settings/plugins/ifnet/connection_parser.c
@@ -26,7 +26,6 @@
 #include 
 #include 
 #include 
-#include 
 #include 
 
 #include 
@@ -76,24 +75,28 @@ static gboolean eap_simple_reader (const char *eap_method,
                                    const char *ssid,
                                    NMSetting8021x *s_8021x,
                                    gboolean phase2,
+                                   const char *basepath,
                                    GError **error);
 
 static gboolean eap_tls_reader (const char *eap_method,
                                 const char *ssid,
                                 NMSetting8021x *s_8021x,
                                 gboolean phase2,
+                                const char *basepath,
                                 GError **error);
 
 static gboolean eap_peap_reader (const char *eap_method,
                                  const char *ssid,
                                  NMSetting8021x *s_8021x,
                                  gboolean phase2,
+                                 const char *basepath,
                                  GError **error);
 
 static gboolean eap_ttls_reader (const char *eap_method,
                                  const char *ssid,
                                  NMSetting8021x *s_8021x,
                                  gboolean phase2,
+                                 const char *basepath,
                                  GError **error);
 
 typedef struct {
@@ -102,6 +105,7 @@ typedef struct {
 	                     const char *ssid,
 	                     NMSetting8021x *s_8021x,
 	                     gboolean phase2,
+	                     const char *basepath,
 	                     GError **error);
 	gboolean wifi_phase2_only;
 } EAPReader;
@@ -125,6 +129,7 @@ eap_simple_reader (const char *eap_method,
                    const char *ssid,
                    NMSetting8021x *s_8021x,
                    gboolean phase2,
+                   const char *basepath,
                    GError **error)
 {
 	const char *value;
@@ -153,17 +158,30 @@ eap_simple_reader (const char *eap_method,
 	return TRUE;
 }
 
+static char *
+get_cert (const char *ssid, const char *key, const char *basepath)
+{
+	const char *orig;
+
+	/* If it's a relative path, convert to absolute using 'basepath' */
+	orig = wpa_get_value (ssid, key);
+	if (g_path_is_absolute (orig))
+		return g_strdup (orig);
+	return g_strdup_printf ("%s/%s", basepath, orig);
+}
+
 static gboolean
 eap_tls_reader (const char *eap_method,
                 const char *ssid,
                 NMSetting8021x *s_8021x,
                 gboolean phase2,
+                const char *basepath,
                 GError **error)
 {
 	const char *value;
-	const char *ca_cert = NULL;
-	const char *client_cert = NULL;
-	const char *privkey = NULL;
+	char *ca_cert = NULL;
+	char *client_cert = NULL;
+	char *privkey = NULL;
 	const char *privkey_password = NULL;
 	gboolean success = FALSE;
 	NMSetting8021xCKFormat privkey_format = NM_SETTING_802_1X_CK_FORMAT_UNKNOWN;
@@ -179,7 +197,7 @@ eap_tls_reader (const char *eap_method,
 	g_object_set (s_8021x, NM_SETTING_802_1X_IDENTITY, value, NULL);
 
 	/* ca cert */
-	ca_cert = wpa_get_value (ssid, phase2 ? "ca_cert2" : "ca_cert");
+	ca_cert = get_cert (ssid, phase2 ? "ca_cert2" : "ca_cert", basepath);
 	if (ca_cert) {
 		if (phase2) {
 			if (!nm_setting_802_1x_set_phase2_ca_cert (s_8021x,
@@ -216,7 +234,7 @@ eap_tls_reader (const char *eap_method,
 	}
 
 	/* The private key itself */
-	privkey = wpa_get_value (ssid, phase2 ? "private_key2" : "private_key");
+	privkey = get_cert (ssid, phase2 ? "private_key2" : "private_key", basepath);
 	if (!privkey) {
 		g_set_error (error, ifnet_plugin_error_quark (), 0,
 			     "Missing %s for EAP method '%s'.",
@@ -249,9 +267,7 @@ eap_tls_reader (const char *eap_method,
 	 */
 	if (privkey_format == NM_SETTING_802_1X_CK_FORMAT_RAW_KEY
 	    || privkey_format == NM_SETTING_802_1X_CK_FORMAT_X509) {
-		client_cert = wpa_get_value (ssid,
-					     phase2 ? "client_cert2" :
-					     "client_cert");
+		client_cert = get_cert (ssid, phase2 ? "client_cert2" : "client_cert", basepath);
 		if (!client_cert) {
 			g_set_error (error, ifnet_plugin_error_quark (), 0,
 				     "Missing %s for EAP method '%s'.",
@@ -279,6 +295,9 @@ eap_tls_reader (const char *eap_method,
 	success = TRUE;
 
 done:
+	g_free (ca_cert);
+	g_free (client_cert);
+	g_free (privkey);
 	return success;
 }
 
@@ -287,15 +306,16 @@ eap_peap_reader (const char *eap_method,
                  const char *ssid,
                  NMSetting8021x *s_8021x,
                  gboolean phase2,
+                 const char *basepath,
                  GError **error)
 {
-	const char *ca_cert = NULL;
+	char *ca_cert = NULL;
 	const char *inner_auth = NULL;
 	const char *peapver = NULL;
 	char **list = NULL, **iter, *lower;
 	gboolean success = FALSE;
 
-	ca_cert = wpa_get_value (ssid, "ca_cert");
+	ca_cert = get_cert (ssid, "ca_cert", basepath);
 	if (ca_cert) {
 		if (!nm_setting_802_1x_set_ca_cert (s_8021x,
 						    ca_cert,
@@ -347,11 +367,10 @@ eap_peap_reader (const char *eap_method,
 		if (!(pos = strstr (*iter, "MSCHAPV2"))
 		    || !(pos = strstr (*iter, "MD5"))
 		    || !(pos = strstr (*iter, "GTC"))) {
-			if (!eap_simple_reader
-			    (pos, ssid, s_8021x, TRUE, error))
+			if (!eap_simple_reader (pos, ssid, s_8021x, TRUE, basepath, error))
 				goto done;
 		} else if (!(pos = strstr (*iter, "TLS"))) {
-			if (!eap_tls_reader (pos, ssid, s_8021x, TRUE, error))
+			if (!eap_tls_reader (pos, ssid, s_8021x, TRUE, basepath, error))
 				goto done;
 		} else {
 			g_set_error (error, ifnet_plugin_error_quark (), 0,
@@ -378,6 +397,7 @@ eap_peap_reader (const char *eap_method,
 	success = TRUE;
 
 done:
+	g_free (ca_cert);
 	if (list)
 		g_strfreev (list);
 	return success;
@@ -388,16 +408,17 @@ eap_ttls_reader (const char *eap_method,
                  const char *ssid,
                  NMSetting8021x *s_8021x,
                  gboolean phase2,
+                 const char *basepath,
                  GError **error)
 {
 	gboolean success = FALSE;
 	const char *anon_ident = NULL;
-	const char *ca_cert = NULL;
+	char *ca_cert = NULL;
 	const char *tmp;
 	char **list = NULL, **iter, *inner_auth = NULL;
 
 	/* ca cert */
-	ca_cert = wpa_get_value (ssid, "ca_cert");
+	ca_cert = get_cert (ssid, "ca_cert", basepath);
 	if (ca_cert) {
 		if (!nm_setting_802_1x_set_ca_cert (s_8021x,
 						    ca_cert,
@@ -435,20 +456,18 @@ eap_ttls_reader (const char *eap_method,
 		    || (pos = strstr (*iter, "mschap")) != NULL
 		    || (pos = strstr (*iter, "pap")) != NULL
 		    || (pos = strstr (*iter, "chap")) != NULL) {
-			if (!eap_simple_reader
-			    (pos, ssid, s_8021x, TRUE, error))
+			if (!eap_simple_reader (pos, ssid, s_8021x, TRUE, basepath, error))
 				goto done;
 			g_object_set (s_8021x, NM_SETTING_802_1X_PHASE2_AUTH,
 				      pos, NULL);
 		} else if ((pos = strstr (*iter, "tls")) != NULL) {
-			if (!eap_tls_reader (pos, ssid, s_8021x, TRUE, error))
+			if (!eap_tls_reader (pos, ssid, s_8021x, TRUE, basepath, error))
 				goto done;
 			g_object_set (s_8021x, NM_SETTING_802_1X_PHASE2_AUTHEAP,
 				      "tls", NULL);
 		} else if ((pos = strstr (*iter, "mschapv2")) != NULL
 			   || (pos = strstr (*iter, "md5")) != NULL) {
-			if (!eap_simple_reader
-			    (pos, ssid, s_8021x, TRUE, error)) {
+			if (!eap_simple_reader (pos, ssid, s_8021x, TRUE, basepath, error)) {
 				PLUGIN_WARN (IFNET_PLUGIN_NAME, "SIMPLE ERROR");
 				goto done;
 			}
@@ -465,6 +484,7 @@ eap_ttls_reader (const char *eap_method,
 
 	success = TRUE;
 done:
+	g_free (ca_cert);
 	if (list)
 		g_strfreev (list);
 	g_free (inner_auth);
@@ -1386,6 +1406,7 @@ static NMSetting8021x *
 fill_8021x (const char *ssid,
             const char *key_mgmt,
             gboolean wifi,
+            const char *basepath,
             GError **error)
 {
 	NMSetting8021x *s_8021x;
@@ -1427,8 +1448,7 @@ fill_8021x (const char *ssid,
 			}
 
 			/* Parse EAP method specific options */
-			if (!(*eap->reader)
-			    (lower, ssid, s_8021x, FALSE, error)) {
+			if (!(*eap->reader) (lower, ssid, s_8021x, FALSE, basepath, error)) {
 				g_free (lower);
 				goto error;
 			}
@@ -1463,6 +1483,7 @@ error:
 
 static NMSettingWirelessSecurity *
 make_wpa_setting (const char *ssid,
+                  const char *basepath,
                   NMSetting8021x **s_8021x,
                   GError **error)
 {
@@ -1477,8 +1498,7 @@ make_wpa_setting (const char *ssid,
 		return NULL;
 	}
 
-	wsec =
-	    NM_SETTING_WIRELESS_SECURITY (nm_setting_wireless_security_new ());
+	wsec = NM_SETTING_WIRELESS_SECURITY (nm_setting_wireless_security_new ());
 
 	/* mode=1: adhoc
 	 * mode=0: infrastructure */
@@ -1530,7 +1550,7 @@ make_wpa_setting (const char *ssid,
 				     value);
 			goto error;
 		}
-		*s_8021x = fill_8021x (ssid, value, TRUE, error);
+		*s_8021x = fill_8021x (ssid, value, TRUE, basepath, error);
 		if (!*s_8021x)
 			goto error;
 
@@ -1552,6 +1572,7 @@ error:
 
 static NMSettingWirelessSecurity *
 make_wireless_security_setting (const char *conn_name,
+                                const char *basepath,
                                 NMSetting8021x **s_8021x,
                                 GError ** error)
 {
@@ -1579,7 +1600,7 @@ make_wireless_security_setting (const char *conn_name,
 			goto error;
 	}
 	if (!wsec) {
-		wsec = make_wpa_setting (ssid, s_8021x, error);
+		wsec = make_wpa_setting (ssid, basepath, s_8021x, error);
 		if (error && *error)
 			goto error;
 	}
@@ -1636,7 +1657,9 @@ make_pppoe_connection_setting (NMConnection *connection,
 }
 
 NMConnection *
-ifnet_update_connection_from_config_block (const char *conn_name, GError **error)
+ifnet_update_connection_from_config_block (const char *conn_name,
+                                           const char *basepath,
+                                           GError **error)
 {
 	const gchar *type = NULL;
 	NMConnection *connection = NULL;
@@ -1700,7 +1723,7 @@ ifnet_update_connection_from_config_block (const char *conn_name, GError **error
 		}
 
 		/* wireless security setting */
-		wsec = make_wireless_security_setting (conn_name, &s_8021x, error);
+		wsec = make_wireless_security_setting (conn_name, basepath, &s_8021x, error);
 		if (wsec) {
 			nm_connection_add_setting (connection,
 						   NM_SETTING (wsec));
@@ -2291,7 +2314,7 @@ write_wireless_setting (NMConnection *connection,
 	 * support these characters, see bug #356337)
 	 */
 	for (i = 0; i < ssid->len; i++) {
-		if (!isalnum (ssid->data[i])) {
+		if (!g_ascii_isalnum (ssid->data[i])) {
 			hex_ssid = TRUE;
 			break;
 		}
@@ -2785,6 +2808,7 @@ ifnet_update_parsers_by_connection (NMConnection *connection,
                                     const char *config_file,
                                     const char *wpa_file,
                                     gchar **out_new_name,
+                                    gchar **out_backup,
                                     GError **error)
 {
 	NMSettingConnection *s_con;
@@ -2868,7 +2892,7 @@ ifnet_update_parsers_by_connection (NMConnection *connection,
 	/* connection id will be displayed in nm-applet */
 	update_connection_id (connection, conn_name);
 
-	success = ifnet_flush_to_file (config_file);
+	success = ifnet_flush_to_file (config_file, out_backup);
 	if (success)
 		wpa_flush_to_file (wpa_file);
 
@@ -2882,12 +2906,13 @@ out:
 gboolean
 ifnet_delete_connection_in_parsers (const char *conn_name,
                                     const char *config_file,
-                                    const char *wpa_file)
+                                    const char *wpa_file,
+                                    gchar **out_backup)
 {
 	gboolean result = FALSE;
 
 	ifnet_delete_network (conn_name);
-	result = ifnet_flush_to_file (config_file);
+	result = ifnet_flush_to_file (config_file, out_backup);
 	if (result) {
 		/* connection may not have security information
 		 * so simply ignore the return value*/
@@ -2953,7 +2978,7 @@ get_wireless_name (NMConnection * connection)
 	}
 
 	for (i = 0; i < ssid->len; i++) {
-		if (!isprint (ssid->data[i])) {
+		if (!g_ascii_isprint (ssid->data[i])) {
 			hex_ssid = TRUE;
 			break;
 		}
@@ -2982,6 +3007,7 @@ char *
 ifnet_add_new_connection (NMConnection *connection,
                           const char *config_file,
                           const char *wpa_file,
+                          gchar **out_backup,
                           GError **error)
 {
 	NMSettingConnection *s_con;
@@ -3025,6 +3051,7 @@ ifnet_add_new_connection (NMConnection *connection,
 		                                              config_file,
 		                                              wpa_file,
 		                                              NULL,
+		                                              out_backup,
 		                                              error);
 	}
 
diff --git a/src/settings/plugins/ifnet/connection_parser.h b/src/settings/plugins/ifnet/connection_parser.h
index b617b605..e8596a64 100644
--- a/src/settings/plugins/ifnet/connection_parser.h
+++ b/src/settings/plugins/ifnet/connection_parser.h
@@ -25,6 +25,7 @@
 #include "net_parser.h"
 
 NMConnection *ifnet_update_connection_from_config_block (const char *conn_name,
+                                                         const char *basepath,
                                                          GError **error);
 
 /* nm_conn_name is used to update nm_ifnet_connection's priv data */
@@ -33,14 +34,17 @@ gboolean ifnet_update_parsers_by_connection (NMConnection *connection,
                                              const char *config_file,
                                              const char *wpa_file,
                                              gchar **out_new_name,
+                                             gchar **out_backup,
                                              GError **error);
 
 gboolean ifnet_delete_connection_in_parsers (const char *conn_name,
                                              const char *config_file,
-                                             const char *wpa_file);
+                                             const char *wpa_file,
+                                             gchar **out_backup);
 
 char * ifnet_add_new_connection (NMConnection *connection,
                                  const char *config_file,
                                  const char *wpa_file,
+                                 gchar **out_backup,
                                  GError ** error);
 #endif
diff --git a/src/settings/plugins/ifnet/net_parser.c b/src/settings/plugins/ifnet/net_parser.c
index 2562e613..f37366af 100644
--- a/src/settings/plugins/ifnet/net_parser.c
+++ b/src/settings/plugins/ifnet/net_parser.c
@@ -590,7 +590,7 @@ done:
 }
 
 gboolean
-ifnet_flush_to_file (const char *config_file)
+ifnet_flush_to_file (const char *config_file, gchar **out_backup)
 {
 	GIOChannel *channel;
 	GError **error = NULL;
@@ -600,18 +600,20 @@ ifnet_flush_to_file (const char *config_file)
 	gchar *out_line = NULL;
 	gsize bytes_written;
 	gboolean result = FALSE;
+	gchar *backup;
 
 	if (!net_parser_data_changed)
 		return TRUE;
 	if (!conn_table || !global_settings_table)
 		return FALSE;
 
-	backup_file (config_file);
+	backup = backup_file (config_file);
 
 	channel = g_io_channel_new_file (config_file, "w", NULL);
 	if (!channel) {
 		PLUGIN_WARN (IFNET_PLUGIN_NAME,
 			     "Can't open file %s for writing", config_file);
+		g_free (backup);
 		return FALSE;
 	}
 	g_hash_table_iter_init (&iter, global_settings_table);
@@ -714,7 +716,13 @@ ifnet_flush_to_file (const char *config_file)
 	}
 	result = TRUE;
 	net_parser_data_changed = FALSE;
+
 done:
+	if (result && out_backup)
+		*out_backup = backup;
+	else
+		g_free (backup);
+
 	g_io_channel_shutdown (channel, FALSE, NULL);
 	g_io_channel_unref (channel);
 	return result;
diff --git a/src/settings/plugins/ifnet/net_parser.h b/src/settings/plugins/ifnet/net_parser.h
index 5dcc7e25..47086c76 100644
--- a/src/settings/plugins/ifnet/net_parser.h
+++ b/src/settings/plugins/ifnet/net_parser.h
@@ -25,7 +25,6 @@
 #include 
 
 #define CONF_NET_FILE SYSCONFDIR "/conf.d/net"
-#define IFNET_SYSTEM_SETTINGS_KEY_FILE SYSCONFDIR "/NetworkManager/nm-system-settings.conf"
 #define IFNET_KEY_FILE_GROUP "ifnet"
 
 gboolean ifnet_init (gchar * config_file);
@@ -39,7 +38,7 @@ const char *ifnet_get_global_setting (const char *group, const char *key);
 gboolean ifnet_has_network (const char *conn_name);
 
 /* Writer functions */
-gboolean ifnet_flush_to_file (const char *config_file);
+gboolean ifnet_flush_to_file (const char *config_file, gchar **out_backup);
 void ifnet_set_data (const char *conn_name, const char *key, const char *value);
 gboolean ifnet_add_network (const char *name, const char *type);
 gboolean ifnet_delete_network (const char *conn_name);
diff --git a/src/settings/plugins/ifnet/net_utils.c b/src/settings/plugins/ifnet/net_utils.c
index d613db6a..17eb1677 100644
--- a/src/settings/plugins/ifnet/net_utils.c
+++ b/src/settings/plugins/ifnet/net_utils.c
@@ -22,7 +22,6 @@
 #include 
 #include 
 #include 
-#include 
 #include 
 #include 
 #include 
@@ -67,7 +66,7 @@ is_hex (const char *value)
 	if (!p)
 		return FALSE;
 	while (*p) {
-		if (!isxdigit (*p++))
+		if (!g_ascii_isxdigit (*p++))
 			return FALSE;
 	}
 	return TRUE;
@@ -79,7 +78,7 @@ is_ascii (const char *value)
 	const char *p = value;
 
 	while (*p) {
-		if (!isascii (*p++))
+		if (!g_ascii_isprint (*p++))
 			return FALSE;
 	}
 	return TRUE;
@@ -254,7 +253,7 @@ read_hostname (const char *path)
 }
 
 gboolean
-write_hostname (const gchar *hostname, const char *path)
+write_hostname (const char *path, const gchar *hostname)
 {
 	gboolean result;
 	char *contents;
@@ -462,7 +461,7 @@ create_ip4_block (gchar * ip)
 		iblock->ip = tmp_ip4_addr.s_addr;
 		prefix = ip_mask[1];
 		i = 0;
-		while (i < length && isdigit (prefix[i]))
+		while (i < length && g_ascii_isdigit (prefix[i]))
 			i++;
 		prefix[i] = '\0';
 		iblock->netmask = nm_utils_ip4_prefix_to_netmask ((guint32)
@@ -951,7 +950,7 @@ get_dhcp_hostname_and_client_id (char **hostname, char **client_id)
 	g_free (contents);
 }
 
-void backup_file (const gchar* target)
+gchar *backup_file (const gchar* target)
 {
 	GFile *source, *backup;
 	gchar* backup_path;
@@ -962,8 +961,11 @@ void backup_file (const gchar* target)
 	backup = g_file_new_for_path (backup_path);
 
 	g_file_copy (source, backup, G_FILE_COPY_OVERWRITE, NULL, NULL, NULL, error);
-	if (error && *error)
+	if (error && *error) {
 		PLUGIN_WARN (IFNET_PLUGIN_NAME, "Backup failed: %s", (*error)->message);
+		g_free (backup_path);
+		backup_path = NULL;
+	}
 
-	g_free (backup_path);
+	return backup_path;
 }
diff --git a/src/settings/plugins/ifnet/net_utils.h b/src/settings/plugins/ifnet/net_utils.h
index dee49143..c2ed83a1 100644
--- a/src/settings/plugins/ifnet/net_utils.h
+++ b/src/settings/plugins/ifnet/net_utils.h
@@ -45,7 +45,7 @@ typedef struct _ip6_block {
 } ip6_block;
 
 gchar *read_hostname (const char *path);
-gboolean write_hostname (const char *hostname, const char *path);
+gboolean write_hostname (const char *path, const char *hostname);
 gboolean is_static_ip4 (const char *conn_name);
 gboolean is_static_ip6 (const char *conn_name);
 gboolean is_ip4_address (const char *in_address);
@@ -77,5 +77,5 @@ gboolean is_true (const char *str);
 
 void get_dhcp_hostname_and_client_id (char **hostname, char **client_id);
 
-void backup_file (const gchar* target);
+gchar *backup_file (const gchar* target);
 #endif
diff --git a/src/settings/plugins/ifnet/nm-ifnet-connection.c b/src/settings/plugins/ifnet/nm-ifnet-connection.c
index 8b7a153c..873a62ec 100644
--- a/src/settings/plugins/ifnet/nm-ifnet-connection.c
+++ b/src/settings/plugins/ifnet/nm-ifnet-connection.c
@@ -68,7 +68,7 @@ nm_ifnet_connection_new (const char *conn_name, NMConnection *source)
 	if (source)
 		tmp = g_object_ref (source);
 	else {
-		tmp = ifnet_update_connection_from_config_block (conn_name, &error);
+		tmp = ifnet_update_connection_from_config_block (conn_name, NULL, &error);
 		if (!tmp){
 			g_error_free (error);
 			return NULL;
@@ -108,6 +108,7 @@ commit_changes (NMSettingsConnection *connection,
 	                                         CONF_NET_FILE,
 	                                         WPA_SUPPLICANT_CONF,
 	                                         &new_name,
+	                                         NULL,
 	                                         &error)) {
 		PLUGIN_PRINT (IFNET_PLUGIN_NAME, "Failed to update %s", priv->conn_name);
 		reload_parsers ();
@@ -135,8 +136,7 @@ do_delete (NMSettingsConnection *connection,
 	NMIfnetConnectionPrivate *priv = NM_IFNET_CONNECTION_GET_PRIVATE (connection);
 
 	g_signal_emit (connection, signals[IFNET_CANCEL_MONITORS], 0);
-	if (!ifnet_delete_connection_in_parsers
-	    (priv->conn_name, CONF_NET_FILE, WPA_SUPPLICANT_CONF)) {
+	if (!ifnet_delete_connection_in_parsers (priv->conn_name, CONF_NET_FILE, WPA_SUPPLICANT_CONF, NULL)) {
 		PLUGIN_PRINT (IFNET_PLUGIN_NAME, "Failed to delete %s",
 			      priv->conn_name);
 		reload_parsers ();
diff --git a/src/settings/plugins/ifnet/plugin.c b/src/settings/plugins/ifnet/plugin.c
index fff83805..5100ad3e 100644
--- a/src/settings/plugins/ifnet/plugin.c
+++ b/src/settings/plugins/ifnet/plugin.c
@@ -108,7 +108,7 @@ write_system_hostname (NMSystemConfigInterface * config,
 	g_return_if_fail (newhostname);
 	PLUGIN_PRINT (IFNET_PLUGIN_NAME, "Write system hostname: %s",
 		      newhostname);
-	if (write_hostname (newhostname, IFNET_SYSTEM_HOSTNAME_FILE)) {
+	if (write_hostname (IFNET_SYSTEM_HOSTNAME_FILE, newhostname)) {
 		g_free (priv->hostname);
 		priv->hostname = g_strdup (newhostname);
 		g_object_notify (G_OBJECT (config),
@@ -360,7 +360,7 @@ add_connection (NMSystemConfigInterface *config,
 	nm_connection_for_each_setting_value (source, check_flagged_secrets, &has_flagged_secrets);
 
 	if (!has_flagged_secrets) {
-		conn_name = ifnet_add_new_connection (source, CONF_NET_FILE, WPA_SUPPLICANT_CONF, error);
+		conn_name = ifnet_add_new_connection (source, CONF_NET_FILE, WPA_SUPPLICANT_CONF, NULL, error);
 		if (conn_name)
 			connection = nm_ifnet_connection_new (conn_name, source);
 		reload_connections (config);
diff --git a/src/settings/plugins/ifnet/tests/Makefile.am b/src/settings/plugins/ifnet/tests/Makefile.am
index 85d42388..23f96c81 100644
--- a/src/settings/plugins/ifnet/tests/Makefile.am
+++ b/src/settings/plugins/ifnet/tests/Makefile.am
@@ -1,19 +1,35 @@
+if ENABLE_TESTS
+
 INCLUDES=-I$(srcdir)/../ \
 	 -I$(top_srcdir)/libnm-glib \
 	 -I$(top_srcdir)/libnm-util \
+	 -I$(top_builddir)/libnm-util \
 	 -I$(top_srcdir)/include \
+	 -I$(top_builddir)/include \
 	 -I$(top_srcdir)/src/settings
-TESTS = check_ifnet
-check_PROGRAMS = check_ifnet
-check_ifnet_SOURCES = test_all.c 
-check_ifnet_CPPFLAGS = $(CHECK_CFLAGS) $(GLIB_CFLAGS)
+
+noinst_PROGRAMS = check_ifnet
+check_ifnet_SOURCES = test_all.c
+
+check_ifnet_CPPFLAGS = \
+	$(CHECK_CFLAGS) \
+	$(GLIB_CFLAGS) \
+	-DTEST_WPA_SUPPLICANT_CONF='"$(srcdir)/wpa_supplicant.conf"'
+
 check_ifnet_LDADD = $(top_builddir)/libnm-util/libnm-util.la \
 		    $(builddir)/../lib-ifnet-io.la \
 		    $(CHECK_LIBS) \
 		    $(GLIB_LIBS) \
 		    $(LIBM)
-EXTRA_DIST = hostname \
-			 net \
-			 net.all \
-			 nm-system-settings.conf \
-			 wpa_supplicant.conf
+check-local: check_ifnet
+	$(abs_builddir)/check_ifnet $(abs_srcdir) $(abs_builddir)
+
+EXTRA_DIST = \
+	hostname \
+	net \
+	net.all \
+	nm-system-settings.conf \
+	wpa_supplicant.conf \
+	test_ca_cert.pem
+
+endif
diff --git a/src/settings/plugins/ifnet/tests/Makefile.in b/src/settings/plugins/ifnet/tests/Makefile.in
index 669e22f6..0c2c1910 100644
--- a/src/settings/plugins/ifnet/tests/Makefile.in
+++ b/src/settings/plugins/ifnet/tests/Makefile.in
@@ -14,6 +14,7 @@
 # PARTICULAR PURPOSE.
 
 @SET_MAKE@
+
 VPATH = @srcdir@
 am__make_dryrun = \
   { \
@@ -50,34 +51,39 @@ PRE_UNINSTALL = :
 POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
-TESTS = check_ifnet$(EXEEXT)
-check_PROGRAMS = check_ifnet$(EXEEXT)
+@ENABLE_TESTS_TRUE@noinst_PROGRAMS = check_ifnet$(EXEEXT)
 subdir = src/settings/plugins/ifnet/tests
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/compiler_warnings.m4 \
-	$(top_srcdir)/m4/gettext.m4 $(top_srcdir)/m4/gtk-doc.m4 \
-	$(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/intlmacosx.m4 \
-	$(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/introspection.m4 \
-	$(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \
-	$(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/libnl-check.m4 \
-	$(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \
-	$(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
-	$(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/nls.m4 \
-	$(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/progtest.m4 \
-	$(top_srcdir)/m4/vapigen.m4 $(top_srcdir)/configure.ac
+	$(top_srcdir)/m4/gettext.m4 \
+	$(top_srcdir)/m4/gnome-code-coverage.m4 \
+	$(top_srcdir)/m4/gtk-doc.m4 $(top_srcdir)/m4/iconv.m4 \
+	$(top_srcdir)/m4/intlmacosx.m4 $(top_srcdir)/m4/intltool.m4 \
+	$(top_srcdir)/m4/introspection.m4 $(top_srcdir)/m4/lib-ld.m4 \
+	$(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \
+	$(top_srcdir)/m4/libnl-check.m4 $(top_srcdir)/m4/libtool.m4 \
+	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
+	$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
+	$(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/po.m4 \
+	$(top_srcdir)/m4/progtest.m4 $(top_srcdir)/m4/vapigen.m4 \
+	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
 CONFIG_CLEAN_VPATH_FILES =
-am_check_ifnet_OBJECTS = check_ifnet-test_all.$(OBJEXT)
+PROGRAMS = $(noinst_PROGRAMS)
+am__check_ifnet_SOURCES_DIST = test_all.c
+@ENABLE_TESTS_TRUE@am_check_ifnet_OBJECTS =  \
+@ENABLE_TESTS_TRUE@	check_ifnet-test_all.$(OBJEXT)
 check_ifnet_OBJECTS = $(am_check_ifnet_OBJECTS)
 am__DEPENDENCIES_1 =
-check_ifnet_DEPENDENCIES = $(top_builddir)/libnm-util/libnm-util.la \
-	$(builddir)/../lib-ifnet-io.la $(am__DEPENDENCIES_1) \
-	$(am__DEPENDENCIES_1)
+@ENABLE_TESTS_TRUE@check_ifnet_DEPENDENCIES =  \
+@ENABLE_TESTS_TRUE@	$(top_builddir)/libnm-util/libnm-util.la \
+@ENABLE_TESTS_TRUE@	$(builddir)/../lib-ifnet-io.la \
+@ENABLE_TESTS_TRUE@	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
 AM_V_lt = $(am__v_lt_@AM_V@)
 am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
 am__v_lt_0 = --silent
@@ -108,7 +114,7 @@ AM_V_GEN = $(am__v_GEN_@AM_V@)
 am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
 am__v_GEN_0 = @echo "  GEN   " $@;
 SOURCES = $(check_ifnet_SOURCES)
-DIST_SOURCES = $(check_ifnet_SOURCES)
+DIST_SOURCES = $(am__check_ifnet_SOURCES_DIST)
 am__can_run_installinfo = \
   case $$AM_UPDATE_INFO_DIR in \
     n|no|NO) false;; \
@@ -116,8 +122,6 @@ am__can_run_installinfo = \
   esac
 ETAGS = etags
 CTAGS = ctags
-am__tty_colors = \
-red=; grn=; lgn=; blu=; std=
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 ALL_LINGUAS = @ALL_LINGUAS@
@@ -131,6 +135,10 @@ AWK = @AWK@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
+CKDB_PATH = @CKDB_PATH@
+CODE_COVERAGE_CFLAGS = @CODE_COVERAGE_CFLAGS@
+CODE_COVERAGE_ENABLED = @CODE_COVERAGE_ENABLED@
+CODE_COVERAGE_LDFLAGS = @CODE_COVERAGE_LDFLAGS@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CXX = @CXX@
@@ -145,9 +153,7 @@ DBUS_SYS_DIR = @DBUS_SYS_DIR@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
 DHCLIENT_PATH = @DHCLIENT_PATH@
-DHCLIENT_VERSION = @DHCLIENT_VERSION@
 DHCPCD_PATH = @DHCPCD_PATH@
-DISABLE_DEPRECATED = @DISABLE_DEPRECATED@
 DLLTOOL = @DLLTOOL@
 DSYMUTIL = @DSYMUTIL@
 DUMPBIN = @DUMPBIN@
@@ -157,17 +163,14 @@ ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
 FGREP = @FGREP@
+GENHTML = @GENHTML@
 GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
 GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
-GIO_CFLAGS = @GIO_CFLAGS@
-GIO_LIBS = @GIO_LIBS@
 GLIB_CFLAGS = @GLIB_CFLAGS@
 GLIB_GENMARSHAL = @GLIB_GENMARSHAL@
 GLIB_LIBS = @GLIB_LIBS@
 GLIB_MAKEFILE = @GLIB_MAKEFILE@
 GLIB_MKENUMS = @GLIB_MKENUMS@
-GMODULE_CFLAGS = @GMODULE_CFLAGS@
-GMODULE_LIBS = @GMODULE_LIBS@
 GMSGFMT = @GMSGFMT@
 GMSGFMT_015 = @GMSGFMT_015@
 GNUTLS_CFLAGS = @GNUTLS_CFLAGS@
@@ -208,6 +211,7 @@ IPTABLES_PATH = @IPTABLES_PATH@
 IWMX_SDK_CFLAGS = @IWMX_SDK_CFLAGS@
 IWMX_SDK_LIBS = @IWMX_SDK_LIBS@
 KERNEL_FIRMWARE_DIR = @KERNEL_FIRMWARE_DIR@
+LCOV = @LCOV@
 LD = @LD@
 LDFLAGS = @LDFLAGS@
 LIBDL = @LIBDL@
@@ -224,11 +228,7 @@ LIBNL2_LIBS = @LIBNL2_LIBS@
 LIBNL3_CFLAGS = @LIBNL3_CFLAGS@
 LIBNL3_LIBS = @LIBNL3_LIBS@
 LIBNL_CFLAGS = @LIBNL_CFLAGS@
-LIBNL_GENL3_CFLAGS = @LIBNL_GENL3_CFLAGS@
-LIBNL_GENL3_LIBS = @LIBNL_GENL3_LIBS@
 LIBNL_LIBS = @LIBNL_LIBS@
-LIBNL_ROUTE3_CFLAGS = @LIBNL_ROUTE3_CFLAGS@
-LIBNL_ROUTE3_LIBS = @LIBNL_ROUTE3_LIBS@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
 LIBSOUP_CFLAGS = @LIBSOUP_CFLAGS@
@@ -243,6 +243,8 @@ MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MANIFEST_TOOL = @MANIFEST_TOOL@
 MKDIR_P = @MKDIR_P@
+MM_GLIB_CFLAGS = @MM_GLIB_CFLAGS@
+MM_GLIB_LIBS = @MM_GLIB_LIBS@
 MOC = @MOC@
 MSGFMT = @MSGFMT@
 MSGFMT_015 = @MSGFMT_015@
@@ -252,6 +254,7 @@ NMEDIT = @NMEDIT@
 NM_MAJOR_VERSION = @NM_MAJOR_VERSION@
 NM_MICRO_VERSION = @NM_MICRO_VERSION@
 NM_MINOR_VERSION = @NM_MINOR_VERSION@
+NM_MODIFY_SYSTEM_POLICY = @NM_MODIFY_SYSTEM_POLICY@
 NM_VERSION = @NM_VERSION@
 NSS_CFLAGS = @NSS_CFLAGS@
 NSS_LIBS = @NSS_LIBS@
@@ -278,13 +281,14 @@ PPPD_PLUGIN_DIR = @PPPD_PLUGIN_DIR@
 QT_CFLAGS = @QT_CFLAGS@
 QT_LIBS = @QT_LIBS@
 RANLIB = @RANLIB@
-RESOLVCONF_PATH = @RESOLVCONF_PATH@
 SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
-SYSTEMD_CFLAGS = @SYSTEMD_CFLAGS@
-SYSTEMD_LIBS = @SYSTEMD_LIBS@
+SYSTEMD_INHIBIT_CFLAGS = @SYSTEMD_INHIBIT_CFLAGS@
+SYSTEMD_INHIBIT_LIBS = @SYSTEMD_INHIBIT_LIBS@
+SYSTEMD_LOGIN_CFLAGS = @SYSTEMD_LOGIN_CFLAGS@
+SYSTEMD_LOGIN_LIBS = @SYSTEMD_LOGIN_LIBS@
 SYSTEM_CA_PATH = @SYSTEM_CA_PATH@
 UDEV_BASE_DIR = @UDEV_BASE_DIR@
 USE_NLS = @USE_NLS@
@@ -339,6 +343,11 @@ localedir = @localedir@
 localstatedir = @localstatedir@
 mandir = @mandir@
 mkdir_p = @mkdir_p@
+nmbinary = @nmbinary@
+nmconfdir = @nmconfdir@
+nmdatadir = @nmdatadir@
+nmrundir = @nmrundir@
+nmstatedir = @nmstatedir@
 oldincludedir = @oldincludedir@
 pdfdir = @pdfdir@
 prefix = @prefix@
@@ -353,25 +362,37 @@ target_alias = @target_alias@
 top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
-INCLUDES = -I$(srcdir)/../ \
-	 -I$(top_srcdir)/libnm-glib \
-	 -I$(top_srcdir)/libnm-util \
-	 -I$(top_srcdir)/include \
-	 -I$(top_srcdir)/src/settings
-
-check_ifnet_SOURCES = test_all.c 
-check_ifnet_CPPFLAGS = $(CHECK_CFLAGS) $(GLIB_CFLAGS)
-check_ifnet_LDADD = $(top_builddir)/libnm-util/libnm-util.la \
-		    $(builddir)/../lib-ifnet-io.la \
-		    $(CHECK_LIBS) \
-		    $(GLIB_LIBS) \
-		    $(LIBM)
-
-EXTRA_DIST = hostname \
-			 net \
-			 net.all \
-			 nm-system-settings.conf \
-			 wpa_supplicant.conf
+with_dhclient = @with_dhclient@
+with_dhcpcd = @with_dhcpcd@
+with_netconfig = @with_netconfig@
+with_resolvconf = @with_resolvconf@
+@ENABLE_TESTS_TRUE@INCLUDES = -I$(srcdir)/../ \
+@ENABLE_TESTS_TRUE@	 -I$(top_srcdir)/libnm-glib \
+@ENABLE_TESTS_TRUE@	 -I$(top_srcdir)/libnm-util \
+@ENABLE_TESTS_TRUE@	 -I$(top_builddir)/libnm-util \
+@ENABLE_TESTS_TRUE@	 -I$(top_srcdir)/include \
+@ENABLE_TESTS_TRUE@	 -I$(top_builddir)/include \
+@ENABLE_TESTS_TRUE@	 -I$(top_srcdir)/src/settings
+
+@ENABLE_TESTS_TRUE@check_ifnet_SOURCES = test_all.c
+@ENABLE_TESTS_TRUE@check_ifnet_CPPFLAGS = \
+@ENABLE_TESTS_TRUE@	$(CHECK_CFLAGS) \
+@ENABLE_TESTS_TRUE@	$(GLIB_CFLAGS) \
+@ENABLE_TESTS_TRUE@	-DTEST_WPA_SUPPLICANT_CONF='"$(srcdir)/wpa_supplicant.conf"'
+
+@ENABLE_TESTS_TRUE@check_ifnet_LDADD = $(top_builddir)/libnm-util/libnm-util.la \
+@ENABLE_TESTS_TRUE@		    $(builddir)/../lib-ifnet-io.la \
+@ENABLE_TESTS_TRUE@		    $(CHECK_LIBS) \
+@ENABLE_TESTS_TRUE@		    $(GLIB_LIBS) \
+@ENABLE_TESTS_TRUE@		    $(LIBM)
+
+@ENABLE_TESTS_TRUE@EXTRA_DIST = \
+@ENABLE_TESTS_TRUE@	hostname \
+@ENABLE_TESTS_TRUE@	net \
+@ENABLE_TESTS_TRUE@	net.all \
+@ENABLE_TESTS_TRUE@	nm-system-settings.conf \
+@ENABLE_TESTS_TRUE@	wpa_supplicant.conf \
+@ENABLE_TESTS_TRUE@	test_ca_cert.pem
 
 all: all-am
 
@@ -408,8 +429,8 @@ $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 $(am__aclocal_m4_deps):
 
-clean-checkPROGRAMS:
-	@list='$(check_PROGRAMS)'; test -n "$$list" || exit 0; \
+clean-noinstPROGRAMS:
+	@list='$(noinst_PROGRAMS)'; test -n "$$list" || exit 0; \
 	echo " rm -f" $$list; \
 	rm -f $$list || exit $$?; \
 	test -n "$(EXEEXT)" || exit 0; \
@@ -429,25 +450,22 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/check_ifnet-test_all.Po@am__quote@
 
 .c.o:
-@am__fastdepCC_TRUE@	$(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\
-@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
-@am__fastdepCC_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.Po
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $<
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c $<
 
 .c.obj:
-@am__fastdepCC_TRUE@	$(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.obj$$||'`;\
-@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ `$(CYGPATH_W) '$<'` &&\
-@am__fastdepCC_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.Po
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c `$(CYGPATH_W) '$<'`
 
 .c.lo:
-@am__fastdepCC_TRUE@	$(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.lo$$||'`;\
-@am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
-@am__fastdepCC_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.Plo
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $<
@@ -524,99 +542,6 @@ GTAGS:
 distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
 
-check-TESTS: $(TESTS)
-	@failed=0; all=0; xfail=0; xpass=0; skip=0; \
-	srcdir=$(srcdir); export srcdir; \
-	list=' $(TESTS) '; \
-	$(am__tty_colors); \
-	if test -n "$$list"; then \
-	  for tst in $$list; do \
-	    if test -f ./$$tst; then dir=./; \
-	    elif test -f $$tst; then dir=; \
-	    else dir="$(srcdir)/"; fi; \
-	    if $(TESTS_ENVIRONMENT) $${dir}$$tst; then \
-	      all=`expr $$all + 1`; \
-	      case " $(XFAIL_TESTS) " in \
-	      *[\ \	]$$tst[\ \	]*) \
-		xpass=`expr $$xpass + 1`; \
-		failed=`expr $$failed + 1`; \
-		col=$$red; res=XPASS; \
-	      ;; \
-	      *) \
-		col=$$grn; res=PASS; \
-	      ;; \
-	      esac; \
-	    elif test $$? -ne 77; then \
-	      all=`expr $$all + 1`; \
-	      case " $(XFAIL_TESTS) " in \
-	      *[\ \	]$$tst[\ \	]*) \
-		xfail=`expr $$xfail + 1`; \
-		col=$$lgn; res=XFAIL; \
-	      ;; \
-	      *) \
-		failed=`expr $$failed + 1`; \
-		col=$$red; res=FAIL; \
-	      ;; \
-	      esac; \
-	    else \
-	      skip=`expr $$skip + 1`; \
-	      col=$$blu; res=SKIP; \
-	    fi; \
-	    echo "$${col}$$res$${std}: $$tst"; \
-	  done; \
-	  if test "$$all" -eq 1; then \
-	    tests="test"; \
-	    All=""; \
-	  else \
-	    tests="tests"; \
-	    All="All "; \
-	  fi; \
-	  if test "$$failed" -eq 0; then \
-	    if test "$$xfail" -eq 0; then \
-	      banner="$$All$$all $$tests passed"; \
-	    else \
-	      if test "$$xfail" -eq 1; then failures=failure; else failures=failures; fi; \
-	      banner="$$All$$all $$tests behaved as expected ($$xfail expected $$failures)"; \
-	    fi; \
-	  else \
-	    if test "$$xpass" -eq 0; then \
-	      banner="$$failed of $$all $$tests failed"; \
-	    else \
-	      if test "$$xpass" -eq 1; then passes=pass; else passes=passes; fi; \
-	      banner="$$failed of $$all $$tests did not behave as expected ($$xpass unexpected $$passes)"; \
-	    fi; \
-	  fi; \
-	  dashes="$$banner"; \
-	  skipped=""; \
-	  if test "$$skip" -ne 0; then \
-	    if test "$$skip" -eq 1; then \
-	      skipped="($$skip test was not run)"; \
-	    else \
-	      skipped="($$skip tests were not run)"; \
-	    fi; \
-	    test `echo "$$skipped" | wc -c` -le `echo "$$banner" | wc -c` || \
-	      dashes="$$skipped"; \
-	  fi; \
-	  report=""; \
-	  if test "$$failed" -ne 0 && test -n "$(PACKAGE_BUGREPORT)"; then \
-	    report="Please report to $(PACKAGE_BUGREPORT)"; \
-	    test `echo "$$report" | wc -c` -le `echo "$$banner" | wc -c` || \
-	      dashes="$$report"; \
-	  fi; \
-	  dashes=`echo "$$dashes" | sed s/./=/g`; \
-	  if test "$$failed" -eq 0; then \
-	    col="$$grn"; \
-	  else \
-	    col="$$red"; \
-	  fi; \
-	  echo "$${col}$$dashes$${std}"; \
-	  echo "$${col}$$banner$${std}"; \
-	  test -z "$$skipped" || echo "$${col}$$skipped$${std}"; \
-	  test -z "$$report" || echo "$${col}$$report$${std}"; \
-	  echo "$${col}$$dashes$${std}"; \
-	  test "$$failed" -eq 0; \
-	else :; fi
-
 distdir: $(DISTFILES)
 	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
 	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
@@ -647,11 +572,11 @@ distdir: $(DISTFILES)
 	    || exit 1; \
 	  fi; \
 	done
+@ENABLE_TESTS_FALSE@check-local:
 check-am: all-am
-	$(MAKE) $(AM_MAKEFLAGS) $(check_PROGRAMS)
-	$(MAKE) $(AM_MAKEFLAGS) check-TESTS
+	$(MAKE) $(AM_MAKEFLAGS) check-local
 check: check-am
-all-am: Makefile
+all-am: Makefile $(PROGRAMS)
 installdirs:
 install: install-am
 install-exec: install-exec-am
@@ -685,7 +610,7 @@ maintainer-clean-generic:
 	@echo "it deletes files that may require special tools to rebuild."
 clean: clean-am
 
-clean-am: clean-checkPROGRAMS clean-generic clean-libtool \
+clean-am: clean-generic clean-libtool clean-noinstPROGRAMS \
 	mostlyclean-am
 
 distclean: distclean-am
@@ -756,8 +681,8 @@ uninstall-am:
 
 .MAKE: check-am install-am install-strip
 
-.PHONY: CTAGS GTAGS all all-am check check-TESTS check-am clean \
-	clean-checkPROGRAMS clean-generic clean-libtool ctags \
+.PHONY: CTAGS GTAGS all all-am check check-am check-local clean \
+	clean-generic clean-libtool clean-noinstPROGRAMS ctags \
 	distclean distclean-compile distclean-generic \
 	distclean-libtool distclean-tags distdir dvi dvi-am html \
 	html-am info info-am install install-am install-data \
@@ -770,6 +695,8 @@ uninstall-am:
 	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
 	tags uninstall uninstall-am
 
+@ENABLE_TESTS_TRUE@check-local: check_ifnet
+@ENABLE_TESTS_TRUE@	$(abs_builddir)/check_ifnet $(abs_srcdir) $(abs_builddir)
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
diff --git a/src/settings/plugins/ifnet/tests/test_all.c b/src/settings/plugins/ifnet/tests/test_all.c
index 974258b9..4c312601 100644
--- a/src/settings/plugins/ifnet/tests/test_all.c
+++ b/src/settings/plugins/ifnet/tests/test_all.c
@@ -25,6 +25,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 
 #include "net_parser.h"
@@ -62,31 +63,33 @@ test_getdata ()
 }
 
 static void
-test_read_hostname ()
+test_read_hostname (const char *base_path)
 {
-	gchar *hostname = read_hostname ("hostname");
+	char *hostname_path, *hostname;
+
+	hostname_path = g_build_filename (base_path, "hostname", NULL);
+	hostname = read_hostname (hostname_path);
+
+	g_assert_cmpstr (hostname, ==, "gentoo");
 
-	ASSERT (hostname != NULL, "get hostname", "hostname is NULL");
-	ASSERT (strcmp ("gentoo", hostname) == 0,
-		"get hostname",
-		"hostname is not correctly read, read:%s, expected: gentoo",
-		hostname);
 	g_free (hostname);
+	g_free (hostname_path);
 }
 
 static void
-test_write_hostname ()
+test_write_hostname (const char *temp_path)
 {
-	gchar *hostname = read_hostname ("hostname");
-	gchar *tmp;
-
-	write_hostname ("gentoo-nm", "hostname");
-	tmp = read_hostname ("hostname");
-	ASSERT (strcmp (tmp, "gentoo-nm") == 0,
-		"write hostname", "write hostname error");
-	write_hostname (hostname, "hostname");
-	g_free (tmp);
+	char *hostname_path, *hostname;
+
+	hostname_path = g_build_filename (temp_path, "hostname-test", NULL);
+	write_hostname (hostname_path, "gentoo-nm");
+	hostname = read_hostname (hostname_path);
+
+	g_assert_cmpstr (hostname, ==, "gentoo-nm");
+
 	g_free (hostname);
+	unlink (hostname_path);
+	g_free (hostname_path);
 }
 
 static void
@@ -226,21 +229,15 @@ test_wpa_parser ()
 {
 	const char *value;
 
-	ASSERT (exist_ssid ("example"), "get wsec",
-		"ssid myxjtu2 is not found");
-	ASSERT (exist_ssid ("static-wep-test"), "exist_ssid",
-		"ssid static-wep-test is not found");
+	g_assert (exist_ssid ("example"));
+
+	g_assert (exist_ssid ("static-wep-test"));
 	value = wpa_get_value ("static-wep-test", "key_mgmt");
-	ASSERT (value
-		&& strcmp (value, "NONE") == 0, "get wpa data",
-		"key_mgmt of static-wep-test should be NONE, find %s", value);
+	g_assert_cmpstr (value, ==, "NONE");
 	value = wpa_get_value ("static-wep-test", "wep_key0");
-	ASSERT (value
-		&& strcmp (value, "\"abcde\"") == 0,
-		"get wpa data",
-		"wep_key0 of static-wep-test should be abcde, find %s", value);
-	ASSERT (exist_ssid ("leap-example"), "get wsec",
-		"ssid leap-example is not found");
+	g_assert_cmpstr (value, ==, "\"abcde\"");
+
+	g_assert (exist_ssid ("leap-example"));
 
 	value = wpa_get_value ("test-with-hash-in-psk", "psk");
 	g_assert_cmpstr (value, ==, "\"xjtudlc3731###asdfasdfasdf\"");
@@ -277,48 +274,59 @@ test_new_connection ()
 	GError *error = NULL;
 	NMConnection *connection;
 
-	connection = ifnet_update_connection_from_config_block ("eth2", &error);
+	connection = ifnet_update_connection_from_config_block ("eth2", NULL, &error);
 	ASSERT (connection != NULL, "new connection",
 		"new connection failed: %s",
 		error ? error->message : "None");
 	g_object_unref (connection);
 
-	connection = ifnet_update_connection_from_config_block ("qiaomuf", &error);
+	connection = ifnet_update_connection_from_config_block ("qiaomuf", NULL, &error);
 	ASSERT (connection != NULL, "new connection",
 		"new connection failed: %s",
 		error ? error->message : "NONE");
 	g_object_unref (connection);
 
-	connection = ifnet_update_connection_from_config_block ("myxjtu2", &error);
+	connection = ifnet_update_connection_from_config_block ("myxjtu2", NULL, &error);
 	ASSERT (connection != NULL, "new connection",
 		"new connection failed: %s",
 		error ? error->message : "NONE");
 	g_object_unref (connection);
 
-	connection = ifnet_update_connection_from_config_block ("eth9", &error);
+	connection = ifnet_update_connection_from_config_block ("eth9", NULL, &error);
 	ASSERT (connection != NULL, "new connection",
 		"new connection(eth9) failed: %s",
 		error ? error->message : "NONE");
 	g_object_unref (connection);
 
-	connection = ifnet_update_connection_from_config_block ("eth10", &error);
+	connection = ifnet_update_connection_from_config_block ("eth10", NULL, &error);
 	ASSERT (connection != NULL, "new connection",
 		"new connection(eth10) failed: %s",
 		error ? error->message : "NONE");
 	g_object_unref (connection);
 }
 
+static void
+kill_backup (char **path)
+{
+	if (path) {
+		unlink (*path);
+		g_free (*path);
+		*path = NULL;
+	}
+}
+
 #define NET_GEN_NAME "net.generate"
 #define SUP_GEN_NAME "wpa_supplicant.conf.generate"
 
 static void
-test_update_connection ()
+test_update_connection (const char *basepath)
 {
 	GError *error = NULL;
 	NMConnection *connection;
 	gboolean success;
+	char *backup = NULL;
 
-	connection = ifnet_update_connection_from_config_block ("eth0", &error);
+	connection = ifnet_update_connection_from_config_block ("eth0", basepath, &error);
 	ASSERT (connection != NULL, "get connection",
 		"get connection failed: %s",
 		error ? error->message : "None");
@@ -327,11 +335,13 @@ test_update_connection ()
 	                                              NET_GEN_NAME,
 	                                              SUP_GEN_NAME,
 	                                              NULL,
+	                                              &backup,
 	                                              &error);
+	kill_backup (&backup);
 	ASSERT (success, "update connection", "update connection failed %s", "eth0");
 	g_object_unref (connection);
 
-	connection = ifnet_update_connection_from_config_block ("0xab3ace", &error);
+	connection = ifnet_update_connection_from_config_block ("0xab3ace", basepath, &error);
 	ASSERT (connection != NULL, "get connection", "get connection failed: %s",
 		error ? error->message : "None");
 
@@ -339,7 +349,9 @@ test_update_connection ()
 	                                              NET_GEN_NAME,
 	                                              SUP_GEN_NAME,
 	                                              NULL,
+	                                              &backup,
 	                                              &error);
+	kill_backup (&backup);
 	ASSERT (success, "update connection", "update connection failed %s", "0xab3ace");
 	g_object_unref (connection);
 
@@ -348,17 +360,21 @@ test_update_connection ()
 }
 
 static void
-test_add_connection ()
+test_add_connection (const char *basepath)
 {
 	NMConnection *connection;
+	char *backup = NULL;
 
-	connection = ifnet_update_connection_from_config_block ("eth0", NULL);
-	ASSERT (ifnet_add_new_connection (connection, NET_GEN_NAME, SUP_GEN_NAME, NULL),
+	connection = ifnet_update_connection_from_config_block ("eth0", basepath, NULL);
+	ASSERT (ifnet_add_new_connection (connection, NET_GEN_NAME, SUP_GEN_NAME, &backup, NULL),
 	        "add connection", "add connection failed: %s", "eth0");
+	kill_backup (&backup);
 	g_object_unref (connection);
-	connection = ifnet_update_connection_from_config_block ("myxjtu2", NULL);
-	ASSERT (ifnet_add_new_connection (connection, NET_GEN_NAME, SUP_GEN_NAME, NULL),
+
+	connection = ifnet_update_connection_from_config_block ("myxjtu2", basepath, NULL);
+	ASSERT (ifnet_add_new_connection (connection, NET_GEN_NAME, SUP_GEN_NAME, &backup, NULL),
 	        "add connection", "add connection failed: %s", "myxjtu2");
+	kill_backup (&backup);
 	g_object_unref (connection);
 
 	unlink (NET_GEN_NAME);
@@ -370,20 +386,24 @@ test_delete_connection ()
 {
 	GError *error = NULL;
 	NMConnection *connection;
+	char *backup = NULL;
 
-	connection = ifnet_update_connection_from_config_block ("eth7", &error);
+	connection = ifnet_update_connection_from_config_block ("eth7", NULL, &error);
 	ASSERT (connection != NULL, "get connection",
 	        "get connection failed: %s",
 	        error ? error->message : "None");
-	ASSERT (ifnet_delete_connection_in_parsers ("eth7", NET_GEN_NAME, SUP_GEN_NAME),
+	ASSERT (ifnet_delete_connection_in_parsers ("eth7", NET_GEN_NAME, SUP_GEN_NAME, &backup),
 	        "delete connection", "delete connection failed: %s", "eth7");
+	kill_backup (&backup);
 	g_object_unref (connection);
-	connection = ifnet_update_connection_from_config_block ("qiaomuf", &error);
+
+	connection = ifnet_update_connection_from_config_block ("qiaomuf", NULL, &error);
 	ASSERT (connection != NULL, "get connection",
 	        "get connection failed: %s",
 	        error ? error->message : "None");
-	ASSERT (ifnet_delete_connection_in_parsers ("qiaomuf", NET_GEN_NAME, SUP_GEN_NAME),
+	ASSERT (ifnet_delete_connection_in_parsers ("qiaomuf", NET_GEN_NAME, SUP_GEN_NAME, &backup),
 	        "delete connection", "delete connection failed: %s", "qiaomuf");
+	kill_backup (&backup);
 	g_object_unref (connection);
 
 	unlink (NET_GEN_NAME);
@@ -396,50 +416,51 @@ test_missing_config ()
 	GError *error = NULL;
 	NMConnection *connection;
 
-	connection = ifnet_update_connection_from_config_block ("eth8", &error);
+	connection = ifnet_update_connection_from_config_block ("eth8", NULL, &error);
 	ASSERT (connection == NULL && error != NULL, "get connection",
 	        "get connection should fail with 'Unknown config for eth8'");
 }
 
-static void
-run_all (gboolean run)
-{
-	if (run) {
-		test_strip_string ();
-		test_is_static ();
-		test_has_ip6_address ();
-		test_has_default_route ();
-		test_getdata ();
-		test_read_hostname ();
-		test_write_hostname ();
-		test_is_ip4_address ();
-		test_is_ip6_address ();
-		test_convert_ipv4_config_block ();
-		test_convert_ipv4_routes_block ();
-		test_is_unmanaged ();
-		test_wpa_parser ();
-		test_convert_ipv4_routes_block ();
-		test_new_connection ();
-		test_update_connection ();
-		test_add_connection ();
-		test_delete_connection ();
-		test_missing_config ();
-	}
-}
-
 int
-main (void)
+main (int argc, char **argv)
 {
-//      g_mem_set_vtable(glib_mem_profiler_table);
-//      g_atexit(g_mem_profile);
+	char *f;
+
 	g_type_init ();
+
+	f = g_build_filename (argv[1], "net", NULL);
+	ifnet_init (f);
+	g_free (f);
+
+	f = g_build_filename (argv[1], "wpa_supplicant.conf", NULL);
+	wpa_parser_init (f);
+	g_free (f);
+
+	test_strip_string ();
+	test_is_static ();
+	test_has_ip6_address ();
+	test_has_default_route ();
+	test_getdata ();
+	test_read_hostname (argv[1]);
+	test_write_hostname (argv[2]);
+	test_is_ip4_address ();
+	test_is_ip6_address ();
+	test_convert_ipv4_config_block ();
+	test_convert_ipv4_routes_block ();
+	test_is_unmanaged ();
+	test_wpa_parser ();
+	test_convert_ipv4_routes_block ();
+	test_new_connection ();
+	test_update_connection (argv[1]);
+	test_add_connection (argv[1]);
+	test_delete_connection ();
+	test_missing_config ();
+
 	ifnet_destroy ();
 	wpa_parser_destroy ();
-	ifnet_init ("net");
-	wpa_parser_init ("wpa_supplicant.conf");
-	printf ("Initialization complete\n");
-	run_all (TRUE);
-	ifnet_destroy ();
-	wpa_parser_destroy ();
+
+	f = g_path_get_basename (argv[0]);
+	fprintf (stdout, "%s: SUCCESS\n", f);
+	g_free (f);
 	return 0;
 }
diff --git a/src/settings/plugins/ifnet/tests/test_ca_cert.pem b/src/settings/plugins/ifnet/tests/test_ca_cert.pem
new file mode 100644
index 00000000..ef1be20d
--- /dev/null
+++ b/src/settings/plugins/ifnet/tests/test_ca_cert.pem
@@ -0,0 +1,27 @@
+-----BEGIN CERTIFICATE-----
+MIIEjzCCA3egAwIBAgIJAOvnZPt59yIZMA0GCSqGSIb3DQEBBQUAMIGLMQswCQYD
+VQQGEwJVUzESMBAGA1UECBMJQmVya3NoaXJlMRAwDgYDVQQHEwdOZXdidXJ5MRcw
+FQYDVQQKEw5NeSBDb21wYW55IEx0ZDEQMA4GA1UECxMHVGVzdGluZzENMAsGA1UE
+AxMEdGVzdDEcMBoGCSqGSIb3DQEJARYNdGVzdEB0ZXN0LmNvbTAeFw0wOTAzMTAx
+NTEyMTRaFw0xOTAzMDgxNTEyMTRaMIGLMQswCQYDVQQGEwJVUzESMBAGA1UECBMJ
+QmVya3NoaXJlMRAwDgYDVQQHEwdOZXdidXJ5MRcwFQYDVQQKEw5NeSBDb21wYW55
+IEx0ZDEQMA4GA1UECxMHVGVzdGluZzENMAsGA1UEAxMEdGVzdDEcMBoGCSqGSIb3
+DQEJARYNdGVzdEB0ZXN0LmNvbTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoC
+ggEBAKot9j+/+CX1/gZLgJHIXCRgCItKLGnf7qGbgqB9T2ACBqR0jllKWwDKrcWU
+xjXNIc+GF9Wnv+lX6G0Okn4Zt3/uRNobL+2b/yOF7M3Td3/9W873zdkQQX930YZc
+Rr8uxdRPP5bxiCgtcw632y21sSEbG9mjccAUnV/0jdvfmMNj0i8gN6E0fMBiJ9S3
+FkxX/KFvt9JWE9CtoyL7ki7UIDq+6vj7Gd5N0B3dOa1y+rRHZzKlJPcSXQSEYUS4
+HmKDwiKSVahft8c4tDn7KPi0vex91hlgZVd3usL2E/Vq7o5D9FAZ5kZY0AdFXwdm
+J4lO4Mj7ac7GE4vNERNcXVIX59sCAwEAAaOB8zCB8DAdBgNVHQ4EFgQUuDU3Mr7P
+T3n1e3Sy8hBauoDFahAwgcAGA1UdIwSBuDCBtYAUuDU3Mr7PT3n1e3Sy8hBauoDF
+ahChgZGkgY4wgYsxCzAJBgNVBAYTAlVTMRIwEAYDVQQIEwlCZXJrc2hpcmUxEDAO
+BgNVBAcTB05ld2J1cnkxFzAVBgNVBAoTDk15IENvbXBhbnkgTHRkMRAwDgYDVQQL
+EwdUZXN0aW5nMQ0wCwYDVQQDEwR0ZXN0MRwwGgYJKoZIhvcNAQkBFg10ZXN0QHRl
+c3QuY29tggkA6+dk+3n3IhkwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAAOC
+AQEAVRG4aALIvCXCiKfe7K+iJxjBVRDFPEf7JWA9LGgbFOn6pNvbxonrR+0BETdc
+JV1ET4ct2xsE7QNFIkp9GKRC+6J32zCo8qtLCD5+v436r8TUG2/t2JRMkb9I2XVT
+p7RJoot6M0Ltf8KNQUPYh756xmKZ4USfQUwc58MOSDGY8VWEXJOYij9Pf0e0c52t
+qiCEjXH7uXiS8Pgq9TYm7AkWSOrglYhSa83x0f8mtT8Q15nBESIHZ6o8FAS2bBgn
+B0BkrKRjtBUkuJG3vTox+bYINh2Gxi1JZHWSV1tN5z3hd4VFcKqanW5OgQwToBqp
+3nniskIjbH0xjgZf/nVMyLnjxg==
+-----END CERTIFICATE-----
diff --git a/src/settings/plugins/ifnet/tests/wpa_supplicant.conf b/src/settings/plugins/ifnet/tests/wpa_supplicant.conf
index 609ee0e1..917d495d 100644
--- a/src/settings/plugins/ifnet/tests/wpa_supplicant.conf
+++ b/src/settings/plugins/ifnet/tests/wpa_supplicant.conf
@@ -1,529 +1,3 @@
-##### Example wpa_supplicant configuration file ###############################
-#
-# This file describes configuration file format and lists all available option.
-# Please also take a look at simpler configuration examples in 'examples'
-# subdirectory.
-#
-# Empty lines and lines starting with # are ignored
-
-# NOTE! This file may contain password information and should probably be made
-# readable only by root user on multiuser systems.
-
-# Note: All file paths in this configuration file should use full (absolute,
-# not relative to working directory) path in order to allow working directory
-# to be changed. This can happen if wpa_supplicant is run in the background.
-
-# Whether to allow wpa_supplicant to update (overwrite) configuration
-#
-# This option can be used to allow wpa_supplicant to overwrite configuration
-# file whenever configuration is changed (e.g., new network block is added with
-# wpa_cli or wpa_gui, or a password is changed). This is required for
-# wpa_cli/wpa_gui to be able to store the configuration changes permanently.
-# Please note that overwriting configuration file will remove the comments from
-# it.
-#update_config=1
-
-# global configuration (shared by all network blocks)
-#
-# Parameters for the control interface. If this is specified, wpa_supplicant
-# will open a control interface that is available for external programs to
-# manage wpa_supplicant. The meaning of this string depends on which control
-# interface mechanism is used. For all cases, the existance of this parameter
-# in configuration is used to determine whether the control interface is
-# enabled.
-#
-# For UNIX domain sockets (default on Linux and BSD): This is a directory that
-# will be created for UNIX domain sockets for listening to requests from
-# external programs (CLI/GUI, etc.) for status information and configuration.
-# The socket file will be named based on the interface name, so multiple
-# wpa_supplicant processes can be run at the same time if more than one
-# interface is used.
-# /var/run/wpa_supplicant is the recommended directory for sockets and by
-# default, wpa_cli will use it when trying to connect with wpa_supplicant.
-#
-# Access control for the control interface can be configured by setting the
-# directory to allow only members of a group to use sockets. This way, it is
-# possible to run wpa_supplicant as root (since it needs to change network
-# configuration and open raw sockets) and still allow GUI/CLI components to be
-# run as non-root users. However, since the control interface can be used to
-# change the network configuration, this access needs to be protected in many
-# cases. By default, wpa_supplicant is configured to use gid 0 (root). If you
-# want to allow non-root users to use the control interface, add a new group
-# and change this value to match with that group. Add users that should have
-# control interface access to this group. If this variable is commented out or
-# not included in the configuration file, group will not be changed from the
-# value it got by default when the directory or socket was created.
-#
-# When configuring both the directory and group, use following format:
-# DIR=/var/run/wpa_supplicant GROUP=wheel
-# DIR=/var/run/wpa_supplicant GROUP=0
-# (group can be either group name or gid)
-#
-# For UDP connections (default on Windows): The value will be ignored. This
-# variable is just used to select that the control interface is to be created.
-# The value can be set to, e.g., udp (ctrl_interface=udp)
-#
-# For Windows Named Pipe: This value can be used to set the security descriptor
-# for controlling access to the control interface. Security descriptor can be
-# set using Security Descriptor String Format (see http://msdn.microsoft.com/
-# library/default.asp?url=/library/en-us/secauthz/security/
-# security_descriptor_string_format.asp). The descriptor string needs to be
-# prefixed with SDDL=. For example, ctrl_interface=SDDL=D: would set an empty
-# DACL (which will reject all connections). See README-Windows.txt for more
-# information about SDDL string format.
-#
-ctrl_interface=/var/run/wpa_supplicant
-
-# IEEE 802.1X/EAPOL version
-# wpa_supplicant is implemented based on IEEE Std 802.1X-2004 which defines
-# EAPOL version 2. However, there are many APs that do not handle the new
-# version number correctly (they seem to drop the frames completely). In order
-# to make wpa_supplicant interoperate with these APs, the version number is set
-# to 1 by default. This configuration value can be used to set it to the new
-# version (2).
-eapol_version=1
-
-# AP scanning/selection
-# By default, wpa_supplicant requests driver to perform AP scanning and then
-# uses the scan results to select a suitable AP. Another alternative is to
-# allow the driver to take care of AP scanning and selection and use
-# wpa_supplicant just to process EAPOL frames based on IEEE 802.11 association
-# information from the driver.
-# 1: wpa_supplicant initiates scanning and AP selection
-# 0: driver takes care of scanning, AP selection, and IEEE 802.11 association
-#    parameters (e.g., WPA IE generation); this mode can also be used with
-#    non-WPA drivers when using IEEE 802.1X mode; do not try to associate with
-#    APs (i.e., external program needs to control association). This mode must
-#    also be used when using wired Ethernet drivers.
-# 2: like 0, but associate with APs using security policy and SSID (but not
-#    BSSID); this can be used, e.g., with ndiswrapper and NDIS drivers to
-#    enable operation with hidden SSIDs and optimized roaming; in this mode,
-#    the network blocks in the configuration file are tried one by one until
-#    the driver reports successful association; each network block should have
-#    explicit security policy (i.e., only one option in the lists) for
-#    key_mgmt, pairwise, group, proto variables
-ap_scan=1
-
-# EAP fast re-authentication
-# By default, fast re-authentication is enabled for all EAP methods that
-# support it. This variable can be used to disable fast re-authentication.
-# Normally, there is no need to disable this.
-fast_reauth=1
-
-# OpenSSL Engine support
-# These options can be used to load OpenSSL engines.
-# The two engines that are supported currently are shown below:
-# They are both from the opensc project (http://www.opensc.org/)
-# By default no engines are loaded.
-# make the opensc engine available
-#opensc_engine_path=/usr/lib64/engine_opensc.so
-# make the pkcs11 engine available
-#pkcs11_engine_path=/usr/lib64/engine_pkcs11.so
-# configure the path to the pkcs11 module required by the pkcs11 engine
-#pkcs11_module_path=/usr/lib64/opensc-pkcs11.so
-
-# Dynamic EAP methods
-# If EAP methods were built dynamically as shared object files, they need to be
-# loaded here before being used in the network blocks. By default, EAP methods
-# are included statically in the build, so these lines are not needed
-#load_dynamic_eap=/usr/lib/wpa_supplicant/eap_tls.so
-#load_dynamic_eap=/usr/lib/wpa_supplicant/eap_md5.so
-
-# Driver interface parameters
-# This field can be used to configure arbitrary driver interace parameters. The
-# format is specific to the selected driver interface. This field is not used
-# in most cases.
-#driver_param="field=value"
-
-# Country code
-# The ISO/IEC alpha2 country code for the country in which this device is
-# currently operating.
-#country=US
-
-# Maximum lifetime for PMKSA in seconds; default 43200
-#dot11RSNAConfigPMKLifetime=43200
-# Threshold for reauthentication (percentage of PMK lifetime); default 70
-#dot11RSNAConfigPMKReauthThreshold=70
-# Timeout for security association negotiation in seconds; default 60
-#dot11RSNAConfigSATimeout=60
-
-# Wi-Fi Protected Setup (WPS) parameters
-
-# Universally Unique IDentifier (UUID; see RFC 4122) of the device
-# If not configured, UUID will be generated based on the local MAC address.
-#uuid=12345678-9abc-def0-1234-56789abcdef0
-
-# Device Name
-# User-friendly description of device; up to 32 octets encoded in UTF-8
-#device_name=Wireless Client
-
-# Manufacturer
-# The manufacturer of the device (up to 64 ASCII characters)
-#manufacturer=Company
-
-# Model Name
-# Model of the device (up to 32 ASCII characters)
-#model_name=cmodel
-
-# Model Number
-# Additional device description (up to 32 ASCII characters)
-#model_number=123
-
-# Serial Number
-# Serial number of the device (up to 32 characters)
-#serial_number=12345
-
-# Primary Device Type
-# Used format: --
-# categ = Category as an integer value
-# OUI = OUI and type octet as a 4-octet hex-encoded value; 0050F204 for
-#       default WPS OUI
-# subcateg = OUI-specific Sub Category as an integer value
-# Examples:
-#   1-0050F204-1 (Computer / PC)
-#   1-0050F204-2 (Computer / Server)
-#   5-0050F204-1 (Storage / NAS)
-#   6-0050F204-1 (Network Infrastructure / AP)
-#device_type=1-0050F204-1
-
-# OS Version
-# 4-octet operating system version number (hex string)
-#os_version=01020300
-
-# Credential processing
-#   0 = process received credentials internally (default)
-#   1 = do not process received credentials; just pass them over ctrl_iface to
-#	external program(s)
-#   2 = process received credentials internally and pass them over ctrl_iface
-#	to external program(s)
-#wps_cred_processing=0
-
-# network block
-#
-# Each network (usually AP's sharing the same SSID) is configured as a separate
-# block in this configuration file. The network blocks are in preference order
-# (the first match is used).
-#
-# network block fields:
-#
-# disabled:
-#	0 = this network can be used (default)
-#	1 = this network block is disabled (can be enabled through ctrl_iface,
-#	    e.g., with wpa_cli or wpa_gui)
-#
-# id_str: Network identifier string for external scripts. This value is passed
-#	to external action script through wpa_cli as WPA_ID_STR environment
-#	variable to make it easier to do network specific configuration.
-#
-# ssid: SSID (mandatory); either as an ASCII string with double quotation or
-#	as hex string; network name
-#
-# scan_ssid:
-#	0 = do not scan this SSID with specific Probe Request frames (default)
-#	1 = scan with SSID-specific Probe Request frames (this can be used to
-#	    find APs that do not accept broadcast SSID or use multiple SSIDs;
-#	    this will add latency to scanning, so enable this only when needed)
-#
-# bssid: BSSID (optional); if set, this network block is used only when
-#	associating with the AP using the configured BSSID
-#
-# priority: priority group (integer)
-# By default, all networks will get same priority group (0). If some of the
-# networks are more desirable, this field can be used to change the order in
-# which wpa_supplicant goes through the networks when selecting a BSS. The
-# priority groups will be iterated in decreasing priority (i.e., the larger the
-# priority value, the sooner the network is matched against the scan results).
-# Within each priority group, networks will be selected based on security
-# policy, signal strength, etc.
-# Please note that AP scanning with scan_ssid=1 and ap_scan=2 mode are not
-# using this priority to select the order for scanning. Instead, they try the
-# networks in the order that used in the configuration file.
-#
-# mode: IEEE 802.11 operation mode
-# 0 = infrastructure (Managed) mode, i.e., associate with an AP (default)
-# 1 = IBSS (ad-hoc, peer-to-peer)
-# Note: IBSS can only be used with key_mgmt NONE (plaintext and static WEP)
-# and key_mgmt=WPA-NONE (fixed group key TKIP/CCMP). In addition, ap_scan has
-# to be set to 2 for IBSS. WPA-None requires following network block options:
-# proto=WPA, key_mgmt=WPA-NONE, pairwise=NONE, group=TKIP (or CCMP, but not
-# both), and psk must also be set.
-#
-# frequency: Channel frequency in megahertz (MHz) for IBSS, e.g.,
-# 2412 = IEEE 802.11b/g channel 1. This value is used to configure the initial
-# channel for IBSS (adhoc) networks. It is ignored in the infrastructure mode.
-# In addition, this value is only used by the station that creates the IBSS. If
-# an IBSS network with the configured SSID is already present, the frequency of
-# the network will be used instead of this configured value.
-#
-# proto: list of accepted protocols
-# WPA = WPA/IEEE 802.11i/D3.0
-# RSN = WPA2/IEEE 802.11i (also WPA2 can be used as an alias for RSN)
-# If not set, this defaults to: WPA RSN
-#
-# key_mgmt: list of accepted authenticated key management protocols
-# WPA-PSK = WPA pre-shared key (this requires 'psk' field)
-# WPA-EAP = WPA using EAP authentication
-# IEEE8021X = IEEE 802.1X using EAP authentication and (optionally) dynamically
-#	generated WEP keys
-# NONE = WPA is not used; plaintext or static WEP could be used
-# WPA-PSK-SHA256 = Like WPA-PSK but using stronger SHA256-based algorithms
-# WPA-EAP-SHA256 = Like WPA-EAP but using stronger SHA256-based algorithms
-# If not set, this defaults to: WPA-PSK WPA-EAP
-#
-# auth_alg: list of allowed IEEE 802.11 authentication algorithms
-# OPEN = Open System authentication (required for WPA/WPA2)
-# SHARED = Shared Key authentication (requires static WEP keys)
-# LEAP = LEAP/Network EAP (only used with LEAP)
-# If not set, automatic selection is used (Open System with LEAP enabled if
-# LEAP is allowed as one of the EAP methods).
-#
-# pairwise: list of accepted pairwise (unicast) ciphers for WPA
-# CCMP = AES in Counter mode with CBC-MAC [RFC 3610, IEEE 802.11i/D7.0]
-# TKIP = Temporal Key Integrity Protocol [IEEE 802.11i/D7.0]
-# NONE = Use only Group Keys (deprecated, should not be included if APs support
-#	pairwise keys)
-# If not set, this defaults to: CCMP TKIP
-#
-# group: list of accepted group (broadcast/multicast) ciphers for WPA
-# CCMP = AES in Counter mode with CBC-MAC [RFC 3610, IEEE 802.11i/D7.0]
-# TKIP = Temporal Key Integrity Protocol [IEEE 802.11i/D7.0]
-# WEP104 = WEP (Wired Equivalent Privacy) with 104-bit key
-# WEP40 = WEP (Wired Equivalent Privacy) with 40-bit key [IEEE 802.11]
-# If not set, this defaults to: CCMP TKIP WEP104 WEP40
-#
-# psk: WPA preshared key; 256-bit pre-shared key
-# The key used in WPA-PSK mode can be entered either as 64 hex-digits, i.e.,
-# 32 bytes or as an ASCII passphrase (in which case, the real PSK will be
-# generated using the passphrase and SSID). ASCII passphrase must be between
-# 8 and 63 characters (inclusive).
-# This field is not needed, if WPA-EAP is used.
-# Note: Separate tool, wpa_passphrase, can be used to generate 256-bit keys
-# from ASCII passphrase. This process uses lot of CPU and wpa_supplicant
-# startup and reconfiguration time can be optimized by generating the PSK only
-# only when the passphrase or SSID has actually changed.
-#
-# eapol_flags: IEEE 802.1X/EAPOL options (bit field)
-# Dynamic WEP key required for non-WPA mode
-# bit0 (1): require dynamically generated unicast WEP key
-# bit1 (2): require dynamically generated broadcast WEP key
-# 	(3 = require both keys; default)
-# Note: When using wired authentication, eapol_flags must be set to 0 for the
-# authentication to be completed successfully.
-#
-# mixed_cell: This option can be used to configure whether so called mixed
-# cells, i.e., networks that use both plaintext and encryption in the same
-# SSID, are allowed when selecting a BSS form scan results.
-# 0 = disabled (default)
-# 1 = enabled
-#
-# proactive_key_caching:
-# Enable/disable opportunistic PMKSA caching for WPA2.
-# 0 = disabled (default)
-# 1 = enabled
-#
-# wep_key0..3: Static WEP key (ASCII in double quotation, e.g. "abcde" or
-# hex without quotation, e.g., 0102030405)
-# wep_tx_keyidx: Default WEP key index (TX) (0..3)
-#
-# peerkey: Whether PeerKey negotiation for direct links (IEEE 802.11e DLS) is
-# allowed. This is only used with RSN/WPA2.
-# 0 = disabled (default)
-# 1 = enabled
-#peerkey=1
-#
-# wpa_ptk_rekey: Maximum lifetime for PTK in seconds. This can be used to
-# enforce rekeying of PTK to mitigate some attacks against TKIP deficiencies.
-#
-# Following fields are only used with internal EAP implementation.
-# eap: space-separated list of accepted EAP methods
-#	MD5 = EAP-MD5 (unsecure and does not generate keying material ->
-#			cannot be used with WPA; to be used as a Phase 2 method
-#			with EAP-PEAP or EAP-TTLS)
-#       MSCHAPV2 = EAP-MSCHAPv2 (cannot be used separately with WPA; to be used
-#		as a Phase 2 method with EAP-PEAP or EAP-TTLS)
-#       OTP = EAP-OTP (cannot be used separately with WPA; to be used
-#		as a Phase 2 method with EAP-PEAP or EAP-TTLS)
-#       GTC = EAP-GTC (cannot be used separately with WPA; to be used
-#		as a Phase 2 method with EAP-PEAP or EAP-TTLS)
-#	TLS = EAP-TLS (client and server certificate)
-#	PEAP = EAP-PEAP (with tunnelled EAP authentication)
-#	TTLS = EAP-TTLS (with tunnelled EAP or PAP/CHAP/MSCHAP/MSCHAPV2
-#			 authentication)
-#	If not set, all compiled in methods are allowed.
-#
-# identity: Identity string for EAP
-#	This field is also used to configure user NAI for
-#	EAP-PSK/PAX/SAKE/GPSK.
-# anonymous_identity: Anonymous identity string for EAP (to be used as the
-#	unencrypted identity with EAP types that support different tunnelled
-#	identity, e.g., EAP-TTLS)
-# password: Password string for EAP. This field can include either the
-#	plaintext password (using ASCII or hex string) or a NtPasswordHash
-#	(16-byte MD4 hash of password) in hash:<32 hex digits> format.
-#	NtPasswordHash can only be used when the password is for MSCHAPv2 or
-#	MSCHAP (EAP-MSCHAPv2, EAP-TTLS/MSCHAPv2, EAP-TTLS/MSCHAP, LEAP).
-#	EAP-PSK (128-bit PSK), EAP-PAX (128-bit PSK), and EAP-SAKE (256-bit
-#	PSK) is also configured using this field. For EAP-GPSK, this is a
-#	variable length PSK.
-# ca_cert: File path to CA certificate file (PEM/DER). This file can have one
-#	or more trusted CA certificates. If ca_cert and ca_path are not
-#	included, server certificate will not be verified. This is insecure and
-#	a trusted CA certificate should always be configured when using
-#	EAP-TLS/TTLS/PEAP. Full path should be used since working directory may
-#	change when wpa_supplicant is run in the background.
-#	On Windows, trusted CA certificates can be loaded from the system
-#	certificate store by setting this to cert_store://, e.g.,
-#	ca_cert="cert_store://CA" or ca_cert="cert_store://ROOT".
-#	Note that when running wpa_supplicant as an application, the user
-#	certificate store (My user account) is used, whereas computer store
-#	(Computer account) is used when running wpasvc as a service.
-# ca_path: Directory path for CA certificate files (PEM). This path may
-#	contain multiple CA certificates in OpenSSL format. Common use for this
-#	is to point to system trusted CA list which is often installed into
-#	directory like /etc/ssl/certs. If configured, these certificates are
-#	added to the list of trusted CAs. ca_cert may also be included in that
-#	case, but it is not required.
-# client_cert: File path to client certificate file (PEM/DER)
-#	Full path should be used since working directory may change when
-#	wpa_supplicant is run in the background.
-#	Alternatively, a named configuration blob can be used by setting this
-#	to blob://.
-# private_key: File path to client private key file (PEM/DER/PFX)
-#	When PKCS#12/PFX file (.p12/.pfx) is used, client_cert should be
-#	commented out. Both the private key and certificate will be read from
-#	the PKCS#12 file in this case. Full path should be used since working
-#	directory may change when wpa_supplicant is run in the background.
-#	Windows certificate store can be used by leaving client_cert out and
-#	configuring private_key in one of the following formats:
-#	cert://substring_to_match
-#	hash://certificate_thumbprint_in_hex
-#	for example: private_key="hash://63093aa9c47f56ae88334c7b65a4"
-#	Note that when running wpa_supplicant as an application, the user
-#	certificate store (My user account) is used, whereas computer store
-#	(Computer account) is used when running wpasvc as a service.
-#	Alternatively, a named configuration blob can be used by setting this
-#	to blob://.
-# private_key_passwd: Password for private key file (if left out, this will be
-#	asked through control interface)
-# dh_file: File path to DH/DSA parameters file (in PEM format)
-#	This is an optional configuration file for setting parameters for an
-#	ephemeral DH key exchange. In most cases, the default RSA
-#	authentication does not use this configuration. However, it is possible
-#	setup RSA to use ephemeral DH key exchange. In addition, ciphers with
-#	DSA keys always use ephemeral DH keys. This can be used to achieve
-#	forward secrecy. If the file is in DSA parameters format, it will be
-#	automatically converted into DH params.
-# subject_match: Substring to be matched against the subject of the
-#	authentication server certificate. If this string is set, the server
-#	sertificate is only accepted if it contains this string in the subject.
-#	The subject string is in following format:
-#	/C=US/ST=CA/L=San Francisco/CN=Test AS/emailAddress=as@example.com
-# altsubject_match: Semicolon separated string of entries to be matched against
-#	the alternative subject name of the authentication server certificate.
-#	If this string is set, the server sertificate is only accepted if it
-#	contains one of the entries in an alternative subject name extension.
-#	altSubjectName string is in following format: TYPE:VALUE
-#	Example: EMAIL:server@example.com
-#	Example: DNS:server.example.com;DNS:server2.example.com
-#	Following types are supported: EMAIL, DNS, URI
-# phase1: Phase1 (outer authentication, i.e., TLS tunnel) parameters
-#	(string with field-value pairs, e.g., "peapver=0" or
-#	"peapver=1 peaplabel=1")
-#	'peapver' can be used to force which PEAP version (0 or 1) is used.
-#	'peaplabel=1' can be used to force new label, "client PEAP encryption",
-#	to be used during key derivation when PEAPv1 or newer. Most existing
-#	PEAPv1 implementation seem to be using the old label, "client EAP
-#	encryption", and wpa_supplicant is now using that as the default value.
-#	Some servers, e.g., Radiator, may require peaplabel=1 configuration to
-#	interoperate with PEAPv1; see eap_testing.txt for more details.
-#	'peap_outer_success=0' can be used to terminate PEAP authentication on
-#	tunneled EAP-Success. This is required with some RADIUS servers that
-#	implement draft-josefsson-pppext-eap-tls-eap-05.txt (e.g.,
-#	Lucent NavisRadius v4.4.0 with PEAP in "IETF Draft 5" mode)
-#	include_tls_length=1 can be used to force wpa_supplicant to include
-#	TLS Message Length field in all TLS messages even if they are not
-#	fragmented.
-#	sim_min_num_chal=3 can be used to configure EAP-SIM to require three
-#	challenges (by default, it accepts 2 or 3)
-#	result_ind=1 can be used to enable EAP-SIM and EAP-AKA to use
-#	protected result indication.
-#	'crypto_binding' option can be used to control PEAPv0 cryptobinding
-#	behavior:
-#	 * 0 = do not use cryptobinding (default)
-#	 * 1 = use cryptobinding if server supports it
-#	 * 2 = require cryptobinding
-#	EAP-WSC (WPS) uses following options: pin= or
-#	pbc=1.
-# phase2: Phase2 (inner authentication with TLS tunnel) parameters
-#	(string with field-value pairs, e.g., "auth=MSCHAPV2" for EAP-PEAP or
-#	"autheap=MSCHAPV2 autheap=MD5" for EAP-TTLS)
-# Following certificate/private key fields are used in inner Phase2
-# authentication when using EAP-TTLS or EAP-PEAP.
-# ca_cert2: File path to CA certificate file. This file can have one or more
-#	trusted CA certificates. If ca_cert2 and ca_path2 are not included,
-#	server certificate will not be verified. This is insecure and a trusted
-#	CA certificate should always be configured.
-# ca_path2: Directory path for CA certificate files (PEM)
-# client_cert2: File path to client certificate file
-# private_key2: File path to client private key file
-# private_key2_passwd: Password for private key file
-# dh_file2: File path to DH/DSA parameters file (in PEM format)
-# subject_match2: Substring to be matched against the subject of the
-#	authentication server certificate.
-# altsubject_match2: Substring to be matched against the alternative subject
-#	name of the authentication server certificate.
-#
-# fragment_size: Maximum EAP fragment size in bytes (default 1398).
-#	This value limits the fragment size for EAP methods that support
-#	fragmentation (e.g., EAP-TLS and EAP-PEAP). This value should be set
-#	small enough to make the EAP messages fit in MTU of the network
-#	interface used for EAPOL. The default value is suitable for most
-#	cases.
-#
-# EAP-FAST variables:
-# pac_file: File path for the PAC entries. wpa_supplicant will need to be able
-#	to create this file and write updates to it when PAC is being
-#	provisioned or refreshed. Full path to the file should be used since
-#	working directory may change when wpa_supplicant is run in the
-#	background. Alternatively, a named configuration blob can be used by
-#	setting this to blob://
-# phase1: fast_provisioning option can be used to enable in-line provisioning
-#         of EAP-FAST credentials (PAC):
-#         0 = disabled,
-#         1 = allow unauthenticated provisioning,
-#         2 = allow authenticated provisioning,
-#         3 = allow both unauthenticated and authenticated provisioning
-#	fast_max_pac_list_len= option can be used to set the maximum
-#		number of PAC entries to store in a PAC list (default: 10)
-#	fast_pac_format=binary option can be used to select binary format for
-#		storing PAC entries in order to save some space (the default
-#		text format uses about 2.5 times the size of minimal binary
-#		format)
-#
-# wpa_supplicant supports number of "EAP workarounds" to work around
-# interoperability issues with incorrectly behaving authentication servers.
-# These are enabled by default because some of the issues are present in large
-# number of authentication servers. Strict EAP conformance mode can be
-# configured by disabling workarounds with eap_workaround=0.
-
-# Example blocks:
-
-# Simple case: WPA-PSK, PSK as an ASCII passphrase, allow all valid ciphers
-network={
-	ssid="simple"
-	psk="very secret passphrase"
-	priority=5
-}
-
-# Same as previous, but request SSID-specific scanning (for APs that reject
-# broadcast SSID)
-network={
-	ssid="second ssid"
-	scan_ssid=1
-	psk="very secret passphrase"
-	priority=2
-}
-
 # Only WPA-PSK is used. Any valid cipher combination is accepted.
 network={
 	ssid="example"
@@ -535,149 +9,6 @@ network={
 	priority=2
 }
 
-# WPA-Personal(PSK) with TKIP and enforcement for frequent PTK rekeying
-network={
-	ssid="example"
-	proto=WPA
-	key_mgmt=WPA-PSK
-	pairwise=TKIP
-	group=TKIP
-	psk="not so secure passphrase"
-	wpa_ptk_rekey=600
-}
-
-# Only WPA-EAP is used. Both CCMP and TKIP is accepted. An AP that used WEP104
-# or WEP40 as the group cipher will not be accepted.
-network={
-	ssid="example"
-	proto=RSN
-	key_mgmt=WPA-EAP
-	pairwise=CCMP TKIP
-	group=CCMP TKIP
-	eap=TLS
-	identity="user@example.com"
-	ca_cert="/etc/cert/ca.pem"
-	client_cert="/etc/cert/user.pem"
-	private_key="/etc/cert/user.prv"
-	private_key_passwd="password"
-	priority=1
-}
-
-# EAP-PEAP/MSCHAPv2 configuration for RADIUS servers that use the new peaplabel
-# (e.g., Radiator)
-network={
-	ssid="example"
-	key_mgmt=WPA-EAP
-	eap=PEAP
-	identity="user@example.com"
-	password="foobar"
-	ca_cert="/etc/cert/ca.pem"
-	phase1="peaplabel=1"
-	phase2="auth=MSCHAPV2"
-	priority=10
-}
-
-# EAP-TTLS/EAP-MD5-Challenge configuration with anonymous identity for the
-# unencrypted use. Real identity is sent only within an encrypted TLS tunnel.
-network={
-	ssid="example"
-	key_mgmt=WPA-EAP
-	eap=TTLS
-	identity="user@example.com"
-	anonymous_identity="anonymous@example.com"
-	password="foobar"
-	ca_cert="/etc/cert/ca.pem"
-	priority=2
-}
-
-# EAP-TTLS/MSCHAPv2 configuration with anonymous identity for the unencrypted
-# use. Real identity is sent only within an encrypted TLS tunnel.
-network={
-	ssid="example"
-	key_mgmt=WPA-EAP
-	eap=TTLS
-	identity="user@example.com"
-	anonymous_identity="anonymous@example.com"
-	password="foobar"
-	ca_cert="/etc/cert/ca.pem"
-	phase2="auth=MSCHAPV2"
-}
-
-# WPA-EAP, EAP-TTLS with different CA certificate used for outer and inner
-# authentication.
-network={
-	ssid="example"
-	key_mgmt=WPA-EAP
-	eap=TTLS
-	# Phase1 / outer authentication
-	anonymous_identity="anonymous@example.com"
-	ca_cert="/etc/cert/ca.pem"
-	# Phase 2 / inner authentication
-	phase2="autheap=TLS"
-	ca_cert2="/etc/cert/ca2.pem"
-	client_cert2="/etc/cer/user.pem"
-	private_key2="/etc/cer/user.prv"
-	private_key2_passwd="password"
-	priority=2
-}
-
-# Both WPA-PSK and WPA-EAP is accepted. Only CCMP is accepted as pairwise and
-# group cipher.
-network={
-	ssid="example"
-	bssid=00:11:22:33:44:55
-	proto=WPA RSN
-	key_mgmt=WPA-PSK WPA-EAP
-	pairwise=CCMP
-	group=CCMP
-	psk=06b4be19da289f475aa46a33cb793029d4ab3db7a23ee92382eb0106c72ac7bb
-}
-
-# Special characters in SSID, so use hex string. Default to WPA-PSK, WPA-EAP
-# and all valid ciphers.
-network={
-	ssid=00010203
-	psk=000102030405060708090a0b0c0d0e0f101112131415161718191a1b1c1d1e1f
-}
-
-
-# EAP-SIM with a GSM SIM or USIM
-network={
-	ssid="eap-sim-test"
-	key_mgmt=WPA-EAP
-	eap=SIM
-	pin="1234"
-	pcsc=""
-}
-
-
-# EAP-PSK
-network={
-	ssid="eap-psk-test"
-	key_mgmt=WPA-EAP
-	eap=PSK
-	anonymous_identity="eap_psk_user"
-	password=06b4be19da289f475aa46a33cb793029
-	identity="eap_psk_user@example.com"
-}
-
-
-# IEEE 802.1X/EAPOL with dynamically generated WEP keys (i.e., no WPA) using
-# EAP-TLS for authentication and key generation; require both unicast and
-# broadcast WEP keys.
-network={
-	ssid="1xtest"
-	key_mgmt=IEEE8021X
-	eap=TLS
-	identity="user@example.com"
-	ca_cert="/etc/cert/ca.pem"
-	client_cert="/etc/cert/user.pem"
-	private_key="/etc/cert/user.prv"
-	private_key_passwd="password"
-	eapol_flags=3
-}
-
-
 # LEAP with dynamic WEP keys
 network={
 	ssid="leap-example"
@@ -687,45 +18,6 @@ network={
 	password="foobar"
 }
 
-# EAP-IKEv2 using shared secrets for both server and peer authentication
-network={
-	ssid="ikev2-example"
-	key_mgmt=WPA-EAP
-	eap=IKEV2
-	identity="user"
-	password="foobar"
-}
-
-# EAP-FAST with WPA (WPA or WPA2)
-network={
-	ssid="eap-fast-test"
-	key_mgmt=WPA-EAP
-	eap=FAST
-	anonymous_identity="FAST-000102030405"
-	identity="username"
-	password="password"
-	phase1="fast_provisioning=1"
-	pac_file="/etc/wpa_supplicant.eap-fast-pac"
-}
-
-network={
-	ssid="eap-fast-test"
-	key_mgmt=WPA-EAP
-	eap=FAST
-	anonymous_identity="FAST-000102030405"
-	identity="username"
-	password="password"
-	phase1="fast_provisioning=1"
-	pac_file="blob://eap-fast-pac"
-}
-
-# Plaintext connection (no WPA, no IEEE 802.1X)
-network={
-	ssid="plaintext-test"
-	key_mgmt=NONE
-}
-
-
 # Shared WEP key connection (no WPA, no IEEE 802.1X)
 network={
 	ssid="static-wep-test"
@@ -737,107 +29,12 @@ network={
 	priority=5
 }
 
-
-# Shared WEP key connection (no WPA, no IEEE 802.1X) using Shared Key
-# IEEE 802.11 authentication
-network={
-	ssid="static-wep-test2"
-	key_mgmt=NONE
-	wep_key0="abcde"
-	wep_key1=0102030405
-	wep_key2="1234567890123"
-	wep_tx_keyidx=0
-	priority=5
-	auth_alg=SHARED
-}
-
-
-# IBSS/ad-hoc network with WPA-None/TKIP.
-network={
-	ssid="test adhoc"
-	mode=1
-	frequency=2412
-	proto=WPA
-	key_mgmt=WPA-NONE
-	pairwise=NONE
-	group=TKIP
-	psk="secret passphrase"
-}
-
-
-# Catch all example that allows more or less all configuration modes
-network={
-	ssid="example"
-	scan_ssid=1
-	key_mgmt=WPA-EAP WPA-PSK IEEE8021X NONE
-	pairwise=CCMP TKIP
-	group=CCMP TKIP WEP104 WEP40
-	psk="very secret passphrase"
-	eap=TTLS PEAP TLS
-	identity="user@example.com"
-	password="foobar"
-	ca_cert="/etc/cert/ca.pem"
-	client_cert="/etc/cert/user.pem"
-	private_key="/etc/cert/user.prv"
-	private_key_passwd="password"
-	phase1="peaplabel=0"
-}
-
-# Example of EAP-TLS with smartcard (openssl engine)
-network={
-	ssid="example"
-	key_mgmt=WPA-EAP
-	eap=TLS
-	proto=RSN
-	pairwise=CCMP TKIP
-	group=CCMP TKIP
-	identity="user@example.com"
-	ca_cert="/etc/cert/ca.pem"
-	client_cert="/etc/cert/user.pem"
-
-	engine=1
-
-	# The engine configured here must be available. Look at
-	# OpenSSL engine support in the global section.
-	# The key available through the engine must be the private key
-	# matching the client certificate configured above.
-
-	# use the opensc engine
-	#engine_id="opensc"
-	#key_id="45"
-
-	# use the pkcs11 engine
-	engine_id="pkcs11"
-	key_id="id_45"
-
-	# Optional PIN configuration; this can be left out and PIN will be
-	# asked through the control interface
-	pin="1234"
-}
-
-# Example configuration showing how to use an inlined blob as a CA certificate
-# data instead of using external file
-network={
-	ssid="example"
-	key_mgmt=WPA-EAP
-	eap=TTLS
-	identity="user@example.com"
-	anonymous_identity="anonymous@example.com"
-	password="foobar"
-	ca_cert="blob://exampleblob"
-	priority=20
-}
-
-blob-base64-exampleblob={
-SGVsbG8gV29ybGQhCg==
-}
-
-
 # Wildcard match for SSID (plaintext APs only). This example select any
 # open AP regardless of its SSID.
 network={
 	key_mgmt=NONE
 }
+
 network={
   ssid="myxjtu2"
   scan_ssid=1
@@ -852,6 +49,7 @@ network={
   auth_alg=OPEN
   mode=1
 }
+
 network={
 	ssid=ab3ace
 	key_mgmt=WPA-EAP
diff --git a/src/settings/plugins/ifnet/wpa_parser.c b/src/settings/plugins/ifnet/wpa_parser.c
index 0fd7d16b..e517bf12 100644
--- a/src/settings/plugins/ifnet/wpa_parser.c
+++ b/src/settings/plugins/ifnet/wpa_parser.c
@@ -163,7 +163,7 @@ add_one_wep_key (GHashTable * table, int key_num, gchar * one_wep_key)
 }
 
 /* Reading wep security information from /etc/conf.d/net.
- * This should not be used in futre, use wpa_supplicant instead. */
+ * This should not be used in future, use wpa_supplicant instead. */
 static void
 add_keys_from_net ()
 {
diff --git a/src/settings/plugins/ifupdown/Makefile.am b/src/settings/plugins/ifupdown/Makefile.am
index 9f9d0218..9d0ad259 100644
--- a/src/settings/plugins/ifupdown/Makefile.am
+++ b/src/settings/plugins/ifupdown/Makefile.am
@@ -1,11 +1,13 @@
-SUBDIRS=. tests
+SUBDIRS = . tests
 
 INCLUDES = \
 	-I$(top_srcdir)/src/logging \
 	-I$(top_srcdir)/src/settings \
 	-I$(top_srcdir)/include \
+	-I$(top_builddir)/include \
 	-I$(top_srcdir)/libnm-glib \
-	-I$(top_srcdir)/libnm-util
+	-I$(top_srcdir)/libnm-util \
+	-I$(top_builddir)/libnm-util
 
 noinst_LTLIBRARIES = libifupdown-io.la
 
@@ -18,13 +20,11 @@ libifupdown_io_la_SOURCES = \
 libifupdown_io_la_CPPFLAGS = \
 	$(GLIB_CFLAGS) \
 	$(DBUS_CFLAGS) \
-	-DG_DISABLE_DEPRECATED \
 	-DSYSCONFDIR=\"$(sysconfdir)\"
 
 libifupdown_io_la_LIBADD = \
 	$(top_builddir)/libnm-util/libnm-util.la \
-	$(GLIB_LIBS) \
-	$(GMODULE_LIBS)
+	$(GLIB_LIBS)
 
 pkglib_LTLIBRARIES = libnm-settings-plugin-ifupdown.la
 
@@ -36,10 +36,8 @@ libnm_settings_plugin_ifupdown_la_SOURCES = \
 
 libnm_settings_plugin_ifupdown_la_CPPFLAGS = \
 	$(GLIB_CFLAGS) \
-	$(GMODULE_CFLAGS) \
 	$(DBUS_CFLAGS) \
 	$(GUDEV_CFLAGS) \
-	-DG_DISABLE_DEPRECATED \
 	-DSYSCONFDIR=\"$(sysconfdir)\"
 
 libnm_settings_plugin_ifupdown_la_LDFLAGS = -module -avoid-version
@@ -48,6 +46,5 @@ libnm_settings_plugin_ifupdown_la_LIBADD = \
 	$(top_builddir)/src/logging/libnm-logging.la \
 	libifupdown-io.la \
 	$(GLIB_LIBS) \
-	$(GMODULE_LIBS) \
 	$(GUDEV_LIBS)
 
diff --git a/src/settings/plugins/ifupdown/Makefile.in b/src/settings/plugins/ifupdown/Makefile.in
index 5663847e..def93ad7 100644
--- a/src/settings/plugins/ifupdown/Makefile.in
+++ b/src/settings/plugins/ifupdown/Makefile.in
@@ -55,16 +55,18 @@ subdir = src/settings/plugins/ifupdown
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/compiler_warnings.m4 \
-	$(top_srcdir)/m4/gettext.m4 $(top_srcdir)/m4/gtk-doc.m4 \
-	$(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/intlmacosx.m4 \
-	$(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/introspection.m4 \
-	$(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \
-	$(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/libnl-check.m4 \
-	$(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \
-	$(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
-	$(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/nls.m4 \
-	$(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/progtest.m4 \
-	$(top_srcdir)/m4/vapigen.m4 $(top_srcdir)/configure.ac
+	$(top_srcdir)/m4/gettext.m4 \
+	$(top_srcdir)/m4/gnome-code-coverage.m4 \
+	$(top_srcdir)/m4/gtk-doc.m4 $(top_srcdir)/m4/iconv.m4 \
+	$(top_srcdir)/m4/intlmacosx.m4 $(top_srcdir)/m4/intltool.m4 \
+	$(top_srcdir)/m4/introspection.m4 $(top_srcdir)/m4/lib-ld.m4 \
+	$(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \
+	$(top_srcdir)/m4/libnl-check.m4 $(top_srcdir)/m4/libtool.m4 \
+	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
+	$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
+	$(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/po.m4 \
+	$(top_srcdir)/m4/progtest.m4 $(top_srcdir)/m4/vapigen.m4 \
+	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(install_sh) -d
@@ -102,8 +104,7 @@ am__installdirs = "$(DESTDIR)$(pkglibdir)"
 LTLIBRARIES = $(noinst_LTLIBRARIES) $(pkglib_LTLIBRARIES)
 am__DEPENDENCIES_1 =
 libifupdown_io_la_DEPENDENCIES =  \
-	$(top_builddir)/libnm-util/libnm-util.la $(am__DEPENDENCIES_1) \
-	$(am__DEPENDENCIES_1)
+	$(top_builddir)/libnm-util/libnm-util.la $(am__DEPENDENCIES_1)
 am_libifupdown_io_la_OBJECTS = libifupdown_io_la-interface_parser.lo \
 	libifupdown_io_la-parser.lo
 libifupdown_io_la_OBJECTS = $(am_libifupdown_io_la_OBJECTS)
@@ -113,8 +114,7 @@ am__v_lt_0 = --silent
 libnm_settings_plugin_ifupdown_la_DEPENDENCIES =  \
 	$(top_builddir)/libnm-util/libnm-util.la \
 	$(top_builddir)/src/logging/libnm-logging.la libifupdown-io.la \
-	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
-	$(am__DEPENDENCIES_1)
+	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
 am_libnm_settings_plugin_ifupdown_la_OBJECTS =  \
 	libnm_settings_plugin_ifupdown_la-nm-ifupdown-connection.lo \
 	libnm_settings_plugin_ifupdown_la-plugin.lo
@@ -212,6 +212,10 @@ AWK = @AWK@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
+CKDB_PATH = @CKDB_PATH@
+CODE_COVERAGE_CFLAGS = @CODE_COVERAGE_CFLAGS@
+CODE_COVERAGE_ENABLED = @CODE_COVERAGE_ENABLED@
+CODE_COVERAGE_LDFLAGS = @CODE_COVERAGE_LDFLAGS@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CXX = @CXX@
@@ -226,9 +230,7 @@ DBUS_SYS_DIR = @DBUS_SYS_DIR@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
 DHCLIENT_PATH = @DHCLIENT_PATH@
-DHCLIENT_VERSION = @DHCLIENT_VERSION@
 DHCPCD_PATH = @DHCPCD_PATH@
-DISABLE_DEPRECATED = @DISABLE_DEPRECATED@
 DLLTOOL = @DLLTOOL@
 DSYMUTIL = @DSYMUTIL@
 DUMPBIN = @DUMPBIN@
@@ -238,17 +240,14 @@ ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
 FGREP = @FGREP@
+GENHTML = @GENHTML@
 GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
 GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
-GIO_CFLAGS = @GIO_CFLAGS@
-GIO_LIBS = @GIO_LIBS@
 GLIB_CFLAGS = @GLIB_CFLAGS@
 GLIB_GENMARSHAL = @GLIB_GENMARSHAL@
 GLIB_LIBS = @GLIB_LIBS@
 GLIB_MAKEFILE = @GLIB_MAKEFILE@
 GLIB_MKENUMS = @GLIB_MKENUMS@
-GMODULE_CFLAGS = @GMODULE_CFLAGS@
-GMODULE_LIBS = @GMODULE_LIBS@
 GMSGFMT = @GMSGFMT@
 GMSGFMT_015 = @GMSGFMT_015@
 GNUTLS_CFLAGS = @GNUTLS_CFLAGS@
@@ -289,6 +288,7 @@ IPTABLES_PATH = @IPTABLES_PATH@
 IWMX_SDK_CFLAGS = @IWMX_SDK_CFLAGS@
 IWMX_SDK_LIBS = @IWMX_SDK_LIBS@
 KERNEL_FIRMWARE_DIR = @KERNEL_FIRMWARE_DIR@
+LCOV = @LCOV@
 LD = @LD@
 LDFLAGS = @LDFLAGS@
 LIBDL = @LIBDL@
@@ -305,11 +305,7 @@ LIBNL2_LIBS = @LIBNL2_LIBS@
 LIBNL3_CFLAGS = @LIBNL3_CFLAGS@
 LIBNL3_LIBS = @LIBNL3_LIBS@
 LIBNL_CFLAGS = @LIBNL_CFLAGS@
-LIBNL_GENL3_CFLAGS = @LIBNL_GENL3_CFLAGS@
-LIBNL_GENL3_LIBS = @LIBNL_GENL3_LIBS@
 LIBNL_LIBS = @LIBNL_LIBS@
-LIBNL_ROUTE3_CFLAGS = @LIBNL_ROUTE3_CFLAGS@
-LIBNL_ROUTE3_LIBS = @LIBNL_ROUTE3_LIBS@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
 LIBSOUP_CFLAGS = @LIBSOUP_CFLAGS@
@@ -324,6 +320,8 @@ MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MANIFEST_TOOL = @MANIFEST_TOOL@
 MKDIR_P = @MKDIR_P@
+MM_GLIB_CFLAGS = @MM_GLIB_CFLAGS@
+MM_GLIB_LIBS = @MM_GLIB_LIBS@
 MOC = @MOC@
 MSGFMT = @MSGFMT@
 MSGFMT_015 = @MSGFMT_015@
@@ -333,6 +331,7 @@ NMEDIT = @NMEDIT@
 NM_MAJOR_VERSION = @NM_MAJOR_VERSION@
 NM_MICRO_VERSION = @NM_MICRO_VERSION@
 NM_MINOR_VERSION = @NM_MINOR_VERSION@
+NM_MODIFY_SYSTEM_POLICY = @NM_MODIFY_SYSTEM_POLICY@
 NM_VERSION = @NM_VERSION@
 NSS_CFLAGS = @NSS_CFLAGS@
 NSS_LIBS = @NSS_LIBS@
@@ -359,13 +358,14 @@ PPPD_PLUGIN_DIR = @PPPD_PLUGIN_DIR@
 QT_CFLAGS = @QT_CFLAGS@
 QT_LIBS = @QT_LIBS@
 RANLIB = @RANLIB@
-RESOLVCONF_PATH = @RESOLVCONF_PATH@
 SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
-SYSTEMD_CFLAGS = @SYSTEMD_CFLAGS@
-SYSTEMD_LIBS = @SYSTEMD_LIBS@
+SYSTEMD_INHIBIT_CFLAGS = @SYSTEMD_INHIBIT_CFLAGS@
+SYSTEMD_INHIBIT_LIBS = @SYSTEMD_INHIBIT_LIBS@
+SYSTEMD_LOGIN_CFLAGS = @SYSTEMD_LOGIN_CFLAGS@
+SYSTEMD_LOGIN_LIBS = @SYSTEMD_LOGIN_LIBS@
 SYSTEM_CA_PATH = @SYSTEM_CA_PATH@
 UDEV_BASE_DIR = @UDEV_BASE_DIR@
 USE_NLS = @USE_NLS@
@@ -420,6 +420,11 @@ localedir = @localedir@
 localstatedir = @localstatedir@
 mandir = @mandir@
 mkdir_p = @mkdir_p@
+nmbinary = @nmbinary@
+nmconfdir = @nmconfdir@
+nmdatadir = @nmdatadir@
+nmrundir = @nmrundir@
+nmstatedir = @nmstatedir@
 oldincludedir = @oldincludedir@
 pdfdir = @pdfdir@
 prefix = @prefix@
@@ -434,13 +439,19 @@ target_alias = @target_alias@
 top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
+with_dhclient = @with_dhclient@
+with_dhcpcd = @with_dhcpcd@
+with_netconfig = @with_netconfig@
+with_resolvconf = @with_resolvconf@
 SUBDIRS = . tests
 INCLUDES = \
 	-I$(top_srcdir)/src/logging \
 	-I$(top_srcdir)/src/settings \
 	-I$(top_srcdir)/include \
+	-I$(top_builddir)/include \
 	-I$(top_srcdir)/libnm-glib \
-	-I$(top_srcdir)/libnm-util
+	-I$(top_srcdir)/libnm-util \
+	-I$(top_builddir)/libnm-util
 
 noinst_LTLIBRARIES = libifupdown-io.la
 libifupdown_io_la_SOURCES = \
@@ -452,13 +463,11 @@ libifupdown_io_la_SOURCES = \
 libifupdown_io_la_CPPFLAGS = \
 	$(GLIB_CFLAGS) \
 	$(DBUS_CFLAGS) \
-	-DG_DISABLE_DEPRECATED \
 	-DSYSCONFDIR=\"$(sysconfdir)\"
 
 libifupdown_io_la_LIBADD = \
 	$(top_builddir)/libnm-util/libnm-util.la \
-	$(GLIB_LIBS) \
-	$(GMODULE_LIBS)
+	$(GLIB_LIBS)
 
 pkglib_LTLIBRARIES = libnm-settings-plugin-ifupdown.la
 libnm_settings_plugin_ifupdown_la_SOURCES = \
@@ -469,10 +478,8 @@ libnm_settings_plugin_ifupdown_la_SOURCES = \
 
 libnm_settings_plugin_ifupdown_la_CPPFLAGS = \
 	$(GLIB_CFLAGS) \
-	$(GMODULE_CFLAGS) \
 	$(DBUS_CFLAGS) \
 	$(GUDEV_CFLAGS) \
-	-DG_DISABLE_DEPRECATED \
 	-DSYSCONFDIR=\"$(sysconfdir)\"
 
 libnm_settings_plugin_ifupdown_la_LDFLAGS = -module -avoid-version
@@ -481,7 +488,6 @@ libnm_settings_plugin_ifupdown_la_LIBADD = \
 	$(top_builddir)/src/logging/libnm-logging.la \
 	libifupdown-io.la \
 	$(GLIB_LIBS) \
-	$(GMODULE_LIBS) \
 	$(GUDEV_LIBS)
 
 all: all-recursive
@@ -576,25 +582,22 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libnm_settings_plugin_ifupdown_la-plugin.Plo@am__quote@
 
 .c.o:
-@am__fastdepCC_TRUE@	$(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\
-@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
-@am__fastdepCC_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.Po
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $<
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c $<
 
 .c.obj:
-@am__fastdepCC_TRUE@	$(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.obj$$||'`;\
-@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ `$(CYGPATH_W) '$<'` &&\
-@am__fastdepCC_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.Po
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c `$(CYGPATH_W) '$<'`
 
 .c.lo:
-@am__fastdepCC_TRUE@	$(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.lo$$||'`;\
-@am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
-@am__fastdepCC_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.Plo
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $<
diff --git a/src/settings/plugins/ifupdown/parser.c b/src/settings/plugins/ifupdown/parser.c
index 7016b35f..d81fd84d 100644
--- a/src/settings/plugins/ifupdown/parser.c
+++ b/src/settings/plugins/ifupdown/parser.c
@@ -25,7 +25,6 @@
 #include 
 #include 
 #include 
-#include 
 
 #include 
 #include 
@@ -447,7 +446,7 @@ ifupdown_ip4_add_dns (NMSettingIP4Config *s_ip4, const char *dns)
 	list = g_strsplit_set (dns, " \t", -1);
 	for (iter = list; iter && *iter; iter++) {
 		g_strstrip (*iter);
-		if (isblank (*iter[0]))
+		if (g_ascii_isspace (*iter[0]))
 			continue;
 		if (!inet_pton (AF_INET, *iter, &addr)) {
 			PLUGIN_WARN ("SCPlugin-Ifupdown",
@@ -553,7 +552,7 @@ update_ip4_setting_from_if_block(NMConnection *connection,
 			list = g_strsplit_set (search_v, " \t", -1);
 			for (iter = list; iter && *iter; iter++) {
 				g_strstrip (*iter);
-				if (isblank (*iter[0]))
+				if (g_ascii_isspace (*iter[0]))
 					continue;
 				if (!nm_setting_ip4_config_add_dns_search (s_ip4, *iter)) {
 					PLUGIN_WARN ("SCPlugin-Ifupdown",
@@ -586,7 +585,7 @@ ifupdown_ip6_add_dns (NMSettingIP6Config *s_ip6, const char *dns)
 	list = g_strsplit_set (dns, " \t", -1);
 	for (iter = list; iter && *iter; iter++) {
 		g_strstrip (*iter);
-		if (isblank (*iter[0]))
+		if (g_ascii_isspace (*iter[0]))
 			continue;
 		if (!inet_pton (AF_INET6, *iter, &addr)) {
 			PLUGIN_WARN ("SCPlugin-Ifupdown",
diff --git a/src/settings/plugins/ifupdown/tests/Makefile.am b/src/settings/plugins/ifupdown/tests/Makefile.am
index 54eeda7e..6bde26fe 100644
--- a/src/settings/plugins/ifupdown/tests/Makefile.am
+++ b/src/settings/plugins/ifupdown/tests/Makefile.am
@@ -1,6 +1,10 @@
+if ENABLE_TESTS
+
 INCLUDES = \
 	-I$(top_srcdir)/include \
+	-I$(top_builddir)/include \
 	-I$(top_srcdir)/libnm-util \
+	-I$(top_builddir)/libnm-util \
 	-I$(top_srcdir)/libnm-glib \
 	-I$(srcdir)/../
 
@@ -20,14 +24,12 @@ test_ifupdown_LDADD = \
 	$(builddir)/../libifupdown-io.la \
 	$(DBUS_LIBS)
 
-if WITH_TESTS
-
 check-local: test-ifupdown
 	$(abs_builddir)/test-ifupdown
 
-endif
-
 EXTRA_DIST = \
 	test1 test2 test3 test4 test5 test6 test7 test8 test9 test11 test12 \
 	test13 test14 test15 test16 test17-wired-static-verify-ip4 \
 	test18-wired-static-verify-ip6 test19-wired-static-verify-ip4-plen
+
+endif
diff --git a/src/settings/plugins/ifupdown/tests/Makefile.in b/src/settings/plugins/ifupdown/tests/Makefile.in
index 8d7ef490..2d4be7bf 100644
--- a/src/settings/plugins/ifupdown/tests/Makefile.in
+++ b/src/settings/plugins/ifupdown/tests/Makefile.in
@@ -51,21 +51,23 @@ PRE_UNINSTALL = :
 POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
-noinst_PROGRAMS = test-ifupdown$(EXEEXT)
+@ENABLE_TESTS_TRUE@noinst_PROGRAMS = test-ifupdown$(EXEEXT)
 subdir = src/settings/plugins/ifupdown/tests
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/compiler_warnings.m4 \
-	$(top_srcdir)/m4/gettext.m4 $(top_srcdir)/m4/gtk-doc.m4 \
-	$(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/intlmacosx.m4 \
-	$(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/introspection.m4 \
-	$(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \
-	$(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/libnl-check.m4 \
-	$(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \
-	$(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
-	$(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/nls.m4 \
-	$(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/progtest.m4 \
-	$(top_srcdir)/m4/vapigen.m4 $(top_srcdir)/configure.ac
+	$(top_srcdir)/m4/gettext.m4 \
+	$(top_srcdir)/m4/gnome-code-coverage.m4 \
+	$(top_srcdir)/m4/gtk-doc.m4 $(top_srcdir)/m4/iconv.m4 \
+	$(top_srcdir)/m4/intlmacosx.m4 $(top_srcdir)/m4/intltool.m4 \
+	$(top_srcdir)/m4/introspection.m4 $(top_srcdir)/m4/lib-ld.m4 \
+	$(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \
+	$(top_srcdir)/m4/libnl-check.m4 $(top_srcdir)/m4/libtool.m4 \
+	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
+	$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
+	$(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/po.m4 \
+	$(top_srcdir)/m4/progtest.m4 $(top_srcdir)/m4/vapigen.m4 \
+	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(install_sh) -d
@@ -73,12 +75,16 @@ CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
 CONFIG_CLEAN_VPATH_FILES =
 PROGRAMS = $(noinst_PROGRAMS)
-am_test_ifupdown_OBJECTS = test_ifupdown-test-ifupdown.$(OBJEXT)
+am__test_ifupdown_SOURCES_DIST = test-ifupdown.c
+@ENABLE_TESTS_TRUE@am_test_ifupdown_OBJECTS =  \
+@ENABLE_TESTS_TRUE@	test_ifupdown-test-ifupdown.$(OBJEXT)
 test_ifupdown_OBJECTS = $(am_test_ifupdown_OBJECTS)
 am__DEPENDENCIES_1 =
-test_ifupdown_DEPENDENCIES = $(top_builddir)/libnm-glib/libnm-glib.la \
-	$(top_builddir)/libnm-util/libnm-util.la \
-	$(builddir)/../libifupdown-io.la $(am__DEPENDENCIES_1)
+@ENABLE_TESTS_TRUE@test_ifupdown_DEPENDENCIES =  \
+@ENABLE_TESTS_TRUE@	$(top_builddir)/libnm-glib/libnm-glib.la \
+@ENABLE_TESTS_TRUE@	$(top_builddir)/libnm-util/libnm-util.la \
+@ENABLE_TESTS_TRUE@	$(builddir)/../libifupdown-io.la \
+@ENABLE_TESTS_TRUE@	$(am__DEPENDENCIES_1)
 AM_V_lt = $(am__v_lt_@AM_V@)
 am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
 am__v_lt_0 = --silent
@@ -109,7 +115,7 @@ AM_V_GEN = $(am__v_GEN_@AM_V@)
 am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
 am__v_GEN_0 = @echo "  GEN   " $@;
 SOURCES = $(test_ifupdown_SOURCES)
-DIST_SOURCES = $(test_ifupdown_SOURCES)
+DIST_SOURCES = $(am__test_ifupdown_SOURCES_DIST)
 am__can_run_installinfo = \
   case $$AM_UPDATE_INFO_DIR in \
     n|no|NO) false;; \
@@ -130,6 +136,10 @@ AWK = @AWK@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
+CKDB_PATH = @CKDB_PATH@
+CODE_COVERAGE_CFLAGS = @CODE_COVERAGE_CFLAGS@
+CODE_COVERAGE_ENABLED = @CODE_COVERAGE_ENABLED@
+CODE_COVERAGE_LDFLAGS = @CODE_COVERAGE_LDFLAGS@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CXX = @CXX@
@@ -144,9 +154,7 @@ DBUS_SYS_DIR = @DBUS_SYS_DIR@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
 DHCLIENT_PATH = @DHCLIENT_PATH@
-DHCLIENT_VERSION = @DHCLIENT_VERSION@
 DHCPCD_PATH = @DHCPCD_PATH@
-DISABLE_DEPRECATED = @DISABLE_DEPRECATED@
 DLLTOOL = @DLLTOOL@
 DSYMUTIL = @DSYMUTIL@
 DUMPBIN = @DUMPBIN@
@@ -156,17 +164,14 @@ ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
 FGREP = @FGREP@
+GENHTML = @GENHTML@
 GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
 GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
-GIO_CFLAGS = @GIO_CFLAGS@
-GIO_LIBS = @GIO_LIBS@
 GLIB_CFLAGS = @GLIB_CFLAGS@
 GLIB_GENMARSHAL = @GLIB_GENMARSHAL@
 GLIB_LIBS = @GLIB_LIBS@
 GLIB_MAKEFILE = @GLIB_MAKEFILE@
 GLIB_MKENUMS = @GLIB_MKENUMS@
-GMODULE_CFLAGS = @GMODULE_CFLAGS@
-GMODULE_LIBS = @GMODULE_LIBS@
 GMSGFMT = @GMSGFMT@
 GMSGFMT_015 = @GMSGFMT_015@
 GNUTLS_CFLAGS = @GNUTLS_CFLAGS@
@@ -207,6 +212,7 @@ IPTABLES_PATH = @IPTABLES_PATH@
 IWMX_SDK_CFLAGS = @IWMX_SDK_CFLAGS@
 IWMX_SDK_LIBS = @IWMX_SDK_LIBS@
 KERNEL_FIRMWARE_DIR = @KERNEL_FIRMWARE_DIR@
+LCOV = @LCOV@
 LD = @LD@
 LDFLAGS = @LDFLAGS@
 LIBDL = @LIBDL@
@@ -223,11 +229,7 @@ LIBNL2_LIBS = @LIBNL2_LIBS@
 LIBNL3_CFLAGS = @LIBNL3_CFLAGS@
 LIBNL3_LIBS = @LIBNL3_LIBS@
 LIBNL_CFLAGS = @LIBNL_CFLAGS@
-LIBNL_GENL3_CFLAGS = @LIBNL_GENL3_CFLAGS@
-LIBNL_GENL3_LIBS = @LIBNL_GENL3_LIBS@
 LIBNL_LIBS = @LIBNL_LIBS@
-LIBNL_ROUTE3_CFLAGS = @LIBNL_ROUTE3_CFLAGS@
-LIBNL_ROUTE3_LIBS = @LIBNL_ROUTE3_LIBS@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
 LIBSOUP_CFLAGS = @LIBSOUP_CFLAGS@
@@ -242,6 +244,8 @@ MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MANIFEST_TOOL = @MANIFEST_TOOL@
 MKDIR_P = @MKDIR_P@
+MM_GLIB_CFLAGS = @MM_GLIB_CFLAGS@
+MM_GLIB_LIBS = @MM_GLIB_LIBS@
 MOC = @MOC@
 MSGFMT = @MSGFMT@
 MSGFMT_015 = @MSGFMT_015@
@@ -251,6 +255,7 @@ NMEDIT = @NMEDIT@
 NM_MAJOR_VERSION = @NM_MAJOR_VERSION@
 NM_MICRO_VERSION = @NM_MICRO_VERSION@
 NM_MINOR_VERSION = @NM_MINOR_VERSION@
+NM_MODIFY_SYSTEM_POLICY = @NM_MODIFY_SYSTEM_POLICY@
 NM_VERSION = @NM_VERSION@
 NSS_CFLAGS = @NSS_CFLAGS@
 NSS_LIBS = @NSS_LIBS@
@@ -277,13 +282,14 @@ PPPD_PLUGIN_DIR = @PPPD_PLUGIN_DIR@
 QT_CFLAGS = @QT_CFLAGS@
 QT_LIBS = @QT_LIBS@
 RANLIB = @RANLIB@
-RESOLVCONF_PATH = @RESOLVCONF_PATH@
 SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
-SYSTEMD_CFLAGS = @SYSTEMD_CFLAGS@
-SYSTEMD_LIBS = @SYSTEMD_LIBS@
+SYSTEMD_INHIBIT_CFLAGS = @SYSTEMD_INHIBIT_CFLAGS@
+SYSTEMD_INHIBIT_LIBS = @SYSTEMD_INHIBIT_LIBS@
+SYSTEMD_LOGIN_CFLAGS = @SYSTEMD_LOGIN_CFLAGS@
+SYSTEMD_LOGIN_LIBS = @SYSTEMD_LOGIN_LIBS@
 SYSTEM_CA_PATH = @SYSTEM_CA_PATH@
 UDEV_BASE_DIR = @UDEV_BASE_DIR@
 USE_NLS = @USE_NLS@
@@ -338,6 +344,11 @@ localedir = @localedir@
 localstatedir = @localstatedir@
 mandir = @mandir@
 mkdir_p = @mkdir_p@
+nmbinary = @nmbinary@
+nmconfdir = @nmconfdir@
+nmdatadir = @nmdatadir@
+nmrundir = @nmrundir@
+nmstatedir = @nmstatedir@
 oldincludedir = @oldincludedir@
 pdfdir = @pdfdir@
 prefix = @prefix@
@@ -352,30 +363,36 @@ target_alias = @target_alias@
 top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
-INCLUDES = \
-	-I$(top_srcdir)/include \
-	-I$(top_srcdir)/libnm-util \
-	-I$(top_srcdir)/libnm-glib \
-	-I$(srcdir)/../
-
-test_ifupdown_SOURCES = \
-	test-ifupdown.c
-
-test_ifupdown_CPPFLAGS = \
-	$(GLIB_CFLAGS) \
-	$(DBUS_CFLAGS) \
-	-DTEST_ENI_DIR=\"$(abs_srcdir)\"
-
-test_ifupdown_LDADD = \
-	$(top_builddir)/libnm-glib/libnm-glib.la \
-	$(top_builddir)/libnm-util/libnm-util.la \
-	$(builddir)/../libifupdown-io.la \
-	$(DBUS_LIBS)
-
-EXTRA_DIST = \
-	test1 test2 test3 test4 test5 test6 test7 test8 test9 test11 test12 \
-	test13 test14 test15 test16 test17-wired-static-verify-ip4 \
-	test18-wired-static-verify-ip6 test19-wired-static-verify-ip4-plen
+with_dhclient = @with_dhclient@
+with_dhcpcd = @with_dhcpcd@
+with_netconfig = @with_netconfig@
+with_resolvconf = @with_resolvconf@
+@ENABLE_TESTS_TRUE@INCLUDES = \
+@ENABLE_TESTS_TRUE@	-I$(top_srcdir)/include \
+@ENABLE_TESTS_TRUE@	-I$(top_builddir)/include \
+@ENABLE_TESTS_TRUE@	-I$(top_srcdir)/libnm-util \
+@ENABLE_TESTS_TRUE@	-I$(top_builddir)/libnm-util \
+@ENABLE_TESTS_TRUE@	-I$(top_srcdir)/libnm-glib \
+@ENABLE_TESTS_TRUE@	-I$(srcdir)/../
+
+@ENABLE_TESTS_TRUE@test_ifupdown_SOURCES = \
+@ENABLE_TESTS_TRUE@	test-ifupdown.c
+
+@ENABLE_TESTS_TRUE@test_ifupdown_CPPFLAGS = \
+@ENABLE_TESTS_TRUE@	$(GLIB_CFLAGS) \
+@ENABLE_TESTS_TRUE@	$(DBUS_CFLAGS) \
+@ENABLE_TESTS_TRUE@	-DTEST_ENI_DIR=\"$(abs_srcdir)\"
+
+@ENABLE_TESTS_TRUE@test_ifupdown_LDADD = \
+@ENABLE_TESTS_TRUE@	$(top_builddir)/libnm-glib/libnm-glib.la \
+@ENABLE_TESTS_TRUE@	$(top_builddir)/libnm-util/libnm-util.la \
+@ENABLE_TESTS_TRUE@	$(builddir)/../libifupdown-io.la \
+@ENABLE_TESTS_TRUE@	$(DBUS_LIBS)
+
+@ENABLE_TESTS_TRUE@EXTRA_DIST = \
+@ENABLE_TESTS_TRUE@	test1 test2 test3 test4 test5 test6 test7 test8 test9 test11 test12 \
+@ENABLE_TESTS_TRUE@	test13 test14 test15 test16 test17-wired-static-verify-ip4 \
+@ENABLE_TESTS_TRUE@	test18-wired-static-verify-ip6 test19-wired-static-verify-ip4-plen
 
 all: all-am
 
@@ -433,25 +450,22 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_ifupdown-test-ifupdown.Po@am__quote@
 
 .c.o:
-@am__fastdepCC_TRUE@	$(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\
-@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
-@am__fastdepCC_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.Po
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $<
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c $<
 
 .c.obj:
-@am__fastdepCC_TRUE@	$(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.obj$$||'`;\
-@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ `$(CYGPATH_W) '$<'` &&\
-@am__fastdepCC_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.Po
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c `$(CYGPATH_W) '$<'`
 
 .c.lo:
-@am__fastdepCC_TRUE@	$(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.lo$$||'`;\
-@am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
-@am__fastdepCC_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.Plo
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $<
@@ -558,7 +572,7 @@ distdir: $(DISTFILES)
 	    || exit 1; \
 	  fi; \
 	done
-@WITH_TESTS_FALSE@check-local:
+@ENABLE_TESTS_FALSE@check-local:
 check-am: all-am
 	$(MAKE) $(AM_MAKEFLAGS) check-local
 check: check-am
@@ -682,8 +696,8 @@ uninstall-am:
 	tags uninstall uninstall-am
 
 
-@WITH_TESTS_TRUE@check-local: test-ifupdown
-@WITH_TESTS_TRUE@	$(abs_builddir)/test-ifupdown
+@ENABLE_TESTS_TRUE@check-local: test-ifupdown
+@ENABLE_TESTS_TRUE@	$(abs_builddir)/test-ifupdown
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
diff --git a/src/settings/plugins/keyfile/Makefile.am b/src/settings/plugins/keyfile/Makefile.am
index 83031c24..a9fbb663 100644
--- a/src/settings/plugins/keyfile/Makefile.am
+++ b/src/settings/plugins/keyfile/Makefile.am
@@ -1,4 +1,4 @@
-SUBDIRS=. tests
+SUBDIRS = . tests
 
 INCLUDES = \
 	-I$(top_srcdir)/src/settings \
@@ -26,8 +26,7 @@ libkeyfile_io_la_SOURCES = \
 libkeyfile_io_la_CPPFLAGS = \
 	$(GLIB_CFLAGS) \
 	$(DBUS_CFLAGS) \
-	-DSYSCONFDIR=\"$(sysconfdir)\" \
-	-DG_DISABLE_DEPRECATED
+	-DNMCONFDIR=\"$(nmconfdir)\"
 
 libkeyfile_io_la_LIBADD = $(GLIB_LIBS)
 
@@ -41,18 +40,14 @@ libnm_settings_plugin_keyfile_la_SOURCES = \
 
 libnm_settings_plugin_keyfile_la_CPPFLAGS = \
 	$(GLIB_CFLAGS) \
-	$(GMODULE_CFLAGS) \
 	$(DBUS_CFLAGS) \
-	-DSYSCONFDIR=\"$(sysconfdir)\" \
-	-DG_DISABLE_DEPRECATED
+	-DNMCONFDIR=\"$(nmconfdir)\"
 
 libnm_settings_plugin_keyfile_la_LIBADD = \
 	$(top_builddir)/libnm-util/libnm-util.la \
 	libkeyfile-io.la \
 	$(GLIB_LIBS) \
-	$(GMODULE_LIBS) \
-	$(DBUS_LIBS) \
-	$(GIO_LIBS)
+	$(DBUS_LIBS)
 
 libnm_settings_plugin_keyfile_la_LDFLAGS = -rdynamic
 
diff --git a/src/settings/plugins/keyfile/Makefile.in b/src/settings/plugins/keyfile/Makefile.in
index 6e70908d..071838b1 100644
--- a/src/settings/plugins/keyfile/Makefile.in
+++ b/src/settings/plugins/keyfile/Makefile.in
@@ -55,16 +55,18 @@ subdir = src/settings/plugins/keyfile
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/compiler_warnings.m4 \
-	$(top_srcdir)/m4/gettext.m4 $(top_srcdir)/m4/gtk-doc.m4 \
-	$(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/intlmacosx.m4 \
-	$(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/introspection.m4 \
-	$(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \
-	$(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/libnl-check.m4 \
-	$(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \
-	$(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
-	$(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/nls.m4 \
-	$(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/progtest.m4 \
-	$(top_srcdir)/m4/vapigen.m4 $(top_srcdir)/configure.ac
+	$(top_srcdir)/m4/gettext.m4 \
+	$(top_srcdir)/m4/gnome-code-coverage.m4 \
+	$(top_srcdir)/m4/gtk-doc.m4 $(top_srcdir)/m4/iconv.m4 \
+	$(top_srcdir)/m4/intlmacosx.m4 $(top_srcdir)/m4/intltool.m4 \
+	$(top_srcdir)/m4/introspection.m4 $(top_srcdir)/m4/lib-ld.m4 \
+	$(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \
+	$(top_srcdir)/m4/libnl-check.m4 $(top_srcdir)/m4/libtool.m4 \
+	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
+	$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
+	$(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/po.m4 \
+	$(top_srcdir)/m4/progtest.m4 $(top_srcdir)/m4/vapigen.m4 \
+	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(install_sh) -d
@@ -83,7 +85,6 @@ am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
 am__v_lt_0 = --silent
 libnm_settings_plugin_keyfile_la_DEPENDENCIES =  \
 	$(top_builddir)/libnm-util/libnm-util.la libkeyfile-io.la \
-	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
 	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
 am_libnm_settings_plugin_keyfile_la_OBJECTS =  \
 	libnm_settings_plugin_keyfile_la-nm-keyfile-connection.lo \
@@ -182,6 +183,10 @@ AWK = @AWK@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
+CKDB_PATH = @CKDB_PATH@
+CODE_COVERAGE_CFLAGS = @CODE_COVERAGE_CFLAGS@
+CODE_COVERAGE_ENABLED = @CODE_COVERAGE_ENABLED@
+CODE_COVERAGE_LDFLAGS = @CODE_COVERAGE_LDFLAGS@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CXX = @CXX@
@@ -196,9 +201,7 @@ DBUS_SYS_DIR = @DBUS_SYS_DIR@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
 DHCLIENT_PATH = @DHCLIENT_PATH@
-DHCLIENT_VERSION = @DHCLIENT_VERSION@
 DHCPCD_PATH = @DHCPCD_PATH@
-DISABLE_DEPRECATED = @DISABLE_DEPRECATED@
 DLLTOOL = @DLLTOOL@
 DSYMUTIL = @DSYMUTIL@
 DUMPBIN = @DUMPBIN@
@@ -208,17 +211,14 @@ ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
 FGREP = @FGREP@
+GENHTML = @GENHTML@
 GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
 GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
-GIO_CFLAGS = @GIO_CFLAGS@
-GIO_LIBS = @GIO_LIBS@
 GLIB_CFLAGS = @GLIB_CFLAGS@
 GLIB_GENMARSHAL = @GLIB_GENMARSHAL@
 GLIB_LIBS = @GLIB_LIBS@
 GLIB_MAKEFILE = @GLIB_MAKEFILE@
 GLIB_MKENUMS = @GLIB_MKENUMS@
-GMODULE_CFLAGS = @GMODULE_CFLAGS@
-GMODULE_LIBS = @GMODULE_LIBS@
 GMSGFMT = @GMSGFMT@
 GMSGFMT_015 = @GMSGFMT_015@
 GNUTLS_CFLAGS = @GNUTLS_CFLAGS@
@@ -259,6 +259,7 @@ IPTABLES_PATH = @IPTABLES_PATH@
 IWMX_SDK_CFLAGS = @IWMX_SDK_CFLAGS@
 IWMX_SDK_LIBS = @IWMX_SDK_LIBS@
 KERNEL_FIRMWARE_DIR = @KERNEL_FIRMWARE_DIR@
+LCOV = @LCOV@
 LD = @LD@
 LDFLAGS = @LDFLAGS@
 LIBDL = @LIBDL@
@@ -275,11 +276,7 @@ LIBNL2_LIBS = @LIBNL2_LIBS@
 LIBNL3_CFLAGS = @LIBNL3_CFLAGS@
 LIBNL3_LIBS = @LIBNL3_LIBS@
 LIBNL_CFLAGS = @LIBNL_CFLAGS@
-LIBNL_GENL3_CFLAGS = @LIBNL_GENL3_CFLAGS@
-LIBNL_GENL3_LIBS = @LIBNL_GENL3_LIBS@
 LIBNL_LIBS = @LIBNL_LIBS@
-LIBNL_ROUTE3_CFLAGS = @LIBNL_ROUTE3_CFLAGS@
-LIBNL_ROUTE3_LIBS = @LIBNL_ROUTE3_LIBS@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
 LIBSOUP_CFLAGS = @LIBSOUP_CFLAGS@
@@ -294,6 +291,8 @@ MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MANIFEST_TOOL = @MANIFEST_TOOL@
 MKDIR_P = @MKDIR_P@
+MM_GLIB_CFLAGS = @MM_GLIB_CFLAGS@
+MM_GLIB_LIBS = @MM_GLIB_LIBS@
 MOC = @MOC@
 MSGFMT = @MSGFMT@
 MSGFMT_015 = @MSGFMT_015@
@@ -303,6 +302,7 @@ NMEDIT = @NMEDIT@
 NM_MAJOR_VERSION = @NM_MAJOR_VERSION@
 NM_MICRO_VERSION = @NM_MICRO_VERSION@
 NM_MINOR_VERSION = @NM_MINOR_VERSION@
+NM_MODIFY_SYSTEM_POLICY = @NM_MODIFY_SYSTEM_POLICY@
 NM_VERSION = @NM_VERSION@
 NSS_CFLAGS = @NSS_CFLAGS@
 NSS_LIBS = @NSS_LIBS@
@@ -329,13 +329,14 @@ PPPD_PLUGIN_DIR = @PPPD_PLUGIN_DIR@
 QT_CFLAGS = @QT_CFLAGS@
 QT_LIBS = @QT_LIBS@
 RANLIB = @RANLIB@
-RESOLVCONF_PATH = @RESOLVCONF_PATH@
 SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
-SYSTEMD_CFLAGS = @SYSTEMD_CFLAGS@
-SYSTEMD_LIBS = @SYSTEMD_LIBS@
+SYSTEMD_INHIBIT_CFLAGS = @SYSTEMD_INHIBIT_CFLAGS@
+SYSTEMD_INHIBIT_LIBS = @SYSTEMD_INHIBIT_LIBS@
+SYSTEMD_LOGIN_CFLAGS = @SYSTEMD_LOGIN_CFLAGS@
+SYSTEMD_LOGIN_LIBS = @SYSTEMD_LOGIN_LIBS@
 SYSTEM_CA_PATH = @SYSTEM_CA_PATH@
 UDEV_BASE_DIR = @UDEV_BASE_DIR@
 USE_NLS = @USE_NLS@
@@ -390,6 +391,11 @@ localedir = @localedir@
 localstatedir = @localstatedir@
 mandir = @mandir@
 mkdir_p = @mkdir_p@
+nmbinary = @nmbinary@
+nmconfdir = @nmconfdir@
+nmdatadir = @nmdatadir@
+nmrundir = @nmrundir@
+nmstatedir = @nmstatedir@
 oldincludedir = @oldincludedir@
 pdfdir = @pdfdir@
 prefix = @prefix@
@@ -404,6 +410,10 @@ target_alias = @target_alias@
 top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
+with_dhclient = @with_dhclient@
+with_dhcpcd = @with_dhcpcd@
+with_netconfig = @with_netconfig@
+with_resolvconf = @with_resolvconf@
 SUBDIRS = . tests
 INCLUDES = \
 	-I$(top_srcdir)/src/settings \
@@ -431,8 +441,7 @@ libkeyfile_io_la_SOURCES = \
 libkeyfile_io_la_CPPFLAGS = \
 	$(GLIB_CFLAGS) \
 	$(DBUS_CFLAGS) \
-	-DSYSCONFDIR=\"$(sysconfdir)\" \
-	-DG_DISABLE_DEPRECATED
+	-DNMCONFDIR=\"$(nmconfdir)\"
 
 libkeyfile_io_la_LIBADD = $(GLIB_LIBS)
 
@@ -445,18 +454,14 @@ libnm_settings_plugin_keyfile_la_SOURCES = \
 
 libnm_settings_plugin_keyfile_la_CPPFLAGS = \
 	$(GLIB_CFLAGS) \
-	$(GMODULE_CFLAGS) \
 	$(DBUS_CFLAGS) \
-	-DSYSCONFDIR=\"$(sysconfdir)\" \
-	-DG_DISABLE_DEPRECATED
+	-DNMCONFDIR=\"$(nmconfdir)\"
 
 libnm_settings_plugin_keyfile_la_LIBADD = \
 	$(top_builddir)/libnm-util/libnm-util.la \
 	libkeyfile-io.la \
 	$(GLIB_LIBS) \
-	$(GMODULE_LIBS) \
-	$(DBUS_LIBS) \
-	$(GIO_LIBS)
+	$(DBUS_LIBS)
 
 libnm_settings_plugin_keyfile_la_LDFLAGS = -rdynamic
 keyfiledir = $(sysconfdir)/NetworkManager/system-connections
@@ -522,25 +527,22 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libnm_settings_plugin_keyfile_la-plugin.Plo@am__quote@
 
 .c.o:
-@am__fastdepCC_TRUE@	$(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\
-@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
-@am__fastdepCC_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.Po
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $<
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c $<
 
 .c.obj:
-@am__fastdepCC_TRUE@	$(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.obj$$||'`;\
-@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ `$(CYGPATH_W) '$<'` &&\
-@am__fastdepCC_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.Po
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c `$(CYGPATH_W) '$<'`
 
 .c.lo:
-@am__fastdepCC_TRUE@	$(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.lo$$||'`;\
-@am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
-@am__fastdepCC_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.Plo
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $<
diff --git a/src/settings/plugins/keyfile/common.h b/src/settings/plugins/keyfile/common.h
index 7d94a705..d48c32f2 100644
--- a/src/settings/plugins/keyfile/common.h
+++ b/src/settings/plugins/keyfile/common.h
@@ -26,7 +26,7 @@
 #define KEYFILE_PLUGIN_NAME "keyfile"
 #define KEYFILE_PLUGIN_INFO "(c) 2007 - 2010 Red Hat, Inc.  To report bugs please use the NetworkManager mailing list."
 
-#define KEYFILE_DIR SYSCONFDIR "/NetworkManager/system-connections"
+#define KEYFILE_DIR NMCONFDIR "/system-connections"
 
 #define VPN_SECRETS_GROUP "vpn-secrets"
 
diff --git a/src/settings/plugins/keyfile/nm-keyfile-connection.c b/src/settings/plugins/keyfile/nm-keyfile-connection.c
index 23618f7c..6d72bbfe 100644
--- a/src/settings/plugins/keyfile/nm-keyfile-connection.c
+++ b/src/settings/plugins/keyfile/nm-keyfile-connection.c
@@ -16,7 +16,7 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  *
  * Copyright (C) 2008 Novell, Inc.
- * Copyright (C) 2008 - 2011 Red Hat, Inc.
+ * Copyright (C) 2008 - 2012 Red Hat, Inc.
  */
 
 #include 
@@ -96,6 +96,19 @@ nm_keyfile_connection_get_path (NMKeyfileConnection *self)
 	return NM_KEYFILE_CONNECTION_GET_PRIVATE (self)->path;
 }
 
+void
+nm_keyfile_connection_set_path (NMKeyfileConnection *self, const char *path)
+{
+	NMKeyfileConnectionPrivate *priv;
+
+	g_return_if_fail (NM_IS_KEYFILE_CONNECTION (self));
+	g_return_if_fail (path != NULL);
+
+	priv = NM_KEYFILE_CONNECTION_GET_PRIVATE (self);
+	g_free (priv->path);
+	priv->path = g_strdup (path);
+}
+
 static void
 commit_changes (NMSettingsConnection *connection,
                 NMSettingsConnectionCommitFunc callback,
diff --git a/src/settings/plugins/keyfile/nm-keyfile-connection.h b/src/settings/plugins/keyfile/nm-keyfile-connection.h
index 932b36f7..e3bce11b 100644
--- a/src/settings/plugins/keyfile/nm-keyfile-connection.h
+++ b/src/settings/plugins/keyfile/nm-keyfile-connection.h
@@ -16,7 +16,7 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  *
  * Copyright (C) 2008 Novell, Inc.
- * Copyright (C) 2008 - 2011 Red Hat, Inc.
+ * Copyright (C) 2008 - 2012 Red Hat, Inc.
  */
 
 #ifndef NM_KEYFILE_CONNECTION_H
@@ -48,6 +48,7 @@ NMKeyfileConnection *nm_keyfile_connection_new (const char *filename,
                                                 GError **error);
 
 const char *nm_keyfile_connection_get_path (NMKeyfileConnection *self);
+void        nm_keyfile_connection_set_path (NMKeyfileConnection *self, const char *path);
 
 G_END_DECLS
 
diff --git a/src/settings/plugins/keyfile/plugin.c b/src/settings/plugins/keyfile/plugin.c
index d53907a9..062eb082 100644
--- a/src/settings/plugins/keyfile/plugin.c
+++ b/src/settings/plugins/keyfile/plugin.c
@@ -16,7 +16,7 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  *
  * Copyright (C) 2008 Novell, Inc.
- * Copyright (C) 2008 - 2011 Red Hat, Inc.
+ * Copyright (C) 2008 - 2012 Red Hat, Inc.
  */
 
 #include 
@@ -268,6 +268,10 @@ dir_changed (GFileMonitor *monitor,
 					 * filename property too.
 					 */
 					update_connection_settings (found, connection);
+					/* However, when connections are the same and only the filename changed
+					 * we need to update the path manually (commit_changes() is not called.
+					 */
+					nm_keyfile_connection_set_path (found, full_path);
 
 					/* Re-insert the connection back into the hash with the new filename */
 					g_hash_table_insert (priv->hash,
diff --git a/src/settings/plugins/keyfile/reader.c b/src/settings/plugins/keyfile/reader.c
index 7f0ab4af..6ddf50d5 100644
--- a/src/settings/plugins/keyfile/reader.c
+++ b/src/settings/plugins/keyfile/reader.c
@@ -39,7 +39,6 @@
 #include 
 #include 
 #include 
-#include 
 
 #include "nm-dbus-glib-types.h"
 #include "nm-system-config-interface.h"
@@ -58,13 +57,13 @@ read_array_of_uint (GKeyFile *file,
 
 	tmp = g_key_file_get_integer_list (file, nm_setting_get_name (setting), key, &length, NULL);
 	array = g_array_sized_new (FALSE, FALSE, sizeof (guint32), length);
+	g_return_val_if_fail (array != NULL, FALSE);
+
 	for (i = 0; i < length; i++)
 		g_array_append_val (array, tmp[i]);
 
-	if (array) {
-		g_object_set (setting, key, array, NULL);
-		g_array_free (array, TRUE);
-	}
+	g_object_set (setting, key, array, NULL);
+	g_array_unref (array);
 
 	return TRUE;
 }
@@ -85,209 +84,326 @@ get_one_int (const char *str, guint32 max_val, const char *key_name, guint32 *ou
 	return TRUE;
 }
 
-static void
-free_one_ip4_address (gpointer data, gpointer user_data)
+static gpointer
+build_ip4_address_or_route (const char *address_str, guint32 plen, const char *gateway_str, guint32 metric, gboolean route)
 {
-	g_array_free ((GArray *) data, TRUE);
-}
+	GArray *result;
+	struct in_addr addr;
+	guint32 address = 0;
+	guint32 gateway = 0;
+	int err;
+
+	g_return_val_if_fail (address_str, NULL);
+
+	/* Address */
+	err = inet_pton (AF_INET, address_str, &addr);
+	if (err <= 0) {
+		g_warning ("%s: ignoring invalid IPv4 address '%s'", __func__, address_str);
+		return NULL;
+	}
+	address = addr.s_addr;
+	/* Gateway */
+	if (gateway_str) {
+		err = inet_pton (AF_INET, gateway_str, &addr);
+		if (err <= 0) {
+			g_warning ("%s: ignoring invalid IPv4 gateway '%s'", __func__, gateway_str);
+			return NULL;
+		}
+		gateway = addr.s_addr;
+	}
+	else
+		gateway = 0;
 
-static GPtrArray *
-read_ip4_addresses (GKeyFile *file,
-			    const char *setting_name,
-			    const char *key)
-{
-	GPtrArray *addresses;
-	int i = 0;
+	result = g_array_sized_new (FALSE, TRUE, sizeof (guint32), 3);
+	g_array_append_val (result, address);
+	g_array_append_val (result, plen);
+	g_array_append_val (result, gateway);
+	if (route)
+		g_array_append_val (result, metric);
 
-	addresses = g_ptr_array_sized_new (3);
+	return result;
+}
 
-	/* Look for individual addresses */
-	while (i++ < 1000) {
-		gchar **tmp, **iter;
-		char *key_name;
-		gsize length = 0;
-		int ret;
-		GArray *address;
-		guint32 empty = 0;
-		int j;
+static gpointer
+build_ip6_address_or_route (const char *address_str, guint32 plen, const char *gateway_str, guint32 metric, gboolean route)
+{
+	GValueArray *result;
+	struct in6_addr addr;
+	GByteArray *address;
+	GByteArray *gateway;
+	GValue value = { 0, };
+	int err;
 
-		key_name = g_strdup_printf ("%s%d", key, i);
-		tmp = g_key_file_get_string_list (file, setting_name, key_name, &length, NULL);
+	g_return_val_if_fail (address_str, NULL);
 
-		if (!tmp || !length) {
-			g_free (key_name);
-			break; /* all done */
-		}
+	result = g_value_array_new (3);
 
-		if ((length < 2) || (length > 3)) {
-			g_warning ("%s: ignoring invalid IPv4 address item '%s'", __func__, key_name);
-			goto next;
+	/* add address */
+	err = inet_pton (AF_INET6, address_str, &addr);
+	if (err <= 0) {
+		g_warning ("%s: ignoring invalid IPv6 address '%s'", __func__, address_str);
+		g_value_array_free (result);
+		return NULL;
+	}
+	address = g_byte_array_new ();
+	g_byte_array_append (address, (guint8 *) addr.s6_addr, 16);
+	g_value_init (&value, DBUS_TYPE_G_UCHAR_ARRAY);
+	g_value_take_boxed (&value, address);
+	g_value_array_append (result, &value);
+	g_value_unset (&value);
+
+	/* add prefix length */
+	g_value_init (&value, G_TYPE_UINT);
+	g_value_set_uint (&value, plen);
+	g_value_array_append (result, &value);
+	g_value_unset (&value);
+
+	/* add gateway */
+	if (gateway_str) {
+		err = inet_pton (AF_INET6, gateway_str, &addr);
+		if (err <= 0) {
+			g_warning ("%s: ignoring invalid IPv6 gateway '%s'", __func__, gateway_str);
+			g_value_array_free (result);
+			return NULL;
 		}
+	} else
+		memset (&addr, 0, 16);
+	gateway = g_byte_array_new ();
+	g_byte_array_append (gateway, (guint8 *) addr.s6_addr, 16);
+	g_value_init (&value, DBUS_TYPE_G_UCHAR_ARRAY);
+	g_value_take_boxed (&value, gateway);
+	g_value_array_append (result, &value);
+	g_value_unset (&value);
+
+	/* add metric (for routing) */
+	if (route) {
+		g_value_init (&value, G_TYPE_UINT);
+		g_value_set_uint (&value, metric);
+		g_value_array_append (result, &value);
+		g_value_unset (&value);
+	}
 
-		/* convert the string array into IP addresses */
-		address = g_array_sized_new (FALSE, TRUE, sizeof (guint32), 3);
-		for (iter = tmp, j = 0; *iter; iter++, j++) {
-			struct in_addr addr;
+	return result;
+}
 
-			if (j == 1) {
-				guint32 prefix = 0;
+/* On success, returns pointer to the zero-terminated field (original @current).
+ * The @current * pointer target is set to point to the rest of the input
+ * or NULL if there is no more input. Sets error to NULL for convenience.
+ *
+ * On failure, returns NULL (unspecified). The @current pointer target is
+ * resets to its original value to allow skipping fields. The @error target
+ * is set to the character that breaks the parsing or NULL if @current was NULL.
+ *
+ * When @current target is NULL, gracefully fail returning NULL while
+ * leaving the @current target NULL end setting @error to NULL;
+ */
+static char *
+read_field (char **current, char **error, const char *characters, const char *delimiters)
+{
+	char *start;
 
-				/* prefix */
-				if (!get_one_int (*iter, 32, key_name, &prefix)) {
-					g_array_free (address, TRUE);
-					goto next;
-				}
+	g_return_val_if_fail (current, NULL);
+	g_return_val_if_fail (error, NULL);
+	g_return_val_if_fail (characters, NULL);
+	g_return_val_if_fail (delimiters, NULL);
 
-				g_array_append_val (address, prefix);
-			} else {
-				/* address and gateway */
-				ret = inet_pton (AF_INET, *iter, &addr);
-				if (ret <= 0) {
-					g_warning ("%s: ignoring invalid IPv4 %s element '%s'", __func__, key_name, *iter);
-					g_array_free (address, TRUE);
-					goto next;
-				}
-				g_array_append_val (address, addr.s_addr);
-			}
-		}
+	if (!*current) {
+		/* graceful failure, leave '*current' NULL */
+		*error = NULL;
+		return NULL;
+	}
 
-		/* fill in blank gateway if not specified */
-		if (address->len == 2)
-			g_array_append_val (address, empty);
+	/* fail on empty input */
+	g_return_val_if_fail (**current, NULL);
 
-		g_ptr_array_add (addresses, address);
+	/* remember beginning of input */
+	start = *current;
 
-next:
-		g_free (key_name);
-		g_strfreev (tmp);
+	while (**current && strchr (characters, **current))
+		(*current)++;
+	if (**current)
+		if (strchr (delimiters, **current)) {
+			/* success, more data available */
+			*error = NULL;
+			*(*current)++ = '\0';
+			return start;
+		} else {
+			/* error, bad character */
+			*error = *current;
+			*current = start;
+			return NULL;
+		}
+	else {
+		/* success, end of input */
+		*error = NULL;
+		*current = NULL;
+		return start;
 	}
+}
 
-	if (addresses->len < 1) {
-		g_ptr_array_free (addresses, TRUE);
-		addresses = NULL;
-	}
+#define IP_ADDRESS_CHARS "0123456789abcdefABCDEF:.%"
+#define DIGITS "0123456789"
+#define DELIMITERS "/;,"
 
-	return addresses;
-}
 
-static void
-ip4_addr_parser (NMSetting *setting, const char *key, GKeyFile *keyfile, const char *keyfile_path)
+/* The following IPv4 and IPv6 address formats are supported:
+ *
+ * address (DEPRECATED)
+ * address/plen
+ * address/gateway (DEPRECATED)
+ * address/plen/gateway
+ *
+ * The following IPv4 and IPv6 route formats are supported:
+ *
+ * address/plen (NETWORK dev DEVICE)
+ * address/plen/gateway (NETWORK via GATEWAY dev DEVICE)
+ * address/plen//gateway (NETWORK dev DEVICE metric METRIC)
+ * address/plen/gateway/metric (NETWORK via GATEWAY dev DEVICE metric METRIC)
+ *
+ * For backward, forward and sideward compatibility, slash (/),
+ * semicolon (;) and comma (,) are interchangable. The use of
+ * slash in the above examples is therefore not significant.
+ *
+ * Leaving out the prefix length is discouraged and DEPRECATED. The
+ * default value of IPv6 prefix length was 64 and has not been
+ * changed. The default for IPv4 is now 24, which is the closest
+ * IPv4 equivalent. These defaults may just as well be changed to
+ * match the iproute2 defaults (32 for IPv4 and 128 for IPv6).
+ *
+ * The returned result is GArray for IPv4 and GValueArray for IPv6.
+ */
+static gpointer
+read_one_ip_address_or_route (GKeyFile *file,
+	const char *setting_name,
+	const char *key_name,
+	gboolean ipv6,
+	gboolean route)
 {
-	GPtrArray *addresses;
-	const char *setting_name = nm_setting_get_name (setting);
+	guint32 plen, metric;
+	gpointer result;
+	char *address_str, *plen_str, *gateway_str, *metric_str, *value, *current, *error;
 
-	addresses = read_ip4_addresses (keyfile, setting_name, key);
+	current = value = g_key_file_get_string (file, setting_name, key_name, NULL);
+	if (!value)
+		return NULL;
 
-	/* Work around for previous syntax */
-	if (!addresses && !strcmp (key, NM_SETTING_IP4_CONFIG_ADDRESSES))
-		addresses = read_ip4_addresses (keyfile, setting_name, "address");
+	/* get address field */
+	address_str = read_field (¤t, &error, IP_ADDRESS_CHARS, DELIMITERS);
+	if (error) {
+		g_warning ("keyfile: Unexpected character '%c' in '%s.%s' address (position %td of '%s').",
+			*error, setting_name, key_name, error - current, current);
+		goto error;
+	}
+	/* get prefix length field (skippable) */
+	plen_str = read_field (¤t, &error, DIGITS, DELIMITERS);
+	/* get gateway field */
+	gateway_str = read_field (¤t, &error, IP_ADDRESS_CHARS, DELIMITERS);
+	if (error) {
+		g_warning ("keyfile: Unexpected character '%c' in '%s.%s' %s (position %td of '%s').",
+			*error, setting_name, key_name,
+			plen_str ? "gateway" : "gateway or prefix length",
+			error - current, current);
+		goto error;
+	}
+	/* for routes, get metric */
+	if (route) {
+		metric_str = read_field (¤t, &error, DIGITS, DELIMITERS);
+		if (error) {
+			g_warning ("keyfile: Unexpected character '%c' in '%s.%s' prefix length (position %td of '%s').",
+				*error, setting_name, key_name, error - current, current);
+			goto error;
+		}
+	} else
+		metric_str = NULL;
+	if (current) {
+		/* there is still some data */
+		if (*current) {
+			/* another field follows */
+			g_warning ("keyfile: %s.%s: Garbage at the and of the line: %s",
+				setting_name, key_name, current);
+			goto error;
+		} else {
+			/* semicolon at the end of input */
+			g_message ("keyfile: %s.%s: Deprecated semicolon at the end of value.",
+				setting_name, key_name);
+		}
+	}
 
-	if (addresses) {
-		g_object_set (setting, key, addresses, NULL);
-		g_ptr_array_foreach (addresses, free_one_ip4_address, NULL);
-		g_ptr_array_free (addresses, TRUE);
+	/* parse plen, fallback to defaults */
+	if (plen_str)
+		g_return_val_if_fail (get_one_int (plen_str, ipv6 ? 128 : 32,
+			key_name, &plen), NULL);
+	else {
+		if (route)
+			plen = ipv6 ? 128 : 24;
+		else
+			plen = ipv6 ? 64 : 24;
+		g_warning ("keyfile: Missing prefix length in '%s.%s', defaulting to %d",
+			setting_name, key_name, plen);
 	}
-}
 
-static void
-free_one_ip4_route (gpointer data, gpointer user_data)
-{
-	g_array_free ((GArray *) data, TRUE);
+	/* parse metric, default to 0 */
+	metric = 0;
+	if (metric_str)
+		g_return_val_if_fail (get_one_int (metric_str, G_MAXUINT32,
+			key_name, &metric), NULL);
+
+	/* build the appropriate data structure for NetworkManager settings */
+	if (route)
+		g_debug ("keyfile: %s.%s: route %s/%d gateway %s metric %d", setting_name, key_name, address_str, plen, gateway_str, metric);
+	else
+		g_debug ("keyfile: %s.%s: address %s/%d gateway %s", setting_name, key_name, address_str, plen, gateway_str);
+	result = (ipv6 ? build_ip6_address_or_route : build_ip4_address_or_route) (
+		address_str, plen, gateway_str, metric, route);
+
+	g_free (value);
+	return result;
+error:
+	g_free (value);
+	return NULL;
 }
 
-static GPtrArray *
-read_ip4_routes (GKeyFile *file,
-			 const char *setting_name,
-			 const char *key)
+static void
+ip_address_or_route_parser (NMSetting *setting, const char *key, GKeyFile *keyfile, const char *keyfile_path)
 {
-	GPtrArray *routes;
-	int i = 0;
-
-	routes = g_ptr_array_sized_new (3);
-
-	/* Look for individual routes */
-	while (i++ < 1000) {
-		gchar **tmp, **iter;
-		char *key_name;
-		gsize length = 0;
-		int ret;
-		GArray *route;
-		int j;
-
-		key_name = g_strdup_printf ("%s%d", key, i);
-		tmp = g_key_file_get_string_list (file, setting_name, key_name, &length, NULL);
-		g_free (key_name);
-
-		if (!tmp || !length)
-			break; /* all done */
-
-		if (length != 4) {
-			g_warning ("%s: ignoring invalid IPv4 route item '%s'", __func__, key_name);
-			goto next;
-		}
+	const char *setting_name = nm_setting_get_name (setting);
+	gboolean ipv6 = !strcmp (setting_name, "ipv6");
+	gboolean routes = !strcmp (key, "routes");
+	static const char *key_names_routes[] = { "route", "routes", NULL };
+	static const char *key_names_addresses[] = { "address", "addresses", NULL };
+	const char **key_names = routes ? key_names_routes : key_names_addresses;
+	GPtrArray *list;
+	int i;
 
-		/* convert the string array into IP addresses */
-		route = g_array_sized_new (FALSE, TRUE, sizeof (guint32), 4);
-		for (iter = tmp, j = 0; *iter; iter++, j++) {
-			struct in_addr addr;
+	list = g_ptr_array_new_with_free_func (
+		ipv6 ? (GDestroyNotify) g_value_array_free : (GDestroyNotify) g_array_unref);
 
-			if (j == 1) {
-				guint32 prefix = 0;
+	for (i = -1; i < 1000; i++) {
+		const char **key_basename;
+		
+		for (key_basename = key_names; *key_basename; key_basename++) {
+			char *key_name;
+			gpointer item;
 
-				/* prefix */
-				if (!get_one_int (*iter, 32, key_name, &prefix)) {
-					g_array_free (route, TRUE);
-					goto next;
-				}
+			/* -1 means no suffix */
+			if (i >= 0)
+				key_name = g_strdup_printf ("%s%d", *key_basename, i);
+			else
+				key_name = g_strdup (*key_basename);
 
-				g_array_append_val (route, prefix);
-			} else if (j == 3) {
-				guint32 metric = 0;
+			item = read_one_ip_address_or_route (keyfile, setting_name, key_name, ipv6, routes);
 
-				/* metric */
-				if (!get_one_int (*iter, G_MAXUINT32, key_name, &metric)) {
-					g_array_free (route, TRUE);
-					goto next;
-				}
+			if (item)
+				g_ptr_array_add (list, item);
 
-				g_array_append_val (route, metric);
-			} else {
-				/* address and next hop */
-				ret = inet_pton (AF_INET, *iter, &addr);
-				if (ret <= 0) {
-					g_warning ("%s: ignoring invalid IPv4 %s element '%s'", __func__, key_name, *iter);
-					g_array_free (route, TRUE);
-					goto next;
-				}
-				g_array_append_val (route, addr.s_addr);
-			}
+			g_free (key_name);
 		}
-		g_ptr_array_add (routes, route);
-
-next:
-		g_strfreev (tmp);
-	}
-
-	if (routes->len < 1) {
-		g_ptr_array_free (routes, TRUE);
-		routes = NULL;
 	}
 
-	return routes;
-}
-
-static void
-ip4_route_parser (NMSetting *setting, const char *key, GKeyFile *keyfile, const char *keyfile_path)
-{
-	GPtrArray *routes;
-	const char *setting_name = nm_setting_get_name (setting);
+	if (list->len >= 1)
+		g_object_set (setting, key, list, NULL);
 
-	routes = read_ip4_routes (keyfile, setting_name, key);
-	if (routes) {
-		g_object_set (setting, key, routes, NULL);
-		g_ptr_array_foreach (routes, free_one_ip4_route, NULL);
-		g_ptr_array_free (routes, TRUE);
-	}
+	g_ptr_array_unref (list);
 }
 
 static void
@@ -319,300 +435,10 @@ ip4_dns_parser (NMSetting *setting, const char *key, GKeyFile *keyfile, const ch
 
 	if (array) {
 		g_object_set (setting, key, array, NULL);
-		g_array_free (array, TRUE);
-	}
-}
-
-static void
-free_one_ip6_address (gpointer data, gpointer user_data)
-{
-	g_value_array_free ((GValueArray *) data);
-}
-
-static char *
-split_prefix (char *addr)
-{
-	char *slash;
-
-	g_return_val_if_fail (addr != NULL, NULL);
-
-	/* Find the prefix and split the string */
-	slash = strchr (addr, '/');
-	if (slash && slash > addr) {
-		slash++;
-		*(slash - 1) = '\0';
-	}
-
-	return slash;
-}
-
-static char *
-split_gw (char *str)
-{
-	char *comma;
-
-	g_return_val_if_fail (str != NULL, NULL);
-
-	/* Find the prefix and split the string */
-	comma = strchr (str, ',');
-	if (comma && comma > str) {
-		comma++;
-		*(comma - 1) = '\0';
-		return comma;
-	}
-	return NULL;
-}
-
-static GPtrArray *
-read_ip6_addresses (GKeyFile *file,
-                    const char *setting_name,
-                    const char *key)
-{
-	GPtrArray *addresses;
-	struct in6_addr addr, gw;
-	guint32 prefix;
-	int i = 0;
-
-	addresses = g_ptr_array_sized_new (3);
-
-	/* Look for individual addresses */
-	while (i++ < 1000) {
-		char *tmp, *key_name, *str_prefix, *str_gw;
-		int ret;
-		GValueArray *values;
-		GByteArray *address;
-		GByteArray *gateway;
-		GValue value = { 0 };
-
-		key_name = g_strdup_printf ("%s%d", key, i);
-		tmp = g_key_file_get_string (file, setting_name, key_name, NULL);
-		g_free (key_name);
-
-		if (!tmp)
-			break; /* all done */
-
-		/* convert the string array into IPv6 addresses */
-		values = g_value_array_new (2); /* NMIP6Address has 2 items */
-
-		/* Split the address and prefix */
-		str_prefix = split_prefix (tmp);
-
-		/* address */
-		ret = inet_pton (AF_INET6, tmp, &addr);
-		if (ret <= 0) {
-			g_warning ("%s: ignoring invalid IPv6 %s element '%s'", __func__, key_name, tmp);
-			g_value_array_free (values);
-			goto next;
-		}
-
-		address = g_byte_array_new ();
-		g_byte_array_append (address, (guint8 *) addr.s6_addr, 16);
-		g_value_init (&value, DBUS_TYPE_G_UCHAR_ARRAY);
-		g_value_take_boxed (&value, address);
-		g_value_array_append (values, &value);
-		g_value_unset (&value);
-
-		/* prefix */
-		prefix = 0;
-		if (str_prefix) {
-			if (!get_one_int (str_prefix, 128, key_name, &prefix)) {
-				g_value_array_free (values);
-				goto next;
-			}
-		} else {
-			/* Missing prefix defaults to /64 */
-			prefix = 64;
-		}
-
-		g_value_init (&value, G_TYPE_UINT);
-		g_value_set_uint (&value, prefix);
-		g_value_array_append (values, &value);
-		g_value_unset (&value);
-
-		/* Gateway (optional) */
-		str_gw = split_gw (str_prefix);
-		if (str_gw) {
-			ret = inet_pton (AF_INET6, str_gw, &gw);
-			if (ret <= 0) {
-				g_warning ("%s: ignoring invalid IPv6 %s gateway '%s'", __func__, key_name, tmp);
-				g_value_array_free (values);
-				goto next;
-			}
-
-			if (!IN6_IS_ADDR_UNSPECIFIED (&gw)) {
-				gateway = g_byte_array_new ();
-				g_byte_array_append (gateway, (guint8 *) gw.s6_addr, 16);
-				g_value_init (&value, DBUS_TYPE_G_UCHAR_ARRAY);
-				g_value_take_boxed (&value, gateway);
-				g_value_array_append (values, &value);
-				g_value_unset (&value);
-			}
-		}
-
-		g_ptr_array_add (addresses, values);
-
-next:
-		g_free (tmp);
-	}
-
-	if (addresses->len < 1) {
-		g_ptr_array_free (addresses, TRUE);
-		addresses = NULL;
-	}
-
-	return addresses;
-}
-
-static void
-ip6_addr_parser (NMSetting *setting, const char *key, GKeyFile *keyfile, const char *keyfile_path)
-{
-	GPtrArray *addresses;
-	const char *setting_name = nm_setting_get_name (setting);
-
-	addresses = read_ip6_addresses (keyfile, setting_name, key);
-	if (addresses) {
-		g_object_set (setting, key, addresses, NULL);
-		g_ptr_array_foreach (addresses, free_one_ip6_address, NULL);
-		g_ptr_array_free (addresses, TRUE);
+		g_array_unref (array);
 	}
 }
 
-static void
-free_one_ip6_route (gpointer data, gpointer user_data)
-{
-	g_value_array_free ((GValueArray *) data);
-}
-
-static GPtrArray *
-read_ip6_routes (GKeyFile *file,
-                 const char *setting_name,
-                 const char *key)
-{
-	GPtrArray *routes;
-	struct in6_addr addr;
-	guint32 prefix, metric;
-	int i = 0;
-
-	routes = g_ptr_array_sized_new (3);
-
-	/* Look for individual routes */
-	while (i++ < 1000) {
-		gchar **tmp;
-		char *key_name, *str_prefix;
-		gsize length = 0;
-		int ret;
-		GValueArray *values;
-		GByteArray *address;
-		GValue value = { 0 };
-
-		key_name = g_strdup_printf ("%s%d", key, i);
-		tmp = g_key_file_get_string_list (file, setting_name, key_name, &length, NULL);
-		g_free (key_name);
-
-		if (!tmp || !length)
-			break; /* all done */
-
-		if (length != 3) {
-			g_warning ("%s: ignoring invalid IPv6 address item '%s'", __func__, key_name);
-			goto next;
-		}
-
-		/* convert the string array into IPv6 routes */
-		values = g_value_array_new (4); /* NMIP6Route has 4 items */
-
-		/* Split the route and prefix */
-		str_prefix = split_prefix (tmp[0]);
-
-		/* destination address */
-		ret = inet_pton (AF_INET6, tmp[0], &addr);
-		if (ret <= 0) {
-			g_warning ("%s: ignoring invalid IPv6 %s element '%s'", __func__, key_name, tmp[0]);
-			g_value_array_free (values);
-			goto next;
-		}
-		address = g_byte_array_new ();
-		g_byte_array_append (address, (guint8 *) addr.s6_addr, 16);
-		g_value_init (&value, DBUS_TYPE_G_UCHAR_ARRAY);
-		g_value_take_boxed (&value, address);
-		g_value_array_append (values, &value);
-		g_value_unset (&value);
-
-		/* prefix */
-		prefix = 0;
-		if (str_prefix) {
-			if (!get_one_int (str_prefix, 128, key_name, &prefix)) {
-				g_value_array_free (values);
-				goto next;
-			}
-		} else {
-			/* default to 64 if unspecified */
-			prefix = 64;
-		}
-		g_value_init (&value, G_TYPE_UINT);
-		g_value_set_uint (&value, prefix);
-		g_value_array_append (values, &value);
-		g_value_unset (&value);
-
-		/* next hop address */
-		ret = inet_pton (AF_INET6, tmp[1], &addr);
-		if (ret <= 0) {
-			g_warning ("%s: ignoring invalid IPv6 %s element '%s'", __func__, key_name, tmp[1]);
-			g_value_array_free (values);
-			goto next;
-		}
-		address = g_byte_array_new ();
-		g_byte_array_append (address, (guint8 *) addr.s6_addr, 16);
-		g_value_init (&value, DBUS_TYPE_G_UCHAR_ARRAY);
-		g_value_take_boxed (&value, address);
-		g_value_array_append (values, &value);
-		g_value_unset (&value);
-
-		/* metric */
-		metric = 0;
-		if (!get_one_int (tmp[2], G_MAXUINT32, key_name, &metric)) {
-			g_value_array_free (values);
-			goto next;
-		}
-		g_value_init (&value, G_TYPE_UINT);
-		g_value_set_uint (&value, metric);
-		g_value_array_append (values, &value);
-		g_value_unset (&value);
-
-		g_ptr_array_add (routes, values);
-
-next:
-		g_strfreev (tmp);
-	}
-
-	if (routes->len < 1) {
-		g_ptr_array_free (routes, TRUE);
-		routes = NULL;
-	}
-
-	return routes;
-}
-
-static void
-ip6_route_parser (NMSetting *setting, const char *key, GKeyFile *keyfile, const char *keyfile_path)
-{
-	GPtrArray *routes;
-	const char *setting_name = nm_setting_get_name (setting);
-
-	routes = read_ip6_routes (keyfile, setting_name, key);
-
-	if (routes) {
-		g_object_set (setting, key, routes, NULL);
-		g_ptr_array_foreach (routes, free_one_ip6_route, NULL);
-		g_ptr_array_free (routes, TRUE);
-	}
-}
-
-static void
-free_one_ip6_dns (gpointer data, gpointer user_data)
-{
-	g_byte_array_free ((GByteArray *) data, TRUE);
-}
-
 static void
 ip6_dns_parser (NMSetting *setting, const char *key, GKeyFile *keyfile, const char *keyfile_path)
 {
@@ -626,7 +452,8 @@ ip6_dns_parser (NMSetting *setting, const char *key, GKeyFile *keyfile, const ch
 	if (!list || !g_strv_length (list))
 		return;
 
-	array = g_ptr_array_sized_new (length);
+	array = g_ptr_array_new_with_free_func ((GDestroyNotify) g_byte_array_unref);
+
 	for (iter = list; *iter; iter++) {
 		GByteArray *byte_array;
 		struct in6_addr addr;
@@ -645,8 +472,7 @@ ip6_dns_parser (NMSetting *setting, const char *key, GKeyFile *keyfile, const ch
 
 	if (array) {
 		g_object_set (setting, key, array, NULL);
-		g_ptr_array_foreach (array, free_one_ip6_dns, NULL);
-		g_ptr_array_free (array, TRUE);
+		g_ptr_array_unref (array);
 	}
 }
 
@@ -988,26 +814,26 @@ typedef struct {
 /* A table of keys that require further parsing/conversion because they are
  * stored in a format that can't be automatically read using the key's type.
  * i.e. IPv4 addresses, which are stored in NetworkManager as guint32, but are
- * stored in keyfiles as strings, eg "10.1.1.2" or IPv6 addresses stored 
+ * stored in keyfiles as strings, eg "10.1.1.2" or IPv6 addresses stored
  * in struct in6_addr internally, but as string in keyfiles.
  */
 static KeyParser key_parsers[] = {
 	{ NM_SETTING_IP4_CONFIG_SETTING_NAME,
 	  NM_SETTING_IP4_CONFIG_ADDRESSES,
 	  FALSE,
-	  ip4_addr_parser },
+	  ip_address_or_route_parser },
 	{ NM_SETTING_IP6_CONFIG_SETTING_NAME,
 	  NM_SETTING_IP6_CONFIG_ADDRESSES,
 	  FALSE,
-	  ip6_addr_parser },
+	  ip_address_or_route_parser },
 	{ NM_SETTING_IP4_CONFIG_SETTING_NAME,
 	  NM_SETTING_IP4_CONFIG_ROUTES,
 	  FALSE,
-	  ip4_route_parser },
+	  ip_address_or_route_parser },
 	{ NM_SETTING_IP6_CONFIG_SETTING_NAME,
 	  NM_SETTING_IP6_CONFIG_ROUTES,
 	  FALSE,
-	  ip6_route_parser },
+	  ip_address_or_route_parser },
 	{ NM_SETTING_IP4_CONFIG_SETTING_NAME,
 	  NM_SETTING_IP4_CONFIG_DNS,
 	  FALSE,
@@ -1044,6 +870,10 @@ static KeyParser key_parsers[] = {
 	  NM_SETTING_INFINIBAND_MAC_ADDRESS,
 	  TRUE,
 	  mac_address_parser },
+	{ NM_SETTING_WIMAX_SETTING_NAME,
+	  NM_SETTING_WIMAX_MAC_ADDRESS,
+	  TRUE,
+	  mac_address_parser },
 	{ NM_SETTING_WIRELESS_SETTING_NAME,
 	  NM_SETTING_WIRELESS_SSID,
 	  TRUE,
@@ -1359,6 +1189,8 @@ nm_keyfile_plugin_connection_from_file (const char *filename, GError **error)
 		g_clear_error (&verify_error);
 		g_object_unref (connection);
 		connection = NULL;
+		g_warning ("Connection failed to verify: %s",
+			verify_error ? g_type_name (nm_connection_lookup_setting_type_by_quark (verify_error->domain)) : "(unknown)");
 	}
 
 out:
diff --git a/src/settings/plugins/keyfile/tests/Makefile.am b/src/settings/plugins/keyfile/tests/Makefile.am
index 2adbf873..26e8eafd 100644
--- a/src/settings/plugins/keyfile/tests/Makefile.am
+++ b/src/settings/plugins/keyfile/tests/Makefile.am
@@ -1,3 +1,5 @@
+if ENABLE_TESTS
+
 SUBDIRS=keyfiles
 
 INCLUDES = \
@@ -25,10 +27,7 @@ test_keyfile_LDADD = \
 	$(top_builddir)/libnm-util/libnm-util.la \
 	$(DBUS_LIBS)
 
-if WITH_TESTS
-
 check-local: test-keyfile
 	$(abs_builddir)/test-keyfile
 
 endif
-
diff --git a/src/settings/plugins/keyfile/tests/Makefile.in b/src/settings/plugins/keyfile/tests/Makefile.in
index 991cd55e..ae5836f5 100644
--- a/src/settings/plugins/keyfile/tests/Makefile.in
+++ b/src/settings/plugins/keyfile/tests/Makefile.in
@@ -51,21 +51,23 @@ PRE_UNINSTALL = :
 POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
-noinst_PROGRAMS = test-keyfile$(EXEEXT)
+@ENABLE_TESTS_TRUE@noinst_PROGRAMS = test-keyfile$(EXEEXT)
 subdir = src/settings/plugins/keyfile/tests
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/compiler_warnings.m4 \
-	$(top_srcdir)/m4/gettext.m4 $(top_srcdir)/m4/gtk-doc.m4 \
-	$(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/intlmacosx.m4 \
-	$(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/introspection.m4 \
-	$(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \
-	$(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/libnl-check.m4 \
-	$(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \
-	$(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
-	$(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/nls.m4 \
-	$(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/progtest.m4 \
-	$(top_srcdir)/m4/vapigen.m4 $(top_srcdir)/configure.ac
+	$(top_srcdir)/m4/gettext.m4 \
+	$(top_srcdir)/m4/gnome-code-coverage.m4 \
+	$(top_srcdir)/m4/gtk-doc.m4 $(top_srcdir)/m4/iconv.m4 \
+	$(top_srcdir)/m4/intlmacosx.m4 $(top_srcdir)/m4/intltool.m4 \
+	$(top_srcdir)/m4/introspection.m4 $(top_srcdir)/m4/lib-ld.m4 \
+	$(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \
+	$(top_srcdir)/m4/libnl-check.m4 $(top_srcdir)/m4/libtool.m4 \
+	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
+	$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
+	$(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/po.m4 \
+	$(top_srcdir)/m4/progtest.m4 $(top_srcdir)/m4/vapigen.m4 \
+	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(install_sh) -d
@@ -73,12 +75,16 @@ CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
 CONFIG_CLEAN_VPATH_FILES =
 PROGRAMS = $(noinst_PROGRAMS)
-am_test_keyfile_OBJECTS = test_keyfile-test-keyfile.$(OBJEXT)
+am__test_keyfile_SOURCES_DIST = test-keyfile.c
+@ENABLE_TESTS_TRUE@am_test_keyfile_OBJECTS =  \
+@ENABLE_TESTS_TRUE@	test_keyfile-test-keyfile.$(OBJEXT)
 test_keyfile_OBJECTS = $(am_test_keyfile_OBJECTS)
 am__DEPENDENCIES_1 =
-test_keyfile_DEPENDENCIES = $(builddir)/../libkeyfile-io.la \
-	$(top_builddir)/libnm-glib/libnm-glib.la \
-	$(top_builddir)/libnm-util/libnm-util.la $(am__DEPENDENCIES_1)
+@ENABLE_TESTS_TRUE@test_keyfile_DEPENDENCIES =  \
+@ENABLE_TESTS_TRUE@	$(builddir)/../libkeyfile-io.la \
+@ENABLE_TESTS_TRUE@	$(top_builddir)/libnm-glib/libnm-glib.la \
+@ENABLE_TESTS_TRUE@	$(top_builddir)/libnm-util/libnm-util.la \
+@ENABLE_TESTS_TRUE@	$(am__DEPENDENCIES_1)
 AM_V_lt = $(am__v_lt_@AM_V@)
 am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
 am__v_lt_0 = --silent
@@ -109,7 +115,7 @@ AM_V_GEN = $(am__v_GEN_@AM_V@)
 am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
 am__v_GEN_0 = @echo "  GEN   " $@;
 SOURCES = $(test_keyfile_SOURCES)
-DIST_SOURCES = $(test_keyfile_SOURCES)
+DIST_SOURCES = $(am__test_keyfile_SOURCES_DIST)
 RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
 	html-recursive info-recursive install-data-recursive \
 	install-dvi-recursive install-exec-recursive \
@@ -129,7 +135,7 @@ AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \
 	distdir
 ETAGS = etags
 CTAGS = ctags
-DIST_SUBDIRS = $(SUBDIRS)
+DIST_SUBDIRS = keyfiles
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 am__relativize = \
   dir0=`pwd`; \
@@ -168,6 +174,10 @@ AWK = @AWK@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
+CKDB_PATH = @CKDB_PATH@
+CODE_COVERAGE_CFLAGS = @CODE_COVERAGE_CFLAGS@
+CODE_COVERAGE_ENABLED = @CODE_COVERAGE_ENABLED@
+CODE_COVERAGE_LDFLAGS = @CODE_COVERAGE_LDFLAGS@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CXX = @CXX@
@@ -182,9 +192,7 @@ DBUS_SYS_DIR = @DBUS_SYS_DIR@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
 DHCLIENT_PATH = @DHCLIENT_PATH@
-DHCLIENT_VERSION = @DHCLIENT_VERSION@
 DHCPCD_PATH = @DHCPCD_PATH@
-DISABLE_DEPRECATED = @DISABLE_DEPRECATED@
 DLLTOOL = @DLLTOOL@
 DSYMUTIL = @DSYMUTIL@
 DUMPBIN = @DUMPBIN@
@@ -194,17 +202,14 @@ ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
 FGREP = @FGREP@
+GENHTML = @GENHTML@
 GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
 GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
-GIO_CFLAGS = @GIO_CFLAGS@
-GIO_LIBS = @GIO_LIBS@
 GLIB_CFLAGS = @GLIB_CFLAGS@
 GLIB_GENMARSHAL = @GLIB_GENMARSHAL@
 GLIB_LIBS = @GLIB_LIBS@
 GLIB_MAKEFILE = @GLIB_MAKEFILE@
 GLIB_MKENUMS = @GLIB_MKENUMS@
-GMODULE_CFLAGS = @GMODULE_CFLAGS@
-GMODULE_LIBS = @GMODULE_LIBS@
 GMSGFMT = @GMSGFMT@
 GMSGFMT_015 = @GMSGFMT_015@
 GNUTLS_CFLAGS = @GNUTLS_CFLAGS@
@@ -245,6 +250,7 @@ IPTABLES_PATH = @IPTABLES_PATH@
 IWMX_SDK_CFLAGS = @IWMX_SDK_CFLAGS@
 IWMX_SDK_LIBS = @IWMX_SDK_LIBS@
 KERNEL_FIRMWARE_DIR = @KERNEL_FIRMWARE_DIR@
+LCOV = @LCOV@
 LD = @LD@
 LDFLAGS = @LDFLAGS@
 LIBDL = @LIBDL@
@@ -261,11 +267,7 @@ LIBNL2_LIBS = @LIBNL2_LIBS@
 LIBNL3_CFLAGS = @LIBNL3_CFLAGS@
 LIBNL3_LIBS = @LIBNL3_LIBS@
 LIBNL_CFLAGS = @LIBNL_CFLAGS@
-LIBNL_GENL3_CFLAGS = @LIBNL_GENL3_CFLAGS@
-LIBNL_GENL3_LIBS = @LIBNL_GENL3_LIBS@
 LIBNL_LIBS = @LIBNL_LIBS@
-LIBNL_ROUTE3_CFLAGS = @LIBNL_ROUTE3_CFLAGS@
-LIBNL_ROUTE3_LIBS = @LIBNL_ROUTE3_LIBS@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
 LIBSOUP_CFLAGS = @LIBSOUP_CFLAGS@
@@ -280,6 +282,8 @@ MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MANIFEST_TOOL = @MANIFEST_TOOL@
 MKDIR_P = @MKDIR_P@
+MM_GLIB_CFLAGS = @MM_GLIB_CFLAGS@
+MM_GLIB_LIBS = @MM_GLIB_LIBS@
 MOC = @MOC@
 MSGFMT = @MSGFMT@
 MSGFMT_015 = @MSGFMT_015@
@@ -289,6 +293,7 @@ NMEDIT = @NMEDIT@
 NM_MAJOR_VERSION = @NM_MAJOR_VERSION@
 NM_MICRO_VERSION = @NM_MICRO_VERSION@
 NM_MINOR_VERSION = @NM_MINOR_VERSION@
+NM_MODIFY_SYSTEM_POLICY = @NM_MODIFY_SYSTEM_POLICY@
 NM_VERSION = @NM_VERSION@
 NSS_CFLAGS = @NSS_CFLAGS@
 NSS_LIBS = @NSS_LIBS@
@@ -315,13 +320,14 @@ PPPD_PLUGIN_DIR = @PPPD_PLUGIN_DIR@
 QT_CFLAGS = @QT_CFLAGS@
 QT_LIBS = @QT_LIBS@
 RANLIB = @RANLIB@
-RESOLVCONF_PATH = @RESOLVCONF_PATH@
 SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
-SYSTEMD_CFLAGS = @SYSTEMD_CFLAGS@
-SYSTEMD_LIBS = @SYSTEMD_LIBS@
+SYSTEMD_INHIBIT_CFLAGS = @SYSTEMD_INHIBIT_CFLAGS@
+SYSTEMD_INHIBIT_LIBS = @SYSTEMD_INHIBIT_LIBS@
+SYSTEMD_LOGIN_CFLAGS = @SYSTEMD_LOGIN_CFLAGS@
+SYSTEMD_LOGIN_LIBS = @SYSTEMD_LOGIN_LIBS@
 SYSTEM_CA_PATH = @SYSTEM_CA_PATH@
 UDEV_BASE_DIR = @UDEV_BASE_DIR@
 USE_NLS = @USE_NLS@
@@ -376,6 +382,11 @@ localedir = @localedir@
 localstatedir = @localstatedir@
 mandir = @mandir@
 mkdir_p = @mkdir_p@
+nmbinary = @nmbinary@
+nmconfdir = @nmconfdir@
+nmdatadir = @nmdatadir@
+nmrundir = @nmrundir@
+nmstatedir = @nmstatedir@
 oldincludedir = @oldincludedir@
 pdfdir = @pdfdir@
 prefix = @prefix@
@@ -390,29 +401,33 @@ target_alias = @target_alias@
 top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
-SUBDIRS = keyfiles
-INCLUDES = \
-	-I$(top_srcdir)/include \
-	-I$(top_builddir)/include \
-	-I$(top_srcdir)/libnm-util \
-	-I$(top_builddir)/libnm-util \
-	-I$(top_srcdir)/libnm-glib \
-	-I$(srcdir)/../
-
-test_keyfile_SOURCES = \
-	test-keyfile.c
-
-test_keyfile_CPPFLAGS = \
-	$(GLIB_CFLAGS) \
-	$(DBUS_CFLAGS) \
-	-DTEST_KEYFILES_DIR=\"$(abs_srcdir)/keyfiles\" \
-	-DTEST_SCRATCH_DIR=\"$(abs_builddir)/keyfiles\"
-
-test_keyfile_LDADD = \
-	$(builddir)/../libkeyfile-io.la \
-	$(top_builddir)/libnm-glib/libnm-glib.la \
-	$(top_builddir)/libnm-util/libnm-util.la \
-	$(DBUS_LIBS)
+with_dhclient = @with_dhclient@
+with_dhcpcd = @with_dhcpcd@
+with_netconfig = @with_netconfig@
+with_resolvconf = @with_resolvconf@
+@ENABLE_TESTS_TRUE@SUBDIRS = keyfiles
+@ENABLE_TESTS_TRUE@INCLUDES = \
+@ENABLE_TESTS_TRUE@	-I$(top_srcdir)/include \
+@ENABLE_TESTS_TRUE@	-I$(top_builddir)/include \
+@ENABLE_TESTS_TRUE@	-I$(top_srcdir)/libnm-util \
+@ENABLE_TESTS_TRUE@	-I$(top_builddir)/libnm-util \
+@ENABLE_TESTS_TRUE@	-I$(top_srcdir)/libnm-glib \
+@ENABLE_TESTS_TRUE@	-I$(srcdir)/../
+
+@ENABLE_TESTS_TRUE@test_keyfile_SOURCES = \
+@ENABLE_TESTS_TRUE@	test-keyfile.c
+
+@ENABLE_TESTS_TRUE@test_keyfile_CPPFLAGS = \
+@ENABLE_TESTS_TRUE@	$(GLIB_CFLAGS) \
+@ENABLE_TESTS_TRUE@	$(DBUS_CFLAGS) \
+@ENABLE_TESTS_TRUE@	-DTEST_KEYFILES_DIR=\"$(abs_srcdir)/keyfiles\" \
+@ENABLE_TESTS_TRUE@	-DTEST_SCRATCH_DIR=\"$(abs_builddir)/keyfiles\"
+
+@ENABLE_TESTS_TRUE@test_keyfile_LDADD = \
+@ENABLE_TESTS_TRUE@	$(builddir)/../libkeyfile-io.la \
+@ENABLE_TESTS_TRUE@	$(top_builddir)/libnm-glib/libnm-glib.la \
+@ENABLE_TESTS_TRUE@	$(top_builddir)/libnm-util/libnm-util.la \
+@ENABLE_TESTS_TRUE@	$(DBUS_LIBS)
 
 all: all-recursive
 
@@ -470,25 +485,22 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_keyfile-test-keyfile.Po@am__quote@
 
 .c.o:
-@am__fastdepCC_TRUE@	$(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\
-@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
-@am__fastdepCC_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.Po
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $<
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c $<
 
 .c.obj:
-@am__fastdepCC_TRUE@	$(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.obj$$||'`;\
-@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ `$(CYGPATH_W) '$<'` &&\
-@am__fastdepCC_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.Po
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c `$(CYGPATH_W) '$<'`
 
 .c.lo:
-@am__fastdepCC_TRUE@	$(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.lo$$||'`;\
-@am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
-@am__fastdepCC_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.Plo
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $<
@@ -703,7 +715,7 @@ distdir: $(DISTFILES)
 	      || exit 1; \
 	  fi; \
 	done
-@WITH_TESTS_FALSE@check-local:
+@ENABLE_TESTS_FALSE@check-local:
 check-am: all-am
 	$(MAKE) $(AM_MAKEFLAGS) check-local
 check: check-recursive
@@ -830,8 +842,8 @@ uninstall-am:
 	tags tags-recursive uninstall uninstall-am
 
 
-@WITH_TESTS_TRUE@check-local: test-keyfile
-@WITH_TESTS_TRUE@	$(abs_builddir)/test-keyfile
+@ENABLE_TESTS_TRUE@check-local: test-keyfile
+@ENABLE_TESTS_TRUE@	$(abs_builddir)/test-keyfile
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
diff --git a/src/settings/plugins/keyfile/tests/keyfiles/Makefile.am b/src/settings/plugins/keyfile/tests/keyfiles/Makefile.am
index f163312e..759b29f4 100644
--- a/src/settings/plugins/keyfile/tests/keyfiles/Makefile.am
+++ b/src/settings/plugins/keyfile/tests/keyfiles/Makefile.am
@@ -14,7 +14,9 @@ KEYFILES = \
 	Test_Wired_TLS_New \
 	Test_Wired_TLS_Blob \
 	Test_Wired_TLS_Path_Missing \
-	Test_InfiniBand_Connection
+	Test_InfiniBand_Connection \
+	Test_Bridge_Main \
+	Test_Bridge_Component
 
 CERTS = \
 	test-ca-cert.pem \
diff --git a/src/settings/plugins/keyfile/tests/keyfiles/Makefile.in b/src/settings/plugins/keyfile/tests/keyfiles/Makefile.in
index 930d9af5..0f0a0445 100644
--- a/src/settings/plugins/keyfile/tests/keyfiles/Makefile.in
+++ b/src/settings/plugins/keyfile/tests/keyfiles/Makefile.in
@@ -54,16 +54,18 @@ subdir = src/settings/plugins/keyfile/tests/keyfiles
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/compiler_warnings.m4 \
-	$(top_srcdir)/m4/gettext.m4 $(top_srcdir)/m4/gtk-doc.m4 \
-	$(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/intlmacosx.m4 \
-	$(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/introspection.m4 \
-	$(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \
-	$(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/libnl-check.m4 \
-	$(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \
-	$(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
-	$(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/nls.m4 \
-	$(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/progtest.m4 \
-	$(top_srcdir)/m4/vapigen.m4 $(top_srcdir)/configure.ac
+	$(top_srcdir)/m4/gettext.m4 \
+	$(top_srcdir)/m4/gnome-code-coverage.m4 \
+	$(top_srcdir)/m4/gtk-doc.m4 $(top_srcdir)/m4/iconv.m4 \
+	$(top_srcdir)/m4/intlmacosx.m4 $(top_srcdir)/m4/intltool.m4 \
+	$(top_srcdir)/m4/introspection.m4 $(top_srcdir)/m4/lib-ld.m4 \
+	$(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \
+	$(top_srcdir)/m4/libnl-check.m4 $(top_srcdir)/m4/libtool.m4 \
+	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
+	$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
+	$(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/po.m4 \
+	$(top_srcdir)/m4/progtest.m4 $(top_srcdir)/m4/vapigen.m4 \
+	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(install_sh) -d
@@ -96,6 +98,10 @@ AWK = @AWK@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
+CKDB_PATH = @CKDB_PATH@
+CODE_COVERAGE_CFLAGS = @CODE_COVERAGE_CFLAGS@
+CODE_COVERAGE_ENABLED = @CODE_COVERAGE_ENABLED@
+CODE_COVERAGE_LDFLAGS = @CODE_COVERAGE_LDFLAGS@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CXX = @CXX@
@@ -110,9 +116,7 @@ DBUS_SYS_DIR = @DBUS_SYS_DIR@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
 DHCLIENT_PATH = @DHCLIENT_PATH@
-DHCLIENT_VERSION = @DHCLIENT_VERSION@
 DHCPCD_PATH = @DHCPCD_PATH@
-DISABLE_DEPRECATED = @DISABLE_DEPRECATED@
 DLLTOOL = @DLLTOOL@
 DSYMUTIL = @DSYMUTIL@
 DUMPBIN = @DUMPBIN@
@@ -122,17 +126,14 @@ ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
 FGREP = @FGREP@
+GENHTML = @GENHTML@
 GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
 GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
-GIO_CFLAGS = @GIO_CFLAGS@
-GIO_LIBS = @GIO_LIBS@
 GLIB_CFLAGS = @GLIB_CFLAGS@
 GLIB_GENMARSHAL = @GLIB_GENMARSHAL@
 GLIB_LIBS = @GLIB_LIBS@
 GLIB_MAKEFILE = @GLIB_MAKEFILE@
 GLIB_MKENUMS = @GLIB_MKENUMS@
-GMODULE_CFLAGS = @GMODULE_CFLAGS@
-GMODULE_LIBS = @GMODULE_LIBS@
 GMSGFMT = @GMSGFMT@
 GMSGFMT_015 = @GMSGFMT_015@
 GNUTLS_CFLAGS = @GNUTLS_CFLAGS@
@@ -173,6 +174,7 @@ IPTABLES_PATH = @IPTABLES_PATH@
 IWMX_SDK_CFLAGS = @IWMX_SDK_CFLAGS@
 IWMX_SDK_LIBS = @IWMX_SDK_LIBS@
 KERNEL_FIRMWARE_DIR = @KERNEL_FIRMWARE_DIR@
+LCOV = @LCOV@
 LD = @LD@
 LDFLAGS = @LDFLAGS@
 LIBDL = @LIBDL@
@@ -189,11 +191,7 @@ LIBNL2_LIBS = @LIBNL2_LIBS@
 LIBNL3_CFLAGS = @LIBNL3_CFLAGS@
 LIBNL3_LIBS = @LIBNL3_LIBS@
 LIBNL_CFLAGS = @LIBNL_CFLAGS@
-LIBNL_GENL3_CFLAGS = @LIBNL_GENL3_CFLAGS@
-LIBNL_GENL3_LIBS = @LIBNL_GENL3_LIBS@
 LIBNL_LIBS = @LIBNL_LIBS@
-LIBNL_ROUTE3_CFLAGS = @LIBNL_ROUTE3_CFLAGS@
-LIBNL_ROUTE3_LIBS = @LIBNL_ROUTE3_LIBS@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
 LIBSOUP_CFLAGS = @LIBSOUP_CFLAGS@
@@ -208,6 +206,8 @@ MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MANIFEST_TOOL = @MANIFEST_TOOL@
 MKDIR_P = @MKDIR_P@
+MM_GLIB_CFLAGS = @MM_GLIB_CFLAGS@
+MM_GLIB_LIBS = @MM_GLIB_LIBS@
 MOC = @MOC@
 MSGFMT = @MSGFMT@
 MSGFMT_015 = @MSGFMT_015@
@@ -217,6 +217,7 @@ NMEDIT = @NMEDIT@
 NM_MAJOR_VERSION = @NM_MAJOR_VERSION@
 NM_MICRO_VERSION = @NM_MICRO_VERSION@
 NM_MINOR_VERSION = @NM_MINOR_VERSION@
+NM_MODIFY_SYSTEM_POLICY = @NM_MODIFY_SYSTEM_POLICY@
 NM_VERSION = @NM_VERSION@
 NSS_CFLAGS = @NSS_CFLAGS@
 NSS_LIBS = @NSS_LIBS@
@@ -243,13 +244,14 @@ PPPD_PLUGIN_DIR = @PPPD_PLUGIN_DIR@
 QT_CFLAGS = @QT_CFLAGS@
 QT_LIBS = @QT_LIBS@
 RANLIB = @RANLIB@
-RESOLVCONF_PATH = @RESOLVCONF_PATH@
 SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
-SYSTEMD_CFLAGS = @SYSTEMD_CFLAGS@
-SYSTEMD_LIBS = @SYSTEMD_LIBS@
+SYSTEMD_INHIBIT_CFLAGS = @SYSTEMD_INHIBIT_CFLAGS@
+SYSTEMD_INHIBIT_LIBS = @SYSTEMD_INHIBIT_LIBS@
+SYSTEMD_LOGIN_CFLAGS = @SYSTEMD_LOGIN_CFLAGS@
+SYSTEMD_LOGIN_LIBS = @SYSTEMD_LOGIN_LIBS@
 SYSTEM_CA_PATH = @SYSTEM_CA_PATH@
 UDEV_BASE_DIR = @UDEV_BASE_DIR@
 USE_NLS = @USE_NLS@
@@ -304,6 +306,11 @@ localedir = @localedir@
 localstatedir = @localstatedir@
 mandir = @mandir@
 mkdir_p = @mkdir_p@
+nmbinary = @nmbinary@
+nmconfdir = @nmconfdir@
+nmdatadir = @nmdatadir@
+nmrundir = @nmrundir@
+nmstatedir = @nmstatedir@
 oldincludedir = @oldincludedir@
 pdfdir = @pdfdir@
 prefix = @prefix@
@@ -318,6 +325,10 @@ target_alias = @target_alias@
 top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
+with_dhclient = @with_dhclient@
+with_dhcpcd = @with_dhcpcd@
+with_netconfig = @with_netconfig@
+with_resolvconf = @with_resolvconf@
 KEYFILES = \
 	Test_Wired_Connection \
 	Test_GSM_Connection \
@@ -334,7 +345,9 @@ KEYFILES = \
 	Test_Wired_TLS_New \
 	Test_Wired_TLS_Blob \
 	Test_Wired_TLS_Path_Missing \
-	Test_InfiniBand_Connection
+	Test_InfiniBand_Connection \
+	Test_Bridge_Main \
+	Test_Bridge_Component
 
 CERTS = \
 	test-ca-cert.pem \
diff --git a/src/settings/plugins/keyfile/tests/keyfiles/Test_Bridge_Component b/src/settings/plugins/keyfile/tests/keyfiles/Test_Bridge_Component
new file mode 100644
index 00000000..f5463ed0
--- /dev/null
+++ b/src/settings/plugins/keyfile/tests/keyfiles/Test_Bridge_Component
@@ -0,0 +1,15 @@
+[connection]
+id=Test Bridge Component
+uuid=d7b4f96c-c45e-4298-bef8-f48574f8c1c0
+type=802-3-ethernet
+master=br0
+slave-type=bridge
+
+[802-3-ethernet]
+mac-address=00:22:15:59:62:97
+
+[bridge-port]
+priority=28
+hairpin-mode=true
+path-cost=100
+
diff --git a/src/settings/plugins/keyfile/tests/keyfiles/Test_Bridge_Main b/src/settings/plugins/keyfile/tests/keyfiles/Test_Bridge_Main
new file mode 100644
index 00000000..7fbbfe22
--- /dev/null
+++ b/src/settings/plugins/keyfile/tests/keyfiles/Test_Bridge_Main
@@ -0,0 +1,17 @@
+[connection]
+id=Test Bridge Main
+uuid=8f061643-fe41-4d4c-a8d9-097d26e2ad3a
+type=bridge
+
+[bridge]
+interface-name=br0
+stp=true
+forward-delay=0
+priority=32744
+hello-time=7
+max-age=39
+ageing-time=235352
+
+[ipv4]
+method=auto
+
diff --git a/src/settings/plugins/keyfile/tests/keyfiles/Test_Wired_Connection b/src/settings/plugins/keyfile/tests/keyfiles/Test_Wired_Connection
index 5785dc24..203441ef 100644
--- a/src/settings/plugins/keyfile/tests/keyfiles/Test_Wired_Connection
+++ b/src/settings/plugins/keyfile/tests/keyfiles/Test_Wired_Connection
@@ -18,6 +18,10 @@ method=manual
 dns=4.2.2.1;4.2.2.2;
 addresses1=192.168.0.5;24;192.168.0.1;
 addresses2=1.2.3.4;16;1.2.1.1;
+address=2.3.4.5/24,2.3.4.6
+address3=3.4.5.6/16
+routes1=1.2.3.0/24,2.3.4.8,99
+route=5.6.7.8/32
 ignore-auto-routes=false
 ignore-auto-dns=false
 
@@ -27,6 +31,10 @@ dns=1111:dddd::aaaa;1::cafe;
 dns-search=super-domain.com;redhat.com;gnu.org;
 addresses1=abcd:1234:ffff::cdde/64
 addresses2=1:2:3:4:5:6:7:8/96
+address=2:3:4:5:6:7:8:9/64,2:3:4:5:1:2:3:4
+address3=3:4:5:6:7:8:9:0/128
 routes1=a:b:c:d::/64;f:e:d:c:1:2:3:4;99;
+route=d:e:f:0:1:2:3:4/64,f:e:d:c:1:2:3:4
+route2=8:7:6:5:4:3:2:1/128
 ignore-auto-routes=false
 ignore-auto-dns=false
diff --git a/src/settings/plugins/keyfile/tests/test-keyfile.c b/src/settings/plugins/keyfile/tests/test-keyfile.c
index 79fa2f9c..8a646e1c 100644
--- a/src/settings/plugins/keyfile/tests/test-keyfile.c
+++ b/src/settings/plugins/keyfile/tests/test-keyfile.c
@@ -49,6 +49,74 @@
 #define TEST_WIRED_FILE    TEST_KEYFILES_DIR"/Test_Wired_Connection"
 #define TEST_WIRELESS_FILE TEST_KEYFILES_DIR"/Test_Wireless_Connection"
 
+static void
+check_ip4_address (NMSettingIP4Config *config, int idx, const char *address_str, int plen, const char *gateway_str)
+{
+	NMIP4Address *ip4 = nm_setting_ip4_config_get_address (config, idx);
+	struct in_addr address;
+	struct in_addr gateway;
+
+	g_assert (inet_pton (AF_INET, address_str, &address) == 1);
+	g_assert (inet_pton (AF_INET, gateway_str, &gateway) == 1);
+
+	g_assert (ip4);
+	g_assert (nm_ip4_address_get_address (ip4) == address.s_addr);
+	g_assert (nm_ip4_address_get_prefix (ip4) == plen);
+	g_assert (nm_ip4_address_get_gateway (ip4) == gateway.s_addr);
+}
+
+static void
+check_ip6_address (NMSettingIP6Config *config, int idx, const char *address_str, int plen, const char *gateway_str)
+{
+	NMIP6Address *ip6 = nm_setting_ip6_config_get_address (config, idx);
+	struct in6_addr address;
+	struct in6_addr gateway;
+
+	g_assert (inet_pton (AF_INET6, address_str, &address) == 1);
+	g_assert (inet_pton (AF_INET6, gateway_str, &gateway) == 1);
+
+	g_assert (ip6);
+	g_assert (!memcmp (nm_ip6_address_get_address (ip6), &address, sizeof(address)));
+	g_assert (nm_ip6_address_get_prefix (ip6) == plen);
+	g_assert (!memcmp (nm_ip6_address_get_gateway (ip6), &gateway, sizeof(gateway)));
+}
+
+static void
+check_ip4_route (NMSettingIP4Config *config, int idx, const char *destination_str, int plen,
+		const char *nexthop_str, int metric)
+{
+	NMIP4Route *route = nm_setting_ip4_config_get_route (config, idx);
+	struct in_addr destination;
+	struct in_addr nexthop;
+
+	g_assert (inet_pton (AF_INET, destination_str, &destination) == 1);
+	g_assert (inet_pton (AF_INET, nexthop_str, &nexthop) == 1);
+
+	g_assert (route);
+	g_assert (nm_ip4_route_get_dest (route) == destination.s_addr);
+	g_assert (nm_ip4_route_get_prefix (route) == plen);
+	g_assert (nm_ip4_route_get_next_hop (route) == nexthop.s_addr);
+	g_assert (nm_ip4_route_get_metric (route) == metric);
+}
+
+static void
+check_ip6_route (NMSettingIP6Config *config, int idx, const char *destination_str, int plen,
+		const char *next_hop_str, int metric)
+{
+	NMIP6Route *route = nm_setting_ip6_config_get_route (config, idx);
+	struct in6_addr destination;
+	struct in6_addr next_hop;
+
+	g_assert (inet_pton (AF_INET6, destination_str, &destination) == 1);
+	g_assert (inet_pton (AF_INET6, next_hop_str, &next_hop) == 1);
+
+	g_assert (route);
+	g_assert (!memcmp (nm_ip6_route_get_dest (route), &destination, sizeof(destination)));
+	g_assert (nm_ip6_route_get_prefix (route) == plen);
+	g_assert (!memcmp (nm_ip6_route_get_next_hop (route), &next_hop, sizeof(next_hop)));
+	g_assert (nm_ip6_route_get_metric (route) == metric);
+}
+
 static void
 test_read_valid_wired_connection (void)
 {
@@ -68,23 +136,12 @@ test_read_valid_wired_connection (void)
 	const char *expected_dns1 = "4.2.2.1";
 	const char *expected_dns2 = "4.2.2.2";
 	struct in_addr addr;
-	const char *expected_address1 = "192.168.0.5";
-	const char *expected_address2 = "1.2.3.4";
-	const char *expected_address1_gw = "192.168.0.1";
-	const char *expected_address2_gw = "1.2.1.1";
-	NMIP4Address *ip4_addr;
+	struct in6_addr addr6;
 	const char *expected6_dns1 = "1111:dddd::aaaa";
 	const char *expected6_dns2 = "1::cafe";
 	const char *expected6_dnssearch1 = "super-domain.com";
 	const char *expected6_dnssearch2 = "redhat.com";
 	const char *expected6_dnssearch3 = "gnu.org";
-	struct in6_addr addr6;
-	const char *expected6_address1 = "abcd:1234:ffff::cdde";
-	const char *expected6_address2 = "1:2:3:4:5:6:7:8";
-	const char *expected6_route_dest = "a:b:c:d::";
-	const char *expected6_route_nh = "f:e:d:c:1:2:3:4";
-	NMIP6Address *ip6_addr;
-	NMIP6Route *ip6_route;
 
 	connection = nm_keyfile_plugin_connection_from_file (TEST_WIRED_FILE, NULL);
 	ASSERT (connection != NULL,
@@ -219,83 +276,17 @@ test_read_valid_wired_connection (void)
 	        NM_SETTING_IP4_CONFIG_SETTING_NAME,
 	        NM_SETTING_IP4_CONFIG_DNS);
 
-	ASSERT (nm_setting_ip4_config_get_num_addresses (s_ip4) == 2,
-	        "connection-verify-wired", "failed to verify %s: unexpected %s / %s key value",
-	        TEST_WIRED_FILE,
-	        NM_SETTING_IP4_CONFIG_SETTING_NAME,
-	        NM_SETTING_IP4_CONFIG_DNS);
-
-	/* Address #1 */
-	ip4_addr = nm_setting_ip4_config_get_address (s_ip4, 0);
-	ASSERT (ip4_addr,
-	        "connection-verify-wired", "failed to verify %s: missing IP4 address #1",
-	        TEST_WIRED_FILE,
-	        NM_SETTING_IP4_CONFIG_SETTING_NAME,
-	        NM_SETTING_IP4_CONFIG_ADDRESSES);
-
-	ASSERT (nm_ip4_address_get_prefix (ip4_addr) == 24,
-	        "connection-verify-wired", "failed to verify %s: unexpected IP4 address #1 prefix",
-	        TEST_WIRED_FILE,
-	        NM_SETTING_IP4_CONFIG_SETTING_NAME,
-	        NM_SETTING_IP4_CONFIG_ADDRESSES);
-
-	ASSERT (inet_pton (AF_INET, expected_address1, &addr) > 0,
-	        "connection-verify-wired", "failed to verify %s: couldn't convert IP address #1",
-	        TEST_WIRED_FILE,
-	        NM_SETTING_IP4_CONFIG_SETTING_NAME,
-	        NM_SETTING_IP4_CONFIG_DNS);
-	ASSERT (nm_ip4_address_get_address (ip4_addr) == addr.s_addr,
-	        "connection-verify-wired", "failed to verify %s: unexpected IP4 address #1",
-	        TEST_WIRED_FILE,
-	        NM_SETTING_IP4_CONFIG_SETTING_NAME,
-	        NM_SETTING_IP4_CONFIG_ADDRESSES);
-
-	ASSERT (inet_pton (AF_INET, expected_address1_gw, &addr) > 0,
-	        "connection-verify-wired", "failed to verify %s: couldn't convert IP address #1 gateway",
-	        TEST_WIRED_FILE,
-	        NM_SETTING_IP4_CONFIG_SETTING_NAME,
-	        NM_SETTING_IP4_CONFIG_ADDRESSES);
-	ASSERT (nm_ip4_address_get_gateway (ip4_addr) == addr.s_addr,
-	        "connection-verify-wired", "failed to verify %s: unexpected IP4 address #1 gateway",
-	        TEST_WIRED_FILE,
-	        NM_SETTING_IP4_CONFIG_SETTING_NAME,
-	        NM_SETTING_IP4_CONFIG_ADDRESSES);
-	
-	/* Address #2 */
-	ip4_addr = nm_setting_ip4_config_get_address (s_ip4, 1);
-	ASSERT (ip4_addr,
-	        "connection-verify-wired", "failed to verify %s: missing IP4 address #2",
-	        TEST_WIRED_FILE,
-	        NM_SETTING_IP4_CONFIG_SETTING_NAME,
-	        NM_SETTING_IP4_CONFIG_ADDRESSES);
+	/* IPv4 addresses */
+	g_assert (nm_setting_ip4_config_get_num_addresses (s_ip4) == 4);
+	check_ip4_address (s_ip4, 0, "2.3.4.5", 24, "2.3.4.6");
+	check_ip4_address (s_ip4, 1, "192.168.0.5", 24, "192.168.0.1");
+	check_ip4_address (s_ip4, 2, "1.2.3.4", 16, "1.2.1.1");
+	check_ip4_address (s_ip4, 3, "3.4.5.6", 16, "0.0.0.0");
 
-	ASSERT (nm_ip4_address_get_prefix (ip4_addr) == 16,
-	        "connection-verify-wired", "failed to verify %s: unexpected IP4 address #2 prefix",
-	        TEST_WIRED_FILE,
-	        NM_SETTING_IP4_CONFIG_SETTING_NAME,
-	        NM_SETTING_IP4_CONFIG_ADDRESSES);
-
-	ASSERT (inet_pton (AF_INET, expected_address2, &addr) > 0,
-	        "connection-verify-wired", "failed to verify %s: couldn't convert IP address #2",
-	        TEST_WIRED_FILE,
-	        NM_SETTING_IP4_CONFIG_SETTING_NAME,
-	        NM_SETTING_IP4_CONFIG_DNS);
-	ASSERT (nm_ip4_address_get_address (ip4_addr) == addr.s_addr,
-	        "connection-verify-wired", "failed to verify %s: unexpected IP4 address #2",
-	        TEST_WIRED_FILE,
-	        NM_SETTING_IP4_CONFIG_SETTING_NAME,
-	        NM_SETTING_IP4_CONFIG_ADDRESSES);
-
-	ASSERT (inet_pton (AF_INET, expected_address2_gw, &addr) > 0,
-	        "connection-verify-wired", "failed to verify %s: couldn't convert IP address #2 gateway",
-	        TEST_WIRED_FILE,
-	        NM_SETTING_IP4_CONFIG_SETTING_NAME,
-	        NM_SETTING_IP4_CONFIG_ADDRESSES);
-	ASSERT (nm_ip4_address_get_gateway (ip4_addr) == addr.s_addr,
-	        "connection-verify-wired", "failed to verify %s: unexpected IP4 address #2 gateway",
-	        TEST_WIRED_FILE,
-	        NM_SETTING_IP4_CONFIG_SETTING_NAME,
-	        NM_SETTING_IP4_CONFIG_ADDRESSES);
+	/* IPv4 routes */
+	g_assert (nm_setting_ip4_config_get_num_routes (s_ip4) == 2);
+	check_ip4_route (s_ip4, 0, "5.6.7.8", 32, "0.0.0.0", 0);
+	check_ip4_route (s_ip4, 1, "1.2.3.0", 24, "2.3.4.8", 99);
 
 	/* ===== IPv6 SETTING ===== */
 
@@ -342,12 +333,6 @@ test_read_valid_wired_connection (void)
 	        NM_SETTING_IP6_CONFIG_SETTING_NAME,
 	        NM_SETTING_IP6_CONFIG_DNS);
 
-	ASSERT (nm_setting_ip6_config_get_num_addresses (s_ip6) == 2,
-	        "connection-verify-wired", "failed to verify %s: unexpected %s / %s key value",
-	        TEST_WIRED_FILE,
-	        NM_SETTING_IP6_CONFIG_SETTING_NAME,
-	        NM_SETTING_IP6_CONFIG_DNS);
-
 	/* DNS Searches */
 	ASSERT (nm_setting_ip6_config_get_num_dns_searches (s_ip6) == 3,
 	        "connection-verify-wired", "failed to verify %s: unexpected %s / %s key value",
@@ -371,98 +356,18 @@ test_read_valid_wired_connection (void)
 	        NM_SETTING_IP6_CONFIG_SETTING_NAME,
 	        NM_SETTING_IP6_CONFIG_DNS_SEARCH);
 
-	/* Address #1 */
-	ip6_addr = nm_setting_ip6_config_get_address (s_ip6, 0);
-	ASSERT (ip6_addr,
-	        "connection-verify-wired", "failed to verify %s: missing IP6 address #1",
-	        TEST_WIRED_FILE,
-	        NM_SETTING_IP6_CONFIG_SETTING_NAME,
-	        NM_SETTING_IP6_CONFIG_ADDRESSES);
-
-	ASSERT (nm_ip6_address_get_prefix (ip6_addr) == 64,
-	        "connection-verify-wired", "failed to verify %s: unexpected IP6 address #1 prefix",
-	        TEST_WIRED_FILE,
-	        NM_SETTING_IP6_CONFIG_SETTING_NAME,
-	        NM_SETTING_IP6_CONFIG_ADDRESSES);
-
-	ASSERT (inet_pton (AF_INET6, expected6_address1, &addr6) > 0,
-	        "connection-verify-wired", "failed to verify %s: couldn't convert IP address #1",
-	        TEST_WIRED_FILE,
-	        NM_SETTING_IP6_CONFIG_SETTING_NAME,
-	        NM_SETTING_IP6_CONFIG_DNS);
-	ASSERT (IN6_ARE_ADDR_EQUAL (nm_ip6_address_get_address (ip6_addr), &addr6),
-	        "connection-verify-wired", "failed to verify %s: unexpected IP4 address #1",
-	        TEST_WIRED_FILE,
-	        NM_SETTING_IP6_CONFIG_SETTING_NAME,
-	        NM_SETTING_IP6_CONFIG_ADDRESSES);
-
-	/* Address #2 */
-	ip6_addr = nm_setting_ip6_config_get_address (s_ip6, 1);
-	ASSERT (ip6_addr,
-	        "connection-verify-wired", "failed to verify %s: missing IP6 address #2",
-	        TEST_WIRED_FILE,
-	        NM_SETTING_IP6_CONFIG_SETTING_NAME,
-	        NM_SETTING_IP6_CONFIG_ADDRESSES);
-
-	ASSERT (nm_ip6_address_get_prefix (ip6_addr) == 96,
-	        "connection-verify-wired", "failed to verify %s: unexpected IP6 address #2 prefix",
-	        TEST_WIRED_FILE,
-	        NM_SETTING_IP6_CONFIG_SETTING_NAME,
-	        NM_SETTING_IP6_CONFIG_ADDRESSES);
-
-	ASSERT (inet_pton (AF_INET6, expected6_address2, &addr6) > 0,
-	        "connection-verify-wired", "failed to verify %s: couldn't convert IP address #2",
-	        TEST_WIRED_FILE,
-	        NM_SETTING_IP6_CONFIG_SETTING_NAME,
-	        NM_SETTING_IP6_CONFIG_DNS);
-	ASSERT (IN6_ARE_ADDR_EQUAL (nm_ip6_address_get_address (ip6_addr), &addr6),
-	        "connection-verify-wired", "failed to verify %s: unexpected IP6 address #2",
-	        TEST_WIRED_FILE,
-	        NM_SETTING_IP6_CONFIG_SETTING_NAME,
-	        NM_SETTING_IP6_CONFIG_ADDRESSES);
+	/* IPv6 addresses */
+	g_assert (nm_setting_ip6_config_get_num_addresses (s_ip6) == 4);
+	check_ip6_address (s_ip6, 0, "2:3:4:5:6:7:8:9", 64, "2:3:4:5:1:2:3:4");
+	check_ip6_address (s_ip6, 1, "abcd:1234:ffff::cdde", 64, "::");
+	check_ip6_address (s_ip6, 2, "1:2:3:4:5:6:7:8", 96, "::");
+	check_ip6_address (s_ip6, 3, "3:4:5:6:7:8:9:0", 128, "::");
 
 	/* Route #1 */
-	ip6_route = nm_setting_ip6_config_get_route (s_ip6, 0);
-	ASSERT (ip6_route,
-	        "connection-verify-wired", "failed to verify %s: missing IP6 route #1",
-	        TEST_WIRED_FILE,
-	        NM_SETTING_IP6_CONFIG_SETTING_NAME,
-	        NM_SETTING_IP6_CONFIG_ROUTES);
-
-	ASSERT (inet_pton (AF_INET6, expected6_route_dest, &addr6) > 0,
-	        "connection-verify-wired", "failed to verify %s: couldn't convert IP route dest #1",
-	        TEST_WIRED_FILE,
-	        NM_SETTING_IP6_CONFIG_SETTING_NAME,
-	        NM_SETTING_IP6_CONFIG_DNS);
-	ASSERT (IN6_ARE_ADDR_EQUAL (nm_ip6_route_get_dest (ip6_route), &addr6),
-	        "connection-verify-wired", "failed to verify %s: unexpected IP4 route dest #1",
-	        TEST_WIRED_FILE,
-	        NM_SETTING_IP6_CONFIG_SETTING_NAME,
-	        NM_SETTING_IP6_CONFIG_ROUTES);
-
-	ASSERT (nm_ip6_route_get_prefix (ip6_route) == 64,
-	        "connection-verify-wired", "failed to verify %s: unexpected IP6 route #1 prefix",
-	        TEST_WIRED_FILE,
-	        NM_SETTING_IP6_CONFIG_SETTING_NAME,
-	        NM_SETTING_IP6_CONFIG_ROUTES);
-
-	ASSERT (inet_pton (AF_INET6, expected6_route_nh, &addr6) > 0,
-	        "connection-verify-wired", "failed to verify %s: couldn't convert IP route next hop #1",
-	        TEST_WIRED_FILE,
-	        NM_SETTING_IP6_CONFIG_SETTING_NAME,
-	        NM_SETTING_IP6_CONFIG_DNS);
-	ASSERT (IN6_ARE_ADDR_EQUAL (nm_ip6_route_get_next_hop (ip6_route), &addr6),
-	        "connection-verify-wired", "failed to verify %s: unexpected IP4 route dest #1",
-	        TEST_WIRED_FILE,
-	        NM_SETTING_IP6_CONFIG_SETTING_NAME,
-	        NM_SETTING_IP6_CONFIG_ROUTES);
-
-	ASSERT (nm_ip6_route_get_metric (ip6_route) == 99,
-	        "connection-verify-wired", "failed to verify %s: unexpected IP6 route #1 metric",
-	        TEST_WIRED_FILE,
-	        NM_SETTING_IP6_CONFIG_SETTING_NAME,
-	        NM_SETTING_IP6_CONFIG_ROUTES);
-
+	g_assert (nm_setting_ip6_config_get_num_routes (s_ip6) == 3);
+	check_ip6_route (s_ip6, 0, "d:e:f:0:1:2:3:4", 64, "f:e:d:c:1:2:3:4", 0);
+	check_ip6_route (s_ip6, 1, "a:b:c:d::", 64, "f:e:d:c:1:2:3:4", 99);
+	check_ip6_route (s_ip6, 2, "8:7:6:5:4:3:2:1", 128, "::", 0);
 	g_object_unref (connection);
 }
 
@@ -733,10 +638,6 @@ test_read_ip6_wired_connection (void)
 	const char *tmp;
 	const char *expected_id = "Test Wired Connection IP6";
 	const char *expected_uuid = "4e80a56d-c99f-4aad-a6dd-b449bc398c57";
-	struct in6_addr addr6;
-	const char *expected6_address1 = "abcd:1234:ffff::cdde";
-	const char *expected6_gw1 = "abcd:1234:ffff::cdd1";
-	NMIP6Address *ip6_addr;
 
 	connection = nm_keyfile_plugin_connection_from_file (TEST_WIRED_IP6_FILE, NULL);
 	ASSERT (connection != NULL,
@@ -825,47 +726,9 @@ test_read_ip6_wired_connection (void)
 	        NM_SETTING_IP6_CONFIG_SETTING_NAME,
 	        NM_SETTING_IP6_CONFIG_METHOD);
 
-	ASSERT (nm_setting_ip6_config_get_num_addresses (s_ip6) == 1,
-	        "connection-verify-wired", "failed to verify %s: unexpected %s / %s key value",
-	        TEST_WIRED_IP6_FILE,
-	        NM_SETTING_IP6_CONFIG_SETTING_NAME,
-	        NM_SETTING_IP6_CONFIG_DNS);
-
-	/* Address #1 */
-	ip6_addr = nm_setting_ip6_config_get_address (s_ip6, 0);
-	ASSERT (ip6_addr,
-	        "connection-verify-wired", "failed to verify %s: missing IP6 address #1",
-	        TEST_WIRED_IP6_FILE,
-	        NM_SETTING_IP6_CONFIG_SETTING_NAME,
-	        NM_SETTING_IP6_CONFIG_ADDRESSES);
-
-	ASSERT (nm_ip6_address_get_prefix (ip6_addr) == 64,
-	        "connection-verify-wired", "failed to verify %s: unexpected IP6 address #1 prefix",
-	        TEST_WIRED_IP6_FILE,
-	        NM_SETTING_IP6_CONFIG_SETTING_NAME,
-	        NM_SETTING_IP6_CONFIG_ADDRESSES);
-
-	ASSERT (inet_pton (AF_INET6, expected6_address1, &addr6) > 0,
-	        "connection-verify-wired", "failed to verify %s: couldn't convert IP address #1",
-	        TEST_WIRED_IP6_FILE,
-	        NM_SETTING_IP6_CONFIG_SETTING_NAME,
-	        NM_SETTING_IP6_CONFIG_ADDRESSES);
-	ASSERT (IN6_ARE_ADDR_EQUAL (nm_ip6_address_get_address (ip6_addr), &addr6),
-	        "connection-verify-wired", "failed to verify %s: unexpected IP4 address #1",
-	        TEST_WIRED_IP6_FILE,
-	        NM_SETTING_IP6_CONFIG_SETTING_NAME,
-	        NM_SETTING_IP6_CONFIG_ADDRESSES);
-
-	ASSERT (inet_pton (AF_INET6, expected6_gw1, &addr6) > 0,
-	        "connection-verify-wired", "failed to verify %s: couldn't convert GW address #1",
-	        TEST_WIRED_IP6_FILE,
-	        NM_SETTING_IP6_CONFIG_SETTING_NAME,
-	        NM_SETTING_IP6_CONFIG_ADDRESSES);
-	ASSERT (IN6_ARE_ADDR_EQUAL (nm_ip6_address_get_gateway (ip6_addr), &addr6),
-	        "connection-verify-wired", "failed to verify %s: unexpected IP4 address #1",
-	        TEST_WIRED_IP6_FILE,
-	        NM_SETTING_IP6_CONFIG_SETTING_NAME,
-	        NM_SETTING_IP6_CONFIG_ADDRESSES);
+	/* IPv6 address */
+	g_assert (nm_setting_ip6_config_get_num_addresses (s_ip6) == 1);
+	check_ip6_address (s_ip6, 0, "abcd:1234:ffff::cdde", 64, "abcd:1234:ffff::cdd1");
 
 	g_object_unref (connection);
 }
@@ -2958,6 +2821,264 @@ test_write_infiniband_connection (void)
 	g_object_unref (connection);
 }
 
+#define TEST_BRIDGE_MAIN_FILE TEST_KEYFILES_DIR"/Test_Bridge_Main"
+
+static void
+test_read_bridge_main (void)
+{
+	NMConnection *connection;
+	NMSettingConnection *s_con;
+	NMSettingIP4Config *s_ip4;
+	NMSettingBridge *s_bridge;
+	GError *error = NULL;
+	const char *expected_id = "Test Bridge Main";
+	const char *expected_uuid = "8f061643-fe41-4d4c-a8d9-097d26e2ad3a";
+	gboolean success;
+
+	connection = nm_keyfile_plugin_connection_from_file (TEST_BRIDGE_MAIN_FILE, &error);
+	g_assert_no_error (error);
+	g_assert (connection);
+	success = nm_connection_verify (connection, &error);
+	g_assert_no_error (error);
+	g_assert (success);
+
+	/* Connection setting */
+	s_con = nm_connection_get_setting_connection (connection);
+	g_assert (s_con);
+	g_assert_cmpstr (nm_setting_connection_get_id (s_con), ==, expected_id);
+	g_assert_cmpstr (nm_setting_connection_get_uuid (s_con), ==, expected_uuid);
+
+	/* IPv4 setting */
+	s_ip4 = nm_connection_get_setting_ip4_config (connection);
+	g_assert (s_ip4);
+	g_assert_cmpstr (nm_setting_ip4_config_get_method (s_ip4), ==, NM_SETTING_IP4_CONFIG_METHOD_AUTO);
+
+	/* Bridge setting */
+	s_bridge = nm_connection_get_setting_bridge (connection);
+	g_assert (s_bridge);
+	g_assert_cmpstr (nm_setting_bridge_get_interface_name (s_bridge), ==, "br0");
+	g_assert_cmpuint (nm_setting_bridge_get_forward_delay (s_bridge), ==, 0);
+	g_assert_cmpuint (nm_setting_bridge_get_stp (s_bridge), ==, TRUE);
+	g_assert_cmpuint (nm_setting_bridge_get_priority (s_bridge), ==, 32744);
+	g_assert_cmpuint (nm_setting_bridge_get_hello_time (s_bridge), ==, 7);
+	g_assert_cmpuint (nm_setting_bridge_get_max_age (s_bridge), ==, 39);
+	g_assert_cmpuint (nm_setting_bridge_get_ageing_time (s_bridge), ==, 235352);
+
+	g_object_unref (connection);
+}
+
+static void
+test_write_bridge_main (void)
+{
+	NMConnection *connection;
+	NMSettingConnection *s_con;
+	NMSettingBridge *s_bridge;
+	NMSettingIP4Config *s_ip4;
+	NMSettingIP6Config *s_ip6;
+	char *uuid;
+	gboolean success;
+	NMConnection *reread;
+	char *testfile = NULL;
+	GError *error = NULL;
+	pid_t owner_grp;
+	uid_t owner_uid;
+
+	connection = nm_connection_new ();
+	g_assert (connection);
+
+	/* Connection setting */
+	s_con = (NMSettingConnection *) nm_setting_connection_new ();
+	g_assert (s_con);
+	nm_connection_add_setting (connection, NM_SETTING (s_con));
+
+	uuid = nm_utils_uuid_generate ();
+	g_object_set (s_con,
+	              NM_SETTING_CONNECTION_ID, "Test Write Bridge Main",
+	              NM_SETTING_CONNECTION_UUID, uuid,
+	              NM_SETTING_CONNECTION_AUTOCONNECT, TRUE,
+	              NM_SETTING_CONNECTION_TYPE, NM_SETTING_BRIDGE_SETTING_NAME,
+	              NULL);
+	g_free (uuid);
+
+	/* Bridge setting */
+	s_bridge = (NMSettingBridge *) nm_setting_bridge_new ();
+	g_assert (s_bridge);
+	nm_connection_add_setting (connection, NM_SETTING (s_bridge));
+
+	g_object_set (s_bridge,
+	              NM_SETTING_BRIDGE_INTERFACE_NAME, "br0",
+	              NULL);
+
+	/* IP4 setting */
+	s_ip4 = (NMSettingIP4Config *) nm_setting_ip4_config_new ();
+	g_assert (s_ip4);
+	nm_connection_add_setting (connection, NM_SETTING (s_ip4));
+	g_object_set (s_ip4,
+	              NM_SETTING_IP4_CONFIG_METHOD, NM_SETTING_IP4_CONFIG_METHOD_MANUAL,
+	              NM_SETTING_IP4_CONFIG_MAY_FAIL, TRUE,
+	              NULL);
+
+	add_one_ip4_address (s_ip4, "1.2.3.4", "1.1.1.1", 24);
+
+	/* IP6 setting */
+	s_ip6 = (NMSettingIP6Config *) nm_setting_ip6_config_new ();
+	g_assert (s_ip6);
+	nm_connection_add_setting (connection, NM_SETTING (s_ip6));
+	g_object_set (s_ip6, NM_SETTING_IP6_CONFIG_METHOD, NM_SETTING_IP6_CONFIG_METHOD_AUTO, NULL);
+
+	/* Write out the connection */
+	owner_uid = geteuid ();
+	owner_grp = getegid ();
+	success = nm_keyfile_plugin_write_test_connection (connection, TEST_SCRATCH_DIR, owner_uid, owner_grp, &testfile, &error);
+	g_assert_no_error (error);
+	g_assert (success);
+	g_assert (testfile);
+
+	/* Read the connection back in and compare it to the one we just wrote out */
+	reread = nm_keyfile_plugin_connection_from_file (testfile, &error);
+	g_assert_no_error (error);
+	g_assert (reread);
+
+	g_assert (nm_connection_compare (connection, reread, NM_SETTING_COMPARE_FLAG_EXACT));
+
+	unlink (testfile);
+	g_free (testfile);
+
+	g_object_unref (reread);
+	g_object_unref (connection);
+}
+
+#define TEST_BRIDGE_COMPONENT_FILE TEST_KEYFILES_DIR"/Test_Bridge_Component"
+
+static void
+test_read_bridge_component (void)
+{
+	NMConnection *connection;
+	NMSettingConnection *s_con;
+	NMSettingBridgePort *s_port;
+	NMSettingWired *s_wired;
+	const GByteArray *array;
+	guint8 expected_mac[ETH_ALEN] = { 0x00, 0x22, 0x15, 0x59, 0x62, 0x97 };
+	GError *error = NULL;
+	const char *expected_id = "Test Bridge Component";
+	const char *expected_uuid = "d7b4f96c-c45e-4298-bef8-f48574f8c1c0";
+	gboolean success;
+
+	connection = nm_keyfile_plugin_connection_from_file (TEST_BRIDGE_COMPONENT_FILE, &error);
+	g_assert_no_error (error);
+	g_assert (connection);
+	success = nm_connection_verify (connection, &error);
+	g_assert_no_error (error);
+	g_assert (success);
+
+	/* Connection setting */
+	s_con = nm_connection_get_setting_connection (connection);
+	g_assert (s_con);
+	g_assert_cmpstr (nm_setting_connection_get_id (s_con), ==, expected_id);
+	g_assert_cmpstr (nm_setting_connection_get_uuid (s_con), ==, expected_uuid);
+	g_assert_cmpstr (nm_setting_connection_get_master (s_con), ==, "br0");
+	g_assert (nm_setting_connection_is_slave_type (s_con, NM_SETTING_BRIDGE_SETTING_NAME));
+
+	/* Wired setting */
+	s_wired = nm_connection_get_setting_wired (connection);
+	g_assert (s_wired);
+	array = nm_setting_wired_get_mac_address (s_wired);
+	g_assert (array);
+	g_assert_cmpint (array->len, ==, ETH_ALEN);
+	g_assert_cmpint (memcmp (array->data, expected_mac, sizeof (expected_mac)), ==, 0);
+
+	/* BridgePort setting */
+	s_port = nm_connection_get_setting_bridge_port (connection);
+	g_assert (s_port);
+	g_assert (nm_setting_bridge_port_get_hairpin_mode (s_port));
+	g_assert_cmpuint (nm_setting_bridge_port_get_priority (s_port), ==, 28);
+	g_assert_cmpuint (nm_setting_bridge_port_get_path_cost (s_port), ==, 100);
+
+	g_object_unref (connection);
+}
+
+static void
+test_write_bridge_component (void)
+{
+	NMConnection *connection;
+	NMSettingConnection *s_con;
+	NMSettingBridgePort *s_port;
+	NMSettingWired *s_wired;
+	char *uuid;
+	GByteArray *mac;
+	guint8 tmpmac[] = { 0x99, 0x88, 0x77, 0x66, 0x55, 0x44 };
+	gboolean success;
+	NMConnection *reread;
+	char *testfile = NULL;
+	GError *error = NULL;
+	pid_t owner_grp;
+	uid_t owner_uid;
+
+	connection = nm_connection_new ();
+	g_assert (connection);
+
+	/* Connection setting */
+	s_con = (NMSettingConnection *) nm_setting_connection_new ();
+	g_assert (s_con);
+	nm_connection_add_setting (connection, NM_SETTING (s_con));
+
+	uuid = nm_utils_uuid_generate ();
+	g_object_set (s_con,
+	              NM_SETTING_CONNECTION_ID, "Test Write Bridge Component",
+	              NM_SETTING_CONNECTION_UUID, uuid,
+	              NM_SETTING_CONNECTION_AUTOCONNECT, TRUE,
+	              NM_SETTING_CONNECTION_TYPE, NM_SETTING_WIRED_SETTING_NAME,
+	              NM_SETTING_CONNECTION_MASTER, "br0",
+	              NM_SETTING_CONNECTION_SLAVE_TYPE, NM_SETTING_BRIDGE_SETTING_NAME,
+	              NULL);
+	g_free (uuid);
+
+	/* Wired setting */
+	s_wired = NM_SETTING_WIRED (nm_setting_wired_new ());
+	g_assert (s_wired);
+	nm_connection_add_setting (connection, NM_SETTING (s_wired));
+
+	mac = g_byte_array_sized_new (ETH_ALEN);
+	g_byte_array_append (mac, &tmpmac[0], sizeof (tmpmac));
+	g_object_set (s_wired,
+	              NM_SETTING_WIRED_MAC_ADDRESS, mac,
+	              NM_SETTING_WIRED_MTU, 1300,
+	              NULL);
+	g_byte_array_free (mac, TRUE);
+
+	/* BridgePort setting */
+	s_port = (NMSettingBridgePort *) nm_setting_bridge_port_new ();
+	g_assert (s_port);
+	nm_connection_add_setting (connection, NM_SETTING (s_port));
+
+	g_object_set (s_port,
+	              NM_SETTING_BRIDGE_PORT_PRIORITY, 3,
+	              NM_SETTING_BRIDGE_PORT_PATH_COST, 99,
+	              NULL);
+
+	/* Write out the connection */
+	owner_uid = geteuid ();
+	owner_grp = getegid ();
+	success = nm_keyfile_plugin_write_test_connection (connection, TEST_SCRATCH_DIR, owner_uid, owner_grp, &testfile, &error);
+	g_assert_no_error (error);
+	g_assert (success);
+	g_assert (testfile);
+
+	/* Read the connection back in and compare it to the one we just wrote out */
+	reread = nm_keyfile_plugin_connection_from_file (testfile, &error);
+	g_assert_no_error (error);
+	g_assert (reread);
+
+	g_assert (nm_connection_compare (connection, reread, NM_SETTING_COMPARE_FLAG_EXACT));
+
+	unlink (testfile);
+	g_free (testfile);
+
+	g_object_unref (reread);
+	g_object_unref (connection);
+}
+
+
 int main (int argc, char **argv)
 {
 	GError *error = NULL;
@@ -3009,6 +3130,11 @@ int main (int argc, char **argv)
 	test_read_infiniband_connection ();
 	test_write_infiniband_connection ();
 
+	test_read_bridge_main ();
+	test_write_bridge_main ();
+	test_read_bridge_component ();
+	test_write_bridge_component ();
+
 	base = g_path_get_basename (argv[0]);
 	fprintf (stdout, "%s: SUCCESS\n", base);
 	g_free (base);
diff --git a/src/settings/plugins/keyfile/writer.c b/src/settings/plugins/keyfile/writer.c
index bbd6a7c3..0b8c1592 100644
--- a/src/settings/plugins/keyfile/writer.c
+++ b/src/settings/plugins/keyfile/writer.c
@@ -16,7 +16,7 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  *
  * Copyright (C) 2008 Novell, Inc.
- * Copyright (C) 2008 - 2011 Red Hat, Inc.
+ * Copyright (C) 2008 - 2012 Red Hat, Inc.
  */
 
 #include 
@@ -41,7 +41,6 @@
 #include 
 #include 
 #include 
-#include 
 
 #include "nm-dbus-glib-types.h"
 #include "nm-glib-compat.h"
@@ -116,18 +115,16 @@ write_ip4_values (GKeyFile *file,
                   guint32 addr1_pos,
                   guint32 addr2_pos)
 {
-	char **list = NULL;
+	GString *output;
 	int i, j;
 
-	list = g_new (char *, tuple_len);
-
 	for (i = 0, j = 0; i < array->len; i++, j++) {
 		GArray *tuple = g_ptr_array_index (array, i);
 		gboolean success = TRUE;
 		char *key_name;
 		int k;
 
-		memset (list, 0, tuple_len * sizeof (char *));
+		output = g_string_new ("");
 
 		for (k = 0; k < tuple_len; k++) {
 			if (k == addr1_pos || k == addr2_pos) {
@@ -142,24 +139,23 @@ write_ip4_values (GKeyFile *file,
 					success = FALSE;
 					break;
 				} else {
-					list[k] = g_strdup (buf);
+					g_string_append_printf (output, "%s%s", k == 0 ? "" : ",", buf);
 				}
 			} else {
 				/* prefix, metric */
-				list[k] = g_strdup_printf ("%d", g_array_index (tuple, guint32, k));
+				g_string_append_printf (output, "%c%d", k == 1 ? '/' : ',', g_array_index (tuple, guint32, k));
 			}
 		}
 
 		if (success) {
 			key_name = g_strdup_printf ("%s%d", key, j + 1);
-			g_key_file_set_string_list (file, setting_name, key_name, (const char **) list, tuple_len);
+			g_key_file_set_string (file, setting_name, key_name, output->str);
 			g_free (key_name);
 		}
 
-		for (k = 0; k < tuple_len; k++)
-			g_free (list[k]);
+		g_string_free (output, TRUE);
+
 	}
-	g_free (list);
 }
 
 static void
@@ -177,7 +173,7 @@ ip4_addr_writer (GKeyFile *file,
 
 	array = (GPtrArray *) g_value_get_boxed (value);
 	if (array && array->len)
-		write_ip4_values (file, setting_name, key, array, 3, 0, 2);
+		write_ip4_values (file, setting_name, "address", array, 3, 0, 2);
 }
 
 static void
@@ -195,7 +191,7 @@ ip4_route_writer (GKeyFile *file,
 
 	array = (GPtrArray *) g_value_get_boxed (value);
 	if (array && array->len)
-		write_ip4_values (file, setting_name, key, array, 4, 0, 2);
+		write_ip4_values (file, setting_name, "route", array, 4, 0, 2);
 }
 
 static void
@@ -340,7 +336,7 @@ ip6_addr_writer (GKeyFile *file,
 		ip6_addr = ip6_array_to_addr_prefix (values);
 		if (ip6_addr) {
 			/* Write it out */
-			key_name = g_strdup_printf ("%s%d", key, j++);
+			key_name = g_strdup_printf ("address%d", j++);
 			g_key_file_set_string (file, setting_name, key_name, ip6_addr);
 			g_free (key_name);
 			g_free (ip6_addr);
@@ -358,7 +354,7 @@ ip6_route_writer (GKeyFile *file,
 {
 	GPtrArray *array;
 	const char *setting_name = nm_setting_get_name (setting);
-	char *list[3];
+	GString *output;
 	int i, j;
 
 	g_return_if_fail (G_VALUE_HOLDS (value, DBUS_TYPE_G_ARRAY_OF_IP6_ROUTE));
@@ -371,36 +367,23 @@ ip6_route_writer (GKeyFile *file,
 		GValueArray *values = g_ptr_array_index (array, i);
 		char *key_name;
 		guint32 int_val;
-		char buf[INET6_ADDRSTRLEN + 1];
-		gboolean is_unspec = FALSE;
 
-		memset (list, 0, sizeof (list));
+		output = g_string_new ("");
 
-		/* Address and prefix */
-		list[0] = ip6_array_to_addr_prefix (values);
-		if (!list[0])
-			continue;
-
-		/* Next Hop */
-		if (!ip6_array_to_addr (values, 2, buf, sizeof (buf), &is_unspec))
-			continue;
-		if (is_unspec)
-			continue;
-		list[1] = g_strdup (buf);
+		/* Address, prefix and next hop*/
+		g_string_append (output, ip6_array_to_addr_prefix (values));
 
 		/* Metric */
 		value = g_value_array_get_nth (values, 3);
 		int_val = g_value_get_uint (value);
-		list[2] = g_strdup_printf ("%d", int_val);
+		g_string_append_printf (output, ",%d", int_val);
 
 		/* Write it out */
-		key_name = g_strdup_printf ("%s%d", key, j++);
-		g_key_file_set_string_list (file, setting_name, key_name, (const char **) list, 3);
+		key_name = g_strdup_printf ("route%d", j++);
+		g_key_file_set_string (file, setting_name, key_name, output->str);
 		g_free (key_name);
 
-		g_free (list[0]);
-		g_free (list[1]);
-		g_free (list[2]);
+		g_string_free (output, TRUE);
 	}
 }
 
@@ -500,7 +483,7 @@ ssid_writer (GKeyFile *file,
 	 */
 	for (i = 0; i < array->len; i++) {
 		char c = array->data[i] & 0xFF;
-		if (!isprint (c)) {
+		if (!g_ascii_isprint (c)) {
 			new_format = FALSE;
 			break;
 		}
@@ -816,6 +799,9 @@ static KeyWriter key_writers[] = {
 	{ NM_SETTING_INFINIBAND_SETTING_NAME,
 	  NM_SETTING_INFINIBAND_MAC_ADDRESS,
 	  mac_address_writer },
+	{ NM_SETTING_WIMAX_SETTING_NAME,
+	  NM_SETTING_WIMAX_MAC_ADDRESS,
+	  mac_address_writer },
 	{ NM_SETTING_WIRELESS_SETTING_NAME,
 	  NM_SETTING_WIRELESS_SSID,
 	  ssid_writer },
@@ -1024,8 +1010,15 @@ _internal_write_connection (NMConnection *connection,
 	if (!data)
 		goto out;
 
-	filename = _writer_id_to_filename (id);
-	path = g_build_filename (keyfile_dir, filename, NULL);
+	/* If we have existing file path, use it. Else generate one from
+	 * connection's ID.
+	 */
+	if (existing_path != NULL) {
+		path = g_strdup (existing_path);
+	} else {
+		filename = _writer_id_to_filename (id);
+		path = g_build_filename (keyfile_dir, filename, NULL);
+	}
 
 	/* If a file with this path already exists (but isn't the existing path
 	 * of the connection) then we need another name.  Multiple connections
diff --git a/src/settings/tests/Makefile.am b/src/settings/tests/Makefile.am
index 57d56fc4..5c0c4565 100644
--- a/src/settings/tests/Makefile.am
+++ b/src/settings/tests/Makefile.am
@@ -1,3 +1,5 @@
+if ENABLE_TESTS
+
 INCLUDES = \
 	-I$(top_srcdir)/include \
 	-I$(top_builddir)/include \
@@ -24,10 +26,7 @@ test_wired_defname_LDADD = \
 
 ###########################################
 
-if WITH_TESTS
-
 check-local: test-wired-defname
 	$(abs_builddir)/test-wired-defname
 
 endif
-
diff --git a/src/settings/tests/Makefile.in b/src/settings/tests/Makefile.in
index 10801a77..1b7450cf 100644
--- a/src/settings/tests/Makefile.in
+++ b/src/settings/tests/Makefile.in
@@ -51,21 +51,23 @@ PRE_UNINSTALL = :
 POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
-noinst_PROGRAMS = test-wired-defname$(EXEEXT)
+@ENABLE_TESTS_TRUE@noinst_PROGRAMS = test-wired-defname$(EXEEXT)
 subdir = src/settings/tests
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/compiler_warnings.m4 \
-	$(top_srcdir)/m4/gettext.m4 $(top_srcdir)/m4/gtk-doc.m4 \
-	$(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/intlmacosx.m4 \
-	$(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/introspection.m4 \
-	$(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \
-	$(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/libnl-check.m4 \
-	$(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \
-	$(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
-	$(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/nls.m4 \
-	$(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/progtest.m4 \
-	$(top_srcdir)/m4/vapigen.m4 $(top_srcdir)/configure.ac
+	$(top_srcdir)/m4/gettext.m4 \
+	$(top_srcdir)/m4/gnome-code-coverage.m4 \
+	$(top_srcdir)/m4/gtk-doc.m4 $(top_srcdir)/m4/iconv.m4 \
+	$(top_srcdir)/m4/intlmacosx.m4 $(top_srcdir)/m4/intltool.m4 \
+	$(top_srcdir)/m4/introspection.m4 $(top_srcdir)/m4/lib-ld.m4 \
+	$(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \
+	$(top_srcdir)/m4/libnl-check.m4 $(top_srcdir)/m4/libtool.m4 \
+	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
+	$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
+	$(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/po.m4 \
+	$(top_srcdir)/m4/progtest.m4 $(top_srcdir)/m4/vapigen.m4 \
+	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(install_sh) -d
@@ -73,14 +75,14 @@ CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
 CONFIG_CLEAN_VPATH_FILES =
 PROGRAMS = $(noinst_PROGRAMS)
-am_test_wired_defname_OBJECTS =  \
-	test_wired_defname-test-wired-defname.$(OBJEXT)
+am__test_wired_defname_SOURCES_DIST = test-wired-defname.c
+@ENABLE_TESTS_TRUE@am_test_wired_defname_OBJECTS = test_wired_defname-test-wired-defname.$(OBJEXT)
 test_wired_defname_OBJECTS = $(am_test_wired_defname_OBJECTS)
 am__DEPENDENCIES_1 =
-test_wired_defname_DEPENDENCIES =  \
-	$(top_builddir)/libnm-util/libnm-util.la \
-	$(top_builddir)/src/settings/libtest-settings-utils.la \
-	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
+@ENABLE_TESTS_TRUE@test_wired_defname_DEPENDENCIES =  \
+@ENABLE_TESTS_TRUE@	$(top_builddir)/libnm-util/libnm-util.la \
+@ENABLE_TESTS_TRUE@	$(top_builddir)/src/settings/libtest-settings-utils.la \
+@ENABLE_TESTS_TRUE@	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
 AM_V_lt = $(am__v_lt_@AM_V@)
 am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
 am__v_lt_0 = --silent
@@ -111,7 +113,7 @@ AM_V_GEN = $(am__v_GEN_@AM_V@)
 am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
 am__v_GEN_0 = @echo "  GEN   " $@;
 SOURCES = $(test_wired_defname_SOURCES)
-DIST_SOURCES = $(test_wired_defname_SOURCES)
+DIST_SOURCES = $(am__test_wired_defname_SOURCES_DIST)
 am__can_run_installinfo = \
   case $$AM_UPDATE_INFO_DIR in \
     n|no|NO) false;; \
@@ -132,6 +134,10 @@ AWK = @AWK@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
+CKDB_PATH = @CKDB_PATH@
+CODE_COVERAGE_CFLAGS = @CODE_COVERAGE_CFLAGS@
+CODE_COVERAGE_ENABLED = @CODE_COVERAGE_ENABLED@
+CODE_COVERAGE_LDFLAGS = @CODE_COVERAGE_LDFLAGS@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CXX = @CXX@
@@ -146,9 +152,7 @@ DBUS_SYS_DIR = @DBUS_SYS_DIR@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
 DHCLIENT_PATH = @DHCLIENT_PATH@
-DHCLIENT_VERSION = @DHCLIENT_VERSION@
 DHCPCD_PATH = @DHCPCD_PATH@
-DISABLE_DEPRECATED = @DISABLE_DEPRECATED@
 DLLTOOL = @DLLTOOL@
 DSYMUTIL = @DSYMUTIL@
 DUMPBIN = @DUMPBIN@
@@ -158,17 +162,14 @@ ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
 FGREP = @FGREP@
+GENHTML = @GENHTML@
 GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
 GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
-GIO_CFLAGS = @GIO_CFLAGS@
-GIO_LIBS = @GIO_LIBS@
 GLIB_CFLAGS = @GLIB_CFLAGS@
 GLIB_GENMARSHAL = @GLIB_GENMARSHAL@
 GLIB_LIBS = @GLIB_LIBS@
 GLIB_MAKEFILE = @GLIB_MAKEFILE@
 GLIB_MKENUMS = @GLIB_MKENUMS@
-GMODULE_CFLAGS = @GMODULE_CFLAGS@
-GMODULE_LIBS = @GMODULE_LIBS@
 GMSGFMT = @GMSGFMT@
 GMSGFMT_015 = @GMSGFMT_015@
 GNUTLS_CFLAGS = @GNUTLS_CFLAGS@
@@ -209,6 +210,7 @@ IPTABLES_PATH = @IPTABLES_PATH@
 IWMX_SDK_CFLAGS = @IWMX_SDK_CFLAGS@
 IWMX_SDK_LIBS = @IWMX_SDK_LIBS@
 KERNEL_FIRMWARE_DIR = @KERNEL_FIRMWARE_DIR@
+LCOV = @LCOV@
 LD = @LD@
 LDFLAGS = @LDFLAGS@
 LIBDL = @LIBDL@
@@ -225,11 +227,7 @@ LIBNL2_LIBS = @LIBNL2_LIBS@
 LIBNL3_CFLAGS = @LIBNL3_CFLAGS@
 LIBNL3_LIBS = @LIBNL3_LIBS@
 LIBNL_CFLAGS = @LIBNL_CFLAGS@
-LIBNL_GENL3_CFLAGS = @LIBNL_GENL3_CFLAGS@
-LIBNL_GENL3_LIBS = @LIBNL_GENL3_LIBS@
 LIBNL_LIBS = @LIBNL_LIBS@
-LIBNL_ROUTE3_CFLAGS = @LIBNL_ROUTE3_CFLAGS@
-LIBNL_ROUTE3_LIBS = @LIBNL_ROUTE3_LIBS@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
 LIBSOUP_CFLAGS = @LIBSOUP_CFLAGS@
@@ -244,6 +242,8 @@ MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MANIFEST_TOOL = @MANIFEST_TOOL@
 MKDIR_P = @MKDIR_P@
+MM_GLIB_CFLAGS = @MM_GLIB_CFLAGS@
+MM_GLIB_LIBS = @MM_GLIB_LIBS@
 MOC = @MOC@
 MSGFMT = @MSGFMT@
 MSGFMT_015 = @MSGFMT_015@
@@ -253,6 +253,7 @@ NMEDIT = @NMEDIT@
 NM_MAJOR_VERSION = @NM_MAJOR_VERSION@
 NM_MICRO_VERSION = @NM_MICRO_VERSION@
 NM_MINOR_VERSION = @NM_MINOR_VERSION@
+NM_MODIFY_SYSTEM_POLICY = @NM_MODIFY_SYSTEM_POLICY@
 NM_VERSION = @NM_VERSION@
 NSS_CFLAGS = @NSS_CFLAGS@
 NSS_LIBS = @NSS_LIBS@
@@ -279,13 +280,14 @@ PPPD_PLUGIN_DIR = @PPPD_PLUGIN_DIR@
 QT_CFLAGS = @QT_CFLAGS@
 QT_LIBS = @QT_LIBS@
 RANLIB = @RANLIB@
-RESOLVCONF_PATH = @RESOLVCONF_PATH@
 SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
-SYSTEMD_CFLAGS = @SYSTEMD_CFLAGS@
-SYSTEMD_LIBS = @SYSTEMD_LIBS@
+SYSTEMD_INHIBIT_CFLAGS = @SYSTEMD_INHIBIT_CFLAGS@
+SYSTEMD_INHIBIT_LIBS = @SYSTEMD_INHIBIT_LIBS@
+SYSTEMD_LOGIN_CFLAGS = @SYSTEMD_LOGIN_CFLAGS@
+SYSTEMD_LOGIN_LIBS = @SYSTEMD_LOGIN_LIBS@
 SYSTEM_CA_PATH = @SYSTEM_CA_PATH@
 UDEV_BASE_DIR = @UDEV_BASE_DIR@
 USE_NLS = @USE_NLS@
@@ -340,6 +342,11 @@ localedir = @localedir@
 localstatedir = @localstatedir@
 mandir = @mandir@
 mkdir_p = @mkdir_p@
+nmbinary = @nmbinary@
+nmconfdir = @nmconfdir@
+nmdatadir = @nmdatadir@
+nmrundir = @nmrundir@
+nmstatedir = @nmstatedir@
 oldincludedir = @oldincludedir@
 pdfdir = @pdfdir@
 prefix = @prefix@
@@ -354,26 +361,30 @@ target_alias = @target_alias@
 top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
-INCLUDES = \
-	-I$(top_srcdir)/include \
-	-I$(top_builddir)/include \
-	-I$(top_srcdir)/libnm-util \
-	-I$(top_srcdir)/src/settings
+with_dhclient = @with_dhclient@
+with_dhcpcd = @with_dhcpcd@
+with_netconfig = @with_netconfig@
+with_resolvconf = @with_resolvconf@
+@ENABLE_TESTS_TRUE@INCLUDES = \
+@ENABLE_TESTS_TRUE@	-I$(top_srcdir)/include \
+@ENABLE_TESTS_TRUE@	-I$(top_builddir)/include \
+@ENABLE_TESTS_TRUE@	-I$(top_srcdir)/libnm-util \
+@ENABLE_TESTS_TRUE@	-I$(top_srcdir)/src/settings
 
 
 ####### wired defname test #######
-test_wired_defname_SOURCES = \
-	test-wired-defname.c
+@ENABLE_TESTS_TRUE@test_wired_defname_SOURCES = \
+@ENABLE_TESTS_TRUE@	test-wired-defname.c
 
-test_wired_defname_CPPFLAGS = \
-	$(GLIB_CFLAGS) \
-	$(DBUS_CFLAGS)
+@ENABLE_TESTS_TRUE@test_wired_defname_CPPFLAGS = \
+@ENABLE_TESTS_TRUE@	$(GLIB_CFLAGS) \
+@ENABLE_TESTS_TRUE@	$(DBUS_CFLAGS)
 
-test_wired_defname_LDADD = \
-	$(top_builddir)/libnm-util/libnm-util.la \
-	$(top_builddir)/src/settings/libtest-settings-utils.la \
-	$(GLIB_LIBS) \
-	$(DBUS_LIBS)
+@ENABLE_TESTS_TRUE@test_wired_defname_LDADD = \
+@ENABLE_TESTS_TRUE@	$(top_builddir)/libnm-util/libnm-util.la \
+@ENABLE_TESTS_TRUE@	$(top_builddir)/src/settings/libtest-settings-utils.la \
+@ENABLE_TESTS_TRUE@	$(GLIB_LIBS) \
+@ENABLE_TESTS_TRUE@	$(DBUS_LIBS)
 
 all: all-am
 
@@ -431,25 +442,22 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_wired_defname-test-wired-defname.Po@am__quote@
 
 .c.o:
-@am__fastdepCC_TRUE@	$(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\
-@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
-@am__fastdepCC_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.Po
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $<
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c $<
 
 .c.obj:
-@am__fastdepCC_TRUE@	$(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.obj$$||'`;\
-@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ `$(CYGPATH_W) '$<'` &&\
-@am__fastdepCC_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.Po
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c `$(CYGPATH_W) '$<'`
 
 .c.lo:
-@am__fastdepCC_TRUE@	$(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.lo$$||'`;\
-@am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
-@am__fastdepCC_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.Plo
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $<
@@ -556,7 +564,7 @@ distdir: $(DISTFILES)
 	    || exit 1; \
 	  fi; \
 	done
-@WITH_TESTS_FALSE@check-local:
+@ENABLE_TESTS_FALSE@check-local:
 check-am: all-am
 	$(MAKE) $(AM_MAKEFLAGS) check-local
 check: check-am
@@ -682,8 +690,8 @@ uninstall-am:
 
 ###########################################
 
-@WITH_TESTS_TRUE@check-local: test-wired-defname
-@WITH_TESTS_TRUE@	$(abs_builddir)/test-wired-defname
+@ENABLE_TESTS_TRUE@check-local: test-wired-defname
+@ENABLE_TESTS_TRUE@	$(abs_builddir)/test-wired-defname
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
diff --git a/src/supplicant-manager/Makefile.am b/src/supplicant-manager/Makefile.am
index 1c24d0ef..74ec9c38 100644
--- a/src/supplicant-manager/Makefile.am
+++ b/src/supplicant-manager/Makefile.am
@@ -1,4 +1,4 @@
-SUBDIRS=. tests
+SUBDIRS = . tests
 
 INCLUDES = \
 	-I${top_srcdir}/src \
diff --git a/src/supplicant-manager/Makefile.in b/src/supplicant-manager/Makefile.in
index c5892b1b..ae6768f8 100644
--- a/src/supplicant-manager/Makefile.in
+++ b/src/supplicant-manager/Makefile.in
@@ -55,16 +55,18 @@ subdir = src/supplicant-manager
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/compiler_warnings.m4 \
-	$(top_srcdir)/m4/gettext.m4 $(top_srcdir)/m4/gtk-doc.m4 \
-	$(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/intlmacosx.m4 \
-	$(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/introspection.m4 \
-	$(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \
-	$(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/libnl-check.m4 \
-	$(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \
-	$(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
-	$(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/nls.m4 \
-	$(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/progtest.m4 \
-	$(top_srcdir)/m4/vapigen.m4 $(top_srcdir)/configure.ac
+	$(top_srcdir)/m4/gettext.m4 \
+	$(top_srcdir)/m4/gnome-code-coverage.m4 \
+	$(top_srcdir)/m4/gtk-doc.m4 $(top_srcdir)/m4/iconv.m4 \
+	$(top_srcdir)/m4/intlmacosx.m4 $(top_srcdir)/m4/intltool.m4 \
+	$(top_srcdir)/m4/introspection.m4 $(top_srcdir)/m4/lib-ld.m4 \
+	$(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \
+	$(top_srcdir)/m4/libnl-check.m4 $(top_srcdir)/m4/libtool.m4 \
+	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
+	$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
+	$(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/po.m4 \
+	$(top_srcdir)/m4/progtest.m4 $(top_srcdir)/m4/vapigen.m4 \
+	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(install_sh) -d
@@ -172,6 +174,10 @@ AWK = @AWK@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
+CKDB_PATH = @CKDB_PATH@
+CODE_COVERAGE_CFLAGS = @CODE_COVERAGE_CFLAGS@
+CODE_COVERAGE_ENABLED = @CODE_COVERAGE_ENABLED@
+CODE_COVERAGE_LDFLAGS = @CODE_COVERAGE_LDFLAGS@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CXX = @CXX@
@@ -186,9 +192,7 @@ DBUS_SYS_DIR = @DBUS_SYS_DIR@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
 DHCLIENT_PATH = @DHCLIENT_PATH@
-DHCLIENT_VERSION = @DHCLIENT_VERSION@
 DHCPCD_PATH = @DHCPCD_PATH@
-DISABLE_DEPRECATED = @DISABLE_DEPRECATED@
 DLLTOOL = @DLLTOOL@
 DSYMUTIL = @DSYMUTIL@
 DUMPBIN = @DUMPBIN@
@@ -198,17 +202,14 @@ ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
 FGREP = @FGREP@
+GENHTML = @GENHTML@
 GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
 GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
-GIO_CFLAGS = @GIO_CFLAGS@
-GIO_LIBS = @GIO_LIBS@
 GLIB_CFLAGS = @GLIB_CFLAGS@
 GLIB_GENMARSHAL = @GLIB_GENMARSHAL@
 GLIB_LIBS = @GLIB_LIBS@
 GLIB_MAKEFILE = @GLIB_MAKEFILE@
 GLIB_MKENUMS = @GLIB_MKENUMS@
-GMODULE_CFLAGS = @GMODULE_CFLAGS@
-GMODULE_LIBS = @GMODULE_LIBS@
 GMSGFMT = @GMSGFMT@
 GMSGFMT_015 = @GMSGFMT_015@
 GNUTLS_CFLAGS = @GNUTLS_CFLAGS@
@@ -249,6 +250,7 @@ IPTABLES_PATH = @IPTABLES_PATH@
 IWMX_SDK_CFLAGS = @IWMX_SDK_CFLAGS@
 IWMX_SDK_LIBS = @IWMX_SDK_LIBS@
 KERNEL_FIRMWARE_DIR = @KERNEL_FIRMWARE_DIR@
+LCOV = @LCOV@
 LD = @LD@
 LDFLAGS = @LDFLAGS@
 LIBDL = @LIBDL@
@@ -265,11 +267,7 @@ LIBNL2_LIBS = @LIBNL2_LIBS@
 LIBNL3_CFLAGS = @LIBNL3_CFLAGS@
 LIBNL3_LIBS = @LIBNL3_LIBS@
 LIBNL_CFLAGS = @LIBNL_CFLAGS@
-LIBNL_GENL3_CFLAGS = @LIBNL_GENL3_CFLAGS@
-LIBNL_GENL3_LIBS = @LIBNL_GENL3_LIBS@
 LIBNL_LIBS = @LIBNL_LIBS@
-LIBNL_ROUTE3_CFLAGS = @LIBNL_ROUTE3_CFLAGS@
-LIBNL_ROUTE3_LIBS = @LIBNL_ROUTE3_LIBS@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
 LIBSOUP_CFLAGS = @LIBSOUP_CFLAGS@
@@ -284,6 +282,8 @@ MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MANIFEST_TOOL = @MANIFEST_TOOL@
 MKDIR_P = @MKDIR_P@
+MM_GLIB_CFLAGS = @MM_GLIB_CFLAGS@
+MM_GLIB_LIBS = @MM_GLIB_LIBS@
 MOC = @MOC@
 MSGFMT = @MSGFMT@
 MSGFMT_015 = @MSGFMT_015@
@@ -293,6 +293,7 @@ NMEDIT = @NMEDIT@
 NM_MAJOR_VERSION = @NM_MAJOR_VERSION@
 NM_MICRO_VERSION = @NM_MICRO_VERSION@
 NM_MINOR_VERSION = @NM_MINOR_VERSION@
+NM_MODIFY_SYSTEM_POLICY = @NM_MODIFY_SYSTEM_POLICY@
 NM_VERSION = @NM_VERSION@
 NSS_CFLAGS = @NSS_CFLAGS@
 NSS_LIBS = @NSS_LIBS@
@@ -319,13 +320,14 @@ PPPD_PLUGIN_DIR = @PPPD_PLUGIN_DIR@
 QT_CFLAGS = @QT_CFLAGS@
 QT_LIBS = @QT_LIBS@
 RANLIB = @RANLIB@
-RESOLVCONF_PATH = @RESOLVCONF_PATH@
 SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
-SYSTEMD_CFLAGS = @SYSTEMD_CFLAGS@
-SYSTEMD_LIBS = @SYSTEMD_LIBS@
+SYSTEMD_INHIBIT_CFLAGS = @SYSTEMD_INHIBIT_CFLAGS@
+SYSTEMD_INHIBIT_LIBS = @SYSTEMD_INHIBIT_LIBS@
+SYSTEMD_LOGIN_CFLAGS = @SYSTEMD_LOGIN_CFLAGS@
+SYSTEMD_LOGIN_LIBS = @SYSTEMD_LOGIN_LIBS@
 SYSTEM_CA_PATH = @SYSTEM_CA_PATH@
 UDEV_BASE_DIR = @UDEV_BASE_DIR@
 USE_NLS = @USE_NLS@
@@ -380,6 +382,11 @@ localedir = @localedir@
 localstatedir = @localstatedir@
 mandir = @mandir@
 mkdir_p = @mkdir_p@
+nmbinary = @nmbinary@
+nmconfdir = @nmconfdir@
+nmdatadir = @nmdatadir@
+nmrundir = @nmrundir@
+nmstatedir = @nmstatedir@
 oldincludedir = @oldincludedir@
 pdfdir = @pdfdir@
 prefix = @prefix@
@@ -394,6 +401,10 @@ target_alias = @target_alias@
 top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
+with_dhclient = @with_dhclient@
+with_dhcpcd = @with_dhcpcd@
+with_netconfig = @with_netconfig@
+with_resolvconf = @with_resolvconf@
 SUBDIRS = . tests
 INCLUDES = \
 	-I${top_srcdir}/src \
@@ -486,25 +497,22 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libsupplicant_manager_la-nm-supplicant-settings-verify.Plo@am__quote@
 
 .c.o:
-@am__fastdepCC_TRUE@	$(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\
-@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
-@am__fastdepCC_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.Po
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $<
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c $<
 
 .c.obj:
-@am__fastdepCC_TRUE@	$(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.obj$$||'`;\
-@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ `$(CYGPATH_W) '$<'` &&\
-@am__fastdepCC_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.Po
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c `$(CYGPATH_W) '$<'`
 
 .c.lo:
-@am__fastdepCC_TRUE@	$(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.lo$$||'`;\
-@am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
-@am__fastdepCC_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.Plo
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $<
diff --git a/src/supplicant-manager/nm-supplicant-config.c b/src/supplicant-manager/nm-supplicant-config.c
index a8e4ab9d..21b52582 100644
--- a/src/supplicant-manager/nm-supplicant-config.c
+++ b/src/supplicant-manager/nm-supplicant-config.c
@@ -363,11 +363,11 @@ gboolean
 nm_supplicant_config_add_setting_wireless (NMSupplicantConfig * self,
                                            NMSettingWireless * setting,
                                            gboolean is_broadcast,
-                                           guint32 adhoc_freq,
+                                           guint32 fixed_freq,
                                            gboolean has_scan_capa_ssid)
 {
 	NMSupplicantConfigPrivate *priv;
-	gboolean is_adhoc;
+	gboolean is_adhoc, is_ap;
 	const char *mode;
 	const GByteArray *id;
 
@@ -378,7 +378,8 @@ nm_supplicant_config_add_setting_wireless (NMSupplicantConfig * self,
 
 	mode = nm_setting_wireless_get_mode (setting);
 	is_adhoc = (mode && !strcmp (mode, "adhoc")) ? TRUE : FALSE;
-	if (is_adhoc)
+	is_ap = (mode && !strcmp (mode, "ap")) ? TRUE : FALSE;
+	if (is_adhoc || is_ap)
 		priv->ap_scan = 2;
 	else if (is_broadcast == FALSE) {
 		/* drivers that support scanning specific SSIDs should use
@@ -395,27 +396,34 @@ nm_supplicant_config_add_setting_wireless (NMSupplicantConfig * self,
 
 	if (is_adhoc) {
 		if (!nm_supplicant_config_add_option (self, "mode", "1", -1, FALSE)) {
-			nm_log_warn (LOGD_SUPPLICANT, "Error adding mode to supplicant config.");
+			nm_log_warn (LOGD_SUPPLICANT, "Error adding mode=1 (adhoc) to supplicant config.");
 			return FALSE;
 		}
+	}
+
+	if (is_ap) {
+		if (!nm_supplicant_config_add_option (self, "mode", "2", -1, FALSE)) {
+			nm_log_warn (LOGD_SUPPLICANT, "Error adding mode=2 (ap) to supplicant config.");
+			return FALSE;
+		}
+	}
 
-		if (adhoc_freq) {
-			char *str_freq;
+	if ((is_adhoc || is_ap) && fixed_freq) {
+		char *str_freq;
 
-			str_freq = g_strdup_printf ("%u", adhoc_freq);
-			if (!nm_supplicant_config_add_option (self, "frequency", str_freq, -1, FALSE)) {
-				g_free (str_freq);
-				nm_log_warn (LOGD_SUPPLICANT, "Error adding Ad-Hoc frequency to supplicant config.");
-				return FALSE;
-			}
+		str_freq = g_strdup_printf ("%u", fixed_freq);
+		if (!nm_supplicant_config_add_option (self, "frequency", str_freq, -1, FALSE)) {
 			g_free (str_freq);
+			nm_log_warn (LOGD_SUPPLICANT, "Error adding Ad-Hoc/AP frequency to supplicant config.");
+			return FALSE;
 		}
+		g_free (str_freq);
 	}
 
-	/* Except for Ad-Hoc networks, request that the driver probe for the
+	/* Except for Ad-Hoc and Hotspot, request that the driver probe for the
 	 * specific SSID we want to associate with.
 	 */
-	if (!is_adhoc) {
+	if (!(is_adhoc || is_ap)) {
 		if (!nm_supplicant_config_add_option (self, "scan_ssid", "1", -1, FALSE))
 			return FALSE;
 	}
@@ -712,6 +720,13 @@ nm_supplicant_config_add_setting_wireless_security (NMSupplicantConfig *self,
 			 */
 			if (!nm_supplicant_config_add_option (self, "bgscan", "simple:30:-45:300", -1, FALSE))
 				nm_log_warn (LOGD_SUPPLICANT, "Error enabling background scanning for ESS roaming");
+
+			/* When using WPA-Enterprise, we want to use Proactive Key Caching (also
+			 * called Opportunistic Key Caching) to avoid full EAP exchanges when
+			 * roaming between access points in the same mobility group.
+			 */
+			if (!nm_supplicant_config_add_option (self, "proactive_key_caching", "1", -1, FALSE))
+				return FALSE;
 		}
 	}
 
@@ -730,7 +745,7 @@ nm_supplicant_config_add_setting_8021x (NMSupplicantConfig *self,
 	gboolean success, added;
 	GString *phase1, *phase2;
 	const GByteArray *array;
-	gboolean peap = FALSE, fast = FALSE;
+	gboolean fast = FALSE;
 	guint32 i, num_eap;
 	gboolean fast_provisoning_allowed = FALSE;
 
@@ -778,25 +793,12 @@ nm_supplicant_config_add_setting_8021x (NMSupplicantConfig *self,
 	for (i = 0; i < num_eap; i++) {
 		const char *method = nm_setting_802_1x_get_eap_method (setting, i);
 
-		if (method && (strcasecmp (method, "peap") == 0))
-			peap = TRUE;
 		if (method && (strcasecmp (method, "fast") == 0)) {
 			fast = TRUE;
 			priv->fast_required = TRUE;
 		}
 	}
 
-	/* When using PEAP-GTC, we're likely using Cisco kit, so we want to turn
-	 * on PMKSA caching so that roaming between access points actually works
-	 * without a full reauth (which requires a new token code).  We may want
-	 * to extend this to all PEAP phase2 methods at some point.
-	 */
-	value = nm_setting_802_1x_get_phase2_auth (setting);
-	if (peap && value && (strcasecmp (value, "gtc") == 0)) {
-		if (!nm_supplicant_config_add_option (self, "proactive_key_caching", "1", -1, FALSE))
-			return FALSE;
-	}
-
 	/* Drop the fragment size a bit for better compatibility */
 	if (!nm_supplicant_config_add_option (self, "fragment_size", "1300", -1, FALSE))
 		return FALSE;
diff --git a/src/supplicant-manager/nm-supplicant-interface.c b/src/supplicant-manager/nm-supplicant-interface.c
index dc35d5af..75450a0a 100644
--- a/src/supplicant-manager/nm-supplicant-interface.c
+++ b/src/supplicant-manager/nm-supplicant-interface.c
@@ -86,12 +86,14 @@ typedef struct {
 	char *                dev;
 	gboolean              is_wireless;
 	gboolean              has_credreq;  /* Whether querying 802.1x credentials is supported */
+	ApSupport             ap_support;   /* Lightweight AP mode support */
 	gboolean              fast_supported;
 	guint32               max_scan_ssids;
 	guint32               ready_count;
 
 	char *                object_path;
 	guint32               state;
+	int                   disconnect_reason;
 	NMCallStore *         assoc_pcalls;
 	NMCallStore *         other_pcalls;
 
@@ -468,7 +470,14 @@ set_state (NMSupplicantInterface *self, guint32 new_state)
 	    || old_state == NM_SUPPLICANT_INTERFACE_STATE_SCANNING)
 		priv->last_scan = time (NULL);
 
-	g_signal_emit (self, signals[STATE], 0, priv->state, old_state);
+	/* Disconnect reason is no longer relevant when not in the DISCONNECTED state */
+	if (priv->state != NM_SUPPLICANT_INTERFACE_STATE_DISCONNECTED)
+		priv->disconnect_reason = 0;
+
+	g_signal_emit (self, signals[STATE], 0,
+	               priv->state,
+	               old_state,
+	               priv->disconnect_reason);
 }
 
 static void
@@ -607,6 +616,21 @@ wpas_iface_properties_changed (DBusGProxy *proxy,
 	value = g_hash_table_lookup (props, "Capabilities");
 	if (value && G_VALUE_HOLDS (value, DBUS_TYPE_G_MAP_OF_VARIANT))
 		parse_capabilities (self, g_value_get_boxed (value));
+
+	/* Disconnect reason is currently only given for deauthentication events,
+	 * not disassociation; currently they are IEEE 802.11 "reason codes",
+	 * defined by (IEEE 802.11-2007, 7.3.1.7, Table 7-22).  Any locally caused
+	 * deauthentication will be negative, while authentications caused by the
+	 * AP will be positive.
+	 */
+	value = g_hash_table_lookup (props, "DisconnectReason");
+	if (value && G_VALUE_HOLDS (value, G_TYPE_INT)) {
+		priv->disconnect_reason = g_value_get_int (value);
+		if (priv->disconnect_reason != 0) {
+			nm_log_warn (LOGD_SUPPLICANT, "Connection disconnected (reason %d)",
+			             priv->disconnect_reason);
+		}
+	}
 }
 
 static void
@@ -734,6 +758,7 @@ wpas_iface_check_network_reply (NMSupplicantInterface *self)
 	NMSupplicantInfo *info;
 	DBusGProxyCall *call;
 
+	priv->ready_count++;
 	info = nm_supplicant_info_new (self, priv->props_proxy, priv->other_pcalls);
 	call = dbus_g_proxy_begin_call (priv->iface_proxy, "NetworkReply",
 	                                iface_check_netreply_cb,
@@ -746,6 +771,76 @@ wpas_iface_check_network_reply (NMSupplicantInterface *self)
 	nm_supplicant_info_set_call (info, call);
 }
 
+ApSupport
+nm_supplicant_interface_get_ap_support (NMSupplicantInterface *self)
+{
+	return NM_SUPPLICANT_INTERFACE_GET_PRIVATE (self)->ap_support;
+}
+
+void
+nm_supplicant_interface_set_ap_support (NMSupplicantInterface *self,
+                                        ApSupport ap_support)
+{
+	NMSupplicantInterfacePrivate *priv = NM_SUPPLICANT_INTERFACE_GET_PRIVATE (self);
+
+	/* Use the best indicator of support between the supplicant global
+	 * Capabilities property and the interface's introspection data.
+	 */
+	if (ap_support > priv->ap_support)
+		priv->ap_support = ap_support;
+}
+
+static void
+iface_check_ap_mode_cb (DBusGProxy *proxy, DBusGProxyCall *call_id, gpointer user_data)
+{
+	NMSupplicantInfo *info = (NMSupplicantInfo *) user_data;
+	NMSupplicantInterfacePrivate *priv = NM_SUPPLICANT_INTERFACE_GET_PRIVATE (info->interface);
+	char *data;
+
+	/* The ProbeRequest method only exists if AP mode has been enabled */
+	if (dbus_g_proxy_end_call (proxy, call_id, NULL,
+	                           G_TYPE_STRING,
+	                           &data,
+	                           G_TYPE_INVALID)) {
+		if (data && strstr (data, "ProbeRequest"))
+			priv->ap_support = AP_SUPPORT_YES;
+		g_free (data);
+	}
+
+	iface_check_ready (info->interface);
+}
+
+static void
+wpas_iface_check_ap_mode (NMSupplicantInterface *self)
+{
+	NMSupplicantInterfacePrivate *priv = NM_SUPPLICANT_INTERFACE_GET_PRIVATE (self);
+	NMSupplicantInfo *info;
+	DBusGProxyCall *call;
+	DBusGProxy *proxy;
+
+	priv->ready_count++;
+
+	proxy = dbus_g_proxy_new_for_name (nm_dbus_manager_get_connection (priv->dbus_mgr),
+	                                   WPAS_DBUS_SERVICE,
+	                                   priv->object_path,
+	                                   DBUS_INTERFACE_INTROSPECTABLE);
+
+	info = nm_supplicant_info_new (self, proxy, priv->other_pcalls);
+	g_object_unref (proxy);
+
+	/* If the global supplicant capabilities property is not present, we can
+	 * fall back to checking whether the ProbeRequest method is supported.  If
+	 * neither of these works we have no way of determining if AP mode is
+	 * supported or not.  hostap 1.0 and earlier don't support either of these.
+	 */
+	call = dbus_g_proxy_begin_call (proxy, "Introspect",
+	                                iface_check_ap_mode_cb,
+	                                info,
+	                                nm_supplicant_info_destroy,
+	                                G_TYPE_INVALID);
+	nm_supplicant_info_set_call (info, call);
+}
+
 static void
 interface_add_done (NMSupplicantInterface *self, char *path)
 {
@@ -818,9 +913,13 @@ interface_add_done (NMSupplicantInterface *self, char *path)
 	                                               path,
 	                                               DBUS_INTERFACE_PROPERTIES);
 	/* Get initial properties and check whether NetworkReply is supported */
+	priv->ready_count = 1;
 	wpas_iface_get_props (self);
+
+	/* These two increment ready_count themselves */
 	wpas_iface_check_network_reply (self);
-	priv->ready_count = 2;
+	if (priv->ap_support == AP_SUPPORT_UNKNOWN)
+		wpas_iface_check_ap_mode (self);
 }
 
 static void
@@ -1383,6 +1482,7 @@ nm_supplicant_interface_new (NMSupplicantManager *smgr,
                              const char *ifname,
                              gboolean is_wireless,
                              gboolean fast_supported,
+                             ApSupport ap_support,
                              gboolean start_now)
 {
 	NMSupplicantInterface *self;
@@ -1406,6 +1506,7 @@ nm_supplicant_interface_new (NMSupplicantManager *smgr,
 		priv->dev = g_strdup (ifname);
 		priv->is_wireless = is_wireless;
 		priv->fast_supported = fast_supported;
+		priv->ap_support = ap_support;
 
 		if (start_now)
 			interface_add (self, priv->is_wireless);
@@ -1540,8 +1641,8 @@ nm_supplicant_interface_class_init (NMSupplicantInterfaceClass *klass)
 		              G_SIGNAL_RUN_LAST,
 		              G_STRUCT_OFFSET (NMSupplicantInterfaceClass, state),
 		              NULL, NULL,
-		              _nm_marshal_VOID__UINT_UINT,
-		              G_TYPE_NONE, 2, G_TYPE_UINT, G_TYPE_UINT);
+		              _nm_marshal_VOID__UINT_UINT_INT,
+		              G_TYPE_NONE, 3, G_TYPE_UINT, G_TYPE_UINT, G_TYPE_INT);
 
 	signals[REMOVED] =
 		g_signal_new (NM_SUPPLICANT_INTERFACE_REMOVED,
diff --git a/src/supplicant-manager/nm-supplicant-interface.h b/src/supplicant-manager/nm-supplicant-interface.h
index b99c0f26..2f0233cf 100644
--- a/src/supplicant-manager/nm-supplicant-interface.h
+++ b/src/supplicant-manager/nm-supplicant-interface.h
@@ -64,6 +64,12 @@ enum {
 #define NM_SUPPLICANT_INTERFACE_CONNECTION_ERROR "connection-error"
 #define NM_SUPPLICANT_INTERFACE_CREDENTIALS_REQUEST "credentials-request"
 
+typedef enum {
+	AP_SUPPORT_UNKNOWN = 0,  /* Can't detect whether supported or not */
+	AP_SUPPORT_NO = 1,       /* AP mode definitely not supported */
+	AP_SUPPORT_YES = 2,      /* AP mode definitely supported */
+} ApSupport;
+
 struct _NMSupplicantInterface {
 	GObject parent;
 };
@@ -76,7 +82,8 @@ typedef struct {
 	/* change in the interface's state */
 	void (*state)            (NMSupplicantInterface * iface,
 	                          guint32 new_state,
-	                          guint32 old_state);
+	                          guint32 old_state,
+	                          int disconnect_reason);
 
 	/* interface was removed by the supplicant */
 	void (*removed)          (NMSupplicantInterface * iface);
@@ -117,6 +124,7 @@ NMSupplicantInterface * nm_supplicant_interface_new (NMSupplicantManager * smgr,
                                                      const char *ifname,
                                                      gboolean is_wireless,
                                                      gboolean fast_supported,
+                                                     ApSupport ap_support,
                                                      gboolean start_now);
 
 gboolean nm_supplicant_interface_set_config (NMSupplicantInterface * iface,
@@ -149,4 +157,9 @@ gboolean nm_supplicant_interface_credentials_reply (NMSupplicantInterface *self,
                                                     const char *value,
                                                     GError **error);
 
+ApSupport nm_supplicant_interface_get_ap_support (NMSupplicantInterface *self);
+
+void nm_supplicant_interface_set_ap_support (NMSupplicantInterface *self,
+                                             ApSupport apmode);
+
 #endif	/* NM_SUPPLICANT_INTERFACE_H */
diff --git a/src/supplicant-manager/nm-supplicant-manager.c b/src/supplicant-manager/nm-supplicant-manager.c
index ae150865..430a3852 100644
--- a/src/supplicant-manager/nm-supplicant-manager.c
+++ b/src/supplicant-manager/nm-supplicant-manager.c
@@ -27,6 +27,7 @@
 #include "nm-supplicant-interface.h"
 #include "nm-dbus-manager.h"
 #include "nm-logging.h"
+#include "nm-dbus-glib-types.h"
 
 #define NM_SUPPLICANT_MANAGER_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), \
                                               NM_TYPE_SUPPLICANT_MANAGER, \
@@ -49,6 +50,7 @@ typedef struct {
 	gboolean        running;
 	GHashTable *    ifaces;
 	gboolean        fast_supported;
+	ApSupport       ap_support;
 	guint           die_count_reset_id;
 	guint           die_count;
 	gboolean        disposed;
@@ -86,7 +88,12 @@ nm_supplicant_manager_iface_get (NMSupplicantManager * self,
 		start_now = !die_count_exceeded (priv->die_count);
 
 		nm_log_dbg (LOGD_SUPPLICANT, "(%s): creating new supplicant interface", ifname);
-		iface = nm_supplicant_interface_new (self, ifname, is_wireless, priv->fast_supported, start_now);
+		iface = nm_supplicant_interface_new (self,
+		                                     ifname,
+		                                     is_wireless,
+		                                     priv->fast_supported,
+		                                     priv->ap_support,
+		                                     start_now);
 		if (iface)
 			g_hash_table_insert (priv->ifaces, g_strdup (ifname), iface);
 	} else {
@@ -125,52 +132,78 @@ nm_supplicant_manager_iface_release (NMSupplicantManager *self,
 }
 
 static void
-get_eap_methods_reply (DBusGProxy *proxy,
-                       DBusGProxyCall *call,
-                       gpointer user_data)
+get_capabilities_cb  (DBusGProxy *proxy, DBusGProxyCall *call_id, gpointer user_data)
 {
 	NMSupplicantManager *self = NM_SUPPLICANT_MANAGER (user_data);
 	NMSupplicantManagerPrivate *priv = NM_SUPPLICANT_MANAGER_GET_PRIVATE (self);
+	NMSupplicantInterface *iface;
+	GHashTableIter hash_iter;
 	GError *error = NULL;
-	GValue value = { 0 };
-	const char **iter;
-
-	if (dbus_g_proxy_end_call (proxy, call, &error,
-	                           G_TYPE_VALUE, &value,
-	                           G_TYPE_INVALID)) {
-		if (G_VALUE_HOLDS (&value, G_TYPE_STRV)) {
-			iter = g_value_get_boxed (&value);
-			while (iter && *iter) {
-				if (strcasecmp (*iter++, "FAST") == 0) {
-					priv->fast_supported = TRUE;
-					break;
-				}
-			}
-		} else {
-			nm_log_warn (LOGD_SUPPLICANT, "Unexpected EapMethods property type %s",
-			             G_VALUE_TYPE_NAME (&value));
-		}
-		g_value_unset (&value);
-	} else {
-		nm_log_warn (LOGD_SUPPLICANT, "Unexpected error requesting EapMethods: (%d) %s",
+	GHashTable *props = NULL;
+	GValue *value;
+	char **iter;
+
+	if (!dbus_g_proxy_end_call (proxy, call_id, &error,
+	                            DBUS_TYPE_G_MAP_OF_VARIANT, &props,
+	                            G_TYPE_INVALID)) {
+		nm_log_warn (LOGD_CORE, "Unexpected error requesting supplicant properties: (%d) %s",
 		             error ? error->code : -1,
 		             error && error->message ? error->message : "(unknown)");
 		g_clear_error (&error);
+		return;
+	}
+
+	/* The supplicant only advertises global capabilities if the following
+	 * commit has been applied:
+	 *
+	 * commit 1634ac0654eba8d458640a115efc0a6cde3bac4d
+	 * Author: Dan Williams 
+	 * Date:   Sat Sep 29 19:06:30 2012 +0300
+	 *
+	 * dbus: Add global capabilities property
+	 */
+	priv->ap_support = AP_SUPPORT_UNKNOWN;
+	value = g_hash_table_lookup (props, "Capabilities");
+	if (value && G_VALUE_HOLDS (value, G_TYPE_STRV)) {
+		priv->ap_support = AP_SUPPORT_NO;
+		for (iter = g_value_get_boxed (value); iter && *iter; iter++) {
+			if (strcasecmp (*iter, "ap"))
+				priv->ap_support = AP_SUPPORT_YES;
+		}
 	}
 
-	nm_log_dbg (LOGD_SUPPLICANT, "EAP-FAST is %ssupported",
-	            priv->fast_supported ? "" : "not ");
+	/* Tell all interfaces about results of the AP check */
+	g_hash_table_iter_init (&hash_iter, priv->ifaces);
+	while (g_hash_table_iter_next (&hash_iter, NULL, (gpointer) &iface))
+		nm_supplicant_interface_set_ap_support (iface, priv->ap_support);
+
+	nm_log_dbg (LOGD_SUPPLICANT, "AP mode is %ssupported",
+	            (priv->ap_support == AP_SUPPORT_YES) ? "" :
+	                (priv->ap_support == AP_SUPPORT_NO) ? "not " : " possibly");
+
+	/* EAP-FAST */
+	priv->fast_supported = FALSE;
+	value = g_hash_table_lookup (props, "EapMethods");
+	if (value && G_VALUE_HOLDS (value, G_TYPE_STRV)) {
+		for (iter = g_value_get_boxed (value); iter && *iter; iter++) {
+			if (strcasecmp (*iter, "fast"))
+				priv->fast_supported = TRUE;
+		}
+	}
+
+	nm_log_dbg (LOGD_SUPPLICANT, "EAP-FAST is %ssupported", priv->fast_supported ? "" : "not ");
+
+	g_hash_table_unref (props);
 }
 
 static void
-check_supported_eap_methods (NMSupplicantManager *self)
+check_capabilities (NMSupplicantManager *self)
 {
 	NMSupplicantManagerPrivate *priv = NM_SUPPLICANT_MANAGER_GET_PRIVATE (self);
 
-	dbus_g_proxy_begin_call (priv->props_proxy, "Get",
-	                         get_eap_methods_reply, self, NULL,
+	dbus_g_proxy_begin_call (priv->props_proxy, "GetAll",
+	                         get_capabilities_cb, self, NULL,
 	                         G_TYPE_STRING, WPAS_DBUS_INTERFACE,
-	                         G_TYPE_STRING, "EapMethods",
 	                         G_TYPE_INVALID);
 }
 
@@ -239,7 +272,7 @@ name_owner_changed (NMDBusManager *dbus_mgr,
 	if (!old_owner_good && new_owner_good) {
 		nm_log_info (LOGD_SUPPLICANT, "wpa_supplicant started");
 		set_running (self, TRUE);
-		check_supported_eap_methods (self);
+		check_capabilities (self);
 	} else if (old_owner_good && !new_owner_good) {
 		nm_log_info (LOGD_SUPPLICANT, "wpa_supplicant stopped");
 
@@ -307,9 +340,9 @@ nm_supplicant_manager_init (NMSupplicantManager *self)
 
 	priv->ifaces = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, g_object_unref);
 
-	/* Grab list of supported EAP methods */
+	/* Check generic supplicant capabilities */
 	if (priv->running)
-		check_supported_eap_methods (self);
+		check_capabilities (self);
 }
 
 static void
diff --git a/src/supplicant-manager/nm-supplicant-settings-verify.c b/src/supplicant-manager/nm-supplicant-settings-verify.c
index 76de84d8..143e51a3 100644
--- a/src/supplicant-manager/nm-supplicant-settings-verify.c
+++ b/src/supplicant-manager/nm-supplicant-settings-verify.c
@@ -91,7 +91,7 @@ static const struct Opt opt_table[] = {
 	{ "ssid",               TYPE_BYTES,   0, 32,FALSE,  NULL },
 	{ "bssid",              TYPE_KEYWORD, 0, 0, FALSE,  NULL },
 	{ "scan_ssid",          TYPE_INT,     0, 1, FALSE,  NULL },
-	{ "mode",               TYPE_INT,     0, 1, FALSE,  NULL },
+	{ "mode",               TYPE_INT,     0, 2, FALSE,  NULL },
 	{ "frequency",          TYPE_INT,     2412, 5825, FALSE,  NULL },
 	{ "auth_alg",           TYPE_KEYWORD, 0, 0, FALSE,  auth_alg_allowed },
 	{ "psk",                TYPE_BYTES,   0, 0, FALSE,  NULL },
diff --git a/src/supplicant-manager/tests/Makefile.am b/src/supplicant-manager/tests/Makefile.am
index 47ae66c5..20ba9cc5 100644
--- a/src/supplicant-manager/tests/Makefile.am
+++ b/src/supplicant-manager/tests/Makefile.am
@@ -1,3 +1,5 @@
+if ENABLE_TESTS
+
 INCLUDES = \
 	-I$(top_srcdir)/include \
 	-I$(top_builddir)/include \
@@ -20,10 +22,7 @@ test_supplicant_config_LDADD = \
 	$(top_builddir)/src/supplicant-manager/libsupplicant-manager.la \
 	$(DBUS_LIBS)
 
-if WITH_TESTS
-
 check-local: test-supplicant-config
 	$(abs_builddir)/test-supplicant-config
 
 endif
-
diff --git a/src/supplicant-manager/tests/Makefile.in b/src/supplicant-manager/tests/Makefile.in
index eb4d001c..cf4be05d 100644
--- a/src/supplicant-manager/tests/Makefile.in
+++ b/src/supplicant-manager/tests/Makefile.in
@@ -51,21 +51,23 @@ PRE_UNINSTALL = :
 POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
-noinst_PROGRAMS = test-supplicant-config$(EXEEXT)
+@ENABLE_TESTS_TRUE@noinst_PROGRAMS = test-supplicant-config$(EXEEXT)
 subdir = src/supplicant-manager/tests
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/compiler_warnings.m4 \
-	$(top_srcdir)/m4/gettext.m4 $(top_srcdir)/m4/gtk-doc.m4 \
-	$(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/intlmacosx.m4 \
-	$(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/introspection.m4 \
-	$(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \
-	$(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/libnl-check.m4 \
-	$(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \
-	$(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
-	$(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/nls.m4 \
-	$(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/progtest.m4 \
-	$(top_srcdir)/m4/vapigen.m4 $(top_srcdir)/configure.ac
+	$(top_srcdir)/m4/gettext.m4 \
+	$(top_srcdir)/m4/gnome-code-coverage.m4 \
+	$(top_srcdir)/m4/gtk-doc.m4 $(top_srcdir)/m4/iconv.m4 \
+	$(top_srcdir)/m4/intlmacosx.m4 $(top_srcdir)/m4/intltool.m4 \
+	$(top_srcdir)/m4/introspection.m4 $(top_srcdir)/m4/lib-ld.m4 \
+	$(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \
+	$(top_srcdir)/m4/libnl-check.m4 $(top_srcdir)/m4/libtool.m4 \
+	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
+	$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
+	$(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/po.m4 \
+	$(top_srcdir)/m4/progtest.m4 $(top_srcdir)/m4/vapigen.m4 \
+	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(install_sh) -d
@@ -73,14 +75,14 @@ CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
 CONFIG_CLEAN_VPATH_FILES =
 PROGRAMS = $(noinst_PROGRAMS)
-am_test_supplicant_config_OBJECTS =  \
-	test_supplicant_config-test-supplicant-config.$(OBJEXT)
+am__test_supplicant_config_SOURCES_DIST = test-supplicant-config.c
+@ENABLE_TESTS_TRUE@am_test_supplicant_config_OBJECTS = test_supplicant_config-test-supplicant-config.$(OBJEXT)
 test_supplicant_config_OBJECTS = $(am_test_supplicant_config_OBJECTS)
 am__DEPENDENCIES_1 =
-test_supplicant_config_DEPENDENCIES =  \
-	$(top_builddir)/libnm-util/libnm-util.la \
-	$(top_builddir)/src/supplicant-manager/libsupplicant-manager.la \
-	$(am__DEPENDENCIES_1)
+@ENABLE_TESTS_TRUE@test_supplicant_config_DEPENDENCIES =  \
+@ENABLE_TESTS_TRUE@	$(top_builddir)/libnm-util/libnm-util.la \
+@ENABLE_TESTS_TRUE@	$(top_builddir)/src/supplicant-manager/libsupplicant-manager.la \
+@ENABLE_TESTS_TRUE@	$(am__DEPENDENCIES_1)
 AM_V_lt = $(am__v_lt_@AM_V@)
 am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
 am__v_lt_0 = --silent
@@ -111,7 +113,7 @@ AM_V_GEN = $(am__v_GEN_@AM_V@)
 am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
 am__v_GEN_0 = @echo "  GEN   " $@;
 SOURCES = $(test_supplicant_config_SOURCES)
-DIST_SOURCES = $(test_supplicant_config_SOURCES)
+DIST_SOURCES = $(am__test_supplicant_config_SOURCES_DIST)
 am__can_run_installinfo = \
   case $$AM_UPDATE_INFO_DIR in \
     n|no|NO) false;; \
@@ -132,6 +134,10 @@ AWK = @AWK@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
+CKDB_PATH = @CKDB_PATH@
+CODE_COVERAGE_CFLAGS = @CODE_COVERAGE_CFLAGS@
+CODE_COVERAGE_ENABLED = @CODE_COVERAGE_ENABLED@
+CODE_COVERAGE_LDFLAGS = @CODE_COVERAGE_LDFLAGS@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CXX = @CXX@
@@ -146,9 +152,7 @@ DBUS_SYS_DIR = @DBUS_SYS_DIR@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
 DHCLIENT_PATH = @DHCLIENT_PATH@
-DHCLIENT_VERSION = @DHCLIENT_VERSION@
 DHCPCD_PATH = @DHCPCD_PATH@
-DISABLE_DEPRECATED = @DISABLE_DEPRECATED@
 DLLTOOL = @DLLTOOL@
 DSYMUTIL = @DSYMUTIL@
 DUMPBIN = @DUMPBIN@
@@ -158,17 +162,14 @@ ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
 FGREP = @FGREP@
+GENHTML = @GENHTML@
 GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
 GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
-GIO_CFLAGS = @GIO_CFLAGS@
-GIO_LIBS = @GIO_LIBS@
 GLIB_CFLAGS = @GLIB_CFLAGS@
 GLIB_GENMARSHAL = @GLIB_GENMARSHAL@
 GLIB_LIBS = @GLIB_LIBS@
 GLIB_MAKEFILE = @GLIB_MAKEFILE@
 GLIB_MKENUMS = @GLIB_MKENUMS@
-GMODULE_CFLAGS = @GMODULE_CFLAGS@
-GMODULE_LIBS = @GMODULE_LIBS@
 GMSGFMT = @GMSGFMT@
 GMSGFMT_015 = @GMSGFMT_015@
 GNUTLS_CFLAGS = @GNUTLS_CFLAGS@
@@ -209,6 +210,7 @@ IPTABLES_PATH = @IPTABLES_PATH@
 IWMX_SDK_CFLAGS = @IWMX_SDK_CFLAGS@
 IWMX_SDK_LIBS = @IWMX_SDK_LIBS@
 KERNEL_FIRMWARE_DIR = @KERNEL_FIRMWARE_DIR@
+LCOV = @LCOV@
 LD = @LD@
 LDFLAGS = @LDFLAGS@
 LIBDL = @LIBDL@
@@ -225,11 +227,7 @@ LIBNL2_LIBS = @LIBNL2_LIBS@
 LIBNL3_CFLAGS = @LIBNL3_CFLAGS@
 LIBNL3_LIBS = @LIBNL3_LIBS@
 LIBNL_CFLAGS = @LIBNL_CFLAGS@
-LIBNL_GENL3_CFLAGS = @LIBNL_GENL3_CFLAGS@
-LIBNL_GENL3_LIBS = @LIBNL_GENL3_LIBS@
 LIBNL_LIBS = @LIBNL_LIBS@
-LIBNL_ROUTE3_CFLAGS = @LIBNL_ROUTE3_CFLAGS@
-LIBNL_ROUTE3_LIBS = @LIBNL_ROUTE3_LIBS@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
 LIBSOUP_CFLAGS = @LIBSOUP_CFLAGS@
@@ -244,6 +242,8 @@ MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MANIFEST_TOOL = @MANIFEST_TOOL@
 MKDIR_P = @MKDIR_P@
+MM_GLIB_CFLAGS = @MM_GLIB_CFLAGS@
+MM_GLIB_LIBS = @MM_GLIB_LIBS@
 MOC = @MOC@
 MSGFMT = @MSGFMT@
 MSGFMT_015 = @MSGFMT_015@
@@ -253,6 +253,7 @@ NMEDIT = @NMEDIT@
 NM_MAJOR_VERSION = @NM_MAJOR_VERSION@
 NM_MICRO_VERSION = @NM_MICRO_VERSION@
 NM_MINOR_VERSION = @NM_MINOR_VERSION@
+NM_MODIFY_SYSTEM_POLICY = @NM_MODIFY_SYSTEM_POLICY@
 NM_VERSION = @NM_VERSION@
 NSS_CFLAGS = @NSS_CFLAGS@
 NSS_LIBS = @NSS_LIBS@
@@ -279,13 +280,14 @@ PPPD_PLUGIN_DIR = @PPPD_PLUGIN_DIR@
 QT_CFLAGS = @QT_CFLAGS@
 QT_LIBS = @QT_LIBS@
 RANLIB = @RANLIB@
-RESOLVCONF_PATH = @RESOLVCONF_PATH@
 SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
-SYSTEMD_CFLAGS = @SYSTEMD_CFLAGS@
-SYSTEMD_LIBS = @SYSTEMD_LIBS@
+SYSTEMD_INHIBIT_CFLAGS = @SYSTEMD_INHIBIT_CFLAGS@
+SYSTEMD_INHIBIT_LIBS = @SYSTEMD_INHIBIT_LIBS@
+SYSTEMD_LOGIN_CFLAGS = @SYSTEMD_LOGIN_CFLAGS@
+SYSTEMD_LOGIN_LIBS = @SYSTEMD_LOGIN_LIBS@
 SYSTEM_CA_PATH = @SYSTEM_CA_PATH@
 UDEV_BASE_DIR = @UDEV_BASE_DIR@
 USE_NLS = @USE_NLS@
@@ -340,6 +342,11 @@ localedir = @localedir@
 localstatedir = @localstatedir@
 mandir = @mandir@
 mkdir_p = @mkdir_p@
+nmbinary = @nmbinary@
+nmconfdir = @nmconfdir@
+nmdatadir = @nmdatadir@
+nmrundir = @nmrundir@
+nmstatedir = @nmstatedir@
 oldincludedir = @oldincludedir@
 pdfdir = @pdfdir@
 prefix = @prefix@
@@ -354,25 +361,29 @@ target_alias = @target_alias@
 top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
-INCLUDES = \
-	-I$(top_srcdir)/include \
-	-I$(top_builddir)/include \
-	-I$(top_srcdir)/libnm-util \
-	-I$(top_builddir)/libnm-util \
-	-I$(top_srcdir)/src \
-	-I$(top_srcdir)/src/supplicant-manager
-
-test_supplicant_config_SOURCES = \
-	test-supplicant-config.c
-
-test_supplicant_config_CPPFLAGS = \
-	$(GLIB_CFLAGS) \
-	$(DBUS_CFLAGS)
-
-test_supplicant_config_LDADD = \
-	$(top_builddir)/libnm-util/libnm-util.la \
-	$(top_builddir)/src/supplicant-manager/libsupplicant-manager.la \
-	$(DBUS_LIBS)
+with_dhclient = @with_dhclient@
+with_dhcpcd = @with_dhcpcd@
+with_netconfig = @with_netconfig@
+with_resolvconf = @with_resolvconf@
+@ENABLE_TESTS_TRUE@INCLUDES = \
+@ENABLE_TESTS_TRUE@	-I$(top_srcdir)/include \
+@ENABLE_TESTS_TRUE@	-I$(top_builddir)/include \
+@ENABLE_TESTS_TRUE@	-I$(top_srcdir)/libnm-util \
+@ENABLE_TESTS_TRUE@	-I$(top_builddir)/libnm-util \
+@ENABLE_TESTS_TRUE@	-I$(top_srcdir)/src \
+@ENABLE_TESTS_TRUE@	-I$(top_srcdir)/src/supplicant-manager
+
+@ENABLE_TESTS_TRUE@test_supplicant_config_SOURCES = \
+@ENABLE_TESTS_TRUE@	test-supplicant-config.c
+
+@ENABLE_TESTS_TRUE@test_supplicant_config_CPPFLAGS = \
+@ENABLE_TESTS_TRUE@	$(GLIB_CFLAGS) \
+@ENABLE_TESTS_TRUE@	$(DBUS_CFLAGS)
+
+@ENABLE_TESTS_TRUE@test_supplicant_config_LDADD = \
+@ENABLE_TESTS_TRUE@	$(top_builddir)/libnm-util/libnm-util.la \
+@ENABLE_TESTS_TRUE@	$(top_builddir)/src/supplicant-manager/libsupplicant-manager.la \
+@ENABLE_TESTS_TRUE@	$(DBUS_LIBS)
 
 all: all-am
 
@@ -430,25 +441,22 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_supplicant_config-test-supplicant-config.Po@am__quote@
 
 .c.o:
-@am__fastdepCC_TRUE@	$(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\
-@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
-@am__fastdepCC_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.Po
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $<
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c $<
 
 .c.obj:
-@am__fastdepCC_TRUE@	$(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.obj$$||'`;\
-@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ `$(CYGPATH_W) '$<'` &&\
-@am__fastdepCC_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.Po
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c `$(CYGPATH_W) '$<'`
 
 .c.lo:
-@am__fastdepCC_TRUE@	$(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.lo$$||'`;\
-@am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
-@am__fastdepCC_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.Plo
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $<
@@ -555,7 +563,7 @@ distdir: $(DISTFILES)
 	    || exit 1; \
 	  fi; \
 	done
-@WITH_TESTS_FALSE@check-local:
+@ENABLE_TESTS_FALSE@check-local:
 check-am: all-am
 	$(MAKE) $(AM_MAKEFLAGS) check-local
 check: check-am
@@ -679,8 +687,8 @@ uninstall-am:
 	tags uninstall uninstall-am
 
 
-@WITH_TESTS_TRUE@check-local: test-supplicant-config
-@WITH_TESTS_TRUE@	$(abs_builddir)/test-supplicant-config
+@ENABLE_TESTS_TRUE@check-local: test-supplicant-config
+@ENABLE_TESTS_TRUE@	$(abs_builddir)/test-supplicant-config
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
diff --git a/src/tests/Makefile.am b/src/tests/Makefile.am
index 61e2261f..8f406361 100644
--- a/src/tests/Makefile.am
+++ b/src/tests/Makefile.am
@@ -1,3 +1,5 @@
+if ENABLE_TESTS
+
 INCLUDES = \
 	-I$(top_srcdir)/include \
 	-I$(top_builddir)/include \
@@ -64,12 +66,9 @@ EXTRA_DIST = test-secret-agent.py
 
 ###########################################
 
-if WITH_TESTS
-
 check-local: test-dhcp-options test-policy-hosts test-wifi-ap-utils
 	$(abs_builddir)/test-dhcp-options
 	$(abs_builddir)/test-policy-hosts
 	$(abs_builddir)/test-wifi-ap-utils
 
 endif
-
diff --git a/src/tests/Makefile.in b/src/tests/Makefile.in
index 63d14c20..df19fc42 100644
--- a/src/tests/Makefile.in
+++ b/src/tests/Makefile.in
@@ -51,22 +51,25 @@ PRE_UNINSTALL = :
 POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
-noinst_PROGRAMS = test-dhcp-options$(EXEEXT) \
-	test-policy-hosts$(EXEEXT) test-wifi-ap-utils$(EXEEXT)
+@ENABLE_TESTS_TRUE@noinst_PROGRAMS = test-dhcp-options$(EXEEXT) \
+@ENABLE_TESTS_TRUE@	test-policy-hosts$(EXEEXT) \
+@ENABLE_TESTS_TRUE@	test-wifi-ap-utils$(EXEEXT)
 subdir = src/tests
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/compiler_warnings.m4 \
-	$(top_srcdir)/m4/gettext.m4 $(top_srcdir)/m4/gtk-doc.m4 \
-	$(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/intlmacosx.m4 \
-	$(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/introspection.m4 \
-	$(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \
-	$(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/libnl-check.m4 \
-	$(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \
-	$(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
-	$(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/nls.m4 \
-	$(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/progtest.m4 \
-	$(top_srcdir)/m4/vapigen.m4 $(top_srcdir)/configure.ac
+	$(top_srcdir)/m4/gettext.m4 \
+	$(top_srcdir)/m4/gnome-code-coverage.m4 \
+	$(top_srcdir)/m4/gtk-doc.m4 $(top_srcdir)/m4/iconv.m4 \
+	$(top_srcdir)/m4/intlmacosx.m4 $(top_srcdir)/m4/intltool.m4 \
+	$(top_srcdir)/m4/introspection.m4 $(top_srcdir)/m4/lib-ld.m4 \
+	$(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \
+	$(top_srcdir)/m4/libnl-check.m4 $(top_srcdir)/m4/libtool.m4 \
+	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
+	$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
+	$(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/po.m4 \
+	$(top_srcdir)/m4/progtest.m4 $(top_srcdir)/m4/vapigen.m4 \
+	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(install_sh) -d
@@ -74,31 +77,30 @@ CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
 CONFIG_CLEAN_VPATH_FILES =
 PROGRAMS = $(noinst_PROGRAMS)
-am_test_dhcp_options_OBJECTS =  \
-	test_dhcp_options-test-dhcp-options.$(OBJEXT)
+am__test_dhcp_options_SOURCES_DIST = test-dhcp-options.c
+@ENABLE_TESTS_TRUE@am_test_dhcp_options_OBJECTS = test_dhcp_options-test-dhcp-options.$(OBJEXT)
 test_dhcp_options_OBJECTS = $(am_test_dhcp_options_OBJECTS)
 am__DEPENDENCIES_1 =
-test_dhcp_options_DEPENDENCIES =  \
-	$(top_builddir)/libnm-util/libnm-util.la \
-	$(top_builddir)/src/dhcp-manager/libdhcp-manager.la \
-	$(top_builddir)/src/libtest-dhcp.la $(am__DEPENDENCIES_1) \
-	$(am__DEPENDENCIES_1)
+@ENABLE_TESTS_TRUE@test_dhcp_options_DEPENDENCIES =  \
+@ENABLE_TESTS_TRUE@	$(top_builddir)/libnm-util/libnm-util.la \
+@ENABLE_TESTS_TRUE@	$(top_builddir)/src/dhcp-manager/libdhcp-manager.la \
+@ENABLE_TESTS_TRUE@	$(top_builddir)/src/libtest-dhcp.la \
+@ENABLE_TESTS_TRUE@	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
 AM_V_lt = $(am__v_lt_@AM_V@)
 am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
 am__v_lt_0 = --silent
-am_test_policy_hosts_OBJECTS =  \
-	test_policy_hosts-test-policy-hosts.$(OBJEXT)
+am__test_policy_hosts_SOURCES_DIST = test-policy-hosts.c
+@ENABLE_TESTS_TRUE@am_test_policy_hosts_OBJECTS = test_policy_hosts-test-policy-hosts.$(OBJEXT)
 test_policy_hosts_OBJECTS = $(am_test_policy_hosts_OBJECTS)
-test_policy_hosts_DEPENDENCIES =  \
-	$(top_builddir)/src/libtest-policy-hosts.la \
-	$(am__DEPENDENCIES_1)
-am_test_wifi_ap_utils_OBJECTS =  \
-	test_wifi_ap_utils-test-wifi-ap-utils.$(OBJEXT)
+@ENABLE_TESTS_TRUE@test_policy_hosts_DEPENDENCIES = $(top_builddir)/src/libtest-policy-hosts.la \
+@ENABLE_TESTS_TRUE@	$(am__DEPENDENCIES_1)
+am__test_wifi_ap_utils_SOURCES_DIST = test-wifi-ap-utils.c
+@ENABLE_TESTS_TRUE@am_test_wifi_ap_utils_OBJECTS = test_wifi_ap_utils-test-wifi-ap-utils.$(OBJEXT)
 test_wifi_ap_utils_OBJECTS = $(am_test_wifi_ap_utils_OBJECTS)
-test_wifi_ap_utils_DEPENDENCIES =  \
-	$(top_builddir)/libnm-util/libnm-util.la \
-	$(top_builddir)/src/libtest-wifi-ap-utils.la \
-	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
+@ENABLE_TESTS_TRUE@test_wifi_ap_utils_DEPENDENCIES =  \
+@ENABLE_TESTS_TRUE@	$(top_builddir)/libnm-util/libnm-util.la \
+@ENABLE_TESTS_TRUE@	$(top_builddir)/src/libtest-wifi-ap-utils.la \
+@ENABLE_TESTS_TRUE@	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
 DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
 depcomp = $(SHELL) $(top_srcdir)/build-aux/depcomp
 am__depfiles_maybe = depfiles
@@ -127,8 +129,9 @@ am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
 am__v_GEN_0 = @echo "  GEN   " $@;
 SOURCES = $(test_dhcp_options_SOURCES) $(test_policy_hosts_SOURCES) \
 	$(test_wifi_ap_utils_SOURCES)
-DIST_SOURCES = $(test_dhcp_options_SOURCES) \
-	$(test_policy_hosts_SOURCES) $(test_wifi_ap_utils_SOURCES)
+DIST_SOURCES = $(am__test_dhcp_options_SOURCES_DIST) \
+	$(am__test_policy_hosts_SOURCES_DIST) \
+	$(am__test_wifi_ap_utils_SOURCES_DIST)
 am__can_run_installinfo = \
   case $$AM_UPDATE_INFO_DIR in \
     n|no|NO) false;; \
@@ -149,6 +152,10 @@ AWK = @AWK@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
+CKDB_PATH = @CKDB_PATH@
+CODE_COVERAGE_CFLAGS = @CODE_COVERAGE_CFLAGS@
+CODE_COVERAGE_ENABLED = @CODE_COVERAGE_ENABLED@
+CODE_COVERAGE_LDFLAGS = @CODE_COVERAGE_LDFLAGS@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CXX = @CXX@
@@ -163,9 +170,7 @@ DBUS_SYS_DIR = @DBUS_SYS_DIR@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
 DHCLIENT_PATH = @DHCLIENT_PATH@
-DHCLIENT_VERSION = @DHCLIENT_VERSION@
 DHCPCD_PATH = @DHCPCD_PATH@
-DISABLE_DEPRECATED = @DISABLE_DEPRECATED@
 DLLTOOL = @DLLTOOL@
 DSYMUTIL = @DSYMUTIL@
 DUMPBIN = @DUMPBIN@
@@ -175,17 +180,14 @@ ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
 FGREP = @FGREP@
+GENHTML = @GENHTML@
 GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
 GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
-GIO_CFLAGS = @GIO_CFLAGS@
-GIO_LIBS = @GIO_LIBS@
 GLIB_CFLAGS = @GLIB_CFLAGS@
 GLIB_GENMARSHAL = @GLIB_GENMARSHAL@
 GLIB_LIBS = @GLIB_LIBS@
 GLIB_MAKEFILE = @GLIB_MAKEFILE@
 GLIB_MKENUMS = @GLIB_MKENUMS@
-GMODULE_CFLAGS = @GMODULE_CFLAGS@
-GMODULE_LIBS = @GMODULE_LIBS@
 GMSGFMT = @GMSGFMT@
 GMSGFMT_015 = @GMSGFMT_015@
 GNUTLS_CFLAGS = @GNUTLS_CFLAGS@
@@ -226,6 +228,7 @@ IPTABLES_PATH = @IPTABLES_PATH@
 IWMX_SDK_CFLAGS = @IWMX_SDK_CFLAGS@
 IWMX_SDK_LIBS = @IWMX_SDK_LIBS@
 KERNEL_FIRMWARE_DIR = @KERNEL_FIRMWARE_DIR@
+LCOV = @LCOV@
 LD = @LD@
 LDFLAGS = @LDFLAGS@
 LIBDL = @LIBDL@
@@ -242,11 +245,7 @@ LIBNL2_LIBS = @LIBNL2_LIBS@
 LIBNL3_CFLAGS = @LIBNL3_CFLAGS@
 LIBNL3_LIBS = @LIBNL3_LIBS@
 LIBNL_CFLAGS = @LIBNL_CFLAGS@
-LIBNL_GENL3_CFLAGS = @LIBNL_GENL3_CFLAGS@
-LIBNL_GENL3_LIBS = @LIBNL_GENL3_LIBS@
 LIBNL_LIBS = @LIBNL_LIBS@
-LIBNL_ROUTE3_CFLAGS = @LIBNL_ROUTE3_CFLAGS@
-LIBNL_ROUTE3_LIBS = @LIBNL_ROUTE3_LIBS@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
 LIBSOUP_CFLAGS = @LIBSOUP_CFLAGS@
@@ -261,6 +260,8 @@ MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MANIFEST_TOOL = @MANIFEST_TOOL@
 MKDIR_P = @MKDIR_P@
+MM_GLIB_CFLAGS = @MM_GLIB_CFLAGS@
+MM_GLIB_LIBS = @MM_GLIB_LIBS@
 MOC = @MOC@
 MSGFMT = @MSGFMT@
 MSGFMT_015 = @MSGFMT_015@
@@ -270,6 +271,7 @@ NMEDIT = @NMEDIT@
 NM_MAJOR_VERSION = @NM_MAJOR_VERSION@
 NM_MICRO_VERSION = @NM_MICRO_VERSION@
 NM_MINOR_VERSION = @NM_MINOR_VERSION@
+NM_MODIFY_SYSTEM_POLICY = @NM_MODIFY_SYSTEM_POLICY@
 NM_VERSION = @NM_VERSION@
 NSS_CFLAGS = @NSS_CFLAGS@
 NSS_LIBS = @NSS_LIBS@
@@ -296,13 +298,14 @@ PPPD_PLUGIN_DIR = @PPPD_PLUGIN_DIR@
 QT_CFLAGS = @QT_CFLAGS@
 QT_LIBS = @QT_LIBS@
 RANLIB = @RANLIB@
-RESOLVCONF_PATH = @RESOLVCONF_PATH@
 SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
-SYSTEMD_CFLAGS = @SYSTEMD_CFLAGS@
-SYSTEMD_LIBS = @SYSTEMD_LIBS@
+SYSTEMD_INHIBIT_CFLAGS = @SYSTEMD_INHIBIT_CFLAGS@
+SYSTEMD_INHIBIT_LIBS = @SYSTEMD_INHIBIT_LIBS@
+SYSTEMD_LOGIN_CFLAGS = @SYSTEMD_LOGIN_CFLAGS@
+SYSTEMD_LOGIN_LIBS = @SYSTEMD_LOGIN_LIBS@
 SYSTEM_CA_PATH = @SYSTEM_CA_PATH@
 UDEV_BASE_DIR = @UDEV_BASE_DIR@
 USE_NLS = @USE_NLS@
@@ -357,6 +360,11 @@ localedir = @localedir@
 localstatedir = @localstatedir@
 mandir = @mandir@
 mkdir_p = @mkdir_p@
+nmbinary = @nmbinary@
+nmconfdir = @nmconfdir@
+nmdatadir = @nmdatadir@
+nmrundir = @nmrundir@
+nmstatedir = @nmstatedir@
 oldincludedir = @oldincludedir@
 pdfdir = @pdfdir@
 prefix = @prefix@
@@ -371,64 +379,68 @@ target_alias = @target_alias@
 top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
-INCLUDES = \
-	-I$(top_srcdir)/include \
-	-I$(top_builddir)/include \
-	-I$(top_srcdir)/libnm-util \
-	-I$(top_builddir)/libnm-util \
-	-I$(top_srcdir)/src/dhcp-manager \
-	-I$(top_srcdir)/src \
-	-I$(top_builddir)/src
+with_dhclient = @with_dhclient@
+with_dhcpcd = @with_dhcpcd@
+with_netconfig = @with_netconfig@
+with_resolvconf = @with_resolvconf@
+@ENABLE_TESTS_TRUE@INCLUDES = \
+@ENABLE_TESTS_TRUE@	-I$(top_srcdir)/include \
+@ENABLE_TESTS_TRUE@	-I$(top_builddir)/include \
+@ENABLE_TESTS_TRUE@	-I$(top_srcdir)/libnm-util \
+@ENABLE_TESTS_TRUE@	-I$(top_builddir)/libnm-util \
+@ENABLE_TESTS_TRUE@	-I$(top_srcdir)/src/dhcp-manager \
+@ENABLE_TESTS_TRUE@	-I$(top_srcdir)/src \
+@ENABLE_TESTS_TRUE@	-I$(top_builddir)/src
 
 
 ####### DHCP options test #######
-test_dhcp_options_SOURCES = \
-	test-dhcp-options.c
+@ENABLE_TESTS_TRUE@test_dhcp_options_SOURCES = \
+@ENABLE_TESTS_TRUE@	test-dhcp-options.c
 
-test_dhcp_options_CPPFLAGS = \
-	$(GLIB_CFLAGS) \
-	$(DBUS_CFLAGS) \
-	-DDHCLIENT_PATH=\"$(DHCLIENT_PATH)\" \
-	-DDHCPCD_PATH=\"$(DHCPCD_PATH)\"
+@ENABLE_TESTS_TRUE@test_dhcp_options_CPPFLAGS = \
+@ENABLE_TESTS_TRUE@	$(GLIB_CFLAGS) \
+@ENABLE_TESTS_TRUE@	$(DBUS_CFLAGS) \
+@ENABLE_TESTS_TRUE@	-DDHCLIENT_PATH=\"$(DHCLIENT_PATH)\" \
+@ENABLE_TESTS_TRUE@	-DDHCPCD_PATH=\"$(DHCPCD_PATH)\"
 
-test_dhcp_options_LDADD = \
-	$(top_builddir)/libnm-util/libnm-util.la \
-	$(top_builddir)/src/dhcp-manager/libdhcp-manager.la \
-	$(top_builddir)/src/libtest-dhcp.la \
-	$(GLIB_LIBS) \
-	$(DBUS_LIBS)
+@ENABLE_TESTS_TRUE@test_dhcp_options_LDADD = \
+@ENABLE_TESTS_TRUE@	$(top_builddir)/libnm-util/libnm-util.la \
+@ENABLE_TESTS_TRUE@	$(top_builddir)/src/dhcp-manager/libdhcp-manager.la \
+@ENABLE_TESTS_TRUE@	$(top_builddir)/src/libtest-dhcp.la \
+@ENABLE_TESTS_TRUE@	$(GLIB_LIBS) \
+@ENABLE_TESTS_TRUE@	$(DBUS_LIBS)
 
 
 ####### policy /etc/hosts test #######
-test_policy_hosts_SOURCES = \
-	test-policy-hosts.c
+@ENABLE_TESTS_TRUE@test_policy_hosts_SOURCES = \
+@ENABLE_TESTS_TRUE@	test-policy-hosts.c
 
-test_policy_hosts_CPPFLAGS = \
-	$(GLIB_CFLAGS)
+@ENABLE_TESTS_TRUE@test_policy_hosts_CPPFLAGS = \
+@ENABLE_TESTS_TRUE@	$(GLIB_CFLAGS)
 
-test_policy_hosts_LDADD = \
-	-ldl \
-	$(top_builddir)/src/libtest-policy-hosts.la \
-	$(GLIB_LIBS)
+@ENABLE_TESTS_TRUE@test_policy_hosts_LDADD = \
+@ENABLE_TESTS_TRUE@	-ldl \
+@ENABLE_TESTS_TRUE@	$(top_builddir)/src/libtest-policy-hosts.la \
+@ENABLE_TESTS_TRUE@	$(GLIB_LIBS)
 
 
 ####### wifi ap utils test #######
-test_wifi_ap_utils_SOURCES = \
-	test-wifi-ap-utils.c
+@ENABLE_TESTS_TRUE@test_wifi_ap_utils_SOURCES = \
+@ENABLE_TESTS_TRUE@	test-wifi-ap-utils.c
 
-test_wifi_ap_utils_CPPFLAGS = \
-	$(GLIB_CFLAGS) \
-	$(DBUS_CFLAGS)
+@ENABLE_TESTS_TRUE@test_wifi_ap_utils_CPPFLAGS = \
+@ENABLE_TESTS_TRUE@	$(GLIB_CFLAGS) \
+@ENABLE_TESTS_TRUE@	$(DBUS_CFLAGS)
 
-test_wifi_ap_utils_LDADD = \
-	$(top_builddir)/libnm-util/libnm-util.la \
-	$(top_builddir)/src/libtest-wifi-ap-utils.la \
-	$(GLIB_LIBS) \
-	$(DBUS_LIBS)
+@ENABLE_TESTS_TRUE@test_wifi_ap_utils_LDADD = \
+@ENABLE_TESTS_TRUE@	$(top_builddir)/libnm-util/libnm-util.la \
+@ENABLE_TESTS_TRUE@	$(top_builddir)/src/libtest-wifi-ap-utils.la \
+@ENABLE_TESTS_TRUE@	$(GLIB_LIBS) \
+@ENABLE_TESTS_TRUE@	$(DBUS_LIBS)
 
 
 ####### secret agent interface test #######
-EXTRA_DIST = test-secret-agent.py
+@ENABLE_TESTS_TRUE@EXTRA_DIST = test-secret-agent.py
 all: all-am
 
 .SUFFIXES:
@@ -493,25 +505,22 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_wifi_ap_utils-test-wifi-ap-utils.Po@am__quote@
 
 .c.o:
-@am__fastdepCC_TRUE@	$(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\
-@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
-@am__fastdepCC_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.Po
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $<
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c $<
 
 .c.obj:
-@am__fastdepCC_TRUE@	$(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.obj$$||'`;\
-@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ `$(CYGPATH_W) '$<'` &&\
-@am__fastdepCC_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.Po
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c `$(CYGPATH_W) '$<'`
 
 .c.lo:
-@am__fastdepCC_TRUE@	$(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.lo$$||'`;\
-@am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
-@am__fastdepCC_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.Plo
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $<
@@ -646,7 +655,7 @@ distdir: $(DISTFILES)
 	    || exit 1; \
 	  fi; \
 	done
-@WITH_TESTS_FALSE@check-local:
+@ENABLE_TESTS_FALSE@check-local:
 check-am: all-am
 	$(MAKE) $(AM_MAKEFLAGS) check-local
 check: check-am
@@ -772,10 +781,10 @@ uninstall-am:
 
 ###########################################
 
-@WITH_TESTS_TRUE@check-local: test-dhcp-options test-policy-hosts test-wifi-ap-utils
-@WITH_TESTS_TRUE@	$(abs_builddir)/test-dhcp-options
-@WITH_TESTS_TRUE@	$(abs_builddir)/test-policy-hosts
-@WITH_TESTS_TRUE@	$(abs_builddir)/test-wifi-ap-utils
+@ENABLE_TESTS_TRUE@check-local: test-dhcp-options test-policy-hosts test-wifi-ap-utils
+@ENABLE_TESTS_TRUE@	$(abs_builddir)/test-dhcp-options
+@ENABLE_TESTS_TRUE@	$(abs_builddir)/test-policy-hosts
+@ENABLE_TESTS_TRUE@	$(abs_builddir)/test-wifi-ap-utils
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
diff --git a/src/vpn-manager/Makefile.am b/src/vpn-manager/Makefile.am
index 06e04734..a525ce20 100644
--- a/src/vpn-manager/Makefile.am
+++ b/src/vpn-manager/Makefile.am
@@ -26,8 +26,7 @@ libvpn_manager_la_SOURCES = \
 libvpn_manager_la_CPPFLAGS =	\
 	$(LIBNL_CFLAGS)		\
 	$(DBUS_CFLAGS)		\
-	$(GLIB_CFLAGS)		\
-	-DG_DISABLE_DEPRECATED
+	$(GLIB_CFLAGS)
 
 libvpn_manager_la_LIBADD = \
 	$(top_builddir)/src/generated/libnm-generated.la \
diff --git a/src/vpn-manager/Makefile.in b/src/vpn-manager/Makefile.in
index 5eb769c5..bb8efd17 100644
--- a/src/vpn-manager/Makefile.in
+++ b/src/vpn-manager/Makefile.in
@@ -55,16 +55,18 @@ subdir = src/vpn-manager
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/compiler_warnings.m4 \
-	$(top_srcdir)/m4/gettext.m4 $(top_srcdir)/m4/gtk-doc.m4 \
-	$(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/intlmacosx.m4 \
-	$(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/introspection.m4 \
-	$(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \
-	$(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/libnl-check.m4 \
-	$(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \
-	$(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
-	$(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/nls.m4 \
-	$(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/progtest.m4 \
-	$(top_srcdir)/m4/vapigen.m4 $(top_srcdir)/configure.ac
+	$(top_srcdir)/m4/gettext.m4 \
+	$(top_srcdir)/m4/gnome-code-coverage.m4 \
+	$(top_srcdir)/m4/gtk-doc.m4 $(top_srcdir)/m4/iconv.m4 \
+	$(top_srcdir)/m4/intlmacosx.m4 $(top_srcdir)/m4/intltool.m4 \
+	$(top_srcdir)/m4/introspection.m4 $(top_srcdir)/m4/lib-ld.m4 \
+	$(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \
+	$(top_srcdir)/m4/libnl-check.m4 $(top_srcdir)/m4/libtool.m4 \
+	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
+	$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
+	$(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/po.m4 \
+	$(top_srcdir)/m4/progtest.m4 $(top_srcdir)/m4/vapigen.m4 \
+	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(install_sh) -d
@@ -134,6 +136,10 @@ AWK = @AWK@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
+CKDB_PATH = @CKDB_PATH@
+CODE_COVERAGE_CFLAGS = @CODE_COVERAGE_CFLAGS@
+CODE_COVERAGE_ENABLED = @CODE_COVERAGE_ENABLED@
+CODE_COVERAGE_LDFLAGS = @CODE_COVERAGE_LDFLAGS@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CXX = @CXX@
@@ -148,9 +154,7 @@ DBUS_SYS_DIR = @DBUS_SYS_DIR@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
 DHCLIENT_PATH = @DHCLIENT_PATH@
-DHCLIENT_VERSION = @DHCLIENT_VERSION@
 DHCPCD_PATH = @DHCPCD_PATH@
-DISABLE_DEPRECATED = @DISABLE_DEPRECATED@
 DLLTOOL = @DLLTOOL@
 DSYMUTIL = @DSYMUTIL@
 DUMPBIN = @DUMPBIN@
@@ -160,17 +164,14 @@ ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
 FGREP = @FGREP@
+GENHTML = @GENHTML@
 GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
 GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
-GIO_CFLAGS = @GIO_CFLAGS@
-GIO_LIBS = @GIO_LIBS@
 GLIB_CFLAGS = @GLIB_CFLAGS@
 GLIB_GENMARSHAL = @GLIB_GENMARSHAL@
 GLIB_LIBS = @GLIB_LIBS@
 GLIB_MAKEFILE = @GLIB_MAKEFILE@
 GLIB_MKENUMS = @GLIB_MKENUMS@
-GMODULE_CFLAGS = @GMODULE_CFLAGS@
-GMODULE_LIBS = @GMODULE_LIBS@
 GMSGFMT = @GMSGFMT@
 GMSGFMT_015 = @GMSGFMT_015@
 GNUTLS_CFLAGS = @GNUTLS_CFLAGS@
@@ -211,6 +212,7 @@ IPTABLES_PATH = @IPTABLES_PATH@
 IWMX_SDK_CFLAGS = @IWMX_SDK_CFLAGS@
 IWMX_SDK_LIBS = @IWMX_SDK_LIBS@
 KERNEL_FIRMWARE_DIR = @KERNEL_FIRMWARE_DIR@
+LCOV = @LCOV@
 LD = @LD@
 LDFLAGS = @LDFLAGS@
 LIBDL = @LIBDL@
@@ -227,11 +229,7 @@ LIBNL2_LIBS = @LIBNL2_LIBS@
 LIBNL3_CFLAGS = @LIBNL3_CFLAGS@
 LIBNL3_LIBS = @LIBNL3_LIBS@
 LIBNL_CFLAGS = @LIBNL_CFLAGS@
-LIBNL_GENL3_CFLAGS = @LIBNL_GENL3_CFLAGS@
-LIBNL_GENL3_LIBS = @LIBNL_GENL3_LIBS@
 LIBNL_LIBS = @LIBNL_LIBS@
-LIBNL_ROUTE3_CFLAGS = @LIBNL_ROUTE3_CFLAGS@
-LIBNL_ROUTE3_LIBS = @LIBNL_ROUTE3_LIBS@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
 LIBSOUP_CFLAGS = @LIBSOUP_CFLAGS@
@@ -246,6 +244,8 @@ MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MANIFEST_TOOL = @MANIFEST_TOOL@
 MKDIR_P = @MKDIR_P@
+MM_GLIB_CFLAGS = @MM_GLIB_CFLAGS@
+MM_GLIB_LIBS = @MM_GLIB_LIBS@
 MOC = @MOC@
 MSGFMT = @MSGFMT@
 MSGFMT_015 = @MSGFMT_015@
@@ -255,6 +255,7 @@ NMEDIT = @NMEDIT@
 NM_MAJOR_VERSION = @NM_MAJOR_VERSION@
 NM_MICRO_VERSION = @NM_MICRO_VERSION@
 NM_MINOR_VERSION = @NM_MINOR_VERSION@
+NM_MODIFY_SYSTEM_POLICY = @NM_MODIFY_SYSTEM_POLICY@
 NM_VERSION = @NM_VERSION@
 NSS_CFLAGS = @NSS_CFLAGS@
 NSS_LIBS = @NSS_LIBS@
@@ -281,13 +282,14 @@ PPPD_PLUGIN_DIR = @PPPD_PLUGIN_DIR@
 QT_CFLAGS = @QT_CFLAGS@
 QT_LIBS = @QT_LIBS@
 RANLIB = @RANLIB@
-RESOLVCONF_PATH = @RESOLVCONF_PATH@
 SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
-SYSTEMD_CFLAGS = @SYSTEMD_CFLAGS@
-SYSTEMD_LIBS = @SYSTEMD_LIBS@
+SYSTEMD_INHIBIT_CFLAGS = @SYSTEMD_INHIBIT_CFLAGS@
+SYSTEMD_INHIBIT_LIBS = @SYSTEMD_INHIBIT_LIBS@
+SYSTEMD_LOGIN_CFLAGS = @SYSTEMD_LOGIN_CFLAGS@
+SYSTEMD_LOGIN_LIBS = @SYSTEMD_LOGIN_LIBS@
 SYSTEM_CA_PATH = @SYSTEM_CA_PATH@
 UDEV_BASE_DIR = @UDEV_BASE_DIR@
 USE_NLS = @USE_NLS@
@@ -342,6 +344,11 @@ localedir = @localedir@
 localstatedir = @localstatedir@
 mandir = @mandir@
 mkdir_p = @mkdir_p@
+nmbinary = @nmbinary@
+nmconfdir = @nmconfdir@
+nmdatadir = @nmdatadir@
+nmrundir = @nmrundir@
+nmstatedir = @nmstatedir@
 oldincludedir = @oldincludedir@
 pdfdir = @pdfdir@
 prefix = @prefix@
@@ -356,6 +363,10 @@ target_alias = @target_alias@
 top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
+with_dhclient = @with_dhclient@
+with_dhcpcd = @with_dhcpcd@
+with_netconfig = @with_netconfig@
+with_resolvconf = @with_resolvconf@
 INCLUDES = \
 	-I${top_srcdir} \
 	-I${top_builddir}/include \
@@ -382,8 +393,7 @@ libvpn_manager_la_SOURCES = \
 libvpn_manager_la_CPPFLAGS = \
 	$(LIBNL_CFLAGS)		\
 	$(DBUS_CFLAGS)		\
-	$(GLIB_CFLAGS)		\
-	-DG_DISABLE_DEPRECATED
+	$(GLIB_CFLAGS)
 
 libvpn_manager_la_LIBADD = \
 	$(top_builddir)/src/generated/libnm-generated.la \
@@ -457,25 +467,22 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libvpn_manager_la-nm-vpn-service.Plo@am__quote@
 
 .c.o:
-@am__fastdepCC_TRUE@	$(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\
-@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
-@am__fastdepCC_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.Po
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $<
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c $<
 
 .c.obj:
-@am__fastdepCC_TRUE@	$(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.obj$$||'`;\
-@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ `$(CYGPATH_W) '$<'` &&\
-@am__fastdepCC_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.Po
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c `$(CYGPATH_W) '$<'`
 
 .c.lo:
-@am__fastdepCC_TRUE@	$(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.lo$$||'`;\
-@am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
-@am__fastdepCC_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.Plo
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $<
diff --git a/src/vpn-manager/nm-vpn-connection.c b/src/vpn-manager/nm-vpn-connection.c
index 1820ede3..639d66d0 100644
--- a/src/vpn-manager/nm-vpn-connection.c
+++ b/src/vpn-manager/nm-vpn-connection.c
@@ -47,6 +47,7 @@
 #include "nm-netlink-utils.h"
 #include "nm-glib-compat.h"
 #include "settings/nm-settings-connection.h"
+#include "nm-dispatcher.h"
 
 #include "nm-vpn-connection-glue.h"
 
@@ -68,8 +69,6 @@ typedef struct {
 
 	NMConnection *connection;
 
-	gboolean user_requested;
-	gulong user_uid;
 	guint32 secrets_id;
 	SecretsReq secrets_idx;
 	char *username;
@@ -134,6 +133,9 @@ ac_state_from_vpn_state (NMVPNConnectionState vpn_state)
 		return NM_ACTIVE_CONNECTION_STATE_ACTIVATING;
 	case NM_VPN_CONNECTION_STATE_ACTIVATED:
 		return NM_ACTIVE_CONNECTION_STATE_ACTIVATED;
+	case NM_VPN_CONNECTION_STATE_FAILED:
+	case NM_VPN_CONNECTION_STATE_DISCONNECTED:
+		return NM_ACTIVE_CONNECTION_STATE_DEACTIVATED;
 	default:
 		break;
 	}
@@ -242,23 +244,27 @@ nm_vpn_connection_set_vpn_state (NMVPNConnection *connection,
 		nm_connection_clear_secrets (priv->connection);
 
 		/* Let dispatcher scripts know we're up and running */
-		nm_utils_call_dispatcher ("vpn-up",
-		                          priv->connection,
-		                          priv->parent_dev,
-		                          priv->ip_iface,
-		                          priv->ip4_config,
-		                          priv->ip6_config);
+		nm_dispatcher_call_vpn (DISPATCHER_ACTION_VPN_UP,
+		                        priv->connection,
+		                        priv->parent_dev,
+		                        priv->ip_iface,
+		                        priv->ip4_config,
+		                        priv->ip6_config,
+		                        NULL,
+		                        NULL);
 		break;
 	case NM_VPN_CONNECTION_STATE_FAILED:
 	case NM_VPN_CONNECTION_STATE_DISCONNECTED:
 		if (old_vpn_state == NM_VPN_CONNECTION_STATE_ACTIVATED) {
 			/* Let dispatcher scripts know we're about to go down */
-			nm_utils_call_dispatcher ("vpn-down",
-			                          priv->connection,
-			                          priv->parent_dev,
-			                          priv->ip_iface,
-			                          NULL,
-			                          NULL);
+			nm_dispatcher_call_vpn (DISPATCHER_ACTION_VPN_DOWN,
+			                        priv->connection,
+			                        priv->parent_dev,
+			                        priv->ip_iface,
+			                        NULL,
+			                        NULL,
+			                        NULL,
+			                        NULL);
 		}
 
 		/* Tear down and clean up the connection */
@@ -342,42 +348,20 @@ nm_vpn_connection_new (NMConnection *connection,
                        gulong user_uid)
 {
 	NMVPNConnection *self;
-	NMVPNConnectionPrivate *priv;
 
 	g_return_val_if_fail (NM_IS_CONNECTION (connection), NULL);
 	g_return_val_if_fail (NM_IS_DEVICE (parent_device), NULL);
 
 	self = (NMVPNConnection *) g_object_new (NM_TYPE_VPN_CONNECTION,
+	                                         NM_ACTIVE_CONNECTION_INT_CONNECTION, connection,
+	                                         NM_ACTIVE_CONNECTION_INT_DEVICE, parent_device,
 	                                         NM_ACTIVE_CONNECTION_SPECIFIC_OBJECT, specific_object,
+	                                         NM_ACTIVE_CONNECTION_INT_USER_REQUESTED, user_requested,
+	                                         NM_ACTIVE_CONNECTION_INT_USER_UID, user_uid,
 	                                         NM_ACTIVE_CONNECTION_VPN, TRUE,
 	                                         NULL);
-	if (!self)
-		return NULL;
-
-	priv = NM_VPN_CONNECTION_GET_PRIVATE (self);
-
-	priv->user_requested = user_requested;
-	priv->user_uid = user_uid;
-	priv->connection = g_object_ref (connection);
-	priv->parent_dev = g_object_ref (parent_device);
-
-	priv->device_monitor = g_signal_connect (parent_device, "state-changed",
-									 G_CALLBACK (device_state_changed),
-									 self);
-
-	priv->device_ip4 = g_signal_connect (parent_device, "notify::" NM_DEVICE_IP4_CONFIG,
-	                                     G_CALLBACK (device_ip4_config_changed),
-	                                     self);
-	priv->device_ip6 = g_signal_connect (parent_device, "notify::" NM_DEVICE_IP6_CONFIG,
-	                                     G_CALLBACK (device_ip6_config_changed),
-	                                     self);
-
-	if (!nm_active_connection_export (NM_ACTIVE_CONNECTION (self),
-	                                  connection,
-	                                  nm_device_get_path (parent_device))) {
-		g_object_unref (self);
-		self = NULL;
-	}
+	if (self)
+		nm_active_connection_export (NM_ACTIVE_CONNECTION (self));
 
 	return self;
 }
@@ -642,7 +626,7 @@ nm_vpn_connection_apply_config (NMVPNConnection *connection)
 	}
 
 	nm_log_info (LOGD_VPN, "VPN connection '%s' (IP Config Get) complete.",
-	             nm_vpn_connection_get_name (connection));
+	             nm_connection_get_id (priv->connection));
 	nm_vpn_connection_set_vpn_state (connection,
 	                                 NM_VPN_CONNECTION_STATE_ACTIVATED,
 	                                 NM_VPN_CONNECTION_STATE_REASON_NONE);
@@ -684,7 +668,7 @@ nm_vpn_connection_config_maybe_complete (NMVPNConnection *connection,
 	g_clear_object (&priv->ip6_config);
 
 	nm_log_warn (LOGD_VPN, "VPN connection '%s' did not receive valid IP config information.",
-	             nm_vpn_connection_get_name (connection));
+	             nm_connection_get_id (priv->connection));
 	nm_vpn_connection_set_vpn_state (connection,
 	                                 NM_VPN_CONNECTION_STATE_FAILED,
 	                                 NM_VPN_CONNECTION_STATE_REASON_IP_CONFIG_INVALID);
@@ -708,7 +692,7 @@ process_generic_config (NMVPNConnection *connection,
 
 	/* Grab the interface index for address/routing operations */
 	priv->ip_ifindex = nm_netlink_iface_to_index (priv->ip_iface);
-	if (priv->ip_ifindex < 0) {
+	if (priv->ip_ifindex <= 0) {
 		nm_log_err (LOGD_VPN, "(%s): failed to look up VPN interface index", priv->ip_iface);
 		nm_vpn_connection_config_maybe_complete (connection, FALSE);
 		return FALSE;
@@ -762,7 +746,7 @@ nm_vpn_connection_config_get (DBusGProxy *proxy,
 	GValue *val;
 
 	nm_log_info (LOGD_VPN, "VPN connection '%s' (IP Config Get) reply received.",
-	             nm_vpn_connection_get_name (connection));
+	             nm_connection_get_id (priv->connection));
 
 	if (!process_generic_config (connection, config_hash))
 		return;
@@ -792,7 +776,7 @@ nm_vpn_connection_ip4_config_get (DBusGProxy *proxy,
 
 	if (priv->has_ip4) {
 		nm_log_info (LOGD_VPN, "VPN connection '%s' (IP4 Config Get) reply received.",
-		             nm_vpn_connection_get_name (connection));
+		             nm_connection_get_id (priv->connection));
 
 		if (g_hash_table_size (config_hash) == 0) {
 			priv->has_ip4 = FALSE;
@@ -801,7 +785,7 @@ nm_vpn_connection_ip4_config_get (DBusGProxy *proxy,
 		}
 	} else {
 		nm_log_info (LOGD_VPN, "VPN connection '%s' (IP4 Config Get) reply received from old-style plugin.",
-		             nm_vpn_connection_get_name (connection));
+		             nm_connection_get_id (priv->connection));
 
 		/* In the old API, the generic and IPv4 configuration items
 		 * were mixed together.
@@ -937,7 +921,7 @@ nm_vpn_connection_ip6_config_get (DBusGProxy *proxy,
 	int i;
 
 	nm_log_info (LOGD_VPN, "VPN connection '%s' (IP6 Config Get) reply received.",
-	             nm_vpn_connection_get_name (connection));
+	             nm_connection_get_id (priv->connection));
 
 	if (g_hash_table_size (config_hash) == 0) {
 		priv->has_ip6 = FALSE;
@@ -1073,7 +1057,7 @@ nm_vpn_connection_ip_config_timeout (gpointer user_data)
 	 */
 	if (nm_vpn_connection_get_vpn_state (connection) == NM_VPN_CONNECTION_STATE_IP_CONFIG_GET) {
 		nm_log_warn (LOGD_VPN, "VPN connection '%s' (IP Config Get) timeout exceeded.",
-		             nm_vpn_connection_get_name (connection));
+		             nm_connection_get_id (priv->connection));
 		nm_vpn_connection_set_vpn_state (connection,
 		                                 NM_VPN_CONNECTION_STATE_FAILED,
 		                                 NM_VPN_CONNECTION_STATE_REASON_CONNECT_TIMEOUT);
@@ -1089,11 +1073,11 @@ nm_vpn_connection_connect_cb (DBusGProxy *proxy, GError *err, gpointer user_data
 	NMVPNConnectionPrivate *priv = NM_VPN_CONNECTION_GET_PRIVATE (connection);
 
 	nm_log_info (LOGD_VPN, "VPN connection '%s' (Connect) reply received.",
-	             nm_vpn_connection_get_name (connection));
+	             nm_connection_get_id (priv->connection));
 
 	if (err) {
 		nm_log_warn (LOGD_VPN, "VPN connection '%s' failed to connect: '%s'.", 
-		             nm_vpn_connection_get_name (connection), err->message);
+		             nm_connection_get_id (priv->connection), err->message);
 		nm_vpn_connection_set_vpn_state (connection,
 		                                 NM_VPN_CONNECTION_STATE_FAILED,
 		                                 NM_VPN_CONNECTION_STATE_REASON_SERVICE_START_FAILED);
@@ -1219,20 +1203,6 @@ nm_vpn_connection_activate (NMVPNConnection *connection)
 	                                 NM_VPN_CONNECTION_STATE_REASON_NONE);
 }
 
-const char *
-nm_vpn_connection_get_name (NMVPNConnection *connection)
-{
-	NMVPNConnectionPrivate *priv;
-	NMSettingConnection *s_con;
-
-	g_return_val_if_fail (NM_IS_VPN_CONNECTION (connection), NULL);
-
-	priv = NM_VPN_CONNECTION_GET_PRIVATE (connection);
-	s_con = nm_connection_get_setting_connection (priv->connection);
-
-	return nm_setting_connection_get_id (s_con);
-}
-
 NMConnection *
 nm_vpn_connection_get_connection (NMVPNConnection *connection)
 {
@@ -1431,11 +1401,13 @@ get_secrets (NMVPNConnection *self, SecretsReq secrets_idx)
 	NMVPNConnectionPrivate *priv = NM_VPN_CONNECTION_GET_PRIVATE (self);
 	NMSettingsGetSecretsFlags flags = NM_SETTINGS_GET_SECRETS_FLAG_NONE;
 	GError *error = NULL;
-	gboolean filter_by_uid = priv->user_requested;
+	gboolean filter_by_uid;
 
 	g_return_if_fail (secrets_idx < SECRETS_REQ_LAST);
 	priv->secrets_idx = secrets_idx;
 
+	filter_by_uid = nm_active_connection_get_user_requested (NM_ACTIVE_CONNECTION (self));
+
 	nm_log_dbg (LOGD_VPN, "(%s/%s) requesting VPN secrets pass #%d",
 	            nm_connection_get_uuid (priv->connection),
 	            nm_connection_get_id (priv->connection),
@@ -1456,12 +1428,12 @@ get_secrets (NMVPNConnection *self, SecretsReq secrets_idx)
 		g_assert_not_reached ();
 	}
 
-	if (priv->user_requested)
+	if (nm_active_connection_get_user_requested (NM_ACTIVE_CONNECTION (self)))
 		flags |= NM_SETTINGS_GET_SECRETS_FLAG_USER_REQUESTED;
 
 	priv->secrets_id = nm_settings_connection_get_secrets (NM_SETTINGS_CONNECTION (priv->connection),
 	                                                       filter_by_uid,
-	                                                       priv->user_uid,
+	                                                       nm_active_connection_get_user_uid (NM_ACTIVE_CONNECTION (self)),
 	                                                       NM_SETTING_VPN_SETTING_NAME,
 	                                                       flags,
 	                                                       NULL,
@@ -1486,6 +1458,35 @@ nm_vpn_connection_init (NMVPNConnection *self)
 	NM_VPN_CONNECTION_GET_PRIVATE (self)->vpn_state = NM_VPN_CONNECTION_STATE_PREPARE;
 }
 
+static void
+constructed (GObject *object)
+{
+	NMVPNConnectionPrivate *priv = NM_VPN_CONNECTION_GET_PRIVATE (object);
+	NMConnection *connection;
+	NMDevice *device;
+
+	G_OBJECT_CLASS (nm_vpn_connection_parent_class)->constructed (object);
+
+	connection = nm_active_connection_get_connection (NM_ACTIVE_CONNECTION (object));
+	priv->connection = g_object_ref (connection);
+
+	device = (NMDevice *) nm_active_connection_get_device (NM_ACTIVE_CONNECTION (object));
+	g_assert (device);
+
+	priv->parent_dev = g_object_ref (device);
+
+	priv->device_monitor = g_signal_connect (device, "state-changed",
+	                                         G_CALLBACK (device_state_changed),
+	                                         object);
+
+	priv->device_ip4 = g_signal_connect (device, "notify::" NM_DEVICE_IP4_CONFIG,
+	                                     G_CALLBACK (device_ip4_config_changed),
+	                                     object);
+	priv->device_ip6 = g_signal_connect (device, "notify::" NM_DEVICE_IP6_CONFIG,
+	                                     G_CALLBACK (device_ip6_config_changed),
+	                                     object);
+}
+
 static void
 dispose (GObject *object)
 {
@@ -1512,7 +1513,7 @@ dispose (GObject *object)
 	if (priv->device_monitor)
 		g_signal_handler_disconnect (priv->parent_dev, priv->device_monitor);
 
-	g_object_unref (priv->parent_dev);
+	g_clear_object (&priv->parent_dev);
 
 	if (priv->ip4_config)
 		g_object_unref (priv->ip4_config);
@@ -1530,7 +1531,7 @@ dispose (GObject *object)
 		                                       priv->secrets_id);
 	}
 
-	g_object_unref (priv->connection);
+	g_clear_object (&priv->connection);
 	g_free (priv->username);
 
 	G_OBJECT_CLASS (nm_vpn_connection_parent_class)->dispose (object);
@@ -1578,6 +1579,7 @@ nm_vpn_connection_class_init (NMVPNConnectionClass *connection_class)
 
 	/* virtual methods */
 	object_class->get_property = get_property;
+	object_class->constructed = constructed;
 	object_class->dispose = dispose;
 	object_class->finalize = finalize;
 
diff --git a/src/vpn-manager/nm-vpn-connection.h b/src/vpn-manager/nm-vpn-connection.h
index 98bf14f1..bf543345 100644
--- a/src/vpn-manager/nm-vpn-connection.h
+++ b/src/vpn-manager/nm-vpn-connection.h
@@ -72,7 +72,6 @@ NMVPNConnection * nm_vpn_connection_new (NMConnection *connection,
 
 void                 nm_vpn_connection_activate        (NMVPNConnection *connection);
 NMConnection *       nm_vpn_connection_get_connection  (NMVPNConnection *connection);
-const char *         nm_vpn_connection_get_name        (NMVPNConnection *connection);
 NMVPNConnectionState nm_vpn_connection_get_vpn_state   (NMVPNConnection *connection);
 const char *         nm_vpn_connection_get_banner      (NMVPNConnection *connection);
 void                 nm_vpn_connection_fail            (NMVPNConnection *connection,
diff --git a/src/vpn-manager/nm-vpn-manager.c b/src/vpn-manager/nm-vpn-manager.c
index 8bfa82ae..7743fddd 100644
--- a/src/vpn-manager/nm-vpn-manager.c
+++ b/src/vpn-manager/nm-vpn-manager.c
@@ -15,7 +15,7 @@
  * with this program; if not, write to the Free Software Foundation, Inc.,
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  *
- * Copyright (C) 2005 - 2011 Red Hat, Inc.
+ * Copyright (C) 2005 - 2012 Red Hat, Inc.
  * Copyright (C) 2006 - 2008 Novell, Inc.
  */
 
@@ -44,15 +44,6 @@ typedef struct {
 	guint monitor_id;
 } NMVPNManagerPrivate;
 
-enum {
-	CONNECTION_ACTIVATED,
-	CONNECTION_DEACTIVATED,
-
-	LAST_SIGNAL
-};
-
-static guint signals[LAST_SIGNAL] = { 0 };
-
 GQuark
 nm_vpn_manager_error_quark (void)
 {
@@ -91,7 +82,7 @@ find_active_vpn_connection_by_connection (NMVPNManager *self, NMConnection *conn
 	NMVPNManagerPrivate *priv = NM_VPN_MANAGER_GET_PRIVATE (self);
 	GHashTableIter iter;
 	gpointer data;
-	GSList *active, *aiter;
+	const GSList *active, *aiter;
 	NMVPNConnection *found = NULL;
 
 	g_return_val_if_fail (connection, NULL);
@@ -108,33 +99,10 @@ find_active_vpn_connection_by_connection (NMVPNManager *self, NMConnection *conn
 				break;
 			}
 		}
-		g_slist_free (active);
 	}
 	return found;
 }
 
-static void
-connection_vpn_state_changed (NMVPNConnection *connection,
-                              NMVPNConnectionState new_state,
-                              NMVPNConnectionState old_state,
-                              NMVPNConnectionStateReason reason,
-                              gpointer user_data)
-{
-	NMVPNManager *manager = NM_VPN_MANAGER (user_data);
-
-	switch (new_state) {
-	case NM_VPN_CONNECTION_STATE_ACTIVATED:
-		g_signal_emit (manager, signals[CONNECTION_ACTIVATED], 0, connection);
-		break;
-	case NM_VPN_CONNECTION_STATE_FAILED:
-	case NM_VPN_CONNECTION_STATE_DISCONNECTED:
-		g_signal_emit (manager, signals[CONNECTION_DEACTIVATED], 0, connection, new_state, old_state, reason);
-		break;
-	default:
-		break;
-	}
-}
-
 NMActiveConnection *
 nm_vpn_manager_activate_connection (NMVPNManager *manager,
                                     NMConnection *connection,
@@ -155,7 +123,8 @@ nm_vpn_manager_activate_connection (NMVPNManager *manager,
 	g_return_val_if_fail (error != NULL, NULL);
 	g_return_val_if_fail (*error == NULL, NULL);
 
-	if (nm_device_get_state (device) != NM_DEVICE_STATE_ACTIVATED) {
+	if (   nm_device_get_state (device) != NM_DEVICE_STATE_ACTIVATED
+	    && nm_device_get_state (device) != NM_DEVICE_STATE_SECONDARIES) {
 		g_set_error (error,
 		             NM_VPN_MANAGER_ERROR, NM_VPN_MANAGER_ERROR_DEVICE_NOT_ACTIVE,
 		             "%s", "The base device for the VPN connection was not active.");
@@ -187,142 +156,48 @@ nm_vpn_manager_activate_connection (NMVPNManager *manager,
 		return NULL;
 	}
 
-	vpn = nm_vpn_service_activate (service, connection, device, specific_object, user_requested, user_uid, error);
-	if (vpn) {
-		g_signal_connect (vpn, NM_VPN_CONNECTION_INTERNAL_STATE_CHANGED,
-		                  G_CALLBACK (connection_vpn_state_changed),
-		                  manager);
-	}
-
-	return (NMActiveConnection *) vpn;
+	return (NMActiveConnection *) nm_vpn_service_activate (service,
+	                                                       connection,
+	                                                       device,
+	                                                       specific_object,
+	                                                       user_requested,
+	                                                       user_uid,
+	                                                       error);
 }
 
 gboolean
 nm_vpn_manager_deactivate_connection (NMVPNManager *self,
-                                      const char *path,
+                                      NMVPNConnection *connection,
                                       NMVPNConnectionStateReason reason)
 {
 	NMVPNManagerPrivate *priv;
 	GHashTableIter iter;
 	gpointer data;
-	GSList *active, *aiter;
+	const GSList *active, *aiter;
 	gboolean success = FALSE;
 
 	g_return_val_if_fail (self, FALSE);
 	g_return_val_if_fail (NM_IS_VPN_MANAGER (self), FALSE);
-	g_return_val_if_fail (path != NULL, FALSE);
+	g_return_val_if_fail (connection != NULL, FALSE);
 
 	priv = NM_VPN_MANAGER_GET_PRIVATE (self);
 	g_hash_table_iter_init (&iter, priv->services);
 	while (g_hash_table_iter_next (&iter, NULL, &data) && (success == FALSE)) {
 		active = nm_vpn_service_get_active_connections (NM_VPN_SERVICE (data));
 		for (aiter = active; aiter; aiter = g_slist_next (aiter)) {
-			NMVPNConnection *vpn = NM_VPN_CONNECTION (aiter->data);
-			const char *vpn_path;
+			NMVPNConnection *candidate = aiter->data;
 
-			vpn_path = nm_active_connection_get_path (NM_ACTIVE_CONNECTION (vpn));
-			if (!strcmp (path, vpn_path)) {
-				nm_vpn_connection_disconnect (vpn, reason);
+			if (connection == candidate) {
+				nm_vpn_connection_disconnect (connection, reason);
 				success = TRUE;
 				break;
 			}
 		}
-		g_slist_free (active);
 	}
 
 	return success;
 }
 
-void
-nm_vpn_manager_add_active_connections (NMVPNManager *self,
-                                       NMConnection *filter,
-                                       GPtrArray *array)
-{
-	NMVPNManagerPrivate *priv;
-	GHashTableIter iter;
-	gpointer data;
-	GSList *active, *aiter;
-
-	g_return_if_fail (self);
-	g_return_if_fail (NM_IS_VPN_MANAGER (self));
-	g_return_if_fail (array != NULL);
-
-	priv = NM_VPN_MANAGER_GET_PRIVATE (self);
-	g_hash_table_iter_init (&iter, priv->services);
-	while (g_hash_table_iter_next (&iter, NULL, &data)) {
-		active = nm_vpn_service_get_active_connections (NM_VPN_SERVICE (data));
-		for (aiter = active; aiter; aiter = g_slist_next (aiter)) {
-			NMVPNConnection *vpn = NM_VPN_CONNECTION (aiter->data);
-			const char *path;
-
-			if (!filter || (nm_vpn_connection_get_connection (vpn) == filter)) {
-				path = nm_active_connection_get_path (NM_ACTIVE_CONNECTION (vpn));
-				g_ptr_array_add (array, g_strdup (path));
-			}
-		}
-		g_slist_free (active);
-	}
-}
-
-GSList *
-nm_vpn_manager_get_active_connections (NMVPNManager *self)
-{
-	NMVPNManagerPrivate *priv;
-	GHashTableIter iter;
-	gpointer data;
-	GSList *list = NULL, *active;
-
-	g_return_val_if_fail (self, NULL);
-	g_return_val_if_fail (NM_IS_VPN_MANAGER (self), NULL);
-
-	priv = NM_VPN_MANAGER_GET_PRIVATE (self);
-	g_hash_table_iter_init (&iter, priv->services);
-	while (g_hash_table_iter_next (&iter, NULL, &data)) {
-		active = nm_vpn_service_get_active_connections (NM_VPN_SERVICE (data));
-		list = g_slist_concat (list, active);
-	}
-	return list;
-}
-
-NMVPNConnection *
-nm_vpn_manager_get_vpn_connection_for_active (NMVPNManager *manager,
-                                              const char *active_path)
-{
-	NMVPNManagerPrivate *priv;
-	GHashTableIter iter;
-	gpointer data;
-	GSList *active, *elt;
-
-	g_return_val_if_fail (NM_IS_VPN_MANAGER (manager), NULL);
-
-	priv = NM_VPN_MANAGER_GET_PRIVATE (manager);
-	g_hash_table_iter_init (&iter, priv->services);
-	while (g_hash_table_iter_next (&iter, NULL, &data)) {
-		active = nm_vpn_service_get_active_connections (NM_VPN_SERVICE (data));
-		for (elt = active; elt; elt = g_slist_next (elt)) {
-			NMVPNConnection *vpn = NM_VPN_CONNECTION (elt->data);
-			const char *ac_path;
-
-			ac_path = nm_active_connection_get_path (NM_ACTIVE_CONNECTION (vpn));
-			if (ac_path && !strcmp (ac_path, active_path))
-				return vpn;
-		}
-	}
-
-	return NULL;
-}
-
-NMConnection *
-nm_vpn_manager_get_connection_for_active (NMVPNManager *manager,
-                                          const char *active_path)
-{
-	NMVPNConnection *vpn_con;
-
-	vpn_con = nm_vpn_manager_get_vpn_connection_for_active (manager, active_path);
-
-	return vpn_con ? nm_vpn_connection_get_connection (vpn_con) : NULL;
-}
-
 static char *
 service_name_from_file (const char *path)
 {
@@ -506,23 +381,6 @@ nm_vpn_manager_class_init (NMVPNManagerClass *manager_class)
 	/* virtual methods */
 	object_class->dispose = dispose;
 
-	/* signals */
-	signals[CONNECTION_ACTIVATED] =
-		g_signal_new ("connection-activated",
-				    G_OBJECT_CLASS_TYPE (object_class),
-				    G_SIGNAL_RUN_FIRST,
-				    0, NULL, NULL,
-				    g_cclosure_marshal_VOID__OBJECT,
-				    G_TYPE_NONE, 1, G_TYPE_OBJECT);
-
-	signals[CONNECTION_DEACTIVATED] =
-		g_signal_new ("connection-deactivated",
-				    G_OBJECT_CLASS_TYPE (object_class),
-				    G_SIGNAL_RUN_FIRST,
-				    0, NULL, NULL,
-				    _nm_marshal_VOID__OBJECT_UINT_UINT_UINT,
-				    G_TYPE_NONE, 4, G_TYPE_OBJECT, G_TYPE_UINT, G_TYPE_UINT, G_TYPE_UINT);
-
 	dbus_g_error_domain_register (NM_VPN_MANAGER_ERROR, NULL, NM_TYPE_VPN_MANAGER_ERROR);
 }
 
diff --git a/src/vpn-manager/nm-vpn-manager.h b/src/vpn-manager/nm-vpn-manager.h
index efae161e..1d398ea2 100644
--- a/src/vpn-manager/nm-vpn-manager.h
+++ b/src/vpn-manager/nm-vpn-manager.h
@@ -53,16 +53,6 @@ typedef struct {
 
 typedef struct {
 	GObjectClass parent;
-
-	/* Signals */
-	void (*connection_activated) (NMVPNManager *manager,
-	                              NMVPNConnection *connection);
-
-	void (*connection_deactivated) (NMVPNManager *manager,
-	                                NMVPNConnection *connection,
-	                                NMVPNConnectionState new_state,
-	                                NMVPNConnectionState old_state,
-	                                NMVPNConnectionStateReason reason);
 } NMVPNManagerClass;
 
 GType nm_vpn_manager_get_type (void);
@@ -78,19 +68,7 @@ NMActiveConnection *nm_vpn_manager_activate_connection (NMVPNManager *manager,
                                                         GError **error);
 
 gboolean nm_vpn_manager_deactivate_connection (NMVPNManager *manager,
-                                               const char *path,
+                                               NMVPNConnection *connection,
                                                NMVPNConnectionStateReason reason);
 
-void nm_vpn_manager_add_active_connections (NMVPNManager *manager,
-                                            NMConnection *filter,
-                                            GPtrArray *list);
-
-GSList *nm_vpn_manager_get_active_connections (NMVPNManager *manager);
-
-NMVPNConnection *nm_vpn_manager_get_vpn_connection_for_active (NMVPNManager *manager,
-                                                               const char *active_path);
-
-NMConnection *nm_vpn_manager_get_connection_for_active (NMVPNManager *manager,
-                                                        const char *active_path);
-
 #endif /* NM_VPN_MANAGER_H */
diff --git a/src/vpn-manager/nm-vpn-service.c b/src/vpn-manager/nm-vpn-service.c
index 8fdf6c16..668cbf2e 100644
--- a/src/vpn-manager/nm-vpn-service.c
+++ b/src/vpn-manager/nm-vpn-service.c
@@ -355,7 +355,7 @@ nm_vpn_service_activate (NMVPNService *service,
 	                  G_CALLBACK (connection_vpn_state_changed),
 	                  service);
 
-	priv->connections = g_slist_prepend (priv->connections, vpn);
+	priv->connections = g_slist_prepend (priv->connections, g_object_ref (vpn));
 
 	if (nm_dbus_manager_name_has_owner (priv->dbus_mgr, priv->dbus_service)) {
 		// FIXME: fill in error when errors happen
@@ -369,12 +369,12 @@ nm_vpn_service_activate (NMVPNService *service,
 	return vpn;
 }
 
-GSList *
+const GSList *
 nm_vpn_service_get_active_connections (NMVPNService *service)
 {
 	g_return_val_if_fail (NM_IS_VPN_SERVICE (service), NULL);
 
-	return g_slist_copy (NM_VPN_SERVICE_GET_PRIVATE (service)->connections);
+	return NM_VPN_SERVICE_GET_PRIVATE (service)->connections;
 }
 
 static void
diff --git a/src/vpn-manager/nm-vpn-service.h b/src/vpn-manager/nm-vpn-service.h
index 6ccdcc47..e883d55f 100644
--- a/src/vpn-manager/nm-vpn-service.h
+++ b/src/vpn-manager/nm-vpn-service.h
@@ -62,7 +62,7 @@ NMVPNConnection * nm_vpn_service_activate (NMVPNService *service,
                                            gulong user_uid,
                                            GError **error);
 
-GSList * nm_vpn_service_get_active_connections (NMVPNService *service);
+const GSList *nm_vpn_service_get_active_connections (NMVPNService *service);
 
 void nm_vpn_service_connections_stop (NMVPNService *service,
                                       gboolean fail,
diff --git a/src/wifi/Makefile.in b/src/wifi/Makefile.in
index f3d4499f..5019bbeb 100644
--- a/src/wifi/Makefile.in
+++ b/src/wifi/Makefile.in
@@ -56,16 +56,18 @@ subdir = src/wifi
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/compiler_warnings.m4 \
-	$(top_srcdir)/m4/gettext.m4 $(top_srcdir)/m4/gtk-doc.m4 \
-	$(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/intlmacosx.m4 \
-	$(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/introspection.m4 \
-	$(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \
-	$(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/libnl-check.m4 \
-	$(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \
-	$(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
-	$(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/nls.m4 \
-	$(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/progtest.m4 \
-	$(top_srcdir)/m4/vapigen.m4 $(top_srcdir)/configure.ac
+	$(top_srcdir)/m4/gettext.m4 \
+	$(top_srcdir)/m4/gnome-code-coverage.m4 \
+	$(top_srcdir)/m4/gtk-doc.m4 $(top_srcdir)/m4/iconv.m4 \
+	$(top_srcdir)/m4/intlmacosx.m4 $(top_srcdir)/m4/intltool.m4 \
+	$(top_srcdir)/m4/introspection.m4 $(top_srcdir)/m4/lib-ld.m4 \
+	$(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \
+	$(top_srcdir)/m4/libnl-check.m4 $(top_srcdir)/m4/libtool.m4 \
+	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
+	$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
+	$(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/po.m4 \
+	$(top_srcdir)/m4/progtest.m4 $(top_srcdir)/m4/vapigen.m4 \
+	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(install_sh) -d
@@ -136,6 +138,10 @@ AWK = @AWK@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
+CKDB_PATH = @CKDB_PATH@
+CODE_COVERAGE_CFLAGS = @CODE_COVERAGE_CFLAGS@
+CODE_COVERAGE_ENABLED = @CODE_COVERAGE_ENABLED@
+CODE_COVERAGE_LDFLAGS = @CODE_COVERAGE_LDFLAGS@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CXX = @CXX@
@@ -150,9 +156,7 @@ DBUS_SYS_DIR = @DBUS_SYS_DIR@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
 DHCLIENT_PATH = @DHCLIENT_PATH@
-DHCLIENT_VERSION = @DHCLIENT_VERSION@
 DHCPCD_PATH = @DHCPCD_PATH@
-DISABLE_DEPRECATED = @DISABLE_DEPRECATED@
 DLLTOOL = @DLLTOOL@
 DSYMUTIL = @DSYMUTIL@
 DUMPBIN = @DUMPBIN@
@@ -162,17 +166,14 @@ ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
 FGREP = @FGREP@
+GENHTML = @GENHTML@
 GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
 GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
-GIO_CFLAGS = @GIO_CFLAGS@
-GIO_LIBS = @GIO_LIBS@
 GLIB_CFLAGS = @GLIB_CFLAGS@
 GLIB_GENMARSHAL = @GLIB_GENMARSHAL@
 GLIB_LIBS = @GLIB_LIBS@
 GLIB_MAKEFILE = @GLIB_MAKEFILE@
 GLIB_MKENUMS = @GLIB_MKENUMS@
-GMODULE_CFLAGS = @GMODULE_CFLAGS@
-GMODULE_LIBS = @GMODULE_LIBS@
 GMSGFMT = @GMSGFMT@
 GMSGFMT_015 = @GMSGFMT_015@
 GNUTLS_CFLAGS = @GNUTLS_CFLAGS@
@@ -213,6 +214,7 @@ IPTABLES_PATH = @IPTABLES_PATH@
 IWMX_SDK_CFLAGS = @IWMX_SDK_CFLAGS@
 IWMX_SDK_LIBS = @IWMX_SDK_LIBS@
 KERNEL_FIRMWARE_DIR = @KERNEL_FIRMWARE_DIR@
+LCOV = @LCOV@
 LD = @LD@
 LDFLAGS = @LDFLAGS@
 LIBDL = @LIBDL@
@@ -229,11 +231,7 @@ LIBNL2_LIBS = @LIBNL2_LIBS@
 LIBNL3_CFLAGS = @LIBNL3_CFLAGS@
 LIBNL3_LIBS = @LIBNL3_LIBS@
 LIBNL_CFLAGS = @LIBNL_CFLAGS@
-LIBNL_GENL3_CFLAGS = @LIBNL_GENL3_CFLAGS@
-LIBNL_GENL3_LIBS = @LIBNL_GENL3_LIBS@
 LIBNL_LIBS = @LIBNL_LIBS@
-LIBNL_ROUTE3_CFLAGS = @LIBNL_ROUTE3_CFLAGS@
-LIBNL_ROUTE3_LIBS = @LIBNL_ROUTE3_LIBS@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
 LIBSOUP_CFLAGS = @LIBSOUP_CFLAGS@
@@ -248,6 +246,8 @@ MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MANIFEST_TOOL = @MANIFEST_TOOL@
 MKDIR_P = @MKDIR_P@
+MM_GLIB_CFLAGS = @MM_GLIB_CFLAGS@
+MM_GLIB_LIBS = @MM_GLIB_LIBS@
 MOC = @MOC@
 MSGFMT = @MSGFMT@
 MSGFMT_015 = @MSGFMT_015@
@@ -257,6 +257,7 @@ NMEDIT = @NMEDIT@
 NM_MAJOR_VERSION = @NM_MAJOR_VERSION@
 NM_MICRO_VERSION = @NM_MICRO_VERSION@
 NM_MINOR_VERSION = @NM_MINOR_VERSION@
+NM_MODIFY_SYSTEM_POLICY = @NM_MODIFY_SYSTEM_POLICY@
 NM_VERSION = @NM_VERSION@
 NSS_CFLAGS = @NSS_CFLAGS@
 NSS_LIBS = @NSS_LIBS@
@@ -283,13 +284,14 @@ PPPD_PLUGIN_DIR = @PPPD_PLUGIN_DIR@
 QT_CFLAGS = @QT_CFLAGS@
 QT_LIBS = @QT_LIBS@
 RANLIB = @RANLIB@
-RESOLVCONF_PATH = @RESOLVCONF_PATH@
 SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
-SYSTEMD_CFLAGS = @SYSTEMD_CFLAGS@
-SYSTEMD_LIBS = @SYSTEMD_LIBS@
+SYSTEMD_INHIBIT_CFLAGS = @SYSTEMD_INHIBIT_CFLAGS@
+SYSTEMD_INHIBIT_LIBS = @SYSTEMD_INHIBIT_LIBS@
+SYSTEMD_LOGIN_CFLAGS = @SYSTEMD_LOGIN_CFLAGS@
+SYSTEMD_LOGIN_LIBS = @SYSTEMD_LOGIN_LIBS@
 SYSTEM_CA_PATH = @SYSTEM_CA_PATH@
 UDEV_BASE_DIR = @UDEV_BASE_DIR@
 USE_NLS = @USE_NLS@
@@ -344,6 +346,11 @@ localedir = @localedir@
 localstatedir = @localstatedir@
 mandir = @mandir@
 mkdir_p = @mkdir_p@
+nmbinary = @nmbinary@
+nmconfdir = @nmconfdir@
+nmdatadir = @nmdatadir@
+nmrundir = @nmrundir@
+nmstatedir = @nmstatedir@
 oldincludedir = @oldincludedir@
 pdfdir = @pdfdir@
 prefix = @prefix@
@@ -358,6 +365,10 @@ target_alias = @target_alias@
 top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
+with_dhclient = @with_dhclient@
+with_dhcpcd = @with_dhcpcd@
+with_netconfig = @with_netconfig@
+with_resolvconf = @with_resolvconf@
 INCLUDES = \
 	-I${top_srcdir}/include \
 	-I${top_builddir}/include \
@@ -437,25 +448,22 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libwifi_utils_la-wifi-utils.Plo@am__quote@
 
 .c.o:
-@am__fastdepCC_TRUE@	$(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\
-@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
-@am__fastdepCC_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.Po
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $<
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c $<
 
 .c.obj:
-@am__fastdepCC_TRUE@	$(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.obj$$||'`;\
-@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ `$(CYGPATH_W) '$<'` &&\
-@am__fastdepCC_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.Po
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c `$(CYGPATH_W) '$<'`
 
 .c.lo:
-@am__fastdepCC_TRUE@	$(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.lo$$||'`;\
-@am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
-@am__fastdepCC_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.Plo
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $<
diff --git a/src/wifi/wifi-utils-nl80211.c b/src/wifi/wifi-utils-nl80211.c
index 663cbc26..62ec6c2b 100644
--- a/src/wifi/wifi-utils-nl80211.c
+++ b/src/wifi/wifi-utils-nl80211.c
@@ -108,7 +108,6 @@ _nl80211_send_and_recv (struct nl_sock *nl_sock,
 	int err, done;
 
 	g_return_val_if_fail (msg != NULL, -ENOMEM);
-	g_return_val_if_fail (valid_handler != NULL, -EINVAL);
 
 	cb = nl_cb_clone (nl_cb);
 	if (!cb) {
@@ -124,7 +123,8 @@ _nl80211_send_and_recv (struct nl_sock *nl_sock,
 	nl_cb_err (cb, NL_CB_CUSTOM, error_handler, &done);
 	nl_cb_set (cb, NL_CB_FINISH, NL_CB_CUSTOM, finish_handler, &done);
 	nl_cb_set (cb, NL_CB_ACK, NL_CB_CUSTOM, ack_handler, &done);
-	nl_cb_set (cb, NL_CB_VALID, NL_CB_CUSTOM, valid_handler, valid_data);
+	if (valid_handler)
+		nl_cb_set (cb, NL_CB_VALID, NL_CB_CUSTOM, valid_handler, valid_data);
 
 	/* Loop until one of our NL callbacks says we're done; on success
 	 * done will be 1, on error it will be < 0.
@@ -187,6 +187,9 @@ static int nl80211_iface_info_handler (struct nl_msg *msg, void *arg)
 	case NL80211_IFTYPE_ADHOC:
 		info->mode = NM_802_11_MODE_ADHOC;
 		break;
+	case NL80211_IFTYPE_AP:
+		info->mode = NM_802_11_MODE_AP;
+		break;
 	case NL80211_IFTYPE_STATION:
 		info->mode = NM_802_11_MODE_INFRA;
 		break;
@@ -216,12 +219,32 @@ wifi_nl80211_get_mode (WifiData *data)
 static gboolean
 wifi_nl80211_set_mode (WifiData *data, const NM80211Mode mode)
 {
-	/*
-	 * Used only to set mode for scanning as some old cards
-	 * don't properly scan in IBSS mode, nl80211 cards are
-	 * expected to scan properly so ignore this.
-	 */
-	return TRUE;
+	WifiDataNl80211 *nl80211 = (WifiDataNl80211 *) data;
+	struct nl_msg *msg;
+	int err;
+
+	msg = nl80211_alloc_msg (nl80211, NL80211_CMD_SET_INTERFACE, 0);
+
+	switch (mode) {
+	case NM_802_11_MODE_INFRA:
+		NLA_PUT_U32 (msg, NL80211_ATTR_IFTYPE, NL80211_IFTYPE_STATION);
+		break;
+	case NM_802_11_MODE_ADHOC:
+		NLA_PUT_U32 (msg, NL80211_ATTR_IFTYPE, NL80211_IFTYPE_ADHOC);
+		break;
+	case NM_802_11_MODE_AP:
+		NLA_PUT_U32 (msg, NL80211_ATTR_IFTYPE, NL80211_IFTYPE_AP);
+		break;
+	default:
+		g_assert_not_reached ();
+	}
+
+	err = nl80211_send_and_recv (nl80211, msg, NULL, NULL);
+	return err ? FALSE : TRUE;
+
+ nla_put_failure:
+	nlmsg_free (msg);
+	return FALSE;
 }
 
 /* @divisor: pass what value @xbm should be divided by to get dBm */
diff --git a/src/wifi/wifi-utils-wext.c b/src/wifi/wifi-utils-wext.c
index 75d00f41..37cd94e9 100644
--- a/src/wifi/wifi-utils-wext.c
+++ b/src/wifi/wifi-utils-wext.c
@@ -118,6 +118,8 @@ wifi_wext_get_mode (WifiData *data)
 	switch (wrq.u.mode) {
 	case IW_MODE_ADHOC:
 		return NM_802_11_MODE_ADHOC;
+	case IW_MODE_MASTER:
+		return NM_802_11_MODE_AP;
 	case IW_MODE_INFRA:
 		return NM_802_11_MODE_INFRA;
 	default:
@@ -140,6 +142,9 @@ wifi_wext_set_mode (WifiData *data, const NM80211Mode mode)
 	case NM_802_11_MODE_ADHOC:
 		wrq.u.mode = IW_MODE_ADHOC;
 		break;
+	case NM_802_11_MODE_AP:
+		wrq.u.mode = IW_MODE_MASTER;
+		break;
 	case NM_802_11_MODE_INFRA:
 		wrq.u.mode = IW_MODE_INFRA;
 		break;
diff --git a/src/wifi/wifi-utils.c b/src/wifi/wifi-utils.c
index a99a4b7b..fc491ec4 100644
--- a/src/wifi/wifi-utils.c
+++ b/src/wifi/wifi-utils.c
@@ -96,7 +96,9 @@ gboolean
 wifi_utils_set_mode (WifiData *data, const NM80211Mode mode)
 {
 	g_return_val_if_fail (data != NULL, FALSE);
-	g_return_val_if_fail ((mode == NM_802_11_MODE_INFRA) || (mode == NM_802_11_MODE_ADHOC), FALSE);
+	g_return_val_if_fail (   (mode == NM_802_11_MODE_INFRA)
+	                      || (mode == NM_802_11_MODE_AP)
+	                      || (mode == NM_802_11_MODE_ADHOC), FALSE);
 
 	/* nl80211 probably doesn't need this */
 	return data->set_mode ? data->set_mode (data, mode) : TRUE;
diff --git a/src/wimax/Makefile.in b/src/wimax/Makefile.in
index 6c15e97d..8e235277 100644
--- a/src/wimax/Makefile.in
+++ b/src/wimax/Makefile.in
@@ -55,16 +55,18 @@ subdir = src/wimax
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/compiler_warnings.m4 \
-	$(top_srcdir)/m4/gettext.m4 $(top_srcdir)/m4/gtk-doc.m4 \
-	$(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/intlmacosx.m4 \
-	$(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/introspection.m4 \
-	$(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \
-	$(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/libnl-check.m4 \
-	$(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \
-	$(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
-	$(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/nls.m4 \
-	$(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/progtest.m4 \
-	$(top_srcdir)/m4/vapigen.m4 $(top_srcdir)/configure.ac
+	$(top_srcdir)/m4/gettext.m4 \
+	$(top_srcdir)/m4/gnome-code-coverage.m4 \
+	$(top_srcdir)/m4/gtk-doc.m4 $(top_srcdir)/m4/iconv.m4 \
+	$(top_srcdir)/m4/intlmacosx.m4 $(top_srcdir)/m4/intltool.m4 \
+	$(top_srcdir)/m4/introspection.m4 $(top_srcdir)/m4/lib-ld.m4 \
+	$(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \
+	$(top_srcdir)/m4/libnl-check.m4 $(top_srcdir)/m4/libtool.m4 \
+	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
+	$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
+	$(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/po.m4 \
+	$(top_srcdir)/m4/progtest.m4 $(top_srcdir)/m4/vapigen.m4 \
+	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(install_sh) -d
@@ -167,6 +169,10 @@ AWK = @AWK@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
+CKDB_PATH = @CKDB_PATH@
+CODE_COVERAGE_CFLAGS = @CODE_COVERAGE_CFLAGS@
+CODE_COVERAGE_ENABLED = @CODE_COVERAGE_ENABLED@
+CODE_COVERAGE_LDFLAGS = @CODE_COVERAGE_LDFLAGS@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CXX = @CXX@
@@ -181,9 +187,7 @@ DBUS_SYS_DIR = @DBUS_SYS_DIR@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
 DHCLIENT_PATH = @DHCLIENT_PATH@
-DHCLIENT_VERSION = @DHCLIENT_VERSION@
 DHCPCD_PATH = @DHCPCD_PATH@
-DISABLE_DEPRECATED = @DISABLE_DEPRECATED@
 DLLTOOL = @DLLTOOL@
 DSYMUTIL = @DSYMUTIL@
 DUMPBIN = @DUMPBIN@
@@ -193,17 +197,14 @@ ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
 FGREP = @FGREP@
+GENHTML = @GENHTML@
 GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
 GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
-GIO_CFLAGS = @GIO_CFLAGS@
-GIO_LIBS = @GIO_LIBS@
 GLIB_CFLAGS = @GLIB_CFLAGS@
 GLIB_GENMARSHAL = @GLIB_GENMARSHAL@
 GLIB_LIBS = @GLIB_LIBS@
 GLIB_MAKEFILE = @GLIB_MAKEFILE@
 GLIB_MKENUMS = @GLIB_MKENUMS@
-GMODULE_CFLAGS = @GMODULE_CFLAGS@
-GMODULE_LIBS = @GMODULE_LIBS@
 GMSGFMT = @GMSGFMT@
 GMSGFMT_015 = @GMSGFMT_015@
 GNUTLS_CFLAGS = @GNUTLS_CFLAGS@
@@ -244,6 +245,7 @@ IPTABLES_PATH = @IPTABLES_PATH@
 IWMX_SDK_CFLAGS = @IWMX_SDK_CFLAGS@
 IWMX_SDK_LIBS = @IWMX_SDK_LIBS@
 KERNEL_FIRMWARE_DIR = @KERNEL_FIRMWARE_DIR@
+LCOV = @LCOV@
 LD = @LD@
 LDFLAGS = @LDFLAGS@
 LIBDL = @LIBDL@
@@ -260,11 +262,7 @@ LIBNL2_LIBS = @LIBNL2_LIBS@
 LIBNL3_CFLAGS = @LIBNL3_CFLAGS@
 LIBNL3_LIBS = @LIBNL3_LIBS@
 LIBNL_CFLAGS = @LIBNL_CFLAGS@
-LIBNL_GENL3_CFLAGS = @LIBNL_GENL3_CFLAGS@
-LIBNL_GENL3_LIBS = @LIBNL_GENL3_LIBS@
 LIBNL_LIBS = @LIBNL_LIBS@
-LIBNL_ROUTE3_CFLAGS = @LIBNL_ROUTE3_CFLAGS@
-LIBNL_ROUTE3_LIBS = @LIBNL_ROUTE3_LIBS@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
 LIBSOUP_CFLAGS = @LIBSOUP_CFLAGS@
@@ -279,6 +277,8 @@ MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MANIFEST_TOOL = @MANIFEST_TOOL@
 MKDIR_P = @MKDIR_P@
+MM_GLIB_CFLAGS = @MM_GLIB_CFLAGS@
+MM_GLIB_LIBS = @MM_GLIB_LIBS@
 MOC = @MOC@
 MSGFMT = @MSGFMT@
 MSGFMT_015 = @MSGFMT_015@
@@ -288,6 +288,7 @@ NMEDIT = @NMEDIT@
 NM_MAJOR_VERSION = @NM_MAJOR_VERSION@
 NM_MICRO_VERSION = @NM_MICRO_VERSION@
 NM_MINOR_VERSION = @NM_MINOR_VERSION@
+NM_MODIFY_SYSTEM_POLICY = @NM_MODIFY_SYSTEM_POLICY@
 NM_VERSION = @NM_VERSION@
 NSS_CFLAGS = @NSS_CFLAGS@
 NSS_LIBS = @NSS_LIBS@
@@ -314,13 +315,14 @@ PPPD_PLUGIN_DIR = @PPPD_PLUGIN_DIR@
 QT_CFLAGS = @QT_CFLAGS@
 QT_LIBS = @QT_LIBS@
 RANLIB = @RANLIB@
-RESOLVCONF_PATH = @RESOLVCONF_PATH@
 SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
-SYSTEMD_CFLAGS = @SYSTEMD_CFLAGS@
-SYSTEMD_LIBS = @SYSTEMD_LIBS@
+SYSTEMD_INHIBIT_CFLAGS = @SYSTEMD_INHIBIT_CFLAGS@
+SYSTEMD_INHIBIT_LIBS = @SYSTEMD_INHIBIT_LIBS@
+SYSTEMD_LOGIN_CFLAGS = @SYSTEMD_LOGIN_CFLAGS@
+SYSTEMD_LOGIN_LIBS = @SYSTEMD_LOGIN_LIBS@
 SYSTEM_CA_PATH = @SYSTEM_CA_PATH@
 UDEV_BASE_DIR = @UDEV_BASE_DIR@
 USE_NLS = @USE_NLS@
@@ -375,6 +377,11 @@ localedir = @localedir@
 localstatedir = @localstatedir@
 mandir = @mandir@
 mkdir_p = @mkdir_p@
+nmbinary = @nmbinary@
+nmconfdir = @nmconfdir@
+nmdatadir = @nmdatadir@
+nmrundir = @nmrundir@
+nmstatedir = @nmstatedir@
 oldincludedir = @oldincludedir@
 pdfdir = @pdfdir@
 prefix = @prefix@
@@ -389,6 +396,10 @@ target_alias = @target_alias@
 top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
+with_dhclient = @with_dhclient@
+with_dhcpcd = @with_dhcpcd@
+with_netconfig = @with_netconfig@
+with_resolvconf = @with_resolvconf@
 INCLUDES = \
 	-I${top_srcdir}/src \
 	-I${top_builddir}/src/generated \
@@ -513,25 +524,22 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libnm_device_plugin_wimax_la-nm-wimax-util.Plo@am__quote@
 
 .c.o:
-@am__fastdepCC_TRUE@	$(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\
-@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
-@am__fastdepCC_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.Po
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $<
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c $<
 
 .c.obj:
-@am__fastdepCC_TRUE@	$(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.obj$$||'`;\
-@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ `$(CYGPATH_W) '$<'` &&\
-@am__fastdepCC_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.Po
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c `$(CYGPATH_W) '$<'`
 
 .c.lo:
-@am__fastdepCC_TRUE@	$(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.lo$$||'`;\
-@am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
-@am__fastdepCC_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.Plo
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $<
diff --git a/src/wimax/nm-device-wimax.c b/src/wimax/nm-device-wimax.c
index 1f1a622c..d549e67e 100644
--- a/src/wimax/nm-device-wimax.c
+++ b/src/wimax/nm-device-wimax.c
@@ -254,6 +254,8 @@ remove_all_nsps (NMDeviceWimax *self)
 		g_object_unref (nsp);
 	}
 
+	nm_device_recheck_available_connections (NM_DEVICE (self));
+
 	g_slist_free (priv->nsp_list);
 	priv->nsp_list = NULL;
 }
@@ -308,7 +310,7 @@ update_availability (NMDeviceWimax *self, gboolean old_available)
 /* NMDeviceInterface interface */
 
 static void
-real_set_enabled (NMDevice *device, gboolean enabled)
+set_enabled (NMDevice *device, gboolean enabled)
 {
 	NMDeviceWimax *self = NM_DEVICE_WIMAX (device);
 	NMDeviceWimaxPrivate *priv = NM_DEVICE_WIMAX_GET_PRIVATE (self);
@@ -345,7 +347,7 @@ real_set_enabled (NMDevice *device, gboolean enabled)
 /* NMDevice methods */
 
 static void
-real_take_down (NMDevice *device)
+take_down (NMDevice *device)
 {
 	NMDeviceWimax *self = NM_DEVICE_WIMAX (device);
 
@@ -354,13 +356,13 @@ real_take_down (NMDevice *device)
 }
 
 static gboolean
-real_hw_is_up (NMDevice *device)
+hw_is_up (NMDevice *device)
 {
 	return nm_system_iface_is_up (nm_device_get_ip_ifindex (device));
 }
 
 static gboolean
-real_hw_bring_up (NMDevice *dev, gboolean *no_firmware)
+hw_bring_up (NMDevice *dev, gboolean *no_firmware)
 {
 	NMDeviceWimaxPrivate *priv = NM_DEVICE_WIMAX_GET_PRIVATE (dev);
 
@@ -371,13 +373,13 @@ real_hw_bring_up (NMDevice *dev, gboolean *no_firmware)
 }
 
 static void
-real_hw_take_down (NMDevice *dev)
+hw_take_down (NMDevice *dev)
 {
 	nm_system_iface_set_up (nm_device_get_ip_ifindex (dev), FALSE, NULL);
 }
 
 static void
-real_update_hw_address (NMDevice *dev)
+update_hw_address (NMDevice *dev)
 {
 	NMDeviceWimax *self = NM_DEVICE_WIMAX (dev);
 	NMDeviceWimaxPrivate *priv = NM_DEVICE_WIMAX_GET_PRIVATE (self);
@@ -439,9 +441,9 @@ hwaddr_matches (NMDevice *device,
 }
 
 static gboolean
-real_check_connection_compatible (NMDevice *device,
-                                  NMConnection *connection,
-                                  GError **error)
+check_connection_compatible (NMDevice *device,
+                             NMConnection *connection,
+                             GError **error)
 {
 	NMDeviceWimaxPrivate *priv = NM_DEVICE_WIMAX_GET_PRIVATE (device);
 	NMSettingConnection *s_con;
@@ -480,11 +482,26 @@ real_check_connection_compatible (NMDevice *device,
 }
 
 static gboolean
-real_complete_connection (NMDevice *device,
-                          NMConnection *connection,
-                          const char *specific_object,
-                          const GSList *existing_connections,
-                          GError **error)
+check_connection_available (NMDevice *device, NMConnection *connection)
+{
+	NMDeviceWimaxPrivate *priv = NM_DEVICE_WIMAX_GET_PRIVATE (device);
+	const GSList *ns_iter = NULL;
+
+	/* Ensure the connection applies to an NSP in the scan list */
+	for (ns_iter = priv->nsp_list; ns_iter; ns_iter = ns_iter->next) {
+		if (nm_wimax_nsp_check_compatible (NM_WIMAX_NSP (ns_iter->data), connection))
+			return TRUE;
+	}
+
+	return FALSE;
+}
+
+static gboolean
+complete_connection (NMDevice *device,
+                     NMConnection *connection,
+                     const char *specific_object,
+                     const GSList *existing_connections,
+                     GError **error)
 {
 	NMDeviceWimax *self = NM_DEVICE_WIMAX (device);
 	NMDeviceWimaxPrivate *priv = NM_DEVICE_WIMAX_GET_PRIVATE (self);
@@ -592,9 +609,9 @@ real_complete_connection (NMDevice *device,
 }
 
 static NMConnection *
-real_get_best_auto_connection (NMDevice *device,
-                               GSList *connections,
-                               char **specific_object)
+get_best_auto_connection (NMDevice *device,
+                          GSList *connections,
+                          char **specific_object)
 {
 	NMDeviceWimaxPrivate *priv = NM_DEVICE_WIMAX_GET_PRIVATE (device);
 	GSList *iter;
@@ -638,13 +655,13 @@ real_get_best_auto_connection (NMDevice *device,
 }
 
 static guint32
-real_get_generic_capabilities (NMDevice *dev)
+get_generic_capabilities (NMDevice *dev)
 {
 	return NM_DEVICE_CAP_NM_SUPPORTED;
 }
 
 static gboolean
-real_is_available (NMDevice *device)
+is_available (NMDevice *device)
 {
 	NMDeviceWimaxPrivate *priv = NM_DEVICE_WIMAX_GET_PRIVATE (device);
 	const char *iface = nm_device_get_iface (device);
@@ -708,7 +725,7 @@ clear_connected_poll (NMDeviceWimax *self)
 }
 
 static NMActStageReturn
-real_act_stage1_prepare (NMDevice *device, NMDeviceStateReason *reason)
+act_stage1_prepare (NMDevice *device, NMDeviceStateReason *reason)
 {
 	NMDeviceWimaxPrivate *priv = NM_DEVICE_WIMAX_GET_PRIVATE (device);
 	NMActRequest *req;
@@ -756,7 +773,7 @@ real_act_stage1_prepare (NMDevice *device, NMDeviceStateReason *reason)
 }
 
 static NMActStageReturn
-real_act_stage2_config (NMDevice *device, NMDeviceStateReason *reason)
+act_stage2_config (NMDevice *device, NMDeviceStateReason *reason)
 {
 	NMDeviceWimaxPrivate *priv = NM_DEVICE_WIMAX_GET_PRIVATE (device);
 	NMConnection *connection;
@@ -824,7 +841,7 @@ force_disconnect (NMDeviceWimax *self, struct wmxsdk *sdk)
 }
 
 static void
-real_deactivate (NMDevice *device)
+deactivate (NMDevice *device)
 {
 	NMDeviceWimax *self = NM_DEVICE_WIMAX (device);
 	NMDeviceWimaxPrivate *priv = NM_DEVICE_WIMAX_GET_PRIVATE (self);
@@ -1070,6 +1087,9 @@ remove_outdated_nsps (NMDeviceWimax *self,
 		g_object_unref (nsp);
 	}
 
+	if (g_slist_length(to_remove) > 0)
+	    nm_device_recheck_available_connections (NM_DEVICE (self));
+
 	g_slist_free (to_remove);
 }
 
@@ -1117,6 +1137,7 @@ wmx_scan_result_cb (struct wmxsdk *wmxsdk,
 			priv->nsp_list = g_slist_append (priv->nsp_list, nsp);
 			nm_wimax_nsp_export_to_dbus (nsp);
 			g_signal_emit (self, signals[NSP_ADDED], 0, nsp);
+			nm_device_recheck_available_connections (NM_DEVICE (self));
 		}
 	}
 }
@@ -1272,8 +1293,7 @@ static void
 device_state_changed (NMDevice *device,
                       NMDeviceState new_state,
                       NMDeviceState old_state,
-                      NMDeviceStateReason reason,
-                      gpointer user_data)
+                      NMDeviceStateReason reason)
 {
 	NMDeviceWimax *self = NM_DEVICE_WIMAX (device);
 	NMDeviceWimaxPrivate *priv = NM_DEVICE_WIMAX_GET_PRIVATE (self);
@@ -1375,7 +1395,6 @@ nm_device_wimax_new (const char *udi,
 		struct wmxsdk *sdk;
 
 		nm_wimax_util_sdk_ref ();
-		g_signal_connect (device, "state-changed", G_CALLBACK (device_state_changed), NULL);
 
 		/* See if the SDK already knows about this interface */
 		sdk = iwmx_sdk_get_wmxsdk_for_iface (iface);
@@ -1498,21 +1517,24 @@ nm_device_wimax_class_init (NMDeviceWimaxClass *klass)
 	object_class->get_property = get_property;
 	object_class->dispose = dispose;
 
-	device_class->take_down = real_take_down;
-	device_class->hw_is_up = real_hw_is_up;
-	device_class->hw_bring_up = real_hw_bring_up;
-	device_class->hw_take_down = real_hw_take_down;
-	device_class->update_hw_address = real_update_hw_address;
-	device_class->check_connection_compatible = real_check_connection_compatible;
-	device_class->complete_connection = real_complete_connection;
-	device_class->get_best_auto_connection = real_get_best_auto_connection;
-	device_class->get_generic_capabilities = real_get_generic_capabilities;
-	device_class->is_available = real_is_available;
-	device_class->act_stage1_prepare = real_act_stage1_prepare;
-	device_class->act_stage2_config = real_act_stage2_config;
-	device_class->deactivate = real_deactivate;
-    device_class->set_enabled = real_set_enabled;
-    device_class->hwaddr_matches = hwaddr_matches;
+	device_class->take_down = take_down;
+	device_class->hw_is_up = hw_is_up;
+	device_class->hw_bring_up = hw_bring_up;
+	device_class->hw_take_down = hw_take_down;
+	device_class->update_hw_address = update_hw_address;
+	device_class->check_connection_compatible = check_connection_compatible;
+	device_class->check_connection_available = check_connection_available;
+	device_class->complete_connection = complete_connection;
+	device_class->get_best_auto_connection = get_best_auto_connection;
+	device_class->get_generic_capabilities = get_generic_capabilities;
+	device_class->is_available = is_available;
+	device_class->act_stage1_prepare = act_stage1_prepare;
+	device_class->act_stage2_config = act_stage2_config;
+	device_class->deactivate = deactivate;
+	device_class->set_enabled = set_enabled;
+	device_class->hwaddr_matches = hwaddr_matches;
+
+	device_class->state_changed = device_state_changed;
 
 	/* Properties */
 	g_object_class_install_property
diff --git a/test/Makefile.am b/test/Makefile.am
index 34b69aad..bdfd306d 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -9,7 +9,6 @@ AM_CPPFLAGS = \
 	$(DBUS_CFLAGS) \
 	$(GLIB_CFLAGS) \
 	-DBINDIR=\"$(bindir)\" \
-	-DNM_RUN_DIR=\"$(rundir)\" \
 	-DDATADIR=\"$(datadir)\" \
 	-DNMLOCALEDIR=\"$(datadir)/locale\"
 
diff --git a/test/Makefile.in b/test/Makefile.in
index 1e19a03b..c759530e 100644
--- a/test/Makefile.in
+++ b/test/Makefile.in
@@ -57,16 +57,18 @@ subdir = test
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/compiler_warnings.m4 \
-	$(top_srcdir)/m4/gettext.m4 $(top_srcdir)/m4/gtk-doc.m4 \
-	$(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/intlmacosx.m4 \
-	$(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/introspection.m4 \
-	$(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \
-	$(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/libnl-check.m4 \
-	$(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \
-	$(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
-	$(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/nls.m4 \
-	$(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/progtest.m4 \
-	$(top_srcdir)/m4/vapigen.m4 $(top_srcdir)/configure.ac
+	$(top_srcdir)/m4/gettext.m4 \
+	$(top_srcdir)/m4/gnome-code-coverage.m4 \
+	$(top_srcdir)/m4/gtk-doc.m4 $(top_srcdir)/m4/iconv.m4 \
+	$(top_srcdir)/m4/intlmacosx.m4 $(top_srcdir)/m4/intltool.m4 \
+	$(top_srcdir)/m4/introspection.m4 $(top_srcdir)/m4/lib-ld.m4 \
+	$(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \
+	$(top_srcdir)/m4/libnl-check.m4 $(top_srcdir)/m4/libtool.m4 \
+	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
+	$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
+	$(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/po.m4 \
+	$(top_srcdir)/m4/progtest.m4 $(top_srcdir)/m4/vapigen.m4 \
+	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(install_sh) -d
@@ -149,6 +151,10 @@ AWK = @AWK@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
+CKDB_PATH = @CKDB_PATH@
+CODE_COVERAGE_CFLAGS = @CODE_COVERAGE_CFLAGS@
+CODE_COVERAGE_ENABLED = @CODE_COVERAGE_ENABLED@
+CODE_COVERAGE_LDFLAGS = @CODE_COVERAGE_LDFLAGS@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CXX = @CXX@
@@ -163,9 +169,7 @@ DBUS_SYS_DIR = @DBUS_SYS_DIR@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
 DHCLIENT_PATH = @DHCLIENT_PATH@
-DHCLIENT_VERSION = @DHCLIENT_VERSION@
 DHCPCD_PATH = @DHCPCD_PATH@
-DISABLE_DEPRECATED = @DISABLE_DEPRECATED@
 DLLTOOL = @DLLTOOL@
 DSYMUTIL = @DSYMUTIL@
 DUMPBIN = @DUMPBIN@
@@ -175,17 +179,14 @@ ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
 FGREP = @FGREP@
+GENHTML = @GENHTML@
 GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
 GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
-GIO_CFLAGS = @GIO_CFLAGS@
-GIO_LIBS = @GIO_LIBS@
 GLIB_CFLAGS = @GLIB_CFLAGS@
 GLIB_GENMARSHAL = @GLIB_GENMARSHAL@
 GLIB_LIBS = @GLIB_LIBS@
 GLIB_MAKEFILE = @GLIB_MAKEFILE@
 GLIB_MKENUMS = @GLIB_MKENUMS@
-GMODULE_CFLAGS = @GMODULE_CFLAGS@
-GMODULE_LIBS = @GMODULE_LIBS@
 GMSGFMT = @GMSGFMT@
 GMSGFMT_015 = @GMSGFMT_015@
 GNUTLS_CFLAGS = @GNUTLS_CFLAGS@
@@ -226,6 +227,7 @@ IPTABLES_PATH = @IPTABLES_PATH@
 IWMX_SDK_CFLAGS = @IWMX_SDK_CFLAGS@
 IWMX_SDK_LIBS = @IWMX_SDK_LIBS@
 KERNEL_FIRMWARE_DIR = @KERNEL_FIRMWARE_DIR@
+LCOV = @LCOV@
 LD = @LD@
 LDFLAGS = @LDFLAGS@
 LIBDL = @LIBDL@
@@ -242,11 +244,7 @@ LIBNL2_LIBS = @LIBNL2_LIBS@
 LIBNL3_CFLAGS = @LIBNL3_CFLAGS@
 LIBNL3_LIBS = @LIBNL3_LIBS@
 LIBNL_CFLAGS = @LIBNL_CFLAGS@
-LIBNL_GENL3_CFLAGS = @LIBNL_GENL3_CFLAGS@
-LIBNL_GENL3_LIBS = @LIBNL_GENL3_LIBS@
 LIBNL_LIBS = @LIBNL_LIBS@
-LIBNL_ROUTE3_CFLAGS = @LIBNL_ROUTE3_CFLAGS@
-LIBNL_ROUTE3_LIBS = @LIBNL_ROUTE3_LIBS@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
 LIBSOUP_CFLAGS = @LIBSOUP_CFLAGS@
@@ -261,6 +259,8 @@ MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MANIFEST_TOOL = @MANIFEST_TOOL@
 MKDIR_P = @MKDIR_P@
+MM_GLIB_CFLAGS = @MM_GLIB_CFLAGS@
+MM_GLIB_LIBS = @MM_GLIB_LIBS@
 MOC = @MOC@
 MSGFMT = @MSGFMT@
 MSGFMT_015 = @MSGFMT_015@
@@ -270,6 +270,7 @@ NMEDIT = @NMEDIT@
 NM_MAJOR_VERSION = @NM_MAJOR_VERSION@
 NM_MICRO_VERSION = @NM_MICRO_VERSION@
 NM_MINOR_VERSION = @NM_MINOR_VERSION@
+NM_MODIFY_SYSTEM_POLICY = @NM_MODIFY_SYSTEM_POLICY@
 NM_VERSION = @NM_VERSION@
 NSS_CFLAGS = @NSS_CFLAGS@
 NSS_LIBS = @NSS_LIBS@
@@ -296,13 +297,14 @@ PPPD_PLUGIN_DIR = @PPPD_PLUGIN_DIR@
 QT_CFLAGS = @QT_CFLAGS@
 QT_LIBS = @QT_LIBS@
 RANLIB = @RANLIB@
-RESOLVCONF_PATH = @RESOLVCONF_PATH@
 SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
-SYSTEMD_CFLAGS = @SYSTEMD_CFLAGS@
-SYSTEMD_LIBS = @SYSTEMD_LIBS@
+SYSTEMD_INHIBIT_CFLAGS = @SYSTEMD_INHIBIT_CFLAGS@
+SYSTEMD_INHIBIT_LIBS = @SYSTEMD_INHIBIT_LIBS@
+SYSTEMD_LOGIN_CFLAGS = @SYSTEMD_LOGIN_CFLAGS@
+SYSTEMD_LOGIN_LIBS = @SYSTEMD_LOGIN_LIBS@
 SYSTEM_CA_PATH = @SYSTEM_CA_PATH@
 UDEV_BASE_DIR = @UDEV_BASE_DIR@
 USE_NLS = @USE_NLS@
@@ -357,6 +359,11 @@ localedir = @localedir@
 localstatedir = @localstatedir@
 mandir = @mandir@
 mkdir_p = @mkdir_p@
+nmbinary = @nmbinary@
+nmconfdir = @nmconfdir@
+nmdatadir = @nmdatadir@
+nmrundir = @nmrundir@
+nmstatedir = @nmstatedir@
 oldincludedir = @oldincludedir@
 pdfdir = @pdfdir@
 prefix = @prefix@
@@ -371,6 +378,10 @@ target_alias = @target_alias@
 top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
+with_dhclient = @with_dhclient@
+with_dhcpcd = @with_dhcpcd@
+with_netconfig = @with_netconfig@
+with_resolvconf = @with_resolvconf@
 INCLUDES = -I${top_srcdir}                    \
            -I${top_srcdir}/libnm-util         \
            -I${top_builddir}/libnm-util         \
@@ -382,7 +393,6 @@ AM_CPPFLAGS = \
 	$(DBUS_CFLAGS) \
 	$(GLIB_CFLAGS) \
 	-DBINDIR=\"$(bindir)\" \
-	-DNM_RUN_DIR=\"$(rundir)\" \
 	-DDATADIR=\"$(datadir)\" \
 	-DNMLOCALEDIR=\"$(datadir)/locale\"
 
@@ -520,25 +530,22 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/nm-tool.Po@am__quote@
 
 .c.o:
-@am__fastdepCC_TRUE@	$(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\
-@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
-@am__fastdepCC_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.Po
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $<
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c $<
 
 .c.obj:
-@am__fastdepCC_TRUE@	$(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.obj$$||'`;\
-@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ `$(CYGPATH_W) '$<'` &&\
-@am__fastdepCC_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.Po
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c `$(CYGPATH_W) '$<'`
 
 .c.lo:
-@am__fastdepCC_TRUE@	$(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.lo$$||'`;\
-@am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
-@am__fastdepCC_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.Plo
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $<
diff --git a/test/nm-online.c b/test/nm-online.c
index 77f74638..4b3ae9a6 100644
--- a/test/nm-online.c
+++ b/test/nm-online.c
@@ -32,7 +32,6 @@
 
 #include 
 
-#include 
 #include 
 #include 
 #include 
diff --git a/test/nm-tool.c b/test/nm-tool.c
index d8c75cee..47bf2e2f 100644
--- a/test/nm-tool.c
+++ b/test/nm-tool.c
@@ -161,7 +161,9 @@ detail_access_point (gpointer data, gpointer user_data)
 	str = g_string_new (NULL);
 	g_string_append_printf (str,
 	                        "%s, %s, Freq %d MHz, Rate %d Mb/s, Strength %d",
-	                        (nm_access_point_get_mode (ap) == NM_802_11_MODE_INFRA) ? "Infra" : "Ad-Hoc",
+	                        nm_access_point_get_mode (ap) == NM_802_11_MODE_ADHOC ? "Ad-Hoc"
+	                        : nm_access_point_get_mode (ap) == NM_802_11_MODE_INFRA ? "Infra"
+	                        : "Unknown",
 	                        nm_access_point_get_hw_address (ap),
 	                        nm_access_point_get_frequency (ap),
 	                        nm_access_point_get_max_bitrate (ap) / 1000,
diff --git a/tools/Makefile.in b/tools/Makefile.in
index 0d7ff335..8f460e49 100644
--- a/tools/Makefile.in
+++ b/tools/Makefile.in
@@ -54,16 +54,18 @@ subdir = tools
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/compiler_warnings.m4 \
-	$(top_srcdir)/m4/gettext.m4 $(top_srcdir)/m4/gtk-doc.m4 \
-	$(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/intlmacosx.m4 \
-	$(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/introspection.m4 \
-	$(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \
-	$(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/libnl-check.m4 \
-	$(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \
-	$(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
-	$(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/nls.m4 \
-	$(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/progtest.m4 \
-	$(top_srcdir)/m4/vapigen.m4 $(top_srcdir)/configure.ac
+	$(top_srcdir)/m4/gettext.m4 \
+	$(top_srcdir)/m4/gnome-code-coverage.m4 \
+	$(top_srcdir)/m4/gtk-doc.m4 $(top_srcdir)/m4/iconv.m4 \
+	$(top_srcdir)/m4/intlmacosx.m4 $(top_srcdir)/m4/intltool.m4 \
+	$(top_srcdir)/m4/introspection.m4 $(top_srcdir)/m4/lib-ld.m4 \
+	$(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \
+	$(top_srcdir)/m4/libnl-check.m4 $(top_srcdir)/m4/libtool.m4 \
+	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
+	$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
+	$(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/po.m4 \
+	$(top_srcdir)/m4/progtest.m4 $(top_srcdir)/m4/vapigen.m4 \
+	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(install_sh) -d
@@ -96,6 +98,10 @@ AWK = @AWK@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
+CKDB_PATH = @CKDB_PATH@
+CODE_COVERAGE_CFLAGS = @CODE_COVERAGE_CFLAGS@
+CODE_COVERAGE_ENABLED = @CODE_COVERAGE_ENABLED@
+CODE_COVERAGE_LDFLAGS = @CODE_COVERAGE_LDFLAGS@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CXX = @CXX@
@@ -110,9 +116,7 @@ DBUS_SYS_DIR = @DBUS_SYS_DIR@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
 DHCLIENT_PATH = @DHCLIENT_PATH@
-DHCLIENT_VERSION = @DHCLIENT_VERSION@
 DHCPCD_PATH = @DHCPCD_PATH@
-DISABLE_DEPRECATED = @DISABLE_DEPRECATED@
 DLLTOOL = @DLLTOOL@
 DSYMUTIL = @DSYMUTIL@
 DUMPBIN = @DUMPBIN@
@@ -122,17 +126,14 @@ ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
 FGREP = @FGREP@
+GENHTML = @GENHTML@
 GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
 GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
-GIO_CFLAGS = @GIO_CFLAGS@
-GIO_LIBS = @GIO_LIBS@
 GLIB_CFLAGS = @GLIB_CFLAGS@
 GLIB_GENMARSHAL = @GLIB_GENMARSHAL@
 GLIB_LIBS = @GLIB_LIBS@
 GLIB_MAKEFILE = @GLIB_MAKEFILE@
 GLIB_MKENUMS = @GLIB_MKENUMS@
-GMODULE_CFLAGS = @GMODULE_CFLAGS@
-GMODULE_LIBS = @GMODULE_LIBS@
 GMSGFMT = @GMSGFMT@
 GMSGFMT_015 = @GMSGFMT_015@
 GNUTLS_CFLAGS = @GNUTLS_CFLAGS@
@@ -173,6 +174,7 @@ IPTABLES_PATH = @IPTABLES_PATH@
 IWMX_SDK_CFLAGS = @IWMX_SDK_CFLAGS@
 IWMX_SDK_LIBS = @IWMX_SDK_LIBS@
 KERNEL_FIRMWARE_DIR = @KERNEL_FIRMWARE_DIR@
+LCOV = @LCOV@
 LD = @LD@
 LDFLAGS = @LDFLAGS@
 LIBDL = @LIBDL@
@@ -189,11 +191,7 @@ LIBNL2_LIBS = @LIBNL2_LIBS@
 LIBNL3_CFLAGS = @LIBNL3_CFLAGS@
 LIBNL3_LIBS = @LIBNL3_LIBS@
 LIBNL_CFLAGS = @LIBNL_CFLAGS@
-LIBNL_GENL3_CFLAGS = @LIBNL_GENL3_CFLAGS@
-LIBNL_GENL3_LIBS = @LIBNL_GENL3_LIBS@
 LIBNL_LIBS = @LIBNL_LIBS@
-LIBNL_ROUTE3_CFLAGS = @LIBNL_ROUTE3_CFLAGS@
-LIBNL_ROUTE3_LIBS = @LIBNL_ROUTE3_LIBS@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
 LIBSOUP_CFLAGS = @LIBSOUP_CFLAGS@
@@ -208,6 +206,8 @@ MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MANIFEST_TOOL = @MANIFEST_TOOL@
 MKDIR_P = @MKDIR_P@
+MM_GLIB_CFLAGS = @MM_GLIB_CFLAGS@
+MM_GLIB_LIBS = @MM_GLIB_LIBS@
 MOC = @MOC@
 MSGFMT = @MSGFMT@
 MSGFMT_015 = @MSGFMT_015@
@@ -217,6 +217,7 @@ NMEDIT = @NMEDIT@
 NM_MAJOR_VERSION = @NM_MAJOR_VERSION@
 NM_MICRO_VERSION = @NM_MICRO_VERSION@
 NM_MINOR_VERSION = @NM_MINOR_VERSION@
+NM_MODIFY_SYSTEM_POLICY = @NM_MODIFY_SYSTEM_POLICY@
 NM_VERSION = @NM_VERSION@
 NSS_CFLAGS = @NSS_CFLAGS@
 NSS_LIBS = @NSS_LIBS@
@@ -243,13 +244,14 @@ PPPD_PLUGIN_DIR = @PPPD_PLUGIN_DIR@
 QT_CFLAGS = @QT_CFLAGS@
 QT_LIBS = @QT_LIBS@
 RANLIB = @RANLIB@
-RESOLVCONF_PATH = @RESOLVCONF_PATH@
 SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
-SYSTEMD_CFLAGS = @SYSTEMD_CFLAGS@
-SYSTEMD_LIBS = @SYSTEMD_LIBS@
+SYSTEMD_INHIBIT_CFLAGS = @SYSTEMD_INHIBIT_CFLAGS@
+SYSTEMD_INHIBIT_LIBS = @SYSTEMD_INHIBIT_LIBS@
+SYSTEMD_LOGIN_CFLAGS = @SYSTEMD_LOGIN_CFLAGS@
+SYSTEMD_LOGIN_LIBS = @SYSTEMD_LOGIN_LIBS@
 SYSTEM_CA_PATH = @SYSTEM_CA_PATH@
 UDEV_BASE_DIR = @UDEV_BASE_DIR@
 USE_NLS = @USE_NLS@
@@ -304,6 +306,11 @@ localedir = @localedir@
 localstatedir = @localstatedir@
 mandir = @mandir@
 mkdir_p = @mkdir_p@
+nmbinary = @nmbinary@
+nmconfdir = @nmconfdir@
+nmdatadir = @nmdatadir@
+nmrundir = @nmrundir@
+nmstatedir = @nmstatedir@
 oldincludedir = @oldincludedir@
 pdfdir = @pdfdir@
 prefix = @prefix@
@@ -318,6 +325,10 @@ target_alias = @target_alias@
 top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
+with_dhclient = @with_dhclient@
+with_dhcpcd = @with_dhcpcd@
+with_netconfig = @with_netconfig@
+with_resolvconf = @with_resolvconf@
 EXTRA_DIST = doc-generator.xsl check-exports.sh glib-mkenums
 all: all-am
 
diff --git a/vapi/Makefile.am b/vapi/Makefile.am
index a63a3c76..f90a9f7d 100644
--- a/vapi/Makefile.am
+++ b/vapi/Makefile.am
@@ -7,8 +7,8 @@ EXTRA_DIST = \
 if ENABLE_VAPIGEN
 include Makefile.vapigen
 
-libnm-util.vapi: $(top_srcdir)/libnm-util/NetworkManager-1.0.gir  libnm-util.deps NetworkManager-1.0.metadata
-libnm-glib.vapi: $(top_srcdir)/libnm-glib/NMClient-1.0.gir  libnm-glib.deps NMClient-1.0.metadata libnm-util.vapi
+libnm-util.vapi: $(top_builddir)/libnm-util/NetworkManager-1.0.gir  libnm-util.deps NetworkManager-1.0.metadata
+libnm-glib.vapi: $(top_builddir)/libnm-glib/NMClient-1.0.gir  libnm-glib.deps NMClient-1.0.metadata libnm-util.vapi
 
 
 libnm_util_vapi_METADATADIRS = $(srcdir)
diff --git a/vapi/Makefile.in b/vapi/Makefile.in
index dfec522c..6c30f944 100644
--- a/vapi/Makefile.in
+++ b/vapi/Makefile.in
@@ -94,16 +94,18 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
 subdir = vapi
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/compiler_warnings.m4 \
-	$(top_srcdir)/m4/gettext.m4 $(top_srcdir)/m4/gtk-doc.m4 \
-	$(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/intlmacosx.m4 \
-	$(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/introspection.m4 \
-	$(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \
-	$(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/libnl-check.m4 \
-	$(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \
-	$(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
-	$(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/nls.m4 \
-	$(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/progtest.m4 \
-	$(top_srcdir)/m4/vapigen.m4 $(top_srcdir)/configure.ac
+	$(top_srcdir)/m4/gettext.m4 \
+	$(top_srcdir)/m4/gnome-code-coverage.m4 \
+	$(top_srcdir)/m4/gtk-doc.m4 $(top_srcdir)/m4/iconv.m4 \
+	$(top_srcdir)/m4/intlmacosx.m4 $(top_srcdir)/m4/intltool.m4 \
+	$(top_srcdir)/m4/introspection.m4 $(top_srcdir)/m4/lib-ld.m4 \
+	$(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \
+	$(top_srcdir)/m4/libnl-check.m4 $(top_srcdir)/m4/libtool.m4 \
+	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
+	$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
+	$(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/po.m4 \
+	$(top_srcdir)/m4/progtest.m4 $(top_srcdir)/m4/vapigen.m4 \
+	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(install_sh) -d
@@ -165,6 +167,10 @@ AWK = @AWK@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
+CKDB_PATH = @CKDB_PATH@
+CODE_COVERAGE_CFLAGS = @CODE_COVERAGE_CFLAGS@
+CODE_COVERAGE_ENABLED = @CODE_COVERAGE_ENABLED@
+CODE_COVERAGE_LDFLAGS = @CODE_COVERAGE_LDFLAGS@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CXX = @CXX@
@@ -179,9 +185,7 @@ DBUS_SYS_DIR = @DBUS_SYS_DIR@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
 DHCLIENT_PATH = @DHCLIENT_PATH@
-DHCLIENT_VERSION = @DHCLIENT_VERSION@
 DHCPCD_PATH = @DHCPCD_PATH@
-DISABLE_DEPRECATED = @DISABLE_DEPRECATED@
 DLLTOOL = @DLLTOOL@
 DSYMUTIL = @DSYMUTIL@
 DUMPBIN = @DUMPBIN@
@@ -191,17 +195,14 @@ ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
 FGREP = @FGREP@
+GENHTML = @GENHTML@
 GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
 GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
-GIO_CFLAGS = @GIO_CFLAGS@
-GIO_LIBS = @GIO_LIBS@
 GLIB_CFLAGS = @GLIB_CFLAGS@
 GLIB_GENMARSHAL = @GLIB_GENMARSHAL@
 GLIB_LIBS = @GLIB_LIBS@
 GLIB_MAKEFILE = @GLIB_MAKEFILE@
 GLIB_MKENUMS = @GLIB_MKENUMS@
-GMODULE_CFLAGS = @GMODULE_CFLAGS@
-GMODULE_LIBS = @GMODULE_LIBS@
 GMSGFMT = @GMSGFMT@
 GMSGFMT_015 = @GMSGFMT_015@
 GNUTLS_CFLAGS = @GNUTLS_CFLAGS@
@@ -242,6 +243,7 @@ IPTABLES_PATH = @IPTABLES_PATH@
 IWMX_SDK_CFLAGS = @IWMX_SDK_CFLAGS@
 IWMX_SDK_LIBS = @IWMX_SDK_LIBS@
 KERNEL_FIRMWARE_DIR = @KERNEL_FIRMWARE_DIR@
+LCOV = @LCOV@
 LD = @LD@
 LDFLAGS = @LDFLAGS@
 LIBDL = @LIBDL@
@@ -258,11 +260,7 @@ LIBNL2_LIBS = @LIBNL2_LIBS@
 LIBNL3_CFLAGS = @LIBNL3_CFLAGS@
 LIBNL3_LIBS = @LIBNL3_LIBS@
 LIBNL_CFLAGS = @LIBNL_CFLAGS@
-LIBNL_GENL3_CFLAGS = @LIBNL_GENL3_CFLAGS@
-LIBNL_GENL3_LIBS = @LIBNL_GENL3_LIBS@
 LIBNL_LIBS = @LIBNL_LIBS@
-LIBNL_ROUTE3_CFLAGS = @LIBNL_ROUTE3_CFLAGS@
-LIBNL_ROUTE3_LIBS = @LIBNL_ROUTE3_LIBS@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
 LIBSOUP_CFLAGS = @LIBSOUP_CFLAGS@
@@ -277,6 +275,8 @@ MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MANIFEST_TOOL = @MANIFEST_TOOL@
 MKDIR_P = @MKDIR_P@
+MM_GLIB_CFLAGS = @MM_GLIB_CFLAGS@
+MM_GLIB_LIBS = @MM_GLIB_LIBS@
 MOC = @MOC@
 MSGFMT = @MSGFMT@
 MSGFMT_015 = @MSGFMT_015@
@@ -286,6 +286,7 @@ NMEDIT = @NMEDIT@
 NM_MAJOR_VERSION = @NM_MAJOR_VERSION@
 NM_MICRO_VERSION = @NM_MICRO_VERSION@
 NM_MINOR_VERSION = @NM_MINOR_VERSION@
+NM_MODIFY_SYSTEM_POLICY = @NM_MODIFY_SYSTEM_POLICY@
 NM_VERSION = @NM_VERSION@
 NSS_CFLAGS = @NSS_CFLAGS@
 NSS_LIBS = @NSS_LIBS@
@@ -312,13 +313,14 @@ PPPD_PLUGIN_DIR = @PPPD_PLUGIN_DIR@
 QT_CFLAGS = @QT_CFLAGS@
 QT_LIBS = @QT_LIBS@
 RANLIB = @RANLIB@
-RESOLVCONF_PATH = @RESOLVCONF_PATH@
 SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
-SYSTEMD_CFLAGS = @SYSTEMD_CFLAGS@
-SYSTEMD_LIBS = @SYSTEMD_LIBS@
+SYSTEMD_INHIBIT_CFLAGS = @SYSTEMD_INHIBIT_CFLAGS@
+SYSTEMD_INHIBIT_LIBS = @SYSTEMD_INHIBIT_LIBS@
+SYSTEMD_LOGIN_CFLAGS = @SYSTEMD_LOGIN_CFLAGS@
+SYSTEMD_LOGIN_LIBS = @SYSTEMD_LOGIN_LIBS@
 SYSTEM_CA_PATH = @SYSTEM_CA_PATH@
 UDEV_BASE_DIR = @UDEV_BASE_DIR@
 USE_NLS = @USE_NLS@
@@ -373,6 +375,11 @@ localedir = @localedir@
 localstatedir = @localstatedir@
 mandir = @mandir@
 mkdir_p = @mkdir_p@
+nmbinary = @nmbinary@
+nmconfdir = @nmconfdir@
+nmdatadir = @nmdatadir@
+nmrundir = @nmrundir@
+nmstatedir = @nmstatedir@
 oldincludedir = @oldincludedir@
 pdfdir = @pdfdir@
 prefix = @prefix@
@@ -387,6 +394,10 @@ target_alias = @target_alias@
 top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
+with_dhclient = @with_dhclient@
+with_dhcpcd = @with_dhcpcd@
+with_netconfig = @with_netconfig@
+with_resolvconf = @with_resolvconf@
 EXTRA_DIST = \
 	NetworkManager-1.0.metadata \
 	NMClient-1.0.metadata \
@@ -640,8 +651,8 @@ uninstall-am: uninstall-vapiDATA
 
 @ENABLE_VAPIGEN_TRUE@$(foreach vapi,$(VAPIGEN_VAPIS),$(eval $(call vapigen,$(vapi))))
 
-@ENABLE_VAPIGEN_TRUE@libnm-util.vapi: $(top_srcdir)/libnm-util/NetworkManager-1.0.gir  libnm-util.deps NetworkManager-1.0.metadata
-@ENABLE_VAPIGEN_TRUE@libnm-glib.vapi: $(top_srcdir)/libnm-glib/NMClient-1.0.gir  libnm-glib.deps NMClient-1.0.metadata libnm-util.vapi
+@ENABLE_VAPIGEN_TRUE@libnm-util.vapi: $(top_builddir)/libnm-util/NetworkManager-1.0.gir  libnm-util.deps NetworkManager-1.0.metadata
+@ENABLE_VAPIGEN_TRUE@libnm-glib.vapi: $(top_builddir)/libnm-glib/NMClient-1.0.gir  libnm-glib.deps NMClient-1.0.metadata libnm-util.vapi
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
-- 
cgit 1.3.0-6-gf8a5